Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified)) by mollari.NetBSD.org (Postfix) with ESMTPS id 278A41A9239 for ; Sun, 2 Jan 2022 00:16:03 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 37E5184EBA; Sun, 2 Jan 2022 00:16:02 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 7BC8184E9C for ; Sun, 2 Jan 2022 00:01:10 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id 0FJArOnVOmKz for ; Sun, 2 Jan 2022 00:01:09 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id BA3F984CFC for ; Sun, 2 Jan 2022 00:01:09 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id B3AC2FAEC; Sun, 2 Jan 2022 00:01:09 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1641081669114580" MIME-Version: 1.0 Date: Sun, 2 Jan 2022 00:01:09 +0000 From: "Thomas Klausner" Subject: CVS commit: pkgsrc/textproc To: pkgsrc-changes@NetBSD.org Reply-To: wiz@netbsd.org X-Mailer: log_accum Message-Id: <20220102000109.B3AC2FAEC@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1641081669114580 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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. --_----------=_1641081669114580 Content-Disposition: inline Content-Length: 3144 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii 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 --_----------=_1641081669114580--