Attachment 176102 Details for Bug 213737 – Patch - Part 1 - v1.0.1

[patch] Patch - Part 1 - v1.0.1

pypy.diff (text/plain), 56.84 KB, created by David Naylor on 2016-10-24 15:14:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Naylor

Created: 2016-10-24 15:14:53 UTC

Size: 56.84 KB

patch

obsolete

>diff --git a/Mk/Uses/kde.mk b/Mk/Uses/kde.mk
>index df6a5b4..6464b87 100644
>--- a/Mk/Uses/kde.mk
>+++ b/Mk/Uses/kde.mk
>@@ -29,6 +29,8 @@
> .if !defined(_INCLUDE_USES_KDE_MK)
> _INCLUDE_USES_KDE_MK=	yes
> 
>+_USES_POST+=	kde
>+
> _KDE_SUPPORTED=		4
> 
> .  if empty(kde_ARGS)
>@@ -140,18 +142,6 @@ PLIST_SUB+=		KDE4_VERSION="${KDE4_VERSION}" \
> .  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 \
> 			kfilemetadata korundum libkcddb libkcompactdisc \
>@@ -339,3 +329,22 @@ IGNORE=				cannot be installed: unknown USE_KDE component '${component}'
> .  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
>diff --git a/Mk/Uses/python.mk b/Mk/Uses/python.mk
>index 96fd743..8ccbfb7 100644
>--- a/Mk/Uses/python.mk
>+++ b/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}/bin
> #
> # 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_ARGS:=		${_PYTHON_ARGS:Nrun}
> _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_RUN_DEP=	yes
> _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 @@ WARNING+=	"PYTHON3_DEFAULT_VERSION is defined, consider using DEFAULT_VERSIONS=p
> .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 @@ _WANTS_META_PORT=	3
> # 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}/bin
>+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_MAXIMUM:=	${_PYTHON_VERSION_MAXIMUM_TMP:M[1-9].[0-9]}
> _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 @@ DEPENDS_ARGS+=		PYTHON_VERSION=${PYTHON_VERSION}
> # 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_SUFFIX=		${_PYTHON_VERSION:S/.//g}
> 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_PORTSDIR=	${_PYTHON_RELPORTDIR}${PYTHON_SUFFIX}
> 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 @@ PYTHONBASE!=	(${PYTHON_CMD} -c 'import sys; print(sys.prefix)' \
> .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 @@ UNIQUE_FIND_SUFFIX_FILES=	\
> _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 @@ PYDISTUTILS_SETUP?=	-c \
> 	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 @@ PYNUMPY=	${PYTHON_SITELIBDIR}/numpy/core/numeric.py:math/py-numpy
> .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 @@ PLIST_SUB+=	PYTHON_INCLUDEDIR=${PYTHONPREFIX_INCLUDEDIR:S;${PREFIX}/;;} \
> 		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
>diff --git a/Mk/Uses/zope.mk b/Mk/Uses/zope.mk
>index 2b0a309..5be16b0 100644
>--- a/Mk/Uses/zope.mk
>+++ b/Mk/Uses/zope.mk
>@@ -19,7 +19,7 @@ _INCLUDE_USES_ZOPE_MK=	yes
> _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}
>diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk
>index 48f1180..a45c5c8 100644
>--- a/Mk/bsd.default-versions.mk
>+++ b/Mk/bsd.default-versions.mk
>@@ -61,12 +61,12 @@ PERL5_DEFAULT:=		${_PERL5_FROM_BIN:R}
> 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
>diff --git a/cad/freecad/Makefile b/cad/freecad/Makefile
>index eb0fc5f..0f841e8 100644
>--- a/cad/freecad/Makefile
>+++ b/cad/freecad/Makefile
>@@ -26,7 +26,7 @@ LIB_DEPENDS=	libexpat.so:textproc/expat2		\
> 		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
> 
> USE_GITHUB=	yes
> GH_TAGNAME=	958686d
>diff --git a/databases/metakit/Makefile b/databases/metakit/Makefile
>index 7e59d7a..a5911e6 100644
>--- a/databases/metakit/Makefile
>+++ b/databases/metakit/Makefile
>@@ -20,43 +20,28 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/builds
> 
> OPTIONS_DEFINE=	PYTHON TCL DOCS
> OPTIONS_DEFAULT=	PYTHON
>+OPTIONS_SUB=	yes
> 
>-.include <bsd.port.options.mk>
>+PYTHON_CATEGORIES=	python
>+PYTHON_CONFIGURE_WITH=	python=${PYTHON_INCLUDEDIR},${PYTHON_SITELIBDIR}
>+PYTHON_USES=		python
> 
>-.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
>+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}
>@@ -71,12 +56,12 @@ post-install:
> 	${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>
>diff --git a/databases/metakit/pkg-plist b/databases/metakit/pkg-plist
>index 533baa3..9b89695 100644
>--- a/databases/metakit/pkg-plist
>+++ b/databases/metakit/pkg-plist
>@@ -4,12 +4,12 @@ include/mk4str.h
> 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
>diff --git a/databases/py33-gdbm/Makefile b/databases/py33-gdbm/Makefile
>index 5259dfb..2ec825b 100644
>--- a/databases/py33-gdbm/Makefile
>+++ b/databases/py33-gdbm/Makefile
>@@ -2,6 +2,6 @@
> 
> MASTERDIR=	${.CURDIR}/../py-gdbm
> 
>-PYTHON_VERSION=	python3.3
>+PYTHON_VERSION=	cpython3.3
> 
> .include "${MASTERDIR}/Makefile"
>diff --git a/databases/py33-sqlite3/Makefile b/databases/py33-sqlite3/Makefile
>index e7feb3b..1acc351 100644
>--- a/databases/py33-sqlite3/Makefile
>+++ b/databases/py33-sqlite3/Makefile
>@@ -2,6 +2,6 @@
> 
> MASTERDIR=	${.CURDIR}/../py-sqlite3
> 
>-PYTHON_VERSION=	python3.3
>+PYTHON_VERSION=	cpython3.3
> 
> .include "${MASTERDIR}/Makefile"
>diff --git a/databases/py34-gdbm/Makefile b/databases/py34-gdbm/Makefile
>index 39e9f6c..807ffc6 100644
>--- a/databases/py34-gdbm/Makefile
>+++ b/databases/py34-gdbm/Makefile
>@@ -2,6 +2,6 @@
> 
> MASTERDIR=	${.CURDIR}/../py-gdbm
> 
>-PYTHON_VERSION=	python3.4
>+PYTHON_VERSION=	cpython3.4
> 
> .include "${MASTERDIR}/Makefile"
>diff --git a/databases/py34-sqlite3/Makefile b/databases/py34-sqlite3/Makefile
>index 139dbf7..9460ec9 100644
>--- a/databases/py34-sqlite3/Makefile
>+++ b/databases/py34-sqlite3/Makefile
>@@ -2,6 +2,6 @@
> 
> MASTERDIR=	${.CURDIR}/../py-sqlite3
> 
>-PYTHON_VERSION=	python3.4
>+PYTHON_VERSION=	cpython3.4
> 
> .include "${MASTERDIR}/Makefile"
>diff --git a/databases/py35-gdbm/Makefile b/databases/py35-gdbm/Makefile
>index 738b376..21fa5e3 100644
>--- a/databases/py35-gdbm/Makefile
>+++ b/databases/py35-gdbm/Makefile
>@@ -2,6 +2,6 @@
> 
> MASTERDIR=	${.CURDIR}/../py-gdbm
> 
>-PYTHON_VERSION=	python3.5
>+PYTHON_VERSION=	cpython3.5
> 
> .include "${MASTERDIR}/Makefile"
>diff --git a/databases/py35-sqlite3/Makefile b/databases/py35-sqlite3/Makefile
>index 5d6643e..3a4fa03 100644
>--- a/databases/py35-sqlite3/Makefile
>+++ b/databases/py35-sqlite3/Makefile
>@@ -2,6 +2,6 @@
> 
> MASTERDIR=	${.CURDIR}/../py-sqlite3
> 
>-PYTHON_VERSION=	python3.5
>+PYTHON_VERSION=	cpython3.5
> 
> .include "${MASTERDIR}/Makefile"
>diff --git a/devel/Makefile b/devel/Makefile
>index 0d7348c..0d98622 100644
>--- a/devel/Makefile
>+++ b/devel/Makefile
>@@ -4734,6 +4734,8 @@
>     SUBDIR += py3-vcversioner
>     SUBDIR += py3-xdg
>     SUBDIR += py3-yaml
>+    SUBDIR += pypy-setuptools27
>+    SUBDIR += pypy-setuptools33
>     SUBDIR += py_static_check
>     SUBDIR += pybugz
>     SUBDIR += pychecker
>diff --git a/devel/gps/Makefile b/devel/gps/Makefile
>index 72ccef6..71a149a 100644
>--- a/devel/gps/Makefile
>+++ b/devel/gps/Makefile
>@@ -33,7 +33,7 @@ USES=		ada:run gettext gmake perl5 pkgconfig python
> 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
>diff --git a/devel/libclc/Makefile b/devel/libclc/Makefile
>index dee3d2a..b81b797 100644
>--- a/devel/libclc/Makefile
>+++ b/devel/libclc/Makefile
>@@ -27,7 +27,7 @@ BROKEN_FreeBSD_9=	missing <system_error> header
> 
> 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
> 
>diff --git a/devel/libsearpc/Makefile b/devel/libsearpc/Makefile
>index 7b1dc08..8d9ff02 100644
>--- a/devel/libsearpc/Makefile
>+++ b/devel/libsearpc/Makefile
>@@ -39,7 +39,7 @@ PLIST_SUB=	USERS=${USERS} \
> 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>
>diff --git a/devel/libsoup/Makefile b/devel/libsoup/Makefile
>index 59048d9..0ea645f 100644
>--- a/devel/libsoup/Makefile
>+++ b/devel/libsoup/Makefile
>@@ -20,7 +20,7 @@ PORTSCOUT=	limitw:1,even
> .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 @@ CONFIGURE_ARGS=	--disable-more-warnings \
> 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 @@ CONFIGURE_ARGS+=--without-gnome
> 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
> 
>diff --git a/devel/newt/Makefile b/devel/newt/Makefile
>index 76a3a3b..e6a4d2f 100644
>--- a/devel/newt/Makefile
>+++ b/devel/newt/Makefile
>@@ -57,7 +57,12 @@ post-patch:
> 
> 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
>diff --git a/devel/py-cxx/pkg-plist b/devel/py-cxx/pkg-plist
>index 07f2cda..a6cb3ff 100644
>--- a/devel/py-cxx/pkg-plist
>+++ b/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
>diff --git a/devel/py-gobject/pkg-plist b/devel/py-gobject/pkg-plist
>index 8074638..45fa684 100644
>--- a/devel/py-gobject/pkg-plist
>+++ b/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
>diff --git a/devel/py-ice/Makefile b/devel/py-ice/Makefile
>index 243b53a..28080a8 100644
>--- a/devel/py-ice/Makefile
>+++ b/devel/py-ice/Makefile
>@@ -23,7 +23,7 @@ INSTALL_WRKSRC=	${WRKSRC}/python
> 
> 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}"
>diff --git a/devel/py-ocempgui/Makefile b/devel/py-ocempgui/Makefile
>index 4c0f499..ee8fca3 100644
>--- a/devel/py-ocempgui/Makefile
>+++ b/devel/py-ocempgui/Makefile
>@@ -14,8 +14,8 @@ COMMENT=	GUI toolkit in python
> 
> 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
>diff --git a/devel/py-setuptools27/Makefile b/devel/py-setuptools27/Makefile
>index bbf286f..11ecba7 100644
>--- a/devel/py-setuptools27/Makefile
>+++ b/devel/py-setuptools27/Makefile
>@@ -3,7 +3,7 @@
> 
> PKGNAMESUFFIX=	${PYTHON_SUFFIX}
> 
>-PYTHON_VERSION=	python2.7
>+PYTHON_VERSION=	cpython2.7
> 
> MASTERDIR=	${.CURDIR}/../py-setuptools
> 
>diff --git a/devel/py-setuptools33/Makefile b/devel/py-setuptools33/Makefile
>index 22b5049..2f46aae 100644
>--- a/devel/py-setuptools33/Makefile
>+++ b/devel/py-setuptools33/Makefile
>@@ -3,7 +3,7 @@
> 
> PKGNAMESUFFIX=	${PYTHON_SUFFIX}
> 
>-PYTHON_VERSION=	python3.3
>+PYTHON_VERSION=	cpython3.3
> 
> MASTERDIR=	${.CURDIR}/../py-setuptools
> 
>diff --git a/devel/py-setuptools34/Makefile b/devel/py-setuptools34/Makefile
>index b96700d..b39b3e6 100644
>--- a/devel/py-setuptools34/Makefile
>+++ b/devel/py-setuptools34/Makefile
>@@ -3,7 +3,7 @@
> 
> PKGNAMESUFFIX=	${PYTHON_SUFFIX}
> 
>-PYTHON_VERSION=	python3.4
>+PYTHON_VERSION=	cpython3.4
> 
> MASTERDIR=	${.CURDIR}/../py-setuptools
> 
>diff --git a/devel/py-setuptools35/Makefile b/devel/py-setuptools35/Makefile
>index de55b8b..93e1998 100644
>--- a/devel/py-setuptools35/Makefile
>+++ b/devel/py-setuptools35/Makefile
>@@ -3,7 +3,7 @@
> 
> PKGNAMESUFFIX=	${PYTHON_SUFFIX}
> 
>-PYTHON_VERSION=	python3.5
>+PYTHON_VERSION=	cpython3.5
> 
> MASTERDIR=	${.CURDIR}/../py-setuptools
> 
>diff --git a/devel/pypy-setuptools27/Makefile b/devel/pypy-setuptools27/Makefile
>new file mode 100644
>index 0000000..787ae08
>--- /dev/null
>+++ b/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"
>diff --git a/devel/pypy-setuptools33/Makefile b/devel/pypy-setuptools33/Makefile
>new file mode 100644
>index 0000000..ce4932f
>--- /dev/null
>+++ b/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"
>diff --git a/devel/pyside-tools/Makefile b/devel/pyside-tools/Makefile
>index 0b0470b..ab3b4bc 100644
>--- a/devel/pyside-tools/Makefile
>+++ b/devel/pyside-tools/Makefile
>@@ -13,7 +13,7 @@ LICENSE=	BSD3CLAUSE GPLv2
> 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
>diff --git a/devel/pyside/Makefile b/devel/pyside/Makefile
>index aa8b5bd..7544d4a 100644
>--- a/devel/pyside/Makefile
>+++ b/devel/pyside/Makefile
>@@ -16,7 +16,7 @@ LICENSE=	LGPL21
> 
> 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 @@ USE_QT4=	declarative designer gui help qmake_build \
> 		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
>diff --git a/devel/pyside/pkg-plist b/devel/pyside/pkg-plist
>index 621791b..9988183 100644
>--- a/devel/pyside/pkg-plist
>+++ b/devel/pyside/pkg-plist
>@@ -30,12 +30,12 @@ include/PySide/pysideqflags.h
> 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
>diff --git a/devel/pysvn/Makefile b/devel/pysvn/Makefile
>index b3879b5..12969f1 100644
>--- a/devel/pysvn/Makefile
>+++ b/devel/pysvn/Makefile
>@@ -21,7 +21,7 @@ PYDISTUTILS_CONFIGURE_TARGET=	configure
> 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
> 
>diff --git a/devel/shiboken/Makefile b/devel/shiboken/Makefile
>index c34bc98..c245de2 100644
>--- a/devel/shiboken/Makefile
>+++ b/devel/shiboken/Makefile
>@@ -16,8 +16,7 @@ LICENSE_COMB=	multi
> 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
>diff --git a/devel/shiboken/pkg-plist b/devel/shiboken/pkg-plist
>index d534702..84fea7c 100644
>--- a/devel/shiboken/pkg-plist
>+++ b/devel/shiboken/pkg-plist
>@@ -18,12 +18,12 @@ include/shiboken/shibokenbuffer.h
> 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
>diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile
>index 9ea53c9..e6a4503 100644
>--- a/editors/libreoffice/Makefile
>+++ b/editors/libreoffice/Makefile
>@@ -254,8 +254,8 @@ CONFIGURE_ENV=	DMAKE=${LOCALBASE}/bin/dmake \
> 		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
>diff --git a/editors/libreoffice4/Makefile b/editors/libreoffice4/Makefile
>index 6c1fc7f..5059a0f 100644
>--- a/editors/libreoffice4/Makefile
>+++ b/editors/libreoffice4/Makefile
>@@ -113,8 +113,8 @@ CONFIGURE_ENV=		DMAKE=${LOCALBASE}/bin/dmake \
> 			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 \
>diff --git a/emulators/gns3/Makefile b/emulators/gns3/Makefile
>index d4a1d72..d0253d0 100644
>--- a/emulators/gns3/Makefile
>+++ b/emulators/gns3/Makefile
>@@ -30,8 +30,7 @@ NO_ARCH=	yes
> 
> 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
> 
>diff --git a/games/kiki/Makefile b/games/kiki/Makefile
>index f18c233..0c560d0 100644
>--- a/games/kiki/Makefile
>+++ b/games/kiki/Makefile
>@@ -17,7 +17,8 @@ USES=		compiler dos2unix gmake python
> 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
>diff --git a/games/kiki/files/patch-linux-Makefile b/games/kiki/files/patch-linux-Makefile
>index 8d1f29f..7a38635 100644
>--- a/games/kiki/files/patch-linux-Makefile
>+++ b/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
>  
>diff --git a/games/pykawari/Makefile b/games/pykawari/Makefile
>index 8acf8f5..706b981 100644
>--- a/games/pykawari/Makefile
>+++ b/games/pykawari/Makefile
>@@ -20,8 +20,7 @@ BUILD_WRKSRC=	${WRKSRC}/build/src
> 
> 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
> 
>diff --git a/games/pykawari/files/patch-build_src_gcc.mak b/games/pykawari/files/patch-build_src_gcc.mak
>index 83f3840..9e098b5 100644
>--- a/games/pykawari/files/patch-build_src_gcc.mak
>+++ b/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
>  
>diff --git a/graphics/py-ming/Makefile b/graphics/py-ming/Makefile
>index b8e60b2..346efc1 100644
>--- a/graphics/py-ming/Makefile
>+++ b/graphics/py-ming/Makefile
>@@ -24,7 +24,7 @@ LIB_DEPENDS=	libfreetype.so:print/freetype2 \
> 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
>diff --git a/japanese/libtomoe-gtk/Makefile b/japanese/libtomoe-gtk/Makefile
>index 8256dc2..ee4c65a 100644
>--- a/japanese/libtomoe-gtk/Makefile
>+++ b/japanese/libtomoe-gtk/Makefile
>@@ -31,7 +31,7 @@ PLIST_SUB+=	GUCHARMAP="@comment "
> #.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
>diff --git a/japanese/tomoe/Makefile b/japanese/tomoe/Makefile
>index 8c1f2e6..a109d19 100644
>--- a/japanese/tomoe/Makefile
>+++ b/japanese/tomoe/Makefile
>@@ -19,7 +19,7 @@ USES=		gettext gmake libtool pathfix perl5 pkgconfig
> 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
>diff --git a/lang/pypy/Makefile.version b/lang/pypy/Makefile.version
>new file mode 100644
>index 0000000..fc62dae
>--- /dev/null
>+++ b/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
>diff --git a/lang/pypy3/Makefile.version b/lang/pypy3/Makefile.version
>new file mode 100644
>index 0000000..778bbbf
>--- /dev/null
>+++ b/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
>diff --git a/lang/python35/Makefile b/lang/python35/Makefile
>index 09804ee..b0a0063 100644
>--- a/lang/python35/Makefile
>+++ b/lang/python35/Makefile
>@@ -25,7 +25,7 @@ CPE_VERSION=	${DISTVERSION}
> 
> # 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
>diff --git a/mail/opensmtpd-extras-filter-python/Makefile b/mail/opensmtpd-extras-filter-python/Makefile
>index c7fa87c..599ba10 100644
>--- a/mail/opensmtpd-extras-filter-python/Makefile
>+++ b/mail/opensmtpd-extras-filter-python/Makefile
>@@ -8,7 +8,8 @@ COMMENT=		Python-script filter support for OpenSMTPD
> 
> 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
> 
>diff --git a/mail/opensmtpd-extras-queue-python/Makefile b/mail/opensmtpd-extras-queue-python/Makefile
>index 7923a72..eaa784f 100644
>--- a/mail/opensmtpd-extras-queue-python/Makefile
>+++ b/mail/opensmtpd-extras-queue-python/Makefile
>@@ -8,7 +8,8 @@ COMMENT=		Python queue support for OpenSMTPD
> 
> 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
> 
>diff --git a/mail/opensmtpd-extras-scheduler-python/Makefile b/mail/opensmtpd-extras-scheduler-python/Makefile
>index ff30fa6..40d2487 100644
>--- a/mail/opensmtpd-extras-scheduler-python/Makefile
>+++ b/mail/opensmtpd-extras-scheduler-python/Makefile
>@@ -8,7 +8,8 @@ COMMENT=		Python scheduler support for OpenSMTPD
> 
> 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
> 
>diff --git a/mail/opensmtpd-extras-table-python/Makefile b/mail/opensmtpd-extras-table-python/Makefile
>index 5876376..b7f8c70 100644
>--- a/mail/opensmtpd-extras-table-python/Makefile
>+++ b/mail/opensmtpd-extras-table-python/Makefile
>@@ -8,7 +8,8 @@ COMMENT=	Python table support for OpenSMTPD
> 
> 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
> 
>diff --git a/math/qtiplot/Makefile b/math/qtiplot/Makefile
>index 65dd42e..670e518 100644
>--- a/math/qtiplot/Makefile
>+++ b/math/qtiplot/Makefile
>@@ -41,7 +41,7 @@ PYTHON_USES=	python
> 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
> 
>diff --git a/math/qtiplot/files/patch-qtiplot__qtiplot.pro b/math/qtiplot/files/patch-qtiplot__qtiplot.pro
>index e935977..549e09a 100644
>--- a/math/qtiplot/files/patch-qtiplot__qtiplot.pro
>+++ b/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)
>diff --git a/multimedia/freevo/Makefile b/multimedia/freevo/Makefile
>index 0fac409..d3ddb68 100644
>--- a/multimedia/freevo/Makefile
>+++ b/multimedia/freevo/Makefile
>@@ -32,7 +32,7 @@ FREEVO_HOME=	/var/db/${FREEVO_USER}
> 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
>diff --git a/multimedia/freevo/files/freevo.in b/multimedia/freevo/files/freevo.in
>index 04a035b..ce5e990 100644
>--- a/multimedia/freevo/files/freevo.in
>+++ b/multimedia/freevo/files/freevo.in
>@@ -30,7 +30,7 @@ freevo_uid=`pw usershow ${freevo_user} | awk -F: '{print $3}'`
> 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
>diff --git a/net-mgmt/ccnet/Makefile b/net-mgmt/ccnet/Makefile
>index 243ea04..e6dae47 100644
>--- a/net-mgmt/ccnet/Makefile
>+++ b/net-mgmt/ccnet/Makefile
>@@ -63,8 +63,8 @@ post-install:
> 		${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>
>diff --git a/net-mgmt/seafile/Makefile b/net-mgmt/seafile/Makefile
>index 5c3aaf7..31ce274 100644
>--- a/net-mgmt/seafile/Makefile
>+++ b/net-mgmt/seafile/Makefile
>@@ -90,7 +90,7 @@ post-patch:
> .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 @@ post-install:
> 	${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 \
>diff --git a/print/system-config-printer/Makefile b/print/system-config-printer/Makefile
>index b0ef23b..1216beb 100644
>--- a/print/system-config-printer/Makefile
>+++ b/print/system-config-printer/Makefile
>@@ -30,8 +30,6 @@ USE_GNOME=	intlhack pygobject3
> 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
>diff --git a/sysutils/condor/Makefile b/sysutils/condor/Makefile
>index 02da353..7be262d 100644
>--- a/sysutils/condor/Makefile
>+++ b/sysutils/condor/Makefile
>@@ -41,8 +41,8 @@ LDFLAGS+=	-Wl,-rpath=${_GCC_RUNTIME}:${LOCALBASE}/lib:/usr/lib:/lib -fPIC
> # 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}
>diff --git a/sysutils/py-zfs/Makefile b/sysutils/py-zfs/Makefile
>index 2072c06..3e82cf7 100644
>--- a/sysutils/py-zfs/Makefile
>+++ b/sysutils/py-zfs/Makefile
>@@ -17,7 +17,7 @@ LICENSE_FILE=	${WRKSRC}/OPENSOLARIS.LICENSE
> 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}
>diff --git a/www/py33-requests/Makefile b/www/py33-requests/Makefile
>index 78a206e..9442845 100644
>--- a/www/py33-requests/Makefile
>+++ b/www/py33-requests/Makefile
>@@ -2,6 +2,6 @@
> 
> MASTERDIR=	${.CURDIR}/../py-requests
> 
>-PYTHON_VERSION=	python3.3
>+PYTHON_VERSION=	cpython3.3
> 
> .include "${MASTERDIR}/Makefile"
>diff --git a/www/py34-requests/Makefile b/www/py34-requests/Makefile
>index bc6ef8c..a24fea2 100644
>--- a/www/py34-requests/Makefile
>+++ b/www/py34-requests/Makefile
>@@ -2,6 +2,6 @@
> 
> MASTERDIR=	${.CURDIR}/../py-requests
> 
>-PYTHON_VERSION=	python3.4
>+PYTHON_VERSION=	cpython3.4
> 
> .include "${MASTERDIR}/Makefile"
>diff --git a/www/py35-requests/Makefile b/www/py35-requests/Makefile
>index 242468f..2b54ff0 100644
>--- a/www/py35-requests/Makefile
>+++ b/www/py35-requests/Makefile
>@@ -2,6 +2,6 @@
> 
> MASTERDIR=	${.CURDIR}/../py-requests
> 
>-PYTHON_VERSION=	python3.5
>+PYTHON_VERSION=	cpython3.5
> 
> .include "${MASTERDIR}/Makefile"
>diff --git a/www/uzbl/Makefile b/www/uzbl/Makefile
>index e35a992..1e77143 100644
>--- a/www/uzbl/Makefile
>+++ b/www/uzbl/Makefile
>@@ -28,7 +28,7 @@ GH_ACCOUNT=	uzbl
> 
> OPTIONS_DEFINE=	DOCS
> 
>-MAKE_ENV+=	PYTHON=${PYTHON_VERSION}
>+MAKE_ENV+=	PYTHON=${PYTHON_CMD}
> 
> .include <bsd.port.options.mk>
> 
>diff --git a/www/webkit-qt5/Makefile b/www/webkit-qt5/Makefile
>index ab7b8f8..0bb74f2 100644
>--- a/www/webkit-qt5/Makefile
>+++ b/www/webkit-qt5/Makefile
>@@ -56,14 +56,15 @@ BUILD_DEPENDS+=	${LOCALBASE}/bin/ld:devel/binutils
> .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:
>diff --git a/x11-toolkits/py33-tkinter/Makefile b/x11-toolkits/py33-tkinter/Makefile
>index 50f0da0..378bc4b 100644
>--- a/x11-toolkits/py33-tkinter/Makefile
>+++ b/x11-toolkits/py33-tkinter/Makefile
>@@ -2,6 +2,6 @@
> 
> MASTERDIR=	${.CURDIR}/../py-tkinter
> 
>-PYTHON_VERSION=	python3.3
>+PYTHON_VERSION=	cpython3.3
> 
> .include "${MASTERDIR}/Makefile"
>diff --git a/x11-toolkits/py34-tkinter/Makefile b/x11-toolkits/py34-tkinter/Makefile
>index fc8c8a6..2bd817d 100644
>--- a/x11-toolkits/py34-tkinter/Makefile
>+++ b/x11-toolkits/py34-tkinter/Makefile
>@@ -2,6 +2,6 @@
> 
> MASTERDIR=	${.CURDIR}/../py-tkinter
> 
>-PYTHON_VERSION=	python3.4
>+PYTHON_VERSION=	cpython3.4
> 
> .include "${MASTERDIR}/Makefile"
>diff --git a/x11-toolkits/py35-tkinter/Makefile b/x11-toolkits/py35-tkinter/Makefile
>index 59e6234..8534329 100644
>--- a/x11-toolkits/py35-tkinter/Makefile
>+++ b/x11-toolkits/py35-tkinter/Makefile
>@@ -2,6 +2,6 @@
> 
> MASTERDIR=	${.CURDIR}/../py-tkinter
> 
>-PYTHON_VERSION=	python3.5
>+PYTHON_VERSION=	cpython3.5
> 
> .include "${MASTERDIR}/Makefile"

Actions: View | Diff

Attachments on bug 213737: 176092 | 176102 | 178193