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

the publicly accessible ones instead
This commit is contained in:
Marcus von Appen 2013-08-30 16:49:43 +00:00
parent 07cb09a8fe
commit 88a76724e6
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=325711
17 changed files with 18 additions and 18 deletions

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -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.

View file

@ -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

View file

@ -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:

View file

@ -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:

View file

@ -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>

View file

@ -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>

View file

@ -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

View file

@ -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>

View file

@ -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:

View file

@ -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>

View file

@ -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