[SVN-Commit] r684 - branches/experimental/security/nss

[svn-freebsd-gecko at chruetertee.ch]

Author: flo
Date: Fri Dec 30 09:14:54 2011
New Revision: 684

Log:
- some fixes to make the regression tests actually run

Submitted by:	mi

Modified:
   branches/experimental/security/nss/Makefile

Modified: branches/experimental/security/nss/Makefile
==============================================================================
--- branches/experimental/security/nss/Makefile	Wed Dec 28 21:41:00 2011	(r683)
+++ branches/experimental/security/nss/Makefile	Fri Dec 30 09:14:54 2011	(r684)
@@ -39,9 +39,9 @@
 
 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
 
@@ -50,10 +50,11 @@
 		p7verify pk12util rsaperf shlibsign signtool signver \
 		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<'	\
 	    ${WRKSRC:H:H}/tests_results/security/*/results.html; then	\
@@ -81,6 +82,8 @@
 		${XARGS} ${REINPLACE_CMD} -e 's|"nspr.h"|<nspr.h>|'
 	@${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:
 	${MKDIR} ${PREFIX}/include/nss/nss ${PREFIX}/lib/nss