Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id EC8A984D4C for ; Wed, 22 Nov 2023 20:35:46 +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 nl_LbUhzIwr2 for ; Wed, 22 Nov 2023 20:35:46 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 58BE384CC9 for ; Wed, 22 Nov 2023 20:35:46 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 0AE85FA3F; Wed, 22 Nov 2023 20:35:46 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1700685346234400" MIME-Version: 1.0 Date: Wed, 22 Nov 2023 20:35:46 +0000 From: "Thomas Klausner" Subject: CVS commit: pkgsrc/sysutils/py-Glances To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: wiz@netbsd.org X-Mailer: log_accum Message-Id: <20231122203546.0AE85FA3F@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_1700685346234400 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: wiz Date: Wed Nov 22 20:35:45 UTC 2023 Modified Files: pkgsrc/sysutils/py-Glances: Makefile PLIST Log Message: py-Glances: convert to wheel.mk Fix dependency list. Bump PKGREVISION. To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 pkgsrc/sysutils/py-Glances/Makefile cvs rdiff -u -r1.11 -r1.12 pkgsrc/sysutils/py-Glances/PLIST Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1700685346234400 Content-Disposition: inline Content-Length: 3014 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/sysutils/py-Glances/Makefile diff -u pkgsrc/sysutils/py-Glances/Makefile:1.24 pkgsrc/sysutils/py-Glances/Makefile:1.25 --- pkgsrc/sysutils/py-Glances/Makefile:1.24 Mon Oct 23 06:37:52 2023 +++ pkgsrc/sysutils/py-Glances/Makefile Wed Nov 22 20:35:45 2023 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.24 2023/10/23 06:37:52 wiz Exp $ +# $NetBSD: Makefile,v 1.25 2023/11/22 20:35:45 wiz Exp $ DISTNAME= Glances-3.4.0.3 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= sysutils python MASTER_SITES= ${MASTER_SITE_PYPI:=G/Glances/} @@ -11,22 +11,21 @@ HOMEPAGE= https://nicolargo.github.io/gl COMMENT= Cross-platform curses-based monitoring tool LICENSE= gnu-lgpl-v3 -DEPENDS+= ${PYPKGPREFIX}-psutil>=5.3.0:../../sysutils/py-psutil -DEPENDS+= ${PYPKGPREFIX}-future-[0-9]*:../../devel/py-future +TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools>=0:../../devel/py-setuptools +TOOL_DEPENDS+= ${PYPKGPREFIX}-wheel>=0:../../devel/py-wheel +DEPENDS+= ${PYPKGPREFIX}-psutil>=5.6.7:../../sysutils/py-psutil DEPENDS+= ${PYPKGPREFIX}-defusedxml-[0-9]*:../../textproc/py-defusedxml DEPENDS+= ${PYPKGPREFIX}-packaging-[0-9]*:../../devel/py-packaging -DEPENDS+= ${PYPKGPREFIX}-ujson-[0-9]*:../../textproc/py-ujson +DEPENDS+= ${PYPKGPREFIX}-ujson>=5.4.0:../../textproc/py-ujson USE_LANGUAGES= # none PYTHON_VERSIONS_INCOMPATIBLE= 27 -USE_PKG_RESOURCES= yes - SUBST_CLASSES+= prefix SUBST_STAGE.prefix= pre-configure SUBST_MESSAGE.prefix= Set correct prefix in setup.py -SUBST_FILES.prefix= ${WRKSRC}/setup.py +SUBST_FILES.prefix= setup.py SUBST_SED.prefix= -e 's,share/man,${PKGMANDIR},' post-extract: @@ -41,5 +40,5 @@ post-install: ${MV} share/examples/glances share/examples/glances-${PYVERSSUFFIX} || ${TRUE} .include "../../lang/python/batteries-included.mk" -.include "../../lang/python/egg.mk" +.include "../../lang/python/wheel.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/sysutils/py-Glances/PLIST diff -u pkgsrc/sysutils/py-Glances/PLIST:1.11 pkgsrc/sysutils/py-Glances/PLIST:1.12 --- pkgsrc/sysutils/py-Glances/PLIST:1.11 Sun May 21 17:41:04 2023 +++ pkgsrc/sysutils/py-Glances/PLIST Wed Nov 22 20:35:45 2023 @@ -1,11 +1,12 @@ -@comment $NetBSD: PLIST,v 1.11 2023/05/21 17:41:04 wiz Exp $ +@comment $NetBSD: PLIST,v 1.12 2023/11/22 20:35:45 wiz Exp $ bin/glances-${PYVERSSUFFIX} -${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}/${WHEEL_INFODIR}/AUTHORS +${PYSITELIB}/${WHEEL_INFODIR}/COPYING +${PYSITELIB}/${WHEEL_INFODIR}/METADATA +${PYSITELIB}/${WHEEL_INFODIR}/RECORD +${PYSITELIB}/${WHEEL_INFODIR}/WHEEL +${PYSITELIB}/${WHEEL_INFODIR}/entry_points.txt +${PYSITELIB}/${WHEEL_INFODIR}/top_level.txt ${PYSITELIB}/glances/__init__.py ${PYSITELIB}/glances/__init__.pyc ${PYSITELIB}/glances/__init__.pyo --_----------=_1700685346234400--