From cc1e47f00eccd203aa624ef2b88dd014c2a5c047 Mon Sep 17 00:00:00 2001
From: wiz <wiz@pkgsrc.org>
Date: Sun, 2 Jan 2022 00:01:09 +0000
Subject: [PATCH] *: convert more to egg.mk

---
 textproc/py-isc_dhcp_leases/Makefile | 8 +++++---
 textproc/py-isc_dhcp_leases/PLIST    | 8 ++++++--
 textproc/py-peg2/Makefile            | 7 +++++--
 textproc/py-peg2/PLIST               | 7 +++++--
 4 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/textproc/py-isc_dhcp_leases/Makefile b/textproc/py-isc_dhcp_leases/Makefile
index 92de613a2d28..3d83f5419156 100644
--- a/textproc/py-isc_dhcp_leases/Makefile
+++ b/textproc/py-isc_dhcp_leases/Makefile
@@ -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-[0-9]*:../../devel/py-freezegun
 
 USE_LANGUAGES=	# none
 
-.include "../../lang/python/distutils.mk"
+PYTHON_VERSIONS_INCOMPATIBLE=	27
+
+.include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/py-isc_dhcp_leases/PLIST b/textproc/py-isc_dhcp_leases/PLIST
index bc5d7b0fda01..bce7ae8e89ad 100644
--- a/textproc/py-isc_dhcp_leases/PLIST
+++ b/textproc/py-isc_dhcp_leases/PLIST
@@ -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
diff --git a/textproc/py-peg2/Makefile b/textproc/py-peg2/Makefile
index ce5ae750b8d6..60ecdb74e763 100644
--- a/textproc/py-peg2/Makefile
+++ b/textproc/py-peg2/Makefile
@@ -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]*:../../textproc/py-lxml
 
 USE_LANGUAGES=	# none
 
-.include "../../lang/python/distutils.mk"
+PYTHON_VERSIONS_INCOMPATIBLE=	27
+
+.include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/py-peg2/PLIST b/textproc/py-peg2/PLIST
index f3c01aff65a2..c665b6fef838 100644
--- a/textproc/py-peg2/PLIST
+++ b/textproc/py-peg2/PLIST
@@ -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