CVS commit: pkgsrc/net/py-sbws

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Jan 10 08:01:01 UTC 2022

Modified Files:
        pkgsrc/net/py-sbws: Makefile PLIST

Log Message:
py-sbws: convert to egg.mk


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/py-sbws/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/py-sbws/PLIST

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/py-sbws/Makefile
diff -u pkgsrc/net/py-sbws/Makefile:1.2 pkgsrc/net/py-sbws/Makefile:1.3
--- pkgsrc/net/py-sbws/Makefile:1.2     Sun Nov  3 11:45:51 2019
+++ pkgsrc/net/py-sbws/Makefile Mon Jan 10 08:01:01 2022
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2019/11/03 11:45:51 rillig Exp $
+# $NetBSD: Makefile,v 1.3 2022/01/10 08:01:01 wiz Exp $
 
 DISTNAME=      sbws-0.8.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
+PKGREVISION=   1
 CATEGORIES=    net
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=torproject/}
 GITHUB_PROJECT=        sbws
@@ -46,5 +47,5 @@ do-test:
        cd ${WRKSRC} && pytest-${PYVERSSUFFIX} -s tests/unit -vv
 
 .include "../../lang/python/application.mk"
-.include "../../lang/python/distutils.mk"
+.include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/py-sbws/PLIST
diff -u pkgsrc/net/py-sbws/PLIST:1.1 pkgsrc/net/py-sbws/PLIST:1.2
--- pkgsrc/net/py-sbws/PLIST:1.1        Tue Oct 23 01:42:35 2018
+++ pkgsrc/net/py-sbws/PLIST    Mon Jan 10 08:01:01 2022
@@ -1,117 +1,117 @@
-@comment $NetBSD: PLIST,v 1.1 2018/10/23 01:42:35 riastradh Exp $
+@comment $NetBSD: PLIST,v 1.2 2022/01/10 08:01:01 wiz Exp $
 bin/sbws
 examples/config.example.ini
-${PYSITELIB}/${EGG_FILE}/PKG-INFO
-${PYSITELIB}/${EGG_FILE}/SOURCES.txt
-${PYSITELIB}/${EGG_FILE}/dependency_links.txt
-${PYSITELIB}/${EGG_FILE}/entry_points.txt
-${PYSITELIB}/${EGG_FILE}/requires.txt
-${PYSITELIB}/${EGG_FILE}/top_level.txt
+${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}/sbws/__init__.py
-${PYSITELIB}/sbws/__init__.pyo
 ${PYSITELIB}/sbws/__init__.pyc
-${PYSITELIB}/sbws/globals.pyo
-${PYSITELIB}/sbws/globals.pyc
-${PYSITELIB}/sbws/sbws.pyo
-${PYSITELIB}/sbws/sbws.pyc
+${PYSITELIB}/sbws/__init__.pyo
 ${PYSITELIB}/sbws/config.default.ini
 ${PYSITELIB}/sbws/config.log.default.ini
 ${PYSITELIB}/sbws/core/__init__.py
-${PYSITELIB}/sbws/core/__init__.pyo
 ${PYSITELIB}/sbws/core/__init__.pyc
-${PYSITELIB}/sbws/core/cleanup.pyo
-${PYSITELIB}/sbws/core/cleanup.pyc
-${PYSITELIB}/sbws/core/generate.pyo
-${PYSITELIB}/sbws/core/generate.pyc
-${PYSITELIB}/sbws/core/scanner.pyo
-${PYSITELIB}/sbws/core/scanner.pyc
-${PYSITELIB}/sbws/core/stats.pyo
-${PYSITELIB}/sbws/core/stats.pyc
+${PYSITELIB}/sbws/core/__init__.pyo
 ${PYSITELIB}/sbws/core/cleanup.py
+${PYSITELIB}/sbws/core/cleanup.pyc
+${PYSITELIB}/sbws/core/cleanup.pyo
 ${PYSITELIB}/sbws/core/generate.py
+${PYSITELIB}/sbws/core/generate.pyc
+${PYSITELIB}/sbws/core/generate.pyo
 ${PYSITELIB}/sbws/core/scanner.py
+${PYSITELIB}/sbws/core/scanner.pyc
+${PYSITELIB}/sbws/core/scanner.pyo
 ${PYSITELIB}/sbws/core/stats.py
+${PYSITELIB}/sbws/core/stats.pyc
+${PYSITELIB}/sbws/core/stats.pyo
 ${PYSITELIB}/sbws/globals.py
+${PYSITELIB}/sbws/globals.pyc
+${PYSITELIB}/sbws/globals.pyo
 ${PYSITELIB}/sbws/lib/__init__.py
-${PYSITELIB}/sbws/lib/__init__.pyo
 ${PYSITELIB}/sbws/lib/__init__.pyc
-${PYSITELIB}/sbws/lib/circuitbuilder.pyo
-${PYSITELIB}/sbws/lib/circuitbuilder.pyc
-${PYSITELIB}/sbws/lib/destination.pyo
-${PYSITELIB}/sbws/lib/destination.pyc
-${PYSITELIB}/sbws/lib/relaylist.pyo
-${PYSITELIB}/sbws/lib/relaylist.pyc
-${PYSITELIB}/sbws/lib/relayprioritizer.pyo
-${PYSITELIB}/sbws/lib/relayprioritizer.pyc
-${PYSITELIB}/sbws/lib/resultdump.pyo
-${PYSITELIB}/sbws/lib/resultdump.pyc
-${PYSITELIB}/sbws/lib/v3bwfile.pyo
-${PYSITELIB}/sbws/lib/v3bwfile.pyc
+${PYSITELIB}/sbws/lib/__init__.pyo
 ${PYSITELIB}/sbws/lib/circuitbuilder.py
+${PYSITELIB}/sbws/lib/circuitbuilder.pyc
+${PYSITELIB}/sbws/lib/circuitbuilder.pyo
 ${PYSITELIB}/sbws/lib/destination.py
+${PYSITELIB}/sbws/lib/destination.pyc
+${PYSITELIB}/sbws/lib/destination.pyo
 ${PYSITELIB}/sbws/lib/relaylist.py
+${PYSITELIB}/sbws/lib/relaylist.pyc
+${PYSITELIB}/sbws/lib/relaylist.pyo
 ${PYSITELIB}/sbws/lib/relayprioritizer.py
+${PYSITELIB}/sbws/lib/relayprioritizer.pyc
+${PYSITELIB}/sbws/lib/relayprioritizer.pyo
 ${PYSITELIB}/sbws/lib/resultdump.py
+${PYSITELIB}/sbws/lib/resultdump.pyc
+${PYSITELIB}/sbws/lib/resultdump.pyo
 ${PYSITELIB}/sbws/lib/v3bwfile.py
+${PYSITELIB}/sbws/lib/v3bwfile.pyc
+${PYSITELIB}/sbws/lib/v3bwfile.pyo
 ${PYSITELIB}/sbws/sbws.py
+${PYSITELIB}/sbws/sbws.pyc
+${PYSITELIB}/sbws/sbws.pyo
 ${PYSITELIB}/sbws/util/__init__.py
-${PYSITELIB}/sbws/util/__init__.pyo
 ${PYSITELIB}/sbws/util/__init__.pyc
-${PYSITELIB}/sbws/util/config.pyo
-${PYSITELIB}/sbws/util/config.pyc
-${PYSITELIB}/sbws/util/filelock.pyo
-${PYSITELIB}/sbws/util/filelock.pyc
-${PYSITELIB}/sbws/util/fs.pyo
-${PYSITELIB}/sbws/util/fs.pyc
-${PYSITELIB}/sbws/util/parser.pyo
-${PYSITELIB}/sbws/util/parser.pyc
-${PYSITELIB}/sbws/util/requests.pyo
-${PYSITELIB}/sbws/util/requests.pyc
-${PYSITELIB}/sbws/util/state.pyo
-${PYSITELIB}/sbws/util/state.pyc
-${PYSITELIB}/sbws/util/stem.pyo
-${PYSITELIB}/sbws/util/stem.pyc
-${PYSITELIB}/sbws/util/timestamp.pyo
-${PYSITELIB}/sbws/util/timestamp.pyc
-${PYSITELIB}/sbws/util/userquery.pyo
-${PYSITELIB}/sbws/util/userquery.pyc
+${PYSITELIB}/sbws/util/__init__.pyo
 ${PYSITELIB}/sbws/util/config.py
+${PYSITELIB}/sbws/util/config.pyc
+${PYSITELIB}/sbws/util/config.pyo
 ${PYSITELIB}/sbws/util/filelock.py
+${PYSITELIB}/sbws/util/filelock.pyc
+${PYSITELIB}/sbws/util/filelock.pyo
 ${PYSITELIB}/sbws/util/fs.py
+${PYSITELIB}/sbws/util/fs.pyc
+${PYSITELIB}/sbws/util/fs.pyo
 ${PYSITELIB}/sbws/util/parser.py
+${PYSITELIB}/sbws/util/parser.pyc
+${PYSITELIB}/sbws/util/parser.pyo
 ${PYSITELIB}/sbws/util/requests.py
+${PYSITELIB}/sbws/util/requests.pyc
+${PYSITELIB}/sbws/util/requests.pyo
 ${PYSITELIB}/sbws/util/state.py
+${PYSITELIB}/sbws/util/state.pyc
+${PYSITELIB}/sbws/util/state.pyo
 ${PYSITELIB}/sbws/util/stem.py
+${PYSITELIB}/sbws/util/stem.pyc
+${PYSITELIB}/sbws/util/stem.pyo
 ${PYSITELIB}/sbws/util/timestamp.py
+${PYSITELIB}/sbws/util/timestamp.pyc
+${PYSITELIB}/sbws/util/timestamp.pyo
 ${PYSITELIB}/sbws/util/userquery.py
+${PYSITELIB}/sbws/util/userquery.pyc
+${PYSITELIB}/sbws/util/userquery.pyo
 ${PYSITELIB}/tests/__init__.py
-${PYSITELIB}/tests/__init__.pyo
 ${PYSITELIB}/tests/__init__.pyc
-${PYSITELIB}/tests/conftest.pyo
-${PYSITELIB}/tests/conftest.pyc
+${PYSITELIB}/tests/__init__.pyo
 ${PYSITELIB}/tests/conftest.py
+${PYSITELIB}/tests/conftest.pyc
+${PYSITELIB}/tests/conftest.pyo
 ${PYSITELIB}/tests/integration/__init__.py
-${PYSITELIB}/tests/integration/__init__.pyo
 ${PYSITELIB}/tests/integration/__init__.pyc
-${PYSITELIB}/tests/integration/conftest.pyo
-${PYSITELIB}/tests/integration/conftest.pyc
+${PYSITELIB}/tests/integration/__init__.pyo
 ${PYSITELIB}/tests/integration/conftest.py
-${PYSITELIB}/tests/integration/core/test_scanner.pyo
-${PYSITELIB}/tests/integration/core/test_scanner.pyc
+${PYSITELIB}/tests/integration/conftest.pyc
+${PYSITELIB}/tests/integration/conftest.pyo
 ${PYSITELIB}/tests/integration/core/test_scanner.py
-${PYSITELIB}/tests/integration/lib/test_relaylist.pyo
-${PYSITELIB}/tests/integration/lib/test_relaylist.pyc
-${PYSITELIB}/tests/integration/lib/test_relayprioritizer.pyo
-${PYSITELIB}/tests/integration/lib/test_relayprioritizer.pyc
+${PYSITELIB}/tests/integration/core/test_scanner.pyc
+${PYSITELIB}/tests/integration/core/test_scanner.pyo
 ${PYSITELIB}/tests/integration/lib/test_relaylist.py
+${PYSITELIB}/tests/integration/lib/test_relaylist.pyc
+${PYSITELIB}/tests/integration/lib/test_relaylist.pyo
 ${PYSITELIB}/tests/integration/lib/test_relayprioritizer.py
+${PYSITELIB}/tests/integration/lib/test_relayprioritizer.pyc
+${PYSITELIB}/tests/integration/lib/test_relayprioritizer.pyo
 ${PYSITELIB}/tests/integration/net.tar
 ${PYSITELIB}/tests/integration/util/__init__.py
-${PYSITELIB}/tests/integration/util/__init__.pyo
 ${PYSITELIB}/tests/integration/util/__init__.pyc
-${PYSITELIB}/tests/integration/util/test_stem.pyo
-${PYSITELIB}/tests/integration/util/test_stem.pyc
+${PYSITELIB}/tests/integration/util/__init__.pyo
 ${PYSITELIB}/tests/integration/util/test_stem.py
+${PYSITELIB}/tests/integration/util/test_stem.pyc
+${PYSITELIB}/tests/integration/util/test_stem.pyo
 ${PYSITELIB}/tests/testnets/.gitignore
 ${PYSITELIB}/tests/testnets/run-network.sh
 ${PYSITELIB}/tests/testnets/simple-ipv4/.net
@@ -119,55 +119,55 @@ ${PYSITELIB}/tests/testnets/simple-ipv4/
 ${PYSITELIB}/tests/testnets/simple-ipv4/01-gen-configs.sh
 ${PYSITELIB}/tests/testnets/simple-ipv4/02-start-network.sh
 ${PYSITELIB}/tests/testnets/simple-ipv4/03-network-in-ready-state.py
-${PYSITELIB}/tests/testnets/simple-ipv4/04-stop-network.sh
-${PYSITELIB}/tests/testnets/simple-ipv4/03-network-in-ready-state.pyo
 ${PYSITELIB}/tests/testnets/simple-ipv4/03-network-in-ready-state.pyc
+${PYSITELIB}/tests/testnets/simple-ipv4/03-network-in-ready-state.pyo
+${PYSITELIB}/tests/testnets/simple-ipv4/04-stop-network.sh
 ${PYSITELIB}/tests/testnets/simple-ipv4/html/alphabet.txt
 ${PYSITELIB}/tests/testnets/simple-ipv6/.net
 ${PYSITELIB}/tests/testnets/simple-ipv6/00-common.sh
 ${PYSITELIB}/tests/testnets/simple-ipv6/01-gen-configs.sh
 ${PYSITELIB}/tests/testnets/simple-ipv6/02-start-network.sh
 ${PYSITELIB}/tests/testnets/simple-ipv6/03-network-in-ready-state.py
-${PYSITELIB}/tests/testnets/simple-ipv6/04-stop-network.sh
-${PYSITELIB}/tests/testnets/simple-ipv6/03-network-in-ready-state.pyo
 ${PYSITELIB}/tests/testnets/simple-ipv6/03-network-in-ready-state.pyc
+${PYSITELIB}/tests/testnets/simple-ipv6/03-network-in-ready-state.pyo
+${PYSITELIB}/tests/testnets/simple-ipv6/04-stop-network.sh
 ${PYSITELIB}/tests/testnets/simple.common/01-gen-configs.sh
 ${PYSITELIB}/tests/testnets/simple.common/02-start-network.sh
 ${PYSITELIB}/tests/testnets/simple.common/03-network-in-ready-state.py
-${PYSITELIB}/tests/testnets/simple.common/04-stop-network.sh
-${PYSITELIB}/tests/testnets/simple.common/03-network-in-ready-state.pyo
 ${PYSITELIB}/tests/testnets/simple.common/03-network-in-ready-state.pyc
+${PYSITELIB}/tests/testnets/simple.common/03-network-in-ready-state.pyo
+${PYSITELIB}/tests/testnets/simple.common/04-stop-network.sh
 ${PYSITELIB}/tests/unit/__init__.py
-${PYSITELIB}/tests/unit/__init__.pyo
 ${PYSITELIB}/tests/unit/__init__.pyc
-${PYSITELIB}/tests/unit/conftest.pyo
-${PYSITELIB}/tests/unit/conftest.pyc
-${PYSITELIB}/tests/unit/globals.pyo
-${PYSITELIB}/tests/unit/globals.pyc
+${PYSITELIB}/tests/unit/__init__.pyo
 ${PYSITELIB}/tests/unit/conftest.py
-${PYSITELIB}/tests/unit/core/test_stats.pyo
-${PYSITELIB}/tests/unit/core/test_stats.pyc
+${PYSITELIB}/tests/unit/conftest.pyc
+${PYSITELIB}/tests/unit/conftest.pyo
 ${PYSITELIB}/tests/unit/core/test_stats.py
+${PYSITELIB}/tests/unit/core/test_stats.pyc
+${PYSITELIB}/tests/unit/core/test_stats.pyo
 ${PYSITELIB}/tests/unit/globals.py
-${PYSITELIB}/tests/unit/lib/test_resultdump.pyo
-${PYSITELIB}/tests/unit/lib/test_resultdump.pyc
-${PYSITELIB}/tests/unit/lib/test_results.pyo
-${PYSITELIB}/tests/unit/lib/test_results.pyc
-${PYSITELIB}/tests/unit/lib/test_v3bwfile.pyo
-${PYSITELIB}/tests/unit/lib/test_v3bwfile.pyc
+${PYSITELIB}/tests/unit/globals.pyc
+${PYSITELIB}/tests/unit/globals.pyo
 ${PYSITELIB}/tests/unit/lib/data/results.txt
 ${PYSITELIB}/tests/unit/lib/test_resultdump.py
+${PYSITELIB}/tests/unit/lib/test_resultdump.pyc
+${PYSITELIB}/tests/unit/lib/test_resultdump.pyo
 ${PYSITELIB}/tests/unit/lib/test_results.py
+${PYSITELIB}/tests/unit/lib/test_results.pyc
+${PYSITELIB}/tests/unit/lib/test_results.pyo
 ${PYSITELIB}/tests/unit/lib/test_v3bwfile.py
-${PYSITELIB}/tests/unit/util/test_config.pyo
-${PYSITELIB}/tests/unit/util/test_config.pyc
-${PYSITELIB}/tests/unit/util/test_state.pyo
-${PYSITELIB}/tests/unit/util/test_state.pyc
-${PYSITELIB}/tests/unit/util/test_timestamp.pyo
-${PYSITELIB}/tests/unit/util/test_timestamp.pyc
-${PYSITELIB}/tests/unit/util/test_userquery.pyo
-${PYSITELIB}/tests/unit/util/test_userquery.pyc
+${PYSITELIB}/tests/unit/lib/test_v3bwfile.pyc
+${PYSITELIB}/tests/unit/lib/test_v3bwfile.pyo
 ${PYSITELIB}/tests/unit/util/test_config.py
+${PYSITELIB}/tests/unit/util/test_config.pyc
+${PYSITELIB}/tests/unit/util/test_config.pyo
 ${PYSITELIB}/tests/unit/util/test_state.py
+${PYSITELIB}/tests/unit/util/test_state.pyc
+${PYSITELIB}/tests/unit/util/test_state.pyo
 ${PYSITELIB}/tests/unit/util/test_timestamp.py
+${PYSITELIB}/tests/unit/util/test_timestamp.pyc
+${PYSITELIB}/tests/unit/util/test_timestamp.pyo
 ${PYSITELIB}/tests/unit/util/test_userquery.py
+${PYSITELIB}/tests/unit/util/test_userquery.pyc
+${PYSITELIB}/tests/unit/util/test_userquery.pyo