diff --git a/databases/py-bsddb3/Makefile b/databases/py-bsddb3/Makefile index 9ec151c1fe3..a310a27c2cf 100644 --- a/databases/py-bsddb3/Makefile +++ b/databases/py-bsddb3/Makefile @@ -3,7 +3,7 @@ COMMENT= Python bindings for Oracle Berkeley DB MODPY_EGG_VERSION= 6.0.1 DISTNAME= bsddb3-${MODPY_EGG_VERSION} PKGNAME= py-${DISTNAME} -REVISION= 7 +REVISION= 8 CATEGORIES= databases devel diff --git a/devel/capstone/python/Makefile b/devel/capstone/python/Makefile index 14c2ab4af97..185c4f0c0a0 100644 --- a/devel/capstone/python/Makefile +++ b/devel/capstone/python/Makefile @@ -3,7 +3,7 @@ COMMENT = Python bindings for capstone MODPY_EGG_VERSION = ${GH_TAGNAME} PKGNAME = py-${DISTNAME} -REVISION = 3 +REVISION = 4 MODULES = lang/python USE_GMAKE = Yes diff --git a/devel/keystone/python/Makefile b/devel/keystone/python/Makefile index 4d8280af5a5..db377bfb835 100644 --- a/devel/keystone/python/Makefile +++ b/devel/keystone/python/Makefile @@ -5,7 +5,7 @@ COMMENT = Python bindings for keystone MODPY_EGG_VERSION = ${GH_TAGNAME} PKGNAME = py-${DISTNAME} -REVISION = 2 +REVISION = 3 MODULES = devel/cmake \ lang/python diff --git a/devel/kf5/kapidox/Makefile b/devel/kf5/kapidox/Makefile index 6ec63e3220d..e1abd9e6794 100644 --- a/devel/kf5/kapidox/Makefile +++ b/devel/kf5/kapidox/Makefile @@ -1,6 +1,7 @@ COMMENT = doxygen wrapper for KDE DISTNAME = kapidox-${VERSION} FULLPKGNAME = ${PKGNAME}${FLAVOR_EXT} +REVISION = 0 WANTLIB- = diff --git a/devel/py-altgraph/Makefile b/devel/py-altgraph/Makefile index 220a9d8def3..e6782b84428 100644 --- a/devel/py-altgraph/Makefile +++ b/devel/py-altgraph/Makefile @@ -3,7 +3,7 @@ COMMENT= Python graph (network) package MODPY_EGG_VERSION = 0.17.3 DISTNAME= altgraph-${MODPY_EGG_VERSION} PKGNAME= py-${DISTNAME} -REVISION= 0 +REVISION= 1 CATEGORIES= devel diff --git a/devel/py-anytree/Makefile b/devel/py-anytree/Makefile index 28b559ca12e..3aba1ba27d9 100644 --- a/devel/py-anytree/Makefile +++ b/devel/py-anytree/Makefile @@ -3,7 +3,7 @@ COMMENT= powerful and lightweight Python tree data structure MODPY_EGG_VERSION= 2.8.0 DISTNAME= anytree-${MODPY_EGG_VERSION} PKGNAME= py-${DISTNAME} -REVISION= 0 +REVISION= 1 CATEGORIES= devel diff --git a/devel/py-buildbot/buildbot/Makefile b/devel/py-buildbot/buildbot/Makefile index f66911c460c..4a89f2427d6 100644 --- a/devel/py-buildbot/buildbot/Makefile +++ b/devel/py-buildbot/buildbot/Makefile @@ -2,7 +2,7 @@ COMMENT = continuous integration framework DISTNAME = buildbot-${MODPY_EGG_VERSION} PKGNAME = ${DISTNAME} -REVISION = 1 +REVISION = 2 RUN_DEPENDS = databases/py-sqlalchemy${MODPY_FLAVOR} \ databases/py-alembic${MODPY_FLAVOR} \ diff --git a/devel/py-buildbot/console-view/Makefile b/devel/py-buildbot/console-view/Makefile index 4ee3b04fd38..2c34ba97664 100644 --- a/devel/py-buildbot/console-view/Makefile +++ b/devel/py-buildbot/console-view/Makefile @@ -1,5 +1,5 @@ COMMENT = console view web interface plugin for buildbot -REVISION = 0 +REVISION = 1 PART = console-view BUILD_DEPENDS = devel/py-buildbot/pkg diff --git a/devel/py-buildbot/grid-view/Makefile b/devel/py-buildbot/grid-view/Makefile index 335abfada1d..4939118b225 100644 --- a/devel/py-buildbot/grid-view/Makefile +++ b/devel/py-buildbot/grid-view/Makefile @@ -1,5 +1,5 @@ COMMENT = grid view web interface plugin for buildbot -REVISION = 0 +REVISION = 1 PART = grid-view BUILD_DEPENDS = devel/py-buildbot/pkg diff --git a/devel/py-buildbot/pkg/Makefile b/devel/py-buildbot/pkg/Makefile index 8b305e3f115..b32e00a3b58 100644 --- a/devel/py-buildbot/pkg/Makefile +++ b/devel/py-buildbot/pkg/Makefile @@ -1,5 +1,5 @@ COMMENT = packaging tools for buildbot -REVISION = 0 +REVISION = 1 PART = pkg diff --git a/devel/py-buildbot/waterfall-view/Makefile b/devel/py-buildbot/waterfall-view/Makefile index 4189b585fe9..c8f7516c958 100644 --- a/devel/py-buildbot/waterfall-view/Makefile +++ b/devel/py-buildbot/waterfall-view/Makefile @@ -1,5 +1,5 @@ COMMENT = waterfall view web interface plugin for buildbot -REVISION = 0 +REVISION = 1 PART = waterfall-view BUILD_DEPENDS = devel/py-buildbot/pkg diff --git a/devel/py-buildbot/www/Makefile b/devel/py-buildbot/www/Makefile index 894ebf1f524..33cb95fa630 100644 --- a/devel/py-buildbot/www/Makefile +++ b/devel/py-buildbot/www/Makefile @@ -1,5 +1,5 @@ COMMENT = web interface for buildbot -REVISION = 0 +REVISION = 1 PART = www diff --git a/devel/py-dulwich/Makefile b/devel/py-dulwich/Makefile index 56a79d5fc4b..112d37c6bd6 100644 --- a/devel/py-dulwich/Makefile +++ b/devel/py-dulwich/Makefile @@ -3,7 +3,7 @@ COMMENT = pure Python implementation of Git file formats and protocols MODPY_EGG_VERSION = 0.20.32 DISTNAME = dulwich-${MODPY_EGG_VERSION} PKGNAME = py-${DISTNAME} -REVISION = 0 +REVISION = 1 CATEGORIES = devel diff --git a/devel/py-funcy/Makefile b/devel/py-funcy/Makefile index 2d157dcd3ed..30445aacd90 100644 --- a/devel/py-funcy/Makefile +++ b/devel/py-funcy/Makefile @@ -3,7 +3,7 @@ COMMENT = fancy and practical functional tools MODPY_EGG_VERSION = 1.17 DISTNAME = funcy-${MODPY_EGG_VERSION} PKGNAME = py-${DISTNAME} -REVISION = 0 +REVISION = 1 CATEGORIES = devel diff --git a/devel/py-future/Makefile b/devel/py-future/Makefile index 4301eb817de..ab336dacccc 100644 --- a/devel/py-future/Makefile +++ b/devel/py-future/Makefile @@ -3,7 +3,7 @@ COMMENT = compatibility layer between Python 2 and Python 3 MODPY_EGG_VERSION = 0.18.2 DISTNAME = future-${MODPY_EGG_VERSION} PKGNAME = py-${DISTNAME} -REVISION = 0 +REVISION = 1 CATEGORIES = devel HOMEPAGE = http://python-future.org/ diff --git a/devel/py-gevent/Makefile b/devel/py-gevent/Makefile index b6b231dd3d1..4eb200f000c 100644 --- a/devel/py-gevent/Makefile +++ b/devel/py-gevent/Makefile @@ -3,7 +3,7 @@ COMMENT = network library for easy and scalable concurrency MODPY_EGG_VERSION = 21.12.0 DISTNAME = gevent-${MODPY_EGG_VERSION} PKGNAME = py-${DISTNAME} -REVISION = 1 +REVISION = 2 CATEGORIES = devel HOMEPAGE = https://www.gevent.org/ diff --git a/devel/py-gobject3/Makefile b/devel/py-gobject3/Makefile index 549f43e92f3..6a916d1a78c 100644 --- a/devel/py-gobject3/Makefile +++ b/devel/py-gobject3/Makefile @@ -4,7 +4,7 @@ GNOME_PROJECT= pygobject GNOME_VERSION= 3.42.2 MODPY_EGG_VERSION= ${GNOME_VERSION} PKGNAME= py3-gobject3-${GNOME_VERSION} -REVISION= 3 +REVISION= 4 CATEGORIES= devel diff --git a/devel/py-intervaltree/Makefile b/devel/py-intervaltree/Makefile index 34d968109ea..3ea7266cce9 100644 --- a/devel/py-intervaltree/Makefile +++ b/devel/py-intervaltree/Makefile @@ -3,7 +3,7 @@ COMMENT = editable interval tree data structure for Python 2 and 3 MODPY_EGG_VERSION = 3.1.0 DISTNAME = intervaltree-${MODPY_EGG_VERSION} PKGNAME = py-${DISTNAME} -REVISION = 0 +REVISION = 1 CATEGORIES = devel diff --git a/devel/py-lief/Makefile b/devel/py-lief/Makefile index c865b9e6ce5..2c6df5f9614 100644 --- a/devel/py-lief/Makefile +++ b/devel/py-lief/Makefile @@ -4,7 +4,7 @@ MODPY_EGG_VERSION = 0.11.5 DISTNAME = lief-${MODPY_EGG_VERSION} PKGNAME = ${MODPY_PY_PREFIX}${DISTNAME} -REVISION = 1 +REVISION = 2 CATEGORIES = devel diff --git a/devel/py-modulegraph/Makefile b/devel/py-modulegraph/Makefile index 98b78090f05..21050165f2a 100644 --- a/devel/py-modulegraph/Makefile +++ b/devel/py-modulegraph/Makefile @@ -3,7 +3,7 @@ COMMENT= Python module dependency analysis tool MODPY_EGG_VERSION= 0.19.3 DISTNAME= modulegraph-${MODPY_EGG_VERSION} PKGNAME= py-${DISTNAME} -REVISION= 1 +REVISION= 2 CATEGORIES= devel diff --git a/devel/py-nose/Makefile b/devel/py-nose/Makefile index 3f361b79ebf..e5e08ba877e 100644 --- a/devel/py-nose/Makefile +++ b/devel/py-nose/Makefile @@ -4,7 +4,7 @@ MODPY_EGG_VERSION= 1.3.7 DISTNAME= nose-${MODPY_EGG_VERSION} PKGNAME= py-${DISTNAME} CATEGORIES= devel -REVISION= 12 +REVISION= 13 HOMEPAGE= https://nose.readthedocs.io/en/latest/ diff --git a/devel/py-pip/Makefile b/devel/py-pip/Makefile index 11b7553854f..df0b754d733 100644 --- a/devel/py-pip/Makefile +++ b/devel/py-pip/Makefile @@ -1,7 +1,7 @@ COMMENT = tool for installing Python packages MODPY_EGG_VERSION = 22.3.1 -REVISION = 1 +REVISION = 2 DISTNAME = pip-${MODPY_EGG_VERSION} PKGNAME = py-${DISTNAME} CATEGORIES = devel diff --git a/devel/py-plugnplay/Makefile b/devel/py-plugnplay/Makefile index 0b88a33aa93..5063c32be45 100644 --- a/devel/py-plugnplay/Makefile +++ b/devel/py-plugnplay/Makefile @@ -3,7 +3,7 @@ COMMENT = a generic plug-in system for python MODPY_EGG_VERSION = 0.5.4 DISTNAME = plugnplay-${MODPY_EGG_VERSION} PKGNAME = py-${DISTNAME} -REVISION = 2 +REVISION = 3 CATEGORIES = devel diff --git a/devel/py-serial/Makefile b/devel/py-serial/Makefile index 18e36fba8ff..687a230ec13 100644 --- a/devel/py-serial/Makefile +++ b/devel/py-serial/Makefile @@ -3,7 +3,7 @@ COMMENT = serial interface class for Python MODPY_EGG_VERSION = 3.4 DISTNAME = pyserial-${MODPY_EGG_VERSION} PKGNAME = ${DISTNAME:S/py/py-/} -REVISION = 3 +REVISION = 4 CATEGORIES = devel diff --git a/devel/py-setuptools_git/Makefile b/devel/py-setuptools_git/Makefile index 9568ec1eee0..cdd1e48e3ef 100644 --- a/devel/py-setuptools_git/Makefile +++ b/devel/py-setuptools_git/Makefile @@ -3,7 +3,7 @@ COMMENT= setuptools revision control system plugin for Git MODPY_EGG_VERSION= 1.2 DISTNAME= setuptools-git-${MODPY_EGG_VERSION} PKGNAME= py-${DISTNAME} -REVISION= 4 +REVISION= 5 CATEGORIES= devel diff --git a/devel/py-simplejson/Makefile b/devel/py-simplejson/Makefile index 63f7eb3dc29..a1ac59c37c2 100644 --- a/devel/py-simplejson/Makefile +++ b/devel/py-simplejson/Makefile @@ -3,6 +3,7 @@ COMMENT = JSON encoder/decoder MODPY_EGG_VERSION = 3.18.0 DISTNAME = simplejson-${MODPY_EGG_VERSION} PKGNAME = py-${DISTNAME} +REVISION = 0 CATEGORIES = devel diff --git a/devel/py-six/Makefile b/devel/py-six/Makefile index 12a373f0d4d..98ddebce42d 100644 --- a/devel/py-six/Makefile +++ b/devel/py-six/Makefile @@ -3,7 +3,7 @@ COMMENT = Python 2 and 3 compatibility library MODPY_EGG_VERSION = 1.16.0 DISTNAME = six-${MODPY_EGG_VERSION} PKGNAME = py-six-${MODPY_EGG_VERSION} -REVISION = 1 +REVISION = 2 CATEGORIES = devel diff --git a/devel/py-sortedcontainers/Makefile b/devel/py-sortedcontainers/Makefile index 864078df314..7bd7eadbea9 100644 --- a/devel/py-sortedcontainers/Makefile +++ b/devel/py-sortedcontainers/Makefile @@ -1,7 +1,7 @@ COMMENT = Python Sorted Container Types MODPY_EGG_VERSION = 2.4.0 -REVISION = 1 +REVISION = 2 DISTNAME = sortedcontainers-${MODPY_EGG_VERSION} PKGNAME = py-${DISTNAME} diff --git a/devel/py-tabulate/Makefile b/devel/py-tabulate/Makefile index 74735233e7a..80fe95abb3a 100644 --- a/devel/py-tabulate/Makefile +++ b/devel/py-tabulate/Makefile @@ -5,7 +5,7 @@ COMMENT = pretty-print tabular data MODPY_EGG_VERSION = 0.8.10 DISTNAME = tabulate-${MODPY_EGG_VERSION} PKGNAME = py-${DISTNAME} -REVISION = 0 +REVISION = 1 CATEGORIES = devel diff --git a/devel/py-xdg/Makefile b/devel/py-xdg/Makefile index 2d572e65e30..305cfd579e5 100644 --- a/devel/py-xdg/Makefile +++ b/devel/py-xdg/Makefile @@ -3,7 +3,7 @@ COMMENT= python library to access freedesktop.org standards MODPY_EGG_VERSION= 0.28 DISTNAME= pyxdg-${MODPY_EGG_VERSION} PKGNAME= py-xdg-${MODPY_EGG_VERSION} -REVISION= 0 +REVISION= 1 CATEGORIES= devel diff --git a/devel/pygame/Makefile b/devel/pygame/Makefile index 4c5132fe76f..4a016b4c421 100644 --- a/devel/pygame/Makefile +++ b/devel/pygame/Makefile @@ -1,7 +1,7 @@ COMMENT= set of Python modules designed for writing games MODPY_EGG_VERSION = 2.0.1 -REVISION= 3 +REVISION= 4 DISTNAME= pygame-${MODPY_EGG_VERSION} PKGNAME = py-game-${MODPY_EGG_VERSION} CATEGORIES= devel games diff --git a/devel/pylint/Makefile b/devel/pylint/Makefile index 699c6de8b2f..5ffa4b63deb 100644 --- a/devel/pylint/Makefile +++ b/devel/pylint/Makefile @@ -3,7 +3,7 @@ COMMENT = lint-like code checker for Python code # XXX check/update py-astroid pkgspec in RUN_DEPENDS when updating MODPY_EGG_VERSION = 2.7.4 DISTNAME= pylint-${MODPY_EGG_VERSION} -REVISION= 2 +REVISION= 3 CATEGORIES= devel diff --git a/devel/spyder/py-spyder-kernels/Makefile b/devel/spyder/py-spyder-kernels/Makefile index 15b2dcaf462..b5c51eb37fa 100644 --- a/devel/spyder/py-spyder-kernels/Makefile +++ b/devel/spyder/py-spyder-kernels/Makefile @@ -3,7 +3,7 @@ COMMENT= kernels used by spyder on its ipython console MODPY_EGG_VERSION= 0.4.2 DISTNAME= spyder-kernels-${MODPY_EGG_VERSION} PKGNAME= ${MODPY_PY_PREFIX}${DISTNAME} -REVISION= 5 +REVISION= 6 PORTROACH= limit:^0 diff --git a/devel/spyder/spyder/Makefile b/devel/spyder/spyder/Makefile index a6c2d1a67df..ff88b9c21e2 100644 --- a/devel/spyder/spyder/Makefile +++ b/devel/spyder/spyder/Makefile @@ -3,7 +3,7 @@ BROKEN = needs updating for Python 3.10 COMMENT = Scientific PYthon Development EnviRonment MODPY_EGG_VERSION = 3.3.3 -REVISION = 8 +REVISION = 9 DISTNAME = spyder-${MODPY_EGG_VERSION} PKGNAME = spyder3-${MODPY_EGG_VERSION} diff --git a/editors/py-neovim/Makefile b/editors/py-neovim/Makefile index 8491c48c3bd..b8df86255d0 100644 --- a/editors/py-neovim/Makefile +++ b/editors/py-neovim/Makefile @@ -3,7 +3,7 @@ COMMENT = Python plugin support for Neovim MODPY_EGG_VERSION = 0.4.3 DISTNAME = pynvim-${MODPY_EGG_VERSION} PKGNAME = py-neovim-${MODPY_EGG_VERSION} -REVISION = 2 +REVISION = 3 CATEGORIES = editors devel HOMEPAGE = https://github.com/neovim/pynvim diff --git a/education/anki/Makefile b/education/anki/Makefile index 19f90a985e0..da1a01ac0f4 100644 --- a/education/anki/Makefile +++ b/education/anki/Makefile @@ -19,7 +19,7 @@ COMMENT = flashcard learning system with spaced repetition # DISTNAME = anki-2.1.16 EXTRACT_SUFX = -source.tgz -REVISION = 4 +REVISION = 5 CATEGORIES = education diff --git a/games/singularity/Makefile b/games/singularity/Makefile index 614715bfd3a..9c6c9228ec6 100644 --- a/games/singularity/Makefile +++ b/games/singularity/Makefile @@ -5,7 +5,7 @@ MUSIC_V= 007 V= ${MODPY_EGG_VERSION} DISTNAME= singularity-${V} PKGNAME= singularity-${V} -REVISION= 1 +REVISION= 2 CATEGORIES= games diff --git a/geo/gdal/Makefile b/geo/gdal/Makefile index 4dc8c0e4ccc..6dc077de19b 100644 --- a/geo/gdal/Makefile +++ b/geo/gdal/Makefile @@ -6,6 +6,8 @@ DISTNAME = gdal-${V} DISTFILES = ${DISTNAME}${EXTRACT_SUFX} \ gdalautotest-${V}${EXTRACT_SUFX} +REVISION-python = 0 + FULLPKGNAME-main = ${DISTNAME} FULLPKGPATH-main = geo/gdal,-main FULLPKGNAME-python = py3-${DISTNAME} diff --git a/geo/mapproxy/Makefile b/geo/mapproxy/Makefile index e606a2161f8..891bac3559e 100644 --- a/geo/mapproxy/Makefile +++ b/geo/mapproxy/Makefile @@ -3,7 +3,7 @@ COMMENT = GIS WMTS/TMS tile caching server MODPY_EGG_VERSION = 1.15.1 DISTNAME = MapProxy-${MODPY_EGG_VERSION} PKGNAME = ${DISTNAME:L} -REVISION = 0 +REVISION = 1 CATEGORIES = geo www diff --git a/geo/mapserver/Makefile b/geo/mapserver/Makefile index 00c0edf3533..8c69720f254 100644 --- a/geo/mapserver/Makefile +++ b/geo/mapserver/Makefile @@ -14,7 +14,7 @@ PKGNAME-php= php-mapscript-${V} PKGNAME-perl= p5-mapscript-${V} PKGNAME-python= py3-mapscript-${V} REVISION-php= 0 -REVISION-python=0 +REVISION-python=1 SHARED_LIBS += mapserver 6.0 diff --git a/geo/pygeoapi/Makefile b/geo/pygeoapi/Makefile index c3bdbdb4d84..3fd75e7360c 100644 --- a/geo/pygeoapi/Makefile +++ b/geo/pygeoapi/Makefile @@ -2,7 +2,7 @@ COMMENT = OGC API server implementation MODPY_EGG_VERSION = 0.12.0 DISTNAME = pygeoapi-${MODPY_EGG_VERSION} -REVISION = 1 +REVISION = 2 CATEGORIES = geo devel diff --git a/graphics/mypaint/Makefile b/graphics/mypaint/Makefile index 857b573ec75..13e6a06278d 100644 --- a/graphics/mypaint/Makefile +++ b/graphics/mypaint/Makefile @@ -3,7 +3,7 @@ COMMENT = raster graphics editor for digital painters MODPY_EGG_VERSION = 2.0.1 DISTNAME = mypaint-${MODPY_EGG_VERSION} EXTRACT_SUFX = .tar.xz -REVISION = 4 +REVISION = 5 CATEGORIES = graphics diff --git a/graphics/py-cairo/Makefile b/graphics/py-cairo/Makefile index d6b35e5a552..08bb420a7f1 100644 --- a/graphics/py-cairo/Makefile +++ b/graphics/py-cairo/Makefile @@ -8,6 +8,7 @@ GH_ACCOUNT= pygobject GH_PROJECT= pycairo GH_TAGNAME= v${MODPY_EGG_VERSION} PKGNAME= py-cairo-${MODPY_EGG_VERSION} +REVISION= 0 CATEGORIES= graphics diff --git a/graphics/py-matplotlib/Makefile b/graphics/py-matplotlib/Makefile index a04838ee881..b51b796d4e0 100644 --- a/graphics/py-matplotlib/Makefile +++ b/graphics/py-matplotlib/Makefile @@ -3,7 +3,7 @@ COMMENT= Python charting and plotting API MODPY_EGG_VERSION = 3.2.2 DISTNAME = matplotlib-${MODPY_EGG_VERSION} PKGNAME = py-${DISTNAME} -REVISION = 0 +REVISION = 1 CATEGORIES = graphics devel math diff --git a/graphics/py-opengl/Makefile b/graphics/py-opengl/Makefile index 1109de30b36..85356452e8d 100644 --- a/graphics/py-opengl/Makefile +++ b/graphics/py-opengl/Makefile @@ -2,7 +2,7 @@ COMMENT = Python bindings for OpenGL MODPY_EGG_VERSION = 3.1.3b2 DISTNAME = PyOpenGL-${MODPY_EGG_VERSION} PKGNAME = py-opengl-${MODPY_EGG_VERSION} -REVISION = 4 +REVISION = 5 CATEGORIES = graphics HOMEPAGE = http://pyopengl.sourceforge.net/ diff --git a/lang/cython/Makefile b/lang/cython/Makefile index 0d2c02a1804..3878b4ff275 100644 --- a/lang/cython/Makefile +++ b/lang/cython/Makefile @@ -4,7 +4,7 @@ MODPY_EGG_VERSION = 0.29.32 DISTNAME = Cython-${MODPY_EGG_VERSION} PKGNAME = py-cython-${MODPY_EGG_VERSION} CATEGORIES = lang -REVISION = 0 +REVISION = 1 EPOCH = 0 diff --git a/lang/python/python.port.mk b/lang/python/python.port.mk index 281ec475397..c748c28fb7d 100644 --- a/lang/python/python.port.mk +++ b/lang/python/python.port.mk @@ -174,15 +174,18 @@ _MODPY_PRE_BUILD_STEPS += ; if [ -e ${WRKSRC}/pyproject.toml ] && \ . if ${MODPY_PYBUILD:L} != "no" ERRORS += "Fatal: don't set both MODPY_PYBUILD and MODPY_SETUPTOOLS" . endif -# The setuptools module provides a package locator (site.py) that is -# required at runtime for the pkg_resources stuff to work +# For Python 2, setuptools provides a package locator that +# is required at runtime for the pkg_resources stuff to work +# For Python 3, normally importlib.metadata (in Python core +# in newer versions) or importlib_metadata (external module) +# are used in preference. . if ${MODPY_MAJOR_VERSION} == 2 MODPY_SETUPUTILS_DEPEND ?= devel/py2-setuptools +MODPY_RUN_DEPENDS += ${MODPY_SETUPUTILS_DEPEND} . else MODPY_SETUPUTILS_DEPEND ?= devel/py-setuptools${MODPY_FLAVOR} . endif -MODPY_RUN_DEPENDS += ${MODPY_SETUPUTILS_DEPEND} BUILD_DEPENDS += ${MODPY_SETUPUTILS_DEPEND} MODPY_SETUPUTILS = Yes @@ -213,8 +216,6 @@ BUILD_DEPENDS += devel/py-hatchling${MODPY_FLAVOR} . elif ${MODPY_PYBUILD} == poetry-core BUILD_DEPENDS += devel/py-poetry-core${MODPY_FLAVOR} . elif ${MODPY_PYBUILD} == setuptools || ${MODPY_PYBUILD} == setuptools_scm -#XXX trying without nojunk to see how it goes: may need to reinstate if there are issues -#DPB_PROPERTIES += nojunk BUILD_DEPENDS += devel/py-setuptools${MODPY_FLAVOR} \ devel/py-wheel${MODPY_FLAVOR} . if ${MODPY_PYBUILD} == setuptools_scm diff --git a/math/py-bottleneck/Makefile b/math/py-bottleneck/Makefile index dfd58dc1e09..33f81e11b77 100644 --- a/math/py-bottleneck/Makefile +++ b/math/py-bottleneck/Makefile @@ -4,7 +4,7 @@ MODPY_EGG_VERSION = 1.3.5 DISTNAME = Bottleneck-${MODPY_EGG_VERSION} PKGNAME = py-${DISTNAME:L} CATEGORIES = math -REVISION = 0 +REVISION = 1 MAINTAINER = Martin Reindl diff --git a/math/py-cvxpy/Makefile b/math/py-cvxpy/Makefile index 4cc9ef1965b..5af31c752da 100644 --- a/math/py-cvxpy/Makefile +++ b/math/py-cvxpy/Makefile @@ -4,7 +4,7 @@ MODPY_EGG_VERSION = 1.2.1 DISTNAME = cvxpy-${MODPY_EGG_VERSION} PKGNAME = py-${DISTNAME} CATEGORIES = math -REVISION = 0 +REVISION = 1 MAINTAINER = Paul Irofti diff --git a/math/py-numpy/Makefile b/math/py-numpy/Makefile index 2552061cd4f..d1740fa8585 100644 --- a/math/py-numpy/Makefile +++ b/math/py-numpy/Makefile @@ -3,7 +3,7 @@ COMMENT= fast array and numeric programming library for Python MODPY_EGG_VERSION= 1.23.2 DISTNAME= numpy-${MODPY_EGG_VERSION} PKGNAME= py-${DISTNAME} -REVISION= 0 +REVISION= 1 CATEGORIES= math devel diff --git a/math/py-scikit-learn/Makefile b/math/py-scikit-learn/Makefile index 779dc899e66..9e4b6752f05 100644 --- a/math/py-scikit-learn/Makefile +++ b/math/py-scikit-learn/Makefile @@ -3,7 +3,7 @@ COMMENT = set of python modules for machine learning and data mining MODPY_EGG_VERSION = 1.0.2 DISTNAME = scikit-learn-${MODPY_EGG_VERSION} PKGNAME = py-${DISTNAME} -REVISION = 0 +REVISION = 1 CATEGORIES = math diff --git a/math/py-scipy/Makefile b/math/py-scipy/Makefile index 04feae7b21b..114b379ba16 100644 --- a/math/py-scipy/Makefile +++ b/math/py-scipy/Makefile @@ -1,7 +1,7 @@ COMMENT= maths, science and engineering modules for Python MODPY_EGG_VERSION= 1.5.3 -REVISION= 3 +REVISION= 4 DISTNAME= scipy-${MODPY_EGG_VERSION} PKGNAME= py-${DISTNAME} diff --git a/math/veusz/Makefile b/math/veusz/Makefile index f2f6993771a..d51b96ae356 100644 --- a/math/veusz/Makefile +++ b/math/veusz/Makefile @@ -5,7 +5,7 @@ COMMENT = scientific plotting and graphing package MODPY_EGG_VERSION = 3.4 DISTNAME = veusz-${MODPY_EGG_VERSION} CATEGORIES = math graphics -REVISION = 1 +REVISION = 2 HOMEPAGE = https://veusz.github.io/ MAINTAINER = Brian Callahan diff --git a/misc/freeopcua/opcua-client-gui/Makefile b/misc/freeopcua/opcua-client-gui/Makefile index 564705b24d4..d252d57ee2d 100644 --- a/misc/freeopcua/opcua-client-gui/Makefile +++ b/misc/freeopcua/opcua-client-gui/Makefile @@ -4,7 +4,7 @@ MODPY_EGG_VERSION = 0.8.0 DISTNAME = opcua-client-${MODPY_EGG_VERSION} PKGNAME = opcua-client-gui-${MODPY_EGG_VERSION} -REVISION = 2 +REVISION = 3 CATEGORIES = misc diff --git a/misc/freeopcua/py-opcua-widgets/Makefile b/misc/freeopcua/py-opcua-widgets/Makefile index daf0e421be6..7be1948c2a7 100644 --- a/misc/freeopcua/py-opcua-widgets/Makefile +++ b/misc/freeopcua/py-opcua-widgets/Makefile @@ -4,7 +4,7 @@ MODPY_EGG_VERSION = 0.5.10 DISTNAME = opcua-widgets-${MODPY_EGG_VERSION} PKGNAME = py-${DISTNAME} -REVISION = 1 +REVISION = 2 CATEGORIES = misc diff --git a/misc/freeopcua/py-opcua/Makefile b/misc/freeopcua/py-opcua/Makefile index a3d52e7b25f..54ed56a71a8 100644 --- a/misc/freeopcua/py-opcua/Makefile +++ b/misc/freeopcua/py-opcua/Makefile @@ -4,7 +4,7 @@ MODPY_EGG_VERSION = 0.98.13 DISTNAME = opcua-${MODPY_EGG_VERSION} PKGNAME = py-${DISTNAME} -REVISION = 0 +REVISION = 1 CATEGORIES = misc diff --git a/misc/lfm/Makefile b/misc/lfm/Makefile index 4d45b691419..489837ac6e3 100644 --- a/misc/lfm/Makefile +++ b/misc/lfm/Makefile @@ -2,7 +2,7 @@ COMMENT = powerful curses interface python file manager MODPY_EGG_VERSION = 3.1 DISTNAME = lfm-${MODPY_EGG_VERSION} -REVISION = 1 +REVISION = 2 CATEGORIES = misc diff --git a/multimedia/devede/Makefile b/multimedia/devede/Makefile index 39f7273322e..9658ccaba92 100644 --- a/multimedia/devede/Makefile +++ b/multimedia/devede/Makefile @@ -3,7 +3,7 @@ COMMENT= video DVDs and CDs creation tool MODPY_EGG_VERSION= 4.17.0 DISTNAME= devedeng-${MODPY_EGG_VERSION} PKGNAME= devede-${MODPY_EGG_VERSION} -REVISION= 0 +REVISION= 1 CATEGORIES= multimedia x11 diff --git a/net/deluge/Makefile b/net/deluge/Makefile index 3a069e3ba06..3542d7693e4 100644 --- a/net/deluge/Makefile +++ b/net/deluge/Makefile @@ -2,7 +2,7 @@ COMMENT = bittorrent client DISTNAME = deluge-${MODPY_EGG_VERSION} MODPY_EGG_VERSION = 2.0.5 -REVISION = 0 +REVISION = 1 CATEGORIES = net diff --git a/net/napalm/py-napalm/Makefile b/net/napalm/py-napalm/Makefile index 60c7e8e87c4..cabe8ea4452 100644 --- a/net/napalm/py-napalm/Makefile +++ b/net/napalm/py-napalm/Makefile @@ -1,7 +1,7 @@ COMMENT = network automation abstraction layer MODPY_EGG_VERSION = 2.3.3 -REVISION = 4 +REVISION = 5 DISTNAME = napalm-${MODPY_EGG_VERSION} PKGNAME = py-${DISTNAME} diff --git a/print/py-reportlab/Makefile b/print/py-reportlab/Makefile index b8a72f38b18..b4549c2ef41 100644 --- a/print/py-reportlab/Makefile +++ b/print/py-reportlab/Makefile @@ -5,7 +5,7 @@ MODPY_EGG_VERSION= 3.5.68 DISTNAME= reportlab-${MODPY_EGG_VERSION} PKGNAME= py-${DISTNAME} EPOCH= 0 -REVISION= 0 +REVISION= 1 # see patches/patch-setup_py # grep 'zipdata =' `make show=WRKSRC`/setup.py diff --git a/print/system-config-printer/Makefile b/print/system-config-printer/Makefile index b230d526901..b37bc970132 100644 --- a/print/system-config-printer/Makefile +++ b/print/system-config-printer/Makefile @@ -2,7 +2,7 @@ COMMENT= printer (CUPS) administration tool V= 1.5.18 DISTNAME= system-config-printer-${V} -REVISION= 1 +REVISION= 2 CATEGORIES= print sysutils diff --git a/security/libpwquality/Makefile b/security/libpwquality/Makefile index 782fc6c4d2f..bb384190911 100644 --- a/security/libpwquality/Makefile +++ b/security/libpwquality/Makefile @@ -5,6 +5,7 @@ GH_PROJECT = libpwquality GH_ACCOUNT = libpwquality GH_TAGNAME = libpwquality-${MODPY_EGG_VERSION} DISTNAME = libpwquality-${MODPY_EGG_VERSION} +REVISION = 0 SHARED_LIBS += pwquality 1.0 # 1.2 diff --git a/security/pass-import/Makefile b/security/pass-import/Makefile index 46e4321c07e..e00ce46feb1 100644 --- a/security/pass-import/Makefile +++ b/security/pass-import/Makefile @@ -1,7 +1,7 @@ COMMENT= importer for pass (passwordstore) MODPY_EGG_VERSION= 3.3 -REVISION= 1 +REVISION= 2 DISTNAME= pass-import-${MODPY_EGG_VERSION} CATEGORIES= security diff --git a/security/py-cryptodome/Makefile b/security/py-cryptodome/Makefile index 5e51740d4ba..785a5edc5ef 100644 --- a/security/py-cryptodome/Makefile +++ b/security/py-cryptodome/Makefile @@ -3,7 +3,7 @@ COMMENT = self-contained cryptographic library for Python MODPY_EGG_VERSION = 3.15.0 DISTNAME = pycryptodome-${MODPY_EGG_VERSION} PKGNAME = py-${DISTNAME:S/py//} -REVISION = 0 +REVISION = 1 CATEGORIES = security diff --git a/security/py-pefile/Makefile b/security/py-pefile/Makefile index bc5bbea2ead..2ce7b8b4192 100644 --- a/security/py-pefile/Makefile +++ b/security/py-pefile/Makefile @@ -3,7 +3,7 @@ COMMENT = Python module to read and work with PE files MODPY_EGG_VERSION = 2018.8.8 DISTNAME = pefile-${MODPY_EGG_VERSION} PKGNAME = py-${DISTNAME} -REVISION = 4 +REVISION = 5 CATEGORIES = security diff --git a/security/wapiti/Makefile b/security/wapiti/Makefile index 8ccff870a41..8deacbf63c0 100644 --- a/security/wapiti/Makefile +++ b/security/wapiti/Makefile @@ -3,7 +3,7 @@ COMMENT = web-application vulnerability scanner MODPY_EGG_VERSION = 3.0.1 DISTNAME = wapiti3-${MODPY_EGG_VERSION} PKGNAME = wapiti-${MODPY_EGG_VERSION} -REVISION = 4 +REVISION = 5 CATEGORIES = security www diff --git a/security/yara/python/Makefile b/security/yara/python/Makefile index deb8859f474..270140f8323 100644 --- a/security/yara/python/Makefile +++ b/security/yara/python/Makefile @@ -5,7 +5,7 @@ GH_PROJECT = yara-python MODPY_EGG_VERSION = 4.2.0 PKGNAME = py-yara-${MODPY_EGG_VERSION} GH_TAGNAME = v${MODPY_EGG_VERSION} -REVISION = 0 +REVISION = 1 COMPILER = base-clang ports-gcc COMPILER_LANGS = c diff --git a/shells/py-qtconsole/Makefile b/shells/py-qtconsole/Makefile index d0ddfe0e3f5..4e9f12f2213 100644 --- a/shells/py-qtconsole/Makefile +++ b/shells/py-qtconsole/Makefile @@ -3,7 +3,7 @@ COMMENT = Jupyter Qt console MODPY_EGG_VERSION = 5.0.3 DISTNAME = qtconsole-${MODPY_EGG_VERSION} PKGNAME = py-${DISTNAME} -REVISION = 1 +REVISION = 2 CATEGORIES = shells diff --git a/sysutils/py-packaging/Makefile b/sysutils/py-packaging/Makefile index 6ad9d0bd894..5363807c29f 100644 --- a/sysutils/py-packaging/Makefile +++ b/sysutils/py-packaging/Makefile @@ -4,7 +4,7 @@ MODPY_EGG_VERSION = 21.3 DISTNAME = packaging-${MODPY_EGG_VERSION} PKGNAME = py-${DISTNAME} -REVISION = 0 +REVISION = 1 CATEGORIES = sysutils diff --git a/sysutils/py-psutil/Makefile b/sysutils/py-psutil/Makefile index 310ed517408..7fb5fa36a53 100644 --- a/sysutils/py-psutil/Makefile +++ b/sysutils/py-psutil/Makefile @@ -1,7 +1,7 @@ COMMENT = library to retrieve system information and utilisation MODPY_EGG_VERSION = 5.8.0 -REVISION = 1 +REVISION = 2 GH_ACCOUNT = giampaolo GH_PROJECT = psutil diff --git a/sysutils/py-vsphere-automation/Makefile b/sysutils/py-vsphere-automation/Makefile index 3eecd4c5ae2..f70ea02f2f3 100644 --- a/sysutils/py-vsphere-automation/Makefile +++ b/sysutils/py-vsphere-automation/Makefile @@ -6,7 +6,7 @@ GH_PROJECT = vsphere-automation-sdk-python GH_TAGNAME = v8.0.0.1 PKGNAME = py-vsphere-automation-${MODPY_EGG_VERSION} -REVISION = 0 +REVISION = 1 CATEGORIES = sysutils diff --git a/sysutils/salt/Makefile b/sysutils/salt/Makefile index de230cbd28e..a9549b88d73 100644 --- a/sysutils/salt/Makefile +++ b/sysutils/salt/Makefile @@ -17,7 +17,7 @@ COMMENT = remote execution and configuration management system MODPY_EGG_VERSION = 3003.5 DISTNAME = salt-${MODPY_EGG_VERSION} -REVISION = 1 +REVISION = 2 CATEGORIES = sysutils net devel diff --git a/sysutils/virt-manager/Makefile b/sysutils/virt-manager/Makefile index 1a017d665ca..9d617278f17 100644 --- a/sysutils/virt-manager/Makefile +++ b/sysutils/virt-manager/Makefile @@ -2,7 +2,7 @@ COMMENT= GUI for managing virtual machines through libvirt DISTNAME= virt-manager-4.1.0 CATEGORIES= sysutils x11 -REVISION= 1 +REVISION= 2 HOMEPAGE= http://virt-manager.org/ diff --git a/textproc/calibre/Makefile b/textproc/calibre/Makefile index f409568b4c9..57c971c3755 100644 --- a/textproc/calibre/Makefile +++ b/textproc/calibre/Makefile @@ -2,7 +2,7 @@ COMMENT = ebook management application V = 5.44.0 DISTNAME = calibre-$V -REVISION = 0 +REVISION = 1 CATEGORIES = textproc diff --git a/textproc/libmarisa/Makefile b/textproc/libmarisa/Makefile index 24afbef6d92..a6ac421b99a 100644 --- a/textproc/libmarisa/Makefile +++ b/textproc/libmarisa/Makefile @@ -10,7 +10,7 @@ PKGNAME-python = py3-libmarisa-${V} PKGNAME-ruby = ruby-libmarisa-${V} REVISION-main = 1 -REVISION-python = 3 +REVISION-python = 4 REVISION-ruby = 0 GH_ACCOUNT = s-yata diff --git a/textproc/py-cssselect/Makefile b/textproc/py-cssselect/Makefile index 57c83efc0c1..a21be0cf71a 100644 --- a/textproc/py-cssselect/Makefile +++ b/textproc/py-cssselect/Makefile @@ -2,7 +2,7 @@ COMMENT = parse CSS3 Selectors and translates them to XPath 1.0 MODPY_EGG_VERSION = 1.1.0 PKGNAME = py-${DISTNAME} -REVISION = 1 +REVISION = 2 GH_ACCOUNT = scrapy GH_PROJECT = cssselect diff --git a/textproc/py-lxml/Makefile b/textproc/py-lxml/Makefile index 9215c3a2f3d..2ad8d548fb8 100644 --- a/textproc/py-lxml/Makefile +++ b/textproc/py-lxml/Makefile @@ -5,7 +5,7 @@ FLAVORS= python3 FLAVOR?= MODPY_EGG_VERSION= 4.9.1 -REVISION= 1 +REVISION= 2 DISTNAME= lxml-${MODPY_EGG_VERSION} PKGNAME= py-lxml-${MODPY_EGG_VERSION} diff --git a/textproc/py-yaml/Makefile b/textproc/py-yaml/Makefile index 165453e6ba5..79b08beb700 100644 --- a/textproc/py-yaml/Makefile +++ b/textproc/py-yaml/Makefile @@ -3,7 +3,7 @@ COMMENT= YAML parser and emitter in Python MODPY_EGG_VERSION=5.4.1 DISTNAME= PyYAML-${MODPY_EGG_VERSION} PKGNAME= py-yaml-${MODPY_EGG_VERSION} -REVISION= 1 +REVISION= 2 CATEGORIES= textproc diff --git a/www/py-adblock/Makefile b/www/py-adblock/Makefile index 68fe0d5d90b..b9b3ee427bc 100644 --- a/www/py-adblock/Makefile +++ b/www/py-adblock/Makefile @@ -13,7 +13,7 @@ GH_PROJECT = python-adblock GH_TAGNAME = 0.5.1 DISTNAME = py-adblock-${GH_TAGNAME} MODPY_EGG_VERSION = ${GH_TAGNAME} -REVISION = 1 +REVISION = 2 CATEGORIES = www diff --git a/www/py-html5-parser/Makefile b/www/py-html5-parser/Makefile index 37e6c0ab6c0..f6056f89e7f 100644 --- a/www/py-html5-parser/Makefile +++ b/www/py-html5-parser/Makefile @@ -4,7 +4,7 @@ MODPY_EGG_VERSION = 0.4.10 DISTNAME = html5-parser-${MODPY_EGG_VERSION} PKGNAME = py-${DISTNAME} -REVISION = 1 +REVISION = 2 CATEGORIES = www diff --git a/www/py-jwt/Makefile b/www/py-jwt/Makefile index 22cc05b2f60..25edeafcc37 100644 --- a/www/py-jwt/Makefile +++ b/www/py-jwt/Makefile @@ -5,7 +5,7 @@ DISTNAME = PyJWT-${MODPY_EGG_VERSION} PKGNAME = py-jwt-${MODPY_EGG_VERSION} CATEGORIES = www MAINTAINER = Johan Huldtgren -REVISION = 0 +REVISION = 1 HOMEPAGE = http://github.com/jpadilla/pyjwt diff --git a/x11/mate/menu-advanced/Makefile b/x11/mate/menu-advanced/Makefile index 6869701e16f..37da09da255 100644 --- a/x11/mate/menu-advanced/Makefile +++ b/x11/mate/menu-advanced/Makefile @@ -4,7 +4,7 @@ GH_COMMIT= 61a995e25948015a4f6d86e12cf6141a3b729ce7 GH_ACCOUNT= rnagy GH_PROJECT= mate-menu DISTNAME= mate-menu-advanced-20.04.1 -REVISION= 2 +REVISION= 3 CATEGORIES= x11 diff --git a/x11/nagstamon/Makefile b/x11/nagstamon/Makefile index 7d60a208ace..3fcd2b659be 100755 --- a/x11/nagstamon/Makefile +++ b/x11/nagstamon/Makefile @@ -6,7 +6,7 @@ GH_PROJECT= Nagstamon GH_TAGNAME= v${MODPY_EGG_VERSION} PKGNAME= ${DISTNAME:L} #WRKDIST= ${WRKDIR}/Nagstamon-${MODPY_EGG_VERSION} -REVISION= 0 +REVISION= 1 CATEGORIES= x11 net diff --git a/x11/py-pyglet/Makefile b/x11/py-pyglet/Makefile index 544b6800c90..2db2379b353 100644 --- a/x11/py-pyglet/Makefile +++ b/x11/py-pyglet/Makefile @@ -4,7 +4,7 @@ MODPY_EGG_VERSION = 1.4.11 DISTNAME = pyglet-${MODPY_EGG_VERSION} PKGNAME = py-${DISTNAME} EXTRACT_SUFX = .zip -REVISION = 2 +REVISION = 3 CATEGORIES = x11 multimedia