pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc



Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Jan  5 15:41:32 UTC 2022

Modified Files:
        pkgsrc/archivers/py-yuicompressor: Makefile
        pkgsrc/audio/aeneas: Makefile
        pkgsrc/audio/eyeD3: Makefile
        pkgsrc/audio/py-mutagen: Makefile
        pkgsrc/audio/sonata: Makefile
        pkgsrc/biology/py-cutadapt: Makefile
        pkgsrc/biology/py-pydicom: Makefile
        pkgsrc/chat/gajim: Makefile
        pkgsrc/chat/matrix-synapse: Makefile
        pkgsrc/chat/maubot: Makefile
        pkgsrc/chat/py-hangups: Makefile
        pkgsrc/chat/tootstream: Makefile
        pkgsrc/comms/py-nodemcu-uploader: Makefile
        pkgsrc/comms/py-serial: Makefile
        pkgsrc/converters/py-base58: Makefile
        pkgsrc/converters/py-bidi: Makefile
        pkgsrc/converters/py-cairosvg: Makefile
        pkgsrc/converters/py-chardet: Makefile
        pkgsrc/converters/py-charset-normalizer: Makefile
        pkgsrc/converters/py-confusable_homoglyphs: Makefile
        pkgsrc/converters/py-zfec: Makefile
        pkgsrc/databases/py-alembic: Makefile
        pkgsrc/databases/py-barman: Makefile
        pkgsrc/databases/py-kb: Makefile
        pkgsrc/databases/py-sqlalchemy-migrate: Makefile
        pkgsrc/databases/py-sqlparse: Makefile
        pkgsrc/devel/RBTools: Makefile
        pkgsrc/devel/bpython: Makefile
        pkgsrc/devel/breezy: Makefile
        pkgsrc/devel/lettuce: Makefile
        pkgsrc/devel/meson: Makefile
        pkgsrc/devel/py-ZopeTestrunner: Makefile
        pkgsrc/devel/py-adb: Makefile
        pkgsrc/devel/py-argcomplete: Makefile
        pkgsrc/devel/py-automat: Makefile
        pkgsrc/devel/py-autopep8: Makefile
        pkgsrc/devel/py-babel: Makefile
        pkgsrc/devel/py-behave: Makefile
        pkgsrc/devel/py-build: Makefile
        pkgsrc/devel/py-buildbot: Makefile
        pkgsrc/devel/py-buildbot-worker: Makefile
        pkgsrc/devel/py-bump2version: Makefile
        pkgsrc/devel/py-cachecontrol: Makefile
        pkgsrc/devel/py-codespell: Makefile
        pkgsrc/devel/py-codestyle: Makefile
        pkgsrc/devel/py-cookiecutter: Makefile
        pkgsrc/devel/py-coverage: Makefile
        pkgsrc/devel/py-cpplint: Makefile
        pkgsrc/devel/py-cython: Makefile
        pkgsrc/devel/py-distro: Makefile
        pkgsrc/devel/py-doc8: Makefile
        pkgsrc/devel/py-docstyle: Makefile
        pkgsrc/devel/py-dotenv: Makefile
        pkgsrc/devel/py-dulwich: Makefile
        pkgsrc/devel/py-editorconfig-core: Makefile
        pkgsrc/devel/py-faker: Makefile
        pkgsrc/devel/py-falcon: Makefile
        pkgsrc/devel/py-flake8: Makefile
        pkgsrc/devel/py-flakes: Makefile
        pkgsrc/devel/py-future: Makefile
        pkgsrc/devel/py-gcovr: Makefile
        pkgsrc/devel/py-gitinspector: Makefile
        pkgsrc/devel/py-grako: Makefile
        pkgsrc/devel/py-hypothesis: Makefile
        pkgsrc/devel/py-ipython: Makefile
        pkgsrc/devel/py-isort: Makefile
        pkgsrc/devel/py-jaraco_util: Makefile
        pkgsrc/devel/py-jupyter-console: Makefile
        pkgsrc/devel/py-jupyter_client: Makefile
        pkgsrc/devel/py-jupyter_core: Makefile
        pkgsrc/devel/py-lama: Makefile
        pkgsrc/devel/py-line_profiler: Makefile
        pkgsrc/devel/py-logilab-common: Makefile
        pkgsrc/devel/py-macholib: Makefile
        pkgsrc/devel/py-mako: Makefile
        pkgsrc/devel/py-manticore: Makefile
        pkgsrc/devel/py-memory-profiler: Makefile
        pkgsrc/devel/py-minidump: Makefile
        pkgsrc/devel/py-modulegraph: Makefile
        pkgsrc/devel/py-nose: Makefile
        pkgsrc/devel/py-nose2: Makefile
        pkgsrc/devel/py-pbr: Makefile
        pkgsrc/devel/py-pep8: Makefile
        pkgsrc/devel/py-pip: Makefile
        pkgsrc/devel/py-pkginfo: Makefile
        pkgsrc/devel/py-pybind11: Makefile
        pkgsrc/devel/py-pylint: Makefile
        pkgsrc/devel/py-pyutil: Makefile
        pkgsrc/devel/py-radon: Makefile
        pkgsrc/devel/py-restructuredtext_lint: Makefile
        pkgsrc/devel/py-slugify: Makefile
        pkgsrc/devel/py-test: Makefile
        pkgsrc/devel/py-test-benchmark: Makefile
        pkgsrc/devel/py-test-watch: Makefile
        pkgsrc/devel/py-tox: Makefile
        pkgsrc/devel/py-tryton: Makefile
        pkgsrc/devel/py-trytond: Makefile
        pkgsrc/devel/py-unittest2: Makefile
        pkgsrc/devel/py-unittest2pytest: Makefile
        pkgsrc/devel/py-virtualenv: Makefile
        pkgsrc/devel/py-wasm: Makefile
        pkgsrc/devel/py-wheel: Makefile
        pkgsrc/devel/py-xdis: Makefile
        pkgsrc/devel/py-yapf: Makefile
        pkgsrc/devel/py-zconfig: Makefile
        pkgsrc/devel/undebt: Makefile
        pkgsrc/editors/retext: Makefile
        pkgsrc/emulators/gns3-gui: Makefile
        pkgsrc/emulators/gns3-server: Makefile
        pkgsrc/filesystems/fuse-pcachefs: Makefile
        pkgsrc/filesystems/tahoe-lafs: Makefile
        pkgsrc/finance/py-backtrader: Makefile
        pkgsrc/finance/py-crytic-compile: Makefile
        pkgsrc/finance/py-pyevmasm: Makefile
        pkgsrc/finance/py-trytond-currency: Makefile
        pkgsrc/fonts/py-fonttools: Makefile
        pkgsrc/geography/py-obspy: Makefile
        pkgsrc/geography/py-trytond-country: Makefile
        pkgsrc/graphics/py-actdiag: Makefile
        pkgsrc/graphics/py-blockdiag: Makefile
        pkgsrc/graphics/py-fits: Makefile
        pkgsrc/graphics/py-imageio: Makefile
        pkgsrc/graphics/py-nwdiag: Makefile
        pkgsrc/graphics/py-pycha: Makefile
        pkgsrc/graphics/py-pygal: Makefile
        pkgsrc/graphics/py-qrcode: Makefile
        pkgsrc/graphics/py-scour: Makefile
        pkgsrc/graphics/py-seqdiag: Makefile
        pkgsrc/graphics/py-tifffile: Makefile
        pkgsrc/lang/py-cmake-language-server: Makefile
        pkgsrc/lang/py-lsp-server: Makefile
        pkgsrc/lang/py-mypy: Makefile
        pkgsrc/lang/py-paver: Makefile
        pkgsrc/lang/py-python-language-server: Makefile
        pkgsrc/lang/py-uncompyle6: Makefile
        pkgsrc/lang/python: egg.mk
        pkgsrc/mail/feed2exec: Makefile
        pkgsrc/mail/py-aiosmtpd: Makefile
        pkgsrc/mail/py-email_validator: Makefile
        pkgsrc/math/py-Theano: Makefile
        pkgsrc/math/py-asdf: Makefile
        pkgsrc/math/py-astropy: Makefile
        pkgsrc/math/py-netCDF4: Makefile
        pkgsrc/math/py-numpy: Makefile
        pkgsrc/math/py-pythran: Makefile
        pkgsrc/math/py-roman: Makefile
        pkgsrc/math/py-scikit-image: Makefile
        pkgsrc/math/py-smt: Makefile
        pkgsrc/math/py-sympy: Makefile
        pkgsrc/math/py-tables: Makefile
        pkgsrc/math/py-tensorboard: Makefile
        pkgsrc/math/py-z3solver: Makefile
        pkgsrc/misc/khard: Makefile
        pkgsrc/misc/py-asciinema: Makefile
        pkgsrc/misc/py-tqdm: Makefile
        pkgsrc/multimedia/streamlink: Makefile
        pkgsrc/net/bandcamp-dl: Makefile
        pkgsrc/net/coherence: Makefile
        pkgsrc/net/coursera-dl: Makefile
        pkgsrc/net/gallery-dl: Makefile
        pkgsrc/net/py-celery: Makefile
        pkgsrc/net/py-cymruwhois: Makefile
        pkgsrc/net/py-foolscap: Makefile
        pkgsrc/net/py-gandi.cli: Makefile
        pkgsrc/net/py-gsutil: Makefile
        pkgsrc/net/py-impacket: Makefile
        pkgsrc/net/py-lexicon: Makefile
        pkgsrc/net/py-magic-wormhole: Makefile
        pkgsrc/net/py-moto: Makefile
        pkgsrc/net/py-netaddr: Makefile
        pkgsrc/net/py-onionbalance: Makefile
        pkgsrc/net/py-ptt: Makefile
        pkgsrc/net/py-pypiserver: Makefile
        pkgsrc/net/py-softlayer: Makefile
        pkgsrc/net/py-stone: Makefile
        pkgsrc/net/py-tldextract: Makefile
        pkgsrc/net/py-twine: Makefile
        pkgsrc/net/py-twisted: Makefile
        pkgsrc/net/scapy: Makefile
        pkgsrc/net/youtube-dl: Makefile
        pkgsrc/net/yt-dlp: Makefile
        pkgsrc/print/py-octoprint: Makefile
        pkgsrc/print/py-weasyprint: Makefile
        pkgsrc/print/py-xhtml2pdf: Makefile
        pkgsrc/security/prelude-correlator: Makefile
        pkgsrc/security/py-acme-tiny: Makefile
        pkgsrc/security/py-certbot: Makefile
        pkgsrc/security/py-cyclonedx-bom: Makefile
        pkgsrc/security/py-google-auth-oauthlib: Makefile
        pkgsrc/security/py-josepy: Makefile
        pkgsrc/security/py-keyring: Makefile
        pkgsrc/security/py-libtaxii: Makefile
        pkgsrc/security/py-ndg_httpsclient: Makefile
        pkgsrc/security/py-pip-audit: Makefile
        pkgsrc/security/py-rsa: Makefile
        pkgsrc/security/py-yubikey-manager: Makefile
        pkgsrc/security/sqlmap: Makefile
        pkgsrc/security/wfuzz: Makefile
        pkgsrc/shells/xonsh: Makefile
        pkgsrc/sysutils/ansible-base: Makefile
        pkgsrc/sysutils/ansible-lint: Makefile
        pkgsrc/sysutils/duplicity: Makefile
        pkgsrc/sysutils/fabric: Makefile
        pkgsrc/sysutils/py-Glances: Makefile
        pkgsrc/sysutils/py-borgbackup: Makefile
        pkgsrc/sysutils/py-cpuinfo: Makefile
        pkgsrc/sysutils/py-diffoscope: Makefile
        pkgsrc/sysutils/py-eliot: Makefile
        pkgsrc/sysutils/py-filetype: Makefile
        pkgsrc/sysutils/py-google-compute-engine: Makefile
        pkgsrc/sysutils/py-salt-pepper: Makefile
        pkgsrc/sysutils/py-setconf: Makefile
        pkgsrc/sysutils/py-supervisor: Makefile
        pkgsrc/sysutils/py-watchdog: Makefile
        pkgsrc/sysutils/py-xattr: Makefile
        pkgsrc/sysutils/salt: Makefile
        pkgsrc/textproc/csvkit: Makefile
        pkgsrc/textproc/csvtomd: Makefile
        pkgsrc/textproc/py-Unidecode: Makefile
        pkgsrc/textproc/py-black: Makefile
        pkgsrc/textproc/py-commonmark: Makefile
        pkgsrc/textproc/py-creole: Makefile
        pkgsrc/textproc/py-deepdiff: Makefile
        pkgsrc/textproc/py-epr-reader: Makefile
        pkgsrc/textproc/py-ftfy: Makefile
        pkgsrc/textproc/py-generateDS: Makefile
        pkgsrc/textproc/py-guessit: Makefile
        pkgsrc/textproc/py-html2text: Makefile
        pkgsrc/textproc/py-jade: Makefile
        pkgsrc/textproc/py-jsbeautifier: Makefile
        pkgsrc/textproc/py-jsonschema: Makefile
        pkgsrc/textproc/py-m2r: Makefile
        pkgsrc/textproc/py-markdown: Makefile
        pkgsrc/textproc/py-mkdocs: Makefile
        pkgsrc/textproc/py-natsort: Makefile
        pkgsrc/textproc/py-nltk: Makefile
        pkgsrc/textproc/py-openapi-spec-validator: Makefile
        pkgsrc/textproc/py-ptable: Makefile
        pkgsrc/textproc/py-pybtex: Makefile
        pkgsrc/textproc/py-pygments: Makefile
        pkgsrc/textproc/py-pysrt: Makefile
        pkgsrc/textproc/py-ramlfications: Makefile
        pkgsrc/textproc/py-rdflib: Makefile
        pkgsrc/textproc/py-rst2pdf: Makefile
        pkgsrc/textproc/py-sphinx: Makefile
        pkgsrc/textproc/py-sphobjinv: Makefile
        pkgsrc/textproc/py-tabulate: Makefile
        pkgsrc/textproc/py-textile: Makefile
        pkgsrc/textproc/py-vobject: Makefile
        pkgsrc/textproc/py-xml2rfc: Makefile
        pkgsrc/textproc/py-xmlschema: Makefile
        pkgsrc/textproc/subliminal: Makefile
        pkgsrc/textproc/translate-toolkit: Makefile
        pkgsrc/textproc/yq: Makefile
        pkgsrc/time/etm: Makefile
        pkgsrc/time/khal: Makefile
        pkgsrc/time/py-icalendar: Makefile
        pkgsrc/time/py-jrnl: Makefile
        pkgsrc/time/py-tempora: Makefile
        pkgsrc/time/py-trading-calendars: Makefile
        pkgsrc/time/py-vdirsyncer: Makefile
        pkgsrc/www/ddgr: Makefile
        pkgsrc/www/py-PasteScript: Makefile
        pkgsrc/www/py-autobahn: Makefile
        pkgsrc/www/py-cheroot: Makefile
        pkgsrc/www/py-cherrypy: Makefile
        pkgsrc/www/py-daphne: Makefile
        pkgsrc/www/py-django: Makefile
        pkgsrc/www/py-flask: Makefile
        pkgsrc/www/py-google-apitools: Makefile
        pkgsrc/www/py-gunicorn: Makefile
        pkgsrc/www/py-httpie: Makefile
        pkgsrc/www/py-httpx: Makefile
        pkgsrc/www/py-livereload: Makefile
        pkgsrc/www/py-mezzanine: Makefile
        pkgsrc/www/py-nbformat: Makefile
        pkgsrc/www/py-notebook: Makefile
        pkgsrc/www/py-pelican: Makefile
        pkgsrc/www/py-pystache: Makefile
        pkgsrc/www/py-raven: Makefile
        pkgsrc/www/py-sanic: Makefile
        pkgsrc/www/py-scrapy: Makefile
        pkgsrc/www/py-static: Makefile
        pkgsrc/www/py-swiftclient: Makefile
        pkgsrc/www/py-uvicorn: Makefile
        pkgsrc/www/py-wagtail: Makefile
        pkgsrc/www/py-waitress: Makefile
        pkgsrc/www/py-webassets: Makefile
        pkgsrc/www/trac: Makefile
        pkgsrc/www/tuir: Makefile

Log Message:
python: egg.mk: add USE_PKG_RESOURCES flag

This flag should be set for packages that import pkg_resources
and thus need setuptools after the build step.

Set this flag for packages that need it and bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/archivers/py-yuicompressor/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/audio/aeneas/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/audio/eyeD3/Makefile
cvs rdiff -u -r1.29 -r1.30 pkgsrc/audio/py-mutagen/Makefile
cvs rdiff -u -r1.61 -r1.62 pkgsrc/audio/sonata/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/biology/py-cutadapt/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/biology/py-pydicom/Makefile
cvs rdiff -u -r1.60 -r1.61 pkgsrc/chat/gajim/Makefile
cvs rdiff -u -r1.38 -r1.39 pkgsrc/chat/matrix-synapse/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/chat/maubot/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/chat/py-hangups/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/chat/tootstream/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/comms/py-nodemcu-uploader/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/comms/py-serial/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/converters/py-base58/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/converters/py-bidi/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/converters/py-cairosvg/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/converters/py-chardet/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/converters/py-charset-normalizer/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/converters/py-confusable_homoglyphs/Makefile
cvs rdiff -u -r1.29 -r1.30 pkgsrc/converters/py-zfec/Makefile
cvs rdiff -u -r1.29 -r1.30 pkgsrc/databases/py-alembic/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/databases/py-barman/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/databases/py-kb/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/databases/py-sqlalchemy-migrate/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/databases/py-sqlparse/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/devel/RBTools/Makefile
cvs rdiff -u -r1.32 -r1.33 pkgsrc/devel/bpython/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/devel/breezy/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/devel/lettuce/Makefile
cvs rdiff -u -r1.34 -r1.35 pkgsrc/devel/meson/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/py-ZopeTestrunner/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/py-adb/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/devel/py-argcomplete/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/py-automat/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/devel/py-autopep8/Makefile
cvs rdiff -u -r1.30 -r1.31 pkgsrc/devel/py-babel/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/py-behave/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/py-build/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/devel/py-buildbot/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/devel/py-buildbot-worker/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/py-bump2version/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/py-cachecontrol/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/py-codespell/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/devel/py-codestyle/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/devel/py-cookiecutter/Makefile
cvs rdiff -u -r1.31 -r1.32 pkgsrc/devel/py-coverage/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/py-cpplint/Makefile
cvs rdiff -u -r1.75 -r1.76 pkgsrc/devel/py-cython/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/py-distro/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/py-doc8/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/py-docstyle/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/py-dotenv/Makefile
cvs rdiff -u -r1.47 -r1.48 pkgsrc/devel/py-dulwich/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/py-editorconfig-core/Makefile
cvs rdiff -u -r1.53 -r1.54 pkgsrc/devel/py-faker/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/py-falcon/Makefile
cvs rdiff -u -r1.39 -r1.40 pkgsrc/devel/py-flake8/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/devel/py-flakes/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/py-future/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/py-gcovr/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/py-gitinspector/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/py-grako/Makefile
cvs rdiff -u -r1.106 -r1.107 pkgsrc/devel/py-hypothesis/Makefile
cvs rdiff -u -r1.70 -r1.71 pkgsrc/devel/py-ipython/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/devel/py-isort/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/devel/py-jaraco_util/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/py-jupyter-console/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/devel/py-jupyter_client/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/devel/py-jupyter_core/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/devel/py-lama/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/devel/py-line_profiler/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/devel/py-logilab-common/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/devel/py-macholib/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/devel/py-mako/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/devel/py-manticore/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/devel/py-memory-profiler/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/py-minidump/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/devel/py-modulegraph/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/devel/py-nose/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/devel/py-nose2/Makefile
cvs rdiff -u -r1.31 -r1.32 pkgsrc/devel/py-pbr/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/devel/py-pep8/Makefile
cvs rdiff -u -r1.50 -r1.51 pkgsrc/devel/py-pip/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/devel/py-pkginfo/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/py-pybind11/Makefile
cvs rdiff -u -r1.58 -r1.59 pkgsrc/devel/py-pylint/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/devel/py-pyutil/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/devel/py-radon/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/py-restructuredtext_lint/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/py-slugify/Makefile
cvs rdiff -u -r1.104 -r1.105 pkgsrc/devel/py-test/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/py-test-benchmark/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/py-test-watch/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/devel/py-tox/Makefile
cvs rdiff -u -r1.50 -r1.51 pkgsrc/devel/py-tryton/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/devel/py-trytond/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/devel/py-unittest2/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/py-unittest2pytest/Makefile
cvs rdiff -u -r1.52 -r1.53 pkgsrc/devel/py-virtualenv/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/py-wasm/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/devel/py-wheel/Makefile
cvs rdiff -u -r1.39 -r1.40 pkgsrc/devel/py-xdis/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/py-yapf/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/devel/py-zconfig/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/undebt/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/editors/retext/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/emulators/gns3-gui/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/emulators/gns3-server/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/filesystems/fuse-pcachefs/Makefile
cvs rdiff -u -r1.53 -r1.54 pkgsrc/filesystems/tahoe-lafs/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/finance/py-backtrader/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/finance/py-crytic-compile/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/finance/py-pyevmasm/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/finance/py-trytond-currency/Makefile
cvs rdiff -u -r1.76 -r1.77 pkgsrc/fonts/py-fonttools/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/geography/py-obspy/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/geography/py-trytond-country/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/graphics/py-actdiag/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/graphics/py-blockdiag/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/graphics/py-fits/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/graphics/py-imageio/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/graphics/py-nwdiag/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/graphics/py-pycha/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/graphics/py-pygal/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/graphics/py-qrcode/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/graphics/py-scour/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/graphics/py-seqdiag/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/graphics/py-tifffile/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/py-cmake-language-server/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/py-lsp-server/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/lang/py-mypy/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/py-paver/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/lang/py-python-language-server/Makefile
cvs rdiff -u -r1.29 -r1.30 pkgsrc/lang/py-uncompyle6/Makefile
cvs rdiff -u -r1.32 -r1.33 pkgsrc/lang/python/egg.mk
cvs rdiff -u -r1.11 -r1.12 pkgsrc/mail/feed2exec/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/mail/py-aiosmtpd/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/mail/py-email_validator/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/math/py-Theano/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/math/py-asdf/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/math/py-astropy/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/math/py-netCDF4/Makefile
cvs rdiff -u -r1.88 -r1.89 pkgsrc/math/py-numpy/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/math/py-pythran/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/math/py-roman/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/math/py-scikit-image/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/math/py-smt/Makefile
cvs rdiff -u -r1.31 -r1.32 pkgsrc/math/py-sympy/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/math/py-tables/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/math/py-tensorboard/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/math/py-z3solver/Makefile
cvs rdiff -u -r1.29 -r1.30 pkgsrc/misc/khard/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/misc/py-asciinema/Makefile
cvs rdiff -u -r1.35 -r1.36 pkgsrc/misc/py-tqdm/Makefile
cvs rdiff -u -r1.29 -r1.30 pkgsrc/multimedia/streamlink/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/net/bandcamp-dl/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/net/coherence/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/net/coursera-dl/Makefile
cvs rdiff -u -r1.83 -r1.84 pkgsrc/net/gallery-dl/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/net/py-celery/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/net/py-cymruwhois/Makefile
cvs rdiff -u -r1.37 -r1.38 pkgsrc/net/py-foolscap/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/net/py-gandi.cli/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/net/py-gsutil/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/net/py-impacket/Makefile
cvs rdiff -u -r1.66 -r1.67 pkgsrc/net/py-lexicon/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/net/py-magic-wormhole/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/py-moto/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/net/py-netaddr/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/net/py-onionbalance/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/net/py-ptt/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/net/py-pypiserver/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/net/py-softlayer/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/py-stone/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/net/py-tldextract/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/net/py-twine/Makefile
cvs rdiff -u -r1.45 -r1.46 pkgsrc/net/py-twisted/Makefile
cvs rdiff -u -r1.37 -r1.38 pkgsrc/net/scapy/Makefile
cvs rdiff -u -r1.244 -r1.245 pkgsrc/net/youtube-dl/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/net/yt-dlp/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/print/py-octoprint/Makefile
cvs rdiff -u -r1.34 -r1.35 pkgsrc/print/py-weasyprint/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/print/py-xhtml2pdf/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/security/prelude-correlator/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/security/py-acme-tiny/Makefile
cvs rdiff -u -r1.31 -r1.32 pkgsrc/security/py-certbot/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/security/py-cyclonedx-bom/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/security/py-google-auth-oauthlib/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/security/py-josepy/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/security/py-keyring/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/security/py-libtaxii/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/security/py-ndg_httpsclient/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/security/py-pip-audit/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/security/py-rsa/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/security/py-yubikey-manager/Makefile
cvs rdiff -u -r1.30 -r1.31 pkgsrc/security/sqlmap/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/security/wfuzz/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/shells/xonsh/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/sysutils/ansible-base/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/sysutils/ansible-lint/Makefile
cvs rdiff -u -r1.55 -r1.56 pkgsrc/sysutils/duplicity/Makefile
cvs rdiff -u -r1.54 -r1.55 pkgsrc/sysutils/fabric/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/sysutils/py-Glances/Makefile
cvs rdiff -u -r1.34 -r1.35 pkgsrc/sysutils/py-borgbackup/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/sysutils/py-cpuinfo/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/sysutils/py-diffoscope/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/sysutils/py-eliot/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/sysutils/py-filetype/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/sysutils/py-google-compute-engine/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/sysutils/py-salt-pepper/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/sysutils/py-setconf/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/sysutils/py-supervisor/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/sysutils/py-watchdog/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/sysutils/py-xattr/Makefile
cvs rdiff -u -r1.76 -r1.77 pkgsrc/sysutils/salt/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/textproc/csvkit/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/textproc/csvtomd/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/textproc/py-Unidecode/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/textproc/py-black/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/textproc/py-commonmark/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/textproc/py-creole/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/textproc/py-deepdiff/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/textproc/py-epr-reader/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/textproc/py-ftfy/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/textproc/py-generateDS/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/textproc/py-guessit/Makefile
cvs rdiff -u -r1.57 -r1.58 pkgsrc/textproc/py-html2text/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/textproc/py-jade/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/textproc/py-jsbeautifier/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/textproc/py-jsonschema/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/textproc/py-m2r/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/textproc/py-markdown/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/textproc/py-mkdocs/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/textproc/py-natsort/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/textproc/py-nltk/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/textproc/py-openapi-spec-validator/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/textproc/py-ptable/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/textproc/py-pybtex/Makefile
cvs rdiff -u -r1.37 -r1.38 pkgsrc/textproc/py-pygments/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/textproc/py-pysrt/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/textproc/py-ramlfications/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/textproc/py-rdflib/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/textproc/py-rst2pdf/Makefile
cvs rdiff -u -r1.81 -r1.82 pkgsrc/textproc/py-sphinx/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/textproc/py-sphobjinv/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/textproc/py-tabulate/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/textproc/py-textile/Makefile
cvs rdiff -u -r1.27 -r1.28 pkgsrc/textproc/py-vobject/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/textproc/py-xml2rfc/Makefile
cvs rdiff -u -r1.34 -r1.35 pkgsrc/textproc/py-xmlschema/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/textproc/subliminal/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/textproc/translate-toolkit/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/textproc/yq/Makefile
cvs rdiff -u -r1.42 -r1.43 pkgsrc/time/etm/Makefile
cvs rdiff -u -r1.34 -r1.35 pkgsrc/time/khal/Makefile
cvs rdiff -u -r1.36 -r1.37 pkgsrc/time/py-icalendar/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/time/py-jrnl/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/time/py-tempora/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/time/py-trading-calendars/Makefile
cvs rdiff -u -r1.60 -r1.61 pkgsrc/time/py-vdirsyncer/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/www/ddgr/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/www/py-PasteScript/Makefile
cvs rdiff -u -r1.33 -r1.34 pkgsrc/www/py-autobahn/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/www/py-cheroot/Makefile
cvs rdiff -u -r1.41 -r1.42 pkgsrc/www/py-cherrypy/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/www/py-daphne/Makefile
cvs rdiff -u -r1.116 -r1.117 pkgsrc/www/py-django/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/www/py-flask/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/www/py-google-apitools/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/www/py-gunicorn/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/www/py-httpie/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/www/py-httpx/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/www/py-livereload/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/www/py-mezzanine/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/www/py-nbformat/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/www/py-notebook/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/www/py-pelican/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/www/py-pystache/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/www/py-raven/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/www/py-sanic/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/www/py-scrapy/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/www/py-static/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/www/py-swiftclient/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/www/py-uvicorn/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/www/py-wagtail/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/www/py-waitress/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/www/py-webassets/Makefile
cvs rdiff -u -r1.92 -r1.93 pkgsrc/www/trac/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/www/tuir/Makefile

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

Modified files:

Index: pkgsrc/archivers/py-yuicompressor/Makefile
diff -u pkgsrc/archivers/py-yuicompressor/Makefile:1.7 pkgsrc/archivers/py-yuicompressor/Makefile:1.8
--- pkgsrc/archivers/py-yuicompressor/Makefile:1.7      Tue Jan  4 20:52:31 2022
+++ pkgsrc/archivers/py-yuicompressor/Makefile  Wed Jan  5 15:40:56 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2022/01/04 20:52:31 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2022/01/05 15:40:56 wiz Exp $
 
 DISTNAME=      yuicompressor-2.4.8
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    archivers python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=y/yuicompressor/}
 
@@ -13,8 +13,8 @@ LICENSE=      modified-bsd
 
 USE_LANGUAGES= # none
 
-PY_PATCHPLIST= yes
-USE_JAVA=      run
+USE_PKG_RESOURCES=     yes
+USE_JAVA=              run
 
 post-install:
        ${MV} ${DESTDIR}${PREFIX}/bin/yuicompressor \

Index: pkgsrc/audio/aeneas/Makefile
diff -u pkgsrc/audio/aeneas/Makefile:1.11 pkgsrc/audio/aeneas/Makefile:1.12
--- pkgsrc/audio/aeneas/Makefile:1.11   Tue Jan  4 20:52:32 2022
+++ pkgsrc/audio/aeneas/Makefile        Wed Jan  5 15:40:57 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2022/01/04 20:52:32 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2022/01/05 15:40:57 wiz Exp $
 
 DISTNAME=      aeneas-1.7.3
-PKGREVISION=   9
+PKGREVISION=   10
 CATEGORIES=    audio
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=readbeyond/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
@@ -19,6 +19,8 @@ DEPENDS+=     ${PYPKGPREFIX}-lxml-[0-9]*:../
 MAKE_ENV+=     AENEAS_FORCE_CEW=True
 EGG_NAME=      ${DISTNAME}.0
 
+USE_PKG_RESOURCES=     yes
+
 .include "../../lang/python/egg.mk"
 .include "../../audio/espeak/buildlink3.mk"
 .include "../../math/py-numpy/buildlink3.mk"

Index: pkgsrc/audio/eyeD3/Makefile
diff -u pkgsrc/audio/eyeD3/Makefile:1.18 pkgsrc/audio/eyeD3/Makefile:1.19
--- pkgsrc/audio/eyeD3/Makefile:1.18    Tue Jan  4 20:52:32 2022
+++ pkgsrc/audio/eyeD3/Makefile Wed Jan  5 15:40:57 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2022/01/04 20:52:32 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2022/01/05 15:40:57 wiz Exp $
 
 DISTNAME=      eyeD3-0.9.5
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    audio
 MASTER_SITES=  ${MASTER_SITE_PYPI:=e/eyeD3/}
 
@@ -20,6 +20,8 @@ PYTHON_VERSIONED_DEPENDENCIES+=       test:tes
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27 # py-faker via py-factory_boy
 
+USE_PKG_RESOURCES=     yes
+
 USE_LANGUAGES= # none
 USE_TOOLS+=    gmake
 

Index: pkgsrc/audio/py-mutagen/Makefile
diff -u pkgsrc/audio/py-mutagen/Makefile:1.29 pkgsrc/audio/py-mutagen/Makefile:1.30
--- pkgsrc/audio/py-mutagen/Makefile:1.29       Tue Jan  4 20:52:34 2022
+++ pkgsrc/audio/py-mutagen/Makefile    Wed Jan  5 15:40:57 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.29 2022/01/04 20:52:34 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2022/01/05 15:40:57 wiz Exp $
 
 DISTNAME=      mutagen-1.45.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    audio python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=m/mutagen/}
 
@@ -20,6 +20,7 @@ PYTHON_VERSIONS_INCOMPATIBLE= 27
 USE_LANGUAGES= # none
 
 PYTHON_SELF_CONFLICT=  yes
+USE_PKG_RESOURCES=     yes
 
 SUBST_CLASSES+=                manpath
 SUBST_STAGE.manpath=   pre-configure

Index: pkgsrc/audio/sonata/Makefile
diff -u pkgsrc/audio/sonata/Makefile:1.61 pkgsrc/audio/sonata/Makefile:1.62
--- pkgsrc/audio/sonata/Makefile:1.61   Tue Jan  4 20:52:34 2022
+++ pkgsrc/audio/sonata/Makefile        Wed Jan  5 15:40:57 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.61 2022/01/04 20:52:34 wiz Exp $
+# $NetBSD: Makefile,v 1.62 2022/01/05 15:40:57 wiz Exp $
 
 DISTNAME=      sonata-1.7b1
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    audio
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=multani/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
@@ -18,6 +18,8 @@ USE_TOOLS+=   pkg-config msgfmt
 
 EGG_NAME=      ${DISTNAME:S/sonata/Sonata/}
 
+USE_PKG_RESOURCES=     yes
+
 SUBST_CLASSES+=                mandir
 SUBST_STAGE.mandir=    pre-configure
 SUBST_VARS.mandir=     PKGMANDIR

Index: pkgsrc/biology/py-cutadapt/Makefile
diff -u pkgsrc/biology/py-cutadapt/Makefile:1.7 pkgsrc/biology/py-cutadapt/Makefile:1.8
--- pkgsrc/biology/py-cutadapt/Makefile:1.7     Tue Jan  4 20:52:35 2022
+++ pkgsrc/biology/py-cutadapt/Makefile Wed Jan  5 15:40:57 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2022/01/04 20:52:35 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2022/01/05 15:40:57 wiz Exp $
 
 DISTNAME=      cutadapt-3.4
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    biology python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=c/cutadapt/}
 
@@ -18,6 +18,8 @@ DEPENDS+=     ${PYPKGPREFIX}-xopen>=1.0.0:..
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27 # py-xopen, dataclasses
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
        ${MV} cutadapt cutadapt-${PYVERSSUFFIX} || ${TRUE}

Index: pkgsrc/biology/py-pydicom/Makefile
diff -u pkgsrc/biology/py-pydicom/Makefile:1.6 pkgsrc/biology/py-pydicom/Makefile:1.7
--- pkgsrc/biology/py-pydicom/Makefile:1.6      Tue Jan  4 20:52:35 2022
+++ pkgsrc/biology/py-pydicom/Makefile  Wed Jan  5 15:40:57 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2022/01/04 20:52:35 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2022/01/05 15:40:57 wiz Exp $
 
 DISTNAME=      pydicom-2.2.2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    biology python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=p/pydicom/}
 
@@ -17,6 +17,8 @@ USE_LANGUAGES=        # none
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
        ${MV} pydicom pydicom-${PYVERSSUFFIX} || ${TRUE}

Index: pkgsrc/chat/gajim/Makefile
diff -u pkgsrc/chat/gajim/Makefile:1.60 pkgsrc/chat/gajim/Makefile:1.61
--- pkgsrc/chat/gajim/Makefile:1.60     Tue Jan  4 20:52:36 2022
+++ pkgsrc/chat/gajim/Makefile  Wed Jan  5 15:40:57 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.60 2022/01/04 20:52:36 wiz Exp $
+# $NetBSD: Makefile,v 1.61 2022/01/05 15:40:57 wiz Exp $
 
 DISTNAME=      gajim-1.3.2
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    chat
 MASTER_SITES=  https://www.gajim.org/downloads/${PKGVERSION_NOREV:R}/
 
@@ -12,6 +12,8 @@ LICENSE=      gnu-gpl-v3
 
 USE_TOOLS+=    gettext
 
+USE_PKG_RESOURCES=     yes
+
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "NetBSD"

Index: pkgsrc/chat/matrix-synapse/Makefile
diff -u pkgsrc/chat/matrix-synapse/Makefile:1.38 pkgsrc/chat/matrix-synapse/Makefile:1.39
--- pkgsrc/chat/matrix-synapse/Makefile:1.38    Tue Jan  4 20:52:36 2022
+++ pkgsrc/chat/matrix-synapse/Makefile Wed Jan  5 15:40:57 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.38 2022/01/04 20:52:36 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2022/01/05 15:40:57 wiz Exp $
 
 DISTNAME=      matrix-synapse-1.48.0
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    chat
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=matrix-org/}
 EGG_NAME=      matrix_synapse-${PKGVERSION_NOREV}
@@ -45,6 +45,8 @@ DEPENDS+=     ${PYPKGPREFIX}-lxml>=3.5.0:../
 
 PYTHON_VERSIONED_DEPENDENCIES= Pillow
 
+USE_PKG_RESOURCES=     yes
+
 USE_LANGUAGES= # none
 USE_TOOLS+=    perl:run
 REPLACE_PERL+= scripts/sync_room_to_group.pl

Index: pkgsrc/chat/maubot/Makefile
diff -u pkgsrc/chat/maubot/Makefile:1.7 pkgsrc/chat/maubot/Makefile:1.8
--- pkgsrc/chat/maubot/Makefile:1.7     Tue Jan  4 20:52:36 2022
+++ pkgsrc/chat/maubot/Makefile Wed Jan  5 15:40:58 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2022/01/04 20:52:36 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2022/01/05 15:40:58 wiz Exp $
 
 DISTNAME=      maubot-0.1.0
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    chat python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=m/maubot/}
 
@@ -28,6 +28,7 @@ USE_LANGUAGES=        # none
  
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
+USE_PKG_RESOURCES=     yes
 INSTALLATION_DIRS+=    share/maubot
 
 post-install:

Index: pkgsrc/chat/py-hangups/Makefile
diff -u pkgsrc/chat/py-hangups/Makefile:1.12 pkgsrc/chat/py-hangups/Makefile:1.13
--- pkgsrc/chat/py-hangups/Makefile:1.12        Tue Jan  4 20:52:37 2022
+++ pkgsrc/chat/py-hangups/Makefile     Wed Jan  5 15:40:58 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2022/01/04 20:52:37 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2022/01/05 15:40:58 wiz Exp $
 
 DISTNAME=      hangups-0.4.13
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    chat python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=h/hangups/}
 
@@ -24,6 +24,8 @@ DEPENDS+=     ${PYPKGPREFIX}-urwid>=1.3.1:..
 
 USE_LANGUAGES= # none
 
+USE_PKG_RESOURCES=     yes
+
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
 .include "../../lang/python/egg.mk"

Index: pkgsrc/chat/tootstream/Makefile
diff -u pkgsrc/chat/tootstream/Makefile:1.14 pkgsrc/chat/tootstream/Makefile:1.15
--- pkgsrc/chat/tootstream/Makefile:1.14        Tue Jan  4 20:52:37 2022
+++ pkgsrc/chat/tootstream/Makefile     Wed Jan  5 15:40:58 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2022/01/04 20:52:37 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2022/01/05 15:40:58 wiz Exp $
 
 DISTNAME=      tootstream-0.3.8.1
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    chat www
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=magicalraccoon/}
 
@@ -13,6 +13,8 @@ LICENSE=      mit
 EXTRACT_USING= bsdtar
 USE_LANGUAGES= # none
 
+USE_PKG_RESOURCES=     yes
+
 # incompatible with python 2.
 # strange locale errors on earlier versions of python 3, related
 # to py-click.

Index: pkgsrc/comms/py-nodemcu-uploader/Makefile
diff -u pkgsrc/comms/py-nodemcu-uploader/Makefile:1.4 pkgsrc/comms/py-nodemcu-uploader/Makefile:1.5
--- pkgsrc/comms/py-nodemcu-uploader/Makefile:1.4       Tue Jan  4 20:52:38 2022
+++ pkgsrc/comms/py-nodemcu-uploader/Makefile   Wed Jan  5 15:40:58 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2022/01/04 20:52:38 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2022/01/05 15:40:58 wiz Exp $
 
 DISTNAME=      nodemcu-uploader-0.4.3
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    comms
 MASTER_SITES=  ${MASTER_SITE_PYPI:=n/nodemcu-uploader/}
 
@@ -16,6 +16,8 @@ USE_LANGUAGES=        # none
 DEPENDS+=      ${PYPKGPREFIX}-serial>=2.7:../../comms/py-serial
 DEPENDS+=      ${PYPKGPREFIX}-wrapt>=1.10.10:../../devel/py-wrapt
 
+USE_PKG_RESOURCES=     yes
+
 .include "../../lang/python/application.mk"
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/comms/py-serial/Makefile
diff -u pkgsrc/comms/py-serial/Makefile:1.10 pkgsrc/comms/py-serial/Makefile:1.11
--- pkgsrc/comms/py-serial/Makefile:1.10        Tue Jan  4 20:52:38 2022
+++ pkgsrc/comms/py-serial/Makefile     Wed Jan  5 15:40:58 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2022/01/04 20:52:38 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2022/01/05 15:40:58 wiz Exp $
 
 DISTNAME=      pyserial-3.5
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/^py//}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    comms python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=p/pyserial/}
 
@@ -17,6 +17,8 @@ USE_LANGUAGES=        # none
 
 REPLACE_PYTHON=        serial/*.py serial/*/*.py
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
 .for bin in pyserial-miniterm pyserial-ports
        cd ${DESTDIR}${PREFIX}/bin && \

Index: pkgsrc/converters/py-base58/Makefile
diff -u pkgsrc/converters/py-base58/Makefile:1.3 pkgsrc/converters/py-base58/Makefile:1.4
--- pkgsrc/converters/py-base58/Makefile:1.3    Tue Jan  4 20:52:39 2022
+++ pkgsrc/converters/py-base58/Makefile        Wed Jan  5 15:40:58 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2022/01/04 20:52:39 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2022/01/05 15:40:58 wiz Exp $
 
 DISTNAME=      base58-2.1.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    converters python
 MASTER_SITES+= ${MASTER_SITE_PYPI:=b/base58/}
 
@@ -19,6 +19,8 @@ USE_LANGUAGES=        # none
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
        ${MV} base58 base58-${PYVERSSUFFIX} || ${TRUE}

Index: pkgsrc/converters/py-bidi/Makefile
diff -u pkgsrc/converters/py-bidi/Makefile:1.2 pkgsrc/converters/py-bidi/Makefile:1.3
--- pkgsrc/converters/py-bidi/Makefile:1.2      Tue Jan  4 20:52:39 2022
+++ pkgsrc/converters/py-bidi/Makefile  Wed Jan  5 15:40:58 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2022/01/04 20:52:39 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2022/01/05 15:40:58 wiz Exp $
 
 DISTNAME=      python-bidi-0.4.2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/^python-//}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    converters python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=p/python-bidi/}
 
@@ -15,6 +15,8 @@ DEPENDS+=     ${PYPKGPREFIX}-six-[0-9]*:../.
 
 USE_LANGUAGES= # none
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
        ${MV} pybidi pybidi-${PYVERSSUFFIX} || ${TRUE}

Index: pkgsrc/converters/py-cairosvg/Makefile
diff -u pkgsrc/converters/py-cairosvg/Makefile:1.20 pkgsrc/converters/py-cairosvg/Makefile:1.21
--- pkgsrc/converters/py-cairosvg/Makefile:1.20 Tue Jan  4 20:52:39 2022
+++ pkgsrc/converters/py-cairosvg/Makefile      Wed Jan  5 15:40:58 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2022/01/04 20:52:39 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2022/01/05 15:40:58 wiz Exp $
 
 DISTNAME=      CairoSVG-2.5.2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:tl}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    converters graphics python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=C/CairoSVG/}
 
@@ -26,6 +26,8 @@ USE_LANGUAGES=        # none
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
        ${MV} cairosvg cairosvg-${PYVERSSUFFIX} || ${TRUE}

Index: pkgsrc/converters/py-chardet/Makefile
diff -u pkgsrc/converters/py-chardet/Makefile:1.28 pkgsrc/converters/py-chardet/Makefile:1.29
--- pkgsrc/converters/py-chardet/Makefile:1.28  Tue Jan  4 20:52:39 2022
+++ pkgsrc/converters/py-chardet/Makefile       Wed Jan  5 15:40:59 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.28 2022/01/04 20:52:39 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2022/01/05 15:40:59 wiz Exp $
 
 DISTNAME=      chardet-4.0.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    converters python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=c/chardet/}
 
@@ -16,6 +16,8 @@ TEST_DEPENDS+=        ${PYPKGPREFIX}-py-[0-9]*:
 
 PYTHON_VERSIONED_DEPENDENCIES= hypothesis:test
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
        ${MV} chardetect chardetect-${PYVERSSUFFIX} || ${TRUE}

Index: pkgsrc/converters/py-charset-normalizer/Makefile
diff -u pkgsrc/converters/py-charset-normalizer/Makefile:1.6 pkgsrc/converters/py-charset-normalizer/Makefile:1.7
--- pkgsrc/converters/py-charset-normalizer/Makefile:1.6        Tue Jan  4 20:52:39 2022
+++ pkgsrc/converters/py-charset-normalizer/Makefile    Wed Jan  5 15:40:59 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2022/01/04 20:52:39 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2022/01/05 15:40:59 wiz Exp $
 
 DISTNAME=      charset-normalizer-2.0.9
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    converters python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=c/charset-normalizer/}
 
@@ -15,6 +15,8 @@ USE_LANGUAGES=        # none
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
        ${MV} normalizer normalizer-${PYVERSSUFFIX} || ${TRUE}

Index: pkgsrc/converters/py-confusable_homoglyphs/Makefile
diff -u pkgsrc/converters/py-confusable_homoglyphs/Makefile:1.5 pkgsrc/converters/py-confusable_homoglyphs/Makefile:1.6
--- pkgsrc/converters/py-confusable_homoglyphs/Makefile:1.5     Tue Jan  4 20:52:39 2022
+++ pkgsrc/converters/py-confusable_homoglyphs/Makefile Wed Jan  5 15:40:59 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2022/01/04 20:52:39 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2022/01/05 15:40:59 wiz Exp $
 
 DISTNAME=      confusable_homoglyphs-3.2.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    converters python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=c/confusable_homoglyphs/}
 
@@ -15,6 +15,8 @@ DEPENDS+=     ${PYPKGPREFIX}-click-[0-9]*:..
 
 USE_LANGUAGES= # none
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin \
                && ${MV} confusable_homoglyphs confusable_homoglyphs-${PYVERSSUFFIX} || ${TRUE}

Index: pkgsrc/converters/py-zfec/Makefile
diff -u pkgsrc/converters/py-zfec/Makefile:1.29 pkgsrc/converters/py-zfec/Makefile:1.30
--- pkgsrc/converters/py-zfec/Makefile:1.29     Tue Jan  4 20:52:40 2022
+++ pkgsrc/converters/py-zfec/Makefile  Wed Jan  5 15:40:59 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.29 2022/01/04 20:52:40 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2022/01/05 15:40:59 wiz Exp $
 
 DISTNAME=      zfec-1.5.5
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    converters python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=z/zfec/}
 
@@ -25,6 +25,8 @@ REPLACE_PYTHON+=      zfec/cmdline_zfec.py
 REPLACE_PYTHON+=       zfec/cmdline_zunfec.py
 REPLACE_PYTHON+=       zfec/test/test_zfec.py
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
 .for bin in zfec zunfec
        cd ${DESTDIR}${PREFIX}/bin && \

Index: pkgsrc/databases/py-alembic/Makefile
diff -u pkgsrc/databases/py-alembic/Makefile:1.29 pkgsrc/databases/py-alembic/Makefile:1.30
--- pkgsrc/databases/py-alembic/Makefile:1.29   Tue Jan  4 20:52:40 2022
+++ pkgsrc/databases/py-alembic/Makefile        Wed Jan  5 15:40:59 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.29 2022/01/04 20:52:40 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2022/01/05 15:40:59 wiz Exp $
 
 DISTNAME=      alembic-1.7.5
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    databases python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=a/alembic/}
 
@@ -21,6 +21,8 @@ USE_LANGUAGES=        # none
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
+USE_PKG_RESOURCES=     yes
+
 .include "../../lang/python/pyversion.mk"
 .if ${_PYTHON_VERSION} < 39
 DEPENDS+=      ${PYPKGPREFIX}-importlib-metadata-[0-9]*:../../devel/py-importlib-metadata

Index: pkgsrc/databases/py-barman/Makefile
diff -u pkgsrc/databases/py-barman/Makefile:1.16 pkgsrc/databases/py-barman/Makefile:1.17
--- pkgsrc/databases/py-barman/Makefile:1.16    Tue Jan  4 20:52:41 2022
+++ pkgsrc/databases/py-barman/Makefile Wed Jan  5 15:40:59 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2022/01/04 20:52:41 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2022/01/05 15:40:59 wiz Exp $
 
 DISTNAME=      barman-2.11
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    databases python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=b/barman/}
 
@@ -22,6 +22,8 @@ USE_LANGUAGES=        # none
 
 PYTHON_SELF_CONFLICT=  yes
 
+USE_PKG_RESOURCES=     yes
+
 CONF_FILES+=           share/examples/barman/barman.conf \
                        ${PKG_SYSCONFDIR}/barman.conf
 INSTALLATION_DIRS+=    share/examples/barman

Index: pkgsrc/databases/py-kb/Makefile
diff -u pkgsrc/databases/py-kb/Makefile:1.3 pkgsrc/databases/py-kb/Makefile:1.4
--- pkgsrc/databases/py-kb/Makefile:1.3 Tue Jan  4 20:52:42 2022
+++ pkgsrc/databases/py-kb/Makefile     Wed Jan  5 15:40:59 2022
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2022/01/04 20:52:42 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2022/01/05 15:40:59 wiz Exp $
 
 DISTNAME=      kb-manager-0.1.6
 EGGNAME=       ${DISTNAME:S/-manager//}
 PKGNAME=       ${PYPKGPREFIX}-${EGGNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    databases python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=k/kb-manager/}
 
@@ -23,6 +23,8 @@ PYTHON_VERSIONS_INCOMPATIBLE= 27 37
 
 USE_LANGUAGES= # none
 
+USE_PKG_RESOURCES=     yes
+
 .include "../../lang/python/egg.mk"
 .include "../../lang/python/application.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/databases/py-sqlalchemy-migrate/Makefile
diff -u pkgsrc/databases/py-sqlalchemy-migrate/Makefile:1.19 pkgsrc/databases/py-sqlalchemy-migrate/Makefile:1.20
--- pkgsrc/databases/py-sqlalchemy-migrate/Makefile:1.19        Tue Jan  4 20:52:44 2022
+++ pkgsrc/databases/py-sqlalchemy-migrate/Makefile     Wed Jan  5 15:40:59 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2022/01/04 20:52:44 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2022/01/05 15:40:59 wiz Exp $
 
 DISTNAME=      sqlalchemy-migrate-0.13.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    databases python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=s/sqlalchemy-migrate/}
 
@@ -20,6 +20,8 @@ DEPENDS+=     ${PYPKGPREFIX}-six>=1.7.0:../.
 
 USE_LANGUAGES=         # none
 
+USE_PKG_RESOURCES=     yes
+
 REPLACE_PYTHON+=       migrate/tests/changeset/databases/test_ibmdb2.py
 REPLACE_PYTHON+=       migrate/tests/changeset/test_changeset.py
 REPLACE_PYTHON+=       migrate/tests/changeset/test_constraint.py

Index: pkgsrc/databases/py-sqlparse/Makefile
diff -u pkgsrc/databases/py-sqlparse/Makefile:1.18 pkgsrc/databases/py-sqlparse/Makefile:1.19
--- pkgsrc/databases/py-sqlparse/Makefile:1.18  Tue Jan  4 20:52:45 2022
+++ pkgsrc/databases/py-sqlparse/Makefile       Wed Jan  5 15:41:00 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2022/01/04 20:52:45 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2022/01/05 15:41:00 wiz Exp $
 
 DISTNAME=      sqlparse-0.3.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    databases python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=s/sqlparse/}
 
@@ -15,6 +15,8 @@ BUILD_DEPENDS+=       ${PYPKGPREFIX}-test-runn
 
 USE_LANGUAGES= # none
 
+USE_PKG_RESOURCES=     yes
+
 PYSETUPTESTTARGET=     pytest
 
 post-install:

Index: pkgsrc/devel/RBTools/Makefile
diff -u pkgsrc/devel/RBTools/Makefile:1.21 pkgsrc/devel/RBTools/Makefile:1.22
--- pkgsrc/devel/RBTools/Makefile:1.21  Tue Jan  4 20:52:46 2022
+++ pkgsrc/devel/RBTools/Makefile       Wed Jan  5 15:41:00 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2022/01/04 20:52:46 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2022/01/05 15:41:00 wiz Exp $
 
 DISTNAME=      RBTools-0.7.6
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    devel
 MASTER_SITES=  http://downloads.reviewboard.org/releases/RBTools/0.7/
 
@@ -16,6 +16,8 @@ REPLACE_PYTHON=                       ez_setup.py setup.py r
 REPLACE_PYTHON+=               contrib/internal/release.py
 PYTHON_VERSIONS_ACCEPTED=      27 # not yet ported as of 0.2
 
+USE_PKG_RESOURCES=     yes
+
 DEPENDS+=      ${PYPKGPREFIX}-six>=1.8.0:../../lang/py-six
 
 .include "../../lang/python/egg.mk"

Index: pkgsrc/devel/bpython/Makefile
diff -u pkgsrc/devel/bpython/Makefile:1.32 pkgsrc/devel/bpython/Makefile:1.33
--- pkgsrc/devel/bpython/Makefile:1.32  Tue Jan  4 20:52:46 2022
+++ pkgsrc/devel/bpython/Makefile       Wed Jan  5 15:41:00 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.32 2022/01/04 20:52:46 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2022/01/05 15:41:00 wiz Exp $
 
 DISTNAME=      bpython-0.22.1
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel python
 MASTER_SITES=  https://bpython-interpreter.org/releases/
 
@@ -27,6 +27,8 @@ USE_LANGUAGES=        # none
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
+USE_PKG_RESOURCES=     yes
+
 .include "../../lang/python/pyversion.mk"
 .if ${_PYTHON_VERSION} < 38
 DEPENDS+=      ${PYPKGPREFIX}-backports.cached-property-[0-9]*:../../devel/py-backports.cached-property

Index: pkgsrc/devel/breezy/Makefile
diff -u pkgsrc/devel/breezy/Makefile:1.9 pkgsrc/devel/breezy/Makefile:1.10
--- pkgsrc/devel/breezy/Makefile:1.9    Tue Jan  4 20:52:46 2022
+++ pkgsrc/devel/breezy/Makefile        Wed Jan  5 15:41:00 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2022/01/04 20:52:46 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2022/01/05 15:41:00 wiz Exp $
 
 DISTNAME=      breezy-3.2.1
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel scm
 MASTER_SITES=  https://launchpad.net/brz/${PKGVERSION_NOREV:R}/${PKGVERSION_NOREV}/+download/
 
@@ -25,6 +25,8 @@ USE_TOOLS+=           gmake msgfmt
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
+USE_PKG_RESOURCES=     yes
+
 REPLACE_PYTHON+=       breezy/git/bzr-receive-pack
 REPLACE_PYTHON+=       breezy/git/bzr-upload-pack
 REPLACE_PYTHON+=       breezy/git/git-remote-bzr

Index: pkgsrc/devel/lettuce/Makefile
diff -u pkgsrc/devel/lettuce/Makefile:1.17 pkgsrc/devel/lettuce/Makefile:1.18
--- pkgsrc/devel/lettuce/Makefile:1.17  Tue Jan  4 20:52:46 2022
+++ pkgsrc/devel/lettuce/Makefile       Wed Jan  5 15:41:00 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2022/01/04 20:52:46 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2022/01/05 15:41:00 wiz Exp $
 
 DISTNAME=      lettuce-0.2.18
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_PYPI:=l/lettuce/}
 
@@ -13,6 +13,8 @@ LICENSE=      gnu-gpl-v3
 REPLACE_PYTHON=        lettuce/bin.py lettuce/plugins/autopdb.py
 PYTHON_VERSIONS_ACCEPTED=      27 # not yet ported as of 0.2.18
 
+USE_PKG_RESOURCES=     yes
+
 .include "../../lang/python/application.mk"
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/meson/Makefile
diff -u pkgsrc/devel/meson/Makefile:1.34 pkgsrc/devel/meson/Makefile:1.35
--- pkgsrc/devel/meson/Makefile:1.34    Tue Jan  4 20:52:46 2022
+++ pkgsrc/devel/meson/Makefile Wed Jan  5 15:41:00 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.34 2022/01/04 20:52:46 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2022/01/05 15:41:00 wiz Exp $
 
 DISTNAME=      meson-0.60.3
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=m/meson/}
 
@@ -17,6 +17,8 @@ DEPENDS+=     ninja-build>=1.7:../../devel/n
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
+USE_PKG_RESOURCES=     yes
+
 USE_LANGUAGES= c c++ # c++ for tests
 
 SUBST_CLASSES+=                man

Index: pkgsrc/devel/py-ZopeTestrunner/Makefile
diff -u pkgsrc/devel/py-ZopeTestrunner/Makefile:1.7 pkgsrc/devel/py-ZopeTestrunner/Makefile:1.8
--- pkgsrc/devel/py-ZopeTestrunner/Makefile:1.7 Tue Jan  4 20:52:48 2022
+++ pkgsrc/devel/py-ZopeTestrunner/Makefile     Wed Jan  5 15:41:00 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2022/01/04 20:52:48 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2022/01/05 15:41:00 wiz Exp $
 
 DISTNAME=      zope.testrunner-5.3.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/zope.t/ZopeT/}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=z/zope.testrunner/}
 
@@ -18,6 +18,8 @@ TEST_DEPENDS+=        ${PYPKGPREFIX}-zope.testi
 
 PYTHON_VERSIONED_DEPENDENCIES+=        setuptools
 
+USE_PKG_RESOURCES=     yes
+
 .include "../../lang/python/egg.mk"
 .include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/py-adb/Makefile
diff -u pkgsrc/devel/py-adb/Makefile:1.3 pkgsrc/devel/py-adb/Makefile:1.4
--- pkgsrc/devel/py-adb/Makefile:1.3    Tue Jan  4 20:52:48 2022
+++ pkgsrc/devel/py-adb/Makefile        Wed Jan  5 15:41:00 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2022/01/04 20:52:48 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2022/01/05 15:41:00 wiz Exp $
 
 DISTNAME=      adb-1.3.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=a/adb/}
 
@@ -15,6 +15,8 @@ DEPENDS+=     ${PYPKGPREFIX}-libusb1>=1.0.16
 
 PYTHON_VERSIONED_DEPENDENCIES+=        rsa
 
+USE_PKG_RESOURCES=     yes
+
 USE_LANGUAGES= # none
 
 post-install:

Index: pkgsrc/devel/py-argcomplete/Makefile
diff -u pkgsrc/devel/py-argcomplete/Makefile:1.25 pkgsrc/devel/py-argcomplete/Makefile:1.26
--- pkgsrc/devel/py-argcomplete/Makefile:1.25   Tue Jan  4 20:52:49 2022
+++ pkgsrc/devel/py-argcomplete/Makefile        Wed Jan  5 15:41:01 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2022/01/04 20:52:49 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2022/01/05 15:41:01 wiz Exp $
 
 DISTNAME=      argcomplete-1.12.3
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=a/argcomplete/}
 
@@ -22,5 +22,7 @@ DEPENDS+=     ${PYPKGPREFIX}-importlib-metad
 
 USE_LANGUAGES= # none
 
+USE_PKG_RESOURCES=     yes
+
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/py-automat/Makefile
diff -u pkgsrc/devel/py-automat/Makefile:1.5 pkgsrc/devel/py-automat/Makefile:1.6
--- pkgsrc/devel/py-automat/Makefile:1.5        Tue Jan  4 20:52:51 2022
+++ pkgsrc/devel/py-automat/Makefile    Wed Jan  5 15:41:01 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2022/01/04 20:52:51 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2022/01/05 15:41:01 wiz Exp $
 
 DISTNAME=      Automat-0.8.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:tl}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=A/Automat/}
 
@@ -18,6 +18,8 @@ DEPENDS+=     ${PYPKGPREFIX}-six-[0-9]*:../.
 
 USE_LANGUAGES= # none
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
        ${MV} automat-visualize automat-visualize${PYVERSSUFFIX} || ${TRUE}

Index: pkgsrc/devel/py-autopep8/Makefile
diff -u pkgsrc/devel/py-autopep8/Makefile:1.20 pkgsrc/devel/py-autopep8/Makefile:1.21
--- pkgsrc/devel/py-autopep8/Makefile:1.20      Tue Jan  4 20:52:51 2022
+++ pkgsrc/devel/py-autopep8/Makefile   Wed Jan  5 15:41:01 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2022/01/04 20:52:51 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2022/01/05 15:41:01 wiz Exp $
 
 DISTNAME=      autopep8-1.6.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=a/autopep8/}
 
@@ -16,6 +16,8 @@ DEPENDS+=     ${PYPKGPREFIX}-toml-[0-9]*:../
 
 USE_LANGUAGES= # none
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
        ${MV} autopep8 autopep8-${PYVERSSUFFIX} || ${TRUE}

Index: pkgsrc/devel/py-babel/Makefile
diff -u pkgsrc/devel/py-babel/Makefile:1.30 pkgsrc/devel/py-babel/Makefile:1.31
--- pkgsrc/devel/py-babel/Makefile:1.30 Tue Jan  4 20:52:51 2022
+++ pkgsrc/devel/py-babel/Makefile      Wed Jan  5 15:41:01 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.30 2022/01/04 20:52:51 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2022/01/05 15:41:01 wiz Exp $
 
 DISTNAME=      Babel-2.9.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:tl}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=B/Babel/}
 
@@ -18,6 +18,8 @@ TEST_DEPENDS+=        ${PYPKGPREFIX}-test-runne
 
 USE_LANGUAGES= # none
 
+USE_PKG_RESOURCES=     yes
+
 PYSETUPTESTTARGET=     pytest
 
 post-install:

Index: pkgsrc/devel/py-behave/Makefile
diff -u pkgsrc/devel/py-behave/Makefile:1.6 pkgsrc/devel/py-behave/Makefile:1.7
--- pkgsrc/devel/py-behave/Makefile:1.6 Tue Jan  4 20:52:52 2022
+++ pkgsrc/devel/py-behave/Makefile     Wed Jan  5 15:41:01 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2022/01/04 20:52:52 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2022/01/05 15:41:01 wiz Exp $
 
 DISTNAME=      behave-1.2.6
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=b/behave/}
 
@@ -24,6 +24,8 @@ USE_LANGUAGES=        # none
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27 # py-parse_type
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && ${MV} behave behave-${PYVERSSUFFIX} || ${TRUE}
 

Index: pkgsrc/devel/py-build/Makefile
diff -u pkgsrc/devel/py-build/Makefile:1.2 pkgsrc/devel/py-build/Makefile:1.3
--- pkgsrc/devel/py-build/Makefile:1.2  Tue Jan  4 20:52:53 2022
+++ pkgsrc/devel/py-build/Makefile      Wed Jan  5 15:41:01 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2022/01/04 20:52:53 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2022/01/05 15:41:01 wiz Exp $
 
 DISTNAME=      build-0.7.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=b/build/}
 
@@ -18,6 +18,8 @@ DEPENDS+=     ${PYPKGPREFIX}-colorama-[0-9]*
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
+USE_PKG_RESOURCES=     yes
+
 .include "../../lang/python/pyversion.mk"
 
 .if ${PYPKGPREFIX} == "py36" || ${PYPKGPREFIX} == "py37"

Index: pkgsrc/devel/py-buildbot/Makefile
diff -u pkgsrc/devel/py-buildbot/Makefile:1.26 pkgsrc/devel/py-buildbot/Makefile:1.27
--- pkgsrc/devel/py-buildbot/Makefile:1.26      Tue Jan  4 20:52:53 2022
+++ pkgsrc/devel/py-buildbot/Makefile   Wed Jan  5 15:41:01 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2022/01/04 20:52:53 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2022/01/05 15:41:01 wiz Exp $
 
 DISTNAME=      buildbot-2.6.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    devel net python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=b/buildbot/}
 
@@ -32,6 +32,8 @@ TEST_DEPENDS+=        ${PYPKGPREFIX}-txrequests
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
+USE_PKG_RESOURCES=     yes
+
 PYTHON_VERSIONED_DEPENDENCIES+=        setuptools
 
 USE_LANGUAGES= # none

Index: pkgsrc/devel/py-buildbot-worker/Makefile
diff -u pkgsrc/devel/py-buildbot-worker/Makefile:1.10 pkgsrc/devel/py-buildbot-worker/Makefile:1.11
--- pkgsrc/devel/py-buildbot-worker/Makefile:1.10       Tue Jan  4 20:52:54 2022
+++ pkgsrc/devel/py-buildbot-worker/Makefile    Wed Jan  5 15:41:02 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2022/01/04 20:52:54 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2022/01/05 15:41:02 wiz Exp $
 
 DISTNAME=      buildbot-worker-2.6.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel net python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=b/buildbot-worker/}
 
@@ -18,6 +18,8 @@ TEST_DEPENDS+=        ${PYPKGPREFIX}-mock-[0-9]
 
 USE_LANGUAGES= # none
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
        ${MV} buildbot-worker buildbot-worker-${PYVERSSUFFIX} && \

Index: pkgsrc/devel/py-bump2version/Makefile
diff -u pkgsrc/devel/py-bump2version/Makefile:1.4 pkgsrc/devel/py-bump2version/Makefile:1.5
--- pkgsrc/devel/py-bump2version/Makefile:1.4   Tue Jan  4 20:52:54 2022
+++ pkgsrc/devel/py-bump2version/Makefile       Wed Jan  5 15:41:02 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2022/01/04 20:52:54 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2022/01/05 15:41:02 wiz Exp $
 
 DISTNAME=      bump2version-1.0.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=b/bump2version/}
 
@@ -15,6 +15,8 @@ USE_LANGUAGES=        # none
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        ${MV} ${DESTDIR}${PREFIX}/bin/bumpversion ${DESTDIR}${PREFIX}/bin/bumpversion-${PYVERSSUFFIX} || ${TRUE}
        ${MV} ${DESTDIR}${PREFIX}/bin/bump2version ${DESTDIR}${PREFIX}/bin/bump2version-${PYVERSSUFFIX} || ${TRUE}

Index: pkgsrc/devel/py-cachecontrol/Makefile
diff -u pkgsrc/devel/py-cachecontrol/Makefile:1.5 pkgsrc/devel/py-cachecontrol/Makefile:1.6
--- pkgsrc/devel/py-cachecontrol/Makefile:1.5   Tue Jan  4 20:52:54 2022
+++ pkgsrc/devel/py-cachecontrol/Makefile       Wed Jan  5 15:41:02 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2022/01/04 20:52:54 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2022/01/05 15:41:02 wiz Exp $
 
 DISTNAME=      CacheControl-0.12.10
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:tl}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=C/CacheControl/}
 
@@ -16,6 +16,8 @@ DEPENDS+=     ${PYPKGPREFIX}-msgpack>=0.5.2:
 
 USE_LANGUAGES= # none
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
        ${MV} doesitcache doesitcache-${PYVERSSUFFIX} || ${TRUE}

Index: pkgsrc/devel/py-codespell/Makefile
diff -u pkgsrc/devel/py-codespell/Makefile:1.7 pkgsrc/devel/py-codespell/Makefile:1.8
--- pkgsrc/devel/py-codespell/Makefile:1.7      Tue Jan  4 20:52:57 2022
+++ pkgsrc/devel/py-codespell/Makefile  Wed Jan  5 15:41:02 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2022/01/04 20:52:57 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2022/01/05 15:41:02 wiz Exp $
 
 DISTNAME=      codespell-2.1.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=c/codespell/}
 
@@ -15,6 +15,8 @@ USE_LANGUAGES=        # none
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
+USE_PKG_RESOURCES=     yes
+
 PYTHON_VERSIONED_DEPENDENCIES+=        test:test
 
 post-install:

Index: pkgsrc/devel/py-codestyle/Makefile
diff -u pkgsrc/devel/py-codestyle/Makefile:1.10 pkgsrc/devel/py-codestyle/Makefile:1.11
--- pkgsrc/devel/py-codestyle/Makefile:1.10     Tue Jan  4 20:52:57 2022
+++ pkgsrc/devel/py-codestyle/Makefile  Wed Jan  5 15:41:02 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2022/01/04 20:52:57 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2022/01/05 15:41:02 wiz Exp $
 
 DISTNAME=      pycodestyle-2.8.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/py//}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=p/pycodestyle/}
 
@@ -13,6 +13,8 @@ LICENSE=      mit
 
 USE_LANGUAGES= # none
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
        ${MV} pycodestyle pycodestyle-${PYVERSSUFFIX} || ${TRUE}

Index: pkgsrc/devel/py-cookiecutter/Makefile
diff -u pkgsrc/devel/py-cookiecutter/Makefile:1.10 pkgsrc/devel/py-cookiecutter/Makefile:1.11
--- pkgsrc/devel/py-cookiecutter/Makefile:1.10  Tue Jan  4 20:52:58 2022
+++ pkgsrc/devel/py-cookiecutter/Makefile       Wed Jan  5 15:41:02 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2022/01/04 20:52:58 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2022/01/05 15:41:02 wiz Exp $
 
 DISTNAME=      cookiecutter-1.7.3
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=c/cookiecutter/}
 
@@ -30,6 +30,8 @@ PYSETUPTESTTARGET=    pytest
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27 # py-slugify
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
        ${MV} cookiecutter cookiecutter-${PYVERSSUFFIX} || ${TRUE}

Index: pkgsrc/devel/py-coverage/Makefile
diff -u pkgsrc/devel/py-coverage/Makefile:1.31 pkgsrc/devel/py-coverage/Makefile:1.32
--- pkgsrc/devel/py-coverage/Makefile:1.31      Tue Jan  4 20:52:58 2022
+++ pkgsrc/devel/py-coverage/Makefile   Wed Jan  5 15:41:02 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.31 2022/01/04 20:52:58 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2022/01/05 15:41:02 wiz Exp $
 
 DISTNAME=      coverage-5.5
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=c/coverage/}
 
@@ -21,6 +21,8 @@ TEST_DEPENDS+=        ${PYPKGPREFIX}-unittest-m
 
 PYTHON_VERSIONED_DEPENDENCIES= test:test
 
+USE_PKG_RESOURCES=     yes
+
 PYSETUPTESTTARGET=     pytest
 
 post-install:

Index: pkgsrc/devel/py-cpplint/Makefile
diff -u pkgsrc/devel/py-cpplint/Makefile:1.7 pkgsrc/devel/py-cpplint/Makefile:1.8
--- pkgsrc/devel/py-cpplint/Makefile:1.7        Tue Jan  4 20:52:58 2022
+++ pkgsrc/devel/py-cpplint/Makefile    Wed Jan  5 15:41:02 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2022/01/04 20:52:58 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2022/01/05 15:41:02 wiz Exp $
 
 DISTNAME=      cpplint-1.5.5
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=c/cpplint/}
 
@@ -17,6 +17,8 @@ TEST_DEPENDS+=        ${PYPKGPREFIX}-test-cov-[
 
 PYTHON_VERSIONED_DEPENDENCIES= pip:tool test:test zipp:test pyparsing:test
 
+USE_PKG_RESOURCES=     yes
+
 .include "../../lang/python/pyversion.mk"
 
 .if ${_PYTHON_VERSION} == 27

Index: pkgsrc/devel/py-cython/Makefile
diff -u pkgsrc/devel/py-cython/Makefile:1.75 pkgsrc/devel/py-cython/Makefile:1.76
--- pkgsrc/devel/py-cython/Makefile:1.75        Tue Jan  4 20:52:59 2022
+++ pkgsrc/devel/py-cython/Makefile     Wed Jan  5 15:41:02 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.75 2022/01/04 20:52:59 wiz Exp $
+# $NetBSD: Makefile,v 1.76 2022/01/05 15:41:02 wiz Exp $
 
 DISTNAME=      Cython-0.29.26
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:tl}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=C/Cython/}
 
@@ -16,6 +16,8 @@ REPLACE_PYTHON+=      Cython/Debugger/Cygdb.p
 REPLACE_PYTHON+=       Cython/Debugger/libpython.py
 REPLACE_PYTHON+=       cython.py
 
+USE_PKG_RESOURCES=     yes
+
 # for test only
 #USE_LANGUAGES=        c c++
 do-test:

Index: pkgsrc/devel/py-distro/Makefile
diff -u pkgsrc/devel/py-distro/Makefile:1.6 pkgsrc/devel/py-distro/Makefile:1.7
--- pkgsrc/devel/py-distro/Makefile:1.6 Tue Jan  4 20:53:01 2022
+++ pkgsrc/devel/py-distro/Makefile     Wed Jan  5 15:41:03 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2022/01/04 20:53:01 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2022/01/05 15:41:03 wiz Exp $
 
 DISTNAME=      distro-1.6.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=d/distro/}
 
@@ -13,6 +13,8 @@ LICENSE=      apache-2.0
 
 PYTHON_VERSIONED_DEPENDENCIES= test:test
 
+USE_PKG_RESOURCES=     yes
+
 USE_LANGUAGES= # none
 
 post-install:

Index: pkgsrc/devel/py-doc8/Makefile
diff -u pkgsrc/devel/py-doc8/Makefile:1.5 pkgsrc/devel/py-doc8/Makefile:1.6
--- pkgsrc/devel/py-doc8/Makefile:1.5   Tue Jan  4 20:53:01 2022
+++ pkgsrc/devel/py-doc8/Makefile       Wed Jan  5 15:41:03 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2022/01/04 20:53:01 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2022/01/05 15:41:03 wiz Exp $
 
 DISTNAME=      doc8-0.10.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=d/doc8/}
 
@@ -23,6 +23,8 @@ PYSETUP=      -c 'from setuptools import setu
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
        ${MV} doc8 doc8-${PYVERSSUFFIX} || ${TRUE}

Index: pkgsrc/devel/py-docstyle/Makefile
diff -u pkgsrc/devel/py-docstyle/Makefile:1.7 pkgsrc/devel/py-docstyle/Makefile:1.8
--- pkgsrc/devel/py-docstyle/Makefile:1.7       Tue Jan  4 20:53:01 2022
+++ pkgsrc/devel/py-docstyle/Makefile   Wed Jan  5 15:41:03 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2022/01/04 20:53:01 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2022/01/05 15:41:03 wiz Exp $
 
 DISTNAME=      pydocstyle-3.0.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/py//}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=p/pydocstyle/}
 
@@ -14,6 +14,8 @@ LICENSE=      mit
 DEPENDS+=      ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
 DEPENDS+=      ${PYPKGPREFIX}-snowballstemmer-[0-9]*:../../textproc/py-snowballstemmer
 
+USE_PKG_RESOURCES=     yes
+
 .include "../../lang/python/pyversion.mk"
 .if ${_PYTHON_VERSION} == 27
 DEPENDS+=      ${PYPKGPREFIX}-configparser-[0-9]*:../../devel/py-configparser

Index: pkgsrc/devel/py-dotenv/Makefile
diff -u pkgsrc/devel/py-dotenv/Makefile:1.7 pkgsrc/devel/py-dotenv/Makefile:1.8
--- pkgsrc/devel/py-dotenv/Makefile:1.7 Tue Jan  4 20:53:02 2022
+++ pkgsrc/devel/py-dotenv/Makefile     Wed Jan  5 15:41:03 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2022/01/04 20:53:02 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2022/01/05 15:41:03 wiz Exp $
 
 DISTNAME=      python-dotenv-0.19.2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/^python-//}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=p/python-dotenv/}
 
@@ -22,6 +22,8 @@ PYSETUPTESTTARGET=    pytest
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && ${MV} dotenv dotenv-${PYVERSSUFFIX} || ${TRUE}
 

Index: pkgsrc/devel/py-dulwich/Makefile
diff -u pkgsrc/devel/py-dulwich/Makefile:1.47 pkgsrc/devel/py-dulwich/Makefile:1.48
--- pkgsrc/devel/py-dulwich/Makefile:1.47       Tue Jan  4 20:53:02 2022
+++ pkgsrc/devel/py-dulwich/Makefile    Wed Jan  5 15:41:03 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.47 2022/01/04 20:53:02 wiz Exp $
+# $NetBSD: Makefile,v 1.48 2022/01/05 15:41:03 wiz Exp $
 
 DISTNAME=      dulwich-0.20.26
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=d/dulwich/}
 
@@ -20,6 +20,8 @@ TEST_DEPENDS+=        ${PYPKGPREFIX}-mock-[0-9]
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
        ${MV} dul-receive-pack dul-receive-pack-${PYVERSSUFFIX} && \

Index: pkgsrc/devel/py-editorconfig-core/Makefile
diff -u pkgsrc/devel/py-editorconfig-core/Makefile:1.5 pkgsrc/devel/py-editorconfig-core/Makefile:1.6
--- pkgsrc/devel/py-editorconfig-core/Makefile:1.5      Tue Jan  4 20:53:02 2022
+++ pkgsrc/devel/py-editorconfig-core/Makefile  Wed Jan  5 15:41:03 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2022/01/04 20:53:02 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2022/01/05 15:41:03 wiz Exp $
 
 DISTNAME=      EditorConfig-0.12.3
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/EditorConfig/editorconfig-core/}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=E/EditorConfig/}
 
@@ -13,6 +13,8 @@ LICENSE=      python-software-foundation AND 
 
 USE_LANGUAGES= # none
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
        ${MV} editorconfig editorconfig-${PYVERSSUFFIX} || ${TRUE}

Index: pkgsrc/devel/py-faker/Makefile
diff -u pkgsrc/devel/py-faker/Makefile:1.53 pkgsrc/devel/py-faker/Makefile:1.54
--- pkgsrc/devel/py-faker/Makefile:1.53 Tue Jan  4 20:53:03 2022
+++ pkgsrc/devel/py-faker/Makefile      Wed Jan  5 15:41:03 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.53 2022/01/04 20:53:03 wiz Exp $
+# $NetBSD: Makefile,v 1.54 2022/01/05 15:41:03 wiz Exp $
 
 DISTNAME=      Faker-8.13.2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:tl}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=F/Faker/}
 
@@ -22,6 +22,8 @@ TEST_DEPENDS+=        ${PYPKGPREFIX}-validators
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27 # since 4.0.0
 
+USE_PKG_RESOURCES=     yes
+
 USE_LANGUAGES= # none
 
 post-install:

Index: pkgsrc/devel/py-falcon/Makefile
diff -u pkgsrc/devel/py-falcon/Makefile:1.7 pkgsrc/devel/py-falcon/Makefile:1.8
--- pkgsrc/devel/py-falcon/Makefile:1.7 Tue Jan  4 20:53:03 2022
+++ pkgsrc/devel/py-falcon/Makefile     Wed Jan  5 15:41:03 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2022/01/04 20:53:03 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2022/01/05 15:41:03 wiz Exp $
 
 DISTNAME=      falcon-2.0.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=f/falcon/}
 
@@ -17,6 +17,8 @@ TEST_DEPENDS+=        ${PYPKGPREFIX}-test-runne
 TEST_DEPENDS+= ${PYPKGPREFIX}-testtools-[0-9]*:../../devel/py-testtools
 TEST_DEPENDS+= ${PYPKGPREFIX}-yaml-[0-9]*:../../textproc/py-yaml
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
        ${MV} falcon-bench falcon-bench-${PYVERSSUFFIX} && \

Index: pkgsrc/devel/py-flake8/Makefile
diff -u pkgsrc/devel/py-flake8/Makefile:1.39 pkgsrc/devel/py-flake8/Makefile:1.40
--- pkgsrc/devel/py-flake8/Makefile:1.39        Tue Jan  4 20:53:05 2022
+++ pkgsrc/devel/py-flake8/Makefile     Wed Jan  5 15:41:04 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.39 2022/01/04 20:53:05 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2022/01/05 15:41:04 wiz Exp $
 
 DISTNAME=      flake8-3.9.2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=f/flake8/}
 
@@ -30,6 +30,8 @@ TEST_DEPENDS+=        ${PYPKGPREFIX}-pylint-[0-
 
 USE_LANGUAGES= # none
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
        ${MV} flake8 flake8-${PYVERSSUFFIX} || ${TRUE}

Index: pkgsrc/devel/py-flakes/Makefile
diff -u pkgsrc/devel/py-flakes/Makefile:1.20 pkgsrc/devel/py-flakes/Makefile:1.21
--- pkgsrc/devel/py-flakes/Makefile:1.20        Tue Jan  4 20:53:05 2022
+++ pkgsrc/devel/py-flakes/Makefile     Wed Jan  5 15:41:04 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2022/01/04 20:53:05 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2022/01/05 15:41:04 wiz Exp $
 
 DISTNAME=      pyflakes-2.4.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/^py//}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=p/pyflakes/}
 
@@ -13,6 +13,8 @@ LICENSE=      mit
 
 USE_LANGUAGES= # none
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
        ${MV} pyflakes pyflakes-${PYVERSSUFFIX} || ${TRUE}

Index: pkgsrc/devel/py-future/Makefile
diff -u pkgsrc/devel/py-future/Makefile:1.7 pkgsrc/devel/py-future/Makefile:1.8
--- pkgsrc/devel/py-future/Makefile:1.7 Tue Jan  4 20:53:07 2022
+++ pkgsrc/devel/py-future/Makefile     Wed Jan  5 15:41:04 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2022/01/04 20:53:07 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2022/01/05 15:41:04 wiz Exp $
 
 DISTNAME=      future-0.18.2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=f/future/}
 
@@ -13,6 +13,8 @@ LICENSE=      mit
 
 USE_LANGUAGES= # none
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
        ${MV} futurize futurize-${PYVERSSUFFIX} && \

Index: pkgsrc/devel/py-gcovr/Makefile
diff -u pkgsrc/devel/py-gcovr/Makefile:1.2 pkgsrc/devel/py-gcovr/Makefile:1.3
--- pkgsrc/devel/py-gcovr/Makefile:1.2  Tue Jan  4 20:53:07 2022
+++ pkgsrc/devel/py-gcovr/Makefile      Wed Jan  5 15:41:04 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2022/01/04 20:53:07 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2022/01/05 15:41:04 wiz Exp $
 
 DISTNAME=      gcovr-4.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=g/gcovr/}
 
@@ -13,5 +13,7 @@ LICENSE=      modified-bsd
 
 DEPENDS+=      ${PYPKGPREFIX}-jinja2-[0-9]*:../../textproc/py-jinja2
 
+USE_PKG_RESOURCES=     yes
+
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/py-gitinspector/Makefile
diff -u pkgsrc/devel/py-gitinspector/Makefile:1.6 pkgsrc/devel/py-gitinspector/Makefile:1.7
--- pkgsrc/devel/py-gitinspector/Makefile:1.6   Tue Jan  4 20:53:08 2022
+++ pkgsrc/devel/py-gitinspector/Makefile       Wed Jan  5 15:41:04 2022
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2022/01/04 20:53:08 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2022/01/05 15:41:04 wiz Exp $
 
 GITHUB_PROJECT=        gitinspector
 DISTNAME=      gitinspector-0.4.4
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=ejwa/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
@@ -15,6 +15,8 @@ LICENSE=      gnu-gpl-v3
 
 DEPENDS+=      git-base-[0-9]*:../../devel/git-base
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        ${MV} ${DESTDIR}${PREFIX}/bin/gitinspector \
                ${DESTDIR}${PREFIX}/bin/gitinspector-${PYVERSSUFFIX}

Index: pkgsrc/devel/py-grako/Makefile
diff -u pkgsrc/devel/py-grako/Makefile:1.4 pkgsrc/devel/py-grako/Makefile:1.5
--- pkgsrc/devel/py-grako/Makefile:1.4  Tue Jan  4 20:53:08 2022
+++ pkgsrc/devel/py-grako/Makefile      Wed Jan  5 15:41:04 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2022/01/04 20:53:08 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2022/01/05 15:41:04 wiz Exp $
 
 DISTNAME=      grako-3.99.9
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=g/grako/}
 EXTRACT_SUFX=  .zip
@@ -16,6 +16,8 @@ BUILD_DEPENDS+=       ${PYPKGPREFIX}-test-runn
 
 USE_LANGUAGES=         c
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && mv grako grako${PYVERSSUFFIX} || ${TRUE}
 

Index: pkgsrc/devel/py-hypothesis/Makefile
diff -u pkgsrc/devel/py-hypothesis/Makefile:1.106 pkgsrc/devel/py-hypothesis/Makefile:1.107
--- pkgsrc/devel/py-hypothesis/Makefile:1.106   Tue Jan  4 20:53:10 2022
+++ pkgsrc/devel/py-hypothesis/Makefile Wed Jan  5 15:41:04 2022
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.106 2022/01/04 20:53:10 wiz Exp $
+# $NetBSD: Makefile,v 1.107 2022/01/05 15:41:04 wiz Exp $
 #
 # Changelog: https://hypothesis.readthedocs.io/en/latest/changes.html
 
 DISTNAME=      hypothesis-6.29.3
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=h/hypothesis/}
 
@@ -18,6 +18,8 @@ DEPENDS+=     ${PYPKGPREFIX}-sortedcontainer
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
+USE_PKG_RESOURCES=     yes
+
 USE_LANGUAGES= # none
 
 .include "../../lang/python/egg.mk"

Index: pkgsrc/devel/py-ipython/Makefile
diff -u pkgsrc/devel/py-ipython/Makefile:1.70 pkgsrc/devel/py-ipython/Makefile:1.71
--- pkgsrc/devel/py-ipython/Makefile:1.70       Tue Jan  4 20:53:11 2022
+++ pkgsrc/devel/py-ipython/Makefile    Wed Jan  5 15:41:04 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.70 2022/01/04 20:53:11 wiz Exp $
+# $NetBSD: Makefile,v 1.71 2022/01/05 15:41:04 wiz Exp $
 
 DISTNAME=      ipython-7.30.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=i/ipython/}
 
@@ -31,6 +31,8 @@ USE_LANGUAGES=        # none
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX} && \
        ${RM} bin/iptest3 bin/ipython3 && \

Index: pkgsrc/devel/py-isort/Makefile
diff -u pkgsrc/devel/py-isort/Makefile:1.21 pkgsrc/devel/py-isort/Makefile:1.22
--- pkgsrc/devel/py-isort/Makefile:1.21 Tue Jan  4 20:53:12 2022
+++ pkgsrc/devel/py-isort/Makefile      Wed Jan  5 15:41:04 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2022/01/04 20:53:12 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2022/01/05 15:41:04 wiz Exp $
 
 DISTNAME=      isort-5.10.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=i/isort/}
 
@@ -18,6 +18,8 @@ USE_LANGUAGES=        # none
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
 .for bin in isort isort-identify-imports
        cd ${DESTDIR}${PREFIX}/bin && \

Index: pkgsrc/devel/py-jaraco_util/Makefile
diff -u pkgsrc/devel/py-jaraco_util/Makefile:1.8 pkgsrc/devel/py-jaraco_util/Makefile:1.9
--- pkgsrc/devel/py-jaraco_util/Makefile:1.8    Tue Jan  4 20:53:13 2022
+++ pkgsrc/devel/py-jaraco_util/Makefile        Wed Jan  5 15:41:05 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2022/01/04 20:53:13 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2022/01/05 15:41:05 wiz Exp $
 
 DISTNAME=      jaraco.util-11.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/./_/}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=j/jaraco.util/}
 EXTRACT_SUFX=  .zip
@@ -21,6 +21,8 @@ USE_LANGUAGES=        # none
 
 REPLACE_PYTHON+=       jaraco/lang/python.py
 
+USE_PKG_RESOURCES=     yes
+
 do-test:
        cd ${WRKSRC} && py.test-${PYVERSSUFFIX}
 

Index: pkgsrc/devel/py-jupyter-console/Makefile
diff -u pkgsrc/devel/py-jupyter-console/Makefile:1.5 pkgsrc/devel/py-jupyter-console/Makefile:1.6
--- pkgsrc/devel/py-jupyter-console/Makefile:1.5        Tue Jan  4 20:53:13 2022
+++ pkgsrc/devel/py-jupyter-console/Makefile    Wed Jan  5 15:41:05 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2022/01/04 20:53:13 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2022/01/05 15:41:05 wiz Exp $
 
 DISTNAME=      jupyter_console-6.4.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/_/-/}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=j/jupyter_console/}
 
@@ -21,6 +21,8 @@ USE_LANGUAGES=        # none
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27 # py-ipykernel
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
        ${MV} jupyter-console jupyter-console-${PYVERSSUFFIX} || ${TRUE}

Index: pkgsrc/devel/py-jupyter_client/Makefile
diff -u pkgsrc/devel/py-jupyter_client/Makefile:1.23 pkgsrc/devel/py-jupyter_client/Makefile:1.24
--- pkgsrc/devel/py-jupyter_client/Makefile:1.23        Tue Jan  4 20:53:13 2022
+++ pkgsrc/devel/py-jupyter_client/Makefile     Wed Jan  5 15:41:05 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2022/01/04 20:53:13 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2022/01/05 15:41:05 wiz Exp $
 
 DISTNAME=      jupyter_client-6.1.12
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=j/jupyter_client/}
 
@@ -28,6 +28,8 @@ USE_LANGUAGES=        # none
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
        ${MV} jupyter-kernel jupyter-kernel-${PYVERSSUFFIX} && \

Index: pkgsrc/devel/py-jupyter_core/Makefile
diff -u pkgsrc/devel/py-jupyter_core/Makefile:1.15 pkgsrc/devel/py-jupyter_core/Makefile:1.16
--- pkgsrc/devel/py-jupyter_core/Makefile:1.15  Tue Jan  4 20:53:13 2022
+++ pkgsrc/devel/py-jupyter_core/Makefile       Wed Jan  5 15:41:05 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2022/01/04 20:53:13 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2022/01/05 15:41:05 wiz Exp $
 
 DISTNAME=      jupyter_core-4.7.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=j/jupyter_core/}
 
@@ -19,6 +19,8 @@ USE_LANGUAGES=        # none
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
+USE_PKG_RESOURCES=     yes
+
 SUBST_CLASSES+=                        fix-prefix
 SUBST_STAGE.fix-prefix=                pre-configure
 SUBST_MESSAGE.fix-prefix=      Fixing prefix.

Index: pkgsrc/devel/py-lama/Makefile
diff -u pkgsrc/devel/py-lama/Makefile:1.8 pkgsrc/devel/py-lama/Makefile:1.9
--- pkgsrc/devel/py-lama/Makefile:1.8   Tue Jan  4 20:53:14 2022
+++ pkgsrc/devel/py-lama/Makefile       Wed Jan  5 15:41:05 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2022/01/04 20:53:14 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2022/01/05 15:41:05 wiz Exp $
 
 DISTNAME=      pylama-7.7.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/py//}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=p/pylama/}
 
@@ -21,6 +21,8 @@ DEPENDS+=     ${PYPKGPREFIX}-radon>=1.4.2:..
 
 PYTHON_VERSIONED_DEPENDENCIES= test:test
 
+USE_PKG_RESOURCES=     yes
+
 USE_LANGUAGES= # none
 
 post-install:

Index: pkgsrc/devel/py-line_profiler/Makefile
diff -u pkgsrc/devel/py-line_profiler/Makefile:1.10 pkgsrc/devel/py-line_profiler/Makefile:1.11
--- pkgsrc/devel/py-line_profiler/Makefile:1.10 Tue Jan  4 20:53:15 2022
+++ pkgsrc/devel/py-line_profiler/Makefile      Wed Jan  5 15:41:05 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2022/01/04 20:53:15 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2022/01/05 15:41:05 wiz Exp $
 
 DISTNAME=      line_profiler-2.1.2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=l/line_profiler/}
 
@@ -19,6 +19,8 @@ post-install:
 
 PYTHON_VERSIONED_DEPENDENCIES= ipython
 
+USE_PKG_RESOURCES=     yes
+
 .include "../../lang/python/pyversion.mk"
 .if ${_PYTHON_VERSION} >= 37
 # Regenerate _line_profiler.c with recent cython

Index: pkgsrc/devel/py-logilab-common/Makefile
diff -u pkgsrc/devel/py-logilab-common/Makefile:1.22 pkgsrc/devel/py-logilab-common/Makefile:1.23
--- pkgsrc/devel/py-logilab-common/Makefile:1.22        Tue Jan  4 20:53:16 2022
+++ pkgsrc/devel/py-logilab-common/Makefile     Wed Jan  5 15:41:05 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2022/01/04 20:53:16 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2022/01/05 15:41:05 wiz Exp $
 
 DISTNAME=      logilab-common-1.8.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=l/logilab-common/}
 
@@ -27,6 +27,8 @@ INSTALLATION_DIRS=    ${PKGMANDIR}/man1
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
        ${MV} logilab-pytest logilab-pytest-${PYVERSSUFFIX} || ${TRUE}

Index: pkgsrc/devel/py-macholib/Makefile
diff -u pkgsrc/devel/py-macholib/Makefile:1.18 pkgsrc/devel/py-macholib/Makefile:1.19
--- pkgsrc/devel/py-macholib/Makefile:1.18      Tue Jan  4 20:53:16 2022
+++ pkgsrc/devel/py-macholib/Makefile   Wed Jan  5 15:41:05 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2022/01/04 20:53:16 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2022/01/05 15:41:05 wiz Exp $
 
 DISTNAME=      macholib-1.15.2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=m/macholib/}
 
@@ -19,6 +19,8 @@ REPLACE_PYTHON+=      macholib/macho_dump.py
 REPLACE_PYTHON+=       macholib/macho_find.py
 REPLACE_PYTHON+=       macholib/macho_standalone.py
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
        ${MV} macho_dump macho_dump-${PYVERSSUFFIX} && \

Index: pkgsrc/devel/py-mako/Makefile
diff -u pkgsrc/devel/py-mako/Makefile:1.25 pkgsrc/devel/py-mako/Makefile:1.26
--- pkgsrc/devel/py-mako/Makefile:1.25  Tue Jan  4 20:53:16 2022
+++ pkgsrc/devel/py-mako/Makefile       Wed Jan  5 15:41:06 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2022/01/04 20:53:16 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2022/01/05 15:41:06 wiz Exp $
 
 DISTNAME=      Mako-1.1.6
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:tl}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=M/Mako/}
 
@@ -16,6 +16,8 @@ TEST_DEPENDS+=        ${PYPKGPREFIX}-test-runne
 
 USE_LANGUAGES= # none
 
+USE_PKG_RESOURCES=     yes
+
 PYSETUPTESTTARGET=     pytest
 
 post-install:

Index: pkgsrc/devel/py-manticore/Makefile
diff -u pkgsrc/devel/py-manticore/Makefile:1.16 pkgsrc/devel/py-manticore/Makefile:1.17
--- pkgsrc/devel/py-manticore/Makefile:1.16     Tue Jan  4 20:53:16 2022
+++ pkgsrc/devel/py-manticore/Makefile  Wed Jan  5 15:41:06 2022
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.16 2022/01/04 20:53:16 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2022/01/05 15:41:06 wiz Exp $
 
 .include "../../devel/py-angr/version.mk"
 
 DISTNAME=      manticore-${GITHUB_TAG}
 PKGNAME=       ${PYPKGPREFIX}-${EGG_NAME}
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=trailofbits/}
 GITHUB_PROJECT=        manticore
@@ -31,6 +31,8 @@ DEPENDS+=     ${PYPKGPREFIX}-yaml-[0-9]*:../
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
 .for alternative in bin/manticore bin/manticore-verifier
        ${MV} ${DESTDIR}${PREFIX}/${alternative} \

Index: pkgsrc/devel/py-memory-profiler/Makefile
diff -u pkgsrc/devel/py-memory-profiler/Makefile:1.9 pkgsrc/devel/py-memory-profiler/Makefile:1.10
--- pkgsrc/devel/py-memory-profiler/Makefile:1.9        Tue Jan  4 20:53:17 2022
+++ pkgsrc/devel/py-memory-profiler/Makefile    Wed Jan  5 15:41:06 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2022/01/04 20:53:17 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2022/01/05 15:41:06 wiz Exp $
 
 DISTNAME=      memory_profiler-0.60.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/_/-/}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=m/memory_profiler/}
 
@@ -18,6 +18,8 @@ USE_LANGUAGES=        # none
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27 # py-matplotlib
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
        ${MV} mprof mprof-${PYVERSSUFFIX} || ${TRUE}

Index: pkgsrc/devel/py-minidump/Makefile
diff -u pkgsrc/devel/py-minidump/Makefile:1.5 pkgsrc/devel/py-minidump/Makefile:1.6
--- pkgsrc/devel/py-minidump/Makefile:1.5       Tue Jan  4 20:53:17 2022
+++ pkgsrc/devel/py-minidump/Makefile   Wed Jan  5 15:41:06 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2022/01/04 20:53:17 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2022/01/05 15:41:06 wiz Exp $
 
 DISTNAME=      minidump-0.0.21
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=m/minidump/}
 
@@ -15,6 +15,8 @@ USE_LANGUAGES=        # none
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
        ${MV} minidump minidump-${PYVERSSUFFIX} || ${TRUE}

Index: pkgsrc/devel/py-modulegraph/Makefile
diff -u pkgsrc/devel/py-modulegraph/Makefile:1.16 pkgsrc/devel/py-modulegraph/Makefile:1.17
--- pkgsrc/devel/py-modulegraph/Makefile:1.16   Tue Jan  4 20:53:17 2022
+++ pkgsrc/devel/py-modulegraph/Makefile        Wed Jan  5 15:41:06 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2022/01/04 20:53:17 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2022/01/05 15:41:06 wiz Exp $
 
 DISTNAME=      modulegraph-0.19.2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=m/modulegraph/}
 
@@ -16,6 +16,8 @@ DEPENDS+=     ${PYPKGPREFIX}-setuptools-[0-9
 
 USE_LANGUAGES= # none
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
        ${MV} modulegraph modulegraph-${PYVERSSUFFIX} || ${TRUE}

Index: pkgsrc/devel/py-nose/Makefile
diff -u pkgsrc/devel/py-nose/Makefile:1.19 pkgsrc/devel/py-nose/Makefile:1.20
--- pkgsrc/devel/py-nose/Makefile:1.19  Tue Jan  4 20:53:18 2022
+++ pkgsrc/devel/py-nose/Makefile       Wed Jan  5 15:41:06 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2022/01/04 20:53:18 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2022/01/05 15:41:06 wiz Exp $
 
 DISTNAME=      nose-1.3.7
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=n/nose/}
 
@@ -16,6 +16,8 @@ TEST_DEPENDS+=        ${PYPKGPREFIX}-coverage>=
 
 USE_LANGUAGES= # none
 
+USE_PKG_RESOURCES=     yes
+
 INSTALLATION_DIRS+=    ${PKGMANDIR}/man1
 
 post-install:

Index: pkgsrc/devel/py-nose2/Makefile
diff -u pkgsrc/devel/py-nose2/Makefile:1.10 pkgsrc/devel/py-nose2/Makefile:1.11
--- pkgsrc/devel/py-nose2/Makefile:1.10 Tue Jan  4 20:53:18 2022
+++ pkgsrc/devel/py-nose2/Makefile      Wed Jan  5 15:41:06 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2022/01/04 20:53:18 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2022/01/05 15:41:06 wiz Exp $
 
 DISTNAME=      nose2-0.10.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=n/nose2/}
 
@@ -20,6 +20,8 @@ DEPENDS+=     ${PYPKGPREFIX}-mock-[0-9]*:../
 
 USE_LANGUAGES= # none
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        ${RM} -f ${DESTDIR}${PREFIX}/bin/nose2
 

Index: pkgsrc/devel/py-pbr/Makefile
diff -u pkgsrc/devel/py-pbr/Makefile:1.31 pkgsrc/devel/py-pbr/Makefile:1.32
--- pkgsrc/devel/py-pbr/Makefile:1.31   Tue Jan  4 20:53:20 2022
+++ pkgsrc/devel/py-pbr/Makefile        Wed Jan  5 15:41:06 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.31 2022/01/04 20:53:20 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2022/01/05 15:41:06 wiz Exp $
 
 DISTNAME=      pbr-5.8.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=p/pbr/}
 
@@ -25,6 +25,8 @@ TEST_DEPENDS+=        ${PYPKGPREFIX}-wheel>=0.3
 
 REPLACE_PYTHON+=       pbr/tests/testpackage/setup.py
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        ${CHMOD} -R g-w,o-w ${DESTDIR}${PREFIX}/${PYSITELIB}/pbr/tests/testpackage
        cd ${DESTDIR}${PREFIX}/bin && ${MV} pbr pbr-${PYVERSSUFFIX} || ${TRUE}

Index: pkgsrc/devel/py-pep8/Makefile
diff -u pkgsrc/devel/py-pep8/Makefile:1.10 pkgsrc/devel/py-pep8/Makefile:1.11
--- pkgsrc/devel/py-pep8/Makefile:1.10  Tue Jan  4 20:53:20 2022
+++ pkgsrc/devel/py-pep8/Makefile       Wed Jan  5 15:41:07 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2022/01/04 20:53:20 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2022/01/05 15:41:07 wiz Exp $
 
 DISTNAME=      pep8-1.7.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=p/pep8/}
 
@@ -13,6 +13,8 @@ LICENSE=      mit
 
 USE_LANGUAGES= # none
 
+USE_PKG_RESOURCES=     yes
+
 do-test:
        cd ${WRKSRC}; ${SETENV} ${TEST_ENV} ${PYTHONBIN} setup.py test
 

Index: pkgsrc/devel/py-pip/Makefile
diff -u pkgsrc/devel/py-pip/Makefile:1.50 pkgsrc/devel/py-pip/Makefile:1.51
--- pkgsrc/devel/py-pip/Makefile:1.50   Tue Jan  4 20:53:20 2022
+++ pkgsrc/devel/py-pip/Makefile        Wed Jan  5 15:41:07 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.50 2022/01/04 20:53:20 wiz Exp $
+# $NetBSD: Makefile,v 1.51 2022/01/05 15:41:07 wiz Exp $
 
 DISTNAME=      pip-21.3.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=p/pip/}
 
@@ -19,6 +19,8 @@ REPLACE_PYTHON+=      src/pip/_vendor/request
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
+USE_PKG_RESOURCES=     yes
+
 .include "../../lang/python/pyversion.mk"
 FILES_SUBST+=  PYMAJORVERSION=${_PYTHON_VERSION:C/^([0-9]).*/\1/}
 

Index: pkgsrc/devel/py-pkginfo/Makefile
diff -u pkgsrc/devel/py-pkginfo/Makefile:1.14 pkgsrc/devel/py-pkginfo/Makefile:1.15
--- pkgsrc/devel/py-pkginfo/Makefile:1.14       Tue Jan  4 20:53:21 2022
+++ pkgsrc/devel/py-pkginfo/Makefile    Wed Jan  5 15:41:07 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2022/01/04 20:53:21 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2022/01/05 15:41:07 wiz Exp $
 
 DISTNAME=      pkginfo-1.8.2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=p/pkginfo/}
 
@@ -16,5 +16,7 @@ TEST_DEPENDS+=        ${PYPKGPREFIX}-nose-[0-9]
 
 USE_LANGUAGES= # none
 
+USE_PKG_RESOURCES=     yes
+
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/py-pybind11/Makefile
diff -u pkgsrc/devel/py-pybind11/Makefile:1.7 pkgsrc/devel/py-pybind11/Makefile:1.8
--- pkgsrc/devel/py-pybind11/Makefile:1.7       Tue Jan  4 20:53:23 2022
+++ pkgsrc/devel/py-pybind11/Makefile   Wed Jan  5 15:41:07 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2022/01/04 20:53:23 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2022/01/05 15:41:07 wiz Exp $
 
 DISTNAME=      pybind11-2.8.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=p/pybind11/}
 
@@ -15,5 +15,7 @@ USE_LANGUAGES=        # none
 
 PYTHON_SELF_CONFLICT=  yes
 
+USE_PKG_RESOURCES=     yes
+
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/py-pylint/Makefile
diff -u pkgsrc/devel/py-pylint/Makefile:1.58 pkgsrc/devel/py-pylint/Makefile:1.59
--- pkgsrc/devel/py-pylint/Makefile:1.58        Tue Jan  4 20:53:23 2022
+++ pkgsrc/devel/py-pylint/Makefile     Wed Jan  5 15:41:07 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.58 2022/01/04 20:53:23 wiz Exp $
+# $NetBSD: Makefile,v 1.59 2022/01/05 15:41:07 wiz Exp $
 
 DISTNAME=      pylint-2.12.2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=p/pylint/}
 
@@ -21,6 +21,8 @@ USE_LANGUAGES=        # none
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
+USE_PKG_RESOURCES=     yes
+
 .include "../../lang/python/pyversion.mk"
 .if ${_PYTHON_VERSION} < 310
 DEPENDS+=      ${PYPKGPREFIX}-typing-extensions>=3.10.0:../../devel/py-typing-extensions

Index: pkgsrc/devel/py-pyutil/Makefile
diff -u pkgsrc/devel/py-pyutil/Makefile:1.25 pkgsrc/devel/py-pyutil/Makefile:1.26
--- pkgsrc/devel/py-pyutil/Makefile:1.25        Tue Jan  4 20:53:34 2022
+++ pkgsrc/devel/py-pyutil/Makefile     Wed Jan  5 15:41:07 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2022/01/04 20:53:34 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2022/01/05 15:41:07 wiz Exp $
 
 DISTNAME=      pyutil-3.3.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=p/pyutil/}
 
@@ -17,6 +17,8 @@ TEST_DEPENDS+=        ${PYPKGPREFIX}-twisted>=1
 
 USE_LANGUAGES= # none
 
+USE_PKG_RESOURCES=     yes
+
 CONFLICTS+=    passphrase-[0-9]*
 
 post-extract:

Index: pkgsrc/devel/py-radon/Makefile
diff -u pkgsrc/devel/py-radon/Makefile:1.15 pkgsrc/devel/py-radon/Makefile:1.16
--- pkgsrc/devel/py-radon/Makefile:1.15 Tue Jan  4 20:53:35 2022
+++ pkgsrc/devel/py-radon/Makefile      Wed Jan  5 15:41:07 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2022/01/04 20:53:35 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2022/01/05 15:41:07 wiz Exp $
 
 DISTNAME=      radon-4.5.2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=r/radon/}
 
@@ -20,6 +20,8 @@ TEST_DEPENDS+=        ${PYPKGPREFIX}-tox-[0-9]*
 
 PYTHON_VERSIONED_DEPENDENCIES= test:test
 
+USE_PKG_RESOURCES=     yes
+
 USE_LANGUAGES= # none
 
 post-install:

Index: pkgsrc/devel/py-restructuredtext_lint/Makefile
diff -u pkgsrc/devel/py-restructuredtext_lint/Makefile:1.5 pkgsrc/devel/py-restructuredtext_lint/Makefile:1.6
--- pkgsrc/devel/py-restructuredtext_lint/Makefile:1.5  Tue Jan  4 20:53:36 2022
+++ pkgsrc/devel/py-restructuredtext_lint/Makefile      Wed Jan  5 15:41:07 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2022/01/04 20:53:36 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2022/01/05 15:41:07 wiz Exp $
 
 DISTNAME=      restructuredtext_lint-1.3.2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=r/restructuredtext_lint/}
 
@@ -15,6 +15,8 @@ DEPENDS+=     ${PYPKGPREFIX}-docutils>=0.11:
 
 USE_LANGUAGES= # none
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
 .for bin in restructuredtext-lint rst-lint
        cd ${DESTDIR}${PREFIX}/bin && \

Index: pkgsrc/devel/py-slugify/Makefile
diff -u pkgsrc/devel/py-slugify/Makefile:1.4 pkgsrc/devel/py-slugify/Makefile:1.5
--- pkgsrc/devel/py-slugify/Makefile:1.4        Tue Jan  4 20:53:39 2022
+++ pkgsrc/devel/py-slugify/Makefile    Wed Jan  5 15:41:07 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2022/01/04 20:53:39 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2022/01/05 15:41:07 wiz Exp $
 
 DISTNAME=      python-slugify-5.0.2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/^python-//}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel www python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=p/python-slugify/}
 
@@ -19,6 +19,8 @@ USE_LANGUAGES=        # none
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
        ${MV} slugify slugify-${PYVERSSUFFIX} || ${TRUE}

Index: pkgsrc/devel/py-test/Makefile
diff -u pkgsrc/devel/py-test/Makefile:1.104 pkgsrc/devel/py-test/Makefile:1.105
--- pkgsrc/devel/py-test/Makefile:1.104 Tue Jan  4 20:53:40 2022
+++ pkgsrc/devel/py-test/Makefile       Wed Jan  5 15:41:08 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.104 2022/01/04 20:53:40 wiz Exp $
+# $NetBSD: Makefile,v 1.105 2022/01/05 15:41:08 wiz Exp $
 
 DISTNAME=      pytest-6.2.5
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/py//}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=p/pytest/}
 
@@ -28,6 +28,8 @@ TEST_DEPENDS+=        ${PYPKGPREFIX}-xmlschema-
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27 # since 5.0.0
 
+USE_PKG_RESOURCES=     yes
+
 .include "../../lang/python/pyversion.mk"
 .if ${_PYTHON_VERSION:S/none/0/} < 38
 DEPENDS+=      ${PYPKGPREFIX}-importlib-metadata>=0.12:../../devel/py-importlib-metadata

Index: pkgsrc/devel/py-test-benchmark/Makefile
diff -u pkgsrc/devel/py-test-benchmark/Makefile:1.4 pkgsrc/devel/py-test-benchmark/Makefile:1.5
--- pkgsrc/devel/py-test-benchmark/Makefile:1.4 Tue Jan  4 20:53:40 2022
+++ pkgsrc/devel/py-test-benchmark/Makefile     Wed Jan  5 15:41:08 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2022/01/04 20:53:40 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2022/01/05 15:41:08 wiz Exp $
 
 DISTNAME=      pytest-benchmark-3.4.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/py//}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=p/pytest-benchmark/}
 
@@ -21,6 +21,8 @@ USE_LANGUAGES=        # none
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27      # py-pygal
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
 .for bin in py.test-benchmark pytest-benchmark
        cd ${DESTDIR}${PREFIX}/bin && \

Index: pkgsrc/devel/py-test-watch/Makefile
diff -u pkgsrc/devel/py-test-watch/Makefile:1.3 pkgsrc/devel/py-test-watch/Makefile:1.4
--- pkgsrc/devel/py-test-watch/Makefile:1.3     Tue Jan  4 20:53:43 2022
+++ pkgsrc/devel/py-test-watch/Makefile Wed Jan  5 15:41:08 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2022/01/04 20:53:43 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2022/01/05 15:41:08 wiz Exp $
 
 DISTNAME=      pytest-watch-4.2.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/py//}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=p/pytest-watch/}
 
@@ -17,6 +17,8 @@ DEPENDS+=     ${PYPKGPREFIX}-watchdog>=0.6.0
 
 PYTHON_VERSIONED_DEPENDENCIES= test
 
+USE_PKG_RESOURCES=     yes
+
 USE_LANGUAGES= # none
 
 post-install:

Index: pkgsrc/devel/py-tox/Makefile
diff -u pkgsrc/devel/py-tox/Makefile:1.23 pkgsrc/devel/py-tox/Makefile:1.24
--- pkgsrc/devel/py-tox/Makefile:1.23   Tue Jan  4 20:53:44 2022
+++ pkgsrc/devel/py-tox/Makefile        Wed Jan  5 15:41:08 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2022/01/04 20:53:44 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2022/01/05 15:41:08 wiz Exp $
 
 DISTNAME=      tox-3.20.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=t/tox/}
 
@@ -35,6 +35,8 @@ DEPENDS+=     ${PYPKGPREFIX}-importlib-metad
 PYTHON_VERSIONED_DEPENDENCIES+=        packaging
 PYTHON_VERSIONED_DEPENDENCIES+=        test:test
 
+USE_PKG_RESOURCES=     yes
+
 USE_LANGUAGES= # none
 
 post-install:

Index: pkgsrc/devel/py-tryton/Makefile
diff -u pkgsrc/devel/py-tryton/Makefile:1.50 pkgsrc/devel/py-tryton/Makefile:1.51
--- pkgsrc/devel/py-tryton/Makefile:1.50        Tue Jan  4 20:53:45 2022
+++ pkgsrc/devel/py-tryton/Makefile     Wed Jan  5 15:41:08 2022
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.50 2022/01/04 20:53:45 wiz Exp $
+# $NetBSD: Makefile,v 1.51 2022/01/05 15:41:08 wiz Exp $
 TRYTON_MODULE_NAME=    tryton
-PKGREVISION= 1
+PKGREVISION= 2
 .include "../../devel/py-trytond/Makefile.common"
 CATEGORIES=    devel python
 
@@ -11,6 +11,8 @@ LICENSE=      gnu-gpl-v3
 
 USE_LANGUAGES=         # none
 
+USE_PKG_RESOURCES=     yes
+
 #WRKSRC=               ${WRKDIR}/tryton-${PKGVERSION_NOREV}
 
 .include "options.mk"

Index: pkgsrc/devel/py-trytond/Makefile
diff -u pkgsrc/devel/py-trytond/Makefile:1.26 pkgsrc/devel/py-trytond/Makefile:1.27
--- pkgsrc/devel/py-trytond/Makefile:1.26       Tue Jan  4 20:53:45 2022
+++ pkgsrc/devel/py-trytond/Makefile    Wed Jan  5 15:41:08 2022
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.26 2022/01/04 20:53:45 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2022/01/05 15:41:08 wiz Exp $
 TRYTON_MODULE_NAME=    trytond
-PKGREVISION= 1
+PKGREVISION= 2
 .include "../../devel/py-trytond/Makefile.common"
 CATEGORIES=     devel python
 
@@ -25,6 +25,8 @@ TEST_DEPENDS+=        ${PYPKGPREFIX}-Pillow-[0-
 USE_PKGLOCALEDIR=      yes
 USE_LANGUAGES=         # none
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
 .for f in trytond trytond-admin trytond-console trytond-cron trytond-stat trytond-worker
        ${MV} ${DESTDIR}${PREFIX}/bin/${f} \

Index: pkgsrc/devel/py-unittest2/Makefile
diff -u pkgsrc/devel/py-unittest2/Makefile:1.14 pkgsrc/devel/py-unittest2/Makefile:1.15
--- pkgsrc/devel/py-unittest2/Makefile:1.14     Tue Jan  4 20:53:46 2022
+++ pkgsrc/devel/py-unittest2/Makefile  Wed Jan  5 15:41:08 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2022/01/04 20:53:46 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2022/01/05 15:41:08 wiz Exp $
 
 DISTNAME=              unittest2-1.1.0
 PKGNAME=               ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=           1
+PKGREVISION=           2
 CATEGORIES=            devel python
 MASTER_SITES=          ${MASTER_SITE_PYPI:=u/unittest2/}
 
@@ -25,6 +25,8 @@ SUBST_STAGE.multi=    pre-configure
 SUBST_FILES.multi=     setup.py
 SUBST_SED.multi=       -e 's,unit2,unit2-${PYVERSSUFFIX},'
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        ${INSTALL_DATA} ${WRKSRC}/README.txt ${DESTDIR}${PREFIX}/${DOCDIR}
 

Index: pkgsrc/devel/py-unittest2pytest/Makefile
diff -u pkgsrc/devel/py-unittest2pytest/Makefile:1.3 pkgsrc/devel/py-unittest2pytest/Makefile:1.4
--- pkgsrc/devel/py-unittest2pytest/Makefile:1.3        Tue Jan  4 20:53:47 2022
+++ pkgsrc/devel/py-unittest2pytest/Makefile    Wed Jan  5 15:41:08 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2022/01/04 20:53:47 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2022/01/05 15:41:08 wiz Exp $
 
 DISTNAME=      unittest2pytest-0.4
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=u/unittest2pytest/}
 
@@ -13,6 +13,8 @@ LICENSE=      gnu-gpl-v3
 
 USE_LANGUAGES= # none
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
        ${MV} unittest2pytest unittest2pytest-${PYVERSSUFFIX} || ${TRUE}

Index: pkgsrc/devel/py-virtualenv/Makefile
diff -u pkgsrc/devel/py-virtualenv/Makefile:1.52 pkgsrc/devel/py-virtualenv/Makefile:1.53
--- pkgsrc/devel/py-virtualenv/Makefile:1.52    Tue Jan  4 20:53:47 2022
+++ pkgsrc/devel/py-virtualenv/Makefile Wed Jan  5 15:41:09 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.52 2022/01/04 20:53:47 wiz Exp $
+# $NetBSD: Makefile,v 1.53 2022/01/05 15:41:09 wiz Exp $
 
 DISTNAME=      virtualenv-16.7.9
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=v/virtualenv/}
 
@@ -24,6 +24,8 @@ TEST_DEPENDS+=        ${PYPKGPREFIX}-mock-[0-9]
 
 PYTHON_VERSIONED_DEPENDENCIES= test:test
 
+USE_PKG_RESOURCES=     yes
+
 USE_LANGUAGES= # none
 
 REPLACE_PYTHON=        virtualenv.py

Index: pkgsrc/devel/py-wasm/Makefile
diff -u pkgsrc/devel/py-wasm/Makefile:1.5 pkgsrc/devel/py-wasm/Makefile:1.6
--- pkgsrc/devel/py-wasm/Makefile:1.5   Tue Jan  4 20:53:48 2022
+++ pkgsrc/devel/py-wasm/Makefile       Wed Jan  5 15:41:09 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2022/01/04 20:53:48 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2022/01/05 15:41:09 wiz Exp $
 
 DISTNAME=      wasm-1.2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=athre0z/}
 GITHUB_PROJECT=        wasm
@@ -17,6 +17,8 @@ USE_LANGUAGES=        c++
 
 PYTHON_VERSIONED_DEPENDENCIES+=        setuptools
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        ${MV} ${DESTDIR}${PREFIX}/bin/wasmdump \
                ${DESTDIR}${PREFIX}/bin/wasmdump-${PYVERSSUFFIX} || ${TRUE}

Index: pkgsrc/devel/py-wheel/Makefile
diff -u pkgsrc/devel/py-wheel/Makefile:1.25 pkgsrc/devel/py-wheel/Makefile:1.26
--- pkgsrc/devel/py-wheel/Makefile:1.25 Tue Jan  4 20:53:48 2022
+++ pkgsrc/devel/py-wheel/Makefile      Wed Jan  5 15:41:09 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2022/01/04 20:53:48 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2022/01/05 15:41:09 wiz Exp $
 
 DISTNAME=      wheel-0.37.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=w/wheel/}
 
@@ -18,6 +18,8 @@ USE_LANGUAGES=        # none
 
 PYSETUPTESTTARGET=     pytest
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
        ${MV} wheel wheel-${PYVERSSUFFIX} || ${TRUE}

Index: pkgsrc/devel/py-xdis/Makefile
diff -u pkgsrc/devel/py-xdis/Makefile:1.39 pkgsrc/devel/py-xdis/Makefile:1.40
--- pkgsrc/devel/py-xdis/Makefile:1.39  Tue Jan  4 20:53:48 2022
+++ pkgsrc/devel/py-xdis/Makefile       Wed Jan  5 15:41:09 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.39 2022/01/04 20:53:48 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2022/01/05 15:41:09 wiz Exp $
 
 DISTNAME=      xdis-6.0.3
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=x/xdis/}
 
@@ -19,6 +19,8 @@ USE_LANGUAGES=        # none
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
        ${MV} pydisasm pydisasm-${PYVERSSUFFIX} || ${TRUE}

Index: pkgsrc/devel/py-yapf/Makefile
diff -u pkgsrc/devel/py-yapf/Makefile:1.5 pkgsrc/devel/py-yapf/Makefile:1.6
--- pkgsrc/devel/py-yapf/Makefile:1.5   Tue Jan  4 20:53:49 2022
+++ pkgsrc/devel/py-yapf/Makefile       Wed Jan  5 15:41:09 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2022/01/04 20:53:49 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2022/01/05 15:41:09 wiz Exp $
 
 DISTNAME=      yapf-0.32.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel textproc python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=y/yapf/}
 
@@ -13,6 +13,8 @@ LICENSE=      apache-2.0
 
 USE_LANGUAGES= # none
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
 .for bin in yapf yapf-diff
        cd ${DESTDIR}${PREFIX}/bin && \

Index: pkgsrc/devel/py-zconfig/Makefile
diff -u pkgsrc/devel/py-zconfig/Makefile:1.23 pkgsrc/devel/py-zconfig/Makefile:1.24
--- pkgsrc/devel/py-zconfig/Makefile:1.23       Tue Jan  4 20:53:49 2022
+++ pkgsrc/devel/py-zconfig/Makefile    Wed Jan  5 15:41:09 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2022/01/04 20:53:49 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2022/01/05 15:41:09 wiz Exp $
 
 DISTNAME=      ZConfig-3.6.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:tl}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=Z/ZConfig/}
 
@@ -18,6 +18,8 @@ TEST_DEPENDS+=        ${PYPKGPREFIX}-ZopeTestru
 
 USE_LANGUAGES= # none
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
        ${MV} zconfig zconfig-${PYVERSSUFFIX} && \

Index: pkgsrc/devel/undebt/Makefile
diff -u pkgsrc/devel/undebt/Makefile:1.5 pkgsrc/devel/undebt/Makefile:1.6
--- pkgsrc/devel/undebt/Makefile:1.5    Tue Jan  4 20:53:50 2022
+++ pkgsrc/devel/undebt/Makefile        Wed Jan  5 15:41:09 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2022/01/04 20:53:50 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2022/01/05 15:41:09 wiz Exp $
 
 DISTNAME=      undebt-0.2.2
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_PYPI:=u/undebt/}
 
@@ -14,6 +14,8 @@ DEPENDS+=     ${PYPKGPREFIX}-argparse-[0-9]*
 
 PYTHON_VERSIONED_DEPENDENCIES+=        pyparsing
 
+USE_PKG_RESOURCES=     yes
+
 USE_LANGUAGES= # none
 
 .include "../../lang/python/egg.mk"

Index: pkgsrc/editors/retext/Makefile
diff -u pkgsrc/editors/retext/Makefile:1.10 pkgsrc/editors/retext/Makefile:1.11
--- pkgsrc/editors/retext/Makefile:1.10 Tue Jan  4 20:53:51 2022
+++ pkgsrc/editors/retext/Makefile      Wed Jan  5 15:41:09 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2022/01/04 20:53:51 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2022/01/05 15:41:09 wiz Exp $
 
 DISTNAME=      ReText-7.2.2
 PKGNAME=       ${DISTNAME:tl}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    editors python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=R/ReText/}
 
@@ -19,6 +19,8 @@ USE_LANGUAGES=        # none
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27 # py-markups
 
+USE_PKG_RESOURCES=     yes
+
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../lang/python/egg.mk"
 .include "../../x11/py-qt5/buildlink3.mk"

Index: pkgsrc/emulators/gns3-gui/Makefile
diff -u pkgsrc/emulators/gns3-gui/Makefile:1.5 pkgsrc/emulators/gns3-gui/Makefile:1.6
--- pkgsrc/emulators/gns3-gui/Makefile:1.5      Tue Jan  4 20:53:51 2022
+++ pkgsrc/emulators/gns3-gui/Makefile  Wed Jan  5 15:41:09 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2022/01/04 20:53:51 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2022/01/05 15:41:09 wiz Exp $
 
 DISTNAME=      gns3-gui-2.2.1
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    emulators
 MASTER_SITES=  ${MASTER_SITE_PYPI:=g/gns3-gui/}
 
@@ -10,14 +10,16 @@ HOMEPAGE=   https://github.com/GNS3/gns3-g
 COMMENT=       GNS3 network simulator - Graphical user interface package
 LICENSE=       gnu-gpl-v3
 
-PYTHON_VERSIONS_INCOMPATIBLE=  27
-
 DEPENDS+=      ${PYPKGPREFIX}-distro>=1.3.0:../../devel/py-distro
 DEPENDS+=      ${PYPKGPREFIX}-psutil>=2.2.1:../../sysutils/py-psutil
 DEPENDS+=      ${PYPKGPREFIX}-jsonschema>=2.6.0:../../textproc/py-jsonschema
 DEPENDS+=      ${PYPKGPREFIX}-raven>=5.23.0:../../www/py-raven
 DEPENDS+=      ${PYPKGPREFIX}-qt5-[0-9]*:../../x11/py-qt5
 
+PYTHON_VERSIONS_INCOMPATIBLE=  27
+
+USE_PKG_RESOURCES=     yes
+
 # we have newer jsonschema and it seems fine
 SUBST_CLASSES+=                inst
 SUBST_STAGE.inst=      pre-configure

Index: pkgsrc/emulators/gns3-server/Makefile
diff -u pkgsrc/emulators/gns3-server/Makefile:1.5 pkgsrc/emulators/gns3-server/Makefile:1.6
--- pkgsrc/emulators/gns3-server/Makefile:1.5   Tue Jan  4 20:53:51 2022
+++ pkgsrc/emulators/gns3-server/Makefile       Wed Jan  5 15:41:10 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2022/01/04 20:53:51 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2022/01/05 15:41:10 wiz Exp $
 
 DISTNAME=      gns3-server-2.2.1
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    emulators
 MASTER_SITES=  ${MASTER_SITE_PYPI:=g/gns3-server/}
 
@@ -10,8 +10,6 @@ HOMEPAGE=     https://github.com/GNS3/gns3-s
 COMMENT=       GNS3 network simulator - Server package
 LICENSE=       gnu-gpl-v3
 
-PYTHON_VERSIONS_INCOMPATIBLE=  27
-
 DEPENDS+=      ${PYPKGPREFIX}-aiohttp>=2.2.0:../../www/py-aiohttp
 DEPENDS+=      ${PYPKGPREFIX}-aiohttp-cors>=0.7.0:../../www/py-aiohttp-cors
 DEPENDS+=      ${PYPKGPREFIX}-aiofiles>=0.4.0:../../devel/py-aiofiles
@@ -24,6 +22,10 @@ DEPENDS+=    ${PYPKGPREFIX}-psutil>=3.0.0:.
 DEPENDS+=      ${PYPKGPREFIX}-async-timeout>=3.0.1:../../devel/py-async-timeout
 DEPENDS+=      ${PYPKGPREFIX}-zipstream>=1.1.4:../../archivers/py-zipstream
 
+PYTHON_VERSIONS_INCOMPATIBLE=  27
+
+USE_PKG_RESOURCES=     yes
+
 CHECK_INTERPRETER_SKIP+=       ${PYSITELIB}/gns3server/compute/docker/resources/init.sh
 CHECK_INTERPRETER_SKIP+=       ${PYSITELIB}/gns3server/compute/docker/resources/etc/udhcpc/default.script
 

Index: pkgsrc/filesystems/fuse-pcachefs/Makefile
diff -u pkgsrc/filesystems/fuse-pcachefs/Makefile:1.12 pkgsrc/filesystems/fuse-pcachefs/Makefile:1.13
--- pkgsrc/filesystems/fuse-pcachefs/Makefile:1.12      Tue Jan  4 20:53:51 2022
+++ pkgsrc/filesystems/fuse-pcachefs/Makefile   Wed Jan  5 15:41:10 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2022/01/04 20:53:51 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2022/01/05 15:41:10 wiz Exp $
 
 DISTNAME=      fuse-pcachefs-0.3
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    filesystems
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=ibizaman/}
 GITHUB_PROJECT=        pcachefs
@@ -11,7 +11,7 @@ HOMEPAGE=     https://github.com/ibizaman/pc
 COMMENT=       FUSE-based persistent caching filesystem
 LICENSE=       apache-2.0
 
-PYTHON_VERSIONED_DEPENDENCIES+=        setuptools:build
+USE_PKG_RESOURCES=     yes
 
 WRKSRC=                ${WRKDIR}/${GITHUB_PROJECT}-${PKGVERSION_NOREV}
 EGG_NAME=      pCacheFS-${PKGVERSION_NOREV}

Index: pkgsrc/filesystems/tahoe-lafs/Makefile
diff -u pkgsrc/filesystems/tahoe-lafs/Makefile:1.53 pkgsrc/filesystems/tahoe-lafs/Makefile:1.54
--- pkgsrc/filesystems/tahoe-lafs/Makefile:1.53 Tue Jan  4 20:53:51 2022
+++ pkgsrc/filesystems/tahoe-lafs/Makefile      Wed Jan  5 15:41:10 2022
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.53 2022/01/04 20:53:51 wiz Exp $
+# $NetBSD: Makefile,v 1.54 2022/01/05 15:41:10 wiz Exp $
 
 VERSION_BASE=  1.16.0
 VERSION_RC=
 DISTNAME=      tahoe-lafs-${VERSION_BASE}${VERSION_RC}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    filesystems
 MASTER_SITES=  https://tahoe-lafs.org/downloads/
 
@@ -18,6 +18,8 @@ USE_TOOLS=    gmake
 # not available for 27 in pkgsrc.
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
+USE_PKG_RESOURCES=     yes
+
 # The world sees this as part of base python.
 DEPENDS+=      ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
 

Index: pkgsrc/finance/py-backtrader/Makefile
diff -u pkgsrc/finance/py-backtrader/Makefile:1.5 pkgsrc/finance/py-backtrader/Makefile:1.6
--- pkgsrc/finance/py-backtrader/Makefile:1.5   Tue Jan  4 20:53:52 2022
+++ pkgsrc/finance/py-backtrader/Makefile       Wed Jan  5 15:41:10 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2022/01/04 20:53:52 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2022/01/05 15:41:10 wiz Exp $
 
 DISTNAME=      backtrader-1.9.74.123
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    finance python
 #MASTER_SITES= ${MASTER_SITE_PYPI:=b/backtrader/}
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=mementum/}
@@ -21,6 +21,8 @@ USE_LANGUAGES=        # none
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27 # py-matplotlib, py-pandas
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
        ${MV} bt-run.py bt-run-${PYVERSSUFFIX}.py && \

Index: pkgsrc/finance/py-crytic-compile/Makefile
diff -u pkgsrc/finance/py-crytic-compile/Makefile:1.3 pkgsrc/finance/py-crytic-compile/Makefile:1.4
--- pkgsrc/finance/py-crytic-compile/Makefile:1.3       Tue Jan  4 20:53:52 2022
+++ pkgsrc/finance/py-crytic-compile/Makefile   Wed Jan  5 15:41:10 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2022/01/04 20:53:52 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2022/01/05 15:41:10 wiz Exp $
 
 DISTNAME=      crytic-compile-0.1.9
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    finance
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=crytic/}
 GITHUB_PROJECT=        crytic-compile
@@ -15,6 +15,8 @@ LICENSE=      gnu-agpl-v3
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        ${MV} ${DESTDIR}${PREFIX}/bin/crytic-compile \
                ${DESTDIR}${PREFIX}/bin/crytic-compile-${PYVERSSUFFIX}

Index: pkgsrc/finance/py-pyevmasm/Makefile
diff -u pkgsrc/finance/py-pyevmasm/Makefile:1.3 pkgsrc/finance/py-pyevmasm/Makefile:1.4
--- pkgsrc/finance/py-pyevmasm/Makefile:1.3     Tue Jan  4 20:53:54 2022
+++ pkgsrc/finance/py-pyevmasm/Makefile Wed Jan  5 15:41:10 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2022/01/04 20:53:54 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2022/01/05 15:41:10 wiz Exp $
 
 DISTNAME=      pyevmasm-0.2.3
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    finance python
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=crytic/}
 GITHUB_PROJECT=        pyevmasm
@@ -18,6 +18,8 @@ TEST_DEPENDS+=        ${PYPKGPREFIX}-test-[0-9]
 
 USE_LANGUAGES= # none
 
+USE_PKG_RESOURCES=     yes
+
 TEST_ENV+=     PYTHONPATH=${WRKSRC}/build/lib
 
 post-install:

Index: pkgsrc/finance/py-trytond-currency/Makefile
diff -u pkgsrc/finance/py-trytond-currency/Makefile:1.12 pkgsrc/finance/py-trytond-currency/Makefile:1.13
--- pkgsrc/finance/py-trytond-currency/Makefile:1.12    Tue Jan  4 20:53:58 2022
+++ pkgsrc/finance/py-trytond-currency/Makefile Wed Jan  5 15:41:10 2022
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2022/01/04 20:53:58 wiz Exp $ 
+# $NetBSD: Makefile,v 1.13 2022/01/05 15:41:10 wiz Exp $ 
 TRYTON_MODULE_NAME=    trytond_currency
-PKGREVISION= 1
+PKGREVISION= 2
 .include "../../devel/py-trytond/Makefile.common"
 CATEGORIES=    finance python
 
@@ -13,6 +13,8 @@ DEPENDS+=     ${PYPKGPREFIX}-trytond>=${TRYT
 
 USE_LANGUAGES= # none
 
+USE_PKG_RESOURCES=     yes
+
 REPLACE_PYTHON+=       tests/test_currency.py tests/tools.py
 
 .include "../../lang/python/application.mk"

Index: pkgsrc/fonts/py-fonttools/Makefile
diff -u pkgsrc/fonts/py-fonttools/Makefile:1.76 pkgsrc/fonts/py-fonttools/Makefile:1.77
--- pkgsrc/fonts/py-fonttools/Makefile:1.76     Tue Jan  4 20:54:01 2022
+++ pkgsrc/fonts/py-fonttools/Makefile  Wed Jan  5 15:41:10 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.76 2022/01/04 20:54:01 wiz Exp $
+# $NetBSD: Makefile,v 1.77 2022/01/05 15:41:10 wiz Exp $
 
 DISTNAME=      fonttools-4.28.5
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    fonts python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=F/FontTools/}
 EXTRACT_SUFX=  .zip
@@ -28,6 +28,8 @@ PYSETUPTESTTARGET=    pytest
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
+USE_PKG_RESOURCES=     yes
+
 SUBST_CLASSES+=                man
 SUBST_STAGE.man=       pre-configure
 SUBST_MESSAGE.man=     Fixing man page installation path.

Index: pkgsrc/geography/py-obspy/Makefile
diff -u pkgsrc/geography/py-obspy/Makefile:1.20 pkgsrc/geography/py-obspy/Makefile:1.21
--- pkgsrc/geography/py-obspy/Makefile:1.20     Tue Jan  4 20:54:02 2022
+++ pkgsrc/geography/py-obspy/Makefile  Wed Jan  5 15:41:11 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2022/01/04 20:54:02 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2022/01/05 15:41:11 wiz Exp $
 
 DISTNAME=      obspy-1.2.2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    geography python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=o/obspy/}
 EXTRACT_SUFX=  .zip
@@ -27,6 +27,8 @@ REPLACE_BASH= obspy/taup/tests/data/TauP
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27 # py-scipy
 
+USE_PKG_RESOURCES=     yes
+
 pre-configure:
        ${FIND} ${WRKSRC} -type f -exec ${CHMOD} -x {} \;
 

Index: pkgsrc/geography/py-trytond-country/Makefile
diff -u pkgsrc/geography/py-trytond-country/Makefile:1.13 pkgsrc/geography/py-trytond-country/Makefile:1.14
--- pkgsrc/geography/py-trytond-country/Makefile:1.13   Tue Jan  4 20:54:02 2022
+++ pkgsrc/geography/py-trytond-country/Makefile        Wed Jan  5 15:41:11 2022
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.13 2022/01/04 20:54:02 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2022/01/05 15:41:11 wiz Exp $
 TRYTON_MODULE_NAME=    trytond_country
-PKGREVISION= 1
+PKGREVISION= 2
 .include "../../devel/py-trytond/Makefile.common"
 CATEGORIES=    geography python
 
@@ -15,6 +15,8 @@ USE_LANGUAGES=        # none
 
 REPLACE_PYTHON+=       tests/test_country.py
 
+USE_PKG_RESOURCES=     yes
+
 PY_PATCHPLIST=                 yes
 
 post-install:

Index: pkgsrc/graphics/py-actdiag/Makefile
diff -u pkgsrc/graphics/py-actdiag/Makefile:1.17 pkgsrc/graphics/py-actdiag/Makefile:1.18
--- pkgsrc/graphics/py-actdiag/Makefile:1.17    Tue Jan  4 20:54:04 2022
+++ pkgsrc/graphics/py-actdiag/Makefile Wed Jan  5 15:41:11 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2022/01/04 20:54:04 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2022/01/05 15:41:11 wiz Exp $
 
 DISTNAME=      actdiag-2.0.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    graphics python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=a/actdiag/}
 
@@ -19,6 +19,8 @@ INSTALLATION_DIRS+=   ${PKGMANDIR}/man1
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
        ${MV} actdiag actdiag-${PYVERSSUFFIX} || ${TRUE}

Index: pkgsrc/graphics/py-blockdiag/Makefile
diff -u pkgsrc/graphics/py-blockdiag/Makefile:1.28 pkgsrc/graphics/py-blockdiag/Makefile:1.29
--- pkgsrc/graphics/py-blockdiag/Makefile:1.28  Tue Jan  4 20:54:04 2022
+++ pkgsrc/graphics/py-blockdiag/Makefile       Wed Jan  5 15:41:11 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.28 2022/01/04 20:54:04 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2022/01/05 15:41:11 wiz Exp $
 
 DISTNAME=      blockdiag-2.0.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    graphics python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=b/blockdiag/}
 
@@ -24,7 +24,8 @@ USE_LANGUAGES=        # none
 INSTALLATION_DIRS+=    ${PKGMANDIR}/man1
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
-PYTHON_VERSIONED_DEPENDENCIES+=        setuptools
+
+USE_PKG_RESOURCES=     yes
 
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
@@ -33,5 +34,4 @@ post-install:
                ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/blockdiag-${PYVERSSUFFIX}.1
 
 .include "../../lang/python/egg.mk"
-.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/graphics/py-fits/Makefile
diff -u pkgsrc/graphics/py-fits/Makefile:1.12 pkgsrc/graphics/py-fits/Makefile:1.13
--- pkgsrc/graphics/py-fits/Makefile:1.12       Tue Jan  4 20:54:05 2022
+++ pkgsrc/graphics/py-fits/Makefile    Wed Jan  5 15:41:11 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2022/01/04 20:54:05 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2022/01/05 15:41:11 wiz Exp $
 
 DISTNAME=      pyfits-3.5
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/py//}
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    graphics python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=p/pyfits/}
 
@@ -14,6 +14,8 @@ LICENSE=      modified-bsd
 BUILD_DEPENDS+=        ${PYPKGPREFIX}-d2to1>=0.2.12:../../devel/py-d2to1
 BUILD_DEPENDS+=        ${PYPKGPREFIX}-stsci.distutils>=0.3:../../devel/py-stsci.distutils
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
                ${MV} fitscheck fitscheck-${PYVERSSUFFIX} && \

Index: pkgsrc/graphics/py-imageio/Makefile
diff -u pkgsrc/graphics/py-imageio/Makefile:1.9 pkgsrc/graphics/py-imageio/Makefile:1.10
--- pkgsrc/graphics/py-imageio/Makefile:1.9     Tue Jan  4 20:54:05 2022
+++ pkgsrc/graphics/py-imageio/Makefile Wed Jan  5 15:41:11 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2022/01/04 20:54:05 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2022/01/05 15:41:11 wiz Exp $
 
 DISTNAME=      imageio-2.10.5
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    graphics python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=i/imageio/}
 
@@ -18,6 +18,8 @@ TEST_DEPENDS+=        ${PYPKGPREFIX}-tifffile-[
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27 # py-numpy
 
+USE_PKG_RESOURCES=     yes
+
 USE_LANGUAGES= # none
 
 post-extract:

Index: pkgsrc/graphics/py-nwdiag/Makefile
diff -u pkgsrc/graphics/py-nwdiag/Makefile:1.17 pkgsrc/graphics/py-nwdiag/Makefile:1.18
--- pkgsrc/graphics/py-nwdiag/Makefile:1.17     Tue Jan  4 20:54:06 2022
+++ pkgsrc/graphics/py-nwdiag/Makefile  Wed Jan  5 15:41:11 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2022/01/04 20:54:06 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2022/01/05 15:41:11 wiz Exp $
 
 DISTNAME=      nwdiag-2.0.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    graphics python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=n/nwdiag/}
 
@@ -15,6 +15,8 @@ DEPENDS+=     ${PYPKGPREFIX}-blockdiag>=1.5.
 
 USE_LANGUAGES= # none
 
+USE_PKG_RESOURCES=     yes
+
 INSTALLATION_DIRS+=    ${PKGMANDIR}/man1
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27

Index: pkgsrc/graphics/py-pycha/Makefile
diff -u pkgsrc/graphics/py-pycha/Makefile:1.21 pkgsrc/graphics/py-pycha/Makefile:1.22
--- pkgsrc/graphics/py-pycha/Makefile:1.21      Tue Jan  4 20:54:06 2022
+++ pkgsrc/graphics/py-pycha/Makefile   Wed Jan  5 15:41:11 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2022/01/04 20:54:06 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2022/01/05 15:41:11 wiz Exp $
 
 DISTNAME=      pycha-0.8.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    graphics python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=p/pycha/}
 
@@ -16,6 +16,8 @@ DEPENDS+=     ${PYPKGPREFIX}-six-[0-9]*:../.
 
 USE_LANGUAGES= #none
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        ${MV} ${DESTDIR}${PREFIX}/bin/chavier ${DESTDIR}${PREFIX}/bin/chavier-${PYVERSSUFFIX} || ${TRUE}
 

Index: pkgsrc/graphics/py-pygal/Makefile
diff -u pkgsrc/graphics/py-pygal/Makefile:1.13 pkgsrc/graphics/py-pygal/Makefile:1.14
--- pkgsrc/graphics/py-pygal/Makefile:1.13      Tue Jan  4 20:54:06 2022
+++ pkgsrc/graphics/py-pygal/Makefile   Wed Jan  5 15:41:11 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2022/01/04 20:54:06 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2022/01/05 15:41:11 wiz Exp $
 
 DISTNAME=      pygal-2.4.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    graphics python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=p/pygal/}
 
@@ -23,6 +23,8 @@ USE_LANGUAGES=        # none
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27 # py-pyquery
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && ${MV} pygal_gen.py pygal_gen${PYVERSSUFFIX}.py || ${TRUE}
 

Index: pkgsrc/graphics/py-qrcode/Makefile
diff -u pkgsrc/graphics/py-qrcode/Makefile:1.16 pkgsrc/graphics/py-qrcode/Makefile:1.17
--- pkgsrc/graphics/py-qrcode/Makefile:1.16     Tue Jan  4 20:54:07 2022
+++ pkgsrc/graphics/py-qrcode/Makefile  Wed Jan  5 15:41:12 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2022/01/04 20:54:07 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2022/01/05 15:41:12 wiz Exp $
 
 DISTNAME=      qrcode-6.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    graphics python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=q/qrcode/}
 
@@ -16,6 +16,8 @@ DEPENDS+=     ${PYPKGPREFIX}-six-[0-9]*:../.
 
 PYTHON_VERSIONED_DEPENDENCIES= Pillow
 
+USE_PKG_RESOURCES=     yes
+
 USE_LANGUAGES= # none
 
 REPLACE_PYTHON+=       qrcode/console_scripts.py

Index: pkgsrc/graphics/py-scour/Makefile
diff -u pkgsrc/graphics/py-scour/Makefile:1.2 pkgsrc/graphics/py-scour/Makefile:1.3
--- pkgsrc/graphics/py-scour/Makefile:1.2       Tue Jan  4 20:54:07 2022
+++ pkgsrc/graphics/py-scour/Makefile   Wed Jan  5 15:41:12 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2022/01/04 20:54:07 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2022/01/05 15:41:12 wiz Exp $
 
 DISTNAME=      scour-0.38.2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    graphics python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=s/scour/}
 
@@ -13,6 +13,8 @@ LICENSE=      apache-2.0
 
 DEPENDS+=      ${PYPKGPREFIX}-six>=1.15.0:../../lang/py-six
 
+USE_PKG_RESOURCES=     yes
+
 USE_LANGUAGES= # none
 
 .include "../../lang/python/egg.mk"

Index: pkgsrc/graphics/py-seqdiag/Makefile
diff -u pkgsrc/graphics/py-seqdiag/Makefile:1.20 pkgsrc/graphics/py-seqdiag/Makefile:1.21
--- pkgsrc/graphics/py-seqdiag/Makefile:1.20    Tue Jan  4 20:54:07 2022
+++ pkgsrc/graphics/py-seqdiag/Makefile Wed Jan  5 15:41:12 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2022/01/04 20:54:07 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2022/01/05 15:41:12 wiz Exp $
 
 DISTNAME=      seqdiag-2.0.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    graphics python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=s/seqdiag/}
 
@@ -19,6 +19,8 @@ INSTALLATION_DIRS+=   ${PKGMANDIR}/man1
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
        ${MV} seqdiag seqdiag-${PYVERSSUFFIX} || ${TRUE}

Index: pkgsrc/graphics/py-tifffile/Makefile
diff -u pkgsrc/graphics/py-tifffile/Makefile:1.11 pkgsrc/graphics/py-tifffile/Makefile:1.12
--- pkgsrc/graphics/py-tifffile/Makefile:1.11   Tue Jan  4 20:54:07 2022
+++ pkgsrc/graphics/py-tifffile/Makefile        Wed Jan  5 15:41:12 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2022/01/04 20:54:07 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2022/01/05 15:41:12 wiz Exp $
 
 DISTNAME=      tifffile-2021.11.2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    graphics python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=t/tifffile/}
 
@@ -15,6 +15,8 @@ USE_LANGUAGES=        # none
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
 .for bin in lsm2bin tiff2fsspec tiffcomment tifffile
        cd ${DESTDIR}${PREFIX}/bin && \

Index: pkgsrc/lang/py-cmake-language-server/Makefile
diff -u pkgsrc/lang/py-cmake-language-server/Makefile:1.4 pkgsrc/lang/py-cmake-language-server/Makefile:1.5
--- pkgsrc/lang/py-cmake-language-server/Makefile:1.4   Tue Jan  4 20:54:08 2022
+++ pkgsrc/lang/py-cmake-language-server/Makefile       Wed Jan  5 15:41:12 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2022/01/04 20:54:08 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2022/01/05 15:41:12 wiz Exp $
 
 DISTNAME=      cmake-language-server-0.1.2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    lang python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=c/cmake-language-server/}
 
@@ -16,6 +16,8 @@ DEPENDS+=     ${PYPKGPREFIX}-pyparsing-[0-9]
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27 # py-pygls
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && ${MV} cmake-format cmake-format-${PYVERSSUFFIX}
        cd ${DESTDIR}${PREFIX}/bin && ${MV} cmake-language-server cmake-language-server-${PYVERSSUFFIX}

Index: pkgsrc/lang/py-lsp-server/Makefile
diff -u pkgsrc/lang/py-lsp-server/Makefile:1.4 pkgsrc/lang/py-lsp-server/Makefile:1.5
--- pkgsrc/lang/py-lsp-server/Makefile:1.4      Tue Jan  4 20:54:09 2022
+++ pkgsrc/lang/py-lsp-server/Makefile  Wed Jan  5 15:41:12 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2022/01/04 20:54:09 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2022/01/05 15:41:12 wiz Exp $
 
 DISTNAME=      python-lsp-server-1.2.4
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/python-//}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    lang python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=p/python-lsp-server/}
 
@@ -35,6 +35,8 @@ TEST_DEPENDS+=        ${PYPKGPREFIX}-flaky-[0-9
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27 # py-pylint, py-parso via py-jedi
 
+USE_PKG_RESOURCES=     yes
+
 SUBST_CLASSES+=                pylint
 SUBST_FILES.pylint+=   test/plugins/test_pylint_lint.py
 SUBST_STAGE.pylint=    pre-build

Index: pkgsrc/lang/py-mypy/Makefile
diff -u pkgsrc/lang/py-mypy/Makefile:1.25 pkgsrc/lang/py-mypy/Makefile:1.26
--- pkgsrc/lang/py-mypy/Makefile:1.25   Tue Jan  4 20:54:09 2022
+++ pkgsrc/lang/py-mypy/Makefile        Wed Jan  5 15:41:12 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2022/01/04 20:54:09 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2022/01/05 15:41:12 wiz Exp $
 
 DISTNAME=      mypy-0.930
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    lang python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=m/mypy/}
 
@@ -19,6 +19,8 @@ USE_LANGUAGES=        # none
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
+USE_PKG_RESOURCES=     yes
+
 .include "../../lang/python/pyversion.mk"
 .if ${_PYTHON_VERSION} < 38
 DEPENDS+=      ${PYPKGPREFIX}-typed-ast>=1.4.0:../../devel/py-typed-ast

Index: pkgsrc/lang/py-paver/Makefile
diff -u pkgsrc/lang/py-paver/Makefile:1.3 pkgsrc/lang/py-paver/Makefile:1.4
--- pkgsrc/lang/py-paver/Makefile:1.3   Tue Jan  4 20:54:09 2022
+++ pkgsrc/lang/py-paver/Makefile       Wed Jan  5 15:41:13 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2022/01/04 20:54:09 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2022/01/05 15:41:13 wiz Exp $
 
 DISTNAME=      Paver-1.3.4
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:tl}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    lang python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=P/Paver/}
 
@@ -19,6 +19,8 @@ TEST_DEPENDS+=        ${PYPKGPREFIX}-virtualenv
 
 USE_LANGUAGES= # none
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && ${MV} paver paver-${PYVERSSUFFIX} || ${TRUE}
 

Index: pkgsrc/lang/py-python-language-server/Makefile
diff -u pkgsrc/lang/py-python-language-server/Makefile:1.5 pkgsrc/lang/py-python-language-server/Makefile:1.6
--- pkgsrc/lang/py-python-language-server/Makefile:1.5  Tue Jan  4 20:54:10 2022
+++ pkgsrc/lang/py-python-language-server/Makefile      Wed Jan  5 15:41:13 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2022/01/04 20:54:10 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2022/01/05 15:41:13 wiz Exp $
 
 DISTNAME=      python-language-server-0.36.2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    lang python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=p/python-language-server/}
 
@@ -29,6 +29,8 @@ TEST_DEPENDS+=        ${PYPKGPREFIX}-mock-[0-9]
 
 PYTHON_VERSIONED_DEPENDENCIES= test:test
 
+USE_PKG_RESOURCES=     yes
+
 PYTHON_VERSIONS_INCOMPATIBLE=  27 # py-pylint, py-parso via py-jedi
 
 post-install:

Index: pkgsrc/lang/py-uncompyle6/Makefile
diff -u pkgsrc/lang/py-uncompyle6/Makefile:1.29 pkgsrc/lang/py-uncompyle6/Makefile:1.30
--- pkgsrc/lang/py-uncompyle6/Makefile:1.29     Tue Jan  4 20:54:10 2022
+++ pkgsrc/lang/py-uncompyle6/Makefile  Wed Jan  5 15:41:13 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.29 2022/01/04 20:54:10 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2022/01/05 15:41:13 wiz Exp $
 
 DISTNAME=      uncompyle6-3.8.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    lang python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=u/uncompyle6/}
 
@@ -19,6 +19,8 @@ USE_LANGUAGES=        # none
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27 # py-xdis
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
        ${MV} pydisassemble pydisassemble-${PYVERSSUFFIX} && \

Index: pkgsrc/lang/python/egg.mk
diff -u pkgsrc/lang/python/egg.mk:1.32 pkgsrc/lang/python/egg.mk:1.33
--- pkgsrc/lang/python/egg.mk:1.32      Tue Jan  4 20:50:41 2022
+++ pkgsrc/lang/python/egg.mk   Wed Jan  5 15:41:32 2022
@@ -1,4 +1,4 @@
-# $NetBSD: egg.mk,v 1.32 2022/01/04 20:50:41 wiz Exp $
+# $NetBSD: egg.mk,v 1.33 2022/01/05 15:41:32 wiz Exp $
 #
 # Common logic to handle Python Eggs
 #
@@ -37,6 +37,8 @@ PRINT_PLIST_AWK+=     { gsub(/${PYVERSSUFFIX
 
 _PYSETUPTOOLSINSTALLARGS=      --single-version-externally-managed
 
+USE_PKG_RESOURCES?=    no
+
 # py-setuptools depends on a couple py-* packages that need to be installed
 # beforehand. Of course, those can not be built and installed using py-setuptools
 # itself; so use the setuptools version included with python itself for installing
@@ -51,9 +53,14 @@ ensurepip:
        ${SETENV} ${MAKE_ENV} ${PYTHONBIN} -m ensurepip --user
 .else
 .  if "${PYVERSSUFFIX}" == "2.7"
-TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools44
+SETUPTOOLS_PATH=../../devel/py-setuptools44
+.  else
+SETUPTOOLS_PATH=../../devel/py-setuptools
+.  endif
+.  if "${USE_PKG_RESOURCES}" == "yes"
+DEPENDS+=      ${PYPKGPREFIX}-setuptools-[0-9]*:${SETUPTOOLS_PATH}
 .  else
-TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
+TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:${SETUPTOOLS_PATH}
 .  endif
 .endif
 

Index: pkgsrc/mail/feed2exec/Makefile
diff -u pkgsrc/mail/feed2exec/Makefile:1.11 pkgsrc/mail/feed2exec/Makefile:1.12
--- pkgsrc/mail/feed2exec/Makefile:1.11 Tue Jan  4 20:54:10 2022
+++ pkgsrc/mail/feed2exec/Makefile      Wed Jan  5 15:41:13 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2022/01/04 20:54:10 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2022/01/05 15:41:13 wiz Exp $
 
 DISTNAME=              feed2exec-0.17.1
-PKGREVISION=           1
+PKGREVISION=           2
 CATEGORIES=            mail python
 MASTER_SITES=          https://gitlab.com/anarcat/feed2exec/-/archive/${PKGVERSION_NOREV}/
 
@@ -10,8 +10,6 @@ HOMEPAGE=             https://feed2exec.readthedocs
 COMMENT=               The programmable feed reader
 LICENSE=               gnu-agpl-v3
 
-PYTHON_VERSIONS_INCOMPATIBLE=  27
-
 BUILD_DEPENDS+=                ${PYPKGPREFIX}-tox-[0-9]*:../../devel/py-tox
 BUILD_DEPENDS+=                ${PYPKGPREFIX}-flakes-[0-9]*:../../devel/py-flakes
 BUILD_DEPENDS+=                ${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
@@ -35,6 +33,10 @@ TEST_DEPENDS+=               ${PYPKGPREFIX}-test-runn
 
 USE_LANGUAGES=         # none
 
+PYTHON_VERSIONS_INCOMPATIBLE=  27
+
+USE_PKG_RESOURCES=     yes
+
 SUBST_CLASSES+=                version
 SUBST_STAGE.version=   pre-configure
 SUBST_FILES.version=   feed2exec/__init__.py

Index: pkgsrc/mail/py-aiosmtpd/Makefile
diff -u pkgsrc/mail/py-aiosmtpd/Makefile:1.8 pkgsrc/mail/py-aiosmtpd/Makefile:1.9
--- pkgsrc/mail/py-aiosmtpd/Makefile:1.8        Tue Jan  4 20:54:10 2022
+++ pkgsrc/mail/py-aiosmtpd/Makefile    Wed Jan  5 15:41:13 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2022/01/04 20:54:10 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2022/01/05 15:41:13 wiz Exp $
 
 DISTNAME=      aiosmtpd-1.4.2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    mail python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=a/aiosmtpd/}
 
@@ -18,6 +18,8 @@ USE_LANGUAGES=        # none
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
+USE_PKG_RESOURCES=     yes
+
 .include "../../lang/python/pyversion.mk"
 .if ${_PYTHON_VERSION} < 38
 DEPENDS+=      ${PYPKGPREFIX}-typing-extensions-[0-9]*:../../devel/py-typing-extensions

Index: pkgsrc/mail/py-email_validator/Makefile
diff -u pkgsrc/mail/py-email_validator/Makefile:1.6 pkgsrc/mail/py-email_validator/Makefile:1.7
--- pkgsrc/mail/py-email_validator/Makefile:1.6 Tue Jan  4 20:54:11 2022
+++ pkgsrc/mail/py-email_validator/Makefile     Wed Jan  5 15:41:13 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2022/01/04 20:54:11 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2022/01/05 15:41:13 wiz Exp $
 
 DISTNAME=      email_validator-1.1.3
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    mail python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=e/email-validator/}
 
@@ -16,6 +16,8 @@ DEPENDS+=     ${PYPKGPREFIX}-idna>=2.0.0:../
 
 USE_LANGUAGES= # none
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
        ${MV} email_validator email_validator-${PYVERSSUFFIX} || ${TRUE}

Index: pkgsrc/math/py-Theano/Makefile
diff -u pkgsrc/math/py-Theano/Makefile:1.9 pkgsrc/math/py-Theano/Makefile:1.10
--- pkgsrc/math/py-Theano/Makefile:1.9  Tue Jan  4 20:54:12 2022
+++ pkgsrc/math/py-Theano/Makefile      Wed Jan  5 15:41:13 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2022/01/04 20:54:12 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2022/01/05 15:41:13 wiz Exp $
 
 DISTNAME=      Theano-1.0.4
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    math python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=T/Theano/}
 
@@ -28,6 +28,8 @@ REPLACE_FILES.bash=   theano/misc/check_bl
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27 # py-scipy
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
        ${MV} theano-cache theano-cache-${PYVERSSUFFIX} && \

Index: pkgsrc/math/py-asdf/Makefile
diff -u pkgsrc/math/py-asdf/Makefile:1.6 pkgsrc/math/py-asdf/Makefile:1.7
--- pkgsrc/math/py-asdf/Makefile:1.6    Tue Jan  4 20:54:12 2022
+++ pkgsrc/math/py-asdf/Makefile        Wed Jan  5 15:41:13 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2022/01/04 20:54:12 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2022/01/05 15:41:13 wiz Exp $
 
 DISTNAME=      asdf-2.8.3
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    math python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=a/asdf/}
 
@@ -24,6 +24,8 @@ USE_LANGUAGES=        # none
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27 # py-numpy
 
+USE_PKG_RESOURCES=     yes
+
 .include "../../lang/python/pyversion.mk"
 .if ${_PYTHON_VERSION} < 39
 DEPENDS+=      ${PYPKGPREFIX}-importlib-resources>=3:../../devel/py-importlib-resources

Index: pkgsrc/math/py-astropy/Makefile
diff -u pkgsrc/math/py-astropy/Makefile:1.3 pkgsrc/math/py-astropy/Makefile:1.4
--- pkgsrc/math/py-astropy/Makefile:1.3 Tue Jan  4 20:54:13 2022
+++ pkgsrc/math/py-astropy/Makefile     Wed Jan  5 15:41:13 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2022/01/04 20:54:13 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2022/01/05 15:41:13 wiz Exp $
 
 DISTNAME=      astropy-4.2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    math python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=a/astropy/}
 
@@ -11,8 +11,6 @@ HOMEPAGE=     https://www.astropy.org/
 COMMENT=       Python module for astronomical calculations and data analysis
 LICENSE=       modified-bsd
 
-PYTHON_VERSIONS_INCOMPATIBLE=  27
-
 DEPENDS+=      libxml2>=2.9.10:../../textproc/libxml2
 DEPENDS+=      ${PYPKGPREFIX}-numpy>=1.17.0:../../math/py-numpy
 DEPENDS+=      ${PYPKGPREFIX}-scipy>=1.1:../../math/py-scipy
@@ -33,6 +31,10 @@ DEPENDS+=    ${PYPKGPREFIX}-extension-helpe
 DEPENDS+=      ${PYPKGPREFIX}-jplephem>=2.15:../../math/py-jplephem
 DEPENDS+=      ${PYPKGPREFIX}-pyerfa>=1.7.1.1:../../math/py-pyerfa
 
+PYTHON_VERSIONS_INCOMPATIBLE=  27
+
+USE_PKG_RESOURCES=     yes
+
 .include "../../lang/python/egg.mk"
 .include "../../math/py-numpy/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/math/py-netCDF4/Makefile
diff -u pkgsrc/math/py-netCDF4/Makefile:1.18 pkgsrc/math/py-netCDF4/Makefile:1.19
--- pkgsrc/math/py-netCDF4/Makefile:1.18        Tue Jan  4 20:54:14 2022
+++ pkgsrc/math/py-netCDF4/Makefile     Wed Jan  5 15:41:14 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2022/01/04 20:54:14 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2022/01/05 15:41:14 wiz Exp $
 
 DISTNAME=      netCDF4-1.5.8
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    math python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=n/netCDF4/}
 
@@ -23,6 +23,8 @@ SUBST_MESSAGE.paths=  Fixing header searc
 
 PYTHON_VERSIONS_INCOMPATIBLE+= 27 # py-numpy
 
+USE_PKG_RESOURCES=     yes
+
 do-test:
        cd ${WRKSRC}/test && ${SETENV} ${TEST_ENV} ${PYTHONBIN} run_all.py
 

Index: pkgsrc/math/py-numpy/Makefile
diff -u pkgsrc/math/py-numpy/Makefile:1.88 pkgsrc/math/py-numpy/Makefile:1.89
--- pkgsrc/math/py-numpy/Makefile:1.88  Tue Jan  4 20:54:15 2022
+++ pkgsrc/math/py-numpy/Makefile       Wed Jan  5 15:41:14 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.88 2022/01/04 20:54:15 wiz Exp $
+# $NetBSD: Makefile,v 1.89 2022/01/05 15:41:14 wiz Exp $
 
 DISTNAME=      numpy-1.21.5
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    math python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=n/numpy/}
 EXTRACT_SUFX=  .zip
@@ -25,6 +25,8 @@ REPLACE_PYTHON+=      *.py */*.py */*/*.py */
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
+USE_PKG_RESOURCES=     yes
+
 # XXX Avoid picking up other compilers when installed
 .include "../../mk/compiler.mk"
 

Index: pkgsrc/math/py-pythran/Makefile
diff -u pkgsrc/math/py-pythran/Makefile:1.4 pkgsrc/math/py-pythran/Makefile:1.5
--- pkgsrc/math/py-pythran/Makefile:1.4 Tue Jan  4 20:54:16 2022
+++ pkgsrc/math/py-pythran/Makefile     Wed Jan  5 15:41:14 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2022/01/04 20:54:16 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2022/01/05 15:41:14 wiz Exp $
 
 DISTNAME=      pythran-0.10.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    math python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=p/pythran/}
 
@@ -20,6 +20,8 @@ USE_LANGUAGES=        # none
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
 .for bin in pythran pythran-config
        cd ${DESTDIR}${PREFIX}/bin && \

Index: pkgsrc/math/py-roman/Makefile
diff -u pkgsrc/math/py-roman/Makefile:1.13 pkgsrc/math/py-roman/Makefile:1.14
--- pkgsrc/math/py-roman/Makefile:1.13  Tue Jan  4 20:54:16 2022
+++ pkgsrc/math/py-roman/Makefile       Wed Jan  5 15:41:14 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2022/01/04 20:54:16 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2022/01/05 15:41:14 wiz Exp $
 
 DISTNAME=      roman-3.3
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    math python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=r/roman/}
 
@@ -15,6 +15,8 @@ CONFLICTS+=   ${PYPKGPREFIX}-docutils<=0.7
 
 USE_LANGUAGES= # none
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
        ${MV} roman roman-${PYVERSSUFFIX} || ${TRUE}

Index: pkgsrc/math/py-scikit-image/Makefile
diff -u pkgsrc/math/py-scikit-image/Makefile:1.12 pkgsrc/math/py-scikit-image/Makefile:1.13
--- pkgsrc/math/py-scikit-image/Makefile:1.12   Tue Jan  4 20:54:16 2022
+++ pkgsrc/math/py-scikit-image/Makefile        Wed Jan  5 15:41:14 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2022/01/04 20:54:16 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2022/01/05 15:41:14 wiz Exp $
 
 DISTNAME=      scikit-image-0.18.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    graphics python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=s/scikit-image/}
 
@@ -26,6 +26,8 @@ USE_LANGUAGES=        c c++
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27 # py-tifffile
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
        ${MV} skivi skivi-${PYVERSSUFFIX} || ${TRUE}

Index: pkgsrc/math/py-smt/Makefile
diff -u pkgsrc/math/py-smt/Makefile:1.2 pkgsrc/math/py-smt/Makefile:1.3
--- pkgsrc/math/py-smt/Makefile:1.2     Tue Jan  4 20:54:17 2022
+++ pkgsrc/math/py-smt/Makefile Wed Jan  5 15:41:14 2022
@@ -1,9 +1,9 @@
-#      $NetBSD: Makefile,v 1.2 2022/01/04 20:54:17 wiz Exp $
+#      $NetBSD: Makefile,v 1.3 2022/01/05 15:41:14 wiz Exp $
 
 VERSION=       0.9.0
 DISTNAME=      PySMT-${VERSION}
 PKGNAME=       ${PYPKGPREFIX}-smt-${VERSION}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    math
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=pysmt/}
 GITHUB_PROJECT=        pysmt
@@ -14,13 +14,15 @@ HOMEPAGE=   http://www.pysmt.org/
 COMMENT=       Library for SMT formula manipulation and solving
 LICENSE=       apache-2.0
 
-PYTHON_VERSIONS_INCOMPATIBLE=  27
-
 DEPENDS+=      ${PYPKGPREFIX}-six>=0:../../lang/py-six
 
 TEST_DEPENDS+= ${PYPKGPREFIX}-nose>=0:../../devel/py-nose
 TEST_DEPENDS+= ${PYPKGPREFIX}-z3>=0:../../math/py-z3
 
+PYTHON_VERSIONS_INCOMPATIBLE=  27
+
+USE_PKG_RESOURCES=     yes
+
 SUBST_CLASSES+=                python3
 SUBST_STAGE.python3=   pre-test
 SUBST_MESSAGE.python3= Fixing python3 interpreter

Index: pkgsrc/math/py-sympy/Makefile
diff -u pkgsrc/math/py-sympy/Makefile:1.31 pkgsrc/math/py-sympy/Makefile:1.32
--- pkgsrc/math/py-sympy/Makefile:1.31  Tue Jan  4 20:54:17 2022
+++ pkgsrc/math/py-sympy/Makefile       Wed Jan  5 15:41:14 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.31 2022/01/04 20:54:17 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2022/01/05 15:41:14 wiz Exp $
 
 DISTNAME=      sympy-1.9
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    math python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=s/sympy/}
 
@@ -19,6 +19,8 @@ REPLACE_PYTHON+=      sympy/utilities/tests/d
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
+USE_PKG_RESOURCES=     yes
+
 SUBST_CLASSES+=                manpath
 SUBST_SED.manpath=     -e 's,share/man,${PKGMANDIR},'
 SUBST_FILES.manpath+=  setup.py

Index: pkgsrc/math/py-tables/Makefile
diff -u pkgsrc/math/py-tables/Makefile:1.11 pkgsrc/math/py-tables/Makefile:1.12
--- pkgsrc/math/py-tables/Makefile:1.11 Wed Jan  5 07:05:39 2022
+++ pkgsrc/math/py-tables/Makefile      Wed Jan  5 15:41:14 2022
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2022/01/05 07:05:39 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2022/01/05 15:41:14 wiz Exp $
 
 DISTNAME=      tables-3.7.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
+PKGREVISION=   1
 CATEGORIES=    math python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=t/tables/}
 
@@ -22,6 +23,8 @@ USE_LANGUAGES=        c c++
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
        ${MV} pt2to3 pt2to3-${PYVERSSUFFIX} && \

Index: pkgsrc/math/py-tensorboard/Makefile
diff -u pkgsrc/math/py-tensorboard/Makefile:1.5 pkgsrc/math/py-tensorboard/Makefile:1.6
--- pkgsrc/math/py-tensorboard/Makefile:1.5     Tue Jan  4 20:54:17 2022
+++ pkgsrc/math/py-tensorboard/Makefile Wed Jan  5 15:41:15 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2022/01/04 20:54:17 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2022/01/05 15:41:15 wiz Exp $
 
 DISTNAME=      tensorboard-${GITHUB_TAG:S/-//}
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    math python
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=tensorflow/}
 GITHUB_PROJECT=        tensorboard
@@ -25,6 +25,8 @@ USE_LANGUAGES=        # none
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27 # py-protobuf, py-numpy
 
+USE_PKG_RESOURCES=     yes
+
 post-extract:
 .for f in MANIFEST.in setup.cfg setup.py
        ${CP} ${WRKSRC}/tensorboard/pip_package/${f} ${WRKSRC}

Index: pkgsrc/math/py-z3solver/Makefile
diff -u pkgsrc/math/py-z3solver/Makefile:1.5 pkgsrc/math/py-z3solver/Makefile:1.6
--- pkgsrc/math/py-z3solver/Makefile:1.5        Tue Jan  4 20:54:18 2022
+++ pkgsrc/math/py-z3solver/Makefile    Wed Jan  5 15:41:15 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2022/01/04 20:54:18 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2022/01/05 15:41:15 wiz Exp $
 
 DISTNAME=      z3-solver-4.8.9.0
 PKGNAME=       ${PYPKGPREFIX}-z3solver-4.8.9.0
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    math
 MASTER_SITES=  ${MASTER_SITE_PYPI:=z/z3-solver/}
 
@@ -13,6 +13,8 @@ LICENSE=      mit
 
 USE_LANGUAGES= c c++
 
+USE_PKG_RESOURCES=     yes
+
 CONFLICTS+=    z3-[0-9]*
 
 .include "../../lang/python/egg.mk"

Index: pkgsrc/misc/khard/Makefile
diff -u pkgsrc/misc/khard/Makefile:1.29 pkgsrc/misc/khard/Makefile:1.30
--- pkgsrc/misc/khard/Makefile:1.29     Tue Jan  4 20:54:18 2022
+++ pkgsrc/misc/khard/Makefile  Wed Jan  5 15:41:15 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.29 2022/01/04 20:54:18 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2022/01/05 15:41:15 wiz Exp $
 
 DISTNAME=      khard-0.17.0
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    misc net python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=k/khard/}
 
@@ -22,6 +22,8 @@ TOOL_DEPENDS+=        ${PYPKGPREFIX}-sphinx-aut
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27 # does not support python-2.x any longer
 
+USE_PKG_RESOURCES=     yes
+
 INSTALLATION_DIRS=     share/examples/khard ${PKGMANDIR}/man1
 REPLACE_PYTHON+=       */*.py
 

Index: pkgsrc/misc/py-asciinema/Makefile
diff -u pkgsrc/misc/py-asciinema/Makefile:1.5 pkgsrc/misc/py-asciinema/Makefile:1.6
--- pkgsrc/misc/py-asciinema/Makefile:1.5       Tue Jan  4 20:54:18 2022
+++ pkgsrc/misc/py-asciinema/Makefile   Wed Jan  5 15:41:15 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2022/01/04 20:54:18 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2022/01/05 15:41:15 wiz Exp $
 
 DISTNAME=      asciinema-2.1.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    misc multimedia python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=a/asciinema/}
 
@@ -15,6 +15,8 @@ USE_LANGUAGES=        # none
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
+USE_PKG_RESOURCES=     yes
+
 SUBST_CLASSES+=                fix-path               
 SUBST_STAGE.fix-path=  pre-configure               
 SUBST_MESSAGE.fix-path=        Fixing paths. 

Index: pkgsrc/misc/py-tqdm/Makefile
diff -u pkgsrc/misc/py-tqdm/Makefile:1.35 pkgsrc/misc/py-tqdm/Makefile:1.36
--- pkgsrc/misc/py-tqdm/Makefile:1.35   Tue Jan  4 20:54:19 2022
+++ pkgsrc/misc/py-tqdm/Makefile        Wed Jan  5 15:41:15 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.35 2022/01/04 20:54:19 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2022/01/05 15:41:15 wiz Exp $
 
 DISTNAME=      tqdm-4.62.3
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    misc python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=t/tqdm/}
 
@@ -24,6 +24,8 @@ PYSETUPTESTTARGET=    pytest
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
+USE_PKG_RESOURCES=     yes
+
 INSTALLATION_DIRS+=    ${PKGMANDIR}/man1
 
 CHECK_INTERPRETER_SKIP+=       ${PYSITELIB}/tqdm/completion.sh

Index: pkgsrc/multimedia/streamlink/Makefile
diff -u pkgsrc/multimedia/streamlink/Makefile:1.29 pkgsrc/multimedia/streamlink/Makefile:1.30
--- pkgsrc/multimedia/streamlink/Makefile:1.29  Tue Jan  4 20:54:23 2022
+++ pkgsrc/multimedia/streamlink/Makefile       Wed Jan  5 15:41:15 2022
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.29 2022/01/04 20:54:23 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2022/01/05 15:41:15 wiz Exp $
 
 DISTNAME=      streamlink-2.3.0
 CATEGORIES=    multimedia
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=streamlink/}
 GITHUB_TAG=    ${PKGVERSION_NOREV}
-PKGREVISION=   2
+PKGREVISION=   3
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://streamlink.github.io/
@@ -13,6 +13,8 @@ LICENSE=      2-clause-bsd
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27 # py-iso3166
 
+USE_PKG_RESOURCES=     yes
+
 .include "../../lang/python/egg.mk"
 
 DEPENDS+=      ${PYPKGPREFIX}-cryptodome>=3.4.3:../../security/py-cryptodome

Index: pkgsrc/net/bandcamp-dl/Makefile
diff -u pkgsrc/net/bandcamp-dl/Makefile:1.5 pkgsrc/net/bandcamp-dl/Makefile:1.6
--- pkgsrc/net/bandcamp-dl/Makefile:1.5 Tue Jan  4 20:54:23 2022
+++ pkgsrc/net/bandcamp-dl/Makefile     Wed Jan  5 15:41:15 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2022/01/04 20:54:23 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2022/01/05 15:41:15 wiz Exp $
 
 DISTNAME=      bandcamp-downloader-0.0.10
 PKGNAME=       ${DISTNAME:S/-downloader/-dl/1}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    net
 MASTER_SITES=  ${MASTER_SITE_PYPI:=b/bandcamp-downloader/}
 
@@ -22,5 +22,7 @@ DEPENDS+=     ${PYPKGPREFIX}-chardet-[0-9]*:
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27 # py-mutagen
 
+USE_PKG_RESOURCES=     yes
+
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/coherence/Makefile
diff -u pkgsrc/net/coherence/Makefile:1.22 pkgsrc/net/coherence/Makefile:1.23
--- pkgsrc/net/coherence/Makefile:1.22  Tue Jan  4 20:54:24 2022
+++ pkgsrc/net/coherence/Makefile       Wed Jan  5 15:41:15 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2022/01/04 20:54:24 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2022/01/05 15:41:15 wiz Exp $
 
 DISTNAME=      Coherence-0.6.6.2
 PKGNAME=       coherence-0.6.6.2
-PKGREVISION=   5
+PKGREVISION=   6
 CATEGORIES=    net
 #MASTER_SITES= http://coherence.beebits.net/download/
 
@@ -16,5 +16,7 @@ DEPENDS+=     ${PYPKGPREFIX}-twisted-[0-9]*:
 
 PYTHON_VERSIONS_ACCEPTED=      27 # as of 0.6.6.2
 
+USE_PKG_RESOURCES=     yes
+
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/coursera-dl/Makefile
diff -u pkgsrc/net/coursera-dl/Makefile:1.5 pkgsrc/net/coursera-dl/Makefile:1.6
--- pkgsrc/net/coursera-dl/Makefile:1.5 Tue Jan  4 20:54:24 2022
+++ pkgsrc/net/coursera-dl/Makefile     Wed Jan  5 15:41:15 2022
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2022/01/04 20:54:24 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2022/01/05 15:41:15 wiz Exp $
 
 DISTNAME=      coursera-dl-0.8.0
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=coursera-dl/}
 GITHUB_TAG=    0.8.0
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    net python
 
 MAINTAINER=    joerg%NetBSD.org@localhost
@@ -22,6 +22,8 @@ DEPENDS+=     ${PYPKGPREFIX}-keyring>=4.0:..
 
 PYTHON_SELF_CONFLICT=  yes
 
+USE_PKG_RESOURCES=     yes
+
 PYTHON_VERSIONS_INCOMPATIBLE=  27      # py-keyring
 
 .include "../../lang/python/egg.mk"

Index: pkgsrc/net/gallery-dl/Makefile
diff -u pkgsrc/net/gallery-dl/Makefile:1.83 pkgsrc/net/gallery-dl/Makefile:1.84
--- pkgsrc/net/gallery-dl/Makefile:1.83 Tue Jan  4 20:54:24 2022
+++ pkgsrc/net/gallery-dl/Makefile      Wed Jan  5 15:41:16 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.83 2022/01/04 20:54:24 wiz Exp $
+# $NetBSD: Makefile,v 1.84 2022/01/05 15:41:16 wiz Exp $
 
 DISTNAME=      gallery_dl-1.18.4
 PKGNAME=       ${DISTNAME:S/_/-/}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    net python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=g/gallery-dl/}
 
@@ -26,5 +26,7 @@ USE_LANGUAGES=                        # none
 # Only for Python 3
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
+USE_PKG_RESOURCES=     yes
+
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/py-celery/Makefile
diff -u pkgsrc/net/py-celery/Makefile:1.21 pkgsrc/net/py-celery/Makefile:1.22
--- pkgsrc/net/py-celery/Makefile:1.21  Tue Jan  4 20:54:26 2022
+++ pkgsrc/net/py-celery/Makefile       Wed Jan  5 15:41:16 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2022/01/04 20:54:26 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2022/01/05 15:41:16 wiz Exp $
 
 DISTNAME=      celery-5.1.2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    net python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=c/celery/}
 
@@ -26,6 +26,8 @@ USE_LANGUAGES=        # none
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
        ${MV} celery celery-${PYVERSSUFFIX} || ${TRUE}

Index: pkgsrc/net/py-cymruwhois/Makefile
diff -u pkgsrc/net/py-cymruwhois/Makefile:1.6 pkgsrc/net/py-cymruwhois/Makefile:1.7
--- pkgsrc/net/py-cymruwhois/Makefile:1.6       Tue Jan  4 20:54:26 2022
+++ pkgsrc/net/py-cymruwhois/Makefile   Wed Jan  5 15:41:16 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2022/01/04 20:54:26 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2022/01/05 15:41:16 wiz Exp $
 
 DISTNAME=      cymruwhois-1.6
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/python-//}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    net python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=c/cymruwhois/}
 
@@ -15,6 +15,8 @@ TEST_DEPENDS+=        ${PYPKGPREFIX}-nose-[0-9]
 
 USE_LANGUAGES= # none
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && ${MV} cymruwhois cymruwhois${PYVERSSUFFIX} || ${TRUE}
 

Index: pkgsrc/net/py-foolscap/Makefile
diff -u pkgsrc/net/py-foolscap/Makefile:1.37 pkgsrc/net/py-foolscap/Makefile:1.38
--- pkgsrc/net/py-foolscap/Makefile:1.37        Tue Jan  4 20:54:27 2022
+++ pkgsrc/net/py-foolscap/Makefile     Wed Jan  5 15:41:16 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.37 2022/01/04 20:54:27 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2022/01/05 15:41:16 wiz Exp $
 
 DISTNAME=      foolscap-21.7.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    net python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=f/foolscap/}
 
@@ -22,6 +22,8 @@ DEPENDS+=     ${PYPKGPREFIX}-twisted>=16.0:.
 
 USE_LANGUAGES= # none
 
+USE_PKG_RESOURCES=     yes
+
 INSTALLATION_DIRS+=    share/doc/py-foolscap
 
 post-install:

Index: pkgsrc/net/py-gandi.cli/Makefile
diff -u pkgsrc/net/py-gandi.cli/Makefile:1.5 pkgsrc/net/py-gandi.cli/Makefile:1.6
--- pkgsrc/net/py-gandi.cli/Makefile:1.5        Tue Jan  4 20:54:27 2022
+++ pkgsrc/net/py-gandi.cli/Makefile    Wed Jan  5 15:41:16 2022
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2022/01/04 20:54:27 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2022/01/05 15:41:16 wiz Exp $
 
 GITHUB_TAG=    1.5
 DISTNAME=      ${GITHUB_TAG}
 PKGNAME=       ${PYPKGPREFIX}-gandi.cli-${GITHUB_TAG}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    net
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=Gandi/}
 GITHUB_PROJECT=        gandi.cli
@@ -25,6 +25,8 @@ TEST_DEPENDS+=        ${PYPKGPREFIX}-tox>=0:../
 
 PYTHON_VERSIONED_DEPENDENCIES= test:test
 
+USE_PKG_RESOURCES=     yes
+
 .include "../../lang/python/egg.mk"
 .include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/py-gsutil/Makefile
diff -u pkgsrc/net/py-gsutil/Makefile:1.15 pkgsrc/net/py-gsutil/Makefile:1.16
--- pkgsrc/net/py-gsutil/Makefile:1.15  Tue Jan  4 20:54:28 2022
+++ pkgsrc/net/py-gsutil/Makefile       Wed Jan  5 15:41:16 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2022/01/04 20:54:28 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2022/01/05 15:41:16 wiz Exp $
 
 DISTNAME=      gsutil-4.68
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    net python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=g/gsutil/}
 
@@ -11,13 +11,6 @@ HOMEPAGE=    https://cloud.google.com/stora
 COMMENT=       Command line tool for interacting with cloud storage services
 LICENSE=       apache-2.0
 
-REPLACE_PYTHON+=       gslib/vendored/boto/boto/pyami/launch_ami.py
-REPLACE_PYTHON+=       gslib/vendored/boto/boto/services/bs.py
-REPLACE_PYTHON+=       gslib/vendored/boto/tests/fps/test.py
-REPLACE_PYTHON+=       gslib/vendored/boto/tests/test.py
-REPLACE_PYTHON+=       gslib/vendored/oauth2client/samples/django/django_user/manage.py
-REPLACE_PYTHON+=       gslib/vendored/oauth2client/samples/django/google_user/manage.py
-
 DEPENDS+=      ${PYPKGPREFIX}-OpenSSL>=0.13:../../security/py-OpenSSL
 DEPENDS+=      ${PYPKGPREFIX}-argcomplete>=1.9.4:../../devel/py-argcomplete
 DEPENDS+=      ${PYPKGPREFIX}-crcmod>=1.7:../../security/py-crcmod
@@ -33,6 +26,15 @@ DEPENDS+=    ${PYPKGPREFIX}-six>=1.12.0:../
 USE_LANGUAGES= # none
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
+USE_PKG_RESOURCES=     yes
+
+REPLACE_PYTHON+=       gslib/vendored/boto/boto/pyami/launch_ami.py
+REPLACE_PYTHON+=       gslib/vendored/boto/boto/services/bs.py
+REPLACE_PYTHON+=       gslib/vendored/boto/tests/fps/test.py
+REPLACE_PYTHON+=       gslib/vendored/boto/tests/test.py
+REPLACE_PYTHON+=       gslib/vendored/oauth2client/samples/django/django_user/manage.py
+REPLACE_PYTHON+=       gslib/vendored/oauth2client/samples/django/google_user/manage.py
+
 CHECK_INTERPRETER_SKIP+=       ${PYSITELIB}/gslib/vendored/oauth2client/scripts/build_docs.sh
 CHECK_INTERPRETER_SKIP+=       ${PYSITELIB}/gslib/vendored/oauth2client/scripts/install.sh
 CHECK_INTERPRETER_SKIP+=       ${PYSITELIB}/gslib/vendored/oauth2client/scripts/run.sh

Index: pkgsrc/net/py-impacket/Makefile
diff -u pkgsrc/net/py-impacket/Makefile:1.8 pkgsrc/net/py-impacket/Makefile:1.9
--- pkgsrc/net/py-impacket/Makefile:1.8 Tue Jan  4 20:54:28 2022
+++ pkgsrc/net/py-impacket/Makefile     Wed Jan  5 15:41:16 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2022/01/04 20:54:28 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2022/01/05 15:41:16 wiz Exp $
 
 DISTNAME=      impacket-0.9.24
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    net python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=i/impacket/}
 
@@ -22,6 +22,8 @@ DEPENDS+=     ${PYPKGPREFIX}-ldapdomaindump>
 DEPENDS+=      ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
 TEST_DEPENDS+= ${PYPKGPREFIX}-coverage-[0-9]*:../../devel/py-coverage
 
+USE_PKG_RESOURCES=     yes
+
 .include "../../lang/python/pyversion.mk"
 .if ${_PYTHON_VERSION} == 27
 DEPENDS+=      ${PYPKGPREFIX}-argparse-[0-9]*:../../devel/py-argparse

Index: pkgsrc/net/py-lexicon/Makefile
diff -u pkgsrc/net/py-lexicon/Makefile:1.66 pkgsrc/net/py-lexicon/Makefile:1.67
--- pkgsrc/net/py-lexicon/Makefile:1.66 Tue Jan  4 20:54:29 2022
+++ pkgsrc/net/py-lexicon/Makefile      Wed Jan  5 15:41:16 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.66 2022/01/04 20:54:29 wiz Exp $
+# $NetBSD: Makefile,v 1.67 2022/01/05 15:41:16 wiz Exp $
 
 DISTNAME=      dns-lexicon-3.8.5
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/dns-//}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    net python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=d/dns-lexicon/}
 
@@ -20,6 +20,8 @@ TEST_DEPENDS+=        ${PYPKGPREFIX}-test-xdist
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
+USE_PKG_RESOURCES=     yes
+
 MESSAGE_SUBST+=        PYPKGPREFIX=${PYPKGPREFIX}
 
 post-install:

Index: pkgsrc/net/py-magic-wormhole/Makefile
diff -u pkgsrc/net/py-magic-wormhole/Makefile:1.6 pkgsrc/net/py-magic-wormhole/Makefile:1.7
--- pkgsrc/net/py-magic-wormhole/Makefile:1.6   Tue Jan  4 20:54:29 2022
+++ pkgsrc/net/py-magic-wormhole/Makefile       Wed Jan  5 15:41:17 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2022/01/04 20:54:29 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2022/01/05 15:41:17 wiz Exp $
 
 DISTNAME=      magic-wormhole-0.12.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    net python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=m/magic-wormhole/}
 
@@ -11,8 +11,6 @@ HOMEPAGE=     https://github.com/warner/magi
 COMMENT=       Securely transfer data between computers
 LICENSE=       mit
 
-PYTHON_VERSIONS_INCOMPATIBLE=          27
-
 DEPENDS+=      ${PYPKGPREFIX}-attrs>=16.3.0:../../devel/py-attrs
 DEPENDS+=      ${PYPKGPREFIX}-autobahn>=0.14.1:../../www/py-autobahn
 DEPENDS+=      ${PYPKGPREFIX}-automat-[0-9]*:../../devel/py-automat
@@ -32,6 +30,10 @@ TEST_DEPENDS+=       ${PYPKGPREFIX}-magic-worm
 
 USE_LANGUAGES= # none
 
+PYTHON_VERSIONS_INCOMPATIBLE=          27
+
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
        ${MV} wormhole wormhole-${PYVERSSUFFIX} || ${TRUE}

Index: pkgsrc/net/py-moto/Makefile
diff -u pkgsrc/net/py-moto/Makefile:1.4 pkgsrc/net/py-moto/Makefile:1.5
--- pkgsrc/net/py-moto/Makefile:1.4     Tue Jan  4 20:54:29 2022
+++ pkgsrc/net/py-moto/Makefile Wed Jan  5 15:41:17 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2022/01/04 20:54:29 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2022/01/05 15:41:17 wiz Exp $
 
 DISTNAME=      moto-1.1.19
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    net devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=m/moto/}
 
@@ -35,6 +35,8 @@ TEST_DEPENDS+=        ${PYPKGPREFIX}-test-[0-9]
 TEST_DEPENDS+= ${PYPKGPREFIX}-sure>=1.2.24:../../devel/py-sure
 TEST_DEPENDS+= ${PYPKGPREFIX}-Tk-[0-9]*:../../x11/py-Tk
 
+USE_PKG_RESOURCES=     yes
+
 TEST_ENV+=     PYTHONPATH=${WRKSRC}/build/lib
 
 post-install:

Index: pkgsrc/net/py-netaddr/Makefile
diff -u pkgsrc/net/py-netaddr/Makefile:1.8 pkgsrc/net/py-netaddr/Makefile:1.9
--- pkgsrc/net/py-netaddr/Makefile:1.8  Tue Jan  4 20:54:29 2022
+++ pkgsrc/net/py-netaddr/Makefile      Wed Jan  5 15:41:17 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2022/01/04 20:54:29 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2022/01/05 15:41:17 wiz Exp $
 
 DISTNAME=      netaddr-0.8.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    net python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=n/netaddr/}
 
@@ -18,6 +18,8 @@ DEPENDS+=     ${PYPKGPREFIX}-importlib-resou
 
 USE_LANGUAGES= # none
 
+USE_PKG_RESOURCES=     yes
+
 REPLACE_PYTHON+=       netaddr/eui/ieee.py
 REPLACE_PYTHON+=       netaddr/ip/iana.py
 REPLACE_PYTHON+=       netaddr/tools/netaddr

Index: pkgsrc/net/py-onionbalance/Makefile
diff -u pkgsrc/net/py-onionbalance/Makefile:1.8 pkgsrc/net/py-onionbalance/Makefile:1.9
--- pkgsrc/net/py-onionbalance/Makefile:1.8     Tue Jan  4 20:54:30 2022
+++ pkgsrc/net/py-onionbalance/Makefile Wed Jan  5 15:41:17 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2022/01/04 20:54:30 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2022/01/05 15:41:17 wiz Exp $
 
 DISTNAME=      OnionBalance-0.2.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:tl}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    net python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=O/OnionBalance/}
 
@@ -31,6 +31,8 @@ PYSETUPTESTTARGET=    pytest
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 PYTHON_VERSIONED_DEPENDENCIES+=        setuptools
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
        ${MV} onionbalance onionbalance-${PYVERSSUFFIX} && \

Index: pkgsrc/net/py-ptt/Makefile
diff -u pkgsrc/net/py-ptt/Makefile:1.6 pkgsrc/net/py-ptt/Makefile:1.7
--- pkgsrc/net/py-ptt/Makefile:1.6      Tue Jan  4 20:54:30 2022
+++ pkgsrc/net/py-ptt/Makefile  Wed Jan  5 15:41:17 2022
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2022/01/04 20:54:30 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.7 2022/01/05 15:41:17 wiz Exp $
 
 PTTVERS=       1.9.0
 DISTNAME=      twitter-${PTTVERS}
 PKGNAME=       ${PYPKGPREFIX}-ptt-${PTTVERS}
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    net python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=t/twitter/}
 
@@ -15,6 +14,8 @@ LICENSE=      gnu-gpl-v2
 
 USE_LANGUAGES= # none
 
+USE_PKG_RESOURCES=     yes
+
 .include "../../net/py-irclib/buildlink3.mk"
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/py-pypiserver/Makefile
diff -u pkgsrc/net/py-pypiserver/Makefile:1.7 pkgsrc/net/py-pypiserver/Makefile:1.8
--- pkgsrc/net/py-pypiserver/Makefile:1.7       Tue Jan  4 20:54:31 2022
+++ pkgsrc/net/py-pypiserver/Makefile   Wed Jan  5 15:41:17 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2022/01/04 20:54:31 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2022/01/05 15:41:17 wiz Exp $
 
 DISTNAME=      pypiserver-1.4.2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    net python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=p/pypiserver/}
 EXTRACT_SUFX=  .zip
@@ -27,6 +27,8 @@ TEST_DEPENDS+=        ${PYPKGPREFIX}-mock-[0-9]
 
 PYTHON_VERSIONED_DEPENDENCIES= pip:test test:test
 
+USE_PKG_RESOURCES=     yes
+
 USE_LANGUAGES= # none
 
 post-install:

Index: pkgsrc/net/py-softlayer/Makefile
diff -u pkgsrc/net/py-softlayer/Makefile:1.14 pkgsrc/net/py-softlayer/Makefile:1.15
--- pkgsrc/net/py-softlayer/Makefile:1.14       Tue Jan  4 20:54:32 2022
+++ pkgsrc/net/py-softlayer/Makefile    Wed Jan  5 15:41:18 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2022/01/04 20:54:32 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2022/01/05 15:41:18 wiz Exp $
 
 DISTNAME=      SoftLayer-5.9.8
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/SoftLayer/softlayer/}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    net python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=S/SoftLayer/}
 
@@ -25,6 +25,8 @@ PYSETUPTESTTARGET=    pytest
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
        ${MV} sl sl-${PYVERSSUFFIX} && \

Index: pkgsrc/net/py-stone/Makefile
diff -u pkgsrc/net/py-stone/Makefile:1.4 pkgsrc/net/py-stone/Makefile:1.5
--- pkgsrc/net/py-stone/Makefile:1.4    Tue Jan  4 20:54:33 2022
+++ pkgsrc/net/py-stone/Makefile        Wed Jan  5 15:41:18 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2022/01/04 20:54:33 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2022/01/05 15:41:18 wiz Exp $
 
 DISTNAME=      stone-3.2.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    net python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=s/stone/}
 
@@ -17,5 +17,7 @@ BUILD_DEPENDS+=       ${PYPKGPREFIX}-test-runn
 
 USE_LANGUAGES= # none
 
+USE_PKG_RESOURCES=     yes
+
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/py-tldextract/Makefile
diff -u pkgsrc/net/py-tldextract/Makefile:1.12 pkgsrc/net/py-tldextract/Makefile:1.13
--- pkgsrc/net/py-tldextract/Makefile:1.12      Tue Jan  4 20:54:33 2022
+++ pkgsrc/net/py-tldextract/Makefile   Wed Jan  5 15:41:18 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2022/01/04 20:54:33 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2022/01/05 15:41:18 wiz Exp $
 
 DISTNAME=      tldextract-3.1.2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    net python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=t/tldextract/}
 
@@ -23,6 +23,8 @@ USE_LANGUAGES=        # none
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
        ${MV} tldextract tldextract-${PYVERSSUFFIX} || ${TRUE}

Index: pkgsrc/net/py-twine/Makefile
diff -u pkgsrc/net/py-twine/Makefile:1.5 pkgsrc/net/py-twine/Makefile:1.6
--- pkgsrc/net/py-twine/Makefile:1.5    Tue Jan  4 20:54:34 2022
+++ pkgsrc/net/py-twine/Makefile        Wed Jan  5 15:41:18 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2022/01/04 20:54:34 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2022/01/05 15:41:18 wiz Exp $
 
 DISTNAME=      twine-1.13.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    net python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=t/twine/}
 
@@ -18,9 +18,10 @@ DEPENDS+=    ${PYPKGPREFIX}-requests-toolbe
 DEPENDS+=      ${PYPKGPREFIX}-tqdm>=4.14:../../misc/py-tqdm
 
 PYTHON_VERSIONED_DEPENDENCIES+=        test:test
-PYTHON_VERSIONED_DEPENDENCIES+= setuptools
 PYTHON_VERSIONS_INCOMPATIBLE=  27 # py-tqdm
 
+USE_PKG_RESOURCES=     yes
+
 USE_LANGUAGES= # none
 
 post-install:

Index: pkgsrc/net/py-twisted/Makefile
diff -u pkgsrc/net/py-twisted/Makefile:1.45 pkgsrc/net/py-twisted/Makefile:1.46
--- pkgsrc/net/py-twisted/Makefile:1.45 Tue Jan  4 20:54:34 2022
+++ pkgsrc/net/py-twisted/Makefile      Wed Jan  5 15:41:18 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.45 2022/01/04 20:54:34 wiz Exp $
+# $NetBSD: Makefile,v 1.46 2022/01/05 15:41:18 wiz Exp $
 
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:tl}
-PKGREVISION=   3
+PKGREVISION=   4
 COMMENT=       Framework for writing networked applications
 .include "../../net/py-twisted/Makefile.common"
 
@@ -22,6 +22,8 @@ REPLACE_PYTHON+=      src/twisted/trial/test/
 
 USE_LANGUAGES= c99
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
 .for bin in cftp ckeygen conch mailmail pyhtmlizer tkconch trial twist twistd
        cd ${DESTDIR}${PREFIX}/bin && \

Index: pkgsrc/net/scapy/Makefile
diff -u pkgsrc/net/scapy/Makefile:1.37 pkgsrc/net/scapy/Makefile:1.38
--- pkgsrc/net/scapy/Makefile:1.37      Tue Jan  4 20:54:34 2022
+++ pkgsrc/net/scapy/Makefile   Wed Jan  5 15:41:18 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2022/01/04 20:54:34 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2022/01/05 15:41:18 wiz Exp $
 
 DISTNAME=      scapy-2.4.5
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    net
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=secdev/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
@@ -15,6 +15,8 @@ NO_BUILD=     yes
 
 INSTALLATION_DIRS+=    share/examples/scapy
 
+USE_PKG_RESOURCES=     yes
+
 .include "options.mk"
 
 CONF_FILES=    ${PREFIX}/share/examples/scapy/ethertypes \

Index: pkgsrc/net/youtube-dl/Makefile
diff -u pkgsrc/net/youtube-dl/Makefile:1.244 pkgsrc/net/youtube-dl/Makefile:1.245
--- pkgsrc/net/youtube-dl/Makefile:1.244        Tue Jan  4 20:54:35 2022
+++ pkgsrc/net/youtube-dl/Makefile      Wed Jan  5 15:41:19 2022
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.244 2022/01/04 20:54:35 wiz Exp $
+# $NetBSD: Makefile,v 1.245 2022/01/05 15:41:19 wiz Exp $
 
 # XXX: VERSION_DATE can contains also an optional part that indicates
 # XXX: possible same day revisions. PKGNAME preserves that dotted part as is.
 VERSION_DATE=  2021.12.17
 DISTNAME=      youtube-dl-${VERSION_DATE}
 PKGNAME=       ${DISTNAME:S/.//:S/.//}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    net
 MASTER_SITES=  https://youtube-dl.org/downloads/${VERSION_DATE}/
 
@@ -18,6 +18,8 @@ USE_LANGUAGES=        # none
 EGG_NAME=      youtube_dl-${VERSION_DATE:S/.0/./g}
 WRKSRC=                ${WRKDIR}/youtube-dl
 
+USE_PKG_RESOURCES=     yes
+
 SUBST_CLASSES+=                pkgmandir
 SUBST_STAGE.pkgmandir= pre-configure
 SUBST_FILES.pkgmandir= setup.py

Index: pkgsrc/net/yt-dlp/Makefile
diff -u pkgsrc/net/yt-dlp/Makefile:1.7 pkgsrc/net/yt-dlp/Makefile:1.8
--- pkgsrc/net/yt-dlp/Makefile:1.7      Tue Jan  4 20:54:35 2022
+++ pkgsrc/net/yt-dlp/Makefile  Wed Jan  5 15:41:19 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2022/01/04 20:54:35 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2022/01/05 15:41:19 wiz Exp $
 
 DISTNAME=      yt-dlp-2021.12.27
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    net
 MASTER_SITES=  ${MASTER_SITE_PYPI:=y/yt-dlp/}
 # \TODO: create symlink, as mpv makes use of youtube-dl?
@@ -24,5 +24,7 @@ SUBST_VARS.paths=     PKGMANDIR
 # Only for >= 3.6
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
+USE_PKG_RESOURCES=     yes
+
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/py-octoprint/Makefile
diff -u pkgsrc/print/py-octoprint/Makefile:1.6 pkgsrc/print/py-octoprint/Makefile:1.7
--- pkgsrc/print/py-octoprint/Makefile:1.6      Tue Jan  4 20:54:35 2022
+++ pkgsrc/print/py-octoprint/Makefile  Wed Jan  5 15:41:19 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2022/01/04 20:54:35 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2022/01/05 15:41:19 wiz Exp $
 
 DISTNAME=      ${GITHUB_PROJECT}-${PKGVERSION_NOREV}
 PKGNAME=       ${PYPKGPREFIX}-octoprint-1.6.1
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    print
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=OctoPrint/}
 GITHUB_PROJECT=        OctoPrint
@@ -55,6 +55,8 @@ DEPENDS+=     ${PYPKGPREFIX}-yaml>=5.3.1:../
 DEPENDS+=      ${PYPKGPREFIX}-zeroconf>=0.24:../../net/py-zeroconf
 DEPENDS+=      ${PYPKGPREFIX}-zipstream>=1.1.8:../../archivers/py-zipstream
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        ${MV} ${DESTDIR}${PREFIX}/bin/octoprint \
                ${DESTDIR}${PREFIX}/bin/octoprint-${PYVERSSUFFIX} || ${TRUE}

Index: pkgsrc/print/py-weasyprint/Makefile
diff -u pkgsrc/print/py-weasyprint/Makefile:1.34 pkgsrc/print/py-weasyprint/Makefile:1.35
--- pkgsrc/print/py-weasyprint/Makefile:1.34    Tue Jan  4 20:54:36 2022
+++ pkgsrc/print/py-weasyprint/Makefile Wed Jan  5 15:41:19 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.34 2022/01/04 20:54:36 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2022/01/05 15:41:19 wiz Exp $
 
 DISTNAME=      weasyprint-53.4
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    print python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=w/weasyprint/}
 
@@ -30,6 +30,8 @@ USE_LANGUAGES=        # none
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27 # py-fonttools
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
        ${MV} weasyprint weasyprint-${PYVERSSUFFIX} || ${TRUE}

Index: pkgsrc/print/py-xhtml2pdf/Makefile
diff -u pkgsrc/print/py-xhtml2pdf/Makefile:1.2 pkgsrc/print/py-xhtml2pdf/Makefile:1.3
--- pkgsrc/print/py-xhtml2pdf/Makefile:1.2      Tue Jan  4 20:54:36 2022
+++ pkgsrc/print/py-xhtml2pdf/Makefile  Wed Jan  5 15:41:19 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2022/01/04 20:54:36 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2022/01/05 15:41:19 wiz Exp $
 
 DISTNAME=      xhtml2pdf-0.2.5
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    print python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=x/xhtml2pdf/}
 
@@ -23,6 +23,8 @@ USE_LANGUAGES=        # none
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27      # py-pyphen
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
 .for bin in pisa xhtml2pdf
        cd ${DESTDIR}${PREFIX}/bin && \

Index: pkgsrc/security/prelude-correlator/Makefile
diff -u pkgsrc/security/prelude-correlator/Makefile:1.26 pkgsrc/security/prelude-correlator/Makefile:1.27
--- pkgsrc/security/prelude-correlator/Makefile:1.26    Tue Jan  4 20:54:36 2022
+++ pkgsrc/security/prelude-correlator/Makefile Wed Jan  5 15:41:19 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2022/01/04 20:54:36 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2022/01/05 15:41:19 wiz Exp $
 
 DISTNAME=      prelude-correlator-0.9.0-beta8
 PKGNAME=       prelude-correlator-${DISTNAME:S/-beta/beta/:C/.*-//}
-PKGREVISION=   8
+PKGREVISION=   9
 CATEGORIES=    security
 MASTER_SITES=  http://www.prelude-ids.com/download/releases/prelude-correlator/
 
@@ -53,6 +53,8 @@ REPLACE_PYTHON=               PreludeCorrelator/main.
 PYTHON_VERSIONS_ACCEPTED=      27 # not yet ported as of 0.9.0beta8
 EGG_NAME=              prelude_correlator-0.9.0b8
 
+USE_PKG_RESOURCES=     yes
+
 pre-patch:
        ${CP} ${FILESDIR}/run-prelude-correlator.c ${WRKSRC}
 

Index: pkgsrc/security/py-acme-tiny/Makefile
diff -u pkgsrc/security/py-acme-tiny/Makefile:1.9 pkgsrc/security/py-acme-tiny/Makefile:1.10
--- pkgsrc/security/py-acme-tiny/Makefile:1.9   Tue Jan  4 20:54:37 2022
+++ pkgsrc/security/py-acme-tiny/Makefile       Wed Jan  5 15:41:19 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2022/01/04 20:54:37 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2022/01/05 15:41:19 wiz Exp $
 
 DISTNAME=      acme-tiny-5.0.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    security python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=a/acme-tiny/}
 
@@ -16,6 +16,8 @@ DEPENDS+=     openssl-[0-9]*:../../security/
 
 USE_LANGUAGES= # none
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
        ${MV} acme-tiny acme-tiny-${PYVERSSUFFIX} || ${TRUE}

Index: pkgsrc/security/py-certbot/Makefile
diff -u pkgsrc/security/py-certbot/Makefile:1.31 pkgsrc/security/py-certbot/Makefile:1.32
--- pkgsrc/security/py-certbot/Makefile:1.31    Tue Jan  4 20:54:38 2022
+++ pkgsrc/security/py-certbot/Makefile Wed Jan  5 15:41:19 2022
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.31 2022/01/04 20:54:38 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2022/01/05 15:41:19 wiz Exp $
 
-PKGREVISION= 1
+PKGREVISION= 2
 .include "../../security/py-certbot/Makefile.common"
 
 DISTNAME=      certbot-${CERTBOT_VERSION}
@@ -44,6 +44,8 @@ MAKE_DIRS+=           ${VARBASE}/letsencrypt/log
 
 INSTALLATION_DIRS+=    share/examples/certbot-${PYVERSSUFFIX}
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
                ${MV} certbot certbot-${PYVERSSUFFIX} || ${TRUE}

Index: pkgsrc/security/py-cyclonedx-bom/Makefile
diff -u pkgsrc/security/py-cyclonedx-bom/Makefile:1.3 pkgsrc/security/py-cyclonedx-bom/Makefile:1.4
--- pkgsrc/security/py-cyclonedx-bom/Makefile:1.3       Tue Jan  4 20:54:40 2022
+++ pkgsrc/security/py-cyclonedx-bom/Makefile   Wed Jan  5 15:41:19 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2022/01/04 20:54:40 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2022/01/05 15:41:19 wiz Exp $
 
 DISTNAME=      cyclonedx-bom-1.5.3
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    security python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=c/cyclonedx-bom/}
 
@@ -15,6 +15,8 @@ DEPENDS+=     ${PYPKGPREFIX}-cyclonedx-pytho
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27 # py-cyclonedx-python-lib
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
                ${MV} cyclonedx-bom cyclonedx-bom-${PYVERSSUFFIX} || ${TRUE}

Index: pkgsrc/security/py-google-auth-oauthlib/Makefile
diff -u pkgsrc/security/py-google-auth-oauthlib/Makefile:1.9 pkgsrc/security/py-google-auth-oauthlib/Makefile:1.10
--- pkgsrc/security/py-google-auth-oauthlib/Makefile:1.9        Tue Jan  4 20:54:41 2022
+++ pkgsrc/security/py-google-auth-oauthlib/Makefile    Wed Jan  5 15:41:20 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2022/01/04 20:54:41 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2022/01/05 15:41:20 wiz Exp $
 
 DISTNAME=      google-auth-oauthlib-0.4.6
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    security python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=g/google-auth-oauthlib/}
 
@@ -18,6 +18,8 @@ USE_LANGUAGES=        # none
    
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
        ${MV} google-oauthlib-tool google-oauthlib-tool-${PYVERSSUFFIX} || ${TRUE}

Index: pkgsrc/security/py-josepy/Makefile
diff -u pkgsrc/security/py-josepy/Makefile:1.14 pkgsrc/security/py-josepy/Makefile:1.15
--- pkgsrc/security/py-josepy/Makefile:1.14     Tue Jan  4 20:54:42 2022
+++ pkgsrc/security/py-josepy/Makefile  Wed Jan  5 15:41:20 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2022/01/04 20:54:42 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2022/01/05 15:41:20 wiz Exp $
 
 DISTNAME=      josepy-1.11.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    security python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=j/josepy/}
 
@@ -24,6 +24,8 @@ USE_LANGUAGES=        # none
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
        ${MV} jws jws-${PYVERSSUFFIX} || ${TRUE}

Index: pkgsrc/security/py-keyring/Makefile
diff -u pkgsrc/security/py-keyring/Makefile:1.28 pkgsrc/security/py-keyring/Makefile:1.29
--- pkgsrc/security/py-keyring/Makefile:1.28    Tue Jan  4 20:54:42 2022
+++ pkgsrc/security/py-keyring/Makefile Wed Jan  5 15:41:20 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.28 2022/01/04 20:54:42 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2022/01/05 15:41:20 wiz Exp $
 
 DISTNAME=      keyring-21.2.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    security python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=k/keyring/}
 
@@ -17,6 +17,8 @@ BUILD_DEPENDS+=       ${PYPKGPREFIX}-setuptool
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
+USE_PKG_RESOURCES=     yes
+
 .include "../../lang/python/pyversion.mk"
 .if ${_PYTHON_VERSION} < 38
 DEPENDS+=      ${PYPKGPREFIX}-importlib-metadata-[0-9]*:../../devel/py-importlib-metadata

Index: pkgsrc/security/py-libtaxii/Makefile
diff -u pkgsrc/security/py-libtaxii/Makefile:1.13 pkgsrc/security/py-libtaxii/Makefile:1.14
--- pkgsrc/security/py-libtaxii/Makefile:1.13   Tue Jan  4 20:54:42 2022
+++ pkgsrc/security/py-libtaxii/Makefile        Wed Jan  5 15:41:20 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2022/01/04 20:54:42 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2022/01/05 15:41:20 wiz Exp $
 
 DISTNAME=      libtaxii-1.1.119
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    security python
 #MASTER_SITES= ${MASTER_SITE_PYPI:=l/libtaxii/}
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=TAXIIProject/}
@@ -21,5 +21,7 @@ USE_LANGUAGES=        # none
 
 PYTHON_SELF_CONFLICT=  yes
 
+USE_PKG_RESOURCES=     yes
+
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/security/py-ndg_httpsclient/Makefile
diff -u pkgsrc/security/py-ndg_httpsclient/Makefile:1.6 pkgsrc/security/py-ndg_httpsclient/Makefile:1.7
--- pkgsrc/security/py-ndg_httpsclient/Makefile:1.6     Tue Jan  4 20:54:42 2022
+++ pkgsrc/security/py-ndg_httpsclient/Makefile Wed Jan  5 15:41:20 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2022/01/04 20:54:42 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2022/01/05 15:41:20 wiz Exp $
 
 DISTNAME=      ndg_httpsclient-0.4.2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    security python
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=cedadev/}
 
@@ -17,5 +17,7 @@ GITHUB_TAG=   ${PKGVERSION_NOREV}
 DEPENDS+=      ${PYPKGPREFIX}-asn1>=0.1.4:../../security/py-asn1
 DEPENDS+=      ${PYPKGPREFIX}-OpenSSL>=0.13:../../security/py-OpenSSL
 
+USE_PKG_RESOURCES=     yes
+
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/security/py-pip-audit/Makefile
diff -u pkgsrc/security/py-pip-audit/Makefile:1.6 pkgsrc/security/py-pip-audit/Makefile:1.7
--- pkgsrc/security/py-pip-audit/Makefile:1.6   Tue Jan  4 20:54:43 2022
+++ pkgsrc/security/py-pip-audit/Makefile       Wed Jan  5 15:41:20 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2022/01/04 20:54:43 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2022/01/05 15:41:20 wiz Exp $
 
 DISTNAME=      pip-audit-1.1.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    security python
 # pypi file does not include tests
 #MASTER_SITES= ${MASTER_SITE_PYPI:=p/pip-audit/}
@@ -28,6 +28,8 @@ TEST_DEPENDS+=        ${PYPKGPREFIX}-test-[0-9]
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
+USE_PKG_RESOURCES=     yes
+
 USE_LANGUAGES= # none
 
 post-install:

Index: pkgsrc/security/py-rsa/Makefile
diff -u pkgsrc/security/py-rsa/Makefile:1.13 pkgsrc/security/py-rsa/Makefile:1.14
--- pkgsrc/security/py-rsa/Makefile:1.13        Tue Jan  4 20:54:44 2022
+++ pkgsrc/security/py-rsa/Makefile     Wed Jan  5 15:41:20 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2022/01/04 20:54:44 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2022/01/05 15:41:20 wiz Exp $
 
 DISTNAME=      rsa-4.8
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    security python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=r/rsa/}
 
@@ -15,6 +15,8 @@ DEPENDS+=     ${PYPKGPREFIX}-asn1>=0.1.3:../
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
+USE_PKG_RESOURCES=     yes
+
 USE_LANGUAGES= # none
 
 post-install:

Index: pkgsrc/security/py-yubikey-manager/Makefile
diff -u pkgsrc/security/py-yubikey-manager/Makefile:1.4 pkgsrc/security/py-yubikey-manager/Makefile:1.5
--- pkgsrc/security/py-yubikey-manager/Makefile:1.4     Tue Jan  4 20:54:45 2022
+++ pkgsrc/security/py-yubikey-manager/Makefile Wed Jan  5 15:41:20 2022
@@ -1,10 +1,10 @@
-#      $NetBSD: Makefile,v 1.4 2022/01/04 20:54:45 wiz Exp $
+#      $NetBSD: Makefile,v 1.5 2022/01/05 15:41:20 wiz Exp $
 
 .include "../../security/ykman/version.mk"
 
 DISTNAME=      yubikey-manager-${VERSION}
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    security sysutils
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=Yubico/}
 GITHUB_PROJECT=        yubikey-manager
@@ -25,6 +25,8 @@ DEPENDS+=     ${PYPKGPREFIX}-usb>=0:../../de
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27 # py-usb
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
        ${MV} ykman ykman-${PYVERSSUFFIX}

Index: pkgsrc/security/sqlmap/Makefile
diff -u pkgsrc/security/sqlmap/Makefile:1.30 pkgsrc/security/sqlmap/Makefile:1.31
--- pkgsrc/security/sqlmap/Makefile:1.30        Tue Jan  4 20:54:46 2022
+++ pkgsrc/security/sqlmap/Makefile     Wed Jan  5 15:41:21 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2022/01/04 20:54:46 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2022/01/05 15:41:21 wiz Exp $
 
 DISTNAME=      sqlmap-1.5.4
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    security
 MASTER_SITES=  ${MASTER_SITE_PYPI:=s/sqlmap/}
 
@@ -33,6 +33,8 @@ REPLACE_PERL+=        sqlmap/extra/icmpsh/icmps
 
 REPLACE_PYTHON+=       sqlmap/extra/shutils/duplicates.py
 
+USE_PKG_RESOURCES=     yes
+
 USE_LANGUAGES= # none
 
 .include "../../lang/python/application.mk"

Index: pkgsrc/security/wfuzz/Makefile
diff -u pkgsrc/security/wfuzz/Makefile:1.2 pkgsrc/security/wfuzz/Makefile:1.3
--- pkgsrc/security/wfuzz/Makefile:1.2  Tue Jan  4 20:54:46 2022
+++ pkgsrc/security/wfuzz/Makefile      Wed Jan  5 15:41:21 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2022/01/04 20:54:46 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2022/01/05 15:41:21 wiz Exp $
 
 DISTNAME=      wfuzz-3.1.0
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    security python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=w/wfuzz/}
 
@@ -20,5 +20,7 @@ USE_LANGUAGES=                        # none
 # Only for Python 3
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
+USE_PKG_RESOURCES=     yes
+
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/shells/xonsh/Makefile
diff -u pkgsrc/shells/xonsh/Makefile:1.9 pkgsrc/shells/xonsh/Makefile:1.10
--- pkgsrc/shells/xonsh/Makefile:1.9    Tue Jan  4 20:54:46 2022
+++ pkgsrc/shells/xonsh/Makefile        Wed Jan  5 15:41:21 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2022/01/04 20:54:46 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2022/01/05 15:41:21 wiz Exp $
 
 DISTNAME=      xonsh-0.10.1
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    shells python
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=xonsh/}
 
@@ -14,6 +14,8 @@ USE_LANGUAGES=        # none
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
+USE_PKG_RESOURCES=     yes
+
 .include "../../mk/bsd.prefs.mk"
 .if ${OPSYS} == "Linux"
 DEPENDS+=      ${PYPKGPREFIX}-distro-[0-9]*:../../devel/py-distro

Index: pkgsrc/sysutils/ansible-base/Makefile
diff -u pkgsrc/sysutils/ansible-base/Makefile:1.13 pkgsrc/sysutils/ansible-base/Makefile:1.14
--- pkgsrc/sysutils/ansible-base/Makefile:1.13  Tue Jan  4 20:54:46 2022
+++ pkgsrc/sysutils/ansible-base/Makefile       Wed Jan  5 15:41:21 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2022/01/04 20:54:46 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2022/01/05 15:41:21 wiz Exp $
 
 DISTNAME=      ansible-base-2.10.16
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    sysutils python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=a/ansible-base/}
 
@@ -19,6 +19,8 @@ DEPENDS+=     ${PYPKGPREFIX}-yaml-[0-9]*:../
 
 PYTHON_VERSIONED_DEPENDENCIES+=        packaging
 
+USE_PKG_RESOURCES=     yes
+
 USE_TOOLS+=    gmake
 
 PKG_SYSCONFSUBDIR=     ansible

Index: pkgsrc/sysutils/ansible-lint/Makefile
diff -u pkgsrc/sysutils/ansible-lint/Makefile:1.3 pkgsrc/sysutils/ansible-lint/Makefile:1.4
--- pkgsrc/sysutils/ansible-lint/Makefile:1.3   Tue Jan  4 20:54:46 2022
+++ pkgsrc/sysutils/ansible-lint/Makefile       Wed Jan  5 15:41:21 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2022/01/04 20:54:46 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2022/01/05 15:41:21 wiz Exp $
 
 DISTNAME=      ansible-lint-5.0.12
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    sysutils python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=a/ansible-lint/}
 
@@ -23,6 +23,8 @@ USE_LANGUAGES=        # none
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27 # py-rich
 
+USE_PKG_RESOURCES=     yes
+
 .include "../../lang/python/pyversion.mk"
 .if ${_PYTHON_VERSION} < 38
 DEPENDS+=      ${PYPKGPREFIX}-typing-extensions-[0-9]*:../../devel/py-typing-extensions

Index: pkgsrc/sysutils/duplicity/Makefile
diff -u pkgsrc/sysutils/duplicity/Makefile:1.55 pkgsrc/sysutils/duplicity/Makefile:1.56
--- pkgsrc/sysutils/duplicity/Makefile:1.55     Tue Jan  4 20:54:47 2022
+++ pkgsrc/sysutils/duplicity/Makefile  Wed Jan  5 15:41:21 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.55 2022/01/04 20:54:47 wiz Exp $
+# $NetBSD: Makefile,v 1.56 2022/01/05 15:41:21 wiz Exp $
 
 DISTNAME=      duplicity-0.8.20
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    sysutils net python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=d/duplicity/}
 
@@ -34,6 +34,8 @@ REPLACE_PYTHON+=      bin/rdiffdir
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
+USE_PKG_RESOURCES=     yes
+
 SUBST_CLASSES+=                        fix-paths
 SUBST_STAGE.fix-paths=         pre-configure
 SUBST_MESSAGE.fix-paths=       fixing hard coded dirs

Index: pkgsrc/sysutils/fabric/Makefile
diff -u pkgsrc/sysutils/fabric/Makefile:1.54 pkgsrc/sysutils/fabric/Makefile:1.55
--- pkgsrc/sysutils/fabric/Makefile:1.54        Tue Jan  4 20:54:47 2022
+++ pkgsrc/sysutils/fabric/Makefile     Wed Jan  5 15:41:21 2022
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.54 2022/01/04 20:54:47 wiz Exp $
+# $NetBSD: Makefile,v 1.55 2022/01/05 15:41:21 wiz Exp $
 
 VERSION=               1.12.0
 DISTNAME=              Fabric-${VERSION}
 PKGNAME=               ${DISTNAME:S/F/f/}
-PKGREVISION=           3
+PKGREVISION=           4
 CATEGORIES=            sysutils net
 MASTER_SITES=          ${MASTER_SITE_PYPI:=F/Fabric/}
 
@@ -16,6 +16,8 @@ DEPENDS+=             ${PYPKGPREFIX}-paramiko>=1.10
 
 PYTHON_VERSIONS_ACCEPTED=      27 # no support yet
 
+USE_PKG_RESOURCES=     yes
+
 USE_TOOLS+=            pax
 
 INSTALLATION_DIRS+=    ${PKGMANDIR}/man1

Index: pkgsrc/sysutils/py-Glances/Makefile
diff -u pkgsrc/sysutils/py-Glances/Makefile:1.15 pkgsrc/sysutils/py-Glances/Makefile:1.16
--- pkgsrc/sysutils/py-Glances/Makefile:1.15    Tue Jan  4 20:54:47 2022
+++ pkgsrc/sysutils/py-Glances/Makefile Wed Jan  5 15:41:21 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2022/01/04 20:54:47 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2022/01/05 15:41:21 wiz Exp $
 
 DISTNAME=      Glances-3.2.4.2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    sysutils python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=G/Glances/}
 
@@ -20,6 +20,8 @@ DEPENDS+=     ${PYPKGPREFIX}-packaging-[0-9]
 
 USE_LANGUAGES= # none
 
+USE_PKG_RESOURCES=     yes
+
 SUBST_CLASSES+=                prefix
 SUBST_STAGE.prefix=    pre-configure
 SUBST_MESSAGE.prefix=  Set correct prefix in setup.py

Index: pkgsrc/sysutils/py-borgbackup/Makefile
diff -u pkgsrc/sysutils/py-borgbackup/Makefile:1.34 pkgsrc/sysutils/py-borgbackup/Makefile:1.35
--- pkgsrc/sysutils/py-borgbackup/Makefile:1.34 Tue Jan  4 20:54:47 2022
+++ pkgsrc/sysutils/py-borgbackup/Makefile      Wed Jan  5 15:41:21 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.34 2022/01/04 20:54:47 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2022/01/05 15:41:21 wiz Exp $
 
 DISTNAME=      borgbackup-1.1.17
-PKGREVISION=   2
+PKGREVISION=   3
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=    sysutils python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=b/borgbackup/}
@@ -17,6 +17,8 @@ DEPENDS+=     ${PYPKGPREFIX}-packaging-[0-9]
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
+USE_PKG_RESOURCES=     yes
+
 MAKE_ENV+=     BORG_OPENSSL_PREFIX=${SSLBASE:Q}
 MAKE_ENV+=     BORG_LZ4_PREFIX=${BUILDLINK_PREFIX.lz4}
 MAKE_ENV+=     BORG_LIBZSTD_PREFIX=${BUILDLINK_PREFIX.zstd}

Index: pkgsrc/sysutils/py-cpuinfo/Makefile
diff -u pkgsrc/sysutils/py-cpuinfo/Makefile:1.5 pkgsrc/sysutils/py-cpuinfo/Makefile:1.6
--- pkgsrc/sysutils/py-cpuinfo/Makefile:1.5     Tue Jan  4 20:54:47 2022
+++ pkgsrc/sysutils/py-cpuinfo/Makefile Wed Jan  5 15:41:22 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2022/01/04 20:54:47 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2022/01/05 15:41:22 wiz Exp $
 
 DISTNAME=      py-cpuinfo-8.0.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/py-//}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    sysutils python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=p/py-cpuinfo/}
 
@@ -13,6 +13,8 @@ LICENSE=      mit
 
 USE_LANGUAGES= # none
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && ${MV} cpuinfo cpuinfo-${PYVERSSUFFIX} || ${TRUE}
 

Index: pkgsrc/sysutils/py-diffoscope/Makefile
diff -u pkgsrc/sysutils/py-diffoscope/Makefile:1.13 pkgsrc/sysutils/py-diffoscope/Makefile:1.14
--- pkgsrc/sysutils/py-diffoscope/Makefile:1.13 Tue Jan  4 20:54:48 2022
+++ pkgsrc/sysutils/py-diffoscope/Makefile      Wed Jan  5 15:41:22 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2022/01/04 20:54:48 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2022/01/05 15:41:22 wiz Exp $
 
 DISTNAME=      diffoscope-134
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    sysutils python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=d/diffoscope/}
 
@@ -25,6 +25,8 @@ USE_TOOLS+=   bzip2:run gtar:run xz:run
 # Only Python 3 is supported.
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
                ${MV} diffoscope diffoscope-${PYVERSSUFFIX} || ${TRUE}

Index: pkgsrc/sysutils/py-eliot/Makefile
diff -u pkgsrc/sysutils/py-eliot/Makefile:1.5 pkgsrc/sysutils/py-eliot/Makefile:1.6
--- pkgsrc/sysutils/py-eliot/Makefile:1.5       Tue Jan  4 20:54:48 2022
+++ pkgsrc/sysutils/py-eliot/Makefile   Wed Jan  5 15:41:22 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2022/01/04 20:54:48 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2022/01/05 15:41:22 wiz Exp $
 
 DISTNAME=      eliot-1.13.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    sysutils python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=e/eliot/}
 
@@ -21,6 +21,8 @@ TEST_DEPENDS+=        ${PYPKGPREFIX}-testtools-
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
+USE_PKG_RESOURCES=     yes
+
 USE_LANGUAGES= # none
 
 post-install:

Index: pkgsrc/sysutils/py-filetype/Makefile
diff -u pkgsrc/sysutils/py-filetype/Makefile:1.4 pkgsrc/sysutils/py-filetype/Makefile:1.5
--- pkgsrc/sysutils/py-filetype/Makefile:1.4    Tue Jan  4 20:54:48 2022
+++ pkgsrc/sysutils/py-filetype/Makefile        Wed Jan  5 15:41:22 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2022/01/04 20:54:48 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2022/01/05 15:41:22 wiz Exp $
 
 DISTNAME=      filetype-1.0.9
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    sysutils python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=f/filetype/}
 
@@ -18,6 +18,8 @@ USE_LANGUAGES=        # none
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
        ${MV} filetype filetype-${PYVERSSUFFIX} || ${TRUE}

Index: pkgsrc/sysutils/py-google-compute-engine/Makefile
diff -u pkgsrc/sysutils/py-google-compute-engine/Makefile:1.6 pkgsrc/sysutils/py-google-compute-engine/Makefile:1.7
--- pkgsrc/sysutils/py-google-compute-engine/Makefile:1.6       Tue Jan  4 20:54:48 2022
+++ pkgsrc/sysutils/py-google-compute-engine/Makefile   Wed Jan  5 15:41:22 2022
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.6 2022/01/04 20:54:48 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2022/01/05 15:41:22 wiz Exp $
 
 GITHUB_PROJECT=        compute-image-packages
 GITHUB_TAG=    20170829
 DISTNAME=      google-compute-engine-${GITHUB_TAG}
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    sysutils
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=GoogleCloudPlatform/}
 DIST_SUBDIR=   ${GITHUB_PROJECT}
@@ -34,5 +34,7 @@ SUBST_SED.paths=      -e 's,/etc,${PREFIX},g'
 SUBST_SED.paths+=      -e 's,/var,${VARBASE},g'
 SUBST_NOOP_OK.paths=   yes # the paths look broken, someone should fix this
 
+USE_PKG_RESOURCES=     yes
+
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/sysutils/py-salt-pepper/Makefile
diff -u pkgsrc/sysutils/py-salt-pepper/Makefile:1.3 pkgsrc/sysutils/py-salt-pepper/Makefile:1.4
--- pkgsrc/sysutils/py-salt-pepper/Makefile:1.3 Tue Jan  4 20:54:49 2022
+++ pkgsrc/sysutils/py-salt-pepper/Makefile     Wed Jan  5 15:41:22 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2022/01/04 20:54:49 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2022/01/05 15:41:22 wiz Exp $
 
 DISTNAME=      salt-pepper-0.7.6
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    sysutils python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=s/salt-pepper/}
 
@@ -15,6 +15,8 @@ BUILD_DEPENDS+=       ${PYPKGPREFIX}-setuptool
 
 USE_LANGUAGES= # none
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
        ${MV} pepper pepper-${PYVERSSUFFIX} || ${TRUE}

Index: pkgsrc/sysutils/py-setconf/Makefile
diff -u pkgsrc/sysutils/py-setconf/Makefile:1.5 pkgsrc/sysutils/py-setconf/Makefile:1.6
--- pkgsrc/sysutils/py-setconf/Makefile:1.5     Tue Jan  4 20:54:49 2022
+++ pkgsrc/sysutils/py-setconf/Makefile Wed Jan  5 15:41:22 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2022/01/04 20:54:49 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2022/01/05 15:41:22 wiz Exp $
 
 DISTNAME=      setconf-0.7.7
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    sysutils python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=s/setconf/}
 
@@ -13,6 +13,8 @@ LICENSE=      gnu-gpl-v2
 
 USE_LANGUAGES= # none
 
+USE_PKG_RESOURCES=     yes
+
 INSTALLATION_DIRS+=    ${PKGMANDIR}/man1
 
 post-install:

Index: pkgsrc/sysutils/py-supervisor/Makefile
diff -u pkgsrc/sysutils/py-supervisor/Makefile:1.11 pkgsrc/sysutils/py-supervisor/Makefile:1.12
--- pkgsrc/sysutils/py-supervisor/Makefile:1.11 Tue Jan  4 20:54:50 2022
+++ pkgsrc/sysutils/py-supervisor/Makefile      Wed Jan  5 15:41:22 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2022/01/04 20:54:50 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2022/01/05 15:41:22 wiz Exp $
 
 DISTNAME=      supervisor-4.2.4
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    sysutils python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=s/supervisor/}
 
@@ -20,6 +20,8 @@ TEST_DEPENDS+=        ${PYPKGPREFIX}-mock-[0-9]
 
 REPLACE_PYTHON+=       supervisor/scripts/*.py
 
+USE_PKG_RESOURCES=     yes
+
 SUBST_CLASSES+=                python
 SUBST_STAGE.python=    pre-build
 SUBST_MESSAGE.python=  Fixing Python path.

Index: pkgsrc/sysutils/py-watchdog/Makefile
diff -u pkgsrc/sysutils/py-watchdog/Makefile:1.12 pkgsrc/sysutils/py-watchdog/Makefile:1.13
--- pkgsrc/sysutils/py-watchdog/Makefile:1.12   Tue Jan  4 20:54:50 2022
+++ pkgsrc/sysutils/py-watchdog/Makefile        Wed Jan  5 15:41:23 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2022/01/04 20:54:50 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2022/01/05 15:41:23 wiz Exp $
 
 DISTNAME=      watchdog-0.10.4
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    sysutils python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=w/watchdog/}
 
@@ -21,6 +21,8 @@ TEST_DEPENDS+=        ${PYPKGPREFIX}-test-timeo
 
 PYSETUPTESTTARGET=     pytest
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
        ${MV} watchmedo watchmedo-${PYVERSSUFFIX} || ${TRUE}

Index: pkgsrc/sysutils/py-xattr/Makefile
diff -u pkgsrc/sysutils/py-xattr/Makefile:1.20 pkgsrc/sysutils/py-xattr/Makefile:1.21
--- pkgsrc/sysutils/py-xattr/Makefile:1.20      Tue Jan  4 20:54:50 2022
+++ pkgsrc/sysutils/py-xattr/Makefile   Wed Jan  5 15:41:23 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2022/01/04 20:54:50 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2022/01/05 15:41:23 wiz Exp $
 
 DISTNAME=      xattr-0.9.9
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    sysutils python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=x/xattr/}
 
@@ -14,6 +14,8 @@ LICENSE=      mit
 DEPENDS+=      ${PYPKGPREFIX}-cffi>=1.0.0:../../devel/py-cffi
 DEPENDS+=      ${PYPKGPREFIX}-cparser-[0-9]*:../../devel/py-cparser
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
        ${MV} xattr xattr-${PYVERSSUFFIX} || ${TRUE}

Index: pkgsrc/sysutils/salt/Makefile
diff -u pkgsrc/sysutils/salt/Makefile:1.76 pkgsrc/sysutils/salt/Makefile:1.77
--- pkgsrc/sysutils/salt/Makefile:1.76  Tue Jan  4 20:54:50 2022
+++ pkgsrc/sysutils/salt/Makefile       Wed Jan  5 15:41:23 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.76 2022/01/04 20:54:50 wiz Exp $
+# $NetBSD: Makefile,v 1.77 2022/01/05 15:41:23 wiz Exp $
 
 DISTNAME=      salt-3004
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    sysutils
 MASTER_SITES=  ${MASTER_SITE_PYPI:=s/salt/}
 
@@ -22,6 +22,8 @@ DEPENDS+=     ${PYPKGPREFIX}-zmq>=19.0.2:../
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
+USE_PKG_RESOURCES=     yes
+
 BUILD_DEFS+=   VARBASE
 
 PYSETUPARGS+=  --salt-base-file-roots-dir=${VARBASE}/salt/file-roots

Index: pkgsrc/textproc/csvkit/Makefile
diff -u pkgsrc/textproc/csvkit/Makefile:1.13 pkgsrc/textproc/csvkit/Makefile:1.14
--- pkgsrc/textproc/csvkit/Makefile:1.13        Tue Jan  4 20:54:50 2022
+++ pkgsrc/textproc/csvkit/Makefile     Wed Jan  5 15:41:23 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2022/01/04 20:54:50 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2022/01/05 15:41:23 wiz Exp $
 
 DISTNAME=      csvkit-0.9.0
-PKGREVISION=   5
+PKGREVISION=   6
 CATEGORIES=    textproc
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=wireservice/}
 GITHUB_TAG=    ${PKGVERSION_NOREV}
@@ -24,5 +24,7 @@ USE_LANGUAGES=        # none
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27 # py-aenum via py-dbf
 
+USE_PKG_RESOURCES=     yes
+
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/textproc/csvtomd/Makefile
diff -u pkgsrc/textproc/csvtomd/Makefile:1.7 pkgsrc/textproc/csvtomd/Makefile:1.8
--- pkgsrc/textproc/csvtomd/Makefile:1.7        Tue Jan  4 20:54:50 2022
+++ pkgsrc/textproc/csvtomd/Makefile    Wed Jan  5 15:41:23 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2022/01/04 20:54:50 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2022/01/05 15:41:23 wiz Exp $
 
 DISTNAME=      csvtomd-0.1.1
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    textproc
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=mplewis/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
@@ -15,6 +15,8 @@ USE_LANGUAGES=        # none
 
 REPLACE_PYTHON+=       csvtomd
 
+USE_PKG_RESOURCES=     yes
+
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
 .include "../../lang/python/egg.mk"

Index: pkgsrc/textproc/py-Unidecode/Makefile
diff -u pkgsrc/textproc/py-Unidecode/Makefile:1.13 pkgsrc/textproc/py-Unidecode/Makefile:1.14
--- pkgsrc/textproc/py-Unidecode/Makefile:1.13  Tue Jan  4 20:54:51 2022
+++ pkgsrc/textproc/py-Unidecode/Makefile       Wed Jan  5 15:41:23 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2022/01/04 20:54:51 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2022/01/05 15:41:23 wiz Exp $
 
 DISTNAME=      Unidecode-1.2.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    textproc python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=U/Unidecode/}
 
@@ -13,6 +13,8 @@ LICENSE=      gnu-gpl-v2
 
 USE_LANGUAGES= # none
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
        ${MV} unidecode unidecode-${PYVERSSUFFIX} || ${TRUE}

Index: pkgsrc/textproc/py-black/Makefile
diff -u pkgsrc/textproc/py-black/Makefile:1.2 pkgsrc/textproc/py-black/Makefile:1.3
--- pkgsrc/textproc/py-black/Makefile:1.2       Tue Jan  4 20:54:52 2022
+++ pkgsrc/textproc/py-black/Makefile   Wed Jan  5 15:41:23 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2022/01/04 20:54:52 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2022/01/05 15:41:23 wiz Exp $
 
 DISTNAME=      black-20.8b1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    textproc devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=b/black/}
 
@@ -27,6 +27,8 @@ DEPENDS+=     ${PYPKGPREFIX}-aiohttp-cors-[0
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27 # py-aiohttp
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && for b in black black-primer blackd; \
           do ${MV} $$b $$b-${PYVERSSUFFIX}; \

Index: pkgsrc/textproc/py-commonmark/Makefile
diff -u pkgsrc/textproc/py-commonmark/Makefile:1.3 pkgsrc/textproc/py-commonmark/Makefile:1.4
--- pkgsrc/textproc/py-commonmark/Makefile:1.3  Tue Jan  4 20:54:53 2022
+++ pkgsrc/textproc/py-commonmark/Makefile      Wed Jan  5 15:41:23 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2022/01/04 20:54:53 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2022/01/05 15:41:23 wiz Exp $
 
 DISTNAME=      commonmark-0.9.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:tl}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    textproc python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=c/commonmark/}
 
@@ -18,6 +18,8 @@ DEPENDS+=     ${PYPKGPREFIX}-future>=0.14.0:
 
 USE_LANGUAGES= # none
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
        ${MV} cmark cmark-${PYVERSSUFFIX} || ${TRUE}

Index: pkgsrc/textproc/py-creole/Makefile
diff -u pkgsrc/textproc/py-creole/Makefile:1.13 pkgsrc/textproc/py-creole/Makefile:1.14
--- pkgsrc/textproc/py-creole/Makefile:1.13     Tue Jan  4 20:54:53 2022
+++ pkgsrc/textproc/py-creole/Makefile  Wed Jan  5 15:41:23 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2022/01/04 20:54:53 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2022/01/05 15:41:23 wiz Exp $
 
 DISTNAME=      python-creole-1.3.2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/^python-//}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    textproc www python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=p/python-creole/}
 
@@ -22,6 +22,8 @@ REPLACE_PYTHON+=      creole/*/*.py
 
 PYTHON_SELF_CONFLICT=  yes
 
+USE_PKG_RESOURCES=     yes
+
 do-test:
        cd ${WRKSRC} && ${PYTHONBIN} setup.py nosetests
 

Index: pkgsrc/textproc/py-deepdiff/Makefile
diff -u pkgsrc/textproc/py-deepdiff/Makefile:1.10 pkgsrc/textproc/py-deepdiff/Makefile:1.11
--- pkgsrc/textproc/py-deepdiff/Makefile:1.10   Tue Jan  4 20:54:53 2022
+++ pkgsrc/textproc/py-deepdiff/Makefile        Wed Jan  5 15:41:24 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2022/01/04 20:54:53 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2022/01/05 15:41:24 wiz Exp $
 
 DISTNAME=      deepdiff-5.5.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    textproc python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=d/deepdiff/}
 
@@ -19,6 +19,8 @@ USE_LANGUAGES=        # none
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
        ${MV} deep deep-${PYVERSSUFFIX} || ${TRUE}

Index: pkgsrc/textproc/py-epr-reader/Makefile
diff -u pkgsrc/textproc/py-epr-reader/Makefile:1.3 pkgsrc/textproc/py-epr-reader/Makefile:1.4
--- pkgsrc/textproc/py-epr-reader/Makefile:1.3  Tue Jan  4 20:54:55 2022
+++ pkgsrc/textproc/py-epr-reader/Makefile      Wed Jan  5 15:41:24 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2022/01/04 20:54:55 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2022/01/05 15:41:24 wiz Exp $
 
 DISTNAME=      epr-reader-2.4.11
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    textproc python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=e/epr-reader/}
 
@@ -13,5 +13,7 @@ LICENSE=      mit
 
 USE_LANGUAGES= # none
 
+USE_PKG_RESOURCES=     yes
+
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/textproc/py-ftfy/Makefile
diff -u pkgsrc/textproc/py-ftfy/Makefile:1.9 pkgsrc/textproc/py-ftfy/Makefile:1.10
--- pkgsrc/textproc/py-ftfy/Makefile:1.9        Tue Jan  4 20:54:55 2022
+++ pkgsrc/textproc/py-ftfy/Makefile    Wed Jan  5 15:41:24 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2022/01/04 20:54:55 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2022/01/05 15:41:24 wiz Exp $
 
 DISTNAME=      ftfy-4.2.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    python textproc
 MASTER_SITES=  ${MASTER_SITE_PYPI:=f/ftfy/}
 
@@ -16,6 +16,8 @@ DEPENDS+=     ${PYPKGPREFIX}-wcwidth-[0-9]*:
 
 USE_LANGUAGES= # none
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        ${MV} ${DESTDIR}${PREFIX}/bin/ftfy \
                ${DESTDIR}${PREFIX}/bin/ftfy${PYVERSSUFFIX} || ${TRUE}

Index: pkgsrc/textproc/py-generateDS/Makefile
diff -u pkgsrc/textproc/py-generateDS/Makefile:1.10 pkgsrc/textproc/py-generateDS/Makefile:1.11
--- pkgsrc/textproc/py-generateDS/Makefile:1.10 Tue Jan  4 20:54:55 2022
+++ pkgsrc/textproc/py-generateDS/Makefile      Wed Jan  5 15:41:24 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2022/01/04 20:54:55 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2022/01/05 15:41:24 wiz Exp $
 
 DISTNAME=      generateDS-2.28b0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/0$//}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    textproc python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=g/generateDS/}
 
@@ -17,5 +17,7 @@ USE_LANGUAGES=        # none
 
 PYTHON_SELF_CONFLICT=  yes
 
+USE_PKG_RESOURCES=     yes
+
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/textproc/py-guessit/Makefile
diff -u pkgsrc/textproc/py-guessit/Makefile:1.7 pkgsrc/textproc/py-guessit/Makefile:1.8
--- pkgsrc/textproc/py-guessit/Makefile:1.7     Tue Jan  4 20:54:55 2022
+++ pkgsrc/textproc/py-guessit/Makefile Wed Jan  5 15:41:24 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2022/01/04 20:54:55 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2022/01/05 15:41:24 wiz Exp $
 
 DISTNAME=      guessit-3.1.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    textproc python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=g/guessit/}
 
@@ -21,6 +21,8 @@ TEST_DEPENDS+=        ${PYPKGPREFIX}-yaml-[0-9]
 
 USE_LANGUAGES= # none
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
        ${MV} guessit guessit-${PYVERSSUFFIX} || ${TRUE}

Index: pkgsrc/textproc/py-html2text/Makefile
diff -u pkgsrc/textproc/py-html2text/Makefile:1.57 pkgsrc/textproc/py-html2text/Makefile:1.58
--- pkgsrc/textproc/py-html2text/Makefile:1.57  Tue Jan  4 20:54:55 2022
+++ pkgsrc/textproc/py-html2text/Makefile       Wed Jan  5 15:41:24 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.57 2022/01/04 20:54:55 wiz Exp $
+# $NetBSD: Makefile,v 1.58 2022/01/05 15:41:24 wiz Exp $
 
 DISTNAME=      html2text-2020.1.16
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    textproc converters python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=h/html2text/}
 
@@ -14,6 +14,8 @@ LICENSE=      gnu-gpl-v3
 USE_LANGUAGES= # none
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && ${MV} html2text html2text-${PYVERSSUFFIX} || ${TRUE}
 

Index: pkgsrc/textproc/py-jade/Makefile
diff -u pkgsrc/textproc/py-jade/Makefile:1.2 pkgsrc/textproc/py-jade/Makefile:1.3
--- pkgsrc/textproc/py-jade/Makefile:1.2        Tue Jan  4 20:54:56 2022
+++ pkgsrc/textproc/py-jade/Makefile    Wed Jan  5 15:41:24 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2022/01/04 20:54:56 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2022/01/05 15:41:24 wiz Exp $
 
 DISTNAME=      pyjade-4.0.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/^py//}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    textproc python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=p/pyjade/}
 
@@ -15,6 +15,8 @@ DEPENDS+=     ${PYPKGPREFIX}-six-[0-9]*:../.
 
 USE_LANGUAGES= # none
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && ${MV} pyjade pyjade${PYVERSSUFFIX} || ${TRUE}
 

Index: pkgsrc/textproc/py-jsbeautifier/Makefile
diff -u pkgsrc/textproc/py-jsbeautifier/Makefile:1.19 pkgsrc/textproc/py-jsbeautifier/Makefile:1.20
--- pkgsrc/textproc/py-jsbeautifier/Makefile:1.19       Tue Jan  4 20:54:57 2022
+++ pkgsrc/textproc/py-jsbeautifier/Makefile    Wed Jan  5 15:41:24 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2022/01/04 20:54:57 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2022/01/05 15:41:24 wiz Exp $
 
 DISTNAME=      jsbeautifier-1.13.13
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    textproc python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=j/jsbeautifier/}
 
@@ -16,6 +16,8 @@ DEPENDS+=     ${PYPKGPREFIX}-six>=1.13.0:../
 
 PYTHON_VERSIONED_DEPENDENCIES= test:test
 
+USE_PKG_RESOURCES=     yes
+
 USE_LANGUAGES= # none
 
 post-install:

Index: pkgsrc/textproc/py-jsonschema/Makefile
diff -u pkgsrc/textproc/py-jsonschema/Makefile:1.17 pkgsrc/textproc/py-jsonschema/Makefile:1.18
--- pkgsrc/textproc/py-jsonschema/Makefile:1.17 Tue Jan  4 20:54:58 2022
+++ pkgsrc/textproc/py-jsonschema/Makefile      Wed Jan  5 15:41:25 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2022/01/04 20:54:58 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2022/01/05 15:41:25 wiz Exp $
 
 DISTNAME=      jsonschema-3.2.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    textproc python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=j/jsonschema/}
 
@@ -24,7 +24,7 @@ DEPENDS+=     ${PYPKGPREFIX}-functools32-[0-
 DEPENDS+=      ${PYPKGPREFIX}-importlib-metadata-[0-9]*:../../devel/py-importlib-metadata
 .endif
 
-PYTHON_VERSIONED_DEPENDENCIES+=        setuptools
+USE_PKG_RESOURCES=     yes
 
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
@@ -34,5 +34,4 @@ do-test:
        cd ${WRKSRC}/jsonschema && ${PYTHONBIN} -m unittest discover -v
 
 .include "../../lang/python/egg.mk"
-.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/textproc/py-m2r/Makefile
diff -u pkgsrc/textproc/py-m2r/Makefile:1.15 pkgsrc/textproc/py-m2r/Makefile:1.16
--- pkgsrc/textproc/py-m2r/Makefile:1.15        Tue Jan  4 20:54:58 2022
+++ pkgsrc/textproc/py-m2r/Makefile     Wed Jan  5 15:41:25 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2022/01/04 20:54:58 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2022/01/05 15:41:25 wiz Exp $
 
 DISTNAME=      m2r-0.2.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    textproc python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=m/m2r/}
 
@@ -18,6 +18,8 @@ USE_LANGUAGES=        # none
 
 PYTHON_VERSIONED_DEPENDENCIES= pygments:test
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && ${MV} m2r m2r-${PYVERSSUFFIX} || ${TRUE}
 

Index: pkgsrc/textproc/py-markdown/Makefile
diff -u pkgsrc/textproc/py-markdown/Makefile:1.24 pkgsrc/textproc/py-markdown/Makefile:1.25
--- pkgsrc/textproc/py-markdown/Makefile:1.24   Tue Jan  4 20:54:59 2022
+++ pkgsrc/textproc/py-markdown/Makefile        Wed Jan  5 15:41:25 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2022/01/04 20:54:59 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2022/01/05 15:41:25 wiz Exp $
 
 DISTNAME=      Markdown-3.2.2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:tl}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    textproc python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=M/Markdown/}
 
@@ -13,9 +13,10 @@ LICENSE=     modified-bsd
 
 TEST_DEPENDS+= ${PYPKGPREFIX}-yaml-[0-9]*:../../textproc/py-yaml
 
-PYTHON_VERSIONED_DEPENDENCIES+=        setuptools
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
+USE_PKG_RESOURCES=     yes
+
 USE_LANGUAGES= # none
 
 post-install:
@@ -23,5 +24,4 @@ post-install:
        ${MV} markdown_py markdown_py${PYVERSSUFFIX} || ${TRUE}
 
 .include "../../lang/python/egg.mk"
-.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/textproc/py-mkdocs/Makefile
diff -u pkgsrc/textproc/py-mkdocs/Makefile:1.6 pkgsrc/textproc/py-mkdocs/Makefile:1.7
--- pkgsrc/textproc/py-mkdocs/Makefile:1.6      Tue Jan  4 20:55:00 2022
+++ pkgsrc/textproc/py-mkdocs/Makefile  Wed Jan  5 15:41:25 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2022/01/04 20:55:00 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2022/01/05 15:41:25 wiz Exp $
 
 DISTNAME=      mkdocs-1.0.4
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    textproc python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=m/mkdocs/}
 
@@ -19,6 +19,8 @@ DEPENDS+=     ${PYPKGPREFIX}-yaml>=3.10:../.
 
 PYTHON_VERSIONED_DEPENDENCIES+=        markdown
 
+USE_PKG_RESOURCES=     yes
+
 USE_LANGUAGES= # none
 
 post-install:

Index: pkgsrc/textproc/py-natsort/Makefile
diff -u pkgsrc/textproc/py-natsort/Makefile:1.19 pkgsrc/textproc/py-natsort/Makefile:1.20
--- pkgsrc/textproc/py-natsort/Makefile:1.19    Tue Jan  4 20:55:00 2022
+++ pkgsrc/textproc/py-natsort/Makefile Wed Jan  5 15:41:25 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2022/01/04 20:55:00 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2022/01/05 15:41:25 wiz Exp $
 
 DISTNAME=      natsort-7.1.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    textproc python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=n/natsort/}
 
@@ -18,6 +18,8 @@ USE_LANGUAGES=        # none
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
        ${MV} natsort natsort-${PYVERSSUFFIX} || ${TRUE}

Index: pkgsrc/textproc/py-nltk/Makefile
diff -u pkgsrc/textproc/py-nltk/Makefile:1.5 pkgsrc/textproc/py-nltk/Makefile:1.6
--- pkgsrc/textproc/py-nltk/Makefile:1.5        Tue Jan  4 20:55:00 2022
+++ pkgsrc/textproc/py-nltk/Makefile    Wed Jan  5 15:41:25 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2022/01/04 20:55:00 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2022/01/05 15:41:25 wiz Exp $
 
 DISTNAME=      nltk-3.6.5
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    textproc python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=n/nltk/}
 EXTRACT_SUFX=  .zip
@@ -56,6 +56,8 @@ REPLACE_PYTHON=               nltk/corpus/reader/knbc
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
        ${MV} nltk nltk-${PYVERSSUFFIX} || ${TRUE}

Index: pkgsrc/textproc/py-openapi-spec-validator/Makefile
diff -u pkgsrc/textproc/py-openapi-spec-validator/Makefile:1.2 pkgsrc/textproc/py-openapi-spec-validator/Makefile:1.3
--- pkgsrc/textproc/py-openapi-spec-validator/Makefile:1.2      Tue Jan  4 20:55:01 2022
+++ pkgsrc/textproc/py-openapi-spec-validator/Makefile  Wed Jan  5 15:41:25 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2022/01/04 20:55:01 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2022/01/05 15:41:25 wiz Exp $
 
 DISTNAME=      openapi-spec-validator-0.3.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    textproc www python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=o/openapi-spec-validator/}
 
@@ -21,6 +21,8 @@ TEST_DEPENDS+=        ${PYPKGPREFIX}-test-flake
 
 USE_LANGUAGES= # none
 
+USE_PKG_RESOURCES=     yes
+
 TEST_ENV+=     PYTHONPATH=${WRKSRC}/build/lib
 
 do-test:

Index: pkgsrc/textproc/py-ptable/Makefile
diff -u pkgsrc/textproc/py-ptable/Makefile:1.2 pkgsrc/textproc/py-ptable/Makefile:1.3
--- pkgsrc/textproc/py-ptable/Makefile:1.2      Tue Jan  4 20:55:02 2022
+++ pkgsrc/textproc/py-ptable/Makefile  Wed Jan  5 15:41:25 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2022/01/04 20:55:02 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2022/01/05 15:41:25 wiz Exp $
 
 DISTNAME=      PTable-0.9.2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:tl}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    textproc python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=P/PTable/}
 
@@ -13,6 +13,8 @@ LICENSE=      modified-bsd
 
 USE_LANGUAGES= # none
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
                ${MV} ptable ptable-${PYVERSSUFFIX} || ${TRUE}

Index: pkgsrc/textproc/py-pybtex/Makefile
diff -u pkgsrc/textproc/py-pybtex/Makefile:1.8 pkgsrc/textproc/py-pybtex/Makefile:1.9
--- pkgsrc/textproc/py-pybtex/Makefile:1.8      Tue Jan  4 20:55:03 2022
+++ pkgsrc/textproc/py-pybtex/Makefile  Wed Jan  5 15:41:26 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2022/01/04 20:55:03 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2022/01/05 15:41:26 wiz Exp $
 
 DISTNAME=      pybtex-0.24.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    textproc python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=p/pybtex/}
 
@@ -17,6 +17,8 @@ DEPENDS+=     ${PYPKGPREFIX}-yaml>=3.01:../.
 
 USE_LANGUAGES= # none
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
        ${MV} pybtex pybtex-${PYVERSSUFFIX} && \

Index: pkgsrc/textproc/py-pygments/Makefile
diff -u pkgsrc/textproc/py-pygments/Makefile:1.37 pkgsrc/textproc/py-pygments/Makefile:1.38
--- pkgsrc/textproc/py-pygments/Makefile:1.37   Tue Jan  4 20:55:03 2022
+++ pkgsrc/textproc/py-pygments/Makefile        Wed Jan  5 15:41:26 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.37 2022/01/04 20:55:03 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2022/01/05 15:41:26 wiz Exp $
 
 DISTNAME=      Pygments-2.11.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:tl}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    textproc python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=P/Pygments/}
 
@@ -18,6 +18,8 @@ USE_LANGUAGES=        # none
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
        ${MV} pygmentize pygmentize-${PYVERSSUFFIX} || ${TRUE}

Index: pkgsrc/textproc/py-pysrt/Makefile
diff -u pkgsrc/textproc/py-pysrt/Makefile:1.3 pkgsrc/textproc/py-pysrt/Makefile:1.4
--- pkgsrc/textproc/py-pysrt/Makefile:1.3       Tue Jan  4 20:55:04 2022
+++ pkgsrc/textproc/py-pysrt/Makefile   Wed Jan  5 15:41:26 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2022/01/04 20:55:04 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2022/01/05 15:41:26 wiz Exp $
 
 DISTNAME=      pysrt-1.1.2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    textproc python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=p/pysrt/}
 
@@ -15,6 +15,8 @@ DEPENDS+=     ${PYPKGPREFIX}-chardet-[0-9]*:
 
 USE_LANGUAGES= # none
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
        ${MV} srt srt-${PYVERSSUFFIX} || ${TRUE}

Index: pkgsrc/textproc/py-ramlfications/Makefile
diff -u pkgsrc/textproc/py-ramlfications/Makefile:1.3 pkgsrc/textproc/py-ramlfications/Makefile:1.4
--- pkgsrc/textproc/py-ramlfications/Makefile:1.3       Tue Jan  4 20:55:04 2022
+++ pkgsrc/textproc/py-ramlfications/Makefile   Wed Jan  5 15:41:26 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2022/01/04 20:55:04 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2022/01/05 15:41:26 wiz Exp $
 
 DISTNAME=      ramlfications-0.1.9
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    textproc python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=r/ramlfications/}
 
@@ -19,6 +19,8 @@ TEST_DEPENDS+=                ${PYPKGPREFIX}-xmltodict
 
 PYTHON_VERSIONED_DEPENDENCIES+=        markdown:test
 
+USE_PKG_RESOURCES=     yes
+
 .include "../../lang/python/egg.mk"
 .include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/textproc/py-rdflib/Makefile
diff -u pkgsrc/textproc/py-rdflib/Makefile:1.9 pkgsrc/textproc/py-rdflib/Makefile:1.10
--- pkgsrc/textproc/py-rdflib/Makefile:1.9      Tue Jan  4 20:55:04 2022
+++ pkgsrc/textproc/py-rdflib/Makefile  Wed Jan  5 15:41:26 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2022/01/04 20:55:04 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2022/01/05 15:41:26 wiz Exp $
 
 DISTNAME=      rdflib-5.0.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    textproc python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=r/rdflib/}
 
@@ -21,6 +21,8 @@ USE_LANGUAGES=        # none
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27      # py-networkx
 
+USE_PKG_RESOURCES=     yes
+
 REPLACE_PYTHON+=       rdflib/extras/describer.py rdflib/extras/infixowl.py
 REPLACE_PYTHON+=       rdflib/plugins/parsers/notation3.py
 REPLACE_PYTHON+=       rdflib/plugins/parsers/ntriples.py

Index: pkgsrc/textproc/py-rst2pdf/Makefile
diff -u pkgsrc/textproc/py-rst2pdf/Makefile:1.11 pkgsrc/textproc/py-rst2pdf/Makefile:1.12
--- pkgsrc/textproc/py-rst2pdf/Makefile:1.11    Tue Jan  4 20:55:05 2022
+++ pkgsrc/textproc/py-rst2pdf/Makefile Wed Jan  5 15:41:26 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2022/01/04 20:55:05 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2022/01/05 15:41:26 wiz Exp $
 
 DISTNAME=      rst2pdf-0.98
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    textproc python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=r/rst2pdf/}
 
@@ -25,6 +25,8 @@ USE_LANGUAGES=        # none
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
        ${MV} rst2pdf rst2pdf-${PYVERSSUFFIX} || ${TRUE}

Index: pkgsrc/textproc/py-sphinx/Makefile
diff -u pkgsrc/textproc/py-sphinx/Makefile:1.81 pkgsrc/textproc/py-sphinx/Makefile:1.82
--- pkgsrc/textproc/py-sphinx/Makefile:1.81     Tue Jan  4 20:55:05 2022
+++ pkgsrc/textproc/py-sphinx/Makefile  Wed Jan  5 15:41:26 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.81 2022/01/04 20:55:05 wiz Exp $
+# $NetBSD: Makefile,v 1.82 2022/01/05 15:41:26 wiz Exp $
 
 DISTNAME=      Sphinx-4.3.2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:tl}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    textproc python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=S/Sphinx/}
 
@@ -40,6 +40,8 @@ PYSETUPTESTTARGET=    pytest
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
        ${MV} sphinx-apidoc sphinx-apidoc-${PYVERSSUFFIX} && \

Index: pkgsrc/textproc/py-sphobjinv/Makefile
diff -u pkgsrc/textproc/py-sphobjinv/Makefile:1.2 pkgsrc/textproc/py-sphobjinv/Makefile:1.3
--- pkgsrc/textproc/py-sphobjinv/Makefile:1.2   Tue Jan  4 20:55:07 2022
+++ pkgsrc/textproc/py-sphobjinv/Makefile       Wed Jan  5 15:41:26 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2022/01/04 20:55:07 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2022/01/05 15:41:26 wiz Exp $
 
 DISTNAME=      sphobjinv-2.0.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    textproc python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=s/sphobjinv/}
 
@@ -20,6 +20,8 @@ USE_LANGUAGES=                # none
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
                ${MV} sphobjinv sphobjinv-${PYVERSSUFFIX} || ${TRUE}

Index: pkgsrc/textproc/py-tabulate/Makefile
diff -u pkgsrc/textproc/py-tabulate/Makefile:1.9 pkgsrc/textproc/py-tabulate/Makefile:1.10
--- pkgsrc/textproc/py-tabulate/Makefile:1.9    Tue Jan  4 20:55:07 2022
+++ pkgsrc/textproc/py-tabulate/Makefile        Wed Jan  5 15:41:27 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2022/01/04 20:55:07 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2022/01/05 15:41:27 wiz Exp $
 
 DISTNAME=      tabulate-0.8.9
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    textproc python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=t/tabulate/}
 
@@ -15,6 +15,8 @@ TEST_DEPENDS+=        ${PYPKGPREFIX}-test-[0-9]
 
 USE_LANGUAGES= # none
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
        ${MV} tabulate tabulate-${PYVERSSUFFIX} || ${TRUE}

Index: pkgsrc/textproc/py-textile/Makefile
diff -u pkgsrc/textproc/py-textile/Makefile:1.21 pkgsrc/textproc/py-textile/Makefile:1.22
--- pkgsrc/textproc/py-textile/Makefile:1.21    Tue Jan  4 20:55:08 2022
+++ pkgsrc/textproc/py-textile/Makefile Wed Jan  5 15:41:27 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2022/01/04 20:55:08 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2022/01/05 15:41:27 wiz Exp $
 
 DISTNAME=      textile-3.0.4
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    textproc python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=t/textile/}
 
@@ -18,6 +18,8 @@ TEST_DEPENDS+=        ${PYPKGPREFIX}-test-cov-[
 
 USE_LANGUAGES= # none
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
        ${MV} pytextile pytextile-${PYVERSSUFFIX} || ${TRUE}

Index: pkgsrc/textproc/py-vobject/Makefile
diff -u pkgsrc/textproc/py-vobject/Makefile:1.27 pkgsrc/textproc/py-vobject/Makefile:1.28
--- pkgsrc/textproc/py-vobject/Makefile:1.27    Tue Jan  4 20:55:08 2022
+++ pkgsrc/textproc/py-vobject/Makefile Wed Jan  5 15:41:27 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.27 2022/01/04 20:55:08 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2022/01/05 15:41:27 wiz Exp $
 
 DISTNAME=      vobject-0.9.6.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    textproc python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=v/vobject/}
 
@@ -13,6 +13,8 @@ LICENSE=      apache-2.0
 
 DEPENDS+=      ${PYPKGPREFIX}-dateutil>=2.4.0:../../time/py-dateutil
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
                ${MV} change_tz change_tz-${PYVERSSUFFIX} && \

Index: pkgsrc/textproc/py-xml2rfc/Makefile
diff -u pkgsrc/textproc/py-xml2rfc/Makefile:1.4 pkgsrc/textproc/py-xml2rfc/Makefile:1.5
--- pkgsrc/textproc/py-xml2rfc/Makefile:1.4     Tue Jan  4 20:55:09 2022
+++ pkgsrc/textproc/py-xml2rfc/Makefile Wed Jan  5 15:41:27 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2022/01/04 20:55:09 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2022/01/05 15:41:27 wiz Exp $
 
 DISTNAME=      xml2rfc-3.5.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    textproc python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=x/xml2rfc/}
 
@@ -37,6 +37,8 @@ TEST_DEPENDS+=        ${PYPKGPREFIX}-weasyprint
 
 USE_LANGUAGES= # none
 
+USE_PKG_RESOURCES=     yes
+
 do-test:
        ${RUN} cd ${WRKSRC} && \
        ${PYTHONBIN} -m unittest

Index: pkgsrc/textproc/py-xmlschema/Makefile
diff -u pkgsrc/textproc/py-xmlschema/Makefile:1.34 pkgsrc/textproc/py-xmlschema/Makefile:1.35
--- pkgsrc/textproc/py-xmlschema/Makefile:1.34  Tue Jan  4 20:55:09 2022
+++ pkgsrc/textproc/py-xmlschema/Makefile       Wed Jan  5 15:41:27 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.34 2022/01/04 20:55:09 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2022/01/05 15:41:27 wiz Exp $
 
 DISTNAME=      xmlschema-1.9.2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    textproc python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=x/xmlschema/}
 
@@ -18,6 +18,8 @@ USE_LANGUAGES=        # none
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27      # py-elementpath
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
 .for bin in xmlschema-json2xml xmlschema-validate xmlschema-xml2json
        cd ${DESTDIR}${PREFIX}/bin && \

Index: pkgsrc/textproc/subliminal/Makefile
diff -u pkgsrc/textproc/subliminal/Makefile:1.7 pkgsrc/textproc/subliminal/Makefile:1.8
--- pkgsrc/textproc/subliminal/Makefile:1.7     Tue Jan  4 20:55:10 2022
+++ pkgsrc/textproc/subliminal/Makefile Wed Jan  5 15:41:27 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2022/01/04 20:55:10 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2022/01/05 15:41:27 wiz Exp $
 
 DISTNAME=      subliminal-2.1.0
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    textproc python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=s/subliminal/}
 
@@ -29,6 +29,8 @@ USE_LANGUAGES=        # none
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27 # py-dogpile-cache, py-stevedore
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
        ${MV} subliminal subliminal-${PYVERSSUFFIX} || ${TRUE}

Index: pkgsrc/textproc/translate-toolkit/Makefile
diff -u pkgsrc/textproc/translate-toolkit/Makefile:1.5 pkgsrc/textproc/translate-toolkit/Makefile:1.6
--- pkgsrc/textproc/translate-toolkit/Makefile:1.5      Tue Jan  4 20:55:10 2022
+++ pkgsrc/textproc/translate-toolkit/Makefile  Wed Jan  5 15:41:27 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2022/01/04 20:55:10 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2022/01/05 15:41:27 wiz Exp $
 
 DISTNAME=      translate-toolkit-3.0.0
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    textproc python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=t/translate-toolkit/}
 
@@ -26,5 +26,7 @@ REPLACE_BASH+=        tools/popuretext
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
+USE_PKG_RESOURCES=     yes
+
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/textproc/yq/Makefile
diff -u pkgsrc/textproc/yq/Makefile:1.3 pkgsrc/textproc/yq/Makefile:1.4
--- pkgsrc/textproc/yq/Makefile:1.3     Tue Jan  4 20:55:10 2022
+++ pkgsrc/textproc/yq/Makefile Wed Jan  5 15:41:27 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2022/01/04 20:55:10 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2022/01/05 15:41:27 wiz Exp $
 
 DISTNAME=      yq-2.9.2
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    textproc
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=kislyuk/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
@@ -21,6 +21,8 @@ TEST_DEPENDS+=        ${PYPKGPREFIX}-wheel-[0-9
 TEST_DEPENDS+= ${PYPKGPREFIX}-flake8-[0-9]*:../../devel/py-flake8
 TEST_DEPENDS+= ${PYPKGPREFIX}-coverage-[0-9]*:../../devel/py-coverage
 
+USE_PKG_RESOURCES=     yes
+
 .include "../../lang/python/application.mk"
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/time/etm/Makefile
diff -u pkgsrc/time/etm/Makefile:1.42 pkgsrc/time/etm/Makefile:1.43
--- pkgsrc/time/etm/Makefile:1.42       Tue Jan  4 20:55:10 2022
+++ pkgsrc/time/etm/Makefile    Wed Jan  5 15:41:27 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.42 2022/01/04 20:55:10 wiz Exp $
+# $NetBSD: Makefile,v 1.43 2022/01/05 15:41:27 wiz Exp $
 
 DISTNAME=      etm-877
-PKGREVISION=   4
+PKGREVISION=   5
 CATEGORIES=    time
 MASTER_SITES=  http://www.duke.edu/~dgraham/ETM/
 
@@ -16,6 +16,8 @@ DEPENDS+=     ${PYPKGPREFIX}-icalendar>=2.0.
 
 PYTHON_VERSIONS_ACCEPTED=      27 # py-wxWidgets
 
+USE_PKG_RESOURCES=     yes
+
 USE_LANGUAGES= # none
 
 REPLACE_PYTHON+=       etm/etmWX.py

Index: pkgsrc/time/khal/Makefile
diff -u pkgsrc/time/khal/Makefile:1.34 pkgsrc/time/khal/Makefile:1.35
--- pkgsrc/time/khal/Makefile:1.34      Tue Jan  4 20:55:10 2022
+++ pkgsrc/time/khal/Makefile   Wed Jan  5 15:41:28 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.34 2022/01/04 20:55:10 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2022/01/05 15:41:28 wiz Exp $
 
 DISTNAME=      khal-0.10.4
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    time net python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=k/khal/}
 
@@ -34,6 +34,8 @@ TEST_DEPENDS+=        ${PYPKGPREFIX}-vdirsyncer
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27 # not supported as of 0.8.0
 
+USE_PKG_RESOURCES=     yes
+
 INSTALLATION_DIRS=     share/doc/khal ${PKGMANDIR}/man1
 REPLACE_PYTHON+=       khal/*/*.py
 REPLACE_PYTHON+=       khal/*.py

Index: pkgsrc/time/py-icalendar/Makefile
diff -u pkgsrc/time/py-icalendar/Makefile:1.36 pkgsrc/time/py-icalendar/Makefile:1.37
--- pkgsrc/time/py-icalendar/Makefile:1.36      Tue Jan  4 20:55:11 2022
+++ pkgsrc/time/py-icalendar/Makefile   Wed Jan  5 15:41:28 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.36 2022/01/04 20:55:11 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2022/01/05 15:41:28 wiz Exp $
 
 DISTNAME=      icalendar-4.0.7
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    time python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=i/icalendar/}
 
@@ -16,6 +16,8 @@ DEPENDS+=     ${PYPKGPREFIX}-pytz-[0-9]*:../
 
 USE_LANGUAGES= # none
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
        ${MV} icalendar icalendar-${PYVERSSUFFIX} || ${TRUE}

Index: pkgsrc/time/py-jrnl/Makefile
diff -u pkgsrc/time/py-jrnl/Makefile:1.5 pkgsrc/time/py-jrnl/Makefile:1.6
--- pkgsrc/time/py-jrnl/Makefile:1.5    Tue Jan  4 20:55:12 2022
+++ pkgsrc/time/py-jrnl/Makefile        Wed Jan  5 15:41:28 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2022/01/04 20:55:12 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2022/01/05 15:41:28 wiz Exp $
 
 DISTNAME=      jrnl-1.9.8
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    time python
 GITHUB_PROJECT=        jrnl
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=maebert/}
@@ -26,6 +26,8 @@ USE_LANGUAGES=        # none
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27      # py-keyring
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        ${MV} ${DESTDIR}${PREFIX}/bin/jrnl ${DESTDIR}${PREFIX}/bin/jrnl-${PYVERSSUFFIX} || ${TRUE}
 

Index: pkgsrc/time/py-tempora/Makefile
diff -u pkgsrc/time/py-tempora/Makefile:1.13 pkgsrc/time/py-tempora/Makefile:1.14
--- pkgsrc/time/py-tempora/Makefile:1.13        Tue Jan  4 20:55:13 2022
+++ pkgsrc/time/py-tempora/Makefile     Wed Jan  5 15:41:28 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2022/01/04 20:55:13 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2022/01/05 15:41:28 wiz Exp $
 
 DISTNAME=      tempora-1.14.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    time python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=t/tempora/}
 
@@ -23,6 +23,8 @@ PYTHON_VERSIONED_DEPENDENCIES=        test:test
 
 USE_LANGUAGES= # none
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && ${MV} calc-prorate calc-prorate${PYVERSSUFFIX} || ${TRUE}
 

Index: pkgsrc/time/py-trading-calendars/Makefile
diff -u pkgsrc/time/py-trading-calendars/Makefile:1.4 pkgsrc/time/py-trading-calendars/Makefile:1.5
--- pkgsrc/time/py-trading-calendars/Makefile:1.4       Tue Jan  4 20:55:13 2022
+++ pkgsrc/time/py-trading-calendars/Makefile   Wed Jan  5 15:41:28 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2022/01/04 20:55:13 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2022/01/05 15:41:28 wiz Exp $
 
 DISTNAME=      trading_calendars-1.11.2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/_/-/}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    time python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=t/trading-calendars/}
 
@@ -21,6 +21,8 @@ USE_LANGUAGES=        # none
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27 # py-pandas
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        ${MV} ${DESTDIR}${PREFIX}/bin/tcal \
                ${DESTDIR}${PREFIX}/bin/tcal-${PYVERSSUFFIX}

Index: pkgsrc/time/py-vdirsyncer/Makefile
diff -u pkgsrc/time/py-vdirsyncer/Makefile:1.60 pkgsrc/time/py-vdirsyncer/Makefile:1.61
--- pkgsrc/time/py-vdirsyncer/Makefile:1.60     Tue Jan  4 20:55:14 2022
+++ pkgsrc/time/py-vdirsyncer/Makefile  Wed Jan  5 15:41:28 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.60 2022/01/04 20:55:14 wiz Exp $
+# $NetBSD: Makefile,v 1.61 2022/01/05 15:41:28 wiz Exp $
 
 DISTNAME=      vdirsyncer-0.18.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    time python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=v/vdirsyncer/}
 
@@ -37,6 +37,8 @@ PYSETUPTESTTARGET=    pytest
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
+USE_PKG_RESOURCES=     yes
+
 USE_TOOLS+=    gmake
 
 post-build:

Index: pkgsrc/www/ddgr/Makefile
diff -u pkgsrc/www/ddgr/Makefile:1.4 pkgsrc/www/ddgr/Makefile:1.5
--- pkgsrc/www/ddgr/Makefile:1.4        Tue Jan  4 20:55:14 2022
+++ pkgsrc/www/ddgr/Makefile    Wed Jan  5 15:41:28 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2022/01/04 20:55:14 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2022/01/05 15:41:28 wiz Exp $
 
 DISTNAME=      ddgr-1.9
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    www
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=jarun/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
@@ -17,6 +17,8 @@ INSTALLATION_DIRS=    ${PKGMANDIR}/man1
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
+USE_PKG_RESOURCES=     yes
+
 REPLACE_PYTHON+=       ddgr
 REPLACE_PYTHON+=       setup.py
 

Index: pkgsrc/www/py-PasteScript/Makefile
diff -u pkgsrc/www/py-PasteScript/Makefile:1.5 pkgsrc/www/py-PasteScript/Makefile:1.6
--- pkgsrc/www/py-PasteScript/Makefile:1.5      Tue Jan  4 20:55:15 2022
+++ pkgsrc/www/py-PasteScript/Makefile  Wed Jan  5 15:41:28 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2022/01/04 20:55:15 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2022/01/05 15:41:28 wiz Exp $
 
 DISTNAME=      PasteScript-2.0.2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    www
 MASTER_SITES=  ${MASTER_SITE_PYPI:=P/PasteScript/}
 
@@ -17,5 +17,7 @@ DEPENDS+=     ${PYPKGPREFIX}-paste-[0-9]*:..
 
 USE_LANGUAGES= # none
 
+USE_PKG_RESOURCES=     yes
+
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/py-autobahn/Makefile
diff -u pkgsrc/www/py-autobahn/Makefile:1.33 pkgsrc/www/py-autobahn/Makefile:1.34
--- pkgsrc/www/py-autobahn/Makefile:1.33        Tue Jan  4 20:55:16 2022
+++ pkgsrc/www/py-autobahn/Makefile     Wed Jan  5 15:41:29 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.33 2022/01/04 20:55:16 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2022/01/05 15:41:29 wiz Exp $
 
 DISTNAME=      autobahn-20.1.2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    www python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=a/autobahn/}
 
@@ -23,6 +23,8 @@ USE_LANGUAGES=        # none
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && ${MV} wamp wamp-${PYVERSSUFFIX}
 

Index: pkgsrc/www/py-cheroot/Makefile
diff -u pkgsrc/www/py-cheroot/Makefile:1.28 pkgsrc/www/py-cheroot/Makefile:1.29
--- pkgsrc/www/py-cheroot/Makefile:1.28 Tue Jan  4 20:55:17 2022
+++ pkgsrc/www/py-cheroot/Makefile      Wed Jan  5 15:41:29 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.28 2022/01/04 20:55:17 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2022/01/05 15:41:29 wiz Exp $
 
 DISTNAME=      cheroot-6.5.8
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    www python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=C/Cheroot/}
 
@@ -35,6 +35,8 @@ DEPENDS+=     ${PYPKGPREFIX}-backports.funct
 
 USE_LANGUAGES= # none
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
        ${MV} cheroot cheroot-${PYVERSSUFFIX} || ${TRUE}

Index: pkgsrc/www/py-cherrypy/Makefile
diff -u pkgsrc/www/py-cherrypy/Makefile:1.41 pkgsrc/www/py-cherrypy/Makefile:1.42
--- pkgsrc/www/py-cherrypy/Makefile:1.41        Tue Jan  4 20:55:17 2022
+++ pkgsrc/www/py-cherrypy/Makefile     Wed Jan  5 15:41:29 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.41 2022/01/04 20:55:17 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2022/01/05 15:41:29 wiz Exp $
 
 DISTNAME=      CherryPy-18.2.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:tl}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    www python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=C/CherryPy/}
 
@@ -30,6 +30,8 @@ USE_LANGUAGES=        # none
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
        ${MV} cherryd cherryd-${PYVERSSUFFIX} || ${TRUE}

Index: pkgsrc/www/py-daphne/Makefile
diff -u pkgsrc/www/py-daphne/Makefile:1.23 pkgsrc/www/py-daphne/Makefile:1.24
--- pkgsrc/www/py-daphne/Makefile:1.23  Tue Jan  4 20:55:17 2022
+++ pkgsrc/www/py-daphne/Makefile       Wed Jan  5 15:41:29 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2022/01/04 20:55:17 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2022/01/05 15:41:29 wiz Exp $
 
 DISTNAME=      daphne-3.0.2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    www python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=d/daphne/}
 
@@ -20,6 +20,8 @@ USE_LANGUAGES=        # none
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
        ${MV} daphne daphne-${PYVERSSUFFIX} || ${TRUE}

Index: pkgsrc/www/py-django/Makefile
diff -u pkgsrc/www/py-django/Makefile:1.116 pkgsrc/www/py-django/Makefile:1.117
--- pkgsrc/www/py-django/Makefile:1.116 Wed Jan  5 10:09:53 2022
+++ pkgsrc/www/py-django/Makefile       Wed Jan  5 15:41:29 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.116 2022/01/05 10:09:53 wiz Exp $
+# $NetBSD: Makefile,v 1.117 2022/01/05 15:41:29 wiz Exp $
 
 DISTNAME=      Django-1.11.29
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:tl}
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    www python
 MASTER_SITES=  https://www.djangoproject.com/m/releases/${PKGVERSION_NOREV:R}/
 
@@ -19,6 +19,8 @@ USE_LANGUAGES=        # none
 REPLACE_PYTHON+=       django/bin/django-admin.py
 REPLACE_PYTHON+=       django/conf/project_template/manage.py-tpl
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
        ${MV} django-admin django-admin-${PYVERSSUFFIX} && \

Index: pkgsrc/www/py-flask/Makefile
diff -u pkgsrc/www/py-flask/Makefile:1.18 pkgsrc/www/py-flask/Makefile:1.19
--- pkgsrc/www/py-flask/Makefile:1.18   Tue Jan  4 20:55:25 2022
+++ pkgsrc/www/py-flask/Makefile        Wed Jan  5 15:41:29 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2022/01/04 20:55:25 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2022/01/05 15:41:29 wiz Exp $
 
 DISTNAME=      Flask-1.1.2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:tl}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    www python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=F/Flask/}
 
@@ -18,6 +18,8 @@ DEPENDS+=     ${PYPKGPREFIX}-werkzeug>=0.15:
 
 PYTHON_VERSIONED_DEPENDENCIES= test:test
 
+USE_PKG_RESOURCES=     yes
+
 USE_LANGUAGES= # none
 
 post-install:

Index: pkgsrc/www/py-google-apitools/Makefile
diff -u pkgsrc/www/py-google-apitools/Makefile:1.9 pkgsrc/www/py-google-apitools/Makefile:1.10
--- pkgsrc/www/py-google-apitools/Makefile:1.9  Tue Jan  4 20:55:29 2022
+++ pkgsrc/www/py-google-apitools/Makefile      Wed Jan  5 15:41:29 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2022/01/04 20:55:29 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2022/01/05 15:41:29 wiz Exp $
 
 DISTNAME=      google-apitools-0.5.32
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    www python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=g/google-apitools/}
 
@@ -21,6 +21,8 @@ TEST_DEPENDS+=        ${PYPKGPREFIX}-nose-[0-9]
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27 # py-gflags
 
+USE_PKG_RESOURCES=     yes
+
 USE_LANGUAGES= # none
 
 post-install:

Index: pkgsrc/www/py-gunicorn/Makefile
diff -u pkgsrc/www/py-gunicorn/Makefile:1.21 pkgsrc/www/py-gunicorn/Makefile:1.22
--- pkgsrc/www/py-gunicorn/Makefile:1.21        Tue Jan  4 20:55:29 2022
+++ pkgsrc/www/py-gunicorn/Makefile     Wed Jan  5 15:41:29 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2022/01/04 20:55:29 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2022/01/05 15:41:29 wiz Exp $
 
 DISTNAME=      gunicorn-20.1.0
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    www python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=g/gunicorn/}
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -22,6 +22,8 @@ PYSETUPTESTTARGET=    pytest
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
        ${MV} gunicorn gunicorn-${PYVERSSUFFIX} || ${TRUE}

Index: pkgsrc/www/py-httpie/Makefile
diff -u pkgsrc/www/py-httpie/Makefile:1.11 pkgsrc/www/py-httpie/Makefile:1.12
--- pkgsrc/www/py-httpie/Makefile:1.11  Tue Jan  4 20:55:30 2022
+++ pkgsrc/www/py-httpie/Makefile       Wed Jan  5 15:41:30 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2022/01/04 20:55:30 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2022/01/05 15:41:30 wiz Exp $
 
 DISTNAME=      httpie-2.6.0
 PKGNAME=       ${PYPKGPREFIX}-${EGG_NAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    www python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=h/httpie/}
 
@@ -25,6 +25,8 @@ USE_LANGUAGES=        # none
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
 .for bin in http https
        cd ${DESTDIR}${PREFIX}/bin && \

Index: pkgsrc/www/py-httpx/Makefile
diff -u pkgsrc/www/py-httpx/Makefile:1.19 pkgsrc/www/py-httpx/Makefile:1.20
--- pkgsrc/www/py-httpx/Makefile:1.19   Tue Jan  4 20:55:30 2022
+++ pkgsrc/www/py-httpx/Makefile        Wed Jan  5 15:41:30 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2022/01/04 20:55:30 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2022/01/05 15:41:30 wiz Exp $
 
 DISTNAME=      httpx-0.21.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    www python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=h/httpx/}
 
@@ -21,6 +21,8 @@ USE_LANGUAGES=        # none
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27 # py-httpcore, py-anyio, py-uvloop
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
        ${MV} httpx httpx-${PYVERSSUFFIX} || ${TRUE}

Index: pkgsrc/www/py-livereload/Makefile
diff -u pkgsrc/www/py-livereload/Makefile:1.9 pkgsrc/www/py-livereload/Makefile:1.10
--- pkgsrc/www/py-livereload/Makefile:1.9       Tue Jan  4 20:55:31 2022
+++ pkgsrc/www/py-livereload/Makefile   Wed Jan  5 15:41:30 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2022/01/04 20:55:31 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2022/01/05 15:41:30 wiz Exp $
 
 DISTNAME=      livereload-2.6.3
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    www python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=l/livereload/}
 
@@ -16,6 +16,8 @@ DEPENDS+=     ${PYPKGPREFIX}-tornado-[0-9]*:
 
 USE_LANGUAGES= # none
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
        ${MV} livereload livereload-${PYVERSSUFFIX} || ${TRUE}

Index: pkgsrc/www/py-mezzanine/Makefile
diff -u pkgsrc/www/py-mezzanine/Makefile:1.13 pkgsrc/www/py-mezzanine/Makefile:1.14
--- pkgsrc/www/py-mezzanine/Makefile:1.13       Tue Jan  4 20:55:31 2022
+++ pkgsrc/www/py-mezzanine/Makefile    Wed Jan  5 15:41:30 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2022/01/04 20:55:31 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2022/01/05 15:41:30 wiz Exp $
 
 DISTNAME=      Mezzanine-4.3.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:tl}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    www python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=M/Mezzanine/}
 
@@ -30,6 +30,8 @@ USE_LANGUAGES=        # none
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27      # py-django-contrib-comments
 
+USE_PKG_RESOURCES=     yes
+
 REPLACE_PYTHON=        mezzanine/project_template/manage.py
 
 post-install:

Index: pkgsrc/www/py-nbformat/Makefile
diff -u pkgsrc/www/py-nbformat/Makefile:1.11 pkgsrc/www/py-nbformat/Makefile:1.12
--- pkgsrc/www/py-nbformat/Makefile:1.11        Tue Jan  4 20:55:32 2022
+++ pkgsrc/www/py-nbformat/Makefile     Wed Jan  5 15:41:30 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2022/01/04 20:55:32 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2022/01/05 15:41:30 wiz Exp $
 
 DISTNAME=      nbformat-5.1.3
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    www python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=n/nbformat/}
 
@@ -23,6 +23,8 @@ USE_LANGUAGES=        # none
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && mv jupyter-trust jupyter-trust-${PYVERSSUFFIX} || ${TRUE}
 

Index: pkgsrc/www/py-notebook/Makefile
diff -u pkgsrc/www/py-notebook/Makefile:1.21 pkgsrc/www/py-notebook/Makefile:1.22
--- pkgsrc/www/py-notebook/Makefile:1.21        Tue Jan  4 20:55:32 2022
+++ pkgsrc/www/py-notebook/Makefile     Wed Jan  5 15:41:30 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2022/01/04 20:55:32 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2022/01/05 15:41:30 wiz Exp $
 
 DISTNAME=      notebook-6.0.3
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    www python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=n/notebook/}
 
@@ -29,6 +29,8 @@ USE_LANGUAGES=        # none
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27 # py-ipykernel
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
 .for name in bundlerextension nbextension notebook serverextension
        cd ${DESTDIR}${PREFIX}/bin && \

Index: pkgsrc/www/py-pelican/Makefile
diff -u pkgsrc/www/py-pelican/Makefile:1.15 pkgsrc/www/py-pelican/Makefile:1.16
--- pkgsrc/www/py-pelican/Makefile:1.15 Tue Jan  4 20:55:32 2022
+++ pkgsrc/www/py-pelican/Makefile      Wed Jan  5 15:41:30 2022
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.15 2022/01/04 20:55:32 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2022/01/05 15:41:30 wiz Exp $
 
 DISTNAME=              pelican-4.5.0
 GITHUB_PROJECT=                pelican
 PKGNAME=               ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=           1
+PKGREVISION=           2
 CATEGORIES=            www textproc
 MASTER_SITES=          ${MASTER_SITE_GITHUB:=getpelican/}
 
@@ -27,6 +27,8 @@ DEPENDS+=             ${PYPKGPREFIX}-dateutil-[0-9]
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 PYTHON_VERSIONED_DEPENDENCIES= sphinx:build
 
+USE_PKG_RESOURCES=     yes
+
 USE_TOOLS+=            make:build sed:build
 
 REPLACE_PYTHON+=       pelican/tools/pelican_import.py

Index: pkgsrc/www/py-pystache/Makefile
diff -u pkgsrc/www/py-pystache/Makefile:1.4 pkgsrc/www/py-pystache/Makefile:1.5
--- pkgsrc/www/py-pystache/Makefile:1.4 Tue Jan  4 20:55:33 2022
+++ pkgsrc/www/py-pystache/Makefile     Wed Jan  5 15:41:30 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2022/01/04 20:55:33 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2022/01/05 15:41:30 wiz Exp $
 
 DISTNAME=      pystache-0.5.4
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    www python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=p/pystache/}
 
@@ -13,6 +13,8 @@ LICENSE=      mit
 
 USE_LANGUAGES= # none
 
+USE_PKG_RESOURCES=     yes
+
 post-extract:
        cd ${WRKSRC} && 2to3-${PYVERSSUFFIX} -w --no-diffs pystache
 

Index: pkgsrc/www/py-raven/Makefile
diff -u pkgsrc/www/py-raven/Makefile:1.11 pkgsrc/www/py-raven/Makefile:1.12
--- pkgsrc/www/py-raven/Makefile:1.11   Tue Jan  4 20:55:34 2022
+++ pkgsrc/www/py-raven/Makefile        Wed Jan  5 15:41:30 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2022/01/04 20:55:34 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2022/01/05 15:41:30 wiz Exp $
 
 DISTNAME=      raven-6.10.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    www python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=r/raven/}
 
@@ -44,6 +44,8 @@ TEST_DEPENDS+=        ${PYPKGPREFIX}-zconfig-[0
 
 PYTHON_VERSIONED_DEPENDENCIES= test:test
 
+USE_PKG_RESOURCES=     yes
+
 .include "../../lang/python/pyversion.mk"
 .if ${PYPKGPREFIX} == py27
 DEPENDS+=      ${PYPKGPREFIX}-contextlib2-[0-9]*:../../devel/py-contextlib2

Index: pkgsrc/www/py-sanic/Makefile
diff -u pkgsrc/www/py-sanic/Makefile:1.23 pkgsrc/www/py-sanic/Makefile:1.24
--- pkgsrc/www/py-sanic/Makefile:1.23   Tue Jan  4 20:55:35 2022
+++ pkgsrc/www/py-sanic/Makefile        Wed Jan  5 15:41:31 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2022/01/04 20:55:35 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2022/01/05 15:41:31 wiz Exp $
 
 DISTNAME=      sanic-21.6.2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    www python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=s/sanic/}
 
@@ -23,6 +23,8 @@ USE_LANGUAGES=        # none
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
        ${MV} sanic sanic-${PYVERSSUFFIX} || ${TRUE}

Index: pkgsrc/www/py-scrapy/Makefile
diff -u pkgsrc/www/py-scrapy/Makefile:1.13 pkgsrc/www/py-scrapy/Makefile:1.14
--- pkgsrc/www/py-scrapy/Makefile:1.13  Tue Jan  4 20:55:35 2022
+++ pkgsrc/www/py-scrapy/Makefile       Wed Jan  5 15:41:31 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2022/01/04 20:55:35 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2022/01/05 15:41:31 wiz Exp $
 
 DISTNAME=      Scrapy-2.4.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:tl}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    www python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=S/Scrapy/}
 
@@ -30,6 +30,8 @@ USE_LANGUAGES=        # none
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
        ${MV} scrapy scrapy-${PYVERSSUFFIX} || ${TRUE}

Index: pkgsrc/www/py-static/Makefile
diff -u pkgsrc/www/py-static/Makefile:1.6 pkgsrc/www/py-static/Makefile:1.7
--- pkgsrc/www/py-static/Makefile:1.6   Tue Jan  4 20:55:35 2022
+++ pkgsrc/www/py-static/Makefile       Wed Jan  5 15:41:31 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2022/01/04 20:55:35 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2022/01/05 15:41:31 wiz Exp $
 
 DISTNAME=      static-1.1.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    www
 MASTER_SITES=  ${MASTER_SITE_PYPI:=s/static/}
 
@@ -15,6 +15,8 @@ USE_LANGUAGES=        # none
 
 DEPENDS+=      ${PYPKGPREFIX}-pystache-[0-9]*:../../www/py-pystache
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        ${MV} ${DESTDIR}${PREFIX}/bin/static ${DESTDIR}${PREFIX}/bin/static-${PYVERSSUFFIX}
 

Index: pkgsrc/www/py-swiftclient/Makefile
diff -u pkgsrc/www/py-swiftclient/Makefile:1.8 pkgsrc/www/py-swiftclient/Makefile:1.9
--- pkgsrc/www/py-swiftclient/Makefile:1.8      Tue Jan  4 20:55:35 2022
+++ pkgsrc/www/py-swiftclient/Makefile  Wed Jan  5 15:41:31 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2022/01/04 20:55:35 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2022/01/05 15:41:31 wiz Exp $
 
 DISTNAME=      python-swiftclient-3.11.0
 PKGNAME=       ${DISTNAME:S/python/${PYPKGPREFIX}/}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    www python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=p/python-swiftclient/}
 
@@ -23,6 +23,8 @@ SUBST_SED.manpath=    -e 's,share/man,${PKG
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX} && \
        ${MV} bin/swift bin/swift-${PYVERSSUFFIX} && \

Index: pkgsrc/www/py-uvicorn/Makefile
diff -u pkgsrc/www/py-uvicorn/Makefile:1.24 pkgsrc/www/py-uvicorn/Makefile:1.25
--- pkgsrc/www/py-uvicorn/Makefile:1.24 Tue Jan  4 20:55:36 2022
+++ pkgsrc/www/py-uvicorn/Makefile      Wed Jan  5 15:41:31 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2022/01/04 20:55:36 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2022/01/05 15:41:31 wiz Exp $
 
 DISTNAME=      uvicorn-0.16.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    www python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=u/uvicorn/}
 
@@ -20,6 +20,8 @@ DEPENDS+=     ${PYPKGPREFIX}-websockets>=10.
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
+USE_PKG_RESOURCES=     yes
+
 .include "../../lang/python/pyversion.mk"
 .if ${_PYTHON_VERSION} < 38
 DEPENDS+=      ${PYPKGPREFIX}-typing-extensions-[0-9]*:../../devel/py-typing-extensions

Index: pkgsrc/www/py-wagtail/Makefile
diff -u pkgsrc/www/py-wagtail/Makefile:1.10 pkgsrc/www/py-wagtail/Makefile:1.11
--- pkgsrc/www/py-wagtail/Makefile:1.10 Tue Jan  4 20:55:37 2022
+++ pkgsrc/www/py-wagtail/Makefile      Wed Jan  5 15:41:31 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2022/01/04 20:55:37 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2022/01/05 15:41:31 wiz Exp $
 
 DISTNAME=      wagtail-2.12.4
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    www python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=w/wagtail/}
 
@@ -38,6 +38,8 @@ USE_LANGUAGES=        # none
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27      # py-django2
 
+USE_PKG_RESOURCES=     yes
+
 REPLACE_PYTHON+=       wagtail/project_template/manage.py
 
 pre-install:

Index: pkgsrc/www/py-waitress/Makefile
diff -u pkgsrc/www/py-waitress/Makefile:1.10 pkgsrc/www/py-waitress/Makefile:1.11
--- pkgsrc/www/py-waitress/Makefile:1.10        Tue Jan  4 20:55:37 2022
+++ pkgsrc/www/py-waitress/Makefile     Wed Jan  5 15:41:31 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2022/01/04 20:55:37 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2022/01/05 15:41:31 wiz Exp $
 
 DISTNAME=      waitress-1.4.3
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    www python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=w/waitress/}
 
@@ -16,6 +16,8 @@ TEST_DEPENDS+=        ${PYPKGPREFIX}-nose-[0-9]
 
 USE_LANGUAGES= # none
 
+USE_PKG_RESOURCES=     yes
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
        ${MV} waitress-serve waitress-serve-${PYVERSSUFFIX} || ${TRUE}

Index: pkgsrc/www/py-webassets/Makefile
diff -u pkgsrc/www/py-webassets/Makefile:1.12 pkgsrc/www/py-webassets/Makefile:1.13
--- pkgsrc/www/py-webassets/Makefile:1.12       Tue Jan  4 20:55:37 2022
+++ pkgsrc/www/py-webassets/Makefile    Wed Jan  5 15:41:31 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2022/01/04 20:55:37 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2022/01/05 15:41:31 wiz Exp $
 
 DISTNAME=      webassets-2.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    www python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=w/webassets/}
 
@@ -11,11 +11,13 @@ HOMEPAGE=   https://webassets.readthedocs.
 COMMENT=       Asset management for Python web development
 LICENSE=       modified-bsd
 
+TEST_DEPENDS+= ${PYPKGPREFIX}-nose-[0-9]*:../../devel/py-nose
+
 USE_LANGUAGES= # empty
 
 REPLACE_PYTHON+=       src/webassets/filter/rjsmin/rjsmin.py
 
-TEST_DEPENDS+= ${PYPKGPREFIX}-nose-[0-9]*:../../devel/py-nose
+USE_PKG_RESOURCES=     yes
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/egg.mk"

Index: pkgsrc/www/trac/Makefile
diff -u pkgsrc/www/trac/Makefile:1.92 pkgsrc/www/trac/Makefile:1.93
--- pkgsrc/www/trac/Makefile:1.92       Tue Jan  4 20:55:39 2022
+++ pkgsrc/www/trac/Makefile    Wed Jan  5 15:41:32 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.92 2022/01/04 20:55:39 wiz Exp $
+# $NetBSD: Makefile,v 1.93 2022/01/05 15:41:32 wiz Exp $
 
 DISTNAME=      Trac-1.4.2
 PKGNAME=       ${DISTNAME:tl}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    www devel
 MASTER_SITES=  http://ftp.edgewall.org/pub/trac/
 
@@ -27,6 +27,8 @@ USE_TOOLS+=   pax
 # The Trac 1.4 series does not support python 3.
 PYTHON_VERSIONS_ACCEPTED=      27
 
+USE_PKG_RESOURCES=     yes
+
 REPLACE_PYTHON=                contrib/*.py contrib/*-hook
 REPLACE_PYTHON+=       trac/tests/functional/*.py
 

Index: pkgsrc/www/tuir/Makefile
diff -u pkgsrc/www/tuir/Makefile:1.2 pkgsrc/www/tuir/Makefile:1.3
--- pkgsrc/www/tuir/Makefile:1.2        Tue Jan  4 20:55:39 2022
+++ pkgsrc/www/tuir/Makefile    Wed Jan  5 15:41:32 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2022/01/04 20:55:39 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2022/01/05 15:41:32 wiz Exp $
 
 DISTNAME=      tuir-1.29.0
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    www
 MASTER_SITES=  ${MASTER_SITE_PYPI:=t/tuir/}
 
@@ -25,6 +25,7 @@ SUBST_FILES.man+=     setup.py
 SUBST_SED.man+=                -e "s,share/man/man1,${PKGMANDIR}/man1,g"
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
+USE_PKG_RESOURCES=             yes
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"



Home | Main Index | Thread Index | Old Index