Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id DBE8B84D01 for ; Mon, 27 Nov 2023 06:55:58 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id uGNDTZ6NeGk7 for ; Mon, 27 Nov 2023 06:55:58 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 2E2F984C86 for ; Mon, 27 Nov 2023 06:55:58 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 1ECF8FA40; Mon, 27 Nov 2023 06:55:58 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1701068158195550" MIME-Version: 1.0 Date: Mon, 27 Nov 2023 06:55:58 +0000 From: "Adam Ciarcinski" Subject: CVS commit: pkgsrc/misc/py-autocommand To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: adam@netbsd.org X-Mailer: log_accum Message-Id: <20231127065558.1ECF8FA40@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_1701068158195550 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: adam Date: Mon Nov 27 06:55:58 UTC 2023 Modified Files: pkgsrc/misc/py-autocommand: Makefile PLIST distinfo Added Files: pkgsrc/misc/py-autocommand/patches: patch-setup.py Log Message: py-autocommand: fix build with setuptools v69; switch to wheel.mk; bump revision To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 pkgsrc/misc/py-autocommand/Makefile \ pkgsrc/misc/py-autocommand/distinfo cvs rdiff -u -r1.1 -r1.2 pkgsrc/misc/py-autocommand/PLIST cvs rdiff -u -r0 -r1.1 pkgsrc/misc/py-autocommand/patches/patch-setup.py Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1701068158195550 Content-Disposition: inline Content-Length: 3572 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/misc/py-autocommand/Makefile diff -u pkgsrc/misc/py-autocommand/Makefile:1.2 pkgsrc/misc/py-autocommand/Makefile:1.3 --- pkgsrc/misc/py-autocommand/Makefile:1.2 Sat Nov 26 17:08:20 2022 +++ pkgsrc/misc/py-autocommand/Makefile Mon Nov 27 06:55:57 2023 @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.2 2022/11/26 17:08:20 adam Exp $ +# $NetBSD: Makefile,v 1.3 2023/11/27 06:55:57 adam Exp $ DISTNAME= autocommand-2.2.2 +PKGREVISION= 1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} CATEGORIES= misc python MASTER_SITES= ${MASTER_SITE_PYPI:=a/autocommand/} @@ -10,12 +11,12 @@ HOMEPAGE= https://github.com/Lucretiel/a COMMENT= Create a command-line program from a function LICENSE= gnu-lgpl-v3 -TEST_DEPENDS+= ${PYPKGPREFIX}-test>0:../../devel/py-test +TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools +TOOL_DEPENDS+= ${PYPKGPREFIX}-wheel-[0-9]*:../../devel/py-wheel -PYTHON_VERSIONS_INCOMPATIBLE= 27 +USE_LANGUAGES= # none -do-test: - cd ${WRKSRC} && ${SETENV} ${TEST_ENV} pytest-${PYVERSSUFFIX} test +PYTHON_VERSIONS_INCOMPATIBLE= 27 -.include "../../lang/python/egg.mk" +.include "../../lang/python/wheel.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/misc/py-autocommand/distinfo diff -u pkgsrc/misc/py-autocommand/distinfo:1.2 pkgsrc/misc/py-autocommand/distinfo:1.3 --- pkgsrc/misc/py-autocommand/distinfo:1.2 Sat Nov 26 17:08:20 2022 +++ pkgsrc/misc/py-autocommand/distinfo Mon Nov 27 06:55:57 2023 @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.2 2022/11/26 17:08:20 adam Exp $ +$NetBSD: distinfo,v 1.3 2023/11/27 06:55:57 adam Exp $ BLAKE2s (autocommand-2.2.2.tar.gz) = cf173d9a16ed4589ee0105b9fed237f8a71c5001444f1d2aa42807eb1caf36ec SHA512 (autocommand-2.2.2.tar.gz) = 7e78b3bb7eb62be8a308fe4406b0c72170f9a057010b02a1f8f0d2b33b5d19682d8795bb573728ebe941957ec60d86edd9db57659f63a4a2d788c7176907f067 Size (autocommand-2.2.2.tar.gz) = 22894 bytes +SHA1 (patch-setup.py) = e66b22146001d4162480c55b2032bee773472dd0 Index: pkgsrc/misc/py-autocommand/PLIST diff -u pkgsrc/misc/py-autocommand/PLIST:1.1 pkgsrc/misc/py-autocommand/PLIST:1.2 --- pkgsrc/misc/py-autocommand/PLIST:1.1 Wed Feb 2 18:50:49 2022 +++ pkgsrc/misc/py-autocommand/PLIST Mon Nov 27 06:55:57 2023 @@ -1,8 +1,9 @@ -@comment $NetBSD: PLIST,v 1.1 2022/02/02 18:50:49 adam 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.2 2023/11/27 06:55:57 adam Exp $ +${PYSITELIB}/${WHEEL_INFODIR}/LICENSE +${PYSITELIB}/${WHEEL_INFODIR}/METADATA +${PYSITELIB}/${WHEEL_INFODIR}/RECORD +${PYSITELIB}/${WHEEL_INFODIR}/WHEEL +${PYSITELIB}/${WHEEL_INFODIR}/top_level.txt ${PYSITELIB}/autocommand/__init__.py ${PYSITELIB}/autocommand/__init__.pyc ${PYSITELIB}/autocommand/__init__.pyo Added files: Index: pkgsrc/misc/py-autocommand/patches/patch-setup.py diff -u /dev/null pkgsrc/misc/py-autocommand/patches/patch-setup.py:1.1 --- /dev/null Mon Nov 27 06:55:58 2023 +++ pkgsrc/misc/py-autocommand/patches/patch-setup.py Mon Nov 27 06:55:57 2023 @@ -0,0 +1,14 @@ +$NetBSD: patch-setup.py,v 1.1 2023/11/27 06:55:57 adam Exp $ + +Fix build with setuptools 69. + +--- setup.py.orig 2023-11-27 06:43:19.679895559 +0000 ++++ setup.py +@@ -13,7 +13,6 @@ setup( + ], + package_dir={'': 'src'}, + platforms='any', +- license='LGPLv3', + author='Nathan West', + url='https://github.com/Lucretiel/autocommand', + description='A library to create a command-line program from a function', --_----------=_1701068158195550--