diff options
Diffstat (limited to 'security/nss')
| -rw-r--r-- | security/nss/Makefile | 10 | ||||
| -rw-r--r-- | security/nss/files/patch-sysdb | 11 |
2 files changed, 15 insertions, 6 deletions
diff --git a/security/nss/Makefile b/security/nss/Makefile index 0645404ee829..a14556f9202a 100644 --- a/security/nss/Makefile +++ b/security/nss/Makefile @@ -11,7 +11,7 @@ MAINTAINER= gecko@FreeBSD.org COMMENT= Libraries to support development of security-enabled applications BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip \ - nspr>=4.8.8:${PORTSDIR}/devel/nspr \ + nspr>=4.10:${PORTSDIR}/devel/nspr \ sqlite3>=3.7.15:${PORTSDIR}/databases/sqlite3 LIB_DEPENDS= nspr4.1:${PORTSDIR}/devel/nspr \ sqlite3.8:${PORTSDIR}/databases/sqlite3 @@ -32,9 +32,7 @@ SUB_LIST= PORTVERSION=${PORTVERSION} DIST= ${WRKSRC:H}/dist -EXTERNALS= CVS dbm security/nss/lib/zlib nsprpub security/dbm -EXTRACT_AFTER_ARGS=| ${TAR} -xf - \ - ${EXTERNALS:C,^,--exclude ${PORTNAME}-${PORTVERSION}/mozilla/,} +EXTRACT_AFTER_ARGS=--exclude */lib/zlib --exclude */lib/dbm --exclude */lib/sqlite INSTALL_BINS= certcgi certutil checkcert cmsutil crlutil derdump makepqg \ mangle modutil ocspclnt oidcalc p7content p7env p7sign \ @@ -61,8 +59,8 @@ check regression-test test: LD_LIBRARY_PATH="${BINS}/lib" \ ${MAKE_ENV} \ ./all.sh - @if ${GREP} -F '>Failed<' \ - ${WRKSRC:H:H}/tests_results/security/*/results.html; then \ + @if ${GREP} -Fh '>Failed<' \ + ${WRKSRC:H}/tests_results/security/*/results.html; then \ echo "Some tests have failed. Let ${MAINTAINER} know."; \ exit 1; \ else \ diff --git a/security/nss/files/patch-sysdb b/security/nss/files/patch-sysdb index 7874a3ad9f09..7c67d21aa651 100644 --- a/security/nss/files/patch-sysdb +++ b/security/nss/files/patch-sysdb @@ -122,6 +122,17 @@ #include "seccomon.h" #include "secdert.h" #include "secoidt.h" +--- lib/manifest.mn~ ++++ lib/manifest.mn +@@ -20,7 +20,7 @@ DIRS = \ + $(UTIL_SRCDIR) \ + $(FREEBL_SRCDIR) \ + $(SQLITE_SRCDIR) \ +- $(DBM_SRCDIR) \ ++ $(NULL) \ + $(SOFTOKEN_SRCDIR) \ + base dev pki \ + libpkix \ --- cmd/platlibs.mk.orig 2009-08-31 12:57:13.000000000 +0200 +++ cmd/platlibs.mk 2009-08-31 12:57:29.000000000 +0200 @@ -85,7 +85,7 @@ |