View | Details | Raw Unified | Return to bug 255013 | Differences between
and this patch

Collapse All | Expand All

(-)Mk/Uses/python.mk (-3 / +3 lines)
Lines 168-175 Link Here
168
# PYTHONBASE		- The installation prefix of the chosen Python
168
# PYTHONBASE		- The installation prefix of the chosen Python
169
#			  interpreter, e.g. /usr/local
169
#			  interpreter, e.g. /usr/local
170
#
170
#
171
# PYTHON_PORTVERSION
171
# PYTHON_DISTVERSION
172
#			- Version number suitable for ${PORTVERSION}.
172
#			- Version number suitable for ${DISTVERSION}.
173
#
173
#
174
# PYTHON_PORTSDIR	- The port directory of the chosen Python interpreter
174
# PYTHON_PORTSDIR	- The port directory of the chosen Python interpreter
175
#
175
#
Lines 464-470 PYTHON_EXT_SUFFIX= # empty Link Here
464
# tokens if it's a single character. Only use the the first 3 tokens of
464
# tokens if it's a single character. Only use the the first 3 tokens of
465
# PORTVERSION to support pre-release versions (rc3, alpha4, etc) of
465
# PORTVERSION to support pre-release versions (rc3, alpha4, etc) of
466
# any Python port (lang/pythonXY)
466
# any Python port (lang/pythonXY)
467
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}
467
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}
468
468
469
# Might be overridden by calling ports
469
# Might be overridden by calling ports
470
PYTHON_CMD?=		${_PYTHON_BASECMD}${_PYTHON_VERSION}
470
PYTHON_CMD?=		${_PYTHON_BASECMD}${_PYTHON_VERSION}
(-)databases/py-gdbm/Makefile (-4 / +4 lines)
Lines 1-12 Link Here
1
# Created by: Thomas Gellekum <tg@FreeBSD.org>
1
# Created by: Thomas Gellekum <tg@FreeBSD.org>
2
2
3
PORTNAME=	gdbm
3
PORTNAME=	gdbm
4
PORTVERSION=	${PYTHON_PORTVERSION}
4
DISTVERSION=	${PYTHON_DISTVERSION}
5
PORTREVISION=	6
5
PORTREVISION=	6
6
CATEGORIES=	databases python
6
CATEGORIES=	databases python
7
MASTER_SITES=	PYTHON/ftp/python/${PORTVERSION}
7
MASTER_SITES=	PYTHON/ftp/python/${DISTVERSION}
8
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
8
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
9
DISTNAME=	Python-${PORTVERSION}
9
DISTNAME=	Python-${DISTVERSION}
10
10
11
MAINTAINER=	python@FreeBSD.org
11
MAINTAINER=	python@FreeBSD.org
12
COMMENT=	Python bindings to the GNU dbm library (Python ${PYTHON_VER})
12
COMMENT=	Python bindings to the GNU dbm library (Python ${PYTHON_VER})
Lines 24-30 PYDISTUTILS_INSTALLARGS+= --install-lib ${PYTHONPREFIX_LIBDIR}/lib-dynload Link Here
24
24
25
DIST_SUBDIR=	python
25
DIST_SUBDIR=	python
26
DISTINFO_FILE=	${PORTSDIR}/lang/python${PYTHON_SUFFIX}/distinfo
26
DISTINFO_FILE=	${PORTSDIR}/lang/python${PYTHON_SUFFIX}/distinfo
27
WRKSRC=		${WRKDIR}/Python-${PORTVERSION}/Modules
27
WRKSRC=		${WRKDIR}/Python-${DISTVERSION}/Modules
28
28
29
post-extract:
29
post-extract:
30
	@${CP} ${FILESDIR}/setup3.py ${WRKSRC}/setup.py
30
	@${CP} ${FILESDIR}/setup3.py ${WRKSRC}/setup.py
(-)databases/py-sqlite3/Makefile (-5 / +5 lines)
Lines 1-19 Link Here
1
# Created by: Hye-Shik Chang
1
# Created by: Hye-Shik Chang
2
2
3
PORTNAME=	sqlite3
3
PORTNAME=	sqlite3
4
PORTVERSION=	${PYTHON_PORTVERSION}
4
DISTVERSION=	${PYTHON_DISTVERSION}
5
PORTREVISION=	7
5
PORTREVISION=	7
6
CATEGORIES=	databases python
6
CATEGORIES=	databases python
7
MASTER_SITES=	PYTHON/ftp/python/${PORTVERSION}
7
MASTER_SITES=	PYTHON/ftp/python/${DISTVERSION}
8
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
8
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
9
DISTNAME=	Python-${PORTVERSION}
9
DISTNAME=	Python-${DISTVERSION}
10
DIST_SUBDIR=	python
10
DIST_SUBDIR=	python
11
11
12
MAINTAINER=	python@FreeBSD.org
12
MAINTAINER=	python@FreeBSD.org
13
COMMENT=	Standard Python binding to the SQLite3 library (Python ${PYTHON_VER})
13
COMMENT=	Standard Python binding to the SQLite3 library (Python ${PYTHON_VER})
14
14
15
LICENSE=	PSFL
15
LICENSE=	PSFL
16
LICENSE_FILE=	${WRKDIR}/Python-${PORTVERSION}/LICENSE
16
LICENSE_FILE=	${WRKDIR}/Python-${DISTVERSION}/LICENSE
17
17
18
LIB_DEPENDS=	libsqlite3.so:databases/sqlite3
18
LIB_DEPENDS=	libsqlite3.so:databases/sqlite3
19
19
Lines 23-29 USES= compiler:c11 python:2.7+ tar:xz Link Here
23
USE_PYTHON=	autoplist distutils allflavors
23
USE_PYTHON=	autoplist distutils allflavors
24
24
25
DISTINFO_FILE=	${PORTSDIR}/lang/python${PYTHON_SUFFIX}/distinfo
25
DISTINFO_FILE=	${PORTSDIR}/lang/python${PYTHON_SUFFIX}/distinfo
26
WRKSRC=		${WRKDIR}/Python-${PORTVERSION}/Modules
26
WRKSRC=		${WRKDIR}/Python-${DISTVERSION}/Modules
27
27
28
PYDISTUTILS_INSTALLARGS+=	--install-lib ${PYTHON_LIBDIR}/lib-dynload
28
PYDISTUTILS_INSTALLARGS+=	--install-lib ${PYTHON_LIBDIR}/lib-dynload
29
29
(-)lang/pypy/bsd.pypy.cffi.mk (-1 / +1 lines)
Lines 12-18 FLAVORS= pypy pypy3 Link Here
12
FLAVOR?=	${FLAVORS:[1]}
12
FLAVOR?=	${FLAVORS:[1]}
13
13
14
PYTHON_IMPL=	${FLAVOR}
14
PYTHON_IMPL=	${FLAVOR}
15
PYTHON_PORTVERSION=	${DISTVERSION}
15
PYTHON_DISTVERSION=	${DISTVERSION}
16
PYTHON_PKGNAMEPREFIX=	${PYTHON_IMPL}-
16
PYTHON_PKGNAMEPREFIX=	${PYTHON_IMPL}-
17
PYTHON_CMD=	${LOCALBASE}/bin/${PYTHON_IMPL}
17
PYTHON_CMD=	${LOCALBASE}/bin/${PYTHON_IMPL}
18
18
(-)lang/python-doc-html/Makefile (-4 / +4 lines)
Lines 1-11 Link Here
1
# Created by: Thomas Gellekum <tg@FreeBSD.org>
1
# Created by: Thomas Gellekum <tg@FreeBSD.org>
2
2
3
PORTNAME=	python-doc-${DOCFORMAT}
3
PORTNAME=	python-doc-${DOCFORMAT}
4
PORTVERSION=	${PYTHON_PORTVERSION}
4
DISTVERSION=	${PYTHON_DISTVERSION}
5
CATEGORIES=	lang python
5
CATEGORIES=	lang python
6
MASTER_SITES=	PYTHON/ftp/python/doc/${PORTVERSION} \
6
MASTER_SITES=	PYTHON/ftp/python/doc/${DISTVERSION} \
7
		PYTHON/ftp/python/doc/current
7
		PYTHON/ftp/python/doc/current
8
DISTNAME=	python-${PORTVERSION}-docs-${DOCFORMAT}
8
DISTNAME=	python-${DISTVERSION}-docs-${DOCFORMAT}
9
DIST_SUBDIR=	python
9
DIST_SUBDIR=	python
10
10
11
MAINTAINER=	python@FreeBSD.org
11
MAINTAINER=	python@FreeBSD.org
Lines 38-44 _VERS!= ${MAKE} -V _PYTHON_VERSIONS:O Link Here
38
38
39
all_python_versions:
39
all_python_versions:
40
.for v in ${_VERS}
40
.for v in ${_VERS}
41
	@${MAKE} -V PYTHON_PORTVERSION DEFAULT_VERSIONS=python=${v}
41
	@${MAKE} -V PYTHON_DISTVERSION DEFAULT_VERSIONS=python=${v}
42
.endfor
42
.endfor
43
43
44
.if make(makesum)
44
.if make(makesum)
(-)lang/python-tools/Makefile (-3 / +3 lines)
Lines 1-10 Link Here
1
PORTNAME=	python-tools
1
PORTNAME=	python-tools
2
PORTVERSION=	${PYTHON_PORTVERSION}
2
DISTVERSION=	${PYTHON_DISTVERSION}
3
PORTREVISION=	1
3
PORTREVISION=	1
4
CATEGORIES=	lang python devel
4
CATEGORIES=	lang python devel
5
MASTER_SITES=	PYTHON/ftp/python/${PORTVERSION}
5
MASTER_SITES=	PYTHON/ftp/python/${DISTVERSION}
6
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
6
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
7
DISTNAME=	Python-${PORTVERSION}
7
DISTNAME=	Python-${DISTVERSION}
8
8
9
MAINTAINER=	python@FreeBSD.org
9
MAINTAINER=	python@FreeBSD.org
10
COMMENT=	Supplementary tools for the Python language
10
COMMENT=	Supplementary tools for the Python language
(-)lang/python27/Makefile (-5 / +5 lines)
Lines 1-10 Link Here
1
PORTNAME=	python
1
PORTNAME=	python
2
PORTVERSION=	${PYTHON_PORTVERSION}
2
DISTVERSION=	${PYTHON_DISTVERSION}
3
PORTREVISION=	1
3
PORTREVISION=	1
4
CATEGORIES=	lang python
4
CATEGORIES=	lang python
5
MASTER_SITES=	PYTHON/ftp/python/${PORTVERSION}
5
MASTER_SITES=	PYTHON/ftp/python/${DISTVERSION}
6
PKGNAMESUFFIX=	27
6
PKGNAMESUFFIX=	27
7
DISTNAME=	Python-${PORTVERSION}
7
DISTNAME=	Python-${DISTVERSION}
8
DIST_SUBDIR=	python
8
DIST_SUBDIR=	python
9
9
10
MAINTAINER=	python@FreeBSD.org
10
MAINTAINER=	python@FreeBSD.org
Lines 19-25 USES= cpe ncurses pathfix pkgconfig readline:port shebangfix ssl tar:xz Link Here
19
PATHFIX_MAKEFILEIN=	Makefile.pre.in
19
PATHFIX_MAKEFILEIN=	Makefile.pre.in
20
USE_LDCONFIG=	yes
20
USE_LDCONFIG=	yes
21
GNU_CONFIGURE=	yes
21
GNU_CONFIGURE=	yes
22
python_CMD=	${PREFIX}/bin/python${PYTHON_PORTVERSION:R}
22
python_CMD=	${PREFIX}/bin/python${PYTHON_DISTVERSION:R}
23
SHEBANG_FILES=	Lib/lib2to3/pgen2/*.py Lib/lib2to3/tests/*.py Lib/lib2to3/tests/data/*.py \
23
SHEBANG_FILES=	Lib/lib2to3/pgen2/*.py Lib/lib2to3/tests/*.py Lib/lib2to3/tests/data/*.py \
24
		Lib/idlelib/*.py Lib/encodings/*.py Lib/test/*.py Lib/UserString.py \
24
		Lib/idlelib/*.py Lib/encodings/*.py Lib/test/*.py Lib/UserString.py \
25
		Lib/base64.py Lib/cProfile.py Lib/keyword.py Lib/mimify.py Lib/pdb.py \
25
		Lib/base64.py Lib/cProfile.py Lib/keyword.py Lib/mimify.py Lib/pdb.py \
Lines 38-44 TEST_ARGS= TESTOPTS=-j${MAKE_JOBS_NUMBER} Link Here
38
MAKE_ARGS+=		INSTALL_SHARED="${INSTALL_LIB}"				# Strip shared library
38
MAKE_ARGS+=		INSTALL_SHARED="${INSTALL_LIB}"				# Strip shared library
39
39
40
PLIST_SUB=		ABI=${ABIFLAGS} \
40
PLIST_SUB=		ABI=${ABIFLAGS} \
41
			PORTVERSION=${PORTVERSION} \
41
			DISTVERSION=${DISTVERSION} \
42
			OSMAJOR=${OSVERSION:C/([0-9]*)[0-9]{5}/\1/}		# For plat-freebsd* in pkg-plist. https://bugs.python.org/issue19554
42
			OSMAJOR=${OSVERSION:C/([0-9]*)[0-9]{5}/\1/}		# For plat-freebsd* in pkg-plist. https://bugs.python.org/issue19554
43
43
44
OPTIONS_DEFINE=		DEBUG IPV6 LIBFFI NLS PYMALLOC THREADS
44
OPTIONS_DEFINE=		DEBUG IPV6 LIBFFI NLS PYMALLOC THREADS
(-)lang/python27/Makefile.version (-1 / +1 lines)
Lines 2-5 Link Here
2
2
3
# Do not forget to update python documentation (lang/python-doc-*)
3
# Do not forget to update python documentation (lang/python-doc-*)
4
# Run "make -C lang/python-doc-html makesum"
4
# Run "make -C lang/python-doc-html makesum"
5
PYTHON_PORTVERSION=	2.7.18
5
PYTHON_DISTVERSION=	2.7.18
(-)lang/python27/pkg-plist (-3 / +3 lines)
Lines 1892-1898 lib/python2.7/json/tool.pyo Link Here
1892
lib/python2.7/keyword.py
1892
lib/python2.7/keyword.py
1893
lib/python2.7/keyword.pyc
1893
lib/python2.7/keyword.pyc
1894
lib/python2.7/keyword.pyo
1894
lib/python2.7/keyword.pyo
1895
lib/python2.7/lib-dynload/Python-%%PORTVERSION%%-py2.7.egg-info
1895
lib/python2.7/lib-dynload/Python-%%DISTVERSION%%-py2.7.egg-info
1896
lib/python2.7/lib-dynload/_bisect.so
1896
lib/python2.7/lib-dynload/_bisect.so
1897
lib/python2.7/lib-dynload/_codecs_cn.so
1897
lib/python2.7/lib-dynload/_codecs_cn.so
1898
lib/python2.7/lib-dynload/_codecs_hk.so
1898
lib/python2.7/lib-dynload/_codecs_hk.so
Lines 2065-2073 lib/python2.7/lib-tk/ttk.pyo Link Here
2065
lib/python2.7/lib-tk/turtle.py
2065
lib/python2.7/lib-tk/turtle.py
2066
lib/python2.7/lib-tk/turtle.pyc
2066
lib/python2.7/lib-tk/turtle.pyc
2067
lib/python2.7/lib-tk/turtle.pyo
2067
lib/python2.7/lib-tk/turtle.pyo
2068
lib/python2.7/lib2to3/Grammar%%PORTVERSION%%.final.0.pickle
2068
lib/python2.7/lib2to3/Grammar%%DISTVERSION%%.final.0.pickle
2069
lib/python2.7/lib2to3/Grammar.txt
2069
lib/python2.7/lib2to3/Grammar.txt
2070
lib/python2.7/lib2to3/PatternGrammar%%PORTVERSION%%.final.0.pickle
2070
lib/python2.7/lib2to3/PatternGrammar%%DISTVERSION%%.final.0.pickle
2071
lib/python2.7/lib2to3/PatternGrammar.txt
2071
lib/python2.7/lib2to3/PatternGrammar.txt
2072
lib/python2.7/lib2to3/__init__.py
2072
lib/python2.7/lib2to3/__init__.py
2073
lib/python2.7/lib2to3/__init__.pyc
2073
lib/python2.7/lib2to3/__init__.pyc
(-)lang/python36/Makefile (-6 / +6 lines)
Lines 1-11 Link Here
1
# Created by: Kubilay Kocak <koobs@FreeBSD.org>
1
# Created by: Kubilay Kocak <koobs@FreeBSD.org>
2
2
3
PORTNAME=	python
3
PORTNAME=	python
4
PORTVERSION=	${PYTHON_PORTVERSION}
4
DISTVERSION=	${PYTHON_DISTVERSION}
5
CATEGORIES=	lang python
5
CATEGORIES=	lang python
6
MASTER_SITES=	PYTHON/ftp/python/${PORTVERSION}
6
MASTER_SITES=	PYTHON/ftp/python/${DISTVERSION}
7
PKGNAMESUFFIX=	${PYTHON_SUFFIX}
7
PKGNAMESUFFIX=	${PYTHON_SUFFIX}
8
DISTNAME=	Python-${PORTVERSION}
8
DISTNAME=	Python-${DISTVERSION}
9
DIST_SUBDIR=	python
9
DIST_SUBDIR=	python
10
10
11
# Resolve sinpi name clash with libm (IEEE-754 violation)
11
# Resolve sinpi name clash with libm (IEEE-754 violation)
Lines 22-32 USES= cpe ncurses pathfix pkgconfig readline:port shebangfix ssl tar:xz Link Here
22
PATHFIX_MAKEFILEIN=	Makefile.pre.in
22
PATHFIX_MAKEFILEIN=	Makefile.pre.in
23
USE_LDCONFIG=	yes
23
USE_LDCONFIG=	yes
24
GNU_CONFIGURE=	yes
24
GNU_CONFIGURE=	yes
25
python_CMD=	${PREFIX}/bin/python${PYTHON_PORTVERSION:R}
25
python_CMD=	${PREFIX}/bin/python${PYTHON_DISTVERSION:R}
26
SHEBANG_FILES=	Lib/*.py Lib/*/*.py Lib/*/*/*.py Lib/*/*/*/*.py
26
SHEBANG_FILES=	Lib/*.py Lib/*/*.py Lib/*/*/*.py Lib/*/*/*/*.py
27
27
28
# Duplicate python.mk variables. TODO: Let lang/python?? ports use python.mk bits.
28
# Duplicate python.mk variables. TODO: Let lang/python?? ports use python.mk bits.
29
PYTHON_VER=		${PYTHON_PORTVERSION:R}
29
PYTHON_VER=		${PYTHON_DISTVERSION:R}
30
PYTHON_VERSION=		python${PYTHON_VER}
30
PYTHON_VERSION=		python${PYTHON_VER}
31
PYTHON_SUFFIX=		${PYTHON_VER:S/.//g}
31
PYTHON_SUFFIX=		${PYTHON_VER:S/.//g}
32
32
Lines 47-53 SUB_LIST= PYTHON_SUFFIX=${PYTHON_SUFFIX} Link Here
47
PLIST_SUB=		ABI=${ABIFLAGS} \
47
PLIST_SUB=		ABI=${ABIFLAGS} \
48
			XY=${PYTHON_SUFFIX} \
48
			XY=${PYTHON_SUFFIX} \
49
			XYDOT=${PYTHON_VER} \
49
			XYDOT=${PYTHON_VER} \
50
			XYZDOT=${PORTVERSION} \
50
			XYZDOT=${DISTVERSION} \
51
			OSMAJOR=${OSVERSION:C/([0-9]*)[0-9]{5}/\1/}		# For plat-freebsd* in pkg-plist. https://bugs.python.org/issue19554
51
			OSMAJOR=${OSVERSION:C/([0-9]*)[0-9]{5}/\1/}		# For plat-freebsd* in pkg-plist. https://bugs.python.org/issue19554
52
52
53
OPTIONS_DEFINE=		DEBUG IPV6 LIBFFI NLS PYMALLOC THREADS
53
OPTIONS_DEFINE=		DEBUG IPV6 LIBFFI NLS PYMALLOC THREADS
(-)lang/python36/Makefile.version (-1 / +1 lines)
Lines 2-5 Link Here
2
2
3
# Do not forget to update python documentation (lang/python-doc-*)
3
# Do not forget to update python documentation (lang/python-doc-*)
4
# Run "make -C lang/python-doc-html makesum"
4
# Run "make -C lang/python-doc-html makesum"
5
PYTHON_PORTVERSION=	3.6.13
5
PYTHON_DISTVERSION=	3.6.13
(-)lang/python37/Makefile (-6 / +6 lines)
Lines 1-11 Link Here
1
# Created by: Kubilay Kocak <koobs@FreeBSD.org>
1
# Created by: Kubilay Kocak <koobs@FreeBSD.org>
2
2
3
PORTNAME=	python
3
PORTNAME=	python
4
PORTVERSION=	${PYTHON_PORTVERSION}
4
DISTVERSION=	${PYTHON_DISTVERSION}
5
CATEGORIES=	lang python
5
CATEGORIES=	lang python
6
MASTER_SITES=	PYTHON/ftp/python/${PORTVERSION}
6
MASTER_SITES=	PYTHON/ftp/python/${DISTVERSION}
7
PKGNAMESUFFIX=	${PYTHON_SUFFIX}
7
PKGNAMESUFFIX=	${PYTHON_SUFFIX}
8
DISTNAME=	Python-${PORTVERSION}
8
DISTNAME=	Python-${DISTVERSION}
9
DIST_SUBDIR=	python
9
DIST_SUBDIR=	python
10
10
11
MAINTAINER=	python@FreeBSD.org
11
MAINTAINER=	python@FreeBSD.org
Lines 19-29 USES= cpe ncurses pathfix pkgconfig readline:port shebangfix ssl tar:xz Link Here
19
PATHFIX_MAKEFILEIN=	Makefile.pre.in
19
PATHFIX_MAKEFILEIN=	Makefile.pre.in
20
USE_LDCONFIG=	yes
20
USE_LDCONFIG=	yes
21
GNU_CONFIGURE=	yes
21
GNU_CONFIGURE=	yes
22
python_CMD=	${PREFIX}/bin/python${PYTHON_PORTVERSION:R}
22
python_CMD=	${PREFIX}/bin/python${PYTHON_DISTVERSION:R}
23
SHEBANG_FILES=	Lib/*.py Lib/*/*.py Lib/*/*/*.py Lib/*/*/*/*.py
23
SHEBANG_FILES=	Lib/*.py Lib/*/*.py Lib/*/*/*.py Lib/*/*/*/*.py
24
24
25
# Duplicate python.mk variables. TODO: Let lang/python?? ports use python.mk bits.
25
# Duplicate python.mk variables. TODO: Let lang/python?? ports use python.mk bits.
26
PYTHON_VER=		${PYTHON_PORTVERSION:R}
26
PYTHON_VER=		${PYTHON_DISTVERSION:R}
27
PYTHON_VERSION=		python${PYTHON_VER}
27
PYTHON_VERSION=		python${PYTHON_VER}
28
PYTHON_SUFFIX=		${PYTHON_VER:S/.//g}
28
PYTHON_SUFFIX=		${PYTHON_VER:S/.//g}
29
29
Lines 45-51 SUB_LIST= PYTHON_SUFFIX=${PYTHON_SUFFIX} Link Here
45
PLIST_SUB=		ABI=${ABIFLAGS} \
45
PLIST_SUB=		ABI=${ABIFLAGS} \
46
			XY=${PYTHON_SUFFIX} \
46
			XY=${PYTHON_SUFFIX} \
47
			XYDOT=${PYTHON_VER} \
47
			XYDOT=${PYTHON_VER} \
48
			XYZDOT=${PORTVERSION} \
48
			XYZDOT=${DISTVERSION} \
49
			OSMAJOR=${OSVERSION:C/([0-9]*)[0-9]{5}/\1/}		# For plat-freebsd* in pkg-plist. https://bugs.python.org/issue19554
49
			OSMAJOR=${OSVERSION:C/([0-9]*)[0-9]{5}/\1/}		# For plat-freebsd* in pkg-plist. https://bugs.python.org/issue19554
50
50
51
OPTIONS_DEFINE=		DEBUG IPV6 NLS PYMALLOC
51
OPTIONS_DEFINE=		DEBUG IPV6 NLS PYMALLOC
(-)lang/python37/Makefile.version (-1 / +1 lines)
Lines 2-5 Link Here
2
2
3
# Do not forget to update python documentation (lang/python-doc-*)
3
# Do not forget to update python documentation (lang/python-doc-*)
4
# Run "make -C lang/python-doc-html makesum"
4
# Run "make -C lang/python-doc-html makesum"
5
PYTHON_PORTVERSION=	3.7.10
5
PYTHON_DISTVERSION=	3.7.10
(-)lang/python38/Makefile (-6 / +6 lines)
Lines 1-11 Link Here
1
# Created by: Kubilay Kocak <koobs@FreeBSD.org>
1
# Created by: Kubilay Kocak <koobs@FreeBSD.org>
2
2
3
PORTNAME=	python
3
PORTNAME=	python
4
PORTVERSION=	${PYTHON_PORTVERSION}
4
DISTVERSION=	${PYTHON_DISTVERSION}
5
CATEGORIES=	lang python
5
CATEGORIES=	lang python
6
MASTER_SITES=	PYTHON/ftp/python/${PORTVERSION}
6
MASTER_SITES=	PYTHON/ftp/python/${DISTVERSION}
7
PKGNAMESUFFIX=	${PYTHON_SUFFIX}
7
PKGNAMESUFFIX=	${PYTHON_SUFFIX}
8
DISTNAME=	Python-${PORTVERSION}
8
DISTNAME=	Python-${DISTVERSION}
9
DIST_SUBDIR=	python
9
DIST_SUBDIR=	python
10
10
11
MAINTAINER=	python@FreeBSD.org
11
MAINTAINER=	python@FreeBSD.org
Lines 17-30 USES= cpe ncurses pathfix pkgconfig readline:port shebangfix ssl tar:xz Link Here
17
PATHFIX_MAKEFILEIN=	Makefile.pre.in
17
PATHFIX_MAKEFILEIN=	Makefile.pre.in
18
USE_LDCONFIG=	yes
18
USE_LDCONFIG=	yes
19
GNU_CONFIGURE=	yes
19
GNU_CONFIGURE=	yes
20
python_CMD=	${PREFIX}/bin/python${PYTHON_PORTVERSION:R}
20
python_CMD=	${PREFIX}/bin/python${PYTHON_DISTVERSION:R}
21
SHEBANG_FILES=	Lib/*.py Lib/*/*.py Lib/*/*/*.py Lib/*/*/*/*.py
21
SHEBANG_FILES=	Lib/*.py Lib/*/*.py Lib/*/*/*.py Lib/*/*/*/*.py
22
SHEBANG_FILES+=	Lib/test/ziptestdata/exe_with_z64 \
22
SHEBANG_FILES+=	Lib/test/ziptestdata/exe_with_z64 \
23
		Lib/test/ziptestdata/exe_with_zip \
23
		Lib/test/ziptestdata/exe_with_zip \
24
		Lib/test/ziptestdata/header.sh
24
		Lib/test/ziptestdata/header.sh
25
25
26
# Duplicate python.mk variables. TODO: Let lang/python?? ports use python.mk bits.
26
# Duplicate python.mk variables. TODO: Let lang/python?? ports use python.mk bits.
27
PYTHON_VER=		${PYTHON_PORTVERSION:R}
27
PYTHON_VER=		${PYTHON_DISTVERSION:R}
28
PYTHON_VERSION=		python${PYTHON_VER}
28
PYTHON_VERSION=		python${PYTHON_VER}
29
PYTHON_SUFFIX=		${PYTHON_VER:S/.//g}
29
PYTHON_SUFFIX=		${PYTHON_VER:S/.//g}
30
30
Lines 45-51 SUB_LIST= PYTHON_SUFFIX=${PYTHON_SUFFIX} Link Here
45
PLIST_SUB=		ABI=${ABIFLAGS} \
45
PLIST_SUB=		ABI=${ABIFLAGS} \
46
			XY=${PYTHON_SUFFIX} \
46
			XY=${PYTHON_SUFFIX} \
47
			XYDOT=${PYTHON_VER} \
47
			XYDOT=${PYTHON_VER} \
48
			XYZDOT=${PORTVERSION} \
48
			XYZDOT=${DISTVERSION} \
49
			OSMAJOR=${OSVERSION:C/([0-9]*)[0-9]{5}/\1/}		# For plat-freebsd* in pkg-plist. https://bugs.python.org/issue19554
49
			OSMAJOR=${OSVERSION:C/([0-9]*)[0-9]{5}/\1/}		# For plat-freebsd* in pkg-plist. https://bugs.python.org/issue19554
50
50
51
OPTIONS_DEFINE=		DEBUG IPV6 LIBFFI NLS PYMALLOC
51
OPTIONS_DEFINE=		DEBUG IPV6 LIBFFI NLS PYMALLOC
(-)lang/python38/Makefile.version (-1 / +1 lines)
Lines 2-5 Link Here
2
2
3
# Do not forget to update python documentation (lang/python-doc-*)
3
# Do not forget to update python documentation (lang/python-doc-*)
4
# Run "make -C lang/python-doc-html makesum"
4
# Run "make -C lang/python-doc-html makesum"
5
PYTHON_PORTVERSION=	3.8.9
5
PYTHON_DISTVERSION=	3.8.9
(-)lang/python39/Makefile (-6 / +6 lines)
Lines 1-11 Link Here
1
# Created by: Kubilay Kocak <koobs@FreeBSD.org>
1
# Created by: Kubilay Kocak <koobs@FreeBSD.org>
2
2
3
PORTNAME=	python
3
PORTNAME=	python
4
PORTVERSION=	${PYTHON_PORTVERSION}
4
DISTVERSION=	${PYTHON_DISTVERSION}
5
CATEGORIES=	lang python
5
CATEGORIES=	lang python
6
MASTER_SITES=	PYTHON/ftp/python/${PORTVERSION}
6
MASTER_SITES=	PYTHON/ftp/python/${DISTVERSION}
7
PKGNAMESUFFIX=	${PYTHON_SUFFIX}
7
PKGNAMESUFFIX=	${PYTHON_SUFFIX}
8
DISTNAME=	Python-${PORTVERSION}
8
DISTNAME=	Python-${DISTVERSION}
9
DIST_SUBDIR=	python
9
DIST_SUBDIR=	python
10
10
11
MAINTAINER=	python@FreeBSD.org
11
MAINTAINER=	python@FreeBSD.org
Lines 18-31 USES= compiler:c11 cpe ncurses pathfix pkgconfig readline:port \ Link Here
18
PATHFIX_MAKEFILEIN=	Makefile.pre.in
18
PATHFIX_MAKEFILEIN=	Makefile.pre.in
19
USE_LDCONFIG=	yes
19
USE_LDCONFIG=	yes
20
GNU_CONFIGURE=	yes
20
GNU_CONFIGURE=	yes
21
python_CMD=	${PREFIX}/bin/python${PYTHON_PORTVERSION:R}
21
python_CMD=	${PREFIX}/bin/python${PYTHON_DISTVERSION:R}
22
SHEBANG_FILES=	Lib/*.py Lib/*/*.py Lib/*/*/*.py Lib/*/*/*/*.py
22
SHEBANG_FILES=	Lib/*.py Lib/*/*.py Lib/*/*/*.py Lib/*/*/*/*.py
23
SHEBANG_FILES+=	Lib/test/ziptestdata/exe_with_z64 \
23
SHEBANG_FILES+=	Lib/test/ziptestdata/exe_with_z64 \
24
		Lib/test/ziptestdata/exe_with_zip \
24
		Lib/test/ziptestdata/exe_with_zip \
25
		Lib/test/ziptestdata/header.sh
25
		Lib/test/ziptestdata/header.sh
26
26
27
# Duplicate python.mk variables. TODO: Let lang/python?? ports use python.mk bits.
27
# Duplicate python.mk variables. TODO: Let lang/python?? ports use python.mk bits.
28
PYTHON_VER=		${PYTHON_PORTVERSION:R}
28
PYTHON_VER=		${PYTHON_DISTVERSION:R}
29
PYTHON_VERSION=		python${PYTHON_VER}
29
PYTHON_VERSION=		python${PYTHON_VER}
30
PYTHON_SUFFIX=		${PYTHON_VER:S/.//g}
30
PYTHON_SUFFIX=		${PYTHON_VER:S/.//g}
31
31
Lines 46-52 SUB_LIST= PYTHON_SUFFIX=${PYTHON_SUFFIX} Link Here
46
PLIST_SUB=		ABI=${ABIFLAGS} \
46
PLIST_SUB=		ABI=${ABIFLAGS} \
47
			XY=${PYTHON_SUFFIX} \
47
			XY=${PYTHON_SUFFIX} \
48
			XYDOT=${PYTHON_VER} \
48
			XYDOT=${PYTHON_VER} \
49
			XYZDOT=${PORTVERSION} \
49
			XYZDOT=${DISTVERSION} \
50
			OSMAJOR=${OSVERSION:C/([0-9]*)[0-9]{5}/\1/}		# For plat-freebsd* in pkg-plist. https://bugs.python.org/issue19554
50
			OSMAJOR=${OSVERSION:C/([0-9]*)[0-9]{5}/\1/}		# For plat-freebsd* in pkg-plist. https://bugs.python.org/issue19554
51
51
52
OPTIONS_DEFINE=		DEBUG IPV6 LIBFFI NLS PYMALLOC
52
OPTIONS_DEFINE=		DEBUG IPV6 LIBFFI NLS PYMALLOC
(-)lang/python39/Makefile.version (-1 / +1 lines)
Lines 2-5 Link Here
2
2
3
# Do not forget to update python documentation (lang/python-doc-*)
3
# Do not forget to update python documentation (lang/python-doc-*)
4
# Run "make -C lang/python-doc-html makesum"
4
# Run "make -C lang/python-doc-html makesum"
5
PYTHON_PORTVERSION=	3.9.4
5
PYTHON_DISTVERSION=	3.9.4
(-)lang/tauthon/Makefile (-1 / +1 lines)
Lines 98-104 THREADS_LDFLAGS= -lpthread Link Here
98
UCS2_CONFIGURE_ENABLE=	unicode=ucs2
98
UCS2_CONFIGURE_ENABLE=	unicode=ucs2
99
UCS4_CONFIGURE_ENABLE=	unicode=ucs4
99
UCS4_CONFIGURE_ENABLE=	unicode=ucs4
100
100
101
PYTHON_PORTVERSION=	${DISTVERSION}
101
PYTHON_DISTVERSION=	${DISTVERSION}
102
102
103
VERSION_NOMICRO=	${DISTVERSION:R}
103
VERSION_NOMICRO=	${DISTVERSION:R}
104
NAME_VERSION=		tauthon${VERSION_NOMICRO}
104
NAME_VERSION=		tauthon${VERSION_NOMICRO}
(-)x11-toolkits/py-tkinter/Makefile (-4 / +4 lines)
Lines 1-12 Link Here
1
# Created by: Thomas Gellekum <tg@FreeBSD.org>
1
# Created by: Thomas Gellekum <tg@FreeBSD.org>
2
2
3
PORTNAME=	tkinter
3
PORTNAME=	tkinter
4
PORTVERSION=	${PYTHON_PORTVERSION}
4
DISTVERSION=	${PYTHON_DISTVERSION}
5
PORTREVISION=	6
5
PORTREVISION=	6
6
CATEGORIES=	x11-toolkits python
6
CATEGORIES=	x11-toolkits python
7
MASTER_SITES=	PYTHON/ftp/python/${PORTVERSION}
7
MASTER_SITES=	PYTHON/ftp/python/${DISTVERSION}
8
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
8
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
9
DISTNAME=	Python-${PORTVERSION}
9
DISTNAME=	Python-${DISTVERSION}
10
10
11
MAINTAINER=	python@FreeBSD.org
11
MAINTAINER=	python@FreeBSD.org
12
COMMENT=	Python bindings to the Tk widget set (Python ${PYTHON_VER})
12
COMMENT=	Python bindings to the Tk widget set (Python ${PYTHON_VER})
Lines 20-26 USE_PYTHON= distutils autoplist allflavors Link Here
20
20
21
DIST_SUBDIR=	python
21
DIST_SUBDIR=	python
22
DISTINFO_FILE=	${PORTSDIR}/lang/python${PYTHON_SUFFIX}/distinfo
22
DISTINFO_FILE=	${PORTSDIR}/lang/python${PYTHON_SUFFIX}/distinfo
23
WRKSRC=		${WRKDIR}/Python-${PORTVERSION}/Modules
23
WRKSRC=		${WRKDIR}/Python-${DISTVERSION}/Modules
24
24
25
PYDISTUTILS_INSTALLARGS+=	--install-lib ${PYTHON_LIBDIR}/lib-dynload
25
PYDISTUTILS_INSTALLARGS+=	--install-lib ${PYTHON_LIBDIR}/lib-dynload
26
26

Return to bug 255013