[pkgsrc/trunk]: pkgsrc Remove more references to python-2.6.

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc Remove more references to python-2.6.
From: wiz <wiz%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 17:43:41 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/2e206e21ba0b
branches:  trunk
changeset: 649966:2e206e21ba0b
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Tue Apr 14 11:40:31 2015 +0000

description:
Remove more references to python-2.6.

diffstat:

 audio/py-audiotools/Makefile                              |  4 ++--
 devel/py-argh/Makefile                                    |  7 +------
 devel/py-argh/PLIST                                       |  3 +--
 devel/py-mercurial/Makefile.version                       |  4 ++--
 devel/py-trytond/Makefile.common                          |  4 ++--
 graphics/py-qrcode/Makefile                               |  4 ++--
 lang/python/extension.mk                                  |  3 ++-
 math/py-rpy/Makefile                                      |  7 ++-----
 net/py-twisted/Makefile                                   |  8 +-------
 net/py-twisted/PLIST                                      |  3 +--
 pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh |  4 ++--
 pkgtools/pkglint/files/makevars.map                       |  4 ++--
 security/py-cryptography/Makefile                         |  4 ++--
 sysutils/dbus/Makefile                                    |  3 +--
 www/py-tornado/Makefile                                   |  4 ++--
 15 files changed, 25 insertions(+), 41 deletions(-)

diffs (269 lines):

diff -r 4b77389395ca -r 2e206e21ba0b audio/py-audiotools/Makefile
--- a/audio/py-audiotools/Makefile      Tue Apr 14 11:36:10 2015 +0000
+++ b/audio/py-audiotools/Makefile      Tue Apr 14 11:40:31 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2015/04/13 23:12:40 rodent Exp $
+# $NetBSD: Makefile,v 1.14 2015/04/14 11:40:31 wiz Exp $
 
 DISTNAME=      audiotools-2.22
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -18,7 +18,7 @@
 REPLACE_PYTHON+=       audiotools/py_decoders/*.py
 REPLACE_PYTHON+=       audiotools/py_encoders/*.py
 
-PYTHON_VERSIONS_INCOMPATIBLE=  33 34 # not yet ported as of 2.20 or rejected
+PYTHON_VERSIONS_INCOMPATIBLE=  33 34 # not yet ported as of 2.20
 
 .include "../../audio/lame/buildlink3.mk"
 .include "../../audio/libvorbis/buildlink3.mk"
diff -r 4b77389395ca -r 2e206e21ba0b devel/py-argh/Makefile
--- a/devel/py-argh/Makefile    Tue Apr 14 11:36:10 2015 +0000
+++ b/devel/py-argh/Makefile    Tue Apr 14 11:40:31 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2014/12/16 07:00:52 obache Exp $
+# $NetBSD: Makefile,v 1.4 2015/04/14 11:40:31 wiz Exp $
 
 DISTNAME=      argh-0.26.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -13,9 +13,4 @@
 USE_LANGUAGES= # none
 
 .include "../../lang/python/egg.mk"
-PLIST_VARS+=   py26
-.if !empty(_PYTHON_VERSION:M26)
-DEPENDS+=      ${PYPKGPREFIX}-argparse>=1.1:../../devel/py-argparse
-PLIST.py26=    yes
-.endif
 .include "../../mk/bsd.pkg.mk"
diff -r 4b77389395ca -r 2e206e21ba0b devel/py-argh/PLIST
--- a/devel/py-argh/PLIST       Tue Apr 14 11:36:10 2015 +0000
+++ b/devel/py-argh/PLIST       Tue Apr 14 11:40:31 2015 +0000
@@ -1,8 +1,7 @@
-@comment $NetBSD: PLIST,v 1.2 2014/12/16 07:00:52 obache Exp $
+@comment $NetBSD: PLIST,v 1.3 2015/04/14 11:40:31 wiz Exp $
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
-${PLIST.py26}${PYSITELIB}/${EGG_INFODIR}/requires.txt
 ${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/argh/__init__.py
 ${PYSITELIB}/argh/__init__.pyc
diff -r 4b77389395ca -r 2e206e21ba0b devel/py-mercurial/Makefile.version
--- a/devel/py-mercurial/Makefile.version       Tue Apr 14 11:36:10 2015 +0000
+++ b/devel/py-mercurial/Makefile.version       Tue Apr 14 11:40:31 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.version,v 1.16 2015/04/03 10:09:15 wiz Exp $
+# $NetBSD: Makefile.version,v 1.17 2015/04/14 11:40:31 wiz Exp $
 
 VERSION=       3.3.3
 
@@ -10,6 +10,6 @@
 # for python-3.x
 #.include "../../lang/python/pyversion.mk"
 #
-#.if ("${PYPKGPREFIX}" != "py26") && ("${PYPKGPREFIX}" != "py27")
+#.if "${PYPKGPREFIX}" != "py27"
 #PYSETUPARGS+= --c2to3
 #.endif
diff -r 4b77389395ca -r 2e206e21ba0b devel/py-trytond/Makefile.common
--- a/devel/py-trytond/Makefile.common  Tue Apr 14 11:36:10 2015 +0000
+++ b/devel/py-trytond/Makefile.common  Tue Apr 14 11:40:31 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.4 2015/04/13 23:12:41 rodent Exp $
+# $NetBSD: Makefile.common,v 1.5 2015/04/14 11:40:31 wiz Exp $
 
 # used by meta-pkgs/py-tryton-platform/Makefile
 # used by devel/py-proteus/Makefile
@@ -132,4 +132,4 @@
 
 DIST_SUBDIR=   tryton-${TRYTON_BASEVER}
 
-PYTHON_VERSIONS_INCOMPATIBLE=   33 34 # 33: py-gtk2 via py-pycha via py-relatorio
+PYTHON_VERSIONS_INCOMPATIBLE=   33 34 # py-gtk2 via py-pycha via py-relatorio
diff -r 4b77389395ca -r 2e206e21ba0b graphics/py-qrcode/Makefile
--- a/graphics/py-qrcode/Makefile       Tue Apr 14 11:36:10 2015 +0000
+++ b/graphics/py-qrcode/Makefile       Tue Apr 14 11:40:31 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2015/04/11 03:12:51 rodent Exp $
+# $NetBSD: Makefile,v 1.5 2015/04/14 11:40:31 wiz Exp $
 
 DISTNAME=      qrcode-5.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -10,7 +10,7 @@
 COMMENT=       Python QR Code image generator
 LICENSE=       modified-bsd
 
-DEPENDS+=      ${PYPKGPREFIX}-lxml-[0-9]*:../../textproc/py-lxml # XXX for py26
+DEPENDS+=      ${PYPKGPREFIX}-lxml-[0-9]*:../../textproc/py-lxml
 DEPENDS+=      ${PYPKGPREFIX}-Pillow-[0-9]*:../../graphics/py-Pillow
 DEPENDS+=      ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
 
diff -r 4b77389395ca -r 2e206e21ba0b lang/python/extension.mk
--- a/lang/python/extension.mk  Tue Apr 14 11:36:10 2015 +0000
+++ b/lang/python/extension.mk  Tue Apr 14 11:40:31 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: extension.mk,v 1.38 2015/04/13 23:12:44 rodent Exp $
+# $NetBSD: extension.mk,v 1.39 2015/04/14 11:40:31 wiz Exp $
 
 .include "../../lang/python/pyversion.mk"
 
@@ -53,6 +53,7 @@
 # appears to be that creating egg info files was new in Python 2.5.
 PY_NO_EGG?=            yes
 .if !empty(PY_NO_EGG:M[yY][eE][sS])
+# see python*/patches/patch-av
 INSTALL_ENV+=          PKGSRC_PYTHON_NO_EGG=defined
 .endif
 
diff -r 4b77389395ca -r 2e206e21ba0b math/py-rpy/Makefile
--- a/math/py-rpy/Makefile      Tue Apr 14 11:36:10 2015 +0000
+++ b/math/py-rpy/Makefile      Tue Apr 14 11:40:31 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2015/04/13 23:12:42 rodent Exp $
+# $NetBSD: Makefile,v 1.39 2015/04/14 11:40:31 wiz Exp $
 
 DISTNAME=      rpy2-2.5.6
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/rpy2/rpy/}
@@ -24,13 +24,10 @@
 .include "../../lang/python/pyversion.mk"
 
 PLIST_VARS=    sd
-.if ${PYPKGPREFIX} == "py26" || ${PYPKGPREFIX} == "py27" || ${PYPKGPREFIX} == "py33"
+.if ${PYPKGPREFIX} == "py27" || ${PYPKGPREFIX} == "py33"
 PLIST.sd=      yes
 DEPENDS+=      ${PYPKGPREFIX}-singledispatch-[0-9]*:../../devel/py-singledispatch
 .endif
-.if ${PYPKGPREFIX} == "py26"
-DEPENDS+=      ${PYPKGPREFIX}-argparse-[0-9]*:../../devel/py-argparse
-.endif
 
 .include "../../devel/pcre/buildlink3.mk"
 .include "../../mk/readline.buildlink3.mk"
diff -r 4b77389395ca -r 2e206e21ba0b net/py-twisted/Makefile
--- a/net/py-twisted/Makefile   Tue Apr 14 11:36:10 2015 +0000
+++ b/net/py-twisted/Makefile   Tue Apr 14 11:40:31 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2014/01/27 18:49:19 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2015/04/14 11:40:32 wiz Exp $
 
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:tl}
 COMMENT=       Framework for writing networked applications
@@ -36,10 +36,4 @@
 .include "../../lang/python/egg.mk"
 .include "../../lang/python/application.mk"
 
-# With python 2.6, twisted builds an additional object.
-PLIST_VARS+=           initgroups
-.if ${PYPKGPREFIX} == "py26"
-PLIST.initgroups=      YES
-.endif
-
 .include "../../mk/bsd.pkg.mk"
diff -r 4b77389395ca -r 2e206e21ba0b net/py-twisted/PLIST
--- a/net/py-twisted/PLIST      Tue Apr 14 11:36:10 2015 +0000
+++ b/net/py-twisted/PLIST      Tue Apr 14 11:40:31 2015 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2014/07/22 22:33:56 wiz Exp $
+@comment $NetBSD: PLIST,v 1.16 2015/04/14 11:40:32 wiz Exp $
 bin/cftp
 bin/ckeygen
 bin/conch
@@ -1296,7 +1296,6 @@
 ${PYSITELIB}/twisted/python/__init__.pyc
 ${PYSITELIB}/twisted/python/__init__.pyo
 ${PYSITELIB}/twisted/python/_initgroups.c
-${PLIST.initgroups}${PYSITELIB}/twisted/python/_initgroups.so
 ${PYSITELIB}/twisted/python/_inotify.py
 ${PYSITELIB}/twisted/python/_inotify.pyc
 ${PYSITELIB}/twisted/python/_inotify.pyo
diff -r 4b77389395ca -r 2e206e21ba0b pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh
--- a/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh Tue Apr 14 11:36:10 2015 +0000
+++ b/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh Tue Apr 14 11:40:31 2015 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $NetBSD: pkg_rolling-replace.sh,v 1.34 2015/02/12 08:22:16 abs Exp $
+# $NetBSD: pkg_rolling-replace.sh,v 1.35 2015/04/14 11:40:31 wiz Exp $
 #<license>
 # Copyright (c) 2006 BBN Technologies Corp.  All rights reserved.
 #
@@ -453,7 +453,7 @@
     # Set PKGNAME_REQD to give underlying make processes a chance to
     # set options derived from the package name.  For example,
     # the appropriate version of Python can be derived from the
-    # package name (so, when building py26-foo, use python-2.6,
+    # package name (so, when building py34-foo, use python-3.4,
     # not python-2.7).
     MAKE_SET_VARS="PKGNAME_REQD=${pkg}-*"
 
diff -r 4b77389395ca -r 2e206e21ba0b pkgtools/pkglint/files/makevars.map
--- a/pkgtools/pkglint/files/makevars.map       Tue Apr 14 11:36:10 2015 +0000
+++ b/pkgtools/pkglint/files/makevars.map       Tue Apr 14 11:40:31 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: makevars.map,v 1.262 2015/03/11 19:05:58 rillig Exp $
+# $NetBSD: makevars.map,v 1.263 2015/04/14 11:40:31 wiz Exp $
 #
 
 # This file contains the guessed type of some variables, according to
@@ -657,7 +657,7 @@
 PTHREAD_TYPE           Identifier [$system]
 # ^^ or "native" or "none".
 PY_PATCHPLIST          Yes [$package]
-PYPKGPREFIX            { py26 py27 py33 } [*:pu, pyversion.mk:s, *:]
+PYPKGPREFIX            { py27 py33 py34 } [*:pu, pyversion.mk:s, *:]
 PYTHON_FOR_BUILD_ONLY  Yes [$package]
 REPLACE_PYTHON List of Pathmask [$package_list]
 PYTHON_VERSIONS_ACCEPTED List of Version [$package]
diff -r 4b77389395ca -r 2e206e21ba0b security/py-cryptography/Makefile
--- a/security/py-cryptography/Makefile Tue Apr 14 11:36:10 2015 +0000
+++ b/security/py-cryptography/Makefile Tue Apr 14 11:40:31 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2015/04/12 14:42:30 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2015/04/14 11:40:31 wiz Exp $
 
 DISTNAME=      cryptography-0.8.2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -22,7 +22,7 @@
 
 .include "../../lang/python/pyversion.mk"
 
-.if ${PYPKGPREFIX} == "py26" || ${PYPKGPREFIX} == "py27" || ${PYPKGPREFIX} == "py33"
+.if ${PYPKGPREFIX} == "py27" || ${PYPKGPREFIX} == "py33"
 DEPENDS+=      ${PYPKGPREFIX}-enum34-[0-9]*:../../devel/py-enum34
 .endif
 
diff -r 4b77389395ca -r 2e206e21ba0b sysutils/dbus/Makefile
--- a/sysutils/dbus/Makefile    Tue Apr 14 11:36:10 2015 +0000
+++ b/sysutils/dbus/Makefile    Tue Apr 14 11:40:31 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.81 2015/02/17 13:48:24 wiz Exp $
+# $NetBSD: Makefile,v 1.82 2015/04/14 11:40:32 wiz Exp $
 
 DISTNAME=      dbus-1.8.16
 CATEGORIES=    sysutils
@@ -10,7 +10,6 @@
 LICENSE=       gnu-gpl-v2
 
 CONFLICTS+=    dbus-glib<0.71
-CONFLICTS+=    py26-dbus<0.71
 CONFLICTS+=    py27-dbus<0.71
 
 GNU_CONFIGURE=         YES
diff -r 4b77389395ca -r 2e206e21ba0b www/py-tornado/Makefile
--- a/www/py-tornado/Makefile   Tue Apr 14 11:36:10 2015 +0000
+++ b/www/py-tornado/Makefile   Tue Apr 14 11:40:31 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2015/02/08 16:31:48 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2015/04/14 11:40:32 wiz Exp $
 
 DISTNAME=      tornado-4.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -22,7 +22,7 @@
 
 .include "../../lang/python/pyversion.mk"
 
-.if "${PYPKGPREFIX}" == "py26" || "${PYPKGPREFIX}" == "py27
+.if "${PYPKGPREFIX}" == "py27"
 DEPENDS+=      ${PYPKGPREFIX}-backports.ssl_match_hostname-[0-9]*:../../security/py-backports.ssl_match_hostname
 .endif
Prev by Date: [pkgsrc/trunk]: pkgsrc/sysutils/xentools41 Fix header guard.
Next by Date: [pkgsrc/trunk]: pkgsrc/devel/py-attic Update to 0.15:
Previous by Thread: [pkgsrc/trunk]: pkgsrc/sysutils/xentools41 Fix header guard.
Next by Thread: [pkgsrc/trunk]: pkgsrc/devel/py-attic Update to 0.15:
Indexes:
Home | Main Index | Thread Index | Old Index