svn commit: r325711 - in head: devel/trac-bitten games/py-poker-eval science/gnudatalanguage www/feedjack www/mitmproxy www/trac-advancedticketworkflow www/trac-announcer www/trac-batchmodify www/t...

Marcus von Appen mva at FreeBSD.org
Fri Aug 30 16:49:48 UTC 2013 

Author: mva
Date: Fri Aug 30 16:49:43 2013
New Revision: 325711
URL: http://svnweb.freebsd.org/changeset/ports/325711

Log:
  - do not use local bsd.python.mk variables within the port Makefile - switch
    the publicly accessible ones instead

Modified:
  head/devel/trac-bitten/Makefile   (contents, props changed)
  head/games/py-poker-eval/Makefile
  head/science/gnudatalanguage/Makefile
  head/www/feedjack/Makefile   (contents, props changed)
  head/www/mitmproxy/Makefile
  head/www/trac-advancedticketworkflow/Makefile   (contents, props changed)
  head/www/trac-announcer/Makefile   (contents, props changed)
  head/www/trac-batchmodify/Makefile   (contents, props changed)
  head/www/trac-ccselector/Makefile   (contents, props changed)
  head/www/trac-customfieldadmin/Makefile   (contents, props changed)
  head/www/trac-iniadmin/Makefile   (contents, props changed)
  head/www/trac-mastertickets/Makefile   (contents, props changed)
  head/www/trac-revtree/Makefile
  head/www/trac-tocmacro/Makefile   (contents, props changed)
  head/www/trac-tweakui/Makefile   (contents, props changed)
  head/www/trac-wikigoodies/Makefile   (contents, props changed)
  head/www/trac-wikitemplates/Makefile   (contents, props changed)

Modified: head/devel/trac-bitten/Makefile
==============================================================================
--- head/devel/trac-bitten/Makefile	Fri Aug 30 16:27:50 2013	(r325710)
+++ head/devel/trac-bitten/Makefile	Fri Aug 30 16:49:43 2013	(r325711)
@@ -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

Modified: head/games/py-poker-eval/Makefile
==============================================================================
--- head/games/py-poker-eval/Makefile	Fri Aug 30 16:27:50 2013	(r325710)
+++ head/games/py-poker-eval/Makefile	Fri Aug 30 16:49:43 2013	(r325711)
@@ -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

Modified: head/science/gnudatalanguage/Makefile
==============================================================================
--- head/science/gnudatalanguage/Makefile	Fri Aug 30 16:27:50 2013	(r325710)
+++ head/science/gnudatalanguage/Makefile	Fri Aug 30 16:49:43 2013	(r325711)
@@ -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

Modified: head/www/feedjack/Makefile
==============================================================================
--- head/www/feedjack/Makefile	Fri Aug 30 16:27:50 2013	(r325710)
+++ head/www/feedjack/Makefile	Fri Aug 30 16:49:43 2013	(r325711)
@@ -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>

Modified: head/www/mitmproxy/Makefile
==============================================================================
--- head/www/mitmproxy/Makefile	Fri Aug 30 16:27:50 2013	(r325710)
+++ head/www/mitmproxy/Makefile	Fri Aug 30 16:49:43 2013	(r325711)
@@ -21,6 +21,6 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}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>

Modified: head/www/trac-advancedticketworkflow/Makefile
==============================================================================
--- head/www/trac-advancedticketworkflow/Makefile	Fri Aug 30 16:27:50 2013	(r325710)
+++ head/www/trac-advancedticketworkflow/Makefile	Fri Aug 30 16:49:43 2013	(r325711)
@@ -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>

Modified: head/www/trac-announcer/Makefile
==============================================================================
--- head/www/trac-announcer/Makefile	Fri Aug 30 16:27:50 2013	(r325710)
+++ head/www/trac-announcer/Makefile	Fri Aug 30 16:49:43 2013	(r325711)
@@ -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.

Modified: head/www/trac-batchmodify/Makefile
==============================================================================
--- head/www/trac-batchmodify/Makefile	Fri Aug 30 16:27:50 2013	(r325710)
+++ head/www/trac-batchmodify/Makefile	Fri Aug 30 16:49:43 2013	(r325711)
@@ -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
 

Modified: head/www/trac-ccselector/Makefile
==============================================================================
--- head/www/trac-ccselector/Makefile	Fri Aug 30 16:27:50 2013	(r325710)
+++ head/www/trac-ccselector/Makefile	Fri Aug 30 16:49:43 2013	(r325711)
@@ -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:

Modified: head/www/trac-customfieldadmin/Makefile
==============================================================================
--- head/www/trac-customfieldadmin/Makefile	Fri Aug 30 16:27:50 2013	(r325710)
+++ head/www/trac-customfieldadmin/Makefile	Fri Aug 30 16:49:43 2013	(r325711)
@@ -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:

Modified: head/www/trac-iniadmin/Makefile
==============================================================================
--- head/www/trac-iniadmin/Makefile	Fri Aug 30 16:27:50 2013	(r325710)
+++ head/www/trac-iniadmin/Makefile	Fri Aug 30 16:49:43 2013	(r325711)
@@ -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>

Modified: head/www/trac-mastertickets/Makefile
==============================================================================
--- head/www/trac-mastertickets/Makefile	Fri Aug 30 16:27:50 2013	(r325710)
+++ head/www/trac-mastertickets/Makefile	Fri Aug 30 16:49:43 2013	(r325711)
@@ -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>

Modified: head/www/trac-revtree/Makefile
==============================================================================
--- head/www/trac-revtree/Makefile	Fri Aug 30 16:27:50 2013	(r325710)
+++ head/www/trac-revtree/Makefile	Fri Aug 30 16:49:43 2013	(r325711)
@@ -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

Modified: head/www/trac-tocmacro/Makefile
==============================================================================
--- head/www/trac-tocmacro/Makefile	Fri Aug 30 16:27:50 2013	(r325710)
+++ head/www/trac-tocmacro/Makefile	Fri Aug 30 16:49:43 2013	(r325711)
@@ -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>

Modified: head/www/trac-tweakui/Makefile
==============================================================================
--- head/www/trac-tweakui/Makefile	Fri Aug 30 16:27:50 2013	(r325710)
+++ head/www/trac-tweakui/Makefile	Fri Aug 30 16:49:43 2013	(r325711)
@@ -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:

Modified: head/www/trac-wikigoodies/Makefile
==============================================================================
--- head/www/trac-wikigoodies/Makefile	Fri Aug 30 16:27:50 2013	(r325710)
+++ head/www/trac-wikigoodies/Makefile	Fri Aug 30 16:49:43 2013	(r325711)
@@ -28,7 +28,7 @@ PYDISTUTILS_PKGVERSION=	0.11.${PORTVERSI
 PYDISTUTILS_NOEGGINFO=	yes
 
 PLIST_SUB+=	PORTVERSION=${PORTVERSION:R} \
-		PYTHONVERSION=${_PYTHON_VERSION}
+		PYTHONVERSION=${PYTHON_VER}
 PLIST_FILES=	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
 
 .include <bsd.port.mk>

Modified: head/www/trac-wikitemplates/Makefile
==============================================================================
--- head/www/trac-wikitemplates/Makefile	Fri Aug 30 16:27:50 2013	(r325710)
+++ head/www/trac-wikitemplates/Makefile	Fri Aug 30 16:49:43 2013	(r325711)
@@ -18,7 +18,7 @@ MAINTAINER=	glarkin at 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

More information about the svn-ports-all mailing list