diff options
| author | Florian Smeets <flo@FreeBSD.org> | 2012-01-12 23:41:27 +0000 |
|---|---|---|
| committer | Florian Smeets <flo@FreeBSD.org> | 2012-01-12 23:41:27 +0000 |
| commit | 75e63fc7f1da5faa506b9505f7e734d5dab47e5f (patch) | |
| tree | 51361757a5df89043bb612362a6587027683ee75 /security/nss | |
| parent | 189491f2e8fb2626ad7d51ce096f288e860e17bf (diff) | |
- update to NSS_3_13_1_WITH_CKBI_1_88_RTM
- some fixes to make the regression tests actually run [1]
Submitted by: mi [1]
Notes
Notes:
svn path=/head/; revision=289060
Diffstat (limited to 'security/nss')
| -rw-r--r-- | security/nss/Makefile | 14 | ||||
| -rw-r--r-- | security/nss/distinfo | 4 |
2 files changed, 10 insertions, 8 deletions
diff --git a/security/nss/Makefile b/security/nss/Makefile index 533201604415..c0fae2db94b4 100644 --- a/security/nss/Makefile +++ b/security/nss/Makefile @@ -7,7 +7,6 @@ PORTNAME= nss PORTVERSION= ${_MAJOR}.${_MINOR}.${_PATCH} -PORTREVISION= 1 CATEGORIES= security MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITE_SUBDIR= security/nss/releases/NSS_${PORTVERSION:S/./_/g}_WITH_CKBI_${CKBI_VER:S/./_/}_RTM/src @@ -22,8 +21,8 @@ LIB_DEPENDS= nspr4.1:${PORTSDIR}/devel/nspr \ sqlite3.8:${PORTSDIR}/databases/sqlite3 _MAJOR= 3 -_MINOR= 12 -_PATCH= 11 +_MINOR= 13 +_PATCH= 1 CKBI_VER= 1.88 @@ -40,9 +39,9 @@ CFLAGS+= -I${LOCALBASE}/include/nspr -L${LOCALBASE}/lib 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 @@ -51,10 +50,11 @@ INSTALL_BINS= certcgi certutil checkcert cmsutil crlutil derdump makepqg \ 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 \ @@ -82,6 +82,8 @@ post-patch: ${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 diff --git a/security/nss/distinfo b/security/nss/distinfo index 69b642b0fb7b..854c26c5e095 100644 --- a/security/nss/distinfo +++ b/security/nss/distinfo @@ -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 |