Page MenuHomeFreeBSD
Files F150433211

D8069.id23197.diff
No OneTemporary
Actions

D8069.id23197.diff
View Options

Index: Mk/Uses/kde.mk
===================================================================
--- Mk/Uses/kde.mk
+++ Mk/Uses/kde.mk
@@ -30,6 +30,8 @@
.if !defined(_INCLUDE_USES_KDE_MK)
_INCLUDE_USES_KDE_MK= yes
+_USES_POST+= kde
+
_KDE_SUPPORTED= 4 5
. if empty(kde_ARGS)
@@ -160,20 +162,8 @@
. endif
# ==============================================================================
-# === HANDLE PYTHON ============================================================
-# TODO: Keep in sync with cmake/modules/PythonMacros.cmake
-_PYTHON_SHORT_VER= ${PYTHON_VERSION:S/^python//:S/.//}
-. if ${_PYTHON_SHORT_VER} > 31
-PLIST_SUB+= PYCACHE="__pycache__/" \
- PYC_SUFFIX=cpython-${_PYTHON_SHORT_VER}.pyc \
- PYO_SUFFIX=cpython-${_PYTHON_SHORT_VER}.pyo
-. else
-PLIST_SUB+= PYCACHE="" \
- PYC_SUFFIX=pyc \
- PYO_SUFFIX=pyo
-. endif
# ==============================================================================
-_USE_KDE4_ALL= baloo baloo-widgets baseapps kactivities kate kdelibs \
+_USE_KDE4_ALL= baloo baloo-widgets baseapps kactivities kate kdelibs \
kfilemetadata korundum libkcddb libkcompactdisc \
libkdcraw libkdeedu libkdegames libkexiv2 libkipi \
libkonq libksane marble nepomuk-core nepomuk-widgets \
@@ -620,3 +610,22 @@
. endfor
.endif
+
+.if defined(_POSTMKINCLUDED) && !defined(_INCLUDE_USES_KDE_POST_MK)
+_INCLUDE_USES_KDE_POST_MK= yes
+
+# === HANDLE PYTHON ============================================================
+# TODO: Keep in sync with cmake/modules/PythonMacros.cmake
+.if defined(PYTHON_SUFFIX)
+. if ${PYTHON_SUFFIX} > 31
+PLIST_SUB+= PYCACHE="__pycache__/" \
+ PYC_SUFFIX=cpython-${PYTHON_SUFFIX}.pyc \
+ PYO_SUFFIX=cpython-${PYTHON_SUFFIX}.pyo
+. else
+PLIST_SUB+= PYCACHE="" \
+ PYC_SUFFIX=pyc \
+ PYO_SUFFIX=pyo
+. endif
+.endif
+
+.endif
Index: Mk/Uses/python.mk
===================================================================
--- Mk/Uses/python.mk
+++ Mk/Uses/python.mk
@@ -6,7 +6,7 @@
#
# Feature: python
# Usage: USES=python or USES=python:args
-# Valid ARGS: <version>, build, run, test
+# Valid ARGS: <version>, <implementation>, build, run, test
#
# version If your port requires only some set of Python versions, you
# can set this to [min]-[max] or min+ or -max or as an
@@ -22,6 +22,12 @@
# USES=python # Use the set default Python
# # version
#
+# implementation If your port requires a specific Python implementation, you
+# can specify this:
+#
+# USES=python:cpython # lang/python
+# USES=python:pypy # lang/pypy
+#
# build Indicates that Python is needed at build time and adds
# it to BUILD_DEPENDS.
# run Indicates that Python is needed at run time and adds
@@ -36,7 +42,7 @@
# Variables, which can be set by a user:
#
# PYTHON_VERSION - The chosen Python interpreter including the version,
-# e.g. python2.7, python3.3, etc. This allows the user
+# e.g. cpython2.7, pypy3.3, etc. This allows the user
# to override the currently chosen default version and
# to install the port for a specific Python version.
# It must not be set by a port.
@@ -92,7 +98,14 @@
#
# PYTHON_CMD - Python's command line file name, including the
# version number (used for dependencies).
-# default: ${PYTHONBASE}/bin/${PYTHON_VERSION}
+# default:
+# cpython: ${PYTHONBASE}/bin/python${PYTHON_VER}
+# pypy: ${LOCALBASE}/bin/pypy${PYTHON_MAJOR_VER:S/2//}
+#
+# PYTHON_LIB - Python's library file name (used to link against)
+# default:
+# cpython: ${PYTHONBASE}/lib/libpython${PYTHON_VER}${PYTHON_ABIVER}.so
+# pypy: ${PYTHON_LIBDIR}/libpypy-c.so
#
# PYSETUP - Name of the setup script used by the distutils
# package.
@@ -128,7 +141,7 @@
#
# PYDISTUTILS_INSTALLARGS
# - Arguments to install with distutils.
-# default: -c -O1 --prefix=${PREFIX} --single-version-externally-managed --root=${STAGEDIR}
+# default: -c -O1 --prefix=${PYTHONPREFIX} --single-version-externally-managed --root=${STAGEDIR}
#
# PYDISTUTILS_EGGINFO
# - Canonical name for egg-info.
@@ -137,7 +150,10 @@
# The following variables can be read by ports and must not be modified:
#
# PYTHONBASE - The installation prefix of the chosen Python
-# interpreter, e.g. /usr/local
+# interpreter
+# default:
+# cpython: ${LOCALBASE}
+# pypy: ${LOCALBASE}/pypy-${PYPY_VER}
#
# PYTHON_PORTVERSION
# - Version number suitable for ${PORTVERSION}.
@@ -161,22 +177,28 @@
# interpreter, e.g. md
#
# PYTHON_INCLUDEDIR - Location of the Python include files.
-# default: ${PYTHONBASE}/include/${PYTHON_VERSION}
+# default:
+# cpython: ${PYTHONBASE}/include/python${PYTHON_VER}
+# pypy: ${PYTHONBASE}/include
#
# PYTHON_LIBDIR - Base of the python library tree
-# default: ${PYTHONBASE}/lib/${PYTHON_VERSION}
+# default:
+# cpython: ${PYTHONBASE}/lib/python${PYTHON_VER}
+# pypy: ${PYTHONBASE}/lib-python/${PYTHON_VER}
#
# PYTHON_SITELIBDIR - Location of the site-packages tree. Don't change,
# unless you know what you do.
-# default: ${PYTHON_LIBDIR}/site-packages
+# default:
+# cpython: ${PYTHON_LIBDIR}/site-packages
+# pypy: ${PYTHONBASE}/site-packages
#
# There are PREFIX-clean variants of the PYTHON_*DIR variables above.
# They are meant to be used by ports instead of the above variables, so the
# ports respect ${PREFIX} (unless USE_PYTHON=pythonprefix is specified).
#
-# PYTHONPREFIX_INCLUDEDIR default: ${PREFIX}/include/${PYTHON_VERSION}
-# PYTHONPREFIX_LIBDIR default: ${PREFIX}/lib/${PYTHON_VERSION}
-# PYTHONPREFIX_SITELIBDIR default: ${PYTHONPREFIX_LIBDIR}/site-packages
+# PYTHONPREFIX_INCLUDEDIR
+# PYTHONPREFIX_LIBDIR
+# PYTHONPREFIX_SITELIBDIR
#
# PYTHON_PLATFORM - Python's idea of the OS release.
# This is faked with ${OPSYS} and ${OSREL} until we
@@ -188,7 +210,7 @@
# packages for different Python versions.
# default: py${PYTHON_SUFFIX}-
#
-# Using USES=python.mk also will add some useful entries to PLIST_SUB:
+# Using USES=python also will add some useful entries to PLIST_SUB:
#
# PYTHON_INCLUDEDIR=${PYTHONPREFIX_INCLUDEDIR:S;${PREFIX}/;;}
# PYTHON_LIBDIR=${PYTHONPREFIX_LIBDIR:S;${PREFIX}/;;}
@@ -219,14 +241,6 @@
.if !defined(_INCLUDE_USES_PYTHON_MK)
_INCLUDE_USES_PYTHON_MK= yes
-# What Python version and what Python interpreters are currently supported?
-# When adding a version, please keep the comment in
-# Mk/bsd.default-versions.mk in sync.
-_PYTHON_VERSIONS= 2.7 3.5 3.4 3.3 # preferred first
-_PYTHON_PORTBRANCH= 2.7 # ${_PYTHON_VERSIONS:[1]}
-_PYTHON_BASECMD= ${LOCALBASE}/bin/python
-_PYTHON_RELPORTDIR= lang/python
-
# Make each individual feature available as _PYTHON_FEATURE_<FEATURENAME>
.for var in ${USE_PYTHON}
_PYTHON_FEATURE_${var:tu}= yes
@@ -250,6 +264,13 @@
_PYTHON_TEST_DEP= yes
_PYTHON_ARGS:= ${_PYTHON_ARGS:Ntest}
.endif
+.undef _PYTHON_IMPL
+.for impl in cpython pypy
+. if ${_PYTHON_ARGS:M${impl}}
+_PYTHON_IMPL+= ${impl}
+_PYTHON_ARGS:= ${_PYTHON_ARGS:N${impl}}
+. endif
+.endfor
# The port does not specify a build, run or test dependency, assume all are
# required.
@@ -260,6 +281,20 @@
_PYTHON_TEST_DEP= yes
.endif
+.for var in PYTHON_DEFAULT_VERSION PYTHON2_DEFAULT_VERSION PYTHON3_DEFAULT_VERSION PYTHON_DEFAULT PYTHON2_DEFAULT PYTHON3_DEFAULT _PYTHON_DEFAULT_VERSION
+. if defined(${var})
+cleanvar:= ${${var}}
+. if ${cleanvar:C/^([a-z]*).*/\1/} == ""
+cleanvar:= cpython${cleanvar}
+. endif
+cleanvar:= ${cleanvar:S/^python/cpython/}
+. if ${cleanvar} != ${${var}}
+WARNING+= "Converting ${var}=${${var}} to ${var}=${cleanvar}"
+${var}:= ${cleanvar}
+. endif
+. endif
+.endfor
+
.if defined(PYTHON_DEFAULT_VERSION)
WARNING+= "PYTHON_DEFAULT_VERSION is defined, consider using DEFAULT_VERSIONS=python=${PYTHON_DEFAULT_VERSION:S/^python//} instead"
.endif
@@ -271,41 +306,41 @@
.endif
.if exists(${LOCALBASE}/bin/python)
-.if !defined(_PYTHON_DEFAULT_VERSION)
+. if !defined(_PYTHON_DEFAULT_VERSION)
_PYTHON_DEFAULT_VERSION!= (${LOCALBASE}/bin/python -c \
- 'import sys; print("%d.%d" % sys.version_info[:2])' 2> /dev/null \
- || ${ECHO_CMD} ${_PYTHON_PORTBRANCH}) | ${TAIL} -1
-.endif
+ 'import platform, sys; print("%s%d.%d" % ((platform.python_implementation().lower(),) + sys.version_info[:2]))' 2> /dev/null \
+ || ${ECHO_CMD} ${PYTHON_DEFAULT}) | ${TAIL} -1
+. endif
_EXPORTED_VARS+= _PYTHON_DEFAULT_VERSION
-.if defined(PYTHON_DEFAULT) && (${PYTHON_DEFAULT} != ${_PYTHON_DEFAULT_VERSION})
+. if defined(PYTHON_DEFAULT) && (${PYTHON_DEFAULT} != ${_PYTHON_DEFAULT_VERSION})
WARNING+= "Your requested default python version ${PYTHON_DEFAULT} is different from the installed default python interpreter version ${_PYTHON_DEFAULT_VERSION}"
-.endif
-PYTHON_DEFAULT_VERSION= python${_PYTHON_DEFAULT_VERSION}
+. endif
+PYTHON_DEFAULT_VERSION= ${_PYTHON_DEFAULT_VERSION}
.else
-PYTHON_DEFAULT_VERSION= python${PYTHON_DEFAULT}
+PYTHON_DEFAULT_VERSION= ${PYTHON_DEFAULT}
.endif # exists(${LOCALBASE}/bin/python)
# Is only a meta-port version defined?
-.if ${PYTHON_DEFAULT_VERSION} == "python2"
-PYTHON2_DEFAULT_VERSION?= python${PYTHON2_DEFAULT}
-.elif ${PYTHON_DEFAULT_VERSION:R} == "python2"
+.if ${PYTHON_DEFAULT_VERSION:C/^[a-z]+//} == "2"
+PYTHON2_DEFAULT_VERSION?= ${PYTHON2_DEFAULT}
+.elif ${PYTHON_DEFAULT_VERSION:R:C/^[a-z]+//} == "2"
PYTHON2_DEFAULT_VERSION= ${PYTHON_DEFAULT_VERSION}
.else
-PYTHON2_DEFAULT_VERSION?= python${PYTHON2_DEFAULT}
+PYTHON2_DEFAULT_VERSION?= ${PYTHON2_DEFAULT}
.endif
-.if ${PYTHON_DEFAULT_VERSION} == "python3"
-PYTHON3_DEFAULT_VERSION?= python${PYTHON3_DEFAULT}
-.elif ${PYTHON_DEFAULT_VERSION:R} == "python3"
+.if ${PYTHON_DEFAULT_VERSION:C/^[a-z]+//} == "3"
+PYTHON3_DEFAULT_VERSION?= ${PYTHON3_DEFAULT}
+.elif ${PYTHON_DEFAULT_VERSION:R:C/^[a-z]+//} == "3"
PYTHON3_DEFAULT_VERSION= ${PYTHON_DEFAULT_VERSION}
.else
-PYTHON3_DEFAULT_VERSION?= python${PYTHON3_DEFAULT}
+PYTHON3_DEFAULT_VERSION?= ${PYTHON3_DEFAULT}
.endif
.if ${_PYTHON_ARGS} == "2"
-_PYTHON_ARGS= ${PYTHON2_DEFAULT_VERSION:S/^python//}
+_PYTHON_ARGS= ${PYTHON2_DEFAULT_VERSION:C/^[a-z]+//}
_WANTS_META_PORT= 2
.elif ${_PYTHON_ARGS} == "3"
-_PYTHON_ARGS= ${PYTHON3_DEFAULT_VERSION:S/^python//}
+_PYTHON_ARGS= ${PYTHON3_DEFAULT_VERSION:C/^[a-z]+//}
_WANTS_META_PORT= 3
.endif # ${_PYTHON_ARGS} == "2"
@@ -325,11 +360,46 @@
# that maintainers know what they are doing and assume PYTHON_VERSION to be a
# hint. Just warn maintainers, if the versions do not match
# (_PYTHON_VERSION_NONSUPPORTED).
-_PYTHON_VERSION:= ${PYTHON_VERSION:S/^python//}
+_PYTHON_VERSION:= ${PYTHON_VERSION:C/^[a-z]+//}
+_PYTHON_VERSION_IMPL= ${PYTHON_VERSION:C/^([a-z]+).*/\1/}
+. if defined(_PYTHON_IMPL) && ${_PYTHON_IMPL} != ${_PYTHON_VERSION_IMPL}
+IGNORE?= "needs Python implementation ${_PYTHON_VERSION_IMPL}. But a port depending on this one specified ${_PYTHON_IMPL}"
+. else
+_PYTHON_IMPL= ${_PYTHON_VERSION_IMPL}
+. endif
.else
-_PYTHON_VERSION:= ${PYTHON_DEFAULT_VERSION:S/^python//}
+_PYTHON_VERSION:= ${PYTHON_DEFAULT_VERSION:C/^[a-z]+//}
+_PYTHON_IMPL?= ${PYTHON_DEFAULT_VERSION:C/^([a-z]+).*/\1/}
.endif # defined(PYTHON_VERSION)
+.if ${_PYTHON_IMPL} == cpython
+_PYTHON_BINNAME= python
+_PYTHON_SHORTNAME= py
+_PYTHON_VERSIONS= 2.7 3.5 3.4 3.3 # preferred first
+
+PYTHON_PORTSDIR= lang/python${PYTHON_SUFFIX}
+PYTHON_CMD?= ${LOCALBASE}/bin/python${PYTHON_VER}
+PYTHON_LIB= ${PYTHONBASE}/lib/libpython${_PYTHON_VERSION}${PYTHON_ABIVER}.so
+
+PYTHON_INCLUDEDIR= ${PYTHONBASE}/include/python${_PYTHON_VERSION}${PYTHON_ABIVER}
+PYTHON_LIBDIR= ${PYTHONBASE}/lib/python${_PYTHON_VERSION}
+PYTHON_SITELIBDIR= ${PYTHON_LIBDIR}/site-packages
+.elif ${_PYTHON_IMPL} == pypy
+_PYTHON_BINNAME= pypy
+_PYTHON_SHORTNAME= pypy
+_PYTHON_VERSIONS= 2.7 3.3 # preferred first
+
+PYTHON_PORTSDIR= lang/pypy${PYTHON_SUFFIX:C/(.).*/\1/:S/2//}
+PYTHON_CMD?= ${LOCALBASE}/bin/pypy${PYTHON_SUFFIX:C/(.).*/\1/:S/2//}
+PYTHON_LIB= ${PYTHON_LIBDIR}/libpypy-c.so
+
+PYTHON_INCLUDEDIR= ${PYTHONBASE}/include
+PYTHON_LIBDIR= ${PYTHONBASE}/lib-python/${PYTHON_VER}
+PYTHON_SITELIBDIR= ${PYTHONBASE}/site-packages
+.else
+IGNORE?= "needs an unsupported implementation '${_PYTHON_IMPL}' of Python (supported implementations: cpython, pypy)"
+.endif # ${_PYTHON_IMPL}
+
# Validate Python version whether it meets the version restriction.
_PYTHON_VERSION_CHECK:= ${_PYTHON_ARGS:C/^([1-9]\.[0-9])$/\1-\1/}
_PYTHON_VERSION_MINIMUM_TMP:= ${_PYTHON_VERSION_CHECK:C/([1-9]\.[0-9])[-+].*/\1/}
@@ -342,35 +412,50 @@
_PYTHON_VERSION_NONSUPPORTED= ${_PYTHON_VERSION_MINIMUM} at least
.elif !empty(_PYTHON_VERSION_MAXIMUM) && (${_PYTHON_VERSION} > ${_PYTHON_VERSION_MAXIMUM})
_PYTHON_VERSION_NONSUPPORTED= ${_PYTHON_VERSION_MAXIMUM} at most
+.else
+. undef _PYTHON_VERSION_SUPPORTED
+. for supported_ver in ${_PYTHON_VERSIONS}
+. if ${_PYTHON_VERSION} == ${supported_ver}
+_PYTHON_VERSION_SUPPORTED= yes
+. endif
+. endfor
+. if !defined(_PYTHON_VERSION_SUPPORTED)
+_PYTHON_VERSION_NONSUPPORTED= ${_PYTHON_VERSIONS} (unsupported)
+. endif
+. undef _PYTHON_VERSION_SUPPORTED
.endif
# If we have an unsupported version of Python, try another.
.if defined(_PYTHON_VERSION_NONSUPPORTED)
-.if defined(PYTHON_VERSION) || defined(PYTHON_CMD)
+. if defined(PYTHON_VERSION) || defined(PYTHON_CMD)
_PV:= ${_PYTHON_VERSION} # preserve the specified python version
WARNING+= "needs Python ${_PYTHON_VERSION_NONSUPPORTED}. But a port depending on this one specified ${_PV}"
-.endif # defined(PYTHON_VERSION) || defined(PYTHON_CMD)
-.undef _PYTHON_VERSION
-.for ver in ${PYTHON2_DEFAULT} ${PYTHON3_DEFAULT} ${_PYTHON_VERSIONS}
-__VER= ${ver}
-.if !defined(_PYTHON_VERSION) && \
+. endif # defined(PYTHON_VERSION) || defined(PYTHON_CMD)
+. undef _PYTHON_VERSION
+. for ver in ${PYTHON_DEFAULT:C/^[a-z]+//} ${PYTHON2_DEFAULT:C/^[a-z]+//} ${PYTHON3_DEFAULT:C/^[a-z]+//} ${_PYTHON_VERSIONS}
+. if !defined(_PYTHON_VERSION) && \
!(!empty(_PYTHON_VERSION_MINIMUM) && ( \
- ${__VER} < ${_PYTHON_VERSION_MINIMUM})) && \
+ ${_PYTHON_VERSION_MINIMUM} > ${ver})) && \
!(!empty(_PYTHON_VERSION_MAXIMUM) && ( \
- ${__VER} > ${_PYTHON_VERSION_MAXIMUM}))
-_PYTHON_VERSION= ${ver}
-.endif
-.endfor
-.if !defined(_PYTHON_VERSION)
-IGNORE= needs an unsupported version of Python
-.endif
+ ${_PYTHON_VERSION_MAXIMUM} < ${ver} ))
+_ver= ${ver}
+. for supported_ver in ${_PYTHON_VERSIONS}
+. if !defined(_PYTHON_VERSION) && ${_ver} == ${supported_ver}
+_PYTHON_VERSION:= ${ver}
+. endif
+. endfor
+. endif
+. endfor
+. if !defined(_PYTHON_VERSION)
+IGNORE?= "needs an unsupported version of Python"
+. endif
.endif # defined(_PYTHON_VERSION_NONSUPPORTED)
# Pass PYTHON_VERSION down the dependency chain. This ensures that
# port A -> B -> C all will use the same python version and do not
# try to find a different one, if the passed version fits into
# the supported version range.
-PYTHON_VERSION?= python${_PYTHON_VERSION}
+PYTHON_VERSION?= ${_PYTHON_IMPL}${_PYTHON_VERSION}
.if !defined(PYTHON_NO_DEPENDS)
DEPENDS_ARGS+= PYTHON_VERSION=${PYTHON_VERSION}
.endif
@@ -378,10 +463,10 @@
# NOTE:
#
# PYTHON_VERSION will hold whatever is passed down the dependency chain.
-# If a user runs `make PYTHON_VERSION=python3.3, PYTHON_VERSION will be
-# set to 'python3.3'. A port however may require a different version,
+# If a user runs `make PYTHON_VERSION=cpython3.3, PYTHON_VERSION will be
+# set to 'cpython3.3'. A port however may require a different version,
# which is stored (above) in _PYTHON_VERSION.
-# Every python bit below hence should use python${_PYTHON_VERSION}, since
+# Every python bit below hence should use ${_PYTHON_IMPL}${_PYTHON_VERSION}, since
# this is the value, the _port_ requires
#
@@ -391,9 +476,9 @@
PYTHON_MAJOR_VER= ${PYTHON_VER:R}
PYTHON_REL= # empty
PYTHON_ABIVER= # empty
-PYTHON_PORTSDIR= ${_PYTHON_RELPORTDIR}${PYTHON_SUFFIX}
+
# Protect partial checkouts from Mk/Scripts/functions.sh:export_ports_env().
-.if !defined(_PORTS_ENV_CHECK) || exists(${PORTSDIR}/${PYTHON_PORTSDIR})
+.if (!defined(_PORTS_ENV_CHECK) || exists(${PORTSDIR}/${PYTHON_PORTSDIR}/Makefile.version)) && defined(PYTHON_PORTSDIR)
.include "${PORTSDIR}/${PYTHON_PORTSDIR}/Makefile.version"
.endif
# Create a 4 integer version string, prefixing 0 to the last token if
@@ -403,7 +488,6 @@
PYTHON_REL= ${PYTHON_PORTVERSION:C/^([0-9]+\.[0-9]+\.[0-9]+).*/\1/:C/\.([0-9]+)$/.0\1/:C/\.0?([0-9][0-9])$/.\1/:S/.//g}
# Might be overridden by calling ports
-PYTHON_CMD?= ${_PYTHON_BASECMD}${_PYTHON_VERSION}
.if ${PYTHON_VER} != 2.7
.if exists(${PYTHON_CMD}-config)
PYTHON_ABIVER!= ${PYTHON_CMD}-config --abiflags
@@ -419,16 +503,14 @@
.endif
_EXPORTED_VARS+= PYTHONBASE
-PYTHON_INCLUDEDIR= ${PYTHONBASE}/include/python${_PYTHON_VERSION}${PYTHON_ABIVER}
-PYTHON_LIBDIR= ${PYTHONBASE}/lib/python${_PYTHON_VERSION}
PYTHON_PLATFORM= ${OPSYS:tl}${OSREL:C/\.[0-9.]*//}
-PYTHON_SITELIBDIR= ${PYTHON_LIBDIR}/site-packages
-PYTHON_PKGNAMEPREFIX= py${PYTHON_SUFFIX}-
-PYTHON_PKGNAMESUFFIX= -py${PYTHON_SUFFIX}
+PYTHON_PKGNAMEPREFIX= ${_PYTHON_SHORTNAME}${PYTHON_SUFFIX}-
+PYTHON_PKGNAMESUFFIX= -${_PYTHON_SHORTNAME}${PYTHON_SUFFIX}
-PYTHONPREFIX_INCLUDEDIR= ${PYTHON_INCLUDEDIR:S;${PYTHONBASE};${PREFIX};}
-PYTHONPREFIX_LIBDIR= ${PYTHON_LIBDIR:S;${PYTHONBASE};${PREFIX};}
-PYTHONPREFIX_SITELIBDIR= ${PYTHON_SITELIBDIR:S;${PYTHONBASE};${PREFIX};}
+PYTHONPREFIX= ${PYTHONBASE:S;${LOCALBASE};${PREFIX};}
+PYTHONPREFIX_INCLUDEDIR= ${PYTHON_INCLUDEDIR:S;${LOCALBASE};${PREFIX};}
+PYTHONPREFIX_LIBDIR= ${PYTHON_LIBDIR:S;${LOCALBASE};${PREFIX};}
+PYTHONPREFIX_SITELIBDIR= ${PYTHON_SITELIBDIR:S;${LOCALBASE};${PREFIX};}
# Used for recording the installed files.
_PYTHONPKGLIST= ${WRKDIR}/.PLIST.pymodtmp
@@ -469,8 +551,8 @@
_CURRENTPORT:= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
.if defined(_PYTHON_FEATURE_DISTUTILS) && \
${_CURRENTPORT:S/${PYTHON_SUFFIX}$//} != ${PYTHON_PKGNAMEPREFIX}setuptools
-BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}setuptools${PYTHON_SUFFIX}>0:devel/py-setuptools${PYTHON_SUFFIX}
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}setuptools${PYTHON_SUFFIX}>0:devel/py-setuptools${PYTHON_SUFFIX}
+BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}setuptools${PYTHON_SUFFIX}>0:devel/${_PYTHON_SHORTNAME}-setuptools${PYTHON_SUFFIX}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}setuptools${PYTHON_SUFFIX}>0:devel/${_PYTHON_SHORTNAME}-setuptools${PYTHON_SUFFIX}
.endif
# distutils support
@@ -481,7 +563,7 @@
exec(compile(open(__file__, 'rb').read().replace(b'\\r\\n', b'\\n'), __file__, 'exec'))"
PYDISTUTILS_CONFIGUREARGS?= # empty
PYDISTUTILS_BUILDARGS?= # empty
-PYDISTUTILS_INSTALLARGS?= -c -O1 --prefix=${PREFIX}
+PYDISTUTILS_INSTALLARGS?= -c -O1 --prefix=${PYTHONPREFIX}
.if defined(_PYTHON_FEATURE_DISTUTILS)
. if !defined(PYDISTUTILS_INSTALLNOSINGLE)
PYDISTUTILS_INSTALLARGS+= --single-version-externally-managed
@@ -564,19 +646,19 @@
.if defined(_PYTHON_BUILD_DEP)
BUILD_DEPENDS+= ${PYTHON_CMD}:${PYTHON_PORTSDIR}
.if defined(_WANTS_META_PORT)
-BUILD_DEPENDS+= python${_WANTS_META_PORT}:${_PYTHON_RELPORTDIR}${_WANTS_META_PORT}
+BUILD_DEPENDS+= python${_WANTS_META_PORT}:lang/python${_WANTS_META_PORT}
.endif
.endif
.if defined(_PYTHON_RUN_DEP)
RUN_DEPENDS+= ${PYTHON_CMD}:${PYTHON_PORTSDIR}
.if defined(_WANTS_META_PORT)
-RUN_DEPENDS+= python${_WANTS_META_PORT}:${_PYTHON_RELPORTDIR}${_WANTS_META_PORT}
+RUN_DEPENDS+= python${_WANTS_META_PORT}:lang/python${_WANTS_META_PORT}
.endif
.endif
.if defined(_PYTHON_TEST_DEP)
TEST_DEPENDS+= ${PYTHON_CMD}:${PYTHON_PORTSDIR}
.if defined(_WANTS_META_PORT)
-TEST_DEPENDS+= python${_WANTS_META_PORT}:${_PYTHON_RELPORTDIR}${_WANTS_META_PORT}
+TEST_DEPENDS+= python${_WANTS_META_PORT}:lang/python${_WANTS_META_PORT}
.endif
.endif
@@ -593,7 +675,7 @@
PYTHON_PLATFORM=${PYTHON_PLATFORM} \
PYTHON_SITELIBDIR=${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;} \
PYTHON_VER=${PYTHON_VER} \
- PYTHON_VERSION=python${_PYTHON_VERSION}
+ PYTHON_VERSION=${_PYTHON_IMPL}${_PYTHON_VERSION}
_USES_POST+= python
.endif # _INCLUDE_USES_PYTHON_MK
@@ -625,4 +707,22 @@
@(cd ${INSTALL_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYDISTUTILS_SETUP} ${PYDISTUTILS_INSTALL_TARGET} ${PYDISTUTILS_INSTALLARGS})
.endif
.endif # defined(_PYTHON_FEATURE_DISTUTILS)
+
+.if defined(PACKAGE_BUILDING) && ${PYTHON_DEFAULT} != ${PYTHON_VERSION} && !defined(_PYTHON_RECURSIVE)
+_PYTHON_ORIGINS= ${BUILD_DEPENDS:C/.*://g} ${RUN_DEPENDS:C/.*://g}
+_PYTHON_ORIGINS:= ${_PYTHON_ORIGINS:O}
+_PYTHON_ORIGINS_UNIQ=
+. for origin in ${_PYTHON_ORIGINS}
+. if !defined(IGNORE)
+. if empty(_PYTHON_ORIGINS_UNIQ:M${origin})
+_PYTHON_ORIGINS_UNIQ+= ${origin}
+python_version!= ${MAKE} -C ${PORTSDIR}/${origin} -V PYTHON_VERSION -D _PYTHON_RECURSIVE
+. if !empty(python_version) && ${PYTHON_VERSION} != ${python_version}
+IGNORE= you have ${PYTHON_DEFAULT} set as the default, and this needs ${PYTHON_VERSION}
+. endif
+. endif
+. endif
+. endfor
+.endif
+
.endif # defined(_POSTMKINCLUDED) && !defined(_INCLUDE_USES_PYTHON_POST_MK)
Index: Mk/Uses/zope.mk
===================================================================
--- Mk/Uses/zope.mk
+++ Mk/Uses/zope.mk
@@ -19,7 +19,7 @@
_ZOPE_PORTBRANCH= 2.13
_ZOPE_ALLBRANCHES= 2.13
-_PYTHON_VER_REQUIRED= python2.7
+_PYTHON_VER_REQUIRED= cpython2.7
.if defined(ZOPE_VERSION)
_ZOPE_VERSION:= ${ZOPE_VERSION}
Index: Mk/bsd.default-versions.mk
===================================================================
--- Mk/bsd.default-versions.mk
+++ Mk/bsd.default-versions.mk
@@ -70,12 +70,12 @@
PGSQL_DEFAULT?= 9.3
# Possible values: 5.6, 7.0
PHP_DEFAULT?= 5.6
-# Possible values: 2.7, 3.3, 3.4, 3.5
-PYTHON_DEFAULT?= 2.7
-# Possible values: 2.7
-PYTHON2_DEFAULT?= 2.7
-# Possible values: 3.3, 3.4, 3.5
-PYTHON3_DEFAULT?= 3.5
+# Possible values: cpython2.7, cpython3.3, cpython3.4, cpython3.5, pypy2.7 pypy3.3
+PYTHON_DEFAULT?= cpython2.7
+# Possible values: cpython2.7, pypy2.7
+PYTHON2_DEFAULT?= cpython2.7
+# Possible values: cpython3.3, cpython3.4, cpython3.5, pypy2.7 pypy3.3
+PYTHON3_DEFAULT?= cpython3.5
# Possible values: 2.0, 2.1, 2.2, 2.3
RUBY_DEFAULT?= 2.2
# Possible values: base, openssl, openssl-devel, libressl, libressl-devel
Index: archivers/py-attic/Makefile
===================================================================
--- archivers/py-attic/Makefile
+++ archivers/py-attic/Makefile
@@ -30,12 +30,6 @@
WITH_OPENSSL_PORT= yes
.endif
-.include <bsd.port.pre.mk>
-
-.if defined(PACKAGE_BUILDING) && ${PYTHON_VER} != ${PYTHON_DEFAULT}
-IGNORE= you have python ${PYTHON_DEFAULT} set as the default, and this needs ${PYTHON_VER}
-.endif
-
regression-test: build
${SETENV} PYTHONPATH="${PYDISTUTILS_BUILDPATH}:${PYTHONPATH}" \
${PYTHON_CMD} -m attic.testsuite.run
@@ -43,4 +37,4 @@
post-install:
${STRIP_CMD} ${STRIP_FILES:S,^,${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/attic/,}
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: archivers/py-borgbackup/Makefile
===================================================================
--- archivers/py-borgbackup/Makefile
+++ archivers/py-borgbackup/Makefile
@@ -33,13 +33,7 @@
WITH_OPENSSL_PORT=yes
.endif
-.include <bsd.port.pre.mk>
-
-.if defined(PACKAGE_BUILDING) && ${PYTHON_VER} != ${PYTHON_DEFAULT}
-IGNORE= you have python ${PYTHON_DEFAULT} set as the default, and this needs ${PYTHON_VER}
-.endif
-
post-install:
${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/borg/*.so
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: audio/libofa/Makefile
===================================================================
--- audio/libofa/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# Created by: Alexander Botero-Lowry <alex@foxybanana.com>
-# $FreeBSD: head/audio/libofa/Makefile 429142 2016-12-22 05:31:22Z dbn $
-
-PORTNAME= libofa
-PORTVERSION= 0.9.3
-PORTREVISION= 10
-CATEGORIES= audio
-
-MAINTAINER= jhale@FreeBSD.org
-COMMENT= The Open Fingerprint Architecture Library
-
-LICENSE= APL1 GPLv2
-LICENSE_COMB= dual
-LICENSE_GROUPS_APL1= OSI
-LICENSE_NAME_APL1= Adaptive Public License version 1.0
-LICENSE_FILE_APL1= ${WRKSRC}/COPYING
-LICENSE_PERMS_APL1= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
-
-LIB_DEPENDS= libfftw3.so:math/fftw3 \
- libexpat.so:textproc/expat2 \
- libcurl.so:ftp/curl
-
-USE_GITHUB= yes
-GH_ACCOUNT= tanob
-GH_TAGNAME= b75e45e
-
-PROJECTHOST= musicip-libofa
-USES= dos2unix libtool pathfix
-GNU_CONFIGURE= yes
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
-USE_LDCONFIG= yes
-INSTALL_TARGET= install-strip
-
-.include <bsd.port.mk>
Index: audio/libofa/distinfo
===================================================================
--- audio/libofa/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1482384437
-SHA256 (tanob-libofa-0.9.3-b75e45e_GH0.tar.gz) = d87c873bb0f52d6e068f60446574fffe6f11bc3cd492eceb5713818243a47911
-SIZE (tanob-libofa-0.9.3-b75e45e_GH0.tar.gz) = 384610
Index: audio/libofa/files/patch-configure
===================================================================
--- audio/libofa/files/patch-configure
+++ /dev/null
@@ -1,16 +0,0 @@
---- configure.orig 2016-07-26 15:10:24 UTC
-+++ configure
-@@ -20315,13 +20315,6 @@ _ACEOF
-
-
-
--if test "$GCC" = yes; then
-- dnlCFLAGS="$CFLAGS -Wall -O2"
-- CFLAGS="$CFLAGS -Wall -g"
--fi
--if test "$GXX" = yes; then
-- CXXFLAGS="$CXXFLAGS -Wall -g"
--fi
-
-
- echo "$as_me:$LINENO: checking for XML_ExpatVersion in -lexpat" >&5
Index: audio/libofa/files/patch-examples_example.cpp
===================================================================
--- audio/libofa/files/patch-examples_example.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- examples/example.cpp.orig 2016-07-26 15:10:24 UTC
-+++ examples/example.cpp
-@@ -7,6 +7,8 @@
-
- -------------------------------------------------------------------*/
-
-+#include <stdio.h>
-+#include <string.h>
- #include "protocol.h"
-
- AudioData* loadWaveFile(char *file);
Index: audio/libofa/files/patch-examples_protocol.cpp
===================================================================
--- audio/libofa/files/patch-examples_protocol.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
---- examples/protocol.cpp.orig 2016-07-26 15:10:24 UTC
-+++ examples/protocol.cpp
-@@ -8,11 +8,11 @@
- -------------------------------------------------------------------*/
- #include <stdio.h>
- #include <stdlib.h>
-+#include <string.h>
- #include <string>
- #include <map>
- #include <expat.h>
- #include <curl/curl.h>
--#include <curl/types.h>
- #include <curl/easy.h>
-
- using namespace std;
Index: audio/libofa/files/patch-examples_uselame.cpp
===================================================================
--- audio/libofa/files/patch-examples_uselame.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- examples/uselame.cpp.orig 2016-07-26 15:10:24 UTC
-+++ examples/uselame.cpp
-@@ -12,6 +12,7 @@
- #else
- #include <sys/wait.h>
- #endif
-+#include <unistd.h>
-
- AudioData *loadWaveFile(char *file);
-
Index: audio/libofa/files/patch-examples_wavefile.cpp
===================================================================
--- audio/libofa/files/patch-examples_wavefile.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- examples/wavefile.cpp.orig 2016-07-26 15:10:24 UTC
-+++ examples/wavefile.cpp
-@@ -11,6 +11,8 @@
- #include "io.h"
- #endif
- #include <fcntl.h>
-+#include <sys/types.h>
-+#include <unistd.h>
-
- static bool readBytes(int fd, unsigned char *buf, int size) {
- int ct = 0;
Index: audio/libofa/files/patch-lib_JAMA_tnt__math__utils.h
===================================================================
--- audio/libofa/files/patch-lib_JAMA_tnt__math__utils.h
+++ /dev/null
@@ -1,33 +0,0 @@
---- lib/JAMA/tnt_math_utils.h.orig 2016-07-26 15:10:24 UTC
-+++ lib/JAMA/tnt_math_utils.h
-@@ -20,6 +20,14 @@ inline const _Tp& max(const _Tp& __a, co
- namespace TNT
- {
- /**
-+ @returns the absolute value of a real (no-complex) scalar.
-+*/
-+template <class Real>
-+Real abs(const Real &a)
-+{
-+ return (a > 0 ? a : -a);
-+}
-+/**
- @returns hypotenuse of real (non-complex) scalars a and b by
- avoiding underflow/overflow
- using (a * sqrt( 1 + (b/a) * (b/a))), rather than
-@@ -56,15 +64,6 @@ Scalar max(const Scalar &a, const Scalar
- }
- */
-
--/**
-- @returns the absolute value of a real (no-complex) scalar.
--*/
--template <class Real>
--Real abs(const Real &a)
--{
-- return (a > 0 ? a : -a);
--}
--
- }
- #endif
- /* MATH_UTILS_H */
Index: audio/libofa/files/patch-lib_signal__op.cpp
===================================================================
--- audio/libofa/files/patch-lib_signal__op.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- lib/signal_op.cpp.orig 2016-07-26 15:10:24 UTC
-+++ lib/signal_op.cpp
-@@ -13,6 +13,7 @@
-
-
- #include <math.h>
-+#include <stdlib.h>
- #include "signal_op.h"
- #include "AFLIB/aflibConverter.h"
- #include "error_op.h"
Index: audio/libofa/pkg-descr
===================================================================
--- audio/libofa/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-The Open Fingerprint Architecture (OFA) Library normalizes, extracts
-frequencies, and creates an array representing the frequency data in an audio
-file.
-
-WWW: http://code.google.com/p/musicip-libofa/
Index: audio/libofa/pkg-plist
===================================================================
--- audio/libofa/pkg-plist
+++ /dev/null
@@ -1,6 +0,0 @@
-include/ofa1/ofa.h
-lib/libofa.a
-lib/libofa.so
-lib/libofa.so.0
-lib/libofa.so.0.0.0
-libdata/pkgconfig/libofa.pc
Index: audio/lollypop/Makefile
===================================================================
--- audio/lollypop/Makefile
+++ audio/lollypop/Makefile
@@ -34,10 +34,4 @@
SUB_FILES= pkg-message
-.include <bsd.port.pre.mk>
-
-.if defined(PACKAGE_BUILDING) && ${PYTHON_VER} != ${PYTHON_DEFAULT}
-IGNORE= you have python ${PYTHON_DEFAULT} set as the default, and this needs ${PYTHON_VER}
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: biology/libsbml/Makefile
===================================================================
--- biology/libsbml/Makefile
+++ biology/libsbml/Makefile
@@ -30,7 +30,7 @@
PYTHON_USES= python
PYTHON_CMAKE_ON= -DWITH_PYTHON:BOOL=ON \
-DPYTHON_INCLUDE_DIR:STRING="${PYTHON_INCLUDEDIR}" \
- -DPYTHON_LIBRARY:STRING="${PYTHONBASE}/lib/lib${PYTHON_VERSION}.so" \
+ -DPYTHON_LIBRARY:STRING="${PYTHON_LIB}" \
-DPYTHON_EXECUTABLE:STRING="${PYTHON_CMD}"
RUBY_BUILD_DEPENDS= swig2.0:devel/swig20
Index: cad/freecad/Makefile
===================================================================
--- cad/freecad/Makefile
+++ cad/freecad/Makefile
@@ -28,7 +28,7 @@
libboost_thread.so:devel/boost-libs \
libarea.so:devel/libarea \
libmed.so:french/med \
- libshiboken-${PYTHON_VERSION}.so:devel/shiboken
+ libshiboken-python${PYTHON_VER}.so:devel/shiboken
BROKEN_FreeBSD_9= does not build on FreeBSD 9.x
Index: comms/wsjt/Makefile
===================================================================
--- comms/wsjt/Makefile
+++ comms/wsjt/Makefile
@@ -38,13 +38,10 @@
# Adding this breaks configure
#LDFLAGS+= -shared
VERSION= 10
-PLIST_SUB= PYVER=${PYTHON_VERSION:S/python//} \
- VERSION=${VERSION}
+PLIST_SUB= VERSION=${VERSION}
OPTIONS_DEFINE= DOCS
-.include <bsd.port.pre.mk>
-
.if defined(BOOTSTRAP) || defined(SVN_FETCH)
#portlint freaks over this but it's only for dev. so ignore.
FETCH_DEPENDS+= svn:devel/subversion
@@ -103,8 +100,4 @@
${INSTALL_DATA} ${WRKSRC}/${d} ${STAGEDIR}${DOCSDIR}
.endfor
-.if defined(PACKAGE_BUILDING) && ${PYTHON_VER} != ${PYTHON_DEFAULT}
-IGNORE= you have python ${PYTHON_DEFAULT} set as the default, and this needs ${PYTHON_VER}
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: comms/wspr/Makefile
===================================================================
--- comms/wspr/Makefile
+++ comms/wspr/Makefile
@@ -31,7 +31,6 @@
#LDFLAGS+= -shared
VERSION= 4.00
-.include <bsd.port.pre.mk>
pre-configure:
@${CP} ${FILESDIR}/wspr.sh.in ${WRKSRC}
@@ -63,8 +62,4 @@
.endif
.endif
-.if defined(PACKAGE_BUILDING) && ${PYTHON_VER} != ${PYTHON_DEFAULT}
-IGNORE= you have python ${PYTHON_DEFAULT} set as the default, and this needs ${PYTHON_VER}
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: databases/metakit/Makefile
===================================================================
--- databases/metakit/Makefile
+++ databases/metakit/Makefile
@@ -23,43 +23,28 @@
OPTIONS_DEFINE= PYTHON TCL DOCS
OPTIONS_DEFAULT= PYTHON
+OPTIONS_SUB= yes
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MPYTHON}
-USES+= python
-CONFIGURE_ARGS+= --with-python=${LOCALBASE}
-CATEGORIES+= python
-PLIST_SUB+= WITH_PYTHON=""
-.else
-PLIST_SUB+= WITH_PYTHON="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MTCL}
-USES+= tcl:85
-CATEGORIES+= tcl
-CONFIGURE_ARGS+=--with-tcl=${TCL_INCLUDEDIR}
-CONFIGURE_ENV+= TCL_LIBDIR=${TCL_LIBDIR}
-PLIST_SUB+= TCL_V="${TCL_VER}"
-PLIST_SUB+= WITH_TCL=""
-.else
-PLIST_SUB+= WITH_TCL="@comment "
-.endif
+PYTHON_CATEGORIES= python
+PYTHON_CONFIGURE_WITH= python=${PYTHON_INCLUDEDIR},${PYTHON_SITELIBDIR}
+PYTHON_USES= python
+
+TCL_CATEGORIES= tcl
+TCL_CONFIGURE_ENV= TCL_LIBDIR=${TCL_LIBDIR}
+TCL_CONFIGURE_WITH= tcl=${TCL_INCLUDEDIR}
+TCL_PLIST_SUB= TCL_V="${TCL_VER}"
+TCL_USES= tcl:85
pre-patch:
${REINPLACE_CMD} -e "s=doc/==" ${WRKSRC}/../Metakit.html
${REINPLACE_CMD} -e "s|= tclsh|=${TCLSH}|" \
${WRKSRC}/../unix/Makefile.in
- ${REINPLACE_CMD} -e "s=python2.[0-9]=${PYTHON_VERSION}=" \
- ${WRKSRC}/../unix/Makefile.in ${WRKSRC}/../unix/configure
-post-build:
-.if ${PORT_OPTIONS:MPYTHON}
+post-build-PYTHON-on:
${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
${WRKSRC}/../python
${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
${WRKSRC}/../python
-.endif
pre-install:
@${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}
@@ -74,12 +59,12 @@
${INSTALL_DATA} ${WRKSRC}/../Metakit.html ${WRKSRC}/../CHANGES \
${WRKSRC}/../README ${STAGEDIR}${DOCSDIR}
-test:
+do-test:
@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} test)
-.if ${PORT_OPTIONS:MTCL}
+
+do-test-TCL-on:
@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} test-tcl)
-.endif
.include <bsd.port.mk>
Index: databases/metakit/pkg-plist
===================================================================
--- databases/metakit/pkg-plist
+++ databases/metakit/pkg-plist
@@ -4,12 +4,12 @@
include/mk4str.inl
lib/libmk4.so
lib/libmk4.so.0
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/Mk4py.so
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/metakit.py
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/metakit.pyc
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/metakit.pyo
-%%WITH_TCL%%lib/tcl%%TCL_V%%/Mk4tcl/Mk4tcl.so
-%%WITH_TCL%%lib/tcl%%TCL_V%%/Mk4tcl/pkgIndex.tcl
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/Mk4py.so
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/metakit.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/metakit.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/metakit.pyo
+%%TCL%%lib/tcl%%TCL_V%%/Mk4tcl/Mk4tcl.so
+%%TCL%%lib/tcl%%TCL_V%%/Mk4tcl/pkgIndex.tcl
%%PORTDOCS%%%%DOCSDIR%%/api/c4_Bytes.html
%%PORTDOCS%%%%DOCSDIR%%/api/c4_BytesProp.html
%%PORTDOCS%%%%DOCSDIR%%/api/c4_BytesProp_desc.html
Index: databases/py-sqlrelay/Makefile
===================================================================
--- databases/py-sqlrelay/Makefile
+++ databases/py-sqlrelay/Makefile
@@ -35,7 +35,7 @@
post-patch:
${PERL} -i -p \
- -e 's,"2\.4" "2\.3" "2\.2" "2\.1",${PYTHON_VERSION:S/^python//},g;' \
+ -e 's,"2\.4" "2\.3" "2\.2" "2\.1",${PYTHON_VER},g;' \
${WRKSRC}/configure
post-install:
Index: databases/py33-gdbm/Makefile
===================================================================
--- databases/py33-gdbm/Makefile
+++ databases/py33-gdbm/Makefile
@@ -2,6 +2,6 @@
MASTERDIR= ${.CURDIR}/../py-gdbm
-PYTHON_VERSION= python3.3
+PYTHON_VERSION= cpython3.3
.include "${MASTERDIR}/Makefile"
Index: databases/py33-sqlite3/Makefile
===================================================================
--- databases/py33-sqlite3/Makefile
+++ databases/py33-sqlite3/Makefile
@@ -2,6 +2,6 @@
MASTERDIR= ${.CURDIR}/../py-sqlite3
-PYTHON_VERSION= python3.3
+PYTHON_VERSION= cpython3.3
.include "${MASTERDIR}/Makefile"
Index: databases/py34-gdbm/Makefile
===================================================================
--- databases/py34-gdbm/Makefile
+++ databases/py34-gdbm/Makefile
@@ -2,6 +2,6 @@
MASTERDIR= ${.CURDIR}/../py-gdbm
-PYTHON_VERSION= python3.4
+PYTHON_VERSION= cpython3.4
.include "${MASTERDIR}/Makefile"
Index: databases/py34-sqlite3/Makefile
===================================================================
--- databases/py34-sqlite3/Makefile
+++ databases/py34-sqlite3/Makefile
@@ -2,6 +2,6 @@
MASTERDIR= ${.CURDIR}/../py-sqlite3
-PYTHON_VERSION= python3.4
+PYTHON_VERSION= cpython3.4
.include "${MASTERDIR}/Makefile"
Index: databases/py35-gdbm/Makefile
===================================================================
--- databases/py35-gdbm/Makefile
+++ databases/py35-gdbm/Makefile
@@ -2,6 +2,6 @@
MASTERDIR= ${.CURDIR}/../py-gdbm
-PYTHON_VERSION= python3.5
+PYTHON_VERSION= cpython3.5
.include "${MASTERDIR}/Makefile"
Index: databases/py35-sqlite3/Makefile
===================================================================
--- databases/py35-sqlite3/Makefile
+++ databases/py35-sqlite3/Makefile
@@ -2,6 +2,6 @@
MASTERDIR= ${.CURDIR}/../py-sqlite3
-PYTHON_VERSION= python3.5
+PYTHON_VERSION= cpython3.5
.include "${MASTERDIR}/Makefile"
Index: deskutils/cairo-dock-plugins/Makefile
===================================================================
--- deskutils/cairo-dock-plugins/Makefile
+++ deskutils/cairo-dock-plugins/Makefile
@@ -27,7 +27,6 @@
USE_XORG= xrender
USES= cmake gettext pkgconfig python
LDFLAGS+= -L${LOCALBASE}/lib
-PLIST_SUB= PYVER="${PYTHON_VERSION:S/thon//}"
CMAKE_ARGS= -DROOT_PREFIX:PATH=${STAGEDIR}
OPTIONS_GROUP= INTEGR PLUGINS ADDON TPI
Index: deskutils/calibre/Makefile
===================================================================
--- deskutils/calibre/Makefile
+++ deskutils/calibre/Makefile
@@ -80,7 +80,7 @@
${PYSETUP} build)
do-install:
- @${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PYTHON_VERSION}/site-packages \
+ @${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR} \
${STAGEDIR}${PREFIX}/share/icons/hicolor \
${STAGEDIR}${PREFIX}/share/applications \
${STAGEDIR}${PREFIX}/share/desktop-directories \
Index: devel/Makefile
===================================================================
--- devel/Makefile
+++ devel/Makefile
@@ -4846,6 +4846,8 @@
SUBDIR += py3-vcversioner
SUBDIR += py3-xdg
SUBDIR += py3-yaml
+ SUBDIR += pypy-setuptools27
+ SUBDIR += pypy-setuptools33
SUBDIR += py_static_check
SUBDIR += pybugz
SUBDIR += pychecker
Index: devel/apr2/Makefile
===================================================================
--- devel/apr2/Makefile
+++ devel/apr2/Makefile
@@ -110,8 +110,8 @@
${REINPLACE_CMD} -e 's|%%OSVERSION%%|${OSVERSION}|g' ${WRKSRC}/build/apr_hints.m4
${REINPLACE_CMD} -e '1s|${SETENV} python|${PYTHON_CMD}|' \
${WRKSRC}/build/gen-build.py
- ${REINPLACE_CMD} -e 's|PrintPath python|PrintPath ${PYTHON_VERSION}|' \
- -e 's|python -c|${PYTHON_VERSION} -c|' \
+ ${REINPLACE_CMD} -e 's|`build/PrintPath python`|"${PYTHON_CMD}"|' \
+ -e 's|python -c|${PYTHON_CMD} -c|' \
${WRKSRC}/build/buildcheck.sh
pre-configure:
Index: devel/boost-all/pkg-message.python
===================================================================
--- devel/boost-all/pkg-message.python
+++ devel/boost-all/pkg-message.python
@@ -5,4 +5,4 @@
-I%%PYTHON_INCLUDEDIR%% -I%%LOCALBASE%%/include
Linker options:
- -L%%PYTHON_LIBDIR%% -L%%LOCALBASE%%/lib -lboost_python -l%%PYTHON_VERSION%%
+ -L%%LOCALBASE%%/lib -lboost_python %%PYTHON_LIB%%
Index: devel/boost-libs/Makefile
===================================================================
--- devel/boost-libs/Makefile
+++ devel/boost-libs/Makefile
@@ -47,7 +47,6 @@
@${REINPLACE_CMD} \
-e "s|%%LOCALBASE%%|${LOCALBASE}|g" \
-e "s|%%PYTHON_INCLUDEDIR%%|${PYTHON_INCLUDEDIR}|g" \
- -e "s|%%PYTHON_LIBDIR%%|${PYTHON_LIBDIR}|g" \
- -e "s|%%PYTHON_VERSION%%|${PYTHON_VERSION}|g" ${PKGMESSAGE}
+ -e "s|%%PYTHON_LIB%%|${PYTHON_LIB}|g" ${PKGMESSAGE}
.include <bsd.port.mk>
Index: devel/boost-python-libs/Makefile
===================================================================
--- devel/boost-python-libs/Makefile
+++ devel/boost-python-libs/Makefile
@@ -12,11 +12,6 @@
.include "${.CURDIR}/../boost-all/compiled.mk"
-MAKE_ENV+= PYTHON_ROOT="${LOCALBASE}"\
- PYTHON_VERSION="${PYTHON_VERSION}"\
- PYTHON_INCLUDES="${PYTHON_INCLUDEDIR}"\
- PYTHON_LIB_PATH="${PYTHON_LIBDIR}"
-
LIB_DEPENDS+= libboost_thread.so:devel/boost-libs
MAKE_ARGS+= --with-python
ALL_TARGET= stage
@@ -41,8 +36,7 @@
@${REINPLACE_CMD} \
-e "s|%%LOCALBASE%%|${LOCALBASE}|g" \
-e "s|%%PYTHON_INCLUDEDIR%%|${PYTHON_INCLUDEDIR}|g" \
- -e "s|%%PYTHON_LIBDIR%%|${PYTHON_LIBDIR}|g" \
- -e "s|%%PYTHON_VERSION%%|${PYTHON_VERSION}|g" ${PKGMESSAGE}
+ -e "s|%%PYTHON_LIB%%|${PYTHON_LIB}|g" ${PKGMESSAGE}
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libboost_python.so.${PORTVERSION}
.include <bsd.port.mk>
Index: devel/gnatcoll/Makefile
===================================================================
--- devel/gnatcoll/Makefile
+++ devel/gnatcoll/Makefile
@@ -23,7 +23,7 @@
GH_PROJECT= gprbuild:libgpr
GH_TAGNAME= 858f72c a2e9066:libgpr
-PYCOMPILE= ${PREFIX}/lib/${PYTHON_VERSION}/compileall.py
+PYCOMPILE= ${PYTHON_LIBDIR}/compileall.py
GNU_CONFIGURE= yes
ALL_TARGET= all
PORTDOCS= *
Index: devel/gps/Makefile
===================================================================
--- devel/gps/Makefile
+++ devel/gps/Makefile
@@ -33,7 +33,7 @@
USE_XORG= x11
USE_PERL5= build
USE_GNOME= glib20 pygobject3 gtk30 pango atk cairo gdkpixbuf2
-PYCOMPILE= ${PREFIX}/lib/${PYTHON_VERSION}/compileall.py
+PYCOMPILE= ${PYTHON_LIBDIR}/compileall.py
AWKREVDATE= '/Last Changed Date/ {print "\"s|unknown date|" $$4 "|\""}'
GPSVER= GPS_VERSION=${PORTVERSION}
ALL_TARGET= default
Index: devel/hgsvn/Makefile
===================================================================
--- devel/hgsvn/Makefile
+++ devel/hgsvn/Makefile
@@ -17,7 +17,6 @@
USES= python
USE_PYTHON= distutils autoplist
-PLIST_SUB= VERSION=${PORTVERSION} PYVER=${PYTHON_VERSION:S/python//}
NO_ARCH= YES
Index: devel/libclc/Makefile
===================================================================
--- devel/libclc/Makefile
+++ devel/libclc/Makefile
@@ -27,7 +27,7 @@
post-patch:
@${REINPLACE_CMD} -e 's|/usr/bin/python|${PYTHON_CMD}|g' \
- -e 's|"python |"${PYTHON_VERSION} |g' \
+ -e 's|"python |"${PYTHON_CMD} |g' \
${WRKSRC}/build/ninja_syntax.py \
${WRKSRC}/configure.py
Index: devel/libsearpc/Makefile
===================================================================
--- devel/libsearpc/Makefile
+++ devel/libsearpc/Makefile
@@ -38,7 +38,7 @@
post-install:
@${MKDIR} ${STAGEDIR}${SEALIB}
(cd ${STAGEDIR}${PREFIX}/lib && \
- ${COPYTREE_SHARE} ${PYTHON_VERSION} ${STAGEDIR}${PREFIX}/${SEALIB})
- ${RM} -r ${STAGEDIR}${PREFIX}/lib/${PYTHON_VERSION}
+ ${COPYTREE_SHARE} python${PYTHON_VER} ${STAGEDIR}${PREFIX}/${SEALIB})
+ ${RM} -r ${STAGEDIR}${PREFIX}/lib/python${PYTHON_VER}
.include <bsd.port.mk>
Index: devel/libsoup/Makefile
===================================================================
--- devel/libsoup/Makefile
+++ devel/libsoup/Makefile
@@ -20,7 +20,7 @@
.if !defined(REFERENCE_PORT)
USES+= gettext gmake gnome libtool pathfix pkgconfig \
- python:3:build sqlite:3 tar:xz
+ python:3:build shebangfix sqlite:3 tar:xz
USE_GNOME= glib20 intlhack introspection:build \
libxml2 referencehack
USE_LDCONFIG= yes
@@ -30,6 +30,7 @@
CPPFLAGS+= -I${LOCALBASE}/include
LIBS+= -L${LOCALBASE}/lib
INSTALL_TARGET= install-strip
+SHEBANG_FILES= ${WRKSRC}/libsoup/tld-parser.py
LIBVERSION= 1.7.0
PLIST_SUB= VERSION="2.4" LIBVERSION=${LIBVERSION}
@@ -45,8 +46,6 @@
post-patch:
@${REINPLACE_CMD} -e 's|-Wmissing-include-dirs||g' \
${WRKSRC}/configure
- @${REINPLACE_CMD} -e 's|env python|env ${PYTHON_VERSION}|g' \
- ${WRKSRC}/libsoup/tld-parser.py
@${REINPLACE_CMD} -e 's|DATADIRNAME=lib|DATADIRNAME=share|g' \
${WRKSRC}/configure
Index: devel/newt/Makefile
===================================================================
--- devel/newt/Makefile
+++ devel/newt/Makefile
@@ -57,7 +57,12 @@
post-patch-PYTHON-on:
@${REINPLACE_CMD} -e \
- '/PYTHONVERS/s|=.*|=${PYTHON_VERSION}|' ${WRKSRC}/configure
+ '/PYTHONVERS/s|=.*|=${PYTHON_CMD}|' ${WRKSRC}/configure
+ @${REINPLACE_CMD} \
+ -e '/mkdir -p $$$$ver;/d' \
+ -e 's|/\$$(libdir)/\$$\$$ver/site-packages|${PYTHON_SITELIBDIR}|g' \
+ -e 's|\$$\$$ver/||g' \
+ ${WRKSRC}/Makefile.in
post-install:
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/whiptail
Index: devel/py-cxx/pkg-plist
===================================================================
--- devel/py-cxx/pkg-plist
+++ devel/py-cxx/pkg-plist
@@ -14,7 +14,7 @@
%%PYTHON_SITELIBDIR%%/CXX/__init__.py
%%PYTHON_SITELIBDIR%%/CXX/__init__.pyc
%%PYTHON_SITELIBDIR%%/CXX/__init__.pyo
-share/%%PYTHON_VERSION%%/CXX/IndirectPythonInterface.cxx
-share/%%PYTHON_VERSION%%/CXX/cxx_extensions.cxx
-share/%%PYTHON_VERSION%%/CXX/cxxextensions.c
-share/%%PYTHON_VERSION%%/CXX/cxxsupport.cxx
+share/python%%PYTHON_VER%%/CXX/IndirectPythonInterface.cxx
+share/python%%PYTHON_VER%%/CXX/cxx_extensions.cxx
+share/python%%PYTHON_VER%%/CXX/cxxextensions.c
+share/python%%PYTHON_VER%%/CXX/cxxsupport.cxx
Index: devel/py-gobject/pkg-plist
===================================================================
--- devel/py-gobject/pkg-plist
+++ devel/py-gobject/pkg-plist
@@ -1,9 +1,9 @@
bin/pygobject-codegen-2.0
include/pygtk-2.0/pyglib.h
include/pygtk-2.0/pygobject.h
-lib/libpyglib-2.0-%%PYTHON_VERSION%%.so
-lib/libpyglib-2.0-%%PYTHON_VERSION%%.so.0
-lib/libpyglib-2.0-%%PYTHON_VERSION%%.so.0.0.0
+lib/libpyglib-2.0-python%%PYTHON_VER%%.so
+lib/libpyglib-2.0-python%%PYTHON_VER%%.so.0
+lib/libpyglib-2.0-python%%PYTHON_VER%%.so.0.0.0
%%PYTHON_SITELIBDIR%%/glib/__init__.py
%%PYTHON_SITELIBDIR%%/glib/__init__.pyc
%%PYTHON_SITELIBDIR%%/glib/__init__.pyo
Index: devel/py-ice/Makefile
===================================================================
--- devel/py-ice/Makefile
+++ devel/py-ice/Makefile
@@ -23,7 +23,7 @@
SHEBANG_FILES= ${BUILD_WRKSRC}/config/s2py.py
-MAKE_ENV+= PYTHON_VERSION=${PYTHON_VERSION}
+MAKE_ENV+= PYTHON=${PYTHON_CMD} PYTHON_LIBS=${PYTHON_LIB}
LIB_VRS= ${PORTVERSION:S|.||g:C|[0-9]$||}
PLIST_SUB= LIB_VERSION="${PORTVERSION}" LIB_VRS="${LIB_VRS}"
Index: devel/py-ocempgui/Makefile
===================================================================
--- devel/py-ocempgui/Makefile
+++ devel/py-ocempgui/Makefile
@@ -14,8 +14,8 @@
LICENSE= BSD2CLAUSE
-BUILD_DEPENDS= ${LOCALBASE}/include/${PYTHON_VERSION}/pygame/pygame.h:devel/py-game
-RUN_DEPENDS= ${LOCALBASE}/include/${PYTHON_VERSION}/pygame/pygame.h:devel/py-game
+BUILD_DEPENDS= ${PYTHON_INCLUDEDIR}/pygame/pygame.h:devel/py-game
+RUN_DEPENDS= ${PYTHON_INCLUDEDIR}/pygame/pygame.h:devel/py-game
USES= python:2
USE_GNOME= atk
Index: devel/py-pykde4/Makefile
===================================================================
--- devel/py-pykde4/Makefile
+++ devel/py-pykde4/Makefile
@@ -21,8 +21,7 @@
qmake_build moc_build uic_build rcc_build
CMAKE_ARGS+= -DWITH_PolkitQt:BOOL=FALSE \
- -DENABLE_PYTHON=ON \
- -DPYTHON_INCLUDE_DIR:PATH=${WRKDIR}/include/${PYTHON_VERSION}
+ -DPYTHON_INCLUDE_DIR:PATH=${WRKDIR}/include/python${PYTHON_VER}
SUB_FILES= kdebindings4.pth
SUB_LIST= PYTHONPREFIX_SITELIBDIR=${PYTHONPREFIX_SITELIBDIR}
Index: devel/py-pyshapelib/Makefile
===================================================================
--- devel/py-pyshapelib/Makefile
+++ devel/py-pyshapelib/Makefile
@@ -14,7 +14,7 @@
LICENSE= LGPL20
-USES= python
+USES= python:-2.7
USE_LDCONFIG= yes
USE_PYTHON= distutils
@@ -42,10 +42,4 @@
${INSTALL_DATA} ${WRKSRC}/$f ${STAGEDIR}${EXAMPLESDIR}
.endfor
-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_MAJOR_VER} != 2
-IGNORE= does not work with ${PYTHON_VERSION}
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: devel/py-setuptools27/Makefile
===================================================================
--- devel/py-setuptools27/Makefile
+++ devel/py-setuptools27/Makefile
@@ -3,7 +3,7 @@
PKGNAMESUFFIX= ${PYTHON_SUFFIX}
-PYTHON_VERSION= python2.7
+PYTHON_VERSION= cpython2.7
MASTERDIR= ${.CURDIR}/../py-setuptools
Index: devel/py-setuptools33/Makefile
===================================================================
--- devel/py-setuptools33/Makefile
+++ devel/py-setuptools33/Makefile
@@ -3,7 +3,7 @@
PKGNAMESUFFIX= ${PYTHON_SUFFIX}
-PYTHON_VERSION= python3.3
+PYTHON_VERSION= cpython3.3
MASTERDIR= ${.CURDIR}/../py-setuptools
Index: devel/py-setuptools34/Makefile
===================================================================
--- devel/py-setuptools34/Makefile
+++ devel/py-setuptools34/Makefile
@@ -3,7 +3,7 @@
PKGNAMESUFFIX= ${PYTHON_SUFFIX}
-PYTHON_VERSION= python3.4
+PYTHON_VERSION= cpython3.4
MASTERDIR= ${.CURDIR}/../py-setuptools
Index: devel/py-setuptools35/Makefile
===================================================================
--- devel/py-setuptools35/Makefile
+++ devel/py-setuptools35/Makefile
@@ -3,7 +3,7 @@
PKGNAMESUFFIX= ${PYTHON_SUFFIX}
-PYTHON_VERSION= python3.5
+PYTHON_VERSION= cpython3.5
MASTERDIR= ${.CURDIR}/../py-setuptools
Index: devel/pygobject3-common/Makefile
===================================================================
--- devel/pygobject3-common/Makefile
+++ devel/pygobject3-common/Makefile
@@ -65,7 +65,7 @@
USES+= python:3
BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/py3cairo.pc:graphics/py3-cairo
RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/py3cairo.pc:graphics/py3-cairo
-PLIST_SUB+= PYTVER=${PYTHON_VER:S/.//}
+PLIST_SUB+= PYTVER=${PYTHON_SUFFIX}
.endif
post-install:
Index: devel/pypy-setuptools27/Makefile
===================================================================
--- /dev/null
+++ devel/pypy-setuptools27/Makefile
@@ -0,0 +1,10 @@
+# Created by: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
+# $FreeBSD: head/devel/py-setuptools27/Makefile 352367 2014-04-26 19:31:10Z sunpoet $
+
+PKGNAMESUFFIX= ${PYTHON_SUFFIX}
+
+PYTHON_VERSION= pypy2.7
+
+MASTERDIR= ${.CURDIR}/../py-setuptools
+
+.include "${MASTERDIR}/Makefile"
Index: devel/pypy-setuptools33/Makefile
===================================================================
--- /dev/null
+++ devel/pypy-setuptools33/Makefile
@@ -0,0 +1,10 @@
+# Created by: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
+# $FreeBSD: head/devel/pypy-setuptools33/Makefile 352367 2014-04-26 19:31:10Z sunpoet $
+
+PKGNAMESUFFIX= ${PYTHON_SUFFIX}
+
+PYTHON_VERSION= pypy3.3
+
+MASTERDIR= ${.CURDIR}/../py-setuptools
+
+.include "${MASTERDIR}/Makefile"
Index: devel/pyside-tools/Makefile
===================================================================
--- devel/pyside-tools/Makefile
+++ devel/pyside-tools/Makefile
@@ -13,7 +13,7 @@
LICENSE_COMB= multi
BUILD_DEPENDS= pyside${PYTHON_PKGNAMESUFFIX}>=1.0.9:devel/pyside
-LIB_DEPENDS= libshiboken-${PYTHON_VERSION}.so:devel/shiboken
+LIB_DEPENDS= libshiboken-python${PYTHON_VER}.so:devel/shiboken
RUN_DEPENDS= pyside${PYTHON_PKGNAMESUFFIX}>=1.0.9:devel/pyside
USE_GITHUB= yes
Index: devel/pyside/Makefile
===================================================================
--- devel/pyside/Makefile
+++ devel/pyside/Makefile
@@ -16,7 +16,7 @@
LIB_DEPENDS= libapiextractor.so:devel/apiextractor \
libgenrunner.so:devel/generatorrunner \
- libshiboken-${PYTHON_VERSION}.so:devel/shiboken
+ libshiboken-python${PYTHON_VER}.so:devel/shiboken
CMAKE_ARGS+= -DGL_H:FILEPATH="${LOCALBASE}/include/GL/gl.h" \
-DGL_INCLUDE_DIR:FILEPATH="${LOCALBASE}/include"
@@ -26,8 +26,7 @@
phonon rcc_build script scripttools \
svg uic_build webkit
-PLIST_SUB= PORTVERSION=${PORTVERSION} \
- PYTHON_VERSION=${PYTHON_VERSION}
+PLIST_SUB= PORTVERSION=${PORTVERSION}
USES= cmake python:2 tar:bzip2
USE_LDCONFIG= yes
Index: devel/pyside/pkg-plist
===================================================================
--- devel/pyside/pkg-plist
+++ devel/pyside/pkg-plist
@@ -30,12 +30,12 @@
include/PySide/pysidesignal.h
include/PySide/pysideweakref.h
include/PySide/signalmanager.h
-lib/cmake/PySide-%%PORTVERSION%%/PySideConfig-%%PYTHON_VERSION%%.cmake
+lib/cmake/PySide-%%PORTVERSION%%/PySideConfig-python%%PYTHON_VER%%.cmake
lib/cmake/PySide-%%PORTVERSION%%/PySideConfig.cmake
lib/cmake/PySide-%%PORTVERSION%%/PySideConfigVersion.cmake
-lib/libpyside-%%PYTHON_VERSION%%.so
-lib/libpyside-%%PYTHON_VERSION%%.so.1.2
-lib/libpyside-%%PYTHON_VERSION%%.so.%%PORTVERSION%%
+lib/libpyside-python%%PYTHON_VER%%.so
+lib/libpyside-python%%PYTHON_VER%%.so.1.2
+lib/libpyside-python%%PYTHON_VER%%.so.%%PORTVERSION%%
%%PYTHON_SITELIBDIR%%/PySide/QtCore.so
%%PYTHON_SITELIBDIR%%/PySide/QtDeclarative.so
%%PYTHON_SITELIBDIR%%/PySide/QtGui.so
Index: devel/pysvn/Makefile
===================================================================
--- devel/pysvn/Makefile
+++ devel/pysvn/Makefile
@@ -21,7 +21,7 @@
PYDISTUTILS_CONFIGUREARGS= --apr-inc-dir=${LOCALBASE}/include/apr-1 \
--svn-root-dir=${LOCALBASE}
-PLIST_SUB= PYTHONVER=${PYTHON_VERSION:S/./_/:S/python//}
+PLIST_SUB= PYTHONVER=${PYTHON_VER:S/./_/}
PLIST_FILES= %%PYTHON_SITELIBDIR%%/${PORTNAME}/__init__.py \
%%PYTHON_SITELIBDIR%%/${PORTNAME}/_pysvn_%%PYTHONVER%%.so
Index: devel/shiboken/Makefile
===================================================================
--- devel/shiboken/Makefile
+++ devel/shiboken/Makefile
@@ -16,8 +16,7 @@
LIB_DEPENDS= libxml2.so:textproc/libxml2 \
libxslt.so:textproc/libxslt
-PLIST_SUB= PORTVERSION=${PORTVERSION} \
- PYTHON_VERSION=${PYTHON_VERSION}
+PLIST_SUB= PORTVERSION=${PORTVERSION}
USE_QT4= corelib qmake_build qtestlib moc_build network \
uic_build rcc_build xml xmlpatterns
Index: devel/shiboken/pkg-plist
===================================================================
--- devel/shiboken/pkg-plist
+++ devel/shiboken/pkg-plist
@@ -18,12 +18,12 @@
include/shiboken/shibokenmacros.h
include/shiboken/threadstatesaver.h
include/shiboken/typeresolver.h
-lib/cmake/Shiboken-%%PORTVERSION%%/ShibokenConfig-%%PYTHON_VERSION%%.cmake
+lib/cmake/Shiboken-%%PORTVERSION%%/ShibokenConfig-python%%PYTHON_VER%%.cmake
lib/cmake/Shiboken-%%PORTVERSION%%/ShibokenConfig.cmake
lib/cmake/Shiboken-%%PORTVERSION%%/ShibokenConfigVersion.cmake
-lib/libshiboken-%%PYTHON_VERSION%%.so
-lib/libshiboken-%%PYTHON_VERSION%%.so.1
-lib/libshiboken-%%PYTHON_VERSION%%.so.%%PORTVERSION%%
+lib/libshiboken-python%%PYTHON_VER%%.so
+lib/libshiboken-python%%PYTHON_VER%%.so.1
+lib/libshiboken-python%%PYTHON_VER%%.so.%%PORTVERSION%%
libdata/pkgconfig/shiboken.pc
%%PYTHON_SITELIBDIR%%/shiboken.so
%%PORTDOCS%%%%DOCSDIR%%/.buildinfo
Index: devel/staf/Makefile
===================================================================
--- devel/staf/Makefile
+++ devel/staf/Makefile
@@ -77,7 +77,7 @@
use_python=py3kplist
PYTHON_MAKE_ARGS= PYTHON_V${PYTHON_SUFFIX}_ROOT=${LOCALBASE} \
PYTHON_V${PYTHON_SUFFIX}_INCLUDEDIRS=${PYTHON_INCLUDEDIR} \
- PYTHON_V${PYTHON_SUFFIX}_LIBS=${PYTHON_VERSION}${PYTHON_ABIVER} \
+ PYTHON_V${PYTHON_SUFFIX}_LIBS=${PYTHON_LIB} \
PYTHON_BUILD_V${PYTHON_SUFFIX}=1
MAKE_JOBS_UNSAFE= yes
Index: editors/libreoffice/Makefile
===================================================================
--- editors/libreoffice/Makefile
+++ editors/libreoffice/Makefile
@@ -255,8 +255,8 @@
GPERF=${LOCALBASE}/bin/gperf \
OPENCOLLADA_CFLAGS="${COLLADA_CFLAGS}" \
OPENCOLLADA_LIBS="${COLLADA_LIBS}" \
- PYTHON_CFLAGS="`${PYTHON_VERSION}-config --cflags`" \
- PYTHON_LIBS="`${PYTHON_VERSION}-config --libs`"
+ PYTHON_CFLAGS="`${PYTHON_CMD}-config --cflags`" \
+ PYTHON_LIBS="`${PYTHON_CMD}-config --libs`"
MAKE_ENV+= CXXFLAGS_WARN="${CXXFLAGS_WARN}"
MAKE_ENV+= GNUSED=${LOCALBASE}/bin/gsed
Index: editors/libreoffice4/Makefile
===================================================================
--- editors/libreoffice4/Makefile
+++ editors/libreoffice4/Makefile
@@ -113,8 +113,8 @@
GPERF=${LOCALBASE}/bin/gperf \
OPENCOLLADA_CFLAGS="${COLLADA_CFLAGS}" \
OPENCOLLADA_LIBS="${COLLADA_LIBS}" \
- PYTHON_CFLAGS="`${PYTHON_VERSION}-config --cflags`" \
- PYTHON_LIBS="`${PYTHON_VERSION}-config --libs`"
+ PYTHON_CFLAGS="`${PYTHON_CMD}-config --cflags`" \
+ PYTHON_LIBS="`${PYTHON_CMD}-config --libs`"
CONFIGURE_ARGS+= --disable-dependency-tracking \
--disable-fetch-external \
Index: emulators/gns3/Makefile
===================================================================
--- emulators/gns3/Makefile
+++ emulators/gns3/Makefile
@@ -30,8 +30,7 @@
DESKTOP_ENTRIES= "GNS3" "${COMMENT}" "" "${PORTNAME}" "System;Emulator;" true
-PLIST_SUB= PYTHON_VERSION=${PYTHON_VERSION:S/python//} \
- VERSION=${PORTVERSION}
+PLIST_SUB= VERSION=${PORTVERSION}
OPTIONS_DEFINE= DOCS
Index: games/kiki/Makefile
===================================================================
--- games/kiki/Makefile
+++ games/kiki/Makefile
@@ -17,7 +17,8 @@
USE_GL= gl glu glut
USE_SDL= sdl mixer image
DOS2UNIX_REGEX= .*/(Makefile|.*\.cpp|.*\.h|.*\.i)$
-MAKE_ENV= PYTHON_VER=${PYTHON_VERSION:C/^python//}
+MAKE_ENV= PYTHON_INCLUDEDIR=${PYTHON_INCLUDEDIR} PYTHON_LIB=${PYTHON_LIB} \
+ PYTHON_LIBDIR=${PYTHON_LIBDIR} PYTHON_VER=${PYTHON_VER}
CXXFLAGS+= -include sys/limits.h -fpermissive
WRKSRC= ${WRKDIR}/kiki
Index: games/kiki/files/patch-linux-Makefile
===================================================================
--- games/kiki/files/patch-linux-Makefile
+++ games/kiki/files/patch-linux-Makefile
@@ -19,15 +19,15 @@
- $(PYTHONHOME)/lib-dynload/time.so \
- $(PYTHONHOME)/lib-dynload/_random.so
+X11_INCLUDES = -I ${LOCALBASE}/include/
-+PYTHON_INCLUDES = -I ${LOCALBASE}/include/python$(PYTHON_VER)
++PYTHON_INCLUDES = -I ${PYTHON_INCLUDEDIR}
+
+SDLCFLAGS = $(shell ${SDL_CONFIG} --cflags)
+SDLLIBS = $(shell ${SDL_CONFIG} --libs) -lSDL_image -lSDL_mixer
+
+GLLIBS = -lglut -lGLU -lGL -L${LOCALBASE}/lib
+
-+PYTHONHOME = ${LOCALBASE}/lib/python$(PYTHON_VER)/
-+PYTHONLIBS = $(PYTHONHOME)/config/libpython$(PYTHON_VER).a -lutil -lpython${PYTHON_VER}
++PYTHONHOME = ${PYTHON_LIBDIR}
++PYTHONLIBS = $(PYTHONHOME)/config/libpython$(PYTHON_VER).a -lutil ${PYTHON_LIB}
# change this, if the kodilib directory isn't parallel to the kiki directory
Index: games/pykawari/Makefile
===================================================================
--- games/pykawari/Makefile
+++ games/pykawari/Makefile
@@ -20,8 +20,7 @@
USES= gmake python zip
MAKEFILE= gcc.mak
-MAKE_ARGS= CXX="${CXX}" CFLAGS="${CXXFLAGS}" \
- PYTHONBASE="${PYTHONBASE}" PYTHON_VERSION="${PYTHON_VERSION}"
+MAKE_ARGS= CXX="${CXX}" CFLAGS="${CXXFLAGS}" PYTHON_LIB="${PYTHON_LIB}"
CFLAGS+= -I. -DNDEBUG -I${PYTHON_INCLUDEDIR} -fPIC
Index: games/pykawari/files/patch-build_src_gcc.mak
===================================================================
--- games/pykawari/files/patch-build_src_gcc.mak
+++ games/pykawari/files/patch-build_src_gcc.mak
@@ -44,7 +44,7 @@
CFLAGS := $(CFLAGS_STLP) -DHAVE_SSTREAM $(CFLAGS)
LDFLAGS := $(LDFLAGS) $(LDFLAGS_STLP)
- LIBS := $(LIBS) $(LIBS_STLP)
-+ LIBS := $(LIBS) -L${PYTHONBASE}/lib -l${PYTHON_VERSION}
++ LIBS := $(LIBS) ${PYTHON_LIB}
endif
ifeq ($(SAORI_NATIVE),yes)
@@ -53,7 +53,7 @@
CFLAGS_PYTHON = -I$(shell python -c "import sys; print sys.prefix+'/include/python'+sys.version[:3]")
CFLAGS := $(CFLAGS_PYTHON) $(CFLAGS)
- LIBS := $(LIBS) -lpython$(PYTHON_VER)
-+ LIBS := $(LIBS) -L${PYTHONBASE}/lib -l${PYTHON_VERSION}
++ LIBS := $(LIBS) ${PYTHON_LIB}
endif
endif
Index: graphics/lcms-python/Makefile
===================================================================
--- graphics/lcms-python/Makefile
+++ graphics/lcms-python/Makefile
@@ -17,10 +17,10 @@
BUILD_WRKSRC= ${WRKSRC}/python
INSTALL_WRKSRC= ${WRKSRC}/python
-USES= python:2
+USES= python:-2.7
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-python
-CONFIGURE_ENV= PYTHON="${PYTHON_CMD}"
+MAKE_ENV= PYTHON_INCLUDEDIR=${PYTHON_INCLUDEDIR}
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
Index: graphics/lcms-python/files/patch-python_Makefile.in
===================================================================
--- graphics/lcms-python/files/patch-python_Makefile.in
+++ graphics/lcms-python/files/patch-python_Makefile.in
@@ -8,24 +8,15 @@
am__lcms_la_OBJECTS = _lcms_la-lcms_wrap.lo
_lcms_la_OBJECTS = $(am__lcms_la_OBJECTS)
_lcms_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-@@ -157,7 +156,7 @@
- PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
- PYTHON_PLATFORM = @PYTHON_PLATFORM@
- PYTHON_PREFIX = @PYTHON_PREFIX@
--PYTHON_VERSION = @PYTHON_VERSION@
-+PYTH_VERSION = @PYTHON_VERSION@
- RANLIB = @RANLIB@
- SED = @SED@
- SET_MAKE = @SET_MAKE@
@@ -243,9 +242,9 @@
_lcms_la_LDFLAGS = -no-undefined -module -avoid-version \
-L$(LCMS_PYLIB)/config
-_lcms_la_LIBADD = $(top_builddir)/src/liblcms.la -lpython$(PYTHON_VERSION)
-+_lcms_la_LIBADD = -llcms -lpython$(PYTH_VERSION)
++_lcms_la_LIBADD = -llcms
_lcms_la_SOURCES = lcms_wrap.cxx
-_lcms_la_CPPFLAGS = -I$(PYTHON_PREFIX)/include/python$(PYTHON_VERSION) \
-+_lcms_la_CPPFLAGS = -I$(PYTHON_PREFIX)/include/python$(PYTH_VERSION) \
++_lcms_la_CPPFLAGS = -I$(PYTHON_INCLUDEDIR) \
-I$(LCMS_PYINCLUDE) \
$(AM_CPPFLAGS)
Index: graphics/mapserver/Makefile
===================================================================
--- graphics/mapserver/Makefile
+++ graphics/mapserver/Makefile
@@ -30,6 +30,7 @@
WMS WFS WCS FASTCGI DEBUG CAIRO CAIRO_SVG \
CLIENT_WMS CLIENT_WFS
OPTIONS_DEFAULT= FRIBIDI GDAL GEOS CLIENT_WMS CLIENT_WFS KML CAIRO_SVG
+OPTIONS_SUB= yes
CAIRO_SVG_DESC= Cairo SVG parser support
GDAL_DESC= GDAL library support
FRIBIDI_DESC= Fribidi library support
@@ -38,146 +39,69 @@
WFS_DESC= WFS Server support
WCS_DESC= WCS Server support
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MPYTHON}
-USES+= python:2
-BUILD_DEPENDS+= swig2.0:devel/swig20
-CMAKE_ARGS+= -DWITH_PYTHON=yes
-PLIST_SUB+= PYTHON=""
-MAP_EGG= MapScript-${PORTVERSION}-${PYTHON_VERSION:S/thon//}
-PLIST_SUB+= MAP_EGG=${MAP_EGG}
-.else
-PLIST_SUB+= PYTHON="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MCAIRO}
-LIB_DEPENDS+= libcairo.so:graphics/cairo \
- libexpat.so:textproc/expat2
-CMAKE_ARGS+= -DWITH_CAIRO=1
-.else
-CMAKE_ARGS+= -DWITH_CAIRO=0
-.endif
-
-.if ${PORT_OPTIONS:MFRIBIDI}
-LIB_DEPENDS+= libfribidi.so:converters/fribidi
-CMAKE_ARGS+= -DWITH_FRIBIDI=1
-.else
-CMAKE_ARGS+= -DWITH_FRIBIDI=0
-.endif
-
-.if ${PORT_OPTIONS:MCAIRO_SVG}
-LIB_DEPENDS+= libcairo.so:graphics/cairo \
- libsvg-cairo.so:graphics/libsvg-cairo \
- libexpat.so:textproc/expat2
-CMAKE_ARGS+= -DWITH_SVGCAIRO=1 -DWITH_CAIRO=1
-USES+= pkgconfig
-.else
-CMAKE_ARGS+= -DWITH_SVGCAIRO=0
-.endif
-
-.if ${PORT_OPTIONS:MKML}
-LIB_DEPENDS+= libxml2.so:textproc/libxml2
-CMAKE_ARGS+= -DWITH_KML=1
-.else
-CMAKE_ARGS+= -DWITH_KML=0
-.endif
-
-.if ${PORT_OPTIONS:MWMS}
-CMAKE_ARGS+= -DWITH_WMS=1
-.else
-CMAKE_ARGS+= -DWITH_WMS=0
-.endif
-
-.if ${PORT_OPTIONS:MWFS}
-CMAKE_ARGS+= -DWITH_WFS=1
-.else
-CMAKE_ARGS+= -DWITH_WFS=0
-.endif
-
-.if ${PORT_OPTIONS:MWCS}
-CMAKE_ARGS+= -DWITH_WCS=1
-.else
-CMAKE_ARGS+= -DWITH_WCS=0
-.endif
-
-.if ${PORT_OPTIONS:MGDAL}
-USES+= iconv
-LIB_DEPENDS+= libgdal.so:graphics/gdal
-CMAKE_ARGS+= -DWITH_GDAL=1
-.else
-CMAKE_ARGS+= -DWITH_GDAL=0
-.endif
-
-.if ${PORT_OPTIONS:MGEOS}
-LIB_DEPENDS+= libgeos.so:graphics/geos
-CMAKE_ARGS+= -DWITH_GEOS=1
-.else
-CMAKE_ARGS+= -DWITH_GEOS=0
-.endif
-
-.if ${PORT_OPTIONS:MPOSTGIS}
-USES+= pgsql
-CMAKE_ARGS+= -DWITH_POSTGIS=1
-.else
-CMAKE_ARGS+= -DWITH_POSTGIS=0
-.endif
-
-.if ${PORT_OPTIONS:MPHP}
-USES+= php:build
-IGNORE_WITH_PHP= 70
-CMAKE_ARGS+= -DWITH_PHP=1
-PLIST_SUB+= PHP=""
-.else
-CMAKE_ARGS+= -DWITH_PHP=0
-PLIST_SUB+= PHP="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MPERL}
-USES+= perl5
-BUILD_DEPENDS= ${LOCALBASE}/bin/swig2.0:devel/swig20
-CMAKE_ARGS+= -DWITH_PERL=1
-PLIST_SUB+= PERL=""
-.else
-CMAKE_ARGS+= -DWITH_PERL=0
-PLIST_SUB+= PERL="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MCURL}
-LIB_DEPENDS+= libcurl.so:ftp/curl
-CMAKE_ARGS+= -DWITH_CURL=1
-.else
-CMAKE_ARGS+= -DWITH_CURL=0
-.endif
-
-.if ${PORT_OPTIONS:MFASTCGI}
-BUILD_DEPENDS+= ${LOCALBASE}/bin/cgi-fcgi:www/fcgi
-CMAKE_ARGS+= -DWITH_FCGI=1
-.else
-CMAKE_ARGS+= -DWITH_FCGI=0
-.endif
-
-.if ${PORT_OPTIONS:MDEBUG}
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Debug
-.else
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
-.endif
+PYTHON_USES= python:-2.7
+PYTHON_BUILD_DEPENDS= swig2.0:devel/swig20
+PYTHON_CMAKE_BOOL= WITH_PYTHON
+PYTHON_VARS= MAP_EGG=MapScript-${PORTVERSION}-py${PYTHON_VER}
+PYTHON_PLIST_SUB= MAP_EGG=${MAP_EGG}
+
+CAIRO_LIB_DEPENDS= libcairo.so:graphics/cairo \
+ libexpat.so:textproc/expat2
+CAIRO_CMAKE_BOOL= WITH_CAIRO
+
+FRIBIDI_LIB_DEPENDS= libfribidi.so:converters/fribidi
+FRIBIDI_CMAKE_BOOL= WITH_FRIBIDI
+
+CAIRO_SVG_LIB_DEPENDS= libsvg-cairo.so:graphics/libsvg-cairo
+CAIRO_SVG_CMAKE_ARGS= WITH_SVGCAIRO
+CAIRO_SVG_USES= pkgconfig
+CAIRO_SVG_IMPLIES= CAIRO
+
+KML_LIB_DEPENDS= libxml2.so:textproc/libxml2
+KML_CMAKE_BOOL= WITH_KML
+
+WMS_CMAKE_BOOL= WITH_WMS
+
+WFS_CMAKE_BOOL= WITH_WFS
+
+WCS_CMAKE_BOOL= WITH_WCS
+
+GDAL_USES= iconv
+GDAL_LIB_DEPENDS= libgdal.so:graphics/gdal
+GDAL_CMAKE_BOOL= WITH_GDAL
+
+GEOS_LIB_DEPENDS= libgeos.so:graphics/geos
+GEOS_CMAKE_BOOL= WITH_GEOS
+
+POSTGIS_USES= pgsql
+POSTGIS_CMAKE_ARGS= WITH_POSTGIS
+
+PHP_USES= php:build
+PHP_VARS= IGNORE_WITH_PHP=70
+PHP_CMAKE_BOOL= WITH_PHP
+
+PERL_USES= perl5
+PERL_BUILD_DEPENDS= ${LOCALBASE}/bin/swig2.0:devel/swig20
+PERL_CMAKE_BOOL= WITH_PERL
+
+CURL_LIB_DEPENDS= libcurl.so:ftp/curl
+CURL_CMAKE_BOOL= WITH_CURL
+
+FASTCGI_BUILD_DEPENDS= ${LOCALBASE}/bin/cgi-fcgi:www/fcgi
+FASTCGI_CMAKE_BOOL= WITH_FCGI
+
+DEBUG_CMAKE_ON= -DCMAKE_BUILD_TYPE=Debug
+DEBUG_CMAKE_OFF= -DCMAKE_BUILD_TYPE=Release
+
+CLIENT_WMS_CMAKE_BOOL= WITH_CLIENT_WMS
+CLIENT_WMS_IMPLIES= CURL GDAL
+
+CLIENT_WFS_CMAKE_BOOL= WITH_CLIENT_WFS
+CLIENT_WFS_IMPLIES= CURL GDAL
PROG_FILES= legend scalebar shp2img shptree shptreetst shptreevis \
sortshp msencrypt tile4ms mapserv
-.if ${PORT_OPTIONS:MCLIENT_WMS}
-LIB_DEPENDS+= libcurl.so:ftp/curl
-LIB_DEPENDS+= libgdal.so:graphics/gdal
-CMAKE_ARGS+= -DWITH_CURL=1 -DWITH_GDAL=1 -DWITH_CLIENT_WMS=1
-.endif
-
-.if ${PORT_OPTIONS:MCLIENT_WFS}
-LIB_DEPENDS+= libcurl.so:ftp/curl
-LIB_DEPENDS+= libgdal.so:graphics/gdal
-CMAKE_ARGS+= -DWITH_CURL=1 -DWITH_GDAL=1 -DWITH_CLIENT_WFS=1
-.endif
-
do-install:
.for f in ${PROG_FILES}
${STRIP_CMD} ${BUILD_WRKSRC}/${f}
Index: graphics/opencolorio/Makefile
===================================================================
--- graphics/opencolorio/Makefile
+++ graphics/opencolorio/Makefile
@@ -24,7 +24,8 @@
-DOCIO_BUILD_NUKE:BOOL=OFF \
-DOCIO_BUILD_STATIC:BOOL=OFF \
-DUSE_EXTERNAL_TINYXML:BOOL=ON \
- -DUSE_EXTERNAL_YAML:BOOL=ON
+ -DUSE_EXTERNAL_YAML:BOOL=ON \
+ -DPYTHON_LIBRARY:PATH=${PYTHON_LIB}
SHEBANG_FILES= share/sphinx/ExtractRstFromSourceCPP.py \
share/sphinx/ExtractRstFromSourceSimple.py \
src/pyglue/createPyDocH.py
Index: graphics/opencolorio/files/patch-share_cmake_OCIOMacros.cmake
===================================================================
--- graphics/opencolorio/files/patch-share_cmake_OCIOMacros.cmake
+++ /dev/null
@@ -1,11 +0,0 @@
---- share/cmake/OCIOMacros.cmake.orig 2015-08-29 00:58:36 UTC
-+++ share/cmake/OCIOMacros.cmake
-@@ -168,7 +168,7 @@ MACRO(OCIOFindPython)
- file(TO_CMAKE_PATH "${PYTHON_LIBRARY_DIRS_RAW}" PYTHON_LIBRARY_DIRS)
-
- FIND_LIBRARY(PYTHON_LIBRARY
-- NAMES "python${PYTHON_VERSION}"
-+ NAMES "${PYTHON_VERSION}${PYTHON_ABIVER}"
- PATHS ${PYTHON_LIBRARY_DIRS}
- NO_DEFAULT_PATH # Don't be "helpful" and randomly grab library from /usr/lib etc
- )
Index: graphics/partio/Makefile
===================================================================
--- graphics/partio/Makefile
+++ graphics/partio/Makefile
@@ -21,7 +21,7 @@
OPTIONS_DEFAULT= PYTHON
DOCS_BUILD_DEPENDS= doxygen:devel/doxygen
-PYTHON_USES= python:2.7+
+PYTHON_USES= python
PYTHON_BUILD_DEPENDS= swig:devel/swig13
PORTDOCS= *
@@ -34,18 +34,16 @@
${WRKSRC}/src/py/CMakeLists.txt
@${REINPLACE_CMD} -e '/install(TARGETS/d' \
${WRKSRC}/src/tests/CMakeLists.txt
-.if !${PORT_OPTIONS:MPYTHON}
+
+post-patch-PYTHON-off:
@${REINPLACE_CMD} -e '/ADD_SUBDIRECTORY.*src\/py.*/d' \
${WRKSRC}/CMakeLists.txt
-.endif
-.if !${PORT_OPTIONS:MDOCS}
+
+post-patch-DOCS-off:
@${REINPLACE_CMD} -e '/ADD_SUBDIRECTORY.*src\/doc.*/d' \
${WRKSRC}/CMakeLists.txt
-.endif
-.if ${PORT_OPTIONS:MDOCS}
-post-build:
+post-build-DOCS-on:
@(cd ${BUILD_WRKSRC}; make doc)
-.endif
.include <bsd.port.mk>
Index: graphics/py-graphy/Makefile
===================================================================
--- graphics/py-graphy/Makefile
+++ graphics/py-graphy/Makefile
@@ -15,6 +15,8 @@
LICENSE_FILE= ${WRKSRC}/LICENSE
BROKEN= Unfetchable (google code has gone away)
+DEPRECATED= Abandoned software: no update since 2010 and no upstream
+EXPIRATION_DATE=2016-12-31
USES= python:run tar:bzip2
@@ -26,7 +28,7 @@
OPTIONS_DEFINE= DOCS EXAMPLES
post-patch:
- @${REINPLACE_CMD} -e 's|python2.4|${PYTHON_VERSION}|' \
+ @${REINPLACE_CMD} -e 's|python2.4|${PYTHON_CMD}|' \
${WRKSRC}/examples/*.py \
${WRKSRC}/${PORTNAME}/*.py
@${FIND} ${WRKSRC} -name '.svn' -or -name '*.bak' | \
Index: graphics/py-ming/Makefile
===================================================================
--- graphics/py-ming/Makefile
+++ graphics/py-ming/Makefile
@@ -24,7 +24,7 @@
PORTSCOUT= limit:^ming-
CONFIGURE_ARGS= --enable-python
-CONFIGURE_ENV= PYTHON_LDFLAGS="-L${PYTHON_LIBDIR} -l${PYTHON_VERSION}${PYTHON_ABIVER}"
+CONFIGURE_ENV= PYTHON_LDFLAGS="${PYTHON_LIB}"
GNU_CONFIGURE= yes
USE_PYTHON= autoplist concurrent distutils
USES= autoreconf libtool localbase:ldflags python
Index: graphics/qgis/Makefile
===================================================================
--- graphics/qgis/Makefile
+++ graphics/qgis/Makefile
@@ -29,7 +29,7 @@
GH_PROJECT= ${PORTNAME:tu}
USES= bison cmake cpe desktop-file-utils execinfo fortran \
- gmake python:2 sqlite
+ gmake python:2 shebangfix sqlite
USE_QT4= corelib designer gui linguist_build moc_build network \
qmake_build rcc_build script sql svg testlib uic_build xml \
webkit
@@ -116,6 +116,18 @@
INSTALLS_ICONS= yes
+SHEBANG_FILES= ${WRKSRC}/python/ext-libs/pygments/util.py \
+ ${WRKSRC}/python/ext-libs/pytz/tzfile.py \
+ ${WRKSRC}/scripts/generate_test_mask_image.py \
+ ${WRKSRC}/scripts/random_vector.py \
+ ${WRKSRC}/scripts/widgets_tree.py \
+ ${WRKSRC}/src/plugins/grass/qgis_grass_test.py \
+ ${WRKSRC}/src/plugins/grass/scripts/qgis.v.kernel.rast.py \
+ ${WRKSRC}/src/plugins/grass/scripts/v.out.ogr.pg.py \
+ ${WRKSRC}/src/plugins/grass/scripts/qgis.v.upgrade.py \
+ ${WRKSRC}/src/plugins/grass/scripts/r.external.all.py \
+ ${WRKSRC}/src/plugins/grass/scripts/db.connect-login.pg.py
+
.include <bsd.port.options.mk>
.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000033
@@ -150,18 +162,6 @@
${WRKSRC}/debian/${PORTNAME}.desktop
@${REINPLACE_CMD} -e 's|Icon=qgis|Icon=qgis-icon|' \
${WRKSRC}/debian/${PORTNAME}.desktop
- @${REINPLACE_CMD} -e 's|env python|env ${PYTHON_VERSION}|g' \
- ${WRKSRC}/python/ext-libs/pygments/util.py \
- ${WRKSRC}/python/ext-libs/pytz/tzfile.py \
- ${WRKSRC}/scripts/generate_test_mask_image.py \
- ${WRKSRC}/scripts/random_vector.py \
- ${WRKSRC}/scripts/widgets_tree.py \
- ${WRKSRC}/src/plugins/grass/qgis_grass_test.py \
- ${WRKSRC}/src/plugins/grass/scripts/qgis.v.kernel.rast.py \
- ${WRKSRC}/src/plugins/grass/scripts/v.out.ogr.pg.py \
- ${WRKSRC}/src/plugins/grass/scripts/qgis.v.upgrade.py \
- ${WRKSRC}/src/plugins/grass/scripts/r.external.all.py \
- ${WRKSRC}/src/plugins/grass/scripts/db.connect-login.pg.py
post-install:
${RM} ${STAGEDIR}${DATADIR}/python/pygments/util.py.bak
Index: japanese/libtomoe-gtk/Makefile
===================================================================
--- japanese/libtomoe-gtk/Makefile
+++ japanese/libtomoe-gtk/Makefile
@@ -31,7 +31,7 @@
#.endif
.if exists(${LOCALBASE}/libdata/pkgconfig/pytomoe.pc)
-CONFIGURE_ENV+= PYTHON_VERSION=${PYTHON_VERSION:S;python;;} \
+CONFIGURE_ENV+= PYTHON_VERSION=${PYTHON_VER} \
pyexecdir=${PYTHON_SITELIBDIR}
PLIST_SUB+= PYTHON=""
.else
Index: japanese/tomoe/Makefile
===================================================================
--- japanese/tomoe/Makefile
+++ japanese/tomoe/Makefile
@@ -19,7 +19,7 @@
USE_LDCONFIG= yes
USE_PERL5= build
-CONFIGURE_ENV= PYTHON_VERSION=${PYTHON_VERSION:S;python;;} \
+CONFIGURE_ENV= PYTHON_VERSION=${PYTHON_VER} \
pyexecdir=${PYTHON_SITELIBDIR} \
GMSGFMT="${LOCALBASE}/bin/msgfmt"
CFLAGS+= -I${LOCALBASE}/include
Index: lang/pypy/Makefile.version
===================================================================
--- /dev/null
+++ lang/pypy/Makefile.version
@@ -0,0 +1,4 @@
+# Mk/Uses/python.mk includes this file, don't remove it!
+# $FreeBSD$
+
+PYTHON_PORTVERSION= 2.7.10
Index: lang/pypy3/Makefile.version
===================================================================
--- /dev/null
+++ lang/pypy3/Makefile.version
@@ -0,0 +1,4 @@
+# Mk/Uses/python.mk includes this file, don't remove it!
+# $FreeBSD$
+
+PYTHON_PORTVERSION= 3.3.5
Index: lang/python35/Makefile
===================================================================
--- lang/python35/Makefile
+++ lang/python35/Makefile
@@ -25,7 +25,7 @@
# Duplicate python.mk variables. TODO: Let lang/python?? ports use python.mk bits.
PYTHON_VER= ${PYTHON_PORTVERSION:R}
-PYTHON_VERSION= python${PYTHON_VER}
+PYTHON_VERSION= cpython${PYTHON_VER}
PYTHON_SUFFIX= ${PYTHON_VER:S/.//g}
DISABLED_EXTENSIONS= _sqlite3 _tkinter _gdbm
Index: mail/opensmtpd-extras-filter-python/Makefile
===================================================================
--- mail/opensmtpd-extras-filter-python/Makefile
+++ mail/opensmtpd-extras-filter-python/Makefile
@@ -8,7 +8,8 @@
PLIST_FILES= libexec/opensmtpd/filter-python
-CONFIGURE_ARGS+= --with-experimental-filter-python --with-python-type=${PYTHON_VERSION}
+CONFIGURE_ARGS+= --with-experimental-filter-python --with-python=${LOCALBASE} \
+ --with-python-type=`basename ${PYTHON_CMD}`
USES= python:2 pkgconfig
Index: mail/opensmtpd-extras-queue-python/Makefile
===================================================================
--- mail/opensmtpd-extras-queue-python/Makefile
+++ mail/opensmtpd-extras-queue-python/Makefile
@@ -8,7 +8,8 @@
PLIST_FILES= libexec/opensmtpd/queue-python
-CONFIGURE_ARGS+= --with-queue-python --with-python-type=${PYTHON_VERSION}
+CONFIGURE_ARGS+= --with-queue-python --with-python=${LOCALBASE} \
+ --with-python-type=`basename ${PYTHON_CMD}`
USES= python:2 pkgconfig
Index: mail/opensmtpd-extras-scheduler-python/Makefile
===================================================================
--- mail/opensmtpd-extras-scheduler-python/Makefile
+++ mail/opensmtpd-extras-scheduler-python/Makefile
@@ -8,7 +8,8 @@
PLIST_FILES= libexec/opensmtpd/scheduler-python
-CONFIGURE_ARGS+= --with-scheduler-python --with-python-type=${PYTHON_VERSION}
+CONFIGURE_ARGS+= --with-scheduler-python --with-python=${LOCALBASE} \
+ --with-python-type=`basename ${PYTHON_CMD}`
USES= python:2 pkgconfig
Index: mail/opensmtpd-extras-table-python/Makefile
===================================================================
--- mail/opensmtpd-extras-table-python/Makefile
+++ mail/opensmtpd-extras-table-python/Makefile
@@ -8,7 +8,8 @@
PLIST_FILES= libexec/opensmtpd/table-python
-CONFIGURE_ARGS+= --with-table-python --with-python-type=${PYTHON_VERSION}
+CONFIGURE_ARGS+= --with-table-python --with-python=${LOCALBASE} \
+ --with-python-type=`basename ${PYTHON_CMD}`
USES= python:2 pkgconfig
Index: mail/rss2email3/Makefile
===================================================================
--- mail/rss2email3/Makefile
+++ mail/rss2email3/Makefile
@@ -33,10 +33,4 @@
cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/
${INSTALL_MAN} ${WRKSRC}/r2e.1 ${STAGEDIR}${MANPREFIX}/man/man1
-.include <bsd.port.pre.mk>
-
-.if defined(PACKAGE_BUILDING) && ${PYTHON_VER} != ${PYTHON_DEFAULT}
-IGNORE= you have python ${PYTHON_DEFAULT} set as the default, and this needs ${PYTHON_VER}
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: math/convertall/Makefile
===================================================================
--- math/convertall/Makefile
+++ math/convertall/Makefile
@@ -50,8 +50,4 @@
PLIST_SUB+= PYTHON_SUFFIX="${PYTHON_SUFFIX}" \
PYOEXTENSION="${PYOEXTENSION}"
-.if defined(PACKAGE_BUILDING) && ${PYTHON_VER} != ${PYTHON_DEFAULT}
-IGNORE= you have python ${PYTHON_DEFAULT} set as the default, and this needs ${PYTHON_VER}
-.endif
-
.include <bsd.port.post.mk>
Index: math/plplot/Makefile
===================================================================
--- math/plplot/Makefile
+++ math/plplot/Makefile
@@ -60,7 +60,6 @@
PYTHON_BUILD_DEPENDS= swig:devel/swig13 \
${PYNUMPY}
PYTHON_RUN_DEPENDS= ${PYNUMPY}
-PYTHON_CONFIGURE_ENV= PYTHON_VERSION="${PYTHON_VERSION}"
PYTHON_CMAKE_OFF= -DENABLE_python:BOOL=OFF
QHULL2003_DESC= Legacy Qhull support
Index: math/qtiplot/Makefile
===================================================================
--- math/qtiplot/Makefile
+++ math/qtiplot/Makefile
@@ -41,7 +41,7 @@
PYTHON_BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:x11-toolkits/py-qt4-gui
PYTHON_RUN_DEPENDS:= ${PYTHON_BUILD_DEPENDS}
PYTHON_CONFIGURE_ENV= PYTHON_INCLUDEDIR=${PYTHON_INCLUDEDIR} \
- PYTHON_VERSION=${PYTHON_VERSION}
+ PYTHON_LIB="${PYTHON_LIB}"
NLS_USE= QT4=linguisttools_build
Index: math/qtiplot/files/patch-qtiplot__qtiplot.pro
===================================================================
--- math/qtiplot/files/patch-qtiplot__qtiplot.pro
+++ math/qtiplot/files/patch-qtiplot__qtiplot.pro
@@ -72,7 +72,7 @@
- INCLUDEPATH += $$system($$PYTHON python-includepath.py)
- LIBS += $$system($$PYTHON -c "\"from distutils import sysconfig; print '-lpython'+sysconfig.get_config_var('VERSION')\"")
+ INCLUDEPATH += $$(PYTHON_INCLUDEDIR)
-+ LIBS += -l$$(PYTHON_VERSION)
++ LIBS += $$(PYTHON_LIB)
LIBS += -lm
system(mkdir -p $${SIP_DIR})
- system($$system($$PYTHON python-sipcmd.py) -c $${SIP_DIR} src/scripting/qti.sip)
Index: math/rpcalc/Makefile
===================================================================
--- math/rpcalc/Makefile
+++ math/rpcalc/Makefile
@@ -45,8 +45,4 @@
PLIST_SUB+= PYTHON_SUFFIX="${PYTHON_SUFFIX}" \
PYOEXTENSION="${PYOEXTENSION}"
-.if defined(PACKAGE_BUILDING) && ${PYTHON_VER} != ${PYTHON_DEFAULT}
-IGNORE= you have python ${PYTHON_DEFAULT} set as the default, and this needs ${PYTHON_VER}
-.endif
-
.include <bsd.port.post.mk>
Index: multimedia/freevo/Makefile
===================================================================
--- multimedia/freevo/Makefile
+++ multimedia/freevo/Makefile
@@ -32,7 +32,7 @@
USERS= ${FREEVO_USER}
GROUPS= ${FREEVO_GROUP}
-SUB_LIST+= PYTHON_VERSION=${PYTHON_DEFAULT_VERSION} \
+SUB_LIST+= PYTHON_CMD=${PYTHON_CMD} \
PORTVERSION=${PORTVERSION} \
FREEVO_HOME=${FREEVO_HOME}
SUB_FILES= pkg-message pkg-deinstall
Index: multimedia/freevo/files/freevo.in
===================================================================
--- multimedia/freevo/files/freevo.in
+++ multimedia/freevo/files/freevo.in
@@ -30,7 +30,7 @@
freevo_dir=`pw usershow ${freevo_user} | awk -F: '{print $9}'`
command="%%PREFIX%%/bin/freevo"
-command_interpreter="%%PREFIX%%/bin/%%PYTHON_VERSION%%"
+command_interpreter="%%PYTHON_CMD%%"
# freevo needs PATH set so it can determine python version
export PATH=/bin:/usr/bin:%%PREFIX%%/bin:${freevo_dir}/bin
Index: multimedia/miro/Makefile
===================================================================
--- multimedia/miro/Makefile
+++ multimedia/miro/Makefile
@@ -37,7 +37,8 @@
USE_GSTREAMER= python gconf
USES= gettext gmake pkgconfig desktop-file-utils python shared-mime-info shebangfix
SHEBANG_FILES= resources/testdata/7digital-replies/generate.py \
- resources/testdata/echonest-replies/generate.py
+ resources/testdata/echonest-replies/generate.py \
+ ${BUILD_WRKSRC}/miro.real
USE_PYTHON= distutils
USE_LDCONFIG= yes
INSTALLS_ICONS= yes
@@ -56,10 +57,6 @@
s|%%MANPREFIX%%|${MANPREFIX}|g' \
${BUILD_WRKSRC}/${file}
.endfor
-.for file in miro.real
- ${REINPLACE_CMD} -e 's|python2.4|${PYTHON_VERSION}|g' \
- ${BUILD_WRKSRC}/${file}
-.endfor
.for file in run.sh
${REINPLACE_CMD} -e 's|^PREFIX=.*|PREFIX=${PREFIX}|g' \
${BUILD_WRKSRC}/${file}
Index: multimedia/mps-youtube/Makefile
===================================================================
--- multimedia/mps-youtube/Makefile
+++ multimedia/mps-youtube/Makefile
@@ -45,10 +45,4 @@
post-install:
${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}/${PREFIX}/bin/${PORTNAME}
-.include <bsd.port.pre.mk>
-
-.if defined(PACKAGE_BUILDING) && ${PYTHON_VER} != ${PYTHON_DEFAULT}
-IGNORE= you have python ${PYTHON_DEFAULT} set as the default, and this needs ${PYTHON_VER}
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: net-im/poezio/Makefile
===================================================================
--- net-im/poezio/Makefile
+++ net-im/poezio/Makefile
@@ -18,10 +18,4 @@
USES= tar:xz python:3.3+
USE_PYTHON= distutils autoplist
-.include <bsd.port.pre.mk>
-
-.if defined(PACKAGE_BUILDING) && ${PYTHON_VER} != ${PYTHON_DEFAULT}
-IGNORE= you have python ${PYTHON_DEFAULT} set as the default, and this needs ${PYTHON_VER}
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: net-mgmt/ccnet/Makefile
===================================================================
--- net-mgmt/ccnet/Makefile
+++ net-mgmt/ccnet/Makefile
@@ -63,8 +63,8 @@
${STAGEDIR}${PREFIX}/bin/ccnet-server \
${STAGEDIR}${PREFIX}/bin/ccnet-servtool
(cd ${STAGEDIR}${PREFIX}/lib && \
- ${COPYTREE_SHARE} ${PYTHON_VERSION} ${STAGEDIR}${PREFIX}/${SEALIB})
- @${RM} -r ${STAGEDIR}${PREFIX}/lib/${PYTHON_VERSION}
+ ${COPYTREE_SHARE} python${PYTHON_VER} ${STAGEDIR}${PREFIX}/${SEALIB})
+ @${RM} -r ${STAGEDIR}${PREFIX}/lib/python${PYTHON_VER}
${LN} -s ${PREFIX}/${SEABIN}/ccnet-server ${STAGEDIR}${PREFIX}/bin/
.include <bsd.port.mk>
Index: net-mgmt/seafile/Makefile
===================================================================
--- net-mgmt/seafile/Makefile
+++ net-mgmt/seafile/Makefile
@@ -90,7 +90,7 @@
.if ${OSVERSION} >= 1100097
${REINPLACE_CMD} 's/P_KTHREAD/P_KPROC/' ${WRKSRC}/lib/utils.c
.endif
- ${REINPLACE_CMD} 's/python/${PYTHON_VERSION}/' \
+ ${REINPLACE_CMD} 's|python|${PYTHON_CMD}|' \
${WRKSRC}/scripts/upgrade/regenerate_secret_key.sh
${REINPLACE_CMD} -e 's|^INSTALL.*|INSTALLPATH="${PREFIX}/${SEAFILE_SERVER}/seafile"|' \
${WRKSRC}/scripts/seaf-cli-wrapper.sh
@@ -114,8 +114,8 @@
${INSTALL_SCRIPT} ${STAGEDIR}${PREFIX}/bin/seaf-cli ${STAGEDIR}${PREFIX}/${SEABIN}/seaf-cli.py
${INSTALL_SCRIPT} ${WRKSRC}/scripts/seaf-cli-wrapper.sh ${STAGEDIR}${PREFIX}/bin/seaf-cli
(cd ${STAGEDIR}${PREFIX}/lib && \
- ${COPYTREE_SHARE} ${PYTHON_VERSION} ${STAGEDIR}${PREFIX}/${SEALIB})
- @${RM} -r ${STAGEDIR}${PREFIX}/lib/${PYTHON_VERSION} \
+ ${COPYTREE_SHARE} python${PYTHON_VER} ${STAGEDIR}${PREFIX}/${SEALIB})
+ @${RM} -r ${STAGEDIR}${PREFIX}/lib/python${PYTHON_VER} \
${WRKSRC}/scripts/seaf-cli-wrapper.sh \
${WRKSRC}/scripts/sqlite2mysql.[ps][yh] \
${WRKSRC}/scripts/setup-seafile.sh \
Index: net-p2p/libtorrent-rasterbar-python/Makefile
===================================================================
--- net-p2p/libtorrent-rasterbar-python/Makefile
+++ net-p2p/libtorrent-rasterbar-python/Makefile
@@ -25,8 +25,4 @@
OPTIONS_EXCLUDE= DOCS EXAMPLES
-# ensure python paths are correctly identified
-CONFIGURE_ENV= PYTHON_INCLUDEDIR="${PYTHON_INCLUDEDIR}" \
- PYTHON_VERSION="${PYTHON_VERSION}"
-
.include "${MASTERDIR}/Makefile"
Index: net-p2p/tribler/Makefile
===================================================================
--- net-p2p/tribler/Makefile
+++ net-p2p/tribler/Makefile
@@ -40,7 +40,7 @@
SUB_FILES= tribler
SUB_LIST= PYTHON_SITELIBDIR="${PYTHON_SITELIBDIR}" \
- PYTHON_VERSION="${PYTHON_VERSION}"
+ PYTHON_CMD="${PYTHON_CMD}"
OPTIONS_DEFINE= DOCS VLC
OPTIONS_DEFAULT= VLC
Index: net-p2p/tribler/files/tribler.in
===================================================================
--- net-p2p/tribler/files/tribler.in
+++ net-p2p/tribler/files/tribler.in
@@ -8,4 +8,4 @@
STATEDIR="$HOME/.Tribler"
[ ! -d $STATEDIR ] && mkdir -p $STATEDIR
cd $_TRIBLERPATH
-exec %%PYTHON_VERSION%% -O Tribler/Main/tribler.py "$@" > $STATEDIR/tribler.log 2>&1
+exec %%PYTHON_CMD%% -O Tribler/Main/tribler.py "$@" > $STATEDIR/tribler.log 2>&1
Index: net/dshell/Makefile
===================================================================
--- net/dshell/Makefile
+++ net/dshell/Makefile
@@ -38,7 +38,7 @@
.endfor
post-build:
- ${RM} -r ${WRKSRC}/lib/${PYTHON_VERSION}
+ ${RM} -r ${WRKSRC}/lib/python${PYTHON_VER}
${REINPLACE_CMD} -e 's|${WRKSRC}|${ETCDIR}|' ${WRKSRC}/dshell ${WRKSRC}/dshell-decode
${REINPLACE_CMD} -e 's|BINPATH=${WRKSRC}/bin|BINPATH=${PREFIX}/libexec/dshell|' \
-e 's|DSHELL=${WRKSRC}|DSHELL=${PYTHON_SITELIBDIR}|' \
Index: net/tiny-network-utilities/Makefile
===================================================================
--- net/tiny-network-utilities/Makefile
+++ net/tiny-network-utilities/Makefile
@@ -25,12 +25,6 @@
FILES_LIB= net_checksums tiny_utils
PLIST_FILES= ${FILES_EXEC:%=bin/%} ${FILES_LIB:%=${PYTHON_SITELIBDIR}/%.py}
-.include <bsd.port.pre.mk>
-
-.if defined(PACKAGE_BUILDING) && ${PYTHON_VER} != ${PYTHON_DEFAULT}
-IGNORE= you have python ${PYTHON_DEFAULT} set as the default, and this needs ${PYTHON_VER}
-.endif
-
do-install:
.for file_exec in ${FILES_EXEC}
${INSTALL_SCRIPT} ${WRKSRC}/${file_exec}.py \
@@ -42,4 +36,4 @@
${STAGEDIR}${PYTHON_SITELIBDIR}/${file_lib}.py
.endfor
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: ports-mgmt/py-pytoport/Makefile
===================================================================
--- ports-mgmt/py-pytoport/Makefile
+++ ports-mgmt/py-pytoport/Makefile
@@ -23,10 +23,4 @@
USE_GITHUB= yes
USE_PYTHON= autoplist distutils
-.include <bsd.port.pre.mk>
-
-.if defined(PACKAGE_BUILDING) && ${PYTHON_VER} != ${PYTHON_DEFAULT}
-IGNORE= you have python ${PYTHON_DEFAULT} set as the default, and this needs ${PYTHON_VER}
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: print/system-config-printer/Makefile
===================================================================
--- print/system-config-printer/Makefile
+++ print/system-config-printer/Makefile
@@ -30,8 +30,6 @@
CONFIGURE_ARGS= --without-udev-rules \
--without-systemdsystemunitdir
-PLIST_SUB= PYTHON_VER=${PYTHON_VERSION:S/python//}
-
SHEBANG_FILES= *.py troubleshoot/*.py xml/validate.py
PYDISTUTILS_PKGNAME= cupshelpers
Index: science/avogadro/Makefile
===================================================================
--- science/avogadro/Makefile
+++ science/avogadro/Makefile
@@ -40,7 +40,7 @@
PYTHON_RUN_DEPENDS= ${PYNUMPY} \
${PYTHON_PKGNAMEPREFIX}sip>0:devel/py-sip
PYTHON_CMAKE_ON= -DENABLE_PYTHON=ON \
- -DPYTHON_INCLUDE_DIR:PATH=${WRKDIR}/include/${PYTHON_VERSION}
+ -DPYTHON_INCLUDE_DIR:PATH=${WRKDIR}/include/python${PYTHON_VER}
PYTHON_CMAKE_OFF= -DENABLE_PYTHON=OFF
post-patch:
@@ -51,12 +51,12 @@
's|share/man|man|' ${WRKSRC}/doc/CMakeLists.txt
pre-configure-PYTHON-on:
- @${MKDIR} ${WRKDIR}/include/${PYTHON_VERSION}
+ @${MKDIR} ${WRKDIR}/include/python${PYTHON_VER}
@${FIND} ${PYTHON_INCLUDEDIR} ! -name "pyport.h" -type f \
-maxdepth 1 | ${XARGS} -J % ${LN} -sf % \
- ${WRKDIR}/include/${PYTHON_VERSION}
+ ${WRKDIR}/include/python${PYTHON_VER}
@${SED} -e 's|^#ifdef _PY_PORT_CTYPE_UTF8_ISSUE|#if 0|' \
${PYTHON_INCLUDEDIR}/pyport.h > \
- ${WRKDIR}/include/${PYTHON_VERSION}/pyport.h
+ ${WRKDIR}/include/python${PYTHON_VER}/pyport.h
.include <bsd.port.mk>
Index: security/py-gpgme/Makefile
===================================================================
--- security/py-gpgme/Makefile
+++ security/py-gpgme/Makefile
@@ -13,6 +13,6 @@
PLIST= ${.CURDIR}/pkg-plist
post-install:
- ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PYTHON_VERSION}/site-packages/gpg/_gpgme.so
+ ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/gpg/_gpgme.so
.include "${MASTERDIR}/Makefile"
Index: sysutils/condor/Makefile
===================================================================
--- sysutils/condor/Makefile
+++ sysutils/condor/Makefile
@@ -42,8 +42,8 @@
# Does not build with Python 3
CMAKE_ARGS+= -DCMAKE_CXX_FLAGS:STRING=${CXXFLAGS} \
-DCMAKE_EXE_LINKER_FLAGS:STRING=${LDFLAGS} \
- -DPYTHON_INCLUDE_DIR:PATH=${LOCALBASE}/include/${PYTHON_VERSION} \
- -DPYTHON_LIBRARY:FILEPATH=${LOCALBASE}/lib/lib${PYTHON_VERSION}.so
+ -DPYTHON_INCLUDE_DIR:PATH=${PYTHON_INCLUDEDIR} \
+ -DPYTHON_LIBRARIES=${PYTHON_LIB}
SUB_FILES= condor-config condor_config.local pkg-message
PLIST_SUB+= CONDOR_UVER=${PORTVERSION:S/./_/g}
Index: sysutils/py-zfs/Makefile
===================================================================
--- sysutils/py-zfs/Makefile
+++ sysutils/py-zfs/Makefile
@@ -17,7 +17,7 @@
USES= python:2
MAKEFILE= ${FILESDIR}/Makefile.lib
MAKE_ARGS+= PYTHON_INCLUDEDIR="${PYTHON_INCLUDEDIR}" \
- PYTHON_LDFLAGS="-L${LOCALBASE}/lib -l${PYTHON_VERSION}"
+ PYTHON_LDFLAGS="${PYTHON_LIB}"
NO_WRKSUBDIR= yes
SUB_LIST+= PYTHON_CMD=${PYTHON_CMD}
Index: www/py33-requests/Makefile
===================================================================
--- www/py33-requests/Makefile
+++ www/py33-requests/Makefile
@@ -2,6 +2,6 @@
MASTERDIR= ${.CURDIR}/../py-requests
-PYTHON_VERSION= python3.3
+PYTHON_VERSION= cpython3.3
.include "${MASTERDIR}/Makefile"
Index: www/py34-requests/Makefile
===================================================================
--- www/py34-requests/Makefile
+++ www/py34-requests/Makefile
@@ -2,6 +2,6 @@
MASTERDIR= ${.CURDIR}/../py-requests
-PYTHON_VERSION= python3.4
+PYTHON_VERSION= cpython3.4
.include "${MASTERDIR}/Makefile"
Index: www/py35-requests/Makefile
===================================================================
--- www/py35-requests/Makefile
+++ www/py35-requests/Makefile
@@ -2,6 +2,6 @@
MASTERDIR= ${.CURDIR}/../py-requests
-PYTHON_VERSION= python3.5
+PYTHON_VERSION= cpython3.5
.include "${MASTERDIR}/Makefile"
Index: www/seahub/Makefile
===================================================================
--- www/seahub/Makefile
+++ www/seahub/Makefile
@@ -76,11 +76,7 @@
SUB_FILES= pkg-message
-SUB_LIST+= USERS=${USERS} \
- GROUPS=${GROUPS} \
- SEAFILE_SERVER=${SEAFILE_SERVER} \
- HAIWENDIR=${HAIWENDIR} \
- PYTHON=${PYTHON_VERSION}
+SUB_LIST= SEAFILE_SERVER=${SEAFILE_SERVER}
do-patch:
echo "${WRKSRC}..."
@@ -91,8 +87,8 @@
${REINPLACE_CMD} -e 's|##FIX_WWWDIR##|${PREFIX}/${HAIWENDIR}|' ${WRKSRC}/*.template
${REINPLACE_CMD} -e 's|##FIX_SEALIB##|${PREFIX}/${SEALIB}|' ${WRKSRC}/*.template
${REINPLACE_CMD} -e 's|##FIX_SITEPACKAGEDIR##|${PREFIX}/${SITEPACKAGEDIR}|' ${WRKSRC}/*.template
- ${REINPLACE_CMD} -e 's|##PYTHON_VERSION##|${PYTHON_VERSION}|g' ${WRKSRC}/*.template
- ${REINPLACE_CMD} -e 's|##FIX_LOCALBASE##|${LOCALBASE}|' ${WRKSRC}/*.template
+ ${REINPLACE_CMD} -e 's|##PYTHON_VER##|${PYTHON_VER}|g' ${WRKSRC}/*.template
+ ${REINPLACE_CMD} -e 's|##PYTHON_SITELIBDIR##|${PYTHON_SITELIBDIR}|' ${WRKSRC}/*.template
${FIND} ${WRKSRC} -name "*.bak" -exec ${RM} {} \;
${FIND} ${WRKSRC} -name "*.orig" -exec ${RM} {} \;
(cd ${WRKSRC}; (for file in run-seahub.sh.template \
Index: www/seahub/files/patch-send__user__notifications.sh.template
===================================================================
--- www/seahub/files/patch-send__user__notifications.sh.template
+++ www/seahub/files/patch-send__user__notifications.sh.template
@@ -11,6 +11,7 @@
-export PYTHONPATH=/Library/Python/2.7/site-packages/Django-1.3.1:thirdpart:/usr/local/lib/python2.7/site-packages/:$PYTHONPATH
+export CCNET_CONF_DIR=##FIX_WWWDIR##/ccnet
+export SEAFILE_CONF_DIR=##FIX_WWWDIR##/seafile-data
-+export PYTHONPATH=##FIX_LOCALBASE##/lib/##PYTHON_VERSION##/site-packages:##FIX_SEALIB##/##PYTHON_VERSION##/site-packages:##FIX_SITEPACKAGEDIR##:$PYTHONPATH
++export PYTHONPATH=##PYTHON_SITELIBDIR##:##FIX_SEALIB##/python##PYTHON_VER##/site-packages:##FIX_SITEPACKAGEDIR##:$PYTHONPATH
- python manage.py send_user_notifications
+-python manage.py send_user_notifications
++##PYTHON_CMD## manage.py send_user_notifications
Index: www/seahub/files/patch-setenv.sh.template
===================================================================
--- www/seahub/files/patch-setenv.sh.template
+++ www/seahub/files/patch-setenv.sh.template
@@ -8,4 +8,4 @@
+
+export CCNET_CONF_DIR=##FIX_WWWDIR##/ccnet
+export SEAFILE_CONF_DIR=##FIX_WWWDIR##/seafile-data
-+export PYTHONPATH=##FIX_LOCALBASE##/lib/##PYTHON_VERSION##/site-packages:##FIX_SEALIB##/##PYTHON_VERSION##/site-packages:##FIX_SITEPACKAGEDIR##:$PYTHONPATH
++export PYTHONPATH=##PYTHON_SITELIBDIR##:##FIX_SEALIB##/python##PYTHON_VER##/site-packages:##FIX_SITEPACKAGEDIR##:$PYTHONPATH
Index: www/uzbl/Makefile
===================================================================
--- www/uzbl/Makefile
+++ www/uzbl/Makefile
@@ -28,7 +28,7 @@
OPTIONS_DEFINE= DOCS
-MAKE_ENV+= PYTHON=${PYTHON_VERSION}
+MAKE_ENV+= PYTHON=${PYTHON_CMD}
.include <bsd.port.options.mk>
Index: www/webkit-qt5/Makefile
===================================================================
--- www/webkit-qt5/Makefile
+++ www/webkit-qt5/Makefile
@@ -56,14 +56,15 @@
.endif
post-patch:
- ${REINPLACE_CMD} -e 's,python,${PYTHON_VERSION},g' \
- -e 's,$$$${PYTHON},${PYTHON_VERSION},g' \
+ ${REINPLACE_CMD} -e 's,python,${PYTHON_CMD},g' \
+ -e 's,$$$${PYTHON},${PYTHON_CMD},g' \
${WRKSRC}/Source/WebCore/DerivedSources.make \
${WRKSRC}/Source/WebCore/DerivedSources.pri \
${WRKSRC}/Source/WebKit2/DerivedSources.make \
${WRKSRC}/Source/WebKit2/DerivedSources.pri \
${WRKSRC}/Source/JavaScriptCore/DerivedSources.make \
- ${WRKSRC}/Source/JavaScriptCore/DerivedSources.pri \
+ ${WRKSRC}/Source/JavaScriptCore/DerivedSources.pri
+ ${REINPLACE_CMD} -e 's,python,,g' \
${WRKSRC}/Tools/qmake/mkspecs/features/configure.prf
pre-configure:
Index: www/xist/Makefile
===================================================================
--- www/xist/Makefile
+++ www/xist/Makefile
@@ -21,10 +21,4 @@
USES= python:3 tar:bzip2
USE_PYTHON= autoplist distutils
-.include <bsd.port.pre.mk>
-
-.if defined(PACKAGE_BUILDING) && ${PYTHON_VER} != ${PYTHON_DEFAULT}
-IGNORE= you have python ${PYTHON_DEFAULT} set as the default, and this needs ${PYTHON_VER}
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: x11-toolkits/py33-tkinter/Makefile
===================================================================
--- x11-toolkits/py33-tkinter/Makefile
+++ x11-toolkits/py33-tkinter/Makefile
@@ -2,6 +2,6 @@
MASTERDIR= ${.CURDIR}/../py-tkinter
-PYTHON_VERSION= python3.3
+PYTHON_VERSION= cpython3.3
.include "${MASTERDIR}/Makefile"
Index: x11-toolkits/py34-tkinter/Makefile
===================================================================
--- x11-toolkits/py34-tkinter/Makefile
+++ x11-toolkits/py34-tkinter/Makefile
@@ -2,6 +2,6 @@
MASTERDIR= ${.CURDIR}/../py-tkinter
-PYTHON_VERSION= python3.4
+PYTHON_VERSION= cpython3.4
.include "${MASTERDIR}/Makefile"
Index: x11-toolkits/py35-tkinter/Makefile
===================================================================
--- x11-toolkits/py35-tkinter/Makefile
+++ x11-toolkits/py35-tkinter/Makefile
@@ -2,6 +2,6 @@
MASTERDIR= ${.CURDIR}/../py-tkinter
-PYTHON_VERSION= python3.5
+PYTHON_VERSION= cpython3.5
.include "${MASTERDIR}/Makefile"

File Metadata

Mime Type
text/plain
Expires
Thu, Apr 2, 4:57 AM (12 h, 54 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
30705374
Default Alt Text
D8069.id23197.diff (94 KB)

Event Timeline