On Mon, 28 Dec 2020, R?mi Pointel wrote:
> Le 28/12/2020 ? 02:09, Daniel Dickman a ?crit?:
> > Nothing depends on python 3.7 anymore.
> >
> > ok to retire the port at this point?
> >
>
> Hello,
>
> sounds good to me.
>
> Thank you,
>
> Remi.
>
>
Thanks Remi.
Stuart requested that we move the packing list markers from the python 3.7
port to the python 3.8 port in the same commit. So the below diff includes
the update for the 3.8 port.
So the below makes this update following the notes in python.port.mk under
the "If later *removing* an old version".
p.s. Note that to make my life easier, I just bumped REVISION to 1 for all
the subpackages. So some of them skip a revision.
ok?
Index: Makefile
===================================================================
RCS file: /cvs/ports/lang/python/Makefile,v
retrieving revision 1.72
diff -u -p -u -r1.72 Makefile
--- Makefile 5 Oct 2020 20:51:18 -0000 1.72
+++ Makefile 28 Dec 2020 22:30:32 -0000
@@ -2,7 +2,6 @@
SUBDIR =
SUBDIR += 2.7
-SUBDIR += 3.7
SUBDIR += 3.8
SUBDIR += 3.9
Index: Makefile.inc
===================================================================
RCS file: /cvs/ports/lang/python/Makefile.inc,v
retrieving revision 1.134
diff -u -p -u -r1.134 Makefile.inc
--- Makefile.inc 11 Feb 2020 11:45:31 -0000 1.134
+++ Makefile.inc 28 Dec 2020 22:30:32 -0000
@@ -50,12 +50,6 @@ MULTI_PACKAGES = -main -tests -gdbm -idl
DEBUG_PACKAGES ?= -main -gdbm -tkinter
.endif
-.if ${VERSION} == "3.7"
-LIB_SUFX = m
-.else
-LIB_SUFX =
-.endif
-
# Python 2.7 lists BSD db 4.6.x as unstable on most architectures (see
# setup.py:allow_db_version). XXX revisit if databases/db/v4 is updated to 4.7
.if ${VERSION} == "2.7"
@@ -92,11 +86,11 @@ LIB_DEPENDS-bsddb += databases/db/v4,no_
.else
LIB_DEPENDS-bsddb += databases/db/v4
.endif
-WANTLIB-bsddb = lib/db4/db>=4 pthread
python${VERSION}${LIB_SUFX}
+WANTLIB-bsddb = lib/db4/db>=4 pthread python${VERSION}
LIB_DEPENDS-gdbm = databases/gdbm \
lang/python/${VERSION},-main
-WANTLIB-gdbm = gdbm>=3 pthread python${VERSION}${LIB_SUFX}
+WANTLIB-gdbm = gdbm>=3 pthread python${VERSION}
RUN_DEPENDS-idle = lang/python/${VERSION},-tkinter \
${RUN_DEPENDS}
@@ -107,7 +101,7 @@ MODULES += x11/tk
MODTK_VERSION = 8.5
LIB_DEPENDS-tkinter = lang/python/${VERSION},-main \
${MODTK_LIB_DEPENDS}
-WANTLIB-tkinter = X11 pthread python${VERSION}${LIB_SUFX} \
+WANTLIB-tkinter = X11 pthread python${VERSION} \
${MODTK_WANTLIB}
AUTOCONF_VERSION = 2.69
Index: python.port.mk
===================================================================
RCS file: /cvs/ports/lang/python/python.port.mk,v
retrieving revision 1.122
diff -u -p -u -r1.122 python.port.mk
--- python.port.mk 5 Oct 2020 20:51:18 -0000 1.122
+++ python.port.mk 28 Dec 2020 22:30:32 -0000
@@ -49,7 +49,6 @@ MODPY_VERSION ?= ${MODPY_DEFAULT_VERSION
# verify if MODPY_VERSION forced is correct
.else
. if ${MODPY_VERSION} != "2.7" && \
- ${MODPY_VERSION} != "3.7" && \
${MODPY_VERSION} != "3.8" && \
${MODPY_VERSION} != "3.9"
ERRORS += "Fatal: unknown or unsupported MODPY_VERSION: ${MODPY_VERSION}"
@@ -59,7 +58,6 @@ ERRORS += "Fatal: unknown or unsupported
MODPY_MAJOR_VERSION = ${MODPY_VERSION:R}
.if ${MODPY_MAJOR_VERSION} == 2
-MODPY_LIB_SUFFIX =
MODPY_FLAVOR =
MODPY_BIN_SUFFIX =
MODPY_PY_PREFIX = py-
@@ -69,12 +67,6 @@ MODPY_COMMENT = "@comment "
MODPY_ABI3SO =
MODPY_PYOEXTENSION = pyo
.elif ${MODPY_MAJOR_VERSION} == 3
-. if ${MODPY_VERSION} == "3.7"
-MODPY_LIB_SUFFIX = m
-. else
-# 3.8 (and later) discard the m suffix on the library
-MODPY_LIB_SUFFIX =
-. endif
# replace py- prefix by py3-
FULLPKGNAME ?= ${PKGNAME:S/^py-/py3-/}${FLAVOR_EXT:S/-python3//}
MODPY_FLAVOR = ,python3
@@ -91,7 +83,7 @@ MODPY_PYOEXTENSION ?= opt-1.pyc
MODPY_PYTEST ?= No
-MODPY_WANTLIB = python${MODPY_VERSION}${MODPY_LIB_SUFFIX}
+MODPY_WANTLIB = python${MODPY_VERSION}
MODPY_RUN_DEPENDS = lang/python/${MODPY_VERSION}
MODPY_LIB_DEPENDS = lang/python/${MODPY_VERSION}
@@ -167,7 +159,7 @@ HOMEPAGE ?= https://pypi.python.org/pyp
MODPY_TKINTER_DEPENDS = lang/python/${MODPY_VERSION},-tkinter
MODPY_BIN = ${LOCALBASE}/bin/python${MODPY_VERSION}
-MODPY_INCDIR =
${LOCALBASE}/include/python${MODPY_VERSION}${MODPY_LIB_SUFFIX}
+MODPY_INCDIR = ${LOCALBASE}/include/python${MODPY_VERSION}
MODPY_LIBDIR = ${LOCALBASE}/lib/python${MODPY_VERSION}
MODPY_SITEPKG = ${MODPY_LIBDIR}/site-packages
Index: 3.8/Makefile
===================================================================
RCS file: /cvs/ports/lang/python/3.8/Makefile,v
retrieving revision 1.9
diff -u -p -u -r1.9 Makefile
--- 3.8/Makefile 13 Oct 2020 12:41:03 -0000 1.9
+++ 3.8/Makefile 28 Dec 2020 22:30:32 -0000
@@ -10,8 +10,7 @@ PATCHLEVEL = .6
SHARED_LIBS = python3.8 0.0
VERSION_SPEC = >=3.8,<3.9
-REVISION-idle = 0
-REVISION-main = 0
+REVISION = 1
CONFIGURE_ARGS += --with-ensurepip=no
CONFIGURE_ARGS += --enable-loadable-sqlite-extensions
Index: 3.8/pkg/PLIST-gdbm
===================================================================
RCS file: /cvs/ports/lang/python/3.8/pkg/PLIST-gdbm,v
retrieving revision 1.3
diff -u -p -u -r1.3 PLIST-gdbm
--- 3.8/pkg/PLIST-gdbm 11 Feb 2020 11:45:31 -0000 1.3
+++ 3.8/pkg/PLIST-gdbm 28 Dec 2020 22:30:32 -0000
@@ -2,4 +2,11 @@
@option no-default-conflict
@option is-branch
@conflict python-gdbm-${VERSION_SPEC}
+@conflict python-gdbm->=3.2,<3.8
+@pkgpath lang/python/3.2,-gdbm
+@pkgpath lang/python/3.3,-gdbm
+@pkgpath lang/python/3.4,-gdbm
+@pkgpath lang/python/3.5,-gdbm
+@pkgpath lang/python/3.6,-gdbm
+@pkgpath lang/python/3.7,-gdbm
@so lib/python3.8/lib-dynload/_gdbm.so
Index: 3.8/pkg/PLIST-idle
===================================================================
RCS file: /cvs/ports/lang/python/3.8/pkg/PLIST-idle,v
retrieving revision 1.5
diff -u -p -u -r1.5 PLIST-idle
--- 3.8/pkg/PLIST-idle 13 Oct 2020 12:41:03 -0000 1.5
+++ 3.8/pkg/PLIST-idle 28 Dec 2020 22:30:32 -0000
@@ -2,7 +2,14 @@
@option no-default-conflict
@option is-branch
@conflict python-idle-${VERSION_SPEC}
-@conflict python-idle->=3.7,<3.7.9p0
+@conflict python-idle->=3.2,<3.8
+@conflict python->=3.6,<3.6.8p0
+@pkgpath lang/python/3.2,-idle
+@pkgpath lang/python/3.3,-idle
+@pkgpath lang/python/3.4,-idle
+@pkgpath lang/python/3.5,-idle
+@pkgpath lang/python/3.6,-idle
+@pkgpath lang/python/3.7,-idle
bin/idle3
bin/idle3.8
lib/python3.8/idlelib/
Index: 3.8/pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/lang/python/3.8/pkg/PLIST-main,v
retrieving revision 1.10
diff -u -p -u -r1.10 PLIST-main
--- 3.8/pkg/PLIST-main 13 Oct 2020 12:41:03 -0000 1.10
+++ 3.8/pkg/PLIST-main 28 Dec 2020 22:30:32 -0000
@@ -2,7 +2,13 @@
@option no-default-conflict
@option is-branch
@conflict python-${VERSION_SPEC}
-@conflict python->=3.7,<3.7.9p0
+@conflict python->=3.2,<3.8
+@pkgpath lang/python/3.2,-main
+@pkgpath lang/python/3.3,-main
+@pkgpath lang/python/3.4,-main
+@pkgpath lang/python/3.5,-main
+@pkgpath lang/python/3.6,-main
+@pkgpath lang/python/3.7,-main
bin/2to3
bin/2to3-3.8
bin/pydoc3
Index: 3.8/pkg/PLIST-tests
===================================================================
RCS file: /cvs/ports/lang/python/3.8/pkg/PLIST-tests,v
retrieving revision 1.5
diff -u -p -u -r1.5 PLIST-tests
--- 3.8/pkg/PLIST-tests 28 Jul 2020 07:58:30 -0000 1.5
+++ 3.8/pkg/PLIST-tests 28 Dec 2020 22:30:33 -0000
@@ -2,7 +2,14 @@
@option no-default-conflict
@option is-branch
@conflict python-tests-${VERSION_SPEC}
-@conflict python->=3.8,<3.8.5
+@conflict python-tests->=3.2,<3.8
+@conflict python->=3.6,<3.8.5
+@pkgpath lang/python/3.2,-tests
+@pkgpath lang/python/3.3,-tests
+@pkgpath lang/python/3.4,-tests
+@pkgpath lang/python/3.5,-tests
+@pkgpath lang/python/3.6,-tests
+@pkgpath lang/python/3.7,-tests
lib/python3.8/ctypes/test/
lib/python3.8/ctypes/test/__init__.py
lib/python3.8/ctypes/test/__main__.py
Index: 3.8/pkg/PLIST-tkinter
===================================================================
RCS file: /cvs/ports/lang/python/3.8/pkg/PLIST-tkinter,v
retrieving revision 1.3
diff -u -p -u -r1.3 PLIST-tkinter
--- 3.8/pkg/PLIST-tkinter 11 Feb 2020 11:45:31 -0000 1.3
+++ 3.8/pkg/PLIST-tkinter 28 Dec 2020 22:30:33 -0000
@@ -2,6 +2,13 @@
@option no-default-conflict
@option is-branch
@conflict python-tkinter-${VERSION_SPEC}
+@conflict python-tkinter->=3.2,<3.8
+@pkgpath lang/python/3.2,-tkinter
+@pkgpath lang/python/3.3,-tkinter
+@pkgpath lang/python/3.4,-tkinter
+@pkgpath lang/python/3.5,-tkinter
+@pkgpath lang/python/3.6,-tkinter
+@pkgpath lang/python/3.7,-tkinter
@so lib/python3.8/lib-dynload/_tkinter.so
lib/python3.8/tkinter/
lib/python3.8/tkinter/__init__.py
