[pkgsrc/trunk]: pkgsrc/mk/pkgformat/pkg Subsitute for @CROSSBASE@ and @VARBAS...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4482ab0bea73
branches:  trunk
changeset: 363389:4482ab0bea73
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Wed Jun 07 20:24:01 2017 +0000

description:
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.

diffstat:

 mk/pkgformat/pkg/scripts.mk       |  6 +++++-
 mk/pkgformat/pkg/templates/header |  6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diffs (54 lines):

diff -r 4d8bb29e52f4 -r 4482ab0bea73 mk/pkgformat/pkg/scripts.mk
--- a/mk/pkgformat/pkg/scripts.mk       Wed Jun 07 20:12:34 2017 +0000
+++ b/mk/pkgformat/pkg/scripts.mk       Wed Jun 07 20:24:01 2017 +0000
@@ -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_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+=  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}
diff -r 4d8bb29e52f4 -r 4482ab0bea73 mk/pkgformat/pkg/templates/header
--- a/mk/pkgformat/pkg/templates/header Wed Jun 07 20:12:34 2017 +0000
+++ b/mk/pkgformat/pkg/templates/header Wed Jun 07 20:24:01 2017 +0000
@@ -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_INFO="@PKG_INFO@"
 
 # Variables for installation prefix references.
+CROSSBASE="@CROSSBASE@"
 LOCALBASE="@LOCALBASE@"
 X11BASE="@X11BASE@"
 PREFIX="${PKG_PREFIX}"
@@ -126,6 +127,9 @@
 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} )