Franco Fichtner
parent
6521ccef03
commit
665d5de5ce
8
CHANGES
8
CHANGES
|
|
@ -10,6 +10,14 @@ in the release notes and/or placed into UPDATING.
|
|||
|
||||
All ports committers are allowed to commit to this file.
|
||||
|
||||
20210525:
|
||||
AUTHOR: amdmi3@FreeBSD.org
|
||||
|
||||
PYTHON_REL has been switched from a 4 digits number to a 5 digits number to
|
||||
handle python 3.10.0. Ports checking for python 3.7.10 should compare
|
||||
PYTHON_REL against 30710 and ports checking for python 3.10.0 should compare
|
||||
PYTHON_REL against 31000.
|
||||
|
||||
20201120:
|
||||
AUTHOR: gnome@FreeBSD.org
|
||||
|
||||
|
|
|
|||
1
MOVED
1
MOVED
|
|
@ -6113,7 +6113,6 @@ security/sudosh3||2014-07-01|Has expired: Funcition replaced by sudo -s
|
|||
security/sudosh||2014-07-01|Has expired: Funcition replaced by sudo -s
|
||||
security/sudosh2||2014-07-01|Has expired: Funcition replaced by sudo -s
|
||||
lang/pike76|lang/pike78|2014-07-01|Has expired: Outdated: Users should switch to lang/pike78
|
||||
editors/gummi||2014-07-01|Has expired: Builds fine but the program itself is unusable
|
||||
archivers/rpm|archivers/rpm4|2014-07-03|rpm3 is long EOLed, rpm4 is the default rpm archivers for most of linux distributions
|
||||
x11-clocks/wmitime||2014-07-04|Has expired
|
||||
x11/xorg-edit||2014-07-04|Has expired: Depends on older version of wxGTK
|
||||
|
|
|
|||
2
Makefile
2
Makefile
|
|
@ -190,7 +190,7 @@ update:
|
|||
@echo "--------------------------------------------------------------"
|
||||
@echo ">>> Updating ${.CURDIR} from git repository"
|
||||
@echo "--------------------------------------------------------------"
|
||||
cd ${.CURDIR}; ${GIT} pull
|
||||
cd ${.CURDIR}; ${GIT} pull --rebase
|
||||
. endif
|
||||
.elif defined(RSYNC_UPDATE) && defined(PORTS_RSYNC_SOURCE)
|
||||
@echo "--------------------------------------------------------------"
|
||||
|
|
|
|||
|
|
@ -168,13 +168,13 @@
|
|||
# PYTHONBASE - The installation prefix of the chosen Python
|
||||
# interpreter, e.g. /usr/local
|
||||
#
|
||||
# PYTHON_PORTVERSION
|
||||
# - Version number suitable for ${PORTVERSION}.
|
||||
# PYTHON_DISTVERSION
|
||||
# - Version number suitable for ${DISTVERSION}.
|
||||
#
|
||||
# PYTHON_PORTSDIR - The port directory of the chosen Python interpreter
|
||||
#
|
||||
# PYTHON_REL - The release number of the chosen Python interpreter
|
||||
# without dots, e.g. 2706, 3401, ...
|
||||
# without dots, e.g. 20706, 30401, ...
|
||||
#
|
||||
# PYTHON_SUFFIX - The major-minor release number of the chosen Python
|
||||
# interpreter without dots, e.g. 27, 36, ...
|
||||
|
|
@ -337,23 +337,28 @@ _PYTHON_ARGS= 3.6+
|
|||
.endif
|
||||
|
||||
# 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]}
|
||||
_PYTHON_VERSION_CHECK:= ${_PYTHON_ARGS:C/^([1-9]\.[1-9]?[0-9])$/\1-\1/}
|
||||
_PYTHON_VERSION_MINIMUM_TMP:= ${_PYTHON_VERSION_CHECK:C/([1-9]\.[1-9]?[0-9])[-+].*/\1/}
|
||||
_PYTHON_VERSION_MINIMUM:= ${_PYTHON_VERSION_MINIMUM_TMP:M[1-9].[0-9]}${_PYTHON_VERSION_MINIMUM_TMP:M[1-9].[1-9][0-9]}
|
||||
_PYTHON_VERSION_MAXIMUM_TMP:= ${_PYTHON_VERSION_CHECK:C/.*-([1-9]\.[1-9]?[0-9])/\1/}
|
||||
_PYTHON_VERSION_MAXIMUM:= ${_PYTHON_VERSION_MAXIMUM_TMP:M[1-9].[0-9]}${_PYTHON_VERSION_MAXIMUM_TMP:M[1-9].[1-9][0-9]}
|
||||
|
||||
# At this point we should have no argument left in ${_PYTHON_ARGS}
|
||||
# except a version spec
|
||||
_PYTHON_ARGS:= ${_PYTHON_ARGS:N[1-9].[0-9]-[1-9].[0-9]:N[1-9].[0-9]:N[1-9].[0-9]+:N-[1-9].[0-9]}
|
||||
_V1= [1-9].[0-9]
|
||||
_V2= [1-9].[1-9][0-9]
|
||||
_PYTHON_ARGS:= ${_PYTHON_ARGS:N${_V1}-${_V1}:N${_V1}-${_V2}:N${_V2}-${_V2}:N${_V1}:N${_V2}:N${_V1}+:N${_V2}+:N-${_V1}:N-${_V2}}
|
||||
.if !empty(_PYTHON_ARGS)
|
||||
IGNORE= uses unknown USES=python arguments: ${_PYTHON_ARGS}
|
||||
.endif
|
||||
|
||||
# Pattern to convert python versions (X.Y or X.YY) to comparable format X.YY
|
||||
_VC= C/^([1-9]\.)([0-9])$$/\10\2/
|
||||
|
||||
.undef _PYTHON_VERSION_NONSUPPORTED
|
||||
.if !empty(_PYTHON_VERSION_MINIMUM) && (${_PYTHON_VERSION} < ${_PYTHON_VERSION_MINIMUM})
|
||||
.if !empty(_PYTHON_VERSION_MINIMUM) && (${_PYTHON_VERSION:${_VC}} < ${_PYTHON_VERSION_MINIMUM:${_VC}})
|
||||
_PYTHON_VERSION_NONSUPPORTED= ${_PYTHON_VERSION_MINIMUM} at least
|
||||
.elif !empty(_PYTHON_VERSION_MAXIMUM) && (${_PYTHON_VERSION} > ${_PYTHON_VERSION_MAXIMUM})
|
||||
.elif !empty(_PYTHON_VERSION_MAXIMUM) && (${_PYTHON_VERSION:${_VC}} > ${_PYTHON_VERSION_MAXIMUM:${_VC}})
|
||||
_PYTHON_VERSION_NONSUPPORTED= ${_PYTHON_VERSION_MAXIMUM} at most
|
||||
.endif
|
||||
|
||||
|
|
@ -364,9 +369,9 @@ _PYTHON_VERSION_NONSUPPORTED= ${_PYTHON_VERSION_MAXIMUM} at most
|
|||
__VER= ${ver}
|
||||
.if !defined(_PYTHON_VERSION) && \
|
||||
!(!empty(_PYTHON_VERSION_MINIMUM) && ( \
|
||||
${__VER} < ${_PYTHON_VERSION_MINIMUM})) && \
|
||||
${__VER:${_VC}} < ${_PYTHON_VERSION_MINIMUM:${_VC}})) && \
|
||||
!(!empty(_PYTHON_VERSION_MAXIMUM) && ( \
|
||||
${__VER} > ${_PYTHON_VERSION_MAXIMUM}))
|
||||
${__VER:${_VC}} > ${_PYTHON_VERSION_MAXIMUM:${_VC}}))
|
||||
_PYTHON_VERSION= ${ver}
|
||||
.endif
|
||||
.endfor
|
||||
|
|
@ -381,9 +386,9 @@ IGNORE= needs an unsupported version of Python
|
|||
. for ver in ${PYTHON_DEFAULT} ${PYTHON2_DEFAULT} ${PYTHON3_DEFAULT} ${_PYTHON_VERSIONS}
|
||||
__VER= ${ver}
|
||||
. if !(!empty(_PYTHON_VERSION_MINIMUM) && ( \
|
||||
${__VER} < ${_PYTHON_VERSION_MINIMUM})) && \
|
||||
${__VER:${_VC}} < ${_PYTHON_VERSION_MINIMUM:${_VC}})) && \
|
||||
!(!empty(_PYTHON_VERSION_MAXIMUM) && ( \
|
||||
${__VER} > ${_PYTHON_VERSION_MAXIMUM}))
|
||||
${__VER:${_VC}} > ${_PYTHON_VERSION_MAXIMUM:${_VC}}))
|
||||
. if empty(_VALID_PYTHON_VERSIONS:M${ver})
|
||||
_VALID_PYTHON_VERSIONS+= ${ver}
|
||||
. endif
|
||||
|
|
@ -416,7 +421,7 @@ FLAVOR= ${FLAVORS:[1]}
|
|||
. endif
|
||||
.endif
|
||||
|
||||
.if ${FLAVOR:Mpy[23][0-9]}
|
||||
.if ${FLAVOR:Mpy[23][0-9]}${FLAVOR:Mpy[23][1-9][0-9]}
|
||||
_PYTHON_VERSION= ${FLAVOR:S/py//:C/(.)/\1./}
|
||||
.endif
|
||||
|
||||
|
|
@ -449,24 +454,24 @@ PYTHON_PORTSDIR= ${_PYTHON_RELPORTDIR}${PYTHON_SUFFIX}
|
|||
.if !defined(_PORTS_ENV_CHECK) || exists(${PORTSDIR}/${PYTHON_PORTSDIR})
|
||||
.include "${PORTSDIR}/${PYTHON_PORTSDIR}/Makefile.version"
|
||||
.endif
|
||||
# Create a 4 integer version string, prefixing 0 to the last token if
|
||||
# it's a single character. Only use the the first 3 tokens of
|
||||
# Create a 5 integer version string, prefixing 0 to the minor and patch
|
||||
# tokens if it's a single character. Only use the the first 3 tokens of
|
||||
# PORTVERSION to support pre-release versions (rc3, alpha4, etc) of
|
||||
# any Python port (lang/pythonXY)
|
||||
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}
|
||||
PYTHON_REL= ${PYTHON_DISTVERSION:C/^([0-9]+\.[0-9]+\.[0-9]+).*/\1/:C/\.([0-9])$/.0\1/:C/\.([0-9]\.[0-9]+)/.0\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
|
||||
.elif ${PYTHON_REL} < 3800
|
||||
.elif ${PYTHON_REL} < 30800
|
||||
# Default ABI flags for lang/python3[67] ports
|
||||
PYTHON_ABIVER= m
|
||||
.endif
|
||||
.endif
|
||||
|
||||
.if ${PYTHON_REL} >= 3807
|
||||
.if ${PYTHON_REL} >= 30807
|
||||
PYTHON_EXT_SUFFIX= .cpython-${PYTHON_SUFFIX}
|
||||
.else
|
||||
PYTHON_EXT_SUFFIX= # empty
|
||||
|
|
@ -607,7 +612,7 @@ add-plist-pymod:
|
|||
${_PYTHONPKGLIST} | ${SORT} >> ${TMPPLIST}
|
||||
|
||||
.else
|
||||
.if ${PYTHON_REL} >= 3200 && defined(_PYTHON_FEATURE_PY3KPLIST)
|
||||
.if ${PYTHON_REL} >= 30200 && defined(_PYTHON_FEATURE_PY3KPLIST)
|
||||
# When Python version is 3.2+ we rewrite all the filenames
|
||||
# of TMPPLIST that end with .py[co], so that they conform
|
||||
# to PEP 3147 (see https://www.python.org/dev/peps/pep-3147/)
|
||||
|
|
@ -623,7 +628,7 @@ add-plist-python:
|
|||
pc="__pycache__" mt="$$(${PYMAGICTAG})" pyo="opt-1.pyc" \
|
||||
${TMPPLIST} > ${TMPPLIST}.pyc_tmp
|
||||
@${MV} ${TMPPLIST}.pyc_tmp ${TMPPLIST}
|
||||
.endif # ${PYTHON_REL} >= 3200 && defined(_PYTHON_FEATURE_PY3KPLIST)
|
||||
.endif # ${PYTHON_REL} >= 30200 && defined(_PYTHON_FEATURE_PY3KPLIST)
|
||||
.endif # defined(_PYTHON_FEATURE_AUTOPLIST) && defined(_PYTHON_FEATURE_DISTUTILS)
|
||||
|
||||
# Fix for programs that build python from a GNU auto* environment
|
||||
|
|
@ -638,7 +643,7 @@ PYGAME= ${PYTHON_PKGNAMEPREFIX}game>0:devel/py-game@${PY_FLAVOR}
|
|||
PYNUMPY= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16,1<1.20,1:math/py-numpy@${PY_FLAVOR}
|
||||
|
||||
# Common Python modules that can be needed but only for some versions of Python.
|
||||
.if ${PYTHON_REL} < 3500
|
||||
.if ${PYTHON_REL} < 30500
|
||||
PY_PYGMENTS= ${PYTHON_PKGNAMEPREFIX}pygments-25>=2.5.1<3:textproc/py-pygments-25@${PY_FLAVOR}
|
||||
.else
|
||||
PY_PILLOW= ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR}
|
||||
|
|
@ -678,7 +683,7 @@ PLIST_SUB+= PYTHON_INCLUDEDIR=${PYTHONPREFIX_INCLUDEDIR:S;${PREFIX}/;;} \
|
|||
PYTHON_EXT_SUFFIX=${PYTHON_EXT_SUFFIX} \
|
||||
PYTHON_VER=${PYTHON_VER} \
|
||||
PYTHON_VERSION=${PYTHON_VERSION}
|
||||
.if ${PYTHON_REL} < 3000
|
||||
.if ${PYTHON_REL} < 30000
|
||||
PLIST_SUB+= PYTHON2="" PYTHON3="@comment "
|
||||
.else
|
||||
PLIST_SUB+= PYTHON2="@comment " PYTHON3=""
|
||||
|
|
|
|||
Loading…
Reference in New Issue