diff options
author | jbeich <jbeich@FreeBSD.org> | 2015-02-02 00:46:24 +0800 |
---|---|---|
committer | jbeich <jbeich@FreeBSD.org> | 2015-02-02 00:46:24 +0800 |
commit | 14e4ec632a2b40aae87663e4351f88849abdaaac (patch) | |
tree | d085c30a772b4eb3386ebc2cc2af5614cf6828d8 /devel | |
parent | 25d0abfdc715572f3f71ea7951173178019d73dc (diff) | |
download | freebsd-ports-graphics-14e4ec632a2b40aae87663e4351f88849abdaaac.tar.gz freebsd-ports-graphics-14e4ec632a2b40aae87663e4351f88849abdaaac.tar.zst freebsd-ports-graphics-14e4ec632a2b40aae87663e4351f88849abdaaac.zip |
- Update NSPR to 4.10.8
- Update NSS to 3.17.2
- Update Firefox to 35.0.1
Changes: http://mozilla.6506.n7.nabble.com/ANNOUNCE-NSPR-4-10-8-Release-td332365.html
Changes: https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_3.17.4_release_notes
Changes: https://www.mozilla.org/en-US/firefox/35.0.1/releasenotes/
Differential Revision: https://reviews.freebsd.org/D1736
Approved by: bapt (mentor)
Diffstat (limited to 'devel')
-rw-r--r-- | devel/nspr/Makefile | 2 | ||||
-rw-r--r-- | devel/nspr/distinfo | 4 | ||||
-rw-r--r-- | devel/nspr/files/patch-bug782113 | 165 | ||||
-rw-r--r-- | devel/nspr/files/patch-bug782124 | 37 |
4 files changed, 3 insertions, 205 deletions
diff --git a/devel/nspr/Makefile b/devel/nspr/Makefile index d4f1d85ae85..62967eedc92 100644 --- a/devel/nspr/Makefile +++ b/devel/nspr/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= nspr -DISTVERSION= 4.10.7 +DISTVERSION= 4.10.8 CATEGORIES= devel MASTER_SITES= MOZILLA/${PORTNAME}/releases/v${PORTVERSION}/src diff --git a/devel/nspr/distinfo b/devel/nspr/distinfo index e7db98c713a..bd1609d13f9 100644 --- a/devel/nspr/distinfo +++ b/devel/nspr/distinfo @@ -1,2 +1,2 @@ -SHA256 (nspr-4.10.7.tar.gz) = 389af5cfa863ea9bc6de7b30c15f8a4f9bddd8002f8c6fdc8b33caef43893938 -SIZE (nspr-4.10.7.tar.gz) = 1131171 +SHA256 (nspr-4.10.8.tar.gz) = 507ea57c525c0c524dae4857a642b4ef5c9d795518754c7f83422d22fe544a15 +SIZE (nspr-4.10.8.tar.gz) = 1131130 diff --git a/devel/nspr/files/patch-bug782113 b/devel/nspr/files/patch-bug782113 deleted file mode 100644 index 46c2d733f14..00000000000 --- a/devel/nspr/files/patch-bug782113 +++ /dev/null @@ -1,165 +0,0 @@ ---- ../pr/include/md/_freebsd.cfg -+++ ../pr/include/md/_freebsd.cfg -@@ -251,6 +251,147 @@ - #define PR_ALIGN_OF_POINTER 8 - #define PR_ALIGN_OF_WORD 8 - -+#elif defined(__powerpc64__) -+ -+#undef IS_LITTLE_ENDIAN -+#define IS_BIG_ENDIAN 1 -+#define IS_64 -+ -+#define PR_BYTES_PER_BYTE 1 -+#define PR_BYTES_PER_SHORT 2 -+#define PR_BYTES_PER_INT 4 -+#define PR_BYTES_PER_INT64 8 -+#define PR_BYTES_PER_LONG 8 -+#define PR_BYTES_PER_FLOAT 4 -+#define PR_BYTES_PER_DOUBLE 8 -+#define PR_BYTES_PER_WORD 8 -+#define PR_BYTES_PER_DWORD 8 -+ -+#define PR_BITS_PER_BYTE 8 -+#define PR_BITS_PER_SHORT 16 -+#define PR_BITS_PER_INT 32 -+#define PR_BITS_PER_INT64 64 -+#define PR_BITS_PER_LONG 64 -+#define PR_BITS_PER_FLOAT 32 -+#define PR_BITS_PER_DOUBLE 64 -+#define PR_BITS_PER_WORD 64 -+ -+#define PR_BITS_PER_BYTE_LOG2 3 -+#define PR_BITS_PER_SHORT_LOG2 4 -+#define PR_BITS_PER_INT_LOG2 5 -+#define PR_BITS_PER_INT64_LOG2 6 -+#define PR_BITS_PER_LONG_LOG2 6 -+#define PR_BITS_PER_FLOAT_LOG2 5 -+#define PR_BITS_PER_DOUBLE_LOG2 6 -+#define PR_BITS_PER_WORD_LOG2 6 -+ -+#define PR_ALIGN_OF_SHORT 2 -+#define PR_ALIGN_OF_INT 4 -+#define PR_ALIGN_OF_LONG 8 -+#define PR_ALIGN_OF_INT64 8 -+#define PR_ALIGN_OF_FLOAT 4 -+#define PR_ALIGN_OF_DOUBLE 8 -+#define PR_ALIGN_OF_POINTER 8 -+#define PR_ALIGN_OF_WORD 8 -+ -+#define PR_BYTES_PER_WORD_LOG2 3 -+#define PR_BYTES_PER_DWORD_LOG2 3 -+ -+#elif defined(__powerpc__) -+ -+#undef IS_LITTLE_ENDIAN -+#define IS_BIG_ENDIAN 1 -+ -+#define PR_BYTES_PER_BYTE 1 -+#define PR_BYTES_PER_SHORT 2 -+#define PR_BYTES_PER_INT 4 -+#define PR_BYTES_PER_INT64 8 -+#define PR_BYTES_PER_LONG 4 -+#define PR_BYTES_PER_FLOAT 4 -+#define PR_BYTES_PER_DOUBLE 8 -+#define PR_BYTES_PER_WORD 4 -+#define PR_BYTES_PER_DWORD 8 -+ -+#define PR_BITS_PER_BYTE 8 -+#define PR_BITS_PER_SHORT 16 -+#define PR_BITS_PER_INT 32 -+#define PR_BITS_PER_INT64 64 -+#define PR_BITS_PER_LONG 32 -+#define PR_BITS_PER_FLOAT 32 -+#define PR_BITS_PER_DOUBLE 64 -+#define PR_BITS_PER_WORD 32 -+ -+#define PR_BITS_PER_BYTE_LOG2 3 -+#define PR_BITS_PER_SHORT_LOG2 4 -+#define PR_BITS_PER_INT_LOG2 5 -+#define PR_BITS_PER_INT64_LOG2 6 -+#define PR_BITS_PER_LONG_LOG2 5 -+#define PR_BITS_PER_FLOAT_LOG2 5 -+#define PR_BITS_PER_DOUBLE_LOG2 6 -+#define PR_BITS_PER_WORD_LOG2 5 -+ -+#define PR_ALIGN_OF_SHORT 2 -+#define PR_ALIGN_OF_INT 4 -+#define PR_ALIGN_OF_LONG 4 -+#define PR_ALIGN_OF_INT64 8 -+#define PR_ALIGN_OF_FLOAT 4 -+#define PR_ALIGN_OF_DOUBLE 8 -+#define PR_ALIGN_OF_POINTER 4 -+#define PR_ALIGN_OF_WORD 4 -+ -+#define PR_BYTES_PER_WORD_LOG2 2 -+#define PR_BYTES_PER_DWORD_LOG2 3 -+ -+#elif defined(__arm__) -+ -+#if defined(__ARMEB__) || defined(__ARM_BIG_ENDIAN__) -+#undef IS_LITTLE_ENDIAN -+#define IS_BIG_ENDIAN 1 -+#else -+#undef IS_BIG_ENDIAN -+#define IS_LITTLE_ENDIAN 1 -+#endif -+ -+#define PR_BYTES_PER_BYTE 1 -+#define PR_BYTES_PER_SHORT 2 -+#define PR_BYTES_PER_INT 4 -+#define PR_BYTES_PER_INT64 8 -+#define PR_BYTES_PER_LONG 4 -+#define PR_BYTES_PER_FLOAT 4 -+#define PR_BYTES_PER_DOUBLE 8 -+#define PR_BYTES_PER_WORD 4 -+#define PR_BYTES_PER_DWORD 8 -+ -+#define PR_BITS_PER_BYTE 8 -+#define PR_BITS_PER_SHORT 16 -+#define PR_BITS_PER_INT 32 -+#define PR_BITS_PER_INT64 64 -+#define PR_BITS_PER_LONG 32 -+#define PR_BITS_PER_FLOAT 32 -+#define PR_BITS_PER_DOUBLE 64 -+#define PR_BITS_PER_WORD 32 -+ -+#define PR_BITS_PER_BYTE_LOG2 3 -+#define PR_BITS_PER_SHORT_LOG2 4 -+#define PR_BITS_PER_INT_LOG2 5 -+#define PR_BITS_PER_INT64_LOG2 6 -+#define PR_BITS_PER_LONG_LOG2 5 -+#define PR_BITS_PER_FLOAT_LOG2 5 -+#define PR_BITS_PER_DOUBLE_LOG2 6 -+#define PR_BITS_PER_WORD_LOG2 5 -+ -+#define PR_ALIGN_OF_SHORT 2 -+#define PR_ALIGN_OF_INT 4 -+#define PR_ALIGN_OF_LONG 4 -+#define PR_ALIGN_OF_INT64 8 -+#define PR_ALIGN_OF_FLOAT 4 -+#define PR_ALIGN_OF_DOUBLE 8 -+#define PR_ALIGN_OF_POINTER 4 -+#define PR_ALIGN_OF_WORD 4 -+ -+#define PR_BYTES_PER_WORD_LOG2 2 -+#define PR_BYTES_PER_DWORD_LOG2 3 -+ - #else - - #error "Unknown CPU architecture" ---- ../pr/include/md/_freebsd.h -+++ ../pr/include/md/_freebsd.h -@@ -25,6 +25,12 @@ - #define _PR_SI_ARCHITECTURE "ia64" - #elif defined(__amd64__) - #define _PR_SI_ARCHITECTURE "amd64" -+#elif defined(__powerpc64__) -+#define _PR_SI_ARCHITECTURE "powerpc64" -+#elif defined(__powerpc__) -+#define _PR_SI_ARCHITECTURE "powerpc" -+#elif defined(__arm__) -+#define _PR_SI_ARCHITECTURE "arm" - #else - #error "Unknown CPU architecture" - #endif diff --git a/devel/nspr/files/patch-bug782124 b/devel/nspr/files/patch-bug782124 deleted file mode 100644 index 3f24011274d..00000000000 --- a/devel/nspr/files/patch-bug782124 +++ /dev/null @@ -1,37 +0,0 @@ ---- ../pr/src/misc/prsystem.c~ -+++ ../pr/src/misc/prsystem.c -@@ -24,7 +24,7 @@ - - /* BSD-derived systems use sysctl() to get the number of processors */ - #if defined(BSDI) || defined(FREEBSD) || defined(NETBSD) \ -- || defined(OPENBSD) || defined(DARWIN) -+ || defined(OPENBSD) || defined(DRAGONFLY) || defined(DARWIN) - #define _PR_HAVE_SYSCTL - #include <sys/param.h> - #include <sys/sysctl.h> -@@ -292,15 +292,23 @@ PR_IMPLEMENT(PRUint64) PR_GetPhysicalMemorySize(void) - if (pageSize >= 0 && pageCount >= 0) - bytes = (PRUint64) pageSize * pageCount; - --#elif defined(NETBSD) || defined(OPENBSD) -- -+#elif defined(NETBSD) || defined(OPENBSD) \ -+ || defined(FREEBSD) || defined(DRAGONFLY) - int mib[2]; - int rc; -+#ifdef HW_PHYSMEM64 - uint64_t memSize; -+#else -+ unsigned long memSize; -+#endif - size_t len = sizeof(memSize); - - mib[0] = CTL_HW; -+#ifdef HW_PHYSMEM64 - mib[1] = HW_PHYSMEM64; -+#else -+ mib[1] = HW_PHYSMEM; -+#endif - rc = sysctl(mib, 2, &memSize, &len, NULL, 0); - if (-1 != rc) { - bytes = memSize; |