diff options
Diffstat (limited to 'deskutils')
| -rw-r--r-- | deskutils/sunbird/Makefile | 6 | ||||
| -rw-r--r-- | deskutils/sunbird/distinfo | 4 | ||||
| -rw-r--r-- | deskutils/sunbird/files/patch-Double.cpp | 59 | ||||
| -rw-r--r-- | deskutils/sunbird/files/patch-extensions_negotiateauth_Makefile.in | 19 | ||||
| -rw-r--r-- | deskutils/sunbird/files/patch-modules_plugin_base_public_nptypes.h | 11 | ||||
| -rw-r--r-- | deskutils/sunbird/files/patch-xptcall-ia64 | 29 |
6 files changed, 10 insertions, 118 deletions
diff --git a/deskutils/sunbird/Makefile b/deskutils/sunbird/Makefile index 65719d7aa..4ae00fd72 100644 --- a/deskutils/sunbird/Makefile +++ b/deskutils/sunbird/Makefile @@ -3,11 +3,11 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/deskutils/sunbird/Makefile,v 1.7 2005/08/19 01:34:21 mezz Exp $ +# $MCom: ports/deskutils/sunbird/Makefile,v 1.8 2005/08/19 01:52:37 mezz Exp $ # PORTNAME= sunbird -PORTVERSION= 0.2.1.2 +PORTVERSION= 0.3a1 CATEGORIES= deskutils MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= ahze @@ -20,7 +20,7 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ Xft.2:${PORTSDIR}/x11-fonts/libXft BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip -USE_GCC= 3.4 +USE_GCC= 3.4+ ALL_TARGET= default CONFIGURE_ENV= LOCALBASE=${LOCALBASE} FAKEDIR= ${WRKDIR}/fake diff --git a/deskutils/sunbird/distinfo b/deskutils/sunbird/distinfo index 19646a732..5fbe41ebd 100644 --- a/deskutils/sunbird/distinfo +++ b/deskutils/sunbird/distinfo @@ -1,2 +1,2 @@ -MD5 (sunbird-0.2.1.2.tar.bz2) = c1041246680da6582cde16cd99203c35 -SIZE (sunbird-0.2.1.2.tar.bz2) = 33153362 +MD5 (sunbird-0.3a1.tar.bz2) = 193ec35d2811eb248c506e8a6052c5f2 +SIZE (sunbird-0.3a1.tar.bz2) = 34166670 diff --git a/deskutils/sunbird/files/patch-Double.cpp b/deskutils/sunbird/files/patch-Double.cpp deleted file mode 100644 index 5cd13e4ff..000000000 --- a/deskutils/sunbird/files/patch-Double.cpp +++ /dev/null @@ -1,59 +0,0 @@ ---- extensions/transformiix/source/base/Double.cpp.orig Thu Jan 30 09:26:46 2003 -+++ extensions/transformiix/source/base/Double.cpp Sun Nov 16 01:46:42 2003 -@@ -51,10 +51,10 @@ - //A trick to handle IEEE floating point exceptions on FreeBSD - E.D. - #ifdef __FreeBSD__ - #include <ieeefp.h> --#ifdef __alpha__ --fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP; --#else -+#if defined(__i386__) - fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML; -+#else -+fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP; - #endif - fp_except_t oldmask = fpsetmask(~allmask); - #endif -@@ -75,22 +75,31 @@ - #define TX_DOUBLE_HI32_EXPMASK 0x7ff00000 - #define TX_DOUBLE_HI32_MANTMASK 0x000fffff - -+union ui32dun { -+ PRUint32 i[2]; -+ double d; -+}; -+ - //-- Initialize Double related constants - #ifdef IS_BIG_ENDIAN --const PRUint32 nanMask[2] = {TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK, -- 0xffffffff}; --const PRUint32 infMask[2] = {TX_DOUBLE_HI32_EXPMASK, 0}; --const PRUint32 negInfMask[2] = {TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT, 0}; -+const union ui32dun nanMask = -+ {{TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK, 0xffffffff}}; -+const union ui32dun infMask = -+ {{TX_DOUBLE_HI32_EXPMASK, 0}}; -+const union ui32dun negInfMask = -+ {{TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT, 0}}; - #else --const PRUint32 nanMask[2] = {0xffffffff, -- TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK}; --const PRUint32 infMask[2] = {0, TX_DOUBLE_HI32_EXPMASK}; --const PRUint32 negInfMask[2] = {0, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT}; -+const union ui32dun nanMask = -+ {{0xffffffff, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK}}; -+const union ui32dun infMask = -+ {{0, TX_DOUBLE_HI32_EXPMASK}}; -+const union ui32dun negInfMask = -+ {{0, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT}}; - #endif - --const double Double::NaN = *((double*)nanMask); --const double Double::POSITIVE_INFINITY = *((double*)infMask); --const double Double::NEGATIVE_INFINITY = *((double*)negInfMask); -+const double Double::NaN = nanMask.d; -+const double Double::POSITIVE_INFINITY = infMask.d; -+const double Double::NEGATIVE_INFINITY = negInfMask.d; - - /* - * Determines whether the given double represents positive or negative diff --git a/deskutils/sunbird/files/patch-extensions_negotiateauth_Makefile.in b/deskutils/sunbird/files/patch-extensions_negotiateauth_Makefile.in deleted file mode 100644 index d2241dbfe..000000000 --- a/deskutils/sunbird/files/patch-extensions_negotiateauth_Makefile.in +++ /dev/null @@ -1,19 +0,0 @@ ---- extensions/negotiateauth/Makefile.in.orig Wed Apr 28 03:26:19 2004 -+++ extensions/negotiateauth/Makefile.in Tue Jul 6 16:27:07 2004 -@@ -66,7 +66,6 @@ - $(NULL) - - EXTRA_DSO_LDOPTS = \ -- $(MOZ_COMPONENT_LIBS) \ - $(NULL) - - ifneq (,$(GSSAPI_LIBS)) -@@ -74,6 +73,8 @@ - EXTRA_DSO_LDOPTS += $(GSSAPI_LIBS) - CPPSRCS += nsNegotiateAuthGSSAPI.cpp - endif -+ -+EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) - - # make sure this component is never statically linked into the main - # application. this is necessary since we don't want to force users diff --git a/deskutils/sunbird/files/patch-modules_plugin_base_public_nptypes.h b/deskutils/sunbird/files/patch-modules_plugin_base_public_nptypes.h deleted file mode 100644 index 84d68d178..000000000 --- a/deskutils/sunbird/files/patch-modules_plugin_base_public_nptypes.h +++ /dev/null @@ -1,11 +0,0 @@ ---- modules/plugin/base/public/nptypes.h.orig Sun Sep 5 18:56:55 2004 -+++ modules/plugin/base/public/nptypes.h Thu Oct 21 19:29:29 2004 -@@ -73,7 +73,7 @@ - #if defined(bsdi) || defined(OPENBSD) - typedef u_int32_t uint32_t; - -- #if defined(bsdi) -+ #if defined(bsdi) || defined(__FreeBSD__) - #if !defined(__cplusplus) - typedef int bool; - #endif diff --git a/deskutils/sunbird/files/patch-xptcall-ia64 b/deskutils/sunbird/files/patch-xptcall-ia64 index 9cd07f7dd..3e05a5c70 100644 --- a/deskutils/sunbird/files/patch-xptcall-ia64 +++ b/deskutils/sunbird/files/patch-xptcall-ia64 @@ -1,24 +1,5 @@ ---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ipf64.s.orig Sun Jul 20 00:05:32 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ipf64.s Sun Jul 20 00:06:37 2003 -@@ -8,6 +8,7 @@ - // Section has executable code - .section .text, "ax","progbits" - // procedure named 'XPTC_InvokeByIndex' -+ .global XPTC_InvokeByIndex - .proc XPTC_InvokeByIndex - // manual bundling - .explicit -@@ -24,7 +25,7 @@ - - // XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex, - // PRUint32 paramCount, nsXPTCVariant* params); --XPTC_InvokeByIndex:: -+XPTC_InvokeByIndex: - .prologue - .save ar.pfs, r37 - // allocate 4 input args, 6 local args, and 8 output args ---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s.orig Sun Jul 20 00:02:02 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s Sun Jul 20 00:02:40 2003 +--- xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s.orig Tue May 24 11:30:54 2005 ++++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s Mon Nov 7 23:10:28 2005 @@ -6,6 +6,7 @@ // Section has executable code .section .text, "ax","progbits" @@ -33,6 +14,6 @@ -SharedStub:: +SharedStub: - // 9 arguments, first 8 are the input arguments of previous - // function call. The last one is methodIndex, and is passed in memory - .prologue + // 10 arguments, first 8 are the input arguments of previous + // function call. The 9th one is methodIndex and the 10th is the + // pointer to the remaining input arguments. The last two arguments |