Date: Thu, 23 Jul 2020 15:13:22 +0000 (UTC) From: Jochen Neumeister <joneum@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r542936 - head/security/ca_root_nss Message-ID: <202007231513.06NFDMHZ036710@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: joneum Date: Thu Jul 23 15:13:22 2020 New Revision: 542936 URL: https://svnweb.freebsd.org/changeset/ports/542936 Log: - Add LICENSE_FILE. - Remove NO_WRKSUBDIR and do-extract target because there isn't special reason requiring them. - Some cosmetics fixes PR: 222262 Reported by: Yasuhiro KIMURA <yasu@utahime.org> Approved by: ports-secteam (with hat) Sponsored by: Netzkommune GmbH Modified: head/security/ca_root_nss/Makefile Modified: head/security/ca_root_nss/Makefile ============================================================================== --- head/security/ca_root_nss/Makefile Thu Jul 23 14:43:55 2020 (r542935) +++ head/security/ca_root_nss/Makefile Thu Jul 23 15:13:22 2020 (r542936) @@ -10,7 +10,14 @@ MAINTAINER= ports-secteam@FreeBSD.org COMMENT= Root certificate bundle from the Mozilla Project LICENSE= MPL20 +LICENSE_FILE= ${WRKSRC}/COPYING +USES= perl5 ssl:build +USE_PERL5= build + +NO_ARCH= yes +WRKSRC_SUBDIR= nss + OPTIONS_DEFINE= ETCSYMLINK OPTIONS_DEFAULT= ETCSYMLINK @@ -19,11 +26,6 @@ OPTIONS_SUB= yes ETCSYMLINK_DESC= Add symlink to /etc/ssl/cert.pem ETCSYMLINK_CONFLICTS_INSTALL= ca-roots-[0-9]* -USES= perl5 ssl:build -USE_PERL5= build -NO_ARCH= yes -NO_WRKSUBDIR= yes - CERTDIR?= share/certs PLIST_SUB+= CERTDIR=${CERTDIR} @@ -34,35 +36,28 @@ PLIST_SUB+= CERTDIR=${CERTDIR} # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! VERSION_NSS= 3.54 #NSS_SUFFIX= -with-ckbi-1.98 -CERTDATA_TXT_PATH= nss-${VERSION_NSS}/nss/lib/ckfw/builtins/certdata.txt +CERTDATA_TXT_PATH= lib/ckfw/builtins/certdata.txt BUNDLE_PROCESSOR= MAca-bundle.pl SUB_FILES= MAca-bundle.pl pkg-message SUB_LIST= VERSION_NSS=${VERSION_NSS} -do-extract: - @${MKDIR} ${WRKDIR} - @${TAR} -C ${WRKDIR} -xf ${DISTDIR}/nss-${VERSION_NSS}${NSS_SUFFIX}${EXTRACT_SUFX} \ - ${CERTDATA_TXT_PATH} - @${CP} ${WRKDIR}/${CERTDATA_TXT_PATH} ${WRKDIR} - @${RM} -r ${WRKDIR}/nss-${VERSION_NSS} - do-build: apply-slist @${SETENV} PATH=${LOCALBASE}/bin:$${PATH} \ ${PERL} ${WRKDIR}/${BUNDLE_PROCESSOR} \ - < ${WRKDIR}/certdata.txt > \ + < ${WRKSRC}/${CERTDATA_TXT_PATH} > \ ${WRKDIR}/ca-root-nss.crt do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/${CERTDIR} ${INSTALL_DATA} ${WRKDIR}/ca-root-nss.crt ${STAGEDIR}${PREFIX}/${CERTDIR} ${MKDIR} ${STAGEDIR}${PREFIX}/etc/ssl - ${LN} -sf ${PREFIX}/${CERTDIR}/ca-root-nss.crt ${STAGEDIR}${PREFIX}/etc/ssl/cert.pem.sample + ${LN} -sf ../../${CERTDIR}/ca-root-nss.crt ${STAGEDIR}${PREFIX}/etc/ssl/cert.pem.sample ${MKDIR} ${STAGEDIR}${PREFIX}/openssl - ${LN} -sf ${PREFIX}/${CERTDIR}/ca-root-nss.crt ${STAGEDIR}${PREFIX}/openssl/cert.pem.sample + ${LN} -sf ../${CERTDIR}/ca-root-nss.crt ${STAGEDIR}${PREFIX}/openssl/cert.pem.sample do-install-ETCSYMLINK-on: ${MKDIR} ${STAGEDIR}/etc/ssl - ${LN} -sf ${PREFIX}/${CERTDIR}/ca-root-nss.crt ${STAGEDIR}/etc/ssl/cert.pem + ${LN} -sf ../..${PREFIX}/${CERTDIR}/ca-root-nss.crt ${STAGEDIR}/etc/ssl/cert.pem .include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202007231513.06NFDMHZ036710>