[SVN-Commit] r1159 - trunk/security/ca_root_nss

[svn-freebsd-gecko at chruetertee.ch]

Author: jbeich
Date: Thu Feb  7 09:41:55 2013
New Revision: 1159

Log:
backout r1152 and 1153, a poorly thought out idea that doesn't even work

Modified:
   trunk/security/ca_root_nss/Makefile
   trunk/security/ca_root_nss/pkg-plist

Modified: trunk/security/ca_root_nss/Makefile
==============================================================================
--- trunk/security/ca_root_nss/Makefile	Tue Feb  5 00:08:02 2013	(r1158)
+++ trunk/security/ca_root_nss/Makefile	Thu Feb  7 09:41:55 2013	(r1159)
@@ -11,15 +11,14 @@
 MAINTAINER=	gecko at FreeBSD.org
 COMMENT=	The root certificate bundle from the Mozilla Project
 
-OPTIONS_DEFINE=	ETCSYMLINK OPENSSL
+OPTIONS_DEFINE=	ETCSYMLINK
 ETCSYMLINK_DESC=	Add symlink to /etc/ssl/cert.pem
-OPENSSL_DESC=	Add a hashed symlink for use with OpenSSL
 
 USE_PERL5_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
-CERTDIR?=	${PREFIX}/share/certs
-PLIST_SUB+=	CERTDIR=${CERTDIR:S,^/,,}
+CERTDIR?=	share/certs
+PLIST_SUB+=	CERTDIR=${CERTDIR}
 
 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 # !!!  These versions are indented to track security/nss.        !!!
@@ -42,13 +41,6 @@
 PLIST_SUB+=	ETCSYMLINK="@comment "
 .endif
 
-.if ${PORT_OPTIONS:MOPENSSL}
-PLIST_SUB+=	OPENSSL= \
-		CA_ROOT_NSS_HASH="$$(cat ${WRKDIR}/ca-root-nss.hash)"
-.else
-PLIST_SUB+=	OPENSSL="@comment "
-.endif
-
 do-extract:
 	@${MKDIR} ${WRKDIR}
 	@${TAR} -C ${WRKDIR} -xf ${DISTDIR}/nss-${VERSION_NSS}${NSS_SUFFIX}${EXTRACT_SUFX} \
@@ -60,20 +52,12 @@
 	@${PERL} ${WRKDIR}/${BUNDLE_PROCESSOR} \
 	    < ${WRKDIR}/certdata.txt > \
 	    ${WRKDIR}/ca-root-nss.crt
-.if ${PORT_OPTIONS:MOPENSSL}
-	openssl x509 -hash -noout -in \
-		${WRKDIR}/ca-root-nss.crt >${WRKDIR}/ca-root-nss.hash
-.endif
 
 do-install:
-	${MKDIR} ${CERTDIR}
-	${INSTALL_DATA} ${WRKDIR}/ca-root-nss.crt ${CERTDIR}
-.if ${PORT_OPTIONS:MOPENSSL}
-	cd ${CERTDIR} && ${LN} -fs ca-root-nss.crt \
-		$$(cat ${WRKDIR}/ca-root-nss.hash).0
-.endif
+	${MKDIR} ${PREFIX}/${CERTDIR}
+	${INSTALL_DATA} ${WRKDIR}/ca-root-nss.crt ${PREFIX}/${CERTDIR}
 .if ${PORT_OPTIONS:METCSYMLINK}
-	${LN} -sf ${CERTDIR}/ca-root-nss.crt /etc/ssl/cert.pem
+	${LN} -sf ${PREFIX}/${CERTDIR}/ca-root-nss.crt /etc/ssl/cert.pem
 .endif
 
 .include <bsd.port.mk>

Modified: trunk/security/ca_root_nss/pkg-plist
==============================================================================
--- trunk/security/ca_root_nss/pkg-plist	Tue Feb  5 00:08:02 2013	(r1158)
+++ trunk/security/ca_root_nss/pkg-plist	Thu Feb  7 09:41:55 2013	(r1159)
@@ -1,5 +1,4 @@
- at cwd /
 %%CERTDIR%%/ca-root-nss.crt
-%%OPENSSL%%%%CERTDIR%%/%%CA_ROOT_NSS_HASH%%.0
 @dirrmtry %%CERTDIR%%
+%%ETCSYMLINK%%@cwd /
 %%ETCSYMLINK%%etc/ssl/cert.pem