[.joined/pkgsrc/trunk]: .joined/pkgsrc *: fix packaging with python 2.7

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [.joined/pkgsrc/trunk]: .joined/pkgsrc *: fix packaging with python 2.7
From: wiz <wiz%pkgsrc.org@localhost>
Date: Wed, 05 Jan 2022 00:44:15 +0000
details:   https://anonhg.NetBSD.org/.joined/pkgsrc/rev/e4569ef20777
branches:  trunk
changeset: 371041:e4569ef20777
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Tue Jan 04 07:13:05 2022 +0000

description:
*: fix packaging with python 2.7

diffstat:

 devel/py-backcall/Makefile    |   7 ++++++-
 devel/py-backcall/PLIST       |  10 +++++-----
 devel/py-configobj/Makefile   |   7 ++++++-
 devel/py-configobj/PLIST      |  12 ++++++------
 devel/py-entrypoints/Makefile |   7 ++++++-
 devel/py-entrypoints/PLIST    |  12 ++++++------
 devel/py-hg-evolve/Makefile   |   7 ++++++-
 devel/py-hg-evolve/PLIST      |  10 +++++-----
 devel/py-testpath/Makefile    |   7 ++++++-
 devel/py-testpath/PLIST       |  10 +++++-----
 misc/py-anita/Makefile        |   7 ++++++-
 misc/py-anita/PLIST           |  10 +++++-----
 12 files changed, 68 insertions(+), 38 deletions(-)

diffs (226 lines):

diff -r db581f137b40 -r e4569ef20777 devel/py-backcall/Makefile
--- a/devel/py-backcall/Makefile        Tue Jan 04 07:09:58 2022 +0000
+++ b/devel/py-backcall/Makefile        Tue Jan 04 07:13:05 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2022/01/01 15:47:06 ryoon Exp $
+# $NetBSD: Makefile,v 1.6 2022/01/04 07:13:05 wiz Exp $
 
 DISTNAME=      backcall-0.2.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -19,5 +19,10 @@
        cd ${WRKSRC}/tests && pytest-${PYVERSSUFFIX}
 
 .include "../../lang/python/egg.mk"
+
+.if ${PYPKGPREFIX} == "py27"
+_PYSETUPTOOLSINSTALLARGS:=     ${PYSETUPTOOLSINSTALLARGS:N--single-version-externally-managed}
+.endif
+
 .include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r db581f137b40 -r e4569ef20777 devel/py-backcall/PLIST
--- a/devel/py-backcall/PLIST   Tue Jan 04 07:09:58 2022 +0000
+++ b/devel/py-backcall/PLIST   Tue Jan 04 07:13:05 2022 +0000
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.2 2022/01/01 15:47:06 ryoon Exp $
-${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
-${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
-${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
-${PYSITELIB}/${EGG_INFODIR}/top_level.txt
+@comment $NetBSD: PLIST,v 1.3 2022/01/04 07:13:05 wiz Exp $
+${PLIST.py3x}${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PLIST.py3x}${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PLIST.py3x}${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PLIST.py3x}${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/backcall/__init__.py
 ${PYSITELIB}/backcall/__init__.pyc
 ${PYSITELIB}/backcall/__init__.pyo
diff -r db581f137b40 -r e4569ef20777 devel/py-configobj/Makefile
--- a/devel/py-configobj/Makefile       Tue Jan 04 07:09:58 2022 +0000
+++ b/devel/py-configobj/Makefile       Tue Jan 04 07:13:05 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2021/12/31 07:50:08 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2022/01/04 07:13:05 wiz Exp $
 
 DISTNAME=      configobj-5.0.6
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -16,4 +16,9 @@
 USE_LANGUAGES= # none
 
 .include "../../lang/python/egg.mk"
+
+.if ${PYPKGPREFIX} == "py27"
+_PYSETUPTOOLSINSTALLARGS:=     ${PYSETUPTOOLSINSTALLARGS:N--single-version-externally-managed}
+.endif
+
 .include "../../mk/bsd.pkg.mk"
diff -r db581f137b40 -r e4569ef20777 devel/py-configobj/PLIST
--- a/devel/py-configobj/PLIST  Tue Jan 04 07:09:58 2022 +0000
+++ b/devel/py-configobj/PLIST  Tue Jan 04 07:13:05 2022 +0000
@@ -1,12 +1,12 @@
-@comment $NetBSD: PLIST,v 1.6 2021/12/31 07:50:08 wiz Exp $
+@comment $NetBSD: PLIST,v 1.7 2022/01/04 07:13:05 wiz Exp $
 ${PYSITELIB}/_version.py
 ${PYSITELIB}/_version.pyc
 ${PYSITELIB}/_version.pyo
-${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
-${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
-${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
-${PYSITELIB}/${EGG_INFODIR}/requires.txt
-${PYSITELIB}/${EGG_INFODIR}/top_level.txt
+${PLIST.py3x}${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PLIST.py3x}${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PLIST.py3x}${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PLIST.py3x}${PYSITELIB}/${EGG_INFODIR}/requires.txt
+${PLIST.py3x}${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/configobj.py
 ${PYSITELIB}/configobj.pyc
 ${PYSITELIB}/configobj.pyo
diff -r db581f137b40 -r e4569ef20777 devel/py-entrypoints/Makefile
--- a/devel/py-entrypoints/Makefile     Tue Jan 04 07:09:58 2022 +0000
+++ b/devel/py-entrypoints/Makefile     Tue Jan 04 07:13:05 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2022/01/01 16:19:25 ryoon Exp $
+# $NetBSD: Makefile,v 1.6 2022/01/04 07:13:05 wiz Exp $
 
 DISTNAME=      entrypoints-0.3
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -24,5 +24,10 @@
        cd ${WRKSRC} && pytest-${PYVERSSUFFIX} tests
 
 .include "../../lang/python/egg.mk"
+
+.if ${PYPKGPREFIX} == "py27"
+_PYSETUPTOOLSINSTALLARGS:=     ${PYSETUPTOOLSINSTALLARGS:N--single-version-externally-managed}
+.endif
+
 .include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r db581f137b40 -r e4569ef20777 devel/py-entrypoints/PLIST
--- a/devel/py-entrypoints/PLIST        Tue Jan 04 07:09:58 2022 +0000
+++ b/devel/py-entrypoints/PLIST        Tue Jan 04 07:13:05 2022 +0000
@@ -1,9 +1,9 @@
-@comment $NetBSD: PLIST,v 1.3 2022/01/01 16:19:25 ryoon Exp $
-${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
-${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
-${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
-${PYSITELIB}/${EGG_INFODIR}/requires.txt
-${PYSITELIB}/${EGG_INFODIR}/top_level.txt
+@comment $NetBSD: PLIST,v 1.4 2022/01/04 07:13:05 wiz Exp $
+${PLIST.py3x}${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PLIST.py3x}${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PLIST.py3x}${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PLIST.py3x}${PYSITELIB}/${EGG_INFODIR}/requires.txt
+${PLIST.py3x}${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/entrypoints.py
 ${PYSITELIB}/entrypoints.pyc
 ${PYSITELIB}/entrypoints.pyo
diff -r db581f137b40 -r e4569ef20777 devel/py-hg-evolve/Makefile
--- a/devel/py-hg-evolve/Makefile       Tue Jan 04 07:09:58 2022 +0000
+++ b/devel/py-hg-evolve/Makefile       Tue Jan 04 07:13:05 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2022/01/01 11:26:34 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2022/01/04 07:13:05 wiz Exp $
 #
 # Release notes:
 # https://www.mercurial-scm.org/pipermail/evolve-testers/
@@ -38,4 +38,9 @@
 .endif
 
 .include "../../lang/python/egg.mk"
+
+.if ${PYPKGPREFIX} == "py27"
+_PYSETUPTOOLSINSTALLARGS:=     ${PYSETUPTOOLSINSTALLARGS:N--single-version-externally-managed}
+.endif
+
 .include "../../mk/bsd.pkg.mk"
diff -r db581f137b40 -r e4569ef20777 devel/py-hg-evolve/PLIST
--- a/devel/py-hg-evolve/PLIST  Tue Jan 04 07:09:58 2022 +0000
+++ b/devel/py-hg-evolve/PLIST  Tue Jan 04 07:13:05 2022 +0000
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.6 2022/01/01 11:26:34 wiz Exp $
-${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
-${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
-${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
-${PYSITELIB}/${EGG_INFODIR}/top_level.txt
+@comment $NetBSD: PLIST,v 1.7 2022/01/04 07:13:05 wiz Exp $
+${PLIST.py3x}${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PLIST.py3x}${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PLIST.py3x}${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PLIST.py3x}${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/hgext3rd/evolve/__init__.py
 ${PYSITELIB}/hgext3rd/evolve/__init__.pyc
 ${PYSITELIB}/hgext3rd/evolve/__init__.pyo
diff -r db581f137b40 -r e4569ef20777 devel/py-testpath/Makefile
--- a/devel/py-testpath/Makefile        Tue Jan 04 07:09:58 2022 +0000
+++ b/devel/py-testpath/Makefile        Tue Jan 04 07:13:05 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2022/01/01 16:14:50 ryoon Exp $
+# $NetBSD: Makefile,v 1.4 2022/01/04 07:13:06 wiz Exp $
 
 DISTNAME=      testpath-0.3.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -17,4 +17,9 @@
        ${RM} ${WRKSRC}/testpath/cli-*.exe
 
 .include "../../lang/python/egg.mk"
+
+.if ${PYPKGPREFIX} == "py27"
+_PYSETUPTOOLSINSTALLARGS:=     ${PYSETUPTOOLSINSTALLARGS:N--single-version-externally-managed}
+.endif
+
 .include "../../mk/bsd.pkg.mk"
diff -r db581f137b40 -r e4569ef20777 devel/py-testpath/PLIST
--- a/devel/py-testpath/PLIST   Tue Jan 04 07:09:58 2022 +0000
+++ b/devel/py-testpath/PLIST   Tue Jan 04 07:13:05 2022 +0000
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.3 2022/01/01 16:14:50 ryoon Exp $
-${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
-${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
-${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
-${PYSITELIB}/${EGG_INFODIR}/top_level.txt
+@comment $NetBSD: PLIST,v 1.4 2022/01/04 07:13:06 wiz Exp $
+${PLIST.py3x}${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PLIST.py3x}${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PLIST.py3x}${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PLIST.py3x}${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/testpath/__init__.py
 ${PYSITELIB}/testpath/__init__.pyc
 ${PYSITELIB}/testpath/__init__.pyo
diff -r db581f137b40 -r e4569ef20777 misc/py-anita/Makefile
--- a/misc/py-anita/Makefile    Tue Jan 04 07:09:58 2022 +0000
+++ b/misc/py-anita/Makefile    Tue Jan 04 07:13:05 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.69 2022/01/01 12:42:38 martin Exp $
+# $NetBSD: Makefile,v 1.70 2022/01/04 07:13:06 wiz Exp $
 
 DISTNAME=      anita-2.9
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -30,4 +30,9 @@
 
 .include "options.mk"
 .include "../../lang/python/egg.mk"
+
+.if ${PYPKGPREFIX} == "py27"
+_PYSETUPTOOLSINSTALLARGS:=     ${PYSETUPTOOLSINSTALLARGS:N--single-version-externally-managed}
+.endif
+
 .include "../../mk/bsd.pkg.mk"
diff -r db581f137b40 -r e4569ef20777 misc/py-anita/PLIST
--- a/misc/py-anita/PLIST       Tue Jan 04 07:09:58 2022 +0000
+++ b/misc/py-anita/PLIST       Tue Jan 04 07:13:05 2022 +0000
@@ -1,9 +1,9 @@
-@comment $NetBSD: PLIST,v 1.5 2022/01/01 12:42:38 martin Exp $
+@comment $NetBSD: PLIST,v 1.6 2022/01/04 07:13:06 wiz Exp $
 bin/anita
-${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
-${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
-${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
-${PYSITELIB}/${EGG_INFODIR}/top_level.txt
+${PLIST.py3x}${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PLIST.py3x}${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PLIST.py3x}${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PLIST.py3x}${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/anita.py
 ${PYSITELIB}/anita.pyc
 ${PYSITELIB}/anita.pyo
Prev by Date: [.joined/pkgsrc/trunk]: .joined/pkgsrc/devel/py-proteus py-proteus: remove ob...
Next by Date: [.joined/pkgsrc/trunk]: .joined/pkgsrc/doc/guide doc/guide: Update htdocs-sha...
Previous by Thread: [.joined/pkgsrc/trunk]: .joined/pkgsrc/devel/py-proteus py-proteus: remove ob...
Next by Thread: [.joined/pkgsrc/trunk]: .joined/pkgsrc/doc/guide doc/guide: Update htdocs-sha...
Indexes:
Home | Main Index | Thread Index | Old Index