Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1496867041221210"
MIME-Version: 1.0
Date: Wed, 7 Jun 2017 20:24:01 +0000
From: "Johnny C. Lam" <jlam@netbsd.org>
Subject: CVS commit: pkgsrc/mk/pkgformat/pkg
To: pkgsrc-changes@NetBSD.org
Reply-To: jlam@netbsd.org
Message-Id: <20170607202401.56031FAE7@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

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

Module Name:	pkgsrc
Committed By:	jlam
Date:		Wed Jun  7 20:24:01 UTC 2017

Modified Files:
	pkgsrc/mk/pkgformat/pkg: scripts.mk
	pkgsrc/mk/pkgformat/pkg/templates: header

Log Message:
Subsitute for @CROSSBASE@ and @VARBASE@ in install scripts.

${CROSSBASE} and ${VARBASE} both point to important directories
for installed packages, so always substitute those values into
deinstall/install scripts.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/mk/pkgformat/pkg/scripts.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/mk/pkgformat/pkg/templates/header

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


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

Modified files:

Index: pkgsrc/mk/pkgformat/pkg/scripts.mk
diff -u pkgsrc/mk/pkgformat/pkg/scripts.mk:1.2 pkgsrc/mk/pkgformat/pkg/scripts.mk:1.3
--- pkgsrc/mk/pkgformat/pkg/scripts.mk:1.2	Fri Jun  2 19:13:44 2017
+++ pkgsrc/mk/pkgformat/pkg/scripts.mk	Wed Jun  7 20:24:01 2017
@@ -1,4 +1,4 @@
-# $NetBSD: scripts.mk,v 1.2 2017/06/02 19:13:44 jlam Exp $
+# $NetBSD: scripts.mk,v 1.3 2017/06/07 20:24:01 jlam Exp $
 #
 # Copyright (c) 2017 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -173,6 +173,7 @@ FILES_SUBST+=	PKG_ADMIN=${PKG_ADMIN:Q}
 FILES_SUBST+=	PKG_INFO=${PKG_INFO:Q}
 
 # Variables for installation prefix references.
+FILES_SUBST+=	CROSSBASE=${CROSSBASE:Q}
 FILES_SUBST+=	LOCALBASE=${LOCALBASE:Q}
 FILES_SUBST+=	X11BASE=${X11BASE:Q}
 FILES_SUBST+=	PREFIX=${PREFIX:Q}
@@ -181,3 +182,6 @@ FILES_SUBST+=	PREFIX=${PREFIX:Q}
 FILES_SUBST+=	PKG_SYSCONFBASE=${PKG_SYSCONFBASE:Q}
 FILES_SUBST+=	PKG_SYSCONFBASEDIR=${PKG_SYSCONFBASEDIR:Q}
 FILES_SUBST+=	PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q}
+
+# Variables for the local state directory.
+FILES_SUBST+=	VARBASE=${VARBASE:Q}

Index: pkgsrc/mk/pkgformat/pkg/templates/header
diff -u pkgsrc/mk/pkgformat/pkg/templates/header:1.1 pkgsrc/mk/pkgformat/pkg/templates/header:1.2
--- pkgsrc/mk/pkgformat/pkg/templates/header:1.1	Thu Jun  1 02:09:43 2017
+++ pkgsrc/mk/pkgformat/pkg/templates/header	Wed Jun  7 20:24:01 2017
@@ -29,7 +29,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 #
-# $NetBSD: header,v 1.1 2017/06/01 02:09:43 jlam Exp $
+# $NetBSD: header,v 1.2 2017/06/07 20:24:01 jlam Exp $
 
 # Package task loader.
 : ${TASK_MODULE_DIR:=@LOCALBASE@/share/pkgtasks-1}
@@ -117,6 +117,7 @@ PKG_ADMIN="@PKG_ADMIN@"
 PKG_INFO="@PKG_INFO@"
 
 # Variables for installation prefix references.
+CROSSBASE="@CROSSBASE@"
 LOCALBASE="@LOCALBASE@"
 X11BASE="@X11BASE@"
 PREFIX="${PKG_PREFIX}"
@@ -126,6 +127,9 @@ PKG_SYSCONFBASE="@PKG_SYSCONFBASE@"
 PKG_SYSCONFBASEDIR="@PKG_SYSCONFBASEDIR@"
 PKG_SYSCONFDIR="@PKG_SYSCONFDIR@"
 
+# Variables for the local state directory.
+VARBASE="@VARBASE@"
+
 # The current working directory from which the script was invoked.
 CURDIR=$( ${PWD_CMD} )
 

--_----------=_1496867041221210--