1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-08 06:48:28 +00:00

Mk: switch from PYTHON_PORTVERSION to PYTHON_DISTVERSION

This brings python framework in consistense with handbook recommendations
to prefer DISTVERSION and simplifies adding prerelease versions of
python

PR:		255013
Differential Revision:	https://reviews.freebsd.org/D29418
Exp-run by:	antoine
Approved by:	wen@, no objection from python@ or portmgr@
This commit is contained in:
Dmitry Marakasov 2021-04-09 16:28:59 +03:00
parent 40d7b48738
commit 5f69415313
19 changed files with 62 additions and 63 deletions
Mk/Uses
databases
py-gdbm
py-sqlite3
lang
x11-toolkits/py-tkinter

View File

@ -168,8 +168,8 @@
# 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
#
@ -458,7 +458,7 @@ PYTHON_PORTSDIR= ${_PYTHON_RELPORTDIR}${PYTHON_SUFFIX}
# 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-9]\.[0-9]+)/.0\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}

View File

@ -1,12 +1,12 @@
# Created by: Thomas Gellekum <tg@FreeBSD.org>
PORTNAME= gdbm
PORTVERSION= ${PYTHON_PORTVERSION}
DISTVERSION= ${PYTHON_DISTVERSION}
PORTREVISION= 6
CATEGORIES= databases python
MASTER_SITES= PYTHON/ftp/python/${PORTVERSION}
MASTER_SITES= PYTHON/ftp/python/${DISTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= Python-${PORTVERSION}
DISTNAME= Python-${DISTVERSION}
MAINTAINER= python@FreeBSD.org
COMMENT= Python bindings to the GNU dbm library (Python ${PYTHON_VER})
@ -24,7 +24,7 @@ PYDISTUTILS_INSTALLARGS+= --install-lib ${PYTHONPREFIX_LIBDIR}/lib-dynload
DIST_SUBDIR= python
DISTINFO_FILE= ${PORTSDIR}/lang/python${PYTHON_SUFFIX}/distinfo
WRKSRC= ${WRKDIR}/Python-${PORTVERSION}/Modules
WRKSRC= ${WRKDIR}/Python-${DISTVERSION}/Modules
post-extract:
@${CP} ${FILESDIR}/setup3.py ${WRKSRC}/setup.py

View File

@ -1,19 +1,19 @@
# Created by: Hye-Shik Chang
PORTNAME= sqlite3
PORTVERSION= ${PYTHON_PORTVERSION}
DISTVERSION= ${PYTHON_DISTVERSION}
PORTREVISION= 7
CATEGORIES= databases python
MASTER_SITES= PYTHON/ftp/python/${PORTVERSION}
MASTER_SITES= PYTHON/ftp/python/${DISTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= Python-${PORTVERSION}
DISTNAME= Python-${DISTVERSION}
DIST_SUBDIR= python
MAINTAINER= python@FreeBSD.org
COMMENT= Standard Python binding to the SQLite3 library (Python ${PYTHON_VER})
LICENSE= PSFL
LICENSE_FILE= ${WRKDIR}/Python-${PORTVERSION}/LICENSE
LICENSE_FILE= ${WRKDIR}/Python-${DISTVERSION}/LICENSE
LIB_DEPENDS= libsqlite3.so:databases/sqlite3
@ -23,7 +23,7 @@ USES= compiler:c11 python:2.7+ tar:xz
USE_PYTHON= autoplist distutils allflavors
DISTINFO_FILE= ${PORTSDIR}/lang/python${PYTHON_SUFFIX}/distinfo
WRKSRC= ${WRKDIR}/Python-${PORTVERSION}/Modules
WRKSRC= ${WRKDIR}/Python-${DISTVERSION}/Modules
PYDISTUTILS_INSTALLARGS+= --install-lib ${PYTHON_LIBDIR}/lib-dynload

View File

@ -12,7 +12,7 @@ FLAVORS= pypy pypy3
FLAVOR?= ${FLAVORS:[1]}
PYTHON_IMPL= ${FLAVOR}
PYTHON_PORTVERSION= ${DISTVERSION}
PYTHON_DISTVERSION= ${DISTVERSION}
PYTHON_PKGNAMEPREFIX= ${PYTHON_IMPL}-
PYTHON_CMD= ${LOCALBASE}/bin/${PYTHON_IMPL}

View File

@ -1,11 +1,11 @@
# Created by: Thomas Gellekum <tg@FreeBSD.org>
PORTNAME= python-doc-${DOCFORMAT}
PORTVERSION= ${PYTHON_PORTVERSION}
DISTVERSION= ${PYTHON_DISTVERSION}
CATEGORIES= lang python
MASTER_SITES?= PYTHON/ftp/python/doc/${PORTVERSION} \
MASTER_SITES= PYTHON/ftp/python/doc/${DISTVERSION} \
PYTHON/ftp/python/doc/current
DISTNAME= python-${PORTVERSION}-docs-${DOCFORMAT}
DISTNAME= python-${DISTVERSION}-docs-${DOCFORMAT}
DIST_SUBDIR= python
MAINTAINER= python@FreeBSD.org
@ -37,8 +37,7 @@ _VERS!= ${MAKE} -V _PYTHON_VERSIONS:O
.endif
all_python_versions:
.for v in ${_VERS}
@${MAKE} -C ${PORTSDIR}/lang/python${v:S/.//} -V PYTHON_PORTVERSION
@${MAKE} -C ${PORTSDIR}/lang/python${v:S/.//} -V PYTHON_DISTVERSION
.endfor
.if make(makesum)

View File

@ -1,10 +1,10 @@
PORTNAME= python-tools
PORTVERSION= ${PYTHON_PORTVERSION}
DISTVERSION= ${PYTHON_DISTVERSION}
PORTREVISION= 1
CATEGORIES= lang python devel
MASTER_SITES= PYTHON/ftp/python/${PORTVERSION}
MASTER_SITES= PYTHON/ftp/python/${DISTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= Python-${PORTVERSION}
DISTNAME= Python-${DISTVERSION}
MAINTAINER= python@FreeBSD.org
COMMENT= Supplementary tools for the Python language

View File

@ -1,10 +1,10 @@
PORTNAME= python
PORTVERSION= ${PYTHON_PORTVERSION}
DISTVERSION= ${PYTHON_DISTVERSION}
PORTREVISION= 1
CATEGORIES= lang python
MASTER_SITES= PYTHON/ftp/python/${PORTVERSION}
MASTER_SITES= PYTHON/ftp/python/${DISTVERSION}
PKGNAMESUFFIX= 27
DISTNAME= Python-${PORTVERSION}
DISTNAME= Python-${DISTVERSION}
DIST_SUBDIR= python
MAINTAINER= python@FreeBSD.org
@ -19,7 +19,7 @@ USES= cpe ncurses pathfix pkgconfig readline shebangfix ssl tar:xz
PATHFIX_MAKEFILEIN= Makefile.pre.in
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
python_CMD= ${PREFIX}/bin/python${PYTHON_PORTVERSION:R}
python_CMD= ${PREFIX}/bin/python${PYTHON_DISTVERSION:R}
SHEBANG_FILES= Lib/lib2to3/pgen2/*.py Lib/lib2to3/tests/*.py Lib/lib2to3/tests/data/*.py \
Lib/idlelib/*.py Lib/encodings/*.py Lib/test/*.py Lib/UserString.py \
Lib/base64.py Lib/cProfile.py Lib/keyword.py Lib/mimify.py Lib/pdb.py \
@ -38,7 +38,7 @@ TEST_ARGS= TESTOPTS=-j${MAKE_JOBS_NUMBER}
MAKE_ARGS+= INSTALL_SHARED="${INSTALL_LIB}" # Strip shared library
PLIST_SUB= ABI=${ABIFLAGS} \
PORTVERSION=${PORTVERSION} \
DISTVERSION=${DISTVERSION} \
OSMAJOR=${OSVERSION:C/([0-9]*)[0-9]{5}/\1/} # For plat-freebsd* in pkg-plist. https://bugs.python.org/issue19554
OPTIONS_DEFINE= DEBUG IPV6 LIBFFI NLS PYMALLOC THREADS

View File

@ -2,4 +2,4 @@
# Do not forget to update python documentation (lang/python-doc-*)
# Run "make -C lang/python-doc-html makesum"
PYTHON_PORTVERSION= 2.7.18
PYTHON_DISTVERSION= 2.7.18

View File

@ -1892,7 +1892,7 @@ lib/python2.7/json/tool.pyo
lib/python2.7/keyword.py
lib/python2.7/keyword.pyc
lib/python2.7/keyword.pyo
lib/python2.7/lib-dynload/Python-%%PORTVERSION%%-py2.7.egg-info
lib/python2.7/lib-dynload/Python-%%DISTVERSION%%-py2.7.egg-info
lib/python2.7/lib-dynload/_bisect.so
lib/python2.7/lib-dynload/_codecs_cn.so
lib/python2.7/lib-dynload/_codecs_hk.so
@ -2065,9 +2065,9 @@ lib/python2.7/lib-tk/ttk.pyo
lib/python2.7/lib-tk/turtle.py
lib/python2.7/lib-tk/turtle.pyc
lib/python2.7/lib-tk/turtle.pyo
lib/python2.7/lib2to3/Grammar%%PORTVERSION%%.final.0.pickle
lib/python2.7/lib2to3/Grammar%%DISTVERSION%%.final.0.pickle
lib/python2.7/lib2to3/Grammar.txt
lib/python2.7/lib2to3/PatternGrammar%%PORTVERSION%%.final.0.pickle
lib/python2.7/lib2to3/PatternGrammar%%DISTVERSION%%.final.0.pickle
lib/python2.7/lib2to3/PatternGrammar.txt
lib/python2.7/lib2to3/__init__.py
lib/python2.7/lib2to3/__init__.pyc

View File

@ -1,11 +1,11 @@
# Created by: Kubilay Kocak <koobs@FreeBSD.org>
PORTNAME= python
PORTVERSION= ${PYTHON_PORTVERSION}
DISTVERSION= ${PYTHON_DISTVERSION}
CATEGORIES= lang python
MASTER_SITES= PYTHON/ftp/python/${PORTVERSION}
MASTER_SITES= PYTHON/ftp/python/${DISTVERSION}
PKGNAMESUFFIX= ${PYTHON_SUFFIX}
DISTNAME= Python-${PORTVERSION}
DISTNAME= Python-${DISTVERSION}
DIST_SUBDIR= python
# Resolve sinpi name clash with libm (IEEE-754 violation)
@ -22,11 +22,11 @@ USES= cpe ncurses pathfix pkgconfig readline shebangfix ssl tar:xz
PATHFIX_MAKEFILEIN= Makefile.pre.in
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
python_CMD= ${PREFIX}/bin/python${PYTHON_PORTVERSION:R}
python_CMD= ${PREFIX}/bin/python${PYTHON_DISTVERSION:R}
SHEBANG_FILES= Lib/*.py Lib/*/*.py Lib/*/*/*.py Lib/*/*/*/*.py
# Duplicate python.mk variables. TODO: Let lang/python?? ports use python.mk bits.
PYTHON_VER= ${PYTHON_PORTVERSION:R}
PYTHON_VER= ${PYTHON_DISTVERSION:R}
PYTHON_VERSION= python${PYTHON_VER}
PYTHON_SUFFIX= ${PYTHON_VER:S/.//g}
@ -47,7 +47,7 @@ SUB_LIST= PYTHON_SUFFIX=${PYTHON_SUFFIX}
PLIST_SUB= ABI=${ABIFLAGS} \
XY=${PYTHON_SUFFIX} \
XYDOT=${PYTHON_VER} \
XYZDOT=${PORTVERSION} \
XYZDOT=${DISTVERSION} \
OSMAJOR=${OSVERSION:C/([0-9]*)[0-9]{5}/\1/} # For plat-freebsd* in pkg-plist. https://bugs.python.org/issue19554
OPTIONS_DEFINE= DEBUG IPV6 LIBFFI NLS PYMALLOC THREADS

View File

@ -2,4 +2,4 @@
# Do not forget to update python documentation (lang/python-doc-*)
# Run "make -C lang/python-doc-html makesum"
PYTHON_PORTVERSION= 3.6.13
PYTHON_DISTVERSION= 3.6.13

View File

@ -1,12 +1,12 @@
# Created by: Kubilay Kocak <koobs@FreeBSD.org>
PORTNAME= python
PORTVERSION= ${PYTHON_PORTVERSION}
DISTVERSION= ${PYTHON_DISTVERSION}
PORTREVISION= 1
CATEGORIES= lang python
MASTER_SITES= PYTHON/ftp/python/${PORTVERSION}
MASTER_SITES= PYTHON/ftp/python/${DISTVERSION}
PKGNAMESUFFIX= ${PYTHON_SUFFIX}
DISTNAME= Python-${PORTVERSION}
DISTNAME= Python-${DISTVERSION}
DIST_SUBDIR= python
MAINTAINER= python@FreeBSD.org
@ -21,11 +21,11 @@ USES= cpe ncurses pathfix pkgconfig readline shebangfix ssl tar:xz
PATHFIX_MAKEFILEIN= Makefile.pre.in
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
python_CMD= ${PREFIX}/bin/python${PYTHON_PORTVERSION:R}
python_CMD= ${PREFIX}/bin/python${PYTHON_DISTVERSION:R}
SHEBANG_FILES= Lib/*.py Lib/*/*.py Lib/*/*/*.py Lib/*/*/*/*.py
# Duplicate python.mk variables. TODO: Let lang/python?? ports use python.mk bits.
PYTHON_VER= ${PYTHON_PORTVERSION:R}
PYTHON_VER= ${PYTHON_DISTVERSION:R}
PYTHON_VERSION= python${PYTHON_VER}
PYTHON_SUFFIX= ${PYTHON_VER:S/.//g}
@ -46,7 +46,7 @@ SUB_LIST= PYTHON_SUFFIX=${PYTHON_SUFFIX}
PLIST_SUB= ABI=${ABIFLAGS} \
XY=${PYTHON_SUFFIX} \
XYDOT=${PYTHON_VER} \
XYZDOT=${PORTVERSION} \
XYZDOT=${DISTVERSION} \
OSMAJOR=${OSVERSION:C/([0-9]*)[0-9]{5}/\1/} # For plat-freebsd* in pkg-plist. https://bugs.python.org/issue19554
OPTIONS_DEFINE= DEBUG IPV6 NLS PYMALLOC

View File

@ -2,4 +2,4 @@
# Do not forget to update python documentation (lang/python-doc-*)
# Run "make -C lang/python-doc-html makesum"
PYTHON_PORTVERSION= 3.7.10
PYTHON_DISTVERSION= 3.7.10

View File

@ -1,11 +1,11 @@
# Created by: Kubilay Kocak <koobs@FreeBSD.org>
PORTNAME= python
PORTVERSION= ${PYTHON_PORTVERSION}
DISTVERSION= ${PYTHON_DISTVERSION}
CATEGORIES= lang python
MASTER_SITES= PYTHON/ftp/python/${PORTVERSION}
MASTER_SITES= PYTHON/ftp/python/${DISTVERSION}
PKGNAMESUFFIX= ${PYTHON_SUFFIX}
DISTNAME= Python-${PORTVERSION}
DISTNAME= Python-${DISTVERSION}
DIST_SUBDIR= python
MAINTAINER= python@FreeBSD.org
@ -17,14 +17,14 @@ USES= cpe ncurses pathfix pkgconfig readline shebangfix ssl tar:xz
PATHFIX_MAKEFILEIN= Makefile.pre.in
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
python_CMD= ${PREFIX}/bin/python${PYTHON_PORTVERSION:R}
python_CMD= ${PREFIX}/bin/python${PYTHON_DISTVERSION:R}
SHEBANG_FILES= Lib/*.py Lib/*/*.py Lib/*/*/*.py Lib/*/*/*/*.py
SHEBANG_FILES+= Lib/test/ziptestdata/exe_with_z64 \
Lib/test/ziptestdata/exe_with_zip \
Lib/test/ziptestdata/header.sh
# Duplicate python.mk variables. TODO: Let lang/python?? ports use python.mk bits.
PYTHON_VER= ${PYTHON_PORTVERSION:R}
PYTHON_VER= ${PYTHON_DISTVERSION:R}
PYTHON_VERSION= python${PYTHON_VER}
PYTHON_SUFFIX= ${PYTHON_VER:S/.//g}
@ -45,7 +45,7 @@ SUB_LIST= PYTHON_SUFFIX=${PYTHON_SUFFIX}
PLIST_SUB= ABI=${ABIFLAGS} \
XY=${PYTHON_SUFFIX} \
XYDOT=${PYTHON_VER} \
XYZDOT=${PORTVERSION} \
XYZDOT=${DISTVERSION} \
OSMAJOR=${OSVERSION:C/([0-9]*)[0-9]{5}/\1/} # For plat-freebsd* in pkg-plist. https://bugs.python.org/issue19554
OPTIONS_DEFINE= DEBUG IPV6 LIBFFI LIBMPDEC NLS PYMALLOC

View File

@ -2,4 +2,4 @@
# Do not forget to update python documentation (lang/python-doc-*)
# Run "make -C lang/python-doc-html makesum"
PYTHON_PORTVERSION= 3.8.10
PYTHON_DISTVERSION= 3.8.10

View File

@ -1,11 +1,11 @@
# Created by: Kubilay Kocak <koobs@FreeBSD.org>
PORTNAME= python
PORTVERSION= ${PYTHON_PORTVERSION}
DISTVERSION= ${PYTHON_DISTVERSION}
CATEGORIES= lang python
MASTER_SITES= PYTHON/ftp/python/${PORTVERSION}
MASTER_SITES= PYTHON/ftp/python/${DISTVERSION}
PKGNAMESUFFIX= ${PYTHON_SUFFIX}
DISTNAME= Python-${PORTVERSION}
DISTNAME= Python-${DISTVERSION}
DIST_SUBDIR= python
MAINTAINER= python@FreeBSD.org
@ -18,14 +18,14 @@ USES= compiler:c11 cpe ncurses pathfix pkgconfig readline \
PATHFIX_MAKEFILEIN= Makefile.pre.in
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
python_CMD= ${PREFIX}/bin/python${PYTHON_PORTVERSION:R}
python_CMD= ${PREFIX}/bin/python${PYTHON_DISTVERSION:R}
SHEBANG_FILES= Lib/*.py Lib/*/*.py Lib/*/*/*.py Lib/*/*/*/*.py
SHEBANG_FILES+= Lib/test/ziptestdata/exe_with_z64 \
Lib/test/ziptestdata/exe_with_zip \
Lib/test/ziptestdata/header.sh
# Duplicate python.mk variables. TODO: Let lang/python?? ports use python.mk bits.
PYTHON_VER= ${PYTHON_PORTVERSION:R}
PYTHON_VER= ${PYTHON_DISTVERSION:R}
PYTHON_VERSION= python${PYTHON_VER}
PYTHON_SUFFIX= ${PYTHON_VER:S/.//g}
@ -46,7 +46,7 @@ SUB_LIST= PYTHON_SUFFIX=${PYTHON_SUFFIX}
PLIST_SUB= ABI=${ABIFLAGS} \
XY=${PYTHON_SUFFIX} \
XYDOT=${PYTHON_VER} \
XYZDOT=${PORTVERSION} \
XYZDOT=${DISTVERSION} \
OSMAJOR=${OSVERSION:C/([0-9]*)[0-9]{5}/\1/} # For plat-freebsd* in pkg-plist. https://bugs.python.org/issue19554
OPTIONS_DEFINE= DEBUG IPV6 LIBFFI LIBMPDEC NLS PYMALLOC

View File

@ -2,4 +2,4 @@
# Do not forget to update python documentation (lang/python-doc-*)
# Run "make -C lang/python-doc-html makesum"
PYTHON_PORTVERSION= 3.9.5
PYTHON_DISTVERSION= 3.9.5

View File

@ -98,7 +98,7 @@ THREADS_LDFLAGS= -lpthread
UCS2_CONFIGURE_ENABLE= unicode=ucs2
UCS4_CONFIGURE_ENABLE= unicode=ucs4
PYTHON_PORTVERSION= ${DISTVERSION}
PYTHON_DISTVERSION= ${DISTVERSION}
VERSION_NOMICRO= ${DISTVERSION:R}
NAME_VERSION= tauthon${VERSION_NOMICRO}

View File

@ -1,12 +1,12 @@
# Created by: Thomas Gellekum <tg@FreeBSD.org>
PORTNAME= tkinter
PORTVERSION= ${PYTHON_PORTVERSION}
DISTVERSION= ${PYTHON_DISTVERSION}
PORTREVISION= 6
CATEGORIES= x11-toolkits python
MASTER_SITES= PYTHON/ftp/python/${PORTVERSION}
MASTER_SITES= PYTHON/ftp/python/${DISTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= Python-${PORTVERSION}
DISTNAME= Python-${DISTVERSION}
MAINTAINER= python@FreeBSD.org
COMMENT= Python bindings to the Tk widget set (Python ${PYTHON_VER})
@ -20,7 +20,7 @@ USE_PYTHON= distutils autoplist allflavors
DIST_SUBDIR= python
DISTINFO_FILE= ${PORTSDIR}/lang/python${PYTHON_SUFFIX}/distinfo
WRKSRC= ${WRKDIR}/Python-${PORTVERSION}/Modules
WRKSRC= ${WRKDIR}/Python-${DISTVERSION}/Modules
PYDISTUTILS_INSTALLARGS+= --install-lib ${PYTHON_LIBDIR}/lib-dynload