Attachment #210535 for bug #243185




.if ${PYTHON2_DEFAULT} != ${PYTHON_DEFAULT} && ${PYTHON3_DEFAULT} != ${PYTHON_DEFAULT}
WARNING+=	"PYTHON_DEFAULT must be a version present in PYTHON2_DEFAULT or PYTHON3_DEFAULT, if you want more Python flavors, set BUILD_ALL_PYTHON_FLAVORS in your make.conf"
.endif

.if ${_PYTHON_ARGS} == "2"
DEV_ERROR+=		"USES=python:2 is no longer supported, use USES=python:2.7"
.elif ${_PYTHON_ARGS} == "3"
DEV_ERROR+=		"USES=python:3 is no longer supported, use USES=python:3.5+ or an appropriate version range"
.endif  # ${_PYTHON_ARGS} == "2"

.if defined(PYTHON_VERSION)
# A port/user requests a specific python version for its dependencies via
# DEPENDS_ARGS, since it requires the specific python version itself.
# Several things can happen now:
#	a) the dependency supports the requested version -> everything's fine
#	b) the dependency does not support the requested version
#		1) the dependency works in a way that the different python
#		   versions do not matter -> everything's fine
#		2) the dependency is likely to break due to the conflict
#		   nothing's fine
#
# b.2) needs to be resolved. Due to the complexity of how different pieces of
# software are built, we can't solve this automatically. Instead, let's assume
# 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//}
.else
_PYTHON_VERSION:=	${PYTHON_DEFAULT}
.endif # defined(PYTHON_VERSION)

# 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/}
_PYTHON_VERSION_MINIMUM:=	${_PYTHON_VERSION_MINIMUM_TMP:M[1-9].[0-9]}
_PYTHON_VERSION_MAXIMUM_TMP:=	${_PYTHON_VERSION_CHECK:C/.*-([1-9]\.[0-9])/\1/}
_PYTHON_VERSION_MAXIMUM:=	${_PYTHON_VERSION_MAXIMUM_TMP:M[1-9].[0-9]}

# At this point we should have no argument left in ${_PYTHON_ARGS}
# except a version spec


.undef _PYTHON_VERSION_NONSUPPORTED
.if !empty(_PYTHON_VERSION_MINIMUM) && (${_PYTHON_VERSION} < ${_PYTHON_VERSION_MINIMUM})
_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
.endif

# If we have an unsupported version of Python, try another.
.if defined(_PYTHON_VERSION_NONSUPPORTED)
.if defined(PYTHON_VERSION) || defined(PYTHON_CMD)
_PV:=		${_PYTHON_VERSION}	# preserve the specified python version
IGNORE=		needs Python ${_PYTHON_VERSION_NONSUPPORTED}, but ${_PV} was specified
.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) && \
	!(!empty(_PYTHON_VERSION_MINIMUM) && ( \
		${__VER} < ${_PYTHON_VERSION_MINIMUM})) && \
	!(!empty(_PYTHON_VERSION_MAXIMUM) && ( \
		${__VER} > ${_PYTHON_VERSION_MAXIMUM}))
_PYTHON_VERSION=	${ver}
.endif

.endif

# To avoid having dependencies with @ and empty flavor:
# _PYTHON_VERSION is either set by (first that matches):
# - If using Python flavors, from the current Python flavor
# - If using a version restriction (USES=python:3.5+), from the first
#   acceptable default Python version.
# - From PYTHON_DEFAULT
PY_FLAVOR=	py${_PYTHON_VERSION:S/.//}

PYTHON_VERSION=	python${_PYTHON_VERSION}
# 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}
.if !defined(PYTHON_NO_DEPENDS) && \
    ${PYTHON_VERSION} != python${PYTHON_DEFAULT}
DEPENDS_ARGS+=		PYTHON_VERSION=${PYTHON_VERSION}
.endif

# NOTE:
#
#  PYTHON_VERSION will hold whatever is passed down the dependency chain.
#  If a user runs `make PYTHON_VERSION=python3.5, PYTHON_VERSION will be
#  set to 'python3.5'. 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
#  this is the value, the _port_ requires
#

# Got the correct python version, set some publicly accessible variables
PYTHON_VER=		${_PYTHON_VERSION}
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})

RUN_DEPENDS+=	cython-${PYTHON_VER}:lang/cython@${PY_FLAVOR}
.endif

.if defined(_PYTHON_FEATURE_CONCURRENT)
.if !defined(_PYTHON_FEATURE_FLAVORS) && (${_PYTHON_VERSION_MINIMUM:M3*} || ${_PYTHON_VERSION_MAXIMUM:M2*})
DEV_WARNING+=	"USE_PYTHON=concurrent when only one of Python 2 or 3 is supported AND not using flavors does not make any sense"
.endif
_USES_POST+=		uniquefiles:dirs
.if defined(_PYTHON_FEATURE_FLAVORS) && ${FLAVOR} == ${FLAVORS:[1]}
UNIQUE_DEFAULT_LINKS=	yes
.elif !defined(_PYTHON_FEATURE_FLAVORS) && ${_PYTHON_VERSION} == ${PYTHON_DEFAULT}
UNIQUE_DEFAULT_LINKS=	yes
.else
UNIQUE_DEFAULT_LINKS=	no
.endif
UNIQUE_PREFIX=		${PYTHON_PKGNAMEPREFIX}
UNIQUE_SUFFIX=		-${PYTHON_VER}
UNIQUE_SUFFIX_TYPES+=	SUFFIX_MAN
UNIQUE_SUFFIX_MAN_WITH_EXT=	.[1-9ln]
UNIQUE_SUFFIX_MAN_EXTRA_EXT=	.gz





		bin/python \
		bin/python-config

do-install:
	${LN} -sf 2to3-${PYTHON_MAJOR_VER} ${STAGEDIR}${PREFIX}/bin/2to3
.for file in idle pydoc python
	${LN} -sf ${file}${PYTHON_MAJOR_VER} ${STAGEDIR}${PREFIX}/bin/${file}
.endfor
	${LN} -sf python${PYTHON_MAJOR_VER}-config ${STAGEDIR}${PREFIX}/bin/python-config

# Major upgrade support
PORTUPGRADE_CMD=	${LOCALBASE}/sbin/portupgrade

.if defined(USE_PORTMASTER)
PORTUPGRADE_CMD=	${LOCALBASE}/sbin/portmaster
.endif

PKG_LIST=	${PKG_BIN} query -a '%n-%v'
PKG_LIST_FILES=	${PKG_INFO} -l

upgrade-site-packages:
	@if [ ! -x ${PORTUPGRADE_CMD} ]; then \
		${ECHO_MSG} "Please install ports-mgmt/portupgrade."; \
		${FALSE}; \
	 fi

	@GREP_ARGS="-q"; \
	for ver in `echo ${_PYTHON_ALLBRANCHES:C/${PYTHON_VER}//}`; do \
		GREP_ARGS="$${GREP_ARGS} -e lib/python$$ver"; \
	done; \
	UPD=""; \
	for pkg in `${PKG_LIST}`; do \
		${PKG_LIST_FILES} $${pkg} | ${GREP} $${GREP_ARGS} && \
			UPD="$${UPD} $${pkg}"; \
	done; \
	if [ "$${UPD}" ]; then \
		if [ -n ${PORTUPGRADE_ARGS} ]; then \
			${PORTUPGRADE_CMD} ${PORTUPGRADE_ARGS} -f $${UPD}; \
		else \
			${PORTUPGRADE_CMD} -f $${UPD}; \
		fi; \
	fi; \

.include <bsd.port.mk>




MASTER_SITES=	# empty
DISTFILES=	# empty
EXTRACT_ONLY=	# empty

MAINTAINER=	python@FreeBSD.org
COMMENT=	The "meta-port" for version 2 of the Python interpreter

DEPRECATED=	EOLed upstream
EXPIRATION_DATE=	2020-12-31

USES=		python:2.7,run

NO_ARCH=	yes
NO_BUILD=	yes
PYTHON_VERSION=	python${PYTHON2_DEFAULT}

PLIST_FILES=	bin/2to3-${PYTHON_MAJOR_VER} \
		bin/idle${PYTHON_MAJOR_VER} \
		bin/pydoc${PYTHON_MAJOR_VER} \
		bin/python${PYTHON_MAJOR_VER} \
		bin/python${PYTHON_MAJOR_VER}-config \
		libdata/pkgconfig/python${PYTHON_MAJOR_VER}.pc

.include <bsd.port.pre.mk>

RUN_DEPENDS+=	${PYTHON_CMD}:${PYTHON_PORTSDIR}

do-install:
.for file in idle pydoc python
	${LN} -sf ${file}${PYTHON_VER} \
		${STAGEDIR}${PREFIX}/bin/${file}${PYTHON_MAJOR_VER}
.endfor
	${LN} -sf 2to3-${PYTHON_VER} \
		${STAGEDIR}${PREFIX}/bin/2to3-${PYTHON_MAJOR_VER}
	${LN} -sf python${PYTHON_VER}-config \
		${STAGEDIR}${PREFIX}/bin/python${PYTHON_MAJOR_VER}-config
	${LN} -sf python-${PYTHON_VER}.pc \
		${STAGEDIR}${PREFIX}/libdata/pkgconfig/python${PYTHON_MAJOR_VER}.pc

.include <bsd.port.mk>
PORTUPGRADE_CMD=	${LOCALBASE}/sbin/portupgrade

.if defined(USE_PORTMASTER)
PORTUPGRADE_CMD=	${LOCALBASE}/sbin/portmaster
.endif

PKG_LIST=	${PKG_BIN} query -a '%n-%v'
PKG_LIST_FILES=	${PKG_INFO} -l

.include <bsd.port.post.mk>




PORTVERSION=	${PYTHON_MAJOR_VER}
PORTREVISION=	3
CATEGORIES=	lang python
MASTER_SITES=
DISTFILES=
EXTRACT_ONLY=

MAINTAINER=	python@FreeBSD.org
COMMENT=	The "meta-port" for version 3 of the Python interpreter

USES=		python:3.5+,run

NO_ARCH=	yes
NO_BUILD=	yes
PYTHON_VERSION=	python${PYTHON3_DEFAULT}

PLIST_FILES=	bin/2to3-${PYTHON_MAJOR_VER} \
		bin/idle${PYTHON_MAJOR_VER} \
		bin/pydoc${PYTHON_MAJOR_VER} \
		bin/python${PYTHON_MAJOR_VER} \
		bin/python${PYTHON_MAJOR_VER}-config \
		libdata/pkgconfig/python${PYTHON_MAJOR_VER}.pc

.include <bsd.port.pre.mk>

RUN_DEPENDS+=	${PYTHON_CMD}:${PYTHON_PORTSDIR}

do-install:
	${LN} -sf python${PYTHON_VER} \
		${STAGEDIR}${PREFIX}/bin/python${PYTHON_MAJOR_VER}
	${LN} -sf 2to3-${PYTHON_VER} \
		${STAGEDIR}${PREFIX}/bin/2to3-${PYTHON_MAJOR_VER}
.for file in idle pydoc
	${LN} -sf ${file}${PYTHON_VER} \
		${STAGEDIR}${PREFIX}/bin/${file}${PYTHON_MAJOR_VER}
.endfor
	${LN} -sf python${PYTHON_VER}-config \
		${STAGEDIR}${PREFIX}/bin/python${PYTHON_MAJOR_VER}-config
	${LN} -sf python-${PYTHON_VER}.pc \
		${STAGEDIR}${PREFIX}/libdata/pkgconfig/python${PYTHON_MAJOR_VER}.pc

.include <bsd.port.mk>
PORTUPGRADE_CMD=	${LOCALBASE}/sbin/portupgrade

.if defined(USE_PORTMASTER)
PORTUPGRADE_CMD=	${LOCALBASE}/sbin/portmaster
.endif

PKG_LIST=	${PKG_BIN} query -a '%n-%v'
PKG_LIST_FILES=	${PKG_INFO} -l

.include <bsd.port.post.mk>

Return to bug 243185

Lines 323-362 _PYTHON_TEST_DEP= yes Link Here

(-)b/Mk/Uses/python.mk (-43 / +2 lines)
323	.if ${PYTHON2_DEFAULT} != ${PYTHON_DEFAULT} && ${PYTHON3_DEFAULT} != ${PYTHON_DEFAULT}	323	.if ${PYTHON2_DEFAULT} != ${PYTHON_DEFAULT} && ${PYTHON3_DEFAULT} != ${PYTHON_DEFAULT}
324	WARNING+= "PYTHON_DEFAULT must be a version present in PYTHON2_DEFAULT or PYTHON3_DEFAULT, if you want more Python flavors, set BUILD_ALL_PYTHON_FLAVORS in your make.conf"	324	WARNING+= "PYTHON_DEFAULT must be a version present in PYTHON2_DEFAULT or PYTHON3_DEFAULT, if you want more Python flavors, set BUILD_ALL_PYTHON_FLAVORS in your make.conf"
325	.endif	325	.endif
326		326
327	.if ${_PYTHON_ARGS} == "2"	327	.if ${_PYTHON_ARGS} == "2"
328	DEV_ERROR+= "USES=python:2 is no longer supported, use USES=python:2.7"	328	DEV_ERROR+= "USES=python:2 is no longer supported, use USES=python:2.7"
329	.elif ${_PYTHON_ARGS} == "3"	329	.elif ${_PYTHON_ARGS} == "3"
330	DEV_ERROR+= "USES=python:3 is no longer supported, use USES=python:3.5+ or an appropriate version range"	330	DEV_ERROR+= "USES=python:3 is no longer supported, use USES=python:3.5+ or an appropriate version range"
331	.endif # ${_PYTHON_ARGS} == "2"	331	.endif # ${_PYTHON_ARGS} == "2"
332		332
333	.if defined(PYTHON_VERSION)
334	# A port/user requests a specific python version for its dependencies via
335	# DEPENDS_ARGS, since it requires the specific python version itself.
336	# Several things can happen now:
337	# a) the dependency supports the requested version -> everything's fine
338	# b) the dependency does not support the requested version
339	# 1) the dependency works in a way that the different python
340	# versions do not matter -> everything's fine
341	# 2) the dependency is likely to break due to the conflict
342	# nothing's fine
343	#
344	# b.2) needs to be resolved. Due to the complexity of how different pieces of
345	# software are built, we can't solve this automatically. Instead, let's assume
346	# that maintainers know what they are doing and assume PYTHON_VERSION to be a
347	# hint. Just warn maintainers, if the versions do not match
348	# (_PYTHON_VERSION_NONSUPPORTED).
349	_PYTHON_VERSION:= ${PYTHON_VERSION:S/^python//}
350	.else
351	_PYTHON_VERSION:= ${PYTHON_DEFAULT}	333	_PYTHON_VERSION:= ${PYTHON_DEFAULT}
352	.endif # defined(PYTHON_VERSION)
353		334
354	# Validate Python version whether it meets the version restriction.	335	# Validate Python version whether it meets the version restriction.
355	_PYTHON_VERSION_CHECK:= ${_PYTHON_ARGS:C/^([1-9]\.[0-9])$/\1-\1/}	336	_PYTHON_VERSION_CHECK:= ${_PYTHON_ARGS:C/^([1-9]\.[0-9])$/\1-\1/}
356	_PYTHON_VERSION_MINIMUM_TMP:= ${_PYTHON_VERSION_CHECK:C/([1-9]\.[0-9])[-+].*/\1/}	337	_PYTHON_VERSION_MINIMUM_TMP:= ${_PYTHON_VERSION_CHECK:C/([1-9]\.[0-9])[-+].*/\1/}
357	_PYTHON_VERSION_MINIMUM:= ${_PYTHON_VERSION_MINIMUM_TMP:M[1-9].[0-9]}	338	_PYTHON_VERSION_MINIMUM:= ${_PYTHON_VERSION_MINIMUM_TMP:M[1-9].[0-9]}
358	_PYTHON_VERSION_MAXIMUM_TMP:= ${_PYTHON_VERSION_CHECK:C/.*-([1-9]\.[0-9])/\1/}	339	_PYTHON_VERSION_MAXIMUM_TMP:= ${_PYTHON_VERSION_CHECK:C/.*-([1-9]\.[0-9])/\1/}
359	_PYTHON_VERSION_MAXIMUM:= ${_PYTHON_VERSION_MAXIMUM_TMP:M[1-9].[0-9]}	340	_PYTHON_VERSION_MAXIMUM:= ${_PYTHON_VERSION_MAXIMUM_TMP:M[1-9].[0-9]}
360		341
361	# At this point we should have no argument left in ${_PYTHON_ARGS}	342	# At this point we should have no argument left in ${_PYTHON_ARGS}
362	# except a version spec	343	# except a version spec
Lines 367-390 IGNORE= uses unknown USES=python arguments: ${_PYTHON_ARGS} Link Here
367		348
368	.undef _PYTHON_VERSION_NONSUPPORTED	349	.undef _PYTHON_VERSION_NONSUPPORTED
369	.if !empty(_PYTHON_VERSION_MINIMUM) && (${_PYTHON_VERSION} < ${_PYTHON_VERSION_MINIMUM})	350	.if !empty(_PYTHON_VERSION_MINIMUM) && (${_PYTHON_VERSION} < ${_PYTHON_VERSION_MINIMUM})
370	_PYTHON_VERSION_NONSUPPORTED= ${_PYTHON_VERSION_MINIMUM} at least	351	_PYTHON_VERSION_NONSUPPORTED= ${_PYTHON_VERSION_MINIMUM} at least
371	.elif !empty(_PYTHON_VERSION_MAXIMUM) && (${_PYTHON_VERSION} > ${_PYTHON_VERSION_MAXIMUM})	352	.elif !empty(_PYTHON_VERSION_MAXIMUM) && (${_PYTHON_VERSION} > ${_PYTHON_VERSION_MAXIMUM})
372	_PYTHON_VERSION_NONSUPPORTED= ${_PYTHON_VERSION_MAXIMUM} at most	353	_PYTHON_VERSION_NONSUPPORTED= ${_PYTHON_VERSION_MAXIMUM} at most
373	.endif	354	.endif
374		355
375	# If we have an unsupported version of Python, try another.	356	# If we have an unsupported version of Python, try another.
376	.if defined(_PYTHON_VERSION_NONSUPPORTED)	357	.if defined(_PYTHON_VERSION_NONSUPPORTED)
377	.if defined(PYTHON_VERSION) \|\| defined(PYTHON_CMD)
378	_PV:= ${_PYTHON_VERSION} # preserve the specified python version
379	IGNORE= needs Python ${_PYTHON_VERSION_NONSUPPORTED}, but ${_PV} was specified
380	.endif # defined(PYTHON_VERSION) \|\| defined(PYTHON_CMD)
381	.undef _PYTHON_VERSION	358	.undef _PYTHON_VERSION
382	.for ver in ${PYTHON2_DEFAULT} ${PYTHON3_DEFAULT} ${_PYTHON_VERSIONS}	359	.for ver in ${PYTHON2_DEFAULT} ${PYTHON3_DEFAULT} ${_PYTHON_VERSIONS}
383	__VER= ${ver}	360	__VER= ${ver}
384	.if !defined(_PYTHON_VERSION) && \	361	.if !defined(_PYTHON_VERSION) && \
385	!(!empty(_PYTHON_VERSION_MINIMUM) && ( \	362	!(!empty(_PYTHON_VERSION_MINIMUM) && ( \
386	${__VER} < ${_PYTHON_VERSION_MINIMUM})) && \	363	${__VER} < ${_PYTHON_VERSION_MINIMUM})) && \
387	!(!empty(_PYTHON_VERSION_MAXIMUM) && ( \	364	!(!empty(_PYTHON_VERSION_MAXIMUM) && ( \
388	${__VER} > ${_PYTHON_VERSION_MAXIMUM}))	365	${__VER} > ${_PYTHON_VERSION_MAXIMUM}))
389	_PYTHON_VERSION= ${ver}	366	_PYTHON_VERSION= ${ver}
390	.endif	367	.endif
Lines 447-485 PKGNAMESUFFIX= ${PYTHON_PKGNAMESUFFIX} Link Here
447	.endif	424	.endif
448		425
449	# To avoid having dependencies with @ and empty flavor:	426	# To avoid having dependencies with @ and empty flavor:
450	# _PYTHON_VERSION is either set by (first that matches):	427	# _PYTHON_VERSION is either set by (first that matches):
451	# - If using Python flavors, from the current Python flavor	428	# - If using Python flavors, from the current Python flavor
452	# - If using a version restriction (USES=python:3.5+), from the first	429	# - If using a version restriction (USES=python:3.5+), from the first
453	# acceptable default Python version.	430	# acceptable default Python version.
454	# - From PYTHON_DEFAULT	431	# - From PYTHON_DEFAULT
455	PY_FLAVOR= py${_PYTHON_VERSION:S/.//}	432	PY_FLAVOR= py${_PYTHON_VERSION:S/.//}
456		433
457	# Pass PYTHON_VERSION down the dependency chain. This ensures that	434	PYTHON_VERSION= python${_PYTHON_VERSION}
458	# port A -> B -> C all will use the same python version and do not
459	# try to find a different one, if the passed version fits into
460	# the supported version range.
461	PYTHON_VERSION?= python${_PYTHON_VERSION}
462	.if !defined(PYTHON_NO_DEPENDS) && \
463	${PYTHON_VERSION} != python${PYTHON_DEFAULT}
464	DEPENDS_ARGS+= PYTHON_VERSION=${PYTHON_VERSION}
465	.endif
466
467	# NOTE:
468	#
469	# PYTHON_VERSION will hold whatever is passed down the dependency chain.
470	# If a user runs `make PYTHON_VERSION=python3.5, PYTHON_VERSION will be
471	# set to 'python3.5'. A port however may require a different version,
472	# which is stored (above) in _PYTHON_VERSION.
473	# Every python bit below hence should use python${_PYTHON_VERSION}, since
474	# this is the value, the _port_ requires
475	#
476		435
477	# Got the correct python version, set some publicly accessible variables	436	# Got the correct python version, set some publicly accessible variables
478	PYTHON_VER= ${_PYTHON_VERSION}	437	PYTHON_VER= ${_PYTHON_VERSION}
479	PYTHON_SUFFIX= ${_PYTHON_VERSION:S/.//g}	438	PYTHON_SUFFIX= ${_PYTHON_VERSION:S/.//g}
480	PYTHON_MAJOR_VER= ${PYTHON_VER:R}	439	PYTHON_MAJOR_VER= ${PYTHON_VER:R}
481	PYTHON_REL= # empty	440	PYTHON_REL= # empty
482	PYTHON_ABIVER= # empty	441	PYTHON_ABIVER= # empty
483	PYTHON_PORTSDIR= ${_PYTHON_RELPORTDIR}${PYTHON_SUFFIX}	442	PYTHON_PORTSDIR= ${_PYTHON_RELPORTDIR}${PYTHON_SUFFIX}
484	# Protect partial checkouts from Mk/Scripts/functions.sh:export_ports_env().	443	# Protect partial checkouts from Mk/Scripts/functions.sh:export_ports_env().
485	.if !defined(_PORTS_ENV_CHECK) \|\| exists(${PORTSDIR}/${PYTHON_PORTSDIR})	444	.if !defined(_PORTS_ENV_CHECK) \|\| exists(${PORTSDIR}/${PYTHON_PORTSDIR})
Lines 550-570 BUILD_DEPENDS+= cython-${PYTHON_VER}:lang/cython@${PY_FLAVOR} Link Here
550	RUN_DEPENDS+= cython-${PYTHON_VER}:lang/cython@${PY_FLAVOR}	509	RUN_DEPENDS+= cython-${PYTHON_VER}:lang/cython@${PY_FLAVOR}
551	.endif	510	.endif
552		511
553	.if defined(_PYTHON_FEATURE_CONCURRENT)	512	.if defined(_PYTHON_FEATURE_CONCURRENT)
554	.if !defined(_PYTHON_FEATURE_FLAVORS) && (${_PYTHON_VERSION_MINIMUM:M3} \|\| ${_PYTHON_VERSION_MAXIMUM:M2})	513	.if !defined(_PYTHON_FEATURE_FLAVORS) && (${_PYTHON_VERSION_MINIMUM:M3} \|\| ${_PYTHON_VERSION_MAXIMUM:M2})
555	DEV_WARNING+= "USE_PYTHON=concurrent when only one of Python 2 or 3 is supported AND not using flavors does not make any sense"	514	DEV_WARNING+= "USE_PYTHON=concurrent when only one of Python 2 or 3 is supported AND not using flavors does not make any sense"
556	.endif	515	.endif
557	_USES_POST+= uniquefiles:dirs	516	_USES_POST+= uniquefiles:dirs
558	.if defined(_PYTHON_FEATURE_FLAVORS) && ${FLAVOR} == ${FLAVORS:[1]}	517	.if defined(_PYTHON_FEATURE_FLAVORS) && ${FLAVOR} == ${FLAVORS:[1]}
559	UNIQUE_DEFAULT_LINKS= yes	518	UNIQUE_DEFAULT_LINKS= yes
560	.elif !defined(_PYTHON_FEATURE_FLAVORS) && ${PYTHON_VERSION} == python${PYTHON_DEFAULT}	519	.elif !defined(_PYTHON_FEATURE_FLAVORS) && ${_PYTHON_VERSION} == ${PYTHON_DEFAULT}
561	UNIQUE_DEFAULT_LINKS= yes	520	UNIQUE_DEFAULT_LINKS= yes
562	.else	521	.else
563	UNIQUE_DEFAULT_LINKS= no	522	UNIQUE_DEFAULT_LINKS= no
564	.endif	523	.endif
565	UNIQUE_PREFIX= ${PYTHON_PKGNAMEPREFIX}	524	UNIQUE_PREFIX= ${PYTHON_PKGNAMEPREFIX}
566	UNIQUE_SUFFIX= -${PYTHON_VER}	525	UNIQUE_SUFFIX= -${PYTHON_VER}
567	UNIQUE_SUFFIX_TYPES+= SUFFIX_MAN	526	UNIQUE_SUFFIX_TYPES+= SUFFIX_MAN
568	UNIQUE_SUFFIX_MAN_WITH_EXT= .[1-9ln]	527	UNIQUE_SUFFIX_MAN_WITH_EXT= .[1-9ln]
569	UNIQUE_SUFFIX_MAN_EXTRA_EXT= .gz	528	UNIQUE_SUFFIX_MAN_EXTRA_EXT= .gz
570		529

Lines 26-69 PLIST_FILES= bin/2to3 \ Link Here

(-)b/lang/python/Makefile (-33 lines)
26	bin/python \	26	bin/python \
27	bin/python-config	27	bin/python-config
28		28
29	do-install:	29	do-install:
30	${LN} -sf 2to3-${PYTHON_MAJOR_VER} ${STAGEDIR}${PREFIX}/bin/2to3	30	${LN} -sf 2to3-${PYTHON_MAJOR_VER} ${STAGEDIR}${PREFIX}/bin/2to3
31	.for file in idle pydoc python	31	.for file in idle pydoc python
32	${LN} -sf ${file}${PYTHON_MAJOR_VER} ${STAGEDIR}${PREFIX}/bin/${file}	32	${LN} -sf ${file}${PYTHON_MAJOR_VER} ${STAGEDIR}${PREFIX}/bin/${file}
33	.endfor	33	.endfor
34	${LN} -sf python${PYTHON_MAJOR_VER}-config ${STAGEDIR}${PREFIX}/bin/python-config	34	${LN} -sf python${PYTHON_MAJOR_VER}-config ${STAGEDIR}${PREFIX}/bin/python-config
35		35
36	# Major upgrade support
37	PORTUPGRADE_CMD= ${LOCALBASE}/sbin/portupgrade
38
39	.if defined(USE_PORTMASTER)
40	PORTUPGRADE_CMD= ${LOCALBASE}/sbin/portmaster
41	.endif
42
43	PKG_LIST= ${PKG_BIN} query -a '%n-%v'
44	PKG_LIST_FILES= ${PKG_INFO} -l
45
46	upgrade-site-packages:
47	@if [ ! -x ${PORTUPGRADE_CMD} ]; then \
48	${ECHO_MSG} "Please install ports-mgmt/portupgrade."; \
49	${FALSE}; \
50	fi
51
52	@GREP_ARGS="-q"; \
53	for ver in `echo ${_PYTHON_ALLBRANCHES:C/${PYTHON_VER}//}`; do \
54	GREP_ARGS="$${GREP_ARGS} -e lib/python$$ver"; \
55	done; \
56	UPD=""; \
57	for pkg in `${PKG_LIST}`; do \
58	${PKG_LIST_FILES} $${pkg} \| ${GREP} $${GREP_ARGS} && \
59	UPD="$${UPD} $${pkg}"; \
60	done; \
61	if [ "$${UPD}" ]; then \
62	if [ -n ${PORTUPGRADE_ARGS} ]; then \
63	${PORTUPGRADE_CMD} ${PORTUPGRADE_ARGS} -f $${UPD}; \
64	else \
65	${PORTUPGRADE_CMD} -f $${UPD}; \
66	fi; \
67	fi; \
68
69	.include <bsd.port.mk>	36	.include <bsd.port.mk>

Lines 7-56 CATEGORIES= lang python Link Here

(-)b/lang/python2/Makefile (-17 / +2 lines)
7	MASTER_SITES= # empty	7	MASTER_SITES= # empty
8	DISTFILES= # empty	8	DISTFILES= # empty
9	EXTRACT_ONLY= # empty	9	EXTRACT_ONLY= # empty
10		10
11	MAINTAINER= python@FreeBSD.org	11	MAINTAINER= python@FreeBSD.org
12	COMMENT= The "meta-port" for version 2 of the Python interpreter	12	COMMENT= The "meta-port" for version 2 of the Python interpreter
13		13
14	DEPRECATED= EOLed upstream	14	DEPRECATED= EOLed upstream
15	EXPIRATION_DATE= 2020-12-31	15	EXPIRATION_DATE= 2020-12-31
16		16
17	USES= python:run	17	USES= python:2.7,run
18		18
19	NO_ARCH= yes	19	NO_ARCH= yes
20	NO_BUILD= yes	20	NO_BUILD= yes
21	PYTHON_VERSION= python${PYTHON2_DEFAULT}
22		21
23	PLIST_FILES= bin/2to3-${PYTHON_MAJOR_VER} \	22	PLIST_FILES= bin/2to3-${PYTHON_MAJOR_VER} \
24	bin/idle${PYTHON_MAJOR_VER} \	23	bin/idle${PYTHON_MAJOR_VER} \
25	bin/pydoc${PYTHON_MAJOR_VER} \	24	bin/pydoc${PYTHON_MAJOR_VER} \
26	bin/python${PYTHON_MAJOR_VER} \	25	bin/python${PYTHON_MAJOR_VER} \
27	bin/python${PYTHON_MAJOR_VER}-config \	26	bin/python${PYTHON_MAJOR_VER}-config \
28	libdata/pkgconfig/python${PYTHON_MAJOR_VER}.pc	27	libdata/pkgconfig/python${PYTHON_MAJOR_VER}.pc
29		28
30	.include <bsd.port.pre.mk>
31
32	RUN_DEPENDS+= ${PYTHON_CMD}:${PYTHON_PORTSDIR}
33
34	do-install:	29	do-install:
35	.for file in idle pydoc python	30	.for file in idle pydoc python
36	${LN} -sf ${file}${PYTHON_VER} \	31	${LN} -sf ${file}${PYTHON_VER} \
37	${STAGEDIR}${PREFIX}/bin/${file}${PYTHON_MAJOR_VER}	32	${STAGEDIR}${PREFIX}/bin/${file}${PYTHON_MAJOR_VER}
38	.endfor	33	.endfor
39	${LN} -sf 2to3-${PYTHON_VER} \	34	${LN} -sf 2to3-${PYTHON_VER} \
40	${STAGEDIR}${PREFIX}/bin/2to3-${PYTHON_MAJOR_VER}	35	${STAGEDIR}${PREFIX}/bin/2to3-${PYTHON_MAJOR_VER}
41	${LN} -sf python${PYTHON_VER}-config \	36	${LN} -sf python${PYTHON_VER}-config \
42	${STAGEDIR}${PREFIX}/bin/python${PYTHON_MAJOR_VER}-config	37	${STAGEDIR}${PREFIX}/bin/python${PYTHON_MAJOR_VER}-config
43	${LN} -sf python-${PYTHON_VER}.pc \	38	${LN} -sf python-${PYTHON_VER}.pc \
44	${STAGEDIR}${PREFIX}/libdata/pkgconfig/python${PYTHON_MAJOR_VER}.pc	39	${STAGEDIR}${PREFIX}/libdata/pkgconfig/python${PYTHON_MAJOR_VER}.pc
45		40
46	# Major upgrade support	41	.include <bsd.port.mk>
47	PORTUPGRADE_CMD= ${LOCALBASE}/sbin/portupgrade
48
49	.if defined(USE_PORTMASTER)
50	PORTUPGRADE_CMD= ${LOCALBASE}/sbin/portmaster
51	.endif
52
53	PKG_LIST= ${PKG_BIN} query -a '%n-%v'
54	PKG_LIST_FILES= ${PKG_INFO} -l
55
56	.include <bsd.port.post.mk>

Lines 4-55 PORTNAME= python3 Link Here

(-)b/lang/python3/Makefile (-17 / +2 lines)
4	PORTVERSION= ${PYTHON_MAJOR_VER}	4	PORTVERSION= ${PYTHON_MAJOR_VER}
5	PORTREVISION= 3	5	PORTREVISION= 3
6	CATEGORIES= lang python	6	CATEGORIES= lang python
7	MASTER_SITES=	7	MASTER_SITES=
8	DISTFILES=	8	DISTFILES=
9	EXTRACT_ONLY=	9	EXTRACT_ONLY=
10		10
11	MAINTAINER= python@FreeBSD.org	11	MAINTAINER= python@FreeBSD.org
12	COMMENT= The "meta-port" for version 3 of the Python interpreter	12	COMMENT= The "meta-port" for version 3 of the Python interpreter
13		13
14	USES= python:run	14	USES= python:3.5+,run
15		15
16	NO_ARCH= yes	16	NO_ARCH= yes
17	NO_BUILD= yes	17	NO_BUILD= yes
18	PYTHON_VERSION= python${PYTHON3_DEFAULT}
19		18
20	PLIST_FILES= bin/2to3-${PYTHON_MAJOR_VER} \	19	PLIST_FILES= bin/2to3-${PYTHON_MAJOR_VER} \
21	bin/idle${PYTHON_MAJOR_VER} \	20	bin/idle${PYTHON_MAJOR_VER} \
22	bin/pydoc${PYTHON_MAJOR_VER} \	21	bin/pydoc${PYTHON_MAJOR_VER} \
23	bin/python${PYTHON_MAJOR_VER} \	22	bin/python${PYTHON_MAJOR_VER} \
24	bin/python${PYTHON_MAJOR_VER}-config \	23	bin/python${PYTHON_MAJOR_VER}-config \
25	libdata/pkgconfig/python${PYTHON_MAJOR_VER}.pc	24	libdata/pkgconfig/python${PYTHON_MAJOR_VER}.pc
26		25
27	.include <bsd.port.pre.mk>
28
29	RUN_DEPENDS+= ${PYTHON_CMD}:${PYTHON_PORTSDIR}
30
31	do-install:	26	do-install:
32	${LN} -sf python${PYTHON_VER} \	27	${LN} -sf python${PYTHON_VER} \
33	${STAGEDIR}${PREFIX}/bin/python${PYTHON_MAJOR_VER}	28	${STAGEDIR}${PREFIX}/bin/python${PYTHON_MAJOR_VER}
34	${LN} -sf 2to3-${PYTHON_VER} \	29	${LN} -sf 2to3-${PYTHON_VER} \
35	${STAGEDIR}${PREFIX}/bin/2to3-${PYTHON_MAJOR_VER}	30	${STAGEDIR}${PREFIX}/bin/2to3-${PYTHON_MAJOR_VER}
36	.for file in idle pydoc	31	.for file in idle pydoc
37	${LN} -sf ${file}${PYTHON_VER} \	32	${LN} -sf ${file}${PYTHON_VER} \
38	${STAGEDIR}${PREFIX}/bin/${file}${PYTHON_MAJOR_VER}	33	${STAGEDIR}${PREFIX}/bin/${file}${PYTHON_MAJOR_VER}
39	.endfor	34	.endfor
40	${LN} -sf python${PYTHON_VER}-config \	35	${LN} -sf python${PYTHON_VER}-config \
41	${STAGEDIR}${PREFIX}/bin/python${PYTHON_MAJOR_VER}-config	36	${STAGEDIR}${PREFIX}/bin/python${PYTHON_MAJOR_VER}-config
42	${LN} -sf python-${PYTHON_VER}.pc \	37	${LN} -sf python-${PYTHON_VER}.pc \
43	${STAGEDIR}${PREFIX}/libdata/pkgconfig/python${PYTHON_MAJOR_VER}.pc	38	${STAGEDIR}${PREFIX}/libdata/pkgconfig/python${PYTHON_MAJOR_VER}.pc
44		39
45	# Major upgrade support	40	.include <bsd.port.mk>
46	PORTUPGRADE_CMD= ${LOCALBASE}/sbin/portupgrade
47
48	.if defined(USE_PORTMASTER)
49	PORTUPGRADE_CMD= ${LOCALBASE}/sbin/portmaster
50	.endif
51
52	PKG_LIST= ${PKG_BIN} query -a '%n-%v'
53	PKG_LIST_FILES= ${PKG_INFO} -l
54
55	.include <bsd.port.post.mk>