- do not use local bsd.python.mk variables within the port Makefile - switch

  the publicly accessible ones instead

17 files changed, 18 insertions, 18 deletions

diff --git a/devel/trac-bitten/Makefile b/devel/trac-bitten/Makefile
index 5101ca924c12..0ec85e4ac531 100644
--- a/devel/trac-bitten/Makefile
+++ b/devel/trac-bitten/Makefile
@@ -38,9 +38,9 @@ WRKSRC=		${WRKDIR}/Bitten-${PORTVERSION}
 NO_BUILD=	yes
 USE_PYTHON=	2.3+
 USE_PYDISTUTILS=yes
-PLIST_SUB+=	PORTVERSION=${PORTVERSION} PYTHONVERSION=${_PYTHON_VERSION} \
+PLIST_SUB+=	PORTVERSION=${PORTVERSION} PYTHONVERSION=${PYTHON_VER} \
 		ECHO_MSG=${ECHO_MSG}
-SUB_LIST+=	PYTHON_CMD=${_PYTHON_CMD} TOUCH=${TOUCH} CHOWN=${CHOWN} \
+SUB_LIST+=	PYTHON_CMD=${PYTHON_CMD} TOUCH=${TOUCH} CHOWN=${CHOWN} \
 		RM=${RM} USERS=${USERS}
 SUB_FILES+=	pkg-message
 PYDISTUTILS_NOEGGINFO=	yes
diff --git a/games/py-poker-eval/Makefile b/games/py-poker-eval/Makefile
index 7957b55cea28..3be992287e0a 100644
--- a/games/py-poker-eval/Makefile
+++ b/games/py-poker-eval/Makefile
@@ -23,7 +23,7 @@ ACLOCAL_ARGS=	-I config
 AUTOMAKE_ARGS=	--add-missing
 CONFIGURE_ARGS=	PYTHON=""
 
-PLIST_SUB=	PYVER=${_PYTHON_VERSION:S/./_/}
+PLIST_SUB=	PYVER=${PYTHON_VER:S/./_/}
 
 post-configure:
 	@${INSTALL_SCRIPT} ${AUTOMAKE_DIR}/py-compile ${WRKSRC}/config
diff --git a/science/gnudatalanguage/Makefile b/science/gnudatalanguage/Makefile
index 26153795ac5d..4fcd57d9ea2f 100644
--- a/science/gnudatalanguage/Makefile
+++ b/science/gnudatalanguage/Makefile
@@ -87,7 +87,7 @@ USE_PYTHON=	-2.7
 BUILD_DEPENDS+=	${PYNUMPY}
 RUN_DEPENDS+=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>0:${PORTSDIR}/math/py-matplotlib
-CONFIGURE_ENV+=	PYTHON_VERSION=${_PYTHON_VERSION}
+CONFIGURE_ENV+=	PYTHON_VERSION=${PYTHON_VER}
 CONFIGURE_ARGS+=--with-python=${PYTHONBASE}
 .else
 CONFIGURE_ARGS+=--with-python=no
diff --git a/www/feedjack/Makefile b/www/feedjack/Makefile
index 7e457b724d32..1871a0d88573 100644
--- a/www/feedjack/Makefile
+++ b/www/feedjack/Makefile
@@ -23,6 +23,6 @@ USE_PYDISTUTILS=	easy_install
 PYDISTUTILS_PKGNAME=	Feedjack
 
 PLIST_SUB=	FEEDJACKVER=${PORTVERSION}	\
-		PYTHONVER=${_PYTHON_VERSION}
+		PYTHONVER=${PYTHON_VER}
 
 .include <bsd.port.mk>
diff --git a/www/mitmproxy/Makefile b/www/mitmproxy/Makefile
index 20d57cb09978..7e0ec0be286a 100644
--- a/www/mitmproxy/Makefile
+++ b/www/mitmproxy/Makefile
@@ -21,6 +21,6 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}asn1>0:${PORTSDIR}/devel/py-asn1 \
 
 USE_PYDISTUTILS=easy_install
 USE_PYTHON=	yes
-PLIST_SUB+=	PORTVERSION=${PORTVERSION} PYTHONVERSION=${_PYTHON_VERSION}
+PLIST_SUB+=	PORTVERSION=${PORTVERSION} PYTHONVERSION=${PYTHON_VER}
 
 .include <bsd.port.mk>
diff --git a/www/trac-advancedticketworkflow/Makefile b/www/trac-advancedticketworkflow/Makefile
index 8585c52eaf79..cad8b5bf0de2 100644
--- a/www/trac-advancedticketworkflow/Makefile
+++ b/www/trac-advancedticketworkflow/Makefile
@@ -24,7 +24,7 @@ USE_PYDISTUTILS=	easy_install
 PYDISTUTILS_PKGNAME=	AdvancedTicketWorkflowPlugin
 PYDISTUTILS_PKGVERSION=	${PORTVERSION:R}dev
 
-PLIST_SUB+=	PORTVERSION=${PORTVERSION:R}dev PYTHONVERSION=${_PYTHON_VERSION}
+PLIST_SUB+=	PORTVERSION=${PORTVERSION:R}dev PYTHONVERSION=${PYTHON_VER}
 PYDISTUTILS_NOEGGINFO=	yes
 
 .include <bsd.port.mk>
diff --git a/www/trac-announcer/Makefile b/www/trac-announcer/Makefile
index 0b69d4f693fa..607bbd82b5f3 100644
--- a/www/trac-announcer/Makefile
+++ b/www/trac-announcer/Makefile
@@ -26,7 +26,7 @@ REL=		8411
 EGG_VER=	0.12_p2.dev
 
 PLIST_SUB+=	PORTVERSION=${PORTVERSION:S/.a/_a/} \
-		PYTHONVERSION=${_PYTHON_VERSION}
+		PYTHONVERSION=${PYTHON_VER}
 PLIST_FILES+=	%%PYTHON_SITELIBDIR%%/AnnouncerPlugin-${EGG_VER}-py%%PYTHONVERSION%%.egg
 
 # We must fix file permissions -- ZIP file have 0000 for every file.
diff --git a/www/trac-batchmodify/Makefile b/www/trac-batchmodify/Makefile
index 5fc25e05f725..ea1bd290e36d 100644
--- a/www/trac-batchmodify/Makefile
+++ b/www/trac-batchmodify/Makefile
@@ -25,7 +25,7 @@ USE_PYTHON=	2.5+
 USE_PYDISTUTILS=	easy_install
 PYDISTUTILS_PKGNAME=    BatchModify
 PYDISTUTILS_PKGVERSION= ${PORTVERSION:R}_trac0.12
-PLIST_SUB+=	EGGVERSION=${PORTVERSION:R} PYTHONVERSION=${_PYTHON_VERSION}
+PLIST_SUB+=	EGGVERSION=${PORTVERSION:R} PYTHONVERSION=${PYTHON_VER}
 PYDISTUTILS_NOEGGINFO=	yes
 PLIST_FILES=	%%PYTHON_SITELIBDIR%%/BatchModify-%%EGGVERSION%%_trac0.12-py%%PYTHONVERSION%%.egg
 
diff --git a/www/trac-ccselector/Makefile b/www/trac-ccselector/Makefile
index f4f956880045..41400be00d33 100644
--- a/www/trac-ccselector/Makefile
+++ b/www/trac-ccselector/Makefile
@@ -26,7 +26,7 @@ USE_PYTHON=	2.5+
 USE_PYDISTUTILS=	easy_install
 PYDISTUTILS_PKGNAME=    cc_selector
 PYDISTUTILS_PKGVERSION= ${PORTVERSION:R}
-PLIST_SUB+=	EGGVERSION=${PORTVERSION:R} PYTHONVERSION=${_PYTHON_VERSION}
+PLIST_SUB+=	EGGVERSION=${PORTVERSION:R} PYTHONVERSION=${PYTHON_VER}
 PYDISTUTILS_NOEGGINFO=	yes
 
 post-install:
diff --git a/www/trac-customfieldadmin/Makefile b/www/trac-customfieldadmin/Makefile
index 3544acddc52d..5dc0423dfbcb 100644
--- a/www/trac-customfieldadmin/Makefile
+++ b/www/trac-customfieldadmin/Makefile
@@ -27,7 +27,7 @@ USE_PYTHON=	2.5+
 USE_PYDISTUTILS=	easy_install
 PYDISTUTILS_PKGNAME=    TracCustomFieldAdmin
 PYDISTUTILS_PKGVERSION= ${PORTVERSION:R}
-PLIST_SUB+=	EGGVERSION=${PORTVERSION:R} PYTHONVERSION=${_PYTHON_VERSION}
+PLIST_SUB+=	EGGVERSION=${PORTVERSION:R} PYTHONVERSION=${PYTHON_VER}
 PYDISTUTILS_NOEGGINFO=	yes
 
 post-install:
diff --git a/www/trac-iniadmin/Makefile b/www/trac-iniadmin/Makefile
index 30626a0b29bc..420ca94db732 100644
--- a/www/trac-iniadmin/Makefile
+++ b/www/trac-iniadmin/Makefile
@@ -23,7 +23,7 @@ USE_PYTHON=	2.5+
 USE_PYDISTUTILS=	easy_install
 PYDISTUTILS_PKGNAME=	IniAdmin
 PYDISTUTILS_PKGVERSION=	${PORTVERSION:R}
-PLIST_SUB+=	PORTVERSION=${PORTVERSION:R} PYTHONVERSION=${_PYTHON_VERSION}
+PLIST_SUB+=	PORTVERSION=${PORTVERSION:R} PYTHONVERSION=${PYTHON_VER}
 PYDISTUTILS_NOEGGINFO=	yes
 
 .include <bsd.port.mk>
diff --git a/www/trac-mastertickets/Makefile b/www/trac-mastertickets/Makefile
index 04c58c3b9d24..e47b1e6f6933 100644
--- a/www/trac-mastertickets/Makefile
+++ b/www/trac-mastertickets/Makefile
@@ -26,7 +26,7 @@ PYDISTUTILS_PKGNAME=	TracMasterTickets
 PYDISTUTILS_NOEGGINFO=	yes
 
 PLIST_SUB+=		PORTVERSION=${PORTVERSION} \
-			PYTHONVERSION=${_PYTHON_VERSION}
+			PYTHONVERSION=${PYTHON_VER}
 PLIST_FILES+=		%%PYTHON_SITELIBDIR%%/TracMasterTickets-%%PORTVERSION%%-py%%PYTHONVERSION%%.egg
 
 .include <bsd.port.mk>
diff --git a/www/trac-revtree/Makefile b/www/trac-revtree/Makefile
index 8e361937edc4..5c881f8b0f29 100644
--- a/www/trac-revtree/Makefile
+++ b/www/trac-revtree/Makefile
@@ -31,7 +31,7 @@ USE_PYTHON=	yes
 USE_PYDISTUTILS=	easy_install
 PYDISTUTILS_PKGNAME=	TracRevtreePlugin
 PYDISTUTILS_PKGVERSION=	${PORTVERSION}dev
-PLIST_SUB+=	EGGVERSION="${PORTVERSION}dev" PYTHONVERSION=${_PYTHON_VERSION}
+PLIST_SUB+=	EGGVERSION="${PORTVERSION}dev" PYTHONVERSION=${PYTHON_VER}
 PYDISTUTILS_NOEGGINFO=	yes
 
 BROKEN=		fails to build
diff --git a/www/trac-tocmacro/Makefile b/www/trac-tocmacro/Makefile
index 0b46c21376af..cd3f42720bd3 100644
--- a/www/trac-tocmacro/Makefile
+++ b/www/trac-tocmacro/Makefile
@@ -21,7 +21,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	easy_install
 PYDISTUTILS_PKGNAME=	TracTocMacro
-PLIST_SUB+=	PORTVERSION=${PORTVERSION} PYTHONVERSION=${_PYTHON_VERSION}
+PLIST_SUB+=	PORTVERSION=${PORTVERSION} PYTHONVERSION=${PYTHON_VER}
 PYDISTUTILS_NOEGGINFO=	yes
 
 .include <bsd.port.mk>
diff --git a/www/trac-tweakui/Makefile b/www/trac-tweakui/Makefile
index 57dfcff783b6..999edcb59b12 100644
--- a/www/trac-tweakui/Makefile
+++ b/www/trac-tweakui/Makefile
@@ -32,7 +32,7 @@ USE_PYTHON=	yes
 USE_PYDISTUTILS=	easy_install
 PYDISTUTILS_PKGNAME=	TracTweakUI
 PYDISTUTILS_PKGVERSION=	${PORTVERSION:R}
-PLIST_SUB+=	EGGVERSION="${PORTVERSION:R}" PYTHONVERSION=${_PYTHON_VERSION}
+PLIST_SUB+=	EGGVERSION="${PORTVERSION:R}" PYTHONVERSION=${PYTHON_VER}
 PYDISTUTILS_NOEGGINFO=	yes
 
 post-install:
diff --git a/www/trac-wikigoodies/Makefile b/www/trac-wikigoodies/Makefile
index 1a012e58092d..035394276a3b 100644
--- a/www/trac-wikigoodies/Makefile
+++ b/www/trac-wikigoodies/Makefile
@@ -28,7 +28,7 @@ PYDISTUTILS_PKGVERSION=	0.11.${PORTVERSION:R}dev
 PYDISTUTILS_NOEGGINFO=	yes
 
 PLIST_SUB+=	PORTVERSION=${PORTVERSION:R} \
-		PYTHONVERSION=${_PYTHON_VERSION}
+		PYTHONVERSION=${PYTHON_VER}
 PLIST_FILES=	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
 
 .include <bsd.port.mk>
diff --git a/www/trac-wikitemplates/Makefile b/www/trac-wikitemplates/Makefile
index 02789b7a5f59..b9e9b3583cba 100644
--- a/www/trac-wikitemplates/Makefile
+++ b/www/trac-wikitemplates/Makefile
@@ -18,7 +18,7 @@ MAINTAINER=	glarkin@FreeBSD.org
 COMMENT=	Templates for the Trac wiki
 
 RUN_DEPENDS+=	tracd:${PORTSDIR}/www/trac
-#		${PYTHON_SITELIBDIR}/TracCtxtnavAdd-2.0-py${_PYTHON_VERSION}.egg:${PORTSDIR}/www/trac-ctxtnavadd
+#		${PYTHON_SITELIBDIR}/TracCtxtnavAdd-2.0-py${PYTHON_VER}.egg:${PORTSDIR}/www/trac-ctxtnavadd
 
 WRKSRC=		${WRKDIR}/${PORTNAME}plugin
 USE_PYTHON=	yes