Received: by mail.netbsd.org (Postfix, from userid 605) id 2D6B584D83; Sat, 2 Sep 2017 16:18:57 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id B44E984D64 for ; Sat, 2 Sep 2017 16:18:56 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id uUHITQlYYPGt for ; Sat, 2 Sep 2017 16:18:56 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 4265984CE0 for ; Sat, 2 Sep 2017 16:18:56 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 406A5FA97; Sat, 2 Sep 2017 16:18:56 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_150436913654120" MIME-Version: 1.0 Date: Sat, 2 Sep 2017 16:18:56 +0000 From: "Johnny C. Lam" Subject: CVS commit: pkgsrc/pkgtools/pkg_comp To: pkgsrc-changes@NetBSD.org Reply-To: jlam@netbsd.org X-Mailer: log_accum Message-Id: <20170902161856.406A5FA97@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_150436913654120 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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. --_----------=_150436913654120 Content-Disposition: inline Content-Length: 1694 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii 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 --_----------=_150436913654120--