diff options
| author | Florian Smeets <flo@FreeBSD.org> | 2013-10-24 20:10:51 +0000 |
|---|---|---|
| committer | Florian Smeets <flo@FreeBSD.org> | 2013-10-24 20:10:51 +0000 |
| commit | c8acac8ff4da7a9058be1bd158e66ce777005fa0 (patch) | |
| tree | 00e7591130dd8fd16b4d50214b63721e7d93f322 /security | |
| parent | bd675ff4114b03547b104816304be009f5627a6d (diff) | |
| download | ports-c8acac8ff4da7a9058be1bd158e66ce777005fa0.tar.gz ports-c8acac8ff4da7a9058be1bd158e66ce777005fa0.zip | |
Notes
Diffstat (limited to 'security')
| -rw-r--r-- | security/ca_root_nss/Makefile | 10 | ||||
| -rw-r--r-- | security/ca_root_nss/distinfo | 4 | ||||
| -rw-r--r-- | security/nss/Makefile | 19 | ||||
| -rw-r--r-- | security/nss/distinfo | 4 |
4 files changed, 17 insertions, 20 deletions
diff --git a/security/ca_root_nss/Makefile b/security/ca_root_nss/Makefile index bb7d487f6a39..db4667ad0ba8 100644 --- a/security/ca_root_nss/Makefile +++ b/security/ca_root_nss/Makefile @@ -2,7 +2,6 @@ PORTNAME= ca_root_nss PORTVERSION= ${VERSION_NSS} -PORTREVISION= 1 CATEGORIES= security MASTER_SITES= MOZILLA/security/nss/releases/${DISTNAME:U:C/[-.]/_/g}_RTM/src DISTNAME= nss-${VERSION_NSS}${NSS_SUFFIX} @@ -25,14 +24,13 @@ PLIST_SUB+= CERTDIR=${CERTDIR} # !!! Please DO NOT submit patches for new version until it has !!! # !!! been committed there first. !!! # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -VERSION_NSS= 3.15.1 +VERSION_NSS= 3.15.2 #NSS_SUFFIX= .with.ckbi.1.93 CERTDATA_TXT_PATH= nss-${VERSION_NSS}/nss/lib/ckfw/builtins/certdata.txt BUNDLE_PROCESSOR= MAca-bundle.pl SUB_FILES= MAca-bundle.pl SUB_LIST= VERSION_NSS=${VERSION_NSS} -NO_STAGE= yes .include <bsd.port.options.mk> .if ${PORT_OPTIONS:METCSYMLINK} @@ -55,10 +53,10 @@ do-build: apply-slist ${WRKDIR}/ca-root-nss.crt do-install: - ${MKDIR} ${PREFIX}/${CERTDIR} - ${INSTALL_DATA} ${WRKDIR}/ca-root-nss.crt ${PREFIX}/${CERTDIR} + ${MKDIR} ${STAGEDIR}${PREFIX}/${CERTDIR} + ${INSTALL_DATA} ${WRKDIR}/ca-root-nss.crt ${STAGEDIR}${PREFIX}/${CERTDIR} .if ${PORT_OPTIONS:METCSYMLINK} - ${LN} -sf ${PREFIX}/${CERTDIR}/ca-root-nss.crt /etc/ssl/cert.pem + ${LN} -sf ${STAGEDIR}${PREFIX}/${CERTDIR}/ca-root-nss.crt /etc/ssl/cert.pem .endif .include <bsd.port.mk> diff --git a/security/ca_root_nss/distinfo b/security/ca_root_nss/distinfo index 5924f8ceeb34..051dd1ff71c1 100644 --- a/security/ca_root_nss/distinfo +++ b/security/ca_root_nss/distinfo @@ -1,2 +1,2 @@ -SHA256 (nss-3.15.1.tar.gz) = f994106a33d1f3210f4151bbb3419a1c28fd1cb545caa7dc9afdebd6da626284 -SIZE (nss-3.15.1.tar.gz) = 6286561 +SHA256 (nss-3.15.2.tar.gz) = 7b2c80d18c49581edbdb509cbf7afd61d8c53658f2a38ff20e224c1909faeddc +SIZE (nss-3.15.2.tar.gz) = 6288669 diff --git a/security/nss/Makefile b/security/nss/Makefile index 594256f55109..12c508f8fc23 100644 --- a/security/nss/Makefile +++ b/security/nss/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= nss -PORTVERSION= 3.15.1 +PORTVERSION= 3.15.2 #DISTVERSIONSUFFIX= .with.ckbi.1.93 CATEGORIES= security MASTER_SITES= MOZILLA/security/${PORTNAME}/releases/${DISTNAME:U:C/[-.]/_/g}_RTM/src @@ -46,7 +46,6 @@ BINS= ${DIST}/${OPSYS}${OSREL}_OPT.OBJ BINS= ${DIST}/${OPSYS}${OSREL}_DBG.OBJ .endif -NO_STAGE= yes .include <bsd.port.pre.mk> .if ${ARCH} == amd64 @@ -78,20 +77,20 @@ post-patch: ${XARGS} ${REINPLACE_CMD} -e 's|#! */bin/bash|#!${SH}|' do-install: - ${MKDIR} ${PREFIX}/include/nss/nss ${PREFIX}/lib/nss + ${MKDIR} ${STAGEDIR}${PREFIX}/include/nss/nss ${STAGEDIR}${PREFIX}/lib/nss ${FIND} ${DIST}/public/nss -type l \ - -exec ${INSTALL_DATA} {} ${PREFIX}/include/nss/nss \; + -exec ${INSTALL_DATA} {} ${STAGEDIR}${PREFIX}/include/nss/nss \; ${INSTALL_DATA} ${BINS}/lib/*.so.1 \ - ${PREFIX}/lib/nss + ${STAGEDIR}${PREFIX}/lib/nss ${INSTALL_DATA} ${BINS}/lib/libcrmf.a \ - ${PREFIX}/lib/nss + ${STAGEDIR}${PREFIX}/lib/nss .for bin in ${INSTALL_BINS} ${INSTALL_PROGRAM} ${BINS}/bin/${bin} \ - ${PREFIX}/bin + ${STAGEDIR}${PREFIX}/bin .endfor cd ${BINS}/lib && \ - ${TAR} -cf - *.so | ${TAR} --unlink -C ${PREFIX}/lib/nss -xf - - ${INSTALL_SCRIPT} ${WRKDIR}/nss-config ${PREFIX}/bin - ${INSTALL_DATA} ${WRKDIR}/nss.pc ${PREFIX}/libdata/pkgconfig + ${TAR} -cf - *.so | ${TAR} --unlink -C ${STAGEDIR}${PREFIX}/lib/nss -xf - + ${INSTALL_SCRIPT} ${WRKDIR}/nss-config ${STAGEDIR}${PREFIX}/bin + ${INSTALL_DATA} ${WRKDIR}/nss.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig .include <bsd.port.post.mk> diff --git a/security/nss/distinfo b/security/nss/distinfo index 5924f8ceeb34..051dd1ff71c1 100644 --- a/security/nss/distinfo +++ b/security/nss/distinfo @@ -1,2 +1,2 @@ -SHA256 (nss-3.15.1.tar.gz) = f994106a33d1f3210f4151bbb3419a1c28fd1cb545caa7dc9afdebd6da626284 -SIZE (nss-3.15.1.tar.gz) = 6286561 +SHA256 (nss-3.15.2.tar.gz) = 7b2c80d18c49581edbdb509cbf7afd61d8c53658f2a38ff20e224c1909faeddc +SIZE (nss-3.15.2.tar.gz) = 6288669 |