diff options
author | Raúl Porcel <armin76@gentoo.org> | 2007-04-20 13:22:26 +0000 |
---|---|---|
committer | Raúl Porcel <armin76@gentoo.org> | 2007-04-20 13:22:26 +0000 |
commit | 983046274ac1e4347ecdf97caba90c0086245150 (patch) | |
tree | 92898132165532a47b714b08b407c5158dad9db5 /dev-libs/nspr/files | |
parent | Version bump, closes bug #170106. (diff) | |
download | gentoo-2-983046274ac1e4347ecdf97caba90c0086245150.tar.gz gentoo-2-983046274ac1e4347ecdf97caba90c0086245150.tar.bz2 gentoo-2-983046274ac1e4347ecdf97caba90c0086245150.zip |
Cleanup
(Portage version: 2.1.2.4)
Diffstat (limited to 'dev-libs/nspr/files')
-rw-r--r-- | dev-libs/nspr/files/digest-nspr-4.6.3 | 3 | ||||
-rw-r--r-- | dev-libs/nspr/files/digest-nspr-4.6.3-r1 | 3 | ||||
-rw-r--r-- | dev-libs/nspr/files/digest-nspr-4.6.4 | 3 | ||||
-rw-r--r-- | dev-libs/nspr/files/digest-nspr-4.6.4-r3 | 3 | ||||
-rw-r--r-- | dev-libs/nspr/files/nspr-4.3-amd64.patch | 224 | ||||
-rw-r--r-- | dev-libs/nspr/files/nspr-4.4.1-hppa.patch | 133 | ||||
-rw-r--r-- | dev-libs/nspr/files/nspr-4.4.1-ppc64.patch | 71 | ||||
-rw-r--r-- | dev-libs/nspr/files/nspr-4.6.3-fbsd62.patch | 16 |
8 files changed, 0 insertions, 456 deletions
diff --git a/dev-libs/nspr/files/digest-nspr-4.6.3 b/dev-libs/nspr/files/digest-nspr-4.6.3 deleted file mode 100644 index ea0a022c4dd6..000000000000 --- a/dev-libs/nspr/files/digest-nspr-4.6.3 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 d529cf2d1676e4c38bf7d530098865e6 nspr-4.6.3.tar.gz 1301965 -RMD160 b9cdde13afabfc6af02817781b2ca274ce5588b6 nspr-4.6.3.tar.gz 1301965 -SHA256 69f323e359a4751c883fbfc3affe5ea255fc89e77107e97736d2440bc22010d1 nspr-4.6.3.tar.gz 1301965 diff --git a/dev-libs/nspr/files/digest-nspr-4.6.3-r1 b/dev-libs/nspr/files/digest-nspr-4.6.3-r1 deleted file mode 100644 index ea0a022c4dd6..000000000000 --- a/dev-libs/nspr/files/digest-nspr-4.6.3-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 d529cf2d1676e4c38bf7d530098865e6 nspr-4.6.3.tar.gz 1301965 -RMD160 b9cdde13afabfc6af02817781b2ca274ce5588b6 nspr-4.6.3.tar.gz 1301965 -SHA256 69f323e359a4751c883fbfc3affe5ea255fc89e77107e97736d2440bc22010d1 nspr-4.6.3.tar.gz 1301965 diff --git a/dev-libs/nspr/files/digest-nspr-4.6.4 b/dev-libs/nspr/files/digest-nspr-4.6.4 deleted file mode 100644 index bda30b21c53b..000000000000 --- a/dev-libs/nspr/files/digest-nspr-4.6.4 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 43db60ab2ff1599c17d3a3f55caa7d47 nspr-4.6.4.tar.gz 1301886 -RMD160 d893554bc49c13787ec33bd2c7580f51bf8e89ac nspr-4.6.4.tar.gz 1301886 -SHA256 49e12321adb3eacf8dac5f799ab52fb1a797021fcb2893736e7bfbd517a02413 nspr-4.6.4.tar.gz 1301886 diff --git a/dev-libs/nspr/files/digest-nspr-4.6.4-r3 b/dev-libs/nspr/files/digest-nspr-4.6.4-r3 deleted file mode 100644 index bda30b21c53b..000000000000 --- a/dev-libs/nspr/files/digest-nspr-4.6.4-r3 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 43db60ab2ff1599c17d3a3f55caa7d47 nspr-4.6.4.tar.gz 1301886 -RMD160 d893554bc49c13787ec33bd2c7580f51bf8e89ac nspr-4.6.4.tar.gz 1301886 -SHA256 49e12321adb3eacf8dac5f799ab52fb1a797021fcb2893736e7bfbd517a02413 nspr-4.6.4.tar.gz 1301886 diff --git a/dev-libs/nspr/files/nspr-4.3-amd64.patch b/dev-libs/nspr/files/nspr-4.3-amd64.patch deleted file mode 100644 index e284b635f2d1..000000000000 --- a/dev-libs/nspr/files/nspr-4.3-amd64.patch +++ /dev/null @@ -1,224 +0,0 @@ -diff -ruN mozilla.old/nsprpub/configure mozilla/nsprpub/configure ---- mozilla.old/nsprpub/configure 2003-05-19 15:05:42.000000000 -0400 -+++ mozilla/nsprpub/configure 2003-09-27 16:20:55.085325144 -0400 -@@ -3729,6 +3729,9 @@ - ia64) - PR_MD_ASFILES=os_Linux_ia64.s - ;; -+ x86_64) -+ PR_MD_ASFILES=os_Linux_x86_64.s -+ ;; - m68k) - CFLAGS="$CFLAGS -m68020-60" - CXXFLAGS="$CXXFLAGS -m68020-60" -diff -ruN mozilla.old/nsprpub/configure.in mozilla/nsprpub/configure.in ---- mozilla.old/nsprpub/configure.in 2003-05-19 15:05:48.000000000 -0400 -+++ mozilla/nsprpub/configure.in 2003-09-27 16:20:55.077326360 -0400 -@@ -1218,6 +1218,9 @@ - ia64) - PR_MD_ASFILES=os_Linux_ia64.s - ;; -+ x86_64) -+ PR_MD_ASFILES=os_Linux_x86_64.s -+ ;; - m68k) - CFLAGS="$CFLAGS -m68020-60" - CXXFLAGS="$CXXFLAGS -m68020-60" -diff -ruN mozilla.old/nsprpub/pr/include/md/_linux.cfg mozilla/nsprpub/pr/include/md/_linux.cfg ---- mozilla.old/nsprpub/pr/include/md/_linux.cfg 2003-02-26 18:53:38.000000000 -0500 -+++ mozilla/nsprpub/pr/include/md/_linux.cfg 2003-09-27 16:20:55.053330008 -0400 -@@ -182,6 +182,52 @@ - #define PR_BYTES_PER_WORD_LOG2 3 - #define PR_BYTES_PER_DWORD_LOG2 3 - -+#elif defined(__x86_64__) -+ -+#define IS_LITTLE_ENDIAN 1 -+#undef IS_BIG_ENDIAN -+#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(__mc68000__) - - #undef IS_LITTLE_ENDIAN -diff -ruN mozilla.old/nsprpub/pr/include/md/_linux.h mozilla/nsprpub/pr/include/md/_linux.h ---- mozilla.old/nsprpub/pr/include/md/_linux.h 2003-02-26 18:53:39.000000000 -0500 -+++ mozilla/nsprpub/pr/include/md/_linux.h 2003-09-27 16:20:55.053330008 -0400 -@@ -49,6 +49,8 @@ - #define _PR_SI_ARCHITECTURE "alpha" - #elif defined(__ia64__) - #define _PR_SI_ARCHITECTURE "ia64" -+#elif defined(__x86_64__) -+#define _PR_SI_ARCHITECTURE "x86-64" - #elif defined(__mc68000__) - #define _PR_SI_ARCHITECTURE "m68k" - #elif defined(__sparc__) -@@ -107,6 +109,19 @@ - #define _MD_ATOMIC_SET _PR_ia64_AtomicSet - #endif - -+#if defined(__x86_64__) -+#define _PR_HAVE_ATOMIC_OPS -+#define _MD_INIT_ATOMIC() -+extern PRInt32 _PR_x86_64_AtomicIncrement(PRInt32 *val); -+#define _MD_ATOMIC_INCREMENT _PR_x86_64_AtomicIncrement -+extern PRInt32 _PR_x86_64_AtomicDecrement(PRInt32 *val); -+#define _MD_ATOMIC_DECREMENT _PR_x86_64_AtomicDecrement -+extern PRInt32 _PR_x86_64_AtomicAdd(PRInt32 *ptr, PRInt32 val); -+#define _MD_ATOMIC_ADD _PR_x86_64_AtomicAdd -+extern PRInt32 _PR_x86_64_AtomicSet(PRInt32 *val, PRInt32 newval); -+#define _MD_ATOMIC_SET _PR_x86_64_AtomicSet -+#endif -+ - #define USE_SETJMP - #if defined(__GLIBC__) && __GLIBC__ >= 2 - #define _PR_POLL_AVAILABLE -diff -ruN mozilla.old/nsprpub/pr/src/io/prprf.c mozilla/nsprpub/pr/src/io/prprf.c ---- mozilla.old/nsprpub/pr/src/io/prprf.c 2003-02-26 18:53:42.000000000 -0500 -+++ mozilla/nsprpub/pr/src/io/prprf.c 2003-09-27 16:20:55.068327728 -0400 -@@ -51,7 +51,10 @@ - ** Note: on some platforms va_list is defined as an array, - ** and requires array notation. - */ --#if (defined(LINUX) && defined(__powerpc__)) || \ -+#if (defined(LINUX) && defined(__x86_64__)) -+#include <stdarg.h> -+#define VARARGS_ASSIGN(foo, bar) __va_copy((foo), (bar)) -+#elif (defined(LINUX) && defined(__powerpc__)) || \ - (defined(LINUX) && defined(__s390__)) || \ - (defined(LINUX) && defined(__s390x__)) || \ - defined(WIN16) || defined(QNX) || \ -diff -ruN mozilla.old/nsprpub/pr/src/md/unix/os_Linux_x86_64.s mozilla/nsprpub/pr/src/md/unix/os_Linux_x86_64.s ---- mozilla.old/nsprpub/pr/src/md/unix/os_Linux_x86_64.s 1969-12-31 19:00:00.000000000 -0500 -+++ mozilla/nsprpub/pr/src/md/unix/os_Linux_x86_64.s 2003-09-27 16:20:55.068327728 -0400 -@@ -0,0 +1,91 @@ -+/ -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- -+/ -+/ The contents of this file are subject to the Mozilla Public -+/ License Version 1.1 (the "License"); you may not use this file -+/ except in compliance with the License. You may obtain a copy of -+/ the License at http://www.mozilla.org/MPL/ -+/ -+/ Software distributed under the License is distributed on an "AS -+/ IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -+/ implied. See the License for the specific language governing -+/ rights and limitations under the License. -+/ -+/ The Original Code is the Netscape Portable Runtime (NSPR). -+/ -+/ The Initial Developer of the Original Code is Netscape -+/ Communications Corporation. Portions created by Netscape are -+/ Copyright (C) 2000 Netscape Communications Corporation. All -+/ Rights Reserved. -+/ -+/ Contributor(s): -+/ -+/ Alternatively, the contents of this file may be used under the -+/ terms of the GNU General Public License Version 2 or later (the -+/ "GPL"), in which case the provisions of the GPL are applicable -+/ instead of those above. If you wish to allow use of your -+/ version of this file only under the terms of the GPL and not to -+/ allow others to use your version of this file under the MPL, -+/ indicate your decision by deleting the provisions above and -+/ replace them with the notice and other provisions required by -+/ the GPL. If you do not delete the provisions above, a recipient -+/ may use your version of this file under either the MPL or the -+/ GPL. -+/ -+ -+/ PRInt32 _PR_x86_64_AtomicIncrement(PRInt32 *val) -+/ -+/ Atomically increment the integer pointed to by 'val' and return -+/ the result of the increment. -+/ -+ .text -+ .globl _PR_x86_64_AtomicIncrement -+ .align 4 -+_PR_x86_64_AtomicIncrement: -+ movl $1, %eax -+ lock -+ xaddl %eax, (%rdi) -+ incl %eax -+ ret -+ -+/ PRInt32 _PR_x86_64_AtomicDecrement(PRInt32 *val) -+/ -+/ Atomically decrement the integer pointed to by 'val' and return -+/ the result of the decrement. -+/ -+ .text -+ .globl _PR_x86_64_AtomicDecrement -+ .align 4 -+_PR_x86_64_AtomicDecrement: -+ movl $-1, %eax -+ lock -+ xaddl %eax, (%rdi) -+ decl %eax -+ ret -+ -+/ PRInt32 _PR_x86_64_AtomicSet(PRInt32 *val, PRInt32 newval) -+/ -+/ Atomically set the integer pointed to by 'val' to the new -+/ value 'newval' and return the old value. -+ .text -+ .globl _PR_x86_64_AtomicSet -+ .align 4 -+_PR_x86_64_AtomicSet: -+ movl %esi, %eax -+ lock -+ xchgl %eax, (%rdi) -+ ret -+ -+/ PRInt32 _PR_x86_64_AtomicAdd(PRInt32 *ptr, PRInt32 val) -+/ -+/ Atomically add 'val' to the integer pointed to by 'ptr' -+/ and return the result of the addition. -+/ -+ .text -+ .globl _PR_x86_64_AtomicAdd -+ .align 4 -+_PR_x86_64_AtomicAdd: -+ movl %esi, %eax -+ lock -+ xaddl %eax, (%rdi) -+ addl %esi, %eax -+ ret diff --git a/dev-libs/nspr/files/nspr-4.4.1-hppa.patch b/dev-libs/nspr/files/nspr-4.4.1-hppa.patch deleted file mode 100644 index 33b1c5494eba..000000000000 --- a/dev-libs/nspr/files/nspr-4.4.1-hppa.patch +++ /dev/null @@ -1,133 +0,0 @@ -diff -uNr nspr-4.4.1.orig/mozilla/nsprpub/config/Linux.mk nspr-4.4.1/mozilla/nsprpub/config/Linux.mk ---- nspr-4.4.1.orig/mozilla/nsprpub/config/Linux.mk 2004-04-05 15:09:53.000000000 +0000 -+++ nspr-4.4.1/mozilla/nsprpub/config/Linux.mk 2004-04-05 15:10:21.000000000 +0000 -@@ -66,12 +66,17 @@ - ifeq (86,$(findstring 86,$(OS_TEST))) - CPU_ARCH := x86 - else -+ifeq ($(OS_TEST),parisc) -+OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -+CPU_ARCH = hppa -+else - ifeq (,$(filter-out arm% sa110,$(OS_TEST))) - CPU_ARCH := arm - else - CPU_ARCH := $(OS_TEST) - endif - endif -+endif - CPU_ARCH_TAG = _$(CPU_ARCH) - - CC = gcc -diff -uNr nspr-4.4.1.orig/mozilla/nsprpub/pr/include/md/_linux.cfg nspr-4.4.1/mozilla/nsprpub/pr/include/md/_linux.cfg ---- nspr-4.4.1.orig/mozilla/nsprpub/pr/include/md/_linux.cfg 2004-04-05 15:09:54.000000000 +0000 -+++ nspr-4.4.1/mozilla/nsprpub/pr/include/md/_linux.cfg 2004-04-05 15:10:21.000000000 +0000 -@@ -414,6 +414,96 @@ - #define PR_BYTES_PER_WORD_LOG2 2 - #define PR_BYTES_PER_DWORD_LOG2 3 - -+#elif defined(__hppa__) -+ -+#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(__hppa__) -+ -+#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(__s390__) - - #define IS_BIG_ENDIAN 1 -diff -uNr nspr-4.4.1.orig/mozilla/nsprpub/pr/include/md/_linux.h nspr-4.4.1/mozilla/nsprpub/pr/include/md/_linux.h ---- nspr-4.4.1.orig/mozilla/nsprpub/pr/include/md/_linux.h 2004-04-05 15:09:54.000000000 +0000 -+++ nspr-4.4.1/mozilla/nsprpub/pr/include/md/_linux.h 2004-04-05 15:12:45.000000000 +0000 -@@ -63,6 +63,8 @@ - #define _PR_SI_ARCHITECTURE "s390" - #elif defined(__s390x__) - #define _PR_SI_ARCHITECTURE "s390x" -+#elif defined(__hppa__) -+#define _PR_SI_ARCHITECTURE "hppa" - #else - #error "Unknown CPU architecture" - #endif diff --git a/dev-libs/nspr/files/nspr-4.4.1-ppc64.patch b/dev-libs/nspr/files/nspr-4.4.1-ppc64.patch deleted file mode 100644 index a98848d2ebc8..000000000000 --- a/dev-libs/nspr/files/nspr-4.4.1-ppc64.patch +++ /dev/null @@ -1,71 +0,0 @@ ---- nspr-4.4.1/mozilla/nsprpub/pr/include/md/_linux.cfg.orig 2003-01-23 18:03:19.000000000 +0100 -+++ nspr-4.4.1/mozilla/nsprpub/pr/include/md/_linux.cfg 2004-10-28 17:23:36.137131376 +0200 -@@ -45,7 +45,53 @@ - - #define PR_AF_INET6 10 /* same as AF_INET6 */ - --#ifdef __powerpc__ -+#ifdef __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 - ---- nspr-4.4.1/mozilla/nsprpub/pr/include/md/_linux.h.orig 2004-10-28 17:28:02.931175520 +0200 -+++ nspr-4.4.1/mozilla/nsprpub/pr/include/md/_linux.h 2004-10-28 17:28:52.716195584 +0200 -@@ -43,7 +43,9 @@ - - #define PR_LINKER_ARCH "linux" - #define _PR_SI_SYSNAME "LINUX" --#ifdef __powerpc__ -+#ifdef __powerpc64__ -+#define _PR_SI_ARCHITECTURE "ppc64" -+#elif defined(__powerpc__) - #define _PR_SI_ARCHITECTURE "ppc" - #elif defined(__alpha) - #define _PR_SI_ARCHITECTURE "alpha" diff --git a/dev-libs/nspr/files/nspr-4.6.3-fbsd62.patch b/dev-libs/nspr/files/nspr-4.6.3-fbsd62.patch deleted file mode 100644 index 525c44775d82..000000000000 --- a/dev-libs/nspr/files/nspr-4.6.3-fbsd62.patch +++ /dev/null @@ -1,16 +0,0 @@ -Index: nspr-4.6.3/mozilla/nsprpub/pr/src/misc/prnetdb.c -=================================================================== ---- nspr-4.6.3.orig/mozilla/nsprpub/pr/src/misc/prnetdb.c -+++ nspr-4.6.3/mozilla/nsprpub/pr/src/misc/prnetdb.c -@@ -108,6 +108,11 @@ PRLock *_pr_dnsLock = NULL; - #define _PR_HAVE_GETPROTO_R_INT - #endif - -+#if __FreeBSD_version >= 602000 -+#define _PR_HAVE_GETPROTO_R -+#define _PR_HAVE_5_ARG_GETPROTO_R -+#endif -+ - #if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) - #define _PR_HAVE_GETPROTO_R - #define _PR_HAVE_5_ARG_GETPROTO_R |