diff options
author | wiz <wiz@pkgsrc.org> | 2022-01-05 15:40:56 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2022-01-05 15:40:56 +0000 |
commit | d19f073cf98e1f2653a8d55bc4ae03f713437692 (patch) | |
tree | e9aefdaf8aa062e73299809ec4ac25bfcfb8a1a8 | |
parent | 43a3377b786e75dc9288884a4be636135f02feae (diff) | |
download | pkgsrc-d19f073cf98e1f2653a8d55bc4ae03f713437692.tar.gz |
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.
290 files changed, 1181 insertions, 611 deletions
diff --git a/archivers/py-yuicompressor/Makefile b/archivers/py-yuicompressor/Makefile index dbffaa1d953..50ae6e857fe 100644 --- a/archivers/py-yuicompressor/Makefile +++ b/archivers/py-yuicompressor/Makefile @@ -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 \ diff --git a/audio/aeneas/Makefile b/audio/aeneas/Makefile index c0ce37bb8c1..40db0df6fc2 100644 --- a/audio/aeneas/Makefile +++ b/audio/aeneas/Makefile @@ -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]*:../../textproc/py-lxml 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" diff --git a/audio/eyeD3/Makefile b/audio/eyeD3/Makefile index a368d814bbd..4f2f2b3d7b8 100644 --- a/audio/eyeD3/Makefile +++ b/audio/eyeD3/Makefile @@ -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:test PYTHON_VERSIONS_INCOMPATIBLE= 27 # py-faker via py-factory_boy +USE_PKG_RESOURCES= yes + USE_LANGUAGES= # none USE_TOOLS+= gmake diff --git a/audio/py-mutagen/Makefile b/audio/py-mutagen/Makefile index ed2135bdb65..129f5cf8761 100644 --- a/audio/py-mutagen/Makefile +++ b/audio/py-mutagen/Makefile @@ -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 diff --git a/audio/sonata/Makefile b/audio/sonata/Makefile index e3c39bc4e06..d0852aa251f 100644 --- a/audio/sonata/Makefile +++ b/audio/sonata/Makefile @@ -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 diff --git a/biology/py-cutadapt/Makefile b/biology/py-cutadapt/Makefile index 11d58a72c64..06ea230e60e 100644 --- a/biology/py-cutadapt/Makefile +++ b/biology/py-cutadapt/Makefile @@ -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:../../devel/py-xopen PYTHON_VERSIONS_INCOMPATIBLE= 27 # py-xopen, dataclasses +USE_PKG_RESOURCES= yes + post-install: cd ${DESTDIR}${PREFIX}/bin && \ ${MV} cutadapt cutadapt-${PYVERSSUFFIX} || ${TRUE} diff --git a/biology/py-pydicom/Makefile b/biology/py-pydicom/Makefile index 50a60fddfce..a37ade7de7f 100644 --- a/biology/py-pydicom/Makefile +++ b/biology/py-pydicom/Makefile @@ -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} diff --git a/chat/gajim/Makefile b/chat/gajim/Makefile index 9d0192cde59..13aab7d8a57 100644 --- a/chat/gajim/Makefile +++ b/chat/gajim/Makefile @@ -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" diff --git a/chat/matrix-synapse/Makefile b/chat/matrix-synapse/Makefile index e82c9af016b..616878fc483 100644 --- a/chat/matrix-synapse/Makefile +++ b/chat/matrix-synapse/Makefile @@ -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:../../textproc/py-lxml PYTHON_VERSIONED_DEPENDENCIES= Pillow +USE_PKG_RESOURCES= yes + USE_LANGUAGES= # none USE_TOOLS+= perl:run REPLACE_PERL+= scripts/sync_room_to_group.pl diff --git a/chat/maubot/Makefile b/chat/maubot/Makefile index 2328cc788e8..799d9420018 100644 --- a/chat/maubot/Makefile +++ b/chat/maubot/Makefile @@ -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: diff --git a/chat/py-hangups/Makefile b/chat/py-hangups/Makefile index 2b0e9a8833e..3813a95e3d6 100644 --- a/chat/py-hangups/Makefile +++ b/chat/py-hangups/Makefile @@ -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:../../devel/py-urwid USE_LANGUAGES= # none +USE_PKG_RESOURCES= yes + PYTHON_VERSIONS_INCOMPATIBLE= 27 .include "../../lang/python/egg.mk" diff --git a/chat/tootstream/Makefile b/chat/tootstream/Makefile index 0aeb218d0d3..b2ca02fdf3e 100644 --- a/chat/tootstream/Makefile +++ b/chat/tootstream/Makefile @@ -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. diff --git a/comms/py-nodemcu-uploader/Makefile b/comms/py-nodemcu-uploader/Makefile index a9cb7ea4f34..63f34857eea 100644 --- a/comms/py-nodemcu-uploader/Makefile +++ b/comms/py-nodemcu-uploader/Makefile @@ -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" diff --git a/comms/py-serial/Makefile b/comms/py-serial/Makefile index 65e0cb5ca12..8a8589b39d1 100644 --- a/comms/py-serial/Makefile +++ b/comms/py-serial/Makefile @@ -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 && \ diff --git a/converters/py-base58/Makefile b/converters/py-base58/Makefile index d50faace850..b94f17ad6fa 100644 --- a/converters/py-base58/Makefile +++ b/converters/py-base58/Makefile @@ -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} diff --git a/converters/py-bidi/Makefile b/converters/py-bidi/Makefile index 2917603061a..4edbcdf292e 100644 --- a/converters/py-bidi/Makefile +++ b/converters/py-bidi/Makefile @@ -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]*:../../lang/py-six USE_LANGUAGES= # none +USE_PKG_RESOURCES= yes + post-install: cd ${DESTDIR}${PREFIX}/bin && \ ${MV} pybidi pybidi-${PYVERSSUFFIX} || ${TRUE} diff --git a/converters/py-cairosvg/Makefile b/converters/py-cairosvg/Makefile index aeb8ef5f9ad..3c1648816b3 100644 --- a/converters/py-cairosvg/Makefile +++ b/converters/py-cairosvg/Makefile @@ -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} diff --git a/converters/py-chardet/Makefile b/converters/py-chardet/Makefile index 140fdc810f4..4aaef8de6cb 100644 --- a/converters/py-chardet/Makefile +++ b/converters/py-chardet/Makefile @@ -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]*:../../devel/py-py PYTHON_VERSIONED_DEPENDENCIES= hypothesis:test +USE_PKG_RESOURCES= yes + post-install: cd ${DESTDIR}${PREFIX}/bin && \ ${MV} chardetect chardetect-${PYVERSSUFFIX} || ${TRUE} diff --git a/converters/py-charset-normalizer/Makefile b/converters/py-charset-normalizer/Makefile index 9ed0701adff..69a70d12aae 100644 --- a/converters/py-charset-normalizer/Makefile +++ b/converters/py-charset-normalizer/Makefile @@ -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} diff --git a/converters/py-confusable_homoglyphs/Makefile b/converters/py-confusable_homoglyphs/Makefile index 055084629ec..b73cbda9c03 100644 --- a/converters/py-confusable_homoglyphs/Makefile +++ b/converters/py-confusable_homoglyphs/Makefile @@ -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]*:../../devel/py-click USE_LANGUAGES= # none +USE_PKG_RESOURCES= yes + post-install: cd ${DESTDIR}${PREFIX}/bin \ && ${MV} confusable_homoglyphs confusable_homoglyphs-${PYVERSSUFFIX} || ${TRUE} diff --git a/converters/py-zfec/Makefile b/converters/py-zfec/Makefile index 4355602447d..b9e4fd34928 100644 --- a/converters/py-zfec/Makefile +++ b/converters/py-zfec/Makefile @@ -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 && \ diff --git a/databases/py-alembic/Makefile b/databases/py-alembic/Makefile index e5de7451b80..c9511afe71b 100644 --- a/databases/py-alembic/Makefile +++ b/databases/py-alembic/Makefile @@ -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 diff --git a/databases/py-barman/Makefile b/databases/py-barman/Makefile index 89c01c9758b..6838cce243a 100644 --- a/databases/py-barman/Makefile +++ b/databases/py-barman/Makefile @@ -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 diff --git a/databases/py-kb/Makefile b/databases/py-kb/Makefile index 7925501ad6e..3c7117dacb6 100644 --- a/databases/py-kb/Makefile +++ b/databases/py-kb/Makefile @@ -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" diff --git a/databases/py-sqlalchemy-migrate/Makefile b/databases/py-sqlalchemy-migrate/Makefile index fdea45f71a2..06d5055dbd5 100644 --- a/databases/py-sqlalchemy-migrate/Makefile +++ b/databases/py-sqlalchemy-migrate/Makefile @@ -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:../../lang/py-six 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 diff --git a/databases/py-sqlparse/Makefile b/databases/py-sqlparse/Makefile index 1aa2c608385..6dfd4462f90 100644 --- a/databases/py-sqlparse/Makefile +++ b/databases/py-sqlparse/Makefile @@ -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-runner-[0-9]*:../../devel/py-test-runner USE_LANGUAGES= # none +USE_PKG_RESOURCES= yes + PYSETUPTESTTARGET= pytest post-install: diff --git a/devel/RBTools/Makefile b/devel/RBTools/Makefile index 316e6e537d8..18477ac8286 100644 --- a/devel/RBTools/Makefile +++ b/devel/RBTools/Makefile @@ -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 rbtools/postreview.py 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" diff --git a/devel/bpython/Makefile b/devel/bpython/Makefile index c1673f288b3..81240eccdef 100644 --- a/devel/bpython/Makefile +++ b/devel/bpython/Makefile @@ -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 diff --git a/devel/breezy/Makefile b/devel/breezy/Makefile index fca19795a3f..3f639f11334 100644 --- a/devel/breezy/Makefile +++ b/devel/breezy/Makefile @@ -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 diff --git a/devel/lettuce/Makefile b/devel/lettuce/Makefile index eba3c719eb2..2d972a3c23a 100644 --- a/devel/lettuce/Makefile +++ b/devel/lettuce/Makefile @@ -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" diff --git a/devel/meson/Makefile b/devel/meson/Makefile index 7bfd05e0bda..37f0d70d717 100644 --- a/devel/meson/Makefile +++ b/devel/meson/Makefile @@ -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/ninja-build PYTHON_VERSIONS_INCOMPATIBLE= 27 +USE_PKG_RESOURCES= yes + USE_LANGUAGES= c c++ # c++ for tests SUBST_CLASSES+= man diff --git a/devel/py-ZopeTestrunner/Makefile b/devel/py-ZopeTestrunner/Makefile index a4302d0bec8..eaee0bd3014 100644 --- a/devel/py-ZopeTestrunner/Makefile +++ b/devel/py-ZopeTestrunner/Makefile @@ -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.testing-[0-9]*:../../devel/py-zope.testing PYTHON_VERSIONED_DEPENDENCIES+= setuptools +USE_PKG_RESOURCES= yes + .include "../../lang/python/egg.mk" .include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/py-adb/Makefile b/devel/py-adb/Makefile index 141cd2edd7c..3dd32b3b9e8 100644 --- a/devel/py-adb/Makefile +++ b/devel/py-adb/Makefile @@ -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:../../devel/py-libusb1 PYTHON_VERSIONED_DEPENDENCIES+= rsa +USE_PKG_RESOURCES= yes + USE_LANGUAGES= # none post-install: diff --git a/devel/py-argcomplete/Makefile b/devel/py-argcomplete/Makefile index 3073449aca7..63f58ab9a2f 100644 --- a/devel/py-argcomplete/Makefile +++ b/devel/py-argcomplete/Makefile @@ -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-metadata>=0.23:../../devel/py-importlib-metad USE_LANGUAGES= # none +USE_PKG_RESOURCES= yes + .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/py-automat/Makefile b/devel/py-automat/Makefile index 354fce655fc..889ddc05402 100644 --- a/devel/py-automat/Makefile +++ b/devel/py-automat/Makefile @@ -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]*:../../lang/py-six USE_LANGUAGES= # none +USE_PKG_RESOURCES= yes + post-install: cd ${DESTDIR}${PREFIX}/bin && \ ${MV} automat-visualize automat-visualize${PYVERSSUFFIX} || ${TRUE} diff --git a/devel/py-autopep8/Makefile b/devel/py-autopep8/Makefile index 34a8e2238e6..80ab087b5c3 100644 --- a/devel/py-autopep8/Makefile +++ b/devel/py-autopep8/Makefile @@ -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]*:../../textproc/py-toml USE_LANGUAGES= # none +USE_PKG_RESOURCES= yes + post-install: cd ${DESTDIR}${PREFIX}/bin && \ ${MV} autopep8 autopep8-${PYVERSSUFFIX} || ${TRUE} diff --git a/devel/py-babel/Makefile b/devel/py-babel/Makefile index 8997c37fc68..cf5d338c627 100644 --- a/devel/py-babel/Makefile +++ b/devel/py-babel/Makefile @@ -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-runner-[0-9]*:../../devel/py-test-runner USE_LANGUAGES= # none +USE_PKG_RESOURCES= yes + PYSETUPTESTTARGET= pytest post-install: diff --git a/devel/py-behave/Makefile b/devel/py-behave/Makefile index a2d4144c916..1252b05f2b2 100644 --- a/devel/py-behave/Makefile +++ b/devel/py-behave/Makefile @@ -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} diff --git a/devel/py-build/Makefile b/devel/py-build/Makefile index eb68444439e..dca8c2a32e4 100644 --- a/devel/py-build/Makefile +++ b/devel/py-build/Makefile @@ -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]*:../../comms/py-colorama PYTHON_VERSIONS_INCOMPATIBLE= 27 +USE_PKG_RESOURCES= yes + .include "../../lang/python/pyversion.mk" .if ${PYPKGPREFIX} == "py36" || ${PYPKGPREFIX} == "py37" diff --git a/devel/py-buildbot-worker/Makefile b/devel/py-buildbot-worker/Makefile index 9a58726d1ff..ab104149c03 100644 --- a/devel/py-buildbot-worker/Makefile +++ b/devel/py-buildbot-worker/Makefile @@ -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]*:../../devel/py-mock USE_LANGUAGES= # none +USE_PKG_RESOURCES= yes + post-install: cd ${DESTDIR}${PREFIX}/bin && \ ${MV} buildbot-worker buildbot-worker-${PYVERSSUFFIX} && \ diff --git a/devel/py-buildbot/Makefile b/devel/py-buildbot/Makefile index 5e8d4dad333..6f4c54083f9 100644 --- a/devel/py-buildbot/Makefile +++ b/devel/py-buildbot/Makefile @@ -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-[0-9]*:../../devel/py-txrequests PYTHON_VERSIONS_INCOMPATIBLE= 27 +USE_PKG_RESOURCES= yes + PYTHON_VERSIONED_DEPENDENCIES+= setuptools USE_LANGUAGES= # none diff --git a/devel/py-bump2version/Makefile b/devel/py-bump2version/Makefile index 1d0c03708d8..6121c98b88a 100644 --- a/devel/py-bump2version/Makefile +++ b/devel/py-bump2version/Makefile @@ -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} diff --git a/devel/py-cachecontrol/Makefile b/devel/py-cachecontrol/Makefile index 92eacb90476..33dfa17da1e 100644 --- a/devel/py-cachecontrol/Makefile +++ b/devel/py-cachecontrol/Makefile @@ -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:../../devel/py-msgpack USE_LANGUAGES= # none +USE_PKG_RESOURCES= yes + post-install: cd ${DESTDIR}${PREFIX}/bin && \ ${MV} doesitcache doesitcache-${PYVERSSUFFIX} || ${TRUE} diff --git a/devel/py-codespell/Makefile b/devel/py-codespell/Makefile index 8a12e889b69..e9c642bad84 100644 --- a/devel/py-codespell/Makefile +++ b/devel/py-codespell/Makefile @@ -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: diff --git a/devel/py-codestyle/Makefile b/devel/py-codestyle/Makefile index 14d7403b8be..c18deba4283 100644 --- a/devel/py-codestyle/Makefile +++ b/devel/py-codestyle/Makefile @@ -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} diff --git a/devel/py-cookiecutter/Makefile b/devel/py-cookiecutter/Makefile index 5ec839f70a6..46cff082cce 100644 --- a/devel/py-cookiecutter/Makefile +++ b/devel/py-cookiecutter/Makefile @@ -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} diff --git a/devel/py-coverage/Makefile b/devel/py-coverage/Makefile index b4743312b50..2a328b80884 100644 --- a/devel/py-coverage/Makefile +++ b/devel/py-coverage/Makefile @@ -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-mixins>=1.6:../../devel/py-unittest-mixin PYTHON_VERSIONED_DEPENDENCIES= test:test +USE_PKG_RESOURCES= yes + PYSETUPTESTTARGET= pytest post-install: diff --git a/devel/py-cpplint/Makefile b/devel/py-cpplint/Makefile index daef3d86e86..56a1f8ff4c0 100644 --- a/devel/py-cpplint/Makefile +++ b/devel/py-cpplint/Makefile @@ -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-[0-9]*:../../devel/py-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 diff --git a/devel/py-cython/Makefile b/devel/py-cython/Makefile index 93428f8438a..6b11443c949 100644 --- a/devel/py-cython/Makefile +++ b/devel/py-cython/Makefile @@ -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.py REPLACE_PYTHON+= Cython/Debugger/libpython.py REPLACE_PYTHON+= cython.py +USE_PKG_RESOURCES= yes + # for test only #USE_LANGUAGES= c c++ do-test: diff --git a/devel/py-distro/Makefile b/devel/py-distro/Makefile index 5f16d753f7a..1b0890caeb1 100644 --- a/devel/py-distro/Makefile +++ b/devel/py-distro/Makefile @@ -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: diff --git a/devel/py-doc8/Makefile b/devel/py-doc8/Makefile index 23d1ef1d311..3e325f7d281 100644 --- a/devel/py-doc8/Makefile +++ b/devel/py-doc8/Makefile @@ -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 setup; setup()' PYTHON_VERSIONS_INCOMPATIBLE= 27 +USE_PKG_RESOURCES= yes + post-install: cd ${DESTDIR}${PREFIX}/bin && \ ${MV} doc8 doc8-${PYVERSSUFFIX} || ${TRUE} diff --git a/devel/py-docstyle/Makefile b/devel/py-docstyle/Makefile index 5ea001a7867..99a140a09a8 100644 --- a/devel/py-docstyle/Makefile +++ b/devel/py-docstyle/Makefile @@ -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 diff --git a/devel/py-dotenv/Makefile b/devel/py-dotenv/Makefile index bdcebacffd6..2f98b699b85 100644 --- a/devel/py-dotenv/Makefile +++ b/devel/py-dotenv/Makefile @@ -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} diff --git a/devel/py-dulwich/Makefile b/devel/py-dulwich/Makefile index 7c56bf6f56e..b210132eef2 100644 --- a/devel/py-dulwich/Makefile +++ b/devel/py-dulwich/Makefile @@ -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]*:../../devel/py-mock PYTHON_VERSIONS_INCOMPATIBLE= 27 +USE_PKG_RESOURCES= yes + post-install: cd ${DESTDIR}${PREFIX}/bin && \ ${MV} dul-receive-pack dul-receive-pack-${PYVERSSUFFIX} && \ diff --git a/devel/py-editorconfig-core/Makefile b/devel/py-editorconfig-core/Makefile index f96680fe330..01eb25faddb 100644 --- a/devel/py-editorconfig-core/Makefile +++ b/devel/py-editorconfig-core/Makefile @@ -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 modified-bsd USE_LANGUAGES= # none +USE_PKG_RESOURCES= yes + post-install: cd ${DESTDIR}${PREFIX}/bin && \ ${MV} editorconfig editorconfig-${PYVERSSUFFIX} || ${TRUE} diff --git a/devel/py-faker/Makefile b/devel/py-faker/Makefile index 056111137f9..1c8c50c0381 100644 --- a/devel/py-faker/Makefile +++ b/devel/py-faker/Makefile @@ -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>=0.13.0:../../textproc/py-validators PYTHON_VERSIONS_INCOMPATIBLE= 27 # since 4.0.0 +USE_PKG_RESOURCES= yes + USE_LANGUAGES= # none post-install: diff --git a/devel/py-falcon/Makefile b/devel/py-falcon/Makefile index 8ea2d37878b..780f384662f 100644 --- a/devel/py-falcon/Makefile +++ b/devel/py-falcon/Makefile @@ -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-runner-[0-9]*:../../devel/py-test-runner 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} && \ diff --git a/devel/py-flake8/Makefile b/devel/py-flake8/Makefile index 5739ecca621..cfcd60c1e25 100644 --- a/devel/py-flake8/Makefile +++ b/devel/py-flake8/Makefile @@ -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-9]*:../../devel/py-pylint USE_LANGUAGES= # none +USE_PKG_RESOURCES= yes + post-install: cd ${DESTDIR}${PREFIX}/bin && \ ${MV} flake8 flake8-${PYVERSSUFFIX} || ${TRUE} diff --git a/devel/py-flakes/Makefile b/devel/py-flakes/Makefile index ac801a5d1b0..4c2144274aa 100644 --- a/devel/py-flakes/Makefile +++ b/devel/py-flakes/Makefile @@ -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} diff --git a/devel/py-future/Makefile b/devel/py-future/Makefile index 89847e812fd..c4ac1ecbf98 100644 --- a/devel/py-future/Makefile +++ b/devel/py-future/Makefile @@ -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} && \ diff --git a/devel/py-gcovr/Makefile b/devel/py-gcovr/Makefile index c333ba8bb91..5bf01b5581c 100644 --- a/devel/py-gcovr/Makefile +++ b/devel/py-gcovr/Makefile @@ -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" diff --git a/devel/py-gitinspector/Makefile b/devel/py-gitinspector/Makefile index ab88241b8ef..6f52b377d3f 100644 --- a/devel/py-gitinspector/Makefile +++ b/devel/py-gitinspector/Makefile @@ -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} diff --git a/devel/py-grako/Makefile b/devel/py-grako/Makefile index 8015c0f8f25..a95b641bd30 100644 --- a/devel/py-grako/Makefile +++ b/devel/py-grako/Makefile @@ -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-runner-[0-9]*:../../devel/py-test-runner USE_LANGUAGES= c +USE_PKG_RESOURCES= yes + post-install: cd ${DESTDIR}${PREFIX}/bin && mv grako grako${PYVERSSUFFIX} || ${TRUE} diff --git a/devel/py-hypothesis/Makefile b/devel/py-hypothesis/Makefile index 762866e4f40..c34a5d384b8 100644 --- a/devel/py-hypothesis/Makefile +++ b/devel/py-hypothesis/Makefile @@ -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}-sortedcontainers>=2.1.0:../../devel/py-sortedcontainers PYTHON_VERSIONS_INCOMPATIBLE= 27 +USE_PKG_RESOURCES= yes + USE_LANGUAGES= # none .include "../../lang/python/egg.mk" diff --git a/devel/py-ipython/Makefile b/devel/py-ipython/Makefile index ffa5ce671a6..5151a6eb210 100644 --- a/devel/py-ipython/Makefile +++ b/devel/py-ipython/Makefile @@ -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 && \ diff --git a/devel/py-isort/Makefile b/devel/py-isort/Makefile index d82238f3b4b..361e9f161bf 100644 --- a/devel/py-isort/Makefile +++ b/devel/py-isort/Makefile @@ -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 && \ diff --git a/devel/py-jaraco_util/Makefile b/devel/py-jaraco_util/Makefile index 6bbf2713063..9b2a4e36715 100644 --- a/devel/py-jaraco_util/Makefile +++ b/devel/py-jaraco_util/Makefile @@ -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} diff --git a/devel/py-jupyter-console/Makefile b/devel/py-jupyter-console/Makefile index e0125317a8b..db07a134058 100644 --- a/devel/py-jupyter-console/Makefile +++ b/devel/py-jupyter-console/Makefile @@ -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} diff --git a/devel/py-jupyter_client/Makefile b/devel/py-jupyter_client/Makefile index 0350b220596..4ecede6d856 100644 --- a/devel/py-jupyter_client/Makefile +++ b/devel/py-jupyter_client/Makefile @@ -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} && \ diff --git a/devel/py-jupyter_core/Makefile b/devel/py-jupyter_core/Makefile index 365209d139c..136b2b605c1 100644 --- a/devel/py-jupyter_core/Makefile +++ b/devel/py-jupyter_core/Makefile @@ -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. diff --git a/devel/py-lama/Makefile b/devel/py-lama/Makefile index 04666cf486c..749da1f43f9 100644 --- a/devel/py-lama/Makefile +++ b/devel/py-lama/Makefile @@ -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:../../devel/py-radon PYTHON_VERSIONED_DEPENDENCIES= test:test +USE_PKG_RESOURCES= yes + USE_LANGUAGES= # none post-install: diff --git a/devel/py-line_profiler/Makefile b/devel/py-line_profiler/Makefile index 8fbc41df6e3..3b556218d78 100644 --- a/devel/py-line_profiler/Makefile +++ b/devel/py-line_profiler/Makefile @@ -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 diff --git a/devel/py-logilab-common/Makefile b/devel/py-logilab-common/Makefile index 37ac82614a0..f19e1058df3 100644 --- a/devel/py-logilab-common/Makefile +++ b/devel/py-logilab-common/Makefile @@ -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} diff --git a/devel/py-macholib/Makefile b/devel/py-macholib/Makefile index 752787d3989..8f9ee1765a4 100644 --- a/devel/py-macholib/Makefile +++ b/devel/py-macholib/Makefile @@ -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} && \ diff --git a/devel/py-mako/Makefile b/devel/py-mako/Makefile index 0e723ad3db0..ba0d07c19ab 100644 --- a/devel/py-mako/Makefile +++ b/devel/py-mako/Makefile @@ -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-runner-[0-9]*:../../devel/py-test-runner USE_LANGUAGES= # none +USE_PKG_RESOURCES= yes + PYSETUPTESTTARGET= pytest post-install: diff --git a/devel/py-manticore/Makefile b/devel/py-manticore/Makefile index 49191653de4..5d36fac5236 100644 --- a/devel/py-manticore/Makefile +++ b/devel/py-manticore/Makefile @@ -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]*:../../textproc/py-yaml PYTHON_VERSIONS_INCOMPATIBLE= 27 +USE_PKG_RESOURCES= yes + post-install: .for alternative in bin/manticore bin/manticore-verifier ${MV} ${DESTDIR}${PREFIX}/${alternative} \ diff --git a/devel/py-memory-profiler/Makefile b/devel/py-memory-profiler/Makefile index 069a50515b2..631cd106d39 100644 --- a/devel/py-memory-profiler/Makefile +++ b/devel/py-memory-profiler/Makefile @@ -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} diff --git a/devel/py-minidump/Makefile b/devel/py-minidump/Makefile index 350c364a80a..bb34209a68d 100644 --- a/devel/py-minidump/Makefile +++ b/devel/py-minidump/Makefile @@ -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} diff --git a/devel/py-modulegraph/Makefile b/devel/py-modulegraph/Makefile index e3cbcd12dc4..35e4dd84ac0 100644 --- a/devel/py-modulegraph/Makefile +++ b/devel/py-modulegraph/Makefile @@ -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]*:../../devel/py-setuptools USE_LANGUAGES= # none +USE_PKG_RESOURCES= yes + post-install: cd ${DESTDIR}${PREFIX}/bin && \ ${MV} modulegraph modulegraph-${PYVERSSUFFIX} || ${TRUE} diff --git a/devel/py-nose/Makefile b/devel/py-nose/Makefile index 16ec48a4a9b..fdac259cc33 100644 --- a/devel/py-nose/Makefile +++ b/devel/py-nose/Makefile @@ -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>=3.0:../../devel/py-coverage USE_LANGUAGES= # none +USE_PKG_RESOURCES= yes + INSTALLATION_DIRS+= ${PKGMANDIR}/man1 post-install: diff --git a/devel/py-nose2/Makefile b/devel/py-nose2/Makefile index 677304f54b7..62c4d343baf 100644 --- a/devel/py-nose2/Makefile +++ b/devel/py-nose2/Makefile @@ -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]*:../../devel/py-mock USE_LANGUAGES= # none +USE_PKG_RESOURCES= yes + post-install: ${RM} -f ${DESTDIR}${PREFIX}/bin/nose2 diff --git a/devel/py-pbr/Makefile b/devel/py-pbr/Makefile index 3316c51f19e..ad9b5b8c8bf 100644 --- a/devel/py-pbr/Makefile +++ b/devel/py-pbr/Makefile @@ -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.32.0:../../devel/py-wheel 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} diff --git a/devel/py-pep8/Makefile b/devel/py-pep8/Makefile index 96e4cf460fe..9f4cef5df08 100644 --- a/devel/py-pep8/Makefile +++ b/devel/py-pep8/Makefile @@ -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 diff --git a/devel/py-pip/Makefile b/devel/py-pip/Makefile index 98d0c5dbd07..3f3499eda11 100644 --- a/devel/py-pip/Makefile +++ b/devel/py-pip/Makefile @@ -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/requests/certs.py PYTHON_VERSIONS_INCOMPATIBLE= 27 +USE_PKG_RESOURCES= yes + .include "../../lang/python/pyversion.mk" FILES_SUBST+= PYMAJORVERSION=${_PYTHON_VERSION:C/^([0-9]).*/\1/} diff --git a/devel/py-pkginfo/Makefile b/devel/py-pkginfo/Makefile index d0fbe78c94f..aa3f8caa334 100644 --- a/devel/py-pkginfo/Makefile +++ b/devel/py-pkginfo/Makefile @@ -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]*:../../devel/py-nose USE_LANGUAGES= # none +USE_PKG_RESOURCES= yes + .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/py-pybind11/Makefile b/devel/py-pybind11/Makefile index 81e4a77b381..71798b5b2c4 100644 --- a/devel/py-pybind11/Makefile +++ b/devel/py-pybind11/Makefile @@ -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" diff --git a/devel/py-pylint/Makefile b/devel/py-pylint/Makefile index 099a99704cb..f7c87f2b675 100644 --- a/devel/py-pylint/Makefile +++ b/devel/py-pylint/Makefile @@ -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 diff --git a/devel/py-pyutil/Makefile b/devel/py-pyutil/Makefile index ac37ab409e3..fb622b4dfa4 100644 --- a/devel/py-pyutil/Makefile +++ b/devel/py-pyutil/Makefile @@ -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>=15.5.0:../../net/py-twisted USE_LANGUAGES= # none +USE_PKG_RESOURCES= yes + CONFLICTS+= passphrase-[0-9]* post-extract: diff --git a/devel/py-radon/Makefile b/devel/py-radon/Makefile index 6e6e858b721..93f748adb84 100644 --- a/devel/py-radon/Makefile +++ b/devel/py-radon/Makefile @@ -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]*:../../devel/py-tox PYTHON_VERSIONED_DEPENDENCIES= test:test +USE_PKG_RESOURCES= yes + USE_LANGUAGES= # none post-install: diff --git a/devel/py-restructuredtext_lint/Makefile b/devel/py-restructuredtext_lint/Makefile index 0ad7a932ccc..d4c024c3452 100644 --- a/devel/py-restructuredtext_lint/Makefile +++ b/devel/py-restructuredtext_lint/Makefile @@ -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:../../textproc/py-docutils USE_LANGUAGES= # none +USE_PKG_RESOURCES= yes + post-install: .for bin in restructuredtext-lint rst-lint cd ${DESTDIR}${PREFIX}/bin && \ diff --git a/devel/py-slugify/Makefile b/devel/py-slugify/Makefile index f8a62a47c4c..fe6303af4e7 100644 --- a/devel/py-slugify/Makefile +++ b/devel/py-slugify/Makefile @@ -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} diff --git a/devel/py-test-benchmark/Makefile b/devel/py-test-benchmark/Makefile index 619fb91b3cb..e0b3f328651 100644 --- a/devel/py-test-benchmark/Makefile +++ b/devel/py-test-benchmark/Makefile @@ -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 && \ diff --git a/devel/py-test-watch/Makefile b/devel/py-test-watch/Makefile index ba152eabe35..9203de48d92 100644 --- a/devel/py-test-watch/Makefile +++ b/devel/py-test-watch/Makefile @@ -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:../../sysutils/py-watchdog PYTHON_VERSIONED_DEPENDENCIES= test +USE_PKG_RESOURCES= yes + USE_LANGUAGES= # none post-install: diff --git a/devel/py-test/Makefile b/devel/py-test/Makefile index 6833f9b18ef..08c105dbb5a 100644 --- a/devel/py-test/Makefile +++ b/devel/py-test/Makefile @@ -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-[0-9]*:../../textproc/py-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 diff --git a/devel/py-tox/Makefile b/devel/py-tox/Makefile index 6fea5324c81..b517d1589d7 100644 --- a/devel/py-tox/Makefile +++ b/devel/py-tox/Makefile @@ -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-metadata>=0.12:../../devel/py-importlib-metad PYTHON_VERSIONED_DEPENDENCIES+= packaging PYTHON_VERSIONED_DEPENDENCIES+= test:test +USE_PKG_RESOURCES= yes + USE_LANGUAGES= # none post-install: diff --git a/devel/py-tryton/Makefile b/devel/py-tryton/Makefile index 66fbb572ab0..3a913e0f4d6 100644 --- a/devel/py-tryton/Makefile +++ b/devel/py-tryton/Makefile @@ -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" diff --git a/devel/py-trytond/Makefile b/devel/py-trytond/Makefile index 2b9d5029130..2f2645bcc41 100644 --- a/devel/py-trytond/Makefile +++ b/devel/py-trytond/Makefile @@ -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-9]*:../../graphics/py-Pillow 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} \ diff --git a/devel/py-unittest2/Makefile b/devel/py-unittest2/Makefile index 273aaaae6dd..a0647d8716b 100644 --- a/devel/py-unittest2/Makefile +++ b/devel/py-unittest2/Makefile @@ -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} diff --git a/devel/py-unittest2pytest/Makefile b/devel/py-unittest2pytest/Makefile index d9f4ba76264..d9d55f30571 100644 --- a/devel/py-unittest2pytest/Makefile +++ b/devel/py-unittest2pytest/Makefile @@ -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} diff --git a/devel/py-virtualenv/Makefile b/devel/py-virtualenv/Makefile index 1f3c35d78d4..d976f34a104 100644 --- a/devel/py-virtualenv/Makefile +++ b/devel/py-virtualenv/Makefile @@ -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]*:../../devel/py-mock PYTHON_VERSIONED_DEPENDENCIES= test:test +USE_PKG_RESOURCES= yes + USE_LANGUAGES= # none REPLACE_PYTHON= virtualenv.py diff --git a/devel/py-wasm/Makefile b/devel/py-wasm/Makefile index b51abd556c5..91293b4f27a 100644 --- a/devel/py-wasm/Makefile +++ b/devel/py-wasm/Makefile @@ -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} diff --git a/devel/py-wheel/Makefile b/devel/py-wheel/Makefile index b903e38e9e8..06ded8398b1 100644 --- a/devel/py-wheel/Makefile +++ b/devel/py-wheel/Makefile @@ -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} diff --git a/devel/py-xdis/Makefile b/devel/py-xdis/Makefile index 1649f912acc..047ea2a8ed0 100644 --- a/devel/py-xdis/Makefile +++ b/devel/py-xdis/Makefile @@ -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} diff --git a/devel/py-yapf/Makefile b/devel/py-yapf/Makefile index 36404f268e7..ba61af6fe70 100644 --- a/devel/py-yapf/Makefile +++ b/devel/py-yapf/Makefile @@ -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 && \ diff --git a/devel/py-zconfig/Makefile b/devel/py-zconfig/Makefile index 12053fcdb2f..cc4eb3e255b 100644 --- a/devel/py-zconfig/Makefile +++ b/devel/py-zconfig/Makefile @@ -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}-ZopeTestrunner-[0-9]*:../../devel/py-ZopeTestrunne USE_LANGUAGES= # none +USE_PKG_RESOURCES= yes + post-install: cd ${DESTDIR}${PREFIX}/bin && \ ${MV} zconfig zconfig-${PYVERSSUFFIX} && \ diff --git a/devel/undebt/Makefile b/devel/undebt/Makefile index 3c0de605fab..ccabd574fe6 100644 --- a/devel/undebt/Makefile +++ b/devel/undebt/Makefile @@ -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]*:../../devel/py-argparse PYTHON_VERSIONED_DEPENDENCIES+= pyparsing +USE_PKG_RESOURCES= yes + USE_LANGUAGES= # none .include "../../lang/python/egg.mk" diff --git a/editors/retext/Makefile b/editors/retext/Makefile index 54781df014b..79fcbfdd7aa 100644 --- a/editors/retext/Makefile +++ b/editors/retext/Makefile @@ -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" diff --git a/emulators/gns3-gui/Makefile b/emulators/gns3-gui/Makefile index 8d55af88b82..f8eda61beab 100644 --- a/emulators/gns3-gui/Makefile +++ b/emulators/gns3-gui/Makefile @@ -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-gui 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 diff --git a/emulators/gns3-server/Makefile b/emulators/gns3-server/Makefile index 89745e625bc..bbe9d4b90df 100644 --- a/emulators/gns3-server/Makefile +++ b/emulators/gns3-server/Makefile @@ -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-server 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:../../sysutils/py-psutil 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 diff --git a/filesystems/fuse-pcachefs/Makefile b/filesystems/fuse-pcachefs/Makefile index b6e6f4002b2..1d39e3b18dc 100644 --- a/filesystems/fuse-pcachefs/Makefile +++ b/filesystems/fuse-pcachefs/Makefile @@ -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/pcachefs 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} diff --git a/filesystems/tahoe-lafs/Makefile b/filesystems/tahoe-lafs/Makefile index d6e31cbce6f..b417dd7662a 100644 --- a/filesystems/tahoe-lafs/Makefile +++ b/filesystems/tahoe-lafs/Makefile @@ -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 diff --git a/finance/py-backtrader/Makefile b/finance/py-backtrader/Makefile index 2e06e397fbb..1a141a6f3b4 100644 --- a/finance/py-backtrader/Makefile +++ b/finance/py-backtrader/Makefile @@ -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 && \ diff --git a/finance/py-crytic-compile/Makefile b/finance/py-crytic-compile/Makefile index 85ebd20baeb..7e047b22736 100644 --- a/finance/py-crytic-compile/Makefile +++ b/finance/py-crytic-compile/Makefile @@ -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} diff --git a/finance/py-pyevmasm/Makefile b/finance/py-pyevmasm/Makefile index 2f089d6c61b..fa4f5e93e90 100644 --- a/finance/py-pyevmasm/Makefile +++ b/finance/py-pyevmasm/Makefile @@ -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]*:../../devel/py-test USE_LANGUAGES= # none +USE_PKG_RESOURCES= yes + TEST_ENV+= PYTHONPATH=${WRKSRC}/build/lib post-install: diff --git a/finance/py-trytond-currency/Makefile b/finance/py-trytond-currency/Makefile index e11c850fccd..670fc36ef96 100644 --- a/finance/py-trytond-currency/Makefile +++ b/finance/py-trytond-currency/Makefile @@ -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>=${TRYTON_BASEVER}:../../devel/py-trytond USE_LANGUAGES= # none +USE_PKG_RESOURCES= yes + REPLACE_PYTHON+= tests/test_currency.py tests/tools.py .include "../../lang/python/application.mk" diff --git a/fonts/py-fonttools/Makefile b/fonts/py-fonttools/Makefile index 0c98c470e6c..bcf2c663f0e 100644 --- a/fonts/py-fonttools/Makefile +++ b/fonts/py-fonttools/Makefile @@ -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. diff --git a/geography/py-obspy/Makefile b/geography/py-obspy/Makefile index c692e01e436..57b4983c0f7 100644 --- a/geography/py-obspy/Makefile +++ b/geography/py-obspy/Makefile @@ -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_test_data/gendata.sh PYTHON_VERSIONS_INCOMPATIBLE= 27 # py-scipy +USE_PKG_RESOURCES= yes + pre-configure: ${FIND} ${WRKSRC} -type f -exec ${CHMOD} -x {} \; diff --git a/geography/py-trytond-country/Makefile b/geography/py-trytond-country/Makefile index 705af6b3019..0dc62360b91 100644 --- a/geography/py-trytond-country/Makefile +++ b/geography/py-trytond-country/Makefile @@ -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: diff --git a/graphics/py-actdiag/Makefile b/graphics/py-actdiag/Makefile index e478a40dbd3..a1837d9913d 100644 --- a/graphics/py-actdiag/Makefile +++ b/graphics/py-actdiag/Makefile @@ -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} diff --git a/graphics/py-blockdiag/Makefile b/graphics/py-blockdiag/Makefile index bb8ba861aa5..cbca6767776 100644 --- a/graphics/py-blockdiag/Makefile +++ b/graphics/py-blockdiag/Makefile @@ -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" diff --git a/graphics/py-fits/Makefile b/graphics/py-fits/Makefile index cbbf27955a7..5840e71a133 100644 --- a/graphics/py-fits/Makefile +++ b/graphics/py-fits/Makefile @@ -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} && \ diff --git a/graphics/py-imageio/Makefile b/graphics/py-imageio/Makefile index 7a50725a511..6f8a552d66c 100644 --- a/graphics/py-imageio/Makefile +++ b/graphics/py-imageio/Makefile @@ -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-[0-9]*:../../graphics/py-tifffile PYTHON_VERSIONS_INCOMPATIBLE= 27 # py-numpy +USE_PKG_RESOURCES= yes + USE_LANGUAGES= # none post-extract: diff --git a/graphics/py-nwdiag/Makefile b/graphics/py-nwdiag/Makefile index 3a167bb2a98..1df85d76c84 100644 --- a/graphics/py-nwdiag/Makefile +++ b/graphics/py-nwdiag/Makefile @@ -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.0:../../graphics/py-blockdiag USE_LANGUAGES= # none +USE_PKG_RESOURCES= yes + INSTALLATION_DIRS+= ${PKGMANDIR}/man1 PYTHON_VERSIONS_INCOMPATIBLE= 27 diff --git a/graphics/py-pycha/Makefile b/graphics/py-pycha/Makefile index 3fa1a2d77f4..c85f2f16189 100644 --- a/graphics/py-pycha/Makefile +++ b/graphics/py-pycha/Makefile @@ -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]*:../../lang/py-six USE_LANGUAGES= #none +USE_PKG_RESOURCES= yes + post-install: ${MV} ${DESTDIR}${PREFIX}/bin/chavier ${DESTDIR}${PREFIX}/bin/chavier-${PYVERSSUFFIX} || ${TRUE} diff --git a/graphics/py-pygal/Makefile b/graphics/py-pygal/Makefile index cd9d9d80f94..8a05722a71e 100644 --- a/graphics/py-pygal/Makefile +++ b/graphics/py-pygal/Makefile @@ -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} diff --git a/graphics/py-qrcode/Makefile b/graphics/py-qrcode/Makefile index 801a10de282..3c6ec49de50 100644 --- a/graphics/py-qrcode/Makefile +++ b/graphics/py-qrcode/Makefile @@ -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]*:../../lang/py-six PYTHON_VERSIONED_DEPENDENCIES= Pillow +USE_PKG_RESOURCES= yes + USE_LANGUAGES= # none REPLACE_PYTHON+= qrcode/console_scripts.py diff --git a/graphics/py-scour/Makefile b/graphics/py-scour/Makefile index 1d93394a490..3efb174243d 100644 --- a/graphics/py-scour/Makefile +++ b/graphics/py-scour/Makefile @@ -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" diff --git a/graphics/py-seqdiag/Makefile b/graphics/py-seqdiag/Makefile index fd87da53ac6..6f13ecf505e 100644 --- a/graphics/py-seqdiag/Makefile +++ b/graphics/py-seqdiag/Makefile @@ -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} diff --git a/graphics/py-tifffile/Makefile b/graphics/py-tifffile/Makefile index cb5ea338e2b..5778837476f 100644 --- a/graphics/py-tifffile/Makefile +++ b/graphics/py-tifffile/Makefile @@ -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 && \ diff --git a/lang/py-cmake-language-server/Makefile b/lang/py-cmake-language-server/Makefile index 161769bd8e1..072c81c6199 100644 --- a/lang/py-cmake-language-server/Makefile +++ b/lang/py-cmake-language-server/Makefile @@ -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]*:../../devel/py-pyparsing 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} diff --git a/lang/py-lsp-server/Makefile b/lang/py-lsp-server/Makefile index 0772c013f9a..f3065340cfa 100644 --- a/lang/py-lsp-server/Makefile +++ b/lang/py-lsp-server/Makefile @@ -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]*:../../devel/py-flaky 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 diff --git a/lang/py-mypy/Makefile b/lang/py-mypy/Makefile index c456958101a..f9c5f1edd3f 100644 --- a/lang/py-mypy/Makefile +++ b/lang/py-mypy/Makefile @@ -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 diff --git a/lang/py-paver/Makefile b/lang/py-paver/Makefile index 7f73edd4424..3268f235c0a 100644 --- a/lang/py-paver/Makefile +++ b/lang/py-paver/Makefile @@ -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-[0-9]*:../../devel/py-virtualenv USE_LANGUAGES= # none +USE_PKG_RESOURCES= yes + post-install: cd ${DESTDIR}${PREFIX}/bin && ${MV} paver paver-${PYVERSSUFFIX} || ${TRUE} diff --git a/lang/py-python-language-server/Makefile b/lang/py-python-language-server/Makefile index 79e985358cf..9674e8a40a3 100644 --- a/lang/py-python-language-server/Makefile +++ b/lang/py-python-language-server/Makefile @@ -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]*:../../devel/py-mock PYTHON_VERSIONED_DEPENDENCIES= test:test +USE_PKG_RESOURCES= yes + PYTHON_VERSIONS_INCOMPATIBLE= 27 # py-pylint, py-parso via py-jedi post-install: diff --git a/lang/py-uncompyle6/Makefile b/lang/py-uncompyle6/Makefile index 1cf61bda1d0..36bed94bcdc 100644 --- a/lang/py-uncompyle6/Makefile +++ b/lang/py-uncompyle6/Makefile @@ -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} && \ diff --git a/lang/python/egg.mk b/lang/python/egg.mk index 078561e8784..b4576e585c4 100644 --- a/lang/python/egg.mk +++ b/lang/python/egg.mk @@ -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:S,.,\.,g}/, \ _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 diff --git a/mail/feed2exec/Makefile b/mail/feed2exec/Makefile index d90d4b492a9..2412d0baa45 100644 --- a/mail/feed2exec/Makefile +++ b/mail/feed2exec/Makefile @@ -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.io/ 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-runner-[0-9]*:../../devel/py-test-runner 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 diff --git a/mail/py-aiosmtpd/Makefile b/mail/py-aiosmtpd/Makefile index 96d6eee33d8..01b668c8243 100644 --- a/mail/py-aiosmtpd/Makefile +++ b/mail/py-aiosmtpd/Makefile @@ -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 diff --git a/mail/py-email_validator/Makefile b/mail/py-email_validator/Makefile index b960a38e12f..3c11227a048 100644 --- a/mail/py-email_validator/Makefile +++ b/mail/py-email_validator/Makefile @@ -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:../../www/py-idna USE_LANGUAGES= # none +USE_PKG_RESOURCES= yes + post-install: cd ${DESTDIR}${PREFIX}/bin && \ ${MV} email_validator email_validator-${PYVERSSUFFIX} || ${TRUE} diff --git a/math/py-Theano/Makefile b/math/py-Theano/Makefile index 09e5e1f574f..467fff4d35f 100644 --- a/math/py-Theano/Makefile +++ b/math/py-Theano/Makefile @@ -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_blas_many.sh PYTHON_VERSIONS_INCOMPATIBLE= 27 # py-scipy +USE_PKG_RESOURCES= yes + post-install: cd ${DESTDIR}${PREFIX}/bin && \ ${MV} theano-cache theano-cache-${PYVERSSUFFIX} && \ diff --git a/math/py-asdf/Makefile b/math/py-asdf/Makefile index 2dd3ef8470f..9f9183214b1 100644 --- a/math/py-asdf/Makefile +++ b/math/py-asdf/Makefile @@ -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 diff --git a/math/py-astropy/Makefile b/math/py-astropy/Makefile index 02a8d8bb516..f19f1d0bf48 100644 --- a/math/py-astropy/Makefile +++ b/math/py-astropy/Makefile @@ -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-helpers>=0.1:../../devel/py-extension-helpers 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" diff --git a/math/py-netCDF4/Makefile b/math/py-netCDF4/Makefile index dd8abcec4ff..db7b068eeb9 100644 --- a/math/py-netCDF4/Makefile +++ b/math/py-netCDF4/Makefile @@ -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 search paths. PYTHON_VERSIONS_INCOMPATIBLE+= 27 # py-numpy +USE_PKG_RESOURCES= yes + do-test: cd ${WRKSRC}/test && ${SETENV} ${TEST_ENV} ${PYTHONBIN} run_all.py diff --git a/math/py-numpy/Makefile b/math/py-numpy/Makefile index 228fe137f00..8baf66e559c 100644 --- a/math/py-numpy/Makefile +++ b/math/py-numpy/Makefile @@ -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 */*/*/*.py */*/*/*/*.py PYTHON_VERSIONS_INCOMPATIBLE= 27 +USE_PKG_RESOURCES= yes + # XXX Avoid picking up other compilers when installed .include "../../mk/compiler.mk" diff --git a/math/py-pythran/Makefile b/math/py-pythran/Makefile index c64bed5ed8f..de230323e67 100644 --- a/math/py-pythran/Makefile +++ b/math/py-pythran/Makefile @@ -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 && \ diff --git a/math/py-roman/Makefile b/math/py-roman/Makefile index 42e33142808..e5e27dd911c 100644 --- a/math/py-roman/Makefile +++ b/math/py-roman/Makefile @@ -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} diff --git a/math/py-scikit-image/Makefile b/math/py-scikit-image/Makefile index d95eeb0ae88..c5dc03309e9 100644 --- a/math/py-scikit-image/Makefile +++ b/math/py-scikit-image/Makefile @@ -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} diff --git a/math/py-smt/Makefile b/math/py-smt/Makefile index b0b4268a0bb..68502b47b2b 100644 --- a/math/py-smt/Makefile +++ b/math/py-smt/Makefile @@ -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 diff --git a/math/py-sympy/Makefile b/math/py-sympy/Makefile index dc4ae7c94c4..8fa76be05a9 100644 --- a/math/py-sympy/Makefile +++ b/math/py-sympy/Makefile @@ -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/diagnose_imports.py PYTHON_VERSIONS_INCOMPATIBLE= 27 +USE_PKG_RESOURCES= yes + SUBST_CLASSES+= manpath SUBST_SED.manpath= -e 's,share/man,${PKGMANDIR},' SUBST_FILES.manpath+= setup.py diff --git a/math/py-tables/Makefile b/math/py-tables/Makefile index d626b385a39..51f1c815b06 100644 --- a/math/py-tables/Makefile +++ b/math/py-tables/Makefile @@ -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} && \ diff --git a/math/py-tensorboard/Makefile b/math/py-tensorboard/Makefile index 7f4d2c51caa..f0a673eaa60 100644 --- a/math/py-tensorboard/Makefile +++ b/math/py-tensorboard/Makefile @@ -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} diff --git a/math/py-z3solver/Makefile b/math/py-z3solver/Makefile index 478315134db..b539d4bd743 100644 --- a/math/py-z3solver/Makefile +++ b/math/py-z3solver/Makefile @@ -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" diff --git a/misc/khard/Makefile b/misc/khard/Makefile index ca19899a36b..86833388bee 100644 --- a/misc/khard/Makefile +++ b/misc/khard/Makefile @@ -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-autodoc-typehints>=1.10:../../textproc/py-s 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 diff --git a/misc/py-asciinema/Makefile b/misc/py-asciinema/Makefile index 304c9d2b180..fedf276d08c 100644 --- a/misc/py-asciinema/Makefile +++ b/misc/py-asciinema/Makefile @@ -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. diff --git a/misc/py-tqdm/Makefile b/misc/py-tqdm/Makefile index aa76b1d3fe0..91dcd2e3f58 100644 --- a/misc/py-tqdm/Makefile +++ b/misc/py-tqdm/Makefile @@ -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 diff --git a/multimedia/streamlink/Makefile b/multimedia/streamlink/Makefile index 2be4e915ea4..464df3d2001 100644 --- a/multimedia/streamlink/Makefile +++ b/multimedia/streamlink/Makefile @@ -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 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 diff --git a/net/bandcamp-dl/Makefile b/net/bandcamp-dl/Makefile index de22ae41af2..a6df5c47eef 100644 --- a/net/bandcamp-dl/Makefile +++ b/net/bandcamp-dl/Makefile @@ -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]*:../../converters/py-chardet PYTHON_VERSIONS_INCOMPATIBLE= 27 # py-mutagen +USE_PKG_RESOURCES= yes + .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/coherence/Makefile b/net/coherence/Makefile index 924660a2653..2214367c025 100644 --- a/net/coherence/Makefile +++ b/net/coherence/Makefile @@ -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]*:../../net/py-twisted PYTHON_VERSIONS_ACCEPTED= 27 # as of 0.6.6.2 +USE_PKG_RESOURCES= yes + .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/coursera-dl/Makefile b/net/coursera-dl/Makefile index 40a704f0036..ff57ff027ee 100644 --- a/net/coursera-dl/Makefile +++ b/net/coursera-dl/Makefile @@ -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 @@ -22,6 +22,8 @@ DEPENDS+= ${PYPKGPREFIX}-keyring>=4.0:../../security/py-keyring PYTHON_SELF_CONFLICT= yes +USE_PKG_RESOURCES= yes + PYTHON_VERSIONS_INCOMPATIBLE= 27 # py-keyring .include "../../lang/python/egg.mk" diff --git a/net/gallery-dl/Makefile b/net/gallery-dl/Makefile index 40767ee423b..57f57e6ab00 100644 --- a/net/gallery-dl/Makefile +++ b/net/gallery-dl/Makefile @@ -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" diff --git a/net/py-celery/Makefile b/net/py-celery/Makefile index eec9ff717ed..ea758880873 100644 --- a/net/py-celery/Makefile +++ b/net/py-celery/Makefile @@ -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} diff --git a/net/py-cymruwhois/Makefile b/net/py-cymruwhois/Makefile index afa53fcdb16..49e56cae4bf 100644 --- a/net/py-cymruwhois/Makefile +++ b/net/py-cymruwhois/Makefile @@ -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]*:../../devel/py-nose USE_LANGUAGES= # none +USE_PKG_RESOURCES= yes + post-install: cd ${DESTDIR}${PREFIX}/bin && ${MV} cymruwhois cymruwhois${PYVERSSUFFIX} || ${TRUE} diff --git a/net/py-foolscap/Makefile b/net/py-foolscap/Makefile index 47270b6efbc..47536ae3249 100644 --- a/net/py-foolscap/Makefile +++ b/net/py-foolscap/Makefile @@ -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:../../net/py-twisted USE_LANGUAGES= # none +USE_PKG_RESOURCES= yes + INSTALLATION_DIRS+= share/doc/py-foolscap post-install: diff --git a/net/py-gandi.cli/Makefile b/net/py-gandi.cli/Makefile index 13609bbc3d6..c5417c2b053 100644 --- a/net/py-gandi.cli/Makefile +++ b/net/py-gandi.cli/Makefile @@ -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:../../devel/py-tox 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" diff --git a/net/py-gsutil/Makefile b/net/py-gsutil/Makefile index 0dbe7229963..5611df1667a 100644 --- a/net/py-gsutil/Makefile +++ b/net/py-gsutil/Makefile @@ -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/storage/docs/gsutil 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:../../lang/py-six 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 diff --git a/net/py-impacket/Makefile b/net/py-impacket/Makefile index 5c047cf9bd1..98a8fa74706 100644 --- a/net/py-impacket/Makefile +++ b/net/py-impacket/Makefile @@ -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>=0.9.0:../../net/py-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 diff --git a/net/py-lexicon/Makefile b/net/py-lexicon/Makefile index 3057698e00f..95f65c6feea 100644 --- a/net/py-lexicon/Makefile +++ b/net/py-lexicon/Makefile @@ -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>=1.26.1:../../devel/py-test-xdist PYTHON_VERSIONS_INCOMPATIBLE= 27 +USE_PKG_RESOURCES= yes + MESSAGE_SUBST+= PYPKGPREFIX=${PYPKGPREFIX} post-install: diff --git a/net/py-magic-wormhole/Makefile b/net/py-magic-wormhole/Makefile index af1163c1998..d8423a29740 100644 --- a/net/py-magic-wormhole/Makefile +++ b/net/py-magic-wormhole/Makefile @@ -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/magic-wormhole 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-wormhole-mailbox-server-[0-9]*:../../net/py- USE_LANGUAGES= # none +PYTHON_VERSIONS_INCOMPATIBLE= 27 + +USE_PKG_RESOURCES= yes + post-install: cd ${DESTDIR}${PREFIX}/bin && \ ${MV} wormhole wormhole-${PYVERSSUFFIX} || ${TRUE} diff --git a/net/py-moto/Makefile b/net/py-moto/Makefile index 92173ae9231..4786f8493d8 100644 --- a/net/py-moto/Makefile +++ b/net/py-moto/Makefile @@ -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]*:../../devel/py-test 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: diff --git a/net/py-netaddr/Makefile b/net/py-netaddr/Makefile index cf9bb2d768f..0e8fa6bf8ed 100644 --- a/net/py-netaddr/Makefile +++ b/net/py-netaddr/Makefile @@ -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-resources-[0-9]*:../../devel/py-importlib-res USE_LANGUAGES= # none +USE_PKG_RESOURCES= yes + REPLACE_PYTHON+= netaddr/eui/ieee.py REPLACE_PYTHON+= netaddr/ip/iana.py REPLACE_PYTHON+= netaddr/tools/netaddr diff --git a/net/py-onionbalance/Makefile b/net/py-onionbalance/Makefile index 3d018f6c628..f57a120f30c 100644 --- a/net/py-onionbalance/Makefile +++ b/net/py-onionbalance/Makefile @@ -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} && \ diff --git a/net/py-ptt/Makefile b/net/py-ptt/Makefile index 86775e2fea5..1b7176a94e1 100644 --- a/net/py-ptt/Makefile +++ b/net/py-ptt/Makefile @@ -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" diff --git a/net/py-pypiserver/Makefile b/net/py-pypiserver/Makefile index 786193588f8..56c095d7bfb 100644 --- a/net/py-pypiserver/Makefile +++ b/net/py-pypiserver/Makefile @@ -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]*:../../devel/py-mock PYTHON_VERSIONED_DEPENDENCIES= pip:test test:test +USE_PKG_RESOURCES= yes + USE_LANGUAGES= # none post-install: diff --git a/net/py-softlayer/Makefile b/net/py-softlayer/Makefile index 6369c0130e0..d24441a8250 100644 --- a/net/py-softlayer/Makefile +++ b/net/py-softlayer/Makefile @@ -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} && \ diff --git a/net/py-stone/Makefile b/net/py-stone/Makefile index 47be5659015..a0d43c388ef 100644 --- a/net/py-stone/Makefile +++ b/net/py-stone/Makefile @@ -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-runner-[0-9]*:../../devel/py-test-runner USE_LANGUAGES= # none +USE_PKG_RESOURCES= yes + .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/py-tldextract/Makefile b/net/py-tldextract/Makefile index 2627034e934..147da043eab 100644 --- a/net/py-tldextract/Makefile +++ b/net/py-tldextract/Makefile @@ -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} diff --git a/net/py-twine/Makefile b/net/py-twine/Makefile index e79806b0b98..12f59ff1f59 100644 --- a/net/py-twine/Makefile +++ b/net/py-twine/Makefile @@ -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-toolbelt>=0.9.1:../../devel/py-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: diff --git a/net/py-twisted/Makefile b/net/py-twisted/Makefile index a302e89a9bc..fcf3a722023 100644 --- a/net/py-twisted/Makefile +++ b/net/py-twisted/Makefile @@ -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/scripttest.py 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 && \ diff --git a/net/scapy/Makefile b/net/scapy/Makefile index e9de444fa1e..d9de18b5e76 100644 --- a/net/scapy/Makefile +++ b/net/scapy/Makefile @@ -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 \ diff --git a/net/youtube-dl/Makefile b/net/youtube-dl/Makefile index b99e1b7b342..1fbde630b2f 100644 --- a/net/youtube-dl/Makefile +++ b/net/youtube-dl/Makefile @@ -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 diff --git a/net/yt-dlp/Makefile b/net/yt-dlp/Makefile index 95f2c83c6fd..3c08cc634e8 100644 --- a/net/yt-dlp/Makefile +++ b/net/yt-dlp/Makefile @@ -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" diff --git a/print/py-octoprint/Makefile b/print/py-octoprint/Makefile index 7e64b90e402..6f7de3a3edb 100644 --- a/print/py-octoprint/Makefile +++ b/print/py-octoprint/Makefile @@ -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:../../textproc/py-yaml 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} diff --git a/print/py-weasyprint/Makefile b/print/py-weasyprint/Makefile index 7c02d46f779..1dace518f67 100644 --- a/print/py-weasyprint/Makefile +++ b/print/py-weasyprint/Makefile @@ -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} diff --git a/print/py-xhtml2pdf/Makefile b/print/py-xhtml2pdf/Makefile index 13db3f5d86d..7dcc6552f91 100644 --- a/print/py-xhtml2pdf/Makefile +++ b/print/py-xhtml2pdf/Makefile @@ -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 && \ diff --git a/security/prelude-correlator/Makefile b/security/prelude-correlator/Makefile index e203bb16228..4c2e343fbf1 100644 --- a/security/prelude-correlator/Makefile +++ b/security/prelude-correlator/Makefile @@ -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.py 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} diff --git a/security/py-acme-tiny/Makefile b/security/py-acme-tiny/Makefile index 1b1cefae09b..adce9522b34 100644 --- a/security/py-acme-tiny/Makefile +++ b/security/py-acme-tiny/Makefile @@ -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/openssl USE_LANGUAGES= # none +USE_PKG_RESOURCES= yes + post-install: cd ${DESTDIR}${PREFIX}/bin && \ ${MV} acme-tiny acme-tiny-${PYVERSSUFFIX} || ${TRUE} diff --git a/security/py-certbot/Makefile b/security/py-certbot/Makefile index 50063e87de0..9dbff2f8d72 100644 --- a/security/py-certbot/Makefile +++ b/security/py-certbot/Makefile @@ -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} diff --git a/security/py-cyclonedx-bom/Makefile b/security/py-cyclonedx-bom/Makefile index 6315a16a8e0..6f5945004ae 100644 --- a/security/py-cyclonedx-bom/Makefile +++ b/security/py-cyclonedx-bom/Makefile @@ -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-python-lib-[0-9]*:../../security/py-cyclonedx 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} diff --git a/security/py-google-auth-oauthlib/Makefile b/security/py-google-auth-oauthlib/Makefile index 7e2fc02a352..04c1733192d 100644 --- a/security/py-google-auth-oauthlib/Makefile +++ b/security/py-google-auth-oauthlib/Makefile @@ -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} diff --git a/security/py-josepy/Makefile b/security/py-josepy/Makefile index cadaf3ea86d..e0ef0349101 100644 --- a/security/py-josepy/Makefile +++ b/security/py-josepy/Makefile @@ -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} diff --git a/security/py-keyring/Makefile b/security/py-keyring/Makefile index b274df12bb1..1834ef3b262 100644 --- a/security/py-keyring/Makefile +++ b/security/py-keyring/Makefile @@ -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}-setuptools_scm>=3.4.1:../../devel/py-setuptools_s 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 diff --git a/security/py-libtaxii/Makefile b/security/py-libtaxii/Makefile index 97d8d3b0d24..f66684c082d 100644 --- a/security/py-libtaxii/Makefile +++ b/security/py-libtaxii/Makefile @@ -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" diff --git a/security/py-ndg_httpsclient/Makefile b/security/py-ndg_httpsclient/Makefile index 48ca78669d2..3a3b4c269a4 100644 --- a/security/py-ndg_httpsclient/Makefile +++ b/security/py-ndg_httpsclient/Makefile @@ -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" diff --git a/security/py-pip-audit/Makefile b/security/py-pip-audit/Makefile index fb80cf8c99d..08866685e1c 100644 --- a/security/py-pip-audit/Makefile +++ b/security/py-pip-audit/Makefile @@ -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]*:../../devel/py-test PYTHON_VERSIONS_INCOMPATIBLE= 27 +USE_PKG_RESOURCES= yes + USE_LANGUAGES= # none post-install: diff --git a/security/py-rsa/Makefile b/security/py-rsa/Makefile index 055533bcd2c..be64cd498cf 100644 --- a/security/py-rsa/Makefile +++ b/security/py-rsa/Makefile @@ -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:../../security/py-asn1 PYTHON_VERSIONS_INCOMPATIBLE= 27 +USE_PKG_RESOURCES= yes + USE_LANGUAGES= # none post-install: diff --git a/security/py-yubikey-manager/Makefile b/security/py-yubikey-manager/Makefile index ee3c679c04e..bf38ada6bb6 100644 --- a/security/py-yubikey-manager/Makefile +++ b/security/py-yubikey-manager/Makefile @@ -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:../../devel/py-usb PYTHON_VERSIONS_INCOMPATIBLE= 27 # py-usb +USE_PKG_RESOURCES= yes + post-install: cd ${DESTDIR}${PREFIX}/bin && \ ${MV} ykman ykman-${PYVERSSUFFIX} diff --git a/security/sqlmap/Makefile b/security/sqlmap/Makefile index baefd047205..367ea5d9073 100644 --- a/security/sqlmap/Makefile +++ b/security/sqlmap/Makefile @@ -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/icmpsh-m.pl REPLACE_PYTHON+= sqlmap/extra/shutils/duplicates.py +USE_PKG_RESOURCES= yes + USE_LANGUAGES= # none .include "../../lang/python/application.mk" diff --git a/security/wfuzz/Makefile b/security/wfuzz/Makefile index ace4a9b9842..b460a43630b 100644 --- a/security/wfuzz/Makefile +++ b/security/wfuzz/Makefile @@ -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" diff --git a/shells/xonsh/Makefile b/shells/xonsh/Makefile index 05e7f342f6c..0f1c112b75a 100644 --- a/shells/xonsh/Makefile +++ b/shells/xonsh/Makefile @@ -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 diff --git a/sysutils/ansible-base/Makefile b/sysutils/ansible-base/Makefile index 600eac3bcf7..5277655dce9 100644 --- a/sysutils/ansible-base/Makefile +++ b/sysutils/ansible-base/Makefile @@ -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]*:../../textproc/py-yaml PYTHON_VERSIONED_DEPENDENCIES+= packaging +USE_PKG_RESOURCES= yes + USE_TOOLS+= gmake PKG_SYSCONFSUBDIR= ansible diff --git a/sysutils/ansible-lint/Makefile b/sysutils/ansible-lint/Makefile index 9b882dc5ae1..d84fec786d6 100644 --- a/sysutils/ansible-lint/Makefile +++ b/sysutils/ansible-lint/Makefile @@ -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 diff --git a/sysutils/duplicity/Makefile b/sysutils/duplicity/Makefile index 4cdf40db362..22382919d8a 100644 --- a/sysutils/duplicity/Makefile +++ b/sysutils/duplicity/Makefile @@ -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 diff --git a/sysutils/fabric/Makefile b/sysutils/fabric/Makefile index 94b738c62d5..ad36fc6a562 100644 --- a/sysutils/fabric/Makefile +++ b/sysutils/fabric/Makefile @@ -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.0:../../security/py-paramiko PYTHON_VERSIONS_ACCEPTED= 27 # no support yet +USE_PKG_RESOURCES= yes + USE_TOOLS+= pax INSTALLATION_DIRS+= ${PKGMANDIR}/man1 diff --git a/sysutils/py-Glances/Makefile b/sysutils/py-Glances/Makefile index 1d2a60d2eab..fb32c5bc7a3 100644 --- a/sysutils/py-Glances/Makefile +++ b/sysutils/py-Glances/Makefile @@ -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]*:../../devel/py-packaging USE_LANGUAGES= # none +USE_PKG_RESOURCES= yes + SUBST_CLASSES+= prefix SUBST_STAGE.prefix= pre-configure SUBST_MESSAGE.prefix= Set correct prefix in setup.py diff --git a/sysutils/py-borgbackup/Makefile b/sysutils/py-borgbackup/Makefile index 00c785dfe7e..4c00516bc78 100644 --- a/sysutils/py-borgbackup/Makefile +++ b/sysutils/py-borgbackup/Makefile @@ -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]*:../../devel/py-packaging 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} diff --git a/sysutils/py-cpuinfo/Makefile b/sysutils/py-cpuinfo/Makefile index 5d3f2547365..4619f2066ce 100644 --- a/sysutils/py-cpuinfo/Makefile +++ b/sysutils/py-cpuinfo/Makefile @@ -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} diff --git a/sysutils/py-diffoscope/Makefile b/sysutils/py-diffoscope/Makefile index 407fe9166c3..3ece8646917 100644 --- a/sysutils/py-diffoscope/Makefile +++ b/sysutils/py-diffoscope/Makefile @@ -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} diff --git a/sysutils/py-eliot/Makefile b/sysutils/py-eliot/Makefile index 4908fe6314e..52e4133fcef 100644 --- a/sysutils/py-eliot/Makefile +++ b/sysutils/py-eliot/Makefile @@ -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-[0-9]*:../../devel/py-testtools PYTHON_VERSIONS_INCOMPATIBLE= 27 +USE_PKG_RESOURCES= yes + USE_LANGUAGES= # none post-install: diff --git a/sysutils/py-filetype/Makefile b/sysutils/py-filetype/Makefile index e9a899d355c..bef755a1c74 100644 --- a/sysutils/py-filetype/Makefile +++ b/sysutils/py-filetype/Makefile @@ -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} diff --git a/sysutils/py-google-compute-engine/Makefile b/sysutils/py-google-compute-engine/Makefile index 3fb06690b3e..29c15e36cc4 100644 --- a/sysutils/py-google-compute-engine/Makefile +++ b/sysutils/py-google-compute-engine/Makefile @@ -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" diff --git a/sysutils/py-salt-pepper/Makefile b/sysutils/py-salt-pepper/Makefile index fde24457fe2..b2695d4787b 100644 --- a/sysutils/py-salt-pepper/Makefile +++ b/sysutils/py-salt-pepper/Makefile @@ -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}-setuptools_scm-[0-9]*:../../devel/py-setuptools_s USE_LANGUAGES= # none +USE_PKG_RESOURCES= yes + post-install: cd ${DESTDIR}${PREFIX}/bin && \ ${MV} pepper pepper-${PYVERSSUFFIX} || ${TRUE} diff --git a/sysutils/py-setconf/Makefile b/sysutils/py-setconf/Makefile index a181b80e74a..d19bb3d1250 100644 --- a/sysutils/py-setconf/Makefile +++ b/sysutils/py-setconf/Makefile @@ -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: diff --git a/sysutils/py-supervisor/Makefile b/sysutils/py-supervisor/Makefile index a303436a059..cd6dcfcaa12 100644 --- a/sysutils/py-supervisor/Makefile +++ b/sysutils/py-supervisor/Makefile @@ -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]*:../../devel/py-mock REPLACE_PYTHON+= supervisor/scripts/*.py +USE_PKG_RESOURCES= yes + SUBST_CLASSES+= python SUBST_STAGE.python= pre-build SUBST_MESSAGE.python= Fixing Python path. diff --git a/sysutils/py-watchdog/Makefile b/sysutils/py-watchdog/Makefile index c0982c52060..f12dd94f928 100644 --- a/sysutils/py-watchdog/Makefile +++ b/sysutils/py-watchdog/Makefile @@ -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-timeout>=0.3:../../devel/py-test-timeout PYSETUPTESTTARGET= pytest +USE_PKG_RESOURCES= yes + post-install: cd ${DESTDIR}${PREFIX}/bin && \ ${MV} watchmedo watchmedo-${PYVERSSUFFIX} || ${TRUE} diff --git a/sysutils/py-xattr/Makefile b/sysutils/py-xattr/Makefile index 2324c4b521c..a43ef1b22ed 100644 --- a/sysutils/py-xattr/Makefile +++ b/sysutils/py-xattr/Makefile @@ -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} diff --git a/sysutils/salt/Makefile b/sysutils/salt/Makefile index 97236484a86..2c6349859c7 100644 --- a/sysutils/salt/Makefile +++ b/sysutils/salt/Makefile @@ -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:../../net/py-zmq PYTHON_VERSIONS_INCOMPATIBLE= 27 +USE_PKG_RESOURCES= yes + BUILD_DEFS+= VARBASE PYSETUPARGS+= --salt-base-file-roots-dir=${VARBASE}/salt/file-roots diff --git a/textproc/csvkit/Makefile b/textproc/csvkit/Makefile index 3a9d788d78c..e4230d92229 100644 --- a/textproc/csvkit/Makefile +++ b/textproc/csvkit/Makefile @@ -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" diff --git a/textproc/csvtomd/Makefile b/textproc/csvtomd/Makefile index ed372c334a1..abc30b88107 100644 --- a/textproc/csvtomd/Makefile +++ b/textproc/csvtomd/Makefile @@ -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" diff --git a/textproc/py-Unidecode/Makefile b/textproc/py-Unidecode/Makefile index 7ba37093ff3..e4ee213b482 100644 --- a/textproc/py-Unidecode/Makefile +++ b/textproc/py-Unidecode/Makefile @@ -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} diff --git a/textproc/py-black/Makefile b/textproc/py-black/Makefile index 2cca1b08f54..c398269ac00 100644 --- a/textproc/py-black/Makefile +++ b/textproc/py-black/Makefile @@ -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-9]*:../../www/py-aiohttp-cors 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}; \ diff --git a/textproc/py-commonmark/Makefile b/textproc/py-commonmark/Makefile index ba9781aa6a2..e8184372f56 100644 --- a/textproc/py-commonmark/Makefile +++ b/textproc/py-commonmark/Makefile @@ -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:../../devel/py-future USE_LANGUAGES= # none +USE_PKG_RESOURCES= yes + post-install: cd ${DESTDIR}${PREFIX}/bin && \ ${MV} cmark cmark-${PYVERSSUFFIX} || ${TRUE} diff --git a/textproc/py-creole/Makefile b/textproc/py-creole/Makefile index f079769b1f0..b9542fc20af 100644 --- a/textproc/py-creole/Makefile +++ b/textproc/py-creole/Makefile @@ -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 diff --git a/textproc/py-deepdiff/Makefile b/textproc/py-deepdiff/Makefile index 3393a2587d7..95ead0898f3 100644 --- a/textproc/py-deepdiff/Makefile +++ b/textproc/py-deepdiff/Makefile @@ -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} diff --git a/textproc/py-epr-reader/Makefile b/textproc/py-epr-reader/Makefile index ba55325a06b..c8194a37554 100644 --- a/textproc/py-epr-reader/Makefile +++ b/textproc/py-epr-reader/Makefile @@ -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" diff --git a/textproc/py-ftfy/Makefile b/textproc/py-ftfy/Makefile index b64b965045d..d1efb2c8f82 100644 --- a/textproc/py-ftfy/Makefile +++ b/textproc/py-ftfy/Makefile @@ -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]*:../../devel/py-wcwidth USE_LANGUAGES= # none +USE_PKG_RESOURCES= yes + post-install: ${MV} ${DESTDIR}${PREFIX}/bin/ftfy \ ${DESTDIR}${PREFIX}/bin/ftfy${PYVERSSUFFIX} || ${TRUE} diff --git a/textproc/py-generateDS/Makefile b/textproc/py-generateDS/Makefile index cbc2c881a7e..c97870fdbb3 100644 --- a/textproc/py-generateDS/Makefile +++ b/textproc/py-generateDS/Makefile @@ -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" diff --git a/textproc/py-guessit/Makefile b/textproc/py-guessit/Makefile index bff82a0c45f..a9e34fc337c 100644 --- a/textproc/py-guessit/Makefile +++ b/textproc/py-guessit/Makefile @@ -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]*:../../textproc/py-yaml USE_LANGUAGES= # none +USE_PKG_RESOURCES= yes + post-install: cd ${DESTDIR}${PREFIX}/bin && \ ${MV} guessit guessit-${PYVERSSUFFIX} || ${TRUE} diff --git a/textproc/py-html2text/Makefile b/textproc/py-html2text/Makefile index 2bb35ef7217..9280b5addb9 100644 --- a/textproc/py-html2text/Makefile +++ b/textproc/py-html2text/Makefile @@ -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} diff --git a/textproc/py-jade/Makefile b/textproc/py-jade/Makefile index a2977c4ccf4..9f9b0fbfe13 100644 --- a/textproc/py-jade/Makefile +++ b/textproc/py-jade/Makefile @@ -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]*:../../lang/py-six USE_LANGUAGES= # none +USE_PKG_RESOURCES= yes + post-install: cd ${DESTDIR}${PREFIX}/bin && ${MV} pyjade pyjade${PYVERSSUFFIX} || ${TRUE} diff --git a/textproc/py-jsbeautifier/Makefile b/textproc/py-jsbeautifier/Makefile index b75e9275da8..35a8a149b1e 100644 --- a/textproc/py-jsbeautifier/Makefile +++ b/textproc/py-jsbeautifier/Makefile @@ -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:../../lang/py-six PYTHON_VERSIONED_DEPENDENCIES= test:test +USE_PKG_RESOURCES= yes + USE_LANGUAGES= # none post-install: diff --git a/textproc/py-jsonschema/Makefile b/textproc/py-jsonschema/Makefile index 7ee2f9bb204..dc148be96f2 100644 --- a/textproc/py-jsonschema/Makefile +++ b/textproc/py-jsonschema/Makefile @@ -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-9]*:../../devel/py-functools32 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" diff --git a/textproc/py-m2r/Makefile b/textproc/py-m2r/Makefile index 96e15f43f89..7c04a712f43 100644 --- a/textproc/py-m2r/Makefile +++ b/textproc/py-m2r/Makefile @@ -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} diff --git a/textproc/py-markdown/Makefile b/textproc/py-markdown/Makefile index 127a4970697..9e8f80a62b8 100644 --- a/textproc/py-markdown/Makefile +++ b/textproc/py-markdown/Makefile @@ -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" diff --git a/textproc/py-mkdocs/Makefile b/textproc/py-mkdocs/Makefile index 9228f9e0272..0ba5342af36 100644 --- a/textproc/py-mkdocs/Makefile +++ b/textproc/py-mkdocs/Makefile @@ -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:../../textproc/py-yaml PYTHON_VERSIONED_DEPENDENCIES+= markdown +USE_PKG_RESOURCES= yes + USE_LANGUAGES= # none post-install: diff --git a/textproc/py-natsort/Makefile b/textproc/py-natsort/Makefile index 30ddbde5d01..4922aa8c288 100644 --- a/textproc/py-natsort/Makefile +++ b/textproc/py-natsort/Makefile @@ -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} diff --git a/textproc/py-nltk/Makefile b/textproc/py-nltk/Makefile index efece9e93ab..7ae5da4fa4f 100644 --- a/textproc/py-nltk/Makefile +++ b/textproc/py-nltk/Makefile @@ -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.py PYTHON_VERSIONS_INCOMPATIBLE= 27 +USE_PKG_RESOURCES= yes + post-install: cd ${DESTDIR}${PREFIX}/bin && \ ${MV} nltk nltk-${PYVERSSUFFIX} || ${TRUE} diff --git a/textproc/py-openapi-spec-validator/Makefile b/textproc/py-openapi-spec-validator/Makefile index a2724f275a0..fee2c2b5a34 100644 --- a/textproc/py-openapi-spec-validator/Makefile +++ b/textproc/py-openapi-spec-validator/Makefile @@ -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-flake8-[0-9]*:../../devel/py-test-flake8 USE_LANGUAGES= # none +USE_PKG_RESOURCES= yes + TEST_ENV+= PYTHONPATH=${WRKSRC}/build/lib do-test: diff --git a/textproc/py-ptable/Makefile b/textproc/py-ptable/Makefile index 1acf7deaa17..3c733288bc1 100644 --- a/textproc/py-ptable/Makefile +++ b/textproc/py-ptable/Makefile @@ -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} diff --git a/textproc/py-pybtex/Makefile b/textproc/py-pybtex/Makefile index 2f1207640a4..5f9114b18ce 100644 --- a/textproc/py-pybtex/Makefile +++ b/textproc/py-pybtex/Makefile @@ -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:../../textproc/py-yaml USE_LANGUAGES= # none +USE_PKG_RESOURCES= yes + post-install: cd ${DESTDIR}${PREFIX}/bin && \ ${MV} pybtex pybtex-${PYVERSSUFFIX} && \ diff --git a/textproc/py-pygments/Makefile b/textproc/py-pygments/Makefile index 57aff616e2d..ecb468c47d9 100644 --- a/textproc/py-pygments/Makefile +++ b/textproc/py-pygments/Makefile @@ -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} diff --git a/textproc/py-pysrt/Makefile b/textproc/py-pysrt/Makefile index 1d98b7ce1b3..c1b2e7f291f 100644 --- a/textproc/py-pysrt/Makefile +++ b/textproc/py-pysrt/Makefile @@ -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]*:../../converters/py-chardet USE_LANGUAGES= # none +USE_PKG_RESOURCES= yes + post-install: cd ${DESTDIR}${PREFIX}/bin && \ ${MV} srt srt-${PYVERSSUFFIX} || ${TRUE} diff --git a/textproc/py-ramlfications/Makefile b/textproc/py-ramlfications/Makefile index 8cf2004f765..b45b1d06dd5 100644 --- a/textproc/py-ramlfications/Makefile +++ b/textproc/py-ramlfications/Makefile @@ -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-[0-9]*:../../textproc/py-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" diff --git a/textproc/py-rdflib/Makefile b/textproc/py-rdflib/Makefile index 71770720379..0d12f27d547 100644 --- a/textproc/py-rdflib/Makefile +++ b/textproc/py-rdflib/Makefile @@ -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 diff --git a/textproc/py-rst2pdf/Makefile b/textproc/py-rst2pdf/Makefile index 70bdea2cf91..6ba07d8d2bd 100644 --- a/textproc/py-rst2pdf/Makefile +++ b/textproc/py-rst2pdf/Makefile @@ -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} diff --git a/textproc/py-sphinx/Makefile b/textproc/py-sphinx/Makefile index 7d75ef94052..e93967a8fbf 100644 --- a/textproc/py-sphinx/Makefile +++ b/textproc/py-sphinx/Makefile @@ -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} && \ diff --git a/textproc/py-sphobjinv/Makefile b/textproc/py-sphobjinv/Makefile index a83894eb77f..a629c857f5a 100644 --- a/textproc/py-sphobjinv/Makefile +++ b/textproc/py-sphobjinv/Makefile @@ -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} diff --git a/textproc/py-tabulate/Makefile b/textproc/py-tabulate/Makefile index b772e6b1296..f5c3985c8f3 100644 --- a/textproc/py-tabulate/Makefile +++ b/textproc/py-tabulate/Makefile @@ -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]*:../../devel/py-test USE_LANGUAGES= # none +USE_PKG_RESOURCES= yes + post-install: cd ${DESTDIR}${PREFIX}/bin && \ ${MV} tabulate tabulate-${PYVERSSUFFIX} || ${TRUE} diff --git a/textproc/py-textile/Makefile b/textproc/py-textile/Makefile index 469ec50c3bd..b7de6b772f2 100644 --- a/textproc/py-textile/Makefile +++ b/textproc/py-textile/Makefile @@ -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-[0-9]*:../../devel/py-test-cov USE_LANGUAGES= # none +USE_PKG_RESOURCES= yes + post-install: cd ${DESTDIR}${PREFIX}/bin && \ ${MV} pytextile pytextile-${PYVERSSUFFIX} || ${TRUE} diff --git a/textproc/py-vobject/Makefile b/textproc/py-vobject/Makefile index cc524e3fb59..299984c36f7 100644 --- a/textproc/py-vobject/Makefile +++ b/textproc/py-vobject/Makefile @@ -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} && \ diff --git a/textproc/py-xml2rfc/Makefile b/textproc/py-xml2rfc/Makefile index 31ecba4ee32..5e5b5538f68 100644 --- a/textproc/py-xml2rfc/Makefile +++ b/textproc/py-xml2rfc/Makefile @@ -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>=0:../../print/py-weasyprint USE_LANGUAGES= # none +USE_PKG_RESOURCES= yes + do-test: ${RUN} cd ${WRKSRC} && \ ${PYTHONBIN} -m unittest diff --git a/textproc/py-xmlschema/Makefile b/textproc/py-xmlschema/Makefile index 3e9684a9978..a56be80b351 100644 --- a/textproc/py-xmlschema/Makefile +++ b/textproc/py-xmlschema/Makefile @@ -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 && \ diff --git a/textproc/subliminal/Makefile b/textproc/subliminal/Makefile index 8dbc96835d6..29ed8099716 100644 --- a/textproc/subliminal/Makefile +++ b/textproc/subliminal/Makefile @@ -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} diff --git a/textproc/translate-toolkit/Makefile b/textproc/translate-toolkit/Makefile index b86a36b4f0e..b45f3b64056 100644 --- a/textproc/translate-toolkit/Makefile +++ b/textproc/translate-toolkit/Makefile @@ -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" diff --git a/textproc/yq/Makefile b/textproc/yq/Makefile index aafb856660c..58b4d26d852 100644 --- a/textproc/yq/Makefile +++ b/textproc/yq/Makefile @@ -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]*:../../devel/py-wheel 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" diff --git a/time/etm/Makefile b/time/etm/Makefile index 7e310d87fa8..54621221f1c 100644 --- a/time/etm/Makefile +++ b/time/etm/Makefile @@ -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.1:../../time/py-icalendar PYTHON_VERSIONS_ACCEPTED= 27 # py-wxWidgets +USE_PKG_RESOURCES= yes + USE_LANGUAGES= # none REPLACE_PYTHON+= etm/etmWX.py diff --git a/time/khal/Makefile b/time/khal/Makefile index 8a1fd6fa363..6eb874ddc5a 100644 --- a/time/khal/Makefile +++ b/time/khal/Makefile @@ -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-[0-9]*:../../time/py-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 diff --git a/time/py-icalendar/Makefile b/time/py-icalendar/Makefile index 5cbe3484f4d..78cf5188181 100644 --- a/time/py-icalendar/Makefile +++ b/time/py-icalendar/Makefile @@ -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]*:../../time/py-pytz USE_LANGUAGES= # none +USE_PKG_RESOURCES= yes + post-install: cd ${DESTDIR}${PREFIX}/bin && \ ${MV} icalendar icalendar-${PYVERSSUFFIX} || ${TRUE} diff --git a/time/py-jrnl/Makefile b/time/py-jrnl/Makefile index d4ed4a4cc54..0d8d28ed4f9 100644 --- a/time/py-jrnl/Makefile +++ b/time/py-jrnl/Makefile @@ -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} diff --git a/time/py-tempora/Makefile b/time/py-tempora/Makefile index 644b22d238d..ac69607c6a6 100644 --- a/time/py-tempora/Makefile +++ b/time/py-tempora/Makefile @@ -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} diff --git a/time/py-trading-calendars/Makefile b/time/py-trading-calendars/Makefile index a5f0da6d25a..dd7497ee207 100644 --- a/time/py-trading-calendars/Makefile +++ b/time/py-trading-calendars/Makefile @@ -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} diff --git a/time/py-vdirsyncer/Makefile b/time/py-vdirsyncer/Makefile index 323f62d9ad7..7c82c84ba5a 100644 --- a/time/py-vdirsyncer/Makefile +++ b/time/py-vdirsyncer/Makefile @@ -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: diff --git a/www/ddgr/Makefile b/www/ddgr/Makefile index e8ef182243d..86bf9e1887f 100644 --- a/www/ddgr/Makefile +++ b/www/ddgr/Makefile @@ -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 diff --git a/www/py-PasteScript/Makefile b/www/py-PasteScript/Makefile index 3f0b1993bbb..bf10cda2ef6 100644 --- a/www/py-PasteScript/Makefile +++ b/www/py-PasteScript/Makefile @@ -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]*:../../www/py-paste USE_LANGUAGES= # none +USE_PKG_RESOURCES= yes + .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/py-autobahn/Makefile b/www/py-autobahn/Makefile index abcc919bff8..cc9665f6064 100644 --- a/www/py-autobahn/Makefile +++ b/www/py-autobahn/Makefile @@ -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} diff --git a/www/py-cheroot/Makefile b/www/py-cheroot/Makefile index acd65e497aa..05bfc5777bf 100644 --- a/www/py-cheroot/Makefile +++ b/www/py-cheroot/Makefile @@ -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.functools_lru_cache-[0-9]*:../../devel/py-bac USE_LANGUAGES= # none +USE_PKG_RESOURCES= yes + post-install: cd ${DESTDIR}${PREFIX}/bin && \ ${MV} cheroot cheroot-${PYVERSSUFFIX} || ${TRUE} diff --git a/www/py-cherrypy/Makefile b/www/py-cherrypy/Makefile index 8a79e2671b7..0415385849a 100644 --- a/www/py-cherrypy/Makefile +++ b/www/py-cherrypy/Makefile @@ -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} diff --git a/www/py-daphne/Makefile b/www/py-daphne/Makefile index d230a3d7895..7de851194b1 100644 --- a/www/py-daphne/Makefile +++ b/www/py-daphne/Makefile @@ -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} diff --git a/www/py-django/Makefile b/www/py-django/Makefile index 0158aef5c46..99cee464dea 100644 --- a/www/py-django/Makefile +++ b/www/py-django/Makefile @@ -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} && \ diff --git a/www/py-flask/Makefile b/www/py-flask/Makefile index 733aab41664..bf8990667e8 100644 --- a/www/py-flask/Makefile +++ b/www/py-flask/Makefile @@ -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:../../www/py-werkzeug PYTHON_VERSIONED_DEPENDENCIES= test:test +USE_PKG_RESOURCES= yes + USE_LANGUAGES= # none post-install: diff --git a/www/py-google-apitools/Makefile b/www/py-google-apitools/Makefile index 033d55e8c54..71070d94307 100644 --- a/www/py-google-apitools/Makefile +++ b/www/py-google-apitools/Makefile @@ -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]*:../../devel/py-nose PYTHON_VERSIONS_INCOMPATIBLE= 27 # py-gflags +USE_PKG_RESOURCES= yes + USE_LANGUAGES= # none post-install: diff --git a/www/py-gunicorn/Makefile b/www/py-gunicorn/Makefile index 0014efbd6e7..7911c3bcc69 100644 --- a/www/py-gunicorn/Makefile +++ b/www/py-gunicorn/Makefile @@ -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} diff --git a/www/py-httpie/Makefile b/www/py-httpie/Makefile index ad2c54bdcf7..fc177193507 100644 --- a/www/py-httpie/Makefile +++ b/www/py-httpie/Makefile @@ -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 && \ diff --git a/www/py-httpx/Makefile b/www/py-httpx/Makefile index 60baae19787..7c623deb635 100644 --- a/www/py-httpx/Makefile +++ b/www/py-httpx/Makefile @@ -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} diff --git a/www/py-livereload/Makefile b/www/py-livereload/Makefile index f55f7959309..01c163eb8a7 100644 --- a/www/py-livereload/Makefile +++ b/www/py-livereload/Makefile @@ -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]*:../../www/py-tornado USE_LANGUAGES= # none +USE_PKG_RESOURCES= yes + post-install: cd ${DESTDIR}${PREFIX}/bin && \ ${MV} livereload livereload-${PYVERSSUFFIX} || ${TRUE} diff --git a/www/py-mezzanine/Makefile b/www/py-mezzanine/Makefile index 6f84b979d29..cb23bb9c357 100644 --- a/www/py-mezzanine/Makefile +++ b/www/py-mezzanine/Makefile @@ -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: diff --git a/www/py-nbformat/Makefile b/www/py-nbformat/Makefile index 59aeb5e9e61..b64fc649379 100644 --- a/www/py-nbformat/Makefile +++ b/www/py-nbformat/Makefile @@ -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} diff --git a/www/py-notebook/Makefile b/www/py-notebook/Makefile index af5ad1308c0..a1838997528 100644 --- a/www/py-notebook/Makefile +++ b/www/py-notebook/Makefile @@ -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 && \ diff --git a/www/py-pelican/Makefile b/www/py-pelican/Makefile index 8b804ec4933..17052daf7df 100644 --- a/www/py-pelican/Makefile +++ b/www/py-pelican/Makefile @@ -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]*:../../time/py-dateutil 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 diff --git a/www/py-pystache/Makefile b/www/py-pystache/Makefile index 2b17a2332d2..ad8d798564f 100644 --- a/www/py-pystache/Makefile +++ b/www/py-pystache/Makefile @@ -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 diff --git a/www/py-raven/Makefile b/www/py-raven/Makefile index 1b385375737..b4377ae3d30 100644 --- a/www/py-raven/Makefile +++ b/www/py-raven/Makefile @@ -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-9]*:../../devel/py-zconfig 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 diff --git a/www/py-sanic/Makefile b/www/py-sanic/Makefile index 56c29999d7b..fde9ca8ff0e 100644 --- a/www/py-sanic/Makefile +++ b/www/py-sanic/Makefile @@ -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} diff --git a/www/py-scrapy/Makefile b/www/py-scrapy/Makefile index 9acfc5f1825..e1e5ce514ec 100644 --- a/www/py-scrapy/Makefile +++ b/www/py-scrapy/Makefile @@ -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} diff --git a/www/py-static/Makefile b/www/py-static/Makefile index d90276d878a..6b6c31ff1e7 100644 --- a/www/py-static/Makefile +++ b/www/py-static/Makefile @@ -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} diff --git a/www/py-swiftclient/Makefile b/www/py-swiftclient/Makefile index da35962fdb3..dde6b1b4d5d 100644 --- a/www/py-swiftclient/Makefile +++ b/www/py-swiftclient/Makefile @@ -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,${PKGMANDIR},' PYTHON_VERSIONS_INCOMPATIBLE= 27 +USE_PKG_RESOURCES= yes + post-install: cd ${DESTDIR}${PREFIX} && \ ${MV} bin/swift bin/swift-${PYVERSSUFFIX} && \ diff --git a/www/py-uvicorn/Makefile b/www/py-uvicorn/Makefile index e1b6a323ded..bcf1ed81156 100644 --- a/www/py-uvicorn/Makefile +++ b/www/py-uvicorn/Makefile @@ -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.0:../../www/py-websockets 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 diff --git a/www/py-wagtail/Makefile b/www/py-wagtail/Makefile index 0545d12a7e2..70c999ac228 100644 --- a/www/py-wagtail/Makefile +++ b/www/py-wagtail/Makefile @@ -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: diff --git a/www/py-waitress/Makefile b/www/py-waitress/Makefile index 2433d409ca8..c6bc663893f 100644 --- a/www/py-waitress/Makefile +++ b/www/py-waitress/Makefile @@ -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]*:../../devel/py-nose USE_LANGUAGES= # none +USE_PKG_RESOURCES= yes + post-install: cd ${DESTDIR}${PREFIX}/bin && \ ${MV} waitress-serve waitress-serve-${PYVERSSUFFIX} || ${TRUE} diff --git a/www/py-webassets/Makefile b/www/py-webassets/Makefile index bbbabc7d811..e0fb936aba0 100644 --- a/www/py-webassets/Makefile +++ b/www/py-webassets/Makefile @@ -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.io/ 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" diff --git a/www/trac/Makefile b/www/trac/Makefile index 3cd55d84899..00c7300da48 100644 --- a/www/trac/Makefile +++ b/www/trac/Makefile @@ -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 diff --git a/www/tuir/Makefile b/www/tuir/Makefile index 1fce1e0f021..ce23800f6a5 100644 --- a/www/tuir/Makefile +++ b/www/tuir/Makefile @@ -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" |