New nss and firefox

[Mikhail T.]

On 29.12.2011 03:36, Florian Smeets wrote:
> a) Sweeping commits are still not allowed as the 9.0-RELEASE process is

I have just replaced the older nss (3.12.x) with the new 3.13.1 (patch 
attached). I then restarted (without rebuilding) the three nss-using programs on 
my system: pidgin, firefox, and thunderbird (the latter two were built some 
months ago after manually hacking the Makefiles to use the ports-provided nss).

All three applications restarted without a problem and are happily working 
(typing this in Thunderbird). I think, this is sufficient proof, that the update 
would not qualify as "sweeping".

The patch also fixes-up the test- and the extraction- targets -- both seem to 
fall into disrepair every once in a while. 57 of the 2380 tests currently fail 
on my system (FreeBSD-8.2/i386)... Yours,

    -mi

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/security/nss/Makefile,v
retrieving revision 1.60
diff -U 2 -r1.60 Makefile
--- Makefile	28 Dec 2011 22:16:13 -0000	1.60
+++ Makefile	30 Dec 2011 00:10:21 -0000
@@ -8,5 +8,4 @@
 PORTNAME=	nss
 PORTVERSION=	${_MAJOR}.${_MINOR}.${_PATCH}
-PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
@@ -23,6 +22,6 @@
 
 _MAJOR=	3
-_MINOR=	12
-_PATCH=	11
+_MINOR=	13
+_PATCH=	1
 
 CKBI_VER=	1.88
@@ -41,7 +40,7 @@
 DIST=		${WRKSRC:H:H}/dist
 
-EXTERNALS=	CVS dbm security/nss/cmd/zlib nsprpub security/dbm
+EXTERNALS=	CVS dbm security/nss/lib/zlib nsprpub security/dbm
 EXTRACT_AFTER_ARGS=| ${TAR} -xf -	\
-	${EXTERNALS:C,^,--exclude ${DISTNAME}/mozilla/,}
+	${EXTERNALS:C,^,--exclude ${PORTNAME}-${PORTVERSION}/mozilla/,}
 
 BINS=${DIST}/${OPSYS}${OSREL}_OPT.OBJ
@@ -52,8 +51,9 @@
 		ssltap strsclnt symkeyutil vfychain vfyserv
 
-test:
+check regression-test test:
 	cd ${WRKSRC}/tests;	\
 		${SETENV} PATH="${BINS}/bin:${PATH}" \
 		    LD_LIBRARY_PATH="${BINS}/lib" \
+		    ${MAKE_ENV}	\
 			./all.sh
 	@if ${GREP} -F '>Failed<'	\
@@ -83,4 +83,6 @@
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
 		${WRKSRC}/lib/softoken/manifest.mn
+	${FIND} ${WRKSRC}/tests -name '*.sh' | ${XARGS} ${GREP} -l -F '/bin/bash' | \
+		${XARGS} ${REINPLACE_CMD} -e 's|#! */bin/bash|#!${SH}|'
 
 do-install:
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/security/nss/distinfo,v
retrieving revision 1.24
diff -U 2 -r1.24 distinfo
--- distinfo	28 Dec 2011 22:16:13 -0000	1.24
+++ distinfo	30 Dec 2011 00:10:21 -0000
@@ -1,2 +1,2 @@
-SHA256 (nss-3.12.11.with.ckbi.1.88.tar.gz) = bd1d49031d415d38568522c079d55f3428c65601077bdc69090e28b56a145a2b
-SIZE (nss-3.12.11.with.ckbi.1.88.tar.gz) = 6041001
+SHA256 (nss-3.13.1.with.ckbi.1.88.tar.gz) = 456fd2ad036976660ae7e4e24edddc49f2f47e7ca490c1c5372771bbb5207879
+SIZE (nss-3.13.1.with.ckbi.1.88.tar.gz) = 6065634