Update to 4.6.6.

Upstream changes: bug fixes.

Package changes: avoid ".." in paths by changing WRKSRC and using
CONFIGURE_DIRS.
Add chunk to configure.in to avoid build failures I was seeing on
NetBSD-current/amd64.

7 files changed, 69 insertions, 48 deletions

diff --git a/devel/nspr/Makefile b/devel/nspr/Makefile
index 098882a5d9a..6467d092a1e 100644
--- a/devel/nspr/Makefile
+++ b/devel/nspr/Makefile
@@ -1,15 +1,16 @@
-# $NetBSD: Makefile,v 1.20 2007/02/22 19:01:17 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2007/03/18 18:49:46 wiz Exp $
 
-DISTNAME=		nspr-4.6.1
-PKGREVISION=		3
+DISTNAME=		nspr-4.6.6
 CATEGORIES=		devel
-MASTER_SITES=		${MASTER_SITE_MOZILLA:S/mozilla\//nspr\//g:=v4.6.1/src/}
+MASTER_SITES=		http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v4.6.6/src/ \
+			ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v4.6.6/src/
 
 MAINTAINER=		mjl@luckie.org.nz
 HOMEPAGE=		http://www.mozilla.org/projects/nspr/index.html
 COMMENT=		Platform-neutral API for system level and libc like functions
 
-WRKSRC=			${WRKDIR}/${DISTNAME}/mozilla/nsprpub/build
+WRKSRC=			${WRKDIR}/${DISTNAME}/mozilla/nsprpub
+CONFIGURE_DIRS=		${WRKSRC}/build
 
 USE_TOOLS+=		autoconf213 gmake
 USE_LANGUAGES=		c c++
@@ -56,23 +57,23 @@ BUILDLINK_PASSTHRU_DIRS+=	/Developer/Headers/FlatCarbon
 
 SUBST_CLASSES+=		libpath
 SUBST_STAGE.libpath=	post-configure
-SUBST_FILES.libpath=	config/autoconf.mk
+SUBST_FILES.libpath=	build/config/autoconf.mk
 SUBST_SED.libpath=	-e 's,@executable_path/$$@,${PREFIX}/lib/nspr/$$(notdir $$@),'
 .endif
 
 post-extract:
-	${CHMOD} -R g-w ${WRKSRC}/..
-	${CHMOD} -x ${WRKSRC}/../pr/include/prvrsion.h
+	${CHMOD} -R g-w ${WRKSRC}
+	${CHMOD} -x ${WRKSRC}/pr/include/prvrsion.h
 
 pre-configure:
-	cd ${WRKSRC}/.. && autoconf
+	cd ${WRKSRC} && autoconf
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/include/nspr
 	${INSTALL_DATA_DIR} ${PREFIX}/lib/nspr
-	(cd ${WRKSRC}/dist/include && ${PAX} -Lrwpe . ${PREFIX}/include/ )
-	(cd ${WRKSRC}/dist/lib && ${PAX} -Lrwpe . ${PREFIX}/lib/nspr/ )
-	${INSTALL_SCRIPT} ${WRKSRC}/config/nspr-config ${PREFIX}/bin
+	(cd ${WRKSRC}/build/dist/include && ${PAX} -Lrwpe . ${PREFIX}/include/ )
+	(cd ${WRKSRC}/build/dist/lib && ${PAX} -Lrwpe . ${PREFIX}/lib/nspr/ )
+	${INSTALL_SCRIPT} ${WRKSRC}/build/config/nspr-config ${PREFIX}/bin
 	${INSTALL_DATA_DIR} ${PREFIX}/lib/pkgconfig
 	set -e; \
 	{ ${ECHO} "Name: NSPR"; \
diff --git a/devel/nspr/distinfo b/devel/nspr/distinfo
index a364bc43f61..cbc808a2eaf 100644
--- a/devel/nspr/distinfo
+++ b/devel/nspr/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.6 2006/08/31 09:12:25 joerg Exp $
+$NetBSD: distinfo,v 1.7 2007/03/18 18:49:46 wiz Exp $
 
-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) = 0e0c70157ab0bd1442a9396b9ef9e03f41dbcab7
-SHA1 (patch-ac) = d79edfd33237b38c9cac251012476e63d8da1df3
-SHA1 (patch-ad) = c4ea8ec9d00c634b651f67153c97587b9d95aa6e
-SHA1 (patch-af) = b8b09a97b026905418b7bcd6cd6434f6665586c4
+SHA1 (nspr-4.6.6.tar.gz) = 5e0d35f0ae968dc7a38387688ecd9ea6002dcf5e
+RMD160 (nspr-4.6.6.tar.gz) = d296242b55ce88f665c91ab0f13e03e1a54c1552
+Size (nspr-4.6.6.tar.gz) = 1302662 bytes
+SHA1 (patch-aa) = 9e374afe504ca3bd3a27e0c05d95e09968181c51
+SHA1 (patch-ab) = af2366bf0419b6aad3c8812762f6304239b788a4
+SHA1 (patch-ac) = 365b3a5158db94f1976ecfd2ede120201717ad83
+SHA1 (patch-ad) = d0d724ec9cc24e3d6a8f0581696c3a379c272a08
+SHA1 (patch-af) = 7a94606109277b5af00197164a854f16d4259c0f
diff --git a/devel/nspr/patches/patch-aa b/devel/nspr/patches/patch-aa
index db072a07bfe..8ba56fd0bd1 100644
--- a/devel/nspr/patches/patch-aa
+++ b/devel/nspr/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1 2005/01/25 14:50:39 jschauma Exp $
+$NetBSD: patch-aa,v 1.2 2007/03/18 18:49:47 wiz Exp $
 
---- ../pr/include/md/_netbsd.cfg.orig	2000-12-02 06:29:17.000000000 +0900
-+++ ../pr/include/md/_netbsd.cfg	2004-06-10 23:06:59.000000000 +0900
-@@ -45,7 +45,8 @@
+--- pr/include/md/_netbsd.cfg.orig	2004-04-25 15:00:47.000000000 +0000
++++ pr/include/md/_netbsd.cfg
+@@ -48,7 +48,8 @@
  
  #define PR_AF_INET6 24  /* same as AF_INET6 */
  
@@ -12,7 +12,7 @@ $NetBSD: patch-aa,v 1.1 2005/01/25 14:50:39 jschauma Exp $
  
  #define IS_LITTLE_ENDIAN 1
  #undef  IS_BIG_ENDIAN
-@@ -91,7 +92,53 @@
+@@ -94,7 +95,53 @@
  #define PR_ALIGN_OF_DOUBLE  4
  #define PR_ALIGN_OF_POINTER 4
  
@@ -67,7 +67,7 @@ $NetBSD: patch-aa,v 1.1 2005/01/25 14:50:39 jschauma Exp $
  
  #undef IS_LITTLE_ENDIAN
  #define  IS_BIG_ENDIAN 1
-@@ -184,6 +231,55 @@
+@@ -187,6 +234,55 @@
  #define PR_BYTES_PER_WORD_LOG2  3
  #define PR_BYTES_PER_DWORD_LOG2 3
  
diff --git a/devel/nspr/patches/patch-ab b/devel/nspr/patches/patch-ab
index ae4e614b862..6b3dcbfde82 100644
--- a/devel/nspr/patches/patch-ab
+++ b/devel/nspr/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2006/02/02 05:51:14 ben Exp $
+$NetBSD: patch-ab,v 1.3 2007/03/18 18:49:47 wiz Exp $
 
---- ../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 @@
+--- pr/include/md/_netbsd.h.orig	2006-04-05 21:38:13.000000000 +0000
++++ pr/include/md/_netbsd.h
+@@ -47,6 +47,8 @@
  #define _PR_SI_ARCHITECTURE "x86"
  #elif defined(__alpha__)
  #define _PR_SI_ARCHITECTURE "alpha"
diff --git a/devel/nspr/patches/patch-ac b/devel/nspr/patches/patch-ac
index 0c576e150a6..9de45574df6 100644
--- a/devel/nspr/patches/patch-ac
+++ b/devel/nspr/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.3 2006/02/02 05:51:14 ben Exp $
+$NetBSD: patch-ac,v 1.4 2007/03/18 18:49:47 wiz Exp $
 
---- ../configure.in.orig	Fri Sep  2 14:44:37 2005
-+++ ../configure.in	Wed Feb  1 19:58:57 2006
-@@ -57,7 +57,7 @@
+--- 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=
@@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.3 2006/02/02 05:51:14 ben Exp $
  _DEBUG_FLAGS=-g
  MOZ_DEBUG=1
  MOZ_OPTIMIZE=
-@@ -1025,7 +1025,7 @@
+@@ -1113,7 +1113,7 @@ tools are selected during the Xcode/Deve
      PR_MD_CSRCS=dgux.c
      ;;
  
@@ -20,7 +20,7 @@ $NetBSD: patch-ac,v 1.3 2006/02/02 05:51:14 ben Exp $
      if test -z "$USE_NSPR_THREADS"; then
          USE_PTHREADS=1
      fi
-@@ -1045,6 +1045,9 @@
+@@ -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
@@ -30,7 +30,7 @@ $NetBSD: patch-ac,v 1.3 2006/02/02 05:51:14 ben Exp $
      ;;
  
  *-hpux*)
-@@ -1544,6 +1547,7 @@
+@@ -1637,6 +1640,7 @@ mips-nec-sysv*)
      AC_DEFINE(XP_UNIX)
      AC_DEFINE(NETBSD)
      AC_DEFINE(HAVE_BSD_FLOCK)
@@ -38,7 +38,27 @@ $NetBSD: patch-ac,v 1.3 2006/02/02 05:51:14 ben Exp $
      USE_NSPR_THREADS=1
      MDCPUCFG_H=_netbsd.cfg
      PR_MD_CSRCS=netbsd.c
-@@ -2345,7 +2349,7 @@
+@@ -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
  	    ;;
@@ -47,7 +67,7 @@ $NetBSD: patch-ac,v 1.3 2006/02/02 05:51:14 ben Exp $
  	    AC_DEFINE(_REENTRANT)
  	    AC_DEFINE(_THREAD_SAFE)
  	    dnl -pthread links in -lc_r, so don't specify it explicitly.
-@@ -2426,7 +2430,7 @@
+@@ -2519,7 +2526,7 @@ case "$target" in
          AC_DEFINE(_PR_NEED_PTHREAD_INIT)
      fi
      ;;
diff --git a/devel/nspr/patches/patch-ad b/devel/nspr/patches/patch-ad
index 33d25d4d404..c14f0685042 100644
--- a/devel/nspr/patches/patch-ad
+++ b/devel/nspr/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.2 2006/02/02 05:51:14 ben Exp $
+$NetBSD: patch-ad,v 1.3 2007/03/18 18:49:47 wiz Exp $
 
---- ../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 @@
+--- pr/src/misc/prnetdb.c.orig	2006-11-14 17:41:59.000000000 +0000
++++ pr/src/misc/prnetdb.c
+@@ -2115,7 +2115,17 @@ PR_IMPLEMENT(PRAddrInfo *) PR_GetAddrInf
           */
          hints.ai_socktype = SOCK_STREAM;
  
diff --git a/devel/nspr/patches/patch-af b/devel/nspr/patches/patch-af
index a9dff879588..76c919926f5 100644
--- a/devel/nspr/patches/patch-af
+++ b/devel/nspr/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.1 2005/01/25 14:50:39 jschauma Exp $
+$NetBSD: patch-af,v 1.2 2007/03/18 18:49:47 wiz Exp $
 
---- ../pr/src/Makefile.in.orig	2003-05-13 18:23:58.000000000 -0700
-+++ ../pr/src/Makefile.in
-@@ -164,6 +164,12 @@ OS_LIBS		= -ldl
+--- 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