CVS commit: pkgsrc/pkgtools/pkg_comp

["Johnny C. Lam" <jlam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jlam
Date:           Sat Sep  2 16:18:56 UTC 2017

Modified Files:
        pkgsrc/pkgtools/pkg_comp: Makefile

Log Message:
pkgtools/pkg_comp: Correct usage of ${PKG_SYSCONFDIR}.

Package configuration files should be found in ${PKG_SYSCONFDIR},
which can be modified by a user-settable variable.  Look for the
default sandboxctl(8) configuration files in
${PKG_SYSCONFDIR.sandboxctl} if that variable is set, or else in
${PKG_SYSCONFBASE}/sandboxctl.

Fixes problem noted by Iain Hibbert on tech-pkg@.

Bump the PKGREVISION to 2 due to changes in the binary package if
PKG_SYSCONFDIR.pkg_comp is set to a non-default value.


To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 pkgsrc/pkgtools/pkg_comp/Makefile

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

Modified files:

Index: pkgsrc/pkgtools/pkg_comp/Makefile
diff -u pkgsrc/pkgtools/pkg_comp/Makefile:1.59 pkgsrc/pkgtools/pkg_comp/Makefile:1.60
--- pkgsrc/pkgtools/pkg_comp/Makefile:1.59      Wed Apr 26 00:48:14 2017
+++ pkgsrc/pkgtools/pkg_comp/Makefile   Sat Sep  2 16:18:56 2017
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.59 2017/04/26 00:48:14 jmmv Exp $
+# $NetBSD: Makefile,v 1.60 2017/09/02 16:18:56 jlam Exp $
 
 DISTNAME=      pkg_comp-2.0
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    sysutils
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=jmmv/}pkg_comp/releases/download/pkg_comp-2.0/
 
@@ -17,8 +17,8 @@ USE_LANGUAGES=                # empty
 USE_TOOLS=             pkg-config
 
 PKG_SYSCONFSUBDIR=     pkg_comp
-CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFBASE}
-CONFIGURE_ARGS+=       PKG_COMP_CONFSUBDIR=${PKG_SYSCONFSUBDIR}
+CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=       PKG_COMP_CONFSUBDIR=
 CONFIGURE_ARGS+=       SANDBOXCTL=${PREFIX}/sbin/sandboxctl
 INSTALL_MAKE_FLAGS+=   pkg_comp_confdir=${EGDIR}
 EGDIR=                 ${PREFIX}/share/examples/pkg_comp
@@ -26,6 +26,14 @@ CONF_FILES+=         ${EGDIR}/default.conf ${PK
 CONF_FILES+=           ${EGDIR}/extra.mk.conf ${PKG_SYSCONFDIR}/extra.mk.conf
 CONF_FILES+=           ${EGDIR}/sandbox.conf ${PKG_SYSCONFDIR}/sandbox.conf
 
+# Substitute for the correct location of the configuration files
+# for sandboxctl.
+SUBST_CLASSES+=                sandboxctl
+SUBST_STAGE.sandboxctl=        pre-configure
+SUBST_FILES.sandboxctl=        sandbox.conf.in
+SUBST_SED.sandboxctl=  -e 's,__PKG_COMP_BASESYSCONFDIR__/sandboxctl/,${SANDBOXCTL_SYSCONFDIR}/,g'
+SANDBOXCTL_SYSCONFDIR= ${PKG_SYSCONFDIR.sandboxctl:U${PKG_SYSCONFBASE}/sandboxctl}
+
 PKG_OPTIONS_VAR=       PKG_OPTIONS.pkg_comp
 PKG_SUPPORTED_OPTIONS= tests
 PKG_SUGGESTED_OPTIONS= tests