diff options
author | Beat Gaetzi <beat@FreeBSD.org> | 2011-12-22 07:17:59 +0000 |
---|---|---|
committer | Beat Gaetzi <beat@FreeBSD.org> | 2011-12-22 07:17:59 +0000 |
commit | 9bff2d2e5e425e9b840fcd26df9acdad968055c2 (patch) | |
tree | 9ff05ea2d0d2b37adac880c6c7379202067705af /mail/thunderbird-esr | |
parent | db09ebfdf55fb8147c90591987493460e47b2324 (diff) |
Notes
Diffstat (limited to 'mail/thunderbird-esr')
5 files changed, 60 insertions, 37 deletions
diff --git a/mail/thunderbird-esr/Makefile b/mail/thunderbird-esr/Makefile index 666fcc22a6a0..987f409a4688 100644 --- a/mail/thunderbird-esr/Makefile +++ b/mail/thunderbird-esr/Makefile @@ -6,7 +6,7 @@ # PORTNAME= thunderbird -DISTVERSION= 8.0 +DISTVERSION= 9.0 CATEGORIES= mail ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${DISTVERSION}/source diff --git a/mail/thunderbird-esr/distinfo b/mail/thunderbird-esr/distinfo index 39f5d2ac7dd1..6aeac63722d0 100644 --- a/mail/thunderbird-esr/distinfo +++ b/mail/thunderbird-esr/distinfo @@ -1,2 +1,2 @@ -SHA256 (thunderbird-8.0.source.tar.bz2) = f728bd2dbc04e6c3a096d79a9ee320740f53794a28be307da8655c8fd90f77f5 -SIZE (thunderbird-8.0.source.tar.bz2) = 89435206 +SHA256 (thunderbird-9.0.source.tar.bz2) = 6f6c40b1c1e3c3cbf3de4dbd9465a5383b0596cb9a97ba8eee7daaade52aa40c +SIZE (thunderbird-9.0.source.tar.bz2) = 96194907 diff --git a/mail/thunderbird-esr/files/patch-configure.in b/mail/thunderbird-esr/files/patch-configure.in index 56c07e868572..4e91d33a273a 100644 --- a/mail/thunderbird-esr/files/patch-configure.in +++ b/mail/thunderbird-esr/files/patch-configure.in @@ -1,6 +1,6 @@ ---- configure.in.orig 2011-07-15 07:42:33.000000000 +0200 -+++ configure.in 2011-07-22 13:43:44.000000000 +0200 -@@ -1438,7 +1438,7 @@ +--- configure.in.orig 2011-12-19 14:48:06.000000000 +0100 ++++ configure.in 2011-12-19 15:51:19.000000000 +0100 +@@ -1410,7 +1410,7 @@ CPU_ARCH=sparc ;; @@ -9,7 +9,7 @@ CPU_ARCH="$OS_TEST" ;; -@@ -1458,7 +1458,7 @@ +@@ -1430,7 +1430,7 @@ dnl =============================================================== INTEL_ARCHITECTURE= case "$OS_TEST" in @@ -18,7 +18,7 @@ INTEL_ARCHITECTURE=1 esac -@@ -1781,7 +1781,7 @@ +@@ -1753,7 +1753,7 @@ esac case "${host_cpu}" in @@ -27,7 +27,7 @@ HOST_CFLAGS="$HOST_CFLAGS -D_AMD64_" ;; esac -@@ -2437,6 +2437,9 @@ +@@ -2415,6 +2415,9 @@ x86_64-*) AC_DEFINE(_AMD64_) ;; @@ -37,7 +37,7 @@ *) AC_DEFINE(_CPU_ARCH_NOT_DEFINED) ;; -@@ -2508,7 +2511,7 @@ +@@ -2486,7 +2489,7 @@ else DLL_SUFFIX=".so.1.0" fi @@ -46,7 +46,7 @@ DSO_CFLAGS='' DSO_PIC_CFLAGS='-fPIC' DSO_LDOPTS='-shared -fPIC' -@@ -3326,11 +3329,11 @@ +@@ -3304,11 +3307,11 @@ ;; *) MOZ_CHECK_PTHREADS(pthreads, @@ -61,7 +61,7 @@ MOZ_CHECK_PTHREADS(c, USE_PTHREADS=1 ) -@@ -3405,18 +3408,18 @@ +@@ -3383,18 +3386,18 @@ *-*-freebsd*) AC_DEFINE(_REENTRANT) AC_DEFINE(_THREAD_SAFE) @@ -83,7 +83,7 @@ if test "$ac_cv_have_dash_pthread" = "yes"; then _PTHREAD_LDFLAGS="-pthread" fi -@@ -3591,7 +3594,7 @@ +@@ -3569,7 +3572,7 @@ ac_cv_func_iconv, [AC_TRY_LINK([ #include <stdlib.h> @@ -92,7 +92,7 @@ ], [ iconv_t h = iconv_open("", ""); -@@ -3612,7 +3615,7 @@ +@@ -3590,7 +3593,7 @@ ac_cv_func_const_iconv, [AC_TRY_COMPILE([ #include <stdlib.h> @@ -101,7 +101,7 @@ ], [ const char *input = "testing"; -@@ -4409,7 +4412,7 @@ +@@ -4383,7 +4386,7 @@ LDFLAGS=$_SAVE_LDFLAGS LIBS=$_SAVE_LIBS @@ -110,12 +110,3 @@ ZLIB_CFLAGS="-I${ZLIB_DIR}/include" ZLIB_LIBS="-L${ZLIB_DIR}/lib ${ZLIB_LIBS}" fi -@@ -5966,7 +5969,7 @@ - i*86) - MOZ_CRT_CPU_ARCH=intel - ;; -- x86_64) -+ amd64 | x86_64) - MOZ_CRT_CPU_ARCH=amd64 - ;; - *) diff --git a/mail/thunderbird-esr/files/patch-ipc-chromium-src-base-file_util.h b/mail/thunderbird-esr/files/patch-ipc-chromium-src-base-file_util.h deleted file mode 100644 index 81a4693140a8..000000000000 --- a/mail/thunderbird-esr/files/patch-ipc-chromium-src-base-file_util.h +++ /dev/null @@ -1,13 +0,0 @@ ---- mozilla/ipc/chromium/src/base/file_util.h~ -+++ mozilla/ipc/chromium/src/base/file_util.h -@@ -15,8 +15,9 @@ - #elif defined(ANDROID) - #include <sys/stat.h> - #elif defined(OS_POSIX) -+#include <sys/types.h> -+#include <sys/stat.h> - #include <fts.h> --#include <sys/stat.h> - #endif - - #include <stdio.h> diff --git a/mail/thunderbird-esr/files/patch-mozilla-ipc-chromium-src-base-dir_reader_linux.h b/mail/thunderbird-esr/files/patch-mozilla-ipc-chromium-src-base-dir_reader_linux.h new file mode 100644 index 000000000000..5c4e5b79f3d1 --- /dev/null +++ b/mail/thunderbird-esr/files/patch-mozilla-ipc-chromium-src-base-dir_reader_linux.h @@ -0,0 +1,45 @@ +--- mozilla/ipc/chromium/src/base/dir_reader_linux.h.orig 2011-12-16 21:29:22.000000000 +0100 ++++ mozilla/ipc/chromium/src/base/dir_reader_linux.h 2011-12-19 21:00:27.000000000 +0100 +@@ -9,6 +9,7 @@ + #include <errno.h> + #include <fcntl.h> + #include <stdint.h> ++#include <sys/dirent.h> + #include <sys/syscall.h> + #include <unistd.h> + +@@ -19,6 +20,8 @@ + + namespace base { + ++#define linux_dirent struct dirent ++#if 0 + struct linux_dirent { + uint64_t d_ino; + int64_t d_off; +@@ -26,11 +29,16 @@ + unsigned char d_type; + char d_name[0]; + }; ++#endif + + class DirReaderLinux { + public: + explicit DirReaderLinux(const char* directory_path) ++#ifdef O_DIRECTORY + : fd_(open(directory_path, O_RDONLY | O_DIRECTORY)), ++#else ++ : fd_(open(directory_path, O_RDONLY)), ++#endif + offset_(0), + size_(0) { + memset(buf_, 0, sizeof(buf_)); +@@ -57,7 +65,7 @@ + if (offset_ != size_) + return true; + +- const int r = syscall(__NR_getdents64, fd_, buf_, sizeof(buf_)); ++ const int r = syscall(SYS_getdents, fd_, buf_, sizeof(buf_)); + if (r == 0) + return false; + if (r == -1) { |