Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1499302715251780"
MIME-Version: 1.0
Date: Thu, 6 Jul 2017 00:58:35 +0000
From: "Greg Troxel" <gdt@netbsd.org>
Subject: CVS commit: pkgsrc/security/mozilla-rootcerts
To: pkgsrc-changes@NetBSD.org
Reply-To: gdt@netbsd.org
Message-Id: <20170706005835.7CA1CFAE8@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1499302715251780
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	gdt
Date:		Thu Jul  6 00:58:35 UTC 2017

Modified Files:
	pkgsrc/security/mozilla-rootcerts: Makefile
	pkgsrc/security/mozilla-rootcerts/files: mozilla-rootcerts.sh

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 pkgsrc/security/mozilla-rootcerts/Makefile
cvs rdiff -u -r1.18 -r1.19 \
    pkgsrc/security/mozilla-rootcerts/files/mozilla-rootcerts.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1499302715251780
Content-Disposition: inline
Content-Length: 2146
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/security/mozilla-rootcerts/Makefile
diff -u pkgsrc/security/mozilla-rootcerts/Makefile:1.30 pkgsrc/security/mozilla-rootcerts/Makefile:1.31
--- pkgsrc/security/mozilla-rootcerts/Makefile:1.30	Thu Jun 22 00:30:10 2017
+++ pkgsrc/security/mozilla-rootcerts/Makefile	Thu Jul  6 00:58:35 2017
@@ -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}

Index: pkgsrc/security/mozilla-rootcerts/files/mozilla-rootcerts.sh
diff -u pkgsrc/security/mozilla-rootcerts/files/mozilla-rootcerts.sh:1.18 pkgsrc/security/mozilla-rootcerts/files/mozilla-rootcerts.sh:1.19
--- pkgsrc/security/mozilla-rootcerts/files/mozilla-rootcerts.sh:1.18	Mon Jun 19 00:39:53 2017
+++ pkgsrc/security/mozilla-rootcerts/files/mozilla-rootcerts.sh	Thu Jul  6 00:58:35 2017
@@ -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=
 

--_----------=_1499302715251780--