CVS commit: [pkgsrc-2017Q1] pkgsrc/pkgtools/pkg_comp

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Mon May  1 09:08:57 UTC 2017

Modified Files:
        pkgsrc/pkgtools/pkg_comp [pkgsrc-2017Q1]: Makefile

Log Message:
Pullup ticket #5371 - requested by sevan
pkgtools/pkg_comp: build fix

Revisions pulled up:
- pkgtools/pkg_comp/Makefile                                    1.59

---
   Module Name:    pkgsrc
   Committed By:   jmmv
   Date:           Wed Apr 26 00:48:14 UTC 2017

   Modified Files:
           pkgsrc/pkgtools/pkg_comp: Makefile

   Log Message:
   Fix sysconfdir settings for pkg_comp.

   This allows the default configuration in pkg_comp to properly find the
   default configuration of sandboxctl.

   Bump PKGREVISION to 1.


To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.58.2.1 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.58 pkgsrc/pkgtools/pkg_comp/Makefile:1.58.2.1
--- pkgsrc/pkgtools/pkg_comp/Makefile:1.58      Mon Feb 20 11:15:19 2017
+++ pkgsrc/pkgtools/pkg_comp/Makefile   Mon May  1 09:08:57 2017
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.58 2017/02/20 11:15:19 jmmv Exp $
+# $NetBSD: Makefile,v 1.58.2.1 2017/05/01 09:08:57 bsiegert Exp $
 
 DISTNAME=      pkg_comp-2.0
+PKGREVISION=   1
 CATEGORIES=    sysutils
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=jmmv/}pkg_comp/releases/download/pkg_comp-2.0/
 
@@ -16,8 +17,8 @@ USE_LANGUAGES=                # empty
 USE_TOOLS=             pkg-config
 
 PKG_SYSCONFSUBDIR=     pkg_comp
-CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
-CONFIGURE_ARGS+=       PKG_COMP_CONFSUBDIR=
+CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFBASE}
+CONFIGURE_ARGS+=       PKG_COMP_CONFSUBDIR=${PKG_SYSCONFSUBDIR}
 CONFIGURE_ARGS+=       SANDBOXCTL=${PREFIX}/sbin/sandboxctl
 INSTALL_MAKE_FLAGS+=   pkg_comp_confdir=${EGDIR}
 EGDIR=                 ${PREFIX}/share/examples/pkg_comp