- update to nspr-4.8.2.5

- take maintainership
- let this package automatically track the stable gecko branch
- clean out some legacy patches

This is the first part of PR pkg/42277.

18 files changed, 59 insertions, 688 deletions

diff --git a/devel/nspr/Makefile b/devel/nspr/Makefile
index 9283c74d7b8..648ec8a2af9 100644
--- a/devel/nspr/Makefile
+++ b/devel/nspr/Makefile
@@ -1,32 +1,36 @@
-# $NetBSD: Makefile,v 1.30 2009/08/27 11:59:38 tnn Exp $
+# $NetBSD: Makefile,v 1.31 2009/11/10 16:44:06 tnn Exp $
+#
 
-DISTNAME=		nspr-4.6.7
-PKGREVISION=		2
-CATEGORIES=		devel
-MASTER_SITES=		${MASTER_SITE_MOZILLA_ALL:=nspr/releases/v4.6.7/src/}
+.include "../../devel/xulrunner/dist.mk"
+PKGNAME=	${DISTNAME:S/firefox/nspr/:S/3.5/${NSPR_RELEASE}/:S/.source//}
+NSPR_RELEASE=	4.8.2
+CATEGORIES=	devel
 
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://www.mozilla.org/projects/nspr/index.html
-COMMENT=		Platform-neutral API for system level and libc like functions
+MAINTAINER=	tnn@NetBSD.org
+HOMEPAGE=	http://www.mozilla.org/projects/nspr/index.html
+COMMENT=	Platform-neutral API for system level and libc like functions
 
 PKG_DESTDIR_SUPPORT=	user-destdir
+CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/libpkix/libpkix.sh
 
-WRKSRC=			${WRKDIR}/${DISTNAME}/mozilla/nsprpub
-CONFIGURE_DIRS=		build
+GNU_CONFIGURE=		yes
+CONFIGURE_DIRS=		nsprpub
 
-USE_TOOLS+=		autoconf213 gmake pax
-USE_LANGUAGES=		c c++
-GNU_CONFIGURE=		YES
+USE_TOOLS+=		autoconf213 gmake perl
+REPLACE_PERL+=		nsprpub/pr/src/misc/compile-et.pl
 
 CONFIGURE_ARGS+=	--disable-debug
-
-MAKE_ENV+=		DIST=${WRKSRC:Q}/dist
-CONFIGURE_SCRIPT=	../configure
+CONFIGURE_ARGS+=	--with-pthreads
+CONFIGURE_ARGS+=	--libdir=${PREFIX}/lib/nspr
 CONFIGURE_ENV+=		LIBRUNPATH=${PREFIX:Q}/lib/nspr
 
-.include		"../../mk/bsd.prefs.mk"
+.include "../../mk/bsd.prefs.mk"
 
-CFLAGS+=		-D_DONT_CAST_PTHREAD_T	# XXX pthread_t can be 64-bit
+SUBST_CLASSES+=			nspr-config
+SUBST_STAGE.nspr-config=	pre-configure
+SUBST_MESSAGE.nspr-config=	Fixing nspr-config run path
+SUBST_FILES.nspr-config=	nsprpub/config/nspr-config.in
+SUBST_SED.nspr-config=		-e 's|-L$$libdir|"${COMPILER_RPATH_FLAG}$$libdir -L$$libdir"|g'
 
 .if ${OBJECT_FMT} == "ELF"
 SO_SUFFIX=		so
@@ -37,10 +41,8 @@ SO_SUFFIX=		so.1.0
 .endif
 PLIST_SUBST+=		SO_SUFFIX=${SO_SUFFIX:Q}
 
-INSTALLATION_DIRS=	bin
 PLIST_VARS+=		sun4u_32
-
-# see ${WRKSRC}/nspr-4.6.1/mozilla/nsprpub/pr/src/md/unix/Makefile.in
+# see nsprpub/pr/src/md/unix/Makefile.in
 # for the bit about 32-bit sun4u machines installing an extra file.
 # That is why we have this specific test and modify the PLIST
 .if ${OPSYS} == "SunOS"
@@ -49,7 +51,7 @@ CONFIGURE_ARGS+=	--enable-64bit
 .  else
 HW_CLASS!=	${UNAME} -m
 .    if ${HW_CLASS} == "sun4u"
-PLIST.sun4u_32=		yes
+PLIST.sun4u_32=                yes
 .    endif
 .  endif
 .endif
@@ -61,45 +63,34 @@ CONFIGURE_ARGS+=	--enable-64bit
 .endif
 
 .if ${OPSYS} == "Darwin" && exists(/Developer/Headers/FlatCarbon)
-BUILDLINK_PASSTHRU_DIRS+=	/Developer/Headers/FlatCarbon
-
-SUBST_CLASSES+=		libpath
-SUBST_STAGE.libpath=	post-configure
-SUBST_FILES.libpath=	build/config/autoconf.mk
-SUBST_SED.libpath=	-e 's,@executable_path/$$@,${PREFIX}/lib/nspr/$$(notdir $$@),'
+BUILDLINK_PASSTHRU_DIRS+=	Developer/Headers/FlatCarbon
 .endif
 
-INSTALLATION_DIRS=	bin include/nspr lib/nspr lib/pkgconfig
-
-post-extract:
-	${CHMOD} -R g-w ${WRKSRC}
-	${CHMOD} -x ${WRKSRC}/pr/include/prvrsion.h
-
 pre-configure:
-	cd ${WRKSRC} && autoconf
-
-do-install:
-	(cd ${WRKSRC}/build/dist/include && pax -Lrwpe . ${DESTDIR}${PREFIX}/include/ )
-	(cd ${WRKSRC}/build/dist/lib && pax -Lrwpe . ${DESTDIR}${PREFIX}/lib/nspr/ )
-	${INSTALL_SCRIPT} ${WRKSRC}/build/config/nspr-config ${DESTDIR}${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/pkgconfig
-	set -e; \
-	{ ${ECHO} "Name: NSPR"; \
-	  ${ECHO} "Description: The Netscape Portable Runtime"; \
-	  ${ECHO} "Version: ${PKGVERSION}"; \
-	  ${ECHO} "Cflags: -I${PREFIX}/include/nspr"; \
-	  ${ECHO} "Libs: -L${PREFIX}/lib/nspr" \
-	      "${COMPILER_RPATH_FLAG}${PREFIX}/lib/nspr" \
-	      "-lplds4 -lplc4 -lnspr4 "${BUILDLINK_LIBS.pthread:Q}; \
-	} >${DESTDIR}${PREFIX}/lib/pkgconfig/nspr.pc
-
-.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "none")
-CONFIGURE_ARGS+=	--without-pthreads
-.else
-CONFIGURE_ARGS+=	--with-pthreads
-.include "../../mk/pthread.buildlink3.mk"
-# XXX TODO
-#.include "../../mk/resolv.buildlink3.mk"
-.endif
+# sanity check: make sure the nspr release is what we think it is.
+	@set -e; if [ '"${NSPR_RELEASE}"' !=			\
+	  "`${AWK} '/PR_VERSION/ {print $$3}' <			\
+	    ${WRKSRC}/nsprpub/pr/include/prinit.h`" ]; then	\
+	  ${ECHO} "package is out of date";			\
+	  exit 1;						\
+	fi
+	cd ${WRKSRC}/nsprpub && autoconf
+
+post-build:
+	set -e; ( \
+	  ${ECHO} "Name: NSPR"; \
+	  ${ECHO} "Description: The Netscape Portable Runtime";	\
+	  ${ECHO} "Version: ${PKGVERSION_NOREV}";		\
+	  ${ECHO} "Cflags: -I${PREFIX}/include/nspr";		\
+	  ${ECHO} "Libs: -L${PREFIX}/lib/nspr"			\
+	    "${COMPILER_RPATH_FLAG}${PREFIX}/lib/nspr"		\
+	    "-lplds4 -lplc4 -lnspr4 -pthread"			\
+	) > ${WRKDIR}/nspr.pc
+
+INSTALLATION_DIRS+=	lib/pkgconfig
+
+post-install:
+	${INSTALL_DATA} ${WRKDIR}/nspr.pc ${DESTDIR}${PREFIX}/lib/pkgconfig
 
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/nspr/PLIST b/devel/nspr/PLIST
index 5f3fdae29a8..a9f5e9deec6 100644
--- a/devel/nspr/PLIST
+++ b/devel/nspr/PLIST
@@ -1,79 +1,39 @@
-@comment $NetBSD: PLIST,v 1.9 2009/06/14 17:49:00 joerg Exp $
+@comment $NetBSD: PLIST,v 1.10 2009/11/10 16:44:06 tnn Exp $
+bin/compile-et.pl
 bin/nspr-config
-include/nspr/md/_aix.h
+bin/prerr.properties
 include/nspr/md/_aix32.cfg
 include/nspr/md/_aix64.cfg
 include/nspr/md/_beos.cfg
-include/nspr/md/_beos.h
 include/nspr/md/_bsdi.cfg
-include/nspr/md/_bsdi.h
 include/nspr/md/_darwin.cfg
-include/nspr/md/_darwin.h
 include/nspr/md/_dgux.cfg
-include/nspr/md/_dgux.h
 include/nspr/md/_freebsd.cfg
-include/nspr/md/_freebsd.h
-include/nspr/md/_hpux.h
 include/nspr/md/_hpux32.cfg
 include/nspr/md/_hpux64.cfg
-include/nspr/md/_irix.h
 include/nspr/md/_irix32.cfg
 include/nspr/md/_irix64.cfg
 include/nspr/md/_linux.cfg
-include/nspr/md/_linux.h
-include/nspr/md/_macos.h
 include/nspr/md/_ncr.cfg
-include/nspr/md/_ncr.h
 include/nspr/md/_nec.cfg
-include/nspr/md/_nec.h
 include/nspr/md/_netbsd.cfg
-include/nspr/md/_netbsd.h
 include/nspr/md/_nextstep.cfg
-include/nspr/md/_nextstep.h
-include/nspr/md/_nspr_pthread.h
 include/nspr/md/_nto.cfg
-include/nspr/md/_nto.h
 include/nspr/md/_openbsd.cfg
-include/nspr/md/_openbsd.h
-include/nspr/md/_openvms.cfg
-include/nspr/md/_openvms.h
 include/nspr/md/_os2.cfg
-include/nspr/md/_os2.h
-include/nspr/md/_os2_errors.h
 include/nspr/md/_osf1.cfg
-include/nspr/md/_osf1.h
-include/nspr/md/_pcos.h
-include/nspr/md/_pth.h
 include/nspr/md/_qnx.cfg
-include/nspr/md/_qnx.h
 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/_sony.cfg
-include/nspr/md/_sony.h
 include/nspr/md/_sunos4.cfg
-include/nspr/md/_sunos4.h
-include/nspr/md/_unix_errors.h
-include/nspr/md/_unixos.h
+include/nspr/md/_symbian.cfg
 include/nspr/md/_unixware.cfg
-include/nspr/md/_unixware.h
 include/nspr/md/_unixware7.cfg
-include/nspr/md/_win16.cfg
-include/nspr/md/_win16.h
-include/nspr/md/_win32_errors.h
 include/nspr/md/_win95.cfg
-include/nspr/md/_win95.h
 include/nspr/md/_winnt.cfg
-include/nspr/md/_winnt.h
-include/nspr/md/prosdep.h
-include/nspr/md/sunos4.h
 include/nspr/nspr.h
 include/nspr/obsolete/pralarm.h
 include/nspr/obsolete/probslet.h
@@ -130,7 +90,6 @@ include/nspr/prtrace.h
 include/nspr/prtypes.h
 include/nspr/prvrsion.h
 include/nspr/prwin16.h
-${PLIST.sun4u_32}lib/nspr/cpu/sparcv8plus/libnspr_flt4.so
 lib/nspr/libnspr4.a
 lib/nspr/libnspr4.${SO_SUFFIX}
 lib/nspr/libplc4.a
@@ -138,3 +97,4 @@ lib/nspr/libplc4.${SO_SUFFIX}
 lib/nspr/libplds4.a
 lib/nspr/libplds4.${SO_SUFFIX}
 lib/pkgconfig/nspr.pc
+share/aclocal/nspr.m4
diff --git a/devel/nspr/buildlink3.mk b/devel/nspr/buildlink3.mk
index 7f04497850c..16e2f1d1c66 100644
--- a/devel/nspr/buildlink3.mk
+++ b/devel/nspr/buildlink3.mk
@@ -1,26 +1,19 @@
-# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:24:25 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2009/11/10 16:44:06 tnn Exp $
 
 BUILDLINK_TREE+=	nspr
 
 .if !defined(NSPR_BUILDLINK3_MK)
 NSPR_BUILDLINK3_MK:=
 
-.  include "../../mk/bsd.fast.prefs.mk"
-
-BUILDLINK_API_DEPENDS.nspr+=	nspr>=4.4.1nb1
-.  if ${OPSYS} == "Darwin"
-BUILDLINK_API_DEPENDS.nspr+=	nspr>=4.6.1nb3
-.  else
-BUILDLINK_API_DEPENDS.nspr+=	nspr>=4.6.1nb1
-.  endif
-
+BUILDLINK_API_DEPENDS.nspr+=	nspr>=4.8.2.5
 BUILDLINK_PKGSRCDIR.nspr?=	../../devel/nspr
+
 BUILDLINK_FILES.nspr+=          lib/nspr/*
 BUILDLINK_FILES.nspr+=          include/nspr/*
 
 BUILDLINK_INCDIRS.nspr+=        include/nspr
 BUILDLINK_LIBDIRS.nspr+=        lib/nspr
 BUILDLINK_RPATHDIRS.nspr+=      lib/nspr
-.endif # NSPR_BUILDLINK3_MK
+.endif	# NSPR_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-nspr
diff --git a/devel/nspr/hacks.mk b/devel/nspr/hacks.mk
deleted file mode 100644
index 278ba0ad07b..00000000000
--- a/devel/nspr/hacks.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# $NetBSD: hacks.mk,v 1.1 2007/09/25 04:18:26 bjs Exp $
-
-.if !defined(NSPR_HACKS_MK)
-NSPR_HACKS_MK=	# defined
-
-.include "../../mk/compiler.mk"
-
-.if !empty(CC_VERSION:Mgcc-[34]*)
-CFLAGS+=	-fno-strict-aliasing
-PKG_HACKS+=	no-strict-aliasing
-.endif
-
-.endif
diff --git a/devel/nspr/patches/patch-aa b/devel/nspr/patches/patch-aa
deleted file mode 100644
index 185f1b1afb2..00000000000
--- a/devel/nspr/patches/patch-aa
+++ /dev/null
@@ -1,125 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2007/09/25 04:21:30 bjs Exp $
-
---- pr/include/md/_netbsd.cfg.orig	2004-04-25 11:00:47.000000000 -0400
-+++ pr/include/md/_netbsd.cfg
-@@ -48,7 +48,8 @@
- 
- #define PR_AF_INET6 24  /* same as AF_INET6 */
- 
--#if defined(__i386__) || defined(__arm32__) || defined(__MIPSEL__)
-+#if defined(__i386__) || defined(__arm32__) || defined(__ARMEL__) || \
-+	defined(__MIPSEL__)
- 
- #define IS_LITTLE_ENDIAN 1
- #undef  IS_BIG_ENDIAN
-@@ -94,7 +95,53 @@
- #define PR_ALIGN_OF_DOUBLE  4
- #define PR_ALIGN_OF_POINTER 4
- 
--#elif defined(__sparc__) || defined(__MIPSEB__)
-+#elif defined(__sparc_v9)
-+
-+#undef IS_LITTLE_ENDIAN
-+#define  IS_BIG_ENDIAN 1
-+#define HAVE_LONG_LONG
-+#define  HAVE_ALIGNED_DOUBLES
-+#define  HAVE_ALIGNED_LONGLONGS
-+
-+#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_BYTES_PER_WORD_LOG2   3
-+#define PR_BYTES_PER_DWORD_LOG2  3
-+
-+#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 
-+
-+#elif defined(__sparc) || defined(__MIPSEB__) || defined(__ARMEB__)
- 
- #undef IS_LITTLE_ENDIAN
- #define  IS_BIG_ENDIAN 1
-@@ -187,6 +234,55 @@
- #define PR_BYTES_PER_WORD_LOG2  3
- #define PR_BYTES_PER_DWORD_LOG2 3
- 
-+#elif defined(__amd64__)
-+#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
-+
-+#define HAVE_LONG_LONG
-+#define HAVE_ALIGNED_DOUBLES
-+#define HAVE_ALIGNED_LONGLONGS
-+
- #elif defined(__powerpc__) || defined(__m68k__)
- 
- #undef  IS_LITTLE_ENDIAN
diff --git a/devel/nspr/patches/patch-ab b/devel/nspr/patches/patch-ab
deleted file mode 100644
index cda9e80497f..00000000000
--- a/devel/nspr/patches/patch-ab
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2007/09/25 04:18:26 bjs Exp $
-
-We really don't want to use getproto reentrant functions.  Also,
-add missing extern decls.
-
---- pr/include/md/_netbsd.h.orig	2006-04-05 17:38:13.000000000 -0400
-+++ pr/include/md/_netbsd.h
-@@ -47,6 +47,8 @@
- #define _PR_SI_ARCHITECTURE "x86"
- #elif defined(__alpha__)
- #define _PR_SI_ARCHITECTURE "alpha"
-+#elif defined(__amd64__)
-+#define _PR_SI_ARCHITECTURE "amd64"
- #elif defined(__m68k__)
- #define _PR_SI_ARCHITECTURE "m68k"
- #elif defined(__powerpc__)
-@@ -92,12 +94,6 @@
- #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
-@@ -243,6 +239,10 @@ struct _MDCPU {
- 
- #endif /* ! _PR_PTHREADS */
- 
-+extern void _MD_EarlyInit(void);
-+extern PRIntervalTime _PR_UNIX_GetInterval(void);
-+extern PRIntervalTime _PR_UNIX_TicksPerSecond(void);
-+
- #define _MD_EARLY_INIT                  _MD_EarlyInit
- #define _MD_FINAL_INIT			_PR_UnixInit
- #define _MD_GET_INTERVAL                  _PR_UNIX_GetInterval
diff --git a/devel/nspr/patches/patch-ac b/devel/nspr/patches/patch-ac
deleted file mode 100644
index 9de45574df6..00000000000
--- a/devel/nspr/patches/patch-ac
+++ /dev/null
@@ -1,78 +0,0 @@
-$NetBSD: patch-ac,v 1.4 2007/03/18 18:49:47 wiz Exp $
-
---- configure.in.orig	2007-01-18 23:44:32.000000000 +0000
-+++ configure.in
-@@ -62,7 +62,7 @@ USE_CPLUS=
- USE_IPV6=
- USE_MDUPDATE=
- _MACOSX_DEPLOYMENT_TARGET=
--_OPTIMIZE_FLAGS=-O
-+_OPTIMIZE_FLAGS=
- _DEBUG_FLAGS=-g
- MOZ_DEBUG=1
- MOZ_OPTIMIZE=
-@@ -1113,7 +1113,7 @@ tools are selected during the Xcode/Deve
-     PR_MD_CSRCS=dgux.c
-     ;;
- 
--*-freebsd*)
-+*-freebsd* | *-dragonfly*)
-     if test -z "$USE_NSPR_THREADS"; then
-         USE_PTHREADS=1
-     fi
-@@ -1133,6 +1133,9 @@ tools are selected during the Xcode/Deve
-     DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)'
-     MDCPUCFG_H=_freebsd.cfg
-     PR_MD_CSRCS=freebsd.c
-+    if test "$LIBRUNPATH"; then
-+        DSO_LDOPTS="$DSO_LDOPTS -Wl,-R$LIBRUNPATH"
-+    fi
-     ;;
- 
- *-hpux*)
-@@ -1637,6 +1640,7 @@ mips-nec-sysv*)
-     AC_DEFINE(XP_UNIX)
-     AC_DEFINE(NETBSD)
-     AC_DEFINE(HAVE_BSD_FLOCK)
-+    AC_DEFINE(HAVE_SOCKLEN_T)
-     USE_NSPR_THREADS=1
-     MDCPUCFG_H=_netbsd.cfg
-     PR_MD_CSRCS=netbsd.c
-@@ -1649,13 +1653,16 @@ mips-nec-sysv*)
-     if test -z "$OBJECT_FMT"; then
-         if echo __ELF__ | ${CC-cc} -E - | grep -q __ELF__ 2>/dev/null; then
-             OBJECT_FMT=a.out
--            DLL_SUFFIX=so.1.0
--            DSO_LDOPTS='-shared'
-         else
-             OBJECT_FMT=ELF
-+        fi
-+    fi
-+    if test "$OBJECT_FMT" = "ELF"; then
-             DLL_SUFFIX=so
-             DSO_LDOPTS='-shared -Wl,-soname,$(notdir $@)'
--        fi
-+    else
-+            DLL_SUFFIX=so.1.0
-+            DSO_LDOPTS='-shared'
-     fi
- 
-     if test "$LIBRUNPATH"; then
-@@ -2438,7 +2445,7 @@ if test -n "$USE_PTHREADS"; then
-             _PTHREAD_LDFLAGS=
-         fi
- 	    ;;
--    *-freebsd*)
-+    *-freebsd* | *-dragonfly*)
- 	    AC_DEFINE(_REENTRANT)
- 	    AC_DEFINE(_THREAD_SAFE)
- 	    dnl -pthread links in -lc_r, so don't specify it explicitly.
-@@ -2519,7 +2526,7 @@ case "$target" in
-         AC_DEFINE(_PR_NEED_PTHREAD_INIT)
-     fi
-     ;;
--*-freebsd*)
-+*-freebsd* | *-dragonfly*)
-     if test -n "$USE_NSPR_THREADS"; then
-         AC_DEFINE(_PR_LOCAL_THREADS_ONLY)
-     fi
diff --git a/devel/nspr/patches/patch-ad b/devel/nspr/patches/patch-ad
deleted file mode 100644
index 74ec1569e79..00000000000
--- a/devel/nspr/patches/patch-ad
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-ad,v 1.5 2009/04/07 08:05:50 hasso Exp $
-
---- pr/src/misc/prnetdb.c.orig	2006-11-14 19:41:59 +0200
-+++ pr/src/misc/prnetdb.c	2009-04-03 18:29:50 +0300
-@@ -113,6 +113,11 @@ PRLock *_pr_dnsLock = NULL;
- #define _PR_HAVE_5_ARG_GETPROTO_R
- #endif
- 
-+#if __DragonFly_version >= 200202
-+#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
-@@ -2115,7 +2120,17 @@ PR_IMPLEMENT(PRAddrInfo *) PR_GetAddrInf
-          */
-         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 b8e48c8b3f1..00000000000
--- a/devel/nspr/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2008/01/05 19:38:46 tron Exp $
-
---- pr/include/md/_pth.h.orig	2005-07-21 19:22:53.000000000 +0100
-+++ pr/include/md/_pth.h	2008-01-05 19:34:33.000000000 +0000
-@@ -205,7 +205,7 @@
- /*
-  * These platforms don't have pthread_kill()
-  */
--#if defined(DARWIN)
-+#if defined(DARWIN) && !defined(__DARWIN_SUF_UNIX03)
- #define pthread_kill(thread, sig) ENOSYS
- #endif
- 
diff --git a/devel/nspr/patches/patch-af b/devel/nspr/patches/patch-af
deleted file mode 100644
index 76c919926f5..00000000000
--- a/devel/nspr/patches/patch-af
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-af,v 1.2 2007/03/18 18:49:47 wiz Exp $
-
---- pr/src/Makefile.in.orig	2006-10-19 00:39:28.000000000 +0000
-+++ pr/src/Makefile.in
-@@ -170,6 +170,12 @@ OS_LIBS		= -ldl
- endif
- endif
- 
-+ifeq ($(OS_ARCH),NetBSD)
-+ifeq ($(USE_PTHREADS), 1)
-+OS_LIBS		= -lpthread
-+endif
-+endif
-+
- ifeq ($(OS_ARCH),HP-UX)
- ifeq ($(USE_PTHREADS), 1)
- ifeq (,$(filter-out B.10.10 B.10.20,$(OS_RELEASE)))
diff --git a/devel/nspr/patches/patch-ag b/devel/nspr/patches/patch-ag
deleted file mode 100644
index a0753a5efe6..00000000000
--- a/devel/nspr/patches/patch-ag
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2007/09/25 04:18:26 bjs Exp $
-
-Get the physical memory size using hw.physmem on _PR_HAVE_SYSCTL
-platforms.
-
---- pr/src/misc/prsystem.c.orig	2006-07-14 18:33:47.000000000 -0400
-+++ pr/src/misc/prsystem.c
-@@ -356,6 +356,19 @@ PR_IMPLEMENT(PRUint64) PR_GetPhysicalMem
-         odm_terminate();
-     }
- 
-+#elif defined(_PR_HAVE_SYSCTL)
-+
-+    int mib[2];
-+    unsigned long physmem;
-+    size_t len;
-+    
-+    mib[0] = CTL_HW;
-+    mib[1] = HW_PHYSMEM;
-+    len = sizeof(physmem);
-+    if(sysctl(mib, 2, &physmem, &len, NULL, 0) == 0
-+        && len == sizeof(physmem))
-+      bytes = physmem;
-+
- #else
- 
-     PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0);
diff --git a/devel/nspr/patches/patch-ah b/devel/nspr/patches/patch-ah
deleted file mode 100644
index 437807f1aef..00000000000
--- a/devel/nspr/patches/patch-ah
+++ /dev/null
@@ -1,54 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2007/09/25 04:18:26 bjs Exp $
-
-Does this package really ever need priority scheduling?  #undef it.
-If _DONT_CAST_PTHREAD_T is defined, then do as the macro says.  After
-all, it could be 64-bit.  From FreeBSD ports.
-
---- pr/src/pthreads/ptthread.c.orig	2006-11-30 19:34:12.000000000 -0500
-+++ pr/src/pthreads/ptthread.c
-@@ -52,6 +52,10 @@
- #include <string.h>
- #include <signal.h>
- 
-+/* XXX should nspr ever really need to set priority? */
-+
-+#undef _POSIX_THREAD_PRIORITY_SCHEDULING 
-+
- /*
-  * Record whether or not we have the privilege to set the scheduling
-  * policy and priority of threads.  0 means that privilege is available.
-@@ -979,12 +983,20 @@ PR_IMPLEMENT(void) PR_ProcessExit(PRIntn
-     _exit(status);
- }
- 
-+#ifndef _DONT_CAST_PTHREAD_T
- PR_IMPLEMENT(PRUint32) PR_GetThreadID(PRThread *thred)
-+#else
-+PR_IMPLEMENT(pthread_t) PR_GetThreadID(PRThread *thred)
-+#endif /* _DONT_CAST_PTHREAD_T */
- {
- #if defined(_PR_DCETHREADS)
-     return (PRUint32)&thred->id;  /* this is really a sham! */
- #else
-+#ifndef _DONT_CAST_PTHREAD_T
-     return (PRUint32)thred->id;  /* and I don't know what they will do with it */
-+#else
-+    return thred->id;  /* and I don't know what they will do with it */
-+#endif /* _DONT_CAST_PTHREAD_T */
- #endif
- }
- 
-@@ -1116,7 +1128,13 @@ PR_IMPLEMENT(PRStatus) PR_EnumerateThrea
-     PRIntn count = 0;
-     PRStatus rv = PR_SUCCESS;
-     PRThread* thred = pt_book.first;
-+#ifdef _DONT_CAST_PTHREAD_T
-+#if !defined(_PR_DCETHREADS) && (defined(DEBUG) || defined(FORCE_PR_ASSERT))
-+#endif /* _DONT_CAST_PTHREAD_T */
-     PRThread *me = PR_CurrentThread();
-+#ifdef _DONT_CAST_PTHREAD_T
-+#endif
-+#endif /* _DONT_CAST_PTHREAD_T */
- 
-     PR_LOG(_pr_gc_lm, PR_LOG_ALWAYS, ("Begin PR_EnumerateThreads\n"));
-     /*
diff --git a/devel/nspr/patches/patch-ai b/devel/nspr/patches/patch-ai
deleted file mode 100644
index c56970e11a1..00000000000
--- a/devel/nspr/patches/patch-ai
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2007/09/25 04:18:27 bjs Exp $
-
-Kill some warnings.  From FreeBSD.
-
---- pr/include/prcountr.h.orig	2004-04-25 11:00:47.000000000 -0400
-+++ pr/include/prcountr.h
-@@ -426,7 +426,7 @@ NSPR_API(void) 
- #define PR_GET_COUNTER(counter,handle)\
-     (counter) = PR_GetCounter((handle))
- #else
--#define PR_GET_COUNTER(counter,handle) 0
-+#define PR_GET_COUNTER(counter,handle)
- #endif
- 
- NSPR_API(PRUint32) 
-@@ -500,7 +500,7 @@ NSPR_API(void) 
- #define PR_FIND_NEXT_COUNTER_QNAME(next,handle)\
-     (next) = PR_FindNextCounterQname((handle))
- #else
--#define PR_FIND_NEXT_COUNTER_QNAME(next,handle) NULL
-+#define PR_FIND_NEXT_COUNTER_QNAME(next,handle)
- #endif
- 
- NSPR_API(PRCounterHandle) 
diff --git a/devel/nspr/patches/patch-aj b/devel/nspr/patches/patch-aj
deleted file mode 100644
index 45a3d4771ad..00000000000
--- a/devel/nspr/patches/patch-aj
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2009/08/27 11:59:38 tnn Exp $
-
---- config/nspr-config.in.orig	2005-05-11 02:53:41.000000000 +0200
-+++ config/nspr-config.in
-@@ -122,7 +122,7 @@ if test "$echo_cflags" = "yes"; then
- fi
- 
- if test "$echo_libs" = "yes"; then
--      libdirs=-L$libdir
-+      libdirs="-Wl,-R$libdir/nspr -L$libdir/nspr"
-       if test -n "$lib_plds"; then
- 	libdirs="$libdirs -lplds${major_version}"
-       fi
diff --git a/devel/nspr/patches/patch-ak b/devel/nspr/patches/patch-ak
deleted file mode 100644
index 64730c70f19..00000000000
--- a/devel/nspr/patches/patch-ak
+++ /dev/null
@@ -1,51 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2007/09/25 04:18:27 bjs Exp $
-
---- pr/src/pthreads/ptsynch.c.orig	2004-11-22 16:24:53.000000000 -0500
-+++ pr/src/pthreads/ptsynch.c
-@@ -62,7 +62,7 @@ static pthread_t pt_zero_tid;  /* a null
- #endif  /* defined(_PR_DCETHREADS) */
- #endif  /* defined(DEBUG) */
- 
--#if defined(FREEBSD)
-+#if defined(FREEBSD) && (defined(DEBUG) || defined(FORCE_PR_ASSERT))
- /*
-  * On older versions of FreeBSD, pthread_mutex_trylock returns EDEADLK.
-  * Newer versions return EBUSY.  We still need to support both.
-@@ -342,7 +342,10 @@ PR_IMPLEMENT(PRCondVar*) PR_NewCondVar(P
-     PR_ASSERT(lock != NULL);
-     if (cv != NULL)
-     {
--        int rv = _PT_PTHREAD_COND_INIT(cv->cv, _pt_cvar_attr); 
-+#if defined(DEBUG) || defined(FORCE_PR_ASSERT)
-+        int rv =
-+#endif
-+	    _PT_PTHREAD_COND_INIT(cv->cv, _pt_cvar_attr); 
-         PR_ASSERT(0 == rv);
-         cv->lock = lock;
-         cv->notify_pending = 0;
-@@ -357,7 +360,11 @@ PR_IMPLEMENT(void) PR_DestroyCondVar(PRC
- {
-     if (0 > PR_AtomicDecrement(&cvar->notify_pending))
-     {
--        PRIntn rv = pthread_cond_destroy(&cvar->cv); PR_ASSERT(0 == rv);
-+#if defined(DEBUG) || defined(FORCE_PR_ASSERT)
-+        PRIntn rv =
-+#endif
-+	    pthread_cond_destroy(&cvar->cv);
-+	PR_ASSERT(0 == rv);
- #if defined(DEBUG)
-         memset(cvar, 0xaf, sizeof(PRCondVar));
-         pt_debug.cvars_destroyed += 1;
-@@ -1079,8 +1086,11 @@ PR_IMPLEMENT(PRCondVar*) PRP_NewNakedCon
-     cv = PR_NEW(PRCondVar);
-     if (cv != NULL)
-     {
-+#if defined(DEBUG) || defined(FORCE_PR_ASSERT)
-         int rv;
--        rv = _PT_PTHREAD_COND_INIT(cv->cv, _pt_cvar_attr); 
-+        rv =
-+#endif
-+	    _PT_PTHREAD_COND_INIT(cv->cv, _pt_cvar_attr); 
-         PR_ASSERT(0 == rv);
-         cv->lock = _PR_NAKED_CV_LOCK;
-     }
diff --git a/devel/nspr/patches/patch-al b/devel/nspr/patches/patch-al
deleted file mode 100644
index c1e07c44f2d..00000000000
--- a/devel/nspr/patches/patch-al
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-al,v 1.1 2007/09/25 04:18:27 bjs Exp $
-
-Fixup locking order.  From OpenBSD.
-
---- pr/src/misc/prinit.c.orig	2006-11-30 19:34:11.000000000 -0500
-+++ pr/src/misc/prinit.c
-@@ -435,6 +435,12 @@ PR_IMPLEMENT(PRStatus) PR_Cleanup()
- 	    _PR_LogCleanup();
- 
-         /*
-+         * accesses the current thread
-+         */
-+        _PR_CleanupNet();
-+        _PR_CleanupIO();
-+
-+        /*
-          * This part should look like the end of _PR_NativeRunThread
-          * and _PR_UserRunThread.
-          */
-@@ -446,6 +452,7 @@ PR_IMPLEMENT(PRStatus) PR_Cleanup()
-             PR_DELETE(me->stack);
-             PR_DELETE(me);
-         }
-+        _PR_MD_SET_CURRENT_THREAD(NULL);
- 
-         /*
-          * XXX: We are freeing the heap memory here so that Purify won't
-@@ -454,8 +461,6 @@ PR_IMPLEMENT(PRStatus) PR_Cleanup()
-          * Ideally, for each _PR_InitXXX(), there should be a corresponding
-          * _PR_XXXCleanup() that we can call here.
-          */
--        _PR_CleanupNet();
--        _PR_CleanupIO();
- #ifdef WINNT
-         _PR_CleanupCPUs();
- #endif
diff --git a/devel/nspr/patches/patch-am b/devel/nspr/patches/patch-am
deleted file mode 100644
index 3fa917aa111..00000000000
--- a/devel/nspr/patches/patch-am
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-am,v 1.2 2007/10/04 14:18:21 joerg Exp $
-
-Fix another cast of pthread_t.
-
---- pr/include/private/pprthred.h.orig	2004-04-25 11:00:56.000000000 -0400
-+++ pr/include/private/pprthred.h
-@@ -51,6 +51,8 @@
- #include <os2.h>
- #endif
- 
-+#include <pthread.h>
-+
- PR_BEGIN_EXTERN_C
- 
- /*---------------------------------------------------------------------------
-@@ -91,7 +93,11 @@ NSPR_API(void) PR_DetachThread(void);
- ** Get the id of the named thread. Each thread is assigned a unique id
- ** when it is created or attached.
- */
-+#ifndef _DONT_CAST_PTHREAD_T
- NSPR_API(PRUint32) PR_GetThreadID(PRThread *thread);
-+#else
-+NSPR_API(pthread_t) PR_GetThreadID(PRThread *thread);
-+#endif
- 
- /*
- ** Set the procedure that is called when a thread is dumped. The procedure
diff --git a/devel/nspr/patches/patch-an b/devel/nspr/patches/patch-an
deleted file mode 100644
index af87f224e02..00000000000
--- a/devel/nspr/patches/patch-an
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-an,v 1.2 2007/10/17 07:40:50 bjs Exp $
-
---- pr/include/md/_freebsd.h.orig	Mon Nov 22 22:24:53 2004
-+++ pr/include/md/_freebsd.h
-@@ -106,6 +106,16 @@
- #define _PR_IPV6_V6ONLY_PROBE
- #endif
- 
-+#if (__FreeBSD_version >= 700016) || (__FreeBSD_version < 700000 && __FreeBSD_version >= 601103)
-+#if defined(_PR_PTHREADS)
-+#define _PR_HAVE_GETPROTO_R
-+#define _PR_HAVE_5_ARG_GETPROTO_R
-+#define _PR_HAVE_GETHOST_R
-+#define _PR_HAVE_GETHOST_R_INT
-+#define _PR_HAVE_THREADSAFE_GETHOST
-+#endif
-+#endif
-+
- #define USE_SETJMP
- 
- #ifndef _PR_PTHREADS