Provide PY_COMPILE_ALL and PY_COMPILE_O_ALL to compile all Python

sources in a directory (tree) in pversion.mk. Adjust the various places
that called it locally.

16 files changed, 40 insertions, 57 deletions

diff --git a/audio/solfege/Makefile b/audio/solfege/Makefile
index 27c7e002b2b..2f331845be4 100644
--- a/audio/solfege/Makefile
+++ b/audio/solfege/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2009/04/07 05:26:59 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2009/07/08 13:55:58 joerg Exp $
 #
 
 DISTNAME=		solfege-3.14.1
@@ -26,7 +26,6 @@ USE_TOOLS+=		gmake gm4 makeinfo pkg-config msgfmt bash:run
 REPLACE_BASH=		lesson-files/bin/csound-play-harmonic-interval.sh
 
 PYTHON_PATCH_SCRIPTS=	*.py *.py.in */*.py */*.py.in
-PYCOMPILEALL=		${BUILDLINK_PREFIX.${PYPACKAGE}}/${PYLIB}/compileall.py
 
 SUBST_CLASSES+=		sound
 SUBST_STAGE.sound=	do-configure
@@ -59,9 +58,9 @@ DEPENDS+=	qtplay-[0-9]*:../../audio/qtplay
 .endif
 
 post-install:
-	${PYTHONBIN} ${PYCOMPILEALL} ${PREFIX}/share/solfege/mpd \
-		${PREFIX}/share/solfege/soundcard \
-		${PREFIX}/share/solfege/src
+	${PY_COMPILE_ALL} ${DESTDIR}${PREFIX}/share/solfege/mpd \
+		${DESTDIR}${PREFIX}/share/solfege/soundcard \
+		${DESTDIR}${PREFIX}/share/solfege/src
 
 PYTHON_VERSIONS_INCOMPATIBLE=	23
 .include "../../lang/python/application.mk"
diff --git a/databases/py-metakit/Makefile b/databases/py-metakit/Makefile
index 4c2e76839f1..5be3ad86faa 100644
--- a/databases/py-metakit/Makefile
+++ b/databases/py-metakit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2009/02/11 21:00:49 joerg Exp $
+# $NetBSD: Makefile,v 1.23 2009/07/08 13:55:58 joerg Exp $
 #
 
 DISTNAME=	metakit-2.4.9.7
@@ -27,12 +27,10 @@ INSTALL_TARGET=	install-python
 MAKE_ENV+=	PYINC=${LOCALBASE}/${PYINC} PYSITELIB=${LOCALBASE}/${PYSITELIB}
 PY_PATCHPLIST=	yes
 
-PYCOMPILEALL=	${BUILDLINK_PREFIX.${PYPACKAGE}}/${PYLIB}/compileall.py
-
 INSTALLATION_DIRS+=	${PYSITELIB}
 
 post-build:
-	cd ${WRKSRC}/python && ${PYTHONBIN} ${PYCOMPILEALL} .
+	cd ${WRKSRC}/python && ${PY_COMPILE_ALL} .
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/python/metakit.pyc ${DESTDIR}${PREFIX}/${PYSITELIB}
diff --git a/devel/ExmanIDE/Makefile b/devel/ExmanIDE/Makefile
index 6581c5655b0..447105de6c6 100644
--- a/devel/ExmanIDE/Makefile
+++ b/devel/ExmanIDE/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2009/02/09 22:56:22 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2009/07/08 13:55:58 joerg Exp $
 
 DISTNAME=	ExmanIDE-0.9.4
 PKGREVISION=	5
@@ -32,8 +32,6 @@ SUBST_STAGE.py=		post-patch
 SUBST_FILES.py=		ExmanIDE
 SUBST_SED.py=		-e 's,python \$$0\.pyw,${PYTHONBIN} ${PREFIX}/share/${PKGBASE}/ExmanIDE.pyw,g'
 
-PYCOMPILEALL=	${BUILDLINK_PREFIX.${PYPACKAGE}}/${PYLIB}/compileall.py
-
 INSTALLATION_DIRS=	 bin share/ExmanIDE
 
 do-install:
@@ -41,8 +39,8 @@ do-install:
 	cd ${WRKSRC} && pax -rwppm '-s|.*/CVS.*$$||'	\
 		'-s|.*/ExmanIDE$$||' '-s|.*/.xvpics.*$$||' \
 		. ${DESTDIR}${PREFIX}/share/ExmanIDE
-	${PYTHONBIN} ${PYCOMPILEALL} ${DESTDIR}${PREFIX}/share/ExmanIDE
-	${PYTHONBIN} -O ${PYCOMPILEALL} ${DESTDIR}${PREFIX}/share/ExmanIDE
+	${PY_COMPILE_ALL} ${DESTDIR}${PREFIX}/share/ExmanIDE
+	${PY_COMPILE_O_ALL} ${DESTDIR}${PREFIX}/share/ExmanIDE
 
 .include "../../lang/python/application.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-at-spi/Makefile b/devel/py-at-spi/Makefile
index 19bea9051d9..b4bab46d76d 100644
--- a/devel/py-at-spi/Makefile
+++ b/devel/py-at-spi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2009/03/16 22:22:07 jmcneill Exp $
+# $NetBSD: Makefile,v 1.9 2009/07/08 13:55:58 joerg Exp $
 #
 
 DISTNAME=		at-spi-1.26.0
@@ -22,7 +22,7 @@ INSTALLATION_DIRS=	${PYATSPIDIR}
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/pyatspi/*.py ${DESTDIR}${PYATSPIDIR}
-	${PYTHONBIN} ${PREFIX}/${PYLIB}/compileall.py ${DESTDIR}${PYATSPIDIR}
+	${PY_COMPILE_ALL} ${DESTDIR}${PYATSPIDIR}
 
 .include "../../lang/python/extension.mk"
 .include "../../devel/at-spi/buildlink3.mk"
diff --git a/devel/py-setuptools/Makefile b/devel/py-setuptools/Makefile
index d2295c0fb75..8210883dc81 100644
--- a/devel/py-setuptools/Makefile
+++ b/devel/py-setuptools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2009/05/28 21:24:44 zafer Exp $
+# $NetBSD: Makefile,v 1.11 2009/07/08 13:55:59 joerg Exp $
 #
 
 EGG_VERSION=		0.6c9
@@ -20,7 +20,6 @@ USE_TOOLS+=		unzip pax
 PY_PATCHPLIST=	yes
 PLIST_SUBST+=	EGG_NAME=${EGG_NAME}
 PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX} PYPKGPREFIX=${PYPKGPREFIX}
-PYCOMPILEALL=	${BUILDLINK_PREFIX.${PYPACKAGE}}/${PYLIB}/compileall.py
 
 CHECK_FILES_SKIP+=	${PREFIX}/${PYSITELIB}/easy-install.pth
 
@@ -47,8 +46,8 @@ do-build:
 	${SED} -e 's,@PYTHON@,${PYTHONBIN},' \
 	       -e 's,@PKGVERSION@,${EGG_VERSION},' \
 	       ${FILESDIR}/easy_install.py > ${WRKDIR}/easy_install.py
-	${PYTHONBIN} ${PYCOMPILEALL} -f -d ${TARGET_NAME} ${WRKSRC}
-	${PYTHONBIN} -O ${PYCOMPILEALL} -f -d ${TARGET_NAME} ${WRKSRC}
+	${PY_COMPILE_ALL} -f -d ${TARGET_NAME} ${WRKSRC}
+	${PY_COMPILE_O_ALL} -f -d ${TARGET_NAME} ${WRKSRC}
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/easy_install.py \
diff --git a/games/4stAttack/Makefile b/games/4stAttack/Makefile
index 9fb05696d68..189aa83f0b7 100644
--- a/games/4stAttack/Makefile
+++ b/games/4stAttack/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2008/05/26 02:13:19 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2009/07/08 13:55:59 joerg Exp $
 #
 
 DISTNAME=		4stAttack-2.1.4
@@ -25,8 +25,8 @@ do-build:
 	${MV} ${WRKSRC}/4stattack ${WRKSRC}/4stattack.pre
 	${SED} -e "s,@FAHOME@,${PREFIX}/share/${PKGBASE}," \
 		${WRKSRC}/4stattack.pre > ${WRKSRC}/4stattack
-	${PYTHONBIN} ${PREFIX}/${PYLIB}/compileall.py ${WRKSRC}
-	${PYTHONBIN} -O ${PREFIX}/${PYLIB}/compileall.py ${WRKSRC}
+	${PY_COMPILE_ALL} ${WRKSRC}
+	${PY_COMPILE_O_ALL} ${WRKSRC}
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/4stattack ${DESTDIR}${PREFIX}/bin
diff --git a/graphics/dia-python/Makefile b/graphics/dia-python/Makefile
index 943ed5ef084..eb50a5b5b0e 100644
--- a/graphics/dia-python/Makefile
+++ b/graphics/dia-python/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2009/02/09 22:56:24 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2009/07/08 13:55:59 joerg Exp $
 #
 
 DIA_SUBPKG=		-python
@@ -17,10 +17,8 @@ PYTHON_PATCH_SCRIPTS+=	sheets/checktrans.py
 BUILD_DIRS+=		${WRKSRC}/plug-ins/python
 INSTALL_DIRS+=		${WRKSRC}/plug-ins/python
 
-PYCOMPILEALL=	${BUILDLINK_PREFIX.${PYPACKAGE}}/${PYLIB}/compileall.py
-
 post-install:
-	${PYTHONBIN} ${PYCOMPILEALL} ${DESTDIR}${PREFIX}/share/dia
+	${PY_COMPILE_ALL} ${DESTDIR}${PREFIX}/share/dia
 
 .include "../../lang/python/application.mk"
 .include "../../x11/py-gtk2/buildlink3.mk"
diff --git a/lang/py-funge/Makefile b/lang/py-funge/Makefile
index 8a4a0270ccb..2f23c0cf753 100644
--- a/lang/py-funge/Makefile
+++ b/lang/py-funge/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2008/06/12 02:14:33 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2009/07/08 13:55:59 joerg Exp $
 
 DISTNAME=	pyfunge-0.2-beta1
 PKGNAME=	${PYPKGPREFIX}-funge-0.2beta1
@@ -22,16 +22,14 @@ PYTHON_VERSIONS_ACCEPTED?=	23
 WRKSRC?=	${WRKDIR}/PyFunge
 PLIST_SUBST+=	PYSITELIB=${PYSITELIB:Q}
 
-PYCOMPILEALL=	${BUILDLINK_PREFIX.${PYPACKAGE}}/${PYLIB}/compileall.py
-
 INSTALLATION_DIRS=	${PYSITELIB}/PyFunge share/doc/${PKGBASE}
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/README.ko ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
 	cd ${WRKSRC} && pax -rwppm '-s|.*/README.ko||' \
 		. ${DESTDIR}${PREFIX}/${PYSITELIB}/PyFunge
-	${PYTHONBIN} ${PYCOMPILEALL} ${DESTDIR}${PREFIX}/${PYSITELIB}/PyFunge
-	${PYTHONBIN} -O ${PYCOMPILEALL} ${DESTDIR}${PREFIX}/${PYSITELIB}/PyFunge
+	${PY_COMPILE_ALL} ${DESTDIR}${PREFIX}/${PYSITELIB}/PyFunge
+	${PY_COMPILE_O_ALL} ${DESTDIR}${PREFIX}/${PYSITELIB}/PyFunge
 
 .include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/python/pyversion.mk b/lang/python/pyversion.mk
index ae45ab50988..0547bcfe6a6 100644
--- a/lang/python/pyversion.mk
+++ b/lang/python/pyversion.mk
@@ -1,4 +1,4 @@
-# $NetBSD: pyversion.mk,v 1.72 2009/07/02 09:37:12 joerg Exp $
+# $NetBSD: pyversion.mk,v 1.73 2009/07/08 13:55:59 joerg Exp $
 
 # This file determines which Python version is used as a dependency for
 # a package.
@@ -156,6 +156,10 @@ BUILDLINK_DEPMETHOD.python?=	build
 .endif
 
 PYTHONBIN=	${LOCALBASE}/bin/python${PYVERSSUFFIX}
+PY_COMPILE_ALL= \
+	${PYTHONBIN} ${PREFIX}/lib/python${PYVERSSUFFIX}/compileall.py -q
+PY_COMPILE_O_ALL= \
+	${PYTHONBIN} -O ${PREFIX}/lib/python${PYVERSSUFFIX}/compileall.py -q
 
 .if exists(${PYTHONBIN})
 PYINC!=	${PYTHONBIN} -c "import distutils.sysconfig; \
diff --git a/mail/mailman/Makefile b/mail/mailman/Makefile
index 135950631e3..42b4dc0d19e 100644
--- a/mail/mailman/Makefile
+++ b/mail/mailman/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2009/06/03 06:55:07 adam Exp $
+# $NetBSD: Makefile,v 1.59 2009/07/08 13:55:59 joerg Exp $
 
 DISTNAME=	mailman-2.1.12
 CATEGORIES=	mail www
@@ -95,8 +95,6 @@ SUBST_SED.paths+=	-e 's,@EXECDIR@,${EXECDIR},g'
 SUBST_SED.paths+=	-e 's,@MAILMAN_DATADIR@,${MAILMAN_DATADIR},g'
 SUBST_STAGE.paths=	post-patch
 
-PYCOMPILEALL=	${BUILDLINK_PREFIX.${PYPACKAGE}}/${PYLIB}/compileall.py
-
 # mailman depends a lot on it and will bitch if changed.
 CHECK_PERMS=	no
 
@@ -126,7 +124,7 @@ post-install:
 	${CHOWN} -R root:${MAILMAN_GROUP} ${EXECDIR}
 	${CHMOD} -R g+w ${EXECDIR}
 	${CHMOD} g+s ${EXECDIR}/cgi-bin/*
-	${PYTHONBIN} ${PYCOMPILEALL} ${PREFIX}/lib/mailman/bin ${PREFIX}/lib/mailman/cron ${PREFIX}/lib/mailman/scripts
+	${PY_COMPILE_ALL} ${PREFIX}/lib/mailman/bin ${PREFIX}/lib/mailman/cron ${PREFIX}/lib/mailman/scripts
 
 .include "../../lang/python/application.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/tmda/Makefile b/mail/tmda/Makefile
index 0e6ed1aeff4..0ba5c4ed265 100644
--- a/mail/tmda/Makefile
+++ b/mail/tmda/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2009/02/09 22:56:25 joerg Exp $
+# $NetBSD: Makefile,v 1.44 2009/07/08 13:56:00 joerg Exp $
 #
 
 DISTNAME=	tmda-1.1.12
@@ -14,7 +14,6 @@ COMMENT=	Python-based SPAM reduction system
 
 PYTHON_PATCH_SCRIPTS=	${TMDA_PROGRAMS}
 PY_PATCHPLIST=		yes
-PYCOMPILEALL=		${BUILDLINK_PREFIX.${PYPACKAGE}}/${PYLIB}/compileall.py
 
 PKG_SYSCONFSUBDIR=	${PKGBASE}
 
@@ -91,7 +90,7 @@ do-install:
 	cp -Rp ${WRKSRC}/doc/html/* ${PREFIX}/${HTMLDIR}
 
 post-install:
-	${PYTHONBIN} ${PYCOMPILEALL} ${PREFIX}/${PYSITELIB}/TMDA \
+	${PY_COMPILE_ALL} ${PREFIX}/${PYSITELIB}/TMDA \
 		${PREFIX}/${PYSITELIB}/TMDA/Queue \
 		${PREFIX}/${PYSITELIB}/TMDA/pythonlib/email \
 		${PREFIX}/${PYSITELIB}/TMDA/pythonlib/email/mime
diff --git a/textproc/gnome-doc-utils/Makefile b/textproc/gnome-doc-utils/Makefile
index 63468a2eaff..b7bdef89f4d 100644
--- a/textproc/gnome-doc-utils/Makefile
+++ b/textproc/gnome-doc-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2009/05/13 21:32:37 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2009/07/08 13:56:00 joerg Exp $
 #
 
 DISTNAME=	gnome-doc-utils-0.16.1
@@ -37,10 +37,8 @@ BUILDLINK_API_DEPENDS.libxml2+=	libxml2>=2.6.12
 BUILDLINK_DEPMETHOD.libxslt=	build
 BUILDLINK_DEPMETHOD.libxml2=	build
 
-PYCOMPILEALL=	${BUILDLINK_PREFIX.${PYPACKAGE}}/${PYLIB}/compileall.py
-
 post-install:
-	${PYTHONBIN} ${PYCOMPILEALL} ${DESTDIR}${PREFIX}/share/xml2po
+	${PY_COMPILE_ALL} ${DESTDIR}${PREFIX}/share/xml2po
 
 .include "../../lang/python/application.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
diff --git a/textproc/py-cmTemplate/Makefile b/textproc/py-cmTemplate/Makefile
index d51ef2aafee..62f2a1c0d5e 100644
--- a/textproc/py-cmTemplate/Makefile
+++ b/textproc/py-cmTemplate/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2008/06/12 02:14:52 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2009/07/08 13:56:00 joerg Exp $
 #
 
 DISTNAME=		cmTemplate-0.3.2
@@ -14,12 +14,11 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 PY_PATCHPLIST=	# empty
 PLIST_SUBST+=	PYPKGPREFIX=${PYPKGPREFIX}
-PYCOMPILEALL=	${BUILDLINK_PREFIX.${PYPACKAGE}}/${PYLIB}/compileall.py
 
 INSTALLATION_DIRS=	${PYSITELIB} share/doc/${PYPKGPREFIX}-cmTemplate
 
 do-build:
-	${PYTHONBIN} ${PYCOMPILEALL} -l ${WRKSRC}
+	${PY_COMPILE_ALL} -l ${WRKSRC}
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/cmTemplate.py ${DESTDIR}${PREFIX}/${PYSITELIB}
diff --git a/time/gdeskcal/Makefile b/time/gdeskcal/Makefile
index 74911d27cbc..53e38791d7c 100644
--- a/time/gdeskcal/Makefile
+++ b/time/gdeskcal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2008/06/20 01:09:38 joerg Exp $
+# $NetBSD: Makefile,v 1.29 2009/07/08 13:56:00 joerg Exp $
 #
 
 DISTNAME=		gDeskCal-0_57_1
@@ -24,8 +24,7 @@ post-extract:
 
 do-install:
 	(cd ${WRKSRC} && ${CP} -r . ${DESTDIR}${PREFIX}/lib/gdeskcal)
-	${PYTHONBIN} ${LOCALBASE}/${PYLIB}/compileall.py \
-		${DESTDIR}${PREFIX}/lib/gdeskcal/code
+	${PY_COMPILE_ALL} ${DESTDIR}${PREFIX}/lib/gdeskcal/code
 	${LN} -s ../lib/gdeskcal/gdeskcal ${DESTDIR}${PREFIX}/bin
 
 .include "../../x11/py-gtk2/buildlink3.mk"
diff --git a/www/browser-bookmarks-menu/Makefile b/www/browser-bookmarks-menu/Makefile
index b5287b55843..bb33a46417b 100644
--- a/www/browser-bookmarks-menu/Makefile
+++ b/www/browser-bookmarks-menu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2009/02/09 22:56:27 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2009/07/08 13:56:00 joerg Exp $
 #
 
 DISTNAME=	browser-bookmarks-menu-0.6
@@ -22,8 +22,6 @@ SUBST_FILES.paths=	BrowserBookmarksMenu.server
 SUBST_SED.paths= -e 's|/usr/lib/browser-bookmarks-menu|${PREFIX}/libexec|g'
 SUBST_SED.paths+= -e 's|/usr/share|${PREFIX}/share|g'
 
-PYCOMPILEALL=	${BUILDLINK_PREFIX.${PYPACKAGE}}/${PYLIB}/compileall.py
-
 INSTALLATION_DIRS=	lib/bonobo/servers libexec
 
 do-install:
@@ -31,7 +29,7 @@ do-install:
 	    ${DESTDIR}${PREFIX}/lib/bonobo/servers/
 	${INSTALL_SCRIPT} ${WRKSRC}/browser-bookmarks-menu.py \
 	    ${DESTDIR}${PREFIX}/libexec
-	${PYTHONBIN} ${PYCOMPILEALL} ${DESTDIR}${PREFIX}/libexec
+	${PYTHONBIN} ${PY_COMPILE_ALL} ${DESTDIR}${PREFIX}/libexec
 
 .include "../../lang/python/application.mk"
 .include "../../x11/py-gnome2/buildlink3.mk"
diff --git a/www/zope/zopeversion.mk b/www/zope/zopeversion.mk
index f461dc5404c..75d327d836a 100644
--- a/www/zope/zopeversion.mk
+++ b/www/zope/zopeversion.mk
@@ -1,4 +1,4 @@
-# $NetBSD: zopeversion.mk,v 1.11 2009/06/14 22:58:11 joerg Exp $
+# $NetBSD: zopeversion.mk,v 1.12 2009/07/08 13:56:00 joerg Exp $
 #
 
 .if !defined(_ZOPEVERSION_MK)
@@ -206,7 +206,5 @@ PRINT_PLIST_AWK+=	/^${ZOPE_BASE:S|/|\\/|g}/ \
 
 #
 ZOPE_PY_COMPILE= ${PYTHONBIN} ${ZOPE_DIR}/bin/compilezpy.py
-PY_COMPILE_ALL= \
-	${PYTHONBIN} ${PREFIX}/lib/python${PYVERSSUFFIX}/compileall.py -q
 
 .endif