CVS commit: pkgsrc/textproc

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Jan  2 00:01:09 UTC 2022

Modified Files:
        pkgsrc/textproc/py-isc_dhcp_leases: Makefile PLIST
        pkgsrc/textproc/py-peg2: Makefile PLIST

Log Message:
*: convert more to egg.mk


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/textproc/py-isc_dhcp_leases/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/textproc/py-isc_dhcp_leases/PLIST
cvs rdiff -u -r1.2 -r1.3 pkgsrc/textproc/py-peg2/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/textproc/py-peg2/PLIST

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

Modified files:

Index: pkgsrc/textproc/py-isc_dhcp_leases/Makefile
diff -u pkgsrc/textproc/py-isc_dhcp_leases/Makefile:1.2 pkgsrc/textproc/py-isc_dhcp_leases/Makefile:1.3
--- pkgsrc/textproc/py-isc_dhcp_leases/Makefile:1.2     Thu Sep  9 00:21:13 2021
+++ pkgsrc/textproc/py-isc_dhcp_leases/Makefile Sun Jan  2 00:01:09 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2021/09/09 00:21:13 gutteridge Exp $
+# $NetBSD: Makefile,v 1.3 2022/01/02 00:01:09 wiz Exp $
 
 DISTNAME=      isc_dhcp_leases-0.9.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    textproc python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=i/isc_dhcp_leases/}
 
@@ -16,5 +16,7 @@ TEST_DEPENDS+=        ${PYPKGPREFIX}-freezegun-
 
 USE_LANGUAGES= # none
 
-.include "../../lang/python/distutils.mk"
+PYTHON_VERSIONS_INCOMPATIBLE=  27
+
+.include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/textproc/py-isc_dhcp_leases/PLIST
diff -u pkgsrc/textproc/py-isc_dhcp_leases/PLIST:1.1 pkgsrc/textproc/py-isc_dhcp_leases/PLIST:1.2
--- pkgsrc/textproc/py-isc_dhcp_leases/PLIST:1.1        Sun Jan  6 01:48:50 2019
+++ pkgsrc/textproc/py-isc_dhcp_leases/PLIST    Sun Jan  2 00:01:09 2022
@@ -1,5 +1,9 @@
-@comment $NetBSD: PLIST,v 1.1 2019/01/06 01:48:50 gutteridge Exp $
-${PYSITELIB}/${EGG_FILE}
+@comment $NetBSD: PLIST,v 1.2 2022/01/02 00:01:09 wiz 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
 ${PYSITELIB}/isc_dhcp_leases/__init__.py
 ${PYSITELIB}/isc_dhcp_leases/__init__.pyc
 ${PYSITELIB}/isc_dhcp_leases/__init__.pyo

Index: pkgsrc/textproc/py-peg2/Makefile
diff -u pkgsrc/textproc/py-peg2/Makefile:1.2 pkgsrc/textproc/py-peg2/Makefile:1.3
--- pkgsrc/textproc/py-peg2/Makefile:1.2        Tue Jun 16 09:53:52 2020
+++ pkgsrc/textproc/py-peg2/Makefile    Sun Jan  2 00:01:09 2022
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2020/06/16 09:53:52 adam Exp $
+# $NetBSD: Makefile,v 1.3 2022/01/02 00:01:09 wiz Exp $
 
 DISTNAME=      pyPEG2-2.15.2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/py//:tl}
+PKGREVISION=   1
 CATEGORIES=    textproc python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=p/pyPEG2/}
 
@@ -14,5 +15,7 @@ DEPENDS+=     ${PYPKGPREFIX}-lxml-[0-9]*:../
 
 USE_LANGUAGES= # none
 
-.include "../../lang/python/distutils.mk"
+PYTHON_VERSIONS_INCOMPATIBLE=  27
+
+.include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/textproc/py-peg2/PLIST
diff -u pkgsrc/textproc/py-peg2/PLIST:1.1 pkgsrc/textproc/py-peg2/PLIST:1.2
--- pkgsrc/textproc/py-peg2/PLIST:1.1   Tue Jun 16 08:40:54 2020
+++ pkgsrc/textproc/py-peg2/PLIST       Sun Jan  2 00:01:09 2022
@@ -1,5 +1,8 @@
-@comment $NetBSD: PLIST,v 1.1 2020/06/16 08:40:54 pin Exp $
-${PYSITELIB}/${EGG_FILE}
+@comment $NetBSD: PLIST,v 1.2 2022/01/02 00:01:09 wiz Exp $
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/pypeg2/__init__.py
 ${PYSITELIB}/pypeg2/__init__.pyc
 ${PYSITELIB}/pypeg2/__init__.pyo