Ports built with setuptools on python 3.10 don't need a RUN_DEPENDS on

setuptools (it's used as a package locator but importlib.metadata in newer Python core or the external importlib_metadata are preferred). So drop the RDEP in that case (it's still kept for py27) and bump revisions.
2022-11-26 23:28:11 +00:00 · 2022-11-26 23:28:11 +00:00 · d858b7cc2a
parent 711c347ad2
commit d858b7cc2a
85 changed files with 91 additions and 84 deletions
--- 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

--- 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
--- 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
--- 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- =

--- 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

--- 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

--- 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} \
--- 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
--- 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
--- 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

--- 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
--- 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

--- 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

--- 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

--- 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/
--- 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/
--- 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

--- 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

--- 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

--- 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

--- 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/

--- 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
--- 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

--- 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

--- 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

--- 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

--- 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

--- 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}

--- 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

--- 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

--- 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
--- 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

--- 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

--- 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}

--- 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
--- 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

--- 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

--- 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}
--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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/
--- 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

--- 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
--- 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 <martin@catai.org>

--- 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 <paul@irofti.net>

--- 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

--- 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

--- 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}

--- 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 <bcallah@openbsd.org>
--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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}

--- 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
--- 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

--- 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

--- 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
--- 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

--- 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

--- 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

--- 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
--- 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

--- 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

--- 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
--- 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

--- 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

--- 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/

--- 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

--- 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
--- 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
--- 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}

--- 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

--- 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

--- 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

--- 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 <jhuldtgren@gmail.com>
-REVISION =	0
+REVISION =	1

 HOMEPAGE =	http://github.com/jpadilla/pyjwt

--- 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

--- 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

--- 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