@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2023/10/23 06:37:51 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2024/04/30 13:47:26 wiz Exp $
 
 DISTNAME=	speedtest-cli-2.1.3
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_GITHUB:=sivel/}
 GITHUB_TAG=	v${PKGVERSION_NOREV}
@@ -11,20 +11,20 @@
 COMMENT=	Command line client for use with speedtest.net
 LICENSE=	apache-2.0
 
+TOOL_DEPENDS+=	${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
+TOOL_DEPENDS+=	${PYPKGPREFIX}-wheel-[0-9]*:../../devel/py-wheel
+
 REPLACE_PYTHON=	*.py
 
-PYTHON_VERSIONED_DEPENDENCIES+=	setuptools
+PYTHON_VERSIONS_INCOMPATIBLE=	27
 
 INSTALLATION_DIRS+=	${PKGMANDIR}/man1
 
-USE_PKG_RESOURCES=	yes
-
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/speedtest-cli.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 	${INSTALL_MAN} ${WRKSRC}/speedtest-cli.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/speedtest.1
 
 .include "../../lang/python/batteries-included.mk"
-.include "../../lang/python/egg.mk"
+.include "../../lang/python/wheel.mk"
 .include "../../lang/python/application.mk"
-.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

@@ -1,13 +1,14 @@
-@comment $NetBSD: PLIST,v 1.3 2022/01/10 22:20:26 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2024/04/30 13:47:26 wiz Exp $
 bin/speedtest
 bin/speedtest-cli
-${PYSITELIB}/speedtest.pyo
-${PYSITELIB}/speedtest.pyc
 ${PYSITELIB}/speedtest.py
-${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}/top_level.txt
+${PYSITELIB}/speedtest.pyc
+${PYSITELIB}/speedtest.pyo
+${PYSITELIB}/${WHEEL_INFODIR}/LICENSE
+${PYSITELIB}/${WHEEL_INFODIR}/METADATA
+${PYSITELIB}/${WHEEL_INFODIR}/RECORD
+${PYSITELIB}/${WHEEL_INFODIR}/WHEEL
+${PYSITELIB}/${WHEEL_INFODIR}/entry_points.txt
+${PYSITELIB}/${WHEEL_INFODIR}/top_level.txt
 man/man1/speedtest-cli.1
 man/man1/speedtest.1