diff options
| author | gdt <gdt@pkgsrc.org> | 2017-07-06 00:58:35 +0000 |
|---|---|---|
| committer | gdt <gdt@pkgsrc.org> | 2017-07-06 00:58:35 +0000 |
| commit | dfc52394db1eb909704fb2b24d79cb71baf37573 (patch) | |
| tree | 78fd0412b8da8ff395f17df50876e2bf913ed6a3 /security | |
| parent | 64aa8e939d051a4af581ee48c05bb53ea26e2aaf (diff) | |
| download | pkgsrc-dfc52394db1eb909704fb2b24d79cb71baf37573.tar.gz | |
Regularize path subsitution and use PREFIX
Use PREFIX rather than LOCALBASE. What matters is where this packages
prefix is, not anything else.
Substitute all paths the same way, assigning to sh variables in one
place, alphabetically, and then using them. Sort list of substituted
variables alphabetically also, so it's easier to review the code.
No functional change for any reasonable configuration.
Based on a suggestion by J. Lewis Muir on pkgsrc-users.
Diffstat (limited to 'security')
| -rw-r--r-- | security/mozilla-rootcerts/Makefile | 6 | ||||
| -rw-r--r-- | security/mozilla-rootcerts/files/mozilla-rootcerts.sh | 8 |
2 files changed, 8 insertions, 6 deletions
diff --git a/security/mozilla-rootcerts/Makefile b/security/mozilla-rootcerts/Makefile index 197e32758b7..a6a43db29a2 100644 --- a/security/mozilla-rootcerts/Makefile +++ b/security/mozilla-rootcerts/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.30 2017/06/22 00:30:10 gdt Exp $ +# $NetBSD: Makefile,v 1.31 2017/07/06 00:58:35 gdt Exp $ DISTNAME= mozilla-rootcerts-1.0.${CERTDATA_DATE} -PKGREVISION= 5 +PKGREVISION= 6 CATEGORIES= security MASTER_SITES= -https://hg.mozilla.org/mozilla-central/raw-file/052b90b5414f/security/nss/lib/ckfw/builtins/certdata.txt DISTFILES= ${CERTDATA} @@ -40,7 +40,7 @@ SUBST_CLASSES= paths SUBST_MESSAGE.paths= Replacing hard-coded paths. SUBST_STAGE.paths= post-configure SUBST_FILES.paths= ${CERT_SCRIPT} -SUBST_VARS.paths= AWK ECHO EXPR LN LOCALBASE LS RM DATADIR MKDIR SSLDIR +SUBST_VARS.paths= AWK DATADIR ECHO EXPR LN LS MKDIR PREFIX SSLDIR RM SUBST_SED.paths= -e 's,@OPENSSL@,${TOOLS_PATH.openssl},g' INSTALLATION_DIRS= sbin ${DATADIR} diff --git a/security/mozilla-rootcerts/files/mozilla-rootcerts.sh b/security/mozilla-rootcerts/files/mozilla-rootcerts.sh index 71c1e9bf16c..c382fccdd90 100644 --- a/security/mozilla-rootcerts/files/mozilla-rootcerts.sh +++ b/security/mozilla-rootcerts/files/mozilla-rootcerts.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: mozilla-rootcerts.sh,v 1.18 2017/06/19 00:39:53 gdt Exp $ +# $NetBSD: mozilla-rootcerts.sh,v 1.19 2017/07/06 00:58:35 gdt Exp $ # # This script is meant to be used as follows: # @@ -10,17 +10,19 @@ # : ${AWK=@AWK@} +: ${DATADIR=@DATADIR@} : ${ECHO=@ECHO@} : ${EXPR=@EXPR@} : ${LN=@LN@} : ${LS=@LS@} : ${MKDIR=@MKDIR@} : ${OPENSSL=@OPENSSL@} +: ${PREFIX=@PREFIX@} : ${SSLDIR=@SSLDIR@} : ${RM=@RM@} -self="@LOCALBASE@/sbin/mozilla-rootcerts" -certfile="@DATADIR@/certdata.txt" +self="${PREFIX}/sbin/mozilla-rootcerts" +certfile="${DATADIR}/certdata.txt" certdir=${SSLDIR}/certs destdir= |