summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorFlorian Smeets <flo@FreeBSD.org>2012-06-04 21:14:30 +0000
committerFlorian Smeets <flo@FreeBSD.org>2012-06-04 21:14:30 +0000
commit42c98f40458b3a3a9345da2b11fef42a434fabc8 (patch)
tree41dd05487bfb44fcb507d4806e343a9d1905421b /security
parentUpdate to 3.13.5 (diff)
- Update to 3.13.5
- Convert to optionsng
Notes
Notes: svn path=/head/; revision=298396
Diffstat (limited to 'security')
-rw-r--r--security/ca_root_nss/Makefile13
-rw-r--r--security/ca_root_nss/distinfo4
2 files changed, 9 insertions, 8 deletions
diff --git a/security/ca_root_nss/Makefile b/security/ca_root_nss/Makefile
index c627f2a2ffb0..9e5af2047636 100644
--- a/security/ca_root_nss/Makefile
+++ b/security/ca_root_nss/Makefile
@@ -15,7 +15,8 @@ DISTNAME= nss-${VERSION_NSS}${NSS_SUFFIX}
MAINTAINER= gecko@FreeBSD.org
COMMENT= The root certificate bundle from the Mozilla Project
-OPTIONS= ETCSYMLINK "Add symlink to /etc/ssl/cert.pem" off
+OPTIONS_DEFINE= ETCSYMLINK
+ETCSYMLINK_DESC= Add symlink to /etc/ssl/cert.pem
USE_PERL5_BUILD= yes
NO_WRKSUBDIR= yes
@@ -28,14 +29,14 @@ PLIST_SUB+= CERTDIR=${CERTDIR}
# !!! www/apache13-modssl. Please DO NOT submit patches for !!!
# !!! new versions until they have been committed there first. !!!
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-VERSION_NSS= 3.13.4
+VERSION_NSS= 3.13.5
VERSION_APACHE= 1.3.41
CERTDATA_TXT_PATH= nss-${VERSION_NSS}/mozilla/security/nss/lib/ckfw/builtins/certdata.txt
BUNDLE_PROCESSOR= MAca-bundle.pl
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
-.if !defined(WITHOUT_ETCSYMLINK)
+.if ${PORT_OPTIONS:METCSYMLINK}
PLIST_SUB+= ETCSYMLINK=
CONFLICTS= ca-roots-[0-9]*
.else
@@ -62,8 +63,8 @@ do-build:
do-install:
${MKDIR} ${PREFIX}/${CERTDIR}
${INSTALL_DATA} ${WRKDIR}/ca-root-nss.crt ${PREFIX}/${CERTDIR}
-.if !defined(WITHOUT_ETCSYMLINK)
+.if ${PORT_OPTIONS:METCSYMLINK}
${LN} -sf ${PREFIX}/${CERTDIR}/ca-root-nss.crt /etc/ssl/cert.pem
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/security/ca_root_nss/distinfo b/security/ca_root_nss/distinfo
index 6c9006689c60..9c961ba22116 100644
--- a/security/ca_root_nss/distinfo
+++ b/security/ca_root_nss/distinfo
@@ -1,2 +1,2 @@
-SHA256 (nss-3.13.4.tar.gz) = a552f56b03c0c716ba950c7eef971d87f717c02a4d9a75ee2fe84bd036830de5
-SIZE (nss-3.13.4.tar.gz) = 6087584
+SHA256 (nss-3.13.5.tar.gz) = ee8b995ebc971308a5bc8b50eb391cd925d6ee7c5e139d25018ee993e71b012a
+SIZE (nss-3.13.5.tar.gz) = 6087983