CVS commit: pkgsrc

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc
From: "Johnny C. Lam" <jlam%netbsd.org@localhost>
Date: Mon, 7 Aug 2017 17:56:13 +0000

Module Name:    pkgsrc
Committed By:   jlam
Date:           Mon Aug  7 17:56:13 UTC 2017

Modified Files:
        pkgsrc/audio/lilv: Makefile
        pkgsrc/chat/spectrum: Makefile
        pkgsrc/mail/minimalist: Makefile
        pkgsrc/net/apollo: Makefile
        pkgsrc/net/coilmq: Makefile
        pkgsrc/net/icinga-base: Makefile
        pkgsrc/net/pulledpork: Makefile
        pkgsrc/security/dehydrated: Makefile
        pkgsrc/security/opendnssec: Makefile
        pkgsrc/sysutils/ansible: Makefile distinfo
        pkgsrc/sysutils/ansible/patches: patch-docs_man_man1_ansible
            patch-docs_man_man1_ansible-asciidoc
            patch-docs_man_man1_ansible-galaxy
            patch-docs_man_man1_ansible-galaxy-asciidoc
            patch-docs_man_man1_ansible-playbook
            patch-docs_man_man1_ansible-playbook-asciidoc
            patch-examples_ansible patch-examples_hosts
            patch-lib_ansible_constants
            patch-lib_ansible_modules_extras_database_misc_riak
            patch-lib_ansible_modules_extras_monitoring_nagios
            patch-plugins_README patch-plugins_inventory_cobbler
            patch-plugins_inventory_collins
        pkgsrc/sysutils/open-vm-tools: Makefile

Log Message:
Fix packages that had INSTALLATION_DIRS+=$(PKG_SYSCONFDIR}.

Set PKG_SYSCONFSUBDIR where appropriate, and use {MAKE,OWN}_DIRS to
create the directory tree under ${PKG_SYSCONFDIR} instead of using
INSTALLATION_DIRS.

Bump the PKGREVISION of packages that changed due to changes in the
package install scripts.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/audio/lilv/Makefile
cvs rdiff -u -r1.58 -r1.59 pkgsrc/chat/spectrum/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/mail/minimalist/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/apollo/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/net/coilmq/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/net/icinga-base/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/pulledpork/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/security/dehydrated/Makefile
cvs rdiff -u -r1.64 -r1.65 pkgsrc/security/opendnssec/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/sysutils/ansible/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/sysutils/ansible/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/sysutils/ansible/patches/patch-docs_man_man1_ansible \
    pkgsrc/sysutils/ansible/patches/patch-docs_man_man1_ansible-asciidoc \
    pkgsrc/sysutils/ansible/patches/patch-docs_man_man1_ansible-galaxy \
    pkgsrc/sysutils/ansible/patches/patch-docs_man_man1_ansible-galaxy-asciidoc \
    pkgsrc/sysutils/ansible/patches/patch-docs_man_man1_ansible-playbook \
    pkgsrc/sysutils/ansible/patches/patch-docs_man_man1_ansible-playbook-asciidoc \
    pkgsrc/sysutils/ansible/patches/patch-examples_ansible \
    pkgsrc/sysutils/ansible/patches/patch-examples_hosts \
    pkgsrc/sysutils/ansible/patches/patch-lib_ansible_modules_extras_database_misc_riak \
    pkgsrc/sysutils/ansible/patches/patch-lib_ansible_modules_extras_monitoring_nagios \
    pkgsrc/sysutils/ansible/patches/patch-plugins_README \
    pkgsrc/sysutils/ansible/patches/patch-plugins_inventory_cobbler \
    pkgsrc/sysutils/ansible/patches/patch-plugins_inventory_collins
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/sysutils/ansible/patches/patch-lib_ansible_constants
cvs rdiff -u -r1.72 -r1.73 pkgsrc/sysutils/open-vm-tools/Makefile

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

Modified files:

Index: pkgsrc/audio/lilv/Makefile
diff -u pkgsrc/audio/lilv/Makefile:1.7 pkgsrc/audio/lilv/Makefile:1.8
--- pkgsrc/audio/lilv/Makefile:1.7      Sun Feb 12 06:25:04 2017
+++ pkgsrc/audio/lilv/Makefile  Mon Aug  7 17:56:12 2017
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2017/02/12 06:25:04 ryoon Exp $
+# $NetBSD: Makefile,v 1.8 2017/08/07 17:56:12 jlam Exp $
 
 DISTNAME=      lilv-0.20.0
-PKGREVISION=   4
+PKGREVISION=   5
 CATEGORIES=    audio
 MASTER_SITES=  http://download.drobilla.net/
 EXTRACT_SUFX=  .tar.bz2
@@ -20,7 +20,8 @@ PKGCONFIG_OVERRIDE+=  lilv.pc.in
 CONFIGURE_ENV+=                LV2_PATH=${BUILDLINK_PREFIX.lv2}/lib/lv2
 EGDIR=                 share/examples/lilv
 CONF_FILES=            ${EGDIR}/lilv ${PKG_SYSCONFDIR}/bash_completion.d/lilv
-INSTALLATION_DIRS+=    ${PKG_SYSCONFDIR}/bash_completion.d ${EGDIR}
+MAKE_DIRS=             ${PKG_SYSCONFDIR}/bash_completion.d
+INSTALLATION_DIRS=     ${EGDIR}
 
 .include "../../mk/bsd.prefs.mk"
 

Index: pkgsrc/chat/spectrum/Makefile
diff -u pkgsrc/chat/spectrum/Makefile:1.58 pkgsrc/chat/spectrum/Makefile:1.59
--- pkgsrc/chat/spectrum/Makefile:1.58  Sat Apr 22 21:03:25 2017
+++ pkgsrc/chat/spectrum/Makefile       Mon Aug  7 17:56:12 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2017/04/22 21:03:25 adam Exp $
+# $NetBSD: Makefile,v 1.59 2017/08/07 17:56:12 jlam Exp $
 
 DISTNAME=              spectrum-1.4.8
 PKGREVISION=           37
@@ -93,7 +93,7 @@ MESSAGE_SUBST+=               PKG_SYSCONFDIR=${PKG_SY
 FILES_SUBST+=          PREFIX=${PREFIX}
 FILES_SUBST+=          JABBER_USER=${JABBER_USER}
 
-INSTALLATION_DIRS+=    bin ${PKG_SYSCONFDIR}
+INSTALLATION_DIRS+=    bin
 INSTALLATION_DIRS+=    share/locales
 INSTALLATION_DIRS+=    ${EGDIR}
 # INSTALLATION_DIRS+=  ${DOCDIR}

Index: pkgsrc/mail/minimalist/Makefile
diff -u pkgsrc/mail/minimalist/Makefile:1.5 pkgsrc/mail/minimalist/Makefile:1.6
--- pkgsrc/mail/minimalist/Makefile:1.5 Sat Jul  9 06:38:30 2016
+++ pkgsrc/mail/minimalist/Makefile     Mon Aug  7 17:56:12 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2016/07/09 06:38:30 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2017/08/07 17:56:12 jlam Exp $
 #
 
 DISTNAME=      minimalist-2.5.4-1
@@ -30,7 +30,7 @@ SUBST_FILES.path+=    contrib/minimalist_re
 SUBST_SED.path=                -e 's,/usr/local,${PREFIX},'
 
 NO_BUILD=              yes
-INSTALLATION_DIRS=     bin ${PKG_SYSCONFDIR} ${EGDIR} share/doc/minimalist/FAQ
+INSTALLATION_DIRS=     bin ${EGDIR} share/doc/minimalist/FAQ
 
 do-install:
        cd ${WRKSRC}; \

Index: pkgsrc/net/apollo/Makefile
diff -u pkgsrc/net/apollo/Makefile:1.2 pkgsrc/net/apollo/Makefile:1.3
--- pkgsrc/net/apollo/Makefile:1.2      Tue Oct 23 17:18:09 2012
+++ pkgsrc/net/apollo/Makefile  Mon Aug  7 17:56:13 2017
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2012/10/23 17:18:09 asau Exp $
+# $NetBSD: Makefile,v 1.3 2017/08/07 17:56:13 jlam Exp $
 #
 
 APOLLOVERS=    1.4
 DISTNAME=      apache-apollo-${APOLLOVERS}-unix-distro
 PKGNAME=       apollo-${APOLLOVERS}
+PKGREVISION=   1
 CATEGORIES=    net java
 MASTER_SITES=  ${MASTER_SITE_APACHE:=activemq/activemq-apollo/1.4/}
 
@@ -18,12 +19,12 @@ USE_JAVA=   run
 NO_BUILD=      yes
 USE_TOOLS+=    pax
 
-EGDIR=         share/examples/apollo
-
-INSTALLATION_DIRS=     bin lib/apollo ${EGDIR} ${PKG_SYSCONFDIR}/apollo
+INSTALLATION_DIRS=     bin lib/apollo ${EGDIR}
 
+PKG_SYSCONFSUBDIR=     apollo
+EGDIR=                 share/examples/apollo
 CONF_FILES=            ${PREFIX}/${EGDIR}/jul.properties       \
-                       ${PKG_SYSCONFDIR}/apollo/jul.properties
+                       ${PKG_SYSCONFDIR}/jul.properties
 
 SUBST_CLASSES+=                home
 SUBST_FILES.home=      ${WRKSRC}/bin/apollo

Index: pkgsrc/net/coilmq/Makefile
diff -u pkgsrc/net/coilmq/Makefile:1.9 pkgsrc/net/coilmq/Makefile:1.10
--- pkgsrc/net/coilmq/Makefile:1.9      Sun Jan  1 14:43:49 2017
+++ pkgsrc/net/coilmq/Makefile  Mon Aug  7 17:56:13 2017
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2017/01/01 14:43:49 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2017/08/07 17:56:13 jlam Exp $
 
 DISTNAME=      CoilMQ-0.6.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
+PKGREVISION=   1
 CATEGORIES=    net python
 MASTER_SITES=  http://coilmq.googlecode.com/files/
 
@@ -18,21 +19,23 @@ USE_LANGUAGES=      # none
 
 REPLACE_PYTHON+=       distribute_setup.py coilmq/start.py
 
+PKG_SYSCONFSUBDIR=     coilmq
+
 SUBST_CLASSES+=                cfg
 SUBST_STAGE.cfg=       post-patch
 SUBST_FILES.cfg=       coilmq/config/__init__.py
-SUBST_SED.cfg=         -e 's,/path/to/config.cfg,${PKG_SYSCONFDIR}/coilmq/defaults.cfg,'
+SUBST_SED.cfg=         -e 's,/path/to/config.cfg,${PKG_SYSCONFDIR}/defaults.cfg,'
 
 PYTHON_VERSIONS_INCOMPATIBLE=  34 35 36 # py-stompclient, py-daemon
 
 EGDIR=                 ${PREFIX}/share/examples/coilmq
 
-INSTALLATION_DIRS+=    ${EGDIR} ${PKG_SYSCONFDIR}/coilmq
+INSTALLATION_DIRS+=    ${EGDIR}
 
 CONF_FILES=            ${EGDIR}/defaults.cfg                           \
-                       ${PKG_SYSCONFDIR}/coilmq/defaults.cfg           \
+                       ${PKG_SYSCONFDIR}/defaults.cfg                  \
                        ${EGDIR}/coilmq.cfg-sample                      \
-                       ${PKG_SYSCONFDIR}/coilmq/coilmq.cfg
+                       ${PKG_SYSCONFDIR}/coilmq.cfg
 
 post-install:
        ${INSTALL_DATA} ${WRKSRC}/coilmq/config/defaults.cfg            \

Index: pkgsrc/net/icinga-base/Makefile
diff -u pkgsrc/net/icinga-base/Makefile:1.16 pkgsrc/net/icinga-base/Makefile:1.17
--- pkgsrc/net/icinga-base/Makefile:1.16        Mon Jun  5 14:24:16 2017
+++ pkgsrc/net/icinga-base/Makefile     Mon Aug  7 17:56:13 2017
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.16 2017/06/05 14:24:16 ryoon Exp $
+# $NetBSD: Makefile,v 1.17 2017/08/07 17:56:13 jlam Exp $
 #
 
 DISTNAME=      icinga-1.9.4
 PKGNAME=       ${DISTNAME:S/-/-base-/}
-PKGREVISION=   9
+PKGREVISION=   10
 CATEGORIES=    net sysutils
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=icinga/}
 
@@ -59,9 +59,9 @@ EGFILES+=             objects/printer.cfg objects/s
 EGFILES+=              objects/templates.cfg objects/timeperiods.cfg
 EGFILES+=              objects/windows.cfg resource.cfg
 
-INSTALLATION_DIRS+=    ${PKG_SYSCONFDIR}/objects
-INSTALLATION_DIRS+=    ${PKG_SYSCONFDIR}/modules
-INSTALLATION_DIRS+=    ${PKG_SYSCONFDIR}/conf.d
+OWN_DIRS+=             ${PKG_SYSCONFDIR}/objects
+OWN_DIRS+=             ${PKG_SYSCONFDIR}/modules
+OWN_DIRS+=             ${PKG_SYSCONFDIR}/conf.d
 
 .for files in ${EGFILES}
 CONF_FILES+=           ${EGDIR}/${files} ${PKG_SYSCONFDIR}/${files}

Index: pkgsrc/net/pulledpork/Makefile
diff -u pkgsrc/net/pulledpork/Makefile:1.1 pkgsrc/net/pulledpork/Makefile:1.2
--- pkgsrc/net/pulledpork/Makefile:1.1  Thu Jun 15 18:37:31 2017
+++ pkgsrc/net/pulledpork/Makefile      Mon Aug  7 17:56:13 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2017/06/15 18:37:31 nils Exp $
+# $NetBSD: Makefile,v 1.2 2017/08/07 17:56:13 jlam Exp $
 
 DISTNAME=      pulledpork-0.7.2
 CATEGORIES=    net
@@ -38,7 +38,7 @@ DEPENDS+=     p5-Carp-[0-9]*:../../devel/p5-
 EGDIR=                 ${PREFIX}/share/examples/pulledpork
 PKG_SYSCONFSUBDIR=     pulledpork
 DOCDIR=                        share/doc/pulledpork
-INSTALLATION_DIRS+=    ${EGDIR} ${PKG_SYSCONFDIR} ${OWN_DIRS} ${DOCDIR} bin
+INSTALLATION_DIRS+=    ${EGDIR} ${DOCDIR} bin
 INSTALLATION_DIRS+=    share/pulledpork/contrib
 AUTO_MKDIRS=           yes
 USE_LANGUAGES=         # none

Index: pkgsrc/security/dehydrated/Makefile
diff -u pkgsrc/security/dehydrated/Makefile:1.1 pkgsrc/security/dehydrated/Makefile:1.2
--- pkgsrc/security/dehydrated/Makefile:1.1     Fri Mar 10 08:30:51 2017
+++ pkgsrc/security/dehydrated/Makefile Mon Aug  7 17:56:13 2017
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2017/03/10 08:30:51 nils Exp $
+# $NetBSD: Makefile,v 1.2 2017/08/07 17:56:13 jlam Exp $
 
 DISTNAME=      dehydrated-0.4.0
+PKGREVISION=   1
 CATEGORIES=    security
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=lukas2511/}
 
@@ -17,18 +18,18 @@ NO_BUILD=   yes
 USE_TOOLS+=    bash:run sed:run awk:run curl:run pax openssl
 REPLACE_BASH=  dehydrated test.sh docs/examples/hook.sh
 
+PKG_SYSCONFSUBDIR=     dehydrated
 EGDIR=                 ${PREFIX}/share/examples/dehydrated
-CONF_FILES=            ${EGDIR}/config ${PKG_SYSCONFDIR}/dehydrated/config
-CONF_FILES+=           ${EGDIR}/domains.txt ${PKG_SYSCONFDIR}/dehydrated/domains.txt
-OWN_DIRS=              ${PKG_SYSCONFDIR}/dehydrated
+CONF_FILES=            ${EGDIR}/config ${PKG_SYSCONFDIR}/config
+CONF_FILES+=           ${EGDIR}/domains.txt ${PKG_SYSCONFDIR}/domains.txt
 DOCDIR=                        share/doc/dehydrated
-INSTALLATION_DIRS+=    ${EGDIR} ${PKG_SYSCONFDIR} ${OWN_DIRS} ${DOCDIR} bin
+INSTALLATION_DIRS+=    ${EGDIR} ${DOCDIR} bin
 AUTO_MKDIRS=           yes
 
 SUBST_CLASSES+=                paths
 SUBST_STAGE.paths=     post-extract
 SUBST_FILES.paths=     ${WRKSRC}/dehydrated
-SUBST_SED.paths=       -e 's|/usr/local/etc|${PKG_SYSCONFDIR}|g'
+SUBST_SED.paths=       -e 's|/usr/local/etc|${PKG_SYSCONFBASE}|g'
 
 do-install:
        ${INSTALL_SCRIPT} ${WRKSRC}/dehydrated ${DESTDIR}${PREFIX}/bin/dehydrated

Index: pkgsrc/security/opendnssec/Makefile
diff -u pkgsrc/security/opendnssec/Makefile:1.64 pkgsrc/security/opendnssec/Makefile:1.65
--- pkgsrc/security/opendnssec/Makefile:1.64    Sat Apr 22 21:03:55 2017
+++ pkgsrc/security/opendnssec/Makefile Mon Aug  7 17:56:13 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.64 2017/04/22 21:03:55 adam Exp $
+# $NetBSD: Makefile,v 1.65 2017/08/07 17:56:13 jlam Exp $
 #
 
 DISTNAME=      opendnssec-1.4.13
@@ -46,7 +46,7 @@ PKG_GROUPS_VARS+=     ODS_GROUP
 
 EGDIR=                 ${PREFIX}/share/examples/opendnssec
 DOCDIR=                        ${PREFIX}/share/doc/opendnssec
-ODS_SYSCONFDIR=                ${PKG_SYSCONFDIR}/opendnssec
+PKG_SYSCONFSUBDIR=     opendnssec
 
 SUBST_CLASSES+=                paths
 SUBST_FILES.paths=     ${WRKSRC}/conf/Makefile.in
@@ -56,15 +56,15 @@ SUBST_SED.paths=    -e 's,@EGDIR@,${EGDIR},
 CXXFLAGS.NetBSD+=      -D_NETBSD_SOURCE
 
 CONF_FILES+=   ${EGDIR}/addns.xml.sample \
-                       ${ODS_SYSCONFDIR}/addns.xml
+                       ${PKG_SYSCONFDIR}/addns.xml
 CONF_FILES+=   ${EGDIR}/conf.xml.sample \
-                       ${ODS_SYSCONFDIR}/conf.xml
+                       ${PKG_SYSCONFDIR}/conf.xml
 CONF_FILES+=   ${EGDIR}/kasp.xml.sample \
-                       ${ODS_SYSCONFDIR}/kasp.xml
+                       ${PKG_SYSCONFDIR}/kasp.xml
 CONF_FILES+=   ${EGDIR}/zonelist.xml.sample \
-                       ${ODS_SYSCONFDIR}/zonelist.xml
+                       ${PKG_SYSCONFDIR}/zonelist.xml
 
-INSTALLATION_DIRS=     ${DOCDIR} ${EGDIR} ${ODS_SYSCONFDIR}
+INSTALLATION_DIRS=     ${DOCDIR} ${EGDIR}
 INSTALLATION_DIRS+=    share/opendnssec
 INSTALLATION_DIRS+=    lib/opendnssec
 INSTALLATION_DIRS+=    lib/opendnssec/signer
@@ -80,7 +80,7 @@ RCD_SCRIPTS=          opendnssec
 .include "options.mk"
 
 pre-install:
-       ${MKDIR} ${DESTDIR}${PKG_SYSCONFDIR}/opendnssec
+       ${MKDIR} ${DESTDIR}${PKG_SYSCONFDIR}
 
 post-install:
        ${INSTALL} ${WRKSRC}/KNOWN_ISSUES ${DESTDIR}${DOCDIR}

Index: pkgsrc/sysutils/ansible/Makefile
diff -u pkgsrc/sysutils/ansible/Makefile:1.20 pkgsrc/sysutils/ansible/Makefile:1.21
--- pkgsrc/sysutils/ansible/Makefile:1.20       Sun Jan  1 14:43:56 2017
+++ pkgsrc/sysutils/ansible/Makefile    Mon Aug  7 17:56:13 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2017/01/01 14:43:56 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2017/08/07 17:56:13 jlam Exp $
 
 DISTNAME=      ansible-1.9.4
 PKGREVISION=   2
@@ -38,6 +38,7 @@ SUBST_FILES.prefix+=    plugins/README.m
 SUBST_FILES.prefix+=    plugins/inventory/collins.py
 SUBST_MESSAGE.prefix=   Fixing PREFIX path.
 SUBST_SED.prefix=       -e "s,@PREFIX@,${PREFIX},"
+SUBST_SED.prefix+=      -e "s,@PKG_SYSCONFBASE@,${PKG_SYSCONFBASE},"
 SUBST_SED.prefix+=      -e "s,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},"
 
 SUBST_CLASSES+=         pythonbin
@@ -54,13 +55,13 @@ REPLACE_PYTHON+=        lib/ansible/util
 MANPAGES=       ansible-doc.1 ansible-pull.1 ansible-galaxy.1 ansible-vault.1
 MANPAGES+=      ansible-playbook.1 ansible.1
 
-INSTALLATION_DIRS=      bin ${PKGMANDIR}/man1 ${PKG_SYSCONFDIR}/ansible
+INSTALLATION_DIRS=      bin ${PKGMANDIR}/man1
 INSTALLATION_DIRS+=     ${EGDIR}/playbooks
 INSTALLATION_DIRS+=     share/ansible/roles
 
 CHECK_INTERPRETER_SKIP= share/ansible/*
 
-MAKE_DIRS=             ${PKG_SYSCONFDIR}/ansible ${PREFIX}/share/ansible
+MAKE_DIRS=             ${PREFIX}/share/ansible
 MAKE_DIRS+=            ${PREFIX}/share/ansible/ansible_plugins
 MAKE_DIRS+=            ${PREFIX}/share/ansible/ansible_plugins/action_plugins
 MAKE_DIRS+=            ${PREFIX}/share/ansible/ansible_plugins/callback_plugins

Index: pkgsrc/sysutils/ansible/distinfo
diff -u pkgsrc/sysutils/ansible/distinfo:1.12 pkgsrc/sysutils/ansible/distinfo:1.13
--- pkgsrc/sysutils/ansible/distinfo:1.12       Thu Mar 23 17:06:59 2017
+++ pkgsrc/sysutils/ansible/distinfo    Mon Aug  7 17:56:13 2017
@@ -1,24 +1,24 @@
-$NetBSD: distinfo,v 1.12 2017/03/23 17:06:59 joerg Exp $
+$NetBSD: distinfo,v 1.13 2017/08/07 17:56:13 jlam Exp $
 
 SHA1 (ansible-1.9.4.tar.gz) = f71f451d96239d08396d20fff2d9b8840426f714
 RMD160 (ansible-1.9.4.tar.gz) = a88a7a1a19a82e6ca17ca77ae8d64a428cf37fe8
 SHA512 (ansible-1.9.4.tar.gz) = 53ef5b3390be620cedc92687c7c9853c42f38547494f9b77056d5ea48ccd8f43d193648a7f4569fcba5afad343a9202b123296ab47c8cd02eecfe455d83b9586
 Size (ansible-1.9.4.tar.gz) = 937120 bytes
-SHA1 (patch-docs_man_man1_ansible) = af150377f41d2feb239111346fc5d3101aa8bcea
-SHA1 (patch-docs_man_man1_ansible-asciidoc) = 6c2b4eae3d8213d8ee0870727003bb128df44f10
-SHA1 (patch-docs_man_man1_ansible-galaxy) = fa8e683620d53d81a88afe7446bef96071aa0edd
-SHA1 (patch-docs_man_man1_ansible-galaxy-asciidoc) = e1a699f7b23d373405a2f18db6658c1ca50fc7d9
-SHA1 (patch-docs_man_man1_ansible-playbook) = ca06a883d02f28895ad5ae9392f47e4024c6ec06
-SHA1 (patch-docs_man_man1_ansible-playbook-asciidoc) = ac1d24661de7d6292252ce696b17f7317b2c43df
-SHA1 (patch-examples_ansible) = f29fedf979a7ef0255d88d6e593eb84ca92fa3de
-SHA1 (patch-examples_hosts) = ed21ed3f6f3db7d4ec9cd273e15adf075cec953d
+SHA1 (patch-docs_man_man1_ansible) = 9d8931a24d7ad836a05a8c23a0931aa839b3c8d8
+SHA1 (patch-docs_man_man1_ansible-asciidoc) = 9e0c962be185ae221a33c3207aae968e50882e34
+SHA1 (patch-docs_man_man1_ansible-galaxy) = 34f2eec381a02a11f496cc1850d8d7036adb8c0f
+SHA1 (patch-docs_man_man1_ansible-galaxy-asciidoc) = a6deca5dbd88027c0ec602dc291331f066908399
+SHA1 (patch-docs_man_man1_ansible-playbook) = c887c712521af0229dd81ebc08197d2a83a13375
+SHA1 (patch-docs_man_man1_ansible-playbook-asciidoc) = 48c0209fdbf62569043408a352330b844dbbcc93
+SHA1 (patch-examples_ansible) = aa6bda94e658f882add389d2318cdffc79caafa2
+SHA1 (patch-examples_hosts) = c2a34131b3f24c1322ce5645a378ef9949420421
 SHA1 (patch-lib_ansible_callbacks) = bdcec47047b5361012472f6276df21618cc664bb
-SHA1 (patch-lib_ansible_constants) = 59b0cb0e666280ebc453399d20d10ba4ad621066
+SHA1 (patch-lib_ansible_constants) = a5b234e7995914660d70a5dd4db3ec4a9ed20132
 SHA1 (patch-lib_ansible_modules_core_system_ping) = 1b91dbdb74e8cfc5e0bf99628e5ebb4bbd54dead
 SHA1 (patch-lib_ansible_modules_core_system_setup) = a9a92a4a8786e0f96155cbd6d4d7b459d7728f0c
-SHA1 (patch-lib_ansible_modules_extras_database_misc_riak) = 26fcb21fe56613a151913398c677d2fdcdaa3703
-SHA1 (patch-lib_ansible_modules_extras_monitoring_nagios) = 0af8b51bc5e34dbb516a3b0be1c8670ea7c863b6
+SHA1 (patch-lib_ansible_modules_extras_database_misc_riak) = cec7d7c38810644938ac5ddca351dbcce96472d6
+SHA1 (patch-lib_ansible_modules_extras_monitoring_nagios) = d17d2a7424712924b9600fe4d0c5842503fcf4f2
 SHA1 (patch-lib_ansible_modules_extras_packaging_os_pkgin) = a8e2be00ff309be676435b7333e9b9ceebaba810
-SHA1 (patch-plugins_README) = 05039fb081fce16754404adf746ef9594ef9f701
-SHA1 (patch-plugins_inventory_cobbler) = bbc1a6c48d65229091d6c247e27ee28fe374e731
-SHA1 (patch-plugins_inventory_collins) = 8eccebae0ea739d890696d27c663c8c65e8b8832
+SHA1 (patch-plugins_README) = 84f4b9b16363157ad0b223c00e8c1b10c43479da
+SHA1 (patch-plugins_inventory_cobbler) = 885165d2b30de20120977490dfc1b92db4799f5f
+SHA1 (patch-plugins_inventory_collins) = 3ec96844fe1a382e68676ec3c8a6eb662d892db1

Index: pkgsrc/sysutils/ansible/patches/patch-docs_man_man1_ansible
diff -u pkgsrc/sysutils/ansible/patches/patch-docs_man_man1_ansible:1.1 pkgsrc/sysutils/ansible/patches/patch-docs_man_man1_ansible:1.2
--- pkgsrc/sysutils/ansible/patches/patch-docs_man_man1_ansible:1.1     Wed Feb 17 20:31:45 2016
+++ pkgsrc/sysutils/ansible/patches/patch-docs_man_man1_ansible Mon Aug  7 17:56:13 2017
@@ -1,4 +1,4 @@
-$NetBSD: patch-docs_man_man1_ansible,v 1.1 2016/02/17 20:31:45 he Exp $
+$NetBSD: patch-docs_man_man1_ansible,v 1.2 2017/08/07 17:56:13 jlam Exp $
 
 Fix hardcoded paths to be replaced with SUBST framework.
 
@@ -9,7 +9,7 @@ Fix hardcoded paths to be replaced with 
  \fIPATH\fR
  to the inventory hosts file, which defaults to
 -\fI/etc/ansible/hosts\fR\&.
-+\fI@PKG_SYSCONFDIR@/ansible/hosts\fR\&.
++\fI@PKG_SYSCONFDIR@/hosts\fR\&.
  .RE
  .PP
  \fB\-f\fR \fINUM\fR, \fB\-\-forks=\fR\fINUM\fR
@@ -27,13 +27,13 @@ Fix hardcoded paths to be replaced with 
  .SH "FILES"
  .sp
 -/etc/ansible/hosts \(em Default inventory file
-+@PKG_SYSCONFDIR@/ansible/hosts \(em Default inventory file
++@PKG_SYSCONFDIR@/hosts \(em Default inventory file
  .sp
 -/usr/share/ansible/ \(em Default module library
 +@PREFIX@/share/ansible/ \(em Default module library
  .sp
 -/etc/ansible/ansible\&.cfg \(em Config file, used if present
-+@PKG_SYSCONFDIR@/ansible/ansible\&.cfg \(em Config file, used if present
++@PKG_SYSCONFDIR@/ansible\&.cfg \(em Config file, used if present
  .sp
  ~/\&.ansible\&.cfg \(em User config file, overrides the default config if present
  .SH "ENVIRONMENT"
Index: pkgsrc/sysutils/ansible/patches/patch-docs_man_man1_ansible-asciidoc
diff -u pkgsrc/sysutils/ansible/patches/patch-docs_man_man1_ansible-asciidoc:1.1 pkgsrc/sysutils/ansible/patches/patch-docs_man_man1_ansible-asciidoc:1.2
--- pkgsrc/sysutils/ansible/patches/patch-docs_man_man1_ansible-asciidoc:1.1    Wed Feb 17 20:31:45 2016
+++ pkgsrc/sysutils/ansible/patches/patch-docs_man_man1_ansible-asciidoc        Mon Aug  7 17:56:13 2017
@@ -1,4 +1,4 @@
-$NetBSD: patch-docs_man_man1_ansible-asciidoc,v 1.1 2016/02/17 20:31:45 he Exp $
+$NetBSD: patch-docs_man_man1_ansible-asciidoc,v 1.2 2017/08/07 17:56:13 jlam Exp $
 
 Fix hardcoded paths to be replaced with SUBST framework.
 
@@ -9,7 +9,7 @@ Fix hardcoded paths to be replaced with 
  *-i* 'PATH', *--inventory=*'PATH'::
  
 -The 'PATH' to the inventory hosts file, which defaults to '/etc/ansible/hosts'.
-+The 'PATH' to the inventory hosts file, which defaults to '@PKG_SYSCONFDIR@/ansible/hosts'.
++The 'PATH' to the inventory hosts file, which defaults to '@PKG_SYSCONFDIR@/hosts'.
  
  
  *-f* 'NUM', *--forks=*'NUM'::
@@ -27,13 +27,13 @@ Fix hardcoded paths to be replaced with 
  -----
  
 -/etc/ansible/hosts -- Default inventory file
-+@PKG_SYSCONFDIR@/ansible/hosts -- Default inventory file
++@PKG_SYSCONFDIR@/hosts -- Default inventory file
  
 -/usr/share/ansible/ -- Default module library
 +@PREFIX@/share/ansible/ -- Default module library
  
 -/etc/ansible/ansible.cfg -- Config file, used if present
-+@PKG_SYSCONFDIR@/ansible/ansible.cfg -- Config file, used if present
++@PKG_SYSCONFDIR@/ansible.cfg -- Config file, used if present
  
  ~/.ansible.cfg -- User config file, overrides the default config if present
  
Index: pkgsrc/sysutils/ansible/patches/patch-docs_man_man1_ansible-galaxy
diff -u pkgsrc/sysutils/ansible/patches/patch-docs_man_man1_ansible-galaxy:1.1 pkgsrc/sysutils/ansible/patches/patch-docs_man_man1_ansible-galaxy:1.2
--- pkgsrc/sysutils/ansible/patches/patch-docs_man_man1_ansible-galaxy:1.1      Wed Feb 17 20:31:45 2016
+++ pkgsrc/sysutils/ansible/patches/patch-docs_man_man1_ansible-galaxy  Mon Aug  7 17:56:13 2017
@@ -1,4 +1,4 @@
-$NetBSD: patch-docs_man_man1_ansible-galaxy,v 1.1 2016/02/17 20:31:45 he Exp $
+$NetBSD: patch-docs_man_man1_ansible-galaxy,v 1.2 2017/08/07 17:56:13 jlam Exp $
 
 Fix hardcoded paths to be replaced with SUBST framework.
 
@@ -9,7 +9,7 @@ Fix hardcoded paths to be replaced with 
  configured in your
  \fBansible\&.cfg\fR
 -file (/etc/ansible/roles if not configured)
-+file (@PKG_SYSCONFDIR@/ansible/roles if not configured)
++file (@PKG_SYSCONFDIR@/roles if not configured)
  .RE
  .PP
  \fB\-r\fR \fIROLE_FILE\fR, \fB\-\-role\-file=\fR\fIROLE_FILE\fR
@@ -18,7 +18,7 @@ Fix hardcoded paths to be replaced with 
  configured in your
  \fBansible\&.cfg\fR
 -file (/etc/ansible/roles if not configured)
-+file (@PKG_SYSCONFDIR@/ansible/roles if not configured)
++file (@PKG_SYSCONFDIR@/roles if not configured)
  .RE
  .SH "INIT"
  .sp
@@ -27,7 +27,7 @@ Fix hardcoded paths to be replaced with 
  configured in your
  \fBansible\&.cfg\fR
 -file (/etc/ansible/roles if not configured)
-+file (@PKG_SYSCONFDIR@/ansible/roles if not configured)
++file (@PKG_SYSCONFDIR@/roles if not configured)
  .RE
  .SH "AUTHOR"
  .sp
Index: pkgsrc/sysutils/ansible/patches/patch-docs_man_man1_ansible-galaxy-asciidoc
diff -u pkgsrc/sysutils/ansible/patches/patch-docs_man_man1_ansible-galaxy-asciidoc:1.1 pkgsrc/sysutils/ansible/patches/patch-docs_man_man1_ansible-galaxy-asciidoc:1.2
--- pkgsrc/sysutils/ansible/patches/patch-docs_man_man1_ansible-galaxy-asciidoc:1.1     Wed Feb 17 20:31:45 2016
+++ pkgsrc/sysutils/ansible/patches/patch-docs_man_man1_ansible-galaxy-asciidoc Mon Aug  7 17:56:13 2017
@@ -1,4 +1,4 @@
-$NetBSD: patch-docs_man_man1_ansible-galaxy-asciidoc,v 1.1 2016/02/17 20:31:45 he Exp $
+$NetBSD: patch-docs_man_man1_ansible-galaxy-asciidoc,v 1.2 2017/08/07 17:56:13 jlam Exp $
 
 Fix hardcoded paths to be replaced with SUBST framework.
 
@@ -9,7 +9,7 @@ Fix hardcoded paths to be replaced with 
  
  The path to the directory containing your roles. The default is the *roles_path* 
 -configured in your *ansible.cfg* file (/etc/ansible/roles if not configured)
-+configured in your *ansible.cfg* file (@PKG_SYSCONFDIR@/ansible/roles if not configured)
++configured in your *ansible.cfg* file (@PKG_SYSCONFDIR@/roles if not configured)
  
  *-r* 'ROLE_FILE', *--role-file=*'ROLE_FILE'::
  
@@ -18,7 +18,7 @@ Fix hardcoded paths to be replaced with 
  
  The path to the directory containing your roles. The default is the *roles_path* 
 -configured in your *ansible.cfg* file (/etc/ansible/roles if not configured)
-+configured in your *ansible.cfg* file (@PKG_SYSCONFDIR@/ansible/roles if not configured)
++configured in your *ansible.cfg* file (@PKG_SYSCONFDIR@/roles if not configured)
  
  INIT
  ----
@@ -27,7 +27,7 @@ Fix hardcoded paths to be replaced with 
  
  The path to the directory containing your roles. The default is the *roles_path*
 -configured in your *ansible.cfg* file (/etc/ansible/roles if not configured)
-+configured in your *ansible.cfg* file (@PKG_SYSCONFDIR@/ansible/roles if not configured)
++configured in your *ansible.cfg* file (@PKG_SYSCONFDIR@/roles if not configured)
  
  
  AUTHOR
Index: pkgsrc/sysutils/ansible/patches/patch-docs_man_man1_ansible-playbook
diff -u pkgsrc/sysutils/ansible/patches/patch-docs_man_man1_ansible-playbook:1.1 pkgsrc/sysutils/ansible/patches/patch-docs_man_man1_ansible-playbook:1.2
--- pkgsrc/sysutils/ansible/patches/patch-docs_man_man1_ansible-playbook:1.1    Wed Feb 17 20:31:45 2016
+++ pkgsrc/sysutils/ansible/patches/patch-docs_man_man1_ansible-playbook        Mon Aug  7 17:56:13 2017
@@ -1,4 +1,4 @@
-$NetBSD: patch-docs_man_man1_ansible-playbook,v 1.1 2016/02/17 20:31:45 he Exp $
+$NetBSD: patch-docs_man_man1_ansible-playbook,v 1.2 2017/08/07 17:56:13 jlam Exp $
 
 Fix hardcoded paths to be replaced with SUBST framework.
 
@@ -9,7 +9,7 @@ Fix hardcoded paths to be replaced with 
  \fIPATH\fR
  to the inventory hosts file, which defaults to
 -\fI/etc/ansible/hosts\fR\&.
-+\fI@PKG_SYSCONFDIR@/ansible/hosts\fR\&.
++\fI@PKG_SYSCONFDIR@/hosts\fR\&.
  .RE
  .PP
  \fB\-M\fR \fIDIRECTORY\fR, \fB\-\-module\-path=\fR\fIDIRECTORY\fR
@@ -27,13 +27,13 @@ Fix hardcoded paths to be replaced with 
  .SH "FILES"
  .sp
 -/etc/ansible/hosts \(em Default inventory file
-+@PKG_SYSCONFDIR@/ansible/hosts \(em Default inventory file
++@PKG_SYSCONFDIR@/hosts \(em Default inventory file
  .sp
 -/usr/share/ansible/ \(em Default module library
 +@PREFIX@/share/ansible/ \(em Default module library
  .sp
 -/etc/ansible/ansible\&.cfg \(em Config file, used if present
-+@PKG_SYSCONFDIR@/ansible/ansible\&.cfg \(em Config file, used if present
++@PKG_SYSCONFDIR@/ansible\&.cfg \(em Config file, used if present
  .sp
  ~/\&.ansible\&.cfg \(em User config file, overrides the default config if present
  .SH "AUTHOR"
Index: pkgsrc/sysutils/ansible/patches/patch-docs_man_man1_ansible-playbook-asciidoc
diff -u pkgsrc/sysutils/ansible/patches/patch-docs_man_man1_ansible-playbook-asciidoc:1.1 pkgsrc/sysutils/ansible/patches/patch-docs_man_man1_ansible-playbook-asciidoc:1.2
--- pkgsrc/sysutils/ansible/patches/patch-docs_man_man1_ansible-playbook-asciidoc:1.1   Wed Feb 17 20:31:45 2016
+++ pkgsrc/sysutils/ansible/patches/patch-docs_man_man1_ansible-playbook-asciidoc       Mon Aug  7 17:56:13 2017
@@ -1,4 +1,4 @@
-$NetBSD: patch-docs_man_man1_ansible-playbook-asciidoc,v 1.1 2016/02/17 20:31:45 he Exp $
+$NetBSD: patch-docs_man_man1_ansible-playbook-asciidoc,v 1.2 2017/08/07 17:56:13 jlam Exp $
 
 Fix hardcoded paths to be replaced with SUBST framework.
 
@@ -9,7 +9,7 @@ Fix hardcoded paths to be replaced with 
  
  The 'PATH' to the inventory hosts file, which defaults to
 -'/etc/ansible/hosts'.
-+'@PKG_SYSCONFDIR@/ansible/hosts'.
++'@PKG_SYSCONFDIR@/hosts'.
  
  
  *-M* 'DIRECTORY', *--module-path=*'DIRECTORY'::
@@ -25,13 +25,13 @@ Fix hardcoded paths to be replaced with 
  -----
  
 -/etc/ansible/hosts -- Default inventory file
-+@PKG_SYSCONFDIR@/ansible/hosts -- Default inventory file
++@PKG_SYSCONFDIR@/hosts -- Default inventory file
  
 -/usr/share/ansible/ -- Default module library
 +@PREFIX@/share/ansible/ -- Default module library
  
 -/etc/ansible/ansible.cfg -- Config file, used if present
-+@PKG_SYSCONFDIR@/ansible/ansible.cfg -- Config file, used if present
++@PKG_SYSCONFDIR@/ansible.cfg -- Config file, used if present
  
  ~/.ansible.cfg -- User config file, overrides the default config if present
  
Index: pkgsrc/sysutils/ansible/patches/patch-examples_ansible
diff -u pkgsrc/sysutils/ansible/patches/patch-examples_ansible:1.1 pkgsrc/sysutils/ansible/patches/patch-examples_ansible:1.2
--- pkgsrc/sysutils/ansible/patches/patch-examples_ansible:1.1  Wed Feb 17 20:31:45 2016
+++ pkgsrc/sysutils/ansible/patches/patch-examples_ansible      Mon Aug  7 17:56:13 2017
@@ -1,4 +1,4 @@
-$NetBSD: patch-examples_ansible,v 1.1 2016/02/17 20:31:45 he Exp $
+$NetBSD: patch-examples_ansible,v 1.2 2017/08/07 17:56:13 jlam Exp $
 
 Fix hardcoded paths to be replaced with SUBST framework.
 
@@ -9,7 +9,7 @@ Fix hardcoded paths to be replaced with 
  # or with command line flags. ansible will read ANSIBLE_CONFIG,
  # ansible.cfg in the current working directory, .ansible.cfg in
 -# the home directory or /etc/ansible/ansible.cfg, whichever it
-+# the home directory or @PKG_SYSCONFDIR@/ansible/ansible.cfg, whichever it
++# the home directory or @PKG_SYSCONFDIR@/ansible.cfg, whichever it
  # finds first
  
  [defaults]
@@ -18,7 +18,7 @@ Fix hardcoded paths to be replaced with 
  
 -inventory      = /etc/ansible/hosts
 -#library        = /usr/share/my_modules/
-+inventory      = @PKG_SYSCONFDIR@/ansible/hosts
++inventory      = @PKG_SYSCONFDIR@/hosts
 +#library        = @PREFIX@/share/my_modules/
  remote_tmp     = $HOME/.ansible/tmp
  pattern        = *
@@ -28,7 +28,7 @@ Fix hardcoded paths to be replaced with 
  
  # additional paths to search for roles in, colon separated
 -#roles_path    = /etc/ansible/roles
-+#roles_path    = @PKG_SYSCONFDIR@/ansible/roles
++#roles_path    = @PKG_SYSCONFDIR@/roles
  
  # uncomment this to disable SSH key host checking
  #host_key_checking = False
Index: pkgsrc/sysutils/ansible/patches/patch-examples_hosts
diff -u pkgsrc/sysutils/ansible/patches/patch-examples_hosts:1.1 pkgsrc/sysutils/ansible/patches/patch-examples_hosts:1.2
--- pkgsrc/sysutils/ansible/patches/patch-examples_hosts:1.1    Wed Feb 17 20:31:45 2016
+++ pkgsrc/sysutils/ansible/patches/patch-examples_hosts        Mon Aug  7 17:56:13 2017
@@ -1,4 +1,4 @@
-$NetBSD: patch-examples_hosts,v 1.1 2016/02/17 20:31:45 he Exp $
+$NetBSD: patch-examples_hosts,v 1.2 2017/08/07 17:56:13 jlam Exp $
 
 Fix hardcoded paths to be replaced with SUBST framework.
 
@@ -8,7 +8,7 @@ Fix hardcoded paths to be replaced with 
  # This is the default ansible 'hosts' file.
  #
 -# It should live in /etc/ansible/hosts
-+# It should live in @PKG_SYSCONFDIR@/ansible/hosts
++# It should live in @PKG_SYSCONFDIR@/hosts
  #
  #   - Comments begin with the '#' character
  #   - Blank lines are ignored
Index: pkgsrc/sysutils/ansible/patches/patch-lib_ansible_modules_extras_database_misc_riak
diff -u pkgsrc/sysutils/ansible/patches/patch-lib_ansible_modules_extras_database_misc_riak:1.1 pkgsrc/sysutils/ansible/patches/patch-lib_ansible_modules_extras_database_misc_riak:1.2
--- pkgsrc/sysutils/ansible/patches/patch-lib_ansible_modules_extras_database_misc_riak:1.1     Wed Feb 17 20:31:45 2016
+++ pkgsrc/sysutils/ansible/patches/patch-lib_ansible_modules_extras_database_misc_riak Mon Aug  7 17:56:13 2017
@@ -1,4 +1,4 @@
-$NetBSD: patch-lib_ansible_modules_extras_database_misc_riak,v 1.1 2016/02/17 20:31:45 he Exp $
+$NetBSD: patch-lib_ansible_modules_extras_database_misc_riak,v 1.2 2017/08/07 17:56:13 jlam Exp $
 
 Fix hardcoded paths to be replaced with SUBST framework.
 
@@ -9,7 +9,7 @@ Fix hardcoded paths to be replaced with 
        - The path to the riak configuration directory
      required: false
 -    default: /etc/riak
-+    default: @PKG_SYSCONFDIR@/riak
++    default: @PKG_SYSCONFBASE@/riak
      aliases: []
    http_conn:
      description:
@@ -18,7 +18,7 @@ Fix hardcoded paths to be replaced with 
          command=dict(required=False, default=None, choices=[
                      'ping', 'kv_test', 'join', 'plan', 'commit']),
 -        config_dir=dict(default='/etc/riak'),
-+        config_dir=dict(default='@PKG_SYSCONFDIR@/riak'),
++        config_dir=dict(default='@PKG_SYSCONFBASE@/riak'),
          http_conn=dict(required=False, default='127.0.0.1:8098'),
          target_node=dict(default='riak@127.0.0.1', required=False),
          wait_for_handoffs=dict(default=False, type='int'),
Index: pkgsrc/sysutils/ansible/patches/patch-lib_ansible_modules_extras_monitoring_nagios
diff -u pkgsrc/sysutils/ansible/patches/patch-lib_ansible_modules_extras_monitoring_nagios:1.1 pkgsrc/sysutils/ansible/patches/patch-lib_ansible_modules_extras_monitoring_nagios:1.2
--- pkgsrc/sysutils/ansible/patches/patch-lib_ansible_modules_extras_monitoring_nagios:1.1      Wed Feb 17 20:31:45 2016
+++ pkgsrc/sysutils/ansible/patches/patch-lib_ansible_modules_extras_monitoring_nagios  Mon Aug  7 17:56:13 2017
@@ -1,4 +1,4 @@
-$NetBSD: patch-lib_ansible_modules_extras_monitoring_nagios,v 1.1 2016/02/17 20:31:45 he Exp $
+$NetBSD: patch-lib_ansible_modules_extras_monitoring_nagios,v 1.2 2017/08/07 17:56:13 jlam Exp $
 
 Fix hardcoded paths to be replaced with SUBST framework.
 
@@ -9,7 +9,7 @@ Fix hardcoded paths to be replaced with 
  def which_cmdfile():
      locations = [
 +              # pkgsrc - any OS
-+              '@PKG_SYSCONFDIR@/nagios/nagios.cfg',
++              '@PKG_SYSCONFBASE@/nagios/nagios.cfg',
          # rhel
          '/etc/nagios/nagios.cfg',
          # debian
@@ -27,7 +27,7 @@ Fix hardcoded paths to be replaced with 
          '/opt/nagios/etc/nagios.cfg',
          '/opt/nagios/nagios.cfg',
 +              # icinga on pkgsrc - any OS
-+              '@PKG_SYSCONFDIR@/icinga/icinga.cfg',
++              '@PKG_SYSCONFBASE@/icinga/icinga.cfg',
          # icinga on debian/ubuntu
          '/etc/icinga/icinga.cfg',
          # icinga installed from source (default location)
Index: pkgsrc/sysutils/ansible/patches/patch-plugins_README
diff -u pkgsrc/sysutils/ansible/patches/patch-plugins_README:1.1 pkgsrc/sysutils/ansible/patches/patch-plugins_README:1.2
--- pkgsrc/sysutils/ansible/patches/patch-plugins_README:1.1    Wed Feb 17 20:31:45 2016
+++ pkgsrc/sysutils/ansible/patches/patch-plugins_README        Mon Aug  7 17:56:13 2017
@@ -1,4 +1,4 @@
-$NetBSD: patch-plugins_README,v 1.1 2016/02/17 20:31:45 he Exp $
+$NetBSD: patch-plugins_README,v 1.2 2017/08/07 17:56:13 jlam Exp $
 
 Fix hardcoded paths to be replaced with SUBST framework.
 
@@ -9,7 +9,7 @@ Fix hardcoded paths to be replaced with 
  Cobbler.  These could also be used to interface with LDAP or database.
  
 -chmod +x an inventory plugin and either name it /etc/ansible/hosts or use ansible
-+chmod +x an inventory plugin and either name it @PKG_SYSCONFDIR@/ansible/hosts or use ansible
++chmod +x an inventory plugin and either name it @PKG_SYSCONFDIR@/hosts or use ansible
  with -i to designate the path to the plugin.
  
  contributions welcome
Index: pkgsrc/sysutils/ansible/patches/patch-plugins_inventory_cobbler
diff -u pkgsrc/sysutils/ansible/patches/patch-plugins_inventory_cobbler:1.1 pkgsrc/sysutils/ansible/patches/patch-plugins_inventory_cobbler:1.2
--- pkgsrc/sysutils/ansible/patches/patch-plugins_inventory_cobbler:1.1 Wed Feb 17 20:31:45 2016
+++ pkgsrc/sysutils/ansible/patches/patch-plugins_inventory_cobbler     Mon Aug  7 17:56:13 2017
@@ -1,4 +1,4 @@
-$NetBSD: patch-plugins_inventory_cobbler,v 1.1 2016/02/17 20:31:45 he Exp $
+$NetBSD: patch-plugins_inventory_cobbler,v 1.2 2017/08/07 17:56:13 jlam Exp $
 
 Fix hardcoded paths to be replaced with SUBST framework.
 
@@ -9,12 +9,12 @@ Fix hardcoded paths to be replaced with 
  =================================
  
 -Ansible has a feature where instead of reading from /etc/ansible/hosts
-+Ansible has a feature where instead of reading from @PKG_SYSCONFDIR@/ansible/hosts
++Ansible has a feature where instead of reading from @PKG_SYSCONFDIR@/hosts
  as a text file, it can query external programs to obtain the list
  of hosts, groups the hosts are in, and even variables to assign to each host.
  
 -To use this, copy this file over /etc/ansible/hosts and chmod +x the file.
-+To use this, copy this file over @PKG_SYSCONFDIR@//ansible/hosts and chmod +x the file.
++To use this, copy this file over @PKG_SYSCONFDIR@/hosts and chmod +x the file.
  This, more or less, allows you to keep one central database containing
  info about all of your managed instances.
  
Index: pkgsrc/sysutils/ansible/patches/patch-plugins_inventory_collins
diff -u pkgsrc/sysutils/ansible/patches/patch-plugins_inventory_collins:1.1 pkgsrc/sysutils/ansible/patches/patch-plugins_inventory_collins:1.2
--- pkgsrc/sysutils/ansible/patches/patch-plugins_inventory_collins:1.1 Wed Feb 17 20:31:45 2016
+++ pkgsrc/sysutils/ansible/patches/patch-plugins_inventory_collins     Mon Aug  7 17:56:13 2017
@@ -1,4 +1,4 @@
-$NetBSD: patch-plugins_inventory_collins,v 1.1 2016/02/17 20:31:45 he Exp $
+$NetBSD: patch-plugins_inventory_collins,v 1.2 2017/08/07 17:56:13 jlam Exp $
 
 Fix hardcoded paths to be replaced with SUBST framework.
 
@@ -9,7 +9,7 @@ Fix hardcoded paths to be replaced with 
  =================================
  
 -Ansible has a feature where instead of reading from /etc/ansible/hosts
-+Ansible has a feature where instead of reading from @PKG_SYSCONFDIR@/ansible/hosts
++Ansible has a feature where instead of reading from @PKG_SYSCONFDIR@/hosts
  as a text file, it can query external programs to obtain the list
  of hosts, groups the hosts are in, and even variables to assign to each host.
  
@@ -18,7 +18,7 @@ Fix hardcoded paths to be replaced with 
  To use it, copy it to your repo and pass -i <collins script> to the ansible or
  ansible-playbook command; if you'd like to use it by default, simply copy collins.ini
 -to /etc/ansible and this script to /etc/ansible/hosts.
-+to @PKG_SYSCONFDIR@/ansible and this script to @PKG_SYSCONFDIR@/ansible/hosts.
++to @PKG_SYSCONFDIR@ and this script to @PKG_SYSCONFDIR@/hosts.
  
  Alongside the options set in collins.ini, there are several environment variables
  that will be used instead of the configured values if they are set:

Index: pkgsrc/sysutils/ansible/patches/patch-lib_ansible_constants
diff -u pkgsrc/sysutils/ansible/patches/patch-lib_ansible_constants:1.2 pkgsrc/sysutils/ansible/patches/patch-lib_ansible_constants:1.3
--- pkgsrc/sysutils/ansible/patches/patch-lib_ansible_constants:1.2     Thu Feb 18 09:24:25 2016
+++ pkgsrc/sysutils/ansible/patches/patch-lib_ansible_constants Mon Aug  7 17:56:13 2017
@@ -1,4 +1,4 @@
-$NetBSD: patch-lib_ansible_constants,v 1.2 2016/02/18 09:24:25 he Exp $
+$NetBSD: patch-lib_ansible_constants,v 1.3 2017/08/07 17:56:13 jlam Exp $
 
 Fix hardcoded paths to be replaced with SUBST framework.
 Move the ansible/roles tree out from under any etc/ directory to share/
@@ -10,7 +10,7 @@ Move the ansible/roles tree out from und
      path1 = os.getcwd() + "/ansible.cfg"
      path2 = os.path.expanduser("~/.ansible.cfg")
 -    path3 = "/etc/ansible/ansible.cfg"
-+    path3 = "@PKG_SYSCONFDIR@/ansible/ansible.cfg"
++    path3 = "@PKG_SYSCONFDIR@/ansible.cfg"
  
      for path in [path0, path1, path2, path3]:
          if path is not None and os.path.exists(path):
@@ -19,7 +19,7 @@ Move the ansible/roles tree out from und
  
  # configurable things
 -DEFAULT_HOST_LIST         = shell_expand_path(get_config(p, DEFAULTS, 'inventory', 'ANSIBLE_INVENTORY', get_config(p, DEFAULTS,'hostfile','ANSIBLE_HOSTS', '/etc/ansible/hosts')))
-+DEFAULT_HOST_LIST         = shell_expand_path(get_config(p, DEFAULTS, 'inventory', 'ANSIBLE_INVENTORY', get_config(p, DEFAULTS,'hostfile','ANSIBLE_HOSTS', '@PKG_SYSCONFDIR@/ansible/hosts')))
++DEFAULT_HOST_LIST         = shell_expand_path(get_config(p, DEFAULTS, 'inventory', 'ANSIBLE_INVENTORY', get_config(p, DEFAULTS,'hostfile','ANSIBLE_HOSTS', '@PKG_SYSCONFDIR@/hosts')))
  DEFAULT_MODULE_PATH       = get_config(p, DEFAULTS, 'library',          'ANSIBLE_LIBRARY',          None)
 -DEFAULT_ROLES_PATH        = shell_expand_path(get_config(p, DEFAULTS, 'roles_path',       'ANSIBLE_ROLES_PATH',       '/etc/ansible/roles'))
 +DEFAULT_ROLES_PATH        = shell_expand_path(get_config(p, DEFAULTS, 'roles_path',       'ANSIBLE_ROLES_PATH',       '@PREFIX@/share/ansible/roles'))

Index: pkgsrc/sysutils/open-vm-tools/Makefile
diff -u pkgsrc/sysutils/open-vm-tools/Makefile:1.72 pkgsrc/sysutils/open-vm-tools/Makefile:1.73
--- pkgsrc/sysutils/open-vm-tools/Makefile:1.72 Fri Jun 23 18:25:12 2017
+++ pkgsrc/sysutils/open-vm-tools/Makefile      Mon Aug  7 17:56:13 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.72 2017/06/23 18:25:12 kamil Exp $
+# $NetBSD: Makefile,v 1.73 2017/08/07 17:56:13 jlam Exp $
 
 DISTNAME=      open-vm-tools-10.1.5-5055683
 PKGNAME=       open-vm-tools-10.1.5
@@ -28,7 +28,7 @@ CONFIGURE_ARGS+=              --disable-vgauth
 CONFIGURE_ARGS+=               --disable-grabbitmqproxy
 CONFIGURE_ARGS+=               --disable-docs # Requires doxygen
 
-INSTALLATION_DIRS+=            ${PKG_SYSCONFDIR} share/examples/vmware-tools
+INSTALLATION_DIRS+=            share/examples/vmware-tools
 
 PKG_SYSCONFSUBDIR=             vmware-tools
 EGDIR=                         ${PREFIX}/share/examples/vmware-tools

Prev by Date: CVS commit: pkgsrc/devel/include-what-you-use
Next by Date: CVS commit: pkgsrc/devel
Previous by Thread: CVS commit: pkgsrc/devel/include-what-you-use
Next by Thread: CVS commit: pkgsrc/devel
Indexes:

Home | Main Index | Thread Index | Old Index