Mon Feb 20 11:15:19 2017 UTC ()
Hardcode the location of sandboxctl to not rely on the PATH.

Should fix the problems observed in:
http://ftp.netbsd.org/pub/pkgsrc/misc/joerg/20170219.1406/meta/report.html


(jmmv)
diff -r1.57 -r1.58 pkgsrc/pkgtools/pkg_comp/Makefile
cvs diff -r1.57 -r1.58 pkgsrc/pkgtools/pkg_comp/Makefile (expand / switch to unified diff)

--- pkgsrc/pkgtools/pkg_comp/Makefile 2017/02/17 21:25:46 1.57
+++ pkgsrc/pkgtools/pkg_comp/Makefile 2017/02/20 11:15:19 1.58
@@ -1,33 +1,34 @@ @@ -1,33 +1,34 @@
1# $NetBSD: Makefile,v 1.57 2017/02/17 21:25:46 jmmv Exp $ 1# $NetBSD: Makefile,v 1.58 2017/02/20 11:15:19 jmmv Exp $
2 2
3DISTNAME= pkg_comp-2.0 3DISTNAME= pkg_comp-2.0
4CATEGORIES= sysutils 4CATEGORIES= sysutils
5MASTER_SITES= ${MASTER_SITE_GITHUB:=jmmv/}pkg_comp/releases/download/pkg_comp-2.0/ 5MASTER_SITES= ${MASTER_SITE_GITHUB:=jmmv/}pkg_comp/releases/download/pkg_comp-2.0/
6 6
7MAINTAINER= jmmv@NetBSD.org 7MAINTAINER= jmmv@NetBSD.org
8COMMENT= Automates builds of packages and manages pkgsrc trees 8COMMENT= Automates builds of packages and manages pkgsrc trees
9LICENSE= modified-bsd 9LICENSE= modified-bsd
10 10
11DEPENDS= sandboxctl>=1.0:../../sysutils/sandboxctl 11DEPENDS= sandboxctl>=1.0:../../sysutils/sandboxctl
12 12
13GNU_CONFIGURE= yes 13GNU_CONFIGURE= yes
14TEST_TARGET= check 14TEST_TARGET= check
15USE_LANGUAGES= # empty 15USE_LANGUAGES= # empty
16USE_TOOLS= pkg-config 16USE_TOOLS= pkg-config
17 17
18PKG_SYSCONFSUBDIR= pkg_comp 18PKG_SYSCONFSUBDIR= pkg_comp
19CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 19CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
20CONFIGURE_ARGS+= PKG_COMP_CONFSUBDIR= 20CONFIGURE_ARGS+= PKG_COMP_CONFSUBDIR=
 21CONFIGURE_ARGS+= SANDBOXCTL=${PREFIX}/sbin/sandboxctl
21INSTALL_MAKE_FLAGS+= pkg_comp_confdir=${EGDIR} 22INSTALL_MAKE_FLAGS+= pkg_comp_confdir=${EGDIR}
22EGDIR= ${PREFIX}/share/examples/pkg_comp 23EGDIR= ${PREFIX}/share/examples/pkg_comp
23CONF_FILES+= ${EGDIR}/default.conf ${PKG_SYSCONFDIR}/default.conf 24CONF_FILES+= ${EGDIR}/default.conf ${PKG_SYSCONFDIR}/default.conf
24CONF_FILES+= ${EGDIR}/extra.mk.conf ${PKG_SYSCONFDIR}/extra.mk.conf 25CONF_FILES+= ${EGDIR}/extra.mk.conf ${PKG_SYSCONFDIR}/extra.mk.conf
25CONF_FILES+= ${EGDIR}/sandbox.conf ${PKG_SYSCONFDIR}/sandbox.conf 26CONF_FILES+= ${EGDIR}/sandbox.conf ${PKG_SYSCONFDIR}/sandbox.conf
26 27
27PKG_OPTIONS_VAR= PKG_OPTIONS.pkg_comp 28PKG_OPTIONS_VAR= PKG_OPTIONS.pkg_comp
28PKG_SUPPORTED_OPTIONS= tests 29PKG_SUPPORTED_OPTIONS= tests
29PKG_SUGGESTED_OPTIONS= tests 30PKG_SUGGESTED_OPTIONS= tests
30 31
31.include "../../mk/bsd.options.mk" 32.include "../../mk/bsd.options.mk"
32 33
33.if !empty(PKG_OPTIONS:Mtests) 34.if !empty(PKG_OPTIONS:Mtests)