No need to have two variables for the same logic.

Replace PYTHON_PATCH_SCRIPTS with REPLACE_PYTHON.

9 files changed, 118 insertions, 118 deletions

diff --git a/sysutils/libvirt/Makefile b/sysutils/libvirt/Makefile
index 30a495b7191..25451c90a8b 100644
--- a/sysutils/libvirt/Makefile
+++ b/sysutils/libvirt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2014/01/25 10:30:21 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2014/01/25 10:45:21 wiz Exp $
 
 DISTNAME=	libvirt-1.2.1
 CATEGORIES=	sysutils
@@ -18,24 +18,24 @@ USE_LIBTOOL=		yes
 PYTHON_VERSIONS_INCOMPATIBLE=	33 # py-xml
 
 PY_PATCHPLIST=		yes
-PYTHON_PATCH_SCRIPTS+=	examples/python/domstart.py
-PYTHON_PATCH_SCRIPTS+=	examples/python/domrestore.py
-PYTHON_PATCH_SCRIPTS+=	examples/python/dominfo.py
-PYTHON_PATCH_SCRIPTS+=	examples/python/domsave.py
-PYTHON_PATCH_SCRIPTS+=	examples/python/esxlist.py
-PYTHON_PATCH_SCRIPTS+=	examples/domain-events/events-python/event-test.py
-PYTHON_PATCH_SCRIPTS+=	python/tests/create.py
-PYTHON_PATCH_SCRIPTS+=	python/tests/error.py
-PYTHON_PATCH_SCRIPTS+=	python/tests/uuid.py
-PYTHON_PATCH_SCRIPTS+=	python/tests/basic.py
-PYTHON_PATCH_SCRIPTS+=	python/tests/node.py
-PYTHON_PATCH_SCRIPTS+=	python/libvirt-override.py
-PYTHON_PATCH_SCRIPTS+=	python/libvirt-override-virStream.py
-PYTHON_PATCH_SCRIPTS+=	python/libvirt-override-virConnect.py
-PYTHON_PATCH_SCRIPTS+=	python/generator.py
-PYTHON_PATCH_SCRIPTS+=	python/libvirt.py
-PYTHON_PATCH_SCRIPTS+=	src/esx/esx_vi_generator.py
-PYTHON_PATCH_SCRIPTS+=	docs/apibuild.py
+REPLACE_PYTHON+=	examples/python/domstart.py
+REPLACE_PYTHON+=	examples/python/domrestore.py
+REPLACE_PYTHON+=	examples/python/dominfo.py
+REPLACE_PYTHON+=	examples/python/domsave.py
+REPLACE_PYTHON+=	examples/python/esxlist.py
+REPLACE_PYTHON+=	examples/domain-events/events-python/event-test.py
+REPLACE_PYTHON+=	python/tests/create.py
+REPLACE_PYTHON+=	python/tests/error.py
+REPLACE_PYTHON+=	python/tests/uuid.py
+REPLACE_PYTHON+=	python/tests/basic.py
+REPLACE_PYTHON+=	python/tests/node.py
+REPLACE_PYTHON+=	python/libvirt-override.py
+REPLACE_PYTHON+=	python/libvirt-override-virStream.py
+REPLACE_PYTHON+=	python/libvirt-override-virConnect.py
+REPLACE_PYTHON+=	python/generator.py
+REPLACE_PYTHON+=	python/libvirt.py
+REPLACE_PYTHON+=	src/esx/esx_vi_generator.py
+REPLACE_PYTHON+=	docs/apibuild.py
 
 EGDIR=			${PREFIX}/share/examples
 CONF_FILES+=		${EGDIR}/libvirt/libvirtd.conf ${PKG_SYSCONFDIR}/libvirt/libvirtd.conf
diff --git a/sysutils/logfinder/Makefile b/sysutils/logfinder/Makefile
index b4ef1567df5..dc22bb49f52 100644
--- a/sysutils/logfinder/Makefile
+++ b/sysutils/logfinder/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2012/10/23 19:51:11 asau Exp $
+# $NetBSD: Makefile,v 1.11 2014/01/25 10:45:21 wiz Exp $
 #
 
 DISTNAME=		logfinder-0.1
@@ -14,7 +14,7 @@ DEPENDS+=		lsof>=4.72:../../sysutils/lsof
 
 NO_BUILD=		YES
 
-PYTHON_PATCH_SCRIPTS+=	${WRKSRC}/logfinder.py
+REPLACE_PYTHON+=	${WRKSRC}/logfinder.py
 INSTALLATION_DIRS=	sbin
 
 do-install:
diff --git a/sysutils/tdir/Makefile b/sysutils/tdir/Makefile
index ce78805f37c..810d0016979 100644
--- a/sysutils/tdir/Makefile
+++ b/sysutils/tdir/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2013/10/17 16:47:41 shattered Exp $
+# $NetBSD: Makefile,v 1.22 2014/01/25 10:45:21 wiz Exp $
 #
 
 DISTNAME=	tdir-1.69
@@ -12,7 +12,7 @@ LICENSE=	tdir-license
 NOT_FOR_BULK_PLATFORM=	HPUX-*-*
 
 USE_TOOLS+=		gunzip
-PYTHON_PATCH_SCRIPTS=	tdir
+REPLACE_PYTHON=	tdir
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 share/doc/tdir
 
 do-install:
diff --git a/sysutils/vxargs/Makefile b/sysutils/vxargs/Makefile
index b4d6c81b802..e488807f48b 100644
--- a/sysutils/vxargs/Makefile
+++ b/sysutils/vxargs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2013/06/04 07:38:49 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2014/01/25 10:45:21 wiz Exp $
 
 DISTNAME=	vxargs-0.3.3
 PKGREVISION=	2
@@ -18,7 +18,7 @@ WRKSRC=		${WRKDIR}
 
 INSTALLATION_DIRS=	bin
 
-PYTHON_PATCH_SCRIPTS=	vxargs.py
+REPLACE_PYTHON=	vxargs.py
 
 .include "../../lang/python/application.mk"
 
diff --git a/sysutils/xentools20/Makefile b/sysutils/xentools20/Makefile
index 7805297a3d8..331a26d5284 100644
--- a/sysutils/xentools20/Makefile
+++ b/sysutils/xentools20/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2014/01/25 10:30:22 wiz Exp $
+# $NetBSD: Makefile,v 1.44 2014/01/25 10:45:21 wiz Exp $
 
 DISTNAME=		xen-2.0.7-src
 PKGNAME=		xentools20-2.0.7
@@ -33,18 +33,18 @@ MAKE_ENV+=		EGDIR=${EGDIR:Q}
 MAKE_ENV+=		MV=${MV:Q} PYTHON=${PYTHONBIN:Q} SED=${SED:Q}
 
 PY_PATCHPLIST=		yes
-PYTHON_PATCH_SCRIPTS=	python/xen/util/console_client.py
-PYTHON_PATCH_SCRIPTS+=	python/xen/xend/server/SrvServer.py
-PYTHON_PATCH_SCRIPTS+=	python/xen/xend/XendClient.py
-PYTHON_PATCH_SCRIPTS+=	python/xen/xend/sxp.py
-PYTHON_PATCH_SCRIPTS+=	xfrd/xfrdClient.py
-PYTHON_PATCH_SCRIPTS+=	misc/xensymoops
-PYTHON_PATCH_SCRIPTS+=	misc/xencons
-PYTHON_PATCH_SCRIPTS+=	misc/xm
-PYTHON_PATCH_SCRIPTS+=	misc/xensv
-PYTHON_PATCH_SCRIPTS+=	misc/netfix
-PYTHON_PATCH_SCRIPTS+=	misc/xend
-PYTHON_PATCH_SCRIPTS+=	xentrace/xentrace_format
+REPLACE_PYTHON=	python/xen/util/console_client.py
+REPLACE_PYTHON+=	python/xen/xend/server/SrvServer.py
+REPLACE_PYTHON+=	python/xen/xend/XendClient.py
+REPLACE_PYTHON+=	python/xen/xend/sxp.py
+REPLACE_PYTHON+=	xfrd/xfrdClient.py
+REPLACE_PYTHON+=	misc/xensymoops
+REPLACE_PYTHON+=	misc/xencons
+REPLACE_PYTHON+=	misc/xm
+REPLACE_PYTHON+=	misc/xensv
+REPLACE_PYTHON+=	misc/netfix
+REPLACE_PYTHON+=	misc/xend
+REPLACE_PYTHON+=	xentrace/xentrace_format
 
 SUBST_CLASSES+=          paths py conf
 SUBST_STAGE.paths=	pre-configure
diff --git a/sysutils/xentools3/Makefile b/sysutils/xentools3/Makefile
index 3999aa0a280..3e492db43e1 100644
--- a/sysutils/xentools3/Makefile
+++ b/sysutils/xentools3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2014/01/25 10:30:22 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2014/01/25 10:45:21 wiz Exp $
 
 VERSION=	3.1.4
 DISTNAME=	xen-${VERSION}
@@ -49,25 +49,25 @@ MAKE_ENV+=		XEN_TARGET_ARCH="x86_64" XEN_COMPILE_ARCH="x86_64"
 MAKE_ENV+=		XEN_TARGET_ARCH="unsupported"
 .endif
 PY_PATCHPLIST=		yes
-PYTHON_PATCH_SCRIPTS+=	misc/xm
-PYTHON_PATCH_SCRIPTS+=	misc/netfix
-PYTHON_PATCH_SCRIPTS+=	misc/xen-bugtool
-PYTHON_PATCH_SCRIPTS+=	misc/xencons
-PYTHON_PATCH_SCRIPTS+=	misc/xend
-PYTHON_PATCH_SCRIPTS+=	misc/xensymoops
-PYTHON_PATCH_SCRIPTS+=	misc/xen-python-path
-PYTHON_PATCH_SCRIPTS+=	pygrub/src/pygrub
-PYTHON_PATCH_SCRIPTS+=	python/xen/util/*.py
-PYTHON_PATCH_SCRIPTS+=	python/xen/xend/*.py
-PYTHON_PATCH_SCRIPTS+=	python/xen/xm/*.py
-PYTHON_PATCH_SCRIPTS+=	python/xen/util/*.py
-PYTHON_PATCH_SCRIPTS+=	python/*.py
-PYTHON_PATCH_SCRIPTS+=	security/python/xensec_gen/cgi-bin/policy.cgi
-PYTHON_PATCH_SCRIPTS+=	security/python/xensec_gen/*.py
-PYTHON_PATCH_SCRIPTS+=	security/python/*.py
-PYTHON_PATCH_SCRIPTS+=	security/*.py
-PYTHON_PATCH_SCRIPTS+=	xenmon/*.py
-PYTHON_PATCH_SCRIPTS+=	xentrace/xentrace_format
+REPLACE_PYTHON+=	misc/xm
+REPLACE_PYTHON+=	misc/netfix
+REPLACE_PYTHON+=	misc/xen-bugtool
+REPLACE_PYTHON+=	misc/xencons
+REPLACE_PYTHON+=	misc/xend
+REPLACE_PYTHON+=	misc/xensymoops
+REPLACE_PYTHON+=	misc/xen-python-path
+REPLACE_PYTHON+=	pygrub/src/pygrub
+REPLACE_PYTHON+=	python/xen/util/*.py
+REPLACE_PYTHON+=	python/xen/xend/*.py
+REPLACE_PYTHON+=	python/xen/xm/*.py
+REPLACE_PYTHON+=	python/xen/util/*.py
+REPLACE_PYTHON+=	python/*.py
+REPLACE_PYTHON+=	security/python/xensec_gen/cgi-bin/policy.cgi
+REPLACE_PYTHON+=	security/python/xensec_gen/*.py
+REPLACE_PYTHON+=	security/python/*.py
+REPLACE_PYTHON+=	security/*.py
+REPLACE_PYTHON+=	xenmon/*.py
+REPLACE_PYTHON+=	xentrace/xentrace_format
 
 SUBST_CLASSES+=		paths
 SUBST_STAGE.paths=	pre-configure
diff --git a/sysutils/xentools33/Makefile b/sysutils/xentools33/Makefile
index 0ec7f283685..f204670eb9b 100644
--- a/sysutils/xentools33/Makefile
+++ b/sysutils/xentools33/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2014/01/25 10:30:22 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2014/01/25 10:45:21 wiz Exp $
 
 VERSION=	3.3.2
 DISTNAME=	xen-${VERSION}
@@ -50,25 +50,25 @@ MAKE_ENV+=		XEN_TARGET_ARCH="x86_64" XEN_COMPILE_ARCH="x86_64"
 MAKE_ENV+=		XEN_TARGET_ARCH="unsupported"
 .endif
 PY_PATCHPLIST=		yes
-PYTHON_PATCH_SCRIPTS+=	misc/xm
-PYTHON_PATCH_SCRIPTS+=	misc/netfix
-PYTHON_PATCH_SCRIPTS+=	misc/xen-bugtool
-PYTHON_PATCH_SCRIPTS+=	misc/xencons
-PYTHON_PATCH_SCRIPTS+=	misc/xend
-PYTHON_PATCH_SCRIPTS+=	misc/xensymoops
-PYTHON_PATCH_SCRIPTS+=	misc/xen-python-path
-PYTHON_PATCH_SCRIPTS+=	pygrub/src/pygrub
-PYTHON_PATCH_SCRIPTS+=	python/xen/util/*.py
-PYTHON_PATCH_SCRIPTS+=	python/xen/xend/*.py
-PYTHON_PATCH_SCRIPTS+=	python/xen/xm/*.py
-PYTHON_PATCH_SCRIPTS+=	python/xen/util/*.py
-PYTHON_PATCH_SCRIPTS+=	python/*.py
-PYTHON_PATCH_SCRIPTS+=	security/python/xensec_gen/cgi-bin/policy.cgi
-PYTHON_PATCH_SCRIPTS+=	security/python/xensec_gen/*.py
-PYTHON_PATCH_SCRIPTS+=	security/python/*.py
-PYTHON_PATCH_SCRIPTS+=	security/*.py
-PYTHON_PATCH_SCRIPTS+=	xenmon/*.py
-PYTHON_PATCH_SCRIPTS+=	xentrace/xentrace_format
+REPLACE_PYTHON+=	misc/xm
+REPLACE_PYTHON+=	misc/netfix
+REPLACE_PYTHON+=	misc/xen-bugtool
+REPLACE_PYTHON+=	misc/xencons
+REPLACE_PYTHON+=	misc/xend
+REPLACE_PYTHON+=	misc/xensymoops
+REPLACE_PYTHON+=	misc/xen-python-path
+REPLACE_PYTHON+=	pygrub/src/pygrub
+REPLACE_PYTHON+=	python/xen/util/*.py
+REPLACE_PYTHON+=	python/xen/xend/*.py
+REPLACE_PYTHON+=	python/xen/xm/*.py
+REPLACE_PYTHON+=	python/xen/util/*.py
+REPLACE_PYTHON+=	python/*.py
+REPLACE_PYTHON+=	security/python/xensec_gen/cgi-bin/policy.cgi
+REPLACE_PYTHON+=	security/python/xensec_gen/*.py
+REPLACE_PYTHON+=	security/python/*.py
+REPLACE_PYTHON+=	security/*.py
+REPLACE_PYTHON+=	xenmon/*.py
+REPLACE_PYTHON+=	xentrace/xentrace_format
 
 SUBST_CLASSES+=		pathsvar
 SUBST_STAGE.pathsvar=	pre-configure
diff --git a/sysutils/xentools41/Makefile b/sysutils/xentools41/Makefile
index 3d321fead3a..79998b0d304 100644
--- a/sysutils/xentools41/Makefile
+++ b/sysutils/xentools41/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2014/01/25 10:30:22 wiz Exp $
+# $NetBSD: Makefile,v 1.43 2014/01/25 10:45:21 wiz Exp $
 #
 # VERSION is set in version.mk as it is shared with other packages
 .include		"version.mk"
@@ -62,25 +62,25 @@ MAKE_ENV+=		V=YES
 #MAKE_ENV+=		INSTALL_PROG=${BSD_INSTALL_PROGRAM}
 
 PY_PATCHPLIST=		yes
-#PYTHON_PATCH_SCRIPTS+=	misc/xm
-#PYTHON_PATCH_SCRIPTS+=	misc/netfix
-#PYTHON_PATCH_SCRIPTS+=	misc/xen-bugtool
-#PYTHON_PATCH_SCRIPTS+=	misc/xencons
-#PYTHON_PATCH_SCRIPTS+=	misc/xend
-#PYTHON_PATCH_SCRIPTS+=	misc/xensymoops
-#PYTHON_PATCH_SCRIPTS+=	misc/xen-python-path
-#PYTHON_PATCH_SCRIPTS+=	pygrub/src/pygrub
-#PYTHON_PATCH_SCRIPTS+=	python/xen/util/*.py
-#PYTHON_PATCH_SCRIPTS+=	python/xen/xend/*.py
-#PYTHON_PATCH_SCRIPTS+=	python/xen/xm/*.py
-#PYTHON_PATCH_SCRIPTS+=	python/xen/util/*.py
-#PYTHON_PATCH_SCRIPTS+=	python/*.py
-#PYTHON_PATCH_SCRIPTS+=	security/python/xensec_gen/cgi-bin/policy.cgi
-#PYTHON_PATCH_SCRIPTS+=	security/python/xensec_gen/*.py
-#PYTHON_PATCH_SCRIPTS+=	security/python/*.py
-#PYTHON_PATCH_SCRIPTS+=	security/*.py
-#PYTHON_PATCH_SCRIPTS+=	xenmon/*.py
-#PYTHON_PATCH_SCRIPTS+=	xentrace/xentrace_format
+#REPLACE_PYTHON+=	misc/xm
+#REPLACE_PYTHON+=	misc/netfix
+#REPLACE_PYTHON+=	misc/xen-bugtool
+#REPLACE_PYTHON+=	misc/xencons
+#REPLACE_PYTHON+=	misc/xend
+#REPLACE_PYTHON+=	misc/xensymoops
+#REPLACE_PYTHON+=	misc/xen-python-path
+#REPLACE_PYTHON+=	pygrub/src/pygrub
+#REPLACE_PYTHON+=	python/xen/util/*.py
+#REPLACE_PYTHON+=	python/xen/xend/*.py
+#REPLACE_PYTHON+=	python/xen/xm/*.py
+#REPLACE_PYTHON+=	python/xen/util/*.py
+#REPLACE_PYTHON+=	python/*.py
+#REPLACE_PYTHON+=	security/python/xensec_gen/cgi-bin/policy.cgi
+#REPLACE_PYTHON+=	security/python/xensec_gen/*.py
+#REPLACE_PYTHON+=	security/python/*.py
+#REPLACE_PYTHON+=	security/*.py
+#REPLACE_PYTHON+=	xenmon/*.py
+#REPLACE_PYTHON+=	xentrace/xentrace_format
 
 REPLACE_PYTHON+=	python/xen/remus/*.py
 REPLACE_PYTHON+=	python/xen/util/*.py
diff --git a/sysutils/xentools42/Makefile b/sysutils/xentools42/Makefile
index f371edeacad..ee7b6e70e96 100644
--- a/sysutils/xentools42/Makefile
+++ b/sysutils/xentools42/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2014/01/25 10:30:23 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2014/01/25 10:45:21 wiz Exp $
 
 VERSION=	4.2.3
 VERSION_IPXE=	1.0.0
@@ -63,25 +63,25 @@ MAKE_ENV+=		V=YES
 #MAKE_ENV+=		INSTALL_PROG=${BSD_INSTALL_PROGRAM}
 
 PY_PATCHPLIST=		yes
-#PYTHON_PATCH_SCRIPTS+=	misc/xm
-#PYTHON_PATCH_SCRIPTS+=	misc/netfix
-#PYTHON_PATCH_SCRIPTS+=	misc/xen-bugtool
-#PYTHON_PATCH_SCRIPTS+=	misc/xencons
-#PYTHON_PATCH_SCRIPTS+=	misc/xend
-#PYTHON_PATCH_SCRIPTS+=	misc/xensymoops
-#PYTHON_PATCH_SCRIPTS+=	misc/xen-python-path
-#PYTHON_PATCH_SCRIPTS+=	pygrub/src/pygrub
-#PYTHON_PATCH_SCRIPTS+=	python/xen/util/*.py
-#PYTHON_PATCH_SCRIPTS+=	python/xen/xend/*.py
-#PYTHON_PATCH_SCRIPTS+=	python/xen/xm/*.py
-#PYTHON_PATCH_SCRIPTS+=	python/xen/util/*.py
-#PYTHON_PATCH_SCRIPTS+=	python/*.py
-#PYTHON_PATCH_SCRIPTS+=	security/python/xensec_gen/cgi-bin/policy.cgi
-#PYTHON_PATCH_SCRIPTS+=	security/python/xensec_gen/*.py
-#PYTHON_PATCH_SCRIPTS+=	security/python/*.py
-#PYTHON_PATCH_SCRIPTS+=	security/*.py
-#PYTHON_PATCH_SCRIPTS+=	xenmon/*.py
-#PYTHON_PATCH_SCRIPTS+=	xentrace/xentrace_format
+#REPLACE_PYTHON+=	misc/xm
+#REPLACE_PYTHON+=	misc/netfix
+#REPLACE_PYTHON+=	misc/xen-bugtool
+#REPLACE_PYTHON+=	misc/xencons
+#REPLACE_PYTHON+=	misc/xend
+#REPLACE_PYTHON+=	misc/xensymoops
+#REPLACE_PYTHON+=	misc/xen-python-path
+#REPLACE_PYTHON+=	pygrub/src/pygrub
+#REPLACE_PYTHON+=	python/xen/util/*.py
+#REPLACE_PYTHON+=	python/xen/xend/*.py
+#REPLACE_PYTHON+=	python/xen/xm/*.py
+#REPLACE_PYTHON+=	python/xen/util/*.py
+#REPLACE_PYTHON+=	python/*.py
+#REPLACE_PYTHON+=	security/python/xensec_gen/cgi-bin/policy.cgi
+#REPLACE_PYTHON+=	security/python/xensec_gen/*.py
+#REPLACE_PYTHON+=	security/python/*.py
+#REPLACE_PYTHON+=	security/*.py
+#REPLACE_PYTHON+=	xenmon/*.py
+#REPLACE_PYTHON+=	xentrace/xentrace_format
 
 REPLACE_PYTHON+=	misc/sbdf2devicepath misc/sxp-pretty misc/xen-bugtool
 REPLACE_PYTHON+=	misc/xen-python-path misc/xen-ringwatch misc/xencons