diff options
author | ben <ben@pkgsrc.org> | 2006-02-02 05:51:14 +0000 |
---|---|---|
committer | ben <ben@pkgsrc.org> | 2006-02-02 05:51:14 +0000 |
commit | 8d8f15123e5605d360a59b85934ac746b8d9520e (patch) | |
tree | 10a21c0e084f416a007f9a0b953ef19813f9d0fb /devel | |
parent | a494d1a3151f6a32103b8f1b147d48f3d55d37f6 (diff) | |
download | pkgsrc-8d8f15123e5605d360a59b85934ac746b8d9520e.tar.gz |
Update to nspr-4.6.1. This addresses PR#32689. Tested with gaim.
Fix typo, MASTER_SIZE_MOZILLA=MASTER_SITE_MOZILLA.
Fix version number in MASTER_SITES.
Fix MASTER_SITES to contain valid URLs to the nspr distribution.
Diffstat (limited to 'devel')
-rw-r--r-- | devel/nspr/Makefile | 7 | ||||
-rw-r--r-- | devel/nspr/PLIST | 7 | ||||
-rw-r--r-- | devel/nspr/distinfo | 15 | ||||
-rw-r--r-- | devel/nspr/patches/patch-ab | 67 | ||||
-rw-r--r-- | devel/nspr/patches/patch-ac | 25 | ||||
-rw-r--r-- | devel/nspr/patches/patch-ad | 39 | ||||
-rw-r--r-- | devel/nspr/patches/patch-ae | 13 |
7 files changed, 56 insertions, 117 deletions
diff --git a/devel/nspr/Makefile b/devel/nspr/Makefile index 6aab3854386..920f8dcbae5 100644 --- a/devel/nspr/Makefile +++ b/devel/nspr/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.10 2005/12/05 20:50:05 rillig Exp $ +# $NetBSD: Makefile,v 1.11 2006/02/02 05:51:14 ben Exp $ -DISTNAME= nspr-4.4.1 -PKGREVISION= 2 +DISTNAME= nspr-4.6.1 CATEGORIES= devel -MASTER_SITES?= ${MASTER_SIZE_MOZILLA:=nspr/releases/v4.4.1/src} +MASTER_SITES?= ${MASTER_SITE_MOZILLA:S/mozilla\//nspr\//g:=v4.6.1/src/} MAINTAINER= mjl@luckie.org.nz HOMEPAGE= http://www.mozilla.org/projects/nspr/index.html diff --git a/devel/nspr/PLIST b/devel/nspr/PLIST index 93f86074943..df7f809afd4 100644 --- a/devel/nspr/PLIST +++ b/devel/nspr/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2005/10/16 11:15:10 jmmv Exp $ +@comment $NetBSD: PLIST,v 1.6 2006/02/02 05:51:14 ben Exp $ bin/nspr-config include/nspr/md/_aix.h include/nspr/md/_aix32.cfg @@ -50,11 +50,12 @@ include/nspr/md/_reliantunix.cfg include/nspr/md/_reliantunix.h include/nspr/md/_rhapsody.cfg include/nspr/md/_rhapsody.h +include/nspr/md/_riscos.cfg +include/nspr/md/_riscos.h include/nspr/md/_scoos.cfg include/nspr/md/_scoos.h +include/nspr/md/_solaris.cfg include/nspr/md/_solaris.h -include/nspr/md/_solaris32.cfg -include/nspr/md/_solaris64.cfg include/nspr/md/_sony.cfg include/nspr/md/_sony.h include/nspr/md/_sunos4.cfg diff --git a/devel/nspr/distinfo b/devel/nspr/distinfo index 1b9013c0e9d..67dbe0564cd 100644 --- a/devel/nspr/distinfo +++ b/devel/nspr/distinfo @@ -1,11 +1,10 @@ -$NetBSD: distinfo,v 1.4 2005/08/12 20:07:35 reed Exp $ +$NetBSD: distinfo,v 1.5 2006/02/02 05:51:14 ben Exp $ -SHA1 (nspr-4.4.1.tar.gz) = f709b7941c8f28508293541a8578ed4b625adeaf -RMD160 (nspr-4.4.1.tar.gz) = 7e07e66652c38d4567e6927f30ae26889c2c672b -Size (nspr-4.4.1.tar.gz) = 1324075 bytes +SHA1 (nspr-4.6.1.tar.gz) = eb02eb63277e02a3f474f2b9746d3c2d5165d2b3 +RMD160 (nspr-4.6.1.tar.gz) = 75e8fe9b32df1698a9290baec122fa5bb970a75d +Size (nspr-4.6.1.tar.gz) = 1327028 bytes SHA1 (patch-aa) = 41cf591b7553175cd5f60a1f30fb5659bab8af8f -SHA1 (patch-ab) = 80d88458a1209f9b0fd79b1cffad168cdb6e6c71 -SHA1 (patch-ac) = 5fb247fac34b7aca0593ef541d983b5d7e968484 -SHA1 (patch-ad) = 4945ca7de73bf3294e369607a06b59bdab00653c -SHA1 (patch-ae) = f09efe0defd526eaedf736d9c3df3bdd2a2600b8 +SHA1 (patch-ab) = 0e0c70157ab0bd1442a9396b9ef9e03f41dbcab7 +SHA1 (patch-ac) = d79edfd33237b38c9cac251012476e63d8da1df3 +SHA1 (patch-ad) = c4ea8ec9d00c634b651f67153c97587b9d95aa6e SHA1 (patch-af) = b8b09a97b026905418b7bcd6cd6434f6665586c4 diff --git a/devel/nspr/patches/patch-ab b/devel/nspr/patches/patch-ab index ba2ba7487d4..ae4e614b862 100644 --- a/devel/nspr/patches/patch-ab +++ b/devel/nspr/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.1 2005/01/25 14:50:39 jschauma Exp $ +$NetBSD: patch-ab,v 1.2 2006/02/02 05:51:14 ben Exp $ ---- ../pr/include/md/_netbsd.h.orig 2003-09-12 02:24:53.000000000 +0900 -+++ ../pr/include/md/_netbsd.h 2004-06-10 23:07:02.000000000 +0900 -@@ -44,16 +44,26 @@ +--- ../pr/include/md/_netbsd.h.orig Wed Feb 1 19:41:54 2006 ++++ ../pr/include/md/_netbsd.h Wed Feb 1 19:44:48 2006 +@@ -44,6 +44,8 @@ #define _PR_SI_ARCHITECTURE "x86" #elif defined(__alpha__) #define _PR_SI_ARCHITECTURE "alpha" @@ -11,62 +11,3 @@ $NetBSD: patch-ab,v 1.1 2005/01/25 14:50:39 jschauma Exp $ #elif defined(__m68k__) #define _PR_SI_ARCHITECTURE "m68k" #elif defined(__powerpc__) - #define _PR_SI_ARCHITECTURE "powerpc" -+#elif defined(__sparc_v9__) -+#define _PR_SI_ARCHITECTURE "sparc64" - #elif defined(__sparc__) - #define _PR_SI_ARCHITECTURE "sparc" - #elif defined(__mips__) - #define _PR_SI_ARCHITECTURE "mips" - #elif defined(__arm32__) - #define _PR_SI_ARCHITECTURE "arm32" -+#elif defined(__ARMEL__) -+#define _PR_SI_ARCHITECTURE "armel" -+#elif defined(__ARMEL__) -+#define _PR_SI_ARCHITECTURE "armeb" -+#elif defined(__arm__) -+#define _PR_SI_ARCHITECTURE "arm" - #endif - - #if defined(__ELF__) -@@ -86,6 +96,12 @@ - #define _PR_INET6_PROBE - #endif - -+#if __NetBSD_Version__ >= 106370000 -+/* NetBSD 1.6ZK */ -+#define _PR_HAVE_GETPROTO_R -+#define _PR_HAVE_GETPROTO_R_INT -+#endif -+ - #define USE_SETJMP - - #ifndef _PR_PTHREADS -@@ -108,7 +124,17 @@ - } - #define _MD_GET_SP(_thread) CONTEXT(_thread)[2] - #endif --#ifdef __sparc__ -+#ifdef __sparc_v9__ -+#define _MD_INIT_CONTEXT(_thread, _sp, _main, status) \ -+{ \ -+ sigsetjmp(CONTEXT(_thread), 1); \ -+ CONTEXT(_thread)[1] = (unsigned char*) ((_sp) - 176 - 0x7ff); \ -+ CONTEXT(_thread)[2] = (long) _main; \ -+ CONTEXT(_thread)[3] = (long) _main + 4; \ -+ *status = PR_TRUE; \ -+} -+#define _MD_GET_SP(_thread) (CONTEXT(_thread)[2]+0x7ff) -+#elif defined(__sparc__) - #define _MD_INIT_CONTEXT(_thread, _sp, _main, status) \ - { \ - sigsetjmp(CONTEXT(_thread), 1); \ -@@ -150,7 +176,7 @@ - } - #define _MD_GET_SP(_thread) CONTEXT(_thread)[32] - #endif --#ifdef __arm32__ -+#ifdef __arm__ - #define _MD_INIT_CONTEXT(_thread, _sp, _main, status) \ - { \ - sigsetjmp(CONTEXT(_thread), 1); \ diff --git a/devel/nspr/patches/patch-ac b/devel/nspr/patches/patch-ac index 2b247048e3c..0c576e150a6 100644 --- a/devel/nspr/patches/patch-ac +++ b/devel/nspr/patches/patch-ac @@ -1,8 +1,17 @@ -$NetBSD: patch-ac,v 1.2 2005/08/12 20:07:35 reed Exp $ +$NetBSD: patch-ac,v 1.3 2006/02/02 05:51:14 ben Exp $ ---- ../configure.in.orig 2003-11-24 16:09:04.000000000 -0800 -+++ ../configure.in 2005-08-12 12:35:10.000000000 -0700 -@@ -913,7 +913,7 @@ +--- ../configure.in.orig Fri Sep 2 14:44:37 2005 ++++ ../configure.in Wed Feb 1 19:58:57 2006 +@@ -57,7 +57,7 @@ + USE_IPV6= + USE_MDUPDATE= + _MACOSX_DEPLOYMENT_TARGET= +-_OPTIMIZE_FLAGS=-O ++_OPTIMIZE_FLAGS= + _DEBUG_FLAGS=-g + MOZ_DEBUG=1 + MOZ_OPTIMIZE= +@@ -1025,7 +1025,7 @@ PR_MD_CSRCS=dgux.c ;; @@ -11,7 +20,7 @@ $NetBSD: patch-ac,v 1.2 2005/08/12 20:07:35 reed Exp $ if test -z "$USE_NSPR_THREADS"; then USE_PTHREADS=1 fi -@@ -932,6 +932,9 @@ +@@ -1045,6 +1045,9 @@ DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)' MDCPUCFG_H=_freebsd.cfg PR_MD_CSRCS=freebsd.c @@ -21,7 +30,7 @@ $NetBSD: patch-ac,v 1.2 2005/08/12 20:07:35 reed Exp $ ;; *-hpux*) -@@ -1408,6 +1411,7 @@ +@@ -1544,6 +1547,7 @@ AC_DEFINE(XP_UNIX) AC_DEFINE(NETBSD) AC_DEFINE(HAVE_BSD_FLOCK) @@ -29,7 +38,7 @@ $NetBSD: patch-ac,v 1.2 2005/08/12 20:07:35 reed Exp $ USE_NSPR_THREADS=1 MDCPUCFG_H=_netbsd.cfg PR_MD_CSRCS=netbsd.c -@@ -2165,7 +2169,7 @@ +@@ -2345,7 +2349,7 @@ _PTHREAD_LDFLAGS= fi ;; @@ -38,7 +47,7 @@ $NetBSD: patch-ac,v 1.2 2005/08/12 20:07:35 reed Exp $ AC_DEFINE(_REENTRANT) AC_DEFINE(_THREAD_SAFE) dnl -pthread links in -lc_r, so don't specify it explicitly. -@@ -2236,7 +2240,7 @@ +@@ -2426,7 +2430,7 @@ AC_DEFINE(_PR_NEED_PTHREAD_INIT) fi ;; diff --git a/devel/nspr/patches/patch-ad b/devel/nspr/patches/patch-ad index ece2b7dc561..33d25d4d404 100644 --- a/devel/nspr/patches/patch-ad +++ b/devel/nspr/patches/patch-ad @@ -1,19 +1,22 @@ -$NetBSD: patch-ad,v 1.1 2005/01/25 14:50:39 jschauma Exp $ +$NetBSD: patch-ad,v 1.2 2006/02/02 05:51:14 ben Exp $ ---- ../pr/src/io/prprf.c.orig Tue Dec 21 11:15:40 2004 -+++ ../pr/src/io/prprf.c Tue Dec 21 11:29:27 2004 -@@ -51,7 +51,13 @@ - ** 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__)) -+#define VARARGS_ASSIGN(foo, bar) __va_copy((foo), (bar)) -+#elif (defined (__NetBSD__) && \ -+ (defined(__amd64__) || \ -+ (defined(__powerpc__) && __NetBSD_Version__ >= 105000000))) -+#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) || \ +--- ../pr/src/misc/prnetdb.c.orig 2006-02-01 20:04:26.000000000 +1300 ++++ ../pr/src/misc/prnetdb.c 2006-02-01 20:05:53.000000000 +1300 +@@ -2110,7 +2110,17 @@ + */ + hints.ai_socktype = SOCK_STREAM; + ++/* NetBSD >= 2.99.9 has a thread-safe resolver */ ++#if defined(__NetBSD_Version__) && __NetBSD_Version__ < 299000900 ++ LOCK_DNS(); ++#endif ++ + rv = GETADDRINFO(hostname, NULL, &hints, &res); ++ ++#if defined(__NetBSD_Version__) && __NetBSD_Version__ < 299000900 ++ UNLOCK_DNS(); ++#endif ++ + if (rv == 0) + return (PRAddrInfo *) res; + diff --git a/devel/nspr/patches/patch-ae b/devel/nspr/patches/patch-ae deleted file mode 100644 index d8ce73c56c2..00000000000 --- a/devel/nspr/patches/patch-ae +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ae,v 1.1 2005/01/25 14:50:39 jschauma Exp $ - ---- ../pr/src/pthreads/ptio.c.orig Tue Dec 21 11:43:31 2004 -+++ ../pr/src/pthreads/ptio.c Tue Dec 21 11:43:46 2004 -@@ -202,7 +202,7 @@ - #elif defined(IRIX) || defined(OSF1) || defined(AIX) || defined(HPUX) \ - || defined(LINUX) || defined(FREEBSD) || defined(BSDI) || defined(VMS) \ - || defined(NTO) || defined(OPENBSD) || defined(DARWIN) \ -- || defined(UNIXWARE) -+ || defined(UNIXWARE) || defined(NETBSD) - #define _PRSockOptVal_t void * - #else - #error "Cannot determine architecture" |