[pkgsrc/trunk]: pkgsrc/sysutils/ansible sysutils/ansible: fix pkglint warning...

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7c6be8f2480d
branches:  trunk
changeset: 403856:7c6be8f2480d
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sat Nov 02 15:18:34 2019 +0000

description:
sysutils/ansible: fix pkglint warnings and clean up Makefile

diffstat:

 sysutils/ansible/Makefile |  80 +++++++++++++++++++---------------------------
 1 files changed, 34 insertions(+), 46 deletions(-)

diffs (110 lines):

diff -r 60378c41a396 -r 7c6be8f2480d sysutils/ansible/Makefile
--- a/sysutils/ansible/Makefile Sat Nov 02 15:14:21 2019 +0000
+++ b/sysutils/ansible/Makefile Sat Nov 02 15:18:34 2019 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2019/09/02 13:20:09 adam Exp $
+# $NetBSD: Makefile,v 1.26 2019/11/02 15:18:34 rillig Exp $
 
 DISTNAME=      ansible-1.9.4
 PKGREVISION=   2
-#PKGNAME=   ${PYPKGPREFIX}-${DISTNAME} # XXX: for when package is py3x-ready
+#PKGNAME=      ${PYPKGPREFIX}-${DISTNAME} # XXX: for when package is py3x-ready
 CATEGORIES=    python sysutils
 MASTER_SITES=  http://releases.ansible.com/ansible/
 
@@ -17,49 +17,40 @@
 DEPENDS+=      ${PYPKGPREFIX}-crypto>=2.6:../../security/py-crypto
 
 USE_TOOLS+=    gmake
+AUTO_MKDIRS=   yes
 EGDIR=         ${PREFIX}/share/examples/ansible
 
-SUBST_CLASSES+=         prefix
-SUBST_STAGE.prefix=     pre-configure
-SUBST_FILES.prefix+=    docs/man/man1/ansible.1
-SUBST_FILES.prefix+=    docs/man/man1/ansible.1.asciidoc.in
-SUBST_FILES.prefix+=    docs/man/man1/ansible-galaxy.1
-SUBST_FILES.prefix+=    docs/man/man1/ansible-galaxy.1.asciidoc.in
-SUBST_FILES.prefix+=    docs/man/man1/ansible-playbook.1
-SUBST_FILES.prefix+=    docs/man/man1/ansible-playbook.1.asciidoc.in
-SUBST_FILES.prefix+=    examples/ansible.cfg examples/hosts
-SUBST_FILES.prefix+=    lib/ansible/constants.py lib/ansible/callbacks.py
-SUBST_FILES.prefix+=    lib/ansible/modules/core/system/ping.py
-SUBST_FILES.prefix+=    lib/ansible/modules/core/system/setup.py
-SUBST_FILES.prefix+=    lib/ansible/modules/extras/database/misc/riak.py
-SUBST_FILES.prefix+=    lib/ansible/modules/extras/monitoring/nagios.py
-SUBST_FILES.prefix+=    lib/ansible/modules/extras/packaging/os/pkgin.py
-SUBST_FILES.prefix+=    plugins/README.md plugins/inventory/cobbler.py
-SUBST_FILES.prefix+=    plugins/inventory/collins.py
-SUBST_MESSAGE.prefix=   Fixing PREFIX path.
-SUBST_VARS.prefix=     PREFIX
-SUBST_VARS.prefix+=    PKG_SYSCONFBASE
-SUBST_VARS.prefix+=    PKG_SYSCONFDIR
+SUBST_CLASSES+=                dirs
+SUBST_STAGE.dirs=      pre-configure
+SUBST_FILES.dirs+=     docs/man/man1/ansible.1
+SUBST_FILES.dirs+=     docs/man/man1/ansible.1.asciidoc.in
+SUBST_FILES.dirs+=     docs/man/man1/ansible-galaxy.1
+SUBST_FILES.dirs+=     docs/man/man1/ansible-galaxy.1.asciidoc.in
+SUBST_FILES.dirs+=     docs/man/man1/ansible-playbook.1
+SUBST_FILES.dirs+=     docs/man/man1/ansible-playbook.1.asciidoc.in
+SUBST_FILES.dirs+=     examples/ansible.cfg examples/hosts
+SUBST_FILES.dirs+=     lib/ansible/constants.py lib/ansible/callbacks.py
+SUBST_FILES.dirs+=     lib/ansible/modules/core/system/ping.py
+SUBST_FILES.dirs+=     lib/ansible/modules/core/system/setup.py
+SUBST_FILES.dirs+=     lib/ansible/modules/extras/database/misc/riak.py
+SUBST_FILES.dirs+=     lib/ansible/modules/extras/monitoring/nagios.py
+SUBST_FILES.dirs+=     lib/ansible/modules/extras/packaging/os/pkgin.py
+SUBST_FILES.dirs+=     plugins/README.md plugins/inventory/cobbler.py
+SUBST_FILES.dirs+=     plugins/inventory/collins.py
+SUBST_VARS.dirs=       PREFIX PKG_SYSCONFBASE PKG_SYSCONFDIR
 
-SUBST_CLASSES+=         pythonbin
-SUBST_STAGE.pythonbin=  pre-configure
-SUBST_FILES.pythonbin=  Makefile
-SUBST_MESSAGE.pythonbin=        Fixing path to PYTHONBIN.
-SUBST_SED.pythonbin=    -e "s,PYTHON=python,PYTHON=${PYTHONBIN},"
-
-PYTHON_VERSIONS_ACCEPTED=    27 # py-paramiko
+SUBST_CLASSES+=                        pythonbin
+SUBST_STAGE.pythonbin=         pre-configure
+SUBST_FILES.pythonbin=         Makefile
+SUBST_MESSAGE.pythonbin=       Fixing path to PYTHONBIN.
+SUBST_SED.pythonbin=           -e "s,PYTHON=python,PYTHON=${PYTHONBIN},"
 
-REPLACE_PYTHON=         lib/ansible/runner/action_plugins/synchronize.py
-REPLACE_PYTHON+=        lib/ansible/utils/module_docs.py
-
-MANPAGES=       ansible-doc.1 ansible-pull.1 ansible-galaxy.1 ansible-vault.1
-MANPAGES+=      ansible-playbook.1 ansible.1
+PYTHON_VERSIONS_ACCEPTED=      27 # py-paramiko
 
-INSTALLATION_DIRS=      bin ${PKGMANDIR}/man1
-INSTALLATION_DIRS+=     ${EGDIR}/playbooks
-INSTALLATION_DIRS+=     share/ansible/roles
+REPLACE_PYTHON=                lib/ansible/runner/action_plugins/synchronize.py
+REPLACE_PYTHON+=       lib/ansible/utils/module_docs.py
 
-CHECK_INTERPRETER_SKIP= share/ansible/*
+INSTALLATION_DIRS=     ${EGDIR}/playbooks share/ansible/roles
 
 MAKE_DIRS=             ${PREFIX}/share/ansible
 MAKE_DIRS+=            ${PREFIX}/share/ansible/ansible_plugins
@@ -74,13 +65,10 @@
        find ${WRKSRC} -name \*.orig -exec rm {} \;
 
 post-install:
-.for f in ${MANPAGES}
-       ${INSTALL_MAN} ${WRKSRC}/docs/man/man1/${f} \
-               ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/
-.endfor
-.for f in ansible.cfg hosts
-       ${INSTALL_DATA} ${WRKSRC}/examples/${f} ${DESTDIR}/${EGDIR}
-.endfor
+       cd ${WRKSRC}/docs/man/man1 && \
+       ${INSTALL_MAN} ./*.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/
+       cd ${WRKSRC}/examples && \
+       ${INSTALL_DATA} ansible.cfg hosts ${DESTDIR}/${EGDIR}
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/egg.mk"