No need to have two variables for the same logic.

Replace PYTHON_PATCH_SCRIPTS with REPLACE_PYTHON.

8 files changed, 19 insertions, 19 deletions

diff --git a/mail/evolution-data-server/Makefile b/mail/evolution-data-server/Makefile
index de4caf5f075..37158f01fff 100644
--- a/mail/evolution-data-server/Makefile
+++ b/mail/evolution-data-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.141 2014/01/01 11:52:07 wiz Exp $
+# $NetBSD: Makefile,v 1.142 2014/01/25 10:45:19 wiz Exp $
 
 DISTNAME=	evolution-data-server-2.32.3
 PKGREVISION=	27
@@ -19,7 +19,7 @@ USE_PKGLOCALEDIR=	YES
 GNU_CONFIGURE=		YES
 
 PYTHON_FOR_BUILD_ONLY=	YES
-PYTHON_PATCH_SCRIPTS=	addressbook/libebook/gen-western-table.py
+REPLACE_PYTHON=	addressbook/libebook/gen-western-table.py
 
 .include "options.mk"
 
diff --git a/mail/fetchmailconf/Makefile b/mail/fetchmailconf/Makefile
index c10da223485..4ec1fb9e33e 100644
--- a/mail/fetchmailconf/Makefile
+++ b/mail/fetchmailconf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.89 2014/01/25 10:30:12 wiz Exp $
+# $NetBSD: Makefile,v 1.90 2014/01/25 10:45:19 wiz Exp $
 
 DISTNAME=	fetchmail-6.3.22
 PKGNAME=	${DISTNAME:S/fetchmail/fetchmailconf/}
@@ -30,7 +30,7 @@ INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 INSTALL_TARGET=		install-pythonPYTHON
 
 PLIST_SUBST+=		PYSITELIB=${PYSITELIB}
-PYTHON_PATCH_SCRIPTS=	fetchmailconf.py
+REPLACE_PYTHON=	fetchmailconf.py
 PYTHON_VERSIONS_INCOMPATIBLE=	33 # not yet ported as of 6.3.22
 
 post-install:
diff --git a/mail/getmail/Makefile b/mail/getmail/Makefile
index 8868a4bf788..3ffd11c5cdf 100644
--- a/mail/getmail/Makefile
+++ b/mail/getmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.137 2014/01/25 10:30:12 wiz Exp $
+# $NetBSD: Makefile,v 1.138 2014/01/25 10:45:19 wiz Exp $
 
 DISTNAME=		getmail-4.43.0
 CATEGORIES=		mail
@@ -11,7 +11,7 @@ LICENSE=		gnu-gpl-v2
 
 USE_LANGUAGES=		# none
 
-PYTHON_PATCH_SCRIPTS=	*.py getmailcore/*.py
+REPLACE_PYTHON=	*.py getmailcore/*.py
 PYTHON_VERSIONS_INCOMPATIBLE=	33 # not yet ported as of 4.43.0
 
 .include "../../lang/python/application.mk"
diff --git a/mail/mailman/Makefile b/mail/mailman/Makefile
index ece9212fdc8..09071dc833b 100644
--- a/mail/mailman/Makefile
+++ b/mail/mailman/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.68 2014/01/25 10:30:12 wiz Exp $
+# $NetBSD: Makefile,v 1.69 2014/01/25 10:45:19 wiz Exp $
 
 DISTNAME=	mailman-2.1.14-1
 PKGNAME=	mailman-2.1.14.1
@@ -70,9 +70,9 @@ INSTALL_TEMPLATES+=	${FILESDIR}/INSTALL
 DEINSTALL_TEMPLATES+=	${FILESDIR}/DEINSTALL
 
 PYTHON_VERSIONS_INCOMPATIBLE=	33 # not yet ported as of 2.1.14.1
-PYTHON_PATCH_SCRIPTS+=	Mailman/Archiver/pipermail.py
-PYTHON_PATCH_SCRIPTS+=	Mailman/Post.py
-PYTHON_PATCH_SCRIPTS+=	bin/msgfmt.py
+REPLACE_PYTHON+=	Mailman/Archiver/pipermail.py
+REPLACE_PYTHON+=	Mailman/Post.py
+REPLACE_PYTHON+=	bin/msgfmt.py
 
 CONFIGURE_ARGS+=	--with-cgi-gid=${MAILMAN_CGIGROUP:Q}
 .if ${MAILMAN_CGIEXT} != "none"
diff --git a/mail/newspipe/Makefile b/mail/newspipe/Makefile
index d27f12867f3..39ffa603109 100644
--- a/mail/newspipe/Makefile
+++ b/mail/newspipe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2012/10/08 12:19:18 asau Exp $
+# $NetBSD: Makefile,v 1.12 2014/01/25 10:45:19 wiz Exp $
 #
 
 DISTNAME=		newspipe.1.1.9
@@ -19,7 +19,7 @@ DEPENDS+=		${PYPKGPREFIX}-html2text-[0-9]*:../../textproc/py-html2text
 WRKSRC=			${WRKDIR}
 
 NO_BUILD=		yes
-PYTHON_PATCH_SCRIPTS=	*.py
+REPLACE_PYTHON=	*.py
 
 SUBST_CLASSES+=		bin
 SUBST_STAGE.bin=	do-configure
diff --git a/mail/pymsgauth/Makefile b/mail/pymsgauth/Makefile
index 3f4548b6a7e..51db4643421 100644
--- a/mail/pymsgauth/Makefile
+++ b/mail/pymsgauth/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2012/10/08 12:19:28 asau Exp $
+# $NetBSD: Makefile,v 1.12 2014/01/25 10:45:19 wiz Exp $
 #
 
 DISTNAME=		pymsgauth-2.1.0
@@ -21,14 +21,14 @@ HTMLDOCDIR=		share/doc/html/pymsgauth
 EGDIR=			share/examples/pymsgauth
 
 NO_BUILD=		yes
-PYTHON_PATCH_SCRIPTS=	${PYMSGAUTH_PROGRAMS} *.py
+REPLACE_PYTHON=	${PYMSGAUTH_PROGRAMS} *.py
 
 FILES_SUBST+=		SHAREDIR=${SHAREDIR:Q}
 
 INSTALLATION_DIRS=	${SHAREDIR} ${DOCDIR} ${HTMLDOCDIR} ${EGDIR} bin
 
 do-install:
-	for f in ${PYTHON_PATCH_SCRIPTS}; do \
+	for f in ${REPLACE_PYTHON}; do \
 		${INSTALL_SCRIPT} ${WRKSRC}/$${f} ${DESTDIR}${PREFIX}/${SHAREDIR}; \
 	done
 
diff --git a/mail/queue-repair/Makefile b/mail/queue-repair/Makefile
index 414e827ca21..8a8a2682c33 100644
--- a/mail/queue-repair/Makefile
+++ b/mail/queue-repair/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2012/10/08 12:19:29 asau Exp $
+# $NetBSD: Makefile,v 1.9 2014/01/25 10:45:19 wiz Exp $
 #
 
 DISTNAME=		queue-repair-0.9.0
@@ -12,7 +12,7 @@ COMMENT=		Check or correct most corruptions of the queue in qmail
 
 NO_BUILD=		YES
 
-PYTHON_PATCH_SCRIPTS=	queue_repair.py
+REPLACE_PYTHON=	queue_repair.py
 INSTALLATION_DIRS=	bin
 
 do-install:
diff --git a/mail/tmda/Makefile b/mail/tmda/Makefile
index 0c0deb72d50..3e76493e066 100644
--- a/mail/tmda/Makefile
+++ b/mail/tmda/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2014/01/25 10:30:13 wiz Exp $
+# $NetBSD: Makefile,v 1.51 2014/01/25 10:45:20 wiz Exp $
 
 DISTNAME=	tmda-1.1.12
 PKGREVISION=	5
@@ -11,7 +11,7 @@ MAINTAINER=	schmonz@NetBSD.org
 HOMEPAGE=	http://tmda.net/
 COMMENT=	Python-based SPAM reduction system
 
-PYTHON_PATCH_SCRIPTS=	${TMDA_PROGRAMS}
+REPLACE_PYTHON=	${TMDA_PROGRAMS}
 PY_PATCHPLIST=		yes
 PYTHON_VERSIONS_INCOMPATIBLE=	33 # not yet ported as of 1.1.12