Fixed most pkglint warnings.

14 files changed, 68 insertions, 67 deletions

diff --git a/devel/nss/Makefile b/devel/nss/Makefile
index e0ca39d2ec1..83681156190 100644
--- a/devel/nss/Makefile
+++ b/devel/nss/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2006/04/06 06:21:54 reed Exp $
+# $NetBSD: Makefile,v 1.14 2006/07/12 15:38:28 rillig Exp $
 
 DISTNAME=		nss-3.9.2
 PKGREVISION=		4
 CATEGORIES=		security
-MASTER_SITES?=		ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_9_2_RTM/src/
+MASTER_SITES=		ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_9_2_RTM/src/
 
 MAINTAINER=		mjl@luckie.org.nz
 HOMEPAGE=		http://www.mozilla.org/projects/security/pki/nss/
@@ -13,16 +13,16 @@ BUILD_DEPENDS+=		zip>=2.3:../../archivers/zip
 
 # NSS will build and run on other platforms when MAINTAINER knows what
 # magic Makefile glue is required
-ONLY_FOR_PLATFORM+=	NetBSD-*-* FreeBSD-*-* Linux-*-* DragonFly-*-*
+#ONLY_FOR_PLATFORM+=	NetBSD-*-* FreeBSD-*-* Linux-*-* DragonFly-*-*
 # Solaris has missing symbols when linking.  It looks like some of those problem
 # have been addressed in the nss source tree so this should be enabled after
 # the next update.
 #SunOS-*-*
 
-WRKSRC=			${WRKDIR}/${DISTNAME}/mozilla/security/nss
+BUILD_DIRS=		mozilla/security/nss
 
 USE_TOOLS+=		gmake perl
-DIST=			${WRKSRC}/../../dist
+DIST=			${WRKSRC}/mozilla/dist
 BUILD_TARGET=		nss_build_all
 MAKE_ENV+=		LD_LIBS="-L${BUILDLINK_PREFIX.nspr}/lib/nspr ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.nspr}/lib/nspr ${COMPILER_RPATH_FLAG}${LOCALBASE}/lib/nss"
 MAKE_ENV+=		LIBRUNPATH=${PREFIX}/lib BUILD_OPT=1
@@ -45,22 +45,22 @@ MAKEFLAGS+=	NS_USE_GCC=YES
 .if ${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly"
 NSS_OBJ_DIR=	${OPSYS}${OS_VERSION}_OPT.OBJ
 .elif ${OPSYS} == "Linux"
-_NSS_SHORT_OS_VERSION!=	echo ${OS_VERSION} | ${SED} -e 's/^\([[:digit:]]\.[[:digit:]]\)\..*$$/\1/'
-.if ${MACHINE_ARCH} == "i386"
-_NSS_MACHINE_ARCH=	_x86
-.elif ${MACHINE_ARCH} == "parisc" || ${MACHINE_ARCH} == "parisc64"
-_NSS_MACHINE_ARCH=	_hppa
-.elif ${MACHINE_ARCH} == "sparc64"
-_NSS_MACHINE_ARCH=	_sparc
-.else
-_NSS_MACHINE_ARCH=	_${MACHINE_ARCH}
-.endif
-NSS_OBJ_DIR=	${OPSYS}${_NSS_SHORT_OS_VERSION}${_NSS_MACHINE_ARCH}_glibc_PTH_OPT.OBJ
+NSS_SHORT_OS_VERSION!=	echo ${OS_VERSION} | ${SED} -e 's/^\([[:digit:]]\.[[:digit:]]\)\..*$$/\1/'
+.  if ${MACHINE_ARCH} == "i386"
+NSS_MACHINE_ARCH=	_x86
+.  elif ${MACHINE_ARCH} == "parisc" || ${MACHINE_ARCH} == "parisc64"
+NSS_MACHINE_ARCH=	_hppa
+.  elif ${MACHINE_ARCH} == "sparc64"
+NSS_MACHINE_ARCH=	_sparc
+.  else
+NSS_MACHINE_ARCH=	_${MACHINE_ARCH}
+.  endif
+NSS_OBJ_DIR=	${OPSYS}${NSS_SHORT_OS_VERSION}${NSS_MACHINE_ARCH}_glibc_PTH_OPT.OBJ
 .endif
 
 pre-configure:
 	${CP} ${FILESDIR}/DragonFly.mk \
-		${WRKDIR}/${DISTNAME}/mozilla/security/coreconf/
+		${WRKSRC}/mozilla/security/coreconf/
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/include/nss
@@ -68,13 +68,14 @@ do-install:
 	(cd ${DIST}/public && ${PAX} -Lrwpe . ${PREFIX}/include/nss/ )
 	(cd ${DIST}/${NSS_OBJ_DIR}/lib && \
 		${PAX} -Lrwpe *.${SO_SUFFIX} ${PREFIX}/lib/nss/ )
+	set -e; \
 	{ ${ECHO} "Name: NSS"; \
 	  ${ECHO} "Description: Mozilla Network Security Services"; \
 	  ${ECHO} "Version: ${PKGVERSION}"; \
 	  ${ECHO} "Cflags: -I${PREFIX}/include/nss"; \
 	  ${ECHO} "Libs: -L${PREFIX}/lib/nss" \
 	      "${COMPILER_RPATH_FLAG}${PREFIX}/lib/nss" \
-	      "-lnss3 -lsmime3 -lssl3 -lsoftokn3 ${BUILDLINK_LIBS.pthread}"; \
+	      "-lnss3 -lsmime3 -lssl3 -lsoftokn3 "${BUILDLINK_LIBS.pthread:Q}; \
 	} >${PREFIX}/lib/pkgconfig/nss.pc
 
 BUILDLINK_API_DEPENDS.nspr+=	nspr>=4.4.1nb2
diff --git a/devel/nss/distinfo b/devel/nss/distinfo
index c7aa14cfe0f..bc59c7c8cad 100644
--- a/devel/nss/distinfo
+++ b/devel/nss/distinfo
@@ -1,17 +1,17 @@
-$NetBSD: distinfo,v 1.11 2006/07/04 22:27:43 rillig Exp $
+$NetBSD: distinfo,v 1.12 2006/07/12 15:38:28 rillig Exp $
 
 SHA1 (nss-3.9.2.tar.gz) = 017b748d92c5f7376bda78915d1b78b260b44133
 RMD160 (nss-3.9.2.tar.gz) = c9e41ac596af2e717da76546c3a5dfd37272c195
 Size (nss-3.9.2.tar.gz) = 4734817 bytes
-SHA1 (patch-aa) = 3b0d0eb22b498d72514e4616b101d93fedc2f53d
-SHA1 (patch-ab) = 21008be57eb73f4ddd36cf89d9ca56aa082a43ee
-SHA1 (patch-ac) = 9de8db092bb2a198fe426cc2c9cb4b4de6ebdb2a
-SHA1 (patch-ad) = 454ec464874b4e424de740edd78b79d30f11d6bb
-SHA1 (patch-ae) = ad64e308931d4eb5cbfb11ca897cd11688af5b4f
-SHA1 (patch-af) = 49d70d4e1bc37b2984021ad64cf531010672e640
-SHA1 (patch-ag) = e99c7396f4a6b7430321124e7c03528ab6e7681c
-SHA1 (patch-ah) = 6c8c335d9ffe4a1dbc83a3b8defe05930d866a40
-SHA1 (patch-ai) = a68c262b67af7778024b6db350c044fe8474919e
-SHA1 (patch-aj) = 7304824888d6e611963eb125535776d07a3dcbbf
-SHA1 (patch-ak) = d1c8a7ebaf839a9ca7734a885fdfa4e091547cb5
-SHA1 (patch-al) = 73d068883b149c43f4f23151d4f02422ee70f6a4
+SHA1 (patch-aa) = d2b5f4213c35e667866279f398fe9297232d27d1
+SHA1 (patch-ab) = 2bdf81b0b4b5961daaebd870463f2bb7c6170969
+SHA1 (patch-ac) = 52fb18a906ae1c019d2cc36521cdcaef1ff978f0
+SHA1 (patch-ad) = 9fdf832d0534440930fac74835360070f135f159
+SHA1 (patch-ae) = 90dd78206ac63bb1be4e6dc92f31dd94016f137b
+SHA1 (patch-af) = c135aec94829fdf45214d69f75e1f76727ce6a35
+SHA1 (patch-ag) = 80baad088424bc06e3978e7bc960175281036aac
+SHA1 (patch-ah) = 01e8644a0a1dfc70985aed213fc753f376560865
+SHA1 (patch-ai) = 995add5e536bb0fba425295cc7972b8725f4e10d
+SHA1 (patch-aj) = fb677fe29a99b6706684f8b67ce6cfeb4e9cd9c5
+SHA1 (patch-ak) = 4816bf73acfa3edcd0a74d0e235eee7974b42dd6
+SHA1 (patch-al) = 711ae5b0ed4a5b8dd8e3735b25fcc5419c27e63e
diff --git a/devel/nss/patches/patch-aa b/devel/nss/patches/patch-aa
index 00e55f0eeec..76dc6ab00f1 100644
--- a/devel/nss/patches/patch-aa
+++ b/devel/nss/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.1.1.1 2005/02/01 21:51:12 jschauma Exp $
+$NetBSD: patch-aa,v 1.2 2006/07/12 15:38:29 rillig Exp $
 
---- Makefile.orig	Tue Jan  4 21:17:13 2005
-+++ Makefile	Tue Jan  4 21:17:25 2005
+--- mozilla/security/nss/Makefile.orig	Tue Jan  4 21:17:13 2005
++++ mozilla/security/nss/Makefile	Tue Jan  4 21:17:25 2005
 @@ -74,7 +74,7 @@
  # (7) Execute "local" rules. (OPTIONAL).                              #
  #######################################################################
diff --git a/devel/nss/patches/patch-ab b/devel/nss/patches/patch-ab
index 9c5a6a477ed..d2a64e5ad9b 100644
--- a/devel/nss/patches/patch-ab
+++ b/devel/nss/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.1.1.1 2005/02/01 21:51:12 jschauma Exp $
+$NetBSD: patch-ab,v 1.2 2006/07/12 15:38:29 rillig Exp $
 
---- ../coreconf/command.mk	2002/08/08 17:20:41	1.1
-+++ ../coreconf/command.mk	2002/08/08 17:20:54
+--- mozilla/security/coreconf/command.mk	2002/08/08 17:20:41	1.1
++++ mozilla/security/coreconf/command.mk	2002/08/08 17:20:54
 @@ -42,7 +42,7 @@
  LINK_DLL      = $(LINK) $(OS_DLLFLAGS) $(DLLFLAGS)
  LINK_EXE      = $(LINK) $(OS_LFLAGS) $(LFLAGS)
diff --git a/devel/nss/patches/patch-ac b/devel/nss/patches/patch-ac
index 816cae7868b..cc7ed3b5067 100644
--- a/devel/nss/patches/patch-ac
+++ b/devel/nss/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.2 2006/06/25 14:52:44 wiz Exp $
+$NetBSD: patch-ac,v 1.3 2006/07/12 15:38:29 rillig Exp $
 
---- lib/fortcrypt/swfort/pkcs11/Makefile.orig	2004-03-23 02:02:04.000000000 +0000
-+++ lib/fortcrypt/swfort/pkcs11/Makefile
+--- mozilla/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile.orig	2004-03-23 02:02:04.000000000 +0000
++++ mozilla/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile
 @@ -94,8 +94,8 @@ EXTRA_LIBS += \
  	$(DIST)/lib/$(LIB_PREFIX)softokn.$(LIB_SUFFIX) \
  	$(CRYPTO_LIB) \
diff --git a/devel/nss/patches/patch-ad b/devel/nss/patches/patch-ad
index 62b0f30b384..9682b897193 100644
--- a/devel/nss/patches/patch-ad
+++ b/devel/nss/patches/patch-ad
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.2 2006/06/25 14:52:44 wiz Exp $
+$NetBSD: patch-ad,v 1.3 2006/07/12 15:38:29 rillig Exp $
 
---- lib/ckfw/builtins/Makefile.orig	2003-04-20 04:23:24.000000000 +0000
-+++ lib/ckfw/builtins/Makefile
+--- mozilla/security/nss/lib/ckfw/builtins/Makefile.orig	2003-04-20 04:23:24.000000000 +0000
++++ mozilla/security/nss/lib/ckfw/builtins/Makefile
 @@ -64,8 +64,8 @@ endif
  else
  
diff --git a/devel/nss/patches/patch-ae b/devel/nss/patches/patch-ae
index 2e0d0e665e0..f0d2cf10e42 100644
--- a/devel/nss/patches/patch-ae
+++ b/devel/nss/patches/patch-ae
@@ -1,7 +1,7 @@
-$NetBSD: patch-ae,v 1.2 2005/08/12 20:11:26 reed Exp $
+$NetBSD: patch-ae,v 1.3 2006/07/12 15:38:29 rillig Exp $
 
---- cmd/platlibs.mk.orig	2004-06-18 23:13:45.000000000 -0700
-+++ cmd/platlibs.mk	2005-08-12 12:21:35.000000000 -0700
+--- mozilla/security/nss/cmd/platlibs.mk.orig	2004-06-18 23:13:45.000000000 -0700
++++ mozilla/security/nss/cmd/platlibs.mk	2005-08-12 12:21:35.000000000 -0700
 @@ -182,7 +182,7 @@
  # If GNU ld is used, we must use the -rpath-link option to tell
  # the linker where to find libsoftokn3.so, an implicit dependency
diff --git a/devel/nss/patches/patch-af b/devel/nss/patches/patch-af
index c54510587c9..87904ee66b4 100644
--- a/devel/nss/patches/patch-af
+++ b/devel/nss/patches/patch-af
@@ -1,10 +1,10 @@
-$NetBSD: patch-af,v 1.4 2006/06/25 15:25:35 wiz Exp $
+$NetBSD: patch-af,v 1.5 2006/07/12 15:38:29 rillig Exp $
 
 Fix gcc4 error:
 error: array type has incomplete element type
 
---- lib/pki1/oiddata.h.orig	2002-01-04 05:22:07.000000000 +0000
-+++ lib/pki1/oiddata.h
+--- mozilla/security/nss/lib/pki1/oiddata.h.orig	2002-01-04 05:22:07.000000000 +0000
++++ mozilla/security/nss/lib/pki1/oiddata.h
 @@ -43,6 +43,8 @@ static const char OIDDATA_CVS_ID[] = "@(
  #include "nsspki1t.h"
  #endif /* NSSPKI1T_H */
diff --git a/devel/nss/patches/patch-ag b/devel/nss/patches/patch-ag
index 14682dc3bfe..2cf4ac44eea 100644
--- a/devel/nss/patches/patch-ag
+++ b/devel/nss/patches/patch-ag
@@ -1,7 +1,7 @@
-$NetBSD: patch-ag,v 1.1 2005/02/09 16:19:35 jschauma Exp $
+$NetBSD: patch-ag,v 1.2 2006/07/12 15:38:29 rillig Exp $
 
---- cmd/shlibsign/sign.sh.orig	Sun Feb  6 17:41:50 2005
-+++ cmd/shlibsign/sign.sh	Sun Feb  6 17:42:29 2005
+--- mozilla/security/nss/cmd/shlibsign/sign.sh.orig	Sun Feb  6 17:41:50 2005
++++ mozilla/security/nss/cmd/shlibsign/sign.sh	Sun Feb  6 17:42:29 2005
 @@ -39,7 +39,7 @@
      export LIBPATH
      SHLIB_PATH=${1}/lib:$SHLIB_PATH
diff --git a/devel/nss/patches/patch-ah b/devel/nss/patches/patch-ah
index d05c576e864..368c2e50630 100644
--- a/devel/nss/patches/patch-ah
+++ b/devel/nss/patches/patch-ah
@@ -1,7 +1,7 @@
-$NetBSD: patch-ah,v 1.1 2005/08/12 20:11:26 reed Exp $
+$NetBSD: patch-ah,v 1.2 2006/07/12 15:38:29 rillig Exp $
 
---- ../coreconf/config.mk.orig	2005-08-12 12:23:06.000000000 -0700
-+++ ../coreconf/config.mk	2005-08-12 12:22:42.000000000 -0700
+--- mozilla/security/coreconf/config.mk.orig	2005-08-12 12:23:06.000000000 -0700
++++ mozilla/security/coreconf/config.mk	2005-08-12 12:22:42.000000000 -0700
 @@ -59,7 +59,7 @@
  #######################################################################
  
diff --git a/devel/nss/patches/patch-ai b/devel/nss/patches/patch-ai
index df78654a240..507bcc8519d 100644
--- a/devel/nss/patches/patch-ai
+++ b/devel/nss/patches/patch-ai
@@ -1,7 +1,7 @@
-$NetBSD: patch-ai,v 1.1 2005/08/12 20:11:26 reed Exp $
+$NetBSD: patch-ai,v 1.2 2006/07/12 15:38:29 rillig Exp $
 
---- ../../dbm/src/mktemp.c.orig	2005-08-12 12:24:10.000000000 -0700
-+++ ../../dbm/src/mktemp.c	2005-08-12 12:24:59.000000000 -0700
+--- mozilla/dbm/src/mktemp.c.orig	2005-08-12 12:24:10.000000000 -0700
++++ mozilla/dbm/src/mktemp.c	2005-08-12 12:24:59.000000000 -0700
 @@ -100,7 +100,7 @@
  static int 
  _gettemp(char *path, register int *doopen, int extraFlags)
diff --git a/devel/nss/patches/patch-aj b/devel/nss/patches/patch-aj
index 47c83966645..b07e16ee007 100644
--- a/devel/nss/patches/patch-aj
+++ b/devel/nss/patches/patch-aj
@@ -1,7 +1,7 @@
-$NetBSD: patch-aj,v 1.1 2006/01/15 16:09:21 joerg Exp $
+$NetBSD: patch-aj,v 1.2 2006/07/12 15:38:29 rillig Exp $
 
---- ../../nsprpub/config/arch.mk.orig	2006-01-15 15:10:27.000000000 +0000
-+++ ../../nsprpub/config/arch.mk
+--- mozilla/nsprpub/config/arch.mk.orig	2006-01-15 15:10:27.000000000 +0000
++++ mozilla/nsprpub/config/arch.mk
 @@ -121,7 +121,7 @@ endif
  # Handle FreeBSD 2.2-STABLE and Linux 2.0.30-osfmach3
  #
diff --git a/devel/nss/patches/patch-ak b/devel/nss/patches/patch-ak
index 270657dce0a..47bf2a84c72 100644
--- a/devel/nss/patches/patch-ak
+++ b/devel/nss/patches/patch-ak
@@ -1,7 +1,7 @@
-$NetBSD: patch-ak,v 1.1 2006/01/15 16:09:21 joerg Exp $
+$NetBSD: patch-ak,v 1.2 2006/07/12 15:38:29 rillig Exp $
 
---- ../coreconf/arch.mk.orig	2006-01-15 15:59:33.000000000 +0000
-+++ ../coreconf/arch.mk
+--- mozilla/security/coreconf/arch.mk.orig	2006-01-15 15:59:33.000000000 +0000
++++ mozilla/security/coreconf/arch.mk
 @@ -141,7 +141,7 @@ endif
  # IRIX 6.5-ALPHA-1289139620.
  #
diff --git a/devel/nss/patches/patch-al b/devel/nss/patches/patch-al
index d8ed93c49dc..1b42618820b 100644
--- a/devel/nss/patches/patch-al
+++ b/devel/nss/patches/patch-al
@@ -1,10 +1,10 @@
-$NetBSD: patch-al,v 1.2 2006/07/04 22:27:43 rillig Exp $
+$NetBSD: patch-al,v 1.3 2006/07/12 15:38:29 rillig Exp $
 
 Since GNU Make 3.81, the backslashes are preserved in the shell commands
 and need to be filtered out explicitly.
 
---- ../coreconf/rules.mk.orig	2004-03-23 01:56:47.000000000 +0100
-+++ ../coreconf/rules.mk	2006-06-24 10:20:21.000000000 +0200
+--- mozilla/security/coreconf/rules.mk.orig	2004-03-23 01:56:47.000000000 +0100
++++ mozilla/security/coreconf/rules.mk	2006-06-24 10:20:21.000000000 +0200
 @@ -882,7 +882,7 @@
  ifneq (,$(filter-out OpenVMS OS2 WIN%,$(OS_TARGET)))
  # Can't use sed because of its 4000-char line length limit, so resort to perl