Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1572707914152090"
MIME-Version: 1.0
Date: Sat, 2 Nov 2019 15:18:34 +0000
From: "Roland Illig" <rillig@netbsd.org>
Subject: CVS commit: pkgsrc/sysutils/ansible
To: pkgsrc-changes@NetBSD.org
Reply-To: rillig@netbsd.org
Message-Id: <20191102151834.55E75FA92@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1572707914152090
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	rillig
Date:		Sat Nov  2 15:18:34 UTC 2019

Modified Files:
	pkgsrc/sysutils/ansible: Makefile

Log Message:
sysutils/ansible: fix pkglint warnings and clean up Makefile


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 pkgsrc/sysutils/ansible/Makefile

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


--_----------=_1572707914152090
Content-Disposition: inline
Content-Length: 4948
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/sysutils/ansible/Makefile
diff -u pkgsrc/sysutils/ansible/Makefile:1.25 pkgsrc/sysutils/ansible/Makefile:1.26
--- pkgsrc/sysutils/ansible/Makefile:1.25	Mon Sep  2 13:20:09 2019
+++ pkgsrc/sysutils/ansible/Makefile	Sat Nov  2 15:18:34 2019
@@ -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}-jinja2-[0-9]*:.
 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+=         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
-
-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
-
-INSTALLATION_DIRS=      bin ${PKGMANDIR}/man1
-INSTALLATION_DIRS+=     ${EGDIR}/playbooks
-INSTALLATION_DIRS+=     share/ansible/roles
+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},"
 
-CHECK_INTERPRETER_SKIP= share/ansible/*
+PYTHON_VERSIONS_ACCEPTED=	27 # py-paramiko
+
+REPLACE_PYTHON=		lib/ansible/runner/action_plugins/synchronize.py
+REPLACE_PYTHON+=	lib/ansible/utils/module_docs.py
+
+INSTALLATION_DIRS=	${EGDIR}/playbooks share/ansible/roles
 
 MAKE_DIRS=		${PREFIX}/share/ansible
 MAKE_DIRS+=		${PREFIX}/share/ansible/ansible_plugins
@@ -74,13 +65,10 @@ pre-install:
 	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"


--_----------=_1572707914152090--