From: Daniel Dickman Subject: switch automake TDEP from python2 to python3 To: ports@openbsd.org Date: Sat, 24 Feb 2024 23:20:42 -0500 The automake NEWS file says that Python 3 has been supported since 1.11, so switch the TDEPs in 1.11+ versions from Python2 to Python3. For the 1.8, 1.9, and 1.10 releases, just switch the TDEPs too and let's not worry about the Python test failures. These older automake versions have a small number of direct consumers anyway so I suspect the risk of any ports breaking is low: 1.8 --> 1 direct reverse consumer 1.9 --> 14 direct reverse consumers 1.10 --> 3 direct reverse consumers Diffstat and patch below. ok? p.s. automake 1.8 doesn't actually have a TDEP on python as per Makefile.inc but I'm not sure if that's correct since we bother to patch m4/python.m4 which implies some kind of dependency on python. 1.8/Makefile | 2 +- 1.8/patches/patch-m4_python_m4 | 2 +- 1.9/Makefile | 4 +--- 1.9/patches/patch-m4_python_m4 | 2 +- 1.10/Makefile | 4 +--- 1.10/patches/patch-m4_python_m4 | 2 +- 1.11/Makefile | 4 +--- 1.12/Makefile | 4 +--- 1.13/Makefile | 4 +--- 1.14/Makefile | 4 +--- 1.15/Makefile | 3 +-- 11 files changed, 11 insertions(+), 24 deletions(-) Index: 1.10/Makefile =================================================================== RCS file: /cvs/ports/devel/automake/1.10/Makefile,v diff -u -p -u -r1.24 Makefile --- 1.10/Makefile 6 Dec 2022 15:34:34 -0000 1.24 +++ 1.10/Makefile 25 Feb 2024 02:47:10 -0000 @@ -1,9 +1,7 @@ VERSION= 1.10 DISTNAME= automake-${VERSION}.3 -REVISION= 9 +REVISION= 10 PKGSPEC= automake->=${VERSION},<1.11 - -MODPY_VERSION= ${MODPY_DEFAULT_VERSION_2} AUTOCONF_VERSION= 2.65 Index: 1.10/patches/patch-m4_python_m4 =================================================================== RCS file: /cvs/ports/devel/automake/1.10/patches/patch-m4_python_m4,v diff -u -p -u -r1.2 patch-m4_python_m4 --- 1.10/patches/patch-m4_python_m4 11 Mar 2022 18:49:41 -0000 1.2 +++ 1.10/patches/patch-m4_python_m4 25 Feb 2024 02:47:10 -0000 @@ -5,7 +5,7 @@ dnl in 1.5. m4_define_default([_AM_PYTHON_INTERPRETER_LIST], - [python python2 python2.5 python2.4 python2.3 python2.2 dnl -+ [python python2 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 dnl ++ [python python3 dnl python2.1 python2.0 python1.6 python1.5]) m4_if([$1],[],[ Index: 1.11/Makefile =================================================================== RCS file: /cvs/ports/devel/automake/1.11/Makefile,v diff -u -p -u -r1.21 Makefile --- 1.11/Makefile 6 Dec 2022 15:34:34 -0000 1.21 +++ 1.11/Makefile 25 Feb 2024 02:47:10 -0000 @@ -1,9 +1,7 @@ VERSION= 1.11 DISTNAME= automake-${VERSION}.6 -REVISION= 3 +REVISION= 4 PKGSPEC= automake->=${VERSION},<1.12 - -MODPY_VERSION= ${MODPY_DEFAULT_VERSION_2} AUTOCONF_VERSION= 2.69 Index: 1.12/Makefile =================================================================== RCS file: /cvs/ports/devel/automake/1.12/Makefile,v diff -u -p -u -r1.17 Makefile --- 1.12/Makefile 6 Dec 2022 15:34:35 -0000 1.17 +++ 1.12/Makefile 25 Feb 2024 02:47:10 -0000 @@ -1,10 +1,8 @@ VERSION= 1.12 DISTNAME= automake-${VERSION}.6 -REVISION= 2 +REVISION= 3 PKGSPEC= automake->=${VERSION},<1.13 EXTRACT_SUFX= .tar.xz - -MODPY_VERSION= ${MODPY_DEFAULT_VERSION_2} AUTOCONF_VERSION= 2.69 Index: 1.13/Makefile =================================================================== RCS file: /cvs/ports/devel/automake/1.13/Makefile,v diff -u -p -u -r1.12 Makefile --- 1.13/Makefile 6 Dec 2022 15:34:35 -0000 1.12 +++ 1.13/Makefile 25 Feb 2024 02:47:10 -0000 @@ -1,10 +1,8 @@ VERSION= 1.13 DISTNAME= automake-${VERSION}.4 -REVISION= 2 +REVISION= 3 PKGSPEC= automake->=${VERSION},<1.14 EXTRACT_SUFX= .tar.xz - -MODPY_VERSION= ${MODPY_DEFAULT_VERSION_2} AUTOCONF_VERSION= 2.69 Index: 1.14/Makefile =================================================================== RCS file: /cvs/ports/devel/automake/1.14/Makefile,v diff -u -p -u -r1.9 Makefile --- 1.14/Makefile 6 Dec 2022 15:34:35 -0000 1.9 +++ 1.14/Makefile 25 Feb 2024 02:47:10 -0000 @@ -1,10 +1,8 @@ VERSION= 1.14 DISTNAME= automake-${VERSION}.1 -REVISION= 1 +REVISION= 2 PKGSPEC= automake->=${VERSION},<1.15 EXTRACT_SUFX= .tar.xz - -MODPY_VERSION= ${MODPY_DEFAULT_VERSION_2} AUTOCONF_VERSION= 2.69 Index: 1.15/Makefile =================================================================== RCS file: /cvs/ports/devel/automake/1.15/Makefile,v diff -u -p -u -r1.6 Makefile --- 1.15/Makefile 6 Dec 2022 15:34:35 -0000 1.6 +++ 1.15/Makefile 25 Feb 2024 02:47:10 -0000 @@ -2,8 +2,7 @@ VERSION= 1.15 DISTNAME= automake-${VERSION}.1 PKGSPEC= automake->=${VERSION},<1.16 EXTRACT_SUFX= .tar.xz - -MODPY_VERSION= ${MODPY_DEFAULT_VERSION_2} +REVISION= 0 AUTOCONF_VERSION= 2.69 Index: 1.8/Makefile =================================================================== RCS file: /cvs/ports/devel/automake/1.8/Makefile,v diff -u -p -u -r1.21 Makefile --- 1.8/Makefile 6 Dec 2022 15:34:35 -0000 1.21 +++ 1.8/Makefile 25 Feb 2024 02:47:10 -0000 @@ -1,6 +1,6 @@ VERSION= 1.8 DISTNAME= automake-${VERSION}.5 -REVISION= 9 +REVISION= 11 PKGSPEC= automake->=${VERSION},<1.9 AUTOCONF_VERSION= 2.59 Index: 1.8/patches/patch-m4_python_m4 =================================================================== RCS file: /cvs/ports/devel/automake/1.8/patches/patch-m4_python_m4,v diff -u -p -u -r1.2 patch-m4_python_m4 --- 1.8/patches/patch-m4_python_m4 11 Mar 2022 18:49:42 -0000 1.2 +++ 1.8/patches/patch-m4_python_m4 25 Feb 2024 02:47:10 -0000 @@ -5,7 +5,7 @@ dnl in 1.5. m4_define([_AM_PYTHON_INTERPRETER_LIST], - [python python2 python2.4 python2.3 python2.2 dnl -+ [python python2 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 dnl ++ [python python3 dnl python2.1 python2.0 python1.6 python1.5]) m4_if([$1],[],[ Index: 1.9/Makefile =================================================================== RCS file: /cvs/ports/devel/automake/1.9/Makefile,v diff -u -p -u -r1.31 Makefile --- 1.9/Makefile 6 Dec 2022 15:34:35 -0000 1.31 +++ 1.9/Makefile 25 Feb 2024 02:47:10 -0000 @@ -1,9 +1,7 @@ VERSION= 1.9 DISTNAME= automake-${VERSION}.6 -REVISION= 12 +REVISION= 13 PKGSPEC= automake->=${VERSION},<1.10 - -MODPY_VERSION= ${MODPY_DEFAULT_VERSION_2} AUTOCONF_VERSION= 2.59 Index: 1.9/patches/patch-m4_python_m4 =================================================================== RCS file: /cvs/ports/devel/automake/1.9/patches/patch-m4_python_m4,v diff -u -p -u -r1.2 patch-m4_python_m4 --- 1.9/patches/patch-m4_python_m4 11 Mar 2022 18:49:42 -0000 1.2 +++ 1.9/patches/patch-m4_python_m4 25 Feb 2024 02:47:10 -0000 @@ -5,7 +5,7 @@ dnl in 1.5. m4_define_default([_AM_PYTHON_INTERPRETER_LIST], - [python python2 python2.5 python2.4 python2.3 python2.2 dnl -+ [python python2 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 dnl ++ [python python3 dnl python2.1 python2.0 python1.6 python1.5]) m4_if([$1],[],[