Attachment 225502 Details for Bug 256387 – Patch (by git format-patch) against the ports tree

[patch] Patch (by git format-patch) against the ports tree

lang_tauthon-2.8.3.patch (text/plain), 11.85 KB, created by Olivier Certner on 2021-06-02 17:24:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Olivier Certner

Created: 2021-06-02 17:24:09 UTC

Size: 11.85 KB

patch

obsolete

>From 6c6a0080920ca5143d1cc78a50996310d229e237 Mon Sep 17 00:00:00 2001
>From: Olivier Certner <olce.freebsd@certner.fr>
>Date: Wed, 2 Jun 2021 19:16:40 +0200
>Subject: [PATCH] lang/tauthon: Update to 2.8.3
>
>---
> lang/tauthon/Makefile                      | 20 ++++----
> lang/tauthon/distinfo                      |  6 +--
> lang/tauthon/files/patch-setup.py          |  2 +-
> lang/tauthon/files/patch-setup_metadata.py | 29 -----------
> lang/tauthon/pkg-plist                     | 58 ++++++++++++++++++----
> 5 files changed, 64 insertions(+), 51 deletions(-)
> delete mode 100644 lang/tauthon/files/patch-setup_metadata.py
>
>diff --git a/lang/tauthon/Makefile b/lang/tauthon/Makefile
>index cd7f553f4dea..4ca71510d953 100644
>--- a/lang/tauthon/Makefile
>+++ b/lang/tauthon/Makefile
>@@ -6,11 +6,11 @@
> # -- Olivier Certner <olce.freebsd.ports@certner.fr>
> PORTNAME=	tauthon
> DISTVERSIONPREFIX=	v
>-DISTVERSION=	2.8.2
>+DISTVERSION=	2.8.3
> CATEGORIES=	lang python
> 
> MAINTAINER=	olce.freebsd.ports@certner.fr
>-COMMENT=	Backward-compatible fork of Python 2.7 interpreter with Python 3.x features
>+COMMENT=	Backwards-compatible fork of CPython 2.7 with Python 3.x features
> 
> LICENSE=	PSFL
> 
>@@ -25,6 +25,7 @@ GH_ACCOUNT=	naftaliharris
> GH_PROJECT=	tauthon
> 
> USE_LDCONFIG=	yes
>+GNU_CONFIGURE=	yes
> # Piggyback on Python support in shebangfix
> python_CMD=	${PREFIX}/bin/${NAME_VERSION}
> # Better be safe than sorry
>@@ -40,7 +41,6 @@ python_CMD=	${PREFIX}/bin/${NAME_VERSION}
> SHEBANG_FILES+=	${_DIRS}/*.py
> .endfor
> 
>-GNU_CONFIGURE=	yes
> CONFIGURE_ARGS+=	--enable-shared
> CONFIGURE_ENV+=		ac_cv_opt_olimit_ok=no OPT=""				# Null out OPT to respect user CFLAGS and remove optimizations
> 
>@@ -52,7 +52,8 @@ TEST_ARGS=		TESTOPTS=-j${MAKE_JOBS_NUMBER}
> MAKE_ARGS+=		INSTALL_SHARED="${INSTALL_LIB}"				# Strip shared library
> 
> PLIST_SUB=		ABI=${ABIFLAGS} \
>-			PORTVERSION=${PORTVERSION} \
>+			DISTVERSION=${DISTVERSION} \
>+			VERSION_LONG=${VERSION_LONG} \
> 			VERSION_NOMICRO=${VERSION_NOMICRO} \
> 			OSMAJOR=${OSVERSION:C/([0-9]*)[0-9]{5}/\1/}		# For plat-freebsd* in pkg-plist. https://bugs.python.org/issue19554
> 
>@@ -98,11 +99,12 @@ THREADS_LDFLAGS=	-lpthread
> UCS2_CONFIGURE_ENABLE=	unicode=ucs2
> UCS4_CONFIGURE_ENABLE=	unicode=ucs4
> 
>-PYTHON_DISTVERSION=	${DISTVERSION}
>-
>+VERSION_LONG=		${DISTVERSION:S/a/.alpha./:S/b/.beta./:C/^([^a-z]*)\$/\1.final.0/}
> VERSION_NOMICRO=	${DISTVERSION:R}
> NAME_VERSION=		tauthon${VERSION_NOMICRO}
> 
>+DISABLED_MODULES=	_bsddb _sqlite3 _tkinter gdbm
>+
> .include <bsd.port.options.mk>
> 
> # https://bugs.python.org/issue22521
>@@ -134,6 +136,7 @@ CFLAGS+=	-DPYTHON_DEFAULT_RECURSION_LIMIT=900
> # See https://bugs.freebsd.org/115940 and https://bugs.freebsd.org/193650
> .if !exists(/usr/bin/ypcat) || defined(WITHOUT_NIS)
> PLIST_SUB+=	NO_NIS="@comment "
>+DISABLED_MODULES+=	nis
> .else
> PLIST_SUB+=	NO_NIS=""
> .endif
>@@ -142,10 +145,9 @@ post-patch:
> 	@${REINPLACE_CMD} -e 's|/usr/local/bin/python|${python_CMD}|' \
> 		${WRKSRC}/Lib/cgi.py
> 
>-.if !exists(/usr/bin/ypcat) || defined(WITHOUT_NIS)
>-	@${REINPLACE_CMD} -e 's/disabled_module_list =[^]]*/&, "nis"/' \
>+	@${REINPLACE_CMD} -e \
>+		's/%%DISABLED_MODULES%%/${DISABLED_MODULES:C/^(.*)$/"\1", /g}/g' \
> 		${WRKSRC}/setup.py
>-.endif
> 
> post-install:
> # Create symlink for tauthon executable
>diff --git a/lang/tauthon/distinfo b/lang/tauthon/distinfo
>index bdd63df0f9aa..e38c879a498f 100644
>--- a/lang/tauthon/distinfo
>+++ b/lang/tauthon/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1604584539
>-SHA256 (naftaliharris-tauthon-v2.8.2_GH0.tar.gz) = 9423756fcb0afb652ae1ce3c7f0ac195e731e3a4f535a703991cf76bcb3ce267
>-SIZE (naftaliharris-tauthon-v2.8.2_GH0.tar.gz) = 17701363
>+TIMESTAMP = 1622652756
>+SHA256 (naftaliharris-tauthon-v2.8.3_GH0.tar.gz) = 09a14777b5e7bf503bdc1959a5e9fabbf09781266689213adfc8c535ea4a7c17
>+SIZE (naftaliharris-tauthon-v2.8.3_GH0.tar.gz) = 17718271
>diff --git a/lang/tauthon/files/patch-setup.py b/lang/tauthon/files/patch-setup.py
>index e3223582a88d..7d2b60e29d67 100644
>--- a/lang/tauthon/files/patch-setup.py
>+++ b/lang/tauthon/files/patch-setup.py
>@@ -20,7 +20,7 @@
>  
>  # This global variable is used to hold the list of modules to be disabled.
> -disabled_module_list = []
>-+disabled_module_list = ["_bsddb", "_sqlite3", "_tkinter", "gdbm", "mpz"]
>++disabled_module_list = [%%DISABLED_MODULES%%]
>  
>  def add_dir_to_list(dirlist, dir):
>      """Add the directory 'dir' to the list 'dirlist' (at the front) if
>diff --git a/lang/tauthon/files/patch-setup_metadata.py b/lang/tauthon/files/patch-setup_metadata.py
>deleted file mode 100644
>index 3f1df2b826e0..000000000000
>--- a/lang/tauthon/files/patch-setup_metadata.py
>+++ /dev/null
>@@ -1,29 +0,0 @@
>---- setup.py	2020-11-10 14:32:40.701965000 +0000
>-+++ setup.py	2020-11-10 14:53:04.048189000 +0000
>-@@ -2329,6 +2329,10 @@
>- listed here, it may still be supported, if there's a C compiler for
>- it. Ask around on comp.lang.python -- or just try compiling Python
>- yourself.
>-+
>-+This implementation, Tauthon, is a backward-compatible fork of
>-+Python's 2.7.18 interpreter with new syntax, builtins, and libraries
>-+backported from Python 3.x.
>- """
>- 
>- CLASSIFIERS = """
>-@@ -2345,12 +2349,12 @@
>-     import warnings
>-     warnings.filterwarnings("ignore",category=DeprecationWarning)
>-     setup(# PyPI Metadata (PEP 301)
>-           name = "Python",
>-           version = sys.version.split()[0],
>--          url = "http://www.python.org/%s" % sys.version[:3],
>--          maintainer = "Guido van Rossum and the Python community",
>--          maintainer_email = "python-dev@python.org",
>-+          url = "https://github.com/naftaliharris/tauthon",
>-+          maintainer = "Guido van Rossum, the Python community \
>-+and the Tauthon developers",
>-           description = "A high-level object-oriented programming language",
>-           long_description = SUMMARY.strip(),
>-           license = "PSF license",
>-           classifiers = filter(None, CLASSIFIERS.split("\n")),
>diff --git a/lang/tauthon/pkg-plist b/lang/tauthon/pkg-plist
>index d4d1db4cb4d7..a123921e8180 100644
>--- a/lang/tauthon/pkg-plist
>+++ b/lang/tauthon/pkg-plist
>@@ -351,9 +351,12 @@ lib/tauthon%%VERSION_NOMICRO%%/codecs.pyo
> lib/tauthon%%VERSION_NOMICRO%%/codeop.py
> lib/tauthon%%VERSION_NOMICRO%%/codeop.pyc
> lib/tauthon%%VERSION_NOMICRO%%/codeop.pyo
>-lib/tauthon%%VERSION_NOMICRO%%/collections.py
>-lib/tauthon%%VERSION_NOMICRO%%/collections.pyc
>-lib/tauthon%%VERSION_NOMICRO%%/collections.pyo
>+lib/tauthon%%VERSION_NOMICRO%%/collections/__init__.py
>+lib/tauthon%%VERSION_NOMICRO%%/collections/__init__.pyc
>+lib/tauthon%%VERSION_NOMICRO%%/collections/__init__.pyo
>+lib/tauthon%%VERSION_NOMICRO%%/collections/abc.py
>+lib/tauthon%%VERSION_NOMICRO%%/collections/abc.pyc
>+lib/tauthon%%VERSION_NOMICRO%%/collections/abc.pyo
> lib/tauthon%%VERSION_NOMICRO%%/colorsys.py
> lib/tauthon%%VERSION_NOMICRO%%/colorsys.pyc
> lib/tauthon%%VERSION_NOMICRO%%/colorsys.pyo
>@@ -433,6 +436,9 @@ lib/tauthon%%VERSION_NOMICRO%%/copy.pyo
> lib/tauthon%%VERSION_NOMICRO%%/copy_reg.py
> lib/tauthon%%VERSION_NOMICRO%%/copy_reg.pyc
> lib/tauthon%%VERSION_NOMICRO%%/copy_reg.pyo
>+lib/tauthon%%VERSION_NOMICRO%%/copyreg.py
>+lib/tauthon%%VERSION_NOMICRO%%/copyreg.pyc
>+lib/tauthon%%VERSION_NOMICRO%%/copyreg.pyo
> lib/tauthon%%VERSION_NOMICRO%%/csv.py
> lib/tauthon%%VERSION_NOMICRO%%/csv.pyc
> lib/tauthon%%VERSION_NOMICRO%%/csv.pyo
>@@ -1538,6 +1544,21 @@ lib/tauthon%%VERSION_NOMICRO%%/htmlentitydefs.pyo
> lib/tauthon%%VERSION_NOMICRO%%/htmllib.py
> lib/tauthon%%VERSION_NOMICRO%%/htmllib.pyc
> lib/tauthon%%VERSION_NOMICRO%%/htmllib.pyo
>+lib/tauthon%%VERSION_NOMICRO%%/http/__init__.py
>+lib/tauthon%%VERSION_NOMICRO%%/http/__init__.pyc
>+lib/tauthon%%VERSION_NOMICRO%%/http/__init__.pyo
>+lib/tauthon%%VERSION_NOMICRO%%/http/client.py
>+lib/tauthon%%VERSION_NOMICRO%%/http/client.pyc
>+lib/tauthon%%VERSION_NOMICRO%%/http/client.pyo
>+lib/tauthon%%VERSION_NOMICRO%%/http/cookiejar.py
>+lib/tauthon%%VERSION_NOMICRO%%/http/cookiejar.pyc
>+lib/tauthon%%VERSION_NOMICRO%%/http/cookiejar.pyo
>+lib/tauthon%%VERSION_NOMICRO%%/http/cookies.py
>+lib/tauthon%%VERSION_NOMICRO%%/http/cookies.pyc
>+lib/tauthon%%VERSION_NOMICRO%%/http/cookies.pyo
>+lib/tauthon%%VERSION_NOMICRO%%/http/server.py
>+lib/tauthon%%VERSION_NOMICRO%%/http/server.pyc
>+lib/tauthon%%VERSION_NOMICRO%%/http/server.pyo
> lib/tauthon%%VERSION_NOMICRO%%/httplib.py
> lib/tauthon%%VERSION_NOMICRO%%/httplib.pyc
> lib/tauthon%%VERSION_NOMICRO%%/httplib.pyo
>@@ -1919,7 +1940,7 @@ lib/tauthon%%VERSION_NOMICRO%%/json/tool.pyo
> lib/tauthon%%VERSION_NOMICRO%%/keyword.py
> lib/tauthon%%VERSION_NOMICRO%%/keyword.pyc
> lib/tauthon%%VERSION_NOMICRO%%/keyword.pyo
>-lib/tauthon%%VERSION_NOMICRO%%/lib-dynload/Python-%%PORTVERSION%%-py%%VERSION_NOMICRO%%.egg-info
>+lib/tauthon%%VERSION_NOMICRO%%/lib-dynload/Python-%%DISTVERSION%%-py%%VERSION_NOMICRO%%.egg-info
> lib/tauthon%%VERSION_NOMICRO%%/lib-dynload/_bisect.so
> lib/tauthon%%VERSION_NOMICRO%%/lib-dynload/_codecs_cn.so
> lib/tauthon%%VERSION_NOMICRO%%/lib-dynload/_codecs_hk.so
>@@ -2093,9 +2114,9 @@ lib/tauthon%%VERSION_NOMICRO%%/lib-tk/turtle.py
> lib/tauthon%%VERSION_NOMICRO%%/lib-tk/turtle.pyc
> lib/tauthon%%VERSION_NOMICRO%%/lib-tk/turtle.pyo
> lib/tauthon%%VERSION_NOMICRO%%/lib2to3/Grammar.txt
>-lib/tauthon%%VERSION_NOMICRO%%/lib2to3/Grammar%%PORTVERSION%%.final.0.pickle
>+lib/tauthon%%VERSION_NOMICRO%%/lib2to3/Grammar%%VERSION_LONG%%.pickle
> lib/tauthon%%VERSION_NOMICRO%%/lib2to3/PatternGrammar.txt
>-lib/tauthon%%VERSION_NOMICRO%%/lib2to3/PatternGrammar%%PORTVERSION%%.final.0.pickle
>+lib/tauthon%%VERSION_NOMICRO%%/lib2to3/PatternGrammar%%VERSION_LONG%%.pickle
> lib/tauthon%%VERSION_NOMICRO%%/lib2to3/__init__.py
> lib/tauthon%%VERSION_NOMICRO%%/lib2to3/__init__.pyc
> lib/tauthon%%VERSION_NOMICRO%%/lib2to3/__init__.pyo
>@@ -3059,6 +3080,7 @@ lib/tauthon%%VERSION_NOMICRO%%/test/randv3.pck
> lib/tauthon%%VERSION_NOMICRO%%/test/re_tests.py
> lib/tauthon%%VERSION_NOMICRO%%/test/re_tests.pyc
> lib/tauthon%%VERSION_NOMICRO%%/test/re_tests.pyo
>+lib/tauthon%%VERSION_NOMICRO%%/test/recursion.tar
> lib/tauthon%%VERSION_NOMICRO%%/test/regrtest.py
> lib/tauthon%%VERSION_NOMICRO%%/test/regrtest.pyc
> lib/tauthon%%VERSION_NOMICRO%%/test/regrtest.pyo
>@@ -4295,6 +4317,9 @@ lib/tauthon%%VERSION_NOMICRO%%/test/test_urllib2_localnet.pyo
> lib/tauthon%%VERSION_NOMICRO%%/test/test_urllib2net.py
> lib/tauthon%%VERSION_NOMICRO%%/test/test_urllib2net.pyc
> lib/tauthon%%VERSION_NOMICRO%%/test/test_urllib2net.pyo
>+lib/tauthon%%VERSION_NOMICRO%%/test/test_urllib_parse.py
>+lib/tauthon%%VERSION_NOMICRO%%/test/test_urllib_parse.pyc
>+lib/tauthon%%VERSION_NOMICRO%%/test/test_urllib_parse.pyo
> lib/tauthon%%VERSION_NOMICRO%%/test/test_urllibnet.py
> lib/tauthon%%VERSION_NOMICRO%%/test/test_urllibnet.pyc
> lib/tauthon%%VERSION_NOMICRO%%/test/test_urllibnet.pyo
>@@ -4537,9 +4562,24 @@ lib/tauthon%%VERSION_NOMICRO%%/unittest/test/test_suite.pyo
> lib/tauthon%%VERSION_NOMICRO%%/unittest/util.py
> lib/tauthon%%VERSION_NOMICRO%%/unittest/util.pyc
> lib/tauthon%%VERSION_NOMICRO%%/unittest/util.pyo
>-lib/tauthon%%VERSION_NOMICRO%%/urllib.py
>-lib/tauthon%%VERSION_NOMICRO%%/urllib.pyc
>-lib/tauthon%%VERSION_NOMICRO%%/urllib.pyo
>+lib/tauthon%%VERSION_NOMICRO%%/urllib/__init__.py
>+lib/tauthon%%VERSION_NOMICRO%%/urllib/__init__.pyc
>+lib/tauthon%%VERSION_NOMICRO%%/urllib/__init__.pyo
>+lib/tauthon%%VERSION_NOMICRO%%/urllib/error.py
>+lib/tauthon%%VERSION_NOMICRO%%/urllib/error.pyc
>+lib/tauthon%%VERSION_NOMICRO%%/urllib/error.pyo
>+lib/tauthon%%VERSION_NOMICRO%%/urllib/parse.py
>+lib/tauthon%%VERSION_NOMICRO%%/urllib/parse.pyc
>+lib/tauthon%%VERSION_NOMICRO%%/urllib/parse.pyo
>+lib/tauthon%%VERSION_NOMICRO%%/urllib/request.py
>+lib/tauthon%%VERSION_NOMICRO%%/urllib/request.pyc
>+lib/tauthon%%VERSION_NOMICRO%%/urllib/request.pyo
>+lib/tauthon%%VERSION_NOMICRO%%/urllib/response.py
>+lib/tauthon%%VERSION_NOMICRO%%/urllib/response.pyc
>+lib/tauthon%%VERSION_NOMICRO%%/urllib/response.pyo
>+lib/tauthon%%VERSION_NOMICRO%%/urllib/robotparser.py
>+lib/tauthon%%VERSION_NOMICRO%%/urllib/robotparser.pyc
>+lib/tauthon%%VERSION_NOMICRO%%/urllib/robotparser.pyo
> lib/tauthon%%VERSION_NOMICRO%%/urllib2.py
> lib/tauthon%%VERSION_NOMICRO%%/urllib2.pyc
> lib/tauthon%%VERSION_NOMICRO%%/urllib2.pyo
>-- 
>2.30.0
>

Actions: View | Diff

Attachments on bug 256387: 225502 | 225537