pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Jan  4 07:13:06 UTC 2022

Modified Files:
        pkgsrc/devel/py-backcall: Makefile PLIST
        pkgsrc/devel/py-configobj: Makefile PLIST
        pkgsrc/devel/py-entrypoints: Makefile PLIST
        pkgsrc/devel/py-hg-evolve: Makefile PLIST
        pkgsrc/devel/py-testpath: Makefile PLIST
        pkgsrc/misc/py-anita: Makefile PLIST

Log Message:
*: fix packaging with python 2.7


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/py-backcall/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/py-backcall/PLIST
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/py-configobj/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/py-configobj/PLIST
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/py-entrypoints/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/py-entrypoints/PLIST
cvs rdiff -u -r1.24 -r1.25 pkgsrc/devel/py-hg-evolve/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/py-hg-evolve/PLIST
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/py-testpath/Makefile \
    pkgsrc/devel/py-testpath/PLIST
cvs rdiff -u -r1.69 -r1.70 pkgsrc/misc/py-anita/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/misc/py-anita/PLIST

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


Modified files:

Index: pkgsrc/devel/py-backcall/Makefile
diff -u pkgsrc/devel/py-backcall/Makefile:1.5 pkgsrc/devel/py-backcall/Makefile:1.6
--- pkgsrc/devel/py-backcall/Makefile:1.5       Sat Jan  1 15:47:06 2022
+++ pkgsrc/devel/py-backcall/Makefile   Tue Jan  4 07:13:05 2022
@@ -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 @@ do-test:
        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"

Index: pkgsrc/devel/py-backcall/PLIST
diff -u pkgsrc/devel/py-backcall/PLIST:1.2 pkgsrc/devel/py-backcall/PLIST:1.3
--- pkgsrc/devel/py-backcall/PLIST:1.2  Sat Jan  1 15:47:06 2022
+++ pkgsrc/devel/py-backcall/PLIST      Tue Jan  4 07:13:05 2022
@@ -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

Index: pkgsrc/devel/py-configobj/Makefile
diff -u pkgsrc/devel/py-configobj/Makefile:1.7 pkgsrc/devel/py-configobj/Makefile:1.8
--- pkgsrc/devel/py-configobj/Makefile:1.7      Fri Dec 31 07:50:08 2021
+++ pkgsrc/devel/py-configobj/Makefile  Tue Jan  4 07:13:05 2022
@@ -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 @@ DEPENDS+=     ${PYPKGPREFIX}-six-[0-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"

Index: pkgsrc/devel/py-configobj/PLIST
diff -u pkgsrc/devel/py-configobj/PLIST:1.6 pkgsrc/devel/py-configobj/PLIST:1.7
--- pkgsrc/devel/py-configobj/PLIST:1.6 Fri Dec 31 07:50:08 2021
+++ pkgsrc/devel/py-configobj/PLIST     Tue Jan  4 07:13:05 2022
@@ -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

Index: pkgsrc/devel/py-entrypoints/Makefile
diff -u pkgsrc/devel/py-entrypoints/Makefile:1.5 pkgsrc/devel/py-entrypoints/Makefile:1.6
--- pkgsrc/devel/py-entrypoints/Makefile:1.5    Sat Jan  1 16:19:25 2022
+++ pkgsrc/devel/py-entrypoints/Makefile        Tue Jan  4 07:13:05 2022
@@ -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 @@ do-test:
        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"

Index: pkgsrc/devel/py-entrypoints/PLIST
diff -u pkgsrc/devel/py-entrypoints/PLIST:1.3 pkgsrc/devel/py-entrypoints/PLIST:1.4
--- pkgsrc/devel/py-entrypoints/PLIST:1.3       Sat Jan  1 16:19:25 2022
+++ pkgsrc/devel/py-entrypoints/PLIST   Tue Jan  4 07:13:05 2022
@@ -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

Index: pkgsrc/devel/py-hg-evolve/Makefile
diff -u pkgsrc/devel/py-hg-evolve/Makefile:1.24 pkgsrc/devel/py-hg-evolve/Makefile:1.25
--- pkgsrc/devel/py-hg-evolve/Makefile:1.24     Sat Jan  1 11:26:34 2022
+++ pkgsrc/devel/py-hg-evolve/Makefile  Tue Jan  4 07:13:05 2022
@@ -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 @@ do-test:
 .endif
 
 .include "../../lang/python/egg.mk"
+
+.if ${PYPKGPREFIX} == "py27"
+_PYSETUPTOOLSINSTALLARGS:=     ${PYSETUPTOOLSINSTALLARGS:N--single-version-externally-managed}
+.endif
+
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/py-hg-evolve/PLIST
diff -u pkgsrc/devel/py-hg-evolve/PLIST:1.6 pkgsrc/devel/py-hg-evolve/PLIST:1.7
--- pkgsrc/devel/py-hg-evolve/PLIST:1.6 Sat Jan  1 11:26:34 2022
+++ pkgsrc/devel/py-hg-evolve/PLIST     Tue Jan  4 07:13:05 2022
@@ -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

Index: pkgsrc/devel/py-testpath/Makefile
diff -u pkgsrc/devel/py-testpath/Makefile:1.3 pkgsrc/devel/py-testpath/Makefile:1.4
--- pkgsrc/devel/py-testpath/Makefile:1.3       Sat Jan  1 16:14:50 2022
+++ pkgsrc/devel/py-testpath/Makefile   Tue Jan  4 07:13:06 2022
@@ -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 @@ post-extract:
        ${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"
Index: pkgsrc/devel/py-testpath/PLIST
diff -u pkgsrc/devel/py-testpath/PLIST:1.3 pkgsrc/devel/py-testpath/PLIST:1.4
--- pkgsrc/devel/py-testpath/PLIST:1.3  Sat Jan  1 16:14:50 2022
+++ pkgsrc/devel/py-testpath/PLIST      Tue Jan  4 07:13:06 2022
@@ -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

Index: pkgsrc/misc/py-anita/Makefile
diff -u pkgsrc/misc/py-anita/Makefile:1.69 pkgsrc/misc/py-anita/Makefile:1.70
--- pkgsrc/misc/py-anita/Makefile:1.69  Sat Jan  1 12:42:38 2022
+++ pkgsrc/misc/py-anita/Makefile       Tue Jan  4 07:13:06 2022
@@ -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 @@ do-test:
 
 .include "options.mk"
 .include "../../lang/python/egg.mk"
+
+.if ${PYPKGPREFIX} == "py27"
+_PYSETUPTOOLSINSTALLARGS:=     ${PYSETUPTOOLSINSTALLARGS:N--single-version-externally-managed}
+.endif
+
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/misc/py-anita/PLIST
diff -u pkgsrc/misc/py-anita/PLIST:1.5 pkgsrc/misc/py-anita/PLIST:1.6
--- pkgsrc/misc/py-anita/PLIST:1.5      Sat Jan  1 12:42:38 2022
+++ pkgsrc/misc/py-anita/PLIST  Tue Jan  4 07:13:06 2022
@@ -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
Home | Main Index | Thread Index | Old Index