CVS commit: pkgsrc/sysutils/mcollective

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

Module Name:    pkgsrc
Committed By:   jlam
Date:           Mon Aug  7 09:42:32 UTC 2017

Modified Files:
        pkgsrc/sysutils/mcollective: Makefile

Log Message:
Use PKG_SYSCONF* variables properly in sysutils/mcollective.

Set PKG_SYSCONFSUBDIR to "mcollective" so that all config files are
found in the "mcollective" subdirectory of ${PKG_SYSCONFBASE}.

Add ${PKG_SYSCONFDIR}/ssl to OWN_DIRS since it must be created at
package installation time.

Don't list directories outside of ${PREFIX} in INSTALLATION_DIRS
since INSTALLATION_DIRS are only created when the package is
installed into the destdir-staging directory.

Bump the PKGREVISION due to fixes in the package install scripts.
-------------------------------------------------------------------


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/sysutils/mcollective/Makefile

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

Modified files:

Index: pkgsrc/sysutils/mcollective/Makefile
diff -u pkgsrc/sysutils/mcollective/Makefile:1.2 pkgsrc/sysutils/mcollective/Makefile:1.3
--- pkgsrc/sysutils/mcollective/Makefile:1.2    Tue Oct 23 19:51:12 2012
+++ pkgsrc/sysutils/mcollective/Makefile        Mon Aug  7 09:42:32 2017
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2012/10/23 19:51:12 asau Exp $
+# $NetBSD: Makefile,v 1.3 2017/08/07 09:42:32 jlam Exp $
 #
 
 DISTNAME=      mcollective-2.1.1
+PKGREVISION=   1
 CATEGORIES=    sysutils
 MASTER_SITES=  http://downloads.puppetlabs.com/mcollective/
 EXTRACT_SUFX=  .tgz
@@ -26,13 +27,15 @@ EGDIR=                      ${PREFIX}/share/examples/mcolle
 
 INSTALLATION_DIRS=     bin sbin share/doc/mcollective share/mcollective
 INSTALLATION_DIRS+=    ${RUBY_VENDORLIB}/mcollective
-INSTALLATION_DIRS+=    ${PKG_SYSCONFDIR}/mcollective
-INSTALLATION_DIRS+=    ${PKG_SYSCONFDIR}/mcollective/ssl ${EGDIR}
+INSTALLATION_DIRS+=    ${EGDIR}
+
+PKG_SYSCONFSUBDIR=     mcollective
+OWN_DIRS=              ${PKG_SYSCONFDIR}/ssl
 
 CONF_FILES+=           ${EGDIR}/server.cfg.dist                \
-                       ${PKG_SYSCONFDIR}/mcollective/server.cfg
+                       ${PKG_SYSCONFDIR}/server.cfg
 CONF_FILES+=           ${EGDIR}/client.cfg.dist                \
-                       ${PKG_SYSCONFDIR}/mcollective/client.cfg
+                       ${PKG_SYSCONFDIR}/client.cfg
 
 SUBST_CLASSES+=                confpath
 SUBST_FILES.confpath=  ${WRKSRC}/bin/mcollectived              \
@@ -41,7 +44,7 @@ SUBST_FILES.confpath= ${WRKSRC}/bin/mcol
                        ${WRKSRC}/lib/mcollective/config.rb     \
                        ${WRKSRC}/lib/mcollective/util.rb       \
                        ${WRKSRC}/lib/mcollective/rpc.rb
-SUBST_SED.confpath=    -e "s,/etc/mcollective,${PKG_SYSCONFDIR}/mcollective,"
+SUBST_SED.confpath=    -e "s,/etc/mcollective,${PKG_SYSCONFDIR},"
 SUBST_STAGE.confpath=  post-patch
 
 SUBST_CLASSES+=                sharepath