CVS commit: pkgsrc

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc
From: "Thomas Klausner" <wiz%netbsd.org@localhost>
Date: Wed, 5 Jun 2024 22:44:58 +0000

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Jun  5 22:44:58 UTC 2024

Modified Files:
        pkgsrc/comms/py-serial: Makefile
        pkgsrc/databases/py-bsddb3: Makefile
        pkgsrc/devel/py-argparse: Makefile
        pkgsrc/devel/py-backports: Makefile
        pkgsrc/devel/py-sortedcontainers: Makefile
        pkgsrc/filesystems/py-fuse-bindings: Makefile
        pkgsrc/lang/py-six: Makefile
        pkgsrc/lang/python: pyversion.mk
        pkgsrc/net/py-ipcalc: Makefile
        pkgsrc/security/py-cryptodome: Makefile
        pkgsrc/security/py-ecdsa: Makefile
        pkgsrc/textproc/py-feedparser5: Makefile
        pkgsrc/textproc/py-libxml2: Makefile

Log Message:
python: remove Python 2.7 from the default build set

Set PYTHON_27_ACCEPTED for packages where 2.7 needs to be supported
because other 2.7 packages depend on it, but it also supports 3.x.

Tested by jperkin, thanks!


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 pkgsrc/comms/py-serial/Makefile
cvs rdiff -u -r1.60 -r1.61 pkgsrc/databases/py-bsddb3/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/devel/py-argparse/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/py-backports/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/devel/py-sortedcontainers/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/filesystems/py-fuse-bindings/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/lang/py-six/Makefile
cvs rdiff -u -r1.159 -r1.160 pkgsrc/lang/python/pyversion.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/net/py-ipcalc/Makefile
cvs rdiff -u -r1.53 -r1.54 pkgsrc/security/py-cryptodome/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/security/py-ecdsa/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/textproc/py-feedparser5/Makefile
cvs rdiff -u -r1.95 -r1.96 pkgsrc/textproc/py-libxml2/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/comms/py-serial/Makefile
diff -u pkgsrc/comms/py-serial/Makefile:1.12 pkgsrc/comms/py-serial/Makefile:1.13
--- pkgsrc/comms/py-serial/Makefile:1.12        Wed Apr 17 10:38:33 2024
+++ pkgsrc/comms/py-serial/Makefile     Wed Jun  5 22:44:57 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2024/04/17 10:38:33 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2024/06/05 22:44:57 wiz Exp $
 
 DISTNAME=      pyserial-3.5
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/^py//}
@@ -18,6 +18,7 @@ USE_LANGUAGES=        # none
 REPLACE_PYTHON=        serial/*.py serial/*/*.py
 
 USE_PKG_RESOURCES=     yes
+PYTHON_27_ACCEPTED=    yes
 
 post-install:
 .for bin in pyserial-miniterm pyserial-ports

Index: pkgsrc/databases/py-bsddb3/Makefile
diff -u pkgsrc/databases/py-bsddb3/Makefile:1.60 pkgsrc/databases/py-bsddb3/Makefile:1.61
--- pkgsrc/databases/py-bsddb3/Makefile:1.60    Tue Jan  4 20:52:41 2022
+++ pkgsrc/databases/py-bsddb3/Makefile Wed Jun  5 22:44:57 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2022/01/04 20:52:41 wiz Exp $
+# $NetBSD: Makefile,v 1.61 2024/06/05 22:44:57 wiz Exp $
 
 DISTNAME=      bsddb3-6.2.9
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -30,6 +30,8 @@ SUBST_SED.bdb=                -e "s,dblib = 'db',dblib
 
 MAKE_ENV+=             YES_I_HAVE_THE_RIGHT_TO_USE_THIS_BERKELEY_DB_VERSION=1
 
+PYTHON_27_ACCEPTED=    yes
+
 do-test:
        cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHONBIN} test.py
 

Index: pkgsrc/devel/py-argparse/Makefile
diff -u pkgsrc/devel/py-argparse/Makefile:1.10 pkgsrc/devel/py-argparse/Makefile:1.11
--- pkgsrc/devel/py-argparse/Makefile:1.10      Tue Jan  4 20:52:50 2022
+++ pkgsrc/devel/py-argparse/Makefile   Wed Jun  5 22:44:57 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2022/01/04 20:52:50 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2024/06/05 22:44:57 wiz Exp $
 
 DISTNAME=      argparse-1.4.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -13,5 +13,7 @@ LICENSE=      apache-2.0
 
 USE_LANGUAGES= # none
 
+PYTHON_27_ACCEPTED=    yes
+
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/py-backports/Makefile
diff -u pkgsrc/devel/py-backports/Makefile:1.5 pkgsrc/devel/py-backports/Makefile:1.6
--- pkgsrc/devel/py-backports/Makefile:1.5      Wed Mar 29 09:34:05 2023
+++ pkgsrc/devel/py-backports/Makefile  Wed Jun  5 22:44:57 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2023/03/29 09:34:05 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2024/06/05 22:44:57 wiz Exp $
 
 PKGNAME=       ${PYPKGPREFIX}-backports-1.0
 PKGREVISION=   2
@@ -12,6 +12,8 @@ LICENSE=      python-software-foundation
 
 PY_PATCHPLIST= yes
 
+PYTHON_27_ACCEPTED=    yes
+
 .include "../../lang/python/pyversion.mk"
 
 INSTALLATION_DIRS+=    ${PYSITELIB}/backports

Index: pkgsrc/devel/py-sortedcontainers/Makefile
diff -u pkgsrc/devel/py-sortedcontainers/Makefile:1.9 pkgsrc/devel/py-sortedcontainers/Makefile:1.10
--- pkgsrc/devel/py-sortedcontainers/Makefile:1.9       Tue Jan  4 20:53:39 2022
+++ pkgsrc/devel/py-sortedcontainers/Makefile   Wed Jun  5 22:44:57 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2022/01/04 20:53:39 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2024/06/05 22:44:57 wiz Exp $
 
 DISTNAME=      sortedcontainers-2.4.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -15,5 +15,7 @@ TEST_DEPENDS+=        ${PYPKGPREFIX}-tox-[0-9]*
 
 USE_LANGUAGES= # none
 
+PYTHON_27_ACCEPTED=    yes
+
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/filesystems/py-fuse-bindings/Makefile
diff -u pkgsrc/filesystems/py-fuse-bindings/Makefile:1.24 pkgsrc/filesystems/py-fuse-bindings/Makefile:1.25
--- pkgsrc/filesystems/py-fuse-bindings/Makefile:1.24   Sat Oct 21 17:10:11 2023
+++ pkgsrc/filesystems/py-fuse-bindings/Makefile        Wed Jun  5 22:44:57 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2023/10/21 17:10:11 gdt Exp $
+# $NetBSD: Makefile,v 1.25 2024/06/05 22:44:57 wiz Exp $
 
 VERSION=               1.0.4
 DISTNAME=              fuse-python-${VERSION}
@@ -18,6 +18,9 @@ EGDIR=                        share/examples/${PKGBASE}
 INSTALLATION_DIRS=     ${EGDIR}
 PLIST_SUBST+=          PYPKGPREFIX=${PYPKGPREFIX}
 PRINT_PLIST_AWK+=      { gsub("${PYPKGPREFIX}-", "$${PYPKGPREFIX}-"); }
+
+PYTHON_27_ACCEPTED=    yes
+
 post-install:
        ${INSTALL_SCRIPT} ${WRKSRC}/example/hello.py \
                ${DESTDIR}${PREFIX}/${EGDIR}

Index: pkgsrc/lang/py-six/Makefile
diff -u pkgsrc/lang/py-six/Makefile:1.21 pkgsrc/lang/py-six/Makefile:1.22
--- pkgsrc/lang/py-six/Makefile:1.21    Sun Apr 30 19:40:20 2023
+++ pkgsrc/lang/py-six/Makefile Wed Jun  5 22:44:57 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2023/04/30 19:40:20 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2024/06/05 22:44:57 wiz Exp $
 
 DISTNAME=      six-1.16.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -15,6 +15,7 @@ USE_LANGUAGES=        # none
 
 PYSETUPTESTTARGET=     pytest
 
+PYTHON_27_ACCEPTED=    yes
 .include "../../lang/python/pyversion.mk"
 
 .if ${PYTHON_VERSION} > 300

Index: pkgsrc/lang/python/pyversion.mk
diff -u pkgsrc/lang/python/pyversion.mk:1.159 pkgsrc/lang/python/pyversion.mk:1.160
--- pkgsrc/lang/python/pyversion.mk:1.159       Fri May 10 10:32:07 2024
+++ pkgsrc/lang/python/pyversion.mk     Wed Jun  5 22:44:57 2024
@@ -1,4 +1,4 @@
-# $NetBSD: pyversion.mk,v 1.159 2024/05/10 10:32:07 wiz Exp $
+# $NetBSD: pyversion.mk,v 1.160 2024/06/05 22:44:57 wiz Exp $
 
 # This file should be included by packages as a way to depend on
 # python when none of the other methods are appropriate, e.g. a
@@ -31,7 +31,7 @@
 #      preferred over later ones.
 #
 #      Possible values: 312 311 310 39 38 27
-#      Default: 312 311 310 39 38 27
+#      Default: 312 311 310 39 38
 #
 # PYTHON_VERSIONS_INCOMPATIBLE
 #      The Python versions that are NOT acceptable for the package.
@@ -107,7 +107,10 @@ PYTHON_VERSION_DEFAULT?=           311
 .else
 PYTHON_VERSION_DEFAULT?=               310
 .endif
-PYTHON_VERSIONS_ACCEPTED?=             312 311 310 39 38 27
+PYTHON_VERSIONS_ACCEPTED?=             312 311 310 39 38
+.if defined(PYTHON_27_ACCEPTED)
+PYTHON_VERSIONS_ACCEPTED+=             27
+.endif
 PYTHON_VERSIONS_INCOMPATIBLE?=         # empty by default
 
 # transform the list into individual variables

Index: pkgsrc/net/py-ipcalc/Makefile
diff -u pkgsrc/net/py-ipcalc/Makefile:1.3 pkgsrc/net/py-ipcalc/Makefile:1.4
--- pkgsrc/net/py-ipcalc/Makefile:1.3   Mon Jan 10 20:35:50 2022
+++ pkgsrc/net/py-ipcalc/Makefile       Wed Jun  5 22:44:58 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2022/01/10 20:35:50 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2024/06/05 22:44:58 wiz Exp $
 
 DISTNAME=      ipcalc-1.99.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -13,5 +13,7 @@ LICENSE=      2-clause-bsd
 
 USE_LANGUAGES= # none
 
+PYTHON_27_ACCEPTED=    yes
+
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/security/py-cryptodome/Makefile
diff -u pkgsrc/security/py-cryptodome/Makefile:1.53 pkgsrc/security/py-cryptodome/Makefile:1.54
--- pkgsrc/security/py-cryptodome/Makefile:1.53 Fri Jan 12 13:15:47 2024
+++ pkgsrc/security/py-cryptodome/Makefile      Wed Jun  5 22:44:58 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2024/01/12 13:15:47 adam Exp $
+# $NetBSD: Makefile,v 1.54 2024/06/05 22:44:58 wiz Exp $
 
 DISTNAME=      pycryptodome-3.20.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/^py//}
@@ -18,6 +18,7 @@ CFLAGS.SunOS+=        -D_XOPEN_SOURCE=600
 
 CHECK_PORTABILITY_SKIP=        appveyor/get_wheels.sh
 
+PYTHON_27_ACCEPTED=    yes
 .include "../../lang/python/egg.mk"
 
 # Python 3 builds of this package get an extra "abi3" suffix added

Index: pkgsrc/security/py-ecdsa/Makefile
diff -u pkgsrc/security/py-ecdsa/Makefile:1.16 pkgsrc/security/py-ecdsa/Makefile:1.17
--- pkgsrc/security/py-ecdsa/Makefile:1.16      Wed Apr 10 11:16:20 2024
+++ pkgsrc/security/py-ecdsa/Makefile   Wed Jun  5 22:44:58 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2024/04/10 11:16:20 adam Exp $
+# $NetBSD: Makefile,v 1.17 2024/06/05 22:44:58 wiz Exp $
 
 DISTNAME=      ecdsa-0.19.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -15,6 +15,8 @@ TEST_DEPENDS+=        ${PYPKGPREFIX}-hypothesis
 
 USE_LANGUAGES= # none
 
+PYTHON_27_ACCEPTED=    yes
+
 do-test:
        cd ${WRKSRC}/src && ${SETENV} ${TEST_ENV} ${PYTHONBIN} -m unittest discover -v
 

Index: pkgsrc/textproc/py-feedparser5/Makefile
diff -u pkgsrc/textproc/py-feedparser5/Makefile:1.4 pkgsrc/textproc/py-feedparser5/Makefile:1.5
--- pkgsrc/textproc/py-feedparser5/Makefile:1.4 Tue Jan  4 20:54:55 2022
+++ pkgsrc/textproc/py-feedparser5/Makefile     Wed Jun  5 22:44:58 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2022/01/04 20:54:55 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2024/06/05 22:44:58 wiz Exp $
 
 DISTNAME=              feedparser-5.2.1
 PKGNAME=               ${PYPKGPREFIX}-${DISTNAME}
@@ -15,6 +15,8 @@ PREV_PKGPATH=         textproc/py-feedparser
 
 USE_LANGUAGES=         #none
 
+PYTHON_27_ACCEPTED=    yes
+
 .include "../../lang/python/pyversion.mk"
 
 .if ${PYPKGPREFIX} != "py27"

Index: pkgsrc/textproc/py-libxml2/Makefile
diff -u pkgsrc/textproc/py-libxml2/Makefile:1.95 pkgsrc/textproc/py-libxml2/Makefile:1.96
--- pkgsrc/textproc/py-libxml2/Makefile:1.95    Wed May 29 16:34:39 2024
+++ pkgsrc/textproc/py-libxml2/Makefile Wed Jun  5 22:44:58 2024
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.95 2024/05/29 16:34:39 adam Exp $
+# $NetBSD: Makefile,v 1.96 2024/06/05 22:44:58 wiz Exp $
+
+PYTHON_27_ACCEPTED=    yes
 
 PKGREVISION= 1
 .include "../../textproc/libxml2/Makefile.common"

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/sysutils/intel-microcode-netbsd
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/sysutils/intel-microcode-netbsd
Indexes:

Home | Main Index | Thread Index | Old Index