CVS commit: pkgsrc/devel

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Jan 10 23:49:02 UTC 2022

Modified Files:
        pkgsrc/devel/py-setuptools: Makefile PLIST
        pkgsrc/devel/py-setuptools44: Makefile PLIST

Log Message:
py-setuptools*: convert to egg.mk


To generate a diff of this commit:
cvs rdiff -u -r1.198 -r1.199 pkgsrc/devel/py-setuptools/Makefile
cvs rdiff -u -r1.60 -r1.61 pkgsrc/devel/py-setuptools/PLIST
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/py-setuptools44/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/py-setuptools44/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-setuptools/Makefile
diff -u pkgsrc/devel/py-setuptools/Makefile:1.198 pkgsrc/devel/py-setuptools/Makefile:1.199
--- pkgsrc/devel/py-setuptools/Makefile:1.198   Fri Jan  7 12:18:44 2022
+++ pkgsrc/devel/py-setuptools/Makefile Mon Jan 10 23:49:02 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.198 2022/01/07 12:18:44 adam Exp $
+# $NetBSD: Makefile,v 1.199 2022/01/10 23:49:02 wiz Exp $
 
 DISTNAME=      setuptools-60.3.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -25,5 +25,7 @@ PYTHON_VERSIONS_INCOMPATIBLE= 27
 
 PYSETUPTESTTARGET=     pytest
 
-.include "../../lang/python/distutils.mk"
+BOOTSTRAP_SETUPTOOLS=  yes
+
+.include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/py-setuptools/PLIST
diff -u pkgsrc/devel/py-setuptools/PLIST:1.60 pkgsrc/devel/py-setuptools/PLIST:1.61
--- pkgsrc/devel/py-setuptools/PLIST:1.60       Fri Jan  7 12:18:44 2022
+++ pkgsrc/devel/py-setuptools/PLIST    Mon Jan 10 23:49:02 2022
@@ -1,10 +1,10 @@
-@comment $NetBSD: PLIST,v 1.60 2022/01/07 12:18:44 adam Exp $
-${PYSITELIB}/${EGG_FILE}/PKG-INFO
-${PYSITELIB}/${EGG_FILE}/SOURCES.txt
-${PYSITELIB}/${EGG_FILE}/dependency_links.txt
-${PYSITELIB}/${EGG_FILE}/entry_points.txt
-${PYSITELIB}/${EGG_FILE}/requires.txt
-${PYSITELIB}/${EGG_FILE}/top_level.txt
+@comment $NetBSD: PLIST,v 1.61 2022/01/10 23:49:02 wiz Exp $
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/entry_points.txt
+${PYSITELIB}/${EGG_INFODIR}/requires.txt
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/_distutils_hack/__init__.py
 ${PYSITELIB}/_distutils_hack/__init__.pyc
 ${PYSITELIB}/_distutils_hack/__init__.pyo

Index: pkgsrc/devel/py-setuptools44/Makefile
diff -u pkgsrc/devel/py-setuptools44/Makefile:1.2 pkgsrc/devel/py-setuptools44/Makefile:1.3
--- pkgsrc/devel/py-setuptools44/Makefile:1.2   Tue Sep  1 04:05:27 2020
+++ pkgsrc/devel/py-setuptools44/Makefile       Mon Jan 10 23:49:02 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2020/09/01 04:05:27 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2022/01/10 23:49:02 wiz Exp $
 
 DISTNAME=      setuptools-44.1.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -25,6 +25,8 @@ PYTHON_VERSIONS_ACCEPTED=     27
 
 PYSETUPTESTTARGET=     pytest
 
+BOOTSTRAP_SETUPTOOLS=  yes
+
 .include "../../lang/python/application.mk"
-.include "../../lang/python/distutils.mk"
+.include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/py-setuptools44/PLIST
diff -u pkgsrc/devel/py-setuptools44/PLIST:1.1 pkgsrc/devel/py-setuptools44/PLIST:1.2
--- pkgsrc/devel/py-setuptools44/PLIST:1.1      Mon Aug 31 23:04:03 2020
+++ pkgsrc/devel/py-setuptools44/PLIST  Mon Jan 10 23:49:02 2022
@@ -1,12 +1,12 @@
-@comment $NetBSD: PLIST,v 1.1 2020/08/31 23:04:03 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2022/01/10 23:49:02 wiz Exp $
 bin/easy_install-${PYVERSSUFFIX}
-${PYSITELIB}/${EGG_FILE}/PKG-INFO
-${PYSITELIB}/${EGG_FILE}/SOURCES.txt
-${PYSITELIB}/${EGG_FILE}/dependency_links.txt
-${PYSITELIB}/${EGG_FILE}/entry_points.txt
-${PYSITELIB}/${EGG_FILE}/requires.txt
-${PYSITELIB}/${EGG_FILE}/top_level.txt
-${PYSITELIB}/${EGG_FILE}/zip-safe
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/entry_points.txt
+${PYSITELIB}/${EGG_INFODIR}/requires.txt
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
+${PYSITELIB}/${EGG_INFODIR}/zip-safe
 ${PYSITELIB}/easy_install.py
 ${PYSITELIB}/easy_install.pyc
 ${PYSITELIB}/easy_install.pyo