diff options
author | Beat Gaetzi <beat@FreeBSD.org> | 2011-03-01 22:27:20 +0000 |
---|---|---|
committer | Beat Gaetzi <beat@FreeBSD.org> | 2011-03-01 22:27:20 +0000 |
commit | 8f359d513346119507a3e9419558fa6f59544429 (patch) | |
tree | b4a8aafcefaacb6746bc4cb3fcaed1f27929e506 /mail | |
parent | 6785ebb952d3151d12fd116695a7aa605c149ee5 (diff) | |
download | ports-8f359d513346119507a3e9419558fa6f59544429.tar.gz ports-8f359d513346119507a3e9419558fa6f59544429.zip |
Notes
Diffstat (limited to 'mail')
14 files changed, 186 insertions, 36 deletions
diff --git a/mail/thunderbird-esr/Makefile b/mail/thunderbird-esr/Makefile index 99db2d545c1b..ecaf94a584c7 100644 --- a/mail/thunderbird-esr/Makefile +++ b/mail/thunderbird-esr/Makefile @@ -6,7 +6,7 @@ # PORTNAME= thunderbird -DISTVERSION= 3.1.7 +DISTVERSION= 3.1.8 CATEGORIES= mail ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${DISTVERSION}/source @@ -63,6 +63,15 @@ EXTRA_PATCHES= ${FILESDIR}/releng6_pulseaudio EXTRA_PATCHES= ${FILESDIR}/liboggplay_oss .endif +.if ${ARCH} == powerpc64 +.if ${OSVERSION} < 900033 +BROKEN= Needs binutils 2.17.50 to build +.else +CONFIGURE_ENV+= UNAME_m="powerpc64" +CFLAGS+= -mminimal-toc +.endif +.endif + GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 '%{\!pg: %{pthread:' | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE} .if ${HAVE_GNOME:Mlibgnomeui}!="" diff --git a/mail/thunderbird-esr/distinfo b/mail/thunderbird-esr/distinfo index c6ebbd83cb2a..844ada6ef895 100644 --- a/mail/thunderbird-esr/distinfo +++ b/mail/thunderbird-esr/distinfo @@ -1,2 +1,2 @@ -SHA256 (thunderbird-3.1.7.source.tar.bz2) = 800fe263b3889d4e602ff48889036ad56e940fc792894aca10fa07db28b6e662 -SIZE (thunderbird-3.1.7.source.tar.bz2) = 65948060 +SHA256 (thunderbird-3.1.8.source.tar.bz2) = ec4439efddc52d672eaaafdee707974c6a59ca6634c9084f7fc844a6ee0f4c8e +SIZE (thunderbird-3.1.8.source.tar.bz2) = 68613204 diff --git a/mail/thunderbird-esr/files/patch-directory-c-sdk-ldap-libraries-libldap-Makefile.in b/mail/thunderbird-esr/files/patch-directory-sdks-c-sdk-ldap-libraries-libldap-Makefile.in index b71a03a4567b..8a065107cd16 100644 --- a/mail/thunderbird-esr/files/patch-directory-c-sdk-ldap-libraries-libldap-Makefile.in +++ b/mail/thunderbird-esr/files/patch-directory-sdks-c-sdk-ldap-libraries-libldap-Makefile.in @@ -1,5 +1,5 @@ ---- directory/c-sdk/ldap/libraries/libldap/Makefile.in.orig 2009-11-10 09:56:42.000000000 +0100 -+++ directory/c-sdk/ldap/libraries/libldap/Makefile.in 2009-11-10 09:58:15.000000000 +0100 +--- directory/sdks/c-sdk/ldap/libraries/libldap/Makefile.in.orig 2009-11-10 09:56:42.000000000 +0100 ++++ directory/sdks/c-sdk/ldap/libraries/libldap/Makefile.in 2009-11-10 09:58:15.000000000 +0100 @@ -254,6 +254,10 @@ EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -lbe endif diff --git a/mail/thunderbird-esr/files/patch-directory_c-sdk_ldap_libraries_libprldap_Makefile.in b/mail/thunderbird-esr/files/patch-directory-sdks-c-sdk-ldap-libraries-libprldap-Makefile.in index ebf7f94ace1e..ff5e375f156b 100644 --- a/mail/thunderbird-esr/files/patch-directory_c-sdk_ldap_libraries_libprldap_Makefile.in +++ b/mail/thunderbird-esr/files/patch-directory-sdks-c-sdk-ldap-libraries-libprldap-Makefile.in @@ -1,5 +1,5 @@ ---- directory/c-sdk/ldap/libraries/libprldap/Makefile.in.orig 2008-09-11 16:38:35.000000000 +0200 -+++ directory/c-sdk/ldap/libraries/libprldap/Makefile.in 2009-12-09 08:53:46.000000000 +0100 +--- directory/sdks/c-sdk/ldap/libraries/libprldap/Makefile.in.orig 2008-09-11 16:38:35.000000000 +0200 ++++ directory/sdks/c-sdk/ldap/libraries/libprldap/Makefile.in 2009-12-09 08:53:46.000000000 +0100 @@ -147,6 +147,11 @@ CUSTOM_LIBS=1 endif diff --git a/mail/thunderbird-esr/files/patch-mozilla-js-ctypes-libffi-configure b/mail/thunderbird-esr/files/patch-mozilla-js-ctypes-libffi-configure new file mode 100644 index 000000000000..6a86c5e6fc39 --- /dev/null +++ b/mail/thunderbird-esr/files/patch-mozilla-js-ctypes-libffi-configure @@ -0,0 +1,14 @@ +B +--- mozilla/js/ctypes/libffi/configure.orig 2011-02-26 21:17:36.000000000 +0100 ++++ mozilla/js/ctypes/libffi/configure 2011-02-26 21:18:35.000000000 +0100 +@@ -21036,6 +21036,9 @@ + + powerpc-*-freebsd*) + TARGET=POWERPC_FREEBSD; TARGETDIR=powerpc + ;; ++ powerpc64-*-freebsd*) ++ TARGET=POWERPC; TARGETDIR=powerpc ++ ;; + powerpc*-*-rtems*) + TARGET=POWERPC; TARGETDIR=powerpc + ;; diff --git a/mail/thunderbird-esr/files/patch-mozilla-security_nss_lib_freebl_mpi_mpcpucache.c b/mail/thunderbird-esr/files/patch-mozilla-security_nss_lib_freebl_mpi_mpcpucache.c new file mode 100644 index 000000000000..e79b29942155 --- /dev/null +++ b/mail/thunderbird-esr/files/patch-mozilla-security_nss_lib_freebl_mpi_mpcpucache.c @@ -0,0 +1,43 @@ +--- mozilla/security/nss/lib/freebl/mpi/mpcpucache.c.orig 2011-02-26 23:13:08.000000000 +0100 ++++ mozilla/security/nss/lib/freebl/mpi/mpcpucache.c 2011-02-26 23:18:46.000000000 +0100 +@@ -733,6 +733,32 @@ + #endif + + #if defined(__ppc64__) ++#if defined(__FreeBSD__) ++#include <sys/stddef.h> ++#include <sys/sysctl.h> ++ ++#include <machine/cpu.h> ++#include <machine/md_var.h> ++ ++unsigned long ++s_mpi_getProcessorLineSize() ++{ ++ static int cacheline_size = 0; ++ static int cachemib[] = { CTL_MACHDEP, CPU_CACHELINE }; ++ int clen; ++ ++ if (cacheline_size > 0) ++ return cacheline_size; ++ ++ clen = sizeof(cacheline_size); ++ if (sysctl(cachemib, sizeof(cachemib) / sizeof(cachemib[0]), ++ &cacheline_size, &clen, NULL, 0) < 0 || !cacheline_size) ++ return 128; /* guess */ ++ ++ return cacheline_size; ++} ++#else /* __FreeBSD__ */ ++ + /* + * Sigh, The PPC has some really nice features to help us determine cache + * size, since it had lots of direct control functions to do so. The POWER +@@ -786,6 +812,7 @@ + return 0; + } + ++#endif /* __FreeBSD__ */ + #define MPI_GET_PROCESSOR_LINE_SIZE_DEFINED 1 + #endif + diff --git a/mail/thunderbird-esr/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in b/mail/thunderbird-esr/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in index a6fb01850aaa..7dd5b80a1ced 100644 --- a/mail/thunderbird-esr/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in +++ b/mail/thunderbird-esr/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in @@ -1,16 +1,16 @@ ---- mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2009-03-05 22:32:55.000000000 +0100 -+++ mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in 2009-04-21 14:15:46.135700268 +0200 -@@ -70,6 +70,9 @@ - ifeq (Darwin,$(OS_ARCH)) +--- mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2010-12-07 17:36:07.000000000 +0100 ++++ mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in 2011-02-26 21:30:36.000000000 +0100 +@@ -73,6 +73,9 @@ DEFINES += -DKEEP_STACK_16_BYTE_ALIGNED + CPPSRCS := xptcinvoke_unixish_x86.cpp xptcstubs_unixish_x86.cpp endif +ifeq (x86_64,$(OS_TEST)) +CPPSRCS := xptcinvoke_x86_64_linux.cpp xptcstubs_x86_64_linux.cpp +endif endif endif - # -@@ -87,7 +90,7 @@ + +@@ -96,7 +99,7 @@ endif endif # IA64 Linux @@ -19,8 +19,8 @@ ifneq (,$(findstring ia64,$(OS_TEST))) CPPSRCS := xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp ASFILES := xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s -@@ -100,6 +103,12 @@ - CPPSRCS := xptcinvoke_amd64_openbsd.cpp xptcstubs_amd64_openbsd.cpp +@@ -115,6 +118,12 @@ + CPPSRCS := xptcinvoke_amd64_linux.cpp xptcstubs_amd64_linux.cpp endif # +# FreeBSD/amd64 @@ -32,7 +32,7 @@ # BeOS/Intel (uses the same unixish_x86 code) # ifeq ($(OS_ARCH)$(OS_TEST),BeOSBePC) -@@ -150,9 +159,15 @@ +@@ -165,9 +174,15 @@ ASFILES := xptcinvoke_asm_osf1_alpha.s xptcstubs_asm_osf1_alpha.s endif # @@ -49,7 +49,7 @@ CPPSRCS := xptcinvoke_linux_alpha.cpp xptcstubs_linux_alpha.cpp endif # -@@ -307,7 +322,7 @@ +@@ -322,7 +337,7 @@ # # Linux/PPC # @@ -58,7 +58,16 @@ CPPSRCS := xptcinvoke_ppc_linux.cpp xptcstubs_ppc_linux.cpp ASFILES := xptcinvoke_asm_ppc_linux.s xptcstubs_asm_ppc_linux.s AS := $(CC) -c -x assembler-with-cpp -@@ -385,6 +400,15 @@ +@@ -331,7 +346,7 @@ + # + # Linux/PPC64 + # +-ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc64) ++ifneq (,$(filter Linuxpowerpc64 FreeBSDpowerpc64,$(OS_ARCH)$(OS_TEST))) + CPPSRCS := xptcinvoke_ppc64_linux.cpp xptcstubs_ppc64_linux.cpp + ASFILES := xptcinvoke_asm_ppc64_linux.s xptcstubs_asm_ppc64_linux.s + AS := $(CC) -c -x assembler-with-cpp +@@ -400,6 +415,15 @@ ASFILES := xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s endif # diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile index 99db2d545c1b..ecaf94a584c7 100644 --- a/mail/thunderbird/Makefile +++ b/mail/thunderbird/Makefile @@ -6,7 +6,7 @@ # PORTNAME= thunderbird -DISTVERSION= 3.1.7 +DISTVERSION= 3.1.8 CATEGORIES= mail ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${DISTVERSION}/source @@ -63,6 +63,15 @@ EXTRA_PATCHES= ${FILESDIR}/releng6_pulseaudio EXTRA_PATCHES= ${FILESDIR}/liboggplay_oss .endif +.if ${ARCH} == powerpc64 +.if ${OSVERSION} < 900033 +BROKEN= Needs binutils 2.17.50 to build +.else +CONFIGURE_ENV+= UNAME_m="powerpc64" +CFLAGS+= -mminimal-toc +.endif +.endif + GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 '%{\!pg: %{pthread:' | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE} .if ${HAVE_GNOME:Mlibgnomeui}!="" diff --git a/mail/thunderbird/distinfo b/mail/thunderbird/distinfo index c6ebbd83cb2a..844ada6ef895 100644 --- a/mail/thunderbird/distinfo +++ b/mail/thunderbird/distinfo @@ -1,2 +1,2 @@ -SHA256 (thunderbird-3.1.7.source.tar.bz2) = 800fe263b3889d4e602ff48889036ad56e940fc792894aca10fa07db28b6e662 -SIZE (thunderbird-3.1.7.source.tar.bz2) = 65948060 +SHA256 (thunderbird-3.1.8.source.tar.bz2) = ec4439efddc52d672eaaafdee707974c6a59ca6634c9084f7fc844a6ee0f4c8e +SIZE (thunderbird-3.1.8.source.tar.bz2) = 68613204 diff --git a/mail/thunderbird/files/patch-directory-c-sdk-ldap-libraries-libldap-Makefile.in b/mail/thunderbird/files/patch-directory-sdks-c-sdk-ldap-libraries-libldap-Makefile.in index b71a03a4567b..8a065107cd16 100644 --- a/mail/thunderbird/files/patch-directory-c-sdk-ldap-libraries-libldap-Makefile.in +++ b/mail/thunderbird/files/patch-directory-sdks-c-sdk-ldap-libraries-libldap-Makefile.in @@ -1,5 +1,5 @@ ---- directory/c-sdk/ldap/libraries/libldap/Makefile.in.orig 2009-11-10 09:56:42.000000000 +0100 -+++ directory/c-sdk/ldap/libraries/libldap/Makefile.in 2009-11-10 09:58:15.000000000 +0100 +--- directory/sdks/c-sdk/ldap/libraries/libldap/Makefile.in.orig 2009-11-10 09:56:42.000000000 +0100 ++++ directory/sdks/c-sdk/ldap/libraries/libldap/Makefile.in 2009-11-10 09:58:15.000000000 +0100 @@ -254,6 +254,10 @@ EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -lbe endif diff --git a/mail/thunderbird/files/patch-directory_c-sdk_ldap_libraries_libprldap_Makefile.in b/mail/thunderbird/files/patch-directory-sdks-c-sdk-ldap-libraries-libprldap-Makefile.in index ebf7f94ace1e..ff5e375f156b 100644 --- a/mail/thunderbird/files/patch-directory_c-sdk_ldap_libraries_libprldap_Makefile.in +++ b/mail/thunderbird/files/patch-directory-sdks-c-sdk-ldap-libraries-libprldap-Makefile.in @@ -1,5 +1,5 @@ ---- directory/c-sdk/ldap/libraries/libprldap/Makefile.in.orig 2008-09-11 16:38:35.000000000 +0200 -+++ directory/c-sdk/ldap/libraries/libprldap/Makefile.in 2009-12-09 08:53:46.000000000 +0100 +--- directory/sdks/c-sdk/ldap/libraries/libprldap/Makefile.in.orig 2008-09-11 16:38:35.000000000 +0200 ++++ directory/sdks/c-sdk/ldap/libraries/libprldap/Makefile.in 2009-12-09 08:53:46.000000000 +0100 @@ -147,6 +147,11 @@ CUSTOM_LIBS=1 endif diff --git a/mail/thunderbird/files/patch-mozilla-js-ctypes-libffi-configure b/mail/thunderbird/files/patch-mozilla-js-ctypes-libffi-configure new file mode 100644 index 000000000000..6a86c5e6fc39 --- /dev/null +++ b/mail/thunderbird/files/patch-mozilla-js-ctypes-libffi-configure @@ -0,0 +1,14 @@ +B +--- mozilla/js/ctypes/libffi/configure.orig 2011-02-26 21:17:36.000000000 +0100 ++++ mozilla/js/ctypes/libffi/configure 2011-02-26 21:18:35.000000000 +0100 +@@ -21036,6 +21036,9 @@ + + powerpc-*-freebsd*) + TARGET=POWERPC_FREEBSD; TARGETDIR=powerpc + ;; ++ powerpc64-*-freebsd*) ++ TARGET=POWERPC; TARGETDIR=powerpc ++ ;; + powerpc*-*-rtems*) + TARGET=POWERPC; TARGETDIR=powerpc + ;; diff --git a/mail/thunderbird/files/patch-mozilla-security_nss_lib_freebl_mpi_mpcpucache.c b/mail/thunderbird/files/patch-mozilla-security_nss_lib_freebl_mpi_mpcpucache.c new file mode 100644 index 000000000000..e79b29942155 --- /dev/null +++ b/mail/thunderbird/files/patch-mozilla-security_nss_lib_freebl_mpi_mpcpucache.c @@ -0,0 +1,43 @@ +--- mozilla/security/nss/lib/freebl/mpi/mpcpucache.c.orig 2011-02-26 23:13:08.000000000 +0100 ++++ mozilla/security/nss/lib/freebl/mpi/mpcpucache.c 2011-02-26 23:18:46.000000000 +0100 +@@ -733,6 +733,32 @@ + #endif + + #if defined(__ppc64__) ++#if defined(__FreeBSD__) ++#include <sys/stddef.h> ++#include <sys/sysctl.h> ++ ++#include <machine/cpu.h> ++#include <machine/md_var.h> ++ ++unsigned long ++s_mpi_getProcessorLineSize() ++{ ++ static int cacheline_size = 0; ++ static int cachemib[] = { CTL_MACHDEP, CPU_CACHELINE }; ++ int clen; ++ ++ if (cacheline_size > 0) ++ return cacheline_size; ++ ++ clen = sizeof(cacheline_size); ++ if (sysctl(cachemib, sizeof(cachemib) / sizeof(cachemib[0]), ++ &cacheline_size, &clen, NULL, 0) < 0 || !cacheline_size) ++ return 128; /* guess */ ++ ++ return cacheline_size; ++} ++#else /* __FreeBSD__ */ ++ + /* + * Sigh, The PPC has some really nice features to help us determine cache + * size, since it had lots of direct control functions to do so. The POWER +@@ -786,6 +812,7 @@ + return 0; + } + ++#endif /* __FreeBSD__ */ + #define MPI_GET_PROCESSOR_LINE_SIZE_DEFINED 1 + #endif + diff --git a/mail/thunderbird/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in b/mail/thunderbird/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in index a6fb01850aaa..7dd5b80a1ced 100644 --- a/mail/thunderbird/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in +++ b/mail/thunderbird/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in @@ -1,16 +1,16 @@ ---- mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2009-03-05 22:32:55.000000000 +0100 -+++ mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in 2009-04-21 14:15:46.135700268 +0200 -@@ -70,6 +70,9 @@ - ifeq (Darwin,$(OS_ARCH)) +--- mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2010-12-07 17:36:07.000000000 +0100 ++++ mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in 2011-02-26 21:30:36.000000000 +0100 +@@ -73,6 +73,9 @@ DEFINES += -DKEEP_STACK_16_BYTE_ALIGNED + CPPSRCS := xptcinvoke_unixish_x86.cpp xptcstubs_unixish_x86.cpp endif +ifeq (x86_64,$(OS_TEST)) +CPPSRCS := xptcinvoke_x86_64_linux.cpp xptcstubs_x86_64_linux.cpp +endif endif endif - # -@@ -87,7 +90,7 @@ + +@@ -96,7 +99,7 @@ endif endif # IA64 Linux @@ -19,8 +19,8 @@ ifneq (,$(findstring ia64,$(OS_TEST))) CPPSRCS := xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp ASFILES := xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s -@@ -100,6 +103,12 @@ - CPPSRCS := xptcinvoke_amd64_openbsd.cpp xptcstubs_amd64_openbsd.cpp +@@ -115,6 +118,12 @@ + CPPSRCS := xptcinvoke_amd64_linux.cpp xptcstubs_amd64_linux.cpp endif # +# FreeBSD/amd64 @@ -32,7 +32,7 @@ # BeOS/Intel (uses the same unixish_x86 code) # ifeq ($(OS_ARCH)$(OS_TEST),BeOSBePC) -@@ -150,9 +159,15 @@ +@@ -165,9 +174,15 @@ ASFILES := xptcinvoke_asm_osf1_alpha.s xptcstubs_asm_osf1_alpha.s endif # @@ -49,7 +49,7 @@ CPPSRCS := xptcinvoke_linux_alpha.cpp xptcstubs_linux_alpha.cpp endif # -@@ -307,7 +322,7 @@ +@@ -322,7 +337,7 @@ # # Linux/PPC # @@ -58,7 +58,16 @@ CPPSRCS := xptcinvoke_ppc_linux.cpp xptcstubs_ppc_linux.cpp ASFILES := xptcinvoke_asm_ppc_linux.s xptcstubs_asm_ppc_linux.s AS := $(CC) -c -x assembler-with-cpp -@@ -385,6 +400,15 @@ +@@ -331,7 +346,7 @@ + # + # Linux/PPC64 + # +-ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc64) ++ifneq (,$(filter Linuxpowerpc64 FreeBSDpowerpc64,$(OS_ARCH)$(OS_TEST))) + CPPSRCS := xptcinvoke_ppc64_linux.cpp xptcstubs_ppc64_linux.cpp + ASFILES := xptcinvoke_asm_ppc64_linux.s xptcstubs_asm_ppc64_linux.s + AS := $(CC) -c -x assembler-with-cpp +@@ -400,6 +415,15 @@ ASFILES := xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s endif # |