diff --git a/archivers/R-cran-zip/Makefile b/archivers/R-cran-zip/Makefile
index 9c6270338a0b..a011450f4f18 100644
--- a/archivers/R-cran-zip/Makefile
+++ b/archivers/R-cran-zip/Makefile
@@ -1,19 +1,20 @@
 PORTNAME=	zip
 DISTVERSION=	2.3.0
+PORTREVISION=	1
 CATEGORIES=	archivers
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Cross-Platform 'zip' Compression
 WWW=		https://github.com/r-lib/zip #readme
 
 LICENSE=	CC0-1.0
 
 TEST_DEPENDS=	R-cran-R6>0:devel/R-cran-R6 \
 		R-cran-covr>0:devel/R-cran-covr \
 		R-cran-testthat>0:devel/R-cran-testthat \
 		R-cran-withr>0:devel/R-cran-withr
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/archivers/py-blosc2/Makefile b/archivers/py-blosc2/Makefile
index 8b933417ea54..75ce06b4b81b 100644
--- a/archivers/py-blosc2/Makefile
+++ b/archivers/py-blosc2/Makefile
@@ -1,41 +1,42 @@
 PORTNAME=	blosc2
 PORTVERSION=	2.2.0
+PORTREVISION=	1
 CATEGORIES=	archivers python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Python wrapper for the C-Blosc2 library
 WWW=		https://github.com/Blosc/python-blosc2
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BUILD_DEPENDS=	cmake:devel/cmake-core \
 		ninja:devel/ninja \
 		${PYTHON_PKGNAMEPREFIX}numpy>=0,1:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-build>=0:devel/py-scikit-build@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR}
 LIB_DEPENDS=	libblosc2.so:archivers/c-blosc2
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}msgpack>=0:devel/py-msgpack@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ndindex>=1.4:math/py-ndindex@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpy>=1.20.3,1:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}py-cpuinfo>=0:sysutils/py-py-cpuinfo@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}rich>=0:textproc/py-rich@${PY_FLAVOR}
 
 USES=		pkgconfig python:3.8+
 USE_PYTHON=	autoplist concurrent cython pep517
 
 MAKE_ENV=	CMAKE_ARGS=-DUSE_SYSTEM_BLOSC2=ON
 
 post-extract:
 	@${RM} ${WRKSRC}/blosc2/c-blosc2/blosc/shuffle-avx2.c.orig
 
 post-patch:
 # Clean up bundled libraries
 	@${RM} -r ${WRKSRC}/blosc2/c-blosc2/
 
 post-install:
 	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' -exec ${STRIP_CMD} {} +
 
 .include <bsd.port.mk>
diff --git a/archivers/vbz-compression/Makefile b/archivers/vbz-compression/Makefile
index 40ffdd7c5019..98021cfb9e4d 100644
--- a/archivers/vbz-compression/Makefile
+++ b/archivers/vbz-compression/Makefile
@@ -1,32 +1,32 @@
 PORTNAME=	vbz-compression
 DISTVERSION=	1.0.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	archivers
 
 MAINTAINER=	jwb@FreeBSD.org
 COMMENT=	Variable byte integer encoding to compress Oxford Nanopore signal data
 WWW=		https://github.com/nanoporetech/vbz_compression
 
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/LICENCE.txt
 
 BUILD_DEPENDS=	streamvbyte>=0.4.1:archivers/streamvbyte
 LIB_DEPENDS=	libhdf5.so:science/hdf5 \
 		libzstd.so:archivers/zstd
 
 USES=		cmake
 USE_GITHUB=	yes
 USE_LDCONFIG=	${PREFIX}/hdf5/lib/plugin
 
 GH_ACCOUNT=	nanoporetech
 GH_PROJECT=	vbz_compression
 
 CMAKE_ARGS=	-DENABLE_CONAN=OFF \
 		-DENABLE_PERF_TESTING=OFF \
 		-DENABLE_PYTHON=OFF \
 		-DSTREAMVBYTE_INSTALL_DIR=${LOCALBASE} \
 		-DSTREAMVBYTE_STATIC_LIB=${LOCALBASE}/lib/libstreamvbyte_static.a
 
 PLIST_FILES=	hdf5/lib/plugin/libvbz_hdf_plugin.so
 
 .include <bsd.port.mk>
diff --git a/astro/R-cran-maptools/Makefile b/astro/R-cran-maptools/Makefile
index cc7a18c51927..c55ee6d6f9d9 100644
--- a/astro/R-cran-maptools/Makefile
+++ b/astro/R-cran-maptools/Makefile
@@ -1,18 +1,19 @@
 PORTNAME=	maptools
 DISTVERSION=	1.1-4
+PORTREVISION=	1
 CATEGORIES=	astro
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Tools for reading and handling spatial objects
 WWW=		https://cran.r-project.org/web/packages/maptools/
 
 LICENSE=	GPLv2+
 
 CRAN_DEPENDS=	R-cran-sp>=1.0.11:math/R-cran-sp
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=	cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/astro/astrometry/Makefile b/astro/astrometry/Makefile
index 70ffdba310d5..7b7551055aa6 100644
--- a/astro/astrometry/Makefile
+++ b/astro/astrometry/Makefile
@@ -1,80 +1,81 @@
 PORTNAME=	astrometry
 PORTVERSION=	0.93
+PORTREVISION=	1
 CATEGORIES=	astro
 MASTER_SITES=	http://astrometry.net/downloads/
 DISTNAME=	${PORTNAME}.net-${PORTVERSION}
 
 MAINTAINER=	rhurlin@FreeBSD.org
 COMMENT=	Astronomic calibration service
 WWW=		https://astrometry.net/
 
 LICENSE=	GPLv3+
 
 BROKEN_armv6=		fails to link: os-features-test.c:10: undefined symbol 'canonicalize_file_name'
 BROKEN_armv7=		fails to link: os-features-test.c:10: undefined symbol 'canonicalize_file_name'
 
 BUILD_DEPENDS=	${PYNUMPY}
 LIB_DEPENDS=	libcairo.so:graphics/cairo \
 		libcfitsio.so:astro/cfitsio \
 		libgsl.so:math/gsl \
 		libpng.so:graphics/png \
 		libnetpbm.so:graphics/netpbm \
 		libwcs.so:astro/wcslib
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}astropy>0:astro/py-astropy@${PY_FLAVOR} \
 		${PYNUMPY}
 
 USES=		gmake jpeg localbase pkgconfig python shebangfix
 USE_LDCONFIG=	yes
 
 SHEBANG_FILES=	bin/* plot/plotann.py sdss/*.py solver/*.py util/[!c]*.py
 
 MAKE_ARGS=	NETPBM_INC="-I${LOCALBASE}/include/netpbm" \
 		NETPBM_LIB="-L${LOCALBASE}/lib -lnetpbm" \
 		SYSTEM_GSL=yes
 MAKE_ENV=	INSTALL_DIR=${STAGEDIR}${PREFIX} \
 		DATA_INSTALL_DIR=${STAGEDIR}${DATADIR} \
 		DOC_INSTALL_DIR=${STAGEDIR}${DOCSDIR} \
 		EXAMPLE_INSTALL_DIR=${STAGEDIR}${EXAMPLESDIR} \
 		MAN1_INSTALL_DIR=${STAGEDIR}${PREFIX}/man/man1 \
 		PY_BASE_INSTALL_DIR=${STAGEDIR}${PYTHON_LIBDIR}/astrometry \
 		PYTHON=${PYTHON_CMD} PYTHON_SCRIPT=${PYTHON_CMD}
 MAKE_JOBS_UNSAFE=	yes
 ALL_TARGET=	all extra
 LDFLAGS+=	-lz
 
 CONFLICTS_INSTALL=	afni p5-Text-RecordParser # bin/imstat bin/tabmerge
 
 MANDIRS=	${MANPREFIX}/man/man1
 SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=		DOCS EXAMPLES
 OPTIONS_DEFAULT=	EXAMPLES
 
 FILES=	an-fitstopnm an-pnmtofits astrometry-engine \
 	build-astrometry-index downsample-fits fit-wcs \
 	fits-column-merge fits-flip-endian fits-guess-scale \
 	fitscopy fitsgetext fitsverify get-healpix get-wcs \
 	hpsplit image2xy imarith imcopy imstat listhead liststruc \
 	modhead new-wcs pad-file plot-constellations \
 	plotquad plotxy query-starkd solve-field startree \
 	subtable tablist tabmerge tabsort wcs-grab wcs-match \
 	wcs-pv2sip wcs-rd2xy wcs-resample wcs-to-tan wcs-xy2rd \
 	wcsinfo
 
 post-install:
 .for file in ${FILES}
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${file}
 .endfor
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libastrometry.so
 	@${REINPLACE_CMD} -i '' \
 		-e 's|${STAGEDIR}/usr/local/data|${DATADIR}|' \
 		${STAGEDIR}${PREFIX}/etc/${PORTNAME}.cfg
 	@${RMDIR} ${STAGEDIR}${PREFIX}/data
 	@${MKDIR} ${STAGEDIR}${DATADIR}/sdss
 	@${MKDIR} ${STAGEDIR}${DATADIR}/solver
 	@${MKDIR} ${STAGEDIR}${DATADIR}/catalogs
 	${INSTALL_DATA} ${WRKSRC}/sdss/testdata/*.fit* ${STAGEDIR}${DATADIR}/sdss
 	${INSTALL_DATA} ${WRKSRC}/solver/index-9918.fits ${STAGEDIR}${DATADIR}/solver
 	${INSTALL_DATA} ${WRKSRC}/catalogs/*.fit* ${STAGEDIR}${DATADIR}/catalogs
 
 .include <bsd.port.mk>
diff --git a/astro/calcmysky/Makefile b/astro/calcmysky/Makefile
index 2fad03886a17..f07de9eaa8f5 100644
--- a/astro/calcmysky/Makefile
+++ b/astro/calcmysky/Makefile
@@ -1,23 +1,24 @@
 PORTNAME=	${GH_PROJECT:tl}
 PORTVERSION=	0.3.0
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	astro
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Planetary atmosphere light scattering simulator
 WWW=		https://github.com/10110111/CalcMySky
 
 LICENSE=	GPLv3
 
 BUILD_DEPENDS=	${LOCALBASE}/include/eigen3/Eigen/Dense:math/eigen3 \
 		${LOCALBASE}/include/glm/glm.hpp:math/glm
 
 USES=		cmake:testing localbase qt:5
 USE_GITHUB=	yes
 GH_ACCOUNT=	10110111
 GH_PROJECT=	CalcMySky
 USE_QT=		buildtools:build qmake:build core gui opengl widgets
 
 CMAKE_ARGS=	-DQT_VERSION:STRING=5
 
 .include <bsd.port.mk>
diff --git a/astro/gnuastro/Makefile b/astro/gnuastro/Makefile
index fb998163bcb0..7f4ffef84c75 100644
--- a/astro/gnuastro/Makefile
+++ b/astro/gnuastro/Makefile
@@ -1,46 +1,46 @@
 PORTNAME=	gnuastro
 PORTVERSION=	0.19
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	astro
 MASTER_SITES=	GNU
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	GNU astronomy utilities and library
 WWW=		https://www.gnu.org/software/gnuastro/
 
 LICENSE=	GPLv3+
 
 LIB_DEPENDS=	libcfitsio.so:astro/cfitsio \
 		libwcs.so:astro/wcslib \
 		libcurl.so:ftp/curl \
 		libgsl.so:math/gsl \
 		libpng.so:graphics/png \
 		libtiff.so:graphics/tiff
 
 USES=		gmake jpeg libtool:build localbase tar:lz
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check
 TEST_WRKSRC=	${WRKSRC}/tests
 
 INFO=		${PORTNAME}
 PORTDOCS=	AUTHORS ChangeLog NEWS README THANKS
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,cflags_add="-O3",:,' \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's,gcc,$(CC),' \
 		${WRKSRC}/bin/buildprog/ui.c
 
 post-install:
 	@${FIND} ${STAGEDIR}${PREFIX}/etc -name \*.conf \
 		-exec ${MV} '{}' '{}.sample' \;
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/astro/kosmorro/Makefile b/astro/kosmorro/Makefile
index 7d4425d07d2f..e1cd6261dfeb 100644
--- a/astro/kosmorro/Makefile
+++ b/astro/kosmorro/Makefile
@@ -1,38 +1,39 @@
 PORTNAME=	kosmorro
 PORTVERSION=	0.10.11
+PORTREVISION=	1
 CATEGORIES=	astro python
 MASTER_SITES=	PYPI
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Ephemerides computation
 WWW=		https://kosmorro.space/
 
 LICENSE=	AGPLv3
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Babel>0:devel/py-babel@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}tabulate>0:devel/py-tabulate@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}Babel>0:devel/py-babel@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}termcolor>0:devel/py-termcolor@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}kosmorrolib>0:astro/py-kosmorrolib@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}importlib-metadata>0:devel/py-importlib-metadata@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Babel>0:devel/py-babel@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}tabulate>0:devel/py-tabulate@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}termcolor>0:devel/py-termcolor@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}kosmorrolib>0:astro/py-kosmorrolib@${PY_FLAVOR}
 
 #USE_GITHUB=	yes
 
 USES=		gettext-runtime:run python:3.8+ shebangfix
 USE_PYTHON=	distutils noflavors
 SHEBANG_FILES=	${PORTNAME}
 
 OPTIONS_DEFINE=	PDF
 OPTIONS_DEFAULT=PDF
 PDF_DESC=	Exporting to PDF
 PDF_RUN_DEPENDS=pdflatex:print/tex-formats
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/astro/kstars/Makefile b/astro/kstars/Makefile
index c783cb2e07f2..6366b7cabe1e 100644
--- a/astro/kstars/Makefile
+++ b/astro/kstars/Makefile
@@ -1,40 +1,41 @@
 PORTNAME=	kstars
 DISTVERSION=	3.6.4
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	astro kde
 MASTER_SITES=	KDE/stable/${PORTNAME}
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE desktop planetarium
 WWW=		https://edu.kde.org/kstars
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libcfitsio.so:astro/cfitsio \
 		libindidriver.so:devel/indi \
 		libqt5keychain.so:security/qtkeychain@qt5 \
 		libraw.so:graphics/libraw \
 		libgsl.so:math/gsl \
 		libsecret-1.so:security/libsecret \
 		libnova.so:astro/libnova \
 		libstellarsolver.so:astro/stellarsolver \
 		libwcs.so:astro/wcslib
 BUILD_DEPENDS=	xplanet:astro/xplanet
 RUN_DEPENDS=	xplanet:astro/xplanet
 
 USES=		cmake compiler:c++11-lib desktop-file-utils eigen:3 \
 		gettext gnome kde:5 localbase:ldflags pkgconfig qt:5 tar:xz xorg
 USE_GNOME=	glib20
 USE_KDE=	attica auth bookmarks codecs completion config configwidgets\
 		coreaddons crash dbusaddons guiaddons i18n \
 		iconthemes init itemviews jobwidgets kio newstuff notifications \
 		notifyconfig parts plotting service solid texteditor \
 		widgetsaddons windowsystem xmlgui \
 		doctools:build ecm:build
 USE_QT=		concurrent core datavis3d dbus declarative gui multimedia \
 		network opengl printsupport sql svg testlib websockets widgets \
 		xml \
 		buildtools:build qmake:build
 USE_XORG=	x11
 
 .include <bsd.port.mk>
diff --git a/astro/libosmium/Makefile b/astro/libosmium/Makefile
index 6d7312472a70..b2633c3249ed 100644
--- a/astro/libosmium/Makefile
+++ b/astro/libosmium/Makefile
@@ -1,44 +1,45 @@
 PORTNAME=	libosmium
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.19.0
+PORTREVISION=	1
 CATEGORIES=	astro geography devel
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Fast and flexible C++ library for working with OpenStreetMap data
 WWW=		https://osmcode.org/libosmium/
 
 LICENSE=	BSL
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	boost-libs>=0:devel/boost-libs \
 		protozero>=0:devel/protozero \
 		gdal>=0:graphics/gdal \
 		protozero>=0:devel/protozero \
 		expat>=0:textproc/expat2 \
 		liblz4>=0:archivers/liblz4 \
 		geos>=0:graphics/geos
 #		proj>=0:graphics/proj
 
 USES=		cmake compiler:c++11-lib
 USE_GITHUB=	yes
 GH_ACCOUNT=	osmcode
 CMAKE_ON=	INSTALL_GDALCPP  # until it appears as a port
 CMAKE_ON+=	BUILD_HEADERS
 CMAKE_OFF=	BUILD_EXAMPLES
 CMAKE_OFF+=	WITH_PROJ  # the ports version is not supported
 
 # although it builds tests the library itself is header-only
 NO_ARCH=	yes
 
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	TEST DOCS
 OPTIONS_DEFAULT=	TEST
 TEST_TEST_TARGET=	test
 TEST_CMAKE_BOOL=	BUILD_TESTING
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/CHANGELOG.md ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/astro/merkaartor/Makefile b/astro/merkaartor/Makefile
index 70db286e88eb..019afef4aa6b 100644
--- a/astro/merkaartor/Makefile
+++ b/astro/merkaartor/Makefile
@@ -1,63 +1,63 @@
 PORTNAME=	merkaartor
 PORTVERSION=	0.19.0
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	astro
 
 MAINTAINER=	dev2@heesakkers.info
 COMMENT=	Openstreetmap mapping program
 WWW=		http://merkaartor.be/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libgdal.so:graphics/gdal \
 		libproj.so:graphics/proj \
 		libquazip1-qt5.so:archivers/quazip@qt5
 
 USES=		compiler:c++11-lang gnome pkgconfig qmake qt:5 sqlite:3
 USE_GITHUB=	yes
 GH_ACCOUNT=	openstreetmap
 USE_LDCONFIG=	yes
 
 QMAKE_ARGS=	SYSTEM_QUAZIP=1
 USE_QT=		buildtools:build \
 		concurrent core gui imageformats network printsupport svg \
 		webkit widgets xml
 
 OPTIONS_DEFINE=	DEBUG GEOIMAGE NLS PROTOBUF ZBAR
 OPTIONS_DEFAULT=	GEOIMAGE
 
 GEOIMAGE_DESC=	Enable geotagged images (needs exiv2)
 GEOIMAGE_QMAKE_ON=	GEOIMAGE=1
 GEOIMAGE_LIB_DEPENDS=	libexiv2.so:graphics/exiv2
 
 PROTOBUF_DESC=	Protobuf Binary Format support
 PROTOBUF_QMAKE_ON=	PROTOBUF=1
 PROTOBUF_LIB_DEPENDS=	libprotobuf.so:devel/protobuf
 
 ZBAR_DESC=	Read barcodes from walking papers (BROKEN)
 ZBAR_QMAKE_ON=	ZBAR=1
 ZBAR_LIB_DEPENDS=	libzbar.so:graphics/zbar
 # graphics/zbar needs to be built with Qt support (and needs a Qt5 version)
 ZBAR_BROKEN=	Does not build with option ZBAR selected
 
 DEBUG_QMAKE_OFF=	NODEBUG=1 RELEASE=1
 
 NLS_USES=	qt:5
 NLS_USE=	QT=linguisttools:build
 
 OPTIONS_SUB=	yes
 
 pre-build-NLS-on:
 	@cd ${WRKSRC}/translations && ${LRELEASE} ../src/src.pro
 
 pre-build-PROTOBUF-on:
 	@cd ${WRKSRC}/src/ImportExport && ${LOCALBASE}/bin/protoc --cpp_out=. \
 		fileformat.proto osmformat.proto
 
 post-install-NLS-on:
 	@${MKDIR} ${STAGEDIR}${DATADIR}/translations
 	@(cd ${WRKSRC}/translations && ${COPYTREE_SHARE} "merkaartor_*.qm" \
 		${STAGEDIR}${DATADIR}/translations)
 
 .include <bsd.port.mk>
diff --git a/astro/nightfall/Makefile b/astro/nightfall/Makefile
index 0bc73023a8c2..8d4110f67716 100644
--- a/astro/nightfall/Makefile
+++ b/astro/nightfall/Makefile
@@ -1,54 +1,54 @@
 PORTNAME=	nightfall
 PORTVERSION=	1.92
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	astro education
 MASTER_SITES=	http://www.la-samhna.de/nightfall/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Interactive binary star application
 WWW=		http://www.hs.uni-hamburg.de/DE/Ins/Per/Wichmann/Nightfall.html
 
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2
 
 USES=		compiler gettext gmake gnome jpeg pathfix perl5 pkgconfig
 USE_GNOME=	cairo gdkpixbuf2 gtk20
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--with-locale-prefix=${PREFIX}/share/locale \
 		--disable-gnome
 
 OPTIONS_DEFINE=		PGPLOT OPENGL
 OPTIONS_DEFAULT=	PGPLOT OPENGL
 OPTIONS_SUB=		yes
 
 OPENGL_CONFIGURE_ON=	--with-lib-GL
 OPENGL_CONFIGURE_OFF=	--disable-opengl
 OPENGL_LIB_DEPENDS=	libgtkgl-2.0.so:x11-toolkits/gtkglarea2
 OPENGL_USES=		gl
 OPENGL_USE=		GL=glut,gl,glu
 
 PGPLOT_DESC=		PGPLOT support
 PGPLOT_CONFIGURE_ON=	--with-pgplot-include=${LOCALBASE}/include \
 			--with-pgplot-lib=${LOCALBASE}/lib
 PGPLOT_CONFIGURE_OFF=	--with-gnuplot
 PGPLOT_LIB_DEPENDS=	libpgplot.so:graphics/pgplot
 PGPLOT_RUN_DEPENDS_OFF=	gnuplot:math/gnuplot
 PGPLOT_USES=		fortran
 
 .include <bsd.port.pre.mk>
 
 post-patch:
 .if ${COMPILER_TYPE} == clang
 	@${REINPLACE_CMD} -e 's|-fforce-addr||' ${WRKSRC}/configure
 .endif
 	@${REINPLACE_CMD} -e 's|CFLAGS -O3|CFLAGS|g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|^Icon=gnome|Icon=${DATADIR}/pixmaps|g' \
 		${WRKSRC}/nightfall.desktop
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/nightfall.desktop \
 		${STAGEDIR}${PREFIX}/share/applications
 
 .include <bsd.port.post.mk>
diff --git a/astro/oskar/Makefile b/astro/oskar/Makefile
index 2dd172789014..8ad16bc3aea9 100644
--- a/astro/oskar/Makefile
+++ b/astro/oskar/Makefile
@@ -1,36 +1,36 @@
 PORTNAME=	OSKAR
 DISTVERSION=	2.8.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	astro
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	SKA Radio telescope simulator
 WWW=		https://github.com/OxfordSKA/OSKAR
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 ONLY_FOR_ARCHS=		amd64 i386 powerpc powerpc64 powerpc64le
 ONLY_FOR_ARCHS_REASON=	gccfeatures.h:54:4: This code has only been tested on x86 and powerpc platforms
 BROKEN_FreeBSD_12_powerpc64=	fails to compile: oskar_convert_cirs_relative_directions_to_enu_directions.c:67:29: 'csinl' undeclared (first use in this function)
 
 LIB_DEPENDS=	libcfitsio.so:astro/cfitsio \
 		libhdf5.so:science/hdf5 \
 		libsz.so:science/libaec
 
 USES=		cmake localbase:ldflags python qt:5 shebangfix
 .if !exists(/usr/include/omp.h)
 USES+=		compiler:gcc-c++11-lib
 .else
 USES+=		compiler:c++11-lang
 .endif
 USE_QT=		core gui network widgets buildtools:build qmake:build
 USE_LDCONFIG=	yes
 
 SHEBANG_FILES=	apps/oskar_convert_cst_to_scalar.py
 USE_GITHUB=	yes
 GH_ACCOUNT=	OxfordSKA
 
 CMAKE_ARGS=	-DFREEBSD_FILESDIR:STRING=${FILESDIR}
 
 .include <bsd.port.mk>
diff --git a/astro/phd2/Makefile b/astro/phd2/Makefile
index 053d6bb9d3f3..a4eea19ffa7e 100644
--- a/astro/phd2/Makefile
+++ b/astro/phd2/Makefile
@@ -1,42 +1,42 @@
 PORTNAME=	phd2
 DISTVERSIONPREFIX=v
 DISTVERSION=	2.6.10
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	astro
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Guiding software inspired by Stark Labs PHD Guiding
 WWW=		https://openphdguiding.org/
 
 LICENSE=	BSD3CLAUSE
 
 LIB_DEPENDS=	libcfitsio.so:astro/cfitsio \
 		libgmock.so:devel/googletest \
 		libindidriver.so:devel/indi \
 		libcurl.so:ftp/curl
 RUN_DEPENDS=	indiserver:devel/indi
 
 USES=		cmake eigen:3 gettext ninja pkgconfig xorg
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	OpenPHDGuiding
 
 USE_WX=		3.2+
 USE_XORG=	x11
 
 WX_COMPS=	wx
 
 CMAKE_ARGS+=	-DUSE_SYSTEM_GTEST:BOOL=YES \
 		-DUSE_SYSTEM_CFITSIO:BOOL=YES \
 		-DUSE_SYSTEM_LIBUSB:BOOL=YES \
 		-DUSE_SYSTEM_LIBINDI:BOOL=YES \
 		-DUSE_SYSTEM_EIGEN3:BOOL=YES \
 		-DwxWidgets_CONFIG_EXECUTABLE=${LOCALBASE}/bin/wxgtk3u-3.2-config
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} != aarch64 && ${ARCH} != armv6 && ${ARCH} != armv7 && ${ARCH} != amd64 && ${ARCH} != i386
 CMAKE_ARGS+=	-DOPENSOURCE_ONLY:BOOL=YES
 .endif
 
 .include <bsd.port.mk>
diff --git a/astro/py-astlib/Makefile b/astro/py-astlib/Makefile
index 8cbdd56a2954..871828adb9ac 100644
--- a/astro/py-astlib/Makefile
+++ b/astro/py-astlib/Makefile
@@ -1,30 +1,31 @@
 PORTNAME=	astlib
 PORTVERSION=	0.11.8
+PORTREVISION=	1
 CATEGORIES=	astro python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	astLib-${PORTVERSION}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Astronomy modules for Python
 WWW=		https://astlib.readthedocs.io/en/latest/ \
 		https://github.com/mattyowl/astLib
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}astropy>=1.1:astro/py-astropy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>=0.98:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpy>=0.1:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=0.7.0:science/py-scipy@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	autoplist concurrent distutils
 
 PORTSCOUT=	skipv:0.15,0.17,0.17.1 # incorrect versioning upstream
 
 post-install:
 	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' -exec ${STRIP_CMD} {} +
 
 .include <bsd.port.mk>
diff --git a/astro/py-astroML/Makefile b/astro/py-astroML/Makefile
index 22692a7b4f29..638a63e45d71 100644
--- a/astro/py-astroML/Makefile
+++ b/astro/py-astroML/Makefile
@@ -1,26 +1,27 @@
 PORTNAME=	astroML
 PORTVERSION=	1.0.2
+PORTREVISION=	1
 CATEGORIES=	astro
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTFILES=	${PORTNAME}-${PORTVERSION}.post1.tar.gz
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Tools for machine learning and data mining in Astronomy
 WWW=		https://www.astroml.org/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.rst
 
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=0.19:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>=3.0:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-learn>=0.18:science/py-scikit-learn@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}astropy>=3.0:astro/py-astropy@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	autoplist distutils
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}.post1
 
 .include <bsd.port.mk>
diff --git a/astro/py-astropy-helpers/Makefile b/astro/py-astropy-helpers/Makefile
index e5807c3ce886..86495a92f08c 100644
--- a/astro/py-astropy-helpers/Makefile
+++ b/astro/py-astropy-helpers/Makefile
@@ -1,22 +1,23 @@
 PORTNAME=	astropy-helpers
 DISTVERSION=	4.0.1
+PORTREVISION=	1
 CATEGORIES=	astro
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Utilities for building and installing packages in Astropy ecosystem
 WWW=		https://github.com/astropy/astropy-helpers
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.rst
 
 BUILD_DEPENDS=	${PYNUMPY}
 RUN_DEPENDS=	${PYNUMPY}
 
 USES=		python:3.5+
 USE_PYTHON=	autoplist distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/astro/py-astropy/Makefile b/astro/py-astropy/Makefile
index dcddae9ce562..e82bb292ff38 100644
--- a/astro/py-astropy/Makefile
+++ b/astro/py-astropy/Makefile
@@ -1,27 +1,28 @@
 PORTNAME=	astropy
 DISTVERSION=	5.2.2
+PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	astro
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Community-developed python astronomy tools
 WWW=		https://www.astropy.org/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.rst
 
 BUILD_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}extension-helpers>=0:astro/py-extension-helpers@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR}
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}pyerfa>=0:astro/py-pyerfa@${PY_FLAVOR}
 
 USES=		compiler:c11 python:3.8+
 USE_PYTHON=	autoplist cython distutils
 
 CONFLICTS_INSTALL=	p5-Data-ShowTable # bin/showtable
 
 .include <bsd.port.mk>
diff --git a/astro/py-jplephem/Makefile b/astro/py-jplephem/Makefile
index c06125ad6470..91f681dd692e 100644
--- a/astro/py-jplephem/Makefile
+++ b/astro/py-jplephem/Makefile
@@ -1,29 +1,30 @@
 PORTNAME=	jplephem
 PORTVERSION=	2.18
+PORTREVISION=	1
 CATEGORIES=	astro python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Python version of NASA DE4xx ephemerides
 WWW=		https://github.com/brandon-rhodes/python-jplephem
 
 LICENSE=	MIT
 
 BUILD_DEPENDS=	${PYNUMPY}
 RUN_DEPENDS=	${PYNUMPY}
 TEST_DEPENDS=	bash:shells/bash	\
 		${PYTHON_PKGNAMEPREFIX}unittest2>0:devel/py-unittest2@${PY_FLAVOR}
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	brandon-rhodes
 GH_PROJECT=	python-jplephem
 
 USES=		python:3.7+ shebangfix
 USE_PYTHON=	distutils
 SHEBANG_FILES=	test.sh	bin/doctest.sh bin/parse_zzidmap.sh bin/benchmark.py
 NO_ARCH=	yes
 
 do-test:	install
 	(cd ${WRKSRC} && ${SETENV} PYTHON=${PYTHON_CMD} ./test.sh)
 
 .include <bsd.port.mk>
diff --git a/astro/py-kosmorrolib/Makefile b/astro/py-kosmorrolib/Makefile
index eb6c751452bb..5a2061812b43 100644
--- a/astro/py-kosmorrolib/Makefile
+++ b/astro/py-kosmorrolib/Makefile
@@ -1,32 +1,33 @@
 PORTNAME=	kosmorrolib
 PORTVERSION=	1.0.7
+PORTREVISION=	1
 CATEGORIES=	astro python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Library that computes the ephemerides
 WWW=		https://kosmorro.space/
 
 LICENSE=	CeCILL-C
 LICENSE_NAME=	${LICENSE}
 LICENSE_TEXT=	CeCILL-C Free Software License Agreement
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}skyfield>0:astro/py-skyfield@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}skyfield-data>0:astro/py-skyfield-data@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}skyfield>0:astro/py-skyfield@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}skyfield-data>0:astro/py-skyfield-data@${PY_FLAVOR}
 
 #USE_GITHUB=	yes
 #GH_ACCOUNT=	Kosmorro
 #GH_PROJECT=	lib
 
 USES=		python:3.8+
 USE_PYTHON=	distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/astro/py-metpy/Makefile b/astro/py-metpy/Makefile
index 8961d696e901..5e1a412aa4fe 100644
--- a/astro/py-metpy/Makefile
+++ b/astro/py-metpy/Makefile
@@ -1,37 +1,38 @@
 PORTNAME=	metpy
 PORTVERSION=	1.4.1
+PORTREVISION=	1
 CATEGORIES=	astro python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	MetPy-${PORTVERSION}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Collection of tools for processing weather data
 WWW=		https://github.com/Unidata/MetPy
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}matplotlib>=3.3.0:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpy>=1.18.0,1:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pandas>=1.0.0,1:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pint>=0.15:devel/py-pint@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pooch>=1.2.0:devel/py-pooch@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyproj>=2.6.1:graphics/py-pyproj@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=1.4.0:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}traitlets>=5.0.5:devel/py-traitlets@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xarray>=0.18.0:devel/py-xarray@${PY_FLAVOR}
 
 USES=		python:3.8+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} < 30900
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}importlib-resources>=1.3.0:devel/py-importlib-resources@${PY_FLAVOR}
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/astro/py-pyerfa/Makefile b/astro/py-pyerfa/Makefile
index 6c807b868f83..f3f25ac95b9e 100644
--- a/astro/py-pyerfa/Makefile
+++ b/astro/py-pyerfa/Makefile
@@ -1,23 +1,24 @@
 PORTNAME=	pyerfa
 DISTVERSION=	2.0.0.3
+PORTREVISION=	1
 CATEGORIES=	astro python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Python wrapper for the ERFA library
 WWW=		https://github.com/liberfa/pyerfa
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.rst
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=1.17.0,1:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=1.17.0,1:math/py-numpy@${PY_FLAVOR}
 
 USES=		python:3.6-3.9
 USE_PYTHON=	autoplist distutils
 
 .include <bsd.port.mk>
diff --git a/astro/py-pykep/Makefile b/astro/py-pykep/Makefile
index a7f050c2bc40..7a2dd8428ae9 100644
--- a/astro/py-pykep/Makefile
+++ b/astro/py-pykep/Makefile
@@ -1,31 +1,32 @@
 PORTNAME=	pykep
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.6.2
+PORTREVISION=	1
 CATEGORIES=	astro python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Python binding for pykep, library for astrodynamics research
 WWW=		https://github.com/esa/pykep
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 LIB_DEPENDS=	libboost_serialization.so:devel/boost-libs \
 		libkeplerian_toolbox.so:astro/pykep \
 		${PY_BOOST}
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pygmo2>0:science/py-pygmo2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR}
 
 USES=		cmake compiler:c++11-lang python:3.7+
 USE_PYTHON=	flavors
 
 CMAKE_OFF=	PYKEP_BUILD_KEP_TOOLBOX PYKEP_BUILD_TESTS
 CMAKE_ON=	PYKEP_BUILD_PYKEP
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	esa
 
 .include <bsd.port.mk>
diff --git a/astro/py-pysofa/Makefile b/astro/py-pysofa/Makefile
index ce405739ee33..8c904b513f8f 100644
--- a/astro/py-pysofa/Makefile
+++ b/astro/py-pysofa/Makefile
@@ -1,26 +1,26 @@
 PORTNAME=	pysofa
 DISTVERSION=	0.1.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	astro devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Python binding for SOFA, the fundamental astronomy library
 WWW=		https://code.google.com/archive/p/pysofa/
 
 LICENSE=	PD
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	${LOCALBASE}/lib/libsofa_c.so:astro/sofa \
 		${PYNUMPY}
 
 USES=		python:3.6+
 NO_ARCH=	yes
 USE_PYTHON=	distutils autoplist
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|find_library('sofa_c')|\"${LOCALBASE}/lib/libsofa_c.so\"|" \
 		${WRKSRC}/pysofa/pysofa_ctypes.py
 
 .include <bsd.port.mk>
diff --git a/astro/py-ro/Makefile b/astro/py-ro/Makefile
index 114f577de0d4..04bb196b5ff0 100644
--- a/astro/py-ro/Makefile
+++ b/astro/py-ro/Makefile
@@ -1,34 +1,34 @@
 PORTNAME=	ro
 PORTVERSION=	3.6.9
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	astro python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	RO-${PORTVERSION}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Package of Python astronomical utilities
 WWW=		https://staff.washington.edu/rowen/ROPackage/Overview.html \
 		https://github.com/ApachePointObservatory/RO
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/docs/License.txt
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=0,1:math/py-numpy@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=	ASTROPY MATPLOTLIB PYGAME
 OPTIONS_DEFAULT=ASTROPY
 ASTROPY_DESC=	Add Support for Astropy
 MATPLOTLIB_DESC=Add support for Matplotlib
 PYGAME_DESC=	Add Support for PyGame
 
 ASTROPY_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}astropy>=0:astro/py-astropy@${PY_FLAVOR}
 MATPLOTLIB_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}matplotlib>=0.98:math/py-matplotlib@${PY_FLAVOR}
 PYGAME_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}game>=0:devel/py-game@${PY_FLAVOR}
 
 .include <bsd.port.mk>
diff --git a/astro/py-skyfield-data/Makefile b/astro/py-skyfield-data/Makefile
index b25a915a8c18..89fd015b5a2a 100644
--- a/astro/py-skyfield-data/Makefile
+++ b/astro/py-skyfield-data/Makefile
@@ -1,26 +1,27 @@
 PORTNAME=	skyfield-data
 PORTVERSION=	4.0.0
+PORTREVISION=	1
 CATEGORIES=	astro python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Minimal data files to work with py-skyfield
 WWW=		https://github.com/brunobord/skyfield-data
 
 LICENSE=	MIT
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}skyfield>0:astro/py-skyfield@${PY_FLAVOR}
 TEST_DEPENDS=	py.test:devel/py-pytest@${PY_FLAVOR}
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	brunobord
 
 USES=		python:3.7+
 USE_PYTHON=	distutils
 
 NO_ARCH=	yes
 
 do-test: install
 	(cd ${WRKSRC} && py.test)
 
 .include <bsd.port.mk>
diff --git a/astro/py-skyfield/Makefile b/astro/py-skyfield/Makefile
index 3ab3609540a9..bfd0b7490dc8 100644
--- a/astro/py-skyfield/Makefile
+++ b/astro/py-skyfield/Makefile
@@ -1,45 +1,46 @@
 PORTNAME=	skyfield
 PORTVERSION=	1.46
+PORTREVISION=	1
 CATEGORIES=	astro python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Ephemerides computation
 WWW=		https://rhodesmill.org/skyfield/
 
 LICENSE=	MIT
 
 BUILD_DEPENDS=	${PYNUMPY}	\
 		${PYTHON_PKGNAMEPREFIX}sgp4>0:astro/py-sgp4@${PY_FLAVOR}	\
 		${PYTHON_PKGNAMEPREFIX}jplephem>0:astro/py-jplephem@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}certifi>0:security/py-certifi@${PY_FLAVOR}
 RUN_DEPENDS=	${PYNUMPY}	\
 		${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR}	\
 		${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR}	\
 		${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR}	\
 		${PYTHON_PKGNAMEPREFIX}sgp4>0:astro/py-sgp4@${PY_FLAVOR}	\
 		${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${PY_FLAVOR}	\
 		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR}	\
 		${PYTHON_PKGNAMEPREFIX}astropy>0:astro/py-astropy@${PY_FLAVOR}	\
 		${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib@${PY_FLAVOR}	\
 		${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR}	\
 		${PYTHON_PKGNAMEPREFIX}tabulate>0:devel/py-tabulate@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}jplephem>0:astro/py-jplephem@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}pyflakes>0:devel/py-pyflakes@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}certifi>0:security/py-certifi@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}spktype21>0:astro/py-spktype21@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}termcolor>0:devel/py-termcolor@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}beautifulsoup>0:www/py-beautifulsoup@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	distutils
 NO_ARCH=	yes
 
 do-test: install
 	${CP} ${FILESDIR}/test-skyfield.py ${WRKSRC}
 	(cd ${WRKSRC} && ${PYTHON_CMD} test-skyfield.py)
 
 .include <bsd.port.mk>
diff --git a/astro/py-spktype01/Makefile b/astro/py-spktype01/Makefile
index c185c39bb586..fcaf7e94ca6c 100644
--- a/astro/py-spktype01/Makefile
+++ b/astro/py-spktype01/Makefile
@@ -1,32 +1,32 @@
 PORTNAME=	spktype01
 PORTVERSION=	1.0.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	astro python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Supporting module for jplephem to handle data type 1
 WWW=		https://github.com/whiskie14142/spktype01
 
 LICENSE=	MIT
 
 BUILD_DEPENDS=	${PYNUMPY}
 RUN_DEPENDS=	${PYNUMPY}	\
 		${PYTHON_PKGNAMEPREFIX}jplephem>0:astro/py-jplephem@${PY_FLAVOR}
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	whiskie14142
 GH_TAGNAME=	964cc70
 
 USES=		python:3.7+
 USE_PYTHON=	distutils
 
 WRKSRC_SUBDIR=	package/${PORTNAME}
 TEST_WRKSRC=	${WRKSRC}/../../test
 NO_ARCH=	yes
 
 PLIST_FILES=	${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;}/__pycache__/spktype01.cpython-${PYTHON_SUFFIX}.opt-1.pyc \
 		${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;}/__pycache__/spktype01.cpython-${PYTHON_SUFFIX}.pyc \
 		${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;}/spktype01.py
 
 .include <bsd.port.mk>
diff --git a/astro/py-spktype21/Makefile b/astro/py-spktype21/Makefile
index 026af1c2bb46..a376bf4f9aef 100644
--- a/astro/py-spktype21/Makefile
+++ b/astro/py-spktype21/Makefile
@@ -1,34 +1,34 @@
 PORTNAME=	spktype21
 PORTVERSION=	0.1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	astro python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Supporting module for jplephem to handle data type 21
 WWW=		https://github.com/whiskie14142/spktype21
 
 LICENSE=	MIT
 
 BUILD_DEPENDS=	${PYNUMPY}
 RUN_DEPENDS=	${PYNUMPY}	\
 		${PYTHON_PKGNAMEPREFIX}jplephem>0:astro/py-jplephem@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}spktype01>0:astro/py-spktype01@${PY_FLAVOR} \
 		py.test:devel/py-pytest@${PY_FLAVOR}
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	whiskie14142
 GH_TAGNAME=	7ed2236
 
 USES=		python:3.7+
 USE_PYTHON=	distutils
 
 WRKSRC_SUBDIR=	package/${PORTNAME}
 TEST_WRKSRC=	${WRKSRC}/../../test
 NO_ARCH=	yes
 
 PLIST_FILES=	${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;}/__pycache__/spktype21.cpython-${PYTHON_SUFFIX}.opt-1.pyc \
 		${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;}/__pycache__/spktype21.cpython-${PYTHON_SUFFIX}.pyc \
 		${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;}/spktype21.py
 
 .include <bsd.port.mk>
diff --git a/astro/qmapshack/Makefile b/astro/qmapshack/Makefile
index 1da576207e3f..a6fd65b36c6c 100644
--- a/astro/qmapshack/Makefile
+++ b/astro/qmapshack/Makefile
@@ -1,32 +1,32 @@
 PORTNAME=	qmapshack
 PORTVERSION=	1.16.1
-PORTREVISION=	5
+PORTREVISION=	6
 DISTVERSIONPREFIX=	V_
 CATEGORIES=	astro
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Ultimate outdoor aficionado's tool
 WWW=		https://github.com/Maproom/qmapshack/
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libgdal.so:graphics/gdal \
 		libproj.so:graphics/proj \
 		libquazip1-qt5.so:archivers/quazip@qt5 \
 		libroutino.so:astro/routino
 RUN_DEPENDS=	${LOCALBASE}/bin/bsdisks:sysutils/bsdisks
 
 USES=		cmake compiler:c++11-lib desktop-file-utils gl jpeg \
 		pkgconfig qt:5 xorg
 USE_GITHUB=	yes
 USE_GL=		gl
 USE_QT=		buildtools core dbus declarative gui help linguisttools location network \
 		printsupport qmake sql sql-sqlite3 uitools \
 		webchannel webengine widgets xml
 
 GH_ACCOUNT=	Maproom
 
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.mk>
diff --git a/astro/siril/Makefile b/astro/siril/Makefile
index eecfc9c3c6ed..80ddd4c28b7e 100644
--- a/astro/siril/Makefile
+++ b/astro/siril/Makefile
@@ -1,54 +1,54 @@
 PORTNAME=	siril
 DISTVERSION=	1.0.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	astro graphics
 MASTER_SITES=	https://free-astro.org/download/
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Astronomical image processing software
 WWW=		https://siril.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 BROKEN_i386=	undefined reference to `__atomic_load' and `__atomic_compare_exchange' #`
 .if !exists(/usr/include/omp.h)
 BROKEN=		requires OpenMP support that is missing on this architecture
 .endif
 
 BUILD_DEPENDS=	cmake:devel/cmake-core
 LIB_DEPENDS=	libavformat.so:multimedia/ffmpeg \
 		libcfitsio.so:astro/cfitsio \
 		libconfig.so:devel/libconfig \
 		libexiv2.so:graphics/exiv2 \
 		libffms2.so:multimedia/ffms2 \
 		libfftw3.so:math/fftw3 \
 		libfftw3f.so:math/fftw3-float \
 		libgsl.so:math/gsl \
 		libharfbuzz.so:print/harfbuzz \
 		libheif.so:graphics/libheif \
 		libjson-glib-1.0.so:devel/json-glib \
 		liblcms2.so:graphics/lcms2 \
 		libopencv_core.so:graphics/opencv \
 		libpng.so:graphics/png \
 		libraw.so:graphics/libraw \
 		librtprocess.so:graphics/librtprocess \
 		libtiff.so:graphics/tiff \
 		libwcs.so:astro/wcslib
 LIB_DEPENDS+=	libopencv_photo.so:graphics/opencv # for some reason, configure fails without opencv, but executable only links to opencv-core
 
 USES=		compiler:c++11-lang desktop-file-utils gettext \
 		gnome meson pkgconfig jpeg shared-mime-info tar:bz2
 USE_GNOME=	atk cairo gdkpixbuf2 gtk30 intltool pango
 
 BINARY_ALIAS=	git=false
 
 OPTIONS_DEFINE=		CURL OPENMP
 OPTIONS_DEFAULT=	CURL OPENMP
 
 OPENMP_MESON_OFF=	-Dopenmp=false
 
 CURL_MESON_YES=		enable-libcurl
 CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 
 .include <bsd.port.mk>
diff --git a/astro/stellarsolver/Makefile b/astro/stellarsolver/Makefile
index 1f312de9d0f8..030f9613d55e 100644
--- a/astro/stellarsolver/Makefile
+++ b/astro/stellarsolver/Makefile
@@ -1,25 +1,25 @@
 PORTNAME=	stellarsolver
 DISTVERSION=	2.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	astro
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Astrometric Plate Solver built on Astrometry.net and SEP
 WWW=		https://github.com/rlancaste/stellarsolver
 
 LICENSE=	GPLv3
 
 LIB_DEPENDS=	libcfitsio.so:astro/cfitsio \
 		libgsl.so:math/gsl \
 		libwcs.so:astro/wcslib
 
 USES=		cmake desktop-file-utils iconv ninja qt:5 pkgconfig
 USE_QT=		buildtools concurrent core gui qmake:build network widgets
 USE_GITHUB=	yes
 GH_ACCOUNT=	rlancaste
 
 USE_LDCONFIG=	yes
 
 CMAKE_ARGS+=	-DBUILD_BATCH_SOLVER=on
 
 .include <bsd.port.mk>
diff --git a/astro/wcslib/Makefile b/astro/wcslib/Makefile
index 8b118868d4e8..0d16f5bec5ee 100644
--- a/astro/wcslib/Makefile
+++ b/astro/wcslib/Makefile
@@ -1,48 +1,48 @@
 PORTNAME=	wcslib
 PORTVERSION=	7.12
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	astro
 MASTER_SITES=	ftp://ftp.atnf.csiro.au/pub/software/wcslib/
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Library for parsing/generating FITS headers
 WWW=		https://www.atnf.csiro.au/people/mcalabre/WCS/index.html
 
 LICENSE=	GPLv3
 
 USES=		tar:bzip2 gmake fortran
 
 GNU_CONFIGURE=	yes
 MAKEFILE=	GNUmakefile
 USE_LDCONFIG=	yes
 MAKE_JOBS_UNSAFE=yes
 
 PLIST_SUB=	VERSION="${PORTVERSION}"
 
 # See makedefs.in which describes why you want to set the extra support.
 # For most users it will not be required.
 
 OPTIONS_DEFINE=	CFITSIO PGPLOT DOCS
 OPTIONS_SUB=	yes
 CFITSIO_DESC=	Add cfitsio support (for tests only)
 PGPLOT_DESC=	Add pgplot support (for tests only)
 
 CFITSIO_CONFIGURE_WITH=	cfitsio
 CFITSIO_LIB_DEPENDS=	libcfitsio.so:astro/cfitsio
 PGPLOT_CONFIGURE_WITH=	pgplot
 PGPLOT_LIB_DEPENDS=	libpgplot.so:graphics/pgplot \
 			libpng.so:graphics/png
 PGPLOT_USE=		XORG=x11
 PGPLOT_USES=		xorg
 
 post-patch:
 	@${REINPLACE_CMD} -e 's#%%PKGDIR%%#${STAGEDIR}${PREFIX}/libdata#g' \
 		${WRKSRC}/GNUmakefile
 
 post-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC}/ && ${INSTALL_DATA} CHANGES README COPYING COPYING.LESSER wcslib.pdf ${STAGEDIR}${DOCSDIR})
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/html
 	(cd ${WRKSRC}/html && ${INSTALL_DATA} * ${STAGEDIR}${DOCSDIR}/html)
 
 .include <bsd.port.mk>
diff --git a/audio/cheesecutter/Makefile b/audio/cheesecutter/Makefile
index 6bc1e72e749a..065f178cbabf 100644
--- a/audio/cheesecutter/Makefile
+++ b/audio/cheesecutter/Makefile
@@ -1,44 +1,44 @@
 PORTNAME=	cheesecutter
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.9-beta-3-25
 DISTVERSIONSUFFIX=	-gdbe9a9d
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	audio
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Tracker for composing music for the C64 SID chip
 WWW=		https://github.com/theyamo/CheeseCutter
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 BUILD_DEPENDS=	acme:devel/acme \
 		ldc2:lang/ldc
 
 USES=		desktop-file-utils gmake
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	ehaupt
 GH_PROJECT=	CheeseCutter
 
 MAKEFILE=	Makefile.ldc
 MAKE_ENV+=	EXAMPLESDIR=${EXAMPLESDIR}
 
 OPTIONS_DEFINE=	EXAMPLES
 
 post-install:
 	${MKDIR} ${STAGEDIR}${MANPREFIX}/share/man/fr/man1 ${STAGEDIR}${DESKTOPDIR}
 	${INSTALL_DATA} ${WRKSRC}/arch/fd/ccutter.desktop ${STAGEDIR}${DESKTOPDIR}
 	${INSTALL_DATA} ${WRKSRC}/icons/cc96.png ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png
 .for f in ccutter ct2util
 	${INSTALL_MAN} ${WRKSRC}/doc/${f}.1 ${STAGEDIR}${MANPREFIX}/share/man/man1
 	${INSTALL_MAN} ${WRKSRC}/doc/${f}.fr.1 ${STAGEDIR}${MANPREFIX}/share/man/fr/man1
 .endfor
 
 .include <bsd.port.pre.mk>
 
 .if (${OSVERSION} >= 1301000)
 MAKE_ARGS=	DLDFLAGS=-L=-Wl,-z,nostart-stop-gc
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/audio/csound/Makefile b/audio/csound/Makefile
index 7a6ec0e0d158..27e6156b854d 100644
--- a/audio/csound/Makefile
+++ b/audio/csound/Makefile
@@ -1,195 +1,195 @@
 PORTNAME=	csound
 DISTVERSION=	6.15.0
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	audio lang
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Sound synthesizer
 WWW=		https://csound.com/
 
 LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	boost-libs>0:devel/boost-libs \
 		swig:devel/swig \
 		gmm++>0:math/gmm++
 LIB_DEPENDS=	libsamplerate.so:audio/libsamplerate \
 		libsndfile.so:audio/libsndfile
 
 USES=		alias bison cmake compiler:c++11-lib cpe eigen:3 localbase ncurses python:build # is python needed: https://github.com/csound/csound/issues/1437 ?
 USE_GITHUB=	yes
 USE_LDCONFIG=	yes
 
 CPE_VENDOR=	csounds
 
 CONFLICTS_INSTALL= clearsilver go-cs libextractor outguess
 
 CFLAGS_powerpc=	-maltivec
 CFLAGS_powerpcspe=	-DPFFFT_SIMD_DISABLE
 CMAKE_ARGS=	-DBUILD_CSOUNDVST:BOOL=OFF \
 		-DBUILD_PD_CLASS:BOOL=OFF \
 		-DPYTHON_MODULE_INSTALL_DIR:PATH="${PYTHONPREFIX_SITELIBDIR}" \
 		-DOPSYS:STRING="${OPSYS}"
 CMAKE_OFF=	USE_ALSA BUILD_JAVA_INTERFACE BUILD_TESTS
 SSP_UNSAFE=	yes
 LDFLAGS+=	-lexecinfo
 
 SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=		CURL FLTK HDF5 NLS OPENMP PORTAUDIO PULSEAUDIO
 OPTIONS_GROUP=		OPCODES # list is in Opcodes/CMakeLists.txt
 OPTIONS_GROUP_OPCODES=	BUCHLA CHUA COUNTER DSSI EXCITER FAUST FLUIDSYNTH IMAGE JACK LUA LINALG MP3OUT OSC P5GLOVE PADSYNTH PLATEREV PVSGENDY PYTHON SCANSYN SELECT SERIAL STACK STK VST4CS WIIMOTE # Opcodes/CMakeLists.txt, Opcodes/stk/CMakeLists.txt
 OPTIONS_DEFAULT=	FLTK OPENMP
 OPTIONS_DEFAULT+=	BUCHLA CHUA DSSI EXCITER FAUST IMAGE JACK LINALG OSC P5GLOVE PADSYNTH PLATEREV SCANSYN SELECT SERIAL STACK STK # for OPCODES
 OPTIONS_SUB=		yes
 
 OPCODES_DESC=		Build/install opcodes
 
 BUCHLA_DESC=		Build the Buchla filter opcode
 BUCHLA_CMAKE_BOOL=	BUILD_BUCHLA_OPCODES
 
 CHUA_DESC=		Build the chua opcodes
 CHUA_CMAKE_BOOL=	BUILD_CHUA_OPCODES
 
 COUNTER_DESC=		Build the serial opcode
 COUNTER_CMAKE_BOOL=	BUILD_COUNTER_OPCODES
 
 CURL_CMAKE_BOOL=	USE_CURL # see https://github.com/csound/csound/issues/1067
 CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 
 DSSI_DESC=		Build DSSI opcodes
 DSSI_BUILD_DEPENDS=	dssi>0:audio/dssi
 DSSI_LIB_DEPENDS=	libdssialsacompat.so:audio/libdssialsacompat
 DSSI_RUN_DEPENDS=	dssi>0:audio/dssi
 DSSI_CMAKE_BOOL=	BUILD_DSSI_OPCODES
 DSSI_CFLAGS=		-isystem ${LOCALBASE}/include/dssi
 
 EXCITER_DESC=		Build the exciter opcode
 EXCITER_CMAKE_BOOL=	BUILD_EXCITER_OPCODES
 
 FLTK_DESC=		Build FLTK plugin and GUI
 FLTK_USES=		xorg
 FLTK_USE=		XORG=ice,sm,x11,xext
 FLTK_LIB_DEPENDS=	libfltk.so:x11-toolkits/fltk
 FLTK_CMAKE_ON=		-DBUILD_WINSOUND:BOOL=ON
 FLTK_CMAKE_OFF=		-DBUILD_CSOUND_AC:BOOL=OFF \
 			-DBUILD_VIRTUAL_KEYBOARD:BOOL=OFF \
 			-DUSE_FLTK:BOOL=OFF
 
 FAUST_DESC=		Build the Faust opcodes
 FAUST_USES=		ssl
 FAUST_LLVM_VERSION=	11 # should be the same as in audio/faust
 FAUST_LIB_DEPENDS=	libfaust.so:audio/faust
 FAUST_CMAKE_BOOL=	BUILD_FAUST_OPCODES
 FAUST_CMAKE_ON=		-DFAUST_LLVM_VERSION:STRING=${FAUST_LLVM_VERSION}
 
 FLUIDSYNTH_DESC=	Building FluidSynth opcodes
 FLUIDSYNTH_LIB_DEPENDS=	libfluidsynth.so:audio/fluidsynth
 FLUIDSYNTH_CMAKE_BOOL=	BUILD_FLUID_OPCODES
 FLUIDSYNTH_BROKEN=	FluidSynth 2.x is broken upstream: https://github.com/csound/csound/issues/1078#issuecomment-441459803
 
 HDF5_DESC=		Build HDF5 read/write plugin
 HDF5_LIB_DEPENDS=	libhdf5.so:science/hdf5 \
 			libsz.so:science/libaec
 HDF5_CMAKE_BOOL=	BUILD_HDF5_OPCODES
 
 JACK_DESC=		Build the JACK related opcodes
 JACK_LIB_DEPENDS=	libjack.so:audio/jack
 JACK_CMAKE_BOOL=	BUILD_JACK_OPCODES USE_JACK
 
 LINALG_DESC=		Build the linear algebra opcodes
 LINALG_CMAKE_BOOL=	BUILD_LINEAR_ALGEBRA_OPCODES
 LINALG_CXXFLAGS=	-DGMM_VERSION=x # workaround based on https://github.com/csound/csound/issues/1069#issuecomment-439648756
 
 LUA_DESC=		Build Lua Interface and module
 LUA_LIB_DEPENDS=	libluajit-5.1.so:lang/luajit
 LUA_CMAKE_BOOL=		BUILD_CSOUND_AC_LUA_INTERFACE BUILD_LUA_INTERFACE BUILD_LUA_OPCODES
 
 NLS_USES=		gettext
 NLS_CMAKE_OFF=		-DGETTEXT_MSGFMT_EXECUTABLE:FILEPATH="" \
 			-DGETTEXT_MSGMERGE_EXECUTABLE:FILEPATH="" \
 			-DLIBINTL_LIBRARY:FILEPATH="" \
 			-DUSE_GETTEXT:BOOL=OFF
 
 OPENMP_CMAKE_BOOL=	USE_OPEN_MP
 
 MP3OUT_DESC=		Build MP3OUT opcodes
 MP3OUT_CMAKE_BOOL=	BUILD_MP3OUT_OPCODE
 
 OSC_DESC=		Build OSC opcodes
 OSC_LIB_DEPENDS=	liblo.so:audio/liblo
 OSC_CMAKE_BOOL=		BUILD_OSC_OPCODES
 
 PADSYNTH_DESC=		Build the Padsynth opcode
 PADSYNTH_CMAKE_BOOL=	BUILD_PADSYNTH_OPCODES
 
 IMAGE_DESC=		Build Image opcodes
 IMAGE_LIB_DEPENDS=	libpng.so:graphics/png
 IMAGE_CMAKE_BOOL=	BUILD_IMAGE_OPCODES
 
 P5GLOVE_DESC=		Build PortAudio I/O module
 P5GLOVE_CMAKE_BOOL=	BUILD_P5GLOVE_OPCODES
 
 PORTAUDIO_DESC=		Build PortAudio I/O module
 PORTAUDIO_LIB_DEPENDS=	libportaudio.so:audio/portaudio
 PORTAUDIO_CMAKE_BOOL=	USE_PORTAUDIO
 
 PULSEAUDIO_DESC=	Build PulseAudio I/O module
 PULSEAUDIO_LIB_DEPENDS=	libpulse-simple.so:audio/pulseaudio
 PULSEAUDIO_CMAKE_BOOL=	USE_PULSEAUDIO
 
 PLATEREV_DESC=		Build the platerev opcode
 PLATEREV_CMAKE_BOOL=	BUILD_PLATEREV_OPCODES
 
 PVSGENDY_DESC=		Build the pvsgendy opcode
 PVSGENDY_CMAKE_BOOL=	BUILD_PVSGENDY_OPCODE
 
 PYTHON_DESC=		Build the Python opcodes
 PYTHON_USES=		python
 PYTHON_CMAKE_BOOL=	BUILD_PYTHON_OPCODES
 
 SCANSYN_DESC=		Build the select opcodes
 SCANSYN_CMAKE_BOOL=	BUILD_SCANSYN_OPCODES
 
 SELECT_DESC=		Build the select opcode
 SELECT_CMAKE_BOOL=	BUILD_SELECT_OPCODE
 
 SERIAL_DESC=		Build the serial opcode
 SERIAL_CMAKE_BOOL=	BUILD_SERIAL_OPCODES
 
 STACK_DESC=		Build the stack opcodes
 STACK_CMAKE_BOOL=	BUILD_STACK_OPCODES
 
 STK_DESC=		Build the stk opcodes
 STK_CMAKE_BOOL=		BUILD_STK_OPCODES
 STK_LIB_DEPENDS=	libstk.so:audio/stk
 
 VST4CS_DESC=		Build the vst4cs opcodes
 VST4CS_CMAKE_BOOL=	BUILD_VST4CS_OPCODES
 
 WIIMOTE_DESC=		Build the Wiimote opcodes
 WIIMOTE_CMAKE_BOOL=	BUILD_WIIMOTE_OPCODES
 WIIMOTE_BROKEN=		Need to port wiiuse: https://github.com/rpavlik/wiiuse
 
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|/usr/include/Python2.7|${PYTHON_INCLUDEDIR}| ; \
 		 s|/usr/local|${LOCALBASE}| ; \
 		 /linuxjoystick/s|^|#| ; \
 		 s| dl)|)|' \
 		${WRKSRC}/Opcodes/CMakeLists.txt
 	@${REINPLACE_CMD} -e \
 		'/CMAKE_SYSTEM_NAME/s|"Linux"|"${OPSYS}"|' \
 		${WRKSRC}/Frontends/CMakeLists.txt
 	@${REINPLACE_CMD} -e \
 		's| mixer)| csmixer)|' \
 		${WRKSRC}/util/CMakeLists.txt
 
 post-install:
 	@${LN} -sf libcsnd6.so.6.0 ${STAGEDIR}${PREFIX}/lib/libcsnd6.so.6
 	@${LN} -sf libcsound64.so.6.0 ${STAGEDIR}${PREFIX}/lib/libcsound64.so.6
 
 post-install-FLTK-on:
 	@${LN} -sf libCsoundAC.so.6.0 ${STAGEDIR}${PREFIX}/lib/libCsoundAC.so.6
 
 .include <bsd.port.mk>
diff --git a/audio/emms/Makefile b/audio/emms/Makefile
index e2890b96557a..bc8c89f0f574 100644
--- a/audio/emms/Makefile
+++ b/audio/emms/Makefile
@@ -1,24 +1,24 @@
 PORTNAME=	emms
 DISTVERSION=	5.0
-PORTREVISION=	10
+PORTREVISION=	12
 CATEGORIES=	audio elisp
 MASTER_SITES=	GNU
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Emacs Multi-Media System
 WWW=		https://www.gnu.org/software/emms/index.html
 
 LICENSE=	GPLv3
 
 # do not depend on base texinfo on 10
 BUILD_DEPENDS=	texi2dvi:print/texinfo
 
 USES=		emacs gmake
 
 CONFLICTS_INSTALL=	emms emms-emacs_* # share/emacs/site-lisp/emms/emms-auto.el
 
 INFO=		emms
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/audio/essentia/Makefile b/audio/essentia/Makefile
index d2197408d496..c0c195e7b0f9 100644
--- a/audio/essentia/Makefile
+++ b/audio/essentia/Makefile
@@ -1,30 +1,31 @@
 PORTNAME=	essentia
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.1_beta5-859
+PORTREVISION=	1
 DISTVERSIONSUFFIX=	-gb247091f
 CATEGORIES=	audio
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	C++ library for audio and music analysis
 WWW=		https://essentia.upf.edu/
 
 LICENSE=	AGPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING.txt
 
 BUILD_DEPENDS=	${LOCALBASE}/include/fftw3.h:math/fftw3
 LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg \
 		libchromaprint.so:audio/chromaprint \
 		libfftw3f.so:math/fftw3-float \
 		libsamplerate.so:audio/libsamplerate \
 		libtag.so:audio/taglib \
 		libyaml.so:textproc/libyaml
 
 USES=		compiler:c++11-lib eigen:3 pkgconfig waf
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	MTG
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libessentia.so
 
 .include <bsd.port.mk>
diff --git a/audio/funktrackergold/Makefile b/audio/funktrackergold/Makefile
index 4f23b7b7fc3a..ec0325bcf472 100644
--- a/audio/funktrackergold/Makefile
+++ b/audio/funktrackergold/Makefile
@@ -1,36 +1,36 @@
 PORTNAME=	funktrackergold
 DISTVERSION=	1.5-2
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	audio
 MASTER_SITES=	SUNSITE/apps/sound/players
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Curses MOD/FNK music tracker
 WWW=		https://boutell.com/lsm/lsmbyid.cgi/000831
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BROKEN_armv6=		fails to compile: function definition is not allowed here
 BROKEN_armv7=		fails to compile: function definition is not allowed here
 
 USES=		compiler:nestedfct ncurses tar:tgz
 
 WRKSRC=		${WRKDIR}/funkgold
 MAKE_ARGS=	EXTRA_LDFLAGS="-lpthread"
 
 PORTDOCS=	INSTALL
 PLIST_FILES=	bin/funkgold
 
 OPTIONS_DEFINE=	DOCS
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/funkgold ${STAGEDIR}${PREFIX}/bin
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for docs in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${docs} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/audio/gramofile/Makefile b/audio/gramofile/Makefile
index 6d55f60a2f8a..7ae04d11427f 100644
--- a/audio/gramofile/Makefile
+++ b/audio/gramofile/Makefile
@@ -1,53 +1,53 @@
 PORTNAME=	gramofile
 PORTVERSION=	1.6P
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	audio
 MASTER_SITES=	http://www.opensourcepartners.nl/~costar/gramofile/
 
 PATCH_SITES=	LOCAL/nox/
 PATCHFILES=	${PORTNAME}_1.6-7.diff.gz
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Audio recording and tick/scratch reduction for e.g. vinyl records
 WWW=		https://www.opensourcepartners.nl/~costar/gramofile/
 
 LIB_DEPENDS=	libfftw.so:math/fftw
 
 ALL_TARGET=	gramofile
 USES=		alias gmake ncurses perl5
 USE_CSTD=	gnu89
 MAKE_ARGS=	CC="${CC}" \
 		CXX="${CXX}" \
 		PERLCOREDIR=${PERLCOREDIR}
 CFLAGS+=	-D_WANT_SEMUN
 
 PERLCOREDIR=	${LOCALBASE}/lib/perl5/${PERL_VER}/${PERL_ARCH}/CORE
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	${RM} ${WRKSRC}/debian/20-warning-fixes.dpatch
 	for i in ${WRKSRC}/debian/*.dpatch; do \
 		${PATCH} -d ${WRKSRC} `${SED} -n '/^#PATCHOPTIONS:/{s///;p;q;}' $$i` --forward --quiet <$$i ;\
 	done
 	for i in `${LS} ${FILESDIR}/post-patch-* |${SED} /.orig$$/d`; do \
 		${PATCH} -d ${WRKSRC} --forward --quiet <$$i ;\
 	done
 	${REINPLACE_CMD} -e "s@-lncurses@-L${LOCALBASE}/lib -lncurses@g" \
 		-e "s|CFLAGS =|CFLAGS +=|" \
 		${WRKSRC}/bplaysrc/Makefile
 	${REINPLACE_CMD} -e 's,machine/soundcard.h,sys/soundcard.h,' \
 		${WRKSRC}/bplaysrc/bplay.c \
 		${WRKSRC}/bplaysrc/sndfunc.c
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/gramofile ${WRKSRC}/bplay_gramo \
 		${STAGEDIR}${PREFIX}/bin
 	${LN} -s bplay_gramo ${STAGEDIR}${PREFIX}/bin/brec_gramo
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/audio/gsequencer/Makefile b/audio/gsequencer/Makefile
index 03a8f310dd50..46ee01ca1af5 100644
--- a/audio/gsequencer/Makefile
+++ b/audio/gsequencer/Makefile
@@ -1,65 +1,65 @@
 PORTNAME=	gsequencer
 DISTVERSION=	4.4.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	SAVANNAH/gsequencer/${DISTVERSION:R}.x
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Advanced Gtk+ sequencer
 WWW=		https://nongnu.org/gsequencer/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	dssi>0:audio/dssi \
 		lv2>0:audio/lv2
 LIB_DEPENDS=	libasound.so:audio/alsa-lib \
 		libfftw3.so:math/fftw3 \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libgraphene-1.0.so:graphics/graphene \
 		libharfbuzz.so:print/harfbuzz \
 		libinstpatch-1.0.so:audio/libinstpatch \
 		libsamplerate.so:audio/libsamplerate \
 		libsndfile.so:audio/libsndfile \
 		libsoup-3.0.so:devel/libsoup3 \
 		libuuid.so:misc/e2fsprogs-libuuid \
 		libvulkan.so:graphics/vulkan-loader \
 		libwebkit2gtk-4.0.so:www/webkit2-gtk3
 RUN_DEPENDS=	dssi>0:audio/dssi
 
 USES=		desktop-file-utils gettext-runtime gettext-tools gmake gnome gstreamer libtool localbase pkgconfig shared-mime-info xorg
 USE_GNOME=	atk cairo gdkpixbuf2 glib20 gtk40 libxml2 pango
 USE_XORG=	x11
 USE_GCC=	yes # the project uses gnu99 extensions, clang fails even with USE_CSTD=gnu99. Suggestions how to build with clang are welcome.
 USE_CSTD=	gnu99
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-alsa --enable-oss --disable-introspection --disable-rt
 
 CPPFLAGS+=	-DAGS_LICENSE_FILENAME=\\\"${LOCALBASE}/share/licenses/${PKGNAME}/${LICENSE}\\\" \
 		-DAGS_LOGO_FILENAME=\\\"${DATADIR}/images/ags.png\\\" # there should be no need to supply AGS_LOGO_FILENAME here since the app knows its location
 LDFLAGS+=	-luuid
 
 INSTALL_TARGET=	install-strip
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
 OPTIONS_DEFINE=			DOCS JACK PULSEAUDIO
 
 DOCS_CONFIGURE_ON=		HTMLHELP_XSL=${LOCALBASE}/share/xsl/docbook/htmlhelp/htmlhelp.xsl --docdir=${DOCSDIR} --enable-single-docdir
 DOCS_BUILD_DEPENDS=		docbook-xsl>0:textproc/docbook-xsl
 DOCS_USE=			GNOME=libxslt:build
 DOCS_ALL_TARGET=		html
 DOCS_INSTALL_TARGET=		install-html
 
 JACK_CONFIGURE_ENABLE=		jack
 JACK_LIB_DEPENDS=		libjack.so:audio/jack
 
 PULSEAUDIO_CONFIGURE_ENABLE=	pulse
 PULSEAUDIO_LIB_DEPENDS=		libpulse.so:audio/pulseaudio
 
 PORTDOCS=	*
 
 .include <bsd.port.mk>
diff --git a/audio/guitarix-lv2/Makefile b/audio/guitarix-lv2/Makefile
index 7f9566b9eed3..6ed08c8e9dde 100644
--- a/audio/guitarix-lv2/Makefile
+++ b/audio/guitarix-lv2/Makefile
@@ -1,74 +1,74 @@
 PORTNAME=	guitarix
 DISTVERSIONPREFIX=	V
 DISTVERSION=	0.44.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	audio
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
 PATCHFILES+=	53560efbbc44a971b7b10290d96b059b67c71eed.patch:-p2
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Virtual versatile amplification for Jack and set of LV2 plugins
 WWW=		https://guitarix.org/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	lv2>0:audio/lv2 \
 		faust:audio/faust \
 		${LOCALBASE}/include/fftw3.h:math/fftw3 \
 		roboto-fonts-ttf>0:x11-fonts/roboto-fonts-ttf \
 		sassc:textproc/sassc \
 		ladspa>0:audio/ladspa # https://sourceforge.net/p/guitarix/bugs/61/
 LIB_DEPENDS=	libavahi-common.so:net/avahi-app \
 		libboost_system.so:devel/boost-libs \
 		libcurl.so:ftp/curl \
 		libfftw3f.so:math/fftw3-float \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libharfbuzz.so:print/harfbuzz \
 		libjack.so:audio/jack \
 		liblilv-0.so:audio/lilv \
 		liblo.so:audio/liblo \
 		liblrdf.so:textproc/liblrdf \
 		libserd-0.so:devel/serd \
 		libsndfile.so:audio/libsndfile \
 		libsord-0.so:devel/sord \
 		libsratom-0.so:audio/sratom \
 		libzita-convolver.so:audio/zita-convolver \
 		libzita-resampler.so:audio/zita-resampler
 RUN_DEPENDS=	roboto-fonts-ttf>0:x11-fonts/roboto-fonts-ttf
 
 USES=		compiler:c++11-lang eigen:3 gnome libarchive localbase:ldflags \
 		pkgconfig python:build readline shebangfix waf xorg tar:xz
 USE_GNOME=	atkmm cairo gtk30 gtkmm30 gdkpixbuf2 pangomm
 USE_XORG=	x11
 USE_LDCONFIG=	yes
 USE_BINUTILS=	yes # linking needs some GNU features, fails on 12 without this, see https://github.com/brummer10/GxPlugins.lv2/issues/9
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	brummer10
 
 SHEBANG_FILES=	tools/coverage tools/dsp2cc tools/dsp2insert tools/dsp2insert tools/tube_transfer.py # see https://github.com/brummer10/guitarix/issues/97
 
 CONFIGURE_ARGS=	--enable-lfs --ldflags="${LDFLAGS}" --jack-session
 
 LDFLAGS+=	-B${LOCALBASE}/bin # Use ld provided by USE_BINUTILS for GNU features, otherwise GNU ld isn't called
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
 WRKSRC_SUBDIR=	trunk
 BINARY_ALIAS=	python=${PYTHON_CMD} python3=${PYTHON_CMD} ld=${LOCALBASE}/bin/ld
 
 OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=	yes
 
 NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=	gettext
 NLS_USE=	GNOME=intltool
 
 post-install:
 	# strip, see https://sourceforge.net/p/guitarix/bugs/60/
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/guitarix
 	@${FIND} ${STAGEDIR}${PREFIX} -name "*.so" | ${XARGS} ${STRIP_CMD}
 
 .include <bsd.port.mk>
diff --git a/audio/openspc/Makefile b/audio/openspc/Makefile
index d1e450da4d02..2bb65af88df9 100644
--- a/audio/openspc/Makefile
+++ b/audio/openspc/Makefile
@@ -1,35 +1,35 @@
 PORTNAME=	openspc
 PORTVERSION=	0.3.1
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	audio
 MASTER_SITES=	http://membres.lycos.fr/pixels/ \
 		LOCAL/ehaupt
 DISTNAME=	OpenSPC-${PORTVERSION}
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Command-line player for .spc and .zst files
 WWW=		http://membres.lycos.fr/pixels/OpenSPC.html
 
 ONLY_FOR_ARCHS=	i386	# contains x86 asm code
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 USES=		autoreconf libtool
 USE_GCC=	yes
 USE_LDCONFIG=	yes
 
 PORTDOCS=	README
 PLIST_FILES=	bin/OpenSPClite include/OpenSPC.h lib/libOpenSPC.a \
 		lib/libOpenSPC.so lib/libOpenSPC.so.0 lib/libOpenSPC.so.0.3.1
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${REINPLACE_CMD} '1,/AUDIOFILE/d' ${WRKSRC}/acinclude.m4
 	@${REINPLACE_CMD} '/AC_PROG_CC/{p;s/.*/AM_PROG_AS/;}' \
 		${WRKSRC}/configure.in
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/audio/pamixer/Makefile b/audio/pamixer/Makefile
index 27369e84620f..089c360a4388 100644
--- a/audio/pamixer/Makefile
+++ b/audio/pamixer/Makefile
@@ -1,23 +1,23 @@
 PORTNAME=	pamixer
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.4-15
-PORTREVISION=	3
+PORTREVISION=	4
 DISTVERSIONSUFFIX=	-g4ea2594
 CATEGORIES=	audio
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Pulseaudio command line mixer
 WWW=		https://github.com/cdemoulins/pamixer
 
 LICENSE=	GPLv3
 
 LIB_DEPENDS+=	libpulse.so:audio/pulseaudio \
 		libboost_program_options.so:devel/boost-libs
 
 USES=		compiler:gcc-c++11-lib gmake localbase
 USE_GITHUB=	yes
 GH_ACCOUNT=	cdemoulins
 
 PLIST_FILES=	bin/pamixer man/man1/pamixer.1.gz
 
 .include <bsd.port.mk>
diff --git a/audio/pulseeffects/Makefile b/audio/pulseeffects/Makefile
index 600513cc52d6..cd1bd7d3fb72 100644
--- a/audio/pulseeffects/Makefile
+++ b/audio/pulseeffects/Makefile
@@ -1,111 +1,111 @@
 PORTNAME=	pulseeffects
 DISTVERSIONPREFIX=	v
 DISTVERSION=	4.6.8
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	audio
 
 MAINTAINER=	daniel@shafer.cc
 COMMENT=	Audio effects for Pulseaudio applications
 WWW=		https://github.com/wwmm/pulseeffects
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cairo>0:graphics/py-cairo@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}gstreamer1>=1.4.0:multimedia/py-gstreamer1@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \
 		appstream-glib>0:devel/appstream-glib \
 		itstool>0:textproc/itstool
 LIB_DEPENDS=	libboost_thread.so:devel/boost-libs \
 		libbs2b.so:audio/libbs2b \
 		libdbus-1.so:devel/dbus \
 		libebur128.so:audio/libebur128 \
 		liblilv-0.so:audio/lilv \
 		libpulse.so:audio/pulseaudio \
 		librubberband.so:audio/rubberband \
 		libsamplerate.so:audio/libsamplerate \
 		libserd-0.so:devel/serd \
 		libsndfile.so:audio/libsndfile \
 		libsord-0.so:devel/sord \
 		libsratom-0.so:audio/sratom \
 		libzita-convolver.so:audio/zita-convolver
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cairo>0:graphics/py-cairo@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}gstreamer1>=1.4.0:multimedia/py-gstreamer1@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \
 		calf-lv2>0:audio/calf-lv2 \
 		ladspa>0:audio/ladspa \
 		lsp-plugins-lv2>0:audio/lsp-plugins-lv2 \
 		mda-lv2>0:audio/mda-lv2 \
 		zam-plugins-lv2>0:audio/zam-plugins-lv2
 
 BROKEN=		error: use of undeclared identifier 'ofs'
 
 USES=		compiler:c++17-lang desktop-file-utils libtool \
 		localbase:ldflags gettext gnome gstreamer meson ninja pathfix pkgconfig \
 		python:3.6+ shebangfix
 USE_GNOME=	cairo gtkmm30 libsigc++20 pygobject3
 USE_GSTREAMER=	bad bs2b good ladspa lv2 pulse webrtcdsp
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	wwmm
 
 GLIB_SCHEMAS=	com.github.wwmm.pulseeffects.gschema.xml \
 		com.github.wwmm.pulseeffects.sinkinputs.autogain.gschema.xml \
 		com.github.wwmm.pulseeffects.sinkinputs.bassenhancer.gschema.xml \
 		com.github.wwmm.pulseeffects.sinkinputs.compressor.gschema.xml \
 		com.github.wwmm.pulseeffects.sinkinputs.convolver.gschema.xml \
 		com.github.wwmm.pulseeffects.sinkinputs.crossfeed.gschema.xml \
 		com.github.wwmm.pulseeffects.sinkinputs.crystalizer.gschema.xml \
 		com.github.wwmm.pulseeffects.sinkinputs.deesser.gschema.xml \
 		com.github.wwmm.pulseeffects.sinkinputs.delay.gschema.xml \
 		com.github.wwmm.pulseeffects.sinkinputs.equalizer.gschema.xml \
 		com.github.wwmm.pulseeffects.sinkinputs.equalizer.leftchannel.gschema.xml \
 		com.github.wwmm.pulseeffects.sinkinputs.equalizer.rightchannel.gschema.xml \
 		com.github.wwmm.pulseeffects.sinkinputs.exciter.gschema.xml \
 		com.github.wwmm.pulseeffects.sinkinputs.filter.gschema.xml \
 		com.github.wwmm.pulseeffects.sinkinputs.gate.gschema.xml \
 		com.github.wwmm.pulseeffects.sinkinputs.gschema.xml \
 		com.github.wwmm.pulseeffects.sinkinputs.limiter.gschema.xml \
 		com.github.wwmm.pulseeffects.sinkinputs.loudness.gschema.xml \
 		com.github.wwmm.pulseeffects.sinkinputs.maximizer.gschema.xml \
 		com.github.wwmm.pulseeffects.sinkinputs.multibandcompressor.gschema.xml \
 		com.github.wwmm.pulseeffects.sinkinputs.multibandgate.gschema.xml \
 		com.github.wwmm.pulseeffects.sinkinputs.pitch.gschema.xml \
 		com.github.wwmm.pulseeffects.sinkinputs.reverb.gschema.xml \
 		com.github.wwmm.pulseeffects.sinkinputs.stereotools.gschema.xml \
 		com.github.wwmm.pulseeffects.sourceoutputs.compressor.gschema.xml \
 		com.github.wwmm.pulseeffects.sourceoutputs.deesser.gschema.xml \
 		com.github.wwmm.pulseeffects.sourceoutputs.equalizer.gschema.xml \
 		com.github.wwmm.pulseeffects.sourceoutputs.equalizer.leftchannel.gschema.xml \
 		com.github.wwmm.pulseeffects.sourceoutputs.equalizer.rightchannel.gschema.xml \
 		com.github.wwmm.pulseeffects.sourceoutputs.filter.gschema.xml \
 		com.github.wwmm.pulseeffects.sourceoutputs.gate.gschema.xml \
 		com.github.wwmm.pulseeffects.sourceoutputs.gschema.xml \
 		com.github.wwmm.pulseeffects.sourceoutputs.limiter.gschema.xml \
 		com.github.wwmm.pulseeffects.sourceoutputs.multibandcompressor.gschema.xml \
 		com.github.wwmm.pulseeffects.sourceoutputs.multibandgate.gschema.xml \
 		com.github.wwmm.pulseeffects.sourceoutputs.pitch.gschema.xml \
 		com.github.wwmm.pulseeffects.sourceoutputs.reverb.gschema.xml \
 		com.github.wwmm.pulseeffects.sourceoutputs.webrtc.gschema.xml \
 		com.github.wwmm.pulseeffects.spectrum.gschema.xml
 
 INSTALL_TARGET=	install-strip
 SHEBANG_FILES=	meson_post_install.py
 
 HELP_LANGS=	it_IT pt_BR ru
 HELP_PNGS=	advancedinfo.png blacklist.png effectsorder.png enableapp.png \
 		saturated.png settingsmenu.png userpresets.png
 
 post-install:
 # Fixes symlink warnings in stage-qa
 .for x in ${HELP_LANGS}
 .for f in ${HELP_PNGS}
 	@${RLN} ${STAGEDIR}${PREFIX}/share/help/C/pulseeffects/figures/${f} \
 		${STAGEDIR}${PREFIX}/share/help/${x}/pulseeffects/figures/${f}
 .endfor
 .endfor
 
 .include <bsd.port.mk>
diff --git a/audio/py-SoundFile/Makefile b/audio/py-SoundFile/Makefile
index 79a0af751161..31220980e6f0 100644
--- a/audio/py-SoundFile/Makefile
+++ b/audio/py-SoundFile/Makefile
@@ -1,25 +1,26 @@
 PORTNAME=	SoundFile
 DISTVERSION=	0.12.1
+PORTREVISION=	1
 CATEGORIES=	audio python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	${PORTNAME:tl}-${PORTVERSION}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Audio library based on libsndfile, CFFI and NumPy
 WWW=		https://github.com/bastibe/PySoundFile
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cffi>=1.0:devel/py-cffi@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cffi>=1.0:devel/py-cffi@${PY_FLAVOR} \
 		${PYNUMPY} \
 		${PREFIX}/lib/libsndfile.so:audio/libsndfile
 
 USES=		python:3.6+
 USE_PYTHON=	distutils autoplist pytest # pkg-plist has files that are missing in autoplist
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/audio/py-aubio/Makefile b/audio/py-aubio/Makefile
index c697d1405a28..ae3ce63449a9 100644
--- a/audio/py-aubio/Makefile
+++ b/audio/py-aubio/Makefile
@@ -1,26 +1,26 @@
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	audio python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	jhale@FreeBSD.org
 COMMENT=	Python bindings for aubio music analysis
 
 LIB_DEPENDS=	libaubio.so:audio/aubio
 BUILD_DEPENDS=	${PYNUMPY}
 RUN_DEPENDS=	${PYNUMPY}
 TEST_DEPENDS=	sox:audio/sox
 
 USES+=		python:3.7+
 USE_PYTHON=	autoplist concurrent distutils pytest
 
 MASTERDIR=	${.CURDIR}/../../audio/aubio
 SLAVEPORT=	py
 PLIST=		${.CURDIR}/pkg-plist
 
 pre-test:
 	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} create_test_sounds)
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME}/_aubio*.so
 
 .include "${MASTERDIR}/Makefile"
diff --git a/audio/py-essentia/Makefile b/audio/py-essentia/Makefile
index 9bc813ad67dc..623fcb1a85c7 100644
--- a/audio/py-essentia/Makefile
+++ b/audio/py-essentia/Makefile
@@ -1,40 +1,41 @@
 PORTNAME=	essentia
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.1_beta5-859
+PORTREVISION=	1
 DISTVERSIONSUFFIX=	-gb247091f
 CATEGORIES=	audio
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Python bindings for essentia, C++ library for audio and music analysis
 WWW=		https://essentia.upf.edu/
 
 LICENSE=	AGPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING.txt
 
 BUILD_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
 LIB_DEPENDS=	libessentia.so:audio/essentia
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
 
 USES=		eigen:3 pkgconfig python
 USE_PYTHON=	pytest
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	MTG
 
 do-configure:
 	@cd ${BUILD_WRKSRC} && ${SETENV} ${BUILD_ENV} ${PYTHON_CMD} waf configure --only-python
 
 do-build:
 	@cd ${BUILD_WRKSRC} && ${SETENV} ${BUILD_ENV} ${PYTHON_CMD} waf build --only-python
 
 do-install:
 	# install
 	cd ${BUILD_WRKSRC} && ${SETENV} ${BUILD_ENV} ${PYTHON_CMD} waf install --only-python --prefix ${PREFIX} --destdir ${STAGEDIR}
 	# strip
 	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/essentia/_essentia${PYTHON_EXT_SUFFIX}.so
 
 .include <bsd.port.mk>
diff --git a/audio/py-librosa/Makefile b/audio/py-librosa/Makefile
index 42585fbbd183..c4a387d0f62e 100644
--- a/audio/py-librosa/Makefile
+++ b/audio/py-librosa/Makefile
@@ -1,37 +1,38 @@
 PORTNAME=	librosa
 DISTVERSION=	0.10.0
+PORTREVISION=	1
 CATEGORIES=	audio python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Python module for audio and music processing
 WWW=		https://librosa.org/
 
 LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 PY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}audioread>=2.1.9:audio/py-audioread@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}decorator>=4.3.0:devel/py-decorator@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}joblib>=0.14:devel/py-joblib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}lazy_loader>=0.1:devel/py-lazy_loader@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}msgpack>=1.0:devel/py-msgpack@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numba>=0.51.0:devel/py-numba@${PY_FLAVOR} \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}packaging>=20.0:devel/py-packaging@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pooch>=1.0:devel/py-pooch@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-learn>=0.20.0:science/py-scikit-learn@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=1.2.0:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}SoundFile>=0.12.1:audio/py-SoundFile@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}soxr>=0.3.2:audio/py-soxr@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}typing-extensions>=4.1.1:devel/py-typing-extensions@${PY_FLAVOR}
 BUILD_DEPENDS=	${PY_DEPENDS}
 RUN_DEPENDS=	${PY_DEPENDS}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}resampy>=0.2.2:audio/py-resampy@${PY_FLAVOR} \
 
 USES=		python:3.6+
 USE_PYTHON=	distutils autoplist pytest
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/audio/py-music21/Makefile b/audio/py-music21/Makefile
index 98aeb9191fbd..46ef426f5bea 100644
--- a/audio/py-music21/Makefile
+++ b/audio/py-music21/Makefile
@@ -1,38 +1,39 @@
 PORTNAME=	music21
 DISTVERSION=	7.3.3
+PORTREVISION=	1
 CATEGORIES=	audio python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Toolkit for computer-aided musical analysis
 WWW=		https://web.mit.edu/music21/
 
 LICENSE=	BSD3CLAUSE LGPL3
 LICENSE_COMB=	multi
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}chardet>0:textproc/py-chardet@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}joblib>0:devel/py-joblib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jsonpickle>0:devel/py-jsonpickle@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}more-itertools>0:devel/py-more-itertools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}webcolors>=1.5:graphics/py-webcolors@${PY_FLAVOR} \
 		lilypond:print/lilypond \
 		mscore:audio/musescore \
 		xdg-open:devel/xdg-utils
 
 USES=		python:3.7+
 USE_PYTHON=	distutils autoplist
 
 NO_ARCH=	yes
 
 post-patch:
 	@${REINPLACE_CMD} -e " \
 		s|/usr/bin/lilypond|${LOCALBASE}/bin/lilypond|; \
 		s|/usr/bin/mscore3|${LOCALBASE}/bin/mscore|; \
 		s|/usr/bin/xdg-open|${LOCALBASE}/bin/xdg-open|" \
 		${WRKSRC}/music21/environment.py
 
 .include <bsd.port.mk>
diff --git a/audio/py-pydub/Makefile b/audio/py-pydub/Makefile
index 38988c700f94..d43dd3afb255 100644
--- a/audio/py-pydub/Makefile
+++ b/audio/py-pydub/Makefile
@@ -1,31 +1,32 @@
 PORTNAME=	pydub
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.25.1
+PORTREVISION=	1
 CATEGORIES=	audio
 #MASTER_SITES=	PYPI # no tests
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Manipulate audio with an simple and easy high level interface
 WWW=		http://pydub.com/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyaudio>0:audio/py-pyaudio@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}simpleaudio>0:audio/py-simpleaudio@${PY_FLAVOR} \
 		ffmpeg:multimedia/ffmpeg
 
 USES=		python
 USE_PYTHON=	distutils autoplist pytest # tests fail to run, see https://github.com/jiaaro/pydub/issues/712
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	jiaaro
 
 NO_ARCH=	yes
 
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 TEST_WRKSRC=	${WRKSRC}/test
 
 .include <bsd.port.mk>
diff --git a/audio/py-pysndfile/Makefile b/audio/py-pysndfile/Makefile
index 7dea527ddacd..bb224db646d9 100644
--- a/audio/py-pysndfile/Makefile
+++ b/audio/py-pysndfile/Makefile
@@ -1,20 +1,21 @@
 PORTNAME=	pysndfile
 DISTVERSION=	1.4.4
+PORTREVISION=	1
 CATEGORIES=	audio python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Cython wrapper class for reading/writing soundfiles using libsndfile
 WWW=		https://forge-2.ircam.fr/roebel/pysndfile
 
 LICENSE=	LGPL3
 
 BUILD_DEPENDS=	${PYNUMPY}
 LIB_DEPENDS=	libsndfile.so:audio/libsndfile
 RUN_DEPENDS=	${PYNUMPY}
 
 USES=		python:3.6+ localbase
 USE_PYTHON=	distutils autoplist cython
 
 .include <bsd.port.mk>
diff --git a/audio/py-resampy/Makefile b/audio/py-resampy/Makefile
index 44cb49a78a11..c64f1a06bc1c 100644
--- a/audio/py-resampy/Makefile
+++ b/audio/py-resampy/Makefile
@@ -1,22 +1,23 @@
 PORTNAME=	resampy
 DISTVERSION=	0.4.2
+PORTREVISION=	1
 CATEGORIES=	audio python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Efficient signal resampling conversion in Python
 WWW=		https://github.com/bmcfee/resampy
 
 LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numba>=0.53:devel/py-numba@${PY_FLAVOR} \
 		${PYNUMPY}
 
 USES=		python:3.6+
 USE_PYTHON=	distutils autoplist
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/audio/py-simpleaudio/Makefile b/audio/py-simpleaudio/Makefile
index dda78285ed0d..807eedaf31d7 100644
--- a/audio/py-simpleaudio/Makefile
+++ b/audio/py-simpleaudio/Makefile
@@ -1,31 +1,32 @@
 PORTNAME=	simpleaudio
 DISTVERSION=	1.0.4
+PORTREVISION=	1
 CATEGORIES=	audio
 #MASTER_SITES=	PYPI # no tests
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Simple, asynchronous audio playback for Python 3
 WWW=		https://github.com/hamiltron/py-simple-audio
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 LIB_DEPENDS=	libasound.so:audio/alsa-lib
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyaudio>0:audio/py-pyaudio@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR}
 
 USES=		localbase python:3.3+
 USE_PYTHON=	distutils autoplist pytest
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	hamiltron
 GH_PROJECT=	py-simple-audio
 
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 TEST_WRKSRC=	${WRKSRC}/tests
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/simpleaudio/_simpleaudio${PYTHON_EXT_SUFFIX}.so
 
 .include <bsd.port.mk>
diff --git a/audio/py-sounddevice/Makefile b/audio/py-sounddevice/Makefile
index 2b7f311af5db..c4c53e40636a 100644
--- a/audio/py-sounddevice/Makefile
+++ b/audio/py-sounddevice/Makefile
@@ -1,29 +1,30 @@
 PORTNAME=	sounddevice
 DISTVERSION=	0.4.6
+PORTREVISION=	1
 CATEGORIES=	audio python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Play and record sound through OSS in python programs
 WWW=		https://github.com/spatialaudio/python-sounddevice
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cffi>=1.0.0:devel/py-cffi@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cffi>=1.0.0:devel/py-cffi@${PY_FLAVOR} \
 		${PYNUMPY} \
 		portaudio>0:audio/portaudio
 
 USES=		python:3.7+
 USE_PYTHON=	distutils autoplist
 
 NO_ARCH=	yes
 
 post-install: # workaround for https://github.com/spatialaudio/python-sounddevice/issues/116
 	@${GREP} "/sounddevice\." < ${_PYTHONPKGLIST} \
 		| ${SED} -e 's|/sounddevice\.|/_sounddevice.|' \
 		>> ${_PYTHONPKGLIST}
 
 .include <bsd.port.mk>
diff --git a/audio/py-soxr/Makefile b/audio/py-soxr/Makefile
index af32f48a4966..b14c5ce463cc 100644
--- a/audio/py-soxr/Makefile
+++ b/audio/py-soxr/Makefile
@@ -1,30 +1,30 @@
 PORTNAME=	soxr
 DISTVERSION=	0.3.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	High quality, one-dimensional sample-rate conversion library
 WWW=		https://github.com/dofuuz/python-soxr
 
 LICENSE=	LGPL21 BSD3CLAUSE
 LICENSE_COMB=	multi
 
 BROKEN_i386=    fails to compile: ...requires target feature 'sse', but would be inlined into function 'h8' that is compiled without support for 'sse'
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR} \
 		${PYNUMPY} \
 		${PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYNUMPY}
 
 USES=		python:3.6+
 USE_PYTHON=	pep517 cython autoplist pytest
 
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/soxr/cysoxr${PYTHON_EXT_SUFFIX}.so
 
 .include <bsd.port.mk>
diff --git a/audio/py-wavio/Makefile b/audio/py-wavio/Makefile
index 8dc224990ffa..6b15d46960f7 100644
--- a/audio/py-wavio/Makefile
+++ b/audio/py-wavio/Makefile
@@ -1,19 +1,20 @@
 PORTNAME=	wavio
 DISTVERSION=	0.0.7
+PORTREVISION=	1
 CATEGORIES=	audio python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Python module for reading and writing WAV files using numpy arrays
 WWW=		https://github.com/WarrenWeckesser/wavio
 
 LICENSE=	BSD2CLAUSE
 
 RUN_DEPENDS=	${PYNUMPY}
 
 USES=		python:3.6+
 USE_PYTHON=	distutils autoplist
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/audio/squash/Makefile b/audio/squash/Makefile
index 742c87dcc05b..e1267c8e1f6c 100644
--- a/audio/squash/Makefile
+++ b/audio/squash/Makefile
@@ -1,56 +1,56 @@
 PORTNAME=	squash
 PORTVERSION=	1.0
-PORTREVISION=	20
+PORTREVISION=	21
 CATEGORIES=	audio
 MASTER_SITES=	SAVANNAH
 
 MAINTAINER=	mandree@FreeBSD.org
 COMMENT=	Learning console-based MP3/OGG player
 WWW=		https://savannah.nongnu.org/projects/squash/
 
 LICENSE=	GPLv2+
 
 LIB_DEPENDS+=	libao.so:audio/libao \
 		libfftw.so:math/fftw \
 		libFLAC.so:audio/flac \
 		libid3.so:audio/id3lib \
 		libmad.so:audio/libmad \
 		libvorbis.so:audio/libvorbis
 RUN_DEPENDS=	id3v2:audio/id3v2
 
 USES=		compiler:c11 gmake ncurses ruby tar:bzip2
 MAKE_ARGS=	CC="${CC}"
 CFLAGS+=	-fcommon
 
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.options.mk>
 
 PORTDOCS=	*
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|--std=gnu99|--std=gnu99 ${CFLAGS}|; \
 		s|-Iinclude|-Iinclude -I${LOCALBASE}/include|; \
 		s|-ldl|-L${LOCALBASE}/lib|; \
 		s}^LDFLAGS.*:=\(.*\)}LDFLAGS :=\1 ${LDFLAGS}}" \
 		${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -e "s,/usr/bin/ruby,${RUBY}," \
 		${WRKSRC}/extra/*.rb
 	@${REINPLACE_CMD} -e "s,/etc/squash.conf,${PREFIX}/etc/squash.conf," \
 		${WRKSRC}/src/global.c
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/squash ${STAGEDIR}${PREFIX}/bin
 .for FILE in collect_info edit_tag export_music import_music joystick uncollect_info
 	${INSTALL_SCRIPT} ${WRKSRC}/extra/${FILE}.rb ${STAGEDIR}${PREFIX}/bin
 .endfor
 	${MKDIR} ${STAGEDIR}${RUBY_SITELIBDIR}
 	${INSTALL_DATA} ${WRKSRC}/extra/musicdb_lib.rb ${STAGEDIR}${RUBY_SITELIBDIR}
 	${INSTALL_DATA} ${WRKSRC}/extra/squash.conf ${STAGEDIR}${PREFIX}/etc/squash.conf.dist
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in README doc/FEATURES doc/LOCKS doc/INSTALL doc/USERS_GUIDE
 	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/benchmarks/himenobench/Makefile b/benchmarks/himenobench/Makefile
index 89db4545c56d..3615b7f19685 100644
--- a/benchmarks/himenobench/Makefile
+++ b/benchmarks/himenobench/Makefile
@@ -1,83 +1,83 @@
 PORTNAME=	himenobench
 PORTVERSION=	2015.07.09
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	benchmarks
 MASTER_SITES=	http://accc.riken.jp/wp-content/uploads/2015/07/
 DISTFILES=	himenobmtxp_xl.zip himenobmtxp_l.zip \
 		himenobmtxp_m.zip himenobmtxp_s.zip \
 		cc_himenobmtxp_xl.zip cc_himenobmtxp_l.zip \
 		cc_himenobmtxp_m.zip cc_himenobmtxp_s.zip \
 		f90_xp.zip himenobmtxpa.zip
 DIST_SUBDIR=	himeno
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tool for measuring performance of floating point operations
 WWW=		http://accc.riken.jp/en/supercom/himenobmt/
 
 LICENSE=	LGPL20 # (or later)
 
 EXTRACT_DEPENDS=	lha:archivers/lha
 
 USES=		dos2unix fortran zip
 DOS2UNIX_GLOB=	*.c *.f
 NO_WRKSUBDIR=	yes
 
 OPTIONS_DEFINE=		ICC OPTIMIZED_CFLAGS
 OPTIONS_SUB=		yes
 
 ICC_DESC=		Intel C compiler support
 ICC_BUILD_DEPENDS=	${LOCALBASE}/intel_cc_80/bin/icc:lang/icc
 OPTIMIZED_CFLAGS_CFLAGS=${OPTFLAGS}
 OPTIMIZED_CFLAGS_VARS=	FFLAGS+="${OPTFLAGS}"
 
 ICC=		${LOCALBASE}/intel_cc_80/bin/icc
 CFLAGS_ICC=	-O3 -tpp7 -axN -Vaxlib
 OPTFLAGS=	-O2 -ffast-math -finline-functions -fomit-frame-pointer \
 		-funroll-loops -fexpensive-optimizations
 
 post-extract:
 	@${FIND} ${WRKSRC} -name "*.lzh" -type f -maxdepth 1 -exec lha \
 		xfpw=${WRKSRC} {} \;
 
 do-build:
 #	cd ${WRKSRC} ; ${FC} ${FFLAGS} -o himenobmtxp_xl himenobmtxp_xl.f #Too large
 	cd ${WRKSRC} ; ${FC} ${FFLAGS} -o himenobmtxp_l  himenobmtxp_l.f
 	cd ${WRKSRC} ; ${FC} ${FFLAGS} -o himenobmtxp_m  himenobmtxp_m.f
 	cd ${WRKSRC} ; ${FC} ${FFLAGS} -o himenobmtxp_s  himenobmtxp_s.f
 #	cd ${WRKSRC} ; ${CC} ${CFLAGS} -DELARGE  -o himenobmtxps_xl himenobmtxps.c #Too large
 	cd ${WRKSRC} ; ${CC} ${CFLAGS} -DLARGE   -o himenobmtxps_l  himenobmtxps.c
 	cd ${WRKSRC} ; ${CC} ${CFLAGS} -DMIDDLE  -o himenobmtxps_m  himenobmtxps.c
 	cd ${WRKSRC} ; ${CC} ${CFLAGS} -DSMALL   -o himenobmtxps_s  himenobmtxps.c
 	cd ${WRKSRC} ; ${CC} ${CFLAGS} -DSSMALL  -o himenobmtxps_ss himenobmtxps.c
 	cd ${WRKSRC} ; ${CC} ${CFLAGS}           -o himenobmtxpa    himenobmtxpa.c
 	cd ${WRKSRC} ; ${FC} ${FFLAGS} -o himenobmtxp    himenobmtxp.f90
 
 do-build-ICC-on:
 #	cd ${WRKSRC} ; ${ICC} ${CFLAGS_ICC} -DELARGE  -o himenobmtxps_xl.icc himenobmtxps.c #Too large
 	cd ${WRKSRC} ; ${ICC} ${CFLAGS_ICC} -DLARGE   -o himenobmtxps_l.icc  himenobmtxps.c
 	cd ${WRKSRC} ; ${ICC} ${CFLAGS_ICC} -DMIDDLE  -o himenobmtxps_m.icc  himenobmtxps.c
 	cd ${WRKSRC} ; ${ICC} ${CFLAGS_ICC} -DSMALL   -o himenobmtxps_s.icc  himenobmtxps.c
 	cd ${WRKSRC} ; ${ICC} ${CFLAGS_ICC} -DSSMALL  -o himenobmtxps_ss.icc himenobmtxps.c
 	cd ${WRKSRC} ; ${ICC} ${CFLAGS_ICC}           -o himenobmtxpa.icc    himenobmtxpa.c
 
 do-install:
 #	${INSTALL_PROGRAM} ${WRKSRC}/himenobmtxp_xl          ${STAGEDIR}${PREFIX}/bin #Too large
 	${INSTALL_PROGRAM} ${WRKSRC}/himenobmtxp_l          ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/himenobmtxp_m          ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/himenobmtxp_s          ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/himenobmtxpa           ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/himenobmtxps_l         ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/himenobmtxps_m         ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/himenobmtxps_s         ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/himenobmtxps_ss        ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/himenobmtxp            ${STAGEDIR}${PREFIX}/bin
 
 do-install-ICC-on:
 #	${INSTALL_PROGRAM} ${WRKSRC}/himenobmtxps_xl.icc    ${STAGEDIR}${PREFIX}/bin #Too large
 	${INSTALL_PROGRAM} ${WRKSRC}/himenobmtxps_l.icc     ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/himenobmtxps_m.icc     ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/himenobmtxps_s.icc     ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/himenobmtxps_ss.icc    ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/himenobmtxpa.icc       ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/benchmarks/hpl/Makefile b/benchmarks/hpl/Makefile
index 22215ecef250..19404ea43450 100644
--- a/benchmarks/hpl/Makefile
+++ b/benchmarks/hpl/Makefile
@@ -1,52 +1,52 @@
 PORTNAME=	hpl
 DISTVERSION=	2.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	benchmarks
 MASTER_SITES=	NETLIB/benchmark/hpl
 
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	High Performance Computing Linpack Benchmark
 WWW=		https://www.netlib.org/benchmark/hpl/
 
 LIB_DEPENDS=	libblas.so:math/blas \
 		libmpich.so:net/mpich
 
 USES=		fortran
 USE_LDCONFIG=	yes
 HPL_ARCH?=	FreeBSD_PIV_CBLAS
 MAKE_ARGS=	arch=${HPL_ARCH}
 ALL_TARGET=	build
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|^TOPdir[ ]*=.*$$|TOPdir = ${WRKSRC}| ; \
 		s|^MPdir[ ]*=.*$$|MPdir = ${LOCALBASE}| ; \
 		s|^LAdir[ ]*=.*$$|LAdir = ${LOCALBASE}| ; \
 		s|^CC[ ]*=.*$$|CC = ${CC}| ; \
 		s|^CCFLAGS[ ]*=.*$$|CCFLAGS = $$\(HPL_DEFS\) ${CFLAGS} -fomit-frame-pointer -funroll-loops| ; \
 		s|^LINKER[ ]*=.*$$|LINKER = ${FC}| ; \
 		s|^LINKFLAGS[ ]*=\(.*\)$$|LINKFLAGS =\1 ${LDFLAGS}| ; \
 		s|^ARCHIVER[ ]*=.*$$|ARCHIVER = ${AR}| ; \
 		s|ARCH[ )]|_&|g ; \
 		s|^HPL_OPTS[ ]*=.*$$|HPL_OPTS =| ; \
 		s|^LAlib[ ]*=.*$$|LAlib = $$\(LAdir\)/lib/libblas.a| ; \
 		s|libmpich.a|libmpich.so -lpthread| ; \
 		s|libpmpich.a|libmpl.so -lpthread|' \
 		${WRKSRC}/setup/Make.${HPL_ARCH}
 	@${REINPLACE_CMD} -e 's|HPL\.dat|${PREFIX}/etc/${PORTNAME}/&|' \
 		${WRKSRC}/testing/ptest/HPL_pdinfo.c
 	@${CP} ${WRKSRC}/setup/Make.${HPL_ARCH} ${WRKSRC}/
 	@${REINPLACE_CMD} -e '/^build/s|$$| startup|' ${WRKSRC}/Makefile
 
 do-install:
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/${HPL_ARCH}/xhpl ${STAGEDIR}${PREFIX}/bin/
 	${INSTALL_DATA} ${WRKSRC}/bin/${HPL_ARCH}/HPL.dat ${STAGEDIR}${ETCDIR}
 	${INSTALL_MAN} ${WRKSRC}/man/man3/*.3 ${STAGEDIR}${MAN3PREFIX}/man/man3/
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for doc in BUGS COPYRIGHT HISTORY README TODO TUNING
 	${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/benchmarks/imb/Makefile b/benchmarks/imb/Makefile
index 3f4f1003f58d..3cb09c174b5e 100644
--- a/benchmarks/imb/Makefile
+++ b/benchmarks/imb/Makefile
@@ -1,57 +1,58 @@
 PORTNAME=	IMB
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2021.3
+PORTREVISION=	1
 CATEGORIES=	benchmarks parallel
 MASTER_SITES=	https://github.com/intel/mpi-benchmarks/archive/refs/tags/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Intel MPI Benchmark
 WWW=		https://software.intel.com/en-us/imb-user-guide
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/license/license.txt
 
 #USE_GITHUB=	yes
 #GH_ACCOUNT=	intel
 #GH_PROJECT=	mpi-benchmarks
 
 USES=		gmake localbase
 BINARY_ALIAS=	make=${GMAKE}
 
 WRKSRC=		${WRKDIR}/mpi-benchmarks-${DISTNAME}
 
 # Intel hardcodes -O3 in make_mpich.  Replacing it with system defaults
 # would make it impossible to compare benchmark results with other systems.
 # By putting it here we make it easier for somebody to change it, if they
 # _really_ want it.
 OPT_CFLAGS=	-O3
 CC=		${MPICC}
 CXX=		${MPICXX}
 CFLAGS+=	${OPT_CFLAGS} ${MPI_CFLAGS}
 LDFLAGS+=	${MPI_LIBS}
 MAKE_ENV=	MPI_HOME=${MPI_HOME}
 
 OPTIONS_DEFINE=		CHECK_RESULTS DOCS
 OPTIONS_RADIO=		MPI
 OPTIONS_RADIO_MPI=	MPICH OPENMPI
 OPTIONS_DEFAULT=	MPICH
 
 # Attention: -DCHECK results are not valid as real benchmark data! Don't
 # forget to deactivate DCHECK and recompile in order to get proper results.
 CHECK_RESULTS_DESC=	Check results (not valid as real benchmark data)
 CHECK_RESULTS_CFLAGS=	-DCHECK
 
 MPICH_USES=	mpi:mpich
 OPENMPI_USES=	mpi:openmpi
 
 do-install:
 	(cd ${WRKSRC} && ${INSTALL_PROGRAM} IMB-* ${STAGEDIR}${PREFIX}/bin)
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/ReadMe_IMB.txt ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/license/third-party-programs.txt ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/license/use-of-trademark-license.txt \
 		${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/benchmarks/ior/Makefile b/benchmarks/ior/Makefile
index 7ae89790ab4b..6a75e2aca713 100644
--- a/benchmarks/ior/Makefile
+++ b/benchmarks/ior/Makefile
@@ -1,31 +1,32 @@
 PORTNAME=	ior
 DISTVERSION=	3.3.0-20230112
+PORTREVISION=	1
 CATEGORIES=	benchmarks
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	IOR and mdtest, parallel IO storage benchmark
 WWW=		https://github.com/hpc/ior
 
 LICENSE=	GPLv2
 
 USES=		autoreconf gmake localbase:ldflags mpi:mpich pkgconfig
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	hpc
 GH_TAGNAME=	24d5d41
 
 GNU_CONFIGURE=	yes
 
 TEST_TARGET=	check
 
 PLIST_FILES=	bin/ior \
 		bin/md-workbench \
 		bin/mdtest \
 		man/man1/mdtest.1.gz
 
 post-install: # see https://github.com/hpc/ior/issues/454
 	@${RM} \
 		${STAGEDIR}${PREFIX}/lib/libaiori.a \
 		${STAGEDIR}${PREFIX}/share/USER_GUIDE
 
 .include <bsd.port.mk>
diff --git a/benchmarks/mdtest/Makefile b/benchmarks/mdtest/Makefile
index 2b05c4d4dab2..fa76603ada71 100644
--- a/benchmarks/mdtest/Makefile
+++ b/benchmarks/mdtest/Makefile
@@ -1,41 +1,41 @@
 PORTNAME=	mdtest
 PORTVERSION=	1.9.3
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	benchmarks
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}%20latest/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Filesystem metadata benchmark utility
 WWW=		https://sourceforge.net/projects/mdtest/
 
 LICENSE=	GPLv2
 
 USES=		tar:tgz
 NO_WRKSUBDIR=	yes
 
 CFLAGS+=	-DDarwin
 
 PLIST_FILES=	bin/${PORTNAME} man/man1/${PORTNAME}.1.gz
 PORTEXAMPLES=	*
 
 OPTIONS_DEFINE=	OPENMPI EXAMPLES
 OPENMPI_DESC=	Use Open MPI instead of MPICH2
 
 OPENMPI_BUILD_DEPENDS=		${LOCALBASE}/mpi/openmpi/bin/mpicc:net/openmpi
 OPENMPI_RUN_DEPENDS=		${LOCALBASE}/mpi/openmpi/bin/mpirun:net/openmpi
 OPENMPI_VARS=			MPICC=${LOCALBASE}/mpi/openmpi/bin/mpicc
 
 OPENMPI_BUILD_DEPENDS_OFF=	${LOCALBASE}/bin/mpicc:net/mpich
 OPENMPI_RUN_DEPENDS_OFF=	${LOCALBASE}/bin/mpirun:net/mpich
 OPENMPI_VARS_OFF=		MPICC=${LOCALBASE}/bin/mpicc
 
 do-build:
 	(cd ${WRKSRC} && ${MPICC} ${CFLAGS} -o ${PORTNAME} ${PORTNAME}.c -lm)
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/scripts/* ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/benchmarks/octave-forge-benchmark/Makefile b/benchmarks/octave-forge-benchmark/Makefile
index 4029b8d89b4f..1caa4f3888b7 100644
--- a/benchmarks/octave-forge-benchmark/Makefile
+++ b/benchmarks/octave-forge-benchmark/Makefile
@@ -1,19 +1,19 @@
 PORTNAME=	octave-forge-benchmark
 PORTVERSION=	1.1.1
-PORTREVISION=	28
+PORTREVISION=	29
 CATEGORIES=	benchmarks math
 MASTER_SITES=	SF/octave/Octave%20Forge%20Packages/Old%20Monolithic%20Releases/R2009-05-08
 DISTNAME=	${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=	octave
 
 WRKSRC=        ${WRKDIR}/${OCTAVE_SRC}
 
 .include <bsd.port.mk>
diff --git a/benchmarks/polygraph/Makefile b/benchmarks/polygraph/Makefile
index 6cdf104f0956..f24912220842 100644
--- a/benchmarks/polygraph/Makefile
+++ b/benchmarks/polygraph/Makefile
@@ -1,56 +1,56 @@
 PORTNAME=	polygraph
 DISTVERSION=	4.13.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	benchmarks www
 MASTER_SITES=	http://www.web-polygraph.org/downloads/srcs/
 EXTRACT_SUFX=	-src.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Benchmarking tool for Web proxies
 WWW=		https://www.web-polygraph.org/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_aarch64=		does not build: libstdc++.so: undefined reference to __floatunditf@GCC_4.2.0
 
 USES=		gmake ncurses shebangfix
 SHEBANG_FILES=	tools/*.pl
 USE_GCC=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	ac_cv_have_64bit_byte_order_conversion=yes
 
 # The port does not build with C++11 or later (bug 219275).
 USE_CXXSTD=	gnu++98
 
 CONFLICTS=	ltrace-0*
 
 OPTIONS_DEFINE=		DOCS GNUPLOT GSSAPI LDNS PERL SSL ZLIB
 OPTIONS_DEFAULT=	SSL ZLIB
 OPTIONS_EXCLUDE_i386=	SSL
 
 GNUPLOT_DESC=		GNUPlot for full reporting functionality
 GNUPLOT_RUN_DEPENDS=	gnuplot:math/gnuplot
 GSSAPI_USES=		gssapi:mit
 GSSAPI_CONFIGURE_ON=	--with-kerberos=${KRB5CONFIG} ${GSSAPI_CONFIGURE_ARGS}
 GSSAPI_CONFIGURE_OFF=	--without-kerberos
 LDNS_DESC=		DNS zone file support via libldns
 LDNS_LIB_DEPENDS=	libldns.so:dns/ldns
 LDNS_CONFIGURE_ON=	--with-ldns=${LOCALBASE}/bin/ldns-config
 LDNS_CONFIGURE_OFF=	--without-ldns
 SSL_DESC=		SSL/HTTPS support
 SSL_USES=		ssl
 SSL_CONFIGURE_ON=	--with-ssl=${OPENSSLBASE}
 SSL_CONFIGURE_OFF=	--without-ssl
 PERL_DESC=		Install Perl for PolyGraph tools
 PERL_USES=		perl5
 PERL_USE=		perl5=run
 ZLIB_DESC=		HTTP compression support
 ZLIB_CONFIGURE_ON=	--with-zlib=/usr
 ZLIB_CONFIGURE_OFF=	--without-zlib
 
 post-patch:
 	@${REINPLACE_CMD} -e \
 		'/LICENSE /d' ${WRKSRC}/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/benchmarks/py-naarad/Makefile b/benchmarks/py-naarad/Makefile
index 541050fd5759..e112629641a5 100644
--- a/benchmarks/py-naarad/Makefile
+++ b/benchmarks/py-naarad/Makefile
@@ -1,32 +1,32 @@
 PORTNAME=	naarad
 PORTVERSION=	1.0.15
-PORTREVISION=	4
+PORTREVISION=	5
 DISTVERSIONPREFIX=	v
 CATEGORIES=	benchmarks python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Framework for performance analysis
 WWW=		https://github.com/linkedin/naarad
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytz>=2013.8,1:devel/py-pytz@${PY_FLAVOR} \
 	${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \
 	${PYTHON_PKGNAMEPREFIX}luminol>0:math/py-luminol@${PY_FLAVOR} \
 	bash:shells/bash \
 	gawk:lang/gawk
 
 USES=		shebangfix python:3.6+
 
 SHEBANG_LANG=	gawk
 SHEBANG_FILES=	bin/naarad_metric_collector.sh bin/PrintGCStats
 
 USE_PYTHON=	autoplist concurrent distutils
 USE_GITHUB=	yes
 GH_ACCOUNT=	linkedin
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/benchmarks/py-zopkio/Makefile b/benchmarks/py-zopkio/Makefile
index 0a3d7ffbae43..6651d81c42dc 100644
--- a/benchmarks/py-zopkio/Makefile
+++ b/benchmarks/py-zopkio/Makefile
@@ -1,27 +1,27 @@
 PORTNAME=	Zopkio
 PORTVERSION=	0.2.5
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	benchmarks python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Functional and Performance Test Framework
 WWW=		https://github.com/linkedin/Zopkio
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}naarad>=1.0.15:benchmarks/py-naarad@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}kazoo>=1.1:devel/py-kazoo@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}paramiko>=1.10.1:security/py-paramiko@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}junit-xml>0:textproc/py-junit-xml@${PY_FLAVOR} \
 
 USES=		dos2unix python:3.6+
 USE_PYTHON=	autoplist concurrent distutils
 USE_GITHUB=	yes
 GH_ACCOUNT=	LinkedInAttic
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/biology/abyss/Makefile b/biology/abyss/Makefile
index e0ab408418d5..8436eab2b31d 100644
--- a/biology/abyss/Makefile
+++ b/biology/abyss/Makefile
@@ -1,45 +1,45 @@
 PORTNAME=	abyss
 DISTVERSION=	2.3.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	biology
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Assembly By Short Sequences: parallel, paired-end sequence assembler
 WWW=		https://www.bcgsc.ca/resources/software/abyss
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_i386=	result of comparison of constant 18446744073709551615 with expression of type 'size_t', see https://github.com/bcgsc/abyss/issues/310
 
 BUILD_DEPENDS=	${LOCALBASE}/include/boost/version.hpp:devel/boost-libs \
 		ghc:lang/ghc \
 		pandoc:textproc/hs-pandoc # pandoc is required just for one man page: abyss-sealer
 LIB_DEPENDS=	libffi.so:devel/libffi \
 		libgmp.so:math/gmp \
 		libmpich.so:net/mpich # binaries aren't linked with libmpich.so for some reason
 RUN_DEPENDS=	bash:shells/bash \
 		gmake:devel/gmake
 
 USES=		autoreconf compiler:c++11-lang gmake iconv:wchar_t localbase:ldflags shebangfix sqlite
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	bcgsc
 
 SHEBANG_FILES=	bin/${PORTNAME}-* DataBase/abyss-db-txt
 SHEBANG_LANG=	make
 make_OLD_CMD=	/usr/bin/make
 make_CMD=	${PREFIX}/bin/gmake
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-sparsehash # configure fails to find std::hash, reported to the ML: https://groups.google.com/forum/#!topic/trans-abyss/SZDBKR5bKxs
 
 TEST_TARGET=	check # tests fail to compile, see https://github.com/bcgsc/abyss/issues/453
 
 OPTIONS_DEFINE=	DOCS
 
 PORTDOCS=	*
 
 PORTSCOUT=	limit:^[0-9\.]*$$ # to ignore alpha-numeric tags
 
 .include <bsd.port.mk>
diff --git a/biology/atac-seq/Makefile b/biology/atac-seq/Makefile
index 46a1adb3bcda..226aef537d57 100644
--- a/biology/atac-seq/Makefile
+++ b/biology/atac-seq/Makefile
@@ -1,27 +1,28 @@
 PORTNAME=	atac-seq
 DISTVERSION=	0.1.2
+PORTREVISION=	1
 CATEGORIES=	biology python
 MASTER_SITES=	# empty
 
 MAINTAINER=	jwb@FreeBSD.org
 COMMENT=	Metaport for ATAC-Seq analysis
 WWW=		https://github.com/auerlab/
 
 LICENSE=	BSD2CLAUSE
 
 RUN_DEPENDS=	sra-tools>0:biology/sra-tools \
 		fastq-trim>0:biology/fastq-trim \
 		fastqc>0:biology/fastqc \
 		${PYTHON_PKGNAMEPREFIX}multiqc>0:biology/py-multiqc@${PY_FLAVOR} \
 		biolibc-tools>0:biology/biolibc-tools \
 		bwa>0:biology/bwa \
 		bowtie2>0:biology/bowtie2 \
 		samtools>0:biology/samtools \
 		${PYTHON_PKGNAMEPREFIX}macs2>0:biology/py-macs2@${PY_FLAVOR} \
 		fasda>0:biology/fasda \
 		peak-classifier>0:biology/peak-classifier \
 		webbrowser>0:www/webbrowser
 
 USES=		metaport python
 
 .include <bsd.port.mk>
diff --git a/biology/augustus/Makefile b/biology/augustus/Makefile
index b66ccbf732ef..957170fa71a6 100644
--- a/biology/augustus/Makefile
+++ b/biology/augustus/Makefile
@@ -1,47 +1,47 @@
 PORTNAME=	augustus
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.5.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	biology science
 PKGNAMESUFFIX=	-gene-prediction
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Genome annotation tool
 WWW=		http://bioinf.uni-greifswald.de/webaugustus/
 
 LICENSE=	GPLv3
 
 LIB_DEPENDS=	libbamtools.so:biology/bamtools \
 		libboost_iostreams.so:devel/boost-libs \
 		libcolamd.so:math/suitesparse-colamd \
 		libgsl.so:math/gsl \
 		libhts.so:biology/htslib \
 		liblpsolve55.so:math/lp_solve \
 		libmysqlpp.so:databases/mysql++
 RUN_DEPENDS=	samtools:biology/samtools
 
 USES=		gmake localbase:ldflags mysql perl5 python sqlite shebangfix
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Gaius-Augustus
 GH_PROJECT=	Augustus
 
 SHEBANG_GLOB=	*.pl *.py
 SHEBANG_FILES=	scripts/checkUTR
 
 CXXFLAGS+=	-I${LOCALBASE}/include/bamtools \
 		-I${LOCALBASE}/include/lpsolve \
 		-I${LOCALBASE}/include/mysql
 LDFLAGS+=	-L${LOCALBASE}/lib/mysql
 
 MAKE_ARGS=	INSTALLDIR=${LOCALBASE}/${PORTNAME} RLN="${RLN}"
 
 BINARY_ALIAS=	make=${GMAKE} python3=${PYTHON_CMD}
 
 TEST_TARGET=	test
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/${PORTNAME}/bin/*
 	@${RM} ${STAGEDIR}${PREFIX}/${PORTNAME}/scripts/pasapolyA2hints.pl.orig
 
 .include <bsd.port.mk>
diff --git a/biology/biosig/Makefile b/biology/biosig/Makefile
index 150ea692f1ac..702bacd9e0d5 100644
--- a/biology/biosig/Makefile
+++ b/biology/biosig/Makefile
@@ -1,36 +1,36 @@
 PORTNAME=	biosig
 DISTVERSION=	2.5.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	biology
 MASTER_SITES=	SF/${PORTNAME}/BioSig%20for%20C_C%2B%2B/src/
 DISTNAME=	${PORTNAME}-${PORTVERSION}.src
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Library for reading and writing different biosignal data format
 WWW=		http://biosig.sourceforge.net/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libb64.so:converters/libb64 \
 		libcholmod.so:math/suitesparse-cholmod \
 		libiconv.so:converters/libiconv \
 		libtinyxml.so:textproc/tinyxml
 
 USES=		gmake iconv localbase:ldflags tar:xz
 USE_LDCONFIG=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
 
 GNU_CONFIGURE=	yes
 
 CFLAGS+=	-D__BYTE_ORDER=BYTE_ORDER -D__LITTLE_ENDIAN=LITTLE_ENDIAN -D__BIG_ENDIAN=BIG_ENDIAN \
 		-Dbswap_16=bswap16 -Dbswap_32=bswap32 -Dbswap_64=bswap64
 LDFLAGS+=	-liconv
 
 post-install:
 .for f in bin/biosig_fhir bin/biosig2gdf bin/physicalunits bin/save2gdf lib/libbiosig.so.3
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/${f}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/biology/biosoup/Makefile b/biology/biosoup/Makefile
index 29c118aeaf6d..5c386bb8234c 100644
--- a/biology/biosoup/Makefile
+++ b/biology/biosoup/Makefile
@@ -1,39 +1,40 @@
 PORTNAME=	biosoup
 DISTVERSION=	0.10.0-2
+PORTREVISION=	1
 DISTVERSIONSUFFIX=	-g62b942c
 CATEGORIES=	biology devel
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Collection of C++ header-only data structures for bioinformatics
 WWW=		https://github.com/rvaser/biosoup
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 TEST_DEPENDS=	googletest>0:devel/googletest
 
 USES=		cmake compiler:gcc-c++11-lib
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	rvaser
 
 CMAKE_OFF=	biosoup_build_tests
 
 NO_ARCH=	yes
 
 PLIST_FILES=	include/biosoup/nucleic_acid.hpp \
 		include/biosoup/overlap.hpp \
 		include/biosoup/progress_bar.hpp \
 		include/biosoup/sequence.hpp \
 		include/biosoup/timer.hpp
 
 do-install:
 	cd ${WRKSRC}/include && ${COPYTREE_SHARE} ${PORTNAME} ${STAGEDIR}${PREFIX}/include
 
 do-test:
 	@cd ${BUILD_WRKSRC} && \
 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -D${PORTNAME}_build_tests:BOOL=ON ${CMAKE_SOURCE_PATH} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
 		${BUILD_WRKSRC}/bin/${PORTNAME}_test
 
 .include <bsd.port.mk>
diff --git a/biology/biostar-tools/Makefile b/biology/biostar-tools/Makefile
index faa45754c02c..59f1fe626195 100644
--- a/biology/biostar-tools/Makefile
+++ b/biology/biostar-tools/Makefile
@@ -1,85 +1,86 @@
 PORTNAME=	biostar-tools
 PORTVERSION=	1.10.1
+PORTREVISION=	1
 CATEGORIES=	biology python
 
 MAINTAINER=	jwb@FreeBSD.org
 COMMENT=	Meta-port for Biostar Handbook tools
 WWW=		https://www.biostarhandbook.com
 
 LICENSE=	BSD2CLAUSE
 
 # For a current list see http://data.biostarhandbook.com/install/conda.txt.
 # Also included are some programs not listed above, but mentioned in the text.
 # TODO: Add hdfview
 RUN_DEPENDS=	wget>0:ftp/wget \
 		curl>0:ftp/curl \
 		nano>0:editors/nano \
 		parallel>0:sysutils/parallel \
 		seqkit>0:biology/seqkit \
 		csvtk>0:science/csvtk \
 		${PYTHON_PKGNAMEPREFIX}csvkit>0:textproc/py-csvkit@${PY_FLAVOR} \
 		miller>0:textproc/miller \
 		ncbi-entrez-direct>0:biology/ncbi-entrez-direct \
 		readseq>0:biology/readseq \
 		snpeff>0:biology/snpeff \
 		picard-tools>0:biology/picard-tools \
 		bbmap>0:biology/bbmap \
 		minimap2>0:biology/minimap2 \
 		bwa>0:biology/bwa \
 		bowtie2>0:biology/bowtie2 \
 		samtools>0:biology/samtools \
 		emboss>0:biology/emboss \
 		bedtools>0:biology/bedtools \
 		bamtools>0:biology/bamtools \
 		${PYTHON_PKGNAMEPREFIX}cutadapt>0:biology/py-cutadapt@${PY_FLAVOR} \
 		seqtk>0:biology/seqtk \
 		datamash>0:textproc/datamash \
 		bcftools>0:biology/bcftools \
 		subread>0:biology/subread \
 		hisat2>0:biology/hisat2 \
 		trimmomatic>0:biology/trimmomatic \
 		fastqc>0:biology/fastqc \
 		picard-tools>0:biology/picard-tools \
 		ncbi-blast+>0:biology/ncbi-blast+ \
 		cd-hit>0:biology/cd-hit \
 		${PYTHON_PKGNAMEPREFIX}biopython>0:biology/py-biopython@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pysam>0:biology/py-pysam@${PY_FLAVOR} \
 		freebayes>0:biology/freebayes \
 		p5-Net-SSLeay>0:security/p5-Net-SSLeay \
 		bioawk>0:biology/bioawk \
 		vt>0:biology/vt \
 		${PYTHON_PKGNAMEPREFIX}crossmap>0:biology/py-crossmap@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}goatools>0:biology/py-goatools@${PY_FLAVOR} \
 		erminej>0:biology/erminej \
 		${PYTHON_PKGNAMEPREFIX}ont-fast5-api>0:biology/py-ont-fast5-api@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}multiqc>0:biology/py-multiqc@${PY_FLAVOR} \
 		flash>0:biology/flash \
 		bfc:biology/bfc \
 		Jellyfish>0:biology/jellyfish \
 		mafft>0:biology/mafft \
 		clustal-omega>0:biology/clustal-omega \
 		${PYTHON_PKGNAMEPREFIX}pywgsim>0:biology/py-pywgsim@${PY_FLAVOR} \
 		sam2pairwise>0:biology/sam2pairwise \
 		kallisto>0:biology/kallisto \
 		bamutil>0:biology/bamutil \
 		${PYTHON_PKGNAMEPREFIX}deepTools>0:biology/py-deeptools@${PY_FLAVOR} \
 		igv>0:biology/igv \
 		gffread>0:biology/gffread
 
 USES=		metaport python
 
 .include <bsd.port.pre.mk>
 
 # Allow pkg build on non-amd64 systems until sra-tools supports them
 .if ${ARCH} == amd64
 RUN_DEPENDS+=	sra-tools>0:biology/sra-tools
 .endif
 
 SUB_FILES=	biostar-shell
 PLIST_FILES=	bin/biostar-shell
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKDIR}/biostar-shell ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.post.mk>
diff --git a/biology/bolt-lmm/Makefile b/biology/bolt-lmm/Makefile
index a1d2123ade9b..026195fddb93 100644
--- a/biology/bolt-lmm/Makefile
+++ b/biology/bolt-lmm/Makefile
@@ -1,52 +1,52 @@
 PORTNAME=	bolt-lmm
 DISTVERSION=	2.3.6
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	biology
 MASTER_SITES=	https://data.broadinstitute.org/alkesgroup/BOLT-LMM/downloads/
 DISTNAME=	BOLT-LMM_v${PORTVERSION}
 
 MAINTAINER=	jwb@FreeBSD.org
 COMMENT=	Mixed model association testing and variance component analysis
 WWW=		https://data.broadinstitute.org/alkesgroup/BOLT-LMM/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/license.txt
 
 LIB_DEPENDS=	libnlopt.so:math/nlopt \
 		libopenblas.so:math/openblas \
 		libboost_program_options.so:devel/boost-libs
 
 USES=		gmake
 
 BUILD_WRKSRC=		${WRKDIR}/${DISTNAME}/src
 INSTALL_WRKSRC=		${WRKDIR}/${DISTNAME}/src
 CXXFLAGS_i386=		-DUSE_SSE -msse -msse2
 CXXFLAGS_amd64=		-DUSE_SSE
 MAKE_ARGS=		BOOST_INSTALL_DIR=${LOCALBASE} \
 			NLOPT_INSTALL_DIR=${LOCALBASE} \
 			ZLIB_STATIC_DIR=/usr/lib \
 			LIBSTDCXX_STATIC_DIR=/usr/lib \
 			GLIBC_STATIC_DIR=/usr/lib \
 			SSEFLAGS="" \
 			MEMCPY="" \
 			LLAPACK="-lopenblas"
 
 CONFLICTS_INSTALL=	rubygem-bolt # bin/bolt
 
 PORTEXAMPLES=	*
 
 OPTIONS_DEFINE=	EXAMPLES
 
 pre-configure:
 	@${RM} ${WRKSRC}/example/*.orig ${WRKSRC}/bolt
 	@${REINPLACE_CMD} -e 's|tables/|${DATADIR}/tables/|g' \
 		${BUILD_WRKSRC}/BoltParams.cpp
 	@${REINPLACE_CMD} -e 's|../tables/|${DATADIR}/tables/|g' \
 		${WRKSRC}/example/run_example.sh
 
 do-install:
 	${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/bolt ${STAGEDIR}${PREFIX}/bin
 	(cd ${WRKSRC}/example && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} tables ${STAGEDIR}${DATADIR})
 
 .include <bsd.port.mk>
diff --git a/biology/checkm/Makefile b/biology/checkm/Makefile
index e0e287e0e668..585eea9da3b7 100644
--- a/biology/checkm/Makefile
+++ b/biology/checkm/Makefile
@@ -1,26 +1,27 @@
 PORTNAME=	CheckM
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.2.0
+PORTREVISION=	1
 CATEGORIES=	biology python
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Quality assessment tool for the microbial genomes
 WWW=		https://ecogenomics.github.io/CheckM/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}DendroPy>0:science/py-DendroPy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pysam>0:biology/py-pysam@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR}
 
 USES=		dos2unix python:3.7+
 USE_GITHUB=	yes
 GH_ACCOUNT=	Ecogenomics
 USE_PYTHON=	distutils noflavors autoplist
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/biology/cufflinks/Makefile b/biology/cufflinks/Makefile
index a76820a3ff56..ec835ba69991 100644
--- a/biology/cufflinks/Makefile
+++ b/biology/cufflinks/Makefile
@@ -1,48 +1,48 @@
 PORTNAME=	cufflinks
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.2.1-89
-PORTREVISION=	4
+PORTREVISION=	5
 DISTVERSIONSUFFIX=	-gdc3b0cb
 CATEGORIES=	biology
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${PORTNAME}/commit/
 PATCHFILES+=	ea4671149f3054c773d99cea521db75bf7b0658f.patch:-p1 # https://github.com/cole-trapnell-lab/cufflinks/pull/127
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Cufflinks assembles transcripts, estimates their abundance, etc
 WWW=		https://cole-trapnell-lab.github.io/cufflinks/
 
 LICENSE=	BSL
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 		libhts.so:biology/htslib
 
 USES=		autoreconf compiler:c++11-lang eigen:3 gmake python shebangfix
 
 SHEBANG_FILES=	src/cuffmerge
 
 GNU_CONFIGURE=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	cole-trapnell-lab
 
 CXXFLAGS+=	-I${LOCALBASE}/include/eigen3
 CFLAGS+=	-I${LOCALBASE}/include/eigen3 # https://github.com/cole-trapnell-lab/cufflinks/issues/113
 
 CONFLICTS_INSTALL=	gffread
 
 PLIST_FILES=	bin/compress_gtf \
 		bin/cuffcompare \
 		bin/cuffdiff \
 		bin/cufflinks \
 		bin/cuffmerge \
 		bin/cuffnorm \
 		bin/cuffquant \
 		bin/gffread \
 		bin/gtf_to_sam
 
 post-patch: # https://github.com/cole-trapnell-lab/cufflinks/issues/116
 	@${GREP} -rl 'fabs(' ${WRKSRC} | ${GREP} "\.cpp$$" | ${XARGS} ${REINPLACE_CMD} 's|std::fabs(|fabs(| ; s|fabs(|::fabs(|'
 
 .include <bsd.port.mk>
diff --git a/biology/ddocent/Makefile b/biology/ddocent/Makefile
index e82fd5828e01..735eba8216d7 100644
--- a/biology/ddocent/Makefile
+++ b/biology/ddocent/Makefile
@@ -1,65 +1,65 @@
 PORTNAME=		dDocent
 DISTVERSIONPREFIX=	v
 DISTVERSION=		2.7.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=		biology java perl5 python
 
 MAINTAINER=	jwb@FreeBSD.org
 COMMENT=	Bash pipeline for RAD sequencing
 WWW=		http://ddocent.com
 
 LICENSE=	MIT
 
 RUN_DEPENDS=	mawk>=0:lang/mawk \
 		gawk>=0:lang/gawk \
 		coreutils>=0:sysutils/coreutils \
 		gnuplot>=0:math/gnuplot \
 		parallel>=0:sysutils/parallel \
 		bash:shells/bash \
 		bwa>=0.7.13:biology/bwa \
 		cd-hit>=0:biology/cd-hit \
 		samtools>=1.3:biology/samtools \
 		vcftools>=0.1.15:biology/vcftools \
 		trimmomatic>=0:biology/trimmomatic \
 		bamtools>=0:biology/bamtools \
 		stacks>=0:biology/stacks \
 		rainbow>=0:biology/rainbow \
 		trimadap>=0:biology/trimadap \
 		seqtk>=0:biology/seqtk \
 		bedtools>=2.26.0:biology/bedtools \
 		pear-merger>=0:biology/pear-merger \
 		vcflib>=0:biology/vcflib \
 		freebayes:biology/freebayes \
 		fastp:biology/fastp
 
 USES=		perl5 python shebangfix
 USE_JAVA=	yes
 USE_GITHUB=	yes
 
 SHEBANG_FILES=	dDocent scripts/*.sh scripts/*.pl scripts/dDocent_filters
 GH_ACCOUNT=	jpuritz
 
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} \
 		${WRKSRC}/dDocent \
 		${WRKSRC}/*.sh \
 		${FILESDIR}/ddocent-assembly-test \
 		${FILESDIR}/ddocent-assembly-test-cleanup \
 		${WRKSRC}/scripts/*.sh \
 		${WRKSRC}/scripts/*.pl \
 		${WRKSRC}/scripts/dDocent_filters \
 		${STAGEDIR}${PREFIX}/bin
 
 # These are on top of patch-dDocent, so don't apply them within the source
 # tree, or they'll get picked up by patch generators, and hard-code PREFIX.
 post-install:
 	@${REINPLACE_CMD} -i '' \
 		-e 's|SHELL=bash|SHELL=${LOCALBASE}/bin/bash|g' \
 		-e 's|python|${PYTHON_CMD}|g' \
 		${STAGEDIR}${PREFIX}/bin/dDocent
 
 .include <bsd.port.mk>
diff --git a/biology/fastp/Makefile b/biology/fastp/Makefile
index a946098298a8..b07db20d2c15 100644
--- a/biology/fastp/Makefile
+++ b/biology/fastp/Makefile
@@ -1,29 +1,29 @@
 PORTNAME=		fastp
 DISTVERSIONPREFIX=	v
 DISTVERSION=		0.23.2
-PORTREVISION=		1
+PORTREVISION=		2
 CATEGORIES=		biology
 
 MAINTAINER=	jwb@FreeBSD.org
 COMMENT=	Ultra-fast all-in-one FASTQ preprocessor
 WWW=		https://github.com/OpenGene/fastp
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libdeflate.so:archivers/libdeflate \
 		libisal.so:devel/isa-l
 
 USES=		gmake localbase:ldflags
 USE_GITHUB=	yes
 USE_GCC=	yes
 
 GH_ACCOUNT=	OpenGene
 
 ALL_TARGET=	fastp
 PLIST_FILES=	bin/fastp
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/fastp
 
 .include <bsd.port.mk>
diff --git a/biology/gcta/Makefile b/biology/gcta/Makefile
index f4a82826d85c..f3ae8d589b4a 100644
--- a/biology/gcta/Makefile
+++ b/biology/gcta/Makefile
@@ -1,34 +1,34 @@
 PORTNAME=	gcta
 DISTVERSION=	1.26.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	biology
 MASTER_SITES=	https://cnsgenomics.com/software/gcta/pre_gcta/:main \
 		https://gitlab.com/libeigen/eigen/-/archive/${EIGEN_VERSION}/:eigen
 DISTFILES=	${PORTNAME}_${DISTVERSION}_src${EXTRACT_SUFX}:main \
 		eigen-${EIGEN_VERSION}.tar.gz:eigen
 
 MAINTAINER=	jwb@FreeBSD.org
 COMMENT=	Genome-wide Complex Trait Analysis
 WWW=		https://cnsgenomics.com/software/gcta/index.html
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/GNU_General_Public_License_v3.txt
 
 LIB_DEPENDS=	libopenblas.so:math/openblas
 
 USES=		compiler:c++11-lang dos2unix gmake localbase:ldflags zip
 
 CXXFLAGS+=	-I${WRKDIR}/eigen-${EIGEN_VERSION} -fopenmp
 LDFLAGS+=	-lopenblas
 
 INSTALL_TARGET=	install-strip
 PLIST_FILES=	bin/gcta
 
 EIGEN_VERSION=	3.3.9
 
 do-extract:
 	@${UNZIP_NATIVE_CMD} -d ${WRKSRC} ${DISTDIR}/${PORTNAME}_${DISTVERSION}_src${EXTRACT_SUFX}
 	@cd ${WRKDIR} && \
 		${TAR} xzf ${DISTDIR}/eigen-${EIGEN_VERSION}.tar.gz
 
 .include <bsd.port.mk>
diff --git a/biology/gemma/Makefile b/biology/gemma/Makefile
index 86abc7fc04f1..8ad9c168566e 100644
--- a/biology/gemma/Makefile
+++ b/biology/gemma/Makefile
@@ -1,38 +1,38 @@
 PORTNAME=	gemma
 DISTVERSION=	0.98.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	biology
 
 MAINTAINER=	jwb@FreeBSD.org
 COMMENT=	Genome-wide Efficient Mixed Model Association
 WWW=		https://github.com/genetics-statistics/GEMMA
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libgsl.so:math/gsl
 
 USES=		blaslapack:openblas compiler:c++11-lang eigen:3 gmake \
 		localbase:ldflags
 USE_GITHUB=	yes
 GH_ACCOUNT=	genetics-statistics
 GH_PROJECT=	GEMMA
 
 MAKEFILE=	${FILESDIR}/Makefile
 # Assuming openblas is built with pthreads, not openmp
 CXXFLAGS+=	-I${LOCALBASE}/include/eigen3 -DOPENBLAS -pthread
 LDFLAGS+=	-lopenblas -pthread
 
 OPTIONS_DEFINE=	EXAMPLES
 
 pre-configure:
 	@${REINPLACE_CMD} -e 's|../bin/gemma|../gemma|' ${WRKSRC}/test/*.sh
 
 do-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	(cd ${WRKSRC}/example && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
 
 do-test:
 	(cd ${WRKSRC}/test && ${SH} test_suite.sh)
 
 .include <bsd.port.mk>
diff --git a/biology/groopm/Makefile b/biology/groopm/Makefile
index 620ccb003fb2..21d3cd34da21 100644
--- a/biology/groopm/Makefile
+++ b/biology/groopm/Makefile
@@ -1,24 +1,24 @@
 PORTNAME=	GroopM
 DISTVERSION=	0.3.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	biology python
 MASTER_SITES=	PYPI
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Metagenomic binning suite
 WWW=		https://ecogenomics.github.io/GroopM/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>=1.1.0:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=0.10.1:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tables>=2.3:devel/py-tables@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	distutils noflavors autoplist
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/biology/haplohseq/Makefile b/biology/haplohseq/Makefile
index b45f83a1129a..75e2c38f3629 100644
--- a/biology/haplohseq/Makefile
+++ b/biology/haplohseq/Makefile
@@ -1,42 +1,42 @@
 PORTNAME=	haplohseq
 DISTVERSION=	0.1.2
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	biology
 
 MAINTAINER=	jwb@FreeBSD.org
 COMMENT=	Identify regions of allelic imbalance
 WWW=		https://sites.google.com/site/integrativecancergenomics/software/haplohseq
 
 LICENSE=	MIT
 
 LIB_DEPENDS=	libboost_system.so:devel/boost-libs
 RUN_DEPENDS=	R-cran-optparse>0:devel/R-cran-optparse
 
 USES=		compiler:c++11-lang gmake localbase:ldflags python:3.6+
 USE_GITHUB=	yes
 
 GH_ACCOUNT=	outpaddling
 
 OPTIONS_DEFINE=	EXAMPLES
 
 MAKEFILE=	makefile
 LDFLAGS+=	-lpthread
 MAKE_ENV=	STRIP=${STRIP}
 
 SUB_FILES=	haplohseq-example
 
 pre-configure:
 	@${REINPLACE_CMD} \
 		-e 's|/bin/bash|/bin/sh|' \
 		-e 's|python|mkdir example_output; ${PYTHON_CMD}|' \
 		-e 's|\.\./haplohseq|haplohseq|' \
 		${WRKSRC}/example/example_run.sh
 
 post-install-EXAMPLES-on:
 	${INSTALL_SCRIPT} ${WRKDIR}/haplohseq-example ${STAGEDIR}${PREFIX}/bin
 	(cd ${WRKSRC} && ${RM} example/*.orig scripts/*.orig && ${COPYTREE_SHARE} "example ldmap scripts" ${STAGEDIR}${EXAMPLESDIR})
 
 do-test:
 	@(cd ${WRKSRC}/build/test && ${FILESDIR}/run-tests)
 
 .include <bsd.port.mk>
diff --git a/biology/hhsuite/Makefile b/biology/hhsuite/Makefile
index 72b887c8a1ca..205283770d26 100644
--- a/biology/hhsuite/Makefile
+++ b/biology/hhsuite/Makefile
@@ -1,42 +1,42 @@
 PORTNAME=	hhsuite
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.3.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	biology science
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Remote protein homology detection suite
 WWW=		https://github.com/soedinglab/hh-suite
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 NOT_FOR_ARCHS=	armv6 armv7 i386 mips powerpc powerpcspe # not for 32-bit architectures, see https://github.com/soedinglab/hh-suite/issues/322#issuecomment-1264416293
 
 LIB_DEPENDS=	libmpi.so:net/openmpi
 
 USES=		compiler:c++11-lang cmake perl5 python shebangfix
 SHEBANG_GLOB=	*.pl *.py
 USE_GITHUB=	yes
 GH_ACCOUNT=	soedinglab
 GH_PROJECT=	hh-suite
 
 LDFLAGS+=	-Wl,-rpath,${LOCALBASE}/mpi/openmpi/lib -L${LOCALBASE}/mpi/openmpi/lib -lmpi # force linking to openmpi, and not to mpich
 
 .if !exists(/usr/include/omp.h)
 PLIST_SUB+=	OPENMP="@comment "
 .else
 PLIST_SUB+=	OPENMP=""
 .endif
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == aarch64
 CMAKE_ON=	HAVE_ARM8
 .elif ${ARCH} == amd64 || ${ARCH} == i386
 CMAKE_ON=	HAVE_SSE2
 .elif ${ARCH} == powerpc64le
 CMAKE_ON=	HAVE_POWER8
 .endif
 
 .include <bsd.port.mk>
diff --git a/biology/iqtree/Makefile b/biology/iqtree/Makefile
index e8bd283e0e42..f6d1014747aa 100644
--- a/biology/iqtree/Makefile
+++ b/biology/iqtree/Makefile
@@ -1,39 +1,39 @@
 PORTNAME=	iqtree
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.0.6
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	biology
 
 MAINTAINER=	jrm@FreeBSD.org
 COMMENT=	Efficient phylogenomic software by maximum likelihood
 WWW=		http://www.iqtree.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_aarch64=	fails to compile: unrecognized command line option '-msse3'
 BROKEN_armv6=	fails to compile: unrecognized command line options '-m32' and '-msse3'
 BROKEN_armv7=	fails to compile: unrecognized command line options '-m32' and '-msse3'
 BROKEN_i386=	ld: error: unable to find library -latomic (see bug 230888)
 BROKEN_powerpc64=	fails to build: GCC version must be at least 4.8!
 
 LIB_DEPENDS=	libboost_filesystem.so:devel/boost-libs
 
 USES=		cmake compiler:c++11-lang eigen:3
 USE_GITHUB=	yes
 GH_ACCOUNT=	Cibiv
 GH_PROJECT=	IQ-TREE
 
 PLIST_FILES=	bin/iqtree
 PORTEXAMPLES=	example.cf example.nex example.phy models.nex
 
 OPTIONS_DEFINE=	EXAMPLES
 
 do-install:
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/iqtree2 ${STAGEDIR}${PREFIX}/bin/iqtree
 
 do-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/example/* ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/biology/kallisto/Makefile b/biology/kallisto/Makefile
index d7b66a14f1b7..9a9ac1e108d4 100644
--- a/biology/kallisto/Makefile
+++ b/biology/kallisto/Makefile
@@ -1,46 +1,46 @@
 PORTNAME=		kallisto
 DISTVERSIONPREFIX=	v
 DISTVERSION=		0.48.0
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=		1
 CATEGORIES=		biology
 
 MAINTAINER=	jwb@FreeBSD.org
 COMMENT=	Quantify abundances of transcripts from RNA-Seq data
 WWW=		https://pachterlab.github.io/kallisto/about.html
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/license.txt
 
 BUILD_DEPENDS=	autoconf>=0:devel/autoconf
 LIB_DEPENDS=	libhdf5.so:science/hdf5 \
 		libsz.so:science/libaec \
 		libhts.so:biology/htslib
 
 USES=		cmake:noninja compiler:c++11-lang gmake localbase:ldflags
 USE_GITHUB=	yes
 GH_ACCOUNT=	pachterlab
 
 SUB_FILES=	kallisto-test
 
 PORTEXAMPLES=		*
 PLIST_FILES=		bin/kallisto
 EXAMPLES_PLIST_FILES=	bin/kallisto-test
 
 # hdf5 is being phased out and is no longer built in by default, but is still
 # required for Sleuth (requires kallisto bootstrap estimates) and other
 # downstream tools.  Remove this after Sleuth et al catch up.
 CMAKE_ARGS+=		-DUSE_HDF5:BOOL=ON
 MAKE_JOBS_UNSAFE=	yes
 LDFLAGS+=		-lhts -lz
 
 OPTIONS_DEFINE=	EXAMPLES
 
 post-extract:
 	${RM} -rf ${WRKSRC}/ext/htslib
 
 post-install-EXAMPLES-on:
 	${INSTALL_SCRIPT} ${WRKDIR}/kallisto-test ${STAGEDIR}${PREFIX}/bin
 	cd ${WRKSRC}/test && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/biology/molden/Makefile b/biology/molden/Makefile
index f16308ecc3e3..70ac7ed8beb3 100644
--- a/biology/molden/Makefile
+++ b/biology/molden/Makefile
@@ -1,78 +1,79 @@
 PORTNAME=	molden
 DISTVERSION=	7.1
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	biology
 MASTER_SITES=	https://ftp.science.ru.nl/Molden/
 DISTNAME=	${PORTNAME}${DISTVERSION}
 
 MAINTAINER=	jmd@FreeBSD.org
 COMMENT=	Display molecular orbitals and electron densities in 2D and 3D
 WWW=		https://www.theochem.ru.nl/molden/
 
 LICENSE=	Molden
 LICENSE_NAME=	Molden License
 LICENSE_FILE=	${WRKSRC}/CopyRight
 LICENSE_PERMS=	auto-accept dist-mirror pkg-mirror # free for academic, non profit use
 
 BUILD_DEPENDS=	makedepend:devel/makedepend
 
 USES=		fortran gl gmake xorg
 USE_XORG=	x11 xmu
 USE_GL=		gl glu
 
 MAKEFILE=	makefile
 
 CFLAGS+=	-D${OPSYS:tu} -DDOBACK -DHASTIMER -DCOLOR_OFFSET=0.0 \
 		-I${LOCALBASE}/include -Wno-return-type
 
 PORTDOCS=	*
 PORTDATA=	*
 
 PLIST_FILES=	bin/ambfor \
 		bin/ambmd \
 		bin/gmolden \
 		bin/molden \
 		bin/surf
 
 PORTSCOUT=	limit:^5\.0\.
 
 OPTIONS_DEFINE=		DATA DOCS
 OPTIONS_DEFAULT=	DATA
 
 post-extract:
 	# remove object modules
 	@${FIND} ${WRKSRC} -name "*.o" | ${XARGS} ${RM}
 	# remove pre-built executables
 	@${RM} ${WRKSRC}/bin/*
 
 post-configure:
 	@${ECHO_MSG} "********************"
 	@${ECHO_MSG} "**  If you want to use a larger MOLDEN,"
 	@${ECHO_MSG} "**  edit change_parameter.sh and run it,"
 	@${ECHO_MSG} "**  before \'make build\'."
 	@${ECHO_MSG} "********************"
 
 do-install:
 .for e in molden gmolden ambfor ambmd surf
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/${e} ${STAGEDIR}${PREFIX}/bin
 .endfor
 
 do-install-DATA-on:
 	@${MKDIR} ${STAGEDIR}${DATADIR}/test
 	(cd ${WRKSRC}/test && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/test)
 	${MKDIR} ${STAGEDIR}${DATADIR}/utils
 	(cd ${WRKSRC}/utils && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/utils)
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.pre.mk>
 
 .if ${GCC_DEFAULT} >= 10
 # workaround for Type mismatch between actual argument at (1) and actual argument at (2) (INTEGER(4)/REAL(4)).
 # in theory, this should set FCFLAGS, but the port does not conform
 FFLAGS+=	-fallow-argument-mismatch
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/biology/ncbi-vdb/Makefile b/biology/ncbi-vdb/Makefile
index 1ae608087727..33f50ec07dd5 100644
--- a/biology/ncbi-vdb/Makefile
+++ b/biology/ncbi-vdb/Makefile
@@ -1,66 +1,66 @@
 PORTNAME=	ncbi-vdb
 DISTVERSION=	2.11.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	biology
 
 MAINTAINER=	mzaki@niid.go.jp
 COMMENT=	NCBI's virtualized back-end for accessing Sequence Read Archive
 WWW=		https://github.com/ncbi/ncbi-vdb/wiki
 
 LICENSE=	PD
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 ONLY_FOR_ARCHS=	amd64 i386
 ONLY_FOR_ARCHS_REASON=	libs/search/nucstrstr.c requires SSE2 instructions
 
 BUILD_DEPENDS=	bash:shells/bash \
 		libepoll-shim>0:devel/libepoll-shim
 
 LIB_DEPENDS=	libxml2.so:textproc/libxml2 \
 		libhdf5.so:science/hdf5 \
 		libmbedtls.so:security/mbedtls
 
 USES=		compiler:c11 gmake localbase:ldflags perl5 shebangfix
 USE_PERL5=	build
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	ncbi
 GH_TUPLE+=	ncbi:ngs:${DISTVERSION}:ngs # ported as biology/ngs-sdk
 
 SHEBANG_GLOB=	*.sh *.pl
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-xml2-prefix=${LOCALBASE} \
 		--with-hdf5-prefix=${LOCALBASE} \
 		--with-mbedtls-prefix=${LOCALBASE} \
 		CC="${CC}" CXX="${CXX}" TOOLS="${CHOSEN_COMPILER_TYPE}"
 MAKE_ENV+=	CPATH="${LOCALBASE}/include/libepoll-shim"
 MAKE_ARGS+=	CCNAME=${CC} CXXNAME=${CXX} PKGCFLAGS="${CFLAGS}"
 
 CFLAGS+=	-I${WRKSRC}/lib
 
 MAKE_JOBS_UNSAFE=	yes
 
 post-extract:
 	@${LN} -sf ${WRKSRC_ngs} ${WRKDIR}/ngs
 	@${LN} -sf ${WRKSRC} ${WRKDIR}/${PORTNAME}
 
 pre-patch:
 	@${CP} ${FILESDIR}/Makefile.bsd ${WRKSRC}/build/
 	@for f in ${WRKSRC}/build/ld.linux.*.sh; do ${CP} -p $${f} $${f%linux*}bsd$${f#*linux}; done
 	@${CP} -p ${WRKSRC}/build/ld.linux.gcc.sh ${WRKSRC}/build/ld.bsd.clang.sh
 	@${MKDIR} ${WRKSRC}/interfaces/os/bsd
 	@${CP} -p ${WRKSRC}/interfaces/os/mac/endian.h ${WRKSRC}/interfaces/os/bsd/
 
 post-patch:
 	@${GREP} -q '@@PREFIX@@' ${WRKSRC}/libs/kfg/config.c || (echo "@@PREFIX@@ in file/patch-libs_kfg_config.c is overwritten probably due to using 'make makepatch'"; exit 1)
 	@${REINPLACE_CMD} -e 's#@@PREFIX@@#"${PREFIX}"#' ${WRKSRC}/libs/kfg/config.c
 
 post-configure:
 	@${ECHO} ${CHOSEN_COMPILER_TYPE} > ${WRKSRC}/build/COMP
 
 # The 'install' target installs broken-looking static libs with symlinks.
 # This is intentional, see comments https://github.com/ncbi/ncbi-vdb/issues/36#issuecomment-817990790 This may change in future versions.
 
 .include <bsd.port.mk>
diff --git a/biology/peak-classifier/Makefile b/biology/peak-classifier/Makefile
index 250d1ae4a221..af06f90083fb 100644
--- a/biology/peak-classifier/Makefile
+++ b/biology/peak-classifier/Makefile
@@ -1,26 +1,27 @@
 PORTNAME=	peak-classifier
 DISTVERSION=	0.1.4-5
+PORTREVISION=	1
 DISTVERSIONSUFFIX=	-ga5bcfec
 CATEGORIES=	biology
 
 MAINTAINER=	jwb@FreeBSD.org
 COMMENT=	Classify ChIP/ATAC-Seq peaks based on features provided in a GFF
 WWW=		https://github.com/auerlab/peak-classifier
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libxtend.so:devel/libxtend libbiolibc.so:biology/biolibc
 RUN_DEPENDS=	bedtools:biology/bedtools \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR}
 
 USES=		localbase python:3.7+ shebangfix
 USE_GITHUB=	yes
 
 GH_ACCOUNT=	auerlab
 SHEBANG_FILES=	feature-view.py
 
 pre-build:
 	cd ${WRKSRC} && make depend LOCALBASE=${LOCALBASE}
 
 .include <bsd.port.mk>
diff --git a/biology/plink/Makefile b/biology/plink/Makefile
index 93e0c5cffe0b..4d88ae60d13f 100644
--- a/biology/plink/Makefile
+++ b/biology/plink/Makefile
@@ -1,59 +1,59 @@
 PORTNAME=		plink
 DISTVERSIONPREFIX=	v
 DISTVERSION=		1.90b6.17
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=		biology
 
 MAINTAINER=	mzaki@e-mail.ne.jp
 COMMENT=	Whole genome association analysis toolset
 WWW=		https://www.cog-genomics.org/plink/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 NOT_FOR_ARCHS=		aarch64 mips64 powerpc64 powerpc64le sparc64
 NOT_FOR_ARCHS_REASON=	64bit code requires SSE2 instructions
 
 USES=		gmake fortran
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	chrchang
 GH_PROJECT=	plink-ng
 GH_TAGNAME=	79b2df8c
 
 WRKSRC_SUBDIR=	1.9
 MAKEFILE=	Makefile.std
 MAKE_ARGS=	ZLIB=-lz BLASFLAGS="${BLASLIB} ${LAPACKLIB}"
 CFLAGS+=	-DDYNAMIC_ZLIB -I${LOCALBASE}/include
 LDFLAGS+=	-lthr
 INSTALL_TARGET=	install-strip
 
 CONFLICTS_INSTALL=	putty putty-nogtk # bin/plink
 
 OPTIONS_DEFINE=		EXAMPLES
 OPTIONS_SINGLE=		BLAS
 OPTIONS_SINGLE_BLAS=	NETLIB OPENBLAS
 OPTIONS_DEFAULT=	OPENBLAS
 
 BLAS_DESC=	BLAS/LAPACK implementation
 
 OPENBLAS_USES=	blaslapack:openblas
 
 NETLIB_DESC=		Netlib's reference
 NETLIB_USES=		blaslapack:netlib
 NETLIB_LIB_DEPENDS=	libcblas.so:math/cblas
 NETLIB_LDFLAGS=		-lcblas
 
 EXAMPLES=	toy.map toy.ped
 
 post-build:
 	(cd ${WRKSRC}; ${CC} ${CFLAGS} prettify.c -o prettify)
 
 post-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/prettify ${STAGEDIR}${PREFIX}/bin
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${EXAMPLES:S,^,${WRKSRC}/,} ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/biology/prodigy-lig/Makefile b/biology/prodigy-lig/Makefile
index 9bc4f222c755..a426c8683946 100644
--- a/biology/prodigy-lig/Makefile
+++ b/biology/prodigy-lig/Makefile
@@ -1,25 +1,25 @@
 PORTNAME=	prodigy-lig
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	biology python
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Prediction of protein-small molecule binding affinities
 WWW=		https://nestor.science.uu.nl/prodigy/lig
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}biopython>0:biology/py-biopython@${PY_FLAVOR}
 
 USES=		gmake python:3.6+
 USE_PYTHON=	distutils noflavors autoplist
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	haddocking
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/biology/psi88/Makefile b/biology/psi88/Makefile
index efd1174ac8f4..c0853aae6941 100644
--- a/biology/psi88/Makefile
+++ b/biology/psi88/Makefile
@@ -1,45 +1,45 @@
 PORTNAME=	psi88
 PORTVERSION=	1.0
-PORTREVISION=	16
+PORTREVISION=	17
 CATEGORIES=	biology
 MASTER_SITES=	http://www.ccl.net/cca/software/SOURCES/FORTRAN/psi88/
 DISTNAME=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Plotting wavefunctions (molecular orbitals) in 3D
 WWW=		http://zarbi.chem.yale.edu/products/psi88/index.shtml
 
 USES=		fortran tar:Z
 MAKE_ARGS=	BIN=${STAGEDIR}${PREFIX}/bin
 FFLAGS+=	-std=legacy
 
 PLIST_FILES=	bin/PSI1 bin/PSICON bin/PSI2CT bin/PSI2HP bin/PSI2PS bin/PSI2 \
 		bin/PREPLOT bin/preplot bin/rpsi1 bin/rpsi2 bin/rpsicon
 PORTDOCS=	README psi88.doc
 PORTEXAMPLES=	*
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 post-patch:
 	@${REINPLACE_CMD} -e 's/f77/$${FC}/' -e 's/LFLAGS/LDFLAGS/' \
 		${WRKSRC}/src/makefile
 	@${CP} ${FILESDIR}/Makefile.top ${WRKSRC}/Makefile
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/P*
 	${LN} -s PSI2PS ${STAGEDIR}${PREFIX}/bin/PSI2
 	${INSTALL_SCRIPT} ${WRKSRC}/unix/preplot ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/unix/rpsi1 ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/unix/rpsi2 ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/unix/rpsicon ${STAGEDIR}${PREFIX}/bin
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/psi88.doc ${STAGEDIR}${DOCSDIR}
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/biology/py-PySCeS/Makefile b/biology/py-PySCeS/Makefile
index c5490e644741..82ca6fb8d248 100644
--- a/biology/py-PySCeS/Makefile
+++ b/biology/py-PySCeS/Makefile
@@ -1,39 +1,40 @@
 PORTNAME=	PySCeS
 DISTVERSION=	1.0.3
+PORTREVISION=	1
 CATEGORIES=	biology python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	${PORTNAME:tl}-${DISTVERSION}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Python Simulator for Cellular Systems
 WWW=		http://pysces.sourceforge.net/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENCE.txt
 
 PY_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR}
 PY_EXTRA=	${PYTHON_PKGNAMEPREFIX}python-libsbml>0:biology/py-python-libsbml@${PY_FLAVOR}
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}scikit-build>0:devel/py-scikit-build@${PY_FLAVOR} \
 		cmake:devel/cmake-core \
 		${PY_DEPENDS}
 RUN_DEPENDS=	${PY_DEPENDS} ${PY_EXTRA}
 
 USES=		fortran python
 USE_PYTHON=	distutils autoplist
 
 LDFLAGS+=	-lpython${PYTHON_VER} -shared # see https://github.com/PySCeS/pysces/issues/29
 
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 
 post-install:
 	@${STRIP_CMD} \
 		${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/pysces/pitcon/pitcon.cpython-${PYTHON_SUFFIX}.so \
 		${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/pysces/nleq2/nleq2.cpython-${PYTHON_SUFFIX}.so
 
 do-test: # from section 2.1 Loading PySCeS in http://pysces.sourceforge.net/pdf/userguide.pdf
 	@${SETENV} ${TEST_ENV} ${PYTHON_CMD} -c "import pysces; pysces.test();"
 
 .include <bsd.port.mk>
diff --git a/biology/py-biom-format/Makefile b/biology/py-biom-format/Makefile
index 4f351f25152a..2149208ef16b 100644
--- a/biology/py-biom-format/Makefile
+++ b/biology/py-biom-format/Makefile
@@ -1,33 +1,34 @@
 PORTNAME=	biom-format
 PORTVERSION=	2.1.10
+PORTREVISION=	1
 CATEGORIES=	biology python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	jrm@FreeBSD.org
 COMMENT=	Biological Observation Matrix (BIOM) Format Project
 WWW=		https://biom-format.org/
 
 LICENSE=	BSD3CLAUSE
 
 BUILD_DEPENDS=	${PYNUMPY}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click@${PY_FLAVOR} \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}future>=0.16.0:devel/py-future@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=1:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pandas>=0.20.0:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}h5py>=2.2.0:science/py-h5py@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	autoplist concurrent cython distutils
 
 .include <bsd.port.pre.mk>
 
 post-extract:
 	${RM} -r ${WRKSRC}/tests
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/biom/*.so
 
 .include <bsd.port.post.mk>
diff --git a/biology/py-biopython/Makefile b/biology/py-biopython/Makefile
index b9f9e1bdf684..928d8cf0a1bd 100644
--- a/biology/py-biopython/Makefile
+++ b/biology/py-biopython/Makefile
@@ -1,32 +1,33 @@
 PORTNAME=	biopython
 DISTVERSION=	1.81
+PORTREVISION=	1
 CATEGORIES=	biology python
 MASTER_SITES=	http://www.biopython.org/DIST/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	mauricio@arareko.net
 COMMENT=	Collection of Python modules for bioinformatics
 WWW=		https://biopython.org/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.rst
 
 BUILD_DEPENDS=	${PYNUMPY}
 RUN_DEPENDS=	${PYNUMPY}
 
 USES=		python:3.7+
 USE_PYTHON=	distutils autoplist
 
 OPTIONS_DEFINE=		REPORTLAB
 OPTIONS_DEFAULT=	REPORTLAB
 
 REPORTLAB_DESC=		PDF support in Bio.Graphics module
 REPORTLAB_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}reportlab>0:print/py-reportlab@${PY_FLAVOR}
 
 post-install:
 	@${STRIP_CMD} \
 		${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/Bio/*.so \
 		${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/Bio/*/*.so \
 		${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/Bio/*/*/*.so \
 
 .include <bsd.port.mk>
diff --git a/biology/py-biosig/Makefile b/biology/py-biosig/Makefile
index 1577ad89521a..9d18998b02b9 100644
--- a/biology/py-biosig/Makefile
+++ b/biology/py-biosig/Makefile
@@ -1,24 +1,25 @@
 PORTNAME=	biosig
 DISTVERSION=	2.5.0
+PORTREVISION=	1
 CATEGORIES=	biology
 MASTER_SITES=	SF/${PORTNAME}/BioSig%20for%20C_C%2B%2B/src/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	${PORTNAME}-${PORTVERSION}.src
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Library for reading and writing different biosignal data format
 WWW=		http://biosig.sourceforge.net/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/../../COPYING
 
 BUILD_DEPENDS=	${PYNUMPY}
 LIB_DEPENDS=	libbiosig.so:biology/biosig
 
 USES=		python tar:xz
 USE_PYTHON=	distutils autoplist
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
 WRKSRC_SUBDIR=	biosig4c++/python
 
 .include <bsd.port.mk>
diff --git a/biology/py-bx-python/Makefile b/biology/py-bx-python/Makefile
index c9840382165a..6d34ed020e8a 100644
--- a/biology/py-bx-python/Makefile
+++ b/biology/py-bx-python/Makefile
@@ -1,24 +1,25 @@
 PORTNAME=	bx-python
 DISTVERSION=	0.8.13
+PORTREVISION=	1
 CATEGORIES=	biology python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Python module for reading, manipulating and writing genomic data sets
 WWW=		https://github.com/bxlab/bx-python
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 PY_DEPENDS=	${PYNUMPY}
 BUILD_DEPENDS=	${PY_DEPENDS}
 RUN_DEPENDS=	${PY_DEPENDS}
 
 USES=		compiler python:3.6+
 USE_PYTHON=	autoplist cython distutils
 
 post-install:
 	@${FIND} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/bx -name "*.so" | ${XARGS} ${STRIP_CMD}
 
 .include <bsd.port.mk>
diff --git a/biology/py-crossmap/Makefile b/biology/py-crossmap/Makefile
index 5f1dff2d0915..67ae7bd8f964 100644
--- a/biology/py-crossmap/Makefile
+++ b/biology/py-crossmap/Makefile
@@ -1,25 +1,26 @@
 PORTNAME=	crossmap
 DISTVERSION=	0.5.4
+PORTREVISION=	1
 CATEGORIES=	biology python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	CrossMap-${DISTVERSION}
 
 MAINTAINER=	jwb@FreeBSD.org
 COMMENT=	Lift over genomics coordinates between assemblies
 WWW=		https://pypi.python.org/pypi/crossmap
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0.10.4:devel/py-nose@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pysam>0:biology/py-pysam@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}bx-python>0:biology/py-bx-python@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyBigWig>0:biology/py-pybigwig@${PY_FLAVOR}
 
 USES=		python:3.5+
 USE_PYTHON=	autoplist concurrent cython distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/biology/py-deeptools/Makefile b/biology/py-deeptools/Makefile
index db4b8c185b06..ed02955d1ad3 100644
--- a/biology/py-deeptools/Makefile
+++ b/biology/py-deeptools/Makefile
@@ -1,27 +1,28 @@
 PORTNAME=	deepTools
 DISTVERSION=	3.5.1
+PORTREVISION=	1
 CATEGORIES=	biology python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	jwb@FreeBSD.org
 COMMENT=	User-friendly tools for exploring deep-sequencing data
 WWW=		https://github.com/deeptools/deepTools
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=0.17.0:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>=3.3.0:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pysam>=0.14.0:biology/py-pysam@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}py2bit>=0.3.0:biology/py-py2bit@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpydoc>=0.5:textproc/py-numpydoc@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyBigWig>=0.3.18:biology/py-pybigwig@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}plotly>=4.9:graphics/py-plotly@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}deeptoolsintervals>=0.1.8:biology/py-deeptoolsintervals@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent distutils
 
 .include <bsd.port.mk>
diff --git a/biology/py-dna-features-viewer/Makefile b/biology/py-dna-features-viewer/Makefile
index 34ce4f67b45d..bc5cb23aaa2c 100644
--- a/biology/py-dna-features-viewer/Makefile
+++ b/biology/py-dna-features-viewer/Makefile
@@ -1,23 +1,24 @@
 PORTNAME=	dna-features-viewer
 DISTVERSION=	3.1.2
+PORTREVISION=	1
 CATEGORIES=	biology python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	dna_features_viewer-${PORTVERSION}
 
 MAINTAINER=	jwb@FreeBSD.org
 COMMENT=	Python library to visualize DNA features, e.g. GenBank or Gff files
 WWW=		https://pypi.python.org/project/dna-features-viewer/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENCE.txt
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}matplotlib>=3:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}biopython>0:biology/py-biopython@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}bcbio-gff>0:biology/py-bcbio-gff@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist distutils
 
 .include <bsd.port.mk>
diff --git a/biology/py-ete3/Makefile b/biology/py-ete3/Makefile
index 8de1552e08e7..d4615b0ed948 100644
--- a/biology/py-ete3/Makefile
+++ b/biology/py-ete3/Makefile
@@ -1,29 +1,29 @@
 PORTNAME=	ete3
 DISTVERSION=	3.1.2
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	biology python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Framework for the analysis and visualization of trees
 WWW=		http://etetoolkit.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 PY_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
 BUILD_DEPENDS=	${PY_DEPENDS}
 RUN_DEPENDS=	${PY_DEPENDS}
 
 USES=		python:3.5+ pyqt:5 shebangfix
 USE_PYTHON=	distutils concurrent autoplist pytest # some tests fail, see https://github.com/etetoolkit/ete/issues/643
 USE_PYQT=	pyqt5
 
 SHEBANG_GLOB=	*.py
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/biology/py-goatools/Makefile b/biology/py-goatools/Makefile
index e1b5735f72fb..4bdaf3d2173b 100644
--- a/biology/py-goatools/Makefile
+++ b/biology/py-goatools/Makefile
@@ -1,30 +1,31 @@
 PORTNAME=	goatools
 DISTVERSION=	1.1.6
+PORTREVISION=	1
 CATEGORIES=	biology python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	jwb@FreeBSD.org
 COMMENT=	Tools for processing and visualizing Gene Ontology terms
 WWW=		https://pypi.python.org/pypi/goatools
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 # xlrd should be == 1.2.0
 RUN_DEPENDS=	${PKGNAMEPREFIX}pandas>0:math/py-pandas@${PY_FLAVOR} \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}XlsxWriter>0:textproc/py-xlsxwriter@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}statsmodels>0:math/py-statsmodels@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xlrd>0:textproc/py-xlrd@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}docopt>0:devel/py-docopt@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pydot>0:graphics/py-pydot@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pygraphviz>0:graphics/py-pygraphviz@${PY_FLAVOR} \
 		wget>0:ftp/wget
 
 USES=		python:3.6+
 USE_PYTHON=	autoplist distutils
 
 .include <bsd.port.mk>
diff --git a/biology/py-gtfparse/Makefile b/biology/py-gtfparse/Makefile
index 2f447defd103..fab7af876d73 100644
--- a/biology/py-gtfparse/Makefile
+++ b/biology/py-gtfparse/Makefile
@@ -1,21 +1,22 @@
 PORTNAME=	gtfparse
 DISTVERSION=	1.3.0
+PORTREVISION=	1
 CATEGORIES=	biology python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Parsing tools for GTF (gene transfer format) files
 WWW=		https://github.com/openvax/gtfparse
 
 LICENSE=	APACHE20
 
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}pandas>=0.15:math/py-pandas@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	distutils autoplist
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/biology/py-loompy/Makefile b/biology/py-loompy/Makefile
index 3695c54e2630..b2211e0e1b7f 100644
--- a/biology/py-loompy/Makefile
+++ b/biology/py-loompy/Makefile
@@ -1,27 +1,28 @@
 PORTNAME=	loompy
 DISTVERSION=	3.0.7
+PORTREVISION=	1
 CATEGORIES=	biology python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Work with .loom files for single-cell RNA-seq data
 WWW=		https://loompy.org/
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}h5py>0:science/py-h5py@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numba>0:devel/py-numba@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpy-groupies>0:math/py-numpy-groupies@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	distutils autoplist
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/biology/py-macs2/Makefile b/biology/py-macs2/Makefile
index d24b07a6e3b8..050437b65bbc 100644
--- a/biology/py-macs2/Makefile
+++ b/biology/py-macs2/Makefile
@@ -1,29 +1,30 @@
 PORTNAME=		macs2
 DISTVERSIONPREFIX=	v
 DISTVERSION=		2.2.7.1
+PORTREVISION=	1
 CATEGORIES=		biology python
 PKGNAMEPREFIX=		${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	jwb@FreeBSD.org
 COMMENT=	Identify transcription factor binding sites
 WWW=		https://github.com/taoliu/MACS
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYNUMPY}
 RUN_DEPENDS=	${PYNUMPY}
 
 USES=		python:3.6+
 USE_PYTHON=	autoplist concurrent cython distutils
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	taoliu
 GH_PROJECT=	MACS
 
 post-stage:
 	${STRIP_CMD} \
 		${STAGEDIR}${PYTHON_SITELIBDIR}/MACS2/*.so \
 		${STAGEDIR}${PYTHON_SITELIBDIR}/MACS2/*/*.so
 
 .include <bsd.port.mk>
diff --git a/biology/py-mrcfile/Makefile b/biology/py-mrcfile/Makefile
index 6e400b9951b2..f6708ad38f4c 100644
--- a/biology/py-mrcfile/Makefile
+++ b/biology/py-mrcfile/Makefile
@@ -1,21 +1,22 @@
 PORTNAME=	mrcfile
 DISTVERSION=	1.4.3
+PORTREVISION=	1
 CATEGORIES=	biology python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	MRC file I/O library which is used in structural biology
 WWW=		https://github.com/ccpem/mrcfile
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	${PYNUMPY}
 
 USES=		python
 USE_PYTHON=	distutils concurrent autoplist
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/biology/py-multiqc/Makefile b/biology/py-multiqc/Makefile
index 3ff1eb4e220b..378e6522e8e0 100644
--- a/biology/py-multiqc/Makefile
+++ b/biology/py-multiqc/Makefile
@@ -1,38 +1,39 @@
 PORTNAME=	multiqc
 DISTVERSION=	1.10
+PORTREVISION=	1
 CATEGORIES=	biology python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	jwb@FreeBSD.org
 COMMENT=	Aggregate bioinformatics analysis reports across samples and tools
 WWW=		https://pypi.python.org/pypi/multiqc
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}future>0.14.0:devel/py-future@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}coloredlogs>0:devel/py-coloredlogs@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>=2.1.1:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}markdown>0:textproc/py-markdown@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}networkx>0:math/py-networkx@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}rich>0:textproc/py-rich@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>=4:devel/py-yaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}simplejson>0:devel/py-simplejson@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.9:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}lzstring>0:archivers/py-lzstring@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}spectra>=0.0.10:graphics/py-spectra@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}colormath>0:math/py-colormath@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 post-patch:
 	@${RM} ${WRKSRC}/multiqc/utils/config.py.orig
 
 .include <bsd.port.mk>
diff --git a/biology/py-ont-fast5-api/Makefile b/biology/py-ont-fast5-api/Makefile
index ea5d333722eb..e154ea248556 100644
--- a/biology/py-ont-fast5-api/Makefile
+++ b/biology/py-ont-fast5-api/Makefile
@@ -1,43 +1,44 @@
 PORTNAME=	ont-fast5-api
 DISTVERSIONPREFIX=	release_
 DISTVERSION=	4.0.2
+PORTREVISION=	1
 CATEGORIES=	biology python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	jwb@FreeBSD.org
 COMMENT=	Interface to HDF5 files in Oxford Nanopore .fast5 format
 WWW=		https://pypi.python.org/pypi/ont_fast5_api
 
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 LIB_DEPENDS=	libvbz_hdf_plugin.so:archivers/vbz-compression
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}h5py>=2.2.0:science/py-h5py@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}progressbar>0:misc/py-progressbar@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pip>=0:devel/py-pip@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent distutils
 USE_GITHUB=	yes
 
 GH_ACCOUNT=	nanoporetech
 GH_PROJECT=	ont_fast5_api
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 post-patch:
 	${RM} ${WRKSRC}/ont_fast5_api/vbz_plugin/*
 
 pre-configure:
 	@${REINPLACE_CMD} -e 's|progressbar33|progressbar|g' \
 		${WRKSRC}/setup.py \
 		${WRKSRC}/README.rst \
 		${WRKSRC}/ont_fast5_api/conversion_tools/conversion_utils.py
 
 do-test:
 	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test
 
 .include <bsd.port.mk>
diff --git a/biology/py-orange3-bioinformatics/Makefile b/biology/py-orange3-bioinformatics/Makefile
index a1d53866eb79..4c1a19696695 100644
--- a/biology/py-orange3-bioinformatics/Makefile
+++ b/biology/py-orange3-bioinformatics/Makefile
@@ -1,31 +1,32 @@
 PORTNAME=	orange3-bioinformatics
 DISTVERSION=	4.3.1
+PORTREVISION=	1
 CATEGORIES=	biology python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	Orange3-Bioinformatics-${DISTVERSION}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Orange add-on providing common functionality for bioinformatics
 WWW=		https://github.com/biolab/orange3-bioinformatics
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR}
 RUN_DEPENDS=	orange3>0:misc/orange3 \
 		${PYTHON_PKGNAMEPREFIX}Genesis-PyAPI>0:biology/py-Genesis-PyAPI@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}point-annotator>=2.0:math/py-point-annotator@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyclipper>=1.2.0:math/py-pyclipper@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests-cache>0:www/py-requests-cache@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}resdk>0:biology/py-resdk@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=1.5.0:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}serverfiles>0:misc/py-serverfiles@${PY_FLAVOR}
 
 USES=		python:3.4+
 USE_PYTHON=	distutils autoplist
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/biology/py-orange3-single-cell/Makefile b/biology/py-orange3-single-cell/Makefile
index fa04f5481e29..3b2926c0d26f 100644
--- a/biology/py-orange3-single-cell/Makefile
+++ b/biology/py-orange3-single-cell/Makefile
@@ -1,41 +1,41 @@
 PORTNAME=	orange3-single-cell
 DISTVERSION=	0.8.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	biology python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Orange add-on for gene expression of single cell data
 WWW=		https://singlecell.biolab.si/
 
 LICENSE=	AGPLv3+
 
 RUN_DEPENDS=	orange3>0:misc/orange3 \
 		${PYTHON_PKGNAMEPREFIX}orange3-bioinformatics>0:biology/py-orange3-bioinformatics@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}astropy>0:astro/py-astropy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}fastdtw>0:math/py-fastdtw@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}joblib>=0.11:devel/py-joblib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}loompy>=2.0.10:biology/py-loompy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}networkx>0:math/py-networkx@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pandas>=0.23:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-learn>0:science/py-scikit-learn@${PY_FLAVOR} \
 		${PYNUMPY}
 
 # Supports 3.4+ but loompy 3.6+ only.
 USES=		python:3.7+
 USE_GITHUB=	yes
 GH_ACCOUNT=	biolab
 USE_PYTHON=	distutils autoplist
 
 OPTIONS_DEFINE=	DOCS
 
 DOCS_BUILD_DEPENDS=	gmake:devel/gmake \
 			${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR}
 
 pre-build-DOCS-on:
 	@cd ${WRKSRC}/doc && ${SETENV} ${MAKE_ENV} ${GMAKE} html htmlhelp SPHINXBUILD=${LOCALBASE}/bin/sphinx-build-${PYTHON_VER}
 
 pre-build-DOCS-off:
 	@${REINPLACE_CMD} "s|^    include_documentation|    #include_documentation|" ${WRKSRC}/setup.py
 
 .include <bsd.port.mk>
diff --git a/biology/py-pandas-charm/Makefile b/biology/py-pandas-charm/Makefile
index c3eb4437176c..fd591f956058 100644
--- a/biology/py-pandas-charm/Makefile
+++ b/biology/py-pandas-charm/Makefile
@@ -1,22 +1,22 @@
 PORTNAME=	pandas-charm
 DISTVERSION=	0.3.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	biology python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Library for getting character matrices into and out of pandas
 WWW=		https://github.com/jmenglund/pandas-charm
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	distutils autoplist
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/biology/py-resdk/Makefile b/biology/py-resdk/Makefile
index 26507db29a15..f4720f68bfe2 100644
--- a/biology/py-resdk/Makefile
+++ b/biology/py-resdk/Makefile
@@ -1,41 +1,41 @@
 PORTNAME=	resdk
 DISTVERSION=	16.0.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	biology python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Resolwe SDK to interact with Resolwe server and Resolwe Bioinformatics
 WWW=		https://github.com/genialis/resolwe-bio-py
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}setuptools_scm>=6.4.0:devel/py-setuptools_scm@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	\
 		${PYTHON_PKGNAMEPREFIX}aiohttp>0:www/py-aiohttp@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}boto3>0:www/py-boto3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}botocore-stubs>0:www/py-botocore-stubs@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}chardet<=4.0.0,1:textproc/py-chardet@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}openpyxl>0:textproc/py-openpyxl@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pandas>=1.0.0:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytz>=2018.4:devel/py-pytz@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.6.0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}slumber>=0.7.1:www/py-slumber@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tqdm>0:misc/py-tqdm@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tzlocal>=1.5.1:devel/py-tzlocal@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wrapt>0:devel/py-wrapt@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xlrd>0:textproc/py-xlrd@${PY_FLAVOR}
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}mypy-boto3-s3>0:devel/py-mypy-boto3-s3@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_PYTHON=	pep517 autoplist pytest
 
 NO_ARCH=	yes
 
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 
 .include <bsd.port.mk>
diff --git a/biology/py-scikit-bio/Makefile b/biology/py-scikit-bio/Makefile
index 7baf8e6e4eda..69d78f73d8b0 100644
--- a/biology/py-scikit-bio/Makefile
+++ b/biology/py-scikit-bio/Makefile
@@ -1,49 +1,50 @@
 PORTNAME=	scikit-bio
 DISTVERSION=	0.5.8
+PORTREVISION=	1
 CATEGORIES=	biology education python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Data structures, algorithms, educational resources for bioinformatics
 WWW=		http://scikit-bio.org/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BROKEN_aarch64=	fails to build: invalid conversion between vector type '__m64' (vector of 1 'long long' value) and integer type 'int' of different size, see https://github.com/biocore/scikit-bio/issues/1816
 
 BUILD_DEPENDS=	${PYNUMPY}
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}CacheControl>=0.11.5:www/py-cachecontrol@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}decorator>=3.4.2:devel/py-decorator@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}h5py>=2.9.0:science/py-h5py@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}hdmedians>=0.14.1:math/py-hdmedians@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ipython>=3.2.0:devel/ipython@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}lockfile>=0.10.2:devel/py-lockfile@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>=1.4.3:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}natsort>=4.0.3:devel/py-natsort@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pandas>=1.0.0:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-learn>=0.19.1:science/py-scikit-learn@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=1.3.0:science/py-scipy@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	distutils cython autoplist pytest # tests fail to run, see https://github.com/biocore/scikit-bio/issues/1846
 
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 
 CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}ddtrace # lib/python3.8/site-packages/benchmarks/__init__.py
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == i386
 CFLAGS+=	-msse2 # workaround for https://github.com/biocore/scikit-bio/issues/1727
 CXXFLAGS+=	-msse2
 .endif
 
 post-install:
 	@${STRIP_CMD} \
 		${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/skbio/*/*${PYTHON_EXT_SUFFIX}.so \
 		${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/skbio/*/*/*${PYTHON_EXT_SUFFIX}.so
 
 .include <bsd.port.mk>
diff --git a/biology/pyfasta/Makefile b/biology/pyfasta/Makefile
index a5238eb14c5f..d3d5d25877d4 100644
--- a/biology/pyfasta/Makefile
+++ b/biology/pyfasta/Makefile
@@ -1,20 +1,20 @@
 PORTNAME=	pyfasta
 PORTVERSION=	0.5.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	biology python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Fast, memory-efficient, pythonic access to fasta sequence files
 WWW=		https://bitbucket.org/brentp/biostuff/src/
 
 LICENSE=	MIT
 
 BUILD_DEPENDS=	${PYNUMPY}
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		python:3.6+
 USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/biology/rampler/Makefile b/biology/rampler/Makefile
index 0de5760c12fe..ea120e8b7a51 100644
--- a/biology/rampler/Makefile
+++ b/biology/rampler/Makefile
@@ -1,25 +1,26 @@
 PORTNAME=	rampler
 DISTVERSION=	2.0.0
+PORTREVISION=	1
 CATEGORIES=	biology
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Standalone module for sampling genomic sequences
 WWW=		https://github.com/rvaser/rampler
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	bioparser>0:biology/bioparser \
 		${LOCALBASE}/include/biosoup/nucleic_acid.hpp:biology/biosoup
 
 USES=		cmake compiler:c++11-lang localbase
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	rvaser
 
 LDFLAGS+=	-lz
 
 PLIST_FILES=	bin/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/biology/rna-seq/Makefile b/biology/rna-seq/Makefile
index d7b50a9c24d7..6a4ff27e6aaf 100644
--- a/biology/rna-seq/Makefile
+++ b/biology/rna-seq/Makefile
@@ -1,26 +1,27 @@
 PORTNAME=	rna-seq
 DISTVERSION=	0.1.2
+PORTREVISION=	1
 CATEGORIES=	biology python
 MASTER_SITES=	# empty
 
 MAINTAINER=	jwb@FreeBSD.org
 COMMENT=	Metaport for RNA-Seq analysis
 WWW=		https://github.com/auerlab/
 
 LICENSE=	BSD2CLAUSE
 
 RUN_DEPENDS=	sra-tools>0:biology/sra-tools \
 		fastq-trim>0:biology/fastq-trim \
 		fastqc>0:biology/fastqc \
 		${PYTHON_PKGNAMEPREFIX}multiqc>0:biology/py-multiqc@${PY_FLAVOR} \
 		biolibc-tools>0:biology/biolibc-tools \
 		gffread>0:biology/gffread \
 		kallisto>0:biology/kallisto \
 		hisat2>0:biology/hisat2 \
 		samtools>0:biology/samtools \
 		fasda>0:biology/fasda \
 		webbrowser>0:www/webbrowser
 
 USES=		metaport python
 
 .include <bsd.port.mk>
diff --git a/biology/seqan3/Makefile b/biology/seqan3/Makefile
index 8937dfb0d812..b40ea02c1c63 100644
--- a/biology/seqan3/Makefile
+++ b/biology/seqan3/Makefile
@@ -1,40 +1,40 @@
 PORTNAME=	seqan3
 DISTVERSION=	3.2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	biology devel math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	C++ header-only library for biological sequence analysis
 WWW=		https://github.com/seqan/seqan3
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 HPP_DEPENDS=	cereal>0:devel/cereal \
 		range-v3>0:devel/range-v3
 BUILD_DEPENDS=	${HPP_DEPENDS}
 RUN_DEPENDS=	${HPP_DEPENDS} \
 		coin-or-lemon>0:math/lemon
 
 USES=		cmake localbase
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	seqan
 GH_TUPLE=	xxsds:sdsl-lite:cf9ff4a:sdsl_lite/submodules/sdsl-lite
 
 USE_GCC=	yes # tests only pass with gcc, see https://github.com/seqan/seqan3/issues/2643, otherwise gcc isn't needed because this is a header-only library
 
 TEST_WRKSRC=	${WRKSRC}/.test
 
 NO_ARCH=	yes
 
 post-install:
 	@${RM} -r ${STAGEDIR}${DOCSDIR}
 
 do-test:
 	@${MKDIR} ${TEST_WRKSRC} && cd ${TEST_WRKSRC} && \
 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} ${WRKSRC}/test/unit && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
 		ctest
 
 .include <bsd.port.mk>
diff --git a/biology/sigviewer/Makefile b/biology/sigviewer/Makefile
index 915dd10649ca..82f9064fd2d4 100644
--- a/biology/sigviewer/Makefile
+++ b/biology/sigviewer/Makefile
@@ -1,32 +1,32 @@
 PORTNAME=	sigviewer
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.6.4-13
-PORTREVISION=	1
+PORTREVISION=	2
 DISTVERSIONSUFFIX=	-gf62f8d9
 CATEGORIES=	biology
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Viewing application for biosignals
 WWW=		https://github.com/cbrnr/sigviewer
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libbiosig.so:biology/biosig \
 		libxdf.so:misc/libxdf
 
 USES=		gl qmake qt:5
 USE_QT=		core gui widgets xml qmake:build buildtools:build
 USE_GL=		gl
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	cbrnr
 
 CXXFLAGS+=	-D__LITTLE_ENDIAN
 
 PLIST_FILES=	bin/sigviewer
 
 do-install: # see https://github.com/cbrnr/sigviewer/issues/130
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/bin/release/sigviewer ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/biology/spoa/Makefile b/biology/spoa/Makefile
index 163a9fb07918..bf258c57ffe4 100644
--- a/biology/spoa/Makefile
+++ b/biology/spoa/Makefile
@@ -1,45 +1,45 @@
 PORTNAME=	spoa
 DISTVERSION=	4.0.7
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	biology
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	C++ implementation of the partial order alignment (POA) algorithm
 WWW=		https://github.com/rvaser/spoa
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	bioparser>0:biology/bioparser \
 		${LOCALBASE}/include/biosoup/nucleic_acid.hpp:biology/biosoup \
 		cereal>0:devel/cereal \
 		simde>0:devel/simde
 LIB_DEPENDS=	libcpu_features.so:devel/cpu_features
 RUN_DEPENDS=	cereal>0:devel/cereal
 TEST_DEPENDS=	googletest>0:devel/googletest
 
 USES=		cmake compiler:c++11-lang localbase:ldflags
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	rvaser
 
 CMAKE_ON=	BUILD_SHARED_LIBS spoa_optimize_for_portability spoa_build_executable spoa_use_simde spoa_use_simde_nonvec spoa_use_simde_openmp
 CMAKE_OFF=	spoa_optimize_for_native
 
 CXXFLAGS+=	-I${LOCALBASE}/include/cpu_features
 LDFLAGS+=	-lz -lcpu_features
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == amd64 || ${ARCH} == i386
 CMAKE_ARGS+=	-Dspoa_generate_dispatch:BOOL=ON
 .endif
 
 do-test:
 	@cd ${BUILD_WRKSRC} && \
 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -D${PORTNAME}_build_tests:BOOL=ON ${CMAKE_SOURCE_PATH} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
 		${BUILD_WRKSRC}/bin/${PORTNAME}_test
 
 .include <bsd.port.mk>
diff --git a/biology/sra-tools/Makefile b/biology/sra-tools/Makefile
index 77a5b54b0416..b7a0da7240bf 100644
--- a/biology/sra-tools/Makefile
+++ b/biology/sra-tools/Makefile
@@ -1,109 +1,109 @@
 PORTNAME=	sra-tools
 DISTVERSION=	2.11.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	biology
 
 MAINTAINER=	jwb@FreeBSD.org
 COMMENT=	NCBI's toolkit for handling data in INSDC Sequence Read Archives
 WWW=		https://github.com/ncbi/sra-tools/wiki
 
 LICENSE=		PD LGPL21+
 LICENSE_COMB=		multi
 LICENSE_FILE_PD=	${WRKSRC}/LICENSE
 LICENSE_DISTFILES_LGPL21+ =
 
 ONLY_FOR_ARCHS=		amd64
 ONLY_FOR_ARCHS_REASON=	NCBI-VDB requires SSE2 instructions, no 32-bit support
 
 BUILD_DEPENDS=	bash:shells/bash \
 		${LOCALBASE}/lib/libngs-c++.a:biology/ngs-sdk
 LIB_DEPENDS=	libxml2.so:textproc/libxml2 \
 		libhdf5.so:science/hdf5 \
 		libepoll-shim.so:devel/libepoll-shim
 
 USES=		compiler:c11 gmake localbase:ldflags perl5 shebangfix
 USE_PERL5=	build
 USE_GITHUB=	yes
 
 SHEBANG_GLOB=	*.sh *.pl
 GH_ACCOUNT=	ncbi
 GH_TUPLE+=	ncbi:ngs:${DISTVERSION}:ngs/ngs # ported as biology/ngs-sdk
 GH_TUPLE+=	ncbi:ncbi-vdb:${DISTVERSION}:vdb/ncbi-vdb
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-ngs-sdk-prefix=${LOCALBASE} \
 		--with-ncbi-vdb-sources=${NCBI_VDB_WRKSRC} \
 		--with-xml2-prefix=${LOCALBASE} \
 		--with-hdf5-prefix=${LOCALBASE} \
 		CC="${CC}" CXX="${CXX}" TOOLS="${CHOSEN_COMPILER_TYPE}" \
 		--with-ncbi-vdb-build=${NCBI_VDB_WRKSRC}/amd64-portbld-freebsd$$(${FREEBSD_RELEASE})
 MAKE_ARGS=	CCNAME=${CC} CXXNAME=${CXX} PKGCFLAGS="${CFLAGS}" \
 		INST_ETCDIR=${STAGEDIR}${PREFIX}/etc
 
 NCBI_VDB_WRKSRC=	${WRKSRC}/ncbi-vdb
 NCBI_VDB_FILESDIR=	${FILESDIR}
 FREEBSD_RELEASE=	uname -r | cut -d - -f 1
 
 CFLAGS+=	-I${WRKSRC}/interfaces/os/sun
 CXXFLAGS+=	-I${WRKSRC}/interfaces/os/sun
 
 CONFLICTS_INSTALL=	kget
 
 BINARY_ALIAS=	gcc=${CC} g++=${CXX}
 
 # for port developers, building with these options may fail
 OPTIONS_DEFINE=		DEBUG OPTIMIZED_CFLAGS TEST
 DEBUG_PREVENTS=		OPTIMIZED_CFLAGS
 DEBUG_CONFIGURE_WITH=	debug
 OPTIMIZED_CFLAGS_MAKE_ARGS_OFF=	OPT=""
 TEST_TEST_TARGET=	test
 TEST_USES=		python
 
 # ncbi-vdb build extras
 VDB_CONFIGURE_ARGS=	\
 		--with-xml2-prefix=${LOCALBASE} \
 		--with-hdf5-prefix=${LOCALBASE} \
 		--prefix=${PREFIX} \
 		--build=amd64-portbld-freebsd$$(${FREEBSD_RELEASE}) \
 		CC="${CC}" CXX="${CXX}" TOOLS="${CHOSEN_COMPILER_TYPE}"
 VDB_MAKE_ARGS+=	-j 1 CCNAME=${CC} CXXNAME=${CXX} PKGCFLAGS="${CFLAGS}"
 MAKE_ENV+=	CPATH="${LOCALBASE}/include/libepoll-shim"
 CFLAGS+=	-I${WRKSRC}/lib
 
 pre-patch:
 	@${CP} ${FILESDIR}/Makefile.bsd ${NCBI_VDB_WRKSRC}/build/
 	@${CP} ${FILESDIR}/ld.bsd.*.sh ${NCBI_VDB_WRKSRC}/build/
 	@${MKDIR} ${NCBI_VDB_WRKSRC}/interfaces/os/bsd
 	@${CP} -p ${NCBI_VDB_WRKSRC}/interfaces/os/mac/endian.h \
 		${NCBI_VDB_WRKSRC}/interfaces/os/bsd/
 
 post-patch:
 	@${GREP} -q '@@PREFIX@@' ${WRKSRC}/ncbi-vdb/libs/kfg/config.c || (echo "@@PREFIX@@ in file/patch-libs_kfg_config.c is overwritten probably due to using 'make makepatch'"; exit 1)
 	@${REINPLACE_CMD} -e 's#@@PREFIX@@#"${PREFIX}"#' ${WRKSRC}/ncbi-vdb/libs/kfg/config.c
 	@${LN} -s ${WRKSRC}/ncbi-vdb/interfaces/cc/gcc/x86_64 ${WRKSRC}/ncbi-vdb/interfaces/cc/gcc/amd64
 
 post-patch-TEST-on:
 	@${REINPLACE_CMD} -e 's|python|${PYTHON_CMD}|' ${WRKSRC}/test/kget/Makefile
 
 pre-configure:
 	@${CP} ${NCBI_VDB_WRKSRC}/setup/os-arch.prl ${WRKSRC}/setup/os-arch.prl
 	# same as in biology/ncbi-vdb
 	@${CP} ${NCBI_VDB_FILESDIR}/Makefile.bsd ${WRKSRC}/build/
 	@${CP} ${NCBI_VDB_WRKSRC}/build/ld.bsd.*.sh ${WRKSRC}/build/
 	@${MKDIR} ${WRKSRC}/interfaces/override
 	@${CP} ${NCBI_VDB_WRKSRC}/interfaces/os/sun/atomic32.h ${WRKSRC}/interfaces/override
 	@${CP} ${FILESDIR}/byteswap.h ${WRKSRC}/interfaces/override
 	@cd ${WRKSRC}/ncbi-vdb && ./configure ${VDB_CONFIGURE_ARGS}
 	@${ECHO} ${CHOSEN_COMPILER_TYPE} > ${WRKSRC}/ncbi-vdb/build/COMP
 	@cd ${WRKSRC}/ncbi-vdb && ${DO_MAKE_BUILD} ${VDB_MAKE_ARGS}
 
 post-build-TEST-on:	do-test
 
 do-install:
 	cd ${WRKSRC}/amd64-portbld-freebsd*/sra-tools/bsd/clang/*/rel/bin && \
 	    for f in `ls *.${PORTVERSION}`; do \
 		${INSTALL_PROGRAM} $${f} \
 		${STAGEDIR}${PREFIX}/bin/`basename $${f%%.${PORTVERSION}}`; \
 	done
 
 .include <bsd.port.mk>
diff --git a/biology/treekin/Makefile b/biology/treekin/Makefile
index 3495feedc09f..ebc657485491 100644
--- a/biology/treekin/Makefile
+++ b/biology/treekin/Makefile
@@ -1,29 +1,29 @@
 PORTNAME=	treekin
 DISTVERSION=	0.5.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	biology
 MASTER_SITES=	https://www.tbi.univie.ac.at/RNA/packages/source/
 DISTNAME=	Treekin-${DISTVERSION}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Efficient computation of RNA folding dynamics
 WWW=		https://www.tbi.univie.ac.at/RNA/Treekin/
 
 LICENSE=	LatticeLib
 LICENSE_NAME=	LatticeLib Disclaimer and Copyright
 LICENSE_FILE=	${WRKSRC}/COPYING
 LICENSE_PERMS=	auto-accept dist-mirror pkg-mirror
 
 BUILD_DEPENDS=	lapacke>0:math/lapacke
 
 USES=		blaslapack:netlib compiler:c++11-lang fortran gmake \
 		localbase:ldflags
 
 GNU_CONFIGURE=	yes
 
 BINARY_ALIAS=	make=${GMAKE}
 
 PLIST_FILES=	bin/${PORTNAME} \
 		man/man1/${PORTNAME}.1.gz
 
 .include <bsd.port.mk>
diff --git a/cad/PrusaSlicer/Makefile b/cad/PrusaSlicer/Makefile
index 341ce3cfe30d..6a7ee361db0d 100644
--- a/cad/PrusaSlicer/Makefile
+++ b/cad/PrusaSlicer/Makefile
@@ -1,50 +1,51 @@
 PORTNAME=	PrusaSlicer
 DISTVERSIONPREFIX=version_
 DISTVERSION=	2.5.1
+PORTREVISION=	1
 CATEGORIES=	cad
 
 MAINTAINER=	teodorsigaev@gmail.com
 COMMENT=	Slicing application for 3D printers
 WWW=		https://www.prusa3d.com/prusaslicer/
 
 LICENSE=	AGPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	cereal>=1.3.0.10:devel/cereal \
 		cgal>=5.0.2:math/cgal \
 		opencascade>=7.7.0:cad/opencascade
 LIB_DEPENDS=	libtbb.so:devel/onetbb \
 		libboost_log.so:devel/boost-libs \
 		libImath.so:math/Imath \
 		libnlopt.so:math/nlopt \
 		libcurl.so:ftp/curl \
 		libexpat.so:textproc/expat2 \
 		libopenvdb.so:misc/openvdb \
 		libgmp.so:math/gmp \
 		libmpfr.so:math/mpfr \
 		libdbus-1.so:devel/dbus \
 		libpng.so:graphics/png \
 		libTKXDESTEP.so:cad/opencascade \
 		libtiff.so:graphics/tiff \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreeimage.so:graphics/freeimage \
 		libfreetype.so:print/freetype2 \
 		libavcodec.so:multimedia/ffmpeg \
 		libharfbuzz.so:print/harfbuzz
 
 USES=		cmake cpe desktop-file-utils eigen:3 gettext gl pkgconfig jpeg iconv gnome xorg
 CPE_VENDOR=	prusa3d
 USE_GITHUB=	yes
 GH_ACCOUNT=	prusa3d
 USE_GL=		gl glu glew
 USE_GNOME=	gtk30 pango atk cairo gdkpixbuf2 glib20
 USE_WX=		3.2
 USE_XORG=	x11
 
 CMAKE_ARGS+=	-DwxWidgets_CONFIG_EXECUTABLE="${WX_CONFIG}" \
 		-DSLIC3R_GTK=3 \
 		-DSLIC3R_FHS=1
 
 PORTDATA=	*
 
 .include <bsd.port.mk>
diff --git a/cad/alliance/Makefile b/cad/alliance/Makefile
index 04d9855e7e1b..a0fb74e5c58c 100644
--- a/cad/alliance/Makefile
+++ b/cad/alliance/Makefile
@@ -1,73 +1,73 @@
 PORTNAME=	alliance
 DISTVERSION=	5.1.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	cad
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Complete set of CAD tools and libraries for VLSI design
 WWW=		http://coriolis.lip6.fr/
 
 LICENSE=	Alliance
 LICENSE_NAME=	Alliance VLSI Cad System License
 LICENSE_FILE=	${WRKSRC}/LICENCE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 BROKEN_aarch64=	fails to link: collect2: error: ld returned 1 exit status
 
 BUILD_DEPENDS=	fig2dev:print/fig2dev
 
 USE_GITLAB=	yes
 GL_SITE=	https://gitlab.lip6.fr
 GL_ACCOUNT=	vlsi-eda
 GL_COMMIT=	ebece102e15c110fc79f1da50524c68fd9523f0c
 
 USES=		autoreconf:build gmake libtool magick:build motif tar:bz2 tex xorg
 USE_GCC=	yes
 USE_TEX=	dvipsk:build latex:build
 USE_XORG=	ice sm x11 xext xt
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ENV+=	ALLIANCE_TOP=${ALLIANCE_TOP} YACC=${YACC}
 CONFIGURE_ARGS+=--mandir=${MANPREFIX}/man \
 		--prefix=${ALLIANCE_TOP} \
 		--enable-alc-shared \
 		--enable-shared
 USE_LDCONFIG=	${ALLIANCE_TOP}/lib
 
 MAKE_JOBS_UNSAFE=	yes
 INSTALL_TARGET=	install-strip
 CFLAGS+=	-fcommon
 
 CONFLICTS_INSTALL=	ocp publib
 
 SUB_FILES=	pkg-message
 WRKSRC_SUBDIR=	alliance/src
 
 ALLIANCE_TOP=	${PREFIX}/alliance
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 pre-configure:
 	${REINPLACE_CMD} -e '/include <malloc.h>/d' \
 		${WRKSRC}/xgra/src/XSB_parse.c
 # Recursive make commands should always use the variable MAKE, not the
 # explicit command name `make' (see the GNU make manual, section 5.7.1)
 	${REINPLACE_CMD} -e 's/; make/; $$(MAKE)/' \
 		${WRKSRC}/documentation/Makefile.am \
 		${WRKSRC}/documentation/alliance-examples/Makefile \
 		${WRKSRC}/documentation/tutorials/Makefile.am
 	${RM} ${WRKSRC}/documentation/tutorials/Makefile.am.bak	\
 		${WRKSRC}/documentation/alliance-examples/Makefile.bak
 	cd ${WRKSRC} && ./autostuff
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${ALLIANCE_TOP}/tutorials
 	(cd ${WRKSRC}/documentation/tutorials &&	\
 		${COPYTREE_SHARE} . ${STAGEDIR}${ALLIANCE_TOP}/tutorials)
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${ALLIANCE_TOP}/examples
 	(cd ${WRKSRC}/documentation/alliance-examples &&	\
 		${COPYTREE_SHARE} . ${STAGEDIR}${ALLIANCE_TOP}/examples)
 
 .include <bsd.port.mk>
diff --git a/cad/appcsxcad/Makefile b/cad/appcsxcad/Makefile
index 5d9e2e08c5c8..a1d0c786eb8f 100644
--- a/cad/appcsxcad/Makefile
+++ b/cad/appcsxcad/Makefile
@@ -1,44 +1,44 @@
 PORTNAME=	appcsxcad
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.2.2-9
 DISTVERSIONSUFFIX=	-g97ba30e
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	cad
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Minimal GUI Application using the QCSXCAD library
 WWW=		https://github.com/thliebig/AppCSXCAD
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libCSXCAD.so:cad/csxcad \
 		libexpat.so:textproc/expat2 \
 		libfreetype.so:print/freetype2 \
 		libhdf5.so:science/hdf5 \
 		libpng16.so:graphics/png \
 		libQCSXCAD.so:cad/qcsxcad \
 		libsz.so:science/libaec \
 		libtiff.so:graphics/tiff \
 		libvtkCommonCore-${VTK_VER}.so:math/vtk${VTK_VER:R}
 
 USES=		cmake jpeg pkgconfig qt:5 xorg
 USE_QT=		core gui sql widgets xml buildtools:build qmake:build
 USE_XORG=	ice sm x11 xext xt
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	thliebig
 GH_PROJECT=	AppCSXCAD
 
 CMAKE_ARGS=	-DVTK_DIR=${LOCALBASE}/lib/cmake/vtk-${VTK_VER}
 
 PLIST_FILES=	bin/AppCSXCAD
 
 post-install:
 	@${RM} ${STAGEDIR}${PREFIX}/bin/AppCSXCAD.sh # shell script is only needed for Matlab
 
 # an example of file that AppCSXCAD opens (zipped): http://openems.de/forum/download/file.php?id=418&sid=6daebbb2df72b415fa2ec7031ffa6ca9
 
 .include <../../math/vtk9/Makefile.version>
 .include <bsd.port.mk>
diff --git a/cad/calculix-ccx/Makefile b/cad/calculix-ccx/Makefile
index d3ac6631ad12..447fda6960d9 100644
--- a/cad/calculix-ccx/Makefile
+++ b/cad/calculix-ccx/Makefile
@@ -1,83 +1,84 @@
 PORTNAME=	ccx
 PORTVERSION=	2.20
+PORTREVISION=	1
 CATEGORIES=	cad
 MASTER_SITES=	http://www.dhondt.de/
 PKGNAMEPREFIX=	CalculiX-
 DISTFILES=	${DIST_SOURCES}
 DIST_SUBDIR=	calculix
 EXTRACT_ONLY=	${DIST_SOURCES}
 
 MAINTAINER=	rsmith@xs4all.nl
 COMMENT=	Three-Dimensional Structural Finite Element Program
 WWW=		http://www.calculix.de/
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libarpack.so:math/arpack-ng	\
 		libspooles.so:math/spooles
 
 USES=		blaslapack fortran gmake perl5 tar:bzip2
 USE_PERL5=	build
 
 DIST_SOURCES=	ccx_${PORTVERSION}.src${EXTRACT_SUFX}
 DIST_HTM=	ccx_${PORTVERSION}.htm${EXTRACT_SUFX}
 DIST_PDF=	ccx_${PORTVERSION}.pdf
 DIST_EXAMPLES=	ccx_${PORTVERSION}.test${EXTRACT_SUFX}
 
 ALL_TARGET=	#Empty
 
 CCX_VER=	ccx_${PORTVERSION}
 DOCSDIR=	${PREFIX}/share/doc/CalculiX
 WRKSRC=		${WRKDIR}/CalculiX/${CCX_VER}/src
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDOCS}
 DISTFILES+=	${DIST_HTM} ${DIST_PDF}
 EXTRACT_ONLY+=	${DIST_HTM}
 .endif
 
 .if $(PORT_OPTIONS:MEXAMPLES)
 DISTFILES+=	${DIST_EXAMPLES}
 EXTRACT_ONLY+=	${DIST_EXAMPLES}
 .endif
 
 .if ${ARCH} == "sparc64"
 CFLAGS+=	-fPIC
 FFLAGS+=	-fPIC
 .else
 CFLAGS+=	-fpic
 FFLAGS+=	-fpic
 .endif
 
 .if ${GCC_DEFAULT} >= 10
 # workaround for Missing actual argument for argument '_formal_15' at (1)
 FFLAGS+=	-fallow-argument-mismatch
 .endif
 
 pre-build:
 	@${REINPLACE_CMD} -e 's+%%FC%%+${FC}+g ; s+%%CC%%+${CC}+g ; \
 	s+%%BLAS_LIBS%%+${BLASLIB}+ ; \
 	s+%%LAPACK_LIBS%%+${LAPACKLIB}+ ; \
 	s+%%LOCALBASE%%+${LOCALBASE}+g;' \
 		${WRKSRC}/Makefile
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${CCX_VER} \
 	  ${STAGEDIR}${PREFIX}/bin/ccx
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@(cd ${WRKDIR}/CalculiX/${CCX_VER}/doc/ccx && ${COPYTREE_SHARE} . \
 		${STAGEDIR}${DOCSDIR}/ccx)
 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${DIST_PDF} \
 		${STAGEDIR}${DOCSDIR}
 
 do-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	@(cd ${WRKDIR}/CalculiX/${CCX_VER}/test && ${COPYTREE_SHARE} . \
 	  ${STAGEDIR}${EXAMPLESDIR})
 
 .include <bsd.port.mk>
diff --git a/cad/calculix/Makefile b/cad/calculix/Makefile
index 1dd137a94ff8..ec4bab9992ab 100644
--- a/cad/calculix/Makefile
+++ b/cad/calculix/Makefile
@@ -1,92 +1,93 @@
 PORTNAME=	calculix
 PORTVERSION=	2.20
+PORTREVISION=	1
 CATEGORIES=	cad
 MASTER_SITES=	http://www.dhondt.de/
 DISTFILES=	${DIST_SOURCES}
 DIST_SUBDIR=	calculix
 EXTRACT_ONLY=	${DIST_SOURCES}
 
 MAINTAINER=	rsmith@xs4all.nl
 COMMENT=	Three-Dimensional Structural Finite Element Program
 WWW=		http://www.calculix.de/
 
 LICENSE=	GPLv2
 
 RUN_DEPENDS=	ccx:cad/calculix-ccx
 
 USES=		gl gmake tar:bzip2 compiler:c++11-lib xorg
 USE_XORG=	ice sm x11 xext xi xmu xt
 USE_GL=		gl glu # uses its own glut
 
 DIST_SOURCES=	cgx_${PORTVERSION}.all${EXTRACT_SUFX}
 DIST_HTM=	cgx_${PORTVERSION}.htm${EXTRACT_SUFX}
 DIST_PDF=	cgx_${PORTVERSION}.pdf
 DIST_EXAMPLES=	cgx_${PORTVERSION}.exa${EXTRACT_SUFX}
 
 WRKSRC=		${WRKDIR}/CalculiX
 CGX_VER=	cgx_${PORTVERSION}
 
 CXXFLAGS+=	-std=c++98
 
 BROWSER?=	firefox
 PSVIEWER?=	gv
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MEXAMPLES}
 DISTFILES+=	${DIST_EXAMPLES}
 EXTRACT_ONLY+=	${DIST_EXAMPLES}
 .endif
 
 .if ${PORT_OPTIONS:MDOCS}
 DISTFILES+=	${DIST_HTM} ${DIST_PDF}
 EXTRACT_ONLY+=	${DIST_HTM}
 DOCSDIR=	${PREFIX}/share/doc/CalculiX
 .endif
 
 .if ${ARCH} == "sparc64"
 CFLAGS+=	-fPIC
 FFLAGS+=	-fPIC
 .else
 CFLAGS+=	-fpic
 FFLAGS+=	-fpic
 .endif
 
 pre-build:
 	@${REINPLACE_CMD} -e 's!c++!${CXX}!g;' \
 		${WRKSRC}/libSNL/src/makefile
 	@${REINPLACE_CMD} -e 's+%%DOCSDIR%%+${DOCSDIR}+g; \
 	s+"firefox"+"${BROWSER}"+ ; \
 	s+"gv"+"${PSVIEWER}"+ ;' \
 		${WRKSRC}/${CGX_VER}/src/cgx.h
 	@${REINPLACE_CMD} -e 's!CalculiX/${CGX_VER}/doc!share/doc/CalculiX!g;' \
 		${WRKSRC}/${CGX_VER}/src/cgx.h
 
 do-build:
 	@(cd ${WRKSRC}/libSNL/src; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} )
 	@(cd ${WRKSRC}/${CGX_VER}/src; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} )
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${CGX_VER}/src/cgx \
 	  ${STAGEDIR}${PREFIX}/bin/cgx
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/cgx
 	@(cd ${WRKSRC}/${CGX_VER}/doc/cgx && ${COPYTREE_SHARE} . \
 	  ${STAGEDIR}${DOCSDIR}/cgx)
 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${DIST_PDF} \
 	  ${STAGEDIR}${DOCSDIR}
 .endif
 .if ${PORT_OPTIONS:MEXAMPLES}
 	# Some garbage crept in
 	@${RM} ${WRKSRC}/${CGX_VER}/examples/OpenFOAM/couette/constant/polyMesh/*~
 	@${RM} ${WRKSRC}/${CGX_VER}/examples/OpenFOAM/couette/constant/*~
 	@${RM} ${WRKSRC}/${CGX_VER}/examples/OpenFOAM/couette/system/*~
 	@${RM} ${WRKSRC}/${CGX_VER}/examples/ifwhiledemo/*.*~
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	@(cd ${WRKSRC}/${CGX_VER}/examples && ${COPYTREE_SHARE} . \
 	  ${STAGEDIR}${EXAMPLESDIR})
 .endif
 
 .include <bsd.port.mk>
diff --git a/cad/csxcad/Makefile b/cad/csxcad/Makefile
index 0e189625a090..2b3841cbe5fa 100644
--- a/cad/csxcad/Makefile
+++ b/cad/csxcad/Makefile
@@ -1,38 +1,38 @@
 PORTNAME=	csxcad
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.6.2-109
 DISTVERSIONSUFFIX=	-gcd9decb
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	cad
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	C++ library to describe geometrical objects
 WWW=		https://github.com/thliebig/CSXCAD
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	cgal>0:math/cgal
 LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 		libfparser-4.5.so:math/fparser \
 		libgmp.so:math/gmp \
 		libhdf5.so:science/hdf5 \
 		libmpfr.so:math/mpfr \
 		libpng16.so:graphics/png \
 		libsz.so:science/libaec \
 		libtiff.so:graphics/tiff \
 		libtinyxml.so:textproc/tinyxml \
 		libvtkCommonCore-${VTK_VER}.so:math/vtk${VTK_VER:R}
 
 USES=		cmake jpeg pkgconfig
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	thliebig
 GH_PROJECT=	${PORTNAME:tu}
 
 CMAKE_ARGS=	-DFPARSER_ROOT_DIR=${LOCALBASE} \
 		-DVTK_DIR=${LOCALBASE}/lib/cmake/vtk-${VTK_VER}
 
 .include <../../math/vtk9/Makefile.version>
 .include <bsd.port.mk>
diff --git a/cad/cura/Makefile b/cad/cura/Makefile
index 5843af957cca..7e827a673b4a 100644
--- a/cad/cura/Makefile
+++ b/cad/cura/Makefile
@@ -1,54 +1,54 @@
 PORTNAME=	Cura
 DISTVERSION=	4.13.1
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	2
 CATEGORIES=	cad
 DIST_SUBDIR=	Ultimaker
 
 MAINTAINER=	db@FreeBSD.org
 COMMENT=	Slicing application for 3D printers
 WWW=		https://github.com/Ultimaker/Cura/wiki
 
 LICENSE=	AGPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	Uranium>0,1:cad/uranium
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zeroconf>0:net/py-zeroconf@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyserial>0:comms/py-pyserial@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Shapely>0:devel/py-shapely@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpy-stl>0:math/py-numpy-stl@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}keyring>0:security/py-keyring@${PY_FLAVOR} \
 		qt5-graphicaleffects>0:graphics/qt5-graphicaleffects \
 		qt5-quickcontrols>0:x11-toolkits/qt5-quickcontrols \
 		qt5-quickcontrols2>0:x11-toolkits/qt5-quickcontrols2 \
 		Uranium>=${DISTVERSION}:cad/uranium \
 		libCharon>=4.13.0:net/libcharon \
 		CuraEngine>=${DISTVERSION}:cad/cura-engine \
 		fdm_materials>=4.13.0:cad/fdm_materials \
 		${PYTHON_PKGNAMEPREFIX}trimesh>0:devel/py-trimesh@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pynest2d>=4.12.1:devel/py-pynest2d@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sentry-sdk>0:devel/py-sentry-sdk@${PY_FLAVOR} \
 		libArcus>=${DISTVERSION}:net/libarcus \
 		libSavitar>=${DISTVERSION}:devel/libsavitar
 LIB_DEPENDS=	libArcus.so:net/libarcus \
 		libSavitar.so:devel/libsavitar
 
 USES=		cmake gettext shebangfix python:3.5+ pyqt:5 \
 		desktop-file-utils shared-mime-info
 USE_PYQT=	pyqt5
 CMAKE_ARGS+=	-DURANIUM_SCRIPTS_DIR:STRING="${LOCALBASE}/share/uranium/scripts" \
 	-DCURA_VERSION=${DISTVERSION}
 USE_GITHUB=	yes
 GH_ACCOUNT=	Ultimaker
 NO_ARCH=	yes
 SHEBANG_FILES=	cura_app.py
 
 pre-configure:
 	${REINPLACE_CMD} -e 's|%%DISTVERSION%%|${DISTVERSION}|' \
 		${WRKSRC}/CMakeLists.txt
 
 post-patch:
 	${REINPLACE_CMD} -e 's|%%PYTHON_CMD%%|${PYTHON_CMD}|' \
 		${WRKSRC}/cura_app.py
 
 .include <bsd.port.mk>
diff --git a/cad/cvc/Makefile b/cad/cvc/Makefile
index eebb52ff82ef..d644a837cf4e 100644
--- a/cad/cvc/Makefile
+++ b/cad/cvc/Makefile
@@ -1,29 +1,30 @@
 PORTNAME=	cvc
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.1.4
+PORTREVISION=	1
 CATEGORIES=	cad
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Circuit Validity Checker
 WWW=		https://github.com/d-m-bailey/cvc
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	pyinstaller:devel/py-pyinstaller@${PY_FLAVOR} \
 		bash:shells/bash
 
 USES=		autoreconf bison gettext-runtime gettext-tools gmake python readline shebangfix
 USE_GCC=	11 # clang fails, see https://github.com/d-m-bailey/cvc/issues/239
 		   # GCC 12 fails, see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=266189
 
 SHEBANG_FILES=	scripts/calibre_cvc scripts/clean_cvc_log scripts/expand_cells.py
 
 GNU_CONFIGURE=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	d-m-bailey
 
 MAKE_ARGS=	INTLLIBS=-lintl
 
 .include <bsd.port.mk>
diff --git a/cad/dinotrace/Makefile b/cad/dinotrace/Makefile
index 169b401bc49d..3e668c785b1a 100644
--- a/cad/dinotrace/Makefile
+++ b/cad/dinotrace/Makefile
@@ -1,43 +1,43 @@
 PORTNAME=	dinotrace
 PORTVERSION=	9.4f
-PORTREVISION=	2
+PORTREVISION=	4
 CATEGORIES=	cad
 MASTER_SITES=	http://www.veripool.org/ftp/
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Graphical signal trace waveform viewer
 WWW=		https://www.veripool.org/wiki/dinotrace
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		gmake motif perl5 tar:tgz xorg
 USE_XORG=	x11 sm ice xmu xt
 USE_PERL5=	build
 
 GNU_CONFIGURE=	yes
 
 CONFLICTS_INSTALL=	dinotrace dinotrace-emacs_*
 
 INFO=		dinotrace
 PLIST_FILES=	bin/dinotrace
 
 OPTIONS_DEFINE=	EMACS
 OPTIONS_DEFAULT=	EMACS
 EMACS_DESC=	Install Emacs supplimentary files
 
 EMACS_USES=	emacs:run
 EMACS_RUN_DEPENDS=	verilog-mode.el${EMACS_PKGNAMESUFFIX}>0:cad/verilog-mode.el@${EMACS_FLAVOR}
 EMACS_PLIST_FILES=	${EMACS_SITE_LISPDIR}/dinotrace.el ${EMACS_SITE_LISPDIR}/sim-log.el
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|"-O3"|""|' ${WRKSRC}/configure
 
 post-install-EMACS-on:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}
 .for F in dinotrace.el sim-log.el
 	${INSTALL_DATA} ${WRKSRC}/lisp/${F} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/cad/feappv/Makefile b/cad/feappv/Makefile
index 34ac659e6b2f..8703980bea95 100644
--- a/cad/feappv/Makefile
+++ b/cad/feappv/Makefile
@@ -1,48 +1,48 @@
 PORTNAME=	feappv
 PORTVERSION=	4.1i
-PORTREVISION=	4
+PORTREVISION=	5
 DISTVERSIONPREFIX=v
 CATEGORIES=	cad education science
 MASTER_SITES=	http://projects.ce.berkeley.edu/feap/${PORTNAME}/:1
 DISTFILES=	${PORTDOCS}:1
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Finite element analysis program (personal version)
 WWW=		http://projects.ce.berkeley.edu/feap/feappv/
 
 USES=		fortran gmake localbase:ldflags xorg
 USE_GITHUB=	yes
 GH_ACCOUNT=	sanjayg0
 USE_XORG=	x11
 MAKEFILE=	makefile
 MAKE_ENV=	FEAPPVHOME4_1="${WRKSRC}"
 ALL_TARGET=	install
 
 LDFLAGS+=	-lX11 -lm
 
 PLIST_FILES=	bin/feappv lib/libfeappv.a
 PORTDOCS=	manual41.pdf
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's| make | $$(MAKE) |' ${WRKSRC}/makefile
 	@${REINPLACE_CMD} -e \
 		'/^  FF /s|=.*|= ${FC}| ; \
 		 /^  CC /s|=.*|= ${CC}| ; \
 		 /^  FFOPTFLAG /s|=.*|= ${FFLAGS}| ; \
 		 /^  CCOPTFLAG /s|=.*|= ${CFLAGS}| ; \
 		 /^  LDOPTIONS /s|=.*|= ${LDFLAGS}| ; \
 		 s|Feappv.a|libfeappv.a|' ${WRKSRC}/makefile.in
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/main/feappv ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/libfeappv.a ${STAGEDIR}${PREFIX}/lib
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${_DISTDIR}/${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/cad/freecad/Makefile b/cad/freecad/Makefile
index ba1cc6a4ea8f..cf4996986313 100644
--- a/cad/freecad/Makefile
+++ b/cad/freecad/Makefile
@@ -1,104 +1,104 @@
 PORTNAME=	FreeCAD
 DISTVERSION=	0.20.2
-PORTREVISION=	1
+PORTREVISION=	2
 # use these for bugfixes/snapshots
 # DISTVERSION=	0.18-16093 # git rev-list --count
 # DISTVERSIONSUFFIX=	-g690774c0e
 CATEGORIES=	cad
 
 MAINTAINER=	cmt@FreeBSD.org
 COMMENT=	General purpose 3D CAD modeller
 WWW=		https://www.freecadweb.org/
 
 LICENSE=	LGPL20+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	pyside_tool.py:devel/pyside2-tools@${PY_FLAVOR} \
 		${PYTHON_SITELIBDIR}/matplotlib/__init__.py:math/py-matplotlib@${PY_FLAVOR} \
 		swig:devel/swig
 LIB_DEPENDS=	libexpat.so:textproc/expat2 \
 		libfreetype.so:print/freetype2 \
 		${PY_BOOST} \
 		libpyside2.cpython-${PYTHON_SUFFIX}${PYTHON_ABIVER}.so:devel/pyside2@${PY_FLAVOR} \
 		libCoin.so:graphics/Coin \
 		libpng.so:graphics/png \
 		libtiff.so:graphics/tiff \
 		libvtksys-${VTK_VER}.so:math/vtk${VTK_VER:R} \
 		libTKernel.so:cad/opencascade \
 		libxerces-c.so:textproc/xerces-c3 \
 		libboost_thread.so:devel/boost-libs \
 		libarea.so:devel/libarea \
 		libmed.so:french/med \
 		libshiboken2.cpython-${PYTHON_SUFFIX}${PYTHON_ABIVER}.so:devel/shiboken2@${PY_FLAVOR} \
 		libhdf5-110.so:science/hdf5-110
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pivy>0:graphics/py-pivy@${PY_FLAVOR} \
 		${PYTHON_SITELIBDIR}/matplotlib/__init__.py:math/py-matplotlib@${PY_FLAVOR}
 
 USES=		dos2unix compiler:c++17-lang cmake cpe gl eigen:3 fortran jpeg \
 		localbase:ldflags mpi:openmpi pkgconfig python:3.7+ localbase qt:5 xorg \
 		desktop-file-utils shared-mime-info shebangfix
 USE_GITHUB=	yes
 USE_XORG=	ice sm x11 xext xt
 USE_GL=		gl glu
 USE_QT=		buildtools concurrent core declarative gui location network \
 		opengl printsupport qmake:build svg webchannel widgets xml \
 		xmlpatterns
 USE_LDCONFIG=	yes
 
 CPE_VENDOR=	freecad_project
 
 VTK_VER=	9.2
 
 DOS2UNIX_GLOB=	*.txt *.h *.cpp *.py *.qss *.csv *.pov *.stp *.ui *.wrl *.WRL
 SHEBANG_FILES=	src/Tools/freecad-thumbnailer
 
 CMAKE_ARGS+=	-DOCC_INCLUDE_DIR="${LOCALBASE}/include/OpenCASCADE" \
 		-DOPENMPI_INCLUDE_DIRS="${LOCALBASE}/mpi/openmpi/include" \
 		-DBUILD_QT5="ON" \
 		-DPYTHON_LIBRARY="${PYTHONBASE}/lib/libpython${PYTHON_VER}${PYTHON_ABIVER}.so" \
 		-DPYTHON_INCLUDE_DIR="${PYTHON_INCLUDEDIR}" \
 		-DPYTHON_PACKAGES_PATH="${PYTHON_SITELIBDIR}" \
 		-DPYTHON_EXECUTABLE="${PYTHON_CMD}" \
 		-DBUILD_ASSEMBLY="OFF" -DBUILD_FLAT_MESH="ON" \
 		-DHDF5_CFLAGS="-I${LOCALBASE}/include/hdf5-110" \
 		-DHDF5_FOUND=TRUE \
 		-DHDF5_INCLUDE_DIRS="${LOCALBASE}/include/hdf5-110" \
 		-DHDF5_LIBRARIES="-L${LOCALBASE}/lib -lhdf5-110" \
 		-DHDF5_LIBRARY_DIRS="${LOCALBASE}/lib" \
 		-DPYSIDE2RCCBINARY="${RCC}" \
 		-DPYSIDE2UICBINARY="${UIC}" \
 		-DBUILD_ENABLE_CXX_STD=C++17
 
 CMAKE_INSTALL_PREFIX=	${PREFIX}/${PORTNAME}
 # Install XDG icons and files to the standard path
 CMAKE_ARGS+=	-DXDG_DATADIR="${PREFIX}/share"
 
 OPTIONS_DEFINE=	COLLADA
 
 COLLADA_DESC=		Install pycollada for Collada files import
 COLLADA_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycollada>0:graphics/py-pycollada@${PY_FLAVOR}
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == aarch64 || ${ARCH} == amd64 || ${ARCH} == i386
 USE_QT+=	webengine
 .else
 USE_QT+=	webkit
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e '/self\.rev/s/Unknown/${DISTVERSION:C/.*-//}/' \
 		${WRKSRC}/src/Tools/SubWCRev.py
 # Install XDG icons and files to the standard path
 	@${REINPLACE_CMD} -e 's/CMAKE_INSTALL_DATAROOTDIR/XDG_DATADIR/g' \
 		${WRKSRC}/src/XDGData/CMakeLists.txt \
 		${WRKSRC}/src/Gui/CMakeLists.txt
 
 post-install:
 	${LN} -s ../${PORTNAME}/bin/FreeCAD ${STAGEDIR}${LOCALBASE}/bin/FreeCAD
 	${LN} -s ../${PORTNAME}/bin/FreeCADCmd ${STAGEDIR}${LOCALBASE}/bin/FreeCADCmd
 	${INSTALL_SCRIPT} ${WRKSRC}/src/Tools/freecad-thumbnailer \
 		${STAGEDIR}${PREFIX}/bin/freecad-thumbnailer
 
 .include <bsd.port.mk>
diff --git a/cad/freehdl/Makefile b/cad/freehdl/Makefile
index e0e596a88543..6ba41c6d66e6 100644
--- a/cad/freehdl/Makefile
+++ b/cad/freehdl/Makefile
@@ -1,26 +1,26 @@
 PORTNAME=	freehdl
 PORTVERSION=	0.0.7
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	cad
 MASTER_SITES=	http://freehdl.seul.org/~enaroska/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Free VHDL simulator
 WWW=		http://www.freehdl.seul.org/
 
 USES=		gmake pathfix libtool makeinfo perl5 pkgconfig
 USE_LDCONFIG=	yes
 USE_GCC=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	SYSTEM_LIBTOOL=${FALSE}
 INSTALL_TARGET=	install-strip
 
 # Bug 219297: GCC 6 changed its default from -std=gnu++98 to -std=gnu++14, and
 # this port's code is not compatible with C++11. Since the project looks
 # abandoned upstream, it makes more sense to just continue building with an
 # older C++ standard.
 USE_CXXSTD=	gnu++98
 
 INFO=		fire
 
 .include <bsd.port.mk>
diff --git a/cad/ghdl/Makefile b/cad/ghdl/Makefile
index fa9dce0f7484..0cc0282cb15c 100644
--- a/cad/ghdl/Makefile
+++ b/cad/ghdl/Makefile
@@ -1,62 +1,63 @@
 PORTNAME=	ghdl
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.0.0
+PORTREVISION=	1
 CATEGORIES=	cad
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	GNU VHDL simulator
 WWW=		https://github.com/ghdl/ghdl
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING.md
 
 LIB_DEPENDS=	libgmp.so:math/gmp \
 		libmpfr.so:math/mpfr \
 		libmpc.so:math/mpc
 TEST_DEPENDS=	bash:shells/bash \
 		${PYTHON_PKGNAMEPREFIX}pyTooling>=2.11.0:devel/py-pyTooling@${PY_FLAVOR}
 
 USES=		ada:run gmake python:test shebangfix
 SHEBANG_FILES=	testsuite/testsuite.sh
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 
 GNU_CONFIGURE=	yes
 
 LLVMVER=	15 # last supported version, see https://github.com/ghdl/ghdl/blob/master/configure#L317
 
 CONFIGURE_ARGS=	--disable-libghdl
 
 OPTIONS_SINGLE=		BACKEND
 OPTIONS_SINGLE_BACKEND=	MCODE LLVM
 OPTIONS_DEFAULT=	LLVM
 OPTIONS_SUB=		yes
 
 MCODE_DESC=		Use the MCODE backend
 # MCODE is enabled by default and doesn't require any configuration options
 
 LLVM_DESC=		Code generator is LLVM
 LLVM_USES=		libedit ncurses
 LLVM_CONFIGURE_ON=	--with-llvm-config=${LOCALBASE}/bin/llvm-config${LLVMVER}
 LLVM_BUILD_DEPENDS=	llvm-config${LLVMVER}:devel/llvm${LLVMVER}
 LLVM_RUN_DEPENDS=	llc${LLVMVER}:devel/llvm${LLVMVER}
 
 post-install-MCODE-on:
 	@${STRIP_CMD} \
 		${STAGEDIR}${PREFIX}/bin/ghdl \
 		${STAGEDIR}${PREFIX}/lib/libghdlvpi.so
 
 post-install-LLVM-on:
 	@${STRIP_CMD} \
 		${STAGEDIR}${PREFIX}/bin/ghdl \
 		${STAGEDIR}${PREFIX}/bin/ghwdump \
 		${STAGEDIR}${PREFIX}/bin/ghdl1-llvm \
 		${STAGEDIR}${PREFIX}/lib/libghdlvpi.so \
 		${STAGEDIR}${PREFIX}/lib/libghw.so
 
 do-test:
 	@cd ${WRKSRC}/testsuite && \
 		${SETENV} ${MAKE_ENV} GHDL=${STAGEDIR}${PREFIX}/bin/ghdl ${SH} testsuite.sh
 
 .include <bsd.port.mk>
diff --git a/cad/gmsh/Makefile b/cad/gmsh/Makefile
index 01b1f4e272fd..93de2e2a876c 100644
--- a/cad/gmsh/Makefile
+++ b/cad/gmsh/Makefile
@@ -1,69 +1,70 @@
 PORTNAME=	gmsh
 DISTVERSION=	4.11.0
+PORTREVISION=	1
 CATEGORIES=	cad
 MASTER_SITES=	http://gmsh.info/src/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-source
 DIST_SUBDIR=	gmsh
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Automatic 3D finite element mesh generator
 WWW=		https://www.geuz.org/gmsh/
 
 LICENSE=	AGPLv3+ APACHE20 GPLv3+ GPLv2+ LGPL21
 LICENSE_COMB=	multi
 
 LIB_DEPENDS=	libfltk.so:x11-toolkits/fltk \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libgmp.so:math/gmp \
 		libhdf5.so:science/hdf5 \
 		libpng.so:graphics/png \
 		libsz.so:science/libaec \
 		libfreetype.so:print/freetype2
 RUN_DEPENDS=	getdp:science/getdp
 
 USES=		blaslapack compiler:c++11-lang cmake fortran gl jpeg tar:tgz \
 		xorg
 
 USE_GL=		gl glu
 USE_XORG=	x11 xcursor xext xinerama xfixes xft xrender
 
 CMAKE_ARGS=	-DCMAKE_SKIP_RPATH:BOOL=YES
 
 CXXFLAGS_powerpc64=	-mvsx
 LDFLAGS+=	-lexecinfo
 
 OPTIONS_DEFINE=	CGNS DOCS MED OCC SHARED STATIC
 OPTIONS_DEFAULT=	CGNS MED OCC
 OPTIONS_SUB=	yes
 
 CGNS_DESC=	Enable CGNS mesh import
 MED_DESC=	Enable MED mesh and post file formats
 OCC_DESC=	Enable OpenCASCADE geometrical models
 SHARED_DESC=	Build shared library and install header files
 STATIC_DESC=	Build static library
 
 PLIST_SUB=	VER=${PORTVERSION} VE=${PORTVERSION:R}
 
 # TODO
 # Dependencies against PythonLibs, swig and petsc are found and registered if
 # installed
 # => add knobs to handle them.
 
 CGNS_CMAKE_BOOL=	ENABLE_CGNS
 CGNS_LIB_DEPENDS=	libcgns.so:science/cgnslib
 DOCS_CMAKE_BOOL=	INSTALL_DOCS
 MED_CMAKE_BOOL=		ENABLE_MED
 MED_LIB_DEPENDS=	libmed.so:french/med
 OCC_CMAKE_BOOL=		ENABLE_OCC
 OCC_CMAKE_ON=		-DOCC_INC=${LOCALBASE}/include/OpenCASCADE
 OCC_LIB_DEPENDS=	libopenblas.so:math/openblas libTKernel.so:cad/opencascade
 OCC_USES=		gnome
 OCC_USE=		gnome=cairo
 SHARED_CMAKE_BOOL=	ENABLE_BUILD_SHARED
 SHARED_USE=		LDCONFIG=yes
 STATIC_CMAKE_BOOL=	ENABLE_BUILD_LIB
 
 post-install-SHARED-on:
 	${RM} -r ${STAGEDIR}/wrkdirs
 
 .include <bsd.port.mk>
diff --git a/cad/graywolf/Makefile b/cad/graywolf/Makefile
index 24b304f4cea8..d6225bdac0a7 100644
--- a/cad/graywolf/Makefile
+++ b/cad/graywolf/Makefile
@@ -1,43 +1,43 @@
 PORTNAME=	graywolf
 DISTVERSION=	0.1.6-4
 DISTVERSIONSUFFIX=	-gf47937b
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	cad
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${PORTNAME}/commit/
 PATCHFILES=	af606a0e8c6f693448978a300e5603fd5a8f2aef.patch:-p1 # https://github.com/rubund/graywolf/pull/41
 PATCHFILES+=	2b23616f26d8f9a9fa03010322fa967a2dc204e3.patch:-p1 \
 		b0692b44dfc21ded1ad61c8a2e47d262d14ebabe.patch:-p1 \
 		9b6a45849ddf1d48b7d0bffa914919a785f6db44.patch:-p1 \
 		56698bb3178b606dec6749cf1f893acceca4ca62.patch:-p1 \
 		0740f436419a9cce323936e0dec2355dde59a97e.patch:-p1 \
 		a9a092d9c2dab31993bc2955c5ed730c9234df29.patch:-p1 # https://github.com/rubund/graywolf/pull/48
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Fork of TimberWolf, a placement tool in VLSI design
 WWW=		https://github.com/rubund/graywolf
 
 LICENSE=	GPLv2
 
 BROKEN_aarch64=	Fails to link: missing sbrk
 
 LIB_DEPENDS=	libgsl.so:math/gsl
 TEST_DEPENDS=	bash:shells/bash \
 		rsync:net/rsync
 
 USES=		cmake compiler:c11 pkgconfig shebangfix xorg
 USE_XORG=	ice sm x11 xext
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	rubund
 
 SHEBANG_GLOB=	*.sh
 
 USE_GCC=	yes # lots of obviously incorrect C where clang fails, which gcc nevertheless magically finds a way to compile
 
 CFLAGS+=	-fcommon
 
 TEST_TARGET=	test
 
 .include <bsd.port.mk>
diff --git a/cad/horizon-eda/Makefile b/cad/horizon-eda/Makefile
index 19e2da6633e4..20342ca08185 100644
--- a/cad/horizon-eda/Makefile
+++ b/cad/horizon-eda/Makefile
@@ -1,47 +1,47 @@
 PORTNAME=	horizon-eda
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.4.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	cad
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	EDA package for printed circuit board design
 WWW=		https://horizon-eda.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${LOCALBASE}/include/boost/optional.hpp:devel/boost-libs \
 		cppzmq>0:net/cppzmq \
 		glm>0:math/glm
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libepoxy.so:graphics/libepoxy \
 		libgit2.so:devel/libgit2 \
 		libharfbuzz.so:print/harfbuzz \
 		libpng16.so:graphics/png \
 		libpodofo.so:graphics/podofo \
 		libTKSTEP.so:cad/opencascade \
 		libuuid.so:misc/e2fsprogs-libuuid \
 		libzip.so:archivers/libzip \
 		libzmq.so:net/libzmq4
 
 USES=		gmake gnome libarchive localbase pkgconfig python:build sqlite # compiler:c++17-lang
 USE_GNOME=	atkmm gdkpixbuf2 gtkmm30 librsvg2
 
 USE_GITHUB=	yes
 GH_PROJECT=	horizon
 
 MAKE_ARGS=	DEBUGFLAGS= OPTIMIZE=
 
 BINARY_ALIAS=	python3=${PYTHON_CMD}
 
 LLVM_VER=	12 # workaround for bug#263870
 BUILD_DEPENDS+=	clang${LLVM_VER}:devel/llvm${LLVM_VER}
 CPP=		clang-cpp${LLVM_VER}
 CC=		clang${LLVM_VER}
 CXX=		clang++${LLVM_VER}
 
 post-install: # https://github.com/horizon-eda/horizon/issues/558
 	@cd ${STAGEDIR}${PREFIX}/bin && ${STRIP_CMD} horizon-eda horizon-imp
 
 .include <bsd.port.mk>
diff --git a/cad/ifcopenshell/Makefile b/cad/ifcopenshell/Makefile
index c47923734c5b..8308643c9908 100644
--- a/cad/ifcopenshell/Makefile
+++ b/cad/ifcopenshell/Makefile
@@ -1,45 +1,45 @@
 PORTNAME=	ifcopenshell
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.6.0
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	cad
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Open source IFC library and geometry engine
 WWW=		http://ifcopenshell.org
 
 LICENSE=	LGPL3+
 LICENSE_FILE=	${WRKSRC}/COPYING.LESSER
 
 BUILD_DEPENDS=	nlohmann-json>0:devel/nlohmann-json
 LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 		libTKernel.so:cad/opencascade740
 
 BROKEN=		error: no viable overloaded '='
 
 USES=		cmake compiler:c++11-lang eigen:3 gnome
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
 USE_GITHUB=	yes
 GH_PROJECT=	IfcOpenShell
 GH_TAGNAME=	7c61c7d200ff
 
 OPTIONS_DEFINE=		PYTHON
 OPTIONS_DEFAULT=	PYTHON
 OPTIONS_SUB=		yes
 
 PYTHON_CMAKE_BOOL=	BUILD_IFCPYTHON
 PYTHON_USES=		python:3.6+
 PYTHON_BUILD_DEPENDS=	swig>=3.0.0:devel/swig
 
 CMAKE_SOURCE_PATH=	${WRKSRC}/cmake
 
 CMAKE_OFF=	COLLADA_SUPPORT
 CMAKE_ON=	BUILD_SHARED_LIBS \
 		ENABLE_BUILD_OPTIMIZATIONS \
 		GLTF_SUPPORT
 CMAKE_ARGS=	-Djson_hpp=${LOCALBASE}/include/nlohmann \
 		-DOCC_INCLUDE_DIR=${LOCALBASE}/include/OpenCASCADE \
 		-DOCC_LIBRARY_DIR=${LOCALBASE}/lib
 
 .include <bsd.port.mk>
diff --git a/cad/kicad-devel/Makefile b/cad/kicad-devel/Makefile
index 84a8765e210a..390f0e9ab15e 100644
--- a/cad/kicad-devel/Makefile
+++ b/cad/kicad-devel/Makefile
@@ -1,172 +1,172 @@
 PORTNAME=	kicad
 DISTVERSION=	r${GIT_SRC_DATE}
-PORTREVISION=	1
+PORTREVISION=	2
 #PORTREVISION=	1
 CATEGORIES=	cad
 PKGNAMESUFFIX=	-devel
 DIST_SUBDIR=		${PORTNAME}
 
 MAINTAINER=		mr@FreeBSD.org
 COMMENT=		Schematic and PCB editing software
 WWW=		http://kicad-pcb.org/
 
 LICENSE=	GPLv3
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/git:devel/git \
 		${LOCALBASE}/include/glm/glm.hpp:math/glm \
 		${LOCALBASE}/bin/swig:devel/swig
 LIB_DEPENDS=	libboost_thread.so:devel/boost-libs \
 		libfreetype.so:print/freetype2 \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libharfbuzz.so:print/harfbuzz \
 		libngspice.so:cad/ngspice_rework@shlib \
 		libTKernel.so:cad/opencascade \
 		libpixman-1.so:x11/pixman \
 		libpng.so:graphics/png \
 		libcurl.so:ftp/curl \
 		libGLEW-wayland.so:graphics/glew-wayland \
 		libodbc.so:databases/unixODBC
 
 CONFLICTS_INSTALL=	kicad # bin/_cvpcb.kiface
 
 BROKEN_aarch64=		Fails to compile: use of undeclared identifier builtin_ia32_emms
 
 OPTIONS_DEFINE=	DOCS
 
 PLIST_SUB=	OPSYS=${OPSYS}	\
 		DESKTOPDIR=${DESKTOPDIR:S|^${PREFIX}/||}
 
 USES=		cmake:noninja compiler:c++11-lib desktop-file-utils gl \
 		gettext gnome pkgconfig python:3.5+ shared-mime-info shebangfix ssl \
 		tar:bzip2 xorg 
 USE_GITLAB=	yes
 GL_ACCOUNT=	kicad/code
 GL_PROJECT=	kicad
 GL_COMMIT=	${GIT_SRC_HASH}
 USE_GL=		gl glu glut
 USE_WX=		3.2
 WX_COMPS=	wx python:lib
 USE_GNOME=	atk cairo gtk30 gdkpixbuf2 pango
 USE_XORG+=	ice pixman x11 xext
 BINS=		cvpcb eeschema gerbview kicad pcbnew
 EXTRAS2RM=	linux-non_unicode linux wings3d LINUX.README	\
 		contrib_makefiles.txt running_kicad_under_W98.txt
 SHEBANG_FILES=	pcbnew/python/plugins/touch_slider_wizard.py
 CXXFLAGS+=	--std=c++11 -I${WRKSRC} -I${WRKSRC}/include -I${LOCALBASE}/include
 CXXFLAGS_powerpc=	-O0
 CMAKE_ARGS=	-DLOCALBASE="${LOCALBASE}" \
 		-DCMAKE_BUILD_TYPE="Debug" \
 		-DKICAD_TESTING_VERSION=ON \
 		-DKICAD_VERSION=${DISTVERSION} \
 		-DCMAKE_INCLUDE_PATH="${WRKSRC}/include ${LOCALBASE}/include" \
 		-DwxWidgets_CONFIG_EXECUTABLE="${WX_CONFIG}" \
 		-DwxWidgets_USE_DEBUG=ON \
 		-DwxWidgets_USE_USE_UNICODE=ON \
 		-DwxWidgets_wxrc_EXECUTABLE=${WXRC_CMD} \
 		-DKICAD_SCRIPTING=ON \
 		-DKICAD_SCRIPTING_MODULES=ON \
 		-DKICAD_SCRIPTING_PYTHON3=ON \
 		-DKICAD_SCRIPTING_WXPYTHON=ON \
 		-DKICAD_SCRIPTING_WXPYTHON_PHOENIX=ON \
 		-DKICAD_SKIP_BOOST=YES \
 		-DKICAD_SPICE=ON \
 		-DKICAD_USE_OCE=OFF \
 		-DKICAD_USE_OCC=ON \
 		-DKICAD_USE_EGL=ON \
 		-DOCC_INCLUDE_DIR=${LOCALBASE}/include/OpenCASCADE
 USE_LDCONFIG=	yes
 
 .include "Makefile.git_rev"
 
 showversions:
 	@${ECHO} "GIT_SRC_HASH: ${GIT_SRC_HASH}"
 	@${ECHO} "GIT_SRC_DATE: ${GIT_SRC_DATE}"
 	@${ECHO} "DISTDIR: ${DISTDIR}"
 	@${ECHO} "DIST_SUBDIR: ${DIST_SUBDIR}"
 	@${ECHO} "DISTNAME: ${DISTNAME}"
 	@${ECHO} "DISTVERSION: ${DISTVERSION}"
 
 # Updating to new rev:
 # sh files/newVersion.sh
 # make makesum && make clean
 # make install #breaks probably due to plist differences
 # make makeplist > pkg-plist #One has to edit/review the generated plist
 # make generate-plist && make check-plist
 # < Check PLIST_FILE_LIST below >
 
 tmp:
 	echo "${DATADIR} ${DATADIR:H}"
 
 # The CheckCXXSymbolExists module has been shipped with CMake since 3.0 times.
 # The ancient implementation that this bundled module uses, no longer works
 # because it uses CMake internals that have gone away in 3.11.
 post-extract:
 	${RM} ${WRKSRC}/CMakeModules/CheckCXXSymbolExists.cmake
 
 pre-configure:
 	${REINPLACE_CMD} -e 's|/usr/share/kicad|${DATADIR}|'            \
 		-e 's|/usr/local|${PREFIX}|'                            \
 		${WRKSRC}/common/gestfich.cpp
 	${REINPLACE_CMD} -e 's|/usr/bin/xdg-open|${LOCALBASE}/bin/xdg-open|' \
 		${WRKSRC}/common/pgm_base.cpp
 
 post-configure:
 #	${REINPLACE_CMD} -e 's|#define HAVE_ISO646_H|//#define HAVE_ISO646_H|'     \
 #		${WRKSRC}/config.h
 	for f in `${FIND} ${WRKSRC} -name \*.make -o -name link.txt` ; do				\
 		${REINPLACE_CMD}						\
 		-e 's|CC = gcc|#CC = gcc|'					\
 		-e 's|LD = gcc|LD = ${CC}|'					\
 		-e 's|LD = g++|LD = ${CXX}|'					\
 		-e 's|wx-config|${WX_CONFIG}|'					\
 		-e 's|CXX_FLAGS =|CXX_FLAGS = ${WRKSRC}/include -I${LOCALBASE}/include|'		\
 		-e 's|C_FLAGS =|C_FLAGS = ${WRKSRC}/include -I${LOCALBASE}/include|'		\
 		-e 's|LDFLAGS =|LDFLAGS += -L${LOCALBASE}/lib|'			\
 		-e 's|gcc -D|${CC} -D|'						\
 		-e 's/-pthread;-D_THREAD_SAFE/-pthread -D_THREAD_SAFE/g'	\
 		$$f ;								\
 	done
 	${REINPLACE_CMD} -e 's|/usr/local/bin/xdg-open|${LOCALBASE}/bin/xdg-open|' \
 		${WRKSRC}/common/pgm_base.cpp
 
 
 pre-install:
 	@echo "${DATADIR}, ${DOCSDIR}"
 
 #post-install:
 #.for subdir in library modules template
 #	${CP} -Rp ${WRKDIR}/kicad-library-master/${subdir} ${STAGEDIR}${DATADIR}
 #.endfor
 #.for subdir in internat
 #	${CP} -Rp ${WRKDIR}/kicad-doc/${subdir} ${STAGEDIR}${DOCSDIR}
 #.endfor
 
 PLIST_FILE_LIST=	bin/freeroute.jnlp \
 			bin/cvpcb \
 			bin/eeschema \
 			bin/gerbview \
 			bin/kicad \
 			bin/pcbnew \
 			bin/pl_editor \
 			bin/bitmap2component \
 			bin/pcb_calculator \
 			share/mimelnk/application/x-kicad-schematic.desktop \
 			share/mimelnk/application/x-kicad-project.desktop \
 			share/icons/hicolor/24x24/mimetypes/application-x-kicad-project.png \
 			share/icons/hicolor/48x48/apps/kicad.png \
 			share/icons/hicolor/48x48/mimetypes/application-x-kicad-project.png \
 			share/icons/hicolor/scalable/apps/kicad.svg \
 			share/icons/hicolor/scalable/mimetypes/application-x-kicad-project.svg \
 			share/icons/hicolor/16x16/mimetypes/application-x-kicad-project.png \
 			share/icons/hicolor/32x32/mimetypes/application-x-kicad-project.png \
 			share/icons/hicolor/22x22/mimetypes/application-x-kicad-project.png \
 			share/mime/packages/kicad.xml \
 			share/applications/kicad.desktop \
 			share/applications/eeschema.desktop
 
 PLIST_DIR_LIST=		lib/kicad
 
 PLIST_SHAREDDIR_LIST=	share/mimelnk/application \
 			share/mimelnk
 
 .include <bsd.port.mk>
diff --git a/cad/kicad-doc/Makefile b/cad/kicad-doc/Makefile
index a028cf49f007..c0da8139ad39 100644
--- a/cad/kicad-doc/Makefile
+++ b/cad/kicad-doc/Makefile
@@ -1,25 +1,26 @@
 PORTNAME=	kicad
 PORTVERSION=	7.0.2
+PORTREVISION=	1
 CATEGORIES=	cad
 MASTER_SITES=	https://kicad-downloads.s3.cern.ch/docs/
 PKGNAMESUFFIX=	-doc
 DISTNAME=	${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSION}
 
 MAINTAINER=	cmt@FreeBSD.org
 COMMENT=	KiCad Documentation and Help Files
 WWW=		https://gitlab.com/kicad/services/kicad-doc
 
 LICENSE=	GPLv3+ CC-BY-3.0
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	kicad:cad/kicad
 
 CONFLICTS=	kicad-devel-r2*
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 do-install:
 	cd ${WRKSRC}/share/doc/kicad && ${COPYTREE_SHARE} . ${STAGEDIR}/${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/cad/kicad-library-footprints-devel/Makefile b/cad/kicad-library-footprints-devel/Makefile
index 4d8ee3a0567e..20740d73689c 100644
--- a/cad/kicad-library-footprints-devel/Makefile
+++ b/cad/kicad-library-footprints-devel/Makefile
@@ -1,43 +1,43 @@
 PORTNAME=	kicad
 DISTVERSION=	r${GIT_FP_DATE}
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	cad
 MASTER_SITES=	https://gitlab.com/kicad/libraries/${PORTNAME}-footprints/-/archive/${GL_COMMIT}/
 PKGNAMESUFFIX=	-library-footprints-devel
 DISTNAME=	${PORTNAME}-footprints-${GL_COMMIT}
 
 MAINTAINER=	mr@FreeBSD.org
 COMMENT=	Official KiCad Footprint Libraries for the future Kicad version 5
 WWW=		https://github.com/KiCad/kicad-footprints
 
 LICENSE=	GPLv2
 
 RUN_DEPENDS=	kicad:cad/kicad-devel
 
 CONFLICTS_INSTALL=	kicad-library-footprints # share/kicad/footprints/Audio_Module.pretty/Reverb_BTDR-1H.kicad_mod
 
 USE_GITLAB=	nodefault
 GL_ACCOUNT=	kicad
 GL_PROJECT=	kicad/libraries
 GL_COMMIT=	${GIT_FP_HASH}
 # WRKSRC=	${WRKDIR}/${PORTNAME}-${GL_COMMIT}-${GL_COMMIT}
 
 USES=		cmake
 
 CMAKE_ARGS=	-DLOCALBASE="${LOCALBASE}" \
 		-DCMAKE_BUILD_TYPE="Release" \
 		-DKICAD_TESTING_VERSION=ON \
 		-DKICAD_BUILD_VERSION=${DISTVERSION}
 INSTALL_TARGET=	install
 
 NO_ARCH=	yes
 
 .include "Makefile.git_rev"
 
 # Updating to new rev:
 # sh files/newVersion.sh
 # make install #breaks probably due to plist differences
 # make makeplist > pkg-plist #One has to edit/review the generated plist
 # make generate-plist && make check-plist
 
 .include <bsd.port.mk>
diff --git a/cad/kicad-library-footprints/Makefile b/cad/kicad-library-footprints/Makefile
index 68a296bbc6b4..0e4129a28d3f 100644
--- a/cad/kicad-library-footprints/Makefile
+++ b/cad/kicad-library-footprints/Makefile
@@ -1,28 +1,29 @@
 PORTNAME=	kicad
 PORTVERSION=	7.0.2
+PORTREVISION=	1
 CATEGORIES=	cad
 MASTER_SITES=	https://gitlab.com/kicad/libraries/${PORTNAME}-footprints/-/archive/${DISTVERSION}${DISTVERSIONSUFFIX}/
 PKGNAMESUFFIX=	-library-footprints
 DISTNAME=	${PORTNAME}-footprints-${DISTVERSION}${DISTVERSIONSUFFIX}
 
 MAINTAINER=	cmt@FreeBSD.org
 COMMENT=	Official KiCad Footprint Libraries
 WWW=		https://gitlab.com/kicad/libraries/kicad-footprints
 
 LICENSE=	GPLv2
 
 RUN_DEPENDS=	kicad:cad/kicad
 
 USES=		cmake tar:bz2
 
 CONFLICTS_INSTALL=	kicad-library-footprints-devel # share/kicad/footprints/Audio_Module.pretty/Reverb_BTDR-1H.kicad_mod
 
 CMAKE_ARGS=	-DLOCALBASE="${LOCALBASE}" \
 		-DCMAKE_BUILD_TYPE="Release" \
 		-DKICAD_TESTING_VERSION=ON \
 		-DKICAD_BUILD_VERSION=${DISTVERSION}
 INSTALL_TARGET=	install
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/cad/kicad-library-packages3d-devel/Makefile b/cad/kicad-library-packages3d-devel/Makefile
index 4706b8af99b2..8cdde6859264 100644
--- a/cad/kicad-library-packages3d-devel/Makefile
+++ b/cad/kicad-library-packages3d-devel/Makefile
@@ -1,42 +1,42 @@
 PORTNAME=	kicad
 DISTVERSION=	r${GIT_P3D_DATE}
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	cad
 MASTER_SITES=	https://gitlab.com/kicad/libraries/${PORTNAME}-packages3D/-/archive/${GL_COMMIT}/
 PKGNAMESUFFIX=	-library-packages3d-devel
 DISTNAME=	${PORTNAME}-packages3D-${GL_COMMIT}
 
 MAINTAINER=	mr@FreeBSD.org
 COMMENT=	Official KiCad 3D model libraries for rendering and MCAD integration
 WWW=		https://github.com/KiCad/kicad-packages3d
 
 LICENSE=	GPLv2
 
 RUN_DEPENDS=	kicad:cad/kicad-devel
 
 CONFLICTS_INSTALL=	kicad-library-packages3d # share/kicad/3dmodels/Battery.3dshapes/BatteryHolder_Bulgin_BX0036_1xC.step
 
 USE_GITLAB=	nodefault
 GL_ACCOUNT=	kicad
 GL_PROJECT=	kicad/packages3D
 GL_COMMIT=	${GIT_P3D_HASH}
 
 USES=		cmake
 
 CMAKE_ARGS=	-DLOCALBASE="${LOCALBASE}" \
 		-DCMAKE_BUILD_TYPE="Release" \
 		-DKICAD_TESTING_VERSION=ON \
 		-DKICAD_BUILD_VERSION=${DISTVERSION}
 INSTALL_TARGET=	install
 
 NO_ARCH=	yes
 
 .include "Makefile.git_rev"
 
 # Updating to new rev:
 # sh files/newVersion.sh
 # make install #breaks probably due to plist differences
 # make makeplist > pkg-plist #One has to edit/review the generated plist
 # make generate-plist && make check-plist
 
 .include <bsd.port.mk>
diff --git a/cad/kicad-library-packages3d/Makefile b/cad/kicad-library-packages3d/Makefile
index d7fed1def536..927752a4aee6 100644
--- a/cad/kicad-library-packages3d/Makefile
+++ b/cad/kicad-library-packages3d/Makefile
@@ -1,28 +1,29 @@
 PORTNAME=	kicad
 PORTVERSION=	7.0.2
+PORTREVISION=	1
 CATEGORIES=	cad
 MASTER_SITES=	https://gitlab.com/kicad/libraries/${PORTNAME}-packages3D/-/archive/${DISTVERSION}${DISTVERSIONSUFFIX}/
 PKGNAMESUFFIX=	-library-packages3d
 DISTNAME=	${PORTNAME}-packages3D-${DISTVERSION}${DISTVERSIONSUFFIX}
 
 MAINTAINER=	cmt@FreeBSD.org
 COMMENT=	Official KiCad 3D model libraries for rendering and MCAD integration
 WWW=		https://gitlab.com/kicad/libraries/kicad-packages3D
 
 LICENSE=	GPLv2
 
 RUN_DEPENDS=	kicad:cad/kicad
 
 USES=		cmake tar:bz2
 
 CONFLICTS_INSTALL=	kicad-library-packages3d-devel # share/kicad/3dmodels/Battery.3dshapes/BatteryHolder_Bulgin_BX0036_1xC.step
 
 CMAKE_ARGS=	-DLOCALBASE="${LOCALBASE}" \
 		-DCMAKE_BUILD_TYPE="Release" \
 		-DKICAD_TESTING_VERSION=ON \
 		-DKICAD_BUILD_VERSION=${DISTVERSION}
 INSTALL_TARGET=	install
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/cad/kicad-library-symbols-devel/Makefile b/cad/kicad-library-symbols-devel/Makefile
index 1c7daf34fd51..1a6eba964df8 100644
--- a/cad/kicad-library-symbols-devel/Makefile
+++ b/cad/kicad-library-symbols-devel/Makefile
@@ -1,42 +1,42 @@
 PORTNAME=	kicad
 DISTVERSION=	r${GIT_SYM_DATE}
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	cad
 MASTER_SITES=	https://gitlab.com/kicad/libraries/${PORTNAME}-symbols/-/archive/${GL_COMMIT}/
 PKGNAMESUFFIX=	-library-symbols-devel
 DISTNAME=	${PORTNAME}-symbols-${GL_COMMIT}
 
 MAINTAINER=	mr@FreeBSD.org
 COMMENT=	Official KiCad schematic symbol libraries for the future Kicad 5 release
 WWW=		https://github.com/KiCad/kicad-symbols
 
 LICENSE=	GPLv2
 
 RUN_DEPENDS=	kicad:cad/kicad-devel
 
 CONFLICTS_INSTALL=	kicad-library-symbols # share/kicad/symbols/4xxx.kicad_sym
 
 USE_GITLAB=	nodefault
 GL_ACCOUNT=	kicad
 GL_PROJECT=	kicad/symbols
 GL_COMMIT=	${GIT_SYM_HASH}
 
 USES=		cmake
 
 CMAKE_ARGS=	-DLOCALBASE="${LOCALBASE}" \
 		-DCMAKE_BUILD_TYPE="Release" \
 		-DKICAD_TESTING_VERSION=ON \
 		-DKICAD_BUILD_VERSION=${DISTVERSION}
 INSTALL_TARGET=	install
 
 NO_ARCH=	yes
 
 .include "Makefile.git_rev"
 
 # Updating to new rev:
 # sh files/newVersion.sh
 # make install #breaks probably due to plist differences
 # make makeplist > pkg-plist #One has to edit/review the generated plist
 # make generate-plist && make check-plist
 
 .include <bsd.port.mk>
diff --git a/cad/kicad-library-symbols/Makefile b/cad/kicad-library-symbols/Makefile
index 8a3805105ea8..79ba7aa3e8a9 100644
--- a/cad/kicad-library-symbols/Makefile
+++ b/cad/kicad-library-symbols/Makefile
@@ -1,28 +1,29 @@
 PORTNAME=	kicad
 PORTVERSION=	7.0.2
+PORTREVISION=	1
 CATEGORIES=	cad
 MASTER_SITES=	https://gitlab.com/kicad/libraries/${PORTNAME}-symbols/-/archive/${DISTVERSION}${DISTVERSIONSUFFIX}/
 PKGNAMESUFFIX=	-library-symbols
 DISTNAME=	${PORTNAME}-symbols-${DISTVERSION}${DISTVERSIONSUFFIX}
 
 MAINTAINER=	cmt@FreeBSD.org
 COMMENT=	Official KiCad schematic symbol libraries
 WWW=		https://gitlab.com/kicad/libraries/kicad-symbols
 
 LICENSE=	GPLv2
 
 RUN_DEPENDS=	kicad:cad/kicad
 
 USES=		cmake tar:bz2
 
 CONFLICTS_INSTALL=	kicad-library-symbols-devel # share/kicad/symbols/4xxx.kicad_sym
 
 CMAKE_ARGS=	-DLOCALBASE="${LOCALBASE}" \
 		-DCMAKE_BUILD_TYPE="Release" \
 		-DKICAD_TESTING_VERSION=ON \
 		-DKICAD_BUILD_VERSION=${DISTVERSION}
 INSTALL_TARGET=	install
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/cad/kicad-library-templates-devel/Makefile b/cad/kicad-library-templates-devel/Makefile
index 6a77db547ff6..da1579c760fa 100644
--- a/cad/kicad-library-templates-devel/Makefile
+++ b/cad/kicad-library-templates-devel/Makefile
@@ -1,42 +1,42 @@
 PORTNAME=	kicad
 DISTVERSION=	r${GIT_TMPL_DATE}
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	cad
 MASTER_SITES=	https://gitlab.com/kicad/libraries/${PORTNAME}-templates/-/archive/${GL_COMMIT}/
 PKGNAMESUFFIX=	-library-tmpl-devel
 DISTNAME=	${PORTNAME}-templates-${GL_COMMIT}
 
 MAINTAINER=	mr@FreeBSD.org
 COMMENT=	Official KiCad project templates
 WWW=		https://github.com/KiCad/kicad-templates
 
 LICENSE=	GPLv2
 
 RUN_DEPENDS=	kicad:cad/kicad-devel
 
 CONFLICTS_INSTALL=	kicad-library-tmpl # share/kicad/template/A2_ISO5457-1999_ISO7200-2004-compact_ASMEY1435-2014_EN.kicad_wks
 
 USE_GITLAB=	nodefault
 GL_ACCOUNT=	kicad
 GL_PROJECT=	kicad/libraries
 GL_COMMIT=	${GIT_TMPL_HASH}
 
 USES=		cmake
 
 CMAKE_ARGS=	-DLOCALBASE="${LOCALBASE}" \
 		-DCMAKE_BUILD_TYPE="Release" \
 		-DKICAD_TESTING_VERSION=ON \
 		-DKICAD_BUILD_VERSION=${DISTVERSION}
 INSTALL_TARGET=	install
 
 NO_ARCH=	yes
 
 .include "Makefile.git_rev"
 
 # Updating to new rev:
 # sh files/newVersion.sh
 # make install #breaks probably due to plist differences
 # make makeplist > pkg-plist #One has to edit/review the generated plist
 # make generate-plist && make check-plist
 
 .include <bsd.port.mk>
diff --git a/cad/kicad-library-templates/Makefile b/cad/kicad-library-templates/Makefile
index 2f02a24c6d4b..65c64a93d163 100644
--- a/cad/kicad-library-templates/Makefile
+++ b/cad/kicad-library-templates/Makefile
@@ -1,28 +1,29 @@
 PORTNAME=	kicad
 PORTVERSION=	7.0.2
+PORTREVISION=	1
 CATEGORIES=	cad
 MASTER_SITES=	https://gitlab.com/kicad/libraries/${PORTNAME}-templates/-/archive/${DISTVERSION}${DISTVERSIONSUFFIX}/
 PKGNAMESUFFIX=	-library-tmpl
 DISTNAME=	${PORTNAME}-templates-${DISTVERSION}${DISTVERSIONSUFFIX}
 
 MAINTAINER=	cmt@FreeBSD.org
 COMMENT=	Official KiCad project templates
 WWW=		https://gitlab.com/kicad/libraries/kicad-templates
 
 LICENSE=	GPLv2
 
 RUN_DEPENDS=	kicad:cad/kicad
 
 USES=		cmake tar:bz2
 
 CONFLICTS_INSTALL=	kicad-library-tmpl-devel # share/kicad/template/A2_ISO5457-1999_ISO7200-2004-compact_ASMEY1435-2014_EN.kicad_wks
 
 CMAKE_ARGS=	-DLOCALBASE="${LOCALBASE}" \
 		-DCMAKE_BUILD_TYPE="Release" \
 		-DKICAD_TESTING_VERSION=ON \
 		-DKICAD_BUILD_VERSION=${DISTVERSION}
 INSTALL_TARGET=	install
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/cad/kicad/Makefile b/cad/kicad/Makefile
index 4b13c7f3bd5e..8a55d67ca4ac 100644
--- a/cad/kicad/Makefile
+++ b/cad/kicad/Makefile
@@ -1,68 +1,69 @@
 PORTNAME=	kicad
 PORTVERSION=	7.0.2
+PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	cad
 MASTER_SITES=	https://gitlab.com/${PORTNAME}/code/${PORTNAME}/-/archive/${DISTVERSION}${DISTVERSIONSUFFIX}/
 
 MAINTAINER=	cmt@FreeBSD.org
 COMMENT=	Schematic and PCB editing software
 WWW=		https://kicad.org/
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	${LOCALBASE}/include/glm/glm.hpp:math/glm	\
 		swig:devel/swig
 LIB_DEPENDS=	libboost_thread.so:devel/boost-libs	\
 		libharfbuzz.so:print/harfbuzz		\
 		libngspice.so:cad/ngspice_rework@shlib	\
 		libTKernel.so:cad/opencascade		\
 		libpixman-1.so:x11/pixman		\
 		libpng.so:graphics/png			\
 		libcurl.so:ftp/curl			\
 		libGLEW-wayland.so:graphics/glew-wayland \
 		libfreetype.so:print/freetype2	\
 		libfontconfig.so:x11-fonts/fontconfig	\
 		libodbc.so:databases/unixODBC
 
 USES=		cmake:noninja compiler:c++17-lang desktop-file-utils gl \
 		gnome pkgconfig python:3.5+ shared-mime-info shebangfix \
 		tar:bz2 xorg
 SHEBANG_FILES=	pcbnew/python/plugins/touch_slider_wizard.py
 
 USE_XORG=	ice x11 xext
 USE_GL=		gl glu glut
 USE_WX=		3.2
 WX_COMPS=	python:lib wx
 USE_GNOME=	atk cairo gdkpixbuf2 gtk30 pango
 CXXFLAGS+=	-std=c++11 -I${WRKSRC}/include -I${LOCALBASE}/include
 CXXFLAGS_powerpc=	-O0
 # not using "bundled glew" breaks the 3d viewer
 CMAKE_ARGS=	-DwxWidgets_CONFIG_EXECUTABLE=${WX_CONFIG}	\
 		-DwxWidgets_USE_UNICODE=ON			\
 		-DwxWidgets_wxrc_EXECUTABLE=${WXRC_CMD}		\
 		-DKICAD_SCRIPTING_WXPYTHON=ON			\
 		-DKICAD_USE_EGL=ON				\
 		-DKICAD_USE_BUNDLED_GLEW=ON 			\
 		-DNANODBC_ENABLE_BOOST=ON			\
 		-DOCC_INCLUDE_DIR=${LOCALBASE}/include/OpenCASCADE
 CMAKE_ENV+=	DODBC_PATH=${LOCALBASE}
 USE_LDCONFIG=	yes
 
 PLIST_SUB=	DESKTOPDIR=${DESKTOPDIR:S|^${PREFIX}/||}
 
 OPTIONS_DEFINE=	DOXYGEN NLS
 OPTIONS_SUB=	yes
 
 NLS_USES=	gettext
 
 DOXYGEN_VARS=	LICENSE+=GFDL LICENSE_COMB=multi
 DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
 DOXYGEN_ALL_TARGET=	all doxygen-docs
 
 CONFLICTS_INSTALL=	kicad-devel # bin/_cvpcb.kiface
 
 pre-configure:
 	${REINPLACE_CMD} -e 's|/usr/local/bin/xdg-open|${LOCALBASE}/bin/xdg-open|' \
 		${WRKSRC}/common/pgm_base.cpp
 
 .include <bsd.port.mk>
diff --git a/cad/opencascade/Makefile b/cad/opencascade/Makefile
index 49fa799e2830..0cbfca200a4b 100644
--- a/cad/opencascade/Makefile
+++ b/cad/opencascade/Makefile
@@ -1,188 +1,188 @@
 PORTNAME=	opencascade
 DISTVERSION=	7.7.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	cad science
 MASTER_SITES=	LOCAL/thierry
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Open CASCADE Technology, 3D modeling & numerical simulation
 WWW=		https://www.opencascade.org/
 
 LICENSE=	OCTPL
 LICENSE_NAME=	LGPL21 with exception
 LICENSE_FILE=	${WRKSRC}/OCCT_LGPL_EXCEPTION.txt
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 BUILD_DEPENDS=	rapidjson>0:devel/rapidjson			\
 		${LOCALBASE}/lib/qt5/bin/qmake:devel/qt5-qmake	\
 		${LOCALBASE}/lib/qt5/bin/moc:devel/qt5-buildtools
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig	\
 		libfreetype.so:print/freetype2		\
 		libexpat.so:textproc/expat2		\
 		libdraco.so:archivers/draco		\
 		libpng16.so:graphics/png		\
 		libvtksys-${VTK_VER}.so:math/vtk${VTK_VER:R}
 RUN_DEPENDS=	bash:shells/bash
 
 # Check ${WRKSRC}/dox/overview/overview.md
 # and ${WRKSRC}/dox/dev_guides/building
 USES=		alias:10 cmake compiler:c++14-lang dos2unix gettext-runtime	\
 		gl gnome localbase python qt:5 shebangfix tk tar:tgz xorg
 USE_XORG=	ice sm x11 xau xcb xdmcp xext xft xi xmu xrender xscrnsaver xt
 USE_GL=		egl gl glesv2 glu
 USE_GNOME=	libxml2
 
 DOS2UNIX_FILES=	adm/templates/*
 SHEBANG_FILES=	adm/templates/*.sh	\
 		adm/templates/*.sh.in	\
 		adm/templates/*.sh.main	\
 		adm/genconf.tcl		\
 		adm/start.tcl		\
 		gendoc
 ENVSH=		adm/templates/env.sh
 
 OPTIONS_DEFINE=	DOCS DOXYGEN FFMPEG VIS
 VIS_DESC=	Build Visualizazion module (requires OpenGL, freetype, ftgl)
 OPTIONS_DEFAULT=FFMPEG VIS
 OPTIONS_SUB=	yes
 
 REINPLACE_ARGS=	-i ""
 LDFLAGS+=	-Wl,--allow-shlib-undefined -lexecinfo
 CMAKE_ARGS+=	-DINSTALL_DIR=${OCCROOT}				\
 		-DINSTALL_DIR_INCLUDE=${PREFIX}/include/OpenCASCADE	\
 		-DINSTALL_DIR_LIB=${PREFIX}/lib				\
 		-DINSTALL_DIR_CMAKE=${PREFIX}/lib/cmake			\
 		-DINSTALL_DIR_DATA=${OCCROOT}/data			\
 		-DINSTALL_DIR_RESOURCE=${OCCROOT}/resources		\
 		-DINSTALL_DIR_SAMPLES=${OCCROOT}/samples		\
 		-DINSTALL_DIR_TESTS=${OCCROOT}/tests			\
 		-DINSTALL_TEST_CASES:BOOL=ON				\
 		-DUSE_FREETYPE:BOOL=ON					\
 		-DUSE_TBB:BOOL=OFF					\
 		-DUSE_RAPIDJSON:BOOL=ON					\
 		-DUSE_DRACO:BOOL=ON					\
 		-DUSE_VTK:BOOL=ON					\
 		-D3RDPARTY_DRACO_LIBRARY_DIR:PATH=${LOCALBASE}/lib	\
 		-D3RDPARTY_DRACO_INCLUDE_DIR:PATH=${LOCALBASE}/include/draco	\
 		-D3RDPARTY_VTK_INCLUDE_DIR:PATH=${LOCALBASE}/include/vtk-${VTK_VER}
 CONFIGURE_ENV+=	DESTDIR=${STAGEDIR}
 
 .if defined(MAINTAINER_MODE)
 CMAKE_ARGS+=	-DCMAKE_MESSAGE_CONTEXT_SHOW:BOOL=ON	\
 		-DCMAKE_MESSAGE_LOG_LEVEL:STRING=DEBUG
 .endif
 
 # TODO: TBB to be replaced by onetbb later
 #CMAKE_ARGS+=	-DUSE_EIGEN:BOOL=ON -DUSE_TBB:BOOL=ON
 #USES+=		eigen:3
 #LIB_DEPENDS+=	libtbb.so:devel/tbb
 
 USE_LDCONFIG=	yes
 
 CONFLICTS_INSTALL=	opencascade740 # OpenCAS/bin/DRAWEXE
 
 LOCCROOT=	OpenCAS
 OCCROOT=	${PREFIX}/${LOCCROOT}
 PLIST_SUB=	OCCROOT="${LOCCROOT}" BITS=${BITS} CC=${CHOSEN_COMPILER_TYPE}	\
 		VE=${PORTVERSION:R} VER=${DISTVERSION:C/-beta//}
 
 FFMPEG_CMAKE_ON=	-DUSE_FFMPEG:BOOL=ON
 FFMPEG_CMAKE_OFF=	-DUSE_FFMPEG:BOOL=OFF
 FFMPEG_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg		\
 			libtheoraenc.so:multimedia/libtheora	\
 			libunistring.so:devel/libunistring	\
 			libvdpau.so:multimedia/libvdpau		\
 			libxvidcore.so:multimedia/xvid		\
 			libp11-kit.so:security/p11-kit		\
 			libx264.so:multimedia/libx264		\
 			libtasn1.so:security/libtasn1		\
 			libvorbis.so:audio/libvorbis		\
 			libdav1d.so:multimedia/dav1d		\
 			libnettle.so:security/nettle		\
 			libgnutls.so:security/gnutls		\
 			libvpx.so:multimedia/libvpx		\
 			libx265.so:multimedia/x265		\
 			libdrm.so:graphics/libdrm		\
 			libva.so:multimedia/libva		\
 			libaom.so:multimedia/aom		\
 			libmp3lame.so:audio/lame		\
 			libffi.so:devel/libffi			\
 			libidn2.so:dns/libidn2			\
 			libogg.so:audio/libogg			\
 			libopus.so:audio/opus			\
 			libgmp.so:math/gmp
 
 VIS_CMAKE_ON=		-DUSE_FREEIMAGE:BOOL=ON	\
 			-DUSE_GLES2:BOOL=ON	\
 			-D3RDPARTY_FREETYPE_DIR=${LOCALBASE}
 VIS_CMAKE_OFF=		-DUSE_FREEIMAGE:BOOL=OFF	\
 			-DUSE_GLES2:BOOL=OFF
 VIS_LIB_DEPENDS=	libftgl.so:graphics/ftgl	\
 			libfreeimageplus.so:graphics/freeimage
 VIS_USE=		GL=glesv2
 
 DOXYGEN_IMPLIES=	DOCS
 DOXYGEN_USES=		tex
 DOXYGEN_USE=		TEX=latex:build
 DOXYGEN_BUILD_DEPENDS=	bash:shells/bash		\
 			doxygen:devel/doxygen		\
 			dot:graphics/graphviz		\
 			pdftex:print/tex-basic-engines	\
 			inkscape:graphics/inkscape
 DOXYGEN_RUN_DEPENDS=	${LOCALBASE}/www/MathJax/MathJax.js:www/mathjax
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == armv6 || ${ARCH} == armv7 || ${ARCH} == mips || ${ARCH} == powerpc || ${ARCH} == powerpcspe || ${ARCH} == "i386"
 BITS=	32
 .else
 BITS=	64
 .endif
 
 pre-everything::
 	@${ECHO_MSG}
 	@${ECHO_MSG} "Warning: to build OpenCascade, you should have at least"
 	@${ECHO_MSG} "2.6 Gb of free disk space in build area!"
 	@${ECHO_MSG}
 
 pre-patch:
 	${REINPLACE_CMD} 's|<malloc.h>|<stdlib.h>|' \
 		${WRKSRC}/src/BRepMesh/delabella.cpp\
 		${WRKSRC}/src/OSD/OSD_MemInfo.cxx
 
 pre-configure:
 	${REINPLACE_CMD} -e 's|tclsh|${TCLSH}|' ${WRKSRC}/gendoc
 	${REINPLACE_CMD} -e 's|/usr/bin/|${LOCALBASE}/bin/|' ${WRKSRC}/adm/genconfdeps.tcl
 	${GREP} -rl x86_64 ${WRKSRC} | ${XARGS} ${REINPLACE_CMD}	\
 		-e 's|x86_64|amd64|'
 .for es in ${ENVSH}
 	${REINPLACE_CMD} -e 's|lin|bsd|' ${WRKSRC}/${es}
 .endfor
 
 post-build-DOXYGEN-on:
 	(cd ${WRKSRC} && ./gendoc -overview)
 
 post-install:
 	${MV} ${STAGEDIR}${OCCROOT}/bin/DRAWEXE-${DISTVERSION:C/-beta//} ${STAGEDIR}${PREFIX}/bin/DRAWEXE
 	(cd ${STAGEDIR}${PREFIX}/bin &&							\
 	${LN} -sf DRAWEXE ${STAGEDIR}${OCCROOT}/bin/DRAWEXE)
 
 post-install-DOXYGEN-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC}/doc/overview && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
 	${RM} -r ${STAGEDIR}${DOCSDIR}/latex
 	${RM} ${STAGEDIR}${DOCSDIR}/html/build_upgrade_building_3rdparty.html.bak
 
 .if defined(MAINTAINER_MODE)
 regression-test:	install
 	${RM} -rf /tmp/testOCC
 	${MKDIR} /tmp/testOCC
 	bash -c "\
 	cd ${OCCROOT} && . ${OCCROOT}/bin/env.sh &&	\
 	CSF_TestScriptsPath=${OCCROOT}/tests		\
 	CSF_TestDataPath=${OCCROOT}/data		\
 	DRAWEXE -f ${FILESDIR}/regtest "
 .endif
 
 .include <../../math/vtk9/Makefile.version>
 .include <bsd.port.mk>
diff --git a/cad/openroad/Makefile b/cad/openroad/Makefile
index 7bc81ecb806c..8f8aa6425e56 100644
--- a/cad/openroad/Makefile
+++ b/cad/openroad/Makefile
@@ -1,70 +1,70 @@
 PORTNAME=	openroad
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.0-2930
-PORTREVISION=	3
+PORTREVISION=	4
 DISTVERSIONSUFFIX=	-gaa6d690df
 PORTEPOCH=	1
 CATEGORIES=	cad
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	ASIC physical design tool
 WWW=		https://theopenroadproject.org/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_i386=	C++ issue on i386, should be resolved in the next update
 .if !exists(/usr/include/omp.h)
 BROKEN=		requires OpenMP support that is missing on this architecture
 .endif
 
 BUILD_DEPENDS=	base64:converters/base64 \
 		boost-libs>0:devel/boost-libs \
 		coin-or-lemon>0:math/lemon \
 		gmake:devel/gmake \
 		swig:devel/swig
 LIB_DEPENDS=	libcudd.so:math/cudd \
 		libfmt.so:devel/libfmt \
 		libspdlog.so:devel/spdlog
 
 USES=		bison compiler:c++17-lang cmake eigen:3 qt:5 localbase:ldflags python:3.7+,build readline tcl:86 # the code asks for tcl-87, but build fails: https://github.com/The-OpenROAD-Project/OpenROAD/issues/508
 USE_QT=		core gui widgets buildtools:build qmake:build
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	The-OpenROAD-Project
 GH_PROJECT=	OpenROAD
 GH_TUPLE=	The-OpenROAD-Project:OpenSTA:d42313d:The_OpenROAD_Project_OpenSTA/src/sta \
 		The-OpenROAD-Project:abc:d1cd437:abc/third-party/abc
 
 CMAKE_OFF=	BUILD_PYTHON FREEBSD_BUILD_TESTS
 CMAKE_ON=	BUILD_TCL
 CMAKE_ARGS=	-DFREEBSD_TCL_VER=${TCL_VER:S/.//} -DFREEBSD_TCL_INCLUDEDIR=${TCL_INCLUDEDIR}
 
 CXXFLAGS+=	-I${LOCALBASE}/include/eigen3 \
 		-DBOOST_STACKTRACE_GNU_SOURCE_NOT_REQUIRED
 
 BINARY_ALIAS=	python3=${PYTHON_CMD} tclsh=${TCLSH} make=${GMAKE}
 
 PLIST_FILES=	bin/openroad \
 		bin/sta
 
 PORTSCOUT=	limit:^[0-9]\. # prevent 2021_*
 
 post-patch: # override the TCL version to be the same as USES=tcl sets
 	@${FIND} ${WRKSRC} -name FindTCL.cmake \
 		| ${XARGS} ${REINPLACE_CMD} -e ' \
 			s|set(TCL_POSSIBLE_NAMES |set(TCL_POSSIBLE_NAMES tcl$${FREEBSD_TCL_VER} |; \
 			s|PATHS $${TCL_LIB_PARENT1}|PATHS $${FREEBSD_TCL_INCLUDEDIR} $${TCL_LIB_PARENT1}|'
 
 post-install: # unnecessarily installs bundled OpenSTA project: https://github.com/The-OpenROAD-Project/OpenROAD/issues/597
 	${RM} -r ${STAGEDIR}${PREFIX}/include/sta ${STAGEDIR}${PREFIX}/lib/libOpenSTA.a
 
 do-test: # some tests are known to fail
 	@${MKDIR} ${WRKSRC}/build/src
 	@[ -f ${WRKSRC}/build/src/openroad ] || ${LN} ${STAGEDIR}${PREFIX}/bin/openroad ${WRKSRC}/build/src/openroad
 	@${ECHO} "==> Unit tests"
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} test/regression
 	@${ECHO} "==> Flow tests"
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} test/regression flow
 
 .include <bsd.port.mk>
diff --git a/cad/openscad-devel/Makefile b/cad/openscad-devel/Makefile
index 280185cafa97..50dba1ab1f88 100644
--- a/cad/openscad-devel/Makefile
+++ b/cad/openscad-devel/Makefile
@@ -1,59 +1,60 @@
 PORTNAME=	openscad
 PORTVERSION=	2022.12.20
+PORTREVISION=	1
 #PORTREVISION=	1
 CATEGORIES=	cad
 PKGNAMESUFFIX=	-devel
 
 #PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
 #PATCHFILES+=	cc49ad8dac24.patch:-p1
 
 MAINTAINER=	mr@FreeBSD.org
 COMMENT=	Programmer's solid 3D CAD modeller #'
 WWW=		https://www.openscad.org/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	cgal>0:math/cgal \
 		evdev-proto>0:devel/evdev-proto
 LIB_DEPENDS=	libzip.so:archivers/libzip \
 		libhidapi.so:comms/hidapi \
 		libboost_regex.so:devel/boost-libs \
 		libqscintilla2_qt5.so:devel/qscintilla2-qt5 \
 		libopencsg.so:graphics/opencsg \
 		libgmp.so:math/gmp \
 		libmpfr.so:math/mpfr \
 		libfreetype.so:print/freetype2 \
 		libharfbuzz.so:print/harfbuzz \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libdouble-conversion.so:devel/double-conversion
 
 CONFLICTS=	openscad
 
 USES=		bison cmake compiler:c++14-lang cpe desktop-file-utils eigen:3 gettext \
 		gl gnome pkgconfig qt:5 shared-mime-info xorg
 USE_GITHUB=	yes
 USE_GL=		gl glu glew
 USE_GNOME=	cairo glib20 libxml2
 USE_QT=		buildtools:build core concurrent:build dbus gui multimedia qmake:build svg widgets
 USE_XORG=	x11
 GH_ACCOUNT=	microsoft:mimalloc
 GH_PROJECT=	MCAD:mcad mimalloc:mimalloc
 GH_TAGNAME=	b621fa6d3d2d2d795b30d1b6aade6ff1b3c8ba29 bd0a7ba3f042bfbced5ca1894b236cea08904e26:mcad v2.0.3:mimalloc
 GH_SUBDIR=	libraries/MCAD:mcad submodules/mimalloc:mimalloc
 #QMAKE_ARGS=	CONFIG+="experimental" VERSION=${PORTVERSION}
 # Avoid overlinking: kvm, procstat, boost(thread, system), Qt5(concurrent, network, printsupport)
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-Wl,--as-needed -L${LOCALBASE}/lib
 
 .include <bsd.port.pre.mk>
 
 #post-patch:
 #	@${REINPLACE_CMD} 's/-libusb//' ${WRKSRC}/features/hidapi.prf
 #	@${REINPLACE_CMD} -e 's,share/man,man,' \
 #		${WRKSRC}/openscad.pro
 
 do-install:
 	${CMAKE_BIN} --install ${BUILD_WRKSRC} --prefix ${STAGEDIR}${PREFIX}
 
 .include <bsd.port.post.mk>
diff --git a/cad/openscad/Makefile b/cad/openscad/Makefile
index 64212e32f74d..2162f656a7a4 100644
--- a/cad/openscad/Makefile
+++ b/cad/openscad/Makefile
@@ -1,46 +1,46 @@
 PORTNAME=	openscad
 DISTVERSION=	2021.01.01-20221206
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	cad
 
 MAINTAINER=	mr@FreeBSD.org
 COMMENT=	Programmer's solid 3D CAD modeller #'
 WWW=		https://openscad.org/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	cgal>0:math/cgal \
 		${LOCALBASE}/include/linux/input.h:devel/evdev-proto
 LIB_DEPENDS=	libzip.so:archivers/libzip \
 		libhidapi.so:comms/hidapi \
 		libboost_regex.so:devel/boost-libs \
 		libqscintilla2_qt5.so:devel/qscintilla2-qt5 \
 		libopencsg.so:graphics/opencsg \
 		libgmp.so:math/gmp \
 		libmpfr.so:math/mpfr \
 		libfreetype.so:print/freetype2 \
 		libharfbuzz.so:print/harfbuzz \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libdouble-conversion.so:devel/double-conversion
 
 USES=		bison cmake compiler:c++14-lang cpe desktop-file-utils eigen:3 gettext \
 		gl gnome localbase:ldflags pkgconfig qt:5 shared-mime-info xorg
 USE_GL=		gl glu glew
 USE_GNOME=	cairo glib20 libxml2
 USE_QT=		buildtools:build core concurrent:build dbus gui multimedia network svg widgets qmake:build
 USE_XORG=	x11
 QMAKE_ARGS=	CONFIG+="experimental" VERSION=${PORTVERSION}
 # Avoid overlinking: kvm, procstat, boost(thread, system), Qt5(concurrent, network, printsupport)
 LDFLAGS+=	-Wl,--as-needed
 
 USE_GITHUB=	yes
 GH_TAGNAME=	972d184
 GH_TUPLE=	openscad:MCAD:1ea4022:MCAD/libraries/MCAD \
 		microsoft:mimalloc:fe61be8:mimalloc/submodules/mimalloc
 
 CMAKE_ARGS=	-DQT5QSCINTILLA_LIBRARY=/usr/local/lib/qt5/libqscintilla2_qt5.so
 
 CONFLICTS_INSTALL=	openscad-devel # bin/openscad
 
 .include <bsd.port.mk>
diff --git a/cad/opentimer/Makefile b/cad/opentimer/Makefile
index edac2b3b7cb9..69dbde695d25 100644
--- a/cad/opentimer/Makefile
+++ b/cad/opentimer/Makefile
@@ -1,41 +1,42 @@
 PORTNAME=	opentimer
 PORTVERSION=	g20210726
+PORTREVISION=	1
 CATEGORIES=	cad
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	High-performance timing analysis tool for VLSI systems
 WWW=		https://github.com/OpenTimer/OpenTimer
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_i386=	undefined reference to `__atomic_compare_exchange_8'
 BROKEN_powerpc=	undefined reference to `__atomic_compare_exchange_8'
 
 USES=		cmake compiler:c++17-lang python:test shebangfix tcl
 USE_GCC=	yes # fails to build with clang-11: https://github.com/OpenTimer/OpenTimer/issues/48
 
 SHEBANG_FILES=	inttest/*.py
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	OpenTimer
 GH_PROJECT=	OpenTimer
 GH_TAGNAME=	18d28ff
 
 TEST_TARGET=	test
 
 PLIST_FILES=	bin/ot-shell \
 		bin/ot-tau15 \
 		bin/ot-tau18 \
 		bin/ot-utility
 
 do-install: # see https://github.com/OpenTimer/OpenTimer/issues/47
 .for e in ot-shell ot-tau15 ot-tau18 ot-utility
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/${e} ${STAGEDIR}${PREFIX}/bin
 .endfor
 
 quick-test: # runs the script suggested in https://github.com/OpenTimer/OpenTimer
 	@cd ${WRKSRC} && \
 		bin/ot-shell < ${FILESDIR}/test.txt
 
 .include <bsd.port.mk>
diff --git a/cad/pdnmesh/Makefile b/cad/pdnmesh/Makefile
index 4bf323b2fdee..9617efd91927 100644
--- a/cad/pdnmesh/Makefile
+++ b/cad/pdnmesh/Makefile
@@ -1,50 +1,50 @@
 PORTNAME=	pdnmesh
 PORTVERSION=	0.2.2
-PORTREVISION=	20
+PORTREVISION=	21
 CATEGORIES=	cad
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-source/${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Mesh generator and solver for Finite Element problems
 WWW=		http://pdnmesh.sourceforge.net/
 
 LICENSE=	GPLv2+
 
 LIB_DEPENDS=	libgtkglext-x11-1.0.so:x11-toolkits/gtkglext
 
 OPTIONS_DEFINE=	ATLAS DOCS EXAMPLES
 ATLAS_DESC=	Enable ATLAS support
 
 USES=		compiler:c++11-lang fortran gl gnome pkgconfig
 USE_GL=		glu
 USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-lm
 
 DESKTOP_ENTRIES="pdnMesh" "${COMMENT}" "" "${PORTNAME}" "" true
 
 ATLAS_USES=		blaslapack:atlas
 ATLAS_CONFIGURE_ON=--with-blas=cblas --with-lapack=alapack
 ATLAS_USES_OFF=		blaslapack
 ATLAS_CONFIGURE_OFF=--with-blas=blas --with-lapack=lapack
 
 post-patch:
 	@${REINPLACE_CMD} -e \
 		'/^SUBDIRS/s|doc|| ; \
 		 s|^pkgdata_DATA|#pkgdata_DATA|' ${WRKSRC}/Makefile.in
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC} \
 		&& ${INSTALL_DATA} ChangeLog ${STAGEDIR}${DOCSDIR} \
 		&& ${INSTALL_DATA} README ${STAGEDIR}${DOCSDIR})
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/tutorial
 	(cd ${WRKSRC}/doc/tutorial \
 		&& ${INSTALL_DATA} README ${STAGEDIR}${DOCSDIR}/tutorial \
 		&& ${INSTALL_DATA} tutorial.* ${STAGEDIR}${DOCSDIR}/tutorial)
 post-install-EXAMPLES-on:
 	(cd ${WRKSRC}/doc/examples && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
 	${RM} ${STAGEDIR}${EXAMPLESDIR}/Makefile*
 
 .include <bsd.port.mk>
diff --git a/cad/py-cadquery/Makefile b/cad/py-cadquery/Makefile
index c7e738de9426..b95a257a1f77 100644
--- a/cad/py-cadquery/Makefile
+++ b/cad/py-cadquery/Makefile
@@ -1,30 +1,31 @@
 PORTNAME=	${GH_ACCOUNT:tl}
 DISTVERSION=	2.0.1
+PORTREVISION=	1
 CATEGORIES=	cad
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	ports@nicandneal.net
 COMMENT=	Python module for building parametric 3D CAD models
 WWW=		https://github.com/CadQuery/cadquery
 
 LICENSE=	APACHE20
 
 DEPRECATED=	Depends on exppired cad/py-ocp
 EXPIRATION_DATE=2023-06-21
 
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/ezdxf/__init__.py:cad/py-ezdxf@${PY_FLAVOR} \
 		${PYTHON_SITELIBDIR}/OCP.so:cad/py-ocp@${PY_FLAVOR} \
 		${PYTHON_SITELIBDIR}/pyparsing.py:devel/py-pyparsing@${PY_FLAVOR} \
 		${PYTHON_SITELIBDIR}/typing_extensions.py:devel/py-typing-extensions@${PY_FLAVOR}
 
 USES=		python:3.6+,run
 USE_PYTHON=	autoplist distutils
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	CadQuery
 
 post-extract:
 # Move into a sub-directory so that we don't pollute site-packages.
 	${MV} ${WRKSRC}/tests ${WRKSRC}/cadquery/tests
 
 .include <bsd.port.mk>
diff --git a/cad/py-cq-editor/Makefile b/cad/py-cq-editor/Makefile
index 8f4d01514618..fa39ebb0e6a8 100644
--- a/cad/py-cq-editor/Makefile
+++ b/cad/py-cq-editor/Makefile
@@ -1,27 +1,27 @@
 PORTNAME=	cq-editor
 DISTVERSION=	0.1.2
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	cad
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	ports@nicandneal.net
 COMMENT=	CadQuery GUI editor based on PyQT
 WWW=		https://github.com/CadQuery/CQ-editor/
 
 LICENSE=	APACHE20
 
 DEPRECATED=	Depends on expiring cad/py-cadquery
 EXPIRATION_DATE=2023-06-21
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cadquery>=0:cad/py-cadquery@${PY_FLAVOR} \
 		${PYTHON_SITELIBDIR}/spyder/__init__.py:devel/spyder
 
 USES=		pyqt:5 python:3.6+
 USE_PYTHON=	autoplist distutils
 USE_PYQT=	pyqt5
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	CadQuery
 GH_PROJECT=	CQ-editor
 
 .include <bsd.port.mk>
diff --git a/cad/py-edalize/Makefile b/cad/py-edalize/Makefile
index a34ab355bf5a..beeed18c3e39 100644
--- a/cad/py-edalize/Makefile
+++ b/cad/py-edalize/Makefile
@@ -1,36 +1,37 @@
 PORTNAME=	edalize
 DISTVERSION=	0.5.0
+PORTREVISION=	1
 CATEGORIES=	cad python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Library for interfacing EDA tools
 WWW=		https://github.com/olofk/edalize
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}types-Jinja2>0:devel/py-types-Jinja2@${PY_FLAVOR} \
 		gmake:devel/gmake \
 		yosys:cad/yosys
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}vunit-hdl>0:cad/py-vunit-hdl@${PY_FLAVOR}
 
 USES=		python:3.6+ shebangfix
 USE_PYTHON=	distutils autoplist pytest
 
 SHEBANG_FILES=	tests/mock_commands/* scripts/el_docker
 
 NO_ARCH=	yes
 
 post-patch:
 	@${GREP} -rl '"make"' ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -i '' -e 's|"make"|"${GMAKE}"|'
 	@${GREP} -rl '"python3"' ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -i '' -e 's|"python3"|"${PYTHON_CMD}"|'
 	@${GREP} -rl 'shell python3 ' ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -i '' -e 's|shell python3 |shell ${PYTHON_CMD} |'
 	@${GREP} -rl '$$(shell which python3)' ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -i '' -e 's|$$(shell which python3)|${PYTHON_CMD}|'
 	@${REINPLACE_CMD} -i '' -e 's|/usr/bin/env python3|${PYTHON_CMD}|' ${WRKSRC}/tests/mock_commands/vcs
 
 # testsuite has intermittent failures: in many runs many tests fail, but sometimes all tests but 1 succeed, see https://github.com/olofk/edalize/issues/368
 # 2 tests (test_modelsim,test_modelsim_common_compilation) always fail because it depends on Intel's modelsim
 
 .include <bsd.port.mk>
diff --git a/cad/py-ezdxf/Makefile b/cad/py-ezdxf/Makefile
index b8b54639db32..ff912bdcded8 100644
--- a/cad/py-ezdxf/Makefile
+++ b/cad/py-ezdxf/Makefile
@@ -1,25 +1,26 @@
 PORTNAME=	ezdxf
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.0.2
+PORTREVISION=	1
 CATEGORIES=	cad
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	ports@nicandneal.net
 COMMENT=	Create and modify DXF drawings
 WWW=		https://ezdxf.mozman.at/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyparsing>=2.0.1:devel/py-pyparsing@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}geomdl>0:graphics/py-geomdl@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}geomdl>0:graphics/py-geomdl@${PY_FLAVOR}
 
 USES=		python:3.7+ pytest
 USE_PYTHON=	concurrent distutils autoplist
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	mozman
 
 .include <bsd.port.mk>
diff --git a/cad/py-gdspy/Makefile b/cad/py-gdspy/Makefile
index 733b15202545..44322f17252e 100644
--- a/cad/py-gdspy/Makefile
+++ b/cad/py-gdspy/Makefile
@@ -1,56 +1,57 @@
 PORTNAME=	gdspy
 PORTVERSION=	1.6.11
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	cad python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Python module for creating GDSII stream files
 WWW=		https://github.com/heitzmann/gdspy
 
 LICENSE=	BSL
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy@${PY_FLAVOR}
 TEST_DEPENDS=	pytest:devel/py-pytest@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_PYTHON=	distutils autoplist
 USE_GITHUB=	yes
 GH_ACCOUNT=	heitzmann
 
 OPTIONS_DEFINE=	EXAMPLES
 EXAMPLES_PLIST_FILES=	\
 	${EXAMPLESDIR}/cell.py \
 	${EXAMPLESDIR}/cellarray.py \
 	${EXAMPLESDIR}/cellreference.py \
 	${EXAMPLESDIR}/curve.py \
 	${EXAMPLESDIR}/flexpath.py \
 	${EXAMPLESDIR}/functions.py \
 	${EXAMPLESDIR}/gdslibrary.py \
 	${EXAMPLESDIR}/gdswriter.py \
 	${EXAMPLESDIR}/polygonset.py \
 	${EXAMPLESDIR}/robustpath.py \
 	${EXAMPLESDIR}/test.gds \
 	${EXAMPLESDIR}/tutils.py \
 	${EXAMPLESDIR}/maketestgds.py
 
 do-test:
 	cd ${WRKSRC} && \
 	    ${SETENV} PYTHONPATH=${STAGEDIR}${PYTHON_SITELIBDIR} \
 	    ${LOCALBASE}/bin/pytest
 
 post-install:
 	cd ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME} && \
 	    ${STRIP_CMD} clipper*.so
 
 post-install-EXAMPLES-on:
 	cd ${WRKSRC}/tests && \
 	    ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} && \
 	    ${INSTALL_SCRIPT} *.py ${STAGEDIR}${EXAMPLESDIR} && \
 	    ${INSTALL_DATA} *.gds ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/tools && \
 	    ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} && \
 	    ${INSTALL_SCRIPT} maketestgds.py ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/cad/py-gmsh/Makefile b/cad/py-gmsh/Makefile
index 3f7be2a99c75..ca80db0e9f7f 100644
--- a/cad/py-gmsh/Makefile
+++ b/cad/py-gmsh/Makefile
@@ -1,51 +1,52 @@
 PORTNAME=	gmsh
 DISTVERSION=	4.11.1
+PORTREVISION=	1
 CATEGORIES=	cad python
 MASTER_SITES=	https://gmsh.info/src/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	${PORTNAME}-${DISTVERSION}-source
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Automatic 3D finite element mesh generator (gmsh's own binding)
 WWW=		https://gmsh.info/
 
 LICENSE=	AGPLv3+ APACHE20 GPLv3+ GPLv2+ LGPL21
 LICENSE_COMB=	multi
 
 BUILD_DEPENDS=	swig:devel/swig
 LIB_DEPENDS=	libcgns.so:science/cgnslib \
 		libfltk_images.so:x11-toolkits/fltk \
 		libfreetype.so:print/freetype2 \
 		libgmp.so:math/gmp \
 		libhdf5.so:science/hdf5 \
 		libmedC.so:french/med \
 		libpng16.so:graphics/png \
 		libsz.so:science/libaec \
 		libTKV3d.so:cad/opencascade
 
 USES=		cmake gl gnome jpeg python:3.6+ tar:tgz xorg
 USE_PYTHON=	flavors
 USE_GNOME=	cairo
 USE_GL=		gl glu
 USE_XORG=	ice sm x11 xext
 USE_LDCONFIG=	${PYTHON_SITELIBDIR}
 
 CMAKE_ON=	ENABLE_WRAP_PYTHON ENABLE_PRIVATE_API ENABLE_OCC
 CMAKE_ARGS=	-DOCC_INC=${LOCALBASE}/include/OpenCASCADE
 
 post-install: # remove all except for the python binding
 	@cd ${STAGEDIR}${PREFIX} && \
 		${RM} -r \
 			bin/* \
 			include/gmsh* \
 			lib/gmsh.jl \
 			share/doc/gmsh \
 			share/man/man1/gmsh.1
 	# move "private API" libs to the python folder
 	@cd ${STAGEDIR} && \
 		${MV} \
 			${STAGEDIR}${PREFIX}/lib/gmsh* \
 			${STAGEDIR}${PREFIX}/lib/lib* \
 			${STAGEDIR}${PYTHON_SITELIBDIR}
 
 .include <bsd.port.mk>
diff --git a/cad/py-lcapy/Makefile b/cad/py-lcapy/Makefile
index f4be977dcacf..6f4b10539427 100644
--- a/cad/py-lcapy/Makefile
+++ b/cad/py-lcapy/Makefile
@@ -1,36 +1,36 @@
 PORTNAME=	lcapy
 DISTVERSION=	g20171202
-PORTREVISION=	4
+PORTREVISION=	5
 PORTEPOCH=	1
 CATEGORIES=	cad python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Symbolic MDA Analysis Package for Linear Circuits
 WWW=		https://github.com/mph-/lcapy
 
 LICENSE=	LGPL21
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sympy>0:math/py-sympy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	distutils concurrent autoplist
 USE_GITHUB=	yes
 GH_ACCOUNT=	mph-
 GH_TAGNAME=	23c940f
 PORTEXAMPLES=	netlists \
 		networks \
 		notebooks \
 		schematics
 
 OPTIONS_DEFINE=	EXAMPLES
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/doc/examples && \
 	    ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/cad/py-ocp/Makefile b/cad/py-ocp/Makefile
index 336ae07c1b59..c66513517e5a 100644
--- a/cad/py-ocp/Makefile
+++ b/cad/py-ocp/Makefile
@@ -1,45 +1,45 @@
 PORTNAME=	ocp
 DISTVERSION=	7.4-RC2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	cad
 # Direct access to github is needed because the release added an extra archive which
 # we need to build from, rather than the initial release.
 MASTER_SITES=	https://github.com/CadQuery/OCP/releases/download/${DISTVERSION}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	OCP_src_Linux
 
 MAINTAINER=	ports@nicandneal.net
 COMMENT=	Python wrapper for OCCT generated using pywrap
 WWW=		https://github.com/CadQuery/OCP
 
 BROKEN=		Mismatch between OpenCascase (7.5) and py-ocp (7.4)
 DEPRECATED=	Broken since 2021
 EXPIRATION_DATE=	2023-03-21
 
 LICENSE=	APACHE20
 
 PATCH_DEPENDS=	${LOCALBASE}/include/OpenCASCADE/OpenGl_HaltonSampler.hxx:cad/opencascade
 LIB_DEPENDS=	libTKernel.so:cad/opencascade
 BUILD_DEPENDS=	${LOCALBASE}/share/cmake/pybind11/pybind11Config.cmake:devel/pybind11 \
 		${PYTHON_SITELIBDIR}/pybind11:devel/py-pybind11@${PY_FLAVOR}
 
 USES=		cmake compiler:c++11-lang gl python:3.6+ zip
 USE_GL=		gl glu glut
 
 WRKSRC=		${WRKDIR}/OCP_src_Ubuntu-16.04
 
 OCCT=		${LOCALBASE}/include/OpenCASCADE
 OCCT_LOCAL=	${WRKSRC}/OCCT
 
 CMAKE_ARGS=	-DOPENCASCADE_INCLUDE_DIR=${OCCT} \
 		-DPYTHON_EXECUTABLE=${PYTHON_CMD}
 
 USE_PYTHON=	flavors
 
 PLIST_FILES=	${PYTHON_SITELIBDIR}/OCP.so
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}/
 	${INSTALL_LIB} ${BUILD_WRKSRC}/OCP.so ${STAGEDIR}${PYTHON_SITELIBDIR}
 
 .include <bsd.port.mk>
diff --git a/cad/py-phidl/Makefile b/cad/py-phidl/Makefile
index c0b4ea51632e..620f25e89665 100644
--- a/cad/py-phidl/Makefile
+++ b/cad/py-phidl/Makefile
@@ -1,21 +1,21 @@
 PORTNAME=	phidl
 PORTVERSION=	1.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	cad python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	GDS-based CAD tool for photonic and superconducting circuits
 WWW=		https://github.com/amccaugh/phidl
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gdspy>0:cad/py-gdspy@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_PYTHON=	distutils autoplist
 USE_GITHUB=	yes
 GH_ACCOUNT=	amccaugh
 
 .include <bsd.port.mk>
diff --git a/cad/py-pyfda/Makefile b/cad/py-pyfda/Makefile
index b5c415dc241b..ae95708501d7 100644
--- a/cad/py-pyfda/Makefile
+++ b/cad/py-pyfda/Makefile
@@ -1,47 +1,47 @@
 PORTNAME=	pyfda
 PORTVERSION=	0.1
-PORTREVISION=	11
+PORTREVISION=	12
 DISTVERSIONSUFFIX=	rc6
 CATEGORIES=	cad python devel
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	GUI tool for designing and analysing discrete time filters
 WWW=		https://github.com/chipmuenk/pyFDA
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR}
 
 USES=		python:3.7+ pyqt:5
 USE_PYTHON=	distutils autoplist
 USE_PYQT=	pyqt5:run
 NO_ARCH=	yes
 
 post-extract:
 	@${MV} ${WRKSRC}/pyfda/pyfda_log.conf ${WRKSRC}/pyfda/pyfda_log.conf.sample
 	@${MV} ${WRKSRC}/pyfda/pyfda_log_debug.conf ${WRKSRC}/pyfda/pyfda_log_debug.conf.sample
 
 post-patch:
 	@${REINPLACE_CMD} -e " \
 		s|package_data={'pyfda': \['pyfda_log.conf', 'pyfda_log_debug.conf',|package_data={'pyfda': [|; \
 		s|data_files = \[|data_files = [('${PREFIX}/etc', ['pyfda/pyfda_log.conf.sample', 'pyfda/pyfda_log_debug.conf.sample'])|" \
 		${WRKSRC}/setup.py
 	@${REINPLACE_CMD} -e " \
 		s|logging.config.fileConfig(os.path.join(base_dir, rc.log_config_file))|logging.config.fileConfig(os.path.join('${PREFIX}/etc', rc.log_config_file))|" \
 		${WRKSRC}/pyfda/pyfdax.py
 	@${REINPLACE_CMD} -e " \
 		s|'pyfda.log'|'/tmp/pyfda.log'|" \
 		${WRKSRC}/pyfda/*.conf.sample
 
 post-stage:
 	@${REINPLACE_CMD} -E " \
 		s|(.*\.sample)$$|@sample \1|" \
 		${WRKDIR}/.PLIST.pymodtmp
 
 .include <bsd.port.mk>
diff --git a/cad/py-pygmsh/Makefile b/cad/py-pygmsh/Makefile
index c61b473742c8..b6b0ee436128 100644
--- a/cad/py-pygmsh/Makefile
+++ b/cad/py-pygmsh/Makefile
@@ -1,31 +1,32 @@
 PORTNAME=	pygmsh
 DISTVERSION=	7.1.17
+PORTREVISION=	1
 CATEGORIES=	cad python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Python frontend for Gmsh (on top of Gmsh's own binding)
 WWW=		https://github.com/meshpro/pygmsh
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 PY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gmsh>0:cad/py-gmsh@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}meshio>=4.3.2:science/py-meshio@${PY_FLAVOR} \
 		${PYNUMPY}
 BUILD_DEPENDS=	${PY_DEPENDS}
 RUN_DEPENDS=	${PY_DEPENDS}
 
 USES=		python:3.7+
 USE_PYTHON=	distutils autoplist pytest # 1 error and many warnings in tests, see https://github.com/meshpro/pygmsh/issues/564
 
 NO_ARCH=	yes
 
 pre-configure:
 	@( \
 		${ECHO} "from setuptools import setup" && \
 		${ECHO} "setup()" \
 	) > ${WRKSRC}/setup.py
 
 .include <bsd.port.mk>
diff --git a/cad/py-pymtl/Makefile b/cad/py-pymtl/Makefile
index 195c67b548bf..64ecf42ff390 100644
--- a/cad/py-pymtl/Makefile
+++ b/cad/py-pymtl/Makefile
@@ -1,26 +1,27 @@
 PORTNAME=	pymtl
 DISTVERSION=	3.1.14
+PORTREVISION=	1
 CATEGORIES=	cad python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 PKGNAMESUFFIX=	${PORTVERSION:R:R}
 DISTNAME=	${PORTNAME}${PORTVERSION:R:R}-${DISTVERSION}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Python-based hardware generation, simulation, verification framework
 WWW=		https://github.com/pymtl/pymtl3
 
 LICENSE=	BSD3CLAUSE
 
 RUN_DEPENDS=	\
 		${PYTHON_PKGNAMEPREFIX}cffi>0:devel/py-cffi@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}greenlet>0:devel/py-greenlet@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}hypothesis>=4.18.1:devel/py-hypothesis@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_PYTHON=	autoplist distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/cad/qcsxcad/Makefile b/cad/qcsxcad/Makefile
index 6dfa29d35df1..893535235dea 100644
--- a/cad/qcsxcad/Makefile
+++ b/cad/qcsxcad/Makefile
@@ -1,36 +1,36 @@
 PORTNAME=	qcsxcad
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.6.2-9
-PORTREVISION=	2
+PORTREVISION=	3
 DISTVERSIONSUFFIX=	-g3f09a8b
 CATEGORIES=	cad
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Qt-GUI for CSXCAD
 WWW=		https://github.com/thliebig/QCSXCAD
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libCSXCAD.so:cad/csxcad \
 		libexpat.so:textproc/expat2 \
 		libfreetype.so:print/freetype2 \
 		libpng16.so:graphics/png \
 		libtiff.so:graphics/tiff \
 		libtinyxml.so:textproc/tinyxml \
 		libvtkCommonCore-${VTK_VER}.so:math/vtk${VTK_VER:R}
 
 USES=		cmake gl jpeg pkgconfig qt:5 xorg
 USE_QT=		core gui opengl sql widgets xml buildtools:build qmake:build
 USE_XORG=	ice sm x11 xext xt
 USE_GL=		gl opengl
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	thliebig
 GH_PROJECT=	${PORTNAME:tu}
 
 CMAKE_ARGS=	-DVTK_DIR=${LOCALBASE}/lib/cmake/vtk-${VTK_VER}
 
 .include <../../math/vtk9/Makefile.version>
 .include <bsd.port.mk>
diff --git a/cad/qflow/Makefile b/cad/qflow/Makefile
index 18f30acf3760..1dd069f6eccc 100644
--- a/cad/qflow/Makefile
+++ b/cad/qflow/Makefile
@@ -1,36 +1,37 @@
 PORTNAME=	qflow
 DISTVERSION=	1.4.100
+PORTREVISION=	1
 CATEGORIES=	cad
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	End-to-end digital synthesis flow for ASIC designs
 WWW=		http://opencircuitdesign.com/qflow/
 
 LICENSE=	GPLv2
 
 APP_DEPENDS=	abc:cad/abc \
 		graywolf:cad/graywolf \
 		magic>0:cad/magic \
 		netgen-lvs>0:cad/netgen-lvs \
 		qrouter>0:cad/qrouter \
 		sta:cad/openroad \
 		yosys>0:cad/yosys
 BUILD_DEPENDS=	${APP_DEPENDS}
 RUN_DEPENDS=	${APP_DEPENDS}
 
 USES=		gmake python tar:tgz tcl tk
 USE_GITHUB=	yes
 GH_ACCOUNT=	RTimothyEdwards
 
 GNU_CONFIGURE=	yes
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|^#!ENV_PATH python3$$|#!${PYTHON_CMD}|' ${WRKSRC}/scripts/*.py.in
 	@${REINPLACE_CMD} -e 's|^#!TCLSH_PATH$$|#!${TCLSH}|' ${WRKSRC}/scripts/*.tcl.in
 
 post-install:
 	@cd ${STAGEDIR}${PREFIX}/share/qflow/bin && \
 		${STRIP_CMD} vlog2Spice vlog2Verilog vlog2Def vlog2Cel vlogFanout DEF2Verilog addspacers vesta spice2delay rc2dly blif2BSpice blif2Verilog blifFanout && \
 		${RM} yosys-abc && ${LN} -s ${LOCALBASE}/bin/abc yosys-abc # https://github.com/RTimothyEdwards/qflow/issues/6
 
 .include <bsd.port.mk>
diff --git a/cad/scotch/Makefile b/cad/scotch/Makefile
index 1ce16bcbd015..9fb933476d7d 100644
--- a/cad/scotch/Makefile
+++ b/cad/scotch/Makefile
@@ -1,93 +1,93 @@
 PORTNAME=	scotch
 DISTVERSION=	6.0.4-aster7
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	cad science
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Package for graph and mesh partitioning and sparse matrix ordering
 WWW=		https://www.labri.fr/perso/pelegrin/scotch/
 
 LICENSE=	CeCILL_C
 LICENSE_NAME=	CeCILL-C
 LICENSE_FILE=	${WRKSRC}/doc/CeCILL-C_V1-en.txt
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 USES=		bison:alias gmake localbase
 
 CONFLICTS_INSTALL=	gbase gmap # bin/gbase bin/gmap
 
 MAKE_JOBS_UNSAFE=yes
 
 OPTIONS_DEFINE=	DOCS EXAMPLES MPICH
 OPTIONS_DEFAULT=MPICH
 OPTIONS_SUB=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
 BUILD_WRKSRC=	${WRKSRC}/src
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 TEST_WRKSRC=	${BUILD_WRKSRC}
 ALL_TARGET=	esmumps
 TEST_TARGET=	check
 MAKE_ENV=	prefix=${STAGEDIR}${PREFIX} mandir=${STAGEDIR}${PREFIX}/share/man	\
 		-DSCOTCH_PTHREAD_NUMBER=2
 USE_LDCONFIG=	yes
 
 DOCVER=		${PORTVERSION:R:R}
 PORTDOCS=	ptscotch_user${DOCVER}.pdf scotch_user${DOCVER}.pdf scotch_example.f
 LIBS=		esmumps scotch scotcherr scotcherrexit scotchmetis
 
 MPICH_USES=		mpi:mpich
 MPICH_ALL_TARGET=	ptesmumps
 MPICH_TEST_TARGET=	ptcheck
 MPICH_LIBS+=	ptesmumps ptscotch ptscotcherr ptscotcherrexit ptscotchparmetis
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == "i386"
 MF=	i686
 .else
 MF=	x86-64
 .endif
 
 pre-everything::
 .if !defined(WITHOUT_MPICH)
 	@${ECHO_MSG}
 	@${ECHO_MSG} "Define WITHOUT_MPI if PT-Scotch is not wanted."
 	@${ECHO_MSG}
 .endif
 
 pre-configure:
 	${REINPLACE_CMD} -e 's/-lthread/-pthread/;s/-lpthread/-pthread/'\
 		${WRKSRC}/src/Make.inc/Makefile.inc.${MF}_pc_freebsd
 	${LN} -sf ${WRKSRC}/src/Make.inc/Makefile.inc.${MF}_pc_freebsd	\
 		${WRKSRC}/src/Makefile.inc
 	${REINPLACE_CMD} -E -e 's|cd (.*) ; * \$$\(MAKE\)|\$$(MAKE) -C \1|'	\
 		-e 's|\&\& \$$\(MAKE\)||' ${WRKSRC}/src/Makefile
 
 post-stage:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* ${STAGEDIR}${PREFIX}/lib/lib*
 .for l in ${LIBS}
 	${MV} ${STAGEDIR}${PREFIX}/lib/lib${l}.so ${STAGEDIR}${PREFIX}/lib/lib${l}.so.0
 	${LN} -sf lib${l}.so.0 ${STAGEDIR}${PREFIX}/lib/lib${l}.so
 .endfor
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/doc/|} ${STAGEDIR}${DOCSDIR}
 
 do-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/grf ${STAGEDIR}${EXAMPLESDIR}/tgt
 	${INSTALL_DATA} ${WRKSRC}/grf/* ${STAGEDIR}${EXAMPLESDIR}/grf
 	${INSTALL_DATA} ${WRKSRC}/tgt/* ${STAGEDIR}${EXAMPLESDIR}/tgt
 
 .if !defined(WITHOUT_MPI)
 pre-test:
 . if !exists(${HOME}/.mpd.conf)
 	@${ECHO_CMD} "MPD_SECRETWORD=change_on_install" > ${HOME}/.mpd.conf
 	${CHMOD} go-r ${HOME}/.mpd.conf
 	@${ECHO_MSG} "${HOME}/.mpd.conf has been generated - please change the secret word!"
 . endif
 .endif
 
 .include "${.CURDIR}/../../french/aster/bsd.aster.mk"
 .include <bsd.port.mk>
diff --git a/cad/silice/Makefile b/cad/silice/Makefile
index 61a004b8f902..0314970b0f62 100644
--- a/cad/silice/Makefile
+++ b/cad/silice/Makefile
@@ -1,39 +1,40 @@
 PORTNAME=	silice
 DISTVERSION=	g20221229
+PORTREVISION=	1
 CATEGORIES=	cad
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Language that simplifies prototyping and writing algorithms for FPGAs
 WWW=		https://github.com/sylefeb/Silice
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE_GPLv3
 
 BUILD_DEPENDS=	bash:shells/bash
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}edalize>0:cad/py-edalize@${PY_FLAVOR} # examples also require xtclsh from Xilinx
 
 USES=		cmake:noninja python shebangfix
 USE_JAVA=	yes
 
 JAVA_VERSION=	17
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	sylefeb
 GH_PROJECT=	Silice
 GH_TAGNAME=	6a2beda
 GH_TUPLE=	sylefeb:LibSL-small:b1942d5:LibSL_small/src/libs/LibSL-small \
 		sylefeb:tinygpus:e6429ac:tinygpus/projects/tinygpus \
 		ultraembedded:fat_io_lib:0ef5c2b:fat_io_lib/learn-silice/classroom/soc_wave_player/firmware/fat_io_lib
 
 SHEBANG_GLOB=	*.sh *.py
 
 do-install:
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/silice-make.py ${STAGEDIR}${PREFIX}/bin
 	${REINPLACE_CMD} \
 		-i '' \
 		-e 's|frameworks_dir = os.path.realpath(os.path.join(make_dir,"../frameworks/"))|frameworks_dir = "${DATADIR}/frameworks"|' \
 		${STAGEDIR}${PREFIX}/bin/silice-make.py
 	cd ${WRKSRC} && ${COPYTREE_SHARE} frameworks ${STAGEDIR}${DATADIR}
 
 .include <bsd.port.mk>
diff --git a/cad/solvespace/Makefile b/cad/solvespace/Makefile
index 32b10560341c..19171121f8b9 100644
--- a/cad/solvespace/Makefile
+++ b/cad/solvespace/Makefile
@@ -1,39 +1,39 @@
 PORTNAME=	solvespace
 PORTVERSION=	3.1
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	cad
 
 PATCH_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/commit/
 PATCHFILES=	6b9e7b2e.patch:-p1
 
 MAINTAINER=	lbartoletti@FreeBSD.org
 COMMENT=	Parametric 2d/3d CAD
 WWW=		https://solvespace.com/
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING.txt
 
 LIB_DEPENDS=	libpng.so:graphics/png \
 		libjson-c.so:devel/json-c \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2
 
 USES=		cmake compiler:c++11-lang eigen:3 gl gnome pkgconfig xorg
 USE_GL=		gl glu glew
 USE_GNOME=	gtkmm30 pangomm
 USE_XORG=	x11
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	microsoft:mimalloc
 GH_PROJECT=	libdxfrw:libdxfrw mimalloc:mimalloc
 GH_TAGNAME=	0b7b7b7:libdxfrw 38a0322:mimalloc
 GH_SUBDIR=	extlib/libdxfrw:libdxfrw extlib/mimalloc:mimalloc
 
 INSTALLS_ICONS=	YES
 
 post-patch:
 	${REINPLACE_CMD} -e '/-stdlib=libc++/d' ${WRKSRC}/CMakeLists.txt
 
 .include <bsd.port.mk>
diff --git a/cad/sumo/Makefile b/cad/sumo/Makefile
index 87a9005aee0e..4cd5414e743f 100644
--- a/cad/sumo/Makefile
+++ b/cad/sumo/Makefile
@@ -1,34 +1,34 @@
 PORTNAME=	sumo
 DISTVERSION=	1.2.0
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	cad
 MASTER_SITES=	http://www.dlr.de/ts/en/Portaldata/16/Resources/projekte/sumo/
 DISTFILES=	${PORTNAME}-src-${DISTVERSIONFULL}${EXTRACT_SUFX}
 
 MAINTAINER=	enriquefynn@gmail.com
 COMMENT=	Traffic simulation suite for road vehicles, public transportation, etc
 WWW=		http://sumo-sim.org
 
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libFOX-1.6.so:x11-toolkits/fox16 \
 		libfreetype.so:print/freetype2 \
 		libgdal.so:graphics/gdal \
 		libpng.so:graphics/png \
 		libproj.so:graphics/proj \
 		libtiff.so:graphics/tiff \
 		libxerces-c.so:textproc/xerces-c3
 
 USES=		compiler:c++11-lang cmake gl jpeg python shebangfix zip xorg
 SHEBANG_FILES=	tools/*.py tools/*/*.py \
 		tools/*/*/*.py tools/*/*/*/*.py \
 		tools/*/*/*/*/*/*.py \
 		tools/game/A10KW/build.sh \
 		tools/game/rebuild_networks.sh \
 		tools/build/rebuild_cscope.sh \
 		tools/build/dailyUpdateMakeGCC.sh
 
 python_OLD_CMD+="/usr/bin/env python"
 USE_GL=		gl glu
 USE_XORG=	x11 xcursor xext xfixes xft xi xrandr xrender
 
 .include <bsd.port.mk>
diff --git a/cad/tochnog/Makefile b/cad/tochnog/Makefile
index e648ae9ffc5a..916c00665841 100644
--- a/cad/tochnog/Makefile
+++ b/cad/tochnog/Makefile
@@ -1,84 +1,84 @@
 PORTNAME=	tochnog
 PORTVERSION=	20140100
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	cad
 MASTER_SITES=	SF/${PORTNAME}/Tochnog%20Latest%20January%202014
 DISTFILES=	Sources${EXTRACT_SUFX} gid${EXTRACT_SUFX} \
 		tools${EXTRACT_SUFX} test${EXTRACT_SUFX}
 DIST_SUBDIR=	${DISTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Free explicit/implicit Finite Element Program
 WWW=		http://tochnog.sourceforge.net/
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libf2c.a:lang/f2c
 
 OPTIONS_DEFINE=	ATLAS EXAMPLES
 ATLAS_DESC=	Use ATLAS instead of BLAS/LAPACK
 
 WRKSRC=		${WRKDIR}/Sources/Tochnog-Latest-jan-2014
 MAKEFILE=	makefile
 USES=		fortran zip dos2unix
 DOS2UNIX_FILES=	time.cc time.h tnlapack.h tnsuplu.h
 
 # You can set GIDDIR to share/gid to install the scripts to be used
 # with the cad/linux-gid port, otherwise they can be linked to the data
 # directory to avoid polluting the port space.
 
 GIDDIR?=	share/${PORTNAME}
 PLIST_SUB+=	GIDDIR=${GIDDIR}
 GID_PTYPES=	${PREFIX}/${GIDDIR}/problemtypes
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MATLAS}
 LIB_DEPENDS+=	libatlas.so:math/atlas
 BLAS_LIBS=	-lf77blas
 .else
 LIB_DEPENDS+=	libblas.so:math/blas	\
 		liblapack.so:math/lapack
 BLAS_LIBS=	-llapack -lblas
 .endif
 
 ALL_TARGET=	freebsd_old
 LIB_DEPENDS+=	libsuperlu.so:math/superlu
 SUPERLU=	superlu
 
 post-extract:
 .for sup in gid tools test
 	${MV} ${WRKDIR}/${sup} ${WRKDIR}/Sources/
 .endfor
 
 pre-configure:
 .for hd in pthread.h
 	${MV} ${WRKSRC}/${hd} ${WRKSRC}/${hd}.orig
 .endfor
 	${REINPLACE_CMD} -e 's,%%LOCALBASE%%,${LOCALBASE},g ; \
 	s,%%SUPERLU%%,${SUPERLU},g ; \
 	s,%%BLAS_LIBS%%,-L${LOCALBASE}/lib ${BLAS_LIBS},g' \
 	${WRKSRC}/makefile
 	${REINPLACE_CMD} -e 's,SUPERLU_USE 0,SUPERLU_USE 1,' \
 	${WRKSRC}/tnsuplu.h
 
 post-build:
 	(cd ${WRKDIR}/Sources/tools && ${CXX} ${CXXFLAGS} -o aba2tn aba2tn.cc)
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/tochnog ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKDIR}/Sources/tools/aba2tn ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKDIR}/Sources/tools/*.awk ${STAGEDIR}${PREFIX}/bin
 	${MKDIR} ${STAGEDIR}${GID_PTYPES}/tochnog.gid
 	${INSTALL_DATA} ${WRKDIR}/Sources/gid/tochnog.gid/tochnog.cnd	\
 	  ${STAGEDIR}${GID_PTYPES}/tochnog.gid
 	${INSTALL_DATA} ${WRKDIR}/Sources/gid/tochnog.gid/tochnog.mat	\
 	  ${STAGEDIR}${GID_PTYPES}/tochnog.gid
 	${INSTALL_SCRIPT} ${WRKDIR}/Sources/gid/tochnog.gid/tochnog.ba*	\
 	  ${STAGEDIR}${GID_PTYPES}/tochnog.gid
 do-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${RM} ${WRKDIR}/Sources/test/*.orig
 	${INSTALL_DATA} ${WRKDIR}/Sources/test/* ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/cad/uranium/Makefile b/cad/uranium/Makefile
index cf1e7b7bdf54..834ded7a2437 100644
--- a/cad/uranium/Makefile
+++ b/cad/uranium/Makefile
@@ -1,33 +1,33 @@
 PORTNAME=	Uranium
 PORTEPOCH=	1
 DISTVERSION=	4.13.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	cad
 DIST_SUBDIR=	Ultimaker
 
 MAINTAINER=	db@FreeBSD.org
 COMMENT=	Python framework for 3D printing applications
 WWW=		https://github.com/Ultimaker/Uranium/blob/master/docs/overview.md
 
 LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}PyOpenGL>0:graphics/py-PyOpenGL@${PY_FLAVOR}
 
 USES=		cmake gettext python:3.5+ pyqt:5
 USE_PYQT=	pyqt5
 USE_GITHUB=	yes
 GH_ACCOUNT=	Ultimaker
 STRIP=
 NO_ARCH=	yes
 
 post-patch:
 	@${FIND} ${WRKSRC} -name "*.orig" -delete
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/uranium/scripts
 	cd ${WRKSRC}/scripts && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/share/uranium/scripts
 
 .include <bsd.port.mk>
diff --git a/cad/verilog-mode.el/Makefile b/cad/verilog-mode.el/Makefile
index f3594469c75f..0ce7c567f540 100644
--- a/cad/verilog-mode.el/Makefile
+++ b/cad/verilog-mode.el/Makefile
@@ -1,33 +1,33 @@
 PORTNAME=	verilog-mode.el
 PORTVERSION=	801
-PORTREVISION=	15
+PORTREVISION=	17
 CATEGORIES=	cad elisp
 MASTER_SITES=	http://www.veripool.org/ftp/
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 DISTNAME=	${PORTNAME:R}-${PORTVERSION}.${PORTNAME:E}
 EXTRACT_SUFX=	.gz
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Emacs lisp modules for the Verilog language
 WWW=		https://www.veripool.org/wiki/verilog-mode
 
 LICENSE=	GPLv3+
 
 EXTRACT_CMD=	${GZCAT}
 EXTRACT_BEFORE_ARGS=	#
 EXTRACT_AFTER_ARGS=	> ${PORTNAME}
 
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 
 USES=		emacs:run
 
 CONFLICTS_INSTALL=	verilog-mode.el verilog-mode.el-emacs_* # share/emacs/site-lisp/verilog-mode.el
 
 PLIST_FILES=	${EMACS_SITE_LISPDIR}/${PORTNAME}
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}
 
 .include <bsd.port.mk>
diff --git a/cad/xyce/Makefile b/cad/xyce/Makefile
index 3db930a14e60..ba259d1392af 100644
--- a/cad/xyce/Makefile
+++ b/cad/xyce/Makefile
@@ -1,75 +1,75 @@
 PORTNAME=	xyce
 DISTVERSION=	7.6.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	cad
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Xyce electronic simulator
 WWW=		https://xyce.sandia.gov/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libblas.so:math/blas \
 		libfftw3.so:math/fftw3 \
 		liblapack.so:math/lapack \
 		libtpetra.so:science/trilinos \
 		\
 		libamd.so:math/suitesparse-amd \
 		libcholmod.so:math/suitesparse-cholmod \
 		libcolamd.so:math/suitesparse-colamd \
 		libsuitesparseconfig.so:math/suitesparse-config \
 		libumfpack.so:math/suitesparse-umfpack
 TEST_DEPENDS=	git:devel/git \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR}
 
 USES=		autoreconf bison gmake fortran libtool localbase perl5 python:test # GNU tools should be used for 7.5 and on until the cmake build is declared stable
 USE_CXXSTD=	c++14 # otherwise configure fails because of c++14 features like std::conditional_t
 USE_LDCONFIG=	yes
 USE_PERL5=	test
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Xyce
 GH_PROJECT=	Xyce
 GH_TAGNAME=	Release-${DISTVERSION}
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	LEX=/usr/bin/flex \
 		--enable-stokhos \
 		--enable-amesos \
 		--enable-shared \
 		--disable-static
 
 INSTALL_TARGET=	install-strip
 
 BINARY_ALIAS=	python=${PYTHON_CMD} # only for tests
 
 do-test: # one test is known to fail, see https://github.com/Xyce/Xyce/issues/67#issuecomment-1179857728
 	# checkout tests
 	@cd ${WRKDIR} && \
 		${ECHO} "cloning git repository ..." && \
 		${RM} -rf Xyce_Regression && \
 		git clone -q https://github.com/Xyce/Xyce_Regression.git && \
 		cd Xyce_Regression && \
 		git checkout -q Release-${DISTVERSION}
 
 	# run tests
 	@cd ${TEST_WRKSRC} && ( \
 		${ECHO} "running tests ..."; \
 		eval `${WRKDIR}/Xyce_Regression/TestScripts/suggestXyceTagList.sh ${STAGEDIR}${PREFIX}/bin/Xyce` ; \
 		${SETENV} ${TEST_ENV} ${WRKDIR}/Xyce_Regression/TestScripts/run_xyce_regression \
 			--output=${WRKDIR}/Xyce_Test \
 			--xyce_test="${WRKDIR}/Xyce_Regression" \
 			--resultfile=${WRKDIR}/serial_results \
 			--taglist="$$TAGLIST" \
 			${STAGEDIR}${PREFIX}/bin/Xyce \
 	)
 	# Testssuite doesn't stop when Ctrl-C is pressed: https://github.com/Xyce/Xyce_Regression/issues/1
 
 # Trilinos build instructions for Xyce: https://xyce.sandia.gov/documentation-tutorials/building-guide/#instTrilinos
 # Xyce build instructions: https://xyce.sandia.gov/documentation-tutorials/building-guide/
 # Xyce regression suite instructions: https://xyce.sandia.gov/documentation-tutorials/running-the-xyce-regression-suite/
 # docs are in https://xyce.sandia.gov/files/xyce/Xyce_Docs-7.5.tar.gz
 
 .include <bsd.port.mk>
diff --git a/cad/yosys/Makefile b/cad/yosys/Makefile
index 0c24f49a2a35..7cba00076678 100644
--- a/cad/yosys/Makefile
+++ b/cad/yosys/Makefile
@@ -1,58 +1,59 @@
 PORTNAME=	yosys
 DISTVERSIONPREFIX=	yosys-
 DISTVERSION=	0.28
+PORTREVISION=	1
 CATEGORIES=	cad
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Yosys Open SYnthesis Suite
 WWW=		https://yosyshq.net/yosys/
 
 LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	abc:cad/abc \
 		bash:shells/bash \
 		gawk:lang/gawk
 LIB_DEPENDS=	libffi.so:devel/libffi
 RUN_DEPENDS=	xdot:x11/py-xdot@${PY_FLAVOR}
 TEST_DEPENDS=	bash:shells/bash \
 		iverilog:cad/iverilog
 
 USES=		bison compiler:c++11-lang gmake pkgconfig python:3.6+ readline \
 		shebangfix tcl
 
 SHEBANG_FILES=	backends/smt2/smtbmc.py \
 		misc/yosys-config.in
 SHEBANG_GLOB=	*.sh *.py
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	YosysHQ
 
 BINARY_ALIAS=	python3=${PYTHON_CMD} tclsh=${TCLSH}
 MAKE_ARGS=	ABCEXTERNAL=abc
 MAKE_ENV=	MAKE=${GMAKE}
 
 TEST_TARGET=	test # some tests fail, see https://github.com/YosysHQ/yosys/issues/3731
 
 OPTIONS_GROUP=		SOLVERS
 OPTIONS_GROUP_SOLVERS=	CVC5 YICES Z3
 OPTIONS_DEFAULT=	YICES # same as the default in C++ code
 
 SOLVERS_DESC=		Install SAT solvers
 CVC5_DESC=		CVC SAT Solver
 YICES_DESC=		Yices SAT Solver
 Z3_DESC=		Z3 SAT Solver
 
 CVC5_RUN_DEPENDS=	cvc5:math/cvc5
 YICES_RUN_DEPENDS=	yices_smt2:math/yices
 Z3_RUN_DEPENDS=		z3:math/z3
 
 post-patch:
 	${REINPLACE_CMD} -e '/^CXX =/d; s/^LD = .*/LD = $$(CXX)/' \
 		-e '/^CONFIG/s/clang/${CHOSEN_COMPILER_TYPE}/' \
 		${WRKSRC}/Makefile
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/yosys
 
 .include <bsd.port.mk>
diff --git a/comms/apitran/Makefile b/comms/apitran/Makefile
index eb00260566e8..27433beef99b 100644
--- a/comms/apitran/Makefile
+++ b/comms/apitran/Makefile
@@ -1,40 +1,40 @@
 PORTNAME=	apitran
 PORTVERSION=	g20180926
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	comms astro hamradio python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Toolkit to handle the automatic picture transmission protocol
 WWW=		https://github.com/rsj56/apitran
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \
 		sox:audio/sox
 
 USES=		magick:6,run python:3.6+,run shebangfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	rsj56
 GH_TAGNAME=	d209347
 
 NO_BUILD=	yes
 NO_ARCH=	yes
 SHEBANG_FILES=	apitran
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/apitran ${STAGEDIR}${PREFIX}/bin
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in NOAA_APT_Frame_Format.gif README.md
 	${INSTALL_DATA} ${WRKSRC}/$f ${STAGEDIR}${DOCSDIR}
 .endfor
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 .for f in ex_1ch_11025.png ex_2ch_48000.png ex_2ch_48000.wav
 	${INSTALL_DATA} ${WRKSRC}/Examples/$f ${STAGEDIR}${EXAMPLESDIR}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/comms/cubicsdr/Makefile b/comms/cubicsdr/Makefile
index 1cbb2c705d69..5d04781708ab 100644
--- a/comms/cubicsdr/Makefile
+++ b/comms/cubicsdr/Makefile
@@ -1,46 +1,46 @@
 PORTNAME=	cubicsdr
 PORTVERSION=	0.2.5
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	comms hamradio
 
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	SDR receiver using liquidsdr
 WWW=		https://cubicsdr.readthedocs.io/en/latest/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYNUMPY} \
 		${LOCALBASE}/libdata/pkgconfig/dri.pc:graphics/mesa-dri
 LIB_DEPENDS=	libSoapySDR.so:misc/soapysdr \
 		libliquid.so:comms/liquid-dsp \
 		libpulse.so:audio/pulseaudio \
 		libhamlib.so:comms/hamlib
 
 USES=		cmake:noninja compiler:c++11-lib gl python
 USE_WX=		3.2
 USE_GL+=	egl glu
 
 OPTIONS_DEFINE=	HAMLIB
 HAMLIB_DESC=	Support rig control via hamlib
 OPTIONS_DEFAULT=	HAMLIB
 # for detailed debugging uncomment the next line
 #CMAKE_ARGS+=   --debug-output --trace
 
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MHAMLIB}
 LIB_DEPENDS+=	libhamlib.so:comms/hamlib
 CMAKE_ARGS+=	-DUSE_HAMLIB=1
 .endif
 
 CMAKE_ARGS+=	-DwxWidgets_CONFIG_EXECUTABLE=${LOCALBASE}/bin/wxgtk3u-3.2-config
 USE_GITHUB=	yes
 GH_ACCOUNT=	cjcliffe
 GH_PROJECT=	CubicSDR
 GH_TAGNAME=	0248e5a
 #
 # N.B. modem from liquidsp was renamed to modemcf Fri Nov 12, 2021
 # our port liquidsp is not synced with Master hence we are stuck here for now. -db
 
 .include <bsd.port.post.mk>
diff --git a/comms/ems-flasher/Makefile b/comms/ems-flasher/Makefile
index 593258c6ef5a..2c172faa9b3f 100644
--- a/comms/ems-flasher/Makefile
+++ b/comms/ems-flasher/Makefile
@@ -1,24 +1,24 @@
 PORTNAME=	ems-flasher
 PORTVERSION=	0.03
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	comms
 MASTER_SITES=	http://lacklustre.net/projects/ems-flasher/ \
 		https://cooltrainer.org/freebsd-ports/ems-flasher/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Utility to flash ROM images to the EMS USB 64mb flash cart
 WWW=		https://lacklustre.net/redmine/projects/ems-flash/
 
 LICENSE=	MIT
 
 USES=		gmake tar:tgz
 CFLAGS+=	-g -Wall
 LDFLAGS+=	-lusb
 USE_GCC=	yes
 
 PLIST_FILES=	bin/ems-flasher
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ems-flasher ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/comms/gnuradio/Makefile b/comms/gnuradio/Makefile
index 46b974ea9018..63fb853f568f 100644
--- a/comms/gnuradio/Makefile
+++ b/comms/gnuradio/Makefile
@@ -1,115 +1,115 @@
 PORTNAME=	gnuradio
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.8.4.0
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	comms astro hamradio
 
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Amateur Radio Software defined radio
 WWW=		https://www.gnuradio.org/
 
 LICENSE=	GPLv3
 
 BUILD_DEPENDS=	volk>0:devel/volk \
 		doxygen>0:devel/doxygen \
 		${PYTHON_PKGNAMEPREFIX}sphinx>=1.2.2,1:textproc/py-sphinx@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
 		${PYNUMPY} \
 		${PYTHON_SITELIBDIR}/mako/__init__.py:textproc/py-mako@${PY_FLAVOR} \
 		${PYTHON_SITELIBDIR}/yaml/__init__.py:devel/py-yaml@${PY_FLAVOR} \
 		${PYTHON_SITELIBDIR}/gi/__init__.py:devel/py-gobject3@${PY_FLAVOR} \
 		${PYTHON_SITELIBDIR}/cairo/__init__.py:graphics/py-cairo@${PY_FLAVOR} \
 		${PYTHON_SITELIBDIR}/six.py:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_SITELIBDIR}/click/__init__.py:devel/py-click@${PY_FLAVOR} \
 		${PYTHON_SITELIBDIR}/click_plugins/__init__.py:devel/py-click-plugins@${PY_FLAVOR} \
 		aconnect:audio/alsa-utils \
 		cheetah:devel/py-cheetah3@${PY_FLAVOR} \
 		cppzmq>0:net/cppzmq \
 		minixmlto:textproc/minixmlto \
 		sdl-config:devel/sdl12 \
 		swig:devel/swig \
 		mpir>0:math/mpir \
 		xdg-open:devel/xdg-utils
 LIB_DEPENDS=	libcodec2.so:audio/codec2 \
 		libfftw3.so:math/fftw3 \
 		libfftw3f.so:math/fftw3-float \
 		libgmpxx.so:math/gmp \
 		libqwt6.so:x11-toolkits/qwt6 \
 		${PY_BOOST} \
 		liblog4cpp.so:devel/log4cpp \
 		libportaudio.so:audio/portaudio \
 		libjack.so:audio/jack \
 		libasound.so:audio/alsa-lib \
 		libgsl.so:math/gsl \
 		libgsm.so:audio/gsm \
 		libboost_date_time.so:devel/boost-libs \
 		liborc-0.4.so:devel/orc \
 		libzmq.so:net/libzmq4
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		cmake compiler:c++11-lang desktop-file-utils fortran gnome \
 		iconv perl5 pkgconfig pyqt:5 python:3.5+ qt:5 shared-mime-info \
 		shebangfix
 
 SHEBANG_FILES=	grc/scripts/freedesktop/grc_setup_freedesktop.in \
 		gnuradio-runtime/python/gnuradio/ctrlport/gr-ctrlport-monitor \
 		gnuradio-runtime/python/gnuradio/ctrlport/gr-perf-monitorx
 
 CMAKE_ARGS+=	-DCMAKE_INSTALL_RPATH:STRING="${LOCALBASE}/lib/gcc${_GCC_VER}" \
 		-DENABLE_GR_CTRLPORT="YES" \
 		-DICONV_LIB:STRING="X${ICONV_LIB}" \
 		-DICONV_PREFIX:STRING="${ICONV_PREFIX}" \
 		-DLOCALBASE:STRING="${LOCALBASE}" \
 		-DGR_PKG_DOC_DIR:STRING="${DOCSDIR}" \
 		-DPYTHON_EXECUTABLE:STRING="${PYTHON_CMD}" \
 		-DSWIG_EXECUTABLE:STRING="${LOCALBASE}/bin/swig"\
 		-DXMLTO_EXECUTABLE:STRING=minixmlto \
 		-DENABLE_INTERNAL_VOLK:STRING="OFF"
 # for detailed debugging uncomment the next line
 #CMAKE_ARGS+=	--debug-output --trace
 USE_CXXSTD=	c++11
 USE_GITHUB=	yes
 USE_PYQT=	pyqt5
 USE_WX=		3.2
 USE_QT=		buildtools core gui xml qmake widgets
 WX_COMPS=	wx python:run
 USE_LDCONFIG=	yes
 LIBSTRIP_FILES=	analog audio blocks channels digital dtv fec fft\
 		filter pmt qtgui runtime trellis video-sdl\
 		vocoder wavelet
 
 OPTIONS_DEFINE=		DOCS UHD TESTING DOXYGEN
 OPTIONS_EXCLUDE=	DOXYGEN
 OPTIONS_SUB=		yes
 UHD_DESC=	Include UHD support from Ettus
 TESTING_DESC=	Include testing support
 
 PLIST_SUB+=	PORTVERSION=${PORTVERSION} PORTMAINVER=${PORTVERSION:C|^([1-9]+)\.([0-9]+)\.([0-9]+).*|\1.\2.\3|}
 
 DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen \
 			${PYTHON_PKGNAMEPREFIX}sphinx>=1.2.2,1:textproc/py-sphinx@${PY_FLAVOR} \
 			dot:graphics/graphviz \
 			xmlto:textproc/xmlto \
 			freefont-ttf>0:x11-fonts/freefont-ttf
 DOXYGEN_CMAKE_ON=	-DENABLE_DOXYGEN:STRING="ON" \
 		-DENABLE_DOCS:STRING="ON"
 DOXYGEN_CMAKE_OFF=	-DENABLE_DOXYGEN:STRING="OFF" \
 		-DENABLE_DOCS:STRING="OFF"
 
 UHD_CMAKE_ON=	-DENABLE_GR_UHD:STRING="ON"
 UHD_CMAKE_OFF=	-DENABLE_GR_UHD:STRING="OFF"
 
 TESTING_CMAKE_ON=	-DENABLE_TESTING:STRING="ON"
 TESTING_CMAKE_OFF=	-DENABLE_TESTING:STRING="OFF"
 
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MUHD}
 LIBSTRIP_FILES+=	uhd
 LIB_DEPENDS+=	libuhd.so:comms/uhd
 PLIST_SUB+=	UHD=""
 .else
 PLIST_SUB+=	UHD="@comment "
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/comms/gqrx/Makefile b/comms/gqrx/Makefile
index 5ebb4c66b2f4..12296e2dbbd1 100644
--- a/comms/gqrx/Makefile
+++ b/comms/gqrx/Makefile
@@ -1,57 +1,57 @@
 PORTNAME=	gqrx
 PORTVERSION=	2.15.9
-PORTREVISION=	3
+PORTREVISION=	4
 DISTVERSIONPREFIX=	v
 PORTEPOCH=	1
 CATEGORIES=	comms hamradio
 
 MAINTAINER=	martymac@FreeBSD.org
 COMMENT=	Software defined radio receiver powered by GNU Radio and Qt
 WWW=		https://gqrx.dk
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libgnuradio-runtime.so:comms/gnuradio \
 		libgnuradio-analog.so:comms/gnuradio \
 		libgnuradio-blocks.so:comms/gnuradio \
 		libgnuradio-filter.so:comms/gnuradio \
 		libgnuradio-fft.so:comms/gnuradio \
 		libgnuradio-digital.so:comms/gnuradio \
 		libgnuradio-pmt.so:comms/gnuradio \
 		libgnuradio-osmosdr.so:comms/gr-osmosdr \
 		libboost_system.so:devel/boost-libs \
 		liblog4cpp.so:devel/log4cpp \
 		libgmpxx.so:math/gmp \
 		libgmp.so:math/gmp \
 		libvolk.so:devel/volk \
 		libfftw3f.so:math/fftw3-float \
 		libfftw3f_threads.so:math/fftw3-float \
 		liborc-0.4.so:devel/orc \
 		libasound.so:audio/alsa-lib \
 		libjack.so:audio/jack \
 		libportaudio.so:audio/portaudio
 
 USES=		cmake compiler:c++11-lang gl pkgconfig qt:5
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	gqrx-sdr
 USE_GL=		gl
 USE_QT=		core gui network svg widgets
 
 # XXX Use Portaudio as Gqrx is invariably linked to it
 # (auto-detected and used through Gnuradio CMake files)
 CMAKE_ARGS+=	-DLINUX_AUDIO_BACKEND:STRING="Portaudio"
 
 PLIST_FILES=	bin/gqrx \
 		share/applications/dk.gqrx.gqrx.desktop \
 		man/man1/gqrx.1.gz
 
 do-install:
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/src/gqrx ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/dk.gqrx.gqrx.desktop \
 		${STAGEDIR}${PREFIX}/share/applications
 	${INSTALL_MAN} ${WRKSRC}/resources/gqrx.1 \
 		${STAGEDIR}${MANPREFIX}/man/man1
 
 .include <bsd.port.mk>
diff --git a/comms/gr-osmosdr/Makefile b/comms/gr-osmosdr/Makefile
index a541c739b1a2..fde564cdb28b 100644
--- a/comms/gr-osmosdr/Makefile
+++ b/comms/gr-osmosdr/Makefile
@@ -1,57 +1,57 @@
 PORTNAME=	gr-osmosdr
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.2.3
-PORTREVISION=	3
+PORTREVISION=	4
 PORTEPOCH=	1
 CATEGORIES=	comms hamradio
 
 MAINTAINER=	martymac@FreeBSD.org
 COMMENT=	GNU Radio OsmoSDR module
 WWW=		http://sdr.osmocom.org/trac
 
 LICENSE=	GPLv3
 
 BUILD_DEPENDS=	swig:devel/swig \
 		cheetah:devel/py-cheetah3@${PY_FLAVOR}
 LIB_DEPENDS=	libgnuradio-runtime.so:comms/gnuradio \
 		libgnuradio-pmt.so:comms/gnuradio \
 		libgnuradio-blocks.so:comms/gnuradio \
 		libvolk.so:devel/volk \
 		libboost_system.so:devel/boost-libs \
 		libboost_thread.so:devel/boost-libs \
 		liblog4cpp.so:devel/log4cpp \
 		libgmpxx.so:math/gmp \
 		libgmp.so:math/gmp \
 		liborc-0.4.so:devel/orc
 
 USES=	cmake compiler:c++11-lang fortran pkgconfig python:3.7+ tar:tgz
 
 SUB_LIST=	VERSION=${PORTVERSION}
 SUB_FILES=	gnuradio-osmosdr.pc
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	osmocom
 
 USE_LDCONFIG=	yes
 
 # See lib/CMakeLists.txt to enable more components
 CMAKE_ARGS+=	-DENABLE_FILE:BOOL=ON \
 		-DENABLE_PYTHON=ON \
 		-DPYTHON_EXECUTABLE:STRING="${PYTHON_CMD}"
 
 CXXFLAGS+=	-std=c++11
 
 OPTIONS_DEFINE=	RTLSDR HACKRF
 RTLSDR_DESC=	Enable rtl-sdr (RTL2832) support
 OPTIONS_DEFAULT=	RTLSDR
 RTLSDR_LIB_DEPENDS=	librtlsdr.so:comms/rtl-sdr
 RTLSDR_CMAKE_ON=	-DENABLE_RTL:BOOL=ON -DENABLE_RTL_TCP:BOOL=ON
 HACKRF_DESC=	Enable hackrf one hardware support
 HACKRF_LIB_DEPENDS=	libhackrf.so:comms/hackrf
 HACKRF_CMAKE_ON=	-DENABLE_HACKRF:BOOL=ON
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgnuradio-osmosdr.so.0.2.0
 	${INSTALL_DATA} ${WRKDIR}/gnuradio-osmosdr.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig/
 
 .include <bsd.port.mk>
diff --git a/comms/nanovna-saver/Makefile b/comms/nanovna-saver/Makefile
index 5363b19c9885..44435a4e4110 100644
--- a/comms/nanovna-saver/Makefile
+++ b/comms/nanovna-saver/Makefile
@@ -1,30 +1,31 @@
 PORTNAME=	nanovna-saver
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.5.3
+PORTREVISION=	1
 CATEGORIES=	comms hamradio
 
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Multiplatform tool to save Touchstone files from the NanoVNA
 WWW=		https://github.com/NanoVNA-Saver/nanovna-saver
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 PY_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyserial>0:comms/py-pyserial@${PY_FLAVOR}
 BUILD_DEPENDS=	${PY_DEPENDS}
 RUN_DEPENDS=	${PY_DEPENDS}
 
 USES=		python:3.3+ pyqt:5
 USE_PYTHON=	distutils autoplist noflavors
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	NanoVNA-Saver
 
 NO_ARCH=	yes
 
 post-extract:
 	${CP} ${FILESDIR}/Sysctl.py ${WRKSRC}/NanoVNASaver/Hardware/
 
 .include <bsd.port.mk>
diff --git a/comms/ncid/Makefile b/comms/ncid/Makefile
index 9e43fbe236e3..69c2674d5dda 100644
--- a/comms/ncid/Makefile
+++ b/comms/ncid/Makefile
@@ -1,142 +1,143 @@
 PORTNAME=	ncid
 PORTVERSION=	1.11
+PORTREVISION=	1
 CATEGORIES=	comms
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Network based Caller ID package
 WWW=		http://ncid.sourceforge.net/
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/doc/GPL.md
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 LIB_DEPENDS=	libpcre.so:devel/pcre
 RUN_DEPENDS=	bash:shells/bash
 
 USES=		compiler:c11 gmake perl5 tk shebangfix
 USE_GCC=	yes
 
 SHEBANG_FILES=	client/ncid.sh \
 		desktop/xml \
 		doc/mk* \
 		extensions/*.sh \
 		gateway/*.pl gateway/*.sh \
 		logrotate/*.sh \
 		man/mk-pdf \
 		modules/*.sh \
 		setup/*.sh \
 		tools/*.pl tools/*.sh
 
 ALL_TARGET=	local
 MAKE_ARGS=	WISH=${WISH} TCLSH=${TCLSH} \
 		CC=${CC} HOSTCC=${CC} AR=${AR}
 INSTALL_TARGET=	freebsd-install
 
 SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=	DOCS LOGROTATE
 OPTIONS_SUB=	yes
 
 LOGROTATE_DESC=	Install logrotate scripts
 
 LOGROTATE_RUN_DEPENDS=	logrotate:sysutils/logrotate
 
 WRKSRC=	${WRKDIR}/${PORTNAME}
 
 post-extract:
 	@cd ${WRKSRC}/FreeBSD;for i in *.rc; do \
 		x=`echo $$i | cut -f 1 -d .`; ${CP} $$i $$x; done
 
 .include <bsd.port.pre.mk>
 
 post-patch:
 	@${GREP} -lr 'etc/ncid' ${WRKSRC}/ | ${XARGS} ${REINPLACE_CMD} -Ee \
 		's,(/usr/local/etc/ncid | /etc/ncid),${ETCDIR},g'
 	@${FIND} ${WRKSRC}/ -name Makefile | ${XARGS} ${REINPLACE_CMD} -Ee \
 		'/install:/s,install-(etc|logrotate),,'
 	@${REINPLACE_CMD} -Ee '/mkdir.*(INIT|ROTATE|BIN|LOG|ETC)/d ;\
 		/CFLAGS.*=/s|=|+=|' ${WRKSRC}/Makefile
 # Respect PREFIX/MANPREFIX/DATADIR
 	@${REINPLACE_CMD} -e 's|prefix.*= /usr/local|prefix=$${PREFIX}|g' \
 		-e 's|$$(prefix)/bin|$${PREFIX}/bin|g' \
 		-e 's|$$(prefix)/sbin|$${PREFIX}/sbin|g' \
 		-e 's|$$(prefix)/share|$${PREFIX}/share|g' \
 		-e 's|$$(SHARE)/man|$${MANPREFIX}/man/|g' \
 		-e 's|$$(SHARE)/ncid|$${DATADIR}|g' ${WRKSRC}/Makefile
 .if ${CHOSEN_COMPILER_TYPE} == gcc
 	@${REINPLACE_CMD} -e 's|-Wno-stringop-truncation||g' \
 		${WRKSRC}/Makefile ${WRKSRC}/server/Makefile
 .endif
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/server/ncidd ${STAGEDIR}${PREFIX}/sbin
 	${INSTALL_PROGRAM} ${WRKSRC}/gateway/ncid2ncid ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/gateway/sip2ncid ${STAGEDIR}${PREFIX}/sbin
 	${INSTALL_SCRIPT} ${WRKSRC}/client/ncid ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/client/ncid.conf ${STAGEDIR}${ETCDIR}/ncid.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/gateway/ncid2ncid.conf ${STAGEDIR}${ETCDIR}/ncid2ncid.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/gateway/sip2ncid.conf ${STAGEDIR}${ETCDIR}/sip2ncid.conf.sample
 .for d in ncidd.alias ncidd.conf ncidd.blacklist ncidd.whitelist
 	${INSTALL_DATA} ${WRKSRC}/server/${d} ${STAGEDIR}${ETCDIR}/${d}.sample
 .endfor
 .for e in hangup-calls hangup-fakenum hangup-fcc hangup-nohangup \
 hangup-closed-skel hangup-combo-skel hangup-message-skel hangup-skel
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/ncid/extensions
 	${INSTALL_SCRIPT} ${WRKSRC}/extensions/${e} ${STAGEDIR}${PREFIX}/share/ncid/extensions
 .endfor
 # ncid2ncid and sip2ncid are installed and stripped before this loop with ${INSTALL_PROGRAM}
 .for f in email2ncid obi2ncid rn2ncid wc2ncid xdmf2ncid yac2ncid
 	${INSTALL_SCRIPT} ${WRKSRC}/gateway/${f} ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/gateway/${f}.conf ${STAGEDIR}${ETCDIR}/${f}.conf.sample
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/client/ncid.gif ${STAGEDIR}${PREFIX}/share/pixmaps/ncid
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/ncid/modules
 .for g in ncid-alert ncid-initmodem ncid-kpopup ncid-mysql ncid-mythtv ncid-notify ncid-page \
 ncid-samba ncid-skel ncid-speak ncid-wakeup ncid-yac
 	${INSTALL_SCRIPT} ${WRKSRC}/modules/${g} ${STAGEDIR}${PREFIX}/share/ncid/modules
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/server/ncidd.alias ${STAGEDIR}${ETCDIR}/ncidd.alias.sample
 .for h in cidcall cidalias cidupdate wct ncidutil
 	${INSTALL_SCRIPT} ${WRKSRC}/tools/${h} ${STAGEDIR}${PREFIX}/bin
 .endfor
 .for i in ncid-initmodem ncid-mysql ncid-mythtv ncid-notify ncid-page ncid-samba ncid-speak ncid-yac \
 ncid2ncid ncidd obi2ncid rn2ncid sip2ncid wc2ncid xdmf2ncid yac2ncid
 	${INSTALL_DATA} ${WRKSRC}/FreeBSD/${i} ${STAGEDIR}${PREFIX}/etc/rc.d
 .endfor
 .for j in CallingDeposit.rmd CannotBeCompleted.rmd DisconnectedNotInService.rmd NotInService.rmd
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/ncid/recordings
 	${INSTALL_DATA} ${WRKSRC}/recordings/${j} ${STAGEDIR}${PREFIX}/share/ncid/recordings
 .endfor
 .for k in ncid-email2ncid-setup ncid-mysql-setup ncid-setup
 	${INSTALL_SCRIPT} ${WRKSRC}/setup/${k} ${STAGEDIR}${PREFIX}/bin
 .endfor
 	${INSTALL_MAN} ${WRKSRC}/man/*.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/man/*.5 ${STAGEDIR}${MAN5PREFIX}/man/man5
 	${INSTALL_MAN} ${WRKSRC}/man/*.7 ${STAGEDIR}${MAN7PREFIX}/man/man7
 	${INSTALL_MAN} ${WRKSRC}/man/*.8 ${STAGEDIR}${MAN8PREFIX}/man/man8
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/recordings
 	${INSTALL_DATA} ${WRKSRC}/doc/*.md ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/FreeBSD/README-FreeBSD ${STAGEDIR}${DOCSDIR}
 .for l in README-recordings CallingDeposit.pvf CannotBeCompleted.pvf DisconnectedNotInService.pvf NotInService.pvf
 	${INSTALL_DATA} ${WRKSRC}/recordings/${l} ${STAGEDIR}${DOCSDIR}/recordings
 .endfor
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${LOCALBASE}/bin/cidupdate
 
 post-install-LOGROTATE-on:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/ncid/sys
 	${INSTALL_SCRIPT} ${WRKSRC}/tools/ncid-yearlog ${STAGEDIR}${PREFIX}/share/ncid/sys
 	${INSTALL_SCRIPT} ${WRKSRC}/logrotate/ncidrotate ${STAGEDIR}${PREFIX}/share/ncid/sys
 	${INSTALL_DATA} ${WRKSRC}/logrotate/ncidrotate.conf ${STAGEDIR}${ETCDIR}/ncidrotate.conf.sample
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/logrotate.d
 	${INSTALL_DATA} ${WRKSRC}/logrotate/ncid ${STAGEDIR}${PREFIX}/etc/logrotate.d
 	${INSTALL_MAN} ${WRKSRC}/logrotate/*.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/logrotate/*.5 ${STAGEDIR}${MAN5PREFIX}/man/man5
 
 .include <bsd.port.post.mk>
diff --git a/comms/py-esptool/Makefile b/comms/py-esptool/Makefile
index 5d03e4687d14..3236709a4bc5 100644
--- a/comms/py-esptool/Makefile
+++ b/comms/py-esptool/Makefile
@@ -1,57 +1,58 @@
 PORTNAME=	esptool
 DISTVERSIONPREFIX=	v
 DISTVERSION=	4.5
+PORTREVISION=	1
 CATEGORIES=	comms python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	loader@FreeBSD.org
 COMMENT=	Utility to communicate with Espressif ESP8266 & ESP32 chips
 WWW=		https://github.com/espressif/esptool
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyserial>=3.0:comms/py-pyserial@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ecdsa>=0.16.0:security/py-ecdsa@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}bitstring>=3.1.6,<4:devel/py-bitstring@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}cryptography>=2.1.4:security/py-cryptography@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}reedsolo>=1.5.3,<=1.6.0:devel/py-reedsolo@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyelftools>0:devel/py-pyelftools@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_GITHUB=	yes
 USE_PYTHON=	autoplist concurrent distutils pytest
 
 GH_ACCOUNT=	espressif
 NO_ARCH=	yes
 
 # test/test_espefuse_host.py calls the python command
 # through subprocess Popen(), create an alias for it.
 BINARY_ALIAS=		python=${PYTHON_CMD}
 TEST_ENV=		${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 
 ESPTOOL_BAUDRATE?=	115200
 ESPTOOL_CHIP?=		esp8266
 ESPTOOL_SERIALPORT?=	/dev/ttyU0
 
 do-test:
 	@cd ${TEST_WRKSRC} && for test in \
 		test/test_imagegen.py \
 		test/test_espsecure.py \
 		test/test_merge_bin.py \
 		test/test_image_info.py \
 		test/test_modules.py; \
 		do ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m pytest $${test}; done
 	@cd ${TEST_WRKSRC} && for chip in \
 		esp32 esp32c2 esp32c3 esp32s2 esp32s3 esp32s3beta2 esp32h2beta1 esp32c6; \
 		do ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m pytest \
 		test/test_espefuse.py --chip $${chip}; done
 .if exists(${ESPTOOL_SERIALPORT})
 	@cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} \
 		${PYTHON_CMD} -m pytest test/test_esptool.py \
 		--port ${ESPTOOL_SERIALPORT} \
 		--chip ${ESPTOOL_CHIP} \
 		--baud ${ESPTOOL_BAUDRATE}
 .endif
 
 .include <bsd.port.mk>
diff --git a/comms/sdr-wspr/Makefile b/comms/sdr-wspr/Makefile
index 12ce7f1f928a..640eaf424846 100644
--- a/comms/sdr-wspr/Makefile
+++ b/comms/sdr-wspr/Makefile
@@ -1,24 +1,24 @@
 PORTNAME=	sdr-wspr
 PORTVERSION=	0.1.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	comms hamradio
 
 MAINTAINER=	jeff@baitis.net
 COMMENT=	WSPR receiver/decoder using libsdr
 WWW=		https://github.com/hmatuschek/sdr-wspr
 
 LICENSE=	GPLv3
 
 LIB_DEPENDS=	libsdr-gui.so:comms/libsdr-gui
 
 USES=		cmake compiler:gcc-c++11-lib fortran pkgconfig qt:5
 USE_GITHUB=	yes
 GH_ACCOUNT=	hmatuschek
 USE_QT=		core buildtools:build qmake webkit widgets
 
 PLIST_FILES=	bin/sdr-wspr share/applications/sdr-wspr.desktop \
 		share/icons/sdr-wspr.svg
 CMAKE_ARGS=	-DCMAKE_INSTALL_RPATH:STRING="${LOCALBASE}/lib/gcc${_GCC_VER}"
 
 .include <bsd.port.mk>
diff --git a/comms/wsjtx/Makefile b/comms/wsjtx/Makefile
index 604e41b5689a..4396f5072c00 100644
--- a/comms/wsjtx/Makefile
+++ b/comms/wsjtx/Makefile
@@ -1,87 +1,87 @@
 PORTNAME=	wsjtx
 DISTVERSION=	2.5.4
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	comms hamradio
 MASTER_SITES=	SF/wsjt/${PORTNAME}-${PORTVERSION}${DISTVERSIONSUFFIX}
 
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Weak signal ham radio communication package
 WWW=		https://physics.princeton.edu/pulsar/k1jt/wsjtx.html
 
 LICENSE=	GPLv3
 
 BUILD_DEPENDS=	asciidoctor:textproc/rubygem-asciidoctor \
 		a2x:textproc/asciidoc \
 		git:devel/git \
 		${LOCALBASE}/share/xsl/docbook:textproc/docbook-xsl
 LIB_DEPENDS=	libfftw3.so:math/fftw3 \
 		libfftw3f.so:math/fftw3-float \
 		libboost_log_setup.so:devel/boost-libs \
 		libxslt.so:textproc/libxslt
 
 USES=	cmake:noninja compiler:c++11-lang fortran gl libedit \
 		makeinfo pkgconfig qt:5 readline tar:tgz
 USE_GL=		glu
 USE_QT=		core gui network widgets \
 		multimedia concurrent printsupport serialport sql sql-sqlite3 \
 		buildtools:build linguisttools:build qmake:build testlib
 
 CONFLICTS_INSTALL=	wsjtz
 
 # for detailed debugging uncomment the next line
 #CMAKE_ARGS+=   --debug-output --trace
 PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
 
 _PATCHES=	wsjtx.patch hamlib.patch
 
 .include <bsd.port.pre.mk>
 
 .if ${GCC_DEFAULT} >= 10
 # workaround for More actual than formal arguments in procedure call at (1)
 FFLAGS+=	-fallow-argument-mismatch
 .endif
 
 _HAMLIB_PATCHES=	configure hamlib.pc.in tests/rigtestlibusb.c src/misc.c
 make-hamlib-patch:
 	${MV} ${FILESDIR}/hamlib.patch ${FILESDIR}/hamlib.patch.old
 . for f in ${_HAMLIB_PATCHES}
 	(cd ${WRKDIR}/.build/hamlib-prefix/src;diff -u hamlib/$f.orig hamlib/$f >> ${FILESDIR}/hamlib.patch || true)
 . endfor
 
 _WSJTX_PATCHES=	CMakeLists.txt Radio.cpp widgets/FrequencyLineEdit.cpp \
 		widgets/FrequencyDeltaLineEdit.cpp \
 		CMake/Modules/FindUsb.cmake \
 		CMake/Modules/FindHamlib.cmake
 make-wsjtx-patch:
 	${MV} ${FILESDIR}/wsjtx.patch ${FILESDIR}/wsjtx.patch.old
 . for f in ${_WSJTX_PATCHES}
 	(cd ${WRKDIR}/.build/wsjtx-prefix/src;diff -u wsjtx/$f.orig wsjtx/$f >> ${FILESDIR}/wsjtx.patch || true)
 . endfor
 
 post-patch:
 .  for _patch in ${_PATCHES}
 	# Keep a copy of the blank patch for the post-build target below
 	${MV} ${WRKSRC}/${_patch} ${WRKSRC}/${_patch}.orig
 	# Copy the patch provided by the ports system
 	${CP} ${FILESDIR}/${_patch}  ${WRKSRC}
 .  endfor
 
 post-build:
 	# With cmake 3.18, the patching stage in the internal build
 	# is run again, trick it by removing the patch again.
 .  for _patch in ${_PATCHES}
 	${MV} ${WRKSRC}/${_patch}.orig  ${WRKSRC}/${_patch}
 .  endfor
 
 do-install:
 	(cd ${CONFIGURE_WRKSRC};${MAKE} -f Makefile DESTDIR=${STAGEDIR} install)
 
 post-install:
 .for f in fcal fmeasure fmtave fst4sim ft8code jt4code jt65code jt9 jt9code \
 	message_aggregator msk144code rigctld-wsjtx rigctlcom-wsjtx \
 	rigctl-wsjtx udp_daemon q65code q65sim \
 	wsjtx wsjtx_app_version wsprd
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${f}
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/comms/wsjtz/Makefile b/comms/wsjtz/Makefile
index 33d91470c0b9..081cf4a63f8c 100644
--- a/comms/wsjtz/Makefile
+++ b/comms/wsjtz/Makefile
@@ -1,63 +1,63 @@
 PORTNAME=	wsjtz
 DISTVERSION=	2.5.4-1.22
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	comms hamradio
 MASTER_SITES=	SF/wsjt-z/Source
 
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Clone of WSJT-X software with additional features
 WWW=		https://sourceforge.net/projects/wsjt-z/
 
 CONFLICTS=	wsjtx
 
 LICENSE=	GPLv3
 
 BUILD_DEPENDS=	asciidoctor:textproc/rubygem-asciidoctor \
 		autoconf>=2.69:devel/autoconf \
 		automake>=1.16.1:devel/automake \
 		a2x:textproc/asciidoc \
 		boost-libs>0:devel/boost-libs \
 		libtool:devel/libtool \
 		${LOCALBASE}/share/xsl/docbook:textproc/docbook-xsl
 LIB_DEPENDS=	libfftw3.so:math/fftw3 \
 		libfftw3f.so:math/fftw3-float \
 		libxslt.so:textproc/libxslt \
 		libhamlib.so:comms/hamlib \
 		libreadline.so:devel/readline \
 		libportaudio.so:audio/portaudio
 
 USES=		cmake compiler:c++11-lib fortran gl \
 		makeinfo pkgconfig qt:5 zip
 USE_GL=		glu
 USE_QT=		core gui network widgets \
 		multimedia concurrent printsupport serialport sql sql-sqlite3 \
 		testlib buildtools:build linguisttools:build qmake:build
 
 CMAKE_ARGS+=	-DCMAKE_PREFIX_PATH+=${LOCALBASE}/wsjtx/lib \
 		-DLOCALBASE::STRING="${LOCALBASE}"
 # for detailed debugging uncomment the next line
 #CMAKE_ARGS+=   --debug-output --trace
 PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
 
 OPTIONS_DEFINE=	DOCS
 
 PORTDOCS=	*
 
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME:S/z/x/}
 DATADIR=	${PREFIX}/share/${PORTNAME:S/z/x/}
 WRKSRC=		${WRKDIR}/wsjtx
 
 .include <bsd.port.pre.mk>
 
 .if ${GCC_DEFAULT} >= 10
 # workaround for More actual than formal arguments in procedure call at (1)
 FFLAGS+=	-fallow-argument-mismatch
 .endif
 
 post-install:
 .for f in fcal fmeasure fmtave fst4sim ft8code jt4code jt65code jt9 jt9code \
 	message_aggregator msk144code q65code q65sim udp_daemon wsjtx wsprd
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${f}
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/comms/xastir/Makefile b/comms/xastir/Makefile
index 95e066d75fcd..c90be97e2fe7 100644
--- a/comms/xastir/Makefile
+++ b/comms/xastir/Makefile
@@ -1,91 +1,91 @@
 PORTNAME=	xastir
 DISTVERSIONPREFIX=	Release-
 DISTVERSION=	2.1.8
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	comms hamradio
 
 MAINTAINER=	carl@stagecraft.cx
 COMMENT=	X Amateur Station Tracking and Information Reporting
 WWW=		http://www.xastir.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	xfontsel:x11-fonts/xfontsel
 RUN_DEPENDS=	wget:ftp/wget
 LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 		libjasper.so:graphics/jasper \
 		libjbig.so:graphics/jbigkit \
 		liblcms2.so:graphics/lcms2 \
 		libpng.so:graphics/png \
 		libshp.so:devel/shapelib \
 		libtiff.so:graphics/tiff \
 		libwebp.so:graphics/webp \
 		libwebpmux.so:graphics/webp \
 		libwmflite.so:graphics/libwmf \
 		libpcre.so:devel/pcre
 
 USES=		autoreconf gmake gnome jpeg motif shebangfix xorg
 
 USE_XORG=	ice sm x11 xext xt
 USE_GNOME+=	libxml2
 GNU_CONFIGURE=	yes
 
 SHEBANG_FILES=	scripts/gpx2shape
 SHEBANG_REGEX=	./scripts/.*\.(sh|pl|py)
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Xastir
 GH_PROJECT=	Xastir
 
 SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=		BDB CURL DAVIS ERRORPOP FESTIVAL GEOTIFF GPSMAN
 OPTIONS_RADIO=		MGG
 OPTIONS_RADIO_MGG=	GMAGICK IMAGICK
 
 DAVIS_DESC=	Include Davis Weatherstation Support
 CURL_DESC=	Include CURL Internet Image support
 GEOTIFF_DESC=	Include GeoTIFF Support
 GPSMAN_DESC=	Include GPSMAN Support
 FESTIVAL_DESC=	Include Festival Voice Synthesis Support
 ERRORPOP_DESC=	Send error popups to stderr
 BDB_DESC=	Tiger Map Caching using Berkeley DB
 MGG_DESC=	Image library for raster map processing
 IMAGICK_DESC=	ImageMagick (Version 6)
 GMAGICK_DESC=	GraphicsMagick (Needs GCC to compile)
 
 OPTIONS_DEFAULT=	BDB CURL GMAGICK
 
 DAVIS_CONFIGURE_ON=	--enable-davis
 
 IMAGICK_USES=		magick:6
 IMAGICK_CONFIGURE_WITH=	imagemagick
 
 GMAGICK_LIB_DEPENDS=	libGraphicsMagickWand.so:graphics/GraphicsMagick
 GMAGICK_CONFIGURE_WITH=	graphicsmagick
 GMAGICK_USES=		compiler:gcc-c++11-lib
 
 CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 
 GEOTIFF_LIB_DEPENDS=	libgeotiff.so:graphics/libgeotiff
 
 GPSMAN_BUILD_DEPENDS=	${LOCALBASE}/share/doc/gpsmanshp/GPSManSHP.pdf:graphics/gpsmanshp
 GPSMAN_IMPLIES=		SHAPELIB
 GPSMAN_CONFIGURE_WITH=	gpsman
 
 FESTIVAL_BUILD_DEPENDS=		festival:audio/festival
 FESTIVAL_CONFIGURE_WITH=	festival
 
 #RTREE_CONFIGURE_WITH=	rtree
 
 ERRORPOP_CONFIGURE_WITH=	errorpopups
 
 BDB_USES=		bdb
 BDB_CONFIGURE_ON=	--with-bdb-incdir=${BDB_INCLUDE_DIR} \
 			--with-bdb-libdir=${BDB_LIB_DIR}
 
 post-extract:
 	@${REINPLACE_CMD} -e 's|2>&1||g' ${WRKSRC}/acinclude.m4
 
 .include <bsd.port.mk>
diff --git a/converters/R-cran-RJSONIO/Makefile b/converters/R-cran-RJSONIO/Makefile
index 717e41c40f06..07d110519dcb 100644
--- a/converters/R-cran-RJSONIO/Makefile
+++ b/converters/R-cran-RJSONIO/Makefile
@@ -1,14 +1,15 @@
 PORTNAME=	RJSONIO
 DISTVERSION=	1.3-1.6
+PORTREVISION=	1
 CATEGORIES=	converters
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Serialize R objects to JSON, JavaScript Object Notation
 WWW=		https://cran.r-project.org/web/packages/RJSONIO/
 
 LICENSE=	BSD3CLAUSE
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/converters/R-cran-arabic2kansuji/Makefile b/converters/R-cran-arabic2kansuji/Makefile
index 3adeb1241c20..dde8c9c42c22 100644
--- a/converters/R-cran-arabic2kansuji/Makefile
+++ b/converters/R-cran-arabic2kansuji/Makefile
@@ -1,19 +1,20 @@
 PORTNAME=	arabic2kansuji
 PORTVERSION=	0.1.2
+PORTREVISION=	1
 CATEGORIES=	converters
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Convert Arabic Numerals to Kansuji
 WWW=		https://cran.r-project.org/web/packages/arabic2kansuji/
 
 LICENSE=	MIT
 
 CRAN_DEPENDS=	R-cran-purrr>0:devel/R-cran-purrr \
 		R-cran-stringr>0:textproc/R-cran-stringr
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/converters/R-cran-base64enc/Makefile b/converters/R-cran-base64enc/Makefile
index e2bc7e7c2034..09b07e99e934 100644
--- a/converters/R-cran-base64enc/Makefile
+++ b/converters/R-cran-base64enc/Makefile
@@ -1,15 +1,15 @@
 PORTNAME=	base64enc
 DISTVERSION=	0.1-3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	converters
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Tools for base64 encoding
 WWW=		https://cran.r-project.org/web/packages/base64enc/
 
 LICENSE=	GPLv2+
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/converters/R-cran-jsonlite/Makefile b/converters/R-cran-jsonlite/Makefile
index 9b8729c74324..14acec42ff36 100644
--- a/converters/R-cran-jsonlite/Makefile
+++ b/converters/R-cran-jsonlite/Makefile
@@ -1,14 +1,15 @@
 PORTNAME=	jsonlite
 PORTVERSION=	1.8.0
+PORTREVISION=	1
 CATEGORIES=	converters
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Robust, High Performance JSON Parser and Generator for R
 WWW=		https://cran.r-project.org/web/packages/jsonlite/
 
 LICENSE=	MIT
 
 USES=	cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/converters/R-cran-rjson/Makefile b/converters/R-cran-rjson/Makefile
index 5f92d5b35591..295eff94160d 100644
--- a/converters/R-cran-rjson/Makefile
+++ b/converters/R-cran-rjson/Makefile
@@ -1,14 +1,15 @@
 PORTNAME=	rjson
 PORTVERSION=	0.2.21
+PORTREVISION=	1
 CATEGORIES=	converters
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	JSON for R
 WWW=		https://cran.r-project.org/web/packages/rjson/
 
 LICENSE=	GPLv2
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/databases/R-cran-DBI/Makefile b/databases/R-cran-DBI/Makefile
index 602bedac71de..cfeab6545afa 100644
--- a/databases/R-cran-DBI/Makefile
+++ b/databases/R-cran-DBI/Makefile
@@ -1,14 +1,15 @@
 PORTNAME=	DBI
 DISTVERSION=	1.1.3
+PORTREVISION=	1
 CATEGORIES=	databases
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	R Database Interface
 WWW=		https://cran.r-project.org/web/packages/DBI/
 
 LICENSE=	LGPL21+
 
 USES=	cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/databases/R-cran-RMySQL/Makefile b/databases/R-cran-RMySQL/Makefile
index 7d35437fe80f..6f4ac3a1f359 100644
--- a/databases/R-cran-RMySQL/Makefile
+++ b/databases/R-cran-RMySQL/Makefile
@@ -1,20 +1,21 @@
 PORTNAME=	RMySQL
 DISTVERSION=	0.10.23
+PORTREVISION=	1
 CATEGORIES=	databases
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	R interface to the MySQL database
 WWW=		https://cran.r-project.org/web/packages/RMySQL/
 
 LICENSE=	GPLv2
 
 CRAN_DEPENDS=	R-cran-DBI>=0.4:databases/R-cran-DBI
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		cpe cran:auto-plist,compiles mysql
 
 CPE_VENDOR=	r-consortium
 
 .include <bsd.port.mk>
diff --git a/databases/R-cran-RPostgreSQL/Makefile b/databases/R-cran-RPostgreSQL/Makefile
index f1ccbe39b97d..3c5c8f22688e 100644
--- a/databases/R-cran-RPostgreSQL/Makefile
+++ b/databases/R-cran-RPostgreSQL/Makefile
@@ -1,25 +1,26 @@
 PORTNAME=	RPostgreSQL
 DISTVERSION=	0.7-4
+PORTREVISION=	1
 CATEGORIES=	databases
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	R Interface to the 'PostgreSQL' Database System
 WWW=		https://cran.r-project.org/web/packages/RPostgreSQL/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 CRAN_DEPENDS=	R-cran-DBI>=0.3:databases/R-cran-DBI
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		cran:auto-plist,compiles pgsql shebangfix
 
 SHEBANG_FILES=	inst/devTests/*.r \
 		inst/devTests/*.sh
 SHEBANG_LANG=	r
 r_OLD_CMD=	/usr/bin/r
 r_CMD=		${LOCALBASE}/bin/R
 
 .include <bsd.port.mk>
diff --git a/databases/R-cran-RSQLite/Makefile b/databases/R-cran-RSQLite/Makefile
index 726420982ab0..9cd8dea8ae42 100644
--- a/databases/R-cran-RSQLite/Makefile
+++ b/databases/R-cran-RSQLite/Makefile
@@ -1,24 +1,25 @@
 PORTNAME=	RSQLite
 PORTVERSION=	2.2.19
+PORTREVISION=	1
 CATEGORIES=	databases
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	skreuzer@FreeBSD.org
 COMMENT=	Database Interface R driver for SQLite
 WWW=		https://cran.r-project.org/web/packages/RSQLite/
 
 LICENSE=	LGPL20
 
 CRAN_DEPENDS=	R-cran-DBI>=1.1.0:databases/R-cran-DBI \
 		R-cran-bit64>0:devel/R-cran-bit64 \
 		R-cran-blob>0:devel/R-cran-blob \
 		R-cran-memoise>0:devel/R-cran-memoise \
 		R-cran-Rcpp>0:devel/R-cran-Rcpp \
 		R-cran-pkgconfig>0:devel/R-cran-pkgconfig \
 		R-cran-plogr>0:devel/R-cran-plogr
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/databases/R-cran-cachem/Makefile b/databases/R-cran-cachem/Makefile
index 1dd7a4e20e81..c1ad18b9bce0 100644
--- a/databases/R-cran-cachem/Makefile
+++ b/databases/R-cran-cachem/Makefile
@@ -1,19 +1,20 @@
 PORTNAME=	cachem
 PORTVERSION=	1.0.6
+PORTREVISION=	1
 CATEGORIES=	databases
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Cache R Objects with Automatic Pruning
 WWW=		https://cran.r-project.org/web/packages/cachem/
 
 LICENSE=	MIT
 
 CRAN_DEPENDS=	R-cran-rlang>0:devel/R-cran-rlang \
 		R-cran-fastmap>0:databases/R-cran-fastmap
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/databases/R-cran-fastmap/Makefile b/databases/R-cran-fastmap/Makefile
index 56fabe45fc47..cb8812c89030 100644
--- a/databases/R-cran-fastmap/Makefile
+++ b/databases/R-cran-fastmap/Makefile
@@ -1,15 +1,16 @@
 PORTNAME=	fastmap
 PORTVERSION=	1.1.0
+PORTREVISION=	1
 CATEGORIES=	databases
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Fast Implementation of a Key-Value Store
 WWW=		https://cran.r-project.org/web/packages/fastmap/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.note
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/databases/R-cran-sqldf/Makefile b/databases/R-cran-sqldf/Makefile
index 137e85e31abb..71d2e09d931e 100644
--- a/databases/R-cran-sqldf/Makefile
+++ b/databases/R-cran-sqldf/Makefile
@@ -1,22 +1,23 @@
 PORTNAME=	sqldf
 DISTVERSION=	0.4-11
+PORTREVISION=	1
 CATEGORIES=	databases
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	skreuzer@FreeBSD.org
 COMMENT=	SQL select on R data frames
 WWW=		https://cran.r-project.org/web/packages/sqldf/
 
 LICENSE=	GPLv2
 
 CRAN_DEPENDS=	R-cran-proto>=0.3.9.2_6:devel/R-cran-proto \
 		R-cran-chron>=2.3.42:devel/R-cran-chron \
 		R-cran-gsubfn>=0.6.4:devel/R-cran-gsubfn \
 		R-cran-DBI>=1.1.0:databases/R-cran-DBI \
 		R-cran-RSQLite>=2.2.14:databases/R-cran-RSQLite
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=	cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/databases/arrow-glib/Makefile b/databases/arrow-glib/Makefile
index acd95beba426..718345bb88af 100644
--- a/databases/arrow-glib/Makefile
+++ b/databases/arrow-glib/Makefile
@@ -1,26 +1,26 @@
 PORTNAME=	arrow
 PORTVERSION=	8.0.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases
 MASTER_SITES=	APACHE/arrow/arrow-${PORTVERSION}/
 PKGNAMESUFFIX=	-glib
 DISTNAME=	apache-arrow-${PORTVERSION}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	C API wrapper library for Arrow C++
 WWW=		https://arrow.apache.org/ \
 		https://github.com/apache/arrow/tree/master/c_glib
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/../LICENSE.txt
 
 BUILD_DEPENDS=	arrow>=${PORTVERSION}<${PORTVERSION}_99:databases/arrow
 LIB_DEPENDS=	libarrow.so:databases/arrow
 
 USES=		compiler:c++11-lang gnome meson pkgconfig
 USE_GNOME=	introspection
 
 MESON_ARGS=	--default-library=both --default-library=both -Darrow_cpp_build_dir='' -Darrow_cpp_build_type='release' -Dgtk_doc=false
 WRKSRC_SUBDIR=	c_glib
 
 .include <bsd.port.mk>
diff --git a/databases/arrow/Makefile b/databases/arrow/Makefile
index 8359978de08b..1c3494e20478 100644
--- a/databases/arrow/Makefile
+++ b/databases/arrow/Makefile
@@ -1,238 +1,238 @@
 PORTNAME=	arrow
 DISTVERSION=	8.0.0
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	databases
 MASTER_SITES=	APACHE/${PORTNAME}/${PORTNAME}-${DISTVERSION} \
 		https://github.com/apache/orc/archive/rel/:orc
 DISTNAME=	apache-${PORTNAME}-${DISTVERSION}
 DISTFILES=	apache-${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} release-1.6.6${EXTRACT_SUFX}:orc
 EXTRACT_ONLY=	apache-${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Columnar in-memory analytics layer for big data
 WWW=		https://arrow.apache.org/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/../LICENSE.txt
 
 LIB_DEPENDS=	libboost_system.so:devel/boost-libs
 
 USES=		cmake compiler:c++11-lang localbase pkgconfig python:build
 USE_LDCONFIG=	yes
 
 WRKSRC_SUBDIR=	cpp
 
 CMAKE_ARGS=	-DARROW_SIMD_LEVEL=NONE -DARROW_RUNTIME_SIMD_LEVEL=NONE
 CMAKE_OFF=	ARROW_BUILD_STATIC ARROW_WITH_BACKTRACE ARROW_BUILD_TESTS ARROW_BUILD_BENCHMARKS
 
 OPTIONS_GROUP=			COMPRESSION COMPONENTS # components are listed in cpp/cmake_modules/DefineOptions.cmake
 OPTIONS_GROUP_COMPRESSION=	BROTLI BZ2 LZ4 SNAPPY ZLIB ZSTD
 OPTIONS_GROUP_COMPONENTS=	COMPUTE CSV DATASET FILESYSTEM FLIGHT GANDIVA HDFS HIVESERVER2 IPC JSON MIMALLOC PARQUET ORC PLASMA PYTHON S3 SKYHOOK SUBSTRAIT BUILD_UTILITIES TESTING
 OPTIONS_SUB=			yes
 
 COMPRESSION_DESC=		Compression support:
 COMPONENTS_DESC=		Build components:
 
 ## Compression options
 
 BROTLI_CMAKE_BOOL=		ARROW_WITH_BROTLI
 BROTLI_LIB_DEPENDS=		libbrotlicommon.so:archivers/brotli
 
 BZ2_DESC=			bz2 compression support
 BZ2_CMAKE_BOOL=			ARROW_WITH_BZ2
 
 LZ4_CMAKE_BOOL=			ARROW_WITH_LZ4
 LZ4_LIB_DEPENDS=		liblz4.so:archivers/liblz4
 
 SNAPPY_CMAKE_BOOL=		ARROW_WITH_SNAPPY
 SNAPPY_LIB_DEPENDS=		libsnappy.so:archivers/snappy
 
 ZLIB_CMAKE_BOOL=		ARROW_WITH_ZLIB
 
 ZSTD_DESC=			zstd compression support
 ZSTD_CMAKE_BOOL=		ARROW_WITH_ZSTD
 ZSTD_LIB_DEPENDS=		libzstd.so:archivers/zstd
 
 ## Component options
 
 COMPUTE_DESC=			Arrow Compute Modules
 COMPUTE_CMAKE_BOOL=		ARROW_COMPUTE
 COMPUTE_LIB_DEPENDS=		libre2.so:devel/re2 \
 				libutf8proc.so:textproc/utf8proc
 
 CSV_DESC=			Arrow CSV Parser Module
 CSV_CMAKE_BOOL=			ARROW_CSV
 
 DATASET_DESC=			Arrow Dataset Modules
 DATASET_CMAKE_BOOL=		ARROW_DATASET
 DATASET_IMPLIES=		COMPUTE FILESYSTEM
 
 FILESYSTEM_DESC=		Arrow Filesystem Layer
 FILESYSTEM_CMAKE_BOOL=		ARROW_FILESYSTEM
 
 FLIGHT_DESC=			Arrow Flight RPC System
 FLIGHT_USES=			ssl
 FLIGHT_CMAKE_BOOL=		ARROW_FLIGHT
 FLIGHT_LIB_DEPENDS=		libgflags.so:devel/gflags \
 				libprotobuf.so:devel/protobuf \
 				libabsl_base.so:devel/abseil \
 				libcares.so:dns/c-ares \
 				libgrpc.so:devel/grpc \
 				libre2.so:devel/re2
 FLIGHT_IMPLIES=			IPC
 FLIGHT_BROKEN=			configure breaks: Could not find a package configuration file provided by "re2"
 
 GANDIVA_DESC=			Gandiva libraries
 GANDIVA_USES=			ssl
 GANDIVA_CMAKE_BOOL=		ARROW_GANDIVA
 GANDIVA_BUILD_DEPENDS=		${LOCALBASE}/bin/clang12:devel/llvm12 # explicitly requires llvm-12
 GANDIVA_LIB_DEPENDS=		libgrpc.so:devel/grpc \
 				libprotobuf.so:devel/protobuf \
 				libre2.so:devel/re2 \
 				libutf8proc.so:textproc/utf8proc
 
 HDFS_DESC=			Arrow HDFS bridge
 HDFS_CMAKE_BOOL=		ARROW_HDFS
 
 HIVESERVER2_DESC=		HiveServer2 client and Arrow adapter
 HIVESERVER2_USES=		python:build
 HIVESERVER2_VARS=		BINARY_ALIAS=python=${PYTHON_CMD}
 HIVESERVER2_BUILD_DEPENDS=	thrift:devel/thrift
 HIVESERVER2_CMAKE_BOOL=		ARROW_HIVESERVER2
 HIVESERVER2_BROKEN=		Pending conflict fix in thrift ports in bug#255538
 
 IPC_DESC=			Arrow IPC extensions
 IPC_CMAKE_BOOL=			ARROW_IPC
 
 JSON_DESC=			JSON support
 JSON_CMAKE_BOOL=		ARROW_JSON
 JSON_BUILD_DEPENDS=		${LOCALBASE}/include/rapidjson/rapidjson.h:devel/rapidjson
 
 MIMALLOC_DESC=			Arrow mimalloc-based allocato
 MIMALLOC_CMAKE_BOOL=		ARROW_MIMALLOC
 MIMALLOC_LIB_DEPENDS=		libmimalloc.so:devel/mimalloc
 MIMALLOC_BROKEN=		Pending paths fix in bug#255537
 
 PARQUET_DESC=			Parquet libraries
 PARQUET_CMAKE_BOOL=		ARROW_PARQUET PARQUET_REQUIRE_ENCRYPTION
 PARQUET_USES=			ssl
 PARQUET_LIB_DEPENDS=		libthrift.so:devel/thrift-cpp
 PARQUET_IMPLIES=		COMPUTE
 
 ORC_DESC=			Arrow ORC adapter
 ORC_CMAKE_BOOL=			ARROW_ORC
 ORC_LIB_DEPENDS=		libprotobuf.so:devel/protobuf
 ORC_CONFIGURE_ENV=		ARROW_ORC_URL=file://${DISTDIR}/${DIST_SUBDIR}/release-1.6.6${EXTRACT_SUFX}
 ORC_IMPLIES=			LZ4 SNAPPY ZLIB ZSTD # cpp/CMakeLists.txt
 ORC_BROKEN=			fatal error: 'orc/OrcFile.hh' file not found: https://issues.apache.org/jira/browse/ARROW-12624
 
 PLASMA_DESC=			Plasma object store
 PLASMA_CMAKE_BOOL=		ARROW_PLASMA
 PLASMA_LIB_DEPENDS=		libaws-c-auth.so:security/aws-c-auth \
 				libaws-c-compression.so:devel/aws-c-compression \
 				libaws-c-http.so:devel/aws-c-http \
 				libaws-c-mqtt.so:devel/aws-c-mqtt \
 				libaws-c-s3.so:devel/aws-c-s3 \
 				libaws-c-sdkutils.so:devel/aws-c-sdkutils \
 				libaws-crt-cpp.so:devel/aws-crt-cpp \
 				libgflags.so:devel/gflags
 
 BUILD_UTILITIES_DESC=		build Arrow commandline utilities
 BUILD_UTILITIES_CMAKE_BOOL=	ARROW_BUILD_UTILITIES
 
 PYTHON_DESC=			Build python extension support
 PYTHON_CMAKE_BOOL=		ARROW_PYTHON
 PYTHON_USES=			python:3.7+
 PYTHON_BUILD_DEPENDS=		${PYNUMPY} # see https://issues.apache.org/jira/browse/ARROW-16820
 PYTHON_CMAKE_ON=		-DPython3_EXECUTABLE=${PYTHON_CMD}
 PYTHON_LIB_DEPENDS=		libutf8proc.so:textproc/utf8proc
 PYTHON_RUN_DEPENDS=		${PYNUMPY}
 PYTHON_IMPLIES=			COMPUTE CSV DATASET FILESYSTEM HDFS JSON
 PYTHON_VARS=			PLIST_SUB+=PYTHON_SUFFIX=${PYTHON_SUFFIX}
 
 S3_DESC=			S3 support
 S3_CMAKE_BOOL=			ARROW_S3
 S3_USES=			ssl
 S3_LIB_DEPENDS=			\
 				libaws-c-cal.so:security/aws-c-cal \
 				libaws-c-common.so:devel/aws-c-common \
 				libaws-c-event-stream.so:devel/aws-c-event-stream \
 				libaws-c-io.so:devel/aws-c-io \
 				libaws-checksums.so:devel/aws-checksums \
 				libaws-cpp-sdk-s3.so:devel/aws-sdk-cpp \
 				libs2n.so:security/s2n-tls
 S3_IMPLIES=			ZLIB
 
 SKYHOOK_DESC=			Build the Skyhook libraries
 SKYHOOK_CMAKE_BOOL=		ARROW_SKYHOOK
 SKYHOOK_BROKEN=			could NOT find librados
 
 SUBSTRAIT_DESC=			Build the Arrow Substrait Consumer Module
 SUBSTRAIT_CMAKE_BOOL=		ARROW_SUBSTRAIT
 SUBSTRAIT_BROKEN=		needs investigation
 
 TESTING_DESC=			Arrow testing libraries
 TESTING_CMAKE_BOOL=		ARROW_TESTING
 TESTING_LIB_DEPENDS=		libgtest.so:devel/googletest
 
 .for opt in ${OPTIONS_GROUP_COMPRESSION} ${OPTIONS_GROUP_COMPONENTS}
 .  if "${${opt}_BROKEN}" == ""
 OPTIONS_DEFAULT+=	${opt}
 .  endif
 .endfor
 
 .include <bsd.port.pre.mk>
 
 pre-configure-PYTHON-on:
 	@${REINPLACE_CMD} -e ' \
 		s|arrow_python|arrow_python${PYTHON_SUFFIX}|g; \
 		s|arrow-python|arrow-python${PYTHON_SUFFIX}|g \
 		' \
 		${WRKSRC}/../ci/appveyor-cpp-build.bat \
 		${WRKSRC}/../cpp/cmake_modules/FindArrowPython.cmake \
 		${WRKSRC}/../cpp/cmake_modules/FindArrowPythonFlight.cmake \
 		${WRKSRC}/../cpp/src/arrow/python/arrow-python-flight.pc.in \
 		${WRKSRC}/../cpp/src/arrow/python/arrow-python.pc.in \
 		${WRKSRC}/../cpp/src/arrow/python/ArrowPythonConfig.cmake.in \
 		${WRKSRC}/../cpp/src/arrow/python/ArrowPythonFlightConfig.cmake.in \
 		${WRKSRC}/../cpp/src/arrow/python/CMakeLists.txt \
 		${WRKSRC}/../dev/release/rat_exclude_files.txt \
 		${WRKSRC}/../dev/release/verify-apt.sh \
 		${WRKSRC}/../dev/release/verify-yum.sh \
 		${WRKSRC}/../dev/tasks/conda-recipes/arrow-cpp/meta.yaml \
 		${WRKSRC}/../dev/tasks/tasks.yml \
 		${WRKSRC}/../docs/source/developers/python.rst \
 		${WRKSRC}/../python/cmake_modules/FindArrowPython.cmake \
 		${WRKSRC}/../python/cmake_modules/FindArrowPythonFlight.cmake \
 		${WRKSRC}/../python/CMakeLists.txt \
 		${WRKSRC}/../python/pyarrow/__init__.py \
 		${WRKSRC}/../python/pyarrow/plasma.py \
 		${WRKSRC}/../python/setup.py
 	@${MV} ${WRKSRC}/src/arrow/python/arrow-python.pc.in ${WRKSRC}/src/arrow/python/arrow-python${PYTHON_SUFFIX}.pc.in
 	@${MV} ${WRKSRC}/src/arrow/python/arrow-python-flight.pc.in ${WRKSRC}/src/arrow/python/arrow-python${PYTHON_SUFFIX}-flight.pc.in
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MCOMPUTE} || ${PORT_OPTIONS:MFLIGHT} || ${PORT_OPTIONS:MGANDIVA}
 PLIST_FILES+=	lib/cmake/arrow/Findre2Alt.cmake
 .endif
 
 .if ${PORT_OPTIONS:MPYTHON} == "PYTHON" && ${PORT_OPTIONS:MFLIGHT} == "FLIGHT"
     PLIST_SUB+=	PYTHONFLIGHT=""
 .else
     PLIST_SUB+=	PYTHONFLIGHT="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MTESTING} && ${PORT_OPTIONS:MFLIGHT} == "FLIGHT"
     PLIST_SUB+=	TESTINGFLIGHT=""
 .else
     PLIST_SUB+=	TESTINGFLIGHT="@comment "
 .endif
 
 do-test: # tests fail to compile: https://issues.apache.org/jira/browse/ARROW-12625
 	@cd ${BUILD_WRKSRC} && \
 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DARROW_BUILD_TESTS:BOOL=ON ${CMAKE_SOURCE_PATH} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
 
 .include <bsd.port.post.mk>
diff --git a/databases/bbdb/Makefile b/databases/bbdb/Makefile
index 3d8062842dd7..fd5752216058 100644
--- a/databases/bbdb/Makefile
+++ b/databases/bbdb/Makefile
@@ -1,56 +1,56 @@
 PORTNAME=	bbdb
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.2.2a
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	databases elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	emacs@FreeBSD.org
 COMMENT=	Big Brother Database
 WWW=		https://savannah.nongnu.org/projects/bbdb/
 
 LICENSE=	GPLv3+
 
 BUILD_DEPENDS=	texi2dvi:print/texinfo
 
 USES=		autoreconf emacs
 USE_GITHUB=	yes
 GH_ACCOUNT=	emacsmirror
 GH_TAGNAME=	a50c89a
 
 BBDB_LISPDIR=	${EMACS_SITE_LISPDIR}/${PORTNAME}
 GNU_CONFIGURE=	yes
 
 CONFLICTS_INSTALL=	bbdb bbdb-emacs_* # share/doc/bbdb/bbdb.pdf
 
 # Do not install the info file.  Upstream has yet to add any real content to it.
 #INFO=		bbdb
 PORTDOCS=	bbdb.pdf
 NO_ARCH=	yes
 PLIST_SUB+=	BBDB_LISPDIR=${BBDB_LISPDIR}
 
 OPTIONS_DEFINE=	DOCS
 DOCS_USES=	tex
 DOCS_USE=	TEX=latex:build
 DOCS_CONFIGURE_ENABLE=	docs
 
 # See http://lists.nongnu.org/archive/html/bbdb-user/2018-11/msg00003.html
 .if ${FLAVOR:U} != devel_full && ${FLAVOR:U} != devel_nox
 post-configure:
 	${REINPLACE_CMD} -e '/[[:blank:]]*--eval '\''(setq byte-compile-dest-file-function (lambda (_) "$$@"))'\'' \\/d' \
 		${WRKSRC}/lisp/Makefile
 .endif
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${BBDB_LISPDIR}
 	${INSTALL_DATA} ${WRKSRC}/lisp/*.el ${WRKSRC}/lisp/*.elc \
 		${STAGEDIR}${PREFIX}/${BBDB_LISPDIR}
 # Do not install the info file.  Upstream has yet to add any real content to it.
 #	${INSTALL_DATA} ${WRKSRC}/doc/${PORTNAME}.info \
 #		${STAGEDIR}${PREFIX}/${INFO_PATH}
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/bbdb.pdf ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/databases/closql/Makefile b/databases/closql/Makefile
index 21e4d7478a1f..88234373645f 100644
--- a/databases/closql/Makefile
+++ b/databases/closql/Makefile
@@ -1,48 +1,48 @@
 PORTNAME=	closql
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.2.1
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	databases elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	yasu@FreeBSD.org
 COMMENT=	Store EIEIO objects using EmacSQL
 WWW=		https://github.com/magit/closql
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	emacsql${EMACS_PKGNAMESUFFIX}>=3.0.0:databases/emacsql@${EMACS_FLAVOR}
 RUN_DEPENDS=	emacsql${EMACS_PKGNAMESUFFIX}>=3.0.0:databases/emacsql@${EMACS_FLAVOR}
 
 USES=		emacs
 USE_GITHUB=	yes
 GH_ACCOUNT=	magit
 
 CONFLICTS_INSTALL=	closql closql-emacs_* # share/doc/closql/README.md
 
 NO_ARCH=	yes
 
 PLIST_FILES=	${EMACS_VERSION_SITE_LISPDIR}/closql.el \
 		${EMACS_VERSION_SITE_LISPDIR}/closql.elc
 
 PORTDOCS=	README.md
 
 OPTIONS_DEFINE=	DOCS
 
 do-build:
 	(cd ${WRKSRC} \
 	&& ${EMACS_CMD} -Q -batch -L . \
 		-L ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/emacsql \
 		-f batch-byte-compile closql.el)
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}
 	(cd ${WRKSRC} && ${INSTALL_DATA} closql.el* \
 	   ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR})
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/databases/cockroach/Makefile b/databases/cockroach/Makefile
index 9dee6b9514e8..1d3385a7f767 100644
--- a/databases/cockroach/Makefile
+++ b/databases/cockroach/Makefile
@@ -1,50 +1,50 @@
 PORTNAME=	cockroach
 DISTVERSIONPREFIX=	v
 DISTVERSION=	19.1.11
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	databases
 MASTER_SITES=	https://binaries.cockroachdb.com/
 EXTRACT_SUFX=	.src.tgz
 
 MAINTAINER=	vishwin@FreeBSD.org
 COMMENT=	Cloud-native SQL database that survive disasters
 WWW=		https://www.cockroachlabs.com/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/src/github.com/cockroachdb/cockroach/LICENSE
 
 ONLY_FOR_ARCHS=	amd64
 ONLY_FOR_ARCHS_REASON=	64-bit system is strongly recommended
 
 BUILD_DEPENDS=	autoconf:devel/autoconf \
 		bash:shells/bash \
 		cmake:devel/cmake-core
 
 USES=		gmake go libedit
 
 USE_GCC=	yes # RocksDB is broken with clang - See PR 236213
 USE_RC_SUBR=	cockroach
 
 NO_CCACHE=	yes
 ALL_TARGET=	build
 
 PLIST_FILES=	bin/cockroach
 
 USERS=		cockroach
 GROUPS=		cockroach
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|LDFLAGS: -ledit|LDFLAGS: -L${LOCALBASE}/lib -ledit|g' \
 			  -e 's|CPPFLAGS: -Ishim|CPPFLAGS: -I${LOCALBASE}/include -Ishim|g' \
 		${WRKSRC}/src/github.com/cockroachdb/cockroach/vendor/github.com/knz/go-libedit/unix/editline_unix.go
 	@${REINPLACE_CMD} -e 's|build -i -o|build -o|g' \
 		${WRKSRC}/src/github.com/cockroachdb/cockroach/Makefile
 
 do-build:
 	@${SETENV} -i ${MAKE_ENV} ${GO_ENV} \
 		${MAKE_CMD} -C ${WRKSRC} buildoss
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/cockroachdb/cockroach/cockroachoss ${STAGEDIR}${PREFIX}/bin/cockroach
 
 .include <bsd.port.mk>
diff --git a/databases/dbixx/Makefile b/databases/dbixx/Makefile
index 608e9562a7e6..9473ec4b3d46 100644
--- a/databases/dbixx/Makefile
+++ b/databases/dbixx/Makefile
@@ -1,30 +1,30 @@
 PORTNAME=	dbixx
 PORTVERSION=	0.0.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	databases
 MASTER_SITES=	SF/cppcms/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	info@babaei.net
 COMMENT=	Tiny C++ wrapper around libdbi for database and SQL connectivity
 WWW=		http://cppcms.com/wikipp/en/page/ref_dbixx
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS+=	libdbi.so:databases/libdbi
 BUILD_DEPENDS=	libdbi-drivers>=0:databases/libdbi-drivers
 
 GNU_CONFIGURE=	yes
 USES=		libtool localbase:ldflags pathfix
 USE_LDCONFIG=	yes
 USE_GCC=	yes
 
 INSTALL_TARGET=	install-strip
 
 PLIST_FILES=	include/dbixx/dbixx.h \
 		lib/libdbixx.a \
 		lib/libdbixx.so \
 		lib/libdbixx.so.2 \
 		lib/libdbixx.so.2.0.0
 
 .include <bsd.port.mk>
diff --git a/databases/emacsql/Makefile b/databases/emacsql/Makefile
index 80b3f3267a60..8cc8a9a4f741 100644
--- a/databases/emacsql/Makefile
+++ b/databases/emacsql/Makefile
@@ -1,52 +1,52 @@
 PORTNAME=	emacsql
 DISTVERSION=	3.1.1
-PORTREVISION=	2
+PORTREVISION=	4
 CATEGORIES=	databases elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 PATCH_SITES=	https://github.com/magit/emacsql/commit/
 PATCHFILES=	3cec7dcb201568a09ee9cebf0ea1e43cba9d334a.patch:-p1
 
 MAINTAINER=	yasu@FreeBSD.org
 COMMENT=	High-level Emacs Lisp RDBMS front-end
 WWW=		https://github.com/magit/emacsql
 
 LICENSE=	UNLICENSE
 LICENSE_FILE=	${WRKSRC}/UNLICENSE
 
 BUILD_DEPENDS=	pg.el${EMACS_PKGNAMESUFFIX}>=0.13:databases/pg.el@${EMACS_FLAVOR}
 LIB_DEPENDS=	libsqlite3.so:databases/sqlite3
 RUN_DEPENDS=	pg.el${EMACS_PKGNAMESUFFIX}>=0.13:databases/pg.el@${EMACS_FLAVOR}
 
 USES=		emacs gmake localbase:ldflags
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	magit
 
 MAKE_ENV+=	LOAD_PATH="-L ${PREFIX}/${EMACS_SITE_LISPDIR} -L ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}"
 MAKE_JOBS_UNSAFE=	yes
 TEST_TARGET=	test
 
 CONFLICTS_INSTALL=	emacsql emacsql-emacs_*
 
 PORTDOCS=	README.md
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	${RM} ${WRKSRC}/sqlite/sqlite3.[ch]
 	${REINPLACE_CMD} 's,%%PREFIX%%,${PREFIX},g' ${WRKSRC}/emacsql-sqlite.el
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/bin \
 		${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
 	${INSTALL_PROGRAM} ${WRKSRC}/sqlite/emacsql-sqlite \
 		${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/*.el ${WRKSRC}/*.elc \
 		${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/databases/fastdb/Makefile b/databases/fastdb/Makefile
index 7433d5fdf914..1ec61394d208 100644
--- a/databases/fastdb/Makefile
+++ b/databases/fastdb/Makefile
@@ -1,34 +1,34 @@
 PORTNAME=	fastdb
 PORTVERSION=	3.75
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	databases
 MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Main Memory Relational Database Management System
 WWW=		https://sourceforge.net/projects/fastdb/
 
 LICENSE=	MIT
 
 USES=		gmake dos2unix
 USE_GCC=	yes
 MAKE_ENV=	OSTYPE="${OPSYS}"
 MAKEFILE=	makefile
 USE_LDCONFIG=	yes
 DOS2UNIX_FILES=	${MAKEFILE}
 CXXFLAGS+=	-D_WANT_SEMUN
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 OPTIONS_DEFINE=	DOCS
 
 PORTDOCS=	FastDB.htm
 
 # The port does not build with C++11 or later (bug 219275).
 USE_CXXSTD=	gnu++98
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/FastDB.htm ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/databases/gigabase/Makefile b/databases/gigabase/Makefile
index 4ff3e18dec76..41b8ac1e4ee9 100644
--- a/databases/gigabase/Makefile
+++ b/databases/gigabase/Makefile
@@ -1,26 +1,26 @@
 PORTNAME=	gigabase
 PORTVERSION=	3.91
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	databases
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-src/${PORTVERSION} \
 		http://www.garret.ru/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Object-Relational Database Management System
 WWW=		http://www.garret.ru/gigabase.html
 
 LICENSE=	MIT
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 GNU_CONFIGURE=	yes
 USES=		autoreconf dos2unix gmake libtool
 DOS2UNIX_FILES=	Makefile.in configure.in *.cpp *.h
 USE_GCC=	yes
 USE_CXXSTD=	gnu++98
 USE_LDCONFIG=	yes
 
 post-build:
 	${STRIP_CMD} ${WRKSRC}/.libs/*.so
 
 .include <bsd.port.mk>
diff --git a/databases/gnats4/Makefile b/databases/gnats4/Makefile
index be3746428c35..0e7a5f28d14a 100644
--- a/databases/gnats4/Makefile
+++ b/databases/gnats4/Makefile
@@ -1,113 +1,113 @@
 PORTNAME=	gnats
 PORTVERSION=	4.1.0
-PORTREVISION=	17
+PORTREVISION=	18
 CATEGORIES=	databases devel
 MASTER_SITES=	GNU
 PKGNAMESUFFIX=	4
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GNATS, the GNU Problem Report Management System
 WWW=		https://www.gnu.org/software/gnats/
 
 BROKEN_mips=		Does not build: error: conflicting types for yy_scan_string
 BROKEN_mips64=		Does not build: error: conflicting types for yy_scan_string
 BROKEN_FreeBSD_12_powerpc64=	fails to build on powerpc64 elfv1: conflicting types for yy_scan_string
 
 GNU_CONFIGURE=	yes
 USES=		cpe gmake makeinfo
 USE_GCC=	yes
 USERS=		gnats
 
 CPE_VENDOR=	gnu
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
 PKGINSTALL=	${WRKDIR}/pkg-install
 
 .ifdef WANT_FREEFALL_CFG
 EXTRA_PATCHES+=		${PATCHDIR}/extrapatch-*
 GNATSDBDIR=		${DATADIR}
 CONFIGURE_ARGS+=	--with-gnats-default-db=${GNATSDBDIR}/gnats-db
 WITH_SUBMITTER_ID=	current-users
 WITH_ORGANIZATION=	FreeBSD
 WITH_GNATSD_SERVICE=	support
 .endif
 
 GNATSDBDIR?=		/var/db/gnats
 
 CONFIGURE_ARGS+=	--sharedstatedir=${GNATSDBDIR}
 
 .ifdef WITH_SUBMITTER_ID
 CONFIGURE_ARGS+=	--with-submitter=${WITH_SUBMITTER_ID}
 .endif
 
 .ifdef WITH_ORGANIZATION
 CONFIGURE_ARGS+=	--with-organization=${WITH_ORGANIZATION:Q}
 .endif
 
 .ifdef WITH_GNATSD_SERVICE
 CONFIGURE_ARGS+=	--with-gnats-service=${WITH_GNATSD_SERVICE}
 .endif
 
 PLIST_SUB=	GNATSDBDIR=${GNATSDBDIR}
 INFO=		gnats-faq gnats
 PORTDOCS=	NEWS UPGRADING
 
 OPTIONS_DEFINE=	DOCS EMACS SERVER
 OPTIONS_DEFAULT=SERVER
 OPTIONS_SUB=	yes
 EMACS_USES=	emacs
 EMACS_DESC=	Install Emacs Lisp support file
 EMACS_VARS=	EMACS_NO_DEPENDS=yes
 SERVER_DESC=	Install the gnats server too
 
 .include <bsd.port.options.mk>
 
 .if ! ${PORT_OPTIONS:MSERVER}
 ALL_TARGET=	all-tools
 INSTALL_TARGET=	install-tools
 .endif
 
 .if ${PORT_OPTIONS:MEMACS}
 CONFIGURE_ARGS+=--with-lispdir=${LOCALBASE}/${EMACS_SITE_LISPDIR}
 .else
 PLIST_SUB+=	EMACS_SITE_LISPDIR="@comment "
 .endif
 
 pre-everything::
 .if !defined(PACKAGE_BUILDING) && !defined(WANT_FREEFALL_CFG)
 	@${ECHO} "============================================================="
 	@${ECHO}
 	@${ECHO} "You can build ${PKGNAME} with the following options:"
 	@${ECHO}
 	@${ECHO} "WITH_SUBMITTER_ID=unknown        default submitter-id"
 	@${ECHO} "WITH_ORGANIZATION='unknown'      default organization"
 	@${ECHO} "WITH_GNATSD_SERVICE=support      default gnatsd port name"
 	@${ECHO}
 	@${ECHO} "============================================================="
 	@${ECHO}
 .endif
 
 pre-configure:
 	@${ECHO_CMD} 'RELEASE_TAG="\`uname -srm\`"' > ${WRKSRC}/release-info
 
 post-build:
 	@for doc in pkg-message pkg-install; do \
 		${SED} -e 's,%%PREFIX%%,${STAGEDIR}${PREFIX},g' \
 			-e 's,%%GNATSDBDIR%%,${GNATSDBDIR},g' \
 			${PKGDIR}/$${doc} >${WRKDIR}/$${doc}; \
 	done
 
 pre-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/libexec/gnats
 
 post-install:
 .if ${PORT_OPTIONS:MSERVER}
 	${MV} ${STAGEDIR}${ETCDIR}/databases.default \
 		${STAGEDIR}${ETCDIR}/databases.sample
 	${MV} ${STAGEDIR}${ETCDIR}/gnatsd.host_access.default \
 		${STAGEDIR}${ETCDIR}/gnatsd.host_access.sample
 .endif
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
diff --git a/databases/grass7/Makefile b/databases/grass7/Makefile
index 3948b25e2a1e..03c6d6fb3cc9 100644
--- a/databases/grass7/Makefile
+++ b/databases/grass7/Makefile
@@ -1,205 +1,205 @@
 PORTNAME=	grass
 PORTVERSION=	7.8.7
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	databases geography
 MASTER_SITES=	https://grass.osgeo.org/%SUBDIR%/ \
 		http://grass.cict.fr/%SUBDIR%/ \
 		http://grass.fbk.eu/%SUBDIR%/ \
 		http://grass.gis-lab.info/%SUBDIR%/ \
 		http://grass.meteo.uni.wroc.pl/%SUBDIR%/ \
 		http://grass.polytechnic.edu.na/%SUBDIR%/ \
 		http://grass.unibuc.ro/%SUBDIR%/ \
 		http://mirrors.ibiblio.org/grass/%SUBDIR%/ \
 		http://pinus.gntech.ac.kr/grass/%SUBDIR%/ \
 		http://wgbis.ces.iisc.ernet.in/grass/%SUBDIR%/ \
 		http://wgrass.media.osaka-cu.ac.jp/grassh/%SUBDIR%/
 MASTER_SITE_SUBDIR=	grass${VER}/source
 PKGNAMESUFFIX=	7
 
 MAINTAINER=	lbartoletti@FreeBSD.org
 COMMENT=	Open source Geographical Information System (GIS)
 WWW=		https://grass.osgeo.org/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/GPL.TXT
 
 BROKEN_sparc64=	Does not configure on sparc64
 
 BUILD_DEPENDS=	${PY_NUMPY} \
 		${PYTHON_SITELIBDIR}/six.py:devel/py-six@${PY_FLAVOR}
 LIB_DEPENDS=	libgdal.so:graphics/gdal \
 		libpng.so:graphics/png \
 		libproj.so:graphics/proj \
 		libtiff.so:graphics/tiff \
 		libfftw3.so:math/fftw3 \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libgeos.so:graphics/geos
 RUN_DEPENDS=	${PY_NUMPY} \
 		${PYTHON_SITELIBDIR}/six.py:devel/py-six@${PY_FLAVOR}
 
 USES=		blaslapack compiler:c11 gl gmake gnome iconv \
 		jpeg perl5 pkgconfig python:3.6+ readline shebangfix xorg
 SHEBANG_GLOB=	*.py
 SHEBANG_LANG=	nviz
 nviz_OLD_CMD=	nviz
 nviz_CMD=	${PREFIX}/${GRASS_INST_DIR}/bin/nviz
 USE_XORG=	sm ice x11 xext xi xmu xrender xt
 USE_GL=		gl glu
 USE_GNOME=	cairo
 USE_WX=		3.2
 WX_COMPS=	wx python:run
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS=	--with-includes=${LOCALBASE}/include \
 		--with-libs=${LOCALBASE}/lib \
 		--with-opengl-includes=${LOCALBASE}/include/ \
 		--with-opengl-libs=${LOCALBASE}/lib/ \
 		--with-freetype \
 		--with-freetype-includes=${LOCALBASE}/include/freetype2 \
 		--with-blas \
 		--with-lapack \
 		--with-cairo \
 		--with-readline \
 		--enable-largefile \
 		--with-wxwidgets=${WX_CONFIG} \
 		--with-proj-share=${LOCALBASE}/share/proj \
 		--with-proj-includes=${LOCALBASE}/include \
 		--with-proj-libs=${LOCALBASE}/lib \
 		--with-proj=${LOCALBASE}/bin/proj \
 		--with-geos=${LOCALBASE}/bin/geos-config \
 		--with-gdal=${LOCALBASE}/bin/gdal-config \
 		--with-pthread=yes \
 		--prefix=${LOCALBASE} \
 		--exec-prefix=${LOCALBASE}
 
 CFLAGS+=	-std=c11
 
 SUB_FILES=	pkg-message
 SUB_LIST=	PYTHON_CMD=${PYTHON_CMD}
 BINARY_ALIAS=	python3=${PYTHON_CMD}
 ALL_TARGET=	default
 USE_LDCONFIG=	${PREFIX}/${GRASS_INST_DIR}/lib
 MAKE_ENV+=	TARGET="${CONFIGURE_TARGET}"
 VER=		${PORTVERSION:R:C/\.//}
 
 PLIST_SUB=	GRASS_INST_DIR="${GRASS_INST_DIR}" \
 		VERSION="${PORTVERSION}" VERS="${PORTVERSION:C/([0-9]+).([0-9]+)(.*)/\1.\2/}" \
 		VER="${VER}" MAJVER="${PKGNAMESUFFIX}"
 
 OPTIONS_DEFINE=		LAS NETCDF NLS PDAL ZSTD
 OPTIONS_MULTI=		DB
 OPTIONS_MULTI_DB=	MYSQL ODBC PGSQL SQLITE
 #OPTIONS_SINGLE=		BLAS
 #OPTIONS_SINGLE_BLAS=	ATLAS NETLIB GOTOBLAS OPENBLAS
 OPTIONS_DEFAULT=	LAS NETCDF NLS PDAL PGSQL SQLITE ZSTD
 OPTIONS_SUB=		yes
 
 # BLAS/LAPACK: Only netlib compile the maxmimum number of modules
 #BLAS_DESC=		BLAS/LAPACK support
 #GOTOBLAS_DESC=		GotoBLAS implementationS
 #ATLAS_USES=		blaslapack:atlas
 #NETLIB_USES=		blaslapack
 #GOTOBLAS_USES=		blaslapack:gotoblas
 #OPENBLAS_USES=		blaslapack:openblas
 LAS_DESC=		Enable LiDAR modules
 PDAL_DESC=		Enable points cloud data modules
 DB_DESC=		Database support
 LAS_CONFIGURE_ON=	--with-liblas=yes
 LAS_LIB_DEPENDS=	liblas.so:devel/liblas \
 			libboost_program_options.so:devel/boost-libs \
 			libboost_thread.so:devel/boost-libs \
 			libgeotiff.so:graphics/libgeotiff
 MYSQL_USES=		mysql
 MYSQL_CONFIGURE_ON=	--with-mysql \
 			--with-mysql-includes=${LOCALBASE}/include/mysql \
 			--with-mysql-libs=${LOCALBASE}/lib/mysql
 NETCDF_CONFIGURE_ON=	--with-netcdf=${LOCALBASE}/bin/nc-config
 NETCDF_LIB_DEPENDS=	libnetcdf.so:science/netcdf
 NLS_CONFIGURE_WITH=	nls
 NLS_USES=		gettext
 ODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC
 ODBC_CONFIGURE_WITH=	odbc
 PDAL_CONFIGURE_ON=	--with-pdal=${LOCALBASE}/bin/pdal-config
 PDAL_LIB_DEPENDS=	libpdal_base.so:math/pdal
 PGSQL_USES=		pgsql
 PGSQL_CONFIGURE_WITH=	postgres
 SQLITE_USES=		sqlite
 SQLITE_CONFIGURE_WITH=	sqlite
 SQLITE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
 ZSTD_CONFIGURE_WITH=	zstd
 ZSTD_LIB_DEPENDS=	libzstd.so:archivers/zstd
 
 .if exists(/usr/include/omp.h)
 CONFIGURE_ARGS+=	--with-openmp
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "i386"
 USE_GCC=	yes
 PLIST_SUB+=	NOTONI386="@comment "
 .else
 PLIST_SUB+=	NOTONI386=""
 .endif
 
 .if !defined (GRASS_INST_DIR)
 GRASS_INST_DIR=	${PORTNAME}${VER}
 .endif
 
 MANDIRS=	${PREFIX}/grass${VER}/docs/man/man1
 
 post-patch:
 	${REINPLACE_CMD} \
 		's|= python3|= ${PYTHON_CMD:T}|' ${WRKSRC}/include/Make/Platform.make.in
 	${REINPLACE_CMD} -e \
 		"s|'make'|'gmake'|g; \
 		 s|gcc|${CC}|" ${WRKSRC}/scripts/g.extension/g.extension.py
 	${REINPLACE_CMD} \
 		's|$$(ARCH)|$$(TARGET)|g' ${WRKSRC}/include/Make/Grass.make
 # Replace hardcoded python interpreter to PYTHON_CMD
 	${REINPLACE_CMD} "s|'GRASS_PYTHON', 'python'|'GRASS_PYTHON', \'${PYTHON_CMD}\'|g" \
 		${WRKSRC}/scripts/wxpyimgview/wxpyimgview.py
 	${REINPLACE_CMD} 's|GRASS_PYTHON=python|GRASS_PYTHON=${PYTHON_CMD}|g' \
 		${WRKSRC}/lib/init/grass.sh
 	${REINPLACE_CMD} \
 		"s|environ\['GRASS_PYTHON'\] = "'"python3"'"|environ['GRASS_PYTHON'] = "'"${PYTHON_CMD}"'"|g" \
 		${WRKSRC}/lib/python/script/setup.py
 
 post-install:
 # remove useless files
 	${RM} -rf ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/etc/db.test/
 	${RM} -rf ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/demolocation/PERMANENT/.tmp/
 	${RM} -rf ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/docs/html/colortables/*bak.png
 
 # fix pkg-plist issues
 # poudriere testport, poudriere bulk -t and make ports can create different pkg-plist
 	for i in `${FIND} ${WRKSRC}/scripts -type f \( -name *jpg -o -name *png -o -name *gxm \)  -print`; do \
 		${INSTALL_DATA} $$i ${STAGEDIR}${LOCALBASE}/${PORTNAME}${VER}/docs/html; \
 	done
 	for i in `${FIND} ${WRKSRC}/gui/wxpython -type f \( -name *jpg -o -name *png -o -name *gxm \) -print`; do \
 		${INSTALL_DATA} $$i ${STAGEDIR}${LOCALBASE}/${PORTNAME}${VER}/docs/html; \
 	done
 	for i in `${FIND} ${WRKSRC}/raster -type f \( -name *jpg -o -name *png -o -name *gxm \) -print`; do \
 		${INSTALL_DATA} $$i ${STAGEDIR}${LOCALBASE}/${PORTNAME}${VER}/docs/html; \
 	done
 	for i in `${FIND} ${WRKSRC}/imagery -type f \( -name *jpg -o -name *png -o -name *gxm \) -print`; do \
 		${INSTALL_DATA} $$i ${STAGEDIR}${LOCALBASE}/${PORTNAME}${VER}/docs/html; \
 	done
 	${INSTALL_SCRIPT} ${WRKSRC}/scripts/wxpyimgview/wxpyimgview_gui.py ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/etc/wxpyimgview_gui.py
 	${MKDIR} ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/etc/d.polar
 	${INSTALL_DATA} ${WRKSRC}/scripts/d.polar/ps_defs.eps ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/etc/d.polar
 
 # STRIP PART
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/bin/*
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/driver/db/*
 .for i in clean_temp current_time_s_ms echo i.find lock run r.watershed/seg r.watershed/ram lister/vector lister/cell
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/etc/${i}
 .endfor
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/tools/g.echo
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/lib/*
 
 # symlink grass7
 	${LN} -sf ${PORTNAME}${VER} \
 		${STAGEDIR}${PREFIX}/bin/${PORTNAME}${PKGNAMESUFFIX}
 .include <bsd.port.post.mk>
diff --git a/databases/grass8/Makefile b/databases/grass8/Makefile
index 59d62da11177..a4a5053f446d 100644
--- a/databases/grass8/Makefile
+++ b/databases/grass8/Makefile
@@ -1,152 +1,152 @@
 PORTNAME=	grass
 DISTVERSION=	8.2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases geography
 MASTER_SITES=	https://grass.osgeo.org/%SUBDIR%/ \
 		http://grass.cict.fr/%SUBDIR%/ \
 		http://grass.fbk.eu/%SUBDIR%/ \
 		http://grass.gis-lab.info/%SUBDIR%/ \
 		http://grass.meteo.uni.wroc.pl/%SUBDIR%/ \
 		http://grass.polytechnic.edu.na/%SUBDIR%/ \
 		http://grass.unibuc.ro/%SUBDIR%/ \
 		http://mirrors.ibiblio.org/grass/%SUBDIR%/ \
 		http://pinus.gntech.ac.kr/grass/%SUBDIR%/ \
 		http://wgbis.ces.iisc.ernet.in/grass/%SUBDIR%/ \
 		http://wgrass.media.osaka-cu.ac.jp/grassh/%SUBDIR%/
 MASTER_SITE_SUBDIR=	grass${VER}/source
 PKGNAMESUFFIX=	8
 
 MAINTAINER=	lbartoletti@FreeBSD.org
 COMMENT=	Open source Geographical Information System (GIS)
 WWW=		https://grass.osgeo.org/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/GPL.TXT
 
 BUILD_DEPENDS=	${PY_NUMPY} \
 		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
 LIB_DEPENDS=	libgdal.so:graphics/gdal \
 		libpng.so:graphics/png \
 		libproj.so:graphics/proj \
 		libtiff.so:graphics/tiff \
 		libgeotiff.so:graphics/libgeotiff \
 		libfftw3.so:math/fftw3 \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libgeos.so:graphics/geos \
 		libzstd.so:archivers/zstd
 RUN_DEPENDS=	${PY_NUMPY} \
 		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
 
 USES=		blaslapack compiler:c11 gl gmake gnome iconv \
 		jpeg perl5 pkgconfig python:3.6+ readline shebangfix sqlite xorg
 SHEBANG_GLOB=	*.py
 SHEBANG_LANG=	nviz
 nviz_OLD_CMD=	nviz
 nviz_CMD=	${PREFIX}/${GRASS_INST_DIR}/bin/nviz
 USE_XORG=	sm ice x11 xext xi xmu xrender xt
 USE_GL=		gl glu
 USE_GNOME=	cairo
 USE_WX=		3.2
 WX_COMPS=	wx python:run
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS=	--with-includes=${LOCALBASE}/include \
 		--with-libs=${LOCALBASE}/lib \
 		--with-opengl-includes=${LOCALBASE}/include/ \
 		--with-opengl-libs=${LOCALBASE}/lib/ \
 		--with-freetype \
 		--with-freetype-includes=${LOCALBASE}/include/freetype2 \
 		--with-blas \
 		--with-lapack \
 		--with-cairo \
 		--with-readline \
 		--enable-largefile \
 		--with-wxwidgets=${WX_CONFIG} \
 		--with-proj-share=${LOCALBASE}/share/proj \
 		--with-proj-includes=${LOCALBASE}/include \
 		--with-proj-libs=${LOCALBASE}/lib \
 		--with-proj=${LOCALBASE}/bin/proj \
 		--with-geos=${LOCALBASE}/bin/geos-config \
 		--with-gdal=${LOCALBASE}/bin/gdal-config \
 		--with-pthread=yes \
 		--prefix=${LOCALBASE} \
 		--exec-prefix=${LOCALBASE}
 
 CFLAGS+=	-std=c11
 
 SUB_LIST=	PYTHON_CMD=${PYTHON_CMD}
 BINARY_ALIAS=	python3=${PYTHON_CMD}
 ALL_TARGET=	default
 USE_LDCONFIG=	${PREFIX}/${GRASS_INST_DIR}/lib
 MAKE_ENV+=	TARGET="${CONFIGURE_TARGET}"
 VER=		${PORTVERSION:R:C/\.//}
 
 PLIST_SUB=	GRASS_INST_DIR="${GRASS_INST_DIR}" \
 		VERSION="${PORTVERSION}" VERS="${PORTVERSION:C/([0-9]+).([0-9]+)(.*)/\1.\2/}" \
 		VER="${VER}" MAJVER="${PKGNAMESUFFIX}"
 
 OPTIONS_DEFINE=		NETCDF NLS PDAL
 OPTIONS_MULTI=		DB
 OPTIONS_MULTI_DB=	MYSQL ODBC PGSQL
 OPTIONS_DEFAULT=	NETCDF NLS PDAL PGSQL
 OPTIONS_SUB=		yes
 
 PDAL_DESC=		Enable points cloud data modules
 DB_DESC=		Database support
 MYSQL_USES=		mysql
 MYSQL_CONFIGURE_ON=	--with-mysql \
 			--with-mysql-includes=${LOCALBASE}/include/mysql \
 			--with-mysql-libs=${LOCALBASE}/lib/mysql
 NETCDF_CONFIGURE_ON=	--with-netcdf=${LOCALBASE}/bin/nc-config
 NETCDF_LIB_DEPENDS=	libnetcdf.so:science/netcdf
 NLS_CONFIGURE_WITH=	nls
 NLS_USES=		gettext
 ODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC
 ODBC_CONFIGURE_WITH=	odbc
 PDAL_CONFIGURE_ON=	--with-pdal=${LOCALBASE}/bin/pdal-config
 PDAL_LIB_DEPENDS=	libpdal_base.so:math/pdal
 PGSQL_USES=		pgsql
 PGSQL_CONFIGURE_WITH=	postgres
 
 .if exists(/usr/include/omp.h)
 CONFIGURE_ARGS+=	--with-openmp
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if !defined (GRASS_INST_DIR)
 GRASS_INST_DIR=	${PORTNAME}${VER}
 .endif
 
 MANDIRS=	${PREFIX}/grass${VER}/docs/man/man1
 
 post-patch:
 	${REINPLACE_CMD} \
 		's|= python3|= ${PYTHON_CMD:T}|' ${WRKSRC}/include/Make/Platform.make.in
 	${REINPLACE_CMD} \
 		's|$$(ARCH)|$$(TARGET)|g' ${WRKSRC}/include/Make/Grass.make
 # Replace hardcoded python interpreter to PYTHON_CMD
 	${REINPLACE_CMD} 's|"GRASS_PYTHON", "python"|"GRASS_PYTHON", "${PYTHON_CMD}"|g' \
 		${WRKSRC}/scripts/wxpyimgview/wxpyimgview.py
 	${REINPLACE_CMD} \
 		's|environ\["GRASS_PYTHON"\] = "python3"|environ["GRASS_PYTHON"] = "${PYTHON_CMD}"|g' \
 		${WRKSRC}/python/grass/script/setup.py
 
 post-install:
 	${RM} -rf ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/demolocation/PERMANENT/.tmp/
 
 # STRIP PART
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/bin/*
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/driver/db/*
 .for i in clean_temp current_time_s_ms echo i.find lock run r.watershed/seg r.watershed/ram lister/vector lister/cell
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/etc/${i}
 .endfor
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/lib/*
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/utils/g.echo
 
 # symlink grass8
 	${LN} -sf ${PORTNAME} \
 		${STAGEDIR}${PREFIX}/bin/${PORTNAME}${PKGNAMESUFFIX}
 .include <bsd.port.post.mk>
diff --git a/databases/mysql-q4m/Makefile b/databases/mysql-q4m/Makefile
index 946df7053d1f..215eb13d4ebf 100644
--- a/databases/mysql-q4m/Makefile
+++ b/databases/mysql-q4m/Makefile
@@ -1,59 +1,59 @@
 PORTNAME=	q4m
 PORTVERSION=	0.9.14
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	databases
 MASTER_SITES=	http://q4m.kazuhooku.com/dist/
 PKGNAMEPREFIX=	${_MYSQL_SERVER:T:C/-server$/-/}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Message queue that works as a pluggable storage engine of MySQL
 WWW=		http://q4m.github.com/
 
 DEPRECATED=	Requires upstream EOL MySQL 5.6
 EXPIRATION_DATE=	2023-06-30
 
 FETCH_DEPENDS+=	${NONEXISTENT}:${_MYSQL_SERVER}:fetch
 BUILD_DEPENDS+=	${NONEXISTENT}:${_MYSQL_SERVER}:build
 
 USES=		gmake perl5 libtool mysql:server
 
 IGNORE_WITH_MYSQL=	57 80 101m 102m 103m 57p 57w
 USE_GCC=	yes
 USE_PERL5=	run
 
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-lpthread -L${LOCALBASE}/lib/mysql
 CONFIGURE_ARGS=	--prefix="${PREFIX}" \
 		--libdir="${PREFIX}/lib/mysql/plugin" \
 		--with-mysql="$$(cd ${PORTSDIR}/${_MYSQL_SERVER}; ${MAKE} -V WRKSRC)" \
 		CPPFLAGS="-I$$(cd ${PORTSDIR}/${_MYSQL_SERVER}; ${MAKE} -V BUILD_WRKSRC)/include -DDEBUG_OFF"
 INSTALL_TARGET=	bindir=${STAGEDIR}${PREFIX}/bin install
 
 post-extract:
 	${CP} -p ${WRKSRC}/support-files/install.sql ${WRKSRC}/examples/
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 PORTDOCS=	AUTHORS ChangeLog README doc
 PORTEXAMPLES=	crawler install.sql
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/include/mysql|/include/mysql/mysql|g' ${WRKSRC}/configure
 
 post-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in ${PORTDOCS}
 	cd ${WRKSRC}; ${COPYTREE_SHARE} ${f} ${STAGEDIR}${DOCSDIR}
 .endfor
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 .for f in ${PORTEXAMPLES}
 	cd ${WRKSRC}/examples; ${COPYTREE_SHARE} ${f} ${STAGEDIR}${EXAMPLESDIR}
 .endfor
 
 install-functions:
 	mysql -u root -p -f mysql < ${EXAMPLESDIR}/install.sql
 
 test:
 	cd ${WRKSRC}; ./run_tests.pl
 
 .include <bsd.port.mk>
diff --git a/databases/p5-Class-DBI-Plugin-Senna/Makefile b/databases/p5-Class-DBI-Plugin-Senna/Makefile
index 0570aacabc51..71e54888ad27 100644
--- a/databases/p5-Class-DBI-Plugin-Senna/Makefile
+++ b/databases/p5-Class-DBI-Plugin-Senna/Makefile
@@ -1,24 +1,24 @@
 PORTNAME=	Class-DBI-Plugin-Senna
 PORTVERSION=	0.01
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Add Instant Fulltext Search Capability With Senna to Class::DBI
 WWW=		https://metacpan.org/release/Class-DBI-Plugin-Senna
 
 BUILD_DEPENDS=	p5-Class-DBI>=0:databases/p5-Class-DBI \
 	p5-Senna>=0:textproc/p5-Senna
 
 USES=		perl5
 USE_PERL5=	configure
 
 # With $TRYBROKEN, do "perl Makefile.PL" in verbose mode.
 do-configure:
 	cd ${CONFIGURE_WRKSRC} && \
 		${SETENV} ${CONFIGURE_ENV} \
 		${PERL5} ${CONFIGURE_CMD} ${CONFIGURE_ARGS}
 
 .include <bsd.port.mk>
diff --git a/databases/pg.el/Makefile b/databases/pg.el/Makefile
index 4ebe94a1fcd6..2a5f83d2a25d 100644
--- a/databases/pg.el/Makefile
+++ b/databases/pg.el/Makefile
@@ -1,44 +1,45 @@
 PORTNAME=	pg.el
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.20
+PORTREVISION=	2
 CATEGORIES=	databases elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	yasu@FreeBSD.org
 COMMENT=	PostgreSQL Elisp interface
 WWW=		https://github.com/emarsden/pg-el
 
 LICENSE=	GPLv2+
 
 USES=		emacs
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	emarsden
 GH_PROJECT=	pg-el
 GH_TAGNAME=	${DISTVERSIONPREFIX}${DISTVERSION}
 
 CONFLICTS_INSTALL=	pg.el pg.el-emacs_* # share/doc/pg.el/README
 
 NO_ARCH=	yes
 
 PLIST_FILES=	${EMACS_VERSION_SITE_LISPDIR}/pg.el \
 		${EMACS_VERSION_SITE_LISPDIR}/pg.elc
 
 PORTDOCS=	CHANGELOG.md README.md
 
 OPTIONS_DEFINE=	DOCS
 
 do-build:
 	(cd ${WRKSRC} \
 	&& ${EMACS_CMD} -Q -batch -L . -f batch-byte-compile *.el)
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}
 	(cd ${WRKSRC} && ${INSTALL_DATA} *.el* \
 	    ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR})
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:C/^/${WRKSRC}\//g} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/databases/pgrouting/Makefile b/databases/pgrouting/Makefile
index e6e2cd509cc4..f6bcec664779 100644
--- a/databases/pgrouting/Makefile
+++ b/databases/pgrouting/Makefile
@@ -1,24 +1,25 @@
 PORTNAME=	pgrouting
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.5.0
+PORTREVISION=	1
 CATEGORIES=	databases geography
 
 MAINTAINER=	lbartoletti@FreeBSD.org
 COMMENT=	Extension to PostGIS to provide geospatial routing functionality
 WWW=		https://pgrouting.org/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libboost_system.so:devel/boost-libs
 RUN_DEPENDS=	${LOCALBASE}/share/postgresql/extension/postgis.control:databases/postgis33
 
 USES=		compiler:c++14-lang cmake localbase perl5 pgsql:11+ pkgconfig
 WANT_PGSQL=	lib server
 USE_LDCONFIG=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	pgRouting
 
 PLIST_SUB=	DISTVERSION=${DISTVERSION}
 
 .include <bsd.port.mk>
diff --git a/databases/postgis30/Makefile b/databases/postgis30/Makefile
index ac47536b0f94..ee561b92cd1d 100644
--- a/databases/postgis30/Makefile
+++ b/databases/postgis30/Makefile
@@ -1,85 +1,85 @@
 PORTNAME=	postgis
 PORTVERSION=	3.0.8
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	databases geography
 MASTER_SITES=	https://download.osgeo.org/postgis/source/
 PKGNAMESUFFIX=	30
 
 MAINTAINER=	lbartoletti@FreeBSD.org
 COMMENT=	Geographic objects support for PostgreSQL databases
 WWW=		https://postgis.net/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libproj.so:graphics/proj \
 		libgeos.so:graphics/geos \
 		libjson-c.so:devel/json-c \
 		libgdal.so:graphics/gdal
 
 USES=		alias compiler:c++11-lang cpe gmake gnome iconv:wchar_t libtool:keepla \
 		localbase perl5 pkgconfig pgsql:11+ shebangfix
 USE_GNOME=	libxml2
 USE_PERL5=	build
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	${ICONV_CONFIGURE_BASE} NUMERICFLAGS=${PORTVERSION}
 SHEBANG_FILES=	extensions/address_standardizer/*.pl raster/test/regress/*.pl \
 		regress/run_test.pl \
 		utils/postgis_restore.pl.in utils/*.pl
 WANT_PGSQL=	server
 
 OPTIONS_DEFINE=	ADDRSTD JSON LOADERGUI NLS PROTOBUF RASTER SFCGAL TOPOLOGY WAGYU
 OPTIONS_DEFAULT=ADDRSTD JSON NLS PROTOBUF RASTER SFCGAL TOPOLOGY WAGYU
 OPTIONS_SUB=	yes
 
 ADDRSTD_DESC=	Enable address standardizer
 JSON_DESC=	Enable JSON support
 LOADERGUI_DESC=	Enable shp2pgsql-gui
 PROTOBUF_DESC=	Enable protocol buffers
 RASTER_DESC=	Enable raster support
 SFCGAL_DESC=	Enable sfcgal
 TOPOLOGY_DESC=	Topology support
 WAGYU_DESC=	Enable WAGYU support
 
 ADDRSTD_CONFIGURE_WITH=		address-standardizer
 ADDRSTD_LIB_DEPENDS=		libpcre.so:devel/pcre
 ADDRSTD_VARS=			WANT_PGSQL+=contrib
 JSON_CONFIGURE_WITH=		json
 JSON_LIB_DEPENDS=		libjson-c.so:devel/json-c
 LOADERGUI_CONFIGURE_WITH=	gui
 LOADERGUI_USE=			GNOME=gtk20
 NLS_CONFIGURE_WITH=		nls
 NLS_USES=			gettext
 PROTOBUF_CONFIGURE_WITH=	protobuf
 PROTOBUF_LIB_DEPENDS=		libprotobuf-c.so:devel/protobuf-c
 SFCGAL_CONFIGURE_WITH=		sfcgal=${LOCALBASE}/bin/sfcgal-config
 SFCGAL_LIB_DEPENDS=		libSFCGAL.so:databases/sfcgal
 TOPOLOGY_CONFIGURE_WITH=	topology
 WAGYU_CONFIGURE_WITH=		wagyu
 
 CONFLICTS_INSTALL=	postgis[0-9][0-9] # lib/postgresql/address_standardizer-3.so
 
 VER=		${PORTVERSION:R}
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION} \
 		VER=${VER}
 
 .include <bsd.port.pre.mk>
 
 .if ${CHOSEN_COMPILER_TYPE} == gcc
 post-patch:
 	${REINPLACE_CMD} -e '/^#pragma GCC diagnostic/d' \
 		${WRKSRC}/postgis/lwgeom_functions_basic.c \
 		${WRKSRC}/postgis/lwgeom_geos.c
 .endif
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/postgresql/*.so
 	${MKDIR} ${STAGEDIR}${DATADIR}/tiger_geocoder
 	(cd ${WRKSRC}/extras/tiger_geocoder && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/tiger_geocoder/ "! ( -name *\.orig -o -name *\.bak )" )
 	${MKDIR} ${STAGEDIR}${DATADIR}/utils
 	(cd ${WRKSRC}/utils/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/utils/ "! ( -name *\.orig -o -name *\.bak -o -name Makefile -o -name *\.in -o -name uninstall_script )" )
 
 .include <bsd.port.post.mk>
diff --git a/databases/postgis31/Makefile b/databases/postgis31/Makefile
index f6952114c422..5f82b0be3d41 100644
--- a/databases/postgis31/Makefile
+++ b/databases/postgis31/Makefile
@@ -1,85 +1,85 @@
 PORTNAME=	postgis
 PORTVERSION=	3.1.8
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	databases geography
 MASTER_SITES=	https://download.osgeo.org/postgis/source/
 PKGNAMESUFFIX=	31
 
 MAINTAINER=	lbartoletti@FreeBSD.org
 COMMENT=	Geographic objects support for PostgreSQL databases
 WWW=		https://postgis.net/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libproj.so:graphics/proj \
 		libgeos.so:graphics/geos \
 		libjson-c.so:devel/json-c \
 		libgdal.so:graphics/gdal
 
 USES=		alias compiler:c++11-lang cpe gmake gnome iconv:wchar_t libtool:keepla \
 		localbase perl5 pkgconfig pgsql:11+ shebangfix
 USE_GNOME=	libxml2
 USE_PERL5=	build
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	${ICONV_CONFIGURE_BASE} NUMERICFLAGS=${PORTVERSION}
 SHEBANG_FILES=	extensions/address_standardizer/*.pl raster/test/regress/*.pl \
 		raster/test/regress/loader/*.pl regress/run_test.pl \
 		utils/postgis_restore.pl.in utils/*.pl
 WANT_PGSQL=	server
 
 OPTIONS_DEFINE=	ADDRSTD JSON LOADERGUI NLS PROTOBUF RASTER SFCGAL TOPOLOGY WAGYU
 OPTIONS_DEFAULT=ADDRSTD JSON NLS PROTOBUF RASTER SFCGAL TOPOLOGY WAGYU
 OPTIONS_SUB=	yes
 
 ADDRSTD_DESC=	Enable address standardizer
 JSON_DESC=	Enable JSON support
 LOADERGUI_DESC=	Enable shp2pgsql-gui
 PROTOBUF_DESC=	Enable protocol buffers
 RASTER_DESC=	Enable raster support
 SFCGAL_DESC=	Enable sfcgal
 TOPOLOGY_DESC=	Topology support
 WAGYU_DESC=	Enable WAGYU support
 
 ADDRSTD_CONFIGURE_WITH=		address-standardizer
 ADDRSTD_LIB_DEPENDS=		libpcre.so:devel/pcre
 ADDRSTD_VARS=			WANT_PGSQL+=contrib
 JSON_CONFIGURE_WITH=		json
 JSON_LIB_DEPENDS=		libjson-c.so:devel/json-c
 LOADERGUI_CONFIGURE_WITH=	gui
 LOADERGUI_USE=			GNOME=gtk20
 NLS_CONFIGURE_WITH=		nls
 NLS_USES=			gettext
 PROTOBUF_CONFIGURE_WITH=	protobuf
 PROTOBUF_LIB_DEPENDS=		libprotobuf-c.so:devel/protobuf-c
 SFCGAL_CONFIGURE_WITH=		sfcgal=${LOCALBASE}/bin/sfcgal-config
 SFCGAL_LIB_DEPENDS=		libSFCGAL.so:databases/sfcgal
 TOPOLOGY_CONFIGURE_WITH=	topology
 WAGYU_CONFIGURE_WITH=		wagyu
 
 CONFLICTS_INSTALL=	postgis[0-9][0-9] # lib/postgresql/address_standardizer-3.so
 
 VER=		${PORTVERSION:R}
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION}${DISTVERSIONSUFFIX} \
 		VER=${VER}
 
 .include <bsd.port.pre.mk>
 
 .if ${CHOSEN_COMPILER_TYPE} == gcc
 post-patch:
 	${REINPLACE_CMD} -e '/^#pragma GCC diagnostic/d' \
 		${WRKSRC}/postgis/lwgeom_functions_basic.c \
 		${WRKSRC}/postgis/lwgeom_geos.c
 .endif
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/postgresql/*.so
 	${MKDIR} ${STAGEDIR}${DATADIR}/tiger_geocoder
 	(cd ${WRKSRC}/extras/tiger_geocoder && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/tiger_geocoder/ "! ( -name *\.orig -o -name *\.bak )" )
 	${MKDIR} ${STAGEDIR}${DATADIR}/utils
 	(cd ${WRKSRC}/utils/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/utils/ "! ( -name *\.orig -o -name *\.bak -o -name Makefile -o -name *\.in -o -name uninstall_script )" )
 
 .include <bsd.port.post.mk>
diff --git a/databases/postgis32/Makefile b/databases/postgis32/Makefile
index a8bb727f18f4..54446c703c30 100644
--- a/databases/postgis32/Makefile
+++ b/databases/postgis32/Makefile
@@ -1,86 +1,86 @@
 PORTNAME=	postgis
 DISTVERSION=	3.2.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	databases geography
 MASTER_SITES=	https://download.osgeo.org/postgis/source/
 PKGNAMESUFFIX=	32
 
 MAINTAINER=	lbartoletti@FreeBSD.org
 COMMENT=	Geographic objects support for PostgreSQL databases
 WWW=		https://postgis.net/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libproj.so:graphics/proj \
 		libgeos.so:graphics/geos \
 		libjson-c.so:devel/json-c \
 		libgdal.so:graphics/gdal
 
 USES=		alias compiler:c++11-lang cpe gmake gnome iconv:wchar_t libtool:keepla \
 		localbase perl5 pkgconfig pgsql:11+ shebangfix
 USE_GNOME=	libxml2
 USE_PERL5=	build
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	${ICONV_CONFIGURE_BASE} NUMERICFLAGS=${PORTVERSION}
 SHEBANG_FILES=	extensions/address_standardizer/*.pl raster/test/regress/*.pl \
 		raster/test/regress/loader/*.pl regress/run_test.pl \
 		utils/postgis_restore.pl.in utils/*.pl
 WANT_PGSQL=	server
 
 OPTIONS_DEFINE=	ADDRSTD JSON LOADERGUI NLS PROTOBUF RASTER SFCGAL TOPOLOGY WAGYU
 OPTIONS_DEFAULT=ADDRSTD JSON NLS PROTOBUF RASTER SFCGAL TOPOLOGY WAGYU
 OPTIONS_SUB=	yes
 
 ADDRSTD_DESC=	Enable address standardizer
 JSON_DESC=	Enable JSON support
 LOADERGUI_DESC=	Enable shp2pgsql-gui
 PROTOBUF_DESC=	Enable protocol buffers
 RASTER_DESC=	Enable raster support
 SFCGAL_DESC=	Enable sfcgal
 TOPOLOGY_DESC=	Topology support
 WAGYU_DESC=	Enable WAGYU support
 
 ADDRSTD_CONFIGURE_WITH=		address-standardizer
 ADDRSTD_LIB_DEPENDS=		libpcre.so:devel/pcre
 ADDRSTD_VARS=			WANT_PGSQL+=contrib
 JSON_CONFIGURE_WITH=		json
 JSON_LIB_DEPENDS=		libjson-c.so:devel/json-c
 LOADERGUI_CONFIGURE_WITH=	gui
 LOADERGUI_LIB_DEPENDS=		libprotobuf-c.so:devel/protobuf-c
 LOADERGUI_USE=			GNOME=gtk20
 NLS_CONFIGURE_WITH=		nls
 NLS_USES=			gettext
 PROTOBUF_CONFIGURE_WITH=	protobuf
 PROTOBUF_LIB_DEPENDS=		libprotobuf-c.so:devel/protobuf-c
 SFCGAL_CONFIGURE_WITH=		sfcgal=${LOCALBASE}/bin/sfcgal-config
 SFCGAL_LIB_DEPENDS=		libSFCGAL.so:databases/sfcgal
 TOPOLOGY_CONFIGURE_WITH=	topology
 WAGYU_CONFIGURE_WITH=		wagyu
 
 CONFLICTS_INSTALL=	postgis[0-9][0-9] # lib/postgresql/address_standardizer-3.so
 
 VER=		${PORTVERSION:R}
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION}${DISTVERSIONSUFFIX} \
 		VER=${VER}
 
 .include <bsd.port.pre.mk>
 
 .if ${CHOSEN_COMPILER_TYPE} == gcc
 post-patch:
 	${REINPLACE_CMD} -e '/^#pragma GCC diagnostic/d' \
 		${WRKSRC}/postgis/lwgeom_functions_basic.c \
 		${WRKSRC}/postgis/lwgeom_geos.c
 .endif
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/postgresql/*.so
 	${MKDIR} ${STAGEDIR}${DATADIR}/tiger_geocoder
 	(cd ${WRKSRC}/extras/tiger_geocoder && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/tiger_geocoder/ "! ( -name *\.orig -o -name *\.bak )" )
 	${MKDIR} ${STAGEDIR}${DATADIR}/utils
 	(cd ${WRKSRC}/utils/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/utils/ "! ( -name *\.orig -o -name *\.bak -o -name Makefile -o -name *\.in -o -name uninstall_script )" )
 
 .include <bsd.port.post.mk>
diff --git a/databases/postgis33/Makefile b/databases/postgis33/Makefile
index 9aa9cd6b4e26..6af1f76264d1 100644
--- a/databases/postgis33/Makefile
+++ b/databases/postgis33/Makefile
@@ -1,88 +1,88 @@
 PORTNAME=	postgis
 DISTVERSION=	3.3.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	databases geography
 MASTER_SITES=	https://download.osgeo.org/postgis/source/
 PKGNAMESUFFIX=	33
 
 MAINTAINER=	lbartoletti@FreeBSD.org
 COMMENT=	Geographic objects support for PostgreSQL databases
 WWW=		https://postgis.net/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libproj.so:graphics/proj \
 		libgeos.so:graphics/geos \
 		libjson-c.so:devel/json-c \
 		libgdal.so:graphics/gdal \
 		libpcre2-8.so:devel/pcre2
 
 USES=		alias compiler:c++11-lang cpe gmake gnome iconv:wchar_t libtool:keepla \
 		localbase perl5 pkgconfig pgsql:11+ shebangfix
 USE_GNOME=	libxml2
 USE_PERL5=	build
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	${ICONV_CONFIGURE_BASE} NUMERICFLAGS=${PORTVERSION}
 SHEBANG_FILES=	extensions/address_standardizer/*.pl regress/run_test.pl \
 		utils/postgis_restore.pl.in utils/*.pl
 WANT_PGSQL=	server
 
 OPTIONS_DEFINE=	ADDRSTD JSON LOADERGUI NLS PROTOBUF RASTER SFCGAL TOPOLOGY WAGYU
 OPTIONS_DEFAULT=ADDRSTD JSON NLS PROTOBUF RASTER SFCGAL TOPOLOGY WAGYU
 OPTIONS_SUB=	yes
 
 ADDRSTD_DESC=	Enable address standardizer
 JSON_DESC=	Enable JSON support
 NLS_DESC=	Enable international language support
 LOADERGUI_DESC=	Enable shp2pgsql-gui
 PROTOBUF_DESC=	Enable protocol buffers
 RASTER_DESC=	Enable raster support
 SFCGAL_DESC=	Enable sfcgal
 TOPOLOGY_DESC=	Topology support
 WAGYU_DESC=	Enable WAGYU support
 
 ADDRSTD_CONFIGURE_WITH=		address-standardizer
 ADDRSTD_LIB_DEPENDS=		libpcre.so:devel/pcre
 ADDRSTD_VARS=			WANT_PGSQL+=contrib
 JSON_CONFIGURE_WITH=		json
 JSON_LIB_DEPENDS=		libjson-c.so:devel/json-c
 LOADERGUI_CONFIGURE_WITH=	gui
 LOADERGUI_LIB_DEPENDS=		libprotobuf-c.so:devel/protobuf-c
 LOADERGUI_USE=			GNOME=gtk20 desktop-file-utils
 NLS_CONFIGURE_WITH=		nls
 NLS_USES=			gettext
 PROTOBUF_CONFIGURE_WITH=	protobuf
 PROTOBUF_LIB_DEPENDS=		libprotobuf-c.so:devel/protobuf-c
 SFCGAL_CONFIGURE_WITH=		sfcgal=${LOCALBASE}/bin/sfcgal-config
 SFCGAL_LIB_DEPENDS=		libSFCGAL.so:databases/sfcgal
 TOPOLOGY_CONFIGURE_WITH=	topology
 WAGYU_CONFIGURE_WITH=		wagyu
 RASTER_CONFIGURE_WITH=		raster
 
 CONFLICTS_INSTALL=	postgis[0-9][0-9] # lib/postgresql/address_standardizer-3.so
 
 VER=		${PORTVERSION:R}
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION}${DISTVERSIONSUFFIX} \
 		VER=${VER}
 
 .include <bsd.port.pre.mk>
 
 .if ${CHOSEN_COMPILER_TYPE} == gcc
 post-patch:
 	${REINPLACE_CMD} -e '/^#pragma GCC diagnostic/d' \
 		${WRKSRC}/postgis/lwgeom_functions_basic.c \
 		${WRKSRC}/postgis/lwgeom_geos.c
 .endif
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/pgs* ${STAGEDIR}${PREFIX}/bin/rast* ${STAGEDIR}${PREFIX}/bin/shp*
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/postgresql/*.so
 	${MKDIR} ${STAGEDIR}${DATADIR}/tiger_geocoder
 	(cd ${WRKSRC}/extras/tiger_geocoder && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/tiger_geocoder/ "! ( -name *\.orig -o -name *\.bak )" )
 	${MKDIR} ${STAGEDIR}${DATADIR}/utils
 	(cd ${WRKSRC}/utils/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/utils/ "! ( -name *\.orig -o -name *\.bak -o -name Makefile -o -name *\.in -o -name uninstall_script )" )
 
 .include <bsd.port.post.mk>
diff --git a/databases/postgresql-ogr_fdw/Makefile b/databases/postgresql-ogr_fdw/Makefile
index dba46d15a085..e11662c267a9 100644
--- a/databases/postgresql-ogr_fdw/Makefile
+++ b/databases/postgresql-ogr_fdw/Makefile
@@ -1,34 +1,35 @@
 PORTNAME=	ogr_fdw
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.1.3
+PORTREVISION=	1
 CATEGORIES=	databases
 PKGNAMEPREFIX=	postgresql${PGSQL_VER:S/.//}-
 
 MAINTAINER=	lbartoletti@FreeBSD.org
 COMMENT=	PostgreSQL foreign data wrapper for OGR
 WWW=		https://github.com/pramsey/pgsql-ogr-fdw
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 LIB_DEPENDS=	libgdal.so:graphics/gdal
 
 USES=		gmake pgsql:11+
 WANT_PGSQL=	server
 USE_GITHUB=	yes
 GH_ACCOUNT=	pramsey
 GH_PROJECT=	pgsql-ogr-fdw
 
 MAKE_ENV=	USE_PGXS=1
 
 PLIST_FILES=	bin/ogr_fdw_info \
 		lib/postgresql/ogr_fdw.so \
 		share/postgresql/extension/ogr_fdw--1.0--${PORTVERSION:R}.sql \
 		share/postgresql/extension/ogr_fdw--${PORTVERSION:R}.sql \
 		share/postgresql/extension/ogr_fdw.control
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ogr_fdw_info
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/postgresql/ogr_fdw.so
 
 .include <bsd.port.mk>
diff --git a/databases/py-apache-arrow/Makefile b/databases/py-apache-arrow/Makefile
index 2ea4bbfb161b..e321fb709423 100644
--- a/databases/py-apache-arrow/Makefile
+++ b/databases/py-apache-arrow/Makefile
@@ -1,34 +1,34 @@
 PORTNAME=	apache-arrow
 DISTVERSION=	8.0.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases python
 MASTER_SITES=	APACHE/arrow/arrow-${DISTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	${PORTNAME}-${DISTVERSION}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Columnar in-memory analytics layer for big data
 WWW=		https://arrow.apache.org/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/../LICENSE.txt
 
 BUILD_DEPENDS=	cmake:devel/cmake-core \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYNUMPY}
 LIB_DEPENDS=	libarrow.so:databases/arrow # assumes that arrow is built with PYTHON=ON (python support is built)
 
 USES=		compiler:c++11-lang pkgconfig python
 USE_PYTHON=	distutils cython concurrent # autoplist is broken, see https://issues.apache.org/jira/browse/ARROW-16820
 
 WRKSRC_SUBDIR=	python
 
 MAKE_ENV=	FREEBSD_PYTHON_SUFFIX=${PYTHON_SUFFIX}
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/pyarrow/*.cpython-${PYTHON_SUFFIX}.so
 
 .include <bsd.port.mk>
diff --git a/databases/py-caterva/Makefile b/databases/py-caterva/Makefile
index 4d086323abcb..32708192d7aa 100644
--- a/databases/py-caterva/Makefile
+++ b/databases/py-caterva/Makefile
@@ -1,42 +1,42 @@
 PORTNAME=	caterva
 PORTVERSION=	0.7.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Caterva for Python (multidimensional compressed data containers)
 WWW=		https://github.com/Blosc/python-caterva
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 DEPRECATED=	Use archivers/py-blosc2 instead. All the features of Python-Caterva have been included in the Python-Blosc2 NDArray object
 EXPIRATION_DATE=2023-06-30
 
 BUILD_DEPENDS=	caterva>=0.5.0_3:databases/caterva \
 		cmake:devel/cmake-core \
 		ninja:devel/ninja \
 		${PYTHON_PKGNAMEPREFIX}scikit-build>=0:devel/py-scikit-build@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 LIB_DEPENDS=	libblosc2.so:archivers/c-blosc2 \
 		libcaterva.so:databases/caterva
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}msgpack>=0:devel/py-msgpack@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ndindex>=0:math/py-ndindex@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpy>=1.20.3,1:math/py-numpy@${PY_FLAVOR}
 
 USES=		localbase:ldflags python:3.7+
 USE_PYTHON=	autoplist concurrent cython pep517
 
 post-patch:
 # Clean up bundled libraries
 	@${RM} -r ${WRKSRC}/caterva/caterva/
 
 post-install:
 	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' -exec ${STRIP_CMD} {} +
 	${PYTHON_CMD} -m compileall -d ${PYTHON_SITELIBDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}
 	${PYTHON_CMD} -O -m compileall -d ${PYTHON_SITELIBDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}
 
 .include <bsd.port.mk>
diff --git a/databases/py-duckdb/Makefile b/databases/py-duckdb/Makefile
index fe5f53149f8d..a82f9627146f 100644
--- a/databases/py-duckdb/Makefile
+++ b/databases/py-duckdb/Makefile
@@ -1,30 +1,31 @@
 PORTNAME=	duckdb
 DISTVERSION=	0.7.1
+PORTREVISION=	1
 CATEGORIES=	databases python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	In-process SQL OLAP database management system
 WWW=		https://duckdb.org/
 
 LICENSE=	MIT
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pybind11>=2.6.0:devel/py-pybind11@${PY_FLAVOR} \
 		${PYNUMPY}
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mypy>0:devel/py-mypy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}google-cloud-storage>0:www/py-google-cloud-storage@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	distutils autoplist pytest
 
 TEST_WRKSRC=	${WRKDIR} # tests fail when run from the build directory due to a name collision with duckdb directory
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} # 2 tests fail, see https://github.com/duckdb/duckdb/issues/5642
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/duckdb.cpython-${PYTHON_SUFFIX}.so
 
 .include <bsd.port.mk>
diff --git a/databases/py-fastparquet/Makefile b/databases/py-fastparquet/Makefile
index 6fd05dd8cbe2..18e9ddecb495 100644
--- a/databases/py-fastparquet/Makefile
+++ b/databases/py-fastparquet/Makefile
@@ -1,30 +1,31 @@
 PORTNAME=	fastparquet
 PORTVERSION=	2023.2.0
+PORTREVISION=	1
 CATEGORIES=	databases python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Python support for Parquet file format
 WWW=		https://github.com/dask/fastparquet
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=0,1:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.5.4:devel/py-setuptools_scm@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} \
 		thrift:devel/thrift
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cramjam>=2.3:archivers/py-cramjam@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}fsspec>=0:devel/py-fsspec@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpy>=1.20.3,1:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}packaging>=0:devel/py-packaging@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pandas>=1.5.0,1:math/py-pandas@${PY_FLAVOR}
 
 USES=		python:3.8+
 USE_PYTHON=	autoplist concurrent cython distutils
 
 post-install:
 	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' -exec ${STRIP_CMD} {} +
 
 .include <bsd.port.mk>
diff --git a/databases/py-tarantool/Makefile b/databases/py-tarantool/Makefile
index 24070a5a0605..47002ae8255b 100644
--- a/databases/py-tarantool/Makefile
+++ b/databases/py-tarantool/Makefile
@@ -1,23 +1,24 @@
 PORTNAME=	tarantool
 PORTVERSION=	0.12.1
+PORTREVISION=	1
 CATEGORIES=	databases python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Client library for Tarantool Database
 WWW=		https://github.com/tarantool/tarantool-python
 
 LICENSE=	BSD3CLAUSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>=6.4.2:devel/py-setuptools_scm@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}msgpack>=0:devel/py-msgpack@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pandas>=0,1:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytz>=0,1:devel/py-pytz@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/databases/py-tiledb/Makefile b/databases/py-tiledb/Makefile
index 9bcee47536a5..744ce9888ed2 100644
--- a/databases/py-tiledb/Makefile
+++ b/databases/py-tiledb/Makefile
@@ -1,34 +1,35 @@
 PORTNAME=	tiledb
 PORTVERSION=	0.21.2
+PORTREVISION=	1
 CATEGORIES=	databases python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Python interface to the TileDB array storage manager
 WWW=		https://github.com/TileDB-Inc/TileDB-Py
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 NOT_FOR_ARCHS=	i386
 NOT_FOR_ARCHS_REASON=	is currently 64-bit only
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cython>=0.27:lang/cython@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpy>=1.23.2,1:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pybind11>=2.6.2:devel/py-pybind11@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.5.4:devel/py-setuptools_scm@${PY_FLAVOR} \
 		tiledb>=2.15.1:databases/tiledb
 LIB_DEPENDS=	libtiledb.so:databases/tiledb
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=1.23.2,1:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}packaging>=0:devel/py-packaging@${PY_FLAVOR}
 
 USES=		compiler:c++17-lang localbase python:3.7+
 USE_PYTHON=	autoplist concurrent cython distutils
 
 MAKE_ENV=	TILEDB_PATH=${LOCALBASE}
 
 post-install:
 	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' -exec ${STRIP_CMD} {} +
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-red-arrow-dataset/Makefile b/databases/rubygem-red-arrow-dataset/Makefile
index f1bbeca1480c..fe035a39d614 100644
--- a/databases/rubygem-red-arrow-dataset/Makefile
+++ b/databases/rubygem-red-arrow-dataset/Makefile
@@ -1,21 +1,22 @@
 PORTNAME=	red-arrow-dataset
 PORTVERSION=	8.0.0
+PORTREVISION=	1
 CATEGORIES=	databases rubygems
 MASTER_SITES=	RG
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Ruby bindings of Apache Arrow Dataset
 WWW=		https://arrow.apache.org/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BUILD_DEPENDS=	rubygem-rake>=0:devel/rubygem-rake
 LIB_DEPENDS=	libarrow-glib.so:databases/arrow-glib
 RUN_DEPENDS=	rubygem-red-arrow>=${PORTVERSION}<${PORTVERSION}_99:databases/rubygem-red-arrow
 
 USES=		gem
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-red-arrow/Makefile b/databases/rubygem-red-arrow/Makefile
index 895b60cc9e9c..551d77259687 100644
--- a/databases/rubygem-red-arrow/Makefile
+++ b/databases/rubygem-red-arrow/Makefile
@@ -1,24 +1,25 @@
 PORTNAME=	red-arrow
 PORTVERSION=	8.0.0
+PORTREVISION=	1
 CATEGORIES=	databases rubygems
 MASTER_SITES=	RG
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Ruby bindings of Apache Arrow
 WWW=		https://arrow.apache.org/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 LIB_DEPENDS=	libarrow-glib.so:databases/arrow-glib
 RUN_DEPENDS=	rubygem-bigdecimal>=2.0.3:math/rubygem-bigdecimal \
 		rubygem-extpp>=0.0.7:devel/rubygem-extpp \
 		rubygem-gio2>=3.5.0:devel/rubygem-gio2 \
 		rubygem-native-package-installer>=0:devel/rubygem-native-package-installer \
 		rubygem-pkg-config>=0:devel/rubygem-pkg-config \
 
 USES=		gem localbase
 
 CFLAGS+=	-I${LOCALBASE}/include
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-red-gandiva/Makefile b/databases/rubygem-red-gandiva/Makefile
index 6879fc7f30a3..04db7602bc2b 100644
--- a/databases/rubygem-red-gandiva/Makefile
+++ b/databases/rubygem-red-gandiva/Makefile
@@ -1,21 +1,22 @@
 PORTNAME=	red-gandiva
 PORTVERSION=	8.0.0
+PORTREVISION=	1
 CATEGORIES=	databases rubygems
 MASTER_SITES=	RG
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Ruby bindings of Gandiva
 WWW=		https://arrow.apache.org/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BUILD_DEPENDS=	rubygem-rake>=0:devel/rubygem-rake
 LIB_DEPENDS=	libarrow-glib.so:databases/arrow-glib
 RUN_DEPENDS=	rubygem-red-arrow>=${PORTVERSION}<${PORTVERSION}_99:databases/rubygem-red-arrow
 
 USES=		gem
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-red-parquet/Makefile b/databases/rubygem-red-parquet/Makefile
index e9a2535614ac..bc7588f8bfc5 100644
--- a/databases/rubygem-red-parquet/Makefile
+++ b/databases/rubygem-red-parquet/Makefile
@@ -1,21 +1,22 @@
 PORTNAME=	red-parquet
 PORTVERSION=	8.0.0
+PORTREVISION=	1
 CATEGORIES=	databases rubygems
 MASTER_SITES=	RG
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Ruby bindings of Apache Parquet
 WWW=		https://arrow.apache.org/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BUILD_DEPENDS=	rubygem-rake>=0:devel/rubygem-rake
 LIB_DEPENDS=	libarrow-glib.so:databases/arrow-glib
 RUN_DEPENDS=	rubygem-red-arrow>=${PORTVERSION}<${PORTVERSION}_99:databases/rubygem-red-arrow
 
 USES=		gem
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-red-plasma/Makefile b/databases/rubygem-red-plasma/Makefile
index a7a291676525..31225d4be968 100644
--- a/databases/rubygem-red-plasma/Makefile
+++ b/databases/rubygem-red-plasma/Makefile
@@ -1,21 +1,22 @@
 PORTNAME=	red-plasma
 PORTVERSION=	8.0.0
+PORTREVISION=	1
 CATEGORIES=	databases rubygems
 MASTER_SITES=	RG
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Ruby bindings of Plasma
 WWW=		https://arrow.apache.org/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BUILD_DEPENDS=	rubygem-rake>=0:devel/rubygem-rake
 LIB_DEPENDS=	libarrow-glib.so:databases/arrow-glib
 RUN_DEPENDS=	rubygem-red-arrow>=${PORTVERSION}<${PORTVERSION}_99:databases/rubygem-red-arrow
 
 USES=		gem
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/deskutils/growl-for-linux/Makefile b/deskutils/growl-for-linux/Makefile
index 5297f3eb4644..852ba4e54780 100644
--- a/deskutils/growl-for-linux/Makefile
+++ b/deskutils/growl-for-linux/Makefile
@@ -1,50 +1,50 @@
 PORTNAME=	growl-for-linux
 PORTVERSION=	0.8.5
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	deskutils
 
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	Notification system compatible with Growl
 WWW=		http://mattn.github.com/growl-for-linux/
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	desktop-file-install:devel/desktop-file-utils
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libdbus-1.so:devel/dbus \
 		libdbus-glib-1.so:devel/dbus-glib \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2
 
 CONFIGURE_ARGS=	OPENSSL_CFLAGS="-I${OPENSSLINC}" OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto"
 
 GH_ACCOUNT=	mattn
 GNU_CONFIGURE=	yes
 
 INSTALL_TARGET=	install-strip
 
 LIBNOTIFY_DESC=		Use notify-osd for libnotify display plugin
 LIBNOTIFY_LIB_DEPENDS=	libnotify.so:devel/libnotify
 LIBNOTIFY_RUN_DEPENDS=	notify-osd>=0.9.29_3:deskutils/notify-osd
 
 OPTIONS_DEFAULT=LIBNOTIFY
 OPTIONS_DEFINE=	LIBNOTIFY
 
 PLIST_SUB=	DESKTOPDIR=${DESKTOPDIR:S,^${PREFIX}/,,}
 
 USES=		autoreconf compiler:nestedfct gnome libtool pkgconfig sqlite:3 \
 		ssl
 USE_GITHUB=	yes
 USE_GNOME=	cairo gdkpixbuf2 gtk20 libxml2
 USE_LDCONFIG=	${PREFIX}/lib/${PORTNAME}/display \
 		${PREFIX}/lib/${PORTNAME}/subscribe
 
 post-patch:
 	@${REINPLACE_CMD} '/^gol_LDADD =/s/$$/ -lgmodule-2.0/' \
 		${WRKSRC}/Makefile.am
 
 post-install:
 	${RM} ${STAGEDIR}${PREFIX}/lib/libgolplug.a
 
 .include <bsd.port.mk>
diff --git a/deskutils/gxneur/Makefile b/deskutils/gxneur/Makefile
index e06e0eabee75..ecd9dc33d3c0 100644
--- a/deskutils/gxneur/Makefile
+++ b/deskutils/gxneur/Makefile
@@ -1,32 +1,32 @@
 PORTNAME=	gxneur
 PORTVERSION=	0.20.0
-PORTREVISION=	3
+PORTREVISION=	4
 DISTVERSIONSUFFIX=.orig
 CATEGORIES=	deskutils
 MASTER_SITES=	https://launchpad.net/~andrew-crew-kuznetsov/+archive/xneur-stable/+files/
 DISTNAME=	${PORTNAME}_${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
 
 MAINTAINER=	mizhka@gmail.com
 COMMENT=	GTK frontend for XNeur keyboard layout switcher
 WWW=		https://launchpad.net/xneur
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	xneur:deskutils/xneur \
 		intltool-update:textproc/intltool
 RUN_DEPENDS=	xneur:deskutils/xneur
 
 USES=		compiler:c++11-lang pkgconfig gmake gnome
 USE_GNOME=	gtk20 libglade2
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-gconf
 
 OPTIONS_DEFINE=	NLS
 
 OPTIONS_SUB=	yes
 NLS_USES=	gettext
 NLS_CONFIGURE_OFF=	--without-nls
 
 .include <bsd.port.mk>
diff --git a/deskutils/howm/Makefile b/deskutils/howm/Makefile
index dc438d1404fc..dacef8acbf29 100644
--- a/deskutils/howm/Makefile
+++ b/deskutils/howm/Makefile
@@ -1,45 +1,45 @@
 PORTNAME=	howm
 PORTVERSION=	1.4.8
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	deskutils
 MASTER_SITES=	http://howm.sourceforge.jp/a/
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Write fragmentarily and read collectively
 WWW=		http://howm.sourceforge.jp/index.html
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 .if ${FLAVOR:U} == devel_full || ${FLAVOR:U} == devel_nox
 BROKEN=		Debugger entered--Lisp error: (wrong-type-argument stringp nil)
 .endif
 
 USES=		emacs
 
 GNU_CONFIGURE=	yes
 
 CONFLICTS_INSTALL=	howm howm-emacs_* # share/doc/howm/README-j.html
 
 PORTDOCS=	*.html *.png
 PORTEXAMPLES=	en/0000-00-00-000000.txt ja/0000-00-00-000000.txt
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 NO_ARCH=	yes
 
 do-install:
 	cd ${WRKSRC} && ${INSTALL_DATA} *.el *.elc \
 		${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC}/doc && ${INSTALL_DATA} *.html *.png ${STAGEDIR}${DOCSDIR})
 
 do-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/en ${STAGEDIR}${EXAMPLESDIR}/ja
 	(cd ${WRKSRC} && ${INSTALL_DATA} ja/0* ${STAGEDIR}${EXAMPLESDIR}/ja)
 	(cd ${WRKSRC} && ${INSTALL_DATA} en/0* ${STAGEDIR}${EXAMPLESDIR}/en)
 
 .include <bsd.port.mk>
diff --git a/deskutils/nextcloudclient/Makefile b/deskutils/nextcloudclient/Makefile
index cba077487c8a..25385af08acf 100644
--- a/deskutils/nextcloudclient/Makefile
+++ b/deskutils/nextcloudclient/Makefile
@@ -1,73 +1,74 @@
 PORTNAME=	nextcloudclient
 PORTVERSION=	3.8.1
+PORTREVISION=	1
 #PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	deskutils
 
 MAINTAINER=	mr@FreeBSD.org
 COMMENT=	NextCloud Desktop Syncing Client
 WWW=		https://github.com/nextcloud/desktop
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	inkscape:graphics/inkscape
 LIB_DEPENDS=	libinotify.so:devel/libinotify \
 		libqt5keychain.so:security/qtkeychain@qt5
 
 USES=		cmake:noninja compiler:c++14-lang desktop-file-utils gmake \
 		gnome iconv kde:5 localbase:ldflags pkgconfig qt:5 shared-mime-info \
 		sqlite ssl
 USE_KDE=	archive
 USE_QT=		buildtools:build concurrent core dbus declarative graphicaleffects \
 		gui linguist:build location network printsupport qmake:build \
 		quickcontrols quickcontrols2 sql svg testlib webchannel websockets \
 		widgets xml
 CMAKE_ARGS=	-DBUILD_UPDATER:BOOL=OFF \
 		-DCMAKE_INSTALL_MANDIR:STRING=man \
 		-DWITH_STACK_PROTECTOR:BOOL=OFF
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	nextcloud
 GH_PROJECT=	desktop
 
 #OPTIONS_DEFINE=		DEBUG DOCS
 OPTIONS_DEFINE=		DEBUG WEBENGINE # DOCS doesn't build currently
 OPTIONS_DEFAULT_amd64=		WEBENGINE
 OPTIONS_DEFAULT_i386=		WEBENGINE
 OPTIONS_DEFAULT_aarch64=	WEBENGINE
 
 WEBENGINE_DESC=		Use Webengine to provide web login flow
 
 #DOCS_BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx \
 #			doxygen:devel/doxygen
 #DOCS_USES=		tex
 #DOCS_USE=		TEX=dvipsk:build,latex:build
 #DOCS_CMAKE_ON=		-DWITH_DOC:BOOL=ON
 
 WEBENGINE_VARS=		USE_QT+=webengine
 
 PLIST_SUB=	VERSION=${PORTVERSION}
 
 .include <bsd.port.pre.mk>
 
 .ifdef WITH_DEBUG
 CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE:STRING=Debug
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|.lst |.lst.sample |' ${WRKSRC}/CMakeLists.txt
 
 post-patch-WEBENGINE-off:
 	@${REINPLACE_CMD} -e '/add_compile_definitions(WITH_WEBENGINE=1)/d' \
 		${WRKSRC}/src/CMakeLists.txt
 
 pre-configure:
 	@(cd ${WRKSRC} && ${CP} -f sync-exclude.lst sync-exclude.lst.sample)
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/sync-exclude.lst ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.post.mk>
diff --git a/deskutils/sliderule/Makefile b/deskutils/sliderule/Makefile
index 41ffde58edbe..df17fb771d37 100644
--- a/deskutils/sliderule/Makefile
+++ b/deskutils/sliderule/Makefile
@@ -1,16 +1,16 @@
 PORTNAME=	sliderule
 PORTVERSION=	1.0
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	deskutils
 MASTER_SITES=	LOCAL/joerg
 DISTNAME=	${PORTNAME}
 
 MAINTAINER=	joerg@FreeBSD.org
 COMMENT=	The part of X11R3's xcalc featuring a slide rule
 
 USES=		imake xorg
 USE_XORG=	x11 xext
 USE_GCC=	yes
 PLIST_FILES=	bin/sliderule man/man1/sliderule.1.gz
 
 .include <bsd.port.mk>
diff --git a/deskutils/xneur/Makefile b/deskutils/xneur/Makefile
index dcad601a5d70..687b8412b8b2 100644
--- a/deskutils/xneur/Makefile
+++ b/deskutils/xneur/Makefile
@@ -1,59 +1,59 @@
 PORTNAME=	xneur
 PORTVERSION=	0.20.0
-PORTREVISION=	2
+PORTREVISION=	3
 DISTVERSIONSUFFIX=.orig
 CATEGORIES=	deskutils
 MASTER_SITES=	https://launchpad.net/~andrew-crew-kuznetsov/+archive/xneur-stable/+files/
 DISTNAME=	${PORTNAME}_${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
 
 MAINTAINER=	mizhka@gmail.com
 COMMENT=	Auto keyboard switcher
 WWW=		https://launchpad.net/xneur
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	intltool-update:textproc/intltool
 LIB_DEPENDS=	libnotify.so:devel/libnotify \
 		libpcre.so:devel/pcre
 
 USES=		compiler:nestedfct gnome iconv libtool localbase pathfix \
 		pkgconfig xorg
 USE_GNOME=	gtk20
 
 USE_XORG=	xtst
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-static --libdir=${PREFIX}/lib/xneur --with-gtk=gtk2
 
 USE_LDCONFIG=	${PREFIX}/lib/xneur ${PREFIX}/lib/xneur/xneur
 INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE=	ASPELL XOSD NLS X11 SOUND
 OPTIONS_DEFAULT=	GSTREAMER ASPELL SOUND
 XOSD_DESC=	Xosd support
 
 OPTIONS_SUB=	yes
 
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
 
 X11_USES=		xorg
 X11_USE=		XORG=x11
 X11_CONFIGURE_WITH=	x
 
 ASPELL_LIB_DEPENDS=	libaspell.so:textproc/aspell
 ASPELL_CONFIGURE_ON=	--with-spell=aspell
 ASPELL_CONFIGURE_OFF=	--with-spell=no --without-aspell
 
 XOSD_LIB_DEPENDS=	libxosd.so:misc/xosd
 XOSD_CONFIGURE_WITH=	xosd
 SOUND_USES=	openal:al,alut
 SOUND_CONFIGURE_ON=	--with-sound=openal
 SOUND_CONFIGURE_OFF=	--with-sound=no
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,-Werror,,g; s,-ldl,,g' ${WRKSRC}/configure
 	@${MV} ${WRKSRC}/etc/xneurrc ${WRKSRC}/etc/xneurrc.sample
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-BH/Makefile b/devel/R-cran-BH/Makefile
index b972aaef008d..da6133918d37 100644
--- a/devel/R-cran-BH/Makefile
+++ b/devel/R-cran-BH/Makefile
@@ -1,14 +1,15 @@
 PORTNAME=	BH
 DISTVERSION=	1.78.0-0
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Boost C++ Header Files
 WWW=		https://cran.r-project.org/web/packages/BH/
 
 LICENSE=	BSL
 
 USES=	cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-Defaults/Makefile b/devel/R-cran-Defaults/Makefile
index 47a957b0b29f..161f13544662 100644
--- a/devel/R-cran-Defaults/Makefile
+++ b/devel/R-cran-Defaults/Makefile
@@ -1,16 +1,16 @@
 PORTNAME=	Defaults
 DISTVERSION=	1.1-1
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Create Global Function Defaults
 WWW=		https://cran.r-project.org/web/packages/Defaults/
 
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
 USES=	cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-Hmisc/Makefile b/devel/R-cran-Hmisc/Makefile
index 01c6b254ebb4..3ae560dbbe27 100644
--- a/devel/R-cran-Hmisc/Makefile
+++ b/devel/R-cran-Hmisc/Makefile
@@ -1,26 +1,26 @@
 PORTNAME=	Hmisc
 DISTVERSION=	4.7-0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	skreuzer@FreeBSD.org
 COMMENT=	Harrell Miscellaneous functions useful for data analysis
 WWW=		https://cran.r-project.org/web/packages/Hmisc/
 
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
 CRAN_DEPENDS=	R-cran-latticeExtra>0:graphics/R-cran-latticeExtra \
 		R-cran-gridExtra>0:graphics/R-cran-gridExtra \
 		R-cran-viridis>0:graphics/R-cran-viridis \
 		R-cran-htmltools>0:textproc/R-cran-htmltools \
 		R-cran-data.table>0:devel/R-cran-data.table \
 		R-cran-htmlTable>0:textproc/R-cran-htmlTable \
 		R-cran-Formula>0:math/R-cran-Formula
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-ModelMetrics/Makefile b/devel/R-cran-ModelMetrics/Makefile
index 57361abd2e3c..4f2d5cc821a0 100644
--- a/devel/R-cran-ModelMetrics/Makefile
+++ b/devel/R-cran-ModelMetrics/Makefile
@@ -1,20 +1,20 @@
 PORTNAME=	ModelMetrics
 PORTVERSION=	1.2.2.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Rapid Calculation of Model Metrics
 WWW=		https://cran.r-project.org/web/packages/ModelMetrics/
 
 LICENSE=	GPLv2+
 
 CRAN_DEPENDS=	R-cran-Rcpp>0:devel/R-cran-Rcpp \
 		R-cran-data.table>0:devel/R-cran-data.table
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-R6/Makefile b/devel/R-cran-R6/Makefile
index 2509ed7f1670..31168cc8ddf8 100644
--- a/devel/R-cran-R6/Makefile
+++ b/devel/R-cran-R6/Makefile
@@ -1,14 +1,15 @@
 PORTNAME=	R6
 PORTVERSION=	2.5.1
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Classes with reference semantics
 WWW=		https://cran.r-project.org/web/packages/R6/
 
 LICENSE=	MIT
 
 USES=	cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-RUnit/Makefile b/devel/R-cran-RUnit/Makefile
index 2724c8880f69..32b8e64b3e09 100644
--- a/devel/R-cran-RUnit/Makefile
+++ b/devel/R-cran-RUnit/Makefile
@@ -1,15 +1,15 @@
 PORTNAME=	RUnit
 PORTVERSION=	0.4.28
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	skreuzer@FreeBSD.org
 COMMENT=	R functions implementing a Unit Testing framework
 WWW=		https://sourceforge.net/projects/runit/
 
 LICENSE=	GPLv2
 
 USES=	cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-Rcpp/Makefile b/devel/R-cran-Rcpp/Makefile
index 3f5e74242369..5e32bd20a7ce 100644
--- a/devel/R-cran-Rcpp/Makefile
+++ b/devel/R-cran-Rcpp/Makefile
@@ -1,20 +1,21 @@
 PORTNAME=	Rcpp
 PORTVERSION=	1.0.10
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Seamless R and C++ Integration
 WWW=		https://cran.r-project.org/web/packages/Rcpp/
 
 LICENSE=	GPLv2+
 
 USES=		cran:auto-plist,compiles shebangfix
 SHEBANG_FILES=	inst/examples/*/*.sh \
 		inst/examples/*/*.r \
 		inst/examples/*/*.R
 SHEBANG_LANG=	r
 r_OLD_CMD=	/usr/bin/r
 r_CMD=		${LOCALBASE}/bin/R
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-RcppProgress/Makefile b/devel/R-cran-RcppProgress/Makefile
index b702dae4a923..aead7a5d10ad 100644
--- a/devel/R-cran-RcppProgress/Makefile
+++ b/devel/R-cran-RcppProgress/Makefile
@@ -1,15 +1,15 @@
 PORTNAME=	RcppProgress
 PORTVERSION=	0.4.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Interruptible Progress Bar with OpenMP Support for C++ in R Packages
 WWW=		https://cran.r-project.org/web/packages/RcppProgress/
 
 LICENSE=	GPLv3
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-Rdpack/Makefile b/devel/R-cran-Rdpack/Makefile
index 1ddb1606d7a7..2c8d4649bc3a 100644
--- a/devel/R-cran-Rdpack/Makefile
+++ b/devel/R-cran-Rdpack/Makefile
@@ -1,18 +1,19 @@
 PORTNAME=	Rdpack
 DISTVERSION=	2.4
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Update and Manipulate Rd Documentation Objects
 WWW=		https://cran.r-project.org/web/packages/Rdpack/
 
 LICENSE=	GPLv2+
 
 CRAN_DEPENDS=	R-cran-rbibutils>=1.3:textproc/R-cran-rbibutils
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-abind/Makefile b/devel/R-cran-abind/Makefile
index 835392ba3245..8ec8f0d013cc 100644
--- a/devel/R-cran-abind/Makefile
+++ b/devel/R-cran-abind/Makefile
@@ -1,15 +1,15 @@
 PORTNAME=	abind
 DISTVERSION=	1.4-5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Combine Multidimensional Arrays
 WWW=		https://cran.r-project.org/web/packages/abind/
 
 LICENSE=	LGPL20+
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-bindr/Makefile b/devel/R-cran-bindr/Makefile
index 60ac98dc5461..42ca1700d86f 100644
--- a/devel/R-cran-bindr/Makefile
+++ b/devel/R-cran-bindr/Makefile
@@ -1,15 +1,15 @@
 PORTNAME=	bindr
 PORTVERSION=	0.1.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Parametrized Active Bindings
 WWW=		https://cran.r-project.org/web/packages/bindr/
 
 LICENSE=	GPLv2+
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-bindrcpp/Makefile b/devel/R-cran-bindrcpp/Makefile
index 7f0f6cad7534..68e63b2d7a53 100644
--- a/devel/R-cran-bindrcpp/Makefile
+++ b/devel/R-cran-bindrcpp/Makefile
@@ -1,20 +1,20 @@
 PORTNAME=	bindrcpp
 DISTVERSION=	0.2.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Rcpp Interface to Active Bindings
 WWW=		https://github.com/krlmlr/bindrcpp
 
 BUILD_DEPENDS=	R-cran-Rcpp>=0.11.0:devel/R-cran-Rcpp \
 		R-cran-bindr>=0:devel/R-cran-bindr \
 		R-cran-plogr>=0:devel/R-cran-plogr
 RUN_DEPENDS=	R-cran-Rcpp>=0.11.0:devel/R-cran-Rcpp \
 		R-cran-bindr>=0:devel/R-cran-bindr \
 		R-cran-plogr>=0:devel/R-cran-plogr
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-bit/Makefile b/devel/R-cran-bit/Makefile
index 3f4080c3e656..c5fd7c6475b6 100644
--- a/devel/R-cran-bit/Makefile
+++ b/devel/R-cran-bit/Makefile
@@ -1,14 +1,15 @@
 PORTNAME=	bit
 DISTVERSION=	4.0.4
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Class for vectors of 1-bit booleans
 WWW=		https://cran.r-project.org/web/packages/bit/
 
 LICENSE=	GPLv2+
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-bit64/Makefile b/devel/R-cran-bit64/Makefile
index b46e09c062a6..4c41fbfe5ca0 100644
--- a/devel/R-cran-bit64/Makefile
+++ b/devel/R-cran-bit64/Makefile
@@ -1,18 +1,19 @@
 PORTNAME=	bit64
 DISTVERSION=	4.0.5
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	S3 Class for Vectors of 64bit Integers
 WWW=		https://cran.r-project.org/web/packages/bit64/
 
 LICENSE=	GPLv2+
 
 CRAN_DEPENDS=	R-cran-bit>=4.0.0:devel/R-cran-bit
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=	cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-bitops/Makefile b/devel/R-cran-bitops/Makefile
index 0f02e5d1d75c..99644ee9707e 100644
--- a/devel/R-cran-bitops/Makefile
+++ b/devel/R-cran-bitops/Makefile
@@ -1,14 +1,15 @@
 PORTNAME=	bitops
 DISTVERSION=	1.0-7
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Functions for Bitwise operations
 WWW=		https://cran.r-project.org/web/packages/bitops/
 
 LICENSE=	GPLv2+
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-blob/Makefile b/devel/R-cran-blob/Makefile
index 39909a7c7806..7e71766a0597 100644
--- a/devel/R-cran-blob/Makefile
+++ b/devel/R-cran-blob/Makefile
@@ -1,22 +1,23 @@
 PORTNAME=	blob
 DISTVERSION=	1.2.3
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	ygy@FreeBSD.org
 COMMENT=	A Simple S3 Class for Representing Vectors of Binary Data ('BLOBS')
 WWW=		https://blob.tidyverse.org
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	R-cran-rlang>0:devel/R-cran-rlang \
 		R-cran-vctrs>=0.2.1:devel/R-cran-vctrs
 TEST_DEPENDS=	R-cran-covr>0:devel/R-cran-covr \
 		R-cran-crayon>0:devel/R-cran-crayon \
 		R-cran-pillar>=1.2.1:devel/R-cran-pillar \
 		R-cran-testthat>0:devel/R-cran-testthat
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-brio/Makefile b/devel/R-cran-brio/Makefile
index 8524ac576f5b..c47f9bd17e2d 100644
--- a/devel/R-cran-brio/Makefile
+++ b/devel/R-cran-brio/Makefile
@@ -1,18 +1,19 @@
 PORTNAME=	brio
 DISTVERSION=	1.1.3
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	ygy@FreeBSD.org
 COMMENT=	Basic R Input Output
 WWW=		https://brio.r-lib.org
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 TEST_DEPENDS=	R-cran-covr>0:devel/R-cran-covr \
 		R-cran-testthat>=2.1.0:devel/R-cran-testthat
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-broom/Makefile b/devel/R-cran-broom/Makefile
index 2f2b1a933909..4c66b6923146 100644
--- a/devel/R-cran-broom/Makefile
+++ b/devel/R-cran-broom/Makefile
@@ -1,28 +1,29 @@
 PORTNAME=	broom
 DISTVERSION=	1.0.1
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Convert Statistical Analysis Objects into Tidy Data Frames
 WWW=		https://cran.r-project.org/web/packages/broom/
 
 LICENSE=	MIT
 
 CRAN_DEPENDS=	R-cran-backports>0:math/R-cran-backports \
 		R-cran-dplyr>=1.0.0:math/R-cran-dplyr \
 		R-cran-ellipsis>0:devel/R-cran-ellipsis \
 		R-cran-generics>=0.0.2:devel/R-cran-generics \
 		R-cran-glue>0:devel/R-cran-glue \
 		R-cran-purrr>0:devel/R-cran-purrr \
 		R-cran-rlang>0:devel/R-cran-rlang \
 		R-cran-stringr>0:textproc/R-cran-stringr \
 		R-cran-tibble>=3.0.0:devel/R-cran-tibble \
 		R-cran-tidyr>=1.0.0:devel/R-cran-tidyr \
 		R-cran-ggplot2>0:graphics/R-cran-ggplot2
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-caTools/Makefile b/devel/R-cran-caTools/Makefile
index d76080ddde25..5e3300ee2bbf 100644
--- a/devel/R-cran-caTools/Makefile
+++ b/devel/R-cran-caTools/Makefile
@@ -1,18 +1,19 @@
 PORTNAME=	caTools
 PORTVERSION=	1.18.2
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Tools: moving window statistics, GIF, Base64, ROC AUC, etc
 WWW=		https://cran.r-project.org/web/packages/caTools/
 
 LICENSE=	GPLv3
 
 CRAN_DEPENDS=	R-cran-bitops>0:devel/R-cran-bitops
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-callr/Makefile b/devel/R-cran-callr/Makefile
index 5fefa6c7624c..ebc4c6d21fed 100644
--- a/devel/R-cran-callr/Makefile
+++ b/devel/R-cran-callr/Makefile
@@ -1,26 +1,27 @@
 PORTNAME=	callr
 DISTVERSION=	3.7.3
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	ygy@FreeBSD.org
 COMMENT=	Call R from R
 WWW=		https://callr.r-lib.org
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	R-cran-R6>0:devel/R-cran-R6 \
 		R-cran-processx>=3.6.1:sysutils/R-cran-processx
 TEST_DEPENDS=	R-cran-cli>=1.1.0:devel/R-cran-cli \
 		R-cran-covr>0:devel/R-cran-covr \
 		R-cran-mockery>0:devel/R-cran-mockery \
 		R-cran-rprojroot>0:devel/R-cran-rprojroot \
 		R-cran-testthat>=3.0.0:devel/R-cran-testthat \
 		R-cran-withr>=2.3.0:devel/R-cran-withr \
 		R-cran-ps>0:sysutils/R-cran-ps \
 		R-cran-spelling>0:textproc/R-cran-spelling
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-caret/Makefile b/devel/R-cran-caret/Makefile
index 049e94d4547a..b9e915877f57 100644
--- a/devel/R-cran-caret/Makefile
+++ b/devel/R-cran-caret/Makefile
@@ -1,26 +1,27 @@
 PORTNAME=	caret
 DISTVERSION=	6.0-93
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Classification and Regression Training
 WWW=		https://topepo.github.io/caret/
 
 LICENSE=	GPLv2+
 
 CRAN_DEPENDS=	R-cran-ggplot2>0:graphics/R-cran-ggplot2 \
 		R-cran-e1071>0:science/R-cran-e1071 \
 		R-cran-foreach>0:devel/R-cran-foreach \
 		R-cran-ModelMetrics>=1.2.2.2:devel/R-cran-ModelMetrics \
 		R-cran-plyr>0:devel/R-cran-plyr \
 		R-cran-pROC>0:graphics/R-cran-pROC \
 		R-cran-recipes>=0.1.10:math/R-cran-recipes \
 		R-cran-reshape2>0:devel/R-cran-reshape2 \
 		R-cran-withr>=2.0.0:devel/R-cran-withr
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=	cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-checkmate/Makefile b/devel/R-cran-checkmate/Makefile
index e352609a635e..17a0e7e5adc0 100644
--- a/devel/R-cran-checkmate/Makefile
+++ b/devel/R-cran-checkmate/Makefile
@@ -1,18 +1,19 @@
 PORTNAME=	checkmate
 DISTVERSION=	2.1.0
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	skreuzer@FreeBSD.org
 COMMENT=	Fast and versatile argument checks
 WWW=		https://cran.r-project.org/web/packages/checkmate/
 
 LICENSE=	BSD3CLAUSE
 
 CRAN_DEPENDS=	R-cran-backports>0:math/R-cran-backports
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-chron/Makefile b/devel/R-cran-chron/Makefile
index f51e76a6ab2e..6714f2dbee0a 100644
--- a/devel/R-cran-chron/Makefile
+++ b/devel/R-cran-chron/Makefile
@@ -1,14 +1,15 @@
 PORTNAME=	chron
 DISTVERSION=	2.3-57
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	skreuzer@FreeBSD.org
 COMMENT=	R package for creating objects which can handle dates and times
 WWW=		https://cran.r-project.org/web/packages/chron/
 
 LICENSE=	GPLv2
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-classInt/Makefile b/devel/R-cran-classInt/Makefile
index 920ba29bb6fa..b94e53b3f015 100644
--- a/devel/R-cran-classInt/Makefile
+++ b/devel/R-cran-classInt/Makefile
@@ -1,18 +1,19 @@
 PORTNAME=	classInt
 DISTVERSION=	0.4-7
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Choose Univariate Class Intervals
 WWW=		https://cran.r-project.org/web/packages/classInt/
 
 LICENSE=	GPLv2+
 
 CRAN_DEPENDS=	R-cran-e1071>0:science/R-cran-e1071
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-cli/Makefile b/devel/R-cran-cli/Makefile
index 24d6df6aa7ba..0649d3f17573 100644
--- a/devel/R-cran-cli/Makefile
+++ b/devel/R-cran-cli/Makefile
@@ -1,17 +1,18 @@
 PORTNAME=	cli
 PORTVERSION=	3.6.0
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Helpers for Developing Command Line Interfaces
 WWW=		https://cran.r-project.org/web/packages/cli/
 
 LICENSE=	MIT
 
 USES=		cran:auto-plist,compiles
 
 post-install:
 	@${ECHO_CMD} "@dir ${R_MOD_DIR}/help/figures" >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-cliapp/Makefile b/devel/R-cran-cliapp/Makefile
index 4e0be4c899d6..e5196402947e 100644
--- a/devel/R-cran-cliapp/Makefile
+++ b/devel/R-cran-cliapp/Makefile
@@ -1,30 +1,31 @@
 PORTNAME=	cliapp
 DISTVERSION=	0.1.1
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	ygy@FreeBSD.org
 COMMENT=	Create Rich Command Line Applications
 WWW=		https://github.com/r-lib/cliapp #readme
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	R-cran-R6>0:devel/R-cran-R6 \
 		R-cran-cli>0:devel/R-cran-cli \
 		R-cran-crayon>0:devel/R-cran-crayon \
 		R-cran-fansi>0:devel/R-cran-fansi \
 		R-cran-glue>=1.3.0:devel/R-cran-glue \
 		R-cran-prettycode>0:devel/R-cran-prettycode \
 		R-cran-progress>=1.2.0:devel/R-cran-progress \
 		R-cran-withr>0:devel/R-cran-withr \
 		R-cran-xml2>0:textproc/R-cran-xml2 \
 		R-cran-selectr>0:www/R-cran-selectr
 TEST_DEPENDS=	R-cran-callr>0:devel/R-cran-callr \
 		R-cran-covr>0:devel/R-cran-covr \
 		R-cran-rstudioapi>0:devel/R-cran-rstudioapi \
 		R-cran-testthat>0:devel/R-cran-testthat
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-clipr/Makefile b/devel/R-cran-clipr/Makefile
index 4cf44154e5fe..b57c60bb3ba5 100644
--- a/devel/R-cran-clipr/Makefile
+++ b/devel/R-cran-clipr/Makefile
@@ -1,22 +1,23 @@
 PORTNAME=	clipr
 PORTVERSION=	0.8.0
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Read and Write from the System Clipboard
 WWW=		https://cran.r-project.org/web/packages/clipr/
 
 LICENSE=	GPLv3
 
 USES=		cran:auto-plist
 
 OPTIONS_DEFINE=	XCLIP XSEL
 OPTIONS_DEFAULT=	XCLIP
 XCLIP_DESC=	Use xclip for interacting with X11 clipboard
 XSEL_DESC=	Use xsel for interacting with X11 clipboard
 
 XCLIP_RUN_DEPENDS=	xclip:x11/xclip
 XSEL_RUN_DEPENDS=	xsel:x11/xsel-conrad
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-clisymbols/Makefile b/devel/R-cran-clisymbols/Makefile
index 4eb22a70cca5..3a3e7c240cf8 100644
--- a/devel/R-cran-clisymbols/Makefile
+++ b/devel/R-cran-clisymbols/Makefile
@@ -1,15 +1,16 @@
 PORTNAME=	clisymbols
 DISTVERSION=	1.2.0
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	jpbeconne@free.fr
 COMMENT=	Unicode Symbols at the R Prompt
 WWW=		https://CRAN.R-project.org/package=clisymbols
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-collapse/Makefile b/devel/R-cran-collapse/Makefile
index 037c0ddbc85f..64b80c4516d2 100644
--- a/devel/R-cran-collapse/Makefile
+++ b/devel/R-cran-collapse/Makefile
@@ -1,18 +1,19 @@
 PORTNAME=	collapse
 PORTVERSION=	1.8.8
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Advanced and Fast Data Transformation
 WWW=		https://cran.r-project.org/web/packages/collapse/
 
 LICENSE=	GPLv2+
 
 CRAN_DEPENDS=	R-cran-Rcpp>=1.0.1:devel/R-cran-Rcpp
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		compiler:c++11-lang cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-covr/Makefile b/devel/R-cran-covr/Makefile
index 9d11b31e2bba..b8cd88860898 100644
--- a/devel/R-cran-covr/Makefile
+++ b/devel/R-cran-covr/Makefile
@@ -1,37 +1,38 @@
 PORTNAME=	covr
 DISTVERSION=	3.6.2
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	ygy@FreeBSD.org
 COMMENT=	Test Coverage for Packages
 WWW=		https://covr.r-lib.org
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	R-cran-knitr>0:print/R-cran-knitr
 RUN_DEPENDS=	R-cran-jsonlite>0:converters/R-cran-jsonlite \
 		R-cran-crayon>0:devel/R-cran-crayon \
 		R-cran-withr>=1.0.2:devel/R-cran-withr \
 		R-cran-digest>0:security/R-cran-digest \
 		R-cran-rex>0:textproc/R-cran-rex \
 		R-cran-yaml>0:textproc/R-cran-yaml \
 		R-cran-httr>0:www/R-cran-httr
 TEST_DEPENDS=	R-cran-R6>0:devel/R-cran-R6 \
 		R-cran-covr>0:devel/R-cran-covr \
 		R-cran-memoise>0:devel/R-cran-memoise \
 		R-cran-mockery>0:devel/R-cran-mockery \
 		R-cran-rlang>0:devel/R-cran-rlang \
 		R-cran-rstudioapi>=0.2:devel/R-cran-rstudioapi \
 		R-cran-testthat>0:devel/R-cran-testthat \
 		R-cran-curl>0:ftp/R-cran-curl \
 		R-cran-knitr>0:print/R-cran-knitr \
 		R-cran-DT>=0.2:textproc/R-cran-DT \
 		R-cran-htmltools>0:textproc/R-cran-htmltools \
 		R-cran-rmarkdown>0:textproc/R-cran-rmarkdown \
 		R-cran-xml2>=1.0.0:textproc/R-cran-xml2
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-cpp11/Makefile b/devel/R-cran-cpp11/Makefile
index 993bf5c649f6..b538219edc19 100644
--- a/devel/R-cran-cpp11/Makefile
+++ b/devel/R-cran-cpp11/Makefile
@@ -1,14 +1,15 @@
 PORTNAME=	cpp11
 PORTVERSION=	0.4.2
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	C++11 Interface for R's C Interface
 WWW=		https://cran.r-project.org/web/packages/cpp11/
 
 LICENSE=	MIT
 
 USES=		compiler:c++11-lang cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-crayon/Makefile b/devel/R-cran-crayon/Makefile
index e64945cdc717..385f30edd714 100644
--- a/devel/R-cran-crayon/Makefile
+++ b/devel/R-cran-crayon/Makefile
@@ -1,20 +1,21 @@
 PORTNAME=	crayon
 DISTVERSION=	1.5.2
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	ygy@FreeBSD.org
 COMMENT=	Colored Terminal Output
 WWW=		https://github.com/r-lib/crayon#readme
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 TEST_DEPENDS=	R-cran-mockery>0:devel/R-cran-mockery \
 		R-cran-rstudioapi>0:devel/R-cran-rstudioapi \
 		R-cran-testthat>0:devel/R-cran-testthat \
 		R-cran-withr>0:devel/R-cran-withr
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-cyclocomp/Makefile b/devel/R-cran-cyclocomp/Makefile
index 8223278141f0..a0cc9aef46c1 100644
--- a/devel/R-cran-cyclocomp/Makefile
+++ b/devel/R-cran-cyclocomp/Makefile
@@ -1,22 +1,23 @@
 PORTNAME=	cyclocomp
 DISTVERSION=	1.1.0
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	ygy@FreeBSD.org
 COMMENT=	Cyclomatic Complexity of R Code
 WWW=		https://github.com/MangoTheCat/cyclocomp
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	R-cran-callr>0:devel/R-cran-callr \
 		R-cran-crayon>0:devel/R-cran-crayon \
 		R-cran-desc>0:devel/R-cran-desc \
 		R-cran-remotes>0:devel/R-cran-remotes \
 		R-cran-withr>0:devel/R-cran-withr
 TEST_DEPENDS=	R-cran-testthat>0:devel/R-cran-testthat
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-data.table/Makefile b/devel/R-cran-data.table/Makefile
index ba62d105e560..4f003e76ea48 100644
--- a/devel/R-cran-data.table/Makefile
+++ b/devel/R-cran-data.table/Makefile
@@ -1,30 +1,31 @@
 PORTNAME=	data.table
 DISTVERSION=	1.14.2
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Extension of Data.frame
 WWW=		https://cran.r-project.org/web/packages/data.table/
 
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		cran:auto-plist
 
 OPTIONS_DEFINE=		OPENMP
 OPTIONS_DEFAULT=	OPENMP
 
 OPENMP_CONFIGURE_ENABLE=	openmp
 
 NO_ARCH_IGNORE=		datatable.so
 
 .include <bsd.port.options.mk>
 
 .if defined(PPC_ABI) && ${PPC_ABI} == ELFv1
 USE_GCC=	yes
 .else
 USES+=		cran:compiles
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-desc/Makefile b/devel/R-cran-desc/Makefile
index 144f043a0077..f1f880fd44b2 100644
--- a/devel/R-cran-desc/Makefile
+++ b/devel/R-cran-desc/Makefile
@@ -1,25 +1,26 @@
 PORTNAME=	desc
 DISTVERSION=	1.4.2
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	ygy@FreeBSD.org
 COMMENT=	Manipulate DESCRIPTION Files
 WWW=		https://github.com/r-lib/desc#readme
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	R-cran-R6>0:devel/R-cran-R6 \
 		R-cran-cli>0:devel/R-cran-cli \
 		R-cran-rprojroot>0:devel/R-cran-rprojroot
 TEST_DEPENDS=	R-cran-callr>0:devel/R-cran-callr \
 		R-cran-covr>0:devel/R-cran-covr \
 		R-cran-testthat>0:devel/R-cran-testthat \
 		R-cran-withr>0:devel/R-cran-withr \
 		R-cran-spelling>0:textproc/R-cran-spelling \
 		R-cran-gh>0:www/R-cran-gh
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-devtools/Makefile b/devel/R-cran-devtools/Makefile
index 19a39f550034..da2dd3032489 100644
--- a/devel/R-cran-devtools/Makefile
+++ b/devel/R-cran-devtools/Makefile
@@ -1,37 +1,38 @@
 PORTNAME=	devtools
 DISTVERSION=	2.4.2
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	jpbeconne@free.fr
 COMMENT=	Tools to Make Developing R Packages Easier
 WWW=		https://CRAN.R-project.org/package=devtools
 
 LICENSE=	MIT
 
 CRAN_DEPENDS=	R-cran-callr>=3.6.0:devel/R-cran-callr \
 		R-cran-cli>=2.4.0:devel/R-cran-cli \
 		R-cran-desc>=1.3.0:devel/R-cran-desc \
 		R-cran-ellipsis>=0.3.1:devel/R-cran-ellipsis \
 		R-cran-fs>=1.5.0:sysutils/R-cran-fs \
 		R-cran-httr>=1.4.2:www/R-cran-httr \
 		R-cran-lifecycle>=1.0.0:devel/R-cran-lifecycle \
 		R-cran-memoise>=1.0.0:devel/R-cran-memoise \
 		R-cran-pkgbuild>=1.2.0:devel/R-cran-pkgbuild \
 		R-cran-pkgload>=1.2.1:devel/R-cran-pkgload \
 		R-cran-rcmdcheck>=1.3.3:devel/R-cran-rcmdcheck \
 		R-cran-remotes>=2.3.0:devel/R-cran-remotes \
 		R-cran-rlang>=0.4.10:devel/R-cran-rlang \
 		R-cran-roxygen2>=7.1.1:devel/R-cran-roxygen2 \
 		R-cran-rstudioapi>=0.13:devel/R-cran-rstudioapi \
 		R-cran-rversions>=2.0.2:devel/R-cran-rversions \
 		R-cran-sessioninfo>=1.1.1:devel/R-cran-sessioninfo \
 		R-cran-testthat>=3.0.2:devel/R-cran-testthat \
 		R-cran-usethis>=2.0.0:devel/R-cran-usethis \
 		R-cran-withr>=2.4.1:devel/R-cran-withr
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-diffobj/Makefile b/devel/R-cran-diffobj/Makefile
index 9e40dcbdab01..1e2acca26b62 100644
--- a/devel/R-cran-diffobj/Makefile
+++ b/devel/R-cran-diffobj/Makefile
@@ -1,20 +1,21 @@
 PORTNAME=	diffobj
 DISTVERSION=	0.3.5
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	ygy@FreeBSD.org
 COMMENT=	Diffs for R Objects
 WWW=		https://github.com/brodieG/diffobj
 
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
 BUILD_DEPENDS=	R-cran-knitr>0:print/R-cran-knitr
 RUN_DEPENDS=	R-cran-crayon>=1.3.2:devel/R-cran-crayon
 TEST_DEPENDS=	R-cran-knitr>0:print/R-cran-knitr \
 		R-cran-rmarkdown>0:textproc/R-cran-rmarkdown
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-doParallel/Makefile b/devel/R-cran-doParallel/Makefile
index f7eb76dae562..dbf52c6699c5 100644
--- a/devel/R-cran-doParallel/Makefile
+++ b/devel/R-cran-doParallel/Makefile
@@ -1,19 +1,20 @@
 PORTNAME=	doParallel
 PORTVERSION=	1.0.17
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Foreach parallel adaptor for the parallel package
 WWW=		https://cran.r-project.org/web/packages/doParallel/
 
 LICENSE=	GPLv2
 
 CRAN_DEPENDS=	R-cran-foreach>=1.2.0:devel/R-cran-foreach \
 		R-cran-iterators>=1.0.0:devel/R-cran-iterators
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=	cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-ellipsis/Makefile b/devel/R-cran-ellipsis/Makefile
index 26eb6a75357f..34fdd64831da 100644
--- a/devel/R-cran-ellipsis/Makefile
+++ b/devel/R-cran-ellipsis/Makefile
@@ -1,17 +1,18 @@
 PORTNAME=	ellipsis
 PORTVERSION=	0.3.2
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Powerful tool for extending functions
 WWW=		https://cran.r-project.org/web/packages/ellipsis/
 
 LICENSE=	GPLv3
 
 CRAN_DEPENDS=	R-cran-rlang>=0.3.0:devel/R-cran-rlang
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-evaluate/Makefile b/devel/R-cran-evaluate/Makefile
index f6ab8794eb37..67d969c08064 100644
--- a/devel/R-cran-evaluate/Makefile
+++ b/devel/R-cran-evaluate/Makefile
@@ -1,14 +1,15 @@
 PORTNAME=	evaluate
 PORTVERSION=	0.16
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Parsing and Evaluation Tools
 WWW=		https://cran.r-project.org/web/packages/evaluate/
 
 LICENSE=	MIT
 
 USES=	cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-fansi/Makefile b/devel/R-cran-fansi/Makefile
index 96e26fab4c0a..9bedecf58415 100644
--- a/devel/R-cran-fansi/Makefile
+++ b/devel/R-cran-fansi/Makefile
@@ -1,14 +1,15 @@
 PORTNAME=	fansi
 PORTVERSION=	1.0.3
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	ANSI Control Sequence Aware String Functions
 WWW=		https://cran.r-project.org/web/packages/fansi/
 
 LICENSE=	GPLv2+
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-filelock/Makefile b/devel/R-cran-filelock/Makefile
index 988fab8bef71..592fdc11f218 100644
--- a/devel/R-cran-filelock/Makefile
+++ b/devel/R-cran-filelock/Makefile
@@ -1,19 +1,20 @@
 PORTNAME=	filelock
 DISTVERSION=	1.0.2
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	ygy@FreeBSD.org
 COMMENT=	Portable File Locking
 WWW=		https://github.com/r-lib/filelock #readme
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 TEST_DEPENDS=	R-cran-callr>=2.0.0:devel/R-cran-callr \
 		R-cran-covr>0:devel/R-cran-covr \
 		R-cran-testthat>0:devel/R-cran-testthat
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-fontawesome/Makefile b/devel/R-cran-fontawesome/Makefile
index 55cda6b9fa9f..b62c2ccc6e7f 100644
--- a/devel/R-cran-fontawesome/Makefile
+++ b/devel/R-cran-fontawesome/Makefile
@@ -1,19 +1,20 @@
 PORTNAME=	fontawesome
 PORTVERSION=	0.3.0
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Easily Work with 'Font Awesome' Icons
 WWW=		https://cran.r-project.org/web/packages/fontawesome/
 
 LICENSE=	MIT
 
 CRAN_DEPENDS=	R-cran-rlang>=0.4.10:devel/R-cran-rlang \
 		R-cran-htmltools>=0.5.1.1:textproc/R-cran-htmltools
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-foreach/Makefile b/devel/R-cran-foreach/Makefile
index 8703e9e5d45e..65cd1b8f51a0 100644
--- a/devel/R-cran-foreach/Makefile
+++ b/devel/R-cran-foreach/Makefile
@@ -1,18 +1,19 @@
 PORTNAME=	foreach
 PORTVERSION=	1.5.2
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Foreach looping construct for R
 WWW=		https://cran.r-project.org/web/packages/foreach/
 
 LICENSE=	APACHE20
 
 CRAN_DEPENDS=	R-cran-iterators>0:devel/R-cran-iterators
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=	cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-future.apply/Makefile b/devel/R-cran-future.apply/Makefile
index 7557be82e51e..0874644e860e 100644
--- a/devel/R-cran-future.apply/Makefile
+++ b/devel/R-cran-future.apply/Makefile
@@ -1,19 +1,20 @@
 PORTNAME=	future.apply
 PORTVERSION=	1.9.1
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Apply Function to Elements in Parallel using Futures
 WWW=		https://cran.r-project.org/web/packages/future.apply/
 
 LICENSE=	GPLv2+
 
 CRAN_DEPENDS=	R-cran-future>=1.27.0:devel/R-cran-future \
 		R-cran-globals>=0.16.1:devel/R-cran-globals
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-future/Makefile b/devel/R-cran-future/Makefile
index 82528d58f68e..864f4e3ffc51 100644
--- a/devel/R-cran-future/Makefile
+++ b/devel/R-cran-future/Makefile
@@ -1,21 +1,22 @@
 PORTNAME=	future
 PORTVERSION=	1.28.0
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Unified Parallel and Distributed Processing in R for Everyone
 WWW=		https://cran.r-project.org/web/packages/future/
 
 LICENSE=	LGPL21+
 
 CRAN_DEPENDS=	R-cran-digest>0:security/R-cran-digest \
 		R-cran-globals>=0.16.0:devel/R-cran-globals \
 		R-cran-listenv>=0.8.0:devel/R-cran-listenv \
 		R-cran-parallelly>=1.32.1:devel/R-cran-parallelly
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-gbRd/Makefile b/devel/R-cran-gbRd/Makefile
index b81efb9507dd..38cdc916d864 100644
--- a/devel/R-cran-gbRd/Makefile
+++ b/devel/R-cran-gbRd/Makefile
@@ -1,15 +1,15 @@
 PORTNAME=	gbRd
 DISTVERSION=	0.4-11
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Utilities for processing Rd objects and files
 WWW=		https://cran.r-project.org/web/packages/gbRd/
 
 LICENSE=	GPLv2+
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-gbm/Makefile b/devel/R-cran-gbm/Makefile
index c425b1fc2c77..0f499b670a39 100644
--- a/devel/R-cran-gbm/Makefile
+++ b/devel/R-cran-gbm/Makefile
@@ -1,15 +1,15 @@
 PORTNAME=	gbm
 DISTVERSION=	2.0-8
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	skreuzer@FreeBSD.org
 COMMENT=	Extensions to AdaBoost algorithm
 WWW=		https://cran.r-project.org/web/packages/gbm/
 
 LICENSE=	GPLv2
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-gdata/Makefile b/devel/R-cran-gdata/Makefile
index 5d13ef35c7a9..d5e39dc7bce9 100644
--- a/devel/R-cran-gdata/Makefile
+++ b/devel/R-cran-gdata/Makefile
@@ -1,19 +1,20 @@
 PORTNAME=	gdata
 PORTVERSION=	2.18.0.1
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Various R programming tools for data manipulation
 WWW=		https://cran.r-project.org/web/packages/gdata/
 
 LICENSE=	GPLv2
 
 RUN_DEPENDS=	R-cran-gtools>0:devel/R-cran-gtools
 
 USES=		cran:auto-plist perl5 shebangfix
 USE_PERL5=	run
 
 SHEBANG_FILES=	inst/perl/*.pl
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-generics/Makefile b/devel/R-cran-generics/Makefile
index cc5b830ed147..c1b243e0fa7e 100644
--- a/devel/R-cran-generics/Makefile
+++ b/devel/R-cran-generics/Makefile
@@ -1,14 +1,15 @@
 PORTNAME=	generics
 PORTVERSION=	0.1.3
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Common S3 Generics not Provided by Base R Methods
 WWW=		https://cran.r-project.org/web/packages/generics/
 
 LICENSE=	MIT
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-gert/Makefile b/devel/R-cran-gert/Makefile
index cc54fbffaf06..0e8cd759d666 100644
--- a/devel/R-cran-gert/Makefile
+++ b/devel/R-cran-gert/Makefile
@@ -1,31 +1,31 @@
 PORTNAME=	gert
 DISTVERSION=	1.3.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	jpbeconne@free.fr
 COMMENT=	Simple Git Client for R
 WWW=		https://docs.ropensci.org/gert/
 
 LICENSE=	MIT
 
 CRAN_DEPENDS=	R-cran-askpass>0:security/R-cran-askpass \
 		R-cran-credentials>=1.2.1:security/R-cran-credentials \
 		R-cran-openssl>=1.4.1:security/R-cran-openssl \
 		R-cran-rstudioapi>=0.11:devel/R-cran-rstudioapi \
 		R-cran-sys>0:devel/R-cran-sys \
 		R-cran-zip>=2.1.0:archivers/R-cran-zip
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 LIB_DEPENDS=	libgit2.so:devel/libgit2
 
 USES=		cran:auto-plist
 
 #Bogus stage-qa as this is $ARCH dependent
 NO_ARCH_IGNORE=	gert.so
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/R/library/gert/libs/gert.so
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-getopt/Makefile b/devel/R-cran-getopt/Makefile
index 4595acc2b6c0..f755ec739ba9 100644
--- a/devel/R-cran-getopt/Makefile
+++ b/devel/R-cran-getopt/Makefile
@@ -1,21 +1,21 @@
 PORTNAME=	getopt
 DISTVERSION=	1.20.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	jwb@FreeBSD.org
 COMMENT=	Accept short and long flags in Rscript
 WWW=		https://cran.r-project.org/web/packages/getopt/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		cran:auto-plist
 
 post-patch:
 	@${REINPLACE_CMD} -i '' -e \
 		's|/path/to/Rscript|${LOCALBASE}/bin/Rscript|' \
 		${WRKSRC}/exec/example.R
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-git2r/Makefile b/devel/R-cran-git2r/Makefile
index 1937f3fbb55c..cb503981f86e 100644
--- a/devel/R-cran-git2r/Makefile
+++ b/devel/R-cran-git2r/Makefile
@@ -1,17 +1,17 @@
 PORTNAME=	git2r
 DISTVERSION=	0.27.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	jpbeconne@free.fr
 COMMENT=	Provides Access to Git Repositories
 WWW=		https://CRAN.R-project.org/package=git2r
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libgit2.so:devel/libgit2
 
 USES=		cran:auto-plist,compiles pkgconfig
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-glmnet/Makefile b/devel/R-cran-glmnet/Makefile
index d8f31415f577..d9f12f04b91c 100644
--- a/devel/R-cran-glmnet/Makefile
+++ b/devel/R-cran-glmnet/Makefile
@@ -1,15 +1,15 @@
 PORTNAME=	glmnet
 DISTVERSION=	1.8-5
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	skreuzer@FreeBSD.org
 COMMENT=	Lasso and elastic-net regularized generalized linear models
 WWW=		https://cran.r-project.org/web/packages/glmnet/
 
 LICENSE=	GPLv2
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-globals/Makefile b/devel/R-cran-globals/Makefile
index 4978ed628983..71ebefe626e7 100644
--- a/devel/R-cran-globals/Makefile
+++ b/devel/R-cran-globals/Makefile
@@ -1,14 +1,15 @@
 PORTNAME=	globals
 PORTVERSION=	0.16.1
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Identify Global Objects in R Expressions
 WWW=		https://cran.r-project.org/web/packages/globals/
 
 LICENSE=	LGPL21+
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-glue/Makefile b/devel/R-cran-glue/Makefile
index 5321f99e4162..a00980a53313 100644
--- a/devel/R-cran-glue/Makefile
+++ b/devel/R-cran-glue/Makefile
@@ -1,14 +1,15 @@
 PORTNAME=	glue
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Interpreted String Literals
 WWW=		https://cran.r-project.org/web/packages/glue/
 
 LICENSE=	MIT
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-gmodels/Makefile b/devel/R-cran-gmodels/Makefile
index 8be267f900bd..f273127f2a7b 100644
--- a/devel/R-cran-gmodels/Makefile
+++ b/devel/R-cran-gmodels/Makefile
@@ -1,16 +1,17 @@
 PORTNAME=	gmodels
 DISTVERSION=	2.18.1.1
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Various R Programming Tools for Model Fitting
 WWW=		https://cran.r-project.org/web/packages/gmodels/
 
 LICENSE=	GPLv2
 
 RUN_DEPENDS=	R-cran-gdata>0:devel/R-cran-gdata
 
 USES=	cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-gsubfn/Makefile b/devel/R-cran-gsubfn/Makefile
index 65a3995a5396..66565b3801a2 100644
--- a/devel/R-cran-gsubfn/Makefile
+++ b/devel/R-cran-gsubfn/Makefile
@@ -1,19 +1,20 @@
 PORTNAME=	gsubfn
 DISTVERSION=	0.7
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	skreuzer@FreeBSD.org
 COMMENT=	R package used for string matching, substitution and parsing
 WWW=		https://code.google.com/p/gsubfn/
 
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
 CRAN_DEPENDS=	R-cran-proto>=0.3.9.2_6:devel/R-cran-proto
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=	cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-gtools/Makefile b/devel/R-cran-gtools/Makefile
index 7502f58ea0d4..d503a3aef153 100644
--- a/devel/R-cran-gtools/Makefile
+++ b/devel/R-cran-gtools/Makefile
@@ -1,14 +1,15 @@
 PORTNAME=	gtools
 PORTVERSION=	3.9.3
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Various R programming tools
 WWW=		https://cran.r-project.org/web/packages/gtools/
 
 LICENSE=	GPLv2
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-hardhat/Makefile b/devel/R-cran-hardhat/Makefile
index 65de17149bad..a0db32388235 100644
--- a/devel/R-cran-hardhat/Makefile
+++ b/devel/R-cran-hardhat/Makefile
@@ -1,21 +1,22 @@
 PORTNAME=	hardhat
 PORTVERSION=	1.2.0
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Construct Modeling Packages
 WWW=		https://cran.r-project.org/web/packages/hardhat/
 
 LICENSE=	MIT
 
 CRAN_DEPENDS=	R-cran-glue>=1.6.2:devel/R-cran-glue \
 		R-cran-rlang>=1.0.3:devel/R-cran-rlang \
 		R-cran-tibble>=3.1.7:devel/R-cran-tibble \
 		R-cran-vctrs>=0.4.1:devel/R-cran-vctrs
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-hms/Makefile b/devel/R-cran-hms/Makefile
index e6e1e4f78111..897434dcd1d8 100644
--- a/devel/R-cran-hms/Makefile
+++ b/devel/R-cran-hms/Makefile
@@ -1,22 +1,23 @@
 PORTNAME=	hms
 PORTVERSION=	1.1.2
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Pretty Time of Day
 WWW=		https://cran.r-project.org/web/packages/hms/
 
 LICENSE=	MIT
 
 CRAN_DEPENDS=	R-cran-ellipsis>=0.3.2:devel/R-cran-ellipsis \
 		R-cran-lifecycle>0:devel/R-cran-lifecycle \
 		R-cran-pkgconfig>0:devel/R-cran-pkgconfig \
 		R-cran-rlang>0:devel/R-cran-rlang \
 		R-cran-vctrs>=0.3.8:devel/R-cran-vctrs
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-ini/Makefile b/devel/R-cran-ini/Makefile
index 21940d9c0543..354137893cbb 100644
--- a/devel/R-cran-ini/Makefile
+++ b/devel/R-cran-ini/Makefile
@@ -1,16 +1,17 @@
 PORTNAME=	ini
 DISTVERSION=	0.3.1
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	ygy@FreeBSD.org
 COMMENT=	Read and Write '.ini' Files
 WWW=		https://github.com/dvdscripter/ini
 
 LICENSE=	GPLv3
 
 TEST_DEPENDS=	R-cran-testthat>0:devel/R-cran-testthat
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-iterators/Makefile b/devel/R-cran-iterators/Makefile
index d486d41d74bf..a2b7ffaa8c06 100644
--- a/devel/R-cran-iterators/Makefile
+++ b/devel/R-cran-iterators/Makefile
@@ -1,14 +1,15 @@
 PORTNAME=	iterators
 PORTVERSION=	1.0.14
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Iterator construct for R
 WWW=		https://cran.r-project.org/web/packages/iterators/
 
 LICENSE=	APACHE20
 
 USES=	cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-itertools/Makefile b/devel/R-cran-itertools/Makefile
index 14e40185007f..d5962f5ae870 100644
--- a/devel/R-cran-itertools/Makefile
+++ b/devel/R-cran-itertools/Makefile
@@ -1,17 +1,17 @@
 PORTNAME=	itertools
 DISTVERSION=	0.1-3
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Iterator Tools for R
 WWW=		https://cran.r-project.org/web/packages/itertools/
 
 LICENSE=	GPLv2
 
 RUN_DEPENDS=	R-cran-iterators>=1.0.0:devel/R-cran-iterators
 
 USES=	cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-later/Makefile b/devel/R-cran-later/Makefile
index c720c05da51f..d2a5cd459a34 100644
--- a/devel/R-cran-later/Makefile
+++ b/devel/R-cran-later/Makefile
@@ -1,19 +1,20 @@
 PORTNAME=	later
 PORTVERSION=	1.3.0
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Utilities for Delaying Function Execution
 WWW=		https://cran.r-project.org/web/packages/later/
 
 LICENSE=	MIT
 
 CRAN_DEPENDS=	R-cran-Rcpp>=0.12.9:devel/R-cran-Rcpp \
 		R-cran-rlang>0:devel/R-cran-rlang
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		compiler:c++11-lang cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-lifecycle/Makefile b/devel/R-cran-lifecycle/Makefile
index 7aab4c4865ba..d073fe03bc2d 100644
--- a/devel/R-cran-lifecycle/Makefile
+++ b/devel/R-cran-lifecycle/Makefile
@@ -1,20 +1,21 @@
 PORTNAME=	lifecycle
 PORTVERSION=	1.0.3
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Manage the Life Cycle of your Package Functions
 WWW=		https://cran.r-project.org/web/packages/lifecycle/
 
 LICENSE=	MIT
 
 CRAN_DEPENDS=	R-cran-glue>0:devel/R-cran-glue \
 		R-cran-rlang>=1.0.5:devel/R-cran-rlang \
 		R-cran-cli>3.4.0:devel/R-cran-cli
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-lintr/Makefile b/devel/R-cran-lintr/Makefile
index 8ef23c39b620..2348d3d6649d 100644
--- a/devel/R-cran-lintr/Makefile
+++ b/devel/R-cran-lintr/Makefile
@@ -1,38 +1,39 @@
 PORTNAME=	lintr
 DISTVERSION=	3.0.2
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	ygy@FreeBSD.org
 COMMENT=	A 'Linter' for R Code
 WWW=		https://github.com/r-lib/lintr
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	R-cran-knitr>0:print/R-cran-knitr
 RUN_DEPENDS=	R-cran-jsonlite>0:converters/R-cran-jsonlite \
 		R-cran-crayon>0:devel/R-cran-crayon \
 		R-cran-cyclocomp>0:devel/R-cran-cyclocomp \
 		R-cran-glue>0:devel/R-cran-glue \
 		R-cran-backports>0:math/R-cran-backports \
 		R-cran-knitr>0:print/R-cran-knitr \
 		R-cran-digest>0:security/R-cran-digest \
 		R-cran-rex>0:textproc/R-cran-rex \
 		R-cran-xml2>=1.0.0:textproc/R-cran-xml2 \
 		R-cran-xmlparsedata>=1.0.5:textproc/R-cran-xmlparsedata
 TEST_DEPENDS=	R-cran-covr>0:devel/R-cran-covr \
 		R-cran-mockery>0:devel/R-cran-mockery \
 		R-cran-rstudioapi>=0.2:devel/R-cran-rstudioapi \
 		R-cran-testthat>=3.0.0:devel/R-cran-testthat \
 		R-cran-tibble>0:devel/R-cran-tibble \
 		R-cran-withr>=2.5.0:devel/R-cran-withr \
 		R-cran-rmarkdown>0:textproc/R-cran-rmarkdown \
 		R-cran-httr>=1.2.1:www/R-cran-httr
 
 USES=		cran:auto-plist
 
 post-install:
 	@${ECHO_CMD} "@dir ${R_MOD_DIR}/help/figures" >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-listenv/Makefile b/devel/R-cran-listenv/Makefile
index 838d4cc7bf78..b8dc548ec717 100644
--- a/devel/R-cran-listenv/Makefile
+++ b/devel/R-cran-listenv/Makefile
@@ -1,14 +1,15 @@
 PORTNAME=	listenv
 PORTVERSION=	0.8.0
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Environments Behaving (Almost) as Lists
 WWW=		https://cran.r-project.org/web/packages/listenv/
 
 LICENSE=	LGPL21+
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-lubridate/Makefile b/devel/R-cran-lubridate/Makefile
index 3192aadcd860..f188b1359066 100644
--- a/devel/R-cran-lubridate/Makefile
+++ b/devel/R-cran-lubridate/Makefile
@@ -1,19 +1,20 @@
 PORTNAME=	lubridate
 PORTVERSION=	1.8.0
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Make Dealing with Dates a Little Easier
 WWW=		https://cran.r-project.org/web/packages/lubridate/
 
 LICENSE=	GPLv2+
 
 CRAN_DEPENDS=	R-cran-generics>0:devel/R-cran-generics \
 		R-cran-cpp11>=0.2.7:devel/R-cran-cpp11
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		compiler:c++11-lang cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-magrittr/Makefile b/devel/R-cran-magrittr/Makefile
index 743748da72c4..8a0a0502a811 100644
--- a/devel/R-cran-magrittr/Makefile
+++ b/devel/R-cran-magrittr/Makefile
@@ -1,14 +1,15 @@
 PORTNAME=	magrittr
 PORTVERSION=	2.0.3
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Forward-Pipe Operator for R
 WWW=		http://cran.r-project.org/web/magrittr/
 
 LICENSE=	MIT
 
 USES=	cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-memoise/Makefile b/devel/R-cran-memoise/Makefile
index 07aee38af63d..1e7fe5eac29d 100644
--- a/devel/R-cran-memoise/Makefile
+++ b/devel/R-cran-memoise/Makefile
@@ -1,19 +1,20 @@
 PORTNAME=	memoise
 PORTVERSION=	2.0.1
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Memoise functions for R
 WWW=		https://cran.r-project.org/web/packages/memoise/
 
 LICENSE=	MIT
 
 CRAN_DEPENDS=	R-cran-rlang>=0.4.10:devel/R-cran-rlang \
 		R-cran-cachem>0:databases/R-cran-cachem
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=	cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-microbenchmark/Makefile b/devel/R-cran-microbenchmark/Makefile
index 021e2e795e92..f953cdc36d09 100644
--- a/devel/R-cran-microbenchmark/Makefile
+++ b/devel/R-cran-microbenchmark/Makefile
@@ -1,17 +1,17 @@
 PORTNAME=	microbenchmark
-PORTREVISION=	5
+PORTREVISION=	6
 DISTVERSION=	1.4-2
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	skreuzer@FreeBSD.org
 COMMENT=	Infrastructure to measure the execution time of R expressions
 WWW=		https://cran.r-project.org/web/packages/microbenchmark/index.html
 
 LICENSE=	BSD3CLAUSE
 
 RUN_DEPENDS=	R-cran-ggplot2>0:graphics/R-cran-ggplot2
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-mockery/Makefile b/devel/R-cran-mockery/Makefile
index 377acafbe0c1..a8f448b55400 100644
--- a/devel/R-cran-mockery/Makefile
+++ b/devel/R-cran-mockery/Makefile
@@ -1,21 +1,22 @@
 PORTNAME=	mockery
 DISTVERSION=	0.4.3
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	ygy@FreeBSD.org
 COMMENT=	Mocking Library for R
 WWW=		https://github.com/r-lib/mockery
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	R-cran-knitr>0:print/R-cran-knitr
 RUN_DEPENDS=	R-cran-testthat>0:devel/R-cran-testthat
 TEST_DEPENDS=	R-cran-R6>0:devel/R-cran-R6 \
 		R-cran-knitr>0:print/R-cran-knitr \
 		R-cran-rmarkdown>=1.0:textproc/R-cran-rmarkdown
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-msm/Makefile b/devel/R-cran-msm/Makefile
index 3226d84c08f6..e268357a9197 100644
--- a/devel/R-cran-msm/Makefile
+++ b/devel/R-cran-msm/Makefile
@@ -1,17 +1,18 @@
 PORTNAME=	msm
 PORTVERSION=	1.7
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Multi-State Markov and Hidden Markov Models in Continuous Time
 WWW=		https://cran.r-project.org/package=msm
 
 LICENSE=	GPLv2+
 
 RUN_DEPENDS=	R-cran-expm>0:math/R-cran-expm	\
 		R-cran-mvtnorm>0:math/R-cran-mvtnorm
 
 USES=		cran:compiles
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-multicool/Makefile b/devel/R-cran-multicool/Makefile
index 6f94d50f9edf..d9fd67ec9fed 100644
--- a/devel/R-cran-multicool/Makefile
+++ b/devel/R-cran-multicool/Makefile
@@ -1,16 +1,17 @@
 PORTNAME=	multicool
 DISTVERSION=	0.1-12
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Permutations of Multisets in Cool-Lex Order
 WWW=		https://cran.r-project.org/package=multicool
 
 LICENSE=	GPLv2
 
 RUN_DEPENDS=	R-cran-Rcpp>0:devel/R-cran-Rcpp
 
 USES=		compiler:c++11-lang cran:compiles
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-optparse/Makefile b/devel/R-cran-optparse/Makefile
index e870d404bd33..eb13d50cc239 100644
--- a/devel/R-cran-optparse/Makefile
+++ b/devel/R-cran-optparse/Makefile
@@ -1,19 +1,20 @@
 PORTNAME=	optparse
 DISTVERSION=	1.6.6
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	jwb@FreeBSD.org
 COMMENT=	Command line flag parser inspired by Python's optparse
 WWW=		https://cran.r-project.org/web/packages/optparse/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 CRAN_DEPENDS=	R-cran-getopt>=1.20.2:devel/R-cran-getopt
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-pak/Makefile b/devel/R-cran-pak/Makefile
index bd34970a1ab1..a0580dfe9ee0 100644
--- a/devel/R-cran-pak/Makefile
+++ b/devel/R-cran-pak/Makefile
@@ -1,38 +1,39 @@
 PORTNAME=	pak
 DISTVERSION=	0.4.0
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	ygy@FreeBSD.org
 COMMENT=	Another Approach to Package Installation
 WWW=		https://pak.r-lib.org/
 
 LICENSE=	GPLv3
 
 TEST_DEPENDS=	R-cran-jsonlite>=1.8.0:converters/R-cran-jsonlite \
 		R-cran-callr>=3.7.0:devel/R-cran-callr \
 		R-cran-cli>=3.2.0:devel/R-cran-cli \
 		R-cran-covr>0:devel/R-cran-covr \
 		R-cran-desc>=1.4.1:devel/R-cran-desc \
 		R-cran-filelock>=1.0.2:devel/R-cran-filelock \
 		R-cran-glue>=1.6.2:devel/R-cran-glue \
 		R-cran-mockery>0:devel/R-cran-mockery \
 		R-cran-pkgcache>=2.0.4:devel/R-cran-pkgcache \
 		R-cran-prettyunits>0:devel/R-cran-prettyunits \
 		R-cran-rprojroot>=2.0.2:devel/R-cran-rprojroot \
 		R-cran-rstudioapi>0:devel/R-cran-rstudioapi \
 		R-cran-testthat>0:devel/R-cran-testthat \
 		R-cran-withr>0:devel/R-cran-withr \
 		R-cran-curl>=4.3.2:ftp/R-cran-curl \
 		R-cran-pingr>0:net/R-cran-pingr \
 		R-cran-digest>0:security/R-cran-digest \
 		R-cran-gitcreds>0:security/R-cran-gitcreds \
 		R-cran-processx>=3.5.2:sysutils/R-cran-processx \
 		R-cran-ps>=1.6.0:sysutils/R-cran-ps
 
 USES=		cran:auto-plist
 
 post-install:
 	@${ECHO_CMD} "@dir ${R_MOD_DIR}/library" >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-parallelly/Makefile b/devel/R-cran-parallelly/Makefile
index 69581a666672..c8a01696f4b6 100644
--- a/devel/R-cran-parallelly/Makefile
+++ b/devel/R-cran-parallelly/Makefile
@@ -1,14 +1,15 @@
 PORTNAME=	parallelly
 PORTVERSION=	1.32.1
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Enhancing the 'parallel' Package
 WWW=		https://cran.r-project.org/web/packages/parallelly/
 
 LICENSE=	LGPL21+
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-pillar/Makefile b/devel/R-cran-pillar/Makefile
index 5bff2c9cc870..e20eab7f5b65 100644
--- a/devel/R-cran-pillar/Makefile
+++ b/devel/R-cran-pillar/Makefile
@@ -1,24 +1,25 @@
 PORTNAME=	pillar
 PORTVERSION=	1.8.1
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Coloured Formatting for Columns
 WWW=		https://cran.r-project.org/web/packages/pillar/
 
 LICENSE=	MIT
 
 CRAN_DEPENDS=	R-cran-cli>=2.3.0:devel/R-cran-cli \
 		R-cran-fansi>0:devel/R-cran-fansi \
 		R-cran-glue>0:devel/R-cran-glue \
 		R-cran-lifecycle>0:devel/R-cran-lifecycle \
 		R-cran-rlang>=1.0.2:devel/R-cran-rlang \
 		R-cran-utf8>=1.1.0:textproc/R-cran-utf8 \
 		R-cran-vctrs>=0.3.8:devel/R-cran-vctrs
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-pkgbuild/Makefile b/devel/R-cran-pkgbuild/Makefile
index a5aea2e4ab4c..0994bf435c48 100644
--- a/devel/R-cran-pkgbuild/Makefile
+++ b/devel/R-cran-pkgbuild/Makefile
@@ -1,26 +1,27 @@
 PORTNAME=	pkgbuild
 DISTVERSION=	1.4.0
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	ygy@FreeBSD.org
 COMMENT=	Find Tools Needed to Build R Packages
 WWW=		https://github.com/r-lib/pkgbuild
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	R-cran-R6>0:devel/R-cran-R6 \
 		R-cran-callr>=3.2.0:devel/R-cran-callr \
 		R-cran-cli>=3.4.0:devel/R-cran-cli \
 		R-cran-crayon>0:devel/R-cran-crayon \
 		R-cran-desc>0:devel/R-cran-desc \
 		R-cran-prettyunits>0:devel/R-cran-prettyunits \
 		R-cran-rprojroot>0:devel/R-cran-rprojroot \
 		R-cran-withr>=2.3.0:devel/R-cran-withr \
 		R-cran-processx>0:sysutils/R-cran-processx
 TEST_DEPENDS=	R-cran-covr>0:devel/R-cran-covr
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-pkgcache/Makefile b/devel/R-cran-pkgcache/Makefile
index 1327a4ff1cfd..ac9eac2487a0 100644
--- a/devel/R-cran-pkgcache/Makefile
+++ b/devel/R-cran-pkgcache/Makefile
@@ -1,37 +1,38 @@
 PORTNAME=	pkgcache
 DISTVERSION=	2.0.4
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	ygy@FreeBSD.org
 COMMENT=	Cache 'CRAN'-Like Metadata and R Packages
 WWW=		https://github.com/r-lib/pkgcache#readme
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	R-cran-jsonlite>0:converters/R-cran-jsonlite \
 		R-cran-R6>0:devel/R-cran-R6 \
 		R-cran-callr>=2.0.4.9000:devel/R-cran-callr \
 		R-cran-cli>=3.2.0:devel/R-cran-cli \
 		R-cran-filelock>0:devel/R-cran-filelock \
 		R-cran-prettyunits>0:devel/R-cran-prettyunits \
 		R-cran-rappdirs>0:devel/R-cran-rappdirs \
 		R-cran-curl>=3.2:ftp/R-cran-curl \
 		R-cran-processx>=3.3.0.9001:sysutils/R-cran-processx
 TEST_DEPENDS=	R-cran-zip>0:archivers/R-cran-zip \
 		R-cran-covr>0:devel/R-cran-covr \
 		R-cran-desc>0:devel/R-cran-desc \
 		R-cran-mockery>0:devel/R-cran-mockery \
 		R-cran-pillar>0:devel/R-cran-pillar \
 		R-cran-rprojroot>0:devel/R-cran-rprojroot \
 		R-cran-sessioninfo>0:devel/R-cran-sessioninfo \
 		R-cran-testthat>=3.0.0:devel/R-cran-testthat \
 		R-cran-withr>0:devel/R-cran-withr \
 		R-cran-pingr>0:net/R-cran-pingr \
 		R-cran-fs>0:sysutils/R-cran-fs \
 		R-cran-spelling>0:textproc/R-cran-spelling
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-pkgconfig/Makefile b/devel/R-cran-pkgconfig/Makefile
index 0830c7502c51..84e4a99934c7 100644
--- a/devel/R-cran-pkgconfig/Makefile
+++ b/devel/R-cran-pkgconfig/Makefile
@@ -1,15 +1,15 @@
 PORTNAME=	pkgconfig
 PORTVERSION=	2.0.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Private Configuration for 'R' Packages
 WWW=		https://cran.r-project.org/web/packages/pkgconfig/
 
 LICENSE=	MIT
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-pkgload/Makefile b/devel/R-cran-pkgload/Makefile
index 3fe36b77b641..0acba7c3f9b3 100644
--- a/devel/R-cran-pkgload/Makefile
+++ b/devel/R-cran-pkgload/Makefile
@@ -1,32 +1,33 @@
 PORTNAME=	pkgload
 DISTVERSION=	1.3.2
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	ygy@FreeBSD.org
 COMMENT=	Simulate Package Installation and Attach
 WWW=		https://github.com/r-lib/pkgload
 
 LICENSE=	GPLv3
 
 RUN_DEPENDS=	R-cran-cli>=3.3.0:devel/R-cran-cli \
 		R-cran-crayon>0:devel/R-cran-crayon \
 		R-cran-desc>0:devel/R-cran-desc \
 		R-cran-glue>0:devel/R-cran-glue \
 		R-cran-rlang>=1.0.3:devel/R-cran-rlang \
 		R-cran-rprojroot>0:devel/R-cran-rprojroot \
 		R-cran-withr>=2.4.3:devel/R-cran-withr \
 		R-cran-fs>0:sysutils/R-cran-fs
 TEST_DEPENDS=	R-cran-Rcpp>0:devel/R-cran-Rcpp \
 		R-cran-bitops>0:devel/R-cran-bitops \
 		R-cran-covr>0:devel/R-cran-covr \
 		R-cran-pak>0:devel/R-cran-pak \
 		R-cran-pkgbuild>0:devel/R-cran-pkgbuild \
 		R-cran-remotes>0:devel/R-cran-remotes \
 		R-cran-rstudioapi>0:devel/R-cran-rstudioapi \
 		R-cran-testthat>=3.1.0:devel/R-cran-testthat \
 		R-cran-mathjaxr>0:math/R-cran-mathjaxr
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-pkgmaker/Makefile b/devel/R-cran-pkgmaker/Makefile
index 739495f6d31a..44da9819ef6a 100644
--- a/devel/R-cran-pkgmaker/Makefile
+++ b/devel/R-cran-pkgmaker/Makefile
@@ -1,23 +1,24 @@
 PORTNAME=	pkgmaker
 PORTVERSION=	0.32.2
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Package development utilities
 WWW=		https://cran.r-project.org/web/packages/pkgmaker/
 
 LICENSE=	GPLv2+
 
 CRAN_DEPENDS=	R-cran-registry>0:devel/R-cran-registry \
 		R-cran-digest>0:security/R-cran-digest \
 		R-cran-xtable>0:textproc/R-cran-xtable \
 		R-cran-stringr>0:textproc/R-cran-stringr \
 		R-cran-withr>0:devel/R-cran-withr \
 		R-cran-assertthat>0:math/R-cran-assertthat
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=	cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-plogr/Makefile b/devel/R-cran-plogr/Makefile
index b787b9565bd2..5d4b8e33e4a1 100644
--- a/devel/R-cran-plogr/Makefile
+++ b/devel/R-cran-plogr/Makefile
@@ -1,16 +1,16 @@
 PORTNAME=	plogr
 DISTVERSION=	0.2.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Plog C++ Logging Library
 WWW=		https://cran.r-project.org/web/packages/plogr/
 
 BUILD_DEPENDS=	R-cran-Rcpp>=0:devel/R-cran-Rcpp
 RUN_DEPENDS=	R-cran-Rcpp>=0:devel/R-cran-Rcpp
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-plyr/Makefile b/devel/R-cran-plyr/Makefile
index 9c8540732337..b9c219d9cdc3 100644
--- a/devel/R-cran-plyr/Makefile
+++ b/devel/R-cran-plyr/Makefile
@@ -1,18 +1,19 @@
 PORTNAME=	plyr
 PORTVERSION=	1.8.7
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Tools for splitting, applying, and combining data
 WWW=		https://cran.r-project.org/web/packages/plyr/
 
 LICENSE=	MIT
 
 CRAN_DEPENDS=	R-cran-Rcpp>=0.11.0:devel/R-cran-Rcpp
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-praise/Makefile b/devel/R-cran-praise/Makefile
index 1219d700cc6b..97bf811b80fa 100644
--- a/devel/R-cran-praise/Makefile
+++ b/devel/R-cran-praise/Makefile
@@ -1,15 +1,15 @@
 PORTNAME=	praise
 DISTVERSION=	1.0.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Praise Users
 WWW=		https://cran.r-project.org/web/packages/praise/
 
 LICENSE=	MIT
 
 USES=	cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-prettycode/Makefile b/devel/R-cran-prettycode/Makefile
index 9ebf662d75e8..aa5250987f77 100644
--- a/devel/R-cran-prettycode/Makefile
+++ b/devel/R-cran-prettycode/Makefile
@@ -1,21 +1,22 @@
 PORTNAME=	prettycode
 DISTVERSION=	1.1.0
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	ygy@FreeBSD.org
 COMMENT=	Pretty Print R Code in the Terminal
 WWW=		https://github.com/r-lib/prettycode #readme
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	R-cran-crayon>0:devel/R-cran-crayon
 TEST_DEPENDS=	R-cran-covr>0:devel/R-cran-covr \
 		R-cran-rstudioapi>0:devel/R-cran-rstudioapi \
 		R-cran-testthat>0:devel/R-cran-testthat \
 		R-cran-withr>0:devel/R-cran-withr
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-prettyunits/Makefile b/devel/R-cran-prettyunits/Makefile
index 55599c4f1182..c143eab7ab41 100644
--- a/devel/R-cran-prettyunits/Makefile
+++ b/devel/R-cran-prettyunits/Makefile
@@ -1,20 +1,20 @@
 PORTNAME=	prettyunits
 PORTVERSION=	1.1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Pretty, Human Readable Formatting of Quantities
 WWW=		https://cran.r-project.org/web/packages/prettyunits/
 
 LICENSE=	MIT
 
 CRAN_DEPENDS=	R-cran-magrittr>0:devel/R-cran-magrittr \
 		R-cran-assertthat>0:math/R-cran-assertthat
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-progress/Makefile b/devel/R-cran-progress/Makefile
index efb2dce66a5f..06bb69acf173 100644
--- a/devel/R-cran-progress/Makefile
+++ b/devel/R-cran-progress/Makefile
@@ -1,22 +1,22 @@
 PORTNAME=	progress
 PORTVERSION=	1.2.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Terminal Progress Bars
 WWW=		https://cran.r-project.org/web/packages/progress/
 
 LICENSE=	MIT
 
 CRAN_DEPENDS=	R-cran-R6>0:devel/R-cran-R6 \
 		R-cran-hms>0:devel/R-cran-hms \
 		R-cran-prettyunits>0:devel/R-cran-prettyunits \
 		R-cran-crayon>0:devel/R-cran-crayon
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-progressr/Makefile b/devel/R-cran-progressr/Makefile
index 4165984f235d..157cc9745731 100644
--- a/devel/R-cran-progressr/Makefile
+++ b/devel/R-cran-progressr/Makefile
@@ -1,18 +1,19 @@
 PORTNAME=	progressr
 PORTVERSION=	0.11.0
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Inclusive, Unifying API for Progress Updates
 WWW=		https://cran.r-project.org/web/packages/progressr/
 
 LICENSE=	GPLv3
 
 CRAN_DEPENDS=	R-cran-digest>0:security/R-cran-digest
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-promises/Makefile b/devel/R-cran-promises/Makefile
index d3d28e67ff99..23a5957297c2 100644
--- a/devel/R-cran-promises/Makefile
+++ b/devel/R-cran-promises/Makefile
@@ -1,22 +1,23 @@
 PORTNAME=	promises
 PORTVERSION=	1.2.0.1
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Abstractions for Promise-Based Asynchronous Programming
 WWW=		https://cran.r-project.org/web/packages/promises/
 
 LICENSE=	MIT
 
 CRAN_DEPENDS=	R-cran-R6>0:devel/R-cran-R6 \
 		R-cran-Rcpp>0:devel/R-cran-Rcpp \
 		R-cran-later>0:devel/R-cran-later \
 		R-cran-rlang>0:devel/R-cran-rlang \
 		R-cran-magrittr>0:devel/R-cran-magrittr
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-proto/Makefile b/devel/R-cran-proto/Makefile
index a3ce2b9c907e..a93e8dde1fec 100644
--- a/devel/R-cran-proto/Makefile
+++ b/devel/R-cran-proto/Makefile
@@ -1,15 +1,15 @@
 PORTNAME=	proto
 DISTVERSION=	1.0.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Prototype object-based programming
 WWW=		https://github.com/hadley/proto
 
 LICENSE=	GPLv2
 
 USES=	cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-purrr/Makefile b/devel/R-cran-purrr/Makefile
index 2a4f4766ef23..281d0acebd79 100644
--- a/devel/R-cran-purrr/Makefile
+++ b/devel/R-cran-purrr/Makefile
@@ -1,21 +1,21 @@
 PORTNAME=	purrr
 PORTVERSION=	0.3.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Functional Programming Tools
 WWW=		https://cran.r-project.org/web/packages/purrr/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 CRAN_DEPENDS=	R-cran-magrittr>=1.5:devel/R-cran-magrittr \
 		R-cran-rlang>=0.3.1:devel/R-cran-rlang
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-rJava/Makefile b/devel/R-cran-rJava/Makefile
index 5e19829ea780..e1c3409f5863 100644
--- a/devel/R-cran-rJava/Makefile
+++ b/devel/R-cran-rJava/Makefile
@@ -1,36 +1,36 @@
 PORTNAME=	rJava
 DISTVERSION=	1.0-6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel java
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	R to Java interface
 WWW=		https://cran.r-project.org/package=rJava
 
 LICENSE=	LGPL21
 
 LIB_DEPENDS=	libicuuc.so:devel/icu	\
 		libpcre2-8.so:devel/pcre2
 
 USES=		cran:compiles
 USE_JAVA=	yes
 
 JRE_LIBS=	${JAVA_HOME}/jre/lib/${ARCH:S/powerpc64/ppc64/}/server	# JDK8
 #JRE_LIBS=	${JAVA_HOME}/jre/lib/server	# JDK11
 LDFLAGS=	"-Wl,-rpath=${JRE_LIBS} "
 MAKE_ENV=	JAVA_HOME=${JAVA_HOME}	\
 		JAVA=${JAVA}	\
 		JAVAC=${JAVAC}	\
 		JAVAH=${JAVAH}	\
 		JAR=${JAR}	\
 		LD_LIBRARY_PATH="${JRE_LIBS}"	\
 		JAVA_LD_LIBRARY_PATH="${JRE_LIBS}"	\
 		JAVA_LIBS="-Wl,-rpath=${JRE_LIBS} -L${JRE_LIBS} -ljvm -lpthread"	\
 		JAVA_CPPFLAGS="-I${JAVA_HOME}/jre/../include -I${JAVA_HOME}/jre/../include/${OPSYS:tl}"
 
 pre-configure:
 	# Just for debug purpose
 	${LOCALBASE}/bin/R CMD javareconf -e exit
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-randomForest/Makefile b/devel/R-cran-randomForest/Makefile
index 355c2e4ca96b..6831ad0531c1 100644
--- a/devel/R-cran-randomForest/Makefile
+++ b/devel/R-cran-randomForest/Makefile
@@ -1,18 +1,18 @@
 PORTNAME=	randomForest
 DISTVERSION=	4.6-14
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	skreuzer@FreeBSD.org
 COMMENT=	Classification based on a forest of trees using random inputs
 WWW=		https://cran.r-project.org/web/packages/randomForest/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	R-cran-RColorBrewer>=1.0.5_6:graphics/R-cran-RColorBrewer
 
 USES=	cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-rappdirs/Makefile b/devel/R-cran-rappdirs/Makefile
index eec22aeff604..5a6920e4c5e6 100644
--- a/devel/R-cran-rappdirs/Makefile
+++ b/devel/R-cran-rappdirs/Makefile
@@ -1,19 +1,20 @@
 PORTNAME=	rappdirs
 DISTVERSION=	0.3.3
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	ygy@FreeBSD.org
 COMMENT=	Application Directories: Determine Where to Save Data, Caches, and Logs
 WWW=		https://rappdirs.r-lib.org
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 TEST_DEPENDS=	R-cran-covr>0:devel/R-cran-covr \
 		R-cran-testthat>=3.0.0:devel/R-cran-testthat \
 		R-cran-withr>0:devel/R-cran-withr
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-rcmdcheck/Makefile b/devel/R-cran-rcmdcheck/Makefile
index 8aa3e55aae49..dc7138959494 100644
--- a/devel/R-cran-rcmdcheck/Makefile
+++ b/devel/R-cran-rcmdcheck/Makefile
@@ -1,30 +1,31 @@
 PORTNAME=	rcmdcheck
 DISTVERSION=	1.3.3
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	jpbeconne@free.fr
 COMMENT=	Run 'R CMD check' from 'R' and Capture Results
 WWW=		https://CRAN.R-project.org/package=rcmdcheck
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 CRAN_DEPENDS=	R-cran-callr>=3.1.1.9000:devel/R-cran-callr \
 		R-cran-cli>=1.1.0:devel/R-cran-cli \
 		R-cran-crayon>0:devel/R-cran-crayon \
 		R-cran-desc>=1.2.0:devel/R-cran-desc \
 		R-cran-digest>0:security/R-cran-digest \
 		R-cran-pkgbuild>0:devel/R-cran-pkgbuild \
 		R-cran-prettyunits>0:devel/R-cran-prettyunits \
 		R-cran-R6>0:devel/R-cran-R6 \
 		R-cran-rprojroot>0:devel/R-cran-rprojroot \
 		R-cran-sessioninfo>0:devel/R-cran-sessioninfo \
 		R-cran-withr>0:devel/R-cran-withr \
 		R-cran-xopen>0:sysutils/R-cran-xopen
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-registry/Makefile b/devel/R-cran-registry/Makefile
index def7e0ceaf83..7df2d26174c5 100644
--- a/devel/R-cran-registry/Makefile
+++ b/devel/R-cran-registry/Makefile
@@ -1,15 +1,15 @@
 PORTNAME=	registry
 DISTVERSION=	0.5-1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Registry infrastructure
 WWW=		https://cran.r-project.org/web/packages/registry/
 
 LICENSE=	GPLv2
 
 USES=	cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-rematch2/Makefile b/devel/R-cran-rematch2/Makefile
index bab64cfcc8eb..e3e03c6ce017 100644
--- a/devel/R-cran-rematch2/Makefile
+++ b/devel/R-cran-rematch2/Makefile
@@ -1,19 +1,20 @@
 PORTNAME=	rematch2
 DISTVERSION=	2.1.2
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	ygy@FreeBSD.org
 COMMENT=	Tidy Output from Regular Expression Matching
 WWW=		https://github.com/r-lib/rematch2 #readme
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	R-cran-tibble>0:devel/R-cran-tibble
 TEST_DEPENDS=	R-cran-covr>0:devel/R-cran-covr \
 		R-cran-testthat>0:devel/R-cran-testthat
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-remotes/Makefile b/devel/R-cran-remotes/Makefile
index 562f8da76c8d..c26f5aa21758 100644
--- a/devel/R-cran-remotes/Makefile
+++ b/devel/R-cran-remotes/Makefile
@@ -1,29 +1,30 @@
 PORTNAME=	remotes
 DISTVERSION=	2.4.2
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	ygy@FreeBSD.org
 COMMENT=	R Package Installation from Remote Repositories, Including 'GitHub'
 WWW=		https://remotes.r-lib.org
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	R-cran-knitr>0:print/R-cran-knitr
 TEST_DEPENDS=	R-cran-callr>0:devel/R-cran-callr \
 		R-cran-covr>0:devel/R-cran-covr \
 		R-cran-git2r>=0.23.0:devel/R-cran-git2r \
 		R-cran-mockery>0:devel/R-cran-mockery \
 		R-cran-pkgbuild>=1.0.1:devel/R-cran-pkgbuild \
 		R-cran-rprojroot>0:devel/R-cran-rprojroot \
 		R-cran-testthat>0:devel/R-cran-testthat \
 		R-cran-withr>0:devel/R-cran-withr \
 		R-cran-curl>0:ftp/R-cran-curl \
 		R-cran-knitr>0:print/R-cran-knitr \
 		R-cran-brew>0:textproc/R-cran-brew \
 		R-cran-rmarkdown>0:textproc/R-cran-rmarkdown
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-repr/Makefile b/devel/R-cran-repr/Makefile
index 4e956892d830..8d9b96a1fcab 100644
--- a/devel/R-cran-repr/Makefile
+++ b/devel/R-cran-repr/Makefile
@@ -1,21 +1,22 @@
 PORTNAME=	repr
 PORTVERSION=	1.1.4
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Serializable Reprensentations
 WWW=		https://cran.r-project.org/web/packages/repr/
 
 LICENSE=	GPLv3
 
 CRAN_DEPENDS=	R-cran-htmltools>0:textproc/R-cran-htmltools \
 		R-cran-jsonlite>0:converters/R-cran-jsonlite \
 		R-cran-pillar>=1.4.0:devel/R-cran-pillar \
 		R-cran-base64enc>0:converters/R-cran-base64enc
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-reshape/Makefile b/devel/R-cran-reshape/Makefile
index 019f67948335..8c59c0a56e34 100644
--- a/devel/R-cran-reshape/Makefile
+++ b/devel/R-cran-reshape/Makefile
@@ -1,18 +1,19 @@
 PORTNAME=	reshape
 PORTVERSION=	0.8.9
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	R package for flexibly restructuring and aggregating data
 WWW=		http://had.co.nz/reshape/
 
 LICENSE=	MIT
 
 CRAN_DEPENDS=	R-cran-plyr>0:devel/R-cran-plyr
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=	cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-reshape2/Makefile b/devel/R-cran-reshape2/Makefile
index ae4135d929d0..7a331097d8c2 100644
--- a/devel/R-cran-reshape2/Makefile
+++ b/devel/R-cran-reshape2/Makefile
@@ -1,19 +1,19 @@
 PORTNAME=	reshape2
 PORTVERSION=	1.4.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Flexibly reshape data: a reboot of the reshape package
 WWW=		https://cran.r-project.org/web/packages/reshape2/
 
 LICENSE=	MIT
 
 RUN_DEPENDS=	R-cran-plyr>=1.8.1:devel/R-cran-plyr \
 		R-cran-Rcpp>0:devel/R-cran-Rcpp \
 		R-cran-stringr>0:textproc/R-cran-stringr
 
 USES=	cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-rgexf/Makefile b/devel/R-cran-rgexf/Makefile
index 92b56150f194..548f8446e2d7 100644
--- a/devel/R-cran-rgexf/Makefile
+++ b/devel/R-cran-rgexf/Makefile
@@ -1,20 +1,21 @@
 PORTNAME=	rgexf
 PORTVERSION=	0.16.2
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Build, Import and Export GEXF Graph Files
 WWW=		https://cran.r-project.org/web/packages/rgexf/
 
 LICENSE=	MIT
 
 CRAN_DEPENDS=	R-cran-XML>0:textproc/R-cran-XML \
 		R-cran-igraph>0:math/R-cran-igraph \
 		R-cran-servr>0:www/R-cran-servr
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-rlang/Makefile b/devel/R-cran-rlang/Makefile
index 22c91b9899a2..e5d11f75b16f 100644
--- a/devel/R-cran-rlang/Makefile
+++ b/devel/R-cran-rlang/Makefile
@@ -1,14 +1,15 @@
 PORTNAME=	rlang
 PORTVERSION=	1.1.0
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Functions for Base Types and Core R and 'Tidyverse' Features
 WWW=		https://cran.r-project.org/web/packages/rlang/
 
 LICENSE=	MIT
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-rngtools/Makefile b/devel/R-cran-rngtools/Makefile
index c1ef85de2850..e091eb76a34b 100644
--- a/devel/R-cran-rngtools/Makefile
+++ b/devel/R-cran-rngtools/Makefile
@@ -1,18 +1,19 @@
 PORTNAME=	rngtools
 PORTVERSION=	1.5.2
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Utility functions for working with Random Number Generators
 WWW=		https://cran.r-project.org/web/packages/rngtools/
 
 LICENSE=	GPLv3
 
 CRAN_DEPENDS=	R-cran-digest>0:security/R-cran-digest
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=	cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-roxygen2/Makefile b/devel/R-cran-roxygen2/Makefile
index efac0f317021..7584c30e224f 100644
--- a/devel/R-cran-roxygen2/Makefile
+++ b/devel/R-cran-roxygen2/Makefile
@@ -1,30 +1,31 @@
 PORTNAME=	roxygen2
 DISTVERSION=	7.1.1
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	jpbeconne@free.fr
 COMMENT=	In-Line Documentation for R
 WWW=		https://roxygen2.r-lib.org
 
 LICENSE=	MIT
 
 CRAN_DEPENDS=	R-cran-brew>0:textproc/R-cran-brew \
 		R-cran-commonmark>0:textproc/R-cran-commonmark \
 		R-cran-desc>=1.2.0:devel/R-cran-desc \
 		R-cran-digest>0:security/R-cran-digest \
 		R-cran-knitr>0:print/R-cran-knitr \
 		R-cran-pkgload>=1.0.2:devel/R-cran-pkgload \
 		R-cran-purrr>=0.3.3:devel/R-cran-purrr \
 		R-cran-R6>=2.1.2:devel/R-cran-R6 \
 		R-cran-Rcpp>=0.11.0:devel/R-cran-Rcpp \
 		R-cran-rlang>0:devel/R-cran-rlang \
 		R-cran-stringi>0:textproc/R-cran-stringi \
 		R-cran-stringr>=1.0.0:textproc/R-cran-stringr \
 		R-cran-xml2>0:textproc/R-cran-xml2
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-rprojroot/Makefile b/devel/R-cran-rprojroot/Makefile
index 2bb0525a5918..1a566bd49098 100644
--- a/devel/R-cran-rprojroot/Makefile
+++ b/devel/R-cran-rprojroot/Makefile
@@ -1,14 +1,15 @@
 PORTNAME=	rprojroot
 DISTVERSION=	2.0.3
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Finding Files in Project Subdirectories
 WWW=		https://cran.r-project.org/web/packages/rprojroot/
 
 LICENSE=	MIT
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-rstudioapi/Makefile b/devel/R-cran-rstudioapi/Makefile
index 81a803ee3b08..7280a3d2ccb9 100644
--- a/devel/R-cran-rstudioapi/Makefile
+++ b/devel/R-cran-rstudioapi/Makefile
@@ -1,14 +1,15 @@
 PORTNAME=	rstudioapi
 PORTVERSION=	0.14
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Safely Access the RStudio API
 WWW=		https://cran.r-project.org/web/packages/rstudioapi/
 
 LICENSE=	MIT
 
 USES=	cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-rversions/Makefile b/devel/R-cran-rversions/Makefile
index 8ab163d27075..53b7e797a941 100644
--- a/devel/R-cran-rversions/Makefile
+++ b/devel/R-cran-rversions/Makefile
@@ -1,21 +1,22 @@
 PORTNAME=	rversions
 DISTVERSION=	2.1.2
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	ygy@FreeBSD.org
 COMMENT=	Query 'R' Versions, Including 'r-release' and 'r-oldrel'
 WWW=		https://github.com/r-hub/rversions
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	R-cran-curl>0:ftp/R-cran-curl \
 		R-cran-xml2>=1.0.0:textproc/R-cran-xml2
 TEST_DEPENDS=	R-cran-covr>0:devel/R-cran-covr \
 		R-cran-mockery>0:devel/R-cran-mockery \
 		R-cran-testthat>0:devel/R-cran-testthat
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-sessioninfo/Makefile b/devel/R-cran-sessioninfo/Makefile
index c653d6949a78..2978e47e4757 100644
--- a/devel/R-cran-sessioninfo/Makefile
+++ b/devel/R-cran-sessioninfo/Makefile
@@ -1,22 +1,23 @@
 PORTNAME=	sessioninfo
 DISTVERSION=	1.2.2
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	ygy@FreeBSD.org
 COMMENT=	R Session Information
 WWW=		https://github.com/r-lib/sessioninfo #readme
 
 LICENSE=	GPLv2
 
 RUN_DEPENDS=	R-cran-cli>=3.1.0:devel/R-cran-cli
 TEST_DEPENDS=	R-cran-callr>0:devel/R-cran-callr \
 		R-cran-covr>0:devel/R-cran-covr \
 		R-cran-mockery>0:devel/R-cran-mockery \
 		R-cran-testthat>0:devel/R-cran-testthat \
 		R-cran-withr>0:devel/R-cran-withr \
 		R-cran-rmarkdown>0:textproc/R-cran-rmarkdown
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-sfsmisc/Makefile b/devel/R-cran-sfsmisc/Makefile
index ea9e8f94c2ee..45d3d628d440 100644
--- a/devel/R-cran-sfsmisc/Makefile
+++ b/devel/R-cran-sfsmisc/Makefile
@@ -1,14 +1,15 @@
 PORTNAME=	sfsmisc
 DISTVERSION=	1.1-13
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Utilities from 'Seminar fuer Statistik' ETH Zurich
 WWW=		https://cran.r-project.org/web/packages/sfsmisc/
 
 LICENSE=	GPLv2+
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-sourcetools/Makefile b/devel/R-cran-sourcetools/Makefile
index 633250d301ce..4633504f600a 100644
--- a/devel/R-cran-sourcetools/Makefile
+++ b/devel/R-cran-sourcetools/Makefile
@@ -1,15 +1,15 @@
 PORTNAME=	sourcetools
 PORTVERSION=	0.1.7
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Tools for the Reading and Tokenization of R Code
 WWW=		https://cran.r-project.org/web/packages/sourcetools/
 
 LICENSE=	MIT
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-sys/Makefile b/devel/R-cran-sys/Makefile
index 4aa06bda7bff..472832763d63 100644
--- a/devel/R-cran-sys/Makefile
+++ b/devel/R-cran-sys/Makefile
@@ -1,14 +1,15 @@
 PORTNAME=	sys
 PORTVERSION=	3.4
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Powerful and Reliable Tools for Running System Commands in R
 WWW=		https://cran.r-project.org/web/packages/sys/
 
 LICENSE=	MIT
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-testthat/Makefile b/devel/R-cran-testthat/Makefile
index 80caa5ede8e8..38334eeeabc3 100644
--- a/devel/R-cran-testthat/Makefile
+++ b/devel/R-cran-testthat/Makefile
@@ -1,43 +1,44 @@
 PORTNAME=	testthat
 DISTVERSION=	3.1.7
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	ygy@FreeBSD.org
 COMMENT=	Unit Testing for R
 WWW=		https://testthat.r-lib.org
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	R-cran-knitr>0:print/R-cran-knitr
 RUN_DEPENDS=	R-cran-jsonlite>0:converters/R-cran-jsonlite \
 		R-cran-R6>=2.2.0:devel/R-cran-R6 \
 		R-cran-brio>0:devel/R-cran-brio \
 		R-cran-callr>=3.5.1:devel/R-cran-callr \
 		R-cran-cli>=3.4.0:devel/R-cran-cli \
 		R-cran-desc>0:devel/R-cran-desc \
 		R-cran-ellipsis>=0.2.0:devel/R-cran-ellipsis \
 		R-cran-evaluate>0:devel/R-cran-evaluate \
 		R-cran-lifecycle>0:devel/R-cran-lifecycle \
 		R-cran-magrittr>0:devel/R-cran-magrittr \
 		R-cran-pkgload>0:devel/R-cran-pkgload \
 		R-cran-praise>0:devel/R-cran-praise \
 		R-cran-rlang>=1.0.1:devel/R-cran-rlang \
 		R-cran-waldo>=0.4.0:devel/R-cran-waldo \
 		R-cran-withr>=2.4.3:devel/R-cran-withr \
 		R-cran-digest>0:security/R-cran-digest \
 		R-cran-processx>0:sysutils/R-cran-processx \
 		R-cran-ps>=1.3.4:sysutils/R-cran-ps
 TEST_DEPENDS=	R-cran-covr>0:devel/R-cran-covr \
 		R-cran-mockery>0:devel/R-cran-mockery \
 		R-cran-rstudioapi>0:devel/R-cran-rstudioapi \
 		R-cran-usethis>0:devel/R-cran-usethis \
 		R-cran-curl>=0.9.5:ftp/R-cran-curl \
 		R-cran-knitr>0:print/R-cran-knitr \
 		R-cran-rmarkdown>0:textproc/R-cran-rmarkdown \
 		R-cran-shiny>0:www/R-cran-shiny
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-tibble/Makefile b/devel/R-cran-tibble/Makefile
index 6af366552625..7f7d52b8604b 100644
--- a/devel/R-cran-tibble/Makefile
+++ b/devel/R-cran-tibble/Makefile
@@ -1,24 +1,25 @@
 PORTNAME=	tibble
 PORTVERSION=	3.2.1
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Simple Data Frames
 WWW=		https://cran.r-project.org/web/packages/tibble/
 
 LICENSE=	MIT
 
 CRAN_DEPENDS=	R-cran-fansi>=0.4.0:devel/R-cran-fansi \
 		R-cran-lifecycle>=1.0.0:devel/R-cran-lifecycle \
 		R-cran-magrittr>0:devel/R-cran-magrittr \
 		R-cran-pillar>=1.7.0:devel/R-cran-pillar \
 		R-cran-pkgconfig>0:devel/R-cran-pkgconfig \
 		R-cran-rlang>=1.0.2:devel/R-cran-rlang \
 		R-cran-vctrs>=0.3.8:devel/R-cran-vctrs
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-tidyr/Makefile b/devel/R-cran-tidyr/Makefile
index a9346f0c4e0b..cb6ec1a3ed8b 100644
--- a/devel/R-cran-tidyr/Makefile
+++ b/devel/R-cran-tidyr/Makefile
@@ -1,28 +1,29 @@
 PORTNAME=	tidyr
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Easily tidy data with spread and gather functions
 WWW=		https://cran.r-project.org/web/packages/tidyr/
 
 LICENSE=	MIT
 
 CRAN_DEPENDS=	R-cran-dplyr>=1.0.0:math/R-cran-dplyr \
 		R-cran-ellipsis>=0.1.0:devel/R-cran-ellipsis \
 		R-cran-glue>0:devel/R-cran-glue \
 		R-cran-lifecycle>0:devel/R-cran-lifecycle \
 		R-cran-magrittr>0:devel/R-cran-magrittr \
 		R-cran-purrr>0:devel/R-cran-purrr \
 		R-cran-rlang>0:devel/R-cran-rlang \
 		R-cran-tibble>=2.1.1:devel/R-cran-tibble \
 		R-cran-tidyselect>=1.1.0:devel/R-cran-tidyselect \
 		R-cran-vctrs>=0.3.7:devel/R-cran-vctrs \
 		R-cran-cpp11>=0.4.0:devel/R-cran-cpp11
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=	compiler:c++11-lang cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-tidyselect/Makefile b/devel/R-cran-tidyselect/Makefile
index 3a466b801d94..5fd7a959bb3f 100644
--- a/devel/R-cran-tidyselect/Makefile
+++ b/devel/R-cran-tidyselect/Makefile
@@ -1,23 +1,24 @@
 PORTNAME=	tidyselect
 PORTVERSION=	1.2.0
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Select from a Set of Strings
 WWW=		https://cran.r-project.org/web/packages/tidyselect/
 
 LICENSE=	MIT
 
 CRAN_DEPENDS=	R-cran-ellipsis>0:devel/R-cran-ellipsis \
 		R-cran-glue>=1.3.0:devel/R-cran-glue \
 		R-cran-purrr>=0.3.2:devel/R-cran-purrr \
 		R-cran-rlang>=1.0.1:devel/R-cran-rlang \
 		R-cran-vctrs>=0.3.0:devel/R-cran-vctrs \
 		R-cran-withr>=0:devel/R-cran-withr
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-tinytest/Makefile b/devel/R-cran-tinytest/Makefile
index ca85da71a981..fbe68116f955 100644
--- a/devel/R-cran-tinytest/Makefile
+++ b/devel/R-cran-tinytest/Makefile
@@ -1,14 +1,15 @@
 PORTNAME=	tinytest
 DISTVERSION=	1.4.1
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	ygy@FreeBSD.org
 COMMENT=	Lightweight and Feature Complete Unit Testing Framework
 WWW=		https://github.com/markvanderloo/tinytest
 
 LICENSE=	GPLv3
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-tzdb/Makefile b/devel/R-cran-tzdb/Makefile
index 0fc83a9850dd..98afde90aecd 100644
--- a/devel/R-cran-tzdb/Makefile
+++ b/devel/R-cran-tzdb/Makefile
@@ -1,19 +1,20 @@
 PORTNAME=	tzdb
 PORTVERSION=	0.3.0
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Time Zone Database Information
 WWW=		https://cran.r-project.org/web/packages/tzdb/
 
 LICENSE=	MIT
 
 CRAN_DEPENDS=	R-cran-cpp11>=0.4.2:devel/R-cran-cpp11
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		compiler:c++11-lang cran:auto-plist,compiles shebangfix
 SHEBANG_FILES=	inst/tzdata/zoneinfo2tdf.pl
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-usethis/Makefile b/devel/R-cran-usethis/Makefile
index 90c1dd511b64..9be487117567 100644
--- a/devel/R-cran-usethis/Makefile
+++ b/devel/R-cran-usethis/Makefile
@@ -1,36 +1,37 @@
 PORTNAME=	usethis
 DISTVERSION=	2.0.1
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	jpbeconne@free.fr
 COMMENT=	Automate Package and Project Setup
 WWW=		https://CRAN.R-project.org/package=usethis
 
 LICENSE=	GPLv3
 
 CRAN_DEPENDS=	R-cran-clipr>=0.3.0:devel/R-cran-clipr \
 		R-cran-clisymbols>0:devel/R-cran-clisymbols \
 		R-cran-crayon>0:devel/R-cran-crayon \
 		R-cran-curl>=2.7:ftp/R-cran-curl \
 		R-cran-desc>=1.2.0:devel/R-cran-desc \
 		R-cran-fs>=1.3.0:sysutils/R-cran-fs \
 		R-cran-gert>=1.0.2:devel/R-cran-gert \
 		R-cran-gh>=1.2.0:www/R-cran-gh \
 		R-cran-glue>=1.3.0:devel/R-cran-glue \
 		R-cran-jsonlite>0:converters/R-cran-jsonlite \
 		R-cran-lifecycle>0:devel/R-cran-lifecycle \
 		R-cran-purrr>0:devel/R-cran-purrr \
 		R-cran-rappdirs>=0.3.3:devel/R-cran-rappdirs \
 		R-cran-rlang>0.4.10:devel/R-cran-rlang \
 		R-cran-rprojroot>=1.2:devel/R-cran-rprojroot \
 		R-cran-rstudioapi>0:devel/R-cran-rstudioapi \
 		R-cran-whisker>0:devel/R-cran-whisker \
 		R-cran-withr>=2.3.0:devel/R-cran-withr \
 		R-cran-yaml>0:textproc/R-cran-yaml
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-uuid/Makefile b/devel/R-cran-uuid/Makefile
index 4fdc82866fa8..1843056c83b2 100644
--- a/devel/R-cran-uuid/Makefile
+++ b/devel/R-cran-uuid/Makefile
@@ -1,15 +1,16 @@
 PORTNAME=	uuid
 DISTVERSION=	1.1-0
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	ygy@FreeBSD.org
 COMMENT=	Tools for Generating and Handling of UUIDs
 WWW=		https://www.rforge.net/uuid
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-vcd/Makefile b/devel/R-cran-vcd/Makefile
index de03e425af96..3506e4cde1bd 100644
--- a/devel/R-cran-vcd/Makefile
+++ b/devel/R-cran-vcd/Makefile
@@ -1,17 +1,18 @@
 PORTNAME=	vcd
 DISTVERSION=	1.4-10
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Visualization techniques, data sets for categorical data
 WWW=		https://cran.r-project.org/package=vcd
 
 LICENSE=	GPLv2
 
 RUN_DEPENDS=	R-cran-colorspace>0:graphics/R-cran-colorspace \
 		R-cran-lmtest>0:finance/R-cran-lmtest
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-vctrs/Makefile b/devel/R-cran-vctrs/Makefile
index 96d4fcbd5124..ab2d5459261a 100644
--- a/devel/R-cran-vctrs/Makefile
+++ b/devel/R-cran-vctrs/Makefile
@@ -1,21 +1,22 @@
 PORTNAME=	vctrs
 PORTVERSION=	0.6.1
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Vector Helpers
 WWW=		https://cran.r-project.org/web/packages/vctrs/
 
 LICENSE=	MIT
 
 CRAN_DEPENDS=	R-cran-cli>=3.4.0:devel/R-cran-cli \
 		R-cran-glue>0:devel/R-cran-glue \
 		R-cran-rlang>=1.0.6:devel/R-cran-rlang \
 		R-cran-lifecycle>=1.0.3:devel/R-cran-lifecycle
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		compiler:c++11-lang cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-waldo/Makefile b/devel/R-cran-waldo/Makefile
index aa0a41e8a95b..078b7a89b640 100644
--- a/devel/R-cran-waldo/Makefile
+++ b/devel/R-cran-waldo/Makefile
@@ -1,31 +1,32 @@
 PORTNAME=	waldo
 DISTVERSION=	0.4.0
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	ygy@FreeBSD.org
 COMMENT=	Find Differences Between R Objects
 WWW=		https://waldo.r-lib.org
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	R-cran-cli>0:devel/R-cran-cli \
 		R-cran-diffobj>=0.3.4:devel/R-cran-diffobj \
 		R-cran-fansi>0:devel/R-cran-fansi \
 		R-cran-glue>0:devel/R-cran-glue \
 		R-cran-rematch2>0:devel/R-cran-rematch2 \
 		R-cran-rlang>=1.0.0:devel/R-cran-rlang \
 		R-cran-tibble>0:devel/R-cran-tibble
 TEST_DEPENDS=	R-cran-R6>0:devel/R-cran-R6 \
 		R-cran-covr>0:devel/R-cran-covr \
 		R-cran-testthat>=3.0.0:devel/R-cran-testthat \
 		R-cran-withr>0:devel/R-cran-withr \
 		R-cran-xml2>0:textproc/R-cran-xml2
 
 USES=		cran:auto-plist
 
 post-install:
 	@${ECHO_CMD} "@dir ${R_MOD_DIR}/help/figures" >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-whisker/Makefile b/devel/R-cran-whisker/Makefile
index 78e0ec9286dd..b7bbc420137a 100644
--- a/devel/R-cran-whisker/Makefile
+++ b/devel/R-cran-whisker/Makefile
@@ -1,16 +1,17 @@
 PORTNAME=	whisker
 DISTVERSION=	0.4.1
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	ygy@FreeBSD.org
 COMMENT=	{{mustache}} for R, Logicless Templating
 WWW=		https://github.com/edwindj/whisker
 
 LICENSE=	GPLv3
 
 TEST_DEPENDS=	R-cran-markdown>0:textproc/R-cran-markdown
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-withr/Makefile b/devel/R-cran-withr/Makefile
index 003ddbdcf64c..e7ecff8510a7 100644
--- a/devel/R-cran-withr/Makefile
+++ b/devel/R-cran-withr/Makefile
@@ -1,14 +1,15 @@
 PORTNAME=	withr
 PORTVERSION=	2.5.0
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Run Code 'With' Temporarily Modified Global State
 WWW=		https://cran.r-project.org/web/packages/withr/
 
 LICENSE=	MIT
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/devel/R-cran-zeallot/Makefile b/devel/R-cran-zeallot/Makefile
index 111463a0b066..cadddf0b9303 100644
--- a/devel/R-cran-zeallot/Makefile
+++ b/devel/R-cran-zeallot/Makefile
@@ -1,15 +1,15 @@
 PORTNAME=	zeallot
 PORTVERSION=	0.1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Multiple, Unpacking, and Destructuring Assignment
 WWW=		https://cran.r-project.org/web/packages/zeallot/
 
 LICENSE=	MIT
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/devel/RStudio/Makefile b/devel/RStudio/Makefile
index c0aa09713361..71d77e336ff6 100644
--- a/devel/RStudio/Makefile
+++ b/devel/RStudio/Makefile
@@ -1,154 +1,155 @@
 # This port opens too many files during build, more than the default setting.
 # Its build is known to succeed with MAX_FILES_RStudio=4096 in poudriere.conf
 
 PORTNAME=	RStudio
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2022.12.0+353
+PORTREVISION=	2
 CATEGORIES=	devel math java
 MASTER_SITES=	https://s3.amazonaws.com/rstudio-buildtools/dictionaries/:dictionaries \
 		https://s3.amazonaws.com/rstudio-buildtools/:buildtools
 DISTFILES=	core-dictionaries.zip:dictionaries \
 		gin-${GIN_VERSION}.zip:buildtools \
 		gwt-${GWT_VERSION}.zip:buildtools \
 		mathjax-27.zip:buildtools
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Integrated development environment (IDE) for R
 WWW=		https://rstudio.com/
 
 LICENSE=	AGPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BROKEN_i386=	[ERROR] Line 101: Failed to resolve 'org.rstudio.studio.client.workbench.views.vcs.common.diff.LineActionButtonRenderer.GrayResources' via deferred binding
 
 BUILD_DEPENDS=	ant:devel/apache-ant \
 		${LOCALBASE}/include/sys/sysinfo.h:devel/libsysinfo \
 		node:www/node \
 		pandoc:textproc/hs-pandoc \
 		R-cran-rstudioapi>0:devel/R-cran-rstudioapi
 LIB_DEPENDS=	libR.so:math/R \
 		libboost_thread.so:devel/boost-libs \
 		libinotify.so:devel/libinotify \
 		libsoci_core.so:databases/soci \
 		libuuid.so:misc/e2fsprogs-libuuid \
 		libyaml-cpp.so:devel/yaml-cpp
 
 FLAVORS=	desktop server
 FLAVOR?=	${FLAVORS:[1]}
 server_PKGNAMESUFFIX=	-server
 
 USES=		cmake fortran localbase:ldflags pgsql pkgconfig sqlite ssl
 USE_JAVA=	yes
 JAVA_VERSION=	11 # Java 8 fails on aarch64: Internal Error (assembler_aarch64.hpp:237), pid=1644, tid=0x00000000000c62b6 guarantee(val < (1U << nbits)) failed: Field too big for insn
 JAVA_BUILD=	yes
 
 USE_GITHUB=	yes
 GH_PROJECT=	${PORTNAME:tl}
 GH_TUPLE=	rstudio:r2d3:v0.2.0:r2d3/dependencies/common/r2d3 \
 		rstudio:rmarkdown:aed26ac:rmarkdown/dependencies/common/rmarkdown \
 		rstudio:rsconnect:03c379b:rsconnect/dependencies/common/rsconnect \
 		trestletech:plumber:v0.4.6:plumber/dependencies/common/plumber
 
 CMAKE_ARGS=	-DFREEBSD_RSTUDIO_VERSION:STRING=${PORTVERSION} \
 		-DFREEBSD_LIBDIR:STRING=${PREFIX}/lib
 CMAKE_ARGS+=	-DQT_QMAKE_EXECUTABLE:STRING=${QMAKE}
 CMAKE_ARGS+=	-DRSTUDIO_BOOST_SIGNALS_VERSION=2
 CMAKE_ARGS+=	-DFREEBSD_PORT_VERSION:STRING=${DISTVERSION}
 CMAKE_ARGS+=	-DFREEBSD_LOCALBASE:STRING=${LOCALBASE} # SOCI package is looked up here, see patch patch-src_cpp_CMakeLists.txt
 CMAKE_ON=	RSTUDIO_USE_SYSTEM_YAML_CPP \
 		RSTUDIO_USE_SYSTEM_SOCI
 MAKE_ENV=	HOME=${WRKDIR} \
 		JAVA_HOME=${JAVA_HOME} \
 		PATH=${JAVA_HOME}/bin:${PATH} \
 		ANT_OPTS="-Duser.home=${WRKDIR}"
 LDFLAGS+=	-lexecinfo
 
 GWT_VERSION=	2.8.1
 GIN_VERSION=	2.1.2
 
 .if ${FLAVOR:U} == desktop
 COMMENT+=	(desktop UI version)
 USES+=		desktop-file-utils qt:5 shared-mime-info
 USE_QT=		core dbus declarative gui location network opengl printsupport quickcontrols sensors \
 		sql svg webchannel webengine webkit widgets xml xmlpatterns buildtools:build qmake:build
 CMAKE_ARGS+=	-DRSTUDIO_TARGET=Desktop
 INSTALL_SUBDIR=	${PORTNAME:tl}
 EXECUTABLE=	${PORTNAME:tl}
 .endif
 
 .if ${FLAVOR:U} == server
 COMMENT+=	(web UI version)
 CMAKE_ARGS+=	-DRSTUDIO_TARGET=Server
 LDFLAGS+=	-linotify
 INSTALL_SUBDIR=	${PORTNAME:tl}-server
 EXECUTABLE=	rserver
 USER=		nobody
 SUB_LIST=	USER=${USER}
 USE_RC_SUBR=	${PORTNAME:tl}-server
 .endif
 
 OPTIONS_DEFINE=		WITH_QUARTO
 
 WITH_QUARTO_DESC=	Build with support for Quarto
 WITH_QUARTO_CMAKE_BOOL=	FREEBSD_QUARTO_ENABLED
 WITH_QUARTO_BROKEN=	Quarto isn't yet ported
 
 post-extract:
 	@${MKDIR} ${WRKSRC}/dependencies/dictionaries && ${MV} ${WRKDIR}/en_* ${WRKSRC}/dependencies/dictionaries/
 	@${MV} ${WRKDIR}/mathjax-* ${WRKSRC}/dependencies/
 	@${MKDIR} ${WRKSRC}/src/gwt/lib/gwt && ${MV} ${WRKDIR}/gwt-${GWT_VERSION} ${WRKSRC}/src/gwt/lib/gwt/${GWT_VERSION}
 	@${MKDIR} ${WRKSRC}/src/gwt/lib/gin/${GIN_VERSION} && ${MV} ${WRKDIR}/*.jar ${WRKSRC}/src/gwt/lib/gin/${GIN_VERSION}/
 
 post-patch:
 	@${REINPLACE_CMD} -e ' \
 		s|target_link_libraries(rstudio|target_link_libraries(rstudio procstat|; \
 		s|get_filename_component|#get_filename_component|; \
 		s|set(CMAKE_PREFIX_PATH "$${QT_BIN_DIR}//..//lib//cmake")|set(CMAKE_PREFIX_PATH "${LOCALBASE}/lib/cmake")|; \
 		s|/usr/share/|${PREFIX}/share/|g' \
 		${WRKSRC}/src/cpp/desktop/CMakeLists.txt
 	@${REINPLACE_CMD} -e ' \
 		s|</java>|<jvmarg value="-Duser.home=${WRKDIR}"/></java>|' \
 		${WRKSRC}/src/gwt/build.xml
 	@${REINPLACE_CMD} -e ' \
 		s|rHomePaths.push_back|//rHomePaths.push_back|; \
 		s|//rHomePaths.push_back(FilePath("/usr/local/lib/|rHomePaths.push_back(FilePath("${PREFIX}/lib/|' \
 		${WRKSRC}/src/cpp/core/r_util/RVersionsPosix.cpp
 	@${REINPLACE_CMD} -e ' \
 		s|<condition property="node.bin" value="../../../$${node.dir}/bin/node">|<condition property="node.bin" value="${LOCALBASE}/bin/node">|' \
 		${WRKSRC}/src/gwt/build.xml
 
 pre-build:
 	@${CP} ${FILESDIR}/global-setenv.h ${WRKSRC}/src/cpp/desktop/
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/src/cpp/desktop/global-setenv.h
 
 post-install:
 	@(echo "#!/bin/sh"; \
 	  echo ""; \
 	  echo "if ! [ -d /proc/curproc ]; then"; \
 	  echo "  echo \"${PORTNAME} needs /proc to be mounted as procfs\" >&2"; \
 	  echo "  exit 1"; \
 	  echo "fi"; \
 	  echo ""; \
 	  echo "# workaround for the problem that RStudio passes /lib with LD_LIBRARY_PATH that causes the /lib/libgcc_s.so.1 conflict with gcc"; \
 	  echo "LD_PRELOAD=${PREFIX}/lib/gcc${GCC_DEFAULT}/libgcc_s.so JAVA_HOME=${JAVA_HOME} ${PREFIX}/lib/${INSTALL_SUBDIR}/bin/${EXECUTABLE} \"$$"@"\"" \
 	) > ${STAGEDIR}${PREFIX}/bin/${EXECUTABLE}
 	@${CHMOD} +x ${STAGEDIR}${PREFIX}/bin/${EXECUTABLE}
 .if ${FLAVOR:U} == desktop
 	${REINPLACE_CMD} -i '' -e 's|^Exec=.*/rstudio|Exec=${PREFIX}/bin/${EXECUTABLE}|' ${STAGEDIR}${PREFIX}/share/applications/${EXECUTABLE}.desktop
 .endif
 .if ${FLAVOR:U} == server
 	${RM} ${STAGEDIR}${LOCALBASE}/lib/${INSTALL_SUBDIR}/bin/rstudio-server # not compatible with FreeBSD
 .endif
 	# Some functions expect the pandoc symlink.
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/${INSTALL_SUBDIR}/bin/pandoc
 	@cd ${STAGEDIR}${PREFIX}/lib/${INSTALL_SUBDIR}/bin/pandoc && ${LN} -s ../../../../bin/pandoc
 	# Add $LOCALBASE/bin to PATH to allow RStudio-server to run gmake (R_HOME/etc/Renviron.site is installed, see https://stat.ethz.ch/R-manual/R-devel/library/base/html/Startup.html)
 .if ${FLAVOR:U} == server
 	#@${MKDIR} ${STAGEDIR}${LOCALBASE}/lib/R/etc
 	#@${ECHO} "PATH=\"${LOCALBASE}/bin:\$$PATH\"" > ${STAGEDIR}${LOCALBASE}/lib/R/etc/Renviron.site # it should be this way, but this fails: https://github.com/rstudio/rstudio/issues/9815
 	@${LN} -s ${LOCALBASE}/bin/${GMAKE} ${STAGEDIR}${PREFIX}/lib/rstudio-server/bin/postback/${GMAKE} # hack, should be as above, but at least gmake is in the path now
 .endif
 	# There is a variability in .js file names due to use of random numbers, so we use the automatic plist.
 	@${SETENV} ${CO_ENV} ${SH} ${SCRIPTSDIR}/check-stagedir.sh makeplist | ${GREP} -v ^\/ | ${SED} -e 's|%%WWWDIR%%|www/rstudio| ; s|%%CMAKE_BUILD_TYPE%%|${CMAKE_BUILD_TYPE:tl}|' > ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/devel/aarch64-none-elf-gcc/Makefile b/devel/aarch64-none-elf-gcc/Makefile
index f9fd323743f1..7e5308d703e3 100644
--- a/devel/aarch64-none-elf-gcc/Makefile
+++ b/devel/aarch64-none-elf-gcc/Makefile
@@ -1,94 +1,95 @@
 PORTNAME=	gcc
 PORTVERSION?=	11.3.0
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	GCC
 PKGNAMEPREFIX?=	aarch64-none-elf-
 
 MAINTAINER=	manu@FreeBSD.org
 COMMENT?=	GNU Compiler Collection for bare metal aarch64 cross-development
 WWW=		https://gcc.gnu.org/
 
 LICENSE=	GPLv3 GPLv3RLE
 LICENSE_COMB=	multi
 
 BROKEN_mips=		configure: error: cannot compute suffix of object files: cannot compile
 BROKEN_mips64=		configure: error: cannot compute suffix of object files: cannot compile
 
 LIB_DEPENDS=	libgmp.so:math/gmp \
 		libmpfr.so:math/mpfr \
 		libmpc.so:math/mpc
 BUILD_DEPENDS=	${GCC_TARGET}-as:devel/binutils@${PKGNAMEPREFIX:C/-$//:C/-/_/g} \
 		objdump:devel/binutils@native
 RUN_DEPENDS=	${GCC_TARGET}-as:devel/binutils@${PKGNAMEPREFIX:C/-$//:C/-/_/g}
 
 USES=		cpe gmake iconv libtool tar:xz makeinfo compiler:c++11-lang
 CPE_VENDOR=	gnu
 
 PLIST_SUB+=	TARGETARCH=${PKGNAMEPREFIX:C/-//g} \
 		OPSYS=${OPSYS:tl} \
 		GCC_TARGET=${GCC_TARGET} \
 		GCC_VERSION=${PORTVERSION}
 
 TARGETARCH=	${PKGNAMEPREFIX:C/-//g}
 
 GCC_TARGET?=	aarch64-none-elf
 
 GNU_CONFIGURE=	yes
 CONFIGURE_OUTSOURCE=	yes
 CONFIGURE_ARGS+=--target=${GCC_TARGET} --disable-nls --enable-languages=c,c++ \
 		--enable-gnu-indirect-function \
 		--without-headers \
 		--with-gmp=${LOCALBASE} \
 		--with-pkgversion="FreeBSD Ports Collection for ${PKGNAMEPREFIX:C/-//g}" \
 		--with-system-zlib \
 		--with-gxx-include-dir=/usr/include/c++/v1/ \
 		--with-sysroot="/" \
 		--with-as=${LOCALBASE}/bin/${GCC_TARGET}-as \
 		--with-ld=${LOCALBASE}/bin/${GCC_TARGET}-ld
 
 # U-Boot requires libgcc, crossbuild and install it along with the compiler.
 ALL_TARGET=	all-gcc all-target-libgcc
 INSTALL_TARGET=	install-gcc install-target-libgcc
 
 .include <bsd.port.pre.mk>
 
 post-patch:
 	@${REINPLACE_CMD} -e '/LIBSTDCXX/ s/stdc\+\+/c\+\+/g ' \
 		${WRKSRC}//gcc/cp/g++spec.c
 	@${REINPLACE_CMD} -e '/LOCAL_INCLUDE_DIR/ d ' \
 		${WRKSRC}//gcc/Makefile.in
 
 .if ${ARCH} == "amd64"
 CONFIGURE_TARGET=	x86_64-unknown-${OPSYS:tl}${OSREL}
 .else
 CONFIGURE_TARGET=	${ARCH}-unknown-${OPSYS:tl}${OSREL}
 .endif
 
 # The following is required for clang to bootstrap gcc.
 .if ${COMPILER_TYPE} == clang
 MAKE_ARGS+=	CXXFLAGS=-fbracket-depth=512
 .endif
 
 post-install:
 .for f in cpp gcov gcov-dump gcov-tool
 	@if [ -f ${STAGEDIR}${PREFIX}/bin/$f ] ; then \
 		${MV} ${STAGEDIR}${PREFIX}/bin/$f  \
 		    ${STAGEDIR}${PREFIX}/bin/${GCC_TARGET}-$f ; \
 	fi
 .endfor
 .for f in c++ cpp g++ gcc gcc-ar gcc-nm gcc-ranlib gcov gcov-dump gcov-tool
 	@if [ ! -f ${STAGEDIR}${PREFIX}/man/man1/${GCC_TARGET}-$f.1 ] ; then \
 		if [ -f ${STAGEDIR}${PREFIX}/man/man1/$f.1 ] ; then \
 			${CP} ${STAGEDIR}${PREFIX}/man/man1/$f.1  \
 			    ${STAGEDIR}${PREFIX}/man/man1/${GCC_TARGET}-$f.1 ; \
 		fi \
 	fi
 	@${RM} ${STAGEDIR}${PREFIX}/bin/$f
 	@${RM} ${STAGEDIR}${PREFIX}/man/man1/$f.1
 	@${RM} ${STAGEDIR}${PREFIX}/man/man1/$f.1.gz
 .endfor
 	@${RM} ${STAGEDIR}${PREFIX}/share/info/*
 	@${RM} ${STAGEDIR}${PREFIX}/man/man7/*
 	${RM} -r ${STAGEDIR}/usr/lib/gcc/${GCC_TARGET}/${PORTVERSION}/include-fixed
 
 .include <bsd.port.post.mk>
diff --git a/devel/adacurses/Makefile b/devel/adacurses/Makefile
index 24ac4c5386fc..c609aa7ee004 100644
--- a/devel/adacurses/Makefile
+++ b/devel/adacurses/Makefile
@@ -1,60 +1,61 @@
 PORTNAME=	adacurses
 DISTVERSION=	20211021
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.invisible-island.net/AdaCurses/
 DISTNAME=	AdaCurses-${DISTVERSION}
 
 MAINTAINER=	fluffy@FreeBSD.org
 COMMENT=	Ada95 bindings for ncurses
 WWW=		https://invisible-island.net/ncurses/ncurses-Ada95.html
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/README
 
 #BUILD_DEPENDS=	gsed:textproc/gsed
 #BINARY_ALIAS=	sed=${LOCALBASE}/bin/gsed
 
 USES=		ada autoreconf gmake pkgconfig tar:tgz
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-ada-include=${PREFIX}/include/adacurses \
 		--with-ada-objects=${PREFIX}/lib/adacurses \
 		--with-curses-dir=${NCURSESBASE} \
 		--libdir=${PREFIX}/lib/adacurses \
 		--enable-widec
 PORTDOCS=	ada Ada95.html
 PLIST_SUB=	atic=adacurses/terminal_interface-curses
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${REINPLACE_CMD} -e '/(INSTALL_PROG)/d' -e 's|@ADAGEN_LDFLAGS@||' \
 		${WRKSRC}/gen/Makefile.in
 	@${REINPLACE_CMD} -e '/pragma Linker_Options/d' \
 		${WRKSRC}/gen/terminal_interface-curses.ads.m4 \
 		${WRKSRC}/gen/terminal_interface-curses-menus.ads.m4 \
 		${WRKSRC}/gen/terminal_interface-curses-forms.ads.m4 \
 		${WRKSRC}/gen/terminal_interface-curses-panels.ads.m4
 	@${REINPLACE_CMD} -e 's|@LIBS@|@LIBS@ -lmenu -lform -lpanel|' \
 		${WRKSRC}/samples/Makefile.in
 
 post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/gen/adacurses-config \
 		${STAGEDIR}${PREFIX}/bin/
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/gnat
 	${SED} "s|@PREFIX@|${NCURSESBASE}|g" ${FILESDIR}/adacurses.gpr.in > \
 		${STAGEDIR}${PREFIX}/lib/gnat/adacurses.gpr
 
 do-install-DOCS-on:
 	(cd ${WRKSRC}/doc && ${SETENV} ${MAKE_ENV} \
 		${MAKE_CMD} ${MAKE_ARGS} THIS=${PORTNAME} install.html)
 
 .include <bsd.port.options.mk>
 
 .if ${OPSYS} == "FreeBSD" && ${OSVERSION} >= 1300079
 USES+=		ncurses
 .else
 USES+=		ncurses:port
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/api-sanity-autotest/Makefile b/devel/api-sanity-autotest/Makefile
index 27960690132a..f8af90e00207 100644
--- a/devel/api-sanity-autotest/Makefile
+++ b/devel/api-sanity-autotest/Makefile
@@ -1,69 +1,69 @@
 PORTNAME=	api-sanity-checker
 PORTVERSION=	1.98.4
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	devel perl5
 MASTER_SITES=	LOCAL/bf/${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Quickly generate sanity tests for the API of a C/C++ shared library
 WWW=		https://ispras.linux-foundation.org/index.php/API_Sanity_Autotest
 
 LICENSE=	LGPL20 GPLv2
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${LOCALBASE}/bin/abi-compliance-checker:devel/abi-compliance-checker
 
 USES=		perl5 shebangfix
 SHEBANG_FILES=	${PORTNAME}.pl
 USE_GITHUB=	yes
 GH_ACCOUNT=	lvc
 
 .if defined(MAINTAINER_MODE) || defined(PACKAGE_BUILDING)
 BUILD_DEPENDS=	${LOCALBASE}/bin/abi-compliance-checker:devel/abi-compliance-checker
 .else
 USE_PERL5=	run
 .endif
 USE_GCC=	yes	# same as devel/elfutils
 
 NO_BUILD=	yes
 
 PLIST_FILES=	bin/${PORTNAME}.pl
 PORTDOCS=	Changes.html Descriptor.html Options.html Readme.html \
 		SpecType.html
 
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.options.mk>
 
 CPPFILT?=	/usr/bin/c++filt
 READELF?=	/usr/bin/readelf
 
 .if ${ARCH} == "sparc64"
 PICFLAG?=	-fPIC
 .else
 PICFLAG?=	-fpic
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -E \
 		-e 's/gcc([ \])/${CC}\1/' \
 		-e 's/g\+\+([ \])/${CXX}\1/' \
 		-e 's/ -shared/& ${PICFLAG}/' \
 		-e 's|abi-compliance-checker|${LOCALBASE}/bin/&.pl|' \
 		${WRKSRC}/${PORTNAME}.pl \
 		${WRKSRC}/Makefile.pl \
 		${WRKSRC}/modules/Internals/RegTests.pm
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}.pl ${STAGEDIR}${PREFIX}/bin
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/doc/,} ${STAGEDIR}${DOCSDIR}
 
 # XXX: tests fail: ERROR: can't find GCC>=3.0 in PATH
 do-test:
 	cd ${WRKSRC} && ${PERL} ./${PORTNAME}.pl -test
 
 .include <bsd.port.mk>
diff --git a/devel/arduino-builder/Makefile b/devel/arduino-builder/Makefile
index 49cdbeb56465..3645413b8665 100644
--- a/devel/arduino-builder/Makefile
+++ b/devel/arduino-builder/Makefile
@@ -1,54 +1,54 @@
 PORTNAME=	arduino-builder
 PORTVERSION=	1.3.25
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	devel
 
 MAINTAINER=	kevans@FreeBSD.org
 COMMENT=	Command line tool for building Arduino sketches
 WWW=		https://github.com/arduino/arduino-builder
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 USES=		go
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	arduino
 GH_TUPLE=	go-errors:errors:8fa88b0:goerrors/src/github.com/go-errors/errors \
 		stretchr:testify:v1.1.4:stretchr/src/github.com/stretchr/testify \
 		jstemmer:go-junit-report:6aeed67:jstemmer/src/github.com/jstemmer/go-junit-report
 
 GO_PKGNAME=	arduino.cc
 GO_TARGET=	./arduino-builder
 
 OPTIONS_DEFINE=	TOOLS
 OPTIONS_DEFAULT=TOOLS
 
 TOOLS_DESC=		Add arduino-tools for a standalone build setup
 TOOLS_RUN_DEPENDS=	arduino-tools>=${_COMPAT_VER}:devel/arduino-tools
 TOOLS_PLIST_FILES=	arduino/arduino-builder.options
 
 _COMPAT_VER=	1.6.12
 _IDE_VER=	10612
 
 PLIST_FILES=	arduino/hardware/platform.keys.rewrite.txt \
 		arduino/hardware/platform.txt \
 		bin/${PORTNAME}
 
 # override, upstream expects GOROOT in ${WRKSRC}, not ${WRKDIR}
 post-extract:
 	${LN} -s ${WRKSRC}/src ${WRKDIR}
 
 do-patch-TOOLS-on:
 	${CP} ${FILESDIR}/arduino-builder.options.in ${WRKSRC}/arduino-builder.options
 	${REINPLACE_CMD} -e 's|%%IDEVER%%|${_IDE_VER}|' \
 			-e 's|%%PREFIX%%|${PREFIX}|' \
 			${WRKSRC}/arduino-builder.options
 
 post-install:
 	(cd ${GO_WRKSRC}/builder && ${COPYTREE_SHARE} "hardware" ${STAGEDIR}${PREFIX}/arduino ${FIND_EXPR})
 
 post-install-TOOLS-on:
 	${INSTALL_DATA} ${WRKSRC}/arduino-builder.options ${STAGEDIR}${PREFIX}/arduino/arduino-builder.options
 
 .include <bsd.port.mk>
diff --git a/devel/arduino-mk/Makefile b/devel/arduino-mk/Makefile
index 52c79f20cc00..bd4e0583422b 100644
--- a/devel/arduino-mk/Makefile
+++ b/devel/arduino-mk/Makefile
@@ -1,52 +1,52 @@
 PORTNAME=	arduino-mk
 PORTVERSION=	0.10
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	devel
 MASTER_SITES=	http://www.mjoldfield.com/atelier/2009/02/acli/
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	leres@FreeBSD.org
 COMMENT=	Build Arduino sketches from the command line
 WWW=		https://www.mjoldfield.com/atelier/2009/02/arduino-cli.html
 
 LICENSE=	LGPL21
 
 # gmake is needed to use the port, not to build it
 RUN_DEPENDS=	gmake:devel/gmake \
 		p5-Device-SerialPort>=0:comms/p5-Device-SerialPort \
 		p5-YAML>=0:textproc/p5-YAML \
 		arduino:devel/arduino
 PATCH_DEPENDS=	${LOCALBASE}/arduino/lib/version.txt:devel/arduino
 
 USES=		shebangfix
 SHEBANG_FILES=	bin/ard-parse-boards bin/ard-reset-arduino
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 NO_BUILD=	yes
 
 OPTIONS_DEFINE+=	DOCS EXAMPLES
 
 ARDUINO_CMD=	${SH} ${FILESDIR}/version.sh ${PREFIX}/arduino/lib/version.txt
 OLD_BOARDS_TXT=	/Applications/Arduino.app/Contents/Resources/Java/hardware/arduino/boards.txt
 NEW_BOARDS_TXT=	${PREFIX}/arduino/hardware/arduino/boards.txt
 
 INSLIST=	AnalogInOutSerial Blink BlinkWithoutDelay Fade HelloWorld \
 		WebServer master_reader toneMelody
 post-patch:
 	@ARDUINO="`${ARDUINO_CMD}`" && \
 	    ${REINPLACE_CMD} -e "s|%%ARDUINO%%|$${ARDUINO}|g" \
 	    ${WRKSRC}/arduino-mk/Arduino.mk
 	@${REINPLACE_CMD} -e "s|'${OLD_BOARDS_TXT}'|'${NEW_BOARDS_TXT}'|g" \
 	    ${WRKSRC}/bin/ard-parse-boards
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${PORTNAME}/bin
 	${INSTALL_DATA} ${WRKSRC}/arduino-mk/Arduino.mk ${STAGEDIR}${PREFIX}/${PORTNAME}
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/ard-parse-boards ${STAGEDIR}${PREFIX}/${PORTNAME}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/ard-reset-arduino ${STAGEDIR}${PREFIX}/${PORTNAME}/bin
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} "${INSLIST}" ${STAGEDIR}${EXAMPLESDIR})
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/devel/arduino-openglcd/Makefile b/devel/arduino-openglcd/Makefile
index 040a6da0e957..ad2efd6e3a71 100644
--- a/devel/arduino-openglcd/Makefile
+++ b/devel/arduino-openglcd/Makefile
@@ -1,61 +1,61 @@
 PORTNAME=	arduino-openglcd
 DISTVERSION=	1.0rc3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	https://bitbucket.org/bperrybap/openglcd/downloads/
 DISTNAME=	openGLCD-v${DISTVERSION}
 
 MAINTAINER=	leres@FreeBSD.org
 COMMENT=	GLCD Graphical LCD Library
 WWW=		https://bitbucket.org/bperrybap/openglcd/wiki/Home
 
 LICENSE=	GPLv3
 
 RUN_DEPENDS=	arduino>=1.0.6:devel/arduino
 
 WRKSRC=		${WRKDIR}/openGLCD
 USES=		zip dos2unix
 
 NO_BUILD=	yes
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 FILES=	\
 	Buildinfo.txt \
 	ChangeLog.txt \
 	License.txt \
 	gText.cpp \
 	glcd.cpp \
 	glcd.h.compat \
 	glcd_Device.cpp \
 	keywords.txt \
 	library.properties \
 	openGLCD.h \
 	openGLCD_Buildinfo.h \
 	openGLCD_Config.h \
 	readme.txt
 
 DIRS=	\
 	GPLdocs \
 	bitmaps \
 	config \
 	device \
 	fonts \
 	include
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/arduino/libraries/glcd
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} "${FILES}" \
 	    ${STAGEDIR}${PREFIX}/arduino/libraries/glcd "! -name *\.orig")
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} "${DIRS}" \
 	    ${STAGEDIR}${PREFIX}/arduino/libraries/glcd)
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . \
 	    ${STAGEDIR}${DOCSDIR} "! -name *\.orig")
 do-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . \
 	    ${STAGEDIR}${EXAMPLESDIR} "! -name *\.orig")
 
 .include <bsd.port.mk>
diff --git a/devel/arduino-tools/Makefile b/devel/arduino-tools/Makefile
index b55cf7801b5d..a6ee7992d9e9 100644
--- a/devel/arduino-tools/Makefile
+++ b/devel/arduino-tools/Makefile
@@ -1,64 +1,64 @@
 PORTNAME=	arduino-tools
 PORTVERSION=	1.8.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	devel
 MASTER_SITES=	# Mostly metaport - installs files, no build
 DISTFILES=	#
 EXTRACT_ONLY=	#
 
 MAINTAINER=	kevans@FreeBSD.org
 COMMENT=	Brings together all of the tool dependencies used for Arduino 1.6+
 
 LICENSE=	BSD3CLAUSE
 
 RUN_DEPENDS=	arduino-avrdude:devel/arduino-avrdude \
 		bossac:devel/bossa \
 		avr-as:devel/binutils@avr \
 		avr-gcc:devel/avr-gcc \
 		${LOCALBASE}/avr/include/avr/io.h:devel/avr-libc \
 		gcc-arm-embedded>0:devel/gcc-arm-embedded \
 		${LOCALBASE}/arduino/tools-builder/ctags/${CTAGS_VERS}/ctags:devel/arduino-ctags \
 		arduino-core>=0:devel/arduino-core \
 		arduinoOTA:devel/arduinoOTA \
 		openocd:devel/openocd
 
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 ARMGCC_VERS=	4.9.2
 AVRDUDE_VERS=	6.3.0-arduino9
 AVRGCC_VERS=	4.9.2-atmel3.5.4-arduino2
 BOSSAC_VERS=	1.7.0
 CMSIS_VERS=	${PORTVERSION}
 CTAGS_VERS=	5.8-arduino11
 OCD_VERS=	0.9.0-arduino5-static
 OTA_VERS=	1.1.1
 
 PLIST_SUB+=	ARMGCC_VERS=${ARMGCC_VERS} \
 		AVRDUDE_VERS=${AVRDUDE_VERS} \
 		AVRGCC_VERS=${AVRGCC_VERS} \
 		BOSSAC_VERS=${BOSSAC_VERS} \
 		CMSIS_VERS=${CMSIS_VERS} \
 		OCD_VERS=${OCD_VERS} \
 		OTA_VERS=${OTA_VERS}
 
 _STD_TOOLS_=	arduinoOTA:${OTA_VERS} \
 		avr-gcc:${AVRGCC_VERS} \
 		avrdude:${AVRDUDE_VERS} \
 		bossac:${BOSSAC_VERS} \
 		openocd:${OCD_VERS}
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/arduino/tools-builder/CMSIS/${CMSIS_VERS}
 	${MKDIR} ${STAGEDIR}${PREFIX}/arduino/tools-builder/arm-none-eabi-gcc/${ARMGCC_VERS}
 	${LN} -s ../../../hardware/arduino/sam/system/CMSIS/CMSIS ${STAGEDIR}${PREFIX}/arduino/tools-builder/CMSIS/${CMSIS_VERS}/CMSIS
 	${LN} -s ../../../hardware/arduino/sam/system/CMSIS/Device ${STAGEDIR}${PREFIX}/arduino/tools-builder/CMSIS/${CMSIS_VERS}/Device
 	${LN} -s ../../../../gcc-arm-embedded/bin ${STAGEDIR}${PREFIX}/arduino/tools-builder/arm-none-eabi-gcc/${ARMGCC_VERS}/bin
 	${LN} -s ../../../../etc ${STAGEDIR}${PREFIX}/arduino/tools-builder/arm-none-eabi-gcc/${ARMGCC_VERS}/etc
 .for _tool in ${_STD_TOOLS_}
 	${MKDIR} ${STAGEDIR}${PREFIX}/arduino/tools-builder/${_tool:C/:.*//}/${_tool:C/.*://}
 	${LN} -s ../../../../bin ${STAGEDIR}${PREFIX}/arduino/tools-builder/${_tool:C/:.*//}/${_tool:C/.*://}/bin
 	${LN} -s ../../../../etc ${STAGEDIR}${PREFIX}/arduino/tools-builder/${_tool:C/:.*//}/${_tool:C/.*://}/etc
 .endfor
 
 .include <bsd.port.mk>
diff --git a/devel/arduino/Makefile b/devel/arduino/Makefile
index b691c736600b..6a3af3e92864 100644
--- a/devel/arduino/Makefile
+++ b/devel/arduino/Makefile
@@ -1,120 +1,120 @@
 PORTNAME=	arduino
 PORTVERSION=	1.0.6
-PORTREVISION=	3
+PORTREVISION=	4
 PORTEPOCH=	1
 CATEGORIES=	devel java lang
 MASTER_SITES=	https://arduino.cc/download.php?f=/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-linux32
 
 MAINTAINER=	leres@FreeBSD.org
 COMMENT=	Open-source electronics prototyping platform
 WWW=		https://www.arduino.cc/
 
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	multi
 
 # Confirmed for ARCHS below. Arm, PowerPC and Sparc untested. (Feedback welcome)
 ONLY_FOR_ARCHS=	amd64 i386
 
 RUN_DEPENDS=	${JAVA_HOME}/jre/lib/ext/RXTXcomm.jar:comms/rxtx \
 		${LOCALBASE}/bin/avrdude:devel/avrdude \
 		${LOCALBASE}/avr/include/avr/io.h:devel/avr-libc
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USES=		dos2unix tar:tgz kmod
 DOS2UNIX_REGEX=	.*(\.(c|cpp|h|hex|txt)|Makefile|makefile)
 
 USE_JAVA=	yes
 JAVA_OS=	native
 JAVA_VENDOR=	openjdk
 JAVA_RUN=	yes
 
 CONFLICTS_INSTALL=	arduino18
 
 NO_BUILD=	yes
 USE_LDCONFIG=	${PREFIX}/arduino/lib
 
 PLIST_SUB=	ARCH=${ARCH:S|i386||:S|amd64|64|}
 
 SUB_FILES=	arduino pkg-message
 SUB_LIST=	PORTNAME=${PORTNAME} LINUXBASE=${PREFIX}
 
 REINPLACE_ARGS=	-i ""
 
 DESKTOP_ENTRIES=	"Arduino" "Arduino IDE" \
 			${PREFIX}/${PORTNAME}/logo.png \
 			"arduino" "Development;IDE;" false
 
 OPTIONS_DEFINE=		ATMEGA644P DOCS EXAMPLES UARDUNO
 OPTIONS_SUB=
 ATMEGA644P_DESC=	ATmega644p patches
 DOCS_DESC=		Install the reference documents
 UARDUNO_DESC=		Kernel module for Arduino Uno USB interface
 
 INSLIST=	arduino hardware lib libraries logo.png revisions.txt tools
 
 # Add serial drivers for those who are new to this.
 UARDUNO_RUN_DEPENDS+=	${KMODDIR}/uarduno.ko:comms/uarduno
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MATMEGA644P}
 EXTRA_PATCHES+=	\
 	${FILESDIR}/extrapatch-hardware-arduino-boards.txt \
 	${FILESDIR}/extrapatch-hardware-arduino-cores-arduino-WInterrupts.c \
 	${FILESDIR}/extrapatch-hardware-arduino-variants-atmega644p-pins_arduino.h
 .endif
 
 .if ! empty(PORT_OPTIONS:MDOCS)
 INSLIST+=	reference
 .endif
 
 FIND_EXCLUDES=	! -name *.orig
 
 .if empty(PORT_OPTIONS:MEXAMPLES)
 FIND_EXCLUDES+=	! -path */examples ! -path */examples/*
 .else
 INSLIST+=	examples
 .endif
 
 FIND_EXPR=	"${FIND_EXCLUDES} -prune"
 
 .if ${PORT_OPTIONS:MATMEGA644P}
 pre-patch:
 	@${MKDIR} ${WRKSRC}/hardware/arduino/variants/atmega644p
 .endif
 
 post-patch:
 	@${RM} -r ${WRKSRC}/hardware/tools/
 	@${MKDIR} ${WRKSRC}/hardware/tools/avr/
 	@${LN} -s ${PREFIX}/bin ${WRKSRC}/hardware/tools/avr/bin
 	@${LN} -s ${PREFIX}/etc ${WRKSRC}/hardware/tools/avr/etc
 
 	# Remove broken jar, and Linux C6 based libraries.
 	@${RM} ${WRKSRC}/lib/RXTXcomm.jar
 
 	# This port relys on comms/RXTX working without Linux C6 compatibility.
 	@${RM} ${WRKSRC}/lib/librxtxSerial.so
 	@${RM} ${WRKSRC}/lib/librxtxSerial64.so
 
 	# Map the RXTX port for our use
 	@${LN} -s ${JAVA_HOME}/jre/lib/ext/RXTXcomm.jar ${WRKSRC}/lib/RXTXcomm.jar
 
 # Add in links to the libraries compiled in RXTX for the above jar to use based on architecture.
 .if ${ARCH} == i386
 	@${LN} -s ${JAVA_HOME}/jre/lib/i386/librxtxSerial.so ${WRKSRC}/lib/librxtxSerial.so
 .endif
 
 .if ${ARCH} == amd64
 	@${LN} -s ${JAVA_HOME}/jre/lib/amd64/librxtxSerial.so ${WRKSRC}/lib/librxtxSerial64.so
 .endif
 
 	@${MV} ${WRKSRC}/reference/img/logo.png ${WRKSRC}/
 	@${RM} -r ${WRKSRC}/reference/img/
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${PORTNAME}
 	(cd ${WRKSRC}/ && ${COPYTREE_SHARE} "${INSLIST}" ${STAGEDIR}${PREFIX}/${PORTNAME} ${FIND_EXPR})
 	${INSTALL_SCRIPT} ${WRKDIR}/arduino ${STAGEDIR}${PREFIX}/bin/
 
 .include <bsd.port.mk>
diff --git a/devel/arduino18/Makefile b/devel/arduino18/Makefile
index c3acd50d7ee7..03887a958df1 100644
--- a/devel/arduino18/Makefile
+++ b/devel/arduino18/Makefile
@@ -1,113 +1,113 @@
 PORTNAME=	${GH_PROJECT:tl}
 PORTVERSION=	1.8.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel java
 PKGNAMESUFFIX=	18
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	kevans@FreeBSD.org
 COMMENT=	Open-source electronics prototyping platform
 WWW=		https://arduino.cc/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/../license.txt
 
 JSSC_DEP=		${JAVA_HOME}/jre/lib/ext/jssc-2.8.0.jar:comms/java-simple-serial-connector
 BUILD_DEPENDS+=	${JSSC_DEP}
 LIB_DEPENDS=	liblistSerialsj.so:devel/listserialc \
 		libastylej-arduino.so:devel/libastylej-arduino
 RUN_DEPENDS=	arduino-builder:devel/arduino-builder \
 		arduino-tools>=1.6.12:devel/arduino-tools \
 		bash:shells/bash \
 		${JSSC_DEP}
 
 CONFLICTS=	arduino
 
 BUNDLE_GH_ACCOUNT=	arduino-libraries
 BUNDLE_LIBRARIES=	Firmata:2.5.6:firmata \
 			Bridge:1.6.3:bridge \
 			Robot_Control:1.0.4:robotcontrol \
 			Robot_Motor:1.0.3:robotmotor \
 			RobotIRremote:2.0.0:robotir \
 			SpacebrewYun:1.0.1:spacebrew \
 			Temboo:1.2.1:temboo \
 			Esplora:1.0.4:esplora \
 			Mouse:1.0.1:mouse \
 			Keyboard:1.0.1:keyboard \
 			SD:1.1.1:sd \
 			Servo:1.1.2:servo \
 			LiquidCrystal:1.0.7:liquidcrystal
 
 GH_TUPLE+=	${BUNDLE_GH_ACCOUNT}:WiFi101-FirmwareUpdater-Plugin:v0.9.2:wifi10/linux/work/tools/WiFi101
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	arduino
 GH_PROJECT=	Arduino
 
 .for blib in ${BUNDLE_LIBRARIES}
 GH_TUPLE+=	${BUNDLE_GH_ACCOUNT}:${blib}/linux/work/libraries/${blib:C/\:.*//}
 .endfor
 
 USES=		desktop-file-utils
 LIB_DIRS+=	${LOCALBASE}/lib ${LOCALBASE}/lib/jni
 WRKSRC_SUBDIR=	build
 PATCH_WRKSRC=	${WRKSRC}/../
 MAKE_ARGS+=	-Dlight_bundle=true -Dlocal_sources=true -Dno_arduino_builder=true
 USE_JAVA=	yes
 JAVA_VERSION=	8+
 USE_ANT=	yes
 OS_DIR=		${WRKSRC}/linux
 BUILD_DIR=	${OS_DIR}/work
 INSLIST=	lib libraries revisions.txt tools
 STRIP=		# No Elfs here, only symlinks
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 OPTIONS_SUB=	yes
 
 DOCS_MAKE_ARGS=		-Dno_docs=false
 DOCS_MAKE_ARGS_OFF=	-Dno_docs=true
 DOCS_MASTER_SITES=	http://downloads.arduino.cc/:ref,galileo,edison \
 			https://files.kyle-evans.net/arduino/:ref,galileo,edison
 DOCS_DISTFILES=		reference-1.6.6-3.zip:ref \
 			Galileo_help_files-1.6.2.zip:galileo \
 			Edison_help_files-1.6.2.zip:edison
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDOCS}
 INSLIST+=	reference
 .endif
 
 .if ${PORT_OPTIONS:MEXAMPLES}
 INSLIST+=	examples
 .endif
 
 post-extract-DOCS-on:
 	${MKDIR} ${BUILD_DIR}/reference
 	${MV} ${WRKDIR}/code.jquery.com ${BUILD_DIR}/reference
 	${MV} ${WRKDIR}/www.arduino.cc ${BUILD_DIR}/reference
 	${MV} ${WRKDIR}/Galileo_help_files ${BUILD_DIR}/reference
 	${MV} ${WRKDIR}/Edison_help_files ${BUILD_DIR}/reference
 
 post-patch:
 	${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' ${PATCH_WRKSRC}/arduino-core/src/processing/app/BaseNoGui.java
 	${REINPLACE_CMD} -e 's:<BINARY_LOCATION>:arduino:' -e 's:<ICON_NAME>:arduino:' \
 		${PATCH_WRKSRC}/build/linux/dist/desktop.template
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${PORTNAME}
 	(cd ${BUILD_DIR}/ && ${COPYTREE_SHARE} "${INSLIST}" ${STAGEDIR}${PREFIX}/${PORTNAME} ${FIND_EXPR})
 	(cd ${WRKSRC}/../ && ${COPYTREE_SHARE} "libraries" ${STAGEDIR}${PREFIX}/${PORTNAME} ${FIND_EXPR})
 	${RM} ${STAGEDIR}${PREFIX}/${PORTNAME}/lib/libastylej.so
 	${RM} ${STAGEDIR}${PREFIX}/${PORTNAME}/lib/liblistSerialsj.so
 	${RM} ${STAGEDIR}${PREFIX}/${PORTNAME}/lib/jssc-2.8.0-arduino1.jar
 	${LN} -s ../../lib/jni/libastylej-arduino.so ${STAGEDIR}${PREFIX}/${PORTNAME}/lib/libastylej.so
 	${LN} -s ../../lib/jni/liblistSerialsj.so ${STAGEDIR}${PREFIX}/${PORTNAME}/lib/liblistSerialsj.so
 	${INSTALL_SCRIPT} ${BUILD_DIR}/arduino ${STAGEDIR}${PREFIX}/${PORTNAME}
 	${LN} -s ../${PORTNAME}/arduino ${STAGEDIR}${PREFIX}/bin/arduino
 	${LN} -s ../bin/arduino-builder ${STAGEDIR}${PREFIX}/arduino/arduino-builder
 	${CP} ${WRKSRC}/shared/icons/arduino.xpm ${STAGEDIR}/${PREFIX}/share/pixmaps
 	${CP} ${PATCH_WRKSRC}/build/linux/dist/desktop.template ${STAGEDIR}/${PREFIX}/share/applications/arduino.desktop
 	${REINPLACE_CMD}  -e 's|$${version}|${PORTVERSION}|' ${STAGEDIR}${PREFIX}/${PORTNAME}/lib/version.txt
 
 .include <bsd.port.mk>
diff --git a/devel/arm-none-eabi-gcc492/Makefile b/devel/arm-none-eabi-gcc492/Makefile
index 365a2712b745..b5502632e321 100644
--- a/devel/arm-none-eabi-gcc492/Makefile
+++ b/devel/arm-none-eabi-gcc492/Makefile
@@ -1,80 +1,80 @@
 PORTNAME=	gcc
 PORTVERSION=	4.9.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	devel
 MASTER_SITES=	GCC/releases/gcc-${DISTVERSION}
 PKGNAMEPREFIX?=	arm-none-eabi-
 PKGNAMESUFFIX=	492
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GNU Compiler Collection for bare metal arm cross-development
 WWW=		https://gcc.gnu.org/
 
 LICENSE=	GPLv3 GPLv3RLE
 LICENSE_COMB=	multi
 
 DEPRECATED=	Long time unsupported upstream
 EXPIRATION_DATE=	2023-05-31
 
 BROKEN_mips=		configure: error: cannot compute suffix of object files: cannot compile
 BROKEN_mips64=		configure: error: cannot compute suffix of object files: cannot compile
 
 LIB_DEPENDS=	libgmp.so:math/gmp \
 		libmpfr.so:math/mpfr \
 		libmpc.so:math/mpc
 BUILD_DEPENDS=	${BU_PREFIX}-as:devel/binutils@${PKGNAMEPREFIX:C/-$//:C/-/_/g} \
 		objdump:devel/binutils
 RUN_DEPENDS=	${BU_PREFIX}-as:devel/binutils@${PKGNAMEPREFIX:C/-$//:C/-/_/g}
 
 USES=		compiler cpe gmake iconv libtool makeinfo tar:bzip2
 CPE_VENDOR=	gnu
 PLIST_SUB=	TARGETARCH=${PKGNAMEPREFIX:C/-//g} \
 		OPSYS=${OPSYS:tl} \
 		GCC_TARGET=${GCC_TARGET}
 
 GCC_TARGET=	arm-none-eabi
 BU_PREFIX?=	${GCC_TARGET}
 
 GNU_CONFIGURE=	yes
 CONFIGURE_OUTSOURCE=	yes
 # libstdcxx won't build, but we don't need it or multiple float-abi libs.
 CONFIGURE_ARGS=	--target=${GCC_TARGET} --disable-nls --enable-languages=c,c++ \
 		--without-headers \
 		--with-gmp=${LOCALBASE} \
 		--with-pkgversion="FreeBSD Ports Collection for ${PKGNAMEPREFIX:C/-//g}" \
 		--with-system-zlib \
 		--with-as=${LOCALBASE}/bin/${BU_PREFIX}-as \
 		--with-ld=${LOCALBASE}/bin/${BU_PREFIX}-ld \
 		--disable-libstdcxx \
 		--disable-multilib
 
 CONFLICTS_INSTALL=	arm-none-eabi-gcc
 
 PLIST=	${.CURDIR}/pkg-plist
 
 # U-Boot requires libgcc, crossbuild and install it along with the compiler.
 ALL_TARGET=	all-gcc all-target-libgcc
 INSTALL_TARGET=	install-gcc install-target-libgcc
 
 .include <bsd.port.pre.mk>
 
 CONFIGURE_TARGET=	${ARCH}-portbld-${OPSYS:tl}${OSREL}
 
 post-install:
 	@if [ -f ${STAGEDIR}${PREFIX}/bin/cpp ] ; then \
 		${MV} ${STAGEDIR}${PREFIX}/bin/cpp  \
 		    ${STAGEDIR}${PREFIX}/bin/${GCC_TARGET}-cpp ; \
 	fi
 .for f in c++ cpp g++ gcc gcc-ar gcc-nm gcc-ranlib gcov
 	@${RM} ${STAGEDIR}${PREFIX}/bin/$f
 	@${RM} ${STAGEDIR}${PREFIX}/man/man1/$f.1.gz
 .endfor
 	@${RM} ${STAGEDIR}${PREFIX}/info/*
 	@${RM} ${STAGEDIR}${PREFIX}/man/man7/*
 
 # The following is required for clang to bootstrap gcc.
 .if ${COMPILER_TYPE} == clang
 MAKE_ARGS+=	CXXFLAGS=-fbracket-depth=512
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/arm-none-eabi-newlib/Makefile b/devel/arm-none-eabi-newlib/Makefile
index 7782085eef21..643abbe421fa 100644
--- a/devel/arm-none-eabi-newlib/Makefile
+++ b/devel/arm-none-eabi-newlib/Makefile
@@ -1,38 +1,38 @@
 PORTNAME=	newlib
 PORTVERSION=	2.4.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	ftp://sources.redhat.com/pub/${PORTNAME}/ \
 		SOURCEWARE/${PORTNAME}
 PKGNAMEPREFIX=	${NEWLIB_TARGET}-
 
 MAINTAINER=	kevans@FreeBSD.org
 COMMENT=	Newlib distribution for ${NEWLIB_TARGET} targets
 WWW=		https://www.sourceware.org/newlib/
 
 BUILD_DEPENDS+=	${NEWLIB_TARGET}-ar:devel/binutils@${NEWLIB_TARGET:C/-/_/g} \
 		${NEWLIB_TARGET}-as:devel/binutils@${NEWLIB_TARGET:C/-/_/g} \
 		${NEWLIB_TARGET}-ld:devel/binutils@${NEWLIB_TARGET:C/-/_/g} \
 		${LOCALBASE}/bin/${NEWLIB_TARGET}-gcc:devel/${NEWLIB_TARGET}-gcc
 
 NEWLIB_TARGET?=	arm-none-eabi
 
 USES=		cpe gmake makeinfo
 CPE_VENDOR=	${PORTNAME}_project
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--prefix=${PREFIX} \
 		--target="${NEWLIB_TARGET}" \
 		--disable-newlib-supplied-syscalls \
 		--enable-multilib
 
 # Disable installation of .info files and fix includedir reference.
 post-patch:
 	@${REINPLACE_CMD} -E 's/^(install.*:.*)install-info(.*)/\1\2/' ${WRKSRC}/etc/Makefile.in
 
 post-install:
 	@${FIND} ${STAGEDIR} ! -type d | \
 		${SED} 's,${STAGEDIR}${PREFIX}/,,' >> ${TMPPLIST}
 	@${FIND} -ds ${STAGEDIR}${PREFIX}/${NEWLIB_TARGET} -type d -empty | \
 		${SED} 's,${STAGEDIR}${PREFIX}/,, ; s,^,@dir ,' >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/devel/asmutils/Makefile b/devel/asmutils/Makefile
index 08569c7e3251..5ecc69bc9539 100644
--- a/devel/asmutils/Makefile
+++ b/devel/asmutils/Makefile
@@ -1,82 +1,82 @@
 PORTNAME=	asmutils
 PORTVERSION=	0.18
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	devel
 MASTER_SITES=	http://asm.sourceforge.net/asmutils/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Set of Unix utilities written in x86 assembly language
 WWW=		http://asm.sourceforge.net/
 
 LICENSE=	GPLv2
 
 ONLY_FOR_ARCHS=	i386
 
 BUILD_DEPENDS=	nasm:devel/nasm
 
 USES=		gmake
 USE_GCC=	yes
 MAKE_ARGS=	OS="${OPSYS:tu}" KERNEL="${OSREL:S/.//g}" CC="${CC}" LD="${LD}"
 
 # This will play merry hell with portlint(1)
 BINARIES=	bonus/asmutils basename cal cat chmod chown chroot cmp cp \
 		cpuinfo cut date dc dd deflate dirname du echo env \
 		bonus/execve extname factor fromdos ftpd getty grep head \
 		hexdump host hostname httpd id idea init kill kldload less \
 		ln ls lzss m_inetd md5 md5sum mkdir mknod mount mv nc \
 		netstat nice nm nohup od paste ping pop3d proxy pwd rc6crypt \
 		readelf readkey readlink reboot renice bonus/report rm \
 		rmdsum rot13 scan scons sh sha1sum sleep strings sync tail \
 		tar tee telnet telnetd test touch tr true uname uuencode \
 		watch wc wget which whoami write yes
 
 LINKS=		arch cpuspeed domainname false halt inflate kldstat kldunload \
 		mkfifo more poweroff regs rmdir size sln todos umount usleep
 
 LIBRARIES=	libc.so.0 libcrypto.so.0 libm.so.0
 
 PLIST_FILES=	${BINARIES:S/^/bin\/asmutils\//:S/bonus\///} \
 		${LINKS:S/^/bin\/asmutils\//} ${LIBRARIES:S/^/lib\/asmutils\//}
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,^static ,,' ${WRKSRC}/lib/libm.c
 
 # Stripping binaries will break installation
 STRIP=	#
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/bin/asmutils \
 		${STAGEDIR}${PREFIX}/lib/asmutils
 	${INSTALL_PROGRAM} ${BINARIES:S,^,${WRKSRC}/src/,} \
 		${STAGEDIR}${PREFIX}/bin/asmutils
 	${INSTALL_PROGRAM} ${LIBRARIES:S,^,${WRKSRC}/lib/,} \
 		${STAGEDIR}${PREFIX}/lib/asmutils
 	(cd ${STAGEDIR}${PREFIX}/bin/asmutils && \
 		${LN} -sf uname arch && \
 		${LN} -sf cpuinfo cpuspeed && \
 		${LN} -sf hostname domainname && \
 		${LN} -sf true false && \
 		${LN} -sf reboot halt && \
 		${LN} -sf deflate inflate && \
 		${LN} -sf kldload kldstat && \
 		${LN} -sf kldload kldunload && \
 		${LN} -sf mknod mkfifo && \
 		${LN} -sf less more && \
 		${LN} -sf reboot poweroff && \
 		${LN} -sf execve regs && \
 		${LN} -sf mkdir rmdir && \
 		${LN} -sf nm size && \
 		${LN} -sf ln sln && \
 		${LN} -sf fromdos todos && \
 		${LN} -sf mount umount && \
 		${LN} -sf sleep usleep)
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/[^i]* ${STAGEDIR}${DOCSDIR}
 	${LN} -sf Asmutils-HOWTO.html ${STAGEDIR}/${DOCSDIR}/index.html
 
 .include <bsd.port.mk>
diff --git a/devel/avr-gcc/Makefile b/devel/avr-gcc/Makefile
index d267f9583427..61fe35a14226 100644
--- a/devel/avr-gcc/Makefile
+++ b/devel/avr-gcc/Makefile
@@ -1,83 +1,84 @@
 PORTNAME=	gcc
 PORTVERSION=	11.2.0
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	GCC
 PKGNAMEPREFIX=	avr-
 
 MAINTAINER=	joerg@FreeBSD.org
 COMMENT=	FSF GCC for Atmel AVR 8-bit RISC cross-development
 WWW=		https://www.nongnu.org/avr-libc/
 
 LICENSE=	GPLv3 GPLv3RLE
 LICENSE_COMB=	multi
 
 BROKEN_mips64=	Fails to configure: cannot compute suffix of object files
 
 BUILD_DEPENDS=	avr-as:devel/binutils@avr \
 		avr-ld:devel/binutils@avr \
 		objdump:devel/binutils
 LIB_DEPENDS=	libgmp.so:math/gmp \
 		libisl.so:devel/isl \
 		libmpc.so:math/mpc \
 		libmpfr.so:math/mpfr
 RUN_DEPENDS=	avr-as:devel/binutils@avr \
 		avr-ld:devel/binutils@avr
 
 USES=		bison compiler:c++11-lang cpe gmake iconv libtool localbase \
 		makeinfo perl5 tar:xz
 CPE_VENDOR=	gnu
 USE_CXXSTD=	gnu++11
 USE_LDCONFIG=	${PREFIX}/lib/gcci/avr/${SUFFIX}
 USE_PERL5=	build
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-libssp \
 		--enable-languages="c c++" \
 		--target=avr \
 		--with-gmp=${LOCALBASE} \
 		--with-isl=${LOCALBASE} \
 		--without-zstd
 
 PLIST_SUB=	VERSION=${GCC_VERSION}
 
 WITHOUT_CPU_CFLAGS=	This is a cross-compiler.
 
 CONFLICTS=	avr-gcc-devel*
 
 INFO=		cpp gcc gccint cppinternals gccinstall
 
 OPTIONS_DEFINE=		NLS
 OPTIONS_SUB=		yes
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
 
 # DIST_VERSION relates to downloads, GCC_VERSION and SUFFIX to names
 # of executables and directories once installed.  A PORTVERSION of
 # 4.Y.2.s20130808 results in values of 4.Y-20130808, 4.Y.2, and 4Y
 # for these three.
 DIST_VERSION=	${PORTVERSION:C/([0-9]+\.[0-9]+).*\.s([0-9]+)/\1-\2/}
 GCC_VERSION=	${PORTVERSION:C/(.+)\.s[0-9]{8}/\1/}
 SUFFIX=		${PORTVERSION:C/([0-9]+).([0-9]+).*/\1\2/}
 
 .include <bsd.port.pre.mk>
 
 .if (${ARCH} == "amd64")
 ARCH=		x86_64
 .endif
 
 post-patch:
 	@${FIND} ${WRKSRC} -type f \( -name '*.[ch]' -o -name '*.cc' \) | \
 		${XARGS} ${EGREP} -l '"(HOST_WIDE|PLUGIN_COND|PRId64)' | \
 		${XARGS} ${REINPLACE_CMD} -E -e 's/"(HOST_WIDE|PLUGIN_COND|PRId64)/" \1/g'
 
 post-configure:
 	${MKDIR} ${WRKSRC}/gcc/include
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/gcc/avr/${PORTVERSION}/liblto_plugin.so \
 		${STAGEDIR}${PREFIX}/lib/libcc1.so.0.0.0 \
 		${STAGEDIR}${PREFIX}/lib/gcc/avr/${PORTVERSION}/plugin/libcc1plugin.so.0.0.0 \
 		${STAGEDIR}${PREFIX}/lib/gcc/avr/${PORTVERSION}/plugin/libcp1plugin.so.0.0.0
 	tar -C ${STAGEDIR}${PREFIX} -xj -f ${FILESDIR}/specs-avr-dx.tar.bz2
 
 .include <bsd.port.post.mk>
diff --git a/devel/avr-libc/Makefile b/devel/avr-libc/Makefile
index 836146e84b52..985b94dc159a 100644
--- a/devel/avr-libc/Makefile
+++ b/devel/avr-libc/Makefile
@@ -1,86 +1,86 @@
 PORTNAME=	avr-libc
 PORTVERSION=	2.0.0
-PORTREVISION=	4
+PORTREVISION=	5
 PORTEPOCH=	1
 CATEGORIES=	devel
 MASTER_SITES=	SAVANNAH
 
 MAINTAINER=	joerg@FreeBSD.org
 COMMENT=	C and math library for the Atmel AVR controller family
 WWW=		https://savannah.nongnu.org/projects/avr-libc
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	avr-as:devel/binutils@avr \
 		avr-ld:devel/binutils@avr \
 		avr-gcc:devel/avr-gcc
 RUN_DEPENDS=	avr-as:devel/binutils@avr \
 		avr-ld:devel/binutils@avr \
 		avr-gcc:devel/avr-gcc
 
 OPTIONS_DEFINE=	DOXYGEN
 
 .include <bsd.port.options.mk>
 
 .if ! ${PORT_OPTIONS:MDOXYGEN}
 .undef WITHOUT_AVRLIBCDOCS=	true
 .endif
 
 .if ${PORT_OPTIONS:MDOXYGEN}
 USES+=		tex
 USE_TEX=	latex:build
 BUILD_DEPENDS+=	doxygen:devel/doxygen \
 		fig2dev:print/fig2dev \
 		jpegtopnm:graphics/netpbm \
 		dvips:print/tex-dvipsk
 .endif
 
 USES=		gettext-tools tar:bzip2 gmake
 HAS_CONFIGURE=	yes
 
 CONFIGURE_ENV=	CC=avr-gcc PREFIX=${PREFIX}
 .if ${PORT_OPTIONS:MDOXYGEN}
 CONFIGURE_ARGS=	--build=`./config.guess` --host=avr \
 	--enable-doc --disable-versioned-doc --prefix=${PREFIX} \
 	--mandir=${PREFIX}/share/doc/avr-libc/man
 PLIST_DOC=	${PKGDIR}/pkg-plist.doc
 .else
 CONFIGURE_ARGS=	--build=`./config.guess` --host=avr --prefix=${PREFIX}
 PLIST_DOC=
 .endif
 
 post-patch:
 .if ! ${PORT_OPTIONS:MDOXYGEN}
 	${REINPLACE_CMD} -e '/SUBDIRS/s,examples,,' ${WRKSRC}/doc/Makefile.in
 .endif
 
 do-install:
 		${RM} ${TMPPLIST}
 .if ${PORT_OPTIONS:MDOXYGEN}
 		(cd ${BUILD_WRKSRC}/doc/api/avr-libc-user-manual && \
 		 ${FIND} . -type f \
 		  \( -name '*.html' -or -name '*.css' -or \
 		     -name '*.jpg' -or -name '*.png' \) |\
 		 ${GREP} -v '/search/' |\
 		 ${SORT} |\
 		 ${SED} -e 's|^\.|share/doc/avr-libc/avr-libc-user-manual|' \
 		 >> ${TMPPLIST})
 		(cd ${BUILD_WRKSRC}/doc/api/man/man3 && \
 		 ${FIND} . -type f |\
 		 ${SORT} |\
 		 ${SED} -e 's|^\.|share/doc/avr-libc/man/man3|' \
 		 >> ${TMPPLIST})
 		${CAT} ${PLIST_DOC} >> ${TMPPLIST}
 .endif
 		${CAT} ${PLIST} >> ${TMPPLIST}
 	        @for file in ${PLIST_FILES}; do \
 			${ECHO_CMD} $${file} >> ${TMPPLIST}; \
 	        done
 		(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} \
 			${MAKE_CMD} ${MAKE_ARGS} install)
 		${MKDIR} ${STAGEDIR}${DOCSDIR}
 		${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/AUTHORS \
 			${STAGEDIR}/${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/devel/babelflow/Makefile b/devel/babelflow/Makefile
index 1198e9b3efe8..03efa71f3145 100644
--- a/devel/babelflow/Makefile
+++ b/devel/babelflow/Makefile
@@ -1,35 +1,36 @@
 PORTNAME=	babelflow
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.1.0
+PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Embedded Domain Specific Language to describe task graph abstraction
 WWW=		https://github.com/sci-visus/BabelFlow
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		cmake compiler:c++11-lang
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	sci-visus
 GH_PROJECT=	BabelFlow
 
 CMAKE_ARGS=	-DRUNTIME_TYPE:STRING="MPI"
 
 OPTIONS_SINGLE=		MPI
 OPTIONS_SINGLE_MPI=	MPICH OPENMPI
 OPTIONS_SINGLE_MPI=	MPICH OPENMPI
 OPTIONS_DEFINE=		EXAMPLES
 OPTIONS_DEFAULT=	EXAMPLES MPICH
 OPTIONS_SUB=		yes
 
 EXAMPLES_CMAKE_BOOL=	BUILD_EXAMPLES
 
 MPICH_USES=		mpi:mpich
 
 OPENMPI_USES=		mpi:openmpi
 
 .include <bsd.port.mk>
diff --git a/devel/boost-python-libs/Makefile b/devel/boost-python-libs/Makefile
index 8ff3c1fc48fd..ac0c7d5638d7 100644
--- a/devel/boost-python-libs/Makefile
+++ b/devel/boost-python-libs/Makefile
@@ -1,72 +1,73 @@
 PORTNAME=	boost-libs
+PORTREVISION=	1
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 COMMENT=	Framework for interfacing Python and C++
 WWW=		https://www.boost.org/
 
 LICENSE=	BSL
 LICENSE_FILE=	${WRKSRC}/LICENSE_1_0.txt
 
 PATCHDIR=	${.CURDIR}/../boost-libs/files
 
 BUILD_DEPENDS=	bjam:devel/boost-jam \
 		${PYNUMPY}
 LIB_DEPENDS=	libboost_thread.so:devel/boost-libs
 
 USES=		python:3.8-3.11  # upper bound inherited from math/py-numpy
 USE_PYTHON=	flavors
 
 OPTIONS_DEFINE=	DEBUG OPTIMIZED_CFLAGS
 
 .include "${.CURDIR}/../boost-all/common.mk"
 
 .include "${.CURDIR}/../boost-all/compiled.mk"
 
 MAKE_ENV+=	PYTHON_ROOT="${LOCALBASE}"\
 		PYTHON_VERSION="${PYTHON_VERSION}"\
 		PYTHON_INCLUDES="${PYTHON_INCLUDEDIR}"\
 		PYTHON_LIB_PATH="${PYTHON_LIBDIR}"
 
 MAKE_ARGS+=	--with-python
 ALL_TARGET=	stage
 
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_VER} == ${PYTHON_DEFAULT}
 PLIST_SUB+=	PY_DEFAULT_ONLY=""
 .else
 PLIST_SUB+=	PY_DEFAULT_ONLY="@comment "
 .endif
 
 pre-build:
 	@${ECHO_CMD} "using python : " ${PYTHON_VER} " : " ${PYTHON_CMD} " : " ${PYTHON_INCLUDEDIR} ";" >> ${WRKSRC}/tools/build/src/site-config.jam
 
 do-install:
 	@cd ${WRKSRC}/stage/lib && ${PAX} -rw -p p libboost* ${STAGEDIR}${PREFIX}/lib
 # For some reasons BJAM forget about the links
 	@cd ${WRKSRC}/stage/ && ${FIND} lib -type l | ${PAX} -rw -p p ${STAGEDIR}${PREFIX}
 # CMake part
 	@cd ${WRKSRC}/stage/lib && ${PAX} -rw -p p cmake/boost_numpy*/*-py${PYTHON_VER}.cmake ${STAGEDIR}${PREFIX}/lib
 	@cd ${WRKSRC}/stage/lib && ${PAX} -rw -p p cmake/boost_python*/*-py${PYTHON_VER}.cmake ${STAGEDIR}${PREFIX}/lib
 .if ${PYTHON_VER} == ${PYTHON_DEFAULT}
 	@cd ${WRKSRC}/stage/lib && ${PAX} -rw -p p cmake/boost_numpy*/*-config*.cmake ${STAGEDIR}${PREFIX}/lib
 	@cd ${WRKSRC}/stage/lib && ${PAX} -rw -p p cmake/boost_python*/*-config*.cmake ${STAGEDIR}${PREFIX}/lib
 .endif
 	@${FIND} ${STAGEDIR}${PREFIX}/lib/cmake -type f -exec \
 		${REINPLACE_CMD} -i '' -e 's,${STAGEDIR},,' {} +
 
 post-install:
 # display pkg-message
 	@${TOUCH} ${PKGMESSAGE}
 	@${CAT} ${PKG_MESSAGE_FILE_THREADS} >> ${PKGMESSAGE}
 	@${ECHO_CMD} >> ${PKGMESSAGE}
 	@${CAT} ${PKG_MESSAGE_FILE_PYTHON} >> ${PKGMESSAGE}
 	@${ECHO_CMD} >> ${PKGMESSAGE}
 	@${REINPLACE_CMD} \
 		-e "s|%%LOCALBASE%%|${LOCALBASE}|g" \
 		-e "s|%%PYTHON_INCLUDEDIR%%|${PYTHON_INCLUDEDIR}|g" \
 		-e "s|%%PYTHON_LIBDIR%%|${PYTHON_LIBDIR}|g" \
 		-e "s|%%PYTHON_VERSION%%|${PYTHON_VERSION}|g" ${PKGMESSAGE}
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libboost_*.so
 
 .include <bsd.port.post.mk>
diff --git a/devel/cask/Makefile b/devel/cask/Makefile
index 737cc9c089e1..9c64ba738642 100644
--- a/devel/cask/Makefile
+++ b/devel/cask/Makefile
@@ -1,45 +1,45 @@
 PORTNAME=	cask
 PORTVERSION=	0.8.3
 DISTVERSIONPREFIX=	v
-PORTREVISION=	9
+PORTREVISION=	11
 CATEGORIES=	devel elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Project management tool for Emacs
 WWW=		https://github.com/cask/cask
 
 LICENSE=	GPLv3
 
 USES=		emacs python shebangfix
 USE_GITHUB=	yes
 
 CONFLICTS_INSTALL=	cask cask-emacs_*
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 PLIST_FILES=	${EMACS_SITE_LISPDIR}/cask.el \
 		${EMACS_SITE_LISPDIR}/cask-bootstrap.el \
 		${EMACS_SITE_LISPDIR}/cask-cli.el \
 		${EMACS_SITE_LISPDIR}/package-legacy.el \
 		${EMACS_SITE_LISPDIR}/templates/init.tpl \
 		${EMACS_SITE_LISPDIR}/templates/init-dev.tpl \
 		bin/cask
 
 SHEBANG_FILES=	bin/cask
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|os.path.dirname(CASK_BIN_DIRECTORY)|"${PREFIX}/${EMACS_SITE_LISPDIR}"|' \
 	    ${WRKSRC}/bin/cask
 
 do-install:
 	(cd ${WRKSRC} && ${INSTALL_DATA} \
 	    ${PLIST_FILES:M*.el:T} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR})
 	${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/templates
 	(cd ${WRKSRC}/templates && ${INSTALL_DATA} ${PLIST_FILES:M*.tpl:T} \
 	    ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/templates)
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/cask \
 	    ${STAGEDIR}${PREFIX}/bin/cask
 
 .include <bsd.port.mk>
diff --git a/devel/clojure-cider/Makefile b/devel/clojure-cider/Makefile
index 19a91c14f087..11a169106ff8 100644
--- a/devel/clojure-cider/Makefile
+++ b/devel/clojure-cider/Makefile
@@ -1,45 +1,46 @@
 PORTNAME=	clojure-cider
 PORTVERSION=	1.7.0
+PORTREVISION=	5
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Clojure IDE and REPL for Emacs
 WWW=		https://github.com/clojure-emacs/cider
 
 LICENSE=	GPLv3+
 
 RUN_DEPENDS=	clojure-mode.el${EMACS_PKGNAMESUFFIX}>0:lang/clojure-mode.el@${EMACS_FLAVOR} \
 		dash.el${EMACS_PKGNAMESUFFIX}>0:devel/dash.el@${EMACS_FLAVOR} \
 		epl.el${EMACS_PKGNAMESUFFIX}>0:devel/epl.el@${EMACS_FLAVOR} \
 		pkg-info.el${EMACS_PKGNAMESUFFIX}>0:devel/pkg-info.el@${EMACS_FLAVOR}
 
 USES=		emacs
 USE_GITHUB=	yes
 GH_ACCOUNT=	clojure-emacs
 GH_PROJECT=	cider
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 PLIST_FILES=	${EMACS_SITE_LISPDIR}/cider-client.el \
 		${EMACS_SITE_LISPDIR}/cider-eldoc.el \
 		${EMACS_SITE_LISPDIR}/cider-inspector.el \
 		${EMACS_SITE_LISPDIR}/cider-macroexpansion.el \
 		${EMACS_SITE_LISPDIR}/cider-mode.el \
 		${EMACS_SITE_LISPDIR}/cider-repl.el \
 		${EMACS_SITE_LISPDIR}/cider-scratch.el \
 		${EMACS_SITE_LISPDIR}/cider-selector.el \
 		${EMACS_SITE_LISPDIR}/cider-stacktrace.el \
 		${EMACS_SITE_LISPDIR}/cider-util.el \
 		${EMACS_SITE_LISPDIR}/cider.el \
 		${EMACS_SITE_LISPDIR}/nrepl-client.el
 
 do-install:
 .for f in ${PLIST_FILES:S,^${EMACS_SITE_LISPDIR}/,,}
 	${INSTALL_DATA} ${WRKSRC}/${f} \
 		${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/devel/containers/Makefile b/devel/containers/Makefile
index 4086cb5bf29c..3182d3380bce 100644
--- a/devel/containers/Makefile
+++ b/devel/containers/Makefile
@@ -1,35 +1,35 @@
 PORTNAME=	containers
 DISTVERSION=	0.9.0
-PORTREVISION=	2
+PORTREVISION=	3
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Containers backed on dlang by std.experimental.allocator
 WWW=		https://github.com/dlang-community/containers
 
 LICENSE=	BSL
 
 BUILD_DEPENDS=	ldmd2:lang/ldc \
 		dub:devel/dub \
 		${LOCALBASE}/lib/d/libmir-core.a:devel/mir-core \
 		${LOCALBASE}/lib/d/libstdx-allocator.a:devel/stdx-allocator
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	dlang-community
 
 DUB_CMD=	${LOCALBASE}/bin/dub build --build=release
 D_INCLUDE_DIR=	${PREFIX}/include/d
 D_LIB_DIR=	${PREFIX}/lib/d
 DC=		${PREFIX}/bin/ldmd2
 
 do-build:
 	@cd ${WRKSRC} && DC=${DC} ${DUB_CMD}
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${D_INCLUDE_DIR}
 	@${MKDIR} ${STAGEDIR}${D_LIB_DIR}
 	${INSTALL_DATA} ${WRKSRC}/build/libemsi_containers.a ${STAGEDIR}${D_LIB_DIR}
 	cd ${WRKSRC}/src && ${COPYTREE_SHARE} . ${STAGEDIR}${D_INCLUDE_DIR} "-name *\.d"
 
 .include <bsd.port.mk>
diff --git a/devel/covtool/Makefile b/devel/covtool/Makefile
index 521186fd604f..c4c47f8f9fab 100644
--- a/devel/covtool/Makefile
+++ b/devel/covtool/Makefile
@@ -1,29 +1,29 @@
 PORTNAME=	covtool
 PORTVERSION=	2.1
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	devel
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/rel_2.0
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	C++ test coverage analyzer
 WWW=		https://sourceforge.net/projects/covtool/
 
 USES=		gmake zip
 USE_GCC=	yes
 
 MAKEFILE=	makefile
 MAKE_ARGS=	CC=${CXX} LN=${CXX} INSTALL_DIR=${STAGEDIR}${PREFIX}
 NO_WRKSUBDIR=	yes
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
 		-e 's|%%PORTNAME%%|${PORTNAME}|g' ${WRKSRC}/cov++
 	@${REINPLACE_CMD} 's|%%CXXFLAGS%%|${CXXFLAGS}|g' \
 		${WRKSRC}/rules.FreeBSD
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/man/man1/*.1 \
 		${STAGEDIR}${MANPREFIX}/man/man1/
 	${INSTALL_DATA} ${WRKSRC}/cov++.cfg ${STAGEDIR}${PREFIX}/etc/cov++.cfg.sample
 
 .include <bsd.port.mk>
diff --git a/devel/cpp2py/Makefile b/devel/cpp2py/Makefile
index 792648284651..b2c106cb8588 100644
--- a/devel/cpp2py/Makefile
+++ b/devel/cpp2py/Makefile
@@ -1,42 +1,43 @@
 PORTNAME=	cpp2py
 DISTVERSION=	2.0.0
+PORTREVISION=	1
 CATEGORIES=	devel
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
 PATCHFILES=	44d5238ab4f05ed4064736ffd2f2b63438d3f64c.patch:-p1 # fix build on i386
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Reflection tools based on clang
 WWW=		https://github.com/TRIQS/cpp2py
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 PY_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}h5py>0:science/py-h5py@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mako>0:textproc/py-mako@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR}
 BUILD_DEPENDS=	${PY_DEPENDS} \
 		llvm${LLVM_VER}>0:devel/llvm${LLVM_VER}
 RUN_DEPENDS=	${PY_DEPENDS} \
 		llvm${LLVM_VER}>0:devel/llvm${LLVM_VER}
 
 USES=		cmake compiler:c++14-lang gettext-runtime python:3.7+ shebangfix
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	TRIQS
 
 SHEBANG_FILES=	bin/c*
 
 CMAKE_ARGS=	-DPYTHON_INTERPRETER:STRING=${PYTHON_CMD} \
 		-DFREEBSD_LLVM_VER:STRING=${LLVM_VER}
 
 LLVM_VER=	10
 
 PORTSCOUT=	limit:^[0-9\.]*$$
 
 post-install: # remove the unnecessary file: https://github.com/TRIQS/cpp2py/issues/41
 	@${RM} ${STAGEDIR}${PREFIX}/share/cpp2pyvars.sh
 
 .include <bsd.port.mk>
diff --git a/devel/d-scanner/Makefile b/devel/d-scanner/Makefile
index 44e9260a3b6d..6e1dff42db5a 100644
--- a/devel/d-scanner/Makefile
+++ b/devel/d-scanner/Makefile
@@ -1,44 +1,44 @@
 PORTNAME=	d-scanner
 PORTVERSION=	0.7.0
-PORTREVISION=	2
+PORTREVISION=	3
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Swiss-army knife for D source code
 WWW=		https://github.com/dlang-community/D-Scanner
 
 LICENSE=	BSL
 
 BROKEN=		fails to build
 
 BUILD_DEPENDS=	ldmd2:lang/ldc \
 		dub:devel/dub \
 		rdmd:lang/dlang-tools \
 		${LOCALBASE}/lib/d/libemsi_containers.a:devel/containers \
 		${LOCALBASE}/lib/d/libdsymbol.a:devel/dsymbol \
 		${LOCALBASE}/lib/d/libinifiled.a:devel/inifiled \
 		${LOCALBASE}/lib/d/libddoc.a:devel/libddoc \
 		${LOCALBASE}/lib/d/libdparse.a:devel/libdparse \
 		${LOCALBASE}/lib/d/libmir-core.a:devel/mir-core \
 		${LOCALBASE}/lib/d/libstdx-allocator.a:devel/stdx-allocator \
 		rdmd:lang/dlang-tools
 
 USES=		pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	dlang-community
 GH_PROJECT=	D-Scanner
 
 PLIST_FILES=	bin/dscanner
 DUB_CMD=	${LOCALBASE}/bin/dub build --build=release
 
 post-patch:
 	${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/dub.json
 
 do-build:
 	@cd ${WRKSRC} && ${DUB_CMD}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/dscanner ${STAGEDIR}${PREFIX}/bin/
 
 .include <bsd.port.mk>
diff --git a/devel/dash.el/Makefile b/devel/dash.el/Makefile
index dbf7773b349e..3c67808e6765 100644
--- a/devel/dash.el/Makefile
+++ b/devel/dash.el/Makefile
@@ -1,32 +1,32 @@
 PORTNAME=	dash.el
 DISTVERSION=	2.19.1
-PORTREVISION=	5
+PORTREVISION=	7
 CATEGORIES=	devel elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	yasu@FreeBSD.org
 COMMENT=	Modern list library for Emacs
 WWW=		https://github.com/magnars/dash.el
 
 LICENSE=	GPLv3
 
 USES=		emacs
 USE_GITHUB=	yes
 GH_ACCOUNT=	magnars
 
 NO_ARCH=	yes
 PLIST_FILES=	${EMACS_VERSION_SITE_LISPDIR}/dash-functional.el \
 		${EMACS_VERSION_SITE_LISPDIR}/dash-functional.elc \
 		${EMACS_VERSION_SITE_LISPDIR}/dash.el \
 		${EMACS_VERSION_SITE_LISPDIR}/dash.elc
 
 do-build:
 	(cd ${WRKSRC} \
 	&& ${EMACS_CMD} -Q -batch -L . -f batch-byte-compile *.el)
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}
 	(cd ${WRKSRC} && ${INSTALL_DATA} *.el* \
 	    ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR})
 
 .include <bsd.port.mk>
diff --git a/devel/dcd-client/Makefile b/devel/dcd-client/Makefile
index 587da732d430..b3bb78d0d0c7 100644
--- a/devel/dcd-client/Makefile
+++ b/devel/dcd-client/Makefile
@@ -1,13 +1,13 @@
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 PKGNAMESUFFIX=	-client
 
 COMMENT=	Auto-complete program for the D programming language (client)
 
 MASTERDIR=	${.CURDIR}/../../devel/dcd-server
 
 PLIST=		${.CURDIR}/pkg-plist
 
 DUB_CONFIG=	client
 
 .include "${MASTERDIR}/Makefile"
diff --git a/devel/dcd-server/Makefile b/devel/dcd-server/Makefile
index 01476f6e4059..31369b27f30f 100644
--- a/devel/dcd-server/Makefile
+++ b/devel/dcd-server/Makefile
@@ -1,57 +1,57 @@
 PORTNAME=	dcd
 PORTVERSION=	0.13.6
 DISTVERSIONPREFIX=	v
-PORTREVISION?=	2
+PORTREVISION?=	3
 CATEGORIES?=	devel
 PKGNAMESUFFIX?=	-server
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT?=	Auto-complete program for the D programming language (server)
 WWW=		https://github.com/dlang-community/DCD
 
 LICENSE=	BSL
 
 BUILD_DEPENDS=	ldmd2:lang/ldc \
 		dub:devel/dub \
 		rdmd:lang/dlang-tools \
 		${LOCALBASE}/lib/d/libemsi_containers.a:devel/containers \
 		${LOCALBASE}/lib/d/libdsymbol.a:devel/dsymbol \
 		${LOCALBASE}/lib/d/libmsgpack-d.a:devel/msgpack-d \
 		${LOCALBASE}/lib/d/libdparse.a:devel/libdparse \
 		${LOCALBASE}/lib/d/libmir-core.a:devel/mir-core \
 		${LOCALBASE}/lib/d/libstdx-allocator.a:devel/stdx-allocator
 
 USES=		pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	dlang-community
 GH_PROJECT=	DCD
 
 DUB_CMD=	${LOCALBASE}/bin/dub build --build=release
 DUB_CONFIG?=	server
 D_INCLUDE_DIR=	${PREFIX}/include/d
 D_LIB_DIR=	${PREFIX}/lib/d
 DC=		${PREFIX}/bin/ldmd2
 
 post-patch:
 	${REINPLACE_CMD} '7d' ${WRKSRC}/common/dub.sdl
 	${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/dub.json
 
 do-build:
 	@cd ${WRKSRC} && DC=${DC} ${DUB_CMD} --config=${DUB_CONFIG}
 .if ${PKGNAMESUFFIX} == "-server"
 	@cd ${WRKSRC} && DC=${DC} ${DUB_CMD} --config=library
 .endif
 
 do-install:
 	@${MKDIR} ${STAGEDIR}/${D_INCLUDE_DIR}/dcd/${PKGNAMESUFFIX:S/-//}
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/dcd${PKGNAMESUFFIX} ${STAGEDIR}${PREFIX}/bin/
 	${INSTALL_MAN} ${WRKSRC}/man1/dcd${PKGNAMESUFFIX}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
 	cd ${WRKSRC}/src/dcd/${PKGNAMESUFFIX:S/-//} && ${COPYTREE_SHARE} . ${STAGEDIR}${D_INCLUDE_DIR}/dcd/${PKGNAMESUFFIX:S/-//} "-name *\.d"
 .if ${PKGNAMESUFFIX} == "-server"
 	@${MKDIR} ${STAGEDIR}/${D_LIB_DIR}
 	@${INSTALL_DATA} ${WRKSRC}/libdcd.a ${STAGEDIR}${D_LIB_DIR}
 	@${MKDIR} ${STAGEDIR}/${D_INCLUDE_DIR}/common
 	cd ${WRKSRC}/common/src/dcd/common && ${COPYTREE_SHARE} . ${STAGEDIR}${D_INCLUDE_DIR}/dcd/common "-name *\.d"
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/derelict-sdl2/Makefile b/devel/derelict-sdl2/Makefile
index d5242a935476..b4e7d834b56c 100644
--- a/devel/derelict-sdl2/Makefile
+++ b/devel/derelict-sdl2/Makefile
@@ -1,39 +1,39 @@
 PORTNAME=	derelict-sdl2
 PORTVERSION=	2.1.4
-PORTREVISION=	6
+PORTREVISION=	7
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Dynamic bindings to SDL2 and its libraries for the D lang
 WWW=		https://github.com/DerelictOrg/DerelictSDL2
 
 LICENSE=	BSL
 
 BUILD_DEPENDS=	ldmd2:lang/ldc \
 		dub:devel/dub \
 		${LOCALBASE}/lib/d/libDerelictUtil.a:devel/derelict-util
 
 USES=		dos2unix
 USE_GITHUB=	yes
 GH_ACCOUNT=	DerelictOrg
 GH_PROJECT=	DerelictSDL2
 
 DUB_CMD=	${LOCALBASE}/bin/dub build --build=release
 D_INCLUDE_DIR=	${PREFIX}/include/d
 D_LIB_DIR=	${PREFIX}/lib/d
 DC=		${PREFIX}/bin/ldmd2
 
 post-patch:
 	${REINPLACE_CMD} -e '13,15d' ${WRKSRC}/dub.json
 
 do-build:
 	@cd ${WRKSRC} && DC=${DC} ${DUB_CMD}
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${D_INCLUDE_DIR}
 	@${MKDIR} ${STAGEDIR}${D_LIB_DIR}
 	${INSTALL_DATA} ${WRKSRC}/lib/libDerelictSDL2.a ${STAGEDIR}${D_LIB_DIR}
 	cd ${WRKSRC}/source && ${COPYTREE_SHARE} . ${STAGEDIR}${D_INCLUDE_DIR} "-name *\.d"
 
 .include <bsd.port.mk>
diff --git a/devel/derelict-util/Makefile b/devel/derelict-util/Makefile
index 805bd5129434..67d8aca34289 100644
--- a/devel/derelict-util/Makefile
+++ b/devel/derelict-util/Makefile
@@ -1,34 +1,34 @@
 PORTNAME=	derelict-util
 PORTVERSION=	2.1.0
-PORTREVISION=	6
+PORTREVISION=	7
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	The base library for all Derelict packages
 WWW=		https://github.com/DerelictOrg/DerelictUtil
 
 LICENSE=	BSL
 
 BUILD_DEPENDS=	ldmd2:lang/ldc \
 		dub:devel/dub
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	DerelictOrg
 GH_PROJECT=	DerelictUtil
 
 DUB_CMD=	${LOCALBASE}/bin/dub build --build=release
 D_INCLUDE_DIR=	${PREFIX}/include/d
 D_LIB_DIR=	${PREFIX}/lib/d
 DC=		${PREFIX}/bin/ldmd2
 
 do-build:
 	@cd ${WRKSRC} && DC=${DC} ${DUB_CMD}
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${D_INCLUDE_DIR}
 	@${MKDIR} ${STAGEDIR}${D_LIB_DIR}
 	${INSTALL_DATA} ${WRKSRC}/lib/libDerelictUtil.a ${STAGEDIR}${D_LIB_DIR}
 	cd ${WRKSRC}/source && ${COPYTREE_SHARE} . ${STAGEDIR}${D_INCLUDE_DIR} "-name *\.d"
 
 .include <bsd.port.mk>
diff --git a/devel/distel/Makefile b/devel/distel/Makefile
index 472129a9ba28..203bfec1a8b3 100644
--- a/devel/distel/Makefile
+++ b/devel/distel/Makefile
@@ -1,49 +1,49 @@
 PORTNAME=	distel
 PORTVERSION=	4.1.1
-PORTREVISION=	11
+PORTREVISION=	13
 CATEGORIES=	devel elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	erlang@FreeBSD.org
 COMMENT=	Distel extends Emacs Lisp with Erlang-style message passing
 WWW=		http://www.bluetail.com/~luke/distel/
 
 LICENSE=	MIT
 
 BUILD_DEPENDS+=	erlc:lang/erlang
 
 USES=		emacs
 USE_GITHUB=	yes
 GH_ACCOUNT=	massemanet
 
 PLIST_SUB=	VERSION="${PORTVERSION}"
 
 NO_ARCH=	yes
 
 DISTEL_DOCS=	AUTHORS ChangeLog INSTALL INSTALL.WIN32 NEWS README README.ie-session
 DISTEL_ROOT=	${PREFIX}/lib/erlang/lib/${PORTNAME}-${PORTVERSION}
 
 OPTIONS_DEFINE=	DOCS
 
 do-build:
 	@${MKDIR} ${WRKSRC}/ebin
 	@cd ${WRKSRC} && erlc -W0 -o ebin/ +debug_info src/*.erl
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/${PORTNAME}
 	${INSTALL_DATA} ${WRKSRC}/elisp/*el ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/${PORTNAME}
 
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	for FILE in ${DISTEL_DOCS}; do \
 		${INSTALL_DATA} ${WRKSRC}/$${FILE} ${STAGEDIR}${DOCSDIR}; \
 	done
 	${INSTALL_DATA} ${WRKSRC}/doc/*.pdf ${STAGEDIR}${DOCSDIR}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/html
 	${INSTALL_DATA} ${WRKSRC}/doc/distel/*.html ${STAGEDIR}${DOCSDIR}/html
 
 	@${MKDIR} ${STAGEDIR}${DISTEL_ROOT}/src
 	@${MKDIR} ${STAGEDIR}${DISTEL_ROOT}/ebin
 	${INSTALL_DATA} ${WRKSRC}/src/*.erl ${STAGEDIR}${DISTEL_ROOT}/src
 	${INSTALL_DATA} ${WRKSRC}/ebin/*.beam ${STAGEDIR}${DISTEL_ROOT}/ebin
 
 .include <bsd.port.mk>
diff --git a/devel/dlib/Makefile b/devel/dlib/Makefile
index 7f3fa20f102d..6c9e51f9ff62 100644
--- a/devel/dlib/Makefile
+++ b/devel/dlib/Makefile
@@ -1,33 +1,33 @@
 PORTNAME=	dlib
 PORTVERSION=	1.1.0
-PORTREVISION=	2
+PORTREVISION=	3
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Math, XML, I/O streams, image and audio processing for D
 WWW=		https://github.com/gecko0307/dlib
 
 LICENSE=	BSL
 
 BUILD_DEPENDS=	ldmd2:lang/ldc \
 		dub:devel/dub
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	gecko0307
 
 DUB_CMD=	${LOCALBASE}/bin/dub build --build=release
 D_INCLUDE_DIR=	${PREFIX}/include/d
 D_LIB_DIR=	${PREFIX}/lib/d
 DC=		${PREFIX}/bin/ldmd2
 
 do-build:
 	@cd ${WRKSRC} && DC=${DC} ${DUB_CMD}
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${D_INCLUDE_DIR}/${PORTNAME}
 	@${MKDIR} ${STAGEDIR}${D_LIB_DIR}
 	${INSTALL_DATA} ${WRKSRC}/libdlib.a ${STAGEDIR}${D_LIB_DIR}
 	cd ${WRKSRC}/${PORTNAME} && ${COPYTREE_SHARE} . ${STAGEDIR}${D_INCLUDE_DIR}/${PORTNAME} "-name *\.d"
 
 .include <bsd.port.mk>
diff --git a/devel/dsymbol/Makefile b/devel/dsymbol/Makefile
index aa1e62597ceb..92b96454fb46 100644
--- a/devel/dsymbol/Makefile
+++ b/devel/dsymbol/Makefile
@@ -1,43 +1,43 @@
 PORTNAME=	dsymbol
 PORTVERSION=	0.14.1
-PORTREVISION=	2
+PORTREVISION=	3
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Symbol lookup support for libdparse
 WWW=		https://github.com/dlang-community/dsymbol
 
 LICENSE=	BSL
 
 BUILD_DEPENDS=	ldmd2:lang/ldc \
 		dub:devel/dub \
 		${LOCALBASE}/lib/d/libmir-core.a:devel/mir-core \
 		${LOCALBASE}/lib/d/libdparse.a:devel/libdparse \
 		${LOCALBASE}/lib/d/libemsi_containers.a:devel/containers \
 		${LOCALBASE}/lib/d/libstdx-allocator.a:devel/stdx-allocator
 
 USES=		pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	dlang-community
 
 DUB_CMD=	${LOCALBASE}/bin/dub build --build=release
 D_INCLUDE_DIR=	${PREFIX}/include/d
 D_LIB_DIR=	${PREFIX}/lib/d
 DC=		${PREFIX}/bin/ldmd2
 
 post-patch:
 	${REINPLACE_CMD} -e '7,11d' ${WRKSRC}/dub.json
 	${REINPLACE_CMD} -e 's@cache.clear@cache.destroy@g' \
 		${WRKSRC}/src/dsymbol/modulecache.d
 
 do-build:
 	@cd ${WRKSRC} && DC=${DC} ${DUB_CMD}
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${D_INCLUDE_DIR}
 	@${MKDIR} ${STAGEDIR}${D_LIB_DIR}
 	${INSTALL_DATA} ${WRKSRC}/build/libdsymbol.a ${STAGEDIR}${D_LIB_DIR}
 	cd ${WRKSRC}/src && ${COPYTREE_SHARE} . ${STAGEDIR}${D_INCLUDE_DIR} "-name *\.d"
 
 .include <bsd.port.mk>
diff --git a/devel/dub/Makefile b/devel/dub/Makefile
index 698a1f1bc295..14ab9c3b248f 100644
--- a/devel/dub/Makefile
+++ b/devel/dub/Makefile
@@ -1,31 +1,31 @@
 PORTNAME=	dub
 PORTVERSION=	1.29.0
-PORTREVISION=	2
+PORTREVISION=	3
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Package and build manager for D applications and libraries
 WWW=		https://github.com/dlang/dub
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	ldmd2:lang/ldc
 LIB_DEPENDS=	libcurl.so:ftp/curl
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	dlang
 
 PLIST_FILES=	bin/${PORTNAME}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PORTVERSION%%|${PORTVERSION}|g' ${WRKSRC}/source/dub/version_.d
 
 do-build:
 	@cd ${WRKSRC} && ${PREFIX}/bin/ldmd2 -run build.d
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} ${STAGEDIR}/${PREFIX}/bin/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/devel/dwarves/Makefile b/devel/dwarves/Makefile
index 8c4ec053a2dd..b3e9cffbaeae 100644
--- a/devel/dwarves/Makefile
+++ b/devel/dwarves/Makefile
@@ -1,59 +1,60 @@
 PORTNAME=	dwarves
 DISTVERSION=	1.19
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	https://fedorapeople.org/~acme/dwarves/
 
 MAINTAINER=	cem@FreeBSD.org
 COMMENT=	Debugging Information Manipulation Tools (pahole & friends)
 WWW=		https://acmel.wordpress.com
 
 LICENSE=	BSD2CLAUSE GPLv2 LGPL21
 LICENSE_COMB=	multi
 LICENSE_FILE_BSD2CLAUSE=	${WRKSRC}/lib/bpf/LICENSE.BSD-2-Clause
 LICENSE_FILE_GPLv2=	${WRKSRC}/COPYING
 LICENSE_FILE_LGPL21=	${WRKSRC}/lib/bpf/LICENSE.LPGL-2.1
 
 BUILD_DEPENDS=	gnulib>=0:devel/gnulib
 LIB_DEPENDS=	libargp.so:devel/argp-standalone \
 		libdw.so:devel/elfutils
 
 USES=		cmake gettext python:3.7+,env shebangfix tar:xz
 USE_GCC=	yes
 USE_LDCONFIG=	yes
 
 SHEBANG_FILES=	btfdiff fullcircle ostra/ostra-cg ostra/python/ostra.py
 
 CFLAGS+=	-I${WRKSRC} -Wno-attributes
 
 OPTIONS_DEFINE=		MANPAGES
 OPTIONS_DEFAULT=	MANPAGES
 OPTIONS_SUB=		yes
 
 post-patch:
 	${REINPLACE_CMD} -e 's,#include <malloc.h>,#include <stdlib.h>,' \
 	    ${WRKSRC}/*.c
 	@${MKDIR} ${WRKSRC}/asm \
 	    ${WRKSRC}/bits \
 	    ${WRKSRC}/linux
 	${LN} -s ${WRKSRC}/freebsd_compat.h ${WRKSRC}/asm/bitsperlong.h
 	${LN} -s ${WRKSRC}/freebsd_compat.h ${WRKSRC}/asm/errno.h
 	${LN} -s ${WRKSRC}/freebsd_compat.h ${WRKSRC}/asm/posix_types.h
 	${LN} -s ${WRKSRC}/freebsd_compat.h ${WRKSRC}/asm/types.h
 	${LN} -s ${WRKSRC}/freebsd_compat.h ${WRKSRC}/asm/unistd.h
 	${LN} -s ${WRKSRC}/freebsd_compat.h ${WRKSRC}/bits/reg.h
 	${LN} -s ${WRKSRC}/freebsd_compat.h ${WRKSRC}/endian.h
 	${LN} -s ${WRKSRC}/freebsd_compat.h ${WRKSRC}/exitfail.h
 	${LN} -s ${WRKSRC}/freebsd_compat.h ${WRKSRC}/gettext.h
 	${LN} -s ${WRKSRC}/freebsd_compat.h ${WRKSRC}/linux/limits.h
 	${LN} -s ${WRKSRC}/freebsd_compat.h ${WRKSRC}/linux/types.h
 	${LN} -s ${WRKSRC}/freebsd_compat.h ${WRKSRC}/vasnprintf.h
 
 pre-configure:
 	${CP} -a \
 	    ${LOCALBASE}/share/gnulib/lib/obstack.c \
 	    ${LOCALBASE}/share/gnulib/lib/obstack.h \
 	    ${WRKSRC}
 	${REINPLACE_CMD} -e 's,_GL_ATTRIBUTE_PURE,__attribute__((pure)),g' \
 	    ${WRKSRC}/obstack.c ${WRKSRC}/obstack.h
 
 .include <bsd.port.mk>
diff --git a/devel/efivar/Makefile b/devel/efivar/Makefile
index 8e369b63e4cb..12975a8454a8 100644
--- a/devel/efivar/Makefile
+++ b/devel/efivar/Makefile
@@ -1,51 +1,51 @@
 PORTNAME=	efivar
 PORTVERSION=	0.15
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	devel
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tools and library to manipulate EFI variables
 WWW=		https://github.com/rhboot/efivar
 
 LICENSE=	LGPL21
 
 NOT_FOR_ARCHS=		powerpc powerpc64 powerpspe sparc64
 NOT_FOR_ARCHS_REASON=	specification only supports little-endian processors
 
 LIB_DEPENDS=	libpopt.so:devel/popt
 
 USES=		gmake localbase pkgconfig
 USE_GCC=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	rhboot
 USE_LDCONFIG=	yes
 
 .include <bsd.port.pre.mk>
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/src/efivar.pc.in
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/efivar ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_LIB} ${WRKSRC}/src/libefivar.so ${STAGEDIR}${PREFIX}/lib
 	${INSTALL_LIB} ${WRKSRC}/src/libefivar.so.0 ${STAGEDIR}${PREFIX}/lib
 	${INSTALL_DATA} ${WRKSRC}/src/efivar.h ${STAGEDIR}${PREFIX}/include
 	${INSTALL_DATA} ${WRKSRC}/src/efivar-guids.h ${STAGEDIR}${PREFIX}/include
 	${INSTALL_DATA} ${WRKSRC}/src/efivar.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig
 	${INSTALL_MAN} ${WRKSRC}/docs/efivar.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/docs/efi_append_variable.3 ${STAGEDIR}${MAN1PREFIX}/man/man3
 	${INSTALL_MAN} ${WRKSRC}/docs/efi_del_variable.3 ${STAGEDIR}${MAN1PREFIX}/man/man3
 	${INSTALL_MAN} ${WRKSRC}/docs/efi_get_next_variable_name.3 ${STAGEDIR}${MAN1PREFIX}/man/man3
 	${INSTALL_MAN} ${WRKSRC}/docs/efi_get_variable.3 ${STAGEDIR}${MAN1PREFIX}/man/man3
 	${INSTALL_MAN} ${WRKSRC}/docs/efi_get_variable_attributes.3 ${STAGEDIR}${MAN1PREFIX}/man/man3
 	${INSTALL_MAN} ${WRKSRC}/docs/efi_get_variable_size.3 ${STAGEDIR}${MAN1PREFIX}/man/man3
 	${INSTALL_MAN} ${WRKSRC}/docs/efi_guid_to_name.3 ${STAGEDIR}${MAN1PREFIX}/man/man3
 	${INSTALL_MAN} ${WRKSRC}/docs/efi_guid_to_str.3 ${STAGEDIR}${MAN1PREFIX}/man/man3
 	${INSTALL_MAN} ${WRKSRC}/docs/efi_guid_to_symbol.3 ${STAGEDIR}${MAN1PREFIX}/man/man3
 	${INSTALL_MAN} ${WRKSRC}/docs/efi_name_to_guid.3 ${STAGEDIR}${MAN1PREFIX}/man/man3
 	${INSTALL_MAN} ${WRKSRC}/docs/efi_set_variable.3 ${STAGEDIR}${MAN1PREFIX}/man/man3
 	${INSTALL_MAN} ${WRKSRC}/docs/efi_str_to_guid.3 ${STAGEDIR}${MAN1PREFIX}/man/man3
 	${INSTALL_MAN} ${WRKSRC}/docs/efi_symbol_to_guid.3 ${STAGEDIR}${MAN1PREFIX}/man/man3
 	${INSTALL_MAN} ${WRKSRC}/docs/efi_variables_supported.3 ${STAGEDIR}${MAN1PREFIX}/man/man3
 
 .include <bsd.port.post.mk>
diff --git a/devel/epl.el/Makefile b/devel/epl.el/Makefile
index e376f572a023..c4a35c18a2cd 100644
--- a/devel/epl.el/Makefile
+++ b/devel/epl.el/Makefile
@@ -1,25 +1,25 @@
 PORTNAME=	epl.el
 PORTVERSION=	0.8
-PORTREVISION=	11
+PORTREVISION=	13
 CATEGORIES=	devel elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Emacs Package Library
 WWW=		https://github.com/cask/epl
 
 LICENSE=	GPLv3
 
 USES=		emacs
 USE_GITHUB=	yes
 GH_ACCOUNT=	cask
 GH_PROJECT=	epl
 
 NO_BUILD=	yes
 PLIST_FILES=	${EMACS_SITE_LISPDIR}/epl.el
 
 do-install:
 	(cd ${WRKSRC} && ${INSTALL_DATA} ${PLIST_FILES:M*.el:T} \
 	    ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR})
 
 .include <bsd.port.mk>
diff --git a/devel/forge-devel/Makefile b/devel/forge-devel/Makefile
index ef0582916d9c..0bb6b863c730 100644
--- a/devel/forge-devel/Makefile
+++ b/devel/forge-devel/Makefile
@@ -1,87 +1,88 @@
 PORTNAME=	forge
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.3.2-96
+PORTREVISION=	5
 DISTVERSIONSUFFIX=	-gba35ffc
 CATEGORIES=	devel elisp
 PKGNAMESUFFIX=	-devel${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	yasu@FreeBSD.org
 COMMENT=	Work with Git forges from the comfort of Magit (Development Version)
 WWW=		https://github.com/magit/forge
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	closql${EMACS_PKGNAMESUFFIX}>=1.2.0:databases/closql@${EMACS_FLAVOR} \
 		compat.el${EMACS_PKGNAMESUFFIX}>=28.1.1.0:misc/compat.el@${EMACS_FLAVOR} \
 		dash.el${EMACS_PKGNAMESUFFIX}>=2.19.1:devel/dash.el@${EMACS_FLAVOR} \
 		emacsql${EMACS_PKGNAMESUFFIX}>=3.0.0:databases/emacsql@${EMACS_FLAVOR} \
 		ghub-devel${EMACS_PKGNAMESUFFIX}>=3.5.4:devel/ghub-devel@${EMACS_FLAVOR} \
 		magit-devel${EMACS_PKGNAMESUFFIX}>=3.3.0:devel/magit-devel@${EMACS_FLAVOR} \
 		markdown-mode.el${EMACS_PKGNAMESUFFIX}>=2.4:textproc/markdown-mode.el@${EMACS_FLAVOR} \
 		transient-devel${EMACS_PKGNAMESUFFIX}>=0.3.6:devel/transient-devel@${EMACS_FLAVOR} \
 		yaml.el${EMACS_PKGNAMESUFFIX}>=0.3.4:textproc/yaml.el@${EMACS_FLAVOR}
 RUN_DEPENDS=	closql${EMACS_PKGNAMESUFFIX}>=1.2.0:databases/closql@${EMACS_FLAVOR} \
 		compat.el${EMACS_PKGNAMESUFFIX}>=28.1.1.0:misc/compat.el@${EMACS_FLAVOR} \
 		dash.el${EMACS_PKGNAMESUFFIX}>=2.19.1:devel/dash.el@${EMACS_FLAVOR} \
 		emacsql${EMACS_PKGNAMESUFFIX}>=3.0.0:databases/emacsql@${EMACS_FLAVOR} \
 		ghub-devel${EMACS_PKGNAMESUFFIX}>=3.5.4:devel/ghub-devel@${EMACS_FLAVOR} \
 		magit-devel${EMACS_PKGNAMESUFFIX}>=3.3.0:devel/magit-devel@${EMACS_FLAVOR} \
 		markdown-mode.el${EMACS_PKGNAMESUFFIX}>=2.4:textproc/markdown-mode.el@${EMACS_FLAVOR} \
 		transient-devel${EMACS_PKGNAMESUFFIX}>=0.3.6:devel/transient-devel@${EMACS_FLAVOR} \
 		yaml.el${EMACS_PKGNAMESUFFIX}>=0.3.4:textproc/yaml.el@${EMACS_FLAVOR}
 
 USES=		emacs gmake makeinfo
 USE_GITHUB=	yes
 GH_ACCOUNT=	magit
 
 MAKE_ENV+=	INSTALL_INFO=install-info \
 		LOAD_PATH="${LOAD_PATH}"
 # Parallel build fails if Emacs is built with native compilation enabled
 MAKE_JOBS_UNSAFE=	yes
 ALL_TARGET=	lisp info
 
 CONFLICTS=	forge-emacs*
 
 NO_ARCH=	yes
 
 INFO=		forge
 PORTDOCS=	CHANGELOG README.org forge.html
 
 OPTIONS_DEFINE=	DOCS PDF
 OPTIONS_SUB=	yes
 
 PDF_DESC=	Build and install PDF document
 
 DOCS_BUILD_DEPENDS=	gsed:textproc/gsed
 DOCS_ALL_TARGET=	html
 DOCS_BINARY_ALIAS=	sed=gsed
 PDF_BUILD_DEPENDS=	texi2pdf:print/texinfo
 PDF_USES=		tex
 PDF_USE=		TEX=dvipdfmx:build
 PDF_ALL_TARGET=		pdf
 
 LOAD_PATH=	-L ${PREFIX}/${EMACS_SITE_LISPDIR} -L \
 		${PREFIX}/${EMACS_VERSION_SITE_LISPDIR} -L \
 		${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/closql -L \
 		${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/compat -L \
 		${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/emacsql -L \
 		${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/ghub -L \
 		${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/magit
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
 	${INSTALL_DATA} ${WRKSRC}/lisp/*.el* \
 	${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
 	${INSTALL_DATA} ${WRKSRC}/docs/*.info ${STAGEDIR}${PREFIX}/${INFO_PATH}
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/CHANGELOG ${WRKSRC}/README.org \
 		${WRKSRC}/docs/forge.html ${STAGEDIR}${DOCSDIR}
 
 do-install-PDF-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/forge.pdf ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/devel/forge/Makefile b/devel/forge/Makefile
index 8feca75957c5..5b45104cb834 100644
--- a/devel/forge/Makefile
+++ b/devel/forge/Makefile
@@ -1,84 +1,84 @@
 PORTNAME=	forge
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.3.1
-PORTREVISION=	4
+PORTREVISION=	9
 CATEGORIES=	devel elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	yasu@FreeBSD.org
 COMMENT=	Work with Git forges from the comfort of Magit
 WWW=		https://github.com/magit/forge
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	closql${EMACS_PKGNAMESUFFIX}>=1.2.0:databases/closql@${EMACS_FLAVOR} \
 		dash.el${EMACS_PKGNAMESUFFIX}>=2.19.1:devel/dash.el@${EMACS_FLAVOR} \
 		emacsql${EMACS_PKGNAMESUFFIX}>=3.0.0:databases/emacsql@${EMACS_FLAVOR} \
 		ghub${EMACS_PKGNAMESUFFIX}>=3.5.4:devel/ghub@${EMACS_FLAVOR} \
 		magit${EMACS_PKGNAMESUFFIX}>=3.3.0:devel/magit@${EMACS_FLAVOR} \
 		markdown-mode.el${EMACS_PKGNAMESUFFIX}>=2.4:textproc/markdown-mode.el@${EMACS_FLAVOR} \
 		transient${EMACS_PKGNAMESUFFIX}>=0.3.6:devel/transient@${EMACS_FLAVOR} \
 		yaml.el${EMACS_PKGNAMESUFFIX}>=0.3.4:textproc/yaml.el@${EMACS_FLAVOR}
 RUN_DEPENDS=	closql${EMACS_PKGNAMESUFFIX}>=1.2.0:databases/closql@${EMACS_FLAVOR} \
 		dash.el${EMACS_PKGNAMESUFFIX}>=2.19.1:devel/dash.el@${EMACS_FLAVOR} \
 		emacsql${EMACS_PKGNAMESUFFIX}>=3.0.0:databases/emacsql@${EMACS_FLAVOR} \
 		ghub${EMACS_PKGNAMESUFFIX}>=3.5.4:devel/ghub@${EMACS_FLAVOR} \
 		magit${EMACS_PKGNAMESUFFIX}>=3.3.0:devel/magit@${EMACS_FLAVOR} \
 		markdown-mode.el${EMACS_PKGNAMESUFFIX}>=2.4:textproc/markdown-mode.el@${EMACS_FLAVOR} \
 		transient${EMACS_PKGNAMESUFFIX}>=0.3.6:devel/transient@${EMACS_FLAVOR} \
 		yaml.el${EMACS_PKGNAMESUFFIX}>=0.3.4:textproc/yaml.el@${EMACS_FLAVOR}
 
 USES=		emacs gmake makeinfo
 USE_GITHUB=	yes
 GH_ACCOUNT=	magit
 
 MAKE_ENV+=	INSTALL_INFO=install-info \
 		LOAD_PATH="${LOAD_PATH}"
 # Parallel build fails if Emacs is built with native compilation enabled
 MAKE_JOBS_UNSAFE=	yes
 ALL_TARGET=	lisp info
 
 CONFLICTS=	forge-devel*
 
 NO_ARCH=	yes
 
 INFO=		forge
 PORTDOCS=	CHANGELOG README.md forge.html
 
 OPTIONS_DEFINE=	DOCS PDF
 OPTIONS_SUB=	yes
 
 PDF_DESC=	Build and install PDF document
 
 DOCS_BUILD_DEPENDS=	gsed:textproc/gsed
 DOCS_ALL_TARGET=	html
 DOCS_BINARY_ALIAS=	sed=gsed
 PDF_BUILD_DEPENDS=	texi2pdf:print/texinfo
 PDF_USES=		tex
 PDF_USE=		TEX=dvipdfmx:build
 PDF_ALL_TARGET=		pdf
 
 LOAD_PATH=	-L ${PREFIX}/${EMACS_SITE_LISPDIR} -L \
 		${PREFIX}/${EMACS_VERSION_SITE_LISPDIR} -L \
 		${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/closql -L \
 		${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/emacsql -L \
 		${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/ghub -L \
 		${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/magit
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
 	${INSTALL_DATA} ${WRKSRC}/lisp/*.el* \
 	${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
 	${INSTALL_DATA} ${WRKSRC}/docs/*.info ${STAGEDIR}${PREFIX}/${INFO_PATH}
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/CHANGELOG ${WRKSRC}/README.md \
 		${WRKSRC}/docs/forge.html ${STAGEDIR}${DOCSDIR}
 
 do-install-PDF-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/forge.pdf ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/devel/freebsd-gcc12/Makefile b/devel/freebsd-gcc12/Makefile
index ad8ab9921dbf..dd000f5624e3 100644
--- a/devel/freebsd-gcc12/Makefile
+++ b/devel/freebsd-gcc12/Makefile
@@ -1,153 +1,154 @@
 PORTNAME=	gcc
 PORTVERSION=	12.2.0
+PORTREVISION=	8
 CATEGORIES=	devel
 MASTER_SITES=	GCC
 PKGNAMEPREFIX=	${TARGETARCH}-
 PKGNAMESUFFIX=	${SUFFIX}
 
 MAINTAINER=	jhb@FreeBSD.org
 COMMENT=	Cross GNU Compiler Collection for ${TARGETARCH}
 WWW=		https://gcc.gnu.org/
 
 LICENSE=	GPLv3 GPLv3RLE
 LICENSE_COMB=	multi
 
 IGNORE_FreeBSD_12= Not supported on FreeBSD 12
 
 BUILD_DEPENDS=	${BU_PREFIX}-as:devel/binutils@${BU_FLAVOR} \
 		objdump:devel/binutils
 LIB_DEPENDS=	libgmp.so:math/gmp \
 		libmpfr.so:math/mpfr \
 		libmpc.so:math/mpc
 RUN_DEPENDS=	${BU_PREFIX}-as:devel/binutils@${BU_FLAVOR}
 
 FLAVORS=	aarch64 amd64 armv6 armv7 i386 powerpc powerpc64 riscv64
 TARGETARCH=	${FLAVOR}
 
 USES=		compiler:c++11-lang cpe gmake iconv libtool makeinfo tar:xz
 CPE_VENDOR=	gnu
 
 PLIST_SUB=	OPSYS=${OPSYS:tl} \
 		SUFFIX=${SUFFIX} \
 		TARGETARCH=${TARGETARCH} \
 		GCC_TARGET=${GCC_TARGET} \
 		GCC_VERSION=${PORTVERSION}
 
 SUB_FILES=	xtoolchain.mk
 SUB_LIST=	BU_PREFIX=${BU_PREFIX} \
 		GCC_TARGET=${GCC_TARGET} \
 		SUFFIX=${SUFFIX}
 
 SUFFIX=		${PORTVERSION:C/([0-9]+).*/\1/}
 
 GNU_CONFIGURE=	yes
 CONFIGURE_OUTSOURCE=	yes
 CONFIGURE_ARGS+=--target=${GCC_TARGET} --disable-nls --enable-languages=c,c++ \
 		--enable-gnu-indirect-function \
 		--enable-initfini-array \
 		--program-prefix=${GCC_TARGET}- \
 		--program-suffix=${SUFFIX} \
 		--without-headers \
 		--with-gmp=${LOCALBASE} \
 		--with-pkgversion="FreeBSD Ports Collection for ${PKGNAMEPREFIX:C/-//g}" \
 		--with-system-zlib \
 		--without-zstd \
 		--with-gxx-include-dir=/usr/include/c++/v1/ \
 		--with-sysroot="/" \
 		--with-as=${LOCALBASE}/bin/${BU_PREFIX}-as \
 		--with-ld=${LOCALBASE}/bin/${BU_PREFIX}-ld
 
 .if ${TARGETARCH:Mpowerpc64*}
 CONFIGURE_ARGS+=--with-abi=elfv2
 .endif
 
 ALL_TARGET=	all-gcc
 INSTALL_TARGET=	install-gcc
 
 .include <bsd.port.pre.mk>
 
 .if ${TARGETARCH:Marm*}
 TARGET_ABI=	gnueabi
 BU_FLAVOR=	arm_${TARGET_ABI}
 BU_PREFIX=	arm-${TARGET_ABI}-${OPSYS:tl}${OSREL}
 .else
 TARGET_ABI=	unknown
 BU_FLAVOR=	${TARGETARCH}
 BU_PREFIX=	${GCC_TARGET}
 .endif
 GCC_TARGET=	${TARGETARCH:S/amd64/x86_64/}-${TARGET_ABI}-${OPSYS:tl}${OSREL}
 
 post-patch:
 	@${REINPLACE_CMD} -e '/LIBSTDCXX/ s/stdc\+\+/c\+\+/g ' \
 		${WRKSRC}//gcc/cp/g++spec.cc
 	@${REINPLACE_CMD} -e '/LOCAL_INCLUDE_DIR/ d ' \
 		${WRKSRC}//gcc/Makefile.in
 
 .if ${ARCH} == "amd64"
 CONFIGURE_TARGET=	x86_64-unknown-${OPSYS:tl}${OSREL}
 .else
 CONFIGURE_TARGET=	${ARCH}-unknown-${OPSYS:tl}${OSREL}
 .endif
 
 .if ${TARGETARCH:Marm*} || ${TARGETARCH} == "aarch64"
 . if ${CHOSEN_COMPILER_TYPE} == clang
 MAKE_ARGS+=CXXFLAGS=-fbracket-depth=512
 . endif
 .endif
 
 .if ${TARGETARCH} == "amd64" || ${TARGETARCH} == "powerpc64"
 CONFIGURE_ARGS+=--enable-multilib
 .endif
 
 .if ${ARCH} == "aarch64"
 PLIST_SUB+=	PLUGINS="@comment plugin does not build"
 .else
 PLIST_SUB+=	PLUGINS=""
 .endif
 
 .if ${TARGETARCH} == "amd64" || ${TARGETARCH} == "i386"
 PLIST_SUB+=	FLOAT_H="@comment "
 .else
 PLIST_SUB+=	FLOAT_H=""
 .endif
 
 PLIST=		${.CURDIR}/pkg-plist
 
 .if ${TARGETARCH} == "aarch64"
 PLIST+=		${.CURDIR}/pkg-plist.aarch64
 .endif
 .if ${TARGETARCH} == "aarch64" || ${TARGETARCH:Marm*}
 PLIST+=		${.CURDIR}/pkg-plist.arm
 .endif
 .if ${TARGETARCH:Marm*}
 PLIST+=		${.CURDIR}/pkg-plist.arm_gnueabi
 .endif
 .if ${TARGETARCH} == "amd64"
 PLIST+=		${.CURDIR}/pkg-plist.amd64
 .endif
 .if ${TARGETARCH} == "amd64" || ${TARGETARCH} == "i386"
 PLIST+=		${.CURDIR}/pkg-plist.i386
 .endif
 .if ${TARGETARCH:Mpowerpc64*}
 PLIST+=		${.CURDIR}/pkg-plist.powerpc64
 .elif ${TARGETARCH:Mpowerpc*}
 PLIST+=		${.CURDIR}/pkg-plist.powerpc
 .endif
 .if ${TARGETARCH:Mriscv*}
 PLIST+=		${.CURDIR}/pkg-plist.riscv
 .endif
 
 post-install:
 	@${RM} ${STAGEDIR}${PREFIX}/bin/${GCC_TARGET}-${GCC_TARGET}-*
 	@${RM} ${STAGEDIR}${PREFIX}/share/info/*
 	@${RM} ${STAGEDIR}${PREFIX}/man/man7/*
 	@${RM} -r ${STAGEDIR}${PREFIX}/lib/gcc/${GCC_TARGET}/${PORTVERSION}/include-fixed
 .if ${TARGETARCH} == "amd64" || ${TARGETARCH} == "i386"
 	# Conflicts with sys/x86/include/float.h
 	${RM} ${STAGEDIR}${PREFIX}/lib/gcc/${GCC_TARGET}/${PORTVERSION}/include/float.h
 .endif
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/toolchains/
 	${INSTALL_DATA} ${WRKDIR}/xtoolchain.mk \
 		${STAGEDIR}${PREFIX}/share/toolchains/${TARGETARCH}-gcc${SUFFIX}.mk
 
 .include <bsd.port.post.mk>
diff --git a/devel/freebsd-gcc9/Makefile b/devel/freebsd-gcc9/Makefile
index a2d546dea341..3ab8b7af908e 100644
--- a/devel/freebsd-gcc9/Makefile
+++ b/devel/freebsd-gcc9/Makefile
@@ -1,157 +1,158 @@
 PORTNAME=	gcc
 PORTVERSION=	9.5.0
+PORTREVISION=	11
 CATEGORIES=	devel
 MASTER_SITES=	GCC
 PKGNAMEPREFIX=	${TARGETARCH}-
 PKGNAMESUFFIX=	${SUFFIX}
 
 MAINTAINER=	jhb@FreeBSD.org
 COMMENT=	Cross GNU Compiler Collection for ${TARGETARCH}
 WWW=		https://gcc.gnu.org/
 
 LICENSE=	GPLv3 GPLv3RLE
 LICENSE_COMB=	multi
 
 BUILD_DEPENDS=	${BU_PREFIX}-as:devel/binutils@${BU_FLAVOR} \
 		objdump:devel/binutils
 LIB_DEPENDS=	libgmp.so:math/gmp \
 		libmpfr.so:math/mpfr \
 		libmpc.so:math/mpc
 RUN_DEPENDS=	${BU_PREFIX}-as:devel/binutils@${BU_FLAVOR}
 
 FLAVORS=	aarch64 amd64 armv6 armv7 i386 mips mips64 powerpc powerpc64 riscv64 sparc64
 TARGETARCH=	${FLAVOR}
 
 USES=		compiler:c++11-lang cpe gmake iconv libtool makeinfo tar:xz
 CPE_VENDOR=	gnu
 
 PLIST_SUB=	OPSYS=${OPSYS:tl} \
 		SUFFIX=${SUFFIX} \
 		TARGETARCH=${TARGETARCH} \
 		GCC_TARGET=${GCC_TARGET} \
 		GCC_VERSION=${PORTVERSION}
 
 SUB_FILES=	xtoolchain.mk
 SUB_LIST=	BU_PREFIX=${BU_PREFIX} \
 		GCC_TARGET=${GCC_TARGET} \
 		SUFFIX=${SUFFIX}
 
 SUFFIX=		${PORTVERSION:C/([0-9]+).*/\1/}
 
 GNU_CONFIGURE=	yes
 CONFIGURE_OUTSOURCE=	yes
 CONFIGURE_ARGS+=--target=${GCC_TARGET} --disable-nls --enable-languages=c,c++ \
 		--enable-gnu-indirect-function \
 		--enable-initfini-array \
 		--program-prefix=${GCC_TARGET}- \
 		--program-suffix=${SUFFIX} \
 		--without-headers \
 		--with-gmp=${LOCALBASE} \
 		--with-pkgversion="FreeBSD Ports Collection for ${PKGNAMEPREFIX:C/-//g}" \
 		--with-system-zlib \
 		--without-zstd \
 		--with-gxx-include-dir=/usr/include/c++/v1/ \
 		--with-sysroot="/" \
 		--with-as=${LOCALBASE}/bin/${BU_PREFIX}-as \
 		--with-ld=${LOCALBASE}/bin/${BU_PREFIX}-ld
 
 .if ${TARGETARCH:Mpowerpc64*}
 CONFIGURE_ARGS+=--with-abi=elfv2
 .endif
 
 ALL_TARGET=	all-gcc
 INSTALL_TARGET=	install-gcc
 
 .include <bsd.port.pre.mk>
 
 .if ${TARGETARCH:Marm*}
 TARGET_ABI=	gnueabi
 BU_FLAVOR=	arm_${TARGET_ABI}
 BU_PREFIX=	arm-${TARGET_ABI}-${OPSYS:tl}${OSREL}
 .else
 TARGET_ABI=	unknown
 BU_FLAVOR=	${TARGETARCH}
 BU_PREFIX=	${GCC_TARGET}
 .endif
 GCC_TARGET=	${TARGETARCH:S/amd64/x86_64/}-${TARGET_ABI}-${OPSYS:tl}${OSREL}
 
 post-patch:
 	@${REINPLACE_CMD} -e '/LIBSTDCXX/ s/stdc\+\+/c\+\+/g ' \
 		${WRKSRC}//gcc/cp/g++spec.c
 	@${REINPLACE_CMD} -e '/LOCAL_INCLUDE_DIR/ d ' \
 		${WRKSRC}//gcc/Makefile.in
 
 .if ${ARCH} == "amd64"
 CONFIGURE_TARGET=	x86_64-unknown-${OPSYS:tl}${OSREL}
 .else
 CONFIGURE_TARGET=	${ARCH}-unknown-${OPSYS:tl}${OSREL}
 .endif
 
 .if ${TARGETARCH:Marm*} || ${TARGETARCH} == "aarch64"
 . if ${CHOSEN_COMPILER_TYPE} == clang
 MAKE_ARGS+=CXXFLAGS=-fbracket-depth=512
 . endif
 .endif
 
 .if ${TARGETARCH} == "amd64" || ${TARGETARCH} == "powerpc64"
 CONFIGURE_ARGS+=--enable-multilib
 .endif
 
 .if ${ARCH} == "aarch64"
 PLIST_SUB+=	PLUGINS="@comment plugin does not build"
 .else
 PLIST_SUB+=	PLUGINS=""
 .endif
 
 .if ${TARGETARCH} == "amd64" || ${TARGETARCH} == "i386"
 PLIST_SUB+=	FLOAT_H="@comment "
 .else
 PLIST_SUB+=	FLOAT_H=""
 .endif
 
 PLIST=		${.CURDIR}/pkg-plist
 
 .if ${TARGETARCH} == "aarch64"
 PLIST+=		${.CURDIR}/pkg-plist.aarch64
 .endif
 .if ${TARGETARCH} == "aarch64" || ${TARGETARCH:Marm*}
 PLIST+=		${.CURDIR}/pkg-plist.arm
 .endif
 .if ${TARGETARCH:Marm*}
 PLIST+=		${.CURDIR}/pkg-plist.arm_gnueabi
 .endif
 .if ${TARGETARCH} == "amd64"
 PLIST+=		${.CURDIR}/pkg-plist.amd64
 .endif
 .if ${TARGETARCH} == "amd64" || ${TARGETARCH} == "i386"
 PLIST+=		${.CURDIR}/pkg-plist.i386
 .endif
 .if ${TARGETARCH:Mmips*}
 PLIST+=		${.CURDIR}/pkg-plist.mips
 .endif
 .if ${TARGETARCH:Mpowerpc64*}
 PLIST+=		${.CURDIR}/pkg-plist.powerpc64
 .elif ${TARGETARCH:Mpowerpc*}
 PLIST+=		${.CURDIR}/pkg-plist.powerpc
 .endif
 .if ${TARGETARCH:Mriscv*}
 PLIST+=		${.CURDIR}/pkg-plist.riscv
 .endif
 .if ${TARGETARCH} == "sparc64"
 PLIST+=		${.CURDIR}/pkg-plist.sparc64
 .endif
 
 post-install:
 	@${RM} ${STAGEDIR}${PREFIX}/bin/${GCC_TARGET}-${GCC_TARGET}-*
 	@${RM} ${STAGEDIR}${PREFIX}/share/info/*
 	@${RM} ${STAGEDIR}${PREFIX}/man/man7/*
 	@${RM} -r ${STAGEDIR}${PREFIX}/lib/gcc/${GCC_TARGET}/${PORTVERSION}/include-fixed
 .if ${TARGETARCH} == "amd64" || ${TARGETARCH} == "i386"
 	# Conflicts with sys/x86/include/float.h
 	${RM} ${STAGEDIR}${PREFIX}/lib/gcc/${GCC_TARGET}/${PORTVERSION}/include/float.h
 .endif
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/toolchains/
 	${INSTALL_DATA} ${WRKDIR}/xtoolchain.mk \
 		${STAGEDIR}${PREFIX}/share/toolchains/${TARGETARCH}-gcc${SUFFIX}.mk
 
 .include <bsd.port.post.mk>
diff --git a/devel/ga/Makefile b/devel/ga/Makefile
index cad2cd930dd9..2db9207f758e 100644
--- a/devel/ga/Makefile
+++ b/devel/ga/Makefile
@@ -1,42 +1,43 @@
 PORTNAME=	ga
 DISTVERSION=	5.8.1
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	https://github.com/GlobalArrays/ga/releases/download/v${DISTVERSION}/
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Partitioned Global Address Space (PGAS) library for distributed arrays
 WWW=		https://hpc.pnl.gov//globalarrays/
 
 LICENSE=	BMIL
 LICENSE_NAME=	Battelle Memorial Institute License
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 LIB_DEPENDS=	libblas.so:math/blas \
 		liblapack.so:math/lapack \
 		libscalapack.so:math/scalapack
 
 USES=		autoreconf fortran gmake libtool localbase
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-peigs --enable-shared --disable-static --with-blas4 --with-scalapack
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 
 LDFLAGS+=	-lscalapack
 
 OPTIONS_RADIO=		MPI
 OPTIONS_RADIO_MPI=	MPICH OPENMPI
 OPTIONS_DEFAULT=	MPICH # the default should be the same as for the MPI option in math/scalapack
 
 MPICH_LIB_DEPENDS=	libmpich.so:net/mpich
 
 OPENMPI_BUILD_DEPENDS=		openmpi>0:net/openmpi
 OPENMPI_RUN_DEPENDS=		openmpi>0:net/openmpi
 OPENMPI_CONFIGURE_ENV=		CC=${LOCALBASE}/mpi/openmpi/bin/mpicc MPICC=${LOCALBASE}/mpi/openmpi/bin/mpicc \
 				CXX=${LOCALBASE}/mpi/openmpi/bin/mpic++ MPICXX=${LOCALBASE}/mpi/openmpi/bin/mpic++ \
 				F77=${LOCALBASE}/mpi/openmpi/bin/mpif77 MPIF77=${LOCALBASE}/mpi/openmpi/bin/mpif77 \
 				FC=${LOCALBASE}/mpi/openmpi/bin/mpif90 MPIFC=${LOCALBASE}/mpi/openmpi/bin/mpif90 \
 				LDFLAGS="-L${LOCALBASE}/mpi/openmpi/lib -Wl,-rpath,${LOCALBASE}/mpi/openmpi/lib"
 OPENMPI_MAKE_ARGS=		FREEBSD_LINK_FLAGS="-L${LOCALBASE}/mpi/openmpi/lib -Wl,-rpath,${LOCALBASE}/mpi/openmpi/lib -lmpi"
 
 .include <bsd.port.mk>
diff --git a/devel/gcc-msp430-ti-toolchain/Makefile b/devel/gcc-msp430-ti-toolchain/Makefile
index 9bedd25dfca7..7cbd152de6ed 100644
--- a/devel/gcc-msp430-ti-toolchain/Makefile
+++ b/devel/gcc-msp430-ti-toolchain/Makefile
@@ -1,212 +1,212 @@
 PORTNAME=	gcc-msp430-ti-toolchain
 PORTVERSION=	${TI_VERSION}.${RELEASE_DATE}
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	GCC/releases/gcc-${GCC_REL_VERSION}:gcc \
 		SOURCEWARE/binutils/releases:binutils \
 		ftp://sources.redhat.com/pub/:newlib \
 		GNU/gdb:gdb \
 		SOURCEWARE/newlib:newlib \
 		http://software-dl.ti.com/msp430/msp430_public_sw/mcu/msp430/MSPGCC/${TI_VERSION:S/./_/g}/export/:tipatch \
 		http://software-dl.ti.com/msp430/msp430_public_sw/mcu/msp430/MSPGCC/${TI_VERSION:S/./_/g}/export/:tisupport \
 		http://www.ti.com/lit/ug/slau${DOC_VERSION}/:tidocs
 DISTFILES=	gcc-${GCC_REL_VERSION}.tar.xz:gcc \
 		binutils-${BINUTILS_VERSION}.tar.bz2:binutils \
 		gdb-${GDB_VERSION}.tar.xz:gdb \
 		newlib-${NEWLIB_VERSION}.tar.gz:newlib \
 		msp430-gcc-${PATCHSET_VERSION}-source-patches.tar.bz2:tipatch \
 		msp430-gcc-support-files-${SUPPORT_VERSION}.zip:tisupport \
 		slau${DOC_VERSION}.pdf:tidocs
 EXTRACT_ONLY=	gcc-${GCC_REL_VERSION}.tar.xz \
 		binutils-${BINUTILS_VERSION}.tar.bz2 \
 		gdb-${GDB_VERSION}.tar.xz \
 		newlib-${NEWLIB_VERSION}.tar.gz \
 		msp430-gcc-${PATCHSET_VERSION}-source-patches.tar.bz2 \
 		msp430-gcc-support-files-${SUPPORT_VERSION}.zip
 
 MAINTAINER=	lev@FreeBSD.org
 COMMENT=	Complete gcc-based toolcahin for TI MSP430 uC
 WWW=		http://www.ti.com/tool/msp430-gcc-opensource
 
 LICENSE=	GPLv2 LGPL20 LGPL21 GPLv3 LGPL3
 LICENSE_COMB=	multi
 
 BUILD_DEPENDS=	objdump:devel/binutils
 LIB_DEPENDS=	libgmp.so:math/gmp \
 		libmpfr.so:math/mpfr \
 		libmpc.so:math/mpc \
 		libisl.so:devel/isl
 
 # Akami tarpitting fetch by user agent
 FETCH_BEFORE_ARGS=	--user-agent=Wget/1.20.3
 
 USES=		bison compiler cpe gmake iconv libtool makeinfo ncurses \
 		tar:bzip2
 USE_CSTD=	gnu89
 
 GNU_CONFIGURE=		yes
 
 TI_VERSION=		9.3.1.2
 GCC_REL_VERSION=	9.3.0
 GCC_VERSION=		9.3.1
 SUPPORT_VERSION=	1.212
 BINUTILS_VERSION=	2.34
 GDB_VERSION=		9.1
 NEWLIB_VERSION=		2.4.0
 PATCHSET_VERSION=	9.3.1.11
 DOC_VERSION=		646f
 RELEASE_DATE=		20210722
 TARGET=			msp430-elf
 
 CPE_PRODUCT=	gcc
 CPE_VENDOR=	gnu
 CPE_VERSION=	${GCC_REL_VERSION}
 
 PATCH_WRKSRC=	${WRKDIR}
 MANPREFIX=	${PREFIX}/${PORTNAME}-${TI_VERSION}
 DOCSDIR=	${PREFIX}/${PORTNAME}-${TI_VERSION}/docs
 PLIST_SUB+=	TARGET=${TARGET} GCC_VERSION=${GCC_VERSION} \
 		TI_VERSION=${TI_VERSION} DOC_VERSION=${DOC_VERSION}
 
 DIST_PATCH_ARGS=--forward --force --quiet --remove-empty-files --strip=0
 
 UNNEEDED_HOST_FILES=	lib/lib${TARGET}-sim.a
 UNNEEDED_HOST_DIRS=	lib/gcc/${TARGET}/${GCC_VERSION}/plugin/include/ada \
 			lib/gcc/${TARGET}/${GCC_VERSION}/plugin/include/java \
 			lib/gcc/${TARGET}/${GCC_VERSION}/plugin/include/objc \
 			include info man share
 
 BUILD_DIR=	${WRKDIR}/build
 INTERIM_WORLD=	${WRKDIR}/install
 INTERIM_PREFIX=	${INTERIM_WORLD}/${PORTNAME}-${TI_VERSION}
 
 MAKE_ENV=	PATH="${PATH}:${INTERIM_PREFIX}/bin"
 CONFIGURE_ENV=	PATH="${PATH}:${INTERIM_PREFIX}/bin"
 
 GCC_DIRS_FROM_NEWLIB=	libgloss newlib
 
 CONFIGURE_ARGS_COMMON=	--prefix=${INTERIM_PREFIX} \
 			--target=msp430-elf \
 			--enable-languages=c,c++ \
 			--disable-nls \
 			--enable-initfini-array
 
 pre-patch:
 	@${ECHO_MSG} "===> Apply distribution patches..."
 	@${ECHO_MSG} "====> Patch gcc"
 	@cd ${WRKDIR}/gcc-${GCC_REL_VERSION} && \
 	 ${PATCH} ${DIST_PATCH_ARGS} < ${WRKDIR}/msp430-gcc-${PATCHSET_VERSION}-source-patches/gcc-${GCC_REL_VERSION}.patch
 	@${ECHO_MSG} "====> Patch binutils"
 	@cd ${WRKDIR}/binutils-${BINUTILS_VERSION} && \
 	 ${MKDIR} sim/testsuite/sim/msp430 && \
 	 ${PATCH} ${DIST_PATCH_ARGS} < ${WRKDIR}/msp430-gcc-${PATCHSET_VERSION}-source-patches/binutils-${BINUTILS_VERSION:S/./_/g}.patch
 	@${ECHO_MSG} "====> Patch gdb"
 	@cd ${WRKDIR}/gdb-${GDB_VERSION} && \
 	 ${MKDIR} gas/config ld/emultempl && \
 	 ${PATCH} ${DIST_PATCH_ARGS} < ${WRKDIR}/msp430-gcc-${PATCHSET_VERSION}-source-patches/gdb-${GDB_VERSION}-release.patch
 	@${ECHO_MSG} "====> Patch newlib"
 	@cd ${WRKDIR}/newlib-${NEWLIB_VERSION} && \
 	 ${PATCH} ${DIST_PATCH_ARGS} < ${WRKDIR}/msp430-gcc-${PATCHSET_VERSION}-source-patches/newlib-${NEWLIB_VERSION:S/./_/g}.patch
 
 do-configure:
 .for _DIR in ${GCC_DIRS_FROM_NEWLIB}
 	@${LN} -fns ${WRKDIR}/newlib-${NEWLIB_VERSION}/${_DIR} ${WRKDIR}/gcc-${GCC_REL_VERSION}/${_DIR}
 .endfor
 	@${RM} -r ${BUILD_DIR}
 	@${MKDIR} ${BUILD_DIR}
 	@${RM} -r ${INTERIM_PREFIX}
 	@${MKDIR} ${INTERIM_PREFIX}
 
 do-build:
 # Build & install binutils
 	${MKDIR} ${BUILD_DIR}/binutils
 	@cd ${BUILD_DIR}/binutils && \
 		${MAKE_ENV} ${CONFIGURE_ENV} ${WRKDIR}/binutils-${BINUTILS_VERSION}/configure \
 		 ${CONFIGURE_ARGS_COMMON} \
 		 --disable-sim \
 		 --disable-gdb \
 		 --disable-werror \
 		 --with-pkgversion="FreeBSD Ports Collection" \
 	         --with-system-zlib
 	@cd ${BUILD_DIR}/binutils && \
 		${DO_MAKE_BUILD}
 	@cd ${BUILD_DIR}/binutils && \
 		${SETENV} ${MAKE_ENV} ${FAKEROOT} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} install DESTDIR=''
 # Build & install gcc & newlib
 	@${MKDIR} ${BUILD_DIR}/gcc
 	@cd ${BUILD_DIR}/gcc && \
 		${MAKE_ENV} ${CONFIGURE_ENV} ${WRKDIR}/gcc-${GCC_REL_VERSION}/configure \
 		 ${CONFIGURE_ARGS_COMMON} \
 		 --enable-target-optspace \
 		 --enable-newlib-nano-formatted-io \
 		 --with-gmp=${PREFIX} \
 		 --with-mprf=${PREFIX} \
 		 --with-mpc=${PREFIX} \
 		 --with-isl=${PREFIX} \
 		 --with-pkgversion="FreeBSD Ports Collection" \
 		 --with-system-zlib
 	@cd ${BUILD_DIR}/gcc && \
 		${DO_MAKE_BUILD}
 	@cd ${BUILD_DIR}/gcc && \
 		${SETENV} ${MAKE_ENV} ${FAKEROOT} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} install DESTDIR=''
 # Build & install gdb
 	@${MKDIR} ${BUILD_DIR}/gdb
 	@cd ${BUILD_DIR}/gdb && \
 		${MAKE_ENV} ${CONFIGURE_ENV} ${WRKDIR}/gdb-${GDB_VERSION}/configure \
 		 ${CONFIGURE_ARGS_COMMON} \
 		 --disable-binutils \
 		 --disable-gas \
 		 --disable-ld \
 		 --disable-gprof \
 		 --disable-etc \
 		 --without-mpfr \
 		 --without-lzma \
 		 --with-python=no \
 		 --with-pkgversion="FreeBSD Ports Collection" \
 		 --with-system-zlib
 	@cd ${BUILD_DIR}/gdb && \
 		${DO_MAKE_BUILD}
 	@cd ${BUILD_DIR}/gdb && \
 		${SETENV} ${MAKE_ENV} ${FAKEROOT} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} install DESTDIR=''
 # Strip binaries
 .if !defined(DEBUG)
 	@for bin in $$(${FIND} ${INTERIM_PREFIX}/bin -type f -name ${TARGET}-\*) ; do \
 		if ! ${FILE} $$bin | ${GREP} -qs ': ELF' ; then continue ; fi ; \
 		${STRIP_CMD} $${bin} ; \
 	done
 	@for bin in $$(${FIND} ${INTERIM_PREFIX}/${TARGET}/bin -type f -maxdepth 1 -mindepth 1) ; do \
 		if ! ${FILE} $$bin | ${GREP} -qs ': ELF' ; then continue ; fi ; \
 		${STRIP_CMD} $${bin} ; \
 	done
 	@for bin in $$(${FIND} ${INTERIM_PREFIX}/libexec/gcc/${TARGET}/${GCC_VERSION} -type f) ; do \
 		if ! ${FILE} $$bin | ${GREP} -qs ': ELF' ; then continue ; fi ; \
 		${STRIP_CMD} $${bin} ; \
 	done
 	@${STRIP_CMD} ${INTERIM_PREFIX}/lib/libcc1.so.0
 	@for bin in $$(${FIND} ${INTERIM_PREFIX}/lib/gcc/${TARGET}/${GCC_VERSION} -perm +111 -and ! -type d) ; do \
 		if ! ${FILE} $$bin | ${GREP} -qs ': ELF' ; then continue ; fi ; \
 		${STRIP_CMD} $${bin} ; \
 	done
 .endif
 
 do-install:
 	@${TAR} -cf - -C ${INTERIM_WORLD} ${PORTNAME}-${TI_VERSION} | ${TAR} -xf - -C ${STAGEDIR}${PREFIX}
 	@${ECHO_MSG} "Remove unneeded host files..."
 	@for f in ${UNNEEDED_HOST_FILES} ; do \
 		${RM} "${STAGEDIR}${PREFIX}/$$f" ; \
 	done
 	@for f in ${UNNEEDED_HOST_DIRS} ; do \
 		${RM} -r "${STAGEDIR}${PREFIX}/$$f" ; \
 	done
 	@${ECHO_MSG} "Install devices' headers and linker scripts..."
 	@${MKDIR} ${STAGEDIR}${PREFIX}/include
 	cd ${WRKDIR}/msp430-gcc-support-files && \
 		${TAR} cf - . | \
 		${TAR} xf - -C ${STAGEDIR}${PREFIX}/${PORTNAME}-${TI_VERSION}
 	@${ECHO_MSG} "Install minimal documentation..."
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/slau${DOC_VERSION}.pdf \
 		${STAGEDIR}${DOCSDIR}/slau${DOC_VERSION}.pdf
 	${INSTALL_DATA} ${FILESDIR}/watchdog.txt ${STAGEDIR}${DOCSDIR}/watchdog.txt
 
 .include <bsd.port.mk>
diff --git a/devel/ghub-devel/Makefile b/devel/ghub-devel/Makefile
index 1aff46293b53..84db4ff5aac3 100644
--- a/devel/ghub-devel/Makefile
+++ b/devel/ghub-devel/Makefile
@@ -1,67 +1,68 @@
 PORTNAME=	ghub
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.5.6-49
+PORTREVISION=	2
 DISTVERSIONSUFFIX=	-g47b7dc9
 CATEGORIES=	devel elisp
 PKGNAMESUFFIX=	-devel${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	yasu@FreeBSD.org
 COMMENT=	Client libraries for the APIs of various Git forges
 WWW=		https://github.com/magit/ghub
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	compat.el${EMACS_PKGNAMESUFFIX}>=28.1.1.0:misc/compat.el@${EMACS_FLAVOR} \
 		treepy.el${EMACS_PKGNAMESUFFIX}>=0.1.1:devel/treepy.el@${EMACS_FLAVOR}
 RUN_DEPENDS=	compat.el${EMACS_PKGNAMESUFFIX}>=28.1.1.0:misc/compat.el@${EMACS_FLAVOR} \
 		treepy.el${EMACS_PKGNAMESUFFIX}>=0.1.1:devel/treepy.el@${EMACS_FLAVOR}
 
 USES=		emacs gmake makeinfo
 USE_GITHUB=	yes
 GH_ACCOUNT=	magit
 
 MAKE_ARGS=	LOAD_PATH="-L ${PREFIX}/${EMACS_SITE_LISPDIR} -L ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR} -L ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/compat -L ."
 MAKE_JOBS_UNSAFE=	yes
 ALL_TARGET=	lisp info
 
 CONFLICTS_INSTALL=	ghub-emacs*
 
 NO_ARCH=	yes
 
 INFO=		ghub
 PORTDOCS=	CHANGELOG README.org ghub.html
 
 OPTIONS_DEFINE=	DOCS PDF
 
 PDF_DESC=	Build and install PDF document
 
 DOCS_BUILD_DEPENDS=	gsed:textproc/gsed
 DOCS_ALL_TARGET=	html
 DOCS_BINARY_ALIAS=	sed=gsed
 PDF_BUILD_DEPENDS=	texi2pdf:print/texinfo
 PDF_USES=		tex
 PDF_USE=		TEX=dvipdfmx:build
 PDF_ALL_TARGET=		pdf
 PDF_PLIST_FILES=	${DOCSDIR}/ghub.pdf
 
 ELISP_FILES=	buck.el buck.elc ghub-autoloads.el ghub-graphql.el \
 		ghub-graphql.elc ghub.el ghub.elc glab.el glab.elc gogs.el \
 		gogs.elc gsexp.el gsexp.elc gtea.el gtea.elc
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
 	${INSTALL_DATA} ${ELISP_FILES:C/^/${WRKSRC}\/lisp\//} \
 		${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
 	${INSTALL_DATA} ${WRKSRC}/docs/*.info ${STAGEDIR}${PREFIX}/${INFO_PATH}
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/CHANGELOG ${WRKSRC}/README.org \
 		${WRKSRC}/docs/ghub.html ${STAGEDIR}${DOCSDIR}
 
 do-install-PDF-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/ghub.pdf ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/devel/ghub/Makefile b/devel/ghub/Makefile
index 07bfbeff7daf..0c57b1f02d36 100644
--- a/devel/ghub/Makefile
+++ b/devel/ghub/Makefile
@@ -1,64 +1,64 @@
 PORTNAME=	ghub
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.5.6
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	devel elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	yasu@FreeBSD.org
 COMMENT=	Client libraries for the APIs of various Git forges
 WWW=		https://github.com/magit/ghub
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	treepy.el${EMACS_PKGNAMESUFFIX}>=0.1.1:devel/treepy.el@${EMACS_FLAVOR}
 RUN_DEPENDS=	treepy.el${EMACS_PKGNAMESUFFIX}>=0.1.1:devel/treepy.el@${EMACS_FLAVOR}
 
 USES=		emacs gmake makeinfo
 USE_GITHUB=	yes
 GH_ACCOUNT=	magit
 
 MAKE_ARGS=	LOAD_PATH="-L ${PREFIX}/${EMACS_SITE_LISPDIR} -L ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR} -L ."
 ALL_TARGET=	lisp info
 
 CONFLICTS_INSTALL=	ghub-emacs*
 
 NO_ARCH=	yes
 
 INFO=		ghub
 PORTDOCS=	CHANGELOG README.md ghub.html
 
 OPTIONS_DEFINE=	DOCS PDF
 
 PDF_DESC=	Build and install PDF document
 
 DOCS_BUILD_DEPENDS=	gsed:textproc/gsed
 DOCS_ALL_TARGET=	html
 DOCS_BINARY_ALIAS=	sed=gsed
 PDF_BUILD_DEPENDS=	texi2pdf:print/texinfo
 PDF_USES=		tex
 PDF_USE=		TEX=dvipdfmx:build
 PDF_ALL_TARGET=		pdf
 PDF_PLIST_FILES=	${DOCSDIR}/ghub.pdf
 
 ELISP_FILES=	buck.el buck.elc ghub-autoloads.el ghub-graphql.el \
 		ghub-graphql.elc ghub.el ghub.elc glab.el glab.elc gogs.el \
 		gogs.elc gsexp.el gsexp.elc gtea.el gtea.elc
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
 	${INSTALL_DATA} ${ELISP_FILES:C/^/${WRKSRC}\/lisp\//} \
 		${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
 	${INSTALL_DATA} ${WRKSRC}/docs/*.info ${STAGEDIR}${PREFIX}/${INFO_PATH}
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/CHANGELOG ${WRKSRC}/README.md \
 		${WRKSRC}/docs/ghub.html ${STAGEDIR}${DOCSDIR}
 
 do-install-PDF-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/ghub.pdf ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/devel/git-modes/Makefile b/devel/git-modes/Makefile
index 3fbc680e73e0..222937ac91fe 100644
--- a/devel/git-modes/Makefile
+++ b/devel/git-modes/Makefile
@@ -1,39 +1,39 @@
 PORTNAME=	git-modes
 DISTVERSION=	1.4.0
-PORTREVISION=	4
+PORTREVISION=	6
 PORTEPOCH=	1
 CATEGORIES=	devel elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	yasu@FreeBSD.org
 COMMENT=	GNU Emacs modes for Git-related files
 WWW=		https://github.com/magit/git-modes
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	git:devel/git
 
 USES=		emacs gmake
 USE_GITHUB=	yes
 GH_ACCOUNT=	magit
 
 NO_ARCH=	yes
 
 PLIST_SUB=	ELISPDIR=${_ELISPDIR}
 PORTDOCS=	README.md
 
 OPTIONS_DEFINE=	DOCS
 
 _ELISPDIR=	${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${_ELISPDIR}
 	${INSTALL_DATA} ${WRKSRC}/*.el ${WRKSRC}/*.elc \
 		${STAGEDIR}${PREFIX}/${_ELISPDIR}
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/devel/glibd/Makefile b/devel/glibd/Makefile
index c190a6f7fdc6..ed09791d83ed 100644
--- a/devel/glibd/Makefile
+++ b/devel/glibd/Makefile
@@ -1,26 +1,27 @@
 PORTNAME=	glibd
 PORTVERSION=	2.4.2
+PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	arrowd@FreeBSD.org
 COMMENT=	D language bindings for the GLib Utility Library
 WWW=		https://github.com/gtkd-developers/GlibD
 
 LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	girtod:lang/gir-to-d \
 		ldc2:lang/ldc
 LIB_DEPENDS=	libphobos2-ldc-shared.so:lang/ldc \
 		libdruntime-ldc-shared.so:lang/ldc
 
 USES=		gnome meson pkgconfig
 
 USE_GNOME=	glib20 introspection
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	gtkd-developers
 GH_PROJECT=	GlibD
 GH_TAGNAME=	v${DISTVERSION}
 
 .include <bsd.port.mk>
diff --git a/devel/gprbuild/Makefile b/devel/gprbuild/Makefile
index 6699deb57372..f4b68a64a337 100644
--- a/devel/gprbuild/Makefile
+++ b/devel/gprbuild/Makefile
@@ -1,107 +1,108 @@
 PORTNAME=	gprbuild
 DISTVERSIONPREFIX=	v
 DISTVERSION=	23.0.0	# Upgrade with devel/libgpr
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	devel
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Adacore multi-language software build tool
 WWW=		https://www.adacore.com/gems/gem-65
 
 LICENSE=	GPLv3+ GPLv3RLE
 LICENSE_COMB=	multi
 LICENSE_FILE=	${WRKSRC}/COPYING3
 
 USES=		ada:12,run gmake
 USE_BINUTILS=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	AdaCore
 GH_PROJECT=	gprconfig_kb:kb xmlada:xa
 
 BOOTPATH=	${WRKSRC}/bootstrap/bin
 MAKE_JOBS_NUMBER_LIMIT=	4
 MAKE_ARGS=	PROCESSORS=${MAKE_JOBS_NUMBER}	\
 		ENABLE_SHARED=yes
 XMLADA_SRC=	${WRKDIR}/xmlada-${PORTVERSION}
 PLATFORM=	${OPSYS:tl}${OSREL}
 GARCH=		${ARCH:S/amd64/x86_64/}
 CONFIGURE_TARGET=	${GARCH}-portbld-${PLATFORM}
 MAKE_ENV+=	GPR_PROJECT_PATH=${WRKSRC}/bootstrap/share/gpr
 ALL_TARGET=	all	# libgpr.build.static
 INSTALL_TARGET=	install	# libgpr.install
 P2STRIP=	libexec/gprbuild/gprbind bin/gprname bin/gprslave bin/gprbuild	\
 		bin/gprconfig bin/gprls bin/gprinstall bin/gprclean
 
 GCC_VER=	12
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 DOCSDIR=	${PREFIX}/gnat${GCC_VER}/share/doc/${PORTNAME}
 EXAMPLESDIR=	${PREFIX}/gnat${GCC_VER}/share/examples/${PORTNAME}
 PORTDOCS=	*
 PORTEXAMPLES=	*
 DOCS_BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx
 
 pre-configure:
 	${REINPLACE_CMD} -e '/^LIB_INSTALLER/s|prefix=|prefix=${STAGEDIR}|'	\
 		${WRKSRC}/${MAKEFILE}
 	@${ECHO} "*** Build the boostrap script"
 	(cd ${WRKSRC} &&	\
 	${SETENV} ${CONFIGURE_ENV} ./bootstrap.sh	\
 		--with-xmlada=${XMLADA_SRC}	\
 		--with-kb=${WRKDIR}/gprconfig_kb-${PORTVERSION}	\
 		--prefix=./bootstrap )
 
 do-configure:
 	@${ECHO} "*** Make setup"
 	(cd ${WRKSRC} &&	\
 	${DO_MAKE_BUILD} setup )
 	@${ECHO} "*** Register our Ada compiler gnat${GCC_VER}"
 	(cd ${WRKSRC} &&	\
 	${SETENV} PATH=${PATH}:${LOCALBASE}/gnat${GCC_VER}/bin	\
 	./gprconfig --batch --target=${CONFIGURE_TARGET}	\
 	--config=Ada,,default,${LOCALBASE}/gnat${GCC_VER}/bin,GNAT )
 
 pre-build:
 	@${ECHO} "*** Bootstrap xmlada (configure)"
 	(cd ${XMLADA_SRC} &&	\
 	${SETENV} ${CONFIGURE_ENV} ./configure --prefix=${WRKSRC}/bootstrap )
 	@${ECHO} "*** Bootstrap xmlada (build)"
 	(cd ${XMLADA_SRC} &&	\
 	${DO_MAKE_BUILD:C|PATH=|PATH=${WRKSRC}/bootstrap/bin:|} all )
 	@${ECHO} "*** Bootstrap xmlada (install)"
 	(cd ${XMLADA_SRC} &&	\
 	${DO_MAKE_BUILD:C|PATH=|PATH=${WRKSRC}/bootstrap/bin:|} install )
 
 do-build:
 	@${ECHO} "*** Final build of gprbuild"
 	(cd ${WRKSRC} &&	\
 	${DO_MAKE_BUILD:C|PATH=|PATH=${WRKSRC}/bootstrap/bin:|} ${ALL_TARGET} )
 
 do-build-DOCS-on:
 	@${ECHO} "*** Build docs"
 	(cd ${WRKSRC}/doc &&	\
 	${DO_MAKE_BUILD} html )
 
 do-build-EXAMPLES-on:
 	@${ECHO} "*** Build examples"
 	# Fortran is not yet supported on FreeBSD
 .for d in ada_f77 matrix
 	${MV} ${WRKSRC}/examples/${d} ${WRKDIR}
 .endfor
 	(cd ${WRKSRC}/examples &&	\
 	${DO_MAKE_BUILD:C|PATH=|PATH=${WRKSRC}/bootstrap/bin:|} ${ALL_TARGET} )
 .for d in ada_f77 matrix
 	${MV} ${WRKDIR}/${d} ${WRKSRC}/examples/
 .endfor
 
 do-install:
 	@${ECHO} "*** Installation of gprbuild"
 	(cd ${WRKSRC} &&	\
 	${SETENV} ${MAKE_ENV:C|PATH=|PATH=${WRKSRC}/bootstrap/bin:|} ${FAKEROOT}	\
 	${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET} )
 .for p in ${P2STRIP}
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/gnat${GCC_VER}/${p}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/devel/icontheme/Makefile b/devel/icontheme/Makefile
index ebd4fc7d485f..6b9dd502a6a7 100644
--- a/devel/icontheme/Makefile
+++ b/devel/icontheme/Makefile
@@ -1,36 +1,36 @@
 PORTNAME=	icontheme
 PORTVERSION=	1.2.3
-PORTREVISION=	2
+PORTREVISION=	3
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Icon Theme Specification implementation in D programming language
 WWW=		https://github.com/FreeSlave/icontheme
 
 LICENSE=	BSL
 
 BUILD_DEPENDS=	ldmd2:lang/ldc \
 		dub:devel/dub \
 		${LOCALBASE}/lib/d/libisfreedesktop.a:devel/isfreedesktop \
 		${LOCALBASE}/lib/d/libinilike.a:devel/inilike \
 		${LOCALBASE}/lib/d/libxdgpaths.a:devel/xdgpaths
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	FreeSlave
 
 DUB_CMD=	${LOCALBASE}/bin/dub build --build=release
 D_INCLUDE_DIR=	${PREFIX}/include/d
 D_LIB_DIR=	${PREFIX}/lib/d
 DC=		${PREFIX}/bin/ldmd2
 
 do-build:
 	@cd ${WRKSRC} && DC=${DC} ${DUB_CMD}
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${D_INCLUDE_DIR}
 	@${MKDIR} ${STAGEDIR}${D_LIB_DIR}
 	${INSTALL_DATA} ${WRKSRC}/lib/libicontheme.a ${STAGEDIR}${D_LIB_DIR}
 	cd ${WRKSRC}/source && ${COPYTREE_SHARE} . ${STAGEDIR}${D_INCLUDE_DIR} "-name *\.d"
 
 .include <bsd.port.mk>
diff --git a/devel/inifiled/Makefile b/devel/inifiled/Makefile
index 5473e626f565..e07ed60e765b 100644
--- a/devel/inifiled/Makefile
+++ b/devel/inifiled/Makefile
@@ -1,33 +1,33 @@
 PORTNAME=	inifiled
 PORTVERSION=	2.0.0
-PORTREVISION=	2
+PORTREVISION=	3
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Compile-time .ini file parser and writer generator for D
 WWW=		https://github.com/burner/inifiled
 
 LICENSE=	BSL
 
 BUILD_DEPENDS=	ldmd2:lang/ldc \
 		dub:devel/dub
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	burner
 
 DUB_CMD=	${LOCALBASE}/bin/dub build --build=release
 D_INCLUDE_DIR=	${PREFIX}/include/d
 D_LIB_DIR=	${PREFIX}/lib/d
 DC=		${PREFIX}/bin/ldmd2
 
 do-build:
 	@cd ${WRKSRC} && DC=${DC} ${DUB_CMD}
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${D_INCLUDE_DIR}
 	@${MKDIR} ${STAGEDIR}${D_LIB_DIR}
 	${INSTALL_DATA} ${WRKSRC}/libinifiled.a ${STAGEDIR}${D_LIB_DIR}
 	cd ${WRKSRC}/source && ${COPYTREE_SHARE} . ${STAGEDIR}${D_INCLUDE_DIR} "-name *\.d"
 
 .include <bsd.port.mk>
diff --git a/devel/inilike/Makefile b/devel/inilike/Makefile
index eda9932f881f..077c32da21d8 100644
--- a/devel/inilike/Makefile
+++ b/devel/inilike/Makefile
@@ -1,33 +1,33 @@
 PORTNAME=	inilike
 PORTVERSION=	1.2.1
-PORTREVISION=	2
+PORTREVISION=	3
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	D library for parsing ini-like files used in Freedesktop systems
 WWW=		https://github.com/FreeSlave/inilike
 
 LICENSE=	BSL
 
 BUILD_DEPENDS=	ldmd2:lang/ldc \
 		dub:devel/dub
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	FreeSlave
 
 DUB_CMD=	${LOCALBASE}/bin/dub build --build=release
 D_INCLUDE_DIR=	${PREFIX}/include/d
 D_LIB_DIR=	${PREFIX}/lib/d
 DC=		${PREFIX}/bin/ldmd2
 
 do-build:
 	@cd ${WRKSRC} && DC=${DC} ${DUB_CMD}
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${D_INCLUDE_DIR}
 	@${MKDIR} ${STAGEDIR}${D_LIB_DIR}
 	${INSTALL_DATA} ${WRKSRC}/lib/libinilike.a ${STAGEDIR}${D_LIB_DIR}
 	cd ${WRKSRC}/source && ${COPYTREE_SHARE} . ${STAGEDIR}${D_INCLUDE_DIR} "-name *\.d"
 
 .include <bsd.port.mk>
diff --git a/devel/isfreedesktop/Makefile b/devel/isfreedesktop/Makefile
index b411a2f3f9a8..bd04f65f983c 100644
--- a/devel/isfreedesktop/Makefile
+++ b/devel/isfreedesktop/Makefile
@@ -1,33 +1,33 @@
 PORTNAME=	isfreedesktop
 PORTVERSION=	0.1.1
-PORTREVISION=	5
+PORTREVISION=	6
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	D programming to test if target platform is freedesktop
 WWW=		https://github.com/FreeSlave/isfreedesktop
 
 LICENSE=	BSL
 
 BUILD_DEPENDS=	ldmd2:lang/ldc \
 		dub:devel/dub
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	FreeSlave
 
 DUB_CMD=	${LOCALBASE}/bin/dub build --build=release
 D_INCLUDE_DIR=	${PREFIX}/include/d
 D_LIB_DIR=	${PREFIX}/lib/d
 DC=		${PREFIX}/bin/ldmd2
 
 do-build:
 	@cd ${WRKSRC} && DC=${DC} ${DUB_CMD}
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${D_INCLUDE_DIR}
 	@${MKDIR} ${STAGEDIR}${D_LIB_DIR}
 	${INSTALL_DATA} ${WRKSRC}/lib/libisfreedesktop.a ${STAGEDIR}${D_LIB_DIR}
 	cd ${WRKSRC}/source && ${COPYTREE_SHARE} . ${STAGEDIR}${D_INCLUDE_DIR} "-name *\.d"
 
 .include <bsd.port.mk>
diff --git a/devel/kBuild/Makefile b/devel/kBuild/Makefile
index d6317d78066c..3c876ac090f6 100644
--- a/devel/kBuild/Makefile
+++ b/devel/kBuild/Makefile
@@ -1,67 +1,67 @@
 PORTNAME=	kBuild
 DISTVERSION=	${KBUILD_VERSION}
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	devel
 MASTER_SITES=	LOCAL/jkim
 DISTNAME=	${PORTNAME}-${DISTVERSION}r3127-src
 
 MAINTAINER=	vbox@FreeBSD.org
 COMMENT=	Makefile framework
 WWW=		https://svn.netlabs.org/kbuild
 
 LICENSE=	BSD3CLAUSE GPLv3+
 LICENSE_COMB=	multi
 
 USES=		autoreconf:build gmake makeinfo tar:xz
 
 CONFLICTS_INSTALL=	kBuild-devel
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
 
 KBUILD_VERSION=	0.1.9998
 KBUILD_ARCH=	${MACHINE_ARCH:S/aarch64/arm64/:S/i386/x86/:S/x86_64/amd64/:C/powerpc64.*/ppc64/:C/powerpc.*/ppc32/:C/armv.*/arm32/}
 KBUILD_ENV=	AUTORECONF=${AUTORECONF} \
 		AUTOPOINT=true \
 		CC="${CC}" CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" \
 		LDFLAGS="${LDFLAGS}" MAKE="${MAKE_CMD}"
 KBUILD_TARGET=	${OPSYS:tl}
 
 KBUILD_BINS=	kDepIDB kDepObj kDepPre kObjCache kmk kmk_append kmk_ash \
 		kmk_cat kmk_chmod kmk_cmp kmk_cp kmk_echo kmk_expr kmk_gmake \
 		kmk_install kmk_ln kmk_md5sum kmk_mkdir kmk_mv kmk_printf \
 		kmk_redirect kmk_rm kmk_rmdir kmk_sed kmk_sleep kmk_test \
 		kmk_time
 PORTDOCS=	QuickReference-kmk.html \
 		QuickReference-kmk.txt
 
 ENV=
 .export ENV
 
 OPTIONS_DEFINE=	DOCS GCC
 OPTIONS_DEFAULT=GCC
 GCC_DESC=	Build with GCC (should almost always be enabled)
 GCC_USE=	GCC=yes
 
 post-patch:
 	@${REINPLACE_CMD} 's|gcc|${CC}|g' ${WRKSRC}/kBuild/tools/*.kmk
 
 do-build:
 	cd ${WRKSRC} && ${SETENV} ${KBUILD_ENV} ./kBuild/env.sh --full ${MAKE_CMD} -f bootstrap.gmk
 	cd ${WRKSRC} && ${RM} -r out
 	cd ${WRKSRC} && ./kBuild/env.sh kmk
 	cd ${WRKSRC} && ./kBuild/env.sh kmk NIX_INSTALL_DIR=${PREFIX} BUILD_TYPE=release -C ${WRKSRC}
 
 do-install:
 .for bin in ${KBUILD_BINS}
 	${INSTALL_PROGRAM} ${WRKSRC}/out/${KBUILD_TARGET}.${KBUILD_ARCH}/release/stage${PREFIX}/bin/${bin} ${STAGEDIR}${PREFIX}/bin
 .endfor
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	(cd ${WRKSRC}/out/${KBUILD_TARGET}.${KBUILD_ARCH}/release/stage${PREFIX}/share/kBuild && ${COPYTREE_SHARE} \* ${STAGEDIR}${DATADIR})
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for doc in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/out/${KBUILD_TARGET}.${KBUILD_ARCH}/release/stage${PREFIX}/share/doc/${PORTNAME}-${KBUILD_VERSION}/${doc} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/devel/kronosnet/Makefile b/devel/kronosnet/Makefile
index bb06c36bc71d..7069209efce7 100644
--- a/devel/kronosnet/Makefile
+++ b/devel/kronosnet/Makefile
@@ -1,42 +1,43 @@
 PORTNAME=	kronosnet
 PORTVERSION=	1.25
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	https://kronosnet.org/releases/
 
 MAINTAINER=	egypcio@FreeBSD.org
 COMMENT=	Network abstraction layer designed for high availability
 WWW=		https://kronosnet.org/
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	liblzo2.so:archivers/lzo2 \
 		liblz4.so:archivers/liblz4 \
 		libnspr4.so:devel/nspr \
 		libnss3.so:security/nss \
 		libqb.so:devel/libqb \
 		libzstd.so:archivers/zstd
 
 USES=		autoreconf gmake localbase libtool pkgconfig ssl
 USE_BINUTILS=	yes
 USE_GCC=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-B${LOCALBASE}/bin
 
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check
 
 OPTIONS_DEFINE=	MANPAGES DOCS
 OPTIONS_DEFAULT=MANPAGES
 OPTIONS_SUB=	yes
 
 MANPAGES_BUILD_DEPENDS=		doxygen:devel/doxygen
 MANPAGES_CONFIGURE_ENABLE=	man
 
 .include <bsd.port.options.mk>
 
 .if ${SSL_DEFAULT} == base
 CONFIGURE_ENV=	openssl_CFLAGS="-I/usr/include" openssl_LIBS="-lcrypto"
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/lattice-ice40-examples-hx1k/Makefile b/devel/lattice-ice40-examples-hx1k/Makefile
index 6b4473dc5b28..8086783cea3a 100644
--- a/devel/lattice-ice40-examples-hx1k/Makefile
+++ b/devel/lattice-ice40-examples-hx1k/Makefile
@@ -1,46 +1,46 @@
 PORTNAME=	lattice-ice40-examples-hx1k
 PORTVERSION=	g20180310
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 
 MAINTAINER=	manu@FreeBSD.org
 COMMENT=	Lattice iCE40 FPGA examples for the Olimex HX1K board
 WWW=		https://github.com/OLIMEX/iCE40HX1K-EVB
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	abc:cad/abc \
 		arachne-pnr:devel/arachne-pnr \
 		icepack:devel/icestorm \
 		yosys:cad/yosys
 
 USES=		gmake
 USE_GITHUB=	yes
 GH_ACCOUNT=	OLIMEX
 GH_PROJECT=	iCE40HX1K-EVB
 GH_TAGNAME=	69df5a7fc2daa8f00a984426b721499f6df22492
 
 EXAMPLESDIR=	${PREFIX}/share/examples/lattice-ice40-olimex
 NO_ARCH=	yes
 
 do-build:
 	${DO_MAKE_BUILD} -C ${WRKSRC}/demo/ice40hx1k-evb
 	${DO_MAKE_BUILD} -C ${WRKSRC}/demo/ice40-io-video
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/demo/ice40hx1k-evb/example.v \
 		${STAGEDIR}${EXAMPLESDIR}/ice40hx1k-blinky.v
 	${INSTALL_DATA} ${WRKSRC}/demo/ice40hx1k-evb/example.rpt \
 		${STAGEDIR}${EXAMPLESDIR}/ice40hx1k-blinky.rpt
 	${INSTALL_DATA} ${WRKSRC}/demo/ice40hx1k-evb/example.bin \
 		${STAGEDIR}${EXAMPLESDIR}/ice40hx1k-blinky.bin
 	${INSTALL_DATA} ${WRKSRC}/demo/ice40-io-video/example.v \
 		${STAGEDIR}${EXAMPLESDIR}/ice40hx1k-vga-ps2.v
 	${INSTALL_DATA} ${WRKSRC}/demo/ice40-io-video/example.rpt \
 		${STAGEDIR}${EXAMPLESDIR}/ice40hx1k-vga-ps2.rpt
 	${INSTALL_DATA} ${WRKSRC}/demo/ice40-io-video/example.bin \
 		${STAGEDIR}${EXAMPLESDIR}/ice40hx1k-vga-ps2.bin
 
 .include <bsd.port.mk>
diff --git a/devel/lattice-ice40-examples-hx8k/Makefile b/devel/lattice-ice40-examples-hx8k/Makefile
index b2369f7f42b9..3628185615f8 100644
--- a/devel/lattice-ice40-examples-hx8k/Makefile
+++ b/devel/lattice-ice40-examples-hx8k/Makefile
@@ -1,46 +1,46 @@
 PORTNAME=	lattice-ice40-examples-hx8k
 PORTVERSION=	g20180310
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 
 MAINTAINER=	manu@FreeBSD.org
 COMMENT=	Lattice iCE40 FPGA examples for the Olimex HX8K board
 WWW=		https://github.com/OLIMEX/iCE40HX8K-EVB
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	abc:cad/abc \
 		arachne-pnr:devel/arachne-pnr \
 		icepack:devel/icestorm \
 		yosys:cad/yosys
 
 USES=		gmake
 USE_GITHUB=	yes
 GH_ACCOUNT=	OLIMEX
 GH_PROJECT=	iCE40HX8K-EVB
 GH_TAGNAME=	ae283711fc6c18f1905d0abf78195aed191ce612
 
 EXAMPLESDIR=	${PREFIX}/share/examples/lattice-ice40-olimex
 NO_ARCH=	yes
 
 do-build:
 	${DO_MAKE_BUILD} -C ${WRKSRC}/demo/ice40hx8k-evb
 	${DO_MAKE_BUILD} -C ${WRKSRC}/demo/ice40-io-video
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/demo/ice40hx8k-evb/example.v  \
 		${STAGEDIR}${EXAMPLESDIR}/ice40hx8k-blinky.v
 	${INSTALL_DATA} ${WRKSRC}/demo/ice40hx8k-evb/example.rpt \
 		${STAGEDIR}${EXAMPLESDIR}/ice40hx8k-blinky.rpt
 	${INSTALL_DATA} ${WRKSRC}/demo/ice40hx8k-evb/example.bin \
 		${STAGEDIR}${EXAMPLESDIR}/ice40hx8k-blinky.bin
 	${INSTALL_DATA} ${WRKSRC}/demo/ice40-io-video/example.v \
 		${STAGEDIR}${EXAMPLESDIR}/ice40hx8k-vga-ps2.v
 	${INSTALL_DATA} ${WRKSRC}/demo/ice40-io-video/example.rpt \
 		${STAGEDIR}${EXAMPLESDIR}/ice40hx8k-vga-ps2.rpt
 	${INSTALL_DATA} ${WRKSRC}/demo/ice40-io-video/example.bin \
 		${STAGEDIR}${EXAMPLESDIR}/ice40hx8k-vga-ps2.bin
 
 .include <bsd.port.mk>
diff --git a/devel/lattice-ice40-tools/Makefile b/devel/lattice-ice40-tools/Makefile
index 3f8dd7ffa4e1..2bb23ae75624 100644
--- a/devel/lattice-ice40-tools/Makefile
+++ b/devel/lattice-ice40-tools/Makefile
@@ -1,23 +1,24 @@
 PORTNAME=	lattice-ice40-tools
 PORTVERSION=	g20181021
+PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Open source tools for Lattice iCE40 FPGAs
 WWW=		https://www.clifford.at/icestorm
 
 RUN_DEPENDS=	abc:cad/abc \
 		arachne-pnr:devel/arachne-pnr \
 		icepack:devel/icestorm \
 		yosys:cad/yosys
 
 USES=		metaport
 
 OPTIONS_DEFINE=	EXAMPLES
 
 EXAMPLES_DESC=	Build examples for Olimex iCE40 FPGA boards
 
 EXAMPLES_RUN_DEPENDS=	lattice-ice40-examples-hx1k>=g0:devel/lattice-ice40-examples-hx1k \
 			lattice-ice40-examples-hx8k>=g0:devel/lattice-ice40-examples-hx8k
 
 .include <bsd.port.mk>
diff --git a/devel/libcwd/Makefile b/devel/libcwd/Makefile
index bb263df83534..c154e6a9fa4b 100644
--- a/devel/libcwd/Makefile
+++ b/devel/libcwd/Makefile
@@ -1,29 +1,29 @@
 PORTNAME=	libcwd
 PORTVERSION=	1.0.6
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	devel
 MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	C++ Debugging Support Library
 WWW=		http://libcwd.sourceforge.net/
 
 LICENSE=	QPL10
 LICENSE_NAME=	Q Public License, Version 1.0
 LICENSE_FILE=	${WRKSRC}/LICENSE.QPL
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 USES=		gmake pathfix pkgconfig libtool
 USE_GCC=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-alloc --disable-location --disable-threading
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 
 CFLAGS+=	-D__GNU_LIBRARY__
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|malloc\.h|stdlib.h|g ; \
 		 s|localtime(|localtime((const time_t *)|g' ${WRKSRC}/debugmalloc.cc
 
 .include <bsd.port.mk>
diff --git a/devel/libddoc/Makefile b/devel/libddoc/Makefile
index d36948a679a1..7187e522eaee 100644
--- a/devel/libddoc/Makefile
+++ b/devel/libddoc/Makefile
@@ -1,39 +1,39 @@
 PORTNAME=	libddoc
 PORTVERSION=	0.8.0
-PORTREVISION=	2
+PORTREVISION=	3
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	D implementation of the DDoc macro system
 WWW=		https://github.com/dlang-community/libddoc
 
 LICENSE=	BSL
 LICENSE_FILE=	${WRKSRC}/LICENSE_1_0.txt
 
 BUILD_DEPENDS=	ldmd2:lang/ldc \
 		dub:devel/dub \
 		${LOCALBASE}/lib/d/libdparse.a:devel/libdparse
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	dlang-community
 
 DUB_CMD=	${LOCALBASE}/bin/dub build --build=release
 D_INCLUDE_DIR=	${PREFIX}/include/d
 D_LIB_DIR=	${PREFIX}/lib/d
 DC=		${PREFIX}/bin/ldmd2
 
 post-patch:
 	${REINPLACE_CMD} -e '23d' ${WRKSRC}/dub.json
 
 do-build:
 	@cd ${WRKSRC} && DC=${DC} ${DUB_CMD}
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${D_INCLUDE_DIR}
 	@${MKDIR} ${STAGEDIR}${D_LIB_DIR}
 	${INSTALL_DATA} ${WRKSRC}/bin/libddoc.a ${STAGEDIR}${D_LIB_DIR}
 	cd ${WRKSRC}/src && ${COPYTREE_SHARE} . ${STAGEDIR}${D_INCLUDE_DIR} "-name *\.d"
 	cd ${WRKSRC}/common/source && ${COPYTREE_SHARE} . ${STAGEDIR}${D_INCLUDE_DIR} "-name *\.d"
 
 .include <bsd.port.mk>
diff --git a/devel/libdparse/Makefile b/devel/libdparse/Makefile
index 155ce1f084fb..cb759b1e0aa0 100644
--- a/devel/libdparse/Makefile
+++ b/devel/libdparse/Makefile
@@ -1,35 +1,35 @@
 PORTNAME=	libdparse
 PORTVERSION=	0.20.0
-PORTREVISION=	2
+PORTREVISION=	3
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Library for lexing and parsing D source code
 WWW=		https://github.com/dlang-community/libdparse
 
 LICENSE=	BSL
 
 BUILD_DEPENDS=	ldmd2:lang/ldc \
 		dub:devel/dub \
 		${LOCALBASE}/lib/d/libmir-core.a:devel/mir-core \
 		${LOCALBASE}/lib/d/libstdx-allocator.a:devel/stdx-allocator
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	dlang-community
 
 DUB_CMD=	${LOCALBASE}/bin/dub build --build=release
 D_INCLUDE_DIR=	${PREFIX}/include/d
 D_LIB_DIR=	${PREFIX}/lib/d
 DC=		${PREFIX}/bin/ldmd2
 
 do-build:
 	@cd ${WRKSRC} && DC=${DC} ${DUB_CMD}
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${D_INCLUDE_DIR}
 	@${MKDIR} ${STAGEDIR}${D_LIB_DIR}
 	${INSTALL_DATA} ${WRKSRC}/libdparse.a ${STAGEDIR}${D_LIB_DIR}
 	cd ${WRKSRC}/src && ${COPYTREE_SHARE} . ${STAGEDIR}${D_INCLUDE_DIR} "-name *\.d"
 
 .include <bsd.port.mk>
diff --git a/devel/libegit2/Makefile b/devel/libegit2/Makefile
index 7d46557603fd..853df6aa8bb3 100644
--- a/devel/libegit2/Makefile
+++ b/devel/libegit2/Makefile
@@ -1,48 +1,48 @@
 PORTNAME=	libegit2
 DISTVERSION=	g20200515
-PORTREVISION=	9
+PORTREVISION=	11
 CATEGORIES=	devel elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	yasu@FreeBSD.org
 COMMENT=	Emacs bindings for libgit2
 WWW=		https://github.com/magit/libegit2
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libgit2.so:devel/libgit2
 
 USES=		cmake:noninja emacs pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	magit
 GH_TAGNAME=	0ef8b13
 USE_LDCONFIG=	yes
 
 CMAKE_ON=	USE_SYSTEM_LIBGIT2
 
 PORTDOCS=	README.md
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	${REINPLACE_CMD} \
 		's,%%LIBEGIT2_INSTALL_DIR%%,${PREFIX}/${EMACS_VERSION_SITE_LISPDIR},' \
 		${WRKSRC}/libgit.el
 
 post-build:
 	(cd ${WRKSRC} \
 	&& ${EMACS_CMD} -Q -batch -L . -f batch-byte-compile libgit.el)
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/../.build/libegit2.so \
 		${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}
 	${INSTALL_DATA} ${WRKSRC}/libgit.el ${WRKSRC}/libgit.elc \
 		${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/devel/libgpr/Makefile b/devel/libgpr/Makefile
index c7340ac8ea91..324abf499d2c 100644
--- a/devel/libgpr/Makefile
+++ b/devel/libgpr/Makefile
@@ -1,38 +1,39 @@
 PORTNAME=	libgpr
 DISTVERSIONPREFIX=	v
 DISTVERSION=	23.0.0
+PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Library from GPRbuild
 WWW=		https://www.adacore.com/gems/gem-65
 
 LICENSE=	GPLv3+ GPLv3RLE
 LICENSE_COMB=	multi
 LICENSE_FILE=	${WRKSRC}/COPYING3
 
 BUILD_DEPENDS=	gprbuild>=23:devel/gprbuild
 LIB_DEPENDS=	libxmlada_dom.so:textproc/xmlada
 
 USES=		ada:12,run gmake
 USE_BINUTILS=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	AdaCore
 GH_PROJECT=	gprbuild
 
 MAKE_ENV=	GPR_PROJECT_PATH=${PREFIX}/share/gpr
 ALL_TARGET=	libgpr.build
 INSTALL_TARGET=	libgpr.install
 
 GCC_VER=	12
 
 pre-configure:
 	${REINPLACE_CMD} -e '/^LIB_INSTALLER/s|prefix=|prefix=${STAGEDIR}|'	\
 		${WRKSRC}/${MAKEFILE}
 
 post-install:
 	${STRIP_CMD}	\
 		${STAGEDIR}${PREFIX}/gnat${GCC_VER}/lib/gpr/relocatable/gpr/libgpr.so
 
 .include <bsd.port.mk>
diff --git a/devel/libnest2d-ultimaker/Makefile b/devel/libnest2d-ultimaker/Makefile
index f70a2879c86b..6b0c38e747b2 100644
--- a/devel/libnest2d-ultimaker/Makefile
+++ b/devel/libnest2d-ultimaker/Makefile
@@ -1,24 +1,24 @@
 PORTNAME=	libnest2d-ultimaker
 # XXX there is no 4.13.1
 # https://github.com/Ultimaker/libnest2d/tags
 DISTVERSION=	4.12.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 
 MAINTAINER=	db@FreeBSD.org
 COMMENT=	2D irregular bin packaging and nesting library
 WWW=		https://github.com/Ultimaker/libnest2d
 
 LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 	libpolyclipping.so:graphics/polyclipping \
 	libnlopt.so:math/nlopt
 
 USES=	cmake
 USE_GITHUB=	yes
 GH_ACCOUNT=	Ultimaker
 GH_PROJECT=	libnest2d
 
 .include <bsd.port.mk>
diff --git a/devel/libpololu-avr/Makefile b/devel/libpololu-avr/Makefile
index 675d8ebd12e6..0b8ba9f612c8 100644
--- a/devel/libpololu-avr/Makefile
+++ b/devel/libpololu-avr/Makefile
@@ -1,22 +1,22 @@
 PORTNAME=	libpololu-avr
 PORTVERSION=	151002
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 
 MAINTAINER=	jonathan@FreeBSD.org
 COMMENT=	Support libraries for Pololu robots
 WWW=		https://www.pololu.com/docs/0J20
 
 LICENSE=	MIT
 
 BUILD_DEPENDS=	${LOCALBASE}/avr/lib/libc.a:devel/avr-libc
 RUN_DEPENDS=	${LOCALBASE}/avr/lib/libc.a:devel/avr-libc
 
 USES=		gmake
 USE_GITHUB=	yes
 GH_ACCOUNT=	pololu
 
 MAKE_ENV=	LIB=${STAGEDIR}${PREFIX}/avr/lib
 ALL_TARGET=	library_files
 
 .include <bsd.port.mk>
diff --git a/devel/lockfree-malloc/Makefile b/devel/lockfree-malloc/Makefile
index 6498a4097ca0..0c904ad24173 100644
--- a/devel/lockfree-malloc/Makefile
+++ b/devel/lockfree-malloc/Makefile
@@ -1,38 +1,38 @@
 PORTNAME=	lockfree-malloc
 PORTVERSION=	0.0.${DATE}
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	devel
 MASTER_SITES=	LOCAL/vg
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Scalable drop-in replacement for malloc/free
 WWW=		https://github.com/Begun/lockfree-malloc
 
 LICENSE=	LGPL3
 
 DATE=		20120802
 ONLY_FOR_ARCHS=	amd64
 USE_LDCONFIG=	yes
 USES=		tar:bzip2
 USE_GCC=	yes
 
 OPTIONS_DEFINE=	DOCS
 DOCS_DESC=	Install README
 
 PLIST_FILES=	lib/liblite-malloc-shared.so \
 		lib/liblite-malloc-static.a
 
 MAKE_ARGS+=	CXX=${CXX}
 
 DOCS_PLIST_FILES=	share/doc/${PORTNAME}/README
 
 do-install:
 .for i in shared.so static.a
 	${INSTALL_LIB} ${WRKSRC}/liblite-malloc-${i} ${STAGEDIR}${PREFIX}/lib/liblite-malloc-${i}
 .endfor
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} README ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/devel/lua-mode/Makefile b/devel/lua-mode/Makefile
index 40f89cf613ce..72af023b0ffb 100644
--- a/devel/lua-mode/Makefile
+++ b/devel/lua-mode/Makefile
@@ -1,28 +1,28 @@
 PORTNAME=	lua-mode
 PORTVERSION=	20210802
-PORTREVISION=	2
+PORTREVISION=	4
 DISTVERSIONPREFIX=v
 CATEGORIES=	devel elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	se@FreeBSD.org
 COMMENT=	Minor mode for LUA
 WWW=		https://github.com/immerrr/lua-mode
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		emacs
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	immerrr
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 PLIST_FILES=	${EMACS_SITE_LISPDIR}/lua-mode.el
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/lua-mode.el ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/
 
 .include <bsd.port.mk>
diff --git a/devel/magit-devel/Makefile b/devel/magit-devel/Makefile
index 71e05fe37816..8805020e974b 100644
--- a/devel/magit-devel/Makefile
+++ b/devel/magit-devel/Makefile
@@ -1,76 +1,77 @@
 PORTNAME=	magit
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.3.0-540
+PORTREVISION=	5
 DISTVERSIONSUFFIX=	-g28bb411a
 CATEGORIES=	devel elisp
 PKGNAMESUFFIX=	-devel${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	yasu@FreeBSD.org
 COMMENT=	Interface to Git for Emacs (Development Version)
 WWW=		https://magit.vc/
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	compat.el${EMACS_PKGNAMESUFFIX}>=28.1.1.0:misc/compat.el@${EMACS_FLAVOR} \
 		dash.el${EMACS_PKGNAMESUFFIX}>=2.19.1:devel/dash.el@${EMACS_FLAVOR} \
 		transient-devel${EMACS_PKGNAMESUFFIX}>=0.3.7:devel/transient-devel@${EMACS_FLAVOR} \
 		with-editor-devel${EMACS_PKGNAMESUFFIX}>=3.0.5:editors/with-editor-devel@${EMACS_FLAVOR}
 RUN_DEPENDS=	compat.el${EMACS_PKGNAMESUFFIX}>=28.1.1.0:misc/compat.el@${EMACS_FLAVOR} \
 		dash.el${EMACS_PKGNAMESUFFIX}>=2.19.1:devel/dash.el@${EMACS_FLAVOR} \
 		transient-devel${EMACS_PKGNAMESUFFIX}>=0.3.7:devel/transient-devel@${EMACS_FLAVOR} \
 		with-editor-devel${EMACS_PKGNAMESUFFIX}>=3.0.5:editors/with-editor-devel@${EMACS_FLAVOR}
 
 USES=		emacs gmake makeinfo
 USE_GITHUB=	yes
 
 MAKE_ENV+=	docdir=${DOCSDIR} \
 		infodir=${PREFIX}/${INFO_PATH} \
 		INSTALL_INFO=install-info \
 		lispdir=${PREFIX}/${ELISPDIR} \
 		LOAD_PATH="-L ${WRKSRC}/lisp -L ${PREFIX}/${EMACS_SITE_LISPDIR} -L ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR} -L ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/compat -L ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/ghub" \
 		VERSION=${PORTVERSION}
 # Parallel build fails if Emacs is built with native compilation enabled
 MAKE_JOBS_UNSAFE=	yes
 ALL_TARGET=	lisp info
 INSTALL_TARGET=	install-lisp install-info
 
 CONFLICTS_INSTALL=	magit-emacs*
 
 NO_ARCH=	yes
 
 INFO=		magit magit-section
 PLIST_SUB+=	ELISPDIR=${ELISPDIR}
 PORTDOCS=	*.html *.md RelNotes/*
 
 OPTIONS_DEFINE=	DOCS LIBEGIT2 PDF
 OPTIONS_SUB=	yes
 
 LIBEGIT2_DESC=	Use libegit2 as backend (EXPERIMENTAL)
 PDF_DESC=	Build and install PDF document
 
 DOCS_BUILD_DEPENDS=		gsed:textproc/gsed
 DOCS_ALL_TARGET=		html
 DOCS_BINARY_ALIAS=		sed=gsed
 LIBEGIT2_BUILD_DEPENDS=		libegit2${EMACS_PKGNAMESUFFIX}>=g20200515:devel/libegit2@${EMACS_FLAVOR}
 LIBEGIT2_BUILD_DEPENDS_OFF=	git:devel/git
 LIBEGIT2_RUN_DEPENDS=		libegit2${EMACS_PKGNAMESUFFIX}>=g20200515:devel/libegit2@${EMACS_FLAVOR}
 LIBEGIT2_RUN_DEPENDS_OFF=	git:devel/git
 LIBEGIT2_VARS=			MAKE_ENV+=BUILD_MAGIT_LIBGIT=true
 PDF_BUILD_DEPENDS=		texi2pdf:print/texinfo
 PDF_USES=			tex
 PDF_USE=			TEX=dvipdfmx:build
 PDF_ALL_TARGET=			pdf
 
 ELISPDIR=	${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/RelNotes
 	${INSTALL_DATA} ${WRKSRC}/docs/*.md ${STAGEDIR}${DOCSDIR}
 	${COPYTREE_SHARE} ${WRKSRC}/docs/RelNotes ${STAGEDIR}${DOCSDIR}/RelNotes
 
 do-install-PDF-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/*.pdf ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/devel/magit/Makefile b/devel/magit/Makefile
index 3f0242aa6cec..173b7bb132b2 100644
--- a/devel/magit/Makefile
+++ b/devel/magit/Makefile
@@ -1,76 +1,76 @@
 PORTNAME=	magit
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.3.0
-PORTREVISION=	5
+PORTREVISION=	10
 CATEGORIES=	devel elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	yasu@FreeBSD.org
 COMMENT=	Interface to Git for Emacs
 WWW=		https://magit.vc/
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	dash.el${EMACS_PKGNAMESUFFIX}>=2.18.1:devel/dash.el@${EMACS_FLAVOR} \
 		transient${EMACS_PKGNAMESUFFIX}>=0.3.6:devel/transient@${EMACS_FLAVOR} \
 		with-editor${EMACS_PKGNAMESUFFIX}>=3.0.4:editors/with-editor@${EMACS_FLAVOR}
 RUN_DEPENDS=	dash.el${EMACS_PKGNAMESUFFIX}>=2.18.1:devel/dash.el@${EMACS_FLAVOR} \
 		transient${EMACS_PKGNAMESUFFIX}>=0.3.6:devel/transient@${EMACS_FLAVOR} \
 		with-editor${EMACS_PKGNAMESUFFIX}>=3.0.4:editors/with-editor@${EMACS_FLAVOR}
 
 USES=		emacs gmake makeinfo
 USE_GITHUB=	yes
 
 MAKE_ENV+=	docdir=${DOCSDIR} \
 		infodir=${PREFIX}/${INFO_PATH} \
 		INSTALL_INFO=install-info \
 		lispdir=${PREFIX}/${ELISPDIR} \
 		LOAD_PATH="-L ${WRKSRC}/lisp -L ${PREFIX}/${EMACS_SITE_LISPDIR} -L ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR} -L ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/ghub" \
 		VERSION=${PORTVERSION}
 # Parallel build fails if Emacs is built with native compilation enabled
 MAKE_JOBS_UNSAFE=	yes
 ALL_TARGET=	lisp info
 INSTALL_TARGET=	install-lisp install-info
 
 CONFLICTS_INSTALL=	magit-devel-emacs*
 
 NO_ARCH=	yes
 
 INFO=		magit magit-section
 PLIST_SUB+=	ELISPDIR=${ELISPDIR}
 PORTDOCS=	*.html *.md RelNotes/*
 
 OPTIONS_DEFINE=	DOCS LIBEGIT2 PDF
 OPTIONS_SUB=	yes
 
 LIBEGIT2_DESC=	Use libegit2 as backend (EXPERIMENTAL)
 PDF_DESC=	Build and install PDF document
 
 DOCS_BUILD_DEPENDS=		gsed:textproc/gsed
 DOCS_ALL_TARGET=		html
 DOCS_BINARY_ALIAS=		sed=gsed
 LIBEGIT2_BUILD_DEPENDS=		libegit2${EMACS_PKGNAMESUFFIX}>=g20200515:devel/libegit2@${EMACS_FLAVOR}
 LIBEGIT2_BUILD_DEPENDS_OFF=	git:devel/git
 LIBEGIT2_RUN_DEPENDS=		libegit2${EMACS_PKGNAMESUFFIX}>=g20200515:devel/libegit2@${EMACS_FLAVOR}
 LIBEGIT2_RUN_DEPENDS_OFF=	git:devel/git
 LIBEGIT2_VARS_OFF=		MAKE_ENV+=BUILD_MAGIT_LIBGIT=false
 PDF_BUILD_DEPENDS=		texi2pdf:print/texinfo
 PDF_USES=			tex
 PDF_USE=			TEX=dvipdfmx:build
 PDF_ALL_TARGET=			pdf
 
 ELISPDIR=	${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/RelNotes
 	${INSTALL_DATA} ${WRKSRC}/Documentation/*.md \
 		${WRKSRC}/Documentation/*.html ${STAGEDIR}${DOCSDIR}
 	${COPYTREE_SHARE} ${WRKSRC}/Documentation/RelNotes \
 		${STAGEDIR}${DOCSDIR}/RelNotes
 
 do-install-PDF-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/Documentation/*.pdf ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/devel/mingw32-directx/Makefile b/devel/mingw32-directx/Makefile
index 3f671dc47d8f..b6d1c204a96b 100644
--- a/devel/mingw32-directx/Makefile
+++ b/devel/mingw32-directx/Makefile
@@ -1,26 +1,26 @@
 PORTNAME=	directx
 PORTVERSION=	20020518
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	https://www.libsdl.org/extras/win32/cygwin/
 PKGNAMEPREFIX=	mingw32-
 DISTNAME=	${PORTNAME}-devel
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	DirectX header files for use with MinGW
 WWW=		https://www.libsdl.org/extras/win32/cygwin/README.txt
 
 BUILD_DEPENDS=	${PKGNAMEPREFIX}gcc:devel/${PKGNAMEPREFIX}gcc \
 		mingwm10.dll:devel/mingw32-bin-msvcrt
 
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/mingw32/include
 .for f in d3dtypes.h ddraw.h dinput.h directx.h dsound.h
 	${INSTALL_DATA} ${WRKSRC}/include/w32api/$f \
 	    ${STAGEDIR}${PREFIX}/mingw32/include/
 .endfor
 
 .include <bsd.port.mk>
diff --git a/devel/mingw32-gcc/Makefile b/devel/mingw32-gcc/Makefile
index b0d1374728cf..f6fd56846d94 100644
--- a/devel/mingw32-gcc/Makefile
+++ b/devel/mingw32-gcc/Makefile
@@ -1,103 +1,103 @@
 PORTNAME=	gcc
 PORTVERSION=	${GCCVERSION}
-PORTREVISION=	5
+PORTREVISION=	6
 PORTEPOCH=	1
 CATEGORIES=	devel
 MASTER_SITES=	GCC
 PKGNAMEPREFIX=	mingw32-
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	FSF gcc-4 for Windows cross-development
 WWW=		https://www.mingw.org/
 
 LICENSE=	GPLv3 GPLv3RLE
 LICENSE_COMB=	multi
 
 BUILD_DEPENDS=	${PKGNAMEPREFIX}as:devel/binutils@${PKGNAMEPREFIX:C/-$//} \
 		mingwm10.dll:devel/${PKGNAMEPREFIX}bin-msvcrt \
 		objdump:devel/binutils
 RUN_DEPENDS=	${PKGNAMEPREFIX}as:devel/binutils@${PKGNAMEPREFIX:C/-$//}
 LIB_DEPENDS=	libgmp.so:math/gmp \
 		libmpfr.so:math/mpfr \
 		libmpc.so:math/mpc
 
 BROKEN_powerpc64=	fails to configure: error: cannot compute suffix of object files: cannot compile
 
 GCCVERSION=	4.8.1
 
 SSP_UNSAFE=	yes
 
 ONLY_FOR_ARCHS=	amd64 i386 powerpc powerpc64 sparc64
 USE_LDCONFIG=	yes
 USES=		bison cpe iconv gmake libtool makeinfo perl5 tar:bzip2
 CPE_VENDOR=	gnu
 USE_PERL5=	build
 
 GCC_TARG=	${PKGNAMEPREFIX:S/-$//}
 
 PATCH_WRKSRC=	${SRCDIR}
 CONFIGURE_SCRIPT=	../${SRCDIR:C/${WRKDIR}//}/configure
 
 BINARIES=	c++ cpp g++ gcc gcov gfortran
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "amd64"
 CONFIGURE_TARGET=	x86_64-portbld-${OPSYS:tl}${OSREL}
 .else
 CONFIGURE_TARGET=	${ARCH}-portbld-${OPSYS:tl}${OSREL}
 .endif
 
 .if ${ARCH} == powerpc64
 CONFIGURE_ENV+=	UNAME_m="powerpc64"
 .endif
 
 LANGUAGES:=	c,c++,fortran,objc,obj-c++
 SRCDIR=		${WRKDIR}/${PORTNAME}-${GCCVERSION}
 WRKSRC=		${WRKDIR}/build
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-nls --target=${GCC_TARG} \
 		--with-gxx-include-dir=${PREFIX}/${GCC_TARG}/include/c++/${GCCVERSION} \
 		--disable-build-poststage1-with-cxx \
 		--includedir=${PREFIX}/${GCC_TARG}/include \
 		--datadir=${PREFIX}/${GCC_TARG}/share \
 		--enable-shared --with-gnu-ld \
 		--enable-lto --disable-multilib \
 		--enable-languages=${LANGUAGES} \
 		--disable-sjlj-exceptions \
 		--with-dwarf2 --disable-win32-registry \
 		--enable-libstdcxx-debug \
 		--enable-version-specific-runtime-libs \
 		--with-gmp=${LOCALBASE} \
 		--with-system-zlib --with-gnu-as \
 		--enable-decimal-float=yes \
 		--disable-libgomp --disable-threads \
 		${ICONV_CONFIGURE_ARG} \
 		--disable-bootstrap
 MAKE_ARGS+=	MAKEINFOFLAGS="--no-split"
 PLIST_SUB+=	GCC_TARG=${GCC_TARG} GCC_REV=${GCCVERSION}
 INFO_PATH=	${GCC_TARG}/share/info
 INFO=		cpp cppinternals gcc gccinstall gccint gfortran
 .if ${ARCH} == "i386" || ${ARCH} == "amd64"
 INFO+=		libquadmath
 .endif
 INSTALL_TARGET=	install-strip
 
 post-patch:
 	${REINPLACE_CMD} -e "s,# include <sys/sysctl.h>,," \
 		${SRCDIR}/libiberty/physmem.c
 
 pre-configure:
 	cd ${SRCDIR} ; contrib/gcc_update --touch
 	@${RM} ${SRCDIR}/gcc/*/*.info*
 	@${MKDIR} ${CONFIGURE_WRKSRC}
 
 post-install:
 	@${RM} ${STAGEDIR}${PREFIX}/lib/libiberty.a
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${GCC_TARG}/bin
 .for F in ${BINARIES}
 	@${LN} -f ${STAGEDIR}${PREFIX}/bin/${PKGNAMEPREFIX}$F \
 		${STAGEDIR}${PREFIX}/${GCC_TARG}/bin/$F
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/devel/mingw32-libffi/Makefile b/devel/mingw32-libffi/Makefile
index 05c20ccf9e0e..0cfb90bdf058 100644
--- a/devel/mingw32-libffi/Makefile
+++ b/devel/mingw32-libffi/Makefile
@@ -1,36 +1,36 @@
 PORTNAME=	libffi
 PORTVERSION=	3.0.13
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	ftp://sourceware.org/pub/libffi/
 PKGNAMEPREFIX=	mingw32-
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The libffi library cross-compiled for MinGW32
 WWW=		http://sources.redhat.com/libffi/
 
 BUILD_DEPENDS=	${PKGNAMEPREFIX}gcc:devel/${PKGNAMEPREFIX}gcc \
 		${LOCALBASE}/mingw32/include/stdlib.h:devel/${PKGNAMEPREFIX}bin-msvcrt
 
 SSP_UNSAFE=	fails to link
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_PREFIX=	${PREFIX}/mingw32
 CONFIGURE_ARGS=	--host="mingw32" --enable-shared
 CC=		${PKGNAMEPREFIX}gcc
 CFLAGS=		-O2	# Override CFLAGS for a cross-build
 USES=		cpe libtool
 CPE_VENDOR=	${PORTNAME}_project
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
 post-patch:
 	${REINPLACE_CMD} -e 's,^INFO_DEPS[ \t]*=,#&,' \
 	                 -e '/^SUBDIRS[ \t]*=/s, man$$,,' \
 	                 ${WRKSRC}/Makefile.in
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/mingw32/include
 	${INSTALL_DATA} \
 		${STAGEDIR}${PREFIX}/mingw32/lib/libffi-${PORTVERSION}/include/*.h \
 		${STAGEDIR}${PREFIX}/mingw32/include/
 
 .include <bsd.port.mk>
diff --git a/devel/mingw32-libyaml/Makefile b/devel/mingw32-libyaml/Makefile
index def1d179034a..246463abda82 100644
--- a/devel/mingw32-libyaml/Makefile
+++ b/devel/mingw32-libyaml/Makefile
@@ -1,26 +1,26 @@
 PORTNAME=	libyaml
 PORTVERSION=	0.1.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel textproc
 MASTER_SITES=	http://pyyaml.org/download/libyaml/
 PKGNAMEPREFIX=	mingw32-
 DISTNAME=	yaml-${PORTVERSION}
 DIST_SUBDIR=	repacked
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The libyaml library cross-compiled for MinGW32
 WWW=		https://pyyaml.org/wiki/LibYAML
 
 BUILD_DEPENDS=	${PKGNAMEPREFIX}gcc:devel/${PKGNAMEPREFIX}gcc \
 		${LOCALBASE}/mingw32/include/stdlib.h:devel/${PKGNAMEPREFIX}bin-msvcrt
 
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_PREFIX=	${PREFIX}/mingw32
 CONFIGURE_ARGS=	--host="mingw32"
 CC=		${PKGNAMEPREFIX}gcc
 CFLAGS=		-O3	# Override CFLAGS for a cross-build
 SSP_CFLAGS?=	-fstack-protector # XXX -strong isn't supported by GCC < 4.9
 USES=		cpe libtool
 CPE_VENDOR=	pyyaml
 
 .include <bsd.port.mk>
diff --git a/devel/mingw32-openssl/Makefile b/devel/mingw32-openssl/Makefile
index bd40c000723c..9dd9c0851034 100644
--- a/devel/mingw32-openssl/Makefile
+++ b/devel/mingw32-openssl/Makefile
@@ -1,34 +1,35 @@
 PORTNAME=	openssl
 PORTVERSION=	1.0.2u
+PORTREVISION=	1
 CATEGORIES=	devel security
 MASTER_SITES=	https://www.openssl.org/source/old/${PORTVERSION:C/[a-z]*$//}/ \
 		http://artfiles.org/openssl.org/source/old/${PORTVERSION:C/[a-z]*$//}/
 PKGNAMEPREFIX=	mingw32-
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The OpenSSL library cross-compiled for MinGW32
 WWW=		http://sctp.fh-muenster.de/dtls-patches.html
 
 BUILD_DEPENDS=	makedepend:devel/makedepend \
 		${PKGNAMEPREFIX}gcc:devel/${PKGNAMEPREFIX}gcc \
 		${LOCALBASE}/mingw32/include/stdlib.h:devel/${PKGNAMEPREFIX}bin-msvcrt \
 		${LOCALBASE}/mingw32/lib/libz.a:devel/mingw32-zlib
 
 USES=		cpe perl5 shebangfix
 SHEBANG_FILES=	apps/tsget
 USE_PERL5=	build
 MAKE_JOBS_UNSAFE=	yes
 CONFIGURE_PREFIX=	${PREFIX}/mingw32
 OPENSSLDIR=		${CONFIGURE_PREFIX}/openssl
 INSTALL_TARGET=		install_sw
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|m4 -B 8192|m4|g' \
 		${WRKSRC}/crypto/des/Makefile
 
 do-configure:
 	cd ${WRKSRC} && ${SETENV} PERL="${PERL}" CROSS_COMPILE="${PKGNAMEPREFIX}" \
 	./Configure mingw --prefix="${CONFIGURE_PREFIX}" --install_prefix=${STAGEDIR} \
 	--openssldir="${OPENSSLDIR}"
 
 .include <bsd.port.mk>
diff --git a/devel/mingw32-pdcurses/Makefile b/devel/mingw32-pdcurses/Makefile
index ac979ae0a663..312cd1a655d3 100644
--- a/devel/mingw32-pdcurses/Makefile
+++ b/devel/mingw32-pdcurses/Makefile
@@ -1,32 +1,32 @@
 PORTNAME=	pdcurses
 PORTVERSION=	3.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	SF
 PKGNAMEPREFIX=	mingw32-
 DISTNAME=	PDCurses-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Curses and Panel terminal library for Windows
 WWW=		http://pdcurses.sourceforge.net/
 
 BUILD_DEPENDS=	${PKGNAMEPREFIX}gcc:devel/${PKGNAMEPREFIX}gcc \
 		mingwm10.dll:devel/mingw32-bin-msvcrt
 
 USES=		gmake
 MAKEFILE=	gccwin32.mak
 WRKSRC=		${WRKDIR}/${DISTNAME}/win32
 MAKE_ARGS+=	CC=${PKGNAMEPREFIX}gcc LIBEXE=${PKGNAMEPREFIX}ar
 ALL_TARGET=	pdcurses.a
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/mingw32/include
 	@${MKDIR} ${STAGEDIR}${PREFIX}/mingw32/lib
 .for f in curses.h curspriv.h panel.h term.h
 	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/$f ${STAGEDIR}${PREFIX}/mingw32/include/$f
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/pdcurses.a ${STAGEDIR}${PREFIX}/mingw32/lib/libpdcurses.a
 	${LN} -sf libpdcurses.a ${STAGEDIR}${PREFIX}/mingw32/lib/libcurses.a
 	${LN} -sf libpdcurses.a ${STAGEDIR}${PREFIX}/mingw32/lib/libpanel.a
 
 .include <bsd.port.mk>
diff --git a/devel/mingw32-pthreads/Makefile b/devel/mingw32-pthreads/Makefile
index 7d90001b12bf..01d8b65ea1b3 100644
--- a/devel/mingw32-pthreads/Makefile
+++ b/devel/mingw32-pthreads/Makefile
@@ -1,33 +1,33 @@
 PORTNAME=	pthreads
 PORTVERSION=	2.8.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	ftp://sources.redhat.com/pub/${PORTNAME}-win32/
 PKGNAMEPREFIX=	mingw32-
 DISTNAME=	${PORTNAME}-w32-${PORTVERSION:S/./-/g}-release
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	POSIX threads library for Windows compiled with MinGW32
 WWW=		https://sourceware.org/pthreads-win32/
 
 BUILD_DEPENDS=	${PKGNAMEPREFIX}gcc:devel/${PKGNAMEPREFIX}gcc \
 		mingwm10.dll:devel/mingw32-bin-msvcrt
 
 USES=		gmake
 
 do-build:
 	@${MAKE_CMD} -C ${WRKSRC} CROSS=${PKGNAMEPREFIX} GC
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/mingw32/include
 	@${MKDIR} ${STAGEDIR}${PREFIX}/mingw32/lib
 .for f in pthread.h sched.h semaphore.h
 	${INSTALL_DATA} ${WRKSRC}/$f ${STAGEDIR}${PREFIX}/mingw32/include/$f
 .endfor
 
 .for f in libpthreadGC2.a pthreadGC2.dll
 	${INSTALL_DATA} ${WRKSRC}/$f ${STAGEDIR}${PREFIX}/mingw32/lib/$f
 .endfor
 	${LN} -sf libpthreadGC2.a ${STAGEDIR}${PREFIX}/mingw32/lib/libpthread.a
 
 .include <bsd.port.mk>
diff --git a/devel/mingw32-zlib/Makefile b/devel/mingw32-zlib/Makefile
index 439dea31505c..fe33a74a2f28 100644
--- a/devel/mingw32-zlib/Makefile
+++ b/devel/mingw32-zlib/Makefile
@@ -1,24 +1,24 @@
 PORTNAME=	zlib
 PORTVERSION=	1.2.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel archivers
 MASTER_SITES=	http://zlib.net/ \
 		SF/libpng/${PORTNAME}/${PORTVERSION}
 PKGNAMEPREFIX=	mingw32-
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The zlib library cross-compiled for MinGW32
 WWW=		https://zlib.net/
 
 BUILD_DEPENDS=	${PKGNAMEPREFIX}gcc:devel/${PKGNAMEPREFIX}gcc \
 		${LOCALBASE}/mingw32/include/sys/types.h:devel/${PKGNAMEPREFIX}bin-msvcrt
 
 USES=		tar:xz cpe gmake
 MAKEFILE=	win32/Makefile.gcc
 MAKE_ARGS=	PREFIX=${PKGNAMEPREFIX} \
 		BINARY_PATH=${CROSS_BASE}/bin \
 		INCLUDE_PATH=${CROSS_BASE}/include \
 		LIBRARY_PATH=${CROSS_BASE}/lib
 CROSS_BASE=	${PREFIX}/mingw32
 
 .include <bsd.port.mk>
diff --git a/devel/mir-core/Makefile b/devel/mir-core/Makefile
index c13f8920e16f..6a5861f8cb71 100644
--- a/devel/mir-core/Makefile
+++ b/devel/mir-core/Makefile
@@ -1,33 +1,33 @@
 PORTNAME=	mir-core
 PORTVERSION=	1.1.62
-PORTREVISION=	2
+PORTREVISION=	3
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	base software building blocks and conventions
 WWW=		https://github.com/libmir/mir-core
 
 LICENSE=	BSL
 
 BUILD_DEPENDS=	ldmd2:lang/ldc \
 		dub:devel/dub
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	libmir
 
 DUB_CMD=	${LOCALBASE}/bin/dub build --build=release
 D_INCLUDE_DIR=	${PREFIX}/include/d
 D_LIB_DIR=	${PREFIX}/lib/d
 DC=		${PREFIX}/bin/ldmd2
 
 do-build:
 	@cd ${WRKSRC} && DC=${DC} ${DUB_CMD}
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${D_INCLUDE_DIR}
 	@${MKDIR} ${STAGEDIR}${D_LIB_DIR}
 	${INSTALL_DATA} ${WRKSRC}/libmir-core.a ${STAGEDIR}${D_LIB_DIR}
 	cd ${WRKSRC}/source && ${COPYTREE_SHARE} . ${STAGEDIR}${D_INCLUDE_DIR} "-name *\.d"
 
 .include <bsd.port.mk>
diff --git a/devel/msgpack-d/Makefile b/devel/msgpack-d/Makefile
index 11b5d640102c..263cfc57974c 100644
--- a/devel/msgpack-d/Makefile
+++ b/devel/msgpack-d/Makefile
@@ -1,33 +1,33 @@
 PORTNAME=	msgpack-d
 PORTVERSION=	1.0.4
-PORTREVISION=	2
+PORTREVISION=	3
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Pure D implementation of MessagePack
 WWW=		https://github.com/msgpack/msgpack-d
 
 LICENSE=	BSL
 
 BUILD_DEPENDS=	ldmd2:lang/ldc \
 		dub:devel/dub
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	msgpack
 
 DUB_CMD=	${LOCALBASE}/bin/dub build --build=release
 D_INCLUDE_DIR=	${PREFIX}/include/d
 D_LIB_DIR=	${PREFIX}/lib/d
 DC=		${PREFIX}/bin/ldmd2
 
 do-build:
 	@cd ${WRKSRC} && DC=${DC} ${DUB_CMD}
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${D_INCLUDE_DIR}
 	@${MKDIR} ${STAGEDIR}${D_LIB_DIR}
 	${INSTALL_DATA} ${WRKSRC}/libmsgpack-d.a ${STAGEDIR}${D_LIB_DIR}
 	cd ${WRKSRC}/src && ${COPYTREE_SHARE} . ${STAGEDIR}${D_INCLUDE_DIR} "-name *\.d"
 
 .include <bsd.port.mk>
diff --git a/devel/nextpnr/Makefile b/devel/nextpnr/Makefile
index 3948b623cdd1..9bf1c002356e 100644
--- a/devel/nextpnr/Makefile
+++ b/devel/nextpnr/Makefile
@@ -1,39 +1,40 @@
 PORTNAME=	nextpnr
 DISTVERSION=	0.4
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	devel
 
 MAINTAINER=	manu@FreeBSD.org
 COMMENT=	Portable FPGA place and route tool
 WWW=		https://github.com/YosysHQ/nextpnr
 
 LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 NOT_FOR_ARCHS=	i386
 NOT_FOR_ARCHS_REASON=	clang segfault
 BROKEN_FreeBSD_12_powerpc64=	runaway build
 
 BUILD_DEPENDS=	${LOCALBASE}/share/trellis/database:devel/trellis \
 		${LOCALBASE}/share/icebox:devel/icestorm
 LIB_DEPENDS=	libboost_thread.so:devel/boost-libs \
 		libboost_filesystem.so:devel/boost-libs \
 		libboost_program_options.so:devel/boost-libs \
 		${PY_BOOST}
 
 USES=		compiler:c++11-lang cmake qt:5 eigen:3 python:3.5+ gl
 USE_QT=		buildtools:build core gui opengl qmake:build widgets
 USE_GL=		gl glu
 USE_GITHUB=	yes
 GH_ACCOUNT=	YosysHQ
 GH_TAGNAME=	${PORTNAME}-${DISTVERSION}
 GH_TUPLE=	YosysHQ:nextpnr-tests:00c55a9e:tests/tests
 
 BINARY_ALIAS=	python3=${PYTHON_CMD}
 
 CMAKE_ARGS=	-DARCH="ice40;ecp5" -DTRELLIS_ROOT=${LOCALBASE}/share/trellis/
 
 PLIST_FILES=	bin/nextpnr-ecp5 \
 		bin/nextpnr-ice40
 
 .include <bsd.port.mk>
diff --git a/devel/ocaml-lacaml/Makefile b/devel/ocaml-lacaml/Makefile
index 5817124987db..4d3ab9697cab 100644
--- a/devel/ocaml-lacaml/Makefile
+++ b/devel/ocaml-lacaml/Makefile
@@ -1,63 +1,63 @@
 PORTNAME=	lacaml
 PORTVERSION=	8.0.7
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	devel
 MASTER_SITES=	https://github.com/mmottl/lacaml/releases/download/v${PORTVERSION}/
 PKGNAMEPREFIX=	ocaml-
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	OCaml interface to BLAS and LAPACK libraries
 WWW=		https://mmottl.github.io/lacaml/
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING.txt
 
 BUILD_DEPENDS=	ocamlbuild:devel/ocaml-ocamlbuild
 
 USE_OCAML=	yes
 USE_OCAML_FINDLIB=yes
 USE_OCAMLFIND_PLIST=yes
 USE_OCAML_LDCONFIG=yes
 USE_OCAML_WASH=	yes
 OCAMLFIND_LDCONF=ignore
 
 USES=		blaslapack fortran
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix ${PREFIX} --disable-docs --disable-examples \
 		--override conf_ccopt "${CFLAGS}" \
 		--override conf_cclib "${LDFLAGS}"
 MAKE_JOBS_UNSAFE=yes
 
 CFLAGS+=	-fPIC -DEXTERNAL_EXP10
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 DOCSDIR=	${OCAML_DOCSDIR}/${PORTNAME}
 EXAMPLESDIR=	${OCAML_EXAMPLESDIR}/${PORTNAME}
 
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|%%BLASLIB%%|${BLASLIB}| ; \
 		 s|%%LAPACKLIB%%|${LAPACKLIB}| ; \
 		 s|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/myocamlbuild.ml
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/lacaml/*.cmxs
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/lacaml/*.so
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in AUTHORS.txt CHANGES.txt README.md TODO.md
 	(cd ${WRKSRC} && ${INSTALL_DATA} ${i} \
 		${STAGEDIR}${DOCSDIR})
 .endfor
 
 post-install-EXAMPLES-on:
 	@(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . \
 		${STAGEDIR}${EXAMPLESDIR})
 
 .include <bsd.port.mk>
diff --git a/devel/omniORB/Makefile b/devel/omniORB/Makefile
index 5b2f121b8c88..a6273bc1b0fc 100644
--- a/devel/omniORB/Makefile
+++ b/devel/omniORB/Makefile
@@ -1,81 +1,82 @@
 PORTNAME=	omniORB
 DISTVERSION=	${ABI_VER}.${ABI_MAJOR_VER}.${ABI_MINOR_VER}
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	SF/${PORTNAME:tl}/${PORTNAME}/${PORTNAME}-${DISTVERSION:S/-2//}
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Robust high performance CORBA ORB for C++ and Python
 WWW=		http://omniorb.sourceforge.net/
 
 LICENSE=	GPLv2
 
 USES=		compiler:gcc-c++11-lib gmake pkgconfig python shebangfix ssl \
 		tar:bzip2
 BROKEN_SSL=	openssl
 BROKEN_SSL_REASON_openssl=	member access into incomplete type 'DH' (aka 'dh_st')
 USE_LDCONFIG=	yes
 USE_PYTHON=	py3kplist
 
 SHEBANG_FILES=	src/tool/omniidl/python2/scripts/omniidlrun.py \
 		src/tool/omniidl/python3/scripts/omniidlrun.py
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--datadir=${DATADIR} \
 		--with-omniNames-logdir=/var/log \
 		--with-omniORB-config=${PREFIX}/etc/omniORB.cfg \
 		--with-openssl=${OPENSSLBASE}
 CONFIGURE_ENV+=	PYTHON=${PYTHON_CMD}
 
 MAKEFILE=	GNUmakefile
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION:S/-2//}
 
 ABI_VER=		4
 ABI_MAJOR_VER=		3
 ABI_MINOR_VER=		0
 PLIST_SUB+=		ABI_MAJOR_VER=${ABI_MAJOR_VER} \
 			ABI_MINOR_VER=${ABI_MINOR_VER} \
 			ABI_VER=${ABI_VER}
 OPTIONS_DEFINE=		DOCS STATIC
 OPTIONS_DEFAULT=	STATIC
 OPTIONS_SUB=		yes
 STATIC_CONFIGURE_OFF=	--disable-static
 
 post-patch:
 	@${REINPLACE_CMD} -e 's#-O2#${CFLAGS}#g' ${WRKSRC}/mk/beforeauto.mk.in
 	@${REINPLACE_CMD} -e 's#$$(INSTALLLIBDIR)/pkgconfig#${STAGEDIR}${PREFIX}/libdata/pkgconfig#g' \
 		${WRKSRC}/contrib/pkgconfig/GNUmakefile.in
 
 post-install:
 	@${PYTHON_CMD} -c "import compileall; compileall.compile_dir('${STAGEDIR}${PYTHON_SITELIBDIR}/omniidl')"
 	@${PYTHON_CMD} -c "import compileall; compileall.compile_dir('${STAGEDIR}${PYTHON_SITELIBDIR}/omniidl_be')"
 	${INSTALL_DATA} ${WRKSRC}/sample.cfg ${STAGEDIR}${PREFIX}/etc/omniORB.cfg.sample
 	@cd ${WRKSRC}/man/man1 && ${INSTALL_MAN} *.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
 	@cd ${WRKSRC}/man/man8 && ${INSTALL_MAN} *.8 ${STAGEDIR}${MAN8PREFIX}/man/man8
 .for i in catior convertior omniMapper omniNames omnicpp nameclt omkdepend \
 	genior
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${i}
 .endfor
 .for i in libomniConnectionMgmt4.so.${ABI_MAJOR_VER}.${ABI_MINOR_VER} \
 	libomniORB4.so.${ABI_MAJOR_VER}.${ABI_MINOR_VER} \
 	libCOSDynamic4.so.${ABI_MAJOR_VER}.${ABI_MINOR_VER} \
 	libomnihttpTP4.so.${ABI_MAJOR_VER}.${ABI_MINOR_VER} \
 	libomnihttpCrypto4.so.${ABI_MAJOR_VER}.${ABI_MINOR_VER} \
 	libomnisslTP4.so.${ABI_MAJOR_VER}.${ABI_MINOR_VER} \
 	libomniDynamic4.so.${ABI_MAJOR_VER}.${ABI_MINOR_VER} \
 	libCOS4.so.${ABI_MAJOR_VER}.${ABI_MINOR_VER} \
 	libomniCodeSets4.so.${ABI_MAJOR_VER}.${ABI_MINOR_VER} \
 	libomniZIOPDynamic4.so.${ABI_MAJOR_VER}.${ABI_MINOR_VER} \
 	libomnithread.so.${ABI_VER}.${ABI_MAJOR_VER} \
 	libomniZIOP4.so.${ABI_MAJOR_VER}.${ABI_MINOR_VER}
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${i}
 .endfor
 	@${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/*.so
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@cd ${WRKSRC} && ${INSTALL_DATA} COPYING README.FIRST.txt README.unix.txt \
 	 ReleaseNotes.txt ${STAGEDIR}${DOCSDIR}
 	@${TAR} cCf ${WRKSRC}/doc - . | ${TAR} xUCf ${STAGEDIR}${DOCSDIR} -
 
 .include <bsd.port.mk>
diff --git a/devel/p5-Sepia/Makefile b/devel/p5-Sepia/Makefile
index f8cc6186fefa..698d5a374dd4 100644
--- a/devel/p5-Sepia/Makefile
+++ b/devel/p5-Sepia/Makefile
@@ -1,33 +1,33 @@
 PORTNAME=	Sepia
 PORTVERSION=	0.992
-PORTREVISION=	21
+PORTREVISION=	23
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	ashish@FreeBSD.org
 COMMENT=	Simple Emacs-Perl Interface
 WWW=		https://metacpan.org/release/Sepia
 
 .if ${FLAVOR:U} == devel_full || ${FLAVOR:U} == devel_nox
 BROKEN=		fails to build
 .endif
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	p5-Devel-Size>=0:devel/p5-Devel-Size \
 		p5-IO-Stringy>=0:devel/p5-IO-Stringy \
 		p5-PadWalker>=0:devel/p5-PadWalker \
 		p5-Devel-LexAlias>=0:devel/p5-Devel-LexAlias \
 		p5-libwww>=0:www/p5-libwww \
 		p5-Module-Info>=0:devel/p5-Module-Info \
 		p5-BSD-Resource>=0:devel/p5-BSD-Resource
 
 USES=		emacs gmake makeinfo perl5
 USE_PERL5=	configure
 
 INFO=	sepia
 
 CONFIGURE_ARGS+=	--emacs ${EMACS_CMD} --lisp ${PREFIX}/${EMACS_SITE_LISPDIR}/sepia --info ${PREFIX}/${INFO_PATH}
 
 .include <bsd.port.mk>
diff --git a/devel/p5-Test-Parser/Makefile b/devel/p5-Test-Parser/Makefile
index 30e90ca18509..fc96a06939bd 100644
--- a/devel/p5-Test-Parser/Makefile
+++ b/devel/p5-Test-Parser/Makefile
@@ -1,19 +1,19 @@
 PORTNAME=	Test-Parser
 PORTVERSION=	1.9
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Parsing log files from test runs, and displays in an XML syntax
 WWW=		https://metacpan.org/release/Test-Parser
 
 RUN_DEPENDS=	p5-Chart-Graph>=0:graphics/p5-Chart-Graph \
 		p5-XML-Simple>=0:textproc/p5-XML-Simple \
 		p5-XML-Twig>=0:textproc/p5-XML-Twig
 
 USES=		perl5
 USE_PERL5=	configure
 
 .include <bsd.port.mk>
diff --git a/devel/papi/Makefile b/devel/papi/Makefile
index dab3e2abd8c9..f2d37af5f5a4 100644
--- a/devel/papi/Makefile
+++ b/devel/papi/Makefile
@@ -1,61 +1,61 @@
 PORTNAME=	papi
 PORTVERSION=	5.4.3
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	devel
 MASTER_SITES=	http://icl.cs.utk.edu/projects/papi/downloads/
 
 MAINTAINER=	pizzamig@FreeBSD.org
 COMMENT=	API to access the performance counter hw in the microprocessor
 WWW=		https://code.google.com/p/papi-for-freebsd/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKDIR}/${PORTNAME}-${PORTVERSION}/LICENSE.txt
 
 TEST_TARGET=	fulltest
 
 ONLY_FOR_ARCHS=	i386 amd64
 ONLY_FOR_ARCHS_REASON=	HWPMC kernel module is only available for I386 and \
 			AMD64 machines
 NO_PACKAGE=	Needs to be compiled for specific CPU
 
 STRIP=		# empty
 USE_LDCONFIG=	yes
 LIB_DEPENDS+=	libopa.so:net/mpich
 USES=		fortran gmake pathfix pkgconfig
 PATHFIX_MAKEFILEIN=	Makefile.inc
 GNU_CONFIGURE=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
 WRKMAN=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/man
 INSTALL_TARGET=	install-all
 CONFIGURE_ARGS+=	--with-tests=ctests
 
 OPTIONS_DEFINE=	CORETEMP DEBUGINFO
 CORETEMP_DESC=	Add Intel Core thermal sensor (need coretemp.ko)
 DEBUGINFO_DESC=	Add debug information (increased verbosity)
 
 CORETEMP_CONFIGURE_ON=	--with-components=coretemp_freebsd
 DEBUGINFO_CONFIGURE_WITH=	debug
 
 .include <bsd.port.options.mk>
 
 HAS_HWPMC!=	${SYSCTL} kern.hwpmc.nsamples >/dev/null 2>&1 && ${ECHO_CMD} yes || ${ECHO_CMD}
 
 .if ${HAS_HWPMC} != yes
 IGNORE=		needs hwpmc module loaded or compiled into the kernel. \
 		Please consult hwpmc(4) on how to do it (or read pkg-message)
 .endif
 
 post-patch:
 	${REINPLACE_CMD} -e 's|<malloc.h>|<stdlib.h>|g' \
 		${WRKSRC}/components/appio/tests/appio_test_pthreads.c \
 		${WRKSRC}/components/appio/tests/iozone/iozone.c \
 		${WRKSRC}/components/appio/tests/iozone/libasync.c \
 		${WRKSRC}/components/perfctr_ppc/linux-ppc64.h \
 		${WRKSRC}/ctests/omptough.c \
 		${WRKSRC}/ctests/pernode.c \
 		${WRKSRC}/ctests/zero_shmem.c \
 		${WRKSRC}/libpfm-3.y/lib/pfmlib_sicortex.c \
 		${WRKSRC}/libpfm4/lib/pfmlib_sicortex.c \
 		${WRKSRC}/testlib/papi_test.h
 
 .include <bsd.port.mk>
diff --git a/devel/pcsc-cyberjack/Makefile b/devel/pcsc-cyberjack/Makefile
index d9344369a8e7..72d898e3b07b 100644
--- a/devel/pcsc-cyberjack/Makefile
+++ b/devel/pcsc-cyberjack/Makefile
@@ -1,36 +1,37 @@
 PORTNAME=	pcsc-cyberjack
 DISTVERSION=	3.99.5final.SP15
+PORTREVISION=	1
 CATEGORIES=	devel security
 MASTER_SITES=	https://support.reiner-sct.de/downloads/LINUX/V3.99.5_SP15/
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tm@NetBSD.org
 COMMENT=	Reiner SCT cyberJack card reader pcsc driver
 WWW=		https://www.reiner-sct.de
 
 LICENSE=	GPLv2 LGPL20
 LICENSE_COMB=	dual
 LICENSE_FILE_GPLv2=	${WRKSRC}/COPYRIGHT.GPL
 LICENSE_FILE_LGPL20=	${WRKSRC}/COPYRIGHT.LGPL
 
 LIB_DEPENDS=	libpcsclite.so:devel/pcsc-lite \
 		libxml2.so:textproc/libxml2
 
 USES=		autoreconf compiler:gcc-c++11-lib dos2unix gmake libtool pkgconfig \
 		tar:bzip2
 
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
 
 CONFIGURE_ARGS=	--enable-release --with-usbdropdir=${PREFIX}/lib/pcsc/drivers
 CONFIGURE_ENV=	LIBUSB_CFLAGS="-I${LOCALBASE}/include" \
 		LIBUSB_LIBS="-L${LOCALBASE}/lib -lusb"
 CXXFLAGS+=	-Wno-c++11-narrowing
 CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS+=	${PTHREAD_LIBS}
 
 PLIST_SUB=	VER=${PORTVERSION}
 
 .include <bsd.port.mk>
diff --git a/devel/pkg-info.el/Makefile b/devel/pkg-info.el/Makefile
index e54e9f94ba46..3625b667c53f 100644
--- a/devel/pkg-info.el/Makefile
+++ b/devel/pkg-info.el/Makefile
@@ -1,25 +1,25 @@
 PORTNAME=	pkg-info.el
 PORTVERSION=	0.6
-PORTREVISION=	10
+PORTREVISION=	12
 CATEGORIES=	devel elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Provide information about Emacs packages
 WWW=		https://github.com/lunaryorn/pkg-info.el
 
 LICENSE=	GPLv3
 
 USES=		emacs
 USE_GITHUB=	yes
 GH_ACCOUNT=	lunaryorn
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 PLIST_FILES=	${EMACS_SITE_LISPDIR}/pkg-info.el
 
 do-install:
 	(cd ${WRKSRC} && ${INSTALL_DATA} ${PLIST_FILES:M*.el:T} \
 	    ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR})
 
 .include <bsd.port.mk>
diff --git a/devel/psvn/Makefile b/devel/psvn/Makefile
index 7d4495b7bccc..65cdace1c8ec 100644
--- a/devel/psvn/Makefile
+++ b/devel/psvn/Makefile
@@ -1,37 +1,37 @@
 PORTNAME=	psvn
 PORTVERSION=	20150720.214200
-PORTREVISION=	8
+PORTREVISION=	10
 CATEGORIES=	devel elisp
 MASTER_SITES=	http://www.xsteve.at/prg/emacs/
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 DISTNAME=	psvn.el
 EXTRACT_SUFX=	# empty
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Subversion interface for Emacs
 WWW=		http://www.xsteve.at/prg/emacs/
 
 LICENSE=	GPLv2+
 
 RUN_DEPENDS=	svn:devel/subversion
 
 USES=		emacs
 
 NO_WRKSUBDIR=	yes
 EXTRACT_CMD=	${CP}
 EXTRACT_BEFORE_ARGS=	# empty
 EXTRACT_AFTER_ARGS=	${WRKSRC}/psvn.el
 
 PLIST_FILES=	${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}/psvn.el \
 		${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}/psvn.elc
 
 ELISPDIR=	${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
 
 do-build:
 	(cd ${WRKSRC} && ${EMACS_CMD} -batch -q -f batch-byte-compile psvn.el)
 
 do-install:
 	@${MKDIR} ${ELISPDIR}
 	${INSTALL_DATA} ${WRKSRC}/psvn.* ${ELISPDIR}
 
 .include <bsd.port.mk>
diff --git a/devel/py-aiortc/Makefile b/devel/py-aiortc/Makefile
index 44bc2b1c3749..8b2ab76bdc7e 100644
--- a/devel/py-aiortc/Makefile
+++ b/devel/py-aiortc/Makefile
@@ -1,32 +1,33 @@
 PORTNAME=	aiortc
 PORTVERSION=	1.5.0
+PORTREVISION=	1
 CATEGORIES=	devel multimedia python www
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	WebRTC and ORTC in Python
 WWW=		https://github.com/aiortc/aiortc/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cffi>=1.0.0:devel/py-cffi@${PY_FLAVOR}
 LIB_DEPENDS=	libopus.so:audio/opus \
 		libvpx.so:multimedia/libvpx
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}aioice>=0.9.0:devel/py-aioice@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}av>=9.0.0:multimedia/py-av@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cryptography>=2.2:security/py-cryptography@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}google-crc32c>=1.1:devel/py-google-crc32c@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}openssl>=23.1.0:security/py-openssl@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyee>=9.0.0:devel/py-pyee@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pylibsrtp>=0.5.6:devel/py-pylibsrtp@${PY_FLAVOR}
 
 USES=		localbase python:3.5+
 USE_PYTHON=	autoplist concurrent distutils
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}/codecs/*.so
 
 .include <bsd.port.mk>
diff --git a/devel/py-anndata/Makefile b/devel/py-anndata/Makefile
index b99c2fc55aa2..d075a4fcd50b 100644
--- a/devel/py-anndata/Makefile
+++ b/devel/py-anndata/Makefile
@@ -1,33 +1,34 @@
 PORTNAME=	anndata
 PORTVERSION=	0.9.1
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Annotated data
 WWW=		https://github.com/scverse/anndata
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}flit-core>=3.4<4:devel/py-flit-core@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}h5py>=3:science/py-h5py@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}natsort>=0:devel/py-natsort@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpy>=1.16.5,1:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pandas>=1.1.1,1:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=1.4:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}h5py>=3:science/py-h5py@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}natsort>=0:devel/py-natsort@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpy>=1.16.5,1:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}packaging>=20:devel/py-packaging@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pandas>=1.1.1,1:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=1.4:science/py-scipy@${PY_FLAVOR}
 
 USES=		python:3.8+
 USE_PYTHON=	autoplist concurrent pep517
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-asteval/Makefile b/devel/py-asteval/Makefile
index 0ade058404d2..46c3e8d68051 100644
--- a/devel/py-asteval/Makefile
+++ b/devel/py-asteval/Makefile
@@ -1,23 +1,24 @@
 PORTNAME=	asteval
 PORTVERSION=	0.9.29
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Safe, minimalistic evaluator of python expression using ast module
 WWW=		https://github.com/newville/asteval
 
 LICENSE=	MIT
 LICENSE_FILES=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${PY_FLAVOR}
 RUN_DEPENDS=	${PYNUMPY}
 
 USES=		python:3.8+
 USE_PYTHON=	distutils autoplist pytest
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-beartype/Makefile b/devel/py-beartype/Makefile
index 3eeeedf22f18..a5dcc6ccfb1c 100644
--- a/devel/py-beartype/Makefile
+++ b/devel/py-beartype/Makefile
@@ -1,21 +1,22 @@
 PORTNAME=	beartype
 DISTVERSION=	0.12.0
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Fast runtime type checking in pure Python
 WWW=		https://github.com/beartype/beartype
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYNUMPY}
 
 USES=		python:3.7+
 USE_PYTHON=	distutils autoplist pytest # tests fail, see https://github.com/beartype/beartype/issues/207
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-bullet3/Makefile b/devel/py-bullet3/Makefile
index 51c2f1c70e4a..57cf3ad10415 100644
--- a/devel/py-bullet3/Makefile
+++ b/devel/py-bullet3/Makefile
@@ -1,33 +1,34 @@
 PORTNAME=	bullet3
 DISTVERSION=	3.25
+PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Python version of 3D collision detection library Bullet
 WWW=		https://pybullet.org/wordpress/
 
 LICENSE=	ZLIB
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}gym>0:math/py-gym@${PY_FLAVOR}
 
 USES=		compiler:c++11-lang gl localbase python:3.6+
 USE_PYTHON=	distutils autoplist
 USE_GL=		gl glew
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	bulletphysics
 
 CFLAGS_powerpc64=	-mvsx
 
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/pybullet*.so
 
 do-test: # test require graphical environment
 	@${SETENV} ${TEST_ENV} ${PYTHON_CMD} ${FILESDIR}/test.py
 
 .include <bsd.port.mk>
diff --git a/devel/py-cadquery-pywrap/Makefile b/devel/py-cadquery-pywrap/Makefile
index bb9151fa69c8..c2a67871958c 100644
--- a/devel/py-cadquery-pywrap/Makefile
+++ b/devel/py-cadquery-pywrap/Makefile
@@ -1,40 +1,41 @@
 PORTNAME=	cadquery-pywrap
 DISTVERSIONPREFIX=	occt
 DISTVERSION=	7.5
+PORTREVISION=	1
 CATEGORIES=	devel python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	ports@nicandneal.net
 COMMENT=	C++ binding generator for python
 WWW=		https://github.com/CadQuery/pywrap
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}clang>0:devel/py-clang@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cymbal>0:devel/py-cymbal@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.11.2:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}joblib>0:devel/py-joblib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}logzero>0:devel/py-logzero@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}path>0:devel/py-path@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pybind11>=2.6:devel/py-pybind11@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}schema>0:devel/py-schema@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}toml>0:textproc/py-toml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}toposort>0:devel/py-toposort@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tqdm>0:misc/py-tqdm@${PY_FLAVOR} \
 		llvm${LLVMVER}>0:devel/llvm${LLVMVER} \
 		pybind11>=2.6:devel/pybind11
 
 USES=		python:3.6+
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	CadQuery
 GH_PROJECT=	pywrap
 GH_TAGNAME=	e8c7bc9
 
 USE_PYTHON=	autoplist concurrent distutils
 LLVMVER=	10
 
 .include <bsd.port.mk>
diff --git a/devel/py-cclib/Makefile b/devel/py-cclib/Makefile
index 3550f6840f0b..14a21b8344d4 100644
--- a/devel/py-cclib/Makefile
+++ b/devel/py-cclib/Makefile
@@ -1,22 +1,23 @@
 PORTNAME=	cclib
 PORTVERSION=	1.7.1
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	robak@FreeBSD.org
 COMMENT=	Parsers And Algorithms For Computational Chemistry
 WWW=		https://cclib.github.io
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYNUMPY}
 RUN_DEPENDS=	${PYNUMPY}
 
 USES=		python:3.6+
 USE_PYTHON=	autoplist distutils
 
 USE_GITHUB=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-cfn-lint/Makefile b/devel/py-cfn-lint/Makefile
index fea1af3f0048..a0d57e4b4146 100644
--- a/devel/py-cfn-lint/Makefile
+++ b/devel/py-cfn-lint/Makefile
@@ -1,28 +1,29 @@
 PORTNAME=	cfn-lint
 DISTVERSION=	0.74.3
+PORTREVISION=	1
 CATEGORIES=	devel python textproc
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	nork@FreeBSD.org
 COMMENT=	AWS CloudFormation Linter
 WWW=		https://pypi.org/project/cfn-lint/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}aws-sam-translator>=1.60.1:devel/py-aws-sam-translator@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jschema-to-python>=1.2.3:devel/py-jschema-to-python@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jsonpatch>0:devel/py-jsonpatch@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jsonschema>=3.2<5:devel/py-jsonschema@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}junit-xml>=1.9:textproc/py-junit-xml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}networkx>=2.4,1<4,1:math/py-networkx@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sarif-om>=1.0.4:devel/py-sarif-om@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>5.4:devel/py-yaml@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-cftime/Makefile b/devel/py-cftime/Makefile
index 7b8020287e44..11e736db33eb 100644
--- a/devel/py-cftime/Makefile
+++ b/devel/py-cftime/Makefile
@@ -1,27 +1,28 @@
 PORTNAME=	cftime
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Time-handling functionality from netcdf4-python
 WWW=		https://github.com/Unidata/cftime
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYNUMPY}
 RUN_DEPENDS=	${PYNUMPY}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	autoplist cython distutils pytest
 
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/cftime/_cftime${PYTHON_EXT_SUFFIX}.so
 
 .include <bsd.port.mk>
diff --git a/devel/py-colorspacious/Makefile b/devel/py-colorspacious/Makefile
index c79cb44529a3..e24b9f54d0bb 100644
--- a/devel/py-colorspacious/Makefile
+++ b/devel/py-colorspacious/Makefile
@@ -1,22 +1,23 @@
 PORTNAME=	colorspacious
 DISTVERSION=	1.1.2
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Python library for doing colorspace conversions
 WWW=		https://github.com/njsmith/colorspacious
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BUILD_DEPENDS=	${PYNUMPY}
 RUN_DEPENDS=	${PYNUMPY}
 
 USES=		python
 USE_PYTHON=	distutils autoplist
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-fastf1/Makefile b/devel/py-fastf1/Makefile
index 26db01327cb8..0207b1f7bd48 100644
--- a/devel/py-fastf1/Makefile
+++ b/devel/py-fastf1/Makefile
@@ -1,29 +1,29 @@
 PORTNAME=	fastf1
 PORTVERSION=	2.3.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	jgh@FreeBSD.org
 COMMENT=	Python module to accessing and analyzing Formula 1 data
 WWW=		https://github.com/theOehrly/Fast-F1
 
 LICENSE=	MIT
 
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>=3.3.3:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pandas>=0:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests-cache>=0:www/py-requests-cache@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=0:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}signalr-client-aio>=0:devel/py-signalr-client-aio@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}thefuzz>=0:devel/py-thefuzz@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}timple>=0:math/py-timple@${PY_FLAVOR}
 
 USES=		python:3.8+
 USE_PYTHON=	autoplist distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-fbprophet/Makefile b/devel/py-fbprophet/Makefile
index b4efc62b98b8..8b1c78579e3a 100644
--- a/devel/py-fbprophet/Makefile
+++ b/devel/py-fbprophet/Makefile
@@ -1,30 +1,30 @@
 PORTNAME=	fbprophet
 PORTVERSION=	0.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	gmm@tutanota.com
 COMMENT=	Forecasting time series data based on an additive model
 WWW=		https://github.com/facebook/prophet
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		compiler:c11 python:3.7+
 USE_PYTHON=	autoplist distutils
 
 BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pystan>2.14:math/py-pystan@${PY_FLAVOR}
 
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pystan>2.14:math/py-pystan@${PY_FLAVOR}
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}numpy>1.10.0:math/py-numpy@${PY_FLAVOR}
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}matplotlib>2.0.0:math/py-matplotlib@${PY_FLAVOR}
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pandas>0.23.4:math/py-pandas@${PY_FLAVOR}
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}holidays>0.9.5:devel/py-holidays@${PY_FLAVOR}
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}lunardate>0.1.5:devel/py-lunardate@${PY_FLAVOR}
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}convertdate>2.1.2:devel/py-convertdate@${PY_FLAVOR}
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-game/Makefile b/devel/py-game/Makefile
index 1cef2441ff43..4a5737524efc 100644
--- a/devel/py-game/Makefile
+++ b/devel/py-game/Makefile
@@ -1,57 +1,58 @@
 PORTNAME=	game
 DISTVERSION=	2.2.0
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	py${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Module designed to write games in Python
 WWW=		https://www.pygame.org/news
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/docs/LGPL.txt
 
 BUILD_DEPENDS=	v4l_compat>0:multimedia/v4l_compat
 LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 		libpng.so:graphics/png \
 		libsmpeg.so:multimedia/smpeg
 RUN_DEPENDS=	${PYNUMPY} \
 		v4l_compat>0:multimedia/v4l_compat
 
 USES=		compiler:c11 jpeg localbase pkgconfig python:3.6+ sdl xorg
 USE_SDL=	sdl2 ttf2 image2 mixer2
 USE_PYTHON=	autoplist distutils
 USE_XORG=	x11
 
 SDLNOX11=	sdl-nox11-[0-9]*
 
 DOCSDIR=	${PREFIX}/share/doc/py-${PORTNAME}
 EXAMPLESDIR=	${PREFIX}/share/examples/py-${PORTNAME}
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
 post-extract:
 	@${RM} -r ${WRKSRC}/examples/.editorconfig
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 
 #Remove Un-needed macosx files
 	@${RM} -r ${WRKSRC}/examples/macosx
 	${TAR} -C ${WRKSRC}/examples -cf - . | \
 		${TAR} --unlink -C ${STAGEDIR}${EXAMPLESDIR} -xf -
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${TAR} -C ${WRKSRC}/docs -cf - . | \
 	${TAR} --unlink -C ${STAGEDIR}${DOCSDIR} -xf -
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/pygame/*.so
 	${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/pygame/_sdl2/*.so
 
 .include <bsd.port.mk>
diff --git a/devel/py-hypothesis/Makefile b/devel/py-hypothesis/Makefile
index d89468919ee5..be129eafebb7 100644
--- a/devel/py-hypothesis/Makefile
+++ b/devel/py-hypothesis/Makefile
@@ -1,59 +1,60 @@
 PORTNAME=	hypothesis
 PORTVERSION=	6.72.0
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Library for property based testing
 WWW=		https://hypothesis.works/ \
 		https://github.com/HypothesisWorks/hypothesis/tree/master/hypothesis-python
 
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}attrs>=19.2.0:devel/py-attrs@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}rich>=9.0.0:textproc/py-rich@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sortedcontainers>=2.1.0<3.0.0:devel/py-sortedcontainers@${PY_FLAVOR}
 
 USES=		python:3.8+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=	CLI CODEMODS DATEUTIL DJANGO DPCONTRACTS GHOSTWRITER LARK NUMPY PANDAS PYTEST PYTZ REDIS
 OPTIONS_DEFAULT=CLI DATEUTIL DJANGO DPCONTRACTS GHOSTWRITER LARK NUMPY PANDAS PYTEST PYTZ REDIS
 CLI_DESC=		Command-line interface support
 CODEMODS_DESC=		Refactor deprecated or inefficient code
 DATEUTIL_DESC=		Provide dateutil timezones
 DJANGO_DESC=		Django support
 DPCONTRACTS_DESC=	Contracts support
 GHOSTWRITER_DESC=	Ghostwriter support
 LARK_DESC=		Lark parser support
 NUMPY_DESC=		NumPy support
 PANDAS_DESC=		Pandas support
 PYTEST_DESC=		pytest support
 PYTZ_DESC=		Timezone support
 REDIS_DESC=		Redis support
 
 CLI_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}black>=19.10b0:devel/py-black@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}click>=7.0:devel/py-click@${PY_FLAVOR}
 CODEMODS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}libcst>=0.3.16:devel/py-libcst@${PY_FLAVOR}
 DATEUTIL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>=1.4:devel/py-dateutil@${PY_FLAVOR}
 DJANGO_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django32>=3.2:www/py-django32@${PY_FLAVOR}
 DPCONTRACTS_RUN_DEPENDS=${PYTHON_PKGNAMEPREFIX}dpcontracts>=0.4:devel/py-dpcontracts@${PY_FLAVOR}
 GHOSTWRITER_RUN_DEPENDS=${PYTHON_PKGNAMEPREFIX}black>=19.10b0:devel/py-black@${PY_FLAVOR}
 LARK_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lark>=0.10.1:devel/py-lark@${PY_FLAVOR}
 NUMPY_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=1.9.0,1:math/py-numpy@${PY_FLAVOR}
 PANDAS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pandas>=0.25,1:math/py-pandas@${PY_FLAVOR}
 PYTEST_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=4.6:devel/py-pytest@${PY_FLAVOR}
 PYTZ_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytz>=2014.1,1:devel/py-pytz@${PY_FLAVOR}
 REDIS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}redis>=3.0.0:databases/py-redis@${PY_FLAVOR}
 
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} < 31100
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}exceptiongroup>=1.0.0:devel/py-exceptiongroup@${PY_FLAVOR}
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/py-hypothesmith/Makefile b/devel/py-hypothesmith/Makefile
index 0324b75ddd4c..9275027350c3 100644
--- a/devel/py-hypothesmith/Makefile
+++ b/devel/py-hypothesmith/Makefile
@@ -1,22 +1,23 @@
 PORTNAME=	hypothesmith
 PORTVERSION=	0.2.3
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Hypothesis strategies for generating Python programs
 WWW=		https://github.com/Zac-HD/hypothesmith
 
 LICENSE=	MPL20
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}hypothesis>=0:devel/py-hypothesis@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}libcst>=0:devel/py-libcst@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}black>=0:devel/py-black@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}parso>=0:textproc/py-parso@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	autoplist distutils pytest
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-importlab/Makefile b/devel/py-importlab/Makefile
index 8bec53f8b045..062e3a964d0b 100644
--- a/devel/py-importlab/Makefile
+++ b/devel/py-importlab/Makefile
@@ -1,21 +1,22 @@
 PORTNAME=	importlab
 PORTVERSION=	0.8
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Calculate python dependency graphs
 WWW=		https://github.com/google/importlab
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}networkx>=2,1:math/py-networkx@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-ipydatawidgets/Makefile b/devel/py-ipydatawidgets/Makefile
index 12bf597561b8..f8e53cd8edaa 100644
--- a/devel/py-ipydatawidgets/Makefile
+++ b/devel/py-ipydatawidgets/Makefile
@@ -1,24 +1,25 @@
 PORTNAME=	ipydatawidgets
 PORTVERSION=	4.3.3
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Set of widgets to facilitate reuse of large datasets across widgets
 WWW=		https://github.com/vidartf/ipydatawidgets
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}jupyter-packaging>0:devel/py-jupyter-packaging@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ipywidgets>=7.0.0:devel/py-ipywidgets@${PY_FLAVOR} \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}traittypes>=0.2.0:devel/py-traittypes@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	distutils autoplist pytest
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-ipympl/Makefile b/devel/py-ipympl/Makefile
index 3d66a7bee191..1945b7e9d4e2 100644
--- a/devel/py-ipympl/Makefile
+++ b/devel/py-ipympl/Makefile
@@ -1,38 +1,39 @@
 PORTNAME=	ipympl
 DISTVERSION=	0.9.3
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Matplotlib Jupyter extension
 WWW=		https://github.com/matplotlib/ipympl
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}jupyter-packaging>0:devel/py-jupyter-packaging@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ipykernel>=4.7:devel/py-ipykernel@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ipywidgets>=7.6.0:devel/py-ipywidgets@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>=2.0.0:math/py-matplotlib@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	autoplist distutils
 
 NO_ARCH=	yes
 
 post-install:
 # Enable extension for jupyter lab and notebook
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/jupyter/nbconfig/notebook.d && \
 	${INSTALL_DATA} ${WRKSRC}/jupyter-matplotlib.json \
 		${STAGEDIR}${PREFIX}/etc/jupyter/nbconfig/notebook.d/
 	${INSTALL_DATA}  ${WRKSRC}/ipympl/labextension/package.json \
 		${STAGEDIR}${PYTHON_SITELIBDIR}/ipympl/nbextension/
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/jupyter/labextensions/ && \
 	${LN} -sf ${PYTHON_SITELIBDIR}/ipympl/labextension \
 		${STAGEDIR}${PREFIX}/share/jupyter/labextensions/jupyter-matplotlib
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/jupyter/nbextensions/ && \
 	${LN} -sf ${PYTHON_SITELIBDIR}/ipympl/nbextension \
 		${STAGEDIR}${PREFIX}/share/jupyter/nbextensions/jupyter-matplotlib
 
 .include <bsd.port.mk>
diff --git a/devel/py-jep/Makefile b/devel/py-jep/Makefile
index f7f2231caf04..a08929483aec 100644
--- a/devel/py-jep/Makefile
+++ b/devel/py-jep/Makefile
@@ -1,37 +1,38 @@
 PORTNAME=	jep
 PORTVERSION=	3.9.1
+PORTREVISION=	1
 CATEGORIES=	devel java python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Java Embedded Python
 WWW=		https://github.com/mrj0/jep
 
 LICENSE=	ZLIB
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		python:3.6+
 USE_PYTHON=	distutils
 
 CONFIGURE_ENV=	JAVA_HOME=${JAVA_HOME}
 MAKE_ENV=	JAVA_HOME=${JAVA_HOME}
 USE_JAVA=	yes
 USE_LDCONFIG=	yes
 PLIST_SUB+=	VERSION=${PORTVERSION}
 
 # Necessary, since the configure script does the LIBS and
 # LDFLAGS detection wrong
 CFLAGS+=	-I${JAVA_HOME}/include/freebsd
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 OPTIONS_DEFINE=	NUMPY
 OPTIONS_DEFAULT=	NUMPY
 NUMPY_BUILD_DEPENDS=	${PYNUMPY}
 NUMPY_RUN_DEPENDS=	${PYNUMPY}
 
 post-install:
 	${LN} -s ${PYTHON_SITELIBDIR}/jep/jep-${PORTVERSION}.jar ${STAGEDIR}${JAVAJARDIR}/jep.jar
 	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/jep/jep*.so
 
 .include <bsd.port.mk>
diff --git a/devel/py-llvmlite/Makefile b/devel/py-llvmlite/Makefile
index e0c41a520c21..b842d24af113 100644
--- a/devel/py-llvmlite/Makefile
+++ b/devel/py-llvmlite/Makefile
@@ -1,31 +1,32 @@
 PORTNAME=	llvmlite
 DISTVERSION=	0.39.1
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	dave@dal.ca
 COMMENT=	Lightweight LLVM python binding for writing JIT compilers
 WWW=		https://github.com/numba/llvmlite
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	llvm-config${LLVM_VER}:devel/llvm${LLVM_VER}
 RUN_DEPENDS=	llvm-config${LLVM_VER}:devel/llvm${LLVM_VER}
 
 USES=		compiler:c++11-lib python:3.6+ fortran
 USE_PYTHON=	distutils autoplist pytest
 
 CXXFLAGS=	-fPIC
 
 MAKE_ENV=	LLVM_CONFIG=${LOCALBASE}/bin/llvm-config${LLVM_VER}
 
 LLVM_VER=	11 # see the compatibility table https://github.com/numba/llvmlite#compatibility
 
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/llvmlite/binding/libllvmlite*.so
 
 .include <bsd.port.mk>
diff --git a/devel/py-mediapy/Makefile b/devel/py-mediapy/Makefile
index d37ec63129b5..7bca32f8eeaa 100644
--- a/devel/py-mediapy/Makefile
+++ b/devel/py-mediapy/Makefile
@@ -1,25 +1,26 @@
 PORTNAME=	mediapy
 PORTVERSION=	1.1.6
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Read/write/show images and videos in an IPython notebook
 WWW=		https://github.com/google/mediapy
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}flit-core>=3.5<4:devel/py-flit-core@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ipython>=0:devel/ipython@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>=0:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpy>=0,1:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR}
 
 USES=		python:3.8+
 USE_PYTHON=	autoplist concurrent pep517
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-mystic/Makefile b/devel/py-mystic/Makefile
index c029b6a9ed9a..3e91bfe437d5 100644
--- a/devel/py-mystic/Makefile
+++ b/devel/py-mystic/Makefile
@@ -1,27 +1,28 @@
 PORTNAME=	mystic
 PORTVERSION=	0.4.0
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Highly-constrained non-convex optimization and uncertainty quantification
 WWW=		https://github.com/uqfoundation/mystic
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=42:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dill>=0.3.6:devel/py-dill@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}klepto>=0.2.3:devel/py-klepto@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mpmath>=0.19:math/py-mpmath@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpy>=1.0,1:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sympy>=0.6.7:math/py-sympy@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	autoplist concurrent cython pep517
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-numba/Makefile b/devel/py-numba/Makefile
index b86b48bbe738..ab1fba3bba47 100644
--- a/devel/py-numba/Makefile
+++ b/devel/py-numba/Makefile
@@ -1,39 +1,39 @@
 PORTNAME=	numba
 DISTVERSION=	0.56.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	dave@dal.ca
 COMMENT=	Optimizing compiler for Python using LLVM
 WWW=		https://numba.pydata.org/
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 .if !exists(/usr/include/omp.h)
 BROKEN=		requires OpenMP support that is missing on this architecture
 .endif
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>1.11,1:math/py-numpy@${PY_FLAVOR}
 LIB_DEPENDS=	libtbb.so:devel/onetbb
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}llvmlite>=0.31.0:devel/py-llvmlite@${PY_FLAVOR}
 
 USES=		compiler:c++11-lang python:3.6+ fortran localbase
 USE_PYTHON=	distutils concurrent autoplist unittest
 
 MAKE_ENV=	NUMBA_DISABLE_TBB=1 # workaround for: not compatible with onetbb-2021.6.0, see https://github.com/numba/numba/issues/8487
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 TEST_WRKSRC=	${WRKSRC}/numba/tests
 
 post-patch:
 	@${SED} -i.bak 's#1\.24#1\.25#g' ${WRKSRC}/setup.py
 
 post-install:
 	@${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name "*.so" | ${XARGS} ${STRIP_CMD}
 
 do-test: # tests run for a very long time
 	@cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m numba.runtests
 
 .include <bsd.port.mk>
diff --git a/devel/py-omniorb/Makefile b/devel/py-omniorb/Makefile
index 210e6e687486..547e08c69f88 100644
--- a/devel/py-omniorb/Makefile
+++ b/devel/py-omniorb/Makefile
@@ -1,66 +1,67 @@
 PORTNAME=	omniorb
 DISTVERSION=	4.3.0
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	SF/${PORTNAME}/omniORBpy/omniORBpy-${DISTVERSION:S/-2//}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	omniORBpy-${DISTVERSION}
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Python bindings for omniORB4, a CORBA 2.6 ORB
 WWW=		http://omniorb.sourceforge.net
 
 LICENSE=	LGPL21
 
 # parts of omniORB4 source tree is required to build omniORBpy;
 # see also the "post-extract" target below.
 BUILD_DEPENDS=	${NONEXISTENT}:devel/omniORB:patch
 LIB_DEPENDS=	libomniORB4.so:devel/omniORB
 RUN_DEPENDS=	omniidl:devel/omniORB
 
 USES=		gmake python shebangfix ssl tar:bzip2
 USE_PYTHON=	py3kplist
 
 SHEBANG_FILES=	examples/ami/*.py examples/echo/*.py examples/embed/*.py \
 		examples/fortune/*.py examples/poa/*.py examples/tests/*.py \
 		examples/valuetype/simple/*.py examples/valuetype/tests/*.py
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS=		--with-omniorb=${LOCALBASE} \
 			--with-openssl=${OPENSSLBASE}
 CONFIGURE_ENV+=		PYTHON=${PYTHON_CMD}
 CONFIGURE_OUTSOURCE=	yes
 
 MAKEFILE=	GNUmakefile
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/-2//}
 
 PLIST_SUB=	SONUM=3
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 OMNIORB_WRKSRC=	cd ${.CURDIR}/../omniORB && ${MAKE} -V WRKSRC
 
 pre-configure:
 	@cd $$(${OMNIORB_WRKSRC}) && ${FIND} idl | ${CPIO} --quiet -pdum ${WRKSRC}
 
 post-install:
 	cd ${STAGEDIR}${PYTHON_SITELIBDIR} && ${PYTHON_CMD} -c "import py_compile;py_compile.compile('CosNaming/__init__.py',None,'CosNaming/__init__.pyc',True)"
 	cd ${STAGEDIR}${PYTHON_SITELIBDIR} && ${PYTHON_CMD} -c "import py_compile;py_compile.compile('CosNaming__POA/__init__.py',None,'CosNaming__POA/__init__.pyc',True)"
 	cd ${STAGEDIR}${PYTHON_SITELIBDIR} && ${PYTHON_CMD} -c "import py_compile;py_compile.compile('omniidl_be/python.py',None,'omniidl_be/python.pyc',True)"
 	@${RM} ${STAGEDIR}${PYTHON_SITELIBDIR}/omniidl_be/__init__.py* \
 		${STAGEDIR}${PYTHON_SITELIBDIR}/omniidl_be/__pycache__/__init__.*
 	@${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/*.so
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/html
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/tex
 	${INSTALL_DATA} ${WRKSRC}/doc/omniORBpy.* ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/omniORBpy/* ${STAGEDIR}${DOCSDIR}/html
 	${INSTALL_DATA} ${WRKSRC}/doc/tex/* ${STAGEDIR}${DOCSDIR}/tex
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/examples && ${FIND} . \
 	  | ${CPIO} --quiet -pdum -R ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/devel/py-orange-widget-base/Makefile b/devel/py-orange-widget-base/Makefile
index 1835812e0965..79fe9695f9b5 100644
--- a/devel/py-orange-widget-base/Makefile
+++ b/devel/py-orange-widget-base/Makefile
@@ -1,25 +1,26 @@
 PORTNAME=	orange-widget-base
 DISTVERSION=	4.13.0
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Base widget for Orange canvas
 WWW=		https://orangedatamining.com/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	\
 		${PYTHON_PKGNAMEPREFIX}AnyQt>0:x11-toolkits/py-AnyQt@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>=2.0.0:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}orange-canvas-core>=0.1.20:devel/py-orange-canvas-core@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyqtgraph>0:graphics/py-pyqtgraph@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}typing-extensions>=0:devel/py-typing-extensions@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	distutils autoplist
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-orca/Makefile b/devel/py-orca/Makefile
index 841fa6d07803..9281791207d7 100644
--- a/devel/py-orca/Makefile
+++ b/devel/py-orca/Makefile
@@ -1,23 +1,24 @@
 PORTNAME=	orca
 PORTVERSION=	1.8
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Python library for task orchestration
 WWW=		https://github.com/UDST/orca
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pandas>=0.15.0,1:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tables>=3.1:devel/py-tables@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}toolz>=0.8.1:devel/py-toolz@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-pint-pandas/Makefile b/devel/py-pint-pandas/Makefile
index 6cc2f64c3294..cfcfa16062ea 100644
--- a/devel/py-pint-pandas/Makefile
+++ b/devel/py-pint-pandas/Makefile
@@ -1,24 +1,25 @@
 PORTNAME=	pint-pandas
 PORTVERSION=	0.3
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	Pint-Pandas-${PORTVERSION}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Physical quantities module
 WWW=		https://github.com/hgrecco/pint-pandas
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pandas>=1.5,1:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pint>=0.20.1:devel/py-pint@${PY_FLAVOR}
 
 USES=		python:3.8+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-pycodeexport/Makefile b/devel/py-pycodeexport/Makefile
index f26b9ad6c329..254597ec22bb 100644
--- a/devel/py-pycodeexport/Makefile
+++ b/devel/py-pycodeexport/Makefile
@@ -1,22 +1,23 @@
 PORTNAME=	pycodeexport
 DISTVERSION=	0.1.3
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Python package for code generation
 WWW=		https://github.com/bjodah/pycodeexport
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mako>=1.0.0:textproc/py-mako@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pycompilation>=0.4.0:devel/py-pycompilation@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sympy>=0.7.5:math/py-sympy@${PY_FLAVOR}
 
 USES=		python:3.5+
 USE_PYTHON=	distutils cython_run autoplist
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-pycognito/Makefile b/devel/py-pycognito/Makefile
index 57a52f56e6cb..f4351e0200f4 100644
--- a/devel/py-pycognito/Makefile
+++ b/devel/py-pycognito/Makefile
@@ -1,21 +1,22 @@
 PORTNAME=	pycognito
 DISTVERSION=	2022.11.1
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	ygy@FreeBSD.org
 COMMENT=	Makes working with AWS Cognito easier for Python developers
 WWW=		https://github.com/pvizeli/pycognito
 
 LICENSE=	APACHE20
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}boto3>0:www/py-boto3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}envs>0:devel/py-envs@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-jose>0:security/py-python-jose@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist distutils
 
 .include <bsd.port.mk>
diff --git a/devel/py-pycompilation/Makefile b/devel/py-pycompilation/Makefile
index b62082b0c793..62a5db7c17eb 100644
--- a/devel/py-pycompilation/Makefile
+++ b/devel/py-pycompilation/Makefile
@@ -1,22 +1,23 @@
 PORTNAME=	pycompilation
 DISTVERSION=	0.4.12
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Package for compilation (meta programming)
 WWW=		https://github.com/bjodah/pycompilation
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}appdirs>0:devel/py-appdirs@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_PYTHON=	distutils cython_run autoplist
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-pyina/Makefile b/devel/py-pyina/Makefile
index 6a7cbf794b32..0b26b847c212 100644
--- a/devel/py-pyina/Makefile
+++ b/devel/py-pyina/Makefile
@@ -1,28 +1,29 @@
 PORTNAME=	pyina
 PORTVERSION=	0.2.7
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	MPI parallel map and cluster scheduling
 WWW=		https://github.com/uqfoundation/pyina
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=42:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dill>=0.3.6:devel/py-dill@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mpi4py>=1.3:net/py-mpi4py@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mystic>=0.4.0:devel/py-mystic@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpy>=1.0,1:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pathos>=0.3.0:devel/py-pathos@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pox>=0.3.2:devel/py-pox@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	autoplist concurrent cython pep517
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-pynest2d/Makefile b/devel/py-pynest2d/Makefile
index 41562409ecd1..20881bf65149 100644
--- a/devel/py-pynest2d/Makefile
+++ b/devel/py-pynest2d/Makefile
@@ -1,30 +1,30 @@
 PORTNAME=	pynest2d
 # XXX there is no 4.13.1
 DISTVERSION=	4.12.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	db@FreeBSD.org
 COMMENT=	CPython bindings for libnest2d by Ultimaker
 WWW=		https://github.com/Ultimaker/libnest2d
 
 LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${LOCALBASE}/include/libnest2d/libnest2d.hpp:devel/libnest2d-ultimaker
 BUILD_DEPENDS=	${LOCALBASE}/include/libnest2d/libnest2d.hpp:devel/libnest2d-ultimaker \
 		sip:devel/py-sip4
 LIB_DEPENDS=	libpolyclipping.so:graphics/polyclipping \
 		libboost_system.so:devel/boost-libs \
 		libnlopt.so:math/nlopt
 
 USES=		python:3.6+ cmake compiler:c++11-lang pyqt:5 pkgconfig
 USE_PYTHON=	flavors
 
 USE_GITHUB=	yes
 GH_TUPLE=	Ultimaker:pynest2d:baec470
 CMAKE_ARGS=	-DLIBNEST2D_INCLUDE_DIRS=${PREFIX}/include/libnest2d
 
 CONFIGURE_ENV=	CLIPPER_PATH=${LOCALBASE} VERBOSE=y
 .include <bsd.port.mk>
diff --git a/devel/py-pyopencl/Makefile b/devel/py-pyopencl/Makefile
index 25feb7550c2e..a944369dcaee 100644
--- a/devel/py-pyopencl/Makefile
+++ b/devel/py-pyopencl/Makefile
@@ -1,43 +1,43 @@
 PORTNAME=	pyopencl
 PORTVERSION=	2018.2
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	python@FreeBSD.org
 COMMENT=	Python wrapper for OpenCL
 WWW=		https://mathema.tician.de/software/pyopencl/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${LOCALBASE}/include/CL/cl.h:devel/opencl \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}pybind11>=0:devel/py-pybind11@${PY_FLAVOR}
 LIB_DEPENDS=	${PY_BOOST} \
 		libOpenCL.so:devel/ocl-icd
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}appdirs>=1.4.0:devel/py-appdirs@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}decorator>=3.2.0:devel/py-decorator@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mako>=0.3.6:textproc/py-mako@${PY_FLAVOR} \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}pytools>=2017.6:devel/py-pytools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${PY_FLAVOR}
 
 USES=		compiler:c++11-lang localbase python:3.6+
 USE_PYTHON=	autoplist distutils
 
 CONFIGURE_ARGS=	BOOST_INC_DIR="${LOCALBASE}/include" \
 		BOOST_LIB_DIR="${LOCALBASE}/lib" \
 		BOOST_PYTHON_LIBNAME=${PY_BOOST_LIB} \
 		CL_INC_DIR="${LOCALBASE}/include" \
 		CL_LIB_DIR="${LOCALBASE}/lib" \
 		USE_SHIPPED_BOOST=False
 
 do-configure:
 	@cd ${WRKSRC} && ${PYTHON_CMD} configure.py ${CONFIGURE_ARGS}
 
 post-install:
 	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR}/ -name '*.so' -exec ${STRIP_CMD} {} +
 
 .include <bsd.port.mk>
diff --git a/devel/py-pyquil/Makefile b/devel/py-pyquil/Makefile
index 77bf997c8571..87921563bfa6 100644
--- a/devel/py-pyquil/Makefile
+++ b/devel/py-pyquil/Makefile
@@ -1,28 +1,29 @@
 PORTNAME=	pyquil
 DISTVERSION=	3.3.1
+PORTREVISION=	1
 CATEGORIES=	devel python # quantum-computing
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	PyQuil: Quantum programming in Python
 WWW=		https://github.com/rigetti/pyquil
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lark>=0.11.1:devel/py-lark@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}networkx>=2.5:math/py-networkx@${PY_FLAVOR} \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}qcs-api-client>=0.20.13,<0.22.0:devel/py-qcs-api-client@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}retry2>=0.9.2,<0.10.0:devel/py-retry2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}rpcq>=3.10.0,<4.0.0:devel/py-rpcq@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=1.6.1,<2.0.0:science/py-scipy@${PY_FLAVOR} \
 		quilc:lang/quilc
 
 USES=		python:3.8+
 USE_PYTHON=	distutils autoplist
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-pytest-mpl/Makefile b/devel/py-pytest-mpl/Makefile
index 6482e51e77ae..110adef266f6 100644
--- a/devel/py-pytest-mpl/Makefile
+++ b/devel/py-pytest-mpl/Makefile
@@ -1,27 +1,28 @@
 PORTNAME=	pytest-mpl
 DISTVERSION=	0.16.1
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Pytest plugin to facilitate image comparison for Matplotlib figures
 WWW=		https://github.com/matplotlib/pytest-mpl
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}packaging>=20.0:devel/py-packaging@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}
 
 USES=		python:3.8+
 USE_PYTHON=	distutils autoplist pytest # 4 tests fail, see https://github.com/matplotlib/pytest-mpl/issues/179
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-pythran/Makefile b/devel/py-pythran/Makefile
index 51b62926afb7..7f5904dbb71f 100644
--- a/devel/py-pythran/Makefile
+++ b/devel/py-pythran/Makefile
@@ -1,29 +1,30 @@
 PORTNAME=	pythran
 PORTVERSION=	0.12.0
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Ahead of Time compiler for numeric kernels
 WWW=		https://github.com/serge-sans-paille/pythran
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}ply>=0:devel/py-ply@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}gast>=0.5.0<0.6:devel/py-gast@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}beniget>=0.4.0:devel/py-beniget@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 post-extract:
 	${RM} ${WRKSRC}/third_party/xsimd/config/*.rej
 	${RM} ${WRKSRC}/third_party/xsimd/*.rej
 	${RM} ${WRKSRC}/third_party/xsimd/math/.xsimd_gamma.hpp.swp
 
 .include <bsd.port.mk>
diff --git a/devel/py-qutip-qip/Makefile b/devel/py-qutip-qip/Makefile
index 12afa303682d..3d60de73bb58 100644
--- a/devel/py-qutip-qip/Makefile
+++ b/devel/py-qutip-qip/Makefile
@@ -1,32 +1,32 @@
 PORTNAME=	qutip-qip
 DISTVERSION=	0.2.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	QuTiP quantum information processing package
 WWW=		https://github.com/qutip/qutip-qip
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR}
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}qutip>=4.5:devel/py-qutip@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=1.0:science/py-scipy@${PY_FLAVOR}
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}ipython>0:devel/ipython@${PY_FLAVOR} # optional dependency, but required for tests
 
 USES=		python:3.7+
 USE_PYTHON=	distutils autoplist pytest
 
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHON_SITELIBDIR}
 
 NO_ARCH=	yes
 
 post-patch:
 	@cd ${WRKSRC} && ${ECHO} ${DISTVERSION} > VERSION
 
 .include <bsd.port.mk>
diff --git a/devel/py-qutip/Makefile b/devel/py-qutip/Makefile
index 5d688695c4a9..eef334df10d1 100644
--- a/devel/py-qutip/Makefile
+++ b/devel/py-qutip/Makefile
@@ -1,40 +1,40 @@
 PORTNAME=	qutip
 DISTVERSION=	4.7.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Quantum toolbox in python
 WWW=		https://qutip.org/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 PY_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=1.0:science/py-scipy@${PY_FLAVOR}
 BUILD_DEPENDS=	${PY_DEPENDS} \
 		${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0.32.0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PY_DEPENDS}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR}
 # the optional graphics/py-mayavi dependency is omitted because it is python-2.7 -only
 
 USES=		python:3.7+
 USE_PYTHON=	pep517 cython cython_run autoplist
 
 xpost-patch: # https://github.com/qutip/qutip/issues/1059
 	@${FIND} ${WRKSRC} -name "*.pyx" -o -name "*.pxd" | ${XARGS} ${REINPLACE_CMD} 's|^#!python|#!${PYTHON_CMD}|'
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/qutip/*/*${PYTHON_EXT_SUFFIX}.so
 
 do-test:
 	@${ECHO} "==> Running tests. Please note that tests require X11 display access."
 	@cd ${WRKDIR} && ${SETENV} ${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHON_SITELIBDIR} \
 		${PYTHON_CMD} -c "import qutip.testing as qt; qt.run();"
 
 .include <bsd.port.mk>
diff --git a/devel/py-rapidfuzz/Makefile b/devel/py-rapidfuzz/Makefile
index 344b6515bda4..1222d00a1fbd 100644
--- a/devel/py-rapidfuzz/Makefile
+++ b/devel/py-rapidfuzz/Makefile
@@ -1,38 +1,39 @@
 PORTNAME=	rapidfuzz
 DISTVERSION=	3.0.0
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Rapid fuzzy string matching in Python
 WWW=		https://github.com/maxbachmann/RapidFuzz
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	cmake:devel/cmake-core \
 		ninja:devel/ninja \
 		jarowinkler-cpp>0:textproc/jarowinkler-cpp \
 		rapidfuzz-cpp>0:devel/rapidfuzz-cpp \
 		taskflow>0:devel/taskflow \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}rapidfuzz-capi==1.0.5:devel/py-rapidfuzz-capi@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-build>=0.13.0:devel/py-scikit-build@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}jarowinkler>=1.0.3:textproc/py-jarowinkler@${PY_FLAVOR}
 
 USES=		compiler:c++14-lang python:3.6+
 USE_PYTHON=	distutils autoplist pytest
 
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 
 post-install:
 	@cd ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME} && \
 		${STRIP_CMD} \
 			${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME}/*.so \
 			${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME}/distance/*.so
 	${PYTHON_CMD} -m compileall -d ${PYTHON_SITELIBDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}
 	${PYTHON_CMD} -O -m compileall -d ${PYTHON_SITELIBDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}
 
 .include <bsd.port.mk>
diff --git a/devel/py-rapidfuzz2/Makefile b/devel/py-rapidfuzz2/Makefile
index f93128da3e53..c35ae25b09ff 100644
--- a/devel/py-rapidfuzz2/Makefile
+++ b/devel/py-rapidfuzz2/Makefile
@@ -1,36 +1,37 @@
 PORTNAME=	rapidfuzz
 DISTVERSION=	2.15.1
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 PKGNAMESUFFIX=	2
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Rapid fuzzy string matching in Python
 WWW=		https://github.com/maxbachmann/RapidFuzz
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	cmake:devel/cmake-core \
 		jarowinkler-cpp>=0:textproc/jarowinkler-cpp \
 		ninja:devel/ninja \
 		${PYTHON_PKGNAMEPREFIX}numpy>=0,1:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}rapidfuzz-capi>=1.0.5<1.0.5_99:devel/py-rapidfuzz-capi@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-build>=0.13.0:devel/py-scikit-build@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} \
 		rapidfuzz-cpp>=0:devel/rapidfuzz-cpp \
 		taskflow>=0:devel/taskflow
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}jarowinkler>=1.0.3:textproc/py-jarowinkler@${PY_FLAVOR}
 
 USES=		compiler:c++14-lang python:3.6+
 USE_PYTHON=	autoplist concurrent distutils
 
 PORTSCOUT=	limit:^2\.
 
 post-install:
 	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' -exec ${STRIP_CMD} {} +
 #	${PYTHON_CMD} -m compileall -d ${PYTHON_SITELIBDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}
 #	${PYTHON_CMD} -O -m compileall -d ${PYTHON_SITELIBDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}
 
 .include <bsd.port.mk>
diff --git a/devel/py-rpcq/Makefile b/devel/py-rpcq/Makefile
index 0bf4d2ed23db..8625b8ce5f2f 100644
--- a/devel/py-rpcq/Makefile
+++ b/devel/py-rpcq/Makefile
@@ -1,29 +1,30 @@
 PORTNAME=	rpcq
 DISTVERSION=	3.11.0
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	RPC framework and message specification for Rigetti QCS
 WWW=		https://github.com/rigetti/rpcq
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}msgpack>=0.6:devel/py-msgpack@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-rapidjson>0:devel/py-python-rapidjson@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyzmq>=17:net/py-pyzmq@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ruamel.yaml>0:devel/py-ruamel.yaml@${PY_FLAVOR}
 TEST_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}pytest>=5.4.0:devel/py-pytest@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-asyncio>0:devel/py-pytest-asyncio@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-cov>0:devel/py-pytest-cov@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_PYTHON=	distutils autoplist
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-sparse/Makefile b/devel/py-sparse/Makefile
index 89d00968896c..7e74dd58c2f7 100644
--- a/devel/py-sparse/Makefile
+++ b/devel/py-sparse/Makefile
@@ -1,23 +1,24 @@
 PORTNAME=	sparse
 PORTVERSION=	0.14.0
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Sparse n-dimensional arrays
 WWW=		https://github.com/pydata/sparse
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numba>=0.49:devel/py-numba@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpy>=1.17,1:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=0.19:science/py-scipy@${PY_FLAVOR}
 
 USES=		python:3.8+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-spyder-kernels/Makefile b/devel/py-spyder-kernels/Makefile
index e938c16e3215..1fa0a26a37f0 100644
--- a/devel/py-spyder-kernels/Makefile
+++ b/devel/py-spyder-kernels/Makefile
@@ -1,48 +1,49 @@
 PORTNAME=	spyder-kernels
 PORTVERSION=	2.4.3
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	rhurlin@FreeBSD.org
 COMMENT=	Jupyter kernels for the Spyder console
 WWW=		https://github.com/spyder-ide/spyder-kernels
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cloudpickle>0:devel/py-cloudpickle@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ipykernel>0:devel/py-ipykernel@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ipyparallel>0:devel/py-ipyparallel@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ipython>=7.31.1:devel/ipython@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jupyter-client>=7.3.4,<8:devel/py-jupyter-client@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyzmq>=22.1.0:net/py-pyzmq@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}traitlets>0:devel/py-traitlets@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wurlitzer>=1.0.3:misc/py-wurlitzer@${PY_FLAVOR}
 # 1 failed, 71 passed, 4 skipped, 15 warnings
 # test_django_settings fail if www/djangoXX not installed
 TEST_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}codecov>0:devel/py-codecov@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cython>0:lang/cython@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dask>0:devel/py-dask@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}distributed>0:devel/py-distributed@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}flaky>0:devel/py-flaky@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ipython_genutils>0:devel/py-ipython_genutils@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-cov>0:devel/py-pytest-cov@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-forked>0:devel/py-pytest-forked@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-mock>0:devel/py-pytest-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-timeout>0:devel/py-pytest-timeout@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-xdist>0:devel/py-pytest-xdist@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xarray>0:devel/py-xarray@${PY_FLAVOR}
 
 USES=		python:3.8+ pytest
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-tables/Makefile b/devel/py-tables/Makefile
index ce3a878cebd5..2b366bb73f9d 100644
--- a/devel/py-tables/Makefile
+++ b/devel/py-tables/Makefile
@@ -1,49 +1,49 @@
 PORTNAME=	tables
 PORTVERSION=	3.7.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Hierarchical database for Python
 WWW=		https://www.pytables.org/
 
 LICENSE=	BSD3CLAUSE
 
 BUILD_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}numexpr>=1.4.1:math/py-numexpr@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}packaging>=0:devel/py-packaging@${PY_FLAVOR}
 LIB_DEPENDS=	libhdf5.so:science/hdf5 \
 		liblzo2.so:archivers/lzo2 \
 		libucl.so:archivers/ucl
 RUN_DEPENDS:=	${BUILD_DEPENDS} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mock>=2.0:devel/py-mock@${PY_FLAVOR}
 
 CONFLICTS_BUILD=	zstd # conflicting version of zstd is bundled
 
 USES=		fortran localbase python:3.6+
 USE_PYTHON=	autoplist concurrent distutils cython
 
 PORTEXAMPLES=	*
 
 OPTIONS_DEFINE=		EXAMPLES
 OPTIONS_DEFINE_amd64=		AVX2
 
 AVX2_DESC=	Enable Haswell New Instructions (AVX2) support
 
 # Explicitly disable AVX2 otherwise it will be automatically enabled if the CPU
 # supports it.  If compiled in and run on hosts that have no AVX2 support, it
 # will trigger a SIGILL (Illegal instruction)
 # See also: https://github.com/PyTables/PyTables/issues/841
 AVX2_VARS_OFF=	MAKE_ENV+=DISABLE_AVX2=yes
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/tables/*.so
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/*.py ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/devel/py-tarantool-queue/Makefile b/devel/py-tarantool-queue/Makefile
index c68e9708fec0..6863a2ba2202 100644
--- a/devel/py-tarantool-queue/Makefile
+++ b/devel/py-tarantool-queue/Makefile
@@ -1,22 +1,22 @@
 PORTNAME=	tarantool-queue
 PORTVERSION=	0.1.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Python bindings for Tarantool queue
 WWW=		https://github.com/tarantool/queue-python
 
 LICENSE=	MIT
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}msgpack>=0:devel/py-msgpack@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tarantool>=0:databases/py-tarantool@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-taskflow/Makefile b/devel/py-taskflow/Makefile
index 5e292cd6a472..71dcfed9af11 100644
--- a/devel/py-taskflow/Makefile
+++ b/devel/py-taskflow/Makefile
@@ -1,48 +1,49 @@
 PORTNAME=	taskflow
 PORTVERSION=	5.1.0
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Taskflow structured state management library
 WWW=		https://docs.openstack.org/taskflow/latest/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}automaton>=1.9.0:devel/py-automaton@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cachetools>=2.0.0:devel/py-cachetools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}fasteners>=0.17.3:devel/py-fasteners@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}futurist>=1.2.0:devel/py-futurist@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jsonschema3>=3.2.0:devel/py-jsonschema3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}networkx>=2.1.0,1:math/py-networkx@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}oslo.serialization>=2.18.0:devel/py-oslo.serialization@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.33.0:devel/py-oslo.utils@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pydot>=1.2.4:graphics/py-pydot@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}stevedore>=1.20.0:devel/py-stevedore@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tenacity>=6.0.0:devel/py-tenacity@${PY_FLAVOR}
 
 USES=		python:3.8+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=	DATABASE EVENTLET REDIS WORKERS
 DATABASE_DESC=	Database support
 EVENTLET_DESC=	Eventlet support
 REDIS_DESC=	Redis support
 WORKERS_DESC=	Worker support
 
 DATABASE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}alembic>=0.8.10:databases/py-alembic@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}psycopg2>=2.8.0:databases/py-psycopg2@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}pymysql>=0.7.6:databases/py-pymysql@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}sqlalchemy13>=1.0.10:databases/py-sqlalchemy13@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}sqlalchemy-utils>=0.30.11:databases/py-sqlalchemy-utils@${PY_FLAVOR}
 EVENTLET_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}eventlet>=0.18.2:net/py-eventlet@${PY_FLAVOR}
 REDIS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}redis>=2.10.0:databases/py-redis@${PY_FLAVOR}
 WORKERS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}kombu>=4.3.0:net/py-kombu@${PY_FLAVOR}
 
 .include <bsd.port.mk>
diff --git a/devel/py-traits/Makefile b/devel/py-traits/Makefile
index 6df056a083d8..3ecb76d62679 100644
--- a/devel/py-traits/Makefile
+++ b/devel/py-traits/Makefile
@@ -1,19 +1,20 @@
 PORTNAME=	traits
 PORTVERSION=	6.4.1
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Explicitly Typed Attributes for Python
 WWW=		https://pypi.org/project/traits/
 
 LICENSE=	BSD3CLAUSE PSFL
 LICENSE_COMB=	multi
 
 BUILD_DEPENDS=	${PYNUMPY}
 
 USES=		python:3.6+
 USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/devel/py-trimesh/Makefile b/devel/py-trimesh/Makefile
index 7d525e0ba4a7..81a07920065d 100644
--- a/devel/py-trimesh/Makefile
+++ b/devel/py-trimesh/Makefile
@@ -1,45 +1,45 @@
 PORTNAME=	trimesh
 PORTVERSION=	3.5.25
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel cad python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	db@FreeBSD.org
 COMMENT=	Library for loading and using triangular meshes
 WWW=		https://pypi.org/project/trimesh/ #description
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 # This order of dependancies directly lifted from setup.py please do not change!
 NEEDED_DEPENDS=	${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}networkx>0:math/py-networkx@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyglet1>0:graphics/py-pyglet1@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Shapely>0:devel/py-shapely@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}rtree>0:devel/py-rtree@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}svg_path>0:graphics/py-svg.path@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sympy>0:math/py-sympy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}msgpack>0:devel/py-msgpack@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xxhash>0:devel/py-xxhash@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pycollada>0:graphics/py-pycollada@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}chardet>0:textproc/py-chardet@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}colorlog>0:devel/py-colorlog@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}triangle>0:math/py-triangle@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jsonschema>0:devel/py-jsonschema@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-image>0:graphics/py-scikit-image@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-fcl>0:math/py-python-fcl@${PY_FLAVOR}
 BUILD_DEPENDS=	${NEEDED_DEPENDS}
 RUN_DEPENDS=	${NEEDED_DEPENDS}
 
 USES=		compiler:c++11-lang python:3.5+
 
 USE_PYTHON=	distutils autoplist concurrent
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-websockify/Makefile b/devel/py-websockify/Makefile
index d630fe0a1739..1df9608d44c1 100644
--- a/devel/py-websockify/Makefile
+++ b/devel/py-websockify/Makefile
@@ -1,20 +1,21 @@
 PORTNAME=	websockify
 PORTVERSION=	0.10.0
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	WebSockets support for any application/server
 WWW=		https://github.com/novnc/websockify
 
 LICENSE=	LGPL3
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=0,1:math/py-numpy@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-xarray-einstats/Makefile b/devel/py-xarray-einstats/Makefile
index 90569feb7834..94378da475ba 100644
--- a/devel/py-xarray-einstats/Makefile
+++ b/devel/py-xarray-einstats/Makefile
@@ -1,37 +1,38 @@
 PORTNAME=	xarray-einstats
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.3.0-4
+PORTREVISION=	1
 DISTVERSIONSUFFIX=	-g029341d
 CATEGORIES=	devel python
 #MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Stats, linear algebra and einops for xarray
 WWW=		https://github.com/arviz-devs/xarray-einstats
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=1.18,1:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}packaging>=20.0:devel/py-packaging@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pandas>=1.1,1:math/py-pandas@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR}
 
 USES=		python:3.8+
 USE_PYTHON=	distutils concurrent autoplist pytest
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	arviz-devs
 
 TEST_WRKSRC=	${WRKSRC}/src/xarray_einstats # tests are broken, see https://github.com/arviz-devs/xarray-einstats/issues/27
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 
 NO_ARCH=	yes
 
 # Upstream stopped providing setup.py
 post-patch:
 	@${ECHO_CMD} 'import setuptools; setuptools.setup()' > ${WRKSRC}/setup.py
 
 .include <bsd.port.mk>
diff --git a/devel/py-xarray-simlab/Makefile b/devel/py-xarray-simlab/Makefile
index 21f6146a5353..8968d58c1cd8 100644
--- a/devel/py-xarray-simlab/Makefile
+++ b/devel/py-xarray-simlab/Makefile
@@ -1,29 +1,30 @@
 PORTNAME=	xarray-simlab
 DISTVERSION=	0.5.0-5
+PORTREVISION=	1
 DISTVERSIONSUFFIX=	-g33a4c83
 CATEGORIES=	devel python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Xarray extension and framework for computer model simulations
 WWW=		https://xarray-simlab.readthedocs.io/en/latest/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		python:3.8+
 USE_PYTHON=	distutils autoplist pytest # 1 test fails, see https://github.com/xarray-contrib/xarray-simlab/issues/192
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	xarray-contrib
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}attrs>=18.1.0:devel/py-attrs@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dask>0:devel/py-dask@${PY_FLAVOR} \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}xarray>=0.10.0:devel/py-xarray@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}zarr>=2.3.0:devel/py-zarr@${PY_FLAVOR}
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}distributed>0:devel/py-distributed@${PY_FLAVOR} # extra dep for devel/py-dask
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-xarray/Makefile b/devel/py-xarray/Makefile
index 8ad9d589b9a0..ecd8e1405b3b 100644
--- a/devel/py-xarray/Makefile
+++ b/devel/py-xarray/Makefile
@@ -1,36 +1,37 @@
 PORTNAME=	xarray
 PORTVERSION=	2023.4.1
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	N-D labeled arrays and datasets in Python
 WWW=		https://xarray.dev/ \
 		https://github.com/pydata/xarray
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=1.22,1:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}packaging>=21.3:devel/py-packaging@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pandas>=1.4,1:math/py-pandas@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cartopy>=0:graphics/py-cartopy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cfgrib>=0:science/py-cfgrib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cftime>=0:devel/py-cftime@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dask>=0:devel/py-dask@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>=0:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}netCDF4>=0:science/py-netCDF4@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pint>=0:devel/py-pint@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}rasterio>=0:graphics/py-rasterio@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}seaborn>=0:math/py-seaborn@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sparse>=0:devel/py-sparse@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}zarr>=0:devel/py-zarr@${PY_FLAVOR}
 
 USES=		python:3.8+
 USE_PYTHON=	autoplist concurrent distutils pytest
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-zarr/Makefile b/devel/py-zarr/Makefile
index 2f63258459d8..d6ba32cf6f0d 100644
--- a/devel/py-zarr/Makefile
+++ b/devel/py-zarr/Makefile
@@ -1,28 +1,28 @@
 PORTNAME=	zarr
 DISTVERSION=	2.14.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Implementation of chunked, compressed, N-dimensional arrays for Python
 WWW=		https://zarr.readthedocs.io/en/stable/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}asciitree>0:graphics/py-asciitree@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}fasteners>0:devel/py-fasteners@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numcodecs>=0.10.0:misc/py-numcodecs@${PY_FLAVOR} \
 		${PYNUMPY}
 
 USES=		python:3.8+
 USE_PYTHON=	pep517 autoplist pytest
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-zfp/Makefile b/devel/py-zfp/Makefile
index 9874fb5ff7f9..eb1027587c16 100644
--- a/devel/py-zfp/Makefile
+++ b/devel/py-zfp/Makefile
@@ -1,25 +1,26 @@
 PORTNAME=	zfp
 DISTVERSION=	1.0.0
+PORTREVISION=	1
 CATEGORIES=	devel science
 MASTER_SITES=	https://github.com/LLNL/${PORTNAME}/releases/download/${DISTVERSION}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	High throughput library for compressed floating-point arrays
 WWW=		https://computing.llnl.gov/projects/zfp
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/scikit-build-cmake/LICENSE
 
 BUILD_DEPENDS=	${PYNUMPY}
 LIB_DEPENDS=	libzfp.so:devel/zfp
 RUN_DEPENDS=	${PYNUMPY}
 
 USES=		cmake localbase:ldflags python
 USE_PYTHON=	cython flavors
 
 WRKSRC_SUBDIR=	python
 
 PLIST_FILES=	${PYTHON_SITELIBDIR}/zfpy${PYTHON_EXT_SUFFIX}.so
 
 .include <bsd.port.mk>
diff --git a/devel/pytype/Makefile b/devel/pytype/Makefile
index 96cf74462fd8..91edf7af984a 100644
--- a/devel/pytype/Makefile
+++ b/devel/pytype/Makefile
@@ -1,46 +1,47 @@
 PORTNAME=	pytype
 PORTVERSION=	2023.2.17
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMESUFFIX=	${PYTHON_PKGNAMESUFFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Python type inferencer
 WWW=		https://google.github.io/pytype/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pybind11>=0:devel/py-pybind11@${PY_FLAVOR}
 RUN_DEPENDS=	ninja>=1.10.2:devel/ninja \
 		${PYTHON_PKGNAMEPREFIX}attrs>=21.4.0:devel/py-attrs@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}importlab>=0.8:devel/py-importlab@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=3.1.2:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}libcst>=0.4.9:devel/py-libcst@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}networkx>=2.8.5:math/py-networkx@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pydot>=1.4.2:graphics/py-pydot@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tabulate>=0.8.9:devel/py-tabulate@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}toml>=0.10.2:textproc/py-toml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}typing-extensions>=4.3.0:devel/py-typing-extensions@${PY_FLAVOR}
 
 USES=		compiler:c++11-lang python:3.7+
 USE_PYTHON=	autoplist concurrent distutils
 
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} < 30800
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}typed-ast>=1.5.0:devel/py-typed-ast@${PY_FLAVOR}
 .endif
 
 post-patch:
 	@${RM} ${WRKSRC}/pytype/tools/merge_pyi/test_data/packed_tuple.py
 	@${RM} ${WRKSRC}/pytype/tools/merge_pyi/test_data/packed_tuple.comment.py
 	@${RM} ${WRKSRC}/pytype/tools/merge_pyi/test_data/packed_tuple.pep484.py
 	@${RM} ${WRKSRC}/pytype/tools/merge_pyi/test_data/parse_error.py
 	@${RM} ${WRKSRC}/pytype/tools/merge_pyi/test_data/pyi_variations.comment.py
 	@${RM} ${WRKSRC}/pytype/tools/merge_pyi/test_data/simple_defaults.py
 
 post-install:
 	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' -exec ${STRIP_CMD} {} +
 
 .include <bsd.port.post.mk>
diff --git a/devel/raknet/Makefile b/devel/raknet/Makefile
index 2e0e7869c268..48c807029eb0 100644
--- a/devel/raknet/Makefile
+++ b/devel/raknet/Makefile
@@ -1,72 +1,72 @@
 PORTNAME=	raknet
 PORTVERSION=	3.9.2
-PORTREVISION=	10
+PORTREVISION=	11
 PORTEPOCH=	1
 CATEGORIES=	devel net
 MASTER_SITES=	http://www.jenkinssoftware.com/raknet/downloads/ \
 		LOCAL/martymac
 DISTNAME=	RakNet-3.902
 
 MAINTAINER=	martymac@FreeBSD.org
 COMMENT=	Networking API that provides reliable UDP primarily for online games
 WWW=		http://www.jenkinssoftware.com/
 
 # Original license is Indy license, but FreeBSD has been granted special
 # authorization to provide RakNet 3.x (*only*, not 4.x) under the terms of
 # the GPL v3 license. This agreement has been received by the MAINTAINER
 # through a private mail exchange on 2012-03-20 (see files/SpecialAuth.mbox).
 LICENSE=	GPLv3 SpecialAuth
 LICENSE_COMB=	dual
 LICENSE_NAME_SpecialAuth=	Special authorization from developer
 LICENSE_FILE_SpecialAuth=	${FILESDIR}/SpecialAuth.mbox
 LICENSE_PERMS_SpecialAuth=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 NOT_FOR_ARCHS=		aarch64 mips mips64
 NOT_FOR_ARCHS_REASON=	fails to compile: error: Add your platform to the list
 
 NO_WRKSUBDIR=	yes
 
 USES=		dos2unix cmake:insource zip
 
 USE_LDCONFIG=	yes
 # XXX Does not build with GCC 12
 # See: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=266190
 USE_GCC=	11
 
 DOS2UNIX_REGEX=	.*\.(cpp|h|txt)
 
 # XXX Do not provide Samples for the following reason :
 # - potential licensing problems
 # XXX Disable build of DependentExtensions for the following reasons :
 # - potential licensing problems
 # - only static libraries are built (shared libraries are no more provided, e.g.
 #   for autopatcher or rakvoice)
 # - no install target is provided, which prevents us to determine what files
 #   have to be provided by the port to have working extensions
 CMAKE_ARGS+=	-DDISABLEDEPENDENCIES:BOOL=ON
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${FIND} ${WRKSRC} -type f -a '(' -name '*.cpp' -o -name '*.h' ')' -print0 \
 		| ${XARGS} -0 -x -n10 \
 			${REINPLACE_CMD} -e 's|Usage of RakNet is subject to the appropriate license agreement|Raknet is available under the terms of the GPLv3 license, see ${_LICENSE_DIR}/GPLv3|'
 
 pre-install:
 	@${FIND} ${WRKSRC} -type f -name '*.bak' -print0 \
 		| ${XARGS} -0 -x -n10 ${RM}
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/include/raknet
 	(cd ${WRKSRC}/Source/ && ${COPYTREE_SHARE} \*.h ${STAGEDIR}${PREFIX}/include/raknet)
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib
 	${INSTALL_LIB} ${WRKSRC}/Lib/DLL/libRakNetDynamic.so \
 		${STAGEDIR}${PREFIX}/lib/libraknet.so.0
 	${LN} -sf ${PREFIX}/lib/libraknet.so.0 ${STAGEDIR}${PREFIX}/lib/libraknet.so
 	${INSTALL_DATA} ${WRKSRC}/Lib/LibStatic/libRakNetStatic.a \
 		${STAGEDIR}${PREFIX}/lib/libraknet.a
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/Help
 	(cd ${WRKSRC}/Help/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/Help)
 	${INSTALL_DATA} ${WRKSRC}/readme.txt ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/devel/rhtvision/Makefile b/devel/rhtvision/Makefile
index 4f376889f5f3..dab5d38014d0 100644
--- a/devel/rhtvision/Makefile
+++ b/devel/rhtvision/Makefile
@@ -1,47 +1,47 @@
 PORTNAME=	rhtvision
 PORTVERSION=	2.2.1.1
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	devel
 MASTER_SITES=	SF/tvision/UNIX/${PORTVERSION:R}%20CVS20100714%20Source%20and%20Debian%205.0
 DISTNAME=	${PORTNAME}_${PORTVERSION:R}-${PORTVERSION:E}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Complete C++ Text User Interface (TUI) library
 WWW=		https://sourceforge.net/projects/tvision/
 
 OPTIONS_DEFINE=	NLS X11
 OPTIONS_SUB=	yes
 
 WRKSRC=		${WRKDIR}/tvision
 
 USES=		gmake perl5 shebangfix
 SHEBANG_FILES=	config.pl confignt.pl conflib.pl linux/compress
 USE_GCC=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${STAGEDIR}${PREFIX} \
 		--real-prefix=${PREFIX} \
 		--no-libs-here
 USE_LDCONFIG=	yes
 
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 # The port does not build with C++11 or later (bug 219275).
 USE_CXXSTD=	gnu++98
 
 PLIST_SUB=	VERSION="${PORTVERSION:R}"
 
 NLS_USES=		gettext
 NLS_CONFIGURE_OFF=	--no-intl
 
 X11_USES=		xorg
 X11_USE=		XORG=x11,xmu
 X11_CONFIGURE_ON=	--x-include=${LOCALBASE}/include \
 			--x-lib=${LOCALBASE}/lib
 X11_CONFIGURE_OFF=	--X11lib=no
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/rhtv-config \
 		${STAGEDIR}${PREFIX}/lib/librhtv.so
 
 .include <bsd.port.mk>
diff --git a/devel/root/Makefile b/devel/root/Makefile
index f4d8da59547c..46fd406ef2de 100644
--- a/devel/root/Makefile
+++ b/devel/root/Makefile
@@ -1,85 +1,86 @@
 PORTNAME=	root
 DISTVERSION=	6.28.02
+PORTREVISION=	1
 CATEGORIES=	devel science math parallel python
 MASTER_SITES=	https://root.cern/download/
 DISTFILES=	${PORTNAME}_v${DISTVERSION}.source${EXTRACT_SUFX}
 
 MAINTAINER=	erik@tenku.dk
 COMMENT=	Data analysis framework made at CERN
 WWW=		https://root.cern/
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/LGPL2_1.txt
 
 BUILD_DEPENDS=	${PYNUMPY} \
 		bash:shells/bash \
 		nlohmann-json>=3:devel/nlohmann-json
 LIB_DEPENDS=	libAfterImage.so:graphics/libafterimage \
 		libcfitsio.so:astro/cfitsio \
 		libcurl.so:ftp/curl \
 		libfftw3.so:math/fftw3 \
 		libfreetype.so:print/freetype2 \
 		libftgl.so:graphics/ftgl \
 		libgif.so:graphics/giflib \
 		libgl2ps.so:print/gl2ps \
 		libgsl.so:math/gsl \
 		liblz4.so:archivers/liblz4 \
 		libpcre.so:devel/pcre \
 		libpng.so:graphics/png \
 		libtbb.so:devel/onetbb \
 		libtiff.so:graphics/tiff \
 		libvdt.so:math/vdt \
 		libxkbcommon.so:x11/libxkbcommon \
 		libXrdCl.so:databases/xrootd \
 		libxxhash.so:devel/xxhash \
 		libzstd.so:archivers/zstd
 
 USES=		blaslapack:openblas cmake compiler:c++17-lang desktop-file-utils \
 		gettext-runtime gl gnome iconv jpeg mysql:57 pgsql:13+ python:3.9+ \
 		shebangfix sqlite ssl xorg
 USE_GL=		glew glu opengl
 USE_GNOME=	cairo gdkpixbuf2 glib20 librsvg2 libxml2
 USE_XORG=	ice sm x11 xau xaw xcb xcomposite xcursor xdamage xdmcp xext \
 		xfixes xfont xfont2 xft xi xinerama xkbfile xmu xpm xrandr \
 		xrender xres xscrnsaver xt xv xxf86vm
 
 SHEBANG_FILES=	config/rootssh etc/dictpch/makepch.py etc/proof/utils/circle.sh \
 		etc/proof/utils/crypt etc/proof/utils/pps \
 		etc/proof/utils/proofctl.sh etc/proof/utils/proofinstall.sh
 
 CMAKE_ARGS=	-DCMAKE_CXX_STANDARD=17
 CMAKE_ON=	gnuinstall soversion
 CMAKE_OFF=	builtin_gtest
 
 CONFIGURE_WRKSRC?=	${WRKDIR}/.build
 MAKE_ENV+=		ROOTSYS=${CONFIGURE_WRKSRC}
 
 OPTIONS_DEFINE=	DOCS ROOT7
 OPTIONS_DEFAULT=	ROOT7
 OPTIONS_SUB=	yes
 
 ROOT7_DESC=	Enable supplementary preview features of ROOT version 7
 ROOT7_CMAKE_BOOL=	root7
 
 .include <bsd.port.options.mk>
 
 PLIST_SUB+=	SHLIB_SHVER="${DISTVERSION:R}" \
 		SHLIB_VER="${DISTVERSION}"
 
 # Some .modulemap, .pcm and .idx files are not installed on aarch64, a few .pcm files are exclusive to aarch64 and files LIBRARY.pcm are renamed libLIBRARY_rdict.pcm on aarch64
 .if ${ARCH} == "aarch64"
 PLIST_SUB+=	NOT_INSTALLED_ON_AARCH64="@comment " ONLY_INSTALLED_ON_AARCH64="" AARCH64_PCM_PREFIX="lib" AARCH64_PCM_SUFFIX="_rdict"
 .else
 PLIST_SUB+=	NOT_INSTALLED_ON_AARCH64="" ONLY_INSTALLED_ON_AARCH64="@comment " AARCH64_PCM_PREFIX="" AARCH64_PCM_SUFFIX=""
 .endif
 
 # Some files only installed with LLVM/Clang 13 (used on FreeBSD 12.4 and 13.x)
 # TODO: Introduce USES+=llvm:min=14 instead when this can be deemed not too obtrusive on supported releases
 #       -- the post-patch step further down can then be phased out as well
 .if 1204000 <= ${OSVERSION} && ${OSVERSION} < 1302000 && ${OSVERSION} != 1301507
 PLIST_SUB+=	ONLY_INSTALLED_WITH_LLVM_CLANG_13=""
 .else
 PLIST_SUB+=	ONLY_INSTALLED_WITH_LLVM_CLANG_13="@comment "
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/rubygem-active_scaffold/Makefile b/devel/rubygem-active_scaffold/Makefile
index 44a84a17cddd..704595c25543 100644
--- a/devel/rubygem-active_scaffold/Makefile
+++ b/devel/rubygem-active_scaffold/Makefile
@@ -1,22 +1,23 @@
 PORTNAME=	active_scaffold
 PORTVERSION=	3.6.15
+PORTREVISION=	1
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Gem to handle all CRUD user interface needs
 WWW=		https://github.com/activescaffold/active_scaffold
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 RUN_DEPENDS=	rubygem-cow_proxy>=0.3<1:devel/rubygem-cow_proxy \
 		rubygem-ice_nine>=0.11<1:devel/rubygem-ice_nine \
 		rubygem-rails61>=4.2.0<6.2:www/rubygem-rails61 \
 		rubygem-request_store>=1.3<2:devel/rubygem-request_store
 
 USES=		gem
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/rubygem-gettext_i18n_rails_js-rails61/Makefile b/devel/rubygem-gettext_i18n_rails_js-rails61/Makefile
index bb8b01b57881..c4eec3294708 100644
--- a/devel/rubygem-gettext_i18n_rails_js-rails61/Makefile
+++ b/devel/rubygem-gettext_i18n_rails_js-rails61/Makefile
@@ -1,23 +1,24 @@
 PORTNAME=	gettext_i18n_rails_js
 PORTVERSION=	1.3.1
+PORTREVISION=	1
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	-rails61
 
 MAINTAINER=	mfechner@FreeBSD.org
 COMMENT=	Make gettext_i18n_rails .po files as JSON
 WWW=		https://github.com/webhippie/gettext_i18n_rails_js
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	rubygem-gettext>=3.0.2:devel/rubygem-gettext \
 		rubygem-gettext_i18n_rails>=0.7.1:devel/rubygem-gettext_i18n_rails \
 		rubygem-po_to_json>=1.0.0:converters/rubygem-po_to_json \
 		rubygem-rails61>=3.2.0:www/rubygem-rails61
 
 USES=		gem
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/rubygem-r18n-rails/Makefile b/devel/rubygem-r18n-rails/Makefile
index d9be32fa3d9a..4cefecdc1115 100644
--- a/devel/rubygem-r18n-rails/Makefile
+++ b/devel/rubygem-r18n-rails/Makefile
@@ -1,20 +1,21 @@
 PORTNAME=	r18n-rails
 PORTVERSION=	5.0.0
+PORTREVISION=	1
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Out-of-box R18n support for Ruby on Rails
 WWW=		https://github.com/r18n/r18n-rails
 
 LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	rubygem-r18n-rails-api>=5.0<6:devel/rubygem-r18n-rails-api \
 		rubygem-rails60>=5.0<7:www/rubygem-rails60
 
 USES=		gem
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/simavr/Makefile b/devel/simavr/Makefile
index e1d0dd5b6dea..09a21116cfdd 100644
--- a/devel/simavr/Makefile
+++ b/devel/simavr/Makefile
@@ -1,91 +1,91 @@
 PORTNAME=	simavr
 PORTVERSION=	1.7
 DISTVERSIONPREFIX=	v
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel emulators
 
 MAINTAINER=	zirias@FreeBSD.org
 COMMENT=	Simulator for several Atmel AVR chips
 WWW=		https://github.com/buserror/simavr
 
 LICENSE=	GPLv3
 
 BUILD_DEPENDS=	avr-gcc:devel/avr-gcc \
 		bash:shells/bash \
 		${LOCALBASE}/avr/lib/libc.a:devel/avr-libc
 
 USES=		compiler:c11 gl gmake pathfix pkgconfig xorg
 USE_GL=	gl glu glut
 PATHFIX_MAKEFILEIN=	Makefile
 USE_XORG=	xdamage xcb xext xfixes xrandr
 USE_GITHUB=	yes
 GH_ACCOUNT=	buserror
 USE_LDCONFIG=	yes
 
 ALL_TARGET=	build-parts
 DESTDIRNAME=	DUMMYDESTDIR
 		# Avoid default DESTDIR handling, so we can set a custom
 		# one that includes PREFIX, as required by unusual upstream
 		# install targets
 MAKE_ARGS=	RELEASE=1 PREFIX=${PREFIX} DESTDIR=${STAGEDIR}${PREFIX}
 MAKE_ENV=	SIMAVR_VERSION=v${PORTVERSION}
 
 OPTIONS_DEFINE=		DOCS EXAMPLES
 
 AVR_STRIP_CMD?=	avr-strip
 DUMPMACHINE=	${CC} -dumpmachine
 OBJDIRNAME=	obj-$$(${DUMPMACHINE})
 
 post-patch:
 	${REINPLACE_CMD} -e 's:Linux:FreeBSD:' \
 		-e 's:unknown:v${PORTVERSION}:' \
 		${WRKSRC}/simavr/Makefile \
 		${WRKSRC}/examples/parts/Makefile
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/simavr
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libsimavr.so.1
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libsimavrparts.so.1
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/manual/manual.pdf ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/simavr_callgraph.pdf ${STAGEDIR}${DOCSDIR}
 
 post-install-EXAMPLES-on:
 .for BOARDELF in ds1338,ds1338demo hd44780,charlcd i2ctest ledramp rotenc,rotenc_test simduino ssd1306,ssd1306demo timer_64led
 	BOARDELF=${BOARDELF}; \
 	BOARD=$${BOARDELF%%,*}; \
 	ELF=$${BOARDELF##*,}; \
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/board_$${BOARD}; \
 	${INSTALL_PROGRAM} \
 		${WRKSRC}/examples/board_$${BOARD}/${OBJDIRNAME}/$${ELF}.elf \
 		${STAGEDIR}${EXAMPLESDIR}/board_$${BOARD}/$${ELF}; \
 	${INSTALL_DATA} ${WRKSRC}/examples/board_$${BOARD}/*.[aihc]* \
 			${WRKSRC}/examples/board_$${BOARD}/Makefile \
 			${STAGEDIR}${EXAMPLESDIR}/board_$${BOARD}/;\
 	${TEST} -f ${WRKSRC}/examples/board_$${BOARD}/README && \
 	${INSTALL_DATA} ${WRKSRC}/examples/board_$${BOARD}/README \
 			${STAGEDIR}${EXAMPLESDIR}/board_$${BOARD}/ || ${TRUE}
 .endfor
 .for AXF in \
 		ds1338/atmega32_ds1338 \
 		hd44780/atmega48_charlcd \
 		i2ctest/atmega1280_i2ctest \
 		ledramp/atmega48_ledramp \
 		rotenc/atmega32_rotenc_test \
 		ssd1306/atmega32_ssd1306 \
 		timer_64led/atmega168_timer_64led
 	${AVR_STRIP_CMD} ${STAGEDIR}${EXAMPLESDIR}/board_${AXF}.axf
 .endfor
 .for EXDIR in parts shared
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/${EXDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/${EXDIR}/*.[hc] \
 			${STAGEDIR}${EXAMPLESDIR}/${EXDIR}
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/Makefile.common ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/Makefile ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/Makefile.opengl \
 			${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/devel/smv/Makefile b/devel/smv/Makefile
index 38a224462a71..1ace9cb38491 100644
--- a/devel/smv/Makefile
+++ b/devel/smv/Makefile
@@ -1,54 +1,54 @@
 PORTNAME=	smv
 PORTVERSION=	2.5.4.3
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	devel
 MASTER_SITES=	http://www.cs.cmu.edu/~modelcheck/smv/
 DISTNAME=	${PORTNAME}.r${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Symbolic Model Verifier System for checking finite state systems
 WWW=		https://www.cs.cmu.edu/~modelcheck/smv.html
 
 BROKEN_aarch64=		fails to build: undefined reference to sbrk
 BROKEN_armv6=		fails to build: error: non-void function check_bdd should return a value
 BROKEN_armv7=		fails to build: error: non-void function check_bdd should return a value
 
 USE_GCC=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
 ALL_TARGET=	${PORTNAME}
 MAKEFILE=	makefile
 MAKE_JOBS_UNSAFE=	yes
 
 PORTEXAMPLES=	*
 PORTDOCS=	NEW README smvmanual.ps
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/smv ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/smv.1 ${STAGEDIR}${MANPREFIX}/man/man1
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/smv-mode.el ${STAGEDIR}${DATADIR}
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/NEW ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/smvmanual.ps ${STAGEDIR}${DOCSDIR}
 
 do-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/counter.smv ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/dme1.smv ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/dme2.smv ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/featuring.smv ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/gigamax.smv ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/mutex.smv ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/mutex1.smv ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/periodic.smv ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/ring.smv ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/semaphore.smv ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/short.smv ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/syncarb5.smv ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/devel/spyder/Makefile b/devel/spyder/Makefile
index bcf1d31e97aa..d9734ade6ab0 100644
--- a/devel/spyder/Makefile
+++ b/devel/spyder/Makefile
@@ -1,66 +1,67 @@
 PORTNAME=	spyder
 DISTVERSIONPREFIX=	v
 DISTVERSION=	5.4.3
+PORTREVISION=	1
 CATEGORIES=	devel science python
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Scientific PYthon Development EnviRonment, an alternative to IDLE
 WWW=		https://www.spyder-ide.org/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	\
 		${PYTHON_PKGNAMEPREFIX}atomicwrites>=1.2.0:devel/py-atomicwrites@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}chardet>=2.0.0:textproc/py-chardet@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cloudpickle>=0.5.0:devel/py-cloudpickle@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cookiecutter>=1.6.0:devel/py-cookiecutter@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}diff-match-patch>=20181111:textproc/py-diff-match-patch@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}intervaltree>=3.0.2:devel/py-intervaltree@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ipython>=7.31.1:devel/ipython@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jedi>=0.17.2:devel/py-jedi@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jellyfish>=0.7:devel/py-jellyfish@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jsonschema>=3.2.0:devel/py-jsonschema@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}keyring>=17.0.0:security/py-keyring@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}nbconvert>=4.0:devel/py-nbconvert@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpydoc>=0.6.0:textproc/py-numpydoc@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}parso>=0.7.0:textproc/py-parso@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pexpect>=4.4.0:misc/py-pexpect@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pickleshare>=0.4:databases/py-pickleshare@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psutil>=5.3:sysutils/py-psutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pygments>=2.0:textproc/py-pygments@${PY_FLAVOR} \
 		pylint${PYTHON_PKGNAMESUFFIX}>=2.5.0:devel/pylint@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pylint-venv>=2.1.1:devel/py-pylint-venv@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-lsp-black>=1.2.0:textproc/py-python-lsp-black@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyls-spyder>=0.4.0:textproc/py-pyls-spyder@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}qt5-webengine>0:www/py-qt5-webengine@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-lsp-server>0:textproc/py-python-lsp-server@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xdg>=0.26:devel/py-xdg@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyzmq>=22.1.0:net/py-pyzmq@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}QDarkStyle>=3.0.2:textproc/py-QDarkStyle@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}qstylizer>=0.2.2:devel/py-qstylizer@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}QtAwesome>=1.2.1:x11-fonts/py-QtAwesome@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}qtconsole>=5.4.0:devel/py-qtconsole@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}QtPy>=2.1.0:devel/py-QtPy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}rtree>=0.9.7:devel/py-rtree@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sphinx>=0.6.6:textproc/py-sphinx@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}spyder-kernels>=2.4.2:devel/py-spyder-kernels@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}textdistance>=4.2.0:textproc/py-textdistance@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}three-merge>=0.1.1:textproc/py-three-merge@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}watchdog>=0.10.3:devel/py-watchdog@${PY_FLAVOR}
 
 USES=		desktop-file-utils python:3.7+ pyqt:5
 USE_PYTHON=	distutils autoplist noflavors
 USE_PYQT=	pyqt5 sip
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	spyder-ide
 
 NO_ARCH=	yes
 
 DOCSDIR=	${PYTHON_SITELIBDIR}/spyder
 
 post-extract: # remove bundled dependencies
 	@${RM} -r ${WRKSRC}/external-deps/*
 
 .include <bsd.port.mk>
diff --git a/devel/stdx-allocator/Makefile b/devel/stdx-allocator/Makefile
index 4527b291f85b..30b1188ca2c5 100644
--- a/devel/stdx-allocator/Makefile
+++ b/devel/stdx-allocator/Makefile
@@ -1,37 +1,37 @@
 PORTNAME=	stdx-allocator
 PORTVERSION=	3.0.2
-PORTREVISION=	3
+PORTREVISION=	4
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Containers backed on dlang by std.experimental.allocator
 WWW=		https://github.com/dlang-community/stdx-allocator
 
 LICENSE=	BSL
 
 BUILD_DEPENDS=	ldmd2:lang/ldc \
 		dub:devel/dub \
 		${LOCALBASE}/lib/d/libmir-core.a:devel/mir-core
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	dlang-community
 
 DUB_CMD=	${LOCALBASE}/bin/dub build --build=release
 D_INCLUDE_DIR=	${PREFIX}/include/d
 D_LIB_DIR=	${PREFIX}/lib/d
 DC=		${PREFIX}/bin/ldmd2
 
 post-patch:
 	${REINPLACE_CMD} '6d' ${WRKSRC}/dub.sdl
 
 do-build:
 	@cd ${WRKSRC} && DC=${DC} ${DUB_CMD}
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${D_INCLUDE_DIR}
 	@${MKDIR} ${STAGEDIR}${D_LIB_DIR}
 	${INSTALL_DATA} ${WRKSRC}/libstdx-allocator.a ${STAGEDIR}${D_LIB_DIR}
 	cd ${WRKSRC}/source && ${COPYTREE_SHARE} . ${STAGEDIR}${D_INCLUDE_DIR} "-name *\.d"
 
 .include <bsd.port.mk>
diff --git a/devel/tablist/Makefile b/devel/tablist/Makefile
index f5503c0d5fb2..a9999d1e5403 100644
--- a/devel/tablist/Makefile
+++ b/devel/tablist/Makefile
@@ -1,34 +1,34 @@
 PORTNAME=	tablist
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.0-13
-PORTREVISION=	2
+PORTREVISION=	4
 DISTVERSIONSUFFIX=	-gfaab7a0
 CATEGORIES=	devel elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	jrm@FreeBSD.org
 COMMENT=	Emacs package for extended tabulated-list-mode
 WWW=		https://github.com/politza/tablist
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		emacs
 USE_GITHUB=	yes
 GH_ACCOUNT=	politza
 
 NO_ARCH=	yes
 PLIST_FILES=	${EMACS_SITE_LISPDIR}/tablist.el \
 		${EMACS_SITE_LISPDIR}/tablist.elc \
 		${EMACS_SITE_LISPDIR}/tablist-filter.el \
 		${EMACS_SITE_LISPDIR}/tablist-filter.elc
 
 do-build:
 	${EMACS_CMD} -Q --batch -L ${WRKSRC} -f batch-byte-compile ${WRKSRC}/*.el
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}
 	${INSTALL_DATA} ${WRKSRC}/*.el ${WRKSRC}/*.elc \
 		${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}
 
 .include <bsd.port.mk>
diff --git a/devel/test-drive/Makefile b/devel/test-drive/Makefile
index f21f0618ac2b..00f113d3e241 100644
--- a/devel/test-drive/Makefile
+++ b/devel/test-drive/Makefile
@@ -1,26 +1,27 @@
 PORTNAME=	test-drive
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.4.0-7
+PORTREVISION=	1
 DISTVERSIONSUFFIX=	-g2127360
 CATEGORIES=	devel
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Simple testing framework
 WWW=		https://github.com/fortran-lang/test-drive
 
 LICENSE=	APACHE20 MIT
 LICENSE_COMB=	dual
 LICENSE_FILE_APACHE20=	${WRKSRC}/LICENSE-Apache
 LICENSE_FILE_MIT=	${WRKSRC}/LICENSE-MIT
 
 BROKEN_aarch64=	fails to compile: Cannot find an intrinsic module named 'ieee_arithmetic' at (1)
 
 USES=		cmake:testing fortran
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	fortran-lang
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 
 .include <bsd.port.mk>
diff --git a/devel/tigcc/Makefile b/devel/tigcc/Makefile
index 5f999b19ffd1..19b8c78ca8de 100644
--- a/devel/tigcc/Makefile
+++ b/devel/tigcc/Makefile
@@ -1,144 +1,144 @@
 PORTNAME=	tigcc
 PORTVERSION=	0.96.b8
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	devel
 MASTER_SITES=	http://freebsd.nsu.ru/distfiles/:gcc LOCAL/danfe:gcc \
 		GNU/binutils:gas \
 		http://tigcc.ticalc.org/linux/:tigcc
 DISTFILES=	gcc-core-4.1-20060728.tar.bz2:gcc \
 		binutils-2.16.1.tar.bz2:gas \
 		tigcc_src.tar.bz2:tigcc
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	C compiler for the TI89, 92, and 92+ calculators
 WWW=		http://tigcc.ticalc.org/
 
 USES=		bison compiler:nestedfct gmake tar:bzip2
 USE_CSTD=	gnu89
 CFLAGS+=	-fcommon
 NO_WRKSUBDIR=	yes
 SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 do-extract:
 	@${MKDIR} ${WRKSRC}
 	@${MKDIR} ${WRKSRC}/tigcc
 	@${TAR} xjf ${DISTDIR}/tigcc_src.tar.bz2 -C ${WRKSRC}/tigcc/
 	@${MKDIR} ${WRKSRC}/gnu
 	@${TAR} xjf ${DISTDIR}/gcc-core-4.1-20060728.tar.bz2 -C ${WRKSRC}/gnu/
 	@${TAR} xjf ${DISTDIR}/binutils-2.16.1.tar.bz2 -C ${WRKSRC}/gnu/
 
 post-patch:
 	@cd ${WRKSRC}/gnu/binutils-2.16.1; ${PATCH} -s -p1 < ${WRKSRC}/tigcc/sources/gcc/gas-2.16-tigcc-patch.diff
 	@cd ${WRKSRC}/gnu/gcc-4.1-20060728; ${PATCH} -s -p1 < ${WRKSRC}/tigcc/sources/gcc/gcc-4.1-tigcc-patch.diff
 	@cd ${WRKSRC}/gnu/gcc-4.1-20060728/gcc; ${ECHO} "echo all:" > mklibgcc.in
 	@${REINPLACE_CMD} -e 's/^CC[[:space:]]*=/CC ?=/' -e 's/^CFLAGS[[:space:]]*=/CFLAGS ?=/' \
 		${WRKSRC}/tigcc/sources/a68k/Makefile ${WRKSRC}/tigcc/sources/ld-tigcc/Makefile \
 		${WRKSRC}/tigcc/sources/patcher/src/Makefile ${WRKSRC}/tigcc/sources/tigcc/src/Makefile \
 		${WRKSRC}/tigcc/sources/tprbuilder/src/Makefile
 
 do-configure:
 	@${ECHO} Configuring GNU AS
 	@${MKDIR} ${WRKSRC}/gnu/binutils_build
 	@cd ${WRKSRC}/gnu/binutils_build; \
 		${SETENV} CC="${CC}" CPP="${CPP}" CXX="${CXX}" \
 		CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" CXXFLAGS="${CXXFLAGS}" \
 		LDFLAGS="${LDFLAGS}" LIBS="${LIBS}" \
 		${CONFIGURE_ENV} \
 		${WRKSRC}/gnu/binutils-2.16.1/configure --disable-serial-configure --target=m68k-coff --disable-shared \
 		--enable-static --disable-multilib --disable-nls --disable-win32-registry
 	@${ECHO} Configuring the GNU C COMPILER
 	@${MKDIR} ${WRKSRC}/gnu/gcc_build
 	@cd ${WRKSRC}/gnu/gcc_build; \
 		${SETENV} CC="${CC}" CPP="${CPP}" CXX="${CXX}" \
 		CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" CXXFLAGS="${CXXFLAGS}" \
 		LDFLAGS="${LDFLAGS}" LIBS="${LIBS}" \
 		${CONFIGURE_ENV} \
 		${WRKSRC}/gnu/gcc-4.1-20060728/configure --target=m68k-coff --with-gnu-as --disable-nls --disable-multilib \
 		--disable-shared --enable-static --disable-threads --disable-win32-registry --disable-checking --disable-werror \
 		--disable-pch --disable-mudflap --disable-libssp
 
 do-build:
 	@${ECHO} Building GNU AS
 	@cd ${WRKSRC}/gnu/binutils_build; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS}
 
 	@${ECHO} Building the GNU C COMPILER
 	@cd ${WRKSRC}/gnu/gcc_build; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS}
 
 	@${ECHO} Building A68K
 	@cd ${WRKSRC}/tigcc/sources/a68k; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS}
 
 	@${ECHO} Building LD-TIGCC
 	@cd ${WRKSRC}/tigcc/sources/ld-tigcc; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS}
 
 	@${ECHO} Building PATCHER
 	@cd ${WRKSRC}/tigcc/sources/patcher/src; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS}
 
 	@${ECHO} Building the ExePack support from the TIGCC Tools Suite
 	@cd ${WRKSRC}/tigcc/sources/ttpack; ${CC} ${CFLAGS} -o ttpack ttpack.c
 	@cd ${WRKSRC}/tigcc/sources/ttpack; ${CC} ${CFLAGS} -o ttbin2oth ttbin2oth.c
 
 	@${ECHO} Building TIGCC
 	@cd ${WRKSRC}/tigcc/sources/tigcc/src; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS}
 
 	@${ECHO} Building TPRBUILDER
 	@cd ${WRKSRC}/tigcc/sources/tprbuilder/src; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS}
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/tigcc
 	@${MKDIR} ${STAGEDIR}${PREFIX}/tigcc/bin
 
 	@${ECHO} Installing GNU AS
 	${INSTALL_PROGRAM} ${WRKSRC}/gnu/binutils_build/gas/as-new ${STAGEDIR}${PREFIX}/tigcc/bin/as
 
 	@${ECHO} Installing the GNU C Compiler
 	${INSTALL_PROGRAM} ${WRKSRC}/gnu/gcc_build/gcc/cc1 ${STAGEDIR}${PREFIX}/tigcc/bin/cc1
 	${INSTALL_PROGRAM} ${WRKSRC}/gnu/gcc_build/gcc/xgcc ${STAGEDIR}${PREFIX}/tigcc/bin/gcc
 
 	@${ECHO} Installing A68K
 	${INSTALL_PROGRAM} ${WRKSRC}/tigcc/sources/a68k/A68k ${STAGEDIR}${PREFIX}/tigcc/bin/a68k
 
 	@${ECHO} Installing LD-TIGCC
 	${INSTALL_PROGRAM} ${WRKSRC}/tigcc/sources/ld-tigcc/ld-tigcc ${STAGEDIR}${PREFIX}/tigcc/bin/ld-tigcc
 	${INSTALL_PROGRAM} ${WRKSRC}/tigcc/sources/ld-tigcc/ar-tigcc ${STAGEDIR}${PREFIX}/tigcc/bin/ar-tigcc
 
 	@${ECHO} Installing PATCHER
 	${INSTALL_PROGRAM} ${WRKSRC}/tigcc/sources/patcher/src/patcher ${STAGEDIR}${PREFIX}/tigcc/bin/patcher
 
 	@${ECHO} Installing the ExePack support from the TIGCC Tools Suite
 	${INSTALL_PROGRAM} ${WRKSRC}/tigcc/sources/ttpack/ttpack ${STAGEDIR}${PREFIX}/tigcc/bin/ttpack
 	${INSTALL_PROGRAM} ${WRKSRC}/tigcc/sources/ttpack/ttbin2oth ${STAGEDIR}${PREFIX}/tigcc/bin/ttbin2oth
 
 	@${ECHO} Installing TIGCC
 	${INSTALL_PROGRAM} ${WRKSRC}/tigcc/sources/tigcc/src/tigcc ${STAGEDIR}${PREFIX}/tigcc/bin/tigcc
 
 	@${ECHO} Installing TPRBUILDER
 	${INSTALL_PROGRAM} ${WRKSRC}/tigcc/sources/tprbuilder/src/tprbuilder ${STAGEDIR}${PREFIX}/tigcc/bin/tprbuilder
 
 	@${ECHO} Installing TIGCCLIB
 	@${CP} -R ${WRKSRC}/tigcc/tigcclib/include ${STAGEDIR}${PREFIX}/tigcc/
 	@${LN} -s ./os.h ${STAGEDIR}${PREFIX}/tigcc/include/asm/OS.h
 	@${CP} -R ${WRKSRC}/tigcc/tigcclib/lib ${STAGEDIR}${PREFIX}/tigcc/
 
 do-install-DOCS-on:
 	@${ECHO} Installing the TIGCC documentation
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@cd ${WRKSRC}/tigcc; ${CP} AUTHORS BUGS CHANGELOG COPYING DIRECTORIES HOWTO INSTALL README README.linux README.osX ${STAGEDIR}${DOCSDIR}/
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/a68k
 	@cd ${WRKSRC}/tigcc/sources/a68k; ${CP} Bugs.txt Doc.txt History.txt ToDo.txt ${STAGEDIR}${DOCSDIR}/a68k/
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/tigcc
 	@cd ${WRKSRC}/tigcc; ${CP} AUTHORS  COPYING  CHANGELOG  README ${STAGEDIR}${DOCSDIR}/tigcc/
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/tprbuilder
 	@cd ${WRKSRC}/tigcc/sources/tprbuilder; ${CP} AUTHORS COPYING ChangeLog README ${STAGEDIR}${DOCSDIR}/tprbuilder/
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/patcher
 	@cd ${WRKSRC}/tigcc/sources/patcher; ${CP} AUTHORS  COPYING  ChangeLog  README ${STAGEDIR}${DOCSDIR}/patcher/
 	@${CP} -R ${WRKSRC}/tigcc/tigcclib/doc/html ${STAGEDIR}${DOCSDIR}/
 	@${LN} -s ./html ${STAGEDIR}${DOCSDIR}/tigcclib
 	@${CP} ${WRKSRC}/tigcc/tigcclib/doc/converter/tigccdoc ${STAGEDIR}${PREFIX}/tigcc/bin/
 
 do-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	@${CP} ${WRKSRC}/tigcc/tigcclib/examples/* ${STAGEDIR}${EXAMPLESDIR}/
 
 .include <bsd.port.mk>
diff --git a/devel/transient-devel/Makefile b/devel/transient-devel/Makefile
index 572ae395bdcf..179e024b432b 100644
--- a/devel/transient-devel/Makefile
+++ b/devel/transient-devel/Makefile
@@ -1,63 +1,64 @@
 PORTNAME=	transient
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.3.7-215
+PORTREVISION=	2
 DISTVERSIONSUFFIX=	-g0204a24
 CATEGORIES=	devel elisp
 PKGNAMESUFFIX=	-devel${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	yasu@FreeBSD.org
 COMMENT=	Emacs key and popup interface for complex keybindings
 WWW=		https://github.com/magit/transient
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	compat.el${EMACS_PKGNAMESUFFIX}>=28.1.1.0:misc/compat.el@${EMACS_FLAVOR}
 RUN_DEPENDS=	compat.el${EMACS_PKGNAMESUFFIX}>=28.1.1.0:misc/compat.el@${EMACS_FLAVOR}
 
 USES=		emacs gmake makeinfo
 USE_GITHUB=	yes
 GH_ACCOUNT=	magit
 
 MAKE_ENV+=	LOAD_PATH="-L ${WRKSRC}/lisp -L ${PREFIX}/${EMACS_SITE_LISPDIR} -L ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR} -L ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/compat"
 
 ALL_TARGET=	lisp info
 
 CONFLICTS_INSTALL=	transient-emacs*
 
 NO_ARCH=	yes
 
 INFO=		transient
 
 PORTDOCS=	CHANGELOG README.org transient.html
 
 OPTIONS_DEFINE=	DOCS PDF
 
 PDF_DESC=	Build and install PDF document
 
 DOCS_BUILD_DEPENDS=	gsed:textproc/gsed
 DOCS_ALL_TARGET=	html
 DOCS_BINARY_ALIAS=	sed=gsed
 PDF_BUILD_DEPENDS=	texi2pdf:print/texinfo
 PDF_USES=		tex
 PDF_USE=		TEX=dvipdfmx:build
 PDF_ALL_TARGET=		pdf
 PDF_PLIST_FILES=	${DOCSDIR}/transient.pdf
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}
 	${INSTALL_DATA} ${WRKSRC}/lisp/*.el* \
 		${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/*.info \
 		${STAGEDIR}${PREFIX}/${INFO_PATH}
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.org ${WRKSRC}/CHANGELOG \
 		${WRKSRC}/docs/transient.html ${STAGEDIR}${DOCSDIR}
 
 do-install-PDF-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/transient.pdf ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/devel/transient/Makefile b/devel/transient/Makefile
index ee47e0efd008..db93cd567344 100644
--- a/devel/transient/Makefile
+++ b/devel/transient/Makefile
@@ -1,58 +1,58 @@
 PORTNAME=	transient
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.3.7
-PORTREVISION=	5
+PORTREVISION=	7
 CATEGORIES=	devel elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	yasu@FreeBSD.org
 COMMENT=	Emacs key and popup interface for complex keybindings
 WWW=		https://github.com/magit/transient
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		emacs gmake makeinfo
 USE_GITHUB=	yes
 GH_ACCOUNT=	magit
 
 ALL_TARGET=	lisp info
 
 CONFLICTS_INSTALL=	transient-devel-emacs*
 
 NO_ARCH=	yes
 
 INFO=		transient
 
 PORTDOCS=	CHANGELOG README.md transient.html
 
 OPTIONS_DEFINE=	DOCS PDF
 
 PDF_DESC=	Build and install PDF document
 
 DOCS_BUILD_DEPENDS=	gsed:textproc/gsed
 DOCS_ALL_TARGET=	html
 DOCS_BINARY_ALIAS=	sed=gsed
 PDF_BUILD_DEPENDS=	texi2pdf:print/texinfo
 PDF_USES=		tex
 PDF_USE=		TEX=dvipdfmx:build
 PDF_ALL_TARGET=		pdf
 PDF_PLIST_FILES=	${DOCSDIR}/transient.pdf
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}
 	${INSTALL_DATA} ${WRKSRC}/lisp/*.el* \
 		${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/*.info \
 		${STAGEDIR}${PREFIX}/${INFO_PATH}
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.md ${WRKSRC}/docs/CHANGELOG \
 		${WRKSRC}/docs/transient.html ${STAGEDIR}${DOCSDIR}
 
 do-install-PDF-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/transient.pdf ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/devel/treepy.el/Makefile b/devel/treepy.el/Makefile
index 718d20d7a40b..8af6b562ec7a 100644
--- a/devel/treepy.el/Makefile
+++ b/devel/treepy.el/Makefile
@@ -1,39 +1,39 @@
 PORTNAME=	treepy.el
 DISTVERSION=	0.1.2
-PORTREVISION=	6
+PORTREVISION=	8
 CATEGORIES=	devel elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	yasu@FreeBSD.org
 COMMENT=	Generic tree traversing tools for Emacs Lisp
 WWW=		https://github.com/volrath/treepy.el
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		emacs
 USE_GITHUB=	yes
 GH_ACCOUNT=	volrath
 
 NO_ARCH=	yes
 
 PLIST_FILES=	${EMACS_VERSION_SITE_LISPDIR}/treepy.el \
 		${EMACS_VERSION_SITE_LISPDIR}/treepy.elc
 
 OPTIONS_DEFINE=	DOCS
 
 PORTDOCS=	README.md
 
 do-build:
 	(cd ${WRKSRC} ; ${EMACS_CMD} -batch -q -f batch-byte-compile treepy.el)
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}
 	${INSTALL_DATA} ${WRKSRC}/treepy.el* \
 		${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/devel/undead/Makefile b/devel/undead/Makefile
index f7d3a4c463a2..95c908cb2892 100644
--- a/devel/undead/Makefile
+++ b/devel/undead/Makefile
@@ -1,38 +1,39 @@
 PORTNAME=	undead
 DISTVERSIONPREFIX=v
 DISTVERSION=	1.1.8
+PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	romain@FreeBSD.org
 COMMENT=	Obsolete Phobos modules upgraded to work with the latest D
 
 LICENSE=	BSL
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	ldmd2:lang/ldc \
 		dub:devel/dub
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	dlang
 GH_PROJECT=	undeaD
 
 DUB_CMD=	${LOCALBASE}/bin/dub build --build=release
 D_INCLUDE_DIR=	${PREFIX}/include/d
 D_LIB_DIR=	${PREFIX}/lib/d
 DC=		${PREFIX}/bin/ldmd2
 
 SUB_FILES=	undead.pc
 SUB_LIST=	DISTVERSION=${DISTVERSION}
 
 do-build:
 	@cd ${WRKSRC} && DC=${DC} ${DUB_CMD}
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${D_INCLUDE_DIR}
 	@${MKDIR} ${STAGEDIR}${D_LIB_DIR}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/libdata/pkgconfig
 	${INSTALL_DATA} ${WRKSRC}/bin/libundead.a ${STAGEDIR}${D_LIB_DIR}
 	cd ${WRKSRC}/src && ${COPYTREE_SHARE} . ${STAGEDIR}${D_INCLUDE_DIR} "-name *\.d"
 	cd ${WRKDIR} && ${COPYTREE_SHARE} undead.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig
 
 .include <bsd.port.mk>
diff --git a/devel/vitables/Makefile b/devel/vitables/Makefile
index 6b9ff90f0cd6..a6927aba5473 100644
--- a/devel/vitables/Makefile
+++ b/devel/vitables/Makefile
@@ -1,34 +1,34 @@
 PORTNAME=	vitables
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.0.2
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	devel science python
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Viewer and editor of files in both PyTables format and HDF5 format
 WWW=		https://github.com/uvemas/ViTables
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}QtPy>=1.2.1:devel/py-QtPy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numexpr>=2.0:math/py-numexpr@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tables>=3.0:devel/py-tables@${PY_FLAVOR}
 
 USES=		dos2unix python pyqt:5
 USE_PYTHON=	distutils cython noflavors autoplist
 USE_PYQT=	pyqt5:run sip:run
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	uvemas
 GH_PROJECT=	ViTables
 
 DOS2UNIX_FILES=	setup.py
 
 NO_ARCH=	yes
 
 post-patch:
 	@${REINPLACE_CMD} "s|version=read('VERSION')|version='${DISTVERSION}'|" ${WRKSRC}/setup.py
 
 .include <bsd.port.mk>
diff --git a/devel/xdgpaths/Makefile b/devel/xdgpaths/Makefile
index b3e49d1c05ca..38d141bd37df 100644
--- a/devel/xdgpaths/Makefile
+++ b/devel/xdgpaths/Makefile
@@ -1,34 +1,34 @@
 PORTNAME=	xdgpaths
 PORTVERSION=	0.2.5
-PORTREVISION=	4
+PORTREVISION=	5
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	XDG Base Directory Specification implementation in D lang
 WWW=		https://github.com/FreeSlave/xdgpaths
 
 LICENSE=	BSL
 
 BUILD_DEPENDS=	ldmd2:lang/ldc \
 		dub:devel/dub \
 		${LOCALBASE}/lib/d/libisfreedesktop.a:devel/isfreedesktop
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	FreeSlave
 
 DUB_CMD=	${LOCALBASE}/bin/dub build --build=release
 D_INCLUDE_DIR=	${PREFIX}/include/d
 D_LIB_DIR=	${PREFIX}/lib/d
 DC=		${PREFIX}/bin/ldmd2
 
 do-build:
 	@cd ${WRKSRC} && DC=${DC} ${DUB_CMD}
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${D_INCLUDE_DIR}
 	@${MKDIR} ${STAGEDIR}${D_LIB_DIR}
 	${INSTALL_DATA} ${WRKSRC}/lib/libxdgpaths.a ${STAGEDIR}${D_LIB_DIR}
 	cd ${WRKSRC}/source && ${COPYTREE_SHARE} . ${STAGEDIR}${D_INCLUDE_DIR} "-name *\.d"
 
 .include <bsd.port.mk>
diff --git a/devel/xtensa-esp32-elf/Makefile b/devel/xtensa-esp32-elf/Makefile
index 8cf6336f5acf..a26beb5b8967 100644
--- a/devel/xtensa-esp32-elf/Makefile
+++ b/devel/xtensa-esp32-elf/Makefile
@@ -1,109 +1,109 @@
 PORTNAME=	xtensa-esp32-elf
 DISTVERSION=	1.22.0.g20200907
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	SOURCEWARE/binutils/releases/binutils:source1 \
 		GNU/binutils:source1 \
 		https://github.com/libexpat/libexpat/releases/download/R_2_1_0/:source2 \
 		SF/expat/expat/2.1.0:source2 \
 		GCC/releases/gcc-${GCCVER}:source3 \
 		GNU/gdb:source4 \
 		GNU/gmp:source5 \
 		http://isl.gforge.inria.fr/:source6 \
 		GNU/mpc:source7 \
 		http://www.mpfr.org/mpfr-3.1.3/:source8 \
 		GNU/mpfr:source8 \
 		ftp://ftp.invisible-island.net/ncurses/:source9 \
 		GNU/ncurses:source9 \
 		SOURCEWARE/newlib:source10 \
 		ftp://sources.redhat.com/pub/newlib/:source10
 DISTFILES=	binutils-2.25.1.tar.bz2:source1 \
 		expat-2.1.0.tar.gz:source2 \
 		gcc-${GCCVER}.tar.bz2:source3 \
 		gdb-7.10.tar.xz:source4 \
 		gmp-6.0.0a.tar.xz:source5 \
 		isl-0.14.tar.xz:source6 \
 		mpc-1.0.3.tar.gz:source7 \
 		mpfr-3.1.3.tar.xz:source8 \
 		ncurses-6.0.tar.gz:source9 \
 		newlib-2.2.0.tar.gz:source10
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	leres@FreeBSD.org
 COMMENT=	Espressif ESP32 toolchain
 WWW=		https://dl.espressif.com/doc/esp-idf/latest/get-started/index.html #setup-toolchain
 
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	multi
 
 BUILD_DEPENDS=	bash:shells/bash \
 		gawk:lang/gawk \
 		gpatch:devel/patch \
 		${LOCALBASE}/bin/grep:textproc/gnugrep \
 		gperf:devel/gperf \
 		gsed:textproc/gsed \
 		help2man:misc/help2man \
 		makeinfo:print/texinfo \
 		wget:ftp/wget
 
 USES=		autoreconf:build bison gmake libtool python
 USE_GCC=	10
 USE_GITHUB=	yes
 
 NO_MTREE=	yes
 SUBDIR=		crosstool-NG
 TAGNAME=	1.22.0-97-gc752ad5
 GH_TUPLE=	espressif:${SUBDIR}:${TAGNAME}
 BINARY_ALIAS=	g++=${CXX} gcc=${CC} python=${PYTHON_VERSION}
 BUILD_ENV=	CT_ALLOW_BUILD_AS_ROOT_SURE=1 \
 		CT_FORBID_DOWNLOAD=y \
 		GREP=${LOCALBASE}/bin/grep \
 		LD_RUN_PATH=${PREFIX}/lib/${CC} \
 		LDFLAGS=-I/usr/local/lib \
 		${MAKE_ENV:MPATH=*}
 
 ESPVER=		crosstool-ng-$(TAGNAME)
 GCCVER=		5.2.0
 PLIST_SUB=	PKGBASE=$(PKGBASE) GCCVER=$(GCCVER)
 TARBALLS=	${BUILD_WRKSRC}/.build/tarballs
 
 post-extract:
 	${MKDIR} ${TARBALLS}
 .for F in $(DISTFILES:N$(EXTRACT_ONLY))
 	${LN} -s ${DISTDIR}/${F:C/:source[0-9]+$//} ${TARBALLS}
 .endfor
 	${MKDIR} ${WRKSRC}/local-patches/gdb/7.10
 	${CP} ${FILESDIR}/0001-gdb-7.12.1.patch ${WRKSRC}/local-patches/gdb/7.10
 	echo CT_LOG_PROGRESS_BAR=n >> \
 	    ${BUILD_WRKSRC}/samples/${PORTNAME}/crosstool.config
 
 do-configure:
 	cd ${BUILD_WRKSRC} && ./bootstrap
 	${PRINTF} "#!/bin/sh\necho '${ESPVER}'\n" > \
 	    ${BUILD_WRKSRC}/version.sh
 	${CHMOD} -w+x ${BUILD_WRKSRC}/version.sh
 	cd ${BUILD_WRKSRC} && \
 	    ${SETENV} ${BUILD_ENV} \
 	    ./configure --enable-local --prefix=${WRKDIR}/ct-ng --exec-prefix=${WRKDIR}/ct-ng
 	cd ${BUILD_WRKSRC} && \
 	    ${SETENV} -uMAKELEVEL -uMAKEFLAGS -u.MAKE.LEVEL.ENV ${BUILD_ENV} \
 	    ${MAKE_CMD} install && ${SETENV} ${BUILD_ENV} ./ct-ng ${PORTNAME}
 
 do-build:
 	cd ${BUILD_WRKSRC} && ${SETENV} ${BUILD_ENV} ./ct-ng build
 	cd ${BUILD_WRKSRC}/builds/${PORTNAME} && \
 	    ${CHMOD} +w . lib && \
 	    ${RM} build.log.bz2 lib/charset.alias && \
 	    ${CHMOD} -w . lib
 
 do-install:
 	cd ${BUILD_WRKSRC}/builds/${PORTNAME} && \
 	    ${COPYTREE_BIN} . ${STAGEDIR}${PREFIX}/${PKGBASE}
 	${FIND} ${STAGEDIR}${PREFIX}/${PKGBASE} -type f | \
 	    ${XARGS} ${CHMOD} -wx
 	${FIND} ${STAGEDIR}${PREFIX}/${PKGBASE}/bin \
 	    ${STAGEDIR}${PREFIX}/${PKGBASE}/libexec/gcc/${PORTNAME}/${GCCVER} \
 	    ${STAGEDIR}${PREFIX}/${PKGBASE}/${PORTNAME}/bin -type f | \
 	    ${XARGS} ${CHMOD} +x
 
 .include <bsd.port.mk>
diff --git a/dns/py-dns-crawler/Makefile b/dns/py-dns-crawler/Makefile
index c946d85ca1fd..d9231fe84bef 100644
--- a/dns/py-dns-crawler/Makefile
+++ b/dns/py-dns-crawler/Makefile
@@ -1,38 +1,39 @@
 PORTNAME=	dns-crawler
 PORTVERSION=	1.4.9
+PORTREVISION=	1
 CATEGORIES=	dns python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Crawler for getting info about DNS domains and services
 WWW=		https://gitlab.nic.cz/adam/dns-crawler
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}asn1crypto>=1.3.0:devel/py-asn1crypto@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cert-human>=1.0.7:security/py-cert-human@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cryptography>=2.8:security/py-cryptography@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dnspython>=0,1:dns/py-dnspython@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ecdsa>=0.15:security/py-ecdsa@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}forcediphttpsadapter>=1.0.1:www/py-forcediphttpsadapter@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}GeoIP2>=3.0.0:net/py-GeoIP2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}hstspreload>=0:www/py-hstspreload@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}idna>=2.9:dns/py-idna@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyaml>=19.12.0:textproc/py-pyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pycryptodome>=3.9.7:security/py-pycryptodome@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyicu>=2.4.3:devel/py-pyicu@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}openssl>=19.1.0:security/py-openssl@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}redis>=3.4.1:databases/py-redis@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.23.0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests-toolbelt>=0.9.1:www/py-requests-toolbelt@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}rq>=1.2.2:devel/py-rq@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/editors/apel/Makefile b/editors/apel/Makefile
index 7006a41a2ffa..05fc7392f2ca 100644
--- a/editors/apel/Makefile
+++ b/editors/apel/Makefile
@@ -1,35 +1,35 @@
 PORTNAME=	apel
 PORTVERSION=	10.8.${SNAPDATE}
-PORTREVISION=	2
+PORTREVISION=	4
 CATEGORIES=	editors elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	nobutaka@FreeBSD.org
 COMMENT=	Portable Emacs Library
 WWW=		https://github.com/wanderlust/apel
 
 LICENSE=	GPLv2
 
 USES=		emacs
 USE_GITHUB=	yes
 GH_ACCOUNT=	wanderlust
 GH_TAGNAME=	82eb232
 
 SNAPDATE=	20220720
 NO_ARCH=	yes
 
 ALL_TARGET=	elc
 MAKE_ARGS+=	PREFIX="${STAGEDIR}${PREFIX}" \
 		LISPDIR="${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}" \
 		VERSION_SPECIFIC_LISPDIR="${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}"
 
 OPTIONS_DEFINE=	DOCS
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@(cd ${WRKSRC} ; \
 	for i in README.* ; do \
 	    ${INSTALL_DATA} $${i} ${STAGEDIR}${DOCSDIR} ; \
 	done)
 
 .include <bsd.port.mk>
diff --git a/editors/calligra/Makefile b/editors/calligra/Makefile
index ef0910a94a30..56863e2af55d 100644
--- a/editors/calligra/Makefile
+++ b/editors/calligra/Makefile
@@ -1,77 +1,77 @@
 PORTNAME=	calligra
 DISTVERSION=	3.2.1
-PORTREVISION=	49
+PORTREVISION=	50
 CATEGORIES=	editors kde
 MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTVERSION}
 DIST_SUBDIR=	KDE/${PORTNAME}
 
 PATCH_SITES=	https://invent.kde.org/office/calligra/-/commit/
 # Poppler 22.03
 PATCHFILES=	236bacbe13739414e919de868283b0caf2df5d8a.diff:-p1 \
 		6b75bec784c9835c78993349845d8c2ef22ec3de.diff:-p1
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE office suite
 WWW=		https://calligra.org/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libImath.so:math/Imath \
 		libKPropertyCore3.so:x11-toolkits/kproperty \
 		libKReport3.so:textproc/kreport \
 		libboost_thread.so:devel/boost-libs \
 		libetonyek-0.1.so:graphics/libetonyek01 \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libgsl.so:math/gsl \
 		liblcms2.so:graphics/lcms2 \
 		libKGantt.so:graphics/kdiagram \
 		libodfgen-0.1.so:textproc/libodfgen01 \
 		libpng.so:graphics/png \
 		libpoppler-qt5.so:graphics/poppler-qt5 \
 		libpoppler.so:graphics/poppler \
 		librevenge-0.0.so:textproc/librevenge \
 		libtiff.so:graphics/tiff \
 		libvisio-0.1.so:textproc/libvisio01 \
 		libwpd-0.10.so:textproc/libwpd010 \
 		libwpg-0.3.so:graphics/libwpg03 \
 		libwps-0.4.so:textproc/libwps
 
 BUILD_DEPENDS=	pstoedit:graphics/pstoedit
 RUN_DEPENDS=	pstoedit:graphics/pstoedit
 
 USES=		cmake cpe compiler:c++17-lang desktop-file-utils eigen:3 \
 		gettext iconv:translit jpeg kde:5 localbase:ldflags perl5 \
 		pkgconfig qca qt:5 shared-mime-info sqlite tar:xz xorg
 USE_KDE=	akonadicontacts activities archive auth bookmarks codecs completion \
 		config configwidgets contacts coreaddons crash dbusaddons doctools ecm \
 		emoticons guiaddons holidays i18n iconthemes init itemmodels itemviews \
 		jobwidgets js kcmutils kdelibs4support khtml kio \
 		kross notifications notifyconfig parts service solid sonnet \
 		texteditor textwidgets threadweaver unitconversion wallet \
 		widgetsaddons windowsystem xmlgui \
 		calendarcore okular
 USE_QT=		buildtools:build concurrent core dbus declarative gui network opengl \
 		phonon4 printsupport qmake:build \
 		script sql svg testlib webkit widgets x11extras xml
 USE_XORG=	ice sm x11 xext
 USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=	OPENEXR
 OPTIONS_DEFAULT=	OPENEXR
 
 OPENEXR_LIB_DEPENDS=	libOpenEXR.so:graphics/openexr
 OPENEXR_CMAKE_BOOL_OFF=	CMAKE_DISABLE_FIND_PACKAGE_OpenEXR
 
 CMAKE_ARGS=	-DCMAKE_INCLUDE_PATH:STRING="${QT_INCDIR} ${LOCALBASE}/include" \
 		-DPRODUCTSET:STRING="DESKTOP"
 
 # Requested by upstream, to not include unfinished modules
 CMAKE_ON=	RELEASE_BUILD
 # Performance increase according to README.PACKAGERS
 CMAKE_ARGS+=	-DCMAKE_CXX_FLAGS="-DKDE_NO_DEBUG_OUTPUT"
 
 PLIST_SUB+=	SHLIB_VER=17.0.0
 
 .include <bsd.port.mk>
diff --git a/editors/emacs-devel/Makefile b/editors/emacs-devel/Makefile
index 534039b5ac0a..87925361087f 100644
--- a/editors/emacs-devel/Makefile
+++ b/editors/emacs-devel/Makefile
@@ -1,291 +1,292 @@
 PORTNAME=	emacs
 DISTVERSION=	30.0.50.20230408
+PORTREVISION=	2
 PORTEPOCH=	3
 CATEGORIES=	editors
 PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	emacs@FreeBSD.org
 COMMENT=	GNU editing macros ${COMMENT_${FLAVOR}}
 WWW=		https://www.gnu.org/software/emacs/
 COMMENT_nox=	(No X flavor)
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	texinfo>=6.5,1:print/texinfo
 LIB_DEPENDS=	libgmp.so:math/gmp
 
 FLAVORS=		full nox
 full_CONFLICTS_INSTALL=	emacs-devel-nox
 nox_PKGNAMESUFFIX=	-devel-nox
 nox_CONFLICTS_INSTALL=	emacs-devel
 
 USES=		autoreconf:build cpe gmake localbase:ldflags ncurses pkgconfig
 CPE_VENDOR=	gnu
 USE_GITHUB=	yes
 GH_ACCOUNT=	emacs-mirror
 GH_TAGNAME=	9848ae1
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS=		--disable-build-details \
 			--localstatedir=/var \
 			--without-gconf \
 			--without-libsystemd \
 			--without-selinux
 .if ${FLAVOR:U} == nox
 CONFIGURE_ARGS+=	--with-sound=no \
 			--with-x-toolkit=no \
 			--without-cairo \
 			--without-dbus \
 			--without-gconf \
 			--without-gif \
 			--without-gsettings \
 			--without-imagemagick \
 			--without-jpeg \
 			--without-lcms2 \
 			--without-libotf \
 			--without-m17n-flt \
 			--without-pgtk \
 			--without-png \
 			--without-rsvg \
 			--without-tiff \
 			--without-toolkit-scroll-bars \
 			--without-webp \
 			--without-x \
 			--without-xim \
 			--without-xpm \
 			--without-xwidgets
 .else
 CONFIGURE_ARGS+=	--with-x
 .endif
 # See r468320 to determine if/when the next line can be removed
 CONFIGURE_ENV=		ac_cv_header_sys_sysinfo_h=no
 
 CONFLICTS_INSTALL=	emacs emacs-canna emacs-nox
 
 SUB_FILES=	pkg-message sources.el
 SUB_LIST=	EMACS_VER=${DISTVERSION:R} \
 		NATIVECOMP_COMMENT_END=${NATIVECOMP_COMMENT_END} \
 		NATIVECOMP_COMMENT_START=${NATIVECOMP_COMMENT_START}
 
 INFO=		auth autotype bovine calc ccmode cl dbus dired-x ebrowse ede \
 		ediff edt efaq eglot eieio eintr elisp emacs emacs-gnutls \
 		emacs-mime epa erc ert eshell eudc eww flymake forms gnus \
 		htmlfontify idlwave ido info mairix-el message mh-e \
 		modus-themes newsticker nxml-mode octave-mode org pcl-cvs pgg \
 		rcirc reftex remember sasl sc semantic ses sieve smtpmail \
 		speedbar srecode todo-mode tramp transient url use-package \
 		vhdl-mode vip viper vtable widget wisent woman
 INFO_PATH=	${DATADIR_REL}/info
 PLIST_SUB=	EMACS_VER=${DISTVERSION:R} \
 		GNU_HOST=${CONFIGURE_TARGET}
 
 OPTIONS_DEFINE=			ACL DBUS GNUTLS GSETTINGS HARFBUZZ JSON LCMS2 \
 				M17N MAILUTILS MODULES NATIVECOMP OTF PGTK \
 				SCROLLBARS SOURCES SQLITE3 THREADS TREESITTER \
 				XFT XIM XML XWIDGETS
 OPTIONS_DEFAULT=		ACL CAIRO DBUS GIF GNUTLS GSETTINGS GTK3 \
 				HARFBUZZ JPEG JSON KQUEUE LCMS2 MAILUTILS \
 				MODULES NATIVECOMP OSS PGTK PNG SCROLLBARS \
 				SOURCES SQLITE3 SVG THREADS TIFF TREESITTER \
 				WEBP XML
 OPTIONS_GROUP=			GRAPHICS
 OPTIONS_GROUP_GRAPHICS=		CAIRO GIF JPEG MAGICK PNG SVG TIFF WEBP XPM
 OPTIONS_RADIO=			FILENOTIFY SOUND X11TOOLKIT
 OPTIONS_RADIO_FILENOTIFY=	GFILE KQUEUE
 OPTIONS_RADIO_SOUND=		ALSA OSS
 OPTIONS_RADIO_X11TOOLKIT=	GTK2 GTK3 XAW XAW3D
 .if ${FLAVOR:U} == nox
 OPTIONS_EXCLUDE=		ALSA CAIRO DBUS GFILE GIF GSETTINGS GTK2 GTK3 \
 				HARFBUZZ JPEG LCMS2 M17N MAGICK OSS OTF PGTK \
 				PNG SCROLLBARS SVG TIFF WEBP XAW XAW3D XFT XIM \
 				XPM XWIDGETS
 .endif
 OPTIONS_SUB=			YES
 
 ACL_DESC=		Access control list support
 CAIRO_DESC=		Cairo graphics library support [implies PNG]
 FILENOTIFY_DESC=	File notification support
 GFILE_DESC=		File notification via gfile
 GRAPHICS_DESC=		Graphics support
 GSETTINGS_DESC=		GSettings API for application settings
 HARFBUZZ_DESC=		HarfBuzz for text shaping
 KQUEUE_DESC=		File notification via kqueue
 M17N_DESC=		M17N support for text-shaping [implies XFT]
 MAGICK_DESC=		ImageMagick image processing support (deprecated)
 MAILUTILS_DESC=		Mail framework via GNU Mailutils
 MODULES_DESC=		Dynamic modules support
 NATIVECOMP_DESC=	Emacs Lisp native compiler support (experimental)
 OTF_DESC=		Opentype fonts [implies XFT]
 PGTK_DESC=		Pure GTK GUI [implies CAIRO, GTK3]
 SCROLLBARS_DESC=	Toolkit scroll-bars
 SOURCES_DESC=		Install sources
 SVG_DESC=		Scalable vector graphics support [implies PNG]
 TREESITTER_DESC=	tree-sitter support
 X11TOOLKIT_DESC=	X11 toolkit
 XAW3D_DESC=		Athena3D widgets
 XAW_DESC=		Athena widgets
 XIM_DESC=		X Input Method
 XWIDGETS_DESC=		Experimental GTK widgets [implies GTK3]
 
 ACL_CONFIGURE_ENABLE=		acl
 ALSA_LIB_DEPENDS=		libasound.so:audio/alsa-lib
 ALSA_CONFIGURE_ON=		--with-sound=alsa
 CAIRO_IMPLIES=			PNG
 CAIRO_PREVENTS=			XFT
 CAIRO_USE=			GNOME=cairo
 CAIRO_CONFIGURE_WITH=		cairo
 DBUS_LIB_DEPENDS=		libdbus-1.so:devel/dbus
 DBUS_CONFIGURE_WITH=		dbus
 GFILE_USE=			GNOME=glib20
 GFILE_CONFIGURE_ON=		--with-file-notification=gfile
 GIF_LIB_DEPENDS=		libgif.so:graphics/giflib
 GIF_CONFIGURE_WITH=		gif
 GNUTLS_LIB_DEPENDS=		libgnutls.so:security/gnutls
 GNUTLS_CONFIGURE_WITH=		gnutls
 GSETTINGS_USE=			GNOME=glib20
 GSETTINGS_CONFIGURE_WITH=	gsettings
 GTK2_LIB_DEPENDS=		libfontconfig.so:x11-fonts/fontconfig \
 				libfreetype.so:print/freetype2
 GTK2_USE=			GNOME=cairo,gtk20
 GTK2_CONFIGURE_ON=		--with-x-toolkit=gtk2
 GTK3_LIB_DEPENDS=		libfontconfig.so:x11-fonts/fontconfig \
 				libfreetype.so:print/freetype2
 GTK3_USE=			GNOME=cairo,gtk30
 GTK3_CONFIGURE_ON=		--with-x-toolkit=gtk3
 HARFBUZZ_LIB_DEPENDS=		libharfbuzz.so:print/harfbuzz
 HARFBUZZ_CONFIGURE_WITH=	harfbuzz
 JPEG_USES=			jpeg
 JPEG_CONFIGURE_WITH=		jpeg
 JSON_LIB_DEPENDS=		libjansson.so:devel/jansson
 JSON_CONFIGURE_WITH=		json
 KQUEUE_CONFIGURE_ON=		--with-file-notification=kqueue
 LCMS2_LIB_DEPENDS=		liblcms2.so:graphics/lcms2
 LCMS2_CONFIGURE_WITH=		lcms2
 #LTO_CONFIGURE_ON=		--enable-link-time-optimization
 M17N_IMPLIES=			XFT
 M17N_LIB_DEPENDS=		libm17n.so:devel/m17n-lib
 M17N_CONFIGURE_WITH=		m17n-flt
 MAGICK_USES=			magick:7
 MAGICK_CONFIGURE_WITH=		imagemagick
 MAILUTILS_LIB_DEPENDS=		libmailutils.so:mail/mailutils
 MAILUTILS_CONFIGURE_WITH=	mailutils
 MAILUTILS_CONFIGURE_ENV_OFF=	ac_cv_lib_lockfile_maillock=no \
 				ac_cv_prog_liblockfile=no
 MODULES_CONFIGURE_WITH=		modules
 NATIVECOMP_USE=			GCC=yes
 NATIVECOMP_CONFIGURE_WITH=	native-compilation
 NATIVECOMP_MAKE_ARGS=		NATIVE_FULL_AOT=1
 OSS_CONFIGURE_ON=		--with-sound=oss
 OTF_LIB_DEPENDS=		libotf.so:print/libotf
 OTF_CONFIGURE_WITH=		libotf
 PGTK_IMPLIES=			CAIRO GTK3
 PGTK_PREVENTS=			M17N XFT XPM
 PGTK_CATEGORIES=		wayland
 PGTK_CONFIGURE_WITH=		pgtk
 PNG_LIB_DEPENDS=		libpng.so:graphics/png
 PNG_CONFIGURE_WITH=		png
 SCROLLBARS_CONFIGURE_WITH=	toolkit-scroll-bars
 SQLITE3_USES=			sqlite:3
 SQLITE3_CONFIGURE_WITH=		sqlite3
 SVG_IMPLIES=			PNG
 SVG_USE=			GNOME=cairo,librsvg2
 SVG_CONFIGURE_WITH=		rsvg
 THREADS_CONFIGURE_WITH=		threads
 TIFF_LIB_DEPENDS=		libtiff.so:graphics/tiff
 TIFF_CONFIGURE_WITH=		tiff
 TREESITTER_LIB_DEPENDS=		libtree-sitter.so:devel/tree-sitter
 TREESITTER_CONFIGURE_WITH=	tree-sitter
 WEBP_LIB_DEPENDS=		libwebp.so:graphics/webp
 WEBP_CONFIGURE_WITH=		webp
 XAW3D_LIB_DEPENDS=		libXaw3d.so:x11-toolkits/Xaw3d
 XAW3D_CONFIGURE_ON=		--with-x-toolkit=athena
 XAW_USE=			XORG=xaw
 XAW_CONFIGURE_ON=		--with-x-toolkit=athena \
 				--without-xaw3d
 XFT_LIB_DEPENDS=		libfontconfig.so:x11-fonts/fontconfig \
 				libfreetype.so:print/freetype2
 XFT_USE=			XORG=xft,xrender
 XFT_CONFIGURE_WITH=		xft
 XIM_CONFIGURE_WITH=		xim
 # keep XML_USES=gnome, because nox flavor does not have USES=gnome
 XML_USES=			gnome
 XML_USE=			GNOME=libxml2
 XML_CONFIGURE_WITH=		xml2
 XPM_USE=			XORG=xpm
 XPM_CONFIGURE_WITH=		xpm
 XWIDGETS_IMPLIES=		GTK3
 XWIDGETS_LIB_DEPENDS=		libsoup-2.4.so:devel/libsoup \
 				libwebkit2gtk-4.0.so:www/webkit2-gtk3
 XWIDGETS_USE=			XORG=xcomposite
 XWIDGETS_CONFIGURE_WITH=	xwidgets
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH:Mpowerpc64*}
 USE_GCC=	yes
 .endif
 
 .if ${PORT_OPTIONS:MNATIVECOMP}
 NATIVECOMP_COMMENT_END=
 NATIVECOMP_COMMENT_START=
 .else
 NATIVECOMP_COMMENT_END=		'*/'
 NATIVECOMP_COMMENT_START=	'/*'
 .endif
 
 .if ${FLAVOR:U} != nox
 USES+=		desktop-file-utils gnome
 .if !${PORT_OPTIONS:MPGTK}
 USES+=		xorg
 USE_XORG+=	ice sm x11 xcb xcomposite xext xfixes xi xinerama xmu xrandr \
 		xrender xt
 .endif
 .endif
 
 .if !${PORT_OPTIONS:MGTK2} && !${PORT_OPTIONS:MGTK3} && !${PORT_OPTIONS:MXAW} && \
 	!${PORT_OPTIONS:MXAW3D}
 CONFIGURE_ARGS+=	--with-x-toolkit=no
 .endif
 
 # Schema generation is dependent on both PGTK, and GSETTINGS options
 # as per https://git.savannah.gnu.org/cgit/emacs.git/commit/?id=183936ee8e5
 .if ${PORT_OPTIONS:MGSETTINGS} && ${PORT_OPTIONS:MPGTK}
 GLIB_SCHEMAS+=	org.gnu.emacs.defaults.gschema.xml
 .endif
 
 .if ${FLAVOR} == nox
 # With a desktop entry stage-qa will give a warning about requiring
 # desktop-file-utils and portlint -C will give a warning about INSTALLS_ICONS,
 # but don't pull in those dependencies with the nox flavor.
 post-patch:
 	@${REINPLACE_CMD} -e 's/^Terminal=.*$$/Terminal=true/' ${WRKSRC}/etc/emacs.desktop
 .endif
 
 pre-configure:
 	@(cd ${WRKSRC} && ./autogen.sh all)
 	@${REINPLACE_CMD} \
 	  -e '/emacs-repository-version/s/^.*$$/(setq emacs-repository-version "${GH_TAGNAME}")/' \
 	  -e '/emacs-repository-branch/s/^.*$$/(setq emacs-repository-branch "master")/' \
 	  ${WRKSRC}/lisp/loadup.el
 
 post-install:
 	@${RM} -r ${STAGEDIR}${PREFIX}/lib/systemd
 	@(cd ${STAGEDIR}${PREFIX} && ${FIND} libexec/emacs/${DISTVERSION:R}/${CONFIGURE_TARGET}/ -name emacs-*.pdmp >> ${TMPPLIST})
 
 post-install-MAILUTILS-on:
 	${LN} -sf ${PREFIX}/bin/movemail \
 		${STAGEDIR}${PREFIX}/libexec/emacs/${DISTVERSION:R}/${CONFIGURE_TARGET}
 
 # Natively compiled elisp files names include build checksum information, so add
 # these files to the plist after the build.
 post-install-NATIVECOMP-on:
 	@(cd ${WRKSRC} && ${FIND} native-lisp -type f | ${SED} -e 's,^,lib/emacs/${DISTVERSION:R}/,') >> ${TMPPLIST}
 	@${FIND} ${STAGEDIR}${PREFIX}/lib/emacs/${DISTVERSION:R}/native-lisp/ -name '*.eln*' -exec ${STRIP_CMD} {} +
 
 post-install-SOURCES-on:
 	@${MKDIR} ${STAGEDIR}${DATADIR}/${DISTVERSION:R}/src
 	${INSTALL_DATA} ${WRKSRC}/src/*.[ch] ${STAGEDIR}${DATADIR}/${DISTVERSION:R}/src
 	${INSTALL_DATA} ${WRKDIR}/sources.el ${STAGEDIR}${DATADIR}/${DISTVERSION:R}/site-lisp/site-start.el
 
 .include <bsd.port.mk>
diff --git a/editors/flim/Makefile b/editors/flim/Makefile
index fd5224cb2466..c9eefe4f7fd8 100644
--- a/editors/flim/Makefile
+++ b/editors/flim/Makefile
@@ -1,56 +1,56 @@
 PORTNAME=	flim
 PORTVERSION=	1.14.9.${SNAPDATE}
-PORTREVISION=	2
+PORTREVISION=	4
 PORTEPOCH=	1
 CATEGORIES=	editors elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	nobutaka@FreeBSD.org
 COMMENT=	Message representation or encoding elisp library for emacs
 WWW=		https://github.com/wanderlust/flim
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	apel${EMACS_PKGNAMESUFFIX}>0:editors/apel@${EMACS_FLAVOR}
 RUN_DEPENDS=	apel${EMACS_PKGNAMESUFFIX}>0:editors/apel@${EMACS_FLAVOR}
 
 USES=		cpe emacs iconv makeinfo
 USE_GITHUB=	yes
 GH_ACCOUNT=	wanderlust
 GH_TAGNAME=	b27f4ae
 
 SNAPDATE=	20220720
 CPE_VENDOR=	gnu
 NO_ARCH=	yes
 
 ALL_TARGET=	elc
 
 MAKE_ARGS+=	PREFIX="${STAGEDIR}${PREFIX}" \
 		LISPDIR="${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}" \
 		VERSION_SPECIFIC_LISPDIR="${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}" \
 		PACKAGE_LISPDIR=NONE
 
 INFO=		mime-en mime-ja
 
 OPTIONS_DEFINE=	DOCS
 
 post-build:
 	@(cd ${WRKSRC} ; \
 	for i in mime-en.texi mime-ja.texi; do \
 		${MAKEINFO} --no-split --no-validate $${i} ; \
 	done)
 
 post-install:
 	@(cd ${WRKSRC} ; \
 	for i in mime-en.info mime-ja.info; do \
 		${INSTALL_DATA} ${WRKSRC}/$${i} ${STAGEDIR}${PREFIX}/${INFO_PATH} ; \
 	done)
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@(cd ${WRKSRC} ; \
 	for i in NEWS README.* VERSION ; do \
 		${INSTALL_DATA} $${i} ${STAGEDIR}${DOCSDIR}/ ; \
 	done)
 
 .include <bsd.port.mk>
diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile
index 66c488a4c218..d4a02a207aab 100644
--- a/editors/libreoffice/Makefile
+++ b/editors/libreoffice/Makefile
@@ -1,395 +1,395 @@
-PORTREVISION=	2
+PORTREVISION=	3
 
 .include "${.CURDIR}/Makefile.common"
 
 MASTER_SITES=	https://download.documentfoundation.org/libreoffice/src/${LOVERSION}/ \
 		https://dev-www.libreoffice.org/src/:src \
 		https://dev-www.libreoffice.org/extern/:ext
 DISTFILES=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \
 		${PORTNAME}-help-${DISTVERSION}${EXTRACT_SUFX}
 DIST_SUBDIR=	libreoffice
 EXTRACT_ONLY:=	${DISTFILES}
 
 COMMENT=	Full integrated office productivity suite
 WWW?=		https://www.libreoffice.org/
 
 BUILD_DEPENDS=	p5-Archive-Zip>=0:archivers/p5-Archive-Zip \
 		zip:archivers/zip \
 		${LOCALBASE}/include/sqlext.h:databases/unixODBC \
 		cppunit-config:devel/cppunit \
 		dmake:devel/dmake \
 		gperf>=3.1:devel/gperf \
 		${LOCALBASE}/include/libcuckoo/cuckoohash_map.hh:devel/libcuckoo \
 		libunwind>=20211201_1:devel/libunwind \
 		mdds>=2.0:devel/mdds \
 		ucpp:devel/ucpp \
 		${LOCALBASE}/include/sane/sane.h:graphics/sane-backends \
 		vigra-config:graphics/vigra \
 		${LOCALBASE}/include/glm/glm.hpp:math/glm \
 		bash:shells/bash \
 		gsed:textproc/gsed \
 		${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
 		coreutils>=8.23:sysutils/coreutils \
 		flex>=0.26:textproc/flex
 LIB_DEPENDS=	libapr-1.so:devel/apr1 \
 		libboost_date_time.so:devel/boost-libs \
 		libbox2d.so:misc/box2d \
 		libicutu.so:devel/icu \
 		liblangtag.so:devel/liblangtag \
 		libltdl.so:devel/libltdl \
 		liborcus-0.17.so:devel/liborcus \
 		libplds4.so:devel/nspr \
 		libcurl.so:ftp/curl \
 		libgraphite2.so:graphics/graphite2 \
 		liblcms2.so:graphics/lcms2 \
 		libcdr-0.1.so:graphics/libcdr01 \
 		libepoxy.so:graphics/libepoxy \
 		libetonyek-0.1.so:graphics/libetonyek01 \
 		libfreehand-0.1.so:graphics/libfreehand \
 		libwpg-0.3.so:graphics/libwpg03 \
 		libzmf-0.0.so:graphics/libzmf \
 		libpng.so:graphics/png \
 		libpoppler.so:graphics/poppler \
 		libwebp.so:graphics/webp \
 		liblpsolve55.so:math/lp_solve \
 		libcmis-0.5.so:net/libcmis \
 		libfreetype.so:print/freetype2 \
 		libharfbuzz.so:print/harfbuzz \
 		libharfbuzz-icu.so:print/harfbuzz-icu \
 		libmspub-0.1.so:print/libmspub01 \
 		libpagemaker-0.0.so:print/libpagemaker \
 		libassuan.so:security/libassuan \
 		libgpgme.so:security/gpgme \
 		libgpgmepp.so:security/gpgme-cpp \
 		libgpg-error.so:security/libgpg-error \
 		libnss3.so:security/nss \
 		libxmlsec1-nss.so:security/xmlsec1 \
 		libclucene-core.so:textproc/clucene \
 		libexpat.so:textproc/expat2 \
 		libhunspell-1.7.so:textproc/hunspell \
 		libhyphen.so:textproc/hyphen \
 		libabw-0.1.so:textproc/libabw \
 		libe-book-0.1.so:textproc/libe-book \
 		libepubgen-0.1.so:textproc/libepubgen \
 		libexttextcat-2.0.so:textproc/libexttextcat \
 		libmwaw-0.3.so:textproc/libmwaw03 \
 		libnumbertext-1.0.so:textproc/libnumbertext \
 		libodfgen-0.1.so:textproc/libodfgen01 \
 		libqxp-0.0.so:textproc/libqxp \
 		librevenge-0.0.so:textproc/librevenge \
 		libstaroffice-0.0.so:textproc/libstaroffice \
 		libvisio-0.1.so:textproc/libvisio01 \
 		libwpd-0.10.so:textproc/libwpd010 \
 		libwps-0.4.so:textproc/libwps \
 		libmythes-1.2.so:textproc/mythes \
 		libraptor2.so:textproc/raptor2 \
 		librdf.so:textproc/redland \
 		libZXing.so:textproc/zxing-cpp \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libxcb-icccm.so:x11/xcb-util-wm \
 		libserf-1.so:www/serf
 
 RUN_DEPENDS=	xdg-open:devel/xdg-utils \
 		${LOCALBASE}/share/fonts/Caladea/Caladea-Bold.ttf:x11-fonts/crosextrafonts-caladea-ttf \
 		${LOCALBASE}/share/fonts/Carlito/Carlito-Bold.ttf:x11-fonts/crosextrafonts-carlito-ttf \
 		${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf:x11-fonts/dejavu \
 		${LOCALBASE}/share/fonts/twemoji-color-font-ttf/TwitterColorEmoji-SVGinOT.ttf:x11-fonts/twemoji-color-font-ttf \
 		${LOCALBASE}/share/fonts/GentiumBasic/GenBasI.ttf:x11-fonts/gentium-basic \
 		${LOCALBASE}/share/fonts/Liberation/LiberationMono-Bold.ttf:x11-fonts/liberation-fonts-ttf \
 		${LOCALBASE}/share/fonts/LinLibertineG/LinLibertine_DR_G.ttf:x11-fonts/linuxlibertine-g
 
 DISTFILES+=	f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf:ext
 DISTFILES+=	dtoa-20180411.tgz:src
 DISTFILES+=	dragonbox-1.1.3.tar.gz:src
 DISTFILES+=	skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz:src
 
 NOT_FOR_ARCHS=		armv6 armv7
 NOT_FOR_ARCHS_REASON=	Unsupported host_cpu
 
 .if defined(PRERELEASE)
 MASTER_SITES+=	https://dev-builds.libreoffice.org/pre-releases/src/
 .endif
 
 CONFLICTS_INSTALL=	libreoffice6
 
 INSTALL_TARGET=	distro-pack-install
 
 SHEBANG_GLOB=	*.py
 
 GNU_CONFIGURE=	yes
 USES=		autoreconf:build bison compiler:c++17-lang cpe desktop-file-utils \
 		gettext gl gmake gnome jpeg ldap localbase:ldflags perl5 pkgconfig \
 		python:3.8+ shebangfix shared-mime-info ssl tar:xz xorg
 USE_GL=		gl glew glu
 USE_GNOME=	cairo glib20 libxml2 libxslt
 USE_PERL5=	build
 USE_XORG=	ice sm x11 xaw xcb xext xinerama xrandr xrender
 
 OPTIONS_DEFINE=	COINMP CUPS DOCS GNOME GTK3 GTK4 JAVA KF5 LTO MMEDIA PDFIUM PGSQL MARIADB SDK TEST WEBDAV
 OPTIONS_RADIO=	QT
 OPTIONS_RADIO_QT=	QT5 QT6
 OPTIONS_DEFAULT=	CUPS DOCS JAVA MMEDIA PDFIUM QT5
 #OPTIONS_EXCLUDE=	GTK4
 
 COINMP_DESC=	Enable CoinMP (deprecated) math solver
 GTK4_DESC=	GTK+ 4 GUI toolkit support (experimental, broken)
 JAVA_DESC=	Add Java support (XML filters, macros, DB connections)
 KF5_DESC=	KF5/Qt5 GUI toolkit support (implies QT5)
 MMEDIA_DESC=	Enable multimedia backend for Impress
 PDFIUM_DESC=	Enable PDFium secure engine
 PGSQL_DESC=	Build with PostgreSQL-SDBC driver
 MARIADB_DESC=	Build with MariaDB/MySQL-SDBC driver
 QT_DESC=	Select Qt GUI engine version
 QT5_DESC=	Qt5 GUI toolkit support (default visual style)
 QT6_DESC=	Qt6 GUI toolkit support (experimental visual style)
 SDK_DESC=	Build with SDK
 TEST_DESC=	Run all regression tests
 WEBDAV_DESC=	Enable WebDAV protocol
 
 COINMP_CONFIGURE_ENABLE=	coinmp
 COINMP_CONFIGURE_ON=	--with-system-coinmp
 COINMP_LIB_DEPENDS=	libCoinMP.so:math/coinmp
 
 CUPS_CONFIGURE_ENABLE=	cups
 CUPS_LIB_DEPENDS=	libcups.so:print/cups
 
 DOCS_CONFIGURE_ON=	--with-help=html
 
 GNOME_CONFIGURE_ENABLE=	dbus dconf
 GNOME_IMPLIES=	GTK3
 GNOME_LIB_DEPENDS=	libdbus-1.so:devel/dbus \
 			libdbus-glib-1.so:devel/dbus-glib
 GNOME_USE=	GNOME=dconf
 
 GTK3_CONFIGURE_ENABLE=	gtk3
 GTK3_USE=	GNOME=gtk30
 
 GTK4_CONFIGURE_ENABLE=	gtk4
 GTK4_USE=	GNOME=gtk40
 
 JAVA_BUILD_DEPENDS=	ant:devel/apache-ant \
 			${JAVAJARDIR}/commons-codec.jar:java/apache-commons-codec \
 			${JAVAJARDIR}/commons-httpclient.jar:java/apache-commons-httpclient \
 			${JAVAJARDIR}/commons-lang3.jar:java/apache-commons-lang3 \
 			${JAVAJARDIR}/commons-logging.jar:java/apache-commons-logging \
 			${JAVAJARDIR}/junit.jar:java/junit
 JAVA_CATEGORIES=	java
 JAVA_CONFIGURE_ON=	--with-ant-home=${LOCALBASE}/share/java/apache-ant \
 			--with-commons-codec-jar=${JAVAJARDIR}/commons-codec.jar \
 			--with-commons-httpclient-jar=${JAVAJARDIR}/commons-httpclient.jar \
 			--with-commons-lang-jar=${JAVAJARDIR}/commons-lang3.jar \
 			--with-commons-logging-jar=${JAVAJARDIR}/commons-logging.jar \
 			--with-jdk-home="${JAVA_HOME}" \
 			--with-junit=${JAVAJARDIR}/junit.jar \
 			--with-hamcrest=${JAVAJARDIR}/hamcrest.jar \
 			--with-system-jars \
 			--without-system-beanshell \
 			--without-system-jfreereport
 JAVA_CONFIGURE_WITH=	java
 # XXX jni.h from GNU classpath causes ABI conflicts.
 JAVA_CONFLICTS_BUILD=	classpath-[0-9]*
 JAVA_DISTFILES=	17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip:src \
 		3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip:src \
 		35c94d2df8893241173de1d16b6034c0-swingExSrc.zip:src \
 		39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip:src \
 		3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip:src \
 		798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip:src \
 		8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar:ext \
 		8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip:src \
 		97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip:src \
 		a084cd548b586552cb7d3ee51f1af969-odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar:ext \
 		ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip:src \
 		ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip:src \
 		beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip:src \
 		d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip:src \
 		db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip:src \
 		eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip:src \
 		f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip:src
 JAVA_USE=	JAVA=yes
 JAVA_VARS=	JAVA_BUILD=yes JAVA_RUN=yes JAVA_VERSION=11+
 
 KF5_CONFIGURE_ENABLE=	kf5
 KF5_USE=	kde=config,coreaddons,i18n,kio,windowsystem
 KF5_USES=	kde:5
 KF5_IMPLIES=	QT5
 
 LTO_CONFIGURE_ENABLE=	lto
 
 MMEDIA_USES=		gstreamer
 MMEDIA_CONFIGURE_ENABLE=	gstreamer-1-0
 
 PDFIUM_CONFIGURE_ENABLE=	pdfium
 PDFIUM_DISTFILES=	pdfium-5408.tar.bz2:src
 PDFIUM_LIB_DEPENDS=	libabsl_strings.so:devel/abseil \
 			libopenjp2.so:graphics/openjpeg
 
 PGSQL_CONFIGURE_ENABLE=	postgresql-sdbc
 PGSQL_CONFIGURE_WITH=	gssapi krb5
 PGSQL_USES=	pgsql
 
 MARIADB_CONFIGURE_ENABLE=	mariadb-sdbc
 MARIADB_USES=	mysql:client
 
 QT5_CONFIGURE_ENABLE=	qt5
 QT5_USE=	qt=buildtools:build,core,gui,network,qmake:build,widgets,x11extras
 QT5_USES=	qt:5
 
 QT6_CONFIGURE_ENABLE=	qt6
 QT6_CONFIGURE_ENV=	QMAKE6=${QMAKE} MOC6=${MOC} PATH="${QT_TOOLDIR}:${PATH}"
 QT6_PREVENTS=	KF5
 QT6_PREVENTS_MSG=	KF5 support require Qt5 engine
 QT6_USE=	qt=base,declarative:build,tools:build
 QT6_USES=	qt:6
 
 SDK_BUILD_DEPENDS=	doxygen:devel/doxygen
 SDK_CONFIGURE_ENABLE=	odk
 SDK_CONFIGURE_OFF=	--without-doxygen
 SDK_CONFIGURE_ON=	--with-doxygen=${LOCALBASE}/bin/doxygen
 SDK_DISTFILES=	185d60944ea767075d27247c3162b3bc-unowinreg.dll:ext
 
 TEST_ALL_TARGET=	build
 TEST_ALL_TARGET_OFF=	build
 TEST_CONFIGURE_ENABLE=	cve-tests
 
 WEBDAV_CONFIGURE_ON=	--with-webdav=neon
 WEBDAV_CONFIGURE_OFF=	--with-webdav=no
 WEBDAV_LIB_DEPENDS=	libneon.so:www/neon
 
 CONFIGURE_ARGS=	--disable-dependency-tracking \
 		--disable-epm \
 		--disable-fetch-external \
 		--disable-firebird-sdbc \
 		--disable-mergelibs \
 		--disable-online-update \
 		--enable-cairo-canvas \
 		--enable-python=system \
 		--enable-release-build \
 		--enable-extension-integration \
 		--disable-mpl-subset \
 		--disable-report-builder \
 		--exec-prefix=${PREFIX} \
 		--with-boost=${LOCALBASE} \
 		--with-build-version="FreeBSD ports ${PKGVERSION}" \
 		--with-external-dict-dir=${LOCALBASE}/share/hunspell \
 		--with-external-hyph-dir=${LOCALBASE}/share/hyphen \
 		--with-external-tar=${DISTDIR}/${DIST_SUBDIR} \
 		--with-external-thes-dir=${LOCALBASE}/share/mythes \
 		--with-os-version=${OSVERSION} \
 		--with-parallelism=${MAKE_JOBS_NUMBER} \
 		--with-system-abseil \
 		--with-system-cppunit \
 		--with-system-cuckoo \
 		--with-system-curl \
 		--with-system-dicts \
 		--with-system-dragonbox=no \
 		--with-system-gpgmepp \
 		--with-system-libfixmath=no \
 		--with-system-libs \
 		--with-system-libtiff \
 		--with-system-libxml \
 		--with-system-mdds \
 		--with-system-nss \
 		--with-system-openjpeg \
 		--with-system-orcus \
 		--with-system-ucpp \
 		--with-system-zlib \
 		--with-system-zxing \
 		--with-tls=nss \
 		--with-vendor="FreeBSD ports" \
 		--without-fonts \
 		--without-myspell-dicts
 
 CONFIGURE_ENV=	DMAKE=${LOCALBASE}/bin/dmake \
 		FLEX=${LOCALBASE}/bin/flex \
 		CONFIG_SHELL=${LOCALBASE}/bin/bash \
 		GNUTAR="${TAR}" \
 		GPERF=${LOCALBASE}/bin/gperf \
 		ICU_CFLAGS="`icu-config --cflags`" \
 		ICU_LIBS="`icu-config --ldflags`" \
 		PYTHON_CFLAGS="`${PYTHON_VERSION}-config --cflags`" \
 		PYTHON_LIBS="`${PYTHON_VERSION}-config --libs`" \
 		ZXING_CFLAGS="-I${LOCALBASE}/include/ZXing \
 		CPLUS_INCLUDE_PATH="-I${LOCALBASE}/include \
 		ac_cv_path_SED=${LOCALBASE}/bin/gsed
 
 CONFIGURE_SHELL=	${LOCALBASE}/bin/bash
 MAKE_SHELL=		${LOCALBASE}/bin/bash
 
 MAKE_ARGS+=	TMPDIR=${WRKDIR}
 MAKE_ENV+=	CXXFLAGS_WARN="${CXXFLAGS_WARN}"
 MAKE_ENV+=	GNUSED=${LOCALBASE}/bin/gsed
 MAKE_ENV+=	DISPLAY=
 MAKE_ENV+=	verbose=1
 
 BINARY_ALIAS=	sed=gsed
 
 #MAKE_JOBS_UNSAFE=	yes
 
 .include <bsd.port.options.mk>
 
 .include <bsd.port.pre.mk>
 
 .if ${OPSYS} == FreeBSD && ( \
     (${OSVERSION} >= 1300525 && ${OSVERSION} < 1301000) || \
     (${OSVERSION} >= 1301500 && ${OSVERSION} < 1301502) || \
     (${OSVERSION} >= 1400051 && ${OSVERSION} < 1400057))
 BROKEN=	please update FreeBSD base system first to fix an ABI incompatibility
 .endif
 
 .if ${ARCH:Mpowerpc*}
 EXTRA_PATCHES+=	${FILESDIR}/powerpc64
 .endif
 
 .if ${ARCH} == powerpc || ${ARCH} == powerpcspe || ${ARCH} == powerpc64
 CONFIGURE_ARGS+=	--disable-skia
 .endif
 
 .if ${PORT_OPTIONS:MGTK3} && ${PORT_OPTIONS:MKF5}
 CONFIGURE_ARGS+=	--enable-gtk3-kde5
 .endif
 
 .if ${PORT_OPTIONS:MLTO} && ${CHOSEN_COMPILER_TYPE} == clang && ${COMPILER_VERSION} < 130
 LLVM_DEFAULT=	13
 CPP=	${LOCALBASE}/bin/clang-cpp${LLVM_DEFAULT}
 CC=	${LOCALBASE}/bin/clang${LLVM_DEFAULT}
 CXX=	${LOCALBASE}/bin/clang++${LLVM_DEFAULT}
 BUILD_DEPENDS+=	${LOCALBASE}/bin/clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
 LLD_UNSAFE=	yes
 .endif
 
 .if ${CHOSEN_COMPILER_TYPE} == clang
 CXXFLAGS_WARN=	-Woverloaded-virtual -Wno-c++11-narrowing \
 		-Wno-unused-parameter -Wno-unused-local-typedefs
 .else
 CXXFLAGS_WARN=	-Wshadow -Woverloaded-virtual
 .endif
 
 post-patch:
 .if ${COMPILER_FEATURES:Mlibstdc++}
 	${REINPLACE_CMD} -e 's/gb_CC/gb_CXX/' ${WRKSRC}/solenv/gbuild/platform/unxgcc.mk
 .endif
 
 pre-configure:
 	@${TOUCH} ${WRKSRC}/autogen.lastrun
 
 post-configure:
 	@${TOUCH} ${WRKSRC}/src.downloaded
 
 post-install:
 	@cd ${STAGEDIR}${PREFIX} && \
 	${FIND} -s lib/libreoffice -type d -empty \
 	    -exec ${ECHO_CMD} "@dir {}" \; >> ${TMPPLIST}
 	@cd ${STAGEDIR}${PREFIX} && \
 	${FIND} -s bin lib man -not -type d >> ${TMPPLIST}
 .for subdir in applications bash-completion icons metainfo mime
 	@cd ${STAGEDIR}${PREFIX} && \
 	${FIND} -s share/${subdir} -not -type d >> ${TMPPLIST}
 .endfor
 
 post-install-SDK-on:
 .for subdir in include share share/doc
 	@cd ${STAGEDIR}${PREFIX} && \
 	${FIND} -s ${subdir}/libreoffice -not -type d >> ${TMPPLIST}
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/editors/openoffice-4/Makefile b/editors/openoffice-4/Makefile
index fa78c44e61ae..553c720c2835 100644
--- a/editors/openoffice-4/Makefile
+++ b/editors/openoffice-4/Makefile
@@ -1,530 +1,530 @@
 PORTNAME=	apache-openoffice
 PORTVERSION=	${AOOVERSION}
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	editors java
 MASTER_SITES=	https://dlcdn.apache.org/openoffice/${PORTVERSION}/source/ \
 		https://archive.apache.org/dist/openoffice/${PORTVERSION}/source/ \
 		http://tools.openoffice.org/unowinreg_prebuild/680/:unoreg \
 		LOCAL/truckman/openoffice:extsrc \
 		SF/oooextras.mirror/:sf
 .if defined(LANG_PKGNAME)
 PKGNAMEPREFIX=		${LANG_PKGNAME}-
 .endif
 .if defined(LANG_SUFFIX)
 PKGNAMESUFFIX=		-${LANG_SUFFIX}
 .endif
 DISTFILES=	${AOOSRC} ${EXTSRC}:extsrc ${PYTHON_DISTFILE}:sf \
 		${GCC_EXTRA_DISTFILES:C/.*/&:sf/g}
 DIST_SUBDIR=	openoffice
 EXTRACT_ONLY=	${AOOSRC}
 
 MAINTAINER=	office@FreeBSD.org
 #de facto maintainer is truckman@FreeBSD.org
 #Frequent Patch submitters should (optionally) sign the Apache iCLA
 COMMENT=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser
 WWW=		https://openoffice.apache.org/
 
 LICENSE=		APACHE20 ADOBE BSD3CLAUSE BSD4CLAUSE BSL ICU MIT MPL10 \
 			MPL11 PSFL TWAIN W3C
 LICENSE_COMB=		multi
 LICENSE_NAME_ADOBE=	Adobe Systems Incorporated license
 LICENSE_NAME_ICU=	ICU License
 LICENSE_NAME_TWAIN=	TWAIN Working Group license
 LICENSE_NAME_W3C=	W3C license
 LICENSE_FILE_APACHE20=	${WRKSRC}/LICENSE_ALv2
 LICENSE_FILE_ADOBE=	${WRKSRC}/LICENSE_ADOBE
 LICENSE_FILE_BSD3CLAUSE=	${WRKSRC}/LICENSE_BSD3CLAUSE
 LICENSE_FILE_BSD4CLAUSE=	${WRKSRC}/LICENSE_BSD4CLAUSE
 LICENSE_FILE_BSL=	${WRKSRC}/LICENSE_BSL
 LICENSE_FILE_ICU=	${WRKSRC}/LICENSE_ICU
 LICENSE_FILE_MIT=	${WRKSRC}/LICENSE_MIT
 LICENSE_FILE_MPL10=	${WRKSRC}/LICENSE_MPL10
 LICENSE_FILE_MPL11=	${WRKSRC}/LICENSE_MPL11
 LICENSE_FILE_PSFL=	${WRKSRC}/LICENSE_PSFL
 LICENSE_FILE_TWAIN=	${WRKSRC}/LICENSE_TWAIN
 LICENSE_FILE_W3C=	${WRKSRC}/LICENSE_W3C
 LICENSE_PERMS_ADOBE=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 LICENSE_PERMS_ICU=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 LICENSE_PERMS_TWAIN=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 LICENSE_PERMS_W3C=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 ONLY_FOR_ARCHS=	amd64 i386 powerpc64
 
 BUILD_DEPENDS=								\
 		p5-Archive-Zip>=0:archivers/p5-Archive-Zip		\
 		${LOCALBASE}/bin/unzip:archivers/unzip			\
 		zip:archivers/zip					\
 		ant:devel/apache-ant					\
 		dmake:devel/dmake					\
 		epm:devel/epm						\
 		${LOCALBASE}/bin/gperf:devel/gperf			\
 		imake:devel/imake					\
 		libunwind>=20211201_1:devel/libunwind			\
 		gpatch:devel/patch					\
 		${LOCALBASE}/include/sane/sane.h:graphics/sane-backends	\
 		${JAVALIBDIR}/commons-lang.jar:java/apache-commons-lang \
 		${JAVALIBDIR}/junit.jar:java/junit			\
 		${JAVALIBDIR}/bsh.jar:lang/bsh				\
 		bash:shells/bash					\
 		${JAVALIBDIR}/lucene-core-3.6.2.jar:textproc/lucene	\
 		p5-XML-Parser>=0:textproc/p5-XML-Parser			\
 		p5-libwww>=0:www/p5-libwww				\
 		p5-LWP-Protocol-https>0:www/p5-LWP-Protocol-https
 LIB_DEPENDS=								\
 		libapr-1.so:devel/apr1					\
 		libnspr4.so:devel/nspr					\
 		libcurl.so:ftp/curl					\
 		libcairo.so:graphics/cairo				\
 		libpng.so:graphics/png					\
 		libgraphite.so:graphics/silgraphite			\
 		libblas.so:math/blas					\
 		libCbcSolver.so:math/cbc				\
 		libCgl.so:math/cgl					\
 		libcoinasl.so:math/asl					\
 		libClpSolver.so:math/clp				\
 		libCoinMP.so:math/coinmp				\
 		libCoinUtils.so:math/coinutils				\
 		libcoinmumps.so:math/coin-or-mumps			\
 		libnauty.so:math/nauty					\
 		libopenblas.so:math/openblas				\
 		libOsi.so:math/osi					\
 		libfreetype.so:print/freetype2				\
 		libharfbuzz.so:print/harfbuzz				\
 		libnss3.so:security/nss					\
 		libexpat.so:textproc/expat2				\
 		libhunspell-1.7.so:textproc/hunspell			\
 		libhyphen.so:textproc/hyphen				\
 		libtextcat.so:textproc/libtextcat			\
 		libmythes-1.2.so:textproc/mythes			\
 		librdf.so:textproc/redland				\
 		libserf-1.so:www/serf					\
 		libfontconfig.so:x11-fonts/fontconfig
 RUN_DEPENDS=								\
 		${LOCALBASE}/share/icons/hicolor/index.theme:misc/hicolor-icon-theme \
 		${JAVALIBDIR}/commons-lang.jar:java/apache-commons-lang \
 		${JAVALIBDIR}/bsh.jar:lang/bsh				\
 		${LOCALBASE}/share/fonts/Caladea/Caladea-Bold.ttf:x11-fonts/crosextrafonts-caladea-ttf \
 		${LOCALBASE}/share/fonts/Carlito/Carlito-Bold.ttf:x11-fonts/crosextrafonts-carlito-ttf \
 		${LOCALBASE}/share/fonts/ChromeOS/Arimo-Bold.ttf:x11-fonts/croscorefonts-fonts-ttf
 # For libgfortran.so and libquadmath.so
 BUILD_DEPENDS+=	gcc${GCC_DEFAULT}>0:lang/gcc${GCC_DEFAULT}
 RUN_DEPENDS+=	gcc${GCC_DEFAULT}>0:lang/gcc${GCC_DEFAULT}
 
 USES=		autoreconf bison compiler:c++11-lib cpe desktop-file-utils \
 		gettext-runtime gl gmake gnome iconv jpeg perl5 pkgconfig \
 		shared-mime-info ssl tar:bzip2 xorg
 USE_GL=		gl glu
 USE_GNOME=	gdkpixbuf2 gdkpixbuf2xlib gtk20 libxslt libidl glib20
 USE_JAVA=	yes
 JAVA_BUILD=	jdk
 JAVA_RUN=	jdk
 JAVA_VENDOR=	openjdk
 USE_PERL5=	build
 USE_XORG=	ice sm x11 xau xaw xcomposite xcursor xdamage xext xfixes xi \
 		xinerama xrandr xrender xt
 
 CONFLICTS_INSTALL=	apache-openoffice-devel
 
 AOOVERSION1=	4
 AOOVERSION2=	1
 AOOVERSION3=	14
 # From solenv/inc/minor.mk SOURCEREVISION LAST_MINOR BUILD
 AOOTAG=		AOO4114m1\(Build:9811\)
 GITREVISION=	a0d24fb625
 EXTSRC=		ApacheOpenOffice.ext_sources.${AOOVERSION1}.x.x.20150707.tar.gz
 
 AOOVERSION=	${AOOVERSION1}.${AOOVERSION2}.${AOOVERSION3}
 AOOXXX=		${AOOVERSION1}${AOOVERSION2}${AOOVERSION3}
 AOOSUFFIX=	${PORTVERSION}
 AOOSRC=		apache-openoffice-${AOOVERSION}-${GITREVISION}-src${EXTRACT_SUFX}
 
 AOOUDIR=		.openoffice.org\/${AOOVERSION1}
 INSTALLATION_BASEDIR?=	openoffice-${AOOSUFFIX}
 PRINSTALLATION_BASEDIR=	${PREFIX}/${INSTALLATION_BASEDIR}
 OOPATH=			${PRINSTALLATION_BASEDIR}/openoffice${AOOVERSION1}
 XDGDIR=			${OOPATH}/share/xdg
 XDGREL=			../../${INSTALLATION_BASEDIR}/openoffice${AOOVERSION1}/share/xdg
 EXECBASE?=		openoffice-${AOOSUFFIX}
 
 WITHOUT_CPU_CFLAGS=	true
 CPE_PRODUCT=	${PORTNAME:S|apache-||}
 CPE_VENDOR=	apache
 
 OPTIONS_DEFINE=		CRASHDUMP CUPS DBGUTIL DEBUG GNOME \
 			SDK WIKI_PUBLISHER
 OPTIONS_DEFAULT=	CUPS GNOME WIKI_PUBLISHER
 CRASHDUMP_DESC=		Enable crashdumps, you also need to set WITH_DEBUG_PORTS+=${PKGORIGIN}
 DBGUTIL_DESC=		Enable assertions, object counting. (non-production)
 DEBUG_DESC=		Compile with -O0, you also need to set WITH_DEBUG_PORTS+=${PKGORIGIN}
 GNOME_DESC=		Screensaver presentation control via DBUS
 SDK_DESC=		Build and install software development kit
 WIKI_PUBLISHER_DESC=	Build and install Wiki Publisher extension
 
 CRASHDUMP_CONFIGURE_ENABLE=	crashdump
 
 CUPS_CONFIGURE_ENABLE=		cups
 CUPS_LIB_DEPENDS=		libcups.so:print/cups
 
 DBGUTIL_CONFIGURE_ENABLE=	dbgutil
 
 DEBUG_CONFIGURE_ENABLE=		debug
 
 GNOME_CONFIGURE_ENABLE=		dbus lockdown
 GNOME_LIB_DEPENDS=		libdbus-1.so:devel/dbus \
 				libdbus-glib-1.so:devel/dbus-glib
 
 SDK_CONFIGURE_ENABLE=		odk
 SDK_DISTFILES=			unowinreg.dll:unoreg
 
 WIKI_PUBLISHER_CONFIGURE_ENABLE=	wiki-publisher
 WIKI_PUBLISHER_CONFIGURE_WITH=						\
 	commons-codec-jar=${JAVALIBDIR}/commons-codec.jar		\
 	commons-httpclient-jar=${JAVALIBDIR}/commons-httpclient.jar	\
 	commons-logging-jar=${JAVALIBDIR}/commons-logging.jar
 WIKI_PUBLISHER_JAR_DEPENDS=						\
 	${JAVALIBDIR}/commons-codec.jar:java/apache-commons-codec	\
 	${JAVALIBDIR}/commons-httpclient.jar:java/apache-commons-httpclient \
 	${JAVALIBDIR}/commons-logging.jar:java/apache-commons-logging
 WIKI_PUBLISHER_BUILD_DEPENDS=	${WIKI_PUBLISHER_JAR_DEPENDS}
 WIKI_PUBLISHER_RUN_DEPENDS=	${WIKI_PUBLISHER_JAR_DEPENDS}
 WIKI_PUBLISHER_VARS=	BUNDLED_EXTENSIONS+=swext/wiki-publisher.oxt
 
 # Don't run gnome-post-icons until after post-install generates the plist
 TARGET_ORDER_OVERRIDE=	710:gnome-post-icons
 
 # Force the SDK option on for makesum to ensure that unowinreg.dll is
 # included in distinfo
 .if make(makesum) || make(distclean)
 WITH=	SDK
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${OPSYS} == FreeBSD && ( \
     (${OSVERSION} >= 1301500 && ${OSVERSION} < 1301502) || \
     (${OSVERSION} >= 1400051 && ${OSVERSION} < 1400057))
 BROKEN=	please update FreeBSD base system first to fix an ABI incompatibility
 .endif
 
 .if defined(WITH_DEBUG)
 CONFIGURE_ARGS+=	--enable-symbols
 .endif
 
 .include <${FILESDIR}/Makefile.localized>
 
 PYTHON_DISTFILE=	38c84292658ed4456157195f1c9bcbe1-Python-2.7.18.tgz
 GCC_EXTRA_DISTFILES=	d6eef4b4cacb2183f2bf265a5a03a354-boost_1_55_0.tar.bz2 \
 			d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz
 
 .if ${CHOSEN_COMPILER_TYPE} == clang
 CPPFLAGS+=		-I${LOCALBASE}/include
 . if ${ARCH} == amd64
 EXTRA_PATCHES+=		${FILESDIR}/extra-patch-align16
 . endif
 .endif
 
 .if ${ARCH} == amd64
 FREEBSD_ENV_SET=	FreeBSDAMDEnv.Set.sh
 PACKAGE_MIDDLE=		${PORTVERSION}_${OPSYS}_x86-64
 .elif ${ARCH} == i386
 FREEBSD_ENV_SET=	FreeBSDX86Env.Set.sh
 PACKAGE_MIDDLE=		${PORTVERSION}_${OPSYS}_x86
 .elif ${ARCH} == powerpc64
 FREEBSD_ENV_SET=	FreeBSDPPC64Env.Set.sh
 PACKAGE_MIDDLE=		${PORTVERSION}_${OPSYS}_ppc64
 .endif
 PACKAGE_PREFIX=		Apache_OpenOffice
 
 LOCALIZED_LANG?=	en-US
 
 AOO_MAKE_ENV=	${MAKE_ENV:NCPPFLAGS=*:NCFLAGS=*:NCXXFLAGS=*:NLDFLAGS=*}
 
 GNU_CONFIGURE=	yes
 WRKSUBDIR=	${WRKDIR}/aoo-${AOOVERSION}
 WRKSRC?=	${WRKSUBDIR}/main
 SUB_FILES=	pkg-message
 SUB_LIST=	EXECBASE=${EXECBASE} AOOTAG=${AOOTAG} AOOUDIR=${AOOUDIR} \
 		AOOVERSION=${AOOVERSION}				\
 		PRINSTALLATION_BASEDIR=${PRINSTALLATION_BASEDIR}
 
 CONFIGURE_ARGS+=							\
 			--disable-gconf					\
 			--enable-gio					\
 			--disable-gnome-vfs				\
 			--with-unix-wrapper=${EXECBASE}			\
 			--with-alloc=system				\
 			--with-ant-home=${LOCALBASE}/share/java/apache-ant \
 			--with-system-apache-commons=yes		\
 			--with-commons-lang-jar=${JAVALIBDIR}/commons-lang.jar \
 			--with-system-apr				\
 			--with-system-apr-util				\
 			--with-system-beanshell				\
 			--with-beanshell-jar=${JAVALIBDIR}/bsh.jar	\
 			--enable-category-b				\
 			--with-system-cairo --enable-cairo		\
 			--with-system-coinmp				\
 			--with-system-curl				\
 			--with-system-dicts				\
 			--with-epm=${LOCALBASE}/bin/epm			\
 			--with-system-expat				\
 			--disable-fetch-external			\
 			--without-fonts					\
 			--with-gnu-patch=${LOCALBASE}/bin/gpatch	\
 			--with-gperf=${LOCALBASE}/bin/gperf		\
 			--with-system-graphite				\
 			--enable-gtk					\
 			--with-system-hunspell				\
 			--with-external-dict-dir=${LOCALBASE}/share/hunspell \
 			--with-system-hyphen				\
 			--with-external-hyph-dir=${LOCALBASE}/share/hyphen \
 			--with-jdk-home=${JAVA_HOME}			\
 			--with-system-jpeg				\
 			--with-junit=${JAVALIBDIR}/junit.jar		\
 			--with-system-libtextcat			\
 			--disable-kde					\
 			--disable-kde4					\
 			--with-system-libxml				\
 			--with-system-libxslt				\
 			--with-system-lucene				\
 			--with-lucene-core-jar=${JAVALIBDIR}/lucene-core-3.6.2.jar \
 			--with-lucene-analyzers-jar=${JAVALIBDIR}/lucene-analyzers-3.6.2.jar \
 			--with-system-mythes				\
 			--with-external-thes-dir=${LOCALBASE}/share/mythes \
 			--with-system-nss				\
 			--enable-opengl					\
 			--with-system-openssl				\
 			--with-package-format="archive"			\
 			--without-system-python				\
 			--with-system-redland				\
 			--with-system-sane				\
 			--with-system-serf				\
 			--with-system-stdlibs				\
 			--with-vendor="FreeBSD ports system"		\
 			--with-build-version="PKGNAME: ${PKGNAME:S/,/@/g}" \
 			--enable-verbose				\
 			--with-system-xrender				\
 			--with-system-zlib
 
 .if defined (BUNDLED_EXTENSIONS)
 CONFIGURE_ARGS+=	--with-bundled-prereg-extensions="${BUNDLED_EXTENSIONS}"
 .endif
 
 CREATE_TREE=	${WRKSRC}/sysui/desktop/share/create_tree.sh
 
 .include <${FILESDIR}/Makefile.knobs>
 
 pre-everything::
 # really tweak, extremely useful when you build all localized language versions
 # needed after when you build with ALL_LOCALIZED_LANGS.
 .if defined(TWEAK_L10N)
 	${RM} ${WRKDIR}/.PLIST*
 	${RM} ${WRKDIR}/.install_done.*
 	${RM} ${WRKDIR}/.package_done.*
 	${RM} ${WRKDIR}/.extract_done.*
 	${RM} ${WRKDIR}/.patch_done.*
 	${RM} ${WRKDIR}/.configure_done.*
 	${RM} ${WRKDIR}/.build_done.*
 	${MKDIR} ${WRKDIR}
 	${TOUCH} ${EXTRACT_COOKIE}
 	${TOUCH} ${PATCH_COOKIE}
 	${TOUCH} ${CONFIGURE_COOKIE}
 	${TOUCH} ${BUILD_COOKIE}
 .endif
 
 do-extract-SDK-on:
 	${CP} ${DISTDIR}/${DIST_SUBDIR}/unowinreg.dll ${WRKSRC}/external/unowinreg/
 
 post-extract:
 	${TAR} -C ${WRKSUBDIR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${EXTSRC}
 	${CP} ${DISTDIR}/${DIST_SUBDIR}/${PYTHON_DISTFILE} ${WRKSUBDIR}/ext_sources/${PYTHON_DISTFILE}
 .for f in ${GCC_EXTRA_DISTFILES}
 	${CP} ${DISTDIR}/${DIST_SUBDIR}/${f} ${WRKSUBDIR}/ext_sources/${f}
 .endfor
 	${CP} ${FILESDIR}/freebsd-aoo-intro.png \
 		${WRKSRC}/default_images/introabout/intro.png
 	${CP} ${FILESDIR}/freebsd-aoo-about.png \
 		${WRKSRC}/default_images/introabout/about.png
 	${RM} -r ${WRKSRC}/l10n
 	${LN} -sf ${UNZIP_CMD} ${WRKSRC}/solenv/bin/unzip
 	${SED}  -e '\|^For main/vcl/unx/generic/fontmanager/parseAFM|,/^__/p' \
 		-e '\|^For PostScript(R) AFM|,/^__/p'			\
 		-e d  ${WRKSRC}/LICENSE > ${LICENSE_FILE_ADOBE}
 	${SED}  -e '\|^For main/unixODBC|,/^__/p'			\
 		-e '\|^For main/connectivity|,/^__/p'			\
 		-e '\|^For main/libtextcat/data|,/^__/p'		\
 		-e '\|^For integration of HSQLDB|,/^__/p'		\
 		-e '\|^For C preprocessor|,/^__/p'			\
 		-e d  ${WRKSRC}/LICENSE > ${LICENSE_FILE_BSD3CLAUSE}
 	${SED}  -e '\|^For ICC |,/^__/p'				\
 		-e d  ${WRKSRC}/LICENSE > ${LICENSE_FILE_BSD4CLAUSE}
 	${SED}  -e '\|^For integration of the C++ Boost |,/^__/p'	\
 		-e d  ${WRKSRC}/LICENSE > ${LICENSE_FILE_BSL}
 	${SED}  -e '\|^For main/i18npool/source/breakiterator|,/^__/p'	\
 		-e d  ${WRKSRC}/LICENSE > ${LICENSE_FILE_ICU}
 	${SED}  -e '\|^For Multi-Dimensional Data|,/^__/p'		\
 		-e '\|^For XSLT MathML Library|,/^__/p'			\
 		-e d  ${WRKSRC}/LICENSE > ${LICENSE_FILE_MIT}
 	${SED}  -e '\|^For XMLSec Library|,/^__/p'			\
 		-e d  ${WRKSRC}/LICENSE_category_b >> ${LICENSE_FILE_MIT}
 	${SED}  -e '\|^For Saxon|,/^__/p'				\
 		-e d ${WRKSRC}/LICENSE_category_b > ${LICENSE_FILE_MPL10}
 	${SED}  -e '\|^The following Licenses have some restrictions|,/^- For Network/p' \
 		-e d ${WRKSRC}/LICENSE_category_b |			\
 		${SED} -e :a -e '$d;N;2,3ba' -e 'P;D' > ${LICENSE_FILE_MPL11}
 	${SED}  -e '\|^For main/filter/source/config/tools/merge/pyAltFCFGMerge|,/^__/p'	\
 		-e d  ${WRKSRC}/LICENSE > ${LICENSE_FILE_PSFL}
 	${ECHO} '' >> ${LICENSE_FILE_PSFL}
 	${SED}  -e '\|^For Python|,/^__/p'	\
 		-e d  ${WRKSRC}/LICENSE >> ${LICENSE_FILE_PSFL}
 	${SED}  -e '\|^For main/twain|,/^__/p'				\
 		-e d  ${WRKSRC}/LICENSE > ${LICENSE_FILE_TWAIN}
 	${SED}  -e '\|^For main/MathMLDTD|,/^__/p'			\
 		-e d  ${WRKSRC}/LICENSE > ${LICENSE_FILE_W3C}
 
 post-patch:
 	${REINPLACE_CMD} -e "/^ICONVERSION/s/=.*/= '${AOOVERSION1}'/" \
 		${WRKSRC}/sysui/desktop/productversion.mk
 	${REINPLACE_CMD} -e "s|%%JAVA_HOME%%|${JAVA_HOME}|" \
 		${WRKSRC}/desktop/scripts/soffice.sh
 	${REINPLACE_CMD} -e '/^mkdir -p/,$$d' ${CREATE_TREE}
 .if ${CHOSEN_COMPILER_TYPE} == gcc
 	# g++49 -Os sometimes leaves inline class methods undefined,
 	# affects fmgridif.cxx and ColumnControl.cxx
 	# See: <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=65009>
 	if [ ${CXX} = g++49  ]; then \
 		${REINPLACE_CMD} -e "s/ := -Os/ := -Os -fno-devirtualize -fno-devirtualize-speculatively/" ${WRKSRC}/solenv/gbuild/platform/freebsd.mk; \
 		${REINPLACE_CMD} -e "s/=-Os /=-Os -fno-devirtualize -fno-devirtualize-speculatively /" ${WRKSRC}/solenv/inc/unxfbsdi.mk; \
 	fi
 .elif ${ARCH} == i386 && ${CHOSEN_COMPILER_TYPE} == clang
 	# autodoc and uno (bridgetest) core dump when built with with -Os
 	# on i386, affects file.cxx and bridgetest.cxx (at least).
 	# Using -O2 optimiztion works, and -Os is essentially -O2 with out
 	# loop unrolling.
 	# Changing optimization in just unxfbsdi.mk is sufficient to get
 	# a successful build, but change it in both places to avoid the
 	# possibility of obscure runtime problems, which is likely
 	# since this seems to be a generic bug in code generation for
 	# exception handling.
 	# See: <https://llvm.org/bugs/show_bug.cgi?id=24792>
 	${REINPLACE_CMD} -e "s/=-Os /=-O2 -fno-unroll-loops /" ${WRKSRC}/solenv/inc/unxfbsdi.mk
 	${REINPLACE_CMD} -e "s/ := -Os/ := -O2 -fno-unroll-loops/" ${WRKSRC}/solenv/gbuild/platform/freebsd.mk
 .endif
 
 # Verify that lucene was built with the CONTRIB option instead of
 # failing mysteriously during the build
 pre-configure:
 	@if [ ! -f ${JAVALIBDIR}/lucene-analyzers-3.6.2.jar ]; then \
 		${ECHO} "error: textproc/lucene must be built with the CONTRIB option enabled"; \
 		exit 1; \
 	fi
 
 do-build:
 	${PRINTF} "[repositories]\nmain=active\nextras=active\n" > ${WRKSUBDIR}/source_config
 	cd ${WRKSRC} ; ./bootstrap
 	#
 	# numproc controls the number of parallel makes.
 	#
 	# dmproc is passed to dmake and controls parallelization at that
 	# level.
 	#
 	# dmproc > numproc seems to give shorter build times than
 	# numproc > dmproc.
 	#
 	# Select values for numproc and dmproc such that:
 	#  * numproc*dmproc >= MAKE_JOBS_NUMBER
 	#  * minimize numproc*dmproc-MAKE_JOBS_NUMBER
 	#  * dmproc >= numproc
 	#  * dmproc <= 2*numproc if MAKE_JOBS_NUMBER <= 3
 	#
 	if [ ${MAKE_JOBS_NUMBER} -le 3 ] ; then				  \
 	 numproc=1 ; dmproc=${MAKE_JOBS_NUMBER} ;			  \
 	else								  \
 	 a=1 ;								  \
 	 while [ $$(( 2 * $${a} * $${a} )) -lt ${MAKE_JOBS_NUMBER} ]; do  \
 	  a=$$(( $${a} + 1 )) ;						  \
 	 done ;								  \
 	 b=$$(( $${a} + 1 )) ;						  \
 	 ad=$$(( ( ${MAKE_JOBS_NUMBER} + $${a} - 1 ) / $${a} )) ;	  \
 	 ap=$$(( $${a} * $${ad} )) ;					  \
 	 bd=$$(( ( ${MAKE_JOBS_NUMBER} + $${b} - 1 ) / $${b} )) ;	  \
 	 bp=$$(( $${b} * $${bd} )) ;					  \
 	 if [ $${ap} -le $${bp} ]; then					  \
 	  numproc=$${a} ; dmproc=$${ad} ;				  \
 	 else								  \
 	  numproc=$${b} ; dmproc=$${bd} ;				  \
 	 fi ;								  \
 	fi ;								  \
 	cd ${WRKSRC}/instsetoo_native ;					  \
 	export ${AOO_MAKE_ENV} ;					  \
 	. ../${FREEBSD_ENV_SET} ;					  \
 	build.pl --all -P$${numproc} -- -P$${dmproc}
 
 PYDL=	${STAGEDIR}${OOPATH}/program/python-core-2.7.18/lib/lib-dynload
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PRINSTALLATION_BASEDIR} \
 		${STAGEDIR}${PREFIX}/share/mime/packages
 	@cd ${WRKSRC} ; \
 		. ${FREEBSD_ENV_SET} ; \
 		cd instsetoo_native/$${INPATH}/Apache_OpenOffice/archive/install/${LOCALIZED_LANG}/ ; \
 		for i in *.tar.?z ; do \
 			${ECHO_CMD} "extracting $$i" ; \
 			${TAR} -s '|./[^/]*/||' -xz -f $$i \
 				-C ${STAGEDIR}${PRINSTALLATION_BASEDIR} ; \
 		done
 	${RM} ${PYDL}/_sqlite3.so ${PYDL}/gdbm.so ${PYDL}/readline.so
 	${FIND} ${STAGEDIR}${PRINSTALLATION_BASEDIR} -type d -exec ${CHMOD} 755 {} \;
 	${REINPLACE_CMD} \
 		-e '/^UserInstallation/s/=.*/=$$SYSUSERCONFIG\/${AOOUDIR}/' \
 		${STAGEDIR}${OOPATH}/program/bootstraprc
 	@${RM} ${STAGEDIR}${OOPATH}/program/bootstraprc.bak
 	@${ECHO_CMD} "adding wrapper scripts";
 	@${CP} ${FILESDIR}/openoffice-wrapper ${WRKDIR}/
 	@${REINPLACE_CMD} -e 's#%%OOPATH%%#${OOPATH}#g' \
 			-e 's#%%EXECBASE%%#${EXECBASE}#g' \
 			${WRKDIR}/openoffice-wrapper
 	${INSTALL_SCRIPT} ${WRKDIR}/openoffice-wrapper \
 		${STAGEDIR}${PREFIX}/bin/${EXECBASE}
 	@cd ${STAGEDIR}${PREFIX}/bin; for i in printeradmin sbase scalc sdraw \
 		simpress smath spadmin swriter ; do \
 			${LN} -f ${EXECBASE} ${EXECBASE}-$${i} ; \
 	done
 	@${ECHO_CMD} "adding desktop support"
 	@cd ${WRKSRC} ;						\
 	    . ${FREEBSD_ENV_SET} ;				\
 	    cd sysui/$${INPATH}/misc/openoffice ;		\
 	    DESTDIR=${STAGEDIR}					\
 		GNOMEDIR=${PREFIX}				\
 		ICON_PREFIX=openoffice${AOOVERSION1}		\
 		ICON_SOURCE_DIR=${WRKSRC}/sysui/desktop/icons	\
 		ICON_THEMES="hicolor/??x??"			\
 		KDEMAINDIR=${PREFIX}				\
 		PREFIX=openoffice${AOOVERSION1}			\
 		${SH} ${CREATE_TREE} ;				\
 	    ${INSTALL_DATA} apacheopenoffice.xml		\
 		${STAGEDIR}/${PREFIX}/share/mime/packages
 	@cd ${STAGEDIR}${DESKTOPDIR}; for i in base calc draw impress \
 		javafilter math printeradmin qstart startcenter writer ; do \
 			${LN} -sf ${XDGREL}/$${i}.desktop ${EXECBASE}-$${i}.desktop ; \
 	done
 
 do-install-SDK-on:
 	${TAR} -s '|./[^/]*/||' -xz -C ${STAGEDIR}${PRINSTALLATION_BASEDIR} \
 		-f ${WRKSRC}/instsetoo_native/unxfbsd*.pro/Apache_OpenOffice_SDK/archive/install/${LOCALIZED_LANG}/*.tar.gz
 	@f=${STAGEDIR}${OOPATH}/sdk/bin/unoapploader ; \
 		${CHMOD} 644 $${f} ; ${STRIP_CMD} $${f} ; ${CHMOD} 444 $${f}
 
 post-install:
 	@${ECHO_CMD} "generating plist";
 	@cd ${STAGEDIR}${PREFIX} ; (\
 		${FIND} -s bin -name "${EXECBASE}*" ; \
 		${FIND} -s ${INSTALLATION_BASEDIR} share/applications \
 			share/application-registry share/icons \
 			share/mime-info share/mime share/mimelnk \! -type d ; \
 		${FIND} ${INSTALLATION_BASEDIR} -type d -empty | ${SORT} -r | \
 			${SED} -e 's/^/@dir /' ; \
 	) >> ${TMPPLIST}
 
 .include <${FILESDIR}/Makefile.others>
 
 .include <bsd.port.post.mk>
diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile
index 21f3a7170163..96db60407225 100644
--- a/editors/openoffice-devel/Makefile
+++ b/editors/openoffice-devel/Makefile
@@ -1,532 +1,532 @@
 PORTNAME=	apache-openoffice
 PORTVERSION=	${AOOVERSION1}.${AOOVERSION2}.${TIMESTAMP}
-PORTREVISION=	0
+PORTREVISION=	1
 PORTEPOCH=	4
 CATEGORIES=	editors java
 MASTER_SITES=	https://dist.apache.org/repos/dist/dev/openoffice/${AOOVERSION}-${AOORC}-${TIMESTAMP}/source/ \
 		http://tools.openoffice.org/unowinreg_prebuild/680/:unoreg \
 		LOCAL/truckman/openoffice:snap,extsrc \
 		SF/oooextras.mirror/:sf
 .if defined(LANG_PKGNAME)
 PKGNAMEPREFIX=		${LANG_PKGNAME}-
 .endif
 .if defined(LANG_SUFFIX)
 PKGNAMESUFFIX=		-${LANG_SUFFIX}
 .endif
 PKGNAMESUFFIX=		-devel
 DISTFILES=	${AOOSRC}${AOODISTTAG} ${EXTSRC}:extsrc \
 		${GCC_EXTRA_DISTFILES:C/.*/&:sf/g}
 DIST_SUBDIR=	openoffice
 EXTRACT_ONLY=	${AOOSRC}
 
 MAINTAINER=	office@FreeBSD.org
 #de facto maintainer is truckman@FreeBSD.org
 #Frequent Patch submitters should (optionally) sign the Apache iCLA
 COMMENT=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser (developer version)
 WWW=		https://openoffice.apache.org/
 
 LICENSE=		APACHE20 ADOBE BSD3CLAUSE BSD4CLAUSE BSL ICU MIT MPL10 \
 			MPL11 PSFL TWAIN W3C
 LICENSE_COMB=		multi
 LICENSE_NAME_ADOBE=	Adobe Systems Incorporated license
 LICENSE_NAME_ICU=	ICU License
 LICENSE_NAME_TWAIN=	TWAIN Working Group license
 LICENSE_NAME_W3C=	W3C license
 LICENSE_FILE_APACHE20=	${WRKSRC}/LICENSE_ALv2
 LICENSE_FILE_ADOBE=	${WRKSRC}/LICENSE_ADOBE
 LICENSE_FILE_BSD3CLAUSE=	${WRKSRC}/LICENSE_BSD3CLAUSE
 LICENSE_FILE_BSD4CLAUSE=	${WRKSRC}/LICENSE_BSD4CLAUSE
 LICENSE_FILE_BSL=	${WRKSRC}/LICENSE_BSL
 LICENSE_FILE_ICU=	${WRKSRC}/LICENSE_ICU
 LICENSE_FILE_MIT=	${WRKSRC}/LICENSE_MIT
 LICENSE_FILE_MPL10=	${WRKSRC}/LICENSE_MPL10
 LICENSE_FILE_MPL11=	${WRKSRC}/LICENSE_MPL11
 LICENSE_FILE_PSFL=	${WRKSRC}/LICENSE_PSFL
 LICENSE_FILE_TWAIN=	${WRKSRC}/LICENSE_TWAIN
 LICENSE_FILE_W3C=	${WRKSRC}/LICENSE_W3C
 LICENSE_PERMS_ADOBE=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 LICENSE_PERMS_ICU=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 LICENSE_PERMS_TWAIN=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 LICENSE_PERMS_W3C=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 ONLY_FOR_ARCHS=	amd64 i386 powerpc64
 BROKEN_powerpc64=	fails to compile: aoo-4.2.0/main/solver/420/unxfbsdppc64.pro/inc/stl/vector:31:11: fatal error: boost/tr1/tr1/vector: No such file or directory
 
 BUILD_DEPENDS=								\
 		p5-Archive-Zip>=0:archivers/p5-Archive-Zip		\
 	${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs \
 		${LOCALBASE}/bin/unzip:archivers/unzip			\
 		zip:archivers/zip					\
 		ant:devel/apache-ant					\
 		dmake:devel/dmake					\
 		epm:devel/epm						\
 		${LOCALBASE}/bin/gperf:devel/gperf			\
 		imake:devel/imake					\
 		libunwind>=20211201_1:devel/libunwind			\
 		gpatch:devel/patch					\
 		${LOCALBASE}/include/sane/sane.h:graphics/sane-backends	\
 		${JAVALIBDIR}/commons-lang3.jar:java/apache-commons-lang3 \
 		${JAVALIBDIR}/junit.jar:java/junit			\
 		${JAVALIBDIR}/bsh.jar:lang/bsh				\
 		bash:shells/bash					\
 		${JAVALIBDIR}/lucene-core-3.6.2.jar:textproc/lucene	\
 		p5-XML-Parser>=0:textproc/p5-XML-Parser			\
 		p5-libwww>=0:www/p5-libwww				\
 		p5-LWP-Protocol-https>0:www/p5-LWP-Protocol-https
 LIB_DEPENDS=								\
 		libapr-1.so:devel/apr1					\
 		libnspr4.so:devel/nspr					\
 		libcurl.so:ftp/curl					\
 		libcairo.so:graphics/cairo				\
 		libpng.so:graphics/png					\
 		libgraphite.so:graphics/silgraphite			\
 		libblas.so:math/blas					\
 		libCbcSolver.so:math/cbc				\
 		libCgl.so:math/cgl					\
 		libcoinasl.so:math/asl					\
 		libClpSolver.so:math/clp				\
 		libCoinMP.so:math/coinmp				\
 		libCoinUtils.so:math/coinutils				\
 		libcoinmumps.so:math/coin-or-mumps			\
 		libnauty.so:math/nauty					\
 		libopenblas.so:math/openblas				\
 		libOsi.so:math/osi					\
 		libfreetype.so:print/freetype2				\
 		libharfbuzz.so:print/harfbuzz				\
 		libnss3.so:security/nss					\
 		libexpat.so:textproc/expat2				\
 		libhunspell-1.7.so:textproc/hunspell			\
 		libhyphen.so:textproc/hyphen				\
 		libtextcat.so:textproc/libtextcat			\
 		libmythes-1.2.so:textproc/mythes			\
 		librdf.so:textproc/redland				\
 		libserf-1.so:www/serf					\
 		libfontconfig.so:x11-fonts/fontconfig
 RUN_DEPENDS=								\
 		${LOCALBASE}/share/icons/hicolor/index.theme:misc/hicolor-icon-theme \
 		${JAVALIBDIR}/commons-lang3.jar:java/apache-commons-lang3 \
 		${JAVALIBDIR}/bsh.jar:lang/bsh				\
 		${LOCALBASE}/share/fonts/Caladea/Caladea-Bold.ttf:x11-fonts/crosextrafonts-caladea-ttf \
 		${LOCALBASE}/share/fonts/Carlito/Carlito-Bold.ttf:x11-fonts/crosextrafonts-carlito-ttf \
 		${LOCALBASE}/share/fonts/ChromeOS/Arimo-Bold.ttf:x11-fonts/croscorefonts-fonts-ttf
 # For libgfortran.so and libquadmath.so
 BUILD_DEPENDS+=	gcc${GCC_DEFAULT}>0:lang/gcc${GCC_DEFAULT}
 RUN_DEPENDS+=	gcc${GCC_DEFAULT}>0:lang/gcc${GCC_DEFAULT}
 
 USES=		autoreconf bison compiler:c++11-lib cpe desktop-file-utils \
 		gettext-runtime gl gmake gnome iconv jpeg perl5 pkgconfig \
 		python:3.9 shared-mime-info ssl tar:${TARTYPE} xorg
 USE_GL=		gl glu
 USE_GNOME=	gdkpixbuf2 gdkpixbuf2xlib gtk20 libxslt libidl glib20
 USE_JAVA=	yes
 JAVA_BUILD=	jdk
 JAVA_RUN=	jdk
 JAVA_VENDOR=	openjdk
 USE_PERL5=	build
 USE_XORG=	ice sm x11 xau xaw xcomposite xcursor xdamage xext xfixes xi \
 		xinerama xrandr xrender xt
 
 CONFLICTS_INSTALL=	apache-openoffice-4*
 
 AOOVERSION1=	4
 AOOVERSION2=	2
 AOOVERSION3=	0
 # From solenv/inc/minor.mk SOURCEREVISION LAST_MINOR BUILD
 AOOTAG=		AOO420m4\(Build:9823\)
 GITREVISION=	e501375395
 TIMESTAMP=	1678061694
 #AOORC=rc3
 EXTSRC=		ApacheOpenOffice.ext_sources.${AOOVERSION1}.x.x.20150707.tar.gz
 
 AOOVERSION=	${AOOVERSION1}.${AOOVERSION2}.${AOOVERSION3}
 AOOXXX=		${AOOVERSION1}${AOOVERSION2}${AOOVERSION3}
 .if defined(AOORC)
 AOOSUFFIX=	${AOOVERSION}-${AOORC}
 AOOSRC=		apache-openoffice-${AOOVERSION}-${GITREVISION}-src${EXTRACT_SUFX}
 AOODISTTAG=
 TARTYPE=	bzip2
 .else
 AOOSUFFIX=	${PORTVERSION}
 AOOSRC=		apache-openoffice-${TIMESTAMP}-${GITREVISION}-src${EXTRACT_SUFX}
 AOODISTTAG=	:snap
 TARTYPE=	xz
 .endif
 
 AOOUDIR=		.openoffice.org\/${AOOVERSION1}
 INSTALLATION_BASEDIR?=	openoffice-${AOOSUFFIX}
 PRINSTALLATION_BASEDIR=	${PREFIX}/${INSTALLATION_BASEDIR}
 OOPATH=			${PRINSTALLATION_BASEDIR}/openoffice${AOOVERSION1}
 XDGDIR=			${OOPATH}/share/xdg
 XDGREL=			../../${INSTALLATION_BASEDIR}/openoffice${AOOVERSION1}/share/xdg
 EXECBASE?=		openoffice-${AOOSUFFIX}
 
 WITHOUT_CPU_CFLAGS=	true
 CPE_PRODUCT=	${PORTNAME:S|apache-||}
 CPE_VENDOR=	apache
 
 OPTIONS_DEFINE=		CRASHDUMP CUPS DBGUTIL DEBUG GNOME MMEDIA \
 			MYSQL PDFIMPORT REPORT_BUILDER SDK WIKI_PUBLISHER
 OPTIONS_DEFAULT=	CUPS GNOME MMEDIA WIKI_PUBLISHER
 CRASHDUMP_DESC=		Enable crashdumps, you also need to set WITH_DEBUG_PORTS+=${PKGORIGIN}
 DBGUTIL_DESC=		Enable assertions, object counting. (non-production)
 DEBUG_DESC=		Compile with -O0, you also need to set WITH_DEBUG_PORTS+=${PKGORIGIN}
 GNOME_DESC=		Screensaver presentation control via DBUS
 MMEDIA_DESC=		Multimedia backend for impress
 MYSQL_DESC=		Build MySQL Connector extension
 PDFIMPORT_DESC=		Build and install PDF import extension
 REPORT_BUILDER_DESC=	Build and install Report builder extension (Broken)
 SDK_DESC=		Build and install software development kit
 WIKI_PUBLISHER_DESC=	Build and install Wiki Publisher extension
 
 CRASHDUMP_CONFIGURE_ENABLE=	crashdump
 
 CUPS_CONFIGURE_ENABLE=		cups
 CUPS_LIB_DEPENDS=		libcups.so:print/cups
 
 DBGUTIL_CONFIGURE_ENABLE=	dbgutil
 
 DEBUG_CONFIGURE_ENABLE=		debug
 
 GNOME_CONFIGURE_ENABLE=		dbus lockdown
 GNOME_LIB_DEPENDS=		libdbus-1.so:devel/dbus \
 				libdbus-glib-1.so:devel/dbus-glib
 
 MMEDIA_CONFIGURE_ENABLE=	gstreamer
 MMEDIA_USES=			gstreamer
 
 MYSQL_CONFIGURE_ENABLE=		mysql-connector
 MYSQL_CONFIGURE_WITH=		system-mysql
 MYSQL_LIB_DEPENDS=		libmysqlcppconn.so:databases/mysql-connector-c++
 MYSQL_USES=			mysql
 
 SDK_CONFIGURE_ENABLE=		odk
 SDK_DISTFILES=			unowinreg.dll:unoreg
 
 PDFIMPORT_BROKEN=		PDFIMPORT is not compatible with poppler-0.7x API
 PDFIMPORT_CONFIGURE_ENABLE=	pdfimport
 
 REPORT_BUILDER_BROKEN=		REPORT_BUILDER option requires additional .jar files
 REPORT_BUILDER_CONFIGURE_ENABLE=	report-builder
 REPORT_BUILDER_JAR_DEPENDS=
 REPORT_BUILDER_BUILD_DEPENDS=	${REPORT_BUILDER_JAR_DEPENDS}
 REPORT_BUILDER_RUN_DEPENDS=	${REPORT_BUILDER_JAR_DEPENDS}
 
 WIKI_PUBLISHER_CONFIGURE_ENABLE=	wiki-publisher
 WIKI_PUBLISHER_CONFIGURE_WITH=						\
 	commons-codec-jar=${JAVALIBDIR}/commons-codec.jar		\
 	commons-httpclient-jar=${JAVALIBDIR}/commons-httpclient.jar
 WIKI_PUBLISHER_JAR_DEPENDS=						\
 	${JAVALIBDIR}/commons-codec.jar:java/apache-commons-codec	\
 	${JAVALIBDIR}/commons-httpclient.jar:java/apache-commons-httpclient
 WIKI_PUBLISHER_BUILD_DEPENDS=	${WIKI_PUBLISHER_JAR_DEPENDS}
 WIKI_PUBLISHER_RUN_DEPENDS=	${WIKI_PUBLISHER_JAR_DEPENDS}
 
 # Don't run gnome-post-icons until after post-install generates the plist
 TARGET_ORDER_OVERRIDE=	710:gnome-post-icons
 
 # Force the SDK option on for makesum to ensure that unowinreg.dll is
 # included in distinfo
 .if make(makesum) || make(distclean)
 WITH=	SDK
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${OPSYS} == FreeBSD && ( \
     (${OSVERSION} >= 1301500 && ${OSVERSION} < 1301502) || \
     (${OSVERSION} >= 1400051 && ${OSVERSION} < 1400057))
 BROKEN=	please update FreeBSD base system first to fix an ABI incompatibility
 .endif
 
 .if defined(WITH_DEBUG)
 CONFIGURE_ARGS+=	--enable-symbols
 .endif
 
 .if ${PORT_OPTIONS:MREPORT_BUILDER} || ${PORT_OPTIONS:MWIKI_PUBLISHER}
 BUILD_DEPENDS+=	${JAVALIBDIR}/commons-logging.jar:java/apache-commons-logging
 RUN_DEPENDS+=	${JAVALIBDIR}/commons-logging.jar:java/apache-commons-logging
 CONFIGURE_ARGS+=	--with-commons-logging-jar=${JAVALIBDIR}/commons-logging.jar
 .else
 CONFIGURE_ARGS+=	--without-commons-logging
 .endif
 
 .include <${FILESDIR}/Makefile.localized>
 
 GCC_EXTRA_DISTFILES=	d6eef4b4cacb2183f2bf265a5a03a354-boost_1_55_0.tar.bz2 \
 			d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz
 
 .if ${CHOSEN_COMPILER_TYPE} == clang
 CPPFLAGS+=		-I${LOCALBASE}/include
 .endif
 
 .if ${ARCH} == amd64
 FREEBSD_ENV_SET=	FreeBSDAMDEnv.Set.sh
 PACKAGE_MIDDLE=		${PORTVERSION}_${OPSYS}_x86-64
 .elif ${ARCH} == i386
 FREEBSD_ENV_SET=	FreeBSDX86Env.Set.sh
 PACKAGE_MIDDLE=		${PORTVERSION}_${OPSYS}_x86
 .elif ${ARCH} == powerpc64
 FREEBSD_ENV_SET=	FreeBSDPPC64Env.Set.sh
 PACKAGE_MIDDLE=		${PORTVERSION}_${OPSYS}_ppc64
 .endif
 PACKAGE_PREFIX=		Apache_OpenOffice
 
 LOCALIZED_LANG?=	en-US
 
 AOO_MAKE_ENV=	${MAKE_ENV:NCPPFLAGS=*:NCFLAGS=*:NCXXFLAGS=*}
 
 GNU_CONFIGURE=	yes
 WRKSUBDIR=	${WRKDIR}/aoo-${AOOVERSION}
 WRKSRC?=	${WRKSUBDIR}/main
 SUB_FILES=	pkg-message
 SUB_LIST=	EXECBASE=${EXECBASE} AOOTAG=${AOOTAG} AOOUDIR=${AOOUDIR} \
 		PRINSTALLATION_BASEDIR=${PRINSTALLATION_BASEDIR}
 
 CONFIGURE_ARGS+=							\
 			--disable-gconf					\
 			--enable-gio					\
 			--disable-gnome-vfs				\
 			--with-unix-wrapper=${EXECBASE}			\
 			--with-alloc=system				\
 			--with-ant-home=${LOCALBASE}/share/java/apache-ant \
 			--with-system-apache-commons=yes		\
 			--with-commons-lang-jar=${JAVALIBDIR}/commons-lang3.jar \
 			--with-system-apr				\
 			--with-system-apr-util				\
 			--with-system-beanshell				\
 			--with-beanshell-jar=${JAVALIBDIR}/bsh.jar	\
 			--enable-category-b				\
 			--with-system-cairo --enable-cairo		\
 			--with-system-coinmp				\
 			--with-system-curl				\
 			--with-system-dicts				\
 			--with-epm=${LOCALBASE}/bin/epm			\
 			--with-system-expat				\
 			--disable-fetch-external			\
 			--without-fonts					\
 			--with-gnu-patch=${LOCALBASE}/bin/gpatch	\
 			--with-gperf=${LOCALBASE}/bin/gperf		\
 			--with-system-graphite				\
 			--enable-gtk					\
 			--with-system-hunspell				\
 			--with-external-dict-dir=${LOCALBASE}/share/hunspell \
 			--with-system-hyphen				\
 			--with-external-hyph-dir=${LOCALBASE}/share/hyphen \
 			--with-jdk-home=${JAVA_HOME}			\
 			--with-system-jpeg				\
 			--with-junit=${JAVALIBDIR}/junit.jar		\
 			--with-system-libtextcat			\
 			--disable-kde					\
 			--disable-kde4					\
 			--with-system-libxml				\
 			--with-system-libxslt				\
 			--with-system-lucene				\
 			--with-lucene-core-jar=${JAVALIBDIR}/lucene-core-3.6.2.jar \
 			--with-lucene-analyzers-jar=${JAVALIBDIR}/lucene-analyzers-3.6.2.jar \
 			--with-system-mythes				\
 			--with-external-thes-dir=${LOCALBASE}/share/mythes \
 			--with-system-nss				\
 			--enable-opengl					\
 			--with-system-openssl				\
 			--with-package-format="archive"			\
 			--with-system-python				\
 			--with-system-redland				\
 			--with-system-sane				\
 			--with-system-serf				\
 			--with-system-stdlibs				\
 			--with-vendor="FreeBSD ports system"		\
 			--with-build-version="PKGNAME: ${PKGNAME:S/,/@/g}" \
 			--enable-verbose				\
 			--with-system-xrender				\
 			--with-system-zlib
 
 CREATE_TREE=	${WRKSRC}/sysui/desktop/share/create_tree.sh
 
 .include <${FILESDIR}/Makefile.knobs>
 
 pre-everything::
 # really tweak, extremely useful when you build all localized language versions
 # needed after when you build with ALL_LOCALIZED_LANGS.
 .if defined(TWEAK_L10N)
 	${RM} ${WRKDIR}/.PLIST*
 	${RM} ${WRKDIR}/.install_done.*
 	${RM} ${WRKDIR}/.package_done.*
 	${RM} ${WRKDIR}/.extract_done.*
 	${RM} ${WRKDIR}/.patch_done.*
 	${RM} ${WRKDIR}/.configure_done.*
 	${RM} ${WRKDIR}/.build_done.*
 	${MKDIR} ${WRKDIR}
 	${TOUCH} ${EXTRACT_COOKIE}
 	${TOUCH} ${PATCH_COOKIE}
 	${TOUCH} ${CONFIGURE_COOKIE}
 	${TOUCH} ${BUILD_COOKIE}
 .endif
 
 do-extract-SDK-on:
 	${CP} ${DISTDIR}/${DIST_SUBDIR}/unowinreg.dll ${WRKSRC}/external/unowinreg/
 
 post-extract:
 	${TAR} -C ${WRKSUBDIR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${EXTSRC}
 .for f in ${GCC_EXTRA_DISTFILES}
 	${CP} ${DISTDIR}/${DIST_SUBDIR}/${f} ${WRKSUBDIR}/ext_sources/${f}
 .endfor
 	${CP} ${FILESDIR}/freebsd-aoo-intro-developer.png \
 		${WRKSRC}/default_images/introabout/intro.png
 	${CP} ${FILESDIR}/freebsd-aoo-about-developer.png \
 		${WRKSRC}/default_images/introabout/about.png
 	${RM} -r ${WRKSRC}/l10n
 	${LN} -sf ${UNZIP_CMD} ${WRKSRC}/solenv/bin/unzip
 	${SED}  -e '\|^For main/vcl/unx/generic/fontmanager/parseAFM|,/^__/p' \
 		-e '\|^For PostScript(R) AFM|,/^__/p'			\
 		-e d  ${WRKSRC}/LICENSE > ${LICENSE_FILE_ADOBE}
 	${SED}  -e '\|^For main/unixODBC|,/^__/p'			\
 		-e '\|^For main/connectivity|,/^__/p'			\
 		-e '\|^For main/libtextcat/data|,/^__/p'		\
 		-e '\|^For integration of HSQLDB|,/^__/p'		\
 		-e '\|^For C preprocessor|,/^__/p'			\
 		-e d  ${WRKSRC}/LICENSE > ${LICENSE_FILE_BSD3CLAUSE}
 	${SED}  -e '\|^For ICC |,/^__/p'				\
 		-e d  ${WRKSRC}/LICENSE > ${LICENSE_FILE_BSD4CLAUSE}
 	${SED}  -e '\|^For integration of the C++ Boost |,/^__/p'	\
 		-e d  ${WRKSRC}/LICENSE > ${LICENSE_FILE_BSL}
 	${SED}  -e '\|^For main/i18npool/source/breakiterator|,/^__/p'	\
 		-e d  ${WRKSRC}/LICENSE > ${LICENSE_FILE_ICU}
 	${SED}  -e '\|^For Multi-Dimensional Data|,/^__/p'		\
 		-e '\|^For XSLT MathML Library|,/^__/p'			\
 		-e d  ${WRKSRC}/LICENSE > ${LICENSE_FILE_MIT}
 	${SED}  -e '\|^For XMLSec Library|,/^__/p'			\
 		-e d  ${WRKSRC}/LICENSE_category_b >> ${LICENSE_FILE_MIT}
 	${SED}  -e '\|^For Saxon|,/^__/p'				\
 		-e d ${WRKSRC}/LICENSE_category_b > ${LICENSE_FILE_MPL10}
 	${SED}  -e '\|^The following Licenses have some restrictions|,/^- For Network/p' \
 		-e d ${WRKSRC}/LICENSE_category_b |			\
 		${SED} -e :a -e '$d;N;2,3ba' -e 'P;D' > ${LICENSE_FILE_MPL11}
 	${SED}  -e '\|^For main/filter/source/config/tools/merge/pyAltFCFGMerge|,/^__/p'	\
 		-e d  ${WRKSRC}/LICENSE > ${LICENSE_FILE_PSFL}
 	${SED}  -e '\|^For main/twain|,/^__/p'				\
 		-e d  ${WRKSRC}/LICENSE > ${LICENSE_FILE_TWAIN}
 	${SED}  -e '\|^For main/MathMLDTD|,/^__/p'			\
 		-e d  ${WRKSRC}/LICENSE > ${LICENSE_FILE_W3C}
 
 post-patch:
 	${REINPLACE_CMD} -e "/^ICONVERSION/s/=.*/= '${AOOVERSION1}'/" \
 		${WRKSRC}/sysui/desktop/productversion.mk
 	${REINPLACE_CMD} -e "s|%%JAVA_HOME%%|${JAVA_HOME}|" \
 		${WRKSRC}/desktop/scripts/soffice.sh
 	${REINPLACE_CMD} -e '/^mkdir -p/,$$d' ${CREATE_TREE}
 
 # Verify that lucene was built with the CONTRIB option instead of
 # failing mysteriously during the build
 pre-configure:
 	@if [ ! -f ${JAVALIBDIR}/lucene-analyzers-3.6.2.jar ]; then \
 		${ECHO} "error: textproc/lucene must be built with the CONTRIB option enabled"; \
 		exit 1; \
 	fi
 
 do-build:
 	${PRINTF} "[repositories]\nmain=active\nextras=active\n" > ${WRKSUBDIR}/source_config
 	cd ${WRKSRC} ; ./bootstrap
 	#
 	# numproc controls the number of parallel makes.
 	#
 	# dmproc is passed to dmake and controls parallelization at that
 	# level.
 	#
 	# dmproc > numproc seems to give shorter build times than
 	# numproc > dmproc.
 	#
 	# Select values for numproc and dmproc such that:
 	#  * numproc*dmproc >= MAKE_JOBS_NUMBER
 	#  * minimize numproc*dmproc-MAKE_JOBS_NUMBER
 	#  * dmproc >= numproc
 	#  * dmproc <= 2*numproc if MAKE_JOBS_NUMBER <= 3
 	#
 	if [ ${MAKE_JOBS_NUMBER} -le 3 ] ; then				  \
 	 numproc=1 ; dmproc=${MAKE_JOBS_NUMBER} ;			  \
 	else								  \
 	 a=1 ;								  \
 	 while [ $$(( 2 * $${a} * $${a} )) -lt ${MAKE_JOBS_NUMBER} ]; do  \
 	  a=$$(( $${a} + 1 )) ;						  \
 	 done ;								  \
 	 b=$$(( $${a} + 1 )) ;						  \
 	 ad=$$(( ( ${MAKE_JOBS_NUMBER} + $${a} - 1 ) / $${a} )) ;	  \
 	 ap=$$(( $${a} * $${ad} )) ;					  \
 	 bd=$$(( ( ${MAKE_JOBS_NUMBER} + $${b} - 1 ) / $${b} )) ;	  \
 	 bp=$$(( $${b} * $${bd} )) ;					  \
 	 if [ $${ap} -le $${bp} ]; then					  \
 	  numproc=$${a} ; dmproc=$${ad} ;				  \
 	 else								  \
 	  numproc=$${b} ; dmproc=$${bd} ;				  \
 	 fi ;								  \
 	fi ;								  \
 	cd ${WRKSRC}/instsetoo_native ;					  \
 	export ${AOO_MAKE_ENV} ;					  \
 	. ../${FREEBSD_ENV_SET} ;					  \
 	build.pl --all -P$${numproc} -- -P$${dmproc}
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PRINSTALLATION_BASEDIR} \
 		${STAGEDIR}${PREFIX}/share/mime/packages
 	@cd ${WRKSRC} ; \
 		. ${FREEBSD_ENV_SET} ; \
 		cd instsetoo_native/$${INPATH}/Apache_OpenOffice/archive/install/${LOCALIZED_LANG}/ ; \
 		for i in *.tar.?z ; do \
 			${ECHO_CMD} "extracting $$i" ; \
 			${TAR} -s '|./[^/]*/||' -xz -f $$i \
 				-C ${STAGEDIR}${PRINSTALLATION_BASEDIR} ; \
 		done
 	${FIND} ${STAGEDIR}${PRINSTALLATION_BASEDIR} -type d -exec ${CHMOD} 755 {} \;
 	${REINPLACE_CMD} \
 		-e '/^UserInstallation/s/=.*/=$$SYSUSERCONFIG\/${AOOUDIR}/' \
 		${STAGEDIR}${OOPATH}/program/bootstraprc
 	@${RM} ${STAGEDIR}${OOPATH}/program/bootstraprc.bak
 	@${ECHO_CMD} "adding wrapper scripts";
 	@${CP} ${FILESDIR}/openoffice-wrapper ${WRKDIR}/
 	@${REINPLACE_CMD} -e 's#%%OOPATH%%#${OOPATH}#g' \
 			-e 's#%%EXECBASE%%#${EXECBASE}#g' \
 			${WRKDIR}/openoffice-wrapper
 	${INSTALL_SCRIPT} ${WRKDIR}/openoffice-wrapper \
 		${STAGEDIR}${PREFIX}/bin/${EXECBASE}
 	@cd ${STAGEDIR}${PREFIX}/bin; for i in printeradmin sbase scalc sdraw \
 		simpress smath spadmin swriter ; do \
 			${LN} -f ${EXECBASE} ${EXECBASE}-$${i} ; \
 	done
 	@${ECHO_CMD} "adding desktop support"
 	@cd ${WRKSRC} ;						\
 	    . ${FREEBSD_ENV_SET} ;				\
 	    cd sysui/$${INPATH}/misc/openoffice ;		\
 	    DESTDIR=${STAGEDIR}					\
 		GNOMEDIR=${PREFIX}				\
 		ICON_PREFIX=openoffice${AOOVERSION1}		\
 		ICON_SOURCE_DIR=${WRKSRC}/sysui/desktop/icons	\
 		ICON_THEMES="hicolor/??x??"			\
 		KDEMAINDIR=${PREFIX}				\
 		PREFIX=openoffice${AOOVERSION1}			\
 		${SH} ${CREATE_TREE} ;				\
 	    ${INSTALL_DATA} apacheopenoffice.xml		\
 		${STAGEDIR}/${PREFIX}/share/mime/packages
 	@cd ${STAGEDIR}${DESKTOPDIR}; for i in base calc draw impress \
 		javafilter math printeradmin qstart startcenter writer ; do \
 			${LN} -sf ${XDGREL}/$${i}.desktop ${EXECBASE}-$${i}.desktop ; \
 	done
 
 do-install-SDK-on:
 	${TAR} -s '|./[^/]*/||' -xz -C ${STAGEDIR}${PRINSTALLATION_BASEDIR} \
 		-f ${WRKSRC}/instsetoo_native/unxfbsd*.pro/Apache_OpenOffice_SDK/archive/install/${LOCALIZED_LANG}/*.tar.gz
 	@f=${STAGEDIR}${OOPATH}/sdk/bin/unoapploader ; \
 		${CHMOD} 644 $${f} ; ${STRIP_CMD} $${f} ; ${CHMOD} 444 $${f}
 
 post-install:
 	@${ECHO_CMD} "generating plist";
 	@cd ${STAGEDIR}${PREFIX} ; (\
 		${FIND} -s bin -name "${EXECBASE}*" ; \
 		${FIND} -s ${INSTALLATION_BASEDIR} share/applications \
 			share/application-registry share/icons \
 			share/mime-info share/mime share/mimelnk \! -type d ; \
 		${FIND} ${INSTALLATION_BASEDIR} -type d -empty | ${SORT} -r | \
 			${SED} -e 's/^/@dir /' ; \
 	) >> ${TMPPLIST}
 
 .include <${FILESDIR}/Makefile.others>
 
 .include <bsd.port.post.mk>
diff --git a/editors/paredit-mode.el/Makefile b/editors/paredit-mode.el/Makefile
index 824360d493d3..8f2611aac0e3 100644
--- a/editors/paredit-mode.el/Makefile
+++ b/editors/paredit-mode.el/Makefile
@@ -1,27 +1,27 @@
 PORTNAME=	paredit-mode.el
 PORTVERSION=	24
-PORTREVISION=	12
+PORTREVISION=	14
 CATEGORIES=	editors elisp
 MASTER_SITES=	http://mumble.net/~campbell/emacs/
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 DISTNAME=	paredit-${PORTVERSION}.el
 EXTRACT_SUFX=
 EXTRACT_ONLY=
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Minor mode for performing editing of S-expression data
 WWW=		https://www.emacswiki.org/emacs/ParEdit
 
 LICENSE=	GPLv3+
 
 USES=		emacs
 
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 PLIST_FILES=	${EMACS_SITE_LISPDIR}/paredit.el
 
 do-install:
 	${INSTALL_DATA} ${DISTDIR}/${DISTNAME} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/paredit.el
 
 .include <bsd.port.mk>
diff --git a/editors/psgml/Makefile b/editors/psgml/Makefile
index 52921af66a9a..a1ab9c1cca4a 100644
--- a/editors/psgml/Makefile
+++ b/editors/psgml/Makefile
@@ -1,42 +1,42 @@
 PORTNAME=	psgml
 PORTVERSION=	1.4.0
-PORTREVISION=	16
+PORTREVISION=	18
 CATEGORIES=	editors elisp
 MASTER_SITES=	SF/${PORTNAME}/ALPHA%20${PORTNAME}/1.3.2
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 DISTNAME=	${PORTNAME}-1.3.2
 
 PATCH_SITES=	LOCAL/hrs
 PATCHFILES=	psgml-symbol-conflict-050503.diff.gz
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Major mode for editing SGML and XML documents for Emacs
 WWW=		http://www.lysator.liu.se/~lenst/about_psgml/
 
 LICENSE=	GPLv2
 
 .if ${FLAVOR:U} == devel_full || ${FLAVOR:U} == devel_nox
 BROKEN=		fails to build
 .endif
 
 USES=		emacs
 
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS=	--lispdir=${PSGML_LISPDIR}
 CONFIGURE_ENV=	EMACS=${EMACS_CMD}
 SUB_FILES=	${PSGML_STARTUPEL}
 SUB_LIST=	PSGML_LISPDIR=${PSGML_LISPDIR}
 PLIST_SUB=	PSGML_STARTUPEL=${PSGML_STARTUPEL}
 
 INFO=		psgml psgml-api
 
 PSGML_STARTUPEL=	psgml-startup.el
 PSGML_LISPDIR=	${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/psgml
 
 post-install:
 	cd ${WRKSRC} && ${SETENV} DESTDIR="${STAGEDIR}" ${MAKE} install-info
 	${GZIP_CMD} ${STAGEDIR}${PSGML_LISPDIR}/*.el
 	${INSTALL_DATA} ${WRKDIR}/${PSGML_STARTUPEL} \
 	    ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}
 
 .include <bsd.port.mk>
diff --git a/editors/semi/Makefile b/editors/semi/Makefile
index 3a49f7e7b6fe..884d85fb1e17 100644
--- a/editors/semi/Makefile
+++ b/editors/semi/Makefile
@@ -1,58 +1,58 @@
 PORTNAME=	semi
 PORTVERSION=	${SEMI_VER}.${SNAPDATE}
-PORTREVISION=	2
+PORTREVISION=	7
 CATEGORIES=	editors elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	nobutaka@FreeBSD.org
 COMMENT=	SEMI, Library of MIME feature for GNU Emacs for emacs
 WWW=		https://github.com/wanderlust/semi
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	flim${EMACS_PKGNAMESUFFIX}>0:editors/flim@${EMACS_FLAVOR}
 RUN_DEPENDS=	flim${EMACS_PKGNAMESUFFIX}>0:editors/flim@${EMACS_FLAVOR}
 
 USES=		emacs iconv makeinfo
 USE_GITHUB=	yes
 GH_ACCOUNT=	wanderlust
 GH_TAGNAME=	ac3e726
 
 SNAPDATE=	20220720
 NO_ARCH=	yes
 
 FLIM_TRUNK=	1.14
 SEMI_VER=	${SEMI_TRUNK}.7
 SEMI_TRUNK=	1.14
 
 ALL_TARGET=	elc
 
 MAKE_ARGS+=	PREFIX="${STAGEDIR}${PREFIX}" \
 		LISPDIR="${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}" \
 		VERSION_SPECIFIC_LISPDIR="${STAGEDIR}${EMACS_VERSION_SITE_LISPDIR}" \
 		PACKAGE_LISPDIR=NONE
 
 INFO=		mime-ui-en mime-ui-ja
 
 OPTIONS_DEFINE=	DOCS
 
 post-build:
 	@(cd ${WRKSRC} ; \
 	for i in mime-ui-en.texi mime-ui-ja.texi; do \
 		${MAKEINFO} --no-split --no-validate $${i} ; \
 	done)
 
 post-install:
 	@(cd ${WRKSRC} ; \
 	for i in mime-ui-en.info mime-ui-ja.info; do \
 		${INSTALL_DATA} ${WRKSRC}/$${i} ${STAGEDIR}${PREFIX}/${INFO_PATH} ; \
 	done)
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@(cd ${WRKSRC} ; \
 	for i in NEWS README.* TODO VERSION ; do \
 		${INSTALL_DATA} $${i} ${STAGEDIR}${DOCSDIR}/ ; \
 	done)
 
 .include <bsd.port.mk>
diff --git a/editors/slime/Makefile b/editors/slime/Makefile
index 501638252eb0..0a1dbcb9013a 100644
--- a/editors/slime/Makefile
+++ b/editors/slime/Makefile
@@ -1,46 +1,46 @@
 PORTNAME=	slime
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.26.1-9
-PORTREVISION=	6
+PORTREVISION=	8
 DISTVERSIONSUFFIX=	-gf368e22a
 CATEGORIES=	editors elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	joe@thrallingpenguin.com
 COMMENT=	Superior Lisp Interaction Mode for Emacs
 WWW=		https://common-lisp.net/project/slime/
 
 LICENSE=	PD
 
 BUILD_DEPENDS=	texinfo>=5.2:print/texinfo
 
 USES=		emacs gmake
 USE_GITHUB=	yes
 
 ALL_TARGET=	all contrib-compile doc-slime.info
 INFO=		slime
 NO_ARCH=	yes
 PORTDOCS=	CONTRIBUTING.md NEWS PROBLEMS README.md
 SUB_FILES=	pkg-message
 SUB_LIST=	SLIME_LISPDIR="${SLIME_LISPDIR}"
 
 OPTIONS_DEFINE=	DOCS
 
 SLIME_LISPDIR=	${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/slime
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${SLIME_LISPDIR}
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${SLIME_LISPDIR} \
 		"! ( -name CONTRIBUTING.md -o -name NEWS -o -name PROBLEMS \
 		-o -name README.md -o -name Makefile -o -name doc \
 		-o -path \./doc/* )")
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${INSTALL_WRKSRC}/contrib/README.md \
 		${STAGEDIR}${DOCSDIR}/README-contrib.md
 	(cd ${INSTALL_WRKSRC}/doc && ${INSTALL_DATA} slime-refcard.pdf \
 		slime-small.pdf ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
diff --git a/editors/sly-asdf/Makefile b/editors/sly-asdf/Makefile
index 2e4eaa6b8330..c6662744df0b 100644
--- a/editors/sly-asdf/Makefile
+++ b/editors/sly-asdf/Makefile
@@ -1,54 +1,54 @@
 PORTNAME=	sly-asdf
 PORTVERSION=	20210308
-PORTREVISION=	6
+PORTREVISION=	11
 CATEGORIES=	editors elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	olce.freebsd.ports@certner.fr
 COMMENT=	SLY support for ASDF
 WWW=		https://github.com/mmgeorge/sly-asdf
 
 LICENSE=	GPLv3
 
 MY_DEPENDS=	${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/sly/sly.el:editors/sly@${EMACS_FLAVOR}
 BUILD_DEPENDS=	${MY_DEPENDS}
 RUN_DEPENDS=	${MY_DEPENDS}
 
 USES=		emacs
 USE_GITHUB=	yes
 GH_ACCOUNT=	mmgeorge
 GH_TAGNAME=	bcaeba9b73b582ae1c4fadc23c71ee7e38d9a64e
 
 NO_ARCH=	yes
 
 EMACS_COMPILE=	${EMACS_CMD} --batch --no-site-file -L ${WRKSRC} \
 		-f batch-byte-compile
 
 PLIST_THIS_LISPDIR=	${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
 THIS_LISPDIR=		${PREFIX}/${PLIST_THIS_LISPDIR}
 PLIST_SUB+=		THIS_LISPDIR=${PLIST_THIS_LISPDIR}
 
 OPTIONS_DEFINE=	DOCS
 
 PORTDOCS=	README.md
 
 post-patch:
 	cd ${WRKSRC} && ${RM} *flymake*
 
 do-build:
 	cd ${WRKSRC} && ${EMACS_COMPILE} sly-*.el
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${THIS_LISPDIR}
 	(cd ${WRKSRC} && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${THIS_LISPDIR} \
 		"! ( -depth 1 ( ${PORTDOCS:C/^(.*)$/-name \1 -o/} \
 			-name LICENSE -o -name *\.md ) -o \
 			-path \./test* -o -path \./.[^.]* -o \
 			-name *\.orig )")
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:%=${WRKSRC}/%} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/editors/sly-named-readtables/Makefile b/editors/sly-named-readtables/Makefile
index 0c6b93c79757..80c28abd95bf 100644
--- a/editors/sly-named-readtables/Makefile
+++ b/editors/sly-named-readtables/Makefile
@@ -1,58 +1,58 @@
 PORTNAME=	sly-named-readtables
 PORTVERSION=	20191013
-PORTREVISION=	6
+PORTREVISION=	11
 CATEGORIES=	editors elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	olce.freebsd.ports@certner.fr
 COMMENT=	Support different readtables in the same file for SLY
 WWW=		https://github.com/joaotavora/sly-named-readtables
 
 LICENSE=	PD
 
 MY_DEPENDS=	${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/sly/sly.el:editors/sly@${EMACS_FLAVOR}
 BUILD_DEPENDS=	${MY_DEPENDS}
 RUN_DEPENDS=	${MY_DEPENDS}
 
 USES=		emacs
 USE_GITHUB=	yes
 GH_ACCOUNT=	joaotavora
 GH_TAGNAME=	a5a42674ccffa97ccd5e4e9742beaf3ea719931f
 
 NO_ARCH=	yes
 
 EMACS_COMPILE=	${EMACS_CMD} --batch --no-site-file -L ${WRKSRC} -f batch-byte-compile
 
 PLIST_THIS_LISPDIR=	${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
 THIS_LISPDIR=		${PREFIX}/${PLIST_THIS_LISPDIR}
 PLIST_SUB+=		THIS_LISPDIR=${PLIST_THIS_LISPDIR}
 
 # File is buggy and can't be used as documented upstream
 EXCLUDED_FILES=	${PORTNAME}-autoloads.el
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 PORTDOCS=	README.md screenshot.png
 PORTEXAMPLES=	example.lisp
 
 do-build:
 	cd ${WRKSRC} && ${EMACS_COMPILE} sly-*.el
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${THIS_LISPDIR}
 	(cd ${WRKSRC} && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${THIS_LISPDIR} \
 		"! ( -depth 1 ( ${EXCLUDED_FILES:C/^(.*)$/-name \1 -o/} \
 			${PORTDOCS:C/^(.*)$/-name \1 -o/} \
 			${PORTEXAMPLES:C/^(.*)$/-name \1 -o/} \
 			-name LICENSE -o -name *\.md -o -name \.[^.]* ) )")
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:%=${WRKSRC}/%} ${STAGEDIR}${DOCSDIR}
 
 post-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${PORTEXAMPLES:%=${WRKSRC}/%} ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/editors/sly-quicklisp/Makefile b/editors/sly-quicklisp/Makefile
index 0887d41e8304..43180f61d38e 100644
--- a/editors/sly-quicklisp/Makefile
+++ b/editors/sly-quicklisp/Makefile
@@ -1,52 +1,52 @@
 PORTNAME=	sly-quicklisp
 PORTVERSION=	20200707
-PORTREVISION=	6
+PORTREVISION=	11
 CATEGORIES=	editors elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	olce.freebsd.ports@certner.fr
 COMMENT=	Basic Quicklisp support for SLY
 WWW=		https://github.com/joaotavora/sly-quicklisp
 
 LICENSE=	PD
 
 MY_DEPENDS=	${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/sly/sly.el:editors/sly@${EMACS_FLAVOR}
 BUILD_DEPENDS=	${MY_DEPENDS}
 RUN_DEPENDS=	${MY_DEPENDS}
 
 USES=		emacs
 USE_GITHUB=	yes
 GH_ACCOUNT=	joaotavora
 GH_TAGNAME=	4707b62803d7a29f172e9c5ff993b91187a9aaf3
 
 NO_ARCH=	yes
 
 EMACS_COMPILE=	${EMACS_CMD} --batch --no-site-file -L ${WRKSRC} -f batch-byte-compile
 
 PLIST_THIS_LISPDIR=	${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
 THIS_LISPDIR=		${PREFIX}/${PLIST_THIS_LISPDIR}
 PLIST_SUB+=		THIS_LISPDIR=${PLIST_THIS_LISPDIR}
 
 # File is buggy and can't be used as documented upstream
 EXCLUDED_FILES=	${PORTNAME}-autoloads.el
 
 OPTIONS_DEFINE=	DOCS
 
 PORTDOCS=	README.md screenshot.png
 
 do-build:
 	cd ${WRKSRC} && ${EMACS_COMPILE} sly-*.el
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${THIS_LISPDIR}
 	(cd ${WRKSRC} && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${THIS_LISPDIR} \
 		"! ( -depth 1 ( ${EXCLUDED_FILES:C/^(.*)$/-name \1 -o/} \
 			${PORTDOCS:C/^(.*)$/-name \1 -o/} \
 			-name LICENSE -o -name *\.md -o -name \.[^.]* ) )")
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:%=${WRKSRC}/%} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/editors/sly/Makefile b/editors/sly/Makefile
index 575854764bd6..d2d4c8b6aa21 100644
--- a/editors/sly/Makefile
+++ b/editors/sly/Makefile
@@ -1,70 +1,70 @@
 PORTNAME=	sly
 DISTVERSION=	1.0.43
-PORTREVISION=	6
+PORTREVISION=	8
 CATEGORIES=	editors elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	olce.freebsd.ports@certner.fr
 COMMENT=	Sylvester the Cat's Common Lisp IDE for Emacs
 WWW=		https://github.com/joaotavora/sly
 
 LICENSE=	PD
 
 USES=		emacs gmake
 USE_GITHUB=	yes
 GH_ACCOUNT=	joaotavora
 
 NO_ARCH=	yes
 
 INFO=		sly
 
 ALL_TARGET=	all doc-sly.info
 
 PLIST_THIS_LISPDIR=	${EMACS_VERSION_SITE_LISPDIR}/sly
 THIS_LISPDIR=		${PREFIX}/${PLIST_THIS_LISPDIR}
 PLIST_SUB+=		THIS_LISPDIR=${PLIST_THIS_LISPDIR}
 
 PORTSCOUT=	limit:^[0-9]
 
 OPTIONS_DEFINE=	DOCS DOCS_PDF
 OPTIONS_DEFAULT=DOCS DOCS_PDF
 
 DOCS_PDF_DESC=	Build PDF documentation (requires DOCS)
 
 ROOT_DOCS_FILES=	CONTRIBUTING.md NEWS.md PROBLEMS.md README.md
 GENERATED_DOCS_FILES=	sly.html
 DOCS_BUILD_DEPENDS=	texinfo>=5.2:print/texinfo
 
 DOCS_PDF_IMPLIES=	DOCS
 DOCS_PDF_USES=	tex
 DOCS_PDF_USE=	TEX=latex:build,pdftex:build,dvipsk:build
 
 .include <bsd.port.options.mk>
 
 .if !empty(PORT_OPTIONS:MDOCS_PDF)
 GENERATED_DOCS_FILES+=	sly.pdf sly-refcard.pdf
 .endif
 
 ALL_TARGET+=	${GENERATED_DOCS_FILES:%=doc-%}
 
 PORTDOCS:=	CONTRIBUTING.md NEWS.md PROBLEMS.md README.md \
 		${GENERATED_DOCS_FILES}
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${THIS_LISPDIR}
 	(cd ${WRKSRC} && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${THIS_LISPDIR} \
 		"! ( -depth 1 ( -name Makefile -o -name *\.md -o \
 				-name \.[^.]* ) -o \
 			-path \./doc* )")
 	${INSTALL_DATA} ${WRKSRC}/doc/${INFO}.info \
 		${STAGEDIR}${PREFIX}/${INFO_PATH}
 
 # DOCS_PDF depends on DOCS
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${ROOT_DOCS_FILES:%=${WRKSRC}/%} \
 		${GENERATED_DOCS_FILES:%=${WRKSRC}/doc/%} \
 		${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/editors/tamago/Makefile b/editors/tamago/Makefile
index 236bf3500dce..0c0dda98491c 100644
--- a/editors/tamago/Makefile
+++ b/editors/tamago/Makefile
@@ -1,28 +1,28 @@
 PORTNAME=	tamago
 PORTVERSION=	4.0.6.0.20041122.19.15
-PORTREVISION=	2
+PORTREVISION=	4
 DISTVERSIONPREFIX=	v
 CATEGORIES=	editors elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Egg V4, Multilingual Input Method for Emacsen
 WWW=		https://github.com/hrs-allbsd/tamago
 
 LICENSE=	GPLv2
 
 USES=		emacs
 USE_GITHUB=	yes
 GH_ACCOUNT=	hrs-allbsd
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-lispdir="${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}"
 CONFIGURE_ENV=	EMACS="${EMACS_CMD}"
 PLIST_SUB=	ELISPDIR="${EMACS_VERSION_SITE_LISPDIR}"
 PORTDOCS=	AUTHORS ChangeLog ChangeLog.1997-1998 \
 		ChangeLog.2000-2001 ChangeLog.2002-2004 \
 		PROBLEMS README README.ja.txt TODO egg-anthy.readme
 OPTIONS_DEFINE=	DOCS
 DOCS_CONFIGURE_ENABLE=	doc
 
 .include <bsd.port.mk>
diff --git a/editors/web-mode/Makefile b/editors/web-mode/Makefile
index 28fd876dbcef..a32af9c4cfa7 100644
--- a/editors/web-mode/Makefile
+++ b/editors/web-mode/Makefile
@@ -1,31 +1,31 @@
 PORTNAME=	web-mode
 PORTVERSION=	15.1
 DISTVERSIONPREFIX=	v
-PORTREVISION=	13
+PORTREVISION=	15
 CATEGORIES=	editors elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Autonomous Emacs major-mode for editing web templates
 WWW=		https://web-mode.org
 
 LICENSE=	GPLv2
 
 USES=		emacs
 USE_GITHUB=	yes
 GH_ACCOUNT=	fxbois
 
 MAKEFILE=	${FILESDIR}/Makefile
 MAKE_ENV=	EMACS="${EMACS_CMD}" LISPDIR="${WEBMODE_LISPDIR}" \
 		DESTDIR="${STAGEDIR}"
 SUB_FILES=	web-mode-autoloads.el
 SUB_LIST=	LISPDIR="${WEBMODE_LISPDIR}"
 WEBMODE_LISPDIR=	${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/web-mode
 PLIST_FILES=	${EMACS_VERSION_SITE_LISPDIR}/web-mode/web-mode.elc.gz \
 		${EMACS_VERSION_SITE_LISPDIR}/web-mode-autoloads.el
 
 post-install:
 	${INSTALL_DATA} ${WRKDIR}/web-mode-autoloads.el \
 	    ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}
 
 .include <bsd.port.mk>
diff --git a/editors/with-editor-devel/Makefile b/editors/with-editor-devel/Makefile
index a9e499de4a57..1370af39afe1 100644
--- a/editors/with-editor-devel/Makefile
+++ b/editors/with-editor-devel/Makefile
@@ -1,64 +1,65 @@
 PORTNAME=	with-editor
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.2.0-40
+PORTREVISION=	2
 DISTVERSIONSUFFIX=	-g59867ae
 CATEGORIES=	editors elisp
 PKGNAMESUFFIX=	-devel${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	yasu@FreeBSD.org
 COMMENT=	Use the Emacsclient as the $$EDITOR of child processes
 WWW=		https://github.com/magit/with-editor
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	compat.el${EMACS_PKGNAMESUFFIX}>=28.1.1.0:misc/compat.el@${EMACS_FLAVOR}
 RUN_DEPENDS=	compat.el${EMACS_PKGNAMESUFFIX}>=28.1.1.0:misc/compat.el@${EMACS_FLAVOR}
 
 USES=		emacs gmake makeinfo
 USE_GITHUB=	yes
 GH_ACCOUNT=	magit
 
 MAKE_ENV+=	LOAD_PATH="-L ${WRKSRC}/lisp -L ${PREFIX}/${EMACS_SITE_LISPDIR} -L ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR} -L ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/compat"
 MAKE_JOBS_UNSAFE=	yes
 ALL_TARGET=	lisp info
 
 CONFLICTS_INSTALL=	with-editor-emacs*
 
 NO_ARCH=	yes
 
 INFO=		with-editor
 PLIST_FILES=	${EMACS_VERSION_SITE_LISPDIR}/with-editor-autoloads.el \
 		${EMACS_VERSION_SITE_LISPDIR}/with-editor.el \
 		${EMACS_VERSION_SITE_LISPDIR}/with-editor.elc
 PORTDOCS=	README.org with-editor.html
 
 OPTIONS_DEFINE=	DOCS PDF
 
 PDF_DESC=	Build and install PDF document
 
 DOCS_BUILD_DEPENDS=	gsed:textproc/gsed
 DOCS_ALL_TARGET=	html
 DOCS_BINARY_ALIAS=	sed=gsed
 PDF_BUILD_DEPENDS=	texi2pdf:print/texinfo
 PDF_USES=		tex
 PDF_USE=		TEX=dvipdfmx:build
 PDF_ALL_TARGET=		pdf
 PDF_PLIST_FILES=	${DOCSDIR}/with-editor.pdf
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}
 	${INSTALL_DATA} ${WRKSRC}/lisp/*.el* \
 		${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/*.info ${STAGEDIR}${PREFIX}/${INFO_PATH}
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.org \
 		${WRKSRC}/docs/with-editor.html ${STAGEDIR}${DOCSDIR}
 
 do-install-PDF-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/with-editor.pdf ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/editors/with-editor/Makefile b/editors/with-editor/Makefile
index ac532c910bcc..de0ca17b9ff4 100644
--- a/editors/with-editor/Makefile
+++ b/editors/with-editor/Makefile
@@ -1,59 +1,59 @@
 PORTNAME=	with-editor
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.2.0
-PORTREVISION=	4
+PORTREVISION=	6
 CATEGORIES=	editors elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	yasu@FreeBSD.org
 COMMENT=	Use the Emacsclient as the $$EDITOR of child processes
 WWW=		https://github.com/magit/with-editor
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		emacs gmake makeinfo
 USE_GITHUB=	yes
 GH_ACCOUNT=	magit
 
 ALL_TARGET=	lisp info
 
 CONFLICTS_INSTALL=	with-editor-devel-emacs*
 
 NO_ARCH=	yes
 
 INFO=		with-editor
 PLIST_FILES=	${EMACS_VERSION_SITE_LISPDIR}/with-editor-autoloads.el \
 		${EMACS_VERSION_SITE_LISPDIR}/with-editor.el \
 		${EMACS_VERSION_SITE_LISPDIR}/with-editor.elc
 PORTDOCS=	AUTHORS.md README.md with-editor.html
 
 OPTIONS_DEFINE=	DOCS PDF
 
 PDF_DESC=	Build and install PDF document
 
 DOCS_BUILD_DEPENDS=	gsed:textproc/gsed
 DOCS_ALL_TARGET=	html
 DOCS_BINARY_ALIAS=	sed=gsed
 PDF_BUILD_DEPENDS=	texi2pdf:print/texinfo
 PDF_USES=		tex
 PDF_USE=		TEX=dvipdfmx:build
 PDF_ALL_TARGET=		pdf
 PDF_PLIST_FILES=	${DOCSDIR}/with-editor.pdf
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}
 	${INSTALL_DATA} ${WRKSRC}/lisp/*.el* \
 		${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/*.info ${STAGEDIR}${PREFIX}/${INFO_PATH}
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.md ${WRKSRC}/docs/AUTHORS.md \
 		${WRKSRC}/docs/with-editor.html ${STAGEDIR}${DOCSDIR}
 
 do-install-PDF-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/with-editor.pdf ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/emulators/catapult/Makefile b/emulators/catapult/Makefile
index 2d7b0e26b0c5..651e97e13a2f 100644
--- a/emulators/catapult/Makefile
+++ b/emulators/catapult/Makefile
@@ -1,78 +1,78 @@
 PORTNAME=	catapult
 PORTVERSION=	18.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	emulators
 MASTER_SITES=	https://github.com/openMSX/openMSX/releases/download/RELEASE_${PORTVERSION:S/./_/g}/
 DISTNAME=	openmsx-${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GUI for openMSX
 WWW=		https://openmsx.org
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/doc/GPL.txt
 
 BUILD_DEPENDS=	openmsx:emulators/openmsx
 RUN_DEPENDS=	openmsx:emulators/openmsx
 
 USES=		gmake pkgconfig python gnome
 USE_GNOME+=	libxml2
 USE_WX=		3.0
 MAKEFILE=	GNUmakefile
 MAKE_ARGS=	INSTALL_BASE="${PREFIX}" \
 		INSTALL_SHARE_DIR="${DATADIR}" \
 		INSTALL_DOC_DIR="${DOCSDIR}" \
 		CATAPULT_FLAVOUR="portbld" \
 		CATAPULT_OPENMSX_BINARY="${LOCALBASE}/bin/openmsx" \
 		CATAPULT_OPENMSX_SHARE="${LOCALBASE}/share/openmsx" \
 		CATAPULT_NO_DESKTOP_HOOKS="true" \
 		SYMLINK_FOR_BINARY="false" \
 		PYTHON="${PYTHON_CMD}"
 
 MAKE_JOBS_UNSAFE=	yes
 
 OPTIONS_DEFINE= DEBUG DOCS
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDEBUG}
 CFLAGS+=	-DDEBUG
 CATAPULT_STRIP=	false
 .else
 CFLAGS+=	-DNDEBUG
 CATAPULT_STRIP=	true
 .endif
 
 post-extract:
 	${CP} ${WRKSRC}/build/platform-freebsd.mk \
 		${WRKSRC}/build/platform-dragonfly.mk
 
 post-patch:
 	@${REINPLACE_CMD} 's|$$(INSTALL_BASE)|${DATADIR}|' \
 		${WRKSRC}/build/info2code.mk
 	@${REINPLACE_CMD} '/-Wno-literal/s|^CXXFLAGS|#CXXFLAGS| ; \
 		 /--cxx/s|^CXX|#CXX| ; \
 		 /COMPILE=/s|g++|$$(CXX)| ; \
 		 s|@$$(CXX)|$$(CXX)|' ${WRKSRC}/build/main.mk
 	@${REINPLACE_CMD} 's|wx-config --|${WX_CONFIG:T} --|g' \
 		${WRKSRC}/build/probe.mk
 	@${REINPLACE_CMD} '/^Exec/s|%INSTALL_BASE%|${PREFIX}| ; \
 		 /^Icon/s|%INSTALL_BASE%|${DATADIR}| ; \
 		 /^DocPath/s|%INSTALL_BASE%/doc|${DOCSDIR}|' \
 		${WRKSRC}/desktop/openMSX-Catapult.desktop
 	@${ECHO_CMD} > ${WRKSRC}/build/flavour-portbld.mk
 	@${ECHO_CMD} 'CXXFLAGS+=${CXXFLAGS}' \
 		>> ${WRKSRC}/build/flavour-portbld.mk
 	@${ECHO_CMD} 'LINK_FLAGS+=${LDFLAGS}' \
 		>> ${WRKSRC}/build/flavour-portbld.mk
 	@${ECHO_CMD} 'CATAPULT_STRIP:=${CATAPULT_STRIP}' \
 		>> ${WRKSRC}/build/flavour-portbld.mk
 
 post-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}/resources/icons
 	${INSTALL_DATA} ${WRKSRC}/src/catapult.xpm \
 		${STAGEDIR}${DATADIR}/resources/icons
 	cd ${WRKSRC}/desktop && ${INSTALL_DATA} openMSX-Catapult.desktop \
 		${STAGEDIR}${DESKTOPDIR}
 
 .include <bsd.port.mk>
diff --git a/emulators/emulationstation/Makefile b/emulators/emulationstation/Makefile
index d8063311246f..7c28e3942055 100644
--- a/emulators/emulationstation/Makefile
+++ b/emulators/emulationstation/Makefile
@@ -1,57 +1,57 @@
 PORTNAME=	emulationstation
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.9.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	emulators
 
 MAINTAINER=	freebsd@coombscloud.com
 COMMENT=	Graphical front-end for emulators (RetroPie fork)
 WWW=		https://github.com/RetroPie/EmulationStation
 
 LICENSE=	APACHE20 MIT
 LICENSE_COMB=	multi
 LICENSE_FILE_APACHE20=	${WRKSRC}/opensans_license.txt
 LICENSE_FILE_MIT=	${WRKSRC}/LICENSE.md
 
 BUILD_DEPENDS=	${LOCALBASE}/include/rapidjson/document.h:devel/rapidjson
 LIB_DEPENDS=	libboost_date_time.so:devel/boost-libs \
 		libboost_filesystem.so:devel/boost-libs \
 		libboost_locale.so:devel/boost-libs \
 		libboost_system.so:devel/boost-libs \
 		libcurl.so:ftp/curl \
 		libfreeimage.so:graphics/freeimage \
 		libfreetype.so:print/freetype2 \
 		libpugixml.so:textproc/pugixml \
 		libvlc.so:multimedia/vlc
 
 USES=		cmake compiler:gcc-c++11-lib gl pkgconfig sdl
 USE_GITHUB=	yes
 GH_ACCOUNT=	RetroPie
 GH_PROJECT=	EmulationStation
 USE_GL=		gl glu
 USE_SDL=	sdl2
 
 PORTDOCS=	CREDITS.md DEVNOTES.md GAMELISTS.md README.md SYSTEMS.md \
 		THEMES.md
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|<pugixml/src/pugixml.hpp>|<pugixml.hpp>|g' \
 		${WRKSRC}/es-app/src/CollectionSystemManager.cpp \
 		${WRKSRC}/es-app/src/Gamelist.cpp \
 		${WRKSRC}/es-app/src/MetaData.cpp \
 		${WRKSRC}/es-app/src/SystemData.cpp \
 		${WRKSRC}/es-app/src/scrapers/GamesDBJSONScraper.cpp \
 		${WRKSRC}/es-app/src/scrapers/ScreenScraper.cpp \
 		${WRKSRC}/es-core/src/InputConfig.cpp \
 		${WRKSRC}/es-core/src/InputManager.cpp \
 		${WRKSRC}/es-core/src/MameNames.cpp \
 		${WRKSRC}/es-core/src/Settings.cpp \
 		${WRKSRC}/es-core/src/ThemeData.cpp
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_MAN} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/emulators/higan/Makefile b/emulators/higan/Makefile
index e8f2bad6a4af..f052840d1c35 100644
--- a/emulators/higan/Makefile
+++ b/emulators/higan/Makefile
@@ -1,99 +1,99 @@
 PORTNAME=	higan
 PORTVERSION=	106
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	emulators games
 MASTER_SITES=	http://download.byuu.org/ \
 		http://www.cyberbotx.com/higan/
 DISTNAME=	${PORTNAME}_v${PORTVERSION}-source
 
 MAINTAINER=	cyberbotx@cyberbotx.com
 COMMENT=	Nintendo multi-system emulator
 WWW=		http://byuu.org/higan/
 
 ONLY_FOR_ARCHS=	amd64 i386 powerpc powerpc64 powerpc64le
 
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2
 
 USES=		7z compiler:c++14-lang gettext gmake gnome pkgconfig xorg
 USE_GNOME=	cairo gdkpixbuf2 gtk20 gtksourceview2
 USE_XORG=	x11 xext
 USE_CSTD=	c99
 USE_CXXSTD=	c++14
 USE_GCC=	yes
 
 MAKEFILE=	GNUmakefile
 MAKE_ENV=	compiler="${CXX}" hiro="gtk"
 
 OPTIONS_DEFINE=		DEBUG
 OPTIONS_MULTI=		VIDEO SOUND INPUT
 OPTIONS_MULTI_VIDEO=	GLX SDL XSHM XV
 OPTIONS_MULTI_SOUND=	AO OPENAL OSS PULSEAUDIO
 OPTIONS_MULTI_INPUT=	INPUT_SDL INPUT_X
 OPTIONS_DEFAULT=	GLX XSHM XV SDL \
 			OSS INPUT_SDL INPUT_X
 
 XSHM_DESC=		Build XShm video driver
 XV_DESC=		Build Xv video driver
 INPUT_SDL_DESC=		Build SDL input driver
 INPUT_X_DESC=		Build X input driver
 
 GLX_USES=	gl
 GLX_USE=	GL=gl
 GLX_VARS=	VIDEO_DRIVER+=video.glx
 
 SDL_USES=	sdl
 SDL_USE=	XORG=xv SDL=sdl
 SDL_VARS=	VIDEO_DRIVER+=video.sdl
 
 XSHM_USE=	XORG=xext
 XSHM_VARS=	VIDEO_DRIVER+=video.xshm
 
 XV_USE=		XORG=xv
 XV_VARS=	VIDEO_DRIVER+=video.xvideo
 
 AO_LIB_DEPENDS=	libao.so:audio/libao
 AO_VARS=	AUDIO_DRIVER+=audio.ao
 
 OPENAL_USES=	openal:al
 OPENAL_VARS=	AUDIO_DRIVER+=audio.openal
 
 OSS_VARS=	AUDIO_DRIVER+=audio.oss
 
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_VARS=	AUDIO_DRIVER+=audio.pulseaudio
 
 INPUT_SDL_USES=	sdl
 INPUT_SDL_USE=	SDL=sdl
 INPUT_SDL_VARS=	INPUT_DRIVER+=input.sdl
 
 INPUT_X_VARS=	INPUT_DRIVER+=input.xlib
 
 post-patch:
 	${REINPLACE_CMD} \
 		-e 's|%%VIDEO%%|${VIDEO_DRIVER}|' \
 		-e 's|%%AUDIO%%|${AUDIO_DRIVER}|' \
 		-e 's|%%INPUT%%|${INPUT_DRIVER}|' \
 		${WRKSRC}/higan/target-tomoko/GNUmakefile
 	${REINPLACE_CMD} -e 's|/usr/share/|${PREFIX}/share/|' \
 		${WRKSRC}/nall/path.hpp
 
 post-patch-DEBUG-on:
 	${REINPLACE_CMD} -e 's|-O3|-g|g' \
 		${WRKSRC}/higan/GNUmakefile \
 		${WRKSRC}/icarus/GNUmakefile
 
 do-build:
 .for d in higan icarus
 	@${DO_MAKE_BUILD} ${ALL_TARGET} -C${WRKSRC}/${d}
 .endfor
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/higan/out/higan ${STAGEDIR}${PREFIX}/bin/
 	${INSTALL_PROGRAM} ${WRKSRC}/icarus/out/icarus ${STAGEDIR}${PREFIX}/bin/
 	${INSTALL_DATA} ${WRKSRC}/higan/data/higan.png ${STAGEDIR}${PREFIX}/share/pixmaps/
 	${INSTALL_DATA} ${WRKSRC}/higan/data/higan.desktop ${STAGEDIR}${PREFIX}/share/applications/
 	(cd ${WRKSRC}/higan/systems && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/)
 	(cd ${WRKSRC}/icarus/Database && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/share/icarus/Database/)
 
 .include <bsd.port.mk>
diff --git a/emulators/libretro-bsnes/Makefile b/emulators/libretro-bsnes/Makefile
index c835efd2e8b8..b4cf17dacc28 100644
--- a/emulators/libretro-bsnes/Makefile
+++ b/emulators/libretro-bsnes/Makefile
@@ -1,28 +1,29 @@
 PORTNAME=	libretro-bsnes
 PORTVERSION=	20211218
+PORTREVISION=	1
 CATEGORIES=	emulators games
 
 MAINTAINER=	beyert@cs.ucr.edu
 COMMENT=	Standalone port of bSNES to libretro
 WWW=		https://github.com/libretro/bsnes-libretro
 
 LICENSE=	GPLv3
 
 USES=		compiler:c++11-lib gmake
 
 USE_GCC=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	libretro
 GH_PROJECT=	bsnes-libretro
 GH_TAGNAME=	9549275
 
 USE_LDCONFIG=	yes
 
 PLIST_FILES=	lib/libretro/bsnes_libretro.so
 
 do-install:
 	@${MKDIR} ${STAGEDIR}/${PREFIX}/lib/libretro;
 	${INSTALL_LIB} ${WRKSRC}/bsnes_libretro.so ${STAGEDIR}/${PREFIX}/lib/libretro;
 
 .include <bsd.port.mk>
diff --git a/emulators/libretro-reicast/Makefile b/emulators/libretro-reicast/Makefile
index ed930a77212f..7d735ef4f0b5 100644
--- a/emulators/libretro-reicast/Makefile
+++ b/emulators/libretro-reicast/Makefile
@@ -1,46 +1,46 @@
 PORTNAME=	libretro-reicast
 PORTVERSION=	0.20201231
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	emulators games
 
 MAINTAINER=	beyert@cs.ucr.edu
 COMMENT=	Standalone port of reicast to libretro
 WWW=		https://github.com/reicast/reicast-emulator
 
 LICENSE=	BSD3CLAUSE GPLv2 LGPL21
 LICENSE_COMB=	multi
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libao.so:audio/libao \
 		libasound.so:audio/alsa-lib \
 		libcurl.so:ftp/curl \
 		libevdev.so:devel/libevdev \
 		libpulse.so:audio/pulseaudio \
 		libudev.so:devel/libudev-devd
 
 USES=	cmake compiler gl xorg
 USE_GCC=	yes
 
 USE_LDCONFIG=	yes
 CMAKE_ARGS=	-DLIBRETRO_CORE=ON \
 		-DOPENGL_EGL_INCLUDE_DIR:PATH=${LOCALBASE}/include/EGL \
 		-DOPENGL_GLX_INCLUDE_DIR:PATH=${LOCALBASE}/include/GL \
 		-DOPENGL_INCLUDE_DIR:PATH=${LOCALBASE}/include/GL \
 		-DOPENGL_opengl_LIBRARY:PATH=${LOCALBASE}/lib/libGL.so
 
 CXXFLAGS+=	-Wno-c++11-extensions
 USE_GITHUB=	yes
 GH_ACCOUNT=	reicast
 GH_PROJECT=	reicast-emulator
 GH_TAGNAME=	0bd6ea3
 
 USE_GL=	egl gbm gl
 
 PLIST_FILES=	lib/libretro/reicast_libretro.so
 
 do-install:
 	@${MKDIR} ${STAGEDIR}/${PREFIX}/lib/libretro;
 	${INSTALL_LIB} ${WRKDIR}/.build/libreicast.so \
 		${STAGEDIR}/${PREFIX}/lib/libretro/reicast_libretro.so;
 
 .include <bsd.port.mk>
diff --git a/emulators/openmsx/Makefile b/emulators/openmsx/Makefile
index 84d66c29812c..be5ad5f167e3 100644
--- a/emulators/openmsx/Makefile
+++ b/emulators/openmsx/Makefile
@@ -1,41 +1,42 @@
 PORTNAME=	openmsx
 DISTVERSION=	18.0
+PORTREVISION=	1
 CATEGORIES=	emulators
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Open source MSX emulator
 WWW=		https://openmsx.org
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/doc/GPL.txt
 
 LIB_DEPENDS=	libpng.so:graphics/png \
 		libogg.so:audio/libogg \
 		libvorbis.so:audio/libvorbis \
 		libtheora.so:multimedia/libtheora \
 		libao.so:audio/libao \
 		libfreetype.so:print/freetype2 \
 		libasound.so:audio/alsa-lib
 
 USES=		gl gmake pkgconfig python sdl tcl
 USE_GCC=	yes
 USE_GL=		gl glew
 USE_SDL=	sdl2 ttf2
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	openMSX
 GH_PROJECT=	openMSX
 GH_TAGNAME=	RELEASE_18_0
 
 MAKEFILE=	GNUmakefile
 MAKE_ARGS=	INSTALL_BINARY_DIR=${PREFIX}/bin \
 		INSTALL_SHARE_DIR=${DATADIR} \
 		INSTALL_DOC_DIR=${DOCSDIR} \
 		OPENMSX_CXX=${CXX} \
 		CXXFLAGS="${CXXFLAGS}"
 
 BINARY_ALIAS=	python3=${PYTHON_CMD}
 
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.mk>
diff --git a/emulators/playonbsd/Makefile b/emulators/playonbsd/Makefile
index ef5f41138d99..e19762771c2d 100644
--- a/emulators/playonbsd/Makefile
+++ b/emulators/playonbsd/Makefile
@@ -1,75 +1,75 @@
 PORTNAME=	playonbsd
 PORTVERSION=	4.2.10
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	emulators games
 
 MAINTAINER=	Clockwork6400@protonmail.com
 COMMENT=	Easily install and run Windows software for use with Wine
 WWW=		https://github.com/Clockwork6400/POL-FreeBSD-4
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	7z:archivers/7-zip \
 		bash:shells/bash \
 		cabextract:archivers/cabextract \
 		glxinfo:graphics/mesa-demos \
 		gpg:security/gnupg \
 		gsed:textproc/gsed \
 		icotool:graphics/icoutils \
 		jq:textproc/jq \
 		sudo:security/sudo \
 		wget:ftp/wget \
 		xdg-open:devel/xdg-utils \
 		xterm:x11/xterm
 
 USES=		perl5 python:run shebangfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	Clockwork6400
 GH_PROJECT=	POL-FreeBSD-4
 USE_WX=		3.2
 WX_COMPS=	python:run
 SHEBANG_FILES=	bash/expert/* lib/*
 SHEBANG_GLOB=	*.py
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=		GECKO MONO NLS
 OPTIONS_DEFAULT=	GECKO MONO WINE
 OPTIONS_RADIO=		WINE
 OPTIONS_RADIO_WINE=	WINE WINE_DEVEL
 OPTIONS_SUB=		yes
 
 GECKO_DESC=		Wine-gecko HTML rendering support
 WINE_DESC=		Installing Wine Emulator dependencies
 WINE_DEVEL_DESC=	Installing Wine-devel emulator dependencies
 GECKO_RUN_DEPENDS=	wine-gecko>=2.47.1:emulators/wine-gecko
 MONO_RUN_DEPENDS=	wine-mono>=4.9.4:emulators/wine-mono
 NLS_USES=		gettext
 WINE_RUN_DEPENDS=	wine:emulators/wine
 WINE_DEVEL_RUN_DEPENDS=	wine:emulators/wine-devel
 
 .include <bsd.port.pre.mk>
 
 NO_BUILD=	true
 SUB_FILES=	playonbsd.sh
 
 do-install:
 .for d in bash python
 		cd ${WRKSRC} && ${COPYTREE_BIN} ${d} ${STAGEDIR}${PREFIX}/lib/playonbsd/ "! -name *\.orig ! -name *\.bak"
 .endfor
 .for d in etc lib plugins resources
 		cd ${WRKSRC} && ${COPYTREE_BIN} ${d} ${STAGEDIR}${PREFIX}/lib/playonbsd/ "! -name *\.orig ! -name *\.bak"
 .endfor
 		@${REINPLACE_CMD} -e 's:linux:bsd:g;s:linux:BSD:ig' ${WRKSRC}/doc/playonlinux.1
 		${INSTALL_MAN} ${WRKSRC}/doc/playonlinux.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/playonbsd.1
 		${INSTALL_SCRIPT} ${WRKDIR}/playonbsd.sh ${STAGEDIR}${PREFIX}/bin/playonbsd
 		${INSTALL_SCRIPT} ${WRKSRC}/playonfreebsd ${STAGEDIR}${PREFIX}/lib/playonbsd/playonfreebsd
 		${MKDIR} ${STAGEDIR}${PREFIX}/lib/playonbsd/lang/locale/en_GB/LC_MESSAGES
 		${INSTALL_SCRIPT} ${WRKSRC}/lang/locale/en_GB/LC_MESSAGES/pol.mo ${STAGEDIR}${PREFIX}/lib/playonbsd/lang/locale/en_GB/LC_MESSAGES/pol.mo
 		${MKDIR} ${STAGEDIR}${PREFIX}/lib/playonbsd/lang/po
 		${INSTALL_SCRIPT} ${WRKSRC}/lang/po/en_GB.po ${STAGEDIR}${PREFIX}/lib/playonbsd/lang/po/en_GB.po
 
 post-install-NLS-on:
 		cd ${WRKSRC} && ${COPYTREE_BIN} lang ${STAGEDIR}${PREFIX}/lib/playonbsd/ "! -name *\.orig ! -name *\.bak"
 
 .include <bsd.port.post.mk>
diff --git a/emulators/reicast/Makefile b/emulators/reicast/Makefile
index 03070bf80094..de4c61adbb85 100644
--- a/emulators/reicast/Makefile
+++ b/emulators/reicast/Makefile
@@ -1,51 +1,51 @@
 PORTNAME=	reicast
 PORTVERSION=	0.20201231
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	emulators games
 
 MAINTAINER=	beyert@cs.ucr.edu
 COMMENT=	Multi-platform Sega Dreamcast emulator
 WWW=		https://github.com/reicast/reicast-emulator
 
 LICENSE=	BSD3CLAUSE GPLv2 LGPL21
 LICENSE_COMB=	multi
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libao.so:audio/libao \
 		libasound.so:audio/alsa-lib \
 		libcurl.so:ftp/curl \
 		libevdev.so:devel/libevdev \
 		libpulse.so:audio/pulseaudio \
 		libudev.so:devel/libudev-devd
 
 USES=	cmake compiler gl xorg
 
 .include <bsd.port.options.mk>
 
 USE_GCC=	yes
 USE_LDCONFIG=	yes
 CMAKE_ARGS=	-DOPENGL_EGL_INCLUDE_DIR:PATH=${LOCALBASE}/include/EGL \
 		-DOPENGL_GLX_INCLUDE_DIR:PATH=${LOCALBASE}/include/GL \
 		-DOPENGL_INCLUDE_DIR:PATH=${LOCALBASE}/include/GL \
 		-DOPENGL_opengl_LIBRARY:PATH=${LOCALBASE}/lib/libGL.so
 
 .if ${ARCH} == i386
 USE_BINUTILS=	yes
 CXXFLAGS+=	-DSIMPLELINK
 .endif
 
 USE_GITHUB=	yes
 GH_TUPLE=	reicast:reicast-emulator:0bd6ea3 \
 		yuikns:intrin:ae63327:intrin/libswirl/deps/intrin
 
 USE_XORG=	ice sm x11 xext
 USE_GL=	egl gbm gl
 
 PLIST_FILES=	bin/reicast
 
 do-install:
 	${INSTALL} ${WRKDIR}/.build/${PORTNAME} \
 		${STAGEDIR}/${PREFIX}/bin/${PORTNAME};
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/emulators/skyeye/Makefile b/emulators/skyeye/Makefile
index 82a344dbc51c..d7851374dab2 100644
--- a/emulators/skyeye/Makefile
+++ b/emulators/skyeye/Makefile
@@ -1,23 +1,23 @@
 PORTNAME=	skyeye
 PORTVERSION=	1.2.5
-PORTREVISION=	7
+PORTREVISION=	8
 DISTVERSIONSUFFIX=	_REL
 CATEGORIES=	emulators
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Environment simulates typical ARM-base embedded computer systems
 WWW=		http://www.skyeye.org/
 
 LICENSE=	GPLv2
 
 USE_CSTD=	gnu89
 USE_BINUTILS=	yes
 USE_GCC=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	ac_cv_func_working_mktime=yes
 CFLAGS+=	-fcommon
 
 PLIST_FILES=	bin/skyeye
 
 .include <bsd.port.mk>
diff --git a/emulators/virtualbox-ose-additions-legacy/Makefile b/emulators/virtualbox-ose-additions-legacy/Makefile
index 904d3e638371..249f4bfa6ef6 100644
--- a/emulators/virtualbox-ose-additions-legacy/Makefile
+++ b/emulators/virtualbox-ose-additions-legacy/Makefile
@@ -1,174 +1,174 @@
 PORTNAME=	virtualbox-ose
 PORTVERSION=	5.2.44
-PORTREVISION?=	4
+PORTREVISION?=	5
 CATEGORIES=	emulators
 MASTER_SITES=	https://download.oracle.com/virtualbox/${PORTVERSION}/
 PKGNAMESUFFIX?=	-additions-legacy
 DISTNAME=	VirtualBox-${PORTVERSION}
 
 MAINTAINER=	vbox@FreeBSD.org
 COMMENT=	VirtualBox additions for FreeBSD guests
 WWW=		https://www.virtualbox.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 ONLY_FOR_ARCHS=	amd64 i386
 USES=		compiler:c++11-lang cpe iconv kmod tar:bzip2
 USE_RC_SUBR=	vboxguest vboxservice
 
 BUILD_DEPENDS=	yasm:devel/yasm \
 		kmk:devel/kBuild \
 		xsltproc:textproc/libxslt
 
 CPE_VENDOR=	oracle
 CPE_PRODUCT=	vm_virtualbox
 
 PATCHDIR=	${.CURDIR}/../${PORTNAME}-legacy/files
 WRKSRC=		${WRKDIR}/VirtualBox-${PORTVERSION}
 MAKE_JOBS_UNSAFE=	yes
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--disable-alsa \
 			--disable-docs \
 			--disable-libvpx \
 			--disable-opengl \
 			--disable-pulse \
 			--disable-python \
 			--disable-sdl-ttf \
 			--disable-xpcom
 CONFIGURE_ARGS+=	--nofatal --with-gcc="${CC}" --with-g++="${CXX}"
 
 CONFLICTS_INSTALL=	virtualbox-ose \
 			virtualbox-ose-additions \
 			virtualbox-ose-additions-devel \
 			virtualbox-ose-devel \
 			virtualbox-ose-lite \
 			virtualbox-ose-nox11
 
 PORTSCOUT=	limit:^5\.
 
 OPTIONS_DEFINE=	DBUS DEBUG X11
 OPTIONS_DEFAULT=	DBUS X11
 OPTIONS_SUB=	yes
 
 DBUS_CONFIGURE_OFF=	--disable-dbus
 DBUS_LIB_DEPENDS=	libdbus-1.so:devel/dbus
 DEBUG_CONFIGURE_ON=	--build-debug
 DEBUG_VARS=		KMK_BUILDTYPE=debug
 DEBUG_VARS_OFF=		KMK_BUILDTYPE=release
 X11_BUILD_DEPENDS=	${LOCALBASE}/include/xorg/compiler.h:x11-servers/xorg-server
 X11_RUN_DEPENDS=	xrandr:x11/xrandr
 X11_USE=		XORG=x11,xcursor,xext,xorgproto,xmu,xrandr,xt
 X11_USES=		pkgconfig xorg
 X11_VARS=		VBOX_WITH_X11=1
 
 .include <bsd.port.options.mk>
 
 .if ${SLAVE_PORT} == no
 CONFLICTS_INSTALL+=	virtualbox-ose-additions-nox11
 .else
 CONFLICTS_INSTALL+=	virtualbox-ose-additions
 .endif
 
 VIDEODIR=	${PREFIX}/lib/xorg/modules/drivers
 INPUTDIR=	${PREFIX}/lib/xorg/modules/input
 
 VBOX_BIN=	${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin/additions
 VBOX_SBINS=	VBoxControl \
 		VBoxService \
 		mount_vboxvfs
 
 BUILD_WRKSRC=	${VBOX_BIN}/src
 
 KMK_ARCH=	freebsd.${ARCH:S/i386/x86/}
 KMK_CONFIG+=	VBOX_LIBPATH_X11=${LOCALBASE} VBOX_FREEBSD_SRC=${SRC_BASE}/sys
 
 .if ${PORT_OPTIONS:MX11}
 .else
 VBOX_WITH_X11=
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${COMPILER_TYPE} == clang
 .if ${COMPILER_FEATURES:Mlibc++}
 EXTRA_PATCHES+=	${PATCHDIR}/extrapatch-src-VBox-Additions-x11-VBoxClient-Makefile.kmk
 .endif
 .endif
 
 post-patch:
 	@${ECHO_CMD} 'VBOX_ONLY_ADDITIONS = 1' > ${WRKSRC}/LocalConfig.kmk
 	@${ECHO_CMD} 'VBOX_WITH_DRAG_AND_DROP = ${VBOX_WITH_X11}' >> \
 	    ${WRKSRC}/LocalConfig.kmk
 	@${ECHO_CMD} 'VBOX_WITH_DRAG_AND_DROP_GH = ${VBOX_WITH_X11}' >> \
 	    ${WRKSRC}/LocalConfig.kmk
 	@${ECHO_CMD} 'VBOX_WITH_X11_ADDITIONS = ${VBOX_WITH_X11}' >> \
 	    ${WRKSRC}/LocalConfig.kmk
 	@${ECHO_CMD} 'VBOX_GCC_std = -std=c++11' >> ${WRKSRC}/LocalConfig.kmk
 .if ${COMPILER_TYPE} == clang
 	@${REINPLACE_CMD} -e 's| -finline-limit=8000||' \
 	    -e 's| -fno-merge-constants||' \
 	    -e 's| -mpreferred-stack-boundary=2||' ${WRKSRC}/Config.kmk
 .endif
 	@${REINPLACE_CMD} -e 's|/usr/X11|${LOCALBASE}|g' \
 	    ${WRKSRC}/src/VBox/Additions/x11/VBoxClient/display.cpp
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
 	    ${WRKSRC}/Config.kmk ${WRKSRC}/configure \
 	    ${WRKSRC}/kBuild/header.kmk ${WRKSRC}/kBuild/units/qt4.kmk \
 	    ${WRKSRC}/kBuild/units/qt5.kmk ${WRKSRC}/kBuild/sdks/LIBSDL.kmk \
 	    ${WRKSRC}/src/VBox/Additions/common/crOpenGL/load.c \
 	    ${WRKSRC}/src/VBox/Additions/x11/Installer/98vboxadd-xclient \
 	    ${WRKSRC}/src/VBox/Additions/x11/Installer/vboxclient.desktop \
 	    ${WRKSRC}/src/VBox/Additions/x11/vboxmouse/Makefile.kmk \
 	    ${WRKSRC}/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
 	@${REINPLACE_CMD} \
 	    -e 's|\$$KBUILDDIR_BIN/kmk_sed|${LOCALBASE}/bin/kmk_sed|g' \
 	    ${WRKSRC}/configure
 .if empty(ICONV_LIB)
 	@${REINPLACE_CMD} -e 's|iconv||' ${WRKSRC}/Config.kmk \
 	    ${WRKSRC}/src/VBox/Runtime/Makefile.kmk \
 	    ${WRKSRC}/src/VBox/Additions/x11/VBoxClient/Makefile.kmk
 	@${ECHO_CMD} 'VBOX_ICONV_DEFS = LIBICONV_PLUG' >> ${WRKSRC}/LocalConfig.kmk
 .endif
 
 post-patch-X11-on:
 	@${ECHO_CMD} 'VBOX_USE_SYSTEM_XORG_HEADERS = 1' >> \
 	    ${WRKSRC}/LocalConfig.kmk
 
 pre-build:
 	cd ${WRKSRC} && ${SH} -c \
 	    ". env.sh && ${KMK_CONFIG} ${LOCALBASE}/bin/kmk"
 
 do-install:
 	${MKDIR} ${STAGEDIR}${KMODDIR}
 	${INSTALL_KLD} ${VBOX_BIN}/src/vboxguest/vboxguest.ko \
 	    ${STAGEDIR}${KMODDIR}
 	${INSTALL_KLD} ${VBOX_BIN}/vboxvfs.ko ${STAGEDIR}${KMODDIR}
 	${INSTALL_LIB} ${VBOX_BIN}/pam_vbox.so ${STAGEDIR}${PREFIX}/lib
 	${INSTALL_PROGRAM} ${VBOX_SBINS:S|^|${VBOX_BIN}/|} \
 	    ${STAGEDIR}${PREFIX}/sbin/
 
 do-install-X11-on:
 	${INSTALL_PROGRAM} ${VBOX_BIN}/VBoxClient ${STAGEDIR}${PREFIX}/bin/
 	${INSTALL_SCRIPT} \
 	    ${WRKSRC}/src/VBox/Additions/x11/Installer/98vboxadd-xclient \
 	    ${STAGEDIR}${PREFIX}/bin/VBoxClient-all
 	# X11 autostart
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/xdg/autostart/
 	${INSTALL_DATA} \
 	    ${WRKSRC}/src/VBox/Additions/x11/Installer/vboxclient.desktop \
 	    ${STAGEDIR}${PREFIX}/etc/xdg/autostart/
 	# KDE autostart
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/autostart/
 	${INSTALL_DATA} \
 	    ${WRKSRC}/src/VBox/Additions/x11/Installer/vboxclient.desktop \
 	    ${STAGEDIR}${PREFIX}/share/autostart/
 	${MKDIR} ${STAGEDIR}${VIDEODIR}
 	${INSTALL_DATA} ${VBOX_BIN}/vboxvideo_drv_system.so \
 	    ${STAGEDIR}${VIDEODIR}/vboxvideo_drv.so
 	${MKDIR} ${STAGEDIR}${INPUTDIR}
 	${INSTALL_DATA} ${VBOX_BIN}/vboxmouse_drv_system.so \
 	    ${STAGEDIR}${INPUTDIR}/vboxmouse_drv.so
 
 .include <bsd.port.post.mk>
diff --git a/emulators/virtualbox-ose-additions-nox11-legacy/Makefile b/emulators/virtualbox-ose-additions-nox11-legacy/Makefile
index e168ca1181e1..f90f0be0b74d 100644
--- a/emulators/virtualbox-ose-additions-nox11-legacy/Makefile
+++ b/emulators/virtualbox-ose-additions-nox11-legacy/Makefile
@@ -1,8 +1,8 @@
 PKGNAMESUFFIX=	-additions-nox11-legacy
-PORTREVISION=	3
+PORTREVISION=	4
 
 OPTIONS_EXCLUDE=	DBUS DEBUG OPENGL X11
 
 MASTERDIR=	${.CURDIR}/../virtualbox-ose-additions-legacy
 
 .include "${MASTERDIR}/Makefile"
diff --git a/emulators/virtualbox-ose-additions-nox11/Makefile b/emulators/virtualbox-ose-additions-nox11/Makefile
index a6d493419d02..c3a0a446a2e7 100644
--- a/emulators/virtualbox-ose-additions-nox11/Makefile
+++ b/emulators/virtualbox-ose-additions-nox11/Makefile
@@ -1,8 +1,8 @@
 PKGNAMESUFFIX=	-additions-nox11
-PORTREVISION=	0
+PORTREVISION=	1
 
 OPTIONS_EXCLUDE=	DBUS DEBUG OPENGL X11
 
 MASTERDIR=	${.CURDIR}/../virtualbox-ose-additions
 
 .include "${MASTERDIR}/Makefile"
diff --git a/emulators/virtualbox-ose-additions/Makefile b/emulators/virtualbox-ose-additions/Makefile
index ee1cfd4bd1ae..3a6dc9421570 100644
--- a/emulators/virtualbox-ose-additions/Makefile
+++ b/emulators/virtualbox-ose-additions/Makefile
@@ -1,164 +1,164 @@
 PORTNAME=	virtualbox-ose
 PORTVERSION=	6.1.36
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES=	emulators
 MASTER_SITES=	https://download.virtualbox.org/virtualbox/${PORTVERSION}/
 PKGNAMESUFFIX?=	-additions
 DISTNAME=	VirtualBox-${PORTVERSION}
 
 MAINTAINER=	vbox@FreeBSD.org
 COMMENT=	VirtualBox additions for FreeBSD guests
 WWW=		https://www.virtualbox.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 ONLY_FOR_ARCHS=	amd64
 USES=		compiler:c++11-lang cpe iconv kmod tar:bzip2
 USE_RC_SUBR=	vboxguest vboxservice
 
 BUILD_DEPENDS=	yasm:devel/yasm \
 		kmk:devel/kBuild \
 		xsltproc:textproc/libxslt
 
 CPE_VENDOR=	oracle
 CPE_PRODUCT=	vm_virtualbox
 
 PATCHDIR=	${.CURDIR}/../${PORTNAME}/files
 WRKSRC=		${WRKDIR}/VirtualBox-${PORTVERSION}
 MAKE_JOBS_UNSAFE=	yes
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--disable-alsa \
 			--disable-docs \
 			--disable-libvpx \
 			--disable-opengl \
 			--disable-pulse \
 			--disable-python \
 			--disable-sdl-ttf \
 			--disable-xpcom
 CONFIGURE_ARGS+=	--nofatal --with-gcc="${CC}" --with-g++="${CXX}"
 
 CONFLICTS_INSTALL=	virtualbox-ose \
 			virtualbox-ose-additions-devel \
 			virtualbox-ose-additions-legacy \
 			virtualbox-ose-devel \
 			virtualbox-ose-legacy \
 			virtualbox-ose-lite \
 			virtualbox-ose-nox11
 
 OPTIONS_DEFINE=	DBUS DEBUG X11
 OPTIONS_DEFAULT=	DBUS X11
 OPTIONS_SUB=	yes
 
 DBUS_CONFIGURE_OFF=	--disable-dbus
 DBUS_LIB_DEPENDS=	libdbus-1.so:devel/dbus
 DEBUG_CONFIGURE_ON=	--build-debug
 DEBUG_VARS=		KMK_BUILDTYPE=debug
 DEBUG_VARS_OFF=		KMK_BUILDTYPE=release
 X11_BUILD_DEPENDS=	${LOCALBASE}/include/xorg/compiler.h:x11-servers/xorg-server
 X11_RUN_DEPENDS=	xrandr:x11/xrandr
 X11_USE=		XORG=x11,xcursor,xext,xorgproto,xmu,xrandr,xt
 X11_USES=		pkgconfig xorg
 X11_VARS=		VBOX_WITH_X11=1
 
 .include <bsd.port.options.mk>
 
 .if ${SLAVE_PORT} == no
 CONFLICTS_INSTALL+=	virtualbox-ose-additions-nox11
 .else
 CONFLICTS_INSTALL+=	virtualbox-ose-additions
 .endif
 
 VIDEODIR=	${PREFIX}/lib/xorg/modules/drivers
 INPUTDIR=	${PREFIX}/lib/xorg/modules/input
 
 VBOX_BIN=	${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin/additions
 VBOX_SBINS=	VBoxControl \
 		VBoxService \
 		mount_vboxvfs
 
 BUILD_WRKSRC=	${VBOX_BIN}/src
 
 KMK_ARCH=	freebsd.${ARCH:S/i386/x86/}
 KMK_CONFIG+=	VBOX_LIBPATH_X11=${LOCALBASE} VBOX_FREEBSD_SRC=${SRC_BASE}/sys
 
 .if ${PORT_OPTIONS:MX11}
 .else
 VBOX_WITH_X11=
 .endif
 
 .include <bsd.port.pre.mk>
 
 post-patch:
 	@${ECHO_CMD} 'VBOX_ONLY_ADDITIONS = 1' > ${WRKSRC}/LocalConfig.kmk
 	@${ECHO_CMD} 'VBOX_WITH_DRAG_AND_DROP = ${VBOX_WITH_X11}' >> \
 	    ${WRKSRC}/LocalConfig.kmk
 	@${ECHO_CMD} 'VBOX_WITH_DRAG_AND_DROP_GH = ${VBOX_WITH_X11}' >> \
 	    ${WRKSRC}/LocalConfig.kmk
 	@${ECHO_CMD} 'VBOX_WITH_X11_ADDITIONS = ${VBOX_WITH_X11}' >> \
 	    ${WRKSRC}/LocalConfig.kmk
 	@${ECHO_CMD} 'VBOX_GCC_std = -std=c++11' >> ${WRKSRC}/LocalConfig.kmk
 .if ${COMPILER_TYPE} == clang
 	@${REINPLACE_CMD} -e 's| -finline-limit=8000||' \
 	    -e 's| -fno-merge-constants||' \
 	    -e 's| -mpreferred-stack-boundary=2||' ${WRKSRC}/Config.kmk
 .endif
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
 	    ${WRKSRC}/Config.kmk ${WRKSRC}/configure \
 	    ${WRKSRC}/kBuild/header.kmk ${WRKSRC}/kBuild/units/qt4.kmk \
 	    ${WRKSRC}/kBuild/units/qt5.kmk ${WRKSRC}/kBuild/sdks/LIBSDL.kmk \
 	    ${WRKSRC}/src/VBox/Additions/x11/Installer/98vboxadd-xclient \
 	    ${WRKSRC}/src/VBox/Additions/x11/Installer/vboxclient.desktop \
 	    ${WRKSRC}/src/VBox/Additions/x11/vboxmouse/Makefile.kmk \
 	    ${WRKSRC}/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
 	@${REINPLACE_CMD} \
 	    -e 's|\$$KBUILDDIR_BIN/kmk_sed|${LOCALBASE}/bin/kmk_sed|g' \
 	    ${WRKSRC}/configure
 .if empty(ICONV_LIB)
 	@${REINPLACE_CMD} -e 's|iconv||' ${WRKSRC}/Config.kmk \
 	    ${WRKSRC}/src/VBox/Runtime/Makefile.kmk \
 	    ${WRKSRC}/src/VBox/Additions/x11/VBoxClient/Makefile.kmk
 	@${ECHO_CMD} 'VBOX_ICONV_DEFS = LIBICONV_PLUG' >> ${WRKSRC}/LocalConfig.kmk
 .endif
 
 post-patch-X11-on:
 	@${ECHO_CMD} 'VBOX_USE_SYSTEM_XORG_HEADERS = 1' >> \
 	    ${WRKSRC}/LocalConfig.kmk
 
 pre-build:
 	cd ${WRKSRC} && ${SH} -c \
 	    ". env.sh && ${KMK_CONFIG} ${LOCALBASE}/bin/kmk"
 
 do-install:
 	${MKDIR} ${STAGEDIR}${KMODDIR}
 	${INSTALL_KLD} ${VBOX_BIN}/src/vboxguest/vboxguest.ko \
 	    ${STAGEDIR}${KMODDIR}
 	${INSTALL_KLD} ${VBOX_BIN}/vboxvfs.ko ${STAGEDIR}${KMODDIR}
 	${INSTALL_LIB} ${VBOX_BIN}/pam_vbox.so ${STAGEDIR}${PREFIX}/lib
 	${INSTALL_PROGRAM} ${VBOX_SBINS:S|^|${VBOX_BIN}/|} \
 	    ${STAGEDIR}${PREFIX}/sbin/
 
 do-install-X11-on:
 	${INSTALL_PROGRAM} ${VBOX_BIN}/VBoxClient ${STAGEDIR}${PREFIX}/bin/
 	${INSTALL_SCRIPT} \
 	    ${WRKSRC}/src/VBox/Additions/x11/Installer/98vboxadd-xclient \
 	    ${STAGEDIR}${PREFIX}/bin/VBoxClient-all
 	# X11 autostart
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/xdg/autostart/
 	${INSTALL_DATA} \
 	    ${WRKSRC}/src/VBox/Additions/x11/Installer/vboxclient.desktop \
 	    ${STAGEDIR}${PREFIX}/etc/xdg/autostart/
 	# KDE autostart
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/autostart/
 	${INSTALL_DATA} \
 	    ${WRKSRC}/src/VBox/Additions/x11/Installer/vboxclient.desktop \
 	    ${STAGEDIR}${PREFIX}/share/autostart/
 	${MKDIR} ${STAGEDIR}${VIDEODIR}
 	${INSTALL_LIB} ${VBOX_BIN}/vboxvideo_drv_system.so \
 	    ${STAGEDIR}${VIDEODIR}/vboxvideo_drv.so
 	${MKDIR} ${STAGEDIR}${INPUTDIR}
 	${INSTALL_LIB} ${VBOX_BIN}/vboxmouse_drv_system.so \
 	    ${STAGEDIR}${INPUTDIR}/vboxmouse_drv.so
 
 .include <bsd.port.post.mk>
diff --git a/emulators/virtualbox-ose-kmod-legacy/Makefile b/emulators/virtualbox-ose-kmod-legacy/Makefile
index d6564769c514..7ab23e6d259e 100644
--- a/emulators/virtualbox-ose-kmod-legacy/Makefile
+++ b/emulators/virtualbox-ose-kmod-legacy/Makefile
@@ -1,110 +1,110 @@
 PORTNAME=	virtualbox-ose
 PORTVERSION=	5.2.44
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	emulators
 MASTER_SITES=	https://download.oracle.com/virtualbox/${PORTVERSION}/
 PKGNAMESUFFIX=	-kmod-legacy
 DISTNAME=	VirtualBox-${PORTVERSION}
 
 MAINTAINER=	vbox@FreeBSD.org
 COMMENT=	VirtualBox kernel module for FreeBSD
 WWW=		https://www.virtualbox.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	kmk:devel/kBuild
 
 CPE_VENDOR=	oracle
 CPE_PRODUCT=	vm_virtualbox
 
 SUB_FILES=	pkg-message
 SUB_LIST=	OPSYS=${OPSYS} OSREL=${OSREL}
 
 USES=		cpe kmod tar:bzip2
 PATCHDIR=	${.CURDIR}/../${PORTNAME}-legacy/files
 WRKSRC=		${WRKDIR}/VirtualBox-${PORTVERSION}
 USE_RC_SUBR=	vboxnet
 ONLY_FOR_ARCHS=	i386 amd64
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--build-headless
 CONFIGURE_ARGS+=	--disable-alsa \
 			--disable-dbus \
 			--disable-docs \
 			--disable-libvpx \
 			--disable-pulse \
 			--disable-python \
 			--disable-sdl-ttf \
 			--disable-xpcom
 CONFIGURE_ARGS+=	--nofatal --with-gcc="${CC}" --with-g++="${CXX}"
 
 CONFLICTS_INSTALL=	virtualbox-ose-kmod
 
 PORTSCOUT=	limit:^5\.
 
 OPTIONS_DEFINE=	DEBUG VIMAGE
 OPTIONS_DEFAULT=VIMAGE
 OPTIONS_SUB=	yes
 DEBUG_DESC=	Debug symbols, additional logs and assertions
 VIMAGE_DESC=	VIMAGE virtual networking support
 
 .include <bsd.port.options.mk>
 
 VBOX_BIN=	${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin/src
 VBOX_KMODS=	vboxdrv \
 		vboxnetadp \
 		vboxnetflt
 
 BUILD_WRKSRC=	${VBOX_BIN}
 
 KMK_BUILDTYPE=	release
 KMK_CONFIG=	VBOX_LIBPATH_X11=${LOCALBASE} VBOX_FREEBSD_SRC=${SRC_BASE}/sys
 KMK_FLAGS=	HostDrivers-scripts vboxdrv-src VBoxNetFlt-src VBoxNetAdp-src
 
 .if ${PORT_OPTIONS:MDEBUG}
 KMK_FLAGS+=	BUILD_TYPE=debug
 KMK_BUILDTYPE=	debug
 EXTRA_PATCHES+=	${PATCHDIR}/extrapatch-src-VBox-HostDrivers-Support-freebsd-Makefile
 MAKE_ARGS+=	DEBUG_FLAGS="-O1 -g"
 .endif
 
 .if ${ARCH} == i386
 KMK_ARCH=	freebsd.x86
 .else
 KMK_ARCH=	freebsd.${ARCH}
 .endif
 
 .include <bsd.port.pre.mk>
 
 SYMBOLSUFFIX=	debug
 PLIST_SUB+=	SYMBOLSUFFIX=${SYMBOLSUFFIX}
 
 post-patch:
 	@${ECHO_CMD} 'VBOX_WITH_VBOXDRV = 1' > ${WRKSRC}/LocalConfig.kmk
 	@${ECHO_CMD} 'VBOX_WITH_NETFLT = 1' >> ${WRKSRC}/LocalConfig.kmk
 	@${ECHO_CMD} 'VBOX_WITH_NETADP = 1' >> ${WRKSRC}/LocalConfig.kmk
 	@${ECHO_CMD} 'VBOX_WITH_ADDITIONS =' >> ${WRKSRC}/LocalConfig.kmk
 .if ${PORT_OPTIONS:MVIMAGE}
 	@${ECHO_CMD} 'VBOX_WITH_NETFLT_VIMAGE = 1' >> ${WRKSRC}/LocalConfig.kmk
 .endif
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
 	    ${WRKSRC}/Config.kmk ${WRKSRC}/configure
 	@${REINPLACE_CMD} \
 	    -e 's|\$$KBUILDDIR_BIN/kmk_sed|${LOCALBASE}/bin/kmk_sed|g' \
 	    ${WRKSRC}/configure
 
 pre-build:
 	cd ${WRKSRC}/src/VBox/HostDrivers && ${SH} -c \
 	    '. ${WRKSRC}/env.sh && ${KMK_CONFIG} ${LOCALBASE}/bin/kmk ${KMK_FLAGS}'
 
 do-install:
 	${MKDIR} ${STAGEDIR}${KMODDIR}
 .for i in ${VBOX_KMODS}
 	${INSTALL_KLD} ${VBOX_BIN}/${i}/${i}.ko ${STAGEDIR}${KMODDIR}
 .if ${PORT_OPTIONS:MDEBUG}
 	${INSTALL_KLD} ${VBOX_BIN}/${i}/${i}.ko.${SYMBOLSUFFIX} ${STAGEDIR}${KMODDIR}
 .endif
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/emulators/virtualbox-ose-kmod/Makefile b/emulators/virtualbox-ose-kmod/Makefile
index 1e31a951bd58..efd78069f3c8 100644
--- a/emulators/virtualbox-ose-kmod/Makefile
+++ b/emulators/virtualbox-ose-kmod/Makefile
@@ -1,108 +1,109 @@
 PORTNAME=	virtualbox-ose
 PORTVERSION=	6.1.36
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	https://download.virtualbox.org/virtualbox/${PORTVERSION}/
 PKGNAMESUFFIX=	-kmod
 DISTNAME=	VirtualBox-${PORTVERSION}
 
 MAINTAINER=	vbox@FreeBSD.org
 COMMENT=	VirtualBox kernel module for FreeBSD
 WWW=		https://www.virtualbox.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	kmk:devel/kBuild
 
 CPE_VENDOR=	oracle
 CPE_PRODUCT=	vm_virtualbox
 
 SUB_FILES=	pkg-message
 SUB_LIST=	OPSYS=${OPSYS} OSREL=${OSREL}
 
 USES=		cpe compiler:c++14-lang kmod tar:bzip2
 PATCHDIR=	${.CURDIR}/../${PORTNAME}/files
 WRKSRC=		${WRKDIR}/VirtualBox-${PORTVERSION}
 USE_RC_SUBR=	vboxnet
 ONLY_FOR_ARCHS=	amd64
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--build-headless
 CONFIGURE_ARGS+=	--disable-alsa \
 			--disable-dbus \
 			--disable-docs \
 			--disable-libvpx \
 			--disable-pulse \
 			--disable-python \
 			--disable-sdl-ttf \
 			--disable-xpcom
 CONFIGURE_ARGS+=	--nofatal --with-gcc="${CC}" --with-g++="${CXX}"
 
 CONFLICTS_INSTALL=	virtualbox-ose-kmod-legacy
 
 OPTIONS_DEFINE=	DEBUG VIMAGE
 OPTIONS_DEFAULT=VIMAGE
 OPTIONS_SUB=	yes
 DEBUG_DESC=	Debug symbols, additional logs and assertions
 VIMAGE_DESC=	VIMAGE virtual networking support
 
 .include <bsd.port.options.mk>
 
 VBOX_BIN=	${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin/src
 VBOX_KMODS=	vboxdrv \
 		vboxnetadp \
 		vboxnetflt
 
 BUILD_WRKSRC=	${VBOX_BIN}
 
 KMK_BUILDTYPE=	release
 KMK_CONFIG=	VBOX_LIBPATH_X11=${LOCALBASE} VBOX_FREEBSD_SRC=${SRC_BASE}/sys
 KMK_FLAGS=	HostDrivers-scripts vboxdrv-src VBoxNetFlt-src VBoxNetAdp-src
 
 .if ${PORT_OPTIONS:MDEBUG}
 KMK_FLAGS+=	BUILD_TYPE=debug
 KMK_BUILDTYPE=	debug
 EXTRA_PATCHES+=	${PATCHDIR}/extrapatch-Config.kmk \
 		${PATCHDIR}/extrapatch-src-VBox-HostDrivers-Support-freebsd-Makefile
 MAKE_ARGS+=	DEBUG_FLAGS="-O1 -g"
 .endif
 
 .if ${ARCH} == i386
 KMK_ARCH=	freebsd.x86
 .else
 KMK_ARCH=	freebsd.${ARCH}
 .endif
 
 .include <bsd.port.pre.mk>
 
 SYMBOLSUFFIX=	debug
 PLIST_SUB+=	SYMBOLSUFFIX=${SYMBOLSUFFIX}
 
 post-patch:
 	@${ECHO_CMD} 'VBOX_WITH_VBOXDRV = 1' > ${WRKSRC}/LocalConfig.kmk
 	@${ECHO_CMD} 'VBOX_WITH_NETFLT = 1' >> ${WRKSRC}/LocalConfig.kmk
 	@${ECHO_CMD} 'VBOX_WITH_NETADP = 1' >> ${WRKSRC}/LocalConfig.kmk
 	@${ECHO_CMD} 'VBOX_WITH_ADDITIONS =' >> ${WRKSRC}/LocalConfig.kmk
 .if ${PORT_OPTIONS:MVIMAGE}
 	@${ECHO_CMD} 'VBOX_WITH_NETFLT_VIMAGE = 1' >> ${WRKSRC}/LocalConfig.kmk
 .endif
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
 	    ${WRKSRC}/Config.kmk ${WRKSRC}/configure
 	@${REINPLACE_CMD} \
 	    -e 's|\$$KBUILDDIR_BIN/kmk_sed|${LOCALBASE}/bin/kmk_sed|g' \
 	    ${WRKSRC}/configure
 
 pre-build:
 	cd ${WRKSRC}/src/VBox/HostDrivers && ${SH} -c \
 	    '. ${WRKSRC}/env.sh && ${KMK_CONFIG} ${LOCALBASE}/bin/kmk ${KMK_FLAGS}'
 
 do-install:
 	${MKDIR} ${STAGEDIR}${KMODDIR}
 .for i in ${VBOX_KMODS}
 	${INSTALL_KLD} ${VBOX_BIN}/${i}/${i}.ko ${STAGEDIR}${KMODDIR}
 .if ${PORT_OPTIONS:MDEBUG}
 	${INSTALL_KLD} ${VBOX_BIN}/${i}/${i}.ko.${SYMBOLSUFFIX} ${STAGEDIR}${KMODDIR}
 .endif
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/emulators/virtualbox-ose-legacy/Makefile b/emulators/virtualbox-ose-legacy/Makefile
index 473396c87ce0..1c22e2fed732 100644
--- a/emulators/virtualbox-ose-legacy/Makefile
+++ b/emulators/virtualbox-ose-legacy/Makefile
@@ -1,430 +1,430 @@
 PORTNAME=	virtualbox-ose
 PORTVERSION=	5.2.44
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	emulators
 MASTER_SITES=	https://download.oracle.com/virtualbox/${PORTVERSION}/
 PKGNAMESUFFIX?=	-legacy
 DISTFILES=	VirtualBox-${PORTVERSION}${EXTRACT_SUFX} ${GUESTADDITIONS}
 EXTRACT_ONLY=	VirtualBox-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	vbox@FreeBSD.org
 COMMENT=	General-purpose full virtualizer for x86 hardware
 WWW=		https://www.virtualbox.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 PATCH_DEPENDS+=	${LOCALBASE}/share/kBuild/tools/GXX3.kmk:devel/kBuild
 BUILD_DEPENDS=	yasm:devel/yasm \
 		xsltproc:textproc/libxslt \
 		kmk:devel/kBuild \
 		gtar:archivers/gtar
 LIB_DEPENDS=	libpng.so:graphics/png \
 		libxslt.so:textproc/libxslt \
 		libcurl.so:ftp/curl
 RUN_DEPENDS=	${LOCALBASE}/etc/rc.d/vboxnet:emulators/virtualbox-ose-kmod-legacy
 
 CPE_VENDOR=	oracle
 CPE_PRODUCT=	vm_virtualbox
 
 WRKSRC=		${WRKDIR}/VirtualBox-${PORTVERSION}
 ONLY_FOR_ARCHS=	i386 amd64
 USES=		compiler:c++14-lang cpe gnome iconv pkgconfig ssl tar:bzip2
 USE_GNOME=	libidl libxml2
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-java --passive-mesa
 CONFIGURE_ARGS+=	--with-gcc="${CC}" --with-g++="${CXX}"
 
 CONFLICTS_INSTALL=	virtualbox-ose-additions-* \
 			virtualbox-ose-devel \
 			virtualbox-ose \
 			virtualbox-ose-lite
 
 PORTSCOUT=	limit:^5\.
 
 LDFLAGS=	-lpthread
 
 VBOXUSER?=	vboxusers
 VBOXWSUSER?=	vboxusers
 VBOXGROUP?=	vboxusers
 USERS=		${VBOXUSER}
 GROUPS=		${VBOXGROUP}
 VBOX_DIR=	${PREFIX}/${VBOX_DIR_REL}
 VBOX_DIR_REL=	lib/virtualbox
 VBOX_LINKS=	VBoxVRDP
 VBOX_PROGS=	VBoxAutostart VBoxBalloonCtrl VBoxBugReport VBoxHeadless \
 		VBoxManage
 VBOX_UTILS=	VBoxExtPackHelperApp VBoxNetAdpCtl VBoxNetDHCP VBoxNetNAT \
 		VBoxSVC VBoxXPCOMIPCD
 
 OPTIONS_DEFINE=	ALSA DBUS DEBUG GUESTADDITIONS MANUAL NLS PULSEAUDIO \
 		PYTHON QT5 R0LOGGING UDPTUNNEL VDE VNC WEBSERVICE VPX X11
 OPTIONS_DEFAULT=	DBUS QT5 UDPTUNNEL VNC WEBSERVICE X11
 OPTIONS_SUB=	yes
 
 DEBUG_DESC=	Debug symbols, additional logs and assertions
 GUESTADDITIONS_DESC=	Build with Guest Additions
 MANUAL_DESC=	Build with user manual
 NLS_DESC=	Native language support (requires QT5)
 QT5_DESC=	Build with QT5 frontend (requires X11)
 R0LOGGING_DESC=	Enable R0 logging (requires DEBUG)
 UDPTUNNEL_DESC=	Build with UDP tunnel support
 VDE_DESC=	Build with VDE support
 VNC_DESC=	Build with VNC support
 VPX_DESC=	Use libvpx for video recording
 WEBSERVICE_DESC=	Build Webservice
 
 ALSA_CONFIGURE_OFF=	--disable-alsa
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 DBUS_CONFIGURE_OFF=	--disable-dbus
 DBUS_LIB_DEPENDS=	libdbus-1.so:devel/dbus
 DEBUG_CONFIGURE_ON=	--build-debug
 MANUAL_BUILD_DEPENDS=	${LOCALBASE}/share/xml/docbook/4.4/docbookx.dtd:textproc/docbook-xml
 MANUAL_CONFIGURE_OFF=	--disable-docs
 NLS_IMPLIES=		QT5
 PULSEAUDIO_CONFIGURE_OFF=	--disable-pulse
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PYTHON_CONFIGURE_OFF=	--disable-python
 QT5_IMPLIES=		X11
 R0LOGGING_IMPLIES=	DEBUG
 UDPTUNNEL_CONFIGURE_OFF=	--disable-udptunnel
 VDE_CONFIGURE_ON=	--enable-vde
 VDE_RUN_DEPENDS=	vde_switch:net/vde2
 VNC_CONFIGURE_ON=	--enable-vnc
 VNC_LIB_DEPENDS=	libvncserver.so:net/libvncserver
 VPX_CONFIGURE_OFF=	--disable-libvpx
 VPX_LIB_DEPENDS=	libvpx.so:multimedia/libvpx
 X11_CONFIGURE_OFF=	--build-headless
 
 ENV=
 .export ENV
 
 PLIST_SUB=	GUEST_VER=${PORTVERSION} \
 		PYTHON_VERU=${PYTHON_VER:S/./_/}${PYTHON_ABIVER} \
 		VBOXGROUP=${VBOXGROUP}
 SUB_LIST=	VBOXDIR=${VBOX_DIR} \
 		VBOXGROUP=${VBOXGROUP} \
 		VBOXUSER=${VBOXUSER} \
 		VBOXWSUSER=${VBOXWSUSER}
 USE_RC_SUBR=	vboxheadless vboxwatchdog
 
 .include <bsd.port.options.mk>
 
 .if ${SLAVE_PORT} == no
 CONFLICTS_INSTALL+=	virtualbox-ose-nox11
 OPTIONS_DEFAULT+=	PYTHON
 .else
 CONFLICTS_INSTALL+=	virtualbox-ose
 .endif
 
 .if ${ARCH} == "amd64"
 _ELF32!=	kldstat -q -m elf32 && echo yes || echo no
 .endif
 
 .if ${PORT_OPTIONS:MDEBUG}
 KMK_BUILDTYPE=	debug
 KMK_FLAGS+=	BUILD_TYPE=debug
 .else
 KMK_BUILDTYPE=	release
 .endif
 
 .if ${PORT_OPTIONS:MGUESTADDITIONS}
 GUESTADDITIONS=	VBoxGuestAdditions_${PORTVERSION}.iso
 LICENSE+=	Additions
 LICENSE_COMB=	multi
 LICENSE_NAME_Additions=	Guest Additions
 LICENSE_PERMS_Additions=	auto-accept
 LICENSE_DISTFILES_Additions=	${GUESTADDITIONS}
 .endif
 
 .if ${PORT_OPTIONS:MMANUAL}
 DBKXMLDIR=	${LOCALBASE}/share/xml/docbook/4.4
 DBKXSLDIR=	${LOCALBASE}/share/xsl/docbook
 USES+=		tex
 USE_TEX=	dvipsk:build formats:build
 .endif
 
 .if ${PORT_OPTIONS:MPYTHON}
 USES+=		python
 USE_PYTHON=	distutils noegginfo noflavors
 PYDISTUTILS_PKGNAME=	vboxapi
 PYDISTUTILS_PKGVERSION=	1.0
 .else
 USES+=		python:build
 .endif
 
 .if ${PORT_OPTIONS:MQT5}
 CONFIGURE_ARGS+=	--enable-qt5
 PLIST_SUB+=	QT=""
 USES+=		gl qmake:no_env qt:5 xorg
 USE_GL=		gl glu
 USE_QT=		buildtools:build core dbus gui linguisttools:build opengl
 USE_QT+=	printsupport widgets x11extras
 USE_XORG=	xcb
 VBOX_PROGS+=	VirtualBox
 VBOX_UTILS+=	VBoxTestOGL
 VBOX_WITH_QT=	1
 .else
 CONFIGURE_ARGS+=	--disable-qt
 PLIST_SUB+=	QT="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MWEBSERVICE}
 BUILD_DEPENDS+=	soapcpp2:devel/gsoap
 USE_RC_SUBR+=	vboxwebsrv
 VBOX_LINKS+=	vboxwebsrv
 VBOX_UTILS+=	vboxwebsrv webtest
 .endif
 
 .if ${PORT_OPTIONS:MX11}
 USES+=		sdl
 USE_SDL=	sdl
 USE_XORG+=	xorgproto x11 xcursor xext xinerama xmu xt
 VBOX_PROGS+=	VBoxSDL
 .endif
 
 .if ${PORT_OPTIONS:MPYTHON} || ${PORT_OPTIONS:MWEBSERVICE}
 PLIST_SUB+=	SDK=""
 .else
 PLIST_SUB+=	SDK="@comment "
 .endif
 
 .if ${ARCH} == i386
 KMK_ARCH=	freebsd.x86
 PLIST_SUB+=	I386=""
 .else
 KMK_ARCH=	freebsd.${ARCH}
 PLIST_SUB+=	I386="@comment "
 .endif
 
 PLIST_SUB+=	ARCH="${KMK_ARCH}"
 
 KMK_BUILDDIR=	${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}
 KMK_CONFIG=	VBOX_LIBPATH_X11=${LOCALBASE} VBOX_FREEBSD_SRC=${SRC_BASE}/sys
 KMK_FLAGS+=	-j${MAKE_JOBS_NUMBER}
 
 .include <bsd.port.pre.mk>
 
 .if ${OPSYS} == FreeBSD
 .if ${OSVERSION} >= 1400059
 BROKEN=		Fails to compile with libc++ 14.0.3
 .elif ${OSVERSION} >= 1301000 && ${OSVERSION} < 1400000
 BROKEN=		Fails to compile: error: ran out of registers during register allocation
 .endif
 .endif
 
 .if ${CHOSEN_COMPILER_TYPE} == clang && ${OPSYS} == FreeBSD && ${OSVERSION} > 1400022
 # clang > 11 included in FreeBSD 14 fails to compile this legacy version
 # of virtualbox-ose, force clang 11 on FreeBSD 14 where a newer clang is
 # included.
 BUILD_DEPENDS+=	clang${VBOX_LLVM_VER}:devel/llvm${VBOX_LLVM_VER}
 CC=		clang${VBOX_LLVM_VER}
 CXX=		clang++${VBOX_LLVM_VER}
 VBOX_LLVM_VER?=	11
 .endif
 
 .if ${PYTHON_MAJOR_VER} >= 3
 PLIST_SUB+=	PYTHON_PYCDIR=/__pycache__/ \
 		PYTHON_PYCEXT=.cpython-${PYTHON_SUFFIX}.pyc
 .else
 PLIST_SUB+=	PYTHON_PYCDIR=/ \
 		PYTHON_PYCEXT=.pyc
 .endif
 
 .if ${SSL_DEFAULT} != base
 CONFIGURE_ARGS+=	--with-openssl-dir="${OPENSSLBASE}"
 .endif
 
 pre-everything::
 .if ${ARCH} == "amd64"
 .if ${_ELF32} != yes
 	@${ECHO_MSG} 'Requires 32-bit runtime support in kernel.'
 	@${ECHO_MSG} 'Rebuild kernel with "options COMPAT_FREEBSD32" and reboot.'
 	@${FALSE}
 .elif !exists(/usr/lib32/libc.so)
 	@${ECHO_MSG} 'Requires 32-bit libraries installed under /usr/lib32.'
 	@${ECHO_MSG} 'Do: cd /usr/src; make build32 install32; service ldconfig restart'
 	@${FALSE}
 .endif
 .endif
 
 post-patch:
 	@${ECHO_CMD} 'VBOX_PATH_APP_PRIVATE_ARCH = ${VBOX_DIR}' > \
 	    ${WRKSRC}/LocalConfig.kmk
 	@${ECHO_CMD} 'VBOX_PATH_DOCBOOK = ${DBKXSLDIR}' >> \
 	    ${WRKSRC}/LocalConfig.kmk
 	@${ECHO_CMD} 'VBOX_PATH_DOCBOOK_DTD = ${DBKXMLDIR}' >> \
 	    ${WRKSRC}/LocalConfig.kmk
 	@${ECHO_CMD} 'VBOX_PATH_SHARED_LIBS = ${VBOX_DIR}' >> \
 	    ${WRKSRC}/LocalConfig.kmk
 	# Please keep this even if using Clang to avoid repeated regressions.
 	# PR 245048
 	@${ECHO_CMD} "VBOX_WITH_RUNPATH = ${_GCC_RUNTIME:D${_GCC_RUNTIME}\:}${VBOX_DIR}" >> \
 	    ${WRKSRC}/LocalConfig.kmk
 	@${ECHO_CMD} 'VBOX_PATH_APP_PRIVATE = ${DATADIR}' >> \
 	    ${WRKSRC}/LocalConfig.kmk
 	@${ECHO_CMD} 'VBOX_PATH_APP_DOCS = ${DOCSDIR}' >> ${WRKSRC}/LocalConfig.kmk
 .if ${SSL_DEFAULT} != base
 	@${ECHO_CMD} 'VBOX_WITH_ALT_HASH_CODE = 1' >> ${WRKSRC}/LocalConfig.kmk
 .endif
 	@${ECHO_CMD} 'VBOX_WITH_EXTPACK_VBOXDTRACE =' >> ${WRKSRC}/LocalConfig.kmk
 	@${ECHO_CMD} 'VBOX_WITH_INSTALLER = 1' >> ${WRKSRC}/LocalConfig.kmk
 	@${ECHO_CMD} 'VBOX_WITH_VBOXDRV =' >> ${WRKSRC}/LocalConfig.kmk
 	@${ECHO_CMD} 'VBOX_WITH_TESTCASES =' >> ${WRKSRC}/LocalConfig.kmk
 	@${ECHO_CMD} 'SDK_VBOX_LIBPNG_INCS = ${PREFIX}/include/libpng' >> \
 	    ${WRKSRC}/LocalConfig.kmk
 	@${ECHO_CMD} 'SDK_VBOX_LIBPNG_LIBS = png' >> ${WRKSRC}/LocalConfig.kmk
 	@${ECHO_CMD} 'VBOX_WITH_ADDITIONS =' >> ${WRKSRC}/LocalConfig.kmk
 	@${ECHO_CMD} 'VBOX_WITH_DRAG_AND_DROP = ${VBOX_WITH_QT}' >> \
 	    ${WRKSRC}/LocalConfig.kmk
 	@${ECHO_CMD} 'VBOX_WITH_DRAG_AND_DROP_GH = ${VBOX_WITH_QT}' >> \
 	    ${WRKSRC}/LocalConfig.kmk
 	@${ECHO_CMD} 'VBOX_WITH_VALIDATIONKIT =' >> ${WRKSRC}/LocalConfig.kmk
 	@${ECHO_CMD} 'VBOX_WITH_X11_ADDITIONS =' >> ${WRKSRC}/LocalConfig.kmk
 .if ${PORT_OPTIONS:MR0LOGGING}
 	@${ECHO_CMD} 'VBOX_WITH_R0_LOGGING = 1' >> ${WRKSRC}/LocalConfig.kmk
 .endif
 .if ${PORT_OPTIONS:MWEBSERVICE}
 	@${ECHO_CMD} 'VBOX_WITH_WEBSERVICES = 1' >> ${WRKSRC}/LocalConfig.kmk
 	@${ECHO_CMD} 'VBOX_GSOAP_INSTALLED = 1' >> ${WRKSRC}/LocalConfig.kmk
 	@${ECHO_CMD} 'VBOX_PATH_GSOAP = ${PREFIX}/lib/gsoap' >> \
 	    ${WRKSRC}/LocalConfig.kmk
 	@${ECHO_CMD} 'VBOX_PATH_GSOAP_BIN = ${PREFIX}/bin' >> \
 	    ${WRKSRC}/LocalConfig.kmk
 	@${ECHO_CMD} 'VBOX_PATH_GSOAP_IMPORT = ${PREFIX}/share/gsoap/import' >> \
 	    ${WRKSRC}/LocalConfig.kmk
 	@${ECHO_CMD} 'VBOX_GCC_PEDANTIC_CXX = -Wshadow $$(VBOX_GCC_WARN) -Wno-long-long' >> \
 	    ${WRKSRC}/LocalConfig.kmk
 	@${REINPLACE_CMD} -E -e '/soap_socket_errno\(/s/(soap_socket_errno)(\([^)]+\))/\1/' \
 		${WRKSRC}/src/VBox/Main/webservice/vboxweb.cpp
 .endif
 	@${REINPLACE_CMD} -e 's| -finline-limit=8000||' \
 	    -e 's| -mpreferred-stack-boundary=2||' \
 	    -e 's|%%PYTHON_VERSION%%|${PYTHON_VERSION}|' \
 		${WRKSRC}/Config.kmk
 	@${REINPLACE_CMD} -e 's| -fpermissive||' ${WRKSRC}/Config.kmk \
 	    ${WRKSRC}/src/VBox/Main/webservice/Makefile.kmk
 	@${ECHO_CMD} 'TOOL_VBoxGccFreeBSD_LD = ${CXX}' >> ${WRKSRC}/LocalConfig.kmk
 	@${SED} -e 's|GXX3|VBoxGccFreeBSD|g' \
 	    ${LOCALBASE}/share/kBuild/tools/GXX3.kmk > \
 	    ${WRKSRC}/tools/kBuildTools/VBoxGccFreeBSD.kmk
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
 	    ${WRKSRC}/Config.kmk ${WRKSRC}/configure \
 	    ${WRKSRC}/kBuild/header.kmk ${WRKSRC}/kBuild/units/qt4.kmk \
 	    ${WRKSRC}/kBuild/units/qt5.kmk ${WRKSRC}/kBuild/sdks/LIBSDL.kmk \
 	    ${WRKSRC}/src/libs/xpcom18a4/python/gen_python_deps.py
 	@${REINPLACE_CMD} \
 	    -e 's|\$$KBUILDDIR_BIN/kmk_sed|${LOCALBASE}/bin/kmk_sed|g' \
 	    -e 's|SUPPYTHONLIBS=.*|SUPPYTHONLIBS="${PYTHON_VERSION}${PYTHON_ABIVER}"|' \
 	    ${WRKSRC}/configure
 .if empty(ICONV_LIB)
 	@${REINPLACE_CMD} -e 's|iconv||' ${WRKSRC}/Config.kmk \
 	    ${WRKSRC}/src/VBox/Runtime/Makefile.kmk
 	@${ECHO_CMD} 'VBOX_ICONV_DEFS = LIBICONV_PLUG' >> ${WRKSRC}/LocalConfig.kmk
 .endif
 	@${REINPLACE_CMD} -e 's|/usr/local/lib/virtualbox|${VBOX_DIR}|' \
 	    -e 's|/usr/local|${PREFIX}|' \
 	    ${WRKSRC}/src/VBox/Installer/freebsd/VBox.sh
 	@${REINPLACE_CMD} \
 	    -e 's|^versions =.*|versions = ["${PYTHON_VER}${PYTHON_ABIVER}"]|' \
 	    ${WRKSRC}/src/libs/xpcom18a4/python/gen_python_deps.py
 
 do-build:
 	cd ${WRKSRC} && ${SH} -c '. ${WRKSRC}/env.sh && \
 	    ${SETENV} ${MAKE_ENV} ${KMK_CONFIG} ${LOCALBASE}/bin/kmk ${KMK_FLAGS}'
 .if ${PORT_OPTIONS:MPYTHON}
 	${PYTHON_CMD} -mcompileall \
 	    ${KMK_BUILDDIR}/bin/sdk/bindings/xpcom/python/xpcom
 .endif
 
 do-install:
 .if ${PORT_OPTIONS:MPYTHON} || ${PORT_OPTIONS:MWEBSERVICE}
 	${MKDIR} ${STAGEDIR}${DATADIR}/sdk
 .endif
 	cd ${KMK_BUILDDIR}/bin/sdk/bindings/xpcom && \
 	    ${COPYTREE_SHARE} "idl samples" ${STAGEDIR}${DATADIR}
 
 	${MKDIR} ${STAGEDIR}${PREFIX}/include/virtualbox
 	cd ${KMK_BUILDDIR}/bin/sdk/bindings/xpcom/include && \
 	    ${COPYTREE_SHARE} "*" ${STAGEDIR}${PREFIX}/include/virtualbox
 
 	${MKDIR} ${STAGEDIR}${VBOX_DIR}
 	cd ${KMK_BUILDDIR}/bin && ${COPYTREE_SHARE} \
 	    "*.fd *.r0 *.rc *.so components" ${STAGEDIR}${VBOX_DIR}
 .if ${PORT_OPTIONS:MPYTHON} || ${PORT_OPTIONS:MWEBSERVICE}
 	${RLN} ${STAGEDIR}${DATADIR}/sdk ${STAGEDIR}${VBOX_DIR}
 .endif
 
 	${INSTALL_SCRIPT} ${WRKSRC}/src/VBox/Installer/freebsd/VBox.sh \
 	    ${STAGEDIR}${VBOX_DIR}
 .for f in ${VBOX_PROGS} ${VBOX_UTILS}
 	${INSTALL_PROGRAM} ${KMK_BUILDDIR}/bin/${f} ${STAGEDIR}${VBOX_DIR}
 .endfor
 .for f in ${VBOX_PROGS} ${VBOX_LINKS}
 	${LN} -fs ../${VBOX_DIR_REL}/VBox.sh ${STAGEDIR}${PREFIX}/bin/${f}
 .endfor
 .for f in ${VBOX_PROGS}
 	${LN} -fs ../${VBOX_DIR_REL}/VBox.sh ${STAGEDIR}${PREFIX}/bin/${f:tl}
 .endfor
 
 .if ${PORT_OPTIONS:MGUESTADDITIONS}
 	${MKDIR} ${STAGEDIR}${VBOX_DIR}/additions
 	${INSTALL_DATA} ${DISTDIR}/${GUESTADDITIONS} \
 	    ${STAGEDIR}${VBOX_DIR}/additions/
 	${RLN} ${STAGEDIR}${VBOX_DIR}/additions/${GUESTADDITIONS} \
 	    ${STAGEDIR}${VBOX_DIR}/additions/VBoxGuestAdditions.iso
 .endif
 
 .if ${PORT_OPTIONS:MMANUAL}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${KMK_BUILDDIR}/bin/UserManual*.pdf \
 	    ${STAGEDIR}${DOCSDIR}
 .endif
 
 .if ${PORT_OPTIONS:MNLS}
 	cd ${KMK_BUILDDIR}/obj/VirtualBox/qtnls && \
 	    ${COPYTREE_SHARE} "*.qm" ${STAGEDIR}${DATADIR}/nls
 .endif
 
 .if ${PORT_OPTIONS:MPYTHON}
 	cd ${KMK_BUILDDIR}/bin/sdk/installer && \
 	    ${SETENV} VBOX_INSTALL_PATH="${VBOX_DIR}" \
 	    ${PYTHON_CMD} vboxapisetup.py install --root=${STAGEDIR}
 
 	@${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}/xpcom
 	cd ${KMK_BUILDDIR}/bin/sdk/bindings/xpcom/python/xpcom && \
 	    ${COPYTREE_SHARE} "*" ${STAGEDIR}${PYTHON_SITELIBDIR}/xpcom
 	@${MKDIR} ${STAGEDIR}${DATADIR}/sdk/bindings/xpcom/python
 	${RLN} ${STAGEDIR}${PYTHON_SITELIBDIR}/xpcom \
 	    ${STAGEDIR}${DATADIR}/sdk/bindings/xpcom/python
 .endif
 
 .if ${PORT_OPTIONS:MQT5}
 	${INSTALL_DATA} \
 	    ${WRKSRC}/src/VBox/Frontends/VirtualBox/images/OSE/VirtualBox_48px.png \
 	    ${STAGEDIR}${PREFIX}/share/pixmaps/VBox.png
 	${INSTALL_DATA} \
 	    ${WRKSRC}/src/VBox/Installer/freebsd/virtualbox.desktop \
 	    ${STAGEDIR}${PREFIX}/share/applications/virtualbox.desktop
 .endif
 
 .if ${PORT_OPTIONS:MVNC}
 	${MKDIR} ${STAGEDIR}${VBOX_DIR}/ExtensionPacks/VNC/${KMK_ARCH}
 	${INSTALL_DATA} ${KMK_BUILDDIR}/bin/ExtensionPacks/VNC/ExtPack* \
 	    ${STAGEDIR}${VBOX_DIR}/ExtensionPacks/VNC/
 	${INSTALL_LIB} ${KMK_BUILDDIR}/bin/ExtensionPacks/VNC/${KMK_ARCH}/* \
 	    ${STAGEDIR}${VBOX_DIR}/ExtensionPacks/VNC/${KMK_ARCH}/
 .endif
 
 .if ${PORT_OPTIONS:MWEBSERVICE}
 	${MKDIR} ${STAGEDIR}${DATADIR}/sdk/bindings/webservice
 	${INSTALL_DATA} ${KMK_BUILDDIR}/obj/webservice/vboxweb.wsdl \
 	    ${STAGEDIR}${DATADIR}/sdk/bindings/webservice/
 .endif
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/virtualbox/*.so \
 		${STAGEDIR}${PREFIX}/lib/virtualbox/components/*.so
 
 .include <bsd.port.post.mk>
diff --git a/emulators/virtualbox-ose-nox11-legacy/Makefile b/emulators/virtualbox-ose-nox11-legacy/Makefile
index 4e677ec72fa1..798ad0acd4e0 100644
--- a/emulators/virtualbox-ose-nox11-legacy/Makefile
+++ b/emulators/virtualbox-ose-nox11-legacy/Makefile
@@ -1,9 +1,9 @@
-PORTREVISION=	2
+PORTREVISION=	3
 PKGNAMESUFFIX=	-nox11-legacy
 
 OPTIONS_EXCLUDE=	ALSA DBUS DEBUG GUESTADDITIONS MANUAL NLS PULSEAUDIO
 OPTIONS_EXCLUDE+=	QT5 VPX X11
 
 MASTERDIR=	${.CURDIR}/../virtualbox-ose-legacy
 
 .include "${MASTERDIR}/Makefile"
diff --git a/emulators/virtualbox-ose-nox11/Makefile b/emulators/virtualbox-ose-nox11/Makefile
index ed9100f7f098..2987a462881d 100644
--- a/emulators/virtualbox-ose-nox11/Makefile
+++ b/emulators/virtualbox-ose-nox11/Makefile
@@ -1,8 +1,9 @@
+PORTREVISION=	1
 PKGNAMESUFFIX=	-nox11
 
 OPTIONS_EXCLUDE=	ALSA DBUS DEBUG GUESTADDITIONS MANUAL NLS PULSEAUDIO \
 			QT5 VPX X11
 
 MASTERDIR=	${.CURDIR}/../virtualbox-ose
 
 .include "${MASTERDIR}/Makefile"
diff --git a/emulators/virtualbox-ose/Makefile b/emulators/virtualbox-ose/Makefile
index 3adb68b1f5fa..301f9a4b855e 100644
--- a/emulators/virtualbox-ose/Makefile
+++ b/emulators/virtualbox-ose/Makefile
@@ -1,438 +1,438 @@
 PORTNAME=	virtualbox-ose
 PORTVERSION=	6.1.36
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	emulators
 MASTER_SITES=	https://download.virtualbox.org/virtualbox/${PORTVERSION}/
 DISTFILES=	VirtualBox-${PORTVERSION}${EXTRACT_SUFX} ${GUESTADDITIONS}
 EXTRACT_ONLY=	VirtualBox-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	vbox@FreeBSD.org
 COMMENT=	General-purpose full virtualizer for x86 hardware
 WWW=		https://www.virtualbox.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	yasm:devel/yasm \
 		xsltproc:textproc/libxslt \
 		kmk:devel/kBuild \
 		gtar:archivers/gtar
 LIB_DEPENDS=	libpng.so:graphics/png \
 		libxslt.so:textproc/libxslt \
 		libcurl.so:ftp/curl
 RUN_DEPENDS=	${LOCALBASE}/etc/rc.d/vboxnet:emulators/virtualbox-ose-kmod
 
 CPE_VENDOR=	oracle
 CPE_PRODUCT=	vm_virtualbox
 
 WRKSRC=		${WRKDIR}/VirtualBox-${PORTVERSION}
 ONLY_FOR_ARCHS=	amd64
 USES=		compiler:c++14-lang cpe gnome iconv pkgconfig ssl tar:bzip2
 USE_GNOME=	libidl libxml2
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-java --passive-mesa
 CONFIGURE_ARGS+=	--with-gcc="${CC}" --with-g++="${CXX}"
 
 CONFLICTS_INSTALL=	virtualbox-ose-additions-* \
 			virtualbox-ose-devel \
 			virtualbox-ose-legacy \
 			virtualbox-ose-lite
 
 VBOXUSER?=	vboxusers
 VBOXWSUSER?=	vboxusers
 VBOXGROUP?=	vboxusers
 USERS=		${VBOXUSER}
 GROUPS=		${VBOXGROUP}
 VBOX_DIR=	${PREFIX}/${VBOX_DIR_REL}
 VBOX_DIR_REL=	lib/virtualbox
 VBOX_LINKS=	VBoxVRDP
 VBOX_PROGS=	VBoxAutostart VBoxBalloonCtrl VBoxBugReport VBoxHeadless \
 		VBoxManage
 VBOX_UTILS=	VBoxExtPackHelperApp VBoxNetAdpCtl VBoxNetDHCP VBoxNetNAT \
 		VBoxSVC VBoxXPCOMIPCD
 
 SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=	AIO ALSA DBUS DEBUG GUESTADDITIONS MANUAL NLS OPUS PULSEAUDIO \
 		PYTHON QT5 R0LOGGING UDPTUNNEL VDE VNC WEBSERVICE VPX X11
 OPTIONS_DEFAULT=	AIO DBUS QT5 UDPTUNNEL VNC WEBSERVICE X11
 # Since version 6.1.24 pulseaudio is broken at runtime, preventing
 # virtual machines from starting if configured to use it.
 OPTIONS_EXCLUDE+=	PULSEAUDIO
 OPTIONS_SUB=	yes
 
 AIO_DESC=	Enable Asyncronous IO support (check pkg-message)
 DEBUG_DESC=	Debug symbols, additional logs and assertions
 GUESTADDITIONS_DESC=	Build with Guest Additions
 MANUAL_DESC=	Build with user manual
 NLS_DESC=	Native language support (requires QT5)
 OPUS_DESC=	Use libvpx for audio recording (requires VPX)
 QT5_DESC=	Build with QT5 frontend (requires X11)
 R0LOGGING_DESC=	Enable R0 logging (requires DEBUG)
 UDPTUNNEL_DESC=	Build with UDP tunnel support
 VDE_DESC=	Build with VDE support
 VNC_DESC=	Build with VNC support
 VPX_DESC=	Use libvpx for video recording
 WEBSERVICE_DESC=	Build Webservice
 
 ALSA_CONFIGURE_OFF=	--disable-alsa
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 DBUS_CONFIGURE_OFF=	--disable-dbus
 DBUS_LIB_DEPENDS=	libdbus-1.so:devel/dbus
 DEBUG_CONFIGURE_ON=	--build-debug
 MANUAL_BUILD_DEPENDS=	${LOCALBASE}/share/xml/docbook/4.4/docbookx.dtd:textproc/docbook-xml
 MANUAL_CONFIGURE_OFF=	--disable-docs
 NLS_IMPLIES=		QT5
 OPUS_CONFIGURE_OFF=	--disable-libopus
 OPUS_LIB_DEPENDS=	libopus.so:audio/opus
 OPUS_IMPLIES=		VPX
 PULSEAUDIO_CONFIGURE_OFF=	--disable-pulse
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PYTHON_CONFIGURE_OFF=	--disable-python
 QT5_IMPLIES=		X11
 R0LOGGING_IMPLIES=	DEBUG
 UDPTUNNEL_CONFIGURE_OFF=	--disable-udptunnel
 VDE_CONFIGURE_ON=	--enable-vde
 VDE_RUN_DEPENDS=	vde_switch:net/vde2
 VNC_CONFIGURE_ON=	--enable-vnc
 VNC_LIB_DEPENDS=	libvncserver.so:net/libvncserver
 VPX_CONFIGURE_OFF=	--disable-libvpx
 VPX_LIB_DEPENDS=	libvpx.so:multimedia/libvpx
 X11_CONFIGURE_OFF=	--build-headless
 
 ENV=
 .export ENV
 
 PLIST_SUB=	GUEST_VER=${PORTVERSION} \
 		PYTHON_VERU=${PYTHON_VER:S/./_/}${PYTHON_ABIVER} \
 		VBOXGROUP=${VBOXGROUP}
 SUB_LIST=	VBOXDIR=${VBOX_DIR} \
 		VBOXGROUP=${VBOXGROUP} \
 		VBOXUSER=${VBOXUSER} \
 		VBOXWSUSER=${VBOXWSUSER}
 USE_RC_SUBR=	vboxheadless vboxwatchdog
 
 .include <bsd.port.options.mk>
 
 .if ${SLAVE_PORT} == no
 CONFLICTS_INSTALL+=	virtualbox-ose-nox11
 OPTIONS_DEFAULT+=	PYTHON
 .else
 CONFLICTS_INSTALL+=	virtualbox-ose
 .endif
 
 .if ${ARCH} == "amd64"
 _ELF32!=	kldstat -q -m elf32 && echo yes || echo no
 .endif
 
 .if ${PORT_OPTIONS:MDEBUG}
 KMK_BUILDTYPE=	debug
 KMK_FLAGS+=	BUILD_TYPE=debug
 WITH_DEBUG=	yes
 .else
 KMK_BUILDTYPE=	release
 .endif
 
 .if ${PORT_OPTIONS:MGUESTADDITIONS}
 GUESTADDITIONS=	VBoxGuestAdditions_${PORTVERSION}.iso
 LICENSE+=	Additions
 LICENSE_COMB=	multi
 LICENSE_NAME_Additions=	Guest Additions
 LICENSE_PERMS_Additions=	auto-accept
 LICENSE_DISTFILES_Additions=	${GUESTADDITIONS}
 .endif
 
 .if ${PORT_OPTIONS:MMANUAL}
 DBKXMLDIR=	${LOCALBASE}/share/xml/docbook/4.4
 DBKXSLDIR=	${LOCALBASE}/share/xsl/docbook
 USES+=		tex
 USE_TEX=	dvipsk:build formats:build
 .endif
 
 .if ${PORT_OPTIONS:MPYTHON}
 USES+=		python
 USE_PYTHON=	distutils noegginfo noflavors
 PYDISTUTILS_PKGNAME=	vboxapi
 PYDISTUTILS_PKGVERSION=	1.0
 .else
 USES+=		python:build
 .endif
 
 .if ${PORT_OPTIONS:MQT5}
 CONFIGURE_ARGS+=	--enable-qt5
 PLIST_SUB+=	QT=""
 USES+=		gl qmake:no_env qt:5 xorg
 USE_GL=		gl glu
 USE_QT=		buildtools:build core dbus gui linguisttools:build opengl
 USE_QT+=	printsupport widgets x11extras
 USE_XORG=	xcb
 VBOX_PROGS+=	VirtualBox VirtualBoxVM
 VBOX_UTILS+=	VBoxTestOGL
 VBOX_WITH_QT=	1
 .else
 CONFIGURE_ARGS+=	--disable-qt
 PLIST_SUB+=	QT="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MWEBSERVICE}
 BUILD_DEPENDS+=	soapcpp2:devel/gsoap
 USE_RC_SUBR+=	vboxwebsrv
 VBOX_LINKS+=	vboxwebsrv
 VBOX_UTILS+=	vboxwebsrv webtest
 .endif
 
 .if ${PORT_OPTIONS:MX11}
 USES+=		sdl xorg
 USE_SDL=	sdl
 USE_XORG+=	xorgproto x11 xcursor xext xinerama xmu xt
 VBOX_PROGS+=	VBoxSDL
 .endif
 
 .if ${PORT_OPTIONS:MPYTHON} || ${PORT_OPTIONS:MWEBSERVICE}
 PLIST_SUB+=	SDK=""
 .else
 PLIST_SUB+=	SDK="@comment "
 .endif
 
 .if ${ARCH} == i386
 KMK_ARCH=	freebsd.x86
 PLIST_SUB+=	I386=""
 .else
 KMK_ARCH=	freebsd.${ARCH}
 PLIST_SUB+=	I386="@comment "
 .endif
 
 PLIST_SUB+=	ARCH="${KMK_ARCH}"
 
 KMK_BUILDDIR=	${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}
 KMK_CONFIG=	VBOX_LIBPATH_X11=${LOCALBASE} VBOX_FREEBSD_SRC=${SRC_BASE}/sys
 KMK_FLAGS+=	-j${MAKE_JOBS_NUMBER}
 
 .include <bsd.port.pre.mk>
 
 .if ${CHOSEN_COMPILER_TYPE} == clang
 # llvm10 in FreeBSD before r364284 miscompiles virtualbox 6.1 causing errors.
 # force llvm11 from ports
 .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1300109
 BUILD_DEPENDS+=	clang${VBOX_LLVM_VER}:devel/llvm${VBOX_LLVM_VER}
 CC=		clang${VBOX_LLVM_VER}
 CXX=		clang++${VBOX_LLVM_VER}
 VBOX_LLVM_VER?=	11
 .endif
 PATCH_DEPENDS+=	${LOCALBASE}/share/kBuild/tools/GXX3.kmk:devel/kBuild
 EXTRA_PATCHES+=	${PATCHDIR}/extrapatch-src-VBox-Devices-PC-ipxe-Makefile.kmk
 .endif
 
 .if ${PYTHON_MAJOR_VER} >= 3
 PLIST_SUB+=	PYTHON_PYCDIR=/__pycache__/ \
 		PYTHON_PYCEXT=.cpython-${PYTHON_SUFFIX}.pyc
 .else
 PLIST_SUB+=	PYTHON_PYCDIR=/ \
 		PYTHON_PYCEXT=.pyc
 .endif
 
 .if ${SSL_DEFAULT} != base
 CONFIGURE_ARGS+=	--with-openssl-dir="${OPENSSLBASE}"
 .endif
 
 pre-everything::
 .if ${ARCH} == "amd64"
 .if ${_ELF32} != yes
 	@${ECHO_MSG} 'Requires 32-bit runtime support in kernel.'
 	@${ECHO_MSG} 'Rebuild kernel with "options COMPAT_FREEBSD32" and reboot.'
 	@${FALSE}
 .elif !exists(/usr/lib32/libc.so)
 	@${ECHO_MSG} 'Requires 32-bit libraries installed under /usr/lib32.'
 	@${ECHO_MSG} 'Do: cd /usr/src; make build32 install32; service ldconfig restart'
 	@${FALSE}
 .endif
 .endif
 
 post-patch:
 	@${ECHO_CMD} 'VBOX_PATH_APP_PRIVATE_ARCH = ${VBOX_DIR}' > \
 	    ${WRKSRC}/LocalConfig.kmk
 	@${ECHO_CMD} 'VBOX_PATH_DOCBOOK = ${DBKXSLDIR}' >> \
 	    ${WRKSRC}/LocalConfig.kmk
 	@${ECHO_CMD} 'VBOX_PATH_DOCBOOK_DTD = ${DBKXMLDIR}' >> \
 	    ${WRKSRC}/LocalConfig.kmk
 	@${ECHO_CMD} 'VBOX_PATH_SHARED_LIBS = ${VBOX_DIR}' >> \
 	    ${WRKSRC}/LocalConfig.kmk
 	# Please keep this even if using Clang to avoid repeated regressions.
 	# PR 245048
 	@${ECHO_CMD} "VBOX_WITH_RUNPATH = ${_GCC_RUNTIME:D${_GCC_RUNTIME}\:}${VBOX_DIR}" >> \
 	    ${WRKSRC}/LocalConfig.kmk
 	@${ECHO_CMD} 'VBOX_PATH_APP_PRIVATE = ${DATADIR}' >> \
 	    ${WRKSRC}/LocalConfig.kmk
 	@${ECHO_CMD} 'VBOX_PATH_APP_DOCS = ${DOCSDIR}' >> ${WRKSRC}/LocalConfig.kmk
 .if ${SSL_DEFAULT} != base
 	@${ECHO_CMD} 'VBOX_WITH_ALT_HASH_CODE = 1' >> ${WRKSRC}/LocalConfig.kmk
 .endif
 	@${ECHO_CMD} 'VBOX_WITH_EXTPACK_VBOXDTRACE =' >> ${WRKSRC}/LocalConfig.kmk
 	@${ECHO_CMD} 'VBOX_WITH_INSTALLER = 1' >> ${WRKSRC}/LocalConfig.kmk
 	@${ECHO_CMD} 'VBOX_WITH_VBOXDRV =' >> ${WRKSRC}/LocalConfig.kmk
 	@${ECHO_CMD} 'VBOX_WITH_TESTCASES =' >> ${WRKSRC}/LocalConfig.kmk
 	@${ECHO_CMD} 'SDK_VBOX_LIBPNG_INCS = ${PREFIX}/include/libpng' >> \
 	    ${WRKSRC}/LocalConfig.kmk
 	@${ECHO_CMD} 'SDK_VBOX_LIBPNG_LIBS = png' >> ${WRKSRC}/LocalConfig.kmk
 	@${ECHO_CMD} 'VBOX_WITH_ADDITIONS =' >> ${WRKSRC}/LocalConfig.kmk
 	@${ECHO_CMD} 'VBOX_WITH_DRAG_AND_DROP = ${VBOX_WITH_QT}' >> \
 	    ${WRKSRC}/LocalConfig.kmk
 	@${ECHO_CMD} 'VBOX_WITH_DRAG_AND_DROP_GH = ${VBOX_WITH_QT}' >> \
 	    ${WRKSRC}/LocalConfig.kmk
 	@${ECHO_CMD} 'VBOX_WITH_VALIDATIONKIT =' >> ${WRKSRC}/LocalConfig.kmk
 	@${ECHO_CMD} 'VBOX_WITH_X11_ADDITIONS =' >> ${WRKSRC}/LocalConfig.kmk
 .if ${PORT_OPTIONS:MR0LOGGING}
 	@${ECHO_CMD} 'VBOX_WITH_R0_LOGGING = 1' >> ${WRKSRC}/LocalConfig.kmk
 .endif
 .if ${PORT_OPTIONS:MWEBSERVICE}
 	@${ECHO_CMD} 'VBOX_WITH_WEBSERVICES = 1' >> ${WRKSRC}/LocalConfig.kmk
 	@${ECHO_CMD} 'VBOX_GSOAP_INSTALLED = 1' >> ${WRKSRC}/LocalConfig.kmk
 	@${ECHO_CMD} 'VBOX_PATH_GSOAP = ${PREFIX}/lib/gsoap' >> \
 	    ${WRKSRC}/LocalConfig.kmk
 	@${ECHO_CMD} 'VBOX_PATH_GSOAP_BIN = ${PREFIX}/bin' >> \
 	    ${WRKSRC}/LocalConfig.kmk
 	@${ECHO_CMD} 'VBOX_PATH_GSOAP_IMPORT = ${PREFIX}/share/gsoap/import' >> \
 	    ${WRKSRC}/LocalConfig.kmk
 	@${ECHO_CMD} 'VBOX_GCC_PEDANTIC_CXX = -Wshadow $$(VBOX_GCC_WARN) -Wno-long-long' >> \
 	    ${WRKSRC}/LocalConfig.kmk
 .endif
 .if empty(PORT_OPTIONS:MX11)
 	@${ECHO} 'VBOX_WITH_VMSVGA3D =' >> ${WRKSRC}/LocalConfig.kmk
 .endif
 .if ${CHOSEN_COMPILER_TYPE} == clang
 	@${REINPLACE_CMD} -e 's| -finline-limit=8000||' \
 	    -e 's| -mpreferred-stack-boundary=2||' ${WRKSRC}/Config.kmk
 	@${REINPLACE_CMD} -e 's| -fpermissive||' ${WRKSRC}/Config.kmk \
 	    ${WRKSRC}/src/VBox/Main/webservice/Makefile.kmk
 	@${ECHO_CMD} 'TOOL_VBoxGccFreeBSD_LD = ${CXX}' >> ${WRKSRC}/LocalConfig.kmk
 	@${SED} -e 's|GXX3|VBoxGccFreeBSD|g' \
 	    ${LOCALBASE}/share/kBuild/tools/GXX3.kmk > \
 	    ${WRKSRC}/tools/kBuildTools/VBoxGccFreeBSD.kmk
 .endif
 	# Causes a "reinplace" QA warning with default LOCALBASE
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
 	    ${WRKSRC}/Config.kmk ${WRKSRC}/configure \
 	    ${WRKSRC}/kBuild/header.kmk ${WRKSRC}/kBuild/units/qt4.kmk \
 	    ${WRKSRC}/kBuild/units/qt5.kmk ${WRKSRC}/kBuild/sdks/LIBSDL.kmk \
 	    ${WRKSRC}/src/VBox/HostDrivers/adpctl/VBoxNetAdpCtl.cpp \
 	    ${WRKSRC}/src/libs/xpcom18a4/python/gen_python_deps.py
 	@${REINPLACE_CMD} \
 	    -e 's|\$$KBUILDDIR_BIN/kmk_sed|${LOCALBASE}/bin/kmk_sed|g' \
 	    -e 's|SUPPYTHONLIBS=.*|SUPPYTHONLIBS="${PYTHON_VERSION}${PYTHON_ABIVER}"|' \
 	    ${WRKSRC}/configure
 .if empty(ICONV_LIB)
 	@${REINPLACE_CMD} -e 's|iconv||' ${WRKSRC}/Config.kmk \
 	    ${WRKSRC}/src/VBox/Runtime/Makefile.kmk
 	@${ECHO_CMD} 'VBOX_ICONV_DEFS = LIBICONV_PLUG' >> ${WRKSRC}/LocalConfig.kmk
 .endif
 	# Causes a "reinplace" QA warning with default PREFIX/VBOX_DIR
 	@${REINPLACE_CMD} -e 's|/usr/local/lib/virtualbox|${VBOX_DIR}|' \
 	    -e 's|/usr/local|${PREFIX}|' \
 	    ${WRKSRC}/src/VBox/Installer/freebsd/VBox.sh
 	@${REINPLACE_CMD} \
 	    -e 's|^versions =.*|versions = ["${PYTHON_VER}${PYTHON_ABIVER}"]|' \
 	    ${WRKSRC}/src/libs/xpcom18a4/python/gen_python_deps.py
 
 post-patch-AIO-off:
 	@${REINPLACE_CMD} 's|r3/freebsd/fileaio-freebsd.cpp|r3/posix/fileaio-posix.cpp|' \
 		${WRKSRC}/src/VBox/Runtime/Makefile.kmk
 
 do-build:
 	cd ${WRKSRC} && ${SH} -c '. ${WRKSRC}/env.sh && \
 	    ${SETENV} ${MAKE_ENV} ${KMK_CONFIG} ${LOCALBASE}/bin/kmk ${KMK_FLAGS}'
 .if ${PORT_OPTIONS:MPYTHON}
 	${PYTHON_CMD} -mcompileall \
 	    ${KMK_BUILDDIR}/bin/sdk/bindings/xpcom/python/xpcom
 .endif
 
 do-install:
 .if ${PORT_OPTIONS:MPYTHON} || ${PORT_OPTIONS:MWEBSERVICE}
 	${MKDIR} ${STAGEDIR}${DATADIR}/sdk
 .endif
 	cd ${KMK_BUILDDIR}/bin/sdk/bindings/xpcom && \
 	    ${COPYTREE_SHARE} "idl samples" ${STAGEDIR}${DATADIR}
 
 	${MKDIR} ${STAGEDIR}${PREFIX}/include/virtualbox
 	cd ${KMK_BUILDDIR}/bin/sdk/bindings/xpcom/include && \
 	    ${COPYTREE_SHARE} "*" ${STAGEDIR}${PREFIX}/include/virtualbox
 
 	${MKDIR} ${STAGEDIR}${VBOX_DIR}
 	cd ${KMK_BUILDDIR}/bin && ${COPYTREE_SHARE} \
 	    "*.fd *.r0 *.so components" ${STAGEDIR}${VBOX_DIR}
 .if ${PORT_OPTIONS:MPYTHON} || ${PORT_OPTIONS:MWEBSERVICE}
 	${RLN} ${STAGEDIR}${DATADIR}/sdk ${STAGEDIR}${VBOX_DIR}
 .endif
 
 	${INSTALL_SCRIPT} ${WRKSRC}/src/VBox/Installer/freebsd/VBox.sh \
 	    ${STAGEDIR}${VBOX_DIR}
 .for f in ${VBOX_PROGS} ${VBOX_UTILS}
 	${INSTALL_PROGRAM} ${KMK_BUILDDIR}/bin/${f} ${STAGEDIR}${VBOX_DIR}
 .endfor
 .for f in ${VBOX_PROGS} ${VBOX_LINKS}
 	${LN} -fs ../${VBOX_DIR_REL}/VBox.sh ${STAGEDIR}${PREFIX}/bin/${f}
 .endfor
 .for f in ${VBOX_PROGS}
 	${LN} -fs ../${VBOX_DIR_REL}/VBox.sh ${STAGEDIR}${PREFIX}/bin/${f:tl}
 .endfor
 
 .if ${PORT_OPTIONS:MGUESTADDITIONS}
 	${MKDIR} ${STAGEDIR}${VBOX_DIR}/additions
 	${INSTALL_DATA} ${DISTDIR}/${GUESTADDITIONS} \
 	    ${STAGEDIR}${VBOX_DIR}/additions/
 	${RLN} ${STAGEDIR}${VBOX_DIR}/additions/${GUESTADDITIONS} \
 	    ${STAGEDIR}${VBOX_DIR}/additions/VBoxGuestAdditions.iso
 .endif
 
 .if ${PORT_OPTIONS:MMANUAL}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${KMK_BUILDDIR}/bin/UserManual*.pdf \
 	    ${STAGEDIR}${DOCSDIR}
 .endif
 
 .if ${PORT_OPTIONS:MNLS}
 	cd ${KMK_BUILDDIR}/obj/VirtualBox/qtnls && \
 	    ${COPYTREE_SHARE} "*.qm" ${STAGEDIR}${DATADIR}/nls
 .endif
 
 .if ${PORT_OPTIONS:MPYTHON}
 	cd ${KMK_BUILDDIR}/bin/sdk/installer && \
 	    ${SETENV} VBOX_INSTALL_PATH="${VBOX_DIR}" \
 	    ${PYTHON_CMD} vboxapisetup.py install --root=${STAGEDIR}
 
 	@${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}/xpcom
 	cd ${KMK_BUILDDIR}/bin/sdk/bindings/xpcom/python/xpcom && \
 	    ${COPYTREE_SHARE} "*" ${STAGEDIR}${PYTHON_SITELIBDIR}/xpcom
 	@${MKDIR} ${STAGEDIR}${DATADIR}/sdk/bindings/xpcom/python
 	${RLN} ${STAGEDIR}${PYTHON_SITELIBDIR}/xpcom \
 	    ${STAGEDIR}${DATADIR}/sdk/bindings/xpcom/python
 .endif
 
 .if ${PORT_OPTIONS:MQT5}
 	${INSTALL_DATA} \
 	    ${WRKSRC}/src/VBox/Frontends/VirtualBox/images/OSE/VirtualBox_48px.png \
 	    ${STAGEDIR}${PREFIX}/share/pixmaps/VBox.png
 	${INSTALL_DATA} \
 	    ${WRKSRC}/src/VBox/Installer/freebsd/virtualbox.desktop \
 	    ${STAGEDIR}${PREFIX}/share/applications/virtualbox.desktop
 .endif
 
 .if ${PORT_OPTIONS:MVNC}
 	${MKDIR} ${STAGEDIR}${VBOX_DIR}/ExtensionPacks/VNC/${KMK_ARCH}
 	${INSTALL_DATA} ${KMK_BUILDDIR}/bin/ExtensionPacks/VNC/ExtPack* \
 	    ${STAGEDIR}${VBOX_DIR}/ExtensionPacks/VNC/
 	${INSTALL_LIB} ${KMK_BUILDDIR}/bin/ExtensionPacks/VNC/${KMK_ARCH}/* \
 	    ${STAGEDIR}${VBOX_DIR}/ExtensionPacks/VNC/${KMK_ARCH}/
 .endif
 
 .if ${PORT_OPTIONS:MWEBSERVICE}
 	${MKDIR} ${STAGEDIR}${DATADIR}/sdk/bindings/webservice
 	${INSTALL_DATA} ${KMK_BUILDDIR}/obj/webservice/vboxweb.wsdl \
 	    ${STAGEDIR}${DATADIR}/sdk/bindings/webservice/
 .endif
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/virtualbox/*.so \
 		${STAGEDIR}${PREFIX}/lib/virtualbox/components/*.so
 
 .include <bsd.port.post.mk>
diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile
index 796704a4338f..2e546496f9a6 100644
--- a/emulators/wine-devel/Makefile
+++ b/emulators/wine-devel/Makefile
@@ -1,194 +1,195 @@
 PORTNAME=	wine
 DISTVERSION=	7.22
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	https://dl.winehq.org/wine/source/7.x/
 PKGNAMESUFFIX=	-devel
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	damjan.jov@gmail.com
 COMMENT=	Microsoft Windows compatibility environment
 WWW=		https://www.winehq.org
 
 LICENSE=	LGPL21 LGPL3
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 ONLY_FOR_ARCHS=	amd64 i386
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/flex:textproc/flex llvm${_LLVM_VERSION}>=0:devel/llvm${_LLVM_VERSION}
 
 USES=		bison cpe desktop-file-utils gmake localbase \
 		pkgconfig sdl shebangfix tar:xz
 USE_GCC=	yes
 USE_SDL=	sdl2
 
 CPE_VENDOR=	winehq
 
 CONFLICTS_INSTALL=	wine
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--verbose \
 		--disable-kerberos \
 		--disable-tests \
 		--without-capi \
 		--without-coreaudio \
 		--without-dbus \
 		--without-gettext --without-gettextpo \
 		--without-gphoto \
 		--without-gssapi \
 		--without-gstreamer \
 		--without-inotify \
 		--without-krb5 \
 		--with-mingw CROSSCC="clang" CROSSCFLAGS="-isystem ${FILESDIR}/clang" \
 		--without-netapi \
 		--without-opencl \
 		--without-osmesa \
 		--with-pcap \
 		--with-pthread \
 		--without-pulse \
 		--without-sane \
 		--with-sdl \
 		--without-udev \
 		--without-unwind \
 		--without-usb
 CONFIGURE_ENV=	CPPBIN="${CPP}" FLEX="${LOCALBASE}/bin/flex"
 WINELIBDIR=	${PREFIX}/lib
 .if !defined(USE_LDCONFIG32)
 USE_LDCONFIG=	${WINELIBDIR} ${WINELIBDIR}/wine
 .endif
 SHEBANG_FILES=	tools/make_requests tools/winemaker/winemaker \
 		tools/winedump/function_grep.pl
 
 BINARY_ALIAS+=	clang=${LOCALBASE}/bin/clang${_LLVM_VERSION} \
 		lld-link=${LOCALBASE}/bin/lld-link${_LLVM_VERSION}
 
 SUB_FILES=	pkg-message
 
 PORTDATA=	wine.inf
 
 OPTIONS_DEFINE=	CUPS DOCS DOSBOX GNUTLS STAGING V4L WINEMAKER X11 GECKO MONO
 OPTIONS_DEFAULT=GNUTLS OSS X11
 OPTIONS_RADIO=	AUDIO
 OPTIONS_RADIO_AUDIO=	ALSA OSS
 OPTIONS_SUB=	yes
 
 DOSBOX_DESC=	Use DOSBox to run MS-DOS programs
 STAGING_DESC=	Include Wine Staging patchset (experimental&unsupported)
 WINEMAKER_DESC=	Fully support winemaker (requires Perl)
 GECKO_DESC=	Bundle Gecko MSI package for Wine
 MONO_DESC=	Bundle Mono MSI package for Wine
 
 ALSA_CONFIGURE_ON=	--with-alsa --without-oss
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 
 CUPS_CONFIGURE_WITH=	cups
 CUPS_LIB_DEPENDS=	libcups.so:print/cups
 
 DOSBOX_RUN_DEPENDS=	dosbox:emulators/dosbox
 
 GECKO_RUN_DEPENDS=	wine-gecko-devel>0:emulators/wine-gecko-devel
 
 GNUTLS_CONFIGURE_WITH=	gnutls
 GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 
 MONO_RUN_DEPENDS=	wine-mono-devel>0:emulators/wine-mono-devel
 
 OSS_CONFIGURE_ON=	--without-alsa --with-oss
 
 STAGING_MASTER_SITES=	https://github.com/wine-staging/wine-staging/archive/:staging
 STAGING_DIST=		v${DISTVERSION}.tar.gz
 STAGING_DISTFILES=	${STAGING_DIST}:staging
 STAGING_EXTRACT_DEPENDS=	bash:shells/bash \
 				git:devel/git \
 				autoconf>0:devel/autoconf \
 				gawk:lang/gawk
 STAGING_LIB_DEPENDS=	libtxc_dxtn.so:graphics/s2tc
 
 V4L_CONFIGURE_WITH=	v4l2
 V4L_BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat
 V4L_LIB_DEPENDS=	libv4l2.so:multimedia/libv4l
 
 WINEMAKER_RUN_DEPENDS=	p5-XML-LibXML>0:textproc/p5-XML-LibXML
 
 X11_CONFIGURE_WITH=	x fontconfig freetype opengl xinerama xinput2 xrandr xrender
 X11_USES=		gl xorg
 X11_USE=		GL=glu XORG=x11,xext,xcomposite,xcursor,xi,xinerama,xrandr,xrender
 X11_LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 			libfreetype.so:print/freetype2 \
 			libvulkan.so:graphics/vulkan-loader
 
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MSTAGING} && ${OSVERSION} < 1300000
 BROKEN=		build failure
 .endif
 
 .if (${LLVM_DEFAULT} == 10 || ${LLVM_DEFAULT} == 11)
 _LLVM_VERSION=	12
 .else
 _LLVM_VERSION=	${LLVM_DEFAULT}
 .endif
 
 .if ${ARCH} == amd64
 # Wine is composed of three parts:
 #  - wine (aka this port on FreeBSD/i386) is the 32-bit component
 #       and runs 32-bit programs.
 #  - wine64 (aka this part of this port on FreeBSD/amd64) is the
 #       64-bit component and runs 64-bit programs.
 #  - wow64 (aka this port built on FreeBSD/i386) is a part of the
 #       64-bit component [wine64] that runs 32-bit programs on FreeBSD/amd64.
 
 # --libdir is required since Wine defaults to "${PREFIX}/lib64" on amd64.
 CONFIGURE_ARGS+=	--enable-win64 --libdir=${PREFIX}/lib
 PLIST_SUB+=		WINE32="@comment " WINE64="" WINEARCH="x86_64"
 
 # Wine assumes a WoW64 package is available, which is not the case on
 # FreeBSD yet.
 post-patch:
 	${REINPLACE_CMD} '/Exec/s|wine|wine64|g' ${WRKSRC}/loader/wine.desktop
 
 .else
 PLIST_SUB+=		WINE32="" WINE64="@comment " WINEARCH="i386"
 .endif
 
 post-extract-STAGING-on: fix-shebang
 	@${LN} -s ${WRKDIR}/${PORTNAME}-staging-${DISTVERSION}/patches ${WRKSRC}/patches
 
 post-patch-STAGING-on:
 	cd ${WRKSRC} && ${PATCH} -p0 < ${PATCHDIR}/extra-gitapply
 	cd ${WRKSRC} && bash ./patches/patchinstall.sh --backend=patch DESTDIR=${WRKSRC} --all
 
 pre-build:
 	cd ${WRKSRC} && ${MAKE_CMD} depend
 
 post-install:
 .if ${ARCH} == i386
 	${MV} ${STAGEDIR}${PREFIX}/bin/wineserver	${STAGEDIR}${PREFIX}/bin/wineserver32
 	${MV} ${STAGEDIR}${PREFIX}/bin/wine		${STAGEDIR}${PREFIX}/bin/wine.bin
 	-${ELFCTL} -e +noaslr				${STAGEDIR}${PREFIX}/bin/wine.bin
 	${INSTALL_SCRIPT} ${FILESDIR}/wine.sh		${STAGEDIR}${PREFIX}/bin/wine
 .else
 	${MV} ${STAGEDIR}${PREFIX}/bin/wine64		${STAGEDIR}${PREFIX}/bin/wine64.bin
 	-${ELFCTL} -e +noaslr				${STAGEDIR}${PREFIX}/bin/wine64.bin
 	${INSTALL_SCRIPT} ${FILESDIR}/wine.sh		${STAGEDIR}${PREFIX}/bin/wine64
 	${INSTALL_SCRIPT} ${FILESDIR}/wine-wow64.sh	${STAGEDIR}${PREFIX}/bin/wine
 	${INSTALL_SCRIPT} ${FILESDIR}/pkg32.sh		${STAGEDIR}${DATADIR}/pkg32.sh
 .endif
 
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in README ANNOUNCE AUTHORS
 	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/programs/winedbg/README ${STAGEDIR}${DOCSDIR}/README.winedbg
 	${INSTALL_DATA} ${WRKSRC}/tools/winedump/README ${STAGEDIR}${DOCSDIR}/README.winedump
 
 check-wine-devel-vs-staging:
 	@${GREP} %%STAGING%% pkg-plist | while read f; do \
 	  f=`echo $$f | ${SED} -e 's:%%STAGING%%::' -e "s:%%DATADIR%%:${DATADIR}:"`; \
 	  if [ -f "$$STAGEDIR/$$PREFIX/$$f" ] || [ -f "$$STAGEDIR/$$f" ]; then \
 	    ${PRINTF} "%s no longer contingent on %%STAGING%%?\n" "$$f"; \
 	  fi \
 	done
 
 .include <bsd.port.post.mk>
diff --git a/emulators/wine-proton/Makefile b/emulators/wine-proton/Makefile
index 99b1d2b11805..24b84e87797d 100644
--- a/emulators/wine-proton/Makefile
+++ b/emulators/wine-proton/Makefile
@@ -1,147 +1,148 @@
 PORTNAME=	wine-proton
 DISTVERSION=	7.0-5
+PORTREVISION=	1
 CATEGORIES=	emulators
 
 MAINTAINER=	iwtcex@gmail.com
 COMMENT=	Wine with a bit of extra spice
 WWW=		https://github.com/ValveSoftware/wine
 
 LICENSE=	LGPL21 LGPL3
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 IGNORE_FreeBSD_12=requires F_ADD_SEALS
 ONLY_FOR_ARCHS=	amd64 i386
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/flex:textproc/flex \
 		llvm${_LLVM_VERSION}>=0:devel/llvm${_LLVM_VERSION}
 
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libgnutls.so:security/gnutls \
 		libvulkan.so:graphics/vulkan-loader
 
 USES=		autoreconf bison desktop-file-utils gettext-runtime gl gmake gnome gstreamer localbase openal pkgconfig python:build sdl shebangfix tar:xz xorg
 USE_GCC=	yes
 PIE_UNSAFE=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	ValveSoftware
 GH_PROJECT=	wine
 GH_TAGNAME=	492470267af486cb24ad0deaa028168eb94618a4
 
 USE_GL=		gl
 USE_GNOME=	glib20
 USE_GSTREAMER=	gl mpeg2dec x264 # https://github.com/ValveSoftware/wine/commit/8cdd506d7e68c27cd564c317320bfc8d3a999eda
 USE_SDL=	sdl2
 USE_XORG=	x11 xext xcomposite xcursor xi xinerama xrandr xrender
 
 SHEBANG_FILES=	tools/make_requests tools/winemaker/winemaker \
 		tools/winedump/function_grep.pl
 
 GNU_CONFIGURE=		yes
 GNU_CONFIGURE_PREFIX=	${PREFIX}/${PORTNAME}
 
 CONFIGURE_ARGS=	--verbose \
 		--libdir=${PREFIX}/${PORTNAME}/lib \
 		--disable-kerberos \
 		--disable-tests \
 		--with-fontconfig \
 		--with-freetype \
 		--with-gnutls \
 		--with-gstreamer \
 		--with-openal \
 		--with-opengl \
 		--with-oss \
 		--with-sdl \
 		--with-vulkan \
 		--with-x \
 		--with-xinerama \
 		--with-xinput2 \
 		--with-xrandr \
 		--with-xrender \
 		--with-pcap \
 		--with-pthread \
 		--with-mingw CROSSCC="clang" CROSSCFLAGS="-isystem ${FILESDIR}/clang" \
 		--without-alsa \
 		--without-capi \
 		--without-coreaudio \
 		--without-cups \
 		--without-dbus \
 		--without-gettext \
 		--without-gettextpo \
 		--without-gphoto \
 		--without-gssapi \
 		--without-inotify \
 		--without-krb5 \
 		--without-ldap \
 		--without-netapi \
 		--without-opencl \
 		--without-osmesa \
 		--without-sane \
 		--without-udev \
 		--without-unwind \
 		--without-usb \
 		--without-v4l2 \
 		--without-vkd3d
 
 CONFIGURE_ENV=	CPPBIN="${CPP}" FLEX="${LOCALBASE}/bin/flex" JXRLIB_CFLAGS="-I${LOCALBASE}/include/jxrlib"
 
 CFLAGS+=	-D__NR_futex="-1"
 
 BINARY_ALIAS+=	clang=${LOCALBASE}/bin/clang${_LLVM_VERSION} \
 		lld-link=${LOCALBASE}/bin/lld-link${_LLVM_VERSION}
 
 OPTIONS_DEFINE=	PULSEAUDIO
 OPTIONS_DEFAULT=PULSEAUDIO
 OPTIONS_SUB=	yes
 
 PULSEAUDIO_DESC=		Build winepulse.drv
 
 PULSEAUDIO_BUILD_DEPENDS=	${LOCALBASE}/include/pulse/pulseaudio.h:audio/pulseaudio
 PULSEAUDIO_CONFIGURE_ON=	--with-pulse
 PULSEAUDIO_CONFIGURE_OFF=	--without-pulse
 
 .include <bsd.port.pre.mk>
 
 .if (${LLVM_DEFAULT} == 10 || ${LLVM_DEFAULT} == 11)
 _LLVM_VERSION=	12
 .else
 _LLVM_VERSION=	${LLVM_DEFAULT}
 .endif
 
 .if ${ARCH} == amd64
 PLIST_SUB+=	WINE32="@comment " WINE64="" WINEARCH="x86_64"
 CONFIGURE_ARGS+=--enable-win64
 .else
 PLIST_SUB+=	WINE32="" WINE64="@comment " WINEARCH="i386"
 .endif
 
 pre-configure:
 	cd ${WRKSRC} && ${PYTHON_CMD} dlls/winevulkan/make_vulkan --xml vk.xml
 
 pre-build:
 	cd ${WRKSRC} && ${MAKE_CMD} depend
 	cd ${WRKSRC} && tools/make_requests
 
 post-install:
 .if ${ARCH} == i386
 	${MV} ${STAGEDIR}${PREFIX}/${PORTNAME}/bin/wineserver ${STAGEDIR}${PREFIX}/${PORTNAME}/bin/wineserver32
 	${MV} ${STAGEDIR}${PREFIX}/${PORTNAME}/bin/wine       ${STAGEDIR}${PREFIX}/${PORTNAME}/bin/wine.bin
 	-${ELFCTL} -e +noaslr                                 ${STAGEDIR}${PREFIX}/${PORTNAME}/bin/wine.bin
 	${INSTALL_SCRIPT} ${FILESDIR}/wine.sh                 ${STAGEDIR}${PREFIX}/${PORTNAME}/bin/wine
 .else
 	${INSTALL_SCRIPT} ${FILESDIR}/pkg32.sh                ${STAGEDIR}${PREFIX}/${PORTNAME}/bin/pkg32.sh
 	${MV} ${STAGEDIR}${PREFIX}/${PORTNAME}/bin/wine64     ${STAGEDIR}${PREFIX}/${PORTNAME}/bin/wine64.bin
 	-${ELFCTL} -e +noaslr                                 ${STAGEDIR}${PREFIX}/${PORTNAME}/bin/wine64.bin
 	${INSTALL_SCRIPT} ${FILESDIR}/wine.sh                 ${STAGEDIR}${PREFIX}/${PORTNAME}/bin/wine64
 	${INSTALL_SCRIPT} ${FILESDIR}/wine-wow64.sh           ${STAGEDIR}${PREFIX}/${PORTNAME}/bin/wine
 .endif
 	${RM} -r ${STAGEDIR}${PREFIX}/${PORTNAME}/include
 	${RM} -r ${STAGEDIR}${MANPREFIX}/man
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in README ANNOUNCE AUTHORS
 	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index 0f31c37b6a61..d3a0b2ce41b2 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -1,162 +1,163 @@
 PORTNAME=	wine
 DISTVERSION=	7.0.2
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	https://dl.winehq.org/wine/source/7.0/
 
 MAINTAINER=	gerald@FreeBSD.org
 COMMENT=	Microsoft Windows compatibility environment
 WWW=		https://www.winehq.org
 
 LICENSE=	LGPL21 LGPL3
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 ONLY_FOR_ARCHS=	amd64 i386
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/flex:textproc/flex
 
 USES=		bison cpe desktop-file-utils gmake localbase \
 		pkgconfig sdl shebangfix tar:xz
 USE_GCC=	yes
 USE_SDL=	sdl2
 
 CPE_VENDOR=	winehq
 
 CONFLICTS_INSTALL=	wine-devel
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--verbose \
 		--disable-kerberos \
 		--disable-tests \
 		--without-capi \
 		--without-coreaudio \
 		--without-dbus \
 		--without-gettext --without-gettextpo \
 		--without-gphoto \
 		--without-gssapi \
 		--without-gstreamer \
 		--without-inotify \
 		--without-krb5 \
 		--without-mingw \
 		--without-netapi \
 		--without-opencl \
 		--without-osmesa \
 		--with-pcap \
 		--with-pthread \
 		--without-pulse \
 		--without-sane \
 		--with-sdl \
 		--without-udev \
 		--without-unwind \
 		--without-usb
 CONFIGURE_ENV=	CPPBIN="${CPP}" FLEX="${LOCALBASE}/bin/flex"
 WINELIBDIR=	${PREFIX}/lib
 .if !defined(USE_LDCONFIG32)
 USE_LDCONFIG=	${WINELIBDIR} ${WINELIBDIR}/wine
 .endif
 SHEBANG_FILES=	tools/make_requests tools/winemaker/winemaker \
 		tools/winedump/function_grep.pl
 
 SUB_FILES=	pkg-message
 
 PORTDATA=	wine.inf
 
 OPTIONS_DEFINE=	CUPS DOCS DOSBOX GNUTLS LDAP OPENAL V4L WINEMAKER X11 GECKO MONO
 OPTIONS_DEFAULT=GNUTLS OPENAL OSS X11
 OPTIONS_RADIO=	AUDIO
 OPTIONS_RADIO_AUDIO=	ALSA OSS
 OPTIONS_SUB=	yes
 
 DOSBOX_DESC=	Use DOSBox to run MS-DOS programs
 WINEMAKER_DESC=	Fully support winemaker (requires Perl)
 GECKO_DESC=	Bundle Gecko MSI package for Wine
 MONO_DESC=	Bundle Mono MSI package for Wine
 
 PORTSCOUT=	limit:^7\.0
 
 ALSA_CONFIGURE_ON=	--with-alsa --without-oss
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 
 CUPS_CONFIGURE_WITH=	cups
 CUPS_LIB_DEPENDS=	libcups.so:print/cups
 
 DOSBOX_RUN_DEPENDS=	dosbox:emulators/dosbox
 
 GECKO_RUN_DEPENDS=	wine-gecko>0:emulators/wine-gecko
 
 GNUTLS_CONFIGURE_WITH=	gnutls
 GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 
 LDAP_CONFIGURE_WITH=	ldap
 LDAP_USES=		ldap
 
 MONO_RUN_DEPENDS=	wine-mono>0:emulators/wine-mono
 
 OPENAL_CONFIGURE_WITH=	openal
 OPENAL_USES=		openal
 
 OSS_CONFIGURE_ON=	--without-alsa --with-oss
 
 V4L_CONFIGURE_WITH=	v4l2
 V4L_BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat
 V4L_LIB_DEPENDS=	libv4l2.so:multimedia/libv4l
 
 WINEMAKER_RUN_DEPENDS=	p5-XML-LibXML>0:textproc/p5-XML-LibXML
 
 X11_CONFIGURE_WITH=	x fontconfig freetype opengl vkd3d xinerama xinput2 xrandr xrender
 X11_USES=		gl xorg
 X11_USE=		GL=glu XORG=x11,xext,xcomposite,xcursor,xi,xinerama,xrandr,xrender
 X11_LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 			libfreetype.so:print/freetype2 \
 			libvulkan.so:graphics/vulkan-loader \
 			libvkd3d.so:graphics/vkd3d
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == amd64
 # Wine is composed of three parts:
 #  - wine (aka this port on FreeBSD/i386) is the 32-bit component
 #       and runs 32-bit programs.
 #  - wine64 (aka this part of this port on FreeBSD/amd64) is the
 #       64-bit component and runs 64-bit programs.
 #  - wow64 (aka this port built on FreeBSD/i386) is a part of the
 #       64-bit component [wine64] that runs 32-bit programs on FreeBSD/amd64.
 
 # --libdir is required since Wine defaults to "${PREFIX}/lib64" on amd64.
 CONFIGURE_ARGS+=	--enable-win64 --libdir=${PREFIX}/lib
 PLIST_SUB+=		WINE32="@comment " WINE64="" WINEARCH="x86_64"
 
 # Wine assumes a WoW64 package is available, which is not the case on
 # FreeBSD yet.
 post-patch:
 	${REINPLACE_CMD} '/Exec/s|wine|wine64|g' ${WRKSRC}/loader/wine.desktop
 
 .else
 PLIST_SUB+=		WINE32="" WINE64="@comment " WINEARCH="i386"
 .endif
 
 pre-build:
 	cd ${WRKSRC} && ${MAKE_CMD} depend
 
 post-install:
 .if ${ARCH} == i386
 	${MV} ${STAGEDIR}${PREFIX}/bin/wineserver   ${STAGEDIR}${PREFIX}/bin/wineserver32
 	${MV} ${STAGEDIR}${PREFIX}/bin/wine         ${STAGEDIR}${PREFIX}/bin/wine.bin
 	-${ELFCTL} -e +noaslr                       ${STAGEDIR}${PREFIX}/bin/wine.bin
 	${INSTALL_SCRIPT} ${FILESDIR}/wine.sh       ${STAGEDIR}${PREFIX}/bin/wine
 .else
 	${MV} ${STAGEDIR}${PREFIX}/bin/wine64       ${STAGEDIR}${PREFIX}/bin/wine64.bin
 	-${ELFCTL} -e +noaslr                       ${STAGEDIR}${PREFIX}/bin/wine64.bin
 	${INSTALL_SCRIPT} ${FILESDIR}/wine.sh       ${STAGEDIR}${PREFIX}/bin/wine64
 	${INSTALL_SCRIPT} ${FILESDIR}/wine-wow64.sh ${STAGEDIR}${PREFIX}/bin/wine
 	${INSTALL_SCRIPT} ${FILESDIR}/pkg32.sh      ${STAGEDIR}${DATADIR}/pkg32.sh
 .endif
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in README ANNOUNCE AUTHORS
 	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/programs/winedbg/README ${STAGEDIR}${DOCSDIR}/README.winedbg
 	${INSTALL_DATA} ${WRKSRC}/tools/winedump/README ${STAGEDIR}${DOCSDIR}/README.winedump
 
 .include <bsd.port.post.mk>
diff --git a/emulators/x49gp/Makefile b/emulators/x49gp/Makefile
index 4c6eaf5487cb..815906cf245a 100644
--- a/emulators/x49gp/Makefile
+++ b/emulators/x49gp/Makefile
@@ -1,98 +1,98 @@
 # Note: sdcard64.tar.gz contains just an empty 64MB FAT-16 disk image
 
 PORTNAME=	x49gp
 PORTVERSION=	20100425
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	emulators math
 MASTER_SITES=	LOCAL/shaun
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} sdcard64.tar.gz
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	shaun@FreeBSD.org
 COMMENT=	HP 49g+/50g graphics calculator emulator
 WWW=		https://sourceforge.net/projects/x49gp/
 
 BROKEN_i386=		does not build on i386 (error: frame pointer required, but reserved)
 BROKEN_powerpc64=	fails to build: qemu/qemu-git/arm-softmmu/i386-dis.o: No such file or directory
 NOT_FOR_ARCHS=		aarch64 armv6 armv7
 NOT_FOR_ARCHS_REASON=	unsupported CPU = unknown
 
 WRKSRC=		${WRKDIR}/x49gp/x49gp-code
 
 USES=		gmake gnome pkgconfig xorg
 USE_GCC=	yes
 USE_XORG=	x11
 USE_GNOME=	gtk20
 
 OPTIONS_SINGLE=	FIRMWARE
 OPTIONS_SINGLE_FIRMWARE=FIRMWARE_215 FIRMWARE_209
 #OPTIONS_SINGLE_FIRMWARE=FIRMWARE_215H3 FIRMWARE_215 FIRMWARE_209
 
 #FIRMWARE_215H3_DESC=	Calculator ROM firmware version 2.15 plus HPGCC3
 FIRMWARE_215_DESC=	Calculator ROM firmware version 2.15
 FIRMWARE_209_DESC=	Calculator ROM firmware version 2.09
 
 OPTIONS_DEFINE=	GRAYSCALE
 GRAYSCALE_DESC=	Apply patch for grayscale support
 
 OPTIONS_DEFAULT=FIRMWARE_215 GRAYSCALE
 
 SUB_FILES=	hp50g.sh
 
 .if defined(WITH_DEBUG)
 MAKE_ENV+=	DEBUGB=1
 .endif
 
 .include <bsd.port.options.mk>
 
 MAKE_ARGS+=CC="${CC}"
 
 .if ${PORT_OPTIONS:MGRAYSCALE}
 EXTRA_PATCHES+=	${FILESDIR}/grayscale.diff
 .endif
 
 .if ${PORT_OPTIONS:MFIRMWARE_215H3} || ${PORT_OPTIONS:MFIRMWARE_215}
 MAKE_ARGS+=FIRMWARE=4950_215.bin
 DISTFILES+=hp4950v215.zip
 EXTRACT_ONLY+=hp4950v215.zip
 .else
 MAKE_ARGS+=FIRMWARE=4950_92.bin
 .endif
 
 #.if ${PORT_OPTIONS:MFIRMWARE_215H3}
 #DISTFILES+=rom215_hpgcc3_R004.tar.gz
 #EXTRACT_ONLY+=rom215_hpgcc3_R004.tar.gz
 #.endif
 
 post-patch:
 .if ${PORT_OPTIONS:MFIRMWARE_215H3} || ${PORT_OPTIONS:MFIRMWARE_215}
 	@${CP} ${WRKDIR}/hp4950v215/*.lib ${WRKSRC}/
 	@${CP} ${WRKDIR}/hp4950v215/*.bin ${WRKSRC}/
 	@${CP} ${WRKDIR}/hp4950v215/*.scp ${WRKSRC}/
 .endif
 #.if ${PORT_OPTIONS:MFIRMWARE_215H3}
 #	@${CP} ${WRKDIR}/rom215_hpgcc3_R004/hpgccrom.bin ${WRKSRC}/4950_215.bin
 #.endif
 
 do-configure:
 	cd ${WRKSRC}/qemu/qemu-git && ./configure-small --extra-cflags=-DX49GP --cc="${CC}"
 
 do-build:
 	cd ${WRKSRC} && ${SETENV} -u MAKELEVEL -u MAKEFLAGS ${MAKE_CMD} ${MAKE_ARGS}
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 .for f in flash-50g hp50g.png hp50g-hack.png hp49g+.png flash-49g+ sram s3c2410-sram
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DATADIR}/
 .endfor
 	${INSTALL_DATA} ${FILESDIR}/config-hp50g ${STAGEDIR}${DATADIR}/
 	${INSTALL_DATA} ${FILESDIR}/config-hp49g+ ${STAGEDIR}${DATADIR}/
 	${INSTALL_PROGRAM} ${WRKSRC}/x49gp ${STAGEDIR}${PREFIX}/bin/x49gp-bin
 
 	${INSTALL_SCRIPT} ${WRKDIR}/hp50g.sh ${STAGEDIR}${PREFIX}/bin/hp50g
 	${RM} ${STAGEDIR}${PREFIX}/bin/hp49g+
 	${LN} ${STAGEDIR}${PREFIX}/bin/hp50g ${STAGEDIR}${PREFIX}/bin/hp49g+
 
 	${INSTALL_DATA} ${DISTDIR}/sdcard64.tar.gz ${STAGEDIR}${DATADIR}/
 
 .include <bsd.port.mk>
diff --git a/finance/R-cran-AER/Makefile b/finance/R-cran-AER/Makefile
index b63bf55b127c..a4f4b9a32ff1 100644
--- a/finance/R-cran-AER/Makefile
+++ b/finance/R-cran-AER/Makefile
@@ -1,20 +1,21 @@
 PORTNAME=	AER
 DISTVERSION=	1.2-10
+PORTREVISION=	1
 CATEGORIES=	finance
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Applied Econometrics with R
 WWW=		https://cran.r-project.org/web/packages/AER/
 
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	R-cran-car>=2.0.19:math/R-cran-car \
 		R-cran-lmtest>=0:finance/R-cran-lmtest \
 		R-cran-Formula>=0.2.0:math/R-cran-Formula \
 		R-cran-zoo>=0:math/R-cran-zoo
 
 USES=	cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/finance/R-cran-PerformanceAnalytics/Makefile b/finance/R-cran-PerformanceAnalytics/Makefile
index ab45bb293625..1e182753e7c6 100644
--- a/finance/R-cran-PerformanceAnalytics/Makefile
+++ b/finance/R-cran-PerformanceAnalytics/Makefile
@@ -1,21 +1,21 @@
 PORTNAME=	PerformanceAnalytics
 PORTVERSION=	2.0.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	finance
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Econometric tools for performance and risk analysis
 WWW=		https://cran.r-project.org/web/packages/PerformanceAnalytics/
 
 LICENSE=	GPLv2+
 
 CRAN_DEPENDS=	R-cran-xts>=0.10.0:math/R-cran-xts \
 		R-cran-quadprog>0:math/R-cran-quadprog \
 		R-cran-zoo>0:math/R-cran-zoo
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/finance/R-cran-RFinanceYJ/Makefile b/finance/R-cran-RFinanceYJ/Makefile
index 505c92a6ce9e..4eedf3e02c3c 100644
--- a/finance/R-cran-RFinanceYJ/Makefile
+++ b/finance/R-cran-RFinanceYJ/Makefile
@@ -1,19 +1,19 @@
 PORTNAME=	RFinanceYJ
 PORTVERSION=	0.3.1
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	finance
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Japanese stock market from Yahoo!-finance-Japan
 WWW=		https://cran.r-project.org/web/packages/RFinanceYJ/
 
 LICENSE=	BSD3CLAUSE
 
 RUN_DEPENDS=	R-cran-RCurl>0:ftp/R-cran-RCurl \
 		R-cran-XML>0:textproc/R-cran-XML \
 		R-cran-xts>0:math/R-cran-xts
 
 USES=	cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/finance/R-cran-TTR/Makefile b/finance/R-cran-TTR/Makefile
index bc627cb81883..64a247505f13 100644
--- a/finance/R-cran-TTR/Makefile
+++ b/finance/R-cran-TTR/Makefile
@@ -1,20 +1,21 @@
 PORTNAME=	TTR
 DISTVERSION=	0.24.3
+PORTREVISION=	1
 CATEGORIES=	finance
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Technical Trading Rules
 WWW=		https://cran.r-project.org/web/packages/TTR/
 
 LICENSE=	GPLv2+
 
 CRAN_DEPENDS=	R-cran-xts>=0.10.0:math/R-cran-xts \
 		R-cran-zoo>0:math/R-cran-zoo \
 		R-cran-curl>0:ftp/R-cran-curl
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/finance/R-cran-ccgarch/Makefile b/finance/R-cran-ccgarch/Makefile
index 7954534fe981..bb09cb37c443 100644
--- a/finance/R-cran-ccgarch/Makefile
+++ b/finance/R-cran-ccgarch/Makefile
@@ -1,16 +1,16 @@
 PORTNAME=	ccgarch
 DISTVERSION=	0.2.3
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	finance
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Conditional Correlation GARCH models
 WWW=		https://cran.r-project.org/web/packages/ccgarch/
 
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/finance/R-cran-fBasics/Makefile b/finance/R-cran-fBasics/Makefile
index b17f258f3912..0b1bfc32e3d1 100644
--- a/finance/R-cran-fBasics/Makefile
+++ b/finance/R-cran-fBasics/Makefile
@@ -1,20 +1,21 @@
 PORTNAME=	fBasics
 DISTVERSION=	4022.94
+PORTREVISION=	1
 CATEGORIES=	finance
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	ygy@FreeBSD.org
 COMMENT=	Rmetrics - Markets and Basic Statistics
 WWW=		https://r-forge.r-project.org/scm/viewvc.php/pkg/fBasics/?root=rmetrics
 
 LICENSE=	GPLv2+
 
 RUN_DEPENDS=	R-cran-timeDate>0:finance/R-cran-timeDate \
 		R-cran-timeSeries>=4021.105:finance/R-cran-timeSeries \
 		R-cran-gss>0:math/R-cran-gss \
 		R-cran-stabledist>0:math/R-cran-stabledist
 TEST_DEPENDS=	R-cran-RUnit>0:devel/R-cran-RUnit
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/finance/R-cran-fGarch/Makefile b/finance/R-cran-fGarch/Makefile
index 57235f70d725..ace5da942f91 100644
--- a/finance/R-cran-fGarch/Makefile
+++ b/finance/R-cran-fGarch/Makefile
@@ -1,21 +1,22 @@
 PORTNAME=	fGarch
 DISTVERSION=	4022.89
+PORTREVISION=	1
 CATEGORIES=	finance
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	ygy@FreeBSD.org
 COMMENT=	Rmetrics - Autoregressive Conditional Heteroskedastic Modelling
 WWW=		https://www.rmetrics.org
 
 LICENSE=	GPLv2+
 
 RUN_DEPENDS=	R-cran-fBasics>0:finance/R-cran-fBasics \
 		R-cran-timeDate>0:finance/R-cran-timeDate \
 		R-cran-timeSeries>0:finance/R-cran-timeSeries \
 		R-cran-cvar>=0.5:math/R-cran-cvar \
 		R-cran-fastICA>0:science/R-cran-fastICA
 TEST_DEPENDS=	R-cran-RUnit>0:devel/R-cran-RUnit
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/finance/R-cran-gmm/Makefile b/finance/R-cran-gmm/Makefile
index 100024c0dcd7..0710a0764434 100644
--- a/finance/R-cran-gmm/Makefile
+++ b/finance/R-cran-gmm/Makefile
@@ -1,18 +1,19 @@
 PORTNAME=	gmm
 DISTVERSION=	1.7
+PORTREVISION=	1
 CATEGORIES=	finance
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Generalized Method of Moments and Generalized Empirical Likelihood
 WWW=		https://cran.r-project.org/web/packages/gmm/
 
 LICENSE=	GPLv2+
 
 CRAN_DEPENDS=	R-cran-sandwich>0:math/R-cran-sandwich
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=	cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/finance/R-cran-lmtest/Makefile b/finance/R-cran-lmtest/Makefile
index 12e4bb087e1f..72e800e25614 100644
--- a/finance/R-cran-lmtest/Makefile
+++ b/finance/R-cran-lmtest/Makefile
@@ -1,18 +1,19 @@
 PORTNAME=	lmtest
 DISTVERSION=	0.9-40
+PORTREVISION=	1
 CATEGORIES=	finance
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Testing Linear Regression Models
 WWW=		https://cran.r-project.org/web/packages/lmtest/
 
 LICENSE=	GPLv2
 
 RUN_DEPENDS=	R-cran-zoo>=0:math/R-cran-zoo \
 		R-cran-strucchange>0:finance/R-cran-strucchange \
 		R-cran-sandwich>=2.2.4:math/R-cran-sandwich
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/finance/R-cran-plm/Makefile b/finance/R-cran-plm/Makefile
index f4f81f53bbfb..a5279d31ca46 100644
--- a/finance/R-cran-plm/Makefile
+++ b/finance/R-cran-plm/Makefile
@@ -1,25 +1,26 @@
 PORTNAME=	plm
 DISTVERSION=	2.6-2
+PORTREVISION=	1
 CATEGORIES=	finance
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Linear Models for Panel Data
 WWW=		https://cran.r-project.org/web/packages/plm/
 
 LICENSE=	GPLv2+
 
 CRAN_DEPENDS=	R-cran-bdsmatrix>0:math/R-cran-bdsmatrix \
 		R-cran-collapse>=1.8.0:devel/R-cran-collapse \
 		R-cran-zoo>0:math/R-cran-zoo \
 		R-cran-sandwich>0:math/R-cran-sandwich \
 		R-cran-lmtest>0:finance/R-cran-lmtest \
 		R-cran-maxLik>0:math/R-cran-maxLik \
 		R-cran-Rdpack>0:devel/R-cran-Rdpack \
 		R-cran-Formula>0:math/R-cran-Formula
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=	cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/finance/R-cran-quantmod/Makefile b/finance/R-cran-quantmod/Makefile
index 72ef2846978b..4c12ce6905bf 100644
--- a/finance/R-cran-quantmod/Makefile
+++ b/finance/R-cran-quantmod/Makefile
@@ -1,21 +1,22 @@
 PORTNAME=	quantmod
 DISTVERSION=	0.4.20
+PORTREVISION=	1
 CATEGORIES=	finance
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Quantitative Financial Modelling and Trading Framework for R
 WWW=		https://www.quantmod.com/
 
 LICENSE=	GPLv3
 
 CRAN_DEPENDS=	R-cran-xts>=0.9.0:math/R-cran-xts \
 		R-cran-zoo>0:math/R-cran-zoo \
 		R-cran-TTR>=0.2:finance/R-cran-TTR \
 		R-cran-curl>0:ftp/R-cran-curl
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=	cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/finance/R-cran-strucchange/Makefile b/finance/R-cran-strucchange/Makefile
index 68a2e3e9c10b..62b06347c06f 100644
--- a/finance/R-cran-strucchange/Makefile
+++ b/finance/R-cran-strucchange/Makefile
@@ -1,19 +1,20 @@
 PORTNAME=	strucchange
 DISTVERSION=	1.5-3
+PORTREVISION=	1
 CATEGORIES=	finance
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Testing, Monitoring, and Dating Structural Changes
 WWW=		https://cran.r-project.org/web/packages/strucchange/
 
 LICENSE=	GPLv2+
 
 CRAN_DEPENDS=	R-cran-zoo>0:math/R-cran-zoo \
 		R-cran-sandwich>0:math/R-cran-sandwich
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=	cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/finance/R-cran-timeDate/Makefile b/finance/R-cran-timeDate/Makefile
index c9703761ea25..39f17a388a3e 100644
--- a/finance/R-cran-timeDate/Makefile
+++ b/finance/R-cran-timeDate/Makefile
@@ -1,16 +1,17 @@
 PORTNAME=	timeDate
 DISTVERSION=	4022.108
+PORTREVISION=	1
 CATEGORIES=	finance
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Rmetrics - Chronological and Calendar Objects
 WWW=		https://www.rmetrics.org
 
 LICENSE=	GPLv2+
 
 TEST_DEPENDS=	R-cran-RUnit>0:devel/R-cran-RUnit
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/finance/R-cran-timeSeries/Makefile b/finance/R-cran-timeSeries/Makefile
index 3cb4dbd79807..27fb64e01854 100644
--- a/finance/R-cran-timeSeries/Makefile
+++ b/finance/R-cran-timeSeries/Makefile
@@ -1,20 +1,21 @@
 PORTNAME=	timeSeries
 DISTVERSION=	4021.105
+PORTREVISION=	1
 CATEGORIES=	finance
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	ygy@FreeBSD.org
 COMMENT=	Financial Time Series Objects (Rmetrics)
 WWW=		https://r-forge.r-project.org/scm/viewvc.php/pkg/timeSeries/?root=rmetrics
 
 LICENSE=	GPLv2+
 
 RUN_DEPENDS=	R-cran-timeDate>=2150.95:finance/R-cran-timeDate
 TEST_DEPENDS=	R-cran-RUnit>0:devel/R-cran-RUnit \
 		R-cran-PerformanceAnalytics>0:finance/R-cran-PerformanceAnalytics \
 		R-cran-robustbase>0:math/R-cran-robustbase \
 		R-cran-xts>0:math/R-cran-xts
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/finance/R-cran-tseries/Makefile b/finance/R-cran-tseries/Makefile
index 6b5a8091dcf3..bcbc8c5aaf07 100644
--- a/finance/R-cran-tseries/Makefile
+++ b/finance/R-cran-tseries/Makefile
@@ -1,18 +1,19 @@
 PORTNAME=	tseries
 DISTVERSION=	0.10-53
+PORTREVISION=	1
 CATEGORIES=	finance
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	ygy@FreeBSD.org
 COMMENT=	Time Series Analysis and Computational Finance
 WWW=		https://CRAN.R-project.org/package=tseries
 
 LICENSE=	GPLv2
 
 RUN_DEPENDS=	R-cran-quantmod>=0.4.9:finance/R-cran-quantmod \
 		R-cran-quadprog>0:math/R-cran-quadprog \
 		R-cran-zoo>0:math/R-cran-zoo
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/finance/R-cran-urca/Makefile b/finance/R-cran-urca/Makefile
index bae674cc9bd1..d43e782e9e5b 100644
--- a/finance/R-cran-urca/Makefile
+++ b/finance/R-cran-urca/Makefile
@@ -1,14 +1,15 @@
 PORTNAME=	urca
 DISTVERSION=	1.3-3
+PORTREVISION=	1
 CATEGORIES=	finance
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Unit root and cointegration tests for time series data
 WWW=		https://cran.r-project.org/web/packages/urca/
 
 LICENSE=	GPLv2+
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/finance/R-cran-vars/Makefile b/finance/R-cran-vars/Makefile
index 3050272437f2..4919643a916d 100644
--- a/finance/R-cran-vars/Makefile
+++ b/finance/R-cran-vars/Makefile
@@ -1,19 +1,20 @@
 PORTNAME=	vars
 DISTVERSION=	1.5-6
+PORTREVISION=	1
 CATEGORIES=	finance
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	VAR Modelling
 WWW=		https://cran.r-project.org/web/packages/vars/
 
 LICENSE=	GPLv2+
 
 RUN_DEPENDS=	R-cran-strucchange>0:finance/R-cran-strucchange \
 		R-cran-urca>=1.1.6:finance/R-cran-urca \
 		R-cran-lmtest>=0.9.26:finance/R-cran-lmtest \
 		R-cran-sandwich>=2.2.4:math/R-cran-sandwich
 
 USES=	cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/finance/electrum/Makefile b/finance/electrum/Makefile
index 76f4888836b0..ecfc45d2b912 100644
--- a/finance/electrum/Makefile
+++ b/finance/electrum/Makefile
@@ -1,69 +1,70 @@
 PORTNAME=	electrum
 PORTVERSION=	4.4.0
+PORTREVISION=	1
 CATEGORIES=	finance python
 MASTER_SITES=	https://download.electrum.org/${PORTVERSION}/ \
 		http://download.electrum.org/${PORTVERSION}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	Electrum-${PORTVERSION}
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Easy to use Bitcoin client
 WWW=		https://electrum.org/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENCE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}aiohttp-socks>=0.3:net/py-aiohttp-socks@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}aiohttp>=3.3.0:www/py-aiohttp@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}aiorpcX>=0.22.0:devel/py-aiorpcX@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}attrs>=19.2.0:devel/py-attrs@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}bitstring>0:devel/py-bitstring@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}certifi>0:security/py-certifi@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cryptography>=2.6:security/py-cryptography@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dnspython>=2.0:dns/py-dnspython@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}httplib2>=0:www/py-httplib2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jsonrpclib-pelix>0:devel/py-jsonrpclib-pelix@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pbkdf2>=1.3:security/py-pbkdf2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}protobuf>=3.12:devel/py-protobuf@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}QDarkStyle>=2.7:textproc/py-QDarkStyle@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}qrcode>0:textproc/py-qrcode@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.4.3:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}secp256k1>0:math/py-secp256k1@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>=3.7.9:databases/py-sqlite3@${PY_FLAVOR}
 
 USES=		cpe python:3.8+ shebangfix
 USE_PYTHON=	autoplist concurrent distutils
 
 PYDISTUTILS_PKGNAME=	Electrum
 
 SHEBANG_FILES=	electrum/electrum
 SHEBANG_GLOB=	*.py
 
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=		GUI HARDWARE
 OPTIONS_DEFAULT=	GUI HARDWARE
 OPTIONS_SUB=		yes
 
 HARDWARE_DESC=	Enable Bitcoin hardware wallet support
 
 GUI_USES=		desktop-file-utils pyqt:5
 GUI_USE=		PYQT=pyqt5,sip
 HARDWARE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}bitbox02>=0.13.0:security/py-bitbox02@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}btchip-python>=0.1.32:security/py-btchip-python@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}ckcc-protocol>=0.7.7:security/py-ckcc-protocol@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}hidapi>=0:comms/py-hidapi@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}keepkey>=6.3.1:security/py-keepkey@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}trezor>=0.13.0:security/py-trezor@${PY_FLAVOR}
 HARDWARE_USE=		PYTHON=cython
 HARDWARE_SUB_FILES=	pkg-message-hwwallet
 HARDWARE_PLIST_FILES=	"@sample etc/devd/hardware_wallet.conf.sample"
 
 post-patch-GUI-off:
 	@${REINPLACE_CMD} -e '/electrum\.desktop/d' ${WRKSRC}/setup.py
 
 post-install-HARDWARE-on:
 	${INSTALL_DATA} ${FILESDIR}/hardware_wallet.conf.sample \
 		${STAGEDIR}${PREFIX}/etc/devd
 
 .include <bsd.port.mk>
diff --git a/finance/py-Nasdaq-Data-Link/Makefile b/finance/py-Nasdaq-Data-Link/Makefile
index e0c15e4338a7..876d5774d6c5 100644
--- a/finance/py-Nasdaq-Data-Link/Makefile
+++ b/finance/py-Nasdaq-Data-Link/Makefile
@@ -1,37 +1,38 @@
 PORTNAME=	Nasdaq-Data-Link
 DISTVERSION=	1.0.4
+PORTREVISION=	1
 CATEGORIES=	finance
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Package for Nasdaq Data Link API access
 WWW=		https://github.com/Nasdaq/data-link-python
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 PY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}inflection>=0.3.1:devel/py-inflection@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}more-itertools>0:devel/py-more-itertools@${PY_FLAVOR} \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}pandas>=0.14:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.7.0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
 BUILD_DEPENDS=	${PY_DEPENDS}
 RUN_DEPENDS=	${PY_DEPENDS}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}httpretty>0:www/py-httpretty@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}factory-boy>0:devel/py-factory-boy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-flake8>0:devel/py-pytest-flake8@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	autoplist concurrent distutils pytest # tests are broken, see https://github.com/Nasdaq/data-link-python/issues/24
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Nasdaq
 GH_PROJECT=	data-link-python
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/finance/py-bt/Makefile b/finance/py-bt/Makefile
index f62c0d39152c..796084cc8a80 100644
--- a/finance/py-bt/Makefile
+++ b/finance/py-bt/Makefile
@@ -1,30 +1,31 @@
 PORTNAME=	bt
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.2.9
+PORTREVISION=	1
 CATEGORIES=	finance python
 #MASTER_SITES=	PYPI # no tests
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	${PORTNAME:S/-/_/}-${PORTVERSION}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Flexible backtesting framework to test quantitative trading strategies
 WWW=		http://pmorissette.github.io/bt/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 PY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ffn>=0.3.5:finance/py-ffn@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyprind>=2.11:misc/py-pyprind@${PY_FLAVOR}
 BUILD_DEPENDS=	${PY_DEPENDS}
 RUN_DEPENDS=	${PY_DEPENDS}
 
 USES=		python:3.8+
 USE_PYTHON=	distutils autoplist pytest # tests require nose which is currently broken
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	pmorissette
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/bt/core${PYTHON_EXT_SUFFIX}.so
 
 .include <bsd.port.mk>
diff --git a/finance/py-degiro-connector/Makefile b/finance/py-degiro-connector/Makefile
index 0d7f40190fce..f18e3c92f765 100644
--- a/finance/py-degiro-connector/Makefile
+++ b/finance/py-degiro-connector/Makefile
@@ -1,31 +1,32 @@
 PORTNAME=	degiro-connector
 DISTVERSION=	2.0.22
+PORTREVISION=	1
 CATEGORIES=	finance python
 MASTER_SITES=	PYPI # no tests
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Library to access Degiro's API
 WWW=		https://github.com/chavithra/degiro-connector
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 PY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}grpcio>=1.49.1:devel/py-grpcio@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}onetimepass>=1.0.1:www/py-onetimepass@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pandas>=1.1.5:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}protobuf>=4.21.7:devel/py-protobuf@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.26.0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wrapt>=1.12.1:devel/py-wrapt@${PY_FLAVOR}
 BUILD_DEPENDS=	${PY_DEPENDS}
 RUN_DEPENDS=	${PY_DEPENDS}
 
 USES=		python:3.6+
 USE_PYTHON=	distutils autoplist
 
 #USE_GITHUB=	yes
 #GH_ACCOUNT=	chavithra
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/finance/py-exchange-calendars/Makefile b/finance/py-exchange-calendars/Makefile
index d24ffade48f3..5d4759fb0686 100644
--- a/finance/py-exchange-calendars/Makefile
+++ b/finance/py-exchange-calendars/Makefile
@@ -1,30 +1,31 @@
 PORTNAME=	exchange-calendars
 DISTVERSION=	4.2.5
+PORTREVISION=	1
 CATEGORIES=	finance python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	${PORTNAME:S/-/_/}-${PORTVERSION}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Calendars for securities exchanges
 WWW=		https://github.com/gerrymanoim/exchange_calendars
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 PY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}korean-lunar-calendar>0:korean/py-korean-lunar-calendar@${PY_FLAVOR} \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}pandas>=1.1:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyluach>0:hebrew/py-pyluach@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}toolz>0:devel/py-toolz@${PY_FLAVOR}
 BUILD_DEPENDS=	${PY_DEPENDS}
 RUN_DEPENDS=	${PY_DEPENDS}
 
 USES=		python:3.8+
 USE_PYTHON=	distutils autoplist pytest
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/finance/py-ffn/Makefile b/finance/py-ffn/Makefile
index de7fbb351b0d..d4216b8cd4af 100644
--- a/finance/py-ffn/Makefile
+++ b/finance/py-ffn/Makefile
@@ -1,35 +1,36 @@
 PORTNAME=	ffn
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.3.6
+PORTREVISION=	1
 CATEGORIES=	finance python
 #MASTER_SITES=	PYPI # no tests
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Financial functions for Python
 WWW=		http://pmorissette.github.io/ffn/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 PY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}decorator>=4:devel/py-decorator@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}future>=0.15:devel/py-future@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>=1:math/py-matplotlib@${PY_FLAVOR} \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}pandas-datareader>=0.2:math/py-pandas-datareader@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pandas>=0.19:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-learn>=0.15:science/py-scikit-learn@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=0.15:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tabulate>=0.7.5:devel/py-tabulate@${PY_FLAVOR}
 BUILD_DEPENDS=	${PY_DEPENDS}
 RUN_DEPENDS=	${PY_DEPENDS}
 
 USES=		python:3.6+
 USE_PYTHON=	distutils autoplist pytest
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	pmorissette
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/finance/py-financedatabase/Makefile b/finance/py-financedatabase/Makefile
index ecdaaf537fee..34179eabf447 100644
--- a/finance/py-financedatabase/Makefile
+++ b/finance/py-financedatabase/Makefile
@@ -1,29 +1,29 @@
 PORTNAME=	financedatabase
 PORTVERSION=	2.0.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	finance python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Database of 300.000+ symbols containing Equities, ETFs, Funds, Indices
 WWW=		https://github.com/JerBouma/FinanceDatabase
 
 LICENSE=	MIT
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pathlib2>0:devel/py-pathlib2@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_PYTHON=	pep517 autoplist
 
 NO_ARCH=	yes
 
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 
 do-test:
 	@${SETENV} ${TEST_ENV} ${PYTHON_CMD} ${FILESDIR}/test.py
 
 .include <bsd.port.mk>
diff --git a/finance/py-finvizfinance/Makefile b/finance/py-finvizfinance/Makefile
index 448364f323eb..9375497afe3c 100644
--- a/finance/py-finvizfinance/Makefile
+++ b/finance/py-finvizfinance/Makefile
@@ -1,30 +1,31 @@
 PORTNAME=	finvizfinance
 PORTVERSION=	0.14.5
+PORTREVISION=	1
 CATEGORIES=	finance python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Finviz Finance information downloader
 WWW=		https://finvizfinance.readthedocs.io/en/latest/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 PY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>0:www/py-beautifulsoup@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}DateTime>0:devel/py-DateTime@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR}
 BUILD_DEPENDS=	${PY_DEPENDS}
 RUN_DEPENDS=	${PY_DEPENDS}
 
 USES=		python:3.6+
 USE_PYTHON=	distutils autoplist pytest
 
 NO_ARCH=	yes
 
 post-extract:
 	@${TOUCH} ${WRKSRC}/README_pypi.md
 
 .include <bsd.port.mk>
diff --git a/finance/py-fredapi/Makefile b/finance/py-fredapi/Makefile
index 85eb2f2739e9..77e80e8e6f78 100644
--- a/finance/py-fredapi/Makefile
+++ b/finance/py-fredapi/Makefile
@@ -1,27 +1,28 @@
 PORTNAME=	fredapi
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.5.0
+PORTREVISION=	1
 CATEGORIES=	finance python
 #MASTER_SITES=	PYPI # no tests
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Python API for Federal Reserve Economic Data (FRED) from St. Louis Fed
 WWW=		https://github.com/mortada/fredapi
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 PY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pandas>=0.15:math/py-pandas@${PY_FLAVOR}
 BUILD_DEPENDS=	${PY_DEPENDS}
 RUN_DEPENDS=	${PY_DEPENDS}
 
 USES=		python
 USE_PYTHON=	distutils autoplist pytest # 1 test fails, see https://github.com/mortada/fredapi/issues/60
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	mortada
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/finance/py-fundamentalanalysis/Makefile b/finance/py-fundamentalanalysis/Makefile
index cf71cb92f4de..1b34620a51d3 100644
--- a/finance/py-fundamentalanalysis/Makefile
+++ b/finance/py-fundamentalanalysis/Makefile
@@ -1,22 +1,23 @@
 PORTNAME=	fundamentalanalysis
 PORTVERSION=	0.2.14
+PORTREVISION=	1
 CATEGORIES=	finance python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Fundamental analysis package to analyze companies data
 WWW=		https://github.com/JerBouma/FundamentalAnalysis
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pandas>=1.1.2:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.25.1:www/py-requests@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/finance/py-investpy/Makefile b/finance/py-investpy/Makefile
index e57da051c83e..c7cdbb1cdb90 100644
--- a/finance/py-investpy/Makefile
+++ b/finance/py-investpy/Makefile
@@ -1,28 +1,29 @@
 PORTNAME=	investpy
 PORTVERSION=	1.0.8
+PORTREVISION=	1
 CATEGORIES=	finance python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Financial Data Extraction from Investing.com with Python
 WWW=		https://investpy.readthedocs.io/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 PY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}pandas>=0.25.1:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytz>=2019.3:devel/py-pytz@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.22.0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}unidecode>=1.1.1:converters/py-unidecode@${PY_FLAVOR}
 BUILD_DEPENDS=	${PY_DEPENDS}
 RUN_DEPENDS=	${PY_DEPENDS}
 
 USES=		python:3.7+
 USE_PYTHON=	distutils autoplist
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/finance/py-mplfinance/Makefile b/finance/py-mplfinance/Makefile
index bb210546e2d7..394022490a03 100644
--- a/finance/py-mplfinance/Makefile
+++ b/finance/py-mplfinance/Makefile
@@ -1,22 +1,23 @@
 PORTNAME=	mplfinance
 PORTVERSION=	0.12.9b7
+PORTREVISION=	1
 CATEGORIES=	finance python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Utilities for the visualization, and visual analysis, of financial data
 WWW=		https://github.com/matplotlib/mplfinance
 
 LICENSE=	PSFL
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}matplotlib>=0:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pandas>=0,1:math/py-pandas@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/finance/py-pandas-market-calendars/Makefile b/finance/py-pandas-market-calendars/Makefile
index 6aeda9eab096..b5e4154e1c11 100644
--- a/finance/py-pandas-market-calendars/Makefile
+++ b/finance/py-pandas-market-calendars/Makefile
@@ -1,32 +1,33 @@
 PORTNAME=	pandas-market-calendars
 DISTVERSIONPREFIX=	v
 DISTVERSION=	4.1.4
+PORTREVISION=	1
 CATEGORIES=	finance python
 #MASTER_SITES=	PYPI # no tests
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	${PORTNAME:S/-/_/g}-${PORTVERSION}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Market and exchange trading calendars for pandas
 WWW=		https://github.com/rsheftel/pandas_market_calendars
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 PY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}exchange-calendars>=3.3:finance/py-exchange-calendars@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pandas>=1.1:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR}
 BUILD_DEPENDS=	${PY_DEPENDS}
 RUN_DEPENDS=	${PY_DEPENDS}
 
 USES=		python:3.8+
 USE_PYTHON=	distutils autoplist pytest
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	rsheftel
 GH_PROJECT=	${PORTNAME:S/-/_/g}
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/finance/py-pandas-ta/Makefile b/finance/py-pandas-ta/Makefile
index 508202daef68..4ec36bf9330d 100644
--- a/finance/py-pandas-ta/Makefile
+++ b/finance/py-pandas-ta/Makefile
@@ -1,33 +1,33 @@
 PORTNAME=	pandas-ta
 DISTVERSION=	0.3.14
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	finance python
 #MASTER_SITES=	PYPI # no tests
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	${PORTNAME:S/-/_/}-${DISTVERSION}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Market Technical Analysis indicators in Python and Pandas
 WWW=		https://twopirllc.github.io/pandas-ta/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 PY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${PY_FLAVOR} \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}pandas>=1.2.0:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytz>=2021.1:devel/py-pytz@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.16.0:devel/py-six@${PY_FLAVOR}
 BUILD_DEPENDS=	${PY_DEPENDS}
 RUN_DEPENDS=	${PY_DEPENDS}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ta-lib>0:finance/py-ta-lib@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_PYTHON=	distutils autoplist pytest # 1 test fails, see https://github.com/twopirllc/pandas-ta/issues/631
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	twopirllc
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/finance/py-python-obelisk/Makefile b/finance/py-python-obelisk/Makefile
index 58b2f29a5547..04dfd36bbcb2 100644
--- a/finance/py-python-obelisk/Makefile
+++ b/finance/py-python-obelisk/Makefile
@@ -1,23 +1,23 @@
 PORTNAME=	python-obelisk
 PORTVERSION=	0.1.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	finance python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Python native client for the obelisk blockchain server
 WWW=		https://github.com/darkwallet/python-obelisk
 
 LICENSE=	AGPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twisted>0:devel/py-twisted@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ecdsa>0:security/py-ecdsa@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyzmq>=14.5.0:net/py-pyzmq@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_PYTHON=	autoplist distutils
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/finance/py-quantecon/Makefile b/finance/py-quantecon/Makefile
index 2d2939d7cd67..9ff9e257c53e 100644
--- a/finance/py-quantecon/Makefile
+++ b/finance/py-quantecon/Makefile
@@ -1,27 +1,27 @@
 PORTNAME=	quantecon
 PORTVERSION=	0.6.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	finance python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Support all forms of quantitative economic modelling
 WWW=		https://github.com/QuantEcon/QuantEcon.py
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}flit-core>=3.5<4:devel/py-flit-core@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numba>=0:devel/py-numba@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpy>=1.17.0,1:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=1.5.0:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sympy>=0:math/py-sympy@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	autoplist concurrent pep517
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/finance/py-ta-lib/Makefile b/finance/py-ta-lib/Makefile
index 7a530dd7c8d7..b6f8cbb261bd 100644
--- a/finance/py-ta-lib/Makefile
+++ b/finance/py-ta-lib/Makefile
@@ -1,30 +1,31 @@
 PORTNAME=	ta-lib # provides Python namespace 'talib'
 DISTVERSION=	0.4.26
+PORTREVISION=	1
 CATEGORIES=	finance python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	TA-Lib-${PORTVERSION}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Python wrapper for TA-Lib (Technical Analysis Library)
 WWW=		https://mrjbq7.github.io/ta-lib/
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYNUMPY}
 LIB_DEPENDS=	libta_lib.so:devel/ta-lib
 RUN_DEPENDS=	${PYNUMPY}
 #TEST_DEPENDS=	misc/py-polars - fails to build, see https://github.com/rust-lang/hashbrown/issues/377
 
 USES=		python
 USE_PYTHON=	distutils cython autoplist pytest # pytest fails to find the library, see https://github.com/pytest-dev/pytest/issues/10885
 
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 TEST_WRKSRC=	${WRKSRC}/talib
 TEST_ARGS=	--pyargs talib
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/talib/_ta_lib${PYTHON_EXT_SUFFIX}.so
 
 .include <bsd.port.mk>
diff --git a/finance/py-technical/Makefile b/finance/py-technical/Makefile
index 26f0011e0f09..c3926714b1d4 100644
--- a/finance/py-technical/Makefile
+++ b/finance/py-technical/Makefile
@@ -1,33 +1,33 @@
 PORTNAME=	technical
 DISTVERSION=	1.4.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	finance python
 #MASTER_SITES=	PYPI # no test data
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Various indicators developed or collected for the Freqtrade
 WWW=		https://github.com/freqtrade/technical
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 PY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pandas>=1.5.3:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ta-lib>=0.4.25:finance/py-ta-lib@${PY_FLAVOR}
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=46.4.0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} \
 		${PY_DEPENDS}
 RUN_DEPENDS=	${PY_DEPENDS}
 
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest-cov>0:devel/py-pytest-cov@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-mock>0:devel/py-pytest-mock@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	pep517 autoplist pytest
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	freqtrade
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/finance/py-yfinance/Makefile b/finance/py-yfinance/Makefile
index 5f9f871865a0..bc85c235a3f2 100644
--- a/finance/py-yfinance/Makefile
+++ b/finance/py-yfinance/Makefile
@@ -1,26 +1,27 @@
 PORTNAME=	yfinance
 PORTVERSION=	0.1.75
+PORTREVISION=	1
 CATEGORIES=	finance python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Yahoo! Finance market data downloader
 WWW=		https://github.com/ranaroussi/yfinance
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}appdirs>=1.4.4:devel/py-appdirs@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}lxml>=4.5.1:devel/py-lxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}multitasking>=0.0.7:devel/py-multitasking@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpy>=1.15,1:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pandas>=0.24.0,1:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.20:www/py-requests@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/french/aster/Makefile b/french/aster/Makefile
index b7116ce818ea..7b7e6ede1bad 100644
--- a/french/aster/Makefile
+++ b/french/aster/Makefile
@@ -1,434 +1,434 @@
 PORTNAME=	aster
 DISTVERSION=	${ASTER_DISTVERSION}
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	french cad
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Code_Aster finite element method solver
 WWW=		http://www.code-aster.org/
 
 LICENSE=	GPLv2
 
 NOT_FOR_ARCHS=		armv6 armv7 i386 mips powerpc
 NOT_FOR_ARCHS_REASON=	ARG_MAX is too small for Code_Aster on 32 bits systems
 
 #-----------------------------------------------------------------------
 # You may define these options:
 #
 # - WITH_ZSH or WITH_BASH or WITH_KSH: select a shell among
 #			zsh (default), bash or ksh;
 # - WITH_ED: select an editor accepting '-display' (e.g. gvim, nedit);
 # - WITHOUT_ASTK_CLI: won't use the GUI from this machine;
 # - WITHOUT_GMSH: don't install GMSH (a mesh generator);
 # - WITHOUT_GRACE: don't install Grace (used to create 2D graph);
 # - WITH_MUMPS: install the interface between Code_Aster and MUMPS (experimental)
 #
 #-----------------------------------------------------------------------
 
 BUILD_DEPENDS+=	astk-serveur>0:cad/astk-serveur	\
 		${SHELL_INSTALL_ASTER}:shells/${SHIADEP}	\
 		gnproc:sysutils/coreutils			\
 		bash:shells/bash				\
 		getopt>0:misc/getopt				\
 		xterm:x11/xterm					\
 		${PYNUMPY}	\
 		${PYTHON_PKGNAMEPREFIX}sympy>0:math/py-sympy@${PY_FLAVOR}
 #		pylupdate5:textproc/py-qt5-xml
 LIB_DEPENDS+=	libhdf5-110.so:science/hdf5-110			\
 		libscotch.so:cad/scotch				\
 		libmetis.so:math/metis				\
 		libmed.so:french/med				\
 		libAsterInterface.so:science/tfel-edf
 RUN_DEPENDS+=	${SHELL_INSTALL_ASTER}:shells/${SHIADEP}	\
 		astk-serveur>0:cad/astk-serveur			\
 		xterm:x11/xterm					\
 		${PYNUMPY}	\
 		${PYTHON_PKGNAMEPREFIX}sympy>0:math/py-sympy@${PY_FLAVOR}
 
 USES=		bison blaslapack:openblas fortran gettext python:3.6+ qt:5 tk
 USE_BINUTILS=	yes
 USE_QT=		linguisttools:build
 
 #CONFLICTS_BUILD=${PYTHON_PKGNAMEPREFIX}cysignals-1.*
 
 HAS_CONFIGURE=	yes
 CFLAGS+=	-I${LOCALBASE}/include/hdf5-110
 MAKE_ENV=	INCLUDES="${LOCALBASE}/include"	\
 		INCLUDEDIR="${LOCALBASE}/include"	\
 		LD_PRELOAD="${LOCALBASE}/lib/gcc${_GCC_VER}/libgcc_s.so.1"	\
 		PYTHONPATH="${PYTHON_SITELIBDIR}:${LOCALBASE}/aster/ASTK/ASTK_SERV"	\
 		PYTHONIOENCODING="utf-8" LANG=C LC_ALL="en_US.UTF-8"	\
 		LINKFLAGS="${LDFLAGS}" LD_LIBRARY_PATH="${LOCALBASE}/lib/gcc${_GCC_VER}"
 REINPLACE_ARGS=	-i ""
 
 BINARY_ALIAS=	python=${PYTHON_CMD}
 
 VER=		${PORTVERSION:R}
 VE=		${VER:R}
 WRKSRC=		${WRKDIR}/${PORTNAME}-full-src-${VER}
 
 PLIST_SUB=	VE=${VE}
 .if defined(WITHOUT_ASTK_CLI)
 SUB_FILES=	pkg-message.sans-astk
 .else
 SUB_FILES=	pkg-message
 .endif
 SUB_LIST=	tools_dir=${tools_dir}
 
 INTERACTIVE_SCRIPTS=	check_compilers.py setup.py
 
 .include "${.CURDIR}/../../french/aster/bsd.aster.mk"
 .include <bsd.port.pre.mk>
 
 .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1300068
 BROKEN=	a larger value of ARG_MAX is needed for Code_Aster, please upgrade your system
 .endif
 
 .if ${ARCH} == "i386"
 FLAGARCH=	-DP_LINUX -DLINUX
 .else
 FLAGARCH=	-DLINUX64
 .endif
 
 .if defined(WITH_DEBUG)
 DEBUG_FLAGS=	--debug
 CFLAGS+=	-D__DEBUG_ALLOCATE__
 FFLAGS+=	-D__DEBUG_ALLOCATE__
 MAKE_ENV+=	FCFLAGS="-g ${FFLAGS:C|O2|O0|} -fno-tree-dse ${FLAGARCH}"
 .else
 MAKE_ENV+=	FCFLAGS="${FFLAGS} -fno-tree-dse ${FLAGARCH}"
 .endif
 
 .if !defined(WITHOUT_ASTK_CLI)
 RUN_DEPENDS+=	astk-client>0:cad/astk-client
 PLIST_SUB+=	ASTK_CLIENT=""  ASTKDIR=${ASTKDIR}
 .else
 PLIST_SUB+=	ASTK_CLIENT="@comment " ASTKDIR=""
 .endif
 .if !defined(WITHOUT_GMSH)
 RUN_DEPENDS+=	${LOCALBASE}/bin/gmsh:cad/gmsh
 PLIST_SUB+=	GMSH=""
 .else
 PLIST_SUB+=	GMSH="@comment "
 .endif
 .if !defined(WITHOUT_GRACE)
 RUN_DEPENDS+=	xmgrace:math/grace
 PLIST_SUB+=	GRACE=""
 .else
 PLIST_SUB+=	GRACE="@comment "
 .endif
 .if defined(WITH_BOOST)
 LIB_DEPENDS+=	${PY_BOOST}
 .endif
 
 .if !defined(WITH_MPI)
 MPISEQ=		-lmpiseq
 MUMPSLIB=	-L${LOCALBASE}/lib -ldmumps -lzmumps -lsmumps -lcmumps -lmumps_common -lpord ${MPISEQ}
 LIB_DEPENDS+=	libmpiseq.so.5:math/mumps
 .else
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libscalapack.a:math/scalapack
 MUMPSLIB=	-L${LOCALBASE}/lib -ldmumps -lzmumps -lsmumps -lcmumps -lmumps_common -lpord -lscalapack -lexecinfo -L${LOCALBASE}/lib -lmpi
 LIB_DEPENDS+=	libcmumps.so.5:math/mumps
 .endif
 
 .if defined(WITH_MPI)
 LIB_DEPENDS+=	libmpi.so:net/mpich
 HOME_MPI=	${LOCALBASE}
 .endif
 
 .if defined(WITH_ZSH)
 SHIA=		zsh
 .elif defined(WITH_BASH)
 SHIA=		bash
 .elif defined(WITH_KSH)
 SHIA=		ksh93
 .elif exists(${LOCALBASE}/bin/zsh)
 SHIA=		zsh
 .elif exists(${LOCALBASE}/bin/bash)
 SHIA=		bash
 .elif exists(${LOCALBASE}/bin/ksh93)
 SHIA=		ksh93
 .else
 SHIA=		zsh
 .endif
 SHIADEP=	${SHIA}
 
 .if !defined(WITH_ED)
 . if exists(${LOCALBASE}/bin/nedit)
 WITH_ED=	nedit
 RUN_DEPENDS+=	${LOCALBASE}/bin/nedit:editors/nedit
 . elif exists(${LOCALBASE}/bin/gvim)
 WITH_ED=	gvim
 RUN_DEPENDS+=	${LOCALBASE}/bin/gvim:editors/vim
 . elif exists(${LOCALBASE}/bin/emacs)
 WITH_ED=	emacs
 RUN_DEPENDS+=	${LOCALBASE}/bin/emacs:editors/emacs
 . elif exists(${LOCALBASE}/bin/gedit)
 WITH_ED=	gedit
 RUN_DEPENDS+=	${LOCALBASE}/bin/gedit:editors/gedit
 . elif exists(${LOCALBASE}/bin/xedit)
 WITH_ED=	xedit
 RUN_DEPENDS+=	${LOCALBASE}/bin/xedit:x11/xedit
 . else
 WITH_ED=	vi
 . endif
 .endif
 
 INST_DAT=	elements
 INST_SH=	as_run parallel_cp
 PFX2FIX=	bin/as_run etc/codeaster/aster etc/codeaster/profile.sh	\
 		${VE}/aster.conf ${VE}/lib/aster/aster_pkginfo.py	\
 		${VE}/share/aster/CTestTestfile.cmake			\
 		${VE}/include/aster/asterf_config.h			\
 		${VE}/include/aster/asterc_config.h			\
 		${VE}/share/aster/execute_codeaster			\
 		${VE}/share/aster/config.txt ${VE}/share/aster/profile.sh
 POSTPY2FIX=	post-patch-waf.engine post-patch-data__post_install
 POSTBASH2FIX=	execute_codeaster create_install_script
 inst_dir=	${PREFIX}/${PORTNAME}
 tools_dir=	${PREFIX}/${PORTNAME}/outils
 tools=		cmpfillin gpmetis graphchk m2gmetis mpmetis ndmetis gnuplot
 .if !defined(WITHOUT_GMSH)
 tools+=		gmsh
 .endif
 .if !defined(WITHOUT_GRACE)
 tools+=		gracebat xmgrace
 .endif
 v_ifdef=	${OPSYS:tu}
 SHELL_INSTALL_ASTER=	${LOCALBASE}/bin/${SHIA}
 tcl_dir=	${LOCALBASE}
 hdf_dir=	${LOCALBASE}
 lib_math=	"-L${LOCALBASE}/lib ${BLASLIB} ${LAPACKLIB} -lscotch -lscotcherr"
 
 LASTKDIR?=	${PORTNAME}/ASTK/ASTK_CLIENT
 ASTKDIR=	${LOCALBASE}/${LASTKDIR}
 
 BASH2RC=	products_data.py
 
 ExportPATH?=	/tmp/maillages
 
 pre-configure:
 	${REINPLACE_CMD} -e 's|PREFER_SHARED_LIBS=False|PREFER_SHARED_LIBS=True|'	\
 		-e 's|/opt/aster|${STAGEDIR}${inst_dir}|' ${WRKSRC}/setup.cfg
 	${REINPLACE_CMD} -e 's|?ASTER_ROOT?|${STAGEDIR}${inst_dir}|'	\
 		${WRKSRC}/products.py
 	${REINPLACE_CMD} -e "s|'gfortran'|'${FC}'|g;s|'gcc'|'${CC}'|g"	\
 		-e "s|'g++'|'${CXX}'|g" ${WRKSRC}/check_compilers.py
 	${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|"		\
 		-e "s|%%PYTHON_CMD%%|${PYTHON_CMD}|"			\
 		-e "s|%%WRKDIR%%|${WRKDIR}|" ${WRKSRC}/as_setup.py
 .for sh in ${BASH2RC}
 	${REINPLACE_CMD} -e 's|/bin/bash|${SHELL_INSTALL_ASTER}|' ${WRKSRC}/${sh}
 .endfor
 	${REINPLACE_CMD} -e 's|%%PYTHON_ABIVER%%|${PYTHON_ABIVER}|' ${WRKSRC}/setup.py
 	${ECHO_CMD} "_install_hdf5 = False"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "_install_med = False"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "_install_tcl = False"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "_install_tk  = False"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "_install_Pmw = False"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "_install_Numeric = False"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "_install_gmsh = False"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "_install_gmsh2 = False"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "_install_gibi = False"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "_install_grace = False"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "XMGRACE = 'xmgrace'"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "_install_homard = False"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "_install_eficas = False"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "_install_astk = False"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "_install_astk_serv = False"		>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "_install_metis = False"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "_install_mfront = False"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "_install_mumps = False"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "_install_omniORB = False"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "_install_omniORBpy = False"		>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "_install_pylotage = False"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "_install_crpcrs = False"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "_install_aster_Linux = False"		>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "_install_scotch  = False"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "OPT_ENV = 'verbose=True'"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "PYTHONPATH = '${PYTHON_SITELIBDIR}:${LOCALBASE}/aster/ASTK/ASTK_SERV'"\
 			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "PYTHON_INCLUDE = '${PYTHON_INCLUDEDIR}'"	>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "HOME_PYTHON = '${PYTHONBASE}'"		>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "PYTHON_EXE = '${PYTHON_CMD}'"		>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "HOME_SCOTCH = '${LOCALBASE}'"		>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "HOME_METIS = '${LOCALBASE}'"		>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "HOME_GMSH = '${LOCALBASE}'"		>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "HOME_GIBI = '${LOCALBASE}'"		>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "HOME_HOMARD = '${LOCALBASE}'"		>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "INCLUDEDIR = ['${LOCALBASE}/include/hdf5-110', '${LOCALBASE}/include', '${LOCALBASE}/include/metis', ]"\
 			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "HOME_MUMPS = '${LOCALBASE}'"		>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "HOME_MFRONT = '${LOCALBASE}'"		>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "MUMPSLIB = '${MUMPSLIB}'"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "CC='${CC}'"				>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "gcc='${CC}'"				>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "CXX='${CXX}'"				>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "LD='${FC}'"				>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "F90='${FC}'"				>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "MATHLIB='${lib_math} ${LDFLAGS} -lgfortran -lm -lkvm'"		\
 		>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "OTHERLIB='-Xlinker -export-dynamic ${MPISEQ} -lc++ -lexecinfo -lutil -lpthread -lz'"	\
 		>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "SYSLIB='-lpthread -lz'"			>> ${WRKSRC}/setup.cfg
 .if defined(WITH_MPI)
 	${ECHO_CMD} "HOME_MPI = '${HOME_MPI}'"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "MPIRUN = 'mpirun'"				>> ${WRKSRC}/setup.cfg
 .else
 	${ECHO_CMD} "HOME_MPI = ''"				>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "MPIRUN = ''"				>> ${WRKSRC}/setup.cfg
 .endif
 	${ECHO_CMD} "HOME_ZMAT = ''"				>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "HOME_HDF='${hdf_dir}'"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "HOME_MED='${LOCALBASE}'"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "HOME_TCL_TK='${tcl_dir}'"			>> ${WRKSRC}/setup.cfg
 .if defined(WITH_BOOST)
 	${ECHO_CMD} "HOME_BOOST='${LOCALBASE}'"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "LIBPATH_BOOST='${LOCALBASE}/lib'"		>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "LIBNAME_BOOST='${PY_BOOST_LIB}'"		>> ${WRKSRC}/setup.cfg
 .endif
 	${ECHO_CMD} "BLASLIB='${_BLASLIB}'"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "LAPACKLIB='lapack'"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "GZIP='/usr/bin/gzip'"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "SHELL_EXECUTION='${SHELL_INSTALL_ASTER}'"	>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "TERMINAL='xterm'"				>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "EDITOR='${WITH_ED}'"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "CXXFLAGS='${CXXFLAGS}'"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "CXXFLAGS_DBG='${CXXFLAGS:C|-O2|--debug|}'"	>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "LDFLAGS='${LDFLAGS}'"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "FFLAGS='-c ${FFLAGS} -fno-tree-dse ${FLAGARCH}'"	\
 		>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "FFLAGS_DBG='-c -g ${FFLAGS:C|O2|O0|} -fno-tree-dse ${FLAGARCH}'"	\
 		>> ${WRKSRC}/setup.cfg
 .if defined(WITH_MPI)
 	${ECHO_CMD} "F90FLAGS='-c ${FFLAGS} -fno-tree-dse ${FLAGARCH} -I${HOME_MPI}/include'"	\
 		>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "F90FLAGS_DBG='-c -g ${FFLAGS:C|O2|O0|} -fno-tree-dse ${FLAGARCH} -I${HOME_MPI}/include'"	\
 		>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "CFLAGS='-c ${CFLAGS} ${FLAGARCH} -I${HOME_MPI}/include'"	\
 		>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "CFLAGS_DBG='-c -g -O -pipe ${FLAGARCH} -I${HOME_MPI}/include'"	\
 		>> ${WRKSRC}/setup.cfg
 .else
 	${ECHO_CMD} "F90FLAGS='-c ${FFLAGS} -fno-tree-dse ${FLAGARCH}'"	\
 		>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "F90FLAGS_DBG='-c -g ${FFLAGS:C|O2|O0|} -fno-tree-dse ${FLAGARCH}'"	\
 		>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "CFLAGS='-c ${CFLAGS} ${FLAGARCH}'"	\
 		>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "CFLAGS_DBG='-c -g -O -pipe ${FLAGARCH}'"	\
 		>> ${WRKSRC}/setup.cfg
 .endif
 .for is in ${INTERACTIVE_SCRIPTS}
 	${REINPLACE_CMD} -e '/should_continue()/d'		\
 		${WRKSRC}/${is}
 .endfor
 	${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}
 	@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}
 
 do-configure:
 	(cd ${CONFIGURE_WRKSRC}	\
 	&& TMPDIR=${WRKDIR} ${MAKE_ENV} ${PYTHON_CMD} setup.py ${DEBUG_FLAGS}	\
 		--prefix=${STAGEDIR}${inst_dir} test | tee ${CONFIGURE_LOG})
 	@${ECHO_MSG} "---------------- Debug ------------------"
 	${CAT} ${CONFIGURE_WRKSRC}/setup.log
 	@${ECHO_MSG} "------------ Fin debug ------------------"
 
 post-configure:
 	${MKDIR} ${STAGEDIR}${inst_dir}/etc
 	${CP} -R ${LOCALBASE}/aster/etc/codeaster ${STAGEDIR}${inst_dir}/etc/
 	${ECHO_CMD} "#?vers : VVV?" >> ${STAGEDIR}${inst_dir}/etc/codeaster/aster
 	${CP} -R ${LOCALBASE}/aster/ASTK/ASTK_SERV/bin		\
 		${LOCALBASE}/aster/ASTK/ASTK_SERV/asrun		\
 		${LOCALBASE}/aster/ASTK/ASTK_SERV/share		\
 		${STAGEDIR}${inst_dir}
 	${REINPLACE_CMD} -e 's|${LOCALBASE}/aster|${STAGEDIR}${inst_dir}|'	\
 		${STAGEDIR}${inst_dir}/bin/as_run
 	${MV} ${STAGEDIR}${inst_dir}/etc/codeaster/profile_astk.sh	\
 		${STAGEDIR}${inst_dir}/etc/codeaster/profile.sh
 .for sf in etc/codeaster/profile.sh asrun/installation.py
 	${REINPLACE_CMD} -e 's|${LOCALBASE}/aster/ASTK/ASTK_SERV|${STAGEDIR}${inst_dir}|g'	\
 		-e 's|${LOCALBASE}/aster|${STAGEDIR}${inst_dir}|g'	\
 		${STAGEDIR}${inst_dir}/${sf}
 .endfor
 
 pre-build:
 	${MKDIR} ${WRKDIR}/post_patches
 	${CP} ${FILESDIR}/post-patch-* ${WRKDIR}/post_patches/
 .for pp in ${POSTPY2FIX}
 	${REINPLACE_CMD} -e 's|%%PYTHON_CMD%%|${PYTHON_CMD}|' ${WRKDIR}/post_patches/${pp}
 .endfor
 
 do-build:
 	(cd ${BUILD_WRKSRC} &&	\
 	TMPDIR=${WRKDIR} ${MAKE_ENV} ${PYTHON_CMD} setup.py ${DEBUG_FLAGS} install aster	\
 		--prefix=${STAGEDIR}${inst_dir} | tee ${BUILD_WRKSRC}/build.log)
 
 do-install:
 	# build: already did the installation
 	@${DO_NADA}
 
 post-install:
 .for f in ${PFX2FIX}
 	${REINPLACE_CMD} -e 's|${STAGEDIR}||g' ${STAGEDIR}${inst_dir}/${f}
 .endfor
 .for f in ${POSTBASH2FIX}
 	${REINPLACE_CMD} -e 's|/bin/bash|${LOCALBASE}/bin/bash|'	\
 		${STAGEDIR}${inst_dir}/${VE}/share/aster/${f}
 .endfor
 	${REINPLACE_CMD} -e 's|LINUX64|LINUX64, FREEBSD|'	\
 		${STAGEDIR}${inst_dir}/asrun/core/default_configuration.py
 	(cd ${STAGEDIR}${PREFIX} && ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py	\
 		-d ${PREFIX} -f ${inst_dir:S|${PREFIX}/||})
 	(cd ${STAGEDIR}${PREFIX} && ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py	\
 		-d ${PREFIX} -f ${inst_dir:S|${PREFIX}/||})
 	${CP} -p ${STAGEDIR}${inst_dir}/${VE}/bin/aster					\
 		${STAGEDIR}${inst_dir}/${VE}/bin/asterd
 	${STRIP_CMD} ${STAGEDIR}${inst_dir}/${VE}/bin/aster
 	${SED} -e 's|%%VER%%|${VE}|' < ${FILESDIR}/astout.export	\
 		> ${STAGEDIR}${inst_dir}/${VE}/astout.export
 	(cd ${STAGEDIR}${inst_dir} &&	\
 		${LN} -fs ${VE} ${STAGEDIR}${inst_dir}/STA${VE})
 .for conf in config.txt profile.sh
 	(cd ${STAGEDIR} && ${LN} -fs ${inst_dir}/${VE}/share/aster/${conf}	\
 		${STAGEDIR}${inst_dir}/STA${VE}/${conf})
 .endfor
 	${MKDIR} ${STAGEDIR}${tools_dir}
 .for outil in ${tools}
 	${LN} -fs ${LOCALBASE}/bin/${outil} ${STAGEDIR}${tools_dir}/${outil}
 .endfor
 .if !defined(WITHOUT_ASTK_CLI)
 	${MKDIR} ${STAGEDIR}${PREFIX}/aster/ASTK/ASTK_SERV/etc/codeaster/astkrc
 	${LN} -fs ${ASTKDIR}/etc/astkrc/*	\
 		${STAGEDIR}${PREFIX}/aster/ASTK/ASTK_SERV/etc/codeaster/astkrc
 . for outil in astk bsf
 	${LN} -fs ${ASTKDIR}/bin/${outil} ${STAGEDIR}${tools_dir}/${outil}
 . endfor
 .endif
 	${MKDIR} ${WRKDIR}/AvoidConflictWithASTK
 .for f in aster.install_${VE} profile.sh
 	${MV} ${STAGEDIR}${inst_dir}/etc/codeaster/${f} ${WRKDIR}/AvoidConflictWithASTK/
 .endfor
 	${RM} -r ${STAGEDIR}${inst_dir}/etc/codeaster/*
 .for f in aster.install_${VE} profile.sh
 	${MV} ${WRKDIR}/AvoidConflictWithASTK/${f} ${STAGEDIR}${inst_dir}/etc/codeaster/
 .endfor
 .for f in aster_pkginfo.cpython-${PYTHON_SUFFIX}.pyc aster_pkginfo.cpython-${PYTHON_SUFFIX}.opt-1.pyc
 	${RM} ${STAGEDIR}${inst_dir}/${VE}/lib/aster/__pycache__/${f}
 .endfor
 	${FIND} ${STAGEDIR}${PREFIX} -name "*.bak" -delete
 
 .if defined(MAINTAINER_MODE)
 regression-test:	install
 	@${ECHO_MSG} "Note: homard must be installed to run some steps succesfully."
 	${MKDIR} ${ExportPATH}
 	${CP} ${inst_dir}/${VE}/astout.export /tmp/
 	(cd ${inst_dir}/${VE} &&	\
 	${LOCALBASE}/aster/bin/as_run --list --all --vers=${VE}	\
 		--filter='"I" not in testlist' -o /tmp/list_seq )
 	(cd /tmp &&	\
 	${LOCALBASE}/aster/bin/as_run astout.export) || ${TRUE}
 	@${ECHO_MSG} "Check /tmp/resu_test/NOOK"
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/french/homard/Makefile b/french/homard/Makefile
index 3130c492e8df..eadbab55023c 100644
--- a/french/homard/Makefile
+++ b/french/homard/Makefile
@@ -1,78 +1,78 @@
 PORTNAME=	homard
 DISTVERSION=	11.12-aster2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	french cad linux
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Refinement and de-refinement mesh tool
 WWW=		https://www.code-aster.org/outils/homard
 
 # Converted from RESTRICTED
 LICENSE=	homard
 LICENSE_NAME=	homard
 LICENSE_TEXT=	The free downloading of HOMARD software is only allowed for coupling\
 		with Code_Aster. For any other use, a license agreement is requested.\
 		Please contact HOMARD project: <homard@edf.fr>.
 LICENSE_PERMS=	auto-accept
 
 ONLY_FOR_ARCHS=	amd64 i386
 
 BUILD_DEPENDS=	${LOCALBASE}/aster/${VER}/bin/aster:french/aster
 RUN_DEPENDS=	${LOCALBASE}/bin/bash:shells/bash		\
 		${LOCALBASE}/aster/${VER}/bin/aster:french/aster
 
 USES=		linux python:3.6+ shebangfix
 
 SHEBANG_FILES=	${WRKSRC}/ASTER_HOMARD/homard	\
 		${WRKSRC}/homard_base ${WRKSRC}/setup_homard.py
 REINPLACE_ARGS=	-i ""
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
 
 LHOMARDDIR?=	apps/${PORTNAME}
 VER=		${ASTER_VER:R}
 ASTER_TOOLS=	${LOCALBASE}/aster/outils
 HOMARDDIR=	${PREFIX}/${LHOMARDDIR}
 AHPY=		aster_homard_py
 HOMARDSCRIPT=	${PORTNAME}_base
 # This name is requested to run aster's make test
 #HOMARDPG=	${PORTNAME:tu}_V${PORTVERSION:R}.out
 HOMARDPG=	${PORTNAME:tu}_V11.10.out
 
 DOCS=		A_Lire.txt Readme.txt
 
 PLIST_SUB=	HOMARDDIR=${LHOMARDDIR} AHPY=${LHOMARDDIR}/${AHPY}			\
 		UNAMES=${OPSYS} HOMARDPG=${HOMARDPG} ASTER_TOOLS=${ASTER_TOOLS}
 
 OPTIONS_DEFINE=	DOCS
 
 pre-configure:
 .for sc in ${HOMARDSCRIPT}
 	${REINPLACE_CMD} -e "s|%%HOMARDDIR%%|${PREFIX}/apps/${OPSYS}|"	\
 		${WRKSRC}/${sc}
 .endfor
 
 do-build:
 	${BRANDELF} -t Linux ${WRKSRC}/Linux/${HOMARDPG}
 
 do-install:
 	${MKDIR} ${STAGEDIR}${HOMARDDIR} ${STAGEDIR}${PREFIX}/apps/${OPSYS}
 	${INSTALL_PROGRAM} ${WRKSRC}/Linux/${HOMARDPG}	\
 		${STAGEDIR}${PREFIX}/apps/${OPSYS}
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}_base	\
 		${STAGEDIR}${HOMARDDIR}/${PORTNAME}
 	${CP} -R ${WRKSRC}/ASTER_HOMARD/${AHPY} ${STAGEDIR}${HOMARDDIR}
 	(cd ${STAGEDIR}${PREFIX} && ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py	\
 		-d ${PREFIX} -f ${HOMARDDIR:S|${PREFIX}/||})
 	(cd ${STAGEDIR}${PREFIX} && ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py	\
 		-d ${PREFIX} -f ${HOMARDDIR:S|${PREFIX}/||})
 	${MKDIR} ${STAGEDIR}${ASTER_TOOLS}/
 	${LN} -fs ${HOMARDDIR}/homard ${STAGEDIR}${ASTER_TOOLS}/
 	${LN} -fs ${HOMARDDIR}/aster_homard_py ${STAGEDIR}${ASTER_TOOLS}/
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for doc in ${DOCS}
 	${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include "${.CURDIR}/../../french/aster/bsd.aster.mk"
 .include <bsd.port.mk>
diff --git a/french/med/Makefile b/french/med/Makefile
index b3ac0458fa0f..d7339b7e6218 100644
--- a/french/med/Makefile
+++ b/french/med/Makefile
@@ -1,66 +1,66 @@
 PORTNAME=	med
 DISTVERSION=	4.0.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	french science
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Modelisation et Echanges de Donnees
 WWW=		https://www.salome-platform.org/user-section/about/med
 
 LICENSE=	GPLv3
 
 LIB_DEPENDS=	libhdf5-110.so:science/hdf5-110
 
 USES=		fortran gmake libtool tk
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 USE_CXXSTD=	gnu++98
 CFLAGS+=	-fPIC
 CONFIGURE_ARGS=	--disable-python \
 		--with-hdf5=${LOCALBASE} \
 		--with-hdf5-include=${LOCALBASE}/include/hdf5-110
 CONFIGURE_ENV=	WISH=${WISH}
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 TEST_WRKSRC=	${WRKSRC}/tests
 TEST_TARGET=	check  # XXX: one fail
 TEST_ENV=	${MAKE_ENV} HDF5_DISABLE_VERSION_CHECK=1
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 LIBVER=		11.0.0
 PLIST_SUB+=	VE=${LIBVER}
 
 PATCH_TK_SCRIPTS=	tools/mdump/xmdump2.in tools/mdump/xmdump3.in
 
 DOC2FIX=	. dox gif html html.dox jpg png
 TST2FIX=	c f
 
 pre-configure:
 	${REINPLACE_CMD} -e 's|<malloc\.h>|<stdlib.h>|' \
 		${WRKSRC}/include/2.3.6/med_outils.h \
 		${WRKSRC}/include/med_outils.h
 .for dd in ${DOC2FIX}
 	${REINPLACE_CMD} -e 's|docdir = $$(datadir)/doc|docdir = @docdir@|'	\
 		${WRKSRC}/doc/${dd}/Makefile.in
 .endfor
 .for dd in ${TST2FIX}
 	${FIND} ${WRKSRC}/tests -name Makefile.in | ${XARGS}	\
 	${REINPLACE_CMD} -e 's|test${dd}dir = $$(bindir)/test|test${dd}dir = ${EXAMPLESDIR}/test|' \
 			-e 's|unittestsdir = $$(bindir)/unit|unittestsdir = ${EXAMPLESDIR}/unit|' \
 			-e 's|usescasesdir = $$(bindir)/uses|usescasesdir = ${EXAMPLESDIR}/uses|'
 .endfor
 
 post-patch-DOCS-off:
 	${REINPLACE_CMD} -e '/SUBDIRS/ s|doc||' ${WRKSRC}/Makefile.in
 
 post-patch-EXAMPLES-off:
 	${REINPLACE_CMD} -e '/SUBDIRS/ s|tests||' ${WRKSRC}/Makefile.in
 
 post-install:
 	(cd ${STAGEDIR}${PREFIX}/bin && ${LN} -sf mdump3 mdump	\
 		&& ${LN} -sf xmdump3 xmdump)
 
 .include "${.CURDIR}/../../french/aster/bsd.aster.mk"
 .include <bsd.port.mk>
diff --git a/ftp/R-cran-RCurl/Makefile b/ftp/R-cran-RCurl/Makefile
index 491f79eee0f7..50221fa79fa3 100644
--- a/ftp/R-cran-RCurl/Makefile
+++ b/ftp/R-cran-RCurl/Makefile
@@ -1,21 +1,22 @@
 PORTNAME=	RCurl
 DISTVERSION=	1.98-1.8
+PORTREVISION=	1
 CATEGORIES=	ftp
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	General network client interface for R
 WWW=		https://cran.r-project.org/web/packages/RCurl/
 
 LICENSE=	BSD3CLAUSE
 
 CRAN_DEPENDS=	R-cran-bitops>0:devel/R-cran-bitops
 BUILD_DEPENDS=	curl-config:ftp/curl \
 		${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 LIB_DEPENDS=	libcurl.so:ftp/curl
 
 USES=		cran:auto-plist,compiles gnome
 USE_GNOME=	libxml2
 
 .include <bsd.port.mk>
diff --git a/ftp/R-cran-curl/Makefile b/ftp/R-cran-curl/Makefile
index 71350eee4e17..5e32b897fdb3 100644
--- a/ftp/R-cran-curl/Makefile
+++ b/ftp/R-cran-curl/Makefile
@@ -1,17 +1,18 @@
 PORTNAME=	curl
 PORTVERSION=	4.3.2
+PORTREVISION=	1
 CATEGORIES=	ftp
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Modern and Flexible Web Client for R
 WWW=		https://cran.r-project.org/web/packages/curl/
 
 LICENSE=	MIT
 
 BUILD_DEPENDS=	${LOCALBASE}/include/curl/curl.h:ftp/curl
 LIB_DEPENDS=	libcurl.so:ftp/curl
 
 USES=	cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/games/endgame-singularity/Makefile b/games/endgame-singularity/Makefile
index f952df0bde6d..bed254dc494a 100644
--- a/games/endgame-singularity/Makefile
+++ b/games/endgame-singularity/Makefile
@@ -1,57 +1,58 @@
 PORTNAME=	singularity
 PORTVERSION=	1.00
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/v${PORTVERSION}/
 PKGNAMEPREFIX=	endgame-
 
 MAINTAINER=	cyberbotx@cyberbotx.com
 COMMENT=	Simulates the life of a true AI
 WWW=		http://emhsoft.com/singularity/
 
 LICENSE=	GPLv2+ MIT CC-BY-SA-3.0 NASA AEFONTS BITSTREAM AREV \
 		MEMESBRUH03 CC0-1.0
 LICENSE_COMB=	multi
 LICENSE_NAME_NASA=	NASA Terms of Use
 LICENSE_NAME_AEFONTS=	Brian Kent - Aenigma Games & Fonts
 LICENSE_NAME_BITSTREAM=	Bitstream Vera Fonts Copyright
 LICENSE_NAME_AREV=	Arev Fonts Copyright
 LICENSE_NAME_MEMESBRUH03=	memesbruh03 Copyright
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 LICENSE_FILE_GPLv2+ =	${WRKSRC}/LICENSE.gpl.txt
 LICENSE_FILE_CC-BY-SA-3.0=	${WRKSRC}/LICENSE.CC-BY-SA-3.txt
 LICENSE_FILE_CC0-1.0=	${WRKSRC}/LICENSE.cc0.txt
 LICENSE_PERMS_NASA=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 LICENSE_PERMS_AEFONTS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 LICENSE_PERMS_BITSTREAM=dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 LICENSE_PERMS_AREV=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 LICENSE_PERMS_MEMESBRUH03=	dist-mirror dist-sell pkg-mirror pkg-sell \
 				auto-accept
 
 RUN_DEPENDS=	${PYGAME} \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}polib>=0:devel/py-polib@${PY_FLAVOR}
 
 USES=		python:3.5+ sdl shebangfix
 USE_PYTHON=	autoplist distutils
 USE_SDL=	image mixer
 PORTDOCS=	AUTHORS.txt Changelog.txt README.txt TODO
 NO_ARCH=	yes
 SHEBANG_FILES=	singularity/i18n/utils/languages.py
 
 OPTIONS_DEFINE=	MUSIC DOCS
 OPTIONS_DEFAULT=	MUSIC
 
 MUSIC_DESC=	Install original music pack
 MUSIC_RUN_DEPENDS=	endgame-singularity-music>=006:games/endgame-singularity-music
 
 post-extract:
 	@${MV} ${WRKSRC}/singularity/data ${WRKSRC}/
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}/data
 	(cd ${WRKSRC}/data && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/data)
 	${INSTALL_DATA} ${WRKSRC}/singularity.desktop ${STAGEDIR}${PREFIX}/share/applications
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
diff --git a/games/fretsonfire/Makefile b/games/fretsonfire/Makefile
index 28ba82b0ce24..a3ec0fbb7c58 100644
--- a/games/fretsonfire/Makefile
+++ b/games/fretsonfire/Makefile
@@ -1,54 +1,54 @@
 PORTNAME=	fretsonfire
 PORTVERSION=	1.3.110
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	games python
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME_UCASE}-${PORTVERSION}
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Game of musical skill and fast fingers
 WWW=		http://fretsonfire.sf.net
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/copying.txt
 
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYGAME} \
 		${PY_PILLOW} \
 		${PYTHON_PKGNAMEPREFIX}PyOpenGL>=0:graphics/py-PyOpenGL@${PY_FLAVOR} \
 		${LOCALBASE}/share/${PORTNAME}/default.ttf:games/fretsonfire-data
 
 USES=		dos2unix python:3.6+
 DOS2UNIX_FILES=	*.txt
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 DATADIR=	share/${PORTNAME}
 EXTRACT_AFTER_ARGS=	--exclude 'data'
 SUB_FILES=	pkg-message FretsOnFire
 SUB_LIST=	PROGRAM_DIR="${FOF_DIR}/${PORTNAME_UCASE}"
 WRKSRC=		"${WRKDIR}/Frets on Fire-${PORTVERSION}"
 
 FOF_DIR=	${PREFIX}/lib/${PORTNAME}
 
 OPTIONS_DEFINE=	DOCS
 
 PORTNAME_UCASE=	FretsOnFire
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${FOF_DIR}/${PORTNAME_UCASE}
 	@cd ${WRKSRC}/src && \
 		${FIND} * -type d -exec ${MKDIR} "${STAGEDIR}${FOF_DIR}/${PORTNAME_UCASE}/{}" \; && \
 			${FIND} -E * -type f -iregex ".*\.(py)" -exec ${INSTALL_DATA} {} "${STAGEDIR}${FOF_DIR}/${PORTNAME_UCASE}/{}" \;
 
 	@${MKDIR} ${STAGEDIR}${FOF_DIR}/data
 	@${LN} -s ${LOCALBASE}/${DATADIR}/* ${STAGEDIR}${FOF_DIR}/data
 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME_UCASE} ${STAGEDIR}${PREFIX}/bin
 	@${REINPLACE_CMD} -i '' -e 's|#!.*|#!${PYTHON_CMD}|' ${STAGEDIR}${PREFIX}/bin/${PORTNAME_UCASE}
 
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/readme.txt ${STAGEDIR}${DOCSDIR}/README
 	${INSTALL_DATA} ${WRKSRC}/install.txt ${STAGEDIR}${DOCSDIR}/INSTALL
 
 .include <bsd.port.mk>
diff --git a/games/funnyboat/Makefile b/games/funnyboat/Makefile
index feb5c2c029c7..9ad49e0f7e55 100644
--- a/games/funnyboat/Makefile
+++ b/games/funnyboat/Makefile
@@ -1,41 +1,42 @@
 PORTNAME=	funnyboat
 PORTVERSION=	1.6
+PORTREVISION=	1
 CATEGORIES=	games
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Side scrolling shooter game starring a steamboat on the sea
 WWW=		https://github.com/AMDmi3/funnyboat \
 		https://funnyboat.sourceforge.net/
 
 LICENSE=	GPLv2 MIT
 LICENSE_COMB=	multi
 LICENSE_FILE_GPLv2=	${WRKSRC}/LICENSE-CODE.txt
 LICENSE_FILE_MIT=	${WRKSRC}/LICENSE-MEDIA.txt
 
 RUN_DEPENDS=	${PYGAME}
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	AMDmi3
 
 USES=		python:3.7-3.9,run  # version range inherited from numpy
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 SUB_FILES=	funnyboat.sh
 SUB_LIST=	DATADIR="${DATADIR}" PYTHON_CMD="${PYTHON_CMD}"
 
 PORTDOCS=	*
 PORTDATA=	*
 PLIST_FILES=	bin/funnyboat
 
 OPTIONS_DEFINE=	DOCS
 
 do-install:
 	@cd ${WRKSRC} && ${COPYTREE_SHARE} "*.py data" ${STAGEDIR}${DATADIR}
 	${INSTALL_SCRIPT} ${WRKDIR}/funnyboat.sh ${STAGEDIR}${PREFIX}/bin/funnyboat
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/
 	${INSTALL_DATA} ${WRKSRC}/README.txt ${STAGEDIR}${DOCSDIR}/
 
 .include <bsd.port.mk>
diff --git a/games/hypatia_engine/Makefile b/games/hypatia_engine/Makefile
index b69a542d0710..fdc058ad5649 100644
--- a/games/hypatia_engine/Makefile
+++ b/games/hypatia_engine/Makefile
@@ -1,21 +1,21 @@
 PORTNAME=	hypatia_engine
 PORTVERSION=	0.3.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	games python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	lillian.lynn.lemmer@gmail.com
 COMMENT=	Game engine for 2D top-down, tile-based action RPGs
 WWW=		http://hypatia-engine.github.io/
 
 LICENSE=	MIT
 
 RUN_DEPENDS=	${PYGAME} \
 		${PYTHON_PKGNAMEPREFIX}pyganim>0:graphics/py-pyganim@${PY_FLAVOR} \
 		${PY_PILLOW}
 
 USES=		python:3.6+
 USE_PYTHON=	autoplist concurrent distutils
 
 .include <bsd.port.mk>
diff --git a/games/iceicepenguin/Makefile b/games/iceicepenguin/Makefile
index 3fd65432bffe..f7be13e33901 100644
--- a/games/iceicepenguin/Makefile
+++ b/games/iceicepenguin/Makefile
@@ -1,60 +1,60 @@
 PORTNAME=	iceicepenguin
 PORTVERSION=	1.5.1
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	games python
 MASTER_SITES=	SF/${PORTNAME}/Default/Ice%20Ice%20Penguin/ \
 		SF/nemysisfreebsdp/games/:icons
 DISTFILES=	iip.${DISTVERSION}-final${EXTRACT_SUFX} \
 		${PORTNAME}_icons_1${EXTRACT_SUFX}:icons
 DIST_SUBDIR=	python
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Remake of an old SEGA Dreamcast game called Chu Chu Rocket
 WWW=		https://sourceforge.net/projects/iceicepenguin/
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	${PYGAME}
 
 WRKSRC=		${WRKDIR}/"ice ice penguin"
 
 USES=		gnome python:run shebangfix zip
 SHEBANG_FILES=	iceicepengui.py
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 PORTDOCS=	CHANGELOG.txt readme.txt
 
 ICON_SIZES=	32x32 48x48 64x64 72x72 96x96
 
 SUB_FILES=	${PORTNAME}
 
 DESKTOP_ENTRIES="Ice Ice Penguin" "" "${PORTNAME}" \
 		"${PORTNAME}" "Game;ArcadeGame;" ""
 
 OPTIONS_DEFINE=	DOCS
 
 do-install:
 	@${REINPLACE_CMD} -e 's|%%PYTHON_CMD%%|${PYTHON_CMD}|' \
 		${WRKDIR}/${PORTNAME}
 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
 
 .for d in fonts gfx lvls menu sfx
 	@(cd ${WRKSRC} && ${COPYTREE_SHARE} ${d} ${STAGEDIR}${DATADIR})
 .endfor
 	${INSTALL_SCRIPT} ${WRKSRC}/*.py ${STAGEDIR}${DATADIR}
 
 .for s in ${ICON_SIZES}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}/apps
 	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}_${s}.png \
 		${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}/apps/${PORTNAME}.png
 .endfor
 	${LN} -sf ${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps/
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/games/krank/Makefile b/games/krank/Makefile
index bdf9c54d515e..751e685ead0e 100644
--- a/games/krank/Makefile
+++ b/games/krank/Makefile
@@ -1,46 +1,46 @@
 PORTNAME=	krank
 PORTVERSION=	07
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	games
 MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Little casual game
 WWW=		http://krank.sourceforge.net/
 
 RUN_DEPENDS=	${PYGAME} \
 		${PYNUMPY}
 
 USES=		python:run tar:bzip2
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 PORTDOCS=	CHANGELOG.txt README
 
 DESKTOP_ENTRIES="Krank" "" "${PORTNAME}" \
 		"${PORTNAME}" "Game;ArcadeGame;" ""
 
 OPTIONS_DEFINE=	DOCS
 
 post-extract:
 	@${FIND} ${WRKSRC} -name .cvsignore -delete -or -name .DS_Store -delete
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|`dirname.*|${DATADIR}|' ${WRKSRC}/${PORTNAME}
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
 
 .for d in art fonts html levels sounds src
 	@(cd ${WRKSRC} && ${COPYTREE_SHARE} ${d} ${STAGEDIR}${DATADIR})
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.iss ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/logo.xcf ${STAGEDIR}${DATADIR}
 	${LN} -sf ${DATADIR}/html/gfx/logo.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/games/leela-zero/Makefile b/games/leela-zero/Makefile
index 070469b2f663..9b1ef9945eb1 100644
--- a/games/leela-zero/Makefile
+++ b/games/leela-zero/Makefile
@@ -1,38 +1,38 @@
 PORTNAME=	leela-zero
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.17-30
-PORTREVISION=	2
+PORTREVISION=	3
 DISTVERSIONSUFFIX=	-ge3ed631
 CATEGORIES=	games
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Go engine without human-provided knowledge based on AlphaGo Zero paper
 WWW=		https://github.com/leela-zero/leela-zero
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	opencl>0:devel/opencl
 LIB_DEPENDS=	libboost_filesystem.so:devel/boost-libs \
 		libopenblas.so:math/openblas \
 		libOpenCL.so:devel/ocl-icd
 
 USES=		cmake compiler:c++14-lang eigen:3 localbase qt:5
 USE_GITHUB=	yes
 GH_TUPLE=	google:googletest:cafa9e5:gtest/gtest
 USE_QT=		core widgets buildtools:build qmake:build
 
 CMAKE_ON=	USE_BLAS BUILD_TESTING
 CMAKE_ARGS=	-DBLAS_INCLUDE_DIRS:STRING=${LOCALBASE}/include
 
 PLIST_FILES=	bin/autogtp \
 		bin/leelaz \
 		bin/validation
 
 do-test:
 	@cd ${WRKSRC} && ${MKDIR} .build && ${CP} ../.build/tests .build && cd .build && ./tests
 
 download-weights:
 	@${FETCH_CMD} https://zero.sjeng.org/best-network -o ~/.local/share/leela-zero/
 
 .include <bsd.port.mk>
diff --git a/games/libretro-px68k/Makefile b/games/libretro-px68k/Makefile
index b0d7b020c83f..1c669f56bfaf 100644
--- a/games/libretro-px68k/Makefile
+++ b/games/libretro-px68k/Makefile
@@ -1,27 +1,28 @@
 PORTNAME=	libretro-px68k
 PORTVERSION=	0.20220311
+PORTREVISION=	1
 CATEGORIES=	games
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	SHARP X68000 libretro core
 WWW=		https://github.com/libretro/px68k-libretro
 
 LICENSE=	GPLv2
 
 USES=		compiler:gcc-c++11-lib gmake
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	libretro
 GH_PROJECT=	px68k-libretro
 GH_TAGNAME=	0183381
 
 PLIST_FILES=	lib/libretro/px68k_libretro.so
 
 MAKEFILE=	Makefile.libretro
 
 do-install:
 	${MKDIR} ${STAGEDIR}/${PREFIX}/lib/libretro
 	${INSTALL_LIB} ${WRKSRC}/px68k_libretro.so ${STAGEDIR}/${PREFIX}/lib/libretro
 
 .include <bsd.port.mk>
diff --git a/games/lizzie/Makefile b/games/lizzie/Makefile
index 963d3ca0455d..40b3dc0b7975 100644
--- a/games/lizzie/Makefile
+++ b/games/lizzie/Makefile
@@ -1,63 +1,63 @@
 PORTNAME=	lizzie
 DISTVERSION=	0.6-105
-PORTREVISION=	1
+PORTREVISION=	2
 DISTVERSIONSUFFIX=	-gd0e7040
 CATEGORIES=	games java
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Leela Zero Interface: GUI for the Go game
 WWW=		https://github.com/featurecat/lizzie
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BUILD_DEPENDS=	mvn:devel/maven
 RUN_DEPENDS=	leelaz:games/leela-zero
 
 USE_JAVA=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	featurecat
 
 NO_ARCH=	yes
 
 # to rebuild the deps archive:
 #   1. set DEV_UPDATE_MODE=yes
 #   2. make makesum build
 #   3. upload the *-deps archive
 #   4. set DEV_UPDATE_MODE=no
 #   5. make clean makesum
 
 DEV_UPDATE_MODE=	no
 
 .if (${DEV_UPDATE_MODE} == "yes")
 post-build:
 	@cd ${WRKDIR} && ${TAR} czf ${DISTDIR}/${PORTNAME}-${DISTVERSION}-deps${EXTRACT_SUFX} .m2
 	@${ECHO} "(!!!) Please upload the maven deps archive: ${DISTDIR}/${PORTNAME}-${DISTVERSION}-deps${EXTRACT_SUFX}"
 .else
 MASTER_SITES+=	LOCAL/yuri/:maven
 DISTFILES+=	${PORTNAME}-${DISTVERSION}-deps${EXTRACT_SUFX}:maven
 MVN_ARGS=	--offline
 .endif
 
 DESKTOP_ENTRIES=	"SGF Editor (Go)" "A GUI for Leela-Zero" "" "${PORTNAME}" "Game;" ""
 
 PLIST_FILES=	bin/${PORTNAME} \
 		${JAVAJARDIR}/lizzie-${PORTVERSION:R}-shaded.jar
 
 do-build:
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		${LOCALBASE}/bin/mvn ${MVN_ARGS} \
 		-fae install \
 		-Dmaven.test.skip=true \
 		-Duser.home=${WRKDIR} \
 		package
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/target/${PORTNAME}-${PORTVERSION:R}-shaded.jar ${STAGEDIR}${JAVAJARDIR}
 	@(echo "#!/bin/sh"; \
 	  echo ""; \
 	  echo "mkdir -p ~/.local/share/lizzie &&"; \
 	  echo "cd ~/.local/share/lizzie && ${JAVA} -jar ${JAVAJARDIR}/${PORTNAME}-${PORTVERSION:R}-shaded.jar \""$$"@\"" \
 	) > ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	@${CHMOD} +x ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/games/marblemarcher/Makefile b/games/marblemarcher/Makefile
index 447485635833..3b9851330984 100644
--- a/games/marblemarcher/Makefile
+++ b/games/marblemarcher/Makefile
@@ -1,33 +1,33 @@
 PORTNAME=	marblemarcher
 DISTVERSION=	1.4.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Marble Marcher: Community Edition
 WWW=		https://github.com/WAUthethird/Marble-Marcher-Community-Edition
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	glm>0:math/glm
 LIB_DEPENDS=	libAntTweakBar.so:graphics/anttweakbar \
 		libsfml-system.so:devel/sfml
 
 USES=		cmake compiler:c++17-lang eigen:3 gl localbase:ldflags
 USE_GL=		gl glew glu
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	WAUthethird
 GH_PROJECT=	Marble-Marcher-Community-Edition
 
 CMAKE_ARGS=	-DFREEBSD_DATADIR=${DATADIR}
 
 post-install:
 	@(echo "#!/bin/sh"; \
 	  echo ""; \
 	  echo "cd ${DATADIR} && ./MarbleMarcher \"$$"@"\"" \
 	) > ${STAGEDIR}${PREFIX}/bin/MarbleMarcher
 	@${CHMOD} +x ${STAGEDIR}${PREFIX}/bin/MarbleMarcher
 
 .include <bsd.port.mk>
diff --git a/games/monsterz/Makefile b/games/monsterz/Makefile
index 36046569a915..71677dc0b56b 100644
--- a/games/monsterz/Makefile
+++ b/games/monsterz/Makefile
@@ -1,55 +1,55 @@
 PORTNAME=	monsterz
 PORTVERSION=	0.7.1
-PORTREVISION=	15
+PORTREVISION=	16
 CATEGORIES=	games
 MASTER_SITES=	http://sam.zoy.org/monsterz/ \
 		SF/nemysisfreebsdp/:icons
 DISTFILES=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \
 		${PORTNAME}.png:icons
 EXTRACT_ONLY=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Arcade puzzle game
 WWW=		http://sam.zoy.org/monsterz/
 
 LICENSE=	WTFPL
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	${PYGAME}
 
 USES=		python:3.7+ shebangfix
 SHEBANG_FILES=	monsterz.py
 MAKE_ENV=	prefix=${PREFIX}
 
 PORTDOCS=	AUTHORS README TODO
 
 SCOREDIR=	/var/games
 PLIST_SUB=	SCOREDIR=${SCOREDIR}
 
 DESKTOP_ENTRIES="Monsterz" "${COMMENT}" "${PORTNAME}" \
 		"${PORTNAME}" "Game;ArcadeGame;" false
 
 OPTIONS_DEFINE=	DOCS
 
 pre-configure:
 	${REINPLACE_CMD} '/test -f/ s|scorefile)|&.sample|g' \
 		${WRKSRC}/Makefile
 
 post-install:
 .for d in graphics sound
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} ${d} ${STAGEDIR}${DATADIR})
 .endfor
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}.py ${STAGEDIR}${DATADIR}
 	(cd ${STAGEDIR}${PREFIX}	\
 	&& ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py -d ${DATADIR}	\
 		-f ${DATADIR:S;${PREFIX}/;;}	\
 	&& ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py -d ${DATADIR}\
 		-f ${DATADIR:S;${PREFIX}/;;})
 	${INSTALL_DATA} ${_DISTDIR}/${PORTNAME}.png ${STAGEDIR}${PREFIX}/share/pixmaps/
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/monsterz
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/games/openage/Makefile b/games/openage/Makefile
index c4384442a72f..98df25e9910c 100644
--- a/games/openage/Makefile
+++ b/games/openage/Makefile
@@ -1,55 +1,56 @@
 PORTNAME=	openage
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.4.1
+PORTREVISION=	1
 CATEGORIES=	games
 
 MAINTAINER=	freebsd@sysctl.cz
 COMMENT=	Free engine clone of the Genie Engine
 WWW=		https://openage.sft.mx/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/legal/GPLv3
 
 BROKEN=		fails to build
 
 BUILD_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \
 		${PY_PILLOW} \
 		${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments@${PY_FLAVOR}
 LIB_DEPENDS=	libepoxy.so:graphics/libepoxy \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libharfbuzz.so:print/harfbuzz \
 		libogg.so:audio/libogg \
 		libopus.so:audio/opus \
 		libopusfile.so:audio/opusfile \
 		libpng.so:graphics/png \
 		libnyan.so:lang/nyan
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \
 		${PY_PILLOW} \
 		${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments@${PY_FLAVOR}
 
 USES=		cmake compiler:c++17-lang eigen:3 gl ncurses:base python:3.7-3.9 qt:5 sdl shebangfix
 SHEBANG_FILES=	configure run.py.in buildsystem/cythonize.py
 USE_GITHUB=	yes
 GH_ACCOUNT=	SFTtech
 USE_SDL=	image2 sdl2
 USE_GL=		gl glu
 USE_QT=		core declarative gui network buildtools:build qmake:build
 USE_PYTHON=	cython
 USE_LDCONFIG=	yes
 
 CMAKE_OFF=	WANT_BACKTRACE WANT_GPERFTOOLS_PROFILER WANT_INOTIFY
 CMAKE_ARGS=	-DGLOBAL_CONFIG_DIR:STRING=${ETCDIR}
 
 BINARY_ALIAS=	python3=${PYTHON_CMD}
 
 pre-configure:
 	${REINPLACE_CMD} -e 's|python3|${PYTHON_CMD}|' ${WRKSRC}/openage/codegen/main.py
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/openage
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/xdg
 
 .include <bsd.port.mk>
diff --git a/games/pathological/Makefile b/games/pathological/Makefile
index 8522eab0a480..54b4e2e20651 100644
--- a/games/pathological/Makefile
+++ b/games/pathological/Makefile
@@ -1,44 +1,44 @@
 PORTNAME=	pathological
 PORTVERSION=	1.1.3
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	games
 MASTER_SITES=	SF
 
 MAINTAINER=	jmohacsi@bsd.hu
 COMMENT=	Enriched clone of the game "Logical"
 WWW=		http://pathological.sourceforge.net/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYGAME}
 
 OPTIONS_DEFINE=	DOCS
 
 USES=		python shebangfix
 SHEBANG_FILES=	pathological.py
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 DOC_FILES=	favicon.ico index.html
 
 DESKTOP_ENTRIES="Pathological" \
 		"Logic game" \
 		"${DATADIR}/pathological.ico" \
 		"pathological" \
 		"Game;LogicGame;" \
 		false
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	(cd ${WRKSRC}; tar -cf - circuits graphics music sounds pathological.ico pathological.py pathological.xpm) | \
 		(cd ${STAGEDIR}${DATADIR}; tar --unlink -xf -)
 	@${PRINTF} "#!/bin/sh\ncd ${DATADIR} && \
 		exec ${PYTHON_CMD} ${DATADIR}/pathological.py\n" > ${WRKDIR}/pathological.sh
 	${INSTALL_SCRIPT} ${WRKDIR}/pathological.sh \
 		${STAGEDIR}${PREFIX}/bin/pathological
 	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.6.gz ${STAGEDIR}${MANPREFIX}/man/man6
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${DOC_FILES:S|^|${WRKSRC}/html/|g} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/games/py-mnemosyne/Makefile b/games/py-mnemosyne/Makefile
index affebd398f46..a5cf6ba842c1 100644
--- a/games/py-mnemosyne/Makefile
+++ b/games/py-mnemosyne/Makefile
@@ -1,38 +1,38 @@
 PORTNAME=	mnemosyne
 PORTVERSION=	2.10.1
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	games education python
 MASTER_SITES=	SF/mnemosyne-proj/${PORTNAME}/${PORTNAME}-${DISTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	Mnemosyne-${DISTVERSION}
 
 MAINTAINER=	eduardo@FreeBSD.org
 COMMENT=	Flash-card tool which optimises your learning process
 WWW=		https://www.mnemosyne-proj.org/
 
 LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PY_PILLOW} \
 		${PYTHON_PKGNAMEPREFIX}argon2-cffi>0:security/py-argon2-cffi@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cheroot>=5.0:www/py-cheroot@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}googletrans>=3.0:textproc/py-googletrans@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}gTTS>=0:audio/py-gtts@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>=0:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}PyOpenGL>=0:graphics/py-PyOpenGL@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}webob>=1.4:www/py-webob@${PY_FLAVOR}
 
 USES=		pyqt:6 python shebangfix
 USE_PYQT=	pyqt6:run sip:run webengine:run
 USE_PYTHON=	autoplist concurrent distutils
 
 SHEBANG_FILES=	mnemosyne/pyqt_ui/mnemosyne
 
 NO_ARCH=	yes
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|icons|pixmaps|' ${WRKSRC}/setup.py
 
 .include <bsd.port.mk>
diff --git a/games/pysolfc-cardsets/Makefile b/games/pysolfc-cardsets/Makefile
index 7d528db51d4b..a391a8e9296d 100644
--- a/games/pysolfc-cardsets/Makefile
+++ b/games/pysolfc-cardsets/Makefile
@@ -1,43 +1,44 @@
 PORTNAME=	pysolfc-cardsets
 PORTVERSION=	2.2
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	SF/pysolfc/PySolFC-Cardsets/PySolFC-Cardsets-${PORTVERSION}/ \
 		https://slackware.uk/~urchlay/src/:bk
 DISTNAME=	PySolFC-Cardsets-${PORTVERSION}
 DISTFILES=	${DISTNAME}.tar.bz2 \
 		pysolfc-cardsets-bknoll.tar.xz:bk
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Collection of free cardsets adapted for use with PySolFC
 WWW=		https://pysolfc.sourceforge.io/
 
 LICENSE=	GPLv2+
 
 RUN_DEPENDS=	pysolfc:games/pysolfc
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 post-extract:
 # Remove cardsets which are bundled with PySolFC main distribution
 .for set in 2000 crystal-mahjongg dondorf dashavatara-ganjifa-xl \
     dashavatara-ganjifa gnome-mahjongg-1 hanafuda-200-years hexadeck \
     louie-mantia-hanafuda matching matching-xl matrix mughal-ganjifa \
     mughal-ganjifa-xl neo neo-hex neo-tarock next-matrix oxymoron \
     standard tuxedo uni-mahjongg vienna-2k
 	@${RM} -r ${WRKSRC}/cardset-${set}
 .endfor
 # Garbage-collect temporary cache files created by image viewers
 .for set in gdkcard-bonded fine-art-tarot konqi-modern nicu-small \
     warwick xpat2-nox-large
 	@${RM} -r ${WRKSRC}/cardset-${set}/.thumbnails \
 		  ${WRKSRC}/cardset-${set}/.xvpics
 .endfor
 
 do-install:
 	cd ${WRKSRC} && ${COPYTREE_SHARE} . \
 		${STAGEDIR}${PREFIX}/share/PySolFC
 	cd ${WRKSRC}/../pysolfc-cardsets-bknoll && ${COPYTREE_SHARE} . \
 		${STAGEDIR}${PREFIX}/share/PySolFC
 
 .include <bsd.port.mk>
diff --git a/games/pysolfc/Makefile b/games/pysolfc/Makefile
index b0b7725326c2..a287444f4da3 100644
--- a/games/pysolfc/Makefile
+++ b/games/pysolfc/Makefile
@@ -1,85 +1,86 @@
 PORTNAME=	pysolfc
 DISTVERSION=	2.20.0
+PORTREVISION=	1
 CATEGORIES=	games python
 MASTER_SITES=	SF/${PORTNAME}/PySolFC/${PYSOLFCDIR} \
 		SF/${PORTNAME}/PySolFC-Cardsets/minimal/:cardsets \
 		SF/${PORTNAME}/PySol-Music/${MUSICDIR}/:music
 DISTFILES=	${PYSOLFCDIST} \
 		${CARDSETDIST}:cardsets \
 		${MUSICDIST}:music
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	kai@FreeBSD.org
 COMMENT=	Solitaire game, written in Python and the successor of PySol
 WWW=		https://pysolfc.sourceforge.io/
 
 LICENSE=	GPLv2+ GPLv3+
 LICENSE_COMB=	multi
 LICENSE_FILE_GPLv2+ =		${WRKDIR}/${CARDSETDIR}/cardset-2000/COPYRIGHT
 LICENSE_FILE_GPLv3+ =		${WRKSRC}/COPYING
 LICENSE_DISTFILES_GPLv2+ =	${CARDSETDIST} ${MUSICDIST}
 LICENSE_DISTFILES_GPLv3+ =	${PYSOLFCDIST}
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}attrs>0:devel/py-attrs@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}configobj>0:devel/py-configobj@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}game>0:devel/py-game@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pysol-cards>0:games/py-pysol-cards@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}random2>=0:math/py-random2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVOR}
 
 USES=		python:3.6+ shebangfix tar:xz
 USE_PYTHON=	distutils noflavors autoplist
 SHEBANG_FILES=	data/themes/clearlooks/convert_imgs.sh
 NO_ARCH=	yes
 
 PLIST_FILES=	share/pixmaps/pysolfc.png
 DATADIR=	${PREFIX}/share/PySolFC
 WRKSRC=		${WRKDIR}/${PYSOLFCDIR}
 
 OPTIONS_DEFINE=	NLS PILLOW SOUND
 OPTIONS_DEFAULT=	PILLOW SOUND
 OPTIONS_SUB=	yes
 
 PILLOW_DESC=	Enhanced graphics support
 
 NLS_USES=	gettext
 
 PILLOW_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR}
 SOUND_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}game>0:devel/py-game@${PY_FLAVOR}
 
 PYSOLFCDIR=	PySolFC-${DISTVERSION}
 PYSOLFCDIST=	${PYSOLFCDIR}${EXTRACT_SUFX}
 CARDSETDIR=	PySolFC-Cardsets--Minimal-2.2.0
 CARDSETDIST=	${CARDSETDIR}.tar.xz
 MUSICDIR=	PySol-Music-4.50
 MUSICDIST=	${MUSICDIR:tl}.tar.xz
 
 post-patch:
 	@${MV} ${WRKSRC}/pysol.py ${WRKSRC}/pysolfc
 	@${REINPLACE_CMD} -e 's|pysol.py|pysolfc|' ${WRKSRC}/setup.py
 	@${REINPLACE_CMD} -e 's|^Icon.*|Icon=${PORTNAME}|' \
 		-e 's|^Exec.*|Exec=${PORTNAME}|' \
 		${WRKSRC}/data/pysol.desktop
 	@${FIND} ${WRKDIR} -name .thumbnails -or -name .xvpics | \
 		${XARGS} ${RM} -r
 	@${FIND} ${WRKSRC} -name "*.bak" -delete
 
 post-patch-NLS-on:
 	@${REINPLACE_CMD} -e 's|^#%%NLS%%||' ${WRKSRC}/setup.py
 
 post-install:
 	${RLN} ${STAGEDIR}${PREFIX}/share/icons/hicolor/48x48/apps/pysol.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png
 	(cd ${WRKDIR}/${CARDSETDIR} && \
 		${COPYTREE_SHARE} \* ${STAGEDIR}${DATADIR})
 	(cd ${WRKDIR}/${CARDSETDIR} && \
 		${FIND} . -type f | ${SED} -e 's|^./|${DATADIR_REL}/|' >> ${TMPPLIST})
 
 post-install-SOUND-on:
 	(cd ${WRKDIR}/${MUSICDIR:tl}/data && \
 		${COPYTREE_SHARE} \* ${STAGEDIR}${DATADIR})
 	(cd ${WRKDIR}/${MUSICDIR:tl}/data && \
 		${FIND} . -type f | ${SED} -e 's|^./|${DATADIR_REL}/|' >> ${TMPPLIST})
 
 .include <bsd.port.mk>
diff --git a/games/pyspacewar/Makefile b/games/pyspacewar/Makefile
index 21647b0d3f78..28d5633aef8b 100644
--- a/games/pyspacewar/Makefile
+++ b/games/pyspacewar/Makefile
@@ -1,46 +1,46 @@
 PORTNAME=	pyspacewar
 PORTVERSION=	1.1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DIST_SUBDIR=	python
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Game loosely based on the original Spacewar!
 WWW=		https://mg.pov.lt/pyspacewar/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYGAME}
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	mgedmin
 #GH_TAGNAME=	f872564
 
 USES=		gnome python:3.6+
 USE_PYTHON=	distutils autoplist
 NO_ARCH=	yes
 
 PORTDOCS=	*.rst
 
 DESKTOP_ENTRIES="PySpaceWar" "" ${PORTNAME} \
 		"${PORTNAME}" "Game;ArcadeGame;" ""
 
 OPTIONS_DEFINE=	DOCS
 
 post-install:
 .for i in 16 22 32 48
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${i}x${i}/apps
 	${INSTALL_DATA} ${WRKSRC}/src/${PORTNAME}/icons/${PORTNAME}${i}.png \
 		${STAGEDIR}${PREFIX}/share/icons/hicolor/${i}x${i}/apps/${PORTNAME}.png
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps
 	${INSTALL_DATA} ${WRKSRC}/src/${PORTNAME}/icons/${PORTNAME}${i}.svg \
 		${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/${PORTNAME}${i}.svg
 .endfor
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/games/rubix/Makefile b/games/rubix/Makefile
index a3116e2bab75..3307bb4cc0e5 100644
--- a/games/rubix/Makefile
+++ b/games/rubix/Makefile
@@ -1,32 +1,32 @@
 PORTNAME=	rubix
 PORTVERSION=	1.0.6
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	games
 MASTER_SITES=	http://sed.free.fr/rubix/ \
 		http://mirror.mcx2.org/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Another Rubik's cube game with a rather interesting interface
 WWW=		http://sed.free.fr/rubix/
 
 USES=		compiler:nestedfct gmake tar:bzip2 xorg
 USE_XORG=	x11
 MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS} -DENGLISH" \
 		XINC="-I${LOCALBASE}/include" XLIB="-L${LOCALBASE}/lib -lX11"
 ALL_TARGET=	${PORTNAME}
 
 PORTDOCS=	AUTHORS BUGS INSTALL README TODO
 PLIST_FILES=	bin/rubix
 
 OPTIONS_DEFINE=	DOCS
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/rubix ${STAGEDIR}${PREFIX}/bin
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for file in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/games/shaaft/Makefile b/games/shaaft/Makefile
index bc85ae730557..a9333685b016 100644
--- a/games/shaaft/Makefile
+++ b/games/shaaft/Makefile
@@ -1,43 +1,43 @@
 PORTNAME=	shaaft
 PORTVERSION=	0.5.0
-PORTREVISION=	25
+PORTREVISION=	26
 CATEGORIES=	games
 MASTER_SITES=	SF/criticalmass/OldFiles
 DISTNAME=	Shaaft-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	OpenGL 3D falling block game similar to Blockout
 
 LIB_DEPENDS=	libpng.so:graphics/png
 
 CONFLICTS=	criticalmass
 
 USES=		gl sdl tar:bzip2
 USE_SDL=	mixer image sdl
 USE_GL=		gl
 USE_GCC=	yes
 USE_CXXSTD=	gnu++98
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-optimize
 
 CPPFLAGS+=	$$(libpng-config --I_opts)
 LDFLAGS+=	$$(libpng-config --L_opts)
 
 DATADIR=	${PREFIX}/share/Shaaft
 
 PLIST_FILES=	bin/Packer bin/shaaft %%DATADIR%%/resource.dat \
 		man/man6/shaaft.6.gz
 
 DESKTOP_ENTRIES="Shaaft" "" "" "${PORTNAME}" "" ""
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|sdl-config|${SDL_CONFIG:T}|g ; \
 		s|^CXXFLAGS|#CXXFLAGS|g ; \
 		s|/usr/X11R6|${LOCALBASE}|g ; \
 		s|-lSDL | |g ; \
 		s|-lpng12|-lpng|g' ${WRKSRC}/configure
 	@${GREP} -lR "SDL/SDL" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e \
 		's|SDL/SDL|SDL|g'
 	@${REINPLACE_CMD} -e 's|== 3|>= 3|' ${WRKSRC}/utils/hashMap.hpp
 
 .include <bsd.port.mk>
diff --git a/games/suyimazu/Makefile b/games/suyimazu/Makefile
index 639b1c7d7f59..59cbb7532380 100644
--- a/games/suyimazu/Makefile
+++ b/games/suyimazu/Makefile
@@ -1,48 +1,49 @@
 PORTNAME=	suyimazu
 DISTVERSION=	2023
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	https://codeberg.org/Alexander88207/Suyimazu/archive/${PORTVERSION}${EXTRACT_SUFX}?dummy=/
 
 MAINTAINER=	Alexander88207@protonmail.com
 COMMENT=	Wine-based Game Launcher for FreeBSD
 WWW=		https://codeberg.org/Alexander88207/Suyimazu
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 ONLY_FOR_ARCHS=	amd64 i386
 ONLY_FOR_ARCHS_REASON=	Wine only runs on x86 architecture
 
 RUN_DEPENDS=	7zz:archivers/7-zip \
 		bash:shells/bash \
 		vulkaninfo:graphics/vulkan-tools \
 		wine:emulators/wine \
 		wine-mono>0:emulators/wine-mono \
 		winetricks:emulators/winetricks \
 		xdg-open:devel/xdg-utils \
 		zenity:x11/zenity
 
 NO_BUILD=	yes
 
 OPTIONS_SUB=	yes
 OPTIONS_DEFAULT=	GLX-UTILS
 OPTIONS_RADIO=		GLXINFO
 OPTIONS_RADIO_GLXINFO=	GLX-UTILS MESA-DEMOS
 
 GLX-UTILS_DESC=		Use glxinfo from glx-utils
 MESA-DEMOS_DESC=	Use glxinfo from mesa-demos
 
 GLX-UTILS_RUN_DEPENDS=	glxinfo:graphics/glx-utils
 MESA-DEMOS_RUN_DEPENDS=	glxinfo:graphics/mesa-demos
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 PLIST_FILES=	bin/Suyimazu \
 		share/Suyimazu/Data/Framework
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/Suyimazu/Data
 	${INSTALL_SCRIPT} ${WRKSRC}/Suyimazu ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/Data/Framework ${STAGEDIR}${PREFIX}/share/Suyimazu/Data
 
 .include <bsd.port.mk>
diff --git a/games/whichwayisup/Makefile b/games/whichwayisup/Makefile
index 4b75e87cda96..4c209cc08b9c 100644
--- a/games/whichwayisup/Makefile
+++ b/games/whichwayisup/Makefile
@@ -1,57 +1,57 @@
 PORTNAME=	whichwayisup
 PORTVERSION=	0.7.9
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	games python
 MASTER_SITES=	http://www.oletus.fi/static/whichwayisup/ \
 		SF/nemysisfreebsdp/games/${PORTNAME}/:icons
 DISTFILES=	${PORTNAME}_b${DISTVERSION:S/.//g}${EXTRACT_SUFX} \
 		${PORTNAME}.png:icons
 DIST_SUBDIR=	python
 EXTRACT_ONLY=	${PORTNAME}_b${DISTVERSION:S/.//g}${EXTRACT_SUFX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Platformer game with rotational twist
 WWW=		https://www.oletus.fi/static/whichwayisup/
 
 LICENSE=	GPLv2
 
 RUN_DEPENDS=	${PYGAME}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USES=		dos2unix gnome python zip
 DOS2UNIX_REGEX=	.*.[^pt][^nt][^gf]
 
 PORTDOCS=	README.txt changelog.txt
 OPTIONS_DEFINE=	DOCS
 
 DESKTOP_ENTRIES="Which Way Is Up" "" "${PORTNAME}" \
 		"${PORTNAME}" "Game;ArcadeGame;" ""
 
 post-patch:
 	@${REINPLACE_CMD} \
 		-e 's|libdir =.*|libdir = "${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}"| ; \
 		s|/usr/bin/env python|${PYTHON_CMD}|' \
 		${WRKSRC}/run_game.py
 	@${REINPLACE_CMD} -e 's|(data_py.*|("${DATADIR}"))|' \
 		${WRKSRC}/lib/data.py
 	@${FIND} ${WRKSRC} -name "*.bak" -delete -or -name "*.orig" -delete
 
 do-build:
 	@${PYTHON_CMD} -m compileall ${WRKSRC}
 	@${PYTHON_CMD} -O -m compileall ${WRKSRC}
 	@${TOUCH} ${WRKSRC}/data/music/.keep_me
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/run_game.py \
 		${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	@(cd ${WRKSRC}/data && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR})
 	@(cd ${WRKSRC}/lib && ${COPYTREE_SHARE} . \
 		${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/${PORTNAME})
 	${INSTALL_DATA} ${_DISTDIR}/${PORTNAME}.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps/
 
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/games/xbat/Makefile b/games/xbat/Makefile
index f75feb54a344..57e6c2842e61 100644
--- a/games/xbat/Makefile
+++ b/games/xbat/Makefile
@@ -1,23 +1,23 @@
 PORTNAME=	xbat
 PORTVERSION=	1.11
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	games
 MASTER_SITES=	LOCAL/hrs
 DISTNAME=	xev111
 
 MAINTAINER=	TsurutaniNaoki@gmail.com
 COMMENT=	XEVIOUS like shooting game
 
 LICENSE=	GPLv2 CR
 LICENSE_COMB=	multi
 LICENSE_NAME_CR=	Copyright
 LICENSE_TEXT_CR=	Possible copyright infringement
 LICENSE_PERMS_CR=	dist-mirror pkg-mirror auto-accept
 
 USES=		imake xorg
 USE_XORG=	x11 xext
 WRKSRC=		${WRKDIR}/Xev111
 ALL_TARGET=	xbat
 USE_GCC=	yes # segfaults when compiled with clang
 
 .include <bsd.port.mk>
diff --git a/graphics/R-cran-DiagrammeR/Makefile b/graphics/R-cran-DiagrammeR/Makefile
index c481e98e96d3..8a50d48a4760 100644
--- a/graphics/R-cran-DiagrammeR/Makefile
+++ b/graphics/R-cran-DiagrammeR/Makefile
@@ -1,36 +1,37 @@
 PORTNAME=	DiagrammeR
 PORTVERSION=	1.0.9
+PORTREVISION=	1
 CATEGORIES=	graphics
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Create Diagrams and Flowcharts Using R
 WWW=		https://cran.r-project.org/web/packages/DiagrammeR/
 
 LICENSE=	MIT
 
 CRAN_DEPENDS=	R-cran-dplyr>=1.0.7:math/R-cran-dplyr \
 		R-cran-downloader>=0.4:www/R-cran-downloader \
 		R-cran-glue>=1.5.0:devel/R-cran-glue \
 		R-cran-htmltools>=0.5.2:textproc/R-cran-htmltools \
 		R-cran-htmlwidgets>=1.5:www/R-cran-htmlwidgets \
 		R-cran-igraph>=1.2.11:math/R-cran-igraph \
 		R-cran-influenceR>=0.1.0.1:math/R-cran-influenceR \
 		R-cran-magrittr>=1.5:devel/R-cran-magrittr \
 		R-cran-purrr>=0.3.4:devel/R-cran-purrr \
 		R-cran-RColorBrewer>=1.1.2:graphics/R-cran-RColorBrewer \
 		R-cran-readr>=2.1.1:textproc/R-cran-readr \
 		R-cran-rlang>=0.4:devel/R-cran-rlang \
 		R-cran-rstudioapi>=0.7:devel/R-cran-rstudioapi \
 		R-cran-scales>=1.1:graphics/R-cran-scales \
 		R-cran-stringr>=1.4:textproc/R-cran-stringr \
 		R-cran-tibble>=3.1:devel/R-cran-tibble \
 		R-cran-tidyr>=1.1:devel/R-cran-tidyr \
 		R-cran-viridis>=0.6.2:graphics/R-cran-viridis \
 		R-cran-visNetwork>=2.1.0:graphics/R-cran-visNetwork
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=	cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/graphics/R-cran-GDD/Makefile b/graphics/R-cran-GDD/Makefile
index 203fa8ec5748..438141bca1dc 100644
--- a/graphics/R-cran-GDD/Makefile
+++ b/graphics/R-cran-GDD/Makefile
@@ -1,20 +1,20 @@
 PORTNAME=	GDD
 DISTVERSION=	0.1-13.1
-PORTREVISION=	15
+PORTREVISION=	16
 CATEGORIES=	graphics
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	skreuzer@FreeBSD.org
 COMMENT=	Graphics device for R for creating bitmap output
 WWW=		http://www.rosuda.org/R/GDD/
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	libgd>=2.0.35_8,1:graphics/gd
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/graphics/R-cran-RColorBrewer/Makefile b/graphics/R-cran-RColorBrewer/Makefile
index 9cdba2df9400..7e6d19befba4 100644
--- a/graphics/R-cran-RColorBrewer/Makefile
+++ b/graphics/R-cran-RColorBrewer/Makefile
@@ -1,14 +1,15 @@
 PORTNAME=	RColorBrewer
 DISTVERSION=	1.1-3
+PORTREVISION=	1
 CATEGORIES=	graphics
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	ColorBrewer palettes
 WWW=		https://cran.r-project.org/web/packages/RColorBrewer/
 
 LICENSE=	APACHE20
 
 USES=	cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/graphics/R-cran-colorspace/Makefile b/graphics/R-cran-colorspace/Makefile
index 6eb60268e17b..ec2bfdfcecb3 100644
--- a/graphics/R-cran-colorspace/Makefile
+++ b/graphics/R-cran-colorspace/Makefile
@@ -1,14 +1,15 @@
 PORTNAME=	colorspace
 DISTVERSION=	2.0-3
+PORTREVISION=	1
 CATEGORIES=	graphics
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Color Space Manipulation
 WWW=		https://cran.r-project.org/web/packages/colorspace/
 
 LICENSE=	BSD3CLAUSE
 
 USES=	cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/graphics/R-cran-diagram/Makefile b/graphics/R-cran-diagram/Makefile
index 84d407f00b3c..dd30a3aebe80 100644
--- a/graphics/R-cran-diagram/Makefile
+++ b/graphics/R-cran-diagram/Makefile
@@ -1,18 +1,19 @@
 PORTNAME=	diagram
 PORTVERSION=	1.6.5
+PORTREVISION=	1
 CATEGORIES=	graphics
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Functions for visualising simple graphs, plotting flow diagrams
 WWW=		https://cran.r-project.org/web/packages/diagram/
 
 LICENSE=	GPLv2+
 
 CRAN_DEPENDS=	R-cran-shape>0:graphics/R-cran-shape
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=	cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/graphics/R-cran-dichromat/Makefile b/graphics/R-cran-dichromat/Makefile
index 8256627a49ac..1367f742604a 100644
--- a/graphics/R-cran-dichromat/Makefile
+++ b/graphics/R-cran-dichromat/Makefile
@@ -1,14 +1,15 @@
 PORTNAME=	dichromat
 DISTVERSION=	2.0-0.1
+PORTREVISION=	1
 CATEGORIES=	graphics
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Color schemes for dichromats
 WWW=		https://cran.r-project.org/web/packages/dichromat/
 
 LICENSE=	GPLv2
 
 USES=	cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/graphics/R-cran-dygraphs/Makefile b/graphics/R-cran-dygraphs/Makefile
index 7d57cbcdafe5..9b70485519d0 100644
--- a/graphics/R-cran-dygraphs/Makefile
+++ b/graphics/R-cran-dygraphs/Makefile
@@ -1,23 +1,23 @@
 PORTNAME=	dygraphs
 DISTVERSION=	1.1.1.6
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Interface to Dygraphs Interactive Time Series Charting Library
 WWW=		https://cran.r-project.org/web/packages/dygraphs/
 
 LICENSE=	MIT
 
 CRAN_DEPENDS=	R-cran-magrittr>0:devel/R-cran-magrittr \
 		R-cran-htmlwidgets>=0.6:www/R-cran-htmlwidgets \
 		R-cran-htmltools>=0.3.5:textproc/R-cran-htmltools \
 		R-cran-zoo>=1.7.10:math/R-cran-zoo \
 		R-cran-xts>=0.9.7:math/R-cran-xts
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=	cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/graphics/R-cran-farver/Makefile b/graphics/R-cran-farver/Makefile
index f1e5496c0d04..0dd4d41c00b2 100644
--- a/graphics/R-cran-farver/Makefile
+++ b/graphics/R-cran-farver/Makefile
@@ -1,15 +1,16 @@
 PORTNAME=	farver
 PORTVERSION=	2.1.1
+PORTREVISION=	1
 CATEGORIES=	graphics
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	High Performance Colour Space Manipulation
 WWW=		https://cran.r-project.org/web/packages/farver/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.note
 
 USES=		compiler:c++11-lang cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/graphics/R-cran-ggplot2/Makefile b/graphics/R-cran-ggplot2/Makefile
index f7536e9ec356..80332c926e62 100644
--- a/graphics/R-cran-ggplot2/Makefile
+++ b/graphics/R-cran-ggplot2/Makefile
@@ -1,25 +1,26 @@
 PORTNAME=	ggplot2
 PORTVERSION=	3.3.6
+PORTREVISION=	1
 CATEGORIES=	graphics
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Implementation of the Grammar of Graphics
 WWW=		https://ggplot2.tidyverse.org/
 
 LICENSE=	MIT
 
 CRAN_DEPENDS=	R-cran-digest>0:security/R-cran-digest \
 		R-cran-glue>0:devel/R-cran-glue \
 		R-cran-gtable>=0.1.1:math/R-cran-gtable \
 		R-cran-isoband>0:math/R-cran-isoband \
 		R-cran-rlang>=0.4.10:devel/R-cran-rlang \
 		R-cran-scales>=0.5.0:graphics/R-cran-scales \
 		R-cran-tibble>0:devel/R-cran-tibble \
 		R-cran-withr>=2.0.0:devel/R-cran-withr
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=	cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/graphics/R-cran-ggrepel/Makefile b/graphics/R-cran-ggrepel/Makefile
index 71575f1baafc..93357278b09a 100644
--- a/graphics/R-cran-ggrepel/Makefile
+++ b/graphics/R-cran-ggrepel/Makefile
@@ -1,20 +1,21 @@
 PORTNAME=	ggrepel
 DISTVERSION=	0.9.3
+PORTREVISION=	1
 CATEGORIES=	graphics
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	uzsolt@uzsolt.hu
 COMMENT=	Help to avoid overlapping text labels of ggplot2
 WWW=		https://cran.r-project.org/web/packages/ggrepel/
 
 LICENSE=	GPLv3
 
 CRAN_DEPENDS=	R-cran-ggplot2>0:graphics/R-cran-ggplot2 \
 		R-cran-Rcpp>0:devel/R-cran-Rcpp \
 		R-cran-scales>0:graphics/R-cran-scales
 BUILD_DEPENDS+=	${CRAN_DEPENDS}
 RUN_DEPENDS+=	${CRAN_DEPENDS}
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/graphics/R-cran-gridBase/Makefile b/graphics/R-cran-gridBase/Makefile
index 886a1efec901..4fc9cf5480a4 100644
--- a/graphics/R-cran-gridBase/Makefile
+++ b/graphics/R-cran-gridBase/Makefile
@@ -1,16 +1,16 @@
 PORTNAME=	gridBase
 DISTVERSION=	0.4-7
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Integration of base and grid graphics
 WWW=		https://cran.r-project.org/web/packages/gridBase/
 
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
 USES=	cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/graphics/R-cran-gridExtra/Makefile b/graphics/R-cran-gridExtra/Makefile
index 8aaec8295cd8..d2536187be21 100644
--- a/graphics/R-cran-gridExtra/Makefile
+++ b/graphics/R-cran-gridExtra/Makefile
@@ -1,19 +1,19 @@
 PORTNAME=	gridExtra
 PORTVERSION=	2.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Miscellaneous Functions for "Grid" Graphics
 WWW=		https://cran.r-project.org/web/packages/gridExtra/
 
 LICENSE=	GPLv2+
 
 CRAN_DEPENDS=	R-cran-gtable>0:math/R-cran-gtable
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/graphics/R-cran-jpeg/Makefile b/graphics/R-cran-jpeg/Makefile
index a535101a3bff..48ba3b627753 100644
--- a/graphics/R-cran-jpeg/Makefile
+++ b/graphics/R-cran-jpeg/Makefile
@@ -1,15 +1,16 @@
 PORTNAME=	jpeg
 DISTVERSION=	0.1-10
+PORTREVISION=	1
 CATEGORIES=	graphics
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	ygy@FreeBSD.org
 COMMENT=	Read and write JPEG images
 WWW=		https://www.rforge.net/jpeg/
 
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/graphics/R-cran-latticeExtra/Makefile b/graphics/R-cran-latticeExtra/Makefile
index 198d1e8f46b3..fc25d7baed16 100644
--- a/graphics/R-cran-latticeExtra/Makefile
+++ b/graphics/R-cran-latticeExtra/Makefile
@@ -1,21 +1,22 @@
 PORTNAME=	latticeExtra
 DISTVERSION=	0.6-29
+PORTREVISION=	1
 CATEGORIES=	graphics
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	skreuzer@FreeBSD.org
 COMMENT=	Extra graphical utilities based on lattice
 WWW=		https://cran.r-project.org/web/packages/latticeExtra/
 
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
 CRAN_DEPENDS=	R-cran-png>0:graphics/R-cran-png \
 		R-cran-jpeg>0:graphics/R-cran-jpeg \
 		R-cran-RColorBrewer>0:graphics/R-cran-RColorBrewer
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/graphics/R-cran-magick/Makefile b/graphics/R-cran-magick/Makefile
index 7ca73682a957..5285e6c0bc26 100644
--- a/graphics/R-cran-magick/Makefile
+++ b/graphics/R-cran-magick/Makefile
@@ -1,21 +1,22 @@
 PORTNAME=	magick
 DISTVERSION=	2.7.4
+PORTREVISION=	1
 CATEGORIES=	graphics
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	uzsolt@uzsolt.hu
 COMMENT=	Advanced Graphics and Image-Processing in R
 WWW=		https://cran.r-project.org/web/packages/magick/index.html
 
 LICENSE=	MIT
 
 CRAN_DEPENDS=	R-cran-curl>0:ftp/R-cran-curl \
 		R-cran-magrittr>0:devel/R-cran-magrittr \
 		R-cran-Rcpp>0:devel/R-cran-Rcpp
 BUILD_DEPENDS+=	${CRAN_DEPENDS}
 RUN_DEPENDS=	ImageMagick7>0:graphics/ImageMagick7 \
 		${CRAN_DEPENDS}
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/graphics/R-cran-munsell/Makefile b/graphics/R-cran-munsell/Makefile
index 92d347ee6c72..7bff7fb3fc3f 100644
--- a/graphics/R-cran-munsell/Makefile
+++ b/graphics/R-cran-munsell/Makefile
@@ -1,23 +1,23 @@
 PORTNAME=	munsell
 PORTVERSION=	0.5.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Munsell colour system
 WWW=		https://cran.r-project.org/web/packages/munsell/
 
 LICENSE=	MIT CW
 LICENSE_COMB=	multi
 LICENSE_NAME_CW=	Charlotte Wickham COPYRIGHT
 LICENSE_FILE_CW=	${WRKSRC}/LICENSE
 LICENSE_PERMS_CW=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 CRAN_DEPENDS=	R-cran-colorspace>0:graphics/R-cran-colorspace
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=	cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/graphics/R-cran-pROC/Makefile b/graphics/R-cran-pROC/Makefile
index 34d981ac23ad..572eaa41c553 100644
--- a/graphics/R-cran-pROC/Makefile
+++ b/graphics/R-cran-pROC/Makefile
@@ -1,19 +1,20 @@
 PORTNAME=	pROC
 PORTVERSION=	1.18.0
+PORTREVISION=	1
 CATEGORIES=	graphics
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Display and Analyze ROC Curves
 WWW=		https://cran.r-project.org/web/packages/pROC/
 
 LICENSE=	GPLv3
 
 CRAN_DEPENDS=	R-cran-plyr>0:devel/R-cran-plyr \
 		R-cran-Rcpp>=0.11.1:devel/R-cran-Rcpp
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/graphics/R-cran-pixmap/Makefile b/graphics/R-cran-pixmap/Makefile
index b8fb5baa74d4..af93035c8541 100644
--- a/graphics/R-cran-pixmap/Makefile
+++ b/graphics/R-cran-pixmap/Makefile
@@ -1,14 +1,15 @@
 PORTNAME=	pixmap
 DISTVERSION=	0.4-12
+PORTREVISION=	1
 CATEGORIES=	graphics
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Bitmap Images ("Pixel Maps")
 WWW=		https://cran.r-project.org/web/packages/pixmap/
 
 LICENSE=	GPLv2
 
 USES=	cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/graphics/R-cran-png/Makefile b/graphics/R-cran-png/Makefile
index 25259df8cc21..3f6d71214d42 100644
--- a/graphics/R-cran-png/Makefile
+++ b/graphics/R-cran-png/Makefile
@@ -1,18 +1,18 @@
 PORTNAME=	png
 DISTVERSION=	0.1-7
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	graphics
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Read and write PNG images
 WWW=		https://www.rforge.net/png/
 
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
 LIB_DEPENDS=	libpng.so:graphics/png
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/graphics/R-cran-qcc/Makefile b/graphics/R-cran-qcc/Makefile
index 18af5f9664e2..f3499a1e0355 100644
--- a/graphics/R-cran-qcc/Makefile
+++ b/graphics/R-cran-qcc/Makefile
@@ -1,16 +1,16 @@
 PORTNAME=	qcc
 DISTVERSION=	2.7
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Quality Control Charts
 WWW=		https://cran.r-project.org/package=qcc
 
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
 USES=	cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/graphics/R-cran-rgdal/Makefile b/graphics/R-cran-rgdal/Makefile
index 34d48ff3ea68..01d9a9cd510c 100644
--- a/graphics/R-cran-rgdal/Makefile
+++ b/graphics/R-cran-rgdal/Makefile
@@ -1,21 +1,21 @@
 PORTNAME=	rgdal
 DISTVERSION=	1.5-32
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Bindings for the Geospatial Data Abstraction Library
 WWW=		https://cran.r-project.org/web/packages/rgdal/
 
 LICENSE=	GPLv2+
 
 LIB_DEPENDS=	libgdal.so:graphics/gdal \
 		libproj.so:graphics/proj
 CRAN_DEPENDS=	R-cran-sp>=1.1.0:math/R-cran-sp
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		compiler:c++11-lang cran:auto-plist,compiles pkgconfig
 
 .include <bsd.port.mk>
diff --git a/graphics/R-cran-rtiff/Makefile b/graphics/R-cran-rtiff/Makefile
index 0bfb5032f93e..c1948aadf9a4 100644
--- a/graphics/R-cran-rtiff/Makefile
+++ b/graphics/R-cran-rtiff/Makefile
@@ -1,19 +1,20 @@
 PORTNAME=	rtiff
 PORTVERSION=	1.4.8
+PORTREVISION=	1
 CATEGORIES=	graphics
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	TIFF reader for R
 WWW=		https://cran.r-project.org/web/packages/rtiff/
 
 LICENSE=	GPLv3
 
 LIB_DEPENDS=	libtiff.so:graphics/tiff
 CRAN_DEPENDS=	R-cran-pixmap>0:graphics/R-cran-pixmap
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/graphics/R-cran-s2/Makefile b/graphics/R-cran-s2/Makefile
index 748a4733536e..648bfb563413 100644
--- a/graphics/R-cran-s2/Makefile
+++ b/graphics/R-cran-s2/Makefile
@@ -1,28 +1,29 @@
 PORTNAME=	s2
 PORTVERSION=	1.1.0
+PORTREVISION=	1
 CATEGORIES=	graphics
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Spherical Geometry Operators Using the S2 Geometry Library
 WWW=		https://cran.r-project.org/web/packages/s2/
 
 LICENSE=	APACHE20
 
 NOT_FOR_ARCHS=	armv6 armv7 i386 mips powerpc powerpcspe
 NOT_FOR_ARCHS_REASON=	is currently 64-bit only
 
 CRAN_DEPENDS=	R-cran-Rcpp>0:devel/R-cran-Rcpp \
 		R-cran-wk>=0.6.0:math/R-cran-wk
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == powerpc64
 EXTRA_PATCHES=	${FILESDIR}/extra-patch-src_Makevars.in
 .endif
 
 .include <bsd.port.mk>
diff --git a/graphics/R-cran-scales/Makefile b/graphics/R-cran-scales/Makefile
index 12dfce7f2760..54cbc72be2cd 100644
--- a/graphics/R-cran-scales/Makefile
+++ b/graphics/R-cran-scales/Makefile
@@ -1,25 +1,26 @@
 PORTNAME=	scales
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES=	graphics
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Scale functions for graphics
 WWW=		https://cran.r-project.org/web/packages/scales/
 
 LICENSE=	MIT
 
 CRAN_DEPENDS=	R-cran-farver>=2.0.3:graphics/R-cran-farver \
 		R-cran-labeling>0:math/R-cran-labeling \
 		R-cran-lifecycle>0:devel/R-cran-lifecycle \
 		R-cran-munsell>=0.5:graphics/R-cran-munsell \
 		R-cran-R6>0:devel/R-cran-R6 \
 		R-cran-RColorBrewer>0:graphics/R-cran-RColorBrewer \
 		R-cran-rlang>=1.0.0:devel/R-cran-rlang \
 		R-cran-viridisLite>0:graphics/R-cran-viridisLite
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=	cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/graphics/R-cran-shape/Makefile b/graphics/R-cran-shape/Makefile
index 82432ec4858b..61a3298afafa 100644
--- a/graphics/R-cran-shape/Makefile
+++ b/graphics/R-cran-shape/Makefile
@@ -1,14 +1,15 @@
 PORTNAME=	shape
 PORTVERSION=	1.4.6
+PORTREVISION=	1
 CATEGORIES=	graphics
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Functions for plotting graphical shapes, colors
 WWW=		https://cran.r-project.org/web/packages/shape/
 
 LICENSE=	GPLv3
 
 USES=	cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/graphics/R-cran-viridis/Makefile b/graphics/R-cran-viridis/Makefile
index ec9eeee0ce0e..8eab1249865b 100644
--- a/graphics/R-cran-viridis/Makefile
+++ b/graphics/R-cran-viridis/Makefile
@@ -1,20 +1,21 @@
 PORTNAME=	viridis
 PORTVERSION=	0.6.2
+PORTREVISION=	1
 CATEGORIES=	graphics
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Default Color Maps from 'matplotlib'
 WWW=		https://cran.r-project.org/web/packages/viridis/
 
 LICENSE=	MIT
 
 CRAN_DEPENDS=	R-cran-viridisLite>=0.4.0:graphics/R-cran-viridisLite \
 		R-cran-ggplot2>=1.0.1:graphics/R-cran-ggplot2 \
 		R-cran-gridExtra>0:graphics/R-cran-gridExtra
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/graphics/R-cran-viridisLite/Makefile b/graphics/R-cran-viridisLite/Makefile
index c56738ce0d80..0ef836c4330b 100644
--- a/graphics/R-cran-viridisLite/Makefile
+++ b/graphics/R-cran-viridisLite/Makefile
@@ -1,14 +1,15 @@
 PORTNAME=	viridisLite
 PORTVERSION=	0.4.1
+PORTREVISION=	1
 CATEGORIES=	graphics
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Default Color Maps from 'matplotlib' (Lite Version)
 WWW=		https://cran.r-project.org/web/packages/viridisLite/
 
 LICENSE=	MIT
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/graphics/R-cran-visNetwork/Makefile b/graphics/R-cran-visNetwork/Makefile
index 626ed32f37b2..54849fd282e9 100644
--- a/graphics/R-cran-visNetwork/Makefile
+++ b/graphics/R-cran-visNetwork/Makefile
@@ -1,21 +1,22 @@
 PORTNAME=	visNetwork
 PORTVERSION=	2.1.0
+PORTREVISION=	1
 CATEGORIES=	graphics
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Network Visualization using 'vis.js' Library
 WWW=		https://cran.r-project.org/web/packages/visNetwork/
 
 LICENSE=	MIT
 
 CRAN_DEPENDS=	R-cran-htmlwidgets>0:www/R-cran-htmlwidgets \
 		R-cran-htmltools>0:textproc/R-cran-htmltools \
 		R-cran-jsonlite>0:converters/R-cran-jsonlite \
 		R-cran-magrittr>0:devel/R-cran-magrittr
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=	cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/graphics/alembic/Makefile b/graphics/alembic/Makefile
index 6633eb61f389..9ab244e7cd19 100644
--- a/graphics/alembic/Makefile
+++ b/graphics/alembic/Makefile
@@ -1,32 +1,33 @@
 PORTNAME=	alembic
 PORTVERSION=	1.8.5
+PORTREVISION=	1
 CATEGORIES=	graphics
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Open framework for storing and sharing graphic scene data
 WWW=		http://alembic.io/
 
 LICENSE=	BSD3CLAUSE
 
 LIB_DEPENDS=	libImath.so:math/Imath
 LIB_DEPENDS+=	libsz.so:science/libaec
 
 USES=		cmake compiler:c++11-lang
 USE_CXXSTD=	c++11
 USE_GITHUB=	yes
 USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=	HDF5
 OPTIONS_DEFAULT=	HDF5
 OPTIONS_SUB=	yes
 
 HDF5_LIB_DEPENDS=	libhdf5.so:science/hdf5
 HDF5_CMAKE_ON=	-DUSE_HDF5:BOOL=ON
 
 PLIST_FILES=	lib/libAlembic.so.${PORTVERSION} \
 		lib/libAlembic.so.${PORTVERSION:R}
 
 do-test:
 	@cd ${TEST_WRKSRC} && ctest -C ${CMAKE_BUILD_TYPE} ${_MAKE_JOBS}
 
 .include <bsd.port.mk>
diff --git a/graphics/alizams/Makefile b/graphics/alizams/Makefile
index 77cd8c4e3fa8..85cf8792d5f5 100644
--- a/graphics/alizams/Makefile
+++ b/graphics/alizams/Makefile
@@ -1,36 +1,37 @@
 PORTNAME=	alizams
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.8.3-34
+PORTREVISION=	1
 DISTVERSIONSUFFIX=	-ge36859b
 CATEGORIES=	graphics
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	DICOM Viewer
 WWW=		https://github.com/AlizaMedicalImaging/AlizaMS
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_i386=	compilation fails: use of undeclared identifier '_mm_cvtsd_si64', see https://github.com/InsightSoftwareConsortium/ITK/issues/3771
 
 LIB_DEPENDS=	libITKCommon-${ITK_VER}.so:science/InsightToolkit
 TEST_DEPENDS=	googletest>0:devel/googletest
 
 USES=		cmake:testing desktop-file-utils eigen:3 qt:5 gl
 USE_QT=		core gui printsupport sql svg widgets
 USE_GL=		gl opengl
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	AlizaMedicalImaging
 GH_PROJECT=	AlizaMS
 
 CMAKE_ARGS=	-DALIZA_QT_VERSION=5
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} != amd64
 CXXFLAGS+=	-DDISABLE_SIMDMATH # i386 also needs disabling SIND, see https://github.com/InsightSoftwareConsortium/ITK/issues/3771#issuecomment-1328839390
 .endif
 
 .include <../../science/InsightToolkit/Makefile.version>
 .include <bsd.port.mk>
diff --git a/graphics/appleseed/Makefile b/graphics/appleseed/Makefile
index c0569fbcb41e..edb9f5bc63da 100644
--- a/graphics/appleseed/Makefile
+++ b/graphics/appleseed/Makefile
@@ -1,93 +1,93 @@
 PORTNAME=	appleseed
 DISTVERSION=	2.1.0-beta
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	graphics
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Modern, physically-based production renderer
 WWW=		https://appleseedhq.net/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 LIB_DEPENDS=	libboost_thread.so:devel/boost-libs \
 		liblz4.so:archivers/liblz4 \
 		libpng.so:graphics/png \
 		libIlmThread.so:graphics/openexr \
 		libImath.so:math/Imath \
 		libOpenColorIO.so:graphics/opencolorio \
 		libOpenImageIO.so:graphics/openimageio \
 		libxerces-c.so:textproc/xerces-c3 \
 		liboslexec.so:graphics/openshadinglanguage
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	${PORTNAME}hq
 
 BROKEN=		cannot build with recent Boost and OCIO libs
 
 ONLY_FOR_ARCHS=	i386 amd64
 ONLY_FOR_ARCHS_REASON=	not ported to it yet
 
 USES=		cmake compiler:c++11-lang shebangfix
 SHEBANG_FILES=	scripts/*.py
 
 CFLAGS+=	-I${LOCALBASE}/include/Imath
 CFLAGS+=	-I${LOCALBASE}/include/OpenEXR
 
 CMAKE_ARGS=	-DWITH_PYTHON2_BINDINGS:BOOL=OFF \
 		-DWITH_DOXYGEN:BOOL=OFF \
 		-DINSTALL_HEADERS:BOOL=OFF \
 		-DINSTALL_TESTS:BOOL=OFF \
 		-DINSTALL_API_EXAMPLES:BOOL=OFF \
 		-DWARNINGS_AS_ERRORS:BOOL=OFF
 
 .for lib in BOOST EMBREE EXR OCIO OIIO OSL
 CMAKE_ARGS+=	-DUSE_STATIC_${lib}:BOOL=OFF
 .endfor
 
 # Not ready for hier(7)-conforming installation yet
 CMAKE_INSTALL_PREFIX=	${PREFIX}/${PKGBASE}
 PLIST_SUB=	APPHOME=${CMAKE_INSTALL_PREFIX}
 
 SUB_FILES=	pkg-message
 SUB_LIST:=	${PLIST_SUB}
 
 OPTIONS_DEFINE=	EMBREE PYTHON STUDIO
 OPTIONS_DEFAULT=	PYTHON STUDIO
 OPTIONS_SUB=	yes
 
 EMBREE_DESC=	Embree intersection backend support
 EMBREE_LIB_DEPENDS=	libembree3.so:graphics/embree
 EMBREE_CMAKE_ON=	-DWITH_EMBREE:BOOL=ON
 
 PYTHON_USES=	gl python:3.5+,build,run
 PYTHON_USE=	GL=gl
 PYTHON_CMAKE_ON=	-DWITH_PYTHON3_BINDINGS:BOOL=ON
 
 STUDIO_DESC=	Build appleseed.studio (Qt-based)
 STUDIO_LIB_DEPENDS=	${PY_BOOST}
 STUDIO_USES=	qt:5
 STUDIO_USE=	QT=buildtools:build,qmake:build,concurrent,core,gui,opengl,widgets
 STUDIO_CMAKE_OFF=	-DWITH_STUDIO:BOOL=OFF
 STUDIO_IMPLIES=	PYTHON
 
 post-patch:
 	@${RMDIR} ${WRKSRC}/sandbox/docs/api
 	@${RM} ${WRKSRC}/sandbox/share/cmake/Modules/FindOpenImageIO.cmake
 	${REINPLACE_CMD} 's,OpenEXR/Imath,Imath/Imath,' \
                 ${WRKSRC}/sandbox/share/cmake/Modules/FindImath.cmake \
                 ${WRKSRC}/src/appleseed/foundation/meta/tests/test_quaternion.cpp \
                 ${WRKSRC}/src/appleseed/foundation/meta/tests/test_matrix.cpp \
                 ${WRKSRC}/src/appleseed/foundation/meta/tests/test_quaternion.cpp \
                 ${WRKSRC}/src/appleseed/foundation/meta/tests/test_vector.cpp \
                 ${WRKSRC}/src/appleseed/foundation/meta/tests/test_aabb.cpp \
                 ${WRKSRC}/src/appleseed/foundation/meta/tests/test_color.cpp \
                 ${WRKSRC}/src/appleseed/foundation/math/vector.h \
                 ${WRKSRC}/src/appleseed/foundation/math/aabb.h \
                 ${WRKSRC}/src/appleseed/foundation/math/matrix.h \
                 ${WRKSRC}/src/appleseed/foundation/math/quaternion.h \
                 ${WRKSRC}/src/appleseed/foundation/image/color.h
 
 .include <bsd.port.mk>
 
 PATCH_ARGS+=	-l
diff --git a/graphics/autopano-sift-c/Makefile b/graphics/autopano-sift-c/Makefile
index 4cb58f51ae0a..16b900f25c31 100644
--- a/graphics/autopano-sift-c/Makefile
+++ b/graphics/autopano-sift-c/Makefile
@@ -1,31 +1,31 @@
 PORTNAME=	autopano-sift-C
 PORTVERSION=	2.5.1
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	graphics
 MASTER_SITES=	SF/hugin/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Automatic panorama control point generation tool, C port
 WWW=		http://hugin.sourceforge.net/docs/manual/Autopano-sift-C.html
 
 LIB_DEPENDS=	libtiff.so:graphics/tiff \
 		libpng.so:graphics/png \
 		libpano13.so:graphics/libpano13
 
 CONFLICTS=	autopano-sift
 
 USE_GNOME=	libxml2
 USES=		cmake gnome jpeg
 
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${REINPLACE_CMD} -e '/set(all_libs/s/$$/ m/' ${WRKSRC}/CMakeLists.txt
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.1ST ${STAGEDIR}${DOCSDIR}/
 
 .include <bsd.port.mk>
diff --git a/graphics/blender-lts29/Makefile b/graphics/blender-lts29/Makefile
index 29ec2ec7c92d..7464e79640fe 100644
--- a/graphics/blender-lts29/Makefile
+++ b/graphics/blender-lts29/Makefile
@@ -1,230 +1,230 @@
 PORTNAME=	blender
 DISTVERSION=	2.93.11
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	graphics multimedia
 MASTER_SITES=	http://download.blender.org/source/ \
 		http://mirror.cs.umn.edu/blender.org/source/ \
 		http://public.planetmirror.com/pub/blender/source/
 # long term support v2.9x
 PKGNAMESUFFIX=	-lts29
 
 MAINTAINER=	FreeBSD@Shaneware.biz
 COMMENT=	3D modeling/rendering/animation package - LTS
 WWW=		https://www.blender.org/
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/doc/license/GPL3-license.txt
 
 BROKEN=		fails to build
 NOT_FOR_ARCHS=	i386
 NOT_FOR_ARCHS_REASON=	uses 64bit atomic functions
 
 BUILD_DEPENDS=	${PYNUMPY}
 LIB_DEPENDS=	libpng.so:graphics/png \
 		libfreetype.so:print/freetype2 \
 		libboost_regex.so:devel/boost-libs
 RUN_DEPENDS=	${PYNUMPY}
 # libboost_regex.so just acts as a placeholder; several boost
 # libraries are used, if either of the most common options in blender
 # are set. We will pull boost in just to be on the safe side.
 
 USES=		cmake compiler:c++17-lang cpe gl jpeg python:3.9 shebangfix \
 		tar:xz xorg
 USE_XORG=	x11 xext xfixes xmu xrender
 USE_GL=		gl glu glew
 
 INSTALLS_ICONS=	yes
 CMAKE_OFF=	WITH_PYTHON_INSTALL \
 		WITH_PYTHON_INSTALL_NUMPY WITH_INSTALL_PORTABLE \
 		WITH_CYCLES_LOGGING
 
 SHEBANG_FILES=	release/bin/blender-thumbnailer.py \
 		release/scripts/modules/bl_i18n_utils/merge_po.py \
 		release/scripts/modules/bl_i18n_utils/utils_rtl.py \
 		release/scripts/modules/blend_render_info.py
 CFLAGS+=	${CFLAGS_${CHOSEN_COMPILER_TYPE}}
 CFLAGS_gcc=	-Wno-float-conversion
 CFLAGS_i386=	-march=i586
 CXXFLAGS_i386=	-march=i586
 
 # prevent conflict with other blender versions
 DATADIR=	${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
 PLIST_SUB+=	VER=${DISTVERSION:R} SUFFIX=${PKGNAMESUFFIX}
 SUB_FILES=	blender
 SUB_LIST=	PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR} VER=${DISTVERSION:R} \
 		SUFFIX=${PKGNAMESUFFIX}
 OPTIONS_SUB=	yes
 
 .include "${.CURDIR}/Makefile.options"
 
 ALEMBIC_CMAKE_BOOL=		WITH_ALEMBIC
 ALEMBIC_LIB_DEPENDS=		libAlembic.so:graphics/alembic
 # note that this needs to be set to match alembics hdf5 option
 ALEMBIC_HDF5_REQUIRES=		ALEMBIC
 ALEMBIC_HDF5_CMAKE_BOOL=	WITH_ALEMBIC_HDF5
 ALEMBIC_HDF5_LIB_DEPENDS=	libhdf5.so:science/hdf5
 AVI_CMAKE_BOOL=			WITH_CODEC_AVI
 BULLET_CMAKE_BOOL=		WITH_BULLET
 CAMERATRACK_CMAKE_BOOL=		WITH_LIBMV WITH_SYSTEM_GLOG
 CAMERATRACK_LIB_DEPENDS=	libunwind.so:devel/libunwind \
 				libglog.so:devel/glog
 CAMERATRACK_ONLY_FOR_ARCHS=	i386 amd64 aarch64 powerpc64 powerpc64le
 CAMERATRACK_ONLY_FOR_ARCHS_REASON=	libunwind only supports x86/amd64/aarch64/powerpc64/powerpc64le
 CINEON_CMAKE_BOOL=		WITH_IMAGE_CINEON
 COLLADA_CMAKE_BOOL=		WITH_OPENCOLLADA
 COLLADA_LIB_DEPENDS=		libOpenCOLLADABaseUtils.so:graphics/opencollada \
 				libpcre.so:devel/pcre
 COLLADA_USE=			GNOME=libxml2
 COLLADA_USES=			gnome
 COMPOSITOR_CMAKE_BOOL=		WITH_COMPOSITOR
 CYCLES_IMPLIES=			OPENIMAGEIO TBB
 CYCLES_CMAKE_BOOL=		WITH_CYCLES
 CYCLES_LIB_DEPENDS=		libpugixml.so:textproc/pugixml
 CYCLESEMBR_IMPLIES=		CYCLES
 CYCLESEMBR_CMAKE_BOOL=		WITH_CYCLES_EMBREE
 CYCLESEMBR_LIB_DEPENDS=		libembree3.so:graphics/embree
 CYCLESEMBR_ONLY_FOR_ARCHS=	amd64
 CYCLESEMBR_ONLY_FOR_ARCHS_REASON=	embree only supports amd64
 CYCLESOSL_IMPLIES=		CYCLES
 CYCLESOSL_CMAKE_BOOL=		WITH_CYCLES_OSL WITH_LLVM
 CYCLESOSL_CMAKE_ON=		-DLLVM_STATIC:BOOL=OFF \
 				-DLLVM_CONFIG:STRING="${LOCALBASE}/bin/llvm-config${LLVM_DEFAULT}" \
 				-DOSL_SHADER_DIR:STRING="${LOCALBASE}/share/openshadinglanguage/shaders"
 CYCLESOSL_BUILD_DEPENDS=	llvm-config${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
 CYCLESOSL_LIB_DEPENDS=		liboslcomp.so:graphics/openshadinglanguage
 CYCLESOSL_RUN_DEPENDS=		llvm-config${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
 DDS_CMAKE_BOOL=			WITH_IMAGE_DDS
 DRACO_CMAKE_BOOL=		WITH_DRACO
 DRACO_USE=			LDCONFIG=${PYTHON_SITELIBDIR}
 EBOOL_CMAKE_BOOL=		WITH_GMP
 EBOOL_LIB_DEPENDS=		libgmp.so:math/gmp
 FFMPEG_CMAKE_BOOL=		WITH_CODEC_FFMPEG
 FFMPEG_LIB_DEPENDS=		libavutil.so:multimedia/ffmpeg \
 				libflite.so:audio/flite \
 				libpulse.so:audio/pulseaudio
 FFMPEG_LDFLAGS=			-L${LOCALBASE}/lib -lflite -lflite_cmu_us_kal -lflite_cmulex -lflite_usenglish
 FFTW3_CMAKE_BOOL=		WITH_FFTW3
 FFTW3_LIB_DEPENDS=		libfftw3.so:math/fftw3
 FRAMESERVER_CMAKE_BOOL=		WITH_IMAGE_FRAMESERVER
 FREESTYLE_CMAKE_BOOL=		WITH_FREESTYLE
 HDR_CMAKE_BOOL=			WITH_IMAGE_HDR
 HEADLESS_PREVENTS=		MENU XINPUT XF86VMODE
 HEADLESS_PREVENTS_MSG=		X11 options can't be used in headless mode
 HEADLESS_CMAKE_BOOL=		WITH_HEADLESS
 INPUT_NDOF_CMAKE_BOOL=		WITH_INPUT_NDOF
 JACK_CMAKE_BOOL=		WITH_JACK
 JACK_LIB_DEPENDS=		libjack.so:audio/jack
 LZO_CMAKE_BOOL=			WITH_LZO
 LZMA_CMAKE_BOOL=		WITH_LZMA
 MENU_USES=			desktop-file-utils
 MOD_BOOLEAN_CMAKE_BOOL=		WITH_MOD_BOOLEAN
 MOD_FLUID_IMPLIES=		TBB
 MOD_FLUID_CMAKE_BOOL=		WITH_MOD_FLUID
 MOD_OCEANSIM_IMPLIES=		FFTW3
 MOD_OCEANSIM_CMAKE_BOOL=	WITH_MOD_OCEANSIM
 MOD_REMESH_CMAKE_BOOL=		WITH_MOD_REMESH
 MOD_SMOKE_CMAKE_BOOL=		WITH_MOD_SMOKE
 NLS_CMAKE_BOOL=			WITH_INTERNATIONAL
 # Use iconv:wchar_t to force the usage of iconv from ports.
 # libboost_locale.so uses libiconv_open, while we only provide
 # iconv_open in 10.x+
 NLS_USES=			gettext iconv:lib,wchar_t
 OPENAL_CMAKE_BOOL=		WITH_OPENAL
 OPENAL_USES=			openal:al,alut
 OPENCOLORIO_CMAKE_BOOL=		WITH_OPENCOLORIO
 OPENCOLORIO_LIB_DEPENDS=	libOpenColorIO.so:graphics/opencolorio \
 				libyaml-cpp.so:devel/yaml-cpp \
 				libtinyxml.so:textproc/tinyxml \
 				libexpat.so:textproc/expat2 \
 				libpystring.so:devel/pystring
 OPENEXR_CMAKE_BOOL=		WITH_IMAGE_OPENEXR
 OPENEXR_CFLAGS=			-I${LOCALBASE}/include/Imath
 OPENEXR_LIB_DEPENDS=		libImath.so:math/Imath \
 				libOpenEXR.so:graphics/openexr
 OPENIMAGEIO_IMPLIES=		OPENEXR TIFF
 OPENIMAGEIO_CMAKE_BOOL=		WITH_OPENIMAGEIO
 OPENIMAGEIO_LIB_DEPENDS=	libOpenImageIO.so:graphics/openimageio
 OPENIMAGEIO_LDFLAGS=		-lOpenImageIO_Util
 OPENIMAGEDN_IMPLIES=		TBB
 OPENIMAGEDN_CMAKE_BOOL=		WITH_OPENIMAGEDENOISE
 OPENIMAGEDN_LIB_DEPENDS=	libOpenImageDenoise.so:graphics/oidn
 OPENIMAGEDN_ONLY_FOR_ARCHS=	amd64
 OPENIMAGEDN_ONLY_FOR_ARCHS_REASON=	oidn only supports amd64
 OPENJPEG_CMAKE_BOOL=		WITH_IMAGE_OPENJPEG
 OPENJPEG_LIB_DEPENDS=		libopenjp2.so:graphics/openjpeg
 # openmp usually works on amd64
 OPENMP_CMAKE_BOOL=		WITH_OPENMP
 OPENSUBDIV_CMAKE_BOOL=		WITH_OPENSUBDIV
 OPENSUBDIV_LIB_DEPENDS=		libosdCPU.so:graphics/opensubdiv
 OPENVDB_IMPLIES=		TBB
 OPENVDB_CMAKE_BOOL=		WITH_OPENVDB WITH_OPENVDB_BLOSC
 OPENVDB_LIB_DEPENDS=		libblosc.so:archivers/c-blosc \
 				libopenvdb.so:misc/openvdb
 OPENVDB_BROKEN=			not compatible with OpenVDB-10
 RAYOPTIMIZATION_CMAKE_BOOL=	WITH_RAYOPTIMIZATION
 SDL_CMAKE_BOOL=			WITH_SDL
 SDL_USE=			SDL=sdl2
 SDL_USES=			sdl
 SNDFILE_CMAKE_BOOL=		WITH_CODEC_SNDFILE
 SNDFILE_LIB_DEPENDS=		libsndfile.so:audio/libsndfile
 TBB_CMAKE_BOOL=			WITH_TBB
 TBB_LIB_DEPENDS=		libtbb.so:devel/onetbb
 TIFF_CMAKE_BOOL=		WITH_IMAGE_TIFF
 TIFF_LIB_DEPENDS=		libtiff.so:graphics/tiff
 TRACE_CMAKE_BOOL=		WITH_POTRACE
 TRACE_LIB_DEPENDS=		libpotrace.so:graphics/libpotrace
 XINPUT_CMAKE_BOOL=		WITH_X11_XINPUT
 XINPUT_USE=			XORG=xi
 XF86VMODE_CMAKE_BOOL=		WITH_X11_XF86VMODE
 XF86VMODE_USE=			XORG=xi,xxf86vm
 
 .if defined(WITH_DEBUG)
 CMAKE_ARGS+=		-DWITH_GHOST_DEBUG:BOOL=ON
 .endif
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH:Mpowerpc*} || ${ARCH:Mriscv64*}
 CMAKE_ARGS+=	-DWITH_CPU_SIMD:BOOL=OFF
 .endif
 
 post-build:
 	@(cd ${WRKSRC}/doc/manpage && \
 		${PYTHON_CMD} blender.1.py \
 			--blender ${INSTALL_WRKSRC}/bin/blender \
 			--output ${INSTALL_WRKSRC}/bin/${PORTNAME}.1)
 
 post-install:
 	${INSTALL_MAN} ${INSTALL_WRKSRC}/bin/${PORTNAME}.1 \
 		${STAGEDIR}${MAN1PREFIX}/share/man/man1
 	# rename files to prevent conflict with other blender versions
 	${MV} ${STAGEDIR}${PREFIX}/share/blender \
 		${STAGEDIR}${PREFIX}/share/blender${PKGNAMESUFFIX}
 	${MV} ${STAGEDIR}${PREFIX}/share/doc/blender \
 		${STAGEDIR}${PREFIX}/share/doc/blender${PKGNAMESUFFIX}
 	${MV} ${STAGEDIR}${PREFIX}/bin/blender \
 		${STAGEDIR}${PREFIX}/bin/blender-bin${PKGNAMESUFFIX}
 	${INSTALL_SCRIPT} ${WRKDIR}/blender ${STAGEDIR}/${PREFIX}/bin/blender${PKGNAMESUFFIX}
 	${MV} ${STAGEDIR}${PREFIX}/bin/blender-thumbnailer.py \
 		${STAGEDIR}${PREFIX}/bin/blender${PKGNAMESUFFIX}-thumbnailer.py
 	${MV} ${STAGEDIR}${PREFIX}/share/man/man1/blender.1 \
 		${STAGEDIR}${PREFIX}/share/man/man1/blender${PKGNAMESUFFIX}.1
 	${MV} ${STAGEDIR}${PREFIX}/share/applications/blender.desktop \
 		${STAGEDIR}${PREFIX}/share/applications/blender${PKGNAMESUFFIX}.desktop
 	${MV} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/blender.svg \
 		${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/blender${PKGNAMESUFFIX}.svg
 	${MV} ${STAGEDIR}${PREFIX}/share/icons/hicolor/symbolic/apps/blender-symbolic.svg \
 		${STAGEDIR}${PREFIX}/share/icons/hicolor/symbolic/apps/blender${PKGNAMESUFFIX}-symbolic.svg
 
 post-install-DRACO-on:
 	# move draco pylib into site-packages
 	${MKDIR} ${STAGEDIR}/${PYTHON_SITELIBDIR}/
 	${INSTALL_LIB} ${INSTALL_WRKSRC}/lib/libextern_draco.so ${STAGEDIR}/${PYTHON_SITELIBDIR}/
 	${STRIP_CMD} ${STAGEDIR}/${PYTHON_SITELIBDIR}/libextern_draco.so
 	@${RM} -R ${STAGEDIR}/${DATADIR}/${DISTVERSION:R}/python
 
 post-install-MENU-on:
 	@-update-desktop-database -q
 
 .include <bsd.port.mk>
diff --git a/graphics/blender/Makefile b/graphics/blender/Makefile
index de3ae532ff9a..00244766cd08 100644
--- a/graphics/blender/Makefile
+++ b/graphics/blender/Makefile
@@ -1,231 +1,231 @@
 PORTNAME=	blender
 DISTVERSION=	3.4.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics multimedia
 MASTER_SITES=	http://download.blender.org/source/ \
 		http://mirror.cs.umn.edu/blender.org/source/ \
 		http://public.planetmirror.com/pub/blender/source/
 
 MAINTAINER=	FreeBSD@Shaneware.biz
 COMMENT=	3D modeling/rendering/animation package
 WWW=		https://www.blender.org/
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/doc/license/GPL3-license.txt
 
 NOT_FOR_ARCHS=	i386
 NOT_FOR_ARCHS_REASON=	uses 64bit atomic functions
 
 BUILD_DEPENDS=	${PYNUMPY}
 LIB_DEPENDS=	libpng.so:graphics/png \
 		libepoxy.so:graphics/libepoxy \
 		libfreetype.so:print/freetype2 \
 		libboost_regex.so:devel/boost-libs \
 		libzstd.so:archivers/zstd
 RUN_DEPENDS=	${PYNUMPY}
 # libboost_regex.so just acts as a placeholder; several boost
 # libraries are used, if either of the most common options in blender
 # are set. We will pull boost in just to be on the safe side.
 
 USES=		cmake compiler:c++17-lang cpe gl jpeg llvm:min=9 \
 		python:3.10 shebangfix tar:xz xorg
 USE_XORG=	x11 xext xfixes xmu xrender
 USE_GL=		gl glu glew
 
 CMAKE_OFF=	WITH_PYTHON_INSTALL \
 		WITH_PYTHON_INSTALL_NUMPY WITH_INSTALL_PORTABLE \
 		WITH_CYCLES_LOGGING WITH_USD
 
 SHEBANG_FILES=	release/scripts/modules/bl_i18n_utils/merge_po.py \
 		release/scripts/modules/bl_i18n_utils/utils_rtl.py \
 		release/scripts/modules/blend_render_info.py
 CFLAGS+=	${CFLAGS_${CHOSEN_COMPILER_TYPE}}
 CFLAGS_gcc=	-Wno-float-conversion
 CFLAGS_i386=	-march=i586
 CXXFLAGS_i386=	-march=i586
 
 PLIST_SUB+=	VER=${DISTVERSION:R}
 OPTIONS_SUB=	yes
 SUB_FILES=	blender
 
 .include "${.CURDIR}/Makefile.options"
 
 ALEMBIC_CMAKE_BOOL=		WITH_ALEMBIC
 ALEMBIC_LIB_DEPENDS=		libAlembic.so:graphics/alembic
 # note that this needs to be set to match alembics hdf5 option
 ALEMBIC_HDF5_REQUIRES=		ALEMBIC
 ALEMBIC_HDF5_CMAKE_BOOL=	WITH_ALEMBIC_HDF5
 ALEMBIC_HDF5_LIB_DEPENDS=	libhdf5.so:science/hdf5
 AVI_CMAKE_BOOL=			WITH_CODEC_AVI
 BULLET_CMAKE_BOOL=		WITH_BULLET
 CAMERATRACK_CMAKE_BOOL=		WITH_LIBMV WITH_SYSTEM_GLOG
 CAMERATRACK_LIB_DEPENDS=	libunwind.so:devel/libunwind \
 				libglog.so:devel/glog
 CAMERATRACK_ONLY_FOR_ARCHS=	i386 amd64 aarch64 powerpc64 powerpc64le
 CAMERATRACK_ONLY_FOR_ARCHS_REASON=	libunwind only supports x86/amd64/aarch64/powerpc64/powerpc64le
 CINEON_CMAKE_BOOL=		WITH_IMAGE_CINEON
 COLLADA_CMAKE_BOOL=		WITH_OPENCOLLADA
 COLLADA_LIB_DEPENDS=		libOpenCOLLADABaseUtils.so:graphics/opencollada \
 				libpcre.so:devel/pcre
 COLLADA_USE=			GNOME=libxml2
 COLLADA_USES=			gnome
 COMPOSITOR_CMAKE_BOOL=		WITH_COMPOSITOR
 CYCLES_IMPLIES=			OPENIMAGEIO TBB
 CYCLES_CMAKE_BOOL=		WITH_CYCLES
 CYCLESEMBR_IMPLIES=		CYCLES
 CYCLESEMBR_CMAKE_BOOL=		WITH_CYCLES_EMBREE
 CYCLESEMBR_LIB_DEPENDS=		libembree3.so:graphics/embree
 CYCLESEMBR_ONLY_FOR_ARCHS=	amd64
 CYCLESEMBR_ONLY_FOR_ARCHS_REASON=	embree only supports amd64
 CYCLESOSL_IMPLIES=		CYCLES
 CYCLESOSL_CMAKE_BOOL=		WITH_CYCLES_OSL WITH_LLVM
 CYCLESOSL_CMAKE_ON=		-DLLVM_STATIC:BOOL=OFF \
 				-DLLVM_CONFIG:STRING="${LOCALBASE}/bin/llvm-config${LLVM_VERSION}" \
 				-DOSL_SHADER_DIR:STRING="${LOCALBASE}/share/openshadinglanguage/shaders"
 CYCLESOSL_BUILD_DEPENDS=	llvm-config${LLVM_VERSION}:devel/llvm${LLVM_VERSION}
 CYCLESOSL_LIB_DEPENDS=		liboslcomp.so:graphics/openshadinglanguage
 CYCLESOSL_RUN_DEPENDS=		llvm-config${LLVM_VERSION}:devel/llvm${LLVM_VERSION}
 DDS_CMAKE_BOOL=			WITH_IMAGE_DDS
 DRACO_CMAKE_BOOL=		WITH_DRACO
 DRACO_USE=			LDCONFIG=${PYTHON_SITELIBDIR}
 EBOOL_CMAKE_BOOL=		WITH_GMP
 EBOOL_LIB_DEPENDS=		libgmp.so:math/gmp
 FFMPEG_CMAKE_BOOL=		WITH_CODEC_FFMPEG
 FFMPEG_LIB_DEPENDS=		libavutil.so:multimedia/ffmpeg \
 				libflite.so:audio/flite
 FFMPEG_LDFLAGS=			-L${LOCALBASE}/lib -lflite -lflite_cmu_us_kal -lflite_cmulex -lflite_usenglish
 FFTW3_CMAKE_BOOL=		WITH_FFTW3
 FFTW3_LIB_DEPENDS=		libfftw3.so:math/fftw3
 FRAMESERVER_CMAKE_BOOL=		WITH_IMAGE_FRAMESERVER
 FREESTYLE_CMAKE_BOOL=		WITH_FREESTYLE
 HARU_CMAKE_BOOL=		WITH_HARU
 HARU_LIB_DEPENDS=		libhpdf.so:print/libharu
 HDR_CMAKE_BOOL=			WITH_IMAGE_HDR
 HEADLESS_PREVENTS=		MENU XINPUT XF86VMODE
 HEADLESS_PREVENTS_MSG=		X11 options can't be used in headless mode
 HEADLESS_CMAKE_BOOL=		WITH_HEADLESS
 INPUT_NDOF_CMAKE_BOOL=		WITH_INPUT_NDOF
 JACK_CMAKE_BOOL=		WITH_JACK WITH_JACK_DYNLOAD
 JACK_LIB_DEPENDS=		libjack.so:audio/jack
 LZO_CMAKE_BOOL=			WITH_LZO
 LZMA_CMAKE_BOOL=		WITH_LZMA
 MENU_USES=			desktop-file-utils
 MOD_BOOLEAN_CMAKE_BOOL=		WITH_MOD_BOOLEAN
 MOD_FLUID_IMPLIES=		TBB
 MOD_FLUID_CMAKE_BOOL=		WITH_MOD_FLUID
 MOD_OCEANSIM_IMPLIES=		FFTW3
 MOD_OCEANSIM_CMAKE_BOOL=	WITH_MOD_OCEANSIM
 MOD_REMESH_CMAKE_BOOL=		WITH_MOD_REMESH
 MOD_SMOKE_CMAKE_BOOL=		WITH_MOD_SMOKE
 NLS_CMAKE_BOOL=			WITH_INTERNATIONAL
 # Use iconv:wchar_t to force the usage of iconv from ports.
 # libboost_locale.so uses libiconv_open, while we only provide
 # iconv_open in 10.x+
 NLS_USES=			gettext iconv:lib,wchar_t
 OPENAL_CMAKE_BOOL=		WITH_OPENAL
 OPENAL_USES=			openal:al,alut
 OPENCOLORIO_CMAKE_BOOL=		WITH_OPENCOLORIO
 OPENCOLORIO_LIB_DEPENDS=	libOpenColorIO.so:graphics/opencolorio \
 				libyaml-cpp.so:devel/yaml-cpp \
 				libtinyxml.so:textproc/tinyxml \
 				libexpat.so:textproc/expat2 \
 				libpystring.so:devel/pystring
 OPENEXR_CMAKE_BOOL=		WITH_IMAGE_OPENEXR
 OPENEXR_CFLAGS=			-I${LOCALBASE}/include/Imath
 OPENEXR_LIB_DEPENDS=		libImath.so:math/Imath \
 				libOpenEXR.so:graphics/openexr
 OPENIMAGEIO_IMPLIES=		OPENEXR TIFF PUGIXML
 OPENIMAGEIO_CMAKE_BOOL=		WITH_OPENIMAGEIO
 OPENIMAGEIO_LIB_DEPENDS=	libOpenImageIO.so:graphics/openimageio
 OPENIMAGEIO_LDFLAGS=		-lOpenImageIO_Util
 OPENIMAGEDN_IMPLIES=		TBB
 OPENIMAGEDN_CMAKE_BOOL=		WITH_OPENIMAGEDENOISE
 OPENIMAGEDN_LIB_DEPENDS=	libOpenImageDenoise.so:graphics/oidn
 OPENIMAGEDN_ONLY_FOR_ARCHS=	amd64
 OPENIMAGEDN_ONLY_FOR_ARCHS_REASON=	oidn only supports amd64
 OPENJPEG_CMAKE_BOOL=		WITH_IMAGE_OPENJPEG
 OPENJPEG_LIB_DEPENDS=		libopenjp2.so:graphics/openjpeg
 # openmp usually works on amd64
 OPENMP_CMAKE_BOOL=		WITH_OPENMP
 OPENPGL_ONLY_FOR_ARCHS=		amd64 armv6 armv7
 OPENPGL_ONLY_FOR_ARCHS_REASON=	requires supported SIMD ISA
 OPENPGL_CMAKE_BOOL=		WITH_CYCLES_PATH_GUIDING
 OPENPGL_LIB_DEPENDS=		libopenpgl.so:graphics/openpgl
 OPENSUBDIV_CMAKE_BOOL=		WITH_OPENSUBDIV
 OPENSUBDIV_LIB_DEPENDS=		libosdCPU.so:graphics/opensubdiv
 OPENVDB_IMPLIES=		TBB
 OPENVDB_CMAKE_BOOL=		WITH_OPENVDB WITH_OPENVDB_BLOSC
 OPENVDB_LIB_DEPENDS=		libblosc.so:archivers/c-blosc \
 				libopenvdb.so:misc/openvdb
 POTRACE_CMAKE_BOOL=		WITH_POTRACE
 POTRACE_LIB_DEPENDS=		libpotrace.so:graphics/libpotrace
 PUGIXML_CMAKE_BOOL=		WITH_PUGIXML
 PUGIXML_LIB_DEPENDS=		libpugixml.so:textproc/pugixml
 PULSEAUDIO_CMAKE_BOOL=		WITH_PULSEAUDIO WITH_PULSEAUDIO_DYNLOAD
 PULSEAUDIO_LIB_DEPENDS=		libpulse.so:audio/pulseaudio
 QUADRIFLOW_CMAKE_BOOL=		WITH_QUADRIFLOW
 RAYOPTIMIZATION_CMAKE_BOOL=	WITH_RAYOPTIMIZATION
 SDL_CMAKE_BOOL=			WITH_SDL WITH_SDL_DYNLOAD
 SDL_USE=			SDL=sdl2
 SDL_USES=			sdl
 SNDFILE_CMAKE_BOOL=		WITH_CODEC_SNDFILE
 SNDFILE_LIB_DEPENDS=		libsndfile.so:audio/libsndfile
 TBB_CMAKE_BOOL=			WITH_TBB
 TBB_LIB_DEPENDS=		libtbb.so:devel/onetbb
 THUMBNAILER_CMAKE_BOOL=		WITH_BLENDER_THUMBNAILER
 TIFF_CMAKE_BOOL=		WITH_IMAGE_TIFF
 TIFF_LIB_DEPENDS=		libtiff.so:graphics/tiff
 TRACE_CMAKE_BOOL=		WITH_POTRACE
 TRACE_LIB_DEPENDS=		libpotrace.so:graphics/libpotrace
 WAYLAND_CATEGORIES=		wayland
 WAYLAND_CMAKE_BOOL=		WITH_GHOST_WAYLAND
 WAYLAND_USES=			pkgconfig
 WAYLAND_BUILD_DEPENDS=		wayland-protocols>=1.15:graphics/wayland-protocols \
 				wayland>=1.12:graphics/wayland \
 				libdecor>0:x11-toolkits/libdecor
 WAYLAND_LIB_DEPENDS=		libxkbcommon.so:x11/libxkbcommon
 WEBP_CMAKE_BOOL=		WITH_IMAGE_WEBP
 WEBP_LIB_DEPENDS=		libwebp.so:graphics/webp
 XINPUT_CMAKE_BOOL=		WITH_X11_XINPUT
 XINPUT_USE=			XORG=xi
 XF86VMODE_CMAKE_BOOL=		WITH_X11_XF86VMODE
 XF86VMODE_USE=			XORG=xi,xxf86vm
 
 .if defined(WITH_DEBUG)
 CMAKE_ARGS+=		-DWITH_GHOST_DEBUG:BOOL=ON
 .endif
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} != amd64 && ${ARCH} != i386
 CMAKE_ARGS+=	-DWITH_CPU_SIMD:BOOL=OFF
 .endif
 
 post-patch:
 	${REINPLACE_CMD} -e 's|%%LLVM_VER%%|${LLVM_VERSION}|g' \
 		${WRKSRC}/intern/cycles/kernel/osl/CMakeLists.txt
 
 post-build:
 	@(cd ${WRKSRC}/doc/manpage && \
 		${PYTHON_CMD} blender.1.py \
 			--blender ${INSTALL_WRKSRC}/bin/blender \
 			--output ${INSTALL_WRKSRC}/bin/${PORTNAME}.1)
 
 post-install:
 	${INSTALL_MAN} ${INSTALL_WRKSRC}/bin/${PORTNAME}.1 \
 		${STAGEDIR}${MAN1PREFIX}/share/man/man1
 	${MV} ${STAGEDIR}/${PREFIX}/bin/blender ${STAGEDIR}/${PREFIX}/bin/blender-bin
 	${REINPLACE_CMD} -e 's|%%PYTHON_SITELIBDIR%%|${PYTHON_SITELIBDIR}|g' ${WRKDIR}/blender
 	${INSTALL_SCRIPT} ${WRKDIR}/blender ${STAGEDIR}/${PREFIX}/bin/blender
 
 post-install-DRACO-on:
 	# move draco pylib into site-packages
 	${MKDIR} ${STAGEDIR}/${PYTHON_SITELIBDIR}/
 	${INSTALL_LIB} ${INSTALL_WRKSRC}/lib/libextern_draco.so ${STAGEDIR}/${PYTHON_SITELIBDIR}/
 	${STRIP_CMD} ${STAGEDIR}/${PYTHON_SITELIBDIR}/libextern_draco.so
 	@${RM} -R ${STAGEDIR}/${DATADIR}/${DISTVERSION:R}/python
 
 post-install-MENU-on:
 	@-update-desktop-database -q
 
 .include <bsd.port.mk>
diff --git a/graphics/cimg/Makefile b/graphics/cimg/Makefile
index 694b75ff2c64..c49509077c08 100644
--- a/graphics/cimg/Makefile
+++ b/graphics/cimg/Makefile
@@ -1,141 +1,142 @@
 PORTNAME=	cimg
 DISTVERSIONPREFIX=	v.
 DISTVERSION=	3.2.3
+PORTREVISION=	1
 PORTEPOCH=	3
 CATEGORIES=	graphics devel
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	C++ Template Image Processing Library
 WWW=		https://cimg.eu/
 
 LICENSE=	CeCILL_C CeCILL
 LICENSE_COMB=	dual
 LICENSE_NAME_CeCILL_C=	CeCILL-C
 LICENSE_NAME_CeCILL=	CeCILL
 LICENSE_FILE_CeCILL_C=	${WRKSRC}/Licence_CeCILL-C_V1-en.txt
 LICENSE_FILE_CeCILL=	${WRKSRC}/Licence_CeCILL_V2-en.txt
 LICENSE_PERMS_CeCILL_C=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 LICENSE_PERMS_CeCILL=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	dtschump
 GH_PROJECT=	CImg
 
 BUILD_WRKSRC=	${WRKSRC}/examples
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDOCS} || ${PORT_OPTIONS:MEXAMPLES}
 USES+=		compiler:c11 gmake pkgconfig:build xorg
 .endif
 
 .if ${PORT_OPTIONS:MDOCS}
 
 .if !defined(WITHOUT_LAPACK)
 . if defined(WITH_ATLAS)
 USES+=		blaslapack:atlas
 . else
 USES+=		blaslapack
 . endif
 .endif
 
 REINPLACE_ARGS=	-i ""
 #LIB_DEPENDS+=	libboard.so:graphics/libboard
 
 . if !defined(WITH_DEBUG)
 LIB_DEPENDS+=	libcurl.so:ftp/curl			\
 		libpng.so:graphics/png			\
 		libtiff.so:graphics/tiff		\
 		libImath.so:math/Imath			\
 		libheif.so:graphics/libheif		\
 		libOpenEXR.so:graphics/openexr		\
 		libgimp-2.0.so:graphics/gimp-app	\
 		libfftw3.so:math/fftw3			\
 		libopencv_core.so:graphics/opencv	\
 		libGraphicsMagick.so:graphics/GraphicsMagick
 USES+=		jpeg
 ALL_TARGET=	Mlinux
 . else
 ALL_TARGET=	dlinux
 WITHOUT_MEDCON=	yes
 WITHOUT_FFMPEG=	yes
 WITHOUT_LAPACK=	yes
 . endif
 
 . if !defined(WITHOUT_MEDCON)
 RUN_DEPENDS+=	medcon:graphics/xmedcon
 . endif
 . if !defined(WITHOUT_FFMPEG)
 LIB_DEPENDS+=	libavformat.so:multimedia/ffmpeg
 . endif
 
 . if !defined(WITHOUT_LAPACK)
 # Don't really need Fortran, but required to link with blas/lapack
 USES+=	fortran
 . endif
 
 USE_XORG+=	x11 xrandr
 . if defined(WITH_XSHM)
 USE_XORG+=	xext
 . endif
 
 DOCBASE=	README.txt
 CFLAGS+=	-I${LOCALBASE}/include/Imath -I${LOCALBASE}/include/OpenEXR
 MAKE_ARGS+=	CPPFLAGS="${CFLAGS}" FREEBSD_LDFLAGS="${LDFLAGS}"
 PROGS=		CImg_demo captcha curve_editor2d dtmri_view3d			\
 	edge_explorer2d fade_images gaussian_fit1d generate_loop_macros		\
 	hough_transform2d image2ascii image_registration2d image_surface3d	\
 	jawbreaker mcf_levelsets2d mcf_levelsets3d odykill			\
 	pde_TschumperleDeriche2d pde_heatflow2d plotter1d radon_transform2d	\
 	scene3d spherical_function3d tetris tron tutorial use_RGBclass		\
 	use_chlpca use_draw_gradient use_jpeg_buffer use_nlmeans use_skeleton	\
 	wavelet_atrous
 .else
 NO_BUILD=	yes
 .endif
 
 .include <bsd.port.pre.mk>
 
 pre-configure-DOCS-on:
 	${REINPLACE_CMD} -e 's|make|${MAKE_CMD}|' ${BUILD_WRKSRC}/Makefile
 
 pre-configure-DOCS-off:
 	${REINPLACE_CMD} -e 's|^OPTFLAGS|#OPTFLAGS|' ${BUILD_WRKSRC}/Makefile
 
 pre-configure:
 . if !defined(WITHOUT_FFMPEG)
 	${REINPLACE_CMD} -e 's|#FFMPEG_CFLAGS|FFMPEG_CFLAGS|'	\
 		-e 's|#FFMPEG_DEFINE|FFMPEG_DEFINE|'		\
 		-e 's|#FFMPEG_LIBS|FFMPEG_LIBS|'		\
 		${BUILD_WRKSRC}/Makefile
 . endif
 . if !defined(WITHOUT_LAPACK)
 	${REINPLACE_CMD} -e 's|#LAPACK_CFLAGS|LAPACK_CFLAGS|'			\
 		-e 's|#LAPACK_DEFINE|LAPACK_DEFINE|'				\
 		-e 's|#LAPACK_LIBS|LAPACK_LIBS|'				\
 		-e 's|-lblas -llapack|-L${LOCALBASE}/lib ${BLASLIB} ${LAPACKLIB}|'	\
 		${BUILD_WRKSRC}/Makefile
 . endif
 . if defined(WITH_XSHM)
 	${REINPLACE_CMD} -e 's|XSHM_CFLAGS = #|XSHM_CFLAGS =|'	\
 		-e 's|XSHM_LDFLAGS = #|XSHM_LDFLAGS =|'		\
 		${BUILD_WRKSRC}/Makefile
 . endif
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/CImg.h ${STAGEDIR}${PREFIX}/include
 
 do-install-DOCS-on:
 	${INSTALL_PROGRAM} ${PROGS:C|^|${BUILD_WRKSRC}/|} ${STAGEDIR}${PREFIX}/bin
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${DOCBASE:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 do-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${CP} -R ${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR}
 	@(cd ${STAGEDIR}${EXAMPLESDIR} && ${MAKE_CMD} clean)
 	@${RM} ${STAGEDIR}${EXAMPLESDIR}/*.orig
 
 .include <bsd.port.post.mk>
diff --git a/graphics/cloudcompare/Makefile b/graphics/cloudcompare/Makefile
index 1596606bff82..1a9506b290d5 100644
--- a/graphics/cloudcompare/Makefile
+++ b/graphics/cloudcompare/Makefile
@@ -1,92 +1,92 @@
 PORTNAME=	cloudcompare
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.12.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 
 MAINTAINER=	nc@FreeBSD.org
 COMMENT=	3D point cloud processing software
 WWW=		https://www.cloudcompare.org/
 
 LICENSE=	GPLv2+ LGPL20+
 LICENSE_COMB=	multi
 
 USES=		cmake compiler:c++11-lang localbase:ldflags qt:5
 USE_GITHUB=	yes
 GH_ACCOUNT=	CloudCompare
 GH_PROJECT=	${GH_ACCOUNT}
 GH_TUPLE=	CloudCompare:CCCoreLib:f0d5450:CloudCompare/libs/qCC_db/extern/CCCoreLib
 
 USE_QT=		concurrent core gui opengl printsupport widgets buildtools:build qmake:build svg linguisttools:build
 USE_LDCONFIG=	yes
 
 # PDAL support disabled ATM
 # plugins/core/IO/qPDALIO/src/LASFilter.cpp:1360:24: error: no member named 'incompatibleSrs' in 'pdal::LasHeader'
 OPTIONS_DEFINE=	DXFLIB GAMEPAD GDAL PLUGINS SHAPELIB
 OPTIONS_DEFAULT=DXFLIB GAMEPAD GDAL PLUGINS SHAPELIB
 OPTIONS_SUB=	yes
 
 DXFLIB_DESC=	Enable AutoCAD DXF file support
 GAMEPAD_DESC=	Enable Qt gamepad support
 GDAL_DESC=	Enable raster file support
 PDAL_DESC=	Enable point cloud data support
 SHAPELIB_DESC=	Enable shape file support
 
 DXFLIB_CMAKE_BOOL=	OPTION_USE_DXF_LIB
 
 GAMEPAD_USE=		QT=gamepad
 GAMEPAD_CMAKE_BOOL=	OPTION_SUPPORT_GAMEPADS
 
 GDAL_CMAKE_BOOL=	OPTION_USE_GDAL
 GDAL_CMAKE_ON=		-DGDAL_INCLUDE_DIR=${PREFIX}/include \
 			-DGDAL_LIBRARY=${PREFIX}/lib/libgdal.so
 GDAL_LIB_DEPENDS=	libgdal.so:graphics/gdal
 
 PDAL_CMAKE_BOOL=	PLUGIN_IO_QPDAL
 PDAL_CMAKE_ON=		-DJSON_ROOT_DIR=${PREFIX}/include/jsoncpp
 PDAL_LIB_DEPENDS=	libpdal_base.so:math/pdal
 
 SHAPELIB_CMAKE_BOOL=	OPTION_USE_SHAPE_LIB
 SHAPELIB_LIB_DEPENDS=	libshp.so:devel/shapelib
 
 PLUGINS_USES=		eigen:3 gl jpeg xorg
 PLUGINS_CMAKE_BOOL=	PLUGIN_STANDARD_QANIMATION	\
 			PLUGIN_STANDARD_QBROOM		\
 			PLUGIN_STANDARD_QCOMPASS	\
 			PLUGIN_STANDARD_QCSF		\
 			PLUGIN_IO_QCSV_MATRIX		\
 			PLUGIN_GL_QEDL			\
 			PLUGIN_STANDARD_QFACETS		\
 			PLUGIN_STANDARD_QHPR		\
 			PLUGIN_STANDARD_QM3C2		\
 			PLUGIN_STANDARD_QPCV		\
 			PLUGIN_IO_QPHOTOSCAN		\
 			PLUGIN_STANDARD_QRANSAC_SD	\
 			PLUGIN_STANDARD_QSRA		\
 			PLUGIN_GL_QSSAO # plugins requiring rare external libs are left out, TODO maybe add some of them?
 PLUGINS_CMAKE_ON=	-DEIGEN_ROOT_DIR:BOOL=${LOCALBASE}/include/eigen3
 PLUGINS_CXXFLAGS=	${PLUGINS_CXXFLAGS_${CHOSEN_COMPILER_TYPE}}
 PLUGINS_CXXFLAGS_clang=	-Wno-narrowing
 PLUGINS_CXXFLAGS+=	-DEIGEN_DONT_PARALLELIZE # OpenMP is broken in cmake: see bug#223678
 PLUGINS_USE=		XORG=ice,sm,x11,xext,xt GL=gl,glu
 PLUGINS_LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 			libexpat.so:textproc/expat2 \
 			libflann_cpp.so:math/flann \
 			libfreetype.so:print/freetype2 \
 			libpng.so:graphics/png \
 			libtiff.so:graphics/tiff \
 			libvtkCommonCore-${VTK_VER}.so:math/vtk${VTK_VER:R}
 PLUGINS_IMPLIES=	SHAPELIB
 
 pre-configure:
 	@${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},1' ${WRKSRC}/snap/gui/ccViewer.desktop ${WRKSRC}/snap/gui/cloudcompare.desktop
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps
 	${INSTALL_DATA} ${WRKSRC}/snap/gui/ccViewer.desktop ${STAGEDIR}${PREFIX}/share/applications
 	${INSTALL_DATA} ${WRKSRC}/snap/gui/ccViewer.png ${STAGEDIR}${PREFIX}/share/pixmaps
 	${INSTALL_DATA} ${WRKSRC}/snap/gui/cloudcompare.desktop ${STAGEDIR}${PREFIX}/share/applications
 	${INSTALL_DATA} ${WRKSRC}/snap/gui/cloudcompare.png ${STAGEDIR}${PREFIX}/share/pixmaps
 
 .include <../../math/vtk9/Makefile.version>
 .include <bsd.port.mk>
diff --git a/graphics/colmap/Makefile b/graphics/colmap/Makefile
index 710a80484797..5e049063c6c5 100644
--- a/graphics/colmap/Makefile
+++ b/graphics/colmap/Makefile
@@ -1,86 +1,87 @@
 PORTNAME=	colmap
 DISTVERSION=	3.8
+PORTREVISION=	1
 CATEGORIES=	graphics
 
 MAINTAINER=	fuz@FreeBSD.org
 COMMENT=	Structure from motion and multi-view stereo
 WWW=		https://colmap.github.io/
 
 LICENSE=	BSD2CLAUSE BSD3CLAUSE CC-BY-3.0 GPLv3+ MIT SIFTGPU
 LICENSE_COMB=	multi
 LICENSE_NAME_SIFTGPU=	SiftGPU non-commercial license
 LICENSE_FILE_BSD2CLAUSE=	${WRKSRC}/lib/VLFeat/LICENSE
 LICENSE_FILE_BSD3CLAUSE=	${WRKSRC}/COPYING.txt # also FLANN
 LICENSE_FILE_CC-BY-3.0=	${WRKSRC}/src/ui/media/LICENSE
 LICENSE_FILE_GPLv3+ =	${WRKSRC}/lib/PBA/LICENSE # also Graclus, LSD
 LICENSE_FILE_MIT=	${WRKSRC}/lib/PoissonRecon/LICENSE
 LICENSE_FILE_SIFTGPU=	${WRKSRC}/lib/SiftGPU/LICENSE
 LICENSE_PERMS_SIFTGPU=	dist-mirror pkg-mirror auto-accept
 
 LIB_DEPENDS=	libboost_filesystem.so:devel/boost-libs \
 		libceres.so:math/ceres-solver \
 		libflann.so:math/flann \
 		libfreeimage.so:graphics/freeimage \
 		libglog.so:devel/glog \
 		liblz4.so:archivers/liblz4 \
 		libmetis.so:math/metis
 
 USES=		cmake compiler:${OPENMP}c++11-lib desktop-file-utils eigen:3 gl \
 		localbase python:env qt:5 sqlite
 USE_GITHUB=	yes
 USE_GL=		gl glew
 USE_QT=		core gui widgets buildtools:build opengl:build qmake:build
 EXCLUDE=	SQLite
 CMAKE_OFF=	BOOST_STATIC CUDA_ENABLED
 TEST_TARGET=	test
 
 LDFLAGS+=	-Wl,--as-needed # gflags, glu, xi, xmu
 
 EXTRACT_AFTER_ARGS=	${EXCLUDE:S,^,--exclude lib/,}
 
 OPTIONS_DEFINE=		CGAL DOCS OPENMP SIMD TEST
 OPTIONS_DEFAULT=	CGAL OPENMP SIMD
 
 CGAL_DESC=		Graph-cut on Delaunay triangulation based meshing algorithm
 CGAL_BUILD_DEPENDS=	cgal>0:math/cgal
 CGAL_LIB_DEPENDS=	libgmp.so:math/gmp
 CGAL_CMAKE_BOOL=	CGAL_ENABLED
 
 DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR} \
 			gmake:devel/gmake \
 			sphinx-build:textproc/py-sphinx
 DOCS_PORTDOCS=		*
 
 OPENMP_CMAKE_BOOL=	OPENMP_ENABLED
 .if !exists(/usr/include/omp.h)
 # XXX ports/199603: LLVM openmp in base doesn't support armv6, armv7 yet
 OPENMP_VARS=		OPENMP=gcc-
 .endif
 
 SIMD_CMAKE_BOOL=	SIMD_ENABLED
 
 TEST_CMAKE_BOOL=	TESTS_ENABLED
 
 post-patch:
 # XXX math/flann has -DUSE_OPENMP=OFF and lacks tunning:
 # https://github.com/colmap/colmap/commit/4b594eb85c13
 # https://github.com/colmap/colmap/commit/1e9f1f3324cd
 .if !defined(DISPLAY) # QApplication
 	@${REINPLACE_CMD} -e '/opengl_utils_test/d' \
 		${WRKSRC}/src/util/CMakeLists.txt
 .endif
 
 post-build-DOCS-on:
 	@${SETENV} ${MAKE_ENV} ${GMAKE} ${_MAKE_JOBS} html -C${WRKSRC}/doc
 
 pre-install-TEST-on: do-test
 
 post-install:
 # XXX Clean up garbage after install(DIRECTORY)
 	@${FIND} ${STAGEDIR}${PREFIX}/include -type d -empty -delete
 
 post-install-DOCS-on:
 	(cd ${WRKSRC}/doc/_build/html && ${COPYTREE_SHARE} \
 		"${PORTDOCS}" ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
diff --git a/graphics/darktable/Makefile b/graphics/darktable/Makefile
index ce9c5799896f..3ce91c789fbd 100644
--- a/graphics/darktable/Makefile
+++ b/graphics/darktable/Makefile
@@ -1,132 +1,132 @@
 PORTNAME=	darktable
 PORTVERSION=	4.2.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	https://github.com/darktable-org/${PORTNAME}/releases/download/release-${PORTVERSION:C/\.rc/rc/}/
 
 MAINTAINER=	dumbbell@FreeBSD.org
 COMMENT=	Virtual lighttable and darkroom for photographers
 WWW=		https://www.darktable.org/
 
 LICENSE=	GPLv3
 
 ONLY_FOR_ARCHS=		aarch64 amd64 powerpc64le
 ONLY_FOR_ARCHS_REASON=	uses 64-bit address space
 
 BUILD_DEPENDS=	iso-codes>=0:misc/iso-codes \
 		p5-Pod-Parser>=0:textproc/p5-Pod-Parser \
 		po4a-translate:textproc/po4a \
 		xsltproc:textproc/libxslt \
 		bash:shells/bash
 LIB_DEPENDS=	libavif.so:graphics/libavif \
 		libcolord-gtk.so:graphics/colord-gtk \
 		libcolord.so:graphics/colord \
 		libcurl.so:ftp/curl \
 		libexiv2.so:graphics/exiv2 \
 		libgphoto2.so:graphics/libgphoto2 \
 		libharfbuzz.so:print/harfbuzz \
 		libheif.so:graphics/libheif \
 		libicui18n.so:devel/icu \
 		libImath.so:math/Imath \
 		libjasper.so:graphics/jasper \
 		libjson-glib-1.0.so:devel/json-glib \
 		libjxl_threads.so:graphics/libjxl \
 		liblcms2.so:graphics/lcms2 \
 		liblensfun.so:graphics/lensfun \
 		libOpenEXR.so:graphics/openexr \
 		libopenjp2.so:graphics/openjpeg \
 		libosmgpsmap-1.0.so:x11-toolkits/osm-gps-map \
 		libpng.so:graphics/png \
 		libpugixml.so:textproc/pugixml \
 		libsoup-2.4.so:devel/libsoup \
 		libtiff.so:graphics/tiff \
 		libwebp.so:graphics/webp
 
 USES=		cmake compiler:gcc-c++11-lib desktop-file-utils gl gnome jpeg \
 		llvm:14,build lua:54 perl5 pkgconfig sdl shebangfix sqlite \
 		tar:xz xorg
 USE_GL=		gl
 USE_GNOME=	cairo gtk30 intltool librsvg2 libxml2
 USE_LDCONFIG=	${PREFIX}/lib/${PORTNAME}
 USE_SDL=	sdl2
 USE_XORG=	ice sm x11 xext xrandr
 
 SHEBANG_FILES=	tools/*.sh
 
 USE_GCC=	yes
 
 CMAKE_ARGS+=	-DBINARY_PACKAGE_BUILD=1
 
 CMAKE_BOOL+=	BUILD_CMSTEST USE_AVIF USE_CAMERA_SUPPORT USE_HEIF \
 		USE_KWALLET USE_LUA USE_MAP USE_OPENEXR USE_OPENJPEG \
 		USE_WEBP RAWSPEED_ENABLE_LTO
 
 CFLAGS+=	-fopenmp -I${LOCALBASE}/include/Imath
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:C/\.rc/~rc/}
 
 OPTIONS_DEFINE=		DOCS GMIC GRAPHMAGICK LIBSECRET NLS PRINT TOOLS
 OPTIONS_DEFAULT=	PRINT
 OPTIONS_SUB=		yes
 
 GMIC_DESC=		Support G'Mic-compressed LUT in lut3d
 LIBSECRET_DESC=		Support libsecret as password backend
 TOOLS_DESC=		Install additional scripts
 
 GMIC_LIB_DEPENDS=	libgmic.so:graphics/gmic
 GMIC_CMAKE_BOOL=	USE_GMIC
 
 GRAPHMAGICK_LIB_DEPENDS=libGraphicsMagick.so:graphics/GraphicsMagick
 GRAPHMAGICK_CMAKE_BOOL=	USE_GRAPHICSMAGICK
 
 LIBSECRET_LIB_DEPENDS=	libsecret-1.so:security/libsecret
 LIBSECRET_CMAKE_BOOL=	USE_LIBSECRET
 
 # FIXME: Even with NLS turned off, darktable(1) is still linked to
 # libintl.so.
 NLS_USES=		gettext
 NLS_USES_OFF=		gettext-runtime
 NLS_CMAKE_BOOL=		USE_NLS
 NLS_LDFLAGS=		-L${LOCALBASE}/lib -lintl
 
 PRINT_LIB_DEPENDS=	libcups.so:print/cups
 PRINT_CMAKE_BOOL=	BUILD_PRINT
 
 TOOLS_BUILD_DEPENDS=	exiftool:graphics/p5-Image-ExifTool
 TOOLS_RUN_DEPENDS=	exiftool:graphics/p5-Image-ExifTool
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == aarch64
 CMAKE_ARGS+=	-DUSE_OPENCL:BOOL=OFF
 CXXFLAGS+=	-DGDK_DISABLE_DEPRECATED
 PLIST_SUB+=	NO_OPENCL="@comment "
 .else
 PLIST_SUB+=	NO_OPENCL=""
 .endif
 
 .include <bsd.port.pre.mk>
 
 # work around CMAKE/CCACHE flaw (cmake stomps over ccache)
 .if "${WITH_CCACHE_BUILD}" == "yes" && !defined(NO_CCACHE)
 CMAKE_ARGS+=	-DCMAKE_C_COMPILER_LAUNCHER=${CCACHE_BIN} \
 		-DCMAKE_CXX_COMPILER_LAUNCHER=${CCACHE_BIN}
 .endif
 
 .if defined(WITH_DEBUG)
 CMAKE_BUILD_TYPE=	RelWithDebInfo
 STRIP=
 .endif
 
 # darktable defines the __XOPEN_SOURCE preprocessor macro, which
 # restricts symbol visibility on FreeBSD and causes compilation failures
 # on, for instance, the cups_print module, because u_char remains
 # undefined. Remove _XOPEN_SOURCE maro definitions.
 post-patch:
 	${REINPLACE_CMD} '/add_definitions."-D_XOPEN_SOURCE=.*"/d' ${WRKSRC}/CMakeLists.txt
 
 post-install-TOOLS-off:
 	@${RM} -f ${STAGEDIR}${DATADIR}/tools/extract_wb_from_images.sh
 
 .include <bsd.port.post.mk>
diff --git a/graphics/dataplot/Makefile b/graphics/dataplot/Makefile
index ac79e4d8ed79..4423a8b41ece 100644
--- a/graphics/dataplot/Makefile
+++ b/graphics/dataplot/Makefile
@@ -1,48 +1,49 @@
 PORTNAME=	dataplot
 DISTVERSION=	20210713
+PORTREVISION=	1
 CATEGORIES=	graphics
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Free software system for statistical visualization
 WWW=		https://www.itl.nist.gov/div898/software/dataplot/index.htm
 
 LICENSE=	PD
 
 LIB_DEPENDS=	libgd.so:graphics/gd \
 		libpng.so:graphics/png
 
 USES=		gmake gnome fortran jpeg readline xorg
 USE_XORG=	x11 xi
 USE_GNOME=	cairo
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	usnistgov
 GH_TAGNAME=	d5eb15dd86dd80098c6535aa68898ab8392ab700
 
 WRKSRC_SUBDIR=	src
 
 MAXOBV?=	450000	# Change if you need more observations/variable
 
 FFLAGS+=	-DLINUX -fdefault-real-8 -fdefault-double-8 -std=legacy
 
 PORTDATA=	*
 
 PLIST_FILES=	bin/dataplot bin/xdataplot
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${REINPLACE_CMD} -e 's/MAXOBV=1500000/MAXOBV=${MAXOBV}/' \
 		${WRKSRC}/DPCOPA.INC
 	@${REINPLACE_CMD} \
 		-e 's;%%FC%%;${FC};' \
 		-e 's;%%CC%%;${CC};' \
 		-e 's;%%FFLAGS%%;${FFLAGS};' \
 		-e 's;%%CFLAGS%%;${CFLAGS};' \
 		-e 's;%%DATADIR%%;${DATADIR};' \
 		-e 's;%%LOCALBASE%%;${LOCALBASE};g' ${WRKSRC}/Makefile
 
 post-build:
 	@${STRIP_CMD} ${WRKSRC}/dataplot
 
 .include <bsd.port.mk>
diff --git a/graphics/dbow2/Makefile b/graphics/dbow2/Makefile
index 6de9dd8fe5c9..e313466ebf22 100644
--- a/graphics/dbow2/Makefile
+++ b/graphics/dbow2/Makefile
@@ -1,27 +1,27 @@
 PORTNAME=	dbow2
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.1-free-23
 DISTVERSIONSUFFIX=	-g3924753
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	C++ Library for converting images into a bag-of-word representation
 WWW=		https://github.com/dorian3d/DBoW2
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 LIB_DEPENDS=	libopencv_photo.so:graphics/opencv \
 		libopencv_core.so:graphics/opencv
 
 USES=		cmake compiler:c++11-lang
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	dorian3d
 GH_PROJECT=	DBoW2
 
 CMAKE_OFF=	BUILD_Demo
 
 .include <bsd.port.mk>
diff --git a/graphics/dcp2icc/Makefile b/graphics/dcp2icc/Makefile
index 7170c87c47aa..efc09c0eb2f0 100644
--- a/graphics/dcp2icc/Makefile
+++ b/graphics/dcp2icc/Makefile
@@ -1,39 +1,39 @@
 PORTNAME=	dcp2icc
 PORTVERSION=	0.1
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	graphics converters
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/Version%20${PORTVERSION}
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	DCP to ICC camera profile converter
 WWW=		https://sourceforge.net/projects/dcp2icc/
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libexpat.so:textproc/expat2 \
 		liblcms.so:graphics/lcms
 
 USES=		localbase:ldflags scons tar:bzip2
 USE_GCC=	yes	# segfaults on exit when built with Clang
 
 PLIST_FILES=	bin/${PORTNAME}
 
 post-extract:
 	@${UNZIP_NATIVE_CMD} -qo ${WRKSRC}/XMP-Toolkit-SDK-4.4.2.zip \
 		-d ${WRKSRC}
 	@${UNZIP_NATIVE_CMD} -qo ${WRKSRC}/dng_sdk_1_2.zip -d ${WRKSRC}
 
 post-patch:
 	@${MV} -f ${WRKSRC}/fixes/XMP-Toolkit/XMPFiles.hpp \
 		${WRKSRC}/XMP-Toolkit-SDK-4.4.2/source/XMPFiles
 	@${MV} -f ${WRKSRC}/fixes/XMP-Toolkit/LargeFileAccess.hpp \
 		${WRKSRC}/XMP-Toolkit-SDK-4.4.2/source/common
 	@${MV} -f ${WRKSRC}/fixes/dng_sdk/dng_hue_sat_map.h \
 		${WRKSRC}/dng_sdk_1_2/dng_sdk/source
 	@${REINPLACE_CMD} -e '/mimetype/s,delete,&[],' \
 		${WRKSRC}/XMP-Toolkit-SDK-4.4.2/source/XMPFiles/FileHandlers/UCF_Handler.cpp
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/graphics/derelict-gl3/Makefile b/graphics/derelict-gl3/Makefile
index 2c8762b720ac..c2b8f9a73a51 100644
--- a/graphics/derelict-gl3/Makefile
+++ b/graphics/derelict-gl3/Makefile
@@ -1,38 +1,38 @@
 PORTNAME=	derelict-gl3
 PORTVERSION=	1.0.24
-PORTREVISION=	4
+PORTREVISION=	5
 DISTVERSIONPREFIX=	v
 CATEGORIES=	graphics
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Dynamic binding to OpenGL for the D Programming Language
 WWW=		https://github.com/DerelictOrg/DerelictGL3
 
 LICENSE=	BSL
 
 BUILD_DEPENDS=	ldmd2:lang/ldc \
 		dub:devel/dub \
 		${LOCALBASE}/lib/d/libDerelictUtil.a:devel/derelict-util
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	DerelictOrg
 GH_PROJECT=	DerelictGL3
 
 DUB_CMD=	${LOCALBASE}/bin/dub build --build=release
 D_INCLUDE_DIR=	${PREFIX}/include/d
 D_LIB_DIR=	${PREFIX}/lib/d
 DC=		${PREFIX}/bin/ldmd2
 
 post-patch:
 	@${REINPLACE_CMD} -e '13,15d' ${WRKSRC}/dub.json
 
 do-build:
 	@cd ${WRKSRC} && DC=${DC} ${DUB_CMD}
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${D_INCLUDE_DIR}
 	@${MKDIR} ${STAGEDIR}${D_LIB_DIR}
 	${INSTALL_DATA} ${WRKSRC}/lib/libDerelictGL3.a ${STAGEDIR}${D_LIB_DIR}
 	cd ${WRKSRC}/source && ${COPYTREE_SHARE} . ${STAGEDIR}${D_INCLUDE_DIR} "-name *\.d"
 
 .include <bsd.port.mk>
diff --git a/graphics/digikam/Makefile b/graphics/digikam/Makefile
index 5041030ff12d..2b2c8a2c9819 100644
--- a/graphics/digikam/Makefile
+++ b/graphics/digikam/Makefile
@@ -1,106 +1,107 @@
 PORTNAME=	digikam
 DISTVERSION=	7.10.0
+PORTREVISION=	1
 CATEGORIES=	graphics kde
 MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTVERSION}
 DIST_SUBDIR=	KDE/${PORTNAME}/${PORTVERSION}
 # One bit changed in the naming convention ..
 DISTFILES=	digiKam-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}${EXTRACT_SUFX}
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE digital photo management application
 WWW=		https://www.digikam.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libKF5Sane.so:graphics/libksane \
 		libboost_graph.so:devel/boost-libs \
 		libexiv2.so:graphics/exiv2 \
 		libexpat.so:textproc/expat2 \
 		libgphoto2.so:graphics/libgphoto2 \
 		libicalss.so:devel/libical \
 		libjasper.so:graphics/jasper \
 		liblcms2.so:graphics/lcms2 \
 		liblensfun.so:graphics/lensfun \
 		liblqr-1.so:graphics/liblqr-1 \
 		libopencv_core.so:graphics/opencv \
 		libheif.so:graphics/libheif \
 		libpgf.so:graphics/libpgf \
 		libpng.so:graphics/png \
 		libtiff.so:graphics/tiff \
 		libx265.so:multimedia/x265
 
 USES=		bison cmake compiler:c++11-lib desktop-file-utils eigen:3 gl \
 		gnome jpeg kde:5 magick pkgconfig qt:5 shebangfix tar:xz xorg
 USE_GL=		gl glu
 USE_GNOME=	glib20 libxml2 libxslt
 USE_KDE=	archive auth bookmarks calendarcore codecs completion config \
 		configwidgets coreaddons crash doctools ecm filemetadata \
 		guiaddons i18n iconthemes itemmodels itemviews jobwidgets kdelibs4support \
 		kio marble libkipi notifications notifyconfig parts service \
 		solid sonnet textwidgets threadweaver unitconversion \
 		widgetsaddons windowsystem xmlgui
 USE_QT=		concurrent core dbus declarative gui location network opengl \
 		printsupport sql webchannel widgets x11extras xml xmlpatterns \
 		sql-sqlite3:run \
 		buildtools:build qmake:build
 USE_XORG=	ice sm x11 xext
 
 USE_LDCONFIG=	yes
 SHEBANG_FILES=	core/data/scripts/digitaglinktree/digitaglinktree
 
 WITH_CCACHE_BUILD=	yes
 
 # Disable kipiplugins, as they are built in their own port: graphics/kipiplugins.
 # Remember to keep that port in sync with this one.
 CMAKE_ON=	BUILD_WITH_CCACHE DIGIKAMSC_COMPILE_DIGIKAM ENABLE_KFILEMETADATASUPPORT
 
 OPTIONS_DEFINE=		DOCS DOXYGEN KDEPIM KVKONTAKTE MEDIAPLAYER MYSQL NLS WEBENGINE
 OPTIONS_DEFAULT=	${OPTIONS_DEFINE:NWEBENGINE}
 OPTIONS_SUB=		yes
 
 DOCS_DESC=		Digikam documentation
 DOCS_CMAKE_BOOL=	DIGIKAMSC_COMPILE_DOC
 DOCS_USES=		gettext
 DOCS_USE=		KDE=doctools
 
 DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
 DOXYGEN_IMPLIES=	DOCS
 
 KDEPIM_DESC=		KDEPim Addressbook support
 KDEPIM_USE=		KDE=akonadi,akonadicontacts,contacts,grantleetheme
 KDEPIM_USES=		grantlee:5
 KDEPIM_CMAKE_BOOL=	ENABLE_AKONADICONTACTSUPPORT
 KDEPIM_CMAKE_BOOL_OFF=	CMAKE_DISABLE_FIND_PACKAGE_KF5AkonadiContact
 
 MEDIAPLAYER_DESC=	Enable mediaplayer
 MEDIAPLAYER_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg \
 				libQtAV.so:multimedia/QtAV
 MEDIAPLAYER_CMAKE_BOOL=		ENABLE_MEDIAPLAYER
 MEDIAPLAYER_CMAKE_BOOL_OFF=	CMAKE_DISABLE_FIND_PACKAGE_FFmpeg \
 				CMAKE_DISABLE_FIND_PACKAGE_QtAV
 
 MYSQL_USES=		mysql:server
 MYSQL_USE=		QT=sql-mysql:run
 MYSQL_CMAKE_BOOL=	ENABLE_INTERNALMYSQL \
 			ENABLE_MYSQLSUPPORT
 MYSQL_CMAKE_ON=		-DMYSQLD_PATH:PATH=${LOCALBASE}/libexec \
 			-DMYSQL_TOOLS_PATH:PATH=${LOCALBASE}/bin
 
 KVKONTAKTE_DESC=	vk.com Plugin
 KVKONTAKTE_LIB_DEPENDS=	libKF5Vkontakte.so:net/libkvkontakte
 KVKONTAKTE_CMAKE_BOOL_OFF=	CMAKE_DISABLE_FIND_PACKAGE_KF5Vkontakte
 
 NLS_DESC=		Digikam i18n translations
 NLS_CMAKE_BOOL=		DIGIKAMSC_COMPILE_PO
 NLS_USES=		gettext
 NLS_USE=		KDE=i18n
 
 WEBENGINE_DESC=		Use Qt WebEngine instead of WebKit
 WEBENGINE_USE=		QT=webengine
 WEBENGINE_USE_OFF=	QT=webkit
 WEBENGINE_CMAKE_BOOL=	ENABLE_QWEBENGINE
 
 PLIST_SUB=		SHLIB_VER=${DISTVERSION}
 
 .include <bsd.port.mk>
diff --git a/graphics/elastix/Makefile b/graphics/elastix/Makefile
index c696db38210e..e38a4b04429f 100644
--- a/graphics/elastix/Makefile
+++ b/graphics/elastix/Makefile
@@ -1,29 +1,30 @@
 PORTNAME=	elastix
 DISTVERSION=	5.1.0
+PORTREVISION=	1
 CATEGORIES=	graphics
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Image registration toolbox
 WWW=		https://elastix.lumc.nl/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libdouble-conversion.so:devel/double-conversion \
 		libgdcmCommon.so:devel/gdcm \
 		libhdf5.so:science/hdf5 \
 		libITKCommon-${ITK_VER}.so:science/InsightToolkit \
 		libvnl.so:misc/vxl
 
 USES=		cmake:testing compiler:c++14-lang eigen:3
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	SuperElastix
 
 CMAKE_ON=	ELASTIX_USE_EIGEN
 
 CXXFLAGS+=	-I${LOCALBASE}/include/double-conversion
 
 .include <../../science/InsightToolkit/Makefile.version>
 .include <bsd.port.mk>
diff --git a/graphics/enblend/Makefile b/graphics/enblend/Makefile
index 309240242640..e3b6bb8c404a 100644
--- a/graphics/enblend/Makefile
+++ b/graphics/enblend/Makefile
@@ -1,51 +1,51 @@
 PORTNAME=	enblend
 PORTVERSION=	4.2
-PORTREVISION=	20
+PORTREVISION=	21
 CATEGORIES=	graphics
 MASTER_SITES=	SF/enblend/enblend-enfuse/enblend-enfuse-${PORTVERSION}
 DISTNAME=	enblend-enfuse-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tool for image blending with multiresolution splines
 WWW=		http://enblend.sourceforge.net/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	help2man:misc/help2man \
 		${LOCALBASE}/include/boost/version.hpp:devel/boost-libs
 LIB_DEPENDS=	liblcms2.so:graphics/lcms2 \
 		libtiff.so:graphics/tiff \
 		libvigraimpex.so:graphics/vigra \
 		libgsl.so:math/gsl \
 		libOpenEXR.so:graphics/openexr \
 		libpng.so:graphics/png
 
 USES=		compiler:features gmake jpeg localbase pkgconfig
 
 GNU_CONFIGURE=	yes
 
 PLIST_FILES=	bin/enblend bin/enfuse man/man1/enblend.1.gz man/man1/enfuse.1.gz
 PORTDOCS=	AUTHORS NEWS README
 
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.pre.mk>
 
 .if ${COMPILER_TYPE} == gcc
 # GCC 4.2 has some problems, see
 # http://groups.google.com/group/hugin-ptx/browse_thread/thread/725b1581c9889e37/50abe3387d61541a#50abe3387d61541a
 # Clang, on 10.0-RELEASE is fine.
 USE_GCC=	yes
 .else
 CXXFLAGS+=	-Wno-c++11-extensions
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e '/a LaTeX/d' ${WRKSRC}/configure
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.post.mk>
diff --git a/graphics/f3d/Makefile b/graphics/f3d/Makefile
index 21d73972aaaf..9a0df9e32919 100644
--- a/graphics/f3d/Makefile
+++ b/graphics/f3d/Makefile
@@ -1,71 +1,71 @@
 PORTNAME=	f3d
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.3.1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	graphics
 
 PATCH_SITES=	https://github.com/f3d-app/f3d/commit/
 PATCHFILES=	cc108300b44981b530aa3ad72c971c889e6bf3e2.diff:-p1
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Fast and minimalist 3D viewer
 WWW=		https://f3d-app.github.io/f3d/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreeimage.so:graphics/freeimage \
 		libfreetype.so:print/freetype2 \
 		libhdf5.so:science/hdf5 \
 		libImath-3_1.so:math/Imath \
 		libnetcdf.so:science/netcdf \
 		libvtkCommonMisc-${VTK_VER}.so:math/vtk${VTK_VER:R}
 
 USES=		cmake:testing compiler:c++17-lang desktop-file-utils gl tcl tk xorg
 USE_GL=		gl glu
 USE_XORG=	ice sm x11 xt
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	f3d-app
 
 CMAKE_OFF=	F3D_STRICT_BUILD # disable -Werror
 
 OPTIONS_GROUP=			MODULES
 OPTIONS_GROUP_MODULES=		ALEMBIC ASSIMP EXODUS EXTERNAL_RENDERING OCCT RAYTRACING
 OPTIONS_DEFAULT=		ALEMBIC ASSIMP EXODUS OCCT
 
 MODULES_DESC=			Build modules:
 
 ALEMBIC_DESC=			Alembic module (ABC files)
 ALEMBIC_CMAKE_BOOL=		F3D_MODULE_ALEMBIC
 ALEMBIC_LIB_DEPENDS=		libAlembic.so:graphics/alembic
 
 ASSIMP_DESC=			Assimp module (FBX, OFF, DAE and DXF files)
 ASSIMP_CMAKE_BOOL=		F3D_MODULE_ASSIMP
 ASSIMP_LIB_DEPENDS=		libassimp.so:multimedia/assimp
 
 EXODUS_DESC=			ExodusII module
 EXODUS_CMAKE_BOOL=		F3D_MODULE_EXODUS
 
 EXTERNAL_RENDERING_DESC=	External rendering module
 EXTERNAL_RENDERING_CMAKE_BOOL=	F3D_MODULE_EXTERNAL_RENDERING
 EXTERNAL_RENDERING_BROKEN=	Requires VTK::RenderingExternal enabled in VTK
 
 OCCT_DESC=			OpenCASCADE module (STEP and IGES files)
 OCCT_USES=			localbase:ldflags
 OCCT_CMAKE_BOOL=		F3D_MODULE_OCCT
 OCCT_LIB_DEPENDS=		libTKBRep.so:cad/opencascade \
 				libdraco.so:archivers/draco
 OCCT_CMAKE_ON=			-DOpenCASCADE_DIR=${LOCALBASE}/lib/cmake
 
 RAYTRACING_DESC=		Raytracing module
 RAYTRACING_CMAKE_BOOL=		F3D_MODULE_RAYTRACING
 RAYTRACING_BROKEN=		Requires VTK::RenderingRayTracing enabled in VTK
 
 post-install:
 	@${RM} -r ${STAGEDIR}${DOCSDIR}
 
 .include <../../math/vtk9/Makefile.version>
 .include <bsd.port.mk>
diff --git a/graphics/facedetect/Makefile b/graphics/facedetect/Makefile
index f532d0658559..c520d43c4a96 100644
--- a/graphics/facedetect/Makefile
+++ b/graphics/facedetect/Makefile
@@ -1,34 +1,34 @@
 PORTNAME=	facedetect
 PORTVERSION=	0.1
 DISTVERSIONPREFIX=	v
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	graphics
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Simple face detector for batch processing
 WWW=		https://www.thregr.org/~wavexx/software/facedetect/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING.txt
 
 RUN_DEPENDS=	opencv>0:graphics/opencv
 
 USES=		python:3.6+,run shebangfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	wavexx
 
 SHEBANG_FILES=	facedetect
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 PLIST_FILES=	bin/facedetect
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/${PORTNAME}
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/graphics/gdal-grass/Makefile b/graphics/gdal-grass/Makefile
index fc09da52da9c..2303ef7cc73f 100644
--- a/graphics/gdal-grass/Makefile
+++ b/graphics/gdal-grass/Makefile
@@ -1,31 +1,32 @@
 PORTNAME=	gdal-grass
 PORTVERSION=	1.0.2
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	graphics
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Standalone GRASS Drivers for GDAL and OGR
 WWW=		https://github.com/OSGeo/gdal-grass
 
 LICENSE=	MIT
 
 BUILD_DEPENDS=	grass8>=8.2<8.3:databases/grass8
 LIB_DEPENDS=	libgdal.so:graphics/gdal \
 		libgrass_gis.so:databases/grass8
 
 USES=		gmake
 
 ALL_TARGET=	default
 CFLAGS+=	-fPIC
 CONFIGURE_ARGS=	--with-autoload=${PREFIX}/lib/gdalplugins \
 		--with-gdal=${LOCALBASE}/bin/gdal-config \
 		--with-grass=${LOCALBASE}/grass82
 GNU_CONFIGURE=	yes
 
 PLIST_FILES=	lib/gdalplugins/gdal_GRASS.so \
 		lib/gdalplugins/ogr_GRASS.so
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	OSGeo
 
 .include <bsd.port.mk>
diff --git a/graphics/gdal/Makefile b/graphics/gdal/Makefile
index 4651cd15ccee..c1963c74a9fa 100644
--- a/graphics/gdal/Makefile
+++ b/graphics/gdal/Makefile
@@ -1,219 +1,219 @@
 PORTNAME=	gdal
 PORTVERSION=	3.6.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics geography
 MASTER_SITES=	https://download.osgeo.org/gdal/${PORTVERSION}/ \
 		LOCAL/sunpoet
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Translator library for raster geospatial data formats
 WWW=		https://gdal.org/ \
 		https://github.com/OSGeo/gdal
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.TXT
 
 BUILD_DEPENDS=	libgeotiff>=1.5.0:graphics/libgeotiff \
 		proj>=6,1:graphics/proj
 LIB_DEPENDS=	libgeotiff.so:graphics/libgeotiff \
 		libgif.so:graphics/giflib \
 		libjson-c.so:devel/json-c \
 		libpng.so:graphics/png \
 		libproj.so:graphics/proj \
 		libqhull_r.so:math/qhull \
 		libtiff.so:graphics/tiff
 
 USES=		cmake compiler:c++17-lang cpe iconv jpeg localbase pkgconfig ssl tar:xz
 
 CMAKE_OFF=	BUILD_CSHARP_BINDINGS \
 		BUILD_DOCS \
 		BUILD_JAVA_BINDINGS \
 		BUILD_PYTHON_BINDINGS \
 		BUILD_TESTING \
 		CLANG_TIDY_ENABLED \
 		CSHARP_MONO \
 		GDAL_ENABLE_HDF5_GLOBAL_LOCK  \
 		GDAL_ENABLE_PLUGINS \
 		GDAL_ENABLE_PLUGINS_NO_DEPS \
 		GDAL_SET_INSTALL_RELATIVE_RPATH \
 		GDAL_USE_INTERNAL_LIBS \
 		GDAL_USE_GEOTIFF_INTERNAL \
 		GDAL_USE_GIF_INTERNAL \
 		GDAL_USE_JPEG12_INTERNAL \
 		GDAL_USE_JPEG_INTERNAL \
 		GDAL_USE_JSONC_INTERNAL \
 		GDAL_USE_LERC_INTERNAL \
 		GDAL_USE_LIBCSF_INTERNAL \
 		GDAL_USE_OPENCAD \
 		GDAL_USE_OPENCAD_INTERNAL \
 		GDAL_USE_PNG_INTERNAL \
 		GDAL_USE_PUBLICDECOMPWT \
 		GDAL_USE_QHULL_INTERNAL \
 		GDAL_USE_SHAPELIB \
 		GDAL_USE_TIFF_INTERNAL \
 		GDAL_USE_ZLIB_INTERNAL \
 		HDFS_ENABLED \
 		SWIG_REGENERATE_PYTHON
 CMAKE_ON=	BUILD_APPS \
 		BUILD_SHARED_LIBS \
 		BUILD_STATIC_LIBS \
 		ENABLE_GNM \
 		ENABLE_IPO \
 		ENABLE_PAM \
 		GDAL_BUILD_OPTIONAL_DRIVERS \
 		GDAL_HIDE_INTERNAL_SYMBOLS \
 		GDAL_OBJECT_LIBRARIES_POSITION_INDEPENDENT_CODE \
 		GDAL_SPLIT_EXPORTED_LIBS \
 		GDAL_USE_EXTERNAL_LIBS \
 		GDAL_USE_GEOTIFF \
 		GDAL_USE_GIF \
 		GDAL_USE_ICONV \
 		GDAL_USE_JPEG \
 		GDAL_USE_JPEG12 \
 		GDAL_USE_JSONC \
 		GDAL_USE_LIBCSF \
 		GDAL_USE_LIBLZMA \
 		GDAL_USE_OPENSSL \
 		GDAL_USE_PNG \
 		GDAL_USE_QHULL \
 		GDAL_USE_SHAPELIB_INTERNAL \
 		GDAL_USE_TIFF \
 		GDAL_USE_ZLIB \
 		OGR_BUILD_OPTIONAL_DRIVERS \
 		OGR_SQLITE_ALLOW_LOAD_EXTENSIONS \
 		USE_CCACHE
 USE_CXXSTD=	c++17
 USE_LDCONFIG=	yes
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
 CPE_VENDOR=	osgeo
 
 HEADER_FILES=	alg/gdalwarpkernel_opencl.h \
 		alg/gvgcpfit.h \
 		alg/internal_qhull_headers.h \
 		alg/thinplatespline.h\
 		gcore/gdalexif.h \
 		gcore/gdaljp2metadatagenerator.h \
 		gcore/gdalsse_priv.h \
 		gnm/gnm_priv.h \
 		port/cpl_aws.h \
 		port/cpl_cpu_features.h \
 		port/cpl_google_cloud.h \
 		port/cpl_odbc.h \
 		port/cpl_sha1.h \
 		port/cpl_sha256.h \
 		port/cpl_vsil_curl_priv.h \
 		port/cpl_worker_thread_pool.h
 
 OPTIONS_DEFINE=	ARMADILLO BRUNSLI CFITSIO CRYPTOPP CURL DEFLATE ECW EXPAT EXR FREEXL GEOS GTA HDF5 HEIF KML LERC LIBXML2 LZ4 MYSQL NETCDF ODBC OPENJPEG PCRE PCRE2 PGSQL RASTERLITE2 SFCGAL SPATIALITE SQLITE TILEDB WEBP XERCES ZSTD
 OPTIONS_RADIO=	PDF
 OPTIONS_RADIO_PDF=	PODOFO POPPLER
 OPTIONS_DEFAULT=CURL EXPAT FREEXL GEOS LIBXML2 LZ4 OPENJPEG PCRE2 PGSQL POPPLER WEBP ZSTD \
 		HDF5 KML NETCDF SPATIALITE SFCGAL SQLITE XERCES
 OPTIONS_SUB=	yes
 BRUNSLI_DESC=	Brunsli support via libbrunsli library
 CRYPTOPP_DESC=	Cryptopp support
 DEFLATE_DESC=	Faster deflate support via libdeflate library
 EXR_DESC=	EXR support via OpenEXR library
 LERC_DESC=	LERC (Limited Error Raster Compression) support
 PCRE_DESC=	Regular expression support for SQLite
 PCRE2_DESC=	Regular expression support for SQLite
 RASTERLITE2_DESC=	RasterLite2 support
 TILEDB_DESC=	TileDB support
 
 ARMADILLO_CMAKE_BOOL=	GDAL_USE_ARMADILLO
 ARMADILLO_LIB_DEPENDS=	libarmadillo.so:math/armadillo
 BRUNSLI_CMAKE_BOOL=	GDAL_USE_BRUNSLI
 BRUNSLI_LIB_DEPENDS=	libbrunslidec-c.so:graphics/brunsli
 CFITSIO_CMAKE_BOOL=	GDAL_USE_CFITSIO
 CFITSIO_LIB_DEPENDS=	libcfitsio.so:astro/cfitsio
 CRYPTOPP_CMAKE_BOOL=	GDAL_USE_CRYPTOPP
 CRYPTOPP_LIB_DEPENDS=	libcryptopp.so:security/cryptopp
 CURL_CMAKE_BOOL=	GDAL_USE_CURL
 CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 DEFLATE_CMAKE_BOOL=	GDAL_USE_DEFLATE
 DEFLATE_LIB_DEPENDS=	libdeflate.so:archivers/libdeflate
 ECW_CMAKE_BOOL=		GDAL_USE_ECW
 ECW_LIB_DEPENDS=	libNCSEcw.so:graphics/libecwj2
 EXPAT_CMAKE_BOOL=	GDAL_USE_EXPAT
 EXPAT_LIB_DEPENDS=	libexpat.so:textproc/expat2
 EXR_CFLAGS=		-DInt64=uint64_t
 EXR_CMAKE_BOOL=		GDAL_USE_EXR
 EXR_LIB_DEPENDS=	libImath.so:math/Imath \
 			libOpenEXR.so:graphics/openexr
 FREEXL_CMAKE_BOOL=	GDAL_USE_FREEXL
 FREEXL_LIB_DEPENDS=	libfreexl.so:textproc/freexl
 GEOS_CMAKE_BOOL=	GDAL_USE_GEOS
 GEOS_LIB_DEPENDS=	libgeos.so:graphics/geos
 GTA_CMAKE_BOOL=		GDAL_USE_GTA
 GTA_LIB_DEPENDS=	libgta.so:devel/libgta
 HDF5_CMAKE_BOOL=	GDAL_USE_HDF5
 HDF5_LIB_DEPENDS=	libhdf5.so:science/hdf5
 HEIF_CMAKE_BOOL=	GDAL_USE_HEIF
 HEIF_LIB_DEPENDS=	libheif.so:graphics/libheif
 KML_CMAKE_BOOL=		GDAL_USE_LIBKML
 KML_LIB_DEPENDS=	libkmlbase.so:science/libkml
 LERC_CMAKE_BOOL=	GDAL_USE_LERC
 LERC_LIB_DEPENDS=	libLerc.so:graphics/lerc
 LIBXML2_CMAKE_BOOL=	GDAL_USE_LIBXML2
 LIBXML2_LIB_DEPENDS=	libxml2.so:textproc/libxml2
 LZ4_CMAKE_BOOL=		GDAL_USE_LZ4
 LZ4_LIB_DEPENDS=	liblz4.so:archivers/liblz4
 MYSQL_CMAKE_BOOL=	GDAL_USE_MYSQL
 MYSQL_USES=		mysql
 NETCDF_CMAKE_BOOL=	GDAL_USE_NETCDF
 NETCDF_LIB_DEPENDS=	libnetcdf.so:science/netcdf
 ODBC_CMAKE_BOOL=	GDAL_USE_ODBC
 ODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC
 OPENJPEG_BUILD_DEPENDS=	openjpeg>=2.1.0:graphics/openjpeg
 OPENJPEG_CMAKE_BOOL=	GDAL_USE_OPENJPEG
 OPENJPEG_LIB_DEPENDS=	libopenjp2.so:graphics/openjpeg
 PCRE_CMAKE_BOOL=	GDAL_USE_PCRE
 PCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
 PCRE2_CMAKE_BOOL=	GDAL_USE_PCRE2
 PCRE2_LIB_DEPENDS=	libpcre2-8.so:devel/pcre2
 PGSQL_CMAKE_BOOL=	GDAL_USE_POSTGRESQL
 PGSQL_USES=		pgsql
 PODOFO_CMAKE_BOOL=	GDAL_USE_PODOFO
 PODOFO_LIB_DEPENDS=	libpodofo.so:graphics/podofo
 POPPLER_CMAKE_BOOL=	GDAL_USE_POPPLER
 POPPLER_LIB_DEPENDS=	libpoppler.so:graphics/poppler
 RASTERLITE2_CMAKE_BOOL=	GDAL_USE_RASTERLITE2
 RASTERLITE2_LIB_DEPENDS=librasterlite2.so:graphics/librasterlite2
 SFCGAL_CMAKE_BOOL=	GDAL_USE_SFCGAL
 SFCGAL_LIB_DEPENDS=	libSFCGAL.so:databases/sfcgal
 SPATIALITE_CMAKE_BOOL=	GDAL_USE_SPATIALITE
 SPATIALITE_LIB_DEPENDS=	libspatialite.so:databases/spatialite
 SQLITE_CMAKE_BOOL=	GDAL_USE_SQLITE3
 SQLITE_USES=		sqlite
 TILEDB_CMAKE_BOOL=	GDAL_USE_TILEDB
 TILEDB_LIB_DEPENDS=	libtiledb.so:databases/tiledb
 WEBP_CMAKE_BOOL=	GDAL_USE_WEBP
 WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp
 XERCES_CMAKE_BOOL=	GDAL_USE_XERCES
 XERCES_LIB_DEPENDS=	libxerces-c.so:textproc/xerces-c3
 ZSTD_CMAKE_BOOL=	GDAL_USE_ZSTD
 ZSTD_LIB_DEPENDS=	libzstd.so:archivers/zstd
 
 post-patch:
 # Clean up bundled libraries
 	@${RM} -r ${WRKSRC}/alg/internal_libqhull/
 	@${RM} -r ${WRKSRC}/frmts/gif/giflib/
 	@${RM} -r ${WRKSRC}/frmts/gtiff/libgeotiff/
 	@${RM} -r ${WRKSRC}/frmts/gtiff/libtiff/
 	@${RM} -r ${WRKSRC}/frmts/jpeg/libjpeg/
 	@${RM} -r ${WRKSRC}/frmts/jpeg/libjpeg12/
 	@${RM} -r ${WRKSRC}/frmts/png/libpng/
 	@${RM} -r ${WRKSRC}/frmts/zlib/
 	@${RM} -r ${WRKSRC}/ogr/ogrsf_frmts/geojson/libjson/
 	@${RM} -r ${WRKSRC}/third_party/LercLib/
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d
 	${INSTALL_DATA} ${WRKSRC}/scripts/gdal-bash-completion.sh ${STAGEDIR}${PREFIX}/etc/bash_completion.d
 	cd ${WRKSRC}/ && ${INSTALL_DATA} ${HEADER_FILES} ${STAGEDIR}${PREFIX}/include/
 #	${INSTALL_DATA} ${WRKSRC}/libgdal.a ${STAGEDIR}${PREFIX}/lib/
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgdal.so
 
 .include <bsd.port.mk>
diff --git a/graphics/gimp-beautify-plugin/Makefile b/graphics/gimp-beautify-plugin/Makefile
index cb38a2923ea9..d5eeb94e13fa 100644
--- a/graphics/gimp-beautify-plugin/Makefile
+++ b/graphics/gimp-beautify-plugin/Makefile
@@ -1,54 +1,54 @@
 PORTNAME=	beautify
 PORTVERSION=	2012.08.12.00
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	graphics
 PKGNAMEPREFIX=	gimp-
 PKGNAMESUFFIX=	-plugin
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GIMP plug-ins to both quickly and easily beautify photo
 WWW=		https://github.com/hejiann/beautify
 
 LICENSE=	GPLv3+
 
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/fontconfig.pc:x11-fonts/fontconfig \
 		${LOCALBASE}/libdata/pkgconfig/freetype2.pc:print/freetype2 \
 		${LOCALBASE}/libdata/pkgconfig/gimp-2.0.pc:graphics/gimp-app
 RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/fontconfig.pc:x11-fonts/fontconfig \
 		${LOCALBASE}/libdata/pkgconfig/freetype2.pc:print/freetype2 \
 		${LOCALBASE}/libdata/pkgconfig/gimp-2.0.pc:graphics/gimp-app
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	hejiann
 GH_TAGNAME=	e209c8d
 
 USES=		gettext gmake gnome pkgconfig xorg
 USE_GCC=	yes
 USE_GNOME=	atk cairo gdkpixbuf2 gtk20
 USE_XORG=	x11 xcomposite xcursor xdamage xext xfixes xi xinerama xrandr xrender
 TMPDIR=		${WRKDIR}
 
 PLUGIN_DIR?=	libexec/gimp/2.2/plug-ins
 PLUGINS=	beautify \
 		border \
 		simple-border \
 		skin-whitening
 
 # installed files
 .for plugin in ${PLUGINS}
 PLIST_FILES+=	${PLUGIN_DIR}/${plugin}
 .endfor
 
 post-patch:
 	@${REINPLACE_CMD} \
 		-e 's|gimptool-2.0|${LOCALBASE}/bin/gimptool-2.0|' \
 		-e 's|gdk-pixbuf-csource|${LOCALBASE}/bin/gdk-pixbuf-csource|' \
 		${WRKSRC}/Makefile
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${PLUGIN_DIR}
 .for plugin in ${PLUGINS}
 	${INSTALL_PROGRAM} ${WRKSRC}/${plugin} ${STAGEDIR}${PREFIX}/${PLUGIN_DIR}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/graphics/glvis/Makefile b/graphics/glvis/Makefile
index 3f55276cde95..67b7bb228f0a 100644
--- a/graphics/glvis/Makefile
+++ b/graphics/glvis/Makefile
@@ -1,43 +1,43 @@
 PORTNAME=	glvis
 DISTVERSION=	4.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	https://glvis.github.io/releases/
 PKGNAMESUFFIX=	-mesh-visualizer # other software also has the name glvis
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Lightweight tool for accurate & flexible finite element visualization
 WWW=		https://glvis.org/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	glm>0:math/glm \
 		xxd:editors/vim
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libHYPRE.so:science/hypre \
 		libmetis.so:math/metis \
 		libmfem.so:math/mfem \
 		libpng.so:graphics/png
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}scikit-image>0:graphics/py-scikit-image@${PY_FLAVOR}
 
 USES=		cmake:testing gl python:test sdl tar:tgz
 USE_GL=		gl glew
 USE_SDL=	sdl2
 
 USE_GITHUB=	nodefault
 GH_TUPLE=	GLVis:data:1fc2954:data/tests/data
 
 CMAKE_TESTING_ON=	ENABLE_TESTS # 5 tests fail, likely because test baseline is for ubuntu
 CMAKE_ARGS=	-DGLVIS_BASELINE_SYS=ubuntu-20.04 # baseline for tests
 
 PLIST_FILES=	bin/${PORTNAME}
 
 BINARY_ALIAS=	python3=${PYTHON_CMD}
 
 do-install: # workaround for https://github.com/GLVis/glvis/issues/234
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/glvis ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/graphics/gmic/Makefile b/graphics/gmic/Makefile
index a856de5f68ba..bdcb7b4df1e0 100644
--- a/graphics/gmic/Makefile
+++ b/graphics/gmic/Makefile
@@ -1,49 +1,49 @@
 PORTNAME=	gmic
 DISTVERSION=	3.1.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	https://gmic.eu/files/source/
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Framework for image processing
 WWW=		https://gmic.eu/
 
 LICENSE=	CeCILL
 LICENSE_NAME=	CeCILL
 LICENSE_FILE=	${WRKSRC}/../COPYING
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 BROKEN_i386=	error: "c++ crashes, clang-5 and 6 fail: undefined reference to `__atomic_load'"
 .if !exists(/usr/include/omp.h)
 BROKEN=		requires OpenMP support that is missing on this architecture
 .endif
 
 BUILD_DEPENDS=	gimptool-2.0:graphics/gimp-app
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libfftw3.so:math/fftw3 \
 		libGraphicsMagick++.so:graphics/GraphicsMagick \
 		libOpenEXR.so:graphics/openexr \
 		libImath.so:math/Imath \
 		libopencv_core.so:graphics/opencv \
 		libpng.so:graphics/png \
 		libtiff.so:graphics/tiff
 
 USES=		compiler:c++11-lang gettext-runtime gmake jpeg localbase:ldflags pkgconfig xorg
 USE_LDCONFIG=	yes
 USE_XORG=	x11 xau xcb xdmcp
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 WRKSRC_SUBDIR=	src # because of makefile issues, see https://github.com/dtschump/gmic/issues/405
 
 MAKE_JOBS_UNSAFE=	yes # see https://github.com/dtschump/gmic/issues/406
 
 ALL_TARGET=	lib cli # cli is bundled here until https://github.com/dtschump/gmic/issues/407 is fixed, afvter which is would be moved to gmic-cli
 
 PORTSCOUT=	limit:[0-9]\..* # not v.220 and similar
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgmic.so.*
 
 .include <bsd.port.mk>
diff --git a/graphics/gmt/Makefile b/graphics/gmt/Makefile
index 38711792c03c..dceaf2a3521a 100644
--- a/graphics/gmt/Makefile
+++ b/graphics/gmt/Makefile
@@ -1,45 +1,45 @@
 PORTNAME=	gmt
 DISTVERSION=	6.3.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	https://github.com/GenericMappingTools/${PORTNAME}/releases/download/${DISTVERSION}/
 DISTNAME=	${PORTNAME}-${DISTVERSION}-src
 
 MAINTAINER=	lbartoletti@FreeBSD.org
 COMMENT=	Generic Mapping Tools - data processing and display software package
 WWW=		https://www.generic-mapping-tools.org/
 
 LICENSE=	GPLv3 LGPL3
 LICENSE_COMB=	multi
 
 LIB_DEPENDS=	libnetcdf.so:science/netcdf \
 		libcurl.so:ftp/curl \
 		libpcre2-8.so:devel/pcre2 \
 		libgdal.so:graphics/gdal \
 		libgeos.so:graphics/geos
 RUN_DEPENDS=	bash:shells/bash \
 		GraphicsMagick>0:graphics/GraphicsMagick \
 		ffmpeg>0:multimedia/ffmpeg \
 		xdg-open:devel/xdg-utils \
 
 BUILD_DEPENDS=	${LOCALBASE}/share/dcw-gmt/dcw-gmt.nc:graphics/gmt-dcw \
 		${LOCALBASE}/share/gshhg-gmt/binned_GSHHS_c.nc:graphics/gmt-gshhg
 
 USES=		blaslapack cmake ghostscript:run shebangfix tar:xz
 USE_LDCONFIG=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
 
 #SHEBANG_GLOB=	*.sh *.in
 #SHEBANG_FILES=	share/tools/ncdeflate src/img/img2google src/gmtswitch
 
 CMAKE_ARGS+=	-DDCW_ROOT=${LOCALBASE}/share/dcw-gmt \
 		-DCOPY_DCW=off \
 		-DGSHHG_ROOT=${LOCALBASE}/share/gshhg-gmt \
 		-DCOPY_GSHHG=off \
 		-DGMT_DATADIR=share/${PORTNAME} \
 		-DGMT_DOCDIR=share/doc/${PORTNAME} \
 		-DGMT_MANDIR=share/doc/${PORTNAME}/man \
 		-DGMT_EXCLUDE_PCRE=True
 
 .include <bsd.port.mk>
diff --git a/graphics/grads/Makefile b/graphics/grads/Makefile
index 6b0faa19a2cb..2e80a810cb64 100644
--- a/graphics/grads/Makefile
+++ b/graphics/grads/Makefile
@@ -1,81 +1,81 @@
 PORTNAME=	grads
 PORTVERSION=	1.9b4
-PORTREVISION=	16
+PORTREVISION=	17
 CATEGORIES=	graphics science math
 MASTER_SITES=	ftp://grads.iges.org/grads/1.9/:src \
 		ftp://cola.gmu.edu/grads/1.9/:src \
 		ftp://grads.iges.org/grads/:other \
 		ftp://cola.gmu.edu/grads/:other
 DISTFILES=	${PORTNAME}-src-${PORTVERSION}${EXTRACT_SUFX}:src \
 		example.tar.gz:other
 EXTRACT_ONLY=	${PORTNAME}-src-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	glewis@FreeBSD.org
 COMMENT=	The Grid Analysis and Display System
 WWW=		http://grads.iges.org/grads/
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libudunits2.a:science/udunits \
 		${LOCALBASE}/lib/libsx.a:x11/libsx
 LIB_DEPENDS=	libgd.so:graphics/gd \
 		libpng.so:graphics/png
 
 USES=		jpeg ncurses
 GNU_CONFIGURE=		yes
 CONFIGURE_ENV+=		SUPPLIBS="${LOCALBASE}"
 CONFIGURE_ARGS+=	--enable-dyn-supplibs \
 			--with-readline \
 			--with-printim \
 			--with-gui \
 			--with-x
 
 OPTIONS_DEFINE=	HDF NETCDF DOCS EXAMPLES
 OPTIONS_DEFAULT=	NETCDF
 HDF_DESC=	Build hdf-support (only hdf OR netcdf is supported)
 NETCDF_DESC=	Build netcdf-support
 
 PORTDATA=	*
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDOCS}
 PORTDOCS=	*
 .endif
 
 .if ${PORT_OPTIONS:MEXAMPLES}
 PORTEXAMPLES=	*
 .endif
 
 .if ${PORT_OPTIONS:MHDF}
 BROKEN=			Fails to package
 LIB_DEPENDS+=		libmfhdf.so:science/hdf
 CONFIGURE_ARGS+=	--with-hdf
 PLIST_SUB+=		NETCDF="@comment " HDF=""
 .endif
 
 .if ${PORT_OPTIONS:MNETCDF}
 LIB_DEPENDS+=		libnetcdf.so:science/netcdf
 CONFIGURE_ARGS+=	--with-nc
 PLIST_SUB+=		NETCDF="" HDF="@comment "
 .endif
 
 post-extract:
 	${MKDIR} "${WRKSRC}/examples"
 	cd "${WRKSRC}/examples" && ${TAR} -xzf "${DISTDIR}/example.tar.gz"
 
 post-configure:
 	${REINPLACE_CMD} -e "s:%%DATADIR%%:${DATADIR}:" ${WRKSRC}/src/gx.h
 	${REINPLACE_CMD} -e "s:ludunits:ludunits2:" ${WRKSRC}/src/Makefile
 
 post-install:
 	${MKDIR} "${STAGEDIR}${DATADIR}"
 	cd ${WRKSRC}/data && ${COPYTREE_SHARE} . "${STAGEDIR}${DATADIR}"
 .if ${PORT_OPTIONS:MEXAMPLES}
 	${MKDIR} "${STAGEDIR}${EXAMPLESDIR}"
 	cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . "${STAGEDIR}${EXAMPLESDIR}"
 .endif
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} "${STAGEDIR}${DOCSDIR}"
 	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . "${STAGEDIR}${DOCSDIR}"
 .endif
 
 .include <bsd.port.mk>
diff --git a/graphics/gstreamer1-plugins-opencv/Makefile b/graphics/gstreamer1-plugins-opencv/Makefile
index 744260b86f67..3ecde1b6d687 100644
--- a/graphics/gstreamer1-plugins-opencv/Makefile
+++ b/graphics/gstreamer1-plugins-opencv/Makefile
@@ -1,18 +1,18 @@
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	graphics
 
 COMMENT=	GStreamer opencv real time computer vision plugin
 
 GST_PLUGIN=	opencv
 DIST=		bad
 
 MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer1-plugins
 
 # Clang has issues with Overloaded stuff inside OpenCV
 CXXFLAGS+=	-Wno-overloaded-virtual
 LIB_DEPENDS=   libopencv_highgui.so:graphics/opencv
 GST_PLUGIN_DIR=  gst-libs/gst/opencv ext/opencv
 
 PLIST=		${.CURDIR}/pkg-plist
 
 .include "${MASTERDIR}/Makefile"
diff --git a/graphics/hugin/Makefile b/graphics/hugin/Makefile
index a3156dbbed78..8d70e532e550 100644
--- a/graphics/hugin/Makefile
+++ b/graphics/hugin/Makefile
@@ -1,61 +1,61 @@
 PORTNAME=	hugin
 DISTVERSION=	2022.0.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}
 
 MAINTAINER=	fuz@FreeBSD.org
 COMMENT=	GUI for Panorama Tools, to stitch panoramic images
 WWW=		http://hugin.sourceforge.net/
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libOpenEXR.so:graphics/openexr \
 		libImath.so:math/Imath \
 		libboost_thread.so:devel/boost-libs \
 		liblcms2.so:graphics/lcms2 \
 		libexiv2.so:graphics/exiv2 \
 		libfftw3.so:math/fftw3 \
 		libpano13.so:graphics/libpano13 \
 		libvigraimpex.so:graphics/vigra \
 		libpng.so:graphics/png \
 		libtiff.so:graphics/tiff \
 		libflann.so:math/flann \
 		liblz4.so:archivers/liblz4
 # gmake is really needed at _runtime_.   Do not remove it from this list.
 RUN_DEPENDS=	enblend>=4.1.4:graphics/enblend \
 		exiftool:graphics/p5-Image-ExifTool \
 		gmake:devel/gmake
 
 USES=		cmake compiler:c++11-lib desktop-file-utils gettext gl gnome \
 		jpeg pkgconfig shared-mime-info shebangfix sqlite tar:bzip2 xorg
 USE_GL=		gl glew glu glut
 USE_WX=		3.0+
 USE_XORG=	x11
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}.0
 
 SHEBANG_FILES=	src/hugin_script_interface/hpi.py \
 		src/hugin_script_interface/plugins/*.py \
 		src/hugin_script_interface/plugins-dev/*.py
 
 CMAKE_ARGS=	-DwxWidgets_CONFIG_EXECUTABLE=${WX_CONFIG}
 CFLAGS+=	-I${LOCALBASE}/include/Imath
 
 OPTIONS_DEFINE=		PANOMATIC AUTOPANOSIFTC PYTHON
 OPTIONS_DEFAULT=	PANOMATIC PYTHON
 OPTIONS_SUB=		yes
 
 PANOMATIC_DESC=		Install graphics/panomatic
 PANOMATIC_RUN_DEPENDS=	panomatic:graphics/panomatic
 
 AUTOPANOSIFTC_DESC=	Install graphics/autopano-sift-c
 AUTOPANOSIFTC_RUN_DEPENDS=	autopano:graphics/autopano-sift-c
 
 PYTHON_DESC=		Python Scripting Interface
 PYTHON_BUILD_DEPENDS=	swig:devel/swig
 PYTHON_USES=		python
 PYTHON_CMAKE_ON=	-DBUILD_HSI=ON
 PYTHON_CMAKE_OFF=	-DBUILD_HSI=OFF
 
 .include <bsd.port.mk>
diff --git a/graphics/impressive/Makefile b/graphics/impressive/Makefile
index 8cb4db6d621f..fe845ab458c4 100644
--- a/graphics/impressive/Makefile
+++ b/graphics/impressive/Makefile
@@ -1,70 +1,70 @@
 PORTNAME=	impressive
 DISTVERSION=	0.13.1
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	graphics python
 MASTER_SITES=	SF/${PORTNAME}/Impressive/${DISTVERSION}/
 DISTNAME=	Impressive-${DISTVERSION}
 
 MAINTAINER=	kai@FreeBSD.org
 COMMENT=	Stylish way of giving presentations
 WWW=		http://impressive.sourceforge.net/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/license.txt
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}PyOpenGL>=0:graphics/py-PyOpenGL@${PY_FLAVOR} \
 		${PYGAME} \
 		${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR}
 
 USES=		python:3.5+ sdl shebangfix
 USE_SDL=	sdl
 
 SHEBANG_FILES=	impressive.py
 NO_BUILD=	yes
 NO_ARCH=	yes
 PLIST_FILES=	bin/${PORTNAME} \
 		share/man/man1/${PORTNAME}.1.gz
 
 PORTDOCS=	${PORTNAME}.html demo.pdf
 
 OPTIONS_DEFINE=	DOCS
 OPTIONS_GROUP=	MULTIMEDIA PDFFEATURE
 OPTIONS_MULTI=	PDFENGINE
 OPTIONS_DEFAULT=FFMPEG MPLAYER MUPDF PDFTK XDG
 
 OPTIONS_GROUP_MULTIMEDIA=	FFMPEG MPLAYER
 OPTIONS_GROUP_PDFFEATURE=	PDFTK XDG
 OPTIONS_MULTI_PDFENGINE=	GHOSTSCRIPT MUPDF POPPLER XPDF
 
 FFMPEG_DESC=		Optimize generation of video preview images
 MPLAYER_DESC=		Enable audio/video playback
 PDFTK_DESC=		Enable automatic extraction of PDF page titles
 XDG_DESC=		Enable web/e-mail hyperlinks in PDF files
 GHOSTSCRIPT_DESC=	Use Ghostscript for PDF rendering
 MUPDF_DESC=		Use MuPDF for PDF rendering
 POPPLER_DESC=		Use Poppler for PDF rendering
 XPDF_DESC=		Use Xpdf for PDF rendering
 
 FFMPEG_IMPLIES=		MPLAYER
 GHOSTSCRIPT_IMPLIES=	PDFTK
 POPPLER_IMPLIES=	PDFTK
 XPDF_IMPLIES=		PDFTK
 
 FFMPEG_RUN_DEPENDS=	ffmpeg:multimedia/ffmpeg
 MPLAYER_RUN_DEPENDS=	mplayer:multimedia/mplayer
 PDFTK_RUN_DEPENDS=	pdftk:print/pdftk
 XDG_RUN_DEPENDS=	xdg-open:devel/xdg-utils
 GHOSTSCRIPT_USES=	ghostscript:run
 MUPDF_RUN_DEPENDS=	mupdf:graphics/mupdf
 POPPLER_RUN_DEPENDS=	pdftoppm:graphics/poppler-utils
 XPDF_RUN_DEPENDS=	${LOCALBASE}/libexec/xpdf/pdftoppm:graphics/xpdf
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}.py ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/share/man/man1
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/graphics/inkscape-open-symbols/Makefile b/graphics/inkscape-open-symbols/Makefile
index 02370a92625a..3628891b0385 100644
--- a/graphics/inkscape-open-symbols/Makefile
+++ b/graphics/inkscape-open-symbols/Makefile
@@ -1,27 +1,28 @@
 PORTNAME=	inkscape-open-symbols
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES=	graphics
 
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	SVG symbol sets that can be used as Inkscape symbols
 WWW=		https://github.com/PanderMusubi/inkscape-open-symbols
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	inkscape:graphics/inkscape
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	PanderMusubi
 
 DATADIR=	${PREFIX}/share/inkscape/symbols
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	(cd ${WRKSRC} && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR} "-mindepth 2")
 
 .include <bsd.port.mk>
diff --git a/graphics/inkscape/Makefile b/graphics/inkscape/Makefile
index ff5b5642e4ce..004457d8e136 100644
--- a/graphics/inkscape/Makefile
+++ b/graphics/inkscape/Makefile
@@ -1,130 +1,130 @@
 PORTNAME=	inkscape
 DISTVERSION=	1.2.2
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	graphics gnome
 MASTER_SITES=	https://media.inkscape.org/dl/resources/file/
 
 PATCH_SITES=	https://gitlab.com/${PORTNAME}/${PORTNAME}/-/commit/
 PATCHFILES+=	781e29cd3538.patch:-p1 # https://gitlab.com/inkscape/inkscape/-/merge_requests/5111
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Full featured open source SVG editor
 WWW=		https://inkscape.org
 
 LICENSE=	GPLv2 GPLv2+ GPLv3 GPLv3+ LGPL21 LGPL3 LGPL3+ MPL11
 LICENSE_COMB=	multi
 LICENSE_FILE_GPLv2  =	${WRKSRC}/LICENSES/GPL-2.0.txt
 LICENSE_FILE_GPLv2+ =	${WRKSRC}/LICENSES/GPL-2.0-or-later.txt
 LICENSE_FILE_GPLv3  =	${WRKSRC}/LICENSES/GPL-3.0.txt
 LICENSE_FILE_GPLv3+ =	${WRKSRC}/LICENSES/GPL-3.0-or-later.txt
 LICENSE_FILE_LGPL21 =	${WRKSRC}/LICENSES/LGPL-2.1.txt
 LICENSE_FILE_LGPL3  =	${WRKSRC}/LICENSES/LGPL-3.0.txt
 LICENSE_FILE_LGPL3+ =	${WRKSRC}/LICENSES/LGPL-3.0-or-later.txt
 LICENSE_FILE_MPL11  =	${WRKSRC}/LICENSES/MPL-1.1.txt
 
 LIB_DEPENDS=	libboost_filesystem.so:devel/boost-libs \
 		libpopt.so:devel/popt \
 		libgc.so:devel/boehm-gc \
 		libgdl-3.so:x11-toolkits/gdl \
 		libgsl.so:math/gsl \
 		liblcms2.so:graphics/lcms2 \
 		libfribidi.so:converters/fribidi \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libharfbuzz.so:print/harfbuzz \
 		libpotrace.so:graphics/libpotrace \
 		libpng.so:graphics/png \
 		libsoup-2.4.so:devel/libsoup \
 		libyaml.so:textproc/libyaml \
 		libdouble-conversion.so:devel/double-conversion \
 		lib2geom.so:math/lib2geom
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}appdirs>0:devel/py-appdirs@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}filelock>=3.7.1:sysutils/py-filelock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scour>0:textproc/py-scour@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}CacheControl>0:www/py-cachecontrol@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cssselect>0:www/py-cssselect@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
 		ps2pdf:print/ghostscript9-agpl-base \
 		fig2dev:print/fig2dev
 
 USES=		compiler:c++17-lang cmake cpe desktop-file-utils gnome \
 		iconv:wchar_t jpeg pathfix pkgconfig python:3.7+ \
 		readline shebangfix tar:xz xorg
 USE_GNOME=	gdkpixbuf2 gtkmm30 libxml2 libxslt
 USE_XORG=	sm ice x11 xext
 USE_LDCONFIG=	yes
 
 CXXSTD=		gnu++17
 
 DATETAG=	2022-12-01_b0a8486541
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}_${DATETAG}
 
 SHEBANG_FILES=	share/extensions/*.py share/extensions/genpofiles.sh \
 		share/templates/*.py man/fix-roff-punct
 
 OPTIONS_DEFINE=		OPENMP POPPLER SCRIBUS VISIO CDR DBUS WPG GVFS NLS GSPELL
 OPTIONS_DEFAULT=	POPPLER VISIO CDR WPG GM GSPELL
 OPTIONS_DEFAULT_amd64=	OPENMP
 OPTIONS_DEFAULT_powerpc64=	OPENMP
 OPTIONS_DEFAULT_powerpc64le=	OPENMP
 OPTIONS_RADIO=		IMAGICK
 OPTIONS_RADIO_IMAGICK=	IMAGICK6 GM
 OPTIONS_SUB=		yes
 
 CDR_DESC=		Support for CorelDRAW graphics
 CDR_CMAKE_BOOL=		WITH_LIBCDR
 CDR_LIB_DEPENDS=	librevenge-stream-0.0.so:textproc/librevenge \
 			libcdr-0.1.so:graphics/libcdr01
 
 DBUS_CMAKE_BOOL=	WITH_DBUS
 DBUS_LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib \
 			libdbus-1.so:devel/dbus
 
 GVFS_USE=		GNOME=gvfs
 
 OPENMP_CMAKE_BOOL=	WITH_OPENMP
 
 POPPLER_DESC=		PDF preview rendering
 POPPLER_CMAKE_BOOL=	ENABLE_POPPLER ENABLE_POPPLER_CAIRO
 POPPLER_LIB_DEPENDS=	libpoppler.so:graphics/poppler \
 			libpoppler-glib.so:graphics/poppler-glib
 
 SCRIBUS_DESC=		Support color-managed PDF export using Scribus (experimental)
 SCRIBUS_RUN_DEPENDS=	scribus:print/scribus-devel
 
 VISIO_DESC=		Support for Microsoft Visio diagrams
 VISIO_CMAKE_BOOL=	WITH_LIBVISIO
 VISIO_LIB_DEPENDS=	librevenge-stream-0.0.so:textproc/librevenge \
 			libvisio-0.1.so:textproc/libvisio01
 
 WPG_DESC=		Support for WordPerfect graphics
 WPG_CMAKE_BOOL=		WITH_LIBWPG
 WPG_LIB_DEPENDS=	libwpg-0.3.so:graphics/libwpg03
 
 IMAGICK_DESC=		Raster image format library
 IMAGICK6_DESC=		Use ImageMagick6
 IMAGICK6_USES=		magick:6
 IMAGICK6_CMAKE_BOOL=	WITH_IMAGE_MAGICK
 GM_DESC=		Use GraphicsMagick
 GM_LIB_DEPENDS=		libGraphicsMagick.so:graphics/GraphicsMagick
 GM_CMAKE_BOOL=		WITH_GRAPHICS_MAGICK
 
 NLS_CMAKE_BOOL=		WITH_NLS
 NLS_USES=		gettext
 
 GSPELL_DESC=		Support for spell checking through gspell
 GSPELL_CMAKE_BOOL= 	WITH_GSPELL
 GSPELL_LIB_DEPENDS=	libgspell-1.so:textproc/gspell
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|COMMAND python3|COMMAND ${PYTHON_VERSION}|g' \
 		${WRKSRC}/share/*/CMakeLists.txt
 	# Third entry in the table of interpreters is basename of executable
 	@${REINPLACE_CMD} -e 's|"python3"|"${PYTHON_VERSION}"|g' \
 		${WRKSRC}/src/extension/implementation/script.cpp
 	@${TOUCH} ${WRKSRC}/share/extensions/gcodetools_check_for_updates.inx.h
 
 .include <bsd.port.mk>
diff --git a/graphics/instant-meshes/Makefile b/graphics/instant-meshes/Makefile
index 2cbcf9c36fa6..9bb7ceeb1df8 100644
--- a/graphics/instant-meshes/Makefile
+++ b/graphics/instant-meshes/Makefile
@@ -1,51 +1,51 @@
 PORTNAME=	instant-meshes
 DISTVERSION=	0.0-42
 DISTVERSIONSUFFIX=	-g4a083f4
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	graphics
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Interactive field-aligned mesh generator
 WWW=		https://igl.ethz.ch/projects/instant-meshes/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 LIB_DEPENDS=	libglfw.so:graphics/glfw
 RUN_DEPENDS=	zenity:x11/zenity
 
 USES=		cmake compiler:c++14-lang eigen:3 gl localbase:ldflags \
 		magick:6,build pkgconfig xorg
 USE_GITHUB=	yes
 GH_ACCOUNT=	wjakob
 GH_TUPLE=	wjakob:nanogui:2a61f03:nanogui/ext/nanogui \
 		wjakob:nanovg:ac15b84:nanovg/ext/nanogui/ext/nanovg \
 		wjakob:dset:7967ef0:dset/ext/dset \
 		wjakob:tbb:141b0e3:tbb/ext/tbb \
 		wjakob:pcg32:0ef13e6:pcg32/ext/pcg32 \
 		wjakob:pss:a91da33:pss/ext/pss  # x11-toolkits/nanogui should be a port dependency, but current versions aren't compatible
 USE_GL=		gl
 USE_XORG=	x11 xcursor xi xinerama xrandr xxf86vm
 CMAKE_ON=	NANOGUI_BUILD_PYTHON
 
 post-build:
 	@convert -verbose -resize 500x500 -gravity center -background none -extent 512x512 \
 		${WRKSRC}/resources/icon.png ${WRKDIR}/icon_512x512.png
 .for size in 128x128 192x192 256x256
 	@convert -verbose -resize ${size} ${WRKDIR}/icon_512x512.png ${WRKDIR}/icon_${size}.png
 .endfor
 .for size in 16x16 24x24 32x32 48x48 64x64 96x96
 	@convert -verbose -resize ${size} ${WRKDIR}/icon_512x512.png -unsharp 0x6 ${WRKDIR}/icon_${size}.png
 .endfor
 
 post-install:
 	@${RM} -r ${STAGEDIR}${PREFIX}/include ${STAGEDIR}${PREFIX}/lib
 .for size in 16x16 24x24 32x32 48x48 64x64 96x96 128x128 192x192 256x256 512x512
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${size}/apps
 	${INSTALL_DATA} ${WRKDIR}/icon_${size}.png \
 		${STAGEDIR}${PREFIX}/share/icons/hicolor/${size}/apps/${PORTNAME}.png
 .endfor
 	${INSTALL_PROGRAM} ${CONFIGURE_WRKSRC}/"Instant Meshes" ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	${INSTALL_DATA} ${FILESDIR}/${PORTNAME}.desktop ${STAGEDIR}${PREFIX}/share/applications/
 
 .include <bsd.port.mk>
diff --git a/graphics/krita/Makefile b/graphics/krita/Makefile
index 9cc28a4ad9df..58950a98b007 100644
--- a/graphics/krita/Makefile
+++ b/graphics/krita/Makefile
@@ -1,78 +1,78 @@
 PORTNAME=	krita
 DISTVERSION=	5.1.5
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	graphics kde
 MASTER_SITES=	KDE/stable/${PORTNAME}/${DISTVERSION}
 DIST_SUBDIR=	KDE/${PORTNAME}
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Sketching and painting program
 WWW=		https://krita.org
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	libheif>=1.12.0:graphics/libheif
 BUILD_DEPENDS+=	${BUILD_DEPENDS_${ARCH}}
 BUILD_DEPENDS_aarch64=	xsimd>=8.1:devel/xsimd
 BUILD_DEPENDS_amd64=	xsimd>=8.1:devel/xsimd
 LIB_DEPENDS=	libImath.so:math/Imath \
 		libOpenColorIO.so:graphics/opencolorio \
 		libX11.so:x11/libX11 \
 		libboost_system.so:devel/boost-libs \
 		libfftw3.so:math/fftw3 \
 		libexiv2.so:graphics/exiv2 \
 		libcurl.so:ftp/curl \
 		libgif.so:graphics/giflib \
 		libgsl.so:math/gsl \
 		libheif.so:graphics/libheif \
 		libturbojpeg.so:graphics/libjpeg-turbo \
 		libjxl.so:graphics/libjxl \
 		liblcms2.so:graphics/lcms2 \
 		libmypaint.so:graphics/libmypaint \
 		libpng.so:graphics/png \
 		libpoppler.so:graphics/poppler \
 		libpoppler-qt5.so:graphics/poppler-qt5 \
 		libquazip1-qt5.so:archivers/quazip@qt5 \
 		libraw.so:graphics/libraw \
 		libtiff.so:graphics/tiff \
 		libwebp.so:graphics/webp \
 		libxcb.so:x11/libxcb \
 		libxcb-util.so:x11/xcb-util
 
 # Disable ninja generator for now (with gmake), until the duplicate test targets are resolved upstream.
 USES=		cmake compiler:c++11-lib desktop-file-utils \
 		eigen:3 gettext jpeg kde:5 localbase:ldflags pkgconfig \
 		python:3.7+ qt:5 shared-mime-info tar:xz xorg
 USE_KDE=	archive completion config coreaddons crash guiaddons i18n \
 		itemmodels itemviews kio service widgetsaddons windowsystem
 USE_QT=		concurrent core dbus declarative gui multimedia network printsupport \
 		sql svg testlib widgets x11extras xml sql-sqlite3:run \
 		buildtools:build qmake:build
 USE_XORG=	ice sm xcb xext xi
 
 CMAKE_ARGS=	-DCMAKE_DISABLE_FIND_PACKAGE_PyQt5:BOOL=true
 
 OPTIONS_DEFINE=		GMIC OPENEXR
 OPTIONS_DEFAULT=	OPENEXR
 OPTIONS_SUB=		yes
 
 GMIC_DESC=		Depend on the G'Mic plugin #'
 GMIC_RUN_DEPENDS=	gmic_krita_qt:graphics/gmic-qt@krita
 
 OPENEXR_LIB_DEPENDS=	libOpenEXR.so:graphics/openexr \
 			libKSeExpr.so:graphics/kseexpr
 OPENEXR_CMAKE_BOOL_OFF=	CMAKE_DISABLE_FIND_PACKAGE_OpenEXR
 
 PLIST_SUB=	SHLIB_VER=18.0.0 \
 		SHLIB_SHVER=18
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == aarch64 || ${ARCH} == amd64 || ${ARCH} == i386
 BUILD_DEPENDS+=	vc>=1.1.0:devel/vc
 .else
 CMAKE_ARGS+=	-DCMAKE_DISABLE_FIND_PACKAGE_Vc=ON
 .endif
 
 .include <bsd.port.mk>
diff --git a/graphics/libpano13/Makefile b/graphics/libpano13/Makefile
index 6cc6efd7cc67..488d661e9db3 100644
--- a/graphics/libpano13/Makefile
+++ b/graphics/libpano13/Makefile
@@ -1,36 +1,36 @@
 PORTNAME=	libpano13
 DISTVERSION=	2.9.21
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics java
 MASTER_SITES=	SF/panotools/${PORTNAME}/${PORTNAME}-${DISTVERSION}
 
 MAINTAINER=	fuz@FreeBSD.org
 COMMENT=	Cross-platform library behind Panorama Tools and other photo stitchers
 WWW=		http://panotools.sourceforge.net/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libpng.so:graphics/png \
 		libtiff.so:graphics/tiff
 
 USES=		cmake:testing cpe jpeg libtool pathfix perl5 pkgconfig
 CPE_VENDOR=	${PORTNAME}_project
 USE_LDCONFIG=	yes
 USE_PERL5=	build	# for pod2man
 
 WRKSRC=		${WRKDIR}/libpano13-${DISTVERSION}
 
 OPTIONS_DEFINE=	DOCS JAVA SUITESPARSE
 OPTIONS_DEFAULT=	SUITESPARSE
 SUITESPARSE_DESC=	Use math/suitesparse for faster operation
 OPTIONS_SUB=	yes
 JAVA_USE=	java=yes
 JAVA_CMAKE_BOOL=	SUPPORT_JAVA_PROGRAMS
 JAVA_VARS=	JAVA_OS=native
 SUITESPARSE_LIB_DEPENDS= \
 		libcholmod.so:math/suitesparse-cholmod \
 		libspqr.so:math/suitesparse-spqr
 SUITESPARSE_CMAKE_BOOL=	USE_SPARSE_LEVMAR
 
 .include <bsd.port.mk>
diff --git a/graphics/lightzone/Makefile b/graphics/lightzone/Makefile
index ecba6b1bdc71..faa2920f652d 100644
--- a/graphics/lightzone/Makefile
+++ b/graphics/lightzone/Makefile
@@ -1,66 +1,66 @@
 PORTNAME=	lightzone
 DISTVERSION=	4.1.8-3
 DISTVERSIONSUFFIX=	-g36e87773
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	graphics java
 DIST_SUBDIR=	${PORTNAME}
 
 PATCH_SITES=	https://github.com/ktgw0316/LightZone/commit/
 PATCHFILES=	376ec67ddfb1.patch:-p1
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Professional-level digital darkroom and photo editor
 WWW=		http://lightzoneproject.org/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/../COPYING
 
 BUILD_DEPENDS=	jhindexer:java/javahelp \
 		git:devel/git \
 		rsync:net/rsync \
 		tidy:www/tidy-lib \
 		autoconf:devel/autoconf
 LIB_DEPENDS=	liblcms2.so:graphics/lcms2 \
 		libtiff.so:graphics/tiff
 RUN_DEPENDS=	jhindexer:java/javahelp
 
 BROKEN_aarch64=		fails to link: /usr/local/bin/ld: LC_JNIUtils.o: relocation R_AARCH64_ADR_PREL_PG_HI21 against symbol
 BROKEN_armv6=		fails to compile: build.xml: exec returned: 1
 BROKEN_armv7=		fails to compile: build.xml: exec returned: 1
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	ktgw0316
 GH_PROJECT=	LightZone
 
 USES=		desktop-file-utils gmake gnome jpeg pkgconfig xorg
 USE_ANT=	yes
 USE_JAVA=	yes
 USE_GCC=	yes
 USE_LDCONFIG=	yes
 USE_XORG=	x11
 JAVA_VENDOR=	openjdk
 JAVA_BUILD=	yes
 JAVA_RUN=	yes
 
 PATCH_WRKSRC=	${WRKSRC:H}
 WRKSRC_SUBDIR=	linux
 
 LIBDIR=		${PREFIX}/lib/${PORTNAME}
 PLIST_SUB=	LIBDIR="${LIBDIR}"
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|gcc|${CC}|' -e 's|g++|${CXX}|' ${WRKSRC}/../lightcrafts/mk/platform.mk
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/products/lightzone
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/products/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
 	@${MKDIR} ${STAGEDIR}${JAVASHAREDIR}/${PORTNAME}
 	${INSTALL_DATA} ${WRKSRC}/products/*.jar ${STAGEDIR}${JAVASHAREDIR}/${PORTNAME}
 	@${MKDIR} ${STAGEDIR}${LIBDIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/products/LightZone-forkd ${STAGEDIR}${LIBDIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/products/dcraw_lz ${STAGEDIR}${LIBDIR}
 	${INSTALL_LIB} ${WRKSRC}/products/*.so ${STAGEDIR}${LIBDIR}
 	${INSTALL_DATA} ${WRKSRC}/products/${PORTNAME}.desktop ${STAGEDIR}${PREFIX}/share/applications/
 	@cd ${WRKSRC} && ${COPYTREE_SHARE} icons ${STAGEDIR}${PREFIX}/share/
 
 .include <bsd.port.mk>
diff --git a/graphics/luminance-qt5/Makefile b/graphics/luminance-qt5/Makefile
index de8c159e58b2..2bd5f97175f9 100644
--- a/graphics/luminance-qt5/Makefile
+++ b/graphics/luminance-qt5/Makefile
@@ -1,62 +1,62 @@
 PORTNAME=	luminance-hdr
 DISTVERSION=	2.6.1.1
-PORTREVISION=	15
+PORTREVISION=	16
 CATEGORIES=	graphics
 MASTER_SITES=	SF/qtpfsgui/luminance/${DISTVERSION}
 
 MAINTAINER=	h2+fbsdports@fsfe.org
 COMMENT=	Complete open source solution for HDR photography
 WWW=		http://qtpfsgui.sourceforge.net/
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	${LOCALBASE}/include/fftw3.h:math/fftw3
 LIB_DEPENDS=	libImath.so:math/Imath \
 		libtiff.so:graphics/tiff \
 		libraw_r.so:graphics/libraw \
 		libfftw3f.so:math/fftw3-float \
 		libgsl.so:math/gsl \
 		libexiv2.so:graphics/exiv2 \
 		liblcms2.so:graphics/lcms2 \
 		libpng.so:graphics/png \
 		libOpenEXR.so:graphics/openexr \
 		libboost_date_time.so:devel/boost-libs
 
 CFLAGS+=	-I${LOCALBASE}/include/Imath
 
 USES=		cmake desktop-file-utils eigen:3 jpeg pkgconfig qt:5 tar:bzip2
 USE_QT=		concurrent core declarative gui location network \
 		printsupport sql svg widgets xml \
 		buildtools:build linguisttools:build qmake:build
 
 OPTIONS_DEFINE=		CFITSIO DOCS HELPBROWSER
 OPTIONS_DEFAULT=	CFITSIO
 OPTIONS_DEFAULT_aarch64=	HELPBROWSER
 OPTIONS_DEFAULT_amd64=	HELPBROWSER
 OPTIONS_DEFAULT_i386=	HELPBROWSER
 
 CFITSIO_LIB_DEPENDS=	libcfitsio.so:astro/cfitsio
 
 HELPBROWSER_DESC=	Build help browser (requires QtWebEngine)
 HELPBROWSER_USE=	QT=webchannel,webengine
 HELPBROWSER_CMAKE_BOOL=	WITH_HELPBROWSER
 
 .include <bsd.port.options.mk>
 
 post-patch:
 # Do not install yet another copy of GPL (we use license framework instead)
 # and fix installation path for docs (but not for internal help files)
 	@${REINPLACE_CMD} -e '/LICENSE/d ; \
 		/#info files/s,share/luminance-hdr/doc,${DOCSDIR_REL},' \
 			${WRKSRC}/CMakeLists.txt
 # Point to the right location for program where to look for GPL text
 	@${REINPLACE_CMD} -e 's,LICENSE,${LICENSE}, ; \
 		s,share/luminance-hdr/doc,share/licenses/${PKGNAME},' \
 			${WRKSRC}/src/UI/UMessageBox.cpp
 
 post-patch-HELPBROWSER-off:
 	@${REINPLACE_CMD} -e 's,name="documentationAction">,& \
 		<property name="enabled"><bool>false</bool></property>,' \
 			${WRKSRC}/src/MainWindow/MainWindow.ui
 
 .include <bsd.port.mk>
diff --git a/graphics/lux/Makefile b/graphics/lux/Makefile
index e856e76e6cd8..ced6efe19ce9 100644
--- a/graphics/lux/Makefile
+++ b/graphics/lux/Makefile
@@ -1,64 +1,65 @@
 PORTNAME=	lux
 PORTVERSION=	1.1.6
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	https://bitbucket.org/kfj/pv/get/
 PKGNAMESUFFIX=	-pv	# distinguish from www/lux
 DISTNAME=	${COMMIT}
 
 MAINTAINER=	fuz@FreeBSD.org
 COMMENT=	Panorama and image viewer
 WWW=		https://bitbucket.org/kfj/pv
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_armv6=	address space exhaustion in compiler
 BROKEN_armv7=	address space exhaustion in compiler
 
 LIB_DEPENDS=	libhwy.so:devel/highway \
 		libsfml-window.so:devel/sfml \
 		libexiv2.so:graphics/exiv2 \
 		libvigraimpex.so:graphics/vigra
 RUN_DEPENDS=	${GUIFONT}:x11-fonts/noto-basic
 GUIFONT=	${LOCALBASE}/share/fonts/noto/NotoSans-Regular.ttf
 
 USES=		cmake desktop-file-utils dos2unix pkgconfig tar:bz2
 DOS2UNIX_FILES=	tinyfiledialogs.c
 CMAKE_ON=	USE_HWY_LIBRARY
 CXXFLAGS+=	-Wno-deprecated-declarations
 CONFLICTS=	lux
 
 WRKSRC=		${WRKDIR}/kfj-pv-${COMMIT}
 COMMIT=		f49809a01243
 OPTIONS_DEFINE_amd64=	SSSE3 SSE42 AVX AVX2 AVX512
 OPTIONS_DEFINE_i386=	SSE2 SSSE3 SSE42 AVX AVX2 AVX512
 OPTIONS_DEFAULT_amd64=	SSSE3 SSE42 AVX AVX2 AVX512
 OPTIONS_DEFAULT_i386=	SSSE3 SSE42 AVX AVX2 AVX512
 
 SSE2_DESC=	build port for Pentium 4 or newer
 SSSE3_DESC=	support SSSE3 flavor
 SSE42_DESC=	support SSE4.2 flavor
 AVX_DESC=	support AVX flavor
 AVX2_DESC=	support AVX2 flavor
 AVX512_DESC=	support AVX-512F flavor
 
 SSE2_CXXFLAGS_OFF=	${${OSVERSION}>=1300000:?-march=i686:}
 SSE2_CXXFLAGS=		-march=pentium4
 SSSE3_CMAKE_BOOL=	FLV_SSSE3
 SSE42_CMAKE_BOOL=	FLV_SSE42
 AVX_CMAKE_BOOL=		FLV_AVX
 AVX2_CMAKE_BOOL=	FLV_AVX2
 AVX512_CMAKE_BOOL=	FLV_AVX512f
 
 .include <bsd.port.pre.mk>
 
 # cannot use CMAKE_ON after bsd.port.pre.mk
 # this disables the flavor dispatch code on non-x86
 .if ${ARCH} != amd64 && ${ARCH} != i386
 CMAKE_ARGS+=	-DFLV_NATIVE=ON
 .endif
 
 pre-configure:
 	@${REINPLACE_CMD} -e 's,%%GUIFONT%%,${GUIFONT},' ${WRKSRC}/options.h
 
 .include <bsd.port.post.mk>
diff --git a/graphics/mahotas/Makefile b/graphics/mahotas/Makefile
index ca32b224f1a7..e59064fff605 100644
--- a/graphics/mahotas/Makefile
+++ b/graphics/mahotas/Makefile
@@ -1,18 +1,19 @@
 PORTNAME=	mahotas
 PORTVERSION=	1.4.13
+PORTREVISION=	1
 CATEGORIES=	graphics python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Computer vision and image processing library for Python
 WWW=		https://packages.python.org/mahotas/
 
 BUILD_DEPENDS=	${PYNUMPY}
 LIB_DEPENDS=	libfreeimage.so:graphics/freeimage
 
 USE_GCC=	yes
 USES=		python:3.7+
 USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/graphics/mapcache/Makefile b/graphics/mapcache/Makefile
index 0bebd0f7a4f1..e498102b5aa0 100644
--- a/graphics/mapcache/Makefile
+++ b/graphics/mapcache/Makefile
@@ -1,69 +1,70 @@
 PORTNAME=		mapcache
 DISTVERSION=		1.14.0
+PORTREVISION=	1
 CATEGORIES=		graphics
 MASTER_SITES=		http://download.osgeo.org/mapserver/
 
 MAINTAINER=		wen@FreeBSD.org
 COMMENT=		Server that implements tile caching to speed up access to WMS layers
 WWW=		https://www.mapserver.org/mapcache/
 
 LICENSE=		MIT
 LICENSE_FILE=		${WRKSRC}/LICENSE.md
 
 LIB_DEPENDS=		libpng.so:graphics/png \
 			libapr-1.so:devel/apr1 \
 			libaprutil-1.so:devel/apr1 \
 			libpixman-1.so:x11/pixman
 
 USES=			cmake jpeg localbase
 USE_LDCONFIG=		yes
 CMAKE_ON=		WITH_OGR WITH_PIXMAN
 CMAKE_OFF=		WITH_BERKELEY_DB
 
 CFLAGS+=		-std=c99
 
 OPTIONS_DEFINE=		APACHE FASTCGI SQLITE MEMCACHE TIFF TIFF_WRITE \
 			GEOTIFF PCRE GDAL GEOS
 OPTIONS_DEFAULT=	APACHE FASTCGI SQLITE GEOS GDAL
 OPTIONS_SUB=		yes
 
 APACHE_DESC=		Native apache module
 APACHE_USES=		apache
 APACHE_CMAKE_BOOL=	WITH_APACHE
 APACHE_CMAKE_ON=	-DAPACHE_INCLUDE_DIR=${LOCALBASE}/${APACHEINCLUDEDIR} \
 			-DAPACHE_MODULE_DIR=${LOCALBASE}/${APACHEMODDIR}
 
 FASTCGI_LIB_DEPENDS=	libfcgi.so:www/fcgi
 FASTCGI_CMAKE_BOOL=	WITH_FCGI
 
 SQLITE_DESC=		Use sqlite as a cache backend
 SQLITE_USES=		sqlite
 SQLITE_CMAKE_BOOL=	WITH_SQLITE
 
 MEMCACHE_DESC=		Use memcache as a cache backend
 MEMCACHE_CMAKE_BOOL=	WITH_MEMCACHE
 
 TIFF_DESC=		Use TIFFs as a cache backend
 TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
 TIFF_CMAKE_BOOL=	WITH_TIFF
 
 TIFF_WRITE_DESC=	Support for writable TIFF cache backends (implies TIFF)
 TIFF_WRITE_LIB_DEPENDS=	libtiff.so:graphics/tiff
 TIFF_WRITE_CMAKE_BOOL=	WITH_TIFF_WRITE_SUPPORT
 TIFF_WRITE_IMPLIES=	TIFF
 
 GEOTIFF_DESC=		GeoTIFF metadata creation for TIFF cache backends
 GEOTIFF_LIB_DEPENDS=	libgeotiff.so:graphics/libgeotiff
 GEOTIFF_CMAKE_BOOL=	WITH_GEOTIFF
 
 PCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
 PCRE_CMAKE_BOOL=	WITH_PCRE
 
 GDAL_DESC=		GDAL library support
 GDAL_LIB_DEPENDS=	libgdal.so:graphics/gdal
 GDAL_CMAKE_BOOL=	WITH_GDAL WITH_OGR
 
 GEOS_LIB_DEPENDS=	libgeos_c.so:graphics/geos
 GEOS_CMAKE_BOOL=	WITH_GEOS
 
 .include <bsd.port.mk>
diff --git a/graphics/mapserver/Makefile b/graphics/mapserver/Makefile
index ef0059cbab6f..ccc464ed9723 100644
--- a/graphics/mapserver/Makefile
+++ b/graphics/mapserver/Makefile
@@ -1,217 +1,218 @@
 PORTNAME=		mapserver
 PORTVERSION=		8.0.0
+PORTREVISION=	1
 CATEGORIES=		graphics www geography
 MASTER_SITES=		https://download.osgeo.org/mapserver/
 
 MAINTAINER=		wen@FreeBSD.org
 COMMENT=		System for developing web-based GIS applications
 WWW=		https://mapserver.org/
 
 LICENSE=		MIT
 
 LIB_DEPENDS=		libgd.so:graphics/gd \
 			libproj.so:graphics/proj \
 			libpng.so:graphics/png \
 			libgif.so:graphics/giflib \
 			libsvg.so:graphics/libsvg \
 			libfreetype.so:print/freetype2
 
 USES=			compiler:c++11-lang cpe cmake gnome jpeg \
 			localbase:ldflags
 CPE_VENDOR=		osgeo
 LDFLAGS+=		-pthread
 CMAKE_ARGS+=		-DCMAKE_PREFIX_PATH=${LOCALBASE} \
 			-DCMAKE_INSTALL_PREFIX=${PREFIX} \
 			-DWITH_GD=1
 MAKE_JOBS_UNSAFE=	yes
 
 PROG_FILES=		legend scalebar shptree shptreetst shptreevis \
 			sortshp msencrypt tile4ms mapserv
 
 OPTIONS_DEFINE=		CAIRO CAIRO_SVG CLIENT_WMS CLIENT_WFS CURL DEBUG \
 			FASTCGI FRIBIDI GDAL GEOS HARFBUZZ KML \
 			PERL PHP POSTGIS PROTOBUFC PYTHON WCS WFS WMS
 OPTIONS_DEFAULT=	CAIRO FRIBIDI GDAL GEOS \
 			HARFBUZZ POSTGIS PROTOBUFC WCS WFS
 CAIRO_SVG_DESC=		Cairo SVG parser support
 GDAL_DESC=		GDAL library support
 FRIBIDI_DESC=		Fribidi library support
 KML_DESC=		KML support
 WMS_DESC=		WMS Server support
 WFS_DESC=		WFS Server support
 WCS_DESC=		WCS Server support
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPYTHON}
 USES+=			python
 BUILD_DEPENDS+=		swig:devel/swig
 CMAKE_ARGS+=		-DWITH_PYTHON=yes
 PLIST_SUB+=		PYTHON=""
 MAP_EGG=		MapScript-${PORTVERSION}-${PYTHON_VERSION:S/thon//}
 PLIST_SUB+=		MAP_EGG=${MAP_EGG}
 .else
 PLIST_SUB+=		PYTHON="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MCAIRO}
 LIB_DEPENDS+=		libcairo.so:graphics/cairo \
 			libexpat.so:textproc/expat2
 CMAKE_ARGS+=		-DWITH_CAIRO=1
 .else
 CMAKE_ARGS+=		-DWITH_CAIRO=0
 .endif
 
 .if ${PORT_OPTIONS:MFRIBIDI}
 LIB_DEPENDS+=		libfribidi.so:converters/fribidi \
 			libharfbuzz.so:print/harfbuzz
 CMAKE_ARGS+=		-DWITH_FRIBIDI=1 -DWITH_HARFBUZZ=1
 .else
 CMAKE_ARGS+=		-DWITH_FRIBIDI=0 -DWITH_HARFBUZZ=0
 .endif
 
 .if ${PORT_OPTIONS:MHARFBUZZ}
 LIB_DEPENDS+=		libfribidi.so:converters/fribidi \
 			libharfbuzz.so:print/harfbuzz
 CMAKE_ARGS+=		-DWITH_FRIBIDI=1 -DWITH_HARFBUZZ=1
 .else
 CMAKE_ARGS+=		-DWITH_FRIBIDI=0 -DWITH_HARFBUZZ=0
 .endif
 
 .if ${PORT_OPTIONS:MPROTOBUFC}
 LIB_DEPENDS+=		libprotobuf-c.so:devel/protobuf-c
 CMAKE_ARGS+=		-DWITH_PROTOBUFC=1
 .else
 CMAKE_ARGS+=		-DWITH_PROTOBUFC=0
 .endif
 
 .if ${PORT_OPTIONS:MCAIRO_SVG}
 LIB_DEPENDS+=		libcairo.so:graphics/cairo \
 			libsvg-cairo.so:graphics/libsvg-cairo \
 			libexpat.so:textproc/expat2
 CMAKE_ARGS+=		-DWITH_SVGCAIRO=1 -DWITH_CAIRO=1
 USES+=			pkgconfig
 .else
 CMAKE_ARGS+=		-DWITH_SVGCAIRO=0
 .endif
 
 .if ${PORT_OPTIONS:MKML}
 LIB_DEPENDS+=		libxml2.so:textproc/libxml2
 CMAKE_ARGS+=		-DWITH_KML=1
 .else
 CMAKE_ARGS+=		-DWITH_KML=0
 .endif
 
 .if ${PORT_OPTIONS:MWMS}
 CMAKE_ARGS+=		-DWITH_WMS=1
 .else
 CMAKE_ARGS+=		-DWITH_WMS=0
 .endif
 
 .if ${PORT_OPTIONS:MWFS}
 CMAKE_ARGS+=		-DWITH_WFS=1
 .else
 CMAKE_ARGS+=		-DWITH_WFS=0
 .endif
 
 .if ${PORT_OPTIONS:MWCS}
 CMAKE_ARGS+=		-DWITH_WCS=1
 .else
 CMAKE_ARGS+=		-DWITH_WCS=0
 .endif
 
 .if ${PORT_OPTIONS:MGDAL}
 USES+=			iconv
 LIB_DEPENDS+=		libgdal.so:graphics/gdal
 CMAKE_ARGS+=		-DWITH_GDAL=1
 .else
 CMAKE_ARGS+=		-DWITH_GDAL=0
 .endif
 
 .if ${PORT_OPTIONS:MGEOS}
 LIB_DEPENDS+=		libgeos.so:graphics/geos
 CMAKE_ARGS+=		-DWITH_GEOS=1
 .else
 CMAKE_ARGS+=		-DWITH_GEOS=0
 .endif
 
 .if ${PORT_OPTIONS:MPOSTGIS}
 USES+=			pgsql
 CMAKE_ARGS+=		-DWITH_POSTGIS=1
 .else
 CMAKE_ARGS+=		-DWITH_POSTGIS=0
 .endif
 
 .if ${PORT_OPTIONS:MPHP}
 USES+=			php:build
 CMAKE_ARGS+=		-DWITH_PHP=1
 PLIST_SUB+=		PHP=""
 .else
 CMAKE_ARGS+=		-DWITH_PHP=0
 PLIST_SUB+=		PHP="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MPERL}
 USES+=		perl5
 BUILD_DEPENDS=	swig:devel/swig
 CMAKE_ARGS+=	-DWITH_PERL=1
 PLIST_SUB+=	PERL=""
 .else
 CMAKE_ARGS+=	-DWITH_PERL=0
 PLIST_SUB+=	PERL="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MCURL}
 LIB_DEPENDS+=		libcurl.so:ftp/curl
 CMAKE_ARGS+=		-DWITH_CURL=1
 .else
 CMAKE_ARGS+=		-DWITH_CURL=0
 .endif
 
 .if ${PORT_OPTIONS:MFASTCGI}
 BUILD_DEPENDS+=		${LOCALBASE}/bin/cgi-fcgi:www/fcgi
 CMAKE_ARGS+=		-DWITH_FCGI=1
 .else
 CMAKE_ARGS+=		-DWITH_FCGI=0
 .endif
 
 .if ${PORT_OPTIONS:MDEBUG}
 CMAKE_ARGS+=		-DCMAKE_BUILD_TYPE=Debug
 .else
 CMAKE_ARGS+=		-DCMAKE_BUILD_TYPE=Release
 .endif
 
 .if ${PORT_OPTIONS:MCLIENT_WMS}
 LIB_DEPENDS+=		libcurl.so:ftp/curl
 LIB_DEPENDS+=		libgdal.so:graphics/gdal
 CMAKE_ARGS+=		-DWITH_CURL=1 -DWITH_GDAL=1 -DWITH_CLIENT_WMS=1
 .endif
 
 .if ${PORT_OPTIONS:MCLIENT_WFS}
 LIB_DEPENDS+=		libcurl.so:ftp/curl
 LIB_DEPENDS+=		libgdal.so:graphics/gdal
 CMAKE_ARGS+=		-DWITH_CURL=1 -DWITH_GDAL=1 -DWITH_CLIENT_WFS=1
 .endif
 
 do-install:
 .for f in ${PROG_FILES}
 	${STRIP_CMD} ${BUILD_WRKSRC}/${f}
 	${INSTALL_SCRIPT} ${BUILD_WRKSRC}/${f} ${STAGEDIR}${PREFIX}/bin
 .endfor
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/libmapserver.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib
 
 	@${LN} -sf libmapserver.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libmapserver.so.2
 	@${LN} -sf libmapserver.so.2 ${STAGEDIR}${PREFIX}/lib/libmapserver.so
 
 do-install-PHP-on:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/php/${PHP_EXT_DIR}
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/mapscript/php/php_mapscript.so \
 		${STAGEDIR}${PREFIX}/lib/php/${PHP_EXT_DIR}/
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/php
 	@${ECHO_CMD} "extension=php_mapscript.so" > ${STAGEDIR}${PREFIX}/etc/php/ext-20-php_mapscript.ini
 
 do-install-PYTHON-on:
 	@${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}/
 	(cd ${BUILD_WRKSRC}/mapscript/python && ${CP} mapscript.py _mapscript.so ${STAGEDIR}${PYTHON_SITELIBDIR}/)
 
 .include <bsd.port.mk>
diff --git a/graphics/matplotlib-cpp/Makefile b/graphics/matplotlib-cpp/Makefile
index f5551ce7464e..7e2e2f301e07 100644
--- a/graphics/matplotlib-cpp/Makefile
+++ b/graphics/matplotlib-cpp/Makefile
@@ -1,30 +1,31 @@
 PORTNAME=	matplotlib-cpp
 PORTVERSION=	g20210422
+PORTREVISION=	1
 CATEGORIES=	graphics devel
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Header-only C++ plotting library built on the popular matplotlib
 WWW=		https://github.com/lava/matplotlib-cpp
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \
 		${PYNUMPY}
 
 USES=		cmake:testing compiler:c++17-lang python
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	lava
 GH_TAGNAME=	ef0383f
 
 CMAKE_TESTING_ON=	FREEBSD_BUILD_EXAMPLES
 CMAKE_TESTING_TARGET=	${ALL_TARGET}
 
 NO_ARCH=	yes
 
 PLIST_FILES=	include/matplotlibcpp.h \
 		lib/matplotlib_cpp/cmake/matplotlib_cppConfig.cmake \
 		lib/matplotlib_cpp/cmake/matplotlib_cppTargets.cmake
 
 .include <bsd.port.mk>
diff --git a/graphics/matplotplusplus/Makefile b/graphics/matplotplusplus/Makefile
index a87706b9700e..6d6f03b2df85 100644
--- a/graphics/matplotplusplus/Makefile
+++ b/graphics/matplotplusplus/Makefile
@@ -1,28 +1,29 @@
 PORTNAME=	matplotplusplus
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.1.0
+PORTREVISION=	1
 CATEGORIES=	graphics devel
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	C++ graphics library for data visualization
 WWW=		https://alandefreitas.github.io/matplotplusplus/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libfftw3.so:math/fftw3 \
 		libfftw3f.so:math/fftw3-float \
 		libopenblas.so:math/openblas \
 		libpng16.so:graphics/png \
 		libtiff.so:graphics/tiff
 RUN_DEPENDS=	gnuplot:math/gnuplot
 
 USES=		cmake compiler:c++17-lang jpeg
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	alandefreitas
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 CMAKE_OFF=	BUILD_TESTS BUILD_EXAMPLES
 
 .include <bsd.port.mk>
diff --git a/graphics/mirtk/Makefile b/graphics/mirtk/Makefile
index 62b612416c7c..d33af7048895 100644
--- a/graphics/mirtk/Makefile
+++ b/graphics/mirtk/Makefile
@@ -1,38 +1,38 @@
 PORTNAME=	mirtk
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.0.0-178
-PORTREVISION=	5
+PORTREVISION=	6
 DISTVERSIONSUFFIX=	-g973ce2f
 CATEGORIES=	graphics
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Medical Image Registration ToolKit (MIRTK)
 WWW=		https://mirtk.github.io/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BUILD_DEPENDS=	boost-libs>0:devel/boost-libs \
 		nifticlib>0:science/nifticlib
 LIB_DEPENDS=	libpng16.so:graphics/png
 
 USES=		cmake compiler:c++11-lang eigen:3 perl5 python
 USE_GITHUB=	yes
 GH_ACCOUNT=	BioMedIA
 GH_PROJECT=	${PORTNAME:tu}
 USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=		TBB VTK
 OPTIONS_DEFAULT=	TBB VTK
 
 TBB_DESC=		Build with TBB
 TBB_CMAKE_BOOL=		WITH_TBB
 TBB_LIB_DEPENDS=	libtbb.so:devel/onetbb
 
 VTK_DESC=		Build with the VTK toolkit
 VTK_CMAKE_BOOL=		WITH_VTK
 VTK_LIB_DEPENDS=	libvtkCommonCore-${VTK_VER}.so:math/vtk${VTK_VER:R} \
 			libexpat.so:textproc/expat2
 
 .include <../../math/vtk9/Makefile.version>
 .include <bsd.port.mk>
diff --git a/graphics/movit/Makefile b/graphics/movit/Makefile
index 101efb5d8de9..96d47d5b97c9 100644
--- a/graphics/movit/Makefile
+++ b/graphics/movit/Makefile
@@ -1,42 +1,43 @@
 PORTNAME=	movit
 PORTVERSION=	1.6.3
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://${PORTNAME}.sesse.net/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	High-performance video filters for the GPU
 WWW=		https://movit.sesse.net
 
 LICENSE=	GPLv2+
 
 LIB_DEPENDS=	libepoxy.so:graphics/libepoxy \
 		libfftw3.so:math/fftw3
 
 USES=		autoreconf compiler:c++11-lang gmake eigen:3,build,run libtool \
 		pathfix pkgconfig
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
 PORTDOCS=	NEWS README
 
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.options.mk>
 
 post-patch:
 	@${REINPLACE_CMD} -e '/AC_INIT/ s/git/${PORTVERSION}/' \
 		${WRKSRC}/configure.ac
 	@${REINPLACE_CMD} -e '/^all/ s/$$(TESTS)//' \
 		${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e '/features\.h/ d' \
 		${WRKSRC}/demo.cpp
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
 . for f in ${PORTDOCS}
 	cd ${WRKSRC} && ${COPYTREE_SHARE} ${f} ${STAGEDIR}${DOCSDIR}
 . endfor
 .endif
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so.*
 
 .include <bsd.port.mk>
diff --git a/graphics/mypaint/Makefile b/graphics/mypaint/Makefile
index 68be648e524b..c9cdb2455cd6 100644
--- a/graphics/mypaint/Makefile
+++ b/graphics/mypaint/Makefile
@@ -1,52 +1,52 @@
 PORTNAME=	mypaint
 DISTVERSIONPREFIX=v
 DISTVERSION=	2.0.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 
 PATCH_SITES=	https://github.com/garynthompson/${PORTNAME}/commit/
 # GTK input grab fix
 PATCHFILES=	94c623b788462fadb3e292b918edc4e90adf4faa.patch:-p1
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Fast painting/scribbling program
 WWW=		http://mypaint.org/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	swig:devel/swig \
 		mypaint-brushes2>0:graphics/mypaint-brushes2 \
 		${PYNUMPY}
 LIB_DEPENDS=	libjson-c.so:devel/json-c \
 		liblcms2.so:graphics/lcms2 \
 		libpng.so:graphics/png \
 		libmypaint.so:graphics/libmypaint
 RUN_DEPENDS=	mypaint-brushes2>0:graphics/mypaint-brushes2 \
 		${PYNUMPY}
 
 USES=		compiler:c++11-lib desktop-file-utils gettext gnome localbase \
 		pkgconfig python:3.6+ tar:xz
 USE_GITHUB=	yes
 USE_GNOME=	gtk30 pygobject3 cairo librsvg2:run
 USE_PYTHON=	distutils py3kplist noflavors
 PYDISTUTILS_BUILD_TARGET=	build build_ext
 CFLAGS+=	${CFLAGS_${CHOSEN_COMPILER_TYPE}}
 CFLAGS_gcc=	-std=c99
 USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=	OPENMP
 OPTIONS_DEFAULT_amd64=	OPENMP
 OPTIONS_DEFAULT_powerpc64=	OPENMP
 OPTIONS_DEFAULT_powerpc64le=	OPENMP
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mypaint/lib/_mypaintlib*.so
 
 .include <bsd.port.options.mk>
 
 .if !${PORT_OPTIONS:MOPENMP}
 PYDISTUTILS_BUILDARGS+=	--disable-openmp
 .endif
 
 .include <bsd.port.mk>
diff --git a/graphics/nip2/Makefile b/graphics/nip2/Makefile
index 0d921de83bcc..772754602ee4 100644
--- a/graphics/nip2/Makefile
+++ b/graphics/nip2/Makefile
@@ -1,62 +1,62 @@
 PORTNAME=	nip2
 PORTVERSION=	8.7.1
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	graphics
 MASTER_SITES=	https://github.com/libvips/${PORTNAME}/releases/download/v${PORTVERSION}/
 
 PATCH_SITES=	https://github.com/libvips/${PORTNAME}/commit/
 PATCHFILES+=	8bdb1459bc2.patch:-p1 # https://github.com/libvips/nip2/pull/96
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Graphical user interface for VIPS
 WWW=		https://github.com/jcupitt/nip2
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	xdg-open:devel/xdg-utils
 LIB_DEPENDS=	libvips.so:graphics/vips \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2
 RUN_DEPENDS=	xdg-open:devel/xdg-utils
 
 USES=		bison cpe desktop-file-utils dos2unix gettext gmake gnome pkgconfig \
 		shared-mime-info
 CPE_VENDOR=	${PORTNAME}_project
 
 DOS2UNIX_GLOB=	*.def
 USE_GNOME=	cairo gdkpixbuf2 gtk20 libxml2
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--disable-update-desktop
 LDFLAGS+=	-lm
 
 SUB_FILES=	run-nip2.sh
 
 OPTIONS_DEFINE=		DOCS FFTW GRAPHVIZ GSF GSL
 OPTIONS_DEFAULT=	FFTW GRAPHVIZ GSF GSL
 
 FFTW_LIB_DEPENDS=	libfftw3.so:math/fftw3
 FFTW_CONFIGURE_WITH=	fftw3
 GRAPHVIZ_DESC=		Use libgvc to show workspace dependency graphs
 GRAPHVIZ_LIB_DEPENDS=	libgvc.so:graphics/graphviz
 GRAPHVIZ_CONFIGURE_WITH=	libgvc
 GSF_DESC=		Use libgsf to save plots to files
 GSF_USE=		gnome=libgsf
 GSF_CONFIGURE_WITH=	libgsf
 GSL_DESC=		Use gsl for numeric functions
 GSL_LIB_DEPENDS=	libgsl.so:math/gsl
 GSL_CONFIGURE_WITH=	gsl
 
 post-install:
 	(cd ${WRKDIR} && ${INSTALL_SCRIPT} run-nip2.sh \
 		${STAGEDIR}/${PREFIX}/bin)
 
 test check: build
 	#
 	# Checks currently require ImageMagick's convert to be available
 	# and aren't enabled by default. They take a long time -- tail
 	# the log-file:
 	#	${WRKSRC}/test/test_all.sh.log
 	#
 	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} check)
 
 .include <bsd.port.mk>
diff --git a/graphics/nomacs/Makefile b/graphics/nomacs/Makefile
index 571a4f45fd27..89371488a3f2 100644
--- a/graphics/nomacs/Makefile
+++ b/graphics/nomacs/Makefile
@@ -1,52 +1,52 @@
 PORTNAME=	nomacs
 PORTVERSION=	3.16
 DISTVERSIONSUFFIX=	.224
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	graphics
 
 PATCH_SITES=	https://github.com/nomacs/nomacs/commit/
 PATCHFILES=	8c44e10ae48a88ed2ea885f432c65a0859013011.patch:-p1
 
 MAINTAINER=	vidar@karlsen.tech
 COMMENT=	Small, fast, and free image viewer
 WWW=		https://www.nomacs.org/
 
 LICENSE=	GPLv3
 
 LIB_DEPENDS=	libexiv2.so:graphics/exiv2 \
 		libopencv_highgui.so:graphics/opencv \
 		libopencv_core.so:graphics/opencv \
 		liblcms2.so:graphics/lcms2 \
 		libquazip1-qt5.so:archivers/quazip@qt5
 
 USES=		cmake compiler:c++11-lang cpe desktop-file-utils \
 		dos2unix pkgconfig qt:5
 USE_QT=		concurrent core gui network printsupport svg widgets \
 		buildtools:build linguisttools:build qmake:build
 DOS2UNIX_FILES=	ImageLounge/plugins/PaintPlugin/src/DkPaintPlugin.cpp \
 		ImageLounge/src/DkGui/DkWidgets.cpp
 
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 
 CMAKE_ARGS=		-DUSE_SYSTEM_QUAZIP=ON
 CMAKE_SOURCE_PATH=	${WRKSRC}/ImageLounge
 
 OPTIONS_DEFINE=		RAW TIFF TRANSLATIONS PLUGINS
 OPTIONS_DEFAULT=	RAW TIFF TRANSLATIONS PLUGINS
 OPTIONS_SUB=		yes
 
 RAW_LIB_DEPENDS=	libraw.so:graphics/libraw
 RAW_CMAKE_BOOL=		ENABLE_RAW
 
 TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
 TIFF_CMAKE_BOOL=	ENABLE_TIFF
 
 TRANSLATIONS_CMAKE_BOOL=	ENABLE_TRANSLATIONS
 TRANSLATIONS_DESC=		Install translations
 
 PLUGINS_GH_TUPLE=	nomacs:nomacs-plugins:3.16:plugins/ImageLounge/plugins
 PLUGINS_CMAKE_ON=	ENABLE_PLUGINS
 
 .include <bsd.port.mk>
diff --git a/graphics/nurbs++/Makefile b/graphics/nurbs++/Makefile
index 4eced68fa52e..0d11d6781516 100644
--- a/graphics/nurbs++/Makefile
+++ b/graphics/nurbs++/Makefile
@@ -1,18 +1,18 @@
 PORTNAME=	nurbs++
 PORTVERSION=	3.0.11
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	graphics
 MASTER_SITES=	SF/libnurbs/nurbs%2B%2B/${PORTVERSION}
 
 MAINTAINER=	gahr@FreeBSD.org
 COMMENT=	C++ library to manipulate and create NURBS curves and surfaces
 WWW=		http://libnurbs.sourceforge.net/
 
 USES=		libtool tar:bzip2
 GNU_CONFIGURE=	yes
 USE_GCC=	yes
 USE_LDCONFIG=	yes
 
 INSTALL_TARGET=	install-strip
 
 .include <bsd.port.mk>
diff --git a/graphics/oidn/Makefile b/graphics/oidn/Makefile
index bab0bfd74b1d..3e806b1b21ec 100644
--- a/graphics/oidn/Makefile
+++ b/graphics/oidn/Makefile
@@ -1,74 +1,74 @@
 PORTNAME=	oidn
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.4.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics
 MASTER_SITES=	http://freebsd.org/:weights # bogus URL to make the framework happy, the fetch uses Git URL below
 DISTFILES=	${PORTNAME}-weights-${WEIGHTS_GIT_HASH}${EXTRACT_SUFX}:weights
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Intel(R) Open Image Denoise library
 WWW=		https://www.openimagedenoise.org/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 ONLY_FOR_ARCHS=		amd64
 ONLY_FOR_ARCHS_REASON=	Intel(R) MKL-DNN supports x86 64 bit platforms only (oidn contains a custom version of mkl-dnn, see math/mkl-dnn), and ISPC has a limited availability
 
 FETCH_DEPENDS=	git:devel/git \
 		git-lfs:devel/git-lfs
 BUILD_DEPENDS=	ispc>=1.14.1:devel/ispc
 LIB_DEPENDS=	libtbb.so:devel/onetbb
 
 USES=		cmake:noninja compiler:c++14-lang python:build
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	OpenImageDenoise
 GH_TUPLE=	OpenImageDenoise:mkl-dnn:f53274c:m/mkl-dnn
 
 CMAKE_ARGS=	-DTBB_ROOT:STRING=${LOCALBASE} -DTBB_INCLUDE_DIR:STRING=${LOCALBASE}/include -DPYTHON_EXECUTABLE:STRING=${PYTHON_CMD}
 
 PLIST_SUB=	VER="${PORTVERSION}"
 
 OPTIONS_DEFINE=			APPS DOCS OPENIMAGEIO
 OPTIONS_DEFAULT=		APPS OPENIMAGEIO
 OPTIONS_SUB=			yes
 
 APPS_DESC=			Build example and test apps
 APPS_CMAKE_BOOL=		OIDN_APPS
 
 DOCSDIR=			share/doc/${GH_ACCOUNT}
 
 OPENIMAGEIO_DESC=		Build with OpenImageIO for image formats support
 OPENIMAGEIO_CMAKE_BOOL=		OIDN_APPS_OPENIMAGEIO
 OPENIMAGEIO_LIB_DEPENDS=	libOpenImageIO.so:graphics/openimageio
 OPENIMAGEIO_IMPLIES=		APPS # OpenImageIO is only used by apps and examples
 
 WEIGHTS_GIT_URL=	https://github.com/OpenImageDenoise/oidn-weights.git
 WEIGHTS_GIT_HASH=	a34b7641349c5a79e46a617d61709c35df5d6c28
 
 pre-fetch:
 	@if [ "${FORCE_FETCH_ALL}" = "true" ] || ! [ -f "${DISTDIR}/${DIST_SUBDIR}/${PORTNAME}-weights-${WEIGHTS_GIT_HASH}${EXTRACT_SUFX}" ]; then \
 		${MKDIR} ${DISTDIR}/${DIST_SUBDIR} && \
 		cd ${DISTDIR}/${DIST_SUBDIR} && \
 		${ECHO} "==> Fetching the oidn/weights subproject with large LFS files" && \
 		( \
 			${MKDIR} ${WRKDIR}; \
 			HOME=${WRKDIR}; \
 			git config --global filter.lfs.smudge "git-lfs smudge -- %f" && \
 			git clone -q ${WEIGHTS_GIT_URL} ${PORTNAME}-weights-${WEIGHTS_GIT_HASH} && \
 			(cd ${PORTNAME}-weights-${WEIGHTS_GIT_HASH} && git reset -q --hard ${WEIGHTS_GIT_HASH} && ${RM} -r .git) && \
 			${RM} -r ${WRKDIR} \
 		) && \
 		${FIND} ${PORTNAME}-weights-${WEIGHTS_GIT_HASH} -and -exec ${TOUCH} -h -d 1970-01-01T00:00:00Z {} \; && \
 		${FIND} ${PORTNAME}-weights-${WEIGHTS_GIT_HASH} -print0 | LC_ALL=C ${SORT} -z | \
 		${TAR} czf ${PORTNAME}-weights-${WEIGHTS_GIT_HASH}${EXTRACT_SUFX} --format=bsdtar --gid 0 --uid 0 --options gzip:!timestamp --no-recursion --null -T - && \
 		${RM} -r ${PORTNAME}-weights-${WEIGHTS_GIT_HASH}; \
 	fi
 
 post-extract:
 	@cd ${WRKSRC} && ${RMDIR} weights && ${LN} -s ${WRKDIR}/${PORTNAME}-weights-${WEIGHTS_GIT_HASH} weights
 
 .include <bsd.port.mk>
diff --git a/graphics/open3d/Makefile b/graphics/open3d/Makefile
index 06f13334bf99..db63518cac82 100644
--- a/graphics/open3d/Makefile
+++ b/graphics/open3d/Makefile
@@ -1,36 +1,36 @@
 PORTNAME=	Open3D
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.2
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	graphics
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Modern library for 3D data processing
 WWW=		http://www.open3d.org/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/../LICENSE
 
 LIB_DEPENDS=	libglfw.so:graphics/glfw \
 		libjsoncpp.so:devel/jsoncpp \
 		libpng.so:graphics/png
 
 USES=		cmake compiler:c++14-lang eigen:3 gl jpeg localbase:ldflags \
 		pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	IntelVCL
 USE_GL=		gl glew glu
 USE_LDCONFIG=	yes
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 CMAKE_OFF=	BUILD_TESTS BUILD_PYBIND11 BUILD_PYTHON_MODULE BUILD_PYTHON_TUTORIALS
 
 WRKSRC_SUBDIR=	src
 LDFLAGS+=	-pthread # https://github.com/IntelVCL/Open3D/issues/510
 
 post-install: # https://github.com/IntelVCL/Open3D/issues/509
 .for d in include/Open3D/IO/FileFormat include/Open3D/Visualization/Shader/GLSL
 	@${RMDIR} ${STAGEDIR}${PREFIX}/${d}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/graphics/opencolorio-tools/Makefile b/graphics/opencolorio-tools/Makefile
index dcc8cf7cf230..6db12e7be1ea 100644
--- a/graphics/opencolorio-tools/Makefile
+++ b/graphics/opencolorio-tools/Makefile
@@ -1,10 +1,10 @@
-PORTREVISION=	2
+PORTREVISION=	3
 PKGNAMESUFFIX=	-tools
 
 COMMENT=	Tools to work with OpenColorIO profiles
 
 MASTERDIR=	${.CURDIR}/../opencolorio
 OCIO_SLAVE=	tools
 OPTIONS_EXCLUDE=	DOCS
 
 .include "${MASTERDIR}/Makefile"
diff --git a/graphics/opencv/Makefile b/graphics/opencv/Makefile
index 721dfb3b2b8f..874c0c015aad 100644
--- a/graphics/opencv/Makefile
+++ b/graphics/opencv/Makefile
@@ -1,241 +1,241 @@
 PORTNAME=	opencv
 DISTVERSION=	4.6.0
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	graphics
 
 MAINTAINER=	desktop@FreeBSD.org
 COMMENT=	Open Source Computer Vision library
 WWW=		https://www.opencv.org/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 		libgflags.so:devel/gflags \
 		libglog.so:devel/glog \
 		libharfbuzz.so:print/harfbuzz \
 		libhdf5.so:science/hdf5
 
 USES=		cmake compiler:c++14-lang cpe localbase:ldflags pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	WeChatCV:wechat
 GH_PROJECT=	opencv_contrib:contrib \
 		ade:ade \
 		opencv_3rdparty:extra_mod_3rdparty_boost_descr \
 		opencv_3rdparty:extra_mod_3rdparty_vgg \
 		opencv_3rdparty:wechat \
 		opencv_3rdparty:face \
 		opencv_3rdparty:ippicv
 GH_TAGNAME=	v0.1.1f:ade \
 		34e4206aef44d50e6bbcd0ab06354b52e7466d26:extra_mod_3rdparty_boost_descr \
 		fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d:extra_mod_3rdparty_vgg \
 		a8b69ccc738421293254aec5ddb38bd523503252:wechat \
 		8afa57abc8229d611c4937165d20e2a2d9fc5a12:face \
 		a56b6ac6f030c312b2dce17430eef13aed9af274:ippicv
 
 CMAKE_ON=	OPENCV_GENERATE_PKGCONFIG
 CMAKE_OFF=	OPENCV_GENERATE_SETUPVARS \
 		BUILD_opencv_python2 \
 		BUILD_TESTS
 CMAKE_ARGS=	-DOPENCV_EXTRA_MODULES_PATH="${WRKSRC}/contrib/modules"
 
 DATADIR=	${PREFIX}/share/${PORTNAME}4
 
 PLIST_SUB=	SHLIB_VER=${DISTVERSION}
 
 OPTIONS_DEFINE=		EIGEN GDAL GDCM HARDENING JAVA LTO OPENCL \
 			PATENTED PROTOBUF PYTHON TBB TESSERACT
 
 OPTIONS_GROUP=		GUI IMAGE VIDEO
 OPTIONS_GROUP_GUI=	GTK3 VTK
 OPTIONS_GROUP_IMAGE=	GPHOTO2 JPEG OPENEXR PNG TIFF
 OPTIONS_GROUP_VIDEO=	DC1394 FFMPEG GSTREAMER V4L VULKAN WEBP XINE
 
 OPTIONS_SINGLE=		BLAS
 OPTIONS_SINGLE_BLAS=	ATLAS OPENBLAS NOBLAS
 
 OPTIONS_RADIO=		JPEG2K
 OPTIONS_RADIO_JPEG2K=	JASPER OPENJPEG
 
 OPTIONS_DEFAULT=	EIGEN GDAL GDCM OPENCL PROTOBUF PYTHON \
 			DC1394 GSTREAMER V4L VULKAN WEBP \
 			GPHOTO2 JPEG OPENEXR PNG TIFF \
 			OPENBLAS \
 			OPENJPEG
 OPTIONS_SUB=		yes
 
 # Normal options (EIGEN GDAL GDCM HARDENING JAVA LTO OPENCL PATENTED PROTOBUF PYTHON TBB)
 EIGEN_DESC=		Add Eigen v3 Support, builds sfm modules
 EIGEN_CMAKE_BOOL=	WITH_EIGEN
 EIGEN_USES=		eigen:3
 
 GDAL_DESC=		Add Geospatial Data Abstraction Library Support
 GDAL_CMAKE_BOOL=	WITH_GDAL
 GDAL_LIB_DEPENDS=	libgdal.so:graphics/gdal
 
 GDCM_DESC=		Add Open source DICOM library Support
 GDCM_CMAKE_BOOL=	WITH_GDCM
 GDCM_LIB_DEPENDS=	libgdcmMSFF.so:devel/gdcm
 
 HARDENING_DESC=		Enables Build Hardening
 HARDENING_CMAKE_BOOL=	ENABLE_BUILD_HARDENING
 
 JAVA_DESC=		Enable Java Support
 JAVA_BUILD_DEPENDS=	ant:devel/apache-ant
 JAVA_CMAKE_BOOL=	BUILD_opencv_java BUILD_opencv_java_bindings_generator BUILD_JAVA
 JAVA_MAKE_ENV=		JAVACMD=${JAVA}
 JAVA_USE=		JAVA=yes
 
 LTO_DESC=		Enables Link Time Optimizations
 LTO_CMAKE_BOOL=		ENABLE_THIN_LTO
 
 OPENCL_DESC=		Add OpenCL Support
 OPENCL_CMAKE_BOOL=	WITH_OPENCL
 OPENCL_BUILD_DEPENDS=	opencl>=0:devel/opencl
 OPENCL_RUN_DEPENDS=	opencl>=0:devel/opencl
 
 PATENTED_DESC=		Enable patented 2d feature detection USE AT OWN RISK
 PATENTED_CMAKE_BOOL=	OPENCV_ENABLE_NONFREE
 
 PROTOBUF_DESC=		Enable protobuf support, builds dnn modules
 PROTOBUF_CMAKE_BOOL=	WITH_PROTOBUF
 PROTOBUF_LIB_DEPENDS=	libprotobuf.so:devel/protobuf
 
 PYTHON_DESC=		Enable Python Support 3.6 or greater
 PYTHON_BUILD_DEPENDS=	${PYNUMPY}
 PYTHON_RUN_DEPENDS=	${PYNUMPY}
 PYTHON_USES=		python:3.6+
 PYTHON_CMAKE_BOOL=	BUILD_opencv_python3
 PYTHON_CMAKE_ON=	-DOPENCV_PYTHON3_INSTALL_PATH=${PYTHON_SITELIBDIR}
 
 TBB_DESC=		Add Intel Threading Building Blocks Support
 TBB_CMAKE_BOOL=		WITH_TBB
 TBB_LIB_DEPENDS=	libtbb.so:devel/onetbb
 
 TESSERACT_DESC=		Add Tesseract-based OCR
 TESSERACT_LIB_DEPENDS=	libtesseract.so:graphics/tesseract
 TESSERACT_CMAKE_BOOL=	WITH_TESSERACT
 ###
 
 # GUI group options (GTK3 VTK)
 GTK3_USES=		gnome
 GTK3_USE=		gnome=gtk30
 GTK3_CMAKE_BOOL=	WITH_GTK
 
 VTK_DESC=		Include VTK library support (build opencv_viz module)
 VTK_CMAKE_BOOL=		WITH_VTK
 VTK_LIB_DEPENDS=	libvtkCommonCore-${VTK_VER}.so:math/vtk${VTK_VER:R}
 VTK_USES=		qt:5
 VTK_USE=		QT=buildtools:build,qmake:build
 ###
 
 # IMAGE group options (GPHOTO2 JPEG OPENEXR PNG TIFF)
 GPHOTO2_DESC=		Add Gphoto2 Support
 GPHOTO2_CMAKE_BOOL=	WITH_GPHOTO2
 GPHOTO2_LIB_DEPENDS=	libgphoto2.so:graphics/libgphoto2
 
 JPEG_DESC=		Add LibJpeg Support
 JPEG_CMAKE_BOOL=	WITH_JPEG
 JPEG_USES=		jpeg
 
 OPENEXR_DESC=		Add OpenEXR Support
 OPENEXR_CMAKE_BOOL=	WITH_OPENEXR
 OPENEXR_LIB_DEPENDS=	libOpenEXR.so:graphics/openexr
 
 PNG_DESC=		Add LibPNG Support
 PNG_CMAKE_BOOL=		WITH_PNG
 PNG_LIB_DEPENDS=	libpng16.so:graphics/png
 
 TIFF_DESC=		Add LibTIFF Support
 TIFF_CMAKE_BOOL=	WITH_TIFF
 TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
 ###
 
 # VIDEO group options (DC1394 FFMPEG GSTREAMER V4L VULKAN WEBP XINE)
 DC1394_DESC=		IEEE 1394 camera support
 DC1394_CMAKE_BOOL=	WITH_1394
 DC1394_LIB_DEPENDS=	libdc1394.so:multimedia/libdc1394
 
 FFMPEG_DESC=		Link with ffmpeg
 FFMPEG_CMAKE_BOOL=	WITH_FFMPEG
 FFMPEG_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
 
 GSTREAMER_DESC=		Add GSTREAMER Support
 GSTREAMER_CMAKE_BOOL=	WITH_GSTREAMER
 GSTREAMER_USES=		gstreamer
 
 V4L_DESC=		Enable support for Video for Linux
 V4L_CMAKE_BOOL=		WITH_V4L WITH_LIBV4L
 V4L_BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat
 V4L_LIB_DEPENDS=	libv4l2.so:multimedia/libv4l
 
 VULKAN_DESC=		Add Vulkan Support
 VULKAN_CMAKE_BOOL=	WITH_VULKAN
 VULKAN_CMAKE_ON=	-DVULKAN_INCLUDE_DIRS=${LOCALBASE}/include
 VULKAN_BUILD_DEPENDS=	vulkan-headers>0:graphics/vulkan-headers
 
 WEBP_DESC=		Add Webp Support
 WEBP_CMAKE_BOOL=	WITH_WEBP
 WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp
 
 XINE_DESC=		Add Xine Support
 XINE_CMAKE_BOOL=	WITH_XINE
 XINE_LIB_DEPENDS=	libxine.so:multimedia/libxine
 ###
 
 # BLAS group options (ATLAS OPENBLAS NOBLAS)
 ATLAS_DESC=		ATLAS blas implementation with lapacke
 ATLAS_USES=		blaslapack:atlas
 ATLAS_BUILD_DEPENDS=	cblas>0:math/cblas \
 			lapacke>0:math/lapacke
 
 OPENBLAS_DESC=		OpenBLAS blas implementation with lapacke
 OPENBLAS_USES=		blaslapack:openblas
 OPENBLAS_BUILD_DEPENDS=	cblas>0:math/cblas \
 			lapacke>0:math/lapacke
 
 NOBLAS_DESC=		Disable support for lapack/blas
 NOBLAS_CMAKE_BOOL_OFF=	WITH_LAPACK
 ###
 
 # JPEG2K group options (JASPER OPENJPEG)
 JASPER_DESC=		Add Jasper Support for JPEG2000
 JASPER_CMAKE_BOOL=	WITH_JASPER
 JASPER_LIB_DEPENDS=	libjasper.so:graphics/jasper
 
 OPENJPEG_DESC=		Add OpenJPEG Support for JPEG2000, OpenCV preferred
 OPENJPEG_CMAKE_BOOL=	WITH_OPENJPEG
 OPENJPEG_LIB_DEPENDS=	libopenjp2.so:graphics/openjpeg
 ###
 
 _IPPICV_i386=		ippicv/ippicv_2020_lnx_ia32_20191018_general.tgz
 _IPPICV_amd64=		ippicv/ippicv_2020_lnx_intel64_20191018_general.tgz
 
 post-extract:
 	# Handle contrib
 	${MV} ${WRKSRC_contrib} ${WRKSRC}/contrib
 	# Handle prefetched ade modul
 	${MKDIR} ${BUILD_WRKSRC}/3rdparty/ade
 	${MV} ${WRKSRC_ade} ${BUILD_WRKSRC}/3rdparty/ade
 	# Handle prefetched xfeatures2d
 	${MKDIR} ${BUILD_WRKSRC}/downloads/xfeatures2d
 	${CP} ${WRKSRC_extra_mod_3rdparty_boost_descr}/* ${BUILD_WRKSRC}/downloads/xfeatures2d
 	${CP} ${WRKSRC_extra_mod_3rdparty_vgg}/* ${BUILD_WRKSRC}/downloads/xfeatures2d
 	# Handle prefetched wechat
 	${MKDIR} ${BUILD_WRKSRC}/downloads/wechat_qrcode
 	${CP} ${WRKSRC_wechat}/* ${BUILD_WRKSRC}/downloads/wechat_qrcode/
 	# Handle Face
 	${MKDIR} ${BUILD_WRKSRC}/share/opencv4/testdata/cv/face
 	${CP} ${WRKSRC_face}/* ${BUILD_WRKSRC}/share/opencv4/testdata/cv/face
 	# Handle ippicv
 .if defined(_IPPICV_${ARCH})
 	${MKDIR} ${BUILD_WRKSRC}/3rdparty/ippicv
 	(cd ${BUILD_WRKSRC}/3rdparty/ippicv && ${EXTRACT_CMD} -xf ${WRKSRC_ippicv}/${_IPPICV_${ARCH}})
 .endif
 
 post-patch:
 	${REINPLACE_CMD} -e 's|/usr/lib/atlas-base|${LOCALBASE}/lib|g' ${WRKSRC}/cmake/OpenCVFindAtlas.cmake
 	${REINPLACE_CMD} -e 's|/usr/include/atlas|${LOCALBASE}/include|g' ${WRKSRC}/cmake/OpenCVFindAtlas.cmake
 
 .include <../../math/vtk9/Makefile.version>
 .include <bsd.port.mk>
diff --git a/graphics/opendx/Makefile b/graphics/opendx/Makefile
index de969d50ce7e..572a4ce77fa4 100644
--- a/graphics/opendx/Makefile
+++ b/graphics/opendx/Makefile
@@ -1,107 +1,107 @@
 PORTNAME=	opendx
 PORTVERSION=	4.4.4
-PORTREVISION=	35
+PORTREVISION=	36
 CATEGORIES=	graphics math java
 MASTER_SITES=	http://www.sfr-fresh.com/unix/misc/
 DISTNAME=	dx-${PORTVERSION}
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	IBM's Open Visualization Data Explorer
 WWW=		http://www.opendx.org/
 
 LICENSE=	IBM-OVDX-v1
 LICENSE_NAME=	IBM PUBLIC LICENSE - Open Visualization Data Explorer VERSION 1.0
 LICENSE_FILE=	${WRKSRC}/LICENSE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 BROKEN_aarch64=	fails to link: undefined symbol: sbrk
 
 LIB_DEPENDS=	libtiff.so:graphics/tiff		\
 		libcdf.so:science/cdf
 
 MAKE_JOBS_UNSAFE=	yes
 USES=		bison compiler:c++17-lang gl gmake libtool magick:6 motif xorg
 USE_XORG=	x11 xt xinerama xext xpm xmu sm ice
 USE_GL=		gl glu
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared
 USE_LDCONFIG=	yes
 CONFIGURE_ENV=	ARCH=freebsd
 CPPFLAGS+=	${CXXFLAGS} -I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 NO_MTREE=	yes
 PLIST_SUB=	ARCH=freebsd
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
 .if defined(WITH_HDF) && !defined(WITHOUT_NETCDF)
 IGNORE=	HDF and NETCDF are conflicting
 .endif
 
 .if defined(WITH_HDF)
 LIB_DEPENDS+=	libmfhdf.so:science/hdf
 .else
 CONFIGURE_ARGS+=	--without-hdf
 .endif
 
 .if !defined(WITHOUT_NETCDF)
 LIB_DEPENDS+=	libnetcdf.so:science/netcdf
 .else
 CONFIGURE_ARGS+=	--without-netcdf
 .endif
 
 .if defined(WITH_JAVA)
 ONLY_FOR_ARCHS=	i386
 USE_JAVA=	yes
 BUILD_DEPENDS+=	${JAVALIBDIR}/npcosmop211.jar:graphics/cosmoplayer
 RUN_DEPENDS+=	${JAVALIBDIR}/npcosmop211.jar:graphics/cosmoplayer
 CONFIGURE_ARGS+=	--with-cosmojar-path=${JAVALIBDIR}/npcosmop211.jar \
 			--with-java40jar-path=${JAVALIBDIR}/java40.jar \
 			--with-jni-path=${JAVA_HOME}/include:${JAVA_HOME}/include/freebsd
 PLIST_SUB+=	JAVA=""
 DIR2PRUNE=	dx/java/user dx/java/server/nets
 .else
 CONFIGURE_ARGS+=	--without-javadx
 PLIST_SUB+=	JAVA="@comment "
 .endif
 
 PLIST_SUB+=	UNAMEP=${ARCH}
 
 .include <bsd.port.pre.mk>
 
 post-patch:
 	@${RM} ${WRKSRC}/include/stamp-h.in
 .for dir in doc help html man
 	@${FIND} ${WRKSRC}/${dir} -type f | ${XARGS} \
 		${REINPLACE_CMD} -e "s;/usr/lpp;${PREFIX};g"
 .endfor
 	@${REINPLACE_CMD} -e "s;/usr/X11R6;${LOCALBASE};g" \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e "s|startserver.bat||" \
 		${WRKSRC}/src/uipp/java/server/Makefile.in
 	@${REINPLACE_CMD} -e 's|$$(ARCH)|@ARCH@|' \
 		${WRKSRC}/src/misc/Makefile.*
 	@${REINPLACE_CMD} -e 's/void exit (int);/[[noreturn]] void exit (int);/' \
 		${WRKSRC}/configure
 	for f in `find ${WRKSRC} -name "*.bm"`; do \
 		if [ $${f%/*} != "${WRKSRC}/src/uipp/widgets" ]; then \
 				${REINPLACE_CMD} -E 's/0x(..)/static_cast<char>(0x\1)/g' $$f; \
 				${REINPLACE_CMD} -E 's/static unsigned char/static char/g' $$f; \
 		fi; \
 	done
 
 post-install:
 	@${CP} ${FILESDIR}/pkg-message.in ${PKGMESSAGE}
 .if defined(WITH_JAVA)
 	${CHMOD} 0775 ${STAGEDIR}${PREFIX}/dx/java/server/nets
 	${TOUCH} ${DIR2PRUNE:S|^|${STAGEDIR}${PREFIX}/|:S|$|/.keepme|}
 	@${ECHO} "---------------------------------------------------------"	\
 		>> ${PKGMESSAGE}
 	@${ECHO} "Before starting ${PREFIX}/dx/java/server/bin/startserver"	\
 		>> ${PKGMESSAGE}
 	@${ECHO} "you must install the port graphics/opendx-samples."		\
 		>> ${PKGMESSAGE}
 .endif
 	@${ECHO} "---------------------------------------------------------"	\
 		>> ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/graphics/opengv/Makefile b/graphics/opengv/Makefile
index d0fbf52e4db1..83bec49d20cb 100644
--- a/graphics/opengv/Makefile
+++ b/graphics/opengv/Makefile
@@ -1,35 +1,36 @@
 PORTNAME=	opengv
 DISTVERSION=	g20200806
+PORTREVISION=	1
 CATEGORIES=	graphics
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Collection of methods for solving geometric vision problems
 WWW=		https://laurentkneip.github.io/opengv/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/License.txt
 
 USES=		cmake compiler:c++11-lib eigen:3
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	laurentkneip
 GH_TAGNAME=	91f4b19
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 CMAKE_OFF=	BUILD_TESTS
 
 do-test:
 	@cd ${BUILD_WRKSRC} && \
 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBUILD_TESTS:BOOL=ON ${CMAKE_SOURCE_PATH} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
 
 .include <bsd.port.pre.mk>
 
 # disable march-native on non-x86 archs
 .if ${ARCH} != amd64 && ${ARCH} != i386
 EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-CMakeLists.txt
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/graphics/openimageio/Makefile b/graphics/openimageio/Makefile
index 2e1359b3fe5e..8141baef680a 100644
--- a/graphics/openimageio/Makefile
+++ b/graphics/openimageio/Makefile
@@ -1,136 +1,136 @@
 PORTNAME=	openimageio
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.4.4.2
 # PORTREVISION must be set with ?= so as not to stomp over
 # py-openimageio's PORTREVISION.
 # Also, just to be on the safe side, when resetting,
 # best keep PORTREVISION?=	0.
-PORTREVISION?=	8
+PORTREVISION?=	9
 CATEGORIES?=	graphics multimedia
 
 MAINTAINER?=	FreeBSD@Shaneware.biz
 COMMENT?=	OpenImageIO graphics library
 WWW=		https://www.openimageio.org/
 
 LICENSE=	BSD3CLAUSE
 
 BUILD_DEPENDS=	${LOCALBASE}/include/tsl/robin_map.h:devel/robin-map
 LIB_DEPENDS=	libboost_thread.so:devel/boost-libs \
 		libfmt.so:devel/libfmt \
 		libhdf5.so:science/hdf5 \
 		libheif.so:graphics/libheif \
 		libImath.so:math/Imath \
 		libOpenColorIO.so:graphics/opencolorio \
 		libOpenEXR.so:graphics/openexr \
 		libpng.so:graphics/png \
 		libsquish.so:graphics/squish \
 		libtiff.so:graphics/tiff \
 		libwebp.so:graphics/webp
 
 USES=		cmake jpeg compiler:c++14-lang iconv:wchar_t qt:5
 
 USE_QT+=	buildtools:build qmake:build
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	OpenImageIO
 GH_PROJECT=	oiio
 
 CMAKE_OFF=	BUILDSTATIC INSTALL_FONTS LINKSTATIC NOTHREADS \
 		STOP_ON_WARNING USE_OPENSSL OIIO_DOWNLOAD_MISSING_TESTDATA
 
 OPTIONS_DEFINE=		DICOM DOCS FFMPEG FREETYPE GIF IMAGEVIEWER \
 			OPENCV OPENJPEG PTEX RAW TBB TEST TOOLS VDB
 OPTIONS_DEFAULT=	DICOM FREETYPE GIF OPENJPEG PTEX TOOLS VDB
 OPTIONS_SUB=		yes
 
 DOCS_CMAKE_BOOL=	INSTALL_DOCS
 DOCS_CMAKE_ON=		-DCMAKE_INSTALL_DOCDIR:STRING=${DOCSDIR}
 
 DICOM_DESC=		DICOM/MEDICOM support
 DICOM_CMAKE_BOOL=	USE_DICOM
 DICOM_LIB_DEPENDS=	libdcmimage.so:graphics/dcmtk
 
 FFMPEG_DESC=		Use FFmpeg to support extra file types
 FFMPEG_CMAKE_BOOL=	USE_FFMPEG
 FFMPEG_LIB_DEPENDS=	libavutil.so:multimedia/ffmpeg
 
 FREETYPE_CMAKE_BOOL=	USE_FREETYPE
 FREETYPE_LIB_DEPENDS=	libfreetype.so:print/freetype2
 FREETYPE_RUN_DEPENDS=	${LOCALBASE}/share/fonts/Droid/DroidSans.ttf:x11-fonts/droid-fonts-ttf
 
 GIF_CMAKE_BOOL=		USE_GIF
 GIF_LIB_DEPENDS=	libgif.so:graphics/giflib
 
 IMAGEVIEWER_DESC=	Build image viewer (requires Qt)
 IMAGEVIEWER_USES=	gl
 IMAGEVIEWER_IMPLIES=	TOOLS
 IMAGEVIEWER_CMAKE_BOOL=	USE_QT USE_OPENGL
 IMAGEVIEWER_USE=	GL=gl,glu,glew \
 			QT=buildtools,core,gui,opengl,qmake:build,widgets
 
 OPENCV_CMAKE_BOOL=	USE_OPENCV
 OPENCV_IMPLIES=		OPENJPEG
 OPENCV_LIB_DEPENDS=	libopencv_highgui.so:graphics/opencv \
 			libopencv_core.so:graphics/opencv
 
 OPENJPEG_CMAKE_BOOL=	USE_OPENJPEG
 OPENJPEG_LIB_DEPENDS=	libopenjp2.so:graphics/openjpeg
 
 PTEX_DESC=		ptex support
 PTEX_LIB_DEPENDS=	libPtex.so:graphics/ptex
 
 RAW_CMAKE_BOOL=		USE_LIBRAW
 RAW_LIB_DEPENDS=	libraw_r.so:graphics/libraw
 
 TBB_DESC=		Intel tbb support
 TBB_CMAKE_BOOL=		USE_TBB
 TBB_LIB_DEPENDS=	libtbb.so:devel/onetbb
 
 TEST_CMAKE_BOOL=	OIIO_BUILD_TESTS
 
 TOOLS_DESC=		Build CLI tools
 TOOLS_CMAKE_BOOL=	OIIO_BUILD_TOOLS
 
 VDB_DESC=		OpenVDB support
 VDB_CMAKE_BOOL=		USE_OPENVDB
 VDB_LIB_DEPENDS=	libopenvdb.so:misc/openvdb
 
 PLIST_SUB=	SHL3=${PORTVERSION:R} SHL2=${PORTVERSION:R:R} SHL1=${PORTVERSION:R:R:R}
 SHL2=		${PORTVERSION:R:R}
 SHL1=		${PORTVERSION:R:R:R}
 
 post-patch:
 	@${REINPLACE_CMD} -e "s,%%LOCALBASE%%,${LOCALBASE}," ${WRKSRC}/src/cmake/modules/FindPtex.cmake
 
 .include <bsd.port.options.mk>
 
 .if ${SLAVE_PORT} == yes
 BUILD_DEPENDS+=	${PREFIX}/share/cmake/pybind11/pybind11Config.cmake:devel/pybind11
 LIB_DEPENDS+=	libOpenImageIO.so:graphics/openimageio
 PLIST=		${PKGDIR}/pkg-plist-pybind
 USES+=		python
 USE_PYTHON=	flavors
 CMAKE_ON+=	USE_PYTHON
 # we don't need the apps built - only libs.
 CMAKE_OFF+=	USE_QT USE_OPENGL OIIO_BUILD_TOOLS OIIO_BUILD_TESTS \
 		EMBED_PLUGINS
 CMAKE_ARGS+=	-DPYTHON_VERSION:STRING=${PYTHON_VER}
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 	${INSTALL_LIB} ${BUILD_WRKSRC}/lib/python/site-packages/OpenImageIO*.so ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 .else # SLAVE_PORT != yes
 USE_LDCONFIG=	yes
 CMAKE_OFF+=	USE_PYTHON
 
 post-install:
 	${LN} -sf libOpenImageIO.so.${SHL2} \
 		${STAGEDIR}${PREFIX}/lib/libOpenImageIO.so.${SHL1}
 	${LN} -sf libOpenImageIO_Util.so.${SHL2} \
 		${STAGEDIR}${PREFIX}/lib/libOpenImageIO_Util.so.${SHL1}
 
 do-test-TEST-on:
 	@cd ${BUILD_WRKSRC} && ${SETENV} ARGS=-V ${MAKE_CMD} test
 .endif # SLAVE_PORT
 
 .include <bsd.port.mk>
diff --git a/graphics/openmvs/Makefile b/graphics/openmvs/Makefile
index eda453028e20..180eb4889ed4 100644
--- a/graphics/openmvs/Makefile
+++ b/graphics/openmvs/Makefile
@@ -1,47 +1,47 @@
 PORTNAME=	openmvs
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Open Multi-View Stereo reconstruction library
 WWW=		https://github.com/cdcseacave/openMVS
 
 LICENSE=	AGPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_aarch64=	use of undeclared identifier '__builtin_ia32_emms' # https://github.com/cdcseacave/openMVS/issues/847
 
 BUILD_DEPENDS=	cgal>0:math/cgal \
 		${LOCALBASE}/include/sys/sysinfo.h:devel/libsysinfo \
 		vcglib>0:devel/vcglib
 LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 		libceres.so:math/ceres-solver \
 		libgflags.so:devel/gflags \
 		libglog.so:devel/glog \
 		libgmp.so:math/gmp \
 		libmpfr.so:math/mpfr \
 		libopencv_core.so:graphics/opencv \
 		libpng16.so:graphics/png \
 		libtiff.so:graphics/tiff
 
 USES=		cmake:testing compiler:c++17-lang eigen:3 jpeg
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	cdcseacave
 GH_PROJECT=	openMVS
 
 CMAKE_ON=	BUILD_SHARED_LIBS OpenMVS_USE_CERES
 CMAKE_OFF=	OpenMVS_BUILD_TOOLS # tools can't be built because of https://github.com/cdcseacave/openMVS/issues/846
 CMAKE_OFF+=	OpenMVS_ENABLE_TESTS
 CMAKE_ARGS=	-DVCG_ROOT=${LOCALBASE}/include/vcglib
 CMAKE_TESTING_ON=	OpenMVS_ENABLE_TESTS # tests fail to configure, see https://github.com/cdcseacave/openMVS/issues/911
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} != amd64 && ${ARCH} != i386
 CMAKE_ARGS+=	-DOpenMVS_USE_SSE:BOOL=OFF
 .endif
 
 .include <bsd.port.mk>
diff --git a/graphics/openorienteering-mapper/Makefile b/graphics/openorienteering-mapper/Makefile
index 681812ce5a28..ebdefcffee72 100644
--- a/graphics/openorienteering-mapper/Makefile
+++ b/graphics/openorienteering-mapper/Makefile
@@ -1,55 +1,55 @@
 PORTNAME=	openorienteering-mapper
 PORTVERSION=	0.9.5
-PORTREVISION=	4
+PORTREVISION=	5
 DISTVERSIONPREFIX=	v
 CATEGORIES=	graphics geography
 
 MAINTAINER=	sikmir@gmail.com
 COMMENT=	Map drawing program from OpenOrienteering
 WWW=		https://www.openorienteering.org/apps/mapper/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 PATCH_SITES=	https://github.com/OpenOrienteering/mapper/commit/
 PATCHFILES=	69977dfd4cbb8608aafa8ca8b5388d4983f5430a.patch:-p1
 
 LIB_DEPENDS=	libpolyclipping.so:graphics/polyclipping \
 		libproj.so:graphics/proj
 
 USES=		cmake:noninja compiler:c++14-lang \
 		desktop-file-utils gmake qt:5 shared-mime-info
 USE_QT=		buildtools:build help qmake:build concurrent core gui \
 		network printsupport testlib widgets
 USE_GITHUB=	yes
 GH_ACCOUNT=	OpenOrienteering
 GH_PROJECT=	mapper
 
 CMAKE_ARGS+=	-DLICENSING_PROVIDER=freebsd \
 		-DMapper_PACKAGE_NAME=${PORTNAME} \
 		-Wno-dev
 
 OPTIONS_DEFINE=	DOCS EXAMPLES GDAL NLS POSITIONING TEST TIFF
 OPTIONS_DEFAULT=	DOCS EXAMPLES GDAL NLS TIFF
 OPTIONS_SUB=	yes
 DOCS_CMAKE_BOOL=	Mapper_WITH_DOCS
 DOCS_BUILD_DEPENDS=	doxygen:devel/doxygen
 DOCS_USE=	QT=assistant:run
 EXAMPLES_CMAKE_BOOL=	Mapper_WITH_EXAMPLES
 GDAL_DESC=	Use the GDAL library
 GDAL_CMAKE_BOOL=	Mapper_USE_GDAL
 GDAL_LIB_DEPENDS=	libgdal.so:graphics/gdal
 NLS_CMAKE_BOOL=	Mapper_WITH_NLS
 NLS_USE=	QT=linguisttools:build
 NLS_USES=	gettext-runtime
 POSITIONING_DESC=	GPS positioning
 POSITIONING_CMAKE_ON=	-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Positioning=0 -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Sensors=0 -DCMAKE_DISABLE_FIND_PACKAGE_Qt5SerialPort=0
 POSITIONING_CMAKE_OFF=	-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Positioning=1 -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Sensors=1 -DCMAKE_DISABLE_FIND_PACKAGE_Qt5SerialPort=1
 POSITIONING_USE=	QT=location,sensors,serialport
 TEST_CMAKE_BOOL=	Mapper_WITH_TEST
 TEST_USE=	QT=testlib:build
 TEST_TEST_TARGET=	test
 TIFF_DESC=	Support for TIFF
 TIFF_USE=	QT=imageformats
 
 .include <bsd.port.mk>
diff --git a/graphics/openshadinglanguage/Makefile b/graphics/openshadinglanguage/Makefile
index 932def6051f6..406fea2ed4d3 100644
--- a/graphics/openshadinglanguage/Makefile
+++ b/graphics/openshadinglanguage/Makefile
@@ -1,83 +1,83 @@
 PORTNAME=	openshadinglanguage
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.12.6.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES?=	graphics devel
 
 MAINTAINER=	FreeBSD@Shaneware.biz
 COMMENT?=	Advanced shading language for production GI renderers
 WWW=		https://github.com/AcademySoftwareFoundation/OpenShadingLanguage
 
 PATCH_SITES=	https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/commit/
 PATCHFILES=	41cc6d78dba4115b7d4adcae7e4759ffa43c3833.patch:-p1
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 BROKEN_FreeBSD_12_powerpc64=	fails to compile: llvm_ops.cpp:101:10: fatal error: 'iostream' file not found
 BROKEN_riscv64=		fails to build: /usr/include/c++/v1/__threading_support:135:3: Unsupported architecture
 
 BUILD_DEPENDS=	llvm-config${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
 LIB_DEPENDS=	libboost_thread.so:devel/boost-libs \
 		libImath.so:math/Imath \
 		libOpenEXR.so:graphics/openexr \
 		libOpenImageIO.so:graphics/openimageio \
 		libpugixml.so:textproc/pugixml
 RUN_DEPENDS=	llvm-config${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
 
 USES=		bison cmake compiler:c++14-lang localbase ncurses qt:5
 
 USE_QT=		buildtools:build qmake:build
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	AcademySoftwareFoundation
 GH_PROJECT=	OpenShadingLanguage
 
 CMAKE_ON=	ENABLERTTI OSL_BUILD_TESTS USE_LLVM_BITCODE USE_LIBCPLUSPLUS
 CMAKE_OFF=	USE_BOOST_WAVE
 CMAKE_ARGS+=	-DLLVM_CONFIG:STRING="${LOCALBASE}/bin/llvm-config${LLVM_DEFAULT}" \
 		-DCMAKE_INSTALL_DOCDIR:STRING=${DOCSDIR} -DCMAKE_CXX_STANDARD=14
 
 OPTIONS_DEFINE=		OSLTOY
 OPTIONS_SUB=		yes
 
 OSLTOY_DESC=		Interactive shader edit and visualize tool
 OSLTOY_CMAKE_BOOL=	USE_QT
 OSLTOY_USE=		QT=buildtools:build,core,gui,qmake:build,widgets
 
 #CXXFLAGS+=	-I${STAGEDIR}/include
 
 # DISTVERSION has an extra digit which isn't in the lib name
 # for LIBVERS we want the first three digits
 PLIST_SUB=	SHL3=${PORTVERSION:R} SHL2=${PORTVERSION:R:R}
 
 .include <bsd.port.options.mk>
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,%%DATADIR%%,${DATADIR},' \
 		-e 's,%%PYCMD%%,${PYTHON_CMD},' \
 		${WRKSRC}/src/shaders/CMakeLists.txt \
 		${WRKSRC}/src/doc/CMakeLists.txt \
 		${WRKSRC}/src/liboslexec/CMakeLists.txt
 
 .if ${SLAVE_PORT} == yes
 BUILD_DEPENDS+=	${PREFIX}/share/cmake/pybind11/pybind11Config.cmake:devel/pybind11
 LIB_DEPENDS+=	liboslquery.so:graphics/openshadinglanguage
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}openimageio>0:graphics/py-openimageio@${PY_FLAVOR}
 PLIST=		${PKGDIR}/pkg-plist-pybind
 USES+=		python
 USE_PYTHON=	flavors
 CMAKE_ON+=	USE_PYTHON
 CMAKE_ARGS+=	-DPYTHON_VERSION=${PYTHON_VER}
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}
 	${INSTALL_LIB} ${BUILD_WRKSRC}/lib/python/site-packages/oslquery.so ${STAGEDIR}${PYTHON_SITELIBDIR}
 .else # SLAVE_PORT != yes
 USES+=		python:build
 BINARY_ALIAS+=	python=${PYTHON_CMD}
 CMAKE_OFF+=	USE_PYTHON
 USE_LDCONFIG=	yes
 .endif # SLAVE_PORT
 
 .include <bsd.port.mk>
diff --git a/graphics/osgearth/Makefile b/graphics/osgearth/Makefile
index 484fe8fbf6ef..c0392036f50d 100644
--- a/graphics/osgearth/Makefile
+++ b/graphics/osgearth/Makefile
@@ -1,52 +1,52 @@
 PORTNAME=	osgearth
 PORTVERSION=	3.2
 DISTVERSIONPREFIX=	${PORTNAME}-
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics geography
 
 MAINTAINER=	lbartoletti@FreeBSD.org
 COMMENT=	C++ terrain rendering toolkit for OpenSceneGraph
 WWW=		http://osgearth.org/
 
 LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 LIB_DEPENDS=	libosg.so:graphics/osg \
 		libgdal.so:graphics/gdal \
 		libcurl.so:ftp/curl \
 		libgeos.so:graphics/geos \
 		libleveldb.so:databases/leveldb \
 		libPocoUtil.so:devel/poco \
 		libprotoc.so:devel/protobuf
 
 USES=		cmake gl pkgconfig sqlite
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	gwaldron
 
 USE_CXXSTD=	c++11
 USE_LDCONFIG=	yes
 USE_GL+=	gl glu
 
 CMAKE_ARGS+=	-DCMAKE_INCLUDE_PATH:PATH=${LOCALBASE}/include \
 		-DCMAKE_LIBRARY_PATH:PATH=${LOCALBASE}/lib \
 		-DLIB_POSTFIX:STRING=""
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH:Mpowerpc64*}
 CXXFLAGS+=	-DNO_WARN_X86_INTRINSICS -maltivec -mvsx
 USES+=		compiler:gcc-c++11-lib
 .else
 USES+=		compiler:c++11-lang
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == i386
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-i386
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/graphics/p5-Chart-Graph/Makefile b/graphics/p5-Chart-Graph/Makefile
index 5e17b9f6764a..32adb2db4892 100644
--- a/graphics/p5-Chart-Graph/Makefile
+++ b/graphics/p5-Chart-Graph/Makefile
@@ -1,24 +1,24 @@
 PORTNAME=	Chart-Graph
 PORTVERSION=	3.2
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Perl extension for a front-end to gnuplot, XRT, and Xmgrace
 WWW=		https://metacpan.org/release/Chart-Graph
 
 LICENSE=	GPLv2
 
 RUN_DEPENDS=	gnuplot:math/gnuplot \
 		xmgrace:math/grace \
 		ppmtogif:graphics/netpbm
 
 USES=		perl5
 USE_PERL5=	configure
 
 post-patch:
 	@${REINPLACE_CMD} -e "s,%%LOCALBASE%%,${LOCALBASE}," ${WRKSRC}/Makefile.PL
 
 .include <bsd.port.mk>
diff --git a/graphics/p5-Geo-GDAL-FFI/Makefile b/graphics/p5-Geo-GDAL-FFI/Makefile
index 6a3fd2368a2d..f3a25486161e 100644
--- a/graphics/p5-Geo-GDAL-FFI/Makefile
+++ b/graphics/p5-Geo-GDAL-FFI/Makefile
@@ -1,32 +1,32 @@
 PORTNAME=	Geo-GDAL-FFI
 PORTVERSION=	0.09
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Foreign function interface to GDAL
 WWW=		https://metacpan.org/release/Geo-GDAL-FFI
 
 LICENSE=	ART10
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 LIB_DEPENDS=	libgdal.so:graphics/gdal
 RUN_DEPENDS=	p5-FFI-Platypus>=0:devel/p5-FFI-Platypus \
 		p5-FFI-Platypus-Declare>=0:devel/p5-FFI-Platypus-Declare \
 		p5-PkgConfig>=0.23026:devel/p5-PkgConfig \
 		PDL>=0:math/PDL
 TEST_DEPENDS=	p5-JSON>=0:converters/p5-JSON \
 		p5-Test-Exception>=0:devel/p5-Test-Exception
 
 USES=		perl5
 USE_PERL5=	configure
 
 NO_ARCH=	yes
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/lib/Geo/GDAL/FFI.pm
 
 .include <bsd.port.mk>
diff --git a/graphics/p5-Gimp/Makefile b/graphics/p5-Gimp/Makefile
index 6cbe5150b1b7..42d51528ec56 100644
--- a/graphics/p5-Gimp/Makefile
+++ b/graphics/p5-Gimp/Makefile
@@ -1,33 +1,33 @@
 PORTNAME=	Gimp
 PORTVERSION=	2.33
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Write GIMP extensions/plug-ins/load- and save-handlers in Perl
 WWW=		https://metacpan.org/release/Gimp
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
 LICENSE_FILE_ART10=	${WRKSRC}/COPYING.Artistic
 
 BUILD_DEPENDS=	${RUN_DEPENDS} \
 		p5-ExtUtils-Depends>=0.402:devel/p5-ExtUtils-Depends \
 		p5-Alien-Gimp>=0.01:graphics/p5-Alien-Gimp
 LIB_DEPENDS=	libgimp-2.0.so:graphics/gimp-app
 RUN_DEPENDS=	p5-Gtk2>=1.0:x11-toolkits/p5-Gtk2 \
 		p5-Gtk2-Ex-PodViewer>=0:x11-toolkits/p5-Gtk2-Ex-PodViewer \
 		p5-IO-All>=0:devel/p5-IO-All \
 		p5-IO-Stringy>=0:devel/p5-IO-Stringy \
 		p5-HTML-Parser>=0:www/p5-HTML-Parser \
 		p5-Web-Scraper>=0:www/p5-Web-Scraper \
 		PDL>=2.007:math/PDL
 
 USES=		perl5
 USE_PERL5=	configure
 
 MAKE_JOBS_UNSAFE=	yes
 
 .include <bsd.port.mk>
diff --git a/graphics/p5-PGPLOT/Makefile b/graphics/p5-PGPLOT/Makefile
index db05192beee2..71a59c94107c 100644
--- a/graphics/p5-PGPLOT/Makefile
+++ b/graphics/p5-PGPLOT/Makefile
@@ -1,33 +1,33 @@
 PORTNAME=	PGPLOT
 PORTVERSION=	2.21
-PORTREVISION=	15
+PORTREVISION=	16
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:KGB
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl5 extension which makes available the pgplot library
 WWW=		https://metacpan.org/release/PGPLOT
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	p5-ExtUtils-F77>=1.13:lang/p5-ExtUtils-F77
 LIB_DEPENDS=	libpgplot.so:graphics/pgplot \
 		libpng.so:graphics/png
 
 USES=		fortran perl5 xorg
 USE_XORG=	x11
 INSTALL_TARGET=	pure_install
 TEST_TARGET=	test
 SCRIPTS_ENV=	PERL=${PERL}
 
 OPTIONS_DEFINE=	EXAMPLES
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	(cd ${WRKSRC} && ${INSTALL_DATA} test* ${STAGEDIR}${EXAMPLESDIR})
 
 .include <bsd.port.mk>
diff --git a/graphics/pcl-pointclouds/Makefile b/graphics/pcl-pointclouds/Makefile
index daddc77b7e5d..e91730ccc6ed 100644
--- a/graphics/pcl-pointclouds/Makefile
+++ b/graphics/pcl-pointclouds/Makefile
@@ -1,88 +1,88 @@
 PORTNAME=	pcl
 DISTVERSION=	1.12.1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	graphics math
 MASTER_SITES=	https://github.com/PointCloudLibrary/${PORTNAME}/releases/download/${PORTNAME}-${DISTVERSION}/
 PKGNAMESUFFIX=	-pointclouds
 DISTNAME=	source
 DIST_SUBDIR=	${PORTNAME}${PKGNAMESUFFIX}/${DISTVERSION}
 
 PATCH_SITES=	https://github.com/PointCloudLibrary/pcl/commit/
 # backport of patches fixing build
 PATCHFILES=	d253f645f0bfbcd2c818fa5d0a6970c61f39c6b5.patch:-p1 \
 		b220d4b3e259dba0686d0b7cdbff10c668176ded.patch:-p1
 # backport of patches fixing tests
 PATCHFILES+=	ba388061b0f9ed9584e57d6019c30b044a657c3e.patch:-p1 \
 		614e19d96bd8415dbfb52d86df0f3774a9f462fe.patch:-p1 \
 		09c76582b5ff0f2b942609f5c85744f1ce96e332.patch:-p1 \
 		5be6766fbb8f5e9b2fe97a077dd5be53e5fc6983.patch:-p1 \
 		09ea81f995f00b9565037b0fafe121eccfe4cf57.patch:-p1
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Point Cloud Library
 WWW=		https://pointclouds.org/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BROKEN_i386=		undefined reference to `__atomic_load'
 NOT_FOR_ARCHS=		armv6 armv7
 NOT_FOR_ARCHS_REASON=	common/include/pcl/pcl_macros.h:420:4: error: aligned_malloc not supported on your platform
 
 LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 		libexpat.so:textproc/expat2 \
 		libflann_cpp.so:math/flann \
 		libfreetype.so:print/freetype2 \
 		liblz4.so:archivers/liblz4 \
 		libpcap.so:net/libpcap \
 		libtiff.so:graphics/tiff
 
 USES=		cmake:testing compiler:c++14-lang eigen:3 jpeg localbase:ldflags python xorg
 USE_XORG=	x11 xext xt ice sm
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	nodefault
 GH_ACCOUNT=	google:gtest
 GH_PROJECT=	googletest:gtest
 GH_TAGNAME=	release-1.11.0:gtest
 
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} # workaround, otherwise USE_GITHUB=nodefault doesn't work #'
 
 CMAKE_TESTING_ON=	BUILD_global_tests # 6 tests are known to fail: https://github.com/PointCloudLibrary/pcl/issues/5127
 CMAKE_TESTING_TARGET=	tests
 CMAKE_ARGS=		-DGTEST_SRC_DIR=${WRKSRC_gtest}/googletest -DGTEST_INCLUDE_DIR=${WRKSRC_gtest}/googletest/include
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 PLIST_SUB=	SHL3=${DISTVERSION} SHL2=${DISTVERSION:R}
 
 DATADIR=	${PREFIX}/share/${PORTNAME}-${DISTVERSION:R}  # match the directory where the project installs .cmake files
 
 OPTIONS_DEFINE=		OPENGL PNG QHULL QT5 VTK
 OPTIONS_DEFAULT=	PNG VTK # QHULL is disabled due to conflicts qhull8 vs. qhull
 OPTIONS_SUB=		yes
 
 OPENGL_CMAKE_BOOL=	WITH_OPENGL # it finds OpenGL, but no binaries are linked with it: https://github.com/PointCloudLibrary/pcl/issues/2641
 OPENGL_USES=		gl
 OPENGL_USE=		GL=gl,glu
 
 PNG_CMAKE_BOOL=		WITH_PNG
 PNG_LIB_DEPENDS=	libpng.so:graphics/png
 
 QHULL_DESC=		Include convex-hull operations
 QHULL_CMAKE_BOOL=	WITH_QHULL
 QHULL_LIB_DEPENDS=	libqhull_r.so:math/qhull
 
 QT5_CMAKE_ON=		-DWITH_QT=QT5
 QT5_CMAKE_OFF=		-DWITH_QT=NO
 QT5_BROKEN=		WITH_QT doesn't do anything, should be used by apps, but apps is also broken: see https://github.com/PointCloudLibrary/pcl/issues/2642
 
 VTK_DESC=		Build VTK visualizations
 VTK_USES=		gl qt:5
 VTK_USE=		GL=gl,glu QT=core,gui,opengl,widgets,buildtools:build,qmake:build
 VTK_CMAKE_BOOL=		WITH_VTK
 VTK_CMAKE_ON=		-DVTK_DIR=${LOCALBASE}/lib/cmake/vtk-${VTK_VER}
 VTK_LIB_DEPENDS=	libvtkCommonCore-${VTK_VER}.so:math/vtk${VTK_VER:R}
 
 .include <../../math/vtk9/Makefile.version>
 .include <bsd.port.mk>
diff --git a/graphics/pecl-vips/Makefile b/graphics/pecl-vips/Makefile
index 53da4aea69b6..e499228cc954 100644
--- a/graphics/pecl-vips/Makefile
+++ b/graphics/pecl-vips/Makefile
@@ -1,16 +1,17 @@
 PORTNAME=	vips
 PORTVERSION=	1.0.13
+PORTREVISION=	3
 CATEGORIES=	graphics
 
 MAINTAINER=	mops@punkt.de
 COMMENT=	PHP bindings for libvips
 WWW=		https://github.com/libvips/php-vips-ext
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 LIB_DEPENDS=	libvips.so:graphics/vips
 
 USES=		compiler:c11 php:pecl pkgconfig
 
 .include <bsd.port.mk>
diff --git a/graphics/pgplot/Makefile b/graphics/pgplot/Makefile
index 6619f43b6c6d..68da1519bb6f 100644
--- a/graphics/pgplot/Makefile
+++ b/graphics/pgplot/Makefile
@@ -1,101 +1,101 @@
 PORTNAME=	pgplot
 PORTVERSION=	5.2.2
-PORTREVISION=	29
+PORTREVISION=	30
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.astro.caltech.edu/pub/pgplot/
 DISTNAME=	${PORTNAME}${PORTVERSION:R}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	C/FORTRAN library for drawing graphs on a variety of display devices
 WWW=		https://sites.astro.caltech.edu/~tjp/pgplot/
 
 LICENSE=	PGPLOT
 LICENSE_NAME=	PGPLOT License
 LICENSE_FILE=	${WRKSRC}/copyright.notice
 LICENSE_PERMS=	dist-mirror pkg-mirror auto-accept
 
 LIB_DEPENDS=	libpng.so:graphics/png
 
 USES=		fortran shebangfix xorg
 USE_LDCONFIG=	yes
 USE_XORG=	x11 xorgproto xt
 
 MAKE_JOBS_UNSAFE=	yes
 
 MAKE_ENV=	SSP_CFLAGS=
 SHEBANG_FILES=	makehtml maketex
 FFLAGS+=	-std=legacy
 SUFFIXES=	flib clib bin
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH:M*64*}
 EXTRA_PATCHES +=	${FILESDIR}/drivers_64bit_patch
 .endif
 
 PORTDATA=	grfont.dat
 
 .if ${PORT_OPTIONS:MDOCS}
 DOCS=	cpg/cpgplot.doc pgplot-routines.tex pgplot.doc pgplot.html \
 	readme.pgdisp rgb.txt
 SUFFIXES+=	doc
 PORTDOCS=	${DOCS:C|.*/||}
 USES+=		perl5
 USE_PERL5=	build
 .endif
 
 .if ${PORT_OPTIONS:MEXAMPLES}
 EXAMPLES=	Makefile.demo cpg/cpgdemo.c examples/pgdemo*.f
 PORTEXAMPLES=	${EXAMPLES:C|.*/||}
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|png_ptr->jmpbuf|png_jmpbuf(png_ptr)|' \
 		${WRKSRC}/drivers/pndriv.c
 	@${REINPLACE_CMD} -e 's|/usr/local/pgplot|${DATADIR}|g' \
 		${WRKSRC}/src/grgfil.f
 	@cd ${FILESDIR}; ${CP} Makefile* drivers.list grexec.f ${WRKSRC}
 	@${CP} ${WRKSRC}/src/*.inc ${WRKSRC}
 
 do-build:
 .for s in ${SUFFIXES}
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} \
 	Makefile.${s} ${_MAKE_JOBS} ${MAKE_ARGS}
 .endfor
 
 do-install:
 	@cd ${WRKSRC}; \
 	${INSTALL_PROGRAM} pgxwin_server pgdisp ${STAGEDIR}${PREFIX}/bin; \
 	${INSTALL_DATA} *.a ${STAGEDIR}${PREFIX}/lib; \
 	${INSTALL_LIB} *.so.5* ${STAGEDIR}${PREFIX}/lib; \
 	${INSTALL_DATA} cpgplot.h ${STAGEDIR}${PREFIX}/include
 .for f in libcpgplot.so libpgplot.so
 	@${LN} -sf ${f}.5 ${STAGEDIR}${PREFIX}/lib/${f}
 .endfor
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	@cd ${WRKSRC}; ${INSTALL_DATA} ${PORTDATA} ${STAGEDIR}${DATADIR}
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@cd ${WRKSRC}; ${CP} pgdispd/aaaread.me readme.pgdisp; \
 	${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}
 .endif
 .if ${PORT_OPTIONS:MEXAMPLES}
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	@cd ${WRKSRC}; ${INSTALL_DATA} ${EXAMPLES} ${STAGEDIR}${EXAMPLESDIR}
 .endif
 
 .if defined(MAINTAINER_MODE) && !defined(BATCH)
 DEMO?=	cpgdemo
 
 check test: build
 	@cd ${WRKSRC}; ${CP} cpg/cpgdemo.c examples/pgdemo*.f ${WRKSRC}; \
 	${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} \
 	Makefile.demo ${_MAKE_JOBS} ${MAKE_ARGS}
 	@${SETENV} LD_LIBRARY_PATH="${LOCALBASE}/lib:${WRKSRC}" \
 	PGPLOT_DIR="${WRKSRC}" PGPLOT_DEV="/xwin" ${WRKSRC}/${DEMO}
 .endif
 
 .include <bsd.port.mk>
diff --git a/graphics/php-facedetect/Makefile b/graphics/php-facedetect/Makefile
index d0969e319b72..ad7954e3a196 100644
--- a/graphics/php-facedetect/Makefile
+++ b/graphics/php-facedetect/Makefile
@@ -1,30 +1,30 @@
 PORTNAME=	facedetect
 PORTVERSION=	1.1
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	graphics
 PKGNAMEPREFIX=	${PHP_PKGNAMEPREFIX}
 
 MAINTAINER=	mm@FreeBSD.org
 COMMENT=	Face detection extension for PHP using OpenCV library
 WWW=		https://www.xarg.org/project/php-facedetect/
 
 LICENSE=	PHP30
 
 DEPRECATED=	Requires php80 which is set to expire on 2023-11-26
 EXPIRATION_DATE=	2023-12-31
 
 LIB_DEPENDS=	libopencv_objdetect.so:graphics/opencv
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	infusion
 GH_PROJECT=	PHP-Facedetect
 GH_TAGNAME=	2a8974b
 
 LIBS+=		-lopencv_core
 
 USES=		compiler:c11 localbase php:ext pkgconfig
 IGNORE_WITH_PHP=	81 82
 
 CONFIGURE_ARGS+=	--with-facedetect
 
 .include <bsd.port.mk>
diff --git a/graphics/piglit/Makefile b/graphics/piglit/Makefile
index 0556b9b567e5..a865ca1b6d49 100644
--- a/graphics/piglit/Makefile
+++ b/graphics/piglit/Makefile
@@ -1,60 +1,60 @@
 PORTNAME=	piglit
 PORTVERSION=	20200910
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Automated OpenGL and OpenCL testsuite
 WWW=		https://piglit.freedesktop.org/
 
 LICENSE=	MIT GPLv2 GPLv3 LGPL20
 LICENSE_COMB=	multi
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}mako>0:textproc/py-mako@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
 		vulkan-headers>0:graphics/vulkan-headers \
 		wayland-protocols>=0:graphics/wayland-protocols
 LIB_DEPENDS=	libdrm.so:graphics/libdrm \
 		libpng.so:graphics/png \
 		libvulkan.so:graphics/vulkan-loader \
 		libwaffle-1.so:graphics/waffle \
 		libwayland-egl.so:graphics/wayland \
 		libxkbcommon.so:x11/libxkbcommon
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}mako>0:textproc/py-mako@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
 
 USE_GITLAB=	yes
 GL_SITE=	https://gitlab.freedesktop.org
 GL_ACCOUNT=	mesa
 GL_PROJECT=	piglit
 GL_COMMIT=	136a7f5fa0703603be1ffb338abe4865e76a8058
 
 PATCH_SITES=		https://gitlab.freedesktop.org/mesa/piglit/-/commit/
 PATCH_DIST_STRIP=	-p1
 PATCHFILES+=		7f1916da04fc.patch # https://gitlab.freedesktop.org/mesa/piglit/-/merge_requests/383
 PATCHFILES+=		c6a4d8aa8e68.patch # https://gitlab.freedesktop.org/mesa/piglit/-/merge_requests/383
 PATCHFILES+=		0443b6a18648.patch # https://gitlab.freedesktop.org/mesa/piglit/-/merge_requests/383
 PATCHFILES+=		96d8ddd0a658.patch # https://gitlab.freedesktop.org/mesa/piglit/-/merge_requests/383
 PATCHFILES+=		d5f4cfd3b0da.patch # https://gitlab.freedesktop.org/mesa/piglit/-/merge_requests/383
 PATCHFILES+=		64c468c6c7e3.patch # https://gitlab.freedesktop.org/mesa/piglit/-/merge_requests/383
 PATCHFILES+=		681e86f53c2e.patch # https://gitlab.freedesktop.org/mesa/piglit/-/merge_requests/383
 
 USES=		cmake compiler:c11 gl pkgconfig python:3.5+ shebangfix xorg
 USE_GL=		egl gbm gl glu
 USE_XORG=	x11 xcb xext xrender
 SHEBANG_FILES=	piglit
 
 CMAKE_ON=	PIGLIT_BUILD_GLES2_TESTS PIGLIT_BUILD_GLES3_TESTS
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 SUB_FILES=	pkg-message
 
 DATADIR=	${PREFIX}/lib/piglit
 PORTDATA=	*
 
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.mk>
diff --git a/graphics/py-PyOpenGL-accelerate/Makefile b/graphics/py-PyOpenGL-accelerate/Makefile
index 395ee98853ee..76e831177276 100644
--- a/graphics/py-PyOpenGL-accelerate/Makefile
+++ b/graphics/py-PyOpenGL-accelerate/Makefile
@@ -1,25 +1,26 @@
 PORTNAME=	PyOpenGL-accelerate
 PORTVERSION=	3.1.6
+PORTREVISION=	1
 CATEGORIES=	graphics python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	python@FreeBSD.org
 COMMENT=	OpenGL acceleration code for PyOpenGL
 WWW=		http://pyopengl.sourceforge.net/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/license.txt
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=0,1:math/py-numpy@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=0,1:math/py-numpy@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_PYTHON=	autoplist cython distutils
 
 CFLAGS=		-Wno-int-conversion
 
 post-install:
 	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' -exec ${STRIP_CMD} {} +
 
 .include <bsd.port.mk>
diff --git a/graphics/py-PyOpenGL/Makefile b/graphics/py-PyOpenGL/Makefile
index 1ec5de3e1fb1..e577e392d3cb 100644
--- a/graphics/py-PyOpenGL/Makefile
+++ b/graphics/py-PyOpenGL/Makefile
@@ -1,39 +1,40 @@
 PORTNAME=	PyOpenGL
 PORTVERSION=	3.1.6
+PORTREVISION=	1
 CATEGORIES=	graphics python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 #DISTNAME=	PyOpenGL-${PORTVERSION}
 
 MAINTAINER=	python@FreeBSD.org
 COMMENT=	OpenGL (and related library) interface for Python
 WWW=		http://pyopengl.sourceforge.net/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/license.txt
 
 BUILD_DEPENDS=	${PYNUMPY} \
 		${PY_PILLOW}
 RUN_DEPENDS=	${PYNUMPY} \
 		${PY_PILLOW}
 
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=	TKINTER
 OPTIONS_DEFAULT=	TKINTER
 TKINTER_DESC=	Build with tkinter for X support
 
 USES=		dos2unix gl python:3.6+
 USE_GL=		glut
 USE_PYTHON=	distutils autoplist
 
 TKINTER_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVOR}
 TKINTER_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVOR}
 
 post-patch:
 	@${FIND} ${WRKSRC} -name '*.[ch]' | ${XARGS} ${REINPLACE_CMD} -e \
 		's|<malloc\.h>|<stdlib.h>|g'
 	@${FIND} ${WRKSRC} -name "*.bak" -delete
 	${REINPLACE_CMD} -e 's|posix |posix|g' ${WRKSRC}/OpenGL/__init__.py
 
 .include <bsd.port.mk>
diff --git a/graphics/py-altair/Makefile b/graphics/py-altair/Makefile
index ace8b0508743..78391bb9ac56 100644
--- a/graphics/py-altair/Makefile
+++ b/graphics/py-altair/Makefile
@@ -1,26 +1,27 @@
 PORTNAME=	altair
 PORTVERSION=	4.2.2
+PORTREVISION=	1
 CATEGORIES=	graphics python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Declarative statistical visualization library for Python
 WWW=		https://github.com/altair-viz/altair
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}entrypoints>=0:devel/py-entrypoints@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jsonschema>=3.0:devel/py-jsonschema@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpy>=0,1:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pandas>=0.18,1:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}toolz>=0:devel/py-toolz@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/graphics/py-cartopy/Makefile b/graphics/py-cartopy/Makefile
index a3b61a7e4058..9d4b654e4346 100644
--- a/graphics/py-cartopy/Makefile
+++ b/graphics/py-cartopy/Makefile
@@ -1,42 +1,43 @@
 PORTNAME=	cartopy
 PORTVERSION=	0.21.1
+PORTREVISION=	1
 CATEGORIES=	graphics python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	Cartopy-${PORTVERSION}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Cartographic library with Matplotlib support for visualisation
 WWW=		https://github.com/SciTools/cartopy
 
 LICENSE=	LGPL3+
 LICENSE_FILE=	${WRKSRC}/COPYING.LESSER
 
 BUILD_DEPENDS=	geos>=3.7.2:graphics/geos \
 		${PYTHON_PKGNAMEPREFIX}numpy>=1.19,1:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm@${PY_FLAVOR}
 LIB_DEPENDS=	libgeos.so:graphics/geos
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}matplotlib>=3.1:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpy>=1.19,1:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyproj>=3.0.0:graphics/py-pyproj@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyshp>=2.1:devel/py-pyshp@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Shapely>=1.6.4:devel/py-shapely@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.3.0:devel/py-six@${PY_FLAVOR}
 
 USES=		python:3.8+
 USE_PYTHON=	autoplist concurrent cython distutils
 
 OPTIONS_DEFINE=	OWS PLOTTING
 OWS_DESC=	OGC Web Service support
 PLOTTING_DESC=	Plotting support
 
 OWS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}OWSLib>=0.18.0:graphics/py-OWSLib@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}pillow>=6.1.0:graphics/py-pillow@${PY_FLAVOR}
 PLOTTING_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gdal>=2.3.2:graphics/py-gdal@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}pillow>=6.1.0:graphics/py-pillow@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}scipy>=1.3.1:science/py-scipy@${PY_FLAVOR}
 
 post-install:
 	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' -exec ${STRIP_CMD} {} +
 
 .include <bsd.port.mk>
diff --git a/graphics/py-descartes/Makefile b/graphics/py-descartes/Makefile
index 5b4da7e10a8d..f5dd1cd6d6b7 100644
--- a/graphics/py-descartes/Makefile
+++ b/graphics/py-descartes/Makefile
@@ -1,21 +1,21 @@
 PORTNAME=	descartes
 PORTVERSION=	1.1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	lbartoletti@FreeBSD.org
 COMMENT=	Use geometric objects as matplotlib paths and patches
 WWW=		https://pypi.python.org/pypi/descartes
 
 LICENSE=	BSD3CLAUSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}matplotlib>=0.98:math/py-matplotlib@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/graphics/py-f3d/Makefile b/graphics/py-f3d/Makefile
index 3bbc5ea8518b..9a72414c3407 100644
--- a/graphics/py-f3d/Makefile
+++ b/graphics/py-f3d/Makefile
@@ -1,26 +1,27 @@
 PORTNAME=	f3d
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.3.1
+PORTREVISION=	1
 CATEGORIES=	graphics
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Fast and minimalist 3D viewer
 WWW=		https://f3d-app.github.io/f3d/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/../LICENSE
 
 BUILD_DEPENDS=	pybind11>0:devel/pybind11
 LIB_DEPENDS=	libf3d.so:graphics/f3d
 
 USES=		cmake:testing compiler:c++17-lang localbase:ldflags python
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	f3d-app
 
 WRKSRC_SUBDIR=	python
 
 CXXFLAGS+=	-I${LOCALBASE}/include/f3d
 
 .include <bsd.port.mk>
diff --git a/graphics/py-face_recognition/Makefile b/graphics/py-face_recognition/Makefile
index eec622f771d3..3f0837a27175 100644
--- a/graphics/py-face_recognition/Makefile
+++ b/graphics/py-face_recognition/Makefile
@@ -1,26 +1,26 @@
 PORTNAME=	face_recognition
 PORTVERSION=	1.3.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics python devel
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Recognize faces from Python or from the command line
 WWW=		https://pypi.org/project/face_recognition/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}click>=6.0:devel/py-click@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}face_recognition_models>0:graphics/py-face_recognition_models@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dlib>=19.7:science/py-dlib@${PY_FLAVOR} \
 		${PY_PILLOW}
 
 USES=		python:3.6+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/graphics/py-fiona/Makefile b/graphics/py-fiona/Makefile
index 9904f94a6520..10d290708d4a 100644
--- a/graphics/py-fiona/Makefile
+++ b/graphics/py-fiona/Makefile
@@ -1,30 +1,31 @@
 PORTNAME=	Fiona
 DISTVERSION=	1.8.22
+PORTREVISION=	1
 CATEGORIES=	graphics python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	lbartoletti@FreeBSD.org
 COMMENT=	OGR's neat and nimble API for Python programmers
 WWW=		https://pypi.org/project/Fiona/
 
 LICENSE=	BSD3CLAUSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cligj>=0.4:devel/py-cligj@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}click-plugins>0:devel/py-click-plugins@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.7:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}munch>0:devel/py-munch@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Shapely>0:devel/py-shapely@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}gdal>0:graphics/py-gdal@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}attrs>=18.2:devel/py-attrs@${PY_FLAVOR}
 LIB_DEPENDS+=	libgdal.so:graphics/gdal
 
 USES=		compiler:c++11-lang python:3.6+
 USE_PYTHON=	autoplist distutils cython
 
 CONFLICTS_INSTALL=	fio
 
 post-install:
 	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME:tl} -name *.so -exec ${STRIP_CMD} {} +
 
 .include <bsd.port.mk>
diff --git a/graphics/py-gdal/Makefile b/graphics/py-gdal/Makefile
index 1f4a7aed4fe2..3b2c799a57ba 100644
--- a/graphics/py-gdal/Makefile
+++ b/graphics/py-gdal/Makefile
@@ -1,32 +1,33 @@
 PORTNAME=	gdal
 PORTVERSION=	3.6.3
+PORTREVISION=	1
 CATEGORIES=	graphics python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	GDAL-${PORTVERSION}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Python binding for GDAL
 WWW=		https://gdal.org/ \
 		https://github.com/OSGeo/gdal
 
 LICENSE=	MIT
 
 LIB_DEPENDS=	libgdal.so:graphics/gdal
 
 USES=		compiler:c++11-lang cpe python:3.8+
 USE_PYTHON=	autoplist concurrent distutils
 
 CPE_VENDOR=	osgeo
 
 OPTIONS_DEFINE=	NUMPY
 NUMPY_DESC=	Enable array support via NumPy
 
 NUMPY_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=1.0.0,1:math/py-numpy@${PY_FLAVOR}
 NUMPY_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=1.0.0,1:math/py-numpy@${PY_FLAVOR}
 NUMPY_USES=		fortran
 
 post-install:
 	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' -exec ${STRIP_CMD} {} +
 
 .include <bsd.port.mk>
diff --git a/graphics/py-geomdl/Makefile b/graphics/py-geomdl/Makefile
index b1fd01ca8850..a4b5739edf9a 100644
--- a/graphics/py-geomdl/Makefile
+++ b/graphics/py-geomdl/Makefile
@@ -1,28 +1,29 @@
 PORTNAME=	geomdl
 PORTVERSION=	5.2.10
+PORTREVISION=	1
 CATEGORIES=	graphics python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	lbartoletti@FreeBSD.org
 COMMENT=	Object-oriented pure Python B-Spline and NURBS library
 WWW=		https://onurraufbingol.com/NURBS-Python/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpy>=1.15.4:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>=2.2.3:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}plotly>0:graphics/py-plotly@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=3.6.0:devel/py-pytest@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	autoplist distutils
 
 NO_ARCH=	yes
 
 do-test:
 	cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test
 
 .include <bsd.port.mk>
diff --git a/graphics/py-geopandas/Makefile b/graphics/py-geopandas/Makefile
index 5e0bab6494f2..bdce860ffd49 100644
--- a/graphics/py-geopandas/Makefile
+++ b/graphics/py-geopandas/Makefile
@@ -1,25 +1,26 @@
 PORTNAME=	geopandas
 PORTVERSION=	0.12.2
+PORTREVISION=	1
 CATEGORIES=	graphics python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	lbartoletti@FreeBSD.org
 COMMENT=	Python tools for geographic data
 WWW=		https://pypi.org/project/geopandas/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Shapely>=1.2.18:devel/py-shapely@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Fiona>=1.0.1:graphics/py-fiona@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyproj>=1.9.3:graphics/py-pyproj@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.3.0:devel/py-six@${PY_FLAVOR}
 
 USES=		python:3.8+
 USE_PYTHON=	autoplist cython distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/graphics/py-giddy/Makefile b/graphics/py-giddy/Makefile
index 5737b7079672..dd20cd0d694f 100644
--- a/graphics/py-giddy/Makefile
+++ b/graphics/py-giddy/Makefile
@@ -1,26 +1,27 @@
 PORTNAME=	giddy
 PORTVERSION=	2.3.4
+PORTREVISION=	1
 CATEGORIES=	graphics python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	GeospatIal Distribution DYnamics (GIDDY)
 WWW=		https://pysal.org/giddy/ \
 		https://github.com/pysal/giddy
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}esda>=2.1.1:science/py-esda@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}libpysal>=4.0.1:science/py-libpysal@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mapclassify>=2.1.1:graphics/py-mapclassify@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}quantecon>=0.4.7:finance/py-quantecon@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=1.3.0:science/py-scipy@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/graphics/py-gizeh/Makefile b/graphics/py-gizeh/Makefile
index 03d755235486..eb3324bc621f 100644
--- a/graphics/py-gizeh/Makefile
+++ b/graphics/py-gizeh/Makefile
@@ -1,22 +1,22 @@
 PORTNAME=	gizeh
 DISTVERSION=	0.1.11
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Simple vector graphics in Python
 WWW=		https://github.com/Zulko/gizeh
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENCE.txt
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cairocffi>0:graphics/py-cairocffi@${PY_FLAVOR} \
 		${PYNUMPY}
 
 USES=		python:3.5+
 USE_PYTHON=	autoplist distutils
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/graphics/py-h3/Makefile b/graphics/py-h3/Makefile
index 47f92cd5f446..646b2ea9eba7 100644
--- a/graphics/py-h3/Makefile
+++ b/graphics/py-h3/Makefile
@@ -1,39 +1,40 @@
 PORTNAME=	h3
 PORTVERSION=	3.7.6
+PORTREVISION=	1
 CATEGORIES=	graphics python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Python binding of H3 library
 WWW=		https://github.com/uber/h3-py
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	cmake:devel/cmake-core \
 		h3>=3.7.2:graphics/h3 \
 		${PYTHON_PKGNAMEPREFIX}scikit-build>=0:devel/py-scikit-build@${PY_FLAVOR}
 LIB_DEPENDS=	libh3.so:graphics/h3
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=0,1:math/py-numpy@${PY_FLAVOR}
 
 USES=		localbase:ldflags ninja:build python:3.7+
 USE_PYTHON=	autoplist concurrent cython distutils pytest
 
 CFLAGS+=	-I${LOCALBASE}/include/h3
 TEST_ENV=	PYTHONPATH=${STAGEDIR}${PYTHON_SITELIBDIR} ${PYTHON_CMD}
 
 OPTIONS_DEFINE=	NUMPY
 OPTIONS_DEFAULT=NUMPY
 NUMPY_DESC=	NumPy support
 
 NUMPY_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=0,1:math/py-numpy@${PY_FLAVOR}
 
 post-patch:
 # Clean up bundled libraries
 	@${RM} -r ${WRKSRC}/src/h3lib/
 
 post-install:
 	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' -exec ${STRIP_CMD} {} +
 
 .include <bsd.port.mk>
diff --git a/graphics/py-imageio/Makefile b/graphics/py-imageio/Makefile
index 6c1cb822566f..79c986227557 100644
--- a/graphics/py-imageio/Makefile
+++ b/graphics/py-imageio/Makefile
@@ -1,47 +1,48 @@
 PORTNAME=	imageio
 PORTVERSION=	2.27.0
+PORTREVISION=	1
 CATEGORIES=	graphics python
 MASTER_SITES=	PYPI \
 		https://github.com/imageio/imageio/releases/download/v${PORTVERSION}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Python library for reading and writing image, video formats
 WWW=		https://github.com/imageio/imageio
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 # requests is from fsspec[github]
 LIB_DEPENDS=	libfreeimage.so:graphics/freeimage
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=0,1:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pillow>=8.3.2:graphics/py-pillow@${PY_FLAVOR}
 TEST_DEPENDS=	opencv>=0:graphics/opencv \
 		${PYTHON_PKGNAMEPREFIX}astropy>=0:astro/py-astropy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}av>=0:multimedia/py-av@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}gdal>=0:graphics/py-gdal@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}fsspec>=0:devel/py-fsspec@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}invoke>=0:devel/py-invoke@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tifffile>=0:graphics/py-tifffile@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	autoplist concurrent distutils pytest
 
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=	FFMPEG FITS PYAV TIFFFILE
 OPTIONS_DEFAULT=FFMPEG
 FFMPEG_DESC=	Read/Write video using FFmpeg
 FITS_DESC=	Read FITS files
 PYAV_DESC=	Read/Write Videos (and images)
 TIFFFILE_DESC=	Read/Write TIFF files
 
 FFMPEG_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}imageio-ffmpeg>=0:graphics/py-imageio-ffmpeg@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}psutil>=0:sysutils/py-psutil@${PY_FLAVOR}
 FITS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}astropy>=0,2:astro/py-astropy@${PY_FLAVOR}
 PYAV_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}av>=0:multimedia/py-av@${PY_FLAVOR}
 TIFFFILE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tifffile>=0:graphics/py-tifffile@${PY_FLAVOR}
 
 .include <bsd.port.mk>
diff --git a/graphics/py-mapclassify/Makefile b/graphics/py-mapclassify/Makefile
index d08f7485def3..78cfe1a93a07 100644
--- a/graphics/py-mapclassify/Makefile
+++ b/graphics/py-mapclassify/Makefile
@@ -1,26 +1,27 @@
 PORTNAME=	mapclassify
 PORTVERSION=	2.5.0
+PORTREVISION=	1
 CATEGORIES=	graphics python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Classification schemes for choropleth maps
 WWW=		https://pysal.org/mapclassify/ \
 		https://github.com/pysal/mapclassify
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}networkx>=0,1:math/py-networkx@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpy>=1.3,1:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pandas>=1.0,1:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-learn>=0:science/py-scikit-learn@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=1.0:science/py-scipy@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/graphics/py-mayavi/Makefile b/graphics/py-mayavi/Makefile
index 8935086d3b8c..6441f6be704a 100644
--- a/graphics/py-mayavi/Makefile
+++ b/graphics/py-mayavi/Makefile
@@ -1,56 +1,56 @@
 PORTNAME=	mayavi
 DISTVERSION=	4.8.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics science python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Application and library for 3D visualization and plotting in Python
 WWW=		http://code.enthought.com/pages/mayavi-project.html
 
 LICENSE=			BSD3CLAUSE LGPL21 LGPL20 EPL LGPL3 BSD2CLAUSE APACHE11 # see ${WRKSRC}/image_LICENSE.txt
 LICENSE_COMB=			multi
 LICENSE_FILE_BSD3CLAUSE=	${WRKSRC}/LICENSE.txt
 LICENSE_FILE_LGPL21=		${WRKSRC}/image_LICENSE_Nuvola.txt
 LICENSE_FILE_LGPL20=		${WRKSRC}/image_LICENSE_CP.txt
 LICENSE_FILE_EPL=		${WRKSRC}/image_LICENSE_Eclipse.txt
 LICENSE_FILE_LGPL3=		${WRKSRC}/image_LICENSE_OOo.txt
 LICENSE_FILE_BSD2CLAUSE=	${WRKSRC}/LICENSE_YORICK.txt
 LICENSE_FILE_APACHE11=		${WRKSRC}/LICENSE_COLORBREWER.txt
 
 BUILD_DEPENDS=	${PYNUMPY} \
 		${PY_SPHINX} \
 		sphinx-build:textproc/py-sphinx@${PY_FLAVOR}
 LIB_DEPENDS=	libvtkCommonCore-${VTK_VER}.so:math/vtk${VTK_VER:R}
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}apptools>0:devel/py-apptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}envisage>0:devel/py-envisage@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyface>=6.1.1:devel/py-pyface@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}traits>=6.0.0:devel/py-traits@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}traitsui>=7.0.0:graphics/py-traitsui@${PY_FLAVOR} # list is in mayavi/__init__.py
 
 USES=		python:3.6+ shebangfix
 USE_PYTHON=	distutils autoplist
 
 USE_WX=		3.2
 WX_COMPS=	python:run
 
 SHEBANG_FILES=	mayavi/tests/csv_files/csv_2_py
 
 POST_PLIST=	fix-plist
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/tvtk/array_ext*.so
 
 fix-plist:
 	@${REINPLACE_CMD} -e "s|${PYTHONPREFIX_SITELIBDIR:S/${PREFIX}\///}/mayavi/preferences/__pycache__$$||" ${TMPPLIST}
 	@${REINPLACE_CMD} -e "s|${PYTHONPREFIX_SITELIBDIR:S/${PREFIX}\///}/tvtk/plugins/scene/__pycache__$$||" ${TMPPLIST}
 
 do-test:
 	@${SETENV} ${TEST_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} ${PYTHON_CMD} ${WRKSRC}/examples/mayavi/interactive/coil_design_application.py
 
 .include <../../math/vtk9/Makefile.version>
 .include <bsd.port.mk>
diff --git a/graphics/py-mgwr/Makefile b/graphics/py-mgwr/Makefile
index 6fec122bc6a7..f9233763d41e 100644
--- a/graphics/py-mgwr/Makefile
+++ b/graphics/py-mgwr/Makefile
@@ -1,26 +1,27 @@
 PORTNAME=	mgwr
 PORTVERSION=	2.1.2
+PORTREVISION=	1
 CATEGORIES=	graphics python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Multiscale Geographically Weighted Regression
 WWW=		https://mgwr.readthedocs.io/en/latest/ \
 		https://github.com/pysal/mgwr
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}libpysal>=4.0.0:science/py-libpysal@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpy>=1.3,1:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=0.11:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}spglm>=1.0.6:math/py-spglm@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}spreg>=0:math/py-spreg@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/graphics/py-moderngl-window/Makefile b/graphics/py-moderngl-window/Makefile
index dad12201c585..a1c6dd5dfe53 100644
--- a/graphics/py-moderngl-window/Makefile
+++ b/graphics/py-moderngl-window/Makefile
@@ -1,35 +1,35 @@
 PORTNAME=	moderngl-window
 DISTVERSION=	2.4.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 #MASTER_SITES=	PYPI # no tests
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Library for ModernGL making window creation & resource loading simple
 WWW=		https://github.com/moderngl/moderngl-window
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PY_SETUPTOOLS} \
 		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow>=9:graphics/py-pillow@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}moderngl<6:graphics/py-moderngl@${PY_FLAVOR} \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}pyglet>0:graphics/py-pyglet@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyrr>=0.10.3,<1:math/py-pyrr@${PY_FLAVOR}
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}PyWavefront>0:misc/py-PyWavefront@${PY_FLAVOR} # optional
 #RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}trimesh>0:devel/py-trimesh@${PY_FLAVOR} # optional, causes conflicts due to pyglet1 vs. pyglet
 
 USES=		python
 USE_PYTHON=	pep517 autoplist pytest # some tests fail due to missing trimesh
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	moderngl
 
 NO_ARCH=	yes
 
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 
 .include <bsd.port.mk>
diff --git a/graphics/py-momepy/Makefile b/graphics/py-momepy/Makefile
index 81b4449633a4..2d926f182946 100644
--- a/graphics/py-momepy/Makefile
+++ b/graphics/py-momepy/Makefile
@@ -1,27 +1,27 @@
 PORTNAME=	momepy
 PORTVERSION=	0.5.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Urban Morphology Measuring Toolkit
 WWW=		https://github.com/pysal/momepy
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}geopandas>=0.8.0:graphics/py-geopandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}libpysal>=4.2.0:science/py-libpysal@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}networkx>=2.3:math/py-networkx@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}packaging>=0:devel/py-packaging@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pygeos>=0:graphics/py-pygeos@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tqdm>=4.27.0:misc/py-tqdm@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/graphics/py-mpl-interactions/Makefile b/graphics/py-mpl-interactions/Makefile
index 40be2bd5e6d4..e685e9acb855 100644
--- a/graphics/py-mpl-interactions/Makefile
+++ b/graphics/py-mpl-interactions/Makefile
@@ -1,20 +1,21 @@
 PORTNAME=	mpl-interactions
 DISTVERSION=	0.23.0
+PORTREVISION=	1
 CATEGORIES=	graphics python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	mpl_interactions-${DISTVERSION}
 
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Simple interactive Matplotlib plots
 WWW=		https://pypi.python.org/pypi/mpl-interactions
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	autoplist distutils
 
 .include <bsd.port.mk>
diff --git a/graphics/py-mpl-scatter-density/Makefile b/graphics/py-mpl-scatter-density/Makefile
index 3b1514274d16..6d6d614b600f 100644
--- a/graphics/py-mpl-scatter-density/Makefile
+++ b/graphics/py-mpl-scatter-density/Makefile
@@ -1,24 +1,25 @@
 PORTNAME=	mpl-scatter-density
 PORTVERSION=	0.7
+PORTREVISION=	1
 CATEGORIES=	graphics python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Matplotlib helpers to make density scatter plots
 WWW=		https://github.com/astrofrog/mpl-scatter-density
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR}
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}fast-histogram>=0.3:misc/py-fast-histogram@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>=2.0:math/py-matplotlib@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	distutils autoplist
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/graphics/py-openimageio/Makefile b/graphics/py-openimageio/Makefile
index 90cf0342bb59..d526fe4351c8 100644
--- a/graphics/py-openimageio/Makefile
+++ b/graphics/py-openimageio/Makefile
@@ -1,10 +1,10 @@
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics multimedia python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 COMMENT=	OpenImageIO python bindings
 
 MASTERDIR=	${.CURDIR}/../openimageio
 OPTIONS_EXCLUDE=${OPTIONS_DEFINE}
 
 .include "${MASTERDIR}/Makefile"
diff --git a/graphics/py-openshadinglanguage/Makefile b/graphics/py-openshadinglanguage/Makefile
index a1707b8c59e3..e70c8bb37bdc 100644
--- a/graphics/py-openshadinglanguage/Makefile
+++ b/graphics/py-openshadinglanguage/Makefile
@@ -1,12 +1,12 @@
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics multimedia python
 # Note this port shares its PORTREVISION with graphics/openshadinglanguage!
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 COMMENT=	OpenShadingLanguage python bindings
 
 MASTERDIR=	${.CURDIR}/../openshadinglanguage
 
 OPTIONS_EXCLUDE=	MATERIALX OSLTOY
 
 .include "${MASTERDIR}/Makefile"
diff --git a/graphics/py-osmnet/Makefile b/graphics/py-osmnet/Makefile
index 36523cc51606..343332acadbc 100644
--- a/graphics/py-osmnet/Makefile
+++ b/graphics/py-osmnet/Makefile
@@ -1,26 +1,26 @@
 PORTNAME=	osmnet
 PORTVERSION=	0.1.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Tools for the extraction of OpenStreetMap street network data
 WWW=		https://github.com/UDST/osmnet
 
 LICENSE=	AGPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}geopandas>=0.7:graphics/py-geopandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpy>=1.10,1:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pandas>=0.23,1:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.9.1:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Shapely>=1.5:devel/py-shapely@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/graphics/py-pandana/Makefile b/graphics/py-pandana/Makefile
index d45d4c4729d4..0f2e8311c44e 100644
--- a/graphics/py-pandana/Makefile
+++ b/graphics/py-pandana/Makefile
@@ -1,36 +1,36 @@
 PORTNAME=	pandana
 PORTVERSION=	0.6.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Python library for network analysis
 WWW=		https://udst.github.io/pandana/ \
 		https://github.com/UDST/pandana
 
 LICENSE=	AGPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 .if !exists(/usr/include/omp.h)
 BROKEN=		requires OpenMP support that is missing on this architecture
 .endif
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cython>=0.25.2:lang/cython@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpy>=1.8,1:math/py-numpy@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=1.8,1:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pandas>=0.17,1:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-learn>=0.18:science/py-scikit-learn@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tables>=3.1<3.8:devel/py-tables@${PY_FLAVOR}
 
 USES=		compiler:c++11-lang python:3.7+
 USE_PYTHON=	autoplist concurrent cython distutils
 
 CFLAGS+=	-DNO_TR1_MEMORY
 
 post-install:
 	${FIND} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} -name '*.so' -exec ${STRIP_CMD} {} +
 
 .include <bsd.port.mk>
diff --git a/graphics/py-pointpats/Makefile b/graphics/py-pointpats/Makefile
index f829e80fd70e..4e3429028979 100644
--- a/graphics/py-pointpats/Makefile
+++ b/graphics/py-pointpats/Makefile
@@ -1,26 +1,27 @@
 PORTNAME=	pointpats
 PORTVERSION=	2.3.0
+PORTREVISION=	1
 CATEGORIES=	graphics python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Methods and Functions for planar point pattern analysis
 WWW=		https://pointpats.readthedocs.io/en/latest/ \
 		https://github.com/pysal/pointpats
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}libpysal>=4.0.0:science/py-libpysal@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>=0:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpy>=1.3,1:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pandas>=0,1:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=1.8.0:science/py-scipy@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/graphics/py-pycollada/Makefile b/graphics/py-pycollada/Makefile
index 5ce786043f9f..f520f3d8ea11 100644
--- a/graphics/py-pycollada/Makefile
+++ b/graphics/py-pycollada/Makefile
@@ -1,26 +1,26 @@
 PORTNAME=	pycollada
 DISTVERSION=	0.6
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	tj+freebsd_ports@a13.fr
 COMMENT=	Python library for reading and writing collada documents
 WWW=		https://pycollada.readthedocs.org/
 
 LICENSE=	BSD3CLAUSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dateutil>=2.0:devel/py-dateutil@${PY_FLAVOR}
 
 NO_ARCH=	yes
 USES=		python:3.6+
 USE_PYTHON=	autoplist distutils
 
 OPTIONS_DEFINE=	LXML
 
 LXML_DESC=		Uses lxml for XML loading, construction, and saving.
 LXML_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR}
 
 .include <bsd.port.mk>
diff --git a/graphics/py-pyganim/Makefile b/graphics/py-pyganim/Makefile
index 1843b5e4cf86..af6bf474d214 100644
--- a/graphics/py-pyganim/Makefile
+++ b/graphics/py-pyganim/Makefile
@@ -1,23 +1,23 @@
 PORTNAME=	pyganim
 PORTVERSION=	0.9.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	Pyganim-${PORTVERSION}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Sprite animation module for Pygame
 WWW=		https://inventwithpython.com/pyganim/ \
 		https://github.com/asweigart/pyganim
 
 LICENSE=	BSD2CLAUSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}game>=0:devel/py-game@${PY_FLAVOR}
 
 USES=		python:3.6+ zip
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/graphics/py-pygeoapi/Makefile b/graphics/py-pygeoapi/Makefile
index d6087d91deaf..c85e3a949a35 100644
--- a/graphics/py-pygeoapi/Makefile
+++ b/graphics/py-pygeoapi/Makefile
@@ -1,27 +1,28 @@
 PORTNAME=	pygeoapi
 PORTVERSION=	0.14.0
+PORTREVISION=	1
 CATEGORIES=	graphics geography python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	lbartoletti@FreeBSD.org
 COMMENT=	OGC API server implementation
 WWW=		https://pygeoapi.io/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}unicodecsv>0:devel/py-unicodecsv@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Flask>0:www/py-flask@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Flask-Cors>0:www/py-flask-cors@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyproj>0:graphics/py-pyproj@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}rasterio>0:graphics/py-rasterio@${PY_FLAVOR}
 
 USES=		python:3.8+
 USE_PYTHON=	autoplist concurrent distutils
 
 .include <bsd.port.mk>
diff --git a/graphics/py-pygeos/Makefile b/graphics/py-pygeos/Makefile
index 0fad8b466bac..f5c070037736 100644
--- a/graphics/py-pygeos/Makefile
+++ b/graphics/py-pygeos/Makefile
@@ -1,25 +1,26 @@
 PORTNAME=	pygeos
 PORTVERSION=	0.12.0
+PORTREVISION=	1
 CATEGORIES=	graphics python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	GEOS wrapped in numpy ufuncs
 WWW=		https://github.com/pygeos/pygeos
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	geos>=3.5:graphics/geos \
 		${PYTHON_PKGNAMEPREFIX}numpy>=1.13,1:math/py-numpy@${PY_FLAVOR}
 LIB_DEPENDS=	libgeos.so:graphics/geos
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=1.13,1:math/py-numpy@${PY_FLAVOR}
 
 USES=		python:3.8+
 USE_PYTHON=	autoplist concurrent cython distutils
 
 post-install:
 	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' -exec ${STRIP_CMD} {} +
 
 .include <bsd.port.mk>
diff --git a/graphics/py-pyqtgraph/Makefile b/graphics/py-pyqtgraph/Makefile
index d49360fb301e..b7eff54f1a58 100644
--- a/graphics/py-pyqtgraph/Makefile
+++ b/graphics/py-pyqtgraph/Makefile
@@ -1,30 +1,30 @@
 PORTNAME=	pyqtgraph
 DISTVERSION=	0.13.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics science python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 PATCH_SITES=	https://github.com/pyqtgraph/pyqtgraph/commit/
 PATCHFILES=	935914143d87f28575ea9d60bd9efada57b3bdd6.patch:-p1 # Fix renderView to not use mremap on FreeBSD, see https://github.com/pyqtgraph/pyqtgraph/pull/2445/
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Scientific graphics and GUI library for Python
 WWW=		https://www.pyqtgraph.org/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}colorcet>0:graphics/py-colorcet@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}PyOpenGL>0:graphics/py-PyOpenGL@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR}
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}qt5-pyqt>0:devel/py-qt5-pyqt@${PY_FLAVOR} # PyQtGraph requires one of PyQt5, PyQt6, PySide2 or PySide6
 
 USES=		python:3.8+
 USE_PYTHON=	distutils autoplist pytest
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/graphics/py-pyrsgis/Makefile b/graphics/py-pyrsgis/Makefile
index 6bfe6e51c3dd..aff3250d4c86 100644
--- a/graphics/py-pyrsgis/Makefile
+++ b/graphics/py-pyrsgis/Makefile
@@ -1,26 +1,27 @@
 PORTNAME=	pyrsgis
 PORTVERSION=	0.4.1
+PORTREVISION=	1
 CATEGORIES=	graphics python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	rhurlin@FreeBSD.org
 COMMENT=	Processing satellite data directly from TAR files
 WWW=		https://github.com/PratyushTripathy/pyrsgis
 
 LICENSE=	MIT
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gdal>=0:graphics/py-gdal@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>=0:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib-scalebar>=0:math/py-matplotlib-scalebar@${PY_FLAVOR} \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-learn>0:science/py-scikit-learn@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-image>0:graphics/py-scikit-image@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	autoplist distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/graphics/py-pyvips/Makefile b/graphics/py-pyvips/Makefile
index a37c220df759..81dc4aa0e7a9 100644
--- a/graphics/py-pyvips/Makefile
+++ b/graphics/py-pyvips/Makefile
@@ -1,27 +1,28 @@
 PORTNAME=	pyvips
 PORTVERSION=	2.2.1
+PORTREVISION=	1
 CATEGORIES=	graphics python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Binding for the libvips image processing library
 WWW=		https://github.com/libvips/pyvips
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cffi>=1.13:devel/py-cffi@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pkgconfig>=0,1:devel/py-pkgconfig@${PY_FLAVOR}
 LIB_DEPENDS=	libvips.so:graphics/vips
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cffi>=1.13:devel/py-cffi@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pkgconfig>=0,1:devel/py-pkgconfig@${PY_FLAVOR}
 
 USES=		gnome python:3.6+
 USE_GNOME=	glib20
 USE_PYTHON=	autoplist concurrent distutils
 
 post-install:
 	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' -exec ${STRIP_CMD} {} +
 
 .include <bsd.port.mk>
diff --git a/graphics/py-pyvista/Makefile b/graphics/py-pyvista/Makefile
index 59fb7cd73b37..e18a8524859d 100644
--- a/graphics/py-pyvista/Makefile
+++ b/graphics/py-pyvista/Makefile
@@ -1,28 +1,28 @@
 PORTNAME=	pyvista
 DISTVERSION=	0.34.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Pythonic interface to VTK
 WWW=		https://github.com/pyvista/pyvista
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}appdirs>0:devel/py-appdirs@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}imageio>0:graphics/py-imageio@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scooby>=0.5.1:devel/py-scooby@${PY_FLAVOR} \
 		vtk${VTK_VER:R}>0:math/vtk${VTK_VER:R}
 
 USES=		python:3.6+
 USE_PYTHON=	distutils autoplist
 
 NO_ARCH=	yes
 
 .include <../../math/vtk9/Makefile.version>
 .include <bsd.port.mk>
diff --git a/graphics/py-rasterio/Makefile b/graphics/py-rasterio/Makefile
index 7eeafb76cfaa..7bb81ae466ab 100644
--- a/graphics/py-rasterio/Makefile
+++ b/graphics/py-rasterio/Makefile
@@ -1,39 +1,40 @@
 PORTNAME=	rasterio
 PORTVERSION=	1.3.6
+PORTREVISION=	1
 CATEGORIES=	graphics python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Fast and direct raster I/O for use with Numpy and SciPy
 WWW=		https://github.com/rasterio/rasterio
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BUILD_DEPENDS=	gdal>=3.1:graphics/gdal \
 		${PYTHON_PKGNAMEPREFIX}numpy>=0,1:math/py-numpy@${PY_FLAVOR}
 RUN_DEPENDS=	gdal>=3.1:graphics/gdal \
 		${PYTHON_PKGNAMEPREFIX}affine>=0:math/py-affine@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}attrs>=0:devel/py-attrs@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}certifi>=0:security/py-certifi@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}click>=4.0:devel/py-click@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}click-plugins>=0:devel/py-click-plugins@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cligj>=0.5:devel/py-cligj@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpy>=1.18,1:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}snuggs>=1.4.1:math/py-snuggs@${PY_FLAVOR}
 
 USES=		compiler:c++11-lang python:3.7+
 USE_PYTHON=	autoplist concurrent cython distutils
 
 OPTIONS_DEFINE=	PLOT S3
 PLOT_DESC=	Plotting support
 S3_DESC=	Amazon S3 support
 
 PLOT_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}matplotlib>=0:math/py-matplotlib@${PY_FLAVOR}
 S3_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}boto3>=1.2.4:www/py-boto3@${PY_FLAVOR}
 
 post-install:
 	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' -exec ${STRIP_CMD} {} +
 
 .include <bsd.port.mk>
diff --git a/graphics/py-rasterstats/Makefile b/graphics/py-rasterstats/Makefile
index 6db5a7080461..beda0f87b773 100644
--- a/graphics/py-rasterstats/Makefile
+++ b/graphics/py-rasterstats/Makefile
@@ -1,31 +1,31 @@
 PORTNAME=	rasterstats
 PORTVERSION=	0.18.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Summarize geospatial raster datasets based on vector geometries
 WWW=		https://github.com/perrygeo/python-rasterstats
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=61:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}affine>=0<3.0:math/py-affine@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}click>=7.1:devel/py-click@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cligj>=0.4:devel/py-cligj@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Fiona>=0<1.9:graphics/py-fiona@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpy>=1.9,1:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}rasterio>=1.0:graphics/py-rasterio@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Shapely>=0:devel/py-shapely@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}simplejson>=0:devel/py-simplejson@${PY_FLAVOR}
 
 USES=		python:3.8+
 USE_PYTHON=	autoplist concurrent pep517
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/graphics/py-scikit-image/Makefile b/graphics/py-scikit-image/Makefile
index d2f24fa3d7e6..4f7518e38dd9 100644
--- a/graphics/py-scikit-image/Makefile
+++ b/graphics/py-scikit-image/Makefile
@@ -1,44 +1,45 @@
 PORTNAME=	scikit-image
 PORTVERSION=	0.19.3
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	graphics python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Image processing in Python
 WWW=		https://scikit-image.org/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BUILD_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pythran>0:devel/py-pythran@${PY_FLAVOR}
 RUN_DEPENDS=	${PYNUMPY} \
 		${PY_PILLOW} \
 		${PYTHON_PKGNAMEPREFIX}imageio>=2.4.1:graphics/py-imageio@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tifffile>=2019.7.26:graphics/py-tifffile@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=1.4.1:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}networkx>=2.2:math/py-networkx@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>=1.1:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}PyWavelets>=1.1.1:math/py-PyWavelets@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cloudpickle>=0.2.1:devel/py-cloudpickle@${PY_FLAVOR}
 
 USES=		compiler:c++11-lang python:3.7+ shebangfix
 USE_GITHUB=	yes
 USE_PYTHON=	autoplist concurrent distutils cython cython_run
 
 PYDISTUTILS_BUILD_TARGET=	build build_ext
 PYDISTUTILS_BUILDARGS+=		saveopts
 SHEBANG_FILES=	skimage/scripts/skivi
 
 post-install:
 	@${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR}/skimage -name "*.so" -exec ${STRIP_CMD} {} \;
 
 do-test:
 	@cd ${WRKSRC} && \
 	${PYTHON_CMD} ${PYSETUP} build_ext -i && \
 	${PYTHON_CMD} selftest.py && \
 	${PYTHON_CMD} -m nose -vx Tests/test_*.py
 
 .include <bsd.port.mk>
diff --git a/graphics/py-tifffile/Makefile b/graphics/py-tifffile/Makefile
index 34e077140224..7ef9637bde19 100644
--- a/graphics/py-tifffile/Makefile
+++ b/graphics/py-tifffile/Makefile
@@ -1,21 +1,22 @@
 PORTNAME=	tifffile
 PORTVERSION=	2022.7.28
+PORTREVISION=	1
 CATEGORIES=	graphics python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Read and write TIFF(r) files
 WWW=		https://github.com/cgohlke/tifffile
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=1.19.2,1:math/py-numpy@${PY_FLAVOR}
 
 USES=		dos2unix python:3.8+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/graphics/py-toyplot/Makefile b/graphics/py-toyplot/Makefile
index e62a62f169b2..42f6d59dcd1c 100644
--- a/graphics/py-toyplot/Makefile
+++ b/graphics/py-toyplot/Makefile
@@ -1,23 +1,24 @@
 PORTNAME=	toyplot
 PORTVERSION=	0.19.0
+PORTREVISION=	1
 CATEGORIES=	graphics python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	skreuzer@FreeBSD.org
 COMMENT=	Modern plotting toolkit supporting electronic publishing
 WWW=		https://pypi.org/project/toyplot/
 
 LICENSE=	BSD3CLAUSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=1.8:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}colormath>=2.1.1:math/py-colormath@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}multipledispatch>=0.4.7:devel/py-multipledispatch@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}png>=0.0.17:graphics/py-png@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}reportlab>=3.2.0:print/py-reportlab@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}custom_inherit>=2.2.0:textproc/py-custom_inherit@${PY_FLAVOR}
 
 USES=		python:3.5+
 USE_PYTHON=	autoplist distutils
 
 .include <bsd.port.mk>
diff --git a/graphics/py-urbanaccess/Makefile b/graphics/py-urbanaccess/Makefile
index 2e0ee6550e65..ddfae9617c36 100644
--- a/graphics/py-urbanaccess/Makefile
+++ b/graphics/py-urbanaccess/Makefile
@@ -1,30 +1,31 @@
 PORTNAME=	urbanaccess
 PORTVERSION=	0.2.2
+PORTREVISION=	1
 CATEGORIES=	graphics python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Tool for creating GTFS transit and OSM pedestrian networks
 WWW=		https://github.com/UDST/urbanaccess
 
 LICENSE=	AGPLv3
 LICENSE_FILE=	${WRKSRC}/License.txt
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}geopy>=1.11.0:net/py-geopy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>=2.0:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpy>=1.11,1:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}osmnet>=0.1.4:graphics/py-osmnet@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pandana>=0.2.0:graphics/py-pandana@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pandas>=0.17.0,1:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.9.1:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-learn>=0.17.1:science/py-scikit-learn@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.11:devel/py-six@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/graphics/py-urbansim/Makefile b/graphics/py-urbansim/Makefile
index f8bfa3003f7b..c4dbcb14793a 100644
--- a/graphics/py-urbansim/Makefile
+++ b/graphics/py-urbansim/Makefile
@@ -1,29 +1,30 @@
 PORTNAME=	urbansim
 PORTVERSION=	3.2
+PORTREVISION=	1
 CATEGORIES=	graphics python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Platform for building statistical models of cities and regions
 WWW=		https://github.com/UDST/urbansim
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=1.8.0,1:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}orca>=1.1:devel/py-orca@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pandas>=0.17.0,1:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}patsy>=0.4.1:math/py-patsy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}prettytable>=0.7.2:devel/py-prettytable@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>=3.10:devel/py-yaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=1.0:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}statsmodels>=0.8:math/py-statsmodels@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}toolz>=0.8.1:devel/py-toolz@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/graphics/py-visvis/Makefile b/graphics/py-visvis/Makefile
index fa45391ee278..0a202af32ed7 100644
--- a/graphics/py-visvis/Makefile
+++ b/graphics/py-visvis/Makefile
@@ -1,32 +1,32 @@
 PORTNAME=	visvis
 PORTVERSION=	1.14.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	rhurlin@FreeBSD.org
 COMMENT=	Object oriented approach to visualization of 1D to 4D data
 WWW=		https://github.com/almarklein/visvis
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/license.txt
 
 LIB_DEPENDS=	libfltk.so:x11-toolkits/fltk
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}imageio>=0:graphics/py-imageio@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}PyOpenGL>=0:graphics/py-PyOpenGL@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyside2>=0:devel/pyside2@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}hypothesis>=0:devel/py-hypothesis@${PY_FLAVOR}
 
 USES=		gl python:3.7+ pyqt:5 pytest shebangfix
 USE_GL=		gl
 USE_PYQT=	pyqt5
 USE_PYTHON=	autoplist distutils
 USE_WX=		3.0+
 
 SHEBANG_FILES=	examples/*.py
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/graphics/py-zbar-py/Makefile b/graphics/py-zbar-py/Makefile
index 2456c9dac20e..65f60939325f 100644
--- a/graphics/py-zbar-py/Makefile
+++ b/graphics/py-zbar-py/Makefile
@@ -1,23 +1,24 @@
 PORTNAME=	zbar-py
 PORTVERSION=	1.0.4
+PORTREVISION=	1
 CATEGORIES=	graphics python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Interface to the zbar bar-code reading library
 WWW=		https://pypi.org/project/zbar-py/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libzbar.so:graphics/zbar
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy@${PY_FLAVOR}
 
 USES=		iconv:wchar_t python:3.6+
 USE_PYTHON=	autoplist distutils
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/zbar/_zbar*.so
 
 .include <bsd.port.mk>
diff --git a/graphics/qgis-ltr/Makefile b/graphics/qgis-ltr/Makefile
index de04e6eb4d40..792919cb13aa 100644
--- a/graphics/qgis-ltr/Makefile
+++ b/graphics/qgis-ltr/Makefile
@@ -1,184 +1,185 @@
 PORTNAME=	qgis
 DISTVERSION=	3.28.5
+PORTREVISION=	1
 CATEGORIES=	graphics geography
 MASTER_SITES=	https://qgis.org/downloads/
 PKGNAMESUFFIX=	-ltr
 
 MAINTAINER=	rhurlin@FreeBSD.org
 COMMENT=	Free and Open Source Geographic Information System
 WWW=		https://qgis.org/en/site/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/doc/LICENSE
 
 BUILD_DEPENDS=	gpsbabel>=1.7.0:astro/gpsbabel \
 		opencl>=0:devel/opencl \
 		${PYTHON_PKGNAMEPREFIX}cycler>=0.11.0:devel/py-cycler@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dateutil>=2.8.2:devel/py-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}future>=0.18.2:devel/py-future@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}httplib2>=0.20.2:www/py-httplib2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jedi>=0.18.1:devel/py-jedi@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=3.1.2:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}markupsafe>=2.1.1:textproc/py-markupsafe@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>=3.4.3:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mock>=4.0.3:devel/py-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}OWSLib>=0.27.2:graphics/py-OWSLib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pbr>=5.10.0:devel/py-pbr@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pip>=22.2.2:devel/py-pip@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}plotly>=4.14.3:graphics/py-plotly@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pygments>=2.13.0:textproc/py-pygments@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyproj>=3.4.0:graphics/py-pyproj@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytz>=2020.5:devel/py-pytz@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.28.0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.16.0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>=3.7.16:databases/py-sqlite3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>=5.4.1:devel/py-yaml@${PY_FLAVOR}
 LIB_DEPENDS=	libexiv2.so:graphics/exiv2 \
 		libexpat.so:textproc/expat2 \
 		libgdal.so:graphics/gdal \
 		libgeos.so:graphics/geos \
 		libgsl.so:math/gsl \
 		libhdf5.so:science/hdf5 \
 		liblazperf.so:archivers/lazperf \
 		libmdal.so:math/mdal \
 		libnetcdf.so:science/netcdf \
 		libOpenCL.so:devel/ocl-icd \
 		libpdal_base.so:math/pdal \
 		libproj.so:graphics/proj \
 		libprotobuf-lite.so:devel/protobuf \
 		libqjson-qt5.so:devel/qjson \
 		libqscintilla2_qt5.so:devel/qscintilla2-qt5 \
 		libqt5keychain.so:security/qtkeychain@qt5 \
 		libqwt6.so:x11-toolkits/qwt6 \
 		libspatialindex.so:devel/spatialindex \
 		libspatialite.so:databases/spatialite \
 		libsz.so:science/libaec \
 		libxerces-c.so:textproc/xerces-c3 \
 		libzip.so:archivers/libzip \
 		libzstd.so:archivers/zstd
 RUN_DEPENDS=	astyle:devel/astyle \
 		opencl>=0:devel/opencl \
 		${PYTHON_PKGNAMEPREFIX}black>=22.10:devel/py-black@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cycler>=0.11.0:devel/py-cycler@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dateutil>=2.8.2:devel/py-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Fiona>=1.8.21:graphics/py-fiona@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}future>=0.18.2:devel/py-future@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}gdal>=3.5.2:graphics/py-gdal@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}geojson>=2.3.0:devel/py-geojson@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}geopandas>=0.11.1:graphics/py-geopandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}httplib2>=0.20.2:www/py-httplib2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jedi>=0.18.1:devel/py-jedi@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=3.1.2:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}markupsafe>=2.1.1:textproc/py-markupsafe@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>=3.4.3:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mock>=4.0.3:devel/py-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}nbformat>=5.7.0:devel/py-nbformat@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}netCDF4>=1.6.2:science/py-netCDF4@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}networkx>=2.8.8:math/py-networkx@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}nltk>=3.7:textproc/py-nltk@${PY_FLAVOR} \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}OWSLib>=0.27.2:graphics/py-OWSLib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pandas>=1.5.0:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pbr>=5.10.0:devel/py-pbr@${PY_FLAVOR} \
 		${PY_PILLOW} \
 		${PYTHON_PKGNAMEPREFIX}pip>=22.2.2:devel/py-pip@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}plotly>=4.14.3:graphics/py-plotly@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psutil>=5.9.2:sysutils/py-psutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psycopg2>=2.9.4:databases/py-psycopg2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pygments>=2.13.0:textproc/py-pygments@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyproj>=3.4.0:graphics/py-pyproj@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyrsgis>=0.4.1:graphics/py-pyrsgis@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytz>=2020.5:devel/py-pytz@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}rasterio>=1.3.2:graphics/py-rasterio@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.28.0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-image>=0.19.3:graphics/py-scikit-image@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-learn>=1.1.3:science/py-scikit-learn@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Shapely>=1.8.5:devel/py-shapely@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.16.0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>=3.7.16:databases/py-sqlite3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}termcolor>=2.1.0:devel/py-termcolor@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xcffib>=0.11.1:x11/py-xcffib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xlrd>=2.0.1:textproc/py-xlrd@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>=5.4.1:devel/py-yaml@${PY_FLAVOR}
 
 ### Fortran is needed by numpy, GRASS, etc.
 USES=		bison cmake compiler:features desktop-file-utils \
 		fortran gl gmake gnome pgsql pyqt:5 python:3.8+ qca qt:5 \
 		shebangfix sqlite:3 tar:bz2
 USE_GL=		gl
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
 USE_PYQT=	pyqt5 qscintilla2 pysip sip
 USE_QT=		3d buildtools:build core concurrent dbus declarative \
 		designer:build qdoc:build gamepad gui linguist:build location \
 		network printsupport qmake:build script serialport \
 		sql sql-pgsql sql-sqlite3 svg uitools:build \
 		webengine webkit widgets xml
 
 SHEBANG_FILES=	src/plugins/grass/scripts/*.py
 
 CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE:STRING=Release \
 		-DLazPerf_INCLUDE_DIR:PATH=${LOCALBASE}/include/lazperf \
 		-DWITH_INTERNAL_MDAL:BOOL=false \
 		-DPYRCC_PROGRAM:FILEPATH=${LOCALBASE}/bin/pyrcc5-${PYTHON_VER} \
 		-DPYUIC_PROGRAM:FILEPATH=${LOCALBASE}/bin/pyuic5-${PYTHON_VER} \
 		-DQSCI_SIP_DIR:PATH=${PYQT_SIPDIR}/Qsci \
 		-DQWT_INCLUDE_DIR:PATH=${LOCALBASE}/include/qt5/qwt6 \
 		-DQWT_LIBRARY:FILEPATH=${LOCALBASE}/lib/qt5/libqwt6.so \
 		-DQGIS_MANUAL_SUBDIR:PATH=share/man
 CMAKE_ON=	USE_OPENCL WITH_3D WITH_ASTYLE \
 		WITH_BINDINGS WITH_COPC WITH_CUSTOM_WIDGETS WITH_EPT \
 		WITH_PDAL WITH_POSTGRESQL
 CMAKE_OFF=	ENABLE_TESTS WITH_QWTPOLAR
 
 CONFLICTS_INSTALL=	qgis
 
 PLIST_SUB=	DISTVERSION=${DISTVERSION}
 
 .if !defined(MAINTAINER_MODE)
 CMAKE_ARGS+=	-Wno-dev
 CMAKE_OFF+=	SUPPRESS_QT_WARNINGS
 .endif
 
 OPTIONS_DEFINE=		GRASS SERVER
 OPTIONS_DEFAULT=	GRASS SERVER
 NO_OPTIONS_SORT=	yes
 
 OPTIONS_SUB=		yes
 SERVER_DESC=		Enable QGIS server
 
 GRASS_BUILD_DEPENDS=	grass7:databases/grass7
 GRASS_RUN_DEPENDS=	${GRASS_BUILD_DEPENDS}
 GRASS_CMAKE_BOOL=	WITH_GRASS7
 SERVER_LIB_DEPENDS=	libfcgi.so:www/fcgi
 SERVER_CMAKE_BOOL=	WITH_SERVER WITH_SERVER_PLUGINS WITH_QSPATIALITE
 
 .include <bsd.port.pre.mk>
 
 # QGIS requires flex >= 2.5.6, see
 # https://github.com/qgis/QGIS/blob/fb0f334b06e0828e5695ffcaa7c7eb82d6516cb0/INSTALL.md
 .if (${OPSYS} == FreeBSD && ${OSVERSION} < 1300501)
 BUILD_DEPENDS+=	${LOCALBASE}/bin/flex:textproc/flex
 CMAKE_ARGS+=	-DFLEX_EXECUTABLE:FILEPATH=${LOCALBASE}/bin/flex
 .endif
 
 post-patch:
 # On i386, '-mllvm -inline-threshold=128' does not build under all circumstances
 # See bugs 242557 and 241687.
 .if ${OPSYS} == FreeBSD && ${ARCH} == "i386"
 	@${REINPLACE_CMD} -e 's|"-mllvm -inline-threshold=128"|"-O1"|g' \
 		${WRKSRC}/src/core/CMakeLists.txt
 .endif
 
 pre-configure:
 	${MKDIR} ${CONFIGURE_WRKSRC}/bin && ${LN} -s ${PYTHON_CMD} ${CONFIGURE_WRKSRC}/bin/python3
 
 post-install:
 	@${RM} ${STAGEDIR}${DATADIR}/python/pytz/tzfile.py.bak
 	@${FIND} ${STAGEDIR}${LOCALBASE} -name "__pycache__" -delete
 	@${RM} /tmp/srs.db
 
 check:
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} check
 
 .include <bsd.port.post.mk>
diff --git a/graphics/qgis/Makefile b/graphics/qgis/Makefile
index 11d018316ac3..bebb0d865345 100644
--- a/graphics/qgis/Makefile
+++ b/graphics/qgis/Makefile
@@ -1,180 +1,181 @@
 PORTNAME=	qgis
 DISTVERSION=	3.30.1
+PORTREVISION=	1
 CATEGORIES=	graphics geography
 MASTER_SITES=	https://qgis.org/downloads/
 
 MAINTAINER=	rhurlin@FreeBSD.org
 COMMENT=	Free and Open Source Geographic Information System
 WWW=		https://qgis.org/en/site/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/doc/LICENSE
 
 BUILD_DEPENDS=	gpsbabel>=1.7.0:astro/gpsbabel \
 		opencl>=0:devel/opencl \
 		${PYTHON_PKGNAMEPREFIX}cycler>=0.11.0:devel/py-cycler@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dateutil>=2.8.2:devel/py-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}future>=0.18.2:devel/py-future@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}httplib2>=0.20.2:www/py-httplib2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jedi>=0.18.1:devel/py-jedi@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=3.1.2:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}markupsafe>=2.1.1:textproc/py-markupsafe@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>=3.4.3:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mock>=4.0.3:devel/py-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}OWSLib>=0.27.2:graphics/py-OWSLib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pbr>=5.10.0:devel/py-pbr@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pip>=22.2.2:devel/py-pip@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}plotly>=4.14.3:graphics/py-plotly@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pygments>=2.13.0:textproc/py-pygments@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyproj>=3.4.0:graphics/py-pyproj@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytz>=2020.5:devel/py-pytz@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.28.0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.16.0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>=3.7.16:databases/py-sqlite3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>=5.4.1:devel/py-yaml@${PY_FLAVOR}
 LIB_DEPENDS=	libexiv2.so:graphics/exiv2 \
 		libexpat.so:textproc/expat2 \
 		libgdal.so:graphics/gdal \
 		libgeos.so:graphics/geos \
 		libgsl.so:math/gsl \
 		libhdf5.so:science/hdf5 \
 		libmdal.so:math/mdal \
 		libnetcdf.so:science/netcdf \
 		libOpenCL.so:devel/ocl-icd \
 		libpdal_base.so:math/pdal \
 		libproj.so:graphics/proj \
 		libprotobuf-lite.so:devel/protobuf \
 		libqjson-qt5.so:devel/qjson \
 		libqscintilla2_qt5.so:devel/qscintilla2-qt5 \
 		libqt5keychain.so:security/qtkeychain@qt5 \
 		libqwt6.so:x11-toolkits/qwt6 \
 		libspatialindex.so:devel/spatialindex \
 		libspatialite.so:databases/spatialite \
 		libsz.so:science/libaec \
 		libxerces-c.so:textproc/xerces-c3 \
 		libzip.so:archivers/libzip \
 		libzstd.so:archivers/zstd
 RUN_DEPENDS=	astyle:devel/astyle \
 		opencl>=0:devel/opencl \
 		${PYTHON_PKGNAMEPREFIX}black>=22.10:devel/py-black@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cycler>=0.11.0:devel/py-cycler@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dateutil>=2.8.2:devel/py-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Fiona>=1.8.21:graphics/py-fiona@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}future>=0.18.2:devel/py-future@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}gdal>=3.5.2:graphics/py-gdal@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}geojson>=2.3.0:devel/py-geojson@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}geopandas>=0.11.1:graphics/py-geopandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}httplib2>=0.20.2:www/py-httplib2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jedi>=0.18.1:devel/py-jedi@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=3.1.2:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}markupsafe>=2.1.1:textproc/py-markupsafe@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>=3.4.3:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mock>=4.0.3:devel/py-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}nbformat>=5.7.0:devel/py-nbformat@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}netCDF4>=1.6.2:science/py-netCDF4@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}networkx>=2.8.8:math/py-networkx@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}nltk>=3.7:textproc/py-nltk@${PY_FLAVOR} \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}OWSLib>=0.27.2:graphics/py-OWSLib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pandas>=1.5.0:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pbr>=5.10.0:devel/py-pbr@${PY_FLAVOR} \
 		${PY_PILLOW} \
 		${PYTHON_PKGNAMEPREFIX}pip>=22.2.2:devel/py-pip@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}plotly>=4.14.3:graphics/py-plotly@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psutil>=5.9.2:sysutils/py-psutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psycopg2>=2.9.4:databases/py-psycopg2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pygments>=2.13.0:textproc/py-pygments@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyproj>=3.4.0:graphics/py-pyproj@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyrsgis>=0.4.1:graphics/py-pyrsgis@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytz>=2020.5:devel/py-pytz@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}rasterio>=1.3.2:graphics/py-rasterio@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.28.0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-image>=0.19.3:graphics/py-scikit-image@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-learn>=1.1.3:science/py-scikit-learn@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Shapely>=1.8.5:devel/py-shapely@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.16.0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>=3.7.16:databases/py-sqlite3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}termcolor>=2.1.0:devel/py-termcolor@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xcffib>=0.11.1:x11/py-xcffib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xlrd>=2.0.1:textproc/py-xlrd@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>=5.4.1:devel/py-yaml@${PY_FLAVOR}
 
 ### Fortran is needed by numpy, GRASS, etc.
 USES=		bison cmake compiler:features desktop-file-utils \
 		fortran gl gmake gnome pgsql pyqt:5 python:3.8+ qca qt:5 \
 		shebangfix sqlite:3 tar:bz2
 USE_GL=		gl
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
 USE_PYQT=	pyqt5 qscintilla2 pysip sip
 USE_QT=		3d buildtools:build core concurrent dbus declarative \
 		designer:build qdoc:build gamepad gui linguist:build location \
 		network printsupport qmake:build script serialport \
 		sql sql-pgsql sql-sqlite3 svg uitools:build \
 		webengine webkit widgets xml
 
 SHEBANG_FILES=	src/plugins/grass/scripts/*.py
 
 CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE:STRING=Release \
 		-DPYRCC_PROGRAM:FILEPATH=${LOCALBASE}/bin/pyrcc5-${PYTHON_VER} \
 		-DPYUIC_PROGRAM:FILEPATH=${LOCALBASE}/bin/pyuic5-${PYTHON_VER} \
 		-DQSCI_SIP_DIR:PATH=${PYQT_SIPDIR}/Qsci \
 		-DQWT_INCLUDE_DIR:PATH=${LOCALBASE}/include/qt5/qwt6 \
 		-DQWT_LIBRARY:FILEPATH=${LOCALBASE}/lib/qt5/libqwt6.so \
 		-DQGIS_MANUAL_SUBDIR:PATH=share/man
 CMAKE_ON=	USE_OPENCL WITH_3D WITH_ASTYLE WITH_BINDINGS \
 		WITH_COPC WITH_CUSTOM_WIDGETS WITH_EPT  WITH_INTERNAL_LAZPERF \
 		WITH_POSTGRESQL WITH_PDAL
 CMAKE_OFF=	ENABLE_TESTS WITH_INTERNAL_MDAL WITH_QWTPOLAR
 
 CONFLICTS_INSTALL=	qgis-ltr
 
 PLIST_SUB=	DISTVERSION=${PORTVERSION}
 
 .if !defined(MAINTAINER_MODE)
 CMAKE_ARGS+=	-Wno-dev
 CMAKE_OFF+=	SUPPRESS_QT_WARNINGS
 .endif
 
 OPTIONS_DEFINE=		GRASS SERVER
 OPTIONS_DEFAULT=	GRASS SERVER
 NO_OPTIONS_SORT=	yes
 
 OPTIONS_SUB=		yes
 SERVER_DESC=		Enable QGIS server
 
 GRASS_BUILD_DEPENDS=	grass7:databases/grass7
 GRASS_RUN_DEPENDS=	${GRASS_BUILD_DEPENDS}
 GRASS_CMAKE_BOOL=	WITH_GRASS7
 SERVER_LIB_DEPENDS=	libfcgi.so:www/fcgi
 SERVER_CMAKE_BOOL=	WITH_SERVER WITH_SERVER_PLUGINS WITH_QSPATIALITE
 
 .include <bsd.port.pre.mk>
 
 # QGIS requires flex >= 2.5.6, see
 # https://github.com/qgis/QGIS/blob/fb0f334b06e0828e5695ffcaa7c7eb82d6516cb0/INSTALL.md
 .if (${OPSYS} == FreeBSD && ${OSVERSION} < 1300501)
 BUILD_DEPENDS+=	${LOCALBASE}/bin/flex:textproc/flex
 CMAKE_ARGS+=	-DFLEX_EXECUTABLE:FILEPATH=${LOCALBASE}/bin/flex
 .endif
 
 post-patch:
 # On i386, '-mllvm -inline-threshold=128' does not build under all circumstances
 # See bugs 242557 and 241687.
 .if ${OPSYS} == FreeBSD && ${ARCH} == "i386"
 	@${REINPLACE_CMD} -e 's|"-mllvm -inline-threshold=128"|"-O1"|g' \
 		${WRKSRC}/src/core/CMakeLists.txt
 .endif
 
 pre-configure:
 	${MKDIR} ${CONFIGURE_WRKSRC}/bin && ${LN} -s ${PYTHON_CMD} ${CONFIGURE_WRKSRC}/bin/python3
 
 post-install:
 	@${RM} ${STAGEDIR}${DATADIR}/python/pytz/tzfile.py.bak
 	@${FIND} ${STAGEDIR}${LOCALBASE} -name "__pycache__" -delete
 	@${RM} /tmp/srs.db
 
 check:
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} check
 
 .include <bsd.port.post.mk>
diff --git a/graphics/qtqr/Makefile b/graphics/qtqr/Makefile
index bf838995dc50..eefe380d6a3d 100644
--- a/graphics/qtqr/Makefile
+++ b/graphics/qtqr/Makefile
@@ -1,41 +1,41 @@
 PORTNAME=	qtqr
 DISTVERSION=	2.0.bzr39
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	graphics python
 MASTER_SITES=	LOCAL/ehaupt
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	qr-tools-${DISTVERSION}
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	GUI that makes it easy to create and decode QR codes
 WWW=		https://launchpad.net/qr-tools
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENCE
 
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}zbar-py>=1.0.4:graphics/py-zbar-py@${PY_FLAVOR}
 
 USES=		desktop-file-utils pyqt:5 python:3.6+ shebangfix
 USE_PYQT=	pyqt5:run
 USE_PYTHON=	autoplist distutils
 
 SHEBANG_FILES=	qtqr.py
 
 NO_BUILD=	yes
 
 OPTIONS_DEFINE=	EXAMPLES
 
 post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/qtqr.py ${STAGEDIR}${PREFIX}/bin/qtqr
 	${INSTALL_DATA} ${WRKSRC}/icon.png ${STAGEDIR}${PREFIX}/share/pixmaps/qtqr.png
 	${INSTALL_DATA} ${WRKSRC}/qtqr.desktop ${STAGEDIR}${DESKTOPDIR}
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/qt5/translations
 	${INSTALL_DATA} ${WRKSRC}/*.qm ${STAGEDIR}${PREFIX}/share/qt5/translations
 
 post-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/samples/* ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/graphics/raster3d/Makefile b/graphics/raster3d/Makefile
index cfebd7720457..ccf17a7be34c 100644
--- a/graphics/raster3d/Makefile
+++ b/graphics/raster3d/Makefile
@@ -1,67 +1,68 @@
 PORTNAME=	raster3d
 DISTVERSION=	3.0.7
+PORTREVISION=	1
 CATEGORIES=	graphics biology
 MASTER_SITES=	http://skuld.bmsc.washington.edu/${PORTNAME}/
 DISTNAME=	Raster3D_${DISTVERSION:R}-${DISTVERSION:E}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Set of tools for generating raster images of proteins and molecules
 WWW=		http://skuld.bmsc.washington.edu/raster3d/
 
 LICENSE=	ART20
 
 LIB_DEPENDS=	libgd.so:graphics/gd \
 		libtiff.so:graphics/tiff
 
 USES=		fortran
 MAKE_ARGS=	INCDIRS="-I${LOCALBASE}/include" LIBDIRS="-L${LOCALBASE}/lib" \
 		CC="${CC}" CFLAGS="${CFLAGS}" FC="${FC}" FFLAGS="${FFLAGS}" \
 		RM="${RM}" OS="${OPSYS}"
 MAKE_JOBS_UNSAFE=	yes
 
 CFLAGS+=	-DLINUX -DNETWORKBYTEORDER -Dgfortran
 FFLAGS+=	-std=legacy -fno-range-check -ffixed-line-length-132
 
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
 OPTIONS_DEFINE=	IMAGEMAGICK DOCS EXAMPLES
 OPTIONS_DEFAULT=IMAGEMAGICK
 OPTIONS_SUB=		yes
 
 IMAGEMAGICK_USES=	magick:6,run
 
 .include <bsd.port.options.mk>
 
 .if ${FORTRAN_DEFAULT} == gfortran && ${GCC_DEFAULT} >= 10
 FFLAGS+=	-fallow-invalid-boz
 .endif
 
 pre-build: # generation of Makefile.incl has to be separate from 'make all', otherwise the generated Makefile.incl isn't read by 'make all'
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} linux
 
 do-install:
 .for f in avs2ps balls normal3d rastep render ribbon rings3d rods
 	${INSTALL_PROGRAM} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/bin
 .endfor
 	${INSTALL_SCRIPT} ${WRKSRC}/worms ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/doc/*.l ${STAGEDIR}${MANLPREFIX}/man/manl
 	@${MKDIR} ${STAGEDIR}${DATADIR}/materials
 	${INSTALL_DATA} ${WRKSRC}/materials/* ${STAGEDIR}${DATADIR}/materials
 
 do-install-IMAGEMAGICK-on:
 .for f in label3d stereo3d
 	${INSTALL_SCRIPT} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/bin
 .endfor
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/html
 	${INSTALL_DATA} ${WRKSRC}/doc/R3D_manual.pdf ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/html/* ${STAGEDIR}${DOCSDIR}/html
 
 do-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
 	@${RM} -r ${STAGEDIR}${EXAMPLESDIR}/msms/CVS
 
 .include <bsd.port.mk>
diff --git a/graphics/rawtherapee/Makefile b/graphics/rawtherapee/Makefile
index 6a5a5cad79a2..f4a0d3d3cf00 100644
--- a/graphics/rawtherapee/Makefile
+++ b/graphics/rawtherapee/Makefile
@@ -1,194 +1,194 @@
 PORTNAME=	rawtherapee
 PORTVERSION=	5.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	https://rawtherapee.com/shared/source/ \
 		LOCAL/mandree/
 
 MAINTAINER=	mandree@FreeBSD.org
 COMMENT=	Powerful RAW image processing application
 WWW=		https://www.rawtherapee.com/
 
 LICENSE=	GPLv3
 
 LIB_DEPENDS=	\
 		liblensfun.so:graphics/lensfun \
 		libcanberra-gtk3.so:audio/libcanberra-gtk3 \
 		libexpat.so:textproc/expat2 \
 		libfftw3.so:math/fftw3 \
 		libfftw3f.so:math/fftw3-float \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libiptcdata.so:graphics/libiptcdata \
 		liblcms2.so:graphics/lcms2 \
 		libpng.so:graphics/png \
 		libsigc-2.0.so:devel/libsigc++20 \
 		libtiff.so:graphics/tiff
 
 USES=		cmake desktop-file-utils compiler:gcc-c++11-lib gnome \
 		jpeg localbase:ldflags pkgconfig tar:xz
 
 # Binutils required for LTO (base ar/nm/ld/ranlib don't work)
 USE_BINUTILS=	yes
 
 # As of 2019-09-29, this port is known to be miscompiled by clang90
 # (SIGSEGV or SIBGUS).
 # So we shall stick to a modern GCC for now,
 # XXX FIXME note that rawtherapee is somewhat sensitive
 # versus compiler details so we may need to pin GCC 9.x
 # or a version range.
 USE_GCC=	yes
 
 USE_GNOME=	gtkmm30 librsvg2
 
 _LTO_FLAGS=	-flto=${MAKE_JOBS_NUMBER}
 # gcc needs -flto=${MAKE_JOBS_NUMBER} for parallel link (fixed in GCC 10?)
 #     and does not understand -flto=thin
 #
 # llvm/clang needs -flto=thin and will automatically parallelize the link
 
 # Fix <https://bugs.freebsd.org/251041>:
 # 11.x has binutils that don't accept a --plugin option,
 # and gcc-ar9 appears to grab those, so make sure that USE_BINUTILS
 # override those in /usr/bin which usually is first in the PATH,
 # before ${LOCALBASE}/bin.
 # (For some reason, poudriere does not trigger this.)
 BINARY_ALIAS+=	ar=${AR} ranlib=${RANLIB}
 #
 _AR=		${CC:S/gcc/gcc-ar/}
 _RANLIB=	${CC:S/gcc/gcc-ranlib/}
 CMAKE_ARGS+=	-DDOCDIR="${DOCSDIR}" \
 		-DCREDITSDIR="${DOCSDIR}" \
 		-DLICENCEDIR="${DOCSDIR}" \
 		-DDESKTOPDIR="${DESKTOPDIR}" \
 		-DDATADIR="${DATADIR}" \
 		-DCACHE_NAME_SUFFIX="" \
 		-Wno-dev \
 		-DCMAKE_AR:FILEPATH=${_AR} \
 		-DCMAKE_RANLIB:FILEPATH=${_RANLIB} \
 		-DCMAKE_POLICY_DEFAULT_CMP0056:STRING=NEW
 # 3.4.x: CMAKE_EXE_LINKER_FLAGS is not passed to TRY_COMPILE by default
 # any more. The CMP0056 policy must be explicitly set to NEW to ensure
 # linker flags are passed. Else -lomp is not found with clang.
 # See: https://cmake.org/cmake/help/v3.4/policy/CMP0056.html
 CFLAGS+=	-I${LOCALBASE}/include -fPIC ${_LTO_FLAGS} ${_OPT_FLAGS}
 LDFLAGS+=	-Wl,--as-needed -lpthread ${_LTO_FLAGS} ${_OPT_FLAGS}
 
 .if defined(PACKAGE_BUILDING) && empty(CFLAGS:M-march*) && (${ARCH} == i386 || ${ARCH} == amd64 || ${ARCH} == aarch64)
 # this gets translated to -mtune=generic, see ${WRKSRC}/ProcessorTargets.cmake
 # and as of GCC 8.3, it appears that among FreeBSD's supported architectures,
 # only the three listed above support this GCC option.
 CMAKE_ARGS+=	-DPROC_TARGET_NUMBER="1"
 .endif
 
 # XXX FIXME - check this every few months, cmake might be fixed one day
 .if "${WITH_CCACHE_BUILD}" == "yes" && !defined(NO_CCACHE)
 CMAKE_ARGS+=	-DCMAKE_C_COMPILER_LAUNCHER=${CCACHE_BIN} \
 		-DCMAKE_CXX_COMPILER_LAUNCHER=${CCACHE_BIN}
 .endif
 
 OPTIONS_DEFINE=		DOCS NATIVE
 OPTIONS_DEFINE_amd64=	OPENMP
 OPTIONS_DEFINE_i386=	OPENMP
 OPTIONS_DEFAULT=	OPENMP
 NATIVE_DESC=		Use -march=native (avoid for generic packages!)
 OPENMP_DESC=		Enable OpenMP parallel processing (i386/amd64 only)
 
 OPENMP_CMAKE_BOOL=	OPTION_OMP
 
 .include <bsd.port.options.mk>
 
 # -------------------------------------------------------------------
 
 .if (${OPSYS} == FreeBSD) && (${OSVERSION} >= 1400000)
 # don't waste everybody's time with Tier-2 and moving targets.
 # might add ARM64 later on if they are established by the
 # time FreeBSD 13 is out.
 ONLY_FOR_ARCHS=	amd64
 ONLY_FOR_ARCHS_REASON=only amd64 is supported on non-released FreeBSD versions
 .endif
 
 .if ${PORT_OPTIONS:MNATIVE}
 CMAKE_ARGS+=	-DPROC_TARGET_NUMBER="2"
 .endif
 
 .if !empty(PORT_OPTIONS:MOPENMP) && !empty(OPTIONS_DEFINE:MOPENMP)
 OPENMP_FLAGS=	-lm -lomp
 LDFLAGS+=	${OPENMP_FLAGS}
 .endif
 
 .if defined(WITH_DEBUG)
 STRIP=
 CMAKE_BUILD_TYPE=	None	# Arch Linux packaging trick to avoid cmake overriding our flags
 _OPT_FLAGS=	-ggdb3 -Og	# -Og is GCC-specific, use -O1 for clang
 .else
 _OPT_FLAGS=	-O3 -funroll-loops
 .endif
 
 # x86_64/amd64 includes -msse2 by default
 .if ${ARCH} == i386
 # and SSE2 has been around since the year 2003 latest
 _OPT_FLAGS+=	-msse2
 .endif
 
 # workaround for values passed on the stack that cause SIGBUS on SSE2
 .if ${ARCH} == i386
 _OPT_FLAGS+=	-mstackrealign
 .endif
 
 # -------------------------------------------------------------------
 
 .include <bsd.port.pre.mk>
 
 post-patch:
 	@${REINPLACE_CMD} -e 's#DESTINATION "$${CMAKE_INSTALL_PREFIX}/share/man/man1"#DESTINATION "${MANPREFIX}/man/man1/"#' \
 		${WRKSRC}/CMakeLists.txt
 
 TESTIMAGES=	${FILESDIR}/../testimages
 
 # paranoia: run rawtherapee to be sure it finds all its
 # shared libraries (this hinges on proper RPATH setting and propagation)
 #
 # _check_version strips stuffixes from distnames etc. that do not appear
 # in the program's version numbering
 _check_version=	${PKGVERSION:C/.g0//}
 _env=		LANG= LC_ALL=C LANGUAGE= DISPLAY= HOME="$$TMP" RT_SETTINGS=${WRKDIR}/rt-config RT_CACHE="$$TMP/rtcache"
 post-install:
 	@${RM} -f ${WRKDIR}/selftest.exitcodes ${WRKDIR}/selftest.expect
 	@(set -e; _mp=$$(/bin/df -P ${STAGEDIR}${PREFIX}/bin/rawtherapee | ${AWK} 'NR==2{print $$NF}') ; \
 	_fsflags=$$(${MOUNT} -p | ${AWK} "{ if (\$$2 == \"$$_mp\") { print \$$4 } }") ; \
 	case $$_fsflags in *noexec*) \
 		${TOUCH} ${WRKDIR}/selftest.expect ${WRKDIR}/selftest.exitcodes ; \
 		${ECHO_CMD} "===> Skipping smoke tests, STAGEDIR=${STAGEDIR} is on a noexec file system" ; \
 		exit 0 ;; \
 	esac ; \
 	${ECHO_MSG} "===> Running smoke tests" ; \
 	${RM} -rf ${WRKDIR}/rt-config ; \
 	${MKDIR} ${WRKDIR}/rt-config ${WRKDIR}/rt-config/dcpprofiles ${WRKDIR}/rt-config/profiles ; \
 	${CP} ${WRKSRC}/rtengine/camconst.json ${WRKDIR}/rt-config ; \
 	${CP} ${WRKSRC}/rtdata/options/options.lin ${WRKDIR}/rt-config/options ; \
 	(cd ${WRKSRC}/rtdata/ && ${COPYTREE_SHARE} "profiles dcpprofiles" ${WRKDIR}/rt-config ) ; \
 	(set -x ; TMP=$$(${MKTEMP} -d -t ${PORTNAME}) && trap "rc=$$? ; ${RM} -rf \"$$TMP\" ; exit \$$rc" 0 && \
 		( set +e ; ${SETENV} ${_env} ${STAGEDIR}${PREFIX}/bin/rawtherapee -v ; \
 		    echo $$? >&3 ) 3>&3 | ${EGREP} -q "RawTherapee, version ${_check_version:C/_.*//:C/,.*//}|cannot open display:" && \
 		( set +e ; ${SETENV} ${_env} ${STAGEDIR}${PREFIX}/bin/rawtherapee-cli ; \
 		    echo $$? >&3 ) 3>&3 | ${EGREP} -q "RawTherapee, version ${_check_version:C/_.*//:C/,.*//}" && \
 		expect=$$'0\n0\n' && \
 		onefile=$$(ls "${TESTIMAGES}"/* | head -1) && \
 		if test -d "${TESTIMAGES}" && test -n "$$onefile" -a -r "$$onefile" ; then \
 		  expect=$$'0\n0\n0\n0\n0\n' && \
 		  ( set +e ; \
 		  /usr/bin/time ${SETENV} ${_env} ${STAGEDIR}${PREFIX}/bin/rawtherapee-cli \
 			-o "$$TMP" -q -f -c ${TESTIMAGES} ; echo $$? >&3 ; \
 		  /usr/bin/time ${SETENV} ${_env} ${STAGEDIR}${PREFIX}/bin/rawtherapee-cli \
 			-o "$$TMP" -q -s -Y -c ${TESTIMAGES} ; echo $$? >&3 ; \
 		  /usr/bin/time ${SETENV} ${_env} ${STAGEDIR}${PREFIX}/bin/rawtherapee-cli \
 			-o "$$TMP" -q -s -Y -tz -c ${TESTIMAGES} ; echo $$? >&3 ) 3>&3 ; \
 		fi ; \
 		ls -Rlbai "${TESTIMAGES}" "$${TMP}" || :; \
 	${PRINTF} "%s" "$$expect" >&4 ) ) 3>${WRKDIR}/selftest.exitcodes 4>${WRKDIR}/selftest.expect  ; \
 	${HEAD} ${WRKDIR}/selftest.exitcodes ${WRKDIR}/selftest.expect ; \
 	cmp ${WRKDIR}/selftest.expect ${WRKDIR}/selftest.exitcodes \
 	|| { ${ECHO_CMD} '===> !!! SELF-TEST FAILED !!! <===' ; exit 1 ; }
 
 .include <bsd.port.post.mk>
diff --git a/graphics/rubygem-image_processing/Makefile b/graphics/rubygem-image_processing/Makefile
index dac4b73b55e5..9e41cdd6d00e 100644
--- a/graphics/rubygem-image_processing/Makefile
+++ b/graphics/rubygem-image_processing/Makefile
@@ -1,20 +1,21 @@
 PORTNAME=	image_processing
 PORTVERSION=	1.12.2
+PORTREVISION=	1
 CATEGORIES=	graphics rubygems
 MASTER_SITES=	RG
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	High-level wrapper for processing images for the web with ImageMagick or libvips
 WWW=		https://github.com/janko/image_processing
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	rubygem-mini_magick>=4.9.5<5:graphics/rubygem-mini_magick \
 		rubygem-ruby-vips>=2.0.17<3:graphics/rubygem-ruby-vips
 
 USES=		gem
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/graphics/rubygem-invisible_captcha/Makefile b/graphics/rubygem-invisible_captcha/Makefile
index a85451667086..c77ca68683ae 100644
--- a/graphics/rubygem-invisible_captcha/Makefile
+++ b/graphics/rubygem-invisible_captcha/Makefile
@@ -1,18 +1,19 @@
 PORTNAME=	invisible_captcha
 PORTVERSION=	2.0.0
+PORTREVISION=	1
 CATEGORIES=	graphics rubygems
 MASTER_SITES=	RG
 
 MAINTAINER=	mfechner@FreeBSD.org
 COMMENT=	Unobtrusive CAPTCHA for ruby
 WWW=		https://github.com/markets/invisible_captcha
 
 LICENSE=	MIT
 
 RUN_DEPENDS=	rubygem-rails61>=5.0:www/rubygem-rails61
 
 USES=		gem
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/graphics/rubygem-ruby-vips/Makefile b/graphics/rubygem-ruby-vips/Makefile
index 2cc493cb4596..8c2d5ddebf29 100644
--- a/graphics/rubygem-ruby-vips/Makefile
+++ b/graphics/rubygem-ruby-vips/Makefile
@@ -1,23 +1,24 @@
 PORTNAME=	ruby-vips
 PORTVERSION=	2.1.4
+PORTREVISION=	1
 CATEGORIES=	graphics rubygems
 MASTER_SITES=	RG
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Binding for the vips image processing library
 WWW=		https://github.com/libvips/ruby-vips
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 LIB_DEPENDS=	libvips.so:graphics/vips
 RUN_DEPENDS=	rubygem-ffi>=1.12<2:devel/rubygem-ffi
 
 USES=		gem gnome shebangfix
 USE_GNOME=	glib20
 
 NO_ARCH=	yes
 
 SHEBANG_FILES=	example/*.rb
 
 .include <bsd.port.mk>
diff --git a/graphics/sam2p/Makefile b/graphics/sam2p/Makefile
index 2efb9788718a..85e0de15a23f 100644
--- a/graphics/sam2p/Makefile
+++ b/graphics/sam2p/Makefile
@@ -1,48 +1,48 @@
 PORTNAME=	sam2p
 PORTVERSION=	0.49.4
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	graphics
 MASTER_SITES=	https://github.com/${GH_ACCOUNT}/${PORTNAME}/releases/download/v${PORTVERSION}/
 
 MAINTAINER=	des@FreeBSD.org
 COMMENT=	Converts raster (bitmap) image formats into PS or PDF files
 WWW=		https://code.google.com/p/sam2p/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	bash:shells/bash
 RUN_DEPENDS=	zip:archivers/zip \
 		tif22pnm:graphics/tif22pnm
 
 #USE_GITHUB=	yes
 GH_ACCOUNT=	pts
 
 USES=		cpe ghostscript:run gmake jpeg:run perl5
 CPE_VENDOR=	${PORTNAME}_project
 USE_GCC=	yes
 USE_PERL5=	build
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-gif
 MAKE_ENV=	MAKE=gmake
 ALL_TARGET=	${PORTNAME}
 
 PORTDOCS=	*
 PORTEXAMPLES=	*
 PLIST_FILES=	bin/${PORTNAME}
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 
 do-install-EXAMPLES-on:
 	@(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . \
 		${STAGEDIR}${EXAMPLESDIR})
 
 .include <bsd.port.mk>
diff --git a/graphics/simpleitk/Makefile b/graphics/simpleitk/Makefile
index 3a4c59c3c06c..7fef3eb2e940 100644
--- a/graphics/simpleitk/Makefile
+++ b/graphics/simpleitk/Makefile
@@ -1,43 +1,44 @@
 PORTNAME=	simpleitk
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.2.1
+PORTREVISION=	1
 CATEGORIES=	graphics
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Simplification layer built on top of the Insight Toolkit (ITK)
 WWW=		https://simpleitk.org/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_armv7=	clang consistently runs out of memory
 BROKEN_i386=	clang consistently runs out of memory
 
 LIB_DEPENDS=	libgdcmCommon.so:devel/gdcm \
 		libhdf5.so:science/hdf5 \
 		libITKCommon-${ITK_VER}.so:science/InsightToolkit \
 		libvnl.so:misc/vxl
 TEST_DEPENDS=	googletest>0:devel/googletest
 
 USES=		cmake:testing compiler:c++14-lang eigen:3 lua:53 # tests fail to configure due to GTest::GTest related issues, see also https://github.com/SimpleITK/SimpleITK/issues/1765
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	SimpleITK
 GH_PROJECT=	SimpleITK
 
 CMAKE_OFF=	WRAP_DEFAULT
 CMAKE_OFF+=	BUILD_TESTING BUILD_EXAMPLES
 CMAKE_ON=	BUILD_SHARED_LIBS
 CMAKE_ARGS=	-DSimpleITK_LUA_EXECUTABLE=${LUA_CMD}
 CMAKE_TESTING_ON=	BUILD_TESTING # tests fail to find GTest, see https://github.com/SimpleITK/SimpleITK/issues/1807
 
 PLIST_SUB+=	VER=${DISTVERSION:R}
 
 BINARY_ALIAS=	git=false
 
 post-install: # remove contentless docs
 	@${RM} -r ${STAGEDIR}${PREFIX}/share
 
 .include <../../science/InsightToolkit/Makefile.version>
 .include <bsd.port.mk>
diff --git a/graphics/synfig/Makefile b/graphics/synfig/Makefile
index d2a205dc43ba..bee91c22cb84 100644
--- a/graphics/synfig/Makefile
+++ b/graphics/synfig/Makefile
@@ -1,57 +1,57 @@
 PORTNAME=	synfig
 PORTVERSION=	1.4.4
 DISTVERSIONPREFIX=v
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics devel multimedia
 
 MAINTAINER=	portmaster@BSDforge.com
 COMMENT=	Vector based 2D animation package
 WWW=		https://www.synfig.org/
 
 LICENSE=	GPLv2+
 
 BUILD_DEPENDS=	etl>=1.2.2:devel/etl \
 		gsed:textproc/gsed
 LIB_DEPENDS=	libImath.so:math/Imath \
 		libOpenEXR.so:graphics/openexr \
 		libavcodec.so:multimedia/ffmpeg \
 		libboost_program_options.so:devel/boost-libs \
 		libdv.so:multimedia/libdv \
 		libfftw3.so:math/fftw3 \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libharfbuzz.so:print/harfbuzz \
 		libltdl.so:devel/libltdl \
 		libmng.so:graphics/libmng \
 		libpng.so:graphics/png \
 		libtiff.so:graphics/tiff
 
 PORTSCOUT=	limitw:1,even
 
 USES=		autoreconf compiler:c++11-lang gmake gnome iconv jpeg \
 		libtool localbase magick:6 mlt:6 pathfix pkgconfig
 USE_CXXSTD=	c++11
 USE_GITHUB=	yes
 USE_GNOME=	cairo glibmm intltool libxml++26 pango
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	${ICONV_CONFIGURE_ARG}
 CONFIGURE_ENV+=	ac_cv_path_SED=${LOCALBASE}/bin/gsed
 # Other spurious uses of direct sed have popped up
 BINARY_ALIAS=	sed=${LOCALBASE}/bin/gsed
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 WRKSRC_SUBDIR=	synfig-core
 
 OPTIONS_DEFINE=	DOCS NLS
 OPTIONS_SUB=	yes
 
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for doc in AUTHORS NEWS README TODO
 	(cd ${WRKSRC} &&  ${INSTALL_DATA} ${doc} ${STAGEDIR}${DOCSDIR})
 .endfor
 
 .include <bsd.port.mk>
diff --git a/graphics/synfigstudio/Makefile b/graphics/synfigstudio/Makefile
index 352bbd4403cc..2b7f1b0e63d6 100644
--- a/graphics/synfigstudio/Makefile
+++ b/graphics/synfigstudio/Makefile
@@ -1,59 +1,59 @@
 PORTNAME=	synfigstudio
 PORTVERSION=	1.4.4
 DISTVERSIONPREFIX=v
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics multimedia
 
 MAINTAINER=	portmaster@BSDforge.com
 COMMENT=	Vector-based 2D animation software package
 WWW=		https://www.synfig.org/
 
 LICENSE=	GPLv2+
 
 BUILD_DEPENDS=	etl>=1.2.2:devel/etl \
 		gsed:textproc/gsed
 LIB_DEPENDS=	libImath.so:math/Imath \
 		libavcodec.so:multimedia/ffmpeg \
 		libavformat.so:multimedia/ffmpeg \
 		libswscale.so:multimedia/ffmpeg \
 		libOpenEXR.so:graphics/openexr \
 		libfftw3.so:math/fftw3 \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libharfbuzz.so:print/harfbuzz \
 		libsynfig.so:graphics/synfig
 RUN_DEPENDS=	xdg-open:devel/xdg-utils
 
 PORTSCOUT=	limitw:1,even
 
 USES=		autoreconf compiler:c++11-lang desktop-file-utils \
 		gmake gnome libtool localbase magick:6 mlt:6 pathfix pkgconfig \
 		shared-mime-info
 USE_GITHUB=	yes
 GH_ACCOUNT=	synfig
 GH_PROJECT=	synfig
 WRKSRC_SUBDIR=	synfig-studio
 USE_CXXSTD=	c++11
 USE_GNOME=	gdkpixbuf2 gtkmm30 intltool
 GNU_CONFIGURE=	yes
 BINARY_ALIAS=	sed=${LOCALBASE}/bin/gsed
 CONFIGURE_ARGS=	--disable-update-mimedb
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=	DOCS JACK NLS
 OPTIONS_SUB=	yes
 
 JACK_LIB_DEPENDS=	libjack.so:audio/jack
 JACK_CONFIGURE_ENABLE=	jack
 
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for doc in AUTHORS NEWS README TODO
 	(cd ${WRKSRC} && ${INSTALL_DATA} ${doc} ${STAGEDIR}${DOCSDIR})
 .endfor
 
 .include <bsd.port.mk>
diff --git a/graphics/tinyows/Makefile b/graphics/tinyows/Makefile
index 684dfaee6641..668647977fc5 100644
--- a/graphics/tinyows/Makefile
+++ b/graphics/tinyows/Makefile
@@ -1,32 +1,32 @@
 PORTNAME=	tinyows
 PORTVERSION=	1.2.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics www geography
 MASTER_SITES=	https://download.osgeo.org/mapserver/
 
 MAINTAINER=	joris.dedieu@gmail.com
 COMMENT=	High Performance WFS-T server
 WWW=		https://mapserver.org/tinyows/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${LOCALBASE}/share/postgresql/extension/postgis.control:databases/postgis31
 LIB_DEPENDS=	libxml2.so:textproc/libxml2
 RUN_DEPENDS=	${LOCALBASE}/share/postgresql/extension/postgis.control:databases/postgis31
 
 USES=		autoreconf pgsql
 
 GNU_CONFIGURE=	yes
 
 OPTIONS_DEFINE=	FASTCGI
 OPTIONS_DEFAULT=FASTCGI
 
 FASTCGI_LIB_DEPENDS=	libfcgi.so:www/fcgi
 FASTCGI_CONFIGURE_WITH=	fastcgi=${LOCALBASE}
 
 post-install:
 	${MKDIR} ${STAGEDIR}${WWWDIR}/cgi-bin/
 	${INSTALL_PROGRAM} ${WRKSRC}/tinyows ${STAGEDIR}${WWWDIR}/cgi-bin/tinyows
 
 .include <bsd.port.mk>
diff --git a/graphics/vapoursynth-waifu2x-w2xc/Makefile b/graphics/vapoursynth-waifu2x-w2xc/Makefile
index 2fb624007f11..66414ab35ba6 100644
--- a/graphics/vapoursynth-waifu2x-w2xc/Makefile
+++ b/graphics/vapoursynth-waifu2x-w2xc/Makefile
@@ -1,38 +1,38 @@
 PORTNAME=	waifu2x-w2xc
 DISTVERSION=	r8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 PKGNAMEPREFIX=	vapoursynth-
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Waifu2x (waifu2x-converter-cpp) plugin for VapourSynth
 WWW=		https://github.com/HomeOfVapourSynthEvolution/VapourSynth-Waifu2x-w2xc
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${LOCALBASE}/include/vapoursynth/VSHelper.h:multimedia/vapoursynth
 LIB_DEPENDS=	libw2xc.so:graphics/waifu2x-converter-cpp
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	HomeOfVapourSynthEvolution
 GH_PROJECT=	VapourSynth-Waifu2x-w2xc
 
 USES=		compiler:c++14-lang localbase:ldflags meson pkgconfig
 CPPFLAGS+=	-DHAVE_OPENCV # https://github.com/DeadSix27/waifu2x-converter-cpp/commit/248797748d5a
 DATADIR=	${PREFIX}/lib/vapoursynth
 DOCSDIR=	${PREFIX}/share/doc/${PKGBASE}
 PORTDATA=	lib${PORTNAME}.so models
 PORTDOCS=	*.md
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 # FreeBSD i386 defaults to -march=i686 (i486 with Clang < 9)
 	@${REINPLACE_CMD} '/-msse2/d' ${WRKSRC}/meson.build
 
 post-install:
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} \
 		"${PORTDOCS}" ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
diff --git a/graphics/vigra/Makefile b/graphics/vigra/Makefile
index 43ff529a5d4f..8f13e8ab9e23 100644
--- a/graphics/vigra/Makefile
+++ b/graphics/vigra/Makefile
@@ -1,77 +1,77 @@
 PORTNAME=	vigra
 DISTVERSIONPREFIX=v
 DISTVERSION=	1.11.1
-PORTREVISION=	23
+PORTREVISION=	24
 CATEGORIES=	graphics
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	VIGRA stands for "Vision with Generic Algorithms"
 WWW=		https://ukoethe.github.io/vigra/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 LIB_DEPENDS=	libImath.so:math/Imath \
 		libsz.so:science/libaec
 
 USES=		cmake compiler:c++14-lang python:run shebangfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	ukoethe
 GH_TAGNAME=	8acd73a
 USE_LDCONFIG=	yes
 
 CFLAGS+=	-I${LOCALBASE}/include/Imath
 
 CMAKE_ARGS=	-DDEPENDENCY_SEARCH_PREFIX:PATH=${LOCALBASE} \
 		-DDOCINSTALL:PATH=${DOCSDIR_REL}
 SHEBANG_FILES=	config/vigra-config.in
 
 OPTIONS_DEFINE=		HDF5 OPENEXR NUMPY DOCS FFTW
 OPTIONS_DEFAULT=	HDF5 OPENEXR FFTW ${OPTIONS_GROUP_IMAGEFORMATS}
 OPTIONS_GROUP=		IMAGEFORMATS
 OPTIONS_GROUP_IMAGEFORMATS=	PNG JPEG TIFF
 OPTIONS_SUB=		yes
 
 HDF5_CFLAGS=		-DH5_USE_110_API=1
 HDF5_CMAKE_BOOL=	WITH_HDF5
 HDF5_LIB_DEPENDS=	libhdf5.so:science/hdf5
 
 OPENEXR_CMAKE_BOOL=	WITH_OPENEXR
 OPENEXR_LIB_DEPENDS=	libOpenEXR.so:graphics/openexr
 
 NUMPY_DESC=		NumPy mathematical computing (USE Fortran/GCC47+)
 NUMPY_CMAKE_BOOL=	WITH_VIGRANUMPY
 NUMPY_USES=		compiler:gcc-c++11-lib python:build
 NUMPY_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR} \
 			${PYNUMPY}
 NUMPY_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR} \
 			${PYNUMPY}
 NUMPY_LIB_DEPENDS=	${PY_BOOST}
 # On FreeBSD < 11 libc++ lacks support for sized delete operators.
 # GCC dropped the builtin version of these operators in 6+ by
 # defaulting to gnu++14. Force c++11 instead.
 # For a more detailed discussion see:
 # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=219484
 NUMPY_CXXFLAGS=		-std=gnu++11
 
 PNG_CMAKE_BOOL=		WITH_PNG
 PNG_LIB_DEPENDS=	libpng.so:graphics/png
 
 JPEG_CMAKE_BOOL=	WITH_JPEG
 JPEG_USES=		jpeg
 
 TIFF_CMAKE_BOOL=	WITH_TIFF
 TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
 
 FFTW_CMAKE_BOOL=	WITH_FFTW
 FFTW_LIB_DEPENDS=	libfftw3.so:math/fftw3 \
 			libfftw3f.so:math/fftw3-float
 
 post-package-NUMPY-on:
 	@${ECHO} ""
 	@${ECHO} "* BEWARE!"
 	@${ECHO} "* Using py-NumPY implies Fortran and GCC 4.7+ as hard dependencies"
 	@${ECHO} "* and require all ports, depending on vigra, to set USE_GCC=yes"
 	@${ECHO} ""
 
 .include <bsd.port.mk>
diff --git a/graphics/vips/Makefile b/graphics/vips/Makefile
index 53e966065b48..59d43d60ec43 100644
--- a/graphics/vips/Makefile
+++ b/graphics/vips/Makefile
@@ -1,122 +1,122 @@
 PORTNAME=	vips
 PORTVERSION=	8.14.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	https://github.com/libvips/libvips/releases/download/v${PORTVERSION}/
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Free image processing system
 WWW=		https://libvips.github.io/libvips \
 		https://github.com/libvips/libvips
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libexpat.so:textproc/expat2 \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libharfbuzz.so:print/harfbuzz
 RUN_DEPENDS=	bash:shells/bash
 
 USES=		compiler:c++11-lang cpe gettext gnome localbase meson pkgconfig python shebangfix tar:xz
 USE_GNOME=	glib20
 
 MESON_ARGS=	--default-library=both \
 		-Danalyze=true \
 		-Dcplusplus=true \
 		-Ddeprecated=true \
 		-Ddoxygen=false \
 		-Dexamples=true \
 		-Dfontconfig=enabled \
 		-Dintrospection=false \
 		-Dmodules=disabled \
 		-Dnifti=disabled \
 		-Dnsgif=true \
 		-Dopenslide=disabled \
 		-Dpdfium=disabled \
 		-Dppm=true \
 		-Dquantizr=disabled \
 		-Dradiance=true \
 		-Dvapi=false \
 		-Dzlib=enabled
 USE_LDCONFIG=	yes
 
 PLIST_SUB=	VERSION=${PORTVERSION:R}
 
 SHEBANG_FILES=	tools/vipsprofile
 
 OPTIONS_DEFINE=	CFITSIO DOCS FFTW GIF GSF HEIF IMAGEQUANT JPEG JXL LCMS2 LIBEXIF LIBRSVG2 MATIO OPENEXR ORC PANGO PNG POPPLER SPNG TIFF WEBP
 OPTIONS_RADIO=	MAGICK
 OPTIONS_RADIO_MAGICK=	IMAGEMAGICK GRAPHMAGICK
 OPTIONS_DEFAULT=CFITSIO FFTW GIF GSF HEIF IMAGEMAGICK JPEG JXL LCMS2 LIBEXIF LIBRSVG2 MATIO OPENEXR ORC PANGO PNG POPPLER SPNG TIFF WEBP
 GSF_DESC=	Structured file formats support
 IMAGEQUANT_DESC=Image Quantization support
 ORC_DESC=	ORC language support
 MATIO_DESC=	Matlab MAT format support
 
 CFITSIO_LIB_DEPENDS=	libcfitsio.so:astro/cfitsio
 CFITSIO_MESON_ENABLED=	cfitsio
 DOCS_BUILD_DEPENDS=	gtkdocize:textproc/gtk-doc
 DOCS_MESON_TRUE=	gtk_doc
 FFTW_LIB_DEPENDS=	libfftw3.so:math/fftw3
 FFTW_MESON_ENABLED=	fftw
 GIF_BUILD_DEPENDS=	cgif>=0.2.0:graphics/cgif
 GIF_LIB_DEPENDS=	libcgif.so:graphics/cgif
 GIF_MESON_ENABLED=	cgif
 GRAPHMAGICK_LIB_DEPENDS=libGraphicsMagick.so:graphics/GraphicsMagick
 GRAPHMAGICK_MESON_ON=	-Dmagick=enabled -Dmagick-package=GraphicsMagick
 GSF_MESON_ENABLED=	gsf
 GSF_USE=		GNOME=libgsf
 HEIF_BUILD_DEPENDS=	libheif>=1.3.0:graphics/libheif
 HEIF_LIB_DEPENDS=	libheif.so:graphics/libheif
 HEIF_MESON_ENABLED=	heif
 IMAGEMAGICK_MESON_ON=	-Dmagick=enabled -Dmagick-package=MagickCore
 IMAGEMAGICK_USES=	magick
 IMAGEQUANT_LIB_DEPENDS=	libimagequant.so:graphics/libimagequant
 IMAGEQUANT_MESON_ENABLED=	imagequant
 JPEG_BUILD_DEPENDS=	openjpeg>=2.4:graphics/openjpeg
 JPEG_LIB_DEPENDS=	libopenjp2.so:graphics/openjpeg
 JPEG_MESON_ENABLED=	jpeg openjpeg
 JPEG_USES=		jpeg
 JXL_BUILD_DEPENDS=	libjxl>=0.6:graphics/libjxl
 JXL_LIB_DEPENDS=	libjxl.so:graphics/libjxl
 JXL_MESON_ENABLED=	jpeg-xl
 LCMS2_LIB_DEPENDS=	liblcms2.so:graphics/lcms2
 LCMS2_MESON_ENABLED=	lcms
 LIBEXIF_BUILD_DEPENDS=	libexif>=0.6:graphics/libexif
 LIBEXIF_LIB_DEPENDS=	libexif.so:graphics/libexif
 LIBEXIF_MESON_ENABLED=	exif
 LIBRSVG2_MESON_ENABLED=	rsvg
 LIBRSVG2_USE=		GNOME=cairo,librsvg2
 MATIO_LIB_DEPENDS=	libmatio.so:math/matio
 MATIO_MESON_ENABLED=	matio
 OPENEXR_BUILD_DEPENDS=	openexr>=1.2.2:graphics/openexr
 OPENEXR_LIB_DEPENDS=	libOpenEXR.so:graphics/openexr
 OPENEXR_MESON_ENABLED=	openexr
 ORC_BUILD_DEPENDS=	orc>=0.4.11:devel/orc
 ORC_LIB_DEPENDS=	liborc-0.4.so:devel/orc
 ORC_MESON_ENABLED=	orc
 PANGO_MESON_ENABLED=	pangocairo
 PANGO_USE=		GNOME=pango
 PNG_BUILD_DEPENDS=	png>=1.2.9:graphics/png
 PNG_LIB_DEPENDS=	libpng.so:graphics/png
 PNG_MESON_ENABLED=	png
 POPPLER_LIB_DEPENDS=	libpoppler-glib.so:graphics/poppler-glib
 POPPLER_MESON_ENABLED=	poppler
 POPPLER_USE=		GNOME=cairo
 SPNG_BUILD_DEPENDS=	libspng>=0.7:graphics/libspng
 SPNG_LIB_DEPENDS=	libspng.so:graphics/libspng
 SPNG_MESON_ENABLED=	spng
 TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
 TIFF_MESON_ENABLED=	tiff
 WEBP_BUILD_DEPENDS=	webp>=0.6:graphics/webp
 WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp
 WEBP_MESON_ENABLED=	webp
 
 .include <bsd.port.options.mk>
 
 .if !${PORT_OPTIONS:MGRAPHMAGICK} && !${PORT_OPTIONS:MIMAGEMAGICK}
 MESON_ARGS+=	-Dmagick=disabled
 .endif
 
 .include <bsd.port.mk>
diff --git a/graphics/vpaint/Makefile b/graphics/vpaint/Makefile
index bacfc3f8941f..d00018ebf875 100644
--- a/graphics/vpaint/Makefile
+++ b/graphics/vpaint/Makefile
@@ -1,56 +1,56 @@
 PORTNAME=	vpaint
 PORTVERSION=	1.7
-PORTREVISION=	2
+PORTREVISION=	3
 DISTVERSIONPREFIX=	v
 CATEGORIES=	graphics
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Experimental vector graphics and 2D animation editor
 WWW=		https://www.vpaint.org/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	dalboris
 
 USES=		compiler:c++11-lib eigen:3 gl qmake qt:5
 USE_QT=		core gui widgets opengl network qmake:build buildtools:build
 USE_GL=		gl glu glew
 
 QMAKE_SOURCE_PATH=	${WRKSRC}/src/Gui
 
 CXXFLAGS+=	-isystem ${LOCALBASE}/include/eigen3
 
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
 DESKTOP_ENTRIES="VPaint" \
 		"Vector-Based Animation Editor" \
 		"VPaint" \
 		"VPaint" \
 		"Graphics;" \
 		""
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 post-extract:
 	@${RM} -r ${WRKSRC}/src/Third
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/VPaint ${STAGEDIR}${PREFIX}/bin
 .for s in 16 32 48 256
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}x${s}
 	${INSTALL_DATA} ${WRKSRC}/src/Gui/images/icon-${s}.png \
 		${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}x${s}/VPaint.png
 .endfor
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
 
 do-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/*.vec ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/graphics/vv/Makefile b/graphics/vv/Makefile
index cae82b56eb76..6814bdc64fab 100644
--- a/graphics/vv/Makefile
+++ b/graphics/vv/Makefile
@@ -1,46 +1,46 @@
 PORTNAME=	vv
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.4.0-383
 DISTVERSIONSUFFIX=	-g7a783a8b
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	graphics
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Fast and simple 4D image viewer
 WWW=		https://www.creatis.insa-lyon.fr/rio/vv/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BUILD_DEPENDS=	googletest>0:devel/googletest # error: unable to find library -lGTest::GTest, see https://github.com/open-vv/vv/issues/74
 LIB_DEPENDS=	libexpat.so:textproc/expat2 \
 		libfreetype.so:print/freetype2 \
 		libgdcmCommon.so:devel/gdcm \
 		libhdf5_cpp.so:science/hdf5 \
 		libITKLabelMap-5.0.so:science/InsightToolkit501 \
 		libpng.so:graphics/png \
 		libsz.so:science/libaec \
 		libtiff.so:graphics/tiff \
 		libvtkIOSQL-8.2.so:math/vtk8
 
 USES=		cmake compiler:c++11-lang eigen:3 jpeg qt:5 xorg
 USE_GITHUB=	yes
 GH_ACCOUNT=	open-vv
 USE_QT=		core designer gui network sql widgets xml buildtools:build qmake:build
 USE_XORG=	ice sm x11 xext xt
 USE_CXXSTD=	c++11
 
 CMAKE_ARGS=	-DVTK_DIR:PATH=${LOCALBASE}/lib/vtk-8.2/cmake/vtk-8.2
 
 PLIST_FILES=	bin/vv
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == i386
 CXXFLAGS+=	-msse2 # workaround for ITK failing to add -msse2 on i386: https://github.com/open-vv/vv/issues/83 & https://github.com/InsightSoftwareConsortium/ITK/issues/2011
 .endif
 
 post-configure: # workaround for "error: unable to find library -lGTest::GTest", see https://github.com/open-vv/vv/issues/74
 	@${REINPLACE_CMD} -E 's/ -lGTest::(GTest|Main) / /g' ${BUILD_WRKSRC}/build.ninja
 
 .include <bsd.port.post.mk>
diff --git a/graphics/waifu2x-converter-cpp/Makefile b/graphics/waifu2x-converter-cpp/Makefile
index af57a2949228..4a25092f0497 100644
--- a/graphics/waifu2x-converter-cpp/Makefile
+++ b/graphics/waifu2x-converter-cpp/Makefile
@@ -1,48 +1,48 @@
 PORTNAME=	waifu2x-converter-cpp
 DISTVERSIONPREFIX=	v
 DISTVERSION=	5.3.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Scale and denoise images using convolutional neural networks
 WWW=		https://github.com/DeadSix27/waifu2x-converter-cpp
 
 LICENSE=	BSD2CLAUSE MIT
 LICENSE_COMB=	multi
 LICENSE_FILE_BSD2CLAUSE=${WRKSRC}/include/picojson_LICENSE.txt
 LICENSE_FILE_MIT=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${LOCALBASE}/include/CL/opencl.h:devel/opencl
 LIB_DEPENDS=	libopencv_imgcodecs.so:graphics/opencv
 
 USES=		cmake:testing compiler:c++17-lang localbase:ldflags
 USE_GITHUB=	yes
 USE_LDCONFIG=	yes
 GH_ACCOUNT=	DeadSix27
 CMAKE_ON=	INSTALL_MODELS
 CMAKE_TESTING_ON=	ENABLE_TESTS
 CMAKE_ARGS=	-DOPENCV_PREFIX:PATH="${LOCALBASE}" \
 		-DOpenCL_LIBRARY:FILEPATH="${LOCALBASE}/lib/libOpenCL.so"
 PLIST_FILES=	bin/${PORTNAME} \
 		include/w2xconv.h \
 		lib/libw2xc.so
 PORTDATA=	*
 
 OPTIONS_DEFINE=	SIMD
 OPTIONS_DEFAULT=SIMD
 
 SIMD_CMAKE_OFF=	-DARMOPT:BOOL=false -DPPCOPT:BOOL=false -DX86OPT:BOOL=false
 
 post-patch:
 	@${REINPLACE_CMD} -e '/Darwin/,/FLAGS_RELEASE/d' \
 		-e 's,".*\(-m[^[:space:]]*\).*","\1",' \
 		-e "s/\$${TS}/`${AWK} '/TIMESTAMP/ { print \$$3 }' ${DISTINFO_FILE}`/" \
 		-e '/find_program/s/git/&_disabled/' \
 		-e '/GIT_BRANCH/s/null/master/' \
 		-e '/GIT_COMMIT_HASH/s/000000/${DISTVERSIONSUFFIX:U&:S/^-g//}/' \
 		-e '/GIT_TAG/s/v0\.0\.0/${DISTVERSIONFULL:C/-.*//}/' \
 		${WRKSRC}/CMakeLists.txt
 	@${REINPLACE_CMD} 's,models_rgb,${WRKSRC}/&,' ${WRKSRC}/w32-apps/runtest.c
 
 .include <bsd.port.mk>
diff --git a/graphics/wings/Makefile b/graphics/wings/Makefile
index 37183d0bd62c..2cc7c47677b6 100644
--- a/graphics/wings/Makefile
+++ b/graphics/wings/Makefile
@@ -1,71 +1,72 @@
 PORTNAME=	wings
 DISTVERSION=	2.2.9
+PORTREVISION=	1
 CATEGORIES=	graphics
 DIST_SUBDIR=	erlang
 
 MAINTAINER=	cmt@FreeBSD.org
 COMMENT=	Polygon mesh modeler written in Erlang
 WWW=		http://www.wings3d.com/
 
 LICENSE=	Wings3D
 LICENSE_NAME=	Wings 3D License # similar to TclTk license
 LICENSE_FILE=	${WRKSRC}/license.terms
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 # c_src/Makefile line 103
 NOT_FOR_ARCHS=		armv6 armv7 i386 mips powerpc
 NOT_FOR_ARCHS_REASON=	subcomponent libigl does not support 32bit platforms
 
 BUILD_DEPENDS=	erl:lang/erlang \
 		erlang-cl>0:devel/erlang-cl \
 		erlang-wx>0:lang/erlang-wx \
 		pkg-config:devel/pkgconf
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		gl tar:bzip2 eigen:3 gmake
 
 ALL_TARGET=	lang
 MAKE_JOBS_UNSAFE=yes
 
 SUB_FILES=	${PORTNAME}.sh
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	dgud
 GH_PROJECT=	wings libigl:igl
 GH_TAGNAME=	v${DISTVERSION} v2.1.0:igl
 
 USE_GL=		gl glu
 
 DESKTOP_ENTRIES="Wings" \
 		"${COMMENT}" \
 		"${PREFIX}/share/pixmaps/${PORTNAME}.ico" \
 		"${PORTNAME}" \
 		"Graphics;3DGraphics;" \
 		""
 
 post-extract:
 	@${MKDIR} ${WRKSRC}/_deps
 	@${LN} -s ${WRKSRC_igl} ${WRKSRC}/_deps/libigl
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,include_lib("wings/,include_lib(",g' \
 		${WRKSRC}/src/*.erl \
 		${WRKSRC}/plugins_src/*.erl \
 		${WRKSRC}/plugins_src/import_export/*.erl \
 		${WRKSRC}/plugins_src/primitives/*.erl \
 		${WRKSRC}/plugins_src/commands/*.erl \
 		${WRKSRC}/plugins_src/commands/*.hrl \
 		${WRKSRC}/plugins_src/autouv/*.erl \
 		${WRKSRC}/icons/*.erl
 
 do-install:
 	cd ${WRKSRC} && ${COPYTREE_SHARE} "ebin icons plugins textures shaders patches" \
 		${STAGEDIR}${PREFIX}/lib/erlang/lib/${PORTNAME}
 	cd ${WRKSRC} && ${COPYTREE_SHARE} "src" \
 		${STAGEDIR}${PREFIX}/lib/erlang/lib/${PORTNAME} "-name *\.erl"
 	cd ${WRKSRC} && ${COPYTREE_SHARE} "priv" \
 		${STAGEDIR}${PREFIX}/lib/erlang/lib/${PORTNAME} "-name *\.so"
 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	${INSTALL_DATA} ${WRKSRC}/src/${PORTNAME}.icon ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.ico
 
 .include <bsd.port.mk>
diff --git a/graphics/xd3d/Makefile b/graphics/xd3d/Makefile
index 82ddf136aabc..aec5b5b0775e 100644
--- a/graphics/xd3d/Makefile
+++ b/graphics/xd3d/Makefile
@@ -1,86 +1,86 @@
 PORTNAME=	xd3d
 PORTVERSION=	8.3.1
-PORTREVISION=	19
+PORTREVISION=	20
 CATEGORIES=	graphics math
 MASTER_SITES=	http://www.cmap.polytechnique.fr/~jouve/xd3d/
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Simple scientific visualization tool
 WWW=		http://www.cmap.polytechnique.fr/~jouve/xd3d/
 
 LICENSE=	GPLv2
 
 #--------------------------------------------------------------------------
 # You may define these options:
 #
 # - WITHOUT_IMAGEMAGICK	:	if you don't need to export bitmap images
 #				in gif or png format;
 #
 # - WITHOUT_GIFSICLE	:	if you don't need to generate animated gifs;
 #
 # - MEMORY_XD3D		:	Max memory for xd3d (MBytes, 64 by default)
 #
 # - F77			:	don't use the default fortran compiler;
 # - FFLAGS		:	fortran compiler's flags (-O by default).
 #--------------------------------------------------------------------------
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 .if !defined(WITHOUT_IMAGEMAGICK)
 USES+=		magick:run
 .endif
 .if !defined(WITHOUT_GIFSICLE)
 RUN_DEPENDS+=	gifsicle:graphics/gifsicle
 .endif
 
 MASTER_SITES_BACKUP=	http://pompo.net/ports/
 
 REINPLACE_ARGS=	-i ""
 FETCH_ARGS=
 FETCH_BEFORE_ARGS=	-R -o ${DISTDIR}/${DISTFILES}
 
 USES=		fortran xorg
 USE_XORG=	x11 xpm
 FFLAGS+=	-O -std=legacy
 MEMORY_XD3D?=	64
 
 .if defined(LANG) && ${LANG:Mfr*} != ""
 XD3D_LANG=	FRANCAIS
 .else
 XD3D_LANG=	ENGLISH
 .endif
 
 DOCS=		BUGS CHANGELOG FAQ FORMATS INSTALL README Manuals/formats.txt	\
 		Manuals/xd3d_doc.pdf Manuals/xgraphic_doc.pdf
 
 .include <bsd.port.pre.mk>
 
 do-fetch:
 .if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})
 	${FETCH_CMD} ${FETCH_BEFORE_ARGS}			\
 		${MASTER_SITES}download.php?file=${DISTFILES}	\
 	|| ${FETCH_CMD} ${FETCH_BEFORE_ARGS} ${MASTER_SITES_BACKUP}${DISTFILES}
 .endif
 
 pre-configure:
 	${CP} ${WRKSRC}/RULES.freeBSD ${WRKSRC}/RULES
 	${REINPLACE_CMD} -e "s|%%WRKSRC%%|${WRKSRC}|"		\
 		-e "s|%%PREFIX%%|${PREFIX}|"			\
 		-e "s|%%X11BASE%%|${LOCALBASE}|"		\
 		-e "s|%%LANG%%|${XD3D_LANG}|"			\
 		-e "s|%%MEMORY_XD3D%%|${MEMORY_XD3D}|"		\
 		-e "s|%%F77%%|${F77}|"				\
 		-e "s|%%FFLAGS%%|${FFLAGS}|"			\
 		-e "s|%%CC%%|${CC}|"				\
 		-e "s|%%CFLAGS%%|${CFLAGS}|"			\
 		${WRKSRC}/RULES
 
 post-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 . for FILE in ${DOCS}
 	${INSTALL_DATA} ${WRKSRC}/${FILE} ${STAGEDIR}${DOCSDIR}
 . endfor
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${CP} -Rp ${WRKSRC}/Examples/* ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.post.mk>
diff --git a/graphics/yafaray/Makefile b/graphics/yafaray/Makefile
index 27d915af836a..f6aceffce407 100644
--- a/graphics/yafaray/Makefile
+++ b/graphics/yafaray/Makefile
@@ -1,49 +1,49 @@
 PORTNAME=	yafaray
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.5.1
-PORTREVISION=	16
+PORTREVISION=	17
 CATEGORIES=	graphics
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Montecarlo raytracing engine
 WWW=		http://www.yafaray.org/
 
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	dual
 LICENSE_FILE_GPLv2=	${WRKSRC}/LICENSES
 LICENSE_FILE_LGPL21=	${WRKSRC}/LICENSES
 
 ONLY_FOR_ARCHS=	amd64 powerpc64le
 
 LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 		libfreetype.so:print/freetype2 \
 		libImath.so:math/Imath \
 		libOpenEXR.so:graphics/openexr \
 		libopencv_photo.so:graphics/opencv \
 		libopencv_core.so:graphics/opencv \
 		libpng.so:graphics/png \
 		libtiff.so:graphics/tiff
 
 USES=		cmake gnome jpeg
 USE_GITHUB=	yes
 GH_ACCOUNT=	YafaRay
 GH_PROJECT=	libYafaRay
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
 
 LDFLAGS+=	-pthread # because build on 13 (head) was failing: ld: error: src/yafraycore/libyafaray_v3_core.so: undefined reference to pthread_create
 
 CMAKE_OFF=	WITH_YAF_PY_BINDINGS
 
 OPTIONS_DEFINE=	DOCS QT
 OPTIONS_SUB=	yes
 
 QT_DESC=	Enable Qt Gui build
 QT_USES=	qt:5
 QT_CMAKE_BOOL=	WITH_QT
 QT_USE=		QT=core,gui,widgets,qmake:build,buildtools:build,qmake:build
 
 post-install:
 	@${RM} ${STAGEDIR}${DOCSDIR}/LICENSES
 
 .include <bsd.port.mk>
diff --git a/irc/ezbounce/Makefile b/irc/ezbounce/Makefile
index 6328dc2e6295..9277cb1bcabd 100644
--- a/irc/ezbounce/Makefile
+++ b/irc/ezbounce/Makefile
@@ -1,48 +1,48 @@
 PORTNAME=	ezbounce
 PORTVERSION=	1.99.15
-PORTREVISION=	22
+PORTREVISION=	23
 CATEGORIES=	irc
 MASTER_SITES=	https://BSDforge.com/projects/source/irc/ezbounce/
 
 MAINTAINER=	portmaster@BSDforge.com
 COMMENT=	Highly configurable IRC Proxy
 WWW=		https://sourceforge.net/projects/ezbounce/
 
 OPTIONS_DEFINE=	DOCS SSL COMPRESS
 OPTIONS_DEFAULT=SSL COMPRESS
 OPTIONS_SUB=	yes
 
 SSL_USES=		ssl
 SSL_CONFIGURE_WITH=	ssl
 COMPRESS_BUILD_DEPENDS=	${LOCALBASE}/include/boost/function.hpp:devel/boost-libs
 COMPRESS_CONFIGURE_WITH=boost
 COMPRESS_DESC=		Chat log compression (requires boost)
 
 GNU_CONFIGURE=	yes
 USES=		compiler:c++0x cpe gmake
 USE_GCC=	yes
 
 # ezbounce 1.99.15 isn't compatible with C++11 and later, which some compilers
 # such as GCC 6 default to.
 USE_CXXSTD=	gnu++98
 
 SUB_FILES=	pkg-message
 
 post-patch:
 	@${SED} -e "s:/path/to:${PREFIX}/sbin:" ${WRKSRC}/sample.conf > \
 		${WRKSRC}/ezb.conf.default
 	@${REINPLACE_CMD} -e 's|=-O2|="$$CXXFLAGS"|g' ${WRKSRC}/configure
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ezbounce ${STAGEDIR}${PREFIX}/sbin
 	${INSTALL_DATA} ${WRKSRC}/ezb.conf.default ${STAGEDIR}${PREFIX}/etc
 	${INSTALL_MAN}	${WRKSRC}/docs/ezbounce.1 ${STAGEDIR}${PREFIX}/man/man1
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/CHANGES ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/TODO ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/worklog ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/irc/py-limnoria/Makefile b/irc/py-limnoria/Makefile
index 211d4a01c6c7..8f120dad3476 100644
--- a/irc/py-limnoria/Makefile
+++ b/irc/py-limnoria/Makefile
@@ -1,65 +1,66 @@
 PORTNAME=	limnoria
 PORTVERSION=	2021.11.18
+PORTREVISION=	1
 CATEGORIES=	irc python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Modified version of Supybot (IRC bot and framework)
 WWW=		https://github.com/ProgVal/Limnoria
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}feedparser>=0:textproc/py-feedparser@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR}
 
 USES=		cpe python:3.6+
 CPE_VENDOR=	${PORTNAME}_project
 USE_GITHUB=	yes
 GH_ACCOUNT=	ProgVal
 GH_PROJECT=	Limnoria
 GH_TAGNAME=	master-2021-11-18
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=		ECDSA PROXY
 OPTIONS_DEFAULT=	ECDSA ENCODING RSS TIME
 
 OPTIONS_GROUP=		EXTRAS
 OPTIONS_GROUP_EXTRAS=	ENCODING GPG RSS TIME
 
 OPTIONS_RADIO=		AKA
 OPTIONS_RADIO_AKA=	SQLITE SQLALCHEMY
 
 AKA_DESC=		AKA Plugin: SQL Backend (none = plugin disabled)
 ECDSA_DESC=	ECDSA SASL authentication
 ENCODING_DESC=	Web Plugin: Better encoding detection (via chardet)
 EXTRAS_DESC=		Plugin Extras
 GPG_DESC=	GPG Plugin: GnuPG Authentication
 PROXY_DESC=	SOCKS Proxy connections
 RSS_DESC=	RSS Plugin: Feed parsing (via feedparser)
 SQLALCHEMY_DESC=	SQLAlchemy database support
 TIME_DESC=	Time Plugin: Extra time features (via dateutil/pytz)
 
 ECDSA_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ecdsa>0:security/py-ecdsa@${PY_FLAVOR}
 ENCODING_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}chardet>=0:textproc/py-chardet@${PY_FLAVOR}
 GPG_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}python-gnupg>=0:security/py-python-gnupg@${PY_FLAVOR}
 PROXY_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pysocks>=0:net/py-pysocks@${PY_FLAVOR}
 RSS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}feedparser>=0:textproc/py-feedparser@${PY_FLAVOR}
 SQLALCHEMY_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlalchemy10>0:databases/py-sqlalchemy10@${PY_FLAVOR}
 SQLITE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
 TIME_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${PY_FLAVOR}
 
 # Needs to be installed first to work.
 do-test:
 	@cd ${WRKSRC} && ${PYTHON_CMD} ${LOCALBASE}/bin/supybot-test \
 		--no-network \
 		--plugins-dir="./build/lib*/supybot/plugins/" \
 		--disable-multiprocessing
 
 .include <bsd.port.mk>
diff --git a/irc/riece/Makefile b/irc/riece/Makefile
index dad9dc5d559a..f237d24c3dfb 100644
--- a/irc/riece/Makefile
+++ b/irc/riece/Makefile
@@ -1,32 +1,32 @@
 PORTNAME=	riece
 PORTVERSION=	9.0.0
-PORTREVISION=	19
+PORTREVISION=	21
 PORTEPOCH=	1
 CATEGORIES=	irc elisp
 MASTER_SITES=	SAVANNAH
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	IRC client for Emacs
 WWW=		https://www.nongnu.org/riece/
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		emacs gmake
 
 NO_ARCH=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-emacs=${EMACS_CMD} \
 		--with-lispdir=${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}
 INFO=		riece-en riece-ja
 
 OPTIONS_DEFINE=	DOCS
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in AUTHORS ChangeLog NEWS NEWS.ja README README.ja doc/HACKING doc/HACKING.ja
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/irc/undernet-ircu/Makefile b/irc/undernet-ircu/Makefile
index f9b5725eea09..2fa75f5d2317 100644
--- a/irc/undernet-ircu/Makefile
+++ b/irc/undernet-ircu/Makefile
@@ -1,95 +1,96 @@
 PORTNAME=	undernet-ircu
 PORTVERSION=	2.10.12.19
+PORTREVISION=	1
 CATEGORIES=	irc net
 MASTER_SITES=	https://github.com/UndernetIRC/ircu2/releases/download/u${PORTVERSION}/ \
 		ftp://ftpmirror.uk/freebsd-ports/undernet-ircu/
 DISTNAME=	ircu${PORTVERSION}
 
 MAINTAINER=	freebsd-ports@dan.me.uk
 COMMENT=	Undernet IRCU irc daemon
 WWW=		https://coder-com.undernet.org
 
 LICENSE=	GPLv1
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_aarch64=		Fails to compile: undefined reference to .mcount
 BROKEN_riscv64=		Fails to compile: undefined reference to .mcount
 
 USE_GCC=	yes
 USE_RC_SUBR=	undernet
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--with-dpath=${PREFIX}/etc/ --with-symlink=no
 
 CONFLICTS=	ircd-hybrid-7.[0-9]*
 
 SUB_FILES=	pkg-message
 
 USERS=		undernet
 GROUPS=		${USERS}
 
 PLIST_FILES=	bin/undernet-convert-conf \
 		bin/undernet-umkpasswd \
 		etc/ircd.conf.sample \
 		sbin/ircd
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS IPV6 POLL DEBUG ASSERTS PEDANTIC WARNINGS \
 		INLINES DEVPOLL KQUEUE EPOLL LEAKDETECT
 OPTIONS_DEFAULT=ASSERTS INLINES DEVPOLL KQUEUE EPOLL
 
 ASSERTS_DESC=	Enable assertion checking
 DEVPOLL_DESC=	Enable the /dev/poll-based engine
 EPOLL_DESC=	Enable the epoll-based engine
 INLINES_DESC=	Enable inlining for a few critical functions
 KQUEUE_DESC=	Enable the kqueue-based engine
 LEAKDETECT_DESC=	Turn on the leak detector (reqs patched boehm)
 PEDANTIC_DESC=	Enable pedantic warnings
 POLL_DESC=	Force poll to be used even if not a sys call
 WARNINGS_DESC=	Enable warnings (add -Wall to CFLAGS)
 
 ASSERTS_CONFIGURE_ENABLE=	asserts
 DEBUG_CONFIGURE_ENABLE=		debug
 DEVPOLL_CONFIGURE_ENABLE=	devpoll
 EPOLL_CONFIGURE_ENABLE=		epoll
 INLINES_CONFIGURE_ENABLE=	inlines
 IPV6_CONFIGURE_WITH=		ipv6
 KQUEUE_CONFIGURE_ENABLE=	kqueue
 LEAKDETECT_CONFIGURE_WITH=	leak-detect
 PEDANTIC_CONFIGURE_ENABLE=	pedantic
 POLL_CONFIGURE_ENABLE=		poll
 WARNINGS_CONFIGURE_ENABLE=	warnings
 
 .if !defined(NO_PROFILE)
 CONFIGURE_ARGS+=	--enable-profile
 .endif
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ircd/ircd ${STAGEDIR}${PREFIX}/sbin
 	${INSTALL_PROGRAM} ${WRKSRC}/ircd/convert-conf \
 		${STAGEDIR}${PREFIX}/bin/undernet-convert-conf
 	${INSTALL_PROGRAM} ${WRKSRC}/ircd/umkpasswd \
 		${STAGEDIR}${PREFIX}/bin/undernet-umkpasswd
 	${INSTALL_DATA} ${WRKSRC}/doc/example.conf \
 		${STAGEDIR}${PREFIX}/etc/ircd.conf.sample
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/api ${STAGEDIR}${DOCSDIR}/history
 	(cd ${WRKSRC} && ${INSTALL_DATA} ChangeLog.11 ChangeLog.12 INSTALL \
 		INSTALL_FR README RELEASE.NOTES ${STAGEDIR}${DOCSDIR})
 	(cd ${WRKSRC}/doc && ${INSTALL_DATA} Authors debug_memleak_gc.patch \
 		example.conf fda.txt features.txt freebsd.txt iso-time.html \
 		linux-poll.patch p10.html readme.asll readme.chroot \
 		readme.crules readme.cvs readme.features readme.gline \
 		readme.iauth readme.indent readme.jupe readme.log readme.who \
 		readme.www readme.xquery rfc1413.txt rfc1459.unet \
 		snomask.html strings.txt ${STAGEDIR}${DOCSDIR})
 	(cd ${WRKSRC}/doc/api && ${INSTALL_DATA} api.txt events.txt \
 		features.txt gline.txt ircd_snprintf.txt joinbuf.txt \
 		jupe.txt log.txt modebuf.txt motd.txt msgq.txt \
 		privileges.txt send.txt ${STAGEDIR}${DOCSDIR}/api)
 	(cd ${WRKSRC}/doc/history && ${INSTALL_DATA} 2.4.notes README-2.6 \
 		2.7-New ChangeLog.07 ChangeLog.10 Manual README.patches \
 		history.pre24 overview.u2.9 ${STAGEDIR}${DOCSDIR}/history)
 
 .include <bsd.port.mk>
diff --git a/japanese/R-cran-zipangu/Makefile b/japanese/R-cran-zipangu/Makefile
index 74b8cb9bc48e..cc0c774b8d3f 100644
--- a/japanese/R-cran-zipangu/Makefile
+++ b/japanese/R-cran-zipangu/Makefile
@@ -1,32 +1,33 @@
 PORTNAME=	zipangu
 PORTVERSION=	0.3.1
+PORTREVISION=	1
 CATEGORIES=	japanese
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Japanese Utility Functions and Data
 WWW=		https://cran.r-project.org/web/packages/zipangu/
 
 LICENSE=	MIT
 
 CRAN_DEPENDS=	R-cran-dplyr>=0.8.3:math/R-cran-dplyr \
 		R-cran-lifecycle>=0.1.0:devel/R-cran-lifecycle \
 		R-cran-lubridate>=1.7.4:devel/R-cran-lubridate \
 		R-cran-magrittr>=1.5:devel/R-cran-magrittr \
 		R-cran-memoise>0:devel/R-cran-memoise \
 		R-cran-purrr>=0.3.3:devel/R-cran-purrr \
 		R-cran-rlang>=0.4.0:devel/R-cran-rlang \
 		R-cran-stringi>=1.4.3:textproc/R-cran-stringi \
 		R-cran-stringr>=1.4.0:textproc/R-cran-stringr \
 		R-cran-tibble>=2.1.3:devel/R-cran-tibble \
 		R-cran-arabic2kansuji>=0.1.0:converters/R-cran-arabic2kansuji
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		cran:auto-plist
 
 .include <bsd.port.pre.mk>
 
 PKGNAMEPREFIX:=	${PKGNAMEPREFIX}R-cran-
 
 .include <bsd.port.post.mk>
diff --git a/japanese/boiled-mozc/Makefile b/japanese/boiled-mozc/Makefile
index 00eb18efaec0..f486234b8e8f 100644
--- a/japanese/boiled-mozc/Makefile
+++ b/japanese/boiled-mozc/Makefile
@@ -1,35 +1,35 @@
 PORTNAME=	boiled-mozc
 PORTVERSION=	0.7
 DISTVERSIONPREFIX=v
-PORTREVISION=	13
+PORTREVISION=	18
 CATEGORIES=	japanese editors elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	ume@FreeBSD.org
 COMMENT=	Wrapper to mozc.el that offers modeless ("boil"ed) input style
 WWW=		https://github.com/tadanagao/boiled-mozc
 
 LICENSE=	BSD2CLAUSE
 
 BUILD_DEPENDS=	ja-mozc-el${EMACS_PKGNAMESUFFIX}>0:japanese/mozc-el@${EMACS_FLAVOR}
 RUN_DEPENDS=	ja-mozc-el${EMACS_PKGNAMESUFFIX}>0:japanese/mozc-el@${EMACS_FLAVOR}
 
 USES=		emacs
 USE_GITHUB=	yes
 GH_ACCOUNT=	tadanagao
 
 PLIST_FILES=	${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}.el \
 		${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}.elc
 
 do-build:
 	@(cd ${WRKSRC} && ${EMACS_CMD} -batch -q -no-site-file -no-init-file \
 		-f batch-byte-compile ${PORTNAME}.el)
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.el \
 		${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.elc \
 		${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}
 
 .include <bsd.port.mk>
diff --git a/japanese/cp5022x-el/Makefile b/japanese/cp5022x-el/Makefile
index 4d1067951ecb..30fb7f4761a6 100644
--- a/japanese/cp5022x-el/Makefile
+++ b/japanese/cp5022x-el/Makefile
@@ -1,33 +1,33 @@
 PORTNAME=	cp5022x
 PORTVERSION=	0.0.20120324
-PORTREVISION=	8
+PORTREVISION=	10
 CATEGORIES=	japanese elisp
 PKGNAMESUFFIX=	-el${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	CP50220 and CP51932 coding system support for Emacsen
 
 LICENSE=	GPLv3+
 
 USES=		emacs
 USE_GITHUB=	yes
 GH_ACCOUNT=	awasira
 GH_PROJECT=	cp5022x.el
 GH_TAGNAME=	ea7327d
 
 PLIST_FILES=	${EMACS_SITE_LISPDIR}/cp5022x.el.gz \
 		${EMACS_SITE_LISPDIR}/cp5022x.elc
 
 do-build:
 	cd ${BUILD_WRKSRC} && \
 	    ${EMACS_CMD} -batch -q -no-site-file -no-init-file \
 	    -f batch-byte-compile cp5022x.el && \
 	    ${GZIP_CMD} cp5022x.el
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR} && \
 	cd ${INSTALL_WRKSRC} && \
 	    ${INSTALL_DATA} cp5022x.elc cp5022x.el.gz \
 		${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}
 
 .include <bsd.port.mk>
diff --git a/japanese/ddskk/Makefile b/japanese/ddskk/Makefile
index 8c974c161ffd..f82a0873af92 100644
--- a/japanese/ddskk/Makefile
+++ b/japanese/ddskk/Makefile
@@ -1,65 +1,65 @@
 PORTNAME=	ddskk
 DISTVERSION=	16.2
-PORTREVISION=	12
+PORTREVISION=	14
 CATEGORIES=	japanese elisp
 MASTER_SITES=	ftp://ftp.ring.gr.jp/pub/elisp/skk/maintrunk/ \
 		http://www.ring.gr.jp/archives/elisp/skk/maintrunk/ \
 		http://openlab.ring.gr.jp/skk/maintrunk/
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple Kana to Kanji conversion program on Emacsen
 WWW=		http://openlab.ring.gr.jp/skk/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/READMEs/COPYING
 
 .if ${FLAVOR:U} == devel_full || ${FLAVOR:U} == devel_nox
 BROKEN=		fails to build
 .endif
 
 USES=		emacs
 
 MAKE_ARGS=	PREFIX="${STAGEDIR}${PREFIX}" \
 		SKK_LISPDIR="${STAGEDIR}${PREFIX}/${SKK_LISPDIR}" \
 		SKK_INFODIR="${STAGEDIR}${PREFIX}/${INFO_PATH}"
 ALL_TARGET=	elc info
 NO_ARCH=	yes
 
 INFO=		skk
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
 SKK_LISPDIR=	${EMACS_VERSION_SITE_LISPDIR}/skk
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 post-patch:
 	@${REINPLACE_CMD} -e \
 		'/skk-tut-file/s|@TUT@|${PREFIX}/share/skk/SKK.tut|' \
 		${WRKSRC}/skk-setup.el.in
 
 pre-build:
 .for i in skk-lookup.el skk-jisx0213.el
 	@${MV} ${WRKSRC}/${i} ${WRKDIR}
 .endfor
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${SKK_LISPDIR}
 .for i in skk-lookup.el skk-jisx0213.el
 	${INSTALL_DATA} ${WRKDIR}/${i} ${STAGEDIR}${PREFIX}/${SKK_LISPDIR}
 .endfor
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in AUTHORS.ja CODENAME.ja Contributors Development.ja.org FAQ.ja NEWS.ja
 	${INSTALL_DATA} ${WRKSRC}/READMEs/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 .for i in Emacs.ad dot.emacs dot.skk
 	${INSTALL_DATA} ${WRKSRC}/etc/${i} ${STAGEDIR}${EXAMPLESDIR}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/japanese/lookup/Makefile b/japanese/lookup/Makefile
index e62534586f2d..ac3c99805e96 100644
--- a/japanese/lookup/Makefile
+++ b/japanese/lookup/Makefile
@@ -1,33 +1,33 @@
 PORTNAME=	lookup
 PORTVERSION=	1.99.96.20180209
-PORTREVISION=	12
+PORTREVISION=	14
 CATEGORIES=	japanese elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	yasu@FreeBSD.org
 COMMENT=	Emacs search interface for CD-ROM books, etc
 WWW=		https://lookup2.github.io/
 
 LICENSE=	GPLv2+
 
 USES=		autoreconf emacs makeinfo
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	lookup2
 GH_PROJECT=	lookup2
 GH_TAGNAME=	c4f4986
 
 INFO=		lookup
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-emacs=${EMACS_CMD} \
 		--with-lispdir=${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}
 
 OPTIONS_DEFINE=	DOCS
 
 PORTDOCS=	AUTHORS ChangeLog NEWS README.md
 
 post-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/japanese/migemo.el/Makefile b/japanese/migemo.el/Makefile
index 5ff254b45849..f0407792276e 100644
--- a/japanese/migemo.el/Makefile
+++ b/japanese/migemo.el/Makefile
@@ -1,36 +1,36 @@
 PORTNAME=	migemo.el
 PORTVERSION=	1.9.2
-PORTREVISION=	8
+PORTREVISION=	10
 CATEGORIES=	japanese elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	nobutaka@FreeBSD.org
 COMMENT=	Japanese incremental search tool for Emacs
 WWW=		https://github.com/emacs-jp/migemo
 
 LICENSE=	GPLv2
 
 RUN_DEPENDS=	cmigemo:japanese/cmigemo
 
 USES=		emacs
 USE_GITHUB=	yes
 GH_ACCOUNT=	emacs-jp
 GH_PROJECT=	migemo
 GH_TAGNAME=	e4744ef
 
 CONFLICTS=	ja-migemo-emacs
 NO_ARCH=	yes
 NO_BUILD=	yes
 PLIST_FILES=	${EMACS_SITE_LISPDIR}/migemo.el
 PORTDOCS=	README.md
 
 OPTIONS_DEFINE=	DOCS
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/migemo.el ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/japanese/mozc-server/Makefile b/japanese/mozc-server/Makefile
index cdcd0106e052..b4f4209e5a9d 100644
--- a/japanese/mozc-server/Makefile
+++ b/japanese/mozc-server/Makefile
@@ -1,408 +1,408 @@
 PORTNAME=	mozc
 PORTVERSION=	2.23.2815.102.01
 DISTVERSIONPREFIX=	v
-PORTREVISION?=	12
+PORTREVISION?=	13
 CATEGORIES=	japanese
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT?=	Mozc Japanese Input Method, Server
 WWW=		https://github.com/google/mozc
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gyp>=20200512:devel/py-gyp@${PY_FLAVOR}
 EXTRACT_DEPENDS=${PYTHON_CMD}:${PYTHON_PORTSDIR}
 LIB_DEPENDS=	libprotobuf.so:devel/protobuf \
 		libzinnia.so:japanese/zinnia
 RUN_DEPENDS=	xdg-open:devel/xdg-utils
 
 BROKEN_FreeBSD_12_powerpc64=	fails to install: gyp: Call to 'which clang' returned exit status 1 while in client/client.gyp
 BROKEN_FreeBSD_13_powerpc64=	fails to build: ERROR: ninja -v -C out_linux/Release mozc_server: Error code 1
 BROKEN_powerpc=		fails to compile: segfault
 BROKEN_sparc64=		fails to compile: segfault
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	hrs-allbsd
 GH_TUPLE=	hiroyuki-komatsu:japanese-usage-dictionary:e5b3425:udic
 
 USES=		compiler:c++11-lang gmake ninja:build pkgconfig \
 		python:3.5+,build shebangfix tar:bzip2
 SHEBANG_FILES=	src/build_mozc.py
 BUILD_WRKSRC=	${WRKSRC}/src
 
 BUILD_MOZC_LIST?=	mozc_server
 
 .if ${BUILD_MOZC_LIST:Mmozc_server} == "mozc_server"
 PKGNAMEPREFIX=	ja-
 PKGNAMESUFFIX=	-server
 
 LICENSE=		BSD3CLAUSE NAISTL
 LICENSE_COMB=		multi
 LICENSE_FILE_BSD3CLAUSE=	${WRKSRC}/LICENSE
 LICENSE_DISTFILES_BSD3CLAUSE=	${DISTNAME}${EXTRACT_SUFX}
 LICENSE_NAME_NAISTL=	Nara Institute of Science and Technology License
 LICENSE_PERMS_NAISTL=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 LICENSE_FILE_NAISTL=	${WRKSRC}/src/data/dictionary_oss/README.txt
 LICENSE_DISTFILES_NAISTL=${DISTNAME}${EXTRACT_SUFX}
 .elif ${BUILD_MOZC_LIST:Mmozc_tool} == "mozc_tool"
 USES+=		qt:5 gnome
 USE_GNOME=	glib20 gtk20
 USE_QT=		buildtools core gui widgets
 .elif ${BUILD_MOZC_LIST:Mibus_mozc} == "ibus_mozc"
 USES+=		gettext-runtime gnome xorg
 USE_XORG=	xcb
 USE_GNOME=	cairo gdkpixbuf2 glib20 gtk20
 LIB_DEPENDS+=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2
 .elif ${BUILD_MOZC_LIST:Mmozc_el} == "mozc_el"
 USES+=		emacs
 .elif ${BUILD_MOZC_LIST:Mfcitx_mozc}
 USES+=		gettext-tools
 .endif
 
 # Use GCC only when the stock clang does not have libc++.so.
 .if exists(/usr/bin/clang) && exists(/usr/lib/libc++.so)
 _CCTYPE=	clang
 .else
 USE_GCC=	yes
 _CCTYPE=	gcc
 .endif
 
 .include <bsd.port.pre.mk>
 
 GYP_DEFINES=	use_libprotobuf=1 \
 		channel_dev=0 \
 		enable_unittest=0 \
 		compiler_host='${_CCTYPE}' \
 		compiler_target='${_CCTYPE}' \
 		use_libzinnia=1 \
 		zinnia_model_file='${LOCALBASE}/share/tegaki/models/zinnia/handwriting-ja.model' \
 		ibus_mozc_icon_path='${LOCALBASE}/share/ibus-mozc/icons/product_icon.png' \
 		ibus_mozc_path='${PREFIX}/libexec/ibus-engine-mozc'
 BUILD_MODE=	Release
 BUILD_CMD=	${SETENV} ${MAKE_ENV} PATH=/bin:/usr/bin:${PATH} ${MAKE_CMD}
 BUILD_MOZC_CMD=	cd ${BUILD_WRKSRC} && \
 		${SETENV} BUILD_COMMAND="${BUILD_WRKSRC}/mozcmake" \
 		    PATH="${PATH}" \
 		    GYP_DEFINES="${GYP_DEFINES}" \
 		    PYTHONPATH=${PYTHON_SITELIBDIR}/gyp \
 		    CC_host="${CC}" \
 		    CC_target="${CC}" \
 		    CXX_host="${CXX}" \
 		    CXX_target="${CXX}" \
 		    LD_host="${CXX}" \
 		    AR_host="${AR}" \
 		    ${MAKE_ENV} \
 		    ${PYTHON_CMD} build_mozc.py
 BUILD_MOZC_CMD_BUILD=	${BUILD_MOZC_CMD} build -c ${BUILD_MODE} ${_MAKE_JOBS}
 BUILD_GYP_CMD=	${SETENV} ${MAKE_ENV} ${LOCALBASE}/bin/gyp
 
 post-extract:	# XXX: do not activate fcitx5
 	${RM} -r ${WRKSRC}/src/unix/fcitx5
 post-patch:
 	${FIND} ${BUILD_WRKSRC} \( -name '*.gyp' -o -name '*.gypi' \) -exec \
 	    ${REINPLACE_CMD} "s,'python','${PYTHON_CMD}',g" {} \;
 .if ${BUILD_MOZC_LIST:Mfcitx_mozc} == "fcitx_mozc"
 	${REINPLACE_CMD} 's,/po/mo},%po}mo,g' \
 	    ${BUILD_WRKSRC}/unix/fcitx/gen_fcitx_mozc_i18n.sh
 	${REINPLACE_CMD} \
 	    "s,IconName=.*,IconName=${LOCALBASE:Q}/share/fcitx/mozc/icon/mozc.png," \
 	    ${BUILD_WRKSRC}/unix/fcitx/mozc.conf
 .endif
 
 .if !${BUILD_MOZC_LIST:Mmozc_el}
 ${BUILD_WRKSRC}/mozcmake:
 	${PRINTF} "%s\n\n%s\n" "#!/bin/sh" 'exec ${BUILD_CMD} "$$@"' \
 	    > ${BUILD_WRKSRC}/mozcmake
 	${CHMOD} +x ${BUILD_WRKSRC}/mozcmake
 
 post-configure: ${BUILD_WRKSRC}/mozcmake
 	${BUILD_MOZC_CMD} gyp \
 	    --gypdir=${LOCALBASE}/bin \
 	    --server_dir="${PREFIX}/bin" \
 	    --tool_dir="${PREFIX}/libexec" \
 	    --renderer_dir="${PREFIX}/libexec" \
 	    --localbase="${LOCALBASE}" \
 	    --ldflags="${LDFLAGS} -fstack-protector -L${LOCALBASE}/lib" \
 	    --cflags="${CFLAGS:Q}" \
 	    --cflags_cc="${CXXFLAGS:Q}" \
 	    --include_dirs="${LOCALBASE}/include" \
 	    ${GYP_OPTIONS}
 .endif
 
 # mozc_server
 .if ${BUILD_MOZC_LIST:Mmozc_server} == "mozc_server" || make(makesum)
 GYP_OPTIONS+=	--noqt
 GYP_DEFINES+=	use_libibus=0 \
 		enable_gtk_renderer=0
 
 MASTER_SITES+=	LOCAL/hrs:zipcode
 DISTFILES+= \
 	ken_all-20221228.zip:zipcode \
 	jigyosyo-20221228.zip:zipcode
 
 PLIST_FILES+=	bin/mozc \
 		bin/mozc_server \
 		libexec/mozc_emacs_helper
 SUB_FILES+=	mozc
 
 post-patch-mozc_server:
 	@for F in ${DISTFILES:M*\:zipcode:C/\:zipcode//}; do \
 		${UNZIP_NATIVE_CMD} -L -d ${BUILD_WRKSRC}/data/dictionary_oss \
 		    ${DISTDIR}/$$F; \
 	done
 	cd ${BUILD_WRKSRC}/data/dictionary_oss && \
 	    ${SETENV} PYTHONPATH=${BUILD_WRKSRC} \
 		${PYTHON_CMD} ${BUILD_WRKSRC}/dictionary/gen_zip_code_seed.py \
 		--zip_code=ken_all.csv --jigyosyo=jigyosyo.csv \
 	    >> dictionary09.txt
 	${MV} ${WRKSRC_udic}/usage_dict.txt \
 	    ${BUILD_WRKSRC}/third_party/japanese_usage_dictionary
 
 post-patch: post-patch-mozc_server
 
 do-build-mozc_server:
 	${BUILD_MOZC_CMD_BUILD} server/server.gyp:mozc_server
 	${BUILD_MOZC_CMD_BUILD} unix/emacs/emacs.gyp:mozc_emacs_helper
 
 do-install-mozc_server:
 	${INSTALL_PROGRAM} \
 	    ${BUILD_WRKSRC}/out_linux/${BUILD_MODE}/mozc_server \
 	    ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} \
 	    ${BUILD_WRKSRC}/out_linux/${BUILD_MODE}/mozc_emacs_helper \
 	    ${STAGEDIR}${PREFIX}/libexec
 	${INSTALL_SCRIPT} \
 	    ${WRKDIR}/mozc ${STAGEDIR}/${PREFIX}/bin
 .endif
 
 # mozc_tool
 .if ${BUILD_MOZC_LIST:Mmozc_tool} == "mozc_tool"
 GYP_DEFINES+=	use_libibus=0 \
 		enable_gtk_renderer=1
 
 RUN_DEPENDS+=	${LOCALBASE}/share/tegaki/models/zinnia/handwriting-ja.model:japanese/tegaki-zinnia-japanese
 
 PLIST_FILES+=	libexec/mozc_tool \
 		bin/mozc_tool \
 		%%DATADIR%%/icons/product_logo.png \
 		%%DATADIR%%/icons/update_uptodate.png
 SUB_FILES+=	mozc_tool
 
 do-build-mozc_tool:
 	${BUILD_MOZC_CMD_BUILD} gui/gui.gyp:mozc_tool
 
 do-install-mozc_tool:
 	${INSTALL_PROGRAM} \
 	    ${BUILD_WRKSRC}/out_linux/${BUILD_MODE}/mozc_tool \
 	    ${STAGEDIR}${PREFIX}/libexec
 	${INSTALL_SCRIPT} ${WRKDIR}/mozc_tool ${STAGEDIR}${PREFIX}/bin
 	@${MKDIR} ${STAGEDIR}${DATADIR}/icons
 	${INSTALL_DATA} \
 	    ${BUILD_WRKSRC}/data/images/unix/ime_product_icon_opensource-32.png \
 	    ${STAGEDIR}${DATADIR}/icons/product_logo.png
 	${INSTALL_DATA} \
 	    ${BUILD_WRKSRC}/data/images/unix/ime_product_icon_opensource-32.png \
 	    ${STAGEDIR}${DATADIR}/icons/update_uptodate.png
 .endif
 
 # ibus_mozc
 .if ${BUILD_MOZC_LIST:Mibus_mozc} == "ibus_mozc"
 GYP_OPTIONS+=	--noqt
 GYP_DEFINES+=	use_libibus=1 \
 		enable_gtk_renderer=1
 
 LIB_DEPENDS+=	libibus-1.0.so:textproc/ibus
 RUN_DEPENDS+=	mozc_server:japanese/mozc-server \
 		mozc_tool:japanese/mozc-tool
 
 PLIST_FILES+=	libexec/mozc_renderer \
 		libexec/ibus-engine-mozc \
 		%%DATADIR%%/icons/alpha_full.png \
 		%%DATADIR%%/icons/alpha_half.png \
 		%%DATADIR%%/icons/dictionary.png \
 		%%DATADIR%%/icons/direct.png \
 		%%DATADIR%%/icons/hiragana.png \
 		%%DATADIR%%/icons/katakana_full.png \
 		%%DATADIR%%/icons/katakana_half.png \
 		%%DATADIR%%/icons/product_icon.png \
 		%%DATADIR%%/icons/properties.png \
 		%%DATADIR%%/icons/tool.png \
 		share/ibus/component/mozc.xml
 PLIST_DIRS+=	%%DATADIR%%/icons ${DATADIR_REL}
 
 do-build-ibus_mozc:
 	${BUILD_MOZC_CMD_BUILD} \
 	    unix/ibus/ibus.gyp:ibus_mozc \
 	    renderer/renderer.gyp:mozc_renderer
 
 do-install-ibus_mozc:
 	${INSTALL_PROGRAM} \
 	    ${BUILD_WRKSRC}/out_linux/${BUILD_MODE}/mozc_renderer \
 	    ${STAGEDIR}${PREFIX}/libexec/mozc_renderer
 	${INSTALL_PROGRAM} \
 	    ${BUILD_WRKSRC}/out_linux/${BUILD_MODE}/ibus_mozc \
 	    ${STAGEDIR}${PREFIX}/libexec/ibus-engine-mozc
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/ibus/component
 	${INSTALL_DATA} \
 	    ${BUILD_WRKSRC}/out_linux/${BUILD_MODE}/gen/unix/ibus/mozc.xml \
 	    ${STAGEDIR}${PREFIX}/share/ibus/component/mozc.xml
 	@${MKDIR} ${STAGEDIR}${DATADIR}/icons
 .for F in ui-alpha_full ui-alpha_half ui-dictionary ui-direct \
 	ui-hiragana ui-katakana_full ui-katakana_half ui-properties ui-tool
 	${INSTALL_DATA} \
 	    ${BUILD_WRKSRC}/data/images/unix/${F}.png \
 	    ${STAGEDIR}${DATADIR}/icons/${F:S/^ui-//}.png
 .endfor
 	${INSTALL_DATA} \
 	    ${BUILD_WRKSRC}/data/images/unix/ime_product_icon_opensource-32.png \
 	    ${STAGEDIR}${DATADIR}/icons/product_icon.png
 .endif
 
 # uim_mozc
 .if ${BUILD_MOZC_LIST:Muim_mozc} == "uim_mozc" || make(makesum)
 GH_TUPLE+=	e-kato:macuim:v0.6.16.2.1:MU
 
 LIB_DEPENDS+=	libuim.so:textproc/uim
 RUN_DEPENDS+=	mozc_server:japanese/mozc-server \
 		mozc_tool:japanese/mozc-tool
 
 EXTRA_PATCHES=	${PATCHDIR}/extra-patch-src-unix-uim-mozc.cc \
 		${PATCHDIR}/extra-patch-src-unix-uim-uim.gyp \
 		${PATCHDIR}/extra-patch-src-unix-uim-key_translator.h \
 		${PATCHDIR}/extra-patch-src-unix-uim-key_translator.cc
 PLIST_FILES+=	lib/uim/plugin/libuim-mozc.so \
 		%%DATADIR%%/mozc.scm \
 		%%DATADIR%%/mozc-custom.scm \
 		%%DATADIR%%/mozc-key-custom.scm \
 		%%DATADIR%%/pixmaps/mozc.png \
 		"@postexec ${SETENV} MOZC_NOLOG=true ${LOCALBASE}/bin/uim-module-manager --register mozc" \
 		"@preunexec ${LOCALBASE}/bin/uim-module-manager --unregister mozc"
 
 GYP_OPTIONS+=	--noqt
 GYP_DEFINES+=	use_libibus=0 \
 		enable_gtk_renderer=0
 
 post-extract-uim_mozc:
 	${MV} ${WRKSRC_MU}/Mozc/uim ${BUILD_WRKSRC}/unix
 	${REINPLACE_CMD} -e "s,/usr/lib/mozc,${LOCALBASE}/libexec," \
 	    ${WRKSRC_MU}/Mozc/scm/mozc-custom.scm
 
 post-extract: post-extract-uim_mozc
 
 do-build-uim_mozc:
 	${BUILD_MOZC_CMD_BUILD} \
 	    unix/uim/uim.gyp:uim-mozc
 
 do-install-uim_mozc:
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/uim/plugin
 	${INSTALL_PROGRAM} \
 	    ${BUILD_WRKSRC}/out_linux/${BUILD_MODE}/libuim-mozc.so \
 	    ${STAGEDIR}${PREFIX}/lib/uim/plugin
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	cd ${WRKSRC_MU}/Mozc/scm && \
 	    ${INSTALL_DATA} mozc.scm mozc-custom.scm mozc-key-custom.scm \
 	    ${STAGEDIR}${DATADIR}
 	${MKDIR} ${STAGEDIR}${DATADIR}/pixmaps
 	${INSTALL_DATA} \
 	    ${BUILD_WRKSRC}/data/images/product_icon_32bpp-128.png \
 	    ${STAGEDIR}${DATADIR}/pixmaps/mozc.png
 .endif
 
 # fcitx_mozc
 .if ${BUILD_MOZC_LIST:Mfcitx_mozc} == "fcitx_mozc"
 GYP_OPTIONS+=	--noqt
 GYP_DEFINES+=	use_libibus=0 \
 		enable_gtk_renderer=0 \
 		use_fcitx="YES"
 
 LIB_DEPENDS+=	libfcitx-core.so:chinese/fcitx
 RUN_DEPENDS+=	mozc_server:japanese/mozc-server \
 		mozc_tool:japanese/mozc-tool
 
 PLIST_FILES+=	lib/fcitx/fcitx-mozc.so \
 		share/fcitx/addon/fcitx-mozc.conf \
 		share/fcitx/inputmethod/mozc.conf \
 		%%DATADIR%%/icon/mozc.png \
 		%%DATADIR%%/icon/mozc-alpha_full.png \
 		%%DATADIR%%/icon/mozc-alpha_half.png \
 		%%DATADIR%%/icon/mozc-direct.png \
 		%%DATADIR%%/icon/mozc-hiragana.png \
 		%%DATADIR%%/icon/mozc-katakana_full.png \
 		%%DATADIR%%/icon/mozc-katakana_half.png \
 		%%DATADIR%%/icon/mozc-dictionary.png \
 		%%DATADIR%%/icon/mozc-properties.png \
 		%%DATADIR%%/icon/mozc-tool.png \
 		share/locale/ja/LC_MESSAGES/fcitx-mozc.mo \
 		share/locale/zh_CN/LC_MESSAGES/fcitx-mozc.mo \
 		share/locale/zh_TW/LC_MESSAGES/fcitx-mozc.mo
 PLIST_DIRS+=	%%DATADIR%%/icon ${DATADIR_REL}
 
 do-build-fcitx_mozc:
 	${BUILD_MOZC_CMD_BUILD} unix/fcitx/fcitx.gyp:fcitx-mozc
 
 do-install-fcitx_mozc:
 	@${MKDIR} \
 	    ${STAGEDIR}${PREFIX}/lib/fcitx \
 	    ${STAGEDIR}${PREFIX}/share/fcitx/addon \
 	    ${STAGEDIR}${PREFIX}/share/fcitx/inputmethod
 	${INSTALL_LIB} \
 	    ${BUILD_WRKSRC}/out_linux/${BUILD_MODE}/fcitx-mozc.so \
 	    ${STAGEDIR}${PREFIX}/lib/fcitx/fcitx-mozc.so
 	${INSTALL_DATA} \
 	    ${BUILD_WRKSRC}/unix/fcitx/fcitx-mozc.conf \
 	    ${STAGEDIR}${PREFIX}/share/fcitx/addon/fcitx-mozc.conf
 	${INSTALL_DATA} \
 	    ${BUILD_WRKSRC}/unix/fcitx/mozc.conf \
 	    ${STAGEDIR}${PREFIX}/share/fcitx/inputmethod/mozc.conf
 	@${MKDIR} ${STAGEDIR}${DATADIR}/icon
 .for F in ui-alpha_full ui-alpha_half ui-dictionary ui-direct \
 	ui-hiragana ui-katakana_full ui-katakana_half ui-properties ui-tool
 	${INSTALL_DATA} \
 	    ${BUILD_WRKSRC}/data/images/unix/${F}.png \
 	    ${STAGEDIR}${DATADIR}/icon/${F:S,^ui-,mozc-,}.png
 .endfor
 	${INSTALL_DATA} \
 	    ${BUILD_WRKSRC}/data/images/product_icon_32bpp-128.png \
 	    ${STAGEDIR}${DATADIR}/icon/mozc.png
 .for L in ja zh_CN zh_TW
 	${INSTALL_DATA} \
 	    ${BUILD_WRKSRC}/out_linux/${BUILD_MODE}/gen/unix/fcitx/po/${L}.mo \
 	    ${STAGEDIR}${PREFIX}/share/locale/${L}/LC_MESSAGES/fcitx-mozc.mo
 .endfor
 .endif
 
 # mozc_el
 .if ${BUILD_MOZC_LIST:Mmozc_el} == "mozc_el"
 CATEGORIES+=	elisp
 RUN_DEPENDS+=	mozc_server:japanese/mozc-server
 
 NO_ARCH=	yes
 PLIST_FILES+=	${EMACS_VERSION_SITE_LISPDIR}/mozc/mozc.elc \
 		${EMACS_VERSION_SITE_LISPDIR}/mozc/mozc.el.gz \
 		${EMACS_VERSION_SITE_LISPDIR}/mozc/leim-list.el
 PLIST_DIRS+=	${EMACS_VERSION_SITE_LISPDIR}/mozc
 
 post-patch-mozc_el:
 	${REINPLACE_CMD} "s,%%PREFIX%%,${PREFIX}," \
 	    ${BUILD_WRKSRC}/unix/emacs/mozc.el
 
 post-patch: post-patch-mozc_el
 
 do-build-mozc_el:
 	cd ${BUILD_WRKSRC}/unix/emacs && \
 	    ${EMACS_CMD} -batch -q -no-site-file -no-init-file \
 	    -f batch-byte-compile mozc.el && \
 	    ${GZIP_CMD} mozc.el
 
 do-install-mozc_el:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/mozc
 	${INSTALL_DATA} \
 	    ${BUILD_WRKSRC}/unix/emacs/mozc.el.gz \
 	    ${BUILD_WRKSRC}/unix/emacs/mozc.elc \
 	    ${FILESDIR}/leim-list.el \
 	    ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/mozc/
 .endif
 
 do-build: ${BUILD_MOZC_LIST:S/^/do-build-/}
 do-install: ${BUILD_MOZC_LIST:S/^/do-install-/}
 
 .include <bsd.port.post.mk>
diff --git a/japanese/mypaedia-fpw-package/Makefile b/japanese/mypaedia-fpw-package/Makefile
index c18065cd3069..c3c12b408a48 100644
--- a/japanese/mypaedia-fpw-package/Makefile
+++ b/japanese/mypaedia-fpw-package/Makefile
@@ -1,32 +1,32 @@
 PORTNAME=	mypaedia-fpw-package
 PORTVERSION=	1.0.7
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	japanese elisp
 MASTER_SITES=	http://openlab.ring.gr.jp/edict/fpw/dist/mypaedia/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Supplement file to use "mypaedia" on lookup
 WWW=		http://openlab.ring.gr.jp/edict/mypaedia-fpw/
 
 RUN_DEPENDS=	sox:audio/sox \
 		timidity:audio/timidity++ \
 		xanim:multimedia/xanim
 
 USES=		magick:6,run
 
 NO_BUILD=	yes
 PLIST_SUB=	PKGNAME=${PKGNAME}
 
 PKG_DIR=	${STAGEDIR}${PREFIX}/share/dict/lookup-package
 
 OPTIONS_DEFINE=	DOCS
 
 do-install:
 	@${MKDIR} ${PKG_DIR}
 	${INSTALL_DATA} ${WRKSRC}/mypaedia-fpw.el ${PKG_DIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/extract-mypaedia.pl ${PKG_DIR}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC} && ${INSTALL_DATA} ChangeLog README.TXT \
 		${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
diff --git a/japanese/navi2ch/Makefile b/japanese/navi2ch/Makefile
index 7957462a3007..7acb931bd2d5 100644
--- a/japanese/navi2ch/Makefile
+++ b/japanese/navi2ch/Makefile
@@ -1,46 +1,46 @@
 PORTNAME=	navi2ch
 PORTVERSION=	2.0.0.d
-PORTREVISION=	17
+PORTREVISION=	19
 PORTEPOCH=	1
 CATEGORIES=	japanese www elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	2ch.net and 2ch-like BBS navigator for Emacsen
 WWW=		http://navi2ch.sourceforge.net
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	${LOCALBASE}/sbin/2chproxy.pl:japanese/p5-2chproxy
 
 USES=		emacs
 USE_GITHUB=	yes
 GH_ACCOUNT=	naota
 GH_TAGNAME=	faebfd1
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	EMACS="${EMACS_CMD}"
 CONFIGURE_ARGS=	--with-lispdir=${PREFIX}/${LISPDIR}/${PORTNAME}
 PLIST_SUB=	LISPDIR=${LISPDIR}
 PORTDOCS=	${PORTDOC_FILES} contrib
 
 INFO=		navi2ch
 
 PORTDOC_FILES=	ChangeLog README TODO
 PORTDOC_LISPS=	gikope.el navi2ch-logo.el navi2ch-migemo.el
 LISPDIR=	${EMACS_VERSION_SITE_LISPDIR}
 
 OPTIONS_DEFINE=	DOCS X11
 OPTIONS_DEFAULT=X11
 X11_RUN_DEPENDS=${LOCALBASE}/share/fonts/mona/monak12.pcf.gz:japanese/font-mona
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && \
 	    ${INSTALL_DATA} ${PORTDOC_FILES} ${STAGEDIR}${DOCSDIR}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/contrib
 	cd ${WRKSRC}/contrib && \
 	    ${INSTALL_DATA} ${PORTDOC_LISPS} ${STAGEDIR}${DOCSDIR}/contrib
 
 .include <bsd.port.mk>
diff --git a/japanese/skkinput3/Makefile b/japanese/skkinput3/Makefile
index 284d9dd9f5ac..8329e0b9318a 100644
--- a/japanese/skkinput3/Makefile
+++ b/japanese/skkinput3/Makefile
@@ -1,56 +1,56 @@
 PORTNAME=	skkinput3
 PORTVERSION=	3.0.6
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	japanese x11
 MASTER_SITES=	OSDN/${PORTNAME}
 DISTNAME=	skkinput-${PORTVERSION}
 
 MAINTAINER=	koma2@lovepeers.org
 COMMENT=	SKK-like Japanese input method for X11
 WWW=		https://sourceforge.jp/projects/skkinput3/
 
 USES=		imake xorg
 USE_GCC=	yes
 USE_CSTD=	gnu89
 USE_XORG=	ice sm x11 xext xmu xt
 MAKE_JOBS_UNSAFE=	yes
 
 PORTDOCS=	*.jis dot.skkinput ChangeLog
 
 OPTIONS_DEFINE=	SKK10 DOCS
 OPTIONS_RADIO=	SKKSERVER
 OPTIONS_RADIO_SKKSERVER=	DBSKKD RSKKSERV
 
 SKKSERVER_DESC=	Skkserver selection
 DBSKKD_DESC=	Use ja-dbskkd-cdb as skkserver
 RSKKSERV_DESC=	Use ja-rskkserv as skkserver
 SKK10_DESC=	Install SKK10 elisp files
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MSKK10}
 PLIST_SUB+=	SKK8="@comment " SKK10=""
 .else
 PLIST_SUB+=	SKK8="" SKK10="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MDBSKKD}
 RUN_DEPENDS=	${LOCALBASE}/libexec/dbskkd-cdb:japanese/dbskkd-cdb
 .elif ${PORT_OPTIONS:MRSKKSERV}
 RUN_DEPENDS=	${LOCALBASE}/libexec/rskkserv:japanese/rskkserv
 .else
 RUN_DEPENDS=	${LOCALBASE}/sbin/skkserv:japanese/skkserv
 .endif
 
 post-patch:
 .if ${PORT_OPTIONS:MSKK10}
 	@${REINPLACE_CMD} -e '/\(#define.*UseSkk8\)/ s/^/XCOMM /' \
 		-e '/XCOMM.*#define.*UseSkk10/ s/XCOMM[[:space:]]*//' \
 			${WRKSRC}/Skkinput.conf
 .endif
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/japanese/xtr/Makefile b/japanese/xtr/Makefile
index db273c429dd8..16902eb55bdf 100644
--- a/japanese/xtr/Makefile
+++ b/japanese/xtr/Makefile
@@ -1,41 +1,41 @@
 PORTNAME=	xtr
 PORTVERSION=	1.50e.0.2
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	japanese textproc
 MASTER_SITES=	ftp://ftp.abk.nu/pub/redist/xtr/
 DISTNAME=	${PORTNAME}1.50e-0.2
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Japanese text formatting processor
 
 # Converted from NO_CDROM
 LICENSE=	xtr
 LICENSE_NAME=	xtr
 LICENSE_TEXT=	Need to obtain permission for commercial redistribution
 LICENSE_PERMS=	dist-mirror pkg-mirror auto-accept
 
 USES=		tar:tgz
 USE_CSTD=	c89
 USE_GCC=	yes
 
 GNU_CONFIGURE=	yes
 
 OPTIONS_DEFINE=	DOCS
 
 post-extract:
 	@${ECHO_MSG} "===>  Converting Kanji code for ${DISTNAME}"
 	@(cd ${WRKSRC} && ${SH} EUCsetup )
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/xtr ${STAGEDIR}${PREFIX}/bin/xtr
 	${INSTALL_MAN} ${WRKSRC}/man/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/man/man1
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/${PORTNAME}
 	${INSTALL_DATA} ${WRKSRC}/sample/*.xtr ${STAGEDIR}${PREFIX}/share/${PORTNAME}
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for file in README doc/xtr.doc
 	${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/java/veditor/Makefile b/java/veditor/Makefile
index 0fdcb904c92b..ada1d79dd2bf 100644
--- a/java/veditor/Makefile
+++ b/java/veditor/Makefile
@@ -1,38 +1,38 @@
 PORTNAME=	veditor
 PORTVERSION=	1.2.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	java cad
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}%20runtime/VEditor%20${PORTVERSION}
 DISTNAME=	net.sourceforge.${PORTNAME}_${PORTVERSION}
 EXTRACT_SUFX=	.jar
 EXTRACT_ONLY=
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Verilog and VHDL editor plugin for eclipse
 WWW=		http://veditor.sourceforge.net/
 
 RUN_DEPENDS=	eclipse:java/eclipse
 
 OPTIONS_DEFINE=	VERILOG VHDL
 VERILOG_DESC=	Support Verilog with Icarus Verilog
 VHDL_VHDL=	Support VHDL with FreeHDL
 OPTIONS_DEFAULT=	VERILOG VHDL
 
 VERILOG_RUN_DEPENDS=	iverilog:cad/iverilog
 VHDL_RUN_DEPENDS=	freehdl-v2cc:cad/freehdl
 
 PLIST_SUB=	VER=${PORTVERSION} \
 		ECLIPSE=${ECLIPSE}
 
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
 ECLIPSE=	lib/eclipse
 PLUGINS=	plugins
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${ECLIPSE}/${PLUGINS}
 	${INSTALL_DATA} ${DISTDIR}/${DISTFILES} \
 		${STAGEDIR}${PREFIX}/${ECLIPSE}/${PLUGINS}
 
 .include <bsd.port.mk>
diff --git a/lang/alchemist.el/Makefile b/lang/alchemist.el/Makefile
index 0cfb0a59df99..97e364f30fed 100644
--- a/lang/alchemist.el/Makefile
+++ b/lang/alchemist.el/Makefile
@@ -1,35 +1,35 @@
 PORTNAME=	alchemist.el
 PORTVERSION=	1.8.2
 DISTVERSIONPREFIX=	v
-PORTREVISION=	11
+PORTREVISION=	13
 CATEGORIES=	lang
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	erlang@FreeBSD.org
 COMMENT=	Elixir Tooling Integration Into Emacs
 WWW=		https://github.com/tonini/alchemist.el
 
 LICENSE=	GPLv3
 
 RUN_DEPENDS=	elixir-mode.el${EMACS_PKGNAMESUFFIX}>=0:lang/elixir-mode.el@${EMACS_FLAVOR}
 
 USES=		emacs
 USE_GITHUB=	yes
 GH_ACCOUNT=	tonini
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 OPTIONS_DEFINE=	DOCS
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/alchemist-server
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/alchemist-server/lib
 	${INSTALL_DATA} ${WRKSRC}/*.el ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}
 	${INSTALL_DATA} ${WRKSRC}/alchemist-server/*.exs ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/alchemist-server
 	(cd ${WRKSRC}/alchemist-server/lib && ${COPYTREE_SHARE} \* ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/alchemist-server/lib)
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/*.md ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
diff --git a/lang/algol68g/Makefile b/lang/algol68g/Makefile
index 4e306f0487ff..5153a651d1bb 100644
--- a/lang/algol68g/Makefile
+++ b/lang/algol68g/Makefile
@@ -1,41 +1,42 @@
 PORTNAME=	algol68g
 PORTVERSION=	3.1.8
+PORTREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	https://jmvdveer.home.xs4all.nl/
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Algol 68 Genie compiler
 WWW=		https://www.xs4all.nl/~jmvdveer/algol.html
 
 LICENSE=	GPLv3+
 
 USES=		readline
 GNU_CONFIGURE=	yes
 TEST_TARGET=	check
 
 OPTIONS_DEFINE=	GSL PGSQL PLOTUTILS RMATH
 OPTIONS_DEFAULT=	GSL PGSQL PLOTUTILS RMATH
 
 GSL_DESC=	Bindings for GNU Scientific Library
 GSL_LIB_DEPENDS=	libgsl.so:math/gsl
 GSL_CONFIGURE_ENABLE=	gsl
 
 PLOTUTILS_DESC=		Plotting support via plotutils
 PLOTUTILS_LIB_DEPENDS=	libplot.so:graphics/plotutils
 PLOTUTILS_CONFIGURE_ENABLE=plotutils
 
 PGSQL_USES=		pgsql
 PGSQL_CONFIGURE_ENABLE=	postgresql
 
 RMATH_DESC=	Bindings for GNU R's statistical routines
 RMATH_LIB_DEPENDS=	libRmath.so:math/libRmath
 RMATH_CONFIGURE_ENABLE=	mathlib
 
 post-patch:
 #	Skip broken check, assume our $CC works
 	@${REINPLACE_CMD} -Ee 's/.*(\*-freebsd)/\1/' \
 		-e 's|"xgcc"|"x${CC}"|; s/-ldl //' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e '/^install-data-am/s/install-docDATA//' \
 		${WRKSRC}/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/lang/clisp/Makefile b/lang/clisp/Makefile
index f7e80543699f..fedea4a9641d 100644
--- a/lang/clisp/Makefile
+++ b/lang/clisp/Makefile
@@ -1,212 +1,212 @@
 PORTNAME=	clisp
 PORTVERSION=	2.49.93+
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	lang lisp
 
 MAINTAINER=	kiri@TrueFC.org
 COMMENT=	Common Lisp implementation
 WWW=		https://www.gnu.org/software/clisp/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/GNU-GPL
 
 BROKEN_sparc64=	Does not compile
 
 LIB_DEPENDS=	libffcall.so:devel/libffcall \
 		libreadline.so:devel/readline \
 		libsigsegv.so:devel/libsigsegv
 
 USES=		compiler gettext ghostscript gnome iconv localbase:ldflags
 USE_GCC=	yes
 USE_GITLAB=	yes
 
 GL_ACCOUNT=	gnu-clisp
 GL_PROJECT=	clisp
 GL_COMMIT=	df3b9f6fdcff22832898e89a989eb499c0f842ed
 USE_LDCONFIG=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ENV=	FORCE_UNSAFE_CONFIGURE=1
 CONFIGURE_ARGS=	--prefix="${PREFIX}" --mandir="${MANPREFIX}/man" \
 		--elispdir="${DATADIR}/emacs" --vimdir="${DATADIR}/vim" \
 		--docdir="${DOCSDIR}" --with-libiconv=${ICONV_PREFIX}
 CONFIGURE_TARGET=	${ARCH:S/amd64/x86_64/}-portbld-freebsd${OSREL}
 # Complaints if the environment changes between build stages.
 LDFLAGS+=	${LDFLAGS_${CHOSEN_COMPILER_TYPE}}
 LDFLAGS_gcc=	-lthr
 MAKE_ENV=	${CONFIGURE_ENV}
 BUILD_WRKSRC=	${WRKSRC}/src
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 MAKE_JOBS_UNSAFE=yes
 
 OPTIONS_DEFINE=	ASDF BDB CLX_MIT CLX_NEW DBUS FASTCGI GDBM GLIBC GTK2 \
 		JITC MATLAB NETICA ORACLE PARI PCRE PGSQL QUEENS RAWSOCK \
 		SVM THREADS ZLIB
 ASDF_DESC=	Another System Definition Facility
 BDB_DESC=	Interface to Berkeley DB from Sleepycat Software
 CLX_MIT_DESC=	Classical X11 Interface
 CLX_NEW_DESC=	Faster X11 Interface (replaces clx/mit-clx)
 DBUS_DESC=	Interface to the D-Bus message bus system
 FASTCGI_DESC=	FastCGI interface for web development
 GDBM_DESC=	Interface to GNU DBM
 GLIBC_DESC=	Interface to most of the GNU libc library
 GTK2_DESC=	Interface to the GTK library using glade
 JITC_DESC=	Use a given Just-In-Time Compiler
 SVM_DESC=	Support Vector Machine predictive analytics
 MATLAB_DESC=	Matrix calculations using Matlab
 NETICA_DESC=	Bayesian belief networks and influence diagrams
 ORACLE_DESC=	Oracle RDMBS interface
 PARI_DESC=	PARI Computer Algebra System
 PCRE_DESC=	Perl-compatible regular expressions
 PGSQL_DESC=	PostGreSQL RDMBS interface
 QUEENS_DESC=	The Queens Function (a toy example)
 RAWSOCK_DESC=	Low level socket interface
 THREADS_DESC=	Multithreaded Support (Experimental)
 ZLIB_DESC=	Compress vectors
 
 OPTIONS_RADIO=	CLX
 OPTIONS_RADIO_CLX=	CLX_MIT CLX_NEW
 CLX_DESC=	X11 Module Selection
 
 OPTIONS_DEFAULT=BDB RAWSOCK ZLIB
 
 SUB_FILES=	pkg-message
 
 .include <bsd.port.options.mk>
 
 # Segmentation fault in amd64 when using 'mmap(2)', errno = EINVAL.
 .if ${ARCH} == "amd64"
 CONFIGURE_ARGS+=--disable-mmap
 .endif
 
 MODULES=	ASDF BDB CLX_MIT CLX_NEW DBUS FASTCGI GDBM GLIBC GTK2 \
 		JITC MATLAB NETICA ORACLE PARI PCRE PGSQL QUEENS RAWSOCK \
 		SVM ZLIB
 
 .for mod in ${MODULES}
 .   if ${PORT_OPTIONS:M${mod}}
 PLIST_SUB+=	${mod}=""
 .   else
 PLIST_SUB+=	${mod}="@comment "
 .   endif
 .endfor
 
 .if ${PORT_OPTIONS:MASDF}
 CONFIGURE_ARGS+=--with-module=asdf
 .endif
 
 .if ${PORT_OPTIONS:MBDB}
 USES+=		bdb
 CONFIGURE_ARGS+=--with-module=berkeley-db
 CPPFLAGS+=	-I${LOCALBASE}/include/db${BDB_VER}
 LDFLAGS+=	-L${LOCALBASE}/lib/db${BDB_VER}
 .endif
 
 .if ${PORT_OPTIONS:MCLX_MIT} || ${PORT_OPTIONS:MCLX_NEW}
 USES+=		xorg
 USE_XORG=	x11
 .endif
 .if ${PORT_OPTIONS:MCLX_MIT}
 CONFIGURE_ARGS+=--with-module=clx/mit-clx
 .endif
 .if ${PORT_OPTIONS:MCLX_NEW}
 CONFIGURE_ARGS+=--with-module=clx/new-clx
 .endif
 
 .if ${PORT_OPTIONS:MDBUS}
 LIB_DEPENDS+=	libdbus-1.so:devel/dbus
 CONFIGURE_ARGS+=--with-module=dbus
 .endif
 
 .if ${PORT_OPTIONS:MFASTCGI}
 LIB_DEPENDS+=	libfcgi.so:www/fcgi
 CONFIGURE_ARGS+=--with-module=fastcgi
 .endif
 
 .if ${PORT_OPTIONS:MGDBM}
 LIB_DEPENDS+=	libgdbm.so:databases/gdbm
 CONFIGURE_ARGS+=--with-module=gdbm
 .endif
 
 .if ${PORT_OPTIONS:MGLIBC}
 USE_LINUX=	base
 CONFIGURE_ARGS+=--with-module=bindings/glibc
 .endif
 
 .if ${PORT_OPTIONS:MGTK2}
 USES+=		gnome
 USE_GNOME=	gtk20 libglade2
 CONFIGURE_ARGS+=--with-module=gtk2
 .endif
 
 .if ${PORT_OPTIONS:MJITC}
 BUILD_DEPENDS+=	${LOCALBASE}/include/lightning.h:devel/lightning
 LIB_DEPENDS+=	liblightning.so:devel/lightning
 CONFIGURE_ARGS+=--with-jitc=lightning
 .endif
 
 .if ${PORT_OPTIONS:MMATLAB}
 CONFIGURE_ARGS+=--with-module=matlab
 .endif
 
 .if ${PORT_OPTIONS:MNETICA}
 CONFIGURE_ARGS+=--with-module=netica
 .endif
 
 .if ${PORT_OPTIONS:MORACLE}
 CONFIGURE_ARGS+=--with-module=oracle
 .endif
 
 .if ${PORT_OPTIONS:MPARI}
 LIB_DEPENDS+=	libpari.so:math/pari
 CONFIGURE_ARGS+=--with-module=pari
 .endif
 
 .if ${PORT_OPTIONS:MPCRE}
 LIB_DEPENDS+=	libpcre.so:devel/pcre
 CONFIGURE_ARGS+=--with-module=pcre
 .endif
 
 .if ${PORT_OPTIONS:MPGSQL}
 USES+=		pgsql
 CONFIGURE_ARGS+=--with-module=postgresql
 .endif
 
 .if ${PORT_OPTIONS:MQUEENS}
 CONFIGURE_ARGS+=--with-module=queens
 .endif
 
 .if ${PORT_OPTIONS:MRAWSOCK}
 CONFIGURE_ARGS+=--with-module=rawsock
 .endif
 
 .if ${PORT_OPTIONS:MSVM}
 BUILD_DEPENDS+=	${LOCALBASE}/bin/svm-predict:science/libsvm
 CONFIGURE_ARGS+=--with-module=libsvm
 .endif
 
 .if ${PORT_OPTIONS:MTHREADS}
 CONFIGURE_ARGS+=--with-threads=POSIX_THREADS \
 		LDFLAGS="${PTHREAD_LIBS} ${LDFLAGS}"
 PKGNAMESUFFIX=	-threaded
 .endif
 
 .if ${PORT_OPTIONS:MZLIB}
 CONFIGURE_ARGS+=--with-module=zlib
 .endif
 
 post-patch:
 .if ${PORT_OPTIONS:MORACLE}
 	@${REINPLACE_CMD} -e 's|-ldl||; s|-lpthread|-lcompat ${PTHREAD_LIBS}|' \
 		${WRKSRC}/modules/oracle/link.sh.in
 .endif
 
 pre-install:
 .if ${PORT_OPTIONS:MCLX_MIT}
 	${CP} ${WRKSRC}/modules/clx/mit-clx/README.CLISP \
 		${WRKSRC}/src/clx/mit-clx/README.CLISP
 .endif
 
 post-install:
 	@${ECHO_CMD}; ${CAT} ${PKGMESSAGE}; ${ECHO_CMD}
 
 .include <bsd.port.mk>
diff --git a/lang/clojure-mode.el/Makefile b/lang/clojure-mode.el/Makefile
index 796294a19fe9..416d2acb3344 100644
--- a/lang/clojure-mode.el/Makefile
+++ b/lang/clojure-mode.el/Makefile
@@ -1,30 +1,30 @@
 PORTNAME=	clojure-mode.el
 PORTVERSION=	5.11.0
-PORTREVISION=	8
+PORTREVISION=	10
 PORTEPOCH=	1
 CATEGORIES=	lang elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Emacs lisp module for the Clojure language
 WWW=		https://github.com/clojure-emacs/clojure-mode
 
 LICENSE=	GPLv3+
 
 USES=		emacs
 USE_GITHUB=	yes
 GH_ACCOUNT=	clojure-emacs
 GH_PROJECT=	clojure-mode
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/clojure-mode.el \
 		${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}
 	${INSTALL_DATA} ${WRKSRC}/clojure-mode-extra-font-locking.el \
 		${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}
 	${INSTALL_DATA} ${WRKSRC}/test.clj \
 		${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}
 
 .include <bsd.port.mk>
diff --git a/lang/csharp-mode.el/Makefile b/lang/csharp-mode.el/Makefile
index 951e3c5e55e7..e800df939d3b 100644
--- a/lang/csharp-mode.el/Makefile
+++ b/lang/csharp-mode.el/Makefile
@@ -1,28 +1,28 @@
 PORTNAME=	csharp-mode.el
 PORTVERSION=	0.9.2
-PORTREVISION=	8
+PORTREVISION=	10
 DISTVERSIONPREFIX=	v
 CATEGORIES=	lang elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Emacs major mode for editing C\# source code
 WWW=		https://github.com/josteink/csharp-mode
 
 LICENSE=	GPLv2
 
 USES=		emacs
 USE_GITHUB=	yes
 GH_ACCOUNT=	josteink
 GH_PROJECT=	csharp-mode
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 PLIST_FILES=	${EMACS_SITE_LISPDIR}/csharp-mode.el
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/csharp-mode.el \
 		${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}
 
 .include <bsd.port.mk>
diff --git a/lang/dlang-tools/Makefile b/lang/dlang-tools/Makefile
index b576c6c0c87b..0578f18ca8ff 100644
--- a/lang/dlang-tools/Makefile
+++ b/lang/dlang-tools/Makefile
@@ -1,37 +1,37 @@
 PORTNAME=	tools
 PORTVERSION=	2.101.0
-PORTREVISION=	1
+PORTREVISION=	2
 DISTVERSIONPREFIX=	v
 CATEGORIES=	lang
 PKGNAMEPREFIX=	dlang-
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Ancillary tools for the D programming language compiler
 WWW=		https://github.com/dlang/tools
 
 LICENSE=	BSL
 
 BUILD_DEPENDS=	ldmd2:lang/ldc \
 		dub:devel/dub \
 		${LOCALBASE}/lib/d/libdparse.a:devel/libdparse
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	dlang
 
 LDC2_CMD=	${LOCALBASE}/bin/ldc2
 TOOLS_LIST=	catdoc changed checkwhitespace contributors ddemangle detab dget rdmd tolf
 
 do-build:
 .for f in ${TOOLS_LIST}
 	${LDC2_CMD} ${WRKSRC}/${f}.d -of=${WRKSRC}/${f}
 .endfor
 	cd ${WRKSRC}/DustMite && \
 		${LDC2_CMD} dustmite.d polyhash.d splitter.d -of=${WRKSRC}/dustmite
 
 do-install:
 .for f in ${TOOLS_LIST} dustmite
 	${INSTALL_PROGRAM} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/bin/
 .endfor
 	${INSTALL_MAN} ${WRKSRC}/man/man1/rdmd.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
 
 .include <bsd.port.mk>
diff --git a/lang/elixir-mode.el/Makefile b/lang/elixir-mode.el/Makefile
index e1c0e3f4ef0c..75194f725397 100644
--- a/lang/elixir-mode.el/Makefile
+++ b/lang/elixir-mode.el/Makefile
@@ -1,32 +1,32 @@
 PORTNAME=	elixir-mode.el
 DISTVERSIONPREFIX=	v
 PORTVERSION=	2.3.1
-PORTREVISION=	11
+PORTREVISION=	13
 CATEGORIES=	lang
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	erlang@FreeBSD.org
 COMMENT=	Emacs major mode for Elixir
 WWW=		https://github.com/elixir-lang/emacs-elixir
 
 LICENSE=	GPLv3
 
 USES=		emacs
 USE_GITHUB=	yes
 GH_ACCOUNT=	elixir-lang
 GH_PROJECT=	emacs-elixir
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 OPTIONS_DEFINE=	DOCS
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}
 	${INSTALL_DATA} ${WRKSRC}/*.el ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/*.md ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/lang/gambit-c/Makefile b/lang/gambit-c/Makefile
index a40d54f30def..60dcede9c3e5 100644
--- a/lang/gambit-c/Makefile
+++ b/lang/gambit-c/Makefile
@@ -1,53 +1,53 @@
 PORTNAME=	gambit-c
 PORTVERSION=	4.9.4
 DISTVERSIONPREFIX=	v
-PORTREVISION=	0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	lang
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Gambit programming system where the compiler generates portable C code
 WWW=		https://www.iro.umontreal.ca/~gambit/
 
 LICENSE=	APACHE20 LGPL21
 LICENSE_COMB=	dual
 
 USES=		compiler gmake
 USE_GITHUB=	yes
 GH_ACCOUNT=	gambit
 GH_PROJECT=	gambit
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-single-host \
 		--enable-gcc-opts \
 		--docdir=${DOCSDIR} \
 		--includedir=${PREFIX}/include/gambit-c \
 		--libdir=${PREFIX}/lib/gambit-c \
 		--enable-compiler-name=gsc-gambit \
 		--enable-interpreter-name=gsi-gambit
 MAKEFILE=	makefile
 USE_LDCONFIG=	${PREFIX}/lib/gambit-c
 
 INFO=		gambit
 
 OPTIONS_DEFINE=	DOCS GCC
 OPTIONS_DEFAULT=GCC
 
 GCC_DESC=	Build with GCC from ports
 
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MGCC}
 USE_GCC=	yes
 .endif
 
 post-patch:
 .for i in makefile.in gsc/makefile.in gsi/makefile.in lib/makefile.in
 	@${REINPLACE_CMD} -e \
 		's|^\(FLAGS_OBJ = \).*|\1 ${CFLAGS}| ; \
 		 s|^\(FLAGS_DYN = \).*|\1 ${CFLAGS}|' ${WRKSRC}/${i}
 .endfor
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/gs[ci]-gambit
 
 .include <bsd.port.post.mk>
diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile
index 32af0f83a21a..c05ae285bb96 100644
--- a/lang/gcc/Makefile
+++ b/lang/gcc/Makefile
@@ -1,30 +1,30 @@
 PORTNAME=	gcc
 PORTVERSION=	${GCC_DEFAULT}
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	lang
 MASTER_SITES=	# not applicable
 DISTFILES=	# not applicable
 
 MAINTAINER=	gerald@FreeBSD.org
 COMMENT=	Meta-port for the default version of the GNU Compiler Collection
 WWW=		https://gcc.gnu.org
 
 # Once GCC 4.8 isn't an option any longer, we can simply use GCC_DEFAULT
 # below. (The expression rewrites 4.8 to 48.)
 RUN_DEPENDS=	gcc${GCC_DEFAULT:S/.//}:lang/gcc${GCC_DEFAULT:S/.//}
 
 USES=		cpe
 CPE_VENDOR=	gnu
 CPE_VERSION=	${GCC_DEFAULT}
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 PLIST_FILES=	bin/g++ bin/gcc bin/gfortran
 
 do-install:
 .for c in gfortran g++ gcc
 	    ${LN} -s ${c}${GCC_DEFAULT} ${STAGEDIR}${PREFIX}/bin/${c}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/lang/gcc10/Makefile b/lang/gcc10/Makefile
index 7882aa8a0dc6..a8fa53b04cba 100644
--- a/lang/gcc10/Makefile
+++ b/lang/gcc10/Makefile
@@ -1,155 +1,156 @@
 PORTNAME=	gcc
 PORTVERSION=	10.4.0
+PORTREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	GCC
 PKGNAMESUFFIX=	${SUFFIX}
 
 MAINTAINER=	salvadore@FreeBSD.org
 COMMENT=	GNU Compiler Collection 10
 WWW=		https://gcc.gnu.org
 
 LICENSE=	GPLv3 GPLv3RLE
 LICENSE_COMB=	multi
 
 ONLY_FOR_ARCHS=	aarch64 amd64 arm armv6 armv7 i386 powerpc powerpc64 powerpc64le
 
 LIB_DEPENDS=	libgmp.so:math/gmp \
 		libmpfr.so:math/mpfr \
 		libmpc.so:math/mpc
 BUILD_DEPENDS+=	${LOCALBASE}/bin/as:devel/binutils
 RUN_DEPENDS+=	${LOCALBASE}/bin/as:devel/binutils
 .if defined(MAINTAINER_MODE)
 BUILD_DEPENDS+=	runtest:misc/dejagnu
 .endif
 
 USES=		compiler cpe gmake iconv libtool makeinfo perl5 tar:xz
 USE_BINUTILS=	yes
 USE_PERL5=	build
 
 CONFLICTS=	gcc10-devel
 
 CPE_VENDOR=	gnu
 
 GCC_VERSION=	${PORTVERSION}
 SUFFIX=		${PORTVERSION:C/([0-9]+).*/\1/}
 CFLAGS:=	${CFLAGS:N-mretpoline}
 CXXFLAGS:=	${CXXFLAGS:N-mretpoline}
 
 OPTIONS_DEFINE=		BOOTSTRAP GRAPHITE
 OPTIONS_DEFAULT=	BOOTSTRAP
 BOOTSTRAP_DESC=		Build using a full bootstrap
 GRAPHITE_DESC=		Support for Graphite loop optimizations
 
 .if exists(/usr/lib32/libc.so)
 OPTIONS_DEFINE_amd64+=		MULTILIB
 OPTIONS_DEFAULT_amd64+=	MULTILIB
 OPTIONS_DEFINE_powerpc64+=	MULTILIB
 #OPTIONS_DEFAULT_powerpc64+=	MULTILIB # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105010
 MULTILIB_DESC=		Build support for 32-bit and 64-bit targets
 MULTILIB_CONFIGURE_ENABLE=	multilib
 .else
 CONFIGURE_ARGS+=	--disable-multilib
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == amd64
 CONFIGURE_TARGET=	x86_64-portbld-${OPSYS:tl}${OSREL}
 
 .elif ${ARCH} == powerpc64
 CONFIGURE_ENV+=	UNAME_m="powerpc64"
 . if defined(PPC_ABI) && ${PPC_ABI} == ELFv2
 CONFIGURE_ARGS+=	--with-abi=elfv2
 . else
 USE_GCC=	9
 . endif
 .endif
 
 LANGUAGES:=	c,c++,objc,fortran
 TARGLIB=	${PREFIX}/lib/gcc${SUFFIX}
 TARGLIB32=	${PREFIX}/lib32	# The version information is added later
 LIBEXEC=	${PREFIX}/libexec/gcc${SUFFIX}
 GNU_CONFIGURE=	yes
 CONFIGURE_OUTSOURCE=	yes
 .if empty(PORT_OPTIONS:MBOOTSTRAP)
 CONFIGURE_ARGS+=--disable-bootstrap
 .else
 CONFIGURE_ARGS+=--with-build-config=bootstrap-debug
 ALL_TARGET=	bootstrap-lean
 PIE_UNSAFE=    yes
 .endif
 INSTALL_TARGET=	install-strip
 .if ${UID} != 0
 BINMODE=	755
 .endif
 CONFIGURE_ARGS+=--disable-nls \
 		--enable-gnu-indirect-function \
 		--enable-plugin \
 		--libdir=${TARGLIB} \
 		--libexecdir=${LIBEXEC} \
 		--program-suffix=${SUFFIX} \
 		--with-as=${LOCALBASE}/bin/as \
 		--with-gmp=${LOCALBASE} \
 		--with-gxx-include-dir=${TARGLIB}/include/c++/ \
 		--with-ld=${LOCALBASE}/bin/ld \
 		${ICONV_CONFIGURE_ARG} \
 		--with-pkgversion="FreeBSD Ports Collection" \
 		--with-system-zlib \
 		--without-zstd
 MAKE_ARGS+=	MAKEINFOFLAGS="--no-split"
 USE_LDCONFIG=	${TARGLIB}
 PLIST_SUB+=	GCC_VERSION=${GCC_VERSION} \
 		GNU_HOST=${CONFIGURE_TARGET} \
 		SUFFIX=${SUFFIX}
 INFO=		gcc${SUFFIX}/cpp \
 		gcc${SUFFIX}/cppinternals \
 		gcc${SUFFIX}/gcc \
 		gcc${SUFFIX}/gccinstall \
 		gcc${SUFFIX}/gccint \
 		gcc${SUFFIX}/gfortran \
 		gcc${SUFFIX}/libgomp
 # Release tarballs (as opposed to snapshots) always carry this.
 INFO+=		gcc${SUFFIX}/libquadmath \
 		gcc${SUFFIX}/libitm
 SUB_FILES=	pkg-message
 SUB_LIST+=	TARGLIB=${TARGLIB}
 
 .if ${PORT_OPTIONS:MGRAPHITE}
 LIB_DEPENDS+=	libisl.so:devel/isl
 CONFIGURE_ARGS+=--with-isl=${LOCALBASE}
 .endif
 
 CONFIGURE_ARGS+=--enable-languages=${LANGUAGES}
 
 pre-everything::
 	@${ECHO_MSG} "Making GCC ${PORTVERSION} for ${CONFIGURE_TARGET} [${LANGUAGES}]"
 
 pre-configure:
 	cd ${WRKSRC} ; contrib/gcc_update --touch
 	@${RM} ${WRKSRC}/gcc/*/*.info*
 
 .if defined(MAINTAINER_MODE)
 full-regression-test: build
 	cd ${TEST_WRKSRC}; ${MAKE_CMD} -sk check \
 	; ${WRKSRC}/contrib/test_summary
 .endif
 
 post-stage:
 	${RM} ${STAGEDIR}${PREFIX}/man/man7/*
 	${RM} -r ${STAGEDIR}${TARGLIB}/gcc/*/${GCC_VERSION}/include-fixed/
 	# Add target libraries and include files to packaging list.
 	${RM} ${WRKDIR}/PLIST.lib
 
 .if (${ARCH} == amd64 || ${ARCH} == powerpc64) && ${PORT_OPTIONS:MMULTILIB}
 	${MKDIR} ${STAGEDIR}${TARGLIB32}
 	${MV} ${STAGEDIR}${PREFIX}/lib/lib32 ${STAGEDIR}${TARGLIB32}/gcc${SUFFIX}
 .endif
 
 .for d in ${TARGLIB:S/^${PREFIX}\///} ${TARGLIB32:S/^${PREFIX}\///} ${LIBEXEC:S/^${PREFIX}\///}
 	cd ${STAGEDIR}${PREFIX} ; if [ -d $d ]; then \
 	    ${FIND} $d -type f -o -type l >>${WRKDIR}/PLIST.lib ;\
 	fi
 .endfor
 	cd ${WRKDIR} ; ${SED} -i -e "/PLIST.lib/ r PLIST.lib" ${TMPPLIST}
 
 .include <bsd.port.post.mk>
diff --git a/lang/gcc11-devel/Makefile b/lang/gcc11-devel/Makefile
index cd2376387387..66a873edbb5d 100644
--- a/lang/gcc11-devel/Makefile
+++ b/lang/gcc11-devel/Makefile
@@ -1,174 +1,175 @@
 PORTNAME=	gcc
 PORTVERSION=	11.3.1.s20230420
+PORTREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	GCC/snapshots/${DIST_VERSION}
 PKGNAMESUFFIX=	${SUFFIX}-devel
 DISTNAME=	gcc-${DIST_VERSION}
 
 MAINTAINER=	salvadore@FreeBSD.org
 COMMENT=	GNU Compiler Collection 11
 WWW=		https://gcc.gnu.org
 
 LICENSE=	GPLv3 GPLv3RLE
 LICENSE_COMB=	multi
 
 ONLY_FOR_ARCHS=	aarch64 amd64 arm armv6 armv7 i386 powerpc powerpc64 powerpc64le
 
 LIB_DEPENDS=	libgmp.so:math/gmp \
 		libmpfr.so:math/mpfr \
 		libmpc.so:math/mpc
 BUILD_DEPENDS+=	${LOCALBASE}/bin/as:devel/binutils
 RUN_DEPENDS+=	${LOCALBASE}/bin/as:devel/binutils
 .if defined(MAINTAINER_MODE)
 BUILD_DEPENDS+=	runtest:misc/dejagnu
 .endif
 
 USES=		compiler:c++11-lang cpe gmake iconv libtool makeinfo perl5 tar:xz
 USE_BINUTILS=	yes
 USE_PERL5=	build
 
 CONFLICTS=	gcc11
 
 CPE_VENDOR=	gnu
 CPE_VERSION=	${GCC_VERSION}
 
 # DIST_VERSION relates to downloads, GCC_VERSION and SUFFIX to names
 # of executables and directories once installed.  A PORTVERSION of
 # Y.2.1.s20140817 results in values of Y-20140817, Y.2.1, and Y
 # for these three.
 DIST_VERSION=	${PORTVERSION:C/([0-9]+).*\.s([0-9]+)/\1-\2/}
 GCC_VERSION=	${PORTVERSION:C/(.+)\.s[0-9]{8}/\1/}
 SUFFIX=		${PORTVERSION:C/([0-9]+).*/\1/}
 CFLAGS:=	${CFLAGS:N-mretpoline}
 CXXFLAGS:=	${CXXFLAGS:N-mretpoline}
 
 OPTIONS_DEFINE=		GRAPHITE
 OPTIONS_DEFAULT_aarch64=LTO_BOOTSTRAP
 OPTIONS_DEFAULT_amd64=	LTO_BOOTSTRAP
 OPTIONS_DEFAULT_i386=	LTO_BOOTSTRAP
 OPTIONS_DEFAULT_powerpc=LTO_BOOTSTRAP
 OPTIONS_DEFAULT_powerpc64=LTO_BOOTSTRAP
 OPTIONS_DEFAULT_powerpc64le=LTO_BOOTSTRAP
 OPTIONS_RADIO=	BOOTSTRAP
 OPTIONS_RADIO_BOOTSTRAP=	LTO_BOOTSTRAP STANDARD_BOOTSTRAP
 LTO_BOOTSTRAP_DESC=	Build using a full LTO bootstrap
 STANDARD_BOOTSTRAP_DESC=	Build using a full bootstrap without LTO
 GRAPHITE_DESC=		Support for Graphite loop optimizations
 
 .if exists(/usr/lib32/libc.so)
 OPTIONS_DEFINE_amd64+=		MULTILIB
 OPTIONS_DEFAULT_amd64+=	MULTILIB
 OPTIONS_DEFINE_powerpc64+=	MULTILIB
 #OPTIONS_DEFAULT_powerpc64+=	MULTILIB # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105010
 MULTILIB_DESC=		Build support for 32-bit and 64-bit targets
 MULTILIB_CONFIGURE_ENABLE=	multilib
 .else
 CONFIGURE_ARGS+=	--disable-multilib
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == amd64
 CONFIGURE_TARGET=	x86_64-portbld-${OPSYS:tl}${OSREL}
 
 .elif defined(PPC_ABI) && ${PPC_ABI} == ELFv2
 CONFIGURE_ARGS+=	--with-abi=elfv2
 .endif
 
 LANGUAGES:=	c,c++,d,objc,fortran,jit
 TARGLIB=	${PREFIX}/lib/gcc${SUFFIX}
 TARGLIB32=	${PREFIX}/lib32	# The version information is added later
 LIBEXEC=	${PREFIX}/libexec/gcc${SUFFIX}
 GNU_CONFIGURE=	yes
 CONFIGURE_OUTSOURCE=	yes
 .if empty(PORT_OPTIONS:M*BOOTSTRAP)
 CONFIGURE_ARGS+=--disable-bootstrap
 .elif ${PORT_OPTIONS:MLTO_BOOTSTRAP}
 CONFIGURE_ARGS+=--with-build-config=bootstrap-lto-noplugin
 ALL_TARGET=	bootstrap-lean
 PIE_UNSAFE=	yes
 .else
 CONFIGURE_ARGS+=--with-build-config=bootstrap-debug
 ALL_TARGET=	bootstrap-lean
 PIE_UNSAFE=	yes
 .endif
 INSTALL_TARGET=	install-strip
 .if ${UID} != 0
 BINMODE=	755
 .endif
 CONFIGURE_ARGS+=--disable-nls \
 		--enable-gnu-indirect-function \
 		--enable-host-shared \
 		--enable-plugin \
 		--libdir=${TARGLIB} \
 		--libexecdir=${LIBEXEC} \
 		--program-suffix=${SUFFIX} \
 		--with-as=${LOCALBASE}/bin/as \
 		--with-gmp=${LOCALBASE} \
 		--with-gxx-include-dir=${TARGLIB}/include/c++/ \
 		--with-gxx-libcxx-include-dir=/usr/include/c++/v1 \
 		--with-ld=${LOCALBASE}/bin/ld \
 		${ICONV_CONFIGURE_ARG} \
 		--with-pkgversion="FreeBSD Ports Collection" \
 		--with-system-zlib \
 		--without-zstd
 MAKE_ARGS+=	MAKEINFOFLAGS="--no-split"
 USE_LDCONFIG=	${TARGLIB}
 PLIST_SUB+=	GCC_VERSION=${GCC_VERSION} \
 		GNU_HOST=${CONFIGURE_TARGET} \
 		SUFFIX=${SUFFIX}
 INFO=		gcc${SUFFIX}/cpp \
 		gcc${SUFFIX}/cppinternals \
 		gcc${SUFFIX}/gcc \
 		gcc${SUFFIX}/gccinstall \
 		gcc${SUFFIX}/gccint \
 		gcc${SUFFIX}/gdc \
 		gcc${SUFFIX}/gfortran \
 		gcc${SUFFIX}/libgccjit \
 		gcc${SUFFIX}/libgomp
 .if ${ARCH} == amd64 || ${ARCH} == i386
 INFO+=		gcc${SUFFIX}/libquadmath \
 		gcc${SUFFIX}/libitm
 .endif
 SUB_FILES=	pkg-message
 SUB_LIST+=	TARGLIB=${TARGLIB}
 
 .if ${PORT_OPTIONS:MGRAPHITE}
 LIB_DEPENDS+=	libisl.so:devel/isl
 CONFIGURE_ARGS+=--with-isl=${LOCALBASE}
 .endif
 
 CONFIGURE_ARGS+=--enable-languages=${LANGUAGES}
 
 pre-everything::
 	@${ECHO_MSG} "Making GCC ${PORTVERSION} for ${CONFIGURE_TARGET} [${LANGUAGES}]"
 
 pre-configure:
 	cd ${WRKSRC} ; contrib/gcc_update --touch
 	@${RM} ${WRKSRC}/gcc/*/*.info*
 
 .if defined(MAINTAINER_MODE)
 full-regression-test: build
 	cd ${TEST_WRKSRC}; ${MAKE_CMD} -sk check \
 	; ${WRKSRC}/contrib/test_summary
 .endif
 
 post-stage:
 	${RM} ${STAGEDIR}${PREFIX}/man/man7/*
 	${RM} -r ${STAGEDIR}${TARGLIB}/gcc/*/${GCC_VERSION}/include-fixed/
 	# Add target libraries and include files to packaging list.
 	${RM} ${WRKDIR}/PLIST.lib
 
 .if (${ARCH} == amd64 || ${ARCH} == powerpc64) && ${PORT_OPTIONS:MMULTILIB}
 	${MKDIR} ${STAGEDIR}${TARGLIB32}
 	${MV} ${STAGEDIR}${PREFIX}/lib/lib32 ${STAGEDIR}${TARGLIB32}/gcc${SUFFIX}
 .endif
 
 .for d in ${TARGLIB:S/^${PREFIX}\///} ${TARGLIB32:S/^${PREFIX}\///} ${LIBEXEC:S/^${PREFIX}\///}
 	cd ${STAGEDIR}${PREFIX} ; if [ -d $d ]; then \
 	    ${FIND} $d -type f -o -type l >>${WRKDIR}/PLIST.lib ;\
 	fi
 .endfor
 	cd ${WRKDIR} ; ${SED} -i -e "/PLIST.lib/ r PLIST.lib" ${TMPPLIST}
 
 .include <bsd.port.post.mk>
diff --git a/lang/gcc11/Makefile b/lang/gcc11/Makefile
index ab6d3d08bd34..7b184ec951bf 100644
--- a/lang/gcc11/Makefile
+++ b/lang/gcc11/Makefile
@@ -1,167 +1,167 @@
 PORTNAME=	gcc
 PORTVERSION=	11.3.0
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	lang
 MASTER_SITES=	GCC
 PKGNAMESUFFIX=	${SUFFIX}
 
 MAINTAINER=	salvadore@FreeBSD.org
 COMMENT=	GNU Compiler Collection 11
 WWW=		https://gcc.gnu.org
 
 LICENSE=	GPLv3 GPLv3RLE
 LICENSE_COMB=	multi
 
 ONLY_FOR_ARCHS=	aarch64 amd64 arm armv6 armv7 i386 powerpc powerpc64 powerpc64le
 
 LIB_DEPENDS=	libgmp.so:math/gmp \
 		libmpfr.so:math/mpfr \
 		libmpc.so:math/mpc
 BUILD_DEPENDS+=	${LOCALBASE}/bin/as:devel/binutils
 RUN_DEPENDS+=	${LOCALBASE}/bin/as:devel/binutils
 .if defined(MAINTAINER_MODE)
 BUILD_DEPENDS+=	runtest:misc/dejagnu
 .endif
 
 USES=		compiler:c++11-lang cpe gmake iconv libtool makeinfo perl5 tar:xz
 USE_BINUTILS=	yes
 USE_PERL5=	build
 
 CONFLICTS=	gcc11-devel
 
 CPE_VENDOR=	gnu
 
 GCC_VERSION=	${PORTVERSION}
 SUFFIX=		${PORTVERSION:C/([0-9]+).*/\1/}
 CFLAGS:=	${CFLAGS:N-mretpoline}
 CXXFLAGS:=	${CXXFLAGS:N-mretpoline}
 
 OPTIONS_DEFINE=		GRAPHITE
 GRAPHITE_DESC=		Support for Graphite loop optimizations
 OPTIONS_DEFAULT_aarch64=LTO_BOOTSTRAP
 OPTIONS_DEFAULT_amd64=	LTO_BOOTSTRAP
 OPTIONS_DEFAULT_i386=	LTO_BOOTSTRAP
 OPTIONS_DEFAULT_powerpc=LTO_BOOTSTRAP
 OPTIONS_DEFAULT_powerpc64=LTO_BOOTSTRAP
 OPTIONS_DEFAULT_powerpc64le=LTO_BOOTSTRAP
 OPTIONS_RADIO=	BOOTSTRAP
 OPTIONS_RADIO_BOOTSTRAP=	LTO_BOOTSTRAP STANDARD_BOOTSTRAP
 LTO_BOOTSTRAP_DESC=	Build using a full LTO bootstrap
 STANDARD_BOOTSTRAP_DESC=	Build using a full bootstrap without LTO
 
 .if exists(/usr/lib32/libc.so)
 OPTIONS_DEFINE_amd64+=		MULTILIB
 OPTIONS_DEFAULT_amd64+=	MULTILIB
 OPTIONS_DEFINE_powerpc64+=	MULTILIB
 OPTIONS_DEFAULT_powerpc64+=	MULTILIB
 MULTILIB_DESC=		Build support for 32-bit and 64-bit targets
 MULTILIB_CONFIGURE_ENABLE=	multilib
 .else
 CONFIGURE_ARGS+=	--disable-multilib
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == amd64
 CONFIGURE_TARGET=	x86_64-portbld-${OPSYS:tl}${OSREL}
 
 .elif defined(PPC_ABI) && ${PPC_ABI} == ELFv2
 CONFIGURE_ARGS+=	--with-abi=elfv2
 .endif
 
 LANGUAGES:=	c,c++,d,objc,fortran,jit
 TARGLIB=	${PREFIX}/lib/gcc${SUFFIX}
 TARGLIB32=	${PREFIX}/lib32	# The version information is added later
 LIBEXEC=	${PREFIX}/libexec/gcc${SUFFIX}
 GNU_CONFIGURE=	yes
 CONFIGURE_OUTSOURCE=	yes
 .if empty(PORT_OPTIONS:M*BOOTSTRAP)
 CONFIGURE_ARGS+=--disable-bootstrap
 .elif ${PORT_OPTIONS:MLTO_BOOTSTRAP}
 CONFIGURE_ARGS+=--with-build-config=bootstrap-lto-noplugin
 ALL_TARGET=	bootstrap-lean
 PIE_UNSAFE=	yes
 .else
 CONFIGURE_ARGS+=--with-build-config=bootstrap-debug
 ALL_TARGET=	bootstrap-lean
 PIE_UNSAFE=	yes
 .endif
 INSTALL_TARGET=	install-strip
 .if ${UID} != 0
 BINMODE=	755
 .endif
 CONFIGURE_ARGS+=--disable-nls \
 		--enable-gnu-indirect-function \
 		--enable-host-shared \
 		--enable-plugin \
 		--libdir=${TARGLIB} \
 		--libexecdir=${LIBEXEC} \
 		--program-suffix=${SUFFIX} \
 		--with-as=${LOCALBASE}/bin/as \
 		--with-gmp=${LOCALBASE} \
 		--with-gxx-include-dir=${TARGLIB}/include/c++/ \
 		--with-gxx-libcxx-include-dir=/usr/include/c++/v1 \
 		--with-ld=${LOCALBASE}/bin/ld \
 		${ICONV_CONFIGURE_ARG} \
 		--with-pkgversion="FreeBSD Ports Collection" \
 		--with-system-zlib \
 		--without-zstd
 MAKE_ARGS+=	MAKEINFOFLAGS="--no-split"
 USE_LDCONFIG=	${TARGLIB}
 PLIST_SUB+=	GCC_VERSION=${GCC_VERSION} \
 		GNU_HOST=${CONFIGURE_TARGET} \
 		SUFFIX=${SUFFIX}
 INFO=		gcc${SUFFIX}/cpp \
 		gcc${SUFFIX}/cppinternals \
 		gcc${SUFFIX}/gcc \
 		gcc${SUFFIX}/gccinstall \
 		gcc${SUFFIX}/gccint \
 		gcc${SUFFIX}/gdc \
 		gcc${SUFFIX}/gfortran \
 		gcc${SUFFIX}/libgccjit \
 		gcc${SUFFIX}/libgomp
 # Release tarballs (as opposed to snapshots) always carry this.
 INFO+=		gcc${SUFFIX}/libquadmath \
 		gcc${SUFFIX}/libitm
 SUB_FILES=	pkg-message
 SUB_LIST+=	TARGLIB=${TARGLIB}
 
 .if ${PORT_OPTIONS:MGRAPHITE}
 LIB_DEPENDS+=	libisl.so:devel/isl
 CONFIGURE_ARGS+=--with-isl=${LOCALBASE}
 .endif
 
 CONFIGURE_ARGS+=--enable-languages=${LANGUAGES}
 
 pre-everything::
 	@${ECHO_MSG} "Making GCC ${PORTVERSION} for ${CONFIGURE_TARGET} [${LANGUAGES}]"
 
 pre-configure:
 	cd ${WRKSRC} ; contrib/gcc_update --touch
 	@${RM} ${WRKSRC}/gcc/*/*.info*
 
 .if defined(MAINTAINER_MODE)
 full-regression-test: build
 	cd ${TEST_WRKSRC}; ${MAKE_CMD} -sk check \
 	; ${WRKSRC}/contrib/test_summary
 .endif
 
 post-stage:
 	${RM} ${STAGEDIR}${PREFIX}/man/man7/*
 	${RM} -r ${STAGEDIR}${TARGLIB}/gcc/*/${GCC_VERSION}/include-fixed/
 	# Add target libraries and include files to packaging list.
 	${RM} ${WRKDIR}/PLIST.lib
 
 .if (${ARCH} == amd64 || ${ARCH} == powerpc64) && ${PORT_OPTIONS:MMULTILIB}
 	${MKDIR} ${STAGEDIR}${TARGLIB32}
 	${MV} ${STAGEDIR}${PREFIX}/lib/lib32 ${STAGEDIR}${TARGLIB32}/gcc${SUFFIX}
 .endif
 
 .for d in ${TARGLIB:S/^${PREFIX}\///} ${TARGLIB32:S/^${PREFIX}\///} ${LIBEXEC:S/^${PREFIX}\///}
 	cd ${STAGEDIR}${PREFIX} ; if [ -d $d ]; then \
 	    ${FIND} $d -type f -o -type l >>${WRKDIR}/PLIST.lib ;\
 	fi
 .endfor
 	cd ${WRKDIR} ; ${SED} -i -e "/PLIST.lib/ r PLIST.lib" ${TMPPLIST}
 
 .include <bsd.port.post.mk>
diff --git a/lang/gcc12-devel/Makefile b/lang/gcc12-devel/Makefile
index edc59d222dc4..980fa71fd20c 100644
--- a/lang/gcc12-devel/Makefile
+++ b/lang/gcc12-devel/Makefile
@@ -1,174 +1,175 @@
 PORTNAME=	gcc
 PORTVERSION=	12.2.1.s20230421
+PORTREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	GCC/snapshots/${DIST_VERSION}
 PKGNAMESUFFIX=	${SUFFIX}-devel
 DISTNAME=	gcc-${DIST_VERSION}
 
 MAINTAINER=	salvadore@FreeBSD.org
 COMMENT=	GNU Compiler Collection 12
 WWW=		https://gcc.gnu.org
 
 LICENSE=	GPLv3 GPLv3RLE
 LICENSE_COMB=	multi
 
 ONLY_FOR_ARCHS=	aarch64 amd64 arm armv6 armv7 i386 powerpc powerpc64 powerpc64le
 
 LIB_DEPENDS=	libgmp.so:math/gmp \
 		libmpfr.so:math/mpfr \
 		libmpc.so:math/mpc
 BUILD_DEPENDS+=	${LOCALBASE}/bin/as:devel/binutils
 RUN_DEPENDS+=	${LOCALBASE}/bin/as:devel/binutils
 .if defined(MAINTAINER_MODE)
 BUILD_DEPENDS+=	runtest:misc/dejagnu
 .endif
 
 USES=		compiler:c++11-lang cpe gmake iconv libtool makeinfo perl5 tar:xz
 USE_BINUTILS=	yes
 USE_PERL5=	build
 
 CONFLICTS=	gcc12
 
 CPE_VENDOR=	gnu
 CPE_VERSION=	${GCC_VERSION}
 
 # DIST_VERSION relates to downloads, GCC_VERSION and SUFFIX to names
 # of executables and directories once installed.  A PORTVERSION of
 # Y.2.1.s20140817 results in values of Y-20140817, Y.2.1, and Y
 # for these three.
 DIST_VERSION=	${PORTVERSION:C/([0-9]+).*\.s([0-9]+)/\1-\2/}
 GCC_VERSION=	${PORTVERSION:C/(.+)\.s[0-9]{8}/\1/}
 SUFFIX=		${PORTVERSION:C/([0-9]+).*/\1/}
 CFLAGS:=	${CFLAGS:N-mretpoline}
 CXXFLAGS:=	${CXXFLAGS:N-mretpoline}
 
 OPTIONS_DEFINE=		GRAPHITE
 OPTIONS_DEFAULT_aarch64=LTO_BOOTSTRAP
 OPTIONS_DEFAULT_amd64=	LTO_BOOTSTRAP
 OPTIONS_DEFAULT_i386=	LTO_BOOTSTRAP
 OPTIONS_DEFAULT_powerpc=LTO_BOOTSTRAP
 OPTIONS_DEFAULT_powerpc64=LTO_BOOTSTRAP
 OPTIONS_DEFAULT_powerpc64le=LTO_BOOTSTRAP
 OPTIONS_RADIO=	BOOTSTRAP
 OPTIONS_RADIO_BOOTSTRAP=	LTO_BOOTSTRAP STANDARD_BOOTSTRAP
 LTO_BOOTSTRAP_DESC=	Build using a full LTO bootstrap
 STANDARD_BOOTSTRAP_DESC=	Build using a full bootstrap without LTO
 GRAPHITE_DESC=		Support for Graphite loop optimizations
 
 .if exists(/usr/lib32/libc.so)
 OPTIONS_DEFINE_amd64+=		MULTILIB
 OPTIONS_DEFAULT_amd64+=	MULTILIB
 OPTIONS_DEFINE_powerpc64+=	MULTILIB
 #OPTIONS_DEFAULT_powerpc64+=	MULTILIB # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105010
 MULTILIB_DESC=		Build support for 32-bit and 64-bit targets
 MULTILIB_CONFIGURE_ENABLE=	multilib
 .else
 CONFIGURE_ARGS+=	--disable-multilib
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == amd64
 CONFIGURE_TARGET=	x86_64-portbld-${OPSYS:tl}${OSREL}
 
 .elif defined(PPC_ABI) && ${PPC_ABI} == ELFv2
 CONFIGURE_ARGS+=	--with-abi=elfv2
 
 .endif
 
 LANGUAGES:=	c,c++,objc,fortran,jit
 TARGLIB=	${PREFIX}/lib/gcc${SUFFIX}
 TARGLIB32=	${PREFIX}/lib32	# The version information is added later
 LIBEXEC=	${PREFIX}/libexec/gcc${SUFFIX}
 GNU_CONFIGURE=	yes
 CONFIGURE_OUTSOURCE=	yes
 .if empty(PORT_OPTIONS:M*BOOTSTRAP)
 CONFIGURE_ARGS+=--disable-bootstrap
 .elif ${PORT_OPTIONS:MLTO_BOOTSTRAP}
 CONFIGURE_ARGS+=--with-build-config=bootstrap-lto-noplugin
 ALL_TARGET=	bootstrap-lean
 PIE_UNSAFE=	yes
 .else
 CONFIGURE_ARGS+=--with-build-config=bootstrap-debug
 ALL_TARGET=	bootstrap-lean
 PIE_UNSAFE=	yes
 .endif
 INSTALL_TARGET=	install-strip
 .if ${UID} != 0
 BINMODE=	755
 .endif
 CONFIGURE_ARGS+=--disable-nls \
 		--enable-gnu-indirect-function \
 		--enable-host-shared \
 		--enable-plugin \
 		--libdir=${TARGLIB} \
 		--libexecdir=${LIBEXEC} \
 		--program-suffix=${SUFFIX} \
 		--with-as=${LOCALBASE}/bin/as \
 		--with-gmp=${LOCALBASE} \
 		--with-gxx-include-dir=${TARGLIB}/include/c++/ \
 		--with-gxx-libcxx-include-dir=/usr/include/c++/v1 \
 		--with-ld=${LOCALBASE}/bin/ld \
 		${ICONV_CONFIGURE_ARG} \
 		--with-pkgversion="FreeBSD Ports Collection" \
 		--with-system-zlib \
 		--without-zstd
 MAKE_ARGS+=	MAKEINFOFLAGS="--no-split"
 USE_LDCONFIG=	${TARGLIB}
 PLIST_SUB+=	GCC_VERSION=${GCC_VERSION} \
 		GNU_HOST=${CONFIGURE_TARGET} \
 		SUFFIX=${SUFFIX}
 INFO=		gcc${SUFFIX}/cpp \
 		gcc${SUFFIX}/cppinternals \
 		gcc${SUFFIX}/gcc \
 		gcc${SUFFIX}/gccinstall \
 		gcc${SUFFIX}/gccint \
 		gcc${SUFFIX}/gfortran \
 		gcc${SUFFIX}/libgccjit \
 		gcc${SUFFIX}/libgomp
 .if ${ARCH} == amd64 || ${ARCH} == i386
 INFO+=		gcc${SUFFIX}/libquadmath \
 		gcc${SUFFIX}/libitm
 .endif
 SUB_FILES=	pkg-message
 SUB_LIST+=	TARGLIB=${TARGLIB}
 
 .if ${PORT_OPTIONS:MGRAPHITE}
 LIB_DEPENDS+=	libisl.so:devel/isl
 CONFIGURE_ARGS+=--with-isl=${LOCALBASE}
 .endif
 
 CONFIGURE_ARGS+=--enable-languages=${LANGUAGES}
 
 pre-everything::
 	@${ECHO_MSG} "Making GCC ${PORTVERSION} for ${CONFIGURE_TARGET} [${LANGUAGES}]"
 
 pre-configure:
 	cd ${WRKSRC} ; contrib/gcc_update --touch
 	@${RM} ${WRKSRC}/gcc/*/*.info*
 
 .if defined(MAINTAINER_MODE)
 full-regression-test: build
 	cd ${TEST_WRKSRC}; ${MAKE_CMD} -sk check \
 	; ${WRKSRC}/contrib/test_summary
 .endif
 
 post-stage:
 	${RM} ${STAGEDIR}${PREFIX}/man/man7/*
 	${RM} -r ${STAGEDIR}${TARGLIB}/gcc/*/${GCC_VERSION}/include-fixed/
 	# Add target libraries and include files to packaging list.
 	${RM} ${WRKDIR}/PLIST.lib
 
 .if (${ARCH} == amd64 || ${ARCH} == powerpc64) && ${PORT_OPTIONS:MMULTILIB}
 	${MKDIR} ${STAGEDIR}${TARGLIB32}
 	${MV} ${STAGEDIR}${PREFIX}/lib/lib32 ${STAGEDIR}${TARGLIB32}/gcc${SUFFIX}
 .endif
 
 .for d in ${TARGLIB:S/^${PREFIX}\///} ${TARGLIB32:S/^${PREFIX}\///} ${LIBEXEC:S/^${PREFIX}\///}
 	cd ${STAGEDIR}${PREFIX} ; if [ -d $d ]; then \
 	    ${FIND} $d -type f -o -type l >>${WRKDIR}/PLIST.lib ;\
 	fi
 .endfor
 	cd ${WRKDIR} ; ${SED} -i -e "/PLIST.lib/ r PLIST.lib" ${TMPPLIST}
 
 .include <bsd.port.post.mk>
diff --git a/lang/gcc12/Makefile b/lang/gcc12/Makefile
index 24895e8dc2d5..56ade38b3832 100644
--- a/lang/gcc12/Makefile
+++ b/lang/gcc12/Makefile
@@ -1,166 +1,166 @@
 PORTNAME=	gcc
 PORTVERSION=	12.2.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	lang
 MASTER_SITES=	GCC
 PKGNAMESUFFIX=	${SUFFIX}
 
 MAINTAINER=	salvadore@FreeBSD.org
 COMMENT=	GNU Compiler Collection 12
 WWW=		https://gcc.gnu.org
 
 LICENSE=	GPLv3 GPLv3RLE
 LICENSE_COMB=	multi
 
 ONLY_FOR_ARCHS=	aarch64 amd64 arm armv6 armv7 i386 powerpc powerpc64 powerpc64le
 
 LIB_DEPENDS=	libgmp.so:math/gmp \
 		libmpfr.so:math/mpfr \
 		libmpc.so:math/mpc
 BUILD_DEPENDS+=	${LOCALBASE}/bin/as:devel/binutils
 RUN_DEPENDS+=	${LOCALBASE}/bin/as:devel/binutils
 .if defined(MAINTAINER_MODE)
 BUILD_DEPENDS+=	runtest:misc/dejagnu
 .endif
 
 USES=		compiler:c++11-lang cpe gmake iconv libtool makeinfo perl5 tar:xz
 USE_BINUTILS=	yes
 USE_PERL5=	build
 
 CONFLICTS=	gcc12-devel
 
 CPE_VENDOR=	gnu
 
 GCC_VERSION=	${PORTVERSION}
 SUFFIX=		${PORTVERSION:C/([0-9]+).*/\1/}
 CFLAGS:=	${CFLAGS:N-mretpoline}
 CXXFLAGS:=	${CXXFLAGS:N-mretpoline}
 
 OPTIONS_DEFINE=		GRAPHITE
 OPTIONS_DEFAULT_aarch64=LTO_BOOTSTRAP
 OPTIONS_DEFAULT_amd64=	LTO_BOOTSTRAP
 OPTIONS_DEFAULT_i386=	LTO_BOOTSTRAP
 OPTIONS_DEFAULT_powerpc=LTO_BOOTSTRAP
 OPTIONS_DEFAULT_powerpc64=	LTO_BOOTSTRAP
 OPTIONS_DEFAULT_powerpc64le=	LTO_BOOTSTRAP
 OPTIONS_RADIO=	BOOTSTRAP
 OPTIONS_RADIO_BOOTSTRAP=	LTO_BOOTSTRAP STANDARD_BOOTSTRAP
 LTO_BOOTSTRAP_DESC=	Build using a full LTO bootstrap
 STANDARD_BOOTSTRAP_DESC=	Build using a full bootstrap without LTO
 GRAPHITE_DESC=		Support for Graphite loop optimizations
 
 .if exists(/usr/lib32/libc.so)
 OPTIONS_DEFINE_amd64+=		MULTILIB
 OPTIONS_DEFAULT_amd64+=	MULTILIB
 OPTIONS_DEFINE_powerpc64+=	MULTILIB
 #OPTIONS_DEFAULT_powerpc64+=	MULTILIB # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105010
 MULTILIB_DESC=		Build support for 32-bit and 64-bit targets
 MULTILIB_CONFIGURE_ENABLE=	multilib
 .else
 CONFIGURE_ARGS+=	--disable-multilib
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == amd64
 CONFIGURE_TARGET=	x86_64-portbld-${OPSYS:tl}${OSREL}
 
 .elif defined(PPC_ABI) && ${PPC_ABI} == ELFv2
 CONFIGURE_ARGS+=	--with-abi=elfv2
 .endif
 
 LANGUAGES:=	c,c++,objc,fortran,jit
 TARGLIB=	${PREFIX}/lib/gcc${SUFFIX}
 TARGLIB32=	${PREFIX}/lib32	# The version information is added later
 LIBEXEC=	${PREFIX}/libexec/gcc${SUFFIX}
 GNU_CONFIGURE=	yes
 CONFIGURE_OUTSOURCE=	yes
 .if empty(PORT_OPTIONS:M*BOOTSTRAP)
 CONFIGURE_ARGS+=--disable-bootstrap
 .elif ${PORT_OPTIONS:MLTO_BOOTSTRAP}
 CONFIGURE_ARGS+=--with-build-config=bootstrap-lto-noplugin
 ALL_TARGET=	bootstrap-lean
 PIE_UNSAFE=	yes
 .else
 CONFIGURE_ARGS+=--with-build-config=bootstrap-debug
 ALL_TARGET=	bootstrap-lean
 PIE_UNSAFE=	yes
 .endif
 INSTALL_TARGET=	install-strip
 .if ${UID} != 0
 BINMODE=	755
 .endif
 CONFIGURE_ARGS+=--disable-nls \
 		--enable-gnu-indirect-function \
 		--enable-host-shared \
 		--enable-plugin \
 		--libdir=${TARGLIB} \
 		--libexecdir=${LIBEXEC} \
 		--program-suffix=${SUFFIX} \
 		--with-as=${LOCALBASE}/bin/as \
 		--with-gmp=${LOCALBASE} \
 		--with-gxx-include-dir=${TARGLIB}/include/c++/ \
 		--with-gxx-libcxx-include-dir=/usr/include/c++/v1 \
 		--with-ld=${LOCALBASE}/bin/ld \
 		${ICONV_CONFIGURE_ARG} \
 		--with-pkgversion="FreeBSD Ports Collection" \
 		--with-system-zlib \
 		--without-zstd
 MAKE_ARGS+=	MAKEINFOFLAGS="--no-split"
 USE_LDCONFIG=	${TARGLIB}
 PLIST_SUB+=	GCC_VERSION=${GCC_VERSION} \
 		GNU_HOST=${CONFIGURE_TARGET} \
 		SUFFIX=${SUFFIX}
 INFO=		gcc${SUFFIX}/cpp \
 		gcc${SUFFIX}/cppinternals \
 		gcc${SUFFIX}/gcc \
 		gcc${SUFFIX}/gccinstall \
 		gcc${SUFFIX}/gccint \
 		gcc${SUFFIX}/gfortran \
 		gcc${SUFFIX}/libgccjit \
 		gcc${SUFFIX}/libgomp
 # Release tarballs (as opposed to snapshots) always carry this.
 INFO+=		gcc${SUFFIX}/libquadmath \
 		gcc${SUFFIX}/libitm
 SUB_FILES=	pkg-message
 SUB_LIST+=	TARGLIB=${TARGLIB}
 
 .if ${PORT_OPTIONS:MGRAPHITE}
 LIB_DEPENDS+=	libisl.so:devel/isl
 CONFIGURE_ARGS+=--with-isl=${LOCALBASE}
 .endif
 
 CONFIGURE_ARGS+=--enable-languages=${LANGUAGES}
 
 pre-everything::
 	@${ECHO_MSG} "Making GCC ${PORTVERSION} for ${CONFIGURE_TARGET} [${LANGUAGES}]"
 
 pre-configure:
 	cd ${WRKSRC} ; contrib/gcc_update --touch
 	@${RM} ${WRKSRC}/gcc/*/*.info*
 
 .if defined(MAINTAINER_MODE)
 full-regression-test: build
 	cd ${TEST_WRKSRC}; ${MAKE_CMD} -sk check \
 	; ${WRKSRC}/contrib/test_summary
 .endif
 
 post-stage:
 	${RM} ${STAGEDIR}${PREFIX}/man/man7/*
 	${RM} -r ${STAGEDIR}${TARGLIB}/gcc/*/${GCC_VERSION}/include-fixed/
 	# Add target libraries and include files to packaging list.
 	${RM} ${WRKDIR}/PLIST.lib
 
 .if (${ARCH} == amd64 || ${ARCH} == powerpc64) && ${PORT_OPTIONS:MMULTILIB}
 	${MKDIR} ${STAGEDIR}${TARGLIB32}
 	${MV} ${STAGEDIR}${PREFIX}/lib/lib32 ${STAGEDIR}${TARGLIB32}/gcc${SUFFIX}
 .endif
 
 .for d in ${TARGLIB:S/^${PREFIX}\///} ${TARGLIB32:S/^${PREFIX}\///} ${LIBEXEC:S/^${PREFIX}\///}
 	cd ${STAGEDIR}${PREFIX} ; if [ -d $d ]; then \
 	    ${FIND} $d -type f -o -type l >>${WRKDIR}/PLIST.lib ;\
 	fi
 .endfor
 	cd ${WRKDIR} ; ${SED} -i -e "/PLIST.lib/ r PLIST.lib" ${TMPPLIST}
 
 .include <bsd.port.post.mk>
diff --git a/lang/gcc13-devel/Makefile b/lang/gcc13-devel/Makefile
index 531e99168e6d..0d88d7c3b658 100644
--- a/lang/gcc13-devel/Makefile
+++ b/lang/gcc13-devel/Makefile
@@ -1,175 +1,176 @@
 PORTNAME=	gcc
 PORTVERSION=	13.0.1.s20230416
+PORTREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	GCC/snapshots/${DIST_VERSION}
 PKGNAMESUFFIX=	${SUFFIX}-devel
 DISTNAME=	gcc-${DIST_VERSION}
 
 MAINTAINER=	salvadore@FreeBSD.org
 COMMENT=	GNU Compiler Collection 13
 WWW=		https://gcc.gnu.org
 
 LICENSE=	GPLv3 GPLv3RLE
 LICENSE_COMB=	multi
 
 ONLY_FOR_ARCHS=	aarch64 amd64 arm armv6 armv7 i386 powerpc powerpc64 powerpc64le
 
 LIB_DEPENDS=	libgmp.so:math/gmp \
 		libmpfr.so:math/mpfr \
 		libmpc.so:math/mpc
 BUILD_DEPENDS+=	${LOCALBASE}/bin/as:devel/binutils
 RUN_DEPENDS+=	${LOCALBASE}/bin/as:devel/binutils
 .if defined(MAINTAINER_MODE)
 BUILD_DEPENDS+=	runtest:misc/dejagnu
 .endif
 
 USES=		compiler:c++11-lang cpe gmake iconv libtool makeinfo perl5 tar:xz
 USE_BINUTILS=	yes
 USE_PERL5=	build
 
 CPE_VENDOR=	gnu
 CPE_VERSION=	${GCC_VERSION}
 
 # DIST_VERSION relates to downloads, GCC_VERSION and SUFFIX to names
 # of executables and directories once installed.  A PORTVERSION of
 # Y.2.1.s20140817 results in values of Y-20140817, Y.2.1, and Y
 # for these three.
 DIST_VERSION=	${PORTVERSION:C/([0-9]+).*\.s([0-9]+)/\1-\2/}
 GCC_VERSION=	${PORTVERSION:C/(.+)\.s[0-9]{8}/\1/}
 SUFFIX=		${PORTVERSION:C/([0-9]+).*/\1/}
 CFLAGS:=	${CFLAGS:N-mretpoline}
 CXXFLAGS:=	${CXXFLAGS:N-mretpoline}
 
 OPTIONS_DEFINE=		GRAPHITE
 OPTIONS_DEFAULT_aarch64=LTO_BOOTSTRAP
 OPTIONS_DEFAULT_amd64=	LTO_BOOTSTRAP
 OPTIONS_DEFAULT_i386=	LTO_BOOTSTRAP
 OPTIONS_DEFAULT_powerpc=LTO_BOOTSTRAP
 OPTIONS_DEFAULT_powerpc64=LTO_BOOTSTRAP
 OPTIONS_DEFAULT_powerpc64le=LTO_BOOTSTRAP
 OPTIONS_RADIO=	BOOTSTRAP
 OPTIONS_RADIO_BOOTSTRAP=	LTO_BOOTSTRAP STANDARD_BOOTSTRAP
 LTO_BOOTSTRAP_DESC=	Build using a full LTO bootstrap
 STANDARD_BOOTSTRAP_DESC=	Build using a full bootstrap without LTO
 GRAPHITE_DESC=		Support for Graphite loop optimizations
 
 .if exists(/usr/lib32/libc.so)
 OPTIONS_DEFINE_amd64+=		MULTILIB
 OPTIONS_DEFAULT_amd64+=	MULTILIB
 OPTIONS_DEFINE_powerpc64+=	MULTILIB
 #OPTIONS_DEFAULT_powerpc64+=	MULTILIB # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105010
 MULTILIB_DESC=		Build support for 32-bit and 64-bit targets
 MULTILIB_CONFIGURE_ENABLE=	multilib
 .else
 CONFIGURE_ARGS+=	--disable-multilib
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == amd64
 CONFIGURE_TARGET=	x86_64-portbld-${OPSYS:tl}${OSREL}
 
 .elif defined(PPC_ABI) && ${PPC_ABI} == ELFv2
 CONFIGURE_ARGS+=	--with-abi=elfv2
 USE_GCC=	yes
 
 .elif ${ARCH} == powerpc64le
 USE_GCC=	yes
 .endif
 
 LANGUAGES:=	c,c++,objc,fortran,jit
 TARGLIB=	${PREFIX}/lib/gcc${SUFFIX}
 TARGLIB32=	${PREFIX}/lib32	# The version information is added later
 LIBEXEC=	${PREFIX}/libexec/gcc${SUFFIX}
 GNU_CONFIGURE=	yes
 CONFIGURE_OUTSOURCE=	yes
 .if empty(PORT_OPTIONS:M*BOOTSTRAP)
 CONFIGURE_ARGS+=--disable-bootstrap
 .elif ${PORT_OPTIONS:MLTO_BOOTSTRAP}
 CONFIGURE_ARGS+=--with-build-config=bootstrap-lto-noplugin
 ALL_TARGET=	bootstrap-lean
 PIE_UNSAFE=	yes
 .else
 CONFIGURE_ARGS+=--with-build-config=bootstrap-debug
 ALL_TARGET=	bootstrap-lean
 PIE_UNSAFE=	yes
 .endif
 INSTALL_TARGET=	install-strip
 .if ${UID} != 0
 BINMODE=	755
 .endif
 CONFIGURE_ARGS+=--disable-nls \
 		--enable-gnu-indirect-function \
 		--enable-host-shared \
 		--enable-plugin \
 		--libdir=${TARGLIB} \
 		--libexecdir=${LIBEXEC} \
 		--program-suffix=${SUFFIX} \
 		--with-as=${LOCALBASE}/bin/as \
 		--with-gmp=${LOCALBASE} \
 		--with-gxx-include-dir=${TARGLIB}/include/c++/ \
 		--with-gxx-libcxx-include-dir=/usr/include/c++/v1 \
 		--with-ld=${LOCALBASE}/bin/ld \
 		${ICONV_CONFIGURE_ARG} \
 		--with-pkgversion="FreeBSD Ports Collection" \
 		--with-system-zlib \
 		--without-zstd
 MAKE_ARGS+=	MAKEINFOFLAGS="--no-split"
 USE_LDCONFIG=	${TARGLIB}
 PLIST_SUB+=	GCC_VERSION=${GCC_VERSION} \
 		GNU_HOST=${CONFIGURE_TARGET} \
 		SUFFIX=${SUFFIX}
 INFO=		gcc${SUFFIX}/cpp \
 		gcc${SUFFIX}/cppinternals \
 		gcc${SUFFIX}/gcc \
 		gcc${SUFFIX}/gccinstall \
 		gcc${SUFFIX}/gccint \
 		gcc${SUFFIX}/gfortran \
 		gcc${SUFFIX}/libgccjit \
 		gcc${SUFFIX}/libgomp
 .if ${ARCH} == amd64 || ${ARCH} == i386
 INFO+=		gcc${SUFFIX}/libquadmath \
 		gcc${SUFFIX}/libitm
 .endif
 SUB_FILES=	pkg-message
 SUB_LIST+=	TARGLIB=${TARGLIB}
 
 .if ${PORT_OPTIONS:MGRAPHITE}
 LIB_DEPENDS+=	libisl.so:devel/isl
 CONFIGURE_ARGS+=--with-isl=${LOCALBASE}
 .endif
 
 CONFIGURE_ARGS+=--enable-languages=${LANGUAGES}
 
 pre-everything::
 	@${ECHO_MSG} "Making GCC ${PORTVERSION} for ${CONFIGURE_TARGET} [${LANGUAGES}]"
 
 pre-configure:
 	cd ${WRKSRC} ; contrib/gcc_update --touch
 	@${RM} ${WRKSRC}/gcc/*/*.info*
 
 .if defined(MAINTAINER_MODE)
 full-regression-test: build
 	cd ${TEST_WRKSRC}; ${MAKE_CMD} -sk check \
 	; ${WRKSRC}/contrib/test_summary
 .endif
 
 post-stage:
 	${RM} ${STAGEDIR}${PREFIX}/man/man7/*
 	${RM} -r ${STAGEDIR}${TARGLIB}/gcc/*/${GCC_VERSION}/include-fixed/
 	# Add target libraries and include files to packaging list.
 	${RM} ${WRKDIR}/PLIST.lib
 
 .if (${ARCH} == amd64 || ${ARCH} == powerpc64) && ${PORT_OPTIONS:MMULTILIB}
 	${MKDIR} ${STAGEDIR}${TARGLIB32}
 	${MV} ${STAGEDIR}${PREFIX}/lib/lib32 ${STAGEDIR}${TARGLIB32}/gcc${SUFFIX}
 .endif
 
 .for d in ${TARGLIB:S/^${PREFIX}\///} ${TARGLIB32:S/^${PREFIX}\///} ${LIBEXEC:S/^${PREFIX}\///}
 	cd ${STAGEDIR}${PREFIX} ; if [ -d $d ]; then \
 	    ${FIND} $d -type f -o -type l >>${WRKDIR}/PLIST.lib ;\
 	fi
 .endfor
 	cd ${WRKDIR} ; ${SED} -i -e "/PLIST.lib/ r PLIST.lib" ${TMPPLIST}
 
 .include <bsd.port.post.mk>
diff --git a/lang/gcc48/Makefile b/lang/gcc48/Makefile
index 831478570136..f9b1b2d36107 100644
--- a/lang/gcc48/Makefile
+++ b/lang/gcc48/Makefile
@@ -1,121 +1,121 @@
 PORTNAME=	gcc
 PORTVERSION=	4.8.5
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	lang
 MASTER_SITES=	GCC
 PKGNAMESUFFIX=	${SUFFIX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GNU Compiler Collection 4.8
 WWW=		https://gcc.gnu.org
 
 LICENSE=	GPLv3 GPLv3RLE
 LICENSE_COMB=	multi
 
 DEPRECATED=		Unsupported by upstream since 2015. Use GCC 10 or newer instead.
 EXPIRATION_DATE=	2024-05-01
 
 ONLY_FOR_ARCHS=	amd64 i386
 
 LIB_DEPENDS=	libgmp.so:math/gmp \
 		libmpfr.so:math/mpfr \
 		libmpc.so:math/mpc
 BUILD_DEPENDS+=	${LOCALBASE}/bin/as:devel/binutils
 RUN_DEPENDS+=	${LOCALBASE}/bin/as:devel/binutils
 .if defined(MAINTAINER_MODE)
 BUILD_DEPENDS+=	runtest:misc/dejagnu
 .endif
 
 USES=		compiler cpe gmake iconv libtool makeinfo perl5 tar:bzip2
 USE_BINUTILS=	yes
 USE_PERL5=	build
 
 CPE_VENDOR=	gnu
 
 GCC_VERSION=	${PORTVERSION}
 SUFFIX=		${PORTVERSION:C/([0-9]+).([0-9]+).*/\1\2/}
 SSP_UNSAFE=	yes
 CFLAGS:=	${CFLAGS:N-march=haswell:N-march=ivybridge:N-march=westmere:N-mretpoline}
 CXXFLAGS:=	${CXXFLAGS:N-march=haswell:N-march=ivybridge:N-march=westmere:N-mretpoline}
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == amd64
 CONFIGURE_TARGET=	x86_64-portbld-${OPSYS:tl}${OSREL}
 .endif
 
 LANGUAGES:=	c,c++
 TARGLIB=	${PREFIX}/lib/gcc${SUFFIX}
 LIBEXEC=	${PREFIX}/libexec/gcc${SUFFIX}
 GNU_CONFIGURE=	yes
 CONFIGURE_OUTSOURCE=	yes
 CONFIGURE_ARGS+=--with-build-config=bootstrap-debug
 ALL_TARGET=	bootstrap-lean
 INSTALL_TARGET=	install-strip
 .if ${UID} != 0
 BINMODE=	755
 .endif
 CONFIGURE_ARGS+=--disable-nls \
 		--disable-multilib \
 		--enable-gnu-indirect-function \
 		--libdir=${TARGLIB} \
 		--libexecdir=${LIBEXEC} \
 		--program-suffix=${SUFFIX} \
 		--with-as=${LOCALBASE}/bin/as \
 		--with-gmp=${LOCALBASE} \
 		--with-gxx-include-dir=${TARGLIB}/include/c++/ \
 		--with-ld=${LOCALBASE}/bin/ld \
 		${ICONV_CONFIGURE_ARG} \
 		--with-pkgversion="FreeBSD Ports Collection" \
 		--with-system-zlib \
 		--disable-libgcj \
 		--enable-languages=${LANGUAGES}
 MAKE_ARGS+=	MAKEINFOFLAGS="--no-split"
 USE_LDCONFIG=	${TARGLIB}
 PLIST_SUB+=	GCC_VERSION=${GCC_VERSION} \
 		GNU_HOST=${CONFIGURE_TARGET} \
 		SUFFIX=${SUFFIX}
 INFO=		gcc${SUFFIX}/cpp \
 		gcc${SUFFIX}/cppinternals \
 		gcc${SUFFIX}/gcc \
 		gcc${SUFFIX}/gccinstall \
 		gcc${SUFFIX}/gccint \
 		gcc${SUFFIX}/gfortran \
 		gcc${SUFFIX}/libgomp \
 		gcc${SUFFIX}/libitm \
 		gcc${SUFFIX}/libquadmath
 SUB_FILES=	pkg-message
 SUB_LIST+=	TARGLIB=${TARGLIB}
 
 pre-everything::
 	@${ECHO_MSG} "Making GCC ${PORTVERSION} for ${CONFIGURE_TARGET} [${LANGUAGES}]"
 
 post-patch:
 	@${FIND} ${WRKSRC} -type f -name '*.[ch]' | \
 	    ${XARGS} ${EGREP} -l '"(HOST_WIDE|PLUGIN_COND)' | \
 	    ${XARGS} ${REINPLACE_CMD} -E -e 's/"(HOST_WIDE|PLUGIN_COND)/" \1/g'
 
 pre-configure:
 	cd ${WRKSRC} ; contrib/gcc_update --touch
 	@${RM} ${WRKSRC}/gcc/*/*.info*
 
 .if defined(MAINTAINER_MODE)
 full-regression-test: build
 	cd ${TEST_WRKSRC}; ${MAKE_CMD} -sk check \
 	; ${WRKSRC}/contrib/test_summary
 .endif
 
 post-stage:
 	${RM} ${STAGEDIR}${PREFIX}/man/man7/*
 	${RM} -r ${STAGEDIR}${TARGLIB}/gcc/*/${GCC_VERSION}/include-fixed/ \
 	         ${STAGEDIR}${TARGLIB}/gcc/*/${GCC_VERSION}/finclude
 	# Add target libraries and include files to packaging list.
 	${RM} ${WRKDIR}/PLIST.lib
 .for d in ${TARGLIB:S/^${PREFIX}\///} ${LIBEXEC:S/^${PREFIX}\///}
 	cd ${STAGEDIR}${PREFIX} ; if [ -d $d ]; then \
 	    ${FIND} $d -type f -o -type l >>${WRKDIR}/PLIST.lib ;\
 	fi
 .endfor
 	cd ${WRKDIR} ; ${SED} -i -e "/PLIST.lib/ r PLIST.lib" ${TMPPLIST}
 
 .include <bsd.port.post.mk>
diff --git a/lang/gcc8/Makefile b/lang/gcc8/Makefile
index de4a7a282f55..6fb128eac336 100644
--- a/lang/gcc8/Makefile
+++ b/lang/gcc8/Makefile
@@ -1,150 +1,150 @@
 PORTNAME=	gcc
 PORTVERSION=	8.5.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang
 MASTER_SITES=	GCC
 PKGNAMESUFFIX=	${SUFFIX}
 
 MAINTAINER=	toolchain@FreeBSD.org
 COMMENT=	GNU Compiler Collection 8
 WWW=		https://gcc.gnu.org
 
 LICENSE=	GPLv3 GPLv3RLE
 LICENSE_COMB=	multi
 
 DEPRECATED=	Unsupported by upstream. Use GCC 10 or newer instead.
 ONLY_FOR_ARCHS=	aarch64 amd64 arm armv6 armv7 i386 powerpc powerpc64 powerpcspe
 
 LIB_DEPENDS=	libgmp.so:math/gmp \
 		libmpfr.so:math/mpfr \
 		libmpc.so:math/mpc
 BUILD_DEPENDS+=	${LOCALBASE}/bin/as:devel/binutils
 RUN_DEPENDS+=	${LOCALBASE}/bin/as:devel/binutils
 .if defined(MAINTAINER_MODE)
 BUILD_DEPENDS+=	runtest:misc/dejagnu
 .endif
 
 USES=		compiler cpe gmake iconv libtool makeinfo perl5 tar:xz
 USE_BINUTILS=	yes
 USE_PERL5=	build
 
 CPE_VENDOR=	gnu
 
 GCC_VERSION=	${PORTVERSION}
 SUFFIX=		${PORTVERSION:C/([0-9]+).*/\1/}
 CFLAGS:=	${CFLAGS:N-mretpoline}
 CXXFLAGS:=	${CXXFLAGS:N-mretpoline}
 
 OPTIONS_DEFINE=		BOOTSTRAP
 OPTIONS_DEFAULT=	BOOTSTRAP
 BOOTSTRAP_DESC=		Build using a full bootstrap
 
 .if exists(/usr/lib32/libc.so)
 OPTIONS_DEFINE_amd64+=		MULTILIB
 OPTIONS_DEFAULT_amd64+=	MULTILIB
 OPTIONS_DEFINE_powerpc64+=	MULTILIB
 OPTIONS_DEFAULT_powerpc64+=	MULTILIB
 MULTILIB_DESC=		Build support for 32-bit and 64-bit targets
 MULTILIB_CONFIGURE_ENABLE=	multilib
 .else
 CONFIGURE_ARGS+=	--disable-multilib
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == amd64
 CONFIGURE_TARGET=	x86_64-portbld-${OPSYS:tl}${OSREL}
 
 .elif ${ARCH} == powerpc64
 CONFIGURE_ENV+=	UNAME_m="powerpc64"
 . if defined(PPC_ABI) && ${PPC_ABI} == ELFv2
 CONFIGURE_ARGS+=	--with-abi=elfv2
 . else
 MAKE_ARGS+=	CFLAGS_FOR_TARGET="-O1" CXXFLAGS_FOR_TARGET="-O1" BOOT_CFLAGS="-O1" # PR235975
 .endif
 
 .elif ${ARCH} == powerpcspe
 CONFIGURE_ARGS+=	--with-cpu=8548 --enable-e500_double --without-fp
 .endif
 
 LANGUAGES:=	c,c++,objc,fortran
 TARGLIB=	${PREFIX}/lib/gcc${SUFFIX}
 TARGLIB32=	${PREFIX}/lib32	# The version information is added later
 LIBEXEC=	${PREFIX}/libexec/gcc${SUFFIX}
 GNU_CONFIGURE=	yes
 CONFIGURE_OUTSOURCE=	yes
 .if empty(PORT_OPTIONS:MBOOTSTRAP)
 CONFIGURE_ARGS+=--disable-bootstrap
 .else
 CONFIGURE_ARGS+=--with-build-config=bootstrap-debug
 ALL_TARGET=	bootstrap-lean
 .endif
 INSTALL_TARGET=	install-strip
 .if ${UID} != 0
 BINMODE=	755
 .endif
 CONFIGURE_ARGS+=--disable-nls \
 		--enable-gnu-indirect-function \
 		--libdir=${TARGLIB} \
 		--libexecdir=${LIBEXEC} \
 		--program-suffix=${SUFFIX} \
 		--with-as=${LOCALBASE}/bin/as \
 		--with-gmp=${LOCALBASE} \
 		--with-gxx-include-dir=${TARGLIB}/include/c++/ \
 		--with-ld=${LOCALBASE}/bin/ld \
 		${ICONV_CONFIGURE_ARG} \
 		--with-pkgversion="FreeBSD Ports Collection" \
 		--with-system-zlib \
 		--without-zstd
 MAKE_ARGS+=	MAKEINFOFLAGS="--no-split"
 USE_LDCONFIG=	${TARGLIB}
 PLIST_SUB+=	GCC_VERSION=${GCC_VERSION} \
 		GNU_HOST=${CONFIGURE_TARGET} \
 		SUFFIX=${SUFFIX}
 INFO=		gcc${SUFFIX}/cpp \
 		gcc${SUFFIX}/cppinternals \
 		gcc${SUFFIX}/gcc \
 		gcc${SUFFIX}/gccinstall \
 		gcc${SUFFIX}/gccint \
 		gcc${SUFFIX}/gfortran \
 		gcc${SUFFIX}/libgomp
 # Release tarballs (as opposed to snapshots) always carry this.
 INFO+=		gcc${SUFFIX}/libquadmath \
 		gcc${SUFFIX}/libitm
 SUB_FILES=	pkg-message
 SUB_LIST+=	TARGLIB=${TARGLIB}
 
 CONFIGURE_ARGS+=--enable-languages=${LANGUAGES}
 
 pre-everything::
 	@${ECHO_MSG} "Making GCC ${PORTVERSION} for ${CONFIGURE_TARGET} [${LANGUAGES}]"
 
 pre-configure:
 	cd ${WRKSRC} ; contrib/gcc_update --touch
 	@${RM} ${WRKSRC}/gcc/*/*.info*
 
 .if defined(MAINTAINER_MODE)
 full-regression-test: build
 	cd ${TEST_WRKSRC}; ${MAKE_CMD} -sk check \
 	; ${WRKSRC}/contrib/test_summary
 .endif
 
 post-stage:
 	${RM} ${STAGEDIR}${PREFIX}/man/man7/*
 	${RM} -r ${STAGEDIR}${TARGLIB}/gcc/*/${GCC_VERSION}/include-fixed/
 	# Add target libraries and include files to packaging list.
 	${RM} ${WRKDIR}/PLIST.lib
 
 .if (${ARCH} == amd64 || ${ARCH} == powerpc64) && ${PORT_OPTIONS:MMULTILIB}
 	${MKDIR} ${STAGEDIR}${TARGLIB32}
 	${MV} ${STAGEDIR}${PREFIX}/lib/lib32 ${STAGEDIR}${TARGLIB32}/gcc${SUFFIX}
 .endif
 
 .for d in ${TARGLIB:S/^${PREFIX}\///} ${TARGLIB32:S/^${PREFIX}\///} ${LIBEXEC:S/^${PREFIX}\///}
 	cd ${STAGEDIR}${PREFIX} ; if [ -d $d ]; then \
 	    ${FIND} $d -type f -o -type l >>${WRKDIR}/PLIST.lib ;\
 	fi
 .endfor
 	cd ${WRKDIR} ; ${SED} -i -e "/PLIST.lib/ r PLIST.lib" ${TMPPLIST}
 
 .include <bsd.port.post.mk>
diff --git a/lang/gcc9/Makefile b/lang/gcc9/Makefile
index dbc4dd55a25b..33d32ffe74f5 100644
--- a/lang/gcc9/Makefile
+++ b/lang/gcc9/Makefile
@@ -1,152 +1,153 @@
 PORTNAME=	gcc
 PORTVERSION=	9.5.0
+PORTREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	GCC
 PKGNAMESUFFIX=	${SUFFIX}
 
 MAINTAINER=	toolchain@FreeBSD.org
 COMMENT=	GNU Compiler Collection 9
 WWW=		https://gcc.gnu.org
 
 LICENSE=	GPLv3 GPLv3RLE
 LICENSE_COMB=	multi
 
 DEPRECATED=	Unsupported by upstream. Use GCC 10 or newer instead.
 EXPIRATION_DATE=2024-06-30
 
 ONLY_FOR_ARCHS=	aarch64 amd64 arm armv6 armv7 i386 powerpc powerpc64 powerpc64le sparc64
 
 LIB_DEPENDS=	libgmp.so:math/gmp \
 		libmpfr.so:math/mpfr \
 		libmpc.so:math/mpc
 BUILD_DEPENDS+=	${LOCALBASE}/bin/as:devel/binutils
 RUN_DEPENDS+=	${LOCALBASE}/bin/as:devel/binutils
 .if defined(MAINTAINER_MODE)
 BUILD_DEPENDS+=	runtest:misc/dejagnu
 .endif
 
 USES=		compiler cpe gmake iconv libtool makeinfo perl5 tar:xz
 USE_BINUTILS=	yes
 USE_PERL5=	build
 
 CONFLICTS=	gcc9-devel
 
 CPE_VENDOR=	gnu
 
 GCC_VERSION=	${PORTVERSION}
 SUFFIX=		${PORTVERSION:C/([0-9]+).*/\1/}
 CFLAGS:=	${CFLAGS:N-mretpoline}
 CXXFLAGS:=	${CXXFLAGS:N-mretpoline}
 
 OPTIONS_DEFINE=		BOOTSTRAP
 OPTIONS_DEFAULT=	BOOTSTRAP
 BOOTSTRAP_DESC=		Build using a full bootstrap
 
 .if exists(/usr/lib32/libc.so)
 OPTIONS_DEFINE_amd64+=		MULTILIB
 OPTIONS_DEFAULT_amd64+=	MULTILIB
 OPTIONS_DEFINE_powerpc64+=	MULTILIB
 OPTIONS_DEFAULT_powerpc64+=	MULTILIB
 MULTILIB_DESC=		Build support for 32-bit and 64-bit targets
 MULTILIB_CONFIGURE_ENABLE=	multilib
 .else
 CONFIGURE_ARGS+=	--disable-multilib
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == amd64
 CONFIGURE_TARGET=	x86_64-portbld-${OPSYS:tl}${OSREL}
 
 .elif ${ARCH} == powerpc64
 CONFIGURE_ENV+=	UNAME_m="powerpc64"
 . if defined(PPC_ABI) && ${PPC_ABI} == ELFv2
 CONFIGURE_ARGS+=	--with-abi=elfv2
 . else
 MAKE_ARGS+=	CFLAGS_FOR_TARGET="-O0" CXXFLAGS_FOR_TARGET="-O0" BOOT_CFLAGS="-O0"
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-libgcc_config_rs6000_t-crtstuff
 . endif
 .endif
 
 LANGUAGES:=	c,c++,objc,fortran
 TARGLIB=	${PREFIX}/lib/gcc${SUFFIX}
 TARGLIB32=	${PREFIX}/lib32	# The version information is added later
 LIBEXEC=	${PREFIX}/libexec/gcc${SUFFIX}
 GNU_CONFIGURE=	yes
 CONFIGURE_OUTSOURCE=	yes
 .if empty(PORT_OPTIONS:MBOOTSTRAP)
 CONFIGURE_ARGS+=--disable-bootstrap
 .else
 CONFIGURE_ARGS+=--with-build-config=bootstrap-debug
 ALL_TARGET=	bootstrap-lean
 .endif
 INSTALL_TARGET=	install-strip
 .if ${UID} != 0
 BINMODE=	755
 .endif
 CONFIGURE_ARGS+=--disable-nls \
 		--enable-gnu-indirect-function \
 		--enable-plugin \
 		--libdir=${TARGLIB} \
 		--libexecdir=${LIBEXEC} \
 		--program-suffix=${SUFFIX} \
 		--with-as=${LOCALBASE}/bin/as \
 		--with-gmp=${LOCALBASE} \
 		--with-gxx-include-dir=${TARGLIB}/include/c++/ \
 		--with-ld=${LOCALBASE}/bin/ld \
 		${ICONV_CONFIGURE_ARG} \
 		--with-pkgversion="FreeBSD Ports Collection" \
 		--with-system-zlib \
 		--without-zstd
 MAKE_ARGS+=	MAKEINFOFLAGS="--no-split"
 USE_LDCONFIG=	${TARGLIB}
 PLIST_SUB+=	GCC_VERSION=${GCC_VERSION} \
 		GNU_HOST=${CONFIGURE_TARGET} \
 		SUFFIX=${SUFFIX}
 INFO=		gcc${SUFFIX}/cpp \
 		gcc${SUFFIX}/cppinternals \
 		gcc${SUFFIX}/gcc \
 		gcc${SUFFIX}/gccinstall \
 		gcc${SUFFIX}/gccint \
 		gcc${SUFFIX}/gfortran \
 		gcc${SUFFIX}/libgomp
 # Release tarballs (as opposed to snapshots) always carry this.
 INFO+=		gcc${SUFFIX}/libquadmath \
 		gcc${SUFFIX}/libitm
 SUB_FILES=	pkg-message
 SUB_LIST+=	TARGLIB=${TARGLIB}
 
 CONFIGURE_ARGS+=--enable-languages=${LANGUAGES}
 
 pre-everything::
 	@${ECHO_MSG} "Making GCC ${PORTVERSION} for ${CONFIGURE_TARGET} [${LANGUAGES}]"
 
 pre-configure:
 	cd ${WRKSRC} ; contrib/gcc_update --touch
 	@${RM} ${WRKSRC}/gcc/*/*.info*
 
 .if defined(MAINTAINER_MODE)
 full-regression-test: build
 	cd ${TEST_WRKSRC}; ${MAKE_CMD} -sk check \
 	; ${WRKSRC}/contrib/test_summary
 .endif
 
 post-stage:
 	${RM} ${STAGEDIR}${PREFIX}/man/man7/*
 	${RM} -r ${STAGEDIR}${TARGLIB}/gcc/*/${GCC_VERSION}/include-fixed/
 	# Add target libraries and include files to packaging list.
 	${RM} ${WRKDIR}/PLIST.lib
 
 .if (${ARCH} == amd64 || ${ARCH} == powerpc64) && ${PORT_OPTIONS:MMULTILIB}
 	${MKDIR} ${STAGEDIR}${TARGLIB32}
 	${MV} ${STAGEDIR}${PREFIX}/lib/lib32 ${STAGEDIR}${TARGLIB32}/gcc${SUFFIX}
 .endif
 
 .for d in ${TARGLIB:S/^${PREFIX}\///} ${TARGLIB32:S/^${PREFIX}\///} ${LIBEXEC:S/^${PREFIX}\///}
 	cd ${STAGEDIR}${PREFIX} ; if [ -d $d ]; then \
 	    ${FIND} $d -type f -o -type l >>${WRKDIR}/PLIST.lib ;\
 	fi
 .endfor
 	cd ${WRKDIR} ; ${SED} -i -e "/PLIST.lib/ r PLIST.lib" ${TMPPLIST}
 
 .include <bsd.port.post.mk>
diff --git a/lang/gforth/Makefile b/lang/gforth/Makefile
index 8b60dc95c2d4..35ebbd3de250 100644
--- a/lang/gforth/Makefile
+++ b/lang/gforth/Makefile
@@ -1,79 +1,79 @@
 PORTNAME=	gforth
 PORTVERSION=	0.7.3
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	lang
 MASTER_SITES=	http://www.complang.tuwien.ac.at/forth/gforth/ \
 		GNU
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Fast and portable Forth system
 WWW=		https://www.gnu.org/software/gforth/gforth.html
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libavcall.so:devel/libffcall \
 		libffi.so:devel/libffi \
 		libltdl.so:devel/libltdl
 
 USES=		gmake libtool:build localbase makeinfo
 USE_GCC=	yes
 USE_LDCONFIG=	${PREFIX}/lib/gforth/${PORTVERSION}/libcc-named
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	GFORTHHIST=${WRKSRC}
 MAKE_ENV=	GFORTHHIST=${WRKSRC}
 ALL_TARGET=	kernel/version.fs more info
 MAKE_JOBS_UNSAFE=yes
 
 STRIP=		#none
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION} \
 		WORDSIZE=${WORDSIZE} BYTEORDER=${BYTEORDER}
 
 PORTDOCS=	AUTHORS BUGS Benchres COPYING COPYING.DOC \
 		INSTALL INSTALL.BINDIST NEWS README \
 		NEWS.vmgen README.vmgen ToDo
 
 INFO=		gforth vmgen
 
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == i386 || ${ARCH} == powerpc || ${ARCH} == armv6 || ${ARCH} == armv7
 WORDSIZE=32
 .else
 WORDSIZE=64
 .endif
 
 .if ${ARCH} == powerpc || ${ARCH} == powerpc64 || ${ARCH} == sparc64
 BYTEORDER=b
 .else
 BYTEORDER=l
 .endif
 
 post-patch:
 	${REINPLACE_CMD} 's:@CC@:& -I${LOCALBASE}/include -L${LOCALBASE}/lib:' \
 		 ${WRKSRC}/envos.fs.in
 	${REINPLACE_CMD} '/ checkone/d' ${WRKSRC}/Makefile.in
 
 post-install: install-doc remove-empty-files remove-empty-dirs
 
 install-doc:
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 . for filename in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${filename} ${STAGEDIR}${DOCSDIR}
 . endfor
 .endif
 
 # Remove unused file
 remove-empty-files:
 	@${RM} ${STAGEDIR}${DATADIR}/site-forth/siteinit.fs
 
 # Remove unused directories
 remove-empty-dirs:
 	@${FIND} -d ${STAGEDIR}${DATADIR}/${PORTVERSION}/arch/ -type d -empty -delete
 
 .include <bsd.port.post.mk>
diff --git a/lang/gir-to-d/Makefile b/lang/gir-to-d/Makefile
index 14c75973c249..77f7db53ea15 100644
--- a/lang/gir-to-d/Makefile
+++ b/lang/gir-to-d/Makefile
@@ -1,29 +1,30 @@
 PORTNAME=	gir-to-d
 PORTVERSION=	0.23.1
+PORTREVISION=	1
 CATEGORIES=	lang
 
 MAINTAINER=	arrowd@FreeBSD.org
 COMMENT=	Create D bindings from GObject introspection files
 WWW=		https://github.com/gtkd-developers/gir-to-d
 
 LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	ldc2:lang/ldc
 LIB_DEPENDS=	libphobos2-ldc-shared.so:lang/ldc \
 		libdruntime-ldc-shared.so:lang/ldc
 
 USES=		gnome meson
 
 USE_GNOME=	introspection
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	gtkd-developers
 GH_TAGNAME=	v${DISTVERSION}
 
 # a workaround for https://github.com/ldc-developers/ldc/issues/4000
 CONFIGURE_ENV=	DFLAGS=--allinst
 
 PLIST_FILES=	bin/girtod
 
 .include <bsd.port.mk>
diff --git a/lang/gnat12/Makefile b/lang/gnat12/Makefile
index dda0d34820b4..51ca10eba7df 100644
--- a/lang/gnat12/Makefile
+++ b/lang/gnat12/Makefile
@@ -1,145 +1,145 @@
 PORTNAME=	gnat12
 PORTVERSION=	12.2.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GCC}:gcc	\
 		LOCAL/thierry:gnat
 MASTER_SITE_SUBDIR=releases/gcc-${PORTVERSION}
 DISTFILES=	gcc-${PORTVERSION}.tar.xz:gcc
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	GNAT Ada compiler
 WWW=		https://www.adacore.com/community
 
 LICENSE=	GPLv2 GPLv3 GPLv3RLE
 LICENSE_COMB=	multi
 
 LIB_DEPENDS=	libgmp.so:math/gmp	\
 		libmpc.so:math/mpc	\
 		libisl.so:devel/isl	\
 		libmpfr.so:math/mpfr
 
 USES=		bison gettext-runtime gmake iconv libtool localbase tar:xz
 USE_BINUTILS=	yes
 BINARY_ALIAS=	make=${GMAKE}
 
 OPTIONS_DEFINE=	ASSETS
 OPTIONS_RADIO=	BOOTSTRAP
 OPTIONS_RADIO_BOOTSTRAP=	GCC6AUX	PREVASSET
 OPTIONS_DEFAULT=GCC6AUX
 .if defined(PACKAGE_BUILDING)
 OPTIONS_DEFAULT+=	ASSETS
 .endif
 OPTIONS_SUB=	yes
 ASSETS_DESC=	Build an asset for future bootstrap on the target platform
 GCC6AUX_DESC=	Bootstrap from lang/gcc6-aux
 PREVASSET_DESC=	Bootstrap from the previous asset (if available)
 
 GCC6AUX_BUILD_DEPENDS=	gcc6-aux>0:lang/gcc6-aux
 PREVASSET_DISTFILES+=	${PREV_ASSET_FILE}.tar.xz:gnat
 
 GCC6AUX_VARS=	PATHAUX=${LOCALBASE}/gcc6-aux/bin
 PREVASSET_VARS=	PATHAUX=${WRKDIR}/${PREV_ASSET_FILE}/bin
 ASSETS_VARS=	PKGMESSAGE=${WRKDIR}/pkg-message
 
 GNU_CONFIGURE=	yes
 CONFIGURE_OUTSOURCE=	yes
 WRKSRC=		${WRKDIR}/gcc-${PORTVERSION}
 PKG_PREFIX=	${PREFIX}/${PORTNAME}
 FULLPATH=	/sbin:/bin:/usr/sbin:/usr/bin:${PATHAUX}:${PREFIX}/bin:${LOCALBASE}/bin
 TARGLIB=	${PKG_PREFIX}/lib/gcc${GCCVER}
 GNU_CONFIGURE_PREFIX=	${PKG_PREFIX}
 GNU_CONFIGURE_MANPREFIX=${PKG_PREFIX}
 MANPREFIX=	${PKG_PREFIX}
 CONFIGURE_ENV+=	PATH=${FULLPATH}	\
 		CC=${PATHAUX}/gcc	\
 		CXX=${PATHAUX}/g++
 CONFIGURE_ARGS=	--enable-languages="c,ada"	\
 		--with-pkgversion="${OPSYS} Ports Collection"	\
 		--enable-gnu-indirect-function	\
 		--with-as=${LOCALBASE}/bin/as	\
 		--with-ld=${LOCALBASE}/bin/ld	\
 		--enable-threads=posix	\
 		--disable-libquadmath	\
 		--enable-host-shared	\
 		--disable-libmudflap	\
 		--with-system-zlib	\
 		--disable-libgomp	\
 		--disable-libssp	\
 		--enable-libada		\
 		--without-zstd
 CONFIGURE_TARGET=	${GARCH}-portbld-${PLATFORM}
 
 MAKE_ENV+=	PATH=${FULLPATH}
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	${TARGLIB}
 
 GNATMAKE=	${PATHAUX}/gnatmake
 GNATBING=	${PATHAUX}/gnatbind
 
 GCCVER=		${PORTVERSION:R:R}
 
 PLATFORM=	${OPSYS:tl}${OSREL}
 GARCH=		${ARCH:S/amd64/x86_64/}
 OS_LABEL4VERS=	[${OPSYS}${GARCH:S/amd//:S/x86_//:S/aarch/\/ARM/:S/i386/32/}]
 REVFILE=	${WRKSRC}/gcc/REVISION
 PHASEFILE=	${WRKSRC}/gcc/DEV-PHASE
 ASSET_FILE=	gnat-${GARCH}-${OPSYS:tl}.${OSREL:R}-${PKGVERSION}
 PREV_ASSET_VER?=	${PORTVERSION}
 PREV_ASSET_REV?=	_2
 PREV_ASSET_GCC=	${PREV_ASSET_VER:R:R}
 PREV_ASSET_OSREL?=	${OSREL:R}
 PREV_ASSET_FILE=gnat-${GARCH}-${OPSYS:tl}.${PREV_ASSET_OSREL}-${PREV_ASSET_VER}${PREV_ASSET_REV}
 
 PLIST_SUB=	CONFTRGT=${CONFIGURE_TARGET} VER=${PORTVERSION}	\
 		ASSET_FILE=${ASSET_FILE}
 # add-plist-info does not honor GNU_CONFIGURE_PREFIX => remove INFO files
 INFOS=		cpp cppinternals gcc gccinstall gccint gnat_rm gnat_ugn	\
 		gnat-style libitm
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == i386 || ${ARCH} == aarch64
 LIB_DIR_32=	""
 PLIST_SUB+=	64BITS="@comment "
 .else
 LIB_DIR_32=	"" 32
 PLIST_SUB+=	64BITS=""
 .endif
 .if ${ARCH} == aarch64
 PLIST_SUB+=	ARM="" NOARM="@comment "
 .else
 PLIST_SUB+=	ARM="@comment " NOARM=""
 .endif
 
 pre-configure:
 	${FIND} ${WRKSRC}/gcc/config -name "*freebsd.h" | ${XARGS}	\
 		${REINPLACE_CMD} -e 's|!static:[[:blank:]]|!static: --hash-style=gnu -rpath ${PREFIX}/gnat${GCCVER}/lib |'
 	${ECHO} "-=> GNAT ${OS_LABEL4VERS}" > ${REVFILE}
 	${ECHO} "release" > ${PHASEFILE}
 
 post-install-ASSETS-on:
 	${MKDIR} ${WRKDIR}/${ASSET_FILE} ${STAGEDIR}${DATADIR}/assets
 	${CP} -Rp ${STAGEDIR}${PKG_PREFIX}/* ${WRKDIR}/${ASSET_FILE}
 	(cd ${WRKDIR} &&	\
 		${TAR} cfJ ${STAGEDIR}${DATADIR}/assets/${ASSET_FILE}.tar.xz ${ASSET_FILE})
 
 post-stage:
 	${RM} -rf ${STAGEDIR}${PKG_PREFIX}/share/info
 .for d in ${LIB_DIR_32}
 .  for l in libgnarl-${GCCVER} libgnat-${GCCVER}
 	${STRIP_CMD}	\
 		${STAGEDIR}${PKG_PREFIX}/lib/gcc/${CONFIGURE_TARGET}/${PORTVERSION}/${d}/adalib/${l}.so
 .  endfor
 	${STRIP_CMD} ${STAGEDIR}${PKG_PREFIX}/lib${d}/libgcc_s.so.1
 .endfor
 
 post-stage-ASSETS-on:
 	@${ECHO_CMD} "The file ${DATADIR}/assets/${ASSET_FILE}.tar.xz has been created"	\
 		> ${PKGMESSAGE}
 	@${ECHO_CMD} "You may want to copy it under ${DISTDIR} to use the option PREVASSET next time."	\
 		>> ${PKGMESSAGE}
 	@${ECHO_CMD} "(and adjust distinfo)"	\
 		>> ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/lang/guile/Makefile b/lang/guile/Makefile
index fdb63d18c49d..9304e4cf3acf 100644
--- a/lang/guile/Makefile
+++ b/lang/guile/Makefile
@@ -1,68 +1,69 @@
 PORTNAME=	guile
 PORTVERSION=	3.0.9
+PORTREVISION=	1
 CATEGORIES=	lang scheme
 MASTER_SITES=	GNU
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	GNU Ubiquitous Intelligent Language for Extension
 WWW=		https://www.gnu.org/software/guile/
 
 LICENSE=	GPLv3 LGPL3
 LICENSE_COMB=	multi
 
 # Currently has linker error in i386. Feel free to add other ARCHS in
 # case of failure
 NOT_FOR_ARCHS=	i386
 
 LIB_DEPENDS=	libffi.so:devel/libffi \
 		libgmp.so:math/gmp \
 		libltdl.so:devel/libltdl \
 		libunistring.so:devel/libunistring
 
 USES=		charsetfix compiler:gcc-c++11-lib cpe gmake iconv libtool \
 		makeinfo pathfix pkgconfig readline tar:lz
 CPE_VENDOR=	gnu
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
 
 #MAKE_JOBS_UNSAFE=	yes
 INSTALL_TARGET=	install-strip
 
 CONFLICTS_INSTALL=	guile1 guile2
 
 INFO=		guile r5rs
 
 PLIST_SUB=	GUILE_VER=${PORTVERSION:R}
 
 OPTIONS_DEFINE=		NLS THREADS
 OPTIONS_DEFAULT=	NLS THREADS
 OPTIONS_SUB=		yes
 
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
 
 THREADS_LIB_DEPENDS=		libgc-threaded.so:devel/boehm-gc-threaded
 THREADS_LIB_DEPENDS_OFF=	libgc.so:devel/boehm-gc
 THREADS_CONFIGURE_WITH=		threads
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == powerpc
 EXTRA_PATCHES=	${FILESDIR}/extra-patch-bootstrap_Makefile.in
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-i -e|-i.bak -e|' \
 		${WRKSRC}/libguile/Makefile.in
 	@${RM} -r ${WRKSRC}/prebuilt/32-bit-big-endian
 
 post-patch-THREADS-on:
 	@${REINPLACE_CMD} -e 's|bdw-gc|bdw-gc-threaded|g' ${WRKSRC}/configure
 
 # Currently guile fails to run if libs are stripped. Will need to debug
 # the case.
 #post-install:
 #	@${FIND} ${STAGEDIR}${PREFIX}/lib -name "*.go" | ${XARGS} ${STRIP_CMD}
 
 .include <bsd.port.mk>
diff --git a/lang/haskell-mode.el/Makefile b/lang/haskell-mode.el/Makefile
index 22e24495d371..e18fcbd12c30 100644
--- a/lang/haskell-mode.el/Makefile
+++ b/lang/haskell-mode.el/Makefile
@@ -1,85 +1,85 @@
 PORTNAME=	haskell-mode
 DISTVERSION=	17.2
-PORTREVISION=	5
+PORTREVISION=	7
 CATEGORIES=	lang elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Emacs lisp mode for editing haskell programs
 WWW=		https://projects.haskell.org/haskellmode-emacs/
 
 LICENSE=	GPLv3
 
 .if ${FLAVOR:U} == devel_full || ${FLAVOR:U} == devel_nox
 BROKEN=		fails to build
 .endif
 
 USES=		emacs gmake
 USE_GITHUB=	yes
 GH_ACCOUNT=	haskell
 
 PORTDOCS=	NEWS README.md
 ALL_TARGET=	haskell-mode-autoloads.el
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=	DOCS
 
 ELISPDIR=	${PREFIX}/${PLIST_DIRS}
 ELISPFILES=	\
 		ghc-core.el \
 		ghci-script-mode.el \
 		haskell-align-imports.el \
 		haskell-c2hs.el \
 		haskell-cabal.el \
 		haskell-collapse.el \
 		haskell-commands.el \
 		haskell-compile.el \
 		haskell-complete-module.el \
 		haskell-completions.el \
 		haskell-customize.el \
 		haskell-debug.el \
 		haskell-decl-scan.el \
 		haskell-doc.el \
 		haskell-font-lock.el \
 		haskell-ghc-support.el \
 		haskell-hoogle.el \
 		haskell-indent.el \
 		haskell-indentation.el \
 		haskell-interactive-mode.el \
 		haskell-lexeme.el \
 		haskell-load.el \
 		haskell-menu.el \
 		haskell-mode-autoloads.el \
 		haskell-mode-pkg.el \
 		haskell-mode.el \
 		haskell-modules.el \
 		haskell-move-nested.el \
 		haskell-navigate-imports.el \
 		haskell-presentation-mode.el \
 		haskell-process.el \
 		haskell-repl.el \
 		haskell-sandbox.el \
 		haskell-session.el \
 		haskell-sort-imports.el \
 		haskell-string.el \
 		haskell-svg.el \
 		haskell-unicode-input-method.el \
 		haskell-utils.el \
 		haskell.el \
 		highlight-uses-mode.el \
 		inf-haskell.el \
 		w3m-haddock.el
 
 PLIST_DIRS=	share/emacs/site-lisp/${PORTNAME}/
 PLIST_FILES=	${ELISPFILES:C/^| [^ ]/${PLIST_DIRS}/g}
 SUB_FILES=	pkg-message
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${ELISPDIR}
 	${INSTALL_DATA} ${ELISPFILES:S,^,${WRKSRC}/,} ${STAGEDIR}${ELISPDIR}/
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/
 
 .include <bsd.port.mk>
diff --git a/lang/julia/Makefile b/lang/julia/Makefile
index 25bba2553f90..aba5fbe29c6f 100644
--- a/lang/julia/Makefile
+++ b/lang/julia/Makefile
@@ -1,132 +1,133 @@
 PORTNAME=	julia
 DISTVERSION=	1.8.5
+PORTREVISION=	1
 DISTVERSIONSUFFIX=	-full
 CATEGORIES=	lang math
 MASTER_SITES=	https://github.com/JuliaLang/${PORTNAME}/releases/download/v${DISTVERSION}/
 
 MAINTAINER=	rizor.reardon@yahoo.com
 COMMENT=	Implementation of Julia, a language for technical computing
 WWW=		https://julialang.org/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 ONLY_FOR_ARCHS=		amd64
 ONLY_FOR_ARCHS_REASON=	Has not been ported to this platform for freebsd
 
 MY_DEPENDS=	7zz:archivers/7-zip
 BUILD_DEPENDS=	patchelf:sysutils/patchelf \
 		cmake:devel/cmake-core \
 		${MY_DEPENDS}
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libgit2.so:devel/libgit2 \
 		libgmp.so:math/gmp \
 		libmbedtls.so:security/mbedtls \
 		libmpfr.so:math/mpfr \
 		libpcre2-8.so:devel/pcre2 \
 		libssh2.so:security/libssh2 \
 		libutf8proc.so:textproc/utf8proc \
 		libnghttp2.so:www/libnghttp2 \
 		libunwind.so:devel/libunwind \
 		libopenlibm.so:math/openlibm
 RUN_DEPENDS=	${MY_DEPENDS}
 
 USES=		gmake cpe fortran python perl5 blaslapack:openblas
 
 CPE_VENDOR=	julialang
 
 USE_CXXSTD=	c++14
 USE_LDCONFIG=	yes
 
 MAKE_ARGS+=	NO_GIT=1 \
 		USE_BINARYBUILDER=0 \
 		prefix=${PREFIX} \
 		JCXXFLAGS="${CXXFLAGS}" \
 		USE_GPL_LIBS=0 \
 		ARCH=x86_64 \
 		JULIA_CPU_TARGET=generic \
 		USE_SYSTEM_CURL=1 \
 		USE_SYSTEM_GMP=1 \
 		USE_SYSTEM_OPENLIBM=1 \
 		USE_SYSTEM_LAPACK=1 \
 		USE_SYSTEM_LIBGIT2=1 \
 		USE_SYSTEM_LIBSSH2=1 \
 		USE_SYSTEM_MBEDTLS=1 \
 		USE_SYSTEM_MPFR=1 \
 		USE_SYSTEM_PATCHELF=1 \
 		USE_SYSTEM_PCRE=1 \
 		USE_SYSTEM_UTF8PROC=1 \
 		USE_SYSTEM_P7ZIP=1 \
 		USE_SYSTEM_BLAS=1 \
 		USE_SYSTEM_NGHTTP2=1 \
 		USE_SYSTEM_CSL=1 \
 		USE_SYSTEM_ZLIB=1 \
 		USE_SYSTEM_LIBUNWIND=1
 ALL_TARGET=	default
 INSTALL_TARGET=	install
 TEST_TARGET=	test
 
 CFLAGS+=	-fpic
 
 BINARY_ALIAS=	python3=${PYTHON_CMD} gfortran=gfortran${_GCC_VER}
 
 WRKSRC=		${WRKDIR}/julia-${DISTVERSION}
 
 PLIST_SUB=	VERSION="${PORTVERSION:R}"
 PORTDOCS=	html
 
 OPTIONS_DEFINE=		DEBUG DOCS NATIVE
 OPTIONS_DEFAULT=	DOCS
 OPTIONS_SUB=		yes
 
 NATIVE_DESC=		Build with native CPU JIT tuning
 NATIVE_MAKE_ARGS=	JULIA_CPU_TARGET=native
 
 DEBUG_MAKE_ARGS=	FORCE_ASSERTIONS=1 \
 			ALL_TARGET=all \
 			BUNDLE_DEBUG_LIBS=1
 
 DOCS_VARS=		INSTALL_TARGET+=install-docs
 
 post-patch:
 	echo "override TAGGED_RELEASE_BANNER=\"FreeBSD port lang/${PORTNAME} build\"" >> ${WRKSRC}/Make.user
 	# unset ARCH for auto-detection
 	# Julia build script uses the name x86_86/x86, which are different from ports framework
 	echo "ARCH=" >> ${WRKSRC}/Make.user
 	echo "LIBBLAS=-lopenblas -L${LOCALBASE}/lib" >> ${WRKSRC}/Make.user
 	echo "LIBBLASNAME=libopenblas" >> ${WRKSRC}/Make.user
 	echo 'LIBLAPACK= $$(LIBBLAS)' >> ${WRKSRC}/Make.user
 	echo 'LIBLAPACKNAME= $$(LIBBLASNAME)' >> ${WRKSRC}/Make.user
 
 post-configure:
 	${CC} ${CFLAGS} -lopenblas ${LDFLAGS} -o ${WRKSRC}/check_openblas \
 		${FILESDIR}/check_openblas.c
 	${WRKSRC}/check_openblas && ( \
 		echo "USE_BLAS64=1" >> ${WRKSRC}/Make.user \
 	) || ( \
 		echo "USE_BLAS64=0" >> ${WRKSRC}/Make.user \
 	)
 
 pre-install:
 	${CP} ${WRKSRC}/deps/srccache/cacert-2022-02-01.pem ${WRKSRC}/usr/share/julia/cert.pem
 
 post-install:
 	# clean up for Pkg3.jl
 .for file in .codecov.yml .travis.yml appveyor.yml bors.toml .gitignore source-extracted *.orig
 	${FIND} ${STAGEDIR}${PREFIX}/share/julia/ -name "${file}" -delete
 .endfor
 .for dir in Statistics SuiteSparse ArgTools Pkg Downloads LibCURL NetworkOptions Tar
 	${RM} -fr ${STAGEDIR}${PREFIX}/share/julia/stdlib/v${PORTVERSION:R}/${dir}/.github/
 .endfor
 
 post-install-DEBUG-off:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/julia*
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libjulia.so*
 .for bin in libccalltest.so libllvmcalltest.so libjulia-internal.so* libblastrampoline.so libdSFMT.so libuv.so* libLLVM* sys.so libjulia-codegen.so*
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/julia/${bin}
 .endfor
 
 post-install-DOCS-off:
 	${RM} -r ${STAGEDIR}${PREFIX}/${INSTALLDIR}/share/doc
 
 .include <bsd.port.mk>
diff --git a/lang/ldc/Makefile b/lang/ldc/Makefile
index 500b89caf5e8..bbb985cd2317 100644
--- a/lang/ldc/Makefile
+++ b/lang/ldc/Makefile
@@ -1,60 +1,61 @@
 PORTNAME=	ldc
 PORTVERSION=	1.32.0
+PORTREVISION=	1
 DISTVERSIONSUFFIX=	-src
 CATEGORIES=	lang
 MASTER_SITES=	https://github.com/ldc-developers/${PORTNAME}/releases/download/v${DISTVERSION}/
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	LLVM-based D compiler
 WWW=		https://wiki.dlang.org/LDC
 
 LICENSE=	BSD3CLAUSE
 
 BROKEN_armv6=	fails to compile: Error: undefined identifier _jmp_buf, did you mean alias jmp_buf?
 BROKEN_armv7=	fails to compile: Error: undefined identifier _jmp_buf, did you mean alias jmp_buf?
 BROKEN_i386=	function core.bitop.bsf (uint v) is not callable using argument types (ulong)
 BROKEN_riscv64=	fails to compile: unable to get target for 'riscv64-portbld-freebsd13.0', see -version and -mtriple.
 
 BUILD_DEPENDS=	gdmd>0:devel/gdmd
 RUN_DEPENDS=	llvm${_LLVM_VER}>0:devel/llvm${_LLVM_VER}
 LIB_DEPENDS=	libconfig.so:devel/libconfig \
 		libgphobos.so:lang/gcc${_GCC_VER} \
 		libLLVM-${_LLVM_VER}.so:devel/llvm${_LLVM_VER}
 
 USES=		ninja cmake:insource pkgconfig
 
 #USE_GITHUB=	yes
 #GH_ACCOUNT=	ldc-developers
 #GH_PROJECT=	ldc
 
 USE_LDCONFIG=	yes
 
 CC=		${LOCALBASE}/bin/clang${_LLVM_VER}
 CXX=		${LOCALBASE}/bin/clang++${_LLVM_VER}
 LLVM_CONFIG=	${LOCALBASE}/bin/llvm-config${_LLVM_VER}
 
 _GCC_VER=	11
 _LLVM_VER=	15
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "aarch64" || ${ARCH} == "amd64"
 CFLAGS+=		-fPIC
 .endif
 
 CMAKE_ARGS+=	-DLDC_INSTALL_PREFIX="${PREFIX}" \
 		-DD_COMPILER="${PREFIX}/bin/gdmd" \
 		-DCMAKE_C_COMPILER="${CC}" \
 		-DCMAKE_CXX_COMPILER="${CXX}" \
 		-DLLVM_CONFIG=${LLVM_CONFIG} \
 		-DBUILD_SHARED_LIBS="BOTH" \
 		-DBUILD_LTO_LIBS=ON
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ldc-build-runtime
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ldc-profdata
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ldc-prune-cache
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ldc2
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ldmd2
 
 .include <bsd.port.post.mk>
diff --git a/lang/micropython/Makefile b/lang/micropython/Makefile
index 30742bd75388..fc293185dbfb 100644
--- a/lang/micropython/Makefile
+++ b/lang/micropython/Makefile
@@ -1,47 +1,47 @@
 PORTNAME=	micropython
 PORTVERSION=	1.17
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang python
 
 MAINTAINER=	python@FreeBSD.org
 COMMENT=	Implementation of the Python language for microcontrollers
 WWW=		https://www.micropython.org/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_armv6=	fails to assemble: error: invalid operand for instruction
 BROKEN_armv7=	fails to assemble: error: invalid operand for instruction
 
 LIB_DEPENDS=	libffi.so:devel/libffi
 
 USES=		gmake pkgconfig python:,build
 USE_GCC=	yes
 USE_GITHUB=	yes
 GH_TUPLE=	micropython:axtls:531cab9:axtls \
 		pfalcon:berkeley-db-1.xx:35aaec4:bdb
 
 MAKE_ARGS+=	CC=${CC} CPP="${CC} -E" V=1
 MAKE_ENV+=	CFLAGS_EXTRA="${CPPFLAGS} ${CFLAGS} -Wno-float-conversion" COPT=""
 
 # With aarch64 (QEMU) the float_parse and the float_parse_doubleprec tests
 # fail as they give a different output.
 TEST_TARGET=	test
 
 BINARY_ALIAS=	python3=${PYTHON_CMD}
 
 BUILD_WRKSRC=	${WRKSRC}/ports/unix
 TEST_WRKSRC=	${WRKSRC}/ports/unix
 
 PLIST_FILES=	bin/micropython
 
 post-extract:
 	@${RM} -r ${WRKSRC}/lib/axtls ${WRKSRC}/lib/berkeley-db-1.xx
 	@${RLN} ${WRKSRC_axtls} ${WRKSRC}/lib/axtls
 	@${RLN} ${WRKSRC_bdb} ${WRKSRC}/lib/berkeley-db-1.xx
 
 do-install:
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/micropython ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/lang/nhc98/Makefile b/lang/nhc98/Makefile
index 0d613b8a55b1..191883fe0cfc 100644
--- a/lang/nhc98/Makefile
+++ b/lang/nhc98/Makefile
@@ -1,43 +1,43 @@
 PORTNAME=	nhc98
 PORTVERSION=	1.22
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	lang haskell
 MASTER_SITES=	http://haskell.org/${PORTNAME}/
 DISTFILES=	${PORTNAME}src-${PORTVERSION}${EXTRACT_SUFX}
 DIST_SUBDIR=	nhc98
 
 MAINTAINER=	haskell@FreeBSD.org
 COMMENT=	Fully-fledged compiler for Haskell 98
 WWW=		https://www.haskell.org/nhc98/
 
 ONLY_FOR_ARCHS=	i386
 
 USES=		gmake
 USE_GCC=	yes
 
 HAS_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--prefix=${PREFIX} --heap=4M --buildwith=gcc
 MAKE_ARGS+=		ARCH=
 MAKE_JOBS_UNSAFE=	yes
 
 OPTIONS_DEFINE=		DOCS
 
 DOCS_CONFIGURE_ON=	--docdir=${DOCSDIR} +docs
 DOCS_CONFIGURE_OFF=	-docs
 
 PORTDOCS=	*
 CONFLICTS=	hs-cpphs
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-O3|${CFLAGS}|' ${WRKSRC}/Makefile.inc
 # The Makefile defines target names based on $(CC) which is
 # problematic when CC=gcc5.  The following patch does not affect the
 # compiler used during the build, but makes sure that targets have
 # the correct suffix e.g. 'basic-gcc' instead of 'basic-gcc5':
 	@${REINPLACE_CMD} -e 's|$$(CC)|gcc|g' ${WRKSRC}/Makefile
 
 post-configure:
 	@${ECHO} "LIBDIR=${PREFIX}/lib/nhc98" \
 		>> ${WRKSRC}/targets/ix86-FreeBSD/config.cache
 
 .include <bsd.port.mk>
diff --git a/lang/oo2c/Makefile b/lang/oo2c/Makefile
index 45471f18d563..65f9cca4c452 100644
--- a/lang/oo2c/Makefile
+++ b/lang/oo2c/Makefile
@@ -1,50 +1,50 @@
 PORTNAME=	oo2c
 PORTVERSION=	2.1.11
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	lang
 MASTER_SITES=	SF/ooc/ooc2/${PORTVERSION}
 DISTNAME=	${PORTNAME}_${BITS}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Optimizing Oberon-2 compiler of University of Kaiserslautern, Germany
 WWW=		http://ooc.sourceforge.net/OOCref/OOCref_16.html
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	xsltproc:textproc/libxslt
 RUN_DEPENDS=	libtool:devel/libtool
 LIB_DEPENDS=	libgc.so:devel/boehm-gc
 
 DOCSDIR=	lib/${PORTNAME}
 USES=		gmake libtool:build localbase:ldflags tar:bzip2
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 USE_CSTD=	gnu89
 USE_GCC=	yes
 
 OPTIONS_DEFINE=	DOCS THREADS
 OPTIONS_SUB=	yes
 
 THREADS_DESC=	Build thread support
 THREADS_CONFIGURE_ON=	--enable-threads=pthreads
 
 post-patch:
 	@${REINPLACE_CMD} 's/dir=@/dir=$${DESTDIR}@/' \
 		 ${WRKSRC}/Makefile.config.in
 	@${REINPLACE_CMD} -e 's|@PERL@|${LOCALBASE}/bin/perl|' \
 		${WRKSRC}/rsrc/OOC/oobacktrace.in
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == i386
 BITS=		32
 .else
 BITS=		64
 .endif
 
 .if defined(PPC_ABI) && ${PPC_ABI} == ELFv1
 CFLAGS+=	-fnested-functions
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/lang/opencoarrays/Makefile b/lang/opencoarrays/Makefile
index 2a8c96d3f703..c127e29e0318 100644
--- a/lang/opencoarrays/Makefile
+++ b/lang/opencoarrays/Makefile
@@ -1,63 +1,64 @@
 PORTNAME=	opencoarrays
 DISTVERSION=	2.10.0
+PORTREVISION=	1
 CATEGORIES=	lang parallel
 
 MAINTAINER=	miguel@gocobachi.dev
 COMMENT=	Transport layer for coarray Fortran compilers
 WWW=		http://www.opencoarrays.org/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_aarch64=	Lack of IEEE754 support in gcc causes "Cannot find an intrinsic module named 'ieee_arithmetic'", see bug#255890
 BROKEN_FreeBSD_12_powerpc=	Lack of IEEE754 support in gcc causes "Cannot find an intrinsic module named 'ieee_arithmetic'", see bug#255890
 BROKEN_FreeBSD_12_powerpc64=	Lack of IEEE754 support in gcc causes "Cannot find an intrinsic module named 'ieee_arithmetic'", see bug#255890
 
 BUILD_DEPENDS=	bash:shells/bash
 RUN_DEPENDS=	bash:shells/bash
 
 USES=		cmake fortran
 USE_CSTD=	gnu99
 USE_GITHUB=	yes
 GH_ACCOUNT=	sourceryinstitute
 GH_PROJECT=	OpenCoarrays
 USE_LDCONFIG=	yes
 
 PLIST_SUB=	GCC_VER=${_GCC_VER} PORTVERSION=${PORTVERSION} SOVERSION=3
 
 OPTIONS_SINGLE=		MPI
 OPTIONS_SINGLE_MPI=	MPICH OPENMPI
 OPTIONS_DEFAULT=	MPICH
 OPTIONS_EXCLUDE_armv6=	MPICH
 OPTIONS_EXCLUDE_armv7=	MPICH
 OPTIONS_EXCLUDE_i386=	MPICH
 OPTIONS_EXCLUDE_mips=	MPICH
 OPTIONS_EXCLUDE_powerpc=	MPICH
 OPTIONS_EXCLUDE_powerpcspe=	MPICH
 OPTIONS_DEFAULT_armv6=	OPENMPI
 OPTIONS_DEFAULT_armv7=	OPENMPI
 OPTIONS_DEFAULT_i386=	OPENMPI
 OPTIONS_DEFAULT_mips=	OPENMPI
 OPTIONS_DEFAULT_powerpc=	OPENMPI
 OPTIONS_DEFAULT_powerpcspe=	OPENMPI
 
 MPICH_BUILD_DEPENDS=	mpif90:net/mpich
 MPICH_RUN_DEPENDS=	mpif90:net/mpich
 MPICH_CONFIGURE_ENV=	MPI_HOME=${LOCALBASE}
 
 OPENMPI_BUILD_DEPENDS=	${LOCALBASE}/mpi/openmpi/bin/mpif90:net/openmpi
 OPENMPI_RUN_DEPENDS=	${LOCALBASE}/mpi/openmpi/bin/mpif90:net/openmpi
 OPENMPI_CONFIGURE_ENV=	MPI_HOME=${LOCALBASE}/mpi/openmpi
 OPENMPI_CMAKE_ON=	-DMPI_C_COMPILE_OPTIONS="-lpthread" \
 			-DMPI_Fortran_COMPILE_OPTIONS="-lpthread"
 
 .include <bsd.port.options.mk>
 
 post-patch:
 	@${REINPLACE_CMD} '/mod_dir_tail/s/$${CMAKE_Fortran_COMPILER_VERSION}/${_GCC_VER}/' \
 		${WRKSRC}/CMakeLists.txt
 
 do-test:
 	(cd ${TEST_WRKSRC} && ctest)
 
 .include <bsd.port.mk>
diff --git a/lang/p5-ExtUtils-F77/Makefile b/lang/p5-ExtUtils-F77/Makefile
index d35c589f0887..5fa7fad623e3 100644
--- a/lang/p5-ExtUtils-F77/Makefile
+++ b/lang/p5-ExtUtils-F77/Makefile
@@ -1,26 +1,26 @@
 PORTNAME=	ExtUtils-F77
 PORTVERSION=	1.26
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Helps link C programs with Fortran subroutines
 WWW=		https://metacpan.org/release/ExtUtils-F77
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	p5-File-Which>=0:sysutils/p5-File-Which
 
 USES=		fortran perl5
 USE_PERL5=	configure
 
 NO_ARCH=	yes
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|'FB_GFORTRAN'|'${FC}'|; s|'-O2'|'${CFLAGS}'|" ${WRKSRC}/F77.pm
 
 .include <bsd.port.mk>
diff --git a/lang/php-mode.el/Makefile b/lang/php-mode.el/Makefile
index 4478f48592e4..cfd4e6fe1ca3 100644
--- a/lang/php-mode.el/Makefile
+++ b/lang/php-mode.el/Makefile
@@ -1,52 +1,53 @@
 PORTNAME=	php-mode.el
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.24.3
+PORTREVISION=	2
 CATEGORIES=	lang elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	marc@bumblingdork.com
 COMMENT=	PHP mode for GNU Emacs
 WWW=		https://github.com/emacs-php/php-mode
 
 LICENSE=	GPLv3
 
 USES=		emacs gmake
 USE_GITHUB=	yes
 GH_ACCOUNT=	emacs-php
 GH_PROJECT=	${PORTNAME:S/.el$//}
 
 NO_ARCH=	yes
 
 LISP_FILES=	lisp/php-align.el \
 		lisp/php-align.elc \
 		lisp/php-complete.el \
 		lisp/php-complete.elc \
 		lisp/php-defs.el \
 		lisp/php-defs.elc \
 		lisp/php-face.el \
 		lisp/php-face.elc \
 		lisp/php-flymake.el \
 		lisp/php-flymake.elc \
 		lisp/php-format.el \
 		lisp/php-format.elc \
 		lisp/php-ide-phpactor.el \
 		lisp/php-ide-phpactor.elc \
 		lisp/php-ide.el \
 		lisp/php-ide.elc \
 		lisp/php-local-manual.el \
 		lisp/php-local-manual.elc \
 		lisp/php-mode-debug.el \
 		lisp/php-mode-debug.elc \
 		lisp/php-mode.el \
 		lisp/php-mode.elc \
 		lisp/php-project.el \
 		lisp/php-project.elc \
 		lisp/php.el \
 		lisp/php.elc
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}
 	${INSTALL_DATA} ${LISP_FILES:C/^/${WRKSRC}\//g} \
 		${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}
 
 .include <bsd.port.mk>
diff --git a/lang/qmasm/Makefile b/lang/qmasm/Makefile
index 165411947458..b4c48dd3b99f 100644
--- a/lang/qmasm/Makefile
+++ b/lang/qmasm/Makefile
@@ -1,22 +1,23 @@
 PORTNAME=	qmasm
 DISTVERSIONPREFIX=	v
 DISTVERSION=	4.1
+PORTREVISION=	1
 CATEGORIES=	lang
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Quantum macro assembler for D-Wave systems
 WWW=		https://github.com/lanl/qmasm
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}PuLP>0:math/py-PuLP@${PY_FLAVOR}
 
 USES=		python
 USE_GITHUB=	yes
 GH_ACCOUNT=	lanl
 USE_PYTHON=	distutils noflavors autoplist
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/lang/quilc/Makefile b/lang/quilc/Makefile
index c224fe316e50..d9138ed0c76d 100644
--- a/lang/quilc/Makefile
+++ b/lang/quilc/Makefile
@@ -1,87 +1,87 @@
 PORTNAME=	quilc
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.26.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	lang # quantum-computing
 DIST_SUBDIR=	${PORTNAME}-${DISTVERSION} # many files, some are unversioned
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Optimizing Quil compiler (for quantum computing)
 WWW=		https://github.com/quil-lang/quilc
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BROKEN_i386=	mmap: Cannot allocate memory: it needs between 2 and 3GB of memory, but on i386 programs can't allocate that much
 
 BUILD_DEPENDS=	sbcl:lang/sbcl \
 		cppzmq>0:net/cppzmq
 LIB_DEPENDS=	libblas.so:math/blas \
 		libffi.so:devel/libffi \
 		liblapack.so:math/lapack
 
 USES=		fortran gmake localbase pkgconfig
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	quil-lang
 
 BINARY_ALIAS=	cc=${FILESDIR}/cc \
 		gfortran=gfortran${GCC_DEFAULT} \
 		git=false
 
 PLIST_FILES=	bin/quilc \
 		lib/libexpokit.so
 
 #
 # In order to update dependencies:
 # 1. set MAINTAINER_MODE=yes
 # 2. make clean build
 # 3. set MAINTAINER_MODE=no
 # 4. make clean makesum
 #
 
 MAINTAINER_MODE=	no
 
 .if (${MAINTAINER_MODE} == "yes")
 BUILD_DEPENDS+=	curl:ftp/curl
 
 do-build:
 	# build, download dependencies during build, and save build log with URLs in it
 	@set -e; set -o pipefail; cd ${WRKSRC} && (${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${TARGET_ALL} | tee -a ${WRKDIR}/build.log)
 	# compute Makefile.deps based on URLs in build.log
 	@${FILESDIR}/build-log-to-makefile-deps ${WRKDIR}/build.log > Makefile.deps
 .else
 .  include <Makefile.deps>
 
 MASTER_SITES=	${MASTER_SITES_DEPS}
 DISTFILES=	${DISTFILES_DEPS}
 
 QL_DIR=		${WRKDIR}/quicklisp
 
 post-extract:
 	# create directories
 	@${MKDIR} \
 		${QL_DIR} \
 		${QL_DIR}/dists/quicklisp \
 		${QL_DIR}/dists/quicklisp/software
 	# copy files
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/asdf.lisp ${QL_DIR}
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/setup.lisp ${QL_DIR}
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/releases.txt ${QL_DIR}/dists/quicklisp
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/systems.txt ${QL_DIR}/dists/quicklisp
 	# extract archives
 	@cd ${QL_DIR} && ${TAR} xf ${DISTDIR}/${DIST_SUBDIR}/quicklisp.tar
 	# extract tarballs
 .  for t in ${DISTFILES_DEPS:C/:.*//:M*.tgz}
 	@cd ${QL_DIR}/dists/quicklisp/software && ${TAR} xzf ${DISTDIR}/${DIST_SUBDIR}/${t}
 .  endfor
 	# fixups: same effect as https://github.com/cffi/cffi/pull/332
 	@${REINPLACE_CMD} -e 's|:openbsd "libffi.so"|:freebsd "libffi.so"|' ${QL_DIR}/dists/quicklisp/software/cffi_0.24.1/libffi/libffi.lisp
 
 post-install:
 	${INSTALL_LIB} ${QL_DIR}/dists/quicklisp/software/magicl-v0.9.1/expokit/libexpokit.so ${STAGEDIR}${PREFIX}/lib
 
 .endif
 
 .include <bsd.port.mk>
diff --git a/lang/ratfor/Makefile b/lang/ratfor/Makefile
index 0222c04448b4..10c4b4f2ba2b 100644
--- a/lang/ratfor/Makefile
+++ b/lang/ratfor/Makefile
@@ -1,40 +1,40 @@
 PORTNAME=	ratfor
 PORTVERSION=	1985.06
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	lang
 MASTER_SITES=	LOCAL/obrien \
 		http://sepwww.stanford.edu/sep/prof/
 DISTFILES=	ratfor.shar.2 local.ratfor77.shar
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Rational FORTRAN compiler
 
 LICENSE=	PD
 LICENSE_FILE=	${WRKSRC}/README
 
 BROKEN_aarch64=		./ratfor -o test.f test.r keeps creating huge output file
 BROKEN_armv6=		./ratfor -o test.f test.r keeps creating huge output file
 BROKEN_armv7=		./ratfor -o test.f test.r keeps creating huge output file
 BROKEN_powerpc=		./ratfor -o test.f test.r keeps creating huge output file
 BROKEN_powerpc64=	./ratfor -o test.f test.r keeps creating huge output file
 BROKEN_powerpc64le=	./ratfor -o test.f test.r keeps creating huge output file
 BROKEN_powerpcspe=	./ratfor -o test.f test.r keeps creating huge output file
 
 NO_WRKSUBDIR=	yes
 EXTRACT_CMD=	${CAT}
 EXTRACT_BEFORE_ARGS=
 EXTRACT_AFTER_ARGS=	| ${SH}
 ALL_TARGET=	all tests
 USES=		fortran
 
 PLIST_FILES=	bin/ratfor bin/ratfor77 man/man1/ratfor.1.gz
 
 post-patch:
 	@${PATCH} -d ${WRKSRC} --quiet < ${WRKSRC}/testw.patch
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ratfor77 ${STAGEDIR}${PREFIX}/bin
 	${RLN} ${STAGEDIR}${PREFIX}/bin/ratfor77 ${STAGEDIR}${PREFIX}/bin/ratfor
 	${INSTALL_MAN} ${WRKSRC}/ratfor.1 ${STAGEDIR}${PREFIX}/man/man1
 
 .include <bsd.port.mk>
diff --git a/lang/silq/Makefile b/lang/silq/Makefile
index 081925050f23..6f10fd113302 100644
--- a/lang/silq/Makefile
+++ b/lang/silq/Makefile
@@ -1,45 +1,46 @@
 PORTNAME=	silq
 PORTVERSION=	20230412
+PORTREVISION=	1
 CATEGORIES=	lang math science
 DIST_SUBDIR=	silq
 
 MAINTAINER=	se@FreeBSD.org
 COMMENT=	Silq from ETH Zuerich
 WWW=		https://silq.ethz.ch/
 
 LICENSE=	BSL
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 ONLY_FOR_ARCHS=	amd64
 ONLY_FOR_ARCHS_REASON=	unknown status of the D language compiler (lang/ldc) on ${ARCH}
 
 BUILD_DEPENDS=	ldmd2:lang/ldc \
 		llvm${LLVM_VERSION}>0:devel/llvm${LLVM_VERSION}
 
 USE_GITHUB=	yes
 
 GH_TUPLE=	eth-sri:silq:e9750cb \
 		tgehr:ast:072796e:ast/ast \
 		tgehr:util:a4532a4:util/util
 
 OPTIONS_DEFINE=	EXAMPLES
 
 LLVM_VERSION=	10
 
 .include <bsd.port.options.mk>
 
 do-build:
 		cd ${WRKSRC}; ldmd2 -O -inline -J. -Jlibrary *.d ast/*.d util/*.d -linker=lld${LLVM_VERSION} -of=silq
 
 do-test:
 		cd ${WRKSRC}/test; ldmd2 -O runtests.d -linker=lld${LLVM_VERSION} -of=runtests
 		cd ${WRKSRC}/test; ./runtests
 
 do-install:
 		${INSTALL_PROGRAM} ${WRKSRC}/silq ${STAGEDIR}${PREFIX}/bin/
 .if ${PORT_OPTIONS:MEXAMPLES}
 		${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 		cd ${WRKSRC}/test && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} "-name *\.slq"
 .endif
 
 .include <bsd.port.mk>
diff --git a/lang/slib-guile/Makefile b/lang/slib-guile/Makefile
index 3a43b8000f32..d431e661ac96 100644
--- a/lang/slib-guile/Makefile
+++ b/lang/slib-guile/Makefile
@@ -1,21 +1,21 @@
 PORTNAME=	slib
 PORTVERSION=	3b6 # Keep this in sync with lang/slib
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang scheme
 MASTER_SITES=	# empty
 PKGNAMESUFFIX=	-guile
 DISTFILES=	# empty
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	SLIB installation for Guile
 
 BUILD_DEPENDS=	${LOCALBASE}/share/slib/require.scm:lang/slib \
 		guile:lang/guile
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 SUB_FILES+=	pkg-install pkg-deinstall
 NO_ARCH=	yes
 NO_BUILD=	yes
 NO_INSTALL=	yes
 
 .include <bsd.port.mk>
diff --git a/lang/tuareg-mode.el/Makefile b/lang/tuareg-mode.el/Makefile
index 658048368171..04f13e5caf14 100644
--- a/lang/tuareg-mode.el/Makefile
+++ b/lang/tuareg-mode.el/Makefile
@@ -1,40 +1,40 @@
 PORTNAME=	tuareg-mode
 PORTVERSION=	2.0.8
-PORTREVISION=	13
+PORTREVISION=	15
 PORTEPOCH=	1
 CATEGORIES=	lang elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	michipili@gmail.com
 COMMENT=	Emacs major mode for editing Caml code
 WWW=		http://tuareg.forge.ocamlcore.org/
 
 LICENSE=	GPLv2
 
 USES=		emacs
 USE_GITHUB=	yes
 GH_ACCOUNT=	ocaml
 GH_PROJECT=	tuareg
 
 OPTIONS_DEFINE=	DOCS
 ELISP_FILES=	ocamldebug.el tuareg.el
 .for f in ${ELISP_FILES}
 PLIST_FILES+=	${EMACS_SITE_LISPDIR}/$f ${EMACS_SITE_LISPDIR}/$fc
 .endfor
 
 PORTDOCS=	README.md
 
 do-build:
 	(cd ${WRKSRC} && \
 		${EMACS_CMD} -batch -q -f batch-byte-compile ${ELISP_FILES})
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${EMACS_SITE_LISPDIR}
 .for tuareg_mode_f in ${ELISP_FILES}
 	${INSTALL_DATA} ${WRKSRC}/${tuareg_mode_f} ${WRKSRC}/${tuareg_mode_f}c \
 		${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}
 .endfor
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:C|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/mail/c-sig/Makefile b/mail/c-sig/Makefile
index 6b90a11869e0..c5b4b09ed422 100644
--- a/mail/c-sig/Makefile
+++ b/mail/c-sig/Makefile
@@ -1,27 +1,27 @@
 PORTNAME=	c-sig
 PORTVERSION=	3.8.0.1
-PORTREVISION=	10
+PORTREVISION=	12
 CATEGORIES=	mail elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	yasu@FreeBSD.org
 COMMENT=	Signature insertion tool for Emacs
 WWW=		https://github.com/yasuhirokimura/c-sig
 
 LICENSE=	GPLv2+
 
 USES=		emacs
 USE_GITHUB=	yes
 GH_ACCOUNT=	yasuhirokimura
 NO_ARCH=	yes
 
 MAKE_ENV+=	EMACS=${EMACS_CMD} LISPDIR=${LISPDIR}
 LISPDIR=	${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for file in c-sig-eng.faq c-sig-eng.man c-sig-jp.faq c-sig-jp.man
 	${INSTALL_MAN} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/mail/mailest/Makefile b/mail/mailest/Makefile
index 1e037741a34a..9f76f6e80d1b 100644
--- a/mail/mailest/Makefile
+++ b/mail/mailest/Makefile
@@ -1,54 +1,54 @@
 PORTNAME=	mailest
 PORTVERSION=	0.9.24
 DISTVERSIONPREFIX=	${PORTNAME}-
-PORTREVISION=	9
+PORTREVISION=	14
 CATEGORIES=	mail
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Hyper Estraier backend for Mew
 WWW=		https://github.com/yasuoka/mailest
 
 LICENSE=	BSD2CLAUSE BSD3CLAUSE ISCL LGPL21
 LICENSE_COMB=	multi
 .for L in ${LICENSE}
 LICENSE_FILE_${L}=	${WRKSRC}/LICENSE.${L}
 .endfor
 
 LIB_DEPENDS=	libevent.so:devel/libevent \
 		libqdbm.so:databases/qdbm \
 		libestraier.so:textproc/hyperestraier
 RUN_DEPENDS=	mew${EMACS_PKGNAMESUFFIX}>0:mail/mew@${EMACS_FLAVOR}
 
 USES=		emacs:run fakeroot iconv
 USE_GITHUB=	yes
 GH_ACCOUNT=	yasuoka
 
 MAKE_ENV=	USE_BSDMAKE=true WITH_INSTALL_AS_USER=true
 
 # XXX Static libraries with PIE are currently unsupported
 MAKE_ENV+=	WITHOUT_PIE=true
 
 LICENSE_BSD2CLAUSE_SRC=	bytebuf.c replace/sys/tree.h
 LICENSE_BSD3CLAUSE_SRC=	replace/sys/queue.h
 LICENSE_ISCL_SRC=	mailestctl.c parser.c parser.h \
 			replace/open_memstream.c \
 			replace/reallocarray.c \
 			replace/replace.h \
 			replace/strlcat.c \
 			replace/strtonum.c
 LICENSE_LGPL21_SRC=	estdraft.c
 LICENSE_BSD2CLAUSE_REGEX="/ \* [Cc]opyright/,/ \*\//!d;s,^ \*,,;s,^/,,"
 LICENSE_BSD3CLAUSE_REGEX=${LICENSE_BSD2CLAUSE_REGEX}
 LICENSE_ISCL_REGEX=	${LICENSE_BSD2CLAUSE_REGEX}
 LICENSE_LGPL21_REGEX=	"/^\/\*\*/,/\*\*\//!d;s,^ \*,,;s,^/,,"
 
 post-extract:
 .for L in ${LICENSE}
 .for F in ${LICENSE_${L}_SRC}
 	cd ${WRKSRC} && ${SED} -e ${LICENSE_${L}_REGEX} ${F} \
 	    >> ${LICENSE_FILE_${L}}
 .endfor
 .endfor
 
 .include <bsd.port.mk>
diff --git a/mail/mew-devel/Makefile b/mail/mew-devel/Makefile
index 2ca3139cfb55..8f6ed132101d 100644
--- a/mail/mew-devel/Makefile
+++ b/mail/mew-devel/Makefile
@@ -1,53 +1,54 @@
 PORTNAME=	mew
 DISTVERSIONPREFIX=	v
 DISTVERSION=	6.9-31
+PORTREVISION=	2
 DISTVERSIONSUFFIX=	-g193175e
 CATEGORIES=	mail elisp
 PKGNAMESUFFIX=	-devel${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	yasu@FreeBSD.org
 COMMENT=	Messaging in the Emacs World for emacs (Development Version)
 WWW=		https://www.Mew.org/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		emacs
 USE_GITHUB=	yes
 GH_ACCOUNT=	kazu-yamamoto
 GH_PROJECT=	Mew
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-elispdir=${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/mew \
 		--with-etcdir=${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/mew/etc
 
 # target name for make build and install
 ALL_TARGET=	all info jinfo
 INSTALL_TARGET=	install install-jinfo
 
 CONFLICTS_INSTALL=	mew mew-devel-emacs_* mew-emacs_* # bin/cmew bin/incm
 
 SUB_FILES=	pkg-message
 
 INFO=		mew mew.ja
 PORTDOCS=	API.md CHANGES.v0.md CHANGES.v1.md CHANGES.v2.md CHANGES.v3.md \
 		CHANGES.v4.1.md CHANGES.v4.2.md CHANGES.v5.1.md CHANGES.v5.2.md \
 		CHANGES.v6.1.md CHANGES.v6.2.md CHANGES.v6.3.md CHANGES.v6.4.md \
 		CHANGES.v6.5.md CHANGES.v6.6.md CHANGES.v6.7.md CHANGES.v6.8.md \
 		CHANGES.v6.9.md INSTALL.md README.md RELEASENOTE.md
 
 OPTIONS_DEFINE=		DATABASE DOCS STUNNEL
 OPTIONS_DEFAULT=	STUNNEL
 
 DATABASE_DESC=	Support database feature (with Ruby & Sqlite3)
 STUNNEL_DESC=	Support TLS feature using stunnel
 
 DATABASE_RUN_DEPENDS=	rubygem-sqlite3>=0:databases/rubygem-sqlite3
 STUNNEL_RUN_DEPENDS=	stunnel>=0:security/stunnel
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/*.md ${WRKSRC}/CHANGES/*.md ${STAGEDIR}${DOCSDIR}
 	(cd ${STAGEDIR}${DOCSDIR}; for f in v*.md ; do ${MV} $$f CHANGES.$$f; done)
 
 .include <bsd.port.mk>
diff --git a/mail/mew/Makefile b/mail/mew/Makefile
index 884d7b3921d3..31a4256133cf 100644
--- a/mail/mew/Makefile
+++ b/mail/mew/Makefile
@@ -1,50 +1,51 @@
 PORTNAME=	mew
 DISTVERSION=	6.9
+PORTREVISION=	2
 CATEGORIES=	mail elisp
 MASTER_SITES=	http://www.mew.org/Release/
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 DISTFILES=	${DISTNAME}a${EXTRACT_SUFX}
 
 MAINTAINER=	yasu@FreeBSD.org
 COMMENT=	Messaging in the Emacs World for emacs
 WWW=		https://www.Mew.org/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		emacs
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-elispdir=${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/mew \
 		--with-etcdir=${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/mew/etc
 
 # target name for make build and install
 ALL_TARGET=	all info jinfo
 INSTALL_TARGET=	install install-jinfo
 
 CONFLICTS_INSTALL=	mew-devel mew-devel-emacs_* mew-emacs_* # bin/cmew bin/incm
 
 SUB_FILES=	pkg-message
 
 INFO=		mew mew.ja
 PORTDOCS=	API.md CHANGES.v0.md CHANGES.v1.md CHANGES.v2.md CHANGES.v3.md \
 		CHANGES.v4.1.md CHANGES.v4.2.md CHANGES.v5.1.md CHANGES.v5.2.md \
 		CHANGES.v6.1.md CHANGES.v6.2.md CHANGES.v6.3.md CHANGES.v6.4.md \
 		CHANGES.v6.5.md CHANGES.v6.6.md CHANGES.v6.7.md CHANGES.v6.8.md \
 		CHANGES.v6.9.md INSTALL.md README.md RELEASENOTE.md
 
 OPTIONS_DEFINE=		DATABASE DOCS STUNNEL
 OPTIONS_DEFAULT=	STUNNEL
 
 DATABASE_DESC=	Support database feature (with Ruby & Sqlite3)
 STUNNEL_DESC=	Support TLS feature using stunnel
 
 DATABASE_RUN_DEPENDS=	rubygem-sqlite3>=0:databases/rubygem-sqlite3
 STUNNEL_RUN_DEPENDS=	stunnel>=0:security/stunnel
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/*.md ${WRKSRC}/CHANGES/*.md ${STAGEDIR}${DOCSDIR}
 	(cd ${STAGEDIR}${DOCSDIR}; for f in v*.md ; do ${MV} $$f CHANGES.$$f; done)
 
 .include <bsd.port.mk>
diff --git a/mail/milter-callback/Makefile b/mail/milter-callback/Makefile
index 28160789596c..895fc1a9b1bc 100644
--- a/mail/milter-callback/Makefile
+++ b/mail/milter-callback/Makefile
@@ -1,54 +1,54 @@
 PORTNAME=	milter-callback
 PORTVERSION=	1.6.0
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	mail
 MASTER_SITES=	LOCAL/ehaupt
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Milter to perform a envelope-from sender verification on target MX
 WWW=		http://unix.zhegan.in
 
 LICENSE=	GPLv3
 
 LIB_DEPENDS=	libspf2.so:mail/libspf2
 
 USES=		compiler tar:xz
 USE_RC_SUBR=	milter-callback
 USE_GCC=	yes
 
 SUB_FILES=	pkg-message
 
 SRC_FILES=	cache.c commonprocs.c cpit.c dealwithmxes.c detectlamespf.c \
 		makedecision.c mcspf.c milter-callback.c pgupdate.c \
 		processdirectpart.c processmxpart.c pushhistory.c sigusr1.c
 
 CFLAGS+=	-DFREEBSD -DHAVE_NS_TYPE -DWITH_SPF -I${LOCALBASE}/include \
 		-I${WRKSRC} -std=gnu99
 LDFLAGS+=	-lmilter -lthr -L${LOCALBASE}/lib -lspf2
 
 .include <bsd.port.pre.mk>
 
 do-build:
 .for f in ${SRC_FILES}
 	${CC} ${CFLAGS} -c ${WRKSRC}/${f} -o ${WRKSRC}/${f:C/\.c/.o/}
 .endfor
 	${CC} ${LDFLAGS} ${SRC_FILES:C/(.*)\.c/${WRKSRC}\/\1.o/} \
 		-o ${WRKSRC}/${PORTNAME}
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|/usr/local|${PREFIX}|" \
 		${WRKSRC}/${PORTNAME}.c
 	@${REINPLACE_CMD} -e "s|/usr/local|${LOCALBASE}|" \
 		${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -e 's|/var/tmp/|/var/run/|' \
 		${WRKSRC}/${PORTNAME}.conf
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/libexec
 	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.8 ${STAGEDIR}${MANPREFIX}/man/man8
 
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/mail
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.conf \
 		${STAGEDIR}${PREFIX}/etc/mail/${PORTNAME}.conf.sample
 
 .include <bsd.port.post.mk>
diff --git a/mail/mu/Makefile b/mail/mu/Makefile
index 49f66ede5e39..16384d31ae82 100644
--- a/mail/mu/Makefile
+++ b/mail/mu/Makefile
@@ -1,45 +1,46 @@
 PORTNAME=	mu
 PORTVERSION=	1.8.13
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	mail
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Mail searching frontend for Xapian
 WWW=		https://www.djcbsoftware.nl/code/mu/
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libxapian.so:databases/xapian-core \
 		libgmime-3.0.so:mail/gmime30 \
 		libgc-threaded.so:devel/boehm-gc-threaded \
 		libjson-glib-1.0.so:devel/json-glib
 
 USES=		autoreconf compiler:c++14-lang gettext-runtime gmake gnome \
 		libtool makeinfo pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	djcb
 USE_GNOME=	glib20
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-mu4e
 INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE=		DOCS GUILE
 OPTIONS_DEFAULT=	DOCS GUILE
 OPTIONS_SUB=		yes
 
 GUILE_LIB_DEPENDS=	libguile-3.0.so:lang/guile
 GUILE_USE=		ldconfig=yes
 GUILE_CONFIGURE_ENABLE=	guile
 GUILE_INFO=		mu-guile
 
 post-install:
 	cd ${FILESDIR} && ${INSTALL_SCRIPT} mu-ask \
 	    ${STAGEDIR}${PREFIX}/bin
 
 post-install-GUILE-on:
 	${FIND} ${STAGEDIR}${PREFIX}/lib -name "*.so.*" -type f | \
 	    ${XARGS} ${STRIP_CMD}
 
 .include <bsd.port.mk>
diff --git a/mail/mu4e-maildirs/Makefile b/mail/mu4e-maildirs/Makefile
index ca5922b897d6..f6337419fbb3 100644
--- a/mail/mu4e-maildirs/Makefile
+++ b/mail/mu4e-maildirs/Makefile
@@ -1,53 +1,53 @@
 PORTNAME=	mu4e-maildirs
 PORTVERSION=	0.8.20201028
-PORTREVISION=	6
+PORTREVISION=	11
 CATEGORIES=	mail
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Maildirs extension for Mu4e
 WWW=		https://github.com/agpchil/mu4e-maildirs-extension
 
 LICENSE=	GPLv3
 
 BUILD_DEPENDS=	dash.el${EMACS_PKGNAMESUFFIX}>0:devel/dash.el@${EMACS_FLAVOR} \
 		mu4e${EMACS_PKGNAMESUFFIX}>0:mail/mu4e@${EMACS_FLAVOR}
 RUN_DEPENDS=	dash.el${EMACS_PKGNAMESUFFIX}>0:devel/dash.el@${EMACS_FLAVOR} \
 		mu4e${EMACS_PKGNAMESUFFIX}>0:mail/mu4e@${EMACS_FLAVOR}
 
 USES=		emacs
 USE_GITHUB=	yes
 GH_PROJECT=	${PORTNAME}-extension
 GH_ACCOUNT=	agpchil
 GH_TAGNAME=	1167bc6
 
 NO_ARCH=	yes
 PLIST_FILES=	${EMACS_SITE_LISPDIR}/mu4e/mu4e-maildirs-extension.elc \
 		${EMACS_SITE_LISPDIR}/mu4e/mu4e-maildirs-extension.el.gz
 PORTDOCS=	README.md
 
 OPTIONS_DEFINE=	DOCS
 
 do-build:
 	cd ${WRKSRC} && ${EMACS_CMD} --batch \
 	    --eval "(provide 'mu4e)" \
 	    --eval "(defvar mu4e~main-buffer-name \"tests\")" \
 	    --eval "(defvar mu4e-mu-binary \"mu\")" \
 	    --eval "(require 'cl)" \
 	    -l dash.el \
 	    -l mu4e-maildirs-extension.el \
 	    --eval "(byte-compile-file \"mu4e-maildirs-extension.el\")" && \
 	    ${GZIP_CMD} mu4e-maildirs-extension.el
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/mu4e && \
 	    cd ${WRKSRC} && ${INSTALL_DATA} \
 	    mu4e-maildirs-extension.elc \
 	    mu4e-maildirs-extension.el.gz \
 	    ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/mu4e
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR} && \
 	    cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/mail/mu4e/Makefile b/mail/mu4e/Makefile
index 04c80313e203..6584929cea8f 100644
--- a/mail/mu4e/Makefile
+++ b/mail/mu4e/Makefile
@@ -1,49 +1,50 @@
 PORTNAME=	mu4e
 PORTVERSION=	1.8.13
+PORTREVISION=	5
 DISTVERSIONPREFIX=	v
 CATEGORIES=	mail
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Emacs frontend for Mu
 WWW=		https://www.djcbsoftware.nl/code/mu/
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	mu:mail/mu
 
 USES=		autoreconf emacs makeinfo pkgconfig
 USE_GITHUB=	yes
 GH_PROJECT=	mu
 GH_ACCOUNT=	djcb
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-guile \
 		--disable-readline \
 		--docdir="${DOCSDIR}" \
 		--enable-mu4e
 INFO=		${PORTNAME}
 BUILD_WRKSRC=	${WRKSRC}/${PORTNAME}
 INSTALL_WRKSRC=	${WRKSRC}/${PORTNAME}
 INSTALL_TARGET=	install-strip
 
 MAKE_JOBS_UNSAFE=	yes
 
 OPTIONS_DEFINE=		DOCS
 OPTIONS_SUB=		yes
 
 post-extract:
 	${INSTALL_DATA} ${WRKSRC}/mu4e/obsolete/org-mu4e.el \
 	    ${WRKSRC}/mu4e/org-mu4e.el
 
 pre-build:
 	${REINPLACE_CMD} -e '/.el.elc/,/^$$/d' ${BUILD_WRKSRC}/Makefile && \
 	    ${ECHO_CMD} '.include "${FILESDIR}/byte-compile.mk"' \
 	    >> ${BUILD_WRKSRC}/Makefile
 
 post-install:
 	cd ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/mu4e && \
 	    ${GZIP_CMD} *.el
 
 .include <bsd.port.mk>
diff --git a/mail/notmuch-emacs/Makefile b/mail/notmuch-emacs/Makefile
index 22329fdd0d9a..4022e4b682a9 100644
--- a/mail/notmuch-emacs/Makefile
+++ b/mail/notmuch-emacs/Makefile
@@ -1,75 +1,75 @@
-PORTREVISION=	2
+PORTREVISION=	4
 CATEGORIES=	mail elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX:S/^$/-emacs/}
 COMMENT=	Emacs major-mode for the Notmuch email search and tagging application
 WWW=		https://notmuchmail.org/notmuch-emacs/
 
 LICENSE=	GPLv3
 
 RUN_DEPENDS=	notmuch:mail/notmuch
 
 USES=		emacs gmake
 
 INSTALL_TARGET=	install-emacs
 MASTERDIR=	${.CURDIR}/../notmuch
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=	DESKTOP DOCS MANPAGES
 OPTIONS_DEFAULT=	MANPAGES
 OPTIONS_SUB=	yes
 
 DESKTOP_DESC=	Install .desktop file for notmuch-emacs-mua
 
 DESKTOP_CONFIGURE_ON=	WITH_DESKTOP=1
 DESKTOP_USES=	desktop-file-utils
 DOCS_ALL_TARGET=	build-info
 DOCS_BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx
 DOCS_CONFIGURE_ON=	HAVE_INSTALL_INFO=1 HAVE_MAKEINFO=1 HAVE_SPHINX=1
 DOCS_INFO=	notmuch-emacs
 DOCS_INSTALL_TARGET=	install-info
 DOCS_USES=	makeinfo
 MANPAGES_ALL_TARGET=	build-man
 MANPAGES_BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx
 MANPAGES_CONFIGURE_ON=	HAVE_SPHINX=1
 MANPAGES_INSTALL_TARGET=	install-man
 
 PORTSCOUT=	limit:^[0-9\.]*$$
 
 # fake ./configure to avoid unneeded dependencies
 do-configure:
 	@${CP} ${WRKSRC}/version.txt ${WRKSRC}/version.stamp
 	@${ECHO_CMD} 'quiet=$$($$(word 1, $$(1)))' > ${WRKSRC}/Makefile.local
 	@${PRINTF} \
 		'%s\n' \
 		BASH_ABSOLUTE=/bin/sh \
 		desktop_dir=${PREFIX}/share/applications \
 		emacsetcdir=${PREFIX}/${EMACS_SITE_LISPDIR} \
 		emacslispdir=${PREFIX}/${EMACS_SITE_LISPDIR} \
 		HAVE_BASH=1 \
 		HAVE_EMACS=1 \
 		infodir=${PREFIX}/${INFO_PATH} \
 		mandir=${MANPREFIX}/man \
 		NOTMUCH_SRCDIR=${WRKSRC} \
 		prefix=${PREFIX} \
 		srcdir=. \
 		subdirs='doc emacs' \
 		WITH_EMACS=1 \
 		${CONFIGURE_ARGS} \
 		> ${WRKSRC}/Makefile.config
 	@${PRINTF} "tags.add('WITH_EMACS')\nrsti_dir = '${WRKSRC}/emacs'\n" \
 		> ${WRKSRC}/sphinx.config
 
 post-install:
 	@${GZIP_CMD} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/*.el
 
 # keep poudriere testport happy
 post-install-DOCS-on:
 	@${FIND} ${STAGEDIR}${PREFIX}/${INFO_PATH} ! -type d ! -name notmuch-emacs.info -delete
 
 post-install-MANPAGES-on:
 	@${FIND} ${STAGEDIR}${MANPREFIX}/man ! -type d ! -name notmuch-emacs-mua.1.gz -delete
 
 # modify what Mk/Uses/emacs.mk set
 MAKE_ARGS+=	EMACS+=--quick
 
 .include "${MASTERDIR}/Makefile"
diff --git a/mail/spamdyke/Makefile b/mail/spamdyke/Makefile
index c61f260f9d21..df3d386d8278 100644
--- a/mail/spamdyke/Makefile
+++ b/mail/spamdyke/Makefile
@@ -1,63 +1,63 @@
 PORTNAME=	spamdyke
 PORTVERSION=	5.0.1
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	mail
 MASTER_SITES=	http://www.spamdyke.org/releases/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Qmail filter for monitoring and intercepting SMTP connections
 WWW=		https://www.spamdyke.org/
 
 LICENSE=	GPLv2
 
 BROKEN_mips=		fails to build: error: nested functions are disabled, use -fnested-functions to re-enable
 BROKEN_mips64=		fails to build: error: nested functions are disabled, use -fnested-functions to re-enable
 BROKEN_powerpc64=	fails to build: error: nested functions are disabled, use -fnested-functions to re-enable
 
 RUN_DEPENDS=	${LOCALBASE}/bin/tcprules:sysutils/ucspi-tcp
 
 USES=		cpe qmail tar:tgz
 WRKSRC=		${WRKDIR}/${DISTNAME}/spamdyke
 GNU_CONFIGURE=	yes
 ALL_TARGET=	spamdyke
 USE_GCC=	yes
 
 OPTIONS_DEFINE=		TLS DEBUG DEBUG_EXCESSIVE DOCS
 OPTIONS_DEFAULT=	TLS
 DEBUG_DESC=		Enable debugging output
 DEBUG_EXCESSIVE_DESC=	Enable excessive debugging output
 
 TLS_CONFIGURE_ENABLE=	tls
 TLS_USES=		ssl
 TLS_LDFLAGS=		-L${OPENSSLLIB}
 TLS_CFLAGS=		-I${OPENSSLINC}
 
 DEBUG_CONFIGURE_ENABLE=			debug-output
 DEBUG_EXCESSIVE_CONFIGURE_ENABLE=	excessive-output
 
 PORTDOCS=	Changelog.txt FAQ.html GNUGPL.txt INSTALL.txt \
 		README.html README_ip_file_format.html \
 		README_rdns_directory_format.html README_rdns_file_format.html \
 		UPGRADING.txt UPGRADING_version_3_to_version_4.txt
 
 .include <bsd.port.pre.mk>
 
 .if ${SSL_DEFAULT} == base
 BROKEN_FreeBSD_12=	checking for library containing SSL_library_init... no
 BROKEN_FreeBSD_13=	checking for library containing SSL_library_init... no
 BROKEN_FreeBSD_14=	checking for library containing SSL_library_init... no
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's#^CFLAGS :=.*#CFLAGS = ${CFLAGS}#' ${WRKSRC}/Makefile.in
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/spamdyke ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/documentation/spamdyke.conf.example \
 		${STAGEDIR}${PREFIX}/etc/spamdyke.conf.sample
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKDIR}/${DISTNAME}/documentation && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.post.mk>
diff --git a/mail/wanderlust/Makefile b/mail/wanderlust/Makefile
index d718d50345eb..7455abb2a168 100644
--- a/mail/wanderlust/Makefile
+++ b/mail/wanderlust/Makefile
@@ -1,67 +1,67 @@
 PORTNAME=	wanderlust
 PORTVERSION=	2.15.9.b.${SNAPDATE}
-PORTREVISION=	2
+PORTREVISION=	7
 CATEGORIES=	mail elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	nobutaka@FreeBSD.org
 COMMENT=	Mail and news system for Emacs
 WWW=		https://github.com/wanderlust/wanderlust
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	emacs-w3m${EMACS_PKGNAMESUFFIX}>0:www/emacs-w3m@${EMACS_FLAVOR} \
 		semi${EMACS_PKGNAMESUFFIX}>0:editors/semi@${EMACS_FLAVOR} \
 		x-face-e21${EMACS_PKGNAMESUFFIX}>0:mail/x-face-e21@${EMACS_FLAVOR}
 RUN_DEPENDS=	emacs-w3m${EMACS_PKGNAMESUFFIX}>0:www/emacs-w3m@${EMACS_FLAVOR} \
 		semi${EMACS_PKGNAMESUFFIX}>0:editors/semi@${EMACS_FLAVOR}
 
 USES=		emacs
 USE_GITHUB=	yes
 GH_TAGNAME=	f5cb2f0
 
 NO_ARCH=	yes
 SNAPDATE=	20221117
 
 MAKE_ARGS+=	EMACS=${EMACS_CMD} \
 		FLAGS="-batch -q -no-site-file" \
 		LISPDIR=${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR} \
 		INFODIR=${STAGEDIR}${PREFIX}/${INFO_PATH} \
 		PACKAGE_LISPDIR=NONE \
 		PIXMAPDIR=${STAGEDIR}${PREFIX}/${EMACS_LIBDIR}/etc/wl/icons
 
 INFO=		wl wl-ja
 PORTDATA=	ja.Emacs
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 post-extract:
 	@${CP} ${FILESDIR}/WL-CFG ${WRKSRC}
 
 post-install:
 	${INSTALL} -d ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/wl \
 		${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${FILESDIR}/wanderlust-startup.el \
 		${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}
 	${INSTALL_DATA} \
 		${WRKSRC}/elmo/elmo-shimbun.el \
 		${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/wl
 	${INSTALL_DATA} ${WRKSRC}/etc/ja.Emacs ${STAGEDIR}${DATADIR}
 
 post-install-DOCS-on:
 	${INSTALL} -d ${STAGEDIR}/${DOCSDIR}
 .for f in README* NEWS* doc/wl*.texi
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 post-install-EXAMPLES-on:
 	${INSTALL} -d ${STAGEDIR}/${EXAMPLESDIR}
 	(cd ${WRKSRC}/samples && ${COPYTREE_SHARE} "en ja" \
 		${STAGEDIR}${EXAMPLESDIR})
 	${RM} ${STAGEDIR}${EXAMPLESDIR}/en/*.orig \
 		${STAGEDIR}${EXAMPLESDIR}/ja/*.orig
 
 .include <bsd.port.mk>
diff --git a/mail/x-face-e21/Makefile b/mail/x-face-e21/Makefile
index d7071d87f041..33ce5f5439b1 100644
--- a/mail/x-face-e21/Makefile
+++ b/mail/x-face-e21/Makefile
@@ -1,37 +1,37 @@
 PORTNAME=	x-face-e21
 PORTVERSION=	20070306
-PORTREVISION=	25
+PORTREVISION=	27
 CATEGORIES=	mail elisp
 MASTER_SITES=	http://www.jpl.org/elips/
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 DISTNAME=	${PORTNAME}.el
 EXTRACT_SUFX=	.gz
 
 MAINTAINER=	ume@FreeBSD.org
 COMMENT=	X-Face utilities for Emacs
 WWW=		https://www.jpl.org/elips/
 
 RUN_DEPENDS=	uncompface:mail/faces
 
 USES=		emacs
 
 NO_WRKSUBDIR=	yes
 EXTRACT_CMD=	${GZCAT}
 EXTRACT_BEFORE_ARGS=
 EXTRACT_AFTER_ARGS=	> ${DISTNAME}
 
 PLIST_FILES=	${EMACS_VERSION_SITE_LISPDIR}/${DISTNAME} \
 		${EMACS_VERSION_SITE_LISPDIR}/${DISTNAME}c
 
 do-build:
 	@(cd ${WRKSRC} && ${EMACS_CMD} -batch -q -no-site-file -no-init-file \
 		-f batch-byte-compile ${DISTNAME})
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}
 	${INSTALL_DATA} ${WRKSRC}/${DISTNAME} \
 		${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}
 	${INSTALL_DATA} ${WRKSRC}/${DISTNAME}c \
 		${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}
 
 .include <bsd.port.mk>
diff --git a/mail/xcite/Makefile b/mail/xcite/Makefile
index 48c7730c0076..d49d12884aea 100644
--- a/mail/xcite/Makefile
+++ b/mail/xcite/Makefile
@@ -1,36 +1,36 @@
 PORTNAME=	xcite
 PORTVERSION=	1.60
-PORTREVISION=	20
+PORTREVISION=	22
 CATEGORIES=	mail elisp
 MASTER_SITES=	https://www.gentei.org/~yuuji/software/
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 DISTNAME=	${PORTNAME}.el
 EXTRACT_SUFX=	# empty
 
 MAINTAINER=	ume@FreeBSD.org
 COMMENT=	Exciting Cite for any Mail/News reading modes on Emacs
 WWW=		https://www.gentei.org/~yuuji/software/
 
 USES=		emacs
 
 NO_WRKSUBDIR=	yes
 
 EXTRACT_CMD=		${CP}
 EXTRACT_BEFORE_ARGS=	-p
 EXTRACT_AFTER_ARGS=	.
 
 PLIST_FILES=	${EMACS_VERSION_SITE_LISPDIR}/${DISTNAME} \
 		${EMACS_VERSION_SITE_LISPDIR}/${DISTNAME}c
 
 do-build:
 	@(cd ${WRKSRC} && ${EMACS_CMD} -batch -q -no-site-file -no-init-file \
 		-f batch-byte-compile ${DISTNAME})
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}
 	${INSTALL_DATA} ${WRKSRC}/${DISTNAME} \
 		${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}
 	${INSTALL_DATA} ${WRKSRC}/${DISTNAME}c \
 		${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}
 
 .include <bsd.port.mk>
diff --git a/math/PDL/Makefile b/math/PDL/Makefile
index 0b4b5fe55229..8fabd2e3a231 100644
--- a/math/PDL/Makefile
+++ b/math/PDL/Makefile
@@ -1,104 +1,104 @@
 PORTNAME=	PDL
 PORTVERSION=	2.019
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Perl Data Language
 WWW=		https://metacpan.org/release/PDL
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
 
 .if ${/usr/bin/ld:L:tA} == /usr/bin/ld.lld
 BROKEN_i386=	ld: error: can't create dynamic relocation R_386_32 against local symbol in readonly segment; recompile object files with -fPIC or pass '-Wl,-z,notext' to allow text relocations in the output
 .endif
 BROKEN_aarch64=	ld: error: relocation R_AARCH64_ADR_PREL_PG_HI21 cannot be used against symbol __stack_chk_guard; recompile with -fPIC
 
 BUILD_DEPENDS=	p5-Devel-CheckLib>=1.01:devel/p5-Devel-CheckLib \
 		p5-Pod-Parser>=0:textproc/p5-Pod-Parser \
 		${RUN_DEPENDS}
 RUN_DEPENDS=	p5-Astro-FITS-Header>=0:astro/p5-Astro-FITS-Header \
 		p5-Convert-UU>=0:converters/p5-Convert-UU \
 		p5-File-Map>=0.57:devel/p5-File-Map \
 		p5-Inline>=0.68:devel/p5-Inline \
 		p5-Inline-C>=0.62:devel/p5-Inline-C \
 		p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
 		p5-Module-Compile>=0.23:devel/p5-Module-Compile
 TEST_DEPENDS=	p5-Test-Deep>=0:devel/p5-Test-Deep \
 		p5-Test-Exception>=0:devel/p5-Test-Exception \
 		p5-Test-Warn>=0:devel/p5-Test-Warn
 
 PORTSCOUT=	limit:^[0-9]\.[0-9][0-9]+[0-9\.]*$$
 
 USES=		gmake perl5
 USE_PERL5=	configure
 MAKE_ENV=	PERL5LIB=${WRKSRC}/blib/lib
 PLIST_FILES=	bin/pdl bin/pdl2 bin/pdldoc bin/perldl bin/pptemplate \
 		${SITE_ARCH_REL}/Inline/Pdlpp.pm \
 		${SITE_ARCH_REL}/Inline/MakePdlppInstallable.pm
 MAKE_JOBS_UNSAFE=	yes
 
 OPTIONS_DEFINE=	PGPLOT PLPLOT OPENGL GD FFTW GSL HDF PROJ F77 READLINE SINK
 OPTIONS_DEFAULT=PGPLOT FFTW F77
 
 # graphics/p5-OpenGL require manual building
 .if empty(PACKAGE_BUILDING)
 OPTIONS_DEFAULT+=	OPENGL
 .endif
 
 PGPLOT_DESC=	Enable PDL::Graphics::PGPLOT
 PLPLOT_DESC=	Enable PDL::Graphics::PLplot
 OPENGL_DESC=	Enable PDL::Graphics::TriD and OpenGL
 GD_DESC=	Enable PDL::IO::GD
 FFTW_DESC=	Enable PDL::FFTW
 GSL_DESC=	Enable PDL::GSL interface
 HDF_DESC=	Enable PDL::IO::HDF interface
 PROJ_DESC=	Enable PDL::GIS::Proj interface
 F77_DESC=	Enable PDL::Minuit and PDL::Slatec
 READLINE_DESC=	Use GNU readline
 SINK_DESC=	Include PDL kitchen sink
 
 PGPLOT_BUILD_DEPENDS=	p5-PGPLOT>=0:graphics/p5-PGPLOT
 PLPLOT_LIB_DEPENDS=	libplplotd.so:math/plplot
 OPENGL_BUILD_DEPENDS=	p5-OpenGL>=0.65:graphics/p5-OpenGL
 OPENGL_RUN_DEPENDS:=	${OPENGL_BUILD_DEPENDS}
 OPENGL_USES=		gl
 OPENGL_USE=		gl=glu
 GD_LIB_DEPENDS=		libgd.so:graphics/gd
 F77_BUILD_DEPENDS=	p5-ExtUtils-F77>=0:lang/p5-ExtUtils-F77
 FFTW_LIB_DEPENDS=	libfftw.so:math/fftw
 GSL_LIB_DEPENDS=	libgsl.so:math/gsl
 HDF_LIB_DEPENDS=	libdf.so:science/hdf
 PROJ_LIB_DEPENDS=	libproj.so:graphics/proj
 READLINE_RUN_DEPENDS=	p5-Term-ReadLine-Gnu>=0:devel/p5-Term-ReadLine-Gnu
 READLINE_RUN_DEPENDS_OFF=	p5-Term-ReadLine-Perl>=0:devel/p5-Term-ReadLine-Perl
 SINK_RUN_DEPENDS=	ppmtogif:graphics/netpbm \
 			mpeg_encode:multimedia/mpeg_encode
 
 post-patch:
 	@${GREP} -lR '#!/.*bin/perl' ${WRKSRC}/ | ${XARGS} ${SED} -e 's|#!/.*bin/perl|#!${PERL}|' -i ''
 	@${GREP} -lR 'x86_64' ${WRKSRC}/ | ${XARGS} ${SED} -e 's|x86_64|amd64|g' -i ''
 	@${REINPLACE_CMD} -e "/POSIX_THREADS_LIBS/ s|undef|'-lpthread'|" \
 		${WRKSRC}/perldl.conf
 
 post-install:
 	${FIND} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/PDL -name '*.so' \
 		| ${XARGS} ${STRIP_CMD}
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/pdl
 # autogen plist
 	@(cd ${WRKSRC}; ${PERL} -Iblib/lib -Iblib/arch Doc/scantree.pl)
 	@(cd ${WRKSRC}/blib/man3 ; \
 	  ${FIND} *.3 | ${SED} "s,^,${MAN3PREFIX}/man/man3/,;s/3$$/3.gz/" \
 		>> ${TMPPLIST} ; \
 	  cd ${WRKSRC}/blib/man1 ; \
 	  ${FIND} *.1 | ${SED} "s,^,${MAN1PREFIX}/man/man1/,;s/1$$/1.gz/" \
 		>> ${TMPPLIST})
 	@(${FIND} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/PDL* -type f | \
 		${SED} "s,^${STAGEDIR}${PREFIX}/,," >> ${TMPPLIST} ; \
 	  ${FIND} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/PDL -type f \
 		-name "[A-Z]*" | ${SED} "s,^${STAGEDIR}${PREFIX}/,," \
 		>> ${TMPPLIST})
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-ADGofTest/Makefile b/math/R-cran-ADGofTest/Makefile
index d390391c6411..0765ae0dc1c3 100644
--- a/math/R-cran-ADGofTest/Makefile
+++ b/math/R-cran-ADGofTest/Makefile
@@ -1,15 +1,15 @@
 PORTNAME=	ADGofTest
 PORTVERSION=	0.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	dteske@FreeBSD.org
 COMMENT=	Anderson-Darling GoF test
 WWW=		https://cran.r-project.org/web/packages/ADGofTest/
 
 LICENSE=	GPLv2
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-Amelia/Makefile b/math/R-cran-Amelia/Makefile
index 436d3c57cf16..df448c70b9b0 100644
--- a/math/R-cran-Amelia/Makefile
+++ b/math/R-cran-Amelia/Makefile
@@ -1,20 +1,21 @@
 PORTNAME=	Amelia
 DISTVERSION=	1.8.1
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Program for Missing Data
 WWW=		https://gking.harvard.edu/amelia
 
 LICENSE=	GPLv2+
 
 BUILD_DEPENDS=	R-cran-Rcpp>=0.11:devel/R-cran-Rcpp \
 		R-cran-RcppArmadillo>=0:math/R-cran-RcppArmadillo \
 		R-cran-rlang>=0:devel/R-cran-rlang
 RUN_DEPENDS=	R-cran-Rcpp>=0.11:devel/R-cran-Rcpp \
 		R-cran-RcppArmadillo>=0:math/R-cran-RcppArmadillo
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-BsMD/Makefile b/math/R-cran-BsMD/Makefile
index 76571150c555..bb529aa8063b 100644
--- a/math/R-cran-BsMD/Makefile
+++ b/math/R-cran-BsMD/Makefile
@@ -1,20 +1,21 @@
 PORTNAME=	BsMD
 DISTVERSION=	2020.4.30
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Bayes Screening and Model Discrimination
 WWW=		https://cran.r-project.org/package=BsMD
 
 LICENSE=	GPLv2+
 
 USES=	cran:auto-plist cran:compiles
 
 #Bogus stage-qa as this is $ARCH dependent
 NO_ARCH_IGNORE=	BsMD.so
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/R/library/BsMD/libs/BsMD.so
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-CVST/Makefile b/math/R-cran-CVST/Makefile
index c61fd474a488..b7980066cd86 100644
--- a/math/R-cran-CVST/Makefile
+++ b/math/R-cran-CVST/Makefile
@@ -1,18 +1,19 @@
 PORTNAME=	CVST
 DISTVERSION=	0.2-3
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Fast Cross-Validation via Sequential Testing
 WWW=		https://cran.r-project.org/web/packages/CVST/
 
 LICENSE=	GPLv2+
 
 CRAN_DEPENDS=	R-cran-kernlab>0:science/R-cran-kernlab
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-ChangeAnomalyDetection/Makefile b/math/R-cran-ChangeAnomalyDetection/Makefile
index 0b66f94db35c..bc2b25b6c1cd 100644
--- a/math/R-cran-ChangeAnomalyDetection/Makefile
+++ b/math/R-cran-ChangeAnomalyDetection/Makefile
@@ -1,18 +1,18 @@
 PORTNAME=	ChangeAnomalyDetection
 PORTVERSION=	0.1.0
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Change Anomaly Detection
 WWW=		https://cran.r-project.org/web/packages/ChangeAnomalyDetection/
 
 LICENSE=	BSD
 
 RUN_DEPENDS=	R-cran-TTR>0:finance/R-cran-TTR \
 		R-cran-forecast>0:math/R-cran-forecast
 
 USES=	cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-DEoptimR/Makefile b/math/R-cran-DEoptimR/Makefile
index f8c23c02ee82..cf34093bdf32 100644
--- a/math/R-cran-DEoptimR/Makefile
+++ b/math/R-cran-DEoptimR/Makefile
@@ -1,14 +1,15 @@
 PORTNAME=	DEoptimR
 DISTVERSION=	1.0-11
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Differential Evolution Optimization in Pure R
 WWW=		https://cran.r-project.org/web/packages/DEoptimR/
 
 LICENSE=	GPLv2+
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-DRR/Makefile b/math/R-cran-DRR/Makefile
index aea09e32478e..739fba7ba157 100644
--- a/math/R-cran-DRR/Makefile
+++ b/math/R-cran-DRR/Makefile
@@ -1,20 +1,20 @@
 PORTNAME=	DRR
 PORTVERSION=	0.0.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Dimensionality Reduction via Regression
 WWW=		https://cran.r-project.org/web/packages/DRR/
 
 LICENSE=	GPLv3
 
 CRAN_DEPENDS=	R-cran-kernlab>0:science/R-cran-kernlab \
 		R-cran-CVST>0:math/R-cran-CVST
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-DoE.base/Makefile b/math/R-cran-DoE.base/Makefile
index 358acc8dde1f..1babe98b0cd1 100644
--- a/math/R-cran-DoE.base/Makefile
+++ b/math/R-cran-DoE.base/Makefile
@@ -1,22 +1,23 @@
 PORTNAME=	DoE.base
 DISTVERSION=	1.2-1
+PORTREVISION=	1
 CATEGORIES=	math devel
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	eduardo@FreeBSD.org
 COMMENT=	Full Factorials, Orthogonal Arrays and Base Utilities for DoE
 WWW=		https://CRAN.R-project.org/package=DoE.base
 
 LICENSE=	GPLv2+
 
 CRAN_DEPENDS=	R-cran-combinat>0:math/R-cran-combinat \
 		R-cran-conf.design>1:math/R-cran-conf.design \
 		R-cran-numbers>=0:math/R-cran-numbers \
 		R-cran-partitions>=0:math/R-cran-partitions \
 		R-cran-vcd>0:devel/R-cran-vcd
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-FNN/Makefile b/math/R-cran-FNN/Makefile
index 003b3b32c6a4..0d49d5acbd16 100644
--- a/math/R-cran-FNN/Makefile
+++ b/math/R-cran-FNN/Makefile
@@ -1,14 +1,15 @@
 PORTNAME=	FNN
 PORTVERSION=	1.1.3.2
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Fast Nearest Neighbor Search Algorithms and Applications
 WWW=		https://cran.r-project.org/package=FNN
 
 LICENSE=	GPLv2+
 
 USES=		cran:compiles
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-Formula/Makefile b/math/R-cran-Formula/Makefile
index 811109963d52..9580aef70c71 100644
--- a/math/R-cran-Formula/Makefile
+++ b/math/R-cran-Formula/Makefile
@@ -1,14 +1,15 @@
 PORTNAME=	Formula
 DISTVERSION=	1.2-4
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Extended Model Formulas
 WWW=		https://cran.r-project.org/web/packages/Formula/
 
 LICENSE=	GPLv2+
 
 USES=	cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-FrF2/Makefile b/math/R-cran-FrF2/Makefile
index ced79341aad3..cd21a1bb526a 100644
--- a/math/R-cran-FrF2/Makefile
+++ b/math/R-cran-FrF2/Makefile
@@ -1,22 +1,23 @@
 PORTNAME=	FrF2
 DISTVERSION=	2.2-3
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	eduardo@FreeBSD.org
 COMMENT=	Statistical Methods for Quality Science
 WWW=		https://CRAN.R-project.org/package=FrF2
 
 LICENSE=	GPLv2+
 
 CRAN_DEPENDS=	R-cran-BsMD>0:math/R-cran-BsMD \
 		R-cran-DoE.base>0:math/R-cran-DoE.base \
 		R-cran-igraph>0:math/R-cran-igraph \
 		R-cran-scatterplot3d>0:math/R-cran-scatterplot3d \
 		R-cran-sfsmisc>0:devel/R-cran-sfsmisc
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-KFAS/Makefile b/math/R-cran-KFAS/Makefile
index eb0bb001ff9b..61b68084cb01 100644
--- a/math/R-cran-KFAS/Makefile
+++ b/math/R-cran-KFAS/Makefile
@@ -1,14 +1,15 @@
 PORTNAME=	KFAS
 PORTVERSION=	1.4.6
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Kalman filter and smoothers for exponential family state space models
 WWW=		https://cran.r-project.org/web/packages/KFAS/
 
 LICENSE=	GPLv2+
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-LearnBayes/Makefile b/math/R-cran-LearnBayes/Makefile
index 5b64d2bfc798..84518cdb78fd 100644
--- a/math/R-cran-LearnBayes/Makefile
+++ b/math/R-cran-LearnBayes/Makefile
@@ -1,15 +1,15 @@
 PORTNAME=	LearnBayes
 PORTVERSION=	2.15.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	math education
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Functions for Learning Bayesian Inference
 WWW=		https://cran.r-project.org/web/packages/LearnBayes/
 
 LICENSE=	GPLv2+
 
 USES=	cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-MCMCpack/Makefile b/math/R-cran-MCMCpack/Makefile
index a410fdc1950f..2e7acb8bae61 100644
--- a/math/R-cran-MCMCpack/Makefile
+++ b/math/R-cran-MCMCpack/Makefile
@@ -1,20 +1,21 @@
 PORTNAME=	MCMCpack
 DISTVERSION=	1.6-3
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Markov chain Monte Carlo Package
 WWW=		https://cran.r-project.org/web/packages/MCMCpack/
 
 LICENSE=	GPLv3
 
 CRAN_DEPENDS=	R-cran-coda>=0.11.3:math/R-cran-coda \
 		R-cran-mcmc>0:math/R-cran-mcmc \
 		R-cran-quantreg>0:math/R-cran-quantreg
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-MSwM/Makefile b/math/R-cran-MSwM/Makefile
index 9febb2a7a377..1bfc0bc1ea92 100644
--- a/math/R-cran-MSwM/Makefile
+++ b/math/R-cran-MSwM/Makefile
@@ -1,14 +1,15 @@
 PORTNAME=	MSwM
 PORTVERSION=	1.5
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Fitting Markov Switching Models
 WWW=		https://cran.r-project.org/web/packages/MSwM/
 
 LICENSE=	GPLv2+
 
 USES=	cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-MatchIt/Makefile b/math/R-cran-MatchIt/Makefile
index ba3933a5e53b..23d4337039b9 100644
--- a/math/R-cran-MatchIt/Makefile
+++ b/math/R-cran-MatchIt/Makefile
@@ -1,25 +1,26 @@
 PORTNAME=	MatchIt
 DISTVERSION=	4.5.2
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Nonparametric Preprocessing for Parametric Casual Inference
 WWW=		https://gking.harvard.edu/matchit
 
 LICENSE=	GPLv2+
 
 BUILD_DEPENDS=	R-cran-Matching>=0:math/R-cran-Matching \
 		R-cran-rgenoud>=0:math/R-cran-rgenoud \
 		R-cran-Rcpp>=0:devel/R-cran-Rcpp \
 		R-cran-RcppProgress>=0:devel/R-cran-RcppProgress \
 		R-cran-backports>=0:math/R-cran-backports
 RUN_DEPENDS=	R-cran-Matching>=0:math/R-cran-Matching \
 		R-cran-rgenoud>=0:math/R-cran-rgenoud\
 		R-cran-Rcpp>=:devel/R-cran-Rcpp\
 		R-cran-RcppProgress>=0:devel/R-cran-RcppProgress \
 		R-cran-backports>=0:math/R-cran-backports
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-Matching/Makefile b/math/R-cran-Matching/Makefile
index eec8005fd184..e1367512c661 100644
--- a/math/R-cran-Matching/Makefile
+++ b/math/R-cran-Matching/Makefile
@@ -1,15 +1,16 @@
 PORTNAME=	Matching
 DISTVERSION=	4.10-8
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Multivariate and Propensity Score Matching with Balance Optimization
 WWW=		https://sekhon.berkeley.edu/matching
 
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-MatrixModels/Makefile b/math/R-cran-MatrixModels/Makefile
index 4605acda224e..8a2797d68ff2 100644
--- a/math/R-cran-MatrixModels/Makefile
+++ b/math/R-cran-MatrixModels/Makefile
@@ -1,14 +1,15 @@
 PORTNAME=	MatrixModels
 DISTVERSION=	0.5-0
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Modelling with Sparse And Dense Matrices
 WWW=		https://cran.r-project.org/web/packages/MatrixModels/
 
 LICENSE=	GPLv2+
 
 USES=	cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-NMF/Makefile b/math/R-cran-NMF/Makefile
index 52bbf4fbd066..46073ed526bb 100644
--- a/math/R-cran-NMF/Makefile
+++ b/math/R-cran-NMF/Makefile
@@ -1,30 +1,30 @@
 PORTNAME=	NMF
 PORTVERSION=	0.21.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Algorithms and Framework for Nonnegative Matrix Factorization
 WWW=		https://cran.r-project.org/web/packages/NMF/
 
 LICENSE=	GPLv2+
 
 CRAN_DEPENDS=	R-cran-pkgmaker>=0.20:devel/R-cran-pkgmaker \
 		R-cran-registry>0:devel/R-cran-registry \
 		R-cran-rngtools>=1.2.3:devel/R-cran-rngtools \
 		R-cran-stringr>=1.0.0:textproc/R-cran-stringr \
 		R-cran-digest>0:security/R-cran-digest \
 		R-cran-gridBase>0:graphics/R-cran-gridBase \
 		R-cran-colorspace>0:graphics/R-cran-colorspace \
 		R-cran-RColorBrewer>0:graphics/R-cran-RColorBrewer \
 		R-cran-foreach>0:devel/R-cran-foreach \
 		R-cran-doParallel>0:devel/R-cran-doParallel \
 		R-cran-ggplot2>0:graphics/R-cran-ggplot2 \
 		R-cran-reshape2>0:devel/R-cran-reshape2
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-RHmm/Makefile b/math/R-cran-RHmm/Makefile
index d16477e7dae5..8447ebbfdd86 100644
--- a/math/R-cran-RHmm/Makefile
+++ b/math/R-cran-RHmm/Makefile
@@ -1,16 +1,16 @@
 PORTNAME=	RHmm
 PORTVERSION=	2.0.3
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Hidden Markov Models simulations and estimations
 WWW=		https://r-forge.r-project.org/projects/rhmm/
 
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-RSvgDevice/Makefile b/math/R-cran-RSvgDevice/Makefile
index c4e77048cd8b..bfc2bd2d67ff 100644
--- a/math/R-cran-RSvgDevice/Makefile
+++ b/math/R-cran-RSvgDevice/Makefile
@@ -1,16 +1,16 @@
 PORTNAME=	RSvgDevice
 PORTVERSION=	0.6.4.4
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	R SVG graphics device
 WWW=		https://cran.r-project.org/web/packages/RSvgDevice/index.html
 
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-RcppArmadillo/Makefile b/math/R-cran-RcppArmadillo/Makefile
index b79ff6445f33..3f63c548063b 100644
--- a/math/R-cran-RcppArmadillo/Makefile
+++ b/math/R-cran-RcppArmadillo/Makefile
@@ -1,18 +1,19 @@
 PORTNAME=	RcppArmadillo
 PORTVERSION=	0.11.2.4.0
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Rcpp integration for Armadillo templated linear algebra library
 WWW=		https://cran.r-project.org/web/packages/RcppArmadillo/
 
 LICENSE=	GPLv2+
 
 CRAN_DEPENDS=	R-cran-Rcpp>=0.11.0:devel/R-cran-Rcpp
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-RcppEigen/Makefile b/math/R-cran-RcppEigen/Makefile
index 4d9da1fea9d1..8aed688f16e5 100644
--- a/math/R-cran-RcppEigen/Makefile
+++ b/math/R-cran-RcppEigen/Makefile
@@ -1,19 +1,20 @@
 PORTNAME=	RcppEigen
 PORTVERSION=	0.3.3.9.2
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Rcpp integration for the Eigen templated linear algebra library
 WWW=		https://cran.r-project.org/web/packages/RcppEigen/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 CRAN_DEPENDS=	R-cran-Rcpp>=0.11.0:devel/R-cran-Rcpp
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=	cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-RcppRoll/Makefile b/math/R-cran-RcppRoll/Makefile
index ceebc3539f5a..cfbbc40b425b 100644
--- a/math/R-cran-RcppRoll/Makefile
+++ b/math/R-cran-RcppRoll/Makefile
@@ -1,19 +1,19 @@
 PORTNAME=	RcppRoll
 DISTVERSION=	0.3.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Efficient Rolling / Windowed Operations
 WWW=		https://cran.r-project.org/web/packages/RcppRoll/
 
 LICENSE=	GPLv2+
 
 CRAN_DEPENDS=	R-cran-Rcpp>0:devel/R-cran-Rcpp
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-Rmpfr/Makefile b/math/R-cran-Rmpfr/Makefile
index e206cbb2f774..3cc18e1dcf00 100644
--- a/math/R-cran-Rmpfr/Makefile
+++ b/math/R-cran-Rmpfr/Makefile
@@ -1,20 +1,21 @@
 PORTNAME=	Rmpfr
 DISTVERSION=	0.8-9
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	R wrapper for the mpfr multiple precision library
 WWW=		https://cran.r-project.org/web/packages/Rmpfr/
 
 LICENSE=	GPLv2+
 
 CRAN_DEPENDS=	R-cran-gmp>=0.6.1:math/R-cran-gmp
 LIB_DEPENDS=	libgmp.so:math/gmp \
 		libmpfr.so:math/mpfr
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=	cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-Rsolnp/Makefile b/math/R-cran-Rsolnp/Makefile
index 1401f951ba82..3b27f2be95b0 100644
--- a/math/R-cran-Rsolnp/Makefile
+++ b/math/R-cran-Rsolnp/Makefile
@@ -1,21 +1,21 @@
 PORTNAME=	Rsolnp
 DISTVERSION=	1.16
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	General Non-Linear Optimization
 WWW=		https://cran.r-project.org/web/packages/Rsolnp/
 
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
 CRAN_DEPENDS=	R-cran-truncnorm>0:math/R-cran-truncnorm
 
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=	cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-SQUAREM/Makefile b/math/R-cran-SQUAREM/Makefile
index 18f99ca9358e..453ca7bbf7a7 100644
--- a/math/R-cran-SQUAREM/Makefile
+++ b/math/R-cran-SQUAREM/Makefile
@@ -1,14 +1,15 @@
 PORTNAME=	SQUAREM
 DISTVERSION=	2021.1
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Squared Extrapolation Methods for Accelerating EM-Like Algorithms
 WWW=		https://cran.r-project.org/web/packages/SQUAREM/
 
 LICENSE=	GPLv2+
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-SparseM/Makefile b/math/R-cran-SparseM/Makefile
index 78b8fab7d661..8c42ec405a42 100644
--- a/math/R-cran-SparseM/Makefile
+++ b/math/R-cran-SparseM/Makefile
@@ -1,14 +1,15 @@
 PORTNAME=	SparseM
 PORTVERSION=	1.81
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Sparse Linear Algebra
 WWW=		https://cran.r-project.org/web/packages/SparseM/
 
 LICENSE=	GPLv2+
 
 USES=	cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-VGAM/Makefile b/math/R-cran-VGAM/Makefile
index afe6d954d56f..b4bd1bbe5af4 100644
--- a/math/R-cran-VGAM/Makefile
+++ b/math/R-cran-VGAM/Makefile
@@ -1,15 +1,16 @@
 PORTNAME=	VGAM
 DISTVERSION=	1.1-8
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Vector Generalized Linear and Additive Models
 WWW=		https://www.stat.auckland.ac.nz/~yee/VGAM
 
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-XLConnect/Makefile b/math/R-cran-XLConnect/Makefile
index e3983f79bb22..3fcd6ed17de2 100644
--- a/math/R-cran-XLConnect/Makefile
+++ b/math/R-cran-XLConnect/Makefile
@@ -1,38 +1,39 @@
 PORTNAME=	XLConnect
 PORTVERSION=	1.0.7
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	R package for manipulating Microsoft Excel files
 WWW=		https://cran.r-project.org/package=XLConnect
 
 LICENSE=	GPLv3
 
 BUILD_DEPENDS=	R-cran-rJava>0:devel/R-cran-rJava
 RUN_DEPENDS=	R-cran-rJava>0:devel/R-cran-rJava	\
 		apache-poi>0:textproc/apache-poi	\
 		SparseBitSet>0:devel/sparsebitset	\
 		apache-xmlbeans>0:textproc/apache-xmlbeans	\
 		apache-commons-math>0:math/apache-commons-math	\
 		apache-commons-codec>0:java/apache-commons-codec	\
 		apache-commons-compress>0:archivers/apache-commons-compress \
 		apache-commons-collections4>0:java/apache-commons-collections4
 
 USES=		cran
 USE_JAVA=	yes
 
 DEP_JARS=	commons-codec commons-collections4 commons-compress commons-io	\
 		log4j-api log4j-core poi poi-ooxml poi-ooxml-full SparseBitSet	\
 		xmlbeans
 
 post-install:
 .for j in ${DEP_JARS}
 	${LN} -sf ${JAVALIBDIR}/${j}.jar ${STAGEDIR}${PREFIX}/${R_MOD_DIR}/java/
 .endfor
 	${LN} -sf ${JAVALIBDIR}/commons-math.jar	\
 		${STAGEDIR}${PREFIX}/${R_MOD_DIR}/java/commons-math3.jar
 	${LN} -sf ${JAVALIBDIR}/commons-codec.jar	\
 		${STAGEDIR}${PREFIX}/${R_MOD_DIR}/java/commons-codec-1.15.jar
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-Zelig/Makefile b/math/R-cran-Zelig/Makefile
index a8f7fe6d8bd8..491d545dcba0 100644
--- a/math/R-cran-Zelig/Makefile
+++ b/math/R-cran-Zelig/Makefile
@@ -1,41 +1,42 @@
 PORTNAME=	Zelig
 DISTVERSION=	5.1.7
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Everyone's Statistical Software
 WWW=		https://gking.harvard.edu/zelig
 
 LICENSE=	GPLv3+
 
 BUILD_DEPENDS=	R-cran-AER>=0:finance/R-cran-AER \
 		R-cran-Amelia>=0:math/R-cran-Amelia \
 		R-cran-sandwich>=0:math/R-cran-sandwich \
 		R-cran-VGAM>=0:math/R-cran-VGAM \
 		R-cran-plyr>=0:devel/R-cran-plyr \
 		R-cran-quantreg>=0:math/R-cran-quantreg \
 		R-cran-MCMCpack>=0:math/R-cran-MCMCpack \
 		R-cran-maxLik>=0:math/R-cran-maxLik \
 		R-cran-jsonlite>=0:converters/R-cran-jsonlite \
 		R-cran-dplyr>=0:math/R-cran-dplyr \
 		R-cran-MatchIt>=0:math/R-cran-MatchIt \
 		R-cran-geepack>=0:math/R-cran-geepack \
 		R-cran-survey>=0:math/R-cran-survey
 RUN_DEPENDS=	R-cran-AER>=0:finance/R-cran-AER \
 		R-cran-Amelia>=0:math/R-cran-Amelia \
 		R-cran-sandwich>=0:math/R-cran-sandwich \
 		R-cran-VGAM>=0:math/R-cran-VGAM \
 		R-cran-plyr>=0:devel/R-cran-plyr \
 		R-cran-quantreg>=0:math/R-cran-quantreg \
 		R-cran-MCMCpack>=0:math/R-cran-MCMCpack \
 		R-cran-maxLik>=0:math/R-cran-maxLik \
 		R-cran-jsonlite>=0:converters/R-cran-jsonlite \
 		R-cran-dplyr>=0:math/R-cran-dplyr \
 		R-cran-MatchIt>=0:math/R-cran-MatchIt \
 		R-cran-geepack>=0:math/R-cran-geepack \
 		R-cran-survey>=0:math/R-cran-survey
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-acepack/Makefile b/math/R-cran-acepack/Makefile
index 98e87028e40d..5cf1e0c06606 100644
--- a/math/R-cran-acepack/Makefile
+++ b/math/R-cran-acepack/Makefile
@@ -1,15 +1,15 @@
 PORTNAME=	acepack
 PORTVERSION=	1.4.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	dteske@FreeBSD.org
 COMMENT=	ACE and AVAS for selecting multiple regression transformations
 WWW=		https://cran.r-project.org/web/packages/acepack/
 
 LICENSE=	MIT
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-admisc/Makefile b/math/R-cran-admisc/Makefile
index 100f6e2a3c81..519d7ce3cbd3 100644
--- a/math/R-cran-admisc/Makefile
+++ b/math/R-cran-admisc/Makefile
@@ -1,14 +1,15 @@
 PORTNAME=	admisc
 DISTVERSION=	0.31
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Adrian Dusa's Miscellaneous
 WWW=		https://cran.r-project.org/package=admisc
 
 LICENSE=	GPLv3+
 
 USES=		cran:compiles
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-alabama/Makefile b/math/R-cran-alabama/Makefile
index a6b0dfd464ac..d41a42152f3e 100644
--- a/math/R-cran-alabama/Makefile
+++ b/math/R-cran-alabama/Makefile
@@ -1,19 +1,19 @@
 PORTNAME=	alabama
 DISTVERSION=	2015.3-1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	dteske@FreeBSD.org
 COMMENT=	Constrained Nonlinear Optimization
 WWW=		https://cran.r-project.org/web/packages/alabama/
 
 LICENSE=	GPLv2+
 
 CRAN_DEPENDS=	R-cran-numDeriv>0:math/R-cran-numDeriv
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-ash/Makefile b/math/R-cran-ash/Makefile
index 17651b2af680..a6f0912386f1 100644
--- a/math/R-cran-ash/Makefile
+++ b/math/R-cran-ash/Makefile
@@ -1,14 +1,15 @@
 PORTNAME=	ash
 DISTVERSION=	1.0-15
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	David Scott's ASH Routines
 WWW=		https://cran.r-project.org/package=ash
 
 LICENSE=	GPLv2+
 
 USES=		cran:compiles
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-assertthat/Makefile b/math/R-cran-assertthat/Makefile
index d8b138abee82..f5bd9aa1c949 100644
--- a/math/R-cran-assertthat/Makefile
+++ b/math/R-cran-assertthat/Makefile
@@ -1,15 +1,15 @@
 PORTNAME=	assertthat
 DISTVERSION=	0.2.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Easy pre and post assertions
 WWW=		https://cran.r-project.org/web/packages/assertthat/
 
 LICENSE=	GPLv3
 
 USES=	cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-backports/Makefile b/math/R-cran-backports/Makefile
index b0cf0613d987..2b24aca0fafc 100644
--- a/math/R-cran-backports/Makefile
+++ b/math/R-cran-backports/Makefile
@@ -1,14 +1,15 @@
 PORTNAME=	backports
 PORTVERSION=	1.4.1
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Reimplementations of Functions Introduced Since R-3.0.0
 WWW=		https://cran.r-project.org/web/packages/backports/
 
 LICENSE=	GPLv2+
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-bdsmatrix/Makefile b/math/R-cran-bdsmatrix/Makefile
index 82c55dc6eaac..dbcb889964ab 100644
--- a/math/R-cran-bdsmatrix/Makefile
+++ b/math/R-cran-bdsmatrix/Makefile
@@ -1,14 +1,15 @@
 PORTNAME=	bdsmatrix
 DISTVERSION=	1.3-6
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Routines for Block Diagonal Symmetric matrices
 WWW=		https://cran.r-project.org/web/packages/bdsmatrix/
 
 LICENSE=	LGPL20
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-car/Makefile b/math/R-cran-car/Makefile
index 8b795eac0228..3f1d4a76300f 100644
--- a/math/R-cran-car/Makefile
+++ b/math/R-cran-car/Makefile
@@ -1,28 +1,29 @@
 PORTNAME=	car
 DISTVERSION=	3.1-1
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Companion to Applied Regression
 WWW=		https://r-forge.r-project.org/projects/car/
 
 LICENSE=	GPLv2+
 
 RUN_DEPENDS=	R-cran-maptools>0:astro/R-cran-maptools \
 		R-cran-abind>0:devel/R-cran-abind \
 		R-cran-carData>=3.0.0:math/R-cran-carData \
 		R-cran-lme4>0:math/R-cran-lme4 \
 		R-cran-pbkrtest>=0.4.4:math/R-cran-pbkrtest \
 		R-cran-quantreg>0:math/R-cran-quantreg \
 		R-cran-rio>0:textproc/R-cran-rio \
 		R-cran-stringi>=0:textproc/R-cran-stringi
 TEST_DEPENDS=	R-cran-lmtest>0:finance/R-cran-lmtest \
 		R-cran-MatrixModels>0:math/R-cran-MatrixModels \
 		R-cran-SparseM>0:math/R-cran-SparseM \
 		R-cran-sandwich>0:math/R-cran-sandwich \
 		R-cran-survey>0:math/R-cran-survey
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-carData/Makefile b/math/R-cran-carData/Makefile
index 3fb83d7dcb49..5c637820b37d 100644
--- a/math/R-cran-carData/Makefile
+++ b/math/R-cran-carData/Makefile
@@ -1,14 +1,15 @@
 PORTNAME=	carData
 DISTVERSION=	3.0-5
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Companion to Applied Regression Data Sets
 WWW=		https://r-forge.r-project.org/projects/car/
 
 LICENSE=	GPLv2+
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-coda/Makefile b/math/R-cran-coda/Makefile
index cb470e6ab3c5..7bd00d9a19bd 100644
--- a/math/R-cran-coda/Makefile
+++ b/math/R-cran-coda/Makefile
@@ -1,14 +1,15 @@
 PORTNAME=	coda
 DISTVERSION=	0.19-4
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Output analysis and diagnostics for MCMC
 WWW=		https://cran.case.edu/web/packages/coda/index.html
 
 LICENSE=	GPLv2+
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-combinat/Makefile b/math/R-cran-combinat/Makefile
index ee4def77aaaf..afabe65af377 100644
--- a/math/R-cran-combinat/Makefile
+++ b/math/R-cran-combinat/Makefile
@@ -1,15 +1,15 @@
 PORTNAME=	combinat
 DISTVERSION=	0.0-8
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Routines for combinatorics
 WWW=		https://cran.r-project.org/package=combinat
 
 LICENSE=	GPLv2
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-conf.design/Makefile b/math/R-cran-conf.design/Makefile
index 5c639b367d93..5cb9f0b03974 100644
--- a/math/R-cran-conf.design/Makefile
+++ b/math/R-cran-conf.design/Makefile
@@ -1,15 +1,15 @@
 PORTNAME=	conf.design
 DISTVERSION=	2.0.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Construction of factorial designs
 WWW=		https://cran.r-project.org/package=conf.design
 
 LICENSE=	GPLv2
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-conquer/Makefile b/math/R-cran-conquer/Makefile
index ddb8c19f280c..20a144e029db 100644
--- a/math/R-cran-conquer/Makefile
+++ b/math/R-cran-conquer/Makefile
@@ -1,20 +1,21 @@
 PORTNAME=	conquer
 PORTVERSION=	1.3.1
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Convolution-Type Smoothed Quantile Regression
 WWW=		https://cran.r-project.org/web/packages/conquer/
 
 LICENSE=	GPLv3
 
 CRAN_DEPENDS=	R-cran-Rcpp>=1.0.3:devel/R-cran-Rcpp \
 		R-cran-matrixStats>0:math/R-cran-matrixStats \
 		R-cran-RcppArmadillo>=0.9.850.1.0:math/R-cran-RcppArmadillo
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		compiler:c++11-lang cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-cvar/Makefile b/math/R-cran-cvar/Makefile
index d7cb9f3880e9..615add474ec1 100644
--- a/math/R-cran-cvar/Makefile
+++ b/math/R-cran-cvar/Makefile
@@ -1,20 +1,21 @@
 PORTNAME=	cvar
 DISTVERSION=	0.5
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	ygy@FreeBSD.org
 COMMENT=	Compute Expected Shortfall and Value at Risk for Continuous Distributions
 WWW=		https://geobosh.github.io/cvar/
 
 LICENSE=	GPLv2+
 
 RUN_DEPENDS=	R-cran-Rdpack>=0.8:devel/R-cran-Rdpack \
 		R-cran-gbutils>0:math/R-cran-gbutils
 TEST_DEPENDS=	R-cran-testthat>0:devel/R-cran-testthat \
 		R-cran-PerformanceAnalytics>0:finance/R-cran-PerformanceAnalytics \
 		R-cran-fGarch>0:finance/R-cran-fGarch
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-date/Makefile b/math/R-cran-date/Makefile
index 26d8b8f9ca59..eb66274efa80 100644
--- a/math/R-cran-date/Makefile
+++ b/math/R-cran-date/Makefile
@@ -1,14 +1,15 @@
 PORTNAME=	date
 DISTVERSION=	1.2-42
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	ygy@FreeBSD.org
 COMMENT=	Functions for Handling Dates
 WWW=		https://CRAN.R-project.org/package=date
 
 LICENSE=	GPLv2
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-ddalpha/Makefile b/math/R-cran-ddalpha/Makefile
index 350922dfc960..36625ffae535 100644
--- a/math/R-cran-ddalpha/Makefile
+++ b/math/R-cran-ddalpha/Makefile
@@ -1,22 +1,23 @@
 PORTNAME=	ddalpha
 PORTVERSION=	1.3.13
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Depth-Based Classification and Calculation of Data Depth
 WWW=		https://cran.r-project.org/web/packages/ddalpha/
 
 LICENSE=	GPLv2
 
 CRAN_DEPENDS=	R-cran-robustbase>0:math/R-cran-robustbase \
 		R-cran-sfsmisc>0:devel/R-cran-sfsmisc \
 		R-cran-geometry>0:math/R-cran-geometry \
 		R-cran-Rcpp>=0.11.0:devel/R-cran-Rcpp \
 		R-cran-BH>0:devel/R-cran-BH
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		compiler:c++11-lang cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-deldir/Makefile b/math/R-cran-deldir/Makefile
index ba77add42a50..aeea417b9221 100644
--- a/math/R-cran-deldir/Makefile
+++ b/math/R-cran-deldir/Makefile
@@ -1,14 +1,15 @@
 PORTNAME=	deldir
 DISTVERSION=	1.0-6
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Delaunay Triangulation and Dirichlet (Voronoi) Tessellation
 WWW=		https://cran.r-project.org/web/packages/deldir/
 
 LICENSE=	GPLv2+
 
 USES=	cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-dimRed/Makefile b/math/R-cran-dimRed/Makefile
index 630b5d3c1468..f74fce7f1827 100644
--- a/math/R-cran-dimRed/Makefile
+++ b/math/R-cran-dimRed/Makefile
@@ -1,20 +1,21 @@
 PORTNAME=	dimRed
 PORTVERSION=	0.2.6
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Framework for Dimensionality Reduction
 WWW=		https://cran.r-project.org/web/packages/dimRed/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 CRAN_DEPENDS=	R-cran-DRR>0:math/R-cran-DRR \
 		R-cran-magrittr>0:devel/R-cran-magrittr
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-dlmodeler/Makefile b/math/R-cran-dlmodeler/Makefile
index 04237b4cad87..7072fcaec41e 100644
--- a/math/R-cran-dlmodeler/Makefile
+++ b/math/R-cran-dlmodeler/Makefile
@@ -1,18 +1,18 @@
 PORTNAME=	dlmodeler
 DISTVERSION=	1.4-2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	cnszym@gmail.com
 COMMENT=	Generalized Dynamic Linear Modeler
 WWW=		https://www.rdocumentation.org/packages/dlmodeler/
 
 LICENSE=	GPLv2 GPLv3 BSD2CLAUSE
 LICENSE_COMB=	dual
 
 BUILD_DEPENDS=	R-cran-KFAS>0:math/R-cran-KFAS
 
 USES=	cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-dplyr/Makefile b/math/R-cran-dplyr/Makefile
index f4d9eac4e338..56bc205a4c35 100644
--- a/math/R-cran-dplyr/Makefile
+++ b/math/R-cran-dplyr/Makefile
@@ -1,29 +1,30 @@
 PORTNAME=	dplyr
 DISTVERSION=	1.1.1
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Grammar of Data Manipulation
 WWW=		https://github.com/hadley/dplyr
 
 LICENSE=	MIT
 
 BUILD_DEPENDS=	R-cran-assertthat>=0.2.0:math/R-cran-assertthat \
 		R-cran-generics>=0:devel/R-cran-generics \
 		R-cran-glue>=1.3.0:devel/R-cran-glue \
 		R-cran-magrittr>=1.5:devel/R-cran-magrittr \
 		R-cran-pkgconfig>0:devel/R-cran-pkgconfig \
 		R-cran-R6>0:devel/R-cran-R6 \
 		R-cran-Rcpp>=1.0.1:devel/R-cran-Rcpp \
 		R-cran-rlang>=1.1.0:devel/R-cran-rlang \
 		R-cran-tibble>=3.2.0:devel/R-cran-tibble \
 		R-cran-tidyselect>=0.2.5:devel/R-cran-tidyselect \
 		R-cran-BH>0:devel/R-cran-BH \
 		R-cran-plogr>=0.2.0:devel/R-cran-plogr \
 		R-cran-vctrs>=0.6.0:devel/R-cran-vctrs
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-eRm/Makefile b/math/R-cran-eRm/Makefile
index 982f3f434106..f3e2e9fb8a8b 100644
--- a/math/R-cran-eRm/Makefile
+++ b/math/R-cran-eRm/Makefile
@@ -1,17 +1,18 @@
 PORTNAME=	eRm
 DISTVERSION=	1.0-2
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Extended Rasch Modeling
 WWW=		https://cran.r-project.org/package=eRm
 
 LICENSE=	GPLv3
 
 RUN_DEPENDS=	R-cran-psych>0:math/R-cran-psych	\
 		R-cran-colorspace>0:graphics/R-cran-colorspace
 
 USES=		cran:compiles
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-energy/Makefile b/math/R-cran-energy/Makefile
index 2729a147fff2..a91ef0e66901 100644
--- a/math/R-cran-energy/Makefile
+++ b/math/R-cran-energy/Makefile
@@ -1,17 +1,18 @@
 PORTNAME=	energy
 DISTVERSION=	1.7-11
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	ygy@FreeBSD.org
 COMMENT=	E-Statistics: Multivariate Inference via the Energy of Data
 WWW=		https://github.com/mariarizzo/energy
 
 LICENSE=	GPLv2+
 
 RUN_DEPENDS=	R-cran-Rcpp>=0.12.6:devel/R-cran-Rcpp \
 		R-cran-gsl>0:math/R-cran-gsl
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-exactRankTests/Makefile b/math/R-cran-exactRankTests/Makefile
index e98f67821a0b..b8c559947d5e 100644
--- a/math/R-cran-exactRankTests/Makefile
+++ b/math/R-cran-exactRankTests/Makefile
@@ -1,14 +1,15 @@
 PORTNAME=	exactRankTests
 DISTVERSION=	0.8-35
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Exact Distributions for Rank and Permutation Tests
 WWW=		https://cran.r-project.org/package=exactRankTests
 
 LICENSE=	GPLv2+
 
 USES=		cran:compiles
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-expm/Makefile b/math/R-cran-expm/Makefile
index d5db71e7a982..beee156aa506 100644
--- a/math/R-cran-expm/Makefile
+++ b/math/R-cran-expm/Makefile
@@ -1,14 +1,15 @@
 PORTNAME=	expm
 DISTVERSION=	0.999-6
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Matrix Exponential, Log, 'etc'
 WWW=		https://cran.r-project.org/web/packages/expm/
 
 LICENSE=	GPLv2+
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-forcats/Makefile b/math/R-cran-forcats/Makefile
index 1bad7506992a..fdbf15e38611 100644
--- a/math/R-cran-forcats/Makefile
+++ b/math/R-cran-forcats/Makefile
@@ -1,27 +1,28 @@
 PORTNAME=	forcats
 DISTVERSION=	1.0.0
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	ygy@FreeBSD.org
 COMMENT=	Tools for Working with Categorical Variables (Factors)
 WWW=		https://forcats.tidyverse.org/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	R-cran-knitr>0:print/R-cran-knitr
 RUN_DEPENDS=	R-cran-cli>=3.4.0:devel/R-cran-cli \
 		R-cran-glue>0:devel/R-cran-glue \
 		R-cran-lifecycle>0:devel/R-cran-lifecycle \
 		R-cran-magrittr>0:devel/R-cran-magrittr \
 		R-cran-rlang>=1.0.0:devel/R-cran-rlang \
 		R-cran-tibble>0:devel/R-cran-tibble
 TEST_DEPENDS=	R-cran-covr>0:devel/R-cran-covr \
 		R-cran-ggplot2>0:graphics/R-cran-ggplot2 \
 		R-cran-dplyr>0:math/R-cran-dplyr \
 		R-cran-knitr>0:print/R-cran-knitr
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-forecast/Makefile b/math/R-cran-forecast/Makefile
index 84b637fff3ec..73935dba5372 100644
--- a/math/R-cran-forecast/Makefile
+++ b/math/R-cran-forecast/Makefile
@@ -1,29 +1,30 @@
 PORTNAME=	forecast
 PORTVERSION=	8.17.0
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Forecasting functions for time series and linear models
 WWW=		https://cran.r-project.org/web/packages/forecast/
 
 LICENSE=	GPLv3
 
 CRAN_DEPENDS=	R-cran-colorspace>0:graphics/R-cran-colorspace \
 		R-cran-fracdiff>0:math/R-cran-fracdiff \
 		R-cran-generics>=0.1.2:devel/R-cran-generics \
 		R-cran-ggplot2>=2.2.1:graphics/R-cran-ggplot2 \
 		R-cran-lmtest>0:finance/R-cran-lmtest \
 		R-cran-magrittr>0:devel/R-cran-magrittr \
 		R-cran-Rcpp>=0.11.0:devel/R-cran-Rcpp \
 		R-cran-timeDate>0:finance/R-cran-timeDate \
 		R-cran-tseries>0:finance/R-cran-tseries \
 		R-cran-urca>0:finance/R-cran-urca \
 		R-cran-zoo>0:math/R-cran-zoo \
 		R-cran-RcppArmadillo>=0.2.35:math/R-cran-RcppArmadillo
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=	cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-fracdiff/Makefile b/math/R-cran-fracdiff/Makefile
index b9afd1e43cbb..7dbd3f12b79f 100644
--- a/math/R-cran-fracdiff/Makefile
+++ b/math/R-cran-fracdiff/Makefile
@@ -1,15 +1,15 @@
 PORTNAME=	fracdiff
 DISTVERSION=	1.5-1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Fractionally differenced ARIMA aka ARFIMA(p,d,q) models
 WWW=		https://cran.r-project.org/web/packages/fracdiff/
 
 LICENSE=	GPLv2+
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-gbutils/Makefile b/math/R-cran-gbutils/Makefile
index 6ce5669dfd6b..32df62e732c4 100644
--- a/math/R-cran-gbutils/Makefile
+++ b/math/R-cran-gbutils/Makefile
@@ -1,17 +1,18 @@
 PORTNAME=	gbutils
 DISTVERSION=	0.5
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	ygy@FreeBSD.org
 COMMENT=	Utilities for Simulation, Plots, Quantile Functions and Programming
 WWW=		https://github.com/GeoBosh/gbutils
 
 LICENSE=	GPLv2+
 
 RUN_DEPENDS=	R-cran-Rdpack>=0.9:devel/R-cran-Rdpack
 TEST_DEPENDS=	R-cran-testthat>=3.0.0:devel/R-cran-testthat
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-geepack/Makefile b/math/R-cran-geepack/Makefile
index b9ea84a9f4b8..66d45127a5c0 100644
--- a/math/R-cran-geepack/Makefile
+++ b/math/R-cran-geepack/Makefile
@@ -1,19 +1,20 @@
 PORTNAME=	geepack
 DISTVERSION=	1.3.9
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Generalized Estimating Equation Package
 WWW=		https://cran.r-project.org/web/packages/geepack/
 
 LICENSE=	GPLv3
 
 CRAN_DEPENDS=	R-cran-broom>=0:devel/R-cran-broom \
 		R-cran-magrittr>=0:devel/R-cran-magrittr
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-geometry/Makefile b/math/R-cran-geometry/Makefile
index 2bf77e813a86..0b8cb12eaa0f 100644
--- a/math/R-cran-geometry/Makefile
+++ b/math/R-cran-geometry/Makefile
@@ -1,22 +1,23 @@
 PORTNAME=	geometry
 DISTVERSION=	0.4.6.1
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Mesh Generation and Surface Tesselation
 WWW=		https://cran.r-project.org/web/packages/geometry/
 
 LICENSE=	GPLv3
 
 CRAN_DEPENDS=	R-cran-magic>0:math/R-cran-magic \
 		R-cran-Rcpp>0:devel/R-cran-Rcpp \
 		R-cran-lpSolve>0:math/R-cran-lpSolve \
 		R-cran-linprog>0:math/R-cran-linprog \
 		R-cran-RcppProgress>0:devel/R-cran-RcppProgress
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-gmp/Makefile b/math/R-cran-gmp/Makefile
index 8dfedcc45d33..2180796e0f71 100644
--- a/math/R-cran-gmp/Makefile
+++ b/math/R-cran-gmp/Makefile
@@ -1,16 +1,17 @@
 PORTNAME=	gmp
 DISTVERSION=	0.6-6
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Multiple Precision Arithmetic
 WWW=		https://cran.r-project.org/web/packages/gmp/
 
 LICENSE=	GPLv2+
 
 LIB_DEPENDS=	libgmp.so:math/gmp
 
 USES=	cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-gower/Makefile b/math/R-cran-gower/Makefile
index 4d964cd4ba78..d58f67b0d7b5 100644
--- a/math/R-cran-gower/Makefile
+++ b/math/R-cran-gower/Makefile
@@ -1,17 +1,18 @@
 PORTNAME=	gower
 DISTVERSION=	1.0.0
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Gower's Distance
 WWW=		https://cran.r-project.org/web/packages/gower/
 
 LICENSE=	GPLv3
 
 USES=		cran:auto-plist,compiles
 
 OPTIONS_DEFINE=	OPENMP
 OPTIONS_DEFAULT=	OPENMP
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-gpclib/Makefile b/math/R-cran-gpclib/Makefile
index dab03205bab1..29abcf60578e 100644
--- a/math/R-cran-gpclib/Makefile
+++ b/math/R-cran-gpclib/Makefile
@@ -1,13 +1,13 @@
 PORTNAME=	gpclib
 DISTVERSION=	1.5-6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	General Polygon Clipping Library for R
 WWW=		https://github.com/rdpeng/gpclib
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-gsl/Makefile b/math/R-cran-gsl/Makefile
index 8654a4f7331b..60a554a4e559 100644
--- a/math/R-cran-gsl/Makefile
+++ b/math/R-cran-gsl/Makefile
@@ -1,16 +1,17 @@
 PORTNAME=	gsl
 DISTVERSION=	2.1-8
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	ygy@FreeBSD.org
 COMMENT=	Wrapper for the Gnu Scientific Library
 WWW=		https://github.com/RobinHankin/gsl
 
 LICENSE=	GPLv3
 
 LIB_DEPENDS=	libgsl.so:math/gsl
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-gss/Makefile b/math/R-cran-gss/Makefile
index 06d002227896..4c91cfeb4030 100644
--- a/math/R-cran-gss/Makefile
+++ b/math/R-cran-gss/Makefile
@@ -1,14 +1,15 @@
 PORTNAME=	gss
 DISTVERSION=	2.2-4
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	General Smoothing Splines
 WWW=		https://CRAN.R-project.org/package=gss
 
 LICENSE=	GPLv2+
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-gtable/Makefile b/math/R-cran-gtable/Makefile
index 47d968e0c145..558be9e5ee1f 100644
--- a/math/R-cran-gtable/Makefile
+++ b/math/R-cran-gtable/Makefile
@@ -1,14 +1,15 @@
 PORTNAME=	gtable
 PORTVERSION=	0.3.1
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Arrange grobs in tables
 WWW=		https://cran.r-project.org/web/packages/gtable/
 
 LICENSE=	MIT
 
 USES=	cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-haven/Makefile b/math/R-cran-haven/Makefile
index 250d2846f0da..b498b9ce7464 100644
--- a/math/R-cran-haven/Makefile
+++ b/math/R-cran-haven/Makefile
@@ -1,30 +1,31 @@
 PORTNAME=	haven
 DISTVERSION=	2.5.2
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Import and Export 'SPSS', 'Stata' and 'SAS' Files
 WWW=		https://haven.tidyverse.org/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	R-cran-knitr>0:print/R-cran-knitr
 RUN_DEPENDS=	R-cran-Rcpp>=0.11.4:devel/R-cran-Rcpp \
 		R-cran-hms>0:devel/R-cran-hms \
 		R-cran-tibble>0:devel/R-cran-tibble \
 		R-cran-forcats>=0.2.0:math/R-cran-forcats \
 		R-cran-readr>=0.1.0:textproc/R-cran-readr \
 		R-cran-tidyselect>=0:devel/R-cran-tidyselect
 TEST_DEPENDS=	R-cran-cli>0:devel/R-cran-cli \
 		R-cran-covr>0:devel/R-cran-covr \
 		R-cran-crayon>0:devel/R-cran-crayon \
 		R-cran-pillar>=1.1.1:devel/R-cran-pillar \
 		R-cran-testthat>0:devel/R-cran-testthat \
 		R-cran-knitr>0:print/R-cran-knitr \
 		R-cran-rmarkdown>0:textproc/R-cran-rmarkdown
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-hdrcde/Makefile b/math/R-cran-hdrcde/Makefile
index d4e8f6bc4af7..5c611094e73c 100644
--- a/math/R-cran-hdrcde/Makefile
+++ b/math/R-cran-hdrcde/Makefile
@@ -1,20 +1,21 @@
 PORTNAME=	hdrcde
 PORTVERSION=	3.4
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Highest Density Regions and Conditional Density Estimation
 WWW=		https://cran.r-project.org/package=hdrcde
 
 LICENSE=	GPLv3
 
 RUN_DEPENDS=	R-cran-ash>0:math/R-cran-ash	\
 		R-cran-ks>0:science/R-cran-ks	\
 		R-cran-locfit>0:math/R-cran-locfit	\
 		R-cran-ggplot2>0:graphics/R-cran-ggplot2	\
 		R-cran-RColorBrewer>0:graphics/R-cran-RColorBrewer
 
 USES=		cran:compiles
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-hexbin/Makefile b/math/R-cran-hexbin/Makefile
index 81aa0fdcc296..79ba7a631785 100644
--- a/math/R-cran-hexbin/Makefile
+++ b/math/R-cran-hexbin/Makefile
@@ -1,17 +1,18 @@
 PORTNAME=	hexbin
 DISTVERSION=	1.28.3
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	ygy@FreeBSD.org
 COMMENT=	Hexagonal Binning Routines
 WWW=		https://github.com/edzer/hexbin
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	R-cran-knitr>0:print/R-cran-knitr
 TEST_DEPENDS=	R-cran-knitr>0:print/R-cran-knitr
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-igraph/Makefile b/math/R-cran-igraph/Makefile
index 67fb23adc471..e648a330698d 100644
--- a/math/R-cran-igraph/Makefile
+++ b/math/R-cran-igraph/Makefile
@@ -1,25 +1,26 @@
 PORTNAME=	igraph
 DISTVERSION=	1.3.4
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Network Analysis and Visualization
 WWW=		https://cran.r-project.org/web/packages/igraph/
 
 LICENSE=	GPLv2+
 
 BROKEN_sparc64=	does not compile on sparc64: uses i386 assembler
 
 LIB_DEPENDS=	libgmp.so:math/gmp \
 		libglpk.so:math/glpk
 CRAN_DEPENDS=	R-cran-magrittr>0:devel/R-cran-magrittr \
 		R-cran-pkgconfig>=2.0.0:devel/R-cran-pkgconfig \
 		R-cran-rlang>0:devel/R-cran-rlang
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		compiler:c++11-lang cran:auto-plist,compiles gnome
 USE_GNOME=	libxml2
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-influenceR/Makefile b/math/R-cran-influenceR/Makefile
index ef4c4d0d83eb..8226c1b05d27 100644
--- a/math/R-cran-influenceR/Makefile
+++ b/math/R-cran-influenceR/Makefile
@@ -1,18 +1,19 @@
 PORTNAME=	influenceR
 PORTVERSION=	0.1.0.1
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Software Tools to Quantify Structural Importance of Nodes in a Network
 WWW=		https://cran.r-project.org/web/packages/influenceR/
 
 LICENSE=	GPLv2
 
 CRAN_DEPENDS=	R-cran-igraph>=1.0.1:math/R-cran-igraph
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-inline/Makefile b/math/R-cran-inline/Makefile
index 5b5a7b3b411b..7f60f072fd46 100644
--- a/math/R-cran-inline/Makefile
+++ b/math/R-cran-inline/Makefile
@@ -1,15 +1,16 @@
 PORTNAME=	inline
 PORTVERSION=	0.3.19
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Inline C, C++, Fortran function calls from R
 WWW=		https://cran.r-project.org/web/packages/inline/
 
 LICENSE=	LGPL20 LGPL21 LGPL3
 LICENSE_COMB=	multi
 
 USES=	cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-intervals/Makefile b/math/R-cran-intervals/Makefile
index bbc99f703ae0..202bbb4c4437 100644
--- a/math/R-cran-intervals/Makefile
+++ b/math/R-cran-intervals/Makefile
@@ -1,14 +1,15 @@
 PORTNAME=	intervals
 DISTVERSION=	0.15.3
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	ygy@FreeBSD.org
 COMMENT=	Tools for Working with Points and Intervals
 WWW=		https://github.com/edzer/intervals
 
 LICENSE=	ART20
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-ipred/Makefile b/math/R-cran-ipred/Makefile
index ceca47237c7d..a85f5322bdcd 100644
--- a/math/R-cran-ipred/Makefile
+++ b/math/R-cran-ipred/Makefile
@@ -1,18 +1,19 @@
 PORTNAME=	ipred
 DISTVERSION=	0.9-13
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Improved Predictors
 WWW=		https://cran.r-project.org/web/packages/ipred/
 
 LICENSE=	GPLv2+
 
 CRAN_DEPENDS=	R-cran-prodlim>0:math/R-cran-prodlim
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-irlba/Makefile b/math/R-cran-irlba/Makefile
index 53acecc39d67..7cfca264419b 100644
--- a/math/R-cran-irlba/Makefile
+++ b/math/R-cran-irlba/Makefile
@@ -1,14 +1,15 @@
 PORTNAME=	irlba
 PORTVERSION=	2.3.5
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Fast partial SVD by implicitly-restarted Lanczos bidiagonalization
 WWW=		https://cran.r-project.org/web/packages/irlba/
 
 LICENSE=	GPLv3
 
 USES=	cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-isoband/Makefile b/math/R-cran-isoband/Makefile
index b208456ee139..6b2efc30b551 100644
--- a/math/R-cran-isoband/Makefile
+++ b/math/R-cran-isoband/Makefile
@@ -1,14 +1,15 @@
 PORTNAME=	isoband
 PORTVERSION=	0.2.5
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Generate Isolines and Isobands from Regularly Spaced Elevation Grids
 WWW=		https://cran.r-project.org/web/packages/isoband/
 
 LICENSE=	MIT
 
 USES=		cran:auto-plist,compiles compiler:c++11-lang
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-labeling/Makefile b/math/R-cran-labeling/Makefile
index 417d278fe651..7ace6c86d949 100644
--- a/math/R-cran-labeling/Makefile
+++ b/math/R-cran-labeling/Makefile
@@ -1,14 +1,15 @@
 PORTNAME=	labeling
 PORTVERSION=	0.4.2
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Provides a range of axis labeling algorithms
 WWW=		https://cran.r-project.org/web/packages/labeling/
 
 LICENSE=	MIT
 
 USES=	cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-lava/Makefile b/math/R-cran-lava/Makefile
index f9dd2a20e44d..6bf523727545 100644
--- a/math/R-cran-lava/Makefile
+++ b/math/R-cran-lava/Makefile
@@ -1,21 +1,22 @@
 PORTNAME=	lava
 DISTVERSION=	1.6.10
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Latent Variable Models
 WWW=		https://cran.r-project.org/web/packages/lava/
 
 LICENSE=	GPLv3
 
 CRAN_DEPENDS=	R-cran-future.apply>0:devel/R-cran-future.apply \
 		R-cran-progressr>0:devel/R-cran-progressr \
 		R-cran-numDeriv>0:math/R-cran-numDeriv \
 		R-cran-SQUAREM>0:math/R-cran-SQUAREM
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-lazyeval/Makefile b/math/R-cran-lazyeval/Makefile
index b381653d1e21..af91717f89ca 100644
--- a/math/R-cran-lazyeval/Makefile
+++ b/math/R-cran-lazyeval/Makefile
@@ -1,15 +1,15 @@
 PORTNAME=	lazyeval
 DISTVERSION=	0.2.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Disciplined approach to non-standard evaluation
 WWW=		https://cran.r-project.org/web/packages/lazyeval/
 
 LICENSE=	GPLv3
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-linprog/Makefile b/math/R-cran-linprog/Makefile
index 3c45f28b04d5..a64a7449c328 100644
--- a/math/R-cran-linprog/Makefile
+++ b/math/R-cran-linprog/Makefile
@@ -1,18 +1,19 @@
 PORTNAME=	linprog
 DISTVERSION=	0.9-4
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Linear Programming / Optimization
 WWW=		https://cran.r-project.org/web/packages/linprog/
 
 LICENSE=	GPLv2+
 
 CRAN_DEPENDS=	R-cran-lpSolve>0:math/R-cran-lpSolve
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-lme4/Makefile b/math/R-cran-lme4/Makefile
index 0775c0b01f60..62e1600082e2 100644
--- a/math/R-cran-lme4/Makefile
+++ b/math/R-cran-lme4/Makefile
@@ -1,21 +1,22 @@
 PORTNAME=	lme4
 DISTVERSION=	1.1-30
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Linear mixed-effects models using Eigen and S4
 WWW=		https://github.com/lme4/lme4
 
 LICENSE=	GPLv2+
 
 CRAN_DEPENDS=	R-cran-minqa>=1.1.15:math/R-cran-minqa \
 		R-cran-nloptr>=1.0.4:math/R-cran-nloptr \
 		R-cran-Rcpp>=0.10.5:devel/R-cran-Rcpp \
 		R-cran-RcppEigen>0:math/R-cran-RcppEigen
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=	cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-locfit/Makefile b/math/R-cran-locfit/Makefile
index b8c654dd6495..c6ef314323d1 100644
--- a/math/R-cran-locfit/Makefile
+++ b/math/R-cran-locfit/Makefile
@@ -1,14 +1,15 @@
 PORTNAME=	locfit
 DISTVERSION=	1.5-9.7
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Local Regression, Likelihood and Density Estimation
 WWW=		https://cran.r-project.org/package=locfit
 
 LICENSE=	GPLv2+
 
 USES=		compiler:c++17-lang cran:compiles
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-lpSolve/Makefile b/math/R-cran-lpSolve/Makefile
index 970ddfdc85c5..475430ab5437 100644
--- a/math/R-cran-lpSolve/Makefile
+++ b/math/R-cran-lpSolve/Makefile
@@ -1,16 +1,17 @@
 PORTNAME=	lpSolve
 PORTVERSION=	5.6.16
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Interface to 'Lp_solve' v. 5.5 to Solve Linear/Integer Programs
 WWW=		https://cran.r-project.org/web/packages/lpSolve/
 
 LICENSE=	LGPL20
 
 LIB_DEPENDS=	liblpsolve55.so:math/lp_solve
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-ltm/Makefile b/math/R-cran-ltm/Makefile
index 682d42dd4f81..f30efb8fad6c 100644
--- a/math/R-cran-ltm/Makefile
+++ b/math/R-cran-ltm/Makefile
@@ -1,17 +1,18 @@
 PORTNAME=	ltm
 DISTVERSION=	1.2-0
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Latent Trait Models under IRT
 WWW=		https://cran.r-project.org/package=ltm
 
 LICENSE=	GPLv2+
 
 RUN_DEPENDS=	R-cran-msm>0:devel/R-cran-msm	\
 		R-cran-polycor>0:math/R-cran-polycor
 
 USES=		cran
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-magic/Makefile b/math/R-cran-magic/Makefile
index ed454a0b285a..0ca39fd105d6 100644
--- a/math/R-cran-magic/Makefile
+++ b/math/R-cran-magic/Makefile
@@ -1,18 +1,19 @@
 PORTNAME=	magic
 DISTVERSION=	1.6-0
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Create and Investigate Magic Squares
 WWW=		https://cran.r-project.org/web/packages/magic/
 
 LICENSE=	GPLv2
 
 CRAN_DEPENDS=	R-cran-abind>0:devel/R-cran-abind
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-maps/Makefile b/math/R-cran-maps/Makefile
index 3d39c5e1e9db..d1090d56f86c 100644
--- a/math/R-cran-maps/Makefile
+++ b/math/R-cran-maps/Makefile
@@ -1,16 +1,17 @@
 PORTNAME=	maps
 DISTVERSION=	3.4.1
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	ygy@FreeBSD.org
 COMMENT=	Draw Geographical Maps
 WWW=		https://CRAN.R-project.org/package=maps
 
 LICENSE=	GPLv2
 
 TEST_DEPENDS=	R-cran-sp>0:math/R-cran-sp
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-mathjaxr/Makefile b/math/R-cran-mathjaxr/Makefile
index 1d3011337cd3..02e7c2fbfba8 100644
--- a/math/R-cran-mathjaxr/Makefile
+++ b/math/R-cran-mathjaxr/Makefile
@@ -1,17 +1,18 @@
 PORTNAME=	mathjaxr
 DISTVERSION=	1.6-0
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Using 'Mathjax' in Rd Files
 WWW=		https://cran.r-project.org/web/packages/mathjaxr/
 
 LICENSE=	GPLv3+
 
 USES=		cran:auto-plist,compiles
 
 post-install:
 	${ECHO} "@dir lib/R/library/mathjaxr/libs" >>${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-matrixStats/Makefile b/math/R-cran-matrixStats/Makefile
index 02a187966094..8262ccecf621 100644
--- a/math/R-cran-matrixStats/Makefile
+++ b/math/R-cran-matrixStats/Makefile
@@ -1,14 +1,15 @@
 PORTNAME=	matrixStats
 PORTVERSION=	0.62.0
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Functions that Apply to Rows and Columns of Matrices
 WWW=		https://cran.r-project.org/web/packages/matrixStats/
 
 LICENSE=	ART20
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-maxLik/Makefile b/math/R-cran-maxLik/Makefile
index 8fb071605a69..3845aa6ab5e2 100644
--- a/math/R-cran-maxLik/Makefile
+++ b/math/R-cran-maxLik/Makefile
@@ -1,22 +1,23 @@
 PORTNAME=	maxLik
 DISTVERSION=	1.5-2
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Maximum Likelihood Estimation and Related Tools
 WWW=		http://www.maxlik.org/
 
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
 BUILD_DEPENDS=	R-cran-miscTools>=0.6.8:math/R-cran-miscTools \
 		R-cran-sandwich>=0:math/R-cran-sandwich \
 		R-cran-generics>=0:devel/R-cran-generics
 RUN_DEPENDS=	R-cran-miscTools>=0.6.8:math/R-cran-miscTools \
 		R-cran-sandwich>=0:math/R-cran-sandwich \
 		R-cran-generics>=0:devel/R-cran-generics
 
 USES=	cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-mclust/Makefile b/math/R-cran-mclust/Makefile
index 8a0c4d7a9266..aa60b840adbf 100644
--- a/math/R-cran-mclust/Makefile
+++ b/math/R-cran-mclust/Makefile
@@ -1,14 +1,15 @@
 PORTNAME=	mclust
 PORTVERSION=	6.0.0
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Gaussian Mixture Modelling for Model-Based Clustering, Classification, and Density Estimation
 WWW=		https://cran.r-project.org/package=mclust
 
 LICENSE=	GPLv2+
 
 USES=		cran:compiles
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-mcmc/Makefile b/math/R-cran-mcmc/Makefile
index 3a53989c973a..2a9cd2a38c34 100644
--- a/math/R-cran-mcmc/Makefile
+++ b/math/R-cran-mcmc/Makefile
@@ -1,15 +1,15 @@
 PORTNAME=	mcmc
 DISTVERSION=	0.9-7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Markov Chain Monte Carlo
 WWW=		https://cran.r-project.org/web/packages/mcmc/
 
 LICENSE=	MIT
 
 USES=	cran:compiles,auto-plist
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-memisc/Makefile b/math/R-cran-memisc/Makefile
index e3718784018e..79926866782a 100644
--- a/math/R-cran-memisc/Makefile
+++ b/math/R-cran-memisc/Makefile
@@ -1,19 +1,20 @@
 PORTNAME=	memisc
 DISTVERSION=	0.99.30.7
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Provides an infrastructure for the management of survey data
 WWW=		https://www.martin-elff.net/software/ #memisc
 
 LICENSE=	GPLv2
 
 CRAN_DEPENDS=	R-cran-repr>0:devel/R-cran-repr \
 		R-cran-data.table>0:devel/R-cran-data.table
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=	cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-minqa/Makefile b/math/R-cran-minqa/Makefile
index 962c8be25b66..e729fe7fd118 100644
--- a/math/R-cran-minqa/Makefile
+++ b/math/R-cran-minqa/Makefile
@@ -1,17 +1,17 @@
 PORTNAME=	minqa
 PORTVERSION=	1.2.4
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Derivative-free optimization algorithms by quadratic approximation
 WWW=		http://cran.r-project.org/web/minqa/
 
 LICENSE=	GPLv2
 
 RUN_DEPENDS=	R-cran-Rcpp>=0.9.10:devel/R-cran-Rcpp
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-misc3d/Makefile b/math/R-cran-misc3d/Makefile
index 44317c1adf54..5bb955e256e7 100644
--- a/math/R-cran-misc3d/Makefile
+++ b/math/R-cran-misc3d/Makefile
@@ -1,14 +1,15 @@
 PORTNAME=	misc3d
 DISTVERSION=	0.9-1
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Miscellaneous 3D Plots
 WWW=		https://cran.r-project.org/package=misc3d
 
 LICENSE=	GPLv2+
 
 USES=		cran
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-miscTools/Makefile b/math/R-cran-miscTools/Makefile
index e8300a70e89e..4efbe86f957a 100644
--- a/math/R-cran-miscTools/Makefile
+++ b/math/R-cran-miscTools/Makefile
@@ -1,20 +1,20 @@
 PORTNAME=	miscTools
 DISTVERSION=	0.6-26
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Miscellaneous small tools and utilities for R
 WWW=		http://www.micecon.org/
 
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
 CRAN_DEPENDS=	R-cran-digest>=0:security/R-cran-digest
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-mitools/Makefile b/math/R-cran-mitools/Makefile
index 92bd21e4290c..c0e7eab141d8 100644
--- a/math/R-cran-mitools/Makefile
+++ b/math/R-cran-mitools/Makefile
@@ -1,19 +1,19 @@
 PORTNAME=	mitools
 DISTVERSION=	2.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Tools for Multiple Imputation of Missing Data
 WWW=		https://cran.r-project.org/package=mitools
 
 LICENSE=	GPLv2
 
 CRAN_DEPENDS=	R-cran-DBI>=0:databases/R-cran-DBI
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-moments/Makefile b/math/R-cran-moments/Makefile
index c68f3da1b780..4008593289dc 100644
--- a/math/R-cran-moments/Makefile
+++ b/math/R-cran-moments/Makefile
@@ -1,14 +1,15 @@
 PORTNAME=	moments
 PORTVERSION=	0.14.1
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Moments, Cumulants, Skewness, Kurtosis and Related Tests
 WWW=		https://cran.r-project.org/package=moments
 
 LICENSE=	GPLv2+
 
 USES=		cran
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-mvtnorm/Makefile b/math/R-cran-mvtnorm/Makefile
index 5df2968491be..1f3a5d42589f 100644
--- a/math/R-cran-mvtnorm/Makefile
+++ b/math/R-cran-mvtnorm/Makefile
@@ -1,12 +1,13 @@
 PORTNAME=	mvtnorm
 DISTVERSION=	1.1-3
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Multivariate Normal and t Distributions
 WWW=		https://cran.r-project.org/package=mvtnorm
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-nloptr/Makefile b/math/R-cran-nloptr/Makefile
index 065b05bef9d8..8c4c4e202e4d 100644
--- a/math/R-cran-nloptr/Makefile
+++ b/math/R-cran-nloptr/Makefile
@@ -1,17 +1,18 @@
 PORTNAME=	nloptr
 PORTVERSION=	2.0.3
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	R interface to NLopt
 WWW=		https://cran.r-project.org/web/packages/nloptr/
 
 LICENSE=	LGPL3
 
 LIB_DEPENDS=	libnlopt.so:math/nlopt
 RUN_DEPENDS=	R-cran-testthat>=3.0.0:devel/R-cran-testthat
 
 USES=		cran:auto-plist,compiles pkgconfig
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-nnls/Makefile b/math/R-cran-nnls/Makefile
index 264e92e81378..be3c21446439 100644
--- a/math/R-cran-nnls/Makefile
+++ b/math/R-cran-nnls/Makefile
@@ -1,15 +1,15 @@
 PORTNAME=	nnls
 PORTVERSION=	1.4
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	skreuzer@FreeBSD.org
 COMMENT=	R implementation of an algorithm for non-negative least squares
 WWW=		https://cran.r-project.org/web/packages/nnls/
 
 LICENSE=	GPLv2
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-nortest/Makefile b/math/R-cran-nortest/Makefile
index 123389a0d1fe..1c18abb86791 100644
--- a/math/R-cran-nortest/Makefile
+++ b/math/R-cran-nortest/Makefile
@@ -1,16 +1,16 @@
 PORTNAME=	nortest
 DISTVERSION=	1.0-4
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tests for Normality
 WWW=		https://cran.r-project.org/web/packages/nortest/
 
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-numDeriv/Makefile b/math/R-cran-numDeriv/Makefile
index acc352fd16df..ff78814e2ea8 100644
--- a/math/R-cran-numDeriv/Makefile
+++ b/math/R-cran-numDeriv/Makefile
@@ -1,15 +1,15 @@
 PORTNAME=	numDeriv
 DISTVERSION=	2016.8-1.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Accurate Numerical Derivatives
 WWW=		https://cran.r-project.org/web/packages/numDeriv/
 
 LICENSE=	GPLv2
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-numbers/Makefile b/math/R-cran-numbers/Makefile
index a27daefd16c1..9aa8a2b67c10 100644
--- a/math/R-cran-numbers/Makefile
+++ b/math/R-cran-numbers/Makefile
@@ -1,16 +1,17 @@
 PORTNAME=	numbers
 DISTVERSION=	0.8-5
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Number-Theoretic Functions
 WWW=		https://cran.r-project.org/web/packages/numbers/
 
 LICENSE=	GPLv3+
 
 RUN_DEPENDS=	R-cran-gmp>=0.5.1:math/R-cran-gmp
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-outliers/Makefile b/math/R-cran-outliers/Makefile
index 689fe21146b5..ee25331f5a94 100644
--- a/math/R-cran-outliers/Makefile
+++ b/math/R-cran-outliers/Makefile
@@ -1,15 +1,16 @@
 PORTNAME=	outliers
 DISTVERSION=	0.15
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	eduardo@FreeBSD.org
 COMMENT=	Collection of some tests commonly used for identifying outliers
 WWW=		https://cran.r-project.org/web/packages/outliers/
 
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	multi
 
 USES=	cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-partitions/Makefile b/math/R-cran-partitions/Makefile
index 6ca149c149a0..9b9772404165 100644
--- a/math/R-cran-partitions/Makefile
+++ b/math/R-cran-partitions/Makefile
@@ -1,20 +1,21 @@
 PORTNAME=	partitions
 DISTVERSION=	1.10-7
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Additive Partitions of Integers
 WWW=		https://cran.r-project.org/web/packages/partitions/
 
 LICENSE=	GPLv3+
 
 RUN_DEPENDS=	R-cran-gmp>=0.5.1:math/R-cran-gmp \
 		R-cran-polynom>=0:math/R-cran-polynom \
 		R-cran-sets>=0:math/R-cran-sets \
 		R-cran-mathjaxr>=0:math/R-cran-mathjaxr \
 		R-cran-Rdpack>=0:devel/R-cran-Rdpack
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-pbkrtest/Makefile b/math/R-cran-pbkrtest/Makefile
index 017e5f76045f..f954ceb85959 100644
--- a/math/R-cran-pbkrtest/Makefile
+++ b/math/R-cran-pbkrtest/Makefile
@@ -1,23 +1,24 @@
 PORTNAME=	pbkrtest
 DISTVERSION=	0.5.1
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Parametric bootstrap and Kenward-Roger-based methods for mixed model comparison
 WWW=		https://cran.r-project.org/web/packages/pbkrtest/
 
 LICENSE=	GPLv2+
 
 CRAN_DEPENDS=	R-cran-lme4>=1.1.10:math/R-cran-lme4 \
 		R-cran-broom>0:devel/R-cran-broom \
 		R-cran-dplyr>0:math/R-cran-dplyr \
 		R-cran-magrittr>0:devel/R-cran-magrittr \
 		R-cran-numDeriv>0:math/R-cran-numDeriv \
 		R-cran-knitr>0:print/R-cran-knitr
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=	cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-plot3D/Makefile b/math/R-cran-plot3D/Makefile
index dccfc1f6c1fd..7ba9bf72d67a 100644
--- a/math/R-cran-plot3D/Makefile
+++ b/math/R-cran-plot3D/Makefile
@@ -1,16 +1,17 @@
 PORTNAME=	plot3D
 PORTVERSION=	1.4
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Plotting Multi-Dimensional Data
 WWW=		https://cran.r-project.org/package=plot3D
 
 LICENSE=	GPLv3+
 
 RUN_DEPENDS=	R-cran-misc3d>0:math/R-cran-misc3d
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-pls/Makefile b/math/R-cran-pls/Makefile
index b5459ccce1bf..696ef524fed2 100644
--- a/math/R-cran-pls/Makefile
+++ b/math/R-cran-pls/Makefile
@@ -1,14 +1,15 @@
 PORTNAME=	pls
 DISTVERSION=	2.8-1
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Partial Least Squares and Principal Component Regression
 WWW=		https://cran.r-project.org/web/packages/pls/
 
 LICENSE=	GPLv2
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-polycor/Makefile b/math/R-cran-polycor/Makefile
index 0b01d518e8a9..a93ce4f94ffe 100644
--- a/math/R-cran-polycor/Makefile
+++ b/math/R-cran-polycor/Makefile
@@ -1,17 +1,18 @@
 PORTNAME=	polycor
 DISTVERSION=	0.8-1
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Polychoric and Polyserial Correlations
 WWW=		https://cran.r-project.org/package=polycor
 
 LICENSE=	GPLv2+
 
 RUN_DEPENDS=	R-cran-admisc>0:math/R-cran-admisc	\
 		R-cran-mvtnorm>0:math/R-cran-mvtnorm
 
 USES=		cran
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-polynom/Makefile b/math/R-cran-polynom/Makefile
index 16417679e5f6..94a37bfb8e3b 100644
--- a/math/R-cran-polynom/Makefile
+++ b/math/R-cran-polynom/Makefile
@@ -1,14 +1,15 @@
 PORTNAME=	polynom
 DISTVERSION=	1.4-1
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Functions to Implement a Class for Univariate Polynomial Manipulations
 WWW=		https://cran.r-project.org/web/packages/polynom/
 
 LICENSE=	GPLv2
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-pracma/Makefile b/math/R-cran-pracma/Makefile
index c28c440d6210..51055de97f3c 100644
--- a/math/R-cran-pracma/Makefile
+++ b/math/R-cran-pracma/Makefile
@@ -1,14 +1,15 @@
 PORTNAME=	pracma
 PORTVERSION=	2.4.2
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Practical Numerical Math Functions
 WWW=		https://cran.r-project.org/package=pracma
 
 LICENSE=	GPLv3+
 
 USES=		cran
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-prodlim/Makefile b/math/R-cran-prodlim/Makefile
index 5effab77621b..845b10ed8be7 100644
--- a/math/R-cran-prodlim/Makefile
+++ b/math/R-cran-prodlim/Makefile
@@ -1,20 +1,20 @@
 PORTNAME=	prodlim
 PORTVERSION=	1.6.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Product-Limit Estimation for Censored Event History Analysis
 WWW=		https://cran.r-project.org/web/packages/prodlim/
 
 LICENSE=	GPLv2+
 
 CRAN_DEPENDS=	R-cran-Rcpp>=0.11.5:devel/R-cran-Rcpp \
 		R-cran-lava>0:math/R-cran-lava
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-proxy/Makefile b/math/R-cran-proxy/Makefile
index e57ab60b144b..8df4a72bf614 100644
--- a/math/R-cran-proxy/Makefile
+++ b/math/R-cran-proxy/Makefile
@@ -1,14 +1,15 @@
 PORTNAME=	proxy
 DISTVERSION=	0.4-27
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Distance and Similarity Measures
 WWW=		https://cran.r-project.org/web/packages/proxy/
 
 LICENSE=	GPLv2
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-psych/Makefile b/math/R-cran-psych/Makefile
index fefaad733631..3851208796cb 100644
--- a/math/R-cran-psych/Makefile
+++ b/math/R-cran-psych/Makefile
@@ -1,13 +1,13 @@
 PORTNAME=	psych
 PORTVERSION=	1.2.1
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	math science
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	drue@therub.org
 COMMENT=	Psych package for the R project
 WWW=		https://cran.r-project.org/web/packages/psych/index.html
 
 USES=	cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-pwr/Makefile b/math/R-cran-pwr/Makefile
index a8d36223f132..05c1fc0be122 100644
--- a/math/R-cran-pwr/Makefile
+++ b/math/R-cran-pwr/Makefile
@@ -1,14 +1,15 @@
 PORTNAME=	pwr
 DISTVERSION=	1.3-0
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Basic Functions for Power Analysis
 WWW=		https://cran.r-project.org/package=pwr
 
 LICENSE=	GPLv3+
 
 USES=		cran
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-quadprog/Makefile b/math/R-cran-quadprog/Makefile
index f07436e6a635..ac832b042918 100644
--- a/math/R-cran-quadprog/Makefile
+++ b/math/R-cran-quadprog/Makefile
@@ -1,16 +1,16 @@
 PORTNAME=	quadprog
 DISTVERSION=	1.5-8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Functions to solve Quadratic Programming Problems
 WWW=		https://cran.r-project.org/web/packages/quadprog/
 
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-qualityTools/Makefile b/math/R-cran-qualityTools/Makefile
index af9e5e97f2aa..09e3562fff46 100644
--- a/math/R-cran-qualityTools/Makefile
+++ b/math/R-cran-qualityTools/Makefile
@@ -1,20 +1,20 @@
 PORTNAME=	qualityTools
 DISTVERSION=	1.55
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Statistical Methods for Quality Science
 WWW=		http://www.r-qualitytools.org/
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 CRAN_DEPENDS=	R-cran-Rsolnp>0:math/R-cran-Rsolnp
 
 USES=	cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-quantreg/Makefile b/math/R-cran-quantreg/Makefile
index b04026788990..c022ba3546e7 100644
--- a/math/R-cran-quantreg/Makefile
+++ b/math/R-cran-quantreg/Makefile
@@ -1,19 +1,20 @@
 PORTNAME=	quantreg
 PORTVERSION=	5.94
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Quantile Regression
 WWW=		https://cran.r-project.org/web/packages/quantreg/
 
 LICENSE=	GPLv2+
 
 CRAN_DEPENDS=	R-cran-SparseM>0:math/R-cran-SparseM \
 		R-cran-MatrixModels>0:math/R-cran-MatrixModels
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=	cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-raster/Makefile b/math/R-cran-raster/Makefile
index b59b18e8357b..dbfe6b626510 100644
--- a/math/R-cran-raster/Makefile
+++ b/math/R-cran-raster/Makefile
@@ -1,20 +1,21 @@
 PORTNAME=	raster
 DISTVERSION=	3.6-3
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Geographic Data Analysis and Modeling
 WWW=		https://cran.r-project.org/web/packages/raster/
 
 LICENSE=	GPLv3
 
 CRAN_DEPENDS=	R-cran-sp>=1.4.5:math/R-cran-sp \
 		R-cran-Rcpp>0:devel/R-cran-Rcpp \
 		R-cran-terra>=1.6.16:math/R-cran-terra
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		compiler:c++11-lang cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-recipes/Makefile b/math/R-cran-recipes/Makefile
index b94436e9eea8..02e204a37f81 100644
--- a/math/R-cran-recipes/Makefile
+++ b/math/R-cran-recipes/Makefile
@@ -1,36 +1,37 @@
 PORTNAME=	recipes
 PORTVERSION=	1.0.1
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Preprocessing Tools to Create Design Matrices
 WWW=		https://cran.r-project.org/web/packages/recipes/
 
 LICENSE=	MIT
 
 CRAN_DEPENDS=	R-cran-dplyr>0:math/R-cran-dplyr \
 		R-cran-cli>0:devel/R-cran-cli \
 		R-cran-ellipsis>0:devel/R-cran-ellipsis \
 		R-cran-generics>=0.1.2:devel/R-cran-generics \
 		R-cran-glue>0:devel/R-cran-glue \
 		R-cran-gower>0:math/R-cran-gower \
 		R-cran-hardhat>=1.2.0:devel/R-cran-hardhat \
 		R-cran-ipred>=0.9.12:math/R-cran-ipred \
 		R-cran-lifecycle>0:devel/R-cran-lifecycle \
 		R-cran-lubridate>=1.8.0:devel/R-cran-lubridate \
 		R-cran-magrittr>0:devel/R-cran-magrittr \
 		R-cran-purrr>=0.2.3:devel/R-cran-purrr \
 		R-cran-rlang>=1.0.3:devel/R-cran-rlang \
 		R-cran-tibble>0:devel/R-cran-tibble \
 		R-cran-tidyr>=1.0.0:devel/R-cran-tidyr \
 		R-cran-tidyselect>=1.1.2:devel/R-cran-tidyselect \
 		R-cran-timeDate>0:finance/R-cran-timeDate \
 		R-cran-vctrs>0:devel/R-cran-vctrs \
 		R-cran-withr>0:devel/R-cran-withr
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-rgenoud/Makefile b/math/R-cran-rgenoud/Makefile
index be4b669026a0..004cf6c95fec 100644
--- a/math/R-cran-rgenoud/Makefile
+++ b/math/R-cran-rgenoud/Makefile
@@ -1,15 +1,16 @@
 PORTNAME=	rgenoud
 DISTVERSION=	5.9-0.3
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	R Version of GENetic Optimization Using Derivatives
 WWW=		https://sekhon.berkeley.edu/rgenoud/
 
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-robustbase/Makefile b/math/R-cran-robustbase/Makefile
index a38094dcedbf..290bcb1c6a02 100644
--- a/math/R-cran-robustbase/Makefile
+++ b/math/R-cran-robustbase/Makefile
@@ -1,18 +1,19 @@
 PORTNAME=	robustbase
 DISTVERSION=	0.95-0
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Basic Robust Statistics
 WWW=		https://cran.r-project.org/web/packages/robustbase/
 
 LICENSE=	GPLv2+
 
 CRAN_DEPENDS=	R-cran-DEoptimR>0:math/R-cran-DEoptimR
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-sandwich/Makefile b/math/R-cran-sandwich/Makefile
index e8cc43b3b11e..8b9e39339562 100644
--- a/math/R-cran-sandwich/Makefile
+++ b/math/R-cran-sandwich/Makefile
@@ -1,16 +1,17 @@
 PORTNAME=	sandwich
 DISTVERSION=	3.0-2
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Robust Covariance Matrix Estimators
 WWW=		https://cran.r-project.org/web/packages/sandwich/
 
 LICENSE=	GPLv2+
 
 RUN_DEPENDS=	R-cran-zoo>0:math/R-cran-zoo
 
 USES=	cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-scatterplot3d/Makefile b/math/R-cran-scatterplot3d/Makefile
index 820424466de3..34cb0191dfc4 100644
--- a/math/R-cran-scatterplot3d/Makefile
+++ b/math/R-cran-scatterplot3d/Makefile
@@ -1,14 +1,15 @@
 PORTNAME=	scatterplot3d
 DISTVERSION=	0.3-42
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	3D Scatter Plot
 WWW=		https://cran.r-project.org/package=scatterplot3d
 
 LICENSE=	GPLv2
 
 USES=	cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-sets/Makefile b/math/R-cran-sets/Makefile
index 8583db7f1cb4..0f5b5bf0abf0 100644
--- a/math/R-cran-sets/Makefile
+++ b/math/R-cran-sets/Makefile
@@ -1,14 +1,15 @@
 PORTNAME=	sets
 DISTVERSION=	1.0-24
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Sets, Generalized Sets, Customizable Sets and Intervals
 WWW=		https://cran.r-project.org/web/packages/sets/
 
 LICENSE=	GPLv2
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-sf/Makefile b/math/R-cran-sf/Makefile
index 0c19b32a786c..330c9527ec8f 100644
--- a/math/R-cran-sf/Makefile
+++ b/math/R-cran-sf/Makefile
@@ -1,30 +1,30 @@
 PORTNAME=	sf
 DISTVERSION=	1.0-8
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Simple Features for R
 WWW=		https://cran.r-project.org/web/packages/sf/
 
 LICENSE=	GPLv2 MIT
 LICENSE_COMB=	dual
 
 CRAN_DEPENDS=	R-cran-classInt>=0.4.1:devel/R-cran-classInt \
 		R-cran-DBI>=0.8:databases/R-cran-DBI \
 		R-cran-magrittr>0:devel/R-cran-magrittr \
 		R-cran-Rcpp>=0.12.18:devel/R-cran-Rcpp \
 		R-cran-s2>=1.0.7:graphics/R-cran-s2 \
 		R-cran-units>=0.7.0:math/R-cran-units
 LIB_DEPENDS=	libgdal.so:graphics/gdal \
 		libgeos.so:graphics/geos \
 		libproj.so:graphics/proj
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		compiler:c++11-lang cran:auto-plist,compiles pkgconfig
 
 CONFIGURE_ARGS+=	"--with-proj-api=yes"
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-sm/Makefile b/math/R-cran-sm/Makefile
index f5651a9d9e4c..ac7639bd9096 100644
--- a/math/R-cran-sm/Makefile
+++ b/math/R-cran-sm/Makefile
@@ -1,12 +1,13 @@
 PORTNAME=	sm
 DISTVERSION=	2.2-5.7.1
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Smoothing methods for nonparametric regression and density estimation
 WWW=		http://www.stats.gla.ac.uk/~adrian/sm
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-sp/Makefile b/math/R-cran-sp/Makefile
index da232872477c..345681e2875b 100644
--- a/math/R-cran-sp/Makefile
+++ b/math/R-cran-sp/Makefile
@@ -1,15 +1,16 @@
 PORTNAME=	sp
 DISTVERSION=	1.6-0
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	R Classes and Methods for Spatial Data
 WWW=		https://github.com/edzer/sp/
 
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-spData/Makefile b/math/R-cran-spData/Makefile
index 10df17c86127..aa3c2cda8960 100644
--- a/math/R-cran-spData/Makefile
+++ b/math/R-cran-spData/Makefile
@@ -1,18 +1,19 @@
 PORTNAME=	spData
 PORTVERSION=	2.2.0
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Datasets for Spatial Analysis
 WWW=		https://cran.r-project.org/web/packages/spData/
 
 LICENSE=	CC0-1.0
 
 CRAN_DEPENDS=	R-cran-sp>0:math/R-cran-sp
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-spdep/Makefile b/math/R-cran-spdep/Makefile
index a9381afa0b3d..e9d8c30f5caf 100644
--- a/math/R-cran-spdep/Makefile
+++ b/math/R-cran-spdep/Makefile
@@ -1,24 +1,25 @@
 PORTNAME=	spdep
 DISTVERSION=	1.2-5
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Spatial dependence: weighting schemes, statistics, and models
 WWW=		https://cran.r-project.org/web/packages/spdep/
 
 LICENSE=	GPLv2+
 
 CRAN_DEPENDS=	R-cran-sp>=1.0:math/R-cran-sp \
 		R-cran-spData>=0.2.6.0:math/R-cran-spData \
 		R-cran-sf>0:math/R-cran-sf \
 		R-cran-deldir>0:math/R-cran-deldir \
 		R-cran-units>0:math/R-cran-units \
 		R-cran-s2>0:graphics/R-cran-s2 \
 		R-cran-e1071>0:science/R-cran-e1071
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=	cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-sspir/Makefile b/math/R-cran-sspir/Makefile
index d4fbe9d405df..acd0a13994d9 100644
--- a/math/R-cran-sspir/Makefile
+++ b/math/R-cran-sspir/Makefile
@@ -1,17 +1,17 @@
 PORTNAME=	sspir
 PORTVERSION=	0.2.10
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	math
 MASTER_SITES=	http://cran.r-project.org/src/contrib/Archive/sspir/
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	skreuzer@FreeBSD.org
 COMMENT=	glm-like formula to define dynamic generalized linear models
 WWW=		https://cran.r-project.org/web/packages/sspir/
 
 RUN_DEPENDS=	R-cran-mvtnorm>=0.9.96_11:math/R-cran-mvtnorm \
 		R-cran-KFAS>=0.9.11_3:math/R-cran-KFAS
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-stabledist/Makefile b/math/R-cran-stabledist/Makefile
index 06763b137894..943fa9abb730 100644
--- a/math/R-cran-stabledist/Makefile
+++ b/math/R-cran-stabledist/Makefile
@@ -1,20 +1,20 @@
 PORTNAME=	stabledist
 DISTVERSION=	0.7-1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Stable Distribution Functions
 WWW=		https://cran.r-project.org/web/packages/stabledist/
 
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
 TEST_DEPENDS=	R-cran-RUnit>0:devel/R-cran-RUnit \
 		R-cran-fBasics>0:finance/R-cran-fBasics \
 		R-cran-Rmpfr>0:math/R-cran-Rmpfr
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-statmod/Makefile b/math/R-cran-statmod/Makefile
index 8f7c77d64efa..10ae760404be 100644
--- a/math/R-cran-statmod/Makefile
+++ b/math/R-cran-statmod/Makefile
@@ -1,14 +1,15 @@
 PORTNAME=	statmod
 DISTVERSION=	1.4.34
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	jpbeconne@free.fr
 COMMENT=	Statistical Modeling
 WWW=		https://CRAN.R-project.org/package=statmod
 
 LICENSE=	GPLv3
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-survey/Makefile b/math/R-cran-survey/Makefile
index 591ba79cf641..52d4513a3c24 100644
--- a/math/R-cran-survey/Makefile
+++ b/math/R-cran-survey/Makefile
@@ -1,21 +1,22 @@
 PORTNAME=	survey
 DISTVERSION=	4.1-1
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Analysis of complex survey samples
 WWW=		https://r-survey.r-forge.r-project.org/survey/
 
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
 CRAN_DEPENDS=	R-cran-minqa>=1.1.15:math/R-cran-minqa \
 		R-cran-numDeriv>=0:math/R-cran-numDeriv \
 		R-cran-mitools>=2.4:math/R-cran-mitools
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-tensor/Makefile b/math/R-cran-tensor/Makefile
index 99f17aedcda3..fac50ab6eae2 100644
--- a/math/R-cran-tensor/Makefile
+++ b/math/R-cran-tensor/Makefile
@@ -1,14 +1,15 @@
 PORTNAME=	tensor
 DISTVERSION=	1.5
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	ygy@FreeBSD.org
 COMMENT=	Tensor product of arrays
 WWW=		https://CRAN.R-project.org/package=tensor
 
 LICENSE=	GPLv2+
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-terra/Makefile b/math/R-cran-terra/Makefile
index 5000ae51b7e0..8778c0b85983 100644
--- a/math/R-cran-terra/Makefile
+++ b/math/R-cran-terra/Makefile
@@ -1,22 +1,22 @@
 PORTNAME=	terra
 DISTVERSION=	1.6-17
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Spatiall Data Analysis
 WWW=		https://cran.r-project.org/web/packages/terra/
 
 LICENSE=	GPLv3+
 
 LIB_DEPENDS=	libgdal.so:graphics/gdal \
 		libgeos.so:graphics/geos \
 		libproj.so:graphics/proj
 CRAN_DEPENDS=	R-cran-Rcpp>0:devel/R-cran-Rcpp
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		compiler:c++11-lang cran:auto-plist,compiles sqlite:3
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-truncnorm/Makefile b/math/R-cran-truncnorm/Makefile
index 2c31a386eb94..722dc3f1d4c6 100644
--- a/math/R-cran-truncnorm/Makefile
+++ b/math/R-cran-truncnorm/Makefile
@@ -1,15 +1,15 @@
 PORTNAME=	truncnorm
-PORTREVISION=	5
+PORTREVISION=	6
 DISTVERSION=	1.0-8
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Truncated normal distribution
 WWW=		https://cran.r-project.org/package=truncnorm
 
 LICENSE=	GPLv2
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-units/Makefile b/math/R-cran-units/Makefile
index c8ffdf38a68d..5303735adb1f 100644
--- a/math/R-cran-units/Makefile
+++ b/math/R-cran-units/Makefile
@@ -1,19 +1,20 @@
 PORTNAME=	units
 DISTVERSION=	0.8-0
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Measurement Units for R Vectors
 WWW=		https://cran.r-project.org/web/packages/units/
 
 LICENSE=	GPLv2
 
 CRAN_DEPENDS=	R-cran-Rcpp>=0.12.10:devel/R-cran-Rcpp
 LIB_DEPENDS=	libudunits2.so:science/udunits
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-uroot/Makefile b/math/R-cran-uroot/Makefile
index 93454f27d0b4..633434a7bc65 100644
--- a/math/R-cran-uroot/Makefile
+++ b/math/R-cran-uroot/Makefile
@@ -1,14 +1,15 @@
 PORTNAME=	uroot
 DISTVERSION=	2.1-2
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Unit Root Tests for Seasonal Time Series
 WWW=		https://cran.r-project.org/web/packages/uroot/
 
 LICENSE=	GPLv2
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-wk/Makefile b/math/R-cran-wk/Makefile
index e19cf8162d3f..e577b9134662 100644
--- a/math/R-cran-wk/Makefile
+++ b/math/R-cran-wk/Makefile
@@ -1,14 +1,15 @@
 PORTNAME=	wk
 PORTVERSION=	0.6.0
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Lightweight Well-Known Geometry Parsing
 WWW=		https://cran.r-project.org/web/packages/wk/
 
 LICENSE=	MIT
 
 USES=		compiler:c++11-lang cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-xts/Makefile b/math/R-cran-xts/Makefile
index 4a51a5f8a70a..2c5eb23f8ff7 100644
--- a/math/R-cran-xts/Makefile
+++ b/math/R-cran-xts/Makefile
@@ -1,18 +1,19 @@
 PORTNAME=	xts
 DISTVERSION=	0.12.1
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Extensible Time Series
 WWW=		https://r-forge.r-project.org/projects/xts/
 
 LICENSE=	GPLv2+
 
 CRAN_DEPENDS=	R-cran-zoo>=1.7.12:math/R-cran-zoo
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-zoo/Makefile b/math/R-cran-zoo/Makefile
index 791a0cd05965..5d557a7ef4a5 100644
--- a/math/R-cran-zoo/Makefile
+++ b/math/R-cran-zoo/Makefile
@@ -1,14 +1,15 @@
 PORTNAME=	zoo
 DISTVERSION=	1.8-11
+PORTREVISION=	1
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	S3 Infrastructure for Regular and Irregular Time Series
 WWW=		https://cran.r-project.org/web/packages/zoo/
 
 LICENSE=	GPLv2+
 
 USES=	cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/math/R/Makefile b/math/R/Makefile
index 90335aa88199..61ca7dc49a1c 100644
--- a/math/R/Makefile
+++ b/math/R/Makefile
@@ -1,144 +1,144 @@
 PORTNAME=	R
 DISTVERSION=	4.2.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math lang
 MASTER_SITES=	CRAN/src/base/R-${PORTVERSION:C|\..*||}
 
 MAINTAINER=	jrm@FreeBSD.org
 COMMENT=	Language for statistical computing and graphics
 WWW=		https://www.R-project.org/
 
 LICENSE=	GPLv2
 
 ONLY_FOR_ARCHS=	aarch64 amd64 armv6 armv7 i386 powerpc powerpc64 powerpc64le
 
 BUILD_DEPENDS=	texi2any:print/texinfo
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libpcre2-8.so:devel/pcre2
 # R packages may require GNU make or cmake to build
 RUN_DEPENDS=	cmake:devel/cmake-core \
 		gmake:devel/gmake
 
 # possible TODO
 # - Use --with-recommended-packages=no by default
 # - Add an option for recommended packages
 # - Create ports for each of the recommended packages
 # - Create a meta-port for the recommended packages
 
 USES=		compiler:c++11-lang cpe fortran gmake iconv libtool localbase \
 		pathfix perl5 readline
 CPE_VENDOR=	r-project
 USE_LDCONFIG=	${PREFIX}/lib/R/lib
 USE_PERL5=	build
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-java \
 		--enable-R-shlib \
 		--with-readline \
 		rdocdir=${DOCSDIR}
 INSTALL_TARGET=	install-strip
 PLIST_SUB=	FULLVER=${DISTVERSION} \
 		MAJORVER=${_MAJORVER}
 
 OPTIONS_DEFINE=		ICU INFO LDOUBLE LETTER MEMPROF NLS OPENMP RPROF X11
 OPTIONS_DEFAULT=	CAIROPANGO GHOSTSCRIPT ICU INFO JPEG LDOUBLE OPENMP PNG \
 			RBLAS RPROF TCLTK TIFF X11
 OPTIONS_GROUP=		NEEDX11
 OPTIONS_GROUP_NEEDX11=	CAIROPANGO GHOSTSCRIPT JPEG PNG TCLTK TEXDOCS TIFF
 OPTIONS_SINGLE=		BLAS
 OPTIONS_SINGLE_BLAS=	ATLAS NETLIB OPENBLAS RBLAS
 
 OPTIONS_SUB=	YES
 
 CAIROPANGO_DESC=	Cairo graphics device and Pango multi-language text
 GHOSTSCRIPT_DESC=	Graphics device for bitmap files via Ghostscript
 JPEG_DESC=		JPEG graphics device
 LDOUBLE_DESC=		Long double data type
 LETTER_DESC=		US letter paper
 MEMPROF_DESC=		Memory profiling via Rprofmem() and tracemem()
 NEEDX11_DESC=		Require X11
 NETLIB_DESC=		Netlib BLAS implementation
 PNG_DESC=		PNG graphics device
 RBLAS_DESC=		Use R-bundled BLAS implementation
 RPROF_DESC=		R profiling via Rprof()
 TEXDOCS_DESC=		Build/Install TeX-dependent documentation files
 X11_DESC=		X11 graphics device
 
 ATLAS_USES=			blaslapack:atlas
 ATLAS_CONFIGURE_ON=		--disable-BLAS-shlib
 CAIROPANGO_IMPLIES=		X11
 CAIROPANGO_LIB_DEPENDS=		libharfbuzz.so:print/harfbuzz
 CAIROPANGO_USES=		gettext gnome jpeg pkgconfig
 CAIROPANGO_USE=			GNOME=cairo,pango
 CAIROPANGO_CONFIGURE_WITH=	cairo
 GHOSTSCRIPT_IMPLIES=		X11
 GHOSTSCRIPT_USES=		ghostscript
 ICU_LIB_DEPENDS=		libicui18n.so:devel/icu
 ICU_CONFIGURE_WITH=		ICU
 INFO_INSTALL_TARGET=		install-info
 INFO_INFO=			R-admin R-data R-exts R-FAQ R-intro R-ints \
 				R-lang
 JPEG_IMPLIES=			X11
 JPEG_USES=			jpeg pkgconfig
 JPEG_CONFIGURE_WITH=		jpeglib
 JPEG_CONFIGURE_ENV=		r_cv_header_jpeglib_h=yes
 LDOUBLE_CONFIGURE_ENABLE=	long-double
 LETTER_CONFIGURE_ENV=		R_PAPERSIZE=letter
 MEMPROF_CONFIGURE_ENABLE=	memory-profiling
 NETLIB_USES=			blaslapack:netlib
 NETLIB_CONFIGURE_ON=		--disable-BLAS-shlib
 NLS_USES=			gettext
 NLS_CONFIGURE_OFF=		--disable-nls
 OPENBLAS_USES=			blaslapack:openblas
 OPENBLAS_CONFIGURE_ON=		--disable-BLAS-shlib
 OPENMP_CONFIGURE_ENABLE=	openmp
 PNG_IMPLIES=			X11
 PNG_LIB_DEPENDS=		libpng.so:graphics/png
 PNG_CONFIGURE_WITH=		libpng
 RBLAS_CONFIGURE_ON=		--enable-BLAS-shlib \
 				--without-blas \
 				--without-lapack
 RBLAS_CONFIGURE_OFF=		--with-blas="-L${LOCALBASE}/lib ${BLASLIB}" \
 				--with-lapack="${LAPACKLIB}"
 RBLAS_EXTRA_PATCHES=		${PATCHDIR}/extra-patch-src_extra_blas_Makefile.in \
 				${PATCHDIR}/extra-patch-src_modules_lapack_Makefile.in
 RPROF_CONFIGURE_ENABLE=		R-profiling
 TCLTK_IMPLIES=			X11
 TCLTK_USES=			tcl tk
 TCLTK_CONFIGURE_WITH=		tcltk tcl_config=${TCL_LIBDIR}/tclConfig.sh \
 				tk_config=${TK_LIBDIR}/tkConfig.sh
 TEXDOCS_USES=			tex
 TEXDOCS_USE=			TEX=dvipsk:build,kpathsea:build,pdftex:build
 .for i in KPSEWHICH MAKEINDEX PDFLATEX PDFTEX TEX TEXI2DVI
 TEXDOCS_CONFIGURE_ENV_OFF+=	ac_cv_path_${i}=""
 .endfor
 TEXDOCS_INSTALL_TARGET=		install-pdf
 TIFF_IMPLIES=			X11
 TIFF_LIB_DEPENDS=		libtiff.so:graphics/tiff
 TIFF_CONFIGURE_WITH=		libtiff
 X11_USES=			xorg
 X11_USE=			XORG=ice,sm,x11,xext,xmu,xscrnsaver,xt
 X11_CONFIGURE_WITH=		x
 
 _MAJORVER=	${DISTVERSION:R:R}
 
 .include <bsd.port.options.mk>
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|/usr/local|${LOCALBASE}|g" ${WRKSRC}/configure
 	@${REINPLACE_CMD} \
 		-e "s|%%FULLVER%%|${DISTVERSION}|" \
 		-e "s|%%MAJORVER%%|${_MAJORVER}|" \
 		${WRKSRC}/src/main/Makefile.in \
 		${WRKSRC}/src/extra/blas/Makefile.in \
 		${WRKSRC}/src/modules/lapack/Makefile.in
 
 post-install-RBLAS-on:
 	@${REINPLACE_CMD} -e "s| -lR| -lR -lRblas|" \
 		${STAGEDIR}${PREFIX}/libdata/pkgconfig/libR.pc
 
 post-install-RBLAS-off:
 	@${REINPLACE_CMD} -e "s| -lR| -lR ${BLASLIB}|" \
 		${STAGEDIR}${PREFIX}/libdata/pkgconfig/libR.pc
 
 .include <bsd.port.mk>
diff --git a/math/SCIP/Makefile b/math/SCIP/Makefile
index aa8c0a9bdc19..1cbdc11f3d93 100644
--- a/math/SCIP/Makefile
+++ b/math/SCIP/Makefile
@@ -1,44 +1,45 @@
 PORTNAME=	SCIP
 DISTVERSION=	8.0.3
+PORTREVISION=	1
 CATEGORIES=	math science
 MASTER_SITES=	https://www.scipopt.org/download/release/
 DISTNAME=	${PORTNAME:tl}-${DISTVERSION}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Solver for mixed integer, mixed integer nonlinear programming
 WWW=		https://www.scipopt.org/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 EXTRACT_DEPENDS=	gtar:archivers/gtar
 LIB_DEPENDS=	libgmp.so:math/gmp \
 		libmpfr.so:math/mpfr \
 		libsoplex.so:math/SoPlex
 
 USES=		compiler:c11 cmake readline tar:tgz
 EXTRACT_CMD=	gtar
 USE_LDCONFIG=	yes
 
 CMAKE_OFF=	PAPILO
 
 CXXFLAGS+=	-I${LOCALBASE}/include/soplex
 
 TEST_TARGET=	test
 
 OPTIONS_DEFINE=		IPOPT ZIMPL
 OPTIONS_DEFAULT=	IPOPT
 
 IPOPT_DESC=		Non-linear optimization support via Ipopt
 IPOPT_USES=		fortran pkgconfig
 IPOPT_CMAKE_BOOL=	IPOPT
 IPOPT_LIB_DEPENDS=	libblas.so:math/blas \
 			libipopt.so:math/ipopt \
 			liblapack.so:math/lapack
 
 ZIMPL_DESC=		Build with Zimpl to translate LP models
 ZIMPL_CMAKE_BOOL=	ZIMPL
 ZIMPL_LIB_DEPENDS=	libzimpl.so:math/zimpl
 ZIMPL_BROKEN=		see https://github.com/scipopt/scip/issues/4
 
 .include <bsd.port.mk>
diff --git a/math/adept/Makefile b/math/adept/Makefile
index 3eb980c3bc99..a16a6d93a7a7 100644
--- a/math/adept/Makefile
+++ b/math/adept/Makefile
@@ -1,33 +1,34 @@
 PORTNAME=	adept
 DISTVERSION=	2.1.1
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	http://www.met.reading.ac.uk/clouds/adept/
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Combined array and automatic differentiation library in C++
 WWW=		https://www.met.reading.ac.uk/clouds/adept/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		autoreconf gmake fortran blaslapack:openblas libtool
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-static
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE=		PDFTEXDOCS
 OPTIONS_SUB=		yes
 
 PDFTEXDOCS_DESC=	Build and install PDF documentation from LaTeX sources
 PDFTEXDOCS_USES=	tex
 PDFTEXDOCS_USE=		TEX=pdftex:build,dvipsk:build
 
 post-build-PDFTEXDOCS-on:
 	@cd ${WRKSRC}/doc && ${SETENV} ${MAKE_ENV} ${MAKE_CMD}
 
 post-install-PDFTEXDOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/*.pdf ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/math/alberta/Makefile b/math/alberta/Makefile
index 80471774a5ff..dd52369a3082 100644
--- a/math/alberta/Makefile
+++ b/math/alberta/Makefile
@@ -1,38 +1,39 @@
 PORTNAME=	alberta
 DISTVERSION=	3.0.3
+PORTREVISION=	1
 CATEGORIES=	math
 PKGNAMESUFFIX=	-fem
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Adaptive multi-level finite element toolbox
 WWW=		http://www.alberta-fem.de/
 
 LICENSE=	GPLv2+
 
 BUILD_DEPENDS=	gsed:textproc/gsed \
 		opendx>0:graphics/opendx
 LIB_DEPENDS=	libltdl.so:devel/libltdl
 RUN_DEPENDS=	opendx>0:graphics/opendx # binaries aren't linked with it, not sure if it is really used
 
 USES=		autoreconf fortran gl gmake libtool localbase:ldflags motif pkgconfig xorg
 USE_GL=		gl
 USE_XORG=	xt
 USE_LDCONFIG=	yes
 
 USE_GITLAB=	yes
 GL_SITE=	https://gitlab.mathematik.uni-stuttgart.de/ians-nmh
 GL_ACCOUNT=	alberta
 GL_PROJECT=	alberta3
 GL_COMMIT=	920315ae1bbfd1b1fb6672d916619ac37a411e95
 
 GNU_CONFIGURE=	yes
 
 LDFLAGS+=	-lXm -lXt -pthread # link breaks without these
 
 MAKE_JOBS_UNSAFE=	yes # otherwise it begins to rebuild something during stage and fails
 
 INSTALL_TARGET=	install-strip
 
 BINARY_ALIAS=	make=${GMAKE} sed=gsed
 
 .include <bsd.port.mk>
diff --git a/math/algae/Makefile b/math/algae/Makefile
index 218d80f52a92..075e4510e259 100644
--- a/math/algae/Makefile
+++ b/math/algae/Makefile
@@ -1,31 +1,31 @@
 PORTNAME=	algae
 PORTVERSION=	4.3.6
-PORTREVISION=	18
+PORTREVISION=	19
 CATEGORIES=	math
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Programming language for numerical analysis
 WWW=		http://algae.sourceforge.net/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_aarch64=		does not build: checking for proper floating point exception handling... no
 BROKEN_armv6=		does not build: checking for proper floating point exception handling... no
 BROKEN_armv7=		does not build: checking for proper floating point exception handling... no
 
 GNU_CONFIGURE=	yes
 USES=		fortran
 
 CONFIGURE_ARGS=	--disable-dlmalloc --without-fftw --without-blas \
 		--without-lapack --without-bcslib --without-npsol
 FFLAGS+=	-std=legacy
 PLIST_SUB=	ALGAE_VERSION=${PORTVERSION}
 
 INFO=		${PORTNAME}
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}-${PORTVERSION}
 
 .include <bsd.port.mk>
diff --git a/math/alps/Makefile b/math/alps/Makefile
index ff86a9c23932..804c259b4537 100644
--- a/math/alps/Makefile
+++ b/math/alps/Makefile
@@ -1,32 +1,32 @@
 PORTNAME=	alps
 DISTVERSIONPREFIX=	releases/
 DISTVERSION=	2.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 PKGNAMEPREFIX=	coin-or-
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Abstract Library for Parallel Search (ALPS)
 WWW=		https://github.com/coin-or/CHiPPS-ALPS
 
 LICENSE=	EPL
 LICENSE_FILE=	${WRKSRC}/Alps/LICENSE
 
 LIB_DEPENDS=	libCoinUtils.so:math/coinutils \
 		libopenblas.so:math/openblas
 
 USES=		blaslapack gmake libtool pkgconfig
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	coin-or
 GH_PROJECT=	CHiPPS-ALPS
 
 GNU_CONFIGURE=	yes
 
 INSTALL_TARGET=	install-strip
 
 post-install:
 	${RM} -r ${STAGEDIR}${PREFIX}/share
 
 .include <bsd.port.mk>
diff --git a/math/ambit/Makefile b/math/ambit/Makefile
index 6685e57aa34e..0c22f77ad34f 100644
--- a/math/ambit/Makefile
+++ b/math/ambit/Makefile
@@ -1,30 +1,30 @@
 PORTNAME=	ambit
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 PKGNAMESUFFIX=	-tensor # avoid clash with shells/ambit
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	C++ library for tensor product calculations
 WWW=		https://github.com/jturney/ambit
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libhdf5.so:science/hdf5 \
 		libopenblas.so:math/openblas \
 		libsz.so:science/libaec
 
 USES=		cmake:testing compiler:c++11-lang python:build
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	jturney
 
 # some declared cmake options do nothing: see https://github.com/jturney/ambit/issues/25 and the patch
 CMAKE_ON=		SHARED_ONLY ENABLE_OPENMP
 CMAKE_OFF=		ENABLE_TESTS # https://github.com/jturney/ambit/issues/24
 CMAKE_TESTING_ON=	ENABLE_TESTS
 
 .include <bsd.port.mk>
diff --git a/math/analitza/Makefile b/math/analitza/Makefile
index 63830f4051aa..addbdea73b34 100644
--- a/math/analitza/Makefile
+++ b/math/analitza/Makefile
@@ -1,28 +1,29 @@
 PORTNAME=	analitza
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	math education kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Library from KDE Education project
 WWW=		https://www.kde.org/applications/education/
 
 LICENSE=		GFDL GPLv2
 LICENSE_COMB=		multi
 LICENSE_FILE_GFDL=	${WRKSRC}/COPYING.DOC
 LICENSE_FILE_GPLv2=	${WRKSRC}/COPYING
 
 USES=		cmake compiler:c++11-lang eigen:3 gl kde:5 qt:5 tar:xz
 USE_GL=		glu
 USE_KDE=	ecm:build
 USE_QT=		core declarative gui network opengl printsupport svg widgets xml \
 		buildtools:build linguisttools:build qmake:build testlib:build
 
 USE_LDCONFIG=	yes
 
 SHLIB_VER=	8.0.0
 PLIST_SUB+=	SHLIB_VER="${SHLIB_VER}" \
 		SHLIB_SHVER="${SHLIB_VER:R:R}"
 
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.mk>
diff --git a/math/antic/Makefile b/math/antic/Makefile
index 657b2afa4f98..8ec98f8600fa 100644
--- a/math/antic/Makefile
+++ b/math/antic/Makefile
@@ -1,34 +1,35 @@
 PORTNAME=	antic
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.2.5
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Algebraic Number Theory In C
 WWW=		https://github.com/wbhart/antic
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/gpl-2.0.txt
 
 LIB_DEPENDS=	libflint.so:math/flint2 \
 		libgmp.so:math/gmp \
 		libmpfr.so:math/mpfr
 
 USES=		cmake:testing
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	wbhart
 
 PLIST_FILES=	include/antic/nf.h \
 		include/antic/nf_elem.h \
 		include/antic/qfb.h \
 		lib/libantic.so \
 		lib/libantic.so.0 \
 		lib/libantic.so.0.2.5
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libantic.so
 
 .include <bsd.port.mk>
diff --git a/math/arb/Makefile b/math/arb/Makefile
index 7f30957b3b48..71970a677ae3 100644
--- a/math/arb/Makefile
+++ b/math/arb/Makefile
@@ -1,22 +1,23 @@
 PORTNAME=	arb
 DISTVERSION=	2.23.0
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	C library for arbitrary-precision interval arithmetic
 WWW=		https://arblib.org/
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libflint.so:math/flint2 \
 		libgmp.so:math/gmp \
 		libmpfr.so:math/mpfr
 
 USES=		cmake:testing
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	fredrik-johansson
 
 .include <bsd.port.mk>
diff --git a/math/armadillo/Makefile b/math/armadillo/Makefile
index dc5291b1adfe..73bfc2fe70bf 100644
--- a/math/armadillo/Makefile
+++ b/math/armadillo/Makefile
@@ -1,27 +1,28 @@
 PORTNAME=	armadillo
 DISTVERSION=	12.2.0
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	SF/arma
 
 MAINTAINER=	salvadore@FreeBSD.org
 COMMENT=	C++ linear algebra library
 WWW=		http://arma.sourceforge.net/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 LIB_DEPENDS=	libarpack.so:math/arpack-ng \
 		libboost_date_time.so:devel/boost-libs \
 		libhdf5.so:science/hdf5 \
 		liblapack.so:math/lapack \
 		libsuperlu.so:math/superlu \
 		libsz.so:science/libaec
 
 USES=		blaslapack:openblas cmake:testing compiler:c++11-lang pkgconfig tar:xz
 USE_LDCONFIG=	yes
 
 CMAKE_ARGS+=	-DPKG_CONFIG_DIR=${LOCALBASE}/libdata/pkgconfig/
 CMAKE_OFF=	BUILD_SMOKE_TEST
 CMAKE_TESTING_ON=	BUILD_SMOKE_TEST
 
 .include <bsd.port.mk>
diff --git a/math/arpack++/Makefile b/math/arpack++/Makefile
index a66da3bb68da..abf848326a9b 100644
--- a/math/arpack++/Makefile
+++ b/math/arpack++/Makefile
@@ -1,90 +1,90 @@
 PORTNAME=	arpack++
 PORTVERSION=	2.3.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	math
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Object-oriented version of the ARPACK package
 WWW=		https://www.ime.unicamp.br/~chico/arpack++/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libarpack.so:math/arpack-ng \
 		libsuperlu.so:math/superlu \
 		libumfpack.so:math/suitesparse-umfpack
 
 .if exists(${LOCALBASE}/lib/libatlas.so) && !defined(WITH_BLAS)
 WITH_ATLAS=	yes
 .endif
 .if defined(WITH_ATLAS)
 LIB_DEPENDS+=	libatlas.so:math/atlas
 BLAS=		-lf77blas
 LAPACK=		-lalapack -lcblas
 .else
 LIB_DEPENDS+=	liblapack.so:math/lapack
 LIB_DEPENDS+=	libblas.so:math/blas
 BLAS=		-lblas
 LAPACK=		-llapack
 .endif
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	m-reuter
 GH_PROJECT=	arpackpp
 
 USES=		fortran gmake localbase
 
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 REINPLACE_ARGS=	-i ""
 
 DOCS=		README.md doc/README doc/arpackpp.pdf doc/structure.txt
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
 pre-configure:
 	${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|g"	\
 		-e "s|%%BLAS%%|${BLAS}|"			\
 		-e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/Makefile.inc
 	${FIND} ${WRKSRC}/examples -name Makefile |	\
 	${XARGS} ${REINPLACE_CMD} -e 's|$$(ARPACKPP_DIR)/examples|${EXAMPLESDIR}|'
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/include/ARPACK++
 	for inc in `${LS} ${WRKSRC}/include` ; do \
 		${INSTALL_DATA} ${WRKSRC}/include/$$inc ${STAGEDIR}${PREFIX}/include/ARPACK++; \
 	done
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for doc in ${DOCS}
 	${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR}
 .endfor
 	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
 
 do-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/Makefile.inc ${STAGEDIR}${EXAMPLESDIR}
 	${CP} -R ${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR}
 	@${ECHO_MSG} "===> Examples installed in ${EXAMPLESDIR}."
 
 .if defined(MAINTAINER_MODE)
 test:	install
 	for sample in `${FIND} ${WRKSRC}/examples -name Makefile` ; do \
 		(cd `dirname $$sample` ; \
 		${ECHO_MSG} "============" ; \
 		${ECHO_MSG} "*** Entering `pwd`" ; \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} \
 		|| ${TRUE}) ; \
 	done
 	@${ECHO_MSG} "============"
 	@${ECHO_MSG} "Failures expected in umfpack/complex, umfpack/nonsym & umfpack/sym"
 	@${ECHO_MSG} "(UM*2FA -> umfpack_*_numeric)."
 	@${ECHO_MSG}
 .endif
 
 .include <bsd.port.mk>
diff --git a/math/arpack-ng/Makefile b/math/arpack-ng/Makefile
index c2a476e30273..64f7d617982c 100644
--- a/math/arpack-ng/Makefile
+++ b/math/arpack-ng/Makefile
@@ -1,67 +1,68 @@
 PORTNAME=	arpack-ng
 DISTVERSION=	3.9.0
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Revised Argand library for solving large-scale eigenvalue problems
 WWW=		https://forge.scilab.org/index.php/p/arpack-ng/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libmpich.so:net/mpich # MPI is incremental: it adds the libparpack.so lib, it is a candidate for a sub-package
 
 USES=		autoreconf fortran libtool pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	opencollab
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-blas="${BLAS}" \
 		--with-lapack="${LAPACK}" \
 		--enable-mpi \
 		--disable-static \
 		--enable-icb
 LDFLAGS+=	-L${LOCALBASE}/lib
 TEST_TARGET=	check
 USE_LDCONFIG=	yes
 
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
 CONFLICTS_INSTALL=	arpack
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 WITH_BLAS?=	blas
 
 .if ${WITH_BLAS} == "gotoblas"
 BLAS=		-lgoto2p
 LAPACK=		-lgoto2p
 LIB_DEPENDS+=	libgoto2p.so:math/gotoblas
 .elif ${WITH_BLAS} == "atlas"
 BLAS=		-lptf77blas
 LAPACK=		-lalapack -lptcblas
 LIB_DEPENDS+=	libptf77blas.so:math/atlas
 .elif ${WITH_BLAS} == "blas"
 BLAS=		-lblas
 LAPACK=		-llapack
 LIB_DEPENDS+=	libblas.so:math/blas \
 		liblapack.so:math/lapack
 .else
 IGNORE=		unknown value of WITH_BLAS: ${WITH_BLAS}
 .endif
 
 pre-configure:
 	@cd ${WRKSRC}; ./bootstrap
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib*arpack.so.*.*
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/DOCUMENTS && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR}
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/EXAMPLES && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/math/atlas/Makefile b/math/atlas/Makefile
index bb2a915a9da9..963523cebd24 100644
--- a/math/atlas/Makefile
+++ b/math/atlas/Makefile
@@ -1,244 +1,244 @@
 PORTNAME=	atlas
 PORTVERSION=	3.10.3
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	math
 MASTER_SITES=	SF/math-${PORTNAME}/Stable/${PORTVERSION}
 PKGNAMESUFFIX=	-math
 DISTNAME=	${PORTNAME}${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Automatically Tuned Linear Algebra Software (ATLAS)
 WWW=		http://math-atlas.sourceforge.net/
 
 LICENSE=	BSD3CLAUSE
 
 BUILD_DEPENDS=	${NONEXISTENT}:math/lapack:checksum
 
 USES=		fortran gmake tar:bzip2
 USE_GCC=	yes
 
 CONFLICTS=	cblas
 CONFLICTS_INSTALL=	openblas	# $PREFIX/include/cblas.h
 MANUAL_PACKAGE_BUILD=	Optimizes for the local machine.
 
 OPTIONS_DEFINE=		DOCS DATA ARCHDEF TSC WALL_TIMER
 OPTIONS_DEFAULT=	DATA
 ARCHDEF_DESC=		Use a specified architectural default
 DATA_DESC=		Install tuning data and logs from the build
 TSC_DESC=		If WALL_TIMER is enabled, use the TSC
 WALL_TIMER_DESC=	Use less robust timing with higher resolution
 
 PORTSCOUT=	limitw:1,even
 WRKSRC=		${WRKDIR}/ATLAS
 
 .include <bsd.port.options.mk>
 
 #Increase ATLAS_MAXMALLOC if the atlas threaded libraries perform poorly on large problems:
 # http://math-atlas.sourceforge.net/errata.html#MaxMalloc
 ATLAS_MAXMALLOC?=	67108864
 
 .if !empty(ARCH:M*64*)
 POINTER?=	64
 .else
 POINTER?=	32
 .endif
 
 .if defined(MAINTAINER_MODE)
 LIB_DEPENDS+=	libblas.so:math/blas
 .endif
 
 .if ${PORT_OPTIONS:MDATA}
 PORTDATA=	*
 .endif
 PORTDOCS=	*
 
 .if ${PORT_OPTIONS:MARCHDEF}
 .  if defined(ARCHDEF)
 .    if ${ARCHDEF} == "NONE"
 ARCHDEFFLAG=	-Si archdef 0
 .    endif
 .  else
 IGNORE=		you have set WITH_ARCHDEF, but have not defined ARCHDEF
 .  endif
 .endif
 
 USE_LDCONFIG=	yes
 
 EXTRA_FLAGS?=	${PICFLAG} -Wl,-rpath=${_GCC_RUNTIME}
 SHARED_FLAGS=	${PICFLAG} -DPIC
 SHARED_LAPACK_WRKSRC=	WRKSRC
 STATIC_LAPACK_WRKSRC=	WRKSRC
 PICFLAG?=	-fPIC
 CFLAGS+=	${PICFLAG}
 CONFIGURE_ENV+=	PATH="${WRKDIR}/.bin:${PATH}"
 MAKE_ENV+=	MAKE=${GMAKE} PATH="${WRKDIR}/.bin:${PATH}"
 BINARY_ALIAS=	make=${LOCALBASE}/bin/gmake	\
 		gcc=${CC} gfortran=${FC} f77=${FC}
 
 pre-everything::
 	@${CAT} ${FILESDIR}/tuning-message
 
 pre-configure:
 	${REINPLACE_CMD} -e 's|$$(ARCH)|$$(ATLAS_ARCH)|g' \
 		${WRKSRC}/Make.top \
 		${WRKSRC}/makes/Make.bin \
 		${WRKSRC}/makes/Make.lib \
 		${WRKSRC}/makes/Make.sysinfo \
 		${WRKSRC}/CONFIG/src/Makefile \
 		${WRKSRC}/CONFIG/ARCHS/Makefile
 	${REINPLACE_CMD} -e "\|OS=ALL|{N; \
 		s|-mavx|-msse3|;s|'| ${EXTRA_FLAGS}'|4;}" \
 		${WRKSRC}/CONFIG/src/atlcomp.txt
 	${REINPLACE_CMD} -E -e \
 	"\|(#define ATL_MaxMalloc[[:blank:]]+)([[:digit:]]+)|s||\1${ATLAS_MAXMALLOC}|" \
 		${WRKSRC}/include/atlas_lvl3.h
 	${REINPLACE_CMD} -e 's|%%WRKBIN%%|${WRKDIR}/.bin|'	\
 		${WRKSRC}/CONFIG/src/probe_comp.c
 
 do-configure:
 	echo "PATH=${PATH} *****************************************"
 	if [ ${PORT_OPTIONS:MWALL_TIMER} ] ; then \
 		TIMEFLAG= ; \
 		if [ \( ${ARCH} = "i386" -o ${ARCH} = "amd64" \) -a ${PORT_OPTIONS:MTSC} ] ; then \
 			freq=`${SYSCTL} -ni machdep.tsc_freq` ; \
 			if [ "x$${freq}" != "x" ] ; then \
 				if [ $${freq} -gt 1000000 ] ; then \
 					MHZ=$$(($${freq}/1000000)) ; \
 					TIMEFLAG="-D c -DPentiumCPS=$${MHZ}" ; \
 				fi ; \
 			fi ; \
 		fi ; \
 		if [ "x$${TIMEFLAG}" = "x" ] ; then \
 			TIMEFLAG="-D c -DWALL" ; \
 		fi ; \
 	fi ; \
 	${ECHO_CMD} "TIMEFLAG = $${TIMEFLAG}" \
 		> ${WRKSRC}/saved_flags ; \
 	${ECHO_CMD} "Dummy configuration of ATLAS to obtain compiler flags:" ; \
 	${MKDIR} ${WRKSRC}/static ; cd ${WRKSRC}/static ; \
 		${SETENV} ${CONFIGURE_ENV} ../configure --cc="${CC}" --cflags="${CFLAGS}" \
 		--prefix="${PREFIX}" -v 2 $${TIMEFLAG} ${ARCHDEFFLAG} \
 		-Ss f77lib " " -Ss pmake "${MAKE} ${_MAKE_JOBS}" \
 		-Fa alg "${STATIC_FLAGS} " -b ${POINTER}
 	${SED} -ne "\|F77FLAGS =|p" ${WRKSRC}/static/Make.inc \
 		>> ${WRKSRC}/saved_flags
 
 post-configure:
 	@${RM} -r ${WRKSRC}/static
 
 do-build:
 .for opt in shared static
 	@${ECHO_CMD} "Building the LAPACK archives with ${opt} ATLAS flags:"
 	F77FLAGS="`${MAKE} -f ${WRKSRC}/saved_flags -V F77FLAGS` ${EXTRA_FLAGS}" ; \
 	LW=`${MAKE} -C ${PORTSDIR}/math/lapack -V ${${opt:tu}_LAPACK_WRKSRC}` ; \
 	${MAKE} -C ${PORTSDIR}/math/lapack WITH=${opt:tu} clean patch ; \
 	${REINPLACE_CMD} -e 's|-O0|-O0 ${EXTRA_FLAGS}|'	$${LW}/make.inc ; \
 	cd $${LW} ; ${SETENV} ${MAKE_ENV:NFFLAGS=*} EXTRAFLAGS="${${opt:tu}_FLAGS} ${PICFLAG} " \
 		FFLAGS="-pipe $${F77FLAGS}" ${MAKE_CMD} ${_MAKE_JOBS} ${MAKE_ARGS} \
 		ARCH="${AR}" lapacklib ; \
 	TIMEFLAG=`${MAKE} -f ${WRKSRC}/saved_flags -V TIMEFLAG` ; \
 	${MKDIR} ${WRKSRC}/${opt}/lib ; cd ${WRKSRC}/${opt} ; \
 	${MV} $${LW}/liblapack.a liblapack_${opt}.a ; \
 	${AR} -dv liblapack_${opt}.a lsame.o xerbla.o csrot.o zdrot.o ; \
 	${CP} liblapack_${opt}.a lib/liblapack.a ; \
 	${MAKE} -C ${PORTSDIR}/math/lapack clean ; \
 	${ECHO_CMD} "Configuring ${opt} ATLAS:" ; \
 		${SETENV} ${CONFIGURE_ENV} ../configure --cc="${CC}" --cflags="${CFLAGS}" \
 		--prefix="${PREFIX}" -v 2 $${TIMEFLAG} ${ARCHDEFFLAG} \
 		-Ss flapack "${WRKSRC}/${opt}/liblapack_${opt}.a" \
 		-Ss f77lib " " -Ss pmake "${MAKE_CMD} ${_MAKE_JOBS}" \
 		-Si lapackref 1 -D c -DATL_FULL_LAPACK \
 		-Fa alg "${${opt:tu}_FLAGS} " -b ${POINTER} ; \
 	if [ "x${WITH_ARCHDEF}" != "x" ] ; then \
 		if [ "x${ARCHDEF}" != "xNONE" ] ; then \
 			if [ -f ${ARCHDEF} ] ; then \
 				${CP} -f ${ARCHDEF} ${WRKSRC}/CONFIG/ARCHS/ ; \
 			elif [ ! -f ${WRKSRC}/CONFIG/ARCHS/${ARCHDEF} ] ; then \
 				${ECHO_CMD} \
 				"==> ${PKGNAME} : ARCHDEF \"${ARCHDEF}\" does not exist" ; \
 				exit 1 ; \
 			fi ; \
 			${REINPLACE_CMD} -E -e \
 			"\|[[:blank:]]*ARCH =|s|=.*|= ${ARCHDEF:T:S/.tgz$//}|" \
 			${WRKSRC}/${opt}/Make.inc ; \
 		fi ; \
 	fi ; \
 	${ECHO_CMD} "Building ${opt} ATLAS:" ; cd ${WRKSRC}/${opt} ; \
 	${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} all
 .endfor
 
 L1=	${FC} $${F77FLAGS} ${SHARED_FLAGS} ${LDFLAGS} -shared -Wl,-x \
 	-Wl,--whole-archive -Wl,-soname,
 L2=	-Wl,--no-whole-archive -Wl,--as-needed -lpthread
 
 post-build:
 .for opt in shared static
 	@${ECHO_CMD} "Timing ${opt} ATLAS:"
 	(cd ${WRKSRC}/${opt} ; ${SETENV} ${MAKE_ENV} \
 		${MAKE_CMD} ${MAKE_ARGS} time ; \
 		cd ARCHS ; ${SETENV} ${MAKE_ENV} \
 			${MAKE_CMD} ${MAKE_ARGS} ArchNew tarfile)
 .endfor
 	@${ECHO_CMD} "Building ATLAS shared libraries:"
 	F77FLAGS="`${MAKE} -f ${WRKSRC}/saved_flags -V F77FLAGS` ${EXTRA_FLAGS}" ; \
 	cd ${WRKSRC}/shared/lib ; \
 	${L1}libatlas.so.2 -o libatlas.so.2 libatlas.a ${L2} ; \
 	${L1}libf77blas.so.2 -o libf77blas.so.2 libf77blas.a ${L2} libatlas.so.2 ; \
 	${L1}libptf77blas.so.2 -o libptf77blas.so.2 libptf77blas.a ${L2} libatlas.so.2 ; \
 	${L1}libcblas.so.2 -o libcblas.so.2 libcblas.a ${L2} libatlas.so.2 ; \
 	${L1}libptcblas.so.2 -o libptcblas.so.2 libptcblas.a ${L2} libatlas.so.2 ; \
 	${L1}libalapack.so.2 -o libalapack.so.2 liblapack.a ${L2} libatlas.so.2
 
 .if defined(MAINTAINER_MODE)
 STATIC_BLAS=	${LOCALBASE}/lib/libblas.a
 SHARED_BLAS=	-L${LOCALBASE}/lib -lblas
 
 test: build
 .  for opt in shared static
 	@${ECHO_CMD} "Testing ${opt} ATLAS:"
 	@cd ${WRKSRC}/${opt} ; ${SETENV} ${MAKE_ENV} BLAS="${${opt:tu}_BLAS}" \
 	${MAKE_CMD} ${MAKE_ARGS} check ptcheck error_report
 .  endfor
 .endif
 
 do-install:
 .for i in libatlas libcblas libf77blas liblapack libptcblas libptf77blas
 	${INSTALL_DATA} ${WRKSRC}/static/lib/${i}.a \
 		${STAGEDIR}${PREFIX}/lib/${i:S|lapack|alapack|}.a
 	${INSTALL_DATA} ${WRKSRC}/shared/lib/${i}.a \
 		${STAGEDIR}${PREFIX}/lib/${i:S|lapack|alapack|}_pic.a
 	${INSTALL_LIB} ${WRKSRC}/shared/lib/${i:S|lapack|alapack|}.so.2 \
 		${STAGEDIR}${PREFIX}/lib
 	${LN} -sf ${i:S|lapack|alapack|}.so.2 \
 		${STAGEDIR}${PREFIX}/lib/${i:S|lapack|alapack|}.so
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/include/cblas.h ${WRKSRC}/include/clapack.h \
 		${STAGEDIR}${PREFIX}/include
 .for opt in shared static
 	@${MKDIR} ${STAGEDIR}${PREFIX}/include/atlas/${opt}
 	${INSTALL_DATA} ${WRKSRC}/${opt}/include/* \
 		${STAGEDIR}${PREFIX}/include/atlas/${opt}
 .    if ${PORT_OPTIONS:MDATA}
 	@${MKDIR} ${STAGEDIR}${DATADIR}/${opt}
 	(cd ${WRKSRC}/${opt}/bin; \
 		${COPYTREE_SHARE} INSTALL_LOG ${STAGEDIR}${DATADIR}/${opt})
 	(cd ${WRKSRC}/${opt}/ARCHS; \
 		${COPYTREE_SHARE} "*" ${STAGEDIR}${DATADIR}/${opt} \
 		"! -name Makefile -and ! -name *.tgz")
 	@${FIND} ${STAGEDIR}${DATADIR}/${opt} -type d -empty -delete
 .    endif
 .endfor
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/* ${STAGEDIR}${DOCSDIR}
 .endif
 
 post-install:
 .for d in shared static
 .  for f in xnegmm xnegmv xnegr1
 	${STRIP_CMD} ${STAGEDIR}${DATADIR}/${d}/${f}
 .  endfor
 .endfor
 
 .include <bsd.port.mk>
diff --git a/math/audi/Makefile b/math/audi/Makefile
index 27bea7d8a66a..c20238c405d6 100644
--- a/math/audi/Makefile
+++ b/math/audi/Makefile
@@ -1,28 +1,29 @@
 PORTNAME=	audi
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.9.2-1
+PORTREVISION=	1
 DISTVERSIONSUFFIX=	-g899eb78
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Header only C++ library implementing the algebra of Taylor polynomials
 WWW=		http://darioizzo.github.io/audi/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 HPP_DEPENDS=	boost-libs>0:devel/boost-libs \
 		obake>0:math/obake
 BUILD_DEPENDS=	${HPP_DEPENDS}
 RUN_DEPENDS=	${HPP_DEPENDS}
 
 USES=		cmake:testing compiler:c++20-lang eigen:3,build,run
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	darioizzo
 
 CMAKE_OFF=	AUDI_BUILD_TESTS
 CMAKE_TESTING_ON=	AUDI_BUILD_TESTS
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/math/bcps/Makefile b/math/bcps/Makefile
index 7e0da4a3b628..8d48137e1793 100644
--- a/math/bcps/Makefile
+++ b/math/bcps/Makefile
@@ -1,32 +1,33 @@
 PORTNAME=	bcps
 DISTVERSIONPREFIX=	releases/
 DISTVERSION=	0.99.2
+PORTREVISION=	1
 CATEGORIES=	math
 PKGNAMEPREFIX=	coin-or-
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Branch, Constrain, and Price Software (BiCePS)
 WWW=		https://github.com/coin-or/CHiPPS-BiCePS
 
 LICENSE=	EPL
 LICENSE_FILE=	${WRKSRC}/Bcps/LICENSE
 
 LIB_DEPENDS=	libAlps.so:math/alps \
 		libCoinUtils.so:math/coinutils \
 		libopenblas.so:math/openblas
 
 USES=		gmake libtool pkgconfig
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	coin-or
 GH_PROJECT=	CHiPPS-BiCePS
 
 GNU_CONFIGURE=	yes
 
 INSTALL_TARGET=	install-strip
 
 post-install:
 	${RM} -r ${STAGEDIR}${PREFIX}/share
 
 .include <bsd.port.mk>
diff --git a/math/blacs/Makefile b/math/blacs/Makefile
index c226f950f6fb..8439b16591ad 100644
--- a/math/blacs/Makefile
+++ b/math/blacs/Makefile
@@ -1,126 +1,126 @@
 PORTNAME=	blacs
 PORTVERSION=	1.7
-PORTREVISION=	38
+PORTREVISION=	39
 CATEGORIES=	math
 MASTER_SITES=	NETLIB/blacs
 DISTNAME=	BLACS
 DISTFILES=	mpiblacs.tgz blacstester.tgz mpiblacs-patch03.tgz
 DIST_SUBDIR=	blacs
 EXTRACT_ONLY=	mpiblacs.tgz blacstester.tgz mpiblacs-patch03.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	BLACS (Basic Linear Algebra Communication Subprograms)
 WWW=		https://www.netlib.org/blacs/
 
 # See http://icl.cs.utk.edu/lapack-forum/archives/lapack/msg01200.html
 LICENSE=	BSD3CLAUSE
 
 SUB_FILES=	pkg-message
 USES=		fortran gmake localbase
 USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=	DOCS
 OPTIONS_RADIO=	MPI
 OPTIONS_RADIO_MPI=	MPICH OPENMPI
 OPTIONS_DEFAULT=	DOCS MPICH
 
 DOCS_DISTFILES=	blacs_install.ps f77blacsqref.ps lawn94.ps \
 		cblacsqref.ps  mpi_prop.ps mpiblacs_issues.ps
 
 OPENMPI_USES=	mpi:openmpi
 OPENMPI_EXTRA_PATCHES=	${FILESDIR}/Bmake.inc-openmpi.diff
 
 MPICH_USES=	mpi:mpich
 MPICH_EXTRA_PATCHES=	${FILESDIR}/Bmake.inc-mpich.diff
 
 .include <bsd.port.pre.mk>
 
 F77EXTRAFLAGS=	#-w -fno-globals -fugly-complex
 .if ${GCC_DEFAULT} >= 10
 # workaround for Rank mismatch between actual argument at (1) and actual argument at (2) (scalar and rank-1)
 F77EXTRAFLAGS+=	-fallow-argument-mismatch
 .endif
 
 DEBUG_LEVEL=	0
 
 .if ${ARCH} == "sparc64" || ${ARCH} == "amd64"
 FPIC=	-fPIC
 .else
 FPIC=	-fpic
 .endif
 
 WRKSRC_SHARED=${WRKSRC}_shared
 CFLAGS_SHARED=${CFLAGS} ${FPIC}
 FFLAGS_SHARED=${FFLAGS} ${FPIC}
 SVERSION=1
 
 .if defined(WITH_OPTIMIZED_FLAGS)
 .if ${ARCH} == "amd64"
 FFLAGS+=	-pipe -O3 -ffast-math -funroll-all-loops -fpeel-loops -ftracer -funswitch-loops -funit-at-a-time
 CFLAGS+=	-pipe -O3 -ffast-math -funroll-all-loops -fpeel-loops -ftracer -funswitch-loops -funit-at-a-time
 .elif ${ARCH} == "i386"
 FFLAGS+=	-O3 -ffast-math -finline-functions -fomit-frame-pointer -funroll-loops -fexpensive-optimizations -malign-double -mcpu=i686 -march=i686 -mfancy-math-387 -mpreferred-stack-boundary=3
 CFLAGS+=	-O3 -ffast-math -finline-functions -fomit-frame-pointer -funroll-loops -fexpensive-optimizations -malign-double -mcpu=i686 -march=i686 -mfancy-math-387 -mpreferred-stack-boundary=3
 .else
 FFLAGS+=	-O3 -ffast-math -finline-functions -fomit-frame-pointer -funroll-loops -fexpensive-optimizations -Wno-multichar
 CFLAGS+=	-O3 -ffast-math -finline-functions -fomit-frame-pointer -funroll-loops -fexpensive-optimizations -Wno-multichar
 .endif
 .endif
 
 pre-patch:
 	(${CP} ${WRKSRC}/BMAKES/Bmake.MPI-LINUX ${WRKSRC}/Bmake.inc)
 
 post-patch:
 	${CP} -r ${WRKSRC} ${WRKSRC_SHARED}
 
 pre-configure:
 	(${REINPLACE_CMD} -e 's|@WRKSRC@|${WRKSRC}|g ; s|@DEBUG_LEVEL@|${DEBUG_LEVEL}|g ; s|@LOCALBASE@|${LOCALBASE}|g ; s|@CC@|${CC}|g ; s|@CFLAGS@|${CFLAGS}|g ; s|@F77@|${F77}|g ; s|@FFLAGS@|${FFLAGS}|g ; s|@F77EXTRAFLAGS@|${F77EXTRAFLAGS}|g ; s|   ARCH *.= ar|   ARCMD = ar|'  ${WRKSRC}/Bmake.inc)
 	(${REINPLACE_CMD} -e 's|@WRKSRC@|${WRKSRC_SHARED}|g ; s|@DEBUG_LEVEL@|${DEBUG_LEVEL}|g ; s|@LOCALBASE@|${LOCALBASE}|g ; s|@CC@|${CC}|g ; s|@CFLAGS@|${CFLAGS_SHARED}|g ; s|@F77@|${F77}|g ; s|@FFLAGS@|${FFLAGS_SHARED}|g ; s|@F77EXTRAFLAGS@|${F77EXTRAFLAGS}|g ; s|   ARCH *.= ar|   ARCMD = ar|'  ${WRKSRC_SHARED}/Bmake.inc)
 	${REINPLACE_CMD} -e 's|\$$(ARCH)|$$(ARCMD)|' ${WRKSRC}/SRC/MPI/Makefile
 	${REINPLACE_CMD} -e 's|\$$(ARCH)|$$(ARCMD)|' ${WRKSRC_SHARED}/SRC/MPI/Makefile
 
 do-build:
 	(cd ${WRKSRC}; make mpi; make tester)
 	(cd ${WRKSRC_SHARED}; make mpi; make tester)
 
 post-build:
 	${RM} -r ${WRKDIR}/tmp_shared
 	${MKDIR} ${WRKDIR}/tmp_shared
 	${MV} ${WRKSRC_SHARED}/LIB/blacs_MPI-FreeBSD-${DEBUG_LEVEL}.a          ${WRKSRC_SHARED}/LIB/libblacsc.a
 	${MV} ${WRKSRC_SHARED}/LIB/blacsF77init_MPI-FreeBSD-${DEBUG_LEVEL}.a   ${WRKSRC_SHARED}/LIB/libblacsf77.a
 	${MV} ${WRKSRC_SHARED}/LIB/blacsCinit_MPI-FreeBSD-${DEBUG_LEVEL}.a     ${WRKSRC_SHARED}/LIB/libblacs.a
 	${FIND} ${WRKSRC_SHARED} -name "*\.a" -exec ${MV} {} ${WRKDIR}/tmp_shared \;
 	cd ${WRKDIR}/tmp_shared ; for i in `ls *.a | ${SED}  's/\.a//' `; do \
 		${LD} -Bshareable -o $${i}.so.${SVERSION} -x -soname $${i}.so.${SVERSION} --whole-archive $${i}.a ;\
 	${LN} -s $${i}.so.${SVERSION} $${i}.so ;\
 	done
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/LIB/blacsCinit_MPI-FreeBSD-${DEBUG_LEVEL}.a ${STAGEDIR}${PREFIX}/lib/libblacsc.a
 	${INSTALL_DATA} ${WRKSRC}/LIB/blacsF77init_MPI-FreeBSD-${DEBUG_LEVEL}.a ${STAGEDIR}${PREFIX}/lib/libblacsf77.a
 	${INSTALL_DATA} ${WRKSRC}/LIB/blacs_MPI-FreeBSD-${DEBUG_LEVEL}.a ${STAGEDIR}${PREFIX}/lib/libblacs.a
 
 .for lib in libblacsc libblacsf77 libblacs
 	${INSTALL_LIB} ${WRKDIR}/tmp_shared/${lib}.so.${SVERSION} ${STAGEDIR}${PREFIX}/lib/${lib}.so.${SVERSION}
 	${LN} -s ${lib}.so.${SVERSION} ${STAGEDIR}${PREFIX}/lib/${lib}.so
 .endfor
 
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/BLACS/TESTING
 	( cd ${WRKSRC_SHARED}/TESTING/EXE ; \
 	  ${INSTALL_PROGRAM} xCbtest_MPI-FreeBSD-${DEBUG_LEVEL} ${STAGEDIR}${PREFIX}/share/BLACS/TESTING/xCbtest_MPI-FreeBSD; \
 	  ${INSTALL_PROGRAM} xFbtest_MPI-FreeBSD-${DEBUG_LEVEL} ${STAGEDIR}${PREFIX}/share/BLACS/TESTING/xFbtest_MPI-FreeBSD; \
 	  ${INSTALL_DATA}  bsbr.dat   ${STAGEDIR}${PREFIX}/share/BLACS/TESTING; \
 	  ${INSTALL_DATA}  bt.dat     ${STAGEDIR}${PREFIX}/share/BLACS/TESTING; \
 	  ${INSTALL_DATA}  comb.dat   ${STAGEDIR}${PREFIX}/share/BLACS/TESTING; \
 	  ${INSTALL_DATA}  sdrv.dat   ${STAGEDIR}${PREFIX}/share/BLACS/TESTING)
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${CAT} ${DISTDIR}/${DIST_SUBDIR}/blacs_install.ps   | ${GZIP_CMD} > ${STAGEDIR}${DOCSDIR}/blacs_install.ps.gz
 	${CAT} ${DISTDIR}/${DIST_SUBDIR}/cblacsqref.ps      | ${GZIP_CMD} > ${STAGEDIR}${DOCSDIR}/cblacsqref.ps.gz
 	${CAT} ${DISTDIR}/${DIST_SUBDIR}/f77blacsqref.ps    | ${GZIP_CMD} > ${STAGEDIR}${DOCSDIR}/f77blacsqref.ps.gz
 	${CAT} ${DISTDIR}/${DIST_SUBDIR}/lawn94.ps          | ${GZIP_CMD} > ${STAGEDIR}${DOCSDIR}/lawn94.ps.gz
 	${CAT} ${DISTDIR}/${DIST_SUBDIR}/mpi_prop.ps        | ${GZIP_CMD} > ${STAGEDIR}${DOCSDIR}/mpi_prop.ps.gz
 	${CAT} ${DISTDIR}/${DIST_SUBDIR}/mpiblacs_issues.ps | ${GZIP_CMD} > ${STAGEDIR}${DOCSDIR}/mpiblacs_issues.ps.gz
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/math/blasfeo/Makefile b/math/blasfeo/Makefile
index 22d5fb9d78ad..a8d5dbb46b99 100644
--- a/math/blasfeo/Makefile
+++ b/math/blasfeo/Makefile
@@ -1,43 +1,44 @@
 PORTNAME=	blasfeo
 DISTVERSION=	0.1.3-59
+PORTREVISION=	1
 DISTVERSIONSUFFIX=	-g8548ea2c
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Basic Linear Algebra Subroutines For Embedded Optimization
 WWW=		https://github.com/giaf/blasfeo
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 LIB_DEPENDS=	libblas.so:math/blas
 
 USES=		cmake:testing
 USE_GITHUB=	yes
 GH_ACCOUNT=	giaf
 
 LDFLAGS+=	-L${LOCALBASE}/lib -lblas
 
 CMAKE_ARGS=	-DTARGET:STRING=GENERIC
 CMAKE_ON=	BUILD_SHARED_LIBS
 CMAKE_OFF=	BLASFEO_EXAMPLES
 CMAKE_TESTING_ON=	BLASFEO_TESTING # tests fail to compile, see https://github.com/giaf/blasfeo/issues/164
 
 OPTIONS_SINGLE=		${OPTIONS_SINGLE_${ARCH}}
 OPTIONS_SINGLE_amd64=	TARGETAMD64
 OPTIONS_SINGLE_TARGETAMD64=	GENERIC X64_INTEL_HASWELL X64_INTEL_SANDY_BRIDGE X64_INTEL_CORE X64_AMD_BULLDOZER
 OPTIONS_DEFAULT_amd64=	GENERIC
 # TODO ARM also has SIMD acceleration
 
 GENERIC_DESC=				Generic C code without SIMD acceleration
 X64_INTEL_HASWELL_DESC=			x86_64 architecture with AVX2 and FMA ISA (64 bit OS)
 X64_INTEL_SANDY_BRIDGE_DESC=		x86_64 architecture with AVX ISA (64 bit OS)
 X64_INTEL_CORE_DESC=			x86_64 architecture with SSE3 (64 bit OS)
 X64_AMD_BULLDOZER_DESC=			x86_64 architecture with AVX and FMA ISA (64 bit OS)
 
 X64_INTEL_HASWELL_CMAKE_ON=		-DTARGET:STRING=X64_INTEL_HASWELL
 X64_INTEL_SANDY_BRIDGE_CMAKE_ON=	-DTARGET:STRING=X64_INTEL_SANDY_BRIDGE
 X64_INTEL_CORE_CMAKE_ON=		-DTARGET:STRING=X64_INTEL_CORE
 X64_AMD_BULLDOZER_CMAKE_ON=		-DTARGET:STRING=X64_AMD_BULLDOZER
 
 .include <bsd.port.mk>
diff --git a/math/blaspp/Makefile b/math/blaspp/Makefile
index 900fd5486ea2..149b91e48f91 100644
--- a/math/blaspp/Makefile
+++ b/math/blaspp/Makefile
@@ -1,22 +1,23 @@
 PORTNAME=	blaspp
 DISTVERSION=	2022.05.00
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	https://bitbucket.org/icl/blaspp/downloads/
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	C++ API for the Basic Linear Algebra Subroutines
 WWW=		https://bitbucket.org/icl/blaspp/src/master/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libopenblas.so:math/openblas
 TEST_DEPENDS=	cblas>0:math/cblas
 
 USES=		cmake:testing fortran localbase # fails to find openblas w/out USES=fortran for some reason, needs investigation
 
 CMAKE_OFF=	build_tests
 CMAKE_TESTING_ON=	build_tests # tests fail to run, see https://bitbucket.org/icl/blaspp/issues/19/tests-arent-run-with-tester-target-when
 CMAKE_TESTING_TARGET=	tester
 
 .include <bsd.port.mk>
diff --git a/math/blaze/Makefile b/math/blaze/Makefile
index 2d05705d320b..8eab0e8d0bf6 100644
--- a/math/blaze/Makefile
+++ b/math/blaze/Makefile
@@ -1,28 +1,28 @@
 PORTNAME=	blaze
 DISTVERSION=	3.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	https://bitbucket.org/${BB_ACCOUNT}/${BB_PROJECT}/downloads/
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	C++ math library for dense and sparse arithmetic
 WWW=		https://bitbucket.org/blaze-lib/blaze/src/master/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	boost-libs>0:devel/boost-libs \
 		openblas>0:math/openblas
 RUN_DEPENDS=	boost-libs>0:devel/boost-libs \
 		openblas>0:math/openblas
 
 USES=		cmake compiler:c++14-lang fortran localbase:ldflags shebangfix
 
 BB_ACCOUNT=	${PORTNAME}-lib
 BB_PROJECT=	${PORTNAME}
 
 SHEBANG_GLOB=	run
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/math/blazeiterative/Makefile b/math/blazeiterative/Makefile
index 0fcd5849daaf..bbb46ae2ab06 100644
--- a/math/blazeiterative/Makefile
+++ b/math/blazeiterative/Makefile
@@ -1,24 +1,24 @@
 PORTNAME=	blazeiterative
 PORTVERSION=	g20180409
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Set of iterative linear system solvers for use with the Blaze library
 WWW=		https://github.com/tjolsen/BlazeIterative
 
 #LICENSE=	https://github.com/tjolsen/BlazeIterative/issues/9
 
 BUILD_DEPENDS=	blaze>0:math/blaze \
 		boost-libs>0:devel/boost-libs \
 		openblas>0:math/openblas
 RUN_DEPENDS=	blaze>0:math/blaze
 
 USES=		cmake compiler:c++14-lang fortran localbase:ldflags
 USE_GITHUB=	yes
 GH_ACCOUNT=	tjolsen
 GH_PROJECT=	BlazeIterative
 GH_TAGNAME=	e9f24b3
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/math/blocksolve95/Makefile b/math/blocksolve95/Makefile
index 507d6ddfc5ef..5be7aba8b771 100644
--- a/math/blocksolve95/Makefile
+++ b/math/blocksolve95/Makefile
@@ -1,76 +1,76 @@
 PORTNAME=	blocksolve95
 PORTVERSION=	3.0
-PORTREVISION=	26
+PORTREVISION=	27
 CATEGORIES=	math parallel
 MASTER_SITES=	ftp://ftp.mcs.anl.gov/pub/BlockSolve95/ \
 		http://ftp.mcs.anl.gov/pub/BlockSolve95/
 DISTNAME=	BlockSolve95
 DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Software for the efficient solution of large, sparse linear systems
 WWW=		https://ftp.mcs.anl.gov/pub/BlockSolve95/
 
 LICENSE=	AS-IS
 LICENSE_NAME=	AS-IS
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 LIB_DEPENDS=	libf2c.so:lang/f2c	\
 		libmpich.so:net/mpich
 
 USES=		fortran gmake tar:Z
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 OPTIONS_RADIO=	BLAS
 OPTIONS_RADIO_BLAS=	REFERENCE ATLAS
 OPTIONS_DEFAULT=	REFERENCE
 
 REFERENCE_DESC=	Blas / Lapack
 REFERENCE_USES=	blaslapack:netlib
 
 ATLAS_DESC=	ATLAS
 ATLAS_USES=	blaslapack:atlas
 
 MAKEFILE=	makefile
 MAKE_ARGS=	GMAKE=${MAKE_CMD} PETSC_ARCH=${PETSC_ARCH} BOPT=${BOPT}	\
 		BLAS_LIB="${BLASLIB}" LAPACK_LIB="-L${LOCALBASE}/lib ${LAPACKLIB}"
 
 MPIDIR=		${LOCALBASE}
 PETSC_ARCH=	freebsd
 BOPT?=		O
 
 FFLAGS+=	-O2
 
 INCLUDES=	BMmsg.h BSdepend.h BSlog.h BSmy_blas.h BSprivate.h BSsparse.h
 PORTDOCS=	manual.ps
 
 do-install:
 	${INSTALL_DATA}	${WRKSRC}/lib/lib${BOPT}/${PETSC_ARCH}/libBS95.a	\
 		${STAGEDIR}${PREFIX}/lib
 	${INSTALL_DATA}	${INCLUDES:S|^|${WRKSRC}/include/|} ${STAGEDIR}${PREFIX}/include
 	${INSTALL_MAN} ${WRKSRC}/doc/man/man3/* ${STAGEDIR}${MANPREFIX}/man/man3
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA}	${PORTDOCS:S|^|${WRKSRC}/doc/manual/|} ${STAGEDIR}${DOCSDIR}
 
 do-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA}	${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR}
 	@${RM} ${STAGEDIR}${EXAMPLESDIR}/makefile.orig
 
 .if defined(MAINTAINER_MODE)
 do-test:
 . if !exists(${HOME}/.mpd.conf)
 	@${ECHO_CMD} "MPD_SECRETWORD=change_on_install" > ${HOME}/.mpd.conf
 	${CHMOD} go-r ${HOME}/.mpd.conf
 	@${ECHO_MSG} "${HOME}/.mpd.conf has been generated - please change the secret word!"
 . endif
 	${LOCALBASE}/bin/mpd &
 	(cd ${BUILD_WRKSRC}/examples &&	\
 	${SETENV} ${MAKE_ENV:C|HOME=|wHOME=|} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} bsrunexamples clean)
 	${LOCALBASE}/bin/mpdallexit
 .endif
 
 .include <bsd.port.mk>
diff --git a/math/bonmin/Makefile b/math/bonmin/Makefile
index f6f288987062..5cec8baa0fba 100644
--- a/math/bonmin/Makefile
+++ b/math/bonmin/Makefile
@@ -1,46 +1,47 @@
 PORTNAME=	bonmin
 DISTVERSIONPREFIX=	releases/
 DISTVERSION=	1.8.9
+PORTREVISION=	1
 CATEGORIES=	math
 PKGNAMEPREFIX=	coin-or-
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Basic Open-source Nonlinear Mixed INteger programming
 WWW=		https://coin-or.github.io/Bonmin/
 
 LICENSE=	EPL
 LICENSE_FILE=	${WRKSRC}/Bonmin/LICENSE
 
 LIB_DEPENDS=	libCbc.so:math/cbc \
 		libCgl.so:math/cgl \
 		libClp.so:math/clp \
 		libcoinmumps.so:math/coin-or-mumps \
 		libcoinasl.so:math/asl \
 		libCoinUtils.so:math/coinutils \
 		libipopt.so:math/ipopt \
 		libnauty.so:math/nauty \
 		libopenblas.so:math/openblas \
 		libOsi.so:math/osi
 
 USES=		blaslapack compiler:c++11-lang gmake libtool pkgconfig
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	coin-or
 GH_PROJECT=	Bonmin
 
 GNU_CONFIGURE=	yes
 
 INSTALL_TARGET=	install-strip
 
 TEST_TARGET=	test
 
 SUB_FILES=	${PORTNAME}.msc
 SUB_LIST=	PORTVERSION=${PORTVERSION}
 
 post-install:
 	# install MiniZinc configuration file
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/minizinc/solvers
 	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.msc ${STAGEDIR}${PREFIX}/share/minizinc/solvers
 
 .include <bsd.port.mk>
diff --git a/math/cadabra2/Makefile b/math/cadabra2/Makefile
index 8bd117017000..30db81c1d22b 100644
--- a/math/cadabra2/Makefile
+++ b/math/cadabra2/Makefile
@@ -1,57 +1,57 @@
 PORTNAME=	cadabra2
 DISTVERSION=	2.4.2.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Computer algebra system for solving field theory problems
 WWW=		https://cadabra.science/
 
 LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/doc/license.txt
 
 BUILD_DEPENDS=	${LOCALBASE}/include/websocketpp/client.hpp:devel/websocketpp
 LIB_DEPENDS=	${PY_BOOST} \
 		libboost_system.so:devel/boost-libs \
 		libharfbuzz.so:print/harfbuzz \
 		libpcrecpp.so:devel/pcre \
 		libjsoncpp.so:devel/jsoncpp \
 		libgmp.so:math/gmp \
 		libuuid.so:misc/e2fsprogs-libuuid
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/sympy/__init__.py:math/py-sympy@${PY_FLAVOR} \
 		${PYTHON_SITELIBDIR}/matplotlib/__init__.py:math/py-matplotlib@${PY_FLAVOR}
 
 USES=		compiler:c++14-lang cmake:noninja dos2unix gettext-runtime gnome localbase:ldflags pkgconfig python:3.7+ sqlite tex # USES=python picks random python versions
 USE_GITHUB=	yes
 GH_ACCOUNT=	kpeeters
 DOS2UNIX_FILES=	cmake/version.cmake
 USE_GNOME=	glib20 glibmm libsigc++20
 USE_TEX=	base latex texhash
 OPTIONS_SUB=	yes
 
 CMAKE_ON=	ENABLE_SYSTEM_JSONCPP USE_PYTHON_3 # OFF doesn't work, still links to python3: https://github.com/kpeeters/cadabra2/issues/76
 CMAKE_OFF=	ENABLE_MATHEMATICA
 CXXFLAGS+=	-I${LOCALBASE}/include/jsoncpp
 LDFLAGS+=	-ljsoncpp
 
 PLIST_SUB=	_PY_SONAME=${_PY_SONAME}
 
 OPTIONS_DEFINE=	GUI
 OPTIONS_DEFAULT=	GUI
 
 GUI_USES=	desktop-file-utils
 GUI_USE=	GNOME=gtkmm30,gdkpixbuf2
 GUI_CMAKE_BOOL=	ENABLE_FRONTEND
 
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} < 30800
 _PY_SONAME=	.cpython-${PYTHON_SUFFIX}m
 .else
 _PY_SONAME=	${PYTHON_EXT_SUFFIX}
 .endif
 
 post-extract: # unbundle
 	@${RM} -r ${WRKSRC}/libs/jsoncpp ${WRKSRC}/libs/websocketpp
 
 .include <bsd.port.post.mk>
diff --git a/math/calcium/Makefile b/math/calcium/Makefile
index 14b76d20d520..6bada3a1b738 100644
--- a/math/calcium/Makefile
+++ b/math/calcium/Makefile
@@ -1,31 +1,32 @@
 PORTNAME=	calcium
 DISTVERSION=	0.4.1
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Exact real and complex numbers in C
 WWW=		https://fredrikj.net/calcium/
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libantic.so:math/antic \
 		libarb.so:math/arb \
 		libflint.so:math/flint2 \
 		libgmp.so:math/gmp \
 		libmpfr.so:math/mpfr
 
 USES=		gmake
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	fredrik-johansson
 
 GNU_CONFIGURE=	yes
 
 TEST_TARGET=	tests # only builds tests and doesn't run them, see https://github.com/fredrik-johansson/calcium/issues/41
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libcalcium.so.${DISTVERSION}
 
 .include <bsd.port.mk>
diff --git a/math/casadi/Makefile b/math/casadi/Makefile
index c4d9efa3a6fd..5f37944822b0 100644
--- a/math/casadi/Makefile
+++ b/math/casadi/Makefile
@@ -1,82 +1,83 @@
 PORTNAME=	casadi
 DISTVERSION=	3.6.0
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Symbolic framework for numeric optimization
 WWW=		https://web.casadi.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 LIB_DEPENDS=	libcoinmumps.so:math/coin-or-mumps
 
 USES=		cmake compiler:c++11-lang pkgconfig
 USE_GITHUB=	yes
 USE_LDCONFIG=	yes
 
 CFLAGS+=	-fPIC
 CXXFLAGS+=	-fPIC
 
 CMAKE_OFF=	WITH_DEEPBIND WITH_BUILD_BLASFEO
 
 # cmake-3.16: disable build of examples (they are not installed anyways),
 # and fail due to not setting up the linker environment properly:
 CMAKE_OFF+=	WITH_EXAMPLES
 
 OPTIONS_DEFINE=		BLASFEO BONMIN CLANG IPOPT LAPACK QPOASES
 OPTIONS_DEFAULT=	BLASFEO BONMIN IPOPT LAPACK QPOASES
 OPTIONS_SUB=		yes
 
 BLASFEO_DESC=		Build with BLASFEO
 BLASFEO_CMAKE_BOOL=	WITH_BLASFEO
 BLASFEO_BUILD_DEPENDS=	blasfeo>0:math/blasfeo
 
 BONMIN_DESC=		Build with Bonmin
 BONMIN_CMAKE_BOOL=	WITH_BONMIN
 BONMIN_USES=		blaslapack:netlib fortran
 BONMIN_LIB_DEPENDS=	libbonmin.so:math/bonmin \
 			libCbcSolver.so:math/cbc \
 			libCgl.so:math/cgl \
 			libClp.so:math/clp \
 			libcoinasl.so:math/asl \
 			libCoinUtils.so:math/coinutils \
 			libipopt.so:math/ipopt \
 			libnauty.so:math/nauty \
 			libopenblas.so:math/openblas \
 			libOsi.so:math/osi
 
 CLANG_DESC=		Build with clang for JIT
 CLANG_USES=		llvm:16
 CLANG_CMAKE_BOOL=	WITH_CLANG
 CLANG_CMAKE_ON=		-DLLVM_INSTALL_PREFIX=${LLVM_PREFIX} -DOLD_LLVM=ON
 CLANG_BROKEN=		fails to find clang, see https://github.com/casadi/casadi/issues/3089
 
 IPOPT_DESC=		Build with IPopt
 IPOPT_CMAKE_BOOL=	WITH_IPOPT
 IPOPT_USES=		blaslapack:netlib fortran
 IPOPT_LIB_DEPENDS=	libipopt.so:math/ipopt
 
 LAPACK_DESC=		Build with LAPACK
 LAPACK_CMAKE_BOOL=	WITH_LAPACK
 LAPACK_USES=		blaslapack:openblas
 
 QPOASES_DESC=		Build with qpOASES
 QPOASES_CMAKE_BOOL=	WITH_QPOASES
 QPOASES_LIB_DEPENDS=	libopenblas.so:math/openblas
 QPOASES_IMPLIES=	LAPACK
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MCLANG}
 # use clang from ports because cmake can't find base llvm for JIT
 BUILD_DEPENDS+=	clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
 RUN_DEPENDS+=	clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
 CPP=		clang-cpp${LLVM_DEFAULT}
 CC=		clang${LLVM_DEFAULT}
 CXX=		clang++${LLVM_DEFAULT}
 .endif
 
 PORTSCOUT=	limit:^.*[1-9]\..* # prevent tags like ge2
 
 .include <bsd.port.mk>
diff --git a/math/cbc/Makefile b/math/cbc/Makefile
index c05eadcdf6ab..0831b7377ddf 100644
--- a/math/cbc/Makefile
+++ b/math/cbc/Makefile
@@ -1,50 +1,51 @@
 PORTNAME=	cbc
 DISTVERSIONPREFIX=	releases/
 DISTVERSION=	2.10.8
+PORTREVISION=	1
 CATEGORIES=	math
 PKGNAMEPREFIX=	coin-or-
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Coin-or Branch and Cut: mixed integer programming solver
 WWW=		https://projects.coin-or.org/Cbc
 
 LICENSE=	EPL
 LICENSE_FILE=	${WRKSRC}/Cbc/LICENSE
 
 LIB_DEPENDS=	libblas.so:math/blas \
 		libCgl.so:math/cgl \
 		libClp.so:math/clp \
 		libcoinasl.so:math/asl \
 		libipopt.so:math/ipopt \
 		libcoinmumps.so:math/coin-or-mumps \
 		libCoinUtils.so:math/coinutils \
 		liblapack.so:math/lapack \
 		libnauty.so:math/nauty \
 		libopenblas.so:math/openblas \
 		libOsi.so:math/osi
 
 USES=		compiler:c++11-lang fortran gmake libtool pkgconfig
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	coin-or
 GH_PROJECT=	Cbc
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-nauty-lib="-L${LOCALBASE}/lib -lnauty" --with-nauty-incdir=${LOCALBASE}/include/nauty
 
 OPTIONS_DEFINE=			DEBUG PARALLEL
 OPTIONS_DEFAULT=		PARALLEL
 
 DEBUG_DESC=			Compile CBC with debug support
 DEBUG_CONFIGURE_ENABLE=		debug
 
 PARALLEL_DESC=			Compile CBC with parallel (multi-threaded solver) support
 PARALLEL_CONFIGURE_ENABLE=	cbc-parallel
 
 CONFLICTS_INSTALL=	libcouchbase # bin/cbc
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so
 
 .include <bsd.port.mk>
diff --git a/math/ceres-solver/Makefile b/math/ceres-solver/Makefile
index 5e84907e0176..4f1b95406aa3 100644
--- a/math/ceres-solver/Makefile
+++ b/math/ceres-solver/Makefile
@@ -1,114 +1,114 @@
 PORTNAME=	ceres-solver
 DISTVERSION=	2.1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Nonlinear least squares minimizer
 WWW=		http://ceres-solver.org/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	glog>=0.5.0:devel/glog
 LIB_DEPENDS=	libglog.so:devel/glog
 RUN_DEPENDS:=	${BUILD_DEPENDS:Meigen*}
 
 USES=		cmake:testing compiler:${OPENMP}c++11-lib eigen:3 localbase shebangfix
 USE_GITHUB=	yes
 USE_LDCONFIG=	yes
 
 SHEBANG_FILES=	examples/slam/pose_graph_*/plot_results.py \
 		scripts/make_docs.py
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 CMAKE_OFF=	BUILD_BENCHMARKS BUILD_TESTING
 
 LDFLAGS+=	-Wl,--as-needed # -lccolamd -lcholmod -lrt from suitesparse
 PLIST_SUB=	VERSION=${DISTVERSION:C/rc.*//}
 
 EXAMPLESDIR=	${PREFIX}/share/examples/${PORTNAME:S/-solver//}
 DOCSDIR=	${PREFIX}/share/doc/Ceres
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
 OPTIONS_DEFINE=		CUSTOM_BLAS EXAMPLES DOCS GFLAGS LAPACK OPENMP SCHUR
 OPTIONS_DEFAULT=	CUSTOM_BLAS CXSPARSE GFLAGS OPENBLAS OPENMP SCHUR SUITESPARSE
 OPTIONS_RADIO=		LAPACK THREADS
 OPTIONS_RADIO_LAPACK=	ATLAS GOTOBLAS NETLIB OPENBLAS
 OPTIONS_GROUP=		SPARSE
 OPTIONS_GROUP_SPARSE=	CXSPARSE EIGENSPARSE SUITESPARSE
 
 CUSTOM_BLAS_DESC=	Handcoded BLAS routines instead of Eigen
 CUSTOM_BLAS_CMAKE_BOOL=	CUSTOM_BLAS
 
 DOCS_BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx \
 			${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR}
 DOCS_USES=		python:build
 DOCS_CMAKE_BOOL=	BUILD_DOCUMENTATION
 
 EXAMPLES_CMAKE_BOOL=	BUILD_EXAMPLES
 EXAMPLES_IMPLIES=	GFLAGS
 
 GFLAGS_DESC=		Google Flags support
 GFLAGS_LIB_DEPENDS=	libgflags.so:devel/gflags
 GFLAGS_CMAKE_BOOL=	GFLAGS
 
 OPENMP_CMAKE_ON=	-DCERES_THREADING_MODEL:STRING="OPENMP"
 .if !exists(/usr/include/omp.h)
 # XXX ports/199603: LLVM openmp in base doesn't support armv6, armv7 yet
 OPENMP_VARS=		OPENMP=gcc-
 .endif
 
 SCHUR_DESC=		Fixed-size schur specializations
 SCHUR_CMAKE_BOOL=	SCHUR_SPECIALIZATIONS
 
 # XXX Unbundle googletest/googlemock
 
 LAPACK_DESC=		Linear Algebra PACKage
 LAPACK_CMAKE_BOOL=	LAPACK
 ATLAS_USES=		blaslapack:atlas
 ATLAS_CMAKE_ON=		-DBLA_VENDOR:STRING="ATLAS" \
 			-DBLAS_LIBRARIES:FILEPATH="${LOCALBASE}/lib/libcblas.so" \
 			-DLAPACK_LIBRARIES:FILEPATH="${LOCALBASE}/lib/libalapack.so"
 ATLAS_IMPLIES=		LAPACK
 GOTOBLAS_DESC=		Goto blas implementation
 GOTOBLAS_USES=		blaslapack:gotoblas
 GOTOBLAS_CMAKE_ON=	-DBLA_VENDOR:STRING="Goto"
 GOTOBLAS_IMPLIES=	LAPACK
 NETLIB_USES=		blaslapack:netlib
 NETLIB_CMAKE_ON=	-DBLA_VENDOR:STRING="Generic"
 NETLIB_IMPLIES=		LAPACK
 OPENBLAS_USES=		blaslapack:openblas
 OPENBLAS_CMAKE_ON=	-DBLA_VENDOR:STRING="OpenBLAS"
 OPENBLAS_IMPLIES=	LAPACK
 
 SPARSE_DESC=		Sparse linear algebra library
 CXSPARSE_DESC=		CXSparse support
 CXSPARSE_LIB_DEPENDS=	libcxsparse.so:math/suitesparse-cxsparse
 CXSPARSE_CMAKE_ON=	-DCXSPARSE_INCLUDE_DIR:PATH="${LOCALBASE}/include/suitesparse"
 CXSPARSE_CMAKE_BOOL=	CXSPARSE
 EIGENSPARSE_DESC=	Simplicial Cholesky factorization in Eigen
 EIGENSPARSE_CMAKE_BOOL=	EIGENSPARSE
 EIGENSPARSE_VARS=	LICENSE+=LGPL21+ LICENSE_COMB=multi \
 			LICENSE_FILE_BSD3CLAUSE="${LICENSE_FILE}"
 SUITESPARSE_DESC=	SuiteSparse support
 SUITESPARSE_LIB_DEPENDS=libspqr.so:math/suitesparse-spqr	\
 			libcholmod.so:math/suitesparse-cholmod
 SUITESPARSE_CMAKE_BOOL=	SUITESPARSE
 
 post-patch-DOCS-on:
 	@${REINPLACE_CMD} -e 's,python,${PYTHON_CMD:T},' \
 		${WRKSRC}/docs/source/CMakeLists.txt
 
 pre-install-TEST-on: do-test
 
 post-install-EXAMPLES-on:
 # Copy examples (stripped), their source and sample data but not tests programs
 	(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} data ${STAGEDIR}${EXAMPLESDIR})
 	(cd ${BUILD_WRKSRC} && ${COPYTREE_SHARE} bin ${STAGEDIR}${EXAMPLESDIR})
 	@${RM} -r ${STAGEDIR}${EXAMPLESDIR}/bin/*_test
 	-@${STRIP_CMD} ${STAGEDIR}${EXAMPLESDIR}/bin/* # may fail for non-root
 
 .include <bsd.port.mk>
diff --git a/math/cgal/Makefile b/math/cgal/Makefile
index a20ad8bc878d..6091945d2f90 100644
--- a/math/cgal/Makefile
+++ b/math/cgal/Makefile
@@ -1,48 +1,49 @@
 PORTNAME=	cgal
 PORTVERSION=	5.5.1
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	https://github.com/${PORTNAME:tu}/${PORTNAME}/releases/download/v${PORTVERSION}/
 DISTNAME=	${PORTNAME:tu}-${PORTVERSION}
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Computational geometry library
 WWW=		https://www.cgal.org/
 
 LICENSE=	GPLv3 LGPL3
 LICENSE_COMB=	multi
 
 BROKEN_sparc64=	does not build: fails to compile all_files.cpp
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libntl.a:math/ntl
 LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 		libmpfr.so:math/mpfr \
 		libgmp.so:math/gmp
 
 #TODO math/mpfi, math/rs, graphics/qglviewer
 #Not yet in ports
 USES=		cmake eigen:3 shebangfix tar:xz
 
 NO_ARCH=	yes
 
 SHEBANG_FILES=	scripts/cgal_create_CMakeLists \
 		scripts/cgal_create_cmake_script
 
 OPTIONS_DEFINE=		VISUALIZATION QT5
 VISUALIZATION_IMPLIES=	QT5
 OPTIONS_SUB=		yes
 
 VISUALIZATION_DESC=		Visualization Required for most demos (Qt5 Geomview)
 VISUALIZATION_LIB_DEPENDS=	libgeomview.so:graphics/geomview
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MQT5}
 USES+=		gl qt:5
 CMAKE_ARGS+=	-DWITH_CGAL_Qt5=ON
 USE_QT+=	core gui opengl widgets svg buildtools:build qmake:build xml
 USE_GL+=	gl glu
 .else
 CMAKE_ARGS+=	-DWITH_CGAL_Qt5=OFF
 .endif
 
 .include <bsd.port.mk>
diff --git a/math/cgl-conic/Makefile b/math/cgl-conic/Makefile
index 62d85af6398a..6319f1257f97 100644
--- a/math/cgl-conic/Makefile
+++ b/math/cgl-conic/Makefile
@@ -1,39 +1,39 @@
 PORTNAME=	cgl-conic
 DISTVERSIONPREFIX=	releases/
 DISTVERSION=	1.0.0-6
-PORTREVISION=	2
+PORTREVISION=	3
 DISTVERSIONSUFFIX=	-gc96de60
 CATEGORIES=	math
 PKGNAMEPREFIX=	coin-or-
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Strategies for conic problems for COIN-OR Cut Generation
 WWW=		https://github.com/aykutbulut/CGL-CONIC
 
 LICENSE=	EPL
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libblas.so:math/blas \
 		libCgl.so:math/cgl \
 		libClp.so:math/clp \
 		libcoinasl.so:math/asl \
 		libCoinUtils.so:math/coinutils \
 		libipopt.so:math/ipopt \
 		liblapack.so:math/lapack \
 		libopenblas.so:math/openblas \
 		libOsiConic.so:math/osi-conic \
 		libOsiIpopt.so:math/osiipopt \
 		libOsi.so:math/osi
 
 USES=		gmake libtool pkgconfig
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	aykutbulut
 GH_PROJECT=	CGL-CONIC
 
 GNU_CONFIGURE=	yes
 
 INSTALL_TARGET=	install-strip
 
 .include <bsd.port.mk>
diff --git a/math/cgl/Makefile b/math/cgl/Makefile
index 7feb6b84538d..5b8f8ddf1169 100644
--- a/math/cgl/Makefile
+++ b/math/cgl/Makefile
@@ -1,36 +1,37 @@
 PORTNAME=	cgl
 DISTVERSIONPREFIX=	releases/
 DISTVERSION=	0.60.6
+PORTREVISION=	1
 CATEGORIES=	math
 PKGNAMEPREFIX=	coin-or-
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Collection of cut generators for COIN-OR packages that use cuts
 WWW=		https://github.com/coin-or/Cgl
 
 LICENSE=	EPL
 LICENSE_FILE=	${WRKSRC}/Cgl/LICENSE
 
 LIB_DEPENDS=	libcoinasl.so:math/asl \
 		libblas.so:math/blas \
 		libCoinUtils.so:math/coinutils \
 		libClp.so:math/clp \
 		libcoinmumps.so:math/coin-or-mumps \
 		libopenblas.so:math/openblas \
 		libOsi.so:math/osi
 
 USES=		compiler:c++11-lang gmake libtool pkgconfig
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	coin-or
 GH_PROJECT=	Cgl
 
 GNU_CONFIGURE=	yes
 
 TEST_TARGET=	test
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libCgl.so.*
 
 .include <bsd.port.mk>
diff --git a/math/cimod/Makefile b/math/cimod/Makefile
index 8f08f2fb79c2..0ceeac0dad85 100644
--- a/math/cimod/Makefile
+++ b/math/cimod/Makefile
@@ -1,31 +1,32 @@
 PORTNAME=	cimod
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.4.54
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	C++ header-only library for a binary quadratic models
 WWW=		https://github.com/OpenJij/cimod
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	nlohmann-json>0:devel/nlohmann-json
 RUN_DEPENDS=	nlohmann-json>0:devel/nlohmann-json
 TEST_DEPENDS=	googletest>0:devel/googletest
 
 USES=		cmake:testing compiler:c++17-lang eigen:3,build,run
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	OpenJij
 
 CMAKE_ON=	CIMOD_INSTALL # doesn't do anything, see https://github.com/OpenJij/cimod/issues/103
 CMAKE_OFF=	CIMOD_TEST CIMOD_DOCS
 CMAKE_TESTING_ON=	CIMOD_TEST
 
 NO_ARCH=	yes
 
 do-install: # see https://github.com/OpenJij/cimod/issues/103
 	cd ${WRKSRC}/include && ${COPYTREE_SHARE} ${PORTNAME} ${STAGEDIR}${PREFIX}/include
 
 .include <bsd.port.mk>
diff --git a/math/clblast/Makefile b/math/clblast/Makefile
index 3feffd412745..0229c5d483d7 100644
--- a/math/clblast/Makefile
+++ b/math/clblast/Makefile
@@ -1,25 +1,25 @@
 PORTNAME=	clblast
 PORTVERSION=	1.1.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	math
 
 MAINTAINER=	jmd@FreeBSD.org
 COMMENT=	Modern, lightweight, performant and tunable OpenCL BLAS library
 WWW=		https://github.com/CNugteren/CLBlast
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	opencl>=0:devel/opencl
 LIB_DEPENDS=	libOpenCL.so:devel/ocl-icd
 RUN_DEPENDS=	opencl>=0:devel/opencl
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	CNugteren
 GH_PROJECT=	CLBlast
 
 USES=		cmake
 USE_GCC=	yes
 USE_LDCONFIG=	yes
 
 .include <bsd.port.mk>
diff --git a/math/clp/Makefile b/math/clp/Makefile
index 31062e583ca8..5be6ddc4ac35 100644
--- a/math/clp/Makefile
+++ b/math/clp/Makefile
@@ -1,47 +1,47 @@
 PORTNAME=	Clp
 DISTVERSION=	1.17.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	https://www.coin-or.org/download/source/${PORTNAME}/
 PKGNAMEPREFIX=	coin-or-
 
 MAINTAINER=	co9co9@gmail.com
 COMMENT=	Linear Programming Solver
 WWW=		https://www.coin-or.org/Clp/index.html
 
 LICENSE=	EPL
 
 BUILD_DEPENDS=	coin-or-Data-Sample>0:math/coin-or-data-sample \
 		coin-or-Data-Netlib>0:math/coin-or-data-netlib
 LIB_DEPENDS=	libcoinasl.so:math/asl \
 		libcoinmetis.so:math/coin-or-metis \
 		libcoinmumps.so:math/coin-or-mumps \
 		libCoinUtils.so:math/coinutils \
 		libOsi.so:math/osi
 RUN_DEPENDS=	coin-or-Data-Sample>0:math/coin-or-data-sample \
 		coin-or-Data-Netlib>0:math/coin-or-data-netlib
 
 USES=		blaslapack compiler:c++11-lang fortran libtool pathfix pkgconfig tar:tgz
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
 INSTALL_TARGET=	install-strip
 
 CONFIGURE_ARGS=	--with-lapack-lib="${LAPACKLIB} -L${LOCALBASE}/lib" \
 		--with-blas-lib="${BLASLIB} -L${LOCALBASE}/lib" \
 		--with-osi-incdir="${LOCALBASE}/include/coin" --with-osi-lib="${LOCALBASE}/lib/libOsi.so" \
 		--with-coinutils-incdir="${LOCALBASE}/include/coin" --with-coinutils-lib="${LOCALBASE}/lib/libCoinUtils.so" \
 		--with-netlib-datadir="${LOCALBASE}/share/coin/Data/Netlib" \
 		--with-sample-datadir="${LOCALBASE}/share/coin/Data/Sample" \
 		--datadir=${DATADIR}
 
 TEST_TARGET=	unitTest
 TEST_WRKSRC=	${WRKSRC}/${PORTNAME}
 
 OPTIONS_DEFINE=	DEBUG DOCS
 PORTDOCS=	*
 
 CXXFLAGS+=	-ffast-math
 DEBUG_CXXFLAGS=	-fomit-frame-pointer
 
 .include <bsd.port.mk>
diff --git a/math/cm/Makefile b/math/cm/Makefile
index d237f9b94c1b..7d651d23e73e 100644
--- a/math/cm/Makefile
+++ b/math/cm/Makefile
@@ -1,30 +1,30 @@
 PORTNAME=	cm
 DISTVERSION=	0.4.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	http://www.multiprecision.org/downloads/
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Library for ring class fields of imaginary quadratic number fields
 WWW=		https://www.multiprecision.org/cm/home.html
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libgmp.so:math/gmp \
 		libmpc.so:math/mpc \
 		libmpfr.so:math/mpfr \
 		libmpfrcx.so:math/mpfrcx \
 		libpari.so:math/pari
 
 USES=		gmake libtool localbase
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
 
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check
 
 INFO=		cm
 
 .include <bsd.port.mk>
diff --git a/math/cmh/Makefile b/math/cmh/Makefile
index 5333dd6c508f..cf93dd265dcf 100644
--- a/math/cmh/Makefile
+++ b/math/cmh/Makefile
@@ -1,34 +1,34 @@
 PORTNAME=	cmh
 DISTVERSION=	1.1.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 MASTER_SITES=	http://www.multiprecision.org/downloads/
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Compute Igusa class polynomials
 WWW=		https://www.multiprecision.org/cmh/home.html
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libfplll.so:math/fplll \
 		libgmp.so:math/gmp \
 		libmpc.so:math/mpc \
 		libmpfr.so:math/mpfr \
 		libmpfrcx.so:math/mpfrcx \
 		libpari.so:math/pari
 RUN_DEPENDS=	bash:shells/bash
 TEST_DEPENDS=	bash:shells/bash
 
 USES=		autoreconf gmake libtool localbase shebangfix
 USE_LDCONFIG=	yes
 
 SHEBANG_FILES=	scripts/cmh-classpol.sh.in
 SHEBANG_GLOB=	*.sh
 
 GNU_CONFIGURE=	yes
 
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check # tests fail, see https://gitlab.inria.fr/cmh/cmh/-/issues/1
 
 .include <bsd.port.mk>
diff --git a/math/cminpack/Makefile b/math/cminpack/Makefile
index f27b90130e04..b5156f4b87dc 100644
--- a/math/cminpack/Makefile
+++ b/math/cminpack/Makefile
@@ -1,28 +1,28 @@
 PORTNAME=	cminpack
 PORTVERSION=	1.3.6
 DISTVERSIONPREFIX=	v
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	math
 
 MAINTAINER=	fernape@FreeBSD.org
 COMMENT=	Solving nonlinear equations and nonlinear least squares problems
 WWW=		http://devernay.free.fr/hacks/cminpack/
 
 LICENSE_FILE=	${WRKSRC}/CopyrightMINPACK.txt
 
 USES=		blaslapack:openblas cmake localbase
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	devernay
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 CMAKE_OFF=	USE_BLAS
 
 OPTIONS_DEFINE=	EXAMPLES
 
 post-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	(cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} "*.[ch] testdata" \
 		${STAGEDIR}${EXAMPLESDIR})
 
 .include <bsd.port.mk>
diff --git a/math/cmlib/Makefile b/math/cmlib/Makefile
index 903fe825cbcf..3599124178f7 100644
--- a/math/cmlib/Makefile
+++ b/math/cmlib/Makefile
@@ -1,52 +1,52 @@
 PORTNAME=	cmlib
 PORTVERSION=	3.0
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	math
 MASTER_SITES=	NL/blas:blas ftp://ftp.nist.gov/pub/cmlib/
 # Get d1mach.f, i1mach.f, r1mach.f from BLAS, rather than from CMLIB.
 # See Netlib FAQ #2.17: http://netlib.org/misc/faq.html#2.17
 DISTFILES=	src.tar.Z d1mach.f:blas i1mach.f:blas r1mach.f:blas
 DIST_SUBDIR=	cmlib
 EXTRACT_ONLY=	src.tar.Z
 
 MAINTAINER=	fortran@FreeBSD.org
 COMMENT=	NIST Core math library (CMLIB)
 WWW=		https://www.nist.gov/itl/math/mcsd-software.cfm
 
 USES=		fortran uidfix
 USE_LDCONFIG=	yes
 SHLIB_MAJOR=	1
 
 LDFLAGS+=	${FFLAGS}
 LDADD ?=	-lgfortran -lm
 SRCCONF=	/dev/null
 MAKE_ENV=	LDADD="${LDADD}" SHLIB_MAJOR="${SHLIB_MAJOR}" \
 		SRCCONF="${SRCCONF}"
 FFLAGS+=	-std=legacy
 
 NO_WRKSUBDIR=	yes
 
 OPTIONS_DEFINE=	DOCS
 
 post-extract:
 	${CP} ${_DISTDIR}/[dir]1mach.f ${WRKSRC}/src/machcon
 	${CP} ${FILESDIR}/make.inc ${WRKSRC}
 
 post-patch:
 	${REINPLACE_CMD} -e 's|../../src|src|g' ${WRKSRC}/Makefile
 	${REINPLACE_CMD} -e 's|../../utils|utils|g' ${WRKSRC}/Makefile
 	${REINPLACE_CMD} -e 's|testall :|testall : libcm|g' ${WRKSRC}/Makefile
 	${REINPLACE_CMD} -e 's|../../utils|utils|g' ${WRKSRC}/utils/Testall
 	${REINPLACE_CMD} -e 's|../../test|test|g' ${WRKSRC}/utils/Testall
 	${REINPLACE_CMD} -e 's|../../utils|utils|g' ${WRKSRC}/utils/Update
 	${REINPLACE_CMD} -e 's|../../src|src|g' ${WRKSRC}/utils/Upar
 	${REINPLACE_CMD} -e 's|../../utils|utils|g' ${WRKSRC}/utils/Upar
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/libcm.a ${STAGEDIR}${PREFIX}/lib
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
diff --git a/math/coin-or-metis/Makefile b/math/coin-or-metis/Makefile
index cdafe408a249..b0779dcc6792 100644
--- a/math/coin-or-metis/Makefile
+++ b/math/coin-or-metis/Makefile
@@ -1,45 +1,46 @@
 PORTNAME=	metis
 DISTVERSIONPREFIX=	releases/
 DISTVERSION=	1.3.10
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	http://coin-or-tools.github.io/ThirdParty-Metis/:metis
 PKGNAMEPREFIX=	coin-or-
 DISTFILES=	metis-${METIS_VERSION}.tar.gz:metis
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	COIN-OR autotools harness to build Metis
 WWW=		https://github.com/coin-or-tools/ThirdParty-Mumps
 
 LICENSE=	EPL
 
 LIB_DEPENDS=	libblas.so:math/blas
 
 USES=		fortran gmake libtool pkgconfig
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	coin-or-tools
 GH_PROJECT=	ThirdParty-Metis
 
 GNU_CONFIGURE=	yes
 
 INSTALL_TARGET=	install-strip
 
 METIS_VERSION=	4.0.3 # from the script get.Metis
 
 .include <bsd.port.pre.mk>
 
 .if ${GCC_DEFAULT} >= 10
 # workaround for Rank mismatch between actual argument at (1) and actual argument at (2) (scalar and rank-1)
 # in theory, this should set FCFLAGS, but the port does not conform
 FFLAGS+=	-fallow-argument-mismatch
 .endif
 
 post-extract: # link MUMPS into the location in the tree
 	@cd ${WRKSRC} && ${LN} -s ${WRKDIR}/metis-${METIS_VERSION} metis-4.0
 
 pre-build: # patching from get.Metis
 	@cd ${WRKDIR} && \
 		${PATCH} -p0 < ${WRKSRC}/metis.patch
 
 .include <bsd.port.post.mk>
diff --git a/math/coin-or-mumps/Makefile b/math/coin-or-mumps/Makefile
index eb1fa58b62e9..21545105509f 100644
--- a/math/coin-or-mumps/Makefile
+++ b/math/coin-or-mumps/Makefile
@@ -1,51 +1,51 @@
 PORTNAME=	mumps
 DISTVERSIONPREFIX=	releases/
 DISTVERSION=	3.0.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	http://coin-or-tools.github.io/ThirdParty-Mumps/:mumps
 PKGNAMEPREFIX=	coin-or-
 DISTFILES=	MUMPS_${MUMPS_VERSION}.tar.gz:mumps
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	COIN-OR autotools harness to build Mumps
 WWW=		https://github.com/coin-or-tools/ThirdParty-Mumps
 
 LICENSE=	EPL
 
 LIB_DEPENDS=	libblas.so:math/blas \
 		libcoinmetis.so:math/coin-or-metis \
 		liblapack.so:math/lapack
 
 USES=		fortran gmake libtool pkgconfig
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	coin-or-tools
 GH_PROJECT=	ThirdParty-Mumps
 
 GNU_CONFIGURE=	yes
 
 MAKE_JOBS_UNSAFE=	yes # otherwise build doesn't find some *.mod files
 
 INSTALL_TARGET=	install-strip
 
 MUMPS_VERSION=	5.5.0 # from the script get.Mumps
 
 .include <bsd.port.pre.mk>
 
 .if ${GCC_DEFAULT} >= 10
 # workaround for Rank mismatch between actual argument at (1) and actual argument at (2) (scalar and rank-1)
 # in theory, this should set FCFLAGS, but the port does not conform
 FFLAGS+=	-fallow-argument-mismatch
 .endif
 
 post-extract: # link MUMPS into the location in the tree
 	@cd ${WRKSRC} && ${LN} -s ${WRKDIR}/MUMPS_${MUMPS_VERSION} MUMPS
 
 post-patch: # patching from get.Mumps
 	@cd ${WRKSRC} && \
 		${PATCH} -p0 < mumps_mpi.patch && \
 		${MV} MUMPS/libseq/mpi.h MUMPS/libseq/mumps_mpi.h
 
 .include <bsd.port.post.mk>
diff --git a/math/coinmp/Makefile b/math/coinmp/Makefile
index c89ec28c3863..3e3e2d28c76b 100644
--- a/math/coinmp/Makefile
+++ b/math/coinmp/Makefile
@@ -1,74 +1,74 @@
 PORTNAME=	CoinMP
 DISTVERSIONPREFIX=	releases/
 DISTVERSION=	1.8.4
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Optimization library with support for COIN-OR CLP, CBC, and CGL
 WWW=		https://projects.coin-or.org/CoinMP
 
 LICENSE=	CPL
 LICENSE_NAME=	Common Public License, Version 1.0
 LICENSE_FILE=	${WRKSRC}/CoinMP/LICENSE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 LIB_DEPENDS=	libblas.so:math/blas \
 		libCbc.so:math/cbc \
 		libCgl.so:math/cgl \
 		libClp.so:math/clp \
 		libcoinasl.so:math/asl \
 		libcoinmumps.so:math/coin-or-mumps \
 		libCoinUtils.so:math/coinutils \
 		libnauty.so:math/nauty \
 		libopenblas.so:math/openblas \
 		libOsi.so:math/osi
 
 USES=		compiler:c++11-lang libtool pathfix pkgconfig
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	coin-or
 GH_PROJECT=	CoinMP
 
 GNU_CONFIGURE=	yes
 
 CXXFLAGS+=	-ffast-math
 
 PLIST_FILES=	include/coin/CoinMP.h \
 		include/coin/CoinMPConfig.h \
 		lib/libCoinMP.so \
 		lib/libCoinMP.so.1 \
 		lib/libCoinMP.so.1.8.4 \
 		libdata/pkgconfig/coinmp.pc
 
 OPTIONS_DEFINE=	DOCS FORTRAN GLPK
 
 FORTRAN_DESC=	Use BLAS/LAPACK with the Fortran interface
 GLPK_DESC=	GNU Linear Programming Kit support
 
 PORTDOCS=	*
 
 FORTRAN_USES=		fortran blaslapack
 FORTRAN_CONFIGURE_ON=	--with-lapack-lib="${LAPACKLIB} -L${LOCALBASE}/lib" \
 			--with-blas-lib="${BLASLIB} -L${LOCALBASE}/lib"
 
 GLPK_LIB_DEPENDS=	libglpk.so:math/glpk
 GLPK_CONFIGURE_ON=	--with-gmpl-incdir=${LOCALBASE}/include	\
 			--with-gmpl-lib="-L${LOCALBASE}/lib -lglpk"
 GLPK_CONFIGURE_OFF=	--disable-glpk-libcheck
 
 INSTALL_TARGET=	install-strip
 
 TEST_TARGET=	unitTest
 
 post-patch::
 	@${REINPLACE_CMD} \
 		-e 's|$$(DESTDIR)$$(addlibsdir)|$$(addlibsdir)|g' \
 		-e 's|addlibs_DATA = examples/Makefile examples/example.c||g' \
 		-e 's|DocInstallDir = $$(datadir)/coin/doc/$$(PACKAGE_NAME)|DocInstallDir = $$(datadir)/doc/CoinMP/$$(PACKAGE_NAME)|' \
 		-e 's|	$$(MAKE) $$(AM_MAKEFLAGS) install-data-hook||' \
 		${WRKSRC}/Makefile.in ${WRKSRC}/CoinMP/Makefile.in
 	@${REINPLACE_CMD} -e 's|addlibsdir = $$(DESTDIR)$$(datadir)/coin/doc/CoinMP|addlibsdir = |' ${WRKSRC}/CoinMP/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/math/coinutils/Makefile b/math/coinutils/Makefile
index ec9078fad419..1d69776c8001 100644
--- a/math/coinutils/Makefile
+++ b/math/coinutils/Makefile
@@ -1,36 +1,37 @@
 PORTNAME=	CoinUtils
 DISTVERSIONPREFIX=	releases/
 DISTVERSION=	2.11.6
+PORTREVISION=	1
 CATEGORIES=	math
 PKGNAMEPREFIX=	coin-or-
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Utilities for COIN-OR project
 WWW=		https://projects.coin-or.org/CoinUtils
 
 LICENSE=	EPL
 LICENSE_FILE=	${WRKSRC}/CoinUtils/LICENSE
 
 COIN_DEPENDS=	coin-or-Data-Sample>0:math/coin-or-data-sample \
 		coin-or-Data-Netlib>0:math/coin-or-data-netlib
 BUILD_DEPENDS=	${COIN_DEPENDS}
 LIB_DEPENDS=	libopenblas.so:math/openblas
 RUN_DEPENDS=	${COIN_DEPENDS}
 
 USES=		fortran gmake libtool localbase:ldflags pkgconfig
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-blas-lib="-lopenblas" --with-lapack-lib="-lopenblas" \
 		--with-sample-datadir="${LOCALBASE}/share/coin/Data/Sample" \
 		--with-netlib-datadir="${LOCALBASE}/share/coin/Data/Netlib"
 		# doesn't link with the optional dependency glpk: https://github.com/coin-or/CoinUtils/issues/7
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	coin-or
 
 INSTALL_TARGET=	install-strip
 
 post-install:
 	@${RM} -r ${STAGEDIR}${PREFIX}/share/coin
 
 .include <bsd.port.mk>
diff --git a/math/combblas/Makefile b/math/combblas/Makefile
index 0f7338aebbc2..221ffe5cca9f 100644
--- a/math/combblas/Makefile
+++ b/math/combblas/Makefile
@@ -1,39 +1,40 @@
 PORTNAME=	CombBLAS
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.0.0
+PORTREVISION=	1
 MASTER_SITES=	https://portal.nersc.gov/project/m1982/CombBLAS/:test_data
 CATEGORIES=	math
 DISTFILES=	testdata_combblas1.6.1.tgz:test_data
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Combinatorial BLAS library: an extensible parallel graph library
 WWW=		https://people.eecs.berkeley.edu/~aydin/CombBLAS/html/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 ONLY_FOR_ARCHS=	amd64 powerpc64 powerpc64le
 ONLY_FOR_ARCHS_REASON=	fails to build: uses x86 asm
 
 LIB_DEPENDS=	libmpi.so:net/mpich
 RUN_DEPENDS=	${LOCALBASE}/lib/gcc${GCC_DEFAULT}/libgcc_s.so.1:lang/gcc${GCC_DEFAULT} # because of the link flags induced by mpich
 
 USES=		cmake:testing compiler:c++14-lang localbase:ldflags tar:tgz
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	PASSIONLab
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 
 # many tests fail, see https://github.com/PASSIONLab/CombBLAS/issues/15
 
 post-extract:
 	@cd ${WRKSRC}/include && ${RM} .DS_Store ._.DS_Store CombBLAS/._CombBLAS.h
 
 pre-test:
 	@if [ ! -L ${TEST_WRKSRC}TESTDATA ]; then \
 		${RLN} ${WRKDIR}/TESTDATA ${TEST_WRKSRC}/; \
 	fi
 
 .include <bsd.port.mk>
diff --git a/math/coq/Makefile b/math/coq/Makefile
index a2c62b27f785..1a9360d81df7 100644
--- a/math/coq/Makefile
+++ b/math/coq/Makefile
@@ -1,71 +1,71 @@
 PORTNAME=	coq
 PORTVERSION=	8.6
-PORTREVISION=	15
+PORTREVISION=	17
 PORTEPOCH=	3
 CATEGORIES=	math
 MASTER_SITES=	http://coq.inria.fr/distrib/V${PORTVERSION}/files/ \
 		ftp://ftp.stack.nl/pub/users/johans/coq/
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Theorem prover based on lambda-C
 WWW=		https://coq.inria.fr/
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_armv6=	fails to compile: Fatal error: exception Invalid_argument("index out of bounds")
 BROKEN_armv7=	fails to compile: Fatal error: exception Invalid_argument("index out of bounds")
 
 BUILD_DEPENDS=	camlp5:devel/ocaml-camlp5 \
 		ocamlfind:devel/ocaml-findlib \
 		${LOCALBASE}/${OCAML_SITELIBDIR}/num/META:math/ocaml-num
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2
 RUN_DEPENDS=	${LOCALBASE}/lib/ocaml/stublibs/dllnums.so:math/ocaml-num
 
 USES=		emacs gettext-runtime gmake gnome
 USE_GNOME=	atk cairo gdkpixbuf2 glib20 gtk20 gtksourceview2 pango
 USE_LDCONFIG=	${PREFIX}/lib/coq
 USE_OCAML=	yes
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	-prefix ${PREFIX} \
 		-mandir ${PREFIX}/man \
 		-emacslib ${PREFIX}/share/emacs/site-lisp/coq \
 		-usecamlp5 \
 		-byteonly
 MAKE_ENV=	VERBOSE=1 USERFLAGS=-unsafe-string
 ALL_TARGET=	world
 
 CONFLICTS_INSTALL=	coq coq-emacs_* # bin/coq-tex bin/coq_makefile bin/coqc bin/coqchk bin/coqdep bin/coqdoc bin/coqide bin/coqmktop bin/coqtop bin/coqtop.byte bin/coqwc bin/coqworkmgr bin/gallina
 
 OPTIONS_DEFINE=		DOCS IDE
 OPTIONS_DEFAULT=	IDE
 OPTIONS_SUB=		yes
 IDE_DESC=		Include desktop environment (coqide)
 IDE_BUILD_DEPENDS=	lablgtk2:x11-toolkits/ocaml-lablgtk2
 IDE_RUN_DEPENDS=	lablgtk2:x11-toolkits/ocaml-lablgtk2
 IDE_CONFIGURE_OFF=	-coqide no
 DOCS_USES=		tex
 DOCS_USE=		TEX=latex:build,dvipsk:build
 DOCS_BUILD_DEPENDS=	hevea:textproc/hevea
 DOCS_CONFIGURE_OFF=	-with-doc no
 
 STRIP_FILES=		lib/coq/dllcoqrun.so
 
 # Workaround bsd.ocaml.mk to fix packaging
 add-plist-post:
 	@${DO_NADA}
 
 post-patch:
 	@${REINPLACE_CMD} -e '/show_latex_mes/s/)$$/; true)/' \
 		${WRKSRC}/Makefile.doc
 # Allow passing USERFLAGS down to inner make(1) via environment
 	@${REINPLACE_CMD} -e '/User compilation flag/,+1d' \
 		${WRKSRC}/configure.ml
 
 post-install:
 	cd ${STAGEDIR}${PREFIX} && ${STRIP_CMD} ${STRIP_FILES}
 
 .include <bsd.port.mk>
diff --git a/math/cosma/Makefile b/math/cosma/Makefile
index 37458631ec23..ae7acf0ab004 100644
--- a/math/cosma/Makefile
+++ b/math/cosma/Makefile
@@ -1,42 +1,43 @@
 PORTNAME=	cosma
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.6.2
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Distributed communication-optimal matrix multiplication algorithm
 WWW=		https://github.com/eth-cscs/COSMA
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 .if !exists(/usr/include/omp.h)
 BROKEN=		requires OpenMP support that is missing on this architecture
 .endif
 
 BUILD_DEPENDS=	openmpi>0:net/openmpi
 LIB_DEPENDS=	libopenblas.so:math/openblas
 RUN_DEPENDS=	openmpi>0:net/openmpi
 
 USES=		cmake:testing
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	eth-cscs
 GH_PROJECT=	COSMA
 GH_TUPLE=	eth-cscs:COSTA:5f1ea59:costa/libs/COSTA \
 		eth-cscs:Tiled-MM:9e880f9:tiledmm/libs/Tiled-MM
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 CMAKE_OFF=	COSMA_WITH_TESTS
 CMAKE_ARGS=	-DCOSMA_BLAS="OPENBLAS"
 CMAKE_TESTING_ON=	COSMA_WITH_TESTS
 
 post-install:
 	@cd ${STAGEDIR}${PREFIX} && \
 		${RMDIR} \
 			include/costa/pxtran \
 			include/costa/pxtranc \
 			include/costa/pxtranu
 
 .include <bsd.port.mk>
diff --git a/math/costa/Makefile b/math/costa/Makefile
index 4cd520b6953f..faacce60caf3 100644
--- a/math/costa/Makefile
+++ b/math/costa/Makefile
@@ -1,43 +1,43 @@
 PORTNAME=	costa
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Distributed Communication-Optimal Shuffle and Transpose Algorithm
 WWW=		https://github.com/eth-cscs/COSTA
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libopenblas.so:math/openblas \
 		libscalapack.so:math/scalapack
 
 USES=		cmake:testing pkgconfig
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	eth-cscs
 GH_PROJECT=	COSTA
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 CMAKE_ARGS=	-DCOSTA_SCALAPACK=CUSTOM
 CMAKE_OFF=	COSTA_WITH_TESTS
 CMAKE_TESTING_ON=	COSTA_WITH_TESTS
 
 OPTIONS_SINGLE=		MPI
 OPTIONS_SINGLE_MPI=	MPICH OPENMPI
 OPTIONS_DEFAULT=	MPICH
 
 MPICH_USES=		mpi:mpich
 
 OPENMPI_USES=		mpi:openmpi
 
 post-install: # workaround for https://github.com/eth-cscs/COSTA/issues/9
 	@cd ${STAGEDIR}${PREFIX} && ${RMDIR} \
 		include/costa/pxtran \
 		include/costa/pxtranc \
 		include/costa/pxtranu
 
 .include <bsd.port.mk>
diff --git a/math/couenne/Makefile b/math/couenne/Makefile
index e18ef11bf7bb..abc6b6f2ffd4 100644
--- a/math/couenne/Makefile
+++ b/math/couenne/Makefile
@@ -1,46 +1,46 @@
 PORTNAME=	couenne
 DISTVERSIONPREFIX=	releases/
 DISTVERSION=	0.5.8
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	math
 PKGNAMEPREFIX=	coin-or-
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Convex Over and Under Envelopes for NonliNear Estimation
 WWW=		https://projects.coin-or.org/Couenne
 
 LICENSE=	EPL
 LICENSE_FILE=	${WRKSRC}/Couenne/LICENSE
 
 LIB_DEPENDS=	libbonmin.so:math/bonmin \
 		libCbc.so:math/cbc \
 		libCgl.so:math/cgl \
 		libClp.so:math/clp \
 		libcoinasl.so:math/asl \
 		libCoinUtils.so:math/coinutils \
 		libipopt.so:math/ipopt \
 		libnauty.so:math/nauty \
 		libopenblas.so:math/openblas \
 		libOsi.so:math/osi
 
 USES=		blaslapack:netlib fortran gmake libtool pkgconfig
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	coin-or
 GH_PROJECT=	Couenne
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-nauty-incdir=${LOCALBASE}/include/nauty --with-nauty-lib=${LOCALBASE}/lib/libnauty.so # see https://github.com/coin-or/Couenne/issues/58
 
 INSTALL_TARGET=	install-strip
 
 SUB_FILES=	${PORTNAME}.msc
 SUB_LIST=	PORTVERSION=${PORTVERSION}
 
 post-install:
 	# install MiniZinc configuration file
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/minizinc/solvers
 	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.msc ${STAGEDIR}${PREFIX}/share/minizinc/solvers
 
 .include <bsd.port.mk>
diff --git a/math/cppad/Makefile b/math/cppad/Makefile
index 1eab70e55e2b..a07484675812 100644
--- a/math/cppad/Makefile
+++ b/math/cppad/Makefile
@@ -1,23 +1,24 @@
 PORTNAME=	cppad
 DISTVERSION=	20230000.0
+PORTREVISION=	1
 CATEGORIES=	math
 PKGNAMEPREFIX=	coin-or-
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	C++ Algorithmic Differentiation package
 WWW=		https://coin-or.github.io/CppAD/doc/cppad.htm
 
 LICENSE=	EPL
 
 USES=		cmake compiler:c++11-lang eigen:3,run
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	coin-or
 GH_PROJECT=	CppAD
 
 CMAKE_ARGS=	-Dcppad_prefix=${PREFIX}
 
 TEST_TARGET=	check
 
 .include <bsd.port.mk>
diff --git a/math/csdp/Makefile b/math/csdp/Makefile
index a1efff6f3958..47fe24d05032 100644
--- a/math/csdp/Makefile
+++ b/math/csdp/Makefile
@@ -1,40 +1,41 @@
 PORTNAME=	csdp
 DISTVERSIONPREFIX=	releases/
 DISTVERSION=	6.2.0
+PORTREVISION=	1
 CATEGORIES=	math
 PKGNAMEPREFIX=	coin-or-
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Solver for semidefinite programming problems
 WWW=		https://github.com/coin-or/Csdp
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libblas.so:math/blas \
 		liblapack.so:math/lapack
 
 USES=		gmake
 USE_GITHUB=	yes
 GH_ACCOUNT=	coin-or
 GH_PROJECT=	Csdp
 USE_LDCONFIG=	yes
 
 MAKE_ARGS=	FREEBSD_CFLAGS="${CFLAGS}" FREEBSD_LIBS="${LIBS} -L${LOCALBASE}/lib"
 
 BINARY_ALIAS=	make=${GMAKE}
 
 PLIST_FILES=	bin/complement \
 		bin/csdp \
 		bin/graphtoprob \
 		bin/rand_graph \
 		bin/theta
 
 .if !exists(/usr/include/omp.h)
 USES+=		compiler:gcc-c++11-lib
 .endif
 
 post-stage:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*
 
 .include <bsd.port.mk>
diff --git a/math/dbcsr/Makefile b/math/dbcsr/Makefile
index f1233df9f863..e39e73546be3 100644
--- a/math/dbcsr/Makefile
+++ b/math/dbcsr/Makefile
@@ -1,55 +1,56 @@
 PORTNAME=	dbcsr
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.5.0
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Distributed Block Compressed Sparse Row matrix library
 WWW=		https://www.cp2k.org/dbcsr
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 .if !exists(/usr/include/omp.h)
 BROKEN=		requires OpenMP support that is missing on this architecture
 .endif
 
 BUILD_DEPENDS=	fypp:devel/py-fypp@${PY_FLAVOR}
 
 USES=		blaslapack:openblas cmake:noninja,testing compiler:c++14-lang fortran \
 		python:build
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	cp2k
 
 FFLAGS+=	-D__NO_STATM_ACCESS # disable /proc/self/statm access
 LDFLAGS+=	-lopenblas
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 CMAKE_OFF=	BUILD_TESTING WITH_EXAMPLES
 CMAKE_ARGS=	-DBLA_VENDOR:STRING="OpenBLAS" -DPython_EXECUTABLE=${PYTHON_CMD}
 
 BINARY_ALIAS=	git=false # with git sonames get messed up
 
 OPTIONS_DEFINE=		MPI OPENMP C_API # libxsmm is supposed to be supported, but cmake build lacks the corresponding option: https://github.com/cp2k/dbcsr/issues/73
 OPTIONS_DEFAULT=	MPI OPENMP C_API
 OPTIONS_SUB=		yes
 
 MPI_CMAKE_BOOL=		USE_MPI
 MPI_LIB_DEPENDS=	libmpi.so:net/openmpi
 
 OPENMP_CMAKE_BOOL=	USE_OPENMP
 
 C_API_DESC=		Build the C API library
 C_API_CMAKE_BOOL=	WITH_C_API
 
 .include <bsd.port.pre.mk>
 
 .  if ${GCC_DEFAULT} >= 10
 CMAKE_ARGS+=	-DCMAKE_Fortran_FLAGS="${FFLAGS} -fallow-argument-mismatch" # -fallow-argument-mismatch is a workaround of https://github.com/cp2k/dbcsr/issues/387 for gcc10+
 .  else
 CMAKE_ARGS+=	-DCMAKE_Fortran_FLAGS="${FFLAGS}"
 .  endif
 
 .include <bsd.port.post.mk>
diff --git a/math/deal.ii/Makefile b/math/deal.ii/Makefile
index 7bfb4e715e1b..46f945b97222 100644
--- a/math/deal.ii/Makefile
+++ b/math/deal.ii/Makefile
@@ -1,99 +1,100 @@
 PORTNAME=	deal.II
 DISTVERSIONPREFIX=	v
 DISTVERSION=	9.4.2
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Finite element Differential Equations Analysis Library (DEAL)
 WWW=		https://www.dealii.org/
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 BROKEN_FreeBSD_14=	clang crashes: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=257876
 BROKEN_aarch64=		error: use of undeclared identifier '__TBB_machine_fetchadd4'
 BROKEN_armv7=		clang runs out of memory
 
 BUILD_DEPENDS=	${LOCALBASE}/include/boost/config.hpp:devel/boost-libs
 LIB_DEPENDS=	libboost_serialization.so:devel/boost-libs \
 		libhdf5.so:science/hdf5 \
 		libmetis.so:math/metis
 
 USES=		blaslapack cmake:testing compiler:c++17-lang localbase:ldflags
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	${PORTNAME:tl:S/.//}
 GH_PROJECT=	${PORTNAME:tl:S/.//}
 
 CMAKE_OFF=	DEAL_II_ALLOW_BUNDLED DEAL_II_COMPONENT_EXAMPLES \
 		DEAL_II_WITH_P4EST DEAL_II_WITH_TRILINOS DEAL_II_WITH_UMFPACK \
 		DEAL_II_WITH_NANOFLANN DEAL_II_WITH_MUPARSER DEAL_II_WITH_ASSIMP \
 		DEAL_II_WITH_HDF5
 CMAKE_ON=	DEAL_II_FORCE_BUNDLED_TBB # instead of LIB_DEPENDS+=libtbb.so:devel/onetbb, pending https://github.com/dealii/dealii/issues/11561
 CMAKE_TESTING_ON=	FREEBSD_ENABLE_TESTS
 
 OPTIONS_DEFINE=		ADOLC ARPACK GSL LAPACK MPI NETCDF OPENCASCADE PETSC SCALAPACK SUNDIALS
 OPTIONS_DEFAULT=	GSL LAPACK # SUNDIALS
 
 ADOLC_DESC=		Compile with ADOL-C
 ADOLC_CMAKE_BOOL=	DEAL_II_WITH_ADOLC
 ADOLC_LIB_DEPENDS=	libadolc.so:math/adol-c
 ADOLC_BROKEN=		requires the development version: see https://github.com/dealii/dealii/issues/7293
 
 ARPACK_DESC=		Compile with Arpack and PArpack (only with MPI, LAPACK)
 ARPACK_CMAKE_BOOL=	DEAL_II_WITH_ARPACK
 ARPACK_CMAKE_ON=	-DARPACK_LINKER_FLAGS:STRING="${LDFLAGS}"
 ARPACK_BUILD_DEPENDS=	arpack-ng>0:math/arpack-ng
 ARPACK_RUN_DEPENDS=	arpack-ng>0:math/arpack-ng # itself doesn't link to arpack, but makes depending project link to it
 ARPACK_IMPLIES=		LAPACK
 
 GSL_DESC=		Compile with gsl
 GSL_CMAKE_BOOL=		DEAL_II_WITH_GSL
 GSL_LIB_DEPENDS=	libgsl.so:math/gsl
 
 LAPACK_DESC=		Compile with LAPACK for matrix operations
 LAPACK_USES=		fortran
 LAPACK_CMAKE_BOOL=	DEAL_II_WITH_LAPACK
 LAPACK_CMAKE_ON=	-DLAPACK_LINKER_FLAGS:STRING="${LDFLAGS}"
 LAPACK_LIB_DEPENDS=	libopenblas.so:math/openblas
 
 MPI_DESC=		MPI support (math/sundials must be compiled with MPI)
 MPI_USES=		fortran
 MPI_CMAKE_BOOL=		DEAL_II_WITH_MPI
 MPI_CMAKE_ON=		-DMPI_LINKER_FLAGS:STRING="${LDFLAGS}"
 MPI_LIB_DEPENDS=	libboost_iostreams.so:devel/boost-libs \
 			libmpich.so:net/mpich
 
 NETCDF_DESC=		Compile with Netcdf (only with MPI)
 NETCDF_CMAKE_BOOL=	DEAL_II_WITH_NETCDF
 NETCDF_CMAKE_ON=	-DNETCDF_INCLUDE_DIR:STRING=${LOCALBASE}/include -DNETCDF_CPLUSPLUS_LIBRARY:STRING=${LOCALBASE}/lib/libnetcdf_c++4.so
 NETCDF_BROKEN=		see https://github.com/dealii/dealii/issues/7263
 
 OPENCASCADE_DESC=	Compile with OpenCascade
 OPENCASCADE_CMAKE_BOOL=	DEAL_II_WITH_OPENCASCADE
 OPENCASCADE_CMAKE_ON=	-DOPENCASCADE_INCLUDE_DIR:STRING=${LOCALBASE}/include/OpenCASCADE
 OPENCASCADE_LIB_DEPENDS=	libTKernel.so:cad/opencascade
 
 PETSC_DESC=		Compile with Petsc (only with MPI)
 PETSC_CMAKE_BOOL=	DEAL_II_WITH_PETSC
 PETSC_LIB_DEPENDS=	libpetsc.so:science/PETSc
 PETSC_BROKEN=		see https://github.com/dealii/dealii/issues/7260
 
 SCALAPACK_DESC=		Compile with ScaLAPACK (only with MPI)
 SCALAPACK_CMAKE_BOOL=	DEAL_II_WITH_SCALAPACK
 SCALAPACK_IMPLIES=	MPI LAPACK
 SCALAPACK_LIB_DEPENDS=	libscalapack.so:math/scalapack
 
 SUNDIALS_DESC=		Compile with SUNDIALS
 SUNDIALS_CMAKE_BOOL=	DEAL_II_WITH_SUNDIALS
 SUNDIALS_LIB_DEPENDS=	libsundials_arkode.so:math/sundials
 SUNDIALS_BROKEN=	Build fails with: Required variable "SUNDIALS_LIB_PAR" set to NOTFOUND
 
 post-patch: # unbundle boost
 	@${RM} -r ${WRKSRC}/dealii/bundled/boost-*
 
 post-stage:
 	@${RM} ${STAGEDIR}${PREFIX}/*.log
 
 .include <bsd.port.mk>
diff --git a/math/dihydrogen/Makefile b/math/dihydrogen/Makefile
index 5b3dcb31215d..331c6168980b 100644
--- a/math/dihydrogen/Makefile
+++ b/math/dihydrogen/Makefile
@@ -1,43 +1,43 @@
 PORTNAME=	dihydrogen
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.2.1-36
-PORTREVISION=	2
+PORTREVISION=	3
 DISTVERSIONSUFFIX=	-g4bda15e
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Dense and sparse linear algebra, conic optimization, lattice reduction
 WWW=		https://github.com/LLNL/DiHydrogen
 
 LICENSE=	BSD2CLAUSE
 
 LIB_DEPENDS=	libepoll-shim.so:devel/libepoll-shim \
 		libfabric.so:net/libfabric \
 		libfmt.so:devel/libfmt \
 		libhwloc.so:devel/hwloc2 \
 		libjson-c.so:devel/json-c \
 		libspdlog.so:devel/spdlog \
 		libze_loader.so:devel/level-zero
 TEST_DEPENDS=	catch>0:devel/catch
 
 USES=		cmake:testing compiler:c++17-lang
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	LLNL
 GH_PROJECT=	DiHydrogen
 
 LDFLAGS+=	${MPI_LIBS} # no MPI libs linkage might be intentional in the project (to allow lazy linking to any MPI implementaton)
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 CMAKE_OFF=	H2_ENABLE_TESTS
 CMAKE_TESTING_ON=	H2_ENABLE_TESTS
 
 OPTIONS_SINGLE=		MPI
 OPTIONS_SINGLE_MPI=	MPICH OPENMPI
 OPTIONS_DEFAULT=	MPICH # should be same as in misc/lbann
 
 MPICH_USES=		mpi:mpich
 
 OPENMPI_USES=		mpi:openmpi
 
 .include <bsd.port.mk>
diff --git a/math/disco/Makefile b/math/disco/Makefile
index afc332f953a1..6aaea537d377 100644
--- a/math/disco/Makefile
+++ b/math/disco/Makefile
@@ -1,47 +1,47 @@
 PORTNAME=	disco
 DISTVERSIONPREFIX=	releases/
 DISTVERSION=	1.0.0-33
-PORTREVISION=	3
+PORTREVISION=	4
 DISTVERSIONSUFFIX=	-g68720be
 CATEGORIES=	math
 PKGNAMEPREFIX=	coin-or-
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Discrete Conic Optimization Solver
 WWW=		https://github.com/coin-or/DisCO
 
 LICENSE=	EPL
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libnauty.a:math/nauty
 LIB_DEPENDS=	libAlps.so:math/alps \
 		libBcps.so:math/bcps \
 		libblas.so:math/blas \
 		libbonmin.so:math/bonmin \
 		libCbc.so:math/cbc \
 		libCgl.so:math/cgl \
 		libCglConic.so:math/cgl-conic \
 		libClp.so:math/clp \
 		libcoinasl.so:math/asl \
 		libCoinUtils.so:math/coinutils \
 		libipopt.so:math/ipopt \
 		liblapack.so:math/lapack \
 		libopenblas.so:math/openblas \
 		libOsi.so:math/osi \
 		libOsiConic.so:math/osi-conic \
 		libOsiIpopt.so:math/osiipopt
 
 USES=		gmake libtool pkgconfig
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	coin-or
 GH_PROJECT=	DisCO
 
 GNU_CONFIGURE=	yes
 
 CONFLICTS_INSTALL=	disco mono mono[0-9]*
 
 INSTALL_TARGET=	install-strip
 
 .include <bsd.port.mk>
diff --git a/math/dsdp/Makefile b/math/dsdp/Makefile
index 6c17535fc135..06588fcb81bf 100644
--- a/math/dsdp/Makefile
+++ b/math/dsdp/Makefile
@@ -1,49 +1,49 @@
 PORTNAME=	dsdp
 DISTVERSION=	5.8
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	math
 MASTER_SITES=	https://www.mcs.anl.gov/hs/software/${PORTNAME:tu}/
 DISTNAME=	${PORTNAME:tu}${DISTVERSION}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Implementation of interior-point method for semidefinite programming
 WWW=		https://www.mcs.anl.gov/hs/software/DSDP/
 
 LICENSE=	DSDP_LICENSE
 LICENSE_NAME=	DSDP License
 LICENSE_FILE=	${WRKSRC}/dsdp-license
 LICENSE_PERMS=	auto-accept dist-mirror dist-sell pkg-mirror pkg-sell # do anything as long as the original copyright notice is retained
 
 LIB_DEPENDS=	libblas.so:math/blas \
 		liblapack.so:math/lapack
 
 USES=		fortran gmake localbase:ldflags
 USE_LDCONFIG=	yes
 
 ALL_TARGET=	all oshared all oshared
 
 BINARY_ALIAS=	make=${GMAKE} gcc=${CC}
 MAKE_ENV=	DSDPROOT=${WRKSRC} SH_LD="${CC} -shared"
 CFLAGS+=	-fPIC
 
 PLIST_FILES=	bin/dsdp5 \
 		include/dsdp/dsdp5.h \
 		include/dsdp/dsdpbasictypes.h \
 		include/dsdp/dsdplapack.h \
 		include/dsdp/dsdpmem.h \
 		include/dsdp/dsdpsys.h \
 		lib/libdsdp.so.0 \
 		lib/libdsdp.so
 
 do-build: # the build fails to build all binaries without being called twice due to makefile convolution
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET}
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET}
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/include/dsdp
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/dsdp5 ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_LIB} ${WRKSRC}/lib/libdsdp.so ${STAGEDIR}${PREFIX}/lib/libdsdp.so.0
 	(cd ${STAGEDIR}${PREFIX}/lib && ${LN} -s libdsdp.so.0 libdsdp.so)
 	${INSTALL_DATA} ${WRKSRC}/include/*.h ${STAGEDIR}${PREFIX}/include/dsdp
 
 .include <bsd.port.mk>
diff --git a/math/dune-alugrid/Makefile b/math/dune-alugrid/Makefile
index 287f6dafa84c..43fbfa46256c 100644
--- a/math/dune-alugrid/Makefile
+++ b/math/dune-alugrid/Makefile
@@ -1,46 +1,46 @@
 PORTNAME=	dune-alugrid
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.8.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	DUNE framework: grid implementation providing simplex or cube grids
 WWW=		https://www.dune-project.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	vc>0:devel/vc
 LIB_DEPENDS=	libalberta_utilities.so:math/alberta \
 		libdunecommon.so:math/dune-common \
 		libdunegeometry.so:math/dune-geometry \
 		libdunegrid.so:math/dune-grid \
 		libduneuggrid.so:math/dune-uggrid \
 		libmetis.so:math/metis \
 		libmpi.so:net/openmpi \
 		libopenblas.so:math/openblas \
 		libtbb.so:devel/onetbb
 
 USES=		cmake compiler:c++17-lang fortran pkgconfig
 USE_GITLAB=	yes
 USE_LDCONFIG=	yes
 
 GL_SITE=	https://gitlab.dune-project.org
 GL_ACCOUNT=	extensions
 GL_COMMIT=	ffd6cd15dc7092593c3d5827c2a2b43b81d7a32f
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 
 OPTIONS_DEFINE=	DOCS
 OPTIONS_SUB=	yes
 
 DOCS_CMAKE_BOOL=	FREEBSD_INSTALL_DOCS
 DOCS_BUILD_DEPENDS=	doxygen:devel/doxygen \
 			sphinx-build:textproc/py-sphinx
 
 PORTDOCS=	*
 
 CXXFLAGS+=	-fsigned-char
 
 .include <bsd.port.mk>
diff --git a/math/dune-common/Makefile b/math/dune-common/Makefile
index cfe78c6460d9..2b36382ee32d 100644
--- a/math/dune-common/Makefile
+++ b/math/dune-common/Makefile
@@ -1,47 +1,47 @@
 PORTNAME=	dune-common
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.8.0
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	DUNE framework: Build system, infrastructure and foundation classes
 WWW=		https://www.dune-project.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 BUILD_DEPENDS=	metis>0:math/metis \
 		openmpi>0:net/openmpi \
 		vc>0:devel/vc # Metis isn't used, see https://gitlab.dune-project.org/core/dune-common/-/issues/306
 LIB_DEPENDS=	libopenblas.so:math/openblas \
 		libtbb.so:devel/onetbb
 
 USES=		cmake compiler:c++17-lang fortran pkgconfig python shebangfix
 SHEBANG_FILES=	bin/dune-ctest bin/setup-dunepy.py bin/dunepackaging.py bin/rmgenerated.py  cmake/scripts/extract_cmake_data.py
 USE_GITLAB=	yes
 USE_LDCONFIG=	yes
 
 GL_SITE=	https://gitlab.dune-project.org
 GL_ACCOUNT=	core
 GL_COMMIT=	df65b1282ea89ad40d2cb6565983f7e633ccce31
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 CMAKE_ARGS=	-DTBB_INCLUDE_DIR=${LOCALBASE}/include -DTBB_LIBRARIES=${LOCALBASE}/lib/libtbb.so
 
 OPTIONS_DEFINE=	DOCS DOXYGEN
 OPTIONS_SUB=	yes
 
 DOCS_CMAKE_BOOL=	FREEBSD_INSTALL_DOCS
 DOCS_BUILD_DEPENDS=	latex:print/tex-formats \
 			sphinx-build:textproc/py-sphinx
 
 DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
 DOXYGEN_IMPLIES=	DOCS
 
 PORTDOCS=	*
 
 post-install:
 	@${RM} ${STAGEDIR}${PREFIX}/share/dune/cmake/scripts/run-in-dune-env.sh.in # https://gitlab.dune-project.org/core/dune-common/-/issues/229
 
 .include <bsd.port.mk>
diff --git a/math/dune-curvedgeometry/Makefile b/math/dune-curvedgeometry/Makefile
index d446b7b6d4ca..183aec4a2340 100644
--- a/math/dune-curvedgeometry/Makefile
+++ b/math/dune-curvedgeometry/Makefile
@@ -1,28 +1,29 @@
 PORTNAME=	dune-curvedgeometry
 DISTVERSION=	g20201116
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	DUNE framework: curved dune geometries by Lagrange parameterization
 WWW=		https://www.dune-project.org/
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	dune-geometry>0:math/dune-geometry
 RUN_DEPENDS=	dune-geometry>0:math/dune-geometry
 
 USES=		cmake compiler:c++17-lang fortran pkgconfig
 USE_GITLAB=	yes
 
 GL_SITE=	https://gitlab.mn.tu-dresden.de
 GL_ACCOUNT=	iwr
 GL_COMMIT=	fae02adf3757851f7f9caf41037da87caa52197d
 
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=	DOCS
 OPTIONS_SUB=	yes
 
 PORTDOCS=	*
 
 .include <bsd.port.mk>
diff --git a/math/dune-fem/Makefile b/math/dune-fem/Makefile
index c58f2cb9829c..a794da5fbe5b 100644
--- a/math/dune-fem/Makefile
+++ b/math/dune-fem/Makefile
@@ -1,68 +1,68 @@
 PORTNAME=	dune-fem
 DISTVERSION=	2.8.0.5
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	DUNE framework: Finite Element Methods, Finite Volume Methods, etc
 WWW=		https://www.dune-project.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 BUILD_DEPENDS=	arpack++>0:math/arpack++ \
 		dune-istl>=2.6:math/dune-istl \
 		dune-localfunctions>=2.6:math/dune-localfunctions \
 		dune-spgrid>0:math/dune-spgrid \
 		vc>0:devel/vc \
 		${LOCALBASE}/mpi/openmpi/lib/libmpi.so:net/openmpi
 LIB_DEPENDS=	libpsurface.so:math/psurface \
 		libarpack.so:math/arpack-ng \
 		libdunealugrid.so:math/dune-alugrid \
 		libdunecommon.so:math/dune-common \
 		libdunegeometry.so:math/dune-geometry \
 		libdunegrid.so:math/dune-grid \
 		libdunepolygongrid.so:math/dune-polygongrid \
 		libduneuggrid.so:math/dune-uggrid \
 		libgmp.so:math/gmp \
 		libmetis.so:math/metis \
 		libopenblas.so:math/openblas \
 		libsuitesparseconfig.so:math/suitesparse-config \
 		libsuperlu.so:math/superlu \
 		libamd.so:math/suitesparse-amd \
 		libcamd.so:math/suitesparse-camd \
 		libccolamd.so:math/suitesparse-ccolamd \
 		libcholmod.so:math/suitesparse-cholmod \
 		libcolamd.so:math/suitesparse-colamd \
 		libldl.so:math/suitesparse-ldl \
 		libspqr.so:math/suitesparse-spqr \
 		libumfpack.so:math/suitesparse-umfpack \
 		libtbb.so:devel/onetbb
 RUN_DEPENDS=	dune-istl>=2.6:math/dune-istl \
 		dune-localfunctions>=2.6:math/dune-localfunctions \
 		dune-spgrid>0:math/dune-spgrid \
 		${LOCALBASE}/mpi/openmpi/lib/libmpi.so:net/openmpi
 
 USES=		cmake compiler:c++17-lang eigen:3 fortran pkgconfig
 USE_GITLAB=	yes
 USE_LDCONFIG=	yes
 
 GL_SITE=	https://gitlab.dune-project.org
 GL_ACCOUNT=	dune-fem
 GL_COMMIT=	30e278aa744c908fbf4bbd8b237eb26c0475d16e
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 
 OPTIONS_DEFINE=		DOCS
 
 DOCS_CMAKE_BOOL=	FREEBSD_INSTALL_DOCS
 DOCS_BUILD_DEPENDS=	doxygen:devel/doxygen \
 			sphinx-build:textproc/py-sphinx
 
 PORTDOCS=	*
 
 post-install: # https://gitlab.dune-project.org/dune-fem/dune-fem/-/issues/111
 	${RM} ${STAGEDIR}${PREFIX}/share/dune/cmake/modules/FindPThreads.cmake
 	${RM} ${STAGEDIR}${PREFIX}/share/dune/cmake/modules/FindSIONlib.cmake
 
 .include <bsd.port.mk>
diff --git a/math/dune-foamgrid/Makefile b/math/dune-foamgrid/Makefile
index f925d386b035..7416c43755f6 100644
--- a/math/dune-foamgrid/Makefile
+++ b/math/dune-foamgrid/Makefile
@@ -1,35 +1,36 @@
 PORTNAME=	dune-foamgrid
 DISTVERSION=	2.8.0
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	DUNE framework: one- and two-dimensional simplex grids
 WWW=		https://www.dune-project.org/
 
 LICENSE=	GPLv2+
 
 HPP_DEPENDS=	dune-common>0:math/dune-common \
 		dune-geometry>0:math/dune-geometry \
 		dune-grid>0:math/dune-grid
 BUILD_DEPENDS=	${HPP_DEPENDS}
 RUN_DEPENDS=	${HPP_DEPENDS}
 
 USES=		cmake compiler:c++17-lang fortran pkgconfig
 USE_GITLAB=	yes
 
 GL_SITE=	https://gitlab.dune-project.org
 GL_ACCOUNT=	extensions
 GL_COMMIT=	c33bcf407a7061e7f5997b895d89207fb9a8097f
 
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=		DOCS
 OPTIONS_SUB=		yes
 
 DOCS_CMAKE_BOOL=	FREEBSD_INSTALL_DOCS
 DOCS_BUILD_DEPENDS=	doxygen:devel/doxygen \
 			sphinx-build:textproc/py-sphinx
 
 PORTDOCS=	*
 
 .include <bsd.port.mk>
diff --git a/math/dune-functions/Makefile b/math/dune-functions/Makefile
index a4227edb7c4f..adbd6fb1ac2f 100644
--- a/math/dune-functions/Makefile
+++ b/math/dune-functions/Makefile
@@ -1,41 +1,42 @@
 PORTNAME=	dune-functions
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.8.0
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	DUNE framework: Abstraction layer for global finite element functions
 WWW=		https://www.dune-project.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 DUNE_DEPENDS=	dune-common>0:math/dune-common \
 		dune-geometry>0:math/dune-geometry \
 		dune-grid>0:math/dune-grid \
 		dune-istl>0:math/dune-istl \
 		dune-localfunctions>0:math/dune-localfunctions \
 		dune-typetree>0:math/dune-typetree
 BUILD_DEPENDS=	${DUNE_DEPENDS} \
 		vc>0:devel/vc
 RUN_DEPENDS=	${DUNE_DEPENDS}
 
 USES=		cmake compiler:c++17-lang fortran pkgconfig
 USE_GITLAB=	yes
 
 GL_SITE=	https://gitlab.dune-project.org
 GL_ACCOUNT=	staging
 GL_COMMIT=	1882b3ec0a14b211dd077f0d5e6455495e28c35d
 
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=	DOCS
 OPTIONS_SUB=	yes
 
 DOCS_CMAKE_BOOL=	FREEBSD_INSTALL_DOCS
 DOCS_BUILD_DEPENDS=	doxygen:devel/doxygen \
 			sphinx-build:textproc/py-sphinx
 
 PORTDOCS=	*
 
 .include <bsd.port.mk>
diff --git a/math/dune-geometry/Makefile b/math/dune-geometry/Makefile
index ad29a911c36f..506cbc98f2fc 100644
--- a/math/dune-geometry/Makefile
+++ b/math/dune-geometry/Makefile
@@ -1,40 +1,40 @@
 PORTNAME=	dune-geometry
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.8.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	DUNE framework: Geometry transformations, reference elements, etc
 WWW=		https://www.dune-project.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 BUILD_DEPENDS=	openmpi>0:net/openmpi \
 		vc>0:devel/vc
 LIB_DEPENDS=	libdunecommon.so:math/dune-common \
 		libopenblas.so:math/openblas \
 		libtbb.so:devel/onetbb
 
 USES=		cmake compiler:c++17-lang fortran pkgconfig python
 USE_GITLAB=	yes
 USE_LDCONFIG=	yes
 
 GL_SITE=	https://gitlab.dune-project.org
 GL_ACCOUNT=	core
 GL_COMMIT=	e7bfb66e48496aa28e47974c33ea9a4579bf723b
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 CMAKE_ARGS=	-DTBB_INCLUDE_DIR=${LOCALBASE}/include -DTBB_LIBRARIES=${LOCALBASE}/lib/libtbb.so
 
 OPTIONS_DEFINE=	DOCS
 OPTIONS_SUB=	yes
 
 DOCS_CMAKE_BOOL=	FREEBSD_INSTALL_DOCS
 DOCS_BUILD_DEPENDS=	doxygen:devel/doxygen \
 			sphinx-build:textproc/py-sphinx
 
 PORTDOCS=	*
 
 .include <bsd.port.mk>
diff --git a/math/dune-grid-glue/Makefile b/math/dune-grid-glue/Makefile
index 13624081721e..3eca787576ab 100644
--- a/math/dune-grid-glue/Makefile
+++ b/math/dune-grid-glue/Makefile
@@ -1,45 +1,45 @@
 PORTNAME=	dune-grid-glue
 DISTVERSION=	2.8.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	DUNE framework: infrastructure for coupling of unrelated Dune grids
 WWW=		https://www.dune-project.org/
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	alberta-fem>0:math/alberta \
 		openmpi>0:net/openmpi \
 		psurface>0:math/psurface \
 		vc>0:devel/vc
 LIB_DEPENDS=	libdunecommon.so:math/dune-common \
 		libdunegeometry.so:math/dune-geometry \
 		libdunegrid.so:math/dune-grid \
 		libduneuggrid.so:math/dune-uggrid \
 		libopenblas.so:math/openblas \
 		libtbb.so:devel/onetbb
 RUN_DEPENDS=	alberta-fem>0:math/alberta # binaries aren't linked with alberta, instead users' binaries are linked with it
 RUN_DEPENDS+=	psurface>0:math/psurface
 
 USES=		cmake compiler:c++17-lang fortran pkgconfig
 USE_GITLAB=	yes
 USE_LDCONFIG=	yes
 
 GL_SITE=	https://gitlab.dune-project.org
 GL_ACCOUNT=	extensions
 GL_COMMIT=	22efb0e3cbf0a75094a8d81a4fdd352c98e78947
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 CMAKE_ARGS=	-DTBB_INCLUDE_DIR=${LOCALBASE}/include -DTBB_LIBRARIES=${LOCALBASE}/lib/libtbb.so
 
 OPTIONS_DEFINE=	DOCS
 OPTIONS_SUB=	yes
 
 DOCS_CMAKE_BOOL=	FREEBSD_INSTALL_DOCS
 DOCS_BUILD_DEPENDS=	doxygen:devel/doxygen \
 			sphinx-build:textproc/py-sphinx
 
 PORTDOCS=	*
 
 .include <bsd.port.mk>
diff --git a/math/dune-grid/Makefile b/math/dune-grid/Makefile
index a30f4378b213..7f57376fb558 100644
--- a/math/dune-grid/Makefile
+++ b/math/dune-grid/Makefile
@@ -1,46 +1,46 @@
 PORTNAME=	dune-grid
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.8.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	DUNE framework: Geometry transformations, reference elements, etc
 WWW=		https://www.dune-project.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 BUILD_DEPENDS=	alberta-fem>0:math/alberta \
 		openmpi>0:net/openmpi \
 		psurface>0:math/psurface \
 		vc>0:devel/vc
 LIB_DEPENDS=	libdunecommon.so:math/dune-common \
 		libdunegeometry.so:math/dune-geometry \
 		libduneuggrid.so:math/dune-uggrid \
 		libopenblas.so:math/openblas \
 		libtbb.so:devel/onetbb
 RUN_DEPENDS=	alberta-fem>0:math/alberta # binaries aren't linked with alberta, instead users' binaries are linked with it
 RUN_DEPENDS+=	psurface>0:math/psurface
 
 USES=		cmake compiler:c++17-lang fortran pkgconfig python:build
 USE_GITLAB=	yes
 USE_LDCONFIG=	yes
 
 GL_SITE=	https://gitlab.dune-project.org
 GL_ACCOUNT=	core
 GL_COMMIT=	de36e4b4e99da4cd7a120a39779345e701821115
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 CMAKE_ARGS=	-DTBB_INCLUDE_DIR=${LOCALBASE}/include -DTBB_LIBRARIES=${LOCALBASE}/lib/libtbb.so
 
 OPTIONS_DEFINE=	DOCS
 OPTIONS_SUB=	yes
 
 DOCS_CMAKE_BOOL=	FREEBSD_INSTALL_DOCS
 DOCS_BUILD_DEPENDS=	doxygen:devel/doxygen \
 			sphinx-build:textproc/py-sphinx
 
 PORTDOCS=	*
 
 .include <bsd.port.mk>
diff --git a/math/dune-istl/Makefile b/math/dune-istl/Makefile
index 4cc653ff9d97..003f0d298fec 100644
--- a/math/dune-istl/Makefile
+++ b/math/dune-istl/Makefile
@@ -1,41 +1,41 @@
 PORTNAME=	dune-istl
 DISTVERSION=	2.8.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	DUNE framework: Iterative Solver Template Library
 WWW=		https://www.dune-project.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 HPP_DEPENDS=	arpack++>0:math/arpack++ \
 		dune-common>0:math/dune-common \
 		suitesparse>0:math/suitesparse # needed in headers, but OPTIONAL dependency set is wider: https://gitlab.dune-project.org/core/dune-istl/-/issues/97
 BUILD_DEPENDS=	${HPP_DEPENDS} \
 		vc>0:devel/vc
 RUN_DEPENDS=	${HPP_DEPENDS}
 
 USES=		cmake compiler:c++17-lang fortran pkgconfig
 USE_GITLAB=	yes
 
 GL_SITE=	https://gitlab.dune-project.org
 GL_ACCOUNT=	core
 GL_COMMIT=	fffb544a61d2c65a0d2fc7c751f36909f06be8f5
 
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=	DOCS PARMETIS
 OPTIONS_SUB=	yes
 
 DOCS_CMAKE_BOOL=	FREEBSD_INSTALL_DOCS
 DOCS_BUILD_DEPENDS=	doxygen:devel/doxygen \
 
 PARMETIS_DESC=		Install PerMetis # needed in headers, but license prohibits packaging
 PARMETIS_BUILD_DEPENDS=	ParMetis>0:math/parmetis
 PARMETIS_RUN_DEPENDS=	ParMetis>0:math/parmetis
 
 PORTDOCS=	*
 
 .include <bsd.port.mk>
diff --git a/math/dune-localfunctions/Makefile b/math/dune-localfunctions/Makefile
index 4c9e345d0022..626c8bfddaff 100644
--- a/math/dune-localfunctions/Makefile
+++ b/math/dune-localfunctions/Makefile
@@ -1,41 +1,42 @@
 PORTNAME=	dune-localfunctions
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.8.0
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	DUNE framework: Local finite elements
 WWW=		https://www.dune-project.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 DUNE_DEPENDS=	dune-common>0:math/dune-common \
 		dune-geometry>0:math/dune-geometry
 BUILD_DEPENDS=	${DUNE_DEPENDS} \
 		vc>0:devel/vc
 RUN_DEPENDS=	${DUNE_DEPENDS}
 
 USES=		cmake compiler:c++17-lang fortran pkgconfig
 USE_GITLAB=	yes
 
 GL_SITE=	https://gitlab.dune-project.org
 GL_ACCOUNT=	core
 GL_COMMIT=	f6628171b2773065ab43f97a77f47cd8c4283d8f
 
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=	DOCS
 OPTIONS_SUB=	yes
 
 DOCS_CMAKE_BOOL=	FREEBSD_INSTALL_DOCS
 DOCS_BUILD_DEPENDS=	doxygen:devel/doxygen \
 			latex:print/tex-formats \
 			sphinx-build:textproc/py-sphinx
 
 PORTDOCS=	*
 
 post-stage-DOCS-on: # https://gitlab.dune-project.org/core/dune-common/issues/191
 	@${RMDIR} ${STAGEDIR}${DOCSDIR}/comm
 
 .include <bsd.port.mk>
diff --git a/math/dune-metagrid/Makefile b/math/dune-metagrid/Makefile
index 4408cc51fb4c..1103f0fe94dc 100644
--- a/math/dune-metagrid/Makefile
+++ b/math/dune-metagrid/Makefile
@@ -1,30 +1,31 @@
 PORTNAME=	dune-metagrid
 DISTVERSION=	g20210929
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	DUNE framework: module implementing a variety of DUNE meta grids
 WWW=		https://www.dune-project.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libdunealugrid.so:math/dune-alugrid \
 		libdunecommon.so:math/dune-common \
 		libdunegrid.so:math/dune-grid
 
 USES=		cmake compiler:c++17-lang fortran pkgconfig
 USE_GITLAB=	yes
 
 GL_SITE=	https://gitlab.dune-project.org
 GL_ACCOUNT=	extensions
 GL_COMMIT=	45fe80d530d18d8b86e77f20e38865f2101e571a
 
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=		DOCS
 OPTIONS_DEFAULT=	DOCS
 
 PORTDOCS=	*
 
 .include <bsd.port.mk>
diff --git a/math/dune-multidomaingrid/Makefile b/math/dune-multidomaingrid/Makefile
index 8f62cc068329..a1eba0e6a60e 100644
--- a/math/dune-multidomaingrid/Makefile
+++ b/math/dune-multidomaingrid/Makefile
@@ -1,36 +1,37 @@
 PORTNAME=	dune-multidomaingrid
 DISTVERSION=	2.8.0
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	DUNE framework: meta grid for subdomains spanning parts of host grid
 WWW=		https://www.dune-project.org/
 
 LICENSE=	GPLv2+
 
 HPP_DEPENDS=	dune-common>0:math/dune-common \
 		dune-geometry>0:math/dune-geometry \
 		dune-grid>0:math/dune-grid \
 		dune-typetree>0:math/dune-typetree
 BUILD_DEPENDS=	${HPP_DEPENDS}
 RUN_DEPENDS=	${HPP_DEPENDS}
 
 USES=		cmake compiler:c++17-lang fortran pkgconfig
 USE_GITLAB=	yes
 
 GL_SITE=	https://gitlab.dune-project.org
 GL_ACCOUNT=	extensions
 GL_COMMIT=	d31fd53d5a3d90348f8b33364011f3afb047c394
 
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=		DOCS
 OPTIONS_SUB=		yes
 
 DOCS_CMAKE_BOOL=	FREEBSD_INSTALL_DOCS
 DOCS_BUILD_DEPENDS=	doxygen:devel/doxygen \
 			sphinx-build:textproc/py-sphinx
 
 PORTDOCS=	*
 
 .include <bsd.port.mk>
diff --git a/math/dune-pdelab/Makefile b/math/dune-pdelab/Makefile
index f7132a215156..5d2a274a1545 100644
--- a/math/dune-pdelab/Makefile
+++ b/math/dune-pdelab/Makefile
@@ -1,66 +1,66 @@
 PORTNAME=	dune-pdelab
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.7.0.20210824
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	DUNE framework: PDE solver toolbox
 WWW=		https://www.dune-project.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 DUNE_DEPENDS=	dune-common>0:math/dune-common \
 		dune-functions>0:math/dune-functions \
 		dune-grid>0:math/dune-grid \
 		dune-istl>0:math/dune-istl \
 		dune-geometry>0:math/dune-geometry \
 		dune-localfunctions>0:math/dune-localfunctions \
 		dune-typetree>0:math/dune-typetree
 BUILD_DEPENDS=	${DUNE_DEPENDS} \
 		suitesparse>0:math/suitesparse \
 		${LOCALBASE}/mpi/openmpi/lib/libmpi.so:net/openmpi
 LIB_DEPENDS=	libarpack.so:math/arpack-ng \
 		libdunealugrid.so:math/dune-alugrid \
 		libduneuggrid.so:math/dune-uggrid \
 		libgmp.so:math/gmp \
 		libmetis.so:math/metis \
 		libpsurface.so:math/psurface \
 		libopenblas.so:math/openblas \
 		libamd.so:math/suitesparse-amd \
 		libcamd.so:math/suitesparse-camd \
 		libccolamd.so:math/suitesparse-ccolamd \
 		libcholmod.so:math/suitesparse-cholmod \
 		libcolamd.so:math/suitesparse-colamd \
 		libsuitesparseconfig.so:math/suitesparse-config \
 		libldl.so:math/suitesparse-ldl \
 		libspqr.so:math/suitesparse-spqr \
 		libumfpack.so:math/suitesparse-umfpack \
 		libsuperlu.so:math/superlu \
 		libtbb.so:devel/onetbb
 RUN_DEPENDS=	${DUNE_DEPENDS} \
 		suitesparse>0:math/suitesparse \
 		${LOCALBASE}/mpi/openmpi/lib/libmpi.so:net/openmpi
 
 USES=		cmake compiler:c++17-lang fortran pkgconfig
 USE_GITLAB=	yes
 USE_LDCONFIG=	yes
 
 GL_SITE=	https://gitlab.dune-project.org
 GL_ACCOUNT=	pdelab
 GL_COMMIT=	20c7085389d3eb4f8ca99e1bc60f7fa6036536c8
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 CMAKE_ARGS=	-DTBB_INCLUDE_DIR=${LOCALBASE}/include -DTBB_LIBRARIES=${LOCALBASE}/lib/libtbb.so
 
 OPTIONS_DEFINE=	DOCS
 OPTIONS_SUB=	yes
 
 DOCS_CMAKE_BOOL=	FREEBSD_INSTALL_DOCS
 DOCS_BUILD_DEPENDS=	doxygen:devel/doxygen \
 			sphinx-build:textproc/py-sphinx
 
 PORTDOCS=	*
 
 .include <bsd.port.mk>
diff --git a/math/dune-polygongrid/Makefile b/math/dune-polygongrid/Makefile
index e78389b43e60..5fd5b8f8de12 100644
--- a/math/dune-polygongrid/Makefile
+++ b/math/dune-polygongrid/Makefile
@@ -1,32 +1,32 @@
 PORTNAME=	dune-polygongrid
 DISTVERSION=	2.8.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	DUNE framework: 2D polygonal grid
 WWW=		https://www.dune-project.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${LOCALBASE}/mpi/openmpi/lib/libmpi.so:net/openmpi
 LIB_DEPENDS=	libdunecommon.so:math/dune-common \
 		libdunegeometry.so:math/dune-geometry \
 		libdunegrid.so:math/dune-grid \
 		libduneuggrid.so:math/dune-uggrid \
 		libopenblas.so:math/openblas \
 		libtbb.so:devel/onetbb
 RUN_DEPENDS=	${LOCALBASE}/mpi/openmpi/lib/libmpi.so:net/openmpi
 
 USES=		cmake compiler:c++17-lang fortran pkgconfig
 USE_GITLAB=	yes
 USE_LDCONFIG=	yes
 
 GL_SITE=	https://gitlab.dune-project.org
 GL_ACCOUNT=	extensions
 GL_COMMIT=	90840c3d36f5fa6e18a00e7df7be01832cd7e23b
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 
 .include <bsd.port.mk>
diff --git a/math/dune-spgrid/Makefile b/math/dune-spgrid/Makefile
index d9ad4d09211f..60d25b8918f4 100644
--- a/math/dune-spgrid/Makefile
+++ b/math/dune-spgrid/Makefile
@@ -1,40 +1,41 @@
 PORTNAME=	dune-spgrid
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.8.0
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	DUNE framework: A structured, parallel DUNE grid implementation
 WWW=		https://www.dune-project.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 DUNE_DEPENDS=	dune-common>0:math/dune-common \
 		dune-grid>0:math/dune-grid \
 		dune-geometry>0:math/dune-geometry \
 		dune-uggrid>0:math/dune-uggrid
 BUILD_DEPENDS=	${DUNE_DEPENDS} \
 		openmpi>0:net/openmpi \
 		vc>0:devel/vc
 RUN_DEPENDS=	${DUNE_DEPENDS}
 
 USES=		cmake compiler:c++17-lang fortran pkgconfig
 USE_GITLAB=	yes
 
 GL_SITE=	https://gitlab.dune-project.org
 GL_ACCOUNT=	extensions
 GL_COMMIT=	0e5a3b234d885ac566c9622421ab4eab97c8a50e
 
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=	DOCS
 OPTIONS_SUB=	yes
 
 DOCS_CMAKE_BOOL=	FREEBSD_INSTALL_DOCS
 DOCS_BUILD_DEPENDS=	doxygen:devel/doxygen \
 			sphinx-build:textproc/py-sphinx
 
 PORTDOCS=	*
 
 .include <bsd.port.mk>
diff --git a/math/dune-typetree/Makefile b/math/dune-typetree/Makefile
index a1881c6c66d3..35bea41c9cab 100644
--- a/math/dune-typetree/Makefile
+++ b/math/dune-typetree/Makefile
@@ -1,38 +1,39 @@
 PORTNAME=	dune-typetree
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.8.0
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	DUNE framework: The TypeTree library
 WWW=		https://www.dune-project.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 BUILD_DEPENDS=	dune-common>0:math/dune-common \
 		openmpi>0:net/openmpi \
 		vc>0:devel/vc
 RUN_DEPENDS=	dune-common>0:math/dune-common \
 		openmpi>0:net/openmpi \
 		vc>0:devel/vc
 
 USES=		cmake compiler:c++17-lang fortran pkgconfig
 USE_GITLAB=	yes
 
 GL_SITE=	https://gitlab.dune-project.org
 GL_ACCOUNT=	staging
 GL_COMMIT=	cf6b5b4d3abe5dfa748815a69f6a8bda02af36f0
 
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=	DOCS
 OPTIONS_SUB=	yes
 
 DOCS_CMAKE_BOOL=	FREEBSD_INSTALL_DOCS
 DOCS_BUILD_DEPENDS=	doxygen:devel/doxygen \
 			sphinx-build:textproc/py-sphinx
 
 PORTDOCS=	*
 
 .include <bsd.port.mk>
diff --git a/math/dune-uggrid/Makefile b/math/dune-uggrid/Makefile
index 4f726af273af..135846f3bda5 100644
--- a/math/dune-uggrid/Makefile
+++ b/math/dune-uggrid/Makefile
@@ -1,32 +1,32 @@
 PORTNAME=	dune-uggrid
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.8.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	DUNE framework: The UG Grid Manager
 WWW=		https://www.dune-project.org/
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING.LGPL-2.1
 
 BUILD_DEPENDS=	openmpi>0:net/openmpi \
 		vc>0:devel/vc
 LIB_DEPENDS=	libdunecommon.so:math/dune-common \
 		libopenblas.so:math/openblas \
 		libtbb.so:devel/onetbb
 RUN_DEPENDS=	openmpi>0:net/openmpi
 
 USES=		cmake compiler:c++17-lang fortran pkgconfig python
 USE_GITLAB=	yes
 USE_LDCONFIG=	yes
 
 GL_SITE=	https://gitlab.dune-project.org
 GL_ACCOUNT=	staging
 GL_COMMIT=	bc2d1229420367563410ce9e519f5ff82b45266f
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 CMAKE_ARGS=	-DTBB_INCLUDE_DIR=${LOCALBASE}/include -DTBB_LIBRARIES=${LOCALBASE}/lib/libtbb.so
 
 .include <bsd.port.mk>
diff --git a/math/dune-vtk/Makefile b/math/dune-vtk/Makefile
index 6f988e13b886..f754581a1b6f 100644
--- a/math/dune-vtk/Makefile
+++ b/math/dune-vtk/Makefile
@@ -1,63 +1,63 @@
 PORTNAME=	dune-vtk
 DISTVERSION=	2.8.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	DUNE framework: File reader and writer for the VTK XML format
 WWW=		https://www.dune-project.org/
 
 LICENSE=	GPLv2+
 
 HPP_DEPENDS=	${LOCALBASE}/include/dune/foamgrid/foamgrid.hh:math/dune-foamgrid \
 		dune-localfunctions>0:math/dune-localfunctions \
 		dune-spgrid>0:math/dune-spgrid
 BUILD_DEPENDS=	${HPP_DEPENDS} \
 		dune-functions>0:math/dune-functions \
 		suitesparse>0:math/suitesparse \
 		${LOCALBASE}/mpi/openmpi/lib/libmpi.so:net/openmpi
 LIB_DEPENDS=	libarpack.so:math/arpack-ng \
 		libdunealugrid.so:math/dune-alugrid \
 		libdunecommon.so:math/dune-common \
 		libdunegeometry.so:math/dune-geometry \
 		libdunegrid.so:math/dune-grid \
 		libdunepolygongrid.so:math/dune-polygongrid \
 		libduneuggrid.so:math/dune-uggrid \
 		libgmp.so:math/gmp \
 		libmetis.so:math/metis \
 		libopenblas.so:math/openblas \
 		libpsurface.so:math/psurface \
 		libamd.so:math/suitesparse-amd \
 		libcamd.so:math/suitesparse-camd \
 		libccolamd.so:math/suitesparse-ccolamd \
 		libcholmod.so:math/suitesparse-cholmod \
 		libcolamd.so:math/suitesparse-colamd \
 		libsuitesparseconfig.so:math/suitesparse-config \
 		libldl.so:math/suitesparse-ldl \
 		libspqr.so:math/suitesparse-spqr \
 		libumfpack.so:math/suitesparse-umfpack \
 		libsuperlu.so:math/superlu \
 		libtbb.so:devel/onetbb
 RUN_DEPENDS=	${HPP_DEPENDS} \
 		suitesparse>0:math/suitesparse \
 		${LOCALBASE}/mpi/openmpi/lib/libmpi.so:net/openmpi
 
 USES=		cmake compiler:c++17-lang fortran pkgconfig
 USE_GITLAB=	yes
 USE_LDCONFIG=	yes
 
 GL_SITE=	https://gitlab.dune-project.org
 GL_ACCOUNT=	extensions
 GL_COMMIT=	467838cde3bbea3d27d2bd117570a3215240dcd1
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 
 OPTIONS_DEFINE=		DOCS
 
 DOCS_CMAKE_BOOL=	FREEBSD_INSTALL_DOCS
 DOCS_BUILD_DEPENDS=	doxygen:devel/doxygen \
 			sphinx-build:textproc/py-sphinx
 
 PORTDOCS=	*
 
 .include <bsd.port.mk>
diff --git a/math/e-antic/Makefile b/math/e-antic/Makefile
index 403cbf7a2a42..7cfe1fc0b680 100644
--- a/math/e-antic/Makefile
+++ b/math/e-antic/Makefile
@@ -1,60 +1,60 @@
 PORTNAME=	e-antic
 DISTVERSION=	1.2.1
-PORTREVISION=	2
+PORTREVISION=	3
 #MASTER_SITES=	https://www.labri.fr/perso/vdelecro/e-antic/
 CATEGORIES=	math
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Real Embedded Algebraic Number Theory In C
 WWW=		https://github.com/flatsurf/e-antic
 
 LICENSE=	GPLv3 LGPL3
 LICENSE_COMB=	dual
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR}
 LIB_DEPENDS=	libarb.so:math/arb		\
 		libgmp.so:math/gmp		\
 		libmpfr.so:math/mpfr		\
 		libantic.so:math/antic		\
 		libflint.so:math/flint2		\
 		libbenchmark.so:devel/benchmark	\
 		libboost_thread.so:devel/boost-libs
 
 USES=		autoreconf compiler:c++11-lang gmake libtool localbase	\
 		python:3.7+
 
 USE_GITHUB=	yes
 ANTIC_TAG=	f4e8a60
 CATCH_TAG=	ff349a5
 CEREAL_TAG=	ebef1e9
 FLINT_TAG=	ae7ec89
 GH_ACCOUNT=	flatsurf catchorg:c1 USCiLab:c2 wbhart:f
 GH_PROJECT=	${PORTNAME} antic:a Catch2:c1 cereal:c2 flint2:f
 GH_TAGNAME=	${ANTIC_TAG}:a ${CATCH_TAG}:c1 ${CEREAL_TAG}:c2 ${FLINT_TAG}:f
 GH_SUBDIR=	libeantic/upstream/antic:a	\
 		libeantic/upstream/flint:f	\
 		libeantic/test/external/catch2:c1	\
 		libeantic/test/external/cereal:c2
 
 LIBS+=		"-lm"
 GNU_CONFIGURE=	yes
 # pytest requires cppyy, doc requires standardese
 CONFIGURE_ARGS=	--without-byexample	\
 		--without-pytest	\
 		--without-doc
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check
 
 PLIST_SUB=	VER=${DISTVERSION}
 
 post-install:
 	${REINPLACE_CMD} -e 's|${STAGEDIR}||'	\
 		${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/pyeantic/install_files.txt
 	${RM} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/pyeantic/install_files.txt.bak
 	${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py -d \
 		${PYTHONPREFIX_SITELIBDIR} -f ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 	${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py -d \
 		${PYTHONPREFIX_SITELIBDIR} -f ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 
 .include <bsd.port.mk>
diff --git a/math/eclib/Makefile b/math/eclib/Makefile
index f6160fcacde8..4454d378f955 100644
--- a/math/eclib/Makefile
+++ b/math/eclib/Makefile
@@ -1,30 +1,30 @@
 PORTNAME=	eclib
 PORTVERSION=	20220621
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	C++ library for arithmetic on elliptic curves
 WWW=		https://homepages.warwick.ac.uk/staff/J.E.Cremona/mwrank/
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libntl.so:math/ntl		\
 		libpari.so:math/pari		\
 		libflint.so:math/flint2		\
 		libboost_thread.so:devel/boost-libs
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	JohnCremona
 
 USES=		autoreconf compiler:c++11-lang libtool localbase
 
 OPTIONS_DEFINE=	DOCS
 
 LIBS+=		"-lm"
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-flint=${LOCALBASE} --with-boost=${LOCALBASE}
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 
 .include <bsd.port.mk>
diff --git a/math/eigen3/Makefile b/math/eigen3/Makefile
index 1f98ae00c208..e64f988b87fb 100644
--- a/math/eigen3/Makefile
+++ b/math/eigen3/Makefile
@@ -1,43 +1,43 @@
 PORTNAME=	eigen
 DISTVERSION=	3.4.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Lightweight library for vector and matrix math
 WWW=		https://eigen.tuxfamily.org/
 
 LICENSE=	LGPL21 MPL20
 LICENSE_COMB=	multi
 LICENSE_FILE_LGPL21=	${WRKSRC}/COPYING.LGPL
 LICENSE_FILE_MPL20=	${WRKSRC}/COPYING.MPL2
 
 TEST_DEPENDS=	suitesparse-cholmod>0:math/suitesparse-cholmod \
 		suitesparse-umfpack>0:math/suitesparse-umfpack \
 		superlu>0:math/superlu	\
 		adol-c>0:math/adol-c \
 		fftw3>0:math/fftw3 \
 		mpfr>0:math/mpfr \
 		gmp>0:math/gmp \
 		boost-libs>0:devel/boost-libs
 
 USES=		cmake:testing
 USE_GITLAB=	yes
 GL_ACCOUNT=	libeigen
 GL_COMMIT=	3147391d946bb4b6c68edd901f2add6ac1f31f8c
 
 CMAKE_ARGS=	-DPKGCONFIG_INSTALL_DIR:PATH="libdata/pkgconfig"
 CMAKE_ON=	EIGEN_TEST_CXX11 # This is to set the C++ standard to C++11, instead of 03
 CMAKE_TESTING_ON=	EIGEN_TEST_CUDA EIGEN_TEST_CUDA_CLANG
 
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=	BLAS
 OPTIONS_DEFAULT=BLAS
 
 BLAS_DESC=	Adds math dependencies
 BLAS_CMAKE_ON=	-DBLAS_DIR:PATH="${LOCALBASE}"
 BLAS_USES=	blaslapack pkgconfig
 
 .include <bsd.port.mk>
diff --git a/math/eispack/Makefile b/math/eispack/Makefile
index db368aa13721..17bf3c421805 100644
--- a/math/eispack/Makefile
+++ b/math/eispack/Makefile
@@ -1,59 +1,59 @@
 PORTNAME=	eispack
 PORTVERSION=	1.0
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	math
 MASTER_SITES=	NL
 DISTFILES=	${SRCS}
 EXTRACT_ONLY=	#empty
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Eigenvalue system package
 WWW=		https://www.netlib.org/eispack/
 
 DIST_SUBDIR=	${PORTNAME}
 NO_WRKSUBDIR=	yes
 
 USES=		fortran uidfix
 USE_LDCONFIG=	yes
 
 SHLIB_MAJOR=	2
 PLIST_FILES=	lib/libeispack.a lib/libeispack.so lib/libeispack.so.${SHLIB_MAJOR}
 
 LDFLAGS+=	${FFLAGS}
 SRCCONF=	/dev/null
 MAKE_ENV+=	SHLIB_MAJOR="${SHLIB_MAJOR}" \
 		SRCCONF="${SRCCONF}"
 
 OPTIONS_DEFINE=	PROFILE
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPROFILE}
 .if defined(NOPROFILE) || defined(NO_PROFILE) || defined(WITHOUT_PROFILE)
 IGNORE=		you have defined WITH_PROFILE, but have also defined\
 WITHOUT_PROFILE, NOPROFILE, or NO_PROFILE
 .elif !exists(/usr/lib/libc_p.a)
 IGNORE=		you have chosen WITH_PROFILE, but have not installed the\
 base system profiling libraries
 .endif
 PLIST_FILES+=	lib/libeispack_p.a
 .else
 MAKE_ENV+=	WITHOUT_PROFILE=yes
 .endif
 
 SRCS=	csroot.f epslon.f pythag.f bakvec.f balanc.f balbak.f bandr.f \
 	bandv.f bisect.f bqr.f cbabk2.f cbal.f cg.f ch.f cinvit.f combak.f \
 	comhes.f comlr.f comlr2.f comqr.f comqr2.f cortb.f corth.f elmbak.f \
 	elmhes.f eltran.f figi.f figi2.f hqr.f hqr2.f htrib3.f htribk.f \
 	htrid3.f htridi.f imtql1.f imtql2.f imtqlv.f invit.f minfit.f \
 	ortbak.f orthes.f ortran.f otqlrat.f qzhes.f qzit.f qzval.f qzvec.f \
 	ratqr.f rebak.f rebakb.f reduc.f reduc2.f rg.f rgg.f rs.f rsb.f \
 	rsg.f rsgab.f rsgba.f rsm.f rsp.f rst.f rt.f svd.f tinvit.f tql1.f \
 	tql2.f tqlrat.f trbak1.f trbak3.f tred1.f tred2.f tred3.f tridib.f \
 	tsturm.f cdiv.f
 
 post-extract:
 	@(cd ${_DISTDIR}; ${CP} ${SRCS} ${WRKSRC})
 	${CP} ${FILESDIR}/Makefile.lib ${WRKSRC}/Makefile
 
 .include <bsd.port.mk>
diff --git a/math/elemental/Makefile b/math/elemental/Makefile
index 4bdb60db2ce6..352e5a499b4d 100644
--- a/math/elemental/Makefile
+++ b/math/elemental/Makefile
@@ -1,48 +1,48 @@
 PORTNAME=	elemental
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.5.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Dense and sparse linear algebra, conic optimization, lattice reduction
 WWW=		https://github.com/LLNL/Elemental
 
 LICENSE=	BSD2CLAUSE
 
 BROKEN_FreeBSD_12_powerpc64=	fails to compile: include/El/blas_like/level1/Copy.hpp:522:27: ambiguous template specialization 'Copy<>' for 'void El::Copy(const El::Matrix<int>&, El::Matrix<int>&)'
 BROKEN_i386=	clang crashes: https://bugs.llvm.org/show_bug.cgi?id=46026
 
 LIB_DEPENDS=	libgmp.so:math/gmp \
 		libmetis.so:math/metis \
 		libmpc.so:math/mpc \
 		libmpfr.so:math/mpfr \
 		libmpi_cxx.so:net/openmpi \
 		libopenblas.so:math/openblas \
 		libqd.so:math/qd
 TEST_DEPENDS=	catch>0:devel/catch
 
 USES=		cmake compiler:c++14-lang fortran
 USE_GITHUB=	yes
 GH_ACCOUNT=	LLNL
 GH_PROJECT=	Elemental
 USE_LDCONFIG=	yes
 
 CMAKE_ON=	BUILD_SHARED_LIBS EL_DISABLE_PARMETIS
 CMAKE_OFF=	Hydrogen_ENABLE_TESTING
 CMAKE_ARGS=	-DGFORTRAN_LIB:STRING=${LOCALBASE}/lib/gcc${GCC_DEFAULT}/libgfortran.so \
 		-DFREEBSD_GCC_LIB:STRING=${LOCALBASE}/lib/gcc${GCC_DEFAULT}/libgcc_s.so
 
 DOCSDIR=	${PREFIX}/share/doc/Elemental
 
 OPTIONS_DEFINE=	DOCS
 
 PORTDOCS=	*
 
 do-test:
 	@cd ${BUILD_WRKSRC} && \
 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DHydrogen_ENABLE_TESTING:BOOL=ON -DHydrogen_ENABLE_UNIT_TESTS:BOOL=ON ${CMAKE_SOURCE_PATH} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
 
 .include <bsd.port.mk>
diff --git a/math/elpa/Makefile b/math/elpa/Makefile
index 0620af618033..4dd9e569e127 100644
--- a/math/elpa/Makefile
+++ b/math/elpa/Makefile
@@ -1,71 +1,72 @@
 PORTNAME=	elpa
 DISTVERSION=	2021.11.001
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	https://elpa.mpcdf.mpg.de/software/tarball-archive/Releases/${DISTVERSION}/
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Eigenvalue soLver for Petaflop Applications
 WWW=		https://elpa.mpcdf.mpg.de/
 
 LICENSE=	GPLv3 LGPL3
 LICENSE_COMB=	dual
 LICENSE_FILE_GPLv3=	${WRKSRC}/COPYING/gpl.txt
 LICENSE_FILE_LGPL3=	${WRKSRC}/COPYING/lgpl.txt
 
 LIB_DEPENDS=	libopenblas.so:math/openblas
 
 USES=		compiler:c11 fortran gmake libtool localbase perl5 shebangfix
 USE_LDCONFIG=	yes
 
 SHEBANG_GLOB=	*.pl
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-avx --disable-avx2 --disable-avx512 --disable-static \
 		--disable-c-tests
 
 CFLAGS+=	-I${WRKSRC} -I${WRKSRC}/private_modules
 CFLAGS+=	-DFREEBSD_OSVERSION=${OSVERSION}
 FCFLAGS+=	-I${WRKSRC} -I${WRKSRC}/private_modules
 LDFLAGS+=	-lutil
 
 # ugly workaround for missing .mod files: some targets are added before 'all' that force rebuild of missing .mod files
 ALL_TARGET=	src/general/libelpa_private_la-elpa_utilities.lo \
 		src/libelpa_private_la-elpa_generated_fortran_interfaces.lo \
 		src/elpa1/libelpa_private_la-elpa1_compute_private.lo \
 		src/elpa2/libelpa_private_la-elpa2_compute.lo \
 		all
 INSTALL_TARGET=	install-strip
 
 BINARY_ALIAS=	make=gmake gcc=gcc${GCC_DEFAULT} g++=g++${GCC_DEFAULT} # build fails with clang: recursively calls cc
 FCFLAGS+=	-std=legacy -I${LOCALBASE}/include
 
 MAKE_JOBS_UNSAFE=	yes # part of the workaround for .mod files
 
 OPTIONS_DEFINE=			OPENMP MPI DOCS
 OPTIONS_DEFINE_amd64=		SSE
 OPTIONS_DEFAULT_amd64=		SSE
 
 SSE_CFLAGS=			-msse3
 OPENMP_CONFIGURE_ENABLE=	openmp
 MPI_CONFIGURE_WITH=		mpi
 MPI_LIB_DEPENDS=		libmpich.so:net/mpich \
 				libscalapack.so:math/scalapack
 
 PORTDOCS=	*
 
 post-patch:
 	# workaround for: https://github.com/marekandreas/elpa/issues/6
 	@${FIND} ${WRKSRC} -name "*.mk" | ${XARGS} ${REINPLACE_CMD} -e 's|-Werror| |'
 	# patch in the full path name of config-f90.h
 	@${FIND} ${WRKSRC} -name *.F90 -o -name *.c | ${XARGS} ${REINPLACE_CMD} -e 's|#include "config-f90.h"|#include "${WRKSRC}/config-f90.h"|'
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:NSSE}
 CONFIGURE_ARGS+=	--disable-sse --disable-sse-assembly
 .endif
 
 post-install-DOCS-on:
 	@cd ${STAGEDIR}${DOCSDIR} && ${RM} *gpl* COPYING LICENSE
 
 .include <bsd.port.mk>
diff --git a/math/ensmallen/Makefile b/math/ensmallen/Makefile
index 2587eed3b0f0..cada764bdada 100644
--- a/math/ensmallen/Makefile
+++ b/math/ensmallen/Makefile
@@ -1,27 +1,28 @@
 PORTNAME=	ensmallen
 DISTVERSION=	2.19.1
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	https://ensmallen.org/files/
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Flexible C++ library for efficient mathematical optimization
 WWW=		https://ensmallen.org/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BUILD_DEPENDS=	${LOCALBASE}/include/armadillo_bits/config.hpp:math/armadillo
 RUN_DEPENDS=	${LOCALBASE}/include/armadillo_bits/config.hpp:math/armadillo
 
 USES=		cmake compiler:c++11-lang localbase
 CMAKE_ON=	BUILD_TESTS # will be removed
 
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 do-test:
 	@cd ${BUILD_WRKSRC} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ensmallen_tests && \
 		./ensmallen_tests
 
 .include <bsd.port.mk>
diff --git a/math/ess/Makefile b/math/ess/Makefile
index b73ca42bad05..ee23d76d500c 100644
--- a/math/ess/Makefile
+++ b/math/ess/Makefile
@@ -1,39 +1,39 @@
 PORTNAME=	ess
 DISTVERSION=	18.10.2
-PORTREVISION=	10
+PORTREVISION=	15
 CATEGORIES=	math
 MASTER_SITES=	http://ess.r-project.org/downloads/ess/ \
 		http://stat.ethz.ch/ESS/downloads/ess/
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	rhurlin@FreeBSD.org
 COMMENT=	R support for Emacsen
 WWW=		https://ess.r-project.org/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	R:math/R
 
 USES=		emacs gmake makeinfo perl5 tar:tgz
 USE_PERL5=	build
 
 NO_ARCH=	yes
 
 INFO=		ess
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|^DESTDIR|#DESTDIR| ; \
 		 s|^PREFIX|#PREFIX| ; \
 		 s|=$$(PREFIX)|=$$(DESTDIR)$$(PREFIX)| ; \
 		 s|share/info|${INFO_PATH}|' ${WRKSRC}/Makeconf
 	@${REINPLACE_CMD} -e \
 		'/^PDFs/s|=.*|=|' ${WRKSRC}/doc/Makefile
 
 post-install:
 	@${CP} ${WRKSRC}/lisp/*.el ${STAGEDIR}${PREFIX}/share/emacs/site-lisp/ess/
 
 .include <bsd.port.mk>
diff --git a/math/faiss/Makefile b/math/faiss/Makefile
index 8ca5a98d8c07..d7cf891c9c8f 100644
--- a/math/faiss/Makefile
+++ b/math/faiss/Makefile
@@ -1,31 +1,32 @@
 PORTNAME=	faiss
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.7.4
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Library for efficient similarity search & clustering of dense vectors
 WWW=		https://github.com/facebookresearch/faiss
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 .if !exists(/usr/include/omp.h)
 BROKEN=		requires OpenMP support that is missing on this architecture
 .endif
 
 BUILD_DEPENDS=	openblas>0:math/openblas # faiss links with libopenblasp-rN.N.N.so (installed by default only on amd64,i386), so use non-filename-specific DEPENDS commands
 RUN_DEPENDS=	openblas>0:math/openblas
 TEST_DEPENDS=	googletest>0:devel/googletest
 
 USES=		cmake:testing compiler:c++11-lang localbase:ldflags # tests fail to link, see https://github.com/facebookresearch/faiss/issues/2654
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	facebookresearch
 
 #LDFLAGS+=	-lgtest #-pthread
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 CMAKE_OFF=	BUILD_TESTING FAISS_ENABLE_GPU FAISS_ENABLE_PYTHON
 
 .include <bsd.port.mk>
diff --git a/math/fcl/Makefile b/math/fcl/Makefile
index baa3642161eb..c1ff95a883ee 100644
--- a/math/fcl/Makefile
+++ b/math/fcl/Makefile
@@ -1,38 +1,39 @@
 PORTNAME=	fcl
 DISTVERSION=	0.7.0
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Flexible Collision Library
 WWW=		https://github.com/flexible-collision-library/fcl
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libccd.so:math/libccd
 
 USES=		cmake compiler:c++11-lang eigen:3
 USE_GITHUB=	yes
 GH_ACCOUNT=	flexible-collision-library
 USE_LDCONFIG=	yes
 
 CMAKE_ON=	FREEBSD_ENABLE_SSE
 CMAKE_OFF=	FCL_BUILD_TESTS BUILD_TESTING # also see https://github.com/flexible-collision-library/fcl/issues/354
 
 OPTIONS_DEFINE_amd64=		SSE2 SSE3 SSSE3 SSE4 SSE41 SSE42 SSE4A
 OPTIONS_DEFAULT_amd64=		SSE2
 OPTIONS_DEFINE_i386=		${OPTIONS_DEFINE_amd64}
 OPTIONS_DEFAULT_i386=		${OPTIONS_DEFAULT_amd64}
 
 .for sse in ${OPTIONS_DEFINE_amd64}
 ${sse}_DESC=		Support for ${sse}
 ${sse}_CMAKE_ON=	-DFCL_USE_X64_SSE:BOOL=ON -DOPT_SSE_${sse}=-m${sse:tl:S/41/4.1/:S/42/4.2/}
 .endfor
 
 do-test: # tests fail to compile: https://github.com/flexible-collision-library/fcl/issues/549
 	@cd ${BUILD_WRKSRC} && \
 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBUILD_TESTING:BOOL=ON -DFCL_BUILD_TESTS:BOOL=ON ${CMAKE_SOURCE_PATH} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
 
 .include <bsd.port.mk>
diff --git a/math/fcl05/Makefile b/math/fcl05/Makefile
index 59cabd00804f..de7654a5a8b3 100644
--- a/math/fcl05/Makefile
+++ b/math/fcl05/Makefile
@@ -1,41 +1,41 @@
 PORTNAME=	fcl
 DISTVERSION=	0.5.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 PKGNAMESUFFIX=	05
 
 MAINTAINER=	db@FreeBSD.org
 COMMENT=	Flexible Collision Library (Old version)
 WWW=		https://github.com/flexible-collision-library/fcl
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	boost-libs>0:devel/boost-libs
 LIB_DEPENDS=	libccd.so:math/libccd \
 		liboctomap.so:math/octomap
 
 USES=		cmake compiler:c++11-lang eigen:3 pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	flexible-collision-library
 USE_LDCONFIG=	yes
 
 CMAKE_OFF=	FCL_BUILD_TESTS BUILD_TESTING
 
 OPTIONS_DEFINE_amd64=		SSE2 SSE3 SSSE3 SSE4 SSE41 SSE42 SSE4A
 OPTIONS_DEFAULT_amd64=		SSE2
 OPTIONS_DEFINE_i386=		${OPTIONS_DEFINE_amd64}
 OPTIONS_DEFAULT_i386=		${OPTIONS_DEFAULT_amd64}
 
 .for sse in ${OPTIONS_DEFINE_amd64}
 ${sse}_DESC=		Support for ${sse}
 ${sse}_CMAKE_ON=	-DFCL_USE_X64_SSE:BOOL=ON -DOPT_SSE_${sse}=-m${sse:tl:S/41/4.1/:S/42/4.2/}
 .endfor
 
 do-test:
 	@cd ${BUILD_WRKSRC} && \
 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBUILD_TESTING:BOOL=ON -DFCL_BUILD_TESTS:BOOL=ON ${CMAKE_SOURCE_PATH} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
 
 .include <bsd.port.mk>
diff --git a/math/fenics-basix/Makefile b/math/fenics-basix/Makefile
index 51f9de6ce9f7..71fb75b57fbf 100644
--- a/math/fenics-basix/Makefile
+++ b/math/fenics-basix/Makefile
@@ -1,31 +1,32 @@
 PORTNAME=	fenics-basix
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.5.1
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	FEniCS finite element basis evaluation library
 WWW=		https://github.com/FEniCS/basix
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/../LICENSE
 
 BUILD_DEPENDS=	xtensor>0:math/xtensor \
 		xtl-quant-stack>0:devel/xtl-quant-stack
 LIB_DEPENDS=	libopenblas.so:math/openblas
 
 USES=		cmake compiler:c++20-lang
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	FEniCS
 GH_PROJECT=	basix
 
 WRKSRC_SUBDIR=	cpp
 
 .include <bsd.port.pre.mk>
 
 .if ${CHOSEN_COMPILER_TYPE} == clang && !exists(/usr/include/c++/v1/concepts) # true only on FreeBSD_12
 BROKEN=		system is missing a required C++ feature std::concepts
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/math/fflas-ffpack/Makefile b/math/fflas-ffpack/Makefile
index 253d9a95bf6e..d6668daeb4b5 100644
--- a/math/fflas-ffpack/Makefile
+++ b/math/fflas-ffpack/Makefile
@@ -1,47 +1,47 @@
 PORTNAME=	fflas-ffpack
 PORTVERSION=	2.4.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Library for dense linear algebra over word-size finite fields
 WWW=		https://linbox-team.github.io/fflas-ffpack/
 
 LICENSE=	LGPL21
 
 BUILD_DEPENDS=	bash:shells/bash
 LIB_DEPENDS=	libgmp.so:math/gmp	\
 		libgivaro.so:math/givaro
 RUN_DEPENDS=	bash:shells/bash
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	linbox-team
 
 USES=		autoreconf blaslapack:openblas compiler:c++11-lang gmake	\
 		libtool localbase pkgconfig shebangfix
 GNU_CONFIGURE=	yes
 SHEBANG_FILES=	fflas-ffpack-config.in
 TEST_TARGET=	check
 
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=	DOXYGEN
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDOXYGEN}
 BUILD_DEPENDS+=		doxygen:devel/doxygen
 CONFIGURE_ARGS+=	--enable-doc --with-docdir="${DOCSDIR}"
 PLIST_SUB+=	DOXYGEN=""
 .else
 PLIST_SUB+=	DOXYGEN="@comment "
 .endif
 
 post-patch-DOXYGEN-on:
 	${REINPLACE_CMD} -e 's/sed -i/& ""/' ${WRKSRC}/doc/Makefile.am
 
 post-install-DOXYGEN-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/fflas-ffpack-dev-html
 	@${TOUCH} ${STAGEDIR}${DOCSDIR}/fflas-ffpack-dev-html/.keep-me
 
 .include <bsd.port.mk>
diff --git a/math/fftw/Makefile b/math/fftw/Makefile
index 6ef5ba0ac3b7..3195c83aca8c 100644
--- a/math/fftw/Makefile
+++ b/math/fftw/Makefile
@@ -1,69 +1,69 @@
 PORTNAME=	fftw
 PORTVERSION=	2.1.5
-PORTREVISION?=	22
+PORTREVISION?=	23
 CATEGORIES=	math
 MASTER_SITES=	ftp://ftp.fftw.org/pub/fftw/		\
 		ftp://ftp.fftw.org/pub/fftw/old/	\
 		ftp://theory.lcs.mit.edu/pub/fftw/	\
 		ftp://pm.cse.rmit.edu.au/pub/dsp/fftw/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT?=	Fast C routines to compute the Discrete Fourier Transform
 WWW=		https://www.fftw.org/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 # current flavors: default, float
 FFTW_FLAVOR?=	default
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared
 USES=		fortran gmake libtool:keepla
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check
 
 PLIST_SUB=	FFTW_SUFX="${FFTW_SUFX}"
 
 PORTSCOUT=	limit:^2\.
 
 .if ${FFTW_FLAVOR}=="float"
 CONFIGURE_ARGS+=	--enable-float --enable-type-prefix
 FFTW_SUFX=		s
 PKGNAMESUFFIX=		-float
 .else
 USES+=			makeinfo
 FFTW_SUFX=
 INFO=			fftw
 .endif
 
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == "i386"
 CONFIGURE_ARGS+=	--enable-i386-hacks
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e '/^SUBDIRS/s|doc | |' ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e '/^LINK/s|$$(CCLD)|& -Wc,-B${LOCALBASE}/bin|' \
 		${WRKSRC}/fftw/Makefile.in ${WRKSRC}/mpi/Makefile.in \
 		${WRKSRC}/rfftw/Makefile.in ${WRKSRC}/threads/Makefile.in
 
 .if ${FFTW_FLAVOR}=="default"
 post-build:
 	@cd ${WRKSRC}/doc && makeinfo fftw.texi
 .endif
 
 .if ${FFTW_FLAVOR}=="default"
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/fftw.info ${STAGEDIR}${PREFIX}/${INFO_PATH}
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/fftw.ps ${STAGEDIR}${DOCSDIR}/
 .endif
 
 .include <bsd.port.mk>
diff --git a/math/flann/Makefile b/math/flann/Makefile
index 34faf6ab47ce..485b6d662d6a 100644
--- a/math/flann/Makefile
+++ b/math/flann/Makefile
@@ -1,29 +1,29 @@
 PORTNAME=	flann
 DISTVERSION=	1.9.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Library for fast nearest neighbor searches in high dimensional spaces
 WWW=		https://www.cs.ubc.ca/research/flann/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libhdf5.so:science/hdf5 \
 		liblz4.so:archivers/liblz4 \
 		libsz.so:science/libaec
 
 USES=		cmake compiler:c++11-lang localbase:ldflags pkgconfig
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	tkircher
 
 CMAKE_OFF=	BUILD_PYTHON_BINDINGS BUILD_MATLAB_BINDINGS BUILD_EXAMPLES BUILD_TESTS BUILD_DOC \
 		USE_OPENMP # OpenMP search is broken in cmake: https://gitlab.kitware.com/cmake/cmake/issues/17474
 
 post-install: # workaround for https://github.com/mariusmuja/flann/issues/466
 	${REINPLACE_CMD} -i '' -e 's/lib;-llz4/lib -llz4/' ${STAGEDIR}${PREFIX}/libdata/pkgconfig/flann.pc
 
 .include <bsd.port.mk>
diff --git a/math/flint2/Makefile b/math/flint2/Makefile
index 047cc9c54056..ad2b225a9e7e 100644
--- a/math/flint2/Makefile
+++ b/math/flint2/Makefile
@@ -1,34 +1,35 @@
 PORTNAME=	flint
 DISTVERSION=	2.9.0	# FLINT is known to change its API. When upgrading please check that it does not break its consumers (e.g. math/e-antic)
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	http://www.flintlib.org/
 PKGNAMESUFFIX=	2
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Fast library for number theory
 WWW=		https://www.flintlib.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libgmp.so:math/gmp \
 		libmpfr.so:math/mpfr \
 		libopenblas.so:math/openblas
 
 USES=		cmake compiler:c++11-lang python:build
 USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=		NTL
 OPTIONS_DEFAULT=	NTL
 
 NTL_DESC=		Victor Shoup's Number Theory Library
 NTL_CMAKE_BOOL=		WITH_NTL
 NTL_LIB_DEPENDS=	libntl.so:math/ntl
 
 do-test:
 	@cd ${BUILD_WRKSRC} && \
 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBUILD_TESTING:BOOL=ON ${CMAKE_SOURCE_PATH} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
 
 .include <bsd.port.mk>
diff --git a/math/flopc++/Makefile b/math/flopc++/Makefile
index e6f0d50e8a0c..35675ff95920 100644
--- a/math/flopc++/Makefile
+++ b/math/flopc++/Makefile
@@ -1,31 +1,32 @@
 PORTNAME=	flopc++
 DISTVERSION=	1.2.5.20200527
+PORTREVISION=	1
 CATEGORIES=	math
 PKGNAMEPREFIX=	coin-or-
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Library for solving Linear Optimization Problems in C++
 WWW=		https://projects.coin-or.org/FlopC++
 
 LICENSE=	EPL
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libCoinUtils.so:math/coinutils \
 		libOsi.so:math/osi
 
 USES=		gmake libtool pkgconfig tar:tgz
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	coin-or
 GH_PROJECT=	FlopCpp
 GH_TAGNAME=	d4c1d98 # fix-clang branch
 
 GNU_CONFIGURE=	yes
 
 INSTALL_TARGET=	install-strip
 
 post-install:
 	@${RM} -r ${STAGEDIR}${PREFIX}/share
 
 .include <bsd.port.mk>
diff --git a/math/fplll/Makefile b/math/fplll/Makefile
index 7a6d3e4d8321..7dce3777016a 100644
--- a/math/fplll/Makefile
+++ b/math/fplll/Makefile
@@ -1,26 +1,27 @@
 PORTNAME=	fplll
 DISTVERSION=	5.4.4
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/${DISTVERSION}/
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Lattice algorithms using floating-point arithmetic
 WWW=		https://github.com/fplll/fplll
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libgmp.so:math/gmp \
 		libmpfr.so:math/mpfr \
 		libqd.so:math/qd
 
 USES=		autoreconf compiler:c++11-lang gmake libtool localbase:ldflags pkgconfig
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-static
 USE_LDCONFIG=	yes
 
 INSTALL_TARGET=	install-strip
 
 TEST_TARGET=	check
 
 .include <bsd.port.mk>
diff --git a/math/freefem++/Makefile b/math/freefem++/Makefile
index 2b6b9d12feee..4ad0d1170861 100644
--- a/math/freefem++/Makefile
+++ b/math/freefem++/Makefile
@@ -1,74 +1,75 @@
 PORTNAME=	freefem++
 DISTVERSIONPREFIX=	v
 DISTVERSION=	4.12
+PORTREVISION=	1
 CATEGORIES=	math science
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Partial differential equation solver
 WWW=		https://freefem.org/index.html
 
 LICENSE=	LGPL3
 
 BUILD_DEPENDS=	bash:shells/bash		\
 		gmm++>0:math/gmm++		\
 		pipe:misc/pipe			\
 		tetgen:math/tetgen
 LIB_DEPENDS=	libhdf5.so:science/hdf5		\
 		libamd.so:math/suitesparse-amd	\
 		libcholmod.so:math/suitesparse-cholmod \
 		libcolamd.so:math/suitesparse-colamd \
 		libumfpack.so:math/suitesparse-umfpack	\
 		libarpack.so:math/arpack-ng	\
 		libfftw3.so:math/fftw3		\
 		libgsl.so:math/gsl		\
 		libipopt.so:math/ipopt		\
 		libmetis.so:math/metis		\
 		libscotch.so:cad/scotch		\
 		libcmumps.so:math/mumps		\
 		libnlopt.so:math/nlopt		\
 		libsuperlu.so:math/superlu	\
 		libsz.so:science/libaec
 RUN_DEPENDS=	bash:shells/bash		\
 		pipe:misc/pipe
 
 USES=		autoreconf bison blaslapack:openblas compiler:c++14-lang fortran	\
 		gl gmake localbase perl5 pkgconfig shebangfix xorg
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	FreeFem
 GH_PROJECT=	FreeFem-sources
 
 SHEBANG_GLOB=	ff-pkg-download.in
 SHEBANG_FILES=	examples/CheckAllEdp ./examples/misc/speedtest.sh
 
 CPPFLAGS+=	-I${LOCALBASE}/include/superlu
 .if !defined{WITH_DEBUG}
 LDFLAGS+=	-s
 .endif
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CNOFLAGS="${CFLAGS}" LIBS=-lz
 CONFIGURE_ARGS=	--disable-download		\
 		--without-mpi			\
 		--with-blas=${BLASLIB}		\
 		--with-lapack=${LAPACKLIB}
 
 USE_GL=		gl glu glut
 
 OPTIONS_DEFINE=	EXAMPLES
 OPTIONS_DEFAULT=EXAMPLES
 
 PORTEXAMPLES=	*
 
 PLIST_SUB=	VER=${PORTVERSION}
 DATADIR=	${PREFIX}/share/FreeFEM/${PORTVERSION}
 
 TEST_TARGET=	check
 
 pre-configure:
 	@${REINPLACE_CMD} -e 's|-llapack|${LAPACKLIB}|' ${WRKSRC}/configure.ac
 
 post-install:
 	@${MV} ${STAGEDIR}${DATADIR}/examples ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/math/g2o/Makefile b/math/g2o/Makefile
index 9f27e65cc461..cecc3455ee31 100644
--- a/math/g2o/Makefile
+++ b/math/g2o/Makefile
@@ -1,73 +1,74 @@
 PORTNAME=	g2o
 DISTVERSION=	20230223
+PORTREVISION=	1
 DISTVERSIONSUFFIX=	_git
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	General framework for graph optimization
 WWW=		https://openslam-org.github.io/g2o.html
 
 LICENSE=	LGPL3 GPLv3
 LICENSE_COMB=	dual
 
 LIB_DEPENDS=	libamd.so:math/suitesparse-amd \
 		libcamd.so:math/suitesparse-camd \
 		libccolamd.so:math/suitesparse-ccolamd \
 		libcholmod.so:math/suitesparse-cholmod \
 		libcolamd.so:math/suitesparse-colamd \
 		libcxsparse.so:math/suitesparse-cxsparse \
 		libQGLViewer-qt5.so:graphics/libQGLViewer \
 		libmetis.so:math/metis \
 		libopenblas.so:math/openblas \
 		libsuitesparseconfig.so:math/suitesparse-config
 TEST_DEPENDS=	googletest>0:devel/googletest
 
 USES=		cmake:testing compiler:c++14-lang gl eigen:3 blaslapack:netlib localbase qt:5
 USE_GL=		gl glu
 USE_QT=		core gui opengl xml widgets buildtools:build qmake:build
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	RainerKuemmerle
 
 CMAKE_OFF=	DO_SSE_AUTODETECT
 CMAKE_TESTING_ON=	BUILD_UNITTESTS
 
 OPTIONS_DEFINE=			FAST_MATH
 OPTIONS_SINGLE=			SIMD_${ARCH:tu}
 OPTIONS_SINGLE_SIMD_AMD64=	NOSSE SSE2 SSE3 SSE41 SSE42 SSE4A
 OPTIONS_SINGLE_SIMD_I386=	${OPTIONS_SINGLE_SIMD_AMD64}
 OPTIONS_DEFAULT_amd64=		SSE2
 OPTIONS_DEFAULT_i386=		SSE2
 
 SIMD_AMD64_DESC=	Use SSE SIMD optimizations
 SIMD_I386_DESC=		${SIMD_AMD64_DESC}
 FAST_MATH_DESC=		Enable fast math operations
 NOSSE_DESC=		Do not use SIMD optimization
 SSE2_DESC=		SSE2 optimization
 SSE3_DESC=		SSE3 optimization
 SSE41_DESC=		SSE41 optimization
 SSE42_DESC=		SSE42 optimization
 SSE4A_DESC=		SSE4a optimization
 
 FAST_MATH_CMAKE_BOOL=	G2O_FAST_MATH
 NOSSE_CMAKE_ON=		-DDISABLE_SSE2:BOOL=ON -DDISABLE_SSE3:BOOL=ON -DDISABLE_SSE4_1:BOOL=ON -DDISABLE_SSE4_2:BOOL=ON -DDISABLE_SSE4_A:BOOL=ON
 SSE2_CMAKE_ON=		-DDISABLE_SSE3:BOOL=ON -DDISABLE_SSE4_1:BOOL=ON -DDISABLE_SSE4_2:BOOL=ON -DDISABLE_SSE4_A:BOOL=ON
 SSE3_CMAKE_ON=		-DDISABLE_SSE4_1:BOOL=ON -DDISABLE_SSE4_2:BOOL=ON -DDISABLE_SSE4_A:BOOL=ON
 SSE41_CMAKE_ON=		-DDISABLE_SSE4_2:BOOL=ON -DDISABLE_SSE4_A:BOOL=ON
 SSE42_CMAKE_ON=		-DDISABLE_SSE4_A:BOOL=ON
 SSE4A_CMAKE_ON=		# empty to make portlint happy
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} != amd64 && ${ARCH} != i386
 CMAKE_ARGS+=	-DDISABLE_SSE2:BOOL=ON -DDISABLE_SSE3:BOOL=ON -DDISABLE_SSE4_1:BOOL=ON -DDISABLE_SSE4_2:BOOL=ON -DDISABLE_SSE4_A:BOOL=ON
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/include|${LOCALBASE}/include|' \
 		${WRKSRC}/cmake_modules/*.cmake
 
 # tests fail to compile, see https://github.com/RainerKuemmerle/g2o/issues/641
 
 .include <bsd.port.mk>
diff --git a/math/gau2grid/Makefile b/math/gau2grid/Makefile
index 4ac64f8491f7..acdee4aac187 100644
--- a/math/gau2grid/Makefile
+++ b/math/gau2grid/Makefile
@@ -1,25 +1,26 @@
 PORTNAME=	gau2grid
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.0.7
+PORTREVISION=	1
 CATEGORIES=	math python
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Fast computation of a gaussian and its derivative on a grid
 WWW=		https://github.com/dgasmith/gau2grid
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 ONLY_FOR_ARCHS=	amd64 i386 powerpc64 powerpc64le
 ONLY_FOR_ARCHS_REASON=	BUG: ValueError: descr is not a valid dtype descriptor: '<f16' (see https://github.com/dgasmith/gau2grid/issues/25)
 
 BUILD_DEPENDS=	${PYNUMPY}
 
 USES=		cmake compiler:c11 python:build # C code build depends on python to generate some headers
 USE_GITHUB=	yes
 GH_ACCOUNT=	dgasmith
 USE_LDCONFIG=	yes
 
 CMAKE_OFF=	ENABLE_XHOST
 
 .include <bsd.port.mk>
diff --git a/math/ggobi/Makefile b/math/ggobi/Makefile
index 6dca5b8c2a80..8314bc97502d 100644
--- a/math/ggobi/Makefile
+++ b/math/ggobi/Makefile
@@ -1,40 +1,40 @@
 PORTNAME=	ggobi
 PORTVERSION=	2.1.11
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	math graphics
 MASTER_SITES=	http://www.ggobi.org/downloads/
 
 MAINTAINER=	rhurlin@FreeBSD.org
 COMMENT=	Data visualization system
 WWW=		http://www.ggobi.org/
 
 LICENSE=	EPL
 
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libcgraph.so:graphics/graphviz \
 		libltdl.so:devel/libltdl
 
 USES=		desktop-file-utils gnome libtool pathfix pkgconfig tar:bzip2
 USE_GNOME=	cairo gdkpixbuf2 glib20 gtk20 libxml2
 USE_GCC=	yes
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--with-all-plugins
 
 SUB_FILES=	pkg-message
 
 ALL_TARGET=	all ggobirc
 INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE=	DOCS
 
 post-build:
 	@${REINPLACE_CMD} -e 's|plugin.la|plugin.so|g' ${WRKSRC}/ggobirc
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/xdg/ggobi
 	${INSTALL_DATA} ${WRKSRC}/ggobirc ${STAGEDIR}${PREFIX}/etc/xdg/ggobi/ggobirc.sample
 
 .include <bsd.port.mk>
diff --git a/math/giacxcas/Makefile b/math/giacxcas/Makefile
index add892ead9d4..286634baf377 100644
--- a/math/giacxcas/Makefile
+++ b/math/giacxcas/Makefile
@@ -1,154 +1,154 @@
 PORTNAME=	giacxcas
 DISTVERSION=	1.9.0-21
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	http://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source/:giac \
 		http://cocoa.dima.unige.it/cocoalib/tgz/:cocoa \
 		http://www-fourier.ujf-grenoble.fr/~parisse/giac/freebsd/
 DISTFILES=	giac_${DISTVERSION}${EXTRACT_SUFX}:giac \
 		CoCoALib-${COCOA_LIB_VERSION}.tgz:cocoa \
 		fltk-giac.tar.gz
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Computer algebra system
 WWW=		https://www-fourier.ujf-grenoble.fr/~parisse/giac.html
 
 LICENSE=	GPLv3 DOC
 LICENSE_COMB=	multi
 LICENSE_NAME_DOC=	French documentation
 LICENSE_TEXT_DOC=	French documentation is for non-commercial use only
 LICENSE_FILE_GPLv3=	${WRKSRC}/COPYING
 LICENSE_PERMS_DOC=	dist-mirror pkg-mirror auto-accept
 LICENSE_DISTFILES_DOC=	giac_${DISTVERSION}${EXTRACT_SUFX}
 
 BUILD_DEPENDS=	bash:shells/bash
 LIB_DEPENDS=	libao.so:audio/libao \
 		libcurl.so:ftp/curl \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libgsl.so:math/gsl \
 		libglpk.so:math/glpk \
 		libgmp.so:math/gmp \
 		libecm.so:math/gmp-ecm \
 		libmpfr.so:math/mpfr \
 		libmpfi.so:math/mpfi \
 		libpari.so:math/pari \
 		libpng.so:graphics/png \
 		libnauty.so:math/nauty \
 		libcliquer.so:math/cliquer \
 		libsamplerate.so:audio/libsamplerate
 RUN_DEPENDS=	xdg-open:devel/xdg-utils
 
 USES=		blaslapack compiler:c++14-lang desktop-file-utils fortran \
 		gettext gl gmake gnome jpeg libtool localbase ncurses perl5 \
 		python readline shebangfix tex xorg
 GNU_CONFIGURE=	yes
 USE_GL=		gl
 USE_XORG=	x11 xcursor xext xft xi xinerama
 USE_TEX=	latex:build dvipsk:build
 USE_PERL5=	run
 USE_LDCONFIG=	yes
 # Warning:  don't remove the USE_GCC without a runtime test *after* make install
 #USE_GCC=	yes
 CONFIGURE_ENV=	ac_cv_lib_X11_main=yes \
 		ac_cv_lib_cocoa_main=yes \
 		ac_cv_lib_fltk_gl_main=yes \
 		ac_cv_lib_fltk_main=yes \
 		ac_cv_lib_fltk_images_main=yes \
 		ac_cv_lib_jpeg_main=yes
 SHEBANG_FILES=	src/pgiac micropython-1.12/docs/conf.py
 
 INSTALL_TARGET=	install-strip
 
 COCOA_LIB_VERSION=	0.99700
 
 CPPFLAGS+=	-I${COCOALIB-GIAC}/include \
 		-I${FLTKDEV-GIAC} \
 		-Wno-narrowing
 LDFLAGS+=	-L${COCOALIB-GIAC}/lib \
 		-L${FLTKDEV-GIAC}/lib
 
 WRKSRC=		${WRKDIR}/giac-${DISTVERSION:C/-[0-9]*//}
 FLTKDEV-GIAC=	${WRKDIR}/fltk-1.3.0
 COCOALIB-GIAC=	${WRKDIR}/CoCoALib-${COCOA_LIB_VERSION}
 TEST_TARGET=	check
 
 DATADIR=	${PREFIX}/share/giac
 DOCSDIR=	${PREFIX}/share/doc/giac
 EXAMPLESDIR=	${PREFIX}/share/examples/giac
 
 INFO=		giac_es giac_us
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 #NB: built of giacxcas with USE_GCC and nlt is successfull if the ntl port is also
 #    installed  with USE_GCC
 CONFIGURE_ARGS+=	--disable-ntl
 CONFIGURE_ARGS+=	--disable-micropy # it causes SEGV in xcas in the nlr_push call from execute_from_lexer@main.c
 
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
 post-extract:
 	@${FIND} ${WRKSRC}/examples/Exemples -name "._*" -delete
 
 post-patch:
 	@${GREP} -Rl --null /bin/bash ${COCOALIB-GIAC} | ${XARGS} -0 \
 		${REINPLACE_CMD} -e 's|/bin/bash|/usr/bin/env bash|'
 	@${REINPLACE_CMD} -e '/^SUBDIR/s|examples||' \
 		${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e 's|/usr/bin|${LOCALBASE}/bin|' \
 		${WRKSRC}/xcas.applications
 	@${REINPLACE_CMD} -e 's|cp -f \*|$$(INSTALL_DATA) WARNINGS [a-z]*|' \
 		${WRKSRC}/doc/el/*/Makefile.in
 	@${REINPLACE_CMD} -e '/browser=/s|"mozilla"|"xdg-open"|' \
 		${WRKSRC}/src/global.cc
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} \
 		${REINPLACE_CMD} -e 's|$$(prefix)/share/giac/doc|$$(docdir)|'
 	@${FIND} ${COCOALIB-GIAC} -name "Makefile" | ${XARGS} \
 		${REINPLACE_CMD} -e \
 		's|\($$(MAKE) \)-s |\1|; s|\([[:blank:]]\)@|\1|'
 	@${REINPLACE_CMD} -e '/.SILENT:/s|^|#|' \
 		${FLTKDEV-GIAC}/makeinclude.in
 	${SED} -i ".orig" -Ee 's|char \*last = style \+ strlen\(style\) - 2|char *last = pretty|' \
 		-Ee 's|\*style = 0|last = style + strnlen(style, ENDOFBUFFER) - 2; *style = 0|' \
 		${FLTKDEV-GIAC}/src/fl_set_fonts_xft.cxx
 
 pre-configure:
 	${REINPLACE_CMD} -e 's|/usr/lib  /usr/lib64  /usr/lib32  /usr/local  /opt/local/lib  /sw/lib  /usr/sfw/lib|${LOCALBASE}/lib|' \
 		-e '/libgmp.a/s|find|#find|' \
 		-e 's|-name  libgmp.so|-type f -name "libgmp.so.*"|' \
 		${COCOALIB-GIAC}/configuration/gmp-find.sh
 	${REINPLACE_CMD} -e 's|^protected:|public:|' ${FLTKDEV-GIAC}/FL/Fl_Widget.H
 .for f in icas.cc path.h
 	${REINPLACE_CMD} -e 's|/usr/local/share/giac/doc|${DOCSDIR}|' \
 		${WRKSRC}/src/${f}
 .endfor
 	${FIND} ${WRKSRC}/doc -type f | ${XARGS} ${GREP} -l 'share/giac/doc' | \
 		${XARGS} ${REINPLACE_CMD} -e 's|/usr/local/share/giac/doc|${DOCSDIR}|'
 	${FIND} ${WRKSRC}/micropython-1.12 -type f | ${XARGS}	\
 		${GREP} -l "/usr/bin/env python3" | ${XARGS}	\
 		${REINPLACE_CMD} -e 's|/usr/bin/env python3|${PYTHON_CMD}|'
 	${FIND} ${WRKSRC}/micropython-1.12 -type f | ${XARGS}	\
 		${GREP} -l "python3 \|'python3'\|= python3\|^python3" | ${XARGS}	\
 		${REINPLACE_CMD} -e "s|python3 |${PYTHON_CMD} |;s|'python3'|'${PYTHON_CMD}'|"	\
 			-e "s|= python3|= ${PYTHON_CMD}|;s|^python3|${PYTHON_CMD}|"
 	@(cd ${COCOALIB-GIAC} && ${SETENV} ${CONFIGURE_ENV} ./configure \
 		--with-cxx="${CXX}")
 	@(cd ${FLTKDEV-GIAC} && ${SETENV} ${CONFIGURE_ENV} ./configure \
 		--prefix=${FLTKDEV-GIAC} \
 		CXX="${CXX}" CXXFLAGS="${CXXFLAGS}")
 
 post-configure:	# malloc.h on 13-CURRENT is missing mallinfo and compilation fails after it is discovered
 	@${FIND} ${WRKSRC} -name config.h | ${XARGS} ${REINPLACE_CMD} -e 's|#define HAVE_MALLOC_H 1|/* #undef HAVE_MALLOC_H */|'
 
 pre-build:
 	@cd ${COCOALIB-GIAC} && ${DO_MAKE_BUILD} \
 		CXXFLAGS_SPECIFIC="${CXXFLAGS}" library
 	@cd ${FLTKDEV-GIAC}/src && ${DO_MAKE_BUILD}
 
 post-install-EXAMPLES-on:
 	cd ${WRKSRC}/examples && ${COPYTREE_SHARE} "Exemples [a-z]*" \
 		${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/math/gnome-calculator/Makefile b/math/gnome-calculator/Makefile
index 2a7024731f13..48cfd6da2a69 100644
--- a/math/gnome-calculator/Makefile
+++ b/math/gnome-calculator/Makefile
@@ -1,32 +1,32 @@
 PORTNAME=	gnome-calculator
 PORTVERSION=	43.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math gnome
 MASTER_SITES=	GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
 DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME calculator tool
 WWW=		https://live.gnome.org/Gcalctool
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	itstool:textproc/itstool
 LIB_DEPENDS=	libadwaita-1.so:x11-toolkits/libadwaita \
 		libgee-0.8.so:devel/libgee \
 		libhandy-1.so:x11-toolkits/libhandy \
 		libmpc.so:math/mpc \
 		libmpfr.so:math/mpfr \
 		libsoup-3.0.so:devel/libsoup3
 
 PORTSCOUT=	limitw:1,even
 
 USES=		compiler:c11 gettext gnome localbase:ldflags meson pkgconfig \
 		python:3.6+,build tar:xz vala:build
 USE_GNOME=	gtk40 gtksourceview5 introspection libxml2
 BINARY_ALIAS=	python3=${PYTHON_VERSION}
 
 GLIB_SCHEMAS=	org.gnome.calculator.gschema.xml
 
 .include <bsd.port.mk>
diff --git a/math/grace/Makefile b/math/grace/Makefile
index 4d4b31fabdee..cbf68e0d03d9 100644
--- a/math/grace/Makefile
+++ b/math/grace/Makefile
@@ -1,77 +1,77 @@
 PORTNAME=	grace
 PORTVERSION=	5.1.25
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	math print
 MASTER_SITES=	ftp://ftp.fu-berlin.de/unix/graphics/grace/src/stable/ \
 		ftp://ftp.ntua.gr/pub/graphics/grace/src/stable/ \
 		ftp://ftp.u-aizu.ac.jp/pub/SciEng/math/grace/src/stable/ \
 		ftp://plasma-gate.weizmann.ac.il/pub/grace/src/stable/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Powerful 2D plotting tool (successor of xmgr)
 WWW=		https://plasma-gate.weizmann.ac.il/Grace/
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libt1.so:devel/t1lib \
 		libpng.so:graphics/png \
 		libXbae.so:x11-toolkits/xbae
 RUN_DEPENDS=	xdg-open:devel/xdg-utils
 
 USES=		gmake jpeg motif
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-grace-home=${DATADIR} \
 		--with-extra-incpath=${LOCALBASE}/include \
 		--with-extra-ldpath=${LOCALBASE}/lib \
 		--with-helpviewer="xdg-open %s" \
 		--without-bundled-xbae
 MAKE_ARGS=	LINUXDOC="${TRUE}" PDFLATEX="${TRUE}"
 
 DESKTOP_ENTRIES="XMgrace" "2D Plotting tool for scientific data" \
 		"${PREFIX}/share/pixmaps/mini-xmgr3.xpm" "xmgrace" \
 		 "" ""
 
 OPTIONS_DEFINE=		DOCS EXAMPLES FFTW NETCDF PDF XMHTML
 OPTIONS_DEFAULT=	FFTW NETCDF PDF XMHTML
 
 FFTW_CONFIGURE_WITH=	fftw
 FFTW_LIB_DEPENDS=	libfftw.so:math/fftw
 NETCDF_CONFIGURE_ENABLE=	netcdf
 NETCDF_LIB_DEPENDS=	libnetcdf.so:science/netcdf
 PDF_DESC=		PDF output
 PDF_CONFIGURE_ENABLE=	pdfdrv
 PDF_LIB_DEPENDS=	libpdf.so:print/pdflib
 XMHTML_DESC=		XmHTML based on-line help
 XMHTML_CONFIGURE_ENABLE=	xmhtml
 XMHTML_LIB_DEPENDS=	libXmHTML.so:x11-toolkits/xmhtml
 
 post-configure:
 	${REINPLACE_CMD} -e \
 		'/SCRIPTS/s|INSTALL_PROGRAM|INSTALL_SCRIPT|' \
 		${WRKSRC}/auxiliary/Makefile
 	${REINPLACE_CMD} -e \
 		'/cd /!s|$$(GRACE_HOME)/doc|${DOCSDIR}| ; \
 		 /cd /s|$$(GRACE_HOME)/doc|$$(DESTDIR)$$(PREFIX)/man/man1| ; \
 		 /^install/s|$$(MANPAGES)||' \
 		${WRKSRC}/doc/Makefile
 	${REINPLACE_CMD} -e \
 		's|$$(GRACE_HOME)/examples|${EXAMPLESDIR}| ; \
 		 /DOTEST/s|INSTALL_PROGRAM|INSTALL_SCRIPT|' \
 		${WRKSRC}/examples/Makefile
 	${REINPLACE_CMD} -e \
 		's|$$(GRACE_HOME)/include|$$(PREFIX)/include| ; \
 		 s|$$(GRACE_HOME)/lib|$$(PREFIX)/lib|' \
 		${WRKSRC}/grace_np/Makefile
 	${FIND} ${WRKSRC} -name Makefile | ${XARGS} ${REINPLACE_CMD} -e \
 		's|$$(GRACE_HOME)/bin|$$(PREFIX)/bin|'
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/[c-g]*.1 ${STAGEDIR}${MANPREFIX}/man/man1
 	${INSTALL_DATA} ${FILESDIR}/mini-xmgr3.xpm \
 		${STAGEDIR}${PREFIX}/share/pixmaps
 	${LN} -sf xmgrace ${STAGEDIR}${PREFIX}/bin/grace
 	${LN} -sf grace.1 ${STAGEDIR}${MANPREFIX}/man/man1/xmgrace.1
 	${LN} -sf ${DOCSDIR} ${STAGEDIR}${DATADIR}/doc
 	${LN} -sf ${EXAMPLESDIR} ${STAGEDIR}${DATADIR}/examples
 
 .include <bsd.port.mk>
diff --git a/math/gravity/Makefile b/math/gravity/Makefile
index a1062debc59f..fc149b2c964d 100644
--- a/math/gravity/Makefile
+++ b/math/gravity/Makefile
@@ -1,42 +1,42 @@
 PORTNAME=	gravity
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.1-20220309
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 PKGNAMEPREFIX=	coin-or-
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Mathematical modeling for optimization and machine learning
 WWW=		https://www.gravityopt.com/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${LOCALBASE}/include/boost/graph/adjacency_list.hpp:devel/boost-libs
 LIB_DEPENDS=	libblas.so:math/blas \
 		libCbc.so:math/cbc \
 		libCgl.so:math/cgl \
 		libClp.so:math/clp \
 		libcoinasl.so:math/asl \
 		liblapack.so:math/lapack \
 		libopenblas.so:math/openblas
 
 USES=		cmake compiler:c++11-lang eigen:3 localbase:ldflags pkgconfig
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	coin-or
 GH_PROJECT=	Gravity
 GH_TAGNAME=	47ac86a
 
 CMAKE_ARGS+=	-DIPOPT_ROOT_DIR=${LOCALBASE}
 CMAKE_ON=	Boost
 CMAKE_OFF=	MP
 CMAKE_OFF+=	Ipopt CoinUtils # fails to find Ipopt and CoinUtils for some reason
 
 do-test:
 	@cd ${BUILD_WRKSRC} && \
 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBUILD_EXAMPLES:BOOL=ON ${CMAKE_SOURCE_PATH} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
 		${WRKSRC}/bin/Release/gravity_test
 
 .include <bsd.port.mk>
diff --git a/math/gretl/Makefile b/math/gretl/Makefile
index 1c199e73a27a..2ea44326cb91 100644
--- a/math/gretl/Makefile
+++ b/math/gretl/Makefile
@@ -1,113 +1,114 @@
 PORTNAME=	gretl
 PORTVERSION=	2023a
+PORTREVISION=	1
 CATEGORIES=	math finance
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${DISTVERSIONFULL}/
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	GNU Regression, Econometrics, and Time-series Library
 WWW=		http://gretl.sourceforge.net/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libfftw3.so:math/fftw3 \
 		libgmp.so:math/gmp \
 		libharfbuzz.so:print/harfbuzz \
 		libjson-glib-1.0.so:devel/json-glib \
 		libmpfr.so:math/mpfr
 
 USES=		compiler:c11 fortran gmake gnome localbase libtool ncurses \
 		pathfix pkgconfig readline tar:xz
 USE_WX=		3.0
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
 
 BINARY_ALIAS=	make=${GMAKE}
 ALL_TARGET=	# empty
 SSP_CFLAGS?=	-fstack-protector # XXX -strong crashes mklang on 12.0+ i386
 CONFIGURE_ENV=	ac_cv_lib_dl_dlopen="" \
 		LAPACK_LIBS="${LAPACK} ${BLAS}"
 
 PLIST_SUB=	GTK_VER=${GTK_VER}
 
 OPTIONS_DEFINE=		ADDONS ATLAS GUI MPI NLS ODBC OPENMP R UNZIP
 OPTIONS_DEFAULT=	ADDONS GUI OPENMP UNZIP
 OPTIONS_SUB=		yes
 
 ADDONS_DESC=		Build gretl addons
 ADDONS_CONFIGURE_ENABLE=	build-addons
 ADDONS_USES=		tex
 ADDONS_USE=			TEX=formats,dvipsk:build
 
 ATLAS_DESC=		Use ATLAS for BLAS and LAPACK
 ATLAS_LIB_DEPENDS=	libatlas.so:math/atlas
 ATLAS_LIB_DEPENDS_OFF=	libblas.so:math/blas \
 			liblapack.so:math/lapack
 ATLAS_VARS=		BLAS=-lf77blas LAPACK="-lalapack -lcblas"
 ATLAS_VARS_OFF=		BLAS=-lblas LAPACK=-llapack
 
 GUI_DESC=		Graphical user interface and plugins
 GUI_CONFIGURE_ON=	--enable-gui=yes
 GUI_CONFIGURE_OFF=	--enable-gui=no --enable-xdg=no
 GUI_USE=		GNOME=cairo,gtksourceview3,gdkpixbuf2
 GUI_USE_OFF=		GNOME=glib20,libxml2
 GUI_VARS=		GTK_VER=3
 GUI_VARS_OFF=		GTK_VER=2
 GUI_USES=		desktop-file-utils shared-mime-info
 GUI_BUILD_DEPENDS=	gnuplot:math/gnuplot
 GUI_LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 			libfontconfig.so:x11-fonts/fontconfig
 GUI_RUN_DEPENDS=	gnuplot:math/gnuplot
 
 MPI_CONFIGURE_WITH=	mpi
 MPI_CONFIGURE_ENV=	MPICC=${LOCALBASE}/bin/mpicc
 MPI_CONFIGURE_ON=	--with-mpi-include=${LOCALBASE}/include/mpi.h --with-mpi-lib=${LOCALBASE}/lib/libmpi.so
 MPI_LIB_DEPENDS=	libmpi.so:net/mpich
 MPI_BROKEN=		checking mpi.h usability... no # need to investigate
 
 NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=		gettext
 
 ODBC_CONFIGURE_WITH=	odbc
 ODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC
 
 OPENMP_CONFIGURE_ENABLE=	openmp
 OPENMP_USE=		GCC=yes
 
 R_DESC=			libR support
 R_CONFIGURE_WITH=	libR
 R_BROKEN=		Doesn't link to R libraries
 
 UNZIP_DESC=		UnZip compression support via libgsf
 UNZIP_CONFIGURE_WITH=	gsf
 UNZIP_USE=		GNOME=libgsf
 
 .if !empty(MACHINE_CPU:Msse2)
 CONFIGURE_ARGS+=	--enable-sse2=yes
 .else
 CONFIGURE_ARGS+=	--enable-sse2=no
 .endif
 
 post-patch:
 	@${SED} -i '.orig' -E -e '/#include[[:blank:]]+<sys\/socket\.h>/\
 		{x; s/.*/#include <netinet\/in.h>/; H; x;}' \
 		${WRKSRC}/configure \
 		${WRKSRC}/plugin/mailer.c
 
 regression-test test check: build
 	@cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \
 		${MAKE_ARGS} check
 
 post-install:
 	# strip
 	@${STRIP_CMD} \
 		${STAGEDIR}${PREFIX}/bin/gretlcli \
 		${STAGEDIR}${PREFIX}/bin/gretl_x11 \
 		${STAGEDIR}${PREFIX}/lib/libgretl-1.0.so.* \
 		${STAGEDIR}${PREFIX}/lib/gretl-gtk3/*.so
 	# rm doc
 	@${RMDIR} ${STAGEDIR}${DATADIR}/doc
 
 .include <bsd.port.mk>
diff --git a/math/gri/Makefile b/math/gri/Makefile
index fb237127cf8f..506f18f984ee 100644
--- a/math/gri/Makefile
+++ b/math/gri/Makefile
@@ -1,73 +1,73 @@
 PORTNAME=	gri
 PORTVERSION=	2.12.23
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	math
 MASTER_SITES=	SF
 
 LICENSE=	GPLv2
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Extensible plotting language for producing scientific graphs
 WWW=		http://gri.sourceforge.net/
 
 LIB_DEPENDS=	libnetcdf.so:science/netcdf
 
 USES=		cpe gmake readline shebangfix makeinfo tex
 SHEBANG_FILES=	doc/examples/FEM.pl src/gri_merge src/gri_unpage
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-FreeBSD
 CPE_VENDOR=	gri_project
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 INFO=		gri
 USE_TEX=	formats:build dvipsk:build
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDOCS} || ${PORT_OPTIONS:MEXAMPLES}
 USES+=		magick:6,build
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e \
 		'/^SUBDIRS/s|doc||' ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e \
 		'/gzip/s|^|#| ; \
 		 /EXAMPLES_DIR/s|^|#|' ${WRKSRC}/doc/Makefile.in
 
 post-build:
 .if ${PORT_OPTIONS:MDOCS} || ${PORT_OPTIONS:MEXAMPLES}
 	(cd ${WRKSRC}/doc && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \
 		${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
 .else
 	(cd ${WRKSRC}/doc && makeinfo gri.texi)
 .endif
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
 	(cd ${WRKSRC}/doc && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \
 		${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
 .else
 	${INSTALL_MAN} ${WRKSRC}/doc/gri-manpage.1 \
 		${STAGEDIR}${MANPREFIX}/man/man1/gri.1
 	${INSTALL_MAN} ${WRKSRC}/doc/gri_merge.1-skel \
 		${STAGEDIR}${MANPREFIX}/man/man1/gri_merge.1
 	${INSTALL_MAN} ${WRKSRC}/doc/gri_unpage.1-skel \
 		${STAGEDIR}${MANPREFIX}/man/man1/gri_unpage.1
 	${INSTALL_DATA} ${WRKSRC}/doc/gri.info* ${STAGEDIR}${PREFIX}/${INFO_PATH}
 .endif
 .if ${PORT_OPTIONS:MEXAMPLES}
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	(cd ${WRKSRC}/doc/examples && ${INSTALL_DATA} model* *.dat *.gri e*.ps \
 		${STAGEDIR}${EXAMPLESDIR})
 	(cd ${WRKSRC}/doc/examples \
 		&& ${INSTALL_SCRIPT} FEM.pl ${STAGEDIR}${EXAMPLESDIR})
 .endif
 
 .include <bsd.port.mk>
diff --git a/math/heyoka/Makefile b/math/heyoka/Makefile
index 536be6ad4e95..48d48dfcc54b 100644
--- a/math/heyoka/Makefile
+++ b/math/heyoka/Makefile
@@ -1,36 +1,36 @@
 PORTNAME=	heyoka
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.21.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	C++ library for ODE integration via Taylor's method and LLVM
 WWW=		https://bluescarni.github.io/heyoka/
 
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libboost_serialization.so:devel/boost-libs \
 		libfmt.so:devel/libfmt \
 		libgmp.so:math/gmp \
 		libmp++.so:math/mppp \
 		libmpc.so:math/mpc \
 		libmpfr.so:math/mpfr \
 		libtbb.so:devel/onetbb \
 		libsleef.so:math/sleef \
 		libspdlog.so:devel/spdlog
 TEST_DEPENDS=	xtensor>0:math/xtensor \
 		xtensor-blas>0:math/xtensor-blas
 
 USES=		cmake:testing compiler:c++17-lang llvm:min=15,build,run
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	bluescarni
 
 CMAKE_ON=		HEYOKA_WITH_MPPP HEYOKA_WITH_SLEEF
 CMAKE_ARGS=		-DFREEBSD_LLVM_VERSION=${LLVM_VERSION}
 CMAKE_TESTING_ON=	HEYOKA_BUILD_TESTS # 3 tests fail, see https://github.com/bluescarni/heyoka/issues/228, also #229 and #230
 
 .include <bsd.port.mk>
diff --git a/math/highs/Makefile b/math/highs/Makefile
index 4a021045afbc..d4d44adea9e0 100644
--- a/math/highs/Makefile
+++ b/math/highs/Makefile
@@ -1,30 +1,31 @@
 PORTNAME=	highs
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.5.1
+PORTREVISION=	1
 CATEGORIES=	math
 PKGNAMEPREFIX=	coin-or-
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Solver for large scale sparse linear programming (LP) problems
 WWW=		https://github.com/ERGO-Code/HiGHS
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libOsi.so:math/osi
 
 USES=		blaslapack cmake:testing compiler:c++11-lang pkgconfig
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	ERGO-Code
 GH_PROJECT=	HiGHS
 
 CMAKE_OFF=	BUILD_TESTING
 
 post-install: # see https://github.com/ERGO-Code/HiGHS/issues/502
 	${RM} -r ${STAGEDIR}${PREFIX}/external
 
 # one test fails, see https://github.com/ERGO-Code/HiGHS/issues/1132
 # tests fail to build on i386: undefined reference to fmax, see https://github.com/ERGO-Code/HiGHS/issues/505
 
 .include <bsd.port.mk>
diff --git a/math/hmat-oss/Makefile b/math/hmat-oss/Makefile
index 2df5f600726c..d143a9cd3e3e 100644
--- a/math/hmat-oss/Makefile
+++ b/math/hmat-oss/Makefile
@@ -1,36 +1,37 @@
 PORTNAME=	hmat-oss
 DISTVERSION=	1.8.1
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Hierarchical matrix C/C++ library
 WWW=		https://github.com/jeromerobert/hmat-oss
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 LIB_DEPENDS=	liblapacke.so:math/lapacke \
 		libblas.so:math/blas \
 		liblapack.so:math/lapack \
 		libopenblas.so:math/openblas
 
 USES=		cmake
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	jeromerobert
 
 CMAKE_ARGS=	-DBLAS_LIBRARIES:STRING=${LOCALBASE}/lib/libopenblas.so \
 		-DLAPACK_LIBRARIES:STRING=${LOCALBASE}/lib/libopenblas.so
 CMAKE_OFF=	HMAT_GIT_VERSION
 
 LDFLAGS+=	-lexecinfo
 
 do-test:
 	@cd ${BUILD_WRKSRC} && \
 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBUILD_EXAMPLES:BOOL=ON ${CMAKE_SOURCE_PATH} && \
 		${REINPLACE_CMD} "s|#define OPENBLAS_DISABLE_THREADS|\/\/&|" ${BUILD_WRKSRC}/config.h && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
 
 .include <bsd.port.mk>
diff --git a/math/hpipm/Makefile b/math/hpipm/Makefile
index f07b74bfd35f..c9d6b2a086ce 100644
--- a/math/hpipm/Makefile
+++ b/math/hpipm/Makefile
@@ -1,28 +1,29 @@
 PORTNAME=	hpipm
 DISTVERSION=	0.1.3-119
+PORTREVISION=	1
 DISTVERSIONSUFFIX=	-gb140f36
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	High-performance interior-point-method QP solvers
 WWW=		https://github.com/giaf/hpipm
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 LIB_DEPENDS=	libblasfeo.so:math/blasfeo
 
 USES=		cmake localbase
 USE_GITHUB=	yes
 GH_ACCOUNT=	giaf
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 CMAKE_ARGS=	-DHPIPM_BLASFEO_LIB=Shared
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} != amd64 && ${ARCH} != i386
 CMAKE_ARGS+=	-DAVX:BOOL=OFF
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/math/hptt/Makefile b/math/hptt/Makefile
index c79588c67b64..3f7471d1a920 100644
--- a/math/hptt/Makefile
+++ b/math/hptt/Makefile
@@ -1,27 +1,28 @@
 PORTNAME=	hptt
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.0.5-18
+PORTREVISION=	1
 DISTVERSIONSUFFIX=	-g9425386
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	High-Performance Tensor Transpose library
 WWW=		https://github.com/springer13/hptt
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 TEST_DEPENDS=	gmake:devel/gmake
 
 USES=		cmake:testing compiler:c++11-lang
 USE_GCC=	yes # workaround for https://github.com/springer13/hptt/issues/21
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	springer13
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 
 do-test: # tests fail to build, see https://github.com/springer13/hptt/issues/23
 	@cd ${WRKSRC}/testframework && ${SETENV} ${MAKE_ENV} ${GMAKE} FREEBSD_GCC_DEFAULT=${GCC_DEFAULT} all
 
 .include <bsd.port.mk>
diff --git a/math/hsl/Makefile b/math/hsl/Makefile
index 7edb9d5fe368..555d3fb72c60 100644
--- a/math/hsl/Makefile
+++ b/math/hsl/Makefile
@@ -1,30 +1,31 @@
 PORTNAME=	hsl
 DISTVERSIONPREFIX=	releases/
 DISTVERSION=	2.2.1
+PORTREVISION=	1
 CATEGORIES=	math
 PKGNAMEPREFIX=	coin-or-
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	COIN-OR autotools harness to build HSL linear solvers
 WWW=		https://github.com/coin-or-tools/ThirdParty-HSL
 
 LICENSE=	EPL
 
 USES=		fortran gmake libtool pkgconfig
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	coin-or-tools
 GH_PROJECT=	ThirdParty-HSL
 
 GNU_CONFIGURE=	yes
 
 INSTALL_TARGET=	install-strip
 
 PLIST_FILES=	include/coin-or/hsl/CoinHslConfig.h \
 		lib/libcoinhsl.so \
 		lib/libcoinhsl.so.7 \
 		lib/libcoinhsl.so.7.2.1 \
 		libdata/pkgconfig/coinhsl.pc
 
 .include <bsd.port.mk>
diff --git a/math/hydrogen/Makefile b/math/hydrogen/Makefile
index f2dcbe6e5526..d345eacb8abf 100644
--- a/math/hydrogen/Makefile
+++ b/math/hydrogen/Makefile
@@ -1,43 +1,43 @@
 PORTNAME=	hydrogen
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.5.1-29
-PORTREVISION=	1
+PORTREVISION=	2
 DISTVERSIONSUFFIX=	-gebfbc6418
 CATEGORIES=	math
 PKGNAMESUFFIX=	-linear-algebra
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Dense and sparse linear algebra, conic optimization, lattice reduction
 WWW=		https://github.com/LLNL/Elemental
 
 LICENSE=	BSD2CLAUSE
 
 BUILD_DEPENDS=	cereal>0:devel/cereal
 LIB_DEPENDS=	libopenblas.so:math/openblas
 
 USES=		cmake:testing compiler:c++17-lang
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	LLNL
 GH_PROJECT=	Elemental
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 CMAKE_OFF=	Hydrogen_ENABLE_TESTING
 CMAKE_TESTING_OFF=	Hydrogen_ENABLE_TESTING # tests fail to configure, see https://github.com/LLNL/Elemental/issues/140
 
 OPTIONS_SINGLE=		MPI
 OPTIONS_SINGLE_MPI=	MPICH OPENMPI
 OPTIONS_DEFINE=		MPC
 OPTIONS_DEFAULT=	MPICH # should be same as in misc/lbann
 
 MPICH_USES=		mpi:mpich
 
 MPC_DESC=		Use MPC(+MPFR+GMP) library and enable related features
 MPC_CMAKE_BOOL=		Hydrogen_ENABLE_MPC
 MPC_BROKEN=		fails to enable: Disabling MPFR since MPI_LONG_LONG was not detected
 
 OPENMPI_USES=		mpi:openmpi
 
 BINARY_ALIAS=	git=false
 
 .include <bsd.port.mk>
diff --git a/math/ignition-math/Makefile b/math/ignition-math/Makefile
index 14b283e9dc60..7eec5754ef40 100644
--- a/math/ignition-math/Makefile
+++ b/math/ignition-math/Makefile
@@ -1,35 +1,35 @@
 PORTNAME=	ignition-math
 DISTVERSION=	6.0.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	math
 MASTER_SITES=	https://bitbucket.org/${BB_ACCOUNT}/${BB_PROJECT}/get/${BB_COMMIT}.tar.gz?dummy=/
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	General purpose math library for robot applications
 WWW=		https://ignitionrobotics.org/home
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	ignition-cmake==2:devel/ignition-cmake
 
 USES=		compiler:c++17-lang cmake eigen:3
 USE_LDCONFIG=	yes
 
 CMAKE_OFF=	BUILD_TESTING
 
 BB_ACCOUNT=	ignitionrobotics
 BB_PROJECT=	ign-math
 BB_COMMIT=	46f3dd24499c
 
 WRKSRC=		${WRKDIR}/${BB_ACCOUNT}-${BB_PROJECT}-${BB_COMMIT}
 
 PLIST_SUB+=	MATH_IGN_VER=math${DISTVERSION:R:R}
 
 do-test: # one test is known to fail: https://bitbucket.org/ignitionrobotics/ign-math/issues/98
 	@cd ${BUILD_WRKSRC} && \
 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBUILD_TESTING=ON ${CMAKE_SOURCE_PATH} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
 
 .include <bsd.port.mk>
diff --git a/math/igraph/Makefile b/math/igraph/Makefile
index 170d9858e502..92bd92c2a004 100644
--- a/math/igraph/Makefile
+++ b/math/igraph/Makefile
@@ -1,30 +1,31 @@
 PORTNAME=	igraph
 DISTVERSION=	0.10.4
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/${DISTVERSION}/
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Package For Manipulating Undirected And Directed Graphs
 WWW=		https://igraph.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libarpack.so:math/arpack-ng \
 		libcxsparse.so:math/suitesparse-cxsparse \
 		libglpk.so:math/glpk \
 		libgmp.so:math/gmp \
 		libopenblas.so:math/openblas
 
 USES=		bison cmake cpe gnome pathfix
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 
 BINARY_ALIAS=	git=false
 
 pre-configure:
 	@${ECHO} ${DISTVERSION} > ${WRKSRC}/IGRAPH_VERSION
 
 .include <bsd.port.mk>
diff --git a/math/iml/Makefile b/math/iml/Makefile
index 3ab31b9f2042..d72734297ffb 100644
--- a/math/iml/Makefile
+++ b/math/iml/Makefile
@@ -1,23 +1,23 @@
 PORTNAME=	iml
 PORTVERSION=	1.0.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	http://www.cs.uwaterloo.ca/~astorjoh/
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Integer Matrix Library
 WWW=		https://cs.uwaterloo.ca/~astorjoh/iml.html
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libgmp.so:math/gmp
 
 USES=		blaslapack:openblas libtool localbase tar:bz2
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-cblas=${LAPACKLIB} --enable-shared
 USE_LDCONFIG=	yes
 
 TEST_TARGET=	check
 
 .include <bsd.port.mk>
diff --git a/math/ipopt/Makefile b/math/ipopt/Makefile
index 8968c6dfb846..96209ab26154 100644
--- a/math/ipopt/Makefile
+++ b/math/ipopt/Makefile
@@ -1,52 +1,53 @@
 PORTNAME=	Ipopt
 DISTVERSIONPREFIX=	releases/
 DISTVERSION=	3.14.11
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Software package for large-scale nonlinear optimization
 WWW=		https://projects.coin-or.org/Ipopt
 
 LICENSE=	EPL
 
 LIB_DEPENDS=	libcoinasl.so:math/asl \
 		libcoinmetis.so:math/coin-or-metis \
 		libcoinmumps.so:math/coin-or-mumps
 TEST_DEPENDS=	bash:shells/bash
 
 USES=		blaslapack compiler:c++11-lang fortran libtool pathfix \
 		pkgconfig shebangfix
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	coin-or
 
 SHEBANG_FILES=	test/run_unitTests.in
 
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	test
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	PKG_CONFIG_PATH=${PREFIX}/libdata/pkgconfig \
 		CXX="${CXX} -B${LOCALBASE}/bin"
 CONFIGURE_ARGS=	--with-lapack-lib="${LAPACKLIB} -L${LOCALBASE}/lib"	\
 		--with-blas-lib="${BLASLIB} -L${LOCALBASE}/lib" \
 		--disable-java
 
 CXXFLAGS+=	-ffast-math
 DEBUG_CXXFLAGS=	-fomit-frame-pointer
 
 DOCSDIR=	${PREFIX}/share/coin/doc/${PORTNAME}
 
 OPTIONS_DEFINE=		DEBUG
 
 CONFLICTS_BUILD=	coin-or-hsl # coin-or-hsl doesn't contain required by Ipopt code
 
 .include <bsd.port.pre.mk>
 
 .if ${GCC_DEFAULT} >= 10
 # workaround for Rank mismatch between actual argument at (1) and actual argument at (2) (scalar and rank-1)
 FFLAGS+=	-fallow-argument-mismatch
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/math/jags/Makefile b/math/jags/Makefile
index 48b56adc8ff9..451807b70ead 100644
--- a/math/jags/Makefile
+++ b/math/jags/Makefile
@@ -1,87 +1,88 @@
 PORTNAME=	mcmc-jags
 DISTVERSION=	4.3.1
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	SF/mcmc-jags/JAGS/${S}.x/Source/:1 \
 		SF/mcmc-jags/Examples/${S}.x/:2 \
 		SF/mcmc-jags/Manuals/2.x/:3 \
 		SF/mcmc-jags/Manuals/${S}.x/:4
 DISTFILES=	JAGS-${PORTVERSION}${EXTRACT_SUFX}:1
 DIST_SUBDIR=	${PORTNAME}
 EXTRACT_ONLY=	${DISTFILES:M*[12]:C|:.*||}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Just Another Gibbs Sampler
 WWW=		http://mcmc-jags.sourceforge.net/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libltdl.so:devel/libltdl
 
 GNU_CONFIGURE=	yes
 USES=		bison compiler:features fortran gmake libtool localbase pathfix
 USE_GCC=	yes
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 
 WRKSRC=		${WRKDIR}/JAGS-${PORTVERSION}
 
 OPTIONS_SINGLE=	BLAS
 OPTIONS_SINGLE_BLAS=	ATLAS OPENBLAS NETLIB
 
 OPTIONS_DEFAULT+=	OPENBLAS
 
 ATLAS_USES=	blaslapack:atlas
 ATLAS_VARS=	MANUAL_PACKAGE_BUILD=\
 "Choose a BLAS option other than ATLAS for package building."
 NETLIB_USES=	blaslapack:netlib
 OPENBLAS_USES=	blaslapack:openblas
 DOCS_DISTFILES=	jags_developer_manual.pdf:3 jags_installation_manual.pdf:4 \
 		jags_user_manual.pdf:4
 DOCS_PORTDOCS=	${DISTFILES:M*[34]:C|:.*||}
 EXAMPLES_DISTFILES=	classic-bugs.tar.gz:2
 EXAMPLES_PORTEXAMPLES=	*
 
 CONFIGURE_ARGS+=	--with-blas="-L${LOCALBASE}/lib ${BLASLIB}" \
 		 --with-lapack="${LAPACKLIB}"
 
 OPTIONS_SUB=	YES
 PLIST_SUB=	MODULEVERSION=${S}
 S=		${PORTVERSION:C|\..*||}
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 post-patch:
 	@${REINPLACE_CMD} \
 		-e '/@WINDOWS_FALSE@bin_SCRIPTS =/s/jags/mcmc-&/' \
 		-e '/CLEANFILES =/s/jags/mcmc-&/' \
 		-e '/@WINDOWS_FALSE@jags:/s/jags/mcmc-&/' \
 		-e '/@WINDOWS_FALSE@.*rm -f jags/s/jags/mcmc-&/' \
 		-e '/@WINDOWS_FALSE@.*mv jags.tmp jags/s/jags/mcmc-&/2' \
 		${WRKSRC}/src/terminal/Makefile.in
 
 post-patch-EXAMPLES-on:
 	@${SED} -i '' -e '\|JAGS ?=|{s|jags|mcmc-&|;s|/usr/local|${PREFIX}|;}' \
 		${WRKDIR}/classic-bugs/vol[12]/Makefile
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@cd ${_DISTDIR}; ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	@cd ${WRKDIR}/classic-bugs; ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR}
 
 .if defined(MAINTAINER_MODE)
 BUILD_DEPENDS+=	${LOCALBASE}/lib/R/library/coda/R/coda.rdb:math/R-cran-coda
 
 check test: install
 .for i in 1 2
 	@cd ${WRKDIR}/classic-bugs/vol${i}; ${SETENV} ${MAKE_ENV} \
 	${MAKE_CMD} ${MAKE_ARGS} check
 .endfor
 	@${FIND} ${WRKDIR}/classic-bugs -type f -name check.log | ${SORT} | \
 	${XARGS} -tI @  ${CAT} @
 
 .endif
 .include <bsd.port.mk>
diff --git a/math/kahip/Makefile b/math/kahip/Makefile
index 1f36e8a9d130..57e9392a732b 100644
--- a/math/kahip/Makefile
+++ b/math/kahip/Makefile
@@ -1,24 +1,25 @@
 PORTNAME=	kahip
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.14-19
+PORTREVISION=	1
 DISTVERSIONSUFFIX=	-g5956007
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Karlsruhe high quality graph partitioning
 WWW=		https://kahip.github.io/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libmetis.so:math/metis \
 		libmpi.so:net/mpich
 
 USES=		cmake localbase
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	KaHIP
 GH_PROJECT=	KaHIP
 
 .include <bsd.port.mk>
diff --git a/math/kalker/Makefile b/math/kalker/Makefile
index ee4f94829a9d..373fe82c5041 100644
--- a/math/kalker/Makefile
+++ b/math/kalker/Makefile
@@ -1,95 +1,95 @@
 PORTNAME=	kalker
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.0.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 
 MAINTAINER=	ashish@FreeBSD.org
 COMMENT=	Scientific calculator that supports math-like syntax
 WWW=		https://kalker.xyz/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libgmp.so:math/gmp \
 		libmpc.so:math/mpc
 
 USES=		cargo
 USE_GITHUB=	yes
 GH_ACCOUNT=	PaddiM8
 CARGO_CRATES=	aho-corasick-0.7.20 \
 		ansi_term-0.12.1 \
 		atty-0.2.14 \
 		az-1.2.1 \
 		bitflags-1.3.2 \
 		bumpalo-3.12.0 \
 		cc-1.0.78 \
 		cfg-if-1.0.0 \
 		console_error_panic_hook-0.1.7 \
 		dirs-3.0.2 \
 		dirs-next-2.0.0 \
 		dirs-sys-0.3.7 \
 		dirs-sys-next-0.1.2 \
 		fs2-0.4.3 \
 		getrandom-0.2.8 \
 		gmp-mpfr-sys-1.5.0 \
 		hermit-abi-0.1.19 \
 		js-sys-0.3.60 \
 		lazy_static-1.4.0 \
 		libc-0.2.139 \
 		log-0.4.17 \
 		memchr-2.5.0 \
 		nix-0.19.1 \
 		once_cell-1.17.0 \
 		proc-macro2-1.0.50 \
 		quote-1.0.23 \
 		redox_syscall-0.2.16 \
 		redox_users-0.4.3 \
 		regex-1.7.1 \
 		regex-syntax-0.6.28 \
 		rug-1.19.0 \
 		rustyline-7.1.0 \
 		scoped-tls-1.0.1 \
 		scopeguard-1.1.0 \
 		seahorse-1.1.2 \
 		serde-1.0.152 \
 		syn-1.0.107 \
 		test-case-1.2.3 \
 		thiserror-1.0.38 \
 		thiserror-impl-1.0.38 \
 		toml-0.5.11 \
 		unicode-ident-1.0.6 \
 		unicode-segmentation-1.10.0 \
 		unicode-width-0.1.10 \
 		utf8parse-0.2.0 \
 		version_check-0.9.4 \
 		wasi-0.11.0+wasi-snapshot-preview1 \
 		wasm-bindgen-0.2.83 \
 		wasm-bindgen-backend-0.2.83 \
 		wasm-bindgen-futures-0.4.33 \
 		wasm-bindgen-macro-0.2.83 \
 		wasm-bindgen-macro-support-0.2.83 \
 		wasm-bindgen-shared-0.2.83 \
 		wasm-bindgen-test-0.3.33 \
 		wasm-bindgen-test-macro-0.3.33 \
 		web-sys-0.3.60 \
 		winapi-0.3.9 \
 		winapi-i686-pc-windows-gnu-0.4.0 \
 		winapi-x86_64-pc-windows-gnu-0.4.0 \
 		windows-sys-0.42.0 \
 		windows_aarch64_gnullvm-0.42.1 \
 		windows_aarch64_msvc-0.42.1 \
 		windows_i686_gnu-0.42.1 \
 		windows_i686_msvc-0.42.1 \
 		windows_x86_64_gnu-0.42.1 \
 		windows_x86_64_gnullvm-0.42.1 \
 		windows_x86_64_msvc-0.42.1 \
 		winres-0.1.12
 CARGO_CARGOTOML=	${WRKSRC}/cli/Cargo.toml
 CARGO_INSTALL_PATH=	./cli
 PLIST_FILES=	bin/kalker
 
 post-patch:
 	${REINPLACE_CMD} -e 's,%%LOCALBASE%%,${LOCALBASE},g' ${WRKSRC_crate_gmp-mpfr-sys}/build.rs
 
 .include <bsd.port.mk>
diff --git a/math/kktdirect/Makefile b/math/kktdirect/Makefile
index 88c8845204a3..411b6e9c8af8 100644
--- a/math/kktdirect/Makefile
+++ b/math/kktdirect/Makefile
@@ -1,95 +1,95 @@
 PORTNAME=	kktdirect
 PORTVERSION=	0.5
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	math
 MASTER_SITES=	http://www.cs.ubc.ca/~rbridson/download/ LOCAL/bf
 DISTNAME=	KKTDirect${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Direct solver package for saddle-point (KKT) matrices
 WWW=		https://www.cs.ubc.ca/~rbridson/kktdirect/
 
 USES=		fortran
 USE_LDCONFIG=	yes
 
 CFLAGS+=	-DUSE_FORTRAN_BLAS -DUSE_FORTRAN_LAPACK
 LDFLAGS+=	-L${LOCALBASE}/lib ${LAPACK} ${BLAS} -lm
 PLIST_FILES=	include/kktdirect.h lib/libkktdirect.a lib/libkktdirect_pic.a \
 		lib/libkktdirect.so lib/libkktdirect.so.0
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "sparc64"
 PICFLAG?=	-fPIC
 .else
 PICFLAG?=	-fpic
 .endif
 
 .if exists(${LOCALBASE}/lib/libgoto2.so)
 WITH_BLAS?=	gotoblas
 .elif exists(${LOCALBASE}/lib/libatlas.so)
 WITH_BLAS?=	atlas
 .else
 WITH_BLAS?=	reference
 .endif
 
 .if ${WITH_BLAS} == reference
 LIB_DEPENDS+=	libblas.so:math/blas
 LIB_DEPENDS+=	liblapack.so:math/lapack
 BLAS=		-lblas
 LAPACK=		-llapack
 .elif ${WITH_BLAS} == gotoblas
 LIB_DEPENDS+=	libgoto2p.so:math/gotoblas
 BLAS=			-lgoto2p
 LAPACK=		-lgoto2p
 .elif ${WITH_BLAS} == atlas
 LIB_DEPENDS+=	libatlas.so:math/atlas
 BLAS=		-lptf77blas
 LAPACK=		-lalapack -lptcblas
 .endif
 
 PORTDOCS=	kktdirect.pdf
 PORTEXAMPLES=	kktsolve.cpp
 
 post-patch:
 	@${REINPLACE_CMD} -E \
 		-e 's@CPP@CXX@g' \
 		-e '\@^(CC|CXX) =@s@^@#@' \
 		-e 's@^(C|CXX|LD)(FLAGS )(=)(.*)@\1\2+\3 $${PICFLAG}@' \
 		-e 's@ar r@${AR} r@' \
 		-e 's@ranlib@${RANLIB}@' \
 			${WRKSRC}/Makefile
 
 pre-build:
 	${CP} -a ${WRKSRC} ${WRKSRC}_shared
 
 do-build:
 	@cd ${WRKSRC}_shared && ${DO_MAKE_BUILD} PICFLAG="${PICFLAG}" libkktdirect.a && \
 		${CXX} ${CXXFLAGS} -shared -Wl,-soname,libkktdirect.so.0 \
 		-o ${WRKDIR}/libkktdirect.so.0 -Wl,--whole-archive libkktdirect.a \
 		-Wl,--no-whole-archive -Wl,--as-needed ${LDFLAGS} && \
 		${CP} -af libkktdirect.a ${WRKDIR}/libkktdirect_pic.a
 	@cd ${WRKSRC} && ${DO_MAKE_BUILD} PICFLAG="" libkktdirect.a && \
 		${CP} -af libkktdirect.a ${WRKDIR}
 
 do-test:
 	@cd ${WRKSRC} && ${DO_MAKE_BUILD} PICFLAG="" stokes && ./stokes 3
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/kktdirect.h ${STAGEDIR}${PREFIX}/include
 	cd ${WRKDIR} && ${INSTALL_DATA} libkktdirect.a libkktdirect_pic.a \
 		${STAGEDIR}${PREFIX}/lib
 	cd ${WRKDIR} && ${INSTALL_LIB} libkktdirect.so.0 ${STAGEDIR}${PREFIX}/lib
 	cd ${STAGEDIR}${PREFIX}/lib && ${LN} -sf libkktdirect.so.0 libkktdirect.so
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 do-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.post.mk>
diff --git a/math/labplot/Makefile b/math/labplot/Makefile
index 33c3e09cb0d4..1018c72097ca 100644
--- a/math/labplot/Makefile
+++ b/math/labplot/Makefile
@@ -1,59 +1,59 @@
 PORTNAME=	labplot
 DISTVERSION=	2.9.0
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	math kde
 MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Data plotting and function analysis tool by KDE
 WWW=		https://labplot.kde.org/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/LICENSES/GPL-2.0-or-later.txt
 
 LIB_DEPENDS=	libgsl.so:math/gsl \
 		liblz4.so:archivers/liblz4 \
 		libspectre.so:print/libspectre \
 		libsz.so:science/libaec \
 		libreadstat.so:math/readstat
 
 USES=		bison cmake compiler:c++11-lang desktop-file-utils kde:5 qt:5 \
 		shared-mime-info tar:xz xorg
 USE_KDE=	archive attica auth bookmarks codecs completion config configwidgets \
 		coreaddons crash guiaddons i18n iconthemes itemviews \
 		jobwidgets kio newstuff notifications parts \
 		service solid sonnet syntaxhighlighting textwidgets unitconversion \
 		widgetsaddons windowsystem xmlgui \
 		doctools:build ecm:build
 USE_QT=		concurrent core dbus gui network printsupport serialport \
 		sql svg widgets xml \
 		buildtools:build qmake:build testlib:build
 USE_XORG=	x11
 
 CMAKE_OFF=	ENABLE_LIBCERF
 CMAKE_ON=	CMAKE_DISABLE_FIND_PACKAGE_KUserFeedback
 
 DATADIR=	${PREFIX}/share/labplot2
 
 OPTIONS_DEFINE=		CANTOR FITS FFTW3 HDF5 NETCDF
 OPTIONS_DEFAULT=	${OPTIONS_DEFINE}
 
 CANTOR_DESC=		Build with Cantor support
 CANTOR_CMAKE_BOOL=	ENABLE_CANTOR
 CANTOR_LIB_DEPENDS=	libcantorlibs.so:math/cantor \
 			libpoppler.so:graphics/poppler \
 			libpoppler-qt5.so:graphics/poppler-qt5
 FITS_DESC=		Flexible Image Transport System Data Format (FITS) Library
 FITS_CMAKE_BOOL=	ENABLE_FITS
 FITS_LIB_DEPENDS=	libcfitsio.so:astro/cfitsio
 FFTW3_DESC=		Build with FFTW support
 FFTW3_CMAKE_BOOL=	ENABLE_FFTW
 FFTW3_LIB_DEPENDS=	libfftw3.so:math/fftw3
 HDF5_DESC=		Build with HDF5 support
 HDF5_CMAKE_BOOL=	ENABLE_HDF5
 HDF5_LIB_DEPENDS=	libhdf5.so:science/hdf5
 NETCDF_DESC=		Build with NetCDF support
 NETCDF_CMAKE_BOOL=	ENABLE_NETCDF
 NETCDF_LIB_DEPENDS=	libnetcdf.so:science/netcdf
 
 .include <bsd.port.mk>
diff --git a/math/lapack++/Makefile b/math/lapack++/Makefile
index dcdb3c4259f3..6759cfce2f62 100644
--- a/math/lapack++/Makefile
+++ b/math/lapack++/Makefile
@@ -1,45 +1,45 @@
 PORTNAME=	lapack++
 PORTVERSION=	2.5.4
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	math
 MASTER_SITES=	SF/lapackpp \
 		http://math.nist.gov/lapack++/:doc
 DISTNAME=	lapackpp-${PORTVERSION}
 DIST_SUBDIR=	lapackpp
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	fortran@FreeBSD.org
 COMMENT=	Linear Algebra PACKage in C++, a wrapper for LAPACK
 WWW=		https://sourceforge.net/projects/lapackpp/
 
 USES=		fortran gmake pathfix libtool
 
 OPTIONS_DEFINE=	DOCS
 
 OPTIONS_RADIO=		BLAS
 OPTIONS_RADIO_BLAS=	ATLAS NETLIB OPENBLAS
 OPTIONS_DEFAULT=	OPENBLAS
 
 OPENBLAS_USES=	blaslapack:openblas
 NETLIB_USES=	blaslapack:netlib
 ATLAS_USES=	blaslapack:atlas
 
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 BLAS_LIB=	-L${LOCALBASE}/lib ${BLASLIB}
 LAPACK_LIB=	-L${LOCALBASE}/lib ${LAPACKLIB}
 
 #lapack++ forces to use atlas when detected, so we should disable here.
 CONFIGURE_ARGS+=	--with-blas="${BLAS_LIB}" --with-lapack="${LAPACK_LIB}" --disable-atlas --enable-static
 
 DOCS_DISTFILES=	lapack++.ps.gz:doc lapackpp1_1.ps.gz:doc lapackppman1_1.ps.gz:doc lapack++_install.ps.gz:doc
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/lapack++.ps.gz ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/lapack++_install.ps.gz ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/lapackpp1_1.ps.gz ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/lapackppman1_1.ps.gz ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/math/lapack/Makefile b/math/lapack/Makefile
index cf67c56ed09c..3515c585b3c8 100644
--- a/math/lapack/Makefile
+++ b/math/lapack/Makefile
@@ -1,176 +1,176 @@
 PORTNAME?=	lapack
 PORTVERSION=	3.11.0
 .if !(defined(BLAS_SLAVEPORT) || defined(CBLAS_SLAVEPORT) || defined(XLAPACK_SLAVEPORT) || defined(LAPACKE_SLAVEPORT))
-PORTREVISION=	0
+PORTREVISION=	1
 .else
-PORTREVISION?=	0	# Never remove this line, keep PORTREVISION?=0 in case.
+PORTREVISION?=	1	# Never remove this line, keep PORTREVISION?=0 in case.
 .endif
 CATEGORIES=	math
 MASTER_SITES=	https://github.com/Reference-LAPACK/lapack/archive/refs/tags/:src	\
 		http://www.netlib.org/lapack/:man	\
 		LOCAL/thierry/lapack-${PORTVERSION}/:man
 DISTFILES=	v${PORTVERSION:R}${EXTRACT_SUFX}:src
 .if make(makesum) || !(defined(BLAS_SLAVEPORT) || defined(XLAPACK_SLAVEPORT))
 DISTFILES+=	manpages.tgz:man
 .endif
 DIST_SUBDIR=	lapack-${PORTVERSION}
 
 MAINTAINER?=	fortran@FreeBSD.org
 COMMENT?=	Linear Algebra PACKage
 WWW?=		https://www.netlib.org/lapack/
 
 LICENSE?=	BSD3CLAUSE
 
 USES=		cmake:testing cpe fortran
 WRKSRC=		${WRKDIR}/lapack-${PORTVERSION:R}
 # The actual math/scilab needs deprecated functions - to be removed later
 CMAKE_ON=	BUILD_SHARED_LIBS BUILD_DEPRECATED
 USE_LDCONFIG=	yes
 CPE_VENDOR=	lapack_project
 CPE_PRODUCT=	lapack
 
 SVERSION=	${PORTVERSION:R:R}
 PLIST_SUB=	SVERSION="${SVERSION}" VER=${PORTVERSION}
 
 .include <bsd.port.options.mk>
 
 .if defined(BLAS_SLAVEPORT)
 BUILD_WRKSRC=		${CONFIGURE_WRKSRC}/BLAS/SRC
 INSTALL_WRKSRC=		${BUILD_WRKSRC}
 BLASLIB=		libblas.a
 LIBS=			blas
 PLIST_SUB+=		BLAS="" CBLAS="@comment " LAPACK="@comment " XLAPACK="@comment " LAPACKE="@comment "
 .elif defined(CBLAS_SLAVEPORT)
 BUILD_DEPENDS+=		lapack>0:math/lapack
 LIB_DEPENDS+=		libblas.so:math/blas
 CMAKE_ON+=		CBLAS
 BUILD_WRKSRC=		${CONFIGURE_WRKSRC}/CBLAS
 INSTALL_WRKSRC=		${BUILD_WRKSRC}
 CBLASLIB=		libcblas.a
 LIBS=			cblas
 PLIST_SUB+=		BLAS="@comment " CBLAS="" LAPACK="@comment " XLAPACK="@comment " LAPACKE="@comment "
 .elif defined(LAPACKE_SLAVEPORT)
 USES+=			blaslapack
 CMAKE_ON+=		USE_OPTIMIZED_LAPACK LAPACKE
 CMAKE_ARGS+=		-DBLAS_LIBRARIES="${LOCALBASE}/lib/libblas.so"		\
 			-DLAPACK_LIBRARIES="${LOCALBASE}/lib/liblapack.so"
 BUILD_WRKSRC=		${CONFIGURE_WRKSRC}/LAPACKE
 INSTALL_WRKSRC=		${BUILD_WRKSRC}
 LAPACKELIB=		liblapacke.a
 PLIST_SUB+=		BLAS="@comment " CBLAS="@comment " LAPACK="@comment " XLAPACK="@comment " LAPACKE=""
 .elif defined(XLAPACK_SLAVEPORT)
 LIB_DEPENDS+=		libblas.so:math/blas		\
 			liblapack.so:math/lapack	\
 			libxblas.so:math/xblas
 FFLAGS+=		-fallow-argument-mismatch
 CMAKE_ON+=		USE_XBLAS  BUILD_TESTING
 CMAKE_ARGS+=		-DBLAS_LIBRARIES="${LOCALBASE}/lib/libblas.so"
 PLIST_SUB+=		BLAS="@comment " CBLAS="@comment " LAPACK="@comment " XLAPACK="" LAPACKE="@comment "
 .else
 # Upstream recommand to use an optimized BLAS, but it would cause conflicts
 # among the dependencies: for an optimized lapack switch to OpenBLAS.
 # BUILD_TESTING to get tmglib.
 LIB_DEPENDS+=		libblas.so:math/blas
 . if defined(MAINTAINER_MODE)
 USES+=			python:3.6+,build,test
 . endif
 CMAKE_ON+=		USE_OPTIMIZED_BLAS BUILD_TESTING
 CMAKE_ARGS+=		-DBLAS_LIBRARIES="${LOCALBASE}/lib/libblas.so"
 LIBS=			lapack
 PLIST_SUB+=		BLAS="@comment " CBLAS="@comment " LAPACK="" XLAPACK="@comment " LAPACKE="@comment "
 .endif
 
 .include <bsd.port.pre.mk>
 
 post-patch:
 	${SED} -Ee '\
 		s@^(FORTRAN|LOADER)([[:blank:]]*=)(.*)@\1\2 $${FC}@; \
 		s@^(OPTS[[:blank:]]*=)(.*)@\1 $${FFLAGS} $${EXTRAFLAGS}@; \
 		s@^NOOPT[[:blank:]]*=.*@& $${EXTRAFLAGS}@; \
 		s@^(LOADOPTS[[:blank:]]*=)(.*)@\1 $${LDFLAGS} $${EXTRAFLAGS}@; \
 		s@^(CC[[:blank:]]*=)(.*)@@; \
 		s@^(FC[[:blank:]]*=)(.*)@@; \
 		s@^(CFLAGS[[:blank:]]*)(=)(.*)@\1 += $${EXTRAFLAGS}@; \
 		s@^(FFLAGS[[:blank:]]*=)(.*)@@; \
 		s@^(LDFLAGS[[:blank:]]*=)(.*)@@; \
 		\@(BLAS|LAPACKE|RAN)LIB[[:blank:]]*=@d;' \
 			${WRKSRC}/make.inc.example > ${WRKSRC}/make.inc
 
 pre-configure:
 	${REINPLACE_CMD} -e 's@\./lapack_testing\.py@${S} &@' \
 		${WRKSRC}/Makefile
 	${FIND} ${WRKSRC} -name Makefile | ${XARGS}	\
 		${SED} -i ".bak" -e 's|^ifdef|.ifdef|;s|^endif|.endif|'
 .if defined(MAINTAINER_MODE)
 	${REINPLACE_CMD} -e 's|PythonInterp 2.7|PythonInterp ${PYTHON_VER}|'	\
 		${WRKSRC}/CMakeLists.txt
 .endif
 
 post-build:
 .if defined(BLAS_SLAVEPORT)
 	${SED} -e 's|%%LIB%%|blas|g;s|cd SRC|cd BLAS/SRC|;s|SRC/lib|BLAS/SRC/lib|'	\
 		${FILESDIR}/static.mk >> ${BUILD_WRKSRC}/CMakeFiles/blas.dir/build.make
 	(cd ${CONFIGURE_WRKSRC} && ${MAKE} -f BLAS/SRC/CMakeFiles/blas.dir/build.make build-static)
 .elif defined(CBLAS_SLAVEPORT)
 	${SED} -e 's|%%LIB%%|cblas|g;s|cd SRC|cd CBLAS/src|;s|SRC/lib|CBLAS/src/lib|'	\
 		${FILESDIR}/static.mk >> ${BUILD_WRKSRC}/src/CMakeFiles/cblas.dir/build.make
 	(cd ${CONFIGURE_WRKSRC} && ${MAKE} -f CBLAS/src/CMakeFiles/cblas.dir/build.make build-static)
 .elif defined(LAPACKE_SLAVEPORT)
 	${SED} -e 's|%%LIB%%|lapacke|g;s|cd SRC|cd LAPACKE|' ${FILESDIR}/static.mk	\
 		>> ${BUILD_WRKSRC}/CMakeFiles/lapacke.dir/build.make
 	(cd ${CONFIGURE_WRKSRC} && ${MAKE} -f LAPACKE/CMakeFiles/lapacke.dir/build.make build-static)
 .else # xlapack + Lapack + tmglib
 	${SED} -e 's|%%LIB%%|lapack|g' ${FILESDIR}/static.mk	\
 		>> ${BUILD_WRKSRC}/SRC/CMakeFiles/lapack.dir/build.make
 	(cd ${CONFIGURE_WRKSRC} && ${MAKE} -f SRC/CMakeFiles/lapack.dir/build.make build-static)
 	${SED} -e 's|%%LIB%%|tmglib|g;s|cd SRC|cd TESTING/MATGEN|;s|SRC/lib|TESTING/MATGEN/lib|'	\
 		${FILESDIR}/static.mk >> ${BUILD_WRKSRC}/TESTING/MATGEN/CMakeFiles/tmglib.dir/build.make
 	(cd ${BUILD_WRKSRC} && ${MAKE} -f TESTING/MATGEN/CMakeFiles/tmglib.dir/build.make build-static)
 .endif
 
 pre-su-install:
 .if !(defined(BLAS_SLAVEPORT) || defined(CBLAS_SLAVEPORT) || defined(XLAPACK_SLAVEPORT) || defined(LAPACKE_SLAVEPORT))
 	cd ${WRKDIR} && ${FIND} man/man3 -type f | ${GREP} -v Users_julie | \
 	tee ${WRKDIR}/manpages | ${SED} 's|$$|.gz|' >> ${TMPPLIST}
 	cd ${WRKDIR} && \
 	${XARGS} -J @ ${INSTALL_MAN} @ ${STAGEDIR}${MAN3PREFIX}/man/man3 < ${WRKDIR}/manpages
 .endif
 
 post-install:
 .if defined(BLAS_SLAVEPORT)
 	${INSTALL_DATA} ${CONFIGURE_WRKSRC}/BLAS/SRC/${BLASLIB} ${STAGEDIR}${PREFIX}/lib
 	${INSTALL_DATA} ${CONFIGURE_WRKSRC}/BLAS/blas.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig
 .elif defined(CBLAS_SLAVEPORT)
 	# Avoid conflict with OpenBLAS
 	${MKDIR} ${STAGEDIR}${PREFIX}/include/cblas
 	${MV} ${STAGEDIR}${PREFIX}/include/*.h ${STAGEDIR}${PREFIX}/include/cblas/
 	${INSTALL_DATA} ${BUILD_WRKSRC}/src/${CBLASLIB} ${STAGEDIR}${PREFIX}/lib
 .elif defined(LAPACKE_SLAVEPORT)
 	# Avoid conflict with OpenBLAS
 	${MKDIR} ${STAGEDIR}${PREFIX}/include/lapacke
 	${MV} ${STAGEDIR}${PREFIX}/include/*.h ${STAGEDIR}${PREFIX}/include/lapacke/
 	${INSTALL_DATA} ${CONFIGURE_WRKSRC}/LAPACKE/${LAPACKELIB} ${STAGEDIR}${PREFIX}/lib
 .elif defined(XLAPACK_SLAVEPORT)
 	${INSTALL_DATA} ${BUILD_WRKSRC}/SRC/liblapack.a ${STAGEDIR}${PREFIX}/lib/libxlapack.a
 	${INSTALL_DATA} ${BUILD_WRKSRC}/TESTING/MATGEN/libtmglib.a	\
 		${STAGEDIR}${PREFIX}/lib/libxtmglib.a
 	${MV} ${STAGEDIR}${PREFIX}/lib/liblapack.so	\
 		${STAGEDIR}${PREFIX}/lib/libxlapack.so.${PORTVERSION}
 	${LN} -sf libxlapack.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libxlapack.so
 	${LN} -sf libxlapack.so.${PORTVERSION}	\
 		${STAGEDIR}${PREFIX}/lib/libxlapack.so.${SVERSION}
 	${MV} ${STAGEDIR}${PREFIX}/lib/libtmglib.so	\
 		${STAGEDIR}${PREFIX}/lib/libxtmglib.so.${PORTVERSION}
 	${LN} -sf libxtmglib.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libxtmglib.so
 	${LN} -sf libxtmglib.so.${PORTVERSION}	\
 		${STAGEDIR}${PREFIX}/lib/libxtmglib.so.${SVERSION}
 	${SED} -e 's|lapack|xlapack|g;s|LAPACK|XLAPACK|'		\
 		${STAGEDIR}${PREFIX}/libdata/pkgconfig/lapack.pc	\
 		> ${STAGEDIR}${PREFIX}/libdata/pkgconfig/xlapack.pc
 	${RM} ${STAGEDIR}${PREFIX}/libdata/pkgconfig/lapack.pc
 .else # Lapack
 	${INSTALL_DATA} ${BUILD_WRKSRC}/SRC/liblapack.a ${STAGEDIR}${PREFIX}/lib
 	${INSTALL_DATA} ${BUILD_WRKSRC}/TESTING/MATGEN/libtmglib.a ${STAGEDIR}${PREFIX}/lib
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/math/lapack95/Makefile b/math/lapack95/Makefile
index cd23065cb794..75f6236fd201 100644
--- a/math/lapack95/Makefile
+++ b/math/lapack95/Makefile
@@ -1,80 +1,80 @@
 PORTNAME=	lapack95
 PORTVERSION=	1.0
-PORTREVISION=	19
+PORTREVISION=	20
 CATEGORIES=	math
 MASTER_SITES=	NL
 DISTNAME=	${PORTNAME}
 DIST_SUBDIR=	lapack95
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	LAPACK95, Fortran90/95 wrapper for LAPACK
 WWW=		https://www.netlib.org/lapack95/
 
 USES=		fortran tar:tgz
 
 OPTIONS_DEFINE=	EXAMPLES
 
 OPTIONS_RADIO=	BLAS
 OPTIONS_RADIO_BLAS=	REFERENCE ATLAS
 OPTIONS_DEFAULT=	REFERENCE
 
 REFERENCE_DESC=	Blas / Lapack
 REFERENCE_USES=	blaslapack:netlib
 
 ATLAS_DESC=	ATLAS
 ATLAS_USES=	blaslapack:atlas
 
 USE_LDCONFIG=	yes
 WRKSRC=		${WRKDIR}/LAPACK95
 
 MAKE_JOBS_UNSAFE=yes
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == "sparc64"
 PICFLAG?=	-fPIC
 .else
 PICFLAG?=	-fpic
 .endif
 
 .if ${PORT_OPTIONS:MEXAMPLES}
 PORTEXAMPLES=	make.inc EXAMPLES1 EXAMPLES2
 .endif
 
 pre-configure:
 	${REINPLACE_CMD} -e 's|%%BLAS%%|${BLASLIB}|g ; \
 		 s|%%FC%%|${FC}|g ; \
 		 s|%%FFLAGS%%|${FFLAGS} $${PICFLAG}|g ; \
 		 s|%%LAPACK%%|${LAPACKLIB}|g ; \
 		 s|%%LDFLAGS%%|${LDFLAGS}|g ; \
 		 s|%%LOCALBASE%%|${LOCALBASE}|g ; \
 		 s|%%PREFIX%%|${PREFIX}|g' \
 		${WRKSRC}/make.inc
 	${REINPLACE_CMD} -e 's|ranlib|${RANLIB}|g ; \
 		 s|ar cr|${AR} cr|g' \
 		${WRKSRC}/SRC/makefile \
 		${WRKSRC}/TESTING/makefile \
 		${WRKSRC}/EXAMPLES1/makefile*
 	${MKDIR} ${WRKSRC}/lapack95_modules
 	${CP} -r ${WRKSRC} ${WRKSRC}_SHARED
 
 do-build:
 	cd ${WRKSRC}/SRC; ${SETENV} ${MAKE_ENV} PICFLAG= \
 		${MAKE} ${_MAKE_JOBS} ${MAKE_ARGS} single_double_complex_dcomplex
 	cd ${WRKSRC}_SHARED/SRC; ${SETENV} ${MAKE_ENV} PICFLAG=${PICFLAG} \
 		${MAKE} ${_MAKE_JOBS} ${MAKE_ARGS} single_double_complex_dcomplex
 	cd ${WRKSRC}_SHARED ; ${LD} -Bshareable -o liblapack95.so.1 -x -soname \
 		liblapack95.so.1 --whole-archive lapack95.a
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/lapack95.a ${STAGEDIR}${PREFIX}/lib/liblapack95.a
 	${INSTALL_LIB} ${WRKSRC}_SHARED/liblapack95.so.1 ${STAGEDIR}${PREFIX}/lib
 	${LN} -sf liblapack95.so.1 ${STAGEDIR}${PREFIX}/lib/liblapack95.so
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/lapack95_modules
 	${INSTALL_DATA} ${WRKSRC}_SHARED/lapack95_modules/*.mod ${STAGEDIR}${PREFIX}/lib/lapack95_modules
 .if ${PORT_OPTIONS:MEXAMPLES}
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTEXAMPLES}" ${STAGEDIR}${EXAMPLESDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/math/lapackpp/Makefile b/math/lapackpp/Makefile
index 8818e046df34..532cd7d83919 100644
--- a/math/lapackpp/Makefile
+++ b/math/lapackpp/Makefile
@@ -1,28 +1,29 @@
 PORTNAME=	lapackpp
 DISTVERSION=	2022.05.00
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	https://bitbucket.org/icl/${PORTNAME}/downloads/
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	C++ API for the Linear Algebra PACKage
 WWW=		https://bitbucket.org/icl/lapackpp/src/master/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	lapacke>0:math/lapacke
 LIB_DEPENDS=	libblaspp.so:math/blaspp \
 		libopenblas.so:math/openblas
 TEST_DEPENDS=	lapacke>0:math/lapacke
 # fails to find xblas, see https://bitbucket.org/icl/lapackpp/issues/14/fails-to-find-xblas
 
 USES=		cmake:testing fortran localbase:ldflags
 
 CMAKE_OFF=	build_tests
 CMAKE_TESTING_ON=	build_tests
 CMAKE_TESTING_TARGET=	tester
 
 post-test:
 	@cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} test/tester
 
 .include <bsd.port.mk>
diff --git a/math/lemon/Makefile b/math/lemon/Makefile
index b44bcf42c23f..81e0e02ab335 100644
--- a/math/lemon/Makefile
+++ b/math/lemon/Makefile
@@ -1,38 +1,38 @@
 PORTNAME=	lemon
 DISTVERSION=	1.3.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	math
 MASTER_SITES=	https://lemon.cs.elte.hu/pub/sources/
 PKGNAMEPREFIX=	coin-or-
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Library for Efficient Modeling and Optimization in Networks
 WWW=		https://lemon.cs.elte.hu/trac/lemon/
 
 LICENSE=	BSL
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libCbc.so:math/cbc \
 		libCgl.so:math/cgl \
 		libClp.so:math/clp \
 		libCoinUtils.so:math/coinutils \
 		libOsi.so:math/osi
 
 USES=		cmake
 USE_LDCONFIG=	yes
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 
 CONFLICTS_BUILD=	SoPlex # Incompatible with SoPlex-4.0.0 optional dependency: https://lemon.cs.elte.hu/trac/lemon/ticket/616
 
 OPTIONS_DEFINE=		GLPK
 OPTIONS_DEFAULT=	GLPK
 
 GLPK_DESC=		Build with GLPK solver
 GLPK_CMAKE_BOOL=	LEMON_ENABLE_GLPK
 GLPK_LIB_DEPENDS=	libglpk.so:math/glpk
 
 post-install:
 	@${RM} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}-0.x-to-1.x.sh
 
 .include <bsd.port.mk>
diff --git a/math/levmar/Makefile b/math/levmar/Makefile
index 0629cc3864c2..997a87996289 100644
--- a/math/levmar/Makefile
+++ b/math/levmar/Makefile
@@ -1,71 +1,71 @@
 PORTNAME=	levmar
 PORTVERSION=	2.6
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	math
 MASTER_SITES=	http://users.ics.forth.gr/~lourakis/levmar/
 
 MAINTAINER=	phd_kimberlite@yahoo.co.jp
 COMMENT=	GPL-licensed library implementing the Levenberg-Marquardt algorithm
 WWW=		http://www.ics.forth.gr/~lourakis/levmar/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USE_LDCONFIG=	yes
 USES=		fortran tar:tgz uidfix
 
 OPTIONS_DEFINE=	DOCS EXAMPLES PROFILE
 OPTIONS_SINGLE=	BLASLIB
 OPTIONS_DEFAULT=	NETLIB
 OPTIONS_SINGLE_BLASLIB=	ATLAS NETLIB OPENBLAS
 PROFILE_DESC=	Build a profiling library
 
 ATLAS_USES=	blaslapack:atlas
 NETLIB_USES=	blaslapack:netlib
 OPENBLAS_USES=	blaslapack:openblas
 
 .include <bsd.port.pre.mk>
 
 PORTDOCS=	README.txt
 PORTEXAMPLES=	lmdemo.c Makefile.demo
 PLIST_FILES=	include/levmar.h \
 	lib/liblevmar.a \
 	lib/liblevmar.so \
 	lib/liblevmar.so.2
 
 .if ${PORT_OPTIONS:MPROFILE}
 .if defined(NOPROFILE) || defined(NO_PROFILE) || defined(WITHOUT_PROFILE)
 IGNORE=		you have defined WITH_PROFILE, but have also defined\
 WITHOUT_PROFILE, NOPROFILE, or NO_PROFILE
 .elif !exists(/usr/lib/libc_p.a)
 IGNORE=		you have chosen WITH_PROFILE, but have not installed the\
 base system profiling libraries
 .endif
 PLIST_FILES+=	lib/liblevmar_p.a
 .else
 MAKE_ENV+=	WITHOUT_PROFILE=true
 .endif
 
 post-extract:
 	@${MV} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.dist
 	@${CP} ${FILESDIR}/Makefile.lib ${WRKSRC}/Makefile
 	@${CP} ${FILESDIR}/Makefile.demo ${WRKSRC}/
 	@${REINPLACE_CMD} -e 's+%%CC%%+${CC}+g' \
 		-e 's+%%CFLAGS%%+${CFLAGS} -I${LOCALBASE}/include+g' \
 		-e 's+%%LDFLAGS%%+${LDFLAGS}+g' \
 		-e 's+%%BLAS%%+${BLASLIB}+g' \
 		-e 's+%%LAPACK%%+${LAPACKLIB}+g' \
 			${WRKSRC}/Makefile.demo
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@(cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	@(cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR})
 
 test check: install
 	@( cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} Makefile.demo \
 	${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET} )
 	${WRKSRC}/lmdemo
 
 .include <bsd.port.post.mk>
diff --git a/math/libRmath/Makefile b/math/libRmath/Makefile
index 914499555596..67bce4c88ae3 100644
--- a/math/libRmath/Makefile
+++ b/math/libRmath/Makefile
@@ -1,47 +1,48 @@
 PORTNAME=	libRmath
 DISTVERSION=	4.2.2
+PORTREVISION=	1
 CATEGORIES=	math lang
 MASTER_SITES=	CRAN/src/base/R-${PORTVERSION:C|\..*||}
 DISTNAME=	R-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Standalone math library from R
 WWW=		https://www.R-project.org/
 
 LICENSE=	GPLv2
 
 ONLY_FOR_ARCHS=	aarch64 amd64 armv6 armv7 i386 powerpc64 powerpc64le
 
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libpcre2-8.so:devel/pcre2
 
 USES=		fortran localbase pathfix
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-nls \
 		--with-cairo=no \
 		--with-ICU=no \
 		--with-jpeglib=no \
 		--with-libpng=no \
 		--with-libtiff=no \
 		--with-readline=no \
 		--with-tcltk=no \
 		--with-x=no \
 		--without-libintl-prefix
 CONFIGURE_ENV+=	ac_cv_header_iconv_h=no \
 		FPICFLAGS=-fPIC
 
 BUILD_WRKSRC=	${WRKSRC}/src/nmath/standalone
 
 PLIST_SUB=	RMATH_SOVERSION="${_RMATH_SOVERSION}"
 
 _RMATH_SOVERSION=	${DISTVERSION:R}
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/src/include/Rmath.h ${STAGEDIR}${PREFIX}/include
 	${INSTALL_DATA} ${BUILD_WRKSRC}/libRmath.a ${STAGEDIR}${PREFIX}/lib
 	${INSTALL_LIB} ${BUILD_WRKSRC}/libRmath.so ${STAGEDIR}${PREFIX}/lib/libRmath.so
 	(cd ${STAGEDIR}${PREFIX}/lib; ${LN} -sf libRmath.so libRmath.so.${_RMATH_SOVERSION})
 
 .include <bsd.port.mk>
diff --git a/math/libmesh/Makefile b/math/libmesh/Makefile
index c4393fba54d0..d130a2606ae1 100644
--- a/math/libmesh/Makefile
+++ b/math/libmesh/Makefile
@@ -1,93 +1,93 @@
 PORTNAME=	libmesh
 DISTVERSION=	1.7.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	math
 MASTER_SITES=	https://github.com/libMesh/${PORTNAME}/releases/download/v${DISTVERSION}/
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Numerical simulation of partial differential equations
 WWW=		https://libmesh.github.io
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 		libnlopt.so:math/nlopt
 
 USES=		compiler:c++17-lang eigen:3 gmake libtool localbase perl5 pkgconfig tar:xz
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-static \
 		--with-methods=opt \
 		--with-thread-model=pthread \
 		--datarootdir=${DATADIR} \
 		--enable-amr \
 		--enable-nlopt \
 		--disable-strict-lgpl \
 		--enable-tetgen \
 		--enable-triagle \
 		--with-boost=${LOCALBASE} \
 		--with-eigen-include=${LOCALBASE}/include/eigen3 \
 		--disable-netcdf --disable-netcdf-4 # https://github.com/libMesh/libmesh/issues/1542
 CONFIGURE_ARGS+=	--disable-metaphysicl # enabling this causes libmesh to install a bundled metaphysicl that would conflict with the metaphysicl package
 CONFIGURE_ARGS+=	--with-nlopt-include=${LOCALBASE}/include --with-nlopt-lib=${LOCALBASE}/lib # workaround for https://github.com/libMesh/libmesh/issues/3314
 MAKE_ARGS=	LDFLAGS="-pthread -lexecinfo -L${LOCALBASE}/lib"
 USE_LDCONFIG=	yes
 
 CXXFLAGS+=	-I${WRKSRC}/contrib/parmetis/include # because parmetis.h isn't found for ./include/libmesh/parmetis_helper.h
 
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check
 
 OPTIONS_DEFINE=			GLPK HDF5 MPI EXAMPLES
 OPTIONS_DEFAULT=		MPI
 GLPK_DESC=			Glpk linear programming solver library
 
 GLPK_CONFIGURE_ENABLE=		glpk
 GLPK_LIB_DEPENDS=		libglpk.so:math/glpk
 
 HDF5_CONFIGURE_ENABLE=		hdf5
 HDF5_LIB_DEPENDS=		libhdf5.so:science/hdf5
 
 MPI_CONFIGURE_ENABLE=		mpi
 MPI_CONFIGURE_ON=		--with-mpi=${LOCALBASE} --with-mpi-include=${LOCALBASE}/include --with-mpi-lib=${LOCALBASE}/lib
 MPI_LIB_DEPENDS=		libmpi.so:net/mpich
 
 EXAMPLES_CONFIGURE_ENABLE=	examples
 EXAMPLES_VARS=			PKGMESSAGE=pkg-message-examples
 
 SUB_FILES=			pkg-message-examples
 
 PORTEXAMPLES=	*
 
 post-extract:
 	@${FIND} ${WRKSRC} -name "*.orig" -delete
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	@${MV} ${STAGEDIR}${PREFIX}/etc/libmesh/Make.common ${STAGEDIR}${DATADIR}
 	@cd ${STAGEDIR}${PREFIX} && ${RM} -r \
 		etc/libmesh \
 		Make.common \
 		contrib \
 		libdata/pkgconfig/Make.common # https://github.com/libMesh/libmesh/issues/1539
 	# delete metis.h, see https://github.com/libMesh/libmesh/issues/3317
 	${RM} ${STAGEDIR}${PREFIX}/include/metis.h
 
 post-install-EXAMPLES-on:
 	# https://github.com/libMesh/libmesh/issues/1541
 	@${MV} ${STAGEDIR}${PREFIX}/examples ${STAGEDIR}${EXAMPLESDIR}
 	@${FIND} ${STAGEDIR}${EXAMPLESDIR} -name Makefile | ${XARGS} ${REINPLACE_CMD} -i '' -e ' \
 		s|LIBMESH_DIR ?= .*|LIBMESH_DIR ?= ${PREFIX}| ; \
 		s|$$(LIBMESH_DIR)/Make.common|${DATADIR}/Make.common| ; \
 		s|LIBMESH_DIR/examples|LIBMESH_DIR/share/examples/${PORTNAME}| ; \
 		s|$$(libmesh_LDFLAGS)|$$(libmesh_LDFLAGS) -pthread|'
 	@${FIND} ${STAGEDIR}${EXAMPLESDIR} -name run.sh | ${XARGS} ${CHMOD} +x
 	@${FIND} ${STAGEDIR}${EXAMPLESDIR} -name run.sh | ${XARGS} ${REINPLACE_CMD} -i '' -e ' \
 		s|#set -x|export LIBMESH_DIR=${PREFIX}| ; \
 		s|#!/bin/bash|#!${LOCALBASE}/bin/bash| ; \
 		s|LIBMESH_DIR/examples|LIBMESH_DIR/share/examples/${PORTNAME}| ; \
 		s|reference_elements|share/${PORTNAME}/reference_elements|'
 	@${REINPLACE_CMD} -i '' -e 's|libmesh_LIBTOOL ?= /usr/local/contrib/bin/libtool|libmesh_LIBTOOL ?= libtool|' \
 		${STAGEDIR}${DATADIR}/Make.common
 
 .include <bsd.port.mk>
diff --git a/math/libmissing/Makefile b/math/libmissing/Makefile
index f6e5565a568e..ea6f7e60ce27 100644
--- a/math/libmissing/Makefile
+++ b/math/libmissing/Makefile
@@ -1,81 +1,81 @@
 PORTNAME=	libmissing
 DISTVERSION=	20130815
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	math
 MASTER_SITES=	LOCAL/bf
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Standard math functions missing from the FreeBSD libm
 
 LICENSE=	BSD2CLAUSE
 
 LIB_DEPENDS=	libmpc.so:math/mpc
 
 USE_LDCONFIG=	yes
 USES=		tar:xz uidfix
 
 MAKE_ENV=	LDADD=-lmpc LIB=missing SHLIB_MAJOR="${SHLIB_MAJOR}" \
 		SRCCONF=/dev/null SRCS="${SRCS}" __MAKE_CONF=/dev/null
 
 OPTIONS_DEFINE=	PROFILE EXAMPLES
 
 PLIST_FILES=	include/missing_complex.h \
 		include/missing_math.h \
 		lib/libmissing.a lib/libmissing.so \
 		lib/libmissing.so.${SHLIB_MAJOR}
 
 SHLIB_MAJOR=	2
 SRCS=		libmissing.c
 
 CFLAGS+=	-fno-builtin -fno-math-errno -I. -I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -Wl,-z,interpose
 PORTEXAMPLES=	${SRCS}
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPROFILE}
 .if !exists(/usr/lib/libc_p.a)
 IGNORE=		you have chosen WITH_PROFILE, but have not installed the\
 base system profiling libraries
 .endif
 PLIST_FILES+=	lib/libmissing_p.a
 .else
 MAKE_ENV+=	WITHOUT_PROFILE=yes
 .endif
 
 post-patch:
 	@${PRINTF} "LIBDIR=\t${PREFIX}/lib\n.include <bsd.lib.mk>\n" > \
 		${WRKSRC}/Makefile
 .for t in d q s
 	@cd ${WRKSRC}/c/common; ${CP} initseed.c maxtest.c ${WRKSRC}/c/${t}p/
 .endfor
 	@${REINPLACE_CMD} -E \
 		'/(XCFLAGS|XDEFINES|XINCLUDES|XLDFLAGS|XLIBS|XMFLAGS|XOPT)[[:blank:]]+=/d' \
 		${WRKSRC}/c/Makefile
 	@${REINPLACE_CMD} -e \
 		'/#include <math.h>/{x;s|^.*$$|#include "missing_math.h"|;H;x;}' \
 		${WRKSRC}/c/common/elefunt.h
 	@${REINPLACE_CMD} -e '\|COMMONOBJS[[:blank:]]*=|s|../common/||g' \
 		${WRKSRC}/c/dp/Makefile \
 		${WRKSRC}/c/qp/Makefile \
 		${WRKSRC}/c/sp/Makefile
 
 do-test:
 	@cd ${WRKSRC}/c; ${SETENV} ${MAKE_ENV} XCFLAGS="${CFLAGS} -frounding-math" \
 		XINCLUDES="-I${WRKSRC}" XLDFLAGS="${LDFLAGS}" XLIBS="-L${WRKSRC} -lmissing" \
 		LD_LIBRARY_PATH="/lib:/usr/lib:${LOCALBASE}/lib:${WRKSRC}" \
 		${MAKE} ${_MAKE_JOBS} ${MAKE_ARGS} all3
 .for t in d q s
 	@${PRINTF} "\n\n\n\t\t%s\n\n\n" "REPORT OF ${t:tu}. PRECISION TEST RESULTS:"
 	@${CAT} ${WRKSRC}/c/${t}p/tall${t}p.lst-xxx
 .endfor
 
 post-install:
 	@cd ${WRKSRC}; ${INSTALL_DATA} missing_complex.h missing_math.h \
 	${STAGEDIR}${PREFIX}/include
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/math/librsb/Makefile b/math/librsb/Makefile
index 653376632681..2b3050fd988e 100644
--- a/math/librsb/Makefile
+++ b/math/librsb/Makefile
@@ -1,37 +1,38 @@
 PORTNAME=	librsb
 PORTVERSION=	1.3.0.2
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	SF/librsb
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/r/-rc/}
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Sparse matrix library
 WWW=		http://librsb.sourceforge.net/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	gsed:textproc/gsed \
 		bash:shells/bash
 
 USES=		fortran gmake libtool shebangfix
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	qtests
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 LDFLAGS+=	-lthr
 SHEBANG_FILES=	*.sh */*.sh
 
 OPTIONS_DEFINE=	DOCS OPTIMIZE
 
 OPTIMIZE_DESC=		Optimize for the local machine
 OPTIMIZE_CONFIGURE_ENV=	SPCFLAGS="${CFLAGS:N-O*}"
 
 post-patch:
 	@${REINPLACE_CMD} -E s/sed/gsed/g ${WRKSRC}/*.sh ${WRKSRC}/*/*.sh
 
 post-patch-OPTIMIZE-on:
 	@${REINPLACE_CMD} s/enable_optimize=no/enable_optimize=yes/ \
 		${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/math/libsemigroups/Makefile b/math/libsemigroups/Makefile
index 8a3aa36fffc6..5f7d6b21856b 100644
--- a/math/libsemigroups/Makefile
+++ b/math/libsemigroups/Makefile
@@ -1,45 +1,45 @@
 PORTNAME=	libsemigroups
 PORTVERSION=	1.3.7
 DISTVERSIONPREFIX=	v
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	math
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	C++ library for semigroups and monoids
 WWW=		https://libsemigroups.readthedocs.io/en/latest/
 
 LICENSE=	GPLv3
 
 BUILD_DEPENDS=	HPCombi>0:math/hpcombi
 LIB_DEPENDS=	libfmt.so:devel/libfmt
 
 USE_GITHUB=	yes
 
 USES=		autoreconf compiler:c++11-lang eigen:3,build \
 		libtool pkgconfig
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-fmt --with-external-fmt=yes	\
 		--with-external-eigen
 USE_LDCONFIG=	yes
 TEST_TARGET=	check
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} != amd64
 CONFIGURE_ARGS+=	--disable-hpcombi
 .endif
 
 pre-configure:
 .if ${ARCH} == amd64
 	${REINPLACE_CMD} -e 's|$$srcdir/extern/HPCombi|${LOCALBASE}/share/HPCombi|'	\
 		${WRKSRC}/m4/ax_check_hpcombi.m4
 	${REINPLACE_CMD} -e 's|extern/HPCombi/include|${LOCALBASE}/include/HPCombi|'	\
 		${WRKSRC}/Makefile.am
 	${REINPLACE_CMD} -e 's|HPCombi/include|HPCombi|'	\
 		${WRKSRC}/include/libsemigroups/hpcombi.hpp
 .endif
 	${REINPLACE_CMD} -e 's|fmtinclude_HEADERS|#fmtinclude_HEADERS|'	\
 		-e 's|-O3 ||' ${WRKSRC}/Makefile.am
 
 .include <bsd.port.post.mk>
diff --git a/math/libxsmm/Makefile b/math/libxsmm/Makefile
index 200aa36e9566..e633f2843c09 100644
--- a/math/libxsmm/Makefile
+++ b/math/libxsmm/Makefile
@@ -1,40 +1,41 @@
 PORTNAME=	libxsmm
 DISTVERSION=	1.17
+PORTREVISION=	1
 CATEGORIES=	math science
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Library for dense and sparse matrix operations and deep learning
 WWW=		https://github.com/hfp/libxsmm
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 BROKEN_i386=	error: assigning to '__m256i' (vector of 4 'long long' values) from incompatible type 'int'
 BROKEN_aarch64=	error: invalid output constraint '=a', see https://github.com/libxsmm/libxsmm/issues/669
 
 BUILD_DEPENDS=	bash:shells/bash
 
 USES=		cpe fortran gmake localbase:ldflags python:build shebangfix
 CPE_VENDOR=	${PORTNAME}_project
 SHEBANG_GLOB=	*.sh
 USE_GITHUB=	yes
 GH_ACCOUNT=	hfp
 USE_LDCONFIG=	yes
 
 MAKE_ARGS=	STATIC=0 DEPSTATIC=0 MAKE_PARALLEL=1
 LDFLAGS+=	-lm
 
 TEST_TARGET=	tests
 
 BINARY_ALIAS=	python=${PYTHON_CMD}
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} != amd64
 MAKE_ARGS+=	PLATFORM=1
 .endif
 
 post-install:
 	@${RM} ${STAGEDIR}${PREFIX}/include/libxsmm/libxsmm_timer.c.orig
 
 .include <bsd.port.mk>
diff --git a/math/lidia/Makefile b/math/lidia/Makefile
index 5581e7379979..4d259834dafb 100644
--- a/math/lidia/Makefile
+++ b/math/lidia/Makefile
@@ -1,25 +1,25 @@
 PORTNAME=	lidia
 DISTVERSION=	2.3.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 MASTER_SITES=	https://www.math.ucdavis.edu/~latte/software/packages/lidia/current/
 DISTNAME=	${PORTNAME}-${DISTVERSION}+latte-patches-2014-10-04
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Library for computational number theory
 WWW=		https://www.math.ucdavis.edu/~latte/
 
 LICENSE=	LiDIA
 LICENSE_NAME=	LiDIA License
 LICENSE_FILE=	${WRKSRC}/COPYING
 LICENSE_PERMS=	dist-mirror pkg-mirror auto-accept
 
 LIB_DEPENDS=	libgmp.so:math/gmp
 
 USES=		gmake localbase:ldflags tar:bz2 libtool
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-static --enable-shared --with-extra-libs=${LOCALBASE}/lib
 USE_GCC=	yes # doesn't build with clang, no active developers to fix this: https://github.com/mkoeppe/LiDIA/issues/6
 USE_LDCONFIG=	yes
 
 .include <bsd.port.mk>
diff --git a/math/linbox/Makefile b/math/linbox/Makefile
index fb7691cdb56d..4a937d654a4b 100644
--- a/math/linbox/Makefile
+++ b/math/linbox/Makefile
@@ -1,77 +1,77 @@
 PORTNAME=	linbox
 PORTVERSION=	1.6.3
 DISTVERSIONPREFIX=	v
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	math
 
 PATCH_SITES=	https://github.com/linbox-team/linbox/commit/
 PATCHFILES=	b79fb13522fceef79e291922ca9c7af0a09b65ae.diff:-p1
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	C++ library for exact, high-performance linear algebra
 WWW=		https://linalg.org/
 
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	dual
 
 BUILD_DEPENDS=	fflas-ffpack-config:math/fflas-ffpack
 LIB_DEPENDS=	libgmp.so:math/gmp		\
 		libgivaro.so:math/givaro
 RUN_DEPENDS=	bash:shells/bash
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	linbox-team
 
 USES=		autoreconf blaslapack:openblas compiler:c++11-lang gmake libtool localbase pkgconfig shebangfix
 
 SHEBANG_FILES=	benchmarks/perfpublisher.sh examples/test.sh	\
 		linbox-auto-install.sh linbox-config.in tests/jenkins-maker.sh	\
 		tests/perfpublisher.sh tests/test_leak.sh
 
 OPTIONS_DEFINE=		DOXYGEN
 OPTIONS_RADIO=		SIZE
 OPTIONS_RADIO_SIZE=	FULL MIN
 OPTIONS_DEFAULT=	FULL
 OPTIONS_SUB=		yes
 
 MIN_DESC=		Lightweight package, with less dependencies
 MIN_CONFIGURE_ON=	--without-saclib
 
 FULL_DESC=		Complete package with all its dependencies
 FULL_BUILD_DEPENDS=	gnuplot:math/gnuplot
 FULL_LIB_DEPENDS=	libflint.so:math/flint2		\
 			libfplll.so:math/fplll		\
 			libiml.so:math/iml		\
 			libm4ri.so:math/m4ri		\
 			libm4rie.so:math/m4rie		\
 			libmpfr.so:math/mpfr		\
 			libntl.so:math/ntl		\
 			libtinyxml2.so:textproc/tinyxml2
 FULL_RUN_DEPENDS=	gnuplot:math/gnuplot
 FULL_USES=		ghostscript
 FULL_CONFIGURE_WITH=	flint fplll ghostscript gnuplot iml m4ri m4rie mpfr ntl
 
 DOXYGEN_VARS=		BINARY_ALIAS=sed=${LOCALBASE}/bin/gsed
 DOXYGEN_CONFIGURE_ENABLE=doc
 DOXYGEN_CONFIGURE_WITH=	docdir=${DOCSDIR}
 DOXYGEN_BUILD_DEPENDS=	gsed:textproc/gsed	\
 			dot:graphics/graphviz	\
 			doxygen:devel/doxygen
 
 GNU_CONFIGURE=	yes
 # ATM expat and drivers are broken
 CONFIGURE_ARGS=	--without-expat
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check
 
 .if defined(PACKAGE_BUILDING)
 CONFIGURE_ARGS+=--disable-sse --disable-sse2 --disable-sse3 --disable-ssse3	\
 		--disable-sse41 --disable-sse42 --disable-fma --disable-fma4	\
 		--disable-avx --disable-avx2
 .endif
 
 pre-configure:
 	${REINPLACE_CMD} -e 's|@LINBOXSAGE_LIBS@||' ${WRKSRC}/linbox.pc.in
 
 .include <bsd.port.mk>
diff --git a/math/linpack/Makefile b/math/linpack/Makefile
index b62458a0d71d..3239ccd8c2b4 100644
--- a/math/linpack/Makefile
+++ b/math/linpack/Makefile
@@ -1,50 +1,50 @@
 PORTNAME=	linpack
 PORTVERSION=	1.0
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	math
 MASTER_SITES=	NL
 DISTFILES=	${SRCS}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Linear Algebra package
 WWW=		https://www.netlib.org/linpack/
 
 LIB_DEPENDS=	libblas.so:math/blas
 
 MAKE_ENV=	WITHOUT_PROFILE=yes __MAKE_CONF=/dev/null SRCCONF=/dev/null
 MAKEFILE=	${FILESDIR}/Makefile.lib
 
 USES=		fortran uidfix
 
 USE_LDCONFIG=	yes
 DIST_SUBDIR=	${PORTNAME}
 NO_WRKSUBDIR=	yes
 EXTRACT_CMD=	${CP}
 EXTRACT_BEFORE_ARGS=
 EXTRACT_AFTER_ARGS=	${WRKSRC}
 
 SRCS=	cchdc.f cchdd.f cchex.f cchud.f cgbco.f cgbdi.f cgbfa.f cgbsl.f \
 	cgeco.f cgedi.f cgefa.f cgesl.f cgtsl.f chico.f chidi.f chifa.f \
 	chisl.f chpco.f chpdi.f chpfa.f chpsl.f cmach.f cpbco.f cpbdi.f \
 	cpbfa.f cpbsl.f cpoco.f cpodi.f cpofa.f cposl.f cppco.f cppdi.f \
 	cppfa.f cppsl.f cptsl.f cqrdc.f cqrsl.f csico.f csidi.f csifa.f \
 	csisl.f cspco.f cspdi.f cspfa.f cspsl.f csvdc.f ctrco.f ctrdi.f \
 	ctrsl.f dchdc.f dchdd.f dchex.f dchud.f dgbco.f dgbdi.f dgbfa.f \
 	dgbsl.f dgeco.f dgedi.f dgefa.f dgesl.f dgtsl.f dmach.f dpbco.f \
 	dpbdi.f dpbfa.f dpbsl.f dpoco.f dpodi.f dpofa.f dposl.f dppco.f \
 	dppdi.f dppfa.f dppsl.f dptsl.f dqrdc.f dqrsl.f dsico.f dsidi.f \
 	dsifa.f dsisl.f dspco.f dspdi.f dspfa.f dspsl.f dsvdc.f dtrco.f \
 	dtrdi.f dtrsl.f schdc.f schdd.f schex.f schud.f sgbco.f sgbdi.f \
 	sgbfa.f sgbsl.f sgeco.f sgedi.f sgefa.f sgesl.f sgtsl.f smach.f \
 	spbco.f spbdi.f spbfa.f spbsl.f spoco.f spodi.f spofa.f sposl.f \
 	sppco.f sppdi.f sppfa.f sppsl.f sptsl.f sqrdc.f sqrsl.f ssico.f \
 	ssidi.f ssifa.f ssisl.f sspco.f sspdi.f sspfa.f sspsl.f ssvdc.f \
 	strco.f strdi.f strsl.f zchdc.f zchdd.f zchex.f zchud.f zgbco.f \
 	zgbdi.f zgbfa.f zgbsl.f zgeco.f zgedi.f zgefa.f zgesl.f zgtsl.f \
 	zhico.f zhidi.f zhifa.f zhisl.f zhpco.f zhpdi.f zhpfa.f zhpsl.f \
 	zmach.f zpbco.f zpbdi.f zpbfa.f zpbsl.f zpoco.f zpodi.f zpofa.f \
 	zposl.f zppco.f zppdi.f zppfa.f zppsl.f zptsl.f zqrdc.f zqrsl.f \
 	zsico.f zsidi.f zsifa.f zsisl.f zspco.f zspdi.f zspfa.f zspsl.f \
 	zsvdc.f ztrco.f ztrdi.f ztrsl.f
 
 .include <bsd.port.mk>
diff --git a/math/mate-calc/Makefile b/math/mate-calc/Makefile
index d272e3d7f8c8..bbe87f6087a8 100644
--- a/math/mate-calc/Makefile
+++ b/math/mate-calc/Makefile
@@ -1,27 +1,27 @@
 PORTNAME=	mate-calc
 PORTVERSION=	1.26.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	math mate
 MASTER_SITES=	MATE
 DIST_SUBDIR=	mate
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	MATE calculator tool based on the old calctool for OpenWindows
 WWW=		https://mate-desktop.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	itstool:textproc/itstool
 LIB_DEPENDS=	libmpc.so:math/mpc \
 		libmpfr.so:math/mpfr
 
 PORTSCOUT=	limitw:1,even
 
 USES=		gettext gmake gnome localbase pkgconfig tar:xz
 USE_GNOME=	cairo gdkpixbuf2 gtk30 intlhack libxml2
 GNU_CONFIGURE=	yes
 
 GLIB_SCHEMAS=	org.mate.calc.gschema.xml
 
 .include <bsd.port.mk>
diff --git a/math/math77/Makefile b/math/math77/Makefile
index 2a6c450db573..6cf9c9279139 100644
--- a/math/math77/Makefile
+++ b/math/math77/Makefile
@@ -1,55 +1,55 @@
 PORTNAME=	math77
 PORTVERSION=	6.0
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	math
 MASTER_SITES=	NL/math
 DISTNAME=	${PORTNAME}
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	CalTech mathematical subprogram libraries for Fortran 77
 WWW=		https://netlib.org/math/
 
 LICENSE=	BSD3CLAUSE
 
 USES=		fortran gmake tar:tgz
 WRKSRC=		${WRKDIR}/MATH77
 MAKEFILE=	makefile
 USE_LDCONFIG=	yes
 
 PLIST_FILES=	lib/libmath77.a
 
 DEMO=	cblas ccoef cgam cge2 cgefsc cpolz csort cwofz daccum dasinh dbacc \
 	dbesj0 dbesjn dbi0k0 dbinom dblas1 dblas2 dblas3 dblas4 dc2fit dcdchi \
 	dcdnml dcdpoi dcft dchol dchol2 dckder dcon dcpltk dcpval ddasl1 \
 	ddasl2 ddasl3 ddasl4 ddasl5 ddasl6 ddasl7 dei deli derf derfce derfi \
 	devun devvun dfmin dfrenl dgami dgamma dge2 dgefsc dherql dhfti dhint \
 	dhtcc dilup dilupm dint1f dint1r dintmf dintmr diva divdb divx djacg1 \
 	djacg2 dlasum dlesum dlnrel dmess dmlc01 dmpval dnlafb dnlafu dnlagb \
 	dnlagu dnlsfb dnlsfu dnlsgb dnlsgu dnqsol dpfit dplot dpoi dpolz \
 	dpolz2 dprpl dprpl1 dprpl2 dpsi dran drane drang drangv dranr dranu \
 	dranus drft drft1 dsbasd dsfit dsfitc dsi dsort dspge dsva dsvdrs \
 	dsymql dtcst dtgfi dtgfi1 dtgfi2 dtgrec ducom2 ducomp dwcom2 dwcomp \
 	dxrk8 dzero ermsg err1 exsort gsortp idranp insort isort isranp mach \
 	matp matpr ran1 saccum sasinh sbacc sbesj0 sbesjn sbi0k0 sbinom sblas1 \
 	sblas2 sblas3 sblas4 sc2fit scdchi scdnml scdpoi scft schol schol2 \
 	sckder scon scpltk scpval sdasl1 sdasl2 sdasl3 sdasl4 sdasl5 sdasl6 \
 	sdasl7 sei seli serf serfce serfi sevun sevvun sfmin sfrenl sgami \
 	sgamma sge2 sgefsc sherql shfti shint shtcc silup silupm sint1f sint1r \
 	sintmf sintmr siva sivdb sivx sjacg1 sjacg2 slasum slesum slnrel smess \
 	smlc01 smpval snlafb snlafu snlagb snlagu snlsfb snlsfu snlsgb snlsgu \
 	snqsol spfit splot spoi spolz spolz2 sprpl sprpl1 sprpl2 spsi sran \
 	srane srang srangv sranr sranu sranus srft srft1 ssbasd ssfit ssfitc \
 	ssi ssort sspge ssva ssvdrs ssymql stcst stgfi stgfi1 stgfi2 stgrec \
 	sucom2 sucomp swcom2 swcomp sxrk8 szero vecp vecpr xblas zcoef zcomp \
 	zgam zpolz zwofz
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/libmath77.a ${STAGEDIR}${PREFIX}/lib
 
 do-test:
 .for CODE in ${DEMO}
 	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} code=${CODE} ${MAKE_CMD} demo)
 .endfor
 
 .include <bsd.port.mk>
diff --git a/math/mathgl/Makefile b/math/mathgl/Makefile
index 022103964df6..492a9f7e6ef1 100644
--- a/math/mathgl/Makefile
+++ b/math/mathgl/Makefile
@@ -1,89 +1,89 @@
 PORTNAME=	mathgl
 DISTVERSION=	2.5
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	math graphics
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}%20${PORTVERSION}/
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Library for high-quality scientific data visualization
 WWW=		http://mathgl.sourceforge.net
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BROKEN_armv7=	error: unknown FP unit 'sse', see https://sourceforge.net/p/mathgl/bugs/49/
 
 LIB_DEPENDS=	libgif.so:graphics/giflib \
 		libgsl.so:math/gsl \
 		libhdf5.so:science/hdf5 \
 		libhpdf.so:print/libharu \
 		libltdl.so:devel/libltdl \
 		libpng.so:graphics/png \
 		libsz.so:science/libaec
 
 USES=		cmake compiler:c++11-lang dos2unix gettext-runtime gl jpeg xorg
 USE_GL=		gl glu glut
 USE_XORG=	xi xmu
 USE_LDCONFIG=	yes
 DOS2UNIX_GLOB=	*.cpp *.h
 
 .for v in double gif glut gsl hdf5 jpeg ltdl mgl2 opengl pdf png zlib
 CMAKE_ARGS+=	-Denable-${v}=ON
 .endfor
 
 .for v in doc-info doc-html lgpl mgltex
 CMAKE_ARGS+=	-Denable-${v}=OFF
 .endfor
 
 OPTIONS_DEFINE=		PYTHON MPI
 OPTIONS_GROUP=		GRAPHICS
 OPTIONS_GROUP_GRAPHICS=	QT5 FLTK WXGTK
 OPTIONS_RADIO=		THREADS
 OPTIONS_RADIO_THREADS=	PTHREADS OPENMP
 OPTIONS_DEFAULT=	QT5
 OPTIONS_SUB=		yes
 GRAPHICS_DESC=		Graphics support
 PTHREADS_DESC=		Enable POSIX threads support (broken, fix pending release)
 OPENMP_DESC=		Parallel processing support via OpenMP (broken, cmake bug)
 FLTK_DESC=		Enable fltk widget
 PLIST_SUB=		SHLIB_VER=7.6.0
 
 PYTHON_CMAKE_BOOL=	enable-python
 PYTHON_BUILD_DEPENDS=	swig:devel/swig \
 			${PYNUMPY}
 PYTHON_RUN_DEPENDS=	${PYNUMPY}
 PYTHON_BROKEN=		Python option needs to be fixed: lgpl needs to be enabled for it
 
 MPI_CMAKE_BOOL=		enable-mpi
 MPI_LIB_DEPENDS=	libmpi.so:net/openmpi
 
 QT5_CMAKE_BOOL=		enable-qt5
 QT5_USE=		QT=core,gui,opengl,printsupport,widgets,buildtools:build,qmake:build
 QT5_USES=		desktop-file-utils qt:5 shared-mime-info
 
 FLTK_CMAKE_BOOL=	enable-fltk
 FLTK_LIB_DEPENDS=	libfltk.so:x11-toolkits/fltk
 FLTK_USE=		XORG=ice,sm,x11,xext
 
 WXGTK_CMAKE_BOOL=	wx
 WXGTK_USE=		WX=3.0+
 
 OPENMP_CMAKE_BOOL=	enable-openmp
 
 PTHREADS_CMAKE_BOOL=	enable-pthread
 
 .include <bsd.port.options.mk>
 
 .if ! ${PORT_OPTIONS:MFLTK} && ! ${PORT_OPTIONS:MQT5}
 PLIST_SUB+=	FLTK_OR_QT5="@comment "
 .else
 PLIST_SUB+=	FLTK_OR_QT5=""
 .endif
 
 .if ${PORT_OPTIONS:MFLTK} && ${PORT_OPTIONS:MQT5}
 PLIST_SUB+=	FLTK_AND_QT5=""
 .else
 PLIST_SUB+=	FLTK_AND_QT5="@comment "
 .endif
 
 .include <bsd.port.mk>
diff --git a/math/mathicsscript/Makefile b/math/mathicsscript/Makefile
index 2bffefbc0681..6278a1bc3587 100644
--- a/math/mathicsscript/Makefile
+++ b/math/mathicsscript/Makefile
@@ -1,48 +1,49 @@
 PORTNAME=	mathicsscript
 PORTVERSION=	6.0.0
+PORTREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Terminal CLI to Mathics
 WWW=		https://mathics.org/
 
 LICENSE=	GPLv3
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Mathics3>0:math/py-mathics \
 		${PYTHON_PKGNAMEPREFIX}mathics_pygments>0:textproc/py-mathics-pygments \
 		${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}networkx>0:math/py-networkx@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}colorama>0:devel/py-colorama@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}columnize>0:devel/py-columnize@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}prompt-toolkit>0:devel/py-prompt-toolkit@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}term-background>0:deskutils/py-term-background@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Mathics3>0:math/py-mathics \
 		${PYTHON_PKGNAMEPREFIX}mathics_pygments>0:textproc/py-mathics-pygments \
 		${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}networkx>2.5:math/py-networkx@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}colorama>0:devel/py-colorama@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}columnize>0:devel/py-columnize@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}prompt-toolkit>0:devel/py-prompt-toolkit@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}term-background>0:deskutils/py-term-background@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}
 
 #USE_GITHUB=	yes
 #GH_ACCOUNT=	Mathics3
 
 USES=		python:3.8+ readline shebangfix
 USE_PYTHON=	distutils noflavors
 SHEBANG_GLOB=	*.py
 
 MAKE_ENV+=	PYTHON=${PYTHON_CMD}
 NO_ARCH=	yes
 
 post-stage:
 	${RM} -r ${STAGEDIR}/${PYTHON_SITELIBDIR}/test
 
 do-test: install
 	(cd ${TEST_WRKSRC} && py.test)
 
 .include <bsd.port.mk>
diff --git a/math/mathlibtools/Makefile b/math/mathlibtools/Makefile
index 6f70b2738d28..923bcf6bf1b0 100644
--- a/math/mathlibtools/Makefile
+++ b/math/mathlibtools/Makefile
@@ -1,30 +1,31 @@
 PORTNAME=	mathlibtools
 DISTVERSION=	1.2.0
+PORTREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Lean prover mathlib supporting tools
 WWW=		https://github.com/leanprover-community/mathlib-tools
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}atomicwrites>0:devel/py-atomicwrites@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}certifi>0:security/py-certifi@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}gitpython>=2.1.11:devel/py-gitpython@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}networkx>0:math/py-networkx@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pydot>0:graphics/py-pydot@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pygithub>0:devel/py-pygithub@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyaml>=3.13:textproc/py-pyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}toml>=0.10.0:textproc/py-toml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tqdm>0:misc/py-tqdm@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_PYTHON=	distutils noflavors autoplist
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/math/matio/Makefile b/math/matio/Makefile
index bd4411db690b..0293a82b3ab3 100644
--- a/math/matio/Makefile
+++ b/math/matio/Makefile
@@ -1,33 +1,33 @@
 PORTNAME=	matio
 PORTVERSION=	1.5.23
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	SF
 
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Library for reading and writing Matlab MAT files
 WWW=		https://sourceforge.net/projects/matio/
 
 LICENSE=	BSD2CLAUSE
 
 USES=		7z compiler:c11 cpe libtool pathfix
 
 CPE_VENDOR=	matio_project
 
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 PLIST_SUB=	SHLIB_VER=11.0.4
 
 OPTIONS_DEFINE=	HDF5
 OPTIONS_DEFAULT=	HDF5
 
 HDF5_DESC=	Support for MAT file version 7.3
 HDF5_LIB_DEPENDS=	libhdf5.so:science/hdf5
 HDF5_CONFIGURE_ON=	--enable-mat73=yes \
 			--with-hdf5=${LOCALBASE}
 
 post-extract:
 	@${CHMOD} +x ${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/math/mdal/Makefile b/math/mdal/Makefile
index 91156261bb95..1f05eecad45a 100644
--- a/math/mdal/Makefile
+++ b/math/mdal/Makefile
@@ -1,38 +1,39 @@
 PORTNAME=	mdal
 DISTVERSION=	1.0.1
+PORTREVISION=	1
 CATEGORIES=	math geography
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Mesh data abstration library
 WWW=		https://www.mdal.xyz/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${LOCALBASE}/include/gtest/gtest.h:devel/googletest
 LIB_DEPENDS=	libpdal_base.so:math/pdal \
 		libnetcdf.so:science/netcdf \
 		libsqlite3.so:databases/sqlite3 \
 		libgdal.so:graphics/gdal \
 		libhdf5.so:science/hdf5 \
 		libsz.so:science/libaec
 
 USES=		cmake gnome localbase
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
 
 PLIST_FILES=	bin/mdal_translate \
 		bin/mdalinfo \
 		include/mdal.h \
 		lib/libmdal.so \
 		lib/libmdal_a.a
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	lutraconsulting
 GH_PROJECT=	MDAL
 GH_TAGNAME=	release-${DISTVERSION}
 
 CMAKE_ARGS=	-DSQLITE3_INCLUDE_DIRS="${LOCALBASE}/include" \
 		-DSQLITE3_LIBRARY="${LOCALBASE}/lib/libsqlite3.so"
 
 .include <bsd.port.mk>
diff --git a/math/mfem/Makefile b/math/mfem/Makefile
index 654976117212..728c574aa833 100644
--- a/math/mfem/Makefile
+++ b/math/mfem/Makefile
@@ -1,53 +1,53 @@
 PORTNAME=	mfem
 DISTVERSIONPREFIX=	v
 DISTVERSION=	4.4
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Lightweight, general, scalable C++ library for finite element methods
 WWW=		https://mfem.org/
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		cmake:testing compiler:c++11-lang
 USE_GITHUB=	yes
 USE_LDCONFIG=	yes
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 CMAKE_TESTING_ON=	MFEM_ENABLE_TESTING # tests are broken, see https://github.com/mfem/mfem/issues/3163
 
 OPTIONS_DEFINE=		METIS SUPERLU
 OPTIONS_SINGLE=		MPI
 OPTIONS_SINGLE_MPI=	NOMPI MPICH OPENMPI
 OPTIONS_DEFAULT=	METIS MPICH SUPERLU # should be the same MPI choice as in science/hypre
 OPTIONS_SUB=		yes
 
 NOMPI_DESC=		Build without parallel processing support
 OPENMPI_CMAKE_ON=	-DTPL_ENABLE_MPI=OFF
 
 MPICH_USES=		mpi:mpich
 MPICH_CMAKE_ON=		-DTPL_ENABLE_MPI=ON
 MPICH_LIB_DEPENDS=	libHYPRE.so:science/hypre \
 			libmetis.so:math/metis
 
 OPENMPI_USES=		mpi:openmpi
 OPENMPI_CMAKE_ON=	-DTPL_ENABLE_MPI=ON
 OPENMPI_LIB_DEPENDS=	libHYPRE.so:science/hypre \
 			libmetis.so:math/metis
 
 METIS_DESC=		Build with metis
 METIS_CMAKE_BOOL=	MFEM_USE_METIS
 METIS_LIB_DEPENDS=	libmetis.so:math/metis
 
 SUPERLU_DESC=		Enable SuperLU use
 SUPERLU_CMAKE_BOOL=	MFEM_USE_SUPERLU
 SUPERLU_CMAKE_ON=	-DSuperLUDist_DIR=${LOCALBASE} -DSuperLUDist_INCLUDE_DIRS=${LOCALBASE}/include/superlu
 SUPERLU_LIB_DEPENDS=	libsuperlu_dist.so:math/superlu-dist
 SUPERLU_LDFLAGS=	-L${LOCALBASE}/lib -lsuperlu_dist # workaround for https://github.com/mfem/mfem/issues/3171#issuecomment-1236591028
 
 post-install-SUPERLU-on: # workaround for https://github.com/mfem/mfem/issues/3191
 	@${REINPLACE_CMD} -e 's|;${LOCALBASE}/include/superlu||' ${STAGEDIR}${PREFIX}/lib/cmake/mfem/MFEMConfig.cmake
 
 .include <bsd.port.mk>
diff --git a/math/mingw32-libgmp/Makefile b/math/mingw32-libgmp/Makefile
index 7e8242ca816c..0224e5dd4815 100644
--- a/math/mingw32-libgmp/Makefile
+++ b/math/mingw32-libgmp/Makefile
@@ -1,44 +1,44 @@
 PORTNAME=	libgmp
 PORTVERSION=	6.0.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	math devel
 MASTER_SITES=	GNU/gmp
 PKGNAMEPREFIX=	mingw32-
 DISTNAME=	gmp-${DISTVERSION}a
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Library for arbitrary precision arithmetic (MinGW32)
 WWW=		http://www.swox.com/gmp/
 
 BUILD_DEPENDS=	${PKGNAMEPREFIX}gcc:devel/${PKGNAMEPREFIX}gcc \
 		mingwm10.dll:devel/mingw32-bin-msvcrt
 
 BROKEN_FreeBSD_13=	error: '::gets' has not been declared
 BROKEN_FreeBSD_14=	error: '::gets' has not been declared
 
 WRKSRC=		${WRKDIR}/gmp-${PORTVERSION}
 
 USES=		libtool makeinfo tar:bzip2
 GMP_TARG=	${PKGNAMEPREFIX:S/-$//}
 GNU_CONFIGURE=	yes
 CC=		${PKGNAMEPREFIX}gcc
 CXX=		${PKGNAMEPREFIX}c++
 CFLAGS+=	-I/usr/include
 SSP_CFLAGS?=	-fstack-protector # XXX -strong isn't supported by GCC < 4.9
 CONFIGURE_ENV=	MAKEINFO="${MAKEINFO} --no-split" \
 		PREFIX="${PREFIX}/${GMP_TARG}" \
 		M4="/usr/bin/m4"
 CONFIGURE_ARGS=	--enable-cxx --host=${GMP_TARG} \
 		--includedir=${PREFIX}/${GMP_TARG}/include \
 		--exec_prefix=${PREFIX}/${GMP_TARG} \
 		--datadir=${PREFIX}/${GMP_TARG}/share \
 		--libdir=${PREFIX}/${GMP_TARG}/lib
 CONFIGURE_TARGET=
 
 INFO=		gmp
 INFO_PATH=	${GMP_TARG}/info
 
 post-extract:
 	@${RM} ${WRKSRC}/doc/gmp.info*
 
 .include <bsd.port.mk>
diff --git a/math/minizinc-ide/Makefile b/math/minizinc-ide/Makefile
index db420bd6b731..cb13b3d84d41 100644
--- a/math/minizinc-ide/Makefile
+++ b/math/minizinc-ide/Makefile
@@ -1,35 +1,36 @@
 PORTNAME=	minizinc-ide
 DISTVERSION=	2.6.4
+PORTREVISION=	1
 CATEGORIES=	math lang
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	IDE for MiniZinc, a constraint modeling language
 WWW=		https://www.minizinc.org/
 
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	minizinc:math/minizinc
 
 USES=		gl compiler:c++11-lang qmake qt:5
 USE_QT=		core declarative gui location network printsupport \
 		sql testlib webchannel webengine websockets widgets \
 		buildtools:build
 USE_GL=		gl
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	MiniZinc
 GH_PROJECT=	MiniZincIDE
 
 USE_GITLAB=	nodefault
 GL_TUPLE=	minizinc:cp-profiler-integration:f16b3132df33b3f258971f36dbe5e909983381c9:cp/cp-profiler/src/cpp-integration
 
 PLIST_FILES=	bin/MiniZincIDE \
 		share/pixmaps/minizinc_icon.png
 
 DESKTOP_ENTRIES=	"MiniZinc" "Constraint modeling language" "${PREFIX}/share/pixmaps/minizinc_icon.png" "MiniZincIDE" "Science;Development;Education;" ""
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/resources/icon.png ${STAGEDIR}${PREFIX}/share/pixmaps/minizinc_icon.png
 
 .include <bsd.port.mk>
diff --git a/math/minizinc-solvers/Makefile b/math/minizinc-solvers/Makefile
index 2e4ed52af248..8373a585375d 100644
--- a/math/minizinc-solvers/Makefile
+++ b/math/minizinc-solvers/Makefile
@@ -1,35 +1,36 @@
 PORTNAME=	minizinc-solvers
 PORTVERSION=	20210505
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Metaport for MiniZinc solvers
 WWW=		https://www.minizinc.org/
 
 USES=		metaport
 
 OPTIONS_MULTI=		LIST
 OPTIONS_MULTI_LIST=	BONMIN CHUFFED COUENNE JACOP GECODE OR_TOOLS
 OPTIONS_DEFAULT=	${OPTIONS_MULTI_LIST}
 
 LIST_DESC=		Install:
 
 BONMIN_DESC=		Nonlinear mixed integer programming solver (COIN-OR)
 BONMIN_RUN_DEPENDS=	coin-or-bonmin>0:math/bonmin
 
 CHUFFED_DESC=		Chuffed lazy clause generation CP solver
 CHUFFED_RUN_DEPENDS=	chuffed>0:math/chuffed
 
 COUENNE_DESC=		Nonlinear convex over and under envelopes solver (COIN-OR)
 COUENNE_RUN_DEPENDS=	coin-or-couenne>0:math/couenne
 
 JACOP_DESC=		Java Constraint Programming solver
 JACOP_RUN_DEPENDS=	jacop>0:math/jacop
 
 GECODE_DESC=		Gecode solver
 GECODE_RUN_DEPENDS=	gecode>0:math/gecode
 
 OR_TOOLS_DESC=		Google OR-Tools-based solver
 OR_TOOLS_RUN_DEPENDS=	or-tools>0:math/or-tools
 
 .include <bsd.port.mk>
diff --git a/math/minizinc/Makefile b/math/minizinc/Makefile
index 17a8933047c1..d4d71f3db17d 100644
--- a/math/minizinc/Makefile
+++ b/math/minizinc/Makefile
@@ -1,41 +1,42 @@
 PORTNAME=	minizinc
 DISTVERSION=	2.6.4
+PORTREVISION=	1
 CATEGORIES=	math lang
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Constraint modeling language
 WWW=		https://www.minizinc.org/
 
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 CONFLICTS_BUILD=	CoinMP
 
 LIB_DEPENDS=	libCbc.so:math/cbc \
 		libCgl.so:math/cgl \
 		libCoinUtils.so:math/coinutils \
 		libgecodekernel.so:math/gecode \
 		libOsi.so:math/osi \
 		libOsiClp.so:math/clp
 
 USES=		bison cmake compiler:c++11-lang
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	MiniZinc
 GH_PROJECT=	libminizinc
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 
 CXXFLAGS+=	-DFREEBSD_MZN_STDLIB_DIR="\\\"${DATADIR}\\\""
 
 OPTIONS_DEFINE=		WITH_SCIP
 
 WITH_SCIP_DESC=		Build with the SCIP optimizer
 WITH_SCIP_CMAKE_BOOL=	USE_SCIP
 WITH_SCIP_LIB_DEPENDS=	libscip.so:math/SCIP/
 
 post-patch:
 	${REINPLACE_CMD} -e 's|string std_lib_dir;|string std_lib_dir = "${DATADIR}";|' ${WRKSRC}/mzn2doc.cpp
 
 .include <bsd.port.mk>
diff --git a/math/miracl/Makefile b/math/miracl/Makefile
index a81c80f420d9..b733115b28ab 100644
--- a/math/miracl/Makefile
+++ b/math/miracl/Makefile
@@ -1,75 +1,75 @@
 PORTNAME=	miracl
 PORTVERSION=	5.6
-PORTREVISION=	7
+PORTREVISION=	8
 PORTEPOCH=	1
 CATEGORIES=	math
 MASTER_SITES=	http://mirror.shatow.net/freebsd/${PORTNAME}/ \
 		LOCAL/jase
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Multiprecision Integer and Rational Arithmetic C/C++ Library
 WWW=		http://certivox.com/index.php/solutions/miracl-crypto-sdk
 
 LICENSE=	AGPLv3 COMMERCIAL
 LICENSE_COMB=	dual
 LICENSE_NAME_COMMERCIAL=	Commercial use license to not be bound by AGPLv3
 LICENSE_TEXT_COMMERCIAL=	License available from CertiVox for commercial use and
 LICENSE_TEXT_COMMERCIAL+=	to not be bound by the terms of the AGPLv3. Visit
 LICENSE_TEXT_COMMERCIAL+=	http://certivox.com/index.php/solutions/miracl-crypto-sdk/
 LICENSE_TEXT_COMMERCIAL+=	for more details.
 #LICENSE_FILE=			${FILESDIR}/LICENSE
 LICENSE_PERMS_COMMERCIAL=	dist-mirror dist-sell pkg-mirror pkg-sell no-auto-accept
 
 ONLY_FOR_ARCHS=	i386 amd64
 
 USES=		zip
 USE_GCC=	yes
 USE_LDCONFIG=	yes
 
 EXTRACT_BEFORE_ARGS=	-j -L -q
 EXTRACT_AFTER_ARGS=	-d ${WRKSRC}
 
 PLIST_FILES=	lib/libmiracl.a \
 		include/miracl.h include/mirdef.h
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == "i386"
 BUILDCMD=	linux
 .elif ${ARCH} == "amd64"
 BUILDCMD=	linux64
 .endif
 
 .if ${ARCH} == "amd64"
 CFLAGS+=	-fPIC
 .endif
 
 post-patch:
 # C{C,XX} safeness
 # CFLAGS safeness
 	@${REINPLACE_CMD} -E \
 		-e 's|gcc|${CC}|' \
 		-e 's|g\+\+|${CXX}|' \
 		-e 's|-O2|${CFLAGS}|' \
 		${WRKSRC}/${BUILDCMD}
 # Don't error when files not found
 # Fix mrmuldv.cc not existing due to s/gcc/CC/ replacement above.
 	@${REINPLACE_CMD} -E \
 		-e 's|^rm |${RM} |' \
 		-e 's|^cp mrmuldv\.${CC} mrmuldv\.c|${CP} mrmuldv.gcc mrmuldv.c|' \
 		${WRKSRC}/${BUILDCMD}
 
 do-build:
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${SH} -ve ./${BUILDCMD}
 
 do-install:
 # lib
 	@${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.a \
 		${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.a
 # headers
 	@${INSTALL_DATA} ${WRKSRC}/miracl.h \
 		${STAGEDIR}${PREFIX}/include/miracl.h
 	@${INSTALL_DATA} ${WRKSRC}/mirdef.h \
 		${STAGEDIR}${PREFIX}/include/mirdef.h
 
 .include <bsd.port.mk>
diff --git a/math/mlpack/Makefile b/math/mlpack/Makefile
index 111055978ab3..d5a031355fcc 100644
--- a/math/mlpack/Makefile
+++ b/math/mlpack/Makefile
@@ -1,39 +1,39 @@
 PORTNAME=	mlpack
 DISTVERSION=	4.0.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	math # machine-learning
 MASTER_SITES=	https://mlpack.org/files/
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Fast, flexible machine learning library
 WWW=		https://www.mlpack.org/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BROKEN_i386=	undefined symbol: __atomic_load
 
 HPP_DEPENDS=	armadillo>0:math/armadillo \
 		cereal>0:devel/cereal \
 		ensmallen>0:math/ensmallen \
 		${LOCALBASE}/include/stb/stb_image.h:devel/stb
 BUILD_DEPENDS=	${HPP_DEPENDS}
 RUN_DEPENDS=	${HPP_DEPENDS}
 
 USES=		cmake:testing compiler:c++14-lang pkgconfig
 
 CMAKE_ARGS=	-DSTB_IMAGE_INCLUDE_DIR=${LOCALBASE}/include/stb
 CMAKE_OFF=	BUILD_PYTHON_BINDINGS BUILD_TESTS
 CMAKE_TESTING_ON=	BUILD_TESTS
 
 BINARY_ALIAS=	git=false
 
 OPTIONS_DEFINE=		EXECUTABLES
 OPTIONS_DEFAULT=	EXECUTABLES
 OPTIONS_SUB=		yes
 
 EXECUTABLES_DESC=	Build command-line executables
 EXECUTABLES_CMAKE_BOOL=	BUILD_CLI_EXECUTABLES
 EXECUTABLES_VARS_OFF=	NO_ARCH=yes
 
 .include <bsd.port.mk>
diff --git a/math/moab/Makefile b/math/moab/Makefile
index 65e2e10aa71a..7905400092a3 100644
--- a/math/moab/Makefile
+++ b/math/moab/Makefile
@@ -1,47 +1,47 @@
 PORTNAME=	moab
 DISTVERSION=	5.3.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 MASTER_SITES=	https://bitbucket.org/${BB_ACCOUNT}/${BB_PROJECT}/get/${BB_COMMIT}.tar.gz?dummy=/
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Component for representing and evaluating mesh data
 WWW=		https://press3.mcs.anl.gov/sigma/moab-library/
 
 LICENSE=	LGPL3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libhdf5.so:science/hdf5 \
 		libnetcdf.so:science/netcdf \
 		libopenblas.so:math/openblas
 
 USES=		cmake eigen:3 fortran
 USE_LDCONFIG=	yes
 
 CMAKE_ARGS=	-DBLAS_LIBRARIES:STRING=${LOCALBASE}/lib/libopenblas.so \
 		-DLAPACK_LIBRARIES:STRING=${LOCALBASE}/lib/libopenblas.so \
 		-DFREEBSD_STAGEDIR:STRING=${STAGEDIR}
 
 BB_ACCOUNT=	fathomteam
 BB_PROJECT=	${PORTNAME}
 BB_COMMIT=	65880ffe833d
 
 WRKSRC=		${WRKDIR}/${BB_ACCOUNT}-${BB_PROJECT}-${BB_COMMIT}
 
 OPTIONS_DEFINE=		MPI
 OPTIONS_DEFAULT=	MPI
 OPTIONS_SUB=		yes
 
 MPI_CMAKE_BOOL=		ENABLE_MPI
 MPI_LIB_DEPENDS=	libmpi.so:net/openmpi
 MPI_VARS=		CXX=${LOCALBASE}/mpi/openmpi/bin/mpic++ CC=${LOCALBASE}/mpi/openmpi/bin/mpicc
 MPI_VARS+=		CONFLICTS_BUILD=mpich # otherwise bin/hexmodops gets linked with libmpi.so:net/mpich
 MPI_VARS_OFF=		USES=compiler:c++11-lang
 
 post-install:
 	# docs are just readmes
 	@${RM} -r ${STAGEDIR}${DOCSDIR}
 	# examples are installed into a wrong location, maybe fix them later?
 	@${RM} -r ${STAGEDIR}${PREFIX}/share/examples
 
 .include <bsd.port.mk>
diff --git a/math/mpc/Makefile b/math/mpc/Makefile
index c0107a1901d2..7ee8f9c2ee7f 100644
--- a/math/mpc/Makefile
+++ b/math/mpc/Makefile
@@ -1,28 +1,29 @@
 PORTNAME=	mpc
 PORTVERSION=	1.3.1
+PORTREVISION=	1
 CATEGORIES=	math devel
 MASTER_SITES=	GNU
 
 MAINTAINER=	gerald@FreeBSD.org
 COMMENT=	Library of complex numbers with arbitrarily high precision
 WWW=		https://www.multiprecision.org/mpc/
 
 LICENSE=	LGPL3+
 LICENSE_FILE=	${WRKSRC}/COPYING.LESSER
 
 LIB_DEPENDS=	libgmp.so:math/gmp \
 		libmpfr.so:math/mpfr
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-gmp=${LOCALBASE} \
 		--with-mpfr=${LOCALBASE}
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check
 USES=		libtool
 USE_LDCONFIG=	yes
 
 INFO=		mpc
 PLIST_FILES=	include/mpc.h \
 		lib/libmpc.a lib/libmpc.so lib/libmpc.so.3 lib/libmpc.so.3.3.1
 
 .include <bsd.port.mk>
diff --git a/math/mpfrcx/Makefile b/math/mpfrcx/Makefile
index d42dfd29e915..b4dac259d82a 100644
--- a/math/mpfrcx/Makefile
+++ b/math/mpfrcx/Makefile
@@ -1,33 +1,34 @@
 PORTNAME=	mpfrcx
 DISTVERSION=	0.6.3
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	http://www.multiprecision.org/downloads/
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Arbitrary precision library for arithmetic of univariate polynomials
 WWW=		https://www.multiprecision.org/mpfrcx/home.html
 
 LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/COPYING.LESSER
 
 LIB_DEPENDS=	libgmp.so:math/gmp \
 		libmpc.so:math/mpc \
 		libmpfr.so:math/mpfr
 
 USES=		gmake libtool localbase
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
 
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check
 
 INFO=		mpfrcx
 
 PLIST_FILES=	include/mpfrcx.h \
 		lib/libmpfrcx.a \
 		lib/libmpfrcx.so \
 		lib/libmpfrcx.so.1 \
 		lib/libmpfrcx.so.1.2.3
 
 .include <bsd.port.mk>
diff --git a/math/mppp/Makefile b/math/mppp/Makefile
index fd157606a68f..7de18a5e6f36 100644
--- a/math/mppp/Makefile
+++ b/math/mppp/Makefile
@@ -1,44 +1,44 @@
 PORTNAME=	mppp
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.27
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Multiprecision for modern C++
 WWW=		https://github.com/bluescarni/mppp
 
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libarb.so:math/arb \
 		libboost_serialization.so:devel/boost-libs \
 		libflint.so:math/flint2 \
 		libgmp.so:math/gmp \
 		libmpc.so:math/mpc \
 		libmpfr.so:math/mpfr
 
 USES=		cmake compiler:c++14-lang
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	bluescarni
 
 CMAKE_ON=	MPPP_WITH_ARB MPPP_WITH_MPC MPPP_WITH_MPFR MPPP_ENABLE_IPO MPPP_WITH_BOOST_S11N
 CMAKE_OFF=	MPPP_WITH_QUADMATH # no quad-precision fp type on FreeBSD, requested __float128 reinstantiation, bug#238129
 TEST_ARGS=	-DMPPP_BUILD_TESTS=ON -DMPPP_WITH_QUADMATH=OFF
 BENCHMARK_ARGS=	-DMPPP_BUILD_BENCHMARKS=ON -DMPPP_BENCHMARK_FLINT=ON -DMPPP_BENCHMARK_BOOST=ON
 
 do-test:
 	@cd ${BUILD_WRKSRC} && \
 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} ${TEST_ARGS} ${CMAKE_SOURCE_PATH} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
 
 benchmarks: build # additionally depends on boost-libs
 	@cd ${BUILD_WRKSRC} && \
 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} ${BENCHMARK_ARGS} ${CMAKE_SOURCE_PATH} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} benchmark
 
 .include <bsd.port.mk>
diff --git a/math/mumps/Makefile b/math/mumps/Makefile
index 30819b13b088..14592851fed9 100644
--- a/math/mumps/Makefile
+++ b/math/mumps/Makefile
@@ -1,145 +1,145 @@
 PORTNAME=	mumps
 DISTVERSION=	5.1.2-aster7
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	math
 PKGNAMESUFFIX=	-edf
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	MUltifrontal Massively Parallel sparse direct Solver for Code_Aster
 WWW=		https://graal.ens-lyon.fr/MUMPS/
 
 LICENSE=	CeCILL_C
 LICENSE_NAME=	CeCILL-C
 LICENSE_FILE=	${WRKSRC}/LICENSE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 LIB_DEPENDS=	libmetis.so:math/metis
 
 USES=		blaslapack fortran
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
 FORTRANLIBS=	-lgfortran
 GCCLIBDIR=	${LDFLAGS}
 USE_LDCONFIG=	yes
 VEM=		${PORTVERSION:R:R:R}
 MUMPSVERSION=	${PORTVERSION:R}
 LIBS=	cmumps dmumps mumps_common pord smumps zmumps
 PLIST_SUB=	VE=${VEM} MUMPSVERSION=${MUMPSVERSION}
 
 OPTIONS_DEFINE=	DOCS EXAMPLES MPICH
 
 MPICH_USES=		mpi:mpich
 MPICH_LIB_DEPENDS_OFF=	libscotch.so:cad/scotch
 MPICH_LIB_DEPENDS=	libparmetis.so:math/parmetis	\
 			libptscotch.so:cad/scotch	\
 			libscalapack.so:math/scalapack
 MPICH_PLIST_SUB=	WITH_LIBSEQ="@comment "
 MPICH_PLIST_SUB_OFF=	WITH_LIBSEQ=""
 MPICH_LIBS_OFF=		mpiseq
 
 MAKE_JOBS_UNSAFE=yes
 
 .include <bsd.port.pre.mk>
 .include "${.CURDIR}/../../french/aster/bsd.aster.mk"
 
 .if ${GCC_DEFAULT} >= 10
 # workaround for Type mismatch in argument 's' at (1); passed INTEGER(4) to LOGICAL(4)
 FCFLAGS+=	-fallow-argument-mismatch
 .endif
 
 .ifdef WITH_MPICH
 PKGNAMESUFFIX+=		-mpich
 .endif
 
 .if ${FORTRAN_DEFAULT} == gfortran && ${GCC_DEFAULT} >= 10
 FCFLAGS+=	-fallow-argument-mismatch
 .endif
 
 post-patch-MPICH-on:
 	${INSTALL_DATA} ${WRKSRC}/Make.inc/Makefile.FREEBSD10.PAR \
 		${WRKSRC}/Makefile.inc
 
 post-patch-MPICH-off:
 	${INSTALL_DATA} ${WRKSRC}/Make.inc/Makefile.FREEBSD10.SEQ \
 		${WRKSRC}/Makefile.inc
 
 pre-configure:
 	${DIRNAME} `${FC} -print-libgcc-file-name` > ${WRKSRC}/LIBDIR
 .for MF in Makefile Makefile.inc PORD/lib/Makefile libseq/Makefile src/Makefile
 	${REINPLACE_CMD} -e 's+@CC@+${CC}+g ; s+@FC@+${FC}+g ; \
 	s+/usr/local+${LOCALBASE}+; \
 	s+@CFLAGS@+${CFLAGS} -fPIC+g; \
 	s+@FCFLAGS@+${FCFLAGS} -fPIC+g; \
 	s+@SOVER@+${VEM}+g; \
 	s+@GCCLIBDIR@+${GCCLIBDIR}+g; \
 	s+@FORTRANLIBS@+${FORTRANLIBS}+g; \
 	s+@BLAS_LIBS@+${BLASLIB}+ ; \
 	s+@LAPACK_LIBS@+${LAPACKLIB}+ ; \
 	s+@LOCALBASE@+${LOCALBASE}+g;' \
 		${WRKSRC}/${MF}
 .endfor
 
 pre-configure-MPICH-on:
 	${REINPLACE_CMD} -e '/lptscotch/s|#LSCOTCH|LSCOTCH|'	\
 		-e 's|^LMETIS|##LMETIS|;s|^#LMETIS|LMETIS|' ${WRKSRC}/Makefile.inc
 
 pre-configure-MPICH-off:
 	${REINPLACE_CMD} -e '/lscotch/s|#LSCOTCH|LSCOTCH|' ${WRKSRC}/Makefile.inc
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/include/*.h ${STAGEDIR}${PREFIX}/include
 	${INSTALL_DATA} ${WRKSRC}/lib/lib*.a ${STAGEDIR}${PREFIX}/lib
 	${INSTALL_LIB} ${WRKSRC}/lib/lib*.so.${VEM} ${STAGEDIR}${PREFIX}/lib
 .for lib in ${LIBS}
 	(cd ${STAGEDIR}${PREFIX}/lib &&	\
 	${LN} -sf lib${lib}.so.${VEM} ${STAGEDIR}${PREFIX}/lib/lib${lib}.so)
 .endfor
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/userguide_${MUMPSVERSION}.pdf ${STAGEDIR}${DOCSDIR}
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 .for ex in Makefile README *.c *.F input_simpletest_*
 	${INSTALL_DATA} ${WRKSRC}/examples/${ex} ${STAGEDIR}${EXAMPLESDIR}
 .endfor
 .for ex in c_example *simpletest
 	${INSTALL_PROGRAM} ${WRKSRC}/examples/${ex} ${STAGEDIR}${EXAMPLESDIR}
 .endfor
 
 do-install-MPICH-off:
 	${MKDIR} ${STAGEDIR}${PREFIX}/include/mumps_seq
 	${INSTALL_DATA} ${WRKSRC}/libseq/mpi.h ${STAGEDIR}${PREFIX}/include/mumps_seq/mpi.h
 	${INSTALL_DATA} ${WRKSRC}/libseq/libmpiseq.a ${STAGEDIR}${PREFIX}/lib
 	${INSTALL_LIB} ${WRKSRC}/libseq/libmpiseq*.so.${VEM} ${STAGEDIR}${PREFIX}/lib
 .for lib in ${LIBS}
 . for ext in a so so.${VEM}
 	(cd ${STAGEDIR}${PREFIX}/lib &&	\
 	${LN} -sf lib${lib}.${ext} ${STAGEDIR}${PREFIX}/lib/lib${lib}_seq.${ext})
 . endfor
 .endfor
 
 test:	install
 .if defined (WITH_MPICH) && defined(MAINTAINER_MODE)
 .  if !exists(${HOME}/.mpd.conf)
 	@${ECHO_CMD} "MPD_SECRETWORD=change_on_install" > ${HOME}/.mpd.conf
 	${CHMOD} go-r ${HOME}/.mpd.conf
 	@${ECHO_MSG} "${HOME}/.mpd.conf has been generated - please change the secret word!"
 .  endif
 	(cd ${WRKSRC}/examples &&	\
 	${LOCALBASE}/bin/mpirun -np 2 ./ssimpletest < input_simpletest_real ;	\
 	${LOCALBASE}/bin/mpirun -np 2 ./dsimpletest < input_simpletest_real ;	\
 	${LOCALBASE}/bin/mpirun -np 2 ./csimpletest < input_simpletest_cmplx ;	\
 	${LOCALBASE}/bin/mpirun -np 2 ./zsimpletest < input_simpletest_cmplx ;	\
 	${ECHO_MSG} "The solution should be (1,2,3,4,5)" ;	\
 	${LOCALBASE}/bin/mpirun -np 3 ./c_example ;	\
 	${ECHO_MSG} "The solution should be (1,2)")
 .else
 	(cd ${WRKSRC}/examples &&	\
 	./ssimpletest < input_simpletest_real ;			\
 	./dsimpletest < input_simpletest_real ;			\
 	./csimpletest < input_simpletest_cmplx ;		\
 	./zsimpletest < input_simpletest_cmplx ;		\
 	${ECHO_MSG} "The solution should be (1,2,3,4,5)" ;	\
 	./c_example ;						\
 	${ECHO_MSG} "The solution should be (1,2)")
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/math/mumps4/Makefile b/math/mumps4/Makefile
index 093d09482ba0..acb43ba5440c 100644
--- a/math/mumps4/Makefile
+++ b/math/mumps4/Makefile
@@ -1,120 +1,120 @@
 PORTNAME=	mumps4
 PORTVERSION=	4.10.0	# Please do not upgrade to 5+: use math/mumps
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	math
 MASTER_SITES=	http://mumps.enseeiht.fr/		\
 		http://graal.ens-lyon.fr/MUMPS/		\
 		http://www.enseeiht.fr/apo/MUMPS/	\
 		http://www.enseeiht.fr/irit/apo/MUMPS/
 DISTNAME=	MUMPS_${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	MUltifrontal Massively Parallel sparse direct Solver
 WWW=		https://graal.ens-lyon.fr/MUMPS/
 
 LICENSE=	PD
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		fortran
 
 MAKE_JOBS_UNSAFE=yes
 
 FFLAGS+=	-ffast-math
 FORTRANLIBS=	-lgfortran
 GCCLIBDIR=	${LDFLAGS}
 USE_LDCONFIG=	yes
 VEM=		${PORTVERSION:R:R}
 LIBS=		cmumps dmumps mumps_common pord smumps zmumps
 
 CONFLICTS+=	mumps-mpich-4*
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 LIBS+=		mpiseq
 
 PLIST_SUB+=	MUMPSVERSION=${PORTVERSION} MUMPSV=${VEM}
 
 #-----------------------------------------------------------------------
 # WARNING: Non-serviceable parts inside, can break other ports
 # You may define these options/knobs:
 #
 # FFLAGS: Fortran compiler flags for gfortran
 # BLASLIB: specify other version of BLAS
 # WITH_ATLAS: Use ATLAS instead of the regular BLAS
 #-----------------------------------------------------------------------
 
 .include <bsd.port.pre.mk>
 
 # This is like blaslapack, except we don't use lapack at all
 .if exists(${LOCALBASE}/lib/libatlas.so) && !defined(WITH_BLAS)
 WITH_ATLAS=	yes
 .endif
 .if defined(WITH_ATLAS)
 LIB_DEPENDS+=	libatlas.so:math/atlas
 BLASLIB=	-lf77blas
 #LAPACKLIB=	-lalapack -lcblas
 .else
 LIB_DEPENDS+=	libblas.so:math/blas
 BLASLIB=	-lblas
 #LAPACKLIB=	-llapack
 .endif
 
 .if ${GCC_DEFAULT} >= 10
 # workaround for Type mismatch in argument 's' at (1); passed INTEGER(4) to LOGICAL(4)
 FCFLAGS+=	-fallow-argument-mismatch
 .endif
 
 pre-configure:
 	${INSTALL_DATA} ${WRKSRC}/Make.inc/Makefile.inc.generic.SEQ \
 		${WRKSRC}/Makefile.inc
 	${REINPLACE_CMD} -e 's+LIBPAR+LIBSEQ+' ${WRKSRC}/src/Makefile
 
 pre-build:
 	${DIRNAME} `${FC} -print-libgcc-file-name` > ${WRKSRC}/LIBDIR
 .for MF in Makefile Makefile.inc PORD/lib/Makefile libseq/Makefile src/Makefile
 	${REINPLACE_CMD} -e 's+@CC@+${CC}+g ; s+@FC@+${FC}+g ; \
 	s+@CFLAGS@+${CFLAGS} -fPIC+g; \
 	s+@FCFLAGS@+${FCFLAGS} -fPIC+g; \
 	s+@SOVER@+${VEM}+g; \
 	s+@GCCLIBDIR@+${GCCLIBDIR}+g; \
 	s+@FORTRANLIBS@+${FORTRANLIBS}+g; \
 	s+@BLAS_LIBS@+${BLASLIB}+ ; \
 	s+@LOCALBASE@+${LOCALBASE}+g;' \
 		${WRKSRC}/${MF}
 .endfor
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/include/${PORTNAME}
 	${INSTALL_DATA} ${WRKSRC}/include/*.h ${STAGEDIR}${PREFIX}/include/${PORTNAME}
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}
 	${INSTALL_DATA} ${WRKSRC}/lib/lib*.a ${STAGEDIR}${PREFIX}/lib/${PORTNAME}
 	${INSTALL_LIB} ${WRKSRC}/lib/lib*.so.${VEM} ${STAGEDIR}${PREFIX}/lib
 	${INSTALL_DATA} ${WRKSRC}/libseq/libmpiseq.a ${STAGEDIR}${PREFIX}/lib/${PORTNAME}
 	${INSTALL_LIB} ${WRKSRC}/libseq/libmpiseq*.so.${VEM} ${STAGEDIR}${PREFIX}/lib
 .for lib in ${LIBS}
 	(cd ${STAGEDIR}${PREFIX}/lib &&	\
 		${LN} -sf lib${lib}.so.${VEM} ${STAGEDIR}${PREFIX}/lib/lib${lib}4.so)
 . endfor
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/userguide_${PORTVERSION}.pdf ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/userguide_${PORTVERSION}.ps ${STAGEDIR}${DOCSDIR}
 	${GZIP_CMD} ${STAGEDIR}${DOCSDIR}/userguide_${PORTVERSION}.ps
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 . for ex in Makefile README *.c *.F input_simpletest_*
 	${INSTALL_DATA} ${WRKSRC}/examples/${ex} ${STAGEDIR}${EXAMPLESDIR}
 . endfor
 . for ex in c_example *simpletest
 	${INSTALL_PROGRAM} ${WRKSRC}/examples/${ex} ${STAGEDIR}${EXAMPLESDIR}
 . endfor
 
 regression-test:	install
 	(cd ${WRKSRC}/examples &&	\
 	./ssimpletest < input_simpletest_real ;			\
 	./dsimpletest < input_simpletest_real ;			\
 	./csimpletest < input_simpletest_cmplx ;		\
 	./zsimpletest < input_simpletest_cmplx ;		\
 	${ECHO_MSG} "The solution should be (1,2,3,4,5)" ;	\
 	./c_example ;						\
 	${ECHO_MSG} "The solution should be (1,2)")
 
 .include <bsd.port.post.mk>
diff --git a/math/nlopt/Makefile b/math/nlopt/Makefile
index 0966f3036444..f9146ece8291 100644
--- a/math/nlopt/Makefile
+++ b/math/nlopt/Makefile
@@ -1,29 +1,30 @@
 PORTNAME=	nlopt
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.7.1
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	rhurlin@FreeBSD.org
 COMMENT=	Nonlinear optimization library
 WWW=		https://nlopt.readthedocs.io/en/latest/
 
 LICENSE=	LGPL21 MIT
 LICENSE_COMB=	multi
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BROKEN_armv6=	fails to package: Unable to access file site-packages/_nlopt.a:No such file or directory
 BROKEN_armv7=	fails to package: Unable to access file site-packages/_nlopt.a:No such file or directory
 
 BUILD_DEPENDS=	swig:devel/swig \
 		${PYNUMPY}
 LIB_DEPENDS=	libgmp.so:math/gmp \
 		libguile-2.2.so:lang/guile2
 RUN_DEPENDS=	${PYNUMPY}
 
 USES=		cmake:testing compiler:features localbase pathfix pkgconfig python
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	stevengj
 USE_LDCONFIG=	yes
 
 .include <bsd.port.mk>
diff --git a/math/ntpoly/Makefile b/math/ntpoly/Makefile
index 93bdf9c5db33..807796adb9bb 100644
--- a/math/ntpoly/Makefile
+++ b/math/ntpoly/Makefile
@@ -1,60 +1,61 @@
 PORTNAME=	NTPoly
 DISTVERSION=	2.7.1
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	math
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Library for computing the functions of sparse matrices
 WWW=		https://william-dawson.github.io/NTPoly
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	swig>0:devel/swig
 TEST_DEPENDS=	${PYNUMPY}	\
 		bash:shells/bash	\
 		${PYTHON_PKGNAMEPREFIX}mpi4py>0:net/py-mpi4py@${PY_FLAVOR}	\
 		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR}
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	william-dawson
 GH_TAGNAME=	${PORTNAME:tl}-${DISTVERSIONPREFIX}${DISTVERSION}
 
 USES=		blaslapack:openblas cmake fortran mpi python
 FFLAGS+=	-fopenmp -fallow-argument-mismatch
 CXXFLAGS+=	-fopenmp
 CMAKE_ARGS=	-DCMAKE_TOOLCHAIN_FILE=${TOOLCHAIN}
 CMAKE_ON=	BUILD_SHARED_LIBS
 USE_LDCONFIG=	yes
 
 TOOLCHAIN=	${WRKSRC}/Targets/${OPSYS}.cmake
 
 NTPLIBS=	${PORTNAME} ${PORTNAME}CPP ${PORTNAME}Wrapper
 
 pre-configure:
 	${ECHO_CMD} 'set(CMAKE_SYSTEM_NAME ${OPSYS})' > ${TOOLCHAIN}
 	${ECHO_CMD} 'set(CMAKE_C_COMPILER ${MPICC})' >> ${TOOLCHAIN}
 	${ECHO_CMD} 'set(CMAKE_Fortran_COMPILER ${MPIFC})' >> ${TOOLCHAIN}
 	${ECHO_CMD} 'set(CMAKE_CXX_COMPILER ${MPICXX})' >> ${TOOLCHAIN}
 	${ECHO_CMD} 'set(TOOLCHAIN_LIBS "${BLASLIB}")' >> ${TOOLCHAIN}
 	${ECHO_CMD} 'set(F_TOOLCHAINFLAGS_RELEASE "${FFLAGS}")' >> ${TOOLCHAIN}
 	${ECHO_CMD} 'set(CXX_TOOLCHAINFLAGS_DEBUG "${CXXFLAGS}")' >> ${TOOLCHAIN}
 	${ECHO_CMD} 'set(F_TOOLCHAINFLAGS_DEBUG "${FFLAGS}")' >> ${TOOLCHAIN}
 	${ECHO_CMD} 'set(TARGET_SUPPORTS_SHARED_LIBS Yes)' >> ${TOOLCHAIN}
 
 post-install:
 .for l in ${NTPLIBS}
 	${MV} ${STAGEDIR}${PREFIX}/lib/lib${l}.so	\
 		${STAGEDIR}${PREFIX}/lib/lib${l}.so.0
 	${RLN} ${STAGEDIR}${PREFIX}/lib/lib${l}.so.0	\
 		${STAGEDIR}${PREFIX}/lib/lib${l}.so
 .endfor
 
 do-test:
 	@${ECHO_MSG} "/!\\ WARNING /!\\"
 	@${ECHO_MSG} "net/py-mpi4py must be built against MPICH!"
 	cd ${BUILD_WRKSRC} && \
 	${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
 	${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
 
 .include <bsd.port.mk>
diff --git a/math/obake/Makefile b/math/obake/Makefile
index 8f28129484e1..c06b92610b10 100644
--- a/math/obake/Makefile
+++ b/math/obake/Makefile
@@ -1,45 +1,45 @@
 PORTNAME=	obake
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.7.0-24
 DISTVERSIONSUFFIX=	-gb8cc71c
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	math
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
 PATCHFILES+=	1a53966f5ce8ca5542d3612c780ea4b69be34de2.patch:-p1 \
 		dadf4ce2aba713522d1949a16ffbf0fa5d6e6298.patch:-p1 \
 		9310de2cb5cc4c85b54e7e90aa6cd88664380346.patch:-p1 \
 		57da8d5f2d0c50e857979ba74434893b0b392382.patch:-p1 \
 		494df04bd7608bb666efde776241370cb84c96bb.patch:-p1 # adding fmt9 compatibility, see https://github.com/bluescarni/obake/pull/145/commits
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	C++ library for the symbolic manipulation of sparse polynomials & co
 WWW=		https://bluescarni.github.io/obake/
 
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libabsl_base.so:devel/abseil \
 		libboost_serialization.so:devel/boost-libs \
 		libfmt.so:devel/libfmt \
 		libgmp.so:math/gmp \
 		libmp++.so:math/mppp \
 		libmpc.so:math/mpc \
 		libmpfr.so:math/mpfr \
 		libtbb.so:devel/onetbb
 
 USES=		cmake:testing compiler:c++20-lang
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	bluescarni
 
 CXXFLAGS+=	-DBOOST_STACKTRACE_GNU_SOURCE_NOT_REQUIRED
 
 CMAKE_TESTING_ON=	OBAKE_BUILD_TESTS
 
 post-install:
 	# remove patch artefacts
 	@${FIND} ${STAGEDIR}${PREFIX}/include/obake -name "*.orig" -delete
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-actuarial/Makefile b/math/octave-forge-actuarial/Makefile
index 372a6db9ab5f..03bafcc46b12 100644
--- a/math/octave-forge-actuarial/Makefile
+++ b/math/octave-forge-actuarial/Makefile
@@ -1,22 +1,22 @@
 PORTNAME=	octave-forge-actuarial
 PORTVERSION=	1.1.0
-PORTREVISION=	25
+PORTREVISION=	26
 CATEGORIES=	math
 MASTER_SITES=	SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
 DISTNAME=	${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKDIR}/${OCTAVE_SRC}/COPYING
 
 USES=		octave
 
 OCTAVE_SRC=		${OCTAVE_PKGNAME}
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-audio/Makefile b/math/octave-forge-audio/Makefile
index 3f4eab3c14b2..18a539201c37 100644
--- a/math/octave-forge-audio/Makefile
+++ b/math/octave-forge-audio/Makefile
@@ -1,21 +1,21 @@
 PORTNAME=	octave-forge-audio
 PORTVERSION=	2.0.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
 DISTNAME=	${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/../COPYING
 
 LIB_DEPENDS+=	librtmidi.so:audio/rtmidi
 
 USES=		compiler:c++11-lang octave pkgconfig
 
 GNU_CONFIGURE=	yes
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-automatic-differentiation/Makefile b/math/octave-forge-automatic-differentiation/Makefile
index 481ec61491e1..a12bf8cc34aa 100644
--- a/math/octave-forge-automatic-differentiation/Makefile
+++ b/math/octave-forge-automatic-differentiation/Makefile
@@ -1,25 +1,25 @@
 PORTNAME=	octave-forge-automatic-differentiation
 DISTVERSION=	1.0.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKDIR}/${OCTAVE_SRC}/COPYING
 
 RUN_DEPENDS+=	${OCTAVE_TARBALLS_DIR}/sockets.tar.gz:math/octave-forge-sockets
 
 USES=		octave
 USE_GITHUB=	yes
 GH_ACCOUNT=	StevenWaldrip
 GH_PROJECT=	Automatic-Differentiation
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 OCTAVE_SRC=		${GH_PROJECT}-${DISTVERSION}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-base/Makefile b/math/octave-forge-base/Makefile
index 571d612d9dbd..31007fe71732 100644
--- a/math/octave-forge-base/Makefile
+++ b/math/octave-forge-base/Makefile
@@ -1,29 +1,30 @@
 PORTNAME=	octave-forge-base
 PORTVERSION=	1.9
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	#none
 DISTFILES=	#none
 EXTRACT_ONLY=	#none
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge baseport for all packages
 WWW=		https://packages.octave.org/
 
 LICENSE=	BSD2CLAUSE
 
 RUN_DEPENDS=	octave:math/octave \
 		gmake:devel/gmake \
 		p5-File-Remove>=0:devel/p5-File-Remove
 
 USES=		perl5
 SUB_FILES=	load-octave-pkg
 SUB_LIST=	PERL=${PERL}
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/octave/tarballs
 	${MKDIR} ${STAGEDIR}${PREFIX}/libexec/octave
 	${INSTALL_SCRIPT} ${WRKDIR}/load-octave-pkg ${STAGEDIR}${PREFIX}/libexec/octave/.
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-bim/Makefile b/math/octave-forge-bim/Makefile
index fd56d03d8566..72daa77dd858 100644
--- a/math/octave-forge-bim/Makefile
+++ b/math/octave-forge-bim/Makefile
@@ -1,27 +1,27 @@
 PORTNAME=	octave-forge-bim
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.1.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKDIR}/${OCTAVE_SRC}/COPYING
 
 RUN_DEPENDS=	${OCTAVE_TARBALLS_DIR}/fpl.tar.gz:math/octave-forge-fpl \
 		${OCTAVE_TARBALLS_DIR}/msh.tar.gz:math/octave-forge-msh
 
 USES=		octave
 USE_GITHUB=	yes
 GH_ACCOUNT=	carlodefalco
 GH_PROJECT=	bim
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 OCTAVE_SRC=		${GH_PROJECT}-${DISTVERSION}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-bioinfo/Makefile b/math/octave-forge-bioinfo/Makefile
index 6fba8d6b1f4e..443e9010602e 100644
--- a/math/octave-forge-bioinfo/Makefile
+++ b/math/octave-forge-bioinfo/Makefile
@@ -1,21 +1,21 @@
 PORTNAME=	octave-forge-bioinfo
 PORTVERSION=	0.1.2
-PORTREVISION=	28
+PORTREVISION=	29
 CATEGORIES=	math
 MASTER_SITES=	SF/octave/Octave%20Forge%20Packages/Old%20Monolithic%20Releases/R2009-05-08
 DISTNAME=	${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		octave
 
 GNU_CONFIGURE=	yes
 
 WRKSRC=        ${WRKDIR}/${OCTAVE_SRC}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-biosig/Makefile b/math/octave-forge-biosig/Makefile
index 43ad6bb009f9..83c7338e7db9 100644
--- a/math/octave-forge-biosig/Makefile
+++ b/math/octave-forge-biosig/Makefile
@@ -1,23 +1,23 @@
 PORTNAME=	octave-forge-biosig
 DISTVERSION=	3.0.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 MASTER_SITES=	https://pub.ist.ac.at/~schloegl/biosig/prereleases/
 DISTNAME=	biosig4octave-${DISTVERSION}.src
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKDIR}/${OCTAVE_SRC}/COPYING
 
 LIB_DEPENDS+=	libbiosig.so:biology/biosig
 
 USES=		octave
 
 ALL_TARGET=	# nada
 
 OCTAVE_SRC=		${DISTNAME:R}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-bsltl/Makefile b/math/octave-forge-bsltl/Makefile
index 3105bd88136f..42f0c3624690 100644
--- a/math/octave-forge-bsltl/Makefile
+++ b/math/octave-forge-bsltl/Makefile
@@ -1,20 +1,20 @@
 PORTNAME=	octave-forge-bsltl
 PORTVERSION=	1.3.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	math
 MASTER_SITES=	SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
 DISTNAME=	${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKDIR}/${OCTAVE_SRC}/COPYING
 
 USES=		octave
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-cfitsio/Makefile b/math/octave-forge-cfitsio/Makefile
index 4776ff0ed05d..98cea8d31a45 100644
--- a/math/octave-forge-cfitsio/Makefile
+++ b/math/octave-forge-cfitsio/Makefile
@@ -1,22 +1,22 @@
 PORTNAME=	octave-forge-cfitsio
 PORTVERSION=	0.0.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=octave-cfitsio/v${PORTVERSION}
 DISTNAME=	octave-${OCTAVE_PKGNAME}-${PORTVERSION}
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKDIR}/${OCTAVE_SRC}/COPYING
 
 LIB_DEPENDS+=	libcfitsio.so:astro/cfitsio
 
 USES=		autoreconf octave
 
 GNU_CONFIGURE=	yes
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-cgi/Makefile b/math/octave-forge-cgi/Makefile
index a865d8fec09f..bc3620b5df04 100644
--- a/math/octave-forge-cgi/Makefile
+++ b/math/octave-forge-cgi/Makefile
@@ -1,22 +1,22 @@
 PORTNAME=	octave-forge-cgi
 PORTVERSION=	0.1.2
-PORTREVISION=	16
+PORTREVISION=	17
 CATEGORIES=	math
 MASTER_SITES=	SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
 DISTNAME=	${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKDIR}/${OCTAVE_SRC}/COPYING
 
 USES=		octave
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 OCTAVE_SRC=		${OCTAVE_PKGNAME}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-civil-engineering/Makefile b/math/octave-forge-civil-engineering/Makefile
index f259dae2c7a9..0f130cf99bad 100644
--- a/math/octave-forge-civil-engineering/Makefile
+++ b/math/octave-forge-civil-engineering/Makefile
@@ -1,21 +1,21 @@
 PORTNAME=	octave-forge-civil-engineering
 PORTVERSION=	1.0.7
-PORTREVISION=	28
+PORTREVISION=	29
 CATEGORIES=	math
 MASTER_SITES=	SF/octave/Octave%20Forge%20Packages/Old%20Monolithic%20Releases/R2009-05-08
 DISTNAME=	${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=			octave
 
 GNU_CONFIGURE=	yes
 
 WRKSRC=        ${WRKDIR}/${OCTAVE_SRC}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-coder/Makefile b/math/octave-forge-coder/Makefile
index 3bf685fbc0be..d6a0104dbc16 100644
--- a/math/octave-forge-coder/Makefile
+++ b/math/octave-forge-coder/Makefile
@@ -1,28 +1,28 @@
 PORTNAME=	octave-forge-coder
 DISTVERSIONPREFIX=	coder-
 DISTVERSION=	1.8.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKDIR}/${OCTAVE_SRC}/COPYING
 
 USES=		octave
 USE_GITHUB=	yes
 GH_ACCOUNT=	shsajjadi
 GH_PROJECT=	OctaveCoder
 
 OCTAVE_SRC=		${GH_PROJECT}-coder-${DISTVERSION}
 
 WRKSRC=		${WRKDIR}/${OCTAVE_SRC}
 
 do-build:
 	cd ${WRKSRC} && \
 	octave-cli -W -H -q --no-site-file --eval "pre_install" && \
 	${RM} pre_install.m
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-communications/Makefile b/math/octave-forge-communications/Makefile
index f84d12a5deef..a0791e4633bc 100644
--- a/math/octave-forge-communications/Makefile
+++ b/math/octave-forge-communications/Makefile
@@ -1,23 +1,23 @@
 PORTNAME=	octave-forge-communications
 PORTVERSION=	1.2.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 MASTER_SITES=	SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
 DISTNAME=	${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKDIR}/${OCTAVE_SRC}/COPYING
 
 RUN_DEPENDS=	${OCTAVE_TARBALLS_DIR}/signal.tar.gz:math/octave-forge-signal
 
 USES=		octave
 
 GNU_CONFIGURE=	yes
 
 MAKE_ENV+=	MKOCTFILE=mkoctfile
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-control/Makefile b/math/octave-forge-control/Makefile
index 09dc139f37a1..914a4d38dd9f 100644
--- a/math/octave-forge-control/Makefile
+++ b/math/octave-forge-control/Makefile
@@ -1,22 +1,23 @@
 PORTNAME=	octave-forge-control
 DISTVERSIONPREFIX=	control-
 DISTVERSION=	3.5.2
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKDIR}/${OCTAVE_SRC}/COPYING
 
 USES=		octave autoreconf
 USE_GITHUB=	yes
 GH_ACCOUNT=	gnu-octave
 GH_PROJECT=	pkg-control
 
 OCTAVE_SRC=	${GH_PROJECT}-control-${DISTVERSION}
 
 GNU_CONFIGURE=	yes
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-csg-toolkit/Makefile b/math/octave-forge-csg-toolkit/Makefile
index 6754076b5206..93a44bd405ef 100644
--- a/math/octave-forge-csg-toolkit/Makefile
+++ b/math/octave-forge-csg-toolkit/Makefile
@@ -1,25 +1,26 @@
 PORTNAME=	octave-forge-csg-toolkit
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.3.0
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKDIR}/${OCTAVE_SRC}/COPYING
 
 RUN_DEPENDS=	${OCTAVE_TARBALLS_DIR}/io.tar.gz:math/octave-forge-io
 
 USES=		compiler octave
 USE_GCC=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	pr0m1th3as
 GH_PROJECT=	${OCTAVE_PKGNAME}
 
 CXXFLAGS+=	-stdlib=libstdc++
 
 OCTAVE_SRC=		${GH_PROJECT}-${DISTVERSION}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-data-smoothing/Makefile b/math/octave-forge-data-smoothing/Makefile
index 0876c9867109..482bf70bbede 100644
--- a/math/octave-forge-data-smoothing/Makefile
+++ b/math/octave-forge-data-smoothing/Makefile
@@ -1,24 +1,24 @@
 PORTNAME=	octave-forge-data-smoothing
 PORTVERSION=	1.3.0
-PORTREVISION=	22
+PORTREVISION=	23
 CATEGORIES=	math
 MASTER_SITES=	SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
 DISTNAME=	${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKDIR}/${OCTAVE_SRC}/COPYING
 
 RUN_DEPENDS+=	${OCTAVE_TARBALLS_DIR}/optim.tar.gz:math/octave-forge-optim
 
 USES=		octave
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 OCTAVE_SRC=		${OCTAVE_PKGNAME}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-database/Makefile b/math/octave-forge-database/Makefile
index a39ee6fe7c73..5a5d01fac2cd 100644
--- a/math/octave-forge-database/Makefile
+++ b/math/octave-forge-database/Makefile
@@ -1,26 +1,26 @@
 PORTNAME=	octave-forge-database
 PORTVERSION=	2.4.4
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	math
 MASTER_SITES=	SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
 DISTNAME=	${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKDIR}/${OCTAVE_SRC}/COPYING
 
 BROKEN=		does not build with octave>=8
 
 RUN_DEPENDS+=	${OCTAVE_TARBALLS_DIR}/struct.tar.gz:math/octave-forge-struct
 
 USES=		octave pgsql
 
 GNU_CONFIGURE=	yes
 
 post-patch:
 	${REINPLACE_CMD} 's#endian.h#sys/endian.h#' ${WRKSRC}/wrap_endian.h
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-dataframe/Makefile b/math/octave-forge-dataframe/Makefile
index 7fb7de9f6908..7ededd07ebc4 100644
--- a/math/octave-forge-dataframe/Makefile
+++ b/math/octave-forge-dataframe/Makefile
@@ -1,20 +1,20 @@
 PORTNAME=	octave-forge-dataframe
 PORTVERSION=	1.2.0
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	math
 MASTER_SITES=	SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
 DISTNAME=	${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKDIR}/${OCTAVE_SRC}/COPYING
 
 USES=		octave
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-dicom/Makefile b/math/octave-forge-dicom/Makefile
index ac19b51b5597..dda8ceb7ce8f 100644
--- a/math/octave-forge-dicom/Makefile
+++ b/math/octave-forge-dicom/Makefile
@@ -1,23 +1,23 @@
 PORTNAME=	octave-forge-dicom
 PORTVERSION=	0.5.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
 DISTNAME=	${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKDIR}/${OCTAVE_SRC}/COPYING
 
 BUILD_DEPENDS+=	cmake:devel/cmake-core
 
 LIB_DEPENDS+=	libgdcmCommon.so:devel/gdcm
 
 USES=		octave
 
 GNU_CONFIGURE=	yes
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-divand/Makefile b/math/octave-forge-divand/Makefile
index c7dbc573a350..ff1e362e2582 100644
--- a/math/octave-forge-divand/Makefile
+++ b/math/octave-forge-divand/Makefile
@@ -1,23 +1,23 @@
 PORTNAME=	octave-forge-divand
 PORTVERSION=	1.1.2
-PORTREVISION=	18
+PORTREVISION=	19
 CATEGORIES=	math
 MASTER_SITES=	SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
 DISTNAME=	${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKDIR}/${OCTAVE_SRC}/COPYING
 
 USES=		octave
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 OCTAVE_SRC=			${OCTAVE_PKGNAME}
 WRKSRC=        ${WRKDIR}/${OCTAVE_SRC}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-doctest/Makefile b/math/octave-forge-doctest/Makefile
index 5af330ba5a7d..7c92086f54ba 100644
--- a/math/octave-forge-doctest/Makefile
+++ b/math/octave-forge-doctest/Makefile
@@ -1,20 +1,20 @@
 PORTNAME=	octave-forge-doctest
 PORTVERSION=	0.8.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
 DISTNAME=	${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKDIR}/${OCTAVE_SRC}/COPYING
 
 USES=		octave
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-econometrics/Makefile b/math/octave-forge-econometrics/Makefile
index 144c3b0459c2..9bd1c0a99132 100644
--- a/math/octave-forge-econometrics/Makefile
+++ b/math/octave-forge-econometrics/Makefile
@@ -1,19 +1,19 @@
 PORTNAME=	octave-forge-econometrics
 PORTVERSION=	1.1.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	math
 MASTER_SITES=	SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
 DISTNAME=	${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKDIR}/${OCTAVE_SRC}/COPYING
 
 RUN_DEPENDS=	${OCTAVE_TARBALLS_DIR}/optim.tar.gz:math/octave-forge-optim
 
 USES=		octave
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-fda/Makefile b/math/octave-forge-fda/Makefile
index 9c0497a880a6..73939bdb9b27 100644
--- a/math/octave-forge-fda/Makefile
+++ b/math/octave-forge-fda/Makefile
@@ -1,24 +1,24 @@
 PORTNAME=	octave-forge-fda
 DISTVERSION=	1.0.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKDIR}/${OCTAVE_SRC}/COPYING
 
 USES=		octave
 USE_GITLAB=	yes
 GL_ACCOUNT=	kakila
 GL_PROJECT=	fda
 GL_COMMIT=	99f733cfa284fc0fdf911e7da97269197c4dec94
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 OCTAVE_SRC=		${GL_PROJECT}-${GL_COMMIT}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-femoctave/Makefile b/math/octave-forge-femoctave/Makefile
index afcf15fc7cae..fc4b376fb915 100644
--- a/math/octave-forge-femoctave/Makefile
+++ b/math/octave-forge-femoctave/Makefile
@@ -1,21 +1,21 @@
 PORTNAME=	octave-forge-femoctave
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.0.10
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKDIR}/${OCTAVE_SRC}/COPYING
 
 USES=		octave
 USE_GITHUB=	yes
 GH_ACCOUNT=	AndreasStahel
 GH_PROJECT=	FEMoctave
 
 OCTAVE_SRC=		${GH_PROJECT}-${DISTVERSION}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-fenv/Makefile b/math/octave-forge-fenv/Makefile
index 1719493a5678..d4f3fc0985dc 100644
--- a/math/octave-forge-fenv/Makefile
+++ b/math/octave-forge-fenv/Makefile
@@ -1,20 +1,20 @@
 PORTNAME=	octave-forge-fenv
 PORTVERSION=	0.1.0
-PORTREVISION=	26
+PORTREVISION=	27
 CATEGORIES=	math
 MASTER_SITES=	SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
 DISTNAME=	${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKDIR}/${OCTAVE_SRC}/COPYING
 
 USES=		compiler octave
 USE_GCC=	yes
 
 OCTAVE_SRC=		${OCTAVE_PKGNAME}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-financial/Makefile b/math/octave-forge-financial/Makefile
index 1694a7a655bf..4ed1d5241847 100644
--- a/math/octave-forge-financial/Makefile
+++ b/math/octave-forge-financial/Makefile
@@ -1,23 +1,23 @@
 PORTNAME=	octave-forge-financial
 PORTVERSION=	0.5.3
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	math
 MASTER_SITES=	SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
 DISTNAME=	${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKDIR}/${OCTAVE_SRC}/COPYING
 
 RUN_DEPENDS=	${OCTAVE_TARBALLS_DIR}/io.tar.gz:math/octave-forge-io \
 				${OCTAVE_TARBALLS_DIR}/statistics.tar.gz:math/octave-forge-statistics
 
 USES=		octave
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-fits/Makefile b/math/octave-forge-fits/Makefile
index 6b4767d06c09..01a2cc7589b1 100644
--- a/math/octave-forge-fits/Makefile
+++ b/math/octave-forge-fits/Makefile
@@ -1,21 +1,21 @@
 PORTNAME=	octave-forge-fits
 PORTVERSION=	1.0.7
-PORTREVISION=	19
+PORTREVISION=	20
 CATEGORIES=	math
 MASTER_SITES=	SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
 DISTNAME=	${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKDIR}/${OCTAVE_SRC}/COPYING
 
 LIB_DEPENDS=	libcfitsio.so:astro/cfitsio
 
 USES=		octave
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-fpl/Makefile b/math/octave-forge-fpl/Makefile
index 447a6082c2d2..ac3c61ba297b 100644
--- a/math/octave-forge-fpl/Makefile
+++ b/math/octave-forge-fpl/Makefile
@@ -1,24 +1,24 @@
 PORTNAME=	octave-forge-fpl
 PORTVERSION=	1.3.5
-PORTREVISION=	17
+PORTREVISION=	18
 CATEGORIES=	math
 MASTER_SITES=	SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
 DISTNAME=	${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKDIR}/${OCTAVE_SRC}/COPYING
 
 RUN_DEPENDS=	dx:graphics/opendx
 
 USES=		octave
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 OCTAVE_SRC=		${OCTAVE_PKGNAME}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-fuzzy-logic-toolkit/Makefile b/math/octave-forge-fuzzy-logic-toolkit/Makefile
index 6cf4c96bd637..6ad3184f3d36 100644
--- a/math/octave-forge-fuzzy-logic-toolkit/Makefile
+++ b/math/octave-forge-fuzzy-logic-toolkit/Makefile
@@ -1,24 +1,24 @@
 PORTNAME=	octave-forge-fuzzy-logic-toolkit
 PORTVERSION=	0.4.6
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	math
 MASTER_SITES=	SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
 DISTNAME=	${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKDIR}/${OCTAVE_SRC}/COPYING
 
 USES=octave
 
 OCTAVE_SRC=		${OCTAVE_PKGNAME}
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 WRKSRC=		${WRKDIR}/${OCTAVE_SRC}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-ga/Makefile b/math/octave-forge-ga/Makefile
index 3de73c945d45..5ee6e4b4dbf6 100644
--- a/math/octave-forge-ga/Makefile
+++ b/math/octave-forge-ga/Makefile
@@ -1,20 +1,20 @@
 PORTNAME=	octave-forge-ga
 PORTVERSION=	0.10.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 MASTER_SITES=	SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
 DISTNAME=	${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKDIR}/${OCTAVE_SRC}/COPYING
 
 USES=		octave
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-general/Makefile b/math/octave-forge-general/Makefile
index edd3c0c94cf9..fc2e4c1be6c3 100644
--- a/math/octave-forge-general/Makefile
+++ b/math/octave-forge-general/Makefile
@@ -1,16 +1,16 @@
 PORTNAME=	octave-forge-general
 PORTVERSION=	2.1.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 MASTER_SITES=	SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
 DISTNAME=	${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 USES=		octave
 
 GNU_CONFIGURE=	yes
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-generate_html/Makefile b/math/octave-forge-generate_html/Makefile
index dcc55626d4b9..06784c1358d0 100644
--- a/math/octave-forge-generate_html/Makefile
+++ b/math/octave-forge-generate_html/Makefile
@@ -1,20 +1,20 @@
 PORTNAME=	octave-forge-generate_html
 PORTVERSION=	0.3.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
 DISTNAME=	${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKDIR}/${OCTAVE_SRC}/COPYING
 
 USES=		octave
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-geographiclib/Makefile b/math/octave-forge-geographiclib/Makefile
index 677c1c1c2be7..9704a5c5f0c1 100644
--- a/math/octave-forge-geographiclib/Makefile
+++ b/math/octave-forge-geographiclib/Makefile
@@ -1,20 +1,20 @@
 PORTNAME=	octave-forge-geographiclib
 PORTVERSION=	2.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 MASTER_SITES=	https://sourceforge.net/projects/geographiclib/files/distrib-Octave/
 DISTNAME=	${OCTAVE_PKGNAME}-octave-${DISTVERSIONFULL}
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKDIR}/${OCTAVE_SRC}/COPYING
 
 USES=		octave
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-geometry/Makefile b/math/octave-forge-geometry/Makefile
index 18ca97be3928..03f9db44aa12 100644
--- a/math/octave-forge-geometry/Makefile
+++ b/math/octave-forge-geometry/Makefile
@@ -1,20 +1,20 @@
 PORTNAME=	octave-forge-geometry
 PORTVERSION=	4.0.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	math
 MASTER_SITES=	SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
 DISTNAME=	${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKDIR}/${OCTAVE_SRC}/COPYING
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} \
 			${OCTAVE_TARBALLS_DIR}/matgeom.tar.gz:math/octave-forge-matgeom
 
 USES=		octave python:env
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-gnuplot/Makefile b/math/octave-forge-gnuplot/Makefile
index 1226282d07a8..b98abc501636 100644
--- a/math/octave-forge-gnuplot/Makefile
+++ b/math/octave-forge-gnuplot/Makefile
@@ -1,22 +1,22 @@
 PORTNAME=	octave-forge-gnuplot
 PORTVERSION=	1.0.1
-PORTREVISION=	25
+PORTREVISION=	26
 CATEGORIES=	math
 MASTER_SITES=	SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
 DISTNAME=	${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKDIR}/${OCTAVE_SRC}/COPYING
 
 USES=		octave
 
 OCTAVE_SRC=		${OCTAVE_PKGNAME}
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-gsl/Makefile b/math/octave-forge-gsl/Makefile
index 55260ee33786..24ad569b9836 100644
--- a/math/octave-forge-gsl/Makefile
+++ b/math/octave-forge-gsl/Makefile
@@ -1,21 +1,21 @@
 PORTNAME=	octave-forge-gsl
 PORTVERSION=	2.1.1
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	math
 MASTER_SITES=	SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
 DISTNAME=	${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKDIR}/${OCTAVE_SRC}/COPYING
 
 LIB_DEPENDS=	libgsl.so:math/gsl
 
 USES=		octave
 
 GNU_CONFIGURE=	yes
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-ident/Makefile b/math/octave-forge-ident/Makefile
index c4f9534a881a..290466788f05 100644
--- a/math/octave-forge-ident/Makefile
+++ b/math/octave-forge-ident/Makefile
@@ -1,21 +1,21 @@
 PORTNAME=	octave-forge-ident
 PORTVERSION=	1.0.7
-PORTREVISION=	28
+PORTREVISION=	29
 CATEGORIES=	math
 MASTER_SITES=	SF/octave/Octave%20Forge%20Packages/Old%20Monolithic%20Releases/R2009-05-08
 DISTNAME=	${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		octave
 
 GNU_CONFIGURE=	yes
 
 WRKSRC=        ${WRKDIR}/${OCTAVE_SRC}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-image/Makefile b/math/octave-forge-image/Makefile
index 1752b58a4c25..4280342d1d87 100644
--- a/math/octave-forge-image/Makefile
+++ b/math/octave-forge-image/Makefile
@@ -1,22 +1,22 @@
 PORTNAME=	octave-forge-image
 PORTVERSION=	2.14.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 MASTER_SITES=	SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
 DISTNAME=	${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	Many
 LICENSE_NAME=	Many different licenses
 LICENSE_FILE=	${WRKDIR}/${OCTAVE_SRC}/COPYING
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 USES=		compiler:c++14-lang octave
 
 GNU_CONFIGURE=	yes
 CXXFLAGS+=	-fPIC
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-informationtheory/Makefile b/math/octave-forge-informationtheory/Makefile
index c0ce655c9b76..fe89c5f2573e 100644
--- a/math/octave-forge-informationtheory/Makefile
+++ b/math/octave-forge-informationtheory/Makefile
@@ -1,21 +1,21 @@
 PORTNAME=	octave-forge-informationtheory
 PORTVERSION=	0.1.8
-PORTREVISION=	28
+PORTREVISION=	29
 CATEGORIES=	math
 MASTER_SITES=	SF/octave/Octave%20Forge%20Packages/Old%20Monolithic%20Releases/R2009-06-07
 DISTNAME=	${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		octave
 
 GNU_CONFIGURE=	yes
 
 WRKSRC=        ${WRKDIR}/${OCTAVE_SRC}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-integration/Makefile b/math/octave-forge-integration/Makefile
index 6e94c108147b..c7c9a2a078ee 100644
--- a/math/octave-forge-integration/Makefile
+++ b/math/octave-forge-integration/Makefile
@@ -1,21 +1,21 @@
 PORTNAME=	octave-forge-integration
 PORTVERSION=	1.0.7
-PORTREVISION=	28
+PORTREVISION=	29
 CATEGORIES=	math
 MASTER_SITES=	SF/octave/Octave%20Forge%20Packages/Old%20Monolithic%20Releases/R2009-05-08
 DISTNAME=	${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		octave
 
 GNU_CONFIGURE=	yes
 
 WRKSRC=        ${WRKDIR}/${OCTAVE_SRC}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-internal-fluid-flow/Makefile b/math/octave-forge-internal-fluid-flow/Makefile
index 387375464975..db73c0057c6a 100644
--- a/math/octave-forge-internal-fluid-flow/Makefile
+++ b/math/octave-forge-internal-fluid-flow/Makefile
@@ -1,24 +1,24 @@
 PORTNAME=	octave-forge-internal-fluid-flow
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.3.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKDIR}/${OCTAVE_SRC}/COPYING
 
 USES=	octave
 USE_GITHUB=	yes
 GH_ACCOUNT=	aumpierre-unb
 GH_PROJECT=	internal-Fluid-Flow-for-GNU-Octave
 
 OCTAVE_SRC=		Internal-Fluid-Flow-for-GNU-Octave-${DISTVERSION}
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-interval/Makefile b/math/octave-forge-interval/Makefile
index 07dfc22d0656..8a6bc0b70d26 100644
--- a/math/octave-forge-interval/Makefile
+++ b/math/octave-forge-interval/Makefile
@@ -1,19 +1,19 @@
 PORTNAME=	octave-forge-interval
 PORTVERSION=	3.2.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 MASTER_SITES=	SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
 DISTNAME=	${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKDIR}/${OCTAVE_SRC}/COPYING
 
 LIB_DEPENDS=	libmpfr.so:math/mpfr
 
 USES=		octave
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-io/Makefile b/math/octave-forge-io/Makefile
index e8ab203a8fd1..b5c5584f9b7d 100644
--- a/math/octave-forge-io/Makefile
+++ b/math/octave-forge-io/Makefile
@@ -1,18 +1,18 @@
 PORTNAME=	octave-forge-io
 PORTVERSION=	2.6.4
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	math
 MASTER_SITES=	SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
 DISTNAME=	${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKDIR}/${OCTAVE_SRC}/COPYING
 
 USES=		gmake octave
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-irsa/Makefile b/math/octave-forge-irsa/Makefile
index 1b1ec8707082..a7594ff8dbca 100644
--- a/math/octave-forge-irsa/Makefile
+++ b/math/octave-forge-irsa/Makefile
@@ -1,21 +1,21 @@
 PORTNAME=	octave-forge-irsa
 PORTVERSION=	1.0.7
-PORTREVISION=	28
+PORTREVISION=	29
 CATEGORIES=	math
 MASTER_SITES=	SF/octave/Octave%20Forge%20Packages/Old%20Monolithic%20Releases/R2009-05-08
 DISTNAME=	${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		octave
 
 GNU_CONFIGURE=	yes
 
 WRKSRC=        ${WRKDIR}/${OCTAVE_SRC}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-level-set/Makefile b/math/octave-forge-level-set/Makefile
index 62edc485d2c3..383f0f1d5396 100644
--- a/math/octave-forge-level-set/Makefile
+++ b/math/octave-forge-level-set/Makefile
@@ -1,22 +1,22 @@
 PORTNAME=	octave-forge-level-set
 PORTVERSION=	0.3.0
-PORTREVISION=	17
+PORTREVISION=	18
 CATEGORIES=	math
 MASTER_SITES=	SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
 DISTNAME=	${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv3
 
 USES=		compiler:c++0x octave
 
 GNU_CONFIGURE=	yes
 
 ALL_TARGET=	oct
 
 OCTAVE_SRC=		${OCTAVE_PKGNAME}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-linear-algebra/Makefile b/math/octave-forge-linear-algebra/Makefile
index aab180a9b4bd..6f40d644b97b 100644
--- a/math/octave-forge-linear-algebra/Makefile
+++ b/math/octave-forge-linear-algebra/Makefile
@@ -1,18 +1,18 @@
 PORTNAME=	octave-forge-linear-algebra
 PORTVERSION=	2.2.3
-PORTREVISION=	5
+PORTREVISION=	6
 PORTEPOCH=	1
 CATEGORIES=	math
 MASTER_SITES=	SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
 DISTNAME=	${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 USES=		octave
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-lssa/Makefile b/math/octave-forge-lssa/Makefile
index c014653bae96..173187364502 100644
--- a/math/octave-forge-lssa/Makefile
+++ b/math/octave-forge-lssa/Makefile
@@ -1,17 +1,17 @@
 PORTNAME=	octave-forge-lssa
 PORTVERSION=	0.1.4
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	math
 MASTER_SITES=	SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
 DISTNAME=	${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKDIR}/${OCTAVE_SRC}/COPYING
 
 USES=		octave
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-ltfat/Makefile b/math/octave-forge-ltfat/Makefile
index 1ed763d7cc60..19d7fcdb7cb9 100644
--- a/math/octave-forge-ltfat/Makefile
+++ b/math/octave-forge-ltfat/Makefile
@@ -1,35 +1,35 @@
 PORTNAME=	octave-forge-ltfat
 PORTVERSION=	2.3.1
-PORTREVISION=	13
+PORTREVISION=	14
 PORTEPOCH=	1
 CATEGORIES=	math
 MASTER_SITES=	SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
 DISTNAME=	${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKDIR}/${OCTAVE_SRC}/COPYING
 
 BROKEN_FreeBSD_12_powerpc64=	fails to compile: modules/libltfat/src/dgt_multi.c:47:31: 'cexpl' undeclared (first use in this function); did you mean 'cexpf'?
 
 LIB_DEPENDS=	libfftw3.so:math/fftw3 \
 		libportaudio.so:audio/portaudio \
 		libopenblas.so:math/openblas
 
 USES=		octave
 
 OCTAVE_SRC=		${OCTAVE_PKGNAME}
 
 GNU_CONFIGURE=	yes
 
 post-build:
 	${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
 	${RM} ${WRKSRC}/../inst/DESCRIPTION
 	${RM} ${WRKSRC}/../inst/ltfat/DESCRIPTION
 	${RM} ${WRKSRC}/../inst/ltfat/inst/DESCRIPTION
 	cd ${WRKDIR} && ${TAR} cfz ${OCTAVE_DISTNAME}.tar.gz ${OCTAVE_SRC}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-mapping/Makefile b/math/octave-forge-mapping/Makefile
index 2a0a6252e021..2cf2d0a6025c 100644
--- a/math/octave-forge-mapping/Makefile
+++ b/math/octave-forge-mapping/Makefile
@@ -1,24 +1,24 @@
 PORTNAME=	octave-forge-mapping
 PORTVERSION=	1.4.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 MASTER_SITES=	SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
 DISTNAME=	${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKDIR}/${OCTAVE_SRC}/COPYING
 
 RUN_DEPENDS=	${OCTAVE_TARBALLS_DIR}/io.tar.gz:math/octave-forge-io \
 		${OCTAVE_TARBALLS_DIR}/geometry.tar.gz:math/octave-forge-geometry
 
 USES=		octave
 
 GNU_CONFIGURE=	yes
 
 ALL_TARGET=	# nada
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-matgeom/Makefile b/math/octave-forge-matgeom/Makefile
index 52bf84ebee2c..2b65260cf96a 100644
--- a/math/octave-forge-matgeom/Makefile
+++ b/math/octave-forge-matgeom/Makefile
@@ -1,20 +1,20 @@
 PORTNAME=	octave-forge-matgeom
 PORTVERSION=	1.2.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	math
 MASTER_SITES=	SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
 DISTNAME=	${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKDIR}/${OCTAVE_SRC}/COPYING
 
 USES=		octave
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-mccabe-thiele/Makefile b/math/octave-forge-mccabe-thiele/Makefile
index ffe3082e95e6..060bcc0782ff 100644
--- a/math/octave-forge-mccabe-thiele/Makefile
+++ b/math/octave-forge-mccabe-thiele/Makefile
@@ -1,26 +1,26 @@
 PORTNAME=	octave-forge-mccabe-thiele
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.1.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKDIR}/${OCTAVE_SRC}/COPYING
 
 RUN_DEPENDS=	${OCTAVE_TARBALLS_DIR}/sockets.tar.gz:math/octave-forge-sockets
 
 USES=		octave
 USE_GITHUB=	yes
 GH_ACCOUNT=	aumpierre-unb
 GH_PROJECT=	McCabe-Thiele-for-GNU-Octave
 
 OCTAVE_SRC=		${GH_PROJECT}-${DISTVERSION}
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-mechanics/Makefile b/math/octave-forge-mechanics/Makefile
index ca40f3d90bdb..ece2fd5c1dda 100644
--- a/math/octave-forge-mechanics/Makefile
+++ b/math/octave-forge-mechanics/Makefile
@@ -1,27 +1,27 @@
 PORTNAME=	octave-forge-mechanics
 PORTVERSION=	1.3.1
-PORTREVISION=	21
+PORTREVISION=	22
 CATEGORIES=	math
 MASTER_SITES=	SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
 DISTNAME=	${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKDIR}/${OCTAVE_SRC}/COPYING
 
 BROKEN=		does not build with octave=8
 
 RUN_DEPENDS=	${OCTAVE_TARBALLS_DIR}/general.tar.gz:math/octave-forge-general \
 		${OCTAVE_TARBALLS_DIR}/geometry.tar.gz:math/octave-forge-geometry \
 		${OCTAVE_TARBALLS_DIR}/linear-algebra.tar.gz:math/octave-forge-linear-algebra
 
 USES=		octave
 
 OCTAVE_SRC=		${OCTAVE_PKGNAME}
 
 WRKSRC=		${WRKDIR}/${OCTAVE_SRC}/inst/molecularDynamics/src
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-miscellaneous/Makefile b/math/octave-forge-miscellaneous/Makefile
index cf0de300e00e..16daf9cd604a 100644
--- a/math/octave-forge-miscellaneous/Makefile
+++ b/math/octave-forge-miscellaneous/Makefile
@@ -1,21 +1,21 @@
 PORTNAME=	octave-forge-miscellaneous
 PORTVERSION=	1.3.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	math
 MASTER_SITES=	SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
 DISTNAME=	${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKDIR}/${OCTAVE_SRC}/COPYING
 
 USES=		octave
 
 GNU_CONFIGURE=	yes
 
 MAKE_ENV+=	MKOCTFILE=mkoctfile
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-missing-functions/Makefile b/math/octave-forge-missing-functions/Makefile
index e67a7d0fa984..6ca0b3bdb56f 100644
--- a/math/octave-forge-missing-functions/Makefile
+++ b/math/octave-forge-missing-functions/Makefile
@@ -1,18 +1,18 @@
 PORTNAME=	octave-forge-missing-functions
 PORTVERSION=	1.0.2
-PORTREVISION=	28
+PORTREVISION=	29
 CATEGORIES=	math
 MASTER_SITES=	SF/octave/Octave%20Forge%20Packages/Old%20Monolithic%20Releases/R2009-05-08
 DISTNAME=	${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 USES=		octave
 
 GNU_CONFIGURE=	yes
 
 WRKSRC=	${WRKDIR}/${OCTAVE_SRC}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-mpi/Makefile b/math/octave-forge-mpi/Makefile
index 58d38ad30cbc..29e9668d0453 100644
--- a/math/octave-forge-mpi/Makefile
+++ b/math/octave-forge-mpi/Makefile
@@ -1,28 +1,28 @@
 PORTNAME=	octave-forge-mpi
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKDIR}/${OCTAVE_SRC}/COPYING
 
 BROKEN=		does not build with octave>=8
 
 LIB_DEPENDS+=	libmpi.so:net/mpich
 
 USES=		octave
 USE_GITHUB=	yes
 GH_ACCOUNT=	carlodefalco
 GH_PROJECT=	octave-mpi
 
 OCTAVE_SRC=		${GH_PROJECT}-${DISTVERSION}
 
 post-patch:
 	${REINPLACE_CMD} 's/= NULL/= 0/g' ${WRKSRC}/*.cc ${WRKSRC}/*.h
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-mqtt/Makefile b/math/octave-forge-mqtt/Makefile
index 79b275880840..7c858f5e65b5 100644
--- a/math/octave-forge-mqtt/Makefile
+++ b/math/octave-forge-mqtt/Makefile
@@ -1,22 +1,22 @@
 PORTNAME=	octave-forge-mqtt
 PORTVERSION=	0.0.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=octave-mqtt/v${PORTVERSION}
 DISTNAME=	octave-${OCTAVE_PKGNAME}-${PORTVERSION}
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKDIR}/${OCTAVE_SRC}/COPYING
 
 LIB_DEPENDS+=	libpaho-mqtt3a.so:net/libpaho-mqtt3
 
 USES=		autoreconf localbase octave
 
 GNU_CONFIGURE=	yes
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-msh/Makefile b/math/octave-forge-msh/Makefile
index 56e6b39d51ae..9c7c8f9e676e 100644
--- a/math/octave-forge-msh/Makefile
+++ b/math/octave-forge-msh/Makefile
@@ -1,27 +1,27 @@
 PORTNAME=	octave-forge-msh
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.0.12
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKDIR}/${OCTAVE_SRC}/COPYING
 
 RUN_DEPENDS=	${OCTAVE_TARBALLS_DIR}/splines.tar.gz:math/octave-forge-splines \
 		gmsh:cad/gmsh
 
 USES=		octave
 USE_GITHUB=	yes
 GH_ACCOUNT=	carlodefalco
 GH_PROJECT=	msh
 
 OCTAVE_SRC=		${GH_PROJECT}-${DISTVERSION}
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-multicore/Makefile b/math/octave-forge-multicore/Makefile
index bfc8b63c2496..8fd3ff7b8721 100644
--- a/math/octave-forge-multicore/Makefile
+++ b/math/octave-forge-multicore/Makefile
@@ -1,21 +1,21 @@
 PORTNAME=	octave-forge-multicore
 PORTVERSION=	0.2.15
-PORTREVISION=	28
+PORTREVISION=	29
 CATEGORIES=	math
 MASTER_SITES=	SF/octave/Octave%20Forge%20Packages/Old%20Monolithic%20Releases/R2009-06-07
 DISTNAME=	${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		octave
 
 GNU_CONFIGURE=	yes
 
 WRKSRC=        ${WRKDIR}/${OCTAVE_SRC}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-mvn/Makefile b/math/octave-forge-mvn/Makefile
index c3985dc7df05..72f1b9b95655 100644
--- a/math/octave-forge-mvn/Makefile
+++ b/math/octave-forge-mvn/Makefile
@@ -1,22 +1,22 @@
 PORTNAME=	octave-forge-mvn
 PORTVERSION=	1.1.0
-PORTREVISION=	20
+PORTREVISION=	21
 CATEGORIES=	math
 MASTER_SITES=	SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
 DISTNAME=	${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKDIR}/${OCTAVE_SRC}/COPYING
 
 USES=		octave
 
 OCTAVE_SRC=		${OCTAVE_PKGNAME}
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-nan/Makefile b/math/octave-forge-nan/Makefile
index f39cc4ea4d3d..d052da17f350 100644
--- a/math/octave-forge-nan/Makefile
+++ b/math/octave-forge-nan/Makefile
@@ -1,23 +1,23 @@
 PORTNAME=	octave-forge-nan
 PORTVERSION=	3.7.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
 DISTNAME=	${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKDIR}/${OCTAVE_SRC}/COPYING
 
 USES=		gmake octave
 
 GNU_CONFIGURE=	yes
 
 MAKE_JOBS_UNSAFE=	yes
 
 ALL_TARGET=	octave
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-ncarray/Makefile b/math/octave-forge-ncarray/Makefile
index 1ddd7202c2b5..5cfe80509f43 100644
--- a/math/octave-forge-ncarray/Makefile
+++ b/math/octave-forge-ncarray/Makefile
@@ -1,23 +1,23 @@
 PORTNAME=	octave-forge-ncarray
 PORTVERSION=	1.0.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
 DISTNAME=	${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKDIR}/${OCTAVE_SRC}/COPYING
 
 RUN_DEPENDS=	${OCTAVE_TARBALLS_DIR}/netcdf.tar.gz:math/octave-forge-netcdf \
 		${OCTAVE_TARBALLS_DIR}/statistics.tar.gz:math/octave-forge-statistics
 
 USES=		octave
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-netcdf/Makefile b/math/octave-forge-netcdf/Makefile
index c5c71422bfaa..27f83ecf1511 100644
--- a/math/octave-forge-netcdf/Makefile
+++ b/math/octave-forge-netcdf/Makefile
@@ -1,23 +1,23 @@
 PORTNAME=	octave-forge-netcdf
 PORTVERSION=	1.0.16
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
 DISTNAME=	${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKDIR}/${OCTAVE_SRC}/COPYING
 
 LIB_DEPENDS+=	libnetcdf.so:science/netcdf
 
 USES=		octave
 
 GNU_CONFIGURE=	yes
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-nlwing2/Makefile b/math/octave-forge-nlwing2/Makefile
index 2d275dc7cd54..3a202ba85fed 100644
--- a/math/octave-forge-nlwing2/Makefile
+++ b/math/octave-forge-nlwing2/Makefile
@@ -1,21 +1,21 @@
 PORTNAME=	octave-forge-nlwing2
 PORTVERSION=	1.2.0
-PORTREVISION=	25
+PORTREVISION=	26
 CATEGORIES=	math
 MASTER_SITES=	SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
 DISTNAME=	${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKDIR}/${OCTAVE_SRC}/COPYING
 
 BROKEN=		does not build with octave>=8
 
 USES=		octave
 
 OCTAVE_SRC=		${OCTAVE_PKGNAME}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-nnet/Makefile b/math/octave-forge-nnet/Makefile
index 6d417084dc6d..863342d9e40e 100644
--- a/math/octave-forge-nnet/Makefile
+++ b/math/octave-forge-nnet/Makefile
@@ -1,22 +1,22 @@
 PORTNAME=	octave-forge-nnet
 PORTVERSION=	0.1.13
-PORTREVISION=	25
+PORTREVISION=	26
 CATEGORIES=	math
 MASTER_SITES=	SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
 DISTNAME=	${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKDIR}/${OCTAVE_SRC}/COPYING
 
 USES=		octave
 
 OCTAVE_SRC=		${OCTAVE_PKGNAME}
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-nurbs/Makefile b/math/octave-forge-nurbs/Makefile
index e352f2023aca..3d6734b538f4 100644
--- a/math/octave-forge-nurbs/Makefile
+++ b/math/octave-forge-nurbs/Makefile
@@ -1,24 +1,24 @@
 PORTNAME=	octave-forge-nurbs
 PORTVERSION=	1.4.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	math
 MASTER_SITES=	SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
 DISTNAME=	${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKDIR}/${OCTAVE_SRC}/COPYING
 
 USES=		compiler octave
 
 .include <bsd.port.pre.mk>
 
 # Force newer GCC on platforms using GCC 4.2 as base
 .if ${CHOSEN_COMPILER_TYPE} == gcc
 USE_GCC=	yes
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/math/octave-forge-oct2mat/Makefile b/math/octave-forge-oct2mat/Makefile
index a979a3079a77..2b81caff9f4c 100644
--- a/math/octave-forge-oct2mat/Makefile
+++ b/math/octave-forge-oct2mat/Makefile
@@ -1,23 +1,23 @@
 PORTNAME=	octave-forge-oct2mat
 PORTVERSION=	1.0.7
-PORTREVISION=	28
+PORTREVISION=	29
 CATEGORIES=	math
 MASTER_SITES=	SF/octave/Octave%20Forge%20Packages/Old%20Monolithic%20Releases/R2009-06-07
 DISTNAME=	${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	${OCTAVE_TARBALLS_DIR}/io.tar.gz:math/octave-forge-io
 
 USES=			octave
 
 GNU_CONFIGURE=	yes
 
 WRKSRC=        ${WRKDIR}/${OCTAVE_SRC}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-octclip/Makefile b/math/octave-forge-octclip/Makefile
index 3caea590268b..1cc6c59da17e 100644
--- a/math/octave-forge-octclip/Makefile
+++ b/math/octave-forge-octclip/Makefile
@@ -1,17 +1,17 @@
 PORTNAME=	octave-forge-octclip
 PORTVERSION=	2.0.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	https://bitbucket.org/jgpallero/octclip/downloads/
 DISTNAME=	${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKDIR}/${OCTAVE_SRC}/COPYING
 
 USES=		octave
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-octproj/Makefile b/math/octave-forge-octproj/Makefile
index 44811f0b3f79..3a8402400837 100644
--- a/math/octave-forge-octproj/Makefile
+++ b/math/octave-forge-octproj/Makefile
@@ -1,22 +1,22 @@
 PORTNAME=	octave-forge-octproj
 PORTVERSION=	3.0.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	math
 MASTER_SITES=	https://bitbucket.org/jgpallero/octproj/downloads/
 DISTNAME=	${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKDIR}/${OCTAVE_SRC}/COPYING
 
 LIB_DEPENDS+=	libproj.so:graphics/proj
 
 USES=		octave
 
 post-patch:
 	${REINPLACE_CMD} -e s/CC/MKOCTFILE/ -e s/-Wall// -e s/-Wextra// ${WRKSRC}/Makefile
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-odebvp/Makefile b/math/octave-forge-odebvp/Makefile
index 22bf0ea52490..7fc84e014640 100644
--- a/math/octave-forge-odebvp/Makefile
+++ b/math/octave-forge-odebvp/Makefile
@@ -1,21 +1,21 @@
 PORTNAME=	octave-forge-odebvp
 PORTVERSION=	1.0.6
-PORTREVISION=	28
+PORTREVISION=	29
 CATEGORIES=	math
 MASTER_SITES=	SF/octave/Octave%20Forge%20Packages/Old%20Monolithic%20Releases/R2009-05-08
 DISTNAME=	${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		octave
 
 GNU_CONFIGURE=	yes
 
 WRKSRC=        ${WRKDIR}/${OCTAVE_SRC}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-onsas/Makefile b/math/octave-forge-onsas/Makefile
index abdad04344a9..2c8d661b2b96 100644
--- a/math/octave-forge-onsas/Makefile
+++ b/math/octave-forge-onsas/Makefile
@@ -1,24 +1,24 @@
 PORTNAME=	octave-forge-onsas
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.2.7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKDIR}/${OCTAVE_SRC}/COPYING
 
 USES=		octave
 USE_GITHUB=	yes
 GH_ACCOUNT=	ONSAS
 GH_PROJECT=	ONSAS.m
 
 OCTAVE_SRC=		${GH_PROJECT}-${DISTVERSION}
 
 NO_ARCH	=	yes
 NO_BUILD=	yes
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-optics/Makefile b/math/octave-forge-optics/Makefile
index 362f936ea8bb..20fb6e8300d2 100644
--- a/math/octave-forge-optics/Makefile
+++ b/math/octave-forge-optics/Makefile
@@ -1,19 +1,19 @@
 PORTNAME=	octave-forge-optics
 PORTVERSION=	0.1.4
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	math
 MASTER_SITES=	SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
 DISTNAME=	${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv3
 
 USES=		octave
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-optim/Makefile b/math/octave-forge-optim/Makefile
index f8f1b62fd335..a2b96d6cb3ab 100644
--- a/math/octave-forge-optim/Makefile
+++ b/math/octave-forge-optim/Makefile
@@ -1,26 +1,26 @@
 PORTNAME=	octave-forge-optim
 PORTVERSION=	1.6.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
 DISTNAME=	${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	Parts
 LICENSE_NAME=	See individual files for licenses
 LICENSE_FILE=	${WRKDIR}/${OCTAVE_SRC}/COPYING
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 RUN_DEPENDS=	${OCTAVE_TARBALLS_DIR}/statistics.tar.gz:math/octave-forge-statistics \
 		${OCTAVE_TARBALLS_DIR}/struct.tar.gz:math/octave-forge-struct
 
 USES=		octave shebangfix
 
 SHEBANG_FILES=	*.pl
 
 GNU_CONFIGURE=	yes
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-optiminterp/Makefile b/math/octave-forge-optiminterp/Makefile
index 76b0452fa124..00c79a81761f 100644
--- a/math/octave-forge-optiminterp/Makefile
+++ b/math/octave-forge-optiminterp/Makefile
@@ -1,31 +1,31 @@
 PORTNAME=	octave-forge-optiminterp
 PORTVERSION=	0.3.7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 MASTER_SITES=	SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
 DISTNAME=	${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKDIR}/${OCTAVE_SRC}/COPYING
 
 USES=		octave
 
 GNU_CONFIGURE=	yes
 
 MAKE_ENV+=	MKOCTFILE_FORTRAN_90=yes MKOCTFILE=mkoctfile
 
 MAKE_JOBS_UNSAFE=	yes
 
 .include <bsd.port.pre.mk>
 
 .if ${GCC_DEFAULT} >= 10
 # workaround for Rank mismatch between actual argument at (1) and actual argument at (2) (scalar and rank-2)
 # in theory, this should set FCFLAGS, but the port does not conform
 FFLAGS+=	-fallow-argument-mismatch
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/math/octave-forge-outliers/Makefile b/math/octave-forge-outliers/Makefile
index b8b8b4f02560..82cfb1e73967 100644
--- a/math/octave-forge-outliers/Makefile
+++ b/math/octave-forge-outliers/Makefile
@@ -1,21 +1,21 @@
 PORTNAME=	octave-forge-outliers
 PORTVERSION=	0.13.9
-PORTREVISION=	28
+PORTREVISION=	29
 CATEGORIES=	math
 MASTER_SITES=	SF/octave/Octave%20Forge%20Packages/Old%20Monolithic%20Releases/R2009-05-08
 DISTNAME=	${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		octave
 
 GNU_CONFIGURE=	yes
 
 WRKSRC=	${WRKDIR}/${OCTAVE_SRC}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-parallel/Makefile b/math/octave-forge-parallel/Makefile
index 1041927c1019..01d372691409 100644
--- a/math/octave-forge-parallel/Makefile
+++ b/math/octave-forge-parallel/Makefile
@@ -1,26 +1,26 @@
 PORTNAME=	octave-forge-parallel
 PORTVERSION=	4.0.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	math
 MASTER_SITES=	SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
 DISTNAME=	${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKDIR}/${OCTAVE_SRC}/COPYING
 
 BROKEN=		does not build with octave>=8
 
 RUN_DEPENDS=	${OCTAVE_TARBALLS_DIR}/struct.tar.gz:math/octave-forge-struct
 
 USES=		compiler:gcc-c++11-lib octave perl5 shebangfix
 USE_PERL5=	build
 
 SHEBANG_FILES=	*.pl
 
 GNU_CONFIGURE=	yes
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-pde1dm/Makefile b/math/octave-forge-pde1dm/Makefile
index 97e9f33e1b86..d3d66cbb98e9 100644
--- a/math/octave-forge-pde1dm/Makefile
+++ b/math/octave-forge-pde1dm/Makefile
@@ -1,24 +1,24 @@
 PORTNAME=	octave-forge-pde1dm
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKDIR}/${OCTAVE_SRC}/COPYING
 
 USES=		octave
 USE_GITHUB=	yes
 GH_ACCOUNT=	wgreene310
 GH_PROJECT=	pde1dm
 
 OCTAVE_SRC=		${GH_PROJECT}-${DISTVERSION}
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-plot/Makefile b/math/octave-forge-plot/Makefile
index da90d31ff72c..afc56abe47fb 100644
--- a/math/octave-forge-plot/Makefile
+++ b/math/octave-forge-plot/Makefile
@@ -1,22 +1,22 @@
 PORTNAME=	octave-forge-plot
 PORTVERSION=	1.1.0
-PORTREVISION=	23
+PORTREVISION=	24
 CATEGORIES=	math
 MASTER_SITES=	SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
 DISTNAME=	${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKDIR}/${OCTAVE_SRC}/COPYING
 
 USES=		octave
 
 OCTAVE_SRC=		${OCTAVE_PKGNAME}
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-ponchon-savarit/Makefile b/math/octave-forge-ponchon-savarit/Makefile
index 2d3681872191..033e9db57a6e 100644
--- a/math/octave-forge-ponchon-savarit/Makefile
+++ b/math/octave-forge-ponchon-savarit/Makefile
@@ -1,24 +1,24 @@
 PORTNAME=	octave-forge-ponchon-savarit
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.1.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKDIR}/${OCTAVE_SRC}/COPYING
 
 USES=		octave
 USE_GITHUB=	yes
 GH_ACCOUNT=	aumpierre-unb
 GH_PROJECT=	Ponchon-Savarit-for-GNU-Octave
 
 OCTAVE_SRC=		${GH_PROJECT}-${DISTVERSION}
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-psychrometrics/Makefile b/math/octave-forge-psychrometrics/Makefile
index 3c6e62606ef9..f89c484e23cf 100644
--- a/math/octave-forge-psychrometrics/Makefile
+++ b/math/octave-forge-psychrometrics/Makefile
@@ -1,24 +1,24 @@
 PORTNAME=	octave-forge-psychrometrics
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKDIR}/${OCTAVE_SRC}/COPYING
 
 USES=		octave
 USE_GITHUB=	yes
 GH_ACCOUNT=	aumpierre-unb
 GH_PROJECT=	Psychrometrics-for-GNU-Octave
 
 OCTAVE_SRC=		${GH_PROJECT}-${DISTVERSION}
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-pythonic/Makefile b/math/octave-forge-pythonic/Makefile
index 4be19770dd5e..b96db7c99e17 100644
--- a/math/octave-forge-pythonic/Makefile
+++ b/math/octave-forge-pythonic/Makefile
@@ -1,26 +1,26 @@
 PORTNAME=	octave-forge-pythonic
 DISTVERSION=	0.0.1+
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKDIR}/${OCTAVE_SRC}/COPYING
 
 BUILD_DEPENDS=	gsed:textproc/gsed
 
 USES=		octave python
 
 USE_GITLAB=	yes
 GL_ACCOUNT=	mtmiller
 GL_PROJECT=	octave-pythonic
 GL_COMMIT=	3dbe9a06c1dec1a138f398b951e18044a00e063d
 
 OCTAVE_SRC=		${GL_PROJECT}-${GL_COMMIT}
 
 MAKE_ENV+=	PYTHON=${PYTHON_CMD} SED=gsed
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-quaternion/Makefile b/math/octave-forge-quaternion/Makefile
index 49d494d82ce0..855316946002 100644
--- a/math/octave-forge-quaternion/Makefile
+++ b/math/octave-forge-quaternion/Makefile
@@ -1,19 +1,19 @@
 PORTNAME=	octave-forge-quaternion
 PORTVERSION=	2.4.0
-PORTREVISION=	17
+PORTREVISION=	18
 CATEGORIES=	math
 MASTER_SITES=	SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
 DISTNAME=	${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKDIR}/${OCTAVE_SRC}/COPYING
 
 USES=		octave
 
 OCTAVE_SRC=		${OCTAVE_PKGNAME}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-queueing/Makefile b/math/octave-forge-queueing/Makefile
index f3bfc99ef315..8d342950874a 100644
--- a/math/octave-forge-queueing/Makefile
+++ b/math/octave-forge-queueing/Makefile
@@ -1,22 +1,22 @@
 PORTNAME=	octave-forge-queueing
 PORTVERSION=	1.2.7
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	math
 MASTER_SITES=	SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
 DISTNAME=	${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKDIR}/${OCTAVE_SRC}/COPYING
 
 USES=		octave
 
 OCTAVE_SRC=		${OCTAVE_PKGNAME}
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-secs1d/Makefile b/math/octave-forge-secs1d/Makefile
index d70c70e33a86..887a5c16ad40 100644
--- a/math/octave-forge-secs1d/Makefile
+++ b/math/octave-forge-secs1d/Makefile
@@ -1,24 +1,24 @@
 PORTNAME=	octave-forge-secs1d
 PORTVERSION=	0.0.9
-PORTREVISION=	22
+PORTREVISION=	23
 CATEGORIES=	math
 MASTER_SITES=	SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
 DISTNAME=	${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKDIR}/${OCTAVE_SRC}/COPYING
 
 RUN_DEPENDS=	${OCTAVE_TARBALLS_DIR}/bim.tar.gz:math/octave-forge-bim
 
 USES=		octave
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 WRKSRC=	${WRKDIR}/${OCTAVE_SRC}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-secs2d/Makefile b/math/octave-forge-secs2d/Makefile
index 030c3c28fd15..5b7a57663087 100644
--- a/math/octave-forge-secs2d/Makefile
+++ b/math/octave-forge-secs2d/Makefile
@@ -1,24 +1,24 @@
 PORTNAME=	octave-forge-secs2d
 PORTVERSION=	0.0.8
-PORTREVISION=	28
+PORTREVISION=	29
 CATEGORIES=	math
 MASTER_SITES=	SF/octave/Octave%20Forge%20Packages/Old%20Monolithic%20Releases/R2009-05-08
 DISTNAME=	${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		octave
 
 GNU_CONFIGURE=	yes
 
 WRKSRC=	${WRKDIR}/${OCTAVE_SRC}
 
 post-patch:
 	${REINPLACE_CMD} -E 's/Octave_map/octave_map/g' ${WRKSRC}/src/*.cc
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-secs3d/Makefile b/math/octave-forge-secs3d/Makefile
index 92e99177f0fa..a223532f0fc8 100644
--- a/math/octave-forge-secs3d/Makefile
+++ b/math/octave-forge-secs3d/Makefile
@@ -1,23 +1,23 @@
 PORTNAME=	octave-forge-secs3d
 PORTVERSION=	0.0.1
-PORTREVISION=	24
+PORTREVISION=	25
 CATEGORIES=	math
 MASTER_SITES=	SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
 DISTNAME=	${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKDIR}/${OCTAVE_SRC}/COPYING
 
 RUN_DEPENDS=	${OCTAVE_TARBALLS_DIR}/bim.tar.gz:math/octave-forge-bim \
 		${OCTAVE_TARBALLS_DIR}/fpl.tar.gz:math/octave-forge-fpl
 
 USES=		octave
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-signal/Makefile b/math/octave-forge-signal/Makefile
index 8e9059fdf9f0..479b78bdabae 100644
--- a/math/octave-forge-signal/Makefile
+++ b/math/octave-forge-signal/Makefile
@@ -1,22 +1,22 @@
 PORTNAME=	octave-forge-signal
 PORTVERSION=	1.4.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
 DISTNAME=	${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKDIR}/${OCTAVE_SRC}/COPYING
 
 RUN_DEPENDS+=	${OCTAVE_TARBALLS_DIR}/control.tar.gz:math/octave-forge-control
 
 USES=		octave
 
 post-patch:
 	${REINPLACE_CMD} s/-Wall// ${WRKSRC}/Makefile
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-simp/Makefile b/math/octave-forge-simp/Makefile
index 2d1fcff52b5b..95dba2615524 100644
--- a/math/octave-forge-simp/Makefile
+++ b/math/octave-forge-simp/Makefile
@@ -1,21 +1,21 @@
 PORTNAME=	octave-forge-simp
 PORTVERSION=	1.1.0
-PORTREVISION=	28
+PORTREVISION=	29
 CATEGORIES=	math
 MASTER_SITES=	SF/octave/Octave%20Forge%20Packages/Old%20Monolithic%20Releases/R2009-05-08
 DISTNAME=	${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		octave
 
 GNU_CONFIGURE=	yes
 
 WRKSRC=        ${WRKDIR}/${OCTAVE_SRC}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-sockets/Makefile b/math/octave-forge-sockets/Makefile
index d82f12705c57..f063d5e1a249 100644
--- a/math/octave-forge-sockets/Makefile
+++ b/math/octave-forge-sockets/Makefile
@@ -1,22 +1,22 @@
 PORTNAME=	octave-forge-sockets
 PORTVERSION=	1.4.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
 DISTNAME=	${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKDIR}/${OCTAVE_SRC}/COPYING
 
 BUILD_DEPENDS+=	gsed:textproc/gsed
 
 USES=		gmake octave
 
 post-patch:
 	${REINPLACE_CMD} 's/sed/gsed/g' ${WRKSRC}/Makefile
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-sole/Makefile b/math/octave-forge-sole/Makefile
index 551f909f6ca4..9213f0952645 100644
--- a/math/octave-forge-sole/Makefile
+++ b/math/octave-forge-sole/Makefile
@@ -1,25 +1,25 @@
 PORTNAME=	octave-forge-sole
 PORTVERSION=	0.1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	https://sourceforge.net/projects/sole/files/latest/
 DISTNAME=	download
 DIST_SUBDIR=	octave-forge/sole
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKDIR}/${OCTAVE_SRC}/COPYING
 
 RUN_DEPENDS=	${OCTAVE_TARBALLS_DIR}/bim.tar.gz:math/octave-forge-bim
 
 USES=		octave
 
 OCTAVE_SRC=		${OCTAVE_PKGNAME}
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-sparsersb/Makefile b/math/octave-forge-sparsersb/Makefile
index 41efb7cd2eb2..d4aba4ebda66 100644
--- a/math/octave-forge-sparsersb/Makefile
+++ b/math/octave-forge-sparsersb/Makefile
@@ -1,19 +1,19 @@
 PORTNAME=	octave-forge-sparsersb
 PORTVERSION=	1.0.9
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	math
 MASTER_SITES=	SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
 DISTNAME=	${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKDIR}/${OCTAVE_SRC}/COPYING
 
 LIB_DEPENDS=	librsb.so:math/librsb
 
 USES=		octave
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-specfun/Makefile b/math/octave-forge-specfun/Makefile
index c96a6a2a3c8c..03bba55bf8ed 100644
--- a/math/octave-forge-specfun/Makefile
+++ b/math/octave-forge-specfun/Makefile
@@ -1,21 +1,21 @@
 PORTNAME=	octave-forge-specfun
 PORTVERSION=	1.1.0
-PORTREVISION=	23
+PORTREVISION=	24
 CATEGORIES=	math
 MASTER_SITES=	SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
 DISTNAME=	${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKDIR}/${OCTAVE_SRC}/COPYING
 
 BROKEN=		does not build with octave>=8
 
 USES=		octave
 
 OCTAVE_SRC=		${OCTAVE_PKGNAME}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-special-matrix/Makefile b/math/octave-forge-special-matrix/Makefile
index 2293fa303a7c..753378bcda0c 100644
--- a/math/octave-forge-special-matrix/Makefile
+++ b/math/octave-forge-special-matrix/Makefile
@@ -1,18 +1,18 @@
 PORTNAME=	octave-forge-special-matrix
 PORTVERSION=	1.0.7
-PORTREVISION=	28
+PORTREVISION=	29
 CATEGORIES=	math
 MASTER_SITES=	SF/octave/Octave%20Forge%20Packages/Old%20Monolithic%20Releases/R2009-05-08
 DISTNAME=	${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 USES=		octave
 
 GNU_CONFIGURE=	yes
 
 WRKSRC=	${WRKDIR}/${OCTAVE_SRC}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-splines/Makefile b/math/octave-forge-splines/Makefile
index f49d76bc8f45..a37dbed805dd 100644
--- a/math/octave-forge-splines/Makefile
+++ b/math/octave-forge-splines/Makefile
@@ -1,20 +1,20 @@
 PORTNAME=	octave-forge-splines
 PORTVERSION=	1.3.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	math
 MASTER_SITES=	SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
 DISTNAME=	${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKDIR}/${OCTAVE_SRC}/COPYING
 
 USES=		octave
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-sqlite/Makefile b/math/octave-forge-sqlite/Makefile
index 5a1fe7b701ac..27f747787337 100644
--- a/math/octave-forge-sqlite/Makefile
+++ b/math/octave-forge-sqlite/Makefile
@@ -1,22 +1,23 @@
 PORTNAME=	octave-forge-sqlite
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.0.3
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKDIR}/${OCTAVE_SRC}/COPYING
 
 USES=		autoreconf octave pkgconfig sqlite
 USE_GITHUB=	yes
 GH_ACCOUNT=	gnu-octave
 GH_PROJECT=	octave-sqlite
 
 GNU_CONFIGURE=	yes
 
 OCTAVE_SRC=		${GH_PROJECT}-${DISTVERSION}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-statistics-bootstrap/Makefile b/math/octave-forge-statistics-bootstrap/Makefile
index f07f9da396fb..1729cf40acf1 100644
--- a/math/octave-forge-statistics-bootstrap/Makefile
+++ b/math/octave-forge-statistics-bootstrap/Makefile
@@ -1,25 +1,25 @@
 PORTNAME=	octave-forge-statistics-bootstrap
 DISTVERSIONPREFIX=	v
 DISTVERSION=	5.1.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKDIR}/${OCTAVE_SRC}/COPYING
 
 RUN_DEPENDS=	${OCTAVE_TARBALLS_DIR}/statistics.tar.gz:math/octave-forge-statistics
 
 USES=		octave
 USE_GITHUB=	yes
 GH_ACCOUNT=	gnu-octave
 GH_PROJECT=	statistics-bootstrap
 
 OCTAVE_SRC=		${GH_PROJECT}-${DISTVERSION}
 
 ALL_TARGET=	make
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-statistics/Makefile b/math/octave-forge-statistics/Makefile
index 4ba38b010360..d131c40e576d 100644
--- a/math/octave-forge-statistics/Makefile
+++ b/math/octave-forge-statistics/Makefile
@@ -1,21 +1,21 @@
 PORTNAME=	octave-forge-statistics
 DISTVERSIONPREFIX=	release-
 DISTVERSION=	1.5.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKDIR}/${OCTAVE_SRC}/COPYING
 
 USES=	octave
 USE_GITHUB=	yes
 GH_ACCOUNT=	gnu-octave
 GH_PROJECT=	statistics
 
 OCTAVE_SRC=		${GH_PROJECT}-release-${DISTVERSION}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-stk/Makefile b/math/octave-forge-stk/Makefile
index 9411302fe86e..40d1279727b9 100644
--- a/math/octave-forge-stk/Makefile
+++ b/math/octave-forge-stk/Makefile
@@ -1,19 +1,19 @@
 PORTNAME=	octave-forge-stk
 PORTVERSION=	2.8.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	https://github.com/stk-kriging/stk/releases/download/2.8.0/
 DISTNAME=	${OCTAVE_PKGNAME}-${DISTVERSIONFULL}-octpkg
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKDIR}/${OCTAVE_SRC}/COPYING
 
 USES=		octave
 
 OCTAVE_SRC=		${OCTAVE_PKGNAME}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-strings/Makefile b/math/octave-forge-strings/Makefile
index bb61f9e247ca..5c1751fde0fa 100644
--- a/math/octave-forge-strings/Makefile
+++ b/math/octave-forge-strings/Makefile
@@ -1,21 +1,21 @@
 PORTNAME=	octave-forge-strings
 PORTVERSION=	1.3.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
 DISTNAME=	${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv3+ BSD2CLAUSE
 LICENSE_COMB=	multi
 
 LIB_DEPENDS=	libpcre2-8.so:devel/pcre2
 
 USES=		octave pkgconfig
 
 GNU_CONFIGURE=	yes
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-struct/Makefile b/math/octave-forge-struct/Makefile
index 6c0c2bd3f284..5f0bcc9aed78 100644
--- a/math/octave-forge-struct/Makefile
+++ b/math/octave-forge-struct/Makefile
@@ -1,19 +1,19 @@
 PORTNAME=	octave-forge-struct
 PORTVERSION=	1.0.18
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
 DISTNAME=	${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKDIR}/${OCTAVE_SRC}/COPYING
 
 USES=		gmake octave
 
 GNU_CONFIGURE=	yes
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-symband/Makefile b/math/octave-forge-symband/Makefile
index f40ffe14c9c3..30b46dae8e74 100644
--- a/math/octave-forge-symband/Makefile
+++ b/math/octave-forge-symband/Makefile
@@ -1,21 +1,21 @@
 PORTNAME=	octave-forge-symband
 PORTVERSION=	1.0.10
-PORTREVISION=	28
+PORTREVISION=	29
 CATEGORIES=	math
 MASTER_SITES=	SF/octave/Octave%20Forge%20Packages/Old%20Monolithic%20Releases/R2009-06-07
 DISTNAME=	${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		octave
 
 GNU_CONFIGURE=	yes
 
 WRKSRC=        ${WRKDIR}/${OCTAVE_SRC}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-symbolic/Makefile b/math/octave-forge-symbolic/Makefile
index ee4c131285fc..1557e08a2985 100644
--- a/math/octave-forge-symbolic/Makefile
+++ b/math/octave-forge-symbolic/Makefile
@@ -1,22 +1,23 @@
 PORTNAME=	octave-forge-symbolic
 PORTVERSION=	3.1.1
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
 DISTNAME=	${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKDIR}/${OCTAVE_SRC}/COPYING
 
 BUILD_DEPENDS+=	isympy:math/py-sympy@${PY_FLAVOR}
 RUN_DEPENDS+=	isympy:math/py-sympy@${PY_FLAVOR}
 
 USES=		octave python
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-tcl-octave/Makefile b/math/octave-forge-tcl-octave/Makefile
index 7b7a16e1080c..37d0dc426280 100644
--- a/math/octave-forge-tcl-octave/Makefile
+++ b/math/octave-forge-tcl-octave/Makefile
@@ -1,18 +1,18 @@
 PORTNAME=	octave-forge-tcl-octave
 PORTVERSION=	0.1.8
-PORTREVISION=	28
+PORTREVISION=	29
 CATEGORIES=	math
 MASTER_SITES=	SF/octave/Octave%20Forge%20Packages/Old%20Monolithic%20Releases/R2009-05-08
 DISTNAME=	${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 USES=		octave tcl:wrapper
 
 GNU_CONFIGURE=	yes
 
 WRKSRC=	${WRKDIR}/${OCTAVE_SRC}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-tsa/Makefile b/math/octave-forge-tsa/Makefile
index b1eb7fd85eef..d2b51a0ff99c 100644
--- a/math/octave-forge-tsa/Makefile
+++ b/math/octave-forge-tsa/Makefile
@@ -1,21 +1,21 @@
 PORTNAME=	octave-forge-tsa
 PORTVERSION=	4.6.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 MASTER_SITES=	SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
 DISTNAME=	${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKDIR}/${OCTAVE_SRC}/COPYING
 
 RUN_DEPENDS+=	${OCTAVE_TARBALLS_DIR}/nan.tar.gz:math/octave-forge-nan
 
 USES=		octave
 
 ALL_TARGET=	octave
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-velas/Makefile b/math/octave-forge-velas/Makefile
index e7c07b8c9548..81470fe53989 100644
--- a/math/octave-forge-velas/Makefile
+++ b/math/octave-forge-velas/Makefile
@@ -1,23 +1,24 @@
 PORTNAME=	octave-forge-velas
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.0.5
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKDIR}/${OCTAVE_SRC}/COPYING
 
 USES=		octave
 USE_GITHUB=	yes
 GH_ACCOUNT=	ranzhengcode
 GH_PROJECT=	VELAS
 
 OCTAVE_SRC=	${GH_PROJECT}-${DISTVERSION}
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-video/Makefile b/math/octave-forge-video/Makefile
index 476852884698..f195bea2d139 100644
--- a/math/octave-forge-video/Makefile
+++ b/math/octave-forge-video/Makefile
@@ -1,22 +1,22 @@
 PORTNAME=	octave-forge-video
 PORTVERSION=	2.0.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 MASTER_SITES=	SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
 DISTNAME=	${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKDIR}/${OCTAVE_SRC}/COPYING
 
 LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
 
 USES=		octave pkgconfig
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	HOME=${WRKSRC}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-websockets/Makefile b/math/octave-forge-websockets/Makefile
index 52f475cf735f..e1bc3c9952c0 100644
--- a/math/octave-forge-websockets/Makefile
+++ b/math/octave-forge-websockets/Makefile
@@ -1,26 +1,26 @@
 PORTNAME=	octave-forge-websockets
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKDIR}/${OCTAVE_SRC}/COPYING
 
 RUN_DEPENDS=	${OCTAVE_TARBALLS_DIR}/sockets.tar.gz:math/octave-forge-sockets
 
 USES=		octave
 USE_GITHUB=	yes
 GH_ACCOUNT=	gnu-octave
 GH_PROJECT=	octave-websockets
 
 OCTAVE_SRC=		${GH_PROJECT}-${DISTVERSION}
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-zenity/Makefile b/math/octave-forge-zenity/Makefile
index 4579fd31e43d..7d033cab9598 100644
--- a/math/octave-forge-zenity/Makefile
+++ b/math/octave-forge-zenity/Makefile
@@ -1,23 +1,23 @@
 PORTNAME=	octave-forge-zenity
 PORTVERSION=	0.5.7
-PORTREVISION=	28
+PORTREVISION=	29
 CATEGORIES=	math
 MASTER_SITES=	SF/octave/Octave%20Forge%20Packages/Old%20Monolithic%20Releases/R2009-05-08
 DISTNAME=	${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS+=	zenity:x11/zenity
 
 USES=			octave
 
 GNU_CONFIGURE=	yes
 
 WRKSRC=	${WRKDIR}/${OCTAVE_SRC}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-zeromq/Makefile b/math/octave-forge-zeromq/Makefile
index 77e759ec5d21..a21c5e3420e3 100644
--- a/math/octave-forge-zeromq/Makefile
+++ b/math/octave-forge-zeromq/Makefile
@@ -1,21 +1,21 @@
 PORTNAME=	octave-forge-zeromq
 PORTVERSION=	1.5.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
 DISTNAME=	${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 WWW=		https://packages.octave.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKDIR}/${OCTAVE_SRC}/COPYING
 
 LIB_DEPENDS+=	libzmq.so:net/libzmq4
 
 USES=		localbase octave pkgconfig
 
 GNU_CONFIGURE=	yes
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge/Makefile b/math/octave-forge/Makefile
index 3e5f44412720..6548efc3e3d8 100644
--- a/math/octave-forge/Makefile
+++ b/math/octave-forge/Makefile
@@ -1,54 +1,55 @@
 PORTNAME=	octave-forge
 PORTVERSION=	20230421
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge metaport for math/octave
 WWW=		http://octave.sourceforge.net/
 
 USES=		metaport
 
 OPTIONS_DEFINE=	AUDIO ACTUARIAL AUTOMATIC_DIFFERENTIATION \
 		BENCHMARK BIM BIOINFO BIOSIG BSLTL CFITSIO CGI \
 		CIVIL_ENGINEERING CODER COMMUNICATIONS CONTROL \
 	        CSG_TOOLKIT DATA_SMOOTHING \
 		DATABASE DATAFRAME DICOM DIVAND DOCTEST ECONOMETRICS \
 		FDA FEMOCTAVE FENV FITS \
 		FINANCIAL FPL FUZZY_LOGIC_TOOLKIT GA GEOGRAPHICLIB \
 		GEOMETRY GENERAL \
 		GENERATE_HTML GNUPLOT GSL IDENT IMAGE \
 		INFORMATIONTHEORY INTEGRATION INTERNAL_FLUID_FLOW \
 		INTERVAL IO IRSA LEVEL_SET \
 		LINEAR_ALGEBRA LSSA LTFAT \
 		MAPPING MATGEOM MCCABE_THIELE \
 		MECHANICS MISCELLANEOUS MISSING_FUNCTIONS MPI MQTT MSH \
 		MULTICORE MVN NAN NCARRAY NETCDF NLWING2 NNET NURBS \
 		OCT2MAT OCTCLIP OCTPROJ ODEBVP ONSAS OPTICS \
 		OPTIM OPTIMINTERP OUTLIERS PARALLEL PDE1DM PLOT \
 		PONCHON_SAVARIT PSYCHROMETRICS PYTHONIC QUATERNION \
 		QUEUEING SECS1D SECS2D SECS3D SIGNAL SIMP SOCKETS SOLE \
 		SPECFUN \
 		SPARSERSB SPECIAL_MATRIX SPLINES SQLITE STATISTICS \
 		STATISTICS_BOOTSTRAP STK STRINGS \
 		STRUCT SYMBAND SYMBOLIC TCL_OCTAVE TSA VIDEO VELAS \
 		WEBSOCKETS ZENITY ZEROMQ
 
 OPTIONS_DEFAULT=	${OPTIONS_DEFINE:NDATABASE:NMECHANICS:NMPI:NNLWING2:NPARALLEL:NSPECFUN}
 
 OCTAVE_TARBALLS_DIR=		${LOCALBASE}/share/octave/tarballs
 
 .for OPT in ${OPTIONS_DEFINE}
 . if ${OPTIONS_DEFINE:MGENERATE_HTML} == ${OPT}
 ${OPT}_DESC=		Install package: ${OPT:tl}
 ${OPT}_RUN_DEPENDS=	${OCTAVE_TARBALLS_DIR}/${OPT:tl}.tar.gz:math/octave-forge-${OPT:tl}
 . else
 ${OPT}_DESC=		Install package: ${OPT:tl:S/_/-/g}
 .  if ${OPTIONS_DEFINE:MBENCHMARK} == ${OPT}
 ${OPT}_RUN_DEPENDS=	${OCTAVE_TARBALLS_DIR}/${OPT:tl:S/_/-/g}.tar.gz:benchmarks/octave-forge-${OPT:tl:S/_/-/g}
 .  else
 ${OPT}_RUN_DEPENDS=	${OCTAVE_TARBALLS_DIR}/${OPT:tl:S/_/-/g}.tar.gz:math/octave-forge-${OPT:tl:S/_/-/g}
 .  endif
 . endif
 .endfor
 
 .include <bsd.port.mk>
diff --git a/math/octave/Makefile b/math/octave/Makefile
index 6a8f4d69eb57..391714927305 100644
--- a/math/octave/Makefile
+++ b/math/octave/Makefile
@@ -1,135 +1,136 @@
 PORTNAME=	octave
 PORTVERSION=	${OCTAVE_VERSION}
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	GNU
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	High-level interactive language for numerical computations
 WWW=		https://www.octave.org/
 
 LICENSE=	GPLv3
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/gperf:devel/gperf \
 		${LOCALBASE}/bin/makeinfo:print/texinfo \
 		gnuplot:math/gnuplot \
 		gsed:textproc/gsed \
 		${LOCALBASE}/include/rapidjson/rapidjson.h:devel/rapidjson
 RUN_DEPENDS=	${LOCALBASE}/bin/makeinfo:print/texinfo \
 		gnuplot:math/gnuplot \
 		gsed:textproc/gsed
 LIB_DEPENDS=	libamd.so:math/suitesparse-amd \
 		libarpack.so:math/arpack-ng \
 		libcamd.so:math/suitesparse-camd \
 		libccolamd.so:math/suitesparse-ccolamd \
 		libcholmod.so:math/suitesparse-cholmod \
 		libcolamd.so:math/suitesparse-colamd \
 		libcurl.so:ftp/curl \
 		libcxsparse.so:math/suitesparse-cxsparse \
 		libdrm.so:graphics/libdrm \
 		libfftw3.so:math/fftw3 \
 		libfftw3f.so:math/fftw3-float \
 		libfltk.so:x11-toolkits/fltk \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libftgl.so:graphics/ftgl \
 		libgl2ps.so:print/gl2ps \
 		libglpk.so:math/glpk \
 		libGraphicsMagick.so:graphics/GraphicsMagick \
 		libhdf5.so:science/hdf5 \
 		libklu.so:math/suitesparse-klu \
 		libOSMesa.so:graphics/libosmesa \
 		libpcre.so:devel/pcre \
 		libportaudio.so:audio/portaudio \
 		libqhull_r.so:math/qhull \
 		libqrupdate.so:math/qrupdate \
 		libspqr.so:math/suitesparse-spqr \
 		libsuitesparseconfig.so:math/suitesparse-config \
 		libsundials_arkode.so:math/sundials \
 		libumfpack.so:math/suitesparse-umfpack
 
 USES=		charsetfix compiler:c++14-lang desktop-file-utils fortran gl \
 		gmake iconv libtool localbase:ldflags ncurses octave:env perl5 \
 		pkgconfig readline tar:xz xorg
 USE_LDCONFIG=	${PREFIX}/lib/${PORTNAME}/${PORTVERSION}
 USE_PERL5=	build
 GNU_CONFIGURE=	yes
 USE_QT=		core gui help network opengl printsupport sql widgets xml \
 		buildtools:build linguist:build qmake:build
 USE_XORG=	x11 xcursor xext xfixes xft xinerama xrender
 USE_GL=		gl glu
 
 GNU_HOST=	${ARCH}-portbld-freebsd${OSREL}
 PLIST_SUB=	GNU_HOST=${GNU_HOST} \
 		OCTAVE_VERSION=${OCTAVE_VERSION}
 LDFLAGS+=	-L${LOCALBASE}/lib/qt5
 CONFIGURE_ENV=	ac_cv_path_SED=${LOCALBASE}/bin/gsed \
 		ac_cv_type_max_align_t=yes \
 		GPERF="${LOCALBASE}/bin/gperf" \
 		JAVA_HOME=${JAVA_HOME} \
 		LRELEASE_QTVER=${LRELEASE} \
 		MAKEINFO=${LOCALBASE}/bin/makeinfo \
 		MKINFO=${LOCALBASE}/bin/makeinfo \
 		MOC_QTVER=${MOC} \
 		QCOLLECTIONGENERATOR_QTVER=${QCOLLECTIONGENERATOR} \
 		QHELPGENERATOR_QTVER=${QHELPGENERATOR} \
 		RCC_QTVER=${RCC} \
 		UIC_QTVER=${UIC}
 
 CONFIGURE_ARGS=	--disable-jit \
 		--disable-openmp \
 		--enable-shared \
 		--host=${GNU_HOST} \
 		--with-blas="-L${LOCALBASE}/lib ${BLASLIB}" \
 		--with-lapack="${LAPACKLIB}" \
 		--with-osmesa
 
 INFO=		octave liboctave
 
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check
 
 OPTIONS_DEFINE=	DOCS JAVA QT5
 
 OPTIONS_RADIO=		BLAS
 OPTIONS_RADIO_BLAS=	ATLAS NETLIB OPENBLAS
 OPTIONS_DEFAULT=	JAVA OPENBLAS QT5
 OPTIONS_SUB=		yes
 
 DOCS_CONFIGURE_ENABLE=	docs
 JAVA_CONFIGURE_ENABLE=	java
 QT5_CONFIGURE_WITH=	qscintilla qt=5
 
 QT5_LIB_DEPENDS=	libqscintilla2_qt5.so:devel/qscintilla2-qt5
 
 DOCS_USES=	tex
 DOCS_USE=	TEX=dvipsk:build,formats:build
 JAVA_USE=	JAVA=yes
 JAVA_CFLAGS=	-I${JAVA_HOME}/include/${OPSYS:tl}
 QT5_USES=	qt:5
 OPENBLAS_USES=	blaslapack:openblas
 NETLIB_USES=	blaslapack:netlib
 ATLAS_USES=	blaslapack:atlas
 
 pre-configure:
 	${REINPLACE_CMD} 's+"makeinfo"+"${LOCALBASE}/bin/makeinfo"+' ${WRKSRC}/libinterp/corefcn/help.cc
 	${REINPLACE_CMD} 's/"-qt=$$qt_version"/"-qt=qt$$qt_version"/' ${WRKSRC}/configure
 
 #post-install:
 #	(cd ${STAGEDIR}${DATADIR} && ${LN} -s ${PORTVERSION}/imagelib  .)
 #	${RM} -r ${STAGEDIR}${DATADIR}/${PORTVERSION}/etc/tests/fixed/${WRKDIR:C+/++:C+/.*++}
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for file in liboctave/liboctave.ps refcard/refcard-a4.ps \
 	refcard/refcard-legal.ps refcard/refcard-letter.ps interpreter/octave.ps
 	${INSTALL_DATA} ${WRKSRC}/doc/${file} ${STAGEDIR}${DOCSDIR}
 .endfor
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${INFO_PATH}
 .for file in interpreter/octave.info liboctave/liboctave.info
 	${INSTALL_DATA} ${WRKSRC}/doc/${file} ${STAGEDIR}${PREFIX}/${INFO_PATH}
 .endfor
 
 check regression-test: build
 	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} check)
 
 .include <bsd.port.mk>
diff --git a/math/openblas/Makefile b/math/openblas/Makefile
index 09882d2f1cdf..f1fed47c9973 100644
--- a/math/openblas/Makefile
+++ b/math/openblas/Makefile
@@ -1,141 +1,142 @@
 PORTNAME=	openblas
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.3.20
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	math
 MASTER_SITES=	NL/lapack/timing/:lapack_tmg
 DISTFILES=	large.tgz:lapack_tmg \
 		timing.tgz:lapack_tmg
 DIST_SUBDIR=	openblas
 
 MAINTAINER=	phd_kimberlite@yahoo.co.jp
 COMMENT=	Optimized BLAS library based on GotoBLAS2
 WWW=		https://github.com/xianyi/OpenBLAS
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		compiler:c11 cpe fortran gmake perl5 pkgconfig
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	xianyi
 GH_PROJECT=	OpenBLAS
 LARGE_FILE=	large.tgz
 TIMING_FILE=	timing.tgz
 CPE_VENDOR=	openblas_project
 
 USE_LDCONFIG=	yes
 USE_PERL5=	build
 
 OPENBLAS_SVER=	0
 TEST_TARGET=	tests
 
 PLIST_SUB+=	PORTVERSION=${PORTVERSION}
 
 OPTIONS_DEFINE=			DYNAMIC_ARCH INTERFACE64 OPENMP
 OPTIONS_DEFAULT=		OPENMP
 OPTIONS_DEFINE_i386=		AVX AVX2
 OPTIONS_DEFINE_amd64=		AVX AVX2
 OPTIONS_EXCLUDE_armv6=		OPENMP
 OPTIONS_EXCLUDE_armv7=		OPENMP
 OPTIONS_EXCLUDE_powerpc64le=	OPENMP
 OPTIONS_EXCLUDE_powerpc64=	OPENMP
 OPTIONS_EXCLUDE_powerpc=	OPENMP
 OPTIONS_RADIO=	${OPTIONS_RADIO_${ARCH}}
 OPTIONS_RADIO_powerpc64=	POWER
 OPTIONS_RADIO_POWER=	POWER6 POWER8
 OPTIONS_SUB=	yes
 
 .if defined(BATCH) || defined(PACKAGE_BUILDING)
 OPTIONS_DEFAULT_i386=	DYNAMIC_ARCH
 OPTIONS_DEFAULT_amd64=	DYNAMIC_ARCH
 OPTIONS_DEFAULT_powerpc64le=	DYNAMIC_ARCH
 .endif
 
 DYNAMIC_ARCH_DESC=	Optimize for multiple CPU types, otherwise for this CPU
 INTERFACE64_DESC=	Use 8 byte integers on 64-bit architectures
 OPENMP_DESC=		Use OpenMP for threading
 AVX_DESC=		Support Advanced Vector Extensions (AVX)
 AVX2_DESC=		Support Advanced Vector Extensions 2 (AVX2)
 POWER6_DESC=		Optimize for POWER6, instead of the default PPC970
 POWER8_DESC=		Optimize for POWER8, instead of the default PPC970
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == powerpc64
 USE_GCC=		yes
 .  if ${PORT_OPTIONS:MPOWER6}
 TARGET_CPU_ARCH=	POWER6
 .  elif ${PORT_OPTIONS:MPOWER8}
 TARGET_CPU_ARCH=	POWER8
 .else
 TARGET_CPU_ARCH=	PPC970
 .  endif
 .endif
 
 .if ${ARCH} == powerpc
 USE_GCC=		yes
 TARGET_CPU_ARCH=	PPCG4
 .endif
 
 .if ${ARCH} == powerpc64le
 USE_GCC=		yes
 .endif
 
 MAXTHREADS?=	64
 
 .include <bsd.port.pre.mk>
 
 post-extract:
 	cd ${DISTDIR}/${DIST_SUBDIR} ; \
 	${CP} ${LARGE_FILE} ${TIMING_FILE} ${WRKSRC}
 
 post-patch:
 	@${ECHO_CMD} MAKE_NB_JOBS=-1 >> ${WRKSRC}/Makefile.rule
 	@${ECHO_CMD} NUM_THREADS=${MAXTHREADS} >> ${WRKSRC}/Makefile.rule
 	@${ECHO_CMD} USE_THREAD=1 >> ${WRKSRC}/Makefile.rule
 .if ! ${PORT_OPTIONS:MAVX}
 	@${ECHO_CMD} NO_AVX=1 >> ${WRKSRC}/Makefile.rule
 .endif
 .if ! ${PORT_OPTIONS:MAVX2}
 	@${ECHO_CMD} NO_AVX2=1 >> ${WRKSRC}/Makefile.rule
 .endif
 .if ${PORT_OPTIONS:MDYNAMIC_ARCH}
 	@${ECHO_CMD} DYNAMIC_ARCH=1 >> ${WRKSRC}/Makefile.rule
 	@${ECHO_CMD} DYNAMIC_OLDER=1 >> ${WRKSRC}/Makefile.rule
 .endif
 .if defined(TARGET_CPU_ARCH)
 	@${ECHO_CMD} TARGET=${TARGET_CPU_ARCH} >> ${WRKSRC}/Makefile.rule
 .endif
 .if ${PORT_OPTIONS:MINTERFACE64}
 	@${ECHO_CMD} INTERFACE64=1 >> ${WRKSRC}/Makefile.rule
 .endif
 .if ${PORT_OPTIONS:MOPENMP}
 	@${ECHO_CMD} USE_OPENMP=1 >> ${WRKSRC}/Makefile.rule
 .endif
 .if ${ARCH:M*64*} == ""
 	@${ECHO_CMD} BINARY=32 >> ${WRKSRC}/Makefile.rule
 .else
 	@${ECHO_CMD} BINARY=64 >> ${WRKSRC}/Makefile.rule
 .endif
 
 post-patch-OPENMP-on:
 	@${REINPLACE_CMD} -e "s+OPENBLAS_NUM_THREADS+OMP_NUM_THREADS+g" \
 		${WRKSRC}/test/Makefile \
 		${WRKSRC}/ctest/Makefile
 
 BENCHMARK_MAXTHREADS?=	${MAXTHREADS}
 .if ${PORT_OPTIONS:MOPENMP}
 BENCHMARK_THREADS_FLAG=	OMP_NUM_THREADS=${BENCHMARK_MAXTHREADS}
 .else
 BENCHMARK_THREADS_FLAG=	OPENBLAS_NUM_THREADS=${BENCHMARK_MAXTHREADS}
 .endif
 
 benchmark: build
 	cd ${WRKSRC} ; ${SETENV} ${MAKE_CMD} ${MAKE_ARGS} hpl
 	cd ${WRKSRC}/benchmark ; ${SETENV} ${BENCHMARK_THREADS_FLAG} ${MAKE_CMD} ${MAKE_ARGS}
 
 post-install-DYNAMIC_ARCH-off:
 	cd ${STAGEDIR}${PREFIX} && ls lib/libopenblas_*p-r${PORTVERSION}.* >> ${TMPPLIST}
 
 .include <bsd.port.post.mk>
diff --git a/math/openturns/Makefile b/math/openturns/Makefile
index 374c9f84f554..9f735a5e062f 100644
--- a/math/openturns/Makefile
+++ b/math/openturns/Makefile
@@ -1,101 +1,101 @@
 PORTNAME=	openturns
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.20
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Uncertainty treatment library
 WWW=		https://openturns.github.io/www/
 
 LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/COPYING.LESSER
 
 BUILD_DEPENDS=	boost-libs>0:devel/boost-libs \
 		flex:textproc/flex \
 		spectra>0:math/spectra
 LIB_DEPENDS=	libamd.so:math/suitesparse-amd \
 		libblas.so:math/blas \
 		libbonmin.so:math/bonmin \
 		libboost_serialization.so:devel/boost-libs \
 		libcamd.so:math/suitesparse-camd \
 		libceres.so:math/ceres-solver \
 		libCbc.so:math/cbc \
 		libccolamd.so:math/suitesparse-ccolamd \
 		libCgl.so:math/cgl \
 		libcholmod.so:math/suitesparse-cholmod \
 		libClp.so:math/clp \
 		libcminpack.so:math/cminpack \
 		libcoinasl.so:math/asl \
 		libCoinUtils.so:math/coinutils \
 		libcolamd.so:math/suitesparse-colamd \
 		libcxsparse.so:math/suitesparse-cxsparse \
 		libdlib.so:science/dlib-cpp \
 		libgif.so:graphics/giflib \
 		libgflags.so:devel/gflags \
 		libglog.so:devel/glog \
 		libgmp.so:math/gmp \
 		libhdf5_cpp.so:science/hdf5 \
 		libipopt.so:math/ipopt \
 		liblapack.so:math/lapack \
 		libmetis.so:math/metis \
 		libmpc.so:math/mpc \
 		libmpfr.so:math/mpfr \
 		libnauty.so:math/nauty \
 		libnlopt.so:math/nlopt \
 		libOsi.so:math/osi \
 		libpagmo.so:science/pagmo2 \
 		libpng16.so:graphics/png \
 		libprimesieve.so:math/primesieve \
 		libspqr.so:math/suitesparse-spqr \
 		libsuitesparseconfig.so:math/suitesparse-config \
 		libsz.so:science/libaec \
 		libtbb.so:devel/onetbb \
 		libunwind.so:devel/libunwind
 
 USES=		bison blaslapack:openblas cmake eigen:3 gnome jpeg localbase:ldflags pkgconfig sqlite xorg # compiler:c++17-lang
 USE_GITHUB=	yes
 USE_GNOME=	libxml2
 USE_XORG=	ice sm x11 xau xcb xdmcp xext
 USE_LDCONFIG=	yes
 
 CMAKE_ARGS=	-DBLAS_LIBRARIES=${LOCALBASE}/lib/libopenblas.so -DLAPACK_LIBRARIES=${LOCALBASE}/lib/libopenblas.so \
 		-DOPENTURNS_EXAMPLE_PATH:STRING=share/examples/openturns \
 		-DOPENTURNS_DOC_PATH:STRING=share/doc/openturns
 CMAKE_OFF=	USE_DOXYGEN USE_SPHINX
 CMAKE_OFF+=	USE_HMAT # broken with hmat-oss-1.7.1: https://github.com/openturns/openturns/issues/1868
 
 TEST_TARGET=	check # 10 tests are known to fail: https://github.com/openturns/openturns/issues/1919
 
 OPTIONS_DEFINE=		PYTHON EXAMPLES
 OPTIONS_DEFAULT=	PYTHON
 OPTIONS_SUB=		yes
 
 PYTHON_USES=		python
 PYTHON_CMAKE_BOOL=	BUILD_PYTHON
 PYTHON_CMAKE_ON=	-DSWIG_EXECUTABLE=${LOCALBASE}/bin/swig
 PYTHON_PY_DEPENDS=	${PYNUMPY} \
 			${PYTHON_PKGNAMEPREFIX}chaospy>0:math/py-chaospy@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}dill>0:devel/py-dill@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR}
 PYTHON_BUILD_DEPENDS=	swig:devel/swig \
 			${PYTHON_PY_DEPENDS}
 PYTHON_RUN_DEPENDS=	${PYTHON_PY_DEPENDS}
 
 PORTEXAMPLES=		*
 
 LLVM_VERSION=	12 # workaround for clang-13 crash: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=261341
 
 # use clang from ports because cmake can't find base llvm for JIT
 BUILD_DEPENDS+=	clang${LLVM_VERSION}:devel/llvm${LLVM_VERSION}
 RUN_DEPENDS+=	clang${LLVM_VERSION}:devel/llvm${LLVM_VERSION}
 CPP=		clang-cpp${LLVM_VERSION}
 CC=		clang${LLVM_VERSION}
 CXX=		clang++${LLVM_VERSION}
 
 post-install:
 	@${RM} -r ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/math/optpp/Makefile b/math/optpp/Makefile
index 311d13aa1361..bcaa7ab8b3c0 100644
--- a/math/optpp/Makefile
+++ b/math/optpp/Makefile
@@ -1,22 +1,22 @@
 PORTNAME=	optpp
 DISTVERSION=	2.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	https://software.sandia.gov/opt++/downloads/
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Object-oriented nonlinear optimization library
 WWW=		https://software.sandia.gov/opt++/
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/GNU_LGPL
 
 USES=		fortran gmake libtool
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared
 USE_LDCONFIG=	yes
 
 post-stage: # installs the conflicting file
 	@${RM} ${STAGEDIR}${PREFIX}/include/cblas.h
 
 .include <bsd.port.mk>
diff --git a/math/or-tools/Makefile b/math/or-tools/Makefile
index 010d49994394..c5a04fc7f4d9 100644
--- a/math/or-tools/Makefile
+++ b/math/or-tools/Makefile
@@ -1,59 +1,60 @@
 PORTNAME=	or-tools
 DISTVERSIONPREFIX=	v
 DISTVERSION=	9.5
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Google's Operations Research tools
 WWW=		https://github.com/google/or-tools
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 PATCH_DEPENDS=	gsed:textproc/gsed
 LIB_DEPENDS=	libabsl_base.so:devel/abseil \
 		libCbc.so:math/cbc \
 		libCgl.so:math/cgl \
 		libcoinasl.so:math/asl \
 		libcoinmumps.so:math/coin-or-mumps \
 		libCoinUtils.so:math/coinutils \
 		libgflags.so:devel/gflags \
 		libglog.so:devel/glog \
 		libnauty.so:math/nauty \
 		libopenblas.so:math/openblas \
 		libOsi.so:math/osi \
 		libOsiClp.so:math/clp \
 		libprotobuf.so:devel/protobuf \
 		libre2.so:devel/re2
 
 USES=		blaslapack cmake:testing compiler:c++17-lang eigen:3 pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	google
 USE_LDCONFIG=	yes
 
 CMAKE_OFF=	BUILD_PYTHON BUILD_DEPS INSTALL_BUILD_DEPS BUILD_EXAMPLES BUILD_SAMPLES
 CMAKE_ON=	BUILD_CXX
 CMAKE_TESTING_ON=	BUILD_EXAMPLES BUILD_CXX_EXAMPLES
 
 CONFIGURE_ENV=	UNIX_CBC_DIR=${LOCALBASE} UNIX_CLP_DIR=${LOCALBASE}
 
 OPTIONS_DEFINE=		DOCS FLATZINC SCIP
 OPTIONS_DEFAULT=	FLATZINC #SCIP
 OPTIONS_SUB=		yes
 
 FLATZINC_DESC=		Build FlatZinc - MiniZinc interface
 FLATZINC_CMAKE_BOOL=	BUILD_FLATZINC
 
 SCIP_DESC=		Use the SCIP solver # SCIP package isn't built because of licensing restrictions
 SCIP_CMAKE_BOOL=	USE_SCIP
 SCIP_LIB_DEPENDS=	libscip.so:math/SCIP
 
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME:S/-//}
 PORTDOCS=	*
 
 # 3 tests are known to fail, see https://github.com/google/or-tools/issues/3429
 
 post-install:
 	@${FIND} ${STAGEDIR}${PREFIX} -type d -empty -delete
 
 .include <bsd.port.mk>
diff --git a/math/osi-conic/Makefile b/math/osi-conic/Makefile
index 88a53e9b7da6..443722391ce1 100644
--- a/math/osi-conic/Makefile
+++ b/math/osi-conic/Makefile
@@ -1,31 +1,32 @@
 PORTNAME=	osi-conic
 DISTVERSIONPREFIX=	releases/
 DISTVERSION=	1.0.0
+PORTREVISION=	1
 CATEGORIES=	math
 PKGNAMEPREFIX=	coin-or-
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Conic problem solver interface extending OSI to conic problems
 WWW=		https://github.com/aykutbulut/OSI-CONIC
 
 LICENSE=	EPL
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libCoinUtils.so:math/coinutils \
 		libopenblas.so:math/openblas \
 		libOsi.so:math/osi
 
 USES=		gmake libtool pkgconfig
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	aykutbulut
 GH_PROJECT=	OSI-CONIC
 
 GNU_CONFIGURE=	yes
 
 MAKE_ARGS=	FREEBSD_STAGEDIR=${STAGEDIR}
 
 INSTALL_TARGET=	install-strip
 
 .include <bsd.port.mk>
diff --git a/math/osi/Makefile b/math/osi/Makefile
index a0d6fc78b772..7e158a42be3f 100644
--- a/math/osi/Makefile
+++ b/math/osi/Makefile
@@ -1,37 +1,38 @@
 PORTNAME=	Osi
 DISTVERSIONPREFIX=	releases/
 DISTVERSION=	0.108.7
+PORTREVISION=	1
 CATEGORIES=	math
 PKGNAMEPREFIX=	coin-or-
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	COIN-OR Open Solver Interface, an API for calling solver libraries
 WWW=		https://projects.coin-or.org/Osi/
 
 LICENSE=	EPL
 LICENSE_FILE=	${WRKSRC}/Osi/LICENSE
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 LIB_DEPENDS=	libCoinUtils.so:math/coinutils \
 		libopenblas.so:math/openblas
 RUN_DEPENDS=	coin-or-Data-Sample>0:math/coin-or-data-sample \
 		coin-or-Data-Netlib>0:math/coin-or-data-netlib
 
 USES=		fortran gmake libtool localbase:ldflags pkgconfig tar:tgz
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-blas-lib="-lopenblas" --with-lapack-lib="-lopenblas" \
 		--with-sample-datadir="${LOCALBASE}/share/coin/Data/Sample" \
 		--with-netlib-datadir="${LOCALBASE}/share/coin/Data/Netlib" \
 		--with-coinutils-incdir="${LOCALBASE}/include/coin" --with-coinutils-lib="${LOCALBASE}/lib/libCoinUtils.so"
 		# Incompatible with optional dependencies glpk and SoPlex: https://projects.coin-or.org/Osi/ticket/117 https://projects.coin-or.org/Osi/ticket/118
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	coin-or
 
 INSTALL_TARGET=	install-strip
 
 post-install:
 	@${RM} -r ${STAGEDIR}${PREFIX}/share/coin
 
 .include <bsd.port.mk>
diff --git a/math/osiipopt/Makefile b/math/osiipopt/Makefile
index 53c2c02c564a..d486fc309357 100644
--- a/math/osiipopt/Makefile
+++ b/math/osiipopt/Makefile
@@ -1,37 +1,37 @@
 PORTNAME=	osiipopt
 DISTVERSIONPREFIX=	releases/
 DISTVERSION=	0.1-8
-PORTREVISION=	1
+PORTREVISION=	2
 DISTVERSIONSUFFIX=	-gc808091
 CATEGORIES=	math
 PKGNAMEPREFIX=	coin-or-
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Conic solver interface for Ipopt
 WWW=		https://github.com/aykutbulut/OsiIpopt
 
 LICENSE=	EPL
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libblas.so:math/blas \
 		libCoinUtils.so:math/coinutils \
 		libipopt.so:math/ipopt \
 		liblapack.so:math/lapack \
 		libopenblas.so:math/openblas \
 		libOsi.so:math/osi \
 		libOsiConic.so:math/osi-conic
 
 USES=		gmake libtool pkgconfig
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	aykutbulut
 GH_PROJECT=	OsiIpopt
 
 GNU_CONFIGURE=	yes
 
 MAKE_ARGS=	FREEBSD_STAGEDIR=${STAGEDIR}
 
 INSTALL_TARGET=	install-strip
 
 .include <bsd.port.mk>
diff --git a/math/p5-Math-MPC/Makefile b/math/p5-Math-MPC/Makefile
index 114af0f6ad4d..b4616139fbf3 100644
--- a/math/p5-Math-MPC/Makefile
+++ b/math/p5-Math-MPC/Makefile
@@ -1,29 +1,30 @@
 PORTNAME=	Math-MPC
 PORTVERSION=	1.31
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl interface to MPC Library
 WWW=		https://metacpan.org/release/Math-MPC
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 LIB_DEPENDS=	libgmp.so:math/gmp \
 		libmpc.so:math/mpc \
 		libmpfr.so:math/mpfr
 RUN_DEPENDS=	p5-Math-MPFR>=3.23:math/p5-Math-MPFR
 
 USES=		localbase perl5
 USE_PERL5=	configure
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Math/MPC/Ball/Ball.so
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Math/MPC/Constant/Constant.so
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Math/MPC/MPC.so
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Math/MPC/Radius/Radius.so
 
 .include <bsd.port.mk>
diff --git a/math/p5-NetCDF/Makefile b/math/p5-NetCDF/Makefile
index e61b26ac8676..6922424949ea 100644
--- a/math/p5-NetCDF/Makefile
+++ b/math/p5-NetCDF/Makefile
@@ -1,25 +1,25 @@
 PORTNAME=	NetCDF
 PORTVERSION=	1.2.4
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	math perl5
 MASTER_SITES=	ftp://ftp.unidata.ucar.edu/pub/netcdf-perl/
 PKGNAMEPREFIX=	p5-
 DISTNAME=	netcdf-perl-${PORTVERSION}
 
 MAINTAINER=	rand@meridian-enviro.com
 COMMENT=	Perl5 module to read and write netCDF files
 WWW=		http://www.unidata.ucar.edu/packages/netcdf-perl/
 
 LIB_DEPENDS=	libnetcdf.so:science/netcdf
 
 USES=		perl5 fakeroot
 
 WRKSRC_SUBDIR=		src
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPP_NETCDF=-I${LOCALBASE}/include LD_NETCDF=-lnetcdf \
 		PERL_MANDIR=${STAGEDIR}${SITE_PERL}/man PERL=${PERL}
 
 pre-install:
 	@${PERL5} -pi -e 's/ doc_(perl|site|\$$\(INSTALLDIRS\))_install$$//' ${WRKSRC}/perl/Makefile
 
 .include <bsd.port.mk>
diff --git a/math/p5-Statistics-R/Makefile b/math/p5-Statistics-R/Makefile
index 1270ee3a69af..5de0b91aa612 100644
--- a/math/p5-Statistics-R/Makefile
+++ b/math/p5-Statistics-R/Makefile
@@ -1,25 +1,25 @@
 PORTNAME=	Statistics-R
 PORTVERSION=	0.34
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:FANGLY
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Controls the R interpreter through Perl
 WWW=		https://metacpan.org/release/Statistics-R
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
 
 BUILD_DEPENDS=	R:math/R
 RUN_DEPENDS=	R:math/R \
 		p5-IPC-Run>=0.10:devel/p5-IPC-Run \
 		p5-Regexp-Common>=0:textproc/p5-Regexp-Common
 
 NO_ARCH=	yes
 USES=		perl5
 USE_PERL5=	configure
 
 .include <bsd.port.mk>
diff --git a/math/paritwine/Makefile b/math/paritwine/Makefile
index aa595e5f34a9..0fb14f9c2bb3 100644
--- a/math/paritwine/Makefile
+++ b/math/paritwine/Makefile
@@ -1,33 +1,33 @@
 PORTNAME=	paritwine
 DISTVERSION=	0.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 MASTER_SITES=	http://www.multiprecision.org/downloads/
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Glue library between PARI/GP and other mathematics libraries
 WWW=		https://www.multiprecision.org/paritwine/home.html
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libarb.so:math/arb \
 		libcmh.so:math/cmh \
 		libflint.so:math/flint2 \
 		libmpc.so:math/mpc \
 		libmpfr.so:math/mpfr \
 		libgmp.so:math/gmp \
 		libpari.so:math/pari
 
 USES=		gmake libtool localbase
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
 
 INSTALL_TARGET=	install-strip
 
 INFO=		paritwine
 
 TEST_TARGET=	check
 
 .include <bsd.port.mk>
diff --git a/math/parmetis/Makefile b/math/parmetis/Makefile
index d1b628ff3be0..6bc3e10a8eb9 100644
--- a/math/parmetis/Makefile
+++ b/math/parmetis/Makefile
@@ -1,87 +1,87 @@
 PORTNAME=	ParMetis
 PORTVERSION=	4.0.3
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	math parallel
 MASTER_SITES=	http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis/
 DISTNAME=	${PORTNAME:tl}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Package for parallel (MPI) unstructured graph partitioning
 WWW=		http://glaros.dtc.umn.edu/gkhome/metis/parmetis/overview
 
 LICENSE=	METIS
 LICENSE_NAME=	University of Minnesota METIS License
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 LICENSE_PERMS=	auto-accept
 
 BROKEN=		does not fetch
 
 USES=		cmake:insource,noninja gmake
 USE_LDCONFIG=	${PREFIX}/lib/parmetis
 
 OPTIONS_DEFINE=	OPENMPI DOCS STATIC
 OPENMPI_DESC=	Use openmpi instead of mpich
 OPTIONS_SUB=	yes
 
 OPENMPI_BUILD_DEPENDS=		${LOCALBASE}/mpi/openmpi/bin/mpicc:net/openmpi
 OPENMPI_RUN_DEPENDS=		${LOCALBASE}/mpi/openmpi/bin/mpirun:net/openmpi
 OPENMPI_VARS=			MPICC=${LOCALBASE}/mpi/openmpi/bin/mpicc \
 				MPICXX=${LOCALBASE}/mpi/openmpi/bin/mpicxx
 OPENMPI_BUILD_DEPENDS_OFF=	${LOCALBASE}/bin/mpicc:net/mpich
 OPENMPI_RUN_DEPENDS_OFF=	${LOCALBASE}/bin/mpirun:net/mpich
 OPENMPI_VARS_OFF=		MPICC=${LOCALBASE}/bin/mpicc \
 				MPICXX=${LOCALBASE}/bin/mpicxx
 
 STATIC_DESC=			Do not build and install shared library
 STATIC_VARS_OFF=		SH_FLAG="shared=1"
 
 CFLAGS+=	-fPIC
 
 .include <bsd.port.options.mk>
 
 pre-configure:
 	@${REINPLACE_CMD} -e \
 		's|BUILDDIR =.*|BUILDDIR = build| ; \
 		 s|make -C|$$(MAKE) -C| ; \
 		 s|$$(MAKEFLAGS)||' ${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -e \
 		's|"-O3"|""|' ${WRKSRC}/metis/GKlib/GKlibSystem.cmake
 .if ((${ARCH}=="amd64") || (${ARCH}=="aarch64") || (${ARCH}=="sparc64") || (${ARCH}=="ppc64") || (${ARCH}=="ia64"))
 	@${REINPLACE_CMD} -e \
 		's|IDXTYPEWIDTH 32|IDXTYPEWIDTH 64|' \
 		${WRKSRC}/metis/include/metis.h
 .endif
 	@${REINPLACE_CMD} -e \
 		'/target_link_libraries(.* parmetis)/s/\(parmetis\)/& -lexecinfo/' \
 		${WRKSRC}/programs/CMakeLists.txt
 
 do-configure:
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \
 		${MAKEFILE} config prefix="${PREFIX}" cc="${MPICC}" cxx="${MPICXX}" ${SH_FLAG}
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/include/parmetis \
 		${STAGEDIR}${PREFIX}/lib/parmetis \
 		${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/include/parmetis.h \
 		${WRKSRC}/metis/include/metis.h \
 		${STAGEDIR}${PREFIX}/include/parmetis
 .if ${PORT_OPTIONS:MSTATIC}
 	${INSTALL_DATA} ${WRKSRC}/build/libmetis/libmetis.a \
 		${STAGEDIR}${PREFIX}/lib/parmetis
 	${INSTALL_DATA} ${WRKSRC}/build/libparmetis/libparmetis.a \
 		${STAGEDIR}${PREFIX}/lib/parmetis
 .else
 	${INSTALL_DATA} ${WRKSRC}/build/libmetis/libmetis.so \
 		${STAGEDIR}${PREFIX}/lib/parmetis/libmetis.so.2
 	${INSTALL_LIB} ${WRKSRC}/build/libparmetis/libparmetis.so \
 		${STAGEDIR}${PREFIX}/lib/parmetis/libparmetis.so.2
 	cd ${STAGEDIR}${PREFIX}/lib/parmetis &&	\
 		${LN} -sf libmetis.so.2 ${STAGEDIR}${PREFIX}/lib/parmetis/libmetis.so && \
 		${LN} -sf libparmetis.so.2 ${STAGEDIR}${PREFIX}/lib/parmetis/libparmetis.so
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/parmetis/libmetis.so.2
 .endif
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/manual/manual.pdf ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/math/parmgridgen/Makefile b/math/parmgridgen/Makefile
index ed8fc095981e..1a66bdbaf07b 100644
--- a/math/parmgridgen/Makefile
+++ b/math/parmgridgen/Makefile
@@ -1,43 +1,43 @@
 PORTNAME=	parmgridgen
 PORTVERSION=	1.0
-PORTREVISION=	15
+PORTREVISION=	16
 CATEGORIES=	math science
 MASTER_SITES=	http://www.mgnet.org/mgnet/Codes/parmgridgen/ \
 		http://www-users.cs.umn.edu/~moulitsa/download/ \
 		http://www.stasyan.com/devel/distfiles/
 DISTNAME=	ParMGridGen-${PORTVERSION}
 
 MAINTAINER=	devel@stasyan.com
 COMMENT=	Library for obtaining a sequence of successive coarse grids
 WWW=		http://www.mgnet.org/mgnet-codes-parmgridgen.html
 
 LIB_DEPENDS=	libmpi.so:net/openmpi
 
 ALL_TARGET=	parallel
 USES=		gmake
 MAKE_JOBS_UNSAFE=	yes
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${REINPLACE_CMD} 's|make|$$(MAKE)|g' ${WRKSRC}/Makefile
 #respect CFLAGS
 .	for f in IMlib Lib Programs
 	    @${REINPLACE_CMD} 's|CFLAGS =|CFLAGS+=|g' ${WRKSRC}/MGridGen/${f}/Makefile
 .	endfor
 .	for f in IMParMetis-2.0 ParLib Programs
 	    @${REINPLACE_CMD} 's|CFLAGS =|CFLAGS+=|g' ${WRKSRC}/ParMGridGen/${f}/Makefile
 .	endfor
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/mgridgen ${STAGEDIR}${PREFIX}/bin/mgridgen
 	${INSTALL_PROGRAM} ${WRKSRC}/parmgridgen ${STAGEDIR}${PREFIX}/bin/parmgridgen
 	${INSTALL_DATA} ${WRKSRC}/libmgrid.a ${STAGEDIR}${PREFIX}/lib/libmgrid.a
 	${INSTALL_DATA} ${WRKSRC}/libparmgrid.a ${STAGEDIR}${PREFIX}/lib/libparmgrid.a
 	${INSTALL_DATA} ${WRKSRC}/mgridgen.h ${STAGEDIR}${PREFIX}/include/mgridgen.h
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/README
 
 .include <bsd.port.mk>
diff --git a/math/pdal/Makefile b/math/pdal/Makefile
index 3b3c99d4bd49..d1c38fad3bfe 100644
--- a/math/pdal/Makefile
+++ b/math/pdal/Makefile
@@ -1,78 +1,78 @@
 PORTNAME=	pdal
 DISTVERSION=	2.3.0
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	math databases graphics
 MASTER_SITES=	https://github.com/PDAL/PDAL/releases/download/${DISTVERSION}/
 DISTNAME=	${PORTNAME}-${DISTVERSION}-src
 
 MAINTAINER=	lbartoletti@FreeBSD.org
 COMMENT=	Library for translating and manipulating point cloud data
 WWW=		https://www.pdal.io/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BUILD_DEPENDS=	nlohmann-json>0:devel/nlohmann-json
 LIB_DEPENDS=	libgdal.so:graphics/gdal \
 		libgeos.so:graphics/geos \
 		libboost_thread.so:devel/boost-libs \
 		libcurl.so:ftp/curl \
 		libgeotiff.so:graphics/libgeotiff \
 		libxml2.so:textproc/libxml2 \
 		liblaszip.so:archivers/laszip \
 		libzstd.so:archivers/zstd \
 		${LIB_DEPENDS_${ARCH}}
 LIB_DEPENDS_aarch64=	libunwind.so:devel/libunwind
 LIB_DEPENDS_amd64=	libunwind.so:devel/libunwind
 LIB_DEPENDS_armv7=	libunwind.so:devel/libunwind
 LIB_DEPENDS_i386=	libunwind.so:devel/libunwind
 LIB_DEPENDS_powerpc64=	libunwind.so:devel/libunwind
 LIB_DEPENDS_powerpc64le=libunwind.so:devel/libunwind
 
 USES=		cmake compiler:c++11-lib pathfix pkgconfig ssl tar:bz2
 USE_LDCONFIG=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME:tu}-${DISTVERSION}-src
 
 CMAKE_ON=	WITH_LASZIP #LASZIP is recommended
 CMAKE_OFF=	WITH_TESTS
 
 OPTIONS_DEFINE=	BASH \
 		ICEBRIDGE PGPOINTCLOUD LAZPERF MBIO \
 
 OPTIONS_DEFAULT=	BASH \
 			ICEBRIDGE PGPOINTCLOUD LAZPERF MBIO
 
 #Plugins with lib not in port:
 #RivLib, Matlab, MrSID, CPD, GeoWave, GreyHound, HexBin, NITF (nitro)
 OPTIONS_SUB=	yes
 
 BASH_DESC=		BASH completion
 ICEBRIDGE_DESC=		Enable Icebridge plugin
 LAZPERF_DESC=		Enable LAZPerf plugin
 MBIO_DESC=		Enable MBIO plugin
 PGPOINTCLOUD_DESC=	Enable Coherent PostgreSQL Point Cloud plugin
 
 BASH_CMAKE_BOOL=	WITH_COMPLETION
 BASH_RUN_DEPENDS=	bash:shells/bash
 
 ICEBRIDGE_CMAKE_BOOL=	BUILD_PLUGIN_ICEBRIDGE
 ICEBRIDGE_LIB_DEPENDS=	libhdf5.so:science/hdf5 \
 			libsz.so:science/libaec
 
 LAZPERF_CMAKE_BOOL=	WITH_LAZPERF
 LAZPERF_LIB_DEPENDS=	liblazperf.so:archivers/lazperf
 
 MBIO_CMAKE_BOOL=	BUILD_PLUGIN_MBIO
 
 PGPOINTCLOUD_CMAKE_BOOL=	BUILD_PLUGIN_PGPOINTCLOUD
 PGPOINTCLOUD_USES=	pgsql
 
 CXXFLAGS_powerpc64=	-mvsx
 
 post-install-BASH-on:
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/bash-completion/completions
 	${INSTALL_DATA} ${WRKSRC}/scripts/bash-completion/pdal \
 		${STAGEDIR}${PREFIX}/share/bash-completion/completions
 
 .include <bsd.port.mk>
diff --git a/math/petiga/Makefile b/math/petiga/Makefile
index 86fc8c9f8282..c52790bf87da 100644
--- a/math/petiga/Makefile
+++ b/math/petiga/Makefile
@@ -1,37 +1,37 @@
 PORTNAME=	petiga
 DISTVERSION=	g20221208
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math python
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Framework for High Performance Isogeometric Analysis
 WWW=		https://github.com/dalcinl/PetIGA
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.rst
 
 LIB_DEPENDS=	libblas.so:math/blas \
 		liblapack.so:math/lapack \
 		libmpich.so:net/mpich \
 		libpetsc.so:science/PETSc
 
 USES=		gmake compiler:c++14-lang fortran xorg
 USE_LDCONFIG=	yes
 USE_XORG=	x11
 
 MAKEFILE=	makefile
 
 MAKE_ENV=	PETSC_DIR=${LOCALBASE}
 MAKE_ARGS=	PREFIX=${STAGEDIR}${PREFIX}
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	dalcinl
 GH_PROJECT=	PetIGA
 GH_TAGNAME=	218fdfa
 
 TEST_TARGET=	check
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpetiga.so
 
 .include <bsd.port.mk>
diff --git a/math/polymake/Makefile b/math/polymake/Makefile
index c455bed13360..5620aadad595 100644
--- a/math/polymake/Makefile
+++ b/math/polymake/Makefile
@@ -1,197 +1,198 @@
 PORTNAME=	polymake
 DISTVERSION=	4.9
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	https://polymake.org/lib/exe/fetch.php/download/
 DISTNAME=	${PORTNAME}-${DISTVERSION}-minimal
 
 MAINTAINER=	bsd@philippost.de
 COMMENT=	Software package for research in polyhedral geometry
 WWW=		https://www.polymake.org/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	boost-libs>=1.72:devel/boost-libs \
 		ninja:devel/ninja \
 		permlib>=0.2.9:math/permlib \
 		p5-XML-SAX>=1.02:textproc/p5-XML-SAX \
 		p5-XML-Writer>=0.900:textproc/p5-XML-Writer \
 		p5-Term-ReadLine-Gnu>=1.37:devel/p5-Term-ReadLine-Gnu \
 		p5-Term-ReadKey>=2.38:devel/p5-Term-ReadKey \
 		p5-JSON>=2.97:converters/p5-JSON
 LIB_DEPENDS=	libcddgmp.so:math/cddlib \
 		libflint.so:math/flint2 \
 		libgmpxx.so:math/gmp \
 		libmpfr.so:math/mpfr
 RUN_DEPENDS=	bash>=5.0:shells/bash \
 		boost-libs>=1.72:devel/boost-libs \
 		permlib>=0.2.9:math/permlib \
 		p5-XML-SAX>=1.02:textproc/p5-XML-SAX \
 		p5-XML-Writer>=0.900:textproc/p5-XML-Writer \
 		p5-Term-ReadLine-Gnu>=1.37:devel/p5-Term-ReadLine-Gnu \
 		p5-Term-ReadKey>=2.38:devel/p5-Term-ReadKey \
 		p5-JSON>=2.97:converters/p5-JSON
 
 USES=		compiler:c++14-lang gmake gnome perl5 readline shebangfix \
 		tar:bzip2
 USE_GNOME=	libxml2 libxslt
 USE_LDCONFIG=	${PREFIX}/lib
 USE_PERL5=	build run
 
 SHEBANG_FILES=	resources/host-agent/bin/env resources/host-agent/bin/polymake
 SHEBANG_GLOB=	*.pl *.sh
 
 # polymake's configure script expects options to be disabled by --without-option
 # and most options to be enabled by --with-option=DIR
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--exec-prefix=${PREFIX} \
 		--bindir=${PREFIX}/bin \
 		--includedir=${PREFIX}/include \
 		--libdir=${PREFIX}/lib \
 		--libexecdir=${PREFIX}/libexec/polymake \
 		--datadir=${PREFIX}/share/polymake \
 		--docdir=${DOCSDIR} \
 		--without-prereq \
 		--with-libcxx \
 		--with-cdd=${LOCALBASE} \
 		--with-flint=${LOCALBASE} \
 		--with-permlib=${LOCALBASE}/lib \
 		--without-java \
 		--without-javaview \
 		--without-sympol
 CONFIGURE_LOG=	build/bundled.log
 
 # Optional features; SoPlex defaults to off due to licencsing and SCIP defaults
 # to off due to a dependency on libsoplex.so.
 OPTIONS_DEFINE=	LRS NATIVE NORMALIZ OPENMP PPL SCIP SINGULAR SOPLEX TESTS
 OPTIONS_DEFAULT=	BLISS LRS NORMALIZ OPENMP PPL SINGULAR
 # Exlude lrslib on i386 and powerpc because it is marked BROKEN for those
 # architectures
 OPTIONS_EXCLUDE_i386=	LRS
 OPTIONS_EXCLUDE_powerpc=	LRS
 OPTIONS_SUB=	yes
 
 # polymake needs either math/bliss or math/nauty to compute graph automorphism
 # groups
 OPTIONS_SINGLE=	GRAPH
 OPTIONS_SINGLE_GRAPH=	BLISS NAUTY
 
 BLISS_DESC=	Compute graph automorphism groups using bliss
 GRAPH_DESC=	Graph automorphism groups
 LRS_DESC=	Convex hull computation and vertex enumeration
 NATIVE_DESC=	Build with native optimizations (-march=native)
 NAUTY_DESC=	Compute graph automorphism groups using nauty
 NORMALIZ_DESC=	Computations in affine monoids and lattice polytopes
 PPL_DESC=	Manipulation of convex polyhedra
 SCIP_DESC=	Solver for mixed integer linear and nonlinear problems
 SINGULAR_DESC=	Computation of Groebner bases
 SOPLEX_DESC=	Solver for linear programming problems
 TESTS_DESC=	Run bundled self tests after build
 
 BLISS_CONFIGURE_ON=	--with-bliss=${LOCALBASE}
 BLISS_CONFIGURE_OFF=	--without-bliss
 BLISS_BUILD_DEPENDS=	bliss-graph-tool>=0.73:math/bliss
 BLISS_RUN_DEPENDS=	bliss-graph-tool>=0.73:math/bliss
 
 NAUTY_CONFIGURE_ON=	--with-nauty=${LOCALBASE}
 NAUTY_CONFIGURE_OFF=	--without-nauty
 NAUTY_LIB_DEPENDS=	libnauty.so:math/nauty
 
 LRS_CONFIGURE_ON=	--with-lrs=${LOCALBASE} \
 			--with-lrs-include=${LOCALBASE}/include/lrslib
 LRS_CONFIGURE_OFF=	--without-lrs
 LRS_LIB_DEPENDS=	liblrs.so:math/lrslib
 
 NATIVE_CONFIGURE_OFF=	--without-native
 
 NORMALIZ_CONFIGURE_ON=	--with-libnormaliz=${LOCALBASE}
 NORMALIZ_CONFIGURE_OFF=	--without-libnormaliz
 NORMALIZ_LIB_DEPENDS=	libnormaliz.so:math/libnormaliz
 
 OPENMP_CONFIGURE_OFF=	--without-openmp
 
 PPL_CONFIGURE_ON=	--with-ppl=${LOCALBASE}
 PPL_CONFIGURE_OFF=	--without-ppl
 PPL_LIB_DEPENDS=	libppl.so:devel/ppl
 
 SCIP_CONFIGURE_ON=	--with-scip=${LOCALBASE}
 SCIP_CONFIGURE_OFF=	--without-scip
 SCIP_LIB_DEPENDS=	libscip.so:math/SCIP
 
 SINGULAR_CONFIGURE_ON=	--with-singular=${LOCALBASE}
 SINGULAR_CONFIGURE_OFF=	--without-singular
 SINGULAR_LIB_DEPENDS=	libSingular.so:math/singular
 
 SOPLEX_CONFIGURE_ON=	--with-soplex=${LOCALBASE}
 SOPLEX_CONFIGURE_OFF=	--without-soplex
 SOPLEX_LIB_DEPENDS=	libsoplex-pic.so:math/SoPlex
 
 TESTS_VARS=	USE_PERL5+=test
 
 # The port uses the minimal distribution tarball without bundled libraries.
 # Set WRKSRC accordingly.
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
 
 .include <bsd.port.options.mk>
 
 # Deal with site specific installation directory
 # polymake installs a perlxs module which depends on the perl configuration
 PERL_ARCHNAME=	${:!${PERL} -E 'use Config; print "\$Config::Config{archname}";'!}
 PLIST_FILES=	libexec/polymake/perlx/${PERL_VERSION}/${PERL_ARCHNAME}/auto/Polymake/Ext/Ext.so
 
 # Keep track of the major version
 DISTVERSION_MAJ=	${:!expr ${DISTVERSION} : '\([0-9]*\).*'!}
 
 post-install:
 	${RLN} ${STAGEDIR}${PREFIX}/lib/libpolymake.so.${DISTVERSION} \
 		${STAGEDIR}${PREFIX}/lib/libpolymake.so.${DISTVERSION_MAJ}
 	${RLN} ${STAGEDIR}${PREFIX}/lib/libpolymake.so.${DISTVERSION} \
 		${STAGEDIR}${PREFIX}/lib/libpolymake.so
 
 	${STRIP_CMD} \
 		${STAGEDIR}${PREFIX}/lib/libpolymake.so.${DISTVERSION} \
 
 .for _lp in libpolymake-apps libpolymake-apps-rt
 	${RLN} ${STAGEDIR}${PREFIX}/lib/${_lp}.so.${DISTVERSION} \
 		${STAGEDIR}${PREFIX}/lib/${_lp}.so.${DISTVERSION_MAJ}
 	${RLN} ${STAGEDIR}${PREFIX}/lib/${_lp}.so.${DISTVERSION} \
 		${STAGEDIR}${PREFIX}/lib/${_lp}.so
 
 	${RLN} ${STAGEDIR}${PREFIX}/lib/${_lp}.so.${DISTVERSION} \
 		${STAGEDIR}${PREFIX}/libexec/polymake/lib/${_lp}.so.${DISTVERSION_MAJ}
 	${RLN} ${STAGEDIR}${PREFIX}/lib/${_lp}.so.${DISTVERSION} \
 		${STAGEDIR}${PREFIX}/libexec/polymake/lib/${_lp}.so
 
 	${RLN} ${STAGEDIR}${PREFIX}/libexec/polymake/lib/${_lp}.so.${DISTVERSION} \
 		${STAGEDIR}${PREFIX}/libexec/polymake/lib/${_lp}.so.${DISTVERSION_MAJ}
 	${RLN} ${STAGEDIR}${PREFIX}/libexec/polymake/lib/${_lp}.so.${DISTVERSION} \
 		${STAGEDIR}${PREFIX}/libexec/polymake/lib/${_lp}.so
 # strip the libraries
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/polymake/lib/${_lp}.so.${DISTVERSION}
 .endfor
 
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/polymake/perlx/${PERL_VERSION}/${PERL_ARCHNAME}/auto/Polymake/Ext/Ext.so
 
 .for l in common fan fulton graph group matroid polytope topaz tropical
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/polymake/lib/${l}.so
 .endfor
 
 # only strip libexec/polymake/lib/ideal.so iff SINGULAR=on, if SINGULAR=off it
 # is an empty file and stripping fails
 .if ${PORT_OPTIONS:MSINGULAR}
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/polymake/lib/ideal.so
 .endif
 
 .for lp in libpolymake-apps libpolymake-apps-rt
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/polymake/lib/${lp}.so.${DISTVERSION}
 .endfor
 
 post-install-TESTS-on: test
 
 # Set HOME=${WRKDIR} to prevent polymake writing its .polymake directory outside
 # WRKDIR.
 test:
 	@cd ${WRKSRC} && HOME=${WRKDIR} perl/polymake --script run_testcases
 
 .include <bsd.port.mk>
diff --git a/math/primme/Makefile b/math/primme/Makefile
index 2d3b7a625871..3c153efbbfc9 100644
--- a/math/primme/Makefile
+++ b/math/primme/Makefile
@@ -1,57 +1,58 @@
 PORTNAME=	primme
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.2
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Iterative eigensolver for symmetric and hermitian matrices
 WWW=		https://www.cs.wm.edu/~andreas/software/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING.txt
 
 TEST_DEPENDS=	gfortran${GCC_DEFAULT}:lang/gcc${GCC_DEFAULT}
 
 USES=		gmake localbase:ldflags
 USE_GITHUB=	yes
 MAKEFILE=	makefile
 ALL_TARGET=	solib
 USE_LDCONFIG=	yes
 
 BINARY_ALIAS=	make=${GMAKE}
 
 CFLAGS+=	-fPIC
 LDFLAGS+=	${LAPACKLIB} -lm
 
 OPTIONS_RADIO=	LINALG
 OPTIONS_RADIO_LINALG=	ATLAS GOTOBLAS NETLIB OPENBLAS
 OPTIONS_DEFAULT=	OPENBLAS
 
 LINALG_DESC=		Choose which linear algebra interface (LAPACK) implementation to use:
 
 GOTOBLAS_DESC=		Goto blas implementation
 ATLAS_USES=		blaslapack:atlas
 GOTOBLAS_USES=		blaslapack:gotoblas
 NETLIB_USES=		blaslapack:netlib
 NETLIB_LDFLAGS=		-lblas # XXX why this isn't covered by blaslapack:netlib?
 OPENBLAS_USES=		blaslapack:openblas
 
 TEST_ENV=	${MAKE_ENV} LDFLAGS="-lm -Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFAULT} ${LOCALBASE}/lib/gcc${GCC_DEFAULT}/libgcc_s.so" \
 		USE_MPI=no USE_PETSC=no PETSC_DIR=${LOCALBASE}
 TEST_ARGS=	F77=gfortran${GCC_DEFAULT} FC=gfortran${GCC_DEFAULT} FLDR=gfortran${GCC_DEFAULT}
 TEST_TARGET=	all_tests test
 
 PLIST_FILES=	include/primme.h \
 		include/primme_eigs.h \
 		include/primme_eigs_f77.h \
 		include/primme_eigs_f90.inc \
 		include/primme_f77.h \
 		include/primme_f90.inc \
 		include/primme_svds.h \
 		include/primme_svds_f77.h \
 		include/primme_svds_f90.inc \
 		lib/libprimme.so \
 		lib/libprimme.so.3 \
 		lib/libprimme.so.3.2
 
 .include <bsd.port.mk>
diff --git a/math/psurface/Makefile b/math/psurface/Makefile
index 0c361d48eb14..1afbc41670de 100644
--- a/math/psurface/Makefile
+++ b/math/psurface/Makefile
@@ -1,26 +1,26 @@
 PORTNAME=	psurface
 DISTVERSION=	2.0.0-13
 DISTVERSIONSUFFIX=	-gb5b6825
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Piecewise linear bijections between triangulated surfaces
 WWW=		https://github.com/psurface/psurface
 
 LICENSE=	GPLv3+
 
 LIB_DEPENDS=	libhdf5.so:science/hdf5
 
 USES=		autoreconf libtool localbase
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 
 GNU_CONFIGURE=	yes
 
 INSTALL_TARGET=	install-strip
 
 TEST_TARGET=	check # 2 tests fail because the file examplefiles/tricube-anticlockwise.msh is missing, see https://github.com/psurface/psurface/issues/3
 
 .include <bsd.port.mk>
diff --git a/math/py-CyLP/Makefile b/math/py-CyLP/Makefile
index c961534e1646..274afb4bc5f4 100644
--- a/math/py-CyLP/Makefile
+++ b/math/py-CyLP/Makefile
@@ -1,37 +1,38 @@
 PORTNAME=	CyLP
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.91.5
+PORTREVISION=	1
 CATEGORIES=	math python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Python interface to CLP, CBC, and CGL to solve LPs and MIPs
 WWW=		https://github.com/coin-or/CyLP
 
 LICENSE=	CPL10
 LICENSE_NAME=	Common Public License Version 1.0
 LICENSE_FILE=	${WRKSRC}/LICENSE
 LICENSE_PERMS=	auto-accept dist-mirror dist-sell pkg-mirror pkg-sell
 
 PY_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=0.10.0:science/py-scipy@${PY_FLAVOR}
 BUILD_DEPENDS=	${PY_DEPENDS}
 LIB_DEPENDS=	libblas.so:math/blas \
 		libCbc.so:math/cbc \
 		libCgl.so:math/cgl \
 		libClp.so:math/clp \
 		liblapack.so:math/lapack
 RUN_DEPENDS=	${PY_DEPENDS}
 
 USES=		compiler:c++11-lang python:3.6+
 USE_PYTHON=	distutils cython autoplist
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	coin-or
 
 MAKE_ENV=	COIN_INSTALL_DIR=${LOCALBASE}
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/cylp/cy/Cy*.so
 
 .include <bsd.port.mk>
diff --git a/math/py-Diofant/Makefile b/math/py-Diofant/Makefile
index 7a211ad35807..1a0392ae91e8 100644
--- a/math/py-Diofant/Makefile
+++ b/math/py-Diofant/Makefile
@@ -1,37 +1,38 @@
 PORTNAME=	Diofant
 DISTVERSION=	0.13.0
+PORTREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Python library for symbolic mathematics
 WWW=		https://github.com/diofant/diofant
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.rst
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}isort>0:devel/py-isort@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR}
 # RUN_DEPENDS includes extra_reqs for convenience
 RUN_DEPENDS=	\
 		${PYTHON_PKGNAMEPREFIX}gmpy2>=2.1.0b5:math/py-gmpy2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>=3.3:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mpmath>=0.19:math/py-mpmath@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=1.6:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}theano>=0.9.0:math/py-theano@${PY_FLAVOR} \
 		${PYNUMPY}
 
 USES=		python:3.7+
 USE_PYTHON=	distutils cython autoplist
 NO_ARCH=	yes
 
 pre-configure:
 	@( \
 		${ECHO} "from setuptools import setup" && \
 		${ECHO} "setup()" \
 	) > ${WRKSRC}/setup.py
 
 .include <bsd.port.mk>
diff --git a/math/py-GridDataFormats/Makefile b/math/py-GridDataFormats/Makefile
index 6f655ff154f0..4fd648cd7c0b 100644
--- a/math/py-GridDataFormats/Makefile
+++ b/math/py-GridDataFormats/Makefile
@@ -1,25 +1,26 @@
 PORTNAME=	GridDataFormats
 DISTVERSION=	1.0.1
+PORTREVISION=	1
 CATEGORIES=	math python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Handle data on a grid: NumPy n-dimensional arrays
 WWW=		https://github.com/MDAnalysis/GridDataFormats
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}mrcfile>0:biology/py-mrcfile@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_PYTHON=	distutils autoplist concurrent pytest
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	MDAnalysis
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/math/py-PuLP/Makefile b/math/py-PuLP/Makefile
index 4e357b5d55af..95134f8a853b 100644
--- a/math/py-PuLP/Makefile
+++ b/math/py-PuLP/Makefile
@@ -1,31 +1,32 @@
 PORTNAME=	PuLP
 DISTVERSION=	2.7.0
+PORTREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	LP modeler written in python
 WWW=		https://github.com/coin-or/pulp
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}amply>=0.1.2:math/py-amply@${PY_FLAVOR} \
 		cbc:math/cbc \
 		glpsol:math/glpk
 
 USES=		cpe python:3.6+
 CPE_VENDOR=	${PORTNAME:tl}project
 USE_PYTHON=	distutils concurrent autoplist
 
 NO_ARCH=	yes
 
 post-patch:
 	@${CP} ${WRKSRC}/pulp/pulp.cfg.linux ${WRKSRC}/pulp/pulp.cfg.freebsd
 	@${REINPLACE_CMD} -E 's/^(CplexPath|PulpCbcPath) = .*/#&/' ${WRKSRC}/pulp/pulp.cfg.freebsd
 
 do-test: install # one test is known to fail: https://github.com/coin-or/pulp/issues/494
 	@cd ${TEST_WRKSRC} && py.test
 
 .include <bsd.port.mk>
diff --git a/math/py-PySCIPOpt/Makefile b/math/py-PySCIPOpt/Makefile
index 6c67f261b281..25457fc54ff7 100644
--- a/math/py-PySCIPOpt/Makefile
+++ b/math/py-PySCIPOpt/Makefile
@@ -1,27 +1,28 @@
 PORTNAME=	PySCIPOpt
 DISTVERSIONPREFIX=	v
 DISTVERSION=	4.3.0
+PORTREVISION=	1
 CATEGORIES=	math python
 #MASTER_SITES=	PYPI # no tests
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Python interface and modeling environment for SCIP
 WWW=		https://github.com/SCIP-Interfaces/PySCIPOpt
 
 LICENSE=	MIT
 
 LIB_DEPENDS=	libscip.so:math/SCIP
 
 USES=		localbase python:3.6+
 USE_PYTHON=	distutils cython autoplist pytest
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	scipopt
 
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/pyscipopt/scip*.so
 
 .include <bsd.port.mk>
diff --git a/math/py-PyWavelets/Makefile b/math/py-PyWavelets/Makefile
index b5a21f826180..f90201ccc030 100644
--- a/math/py-PyWavelets/Makefile
+++ b/math/py-PyWavelets/Makefile
@@ -1,26 +1,27 @@
 PORTNAME=	PyWavelets
 PORTVERSION=	1.4.1
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	math python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Discrete Wavelet Transforms in Python
 WWW=		https://github.com/PyWavelets/pywt
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYNUMPY}
 RUN_DEPENDS=	${PYNUMPY}
 
 USE_GITHUB=	yes
 GH_PROJECT=	pywt
 
 USES=		python:3.7+
 USE_PYTHON=	autoplist distutils cython cython_run
 
 PYDISTUTILS_BUILD_TARGET=	build build_ext
 PYDISTUTILS_BUILDARGS+=		saveopts
 
 .include <bsd.port.mk>
diff --git a/math/py-algopy/Makefile b/math/py-algopy/Makefile
index e90967b48419..6f2d992b1ada 100644
--- a/math/py-algopy/Makefile
+++ b/math/py-algopy/Makefile
@@ -1,20 +1,20 @@
 PORTNAME=	algopy
 DISTVERSION=	0.5.7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Algorithmic Differentiation (AD) and Taylor polynomial approximations
 WWW=		https://pythonhosted.org/algopy/
 
 LICENSE=	BSD3CLAUSE
 
 RUN_DEPENDS=	${PYNUMPY}
 
 USES=		python:3.6+ zip
 USE_PYTHON=	distutils autoplist
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/math/py-animatplot-ng/Makefile b/math/py-animatplot-ng/Makefile
index 58a6685f1efe..5dbd2e732805 100644
--- a/math/py-animatplot-ng/Makefile
+++ b/math/py-animatplot-ng/Makefile
@@ -1,25 +1,26 @@
 PORTNAME=	animatplot-ng
 DISTVERSION=	0.4.3
+PORTREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Making animating in matplotlib easy (new gen)
 WWW=		https://github.com/boutproject/animatplot-ng/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 PY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}matplotlib>=2.2:math/py-matplotlib@${PY_FLAVOR}
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}setuptools_scm_git_archive>0:devel/py-setuptools_scm_git_archive@${PY_FLAVOR} \
 		${PY_DEPENDS}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}matplotlib>=2.2:math/py-matplotlib@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	distutils autoplist
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/math/py-animatplot/Makefile b/math/py-animatplot/Makefile
index 55f0bed31a15..3dbb1e51577b 100644
--- a/math/py-animatplot/Makefile
+++ b/math/py-animatplot/Makefile
@@ -1,22 +1,23 @@
 PORTNAME=	animatplot
 DISTVERSION=	0.4.2
+PORTREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Making animating in matplotlib easy
 WWW=		https://github.com/t-makaro/animatplot/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}matplotlib>=2.2:math/py-matplotlib@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}matplotlib>=2.2:math/py-matplotlib@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	distutils autoplist
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/math/py-apgl/Makefile b/math/py-apgl/Makefile
index 2c7904b955a3..18c1085e1121 100644
--- a/math/py-apgl/Makefile
+++ b/math/py-apgl/Makefile
@@ -1,21 +1,21 @@
 PORTNAME=	apgl
 PORTVERSION=	0.8.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Fast python graph library with some machine learning features
 WWW=		http://packages.python.org/apgl/
 
 LICENSE=	GPLv3
 
 BUILD_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}scipy>0.7.0:science/py-scipy@${PY_FLAVOR}
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		python:3.6+
 USE_PYTHON=	autoplist distutils
 
 .include <bsd.port.mk>
diff --git a/math/py-arviz/Makefile b/math/py-arviz/Makefile
index 94fb7250bd44..27b4a45e0e9a 100644
--- a/math/py-arviz/Makefile
+++ b/math/py-arviz/Makefile
@@ -1,31 +1,32 @@
 PORTNAME=	arviz
 DISTVERSION=	0.15.1
+PORTREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Package for exploratory analysis of Bayesian models
 WWW=		https://arviz-devs.github.io/arviz/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}matplotlib>=3.2:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}netCDF4>0:science/py-netCDF4@${PY_FLAVOR} \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pandas>=1.3.0:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=1.8.0:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}typing-extensions>=4.1.0:devel/py-typing-extensions@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xarray>=0.21.0:devel/py-xarray@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xarray-einstats>=0.3:devel/py-xarray-einstats@${PY_FLAVOR}
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}cloudpickle>0:devel/py-cloudpickle@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numba>0:devel/py-numba@${PY_FLAVOR}
 
 USES=		python:3.8+
 USE_PYTHON=	distutils autoplist pytest # tests have 13 warnings, 1 error, see https://github.com/arviz-devs/arviz/issues/2084
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/math/py-arybo/Makefile b/math/py-arybo/Makefile
index b1aa0c2f244c..1afc5b6a60b6 100644
--- a/math/py-arybo/Makefile
+++ b/math/py-arybo/Makefile
@@ -1,24 +1,25 @@
 PORTNAME=	arybo
 DISTVERSION=	1.1.0
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Manipulation of mixed boolean-arithmetic symbolic expressions
 WWW=		https://github.com/quarkslab/arybo
 
 LICENSE=	BSD3CLAUSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ipython>0:devel/ipython@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}llvmlite>0:devel/py-llvmlite@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}networkx>=2.4:math/py-networkx@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytanque>=1.0:math/py-pytanque@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
 
 USES=		compiler:c++14-lang python:3.5+
 USE_PYTHON=	distutils concurrent autoplist
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/math/py-autograd/Makefile b/math/py-autograd/Makefile
index 411908caaf61..4fe9ec371bc3 100644
--- a/math/py-autograd/Makefile
+++ b/math/py-autograd/Makefile
@@ -1,21 +1,22 @@
 PORTNAME=	autograd
 DISTVERSION=	1.3
+PORTREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	rm@FreeBSD.org
 COMMENT=	Efficiently computes derivatives of numpy code
 WWW=		https://github.com/HIPS/autograd
 
 LICENSE=	MIT
 
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}future>=0.15.2:devel/py-future@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_PYTHON=	autoplist distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/math/py-baycomp/Makefile b/math/py-baycomp/Makefile
index 32450a8dac1f..e2ed734e4cea 100644
--- a/math/py-baycomp/Makefile
+++ b/math/py-baycomp/Makefile
@@ -1,32 +1,32 @@
 PORTNAME=	baycomp
 DISTVERSION=	1.0.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math python # statistics
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Library for Bayesian comparison of classifiers
 WWW=		https://github.com/janezd/baycomp
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>=2.1.2:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=0.19.1:science/py-scipy@${PY_FLAVOR}
 
 USES=		localbase:ldflags python:3.7+
 USE_PYTHON=	distutils autoplist
 
 NO_ARCH=	yes
 
 POST_PLIST=	rm-tests-from-plist
 
 post-install:
 	@${RM} -r ${STAGEDIR}${PYTHON_SITELIBDIR}/tests
 
 rm-tests-from-plist:
 	@${REINPLACE_CMD} '/\/tests\//d' ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/math/py-bayesian-optimization/Makefile b/math/py-bayesian-optimization/Makefile
index 860944cbade0..d6f1f123b304 100644
--- a/math/py-bayesian-optimization/Makefile
+++ b/math/py-bayesian-optimization/Makefile
@@ -1,24 +1,25 @@
 PORTNAME=	bayesian-optimization
 PORTVERSION=	1.4.2
+PORTREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Bayesian Optimization package
 WWW=		https://github.com/fmfn/BayesianOptimization
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}colorama>=0.4.5:devel/py-colorama@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpy>=1.9.0,1:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-learn>=0.18.0:science/py-scikit-learn@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=1.0.0:science/py-scipy@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/math/py-benford_py/Makefile b/math/py-benford_py/Makefile
index e2cb5802f973..4b934a46eaae 100644
--- a/math/py-benford_py/Makefile
+++ b/math/py-benford_py/Makefile
@@ -1,30 +1,31 @@
 PORTNAME=	benford_py
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.5.0
+PORTREVISION=	1
 CATEGORIES=	math python
 #MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Library for testing data sets with Benford's law
 WWW=		https://github.com/milcent/benford_py
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	distutils autoplist
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	milcent
 
 NO_ARCH=	yes
 
 post-extract: # https://github.com/milcent/benford_py/issues/48
 	${TOUCH} ${WRKSRC}/README-pypi.md
 
 .include <bsd.port.mk>
diff --git a/math/py-bottleneck/Makefile b/math/py-bottleneck/Makefile
index 3c5d7b5ed0d7..3d02493d9d0a 100644
--- a/math/py-bottleneck/Makefile
+++ b/math/py-bottleneck/Makefile
@@ -1,34 +1,35 @@
 PORTNAME=	bottleneck
 PORTVERSION=	1.3.7
+PORTREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	Bottleneck-${PORTVERSION}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Collection of fast NumPy array functions written in Cython
 WWW=		https://github.com/kwgoodman/bottleneck
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=0,1:math/py-numpy@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	autoplist concurrent cython distutils
 
 DOCS=		README.rst RELEASE.rst \
 		doc/source/conf.py doc/source/index.rst doc/source/intro.rst doc/source/reference.rst
 PORTDOCS=	${DOCS:T}
 
 OPTIONS_DEFINE=	DOCS
 
 post-install:
 	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' -exec ${STRIP_CMD} {} +
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/ && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/math/py-chaospy/Makefile b/math/py-chaospy/Makefile
index 0df27613568b..3fa89ec3311d 100644
--- a/math/py-chaospy/Makefile
+++ b/math/py-chaospy/Makefile
@@ -1,35 +1,35 @@
 PORTNAME=	chaospy
 DISTVERSIONPREFIX=	v
 DISTVERSION=	4.3.11
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math python
 #MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Toolbox for performing uncertainty quantification
 WWW=		https://github.com/jonathf/chaospy
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BUILD_DEPENDS=	${PY_SETUPTOOLS} \
 		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpoly>0:math/py-numpoly@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}scikit-learn>0:science/py-scikit-learn@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_PYTHON=	pep517 autoplist pytest
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	jonathf
 
 NO_ARCH=	yes
 
 do-test: # tests hang: https://github.com/jonathf/chaospy/issues/406
 	@cd ${WRKSRC} && pytest --doctest-modules chaospy/
 
 .include <bsd.port.mk>
diff --git a/math/py-cma/Makefile b/math/py-cma/Makefile
index 439d3471e0e3..5a9f6272e979 100644
--- a/math/py-cma/Makefile
+++ b/math/py-cma/Makefile
@@ -1,28 +1,29 @@
 PORTNAME=	cma
 PORTVERSION=	3.3.0
+PORTREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	CMA-ES for non-linear numerical optimization in Python
 WWW=		https://github.com/CMA-ES/pycma
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/cma/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=0,1:math/py-numpy@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=	CONSTRAINED_SOLUTION_TRACKING PLOTTING
 CONSTRAINED_SOLUTION_TRACKING_DESC=	Convergence tracking support
 PLOTTING_DESC=	Plotting support
 
 CONSTRAINED_SOLUTION_TRACKING_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}moarchiving>=0:math/py-moarchiving@${PY_FLAVOR}
 PLOTTING_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}matplotlib>=0:math/py-matplotlib@${PY_FLAVOR}
 
 .include <bsd.port.mk>
diff --git a/math/py-cmaes/Makefile b/math/py-cmaes/Makefile
index f18704250150..fcecdbd68d68 100644
--- a/math/py-cmaes/Makefile
+++ b/math/py-cmaes/Makefile
@@ -1,21 +1,22 @@
 PORTNAME=	cmaes
 PORTVERSION=	0.9.1
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Lightweight CMA Evolution Strategy implementation for Python
 WWW=		https://github.com/CyberAgent/cmaes
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=0,1:math/py-numpy@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/math/py-cmyt/Makefile b/math/py-cmyt/Makefile
index 3124b26c34e8..a0f52aef1db5 100644
--- a/math/py-cmyt/Makefile
+++ b/math/py-cmyt/Makefile
@@ -1,33 +1,34 @@
 PORTNAME=	cmyt
 DISTVERSION=	1.2.0
+PORTREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Collection of Matplotlib colormaps from the yt project
 WWW=		https://yt-project.org/
 
 LICENSE=	BSD3CLAUSE
 
 BUILD_DEPENDS=	${PY_SETUPTOOLS} \
 		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>=3.2.0:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}more-itertools>=8.4:devel/py-more-itertools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}colorspacious>=1.1.2:devel/py-colorspacious@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	pep517 concurrent autoplist
 
 NO_ARCH=	yes
 
 POST_PLIST=	rm-tests-from-plist
 
 post-install:
 	@${RM} -r ${STAGEDIR}${PYTHON_SITELIBDIR}/tests
 
 rm-tests-from-plist:
 	@${REINPLACE_CMD} '/\/tests\//d' ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/math/py-colormath/Makefile b/math/py-colormath/Makefile
index 2b5896b65363..c89c53d25924 100644
--- a/math/py-colormath/Makefile
+++ b/math/py-colormath/Makefile
@@ -1,22 +1,22 @@
 PORTNAME=	colormath
 PORTVERSION=	3.0.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	skreuzer@FreeBSD.org
 COMMENT=	Module that spares the user from directly dealing with color math
 WWW=		https://pypi.org/project/colormath/
 
 LICENSE=	BSD2CLAUSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=1.9.2,1:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}networkx>=1.9.1:math/py-networkx@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_PYTHON=	autoplist distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/math/py-contourpy/Makefile b/math/py-contourpy/Makefile
index eb5588f1528f..b45153807fc8 100644
--- a/math/py-contourpy/Makefile
+++ b/math/py-contourpy/Makefile
@@ -1,20 +1,21 @@
 PORTNAME=	contourpy
 PORTVERSION=	1.0.7
+PORTREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Python library for calculating contours of 2D quadrilateral grids
 WWW=		https://github.com/contourpy/contourpy
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/pybind11:devel/py-pybind11@${PY_FLAVOR}
 RUN_DEPENDS=	${PYNUMPY}
 
 USES=		python:3.8+
 USE_PYTHON=	autoplist concurrent distutils
 
 .include <bsd.port.mk>
diff --git a/math/py-cvxopt/Makefile b/math/py-cvxopt/Makefile
index a4d2f2dbe287..fe709a7af7b2 100644
--- a/math/py-cvxopt/Makefile
+++ b/math/py-cvxopt/Makefile
@@ -1,56 +1,56 @@
 PORTNAME=	cvxopt
 DISTVERSION=	1.3.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Python software for convex optimization
 WWW=		https://github.com/cvxopt/cvxopt
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libamd.so:math/suitesparse-amd \
 		libblas.so:math/blas \
 		libcholmod.so:math/suitesparse-cholmod \
 		libcolamd.so:math/suitesparse-colamd \
 		liblapack.so:math/lapack \
 		libsuitesparseconfig.so:math/suitesparse-config \
 		libumfpack.so:math/suitesparse-umfpack
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}
 
 USES=		python:3.6+ localbase:ldflags cpe
 USE_GITHUB=	yes
 USE_PYTHON=	distutils autoplist
 
 CPE_VENDOR=	cvxopt_project
 
 CFLAGS+=	-I${LOCALBASE}/include/suitesparse
 
 OPTIONS_DEFINE=		GSL FFTW GLPK DSDP
 OPTIONS_DEFAULT=	GSL FFTW GLPK DSDP
 
 GSL_DESC=		Build with GSL, the GNU scientific library
 GSL_MAKE_ENV=		CVXOPT_BUILD_GSL=1
 GSL_LIB_DEPENDS=	libgsl.so:math/gsl
 
 FFTW_MAKE_ENV=		CVXOPT_BUILD_FFTW=1
 FFTW_LIB_DEPENDS=	libfftw3.so:math/fftw3
 
 GLPK_DESC=		Build with GLPK, the linear programming solver
 GLPK_MAKE_ENV=		CVXOPT_BUILD_GLPK=1
 GLPK_LIB_DEPENDS=	libglpk.so:math/glpk
 
 DSDP_DESC=		Build with DSDP, the interior-point method
 DSDP_MAKE_ENV=		CVXOPT_BUILD_DSDP=1
 DSDP_CFLAGS=		-I${LOCALBASE}/include/dsdp
 DSDP_LIB_DEPENDS=	libdsdp.so:math/dsdp
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/cvxopt/*.so
 
 do-test: install
 	@cd ${WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m pytest
 
 .include <bsd.port.mk>
diff --git a/math/py-cvxpy/Makefile b/math/py-cvxpy/Makefile
index a9c265597d97..f025ee7aa6ba 100644
--- a/math/py-cvxpy/Makefile
+++ b/math/py-cvxpy/Makefile
@@ -1,30 +1,31 @@
 PORTNAME=	cvxpy
 DISTVERSION=	1.3.1
+PORTREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Domain-specific language for modeling convex optimization problems
 WWW=		https://www.cvxpy.org/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYNUMPY}
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}ecos>=2:math/py-ecos@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}osqp>=0.4.1:math/py-osqp@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=1.1.0:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scs>=1.1.6:math/py-scs@${PY_FLAVOR}
 TEST_DEPENDS=	pytest:devel/py-pytest@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_PYTHON=	distutils autoplist pytest
 
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 
 post-install:
 		${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/_cvxcore*.so
 
 .include <bsd.port.mk>
diff --git a/math/py-cyipopt/Makefile b/math/py-cyipopt/Makefile
index 5d33659f1954..f7793e19e067 100644
--- a/math/py-cyipopt/Makefile
+++ b/math/py-cyipopt/Makefile
@@ -1,34 +1,35 @@
 PORTNAME=	cyipopt
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.2.0
+PORTREVISION=	1
 CATEGORIES=	math python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Cython interface for the interior point optimizer IPOPT
 WWW=		https://github.com/matthias-k/cyipopt
 
 LICENSE=	EPL
 
 BUILD_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
 LIB_DEPENDS=	libblas.so:math/blas \
 		libipopt.so:math/ipopt \
 		liblapack.so:math/lapack
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
 
 USES=		fortran python:3.6+ pkgconfig # fortran because ipopt's pkg-config returns gcc libs
 USE_PYTHON=	distutils cython autoplist pytest
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	matthias-k
 
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/ipopt_wrapper${PYTHON_EXT_SUFFIX}.so
 
 .include <bsd.port.mk>
diff --git a/math/py-deap/Makefile b/math/py-deap/Makefile
index 6325ba67f685..fbf633d278a9 100644
--- a/math/py-deap/Makefile
+++ b/math/py-deap/Makefile
@@ -1,25 +1,26 @@
 PORTNAME=	deap
 DISTVERSION=	1.3.3
+PORTREVISION=	1
 CATEGORIES=	math biology science devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Distributed Evolutionary Algorithms in Python
 WWW=		https://github.com/DEAP/deap
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BUILD_DEPENDS=	${PYNUMPY}
 RUN_DEPENDS=	${PYNUMPY}
 
 USES=		python:3.5+
 USE_PYTHON=	distutils autoplist pytest # tests fail, see https://github.com/DEAP/deap/issues/668
 
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/deap/tools/_hypervolume/hv${PYTHON_EXT_SUFFIX}.so
 
 .include <bsd.port.mk>
diff --git a/math/py-ducc0/Makefile b/math/py-ducc0/Makefile
index 29ef638cd645..cf337002d698 100644
--- a/math/py-ducc0/Makefile
+++ b/math/py-ducc0/Makefile
@@ -1,32 +1,33 @@
 PORTNAME=	ducc0
 DISTVERSION=	0.29.0
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Distinctly Useful Code Collection (DUCC)
 WWW=		https://gitlab.mpcdf.mpg.de/mtr/ducc
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_armv7=	clang runs out of memory
 BROKEN_i386=	non-constant-expression cannot be narrowed from type 'long long' to 'int' in initializer list (reported to the author on 2021-05-02 and 2022-02-01)
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pybind11>0:devel/py-pybind11@${PY_FLAVOR}
 RUN_DEPENDS=	${PYNUMPY}
 
 USES=		compiler:c++17-lang python:3.6+
 
 USE_PYTHON=	distutils autoplist pytest
 
 MAKE_ENV=	DUCC0_OPTIMIZATION=none
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/ducc0*.so
 
 do-test: install
 	@cd ${WRKSRC} && py.test
 
 .include <bsd.port.mk>
diff --git a/math/py-ecos/Makefile b/math/py-ecos/Makefile
index a49067757a4e..66b1d23cf2ec 100644
--- a/math/py-ecos/Makefile
+++ b/math/py-ecos/Makefile
@@ -1,27 +1,28 @@
 PORTNAME=	ecos
 DISTVERSION=	2.0.12
+PORTREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Python package for ECOS: Embedded Cone Solver
 WWW=		https://www.embotech.com/ECOS
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYNUMPY}
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=0.9:science/py-scipy@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_PYTHON=	distutils autoplist
 
 pre-configure:
 	@${ECHO} "__version__=\"$(DISTVERSION)\"" > ${WRKSRC}/src/ecos/version.py
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/_ecos*.so
 
 .include <bsd.port.mk>
diff --git a/math/py-faiss/Makefile b/math/py-faiss/Makefile
index 6b11bebd8c30..3a08c0498ee1 100644
--- a/math/py-faiss/Makefile
+++ b/math/py-faiss/Makefile
@@ -1,46 +1,47 @@
 PORTNAME=	faiss
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.7.4
+PORTREVISION=	1
 CATEGORIES=	math
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Library for efficient similarity search & clustering of dense vectors
 WWW=		https://github.com/facebookresearch/faiss
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/../../LICENSE
 
 BROKEN_i386=	clang crashes, see bug#261580
 
 PY_DEPENDS=	${PYNUMPY}
 BUILD_DEPENDS=	swig:devel/swig \
 		${PY_DEPENDS}
 LIB_DEPENDS=	libfaiss.so:math/faiss
 RUN_DEPENDS=	${PY_DEPENDS}
 
 USES=		cmake compiler:c++11-lang localbase python
 USE_PYTHON=	flavors pytest
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	facebookresearch
 
 WRKSRC_SUBDIR=	faiss/python
 
 CMAKE_ARGS=	-DPython_EXECUTABLE:STRING=${PYTHON_CMD}
 
 TEST_WRKSRC=	${WRKSRC}/../..
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 
 post-patch: # remove GPU testcases
 	${RM} -r ${WRKSRC}/../../faiss/gpu
 
 do-install: # see https://github.com/facebookresearch/faiss/issues/2194
 	${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME}
 	${INSTALL_LIB} ${BUILD_WRKSRC}/_swigfaiss.so ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME}
 .for f in __init__.py array_conversions.py class_wrappers.py extra_wrappers.py gpu_wrappers.py loader.py swigfaiss.py
 	${INSTALL_DATA} ${BUILD_WRKSRC}/${f} ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME}
 .endfor
 	cd ${BUILD_WRKSRC} && ${COPYTREE_SHARE} contrib ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/math/py-fastcluster/Makefile b/math/py-fastcluster/Makefile
index c3f6c1f4ee35..7683635cc03e 100644
--- a/math/py-fastcluster/Makefile
+++ b/math/py-fastcluster/Makefile
@@ -1,33 +1,34 @@
 PORTNAME=	fastcluster
 PORTVERSION=	1.2.6
+PORTREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Fast hierarchical clustering routines for R and Python
 WWW=		http://danifold.net/fastcluster.html \
 		https://github.com/dmuellner/fastcluster
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING.txt
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=0,1:math/py-numpy@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=1.9,1:math/py-numpy@${PY_FLAVOR}
 
 USES=		compiler python:3.7+
 USE_PYTHON=	autoplist concurrent distutils
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH:Mpowerpc*} && ${COMPILER_VERSION} == 140
 BUILD_DEPENDS+=	clang15:devel/llvm15
 CPP=            clang-cpp15
 CC=             clang15
 CXX=            clang++15
 .endif
 
 post-install:
 	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' -exec ${STRIP_CMD} {} +
 
 .include <bsd.port.post.mk>
diff --git a/math/py-fastdtw/Makefile b/math/py-fastdtw/Makefile
index 92bc5b905094..8426c39d5267 100644
--- a/math/py-fastdtw/Makefile
+++ b/math/py-fastdtw/Makefile
@@ -1,28 +1,28 @@
 PORTNAME=	fastdtw
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.3.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Dynamic Time Warping (DTW) algorithm with an O(N) complexity
 WWW=		https://github.com/slaypni/fastdtw
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner@${PY_FLAVOR}
 RUN_DEPENDS=	${PYNUMPY}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}
 
 USES=		python:3.6+
 
 USE_GITHUB=	yes # tests are only on github
 GH_ACCOUNT=	slaypni
 USE_PYTHON=	distutils cython autoplist pytest # tests fail: https://github.com/slaypni/fastdtw/issues/23
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/fastdtw/_fastdtw${PYTHON_EXT_SUFFIX}.so
 
 .include <bsd.port.mk>
diff --git a/math/py-fenics-basix/Makefile b/math/py-fenics-basix/Makefile
index 135c51ee2e30..09e42971b3ba 100644
--- a/math/py-fenics-basix/Makefile
+++ b/math/py-fenics-basix/Makefile
@@ -1,41 +1,42 @@
 PORTNAME=	fenics-basix
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.5.1
+PORTREVISION=	1
 CATEGORIES=	math
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	FEniCS finite element basis evaluation library
 WWW=		https://github.com/FEniCS/basix
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/../LICENSE
 
 BUILD_DEPENDS=	pybind11>=2.6.4:devel/pybind11 \
 		cmake-core>=3.16:devel/cmake-core \
 		xtensor>0:math/xtensor \
 		xtl-quant-stack>0:devel/xtl-quant-stack \
 		${PYTHON_PKGNAMEPREFIX}pybind11>0:devel/py-pybind11@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-build>=0.12:devel/py-scikit-build@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
 LIB_DEPENDS=	libbasix.so:math/fenics-basix
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numba>0:devel/py-numba@${PY_FLAVOR} \
 		${PYNUMPY}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}fenics-ufl>0:math/py-fenics-ufl@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sympy>0:math/py-sympy@${PY_FLAVOR}
 
 USES=		localbase python
 USE_PYTHON=	distutils autoplist pytest # 36 tests are known to fail likely because of broken numba, see https://github.com/FEniCS/basix/issues/594
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	FEniCS
 GH_PROJECT=	basix
 
 WRKSRC_SUBDIR=	python
 
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 TEST_WRKSRC=	${WRKSRC}/../test
 
 .include <bsd.port.mk>
diff --git a/math/py-flax/Makefile b/math/py-flax/Makefile
index c85029646404..cb7a899e93b5 100644
--- a/math/py-flax/Makefile
+++ b/math/py-flax/Makefile
@@ -1,25 +1,26 @@
 PORTNAME=	flax
 PORTVERSION=	0.6.8
+PORTREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Neural network library for JAX designed for flexibility
 WWW=		https://github.com/google/flax
 
 LICENSE=	APACHE20
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}jax>=0.4.2:math/py-jax@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}msgpack>=0:devel/py-msgpack@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpy>=1.12,1:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>=5.4.1:devel/py-yaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}rich>=11.1:textproc/py-rich@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}typing-extensions>=4.1.1:devel/py-typing-extensions@${PY_FLAVOR}
 
 USES=		python:3.8+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/math/py-formulaic/Makefile b/math/py-formulaic/Makefile
index abb4e4496572..cc5c20d5afa8 100644
--- a/math/py-formulaic/Makefile
+++ b/math/py-formulaic/Makefile
@@ -1,41 +1,42 @@
 PORTNAME=	formulaic
 PORTVERSION=	0.5.2
+PORTREVISION=	1
 CATEGORIES=	math python # statistics
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Implementation of Wilkinson formulas
 WWW=		https://github.com/matthewwardrop/formulaic
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 PY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}astor>=0.8:devel/py-astor@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cached-property>=1.3.0:devel/py-cached-property@${PY_FLAVOR} \
 		${PYNUMY} \
 		${PYTHON_PKGNAMEPREFIX}pandas>=1.0:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=1.6:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}typing-extensions>=4.2.0:devel/py-typing-extensions@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wrapt>=1.0:devel/py-wrapt@${PY_FLAVOR}
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}build>0:devel/py-build@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}installer>0:devel/py-installer@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}hatch-vcs>0:devel/py-hatch-vcs@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}hatchling>0:devel/py-hatchling@${PY_FLAVOR} \
 		${PY_DEPENDS}
 RUN_DEPENDS=	${PY_DEPENDS}
 
 USES=		python:3.7+
 USE_PYTHON=	flavors pytest
 
 NO_ARCH=	yes
 
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 
 do-build:
 	@cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} -m build --wheel --no-isolation --outdir ${WRKDIR}
 
 do-install:
 	@cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} -m installer ${WRKDIR}/*.whl --destdir ${STAGEDIR}
 
 .include <bsd.port.mk>
diff --git a/math/py-fpylll/Makefile b/math/py-fpylll/Makefile
index 39e11da821d7..3ab832af143e 100644
--- a/math/py-fpylll/Makefile
+++ b/math/py-fpylll/Makefile
@@ -1,55 +1,56 @@
 PORTNAME=	fpylll
 PORTVERSION=	0.5.9
+PORTREVISION=	1
 CATEGORIES=	math python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Python interface for fplll
 WWW=		https://github.com/fplll/fpylll
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	${PYNUMPY}	\
 		cython:lang/cython	\
 		${PYTHON_PKGNAMEPREFIX}black>0:devel/py-black@${PY_FLAVOR}	\
 		${PYTHON_PKGNAMEPREFIX}pythran>0:devel/py-pythran@${PY_FLAVOR}	\
 		${PYTHON_PKGNAMEPREFIX}cysignals>0:devel/py-cysignals@${PY_FLAVOR}
 LIB_DEPENDS=	libfplll.so:math/fplll	\
 		libgmp.so:math/gmp	\
 		libmpfr.so:math/mpfr	\
 		libpari.so:math/pari	\
 		libqd.so:math/qd
 RUN_DEPENDS=	${PYNUMPY}	\
 		${PYTHON_PKGNAMEPREFIX}black>0:devel/py-black@${PY_FLAVOR}	\
 		${PYTHON_PKGNAMEPREFIX}pythran>0:devel/py-pythran@${PY_FLAVOR}	\
 		${PYTHON_PKGNAMEPREFIX}cysignals>0:devel/py-cysignals@${PY_FLAVOR}
 TEST_DEPENDS=	py.test:devel/py-pytest@${PY_FLAVOR}
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	fplll
 
 USES=		compiler:c++11-lang python:3.6+
 USE_PYTHON=	distutils
 .if !defined(WITH_DEBUG)
 LDFLAGS+=	-s
 .endif
 
 OPTIONS_DEFINE=		TUTO
 TUTO_DESC=		Build the tutorial
 OPTIONS_SUB=		Yes
 TUTO_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=1.6,1:textproc/py-sphinx@${PY_FLAVOR}
 TUTO_USES=		gmake
 
 PLIST_SUB=	VER=${PORTVERSION:R}
 
 do-build-TUTO-on:
 	(cd ${WRKSRC}/docs && ${GMAKE} html)
 
 post-build-TUTO-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${CP} -R ${WRKSRC}/docs/_build/html/* ${STAGEDIR}${DOCSDIR}
 
 do-test: install
 	(cd ${WRKSRC} && PY_IGNORE_IMPORTMISMATCH=1 py.test)
 
 .include <bsd.port.mk>
diff --git a/math/py-fvcore/Makefile b/math/py-fvcore/Makefile
index 67cbc60271c9..b9f34f9a733b 100644
--- a/math/py-fvcore/Makefile
+++ b/math/py-fvcore/Makefile
@@ -1,27 +1,28 @@
 PORTNAME=	fvcore
 PORTVERSION=	0.1.5.post20220512
+PORTREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Shared code among different Facebook research projects
 WWW=		https://github.com/facebookresearch/fvcore
 
 LICENSE=	APACHE20
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}iopath>0:devel/py-iopath@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tabulate>0:devel/py-tabulate@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}termcolor>0:devel/py-termcolor@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tqdm>0:misc/py-tqdm@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yacs>0:devel/py-yacs@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/math/py-gau2grid/Makefile b/math/py-gau2grid/Makefile
index 2ea05f2fd45b..9b34c561ced2 100644
--- a/math/py-gau2grid/Makefile
+++ b/math/py-gau2grid/Makefile
@@ -1,34 +1,35 @@
 PORTNAME=	gau2grid
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.0.7
+PORTREVISION=	1
 CATEGORIES=	math python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Fast computation of a gaussian and its derivative on a grid
 WWW=		https://github.com/dgasmith/gau2grid
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYNUMPY} \
 		cmake:devel/cmake-core
 RUN_DEPENDS=	${PYNUMPY}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}
 
 USES=		cmake compiler:c11 python:3.6+
 USE_GITHUB=	yes
 GH_ACCOUNT=	dgasmith
 USE_PYTHON=	flavors
 
 CMAKE_ON=	INSTALL_PYMOD
 CMAKE_ARGS=	-DPYMOD_INSTALL_LIBDIR:STRING=${PYTHON_SITELIBDIR} -DFREEBSD_PYTHON_VER:STRING=${PYTHON_VER}
 
 post-install:
 	@${RM} -r ${STAGEDIR}${PYTHON_SITELIBDIR}/gau2grid/__pycache__
 	@${RM} -r ${STAGEDIR}${LOCALBASE}//lib/usr # LICENSE is installed under there
 
 do-test:
 	@cd ${WRKSRC} && ${PYTHON_CMD} -m pytest
 
 .include <bsd.port.mk>
diff --git a/math/py-gimmik/Makefile b/math/py-gimmik/Makefile
index 253c45cbfcb2..314468932170 100644
--- a/math/py-gimmik/Makefile
+++ b/math/py-gimmik/Makefile
@@ -1,22 +1,23 @@
 PORTNAME=	gimmik
 DISTVERSION=	3.0
+PORTREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Generator of Matrix Multiplication Kernels
 WWW=		https://github.com/vincentlab/GiMMiK
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}mako>0:textproc/py-mako@${PY_FLAVOR}
 
 USES=		python:3.3+
 USE_PYTHON=	distutils autoplist
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/math/py-gmpy2/Makefile b/math/py-gmpy2/Makefile
index 2e1787e26c7a..7bd6be567896 100644
--- a/math/py-gmpy2/Makefile
+++ b/math/py-gmpy2/Makefile
@@ -1,29 +1,30 @@
 PORTNAME=	gmpy2
 DISTVERSION=	2.1.5
+PORTREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	GMP/MPIR, MPFR, and MPC interface to Python
 WWW=		https://gmpy2.readthedocs.io/en/latest/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libgmp.so:math/gmp \
 		libmpc.so:math/mpc \
 		libmpfr.so:math/mpfr
 
 USES=		localbase python
 USE_PYTHON=	distutils autoplist
 
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/gmpy2/gmpy2*.so
 
 do-test: # pytest isn't currently supported, see https://github.com/aleaxit/gmpy/issues/403#issuecomment-1484584428
 	@cd ${WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} test/runtests.py
 
 .include <bsd.port.mk>
diff --git a/math/py-gym/Makefile b/math/py-gym/Makefile
index 62d8dab062fa..77e110e79b95 100644
--- a/math/py-gym/Makefile
+++ b/math/py-gym/Makefile
@@ -1,30 +1,31 @@
 PORTNAME=	gym
 PORTVERSION=	0.26.2
+PORTREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	OpenAI toolkit for developing and comparing your reinforcement learning agents
 WWW=		https://www.gymlibrary.dev/ \
 		https://github.com/openai/gym
 
 LICENSE=	MIT
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cloudpickle>=1.2.0:devel/py-cloudpickle@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}gym-notices>=0.0.4:math/py-gym-notices@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpy>=1.18.0,1:math/py-numpy@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR}
 
 USES=		python:3.8+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} < 31000
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}importlib-metadata>=4.8.0:devel/py-importlib-metadata@${PY_FLAVOR}
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/math/py-hdbscan/Makefile b/math/py-hdbscan/Makefile
index 2bef92847a82..4115af00ecbe 100644
--- a/math/py-hdbscan/Makefile
+++ b/math/py-hdbscan/Makefile
@@ -1,26 +1,27 @@
 PORTNAME=	hdbscan
 PORTVERSION=	0.8.29
+PORTREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Clustering based on density with variable density clusters
 WWW=		https://github.com/scikit-learn-contrib/hdbscan
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=1.16,1:math/py-numpy@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}joblib>=1.0:devel/py-joblib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpy>=1.20,1:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-learn>=0.20:science/py-scikit-learn@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=1.0:science/py-scipy@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	autoplist concurrent cython distutils
 
 post-install:
 	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' -exec ${STRIP_CMD} {} +
 
 .include <bsd.port.mk>
diff --git a/math/py-hdmedians/Makefile b/math/py-hdmedians/Makefile
index fd1ff23bb844..6036f98c90ef 100644
--- a/math/py-hdmedians/Makefile
+++ b/math/py-hdmedians/Makefile
@@ -1,23 +1,24 @@
 PORTNAME=	hdmedians
 PORTVERSION=	0.14.2
+PORTREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	High-dimensional medians
 WWW=		https://github.com/daleroberts/hdmedians
 
 LICENSE=	APACHE20
 
 BUILD_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}nose>=1.0:devel/py-nose@${PY_FLAVOR}
 RUN_DEPENDS=	${PYNUMPY}
 
 USES=		python:3.6+
 USE_PYTHON=	distutils cython autoplist
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/hdmedians/geomedian*.so
 
 .include <bsd.port.mk>
diff --git a/math/py-heyoka/Makefile b/math/py-heyoka/Makefile
index 5b4e7476cd74..273f76d36496 100644
--- a/math/py-heyoka/Makefile
+++ b/math/py-heyoka/Makefile
@@ -1,50 +1,50 @@
 PORTNAME=	heyoka
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.21.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Python library for ODE integration via Taylor's method and LLVM
 WWW=		https://bluescarni.github.io/heyoka.py/
 
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	pybind11>0:devel/pybind11 \
 		${PYNUMPY}
 LIB_DEPENDS=	libboost_serialization.so:devel/boost-libs \
 		libfmt.so:devel/libfmt \
 		libgmp.so:math/gmp \
 		libheyoka.so:math/heyoka \
 		libmp++.so:math/mppp \
 		libmpc.so:math/mpc \
 		libmpfr.so:math/mpfr \
 		libtbb.so:devel/onetbb \
 		libspdlog.so:devel/spdlog
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}cloudpickle>0:devel/py-cloudpickle@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mpmath>0:math/py-mpmath@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sympy>0:math/py-sympy@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR}
 
 USES=		cmake compiler:c++17-lang python:3.7+
 USE_PYTHON=	flavors
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	bluescarni
 GH_PROJECT=	${PORTNAME}.py
 
 CMAKE_ON=	HEYOKA_PY_ENABLE_IPO
 CMAKE_ARGS=	-DFREEBSD_PYTHON_DISTVERSION=${PYTHON_DISTVERSION:R}
 
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 
 do-test:
 	# testsuite based on instructions in https://bluescarni.github.io/heyoka.py/install.html#verifying-the-installation
 	@cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -c "import heyoka; heyoka.test.run_test_suite();"
 	# integrate and plot an example
 	@cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} ${FILESDIR}/example-restricted-three-body-problem.py
 
 .include <bsd.port.mk>
diff --git a/math/py-iminuit/Makefile b/math/py-iminuit/Makefile
index 764ceef4e6ac..8da5a3ae192d 100644
--- a/math/py-iminuit/Makefile
+++ b/math/py-iminuit/Makefile
@@ -1,22 +1,23 @@
 PORTNAME=	iminuit
 DISTVERSION=	2.21.1
+PORTREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Jupyter-friendly Python frontend for MINUIT2 in C++
 WWW=		https://iminuit.readthedocs.io/en/stable/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	cmake:devel/cmake-core
 RUN_DEPENDS=	${PYNUMPY}
 
 USES=		compiler:c++14-lang python:3.9+
 USE_PYTHON=	distutils autoplist pytest # 2 tests are known to fail, see https://github.com/scikit-hep/iminuit/issues/850
 
 TEST_ENV=      ${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 
 .include <bsd.port.mk>
diff --git a/math/py-iohexperimenter/Makefile b/math/py-iohexperimenter/Makefile
index 824ca78d694a..5ecea77cad18 100644
--- a/math/py-iohexperimenter/Makefile
+++ b/math/py-iohexperimenter/Makefile
@@ -1,26 +1,26 @@
 PORTNAME=	iohexperimenter
 PORTVERSION=	0.2.9.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	IOHexperimenter-${PORTVERSION}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Experimenter for Iterative Optimization Heuristic
 WWW=		https://github.com/IOHprofiler/IOHexperimenter
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=0,1:math/py-numpy@${PY_FLAVOR}
 
 USES=		compiler:c++14-lang dos2unix python:3.7+
 USE_PYTHON=	autoplist concurrent distutils
 
 USE_CXXSTD=	c++14
 
 post-install:
 	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' -exec ${STRIP_CMD} {} +
 
 .include <bsd.port.mk>
diff --git a/math/py-ipyopt/Makefile b/math/py-ipyopt/Makefile
index f9e03ae97f3c..4c0b1e87add9 100644
--- a/math/py-ipyopt/Makefile
+++ b/math/py-ipyopt/Makefile
@@ -1,33 +1,34 @@
 PORTNAME=	ipyopt
 DISTVERSION=	0.12.7
+PORTREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Python interface to Ipopt
 WWW=		https://gitlab.com/g-braeunlich/ipyopt
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 PY_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR}
 BUILD_DEPENDS=	${PY_DEPENDS}
 LIB_DEPENDS=	libipopt.so:math/ipopt
 RUN_DEPENDS=	${PY_DEPENDS}
 
 USES=		compiler:c++17-lang pkgconfig python:3.6+
 USE_PYTHON=	distutils autoplist pytest
 
 CXXFLAGS+=	$(pkg-config --cflags ipopt)
 
 TEST_ENV=      ${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME}/${PORTNAME}.cpython-*.so
 
 do-test:
 	@cd ${WRKSRC} && ${SETENV} ${TEST_ENV} pytest
 
 .include <bsd.port.mk>
diff --git a/math/py-isosurfaces/Makefile b/math/py-isosurfaces/Makefile
index 63ef30cdb9c4..483527331f55 100644
--- a/math/py-isosurfaces/Makefile
+++ b/math/py-isosurfaces/Makefile
@@ -1,30 +1,31 @@
 PORTNAME=	isosurfaces
 DISTVERSION=	0.1.0
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Construct isolines/isosurfaces over a 2D/3D scalar field
 WWW=		https://github.com/jared-hughes/isosurfaces
 
 LICENSE=	MIT
 
 RUN_DEPENDS=	${PYNUMPY}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cairo>0:graphics/py-cairo@${PY_FLAVOR} \
 		${PYNUMPY} \
 		xdg-open:devel/xdg-utils
 
 USES=		python
 USE_PYTHON=	distutils autoplist
 
 NO_ARCH=	yes
 
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 
 do-test:
 	@cd ${TEST_WRKSRC} && \
 		${SETENV} ${TEST_ENV} ${PYTHON_CMD} ${FILESDIR}/isoline_demo.py && \
 		xdg-open ${TEST_WRKSRC}/demo.svg
 
 .include <bsd.port.mk>
diff --git a/math/py-jax/Makefile b/math/py-jax/Makefile
index 744fd15fdcd8..2fef2de95959 100644
--- a/math/py-jax/Makefile
+++ b/math/py-jax/Makefile
@@ -1,25 +1,26 @@
 PORTNAME=	jax
 PORTVERSION=	0.4.8
+PORTREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Differentiate, compile, and transform Numpy code
 WWW=		https://github.com/google/jax
 
 LICENSE=	APACHE20
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ml-dtypes>=0.0.3:math/py-ml-dtypes@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpy>=1.21,1:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}opt-einsum>=0:math/py-opt-einsum@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=1.7:science/py-scipy@${PY_FLAVOR}
 
 USES=		python:3.8+
 USE_PYTHON=	autoplist concurrent pep517
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/math/py-kahip/Makefile b/math/py-kahip/Makefile
index 41a5dcdb1c2e..6e6318381849 100644
--- a/math/py-kahip/Makefile
+++ b/math/py-kahip/Makefile
@@ -1,41 +1,42 @@
 PORTNAME=	kahip
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.14-19
+PORTREVISION=	1
 DISTVERSIONSUFFIX=	-g5956007
 CATEGORIES=	math
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Karlsruhe high quality graph partitioning
 WWW=		https://kahip.github.io/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	pybind11>0:devel/pybind11
 LIB_DEPENDS=	libkahip.so:math/kahip
 
 USES=		cmake localbase:ldflags python
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	KaHIP
 GH_PROJECT=	KaHIP
 
 CMAKE_SOURCE_PATH=	${FILESDIR}/CMakeLists.txt
 CMAKE_ARGS=	-DFREEBSD_WRKSRC=${WRKSRC}
 
 CXXFLAGS+=	-I${WRKSRC}
 
 PLIST_FILES=	${PYTHON_SITELIBDIR}/${PORTNAME}${PYTHON_EXT_SUFFIX}.so
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}
 	${INSTALL_LIB} ${BUILD_WRKSRC}/${PORTNAME}${PYTHON_EXT_SUFFIX}.so ${STAGEDIR}${PYTHON_SITELIBDIR}
 
 do-test:
 	@cd ${WRKSRC} && \
 		${SETENV} ${TEST_ENV} ${PYTHON_CMD} ${WRKSRC}/misc/pymodule/callkahipfrompython.py && \
 		${ECHO} "Tests succeeded."
 
 .include <bsd.port.mk>
diff --git a/math/py-keras-applications/Makefile b/math/py-keras-applications/Makefile
index 5fe3facda097..8035bab0d028 100644
--- a/math/py-keras-applications/Makefile
+++ b/math/py-keras-applications/Makefile
@@ -1,23 +1,24 @@
 PORTNAME=	keras-applications
 DISTVERSION=	1.0.8
+PORTREVISION=	1
 CATEGORIES=	math python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	rm@FreeBSD.org
 COMMENT=	Reference implementations of popular deep learning models
 WWW=		https://github.com/keras-team/keras-applications
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}h5py>=0:science/py-h5py@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_GITHUB=	yes
 GH_ACCOUNT=	keras-team
 USE_PYTHON=	autoplist distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/math/py-keras-preprocessing/Makefile b/math/py-keras-preprocessing/Makefile
index 7958e9aa5cad..efc9e8e49551 100644
--- a/math/py-keras-preprocessing/Makefile
+++ b/math/py-keras-preprocessing/Makefile
@@ -1,23 +1,24 @@
 PORTNAME=	keras-preprocessing
 DISTVERSION=	1.1.2
+PORTREVISION=	1
 CATEGORIES=	math python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	rm@FreeBSD.org
 COMMENT=	Easy data preprocessing and data augmentation for DL models
 WWW=		https://github.com/keras-team/keras-preprocessing
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_GITHUB=	yes
 GH_ACCOUNT=	keras-team
 USE_PYTHON=	autoplist distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/math/py-keras/Makefile b/math/py-keras/Makefile
index af328985024e..ce6350976994 100644
--- a/math/py-keras/Makefile
+++ b/math/py-keras/Makefile
@@ -1,106 +1,107 @@
 PORTNAME=	keras
 DISTVERSION=	2.9.0
+PORTREVISION=	1
 CATEGORIES=	math # machine-learning
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Deep learning library for Python
 WWW=		https://keras.io/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}absl-py>=1.0.0:devel/py-absl-py \
 		${PYTHON_PKGNAMEPREFIX}h5py>=0:science/py-h5py@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pandas>=1.3.5:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pillow>=9.2.0:graphics/py-pillow@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}keras-preprocessing>=1.1.0:math/py-keras-preprocessing@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=0.14:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}protobuf>=3.13.0:devel/py-protobuf@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}keras-applications>=1.0.8:math/py-keras-applications@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}keras-preprocessing>=1.1.1:math/py-keras-preprocessing@${PY_FLAVOR}
 
 BUILD_DEPENDS=	${RUN_DEPENDS} \
 		${PYTHON_PKGNAMEPREFIX}tensorflow>=2.9.0:science/py-tensorflow@${PY_FLAVOR} \
 		bazel:devel/bazel \
 		bash:shells/bash
 
 USES=		python:3.7+
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	keras-team
 GH_PROJECT=	${PORTNAME}
 GH_TAGNAME=	r2.9
 
 .include "Makefile.MASTER_SITES"
 
 post-patch:
 	# don't cache stuff to $HOME/.cache/
 	@${MKDIR} ${WRKDIR}/bazel-cache
 	@${MKDIR} ${WRKDIR}/bazel-dist
 
 .for file in ${DISTFILES:C/\:(.*)//}
 	@${ECHO} "Moving ${file} to ${WRKDIR}/bazel-dist"
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${file} ${WRKDIR}/bazel-dist
 .endfor
 
 	# place the generate wheel file here
 	@${MKDIR} ${WRKDIR}/whl
 
 	# These files are from my tensorflow port
 	# if both make it into the port they can be shared
 
 	# copy the toolchain over
 	@${CP} -R ${PATCHDIR}/freebsd \
 		${WRKSRC}/
 
 	@${CP} ${PATCHDIR}/bazelrc \
 		${WRKSRC}/
 
 	#setup localbase
 	@${REINPLACE_CMD} "s#%%LOCALBASE%%#${LOCALBASE}#" \
 		${WRKSRC}/freebsd/cc_toolchain_config.bzl \
 		${WRKSRC}/.bazelrc \
 		${WRKSRC}/bazelrc
 
 	# setup our bazelrc
 	@${REINPLACE_CMD} "s#%%BAZEL_DIR%%#${WRKDIR}#" ${WRKSRC}/bazelrc
 	@${REINPLACE_CMD} "s#%%BAZEL_DIST%%#${WRKDIR}#" ${WRKSRC}/bazelrc
 	@${REINPLACE_CMD} "s#%%PATH%%#${PATH}#" ${WRKSRC}/bazelrc
 	@${REINPLACE_CMD} "s#%%PYTHON%%#${PYTHON_CMD}#" ${WRKSRC}/.bazelrc
 
 	# bazel is horrible, it will won't propagated enviroment variable throughout the build
 	# and will ignore variables set by us. This causing a lot of issues, especially with python
 	# auto generated files will sometimes ignore our py_runtime toolchain and our PYTHON_BIN_PATH
 	# causing it to still set the shebang line to bin/env python3. Even on the github page the solution
 	# has been to use a symlink to work around so do that here as a fix
 	@${MKDIR} ${WRKDIR}/.bin
 	${LN} -s ${PYTHON_CMD} ${WRKDIR}/.bin/python3
 
 	@${REINPLACE_CMD} "s#%%PYTHON%%#${PYTHON_CMD}#" \
 		${WRKSRC}/keras/tools/pip_package/build_pip_package.sh
 
 do-build:
 	@cd ${WRKSRC} && ${SETENV} \
 		PYTHON_BIN_PATH=${PYTHON_CMD} \
 		PYTHON_LIB_PATH="${PYTHON_SITELIBDIR}" \
 		PYTHON_BINARY=${PYTHON_CMD} \
 		bazel --bazelrc="${WRKSRC}/bazelrc" \
 		build --config=freebsd \
 		//keras/tools/pip_package:build_pip_package
 
 #	@${REINPLACE_CMD} "s#python#${PYTHON_CMD}#" \
 #		${WRKSRC}/bazel-bin/keras/tools/pip_package/build_pip_package
 
 	@cd ${WRKSRC} && \
 		bazel-bin/keras/tools/pip_package/build_pip_package \
 		${WRKDIR}/whl
 
 do-install:
 	@${MKDIR} ${STAGEDIR}/${PYTHON_SITELIBDIR}
 
 	${UNZIP_NATIVE_CMD} -d ${STAGEDIR}/${PYTHON_SITELIBDIR} ${WRKDIR}/whl/${PORTNAME}-${PORTVERSION}-*.whl
 
 .include <bsd.port.mk>
diff --git a/math/py-levmar/Makefile b/math/py-levmar/Makefile
index daa90f65fc22..be990e0385cc 100644
--- a/math/py-levmar/Makefile
+++ b/math/py-levmar/Makefile
@@ -1,34 +1,35 @@
 # levmar library (math/levmar) is bundled
 
 PORTNAME=	levmar
 DISTVERSION=	0.2.3
+PORTREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Binding to levmar library (Levenberg-Marquardt optimization algorithm)
 WWW=		https://github.com/bjodah/levmar
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BUILD_DEPENDS=	${PYNUMPY}
 LIB_DEPENDS=	libblas.so:math/blas \
 		liblapack.so:math/lapack
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} \
 		${PYNUMPY}
 
 USES=		python:3.6+
 USE_PYTHON=	distutils autoplist
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|ö|o|' ${WRKSRC}/AUTHORS # breaks because of non-ascii chars
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME}/_${PORTNAME}*.so
 
 do-test:
 	@cd ${WRKSRC}/levmar/tests && ${PYTHON_CMD} -m pytest --pyargs levmar
 
 .include <bsd.port.mk>
diff --git a/math/py-linearmodels/Makefile b/math/py-linearmodels/Makefile
index 98d440addcd3..59616e0b78e9 100644
--- a/math/py-linearmodels/Makefile
+++ b/math/py-linearmodels/Makefile
@@ -1,32 +1,33 @@
 PORTNAME=	linearmodels
 PORTVERSION=	4.27
+PORTREVISION=	1
 CATEGORIES=	math python # statistics
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Linear Panel, Instrumental Variable, Asset Pricing and other models
 WWW=		https://bashtage.github.io/linearmodels/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 PY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}formulaic>=0.3.2:math/py-formulaic@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mypy_extensions>=0.4:devel/py-mypy_extensions@${PY_FLAVOR} \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}pandas>=0.24:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}property-cached>=1.6.3:devel/py-property-cached@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyhdfe>=0.1:math/py-pyhdfe@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=1.2:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}statsmodels>=0.11:math/py-statsmodels@${PY_FLAVOR}
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>=6.4.2,<7.0.0:devel/py-setuptools_scm@${PY_FLAVOR} \
 		${PY_DEPENDS}
 RUN_DEPENDS=	${PY_DEPENDS}
 
 USES=		python:3.7+ shebangfix
 USE_PYTHON=	autoplist cython distutils
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/linearmodels/panel/_utility${PYTHON_EXT_SUFFIX}.so
 
 .include <bsd.port.mk>
diff --git a/math/py-lmfit/Makefile b/math/py-lmfit/Makefile
index 50d1fde9d90c..cf5eed218508 100644
--- a/math/py-lmfit/Makefile
+++ b/math/py-lmfit/Makefile
@@ -1,31 +1,31 @@
 PORTNAME=	lmfit
 DISTVERSION=	1.2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Least-squares Minimization with bounds and constraints
 WWW=		https://lmfit.github.io/lmfit-py/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 PY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}asteval>=0.9.22:devel/py-asteval@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dill>0:devel/py-dill@${PY_FLAVOR} \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=1.4:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}uncertainties>=3.0.1:math/py-uncertainties@${PY_FLAVOR}
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} \
 		${PY_DEPENDS}
 RUN_DEPENDS=	${PY_DEPENDS}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numdifftools>0:math/py-numdifftools@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_PYTHON=	pep517 autoplist pytest # 1 test fails, see https://github.com/lmfit/lmfit-py/issues/861
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/math/py-luminol/Makefile b/math/py-luminol/Makefile
index 8040192f88e7..c66fc8818694 100644
--- a/math/py-luminol/Makefile
+++ b/math/py-luminol/Makefile
@@ -1,22 +1,23 @@
 PORTNAME=	luminol
 DISTVERSION=	0.4
+PORTREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Lightweight python library for time series data analysis
 WWW=		https://github.com/linkedin/luminol
 
 LICENSE=	APACHE20
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future@${PY_FLAVOR} \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_PYTHON=	autoplist distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/math/py-mapbox-earcut/Makefile b/math/py-mapbox-earcut/Makefile
index dc0bd92d7388..35cb11792b22 100644
--- a/math/py-mapbox-earcut/Makefile
+++ b/math/py-mapbox-earcut/Makefile
@@ -1,28 +1,29 @@
 PORTNAME=	mapbox-earcut
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.0.1
+PORTREVISION=	1
 CATEGORIES=	math
 #MASTER_SITES=	PYPI # no tests
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Bindings for Pango for use with Manim
 WWW=		https://manimpango.manim.community/en/latest/
 
 LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pybind11>0:devel/py-pybind11@${PY_FLAVOR}
 RUN_DEPENDS=	${PYNUMPY}
 
 USES=		python
 USE_PYTHON=	distutils autoplist pytest
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	skogler
 GH_PROJECT=	mapbox_earcut_python
 
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 TEST_WRKSRC=	${WRKSRC}/tests
 
 .include <bsd.port.mk>
diff --git a/math/py-mathics/Makefile b/math/py-mathics/Makefile
index aaccf1d6c68a..8aa89c7dcdf9 100644
--- a/math/py-mathics/Makefile
+++ b/math/py-mathics/Makefile
@@ -1,81 +1,82 @@
 PORTNAME=	Mathics3
 PORTVERSION=	6.0.1
+PORTREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	General-purpose computer algebra system (CAS)
 WWW=		https://mathics.org/
 
 LICENSE=	GPLv3
 
 BUILD_DEPENDS=	${PYNUMPY}	\
 		${PY_PILLOW}	\
 		${PYTHON_PKGNAMEPREFIX}cython>0:lang/cython@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pint>0:devel/py-pint@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sympy>0:math/py-sympy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mpmath>0:math/py-mpmath@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}llvmlite>0:devel/py-llvmlite@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}palettable>0:misc/py-palettable@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wordcloud>0:textproc/py-wordcloud@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-image>0:graphics/py-scikit-image@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Mathics_Scanner>0:math/py-mathics-scanner
 RUN_DEPENDS=	${PYNUMPY}	\
 		${PY_PILLOW}	\
 		bash:shells/bash	\
 		${PYTHON_PKGNAMEPREFIX}py>0:devel/py-py@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cython>0:lang/cython@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pint>0:devel/py-pint@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sympy>0:math/py-sympy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mpmath>0:math/py-mpmath@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ipython>0:devel/ipython@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}nltk>0:textproc/py-nltk@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyaml>0:textproc/py-pyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pydot>0:graphics/py-pydot@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyocr>0:graphics/py-pyocr@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}langid>0:textproc/py-langid@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}networkx>0:math/py-networkx@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}llvmlite>0:devel/py-llvmlite@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}colorama>0:devel/py-colorama@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}enchant>0:textproc/py-enchant@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}imageio>0:graphics/py-imageio@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}palettable>0:misc/py-palettable@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tifffile>0:graphics/py-tifffile@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ipykernel>0:devel/py-ipykernel@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ipywidgets>0:devel/py-ipywidgets@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pycountry>0:textproc/py-pycountry@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wordcloud>0:textproc/py-wordcloud@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}recordclass>0:devel/py-recordclass@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-image>0:graphics/py-scikit-image@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Mathics_Scanner>0:math/py-mathics-scanner
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pluggy>0:devel/py-pluggy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pexpect>0:misc/py-pexpect@${PY_FLAVOR}
 
 #USE_GITHUB=	yes
 #GH_ACCOUNT=	${PORTNAME:tl}
 
 USES=		python:3.8+ shebangfix
 USE_PYTHON=	cython distutils noflavors
 MAKE_ENV+=	USE_CYTHON=yes
 SHEBANG_GLOB=	*.py
 
 .if !defined(WITH_DEBUG)
 LDFLAGS+=	-s
 .endif
 
 do-test: install
 	(cd ${TEST_WRKSRC} && py.test)
 
 .include <bsd.port.mk>
diff --git a/math/py-matplotlib-scalebar/Makefile b/math/py-matplotlib-scalebar/Makefile
index 864c98537d0a..8ef2a62d092d 100644
--- a/math/py-matplotlib-scalebar/Makefile
+++ b/math/py-matplotlib-scalebar/Makefile
@@ -1,22 +1,23 @@
 PORTNAME=	matplotlib-scalebar
 PORTVERSION=	0.8.1
+PORTREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	rhurlin@FreeBSD.org
 COMMENT=	Artist for matplotlib to display a scale bar
 WWW=		https://github.com/ppinard/matplotlib-scalebar
 
 LICENSE=	BSD
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}matplotlib>=0:math/py-matplotlib@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_LOCALE=	en_US.UTF-8
 USE_PYTHON=	autoplist distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/math/py-matplotlib/Makefile b/math/py-matplotlib/Makefile
index 86f2e4ce97bf..918bcaaef4b4 100644
--- a/math/py-matplotlib/Makefile
+++ b/math/py-matplotlib/Makefile
@@ -1,56 +1,57 @@
 PORTNAME=	matplotlib
 PORTVERSION=	3.7.1
+PORTREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	mainland@apeiron.net
 COMMENT=	Plotting library uses a syntax familiar to MATLAB users
 WWW=		https://matplotlib.org/
 
 LICENSE=	PSFL
 
 BUILD_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}pillow>=6.2:graphics/py-pillow@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyparsing>=0:devel/py-pyparsing@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}certifi>=0.10:security/py-certifi@${PY_FLAVOR} \
 		${PYTHON_SITELIBDIR}/pybind11:devel/py-pybind11@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVOR}
 LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 		libqhull_r.so:math/qhull \
 		libpng.so:graphics/png \
 		libfontconfig.so:x11-fonts/fontconfig
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}contourpy>=0:math/py-contourpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cycler>=0.10:devel/py-cycler@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:devel/py-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}importlib-resources>=0:devel/py-importlib-resources@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyparsing>=0:devel/py-pyparsing@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tornado>0:www/py-tornado@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pluggy>0:devel/py-pluggy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pillow>=6.2:graphics/py-pillow@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyparsing>=0:devel/py-pyparsing@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}certifi>=0.10:security/py-certifi@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}kiwisolver>=1.0.0:math/py-kiwisolver@${PY_FLAVOR}
 
 USES=		compiler:c++11-lib gettext gnome localbase pkgconfig python:3.7+ shebangfix uniquefiles:dirs
 USE_PYTHON=	distutils
 
 PLIST_SUB=	VER=${PORTVERSION}
 PORTEXAMPLES=	*
 
 OPTIONS_DEFINE=		EXAMPLES
 
 post-extract:
 	@${FIND} ${WRKSRC} -name '*.py' | ${XARGS} ${CHMOD} -x
 
 post-install:
 	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR}/matplotlib -name '*.so' \
 		| ${XARGS} ${STRIP_CMD}
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${CP} -R ${WRKSRC}/examples/ ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/math/py-matplotlib2/Makefile b/math/py-matplotlib2/Makefile
index 4133c12944b7..743a1e59c7a8 100644
--- a/math/py-matplotlib2/Makefile
+++ b/math/py-matplotlib2/Makefile
@@ -1,70 +1,70 @@
 PORTNAME=	matplotlib
 DISTVERSION=	2.2.4
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 PKGNAMESUFFIX=	2
 
 MAINTAINER=	mainland@apeiron.net
 COMMENT=	Plotting library uses a syntax familiar to MATLAB users (legacy)
 WWW=		https://matplotlib.org/
 
 LICENSE=	PSFL
 
 BUILD_DEPENDS=	${PYNUMPY}
 LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 		libpng.so:graphics/png \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libtcl86.so:lang/tcl86
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}cycler>=0.10:devel/py-cycler@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:devel/py-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyparsing>=0:devel/py-pyparsing@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tornado>0:www/py-tornado@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}kiwisolver>=1.0.0:math/py-kiwisolver@${PY_FLAVOR}
 
 USES=		compiler:c++11-lib gettext gnome pkgconfig python:3.6+ shebangfix uniquefiles:dirs
 USE_PYTHON=	autoplist distutils
 
 CFLAGS+=	-I${LOCALBASE}/include
 
 OPTIONS_DEFINE=		EXAMPLES \
 			QT5AGGBACKEND TKAGGBACKEND
 OPTIONS_DEFAULT=	TKAGGBACKEND
 OPTIONS_SUB=		yes
 
 QT5AGGBACKEND_DESC=	Qt5Agg backend support
 QT5AGGBACKEND_USES=	display pyqt:5
 QT5AGGBACKEND_USE=	PYQT=pyqt5,sip
 QT5AGGBACKEND_VARS=	QT5AGG_BACKEND=True
 QT5AGGBACKEND_VARS_OFF=	QT5AGG_BACKEND=False
 TKAGGBACKEND_DESC=	TKAgg backend support
 TKAGGBACKEND_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVOR}
 TKAGGBACKEND_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVOR}
 TKAGGBACKEND_USES=	display tk:run
 TKAGGBACKEND_VARS=	TKAGG_BACKEND=True
 TKAGGBACKEND_VARS_OFF=	TKAGG_BACKEND=False
 
 PORTEXAMPLES=	*
 
 post-extract:
 	@${FIND} ${WRKSRC} -name '*.py' | ${XARGS} ${CHMOD} -x
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%QT5AGG_BACKEND%%|${QT5AGG_BACKEND}|g' \
 			 -e 's|%%TKAGG_BACKEND%%|${TKAGG_BACKEND}|g' \
 		${WRKSRC}/setup.cfg
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}/matplotlib/backends/web_backend/jquery-ui-1.12.1
 	cd ${WRKSRC}/lib/matplotlib/backends/web_backend/jquery-ui-1.12.1 && ${COPYTREE_SHARE} . ${STAGEDIR}${PYTHON_SITELIBDIR}/matplotlib/backends/web_backend/jquery-ui-1.12.1
 	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR}/matplotlib -name '*.so' \
 		| ${XARGS} ${STRIP_CMD}
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${CP} -R ${WRKSRC}/examples/ ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/math/py-minorminer/Makefile b/math/py-minorminer/Makefile
index 2a4743aa5157..c00e710d4260 100644
--- a/math/py-minorminer/Makefile
+++ b/math/py-minorminer/Makefile
@@ -1,40 +1,41 @@
 PORTNAME=	minorminer
 DISTVERSION=	0.2.11
+PORTREVISION=	1
 CATEGORIES=	math python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Heuristic tool for minor embedding of graphs
 WWW=		https://docs.ocean.dwavesys.com/projects/minorminer/en/latest/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 PY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}fasteners>=0.15:devel/py-fasteners@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}homebase>=1.0.1:devel/py-homebase@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}networkx>=2.4:math/py-networkx@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dwave-networkx>=0.8.11:science/py-dwave-networkx@${PY_FLAVOR} \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}rectangle-packer>=2.0.1:math/py-rectangle-packer@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=1.8.0:science/py-scipy@${PY_FLAVOR}
 BUILD_DEPENDS=	${PY_DEPENDS}
 RUN_DEPENDS=	${PY_DEPENDS}
 
 USES=		python:3.6+
 USE_PYTHON=	distutils cython autoplist pytest # 9 tests fail, see https://github.com/dwavesystems/minorminer/issues/231
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	dwavesystems
 GH_TUPLE=	boothby:glasgow-subgraph-solver:568c45f:glasgow_subgraph_solver/external/glasgow-subgraph-solver \
 		nemequ:portable-snippets:84abba9:portable_snippets/external/portable-snippets
 
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 TEST_WRKSRC=	${WRKSRC}/tests
 
 post-install:
 	@${STRIP_CMD} \
 		${STAGEDIR}${PYTHON_SITELIBDIR}/minorminer/_minorminer${PYTHON_EXT_SUFFIX}.so \
 		${STAGEDIR}${PYTHON_SITELIBDIR}/minorminer/busclique${PYTHON_EXT_SUFFIX}.so \
 		${STAGEDIR}${PYTHON_SITELIBDIR}/minorminer/subgraph${PYTHON_EXT_SUFFIX}.so
 
 .include <bsd.port.mk>
diff --git a/math/py-ml-dtypes/Makefile b/math/py-ml-dtypes/Makefile
index e0e1ba9d16ce..5d37ea2b56bb 100644
--- a/math/py-ml-dtypes/Makefile
+++ b/math/py-ml-dtypes/Makefile
@@ -1,27 +1,28 @@
 PORTNAME=	ml-dtypes
 PORTVERSION=	0.1.0
+PORTREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	ml_dtypes-${PORTVERSION}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Stand-alone implementation of several NumPy dtype extensions
 WWW=		https://github.com/jax-ml/ml_dtypes
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=1.23.3:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pybind11>=2.10.0<2.11:devel/py-pybind11@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=1.23.3:math/py-numpy@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	autoplist concurrent pep517
 
 post-install:
 	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' -exec ${STRIP_CMD} {} +
 
 .include <bsd.port.mk>
diff --git a/math/py-networkx/Makefile b/math/py-networkx/Makefile
index e66c6dfa24e2..6ce110df6ff7 100644
--- a/math/py-networkx/Makefile
+++ b/math/py-networkx/Makefile
@@ -1,67 +1,68 @@
 PORTNAME=	networkx
 DISTVERSION=	3.1
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Tools for complex networks
 WWW=		https://networkx.github.io/
 
 LICENSE=	BSD3CLAUSE
 
 RUN_DEPENDS:=	${PYTHON_PKGNAMEPREFIX}decorator>=4.3.0:devel/py-decorator@${PY_FLAVOR}
 
 USES=		cpe python:3.8+ shebangfix
 USE_PYTHON=	autoplist concurrent distutils pytest
 SHEBANG_GLOB=	*.py
 NO_ARCH=	yes
 CPE_VENDOR=	python
 
 PLIST_SUB+=	PYTHON_MAJOR_VER=${PYTHON_MAJOR_VER}
 
 OPTIONS_DEFINE=	EXAMPLES GDAL LXML PANDAS PYDOT YAML
 OPTIONS_GROUP=	MATRIX RENDER
 OPTIONS_GROUP_MATRIX=	NUMPY SCIPY
 OPTIONS_GROUP_RENDER=	MPL GRAPHVIZ
 OPTIONS_DEFAULT=	NUMPY SCIPY MPL GDAL GRAPHVIZ LXML PANDAS PYDOT YAML
 
 NUMPY_DESC=	Matrix representation of graphs
 NUMPY_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=1.20.0,1:math/py-numpy@${PY_FLAVOR}
 
 SCIPY_DESC=	Sparse matrix representation of graphs
 SCIPY_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}scipy>=1.8:science/py-scipy@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}scikit-sparse>=0.2:science/py-scikit-sparse@${PY_FLAVOR}
 
 MPL_DESC=	Flexible graph rendering
 MPL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}matplotlib>=3.4.0:math/py-matplotlib@${PY_FLAVOR}
 
 GDAL_DESC=	Support of raster geospatial data formats
 GDAL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gdal>=0:graphics/py-gdal@${PY_FLAVOR}
 
 GRAPHVIZ_DESC=	Additional graph layout and rendering algorithms
 GRAPHVIZ_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pygraphviz>=1.2:graphics/py-pygraphviz@${PY_FLAVOR}
 
 LXML_DESC=	Binding for the libxml2 and libxslt libraries
 LXML_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR}
 
 PANDAS_DESC=	Data analysis
 PANDAS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pandas>=1.3:math/py-pandas@${PY_FLAVOR}
 
 PYDOT_DESC=	Graphviz Dot language
 PYDOT_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pydot>=0:graphics/py-pydot@${PY_FLAVOR}
 
 YAML_DESC=	Reading and writing YAML files
 YAML_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${PY_FLAVOR}
 
 PORTEXAMPLES=	*
 
 post-install:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
 
 do-test: install
 	(cd ${WRKSRC} && py.test)
 
 .include <bsd.port.mk>
diff --git a/math/py-nevergrad/Makefile b/math/py-nevergrad/Makefile
index 566b491bc850..62652c48a02e 100644
--- a/math/py-nevergrad/Makefile
+++ b/math/py-nevergrad/Makefile
@@ -1,42 +1,43 @@
 PORTNAME=	nevergrad
 PORTVERSION=	0.4.3
+PORTREVISION=	1
 DISTVERSIONSUFFIX=	.post2
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Python toolbox for performing gradient-free optimization
 WWW=		https://github.com/facebookresearch/nevergrad
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}bayesian-optimization>=1.2.0:math/py-bayesian-optimization@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cma>=2.6.0:math/py-cma@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpy>=1.15.0,1:math/py-numpy@${PY_FLAVOR}
 
 USES=		python:3.8+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=	BENCHMARK
 OPTIONS_DEFAULT=BENCHMARK
 BENCHMARK_DESC=	Run benchmark functions
 
 BENCHMARK_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gym>=0.12.1:math/py-gym@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}hiplot>=0:graphics/py-hiplot@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}iohexperimenter>=0.2.8:math/py-iohexperimenter@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}matplotlib>=2.2.3:math/py-matplotlib@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}mixsimulator>=0.2.9.5:math/py-mixsimulator@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}pandas>=0.23.4,1:math/py-pandas@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}Pyomo>=5.7:math/py-Pyomo@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}pyproj>=2.6.1:graphics/py-pyproj@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}requests>=2.21.0:www/py-requests@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}tqdm>=0:misc/py-tqdm@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}xlrd>=1.2.0:textproc/py-xlrd@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}xlwt>=1.3.0:textproc/py-xlwt@${PY_FLAVOR}
 
 .include <bsd.port.mk>
diff --git a/math/py-nlopt/Makefile b/math/py-nlopt/Makefile
index 1e656bce247b..0914749ac68f 100644
--- a/math/py-nlopt/Makefile
+++ b/math/py-nlopt/Makefile
@@ -1,34 +1,35 @@
 PORTNAME=	nlopt
 DISTVERSION=	2.7.1
+PORTREVISION=	1
 CATEGORIES=	math
 #MASTER_SITES=	PYPI # https://github.com/DanielBok/nlopt-python/issues/15
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Nonlinear optimization library
 WWW=		https://github.com/DanielBok/nlopt-python
 
 LICENSE=	LGPL21 MIT
 LICENSE_COMB=	multi
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	cmake:devel/cmake-core \
 		swig:devel/swig \
 		${PYNUMPY}
 RUN_DEPENDS=	${PYNUMPY}
 
 USES=		python
 USE_PYTHON=	distutils # autoplist is broken, see https://github.com/DanielBok/nlopt-python/issues/17
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	DanielBok
 GH_PROJECT=	nlopt-python
 GH_TUPLE=	stevengj:nlopt:4a0e93c:nlopt/extern/nlopt
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/nlopt/_nlopt.so
 
 do-test:
 	@${SETENV} ${TEST_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} ${PYTHON_CMD} ${FILESDIR}/example.py
 
 .include <bsd.port.mk>
diff --git a/math/py-numdifftools/Makefile b/math/py-numdifftools/Makefile
index ec17880ac07e..d9327d34d29f 100644
--- a/math/py-numdifftools/Makefile
+++ b/math/py-numdifftools/Makefile
@@ -1,32 +1,33 @@
 PORTNAME=	numdifftools
 DISTVERSION=	0.9.41
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Solve automatic numerical differentiation problems in 1+ variables
 WWW=		https://github.com/pbrod/numdifftools
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 PY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}algopy>=0.4:math/py-algopy@${PY_FLAVOR} \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=0.8:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}statsmodels>0:math/py-statsmodels@${PY_FLAVOR}
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner@${PY_FLAVOR} \
 		${PY_DEPENDS}
 RUN_DEPENDS=	${PY_DEPENDS}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}hypothesis>=3.56:devel/py-hypothesis@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}line-profiler>0:devel/py-line-profiler@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-cov>0:devel/py-pytest-cov@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-pep8>0:devel/py-pytest-pep8@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_PYTHON=	distutils autoplist pytest # test dependencies fail to install due to inter-package conflicts
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/math/py-numexpr/Makefile b/math/py-numexpr/Makefile
index 814c6ca33917..9b4ad1cdf5d8 100644
--- a/math/py-numexpr/Makefile
+++ b/math/py-numexpr/Makefile
@@ -1,23 +1,24 @@
 PORTNAME=	numexpr
 PORTVERSION=	2.8.4
+PORTREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Fast numerical array expression evaluator for Python and NumPy
 WWW=		https://github.com/pydata/numexpr
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=1.13.3,1:math/py-numpy@${PY_FLAVOR}
 
 USES=		dos2unix python:3.7+
 USE_PYTHON=	autoplist concurrent distutils
 
 post-install:
 	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' -exec ${STRIP_CMD} {} +
 
 .include <bsd.port.mk>
diff --git a/math/py-numpoly/Makefile b/math/py-numpoly/Makefile
index ebc474a5d981..529a08b3ce76 100644
--- a/math/py-numpoly/Makefile
+++ b/math/py-numpoly/Makefile
@@ -1,21 +1,22 @@
 PORTNAME=	numpoly
 DISTVERSION=	1.2.3
+PORTREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Create/manipulate/evaluate polynomial arrays based on numpy.ndarray
 WWW=		https://github.com/jonathf/numpoly
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYNUMPY}
 
 USES=		python:3.6+
 USE_PYTHON=	distutils autoplist
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/math/py-numpy-stl/Makefile b/math/py-numpy-stl/Makefile
index f0d7e47c4583..151c95d59740 100644
--- a/math/py-numpy-stl/Makefile
+++ b/math/py-numpy-stl/Makefile
@@ -1,25 +1,26 @@
 PORTNAME=	numpy-stl
 DISTVERSION=	2.11.3
+PORTREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	db@FreeBSD.org
 COMMENT=	Simple library to make working with STL files fast and easy
 WWW=		https://github.com/WoLpH/numpy-stl
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYNUMPY}
 
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}python-utils>=2.3.0:misc/py-python-utils@${PY_FLAVOR}
 
 USES=		python:3.4+
 USE_PYTHON=	cython distutils autoplist
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/stl/_speedups*.so
 
 .include <bsd.port.mk>
diff --git a/math/py-numpy/Makefile b/math/py-numpy/Makefile
index ad2ab596830f..1ed4b5b8bf03 100644
--- a/math/py-numpy/Makefile
+++ b/math/py-numpy/Makefile
@@ -1,79 +1,80 @@
 PORTNAME=	numpy
 PORTVERSION=	1.24.1
+PORTREVISION=	4
 PORTEPOCH=	1
 CATEGORIES=	math python
 MASTER_SITES=	PYPI \
 		https://numpy.org/doc/1.23/:doc
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		${PORTNAME}-ref.pdf:doc \
 		${PORTNAME}-user.pdf:doc
 DIST_SUBDIR=	${PORTNAME}-${PORTVERSION:R}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	python@FreeBSD.org
 COMMENT=	The New Numeric Extension to Python
 WWW=		https://www.numpy.org/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=6.2.5:devel/py-pytest@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}hypothesis>=6.24.1:devel/py-hypothesis@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}typing-extensions>=4.2.0:devel/py-typing-extensions@${PY_FLAVOR}
 USES=		compiler:c11 cpe fortran python:3.8+
 USE_PYTHON=	allflavors autoplist concurrent cython distutils
 
 GCCLIBDIR_CMDS=	${FC} -print-file-name=libgfortran.so | ${SED} -e s/libgfortran.so//
 LDFLAGS+=	-s
 PYDISTUTILS_BUILDARGS=		--fcompiler=gnu95
 PYDISTUTILS_CONFIGUREARGS=	--fcompiler=gnu95
 
 PORTDOCS=	*
 
 OPTIONS_DEFINE=		DOCS SUITESPARSE
 OPTIONS_SINGLE=		BLASLIB
 OPTIONS_SINGLE_BLASLIB=	ATLAS NETLIB OPENBLAS
 OPTIONS_DEFAULT=	OPENBLAS SUITESPARSE
 SUITESPARSE_DESC=	Use AMD and UMFPACK in SuiteSparse
 
 ATLAS_USES=		blaslapack:atlas
 ATLAS_VARS=		BLASLIBS="ptf77blas, ptcblas" BLASNAME=atlas LAPACKLIBS=alapack LIBRARIES=atlas_libs
 NETLIB_USES=		blaslapack:netlib
 NETLIB_VARS=		BLASLIBS="blas, cblas" BLASNAME=atlas LAPACKLIBS=lapack LIBRARIES=atlas_libs
 NETLIB_LIB_DEPENDS=	libcblas.so:math/cblas
 OPENBLAS_USES=		blaslapack:openblas
 OPENBLAS_VARS=		BLASLIBS="openblas, gfortran" BLASNAME=openblas LAPACKLIBS="openblas, gfortran" LIBRARIES=libraries
 SUITESPARSE_LIB_DEPENDS=libumfpack.so:math/suitesparse-umfpack
 
 post-extract:
 	@${TOUCH} ${WRKSRC}/numpy/f2py/tests/src/temp
 	@${TOUCH} ${WRKSRC}/numpy/random/_examples/temp
 	@${TOUCH} ${WRKSRC}/numpy/core/tests/examples/temp
 
 pre-configure-SUITESPARSE-off:
 	@${REINPLACE_CMD} -e 's|:%%LOCALBASE%%/include/suitesparse||' ${WRKSRC}/site.cfg
 
 pre-configure:
 	@${REINPLACE_CMD} -e 's|%%FC%%|${FC}|' ${WRKSRC}/numpy/distutils/fcompiler/gnu.py
 	@${CP} ${FILESDIR}/site.cfg ${WRKSRC}/site.cfg
 	${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		-e 's|%%BLASLIBS%%|${BLASLIBS}|; s|%%BLASNAME%%|${BLASNAME}|' \
 		-e 's|%%LAPACKLIBS%%|${LAPACKLIBS}|; s|%%LIBRARIES%%|${LIBRARIES}|' \
 			${WRKSRC}/site.cfg
 	@${REINPLACE_CMD} -e "s|%%GCCLIBDIR%%|$$(${GCCLIBDIR_CMDS})|" ${WRKSRC}/site.cfg ${WRKSRC}/numpy/distutils/system_info.py
 
 do-configure:
 
 post-install:
 	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' | ${XARGS} ${STRIP_CMD}
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${_DISTDIR}/${PORTNAME}-ref.pdf ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${_DISTDIR}/${PORTNAME}-user.pdf ${STAGEDIR}${DOCSDIR}
 
 do-test:
 	@cd ${WRKSRC} && ${PYTHON_CMD} runtests.py
 
 .include <bsd.port.mk>
diff --git a/math/py-openTSNE/Makefile b/math/py-openTSNE/Makefile
index aef3d9ecb19e..ce0eef1a6770 100644
--- a/math/py-openTSNE/Makefile
+++ b/math/py-openTSNE/Makefile
@@ -1,30 +1,30 @@
 PORTNAME=	openTSNE
 DISTVERSION=	0.7.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math python # statistics
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Fast, parallel implementations of t-SNE
 WWW=		https://github.com/pavlin-policar/openTSNE
 
 LICENSE=	BSD3CLAUSE
 
 BUILD_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
 LIB_DEPENDS=	libfftw3.so:math/fftw3
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-learn>=0.20:science/py-scikit-learn@${PY_FLAVOR}
 
 USES=		compiler:c++14-lang localbase:ldflags python:3.6+
 USE_PYTHON=	pep517 cython autoplist pytest # tests fail to run, see https://github.com/pavlin-policar/openTSNE/issues/237
 
 TEST_WRKSRC=	${WRKSRC}/tests
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 
 post-install:
 	@${FIND} ${STAGEDIR}${PREFIX} -name "*.so" | ${XARGS} ${STRIP_CMD}
 
 .include <bsd.port.mk>
diff --git a/math/py-opt-einsum/Makefile b/math/py-opt-einsum/Makefile
index f5b672863ee0..f1e8ff232b47 100644
--- a/math/py-opt-einsum/Makefile
+++ b/math/py-opt-einsum/Makefile
@@ -1,22 +1,23 @@
 PORTNAME=	opt-einsum
 PORTVERSION=	3.3.0
+PORTREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	opt_einsum-${PORTVERSION}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Optimizing numpys einsum function
 WWW=		https://github.com/dgasmith/opt_einsum
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=1.7,1:math/py-numpy@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/math/py-optuna/Makefile b/math/py-optuna/Makefile
index d6c63a416e6f..8e9d3b0961a0 100644
--- a/math/py-optuna/Makefile
+++ b/math/py-optuna/Makefile
@@ -1,30 +1,31 @@
 PORTNAME=	optuna
 DISTVERSION=	2.10.1
+PORTREVISION=	1
 CATEGORIES=	math # machine-learning
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	nc@FreeBSD.org
 COMMENT=	Hyperparameter optimization framework
 WWW=		https://optuna.org/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}alembic14>0:databases/py-alembic14@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cliff>0:devel/py-cliff@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cmaes>0:math/py-cmaes@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}colorlog>0:devel/py-colorlog@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}joblib>0:devel/py-joblib@${PY_FLAVOR} \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlalchemy12>0:databases/py-sqlalchemy12@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tqdm>0:misc/py-tqdm@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_PYTHON=	autoplist distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/math/py-or-tools/Makefile b/math/py-or-tools/Makefile
index 7b28515ee90f..4cba09867118 100644
--- a/math/py-or-tools/Makefile
+++ b/math/py-or-tools/Makefile
@@ -1,85 +1,86 @@
 PORTNAME=	or-tools
 DISTVERSIONPREFIX=	v
 DISTVERSION=	9.5
+PORTREVISION=	1
 CATEGORIES=	math
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Google's Operations Research tools (Python binding)
 WWW=		https://github.com/google/or-tools
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_armv7=	SWIG wrapped code invalid in 32 bit architecture, regenerate code using -DSWIGWORDSIZE32
 BROKEN_i386=	SWIG wrapped code invalid in 32 bit architecture, regenerate code using -DSWIGWORDSIZE32 # see https://github.com/google/or-tools/issues/2130
 
 PY_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}absl-py>0:devel/py-absl-py@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}protobuf>0:devel/py-protobuf@${PY_FLAVOR}
 BUILD_DEPENDS=	${PY_DEPENDS} \
 		pybind11>0:devel/pybind11 \
 		protoc-gen-mypy:devel/py-mypy-protobuf@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}virtualenv>0:devel/py-virtualenv@${PY_FLAVOR} \
 		swig:devel/swig
 LIB_DEPENDS=	libabsl_base.so:devel/abseil \
 		libCbc.so:math/cbc \
 		libCgl.so:math/cgl \
 		libcoinasl.so:math/asl \
 		libcoinmumps.so:math/coin-or-mumps \
 		libCoinUtils.so:math/coinutils \
 		libnauty.so:math/nauty \
 		libopenblas.so:math/openblas \
 		libOsi.so:math/osi \
 		libOsiClp.so:math/clp \
 		libgflags.so:devel/gflags \
 		libglog.so:devel/glog \
 		libprotobuf.so:devel/protobuf \
 		libre2.so:devel/re2
 RUN_DEPENDS=	${PY_DEPENDS}
 
 USES=		blaslapack cmake:insource compiler:c++17-lang eigen:3 pkgconfig python:3.6+
 USE_PYTHON=	flavors pytest # tests fail, see https://github.com/google/or-tools/issues/3464
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	google
 
 CMAKE_OFF=	BUILD_DEPS BUILD_pybind11 INSTALL_BUILD_DEPS BUILD_TESTING BUILD_EXAMPLES
 CMAKE_ON=	BUILD_PYTHON
 CMAKE_ARGS=	-DSWIG_EXECUTABLE=${LOCALBASE}/bin/swig -DFREEBSD_PYTHON_VER=${PYTHON_VER}
 CONFIGURE_ENV=	UNIX_CBC_DIR=${LOCALBASE} UNIX_CLP_DIR=${LOCALBASE}
 BUILD_ENV=	UNIX_CBC_DIR=${LOCALBASE} UNIX_CLP_DIR=${LOCALBASE}
 
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 
 OPTIONS_DEFINE=		SCIP
 
 SCIP_DESC=		Use the SCIP solver # SCIP package isn't built because of licensing restrictions
 SCIP_CMAKE_BOOL=	USE_SCIP
 SCIP_LIB_DEPENDS=	libscip.so:math/SCIP
 
 post-patch:
 	@${REINPLACE_CMD} -e '/absl::container/s,^,#,' \
 		${WRKSRC}/ortools/constraint_solver/CMakeLists.txt \
 		${WRKSRC}/ortools/glop/CMakeLists.txt \
 		${WRKSRC}/ortools/linear_solver/CMakeLists.txt \
 		${WRKSRC}/ortools/sat/CMakeLists.txt
 
 do-install: # by default cmake installs the whole or-tools project without the python part, so extract the wheel and install python files manually here
 	${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 	cd ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} && \
 		unzip ${BUILD_WRKSRC}/python/dist/ortools-${DISTVERSION}*.whl && \
 		${RM} -rf ortools-*.dist-info
 	${FIND} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} -name "*.so" -o -name "*.so.*" | ${XARGS} ${STRIP_CMD}
 
 run-examples: # one of the examples fail: https://github.com/google/or-tools/issues/3463
 .for e in arc_flow_cutting_stock_sat.py bus_driver_scheduling_sat.py cover_rectangle_sat.py cvrptw_plot.py qubo_sat.py # list is from examples/python/CMakeLists.txt
 	@cd ${WRKSRC}/examples/python && \
 		${ECHO} "==> Running ${PORTNAME} test ${e} ..." && \
 		${SETENV} ${TEST_ENV} ${PYTHON_CMD} ${e} && \
 		${ECHO} "... test ${e} succeeded"
 .endfor
 
 .include <bsd.port.mk>
diff --git a/math/py-osqp/Makefile b/math/py-osqp/Makefile
index 5522582bc889..f7daf1f16da0 100644
--- a/math/py-osqp/Makefile
+++ b/math/py-osqp/Makefile
@@ -1,25 +1,26 @@
 PORTNAME=	osqp
 PORTVERSION=	0.6.2.post5
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Python binding for Operator Splitting QP Solver
 WWW=		https://osqp.org
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 PY_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}qdldl>0:math/py-qdldl@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=0.13.2:science/py-scipy@${PY_FLAVOR}
 BUILD_DEPENDS=	${PY_DEPENDS} \
 		cmake:devel/cmake-core
 RUN_DEPENDS=	${PY_DEPENDS}
 
 USES=		python:3.6+
 USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/math/py-pandas-datareader/Makefile b/math/py-pandas-datareader/Makefile
index b01f4353fd03..a6a5f40639d4 100644
--- a/math/py-pandas-datareader/Makefile
+++ b/math/py-pandas-datareader/Makefile
@@ -1,30 +1,31 @@
 PORTNAME=	pandas-datareader
 DISTVERSION=		0.9.0
+PORTREVISION=	1
 CATEGORIES=	math finance python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	FreeBSD@Shaneware.biz
 COMMENT=	Data readers previously found in Pandas
 WWW=		https://github.com/pydata/pandas-datareader
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pandas>0.19.2:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.3.0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests-file>0:www/py-requests-file@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests-ftp>0:ftp/py-requests-ftp@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wrapt>0:devel/py-wrapt@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	distutils autoplist
 
 NO_ARCH=	yes
 
 do-test: # some testcases are known to fail: https://github.com/pydata/pandas-datareader/issues/500
 	@cd ${WRKSRC} && ${PYTHON_CMD} -m pytest pandas_datareader/tests
 
 .include <bsd.port.mk>
diff --git a/math/py-pandas/Makefile b/math/py-pandas/Makefile
index 8bbdcb9fcb86..b648ff458118 100644
--- a/math/py-pandas/Makefile
+++ b/math/py-pandas/Makefile
@@ -1,90 +1,91 @@
 PORTNAME=	pandas
 PORTVERSION=	1.5.3
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	math devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	python@FreeBSD.org
 COMMENT=	Flexible, high-performance data analysis in Python
 WWW=		https://pandas.pydata.org/
 
 LICENSE=	BSD3CLAUSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cython>=0.29.32<3:lang/cython@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpy>=1.20.3,1:math/py-numpy@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cython>=0.29.32<3:lang/cython@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpy>=1.20.3,1:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dateutil>=2.8.1:devel/py-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytz>=2020.1,1:devel/py-pytz@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}arrow>=0:devel/py-arrow@${PY_FLAVOR}
 
 USES=		cpe python:3.8+
 CPE_VENDOR=	numfocus
 USE_PYTHON=	cython distutils
 
 OPTIONS_DEFINE=		MPL SCIPY
 OPTIONS_GROUP=		ACCEL STORAGE HTML EXCEL
 OPTIONS_RADIO=		SQL
 OPTIONS_GROUP_ACCEL=	BTLNCK NUMEXPR
 OPTIONS_GROUP_STORAGE=	BOTO TABLES
 OPTIONS_GROUP_HTML=	LXML HTML5LIB JINJA2
 OPTIONS_GROUP_EXCEL=	XLRD XLWT OPENPYXL XLSX
 OPTIONS_RADIO_SQL=	ALCHEMY10 ALCHEMY11 ALCHEMY12 ALCHEMY13 ALCHEMY14
 OPTIONS_DEFAULT=	BTLNCK NUMEXPR
 
 # Note: we cannot include the following ports in *_DEPENDS because they depend
 # on us for BUILD and RUN.
 #	devel/py-xarray
 #	math/py-statsmodels
 ACCEL_DESC=	Computation Acceleration Add-ons
 ALCHEMY10_DESC=	Support SQL databases via databases/py-sqlalchemy10
 ALCHEMY11_DESC=	Support SQL databases via databases/py-sqlalchemy11
 ALCHEMY12_DESC=	Support SQL databases via databases/py-sqlalchemy12
 ALCHEMY13_DESC=	Support SQL databases via databases/py-sqlalchemy13
 ALCHEMY14_DESC=	Support SQL databases via databases/py-sqlalchemy14
 BOTO_DESC=	Support Amazon S3 storage via devel/py-boto
 BTLNCK_DESC=	Accelerate certain NaN evals via math/py-bottleneck
 EXCEL_DESC=	MS Excel I/O Add-ons
 HTML5LIB_DESC=	Parse HTML with www/py-html5lib and www/py-beautifulsoup
 HTML_DESC=	HTML Parsing/Generation Add-ons
 JINJA2_DESC=	Support conditional HTML formatting with devel/py-Jinja2
 LXML_DESC=	Parse HTML with devel/py-lxml and www/py-beautifulsoup
 MPL_DESC=	Support graphical plotting output via math/py-matplotlib
 NUMEXPR_DESC=	Accelerate certain numerical ops via math/py-numexpr
 OPENPYXL_DESC=	Write MS Excel 2007+ with textproc/py-openpyxl
 OPENPYXL_IMPLIES=	XLRD
 SCIPY_DESC=	Support various statistical functions via science/py-scipy
 SQL_DESC=	SQLAlchemy ORM Add-ons
 STORAGE_DESC=	Data Storage Add-ons
 TABLES_DESC=	Support HDF5-based storage via devel/py-tables
 XLRD_DESC=	Read MS Excel with textproc/py-xlrd
 XLSX_DESC=	Write MS Excel with textproc/py-xlsxwriter
 XLWT_DESC=	Write MS Excel with textproc/py-xlwt
 
 ALCHEMY10_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlalchemy10>0:databases/py-sqlalchemy10@${PY_FLAVOR}
 ALCHEMY11_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlalchemy11>0:databases/py-sqlalchemy11@${PY_FLAVOR}
 ALCHEMY12_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlalchemy12>0:databases/py-sqlalchemy12@${PY_FLAVOR}
 ALCHEMY13_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlalchemy13>0:databases/py-sqlalchemy13@${PY_FLAVOR}
 ALCHEMY14_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlalchemy14>0:databases/py-sqlalchemy14@${PY_FLAVOR}
 BOTO_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}boto>0:devel/py-boto@${PY_FLAVOR}
 BTLNCK_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}bottleneck>=1.2.0:math/py-bottleneck@${PY_FLAVOR}
 HTML5LIB_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.2.1:www/py-beautifulsoup@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib@${PY_FLAVOR}
 JINJA2_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR}
 LXML_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.2.1:www/py-beautifulsoup@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR}
 MPL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}matplotlib>=2.0.0:math/py-matplotlib@${PY_FLAVOR}
 NUMEXPR_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numexpr>=2.6.1:math/py-numexpr@${PY_FLAVOR}
 OPENPYXL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}openpyxl>=2.4.0:textproc/py-openpyxl@${PY_FLAVOR}
 SCIPY_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}scipy>=1.1:science/py-scipy@${PY_FLAVOR}
 TABLES_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tables>=3.4.2:devel/py-tables@${PY_FLAVOR}
 XLRD_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}xlrd>=1.0.0:textproc/py-xlrd@${PY_FLAVOR}
 XLSX_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}XlsxWriter>0:textproc/py-xlsxwriter@${PY_FLAVOR}
 XLWT_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}xlwt>0:textproc/py-xlwt@${PY_FLAVOR}
 
 post-install:
 	${FIND} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} -name '*.so' -exec ${STRIP_CMD} {} +
 
 .include <bsd.port.mk>
diff --git a/math/py-patsy/Makefile b/math/py-patsy/Makefile
index f7e8db7e83a5..28e787a8bd20 100644
--- a/math/py-patsy/Makefile
+++ b/math/py-patsy/Makefile
@@ -1,33 +1,34 @@
 PORTNAME=	patsy
 PORTVERSION=	0.5.3
+PORTREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Python package for statistical models and design matrices
 WWW=		https://github.com/pydata/patsy
 
 LICENSE=	BSD2CLAUSE PSFL
 LICENSE_COMB=	multi
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=1.4,1:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/*.rst ${STAGEDIR}${DOCSDIR}
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/_examples/*.py ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/math/py-pdal/Makefile b/math/py-pdal/Makefile
index 7d132a7b1ab5..6391fb865c80 100644
--- a/math/py-pdal/Makefile
+++ b/math/py-pdal/Makefile
@@ -1,35 +1,35 @@
 PORTNAME=	pdal
 DISTVERSION=	3.0.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	${PORTNAME:tu}-${DISTVERSION}
 
 MAINTAINER=	lbartoletti@FreeBSD.org
 COMMENT=	PDAL Python bindings
 WWW=		https://pypi.python.org/pypi/pdal
 
 LICENSE=	BSD3CLAUSE
 
 BUILD_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}scikit-build>0:devel/py-scikit-build@${PY_FLAVOR} \
 		${PREFIX}/share/cmake/pybind11/pybind11Config.cmake:devel/pybind11 \
 		cmake:devel/cmake-core
 LIB_DEPENDS=	libpdal_base.so:math/pdal
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}packaging>=0:devel/py-packaging@${PY_FLAVOR} \
 		${PYNUMPY}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}
 
 USES=		compiler:c++11-lang ninja:build python:3.6+
 USE_PYTHON=	autoplist cython distutils
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}/libpdalpython*.so
 	${PYTHON_CMD} -m compileall -d ${PYTHON_SITELIBDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}
 	${PYTHON_CMD} -O -m compileall -d ${PYTHON_SITELIBDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}
 
 do-test:
 	@cd ${WRKSRC} && py.test -v test
 
 .include <bsd.port.mk>
diff --git a/math/py-petsc4py/Makefile b/math/py-petsc4py/Makefile
index 0b5d0bea11ea..b40e438b9ed1 100644
--- a/math/py-petsc4py/Makefile
+++ b/math/py-petsc4py/Makefile
@@ -1,38 +1,39 @@
 PORTNAME=	petsc4py
 DISTVERSION=	3.18.5
+PORTREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	PETSc for Python
 WWW=		https://gitlab.com/petsc/petsc
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.rst
 
 BROKEN=		the upstream failed to update petsc4py on PYPI, it also breaks with pythran-0.12.0, see bug#270507
 
 BUILD_DEPENDS=	${PYNUMPY}
 LIB_DEPENDS=	libpetsc.so:science/PETSc
 RUN_DEPENDS=	${PYNUMPY}
 
 USES=		python:3.6+
 USE_PYTHON=	distutils autoplist pytest # tests fail to run, see https://gitlab.com/petsc/petsc/-/issues/1301
 
 MAKE_ENV=	PETSC_DIR=${LOCALBASE}
 
 OPTIONS_SINGLE=		MPI
 OPTIONS_SINGLE_MPI=	MPICH OPENMPI
 OPTIONS_DEFAULT=	MPICH
 
 MPICH_USES=		mpi:mpich
 
 OPENMPI_USES=		mpi:openmpi
 
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/petsc4py/lib/PETSc${PYTHON_EXT_SUFFIX}.so
 
 .include <bsd.port.mk>
diff --git a/math/py-point-annotator/Makefile b/math/py-point-annotator/Makefile
index 51dab39852a1..6bc5a2f1ce1e 100644
--- a/math/py-point-annotator/Makefile
+++ b/math/py-point-annotator/Makefile
@@ -1,24 +1,25 @@
 PORTNAME=	point-annotator
 PORTVERSION=	2.0.0
+PORTREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Annotate data with labels based on the Mann-Whitney U test
 WWW=		https://fri.uni-lj.si/en/laboratory/biolab
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR}
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_PYTHON=	autoplist distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/math/py-pplpy/Makefile b/math/py-pplpy/Makefile
index 7ea10a20200a..37ea58f7eda3 100644
--- a/math/py-pplpy/Makefile
+++ b/math/py-pplpy/Makefile
@@ -1,49 +1,49 @@
 PORTNAME=	pplpy
 PORTVERSION=	0.8.7
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Python wrapper to the C++ Parma Polyhedra Library (PPL)
 WWW=		https://www.labri.fr/perso/vdelecro/pplpy/latest/
 
 LICENSE=	GPLv3
 
 BROKEN_aarch64=	runaway build, 7200 seconds with no output
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gmpy2>0:math/py-gmpy2@${PY_FLAVOR}	\
 		${PYTHON_PKGNAMEPREFIX}cysignals>0:devel/py-cysignals@${PY_FLAVOR}
 LIB_DEPENDS=	libgmp.so:math/gmp	\
 		libmpfr.so:math/mpfr	\
 		libmpc.so:math/mpc	\
 		libpari.so:math/pari	\
 		libppl.so:devel/ppl
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gmpy2>0:math/py-gmpy2@${PY_FLAVOR}	\
 		${PYTHON_PKGNAMEPREFIX}cysignals>0:devel/py-cysignals@${PY_FLAVOR}
 TEST_DEPENDS=	py.test:devel/py-pytest@${PY_FLAVOR}
 
 USES=		compiler:c++11-lang localbase python:3.6+
 USE_PYTHON=	cython distutils
 
 .if !defined(WITH_DEBUG)
 LDFLAGS+=	-s
 .endif
 
 OPTIONS_DEFINE=		DOCS
 DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR}
 DOCS_USES=		gmake
 PORTDOCS=		*
 
 do-build-DOCS-on:
 	(cd ${WRKSRC}/docs && ${GMAKE} html)
 
 post-build-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${CP} -R ${WRKSRC}/docs/build/html/* ${STAGEDIR}${DOCSDIR}
 
 do-test: install
 	(cd ${WRKSRC} && py.test)
 
 .include <bsd.port.mk>
diff --git a/math/py-primme/Makefile b/math/py-primme/Makefile
index d553001d7ac6..7a80981e675d 100644
--- a/math/py-primme/Makefile
+++ b/math/py-primme/Makefile
@@ -1,31 +1,32 @@
 PORTNAME=	primme
 DISTVERSION=	3.2.1
+PORTREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	PRIMME wrapper for Python
 WWW=		https://www.cs.wm.edu/~andreas/software/
 
 LICENSE=	BSD3CLAUSE
 
 BUILD_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR}
 LIB_DEPENDS=	libprimme.so:math/primme
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${PY_FLAVOR}
 
 USES=		fortran gmake localbase:ldflags python:3.6+ shebangfix
 USE_PYTHON=	distutils cython autoplist
 
 TEST_TARGET=	test
 
 BINARY_ALIAS=	python2=${PYTHON_CMD}
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/primme${PYTHON_EXT_SUFFIX}.so
 
 .include <bsd.port.mk>
diff --git a/math/py-py-find-1st/Makefile b/math/py-py-find-1st/Makefile
index eef559cbe2ba..1a3e816016fd 100644
--- a/math/py-py-find-1st/Makefile
+++ b/math/py-py-find-1st/Makefile
@@ -1,28 +1,28 @@
 PORTNAME=	py-find-1st
 DISTVERSION=	1.1.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	${PORTNAME:S/-/_/g}-${PORTVERSION}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Numpy extension module for efficient search in numpy arrays
 WWW=		https://github.com/roebel/py_find_1st
 
 LICENSE=	GPLv3
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=46.4.0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYNUMPY}
 
 USES=		python:3.6+
 USE_PYTHON=	pep517 autoplist pytest # tests are broken, see https://github.com/roebel/py_find_1st/issues/13
 
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/utils_find_1st/find_1st${PYTHON_EXT_SUFFIX}.so
 
 .include <bsd.port.mk>
diff --git a/math/py-pyFFTW/Makefile b/math/py-pyFFTW/Makefile
index a5b92565c77a..157952e5dd1e 100644
--- a/math/py-pyFFTW/Makefile
+++ b/math/py-pyFFTW/Makefile
@@ -1,25 +1,26 @@
 PORTNAME=	pyFFTW
 DISTVERSION=	0.13.0
+PORTREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Pythonic wrapper around FFTW, the FFT library
 WWW=		https://hgomersall.github.io/pyFFTW/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 PY_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}dask>=1.0.0:devel/py-dask@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=1.2.0:science/py-scipy@${PY_FLAVOR}
 BUILD_DEPENDS=	${PY_DEPENDS}
 LIB_DEPENDS=	libfftw3.so:math/fftw3 \
 		libfftw3f.so:math/fftw3-float
 RUN_DEPENDS=	${PY_DEPENDS}
 
 USES=		python:3.8+ localbase:ldflags
 USE_PYTHON=	distutils cython autoplist
 
 .include <bsd.port.mk>
diff --git a/math/py-pyaudi/Makefile b/math/py-pyaudi/Makefile
index 807c9b3faac3..a606a9f3f4e0 100644
--- a/math/py-pyaudi/Makefile
+++ b/math/py-pyaudi/Makefile
@@ -1,47 +1,47 @@
 PORTNAME=	pyaudi
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.9.2-1
-PORTREVISION=	1
+PORTREVISION=	2
 DISTVERSIONSUFFIX=	-g899eb78
 CATEGORIES=	math
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Library implementing the algebra of Taylor polynomials
 WWW=		http://darioizzo.github.io/audi/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/../LICENSE
 
 BROKEN_i386=	fails to compile, see https://github.com/darioizzo/audi/issues/62
 
 BUILD_DEPENDS=	audi>0:math/audi \
 		pybind11>0:devel/pybind11
 LIB_DEPENDS=	libabsl_base.so:devel/abseil \
 		libboost_serialization.so:devel/boost-libs \
 		libfmt.so:devel/libfmt \
 		libgmp.so:math/gmp \
 		libmp++.so:math/mppp \
 		libmpc.so:math/mpc \
 		libmpfr.so:math/mpfr \
 		libobake.so:math/obake \
 		libtbb.so:devel/onetbb
 
 USES=		cmake:testing compiler:c++20-lang python
 USE_PYTHON=	flavors
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	darioizzo
 GH_PROJECT=	audi
 
 WRKSRC_SUBDIR=	pyaudi
 
 CMAKE_OFF=	AUDI_BUILD_TESTS
 CMAKE_ARGS=	-DPYTHON_VERSION_MAJOR=3
 
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 
 do-test:
 	@${SETENV} ${TEST_ENV} ${PYTHON_CMD} ${FILESDIR}/test.py
 
 .include <bsd.port.mk>
diff --git a/math/py-pygsl/Makefile b/math/py-pygsl/Makefile
index a012404752d3..d2675b69fc9f 100644
--- a/math/py-pygsl/Makefile
+++ b/math/py-pygsl/Makefile
@@ -1,26 +1,27 @@
 PORTNAME=	pygsl
 PORTVERSION=	2.3.3
+PORTREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Python interface to GNU Scientific Library
 WWW=		https://github.com/pygsl/pygsl
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=0,1:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 LIB_DEPENDS=	libgsl.so:math/gsl
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=0,1:math/py-numpy@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	autoplist concurrent pep517
 
 post-install:
 	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' -exec ${STRIP_CMD} {} +
 
 .include <bsd.port.mk>
diff --git a/math/py-pygslodeiv2/Makefile b/math/py-pygslodeiv2/Makefile
index 09b9349c15a1..7f689992fe1d 100644
--- a/math/py-pygslodeiv2/Makefile
+++ b/math/py-pygslodeiv2/Makefile
@@ -1,25 +1,25 @@
 PORTNAME=	pygslodeiv2
 DISTVERSION=	0.9.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Python binding for odeiv2 in GNU Scientific Library (GSL)
 WWW=		https://github.com/bjodah/pygslodeiv2
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYNUMPY}
 LIB_DEPENDS=	libgsl.so:math/gsl
 RUN_DEPENDS=	${PYNUMPY}
 
 USES=		compiler:c++11-lang localbase python:3.6+ pytest
 USE_PYTHON=	distutils autoplist
 
 pre-test:
 	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} build_ext --inplace
 
 .include <bsd.port.mk>
diff --git a/math/py-pyhdfe/Makefile b/math/py-pyhdfe/Makefile
index 895faaac5075..7bf4a765b465 100644
--- a/math/py-pyhdfe/Makefile
+++ b/math/py-pyhdfe/Makefile
@@ -1,26 +1,27 @@
 PORTNAME=	pyhdfe
 DISTVERSION=	0.1.2
+PORTREVISION=	1
 CATEGORIES=	math python # statistics
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	High dimensional fixed effect absorption
 WWW=		https://github.com/jeffgortmaker/pyhdfe
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 PY_DEPENDS=	${PYNUMY} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=1.0.0:science/py-scipy@${PY_FLAVOR}
 BUILD_DEPENDS=	${PY_DEPENDS}
 RUN_DEPENDS=	${PY_DEPENDS}
 
 USES=		python:3.7+
 USE_PYTHON=	distutils autoplist pytest
 
 NO_ARCH=	yes
 
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 
 .include <bsd.port.mk>
diff --git a/math/py-pyhull/Makefile b/math/py-pyhull/Makefile
index f33afa3c43ce..d73ae7a7f4f3 100644
--- a/math/py-pyhull/Makefile
+++ b/math/py-pyhull/Makefile
@@ -1,24 +1,24 @@
 PORTNAME=	pyhull
 DISTVERSION=	2015.2.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Computation of convex hull, Delaunay triangulation and Voronoi diagram
 WWW=		https://pypi.org/project/pyhull/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.rst
 
 BUILD_DEPENDS=	${PYNUMPY}
 RUN_DEPENDS=	${PYNUMPY}
 
 USES=		python:3.6+
 USE_PYTHON=	autoplist distutils
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/pyhull/_pyhull*.so
 
 .include <bsd.port.mk>
diff --git a/math/py-pymc3/Makefile b/math/py-pymc3/Makefile
index 382ec3587c3c..24c470f7130c 100644
--- a/math/py-pymc3/Makefile
+++ b/math/py-pymc3/Makefile
@@ -1,36 +1,37 @@
 PORTNAME=	pymc3
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.11.5
+PORTREVISION=	1
 CATEGORIES=	math python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Probabilistic programming in Python
 WWW=		https://docs.pymc.io/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}arviz>=0.11.0:math/py-arviz@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cachetools>=4.2.1:devel/py-cachetools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}deprecat>0:devel/py-deprecat@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dill>0:devel/py-dill@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}fastprogress>=0.2.0:devel/py-fastprogress@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pandas>=0.24.0:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}patsy>=0.5.1:math/py-patsy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=1.7.3:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}semver>=2.13.0:devel/py-semver@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}theano>0:math/py-theano@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}typing-extensions>=3.7.4:devel/py-typing-extensions@${PY_FLAVOR}
 
 USES=		python:3.8+
 USE_GITHUB=	yes
 GH_ACCOUNT=	pymc-devs
 USE_PYTHON=	distutils concurrent autoplist
 
 WRKSRC=		${WRKDIR}/pymc-${DISTVERSION}
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/math/py-pyneqsys/Makefile b/math/py-pyneqsys/Makefile
index 5b6197a20e0b..6ddd32651281 100644
--- a/math/py-pyneqsys/Makefile
+++ b/math/py-pyneqsys/Makefile
@@ -1,24 +1,25 @@
 PORTNAME=	pyneqsys
 DISTVERSION=	0.5.7
+PORTREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Solver of symbolically defined systems of non-linear equations
 WWW=		https://github.com/bjodah/pyneqsys
 
 LICENSE=	BSD2CLAUSE
 
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sym>=0.3.1:math/py-sym@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sympy>=1.3:math/py-sympy@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	distutils autoplist
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/math/py-pynleq2/Makefile b/math/py-pynleq2/Makefile
index 44ab95657806..5ec81ed90144 100644
--- a/math/py-pynleq2/Makefile
+++ b/math/py-pynleq2/Makefile
@@ -1,37 +1,37 @@
 PORTNAME=	pynleq2
 DISTVERSION=	0.0.2
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Python binding for NLEQ2 algorithm's fortran implementation
 WWW=		https://github.com/bjodah/pynleq2
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYNUMPY}
 
 USES=		fortran python:3.6+
 USE_PYTHON=	distutils autoplist
 USE_GITHUB=	nodefault
 GH_TUPLE=	PySCeS:pysces:0.9.8:fortran
 
 FORTRAN_FILES=	linalg_nleq2.f nleq2.f wnorm.f zibconst.f zibmon.f zibsec.f
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/setup.py
 
 pre-build: # compile fortran files into a static library because distutils fails while doing this
 	@${MKDIR} ${WRKDIR}/.fbuild && \
 		cd ${WRKDIR}/.fbuild && \
 		${FC} -c ${CFLAGS} -fPIC ${FORTRAN_FILES:C,^,${WRKSRC_fortran}/pysces/nleq2/,} && \
 		${AR} -qc libff.a ${FORTRAN_FILES:S/.f/.o/}
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME}/nleq2*.so
 
 .include <bsd.port.mk>
diff --git a/math/py-pynndescent/Makefile b/math/py-pynndescent/Makefile
index 044909079c95..73ba5c9e610d 100644
--- a/math/py-pynndescent/Makefile
+++ b/math/py-pynndescent/Makefile
@@ -1,26 +1,27 @@
 PORTNAME=	pynndescent
 DISTVERSION=	0.5.9
+PORTREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Python nearest neighbor descent for approximate nearest neighbors
 WWW=		https://github.com/lmcinnes/pynndescent
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}joblib>0.11:devel/py-joblib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}llvmlite>=0.30:devel/py-llvmlite@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numba>=0.51.2:devel/py-numba@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-learn>=0.18:science/py-scikit-learn@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=1.0:science/py-scipy@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_PYTHON=	distutils autoplist pytest # tests fail to run, see https://github.com/lmcinnes/pynndescent/issues/216
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/math/py-pyodeint/Makefile b/math/py-pyodeint/Makefile
index 558800934f2a..82463547125c 100644
--- a/math/py-pyodeint/Makefile
+++ b/math/py-pyodeint/Makefile
@@ -1,22 +1,22 @@
 PORTNAME=	pyodeint
 DISTVERSION=	0.10.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Python binding for odeint from boost
 WWW=		https://github.com/bjodah/pyodeint
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYNUMPY} \
 		${LOCALBASE}/include/boost/config.hpp:devel/boost-libs
 RUN_DEPENDS=	${PYNUMPY}
 
 USES=		compiler:c++11-lang localbase python:3.6+
 USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/math/py-pyodesys/Makefile b/math/py-pyodesys/Makefile
index e37e06e3e4c2..d4deded101f3 100644
--- a/math/py-pyodesys/Makefile
+++ b/math/py-pyodesys/Makefile
@@ -1,43 +1,44 @@
 PORTNAME=	pyodesys
 DISTVERSION=	0.14.1
+PORTREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Straightforward numerical integration of ODE systems from Python
 WWW=		https://github.com/bjodah/pyodesys
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>=2.2.5:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}notebook>=5.7.8:www/py-notebook@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=1.2.3:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sym>=0.3.4:math/py-sym@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sympy>=1.5.1:math/py-sympy@${PY_FLAVOR}
 TEST_DEPENDS=	${LOCALBASE}/include/boost/numeric/ublas/matrix.hpp:devel/boost-libs \
 		${LOCALBASE}/include/gsl/gsl_errno.h:math/gsl
 
 USES=		display:test localbase:ldflags python:3.7+ shebangfix pytest
 USE_PYTHON=	distutils autoplist
 
 SHEBANG_GLOB=	*.py
 
 NO_ARCH=	yes
 
 BINARY_ALIAS=	python3=${PYTHON_CMD}
 
 OPTIONS_DEFINE=		EXTRAS
 OPTIONS_DEFAULT=	EXTRAS
 
 EXTRAS_DESC=		Install optional dependencies for additional functionality
 EXTRAS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}appdirs>0:devel/py-appdirs@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}pycodeexport>=0.1.2:devel/py-pycodeexport@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}pycompilation>=0.4.9:devel/py-pycompilation@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}pygslodeiv2>=0.9.1:math/py-pygslodeiv2@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}pyodeint>=0.10.1:math/py-pyodeint@${PY_FLAVOR}
 			# TODO pycvodes>=0.13.1 - doesn't build with sundials
 
 .include <bsd.port.mk>
diff --git a/math/py-pyreadr/Makefile b/math/py-pyreadr/Makefile
index 56dd7d4cf240..5bcf10ffd3d2 100644
--- a/math/py-pyreadr/Makefile
+++ b/math/py-pyreadr/Makefile
@@ -1,27 +1,28 @@
 PORTNAME=	pyreadr
 PORTVERSION=	0.4.7
+PORTREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Read/write R RData and Rds files into/from pandas data frames
 WWW=		https://github.com/ofajardo/pyreadr
 
 LICENSE=	AGPLv3+
 
 LIB_DEPENDS=	librdata.so:math/librdata
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pandas>=1.2.0,1:math/py-pandas@${PY_FLAVOR}
 
 USES=		localbase python
 USE_PYTHON=	autoplist concurrent cython distutils
 
 post-patch:
 # Clean up bundled libraries
 	@${RM} -r ${WRKSRC}/pyreadr/libs/
 	@${RM} -r ${WRKSRC}/win_libs/
 
 post-install:
 	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' -exec ${STRIP_CMD} {} +
 
 .include <bsd.port.mk>
diff --git a/math/py-pyrr/Makefile b/math/py-pyrr/Makefile
index 2453c7dd3711..271279dcfda0 100644
--- a/math/py-pyrr/Makefile
+++ b/math/py-pyrr/Makefile
@@ -1,29 +1,30 @@
 PORTNAME=	pyrr
 DISTVERSION=	0.10.3
+PORTREVISION=	1
 CATEGORIES=	math
 #MASTER_SITES=	PYPI # no tests
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	3D mathematical functions using NumPy
 WWW=		https://github.com/adamlwgriffiths/Pyrr
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}multipledispatch>0:devel/py-multipledispatch@${PY_FLAVOR} \
 		${PYNUMPY}
 
 USES=		python
 USE_PYTHON=	distutils autoplist pytest
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	adamlwgriffiths
 GH_PROJECT=	Pyrr
 
 NO_ARCH=	yes
 
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 TEST_WRKSRC=	${WRKSRC}/tests
 
 .include <bsd.port.mk>
diff --git a/math/py-pystan/Makefile b/math/py-pystan/Makefile
index 27614c4710b7..49c000839c65 100644
--- a/math/py-pystan/Makefile
+++ b/math/py-pystan/Makefile
@@ -1,38 +1,38 @@
 PORTNAME=	pystan
 PORTVERSION=	2.19.0.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	gmm@tutanota.com
 COMMENT=	Python interface for Stan
 WWW=		https://github.com/stan-dev/pystan
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		compiler:c++14-lang python:3.6+ shebangfix
 USE_PYTHON=	autoplist distutils
 
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} >= 30900
 # See PR 262797 - to be upgraded after the modernization of OCaml ports
 BROKEN=		several build errors
 .endif
 
 BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}cython>0:lang/cython@${PY_FLAVOR}
 BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy@${PY_FLAVOR}
 
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}cython>0:lang/cython@${PY_FLAVOR}
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy@${PY_FLAVOR}
 
 SHEBANG_FILES=	${WRKSRC}/pystan/stan/lib/stan_math/lib/upgrade-sundials.sh \
 		${WRKSRC}/pystan/stan/lib/stan_math/hooks/pre-commit \
 		${WRKSRC}/pystan/stan/lib/stan_math/runTests.py \
 
 NO_ARCH=	yes
 NO_ARCH_IGNORE=	_api.so _chains.so _misc.so
 
 .include <bsd.port.post.mk>
diff --git a/math/py-pysym/Makefile b/math/py-pysym/Makefile
index 99a05c48d056..6e2aaf22602a 100644
--- a/math/py-pysym/Makefile
+++ b/math/py-pysym/Makefile
@@ -1,22 +1,22 @@
 PORTNAME=	pysym
 DISTVERSION=	0.2.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Prototype package for symbolic manipulation
 WWW=		https://github.com/bjodah/pysym
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sympy>0:math/py-sympy@${PY_FLAVOR} \
 		${PYNUMPY}
 
 USES=		python:3.5+
 USE_PYTHON=	distutils autoplist
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/math/py-python-fcl/Makefile b/math/py-python-fcl/Makefile
index 646a36482bbd..c30e003584eb 100644
--- a/math/py-python-fcl/Makefile
+++ b/math/py-python-fcl/Makefile
@@ -1,29 +1,29 @@
 PORTNAME=	python-fcl
 PORTVERSION=	0.0.12
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	db@FreeBSD.org
 COMMENT=	Python bindings for the Flexible Collision Library
 WWW=		https://libraries.io/pypi/python-fcl
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libfcl05.so:math/fcl05 \
 		liboctomap.so:math/octomap
 BUILD_DEPENDS=	${PYNUMPY}
 RUN_DEPENDS=	${PYNUMPY}
 
 USES=		compiler:c++11-lang eigen:3 python:3.6+
 
 USE_PYTHON=	distutils autoplist concurrent cython
 
 PYDISTUTILS_BUILD_TARGET=	build_ext
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/fcl/fcl*.so
 
 .include <bsd.port.mk>
diff --git a/math/py-python-igraph/Makefile b/math/py-python-igraph/Makefile
index f596b4315e6f..1dc04803f3c6 100644
--- a/math/py-python-igraph/Makefile
+++ b/math/py-python-igraph/Makefile
@@ -1,31 +1,31 @@
 PORTNAME=	python-igraph # it has been renamed to igraph
 DISTVERSION=	0.9.9
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	igraph-${PORTVERSION}
 
 MAINTAINER=	lwhsu@FreeBSD.org
 COMMENT=	High performance graph data structures and algorithms
 WWW=		https://igraph.org/python/
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	cmake:devel/cmake-core
 LIB_DEPENDS=	libigraph.so:math/igraph
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}texttable>=1.6.2:textproc/py-texttable@${PY_FLAVOR}	\
 		${PYTHON_PKGNAMEPREFIX}cairocffi>0:graphics/py-cairocffi@${PY_FLAVOR}
 TEST_DEPENDS=	py.test:devel/py-pytest@${PY_FLAVOR}
 
 USES=		bison gnome pkgconfig python:3.6+
 USE_PYTHON=	distutils concurrent autoplist
 USE_GNOME=	libxml2
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/igraph/_igraph${PYTHON_EXT_SUFFIX}.so
 
 do-test: install
 	(cd ${WRKSRC} && py.test)
 
 .include <bsd.port.mk>
diff --git a/math/py-python-louvain/Makefile b/math/py-python-louvain/Makefile
index f8583a1ce3f2..d8b11a1dab31 100644
--- a/math/py-python-louvain/Makefile
+++ b/math/py-python-louvain/Makefile
@@ -1,21 +1,22 @@
 PORTNAME=	python-louvain
 DISTVERSION=	0.16
+PORTREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Louvain algorithm for community detection
 WWW=		https://github.com/taynaud/python-louvain
 
 LICENSE=	BSD3CLAUSE
 
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}networkx>0:math/py-networkx@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_PYTHON=	distutils concurrent autoplist
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/math/py-python-picard/Makefile b/math/py-python-picard/Makefile
index 2ef15aacaa0b..949d50ab2313 100644
--- a/math/py-python-picard/Makefile
+++ b/math/py-python-picard/Makefile
@@ -1,26 +1,27 @@
 PORTNAME=	python-picard
 DISTVERSION=	0.7
+PORTREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Preconditoned ICA algorithm for Real Data
 WWW=		https://pierreablin.github.io/picard/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYNUMPY}
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numexpr>0:math/py-numexpr@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-learn>0:science/py-scikit-learn@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	distutils concurrent autoplist
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/math/py-pytorchvideo/Makefile b/math/py-pytorchvideo/Makefile
index afc3c4e458ee..b90e61b294ff 100644
--- a/math/py-pytorchvideo/Makefile
+++ b/math/py-pytorchvideo/Makefile
@@ -1,23 +1,24 @@
 PORTNAME=	pytorchvideo
 PORTVERSION=	0.1.5
+PORTREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Video understanding deep learning library
 WWW=		https://github.com/facebookresearch/pytorchvideo
 
 LICENSE=	APACHE20
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}av>0:multimedia/py-av@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}fvcore>0:math/py-fvcore@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}iopath>0:devel/py-iopath@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}parameterized>0:devel/py-parameterized@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/math/py-qdldl/Makefile b/math/py-qdldl/Makefile
index 98308436c4cf..c6dfd461d532 100644
--- a/math/py-qdldl/Makefile
+++ b/math/py-qdldl/Makefile
@@ -1,32 +1,33 @@
 PORTNAME=	qdldl
 PORTVERSION=	0.1.5.post2
+PORTREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	QDLDL free LDL factorization routine for linear systems: Ax = b
 WWW=		https://github.com/oxfordcontrol/qdldl-python/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_armv7=	error: no matching function for call to 'amd_l_order', see https://github.com/oxfordcontrol/qdldl-python/issues/15
 BROKEN_i386=	error: no matching function for call to 'amd_l_order', see https://github.com/oxfordcontrol/qdldl-python/issues/15
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pybind11>0:devel/py-pybind11@${PY_FLAVOR} \
 		cmake:devel/cmake-core
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=0.13.2:science/py-scipy@${PY_FLAVOR}
 TEST_DEPENDS=	pytest:devel/py-pytest@${PY_FLAVOR}
 
 USES=		compiler:c++11-lang python:3.6+
 USE_PYTHON=	distutils autoplist
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/qdldl.cpython-*.so
 
 do-test: install
 	@cd ${WRKSRC} && pytest
 
 .include <bsd.port.mk>
diff --git a/math/py-quadprog/Makefile b/math/py-quadprog/Makefile
index 0788be0fd6aa..1a0aab4c33b8 100644
--- a/math/py-quadprog/Makefile
+++ b/math/py-quadprog/Makefile
@@ -1,18 +1,19 @@
 PORTNAME=	quadprog
 DISTVERSION=	0.1.11
+PORTREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Quadratic programming package
 WWW=		https://pypi.org/project/quadprog/
 
 LICENSE=	GPLv2+
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=1.2,1:math/py-numpy@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_PYTHON=	distutils autoplist cython
 
 .include <bsd.port.mk>
diff --git a/math/py-rpy2/Makefile b/math/py-rpy2/Makefile
index 9aa574230a27..61cf8c6fb686 100644
--- a/math/py-rpy2/Makefile
+++ b/math/py-rpy2/Makefile
@@ -1,46 +1,47 @@
 PORTNAME=	rpy2
 PORTVERSION=	3.5.11
+PORTREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Python interface to the R Programming Language
 WWW=		https://rpy2.bitbucket.io/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/gpl-2.0.txt
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cffi>=1.10.0:devel/py-cffi@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}setuptools>=61:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 LIB_DEPENDS=	libR.so:math/R \
 		libicui18n.so:devel/icu \
 		libpcre2-8.so:devel/pcre2
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cffi>=1.10.0:devel/py-cffi@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytz>=0,1:devel/py-pytz@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tzlocal>=0:devel/py-tzlocal@${PY_FLAVOR}
 
 USES=		compiler:c11 fortran python:3.7+ readline
 USE_PYTHON=	autoplist concurrent pep517
 
 MAKE_ENV=	RPY2_CFFI_MODE=BOTH
 
 OPTIONS_DEFINE=	PANDAS
 OPTIONS_DEFAULT=PANDAS
 PANDAS_DESC=	Pandas support
 
 PANDAS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=0,1:math/py-numpy@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}pandas>=1.3.5,1:math/py-pandas@${PY_FLAVOR}
 
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} < 30800
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}typing-extensions>=0:devel/py-typing-extensions@${PY_FLAVOR}
 .endif
 
 post-install:
 	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' -exec ${STRIP_CMD} {} +
 
 .include <bsd.port.post.mk>
diff --git a/math/py-rustworkx/Makefile b/math/py-rustworkx/Makefile
index b1bdd9b0a20b..9f95888eb31c 100644
--- a/math/py-rustworkx/Makefile
+++ b/math/py-rustworkx/Makefile
@@ -1,115 +1,115 @@
 PORTNAME=	rustworkx
 DISTVERSION=	0.12.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	math python
 #MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	High performance Python graph library implemented in Rust
 WWW=		https://github.com/Qiskit/rustworkx
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools-rust>0:devel/py-setuptools-rust@${PY_FLAVOR}
 RUN_DEPENDS=	${PYNUMPY}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}matplotlib>=3.0:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pillow>=5.4:graphics/py-pillow@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tox>0:devel/py-tox@${PY_FLAVOR}
 
 USES=		cargo python:3.7+
 USE_PYTHON=	autoplist distutils
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Qiskit
 
 CARGO_CRATES=	ahash-0.7.6 \
 		autocfg-1.1.0 \
 		bitflags-1.3.2 \
 		cfg-if-1.0.0 \
 		crossbeam-channel-0.5.4 \
 		crossbeam-deque-0.8.1 \
 		crossbeam-epoch-0.9.8 \
 		crossbeam-utils-0.8.8 \
 		either-1.6.1 \
 		fixedbitset-0.4.2 \
 		getrandom-0.2.6 \
 		hashbrown-0.11.2 \
 		hermit-abi-0.1.19 \
 		indexmap-1.7.0 \
 		indoc-1.0.6 \
 		instant-0.1.12 \
 		itoa-1.0.2 \
 		lazy_static-1.4.0 \
 		libc-0.2.126 \
 		lock_api-0.4.7 \
 		matrixmultiply-0.2.4 \
 		memchr-2.5.0 \
 		memoffset-0.6.5 \
 		ndarray-0.13.1 \
 		num-bigint-0.4.3 \
 		num-complex-0.2.4 \
 		num-complex-0.4.1 \
 		num-integer-0.1.45 \
 		num-traits-0.2.15 \
 		num_cpus-1.13.1 \
 		numpy-0.17.2 \
 		once_cell-1.12.0 \
 		parking_lot-0.11.2 \
 		parking_lot_core-0.8.5 \
 		petgraph-0.6.2 \
 		ppv-lite86-0.2.16 \
 		priority-queue-1.2.0 \
 		proc-macro2-1.0.39 \
 		pyo3-0.17.3 \
 		pyo3-build-config-0.17.3 \
 		pyo3-ffi-0.17.3 \
 		pyo3-macros-0.17.3 \
 		pyo3-macros-backend-0.17.3 \
 		quick-xml-0.22.0 \
 		quote-1.0.18 \
 		rand-0.8.5 \
 		rand_chacha-0.3.1 \
 		rand_core-0.6.3 \
 		rand_pcg-0.3.1 \
 		rawpointer-0.2.1 \
 		rayon-1.5.3 \
 		rayon-core-1.9.3 \
 		redox_syscall-0.2.13 \
 		ryu-1.0.10 \
 		scopeguard-1.1.0 \
 		serde-1.0.145 \
 		serde_derive-1.0.145 \
 		serde_json-1.0.89 \
 		smallvec-1.8.0 \
 		syn-1.0.96 \
 		target-lexicon-0.12.4 \
 		unicode-ident-1.0.0 \
 		unindent-0.1.9 \
 		version_check-0.9.4 \
 		wasi-0.10.2+wasi-snapshot-preview1 \
 		winapi-0.3.9 \
 		winapi-i686-pc-windows-gnu-0.4.0 \
 		winapi-x86_64-pc-windows-gnu-0.4.0
 
 CARGO_BUILD=	no
 CARGO_INSTALL=	no
 CARGO_TEST=	no
 CARGO_TARGET_DIR=	${WRKSRC}/target
 
 MAKE_ENV=	${CARGO_ENV}
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 TEST_WRKSRC=	${BUILD_WRKDIR}
 
 PLIST_FILES=	${PYTHON_SITELIBDIR}/rustworkx/rustworkx${PYTHON_EXT_SUFFIX}.so # workaround for https://github.com/Qiskit/rustworkx/issues/654
 
 BINARY_ALIAS=	python3=${PYTHON_CMD}
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/rustworkx/rustworkx.cpython-${PYTHON_SUFFIX}.so
 
 do-test:
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} tox -epy
 
 .include <bsd.port.mk>
diff --git a/math/py-rvlib/Makefile b/math/py-rvlib/Makefile
index 96c1ead116f2..4e734aff1b33 100644
--- a/math/py-rvlib/Makefile
+++ b/math/py-rvlib/Makefile
@@ -1,27 +1,28 @@
 PORTNAME=	rvlib
 PORTVERSION=	0.0.6
+PORTREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Probability distributions mimicking Distrbutions.jl
 WWW=		https://github.com/QuantEcon/rvlib
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cffi>=1.0.0:devel/py-cffi@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cffi>=1.0.0:devel/py-cffi@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numba>=0.49:devel/py-numba@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpy>=0,1:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	autoplist concurrent distutils
 
 post-install:
 	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' -exec ${STRIP_CMD} {} +
 
 .include <bsd.port.mk>
diff --git a/math/py-scikit-umfpack/Makefile b/math/py-scikit-umfpack/Makefile
index b500ef6f1341..f964eac86fdc 100644
--- a/math/py-scikit-umfpack/Makefile
+++ b/math/py-scikit-umfpack/Makefile
@@ -1,33 +1,34 @@
 PORTNAME=	scikit-umfpack
 DISTVERSION=	0.3.3
+PORTREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Python interface to UMFPACK sparse direct solver
 WWW=		https://scikit-umfpack.github.io/scikit-umfpack/
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN=		does not build with SuiteSparse 6 # https://github.com/scikit-umfpack/scikit-umfpack/issues/78
 
 BUILD_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \
 		swig:devel/swig
 LIB_DEPENDS=	libamd.so:math/suitesparse-amd \
 		libopenblas.so:math/openblas \
 		libumfpack.so:math/suitesparse-umfpack
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_PYTHON=	distutils cython autoplist pytest # tests fail, see https://github.com/scikit-umfpack/scikit-umfpack/issues/77
 
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/scikits/umfpack/__umfpack${PYTHON_EXT_SUFFIX}.so
 
 .include <bsd.port.mk>
diff --git a/math/py-scs/Makefile b/math/py-scs/Makefile
index 1e8e156227bb..f6a3cc3ece9a 100644
--- a/math/py-scs/Makefile
+++ b/math/py-scs/Makefile
@@ -1,27 +1,28 @@
 PORTNAME=	scs
 DISTVERSION=	3.2.0
+PORTREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Splitting conic solver for Python
 WWW=		https://github.com/cvxgrp/scs
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYNUMPY}
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=0.13.2:science/py-scipy@${PY_FLAVOR}
 
 USES=		python:3.6+ blaslapack:openblas fortran # fortran is for openblas
 USE_PYTHON=	distutils autoplist
 
 CONFIGURE_ENV=	BLAS_LAPACK_LIBS="openblas"
 MAKE_ENV=	${CONFIGURE_ENV}
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/_scs_*.so
 
 .include <bsd.port.mk>
diff --git a/math/py-seaborn/Makefile b/math/py-seaborn/Makefile
index 0756981e7ccd..2070a43e5cad 100644
--- a/math/py-seaborn/Makefile
+++ b/math/py-seaborn/Makefile
@@ -1,25 +1,26 @@
 PORTNAME=	seaborn
 PORTVERSION=	0.11.2
+PORTREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	FreeBSD@Shaneware.biz
 COMMENT=	Statistical data visualization
 WWW=		https://seaborn.pydata.org/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}patsy>0:math/py-patsy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}statsmodels>0:math/py-statsmodels@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	autoplist distutils
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/math/py-seriate/Makefile b/math/py-seriate/Makefile
index d5736f8ec0f3..ac287269cf4c 100644
--- a/math/py-seriate/Makefile
+++ b/math/py-seriate/Makefile
@@ -1,25 +1,26 @@
 PORTNAME=	seriate
 DISTVERSION=	1.1.2
+PORTREVISION=	1
 CATEGORIES=	math python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Optimal ordering of elements in a set given their distance matrix
 WWW=		https://github.com/src-d/seriate
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}or-tools>0:math/py-or-tools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR}
 
 USES=		python:3.5+
 USE_GITHUB=	yes
 GH_ACCOUNT=	src-d
 USE_PYTHON=	distutils autoplist
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/math/py-slepc4py/Makefile b/math/py-slepc4py/Makefile
index 45466c3b8536..6991a617c541 100644
--- a/math/py-slepc4py/Makefile
+++ b/math/py-slepc4py/Makefile
@@ -1,32 +1,33 @@
 PORTNAME=	slepc4py
 DISTVERSION=	3.18.3
+PORTREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	SLEPc for Python
 WWW=		https://bitbucket.org/slepc/slepc4py
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.rst
 
 PY_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}petsc4py>0:math/py-petsc4py@${PY_FLAVOR}
 BUILD_DEPENDS=	${PY_DEPENDS}
 RUN_DEPENDS=	${PY_DEPENDS}
 LIB_DEPENDS=	libmpich.so:net/mpich \
 		libpetsc.so:science/PETSc \
 		libslepc.so:math/slepc
 RUN_DEPENDS=	${PYNUMPY}
 
 USES=		fortran python:3.6+
 USE_PYTHON=	distutils autoplist pytest
 
 MAKE_ENV=	PETSC_DIR=${LOCALBASE} SLEPC_DIR=${LOCALBASE}
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/slepc4py/lib/SLEPc${PYTHON_EXT_SUFFIX}.so
 
 .include <bsd.port.mk>
diff --git a/math/py-snuggs/Makefile b/math/py-snuggs/Makefile
index 3a0ceffd6502..482add36c737 100644
--- a/math/py-snuggs/Makefile
+++ b/math/py-snuggs/Makefile
@@ -1,22 +1,23 @@
 PORTNAME=	snuggs
 PORTVERSION=	1.4.7
+PORTREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	S-expressions for Numpy
 WWW=		https://github.com/mapbox/snuggs
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=0,1:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyparsing>=2.1.6:devel/py-pyparsing@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/math/py-spectral/Makefile b/math/py-spectral/Makefile
index c9a094ce1c95..96f9b448d764 100644
--- a/math/py-spectral/Makefile
+++ b/math/py-spectral/Makefile
@@ -1,21 +1,22 @@
 PORTNAME=	spectral
 DISTVERSION=	0.22.4
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Spectral Python (SPy) is a Python module for hyperspectral image processing
 WWW=		https://www.spectralpython.net/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	${PYNUMPY}
 
 USES=		python:3.6+
 USE_PYTHON=	distutils autoplist
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/math/py-spglm/Makefile b/math/py-spglm/Makefile
index 26754e41283e..ec78944f9fd2 100644
--- a/math/py-spglm/Makefile
+++ b/math/py-spglm/Makefile
@@ -1,23 +1,24 @@
 PORTNAME=	spglm
 PORTVERSION=	1.0.8
+PORTREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Sparse generalize linear models
 WWW=		https://github.com/pysal/spglm
 
 LICENSE=	BSD3CLAUSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}libpysal>=4.0.0:science/py-libpysal@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpy>=1.3,1:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=0.11:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}spreg>=1.0.4:math/py-spreg@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/math/py-spint/Makefile b/math/py-spint/Makefile
index dd4d277a68ce..3134076a1f01 100644
--- a/math/py-spint/Makefile
+++ b/math/py-spint/Makefile
@@ -1,25 +1,26 @@
 PORTNAME=	spint
 PORTVERSION=	1.0.7
+PORTREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	SPatial INTeraction models
 WWW=		https://github.com/pysal/spint
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}libpysal>=4.0.0:science/py-libpysal@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpy>=1.3,1:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=0.11:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}spglm>=1.0.6:math/py-spglm@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}spreg>=0:math/py-spreg@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/math/py-splot/Makefile b/math/py-splot/Makefile
index 07809f9365d3..dd15e3503559 100644
--- a/math/py-splot/Makefile
+++ b/math/py-splot/Makefile
@@ -1,31 +1,31 @@
 PORTNAME=	splot
 PORTVERSION=	1.1.5.post1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Visual analytics for spatial analysis with PySAL
 WWW=		https://splot.readthedocs.io/en/latest/ \
 		https://github.com/pysal/splot
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}esda>=0:science/py-esda@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}geopandas>=0.4.0:graphics/py-geopandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}giddy>=0:graphics/py-giddy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}libpysal>=0:science/py-libpysal@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mapclassify>=0:graphics/py-mapclassify@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>=0:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpy>=0,1:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}seaborn>=0:math/py-seaborn@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}spreg>=0:math/py-spreg@${PY_FLAVOR}
 
 USES=		python:3.8+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/math/py-spopt/Makefile b/math/py-spopt/Makefile
index 5ce70d9cecc3..f3d7767e1a9e 100644
--- a/math/py-spopt/Makefile
+++ b/math/py-spopt/Makefile
@@ -1,30 +1,31 @@
 PORTNAME=	spopt
 PORTVERSION=	0.5.0
+PORTREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Spatial Optimization in PySAL
 WWW=		https://github.com/pysal/spopt
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}geopandas>=0.10.0:graphics/py-geopandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}libpysal>=0:science/py-libpysal@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}networkx>=0.1:math/py-networkx@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpy>=1.21,1:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pandas>=1.0.5,1:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}PuLP>=0:math/py-PuLP@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-learn>=0.22:science/py-scikit-learn@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=1.3.2:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}spaghetti>=0:science/py-spaghetti@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tqdm>=4.27.0:misc/py-tqdm@${PY_FLAVOR}
 
 USES=		python:3.8+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/math/py-spreg/Makefile b/math/py-spreg/Makefile
index a6b9f952a77f..5c4437530928 100644
--- a/math/py-spreg/Makefile
+++ b/math/py-spreg/Makefile
@@ -1,26 +1,27 @@
 PORTNAME=	spreg
 PORTVERSION=	1.3.2
+PORTREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	PySAL Spatial Econometrics Package
 WWW=		https://spreg.readthedocs.io/en/latest/ \
 		https://github.com/pysal/spreg
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}libpysal>=4.0.0:science/py-libpysal@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpy>=1.3,1:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pandas>=0,1:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-learn>=0.22:science/py-scikit-learn@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=0.11:science/py-scipy@${PY_FLAVOR}
 
 USES=		python:3.8+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/math/py-spvcm/Makefile b/math/py-spvcm/Makefile
index eb06be558fec..750ee16b3262 100644
--- a/math/py-spvcm/Makefile
+++ b/math/py-spvcm/Makefile
@@ -1,25 +1,26 @@
 PORTNAME=	spvcm
 PORTVERSION=	0.3.0
+PORTREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Fit spatial multilevel models and diagnose convergence
 WWW=		https://github.com/pysal/spvcm
 
 LICENSE=	BSD3CLAUSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}libpysal>=0:science/py-libpysal@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpy>=0,1:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pandas>=0,1:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=0:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}seaborn>=0:math/py-seaborn@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}spreg>=0:math/py-spreg@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/math/py-ssm/Makefile b/math/py-ssm/Makefile
index cc6f6fad5bcc..e5c006edfb5c 100644
--- a/math/py-ssm/Makefile
+++ b/math/py-ssm/Makefile
@@ -1,31 +1,32 @@
 PORTNAME=	ssm
 DISTVERSION=	0.0.1
+PORTREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Bayesian learning and inference for state space models
 WWW=		https://github.com/lindermanlab/ssm
 
 LICENSE=	MIT
 
 PY_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}autograd>0:math/py-autograd@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numba>0:devel/py-numba@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-learn>0:science/py-scikit-learn@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}seaborn>0:math/py-seaborn@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tqdm>0:misc/py-tqdm@${PY_FLAVOR}
 BUILD_DEPENDS=	${PY_DEPENDS}
 RUN_DEPENDS=	${PY_DEPENDS}
 
 USES=		python:3.7+
 USE_PYTHON=	distutils cython concurrent autoplist
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}/*.so
 
 .include <bsd.port.mk>
diff --git a/math/py-statsmodels/Makefile b/math/py-statsmodels/Makefile
index 34b2fd2556d3..c36e43514354 100644
--- a/math/py-statsmodels/Makefile
+++ b/math/py-statsmodels/Makefile
@@ -1,41 +1,42 @@
 PORTNAME=	statsmodels
 PORTVERSION=	0.13.5
+PORTREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Complement to SciPy for statistical computations
 WWW=		https://github.com/statsmodels/statsmodels
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cython>=0.29.26:lang/cython@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpy>=1.17,1:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=1.3:science/py-scipy@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=1.17,1:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}packaging>=21.3:devel/py-packaging@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pandas>=0.25,1:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}patsy>=0.5.2:math/py-patsy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=1.3:science/py-scipy@${PY_FLAVOR}
 
 USES=		python:3.7+ shebangfix
 USE_PYTHON=	autoplist concurrent cython distutils
 
 SHEBANG_GLOB=	*.py
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 post-install:
 	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' -exec ${STRIP_CMD} {} +
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.rst ${WRKSRC}/README_l1.txt ${STAGEDIR}${DOCSDIR}
 
 post-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/math/py-sym/Makefile b/math/py-sym/Makefile
index f75f23bf5f3d..018d85738278 100644
--- a/math/py-sym/Makefile
+++ b/math/py-sym/Makefile
@@ -1,21 +1,22 @@
 PORTNAME=	sym
 DISTVERSION=	0.3.5
+PORTREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Unified wrapper for symbolic manipulation libraries in Python
 WWW=		https://github.com/bjodah/sym
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYNUMPY}
 
 USES=		python:3.6+
 USE_PYTHON=	distutils autoplist
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/math/py-symengine/Makefile b/math/py-symengine/Makefile
index 9684a94c077f..6d4892ea2e7b 100644
--- a/math/py-symengine/Makefile
+++ b/math/py-symengine/Makefile
@@ -1,34 +1,35 @@
 PORTNAME=	symengine
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.10.0
+PORTREVISION=	1
 CATEGORIES=	math python
 #MASTER_SITES=	PYPI # latest release isn't compatible with math/symengine
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Python library providing wrappers to SymEngine
 WWW=		https://symengine.org/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libarb.so:math/arb \
 		libecm.so:math/gmp-ecm \
 		libflint.so:math/flint2 \
 		libgmp.so:math/gmp \
 		libmpc.so:math/mpc \
 		libmpfr.so:math/mpfr \
 		libsymengine.so:math/symengine
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sympy>0:math/py-sympy@${PY_FLAVOR} # see https://github.com/symengine/symengine.py/issues/416
 
 USES=		cmake compiler:c++11-lang python:3.7+
 USE_PYTHON=	cython flavors pytest
 
 USE_GITHUB=	yes
 GH_PROJECT=	symengine.py
 
 BINARY_ALIAS=	python=${PYTHON_CMD} # cmake scripts expect python executable
 
 # cmake scripts copy build type and flags from math/symengine, and ignore all local variables of that kind
 
 .include <bsd.port.mk>
diff --git a/math/py-theano/Makefile b/math/py-theano/Makefile
index 3b64d5f415bc..23737a07bbfc 100644
--- a/math/py-theano/Makefile
+++ b/math/py-theano/Makefile
@@ -1,31 +1,31 @@
 PORTNAME=	theano
 DISTVERSION=	1.0.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	Theano-${DISTVERSION}
 
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	Optimizing compiler for evaluating math expressions on CPUs and GPUs
 WWW=		http://deeplearning.net/software/theano/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=0.8.0:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_PYTHON=	concurrent distutils autoplist
 
 NO_ARCH=	yes
 SUB_FILES=	pkg-message
 SUB_LIST=	CXX=${CXX}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/bin/bash|/bin/sh|; s|python |${PYTHON_CMD} |' \
 		${WRKSRC}/theano/misc/check_blas_many.sh
 
 .include <bsd.port.mk>
diff --git a/math/py-timple/Makefile b/math/py-timple/Makefile
index 751053dda155..c70d84bb5c8d 100644
--- a/math/py-timple/Makefile
+++ b/math/py-timple/Makefile
@@ -1,21 +1,22 @@
 PORTNAME=	timple
 PORTVERSION=	0.1.5
+PORTREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	jgh@FreeBSD.org
 COMMENT=	Extended functionality for plotting timedelta values with Matplotlib
 WWW=		https://github.com/theOehrly/Timple
 
 LICENSE=	MIT
 
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>=0:math/py-matplotlib@${PY_FLAVOR}
 
 USES=	python:3.6+
 USE_PYTHON=	distutils autoplist
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/math/py-topologic/Makefile b/math/py-topologic/Makefile
index f0ad3aeff767..7e15e4269e85 100644
--- a/math/py-topologic/Makefile
+++ b/math/py-topologic/Makefile
@@ -1,38 +1,38 @@
 PORTNAME=	topologic
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.6.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 PKGNAMESUFFIX=	-space-modeling-library
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Library for topological representations of architectural spaces
 WWW=		https://topologic.app/
 
 LICENSE=	AGPLv3
 LICENSE_FILE=	${WRKSRC}/../LICENSE
 
 LIB_DEPENDS=	libTopologicCore.so:math/topologic \
 		libTKernel.so:cad/opencascade
 
 USES=		cmake compiler:c++17-lang localbase:ldflags python
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	wassimj
 GH_PROJECT=	Topologic
 
 WRKSRC_SUBDIR=	Python-Bindings
 
 CXXFLAGS+=	-I${LOCALBASE}/include/OpenCASCADE
 
 PLIST_FILES=	${PYTHON_SITELIBDIR}/topologic${PYTHON_EXT_SUFFIX}.so
 
 do-install: # workaround for https://github.com/wassimj/Topologic/issues/34
 	${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 	${INSTALL_LIB} ${BUILD_WRKSRC}/topologic${PYTHON_EXT_SUFFIX}.so ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 
 do-test: install
 	${PYTHON_CMD} ${WRKSRC}/test/topologictest01.py
 
 .include <bsd.port.mk>
diff --git a/math/py-umap-learn/Makefile b/math/py-umap-learn/Makefile
index 06148581e07f..7efd527e9ffc 100644
--- a/math/py-umap-learn/Makefile
+++ b/math/py-umap-learn/Makefile
@@ -1,25 +1,26 @@
 PORTNAME=	umap-learn
 DISTVERSION=	0.5.3
+PORTREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Uniform Manifold Approximation and Projection
 WWW=		https://github.com/lmcinnes/umap
 
 LICENSE=	BSD3CLAUSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numba>=0.49:devel/py-numba@${PY_FLAVOR} \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}pynndescent>=0.5:math/py-pynndescent@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-learn>=0.22:science/py-scikit-learn@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=1.0:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tqdm>=3.4.0:misc/py-tqdm@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_PYTHON=	distutils autoplist pytest
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/math/py-uncertainties/Makefile b/math/py-uncertainties/Makefile
index d2778f844d46..c61a9e1b0a8e 100644
--- a/math/py-uncertainties/Makefile
+++ b/math/py-uncertainties/Makefile
@@ -1,29 +1,30 @@
 PORTNAME=	uncertainties
 DISTVERSION=	3.1.7
+PORTREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Calculations with uncertainties on the quantities involved
 WWW=		https://uncertainties-python-package.readthedocs.io/en/latest/
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future@${PY_FLAVOR}
 TEST_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_PYTHON=	distutils autoplist
 
 NO_ARCH=	yes
 
 TEST_ENV=      ${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 
 do-test:
 	@cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} nosetests-${PYTHON_VER} -v
 
 .include <bsd.port.mk>
diff --git a/math/py-unyt/Makefile b/math/py-unyt/Makefile
index 4e288ad3fe65..369ede0de890 100644
--- a/math/py-unyt/Makefile
+++ b/math/py-unyt/Makefile
@@ -1,26 +1,27 @@
 PORTNAME=	unyt
 DISTVERSION=	2.9.0
+PORTREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Package for handling numpy arrays with units
 WWW=		https://github.com/yt-project/unyt
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 PY_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}sympy>=1.2:math/py-sympy@${PY_FLAVOR}
 BUILD_DEPENDS=	${PY_DEPENDS}
 RUN_DEPENDS=	${PY_DEPENDS}
 
 USES=		python:3.6+
 USE_PYTHON=	distutils autoplist pytest
 
 NO_ARCH=	yes
 
 TEST_WRKSRC=	${WRKSRC}/unyt/tests
 
 .include <bsd.port.mk>
diff --git a/math/py-yt/Makefile b/math/py-yt/Makefile
index 5aadaa7b5623..769252f8c7bb 100644
--- a/math/py-yt/Makefile
+++ b/math/py-yt/Makefile
@@ -1,47 +1,48 @@
 PORTNAME=	yt
 DISTVERSION=	4.1.4
+PORTREVISION=	1
 CATEGORIES=	math astro python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Analysis and visualization toolkit for volumetric data
 WWW=		https://yt-project.org/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING.txt
 
 # dependencies are in setup.cfg
 BUILD_DEPENDS=	${PYNUMPY}
 RUN_DEPENDS=	\
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}cmyt>=0.2.2:math/py-cmyt@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ipywidgets>0:devel/py-ipywidgets@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ipython>=1.0:devel/ipython@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}more-itertools>=8.4:devel/py-more-itertools@${PY_FLAVOR} \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}packaging>=20.9:devel/py-packaging@${PY_FLAVOR} \
 		${PY_PILLOW} \
 		${PYTHON_PKGNAMEPREFIX}pyparsing>=2.0.2:devel/py-pyparsing@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sympy>=1.2:math/py-sympy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}toml>=0.10.2:textproc/py-toml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tomli-w>=0.4.0:textproc/py-tomli-w@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tqdm>=3.4.0:misc/py-tqdm@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}unyt>=2.8.0:math/py-unyt@${PY_FLAVOR}
 
 USES=		dos2unix localbase python:3.8+
 USE_PYTHON=	distutils cython autoplist concurrent
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|check_for_pyembree() is not None|False|" \
 		${WRKSRC}/setup.py
 	@${REINPLACE_CMD} -e "s|check_for_openmp() is True|True|" \
 		${WRKSRC}/setup.py
 	@${REINPLACE_CMD} -e "s|\['-fopenmp', filename\]|['-I${LOCALBASE}/include', '-L${LOCALBASE}/lib', '-lm', '-fopenmp', filename]|" \
 		${WRKSRC}/setupext.py
 
 post-install:
 	@${STRIP_CMD} $$(${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name "*.so")
 
 .include <bsd.port.mk>
diff --git a/math/qd/Makefile b/math/qd/Makefile
index 977730e7e671..151789d82212 100644
--- a/math/qd/Makefile
+++ b/math/qd/Makefile
@@ -1,24 +1,25 @@
 PORTNAME=	qd
 DISTVERSION=	2.3.23
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	https://www.davidhbailey.com/dhbsoftware/
 
 MAINTAINER=	fortran@FreeBSD.org
 COMMENT=	Double-Double and Quad-Double Arithmetic
 WWW=		https://crd-legacy.lbl.gov/~dhbailey/mpdist
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		fortran libtool
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared --disable-static
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 
 TEST_WRKSRC=	${WRKSRC}/tests
 TEST_TARGET=	demo
 
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.mk>
diff --git a/math/qposases/Makefile b/math/qposases/Makefile
index cc05da089665..d63ad158909b 100644
--- a/math/qposases/Makefile
+++ b/math/qposases/Makefile
@@ -1,39 +1,39 @@
 PORTNAME=	qpOASES
 DISTVERSION=	3.2.1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	math
 MASTER_SITES=	https://www.coin-or.org/download/source/${PORTNAME}/
 PKGNAMEPREFIX=	coin-or-
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Library for online active set strategy quadratic programming problems
 WWW=		https://projects.coin-or.org/qpOASES
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libopenblas.so:math/openblas
 
 USES=		cmake fortran tar:tgz
 USE_LDCONFIG=	yes
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 CMAKE_OFF=	QPOASES_BUILD_EXAMPLES
 
 LDFLAGS+=	${LOCALBASE}/lib/libopenblas.so
 
 EXAMPLES=	example1 example1a example1b example2 example4 example5 exampleLP qrecipe # there are some other examples, but they need additional files/packages to run
 
 post-patch:
 	@truncate -s 0 ${WRKSRC}/src/BLASReplacement.cpp ${WRKSRC}/src/LAPACKReplacement.cpp
 
 do-test:
 	@cd ${BUILD_WRKSRC} && \
 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DQPOASES_BUILD_EXAMPLES:BOOL=ON ${CMAKE_SOURCE_PATH} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
 		for e in ${EXAMPLES}; do \
 			${ECHO} "=== Running example $${e} ===" && \
 			${BUILD_WRKSRC}/bin/$${e}; \
 		done
 
 .include <bsd.port.mk>
diff --git a/math/qrupdate/Makefile b/math/qrupdate/Makefile
index 9e2a40a6b7f4..44e394682710 100644
--- a/math/qrupdate/Makefile
+++ b/math/qrupdate/Makefile
@@ -1,32 +1,32 @@
 PORTNAME=	qrupdate
 PORTVERSION=	1.1.2
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	math
 MASTER_SITES=	SOURCEFORGE/qrupdate/qrupdate/1.2
 
 MAINTAINER=	robertjenssen@ozemail.com.au
 COMMENT=	Fortran library for fast updates of QR and Cholesky decomposition
 WWW=		http://qrupdate.sourceforge.net/
 
 LIB_DEPENDS=	libblas.so:math/blas \
 		liblapack.so:math/lapack
 
 USES=		fortran gmake
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "sparc64"
 PICFLAG?=	-fPIC
 BROKEN=		Does not compile on sparc64: assertions fail
 .else
 PICFLAG?=	-fpic
 .endif
 
 USE_LDCONFIG=	yes
 
 pre-build:
 	@${REINPLACE_CMD} -e 's+%%FC%%+${FC}+g ; s+%%FFLAGS%%+${FFLAGS}+g ; \
 		s+%%PICFLAG%%+${PICFLAG}+g ; ' \
 		${WRKSRC}/Makeconf
 
 .include <bsd.port.post.mk>
diff --git a/math/rankwidth/Makefile b/math/rankwidth/Makefile
index ddc56597979a..79d032710033 100644
--- a/math/rankwidth/Makefile
+++ b/math/rankwidth/Makefile
@@ -1,26 +1,26 @@
 PORTNAME=	rankwidth	# Also known as: rw
 PORTVERSION=	0.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	SF/${PORTNAME}/
 DISTNAME=	rw-${PORTVERSION}
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Calculation of rank-width and rank-decompositions
 WWW=		https://sourceforge.net/projects/rankwidth/
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libigraph.so:math/igraph
 
 USES=		autoreconf libtool localbase pkgconfig
 
 CONFLICTS_INSTALL=	rw
 
 OPTIONS_DEFINE=	DOCS
 
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 DOCSDIR=	${PREFIX}/share/doc/rw
 
 .include <bsd.port.mk>
diff --git a/math/rehearse/Makefile b/math/rehearse/Makefile
index d9e24e7a9fe6..caf32edeb445 100644
--- a/math/rehearse/Makefile
+++ b/math/rehearse/Makefile
@@ -1,27 +1,28 @@
 PORTNAME=	rehearse
 DISTVERSION=	g20190305
+PORTREVISION=	1
 CATEGORIES=	math
 PKGNAMEPREFIX=	coin-or-
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Algebraic modeling library in C++ for linear optimization solvers
 WWW=		https://projects.coin-or.org/Rehearse
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libClp.so:math/clp \
 		libOsi.so:math/osi
 
 USES=		compiler:c++11-lang gmake libtool pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	coin-or
 GH_PROJECT=	Rehearse
 GH_TAGNAME=	31d12f8
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
 post-stage:
 	@${RM} -r ${STAGEDIR}${LOCALBASE}/share/coin
 
 .include <bsd.port.mk>
diff --git a/math/rkward/Makefile b/math/rkward/Makefile
index 9ea72754fcd8..c37d0f3ff700 100644
--- a/math/rkward/Makefile
+++ b/math/rkward/Makefile
@@ -1,90 +1,91 @@
 PORTNAME=	rkward
 PORTVERSION=	0.7.5
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTVERSION}/
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	IDE/GUI for the R-project
 WWW=		https://rkward.kde.org/
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libR.so:math/R
 RUN_DEPENDS=	kbibtex:databases/kbibtex	\
 		pandoc:textproc/hs-pandoc	\
 		${LR_MOD_DIR}/R2HTML/INDEX:textproc/R-cran-R2HTML	\
 		${LR_MOD_DIR}/rmarkdown/INDEX:textproc/R-cran-rmarkdown
 TEST_DEPENDS=	${LR_MOD_DIR}/FAdist/INDEX:science/R-cran-FAdist
 
 USES=		cmake compiler:c++11-lang desktop-file-utils gettext fortran	\
 		kde:5 php:cli qt:5 shared-mime-info xorg
 USE_QT=		buildtools concurrent core dbus declarative gui location	\
 		network printsupport qmake script testlib webchannel webengine	\
 		webkit widgets xml
 USE_XORG=	ice x11 xext
 USE_KDE=	archive auth bookmarks codecs completion config configwidgets coreaddons\
 		crash doctools ecm i18n itemviews jobwidgets kate:run kdewebkit kio	\
 		notifications parts service solid sonnet syntaxhighlighting texteditor	\
 		textwidgets widgetsaddons windowsystem xmlgui
 
 CFLAGS+=	-I${LOCALBASE}/include
 TEST_TARGET=	plugintests
 
 LR_MOD_DIR=	${LOCALBASE}/lib/R/library
 DOCSDIR=	${PREFIX}/share/doc/HTML/en/rkward
 
 OPTIONS_DEFINE=	DOCS NLS INSTTEST RECDEP
 INSTTEST_DESC=	Install rkwardtests R package
 RECDEP_DESC=	Recommended runtime dependencies
 OPTIONS_DEFAULT=RECDEP
 OPTIONS_SUB=	yes
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MRECDEP}
 RUN_DEPENDS+=	${LR_MOD_DIR}/XML/INDEX:textproc/R-cran-XML		\
 		${LR_MOD_DIR}/gdata/INDEX:devel/R-cran-gdata		\
 		${LR_MOD_DIR}/mvtnorm/INDEX:math/R-cran-mvtnorm		\
 		${LR_MOD_DIR}/nortest/INDEX:math/R-cran-nortest		\
 		${LR_MOD_DIR}/outliers/INDEX:math/R-cran-outliers	\
 		${LR_MOD_DIR}/qcc/INDEX:graphics/R-cran-qcc		\
 		${LR_MOD_DIR}/tseries/INDEX:finance/R-cran-tseries	\
 		${LR_MOD_DIR}/xtable/INDEX:textproc/R-cran-xtable	\
 		${LR_MOD_DIR}/car/INDEX:math/R-cran-car			\
 		${LR_MOD_DIR}/XLConnect/INDEX:math/R-cran-XLConnect	\
 		${LR_MOD_DIR}/ltm/INDEX:math/R-cran-ltm			\
 		${LR_MOD_DIR}/moments/INDEX:math/R-cran-moments		\
 		${LR_MOD_DIR}/pwr/INDEX:math/R-cran-pwr			\
 		${LR_MOD_DIR}/hdrcde/INDEX:math/R-cran-hdrcde		\
 		${LR_MOD_DIR}/devtools/INDEX:devel/R-cran-devtools	\
 		${LR_MOD_DIR}/exactRankTests/INDEX:math/R-cran-exactRankTests
 .endif
 
 .if ${PORT_OPTIONS:MINSTTEST}
 R_LIB_DIR=	lib/R/library
 R_COMMAND=	${LOCALBASE}/bin/R
 .endif
 
 pre-configure:
 .if ! ${PORT_OPTIONS:MDOCS}
 	${REINPLACE_CMD} -e 's|ADD_SUBDIRECTORY(doc)|#ADD_SUBDIRECTORY(doc)|'	\
 		${WRKSRC}/CMakeLists.txt
 .endif
 .if ! ${PORT_OPTIONS:MNLS}
 	${REINPLACE_CMD} -e 's|ADD_SUBDIRECTORY(po)|#ADD_SUBDIRECTORY(po)|'	\
 		${WRKSRC}/CMakeLists.txt
 .endif
 	@(if [ ! -e ${LOCALBASE}/lib/R/lib/libR.so ] ; then \
 	${ECHO_MSG} "==> ${PKGNAME} requires math/R to be built WITH_LIBR" ; \
 	exit 1; fi)
 
 post-install:
 	${RM} ${STAGEDIR}${PREFIX}/share/apps/katepart/syntax/r.xml # Conflicts with kate
 .if ${PORT_OPTIONS:MINSTTEST}
 	${MKDIR} ${STAGEDIR}${PREFIX}/${R_LIB_DIR}
 	(cd ${WRKSRC}/rkward/rbackend/rpackages/rkwardtests &&	\
 	${SETENV} ${MAKE_ENV} _R_CHECK_FORCE_SUGGESTS_=FALSE &&	\
 	${R_COMMAND} CMD INSTALL -l ${STAGEDIR}${PREFIX}/${R_LIB_DIR} . )
 .endif
 
 .include <bsd.port.mk>
diff --git a/math/saga/Makefile b/math/saga/Makefile
index 9eae30d8fe60..15a1d62e06ce 100644
--- a/math/saga/Makefile
+++ b/math/saga/Makefile
@@ -1,99 +1,100 @@
 PORTNAME=	saga
 PORTVERSION=	9.0.1
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	SF/saga-gis/SAGA%20-%20${PORTVERSION:C/\.[[:digit:]]\.[[:digit:]]*$//}/SAGA%20-%20${PORTVERSION}
 
 MAINTAINER=	rhurlin@FreeBSD.org
 COMMENT=	System for Automated Geoscientific Analyses
 WWW=		http://www.saga-gis.org/en/index.html
 
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	multi
 
 .if !exists(/usr/include/omp.h)
 BROKEN=		requires OpenMP support that is missing on this architecture
 .endif
 
 BUILD_DEPENDS=	swig:devel/swig
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libfftw3.so:math/fftw3 \
 		libgdal.so:graphics/gdal \
 		libhdf5.so:science/hdf5 \
 		libhpdf.so:print/libharu \
 		libodbc.so:databases/unixODBC \
 		libopencv_core.so:graphics/opencv \
 		libpdal_base.so:math/pdal \
 		libproj.so:graphics/proj \
 		libsvm.so:science/libsvm \
 		libsz.so:science/libaec \
 		libtiff.so:graphics/tiff
 RUN_DEPENDS:=	swig:devel/swig
 
 USES=		cmake compiler:c++14-lang dos2unix gnome \
 		iconv:wchar_t libtool localbase pkgconfig python
 DOS2UNIX_GLOB=	*.cpp *.h
 USE_LDCONFIG=	yes
 USE_WX=		3.2+
 
 GIT_TAGNAME=	c059b7db8
 
 CMAKE_ARGS=	-DSVM_INCLUDE:PATH=${LOCALBASE}/include/svm.h
 CMAKE_ON=	CMAKE_VERBOSE_MAKEFILE
 CMAKE_ON+=	WITH_DEV_TOOLS
 CMAKE_ON+=	WITH_EXCERCISES
 CMAKE_ON+=	WITH_MRMR
 CMAKE_ON+=	WITH_SYSTEM_SVM
 CMAKE_OFF=	WITH_CLIPPER_ONE
 CMAKE_OFF+=	WITH_TOOLS_RIEGL
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/saga-gis
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
 OPTIONS_DEFINE=	PGSQL OPENMP VIGRA
 OPTIONS_DEFAULT=	PGSQL VIGRA
 OPTIONS_DEFAULT_amd64=	OPENMP
 OPTIONS_DEFAULT_i386=	OPENMP
 OPTIONS_DEFAULT_powerpc64=	OPENMP
 OPTIONS_DEFAULT_powerpc64le=	OPENMP
 NO_OPTIONS_SORT=	yes
 OPTIONS_SUB=	yes
 OPENMP_DESC=	Enable Multiprocessing (only amd64, i386 and powerpc64*)
 VIGRA_DESC=	Enable 'Vision with Generic Algorithms' Library
 
 OPENMP_CONFIGURE_ENABLE=	openmp
 PGSQL_USES=		pgsql
 PGSQL_CONFIGURE_WITH=	postgresql
 VIGRA_BUILD_DEPENDS=	${LOCALBASE}/lib/libvigraimpex.so:graphics/vigra
 VIGRA_RUN_DEPENDS=	${LOCALBASE}/lib/libvigraimpex.so:graphics/vigra
 
 .include <bsd.port.pre.mk>
 
 SUB_FILES=	pkg-message
 
 post-patch:
 .if ${ARCH} == "powerpc"
 	@${REINPLACE_CMD} -e 's|typedef unsigned long	DWORD;|typedef unsigned int	DWORD;|' \
 		${WRKSRC}/src/saga_core/saga_api/api_core.h
 .endif
 	@${REINPLACE_CMD} -e 's|GIT_TAGNAME|${GIT_TAGNAME}|g' \
 		${WRKSRC}/src/saga_core/saga_gui/CMakeLists.txt \
 		${WRKSRC}/src/saga_core/saga_gui/dlg_about.cpp
 	@${REINPLACE_CMD} -e 's|-lgomp|-lomp|' \
 		${WRKSRC}/src/accessories/templates/template4saga-tools/my_tool_library/Makefile
 
 post-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/src/saga_core/saga_gui/res/saga*.txt ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/src/saga_core/saga_gui/res/saga.png ${STAGEDIR}${DATADIR}
 	${RM} ${STAGEDIR}${DATADIR}/saga_dic.txt ${STAGEDIR}${DATADIR}/saga_srs.txt
 # toolchains dir was moved in r2805 (and followups r2810,r2811,r2820)
 	(cd ${WRKSRC}/src/accessories && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR})
 	${RM} -R ${STAGEDIR}${DATADIR}/CMakeLists.txt
 	${RM} -R ${STAGEDIR}${DATADIR}/templates/template4saga-tools/my_tool_library/Makefile.bak
 	${INSTALL_DATA} ${WRKSRC}/src/saga_core/saga_gui/res/saga.desktop \
 		${STAGEDIR}${PREFIX}/share/applications/
 # library helper files are not needed and cripple some math/qgis extensions
 	@${RM} ${STAGEDIR}${PREFIX}/lib/saga/*.la
 
 .include <bsd.port.post.mk>
diff --git a/math/sage/Makefile b/math/sage/Makefile
index b6d18fb9266d..e0c824d220ca 100644
--- a/math/sage/Makefile
+++ b/math/sage/Makefile
@@ -1,576 +1,576 @@
 PORTNAME=	sage
 PORTVERSION=	9.2
-PORTREVISION=	36
+PORTREVISION=	37
 CATEGORIES=	math
 MASTER_SITES=	https://mirrors.xmission.com/sage/src/		\
 		http://mirrors.xmission.com/sage/src/		\
 		https://www-ftp.lip6.fr/pub/math/sagemath/src/	\
 		https://mirrors.mit.edu/sage/src/		\
 		https://files.sagemath.org/src/			\
 		ftp://www-ftp.lip6.fr/pub/math/sagemath/src/
 #MASTER_SITES=	ftp://www-ftp.lip6.fr/pub/math/sagemath/devel/
 PKGNAMESUFFIX=	-math
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Open source Mathematics software
 WWW=		https://www.sagemath.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING.txt
 
 BROKEN=		hoping to fix it with Python-3.9
 
 BUILD_DEPENDS=	bash:shells/bash		\
 		dash:shells/dash		\
 		cmake:devel/cmake-core		\
 		dreadnaut:math/nauty		\
 		${PYTHON_PKGNAMEPREFIX}alabaster>0:textproc/py-alabaster@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}attrs>0:devel/py-attrs@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}Babel>0:devel/py-babel@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}backcall>0:devel/py-backcall@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}bleach>0:www/py-bleach@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}brial>0:math/py-brial@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}certifi>0:security/py-certifi@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}cffi>0:devel/py-cffi@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}cvxopt>0:math/py-cvxopt@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}cycler>0:devel/py-cycler@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}cypari2>0:math/py-cypari2@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}cysignals>0:devel/py-cysignals@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}cython>0:lang/cython@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}decorator>0:devel/py-decorator@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}defusedxml>0:devel/py-defusedxml@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}entrypoints>0:devel/py-entrypoints@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}fpylll>0:math/py-fpylll@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}gmpy2>0:math/py-gmpy2@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}imagesize>0:graphics/py-imagesize@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}importlib-metadata>0:devel/py-importlib-metadata@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}ipykernel>0:devel/py-ipykernel@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}ipython>0:devel/ipython@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}ipython_genutils>0:devel/py-ipython_genutils@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}ipywidgets>0:devel/py-ipywidgets@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}itsdangerous>0:security/py-itsdangerous@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}Jinja2>0i:devel/py-Jinja2@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}jedi>0:devel/py-jedi@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}jsonschema>0:devel/py-jsonschema@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}jupyter-core>0:devel/py-jupyter-core@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}jupyter-client>0:devel/py-jupyter-client@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}kiwisolver>0:math/py-kiwisolver@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}markupsafe>0:textproc/py-markupsafe@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}mistune>0:textproc/py-mistune@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}mpmath>0:math/py-mpmath@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}nbconvert>0:devel/py-nbconvert@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}nbformat>0:devel/py-nbformat@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}networkx>0:math/py-networkx@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}notebook>0:www/py-notebook@${PY_FLAVOR}\
 		${PYNUMPY}			\
 		${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}pandocfilters>0:textproc/py-pandocfilters@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}parso>0:textproc/py-parso@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}path.py>0:devel/py-path.py@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}pexpect>0:misc/py-pexpect@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}pickleshare>0:databases/py-pickleshare@${PY_FLAVOR}\
 		${PY_PILLOW}			\
 		${PYTHON_PKGNAMEPREFIX}pkgconfig>0:devel/py-pkgconfig@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}pplpy>0:math/py-pplpy@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}prometheus-client>0:net-mgmt/py-prometheus-client@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}prompt-toolkit>0:devel/py-prompt-toolkit@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}ptyprocess>0:sysutils/py-ptyprocess@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}pybind11>0:devel/py-pybind11@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}pycparser>0:devel/py-pycparser@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}pyparsing>0:devel/py-pyparsing@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}pyrsistent>0:devel/py-pyrsistent@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}pyzmq>0:net/py-pyzmq@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}rpy2>0:math/py-rpy2@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}scandir>0:sysutils/py-scandir@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}send2trash>0:deskutils/py-send2trash@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}simplegeneric>0:devel/py-simplegeneric@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}snowballstemmer>0:textproc/py-snowballstemmer@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}sphinxcontrib-applehelp>0:textproc/py-sphinxcontrib-applehelp@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}sphinxcontrib-devhelp>0:textproc/py-sphinxcontrib-devhelp@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}sphinxcontrib-htmlhelp>0:textproc/py-sphinxcontrib-htmlhelp@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}sphinxcontrib-jsmath>0:textproc/py-sphinxcontrib-jsmath@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}sphinxcontrib-qthelp>0:textproc/py-sphinxcontrib-qthelp@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}sphinxcontrib-serializinghtml>0:textproc/py-sphinxcontrib-serializinghtml@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}sphinxcontrib-websupport>0:textproc/py-sphinxcontrib-websupport@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}sympy>0:math/py-sympy@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}terminado>0:net/py-terminado@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}testpath>0:devel/py-testpath@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}traitlets>0:devel/py-traitlets@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}tornado>0:www/py-tornado@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}traitlets>0:devel/py-traitlets@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}tzlocal>0:devel/py-tzlocal@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}vcversioner>0:devel/py-vcversioner@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}wcwidth>0:devel/py-wcwidth@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}webencodings>0:converters/py-webencodings@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}widgetsnbextension>0:devel/py-widgetsnbextension@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}zipp>0:devel/py-zipp@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${PY_FLAVOR}\
 		fflas-ffpack-config:math/fflas-ffpack	\
 		fricas>0:math/fricas		\
 		gfan:math/gfan			\
 		git:devel/git			\
 		gp2c:math/gp2c			\
 		jmol:science/jmol		\
 		libatomic_ops>0:devel/libatomic_ops	\
 		MathJax>0:www/mathjax		\
 		maxima>0:math/maxima		\
 		p5-XML-Writer>0:textproc/p5-XML-Writer	\
 		p5-XML-LibXML>0:textproc/p5-XML-LibXML	\
 		p5-XML-LibXSLT>0:textproc/p5-XML-LibXSLT\
 		p5-File-Slurp>0:devel/p5-File-Slurp	\
 		p5-JSON>0:converters/p5-JSON	\
 		p5-SVG>0:textproc/p5-SVG	\
 		p5-MongoDB>0:databases/p5-MongoDB	\
 		p5-Term-ReadLine-Gnu>0:devel/p5-Term-ReadLine-Gnu\
 		palp>0:math/palp		\
 		pandoc:textproc/hs-pandoc	\
 		pari-elldata>0:math/pari_elldata\
 		pari-galdata>0:math/pari_galdata\
 		pari-galpol>0:math/pari_galpol	\
 		pari-nftables>0:math/pari_nftables	\
 		pari-seadata>0:math/pari_seadata\
 		QuadraticSieve:math/flintqs	\
 		gpatch:devel/patch		\
 		rubiks>0:math/rubiks		\
 		sympow:math/sympow		\
 		tachyon:graphics/tachyon	\
 		three.js>0:www/threejs		\
 		yasm:devel/yasm			\
 		gtar:archivers/gtar		\
 		ffmpeg:multimedia/ffmpeg	\
 		${LOCALBASE}/lib/libBLT.a:x11-toolkits/blt
 LIB_DEPENDS=	libarb.so:math/arb		\
 		libboost_thread.so:devel/boost-libs	\
 		libbraiding.so:math/libbraiding	\
 		libbrial.so:math/brial		\
 		libCbc.so:math/cbc		\
 		libcdd.so:math/cddlib		\
 		libcliquer.so:math/cliquer	\
 		libcurl.so:ftp/curl		\
 		libeantic.so:math/e-antic	\
 		libec.so:math/eclib		\
 		libecl.so:lang/ecl		\
 		libecm.so:math/gmp-ecm		\
 		libflint.so:math/flint2		\
 		libfplll.so:math/fplll		\
 		libfreetype.so:print/freetype2	\
 		libgc.so:devel/boehm-gc		\
 		libgc-threaded.so:devel/boehm-gc-threaded\
 		libgf2x.so:math/gf2x		\
 		libgivaro.so:math/givaro	\
 		libglpk.so:math/glpk		\
 		libgap.so:math/gap		\
 		libgmp.so:math/gmp		\
 		libgsl.so:math/gsl		\
 		libhomfly.so:math/libhomfly	\
 		libiml.so:math/iml		\
 		libisl.so:devel/isl		\
 		libLfunction.so:math/lcalc	\
 		libffi.so:devel/libffi		\
 		libgd.so:graphics/gd		\
 		libgiac.so:math/giacxcas	\
 		liblinbox.so:math/linbox	\
 		liblrcalc.so:math/lrcalc	\
 		liblrs.so:math/lrslib	\
 		libm4ri.so:math/m4ri		\
 		libm4rie.so:math/m4rie		\
 		libmpc.so:math/mpc		\
 		libmpfi.so:math/mpfi		\
 		libmpfr.so:math/mpfr		\
 		libmpir.so:math/mpir		\
 		libntl.so:math/ntl		\
 		libpari.so:math/pari		\
 		libpcre.so:devel/pcre		\
 		libplanarity.so:math/planarity	\
 		libpng.so:graphics/png		\
 		libppl.so:devel/ppl		\
 		libR.so:math/R			\
 		librw.so:math/rankwidth		\
 		libSingular.so:math/singular	\
 		libumfpack.so:math/suitesparse-umfpack	\
 		libsemigroups.so:math/libsemigroups	\
 		libsymmetrica.so:math/symmetrica\
 		libzmq.so:net/libzmq4		\
 		libzn_poly-0.9.so:math/zn_poly	\
 		libqd.so:math/qd		\
 		libisl.so:devel/isl		\
 		libblas.so:math/blas		\
 		libicuuc.so:devel/icu		\
 		libtiff.so:graphics/tiff	\
 		liblapack.so:math/lapack	\
 		libedit.so:devel/libedit	\
 		libwebp.so:graphics/webp	\
 		libpcre2-8.so:devel/pcre2	\
 		libgdbm.so:databases/gdbm	\
 		liblcms2.so:graphics/lcms2	\
 		libopenjp2.so:graphics/openjpeg
 RUN_DEPENDS=	bash:shells/bash		\
 		dreadnaut:math/nauty		\
 		${PYTHON_PKGNAMEPREFIX}alabaster>0:textproc/py-alabaster@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}attrs>0:devel/py-attrs@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}Babel>0:devel/py-babel@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}backcall>0:devel/py-backcall@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}bleach>0:www/py-bleach@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}brial>0:math/py-brial@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}certifi>0:security/py-certifi@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}cffi>0:devel/py-cffi@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}cvxopt>0:math/py-cvxopt@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}cycler>0:devel/py-cycler@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}cypari2>0:math/py-cypari2@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}cysignals>0:devel/py-cysignals@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}cython>0:lang/cython@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}decorator>0:devel/py-decorator@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}defusedxml>0:devel/py-defusedxml@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}entrypoints>0:devel/py-entrypoints@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}fpylll>0:math/py-fpylll@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}gmpy2>0:math/py-gmpy2@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}imagesize>0:graphics/py-imagesize@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}importlib-metadata>0:devel/py-importlib-metadata@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}ipykernel>0:devel/py-ipykernel@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}ipython>0:devel/ipython@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}ipython_genutils>0:devel/py-ipython_genutils@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}ipywidgets>0:devel/py-ipywidgets@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}itsdangerous>0:security/py-itsdangerous@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}jedi>0:devel/py-jedi@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}jsonschema>0:devel/py-jsonschema@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}jupyter-core>0:devel/py-jupyter-core@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}jupyter-client>0:devel/py-jupyter-client@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}kiwisolver>0:math/py-kiwisolver@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}markupsafe>0:textproc/py-markupsafe@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}mistune0>0:textproc/py-mistune0@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}mpmath>0:math/py-mpmath@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}nbconvert>0:devel/py-nbconvert@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}nbformat>0:devel/py-nbformat@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}networkx>0:math/py-networkx@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}notebook>0:www/py-notebook@${PY_FLAVOR}\
 		${PYNUMPY}			\
 		${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}pandocfilters>0:textproc/py-pandocfilters@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}parso>0:textproc/py-parso@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}path.py>0:devel/py-path.py@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}pexpect>0:misc/py-pexpect@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}pickleshare>0:databases/py-pickleshare@${PY_FLAVOR}\
 		${PY_PILLOW}			\
 		${PYTHON_PKGNAMEPREFIX}pkgconfig>0:devel/py-pkgconfig@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}pplpy>0:math/py-pplpy@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}prometheus-client>0:net-mgmt/py-prometheus-client@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}prompt-toolkit>0:devel/py-prompt-toolkit@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}ptyprocess>0:sysutils/py-ptyprocess@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}pybind11>0:devel/py-pybind11@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}pycparser>0:devel/py-pycparser@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}pyparsing>0:devel/py-pyparsing@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}pyrsistent>0:devel/py-pyrsistent@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}pyzmq>0:net/py-pyzmq@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}rpy2>0:math/py-rpy2@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}scandir>0:sysutils/py-scandir@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}send2trash>0:deskutils/py-send2trash@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}simplegeneric>0:devel/py-simplegeneric@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}snowballstemmer>0:textproc/py-snowballstemmer@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}sphinxcontrib-applehelp>0:textproc/py-sphinxcontrib-applehelp@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}sphinxcontrib-devhelp>0:textproc/py-sphinxcontrib-devhelp@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}sphinxcontrib-htmlhelp>0:textproc/py-sphinxcontrib-htmlhelp@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}sphinxcontrib-jsmath>0:textproc/py-sphinxcontrib-jsmath@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}sphinxcontrib-qthelp>0:textproc/py-sphinxcontrib-qthelp@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}sphinxcontrib-serializinghtml>0:textproc/py-sphinxcontrib-serializinghtml@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}sphinxcontrib-websupport>0:textproc/py-sphinxcontrib-websupport@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}sympy>0:math/py-sympy@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}terminado>0:net/py-terminado@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}testpath>0:devel/py-testpath@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}tornado>0:www/py-tornado@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}traitlets>0:devel/py-traitlets@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}tzlocal>0:devel/py-tzlocal@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}vcversioner>0:devel/py-vcversioner@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}wcwidth>0:devel/py-wcwidth@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}webencodings>0:converters/py-webencodings@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}widgetsnbextension>0:devel/py-widgetsnbextension@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}zipp>0:devel/py-zipp@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${PY_FLAVOR}\
 		fflas-ffpack-config:math/fflas-ffpack	\
 		fricas>0:math/fricas		\
 		gfan:math/gfan			\
 		git:devel/git			\
 		gp2c:math/gp2c			\
 		jmol:science/jmol		\
 		MathJax>0:www/mathjax		\
 		maxima>0:math/maxima		\
 		p5-Term-ReadLine-Gnu>0:devel/p5-Term-ReadLine-Gnu\
 		palp>0:math/palp		\
 		pandoc:textproc/hs-pandoc	\
 		pari-elldata>0:math/pari_elldata\
 		pari-galdata>0:math/pari_galdata\
 		pari-galpol>0:math/pari_galpol	\
 		pari-nftables>0:math/pari_nftables	\
 		pari-seadata>0:math/pari_seadata\
 		QuadraticSieve:math/flintqs	\
 		rubiks>0:math/rubiks		\
 		sympow:math/sympow		\
 		tachyon:graphics/tachyon	\
 		three.js>0:www/threejs		\
 		yasm:devel/yasm			\
 		pixz:archivers/pixz
 
 USES=		autoreconf blaslapack:openblas compiler:c++11-lib fortran \
 		gettext gmake gnome iconv jpeg libtool localbase magick:6,build \
 		ncurses ninja:build perl5 pkgconfig python:3.7+ readline shebangfix \
 		sqlite tex tk xorg
 USE_TEX=	latex:build pdftex:build tex:build
 USE_XORG=	x11 xext xscrnsaver
 USE_GNOME=	cairo glib20 pango
 USE_PYTHON=	cython
 USE_JAVA=	yes # for science/jmol
 
 CONFLICTS=	${PYTHON_PKGNAMEPREFIX}wheel-0.*
 
 SHEBANG_FILES=	.
 SHEBANG_LANG+=	dash
 dash_OLD_CMD=	/bin/dash
 dash_CMD=	${LOCALBASE}/bin/dash
 
 DISABLE_BINUTILS=	yes
 
 LIBS=		-lomp -pthread
 .if !defined{WITH_DEBUG}
 LDFLAGS+=	-s
 .endif
 BLDDIR=		${WRKDIR}/build
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	SAGE_PORT=yes CC=${CC} GCC=${CC} CXX=${CXX} AS=${AS} LD=${LD}	\
 		SAGE_LOCAL=${PREFIX} SAGE_DESTDIR=${BLDDIR}/	\
 		DESTDIR=${BLDDIR}/${PREFIX} PATCH=${LOCALBASE}/bin/gpatch
 CONFIGURE_ARGS=	--with-system-gcc=force		\
 		--with-system-python3=yes	\
 		--with-python=${PYTHON_CMD}	\
 		--enable-build-as-root		\
 		--disable-download-from-upstream-url	\
 		--localstatedir=/var
 MAKE_ENV=	MAKE=${GMAKE} DESTDIR=${BLDDIR}
 ALL_TARGET=	build
 REINPLACE_ARGS=	-i ''
 BINARY_ALIAS=	patch=${LOCALBASE}/bin/gpatch
 OPTIONS_SUB=	yes
 PLIST_SUB=	VER=${DISTVERSION}
 SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=	DOCS
 PORTDOCS=	*
 
 .include <bsd.port.pre.mk>
 
 WSDIR=		${BLDDIR}${PREFIX}
 SPKG_INST=	configure.ac configure build/sage_bootstrap/uninstall.py	\
 		build/make/install src/bin/sage-env
 PY2FIX=		bin lib/${PYTHON_VERSION}
 DOC2FIX=	.pickle .doctree
 SE2FIX=		^ECLDIR= ^SINGULAR MAXIMA_PREFIX
 SHR2FIX=	GAP_ROOT_DIR PPLPY_DOCS SINGULARPATH
 STG2FIX=	bin/sage-env-config	\
 		share/jupyter/kernels/sagemath/kernel.json
 BADLN=		kernels/sagemath/doc nbextensions/jsmol	\
 		nbextensions/mathjax nbextensions/threejs
 # External dependencies not yet handled by SageMath
 # Note: do not use wheel from ports
 PY_LIBS=	alabaster attrs babel backcall bleach certifi cffi cvxopt cycler	\
 		cypari cysignals cython dateutil decorator defusedxml docutils	\
 		entrypoints fpylll gmpy2 html5lib imagesize importlib_metadata ipykernel ipython	\
 		ipython_genutils ipywidgets itsdangerous jedi jinja2 jsonschema jupyter_client	\
 		jupyter_core kiwisolver markupsafe matplotlib mistune mpmath	\
 		nbconvert nbformat networkx nose notebook numpy packaging pandocfilters	\
 		parso pathpy pexpect pickleshare pillow pkgconfig pplpy		\
 		prometheus_client prompt_toolkit psutil ptyprocess pybind11 pycparser pyparsing	\
 		pygments pyrsistent pytz pyzmq requests rpy2 scandir scipy send2trash simplegeneric	\
 		six snowballstemmer sphinx sphinxcontrib_applehelp sphinxcontrib_devhelp sphinxcontrib_htmlhelp sphinxcontrib_jsmath sphinxcontrib_qthelp sphinxcontrib_serializinghtml sphinxcontrib_websupport sympy terminado testpath tornado traitlets	\
 		tzlocal vcversioner wcwidth webencodings widgetsnbextension zipp zope_interface
 JS_LIBS=	jmol mathjax threejs
 SPKGCM4=	e_antic ecl gap libhomfly linbox maxima pynac rubiks singular
 
 post-patch:
 	${CP} ${FILESDIR}/psutil__arch__bsd__freebsd_socks.c.patch	\
 		${WRKSRC}/build/pkgs/psutil/patches/
 .for sp in ${SPKGCM4}
 	${CP} ${FILESDIR}/${sp}_spkg-configure.m4		\
 		${WRKSRC}/build/pkgs/${sp}/spkg-configure.m4
 .endfor
 .for sp in ${PY_LIBS}
 	${CP} ${FILESDIR}/py_libs_spkg-configure.m4		\
 		${WRKSRC}/build/pkgs/${sp:C/pari2/pari/}/spkg-configure.m4
 .endfor
 #.for sp in ${PY_FILES}
 #	${SED} -e 's|%%PYTHON_SITELIBDIR%%|${PYTHON_SITELIBDIR}|' ${FILESDIR}/${sp}_spkg-configure.m4.in \
 #		> ${WRKSRC}/build/pkgs/${sp}/spkg-configure.m4
 #.endfor
 .for sp in ${JS_LIBS}
 	${SED} -e 's|%%LOCALBASE%%|${LOCALBASE}|' ${FILESDIR}/${sp}_spkg-configure.m4.in \
 		> ${WRKSRC}/build/pkgs/${sp}/spkg-configure.m4
 .endfor
 
 pre-configure:
 	${REINPLACE_CMD} -e 's|SAGE_LOCAL="$$prefix"|SAGE_LOCAL="${WSDIR}"|'	\
 		-e 's|lib/pkgconfig|libdata/pkgconfig|' ${WRKSRC}/configure.ac
 	${REINPLACE_CMD} -e 's|SAGE_LOCAL="@prefix@"|SAGE_LOCAL="${WSDIR}"|'	\
 		${WRKSRC}/src/bin/sage-env-config.in
 	${REINPLACE_CMD} -e 's|%%CFLAGS%%|${CFLAGS}|;s|%%LDFLAGS%%|${LDFLAGS}|'	\
 		${WRKSRC}/build/pkgs/tachyon/patches/Make-arch.patch
 	${REINPLACE_CMD} -e '/SUITESPARSE_INC_DIR/s|$${SAGE_LOCAL}/include|${LOCALBASE}/include/suitesparse|'\
 		${WRKSRC}/build/pkgs/cvxopt/spkg-install.in
 	${REINPLACE_CMD} -e 's|exec python3|exec ${PYTHON_CMD}|'		\
 		-e 's|exec "$$SAGE_LOCAL"/bin/python3|exec ${PYTHON_CMD}|'	\
 		${WRKSRC}/src/bin/sage
 .for f in ${PY_LIBS}
 	${REINPLACE_CMD} -e 's|python3|${PYTHON_CMD}|;s|py_libs|${f}|'	\
 		${WRKSRC}/build/pkgs/${f}/spkg-configure.m4
 .endfor
 	${REINPLACE_CMD} -e 's|import attrs|import attr|'	\
 		${WRKSRC}/build/pkgs/attrs/spkg-configure.m4
 	${REINPLACE_CMD} -e 's|import cypari|import cypari2|'	\
 		${WRKSRC}/build/pkgs/cypari/spkg-configure.m4
 	${REINPLACE_CMD} -e 's|import ipython|import IPython|'	\
 		${WRKSRC}/build/pkgs/ipython/spkg-configure.m4
 	${REINPLACE_CMD} -e 's|import pathpy|import path|'	\
 		${WRKSRC}/build/pkgs/pathpy/spkg-configure.m4
 	${REINPLACE_CMD} -e 's|import pillow|import PIL|'	\
 		${WRKSRC}/build/pkgs/pillow/spkg-configure.m4
 	${REINPLACE_CMD} -e 's|import pplpy|import ppl|'	\
 		${WRKSRC}/build/pkgs/pplpy/spkg-configure.m4
 	${REINPLACE_CMD} -e 's|import pyzmq|import zmq|'	\
 		${WRKSRC}/build/pkgs/pyzmq/spkg-configure.m4
 .for f in applehelp devhelp htmlhelp jsmath qthelp serializinghtml websupport
 	${REINPLACE_CMD} -e 's|import sphinxcontrib_|import sphinxcontrib.|'	\
 		${WRKSRC}/build/pkgs/sphinxcontrib_${f}/spkg-configure.m4
 .endfor
 	${REINPLACE_CMD} -e 's|import zope_interface|import zope.interface|'	\
 		${WRKSRC}/build/pkgs/zope_interface/spkg-configure.m4
 	${REINPLACE_CMD} -e '/GAP_ROOT=/s|$$SAGE_LOCAL|${LOCALBASE}|'	\
 		${WRKSRC}/build/pkgs/gap_packages/spkg-install.in
 	${REINPLACE_CMD} -e "/os.path.join/s|SAGE_LOCAL|'${LOCALBASE}'|"\
 		${WRKSRC}/src/sage/libs/gap/util.pyx
 	${REINPLACE_CMD} -e "/os.path.join(SAGE_LOCAL/s|SAGE_LOCAL|'${LOCALBASE}'|"	\
 		${WRKSRC}/src/sage/env.py
 	${REINPLACE_CMD} -e "/^library_dirs/s|SAGE_LOCAL|'${LOCALBASE}'|"	\
 		${WRKSRC}/src/setup.py
 .for f in ${SHR2FIX}
 	${REINPLACE_CMD} -e "/${f}/s|SAGE_SHARE|'${LOCALBASE}/share/'|"	\
 		${WRKSRC}/src/sage/env.py
 .endfor
 	${REINPLACE_CMD} -e "/JMOL_DIR/s|SAGE_SHARE|'${JAVASHAREDIR}'|"	\
 			-e "/JMOL_DIR/s|jmol|classes|"			\
 		${WRKSRC}/src/sage/env.py
 	${REINPLACE_CMD} -e "/JSMOL_DIR/s|SAGE_SHARE|'${LOCALBASE}/www'|"	\
 			-e "/JSMOL_DIR/s|jsmol|JSmol|"				\
 		${WRKSRC}/src/sage/env.py
 	${REINPLACE_CMD} -e "/MATHJAX_DIR/s|SAGE_SHARE|'${LOCALBASE}/www'|"	\
 			-e "/MATHJAX_DIR/s|mathjax|MathJax|"			\
 		${WRKSRC}/src/sage/env.py
 	${REINPLACE_CMD} -e "/THREEJS_DIR/s|SAGE_SHARE|'${LOCALBASE}/www'|"	\
 		${WRKSRC}/src/sage/env.py
 .for f in ${SE2FIX}
 	${REINPLACE_CMD} -e '/${f}/s|$$SAGE_LOCAL|${LOCALBASE}|'	\
 		${WRKSRC}/src/bin/sage-env
 .endfor
 	${REINPLACE_CMD} -e '/LDFLAGS=/s|-rpath,$$SAGE_LOCAL|-rpath,${LOCALBASE}|'	\
 		${WRKSRC}/src/bin/sage-env
 .for f in ${SPKG_INST}
 	${REINPLACE_CMD} -e 's|/var/lib/sage|/share/libdata/${PORTNAME}|'	\
 		${WRKSRC}/${f}
 .endfor
 	# Bug with py-docutils > 0.16
 	${RM} -r ${WRKSRC}/src/doc/hu
 	(cd ${WRKSRC} && ./bootstrap)
 	${MKDIR} ${BLDDIR}${PREFIX}/lib/pkgconfig	# Removed thereafter
 
 post-build:
 .if ${PORT_OPTIONS:MDOCS}
 	(cd ${WRKSRC} && ${MAKE_ENV} ${MAKE_CMD} doc)
 .endif
 .for d in ${PY2FIX}
 	${FIND} ${WSDIR}/${d} -type f -exec ${GREP} -I -l "${WSDIR}/bin/python" {} \;	|\
 	${XARGS} ${SED} -i "" -e 's|${WSDIR}/bin/pytho.*|${PYTHON_CMD}|'
 .endfor
 .for d in ${PY2FIX}
 	${FIND} ${WSDIR}/${d} -type f -exec ${GREP} -I -l "/usr/bin/env python" {} \;	|\
 	${XARGS} ${SED} -i "" -e 's|/usr/bin/env pytho.*|${PYTHON_CMD}|'
 .endfor
 	${FIND} ${BLDDIR}/${PYTHON_LIBDIR} -type d -name __pycache__ |	\
 		${XARGS} ${RM} -r
 .for f in ${DOC2FIX}
 	${FIND} ${BLDDIR}${DOCSDIR} -type f -name "*${f}" | ${XARGS}	\
 	${SED} -i "" -e 's|${BLDDIR}||g'
 .endfor
 .for f in ${STG2FIX}
 	${SED} -i "" -e 's|${BLDDIR}||g' ${BLDDIR}${PREFIX}/${f}
 .endfor
 	${RM} ${BLDDIR}${PYTHON_CMD} ${BADLN:C|^|${BLDDIR}${PREFIX}/share/jupyter/|}
 	${RM} -r ${BLDDIR}${PREFIX}/var
 	${RM} ${BLDDIR}${PREFIX}/lib64 ${BLDDIR}${PREFIX}/lib/pkgconfig/blas.pc	\
 		${BLDDIR}${PREFIX}/lib/pkgconfig/cblas.pc	\
 		${BLDDIR}${PREFIX}/lib/pkgconfig/gsl.pc	\
 		${BLDDIR}${PREFIX}/lib/pkgconfig/lapack.pc
 	# Cannot use a package system for pip and setuptools
 	${RM} ${BLDDIR}${PREFIX}/bin/easy_install* ${BLDDIR}${PREFIX}/bin/pip*
 	${RM} -r ${BLDDIR}${PYTHON_SITELIBDIR}/pip-* ${BLDDIR}${PYTHON_SITELIBDIR}/pip/
 	${RM} -r ${BLDDIR}${PYTHON_SITELIBDIR}/setuptools*		\
 		${BLDDIR}${PYTHON_SITELIBDIR}/easy_install.py		\
 		${BLDDIR}${PYTHON_SITELIBDIR}/pkg_resources		\
 		${BLDDIR}${PYTHON_SITELIBDIR}/__pycache__/easy_install*
 	# Remove CONFLICTS with lang/python3
 	${RM} ${BLDDIR}${PREFIX}/bin/python ${BLDDIR}${PREFIX}/bin/python3
 	${REINPLACE_CMD} -e '/exec/s|python3|${PYTHON_VERSION}|' ${BLDDIR}${PREFIX}/bin/sage
 	# ${TRUE} because compilation of some .py fails: compileall.py -q to see errors
 	(cd ${WSDIR} && (${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py	\
 	 -d ${PYTHONPREFIX_SITELIBDIR} -f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;} ||	\
 	 ${TRUE}))
 	${FIND} ${BLDDIR}${PREFIX} -name "*.bak" -delete
 # See https://lists.freebsd.org/pipermail/freebsd-python/2020-June/020710.html
 .if exists(${PYTHON_SITELIBDIR}/path.py-7.1.dist-info/WHEEL)
 PLIST_SUB+=	EGG="@comment " WHEEL=""
 .else
 PLIST_SUB+=	EGG="" WHEEL="@comment "
 .endif
 
 do-install:
 	cd "${BLDDIR}" && ${FIND} . | ${CPIO} -pduml ${STAGEDIR}
 	# Remove bad links
 	${LN} -sf ${DOCSDIR}	\
 		${STAGEDIR}${PREFIX}/share/jupyter/kernels/sagemath/doc
 	${LN} -sf ${LOCALBASE}/www/JSmol	\
 		${STAGEDIR}${PREFIX}/share/jupyter/nbextensions/jsmol
 	${LN} -sf ${LOCALBASE}/www/MathJax	\
 		${STAGEDIR}${PREFIX}/share/jupyter/nbextensions/mathjax
 	${LN} -sf ${LOCALBASE}/www/threejs	\
 		${STAGEDIR}${PREFIX}/share/jupyter/nbextensions/threejs
 
 post-install:
 	${RM} ${STAGEDIR}${PREFIX}/lib64 ${STAGEDIR}${PREFIX}/libdata/pkgconfig/blas.pc	\
 		${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/distutils-precedence.pth	\
 		${STAGEDIR}${PREFIX}/libdata/pkgconfig/cblas.pc	\
 		${STAGEDIR}${PREFIX}/libdata/pkgconfig/gsl.pc	\
 		${STAGEDIR}${PREFIX}/libdata/pkgconfig/lapack.pc
 	${RM} -r ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/_distutils_hack
 
 .include <bsd.port.post.mk>
diff --git a/math/scalapack/Makefile b/math/scalapack/Makefile
index ce0c6849d334..05a2ba25af9c 100644
--- a/math/scalapack/Makefile
+++ b/math/scalapack/Makefile
@@ -1,97 +1,98 @@
 PORTNAME=	scalapack
 PORTVERSION=	2.2.0
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	math
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	ScaLAPACK Scalable LAPACK library
 WWW=		https://www.netlib.org/scalapack/
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 CONFLICTS=	elmer-mathlibs-1*
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Reference-ScaLAPACK
 
 USES=		cmake fortran pathfix
 
 USE_LDCONFIG=	yes
 CMAKE_ARGS=	-DBUILD_STATIC_LIBS:BOOL=ON
 
 ARCH2FIX=	PBLAS/SRC PBLAS/SRC/PBBLAS PBLAS/SRC/PTOOLS PBLAS/SRC/PTZBLAS \
 		REDIST/SRC SRC TOOLS TOOLS/LAPACK
 
 DATADIR=	${PREFIX}/share/${PORTNAME:tu}
 EXAMPLESDIR=	${PREFIX}/share/examples/${PORTNAME:tu}
 SUB_FILES=	pkg-message
 PLIST_SUB=	SVERSION=${SVERSION} PORTVERSION=2.1.0
 
 OPTIONS_DEFINE=		EXAMPLES
 OPTIONS_RADIO=		LA MPI
 OPTIONS_RADIO_LA=	ATLAS BLAS
 LA_DESC=		Linear Algebra library support
 BLAS_DESC=		LAPACK blass implementation
 OPTIONS_RADIO_MPI=	MPICH OPENMPI
 OPTIONS_DEFAULT=	BLAS EXAMPLES MPICH
 
 ATLAS_USES=	blaslapack:atlas
 BLAS_USES=	blaslapack:openblas
 
 MPICH_USES=	mpi:mpich
 MPICH_CMAKE_ON=	-DMPI_BASE_DIR=${LOCALBASE}
 OPENMPI_USES=	mpi:openmpi
 OPENMPI_CMAKE_ON=-DMPI_BASE_DIR=${LOCALBASE}/mpi/openmpi
 
 .include <bsd.port.pre.mk>
 
 BLAS=		${BLASLIB}
 LAPACK=		${LAPACKLIB}
 
 .if ${ARCH} == "sparc64" || ${ARCH} == "amd64"
 FPIC=	-fPIC
 .else
 FPIC=	-fpic
 .endif
 
 CFLAGS+=	${FPIC} ${MPI_CFLAGS}
 FFLAGS+=	${FPIC}
 LDFLAGS+=	${MPI_LIBS}
 SVERSION=	2
 
 .if ${GCC_DEFAULT} >= 10
 # workaround for Rank mismatch between actual argument at (1) and actual argument at (2) (scalar and rank-1)
 FFLAGS+=	-fallow-argument-mismatch
 .endif
 
 # USES=fortran already forces FC to a supported fortran compiler;
 # assume mpicc points to a compatible compiler and force that, too.
 CC=	${MPICC}
 
 post-build:
 	${RM} -r ${WRKSRC}/CMakeFiles ${WRKSRC}/CMakeCache.txt
 	(cd ${WRKSRC} &&	\
 	${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS:C|BUILD_STATIC_LIBS|BUILD_SHARED_LIBS|} ${CMAKE_SOURCE_PATH})
 	(cd ${WRKSRC} && ${DO_MAKE_BUILD} ${ALL_TARGET})
 
 post-install:
 	${INSTALL_LIB} ${WRKSRC}/lib/libscalapack.so ${STAGEDIR}${PREFIX}/lib/libscalapack.so.${SVERSION}
 	${LN} -sf libscalapack.so.${SVERSION} ${STAGEDIR}${PREFIX}/lib/libscalapack.so
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/SCALAPACK/TESTING
 	(cd ${BUILD_WRKSRC}/TESTING/ ;\
 	${INSTALL_PROGRAM} x* ${STAGEDIR}${PREFIX}/share/SCALAPACK/TESTING ;\
 	${INSTALL_DATA} *.dat ${STAGEDIR}${PREFIX}/share/SCALAPACK/TESTING)
 	${INSTALL_DATA} ${FILESDIR}/scalapack.h ${STAGEDIR}${PREFIX}/include
 	${INSTALL_DATA} ${WRKSRC}/PBLAS/SRC/*.h ${STAGEDIR}${PREFIX}/include
 
 post-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/examples/SCALAPACK
 	${INSTALL_DATA} ${FILESDIR}/Makefile    ${STAGEDIR}${PREFIX}/share/examples/SCALAPACK
 	${INSTALL_DATA} ${FILESDIR}/example1.cc ${STAGEDIR}${PREFIX}/share/examples/SCALAPACK
 	${INSTALL_DATA} ${FILESDIR}/example1.f  ${STAGEDIR}${PREFIX}/share/examples/SCALAPACK
 
 do-test:
 	(cd ${BUILD_WRKSRC}/TESTING && ${MAKE_CMD} test)
 
 .include <bsd.port.post.mk>
diff --git a/math/scalapackfx/Makefile b/math/scalapackfx/Makefile
index b8ddf6807add..b74e752ed50f 100644
--- a/math/scalapackfx/Makefile
+++ b/math/scalapackfx/Makefile
@@ -1,32 +1,33 @@
 PORTNAME=	scalapackfx
 DISTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Modern Fortran wrappers around ScaLAPACK routines
 WWW=		https://github.com/dftbplus/scalapackfx
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	fypp:devel/py-fypp@${PY_FLAVOR}
 LIB_DEPENDS=	libmpi.so:net/mpich \
 		libmpifort.so:net/mpich \
 		libopenblas.so:math/openblas \
 		libscalapack.so:math/scalapack
 
 USES=		cmake fortran python:build
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	dftbplus
 
 CMAKE_ARGS=	-DSCALAPACK_LIBRARY=${LOCALBASE}
 LDFLAGS+=	-lscalapack
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 
 do-test:
 	@cd ${WRKSRC}/test && mpirun -n 2 ${BUILD_WRKSRC}/test/test_det
 
 .include <bsd.port.mk>
diff --git a/math/scilab-toolbox-swt/Makefile b/math/scilab-toolbox-swt/Makefile
index 9513254f52ea..daffac10f7ca 100644
--- a/math/scilab-toolbox-swt/Makefile
+++ b/math/scilab-toolbox-swt/Makefile
@@ -1,69 +1,69 @@
 PORTNAME=	swt
 PORTVERSION=	0.3.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	http://atoms.scilab.org/toolboxes/swt/${PORTVERSION}/files/
 PKGNAMEPREFIX=	scilab-toolbox-
 DISTNAME=	${PORTNAME}-${PORTVERSION}-3-src
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Scilab 1-D and 2-D Wavelet Toolbox
 WWW=		https://atoms.scilab.org/toolboxes/swt
 
 BUILD_DEPENDS=	${SCILAB_CMD}:math/scilab
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		dos2unix zip
 USE_LOCALE=	en_US.UTF-8
 
 SCILAB_CMD=	${LOCALBASE}/bin/scilab-adv-cli
 SCILAB_ARGS=	-noatomsautoload -nb -nouserstartup
 MAKE_ENV=	SCI_JAVA_ENABLE_HEADLESS=1 SCI_DISABLE_TK=1
 DOS2UNIX_FILES=	etc/swt.start
 
 CONTRIBDIR?=	share/scilab/contrib
 TOOLBOXDIR_REL?=	${CONTRIBDIR}/${PORTNAME}
 TOOLBOXDIR=	${PREFIX}/${TOOLBOXDIR_REL}
 PLIST_SUB=	TOOLBOXDIR=${TOOLBOXDIR_REL}
 TOOLBOX_SUBDIRS=	demos etc macros
 
 OPTIONS_DEFINE=	HELP
 OPTIONS_DEFAULT=	HELP
 OPTIONS_SUB=	yes
 
 HELP_DESC=	Build help files (requires scilab with gui support)
 
 WRKSRC=		${WRKDIR}/swt
 
 .include <bsd.port.options.mk>
 
 .if !${PORT_OPTIONS:MHELP}
 SCILAB_ARGS+=	-nwni
 EXTRA_PATCHES+=	${FILESDIR}/extrapatch-etc__swt.start
 .else
 TOOLBOX_SUBDIRS+=	jar
 .endif
 
 post-patch:
 .if !${PORT_OPTIONS:MHELP}
 	${REINPLACE_CMD} -e '/tbx_builder_help/d' ${WRKSRC}/builder.sce
 .endif
 	${REINPLACE_CMD} '/#include "MALLOC.h"/d' \
 		${WRKSRC}/sci_gateway/c/swt_common.h
 	${ECHO_CMD} quit >> ${WRKSRC}/builder.sce
 
 pre-build:
 	${FIND} -d ${WRKSRC} \( -name '*.orig' -or -name '*.bak' \) -delete
 
 do-build:
 	cd ${WRKSRC} && \
 		${SETENV} ${MAKE_ENV} ${SCILAB_CMD} ${SCILAB_ARGS} -f builder.sce
 
 do-install:
 	cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${TOOLBOXDIR} "-name *\.so -or -name loader*\.sce"
 .for d in ${TOOLBOX_SUBDIRS}
 	cd ${WRKSRC} && ${COPYTREE_SHARE} ${d} ${STAGEDIR}${TOOLBOXDIR}
 .endfor
 	${FIND} ${STAGEDIR}${TOOLBOXDIR} -name *\.so -exec ${STRIP_CMD} {} \;
 
 .include <bsd.port.mk>
diff --git a/math/scilab/Makefile b/math/scilab/Makefile
index 24ce9b3a293b..d5b2986edc97 100644
--- a/math/scilab/Makefile
+++ b/math/scilab/Makefile
@@ -1,174 +1,174 @@
 PORTNAME=	scilab
 PORTVERSION=	6.1.1
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	math cad java
 MASTER_SITES=	https://cgit.scilab.org/scilab/snapshot/
 
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Scientific software package for numerical computations
 WWW=		https://www.scilab.org
 
 LICENSE=	GPLv2 BSD3CLAUSE
 LICENSE_COMB=	dual
 LICENSE_FILE_GPLv2=	${WRKSRC}/COPYING
 LICENSE_FILE_BSD3CLAUSE=	${WRKSRC}/COPYING-BSD
 
 LIB_DEPENDS=	libxml2.so:textproc/libxml2 \
 		libpcre.so:devel/pcre \
 		libcurl.so:ftp/curl \
 		libhdf5.so:science/hdf5 \
 		libarpack.so:math/arpack-ng \
 		libfftw3.so:math/fftw3 \
 		libmatio.so:math/matio \
 		libamd.so:math/suitesparse-amd \
 		libumfpack.so:math/suitesparse-umfpack
 RUN_DEPENDS=	xdg-open:devel/xdg-utils
 
 USES=		compiler:c++17-lang cpe desktop-file-utils eigen:3,build \
 		fortran gettext gmake gnome iconv:wchar_t libtool \
 		localbase ncurses pathfix pkgconfig shared-mime-info
 USE_LOCALE=	en_US.UTF-8
 
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS=	--with-gfortran \
 		--without-emf \
 		--with-eigen-include=${LOCALBASE}/include/eigen3 \
 		${ICONV_CONFIGURE_ARG}
 LDFLAGS+=	${ICONV_LIB}
 
 CONFIGURE_ENV=	BLAS_LIBS="${BLASLIB}" LAPACK_LIBS="${LAPACKLIB}"
 INSTALL_TARGET=	install-strip
 WRKSRC_SUBDIR=	scilab
 
 PLIST_SUB=	SHLIB_VER=${PORTVERSION}
 
 OPTIONS_DEFINE=	GUI OCAML TK
 OPTIONS_RADIO=	BLAS
 OPTIONS_RADIO_BLAS=	ATLAS NETLIB OPENBLAS
 OPTIONS_DEFAULT=	GUI NETLIB OCAML TK
 OPTIONS_EXCLUDE_powerpc64=	GUI
 OPTIONS_EXCLUDE_powerpc64le=	GUI
 OPTIONS_SUB=	yes
 
 ATLAS_USES=	blaslapack:atlas
 NETLIB_USES=	blaslapack:netlib
 OPENBLAS_USES=	blaslapack:openblas
 
 GUI_DESC=	Java-based Graphical User Interface
 OCAML_DESC=	Scicos - dynamical system simulator (requires GUI)
 
 # Java dependencies:
 _GUI_DEPENDS+=	${JAVALIBDIR}/flexdock.jar:devel/flexdock \
 		${JAVALIBDIR}/jogl2.jar:graphics/jogamp-jogl \
 		foprep:math/jeuclid \
 		${JAVALIBDIR}/jhall.jar:java/javahelp \
 		${JAVALIBDIR}/jrosetta-api.jar:java/jrosetta \
 		${JAVALIBDIR}/commons-logging.jar:java/apache-commons-logging \
 		${JAVALIBDIR}/jgraphx.jar:java/jgraphx \
 		${JAVALIBDIR}/jlatexmath.jar:math/jlatexmath \
 		${JAVALIBDIR}/ecj-4.4.2.jar:java/eclipse-ecj \
 		${JAVALIBDIR}/lucene-core-5.5.5.jar:textproc/lucene5
 # Documentation, graphic export:
 _GUI_DEPENDS+=	${LOCALBASE}/share/java/fop/build/fop.jar:textproc/fop \
 		${JAVALIBDIR}/jlatexmath-fop.jar:math/jlatexmath \
 		${LOCALBASE}/share/java/batik/lib/batik-all.jar:graphics/batik \
 		${JAVALIBDIR}/avalon-framework.jar:devel/avalon-framework \
 		${JAVALIBDIR}/commons-io.jar:devel/apache-commons-io \
 		${JAVALIBDIR}/xmlgraphics-commons.jar:graphics/xmlgraphics-commons
 # Code quality:
 _GUI_DEPENDS+=	${JAVALIBDIR}/commons-beanutils.jar:java/apache-commons-beanutils \
 		${JAVALIBDIR}/antlr.jar:devel/antlr \
 		${JAVALIBDIR}/junit4.jar:java/junit \
 		${LOCALBASE}/bin/splint:devel/splint
 # Documentation building:
 _GUI_DEPENDS+=	${LOCALBASE}/share/xsl/docbook/javahelp/javahelp.xsl:textproc/docbook-xsl \
 		${JAVALIBDIR}/saxon-he-10.6.jar:textproc/saxon-he \
 		${JAVALIBDIR}/xml-apis-ext.jar:textproc/xml-commons \
 		xsltproc:textproc/libxslt
 # Other gui deps:
 _GUI_DEPENDS+=	${JAVALIBDIR}/looks.jar:devel/jgoodies-looks \
 		${JAVALIBDIR}/skinlf.jar:x11-toolkits/skinlf
 
 # Can't use USE_ANT because it overrides do-build target
 GUI_BUILD_DEPENDS=	${_GUI_DEPENDS} \
 			ant:devel/apache-ant
 GUI_RUN_DEPENDS=	${_GUI_DEPENDS}
 
 GUI_ALL_TARGET=	all doc
 GUI_USES=	gl
 GUI_USE=	GL=gl JAVA=yes
 GUI_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-bin-JAVA_HOME
 GUI_CONFIGURE_ON=	--with-jdk=${JAVA_HOME} \
 			--with-docbook=${LOCALBASE}/share/xsl/docbook \
 			--enable-build-help
 GUI_CONFIGURE_OFF=	--without-gui \
 			--without-javasci \
 			--without-xcos \
 			--disable-build-help
 
 OCAML_IMPLIES=		GUI
 OCAML_CONFIGURE_WITH=	modelica
 OCAML_BUILD_DEPENDS=	ocaml:lang/ocaml \
 	${LOCALBASE}/lib/ocaml/site-lib/num/META:math/ocaml-num
 OCAML_RUN_DEPENDS=	ocaml:lang/ocaml
 
 TK_CONFIGURE_OFF=	--without-tk
 TK_CONFIGURE_ON=	--with-tk-library=${LOCALBASE}/lib \
 			--with-tk-include=${TK_INCLUDEDIR} \
 			--with-tcl-library=${LOCALBASE}/lib \
 			--with-tcl-include=${TCL_INCLUDEDIR}
 TK_USES=	tk xorg
 TK_USE=		XORG=x11
 TK_RUN_DEPENDS=	${LOCALBASE}/lib/bwidget/init.tcl:x11-toolkits/bwidget
 
 .if !exists(/usr/include/omp.h)
 CONFIGURE_ARGS+=	--without-openmp
 .endif
 
 .if defined(WITH_DEBUG)
 CONFIGURE_ARGS+=	--enable-debug
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${GCC_DEFAULT} >= 10
 # workaround for Rank mismatch between actual argument at (1) and actual argument at (2) (rank-1 and scalar)
 FFLAGS+=	-fallow-argument-mismatch
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} 's,/usr/local,${LOCALBASE},' ${WRKSRC}/etc/librarypath.xml
 	@${REINPLACE_CMD} -e 's, gfortran, ${FC},' ${WRKSRC}/modules/dynamic_link/src/scripts/configure
 
 post-patch-GUI-on:
 # scilab segfaults on FreeBSD with C locale
 	@${REINPLACE_CMD} 's,LC_ALL=C,,' ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} '/ac_java_jvm_jni_lib_flags/s,\(ljvm\),\1 -pthread,' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|/usr/lib/java|${JAVALIBDIR}|g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|/usr/lib64/jni|${LOCALBASE}/lib/|g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} 's,\(DEFAULT_JAR_DIR="\),\1 \
 		${LOCALBASE}/share/java/classes \
 		${LOCALBASE}/share/java/fop/build \
 		${LOCALBASE}/share/java/batik/lib \
 		${LOCALBASE}/share/java/jeuclid/repo ,' ${WRKSRC}/configure
 # Prefer non-versioned files to avoid excessive rebuilds. This also fixes detection of fop.
 	@${REINPLACE_CMD} 's|batik-all\*\.jar|batik-all.jar|g; \
 			s|commons-io\*\.jar|commons-io.jar|g; \
 			s|commons-logging\*\.jar|commons-logging.jar|g; \
 			s|fop\*\.jar|fop.jar|g; \
 			s|jlatexmath\*\.jar|jlatexmath.jar|g; \
 			s|xmlgraphics-commons\*\.jar|xmlgraphics-commons.jar|g' \
 			${WRKSRC}/configure
 # Part of the jogamp-jogl-2.3 patch:
 	@${REINPLACE_CMD} -e 's|javax.media.opengl.glu.GLUnurbs|com.jogamp.opengl.glu.GLUnurbs|' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|jogamp.common.os.MachineDescriptionRuntime|jogamp.common.os.MachineDataInfoRuntime|' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|%%JAVA_HOME%%|${JAVA_HOME}|' ${WRKSRC}/bin/scilab
 
 pre-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}/.atoms
 
 post-install:
 	@${FIND} ${STAGEDIR}${DATADIR}/modules -type d -empty -delete
 
 .include <bsd.port.post.mk>
diff --git a/math/scorec-core/Makefile b/math/scorec-core/Makefile
index 7bea7085b6bd..6a770e3d08a7 100644
--- a/math/scorec-core/Makefile
+++ b/math/scorec-core/Makefile
@@ -1,51 +1,52 @@
 PORTNAME=	scorec-core
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.2.7-55
+PORTREVISION=	1
 DISTVERSIONSUFFIX=	-g83113372
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Parallel finite element unstructured meshes
 WWW=		https://github.com/SCOREC/core
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	\
 		libepoll-shim.so:devel/libepoll-shim \
 		libfabric.so:net/libfabric \
 		libhwloc.so:devel/hwloc2 \
 		libjson-c.so:devel/json-c \
 		libze_loader.so:devel/level-zero
 
 USES=		cmake:testing compiler:c++11-lang pkgconfig
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	SCOREC
 GH_PROJECT=	core
 GH_TUPLE=	SCOREC:pumi-meshes:7b84de7:meshes/pumi-meshes
 
 CFLAGS+=	${MPI_CFLAGS}
 CXXFLAGS+=	${MPI_CFLAGS}
 LDFLAGS+=	${MPI_LIBS}
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 CMAKE_TESTING_ON=	IS_TESTING # some tests fail possibly because they need a larger MPI cluster
 
 OPTIONS_DEFINE=		FORTRAN
 OPTIONS_SINGLE=		MPI
 OPTIONS_SINGLE_MPI=	MPICH OPENMPI
 OPTIONS_DEFAULT=	FORTRAN MPICH
 OPTIONS_SUB=		yes
 
 FORTRAN_USES=		fortran
 FORTRAN_CMAKE_BOOL=	PUMI_FORTRAN_INTERFACE
 
 MPICH_USES=		mpi:mpich
 
 OPENMPI_USES=		mpi:openmpi
 
 PORTSCOUT=	limit:^.*[0-9]\.[0-9].* # prevent tags like remove_viz
 
 .include <bsd.port.mk>
diff --git a/math/scs/Makefile b/math/scs/Makefile
index 62a0620367ed..86ad408c52e2 100644
--- a/math/scs/Makefile
+++ b/math/scs/Makefile
@@ -1,31 +1,32 @@
 PORTNAME=	scs
 DISTVERSION=	3.2.0
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Solver of convex cone problems via operator splitting
 WWW=		https://github.com/cvxgrp/scs
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 USES=		gmake blaslapack:openblas fortran # fortran is for openblas
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	cvxgrp
 
 MAKE_ARGS=	BLASLDFLAGS="-lopenblas"
 
 ALL_TARGET=	default
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so
 
 do-test:
 	cd ${WRKSRC} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} out/demo_socp_indirect && \
 		out/demo_socp_indirect 50 0.3 0.3 50 && \
 		${ECHO} "Test succeeded"
 
 .include <bsd.port.mk>
diff --git a/math/sdpa/Makefile b/math/sdpa/Makefile
index c0913aabafc0..17f616645c91 100644
--- a/math/sdpa/Makefile
+++ b/math/sdpa/Makefile
@@ -1,70 +1,70 @@
 PORTNAME=	sdpa
 PORTVERSION=	7.3.8
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	math
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME} \
 		DEBIAN/pool/main/m/mumps:mumps
 DISTFILES=	${PORTNAME}_${PORTVERSION}${EXTRACT_SUFX} \
 		mumps_4.10.0.dfsg.orig.tar.gz:mumps
 DIST_SUBDIR=	sdpa
 EXTRACT_ONLY=	${PORTNAME}_${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Very efficient SDP (semidefinite programming) solver
 WWW=		http://sdpa.sourceforge.net/
 
 LICENSE=	GPLv2 # (or later)
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		fortran gmake
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-blas="-L${LOCALBASE}/lib ${BLASLIB}" \
 		--with-lapack="-L${LOCALBASE}/lib ${LAPACKLIB}"
 
 PORTDOCS=	${MANUALFILE}
 PLIST_FILES=	bin/sdpa %%DATADIR%%/param.sdpa
 
 OPTIONS_DEFINE=		DOCS
 OPTIONS_SINGLE=		BLAS
 OPTIONS_SINGLE_BLAS=	ATLAS GOTOBLAS REFERENCE
 OPTIONS_DEFAULT=	REFERENCE
 
 ATLAS_USES=		blaslapack:atlas
 DOCS_DISTFILES=		${MANUALFILE}
 GOTOBLAS_DESC=		GotoBLAS blas implementation
 GOTOBLAS_USES=		blaslapack:gotoblas
 REFERENCE_DESC=		Reference blas implementation
 REFERENCE_USES=		blaslapack
 
 MANUALFILE=		sdpa.7.1.1.manual.20080618.pdf
 
 .include <bsd.port.pre.mk>
 
 .if ${GCC_DEFAULT} >= 10
 # workaround for Type mismatch in argument 's' at (1); passed INTEGER(4) to LOGICAL(4)
 CONFIGURE_ARGS+=	FCFLAGS=-fallow-argument-mismatch
 .endif
 
 post-extract:
 	@(cd ${DISTDIR}/${DIST_SUBDIR} && ${PAX} -rw \
 		mumps_4.10.0.dfsg.orig.tar.gz ${WRKSRC}/mumps)
 
 post-patch:
 # Register missing target dependency to unbreak parallel builds
 	@${REINPLACE_CMD} -e 's,^sdpa_DEPENDENCIES =,& $$(lib_LIBRARIES),' \
 		${WRKSRC}/Makefile.in
 .for i in sdpa.1 sdpa_exe.cpp
 	@${REINPLACE_CMD} -e \
 		's|/usr/share/sdpa/|${DATADIR}/|' ${WRKSRC}/${i}
 .endfor
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/sdpa ${STAGEDIR}${PREFIX}/bin
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA}    ${WRKSRC}/param.sdpa ${STAGEDIR}${DATADIR}
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${MANUALFILE} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.post.mk>
diff --git a/math/sfft/Makefile b/math/sfft/Makefile
index 2da9007187be..2a1f158197f6 100644
--- a/math/sfft/Makefile
+++ b/math/sfft/Makefile
@@ -1,115 +1,115 @@
 PORTNAME=	sfft
 PORTVERSION=	0.1.0
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	math
 MASTER_SITES=	http://spiral.net/software/sfft/ LOCAL/bf
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Optimized Sparse Fast Fourier Transform
 WWW=		https://spiral.net/software/sfft.html
 
 LICENSE=	GPLv2
 
 ONLY_FOR_ARCHS=		amd64 i386
 ONLY_FOR_ARCHS_REASON=	requires SSE instructions, which are x86-specific
 
 LIB_DEPENDS=	libfftw3.so:math/fftw3
 
 USES=		uidfix zip
 USE_GCC=	yes
 USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=		OPTIMIZED_CFLAGS PROFILE DOCS
 OPTIONS_DEFAULT=	OPTIMIZED_CFLAGS
 
 BUILD_WRKSRC=	${WRKSRC}/src
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 CFLAGS+=	-fopenmp -msse2 -Iflopcount -I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 HEADERS=	sfft.h
 HDIR=		include/sfft
 MAKE_ENV=	LDADD="-lfftw3 ${LIBM}" LIB=sfft SHLIB_MAJOR="${SHLIB_MAJOR}" \
 		SRCCONF=/dev/null SRCS="${SRCS}"
 
 PLIST_FILES=	${HEADERS:S|^|${HDIR}/|} lib/libsfft.a lib/libsfft.so \
 		lib/libsfft.so.${SHLIB_MAJOR}
 
 SHLIB_MAJOR=	1
 SRCS=	common.cc computefourier-1.0-2.0.cc \
 	computefourier-3.0.cc fftw.cc filters.cc parameters.cc \
 	sfft.cc simulation.cc timer.cc utils.cc
 
 .include <bsd.port.options.mk>
 
 .if !${ARCH:Mamd64} && !${MACHINE_CPU:Msse2}
 IGNORE=	this port requires SSE2, and benefits from SSE3 -- set CPUTYPE\
 appropriately
 .endif
 
 LIBM=	-lm
 
 .if ${PORT_OPTIONS:MDOCS} || make(makesum)
 DISTFILES+=	sfft-doc.pdf
 PORTDOCS=	sfft-doc.pdf
 .endif
 
 .if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
 CFLAGS+=	-O3 -ffast-math
 .endif
 
 .if ${PORT_OPTIONS:MPROFILE}
 .if defined(NOPROFILE) || defined(NO_PROFILE) || defined(WITHOUT_PROFILE)
 IGNORE=		you have defined WITH_PROFILE, but have also defined\
 WITHOUT_PROFILE, NOPROFILE, or NO_PROFILE
 .elif !exists(/usr/lib/libc_p.a)
 IGNORE=		you have chosen WITH_PROFILE, but have not installed the\
 base system profiling libraries
 .endif
 PLIST_FILES+=	lib/libsfft_p.a
 .else
 MAKE_ENV+=	WITHOUT_PROFILE=yes
 .endif
 
 post-extract:
 	@${CP} /usr/include/complex.h ${BUILD_WRKSRC}/sfftcomplex.h
 	@${PRINTF} "LIBDIR=\t${PREFIX}/lib\n.include <bsd.lib.mk>\n" > \
 		${BUILD_WRKSRC}/Makefile
 
 post-patch:
 	@${REINPLACE_CMD} -e 's/string\.h/cstring/' \
 		${WRKSRC}/src/utils.cc
 	@${REINPLACE_CMD} -E -e '/<complex\.h>/ \
 	{s/<complex\.h>/ "sfftcomplex.h"/; x ; \
 	s|^.*$$|#endif|; G; x; \
 	s|^.*$$|extern "C" {|; G; x; \
 	s|^.*$$|#ifdef __cplusplus|; G; x; \
 	s|^.*$$|#ifdef __cplusplus|; H; \
 	s|^.*$$|}|; H; \
 	s|^.*$$|#endif|; H; x;}' \
 		${WRKSRC}/src/computefourier-1.0-2.0.h \
 		${WRKSRC}/src/computefourier-3.0.h \
 		${WRKSRC}/src/fft.h
 
 CORELIMIT?=	/usr/bin/limits -Sc 0
 
 do-test:
 	@cd ${BUILD_WRKSRC}; \
 	${CXX} ${CXXFLAGS} -o sfft-verification verification.cc \
 	${LDFLAGS} libsfft.a -lfftw3 ${LIBM} ; \
 	for _v in 1 2 3 ; do \
 	for _k in 5 10 50; do \
 	echo "Checking sfft version $${_v} with $${_k} frequency components:"; \
 	${CORELIMIT} ./sfft-verification -k $${_k} -r 3 -v $${_v} || ${TRUE} ; \
 	done ; done
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${HDIR}
 	@cd ${BUILD_WRKSRC}; ${INSTALL_DATA} ${HEADERS} ${STAGEDIR}${PREFIX}/${HDIR}
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${_DISTDIR}/${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/math/singular/Makefile b/math/singular/Makefile
index df655841fb3a..e81143063cb7 100644
--- a/math/singular/Makefile
+++ b/math/singular/Makefile
@@ -1,59 +1,60 @@
 PORTNAME=	singular
 DISTVERSIONPREFIX=	Release-
 DISTVERSION=	4-3-2
+PORTREVISION=	1
 CATEGORIES=	math
 #MASTER_SITES=	ftp://jim.mathematik.uni-kl.de/pub/Math/Singular/SOURCES/${PORTVERSION:C/\./-/g}/
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Computer algebra system for polynomial computations
 WWW=		https://www.singular.uni-kl.de/
 
 LICENSE=	GPLv3RLE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libgmp.so:math/gmp \
 		libmpfr.so:math/mpfr
 RUN_DEPENDS=	bash:shells/bash
 
 USES=		autoreconf gmake libtool ncurses perl5 pkgconfig readline shebangfix
 USE_PERL5=	build
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Singular
 GH_PROJECT=	Singular
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-gmp=${LOCALBASE} --disable-dependency-tracking --without-python
 
 SHEBANG_FILES=	Singular/surfex \
 		libpolys/libpolys-config.in \
 		libsingular-config.in
 
 TEST_TARGET=	check
 
 OPTIONS_DEFINE=		FLINT NTL
 OPTIONS_DEFAULT=	FLINT NTL
 OPTIONS_SUB=		yes
 
 FLINT_DESC=		Use FLINT library
 FLINT_CONFIGURE_ON=	--with-flint=${LOCALBASE}
 FLINT_CONFIGURE_OFF=	--with-flint=no
 FLINT_LIB_DEPENDS=	libflint.so:math/flint2
 
 NTL_DESC=		Use NTL library
 NTL_USES=		compiler:c11
 NTL_CONFIGURE_ON=	--with-ntl=${LOCALBASE}
 NTL_CONFIGURE_OFF=	--with-ntl=no
 NTL_LIB_DEPENDS=	libntl.so:math/ntl	\
 			libcddgmp.so:math/cddlib
 
 # not a shebang but "/bin/bash" is hardcoded in some files
 post-patch:
 	  @${REINPLACE_CMD} -e "s|/bin/bash|${LOCALBASE}/bin/bash|g" \
 		 ${WRKSRC}/emacs/.emacs-general
 
 post-install:
 	@${FIND} ${STAGEDIR}${PREFIX} -name "*.so" | ${XARGS} ${STRIP_CMD}
 
 .include <bsd.port.mk>
diff --git a/math/slatec/Makefile b/math/slatec/Makefile
index e2754edfb5e7..0c746dbf2da9 100644
--- a/math/slatec/Makefile
+++ b/math/slatec/Makefile
@@ -1,75 +1,75 @@
 PORTNAME=	slatec
 PORTVERSION=	4.1
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	math
 MASTER_SITES=	NL/slatec/:slatec NL/blas/:blas
 # Get d1mach.f, i1mach.f, r1mach.f from BLAS, rather than from Slatec:
 # See Netlib FAQ #2.17: http://netlib.org/misc/faq.html#2.17
 DISTFILES=	guide:slatec slatec_chk.tgz:slatec slatec_src.tgz:slatec \
 		toc:slatec d1mach.f:blas i1mach.f:blas r1mach.f:blas
 DIST_SUBDIR=	slatec
 EXTRACT_ONLY=	slatec_src.tgz slatec_chk.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	SLATEC Common Mathematical Library
 WWW=		https://www.netlib.org/slatec/
 
 USES=		fortran uidfix
 USE_LDCONFIG=	yes
 WRKSRC=		${WRKDIR}/src
 SHLIB_MAJOR=	1
 
 PLIST_FILES=	lib/libslatec.a lib/libslatec.so lib/libslatec.so.${SHLIB_MAJOR}
 PORTDOCS=	guide toc
 
 LDFLAGS+=	${FFLAGS}
 LDADD ?=	-lgfortran -lm
 SRCCONF=	/dev/null
 MAKE_ENV+=	LDADD="${LDADD}" SHLIB_MAJOR="${SHLIB_MAJOR}" \
 		SRCCONF="${SRCCONF}"
 FFLAGS+=	-std=legacy
 
 OPTIONS_DEFINE=	DOCS PROFILE
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPROFILE}
 .if defined(NOPROFILE) || defined(NO_PROFILE) || defined(WITHOUT_PROFILE)
 IGNORE=	you have selected PROFILE option, but have also defined\
 WITHOUT_PROFILE, NOPROFILE, or NO_PROFILE
 .elif !exists(/usr/lib/libc_p.a)
 IGNORE=	you have chosen WITH_PROFILE, but have not installed the\
 base system profiling libraries
 .endif
 PLIST_FILES+=	lib/libslatec_p.a
 .else
 MAKE_ENV+=	WITHOUT_PROFILE=yes
 .endif
 
 post-extract:
 	@${CP} ${_DISTDIR}/[dir]1mach.f ${WRKSRC}
 	@cd ${WRKDIR}; ${MV} dfmat.f dgvec.f duivp.f duvec.f fmat.f gvec.f \
 	uivp.f uvec.f ${WRKSRC}
 	@${CP} ${FILESDIR}/makefile.lib ${WRKSRC}/Makefile
 	@${CP} ${FILESDIR}/makefile.test ${WRKDIR}/Makefile
 
 TEST_VERBOSITY?=	1
 
 check regression-test test: test-dynamic test-static
 
 .for l in dynamic static
 test-${l}: build
 	@${ECHO_CMD} "****** Testing SLATEC ${l} library,"
 	@${ECHO_CMD} "****** using a verbosity of ${TEST_VERBOSITY}."
 	@${ECHO_CMD} "****** (The verbosity level can be selected by defining"
 	@${ECHO_CMD} "****** TEST_VERBOSITY=0|1|2|3.)"
 	@cd ${WRKDIR}; ${SETENV} ${MAKE_ENV} TEST_VERBOSITY="${TEST_VERBOSITY}" \
 	${MAKE} ${_MAKE_JOBS} ${MAKE_ARGS} test-${l}
 
 .endfor
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@cd ${_DISTDIR}; ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/math/slepc/Makefile b/math/slepc/Makefile
index ce342f35593f..ef9c3786b964 100644
--- a/math/slepc/Makefile
+++ b/math/slepc/Makefile
@@ -1,43 +1,44 @@
 PORTNAME=	slepc
 DISTVERSION=	3.19.0
+PORTREVISION=	1
 CATEGORIES=	math devel
 MASTER_SITES=	http://slepc.upv.es/download/distrib/
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Scalable Library for Eigenvalue Problem Computations
 WWW=		http://slepc.upv.es/
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 LIB_DEPENDS=	libblas.so:math/blas \
 		liblapack.so:math/lapack \
 		libmetis.so:math/metis \
 		libmpich.so:net/mpich \
 		libpetsc.so:science/PETSc
 
 USES=		gmake fortran python:3.9 shebangfix xorg
 USE_XORG=	x11 # not really needed, but is inherited from the PETSc setup
 USE_LDCONFIG=	yes
 
 SHEBANG_FILES=	configure
 SHEBANG_GLOB=	*.py
 
 MAKEFILE=	makefile
 MAKE_ENV=	PETSC_DIR=${LOCALBASE} PETSC_ARCH="" SLEPC_DIR=${WRKSRC} PYTHON=${PYTHON_CMD}
 
 TEST_TARGET=	test # 1 of 2568 tests fail because some file can't be opened
 
 BINARY_ALIAS=	python=${PYTHON_CMD}
 
 OPTIONS_DEFINE=	EXAMPLES
 
 PORTEXAMPLES=	*
 
 do-configure:
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./configure --prefix=${PREFIX}
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libslepc.so.${PORTVERSION}
 
 .include <bsd.port.mk>
diff --git a/math/slgrace/Makefile b/math/slgrace/Makefile
index d2826e4697c0..1bcef3653282 100644
--- a/math/slgrace/Makefile
+++ b/math/slgrace/Makefile
@@ -1,31 +1,31 @@
 PORTNAME=	slgrace
 PORTVERSION=	0.2.2
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	math devel
 MASTER_SITES=	ftp://space.mit.edu/pub/davis/slang/v${SLANG_VER}/modules/grace/ \
 		ftp://ftp.fu-berlin.de/pub/unix/misc/slang/v${SLANG_VER}/modules/grace/ \
 		LOCAL/garga/slgrace
 
 MAINTAINER=	garga@FreeBSD.org
 COMMENT=	SLang module to plot graphs with grace
 WWW=		http://www.jedsoft.org/slang/modules/grace/index.html
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libslang.so:devel/libslang2
 RUN_DEPENDS=	grace:math/grace
 
 OPTIONS_DEFINE=	DOCS
 
 SLANG_VER=	2.1
 
 GNU_CONFIGURE=	yes
 MAKE_JOBS_UNSAFE=	yes
 PLIST_SUB=	VERSION=${PORTVERSION}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's, install_docfiles,,' \
 			  -e '/MKINSDIR.*DEST_DOC_FILES_INSTALL_DIR/d' \
 		${WRKSRC}/src/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/math/slicot/Makefile b/math/slicot/Makefile
index e096d46ac50e..028c5ade07c7 100644
--- a/math/slicot/Makefile
+++ b/math/slicot/Makefile
@@ -1,68 +1,68 @@
 PORTNAME=	SLICOT
 PORTVERSION=	5.8
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Fortran subroutines library for systems and control
 WWW=		http://slicot.org/
 
 LICENSE=	BSD3CLAUSE
 
 USE_GITHUB=	yes
 GH_PROJECT=	SLICOT-Reference
 
 USES=		blaslapack:openblas fortran
 
 WRKSRC_SUBDIR=	src
 PATCH_WRKSRC=	${WRKDIR}/${GH_PROJECT}-${PORTVERSION}
 MAKEFILE=	makefile
 MAKE_ENV=	FORTRAN=${FC} OPTS="${FFLAGS} -fPIC" LOADER=${FC}	\
 		LOADOPTS="../src/libslicot.a ${FFLAGS} ${BLASLIB} ${LAPACKLIB}"
 USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 PORTDOCS=	*
 
 post-build:
 	(cd ${WRKSRC} &&	\
 	${AR} ${ARFLAGS} libslicot.a *.o &&	\
 	${FC} ${LDFLAGS} -shared -Wl,-soname=libslicot.so.0	\
 		-o libslicot.so.0.0 *.o ${BLASLIB} ${LAPACKLIB} &&	\
 	${LN} -sf libslicot.so.0.0 libslicot.so.0 &&	\
 	${LN} -sf libslicot.so.0.0 libslicot.so)
 
 pre-configure-EXAMPLES-on:
 	${REINPLACE_CMD} -e 's|\\src\\|/src/|;s|\.obj|.o|g;s|\-exe:|-o |;s|exe;  T|exe;  ./T|'	\
 		${WRKSRC}/../examples/${MAKEFILE}
 
 post-build-EXAMPLES-on:
 	(cd ${WRKSRC}/../examples && ${DO_MAKE_BUILD} ${ALL_TARGET})
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib
 	${INSTALL_DATA} ${WRKSRC}/libslicot.a ${STAGEDIR}${PREFIX}/lib
 	${INSTALL_LIB} ${WRKSRC}/libslicot.so.0.0 ${STAGEDIR}${PREFIX}/lib
 	${RLN} ${STAGEDIR}${PREFIX}/lib/libslicot.so.0.0	\
 		${STAGEDIR}${PREFIX}/lib/libslicot.so
 	${RLN} ${STAGEDIR}${PREFIX}/lib/libslicot.so.0.0	\
 		${STAGEDIR}${PREFIX}/lib/libslicot.so.0
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in README.md libindex.html
 	${INSTALL_DATA} ${WRKSRC}/../${f} ${STAGEDIR}${DOCSDIR}
 .endfor
 	cd ${WRKSRC}/.. && ${COPYTREE_SHARE} doc ${STAGEDIR}${DOCSDIR}
 
 do-install-EXAMPLES-on:
 	${FIND} ${WRKSRC}/../examples -name "T*" -a ! -name "*\.*" |	\
 		${XARGS} ${STRIP_CMD}
 	${RM} ${WRKSRC}/../examples/*.o ${WRKSRC}/../examples/makefile.bak	\
 		${WRKSRC}/../examples/makefile.orig
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/../examples &&	\
 		${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/math/spblas/Makefile b/math/spblas/Makefile
index 31f0bca65304..8c212f5c295f 100644
--- a/math/spblas/Makefile
+++ b/math/spblas/Makefile
@@ -1,76 +1,76 @@
 PORTNAME=	spblas
 DISTVERSION=	1_02
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	math
 MASTER_SITES=	http://math.nist.gov/spblas/:1 LOCAL/bf/:1 NL/blas/blast-forum/:2
 DISTFILES=	nist_spblas_${DISTVERSION}.zip:1
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	NIST Sparse Basic Linear Algebra Subprograms (BLAS)
 WWW=		https://math.nist.gov/spblas/
 
 LICENSE=	PD
 
 USES=		dos2unix uidfix zip
 USE_GCC=	yes
 USE_LDCONFIG=	yes
 
 HEADERS=	blas_enum.h blas_sparse.h blas_sparse_proto.h
 HDIR=		include/spblas
 MAKE_ENV=	LIB=spblas SHLIB_MAJOR="${SHLIB_MAJOR}" \
 		SRCCONF=/dev/null SRCS="${SRCS}"
 
 NO_WRKSUBDIR=	yes
 OPTIONS_DEFINE=	PROFILE DOCS EXAMPLES
 
 PLIST_FILES=	${HEADERS:S|^|${HDIR}/|} lib/libspblas.a lib/libspblas.so \
 		lib/libspblas.so.${SHLIB_MAJOR}
 
 SHLIB_MAJOR=	1
 SRCS=		nist_spblas.cc
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPROFILE}
 .if defined(NOPROFILE) || defined(NO_PROFILE) || defined(WITHOUT_PROFILE)
 IGNORE=		you have defined WITH_PROFILE, but have also defined\
 WITHOUT_PROFILE, NOPROFILE, or NO_PROFILE
 .elif !exists(/usr/lib/libc_p.a)
 IGNORE=		you have chosen WITH_PROFILE, but have not installed the\
 base system profiling libraries
 .endif
 PLIST_FILES+=	lib/libspblas_p.a
 .else
 MAKE_ENV+=	WITHOUT_PROFILE=yes
 .endif
 
 .if ${PORT_OPTIONS:MDOCS}
 PORTDOCS=	blas-report.pdf
 .endif
 
 .if ${PORT_OPTIONS:MDOCS} || make(makesum)
 DISTFILES+=	blas-report.pdf:2
 EXTRACT_ONLY=	nist_spblas_${DISTVERSION}.zip
 .endif
 
 .if ${PORT_OPTIONS:MEXAMPLES}
 PORTEXAMPLES=	${SRCS}
 .endif
 
 post-extract:
 	@${PRINTF} "LIBDIR=\t${PREFIX}/lib\n.include <bsd.lib.mk>\n" > \
 		${WRKSRC}/Makefile
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${HDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${HEADERS} ${STAGEDIR}${PREFIX}/${HDIR}
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/math/spectra/Makefile b/math/spectra/Makefile
index aef2a688eacf..8299bf6966e4 100644
--- a/math/spectra/Makefile
+++ b/math/spectra/Makefile
@@ -1,25 +1,26 @@
 PORTNAME=	spectra
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.0.1
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	C++ library for large scale eigenvalue problems
 WWW=		https://spectralib.org
 
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 TEST_DEPENDS=	gmake>0:devel/gmake
 
 USES=		cmake eigen:3,build,run
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	yixuan
 
 NO_ARCH=	yes
 
 do-test: # some tests are known to fail: https://github.com/yixuan/spectra/issues/47
 	@cd ${WRKSRC}/test && ${SETENV} ${MAKE_ENV} CXXFLAGS=-I${LOCALBASE}/include/eigen3 ${GMAKE} all test
 
 .include <bsd.port.mk>
diff --git a/math/spfft/Makefile b/math/spfft/Makefile
index 21c5990b28ce..f7ab099dc6d1 100644
--- a/math/spfft/Makefile
+++ b/math/spfft/Makefile
@@ -1,50 +1,51 @@
 PORTNAME=	spfft
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.0.6
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Sparse 3D FFT library
 WWW=		https://github.com/eth-cscs/SpFFT
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libfftw3.so:math/fftw3
 
 USES=		cmake:testing compiler:c++11-lang
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	eth-cscs
 GH_PROJECT=	SpFFT
 
 CMAKE_TESTING_ON=	SPFFT_BUILD_TESTS
 CMAKE_TESTING_TARGET=	${ALL_TARGET}
 
 OPTIONS_DEFINE=		FORTRAN OPENMP
 OPTIONS_SINGLE=		MPI
 OPTIONS_SINGLE_MPI=	NOMPI MPICH OPENMPI
 OPTIONS_DEFAULT=	FORTRAN MPICH OPENMP
 OPTIONS_SUB=		yes
 
 FORTRAN_USES=		fortran
 FORTRAN_CMAKE_BOOL=	SPFFT_FORTRAN
 
 NOMPI_DESC=		Build without parallel processing support
 NOMPI_CMAKE_ON=		-DSPFFT_MPI=OFF
 
 MPICH_USES=		mpi:mpich
 MPICH_CMAKE_ON=		-DSPFFT_MPI=ON
 
 OPENMPI_USES=		mpi:openmpi
 OPENMPI_CMAKE_ON=	-DSPFFT_MPI=ON
 
 OPENMP_CMAKE_BOOL=	SPFFT_OMP
 
 post-test:
 	@cd ${BUILD_WRKSRC}/tests && \
 		./run_local_tests && \
 		./run_mpi_tests
 
 .include <bsd.port.mk>
diff --git a/math/spla/Makefile b/math/spla/Makefile
index 617ef8efc775..924b3b896661 100644
--- a/math/spla/Makefile
+++ b/math/spla/Makefile
@@ -1,40 +1,41 @@
 PORTNAME=	spla
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.5.4
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Specialized Parallel Linear Algebra
 WWW=		https://github.com/eth-cscs/spla
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libopenblas.so:math/openblas
 TEST_DEPENDS=	scalapack>0:math/scalapack
 
 USES=		cmake:testing compiler:c++11-lang
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	eth-cscs
 
 CMAKE_TESTING_ON=	SPLA_BUILD_TESTS # tests fail to link, see https://github.com/eth-cscs/spla/issues/24
 CMAKE_TESTING_TARGET=	${ALL_TARGET}
 
 OPTIONS_DEFINE=		FORTRAN OPENMP
 OPTIONS_SINGLE=		MPI
 OPTIONS_SINGLE_MPI=	MPICH OPENMPI
 OPTIONS_DEFAULT=	FORTRAN MPICH OPENMP
 OPTIONS_SUB=		yes
 
 FORTRAN_USES=		fortran
 FORTRAN_CMAKE_BOOL=	SPLA_FORTRAN
 
 MPICH_USES=		mpi:mpich
 
 OPENMPI_USES=		mpi:openmpi
 
 OPENMP_CMAKE_BOOL=	SPLA_OMP
 
 .include <bsd.port.mk>
diff --git a/math/sprng/Makefile b/math/sprng/Makefile
index a90123c510d4..32efedec5e19 100644
--- a/math/sprng/Makefile
+++ b/math/sprng/Makefile
@@ -1,65 +1,66 @@
 PORTNAME=	SPRNG
 PORTVERSION=	5.0
+PORTREVISION=	1
 CATEGORIES=	math science
 MASTER_SITES=	http://www.sprng.org/Version${PORTVERSION}/
 DISTNAME=	${PORTNAME:tl}${PORTVERSION:R}
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Scalable Parallel Pseudo Random Number Generators Library
 WWW=		http://www.sprng.org/
 
 LICENSE=	CC-BY-NC-SA-4.0
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libtestu01.so:math/testu01
 
 USES=		compiler dos2unix fortran gmake localbase tar:bz2
 DOS2UNIX_GLOB=	LICENSE
 
 FFLAGS=		-I${LOCALBASE}/include
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-testu01=${LOCALBASE}	\
 		--with-testu01lib=${LOCALBASE}/lib	\
 		--with-testu01inc=${LOCALBASE}/include/TestU01
 TEST_TARGET=	check
 
 PORTEXAMPLES=	*
 
 OPTIONS_DEFINE=		EXAMPLES MPICH
 OPTIONS_DEFAULT=	EXAMPLES MPICH
 OPTIONS_SUB=		yes
 MPICH_USES=		mpi:mpich
 MPICH_CONFIGURE_WITH=	mpi
 
 ASCII_TEXTS=	checkcmrg checklcg checklcg64 checklfg checkmlfg checkpmlcg	\
 		checksprng timecmrg timelcg timelcg64 timelfg timemlfg timepmlcg\
 		timesprng
 
 .include <bsd.port.pre.mk>
 
 pre-configure:
 .if ${CHOSEN_COMPILER_TYPE} == clang
 	${FIND} ${WRKSRC} -name Makefile.in |	\
 		${XARGS} ${REINPLACE_CMD} -e 's|-lstdc++|-lc++|'
 .endif
 .for s in check_gen.cpp check_gen_simple.cpp
 	${FIND} ${WRKSRC} -name ${s} |	\
 		${XARGS} ${REINPLACE_CMD} -e 's|using namespace std;||'
 .endfor
 
 post-stage:
 	(cd ${STAGEDIR}${PREFIX}/share &&	\
 	${RM} .insertlib gencheck gentime insertlib)
 	(cd ${STAGEDIR}${PREFIX}/bin &&	${RM} ${ASCII_TEXTS})
 
 post-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	(cd ${WRKSRC}/EXAMPLES &&	\
 	${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
 	(cd ${STAGEDIR}${EXAMPLESDIR} && ${RM} -r .deps)
 .if !defined(WITH_DEBUG)
 	${FIND} ${STAGEDIR}${EXAMPLESDIR} -name "*.sprng" | \
 		${XARGS} ${STRIP_CMD}
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/math/stan/Makefile b/math/stan/Makefile
index 46f0727fe467..4adceac83e24 100644
--- a/math/stan/Makefile
+++ b/math/stan/Makefile
@@ -1,32 +1,33 @@
 PORTNAME=	stan
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.30.0
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	C++ package for Bayesian inference, maximum likelihood estimation, etc
 WWW=		https://mc-stan.org/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 RUN_DEPENDS=	stanmath>0:math/stanmath
 TEST_DEPENDS=	gmake:devel/gmake
 
 USES=		eigen:3,run gmake python:test shebangfix
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	stan-dev
 
 SHEBANG_FILES=	runTests.py
 
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 do-install:
 	@cd ${WRKSRC}/src && ${COPYTREE_SHARE} stan ${STAGEDIR}${PREFIX}/include
 
 do-test: # fails to compile: https://github.com/stan-dev/stan/issues/3058
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./runTests.py src/test/unit
 
 .include <bsd.port.mk>
diff --git a/math/stanmath/Makefile b/math/stanmath/Makefile
index 54ced8a40b49..f6a27df32192 100644
--- a/math/stanmath/Makefile
+++ b/math/stanmath/Makefile
@@ -1,36 +1,37 @@
 PORTNAME=	stanmath
 DISTVERSIONPREFIX=	v
 DISTVERSION=	4.4.0
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	C++ template library for automatic differentiation
 WWW=		https://mc-stan.org/math/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 RUN_DEPENDS=	${LOCALBASE}/include/boost/math/constants/constants.hpp:devel/boost-libs \
 		${LOCALBASE}/include/tbb/task_arena.h:devel/onetbb # compiler define -DTBB_INTERFACE_NEW chooses oneTBB as opposed to TBB
 TEST_DEPENDS=	gmake:devel/gmake
 
 USES=		eigen:3,run python:test shebangfix
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	stan-dev
 GH_PROJECT=	math
 
 SHEBANG_FILES=	runTests.py
 
 MAKE_ENV=	TBB_LIB="${LOCALBASE}/lib"
 
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 do-install:
 	@cd ${WRKSRC} && ${COPYTREE_SHARE} stan ${STAGEDIR}${PREFIX}/include
 
 do-test: # fails to compile: https://github.com/stan-dev/math/issues/2571
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./runTests.py test/unit test/prob
 
 .include <bsd.port.mk>
diff --git a/math/suitesparse-amd/Makefile b/math/suitesparse-amd/Makefile
index b19ccf7333de..204f30de8ae7 100644
--- a/math/suitesparse-amd/Makefile
+++ b/math/suitesparse-amd/Makefile
@@ -1,24 +1,25 @@
 PORTNAME=	${MPORTNAME:tl}
 PORTVERSION=	3.0.3
+PORTREVISION=	1
 CATEGORIES=	math
 
 COMMENT=	Symmetric approximate minimum degree
 WWW=		https://faculty.cse.tamu.edu/davis/suitesparse.html
 
 LICENSE=	BSD3CLAUSE
 
 USES=		localbase:ldflags fortran
 
 MPORTNAME=	AMD
 USE_LDCONFIG=	yes
 
 .include "${.CURDIR}/../../math/suitesparse/bsd.suitesparse.mk"
 
 post-stage-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${BUILD_WRKSRC}/README.txt	\
 		${STAGEDIR}${DOCSDIR}/${MPORTNAME}_README.txt
 	${INSTALL_DATA} ${BUILD_WRKSRC}/Doc/AMD_UserGuide.pdf	\
 		${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.post.mk>
diff --git a/math/suitesparse-btf/Makefile b/math/suitesparse-btf/Makefile
index 49a57f9e1db5..3f934eda4d52 100644
--- a/math/suitesparse-btf/Makefile
+++ b/math/suitesparse-btf/Makefile
@@ -1,22 +1,23 @@
 PORTNAME=	${MPORTNAME:tl}
 PORTVERSION=	2.0.3
+PORTREVISION=	1
 CATEGORIES=	math
 
 COMMENT=	Permutation to block triangular form
 WWW=		https://faculty.cse.tamu.edu/davis/suitesparse.html
 
 LICENSE=	LGPL21+
 
 USES=		localbase:ldflags
 
 MPORTNAME=	BTF
 USE_LDCONFIG=	yes
 
 .include "${.CURDIR}/../../math/suitesparse/bsd.suitesparse.mk"
 
 post-stage-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${BUILD_WRKSRC}/README.txt	\
 		${STAGEDIR}${DOCSDIR}/${MPORTNAME}_README.txt
 
 .include <bsd.port.post.mk>
diff --git a/math/suitesparse-camd/Makefile b/math/suitesparse-camd/Makefile
index f275bed6d2c0..4f91bd42e3c9 100644
--- a/math/suitesparse-camd/Makefile
+++ b/math/suitesparse-camd/Makefile
@@ -1,24 +1,25 @@
 PORTNAME=	${MPORTNAME:tl}
 PORTVERSION=	3.0.3
+PORTREVISION=	1
 CATEGORIES=	math
 
 COMMENT=	Symmetric approximate minimum degree
 WWW=		https://faculty.cse.tamu.edu/davis/suitesparse.html
 
 LICENSE=	BSD3CLAUSE
 
 USES=		localbase:ldflags
 
 MPORTNAME=	CAMD
 USE_LDCONFIG=	yes
 
 .include "${.CURDIR}/../../math/suitesparse/bsd.suitesparse.mk"
 
 post-stage-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${BUILD_WRKSRC}/README.txt	\
 		${STAGEDIR}${DOCSDIR}/${MPORTNAME}_README.txt
 	${INSTALL_DATA} ${BUILD_WRKSRC}/Doc/CAMD_UserGuide.pdf	\
 		${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.post.mk>
diff --git a/math/suitesparse-ccolamd/Makefile b/math/suitesparse-ccolamd/Makefile
index 4bea7de221e1..87b8840b253b 100644
--- a/math/suitesparse-ccolamd/Makefile
+++ b/math/suitesparse-ccolamd/Makefile
@@ -1,22 +1,23 @@
 PORTNAME=	${MPORTNAME:tl}
 PORTVERSION=	3.0.3
+PORTREVISION=	1
 CATEGORIES=	math
 
 COMMENT=	Constrained column approximate minimum degree ordering
 WWW=		https://faculty.cse.tamu.edu/davis/suitesparse.html
 
 LICENSE=	BSD3CLAUSE
 
 USES=		localbase:ldflags
 
 MPORTNAME=	CCOLAMD
 USE_LDCONFIG=	yes
 
 .include "${.CURDIR}/../../math/suitesparse/bsd.suitesparse.mk"
 
 post-stage-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${BUILD_WRKSRC}/README.txt	\
 		${STAGEDIR}${DOCSDIR}/${MPORTNAME}_README.txt
 
 .include <bsd.port.post.mk>
diff --git a/math/suitesparse-cholmod/Makefile b/math/suitesparse-cholmod/Makefile
index b0c99923eeea..0ef374985c32 100644
--- a/math/suitesparse-cholmod/Makefile
+++ b/math/suitesparse-cholmod/Makefile
@@ -1,30 +1,31 @@
 PORTNAME=	${MPORTNAME:tl}
 PORTVERSION=	4.0.3
+PORTREVISION=	1
 CATEGORIES=	math
 
 COMMENT=	Sparse CHOLesky MODification package
 WWW=		https://faculty.cse.tamu.edu/davis/suitesparse.html
 
 LICENSE=	LGPL21+
 
 LIB_DEPENDS=	libmetis.so:math/metis		\
 		libamd.so:math/suitesparse-amd		\
 		libcamd.so:math/suitesparse-camd	\
 		libcolamd.so:math/suitesparse-colamd	\
 		libccolamd.so:math/suitesparse-ccolamd
 
 USES=		localbase:ldflags
 
 MPORTNAME=	CHOLMOD
 USE_LDCONFIG=	yes
 
 .include "${.CURDIR}/../../math/suitesparse/bsd.suitesparse.mk"
 
 post-stage-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${BUILD_WRKSRC}/README.txt	\
 		${STAGEDIR}${DOCSDIR}/${MPORTNAME}_README.txt
 	${INSTALL_DATA} ${BUILD_WRKSRC}/Doc/${MPORTNAME}_UserGuide.pdf	\
 		${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.post.mk>
diff --git a/math/suitesparse-colamd/Makefile b/math/suitesparse-colamd/Makefile
index 9578ecb68f0e..e0f456728504 100644
--- a/math/suitesparse-colamd/Makefile
+++ b/math/suitesparse-colamd/Makefile
@@ -1,22 +1,23 @@
 PORTNAME=	${MPORTNAME:tl}
 PORTVERSION=	3.0.3
+PORTREVISION=	1
 CATEGORIES=	math
 
 COMMENT=	Column approximate minimum degree ordering algorithm
 WWW=		https://faculty.cse.tamu.edu/davis/suitesparse.html
 
 LICENSE=	BSD3CLAUSE
 
 USES=		localbase:ldflags
 
 MPORTNAME=	COLAMD
 USE_LDCONFIG=	yes
 
 .include "${.CURDIR}/../../math/suitesparse/bsd.suitesparse.mk"
 
 post-stage-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${BUILD_WRKSRC}/README.txt	\
 		${STAGEDIR}${DOCSDIR}/${MPORTNAME}_README.txt
 
 .include <bsd.port.post.mk>
diff --git a/math/suitesparse-config/Makefile b/math/suitesparse-config/Makefile
index e3c4e3f8c8b8..9f6c1505f727 100644
--- a/math/suitesparse-config/Makefile
+++ b/math/suitesparse-config/Makefile
@@ -1,22 +1,23 @@
 PORTNAME=	${MPORTNAME:tl}
 PORTVERSION=	${SSPVERSION}
+PORTREVISION=	1
 CATEGORIES=	math
 
 COMMENT=	Common library for SuiteSparse
 WWW=		https://faculty.cse.tamu.edu/davis/suitesparse.html
 
 LICENSE=	GPLv2+
 
 MPORTNAME=	config
 USE_LDCONFIG=	yes
 
 .include "${.CURDIR}/../../math/suitesparse/bsd.suitesparse.mk"
 
 post-stage-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.md	\
 		${STAGEDIR}${DOCSDIR}/SuiteSparse_README.md
 	${INSTALL_DATA} ${BUILD_WRKSRC}/README.txt	\
 		${STAGEDIR}${DOCSDIR}/${PORTNAME}_README.txt
 
 .include <bsd.port.post.mk>
diff --git a/math/suitesparse-csparse/Makefile b/math/suitesparse-csparse/Makefile
index 90ad501ea674..bc93c27b07cb 100644
--- a/math/suitesparse-csparse/Makefile
+++ b/math/suitesparse-csparse/Makefile
@@ -1,25 +1,26 @@
 PORTNAME=	${MPORTNAME:tl}
 PORTVERSION=	4.0.1
+PORTREVISION=	1
 CATEGORIES=	math
 
 COMMENT=	Concise Sparse Matrix package
 WWW=		https://faculty.cse.tamu.edu/davis/suitesparse.html
 
 LICENSE=	LGPL21+
 
 USES=		localbase:ldflags
 
 MPORTNAME=	CSparse
 USE_LDCONFIG=	yes
 PLIST_FILES=	# empty
 
 # For system-wide installation, the author recommends that you install
 # CXSparse instead.
 # The CSparse library is meant for personal experimentation.  The 'make
 # install' in this Makefile only installs a static compiled library in
 # CSparse/Lib.  It does not install it for system-wide usage.
 do-install:
 	${DO_NADA}
 
 .include "${.CURDIR}/../../math/suitesparse/bsd.suitesparse.mk"
 .include <bsd.port.post.mk>
diff --git a/math/suitesparse-cxsparse/Makefile b/math/suitesparse-cxsparse/Makefile
index fefa08839e79..5637f7da062e 100644
--- a/math/suitesparse-cxsparse/Makefile
+++ b/math/suitesparse-cxsparse/Makefile
@@ -1,22 +1,23 @@
 PORTNAME=	${MPORTNAME:tl}
 PORTVERSION=	4.0.3
+PORTREVISION=	1
 CATEGORIES=	math
 
 COMMENT=	Extended version of CSparse
 WWW=		https://faculty.cse.tamu.edu/davis/suitesparse.html
 
 LICENSE=	LGPL21+
 
 USES=		localbase:ldflags
 
 MPORTNAME=	CXSparse
 USE_LDCONFIG=	yes
 
 .include "${.CURDIR}/../../math/suitesparse/bsd.suitesparse.mk"
 
 post-stage-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${BUILD_WRKSRC}/README.txt	\
 		${STAGEDIR}${DOCSDIR}/${MPORTNAME}_README.txt
 
 .include <bsd.port.post.mk>
diff --git a/math/suitesparse-graphblas/Makefile b/math/suitesparse-graphblas/Makefile
index 7861aee110cd..e25e80b5b74a 100644
--- a/math/suitesparse-graphblas/Makefile
+++ b/math/suitesparse-graphblas/Makefile
@@ -1,27 +1,28 @@
 PORTNAME=	${MPORTNAME:tl}
 PORTVERSION=	7.4.3
+PORTREVISION=	1
 CATEGORIES=	math
 
 COMMENT=	Graph algorithms in the language of linear algebra
 WWW=		https://faculty.cse.tamu.edu/davis/suitesparse.html
 
 LICENSE=	APACHE20
 
 USES=		localbase:ldflags
 
 MPORTNAME=	GraphBLAS
 USE_LDCONFIG=	yes
 
 PORTDOCS=	CSC20_OpenMP_GraphBLAS.pdf GraphBLAS_API_C_v13.pdf	\
 		GraphBLAS_UserGuide.pdf HPEC19.pdf lagraph-grapl19.pdf	\
 		toms_graphblas.pdf
 
 .include "${.CURDIR}/../../math/suitesparse/bsd.suitesparse.mk"
 
 post-stage-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for doc in ${PORTDOCS}
 	${INSTALL_DATA} ${BUILD_WRKSRC}/Doc/${doc} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/math/suitesparse-klu/Makefile b/math/suitesparse-klu/Makefile
index f5f7ce8f2557..ce45d0be4368 100644
--- a/math/suitesparse-klu/Makefile
+++ b/math/suitesparse-klu/Makefile
@@ -1,32 +1,33 @@
 PORTNAME=	${MPORTNAME:tl}
 PORTVERSION=	2.0.3
+PORTREVISION=	1
 CATEGORIES=	math
 
 COMMENT=	Sparse LU factorization, for circuit simulation
 WWW=		https://faculty.cse.tamu.edu/davis/suitesparse.html
 
 LICENSE=	LGPL21+
 
 LIB_DEPENDS=	libmetis.so:math/metis		\
 		libamd.so:math/suitesparse-amd		\
 		libbtf.so:math/suitesparse-btf		\
 		libcamd.so:math/suitesparse-camd	\
 		libcolamd.so:math/suitesparse-colamd	\
 		libccolamd.so:math/suitesparse-ccolamd	\
 		libcholmod.so:math/suitesparse-cholmod
 
 USES=		localbase:ldflags
 
 MPORTNAME=	KLU
 USE_LDCONFIG=	yes
 
 .include "${.CURDIR}/../../math/suitesparse/bsd.suitesparse.mk"
 
 post-stage-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${BUILD_WRKSRC}/README.txt	\
 		${STAGEDIR}${DOCSDIR}/${MPORTNAME}_README.txt
 	${INSTALL_DATA} ${BUILD_WRKSRC}/Doc/${MPORTNAME}_UserGuide.pdf	\
 		${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.post.mk>
diff --git a/math/suitesparse-ldl/Makefile b/math/suitesparse-ldl/Makefile
index da8fa5cbf30a..f58360a8c9c6 100644
--- a/math/suitesparse-ldl/Makefile
+++ b/math/suitesparse-ldl/Makefile
@@ -1,26 +1,27 @@
 PORTNAME=	${MPORTNAME:tl}
 PORTVERSION=	3.0.3
+PORTREVISION=	1
 CATEGORIES=	math
 
 COMMENT=	Simple LDL^T factorization
 WWW=		https://faculty.cse.tamu.edu/davis/suitesparse.html
 
 LICENSE=	LGPL21+
 
 LIB_DEPENDS=	libamd.so:math/suitesparse-amd
 
 USES=		localbase:ldflags
 
 MPORTNAME=	LDL
 USE_LDCONFIG=	yes
 
 .include "${.CURDIR}/../../math/suitesparse/bsd.suitesparse.mk"
 
 post-stage-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${BUILD_WRKSRC}/README.txt	\
 		${STAGEDIR}${DOCSDIR}/${MPORTNAME}_README.txt
 	${INSTALL_DATA} ${BUILD_WRKSRC}/Doc/ldl_userguide.pdf	\
 		${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.post.mk>
diff --git a/math/suitesparse-mongoose/Makefile b/math/suitesparse-mongoose/Makefile
index 5205e4b5b87d..ce9dd1194f9f 100644
--- a/math/suitesparse-mongoose/Makefile
+++ b/math/suitesparse-mongoose/Makefile
@@ -1,24 +1,25 @@
 PORTNAME=	${MPORTNAME:tl}
 PORTVERSION=	3.0.4
+PORTREVISION=	1
 CATEGORIES=	math
 
 COMMENT=	Symmetric approximate minimum degree
 WWW=		https://faculty.cse.tamu.edu/davis/suitesparse.html
 
 LICENSE=	GPLv3
 
 USES=		cmake:insource localbase:ldflags
 
 MPORTNAME=	Mongoose
 USE_LDCONFIG=	yes
 
 CONFLICTS_INSTALL=	mongoose # bin/mongoose
 
 .include "${.CURDIR}/../../math/suitesparse/bsd.suitesparse.mk"
 
 post-stage-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${BUILD_WRKSRC}/Doc/Mongoose_UserGuide.pdf	\
 		${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.post.mk>
diff --git a/math/suitesparse-rbio/Makefile b/math/suitesparse-rbio/Makefile
index fc8d2c45547f..3f6c2669151b 100644
--- a/math/suitesparse-rbio/Makefile
+++ b/math/suitesparse-rbio/Makefile
@@ -1,22 +1,23 @@
 PORTNAME=	${MPORTNAME:tl}
 PORTVERSION=	3.0.3
+PORTREVISION=	1
 CATEGORIES=	math
 
 COMMENT=	Read/write sparse matrices
 WWW=		https://faculty.cse.tamu.edu/davis/suitesparse.html
 
 LICENSE=	GPLv2+
 
 USES=		localbase:ldflags
 
 MPORTNAME=	RBio
 USE_LDCONFIG=	yes
 
 .include "${.CURDIR}/../../math/suitesparse/bsd.suitesparse.mk"
 
 post-stage-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${BUILD_WRKSRC}/README.txt	\
 		${STAGEDIR}${DOCSDIR}/${MPORTNAME}_README.txt
 
 .include <bsd.port.post.mk>
diff --git a/math/suitesparse-spex/Makefile b/math/suitesparse-spex/Makefile
index 2d32fe9e725c..9ba9de8fa4c2 100644
--- a/math/suitesparse-spex/Makefile
+++ b/math/suitesparse-spex/Makefile
@@ -1,31 +1,32 @@
 PORTNAME=	${MPORTNAME:tl}
 PORTVERSION=	2.0.3
+PORTREVISION=	1
 CATEGORIES=	math
 
 COMMENT=	Sparse Left-looking Integer-Preserving LU Factorization
 WWW=		https://faculty.cse.tamu.edu/davis/suitesparse.html
 
 LICENSE=	GPLv2+ LGPL3+
 LICENSE_COMB=	dual
 LICENSE_FILE=	${BUILD_WRKSRC}/LICENSE.txt
 
 LIB_DEPENDS=	libgmp.so:math/gmp	\
 		libmpfr.so:math/mpfr	\
 		libamd.so:math/suitesparse-amd	\
 		libcolamd.so:math/suitesparse-colamd
 
 USES=		localbase:ldflags
 
 MPORTNAME=	SPEX
 USE_LDCONFIG=	yes
 
 .include "${.CURDIR}/../../math/suitesparse/bsd.suitesparse.mk"
 
 post-stage-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${BUILD_WRKSRC}/README.md	\
 		${STAGEDIR}${DOCSDIR}/${MPORTNAME}_README.md
 	${INSTALL_DATA} ${BUILD_WRKSRC}/Doc/${MPORTNAME}_UserGuide.pdf	\
 		${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.post.mk>
diff --git a/math/suitesparse-spqr/Makefile b/math/suitesparse-spqr/Makefile
index 976fd9e6cf15..ea6d0db50d0e 100644
--- a/math/suitesparse-spqr/Makefile
+++ b/math/suitesparse-spqr/Makefile
@@ -1,30 +1,31 @@
 PORTNAME=	${MPORTNAME:tl}
 PORTVERSION=	3.0.3
+PORTREVISION=	1
 CATEGORIES=	math
 
 COMMENT=	Sparse QR factorization
 WWW=		https://faculty.cse.tamu.edu/davis/suitesparse.html
 
 LICENSE=	GPLv2+
 
 LIB_DEPENDS=	libamd.so:math/suitesparse-amd		\
 		libcamd.so:math/suitesparse-camd	\
 		libcolamd.so:math/suitesparse-colamd	\
 		libccolamd.so:math/suitesparse-ccolamd	\
 		libcholmod.so:math/suitesparse-cholmod
 
 USES=		localbase:ldflags
 
 MPORTNAME=	SPQR
 USE_LDCONFIG=	yes
 
 .include "${.CURDIR}/../../math/suitesparse/bsd.suitesparse.mk"
 
 post-stage-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${BUILD_WRKSRC}/README.txt	\
 		${STAGEDIR}${DOCSDIR}/${MPORTNAME}_README.txt
 	${INSTALL_DATA} ${BUILD_WRKSRC}/Doc/spqr_user_guide.pdf	\
 		${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.post.mk>
diff --git a/math/suitesparse-umfpack/Makefile b/math/suitesparse-umfpack/Makefile
index 6e936526c950..a47bd7bca8d2 100644
--- a/math/suitesparse-umfpack/Makefile
+++ b/math/suitesparse-umfpack/Makefile
@@ -1,33 +1,34 @@
 PORTNAME=	${MPORTNAME:tl}
 PORTVERSION=	6.1.0
+PORTREVISION=	1
 CATEGORIES=	math
 
 COMMENT=	Sparse multifrontal LU factorization
 WWW=		https://faculty.cse.tamu.edu/davis/suitesparse.html
 
 LICENSE=	GPLv2+
 
 LIB_DEPENDS=	libmetis.so:math/metis	\
 		libamd.so:math/suitesparse-amd	\
 		libcamd.so:math/suitesparse-camd	\
 		libcolamd.so:math/suitesparse-colamd	\
 		libccolamd.so:math/suitesparse-ccolamd	\
 		libcholmod.so:math/suitesparse-cholmod
 
 USES=		localbase:ldflags
 
 MPORTNAME=	UMFPACK
 USE_LDCONFIG=	yes
 
 .include "${.CURDIR}/../../math/suitesparse/bsd.suitesparse.mk"
 
 post-stage-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${BUILD_WRKSRC}/README.txt	\
 		${STAGEDIR}${DOCSDIR}/${MPORTNAME}_README.txt
 	${INSTALL_DATA} ${BUILD_WRKSRC}/Doc/${MPORTNAME}_QuickStart.pdf	\
 		${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${BUILD_WRKSRC}/Doc/${MPORTNAME}_UserGuide.pdf	\
 		${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.post.mk>
diff --git a/math/suitesparse/Makefile b/math/suitesparse/Makefile
index 2c506d64b12c..893a0418a31e 100644
--- a/math/suitesparse/Makefile
+++ b/math/suitesparse/Makefile
@@ -1,31 +1,32 @@
 PORTNAME=	suitesparse
 PORTVERSION=	7.0.1
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	fortran@FreeBSD.org
 COMMENT=	Set of packages for sparse matrix calculation
 WWW=		https://faculty.cse.tamu.edu/davis/suitesparse.html
 
 RUN_DEPENDS=	suitesparse-amd>0:math/suitesparse-amd			\
 		suitesparse-btf>0:math/suitesparse-btf			\
 		suitesparse-camd>0:math/suitesparse-camd		\
 		suitesparse-ccolamd>0:math/suitesparse-ccolamd		\
 		suitesparse-cholmod>0:math/suitesparse-cholmod		\
 		suitesparse-colamd>0:math/suitesparse-colamd		\
 		suitesparse-config>0:math/suitesparse-config		\
 		suitesparse-cxsparse>0:math/suitesparse-cxsparse	\
 		suitesparse-graphblas>0:math/suitesparse-graphblas	\
 		suitesparse-klu>0:math/suitesparse-klu			\
 		suitesparse-ldl>0:math/suitesparse-ldl			\
 		suitesparse-mongoose>0:math/suitesparse-mongoose	\
 		suitesparse-rbio>0:math/suitesparse-rbio		\
 		suitesparse-spex>0:math/suitesparse-spex		\
 		suitesparse-spqr>0:math/suitesparse-spqr		\
 		suitesparse-umfpack>0:math/suitesparse-umfpack
 .if !defined(PACKAGE_BUILDING)
 RUN_DEPENDS+=	suitesparse-csparse>0:math/suitesparse-csparse
 .endif
 
 USES=		metaport
 
 .include <bsd.port.mk>
diff --git a/math/sundials/Makefile b/math/sundials/Makefile
index f6eee171f48b..1a55172debc5 100644
--- a/math/sundials/Makefile
+++ b/math/sundials/Makefile
@@ -1,81 +1,81 @@
 PORTNAME=	sundials
 DISTVERSION=	6.4.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 MASTER_SITES=	https://github.com/LLNL/sundials/releases/download/v${DISTVERSION}/
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	SUite of Nonlinear and DIfferential/ALgebraic Equation Solvers
 WWW=		https://computing.llnl.gov/projects/sundials
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		cmake:testing fortran localbase:ldflags python:build # 4 tests fail, see https://github.com/LLNL/sundials/issues/220
 USE_LDCONFIG=	yes
 
 CMAKE_ARGS=		-DCMAKE_C_STANDARD=99
 CMAKE_ON=		ENABLE_PTHREAD
 CMAKE_OFF=		BUILD_STATIC_LIBS \
 			EXAMPLES_ENABLE_C EXAMPLES_ENABLE_CXX EXAMPLES_ENABLE_F77 EXAMPLES_ENABLE_F90
 CMAKE_TESTING_ON=	SUNDIALS_TEST_UNITTESTS \
 			EXAMPLES_ENABLE_C EXAMPLES_ENABLE_CXX EXAMPLES_ENABLE_F77 EXAMPLES_ENABLE_F90
 
 FCFLAGS:=		${FFLAGS} # project checks that these flags are equal
 
 OPTIONS_DEFINE=		BLAS EXAMPLES KLU LAPACK MPI OPENMP
 OPTIONS_DEFAULT=	KLU LAPACK MPI OPENMP
 OPTIONS_GROUP=		VECTORS
 OPTIONS_GROUP_VECTORS=	HYPRE PETSC
 VECTORS_DESC=		Alternative vector libraries
 OPTIONS_SUB=		yes
 
 BLAS_DESC=		Enable BLAS support
 BLAS_CMAKE_BOOL=	ENABLE_BLAS
 BLAS_USES=		blaslapack:openblas
 
 #EXAMPLES_CMAKE_BOOL=	EXAMPLES_ENABLE_C EXAMPLES_ENABLE_CXX EXAMPLES_ENABLE_F77 EXAMPLES_ENABLE_F90
 #EXAMPLES_CMAKE_ON=	-DEXAMPLES_INSTALL_PATH=${EXAMPLESDIR}
 #PORTEXAMPLES=		*
 
 HYPRE_DESC=		HYPRE vectors support (also enables MPI)
 HYPRE_CMAKE_BOOL=	ENABLE_HYPRE
 HYPRE_CMAKE_ON=		-DHYPRE_INCLUDE_DIR=${LOCALBASE}/include \
 			-DHYPRE_LIBRARY_DIR=${LOCALBASE}/lib
 HYPRE_LIB_DEPENDS=	libHYPRE.so:science/hypre # maybe is broken due to https://github.com/hypre-space/hypre/issues/464
 HYPRE_IMPLIES=		MPI
 HYPRE_PREVENTS=		LAPACK  # error: Incompatible sunindextype for LAPACK; disable LAPACK and rebuild
 HYPRE_BROKEN=		ERROR: SUNDIALS interface to HYPRE is not functional.
 
 KLU_DESC=		Use KLU package that is part of suitesparse
 KLU_CMAKE_BOOL=		ENABLE_KLU
 KLU_CMAKE_ON=		-DKLU_INCLUDE_DIR=${LOCALBASE}/include/suitesparse -DKLU_LIBRARY_DIR=${LOCALBASE}/lib
 KLU_LIB_DEPENDS=	libamd.so:math/suitesparse-amd \
 			libbtf.so:math/suitesparse-btf \
 			libcolamd.so:math/suitesparse-colamd \
 			libklu.so:math/suitesparse-klu \
 			libsuitesparseconfig.so:math/suitesparse-config
 
 LAPACK_DESC=		Use Lapack linear algebra (sets SUNDIALS_INDEX_TYPE=int32)
 LAPACK_USES=		blaslapack:openblas
 LAPACK_CMAKE_BOOL=	ENABLE_LAPACK
 
 MPI_CMAKE_BOOL=		ENABLE_MPI
 MPI_LIB_DEPENDS=	libmpich.so:net/mpich
 
 OPENMP_CMAKE_BOOL=	ENABLE_OPENMP
 
 PETSC_DESC=		PETSc vectors support (also enables MPI)
 PETSC_CMAKE_BOOL=	ENABLE_PETSC
 PETSC_CMAKE_ON=		-DPETSC_DIR=${LOCALBASE} \
 			-DPETSC_INCLUDE_DIR=${LOCALBASE}/include \
 			-DPETSC_LIBRARY_DIR=${LOCALBASE}/lib
 PETSC_LIB_DEPENDS=	libpetsc.so:science/PETSc
 PETSC_IMPLIES=		MPI
 PETSC_PREVENTS=		LAPACK  # error: Incompatible sunindextype for LAPACK; disable LAPACK and rebuild
 PETSC_BROKEN=		ERROR: PETSc not functional due to index size mismatch: SUNDIALS_INDEX_SIZE=64, but PETSc was built with 32-bit indices
 
 post-install:
 	@${RM} ${STAGEDIR}${PREFIX}/include/sundials/LICENSE
 
 .include <bsd.port.mk>
diff --git a/math/superlu-dist/Makefile b/math/superlu-dist/Makefile
index 8b3cf9389dbd..c1a5224776ee 100644
--- a/math/superlu-dist/Makefile
+++ b/math/superlu-dist/Makefile
@@ -1,60 +1,61 @@
 PORTNAME=	superlu-dist
 DISTVERSIONPREFIX=	v
 DISTVERSION=	8.1.2
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Distributed memory, MPI based SuperLU
 WWW=		https://portal.nersc.gov/project/sparse/superlu/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/License.txt
 
 USES=		cmake:testing fortran pkgconfig
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	xiaoyeli
 GH_PROJECT=	superlu_dist
 
 CMAKE_ON=	USE_XSDK_DEFAULTS BUILD_SHARED_LIBS
 CMAKE_OFF=	enable_tests enable_examples TPL_ENABLE_PARMETISLIB
 CMAKE_TESTING_ON=	enable_tests # many tests fail, see https://github.com/xiaoyeli/superlu_dist/issues/113
 
 OPTIONS_DEFINE=		DOCS FORTRAN
 OPTIONS_SINGLE=		BLAS MPI
 OPTIONS_SINGLE_BLAS=	ATLAS GOTOBLAS OPENBLAS REFERENCE
 OPTIONS_SINGLE_MPI=	MPICH OPENMPI
 OPTIONS_DEFAULT=	FORTRAN MPICH REFERENCE
 OPTIONS_SUB=		yes
 
 # all BLAS-related options
 ATLAS_USES=		blaslapack:atlas
 ATLAS_CMAKE_ON=		-DBLA_VENDOR:STRING="ATLAS"
 GOTOBLAS_DESC=		GotoBLAS blas implementation
 GOTOBLAS_USES=		blaslapack:gotoblas
 GOTOBLAS_CMAKE_ON=	-DBLA_VENDOR:STRING="Goto"
 OPENBLAS_USES=		blaslapack:openblas
 OPENBLAS_CMAKE_ON=	-DBLA_VENDOR:STRING="OpenBLAS"
 REFERENCE_DESC=		Reference blas implementation
 REFERENCE_USES=		blaslapack
 REFERENCE_CMAKE_ON=	-DBLA_VENDOR:STRING="Generic"
 
 # other options
 FORTRAN_CMAKE_BOOL=	XSDK_ENABLE_Fortran
 MPICH_USES=		mpi:mpich
 OPENMPI_USES=		mpi:openmpi
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/DOC && ${COPYTREE_SHARE} "ug.pdf" ${STAGEDIR}${DOCSDIR}
 
 post-install-FORTRAN-on:
 	# workaround for https://github.com/xiaoyeli/superlu_dist/issues/112
 	@${RM} -r ${STAGEDIR}${PREFIX}/include/FORTRAN/CMakeFiles
 	# move .mod files to a proper location
 	@cd ${STAGEDIR}${PREFIX}/include && \
 		${MV} FORTRAN/* . && \
 		${RMDIR} FORTRAN
 
 .include <bsd.port.mk>
diff --git a/math/superlu/Makefile b/math/superlu/Makefile
index 6ef924f2b59f..ee6f928cfd5f 100644
--- a/math/superlu/Makefile
+++ b/math/superlu/Makefile
@@ -1,64 +1,65 @@
 PORTNAME=	superlu
 DISTVERSIONPREFIX=	v
 DISTVERSION=	5.3.0
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	robert.ayrapetyan@gmail.com
 COMMENT=	Library of routines for performing sparse factorization
 WWW=		https://portal.nersc.gov/project/sparse/superlu/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/License.txt
 
 USES=		cmake fortran pkgconfig
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	xiaoyeli
 
 CMAKE_ON=	USE_XSDK_DEFAULTS
 CMAKE_OFF=	enable_tests
 
 OPTIONS_DEFINE=		DOCS EXAMPLES
 OPTIONS_SINGLE=		BLAS
 OPTIONS_SINGLE_BLAS=	ATLAS GOTOBLAS OPENBLAS REFERENCE
 OPTIONS_DEFAULT=	REFERENCE
 
 ATLAS_USES=		blaslapack:atlas
 ATLAS_CMAKE_ON=		-DBLA_VENDOR:STRING="ATLAS"
 GOTOBLAS_DESC=		GotoBLAS blas implementation
 GOTOBLAS_USES=		blaslapack:gotoblas
 GOTOBLAS_CMAKE_ON=	-DBLA_VENDOR:STRING="Goto"
 OPENBLAS_USES=		blaslapack:openblas
 OPENBLAS_CMAKE_ON=	-DBLA_VENDOR:STRING="OpenBLAS"
 REFERENCE_DESC=		Reference blas implementation
 REFERENCE_USES=		blaslapack
 REFERENCE_CMAKE_ON=	-DBLA_VENDOR:STRING="Generic"
 
 PORTDOCS=		*
 PORTEXAMPLES=		*
 
 post-patch:
 	@${REINPLACE_CMD} -e \
 		'/CMAKE_C_FLAGS_RELEASE/s|^|#|' ${WRKSRC}/CMakeLists.txt
 	@${REINPLACE_CMD} -e \
 		'/FFLAGS/s|FATAL_ERROR|WARNING|' ${WRKSRC}/cmake/XSDKDefaults.cmake
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/DOC && ${COPYTREE_SHARE} "html ug.pdf" \
 		${STAGEDIR}${DOCSDIR}
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	(cd ${WRKSRC}/EXAMPLE && ${INSTALL_DATA} * ${STAGEDIR}${EXAMPLESDIR})
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/FORTRAN
 	(cd ${WRKSRC}/FORTRAN && ${INSTALL_DATA} * ${STAGEDIR}${EXAMPLESDIR}/FORTRAN)
 
 do-test:
 	@cd ${BUILD_WRKSRC} && \
 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -Denable_tests:BOOL=ON ${CMAKE_SOURCE_PATH} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
 
 .include <bsd.port.mk>
diff --git a/math/symengine/Makefile b/math/symengine/Makefile
index deadb32d1b67..68498695babc 100644
--- a/math/symengine/Makefile
+++ b/math/symengine/Makefile
@@ -1,87 +1,88 @@
 PORTNAME=	symengine
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.10.1
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Fast symbolic manipulation library, written in C++
 WWW=		https://symengine.org/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libboost_serialization.so:devel/boost-libs \
 		libgmp.so:math/gmp \
 		libzstd.so:archivers/zstd
 
 USES=		cmake compiler:c++14-lang llvm:min=15,max=15
 USE_GITHUB=	yes
 USE_LDCONFIG=	yes
 
 CMAKE_ON=	WITH_SYMENGINE_THREAD_SAFE BUILD_SHARED_LIBS BUILD_FOR_DISTRIBUTION
 CMAKE_OFF=	BUILD_BENCHMARKS WITH_COTIRE
 
 OPTIONS_DEFINE=			ARB ECM LLVM MPC TCMALLOC ASSERT
 OPTIONS_SINGLE=			INTCLASS
 OPTIONS_SINGLE_INTCLASS=	GMP GMPXX BOOSTMP FLINT PIRANHA
 OPTIONS_DEFAULT=		ARB ECM LLVM MPC FLINT # FLINT choice is based on best performance, TCMALLOC is broken due to memory corruption issues, see https://github.com/symengine/symengine.py/issues/412
 
 INTCLASS_DESC=		Integer class, use integers from:
 
 ARB_DESC=		Build with Arb (interval arithmetic library)
 ARB_CMAKE_BOOL=		WITH_ARB
 ARB_LIB_DEPENDS=	libarb.so:math/arb \
 			libflint.so:math/flint2 \
 			libmpfr.so:math/mpfr
 
 ECM_DESC=		Build with ECM support (Elliptic Curve Method)
 ECM_CMAKE_BOOL=		WITH_ECM
 ECM_LIB_DEPENDS=	libecm.so:math/gmp-ecm
 
 LLVM_DESC=		Build with LLVM
 LLVM_CMAKE_BOOL=	WITH_LLVM
 LLVM_CMAKE_ON=		-DLLVM_INCLUDE_DIRS:STRING=${LOCALBASE}/llvm${LLVM_VERSION}/include \
 			-DFREEBSD_LLVM_VERSION=${LLVM_VERSION}
 LLVM_BUILD_DEPENDS=	llvm${LLVM_VERSION}>0:devel/llvm${LLVM_VERSION}
 
 MPC_DESC=		Build with MPC
 MPC_CMAKE_BOOL=		WITH_MPC
 MPC_LIB_DEPENDS=	libmpc.so:math/mpc
 
 TCMALLOC_DESC=		Use tcmalloc from google-perftools (improves performance)
 TCMALLOC_CMAKE_BOOL=	WITH_TCMALLOC
 TCMALLOC_LIB_DEPENDS=	libtcmalloc.so:devel/google-perftools
 TCMALLOC_BROKEN=	associated with a suspected memory corruption problem, see https://github.com/symengine/symengine.py/issues/412
 
 ASSERT_CMAKE_BOOL=	WITH_SYMENGINE_ASSERT
 
 GMP_DESC=		gmp (supports arbitrary fp precision)
 GMP_CMAKE_ON=		-DINTEGER_CLASS:STRING=gmp
 GMP_LIB_DEPENDS=	libgmp.so:math/gmp \
 			libmpfr.so:math/mpfr
 
 GMPXX_DESC=		gmpxx
 GMPXX_CMAKE_ON=		-DINTEGER_CLASS:STRING=gmpxx
 GMPXX_LIB_DEPENDS=	libgmp.so:math/gmp
 
 BOOSTMP_DESC=		boostmp (no arbitrary fp precision)
 BOOSTMP_CMAKE_ON=	-DINTEGER_CLASS:STRING=boostmp
 BOOSTMP_BUILD_DEPENDS=	${LOCALBASE}/include/boost/multiprecision/cpp_int.hpp:devel/boost-libs
 
 FLINT_DESC=		flint (supports arbitrary fp precision, best performance)
 FLINT_CMAKE_ON=		-DINTEGER_CLASS:STRING=flint
 FLINT_LIB_DEPENDS=	libflint.so:math/flint2 \
 			libgmp.so:math/gmp \
 			libmpfr.so:math/mpfr
 
 PIRANHA_DESC=		piranha
 PIRANHA_CMAKE_ON=	-DINTEGER_CLASS:STRING=piranha
 PIRANHA_BUILD_DEPENDS=	piranha>0:math/piranha
 
 do-test: # one test fails: https://github.com/symengine/symengine/issues/1697
 	@cd ${BUILD_WRKSRC} && \
 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBUILD_TESTING:BOOL=ON ${CMAKE_SOURCE_PATH} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
 
 .include <bsd.port.mk>
diff --git a/math/symphony/Makefile b/math/symphony/Makefile
index 1892beb60c87..0e06e6888a5d 100644
--- a/math/symphony/Makefile
+++ b/math/symphony/Makefile
@@ -1,36 +1,37 @@
 PORTNAME=	symphony
 DISTVERSIONPREFIX=	releases/
 DISTVERSION=	5.6.19
+PORTREVISION=	1
 CATEGORIES=	math
 PKGNAMEPREFIX=	coin-or-
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Solver and development framework for mixed-integer linear programs
 WWW=		https://github.com/coin-or/SYMPHONY
 
 LICENSE=	EPL
 LICENSE_FILE=	${WRKSRC}/SYMPHONY/LICENSE
 
 LIB_DEPENDS=	libblas.so:math/blas \
 		libCbc.so:math/cbc \
 		libCgl.so:math/cgl \
 		libcoinasl.so:math/asl \
 		libcoinmumps.so:math/coin-or-mumps \
 		libCoinUtils.so:math/coinutils \
 		libopenblas.so:math/openblas \
 		libOsi.so:math/osi \
 		libClp.so:math/clp
 
 USES=		gmake libtool pkgconfig
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	coin-or
 GH_PROJECT=	${PORTNAME:tu}
 
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	test
 
 .include <bsd.port.mk>
diff --git a/math/sympol/Makefile b/math/sympol/Makefile
index fbeda3d0687f..e17f7eda0724 100644
--- a/math/sympol/Makefile
+++ b/math/sympol/Makefile
@@ -1,43 +1,43 @@
 PORTNAME=	sympol
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.1.9
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	C++ library and tool to work with symmetric polyhedra
 WWW=		https://www.math.uni-rostock.de/~rehn/software/sympol.html
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libbliss.a:math/bliss \
 		permlib>0:math/permlib
 LIB_DEPENDS=	libboost_program_options.so:devel/boost-libs \
 		libcddgmp.so:math/cddlib \
 		libgmp.so:math/gmp
 
 USES=		cmake:testing compiler:c++11-lang eigen:3 localbase:ldflags perl5 shebangfix
 USE_PERL5=	test
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	tremlin
 GH_PROJECT=	SymPol
 
 SHEBANG_GLOB=	*.pl
 
 CMAKE_ARGS=		-DBLISS_INCLUDE_DIR=${LOCALBASE}/include/bliss
 CMAKE_TESTING_ON=	BUILD_TESTS # test 'perltest' fails with 'output format mismatch', see https://github.com/tremlin/SymPol/issues/1
 
 post-install:
 	@${RM} ${STAGEDIR}${PREFIX}/lib/libcddgmp.so
 	# fix incorrect subdirectories in #include statements, see https://github.com/tremlin/SymPol/issues/2
 	@${REINPLACE_CMD} -i '' -e 's|#include "yal/|#include "|' ${STAGEDIR}${PREFIX}/include/sympol/*.h
 	@${REINPLACE_CMD} -i '' -e 's|#include "\.\./matrix/|#include "|' ${STAGEDIR}${PREFIX}/include/sympol/*.h
 	@${REINPLACE_CMD} -i '' -e 's|#include "\.\./|#include "|' ${STAGEDIR}${PREFIX}/include/sympol/*.h
 
 pre-test: # correct the build directory path
 	@${REINPLACE_CMD} -e "s|'\\.\\./build/release'|'${BUILD_WRKSRC}'|" ${WRKSRC}/contrib/test-sympol.pl
 
 .include <bsd.port.mk>
diff --git a/math/taucs/Makefile b/math/taucs/Makefile
index f5618247bc52..662584e1e64b 100644
--- a/math/taucs/Makefile
+++ b/math/taucs/Makefile
@@ -1,108 +1,108 @@
 PORTNAME=	taucs
 PORTVERSION=	2.2
-PORTREVISION=	23
+PORTREVISION=	24
 CATEGORIES=	math
 MASTER_SITES=	http://www.tau.ac.il/~stoledo/taucs/${PORTVERSION}/ \
 		LOCAL/bf
 DISTNAME=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	C library of sparse linear solvers
 WWW=		http://www.tau.ac.il/~stoledo/taucs/
 
 LICENSE=	TAUCS
 LICENSE_NAME=	TAUCS License
 LICENSE_FILE=	${FILESDIR}/TAUCS-license.txt
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 LIB_DEPENDS=	libmetis.so:math/metis
 
 USES=		blaslapack fortran tar:tgz
 USE_LDCONFIG=	yes
 
 NO_WRKSUBDIR=	yes
 HAS_CONFIGURE=	yes
 
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.options.mk>
 
 LDFLAGS+=	-L${LOCALBASE}/lib
 LIBMETIS?=	-lmetis
 MAKE_ENV+=	LIBBLAS="${BLASLIB}" LIBLAPACK="${LAPACKLIB}" LIBMETIS="${LIBMETIS}"
 
 BINS?=		direct iter taucs_run
 TESTS?=		complex stack timer linsolve memory
 
 .if ${ARCH} == "sparc64"
 PICFLAG?=	-fPIC
 .else
 PICFLAG?=	-fpic
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's/succedd/succeed/' \
 		${WRKSRC}/progs/taucs_blas_underscore_test.c
 	@${REINPLACE_CMD} -e 's/SUCCEDD/SUCCEED/' \
 		${WRKSRC}/progs/test_linsolve.c
 
 post-configure:
 	@${CP} -r ${WRKSRC} ${WRKSRC}_SHARED
 
 archives: configure
 	@${PRINTF} "\n\n%s\n\n\n" "Building libtaucs archives:"
 	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		${MAKE} ${_MAKE_JOBS} ${MAKE_ARGS} lib/FreeBSD/libtaucs.a)
 	(cd ${WRKSRC}_SHARED && ${SETENV} ${MAKE_ENV} PICFLAG="${PICFLAG}" \
 		${MAKE} ${_MAKE_JOBS} ${MAKE_ARGS} lib/FreeBSD/libtaucs.a)
 
 lib: archives
 	@${PRINTF} "\n\n%s\n\n\n" "Building shared library:"
 	(cd ${WRKSRC}_SHARED/lib/FreeBSD && \
 		${FC} ${CFLAGS} ${PICFLAG} ${LDFLAGS} -shared \
 		-o libtaucs.so.1 -Wl,-x -Wl,-soname,libtaucs.so.1 \
 		-Wl,--whole-archive libtaucs.a -Wl,--no-whole-archive)
 	${STRIP_CMD} ${WRKSRC}_SHARED/lib/FreeBSD/libtaucs.so.1
 
 bins: lib
 	@${PRINTF} "\n\n%s\n\n\n" "Building (dynamically-linked) executables:"
 #for the second pass through WRKSRC_SHARED, use a nonexistent MAKEOBJDIR to
 #prevent make from entering the obj subdirectories and breaking the build (see,
 #for example, the description of .OBJDIR in make(1)):
 	(cd ${WRKSRC}_SHARED && \
 		${SETENV} ${MAKE_ENV} MAKEOBJDIR="${NONEXISTENT}" \
 		${MAKE} ${_MAKE_JOBS} ${MAKE_ARGS} ${BINS:S|^|bin/FreeBSD/|})
 
 do-build: bins
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/lib/FreeBSD/libtaucs.a \
 		${STAGEDIR}${PREFIX}/lib
 	${INSTALL_DATA} ${WRKSRC}_SHARED/lib/FreeBSD/libtaucs.so.1 \
 		${STAGEDIR}${PREFIX}/lib
 	(cd ${STAGEDIR}${PREFIX}/lib && ${LN} -s libtaucs.so.1 libtaucs.so)
 	${INSTALL_DATA} ${WRKSRC}/build/FreeBSD/*.h \
 		${STAGEDIR}${PREFIX}/include
 	${INSTALL_DATA} ${WRKSRC}/src/*.h ${STAGEDIR}${PREFIX}/include
 	(cd ${WRKSRC}_SHARED/bin/FreeBSD && \
 		${INSTALL_PROGRAM} ${BINS} ${STAGEDIR}${PREFIX}/bin)
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/*.pdf ${STAGEDIR}${DOCSDIR}
 
 do-test: # XXX: building tests fail
 .for t in ${TESTS}
 	@${PRINTF} "\n%s\n" "Building test_${t}"
 	@cd ${WRKSRC}_SHARED ; ${FC} ${FFLAGS} -Llib/FreeBSD -L./ \
 	${LDFLAGS} -o bin/FreeBSD/test_${t} \
 	`${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} -V STDDEFS` \
 	`${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} -V STDINCS` \
 	progs/test_${t}.c -ltaucs ${LAPACKLIB} ${BLASLIB} ${LIBMETIS}
 	@${PRINTF} "\n%s\n\n\n" "Running test_${t}:"
 	-@cd ${WRKSRC}_SHARED ; \
 	${SETENV} LD_LIBRARY_PATH="lib/FreeBSD:/lib:/usr/lib:${LOCALBASE}/lib" \
 	bin/FreeBSD/test_${t}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/math/tlapack/Makefile b/math/tlapack/Makefile
index a12306481367..d3685cd39e2a 100644
--- a/math/tlapack/Makefile
+++ b/math/tlapack/Makefile
@@ -1,28 +1,29 @@
 PORTNAME=	tlapack
 DISTVERSION=	g20220628
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	C++ Template Linear Algebra PACKage
 WWW=		https://github.com/tlapack/tlapack
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	lapackpp>0:math/lapackpp
 RUN_DEPENDS=	lapackpp>0:math/lapackpp
 TEST_DEPENDS=	blaspp>0:math/blaspp
 
 USES=		cmake:testing
 
 USE_GITHUB=	yes
 GH_TAGNAME=	77352a9
 
 CMAKE_ON=	USE_LAPACKPP_WRAPPERS
 CMAKE_OFF=	BUILD_EXAMPLES BUILD_TESTING BUILD_BLASPP_TESTS
 CMAKE_TESTING_ON=	BUILD_TESTING BUILD_BLASPP_TESTS # tests fail to compile, see https://github.com/tlapack/tlapack/issues/111
 
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/math/tmv/Makefile b/math/tmv/Makefile
index 20537bb8ed9b..6891eae60c69 100644
--- a/math/tmv/Makefile
+++ b/math/tmv/Makefile
@@ -1,33 +1,33 @@
 PORTNAME=	tmv
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.75
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Fast, intuitive linear algebra library for C++
 WWW=		https://github.com/rmjarvis/tmv
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/TMV_LICENSE
 
 USES=		gmake blaslapack:netlib localbase
 USE_GITHUB=	yes
 GH_ACCOUNT=	rmjarvis
 USE_LDCONFIG=	yes
 
 BUILD_WRKSRC=	${WRKSRC}/src
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 MAKEFILE=	${FILESDIR}/Makefile
 
 OPTIONS_DEFINE=	DOCS
 
 .if !exists(/usr/include/omp.h)
 USES+=		compiler:gcc-c++11-lib
 .endif
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/TMV_Documentation.pdf ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/math/topologic/Makefile b/math/topologic/Makefile
index 4d389c0aee1c..4354aa568885 100644
--- a/math/topologic/Makefile
+++ b/math/topologic/Makefile
@@ -1,27 +1,28 @@
 PORTNAME=	topologic
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.6.0-3
+PORTREVISION=	1
 DISTVERSIONSUFFIX=	-gdbddce9
 CATEGORIES=	math
 PKGNAMESUFFIX=	-space-modeling-library
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Library for topological representations of architectural spaces
 WWW=		https://topologic.app/
 
 LICENSE=	AGPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libTKernel.so:cad/opencascade \
 		libuuid.so:misc/e2fsprogs-libuuid
 
 USES=		cmake compiler:c++14-lang localbase:ldflags
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	wassimj
 GH_PROJECT=	Topologic
 
 CMAKE_ARGS=	-DOCC_INCLUDE_DIR=${LOCALBASE}/include/OpenCASCADE
 
 .include <bsd.port.mk>
diff --git a/math/trlan/Makefile b/math/trlan/Makefile
index 0e041ececc92..95896d36e1dc 100644
--- a/math/trlan/Makefile
+++ b/math/trlan/Makefile
@@ -1,99 +1,99 @@
 PORTNAME=	trlan
 PORTVERSION=	201009
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	math
 MASTER_SITES=	https://codeforge.lbl.gov/frs/download.php/210/:1 \
 		http://crd.lbl.gov/~kewu/ps/:2 \
 		LOCAL/bf:1,2
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:1 trlan-ug.pdf:2
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Thick-restart Lanczos method for eigenproblems
 WWW=		http://crd.lbl.gov/~kewu/trlan.html
 
 USES=		fortran
 USE_LDCONFIG=	yes
 
 ALL_TARGET=	lib
 
 PLIST_FILES=	lib/libtrlan.a lib/libtrlan.so lib/libtrlan.so.1
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 .include <bsd.port.pre.mk>
 
 PORTDOCS=	trlan-ug.pdf
 PORTEXAMPLES=	Makefile README dense.f90 simple.f90 simple77.f simplec.c
 
 .if ${ARCH} == sparc64
 PICFLAG=	-fPIC
 .else
 PICFLAG=	-fpic
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -E \
 		-e '/^(FC|FFLAGS)=/s/^/#/' \
 		-e '/^F90=/s/=.*/=${FC}/' \
 		${WRKSRC}/Make.inc
 	@${REINPLACE_CMD} -E \
 		-e '/^(CC|CFLAGS|LDFLAGS|TRLAN)=/s/^/#/' \
 		${WRKSRC}/examples/SUN/Makefile
 	@${REINPLACE_CMD} \
 		-e 's|ar -cru|${AR} -cru|' \
 		${WRKSRC}/SRC/Makefile
 
 do-build:
 	@${ECHO_CMD} "Building static archive ..."
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${_MAKE_JOBS} ${MAKE_ARGS} \
 		${ALL_TARGET}
 	@${STRIP_CMD} -x -o ${WRKDIR}/libtrlan.a ${WRKSRC}/libtrlan.a
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${_MAKE_JOBS} ${MAKE_ARGS} \
 		clean
 	@${ECHO_CMD} "Building shared library ..."
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${_MAKE_JOBS} ${MAKE_ARGS} \
 		${ALL_TARGET} FFLAGS="${PICFLAG} ${FFLAGS}"
 	@${FC} ${FFLAGS} ${LDFLAGS} -shared -Wl,-x  -Wl,-soname,libtrlan.so.1 \
 		-o ${WRKDIR}/libtrlan.so.1 -Wl,--whole-archive \
 		${WRKSRC}/libtrlan.a -Wl,--no-whole-archive -Wl,--as-needed
 
 do-install:
 	${INSTALL_DATA} ${WRKDIR}/libtrlan.* ${STAGEDIR}${PREFIX}/lib
 	@${LN} -sf libtrlan.so.1 ${STAGEDIR}${PREFIX}/lib/libtrlan.so
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${DISTDIR}/${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	@cd ${WRKSRC}/examples/SUN && ${INSTALL_DATA} ${PORTEXAMPLES} \
 	${STAGEDIR}${EXAMPLESDIR}
 
 .if defined(MAINTAINER_MODE)
 
 BUILD_DEPENDS +=	${LOCALBASE}/lib/libblas.so.2:math/blas \
 			${LOCALBASE}/lib/liblapack.so.4:math/lapack
 
 BLAS?=		-L${LOCALBASE}/lib -lblas
 LAPACK?=	-L${LOCALBASE}/lib -llapack
 
 check regression-test test: test-static test-shared
 
 test-static: build
 	@${ECHO_CMD} "Checking static archive ..."
 	@cd ${WRKSRC}/examples/SUN; ${SETENV} ${MAKE_ENV} ${MAKE} ${_MAKE_JOBS} \
 		${MAKE_ARGS} clean simple simple77 simplec \
 		LDFLAGS="${LDFLAGS} ${LAPACK} ${BLAS}" \
 		TRLAN="${WRKDIR}/libtrlan.a" ; \
 		./simple ; ./simple77 ; ./simplec
 
 test-shared: build
 	@${ECHO_CMD} "Checking shared library ..."
 	@cd ${WRKSRC}/examples/SUN; ${SETENV} ${MAKE_ENV} ${MAKE} ${_MAKE_JOBS} \
 		${MAKE_ARGS} clean simple simple77 simplec \
 		FFLAGS="${PICFLAG} ${FFLAGS}" \
 		LDFLAGS="${LDFLAGS} ${LAPACK} ${BLAS}" \
 		TRLAN="-L${WRKDIR} -ltrlan" ; \
 		./simple ; ./simple77 ; ./simplec
 
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/math/trlib/Makefile b/math/trlib/Makefile
index fd180ae19e8d..0cd0421d668f 100644
--- a/math/trlib/Makefile
+++ b/math/trlib/Makefile
@@ -1,26 +1,27 @@
 PORTNAME=	trlib
 DISTVERSION=	g20211004
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Trust Region Subproblem Solver Library
 WWW=		https://github.com/felixlen/trlib
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libopenblas.so:math/openblas
 TEST_DEPENDS=	check>0:devel/check \
 		gsed:textproc/gsed \
 		valgrind:devel/valgrind
 
 USES=		cmake:testing pkgconfig localbase:ldflags
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	felixlen
 GH_TAGNAME=	f168b59
 
 # some tests fail, see https://github.com/felixlen/trlib/issues/16
 
 .include <bsd.port.mk>
diff --git a/math/vtk8/Makefile b/math/vtk8/Makefile
index dac16c525459..7dc4688d1a7a 100644
--- a/math/vtk8/Makefile
+++ b/math/vtk8/Makefile
@@ -1,130 +1,130 @@
 PORTNAME=	vtk
 DISTVERSION=	8.2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math graphics
 MASTER_SITES=	http://www.vtk.org/files/release/${VTK_SHORT_VER}/
 PKGNAMESUFFIX=	8
 DISTNAME=	${PORTNAME:tu}-${PORTVERSION}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Visualization toolkit
 WWW=		https://www.vtk.org
 
 LICENSE=	BSD3CLAUSE
 
 BROKEN_FreeBSD_14_aarch64=	clang-14 crashes, see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=264834
 
 LIB_DEPENDS=	libtiff.so:graphics/tiff \
 		libpng.so:graphics/png \
 		libfreetype.so:print/freetype2 \
 		libexpat.so:textproc/expat2
 
 CONFLICTS=	vtk6 vtk9
 
 USES=		alias cmake compiler:c++11-lang gl jpeg localbase xorg
 USE_LDCONFIG=	${PREFIX}/lib/vtk-${VTK_SHORT_VER}
 USE_XORG=	ice x11 xt xext sm
 
 CMAKE_ON=	BUILD_SHARED_LIBS \
 		VTK_INSTALL_NO_DOCUMENTATION VTK_USE_SYSTEM_EXPAT VTK_USE_SYSTEM_TIFF \
 		VTK_USE_SYSTEM_PNG VTK_USE_SYSTEM_JPEG VTK_USE_SYSTEM_FREETYPE VTK_USE_SYSTEM_ZLIB \
 		Module_vtkTestingCore Module_vtkTestingRendering
 CMAKE_ARGS+=	-DVTK_INSTALL_LIBRARY_DIR=lib/vtk-${VTK_SHORT_VER} \
 		-DVTK_INSTALL_ARCHIVE_DIR=lib/vtk-${VTK_SHORT_VER} \
 		-DVTK_INSTALL_QT_DIR=/${QT_LIBDIR_REL}/plugins/designer \
 		-DSTAGEDIR=${STAGEDIR}
 
 VTK_SHORT_VER=	${PORTVERSION:R}
 
 DOCSDIR=	${PREFIX}/share/doc/vtk-${VTK_SHORT_VER}
 DATADIR=	${PREFIX}/share/vtk-${VTK_SHORT_VER}
 
 # Options
 OPTIONS_DEFINE=	DESIGNER DOCS OSMESA QT5 EXAMPLES
 OPTIONS_DEFAULT=	MPI QT5
 OSMESA_DESC=	Use Mesa for off-screen rendering
 DESIGNER_DESC=	Build the Qt Designer plugin
 OPTIONS_SUB=	yes
 
 # Options groups
 #VTK_GROUPS=	Imaging MPI Qt Rendering StandAlone Views
 VTK_GROUPS=	MPI
 VTK_WRAPS=	JAVA TCLTK
 OPTIONS_GROUP=	GROUPS WRAPPING
 OPTIONS_GROUP_GROUPS=${VTK_GROUPS}
 OPTIONS_GROUP_WRAPPING=${VTK_WRAPS}
 GROUPS_DESC=	Groups
 WRAPPING_DESC=	Wrapping
 .for g in ${VTK_GROUPS}
 $g_DESC=	Build the $g group
 .endfor
 .for w in ${VTK_WRAPS}
 $w_DESC=	$w wrapping
 .endfor
 
 QT5_USES=		qt:5
 QT5_USE=		QT=core,gui,sql,uiplugin,widgets,x11extras,qmake:build,buildtools:build
 QT5_CMAKE_ON=		-DVTK_QT_VERSION:STRING="5" \
 			-DCMAKE_PREFIX_PATH:STRING=${LOCALBASE}/lib/qt5 \
 			-DVTK_Group_Qt:BOOL=ON
 
 DESIGNER_CMAKE_BOOL=	QT_DESIGNER_PLUGIN
 DESIGNER_USE=		QT=designer
 DESIGNER_IMPLIES=	QT5
 
 MPI_LIB_DEPENDS=	libmpi.so:net/openmpi
 MPI_CMAKE_ON=		-DMPIEXEC=${LOCALBASE}/mpi/openmpi/bin/mpiexec
 
 OSMESA_CMAKE_ARGS=	-DVTK_OPENGL_HAS_OSMESA:BOOL=ON \
 			-DOSMESA_INCLUDE_DIR:PATH=${LOCALBASE}/include/Mesa \
 			-DOSMESA_LIBRARY:FILEPATH=${LOCALBASE}/lib/libOSMesa.so \
 			-DOPENGL_gl_LIBRARY:FILEPATH=${LOCALBASE}/lib/libOSMesa.so \
 			-DVTK_USE_X:BOOL=OFF
 OSMESA_LIB_DEPENDS=	libOSMesa.so:graphics/libosmesa
 
 # Wrapping
 JAVA_CATEGORIES=	java
 JAVA_VARS=		USE_JAVA=yes
 JAVA_CMAKE_BOOL=	VTK_WRAP_JAVA Module_vtkWrappingJava
 JAVA_CMAKE_ON=		-DJAVA_INCLUDE_PATH:PATH=${JAVA_HOME}/include \
 			-DJAVA_AWT_LIBRARY:PATH=${JAVA_HOME}/jre/lib/${ARCH}/libjawt.so \
 			-DJAVA_JVM_LIBRARY:PATH=${JAVA_HOME}/jre/lib/${ATCH}/libjava.so
 
 TCLTK_USES=		tk
 TCLTK_CMAKE_BOOL=	VTK_WRAP_TCL VTK_Group_Tk
 TCLTK_CMAKE_ON=		-DTCL_INCLUDE_PATH:PATH=${TCL_INCLUDEDIR} \
 			-DTK_INCLUDE_PATH:PATH=${TK_INCLUDEDIR}  \
 			-DVTK_INSTALL_TCL_DIR=lib/vtk-${VTK_SHORT_VER}
 
 DOCS_CMAKE_BOOL=	BUILD_DOCUMENTATION
 DOCS_BUILD_DEPENDS=	doxygen:devel/doxygen
 
 EXAMPLES_CMAKE_BOOL=	BUILD_EXAMPLES
 
 # Mangling so that it will build when science/netcdf is installed.
 post-patch:
 	@${MV} ${WRKSRC}/ThirdParty/netcdf/vtknetcdf/include/netcdf.h \
 		${WRKSRC}/ThirdParty/netcdf/vtknetcdf/include/xxxnetcdf.h
 	@${FIND} ${WRKSRC}/ThirdParty/netcdf -type f | ${XARGS} ${REINPLACE_CMD} \
 		-E 's/[[:<:]]netcdf\.h[[:>:]]/xxxnetcdf.h/'
 
 .include <bsd.port.options.mk>
 
 .for g in ${VTK_GROUPS}
 .  if ${PORT_OPTIONS:M${g}}
 CMAKE_ARGS+=	-DVTK_Group_${g}:BOOL=ON
 .  else
 CMAKE_ARGS+=	-DVTK_Group_${g}:BOOL=OFF
 .  endif
 .endfor
 
 .if !${PORT_OPTIONS:MOSMESA}
 USES+=		gl
 USE_GL=		gl glu
 .endif
 
 post-install: # autoplist: thousands of files, complex dependencies on options
 	@cd ${STAGEDIR}${PREFIX} && \
 		${FIND} * -type f -or -type l >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/math/vtk9/Makefile b/math/vtk9/Makefile
index d43ca1f931ba..d04d22191888 100644
--- a/math/vtk9/Makefile
+++ b/math/vtk9/Makefile
@@ -1,141 +1,141 @@
 PORTNAME=	vtk
 DISTVERSION=	9.2.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math graphics
 MASTER_SITES=	https://vtk.org/files/release/${VTK_SHORT_VER}/
 PKGNAMESUFFIX=	9
 DISTNAME=	${PORTNAME:tu}-${DISTVERSION}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Visualization toolkit
 WWW=		https://vtk.org/
 
 LICENSE=	BSD3CLAUSE
 
 LIB_DEPENDS=	\
 		libexpat.so:textproc/expat2 \
 		libfreetype.so:print/freetype2 \
 		libhdf5.so:science/hdf5 \
 		libnetcdf.so:science/netcdf \
 		libpng.so:graphics/png \
 		libtiff.so:graphics/tiff
 
 USES=		alias cmake compiler:c++11-lang gl jpeg localbase xorg
 USE_LDCONFIG=	${PREFIX}/lib/vtk-${VTK_SHORT_VER}
 USE_XORG=	ice x11 xt xext sm xcursor xfixes xrender
 
 CFLAGS_powerpc64le=	-DSQLITE_BYTEORDER=1234
 CMAKE_ON=	BUILD_SHARED_LIBS \
 		VTK_INSTALL_NO_DOCUMENTATION \
 		Module_vtkTestingCore Module_vtkTestingRendering
 .for m in expat freetype hdf5 jpeg netcdf png tiff zlib # mpi4py should be here, but this fails, see https://gitlab.kitware.com/vtk/vtk/-/issues/18693
 CMAKE_ON+=	VTK_MODULE_USE_EXTERNAL_VTK_${m}
 .endfor
 CMAKE_ARGS=	-DVTK_INSTALL_LIBRARY_DIR=lib/vtk-${VTK_SHORT_VER} \
 		-DVTK_INSTALL_ARCHIVE_DIR=lib/vtk-${VTK_SHORT_VER} \
 		-DVTK_INSTALL_QT_DIR=/${QT_LIBDIR_REL}/plugins/designer \
 		-DSTAGEDIR=${STAGEDIR}
 		# all build options are documented here: https://gitlab.kitware.com/vtk/vtk/blob/master/Documentation/dev/build.md
 		# all modules can be obtailed by: find . -name vtk.module
 		# there's also CMake/vtkWrapSettings.cmake with options
 
 # disable finding Qt6
 CMAKE_ON+=	CMAKE_DISABLE_FIND_PACKAGE_Qt6
 
 # enable all modules
 #CMAKE_ON+=	VTK_BUILD_ALL_MODULES
 
 VTK_SHORT_VER=	${PORTVERSION:R}
 
 DOCSDIR=	${PREFIX}/share/doc/vtk-${VTK_SHORT_VER}
 DATADIR=	${PREFIX}/share/vtk-${VTK_SHORT_VER}
 
 # Options
 OPTIONS_DEFINE=	DESIGNER DOCS OMPI OSMESA PYTHON QT5 EXAMPLES
 OPTIONS_DEFAULT=	OMPI PYTHON QT5 # vtk python binding is needed by other packages, and is unfortunately is unseparable. It is a candidate to be a subpackage.
 OSMESA_DESC=	Use Mesa for off-screen rendering
 OMPI_DESC=	OpenMPI (Message Passing Interface) support
 DESIGNER_DESC=	Build the Qt Designer plugin
 OPTIONS_SUB=	yes
 
 # Option groups that enable groups of modules in VTK
 VTK_GROUPS=		JAVA TCLTK
 OPTIONS_GROUP=		GROUPS
 OPTIONS_GROUP_GROUPS=	${VTK_GROUPS}
 GROUPS_DESC=		Groups
 .for w in ${VTK_GROUPS}
 $w_DESC=		Enable $w group
 .endfor
 
 PYTHON_USES=		python:3.6+
 PYTHON_CMAKE_BOOL=	VTK_WRAP_PYTHON
 PYTHON_CMAKE_ON=	-DVTK_PYTHON_VERSION=${PYTHON_MAJOR_VER} -DPython3_EXECUTABLE=${PYTHON_CMD}
 PYTHON_VARS=		SUB_FILES=PKG-INFO SUB_LIST=PORTVERSION=${PORTVERSION}
 
 QT5_USES=		qt:5
 QT5_USE=		QT=core,declarative,gui,network,opengl,sql,uiplugin,widgets,x11extras,qmake,buildtools # qmake and buildtools should be with :build, but see https://gitlab.kitware.com/vtk/vtk/-/issues/18705
 QT5_CMAKE_ON=		-DVTK_GROUP_ENABLE_Qt:STRING=YES \
 			-DCMAKE_PREFIX_PATH:STRING=${LOCALBASE}/lib/qt5
 
 #QT6_USES=		qt:6
 #QT6_USE=		QT=base,declarative,tools:build
 #QT6_CMAKE_ON=		-DVTK_GROUP_ENABLE_Qt:STRING=YES \
 			-DCMAKE_PREFIX_PATH:STRING=${LOCALBASE}/lib/qt5
 
 DESIGNER_CMAKE_BOOL=	QT_DESIGNER_PLUGIN
 DESIGNER_USE=		QT=designer
 DESIGNER_IMPLIES=	QT5
 
 OMPI_CMAKE_BOOL=	VTK_USE_MPI
 OMPI_USES=		mpi:openmpi
 
 OSMESA_CMAKE_ON=	-DVTK_OPENGL_HAS_OSMESA:BOOL=ON \
 			-DOSMESA_INCLUDE_DIR:PATH=${LOCALBASE}/include/Mesa \
 			-DOSMESA_LIBRARY:FILEPATH=${LOCALBASE}/lib/libOSMesa.so \
 			-DOPENGL_gl_LIBRARY:FILEPATH=${LOCALBASE}/lib/libOSMesa.so \
 			-DVTK_USE_X:BOOL=OFF
 OSMESA_LIB_DEPENDS=	libOSMesa.so:graphics/libosmesa
 
 JAVA_VARS=		USE_JAVA=yes
 JAVA_CMAKE_BOOL=	VTK_WRAP_JAVA
 JAVA_CMAKE_ON=		-DJAVA_INCLUDE_PATH:PATH=${JAVA_HOME}/include \
 			-DJAVA_AWT_LIBRARY:PATH=${JAVA_HOME}/jre/lib/${ARCH}/libjawt.so \
 			-DJAVA_JVM_LIBRARY:PATH=${JAVA_HOME}/jre/lib/${ATCH}/libjava.so
 
 TCLTK_USES=		tk
 TCLTK_CMAKE_ON=		-DVTK_GROUP_ENABLE_Tk:STRING=YES \
 			-DTCL_INCLUDE_PATH:PATH=${TCL_INCLUDEDIR} \
 			-DTK_INCLUDE_PATH:PATH=${TK_INCLUDEDIR}  \
 			-DVTK_INSTALL_TCL_DIR=lib/vtk-${VTK_SHORT_VER}
 
 DOCS_CMAKE_BOOL=	BUILD_DOCUMENTATION
 DOCS_BUILD_DEPENDS=	doxygen:devel/doxygen
 
 EXAMPLES_CMAKE_BOOL=	BUILD_EXAMPLES
 
 .include <bsd.port.options.mk>
 
 .if !${PORT_OPTIONS:MOSMESA}
 USES+=		gl
 USE_GL=		gl glu
 .endif
 
 .if ${PORT_OPTIONS:MPYTHON} && ${PORT_OPTIONS:MOMPI}
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mpi4py>0:net/py-mpi4py@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mpi4py>0:net/py-mpi4py@${PY_FLAVOR}
 .endif
 
 CONFLICTS=	vtk6 vtk8
 
 do-install-PYTHON-on:
 	# cmake doesn't install pip's .egg-info: https://gitlab.kitware.com/vtk/vtk/-/issues/18087
 	@${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}/vtk-${DISTVERSION}-py${PYTHON_VER}.egg-info
 	@${INSTALL_DATA} ${WRKDIR}/PKG-INFO ${STAGEDIR}${PYTHON_SITELIBDIR}/vtk-${DISTVERSION}-py${PYTHON_VER}.egg-info
 	# workaround for: VTK installs mpi4py which makes it to conflict with the standalone mpi4py package, see https://gitlab.kitware.com/vtk/vtk/-/issues/18691
 	@${RM} -r ${STAGEDIR}${PYTHON_SITELIBDIR}/mpi4py
 
 post-install: # autoplist: thousands of files, complex dependencies on options
 	@cd ${STAGEDIR}${PREFIX} && \
 		${FIND} * -type f -or -type l >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/math/xlife++/Makefile b/math/xlife++/Makefile
index 113c19428e0e..8687c452ca7d 100644
--- a/math/xlife++/Makefile
+++ b/math/xlife++/Makefile
@@ -1,36 +1,36 @@
 PORTNAME=	xlife++
 DISTVERSION=	2.0.1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	math
 MASTER_SITES=	https://uma.ensta-paristech.fr/soft/XLiFE++/var/files/src/
 DISTNAME=	xlifepp-sources-v${DISTVERSION}-2018-05-09
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	XLiFE++: eXtended Library of Finite Elements in C++
 WWW=		https://uma.ensta-paristech.fr/soft/XLiFE++/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 USES=		cmake compiler:c++11-lang eigen:3 fortran tar:tbz
 USE_LDCONFIG=	yes
 
 CMAKE_OFF=	XLIFEPP_ENABLE_ARPACK # should be ON, but it fails to build. Reported to their bugs ML.
 
 CXXFLAGS+=	-I${LOCALBASE}/include/eigen3/Eigen -I${LOCALBASE}/include/ARPACK++
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
 post-extract: # delete bundled packages
 	@${RM} -r ${WRKSRC}/ext/Eigen ${WRKSRC}/ext/ARPACK ${WRKSRC}/ext/ARPACK++
 
 post-configure:
 	@${REINPLACE_CMD} -E 's/.*(ARPACK|Eigen)/#&/' ${CONFIGURE_WRKSRC}/cmake_install.cmake
 
 post-install:
 	@cd ${STAGEDIR}${PREFIX} && ${RM} -r CMakeLists.txt VERSION.txt etc/visuTermVec.m etc/templates etc/gmsh
 
 .include <bsd.port.mk>
diff --git a/math/xtensor-python/Makefile b/math/xtensor-python/Makefile
index 62ba54f48771..e5a53844b723 100644
--- a/math/xtensor-python/Makefile
+++ b/math/xtensor-python/Makefile
@@ -1,36 +1,37 @@
 PORTNAME=	xtensor-python
 DISTVERSION=	0.26.1
+PORTREVISION=	1
 CATEGORIES=	math python
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Python bindings for xtensor # it is called "bindings" but it doesn't install python modules, it's rather a header-only library to use xtensor from python extensions
 WWW=		https://github.com/xtensor-stack/xtensor-python
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 HPP_DEPENDS=	xtensor>0:math/xtensor \
 		pybind11>0:devel/pybind11 \
 		${PYNUMPY}
 BUILD_DEPENDS=	${HPP_DEPENDS}
 RUN_DEPENDS=	${HPP_DEPENDS}
 TEST_DEPENDS=	googletest>0:devel/googletest \
 		pybind11>0:devel/pybind11
 
 USES=		cmake compiler:c++14-lang python
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	xtensor-stack
 
 CXXFLAGS+=	-I${PYTHON_INCLUDEDIR} -I${PYTHON_SITELIBDIR}/numpy/core/include # workaround for https://github.com/xtensor-stack/xtensor-python/issues/272
 
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 do-test: install
 	@cd ${WRKSRC}/test && \
 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} . && \
 		${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} && \
 		${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} xtest
 
 .include <bsd.port.mk>
diff --git a/misc/R-cran-mime/Makefile b/misc/R-cran-mime/Makefile
index 53d40c5fff54..bdc7a867266e 100644
--- a/misc/R-cran-mime/Makefile
+++ b/misc/R-cran-mime/Makefile
@@ -1,14 +1,15 @@
 PORTNAME=	mime
 PORTVERSION=	0.12
+PORTREVISION=	1
 CATEGORIES=	misc
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Map Filenames to MIME Types
 WWW=		https://cran.r-project.org/web/packages/mime/
 
 LICENSE=	GPLv2+
 
 USES=	cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/misc/R-cran-xfun/Makefile b/misc/R-cran-xfun/Makefile
index dddb16836c94..e0d8b60cb265 100644
--- a/misc/R-cran-xfun/Makefile
+++ b/misc/R-cran-xfun/Makefile
@@ -1,14 +1,15 @@
 PORTNAME=	xfun
 PORTVERSION=	0.33
+PORTREVISION=	1
 CATEGORIES=	misc
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Miscellaneous Functions by Yihui Xie
 WWW=		https://cran.r-project.org/web/packages/xfun/
 
 LICENSE=	MIT
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/misc/actiona/Makefile b/misc/actiona/Makefile
index 728fbf518d5e..7d4d8542da47 100644
--- a/misc/actiona/Makefile
+++ b/misc/actiona/Makefile
@@ -1,41 +1,41 @@
 PORTNAME=	actiona
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.10.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	misc
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Cross-platform automation tool
 WWW=		https://wiki.actiona.tools/doku.php
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${LOCALBASE}/include/boost/property_tree/ini_parser.hpp:devel/boost-libs
 LIB_DEPENDS=	libnotify.so:devel/libnotify \
 		libopencv_core.so:graphics/opencv
 
 USES=		compiler:c++11-lang desktop-file-utils gl pkgconfig qmake \
 		gnome qt:5 shared-mime-info xorg
 USE_GITHUB=	yes
 GH_ACCOUNT=	Jmgr
 USE_QT=		concurrent core dbus gui multimedia network script scripttools speech sql widgets x11extras xml xmlpatterns \
 		buildtools:build uitools:build
 USE_GNOME=	gdkpixbuf2 glib20
 USE_GL=		gl
 USE_XORG=	x11 xtst
 
 QMAKE_ARGS=	PKGCONFIG_OPENCV=opencv4
 
 OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=	yes
 
 NLS_USE=	QT=linguisttools:build
 
 pre-build-NLS-on: # this is a hackish way to turn NLS on/off, asked the upstream to have the NLS option
 	@cd ${WRKSRC} && ${MAKE_CMD} locale_release
 
 post-stage-NLS-off:
 	@${RM} -r ${STAGEDIR}${DATADIR}
 
 .include <bsd.port.mk>
diff --git a/misc/adios2/Makefile b/misc/adios2/Makefile
index 1873a699a2aa..f9a69a07aca9 100644
--- a/misc/adios2/Makefile
+++ b/misc/adios2/Makefile
@@ -1,59 +1,60 @@
 PORTNAME=	adios2
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.9.0
+PORTREVISION=	1
 CATEGORIES=	misc science
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Next generation of ADIOS developed in the Exascale Computing Program
 WWW=		https://github.com/ornladios/ADIOS2
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_i386=	constant expression evaluates to 18446744073709551613 which cannot be narrowed to type 'unsigned int': https://github.com/ornladios/ADIOS2/issues/2469
 BROKEN_powerpc=	constant expression evaluates to 18446744073709551613 which cannot be narrowed to type 'unsigned int': https://github.com/ornladios/ADIOS2/issues/2469
 
 PY_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}mpi4py>=3.0.3:net/py-mpi4py@${PY_FLAVOR}
 BUILD_DEPENDS=	bash:shells/bash \
 		pybind11>0:devel/pybind11 \
 		${PYTHON_PKGNAMEPREFIX}pybind11>=2.4:devel/py-pybind11@${PY_FLAVOR} \
 		${PY_DEPENDS}
 LIB_DEPENDS=	libblosc.so:archivers/c-blosc \
 		libepoll-shim.so:devel/libepoll-shim \
 		libfabric.so:net/libfabric \
 		libffi.so:devel/libffi \
 		libhdf5.so:science/hdf5 \
 		libmpi.so:net/mpich \
 		libpng.so:graphics/png \
 		libsodium.so:security/libsodium \
 		libsz.so:science/libaec \
 		libzmq.so:net/libzmq4 \
 		libzfp.so:devel/zfp
 RUN_DEPENDS=	bash:shells/bash \
 		${PY_DEPENDS}
 
 USES=		bison cmake:testing compiler:c++11-lang fortran localbase:ldflags pkgconfig \
 		perl5 python shebangfix
 USE_LDCONFIG=	yes
 
 SHEBANG_FILES=	cmake/install/post/adios2-config.pre.sh.in cmake/install/post/generate-adios2-config.sh.in \
 		source/utils/adios_reorganize/adios2_reorganize_wrapper source/utils/adios2_deactivate_bp
 SHEBANG_GLOB=	*.sh *.py
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	ornladios
 GH_PROJECT=	ADIOS2
 
 CMAKE_ARGS=	-DFREEBSD_PYTHON_VERSION=${PYTHON_VER}
 CMAKE_OFF=	BUILD_TESTING ADIOS2_BUILD_EXAMPLES
 LDFLAGS+=	-lepoll-shim
 
 OPTIONS_DEFINE=	DOCS
 
 DOCSDIR=	${PREFIX}/share/doc/ADIOS2
 PORTDOCS=	*
 
 # several tests fail, see https://github.com/ornladios/ADIOS2/issues/3286
 
 .include <bsd.port.mk>
diff --git a/misc/caffe/Makefile b/misc/caffe/Makefile
index 8e43a6733a35..d4fc2f8612ec 100644
--- a/misc/caffe/Makefile
+++ b/misc/caffe/Makefile
@@ -1,51 +1,51 @@
 PORTNAME=	caffe
 DISTVERSION=	1.0-136
 DISTVERSIONSUFFIX=	-g9b891540
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc # machine-learning
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
 PATCHFILES+=	7f503bd9a19758a173064e299ab9d4cac65ed60f.patch:-p1 # opencv4 fix
 PATCHFILES+=	1b317bab3f6413a1b5d87c9d3a300d785a4173f9.patch:-p1 # protobuf3 fix
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Fast open framework for deep learning
 WWW=		https://caffe.berkeleyvision.org/
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	bash:shells/bash \
 		${PYNUMPY}
 LIB_DEPENDS=	libsnappy.so:archivers/snappy \
 		libleveldb.so:databases/leveldb \
 		liblmdb.so:databases/lmdb \
 		libboost_system.so:devel/boost-libs \
 		${PY_BOOST} \
 		libgflags.so:devel/gflags \
 		libglog.so:devel/glog \
 		libprotobuf.so:devel/protobuf \
 		libopencv_highgui.so:graphics/opencv \
 		libopenblas.so:math/openblas \
 		libhdf5.so:science/hdf5
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}protobuf>0:devel/py-protobuf@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pydot>0:graphics/py-pydot@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pydotplus>0:graphics/py-pydotplus@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-image>0:graphics/py-scikit-image@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
 
 USES=		cmake fortran pkgconfig python
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	BVLC
 
 CMAKE_ARGS=	-DBLAS=Open \
 		-DPYTHON_EXECUTABLE=${PYTHON_CMD} \
 		-DFREEBSD_PYTHONPREFIX_SITELIBDIR=${PYTHONPREFIX_SITELIBDIR}
 
 PORTSCOUT=	limit:^[0-9].*[0-9]$$ # should begin and end with a digit to prevent tags like rcnn-release and rc5
 
 .include <bsd.port.mk>
diff --git a/misc/compat.el/Makefile b/misc/compat.el/Makefile
index aded24c129f4..4d0349610720 100644
--- a/misc/compat.el/Makefile
+++ b/misc/compat.el/Makefile
@@ -1,41 +1,42 @@
 PORTNAME=	compat.el
 DISTVERSION=	29.1.4.1
+PORTREVISION=	2
 CATEGORIES=	misc elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	yasu@FreeBSD.org
 COMMENT=	Compatibility library for Emacs Lisp
 WWW=		https://github.com/emacs-compat/compat
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		emacs gmake makeinfo
 USE_GITHUB=	yes
 GH_ACCOUNT=	emacs-compat
 GH_PROJECT=	compat
 
 ALL_TARGET=	all compat.info
 
 NO_ARCH=	yes
 
 INFO=		compat
 PORTDOCS=	NEWS.org README.md
 
 OPTIONS_DEFINE=	DOCS
 
 ELISP_FILES=	compat-25.el compat-25.elc compat-26.el compat-26.elc \
 		compat-27.el compat-27.elc compat-28.el compat-28.elc \
 		compat-29.el compat-29.elc compat-macs.el compat.el compat.elc
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/compat
 	${INSTALL_DATA}  ${ELISP_FILES:C/^/${WRKSRC}\//} \
 		${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/compat
 	${INSTALL_DATA} ${WRKSRC}/*.info ${STAGEDIR}${PREFIX}/${INFO_PATH}
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:C/^/${WRKSRC}\//} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/misc/darknet/Makefile b/misc/darknet/Makefile
index aa5c58a8de81..04d7ef1d7541 100644
--- a/misc/darknet/Makefile
+++ b/misc/darknet/Makefile
@@ -1,59 +1,59 @@
 PORTNAME=	darknet
 DISTVERSIONPREFIX=	darknet_yolo_v
 DISTVERSION=	4_pre
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	misc # machine-learning
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Open source neural networks in C
 WWW=		https://pjreddie.com/darknet/
 
 LICENSE=	PD
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		cmake compiler:c11
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	AlexeyAB
 
 CMAKE_OFF=	ENABLE_CUDA ENABLE_CUDNN ENABLE_CUDNN_HALF ENABLE_VCPKG_INTEGRATION
 
 PLIST_FILES=	bin/darknet \
 		include/darknet.h \
 		include/yolo_v2_class.hpp \
 		lib/libdark.so
 
 OPTIONS_DEFINE=		OPENCV
 OPTIONS_DEFAULT=	OPENCV
 OPTIONS_DEFINE_amd64=	SSE2 SSE3 SSE4 AVX
 OPTIONS_DEFINE_i386=	SSE2 SSE3 SSE4 AVX
 OPTIONS_DEFAULT_amd64=	SSE2
 OPTIONS_DEFAULT_i386=	SSE2
 # Many secondary functions in DarkNet depend on OpenCV which is a large dependency.
 # Build with OPENCV=off for a self-contained executable which would support
 # core NN computations but would not support many visualization, training and
 # other features.
 
 OPENCV_USES=		pkgconfig
 OPENCV_CMAKE_BOOL=	ENABLE_OPENCV
 OPENCV_LIB_DEPENDS=	libopencv_video.so:graphics/opencv \
 			libopencv_core.so:graphics/opencv
 
 SSE2_DESC=		Use SSE2 instructions
 SSE2_CMAKE_ON=		-DFREEBSD_SIMD="-msse2"
 SSE3_DESC=		Use SSE3 instructions
 SSE3_CMAKE_ON=		-DFREEBSD_SIMD="-msse3"
 SSE4_DESC=		Use SSE4 instructions
 SSE4_CMAKE_ON=		-DFREEBSD_SIMD="-msse4.1 -msse4.2 -msse4a"
 AVX_DESC=		Use AVX instructions
 AVX_CMAKE_ON=		-DFREEBSD_SIMD="-mavx -mavx2"
 
 do-install: # https://github.com/AlexeyAB/darknet/issues/4527
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/darknet ${STAGEDIR}${PREFIX}/bin
 	cd ${WRKSRC} && ${COPYTREE_SHARE} include ${STAGEDIR}${PREFIX}
 	${INSTALL_DATA} ${BUILD_WRKSRC}/libdark.so ${STAGEDIR}${PREFIX}/lib
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libdark.so
 
 .include <bsd.port.mk>
diff --git a/misc/dartsim/Makefile b/misc/dartsim/Makefile
index fb8426031d42..c4dfa6579866 100644
--- a/misc/dartsim/Makefile
+++ b/misc/dartsim/Makefile
@@ -1,58 +1,58 @@
 PORTNAME=	dartsim
 DISTVERSIONPREFIX=	v
 DISTVERSION=	6.13.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Dynamic Animation and Robotics Toolkit
 WWW=		https://dartsim.github.io/
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_i386=	clang failure: https://bugs.llvm.org/show_bug.cgi?id=41757
 
 BUILD_DEPENDS=	pagmo2>0:science/pagmo2 \
 		pybind11>0:devel/pybind11
 LIB_DEPENDS=	libassimp.so:multimedia/assimp \
 		libBulletDynamics.so:devel/bullet \
 		libboost_system.so:devel/boost-libs \
 		libccd.so:math/libccd \
 		libconsole_bridge.so:devel/ros-console_bridge \
 		libfcl.so:math/fcl \
 		libflann_cpp.so:math/flann \
 		libfmt.so:devel/libfmt \
 		libipopt.so:math/ipopt \
 		liblz4.so:archivers/liblz4 \
 		liboctomap.so:math/octomap \
 		libode.so:devel/ode \
 		libosg.so:graphics/osg34 \
 		libnlopt.so:math/nlopt \
 		libpagmo.so:science/pagmo2 \
 		libtinyxml2.so:textproc/tinyxml2 \
 		liburdfdom_world.so:devel/ros-urdfdom
 
 USES=		cmake compiler:c++17-lang eigen:3,build,run gl localbase:ldflags \
 		pkgconfig python xorg
 USE_GL=		gl glu glut
 USE_XORG=	xi xmu
 USE_CXXSTD=	c++17 # missing in the project, it uses std::void_t (through pagmo2) which is a c++17 feature
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_PROJECT=	dart
 
 CXXFLAGS+=	-I${LOCALBASE}/include/coin # because of pagmo2 headers include <IpReturnCodes.hpp>
 
 CMAKE_ON=	BUILD_SHARED_LIBS # DART_VERBOSE
 CMAKE_ARGS=	-DODE_DIR=${LOCALBASE}
 
 DATADIR=	share/dart
 DOCSDIR=	${PREFIX}/share/doc/dart
 
 OPTIONS_DEFINE=	DOCS
 
 PORTDOCS=	*
 
 .include <bsd.port.mk>
diff --git a/misc/elscreen/Makefile b/misc/elscreen/Makefile
index d394ef8cf60d..bd21c20f7f5e 100644
--- a/misc/elscreen/Makefile
+++ b/misc/elscreen/Makefile
@@ -1,40 +1,40 @@
 PORTNAME=	elscreen
 PORTVERSION=	1.4.6.20180320
-PORTREVISION=	9
+PORTREVISION=	11
 CATEGORIES=	misc elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Emacs utility similar to GNU Screen
 WWW=		https://github.com/TakaakiFuruse/elscreen
 
 LICENSE=	GPLv2
 
 RUN_DEPENDS=	apel${EMACS_PKGNAMESUFFIX}>0:editors/apel@${EMACS_FLAVOR}
 
 USES=		emacs
 USE_GITHUB=	yes
 
 GH_ACCOUNT=	TakaakiFuruse
 GH_PROJECT=	${PORTNAME}
 GH_TAGNAME=	329b438
 
 NO_ARCH=	yes
 NO_BUILD=	YES
 
 PORTDOCS=	GF-QuickStart GF-README Readme.md
 
 OPTIONS_DEFINE=	DOCS
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/${PORTNAME}
 	(cd ${WRKSRC}; ${INSTALL_DATA} ${WRKSRC}/*.el \
 		${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/${PORTNAME})
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 
 do-install-DOCS-on:
 .for i in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/misc/frugally-deep/Makefile b/misc/frugally-deep/Makefile
index 21cbfc6b6684..f5bf7063763b 100644
--- a/misc/frugally-deep/Makefile
+++ b/misc/frugally-deep/Makefile
@@ -1,36 +1,37 @@
 PORTNAME=	frugally-deep
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.15.20-p0
+PORTREVISION=	1
 CATEGORIES=	misc # deep-learning
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	C++ header-only library to use Keras models in C++ with ease
 WWW=		https://github.com/Dobiasd/frugally-deep
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 HPP_DEPENDS=	functionalplus>0:devel/functionalplus \
 		nlohmann-json>0:devel/nlohmann-json
 BUILD_DEPENDS=	${HPP_DEPENDS}
 RUN_DEPENDS=	${HPP_DEPENDS}
 TEST_DEPENDS=	doctest>0:devel/doctest \
 		${PYTHON_PKGNAMEPREFIX}keras>0:math/py-keras@${PY_FLAVOR}
 
 USES=		cmake compiler:c++14-lang eigen:3,build,run python:3.6+,test
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Dobiasd
 
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 BINARY_ALIAS=	python3=${PYTHON_CMD}
 
 do-test: # tests are broken because they require tensorflow which is currently not available on FreeBSD
 	@cd ${BUILD_WRKSRC} && \
 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DFDEEP_BUILD_UNITTEST:BOOL=ON ${CMAKE_SOURCE_PATH} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
 
 .include <bsd.port.mk>
diff --git a/misc/g810-led/Makefile b/misc/g810-led/Makefile
index 845068995eb6..35a817bc26f8 100644
--- a/misc/g810-led/Makefile
+++ b/misc/g810-led/Makefile
@@ -1,24 +1,25 @@
 PORTNAME=	g810-led
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.4.2
+PORTREVISION=	1
 CATEGORIES=	misc
 
 MAINTAINER=	Alexander88207@protonmail.com
 COMMENT=	LED controller for Logitech G-series keyboards
 WWW=		https://github.com/MatMoul/g810-led
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	hidapi>0:comms/hidapi
 LIB_DEPENDS=	libhidapi.so:comms/hidapi
 
 USES=		gmake
 USE_GCC=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	MatMoul
 
 MAKEFILE=	makefile
 
 .include <bsd.port.mk>
diff --git a/misc/iio-oscilloscope/Makefile b/misc/iio-oscilloscope/Makefile
index b88f7dc38e77..74e55a7a5147 100644
--- a/misc/iio-oscilloscope/Makefile
+++ b/misc/iio-oscilloscope/Makefile
@@ -1,34 +1,34 @@
 PORTNAME=	iio-oscilloscope
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.14
-PORTREVISION=	3
+PORTREVISION=	4
 DISTVERSIONSUFFIX=	-master
 CATEGORIES=	misc
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Oscilloscope application for interfacing with various IIO devices
 WWW=		https://wiki.analog.com/resources/tools-software/linux-software/iio_oscilloscope
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libad9361.so:misc/libad9361-iio \
 		libcurl.so:ftp/curl \
 		libfftw3.so:math/fftw3 \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libgtkdatabox.so:x11-toolkits/gtkdatabox \
 		libiio.so:misc/libiio \
 		libjansson.so:devel/jansson \
 		libmatio.so:math/matio
 
 USES=		cmake compiler:c11 gnome localbase:ldflags pkgconfig
 USE_GNOME=	atk cairo gdkpixbuf2 gtk20 libxml2 pango
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	analogdevicesinc
 
 LDFLAGS+=	-lm -lexecinfo
 
 .include <bsd.port.mk>
diff --git a/misc/ini_file_manager/Makefile b/misc/ini_file_manager/Makefile
index 26bb5036b5d9..28b593ea4c14 100644
--- a/misc/ini_file_manager/Makefile
+++ b/misc/ini_file_manager/Makefile
@@ -1,55 +1,55 @@
 PORTNAME=	ini_file_manager
 PORTVERSION=	03
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	misc
 MASTER_SITES=	http://sourceforge.net/projects/${SFPATH}/
 DISTNAME=	ini-files-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Ini configuration file reader and manipulator package for Ada
 WWW=		https://sourceforge.net/projects/ini-files/
 
 LICENSE=	MIT
 
 USES=		ada zip dos2unix
 
 NO_WRKSUBDIR=	yes
 
 SFPATH=		ini-files/files/ini-files/ini-files-${PORTVERSION}
 PORTDOCS=	ini_file_manager.txt
 PORTEXAMPLES=	example.gpr test_config.adb runme.sh
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 post-extract:
 	${CP} ${FILESDIR}/construct.gpr ${WRKSRC}
 	${MKDIR} ${WRKSRC}/src
 	${MV} ${WRKSRC}/config.ad[bs] ${WRKSRC}/src
 	${SED} -e "s,@PREFIX@,${LOCALBASE},g" ${FILESDIR}/runme.sh.in \
 		> ${WRKSRC}/runme.sh
 
 do-build:
 	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} gnatmake -p -Pconstruct)
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/gnat \
 		${STAGEDIR}${PREFIX}/lib/ini_file_manager \
 		${STAGEDIR}${PREFIX}/include/ini_file_manager
 	${INSTALL_DATA} ${FILESDIR}/ini_file_manager.gpr \
 		${STAGEDIR}${PREFIX}/lib/gnat
 	${INSTALL_DATA} ${WRKSRC}/src/* \
 		${STAGEDIR}${PREFIX}/include/ini_file_manager
 	${INSTALL_DATA} ${WRKSRC}/lib/*  \
 		${STAGEDIR}${PREFIX}/lib/ini_file_manager
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/ini_file_manager.txt ${STAGEDIR}${DOCSDIR}
 
 do-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/runme.sh ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/test_config.adb \
 		${FILESDIR}/example.gpr ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/misc/lbann/Makefile b/misc/lbann/Makefile
index cf78ecb3e2ef..c7369a916546 100644
--- a/misc/lbann/Makefile
+++ b/misc/lbann/Makefile
@@ -1,56 +1,57 @@
 PORTNAME=	lbann
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.102-254
+PORTREVISION=	1
 DISTVERSIONSUFFIX=	-g2e3012a9a
 CATEGORIES=	misc # machine-learning
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Livermore Big Artificial Neural Network toolkit
 WWW=		https://github.com/LLNL/lbann
 
 LICENSE=	APACHE20
 
 BUILD_DEPENDS=	cereal>0:devel/cereal \
 		dihydrogen>0:math/dihydrogen \
 		zstr>0:archivers/zstr
 LIB_DEPENDS=	libconduit.so:science/conduit \
 		libhdf5.so:science/hdf5 \
 		libHydrogen_CXX.so:math/hydrogen \
 		libopenblas.so:math/openblas \
 		libprotobuf.so:devel/protobuf \
 		libsiloh5.so:science/silo
 
 USES=		cmake:testing compiler:c++17-lang localbase pkgconfig
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	LLNL
 GH_TUPLE=	KIwabuchi:havoqgt:100f63b:havoqgt/applications/graph/node2vec/havoqgt \
 		samadejacobs:moses:28932ce:moses/applications/ATOM/moses \
 		snap-stanford:snap:58a1e6a:snap/applications/graph/node2vec/snap \
 		catchorg:Clara:2bfd8b2:clara
 
 CMAKE_ARGS=	-DCLARA_INCLUDE_PATH=${WRKSRC_clara}/include
 CMAKE_OFF=	LBANN_WITH_CNPY \
 		LBANN_WITH_CUDNN \
 		LBANN_WITH_HWLOC \
 		LBANN_WITH_PYTHON_FRONTEND \
 		LBANN_WITH_EMBEDDED_PYTHON \
 		LBANN_WITH_VISION \
 		LBANN_WITH_TBINF
 CMAKE_ON=	LBANN_USE_PROTOBUF_MODULE
 CMAKE_TESTING_ON=	LBANN_WITH_UNIT_TESTING # requires MPI cluster
 
 LDFLAGS+=	-lexecinfo
 
 OPTIONS_SINGLE=		MPI
 OPTIONS_SINGLE_MPI=	MPICH OPENMPI
 OPTIONS_DEFAULT=	MPICH # should be same as in conduit, hydrogen, dihydrogen
 
 MPICH_USES=		mpi:mpich
 
 OPENMPI_USES=		mpi:openmpi
 
 post-install: # remove unnecessary files
 	@${RM} -r ${STAGEDIR}${PREFIX}/share/doc
 
 .include <bsd.port.mk>
diff --git a/misc/libemos/Makefile b/misc/libemos/Makefile
index 36b80d4ef33c..a47f6eed08aa 100644
--- a/misc/libemos/Makefile
+++ b/misc/libemos/Makefile
@@ -1,30 +1,30 @@
 PORTNAME=	libemos
 DISTVERSION=	4.5.9
-PORTREVISION=	3
+PORTREVISION=	4
 DISTVERSIONSUFFIX=	-Source
 CATEGORIES=	misc
 MASTER_SITES=	https://confluence.ecmwf.int/download/attachments/3473472/
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Interpolation library for meteorological software
 WWW=		https://confluence.ecmwf.int/display/EMOS/Emoslib
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libeccodes.so:science/eccodes \
 		libfftw3.so:math/fftw3 \
 		libpng.so:graphics/png
 
 USES=		cmake:noninja compiler:c11 fortran
 
 CMAKE_ON=	BUILD_SHARED_LIBS # not respected: https://jira.ecmwf.int/browse/SUP-2691
 CMAKE_OFF=	HAVE_TESTS
 
 FFLAGS+=	-std=legacy
 LDFLAGS+=	-leccodes
 
 post-stage: # installs the file from eccodes: https://jira.ecmwf.int/browse/SUP-2693
 	@${RM} ${STAGEDIR}${PREFIX}/bin/bufr_filter
 
 .include <bsd.port.mk>
diff --git a/misc/lightgbm/Makefile b/misc/lightgbm/Makefile
index a4cccc50e816..68047c2fe5ce 100644
--- a/misc/lightgbm/Makefile
+++ b/misc/lightgbm/Makefile
@@ -1,32 +1,33 @@
 PORTNAME=	lightgbm
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.3.5
+PORTREVISION=	1
 CATEGORIES=	misc # machine-learning
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Gradient boosting framework that uses tree based learning algorithms
 WWW=		https://lightgbm.readthedocs.io/en/latest/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 TEST_DEPENDS=	googletest>0:devel/googletest
 
 USES=		cmake:testing compiler:c++11-lang eigen:3
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	microsoft
 GH_PROJECT=	LightGBM
 GH_TUPLE=	boostorg:compute:36350b7:boostorg_compute/external_libs/compute \
 		fmtlib:fmt:b6f4cea:fmt/external_libs/fmt \
 		lemire:fast_double_parser:ace6064:fast_double_parser/external_libs/fast_double_parser
 
 CMAKE_TESTING_ON=	BUILD_CPP_TEST
 CMAKE_TESTING_TARGET=
 
 CXXFLAGS+=	-I${LOCALBASE}/include/eigen3
 
 post-test:
 	${WRKSRC}/testlightgbm
 
 .include <bsd.port.mk>
diff --git a/misc/minidnn/Makefile b/misc/minidnn/Makefile
index e7c27bf9da74..f5f2f9d605e9 100644
--- a/misc/minidnn/Makefile
+++ b/misc/minidnn/Makefile
@@ -1,23 +1,24 @@
 PORTNAME=	minidnn
 DISTVERSION=	g20200330
+PORTREVISION=	1
 CATEGORIES=	misc # machine-learning
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Header-only C++ library for deep neural networks
 WWW=		https://github.com/yixuan/MiniDNN
 
 LICENSE=	MPL20
 
 USES=		eigen:3,run
 USE_GITHUB=	yes
 GH_ACCOUNT=	yixuan
 GH_PROJECT=	MiniDNN
 GH_TAGNAME=	525ff216a6b5f576d4d679aee6a4636994bd4f23
 
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 do-install:
 	@cd ${WRKSRC}/include && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/include/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/misc/mmdnn/Makefile b/misc/mmdnn/Makefile
index b2b613293410..32dcd487da5e 100644
--- a/misc/mmdnn/Makefile
+++ b/misc/mmdnn/Makefile
@@ -1,25 +1,26 @@
 PORTNAME=	mmdnn
 DISTVERSION=	0.3.1
+PORTREVISION=	1
 CATEGORIES=	misc python # machine-learning
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Tools to inter-operate among different deep learning frameworks
 WWW=		https://github.com/microsoft/MMdnn
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYNUMPY} \
 		${PY_PILLOW} \
 		${PYTHON_PKGNAMEPREFIX}protobuf>=3.6.0:devel/py-protobuf@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_GITHUB=	yes
 GH_ACCOUNT=	microsoft
 GH_PROJECT=	MMdnn
 USE_PYTHON=	distutils noflavors autoplist
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/misc/mxnet/Makefile b/misc/mxnet/Makefile
index a0ea4f22289a..79d67c8d2770 100644
--- a/misc/mxnet/Makefile
+++ b/misc/mxnet/Makefile
@@ -1,64 +1,64 @@
 PORTNAME=	mxnet
 DISTVERSION=	1.9.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	misc # machine-learning
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Apache MXNet: Ultra-scalable deep learning framework
 WWW=		https://mxnet.apache.org/
 
 LICENSE=	APACHE20
 
 BROKEN_i386=	https://github.com/apache/incubator-mxnet/issues/20832
 .if !exists(/usr/include/omp.h)
 BROKEN=		requires OpenMP support that is missing on this architecture
 .endif
 
 BUILD_DEPENDS=	googletest>0:devel/googletest
 LIB_DEPENDS=	libdmlc.so:devel/dmlc-core \
 		liblapack.so:math/lapack \
 		libopenblas.so:math/openblas
 
 USES=		cmake compiler:c++11-lang localbase:ldflags
 USE_GITHUB=	yes
 GH_ACCOUNT=	apache
 GH_PROJECT=	incubator-mxnet
 GH_TUPLE=	apache:tvm:efdac94:tvm/3rdparty/tvm \
 		dmlc:dlpack:3efc489:dlpack/3rdparty/dlpack \
 		oneapi-src:oneDNN:f40443c:onednn/3rdparty/mkldnn # same as BUILD_DEPENDS=${LOCALBASE}/include/dnnl.h:math/onednn
 USE_LDCONFIG=	yes
 
 CMAKE_OFF=	USE_CUDA USE_CUDNN USE_MKLDNN USE_NCCL ENABLE_CUDA_RTC \
 		BUILD_CPP_EXAMPLES USE_JEMALLOC USE_MKL_IF_AVAILABLE
 
 LDFLAGS+=	-pthread -lexecinfo
 
 OPTIONS_DEFINE=		CPP OPENCV
 OPTIONS_DEFAULT=	CPP OPENCV
 OPTIONS_SUB=		yes
 
 CPP_DESC=		Install the C++ binding (cpp-package)
 CPP_CMAKE_BOOL=		USE_CPP_PACKAGE
 CPP_USES=		python:build
 CPP_VARS=		BINARY_ALIAS=python=${PYTHON_CMD}
 
 OPENCV_CMAKE_BOOL=	USE_OPENCV
 OPENCV_LIB_DEPENDS=	libopencv_core.so:graphics/opencv \
 			libopencv_videoio.so:graphics/opencv
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} != amd64 && ${ARCH} != i386
 CMAKE_OFF+=	USE_SSE
 .endif
 
 xpost-patch:
 	@${RM} ${WRKSRC}/include/mkldnn/*
 .for h in dnnl.h dnnl.hpp mkldnn.h mkldnn.hpp mkldnn_dnnl_mangling.h mkldnn_types.h mkldnn_version.h
 	@${LN} -s ${LOCALBASE}/include/${h} ${WRKSRC}/include/mkldnn/${h}
 .endfor
 
 post-install-CPP-on: # https://github.com/apache/incubator-mxnet/issues/17080
 	@cd ${STAGEDIR}${PREFIX} && ${RM} include/mxnet-cpp/.gitignore include/mxnet-cpp/CPPLINT.cfg
 
 .include <bsd.port.post.mk>
diff --git a/misc/ompl/Makefile b/misc/ompl/Makefile
index 40895118656e..7ac5d276ef63 100644
--- a/misc/ompl/Makefile
+++ b/misc/ompl/Makefile
@@ -1,57 +1,58 @@
 PORTNAME=	ompl
 DISTVERSION=	1.6.0
+PORTREVISION=	1
 CATEGORIES=	misc comms
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Open Motion Planning Library
 WWW=		https://ompl.kavrakilab.org/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libboost_system.so:devel/boost-libs
 
 USES=		cmake:testing compiler:c++11-lang eigen:3 pkgconfig
 USE_GITHUB=	yes
 USE_LDCONFIG=	yes
 
 CMAKE_OFF=	OMPL_REGISTRATION OMPL_BUILD_TESTS OMPL_BUILD_DEMOS OMPL_VERSIONED_INSTALL
 CMAKE_TESTING_ON=	OMPL_BUILD_TESTS
 
 OPTIONS_DEFINE=		FLANN MORSE OPENDE SPOT TRIANGLE PLANNERARENA
 OPTIONS_DEFAULT=	FLANN MORSE OPENDE TRIANGLE
 OPTIONS_SUB=		yes
 
 FLANN_DESC=		Use FLANN for nearest neighbor queries
 FLANN_LIB_DEPENDS=	libflann.so:math/flann
 
 MORSE_DESC=		Include a plugin for the MORSE Robot Simulation engine
 MORSE_BUILD_DEPENDS=	morse-robotics>0:misc/morse
 MORSE_RUN_DEPENDS=	morse-robotics>0:misc/morse
 
 OPENDE_DESC=		Use Open Dynamics Engine for kinodynamic planning
 OPENDE_LIB_DEPENDS=	libode.so:devel/ode
 
 SPOT_DESC=		Use 'Spot' for creating finite automata from LTL formulae
 SPOT_USES=		compiler:c++14-lang
 SPOT_LIB_DEPENDS=	libspot.so:math/spot
 
 TRIANGLE_DESC=		Create triangular decompositions of 2D polygons
 TRIANGLE_LIB_DEPENDS=	libtriangle.so:math/triangle
 
 PLANNERARENA_DESC=	Install plannerarena (depends on R)
 PLANNERARENA_BUILD_DEPENDS=	Rscript:math/R
 PLANNERARENA_RUN_DEPENDS=	Rscript:math/R
 
 .for o in ${OPTIONS_DEFINE:NPLANNERARENA}
 post-patch-${o}-off:
 	@${REINPLACE_CMD} 's|find_package(${o}|#&|i' ${WRKSRC}/CMakeLists.txt
 .endfor
 
 post-patch-PLANNERARENA-off:
 	@${REINPLACE_CMD} 's|find_program(R_EXEC|#&|' ${WRKSRC}/CMakeLists.txt
 
 post-configure:
 	@${REINPLACE_CMD} 's|/usr/bin/morse|${LOCALBASE}/bin/morse|' ${BUILD_WRKSRC}/CMakeCache.txt
 
 .include <bsd.port.mk>
diff --git a/misc/openmvg/Makefile b/misc/openmvg/Makefile
index 4aca75779962..632fdc51b8ba 100644
--- a/misc/openmvg/Makefile
+++ b/misc/openmvg/Makefile
@@ -1,96 +1,96 @@
 PORTNAME=	openmvg
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.0
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	misc science
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Multiple View Geometry (MVG) library
 WWW=		https://imagine.enpc.fr/%7Emoulonp/openMVG/
 
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/../LICENSE
 
 ONLY_FOR_ARCHS=	amd64 armv7 i386 powerpc64 powerpc64le
 ONLY_FOR_ARCHS_REASON=	need to figure out which TARGET_ARCHITECTURE values correspond to other architectures, plus "generic" is broken
 
 #HPP_DEPENDS=	cereal>0:devel/cereal # external cereal is currently broken, see https://github.com/openMVG/openMVG/issues/1963
 #BUILD_DEPENDS=	${HPP_DEPENDS}
 LIB_DEPENDS=	libamd.so:math/suitesparse-amd \
 		libblas.so:math/blas \
 		libcamd.so:math/suitesparse-camd \
 		libCbc.so:math/cbc \
 		libccolamd.so:math/suitesparse-ccolamd \
 		libceres.so:math/ceres-solver \
 		libCgl.so:math/cgl \
 		libcholmod.so:math/suitesparse-cholmod \
 		libClp.so:math/clp \
 		libcoinasl.so:math/asl \
 		libCoinUtils.so:math/coinutils \
 		libcolamd.so:math/suitesparse-colamd \
 		libcoinmumps.so:math/coin-or-mumps \
 		libcxsparse.so:math/suitesparse-cxsparse \
 		libemon.so:math/lemon \
 		libflann_cpp.so:math/flann \
 		libgflags.so:devel/gflags \
 		libglog.so:devel/glog \
 		libglpk.so:math/glpk \
 		libgmp.so:math/gmp \
 		libjbig.so:graphics/jbigkit \
 		libmetis.so:math/metis \
 		libnauty.so:math/nauty \
 		libopenblas.so:math/openblas \
 		libOsi.so:math/osi \
 		libpng.so:graphics/png \
 		libspqr.so:math/suitesparse-spqr \
 		libsuitesparseconfig.so:math/suitesparse-config \
 		libtiff.so:graphics/tiff \
 		libunwind.so:devel/libunwind
 LIB_DEPENDS+=	liblz4.so:archivers/liblz4 # workaround for https://github.com/openMVG/openMVG/issues/1798
 #RUN_DEPENDS=	${HPP_DEPENDS}
 
 USES=		cmake compiler:c++11-lang eigen:3 jpeg qt:5
 USE_GITHUB=	yes
 GH_ACCOUNT=	openMVG
 GH_PROJECT=	openMVG
 GH_TUPLE=	openMVG-thirdparty:cereal:ac168fe:cereal/dependencies/cereal
 WRKSRC_SUBDIR=	src
 USE_QT=		core gui opengl svg widgets buildtools:build qmake:build
 USE_LDCONFIG=	yes
 
 CMAKE_ARGS=	-DEIGEN_INCLUDE_DIR_HINTS=${LOCALBASE}/include/eigen3 \
 		-DFLANN_INCLUDE_DIR_HINTS=${LOCALBASE}/include \
 		-DLEMON_INCLUDE_DIR_HINTS=${LOCALBASE}/include \
 		-DOSI_INCLUDE_DIR_HINTS=${LOCALBASE}/include \
 		-DCOINUTILS_INCLUDE_DIR_HINTS=${LOCALBASE}/include \
 		-DCLP_INCLUDE_DIR_HINTS=${LOCALBASE}/include \
 		-DCERES_DIR_HINTS=${LOCALBASE}/include
 CMAKE_ON=	OpenMVG_BUILD_SHARED
 CMAKE_OFF=	OpenMVG_BUILD_TESTS OpenMVG_BUILD_EXAMPLES
 
 CXXFLAGS+=	-fPIC \
 		-I${LOCALBASE}/include # because flann is looked for in a wrong directiory: https://github.com/openMVG/openMVG/issues/1284
 LDFLAGS+=	-L${LOCALBASE}/lib -llz4 # workaround for https://github.com/openMVG/openMVG/issues/1798
 
 OPTIONS_SINGLE=			SIMD_${ARCH:tu}
 OPTIONS_SINGLE_SIMD_AMD64=	K8 CORE MEROM NEHALEM
 OPTIONS_SINGLE_SIMD_I386=	${OPTIONS_SINGLE_SIMD_AMD64}
 OPTIONS_DEFAULT_amd64=		K8
 OPTIONS_DEFAULT_i386=		K8
 
 SIMD_AMD64_DESC=		Use SSE SIMD optimizations for
 SIMD_I386_DESC=			${SIMD_AMD64_DESC}
 K8_DESC=			K8 architecture (SSE2)
 CORE_DESC=			Core architecture (up to SSE3)
 MEROM_DESC=			Merom architecture (up to SSSE3)
 NEHALEM_DESC=			Nehalem architecture (up to SSE4.2)
 
 K8_CMAKE_ON=			-DTARGET_ARCHITECTURE=k8
 CORE_CMAKE_ON=			-DTARGET_ARCHITECTURE=core
 MEROM_CMAKE_ON=			-DTARGET_ARCHITECTURE=merom
 NEHALEM_CMAKE_ON=		-DTARGET_ARCHITECTURE=nehalem
 
 post-install:
 	@${RM} -r ${STAGEDIR}${PREFIX}/include/openMVG_dependencies/osi_clp
 
 .include <bsd.port.mk>
diff --git a/misc/orange3/Makefile b/misc/orange3/Makefile
index 6c1c19c13df2..03a9d9df8134 100644
--- a/misc/orange3/Makefile
+++ b/misc/orange3/Makefile
@@ -1,64 +1,64 @@
 PORTNAME=	orange3
 DISTVERSION=	3.29.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	misc python
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Component-based data mining software
 WWW=		https://orange.biolab.si/
 
 LICENSE=	GPLv3
 
 BUILD_DEPENDS=	${PYNUMPY}
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}AnyQt>=0.0.11:x11-toolkits/py-AnyQt@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}baycomp>=1.0.2:math/py-baycomp@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}bottleneck>=1.0.0:math/py-bottleneck@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}chardet>=3.0.2:textproc/py-chardet@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}joblib>=0.9.4:devel/py-joblib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}httpx>=0.14.0:www/py-httpx@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}keyring>0:security/py-keyring@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}keyrings.alt>0:security/py-keyrings.alt@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>=2.0.0:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}networkx>0:math/py-networkx@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}openTSNE>=0.6.0:math/py-openTSNE@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}orange-canvas-core>=0.1.19:devel/py-orange-canvas-core@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}orange-widget-base>=4.13.0:devel/py-orange-widget-base@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}openpyxl>0:textproc/py-openpyxl@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pandas>=1.0.0:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pip>=9.0:devel/py-pip@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}PyOpenGL>=0:graphics/py-PyOpenGL@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-louvain>=0.13:math/py-python-louvain@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyqtgraph>=0.11.1:graphics/py-pyqtgraph@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-learn>=0.22.0:science/py-scikit-learn@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=0.16.1:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}serverfiles>0:misc/py-serverfiles@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xlrd>=0.9.2:textproc/py-xlrd@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}XlsxWriter>0:textproc/py-xlsxwriter@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
 
 USES=		python:3.7+ pyqt:5
 USE_PYTHON=	distutils cython autoplist noflavors
 USE_PYQT=	pyqt5:run webengine:run
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	biolab
 
 CFLAGS+=	-DQSORT_R_STYLE_BSD=yes
 LDFLAGS+=	-Xlinker -strip-all # strip, stage-qa doesn't catch that it isn't stripped
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == aarch64 || ${ARCH} == amd64 || ${ARCH} == i386
 USE_PYQT+=	webengine:run
 .else
 USE_PYQT+=	webkit:run
 .endif
 
 xpost-install:
 	@${REINPLACE_CMD} -e 's|^"${PREFIX}/|| ; s|"$$||' ${_PYTHONPKGLIST} # https://github.com/biolab/orange3/issues/3060
 	@${REINPLACE_CMD} -e 's|import sys|& ; from OpenGL import GL|' ${STAGEDIR}${PREFIX}/bin/orange-canvas # https://github.com/biolab/orange3/issues/3062
 
 .include <bsd.port.mk>
diff --git a/misc/py-QSpectrumAnalyzer/Makefile b/misc/py-QSpectrumAnalyzer/Makefile
index d89830a1a2a3..5efe29710adb 100644
--- a/misc/py-QSpectrumAnalyzer/Makefile
+++ b/misc/py-QSpectrumAnalyzer/Makefile
@@ -1,40 +1,40 @@
 PORTNAME=	QSpectrumAnalyzer
 DISTVERSION=	2.1.0
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	misc hamradio python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Spectrum analyzer for multiple SDR platforms
 WWW=		https://github.com/xmikos/qspectrumanalyzer
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}pyqtgraph>=0.10.0:graphics/py-pyqtgraph@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}soapy_power>=1.5.0:misc/py-soapy_power@${PY_FLAVOR}
 
 USES=		fortran python:3.8+ pyqt:5
 USE_PYQT=	pyqt5
 USE_PYTHON=	distutils concurrent autoplist
 
 PLIST_FILES=	bin/${PORTNAME:tl}.shadow
 
 post-patch: # change from Qt.py that doesn't work to PyQt5
 	@${FIND} ${WRKSRC} -name "*.py" | ${XARGS} ${REINPLACE_CMD} -i '' -e ' \
 		s|from Qt import |from PyQt5 import | ; \
 		s|, __binding__|| ; \
 		s|QtCore.Signal|QtCore.pyqtSignal| ; \
 		s|QtCore.Slot|QtCore.pyqtSlot|'
 
 post-install:
 	@${MV} ${STAGEDIR}${PREFIX}/bin/${PORTNAME:tl} ${STAGEDIR}${PREFIX}/bin/${PORTNAME:tl}.shadow
 	@(echo "#!/bin/sh"; \
 	  echo ""; \
 	  echo "LD_PRELOAD=${PREFIX}/lib/gcc9/libgcc_s.so ${PREFIX}/bin/${PORTNAME:tl}.shadow \"$$@\"" \
 	) > ${STAGEDIR}${PREFIX}/bin/${PORTNAME:tl}
 	@${CHMOD} +x ${STAGEDIR}${PREFIX}/bin/${PORTNAME:tl}
 
 .include <bsd.port.mk>
diff --git a/misc/py-SimpleSoapy/Makefile b/misc/py-SimpleSoapy/Makefile
index 4d770d7676d2..616c22b9e5f4 100644
--- a/misc/py-SimpleSoapy/Makefile
+++ b/misc/py-SimpleSoapy/Makefile
@@ -1,22 +1,22 @@
 PORTNAME=	SimpleSoapy
 DISTVERSION=	1.5.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	misc hamradio python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Simple pythonic wrapper for SoapySDR library
 WWW=		https://github.com/xmikos/simplesoapy
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}SoapySDR>0:misc/py-SoapySDR@${PY_FLAVOR}
 
 USES=		python:3.4+
 USE_PYTHON=	distutils autoplist
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/misc/py-apache-beam/Makefile b/misc/py-apache-beam/Makefile
index b5649eaf7a6d..710a0f87d480 100644
--- a/misc/py-apache-beam/Makefile
+++ b/misc/py-apache-beam/Makefile
@@ -1,61 +1,62 @@
 PORTNAME=	apache-beam
 DISTVERSION=	2.43.0
+PORTREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Apache Beam SDK for Python
 WWW=		https://beam.apache.org/
 
 LICENSE=	APACHE20
 
 PY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cloudpickle>=2.2.0:devel/py-cloudpickle@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}crcmod>=1.7:devel/py-crcmod@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dateutil>=2.8.0:devel/py-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dill>=0.3.1.1:devel/py-dill@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}fastavro>=0.23.6:textproc/py-fastavro@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}fasteners>=0.3:devel/py-fasteners@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}grpcio>=1.33.1>0:devel/py-grpcio@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}hdfs>=2.1.0:www/py-hdfs@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}httplib2>=0.8:www/py-httplib2@${PY_FLAVOR} \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}orjson<4.0:devel/py-orjson@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}objsize>=0.5.2:devel/py-objsize@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}proto-plus>=1.7.1:devel/py-proto-plus@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}protobuf>=3.12.2:devel/py-protobuf@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pydot>=1.2.0:graphics/py-pydot@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pymongo>=3.8.0:databases/py-pymongo@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytz>=2018.3:devel/py-pytz@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}regex>=2020.6.8:textproc/py-regex@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.24.0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}typing-extensions>=3.7.0:devel/py-typing-extensions@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}zstandard>=0.18.0:archivers/py-zstandard@${PY_FLAVOR}
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${PY_FLAVOR} \
 		${PY_DEPENDS}
 RUN_DEPENDS=	${PY_DEPENDS}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cryptography>=36.0.0:security/py-cryptography@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}freezegun>=0.3.12:devel/py-freezegun@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}joblib>=0.3.12:devel/py-joblib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mock>=1.0.1:devel/py-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}parameterized>=0.7.1:devel/py-parameterized@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psycopg2>=2.8.5:databases/py-psycopg2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}PyHamcrest>=1.9:textproc/py-pyhamcrest@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-timeout>=1.3.3:devel/py-pytest-timeout@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-xdist>=1.29.0:devel/py-pytest-xdist@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests-mock>=1.7:www/py-requests-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tenacity>=5.0.2:devel/py-tenacity@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-learn>=0.20.0:science/py-scikit-learn@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlalchemy14>=1.3:databases/py-sqlalchemy14@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>=3.12:devel/py-yaml@${PY_FLAVOR}
 		# testcontainers[mysql]>=3.0.3 is also required
 
 USES=		python:3.6+ zip
 USE_PYTHON=	distutils cython concurrent autoplist pytest # 5 tests fail, depending on pyarrow, MySqlContainer, threadpoolctl
 
 post-install:
 	# strip binaries
 	@${FIND} ${STAGEDIR}${PREFIX} -name "*${PYTHON_EXT_SUFFIX}.so" | ${XARGS} ${STRIP_CMD}
 
 .include <bsd.port.mk>
diff --git a/misc/py-cinder/Makefile b/misc/py-cinder/Makefile
index ffb0de64b352..2e7d9f0ec423 100644
--- a/misc/py-cinder/Makefile
+++ b/misc/py-cinder/Makefile
@@ -1,127 +1,127 @@
 PORTNAME=	cinder
 PORTVERSION=	12.0.10
-PORTREVISION=	22
+PORTREVISION=	23
 CATEGORIES=	misc python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	OpenStack Block Storage
 WWW=		https://docs.openstack.org/cinder/latest/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}castellan>=0.16.0:devel/py-castellan@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cryptography>=1.9:security/py-cryptography@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}decorator>=3.4.0:devel/py-decorator@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}defusedxml>=0.5.0:devel/py-defusedxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}eventlet>=0.18.2:net/py-eventlet@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}google-api-python-client>=1.4.2:www/py-google-api-python-client@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}greenlet>=0.4.10:devel/py-greenlet@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}httplib2>=0.9.1:www/py-httplib2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jsonschema>=2.6.0:devel/py-jsonschema@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}keystoneauth1>=3.3.0:devel/py-keystoneauth1@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}keystonemiddleware>=4.17.0:devel/py-keystonemiddleware@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}lxml>=3.4.1:devel/py-lxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}oauth2client>=1.5.0:security/py-oauth2client@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}os-brick>=2.2.0:devel/py-os-brick@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}os-win>=3.0.0:devel/py-os-win@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.25.0:devel/py-oslo.concurrency@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}oslo.config>=5.1.0:devel/py-oslo.config@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}oslo.context>=2.19.2:devel/py-oslo.context@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}oslo.db>=4.27.0:devel/py-oslo.db@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}oslo.i18n>=3.15.3:devel/py-oslo.i18n@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}oslo.log>=3.36.0:devel/py-oslo.log@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}oslo.messaging>=5.29.0:devel/py-oslo.messaging@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}oslo.middleware>=3.31.0:devel/py-oslo.middleware@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}oslo.policy>=1.30.0:devel/py-oslo.policy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}oslo.privsep>=1.23.0:devel/py-oslo.privsep@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}oslo.reports>=1.18.0:devel/py-oslo.reports@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}oslo.rootwrap>=5.8.0:devel/py-oslo.rootwrap@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}oslo.serialization>=2.18.0:devel/py-oslo.serialization@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}oslo.service>=1.24.0:devel/py-oslo.service@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.33.0:devel/py-oslo.utils@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}oslo.versionedobjects>=1.31.2:devel/py-oslo.versionedobjects@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}oslo.vmware>=2.17.0:devel/py-oslo.vmware@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}osprofiler>=1.4.0:devel/py-osprofiler@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}paramiko>=2.0.0:security/py-paramiko@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Paste>=2.0.2:www/py-paste@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pastedeploy>=1.5.0:www/py-pastedeploy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}prettytable0>=0.7.1<0.8:devel/py-prettytable0@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psutil>=3.2.2:sysutils/py-psutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyparsing>=2.1.0:devel/py-pyparsing@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-barbicanclient>=4.0.0:net/py-python-barbicanclient@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-glanceclient>=2.8.0:net/py-python-glanceclient@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-keystoneclient>=3.8.0:net/py-python-keystoneclient@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-novaclient>=9.1.0:net/py-python-novaclient@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-swiftclient>=3.2.0:databases/py-python-swiftclient@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytz>=2013.6,1:devel/py-pytz@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.14.2:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}retrying>=1.2.3:devel/py-retrying@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}routes>=2.3.1:www/py-routes@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}rtslib-fb>=2.1.43:devel/py-rtslib-fb@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}simplejson>=3.5.1:devel/py-simplejson@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlalchemy-migrate>=0.11.0:databases/py-sqlalchemy-migrate@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlalchemy12>=1.0.10:databases/py-sqlalchemy12@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}stevedore>=1.20.0:devel/py-stevedore@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}suds>=0.6:net/py-suds@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}taskflow>=2.16.0:devel/py-taskflow@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tooz>=1.58.0:devel/py-tooz@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}webob>=1.7.1:www/py-webob@${PY_FLAVOR}
 
 USES=		cpe python:3.8+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 USE_RC_SUBR=	cinder-api cinder-scheduler cinder-volume
 
 USERS=		cinder
 GROUPS=		cinder
 
 SUB_LIST=	PYTHON_VER=${PYTHON_VER}
 
 CONFLICTS_INSTALL=	py??-cinder
 
 CPE_VENDOR=	openstack
 
 PORTSCOUT=	skipv:2015.1.4
 
 OPTIONS_DEFINE=	MEMCACHED MONGODB
 OPTIONS_RADIO=	DB
 OPTIONS_RADIO_DB=	MYSQL PGSQL
 MEMCACHED_DESC=	Memcached support
 MONGODB_DESC=	MongoDB support (used for messaging services)
 MYSQL_DESC=	MySQL/MariaDB support
 PGSQL_DESC=	PostgreSQL support
 
 MEMCACHED_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}python-memcached>=1.56:databases/py-python-memcached@${PY_FLAVOR}
 MONGODB_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pymongo>=3.0.2:databases/py-pymongo@${PY_FLAVOR}
 MYSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pymysql>=0:databases/py-pymysql@${PY_FLAVOR}
 PGSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psycopg2>=0:databases/py-psycopg2@${PY_FLAVOR}
 
 MY_REGEX=	(/etc/)(ceph|nova|pki|ssl)
 
 post-patch:
 	# Prevent the installation of files into ${ETCDIR} by distutils. We do it
 	# manually in the post-install target
 	@${REINPLACE_CMD} -e '/etc\//d' ${WRKSRC}/setup.cfg
 	${CP} ${FILESDIR}/cinder.conf.sample ${WRKSRC}/etc/cinder/cinder.conf
 	# Replace (hardcoded) paths of config, documentation and Python files
 	@${GREP} -Rl -Ee '${MY_REGEX}' --null \
 		${WRKSRC}/etc ${WRKSRC}/doc ${WRKSRC}/cinder | \
 			${XARGS} -0 ${REINPLACE_CMD} -i '' -Ee \
 				"s,${MY_REGEX},${PREFIX}\1\2,g"
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${ETCDIR}/rootwrap.d
 .for f in api-paste.ini cinder.conf rootwrap.conf rootwrap.d/volume.filters
 	${INSTALL_DATA} ${WRKSRC}/etc/cinder/$f ${STAGEDIR}${ETCDIR}/$f.sample
 .endfor
 
 .include <bsd.port.mk>
diff --git a/misc/py-detecta/Makefile b/misc/py-detecta/Makefile
index 3c5f1668df3b..17430b00f644 100644
--- a/misc/py-detecta/Makefile
+++ b/misc/py-detecta/Makefile
@@ -1,23 +1,24 @@
 PORTNAME=	detecta
 DISTVERSION=	0.0.5
+PORTREVISION=	1
 CATEGORIES=	misc python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Library to detect events in data
 WWW=		https://github.com/demotu/detecta
 
 LICENSE=	APACHE20
 
 PY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \
 		${PYNUMPY}
 BUILD_DEPENDS=	${PY_DEPENDS}
 RUN_DEPENDS=	${PY_DEPENDS}
 
 USES=		python:3.6+
 USE_PYTHON=	distutils autoplist
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/misc/py-eemeter/Makefile b/misc/py-eemeter/Makefile
index 5ce5afa98638..2fd1000600bd 100644
--- a/misc/py-eemeter/Makefile
+++ b/misc/py-eemeter/Makefile
@@ -1,22 +1,23 @@
 PORTNAME=	eemeter
 DISTVERSION=	3.1.1
+PORTREVISION=	1
 CATEGORIES=	misc python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Package implementing methods to calculate metered energy consumption
 WWW=		https://eemeter.openee.io/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}statsmodels>0:math/py-statsmodels@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	distutils concurrent autoplist pytest # several tests fail, see https://github.com/openeemeter/eemeter/issues/448
 
 .include <bsd.port.mk>
diff --git a/misc/py-ezc3d/Makefile b/misc/py-ezc3d/Makefile
index 27a57dcf5b8b..f48cc50d849e 100644
--- a/misc/py-ezc3d/Makefile
+++ b/misc/py-ezc3d/Makefile
@@ -1,55 +1,56 @@
 PORTNAME=	ezc3d
 DISTVERSIONPREFIX=	Release_
 DISTVERSION=	1.5.0
+PORTREVISION=	1
 CATEGORIES=	misc python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	C3D (biomechanics data format) reader/writer
 WWW=		https://github.com/pyomeca/ezc3d
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}scikit-build>0:devel/py-scikit-build@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} \
 		cmake:devel/cmake-core \
 		swig:devel/swig
 RUN_DEPENDS=	${PYNUMPY}
 
 USES=		python
 USE_PYTHON=	distutils pytest # autoplist is broken due to https://github.com/pyomeca/ezc3d/issues/258 ; tests fail, see https://github.com/pyomeca/ezc3d/issues/259
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	pyomeca
 GH_TUPLE=	google:googletest:3880b13:googletest/external/gtest # https://github.com/pyomeca/ezc3d/issues/256
 
 TEST_ARGS=	${WRKSRC}/test/python3
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 
 post-install:
 	# remove unnecessary C++ headers, see https://github.com/pyomeca/ezc3d/issues/258
 	@${RM} -r ${STAGEDIR}${PREFIX}/include/*
 	# strip binaries
 	@cd ${STAGEDIR}/${PYTHON_SITELIBDIR} && \
 		${STRIP_CMD} \
 			ezc3d/_ezc3d.so \
 			ezc3d/libezc3d.so
 
 pre-test: # download test c3d files
 	# download archives
 	@${MKDIR} ${WRKSRC}/test/c3dFiles
 	@cd ${WRKDIR} && ${FETCH_CMD} -q https://github.com/pyomeca/ezc3d-testFiles/archive/master.zip -o ${WRKSRC}/test/c3dFiles/ezc3d-testFiles-master.zip
 .for f in Sample01.zip Sample02.zip
 	@cd ${WRKDIR} && ${FETCH_CMD} -q https://www.c3d.org/data/${f} -o ${WRKSRC}/test/c3dFiles/${f}
 .endfor
 	# extract archives
 .for n in ezc3d-testFiles-master Sample01 Sample02
 	@cd ${WRKSRC}/test/c3dFiles && ${MKDIR} ${n} && cd ${n} && ${TAR} -xf ../${n}.zip
 .endfor
 	# move *.c3d files into a flat folder
 	@${MKDIR} ${WRKSRC}/test/c3dTestFiles
 	@${CP} `${FIND} ${WRKSRC} -name "*.c3d"` ${WRKSRC}/test/c3dTestFiles
 
 .include <bsd.port.mk>
diff --git a/misc/py-fast-histogram/Makefile b/misc/py-fast-histogram/Makefile
index bed37c0cc37d..94cc5b641583 100644
--- a/misc/py-fast-histogram/Makefile
+++ b/misc/py-fast-histogram/Makefile
@@ -1,24 +1,25 @@
 PORTNAME=	fast-histogram
 DISTVERSION=	0.11
+PORTREVISION=	1
 CATEGORIES=	misc python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Fast simple 1D and 2D histograms
 WWW=		https://github.com/astrofrog/fast-histogram
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR}
 RUN_DEPENDS=	${PYNUMPY}
 
 USES=		python:3.6+
 USE_PYTHON=	distutils autoplist
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/fast_histogram/_histogram_core*.so
 
 .include <bsd.port.mk>
diff --git a/misc/py-fastscapelib/Makefile b/misc/py-fastscapelib/Makefile
index e01d46082ca3..ca4efc083585 100644
--- a/misc/py-fastscapelib/Makefile
+++ b/misc/py-fastscapelib/Makefile
@@ -1,32 +1,33 @@
 PORTNAME=	fastscapelib
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.1.3-53
+PORTREVISION=	1
 DISTVERSIONSUFFIX=	-g5698347
 CATEGORIES=	misc
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Library of efficient algorithms for topographic data
 WWW=		https://fastscapelib.readthedocs.io/en/latest/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/../LICENSE
 
 BUILD_DEPENDS=	cmake:devel/cmake-core \
 		pybind11>0:devel/pybind11 \
 		xtensor>0:math/xtensor \
 		xtensor-python>0:math/xtensor-python \
 		${PYNUMPY}
 RUN_DEPENDS=	${PYNUMPY}
 
 USES=		python
 USE_PYTHON=	distutils autoplist pytest
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	fastscape-lem
 
 WRKSRC_SUBDIR=	python
 
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 
 .include <bsd.port.mk>
diff --git a/misc/py-gluoncv/Makefile b/misc/py-gluoncv/Makefile
index a3100045bd22..6bddd06910e5 100644
--- a/misc/py-gluoncv/Makefile
+++ b/misc/py-gluoncv/Makefile
@@ -1,41 +1,41 @@
 PORTNAME=	gluoncv
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.9.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc # machine-learning
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Gluon CV toolkit for state-of-the-art deep learning in computer vision
 WWW=		https://gluon-cv.mxnet.io/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 PY_DEPENDS=	${PYNUMPY} \
 		${PY_PILLOW} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mxnet>0:misc/py-mxnet@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}portalocker>0:devel/py-portalocker@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=1.0:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tqdm>0:misc/py-tqdm@${PY_FLAVOR}
 BUILD_DEPENDS=	${PY_DEPENDS}
 RUN_DEPENDS=	${PY_DEPENDS}
 
 USES=		compiler:c11 python:3.7+ localbase
 USE_GITHUB=	yes
 GH_ACCOUNT=	dmlc
 GH_PROJECT=	gluon-cv
 USE_PYTHON=	distutils cython autoplist
 
 PYDISTUTILS_BUILDARGS=		--with-cython
 PYDISTUTILS_INSTALLARGS=	--with-cython
 
 post-patch: # https://github.com/dmlc/gluon-cv/issues/1095
 	@truncate -s 0 ${WRKSRC}/README.md
 
 post-install:
 	@${FIND} ${STAGEDIR}${PREFIX} -name "*.so" | ${XARGS} ${STRIP_CMD}
 
 .include <bsd.port.mk>
diff --git a/misc/py-gluonnlp/Makefile b/misc/py-gluonnlp/Makefile
index a5ef57e69701..53af5b8d7bbb 100644
--- a/misc/py-gluonnlp/Makefile
+++ b/misc/py-gluonnlp/Makefile
@@ -1,29 +1,29 @@
 PORTNAME=	gluonnlp
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.10.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc # machine-learning
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	MXNet-based toolkit to enable easy text, datasets preprocessing
 WWW=		https://gluon-nlp.mxnet.io/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 PY_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}mxnet>0:misc/py-mxnet@${PY_FLAVOR}
 BUILD_DEPENDS=	${PY_DEPENDS}
 RUN_DEPENDS=	${PY_DEPENDS}
 
 USES=		python:3.6+ localbase
 USE_GITHUB=	yes
 GH_ACCOUNT=	dmlc
 GH_PROJECT=	gluon-nlp
 USE_PYTHON=	distutils cython autoplist
 
 post-install:
 	@${FIND} ${STAGEDIR}${PREFIX} -name "*.so" | ${XARGS} ${STRIP_CMD}
 
 .include <bsd.port.mk>
diff --git a/misc/py-histoprint/Makefile b/misc/py-histoprint/Makefile
index fa6d543dfbfe..75b78704fc9d 100644
--- a/misc/py-histoprint/Makefile
+++ b/misc/py-histoprint/Makefile
@@ -1,27 +1,28 @@
 PORTNAME=	histoprint
 DISTVERSION=	2.4.0
+PORTREVISION=	1
 CATEGORIES=	misc python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Pretty printing of histograms to the console
 WWW=		https://github.com/scikit-hep/histoprint
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}click>=7.0.0:devel/py-click@${PY_FLAVOR} \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}uhi>=0.2.1:misc/py-uhi@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_PYTHON=	distutils autoplist pytest
 
 NO_ARCH=	yes
 
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 
 .include <bsd.port.mk>
diff --git a/misc/py-ipyfastscape/Makefile b/misc/py-ipyfastscape/Makefile
index 55b46c398a84..02f0c8694ba5 100644
--- a/misc/py-ipyfastscape/Makefile
+++ b/misc/py-ipyfastscape/Makefile
@@ -1,32 +1,33 @@
 PORTNAME=	ipyfastscape
 DISTVERSION=	0.2.0
+PORTREVISION=	1
 CATEGORIES=	misc
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Interactive widgets for topographic data analysis and modelling
 WWW=		https://github.com/fastscape-lem/ipyfastscape
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 PY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ipygany>=0.5.0:science/py-ipygany@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ipywidgets>0:devel/py-ipywidgets@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ipython>=0:devel/ipython@${PY_FLAVOR} \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}xarray>0:devel/py-xarray@${PY_FLAVOR}
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR} \
 		${PY_DEPENDS}
 RUN_DEPENDS=	${PY_DEPENDS}
 
 USES=		python:3.6+
 USE_PYTHON=	distutils autoplist pytest
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	fastscape-lem
 
 MAKE_ENV=	SETUPTOOLS_SCM_PRETEND_VERSION=${DISTVERSION} # workaround for LookupError: setuptools-scm was unable to detect version for ...
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/misc/py-kartograph/Makefile b/misc/py-kartograph/Makefile
index 5e8cc2144991..05828f1c2c98 100644
--- a/misc/py-kartograph/Makefile
+++ b/misc/py-kartograph/Makefile
@@ -1,29 +1,29 @@
 PORTNAME=	kartograph
 DISTVERSION=	0.6.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Framework for building interactive map applications
 WWW=		https://kartograph.org/docs/kartograph.py/
 
 LICENSE=	MIT
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}argparse>0:devel/py-argparse@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}gdal>0:graphics/py-gdal@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ordereddict>0:devel/py-ordereddict@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyshp>0:devel/py-pyshp@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyaml>0:textproc/py-pyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pykml>0:misc/py-pykml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyproj>0:graphics/py-pyproj@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Shapely>=1.0.14:devel/py-shapely@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tinycss>0:textproc/py-tinycss@${PY_FLAVOR}
 
 USES=		python:3.8+
 USE_GITHUB=	yes
 GH_PROJECT=	${PORTNAME}.py
 USE_PYTHON=	distutils concurrent autoplist
 
 .include <bsd.port.mk>
diff --git a/misc/py-lightgbm/Makefile b/misc/py-lightgbm/Makefile
index c997f10eb77f..292c4b976322 100644
--- a/misc/py-lightgbm/Makefile
+++ b/misc/py-lightgbm/Makefile
@@ -1,42 +1,43 @@
 PORTNAME=	lightgbm
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.3.5
+PORTREVISION=	1
 CATEGORIES=	misc # machine-learning
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Gradient boosting framework that uses tree based learning algorithms
 WWW=		https://lightgbm.readthedocs.io/en/latest/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/../LICENSE
 
 PY_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-learn>=0.22.0:science/py-scikit-learn@${PY_FLAVOR}
 BUILD_DEPENDS=	cmake:devel/cmake-core \
 		gmake:devel/gmake \
 		${PY_DEPENDS} \
 		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PY_DEPENDS}
 
 USES=		eigen:3 python
 USE_PYTHON=	distutils autoplist
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	microsoft
 GH_PROJECT=	LightGBM
 GH_TUPLE=	boostorg:compute:36350b7:boostorg_compute/../external_libs/compute \
 		fmtlib:fmt:b6f4cea:fmt/../external_libs/fmt \
 		lemire:fast_double_parser:ace6064:fast_double_parser/../external_libs/fast_double_parser
 
 WRKSRC_SUBDIR=	python-package
 
 CXXFLAGS+=	-I${LOCALBASE}/include/eigen3
 
 BINARY_ALIAS=	make=${GMAKE}
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/lightgbm/lib_lightgbm.so
 
 .include <bsd.port.mk>
diff --git a/misc/py-mffpy/Makefile b/misc/py-mffpy/Makefile
index 82a0dfe64f22..ca780f875594 100644
--- a/misc/py-mffpy/Makefile
+++ b/misc/py-mffpy/Makefile
@@ -1,26 +1,27 @@
 PORTNAME=	mffpy
 DISTVERSION=	0.8.0
+PORTREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Reader and writer for Philips' MFF file format
 WWW=		https://github.com/BEL-Public/mffpy/
 
 LICENSE=	APACHE20
 
 PY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}deprecated>=1.2.12:devel/py-deprecated@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}lxml>=4.8.0:devel/py-lxml@${PY_FLAVOR} \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}pytz>=2019.2:devel/py-pytz@${PY_FLAVOR}
 BUILD_DEPENDS=	${PY_DEPENDS} \
 		${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${PY_FLAVOR}
 RUN_DEPENDS=	${PY_DEPENDS}
 
 USES=		python:3.6+
 USE_PYTHON=	distutils concurrent autoplist
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/misc/py-mxnet/Makefile b/misc/py-mxnet/Makefile
index 2c44edc6aa8d..d808b7853c0a 100644
--- a/misc/py-mxnet/Makefile
+++ b/misc/py-mxnet/Makefile
@@ -1,44 +1,44 @@
 PORTNAME=	mxnet
 DISTVERSION=	1.9.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc # machine-learning
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Apache MXNet: Ultra-scalable deep learning framework
 WWW=		https://mxnet.apache.org/
 
 LICENSE=	APACHE20
 
 BUILD_DEPENDS=	mxnet>0:misc/mxnet
 RUN_DEPENDS=	mxnet>0:misc/mxnet \
 		${PYTHON_PKGNAMEPREFIX}graphviz>0:graphics/py-graphviz@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.20.0:www/py-requests@${PY_FLAVOR}
 
 USES=		python:3.6+ localbase
 USE_GITHUB=	yes
 USE_PYTHON=	distutils cython autoplist
 
 GH_ACCOUNT=	apache
 GH_PROJECT=	incubator-mxnet
 
 WRKSRC_SUBDIR=	python
 
 POST_PLIST=	fix-plist
 
 PYDISTUTILS_BUILDARGS=		--with-cython
 PYDISTUTILS_INSTALLARGS=	--with-cython
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|dll_path = \[curr_path, api_path, cmake_build_path\]|dll_path = ["${LOCALBASE}/lib"]|' ${WRKSRC}/mxnet/libinfo.py
 
 post-install:
 	@${FIND} ${STAGEDIR}${PREFIX} -name "*.so" | ${XARGS} ${STRIP_CMD}
 	# https://github.com/apache/incubator-mxnet/issues/17081
 	@${RM} ${STAGEDIR}${PREFIX}/mxnet/libmxnet.so
 	@${RMDIR} ${STAGEDIR}${PREFIX}/mxnet
 
 fix-plist: # see post-install
 	@${REINPLACE_CMD} '/^mxnet\/libmxnet.so$$/d' ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/misc/py-numcodecs/Makefile b/misc/py-numcodecs/Makefile
index c06fa17ac58a..13b6691e7088 100644
--- a/misc/py-numcodecs/Makefile
+++ b/misc/py-numcodecs/Makefile
@@ -1,36 +1,36 @@
 PORTNAME=	numcodecs
 DISTVERSION=	0.11.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Package providing buffer compression and transformation codecs for use
 WWW=		https://numcodecs.readthedocs.io/en/stable/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}py-cpuinfo>0:sysutils/py-py-cpuinfo@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}entrypoints>0:devel/py-entrypoints@${PY_FLAVOR} \
 		${PYNUMPY}
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}msgpack>0:devel/py-msgpack@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}zfp>0:devel/py-zfp@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	distutils cython autoplist pytest # tests fail to find the library in the staged directory for some reason
 
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 TEST_WRKSRC=	${WRKSRC}/numcodecs/tests
 
 OPTIONS_DEFINE=		AVX2
 
 AVX2_DESC=		Use AVX2 SIMD instructions
 AVX2_CONFIGURE_ENV_OFF=	DISABLE_NUMCODECS_AVX2=yes
 AVX2_MAKE_ENV_OFF=	DISABLE_NUMCODECS_AVX2=yes
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/numcodecs/*${PYTHON_EXT_SUFFIX}.so
 
 .include <bsd.port.mk>
diff --git a/misc/py-onnx-tf/Makefile b/misc/py-onnx-tf/Makefile
index 1c61d9dc30ee..8e639a34dee0 100644
--- a/misc/py-onnx-tf/Makefile
+++ b/misc/py-onnx-tf/Makefile
@@ -1,22 +1,23 @@
 PORTNAME=	onnx-tf
 DISTVERSION=	1.10.0
+PORTREVISION=	1
 CATEGORIES=	misc python # machine-learning
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Tensorflow backend for ONNX (Open Neural Network Exchange)
 WWW=		https://github.com/onnx/onnx-tensorflow/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}onnx>0:misc/py-onnx@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_PYTHON=	distutils concurrent autoplist
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/misc/py-onnx/Makefile b/misc/py-onnx/Makefile
index db19e0edfcb7..8a075f912b1f 100644
--- a/misc/py-onnx/Makefile
+++ b/misc/py-onnx/Makefile
@@ -1,34 +1,35 @@
 PORTNAME=	onnx
 DISTVERSION=	1.13.1
+PORTREVISION=	1
 CATEGORIES=	misc # machine-learning
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Open Neural Network eXchange
 WWW=		https://onnx.ai/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	bash:shells/bash \
 		cmake:devel/cmake-core \
 		protoc-gen-mypy:devel/py-mypy-protobuf@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pybind11>0:devel/py-pybind11@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-runner>=0:devel/py-pytest-runner@${PY_FLAVOR}
 LIB_DEPENDS=	libprotobuf.so:devel/protobuf
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}typing-extensions>=3.6.2.1:devel/py-typing-extensions@${PY_FLAVOR}
 
 USES=		compiler:c11 python:3.6+ shebangfix
 USE_PYTHON=	distutils concurrent autoplist
 
 SHEBANG_FILES=	tools/protoc-gen-mypy.sh.in
 
 BINARY_ALIAS=	python=${PYTHON_CMD}
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/onnx/onnx_cpp2py_export*.so
 
 .include <bsd.port.mk>
diff --git a/misc/py-openai/Makefile b/misc/py-openai/Makefile
index 2ed42b2e0dd9..7d3b1155eeac 100644
--- a/misc/py-openai/Makefile
+++ b/misc/py-openai/Makefile
@@ -1,30 +1,30 @@
 PORTNAME=	openai
 DISTVERSION=	0.27.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc # machine-learning
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Python client library for the OpenAI API
 WWW=		https://github.com/openai/openai-python
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}aiohttp>0:www/py-aiohttp@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.20:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tqdm>0:misc/py-tqdm@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}typing-extensions>0:devel/py-typing-extensions@${PY_FLAVOR}
 RUN_DEPENDS+=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}pandas>=1.2.3:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wandb>0:misc/py-wandb@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	pep517 autoplist
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/misc/py-openvdb/Makefile b/misc/py-openvdb/Makefile
index 0fe9460f5e4a..e17496cbc2f7 100644
--- a/misc/py-openvdb/Makefile
+++ b/misc/py-openvdb/Makefile
@@ -1,38 +1,38 @@
 PORTNAME=	openvdb
 DISTVERSIONPREFIX=	v
 DISTVERSION=	10.0.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	misc
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Tools for storage and manipulation of sparse volumetric data
 WWW=		https://www.openvdb.org/
 
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/../../../LICENSE
 
 BUILD_DEPENDS=	${PYNUMPY}
 LIB_DEPENDS=	${PY_BOOST} \
 		libboost_iostreams.so:devel/boost-libs \
 		libopenvdb.so:misc/openvdb \
 		libtbb.so:devel/onetbb
 RUN_DEPENDS=	${PYNUMPY}
 
 USES=		cmake compiler:c++17-lang localbase:ldflags python
 USE_LDCONFIG=	yes
 USE_PYTHON=	flavors
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	AcademySoftwareFoundation
 
 CMAKE_ON=	USE_NUMPY OPENVDB_PYTHON_WRAP_ALL_GRID_TYPES
 CMAKE_OFF=	OPENVDB_BUILD_PYTHON_UNITTESTS
 CMAKE_ARGS=	-DPython_EXECUTABLE=${PYTHON_CMD}
 
 WRKSRC_SUBDIR=	openvdb/openvdb/python
 
 PLIST_FILES=	include/openvdb/python/pyopenvdb.h \
 		${PYTHON_SITELIBDIR}/pyopenvdb.so
 
 .include <bsd.port.mk>
diff --git a/misc/py-orange3-associate/Makefile b/misc/py-orange3-associate/Makefile
index 9239fbf85c5a..2b1d78e6bc27 100644
--- a/misc/py-orange3-associate/Makefile
+++ b/misc/py-orange3-associate/Makefile
@@ -1,22 +1,23 @@
 PORTNAME=	orange3-associate
 DISTVERSION=	1.1.8
+PORTREVISION=	1
 CATEGORIES=	misc python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Orange 3 add-on: Frequent itemsets and association rules mining
 WWW=		https://github.com/biolab/orange3-associate
 
 LICENSE=	GPLv3+
 
 RUN_DEPENDS=	orange3>0:misc/orange3 \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR}
 
 USES=		python:3.4+
 USE_PYTHON=	distutils autoplist
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	biolab
 
 .include <bsd.port.mk>
diff --git a/misc/py-orange3-datafusion/Makefile b/misc/py-orange3-datafusion/Makefile
index 31b34f88f861..582013b642a5 100644
--- a/misc/py-orange3-datafusion/Makefile
+++ b/misc/py-orange3-datafusion/Makefile
@@ -1,24 +1,24 @@
 PORTNAME=	orange3-datafusion
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.1.11-7
-PORTREVISION=	3
+PORTREVISION=	4
 DISTVERSIONSUFFIX=	-g69aa51c
 CATEGORIES=	misc python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Data fusion add-on for Orange3
 WWW=		https://github.com/biolab/orange3-datafusion
 
 LICENSE=	GPLv3
 
 RUN_DEPENDS=	orange3>0:misc/orange3 \
 		${PYTHON_PKGNAMEPREFIX}scikit-fusion>0:misc/py-scikit-fusion@${PY_FLAVOR}
 
 USES=		python:3.4+
 USE_GITHUB=	yes
 GH_ACCOUNT=	biolab
 USE_PYTHON=	distutils autoplist
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/misc/py-orange3-educational/Makefile b/misc/py-orange3-educational/Makefile
index fc8fefdf633f..1924f59c65da 100644
--- a/misc/py-orange3-educational/Makefile
+++ b/misc/py-orange3-educational/Makefile
@@ -1,25 +1,26 @@
 PORTNAME=	orange3-educational
 DISTVERSION=	0.4.0
+PORTREVISION=	1
 CATEGORIES=	misc education python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Orange add-on: widgets for machine learning and data mining
 WWW=		https://github.com/biolab/orange3-educational
 
 LICENSE=	CC-BY-3.0
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	orange3>0:misc/orange3 \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}beautifulsoup>0:www/py-beautifulsoup@${PY_FLAVOR}
 
 USES=		python:3.4+
 USE_PYTHON=	distutils autoplist
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	biolab
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/misc/py-orange3-network/Makefile b/misc/py-orange3-network/Makefile
index 45f24ee498c7..9a6141b619fe 100644
--- a/misc/py-orange3-network/Makefile
+++ b/misc/py-orange3-network/Makefile
@@ -1,26 +1,27 @@
 PORTNAME=	orange3-network
 DISTVERSION=	1.5.1.20210224 # the 1.5.1 was forgotten
+PORTREVISION=	1
 CATEGORIES=	misc python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Network analysis add-on for Orange data mining suite
 WWW=		https://github.com/biolab/orange3-network
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${PYNUMPY}
 RUN_DEPENDS=	orange3>0:misc/orange3 \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}gensim>0:textproc/py-gensim@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyqtgraph>=0.9.10:graphics/py-pyqtgraph@${PY_FLAVOR}
 
 USES=		python:3.4+
 USE_PYTHON=	distutils cython autoplist
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	biolab
 GH_TAGNAME=	ec534c9
 
 .include <bsd.port.mk>
diff --git a/misc/py-orange3-timeseries/Makefile b/misc/py-orange3-timeseries/Makefile
index 578a215cc116..7e963d6aec41 100644
--- a/misc/py-orange3-timeseries/Makefile
+++ b/misc/py-orange3-timeseries/Makefile
@@ -1,27 +1,28 @@
 PORTNAME=	orange3-timeseries
 DISTVERSION=	0.3.10
+PORTREVISION=	1
 CATEGORIES=	misc python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Orange add-on for analyzing, visualizing, manipulating time series
 WWW=		https://github.com/biolab/orange3-timeseries
 
 LICENSE=	CC-BY-3.0
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	orange3>0:misc/orange3 \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}more-itertools>0:devel/py-more-itertools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pandas-datareader>0:math/py-pandas-datareader@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=0.17:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}statsmodels>=0.10.0:math/py-statsmodels@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_GITHUB=	yes
 GH_ACCOUNT=	biolab
 USE_PYTHON=	distutils autoplist
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/misc/py-placekey/Makefile b/misc/py-placekey/Makefile
index 436ed8a19943..d3b5763a1099 100644
--- a/misc/py-placekey/Makefile
+++ b/misc/py-placekey/Makefile
@@ -1,25 +1,26 @@
 PORTNAME=	placekey
 PORTVERSION=	0.0.12
+PORTREVISION=	1
 CATEGORIES=	misc geography python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Utilities for working with Placekeys
 WWW=		https://github.com/Placekey/placekey-py
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}backoff>=0:devel/py-backoff@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}h3>=0:graphics/py-h3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ratelimiter>=0:devel/py-ratelimiter@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Shapely>=0:devel/py-shapely@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/misc/py-pyEDFlib/Makefile b/misc/py-pyEDFlib/Makefile
index 4bad136d05a6..5126168c0e35 100644
--- a/misc/py-pyEDFlib/Makefile
+++ b/misc/py-pyEDFlib/Makefile
@@ -1,30 +1,31 @@
 PORTNAME=	pyEDFlib
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.1.30
+PORTREVISION=	1
 CATEGORIES=	misc
 #MASTER_SITES=	PYPI # PyPI version fails: https://github.com/holgern/pyedflib/issues/168
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Python library to read/write EDF+/BDF+ files based on EDFlib
 WWW=		https://github.com/holgern/pyedflib
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYNUMPY}
 RUN_DEPENDS=	${PYNUMPY}
 
 USES=		fortran python:3.6+
 USE_PYTHON=	distutils cython autoplist
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	holgern
 GH_PROJECT=	pyedflib
 
 USE_GCC=	yes # fails to build with clang: https://github.com/holgern/pyedflib/issues/104
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/pyedflib/_extensions/_pyedflib*.so
 
 .include <bsd.port.mk>
diff --git a/misc/py-pypatent/Makefile b/misc/py-pypatent/Makefile
index 3db7959001c6..67a093e59bdf 100644
--- a/misc/py-pypatent/Makefile
+++ b/misc/py-pypatent/Makefile
@@ -1,25 +1,26 @@
 PORTNAME=	pypatent
 DISTVERSION=	1.2.0
+PORTREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Search for and retrieve US Patent and Trademark Office Patent Data
 WWW=		https://github.com/daneads/pypatent
 
 LICENSE=	GPLv3
 
 PY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>0:www/py-beautifulsoup@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}selenium>0:www/py-selenium@${PY_FLAVOR}
 BUILD_DEPENDS=	${PY_DEPENDS}
 RUN_DEPENDS=	${PY_DEPENDS}
 
 USES=		python:3.6+
 USE_PYTHON=	distutils autoplist
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/misc/py-qiskit-machine-learning/Makefile b/misc/py-qiskit-machine-learning/Makefile
index 32f80a0118ff..6fdd01e9cb9a 100644
--- a/misc/py-qiskit-machine-learning/Makefile
+++ b/misc/py-qiskit-machine-learning/Makefile
@@ -1,32 +1,33 @@
 PORTNAME=	qiskit-machine-learning
 DISTVERSION=	0.5.0
+PORTREVISION=	1
 CATEGORIES=	misc python # quantum-computing, machine-learning
 #MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Quantum Machine Learning for Quiskit framework for quantum computing
 WWW=		https://qiskit.org/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 PY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dill>=0.3.4:devel/py-dill@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}fastdtw>0:math/py-fastdtw@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psutil>=5:sysutils/py-psutil@${PY_FLAVOR} \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}qiskit-terra>=0.22:science/py-qiskit-terra@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-learn>=0.20.0:science/py-scikit-learn@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=1.4:science/py-scipy@${PY_FLAVOR}
 BUILD_DEPENDS=	${PY_DEPENDS}
 RUN_DEPENDS=	${PY_DEPENDS}
 
 USES=		python:3.7+
 USE_PYTHON=	distutils autoplist pytest # several tests fail with "No module named 'threadpoolctl'", see https://reviews.freebsd.org/D35513
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Qiskit
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/misc/py-scikit-fusion/Makefile b/misc/py-scikit-fusion/Makefile
index 0080ab10bf88..352d0870d16d 100644
--- a/misc/py-scikit-fusion/Makefile
+++ b/misc/py-scikit-fusion/Makefile
@@ -1,23 +1,23 @@
 PORTNAME=	scikit-fusion
 DISTVERSION=	0.2.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	misc python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Data fusion based on recent collective latent factor models
 WWW=		https://github.com/marinkaz/scikit-fusion
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}joblib>=0.8.4:devel/py-joblib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=0.12.0:science/py-scipy@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_PYTHON=	autoplist distutils
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/misc/py-shap2/Makefile b/misc/py-shap2/Makefile
index f3a7fb7cdf99..d2deef4a7e73 100644
--- a/misc/py-shap2/Makefile
+++ b/misc/py-shap2/Makefile
@@ -1,30 +1,31 @@
 PORTNAME=	shap2
 DISTVERSION=	0.42.0
+PORTREVISION=	1
 CATEGORIES=	misc # machine-learning
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Unified approach to explain the output of any machine learning model
 WWW=		https://github.com/slundberg/shap
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 PY_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}numba>0:devel/py-numba@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-learn>0:science/py-scikit-learn@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xgboost>0:misc/py-xgboost@${PY_FLAVOR}
 BUILD_DEPENDS=	${PY_DEPENDS}
 RUN_DEPENDS=	${PY_DEPENDS}
 
 USES=		python:3.6+
 USE_PYTHON=	distutils autoplist
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/shap2/_cext${PYTHON_EXT_SUFFIX}.so
 
 .include <bsd.port.mk>
diff --git a/misc/py-soapy_power/Makefile b/misc/py-soapy_power/Makefile
index 0b650e73b43f..6244ee61fac1 100644
--- a/misc/py-soapy_power/Makefile
+++ b/misc/py-soapy_power/Makefile
@@ -1,23 +1,23 @@
 PORTNAME=	soapy_power
 DISTVERSION=	1.6.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	misc hamradio python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Obtain power spectrum from SoapySDR devices
 WWW=		https://github.com/xmikos/soapy_power
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}pyFFTW>0:math/py-pyFFTW@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}SimpleSoapy>=1.5.0:misc/py-SimpleSoapy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}SimpleSpectral>0:science/py-SimpleSpectral@${PY_FLAVOR}
 
 USES=		python:3.8+
 USE_PYTHON=	distutils concurrent autoplist
 
 .include <bsd.port.mk>
diff --git a/misc/py-tflearn/Makefile b/misc/py-tflearn/Makefile
index 99662819cea1..447ed65961c1 100644
--- a/misc/py-tflearn/Makefile
+++ b/misc/py-tflearn/Makefile
@@ -1,25 +1,26 @@
 PORTNAME=	tflearn
 DISTVERSION=	0.3.2-53
+PORTREVISION=	1
 DISTVERSIONSUFFIX=	-g5c23566
 CATEGORIES=	misc python # machine-learning
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Modular and transparent deep learning library on top of TensorFlow
 WWW=		http://tflearn.org/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYNUMPY} \
 		${PY_PILLOW} \
 		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tensorflow>0:science/py-tensorflow@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_GITHUB=	yes
 USE_PYTHON=	distutils autoplist
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/misc/py-tflite-support/Makefile b/misc/py-tflite-support/Makefile
index bbb59e8c0a81..2ec6d86545c1 100644
--- a/misc/py-tflite-support/Makefile
+++ b/misc/py-tflite-support/Makefile
@@ -1,24 +1,25 @@
 PORTNAME=	tflite-support
 DISTVERSION=	0.1.0a1
+PORTREVISION=	1
 CATEGORIES=	misc # machine-learning
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Toolkit for developing/deploying ML/TFLite models
 WWW=		https://www.tensorflow.org/
 
 LICENSE=	APACHE20
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pybind11>=2.4:devel/py-pybind11@${PY_FLAVOR}
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}absl>=0.7.0:devel/py-absl@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pybind11>=2.4:devel/py-pybind11@${PY_FLAVOR}
 
 USES=		compiler:c++14-lang python:3.6+
 USE_PYTHON=	distutils concurrent autoplist
 
 post-install:
 	@${FIND} ${STAGEDIR}${PREFIX} -name "*.so" | ${XARGS} ${STRIP_CMD}
 
 .include <bsd.port.mk>
diff --git a/misc/py-uhi/Makefile b/misc/py-uhi/Makefile
index 49166c6029e8..51634361840e 100644
--- a/misc/py-uhi/Makefile
+++ b/misc/py-uhi/Makefile
@@ -1,32 +1,33 @@
 PORTNAME=	uhi
 DISTVERSION=	0.3.2
+PORTREVISION=	1
 CATEGORIES=	misc python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Universal Histogram Interface
 WWW=		https://uhi.readthedocs.io/en/latest/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYNUMPY}
 RUN_DEPENDS=	${PYNUMPY}
 
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}boost-histogram>=1.0:misc/py-boost-histogram@${PY_FLAVOR}
 
 USES=		compiler:c++14-lang python:3.8+
 USE_PYTHON=	distutils autoplist pytest
 
 NO_ARCH=	yes
 
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 
 pre-configure: # uhi is officially built with "build" (https://github.com/pypa/build), but this is easily circumvented with this simple setup.py
 	@( \
 		${ECHO} "from setuptools import setup" && \
 		${ECHO} "setup()" \
 	) > ${WRKSRC}/setup.py
 
 .include <bsd.port.mk>
diff --git a/misc/py-wurlitzer/Makefile b/misc/py-wurlitzer/Makefile
index 232cc6b6f081..d495132f2d70 100644
--- a/misc/py-wurlitzer/Makefile
+++ b/misc/py-wurlitzer/Makefile
@@ -1,25 +1,26 @@
 PORTNAME=	wurlitzer
 PORTVERSION=	3.0.3
+PORTREVISION=	1
 CATEGORIES=	misc python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	rhurlin@FreeBSD.org
 COMMENT=	Capture C-level output in context managers
 WWW=		https://github.com/minrk/wurlitzer
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYNUMPY}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}codecov>0:devel/py-codecov@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-cov>0:devel/py-pytest-cov@${PY_FLAVOR}
 
 USES=		python:3.6+ pytest
 USE_PYTHON=	autoplist concurrent distutils
 PYTEST_ARGS=	test.py
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/misc/py-xgboost/Makefile b/misc/py-xgboost/Makefile
index 94945f758d33..cf4348672714 100644
--- a/misc/py-xgboost/Makefile
+++ b/misc/py-xgboost/Makefile
@@ -1,40 +1,41 @@
 PORTNAME=	xgboost
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.7.4
+PORTREVISION=	1
 CATEGORIES=	misc # machine-learning
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Scalable, Portable and Distributed Gradient Boosting (GBDT, GBRT, GBM)
 WWW=		https://xgboost.ai/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/../LICENSE
 
 BUILD_DEPENDS=	cmake:devel/cmake-core
 LIB_DEPENDS=	libdmlc.so:devel/dmlc-core \
 		libxgboost.so:misc/xgboost
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}scikit-learn>0:science/py-scikit-learn@${PY_FLAVOR}
 
 USES=		compiler:c11 python:3.5+ localbase:ldflags
 USE_PYTHON=	distutils pytest # Python tests are broken because py-scikit-learn is missing the py-threadpoolctl dependency which is also currently broken
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	dmlc
 
 WRKSRC_SUBDIR=	python-package
 
 PYDISTUTILS_INSTALLARGS=	--use-system-libxgboost # this is ignored so that setup.py has to be patched, see https://github.com/dmlc/xgboost/issues/6879
 
 NO_ARCH=	yes
 
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 TEST_WRKSRC=	${WRKSRC}/../tests/python
 
 post-install:
 	${PYTHON_CMD} -m compileall -d ${PYTHON_SITELIBDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}
 
 .include <bsd.port.mk>
diff --git a/misc/pytorch/Makefile b/misc/pytorch/Makefile
index 476c58a5da72..a20a7a290275 100644
--- a/misc/pytorch/Makefile
+++ b/misc/pytorch/Makefile
@@ -1,74 +1,75 @@
 PORTNAME=	pytorch
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.13.1
+PORTREVISION=	1
 CATEGORIES=	misc # machine-learning
 MASTER_SITES=	https://github.com/pytorch/pytorch/releases/download/v1.13.1/
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Tensors and dynamic neural networks in Python (C++ library)
 WWW=		https://pytorch.org/
 
 LICENSE=	BSD3CLAUSE
 
 BROKEN_aarch64=	configure fails: CMake Error at third_party/XNNPACK/CMakeLists.txt:94 (MESSAGE): Unrecognized CMAKE_SYSTEM_NAME = FreeBSD
 BROKEN_i386=	compilation fails: error: use of undeclared identifier 'AVX2'
 
 BUILD_DEPENDS=	gmake:devel/gmake \
 		${LOCALBASE}/include/fxdiv.h:devel/fxdiv
 LIB_DEPENDS=	libopenblas.so:math/openblas \
 		libmpi.so:net/openmpi \
 		libpthreadpool.so:devel/pthreadpool \
 		libonnx.so:misc/onnx \
 		libprotobuf.so:devel/protobuf \
 		libsleef.so:math/sleef
 
 USES=		compiler:c++14-lang cmake localbase:ldflags python # requires python even with PYTHON=off
 
 CMAKE_OFF=	BUILD_CUSTOM_PROTOBUF USE_CUDA USE_ROCM  USE_NNPACK USE_QNNPACK USE_PYTORCH_QNNPACK \
 		USE_FBGEMM # workaround recommended by the upstream here: https://github.com/pytorch/pytorch/issues/28337
 CMAKE_ON=	USE_SYSTEM_PYBIND11 \
 		USE_SYSTEM_SLEEF \
 		USE_SYSTEM_ONNX # see other USE_SYSTEM_xx in CMakeLists.txt
 CMAKE_ARGS=	-DPSIMD_SOURCE_DIR=${WRKSRC}/third_party/psimd \
 		-DFREEBSD_PYTHON_VER=${PYTHON_VER} \
 		-DPYTHON_EXECUTABLE:STRING=${PYTHON_CMD}
 
 MAKE_ENV=	USE_NINJA=no # ninja breaks for some reason
 LDFLAGS+=	-lexecinfo
 
 BINARY_ALIAS=	make=${GMAKE} git=true
 
 OPTIONS_DEFINE=		PYTHON # PYTHON only provides python support for the py-PyTorch port - it's not a python binding
 OPTIONS_DEFAULT=	PYTHON
 OPTIONS_SUB=		yes
 
 PYTHON_CMAKE_BOOL=	BUILD_PYTHON
 PYTHON_PY_DEPENDS=	${PYNUMPY} \
 			${PYTHON_PKGNAMEPREFIX}typing-extensions>0:devel/py-typing-extensions@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
 PYTHON_BUILD_DEPENDS=	${PYTHON_PY_DEPENDS} \
 			pybind11>0:devel/pybind11
 PYTHON_RUN_DEPENDS=	${PYTHON_PY_DEPENDS}
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "amd64"
 PLIST_SUB+=	AMD64=""
 .else
 PLIST_SUB+=	AMD64="@comment "
 .endif
 
 post-patch:
 	# replace malloc.h -> stdlib.h in many places
 	@cd ${WRKSRC} && for f in $$(${GREP} -rl "include <malloc\.h>" * | ${GREP} -E "\.(c|cpp|h|hpp)$$"); do \
 	  ${REINPLACE_CMD} -i'' -E "s|include <malloc\.h>|include <stdlib.h>|" $$f; \
 	done
 
 post-install:
 	# functorch.so is installed back into the source directory, see https://github.com/pytorch/pytorch/issues/91524
 	@${RM} $$(${FIND} ${STAGEDIR} -name functorch.so)
 	# https://github.com/pytorch/pytorch/issues/24417
 	@${FIND} ${STAGEDIR} -type d -empty -delete
 
 .include <bsd.port.post.mk>
diff --git a/misc/quantum++/Makefile b/misc/quantum++/Makefile
index 76a26bf60751..fd5532163bff 100644
--- a/misc/quantum++/Makefile
+++ b/misc/quantum++/Makefile
@@ -1,28 +1,29 @@
 PORTNAME=	quantum++
 DISTVERSIONPREFIX=	v
 DISTVERSION=	4.0.1
+PORTREVISION=	1
 CATEGORIES=	misc devel
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	C++ header-only general purpose quantum computing library
 WWW=		https://github.com/softwareQinc/qpp
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		cmake:testing compiler:c++17-lang eigen:3,build,run
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	softwareQinc
 GH_PROJECT=	qpp
 
 CMAKE_TESTING_ON=	WITH_UNIT_TESTS
 CMAKE_TESTING_TARGET=	unit_tests
 
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 post-test: # run tests
 	@${BUILD_WRKSRC}/unit_tests/unit_tests
 
 .include <bsd.port.mk>
diff --git a/misc/seabios/Makefile b/misc/seabios/Makefile
index 7647f5c99d14..dbba92f1e069 100644
--- a/misc/seabios/Makefile
+++ b/misc/seabios/Makefile
@@ -1,30 +1,30 @@
 PORTNAME=	seabios
 PORTVERSION=	1.16.1
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	https://www.seabios.org/downloads/
 
 MAINTAINER=	royger@FreeBSD.org
 COMMENT=	Open source implementation of a 16bit X86 BIOS
 WWW=		http://www.seabios.org
 
 LICENSE=	LGPL3
 
 ONLY_FOR_ARCHS=		amd64 i386
 ONLY_FOR_ARCHS_REASON=	specific to x86
 
 USES=	gmake python:build
 
 MAKE_ARGS=	AS="${AS}" HOSTCC="${CC}" LD="${LD}" OBJCPY="${OBJCPY}" \
 		OBJDUMP="${OBJDUMP}" PYTHON="${PYTHON_CMD}"
 NO_ARCH=	yes
 USE_GCC=	yes:build
 USE_BINUTILS=	yes
 
 PLIST_FILES=	${DATADIR}/bios.bin
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/out/bios.bin ${STAGEDIR}${DATADIR}
 
 .include <bsd.port.mk>
diff --git a/misc/snakemake/Makefile b/misc/snakemake/Makefile
index d149a020b2c1..604c84137114 100644
--- a/misc/snakemake/Makefile
+++ b/misc/snakemake/Makefile
@@ -1,37 +1,38 @@
 PORTNAME=	snakemake
 DISTVERSION=	6.15.5
+PORTREVISION=	1
 CATEGORIES=	misc python
 MASTER_SITES=	PYPI
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Workflow management system
 WWW=		https://github.com/snakemake/snakemake
 
 LICENSE=	MIT
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}appdirs>0:devel/py-appdirs@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}connection_pool>=0.0.3>0:devel/py-connection_pool@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}configargparse>0:devel/py-configargparse@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}datrie>0:devel/py-datrie@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}filelock>0:sysutils/py-filelock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}gitpython>0:devel/py-gitpython@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jsonschema>0:devel/py-jsonschema@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}nbformat>0:devel/py-nbformat@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}PuLP>=2.0:math/py-PuLP@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ratelimiter>0:devel/py-ratelimiter@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}smart-open>=3.0:net/py-smart-open@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}stopit>0:devel/py-stopit@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tabulate>0:devel/py-tabulate@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}toposort>0:devel/py-toposort@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wrapt>0:devel/py-wrapt@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
 
 USES=		python:3.5+
 USE_PYTHON=	distutils noflavors autoplist
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/misc/thrill/Makefile b/misc/thrill/Makefile
index 6f0cf3df643f..b3415df3ce26 100644
--- a/misc/thrill/Makefile
+++ b/misc/thrill/Makefile
@@ -1,42 +1,43 @@
 PORTNAME=	thrill
 DISTVERSION=	g20200406
+PORTREVISION=	1
 CATEGORIES=	misc
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	C++ framework for algorithmic distributed Big Data batch computations
 WWW=		https://project-thrill.org/
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 NOT_FOR_ARCHS=	armv6 armv7 i386 mips powerpc powerpcspe # static_assert failed due to requirement 'sizeof(unsigned int) == 8' "FOXXLL supports only 64-bit builds"
 
 LIB_DEPENDS=	libmpi.so:net/openmpi
 
 USES=		cmake compiler:c++17-lang fortran
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_TAGNAME=	12c5b59bca66df93b66628b3829027bd0f110dd9
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 CMAKE_OFF=	THRILL_USE_JEMALLOC
 CMAKE_ARGS=	-DINSTALL_INCLUDE_DIR=${PREFIX}/include # workaround for https://github.com/thrill/thrill/issues/196
 
 GH_TUPLE=	USCiLab:cereal:2f9471bc401590cf58b38bbbc33d412dade6d589:USCiLab_cereal/extlib/cereal \
 		google:googletest:5490beb0602eab560fa3969a4410e11d94bf12af:google_googletest/extlib/googletest \
 		bji:libs3:111dc30029f64bbf82031f3e160f253a0a63c119:bji_libs3/extlib/libs3/libs3 \
 		tlx:tlx:89397b7fa1aa5631b4b84e53a92d6c5e06044d43:tlx_tlx/extlib/tlx \
 		stxxl:foxxll:a4a8aeee64743f845c5851e8b089965ea1c219d7:stxxl_foxxll/extlib/foxxll
 
 .include <bsd.port.pre.mk>
 
 .if ${CHOSEN_COMPILER_TYPE} == clang
 LLVM_VERSION=	10 # clang-11 crashes: https://bugs.llvm.org/show_bug.cgi?id=48562
 BUILD_DEPENDS+=	clang${LLVM_VERSION}:devel/llvm${LLVM_VERSION}
 CPP=		clang-cpp${LLVM_VERSION}
 CC=		clang${LLVM_VERSION}
 CXX=		clang++${LLVM_VERSION}
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/misc/urh/Makefile b/misc/urh/Makefile
index f48b104124b2..6557519ee06e 100644
--- a/misc/urh/Makefile
+++ b/misc/urh/Makefile
@@ -1,37 +1,37 @@
 PORTNAME=	urh
 DISTVERSION=	2.9.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc hamradio python
 MASTER_SITES=	PYPI
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Universal Radio Hacker: investigate wireless protocols like a boss
 WWW=		https://github.com/jopohl/urh
 
 LICENSE=	GPLv3
 
 .if !exists(/usr/include/omp.h)
 BROKEN=		requires OpenMP support that is missing on this architecture
 .endif
 
 BUILD_DEPENDS=	${PYNUMPY}
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyzmq>0:net/py-pyzmq@${PY_FLAVOR}
 
 USES=		compiler:c++11-lang fortran python:3.4+ localbase pyqt:5
 USE_PYQT=	pyqt5
 USE_PYTHON=	distutils cython noflavors autoplist
 
 PLIST_FILES=	bin/urh.shadow
 
 post-install:
 	@${MV} ${STAGEDIR}${PREFIX}/bin/urh ${STAGEDIR}${PREFIX}/bin/urh.shadow
 	@(echo "#!/bin/sh"; \
 	  echo ""; \
 	  echo "LD_PRELOAD=${PREFIX}/lib/gcc${GCC_DEFAULT}/libgcc_s.so ${PREFIX}/bin/urh.shadow \"$$@\"" \
 	) > ${STAGEDIR}${PREFIX}/bin/urh
 	@${CHMOD} +x ${STAGEDIR}${PREFIX}/bin/urh
 	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/urh/cythonext/*.so
 
 .include <bsd.port.mk>
diff --git a/misc/visp/Makefile b/misc/visp/Makefile
index 4d4b6e192c12..3c36a383eaf8 100644
--- a/misc/visp/Makefile
+++ b/misc/visp/Makefile
@@ -1,60 +1,60 @@
 PORTNAME=	visp
 DISTVERSION=	3.5.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	misc
 MASTER_SITES=	https://visp-doc.inria.fr/download/releases/
 
 PATCH_SITES=	https://github.com/lagadic/${PORTNAME}/commit/
 PATCHFILES=	ff554ca8be5f43a3470e1cb20150d8171a66b463.patch:-p1 # fix https://github.com/lagadic/visp/issues/1059
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Modular library for visual tracking and visual servoing
 WWW=		https://visp.inria.fr/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 LIB_DEPENDS=	libblas.so:math/blas \
 		libboost_system.so:devel/boost-libs \
 		libdmtx.so:graphics/libdmtx \
 		libflann.so:math/flann \
 		libgsl.so:math/gsl \
 		liblapack.so:math/lapack \
 		libopenblas.so:math/openblas \
 		libopencv_core.so:graphics/opencv \
 		libopencv_videoio.so:graphics/opencv \
 		libqhull_r.so:math/qhull \
 		libpng.so:graphics/png \
 		libv4l2.so:multimedia/libv4l \
 		liblz4.so:archivers/liblz4 \
 		libdc1394.so:multimedia/libdc1394
 
 USES=		cmake compiler:c++14-lang eigen:3 fortran gl gnome jpeg python:build xorg zip
 USE_GNOME=	libxml2
 USE_XORG=	ice sm x11 xext
 USE_GL=		gl glu opengl
 USE_LDCONFIG=	yes
 
 CMAKE_OFF=	WITH_QBDEVICE BUILD_EXAMPLES BUILD_TUTORIALS BUILD_TESTS BUILD_DEMOS
 
 OPTIONS_DEFINE=		COIN OGRE PCL ZBAR
 OPTIONS_DEFAULT=	COIN OGRE PCL ZBAR
 
 COIN_DESC=		Use Coin3D for simulation or augmented reality capabilities
 COIN_CMAKE_BOOL=	USE_COIN3D
 COIN_LIB_DEPENDS=	libCoin.so:graphics/Coin
 
 OGRE_DESC=		Include Ogre support for 3D Rendering
 OGRE_CMAKE_BOOL=	USE_OGRE
 OGRE_LIB_DEPENDS=	libOgreMain.so:graphics/ogre3d19
 
 PCL_DESC=		Include Point Cloud Library support
 PCL_CMAKE_BOOL=		USE_PCL
 PCL_LIB_DEPENDS=	libpcl_common.so:graphics/pcl-pointclouds \
 			libvtkCommonCore-9.2.so:math/vtk9 # vtk9 is incurred by pcl-pointclouds
 
 ZBAR_DESC=		Use ZBAR to read bar codes and QR codes
 ZBAR_CMAKE_BOOL=	USE_ZBAR
 ZBAR_LIB_DEPENDS=	libzbar.so:graphics/zbar
 
 .include <bsd.port.mk>
diff --git a/multimedia/avidemux-cli/Makefile b/multimedia/avidemux-cli/Makefile
index 31e5f892341d..d84136c6f8ac 100644
--- a/multimedia/avidemux-cli/Makefile
+++ b/multimedia/avidemux-cli/Makefile
@@ -1,22 +1,23 @@
 PORTNAME=	avidemux
 PORTVERSION=	${AVIDEMUX_VERSION}
+PORTREVISION=	1
 CATEGORIES=	multimedia
 PKGNAMESUFFIX=	-cli
 
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Simple GUI based video editor (cli)
 
 LIB_DEPENDS=	libADM6avutil.so.56:multimedia/avidemux
 
 MASTERDIR=	${.CURDIR}/../avidemux
 PLIST=		${.CURDIR}/pkg-plist
 
 .include "${MASTERDIR}/Makefile.common"
 
 CMAKE_SOURCE_PATH=	${WRKSRC}/avidemux/cli
 
 CMAKE_ARGS+=	-DAVIDEMUX_SOURCE_DIR=${WRKSRC} -DAVIDEMUX_INSTALL_PREFIX:PATH="${PREFIX}"
 
 post-configure: post-configure-common
 
 .include <bsd.port.post.mk>
diff --git a/multimedia/avidemux-plugins/Makefile b/multimedia/avidemux-plugins/Makefile
index 995fa3ddc071..cf9ae6bb67fc 100644
--- a/multimedia/avidemux-plugins/Makefile
+++ b/multimedia/avidemux-plugins/Makefile
@@ -1,38 +1,38 @@
 PORTNAME=	avidemux
 PORTVERSION=	${AVIDEMUX_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 PKGNAMESUFFIX=	-plugins
 
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Simple GUI based video editor (Plugins)
 
 LIB_DEPENDS=	libADM6avutil.so.56:multimedia/avidemux
 
 MASTERDIR=	${.CURDIR}/../avidemux
 PLIST=		${.CURDIR}/pkg-plist
 
 .include "${MASTERDIR}/Makefile.common"
 
 CMAKE_SOURCE_PATH=	${WRKSRC}/avidemux_plugins
 
 CMAKE_ARGS+=	-DAVIDEMUX_SOURCE_DIR=${WRKSRC} -DAVIDEMUX_INSTALL_PREFIX:PATH="${PREFIX}"
 PLUGIN_UI=	COMMON SETTINGS
 
 .if ${PORT_OPTIONS:MCLI}
 BUILD_DEPENDS+=	avidemux-cli>0:multimedia/avidemux-cli
 RUN_DEPENDS+=	avidemux-cli>0:multimedia/avidemux-cli
 PLUGIN_UI+=	CLI
 .endif
 
 .if ${PORT_OPTIONS:MQT5}
 BUILD_DEPENDS+=	avidemux-qt5>0:multimedia/avidemux-qt5
 RUN_DEPENDS+=	avidemux-qt5>0:multimedia/avidemux-qt5
 PLUGIN_UI+=	QT4
 .endif
 
 CMAKE_ARGS+=	-DPLUGIN_UI="${PLUGIN_UI}"
 
 post-configure: post-configure-common
 
 .include <bsd.port.post.mk>
diff --git a/multimedia/avidemux-qt5/Makefile b/multimedia/avidemux-qt5/Makefile
index 5a7c8f3dca82..ba9bab764606 100644
--- a/multimedia/avidemux-qt5/Makefile
+++ b/multimedia/avidemux-qt5/Makefile
@@ -1,25 +1,26 @@
 PORTNAME=	avidemux
 PORTVERSION=	${AVIDEMUX_VERSION}
+PORTREVISION=	1
 CATEGORIES=	multimedia
 PKGNAMESUFFIX=	-qt5
 
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Simple GUI based video editor (QT5 UI)
 
 LIB_DEPENDS=	libADM6avutil.so.56:multimedia/avidemux
 
 MASTERDIR=	${.CURDIR}/../avidemux
 OPTIONS_SLAVE=	QT5
 PLIST=		${.CURDIR}/pkg-plist
 
 .include "${MASTERDIR}/Makefile.common"
 
 USES+=	desktop-file-utils
 
 CMAKE_SOURCE_PATH=	${WRKSRC}/avidemux/qt4
 
 CMAKE_ARGS+=	-DAVIDEMUX_SOURCE_DIR=${WRKSRC} -DAVIDEMUX_INSTALL_PREFIX:PATH="${PREFIX}"
 
 post-configure: post-configure-common
 
 .include <bsd.port.post.mk>
diff --git a/multimedia/avidemux/Makefile b/multimedia/avidemux/Makefile
index db671badd489..5bf571ac3561 100644
--- a/multimedia/avidemux/Makefile
+++ b/multimedia/avidemux/Makefile
@@ -1,24 +1,25 @@
 # assuming freebsd always has 16 byte aligned malloc as macos does. is this true?
 # nls files not getting installed with nls=on. are they getting built?
 # sync port options with current software options
 
 PORTNAME=	avidemux
 PORTVERSION=	${AVIDEMUX_VERSION}
+PORTREVISION=	1
 CATEGORIES=	multimedia
 
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Simple GUI based video editor
 WWW=		https://avidemux.org/
 
 .include "${.CURDIR}/Makefile.common"
 
 CMAKE_SOURCE_PATH=	${WRKSRC}/avidemux_core
 
 post-configure: post-configure-common
 
 post-install:
 .for l in swscale.so.5 postproc.so.55 avutil.so.56 avcodec.so.58 avformat.so.58
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libADM6${l}
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/multimedia/chilitags/Makefile b/multimedia/chilitags/Makefile
index bf5475128b16..93a0059f5e6a 100644
--- a/multimedia/chilitags/Makefile
+++ b/multimedia/chilitags/Makefile
@@ -1,30 +1,30 @@
 PORTNAME=	chilitags
 DISTVERSION=	2.0.0-169
 DISTVERSIONSUFFIX=	-g0d9854f
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	multimedia
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Robust fiducial markers for augmented reality and robotics
 WWW=		https://chili.epfl.ch/software
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/gpl.txt
 
 LIB_DEPENDS=	libopencv_video.so:graphics/opencv
 
 USES=		cmake compiler:c++11-lang
 USE_GITHUB=	yes
 GH_ACCOUNT=	chili-epfl
 USE_LDCONFIG=	yes
 
 PLIST_FILES=	bin/chilitags-creator \
 		include/chilitags/chilitags.hpp \
 		include/chilitags/chilitags_export.hpp \
 		lib/libchilitags.so \
 		libdata/pkgconfig/chilitags.pc
 
 post-install:
 		@${RM} ${STAGEDIR}${PREFIX}/lib/libchilitags_static.a
 
 .include <bsd.port.mk>
diff --git a/multimedia/gstreamer1-plugins-all/Makefile b/multimedia/gstreamer1-plugins-all/Makefile
index 3416a20d852b..436c8d727adb 100644
--- a/multimedia/gstreamer1-plugins-all/Makefile
+++ b/multimedia/gstreamer1-plugins-all/Makefile
@@ -1,13 +1,13 @@
 PORTNAME=	gstreamer1-plugins-all
 PORTVERSION=	1.20
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	multimedia
 
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Meta-port of all GStreamer 1.x plugins
 WWW=		https://gstreamer.freedesktop.org/
 
 USES=		gstreamer metaport
 USE_GSTREAMER=	${_GST_PLUGINS_VER}
 
 .include <bsd.port.mk>
diff --git a/multimedia/kdemultimedia/Makefile b/multimedia/kdemultimedia/Makefile
index 8366c47667df..712462af2fcc 100644
--- a/multimedia/kdemultimedia/Makefile
+++ b/multimedia/kdemultimedia/Makefile
@@ -1,32 +1,32 @@
 PORTNAME=	kdemultimedia
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia kde
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE Multimedia applications (meta port)
 WWW=		https://multimedia.kde.org
 
 USES=		kde:5 metaport qt:5
 USE_QT=		#
 
 OPTIONS_DEFINE=		DRAGON FFMPEG AUDIOCD_KIO KDENLIVE KMIX
 OPTIONS_DEFAULT=	${OPTIONS_DEFINE:NKMIX}
 
 DRAGON_DESC=		Simple video player
 DRAGON_RUN_DEPENDS=	dragon-player>=${KDE_APPLICATIONS_VERSION}:multimedia/dragon
 
 FFMPEG_DESC=		FFMPEG-based video thumbnailer
 FFMPEG_RUN_DEPENDS=	kdemultimedia-ffmpegthumbs>=${KDE_APPLICATIONS_VERSION}:multimedia/kdemultimedia-ffmpegthumbs
 
 AUDIOCD_KIO_DESC=	Audio CD IOSlave
 AUDIOCD_KIO_RUN_DEPENDS=	audiocd-kio>=${KDE_APPLICATIONS_VERSION}:audio/audiocd-kio
 
 # KMix is being replaced by the plasma-pa mixer
 KMIX_DESC=		Audio mixer
 KMIX_RUN_DEPENDS=	kmix>=${KDE_APPLICATIONS_VERSION}:audio/kmix
 
 KDENLIVE_DESC=		KDE Non-Linear Video Editor
 KDENLIVE_RUN_DEPENDS=	kdenlive>=18.12.3:multimedia/kdenlive
 
 .include <bsd.port.mk>
diff --git a/multimedia/kdenlive/Makefile b/multimedia/kdenlive/Makefile
index 55e572210500..285425935fd5 100644
--- a/multimedia/kdenlive/Makefile
+++ b/multimedia/kdenlive/Makefile
@@ -1,74 +1,74 @@
 PORTNAME=	kdenlive
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE professional quality non-linear video editing suite
 WWW=		https://www.kdenlive.org
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	librttr_core.so:devel/rttr
 BUILD_DEPENDS=	${LOCALBASE}/include/linux/input.h:devel/evdev-proto \
 		${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat \
 		${LOCALBASE}/lib/mlt-7/libmltglaxnimate.so:multimedia/mlt7-glaxnimate
 RUN_DEPENDS=	ffmpeg${FFMPEG_SUFX}:multimedia/ffmpeg${FFMPEG_SUFX} \
 		${LOCALBASE}/lib/mlt-7/libmltqt.so:multimedia/mlt7-qt@qt5 \
 		${LOCALBASE}/lib/mlt-7/libmltglaxnimate.so:multimedia/mlt7-glaxnimate
 
 USES=		cmake compiler:c++11-lang desktop-file-utils gettext-tools \
 		gl mlt:7 pkgconfig qt:5 shared-mime-info kde:5 tar:xz xorg
 USE_GL=		gl glu
 USE_KDE=	archive attica auth bookmarks codecs completion config \
 		configwidgets coreaddons crash dbusaddons filemetadata \
 		guiaddons i18n iconthemes kio itemviews jobwidgets \
 		kdeclarative newstuff notifications notifyconfig package \
 		service solid sonnet textwidgets widgetsaddons windowsystem \
 		xmlgui \
 		ecm:build \
 		init:run
 USE_QT=		concurrent core dbus declarative gui multimedia network \
 		networkauth quickcontrols2 xml \
 		buildtools:build qmake:build \
 		quickcontrols:run script svg webkit widgets
 USE_XORG=	x11
 CFLAGS+=	-isystem${LOCALBASE}/include # linux/input.h
 CMAKE_ARGS=	-DFFMPEG_SUFFIX:STRING="${FFMPEG_SUFX}"
 
 # Keep in sync with multimedia/mlt, possibly.
 FFMPEG_SUFX=	# Currently empty.
 
 OPTIONS_DEFINE=	DVDWIZARD FILESHARE FREI0R LADSPA SCREENCAST V4L XINE DOCS
 OPTIONS_DEFAULT=DVDWIZARD FILESHARE FREI0R LADSPA SCREENCAST V4L
 OPTIONS_SUB=	yes
 
 DVDWIZARD_DESC=	DVD authoring via DVDAuthor and cdrtools
 FILESHARE_DESC=	Common KF5 filesharing support
 SCREENCAST_DESC=Screen capture support via recordMyDesktop
 V4L_DESC=	Webcam support via Video4Linux
 XINE_DESC=	DVD preview support via xine
 
 DVDWIZARD_RUN_DEPENDS=	dvdauthor:multimedia/dvdauthor \
 			cdrecord:sysutils/cdrtools
 
 FILESHARE_USE=	KDE=purpose
 FILESHARE_CMAKE_BOOL_OFF=	CMAKE_DISABLE_FIND_PACKAGE_KF5Purpose
 
 FREI0R_RUN_DEPENDS=	frei0r-plugins>=0:graphics/frei0r-plugins
 
 LADSPA_RUN_DEPENDS=	swhplugins>=0:audio/swhplugins
 
 SCREENCAST_RUN_DEPENDS=	recordmydesktop:multimedia/recordmydesktop
 
 V4L_LIB_DEPENDS=	libv4l2.so:multimedia/libv4l
 V4L_CMAKE_OFF=		-DWITH_LibV4L2:BOOL=FALSE
 
 XINE_RUN_DEPENDS=	xine:multimedia/xine
 
 post-patch:
 	@${REINPLACE_CMD} -e '/^update_xdg_mimetypes/ d' \
 		-e '/SharedMimeInfo/ d' \
 		${PATCH_WRKSRC}/data/CMakeLists.txt
 
 .include <bsd.port.mk>
diff --git a/multimedia/libopenshot/Makefile b/multimedia/libopenshot/Makefile
index 241fdbbe76f9..0963f4143464 100644
--- a/multimedia/libopenshot/Makefile
+++ b/multimedia/libopenshot/Makefile
@@ -1,68 +1,69 @@
 PORTNAME=	libopenshot
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.3.1
+PORTREVISION=	1
 CATEGORIES=	multimedia
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	tatsuki_makino@hotmail.com
 COMMENT=	OpenShot Video Library
 WWW=		https://www.openshot.org/
 
 LICENSE=	BSD3CLAUSE LGPL3+
 LICENSE_COMB=	multi
 LICENSE_FILE_BSD3CLAUSE=	${WRKSRC}/LICENSES/BSD-3-Clause.txt
 LICENSE_FILE_LGPL3+ =	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	swig:devel/swig \
 		${LOCALBASE}/include/zmq.hpp:net/cppzmq
 LIB_DEPENDS=	libavformat.so:multimedia/ffmpeg \
 		libbabl-0.1.so:x11/babl \
 		libjsoncpp.so:devel/jsoncpp \
 		libopenshot-audio.so:audio/libopenshot-audio \
 		libzmq.so:net/libzmq4
 
 USES=		cmake pkgconfig python:build qt:5
 USE_GITHUB=	yes
 GH_ACCOUNT=	OpenShot
 USE_LDCONFIG=	yes
 USE_PYTHON=	flavors
 USE_QT=		core gui widgets buildtools:build qmake:build
 CMAKE_ON=	USE_SYSTEM_JSONCPP DISABLE_BUNDLED_JSONCPP\
 		USE_HW_ACCEL ENABLE_PYTHON\
 		CMAKE_DISABLE_FIND_PACKAGE_Catch2
 CMAKE_OFF=	ENABLE_PARALLEL_CTEST VERBOSE_TESTS ENABLE_COVERAGE\
 		APPIMAGE_BUILD BUILD_TESTING ENABLE_TESTS
 
 OPTIONS_DEFINE=	DOCS IMAGEMAGICK OPENCV RESVG RUBY
 OPTIONS_DEFAULT=	IMAGEMAGICK OPENCV
 OPTIONS_SUB=	yes
 RESVG_DESC?=	SVG vector graphics support via resvg
 DOCS_BUILD_DEPENDS=	doxygen:devel/doxygen
 DOCS_CMAKE_BOOL=	ENABLE_LIB_DOCS
 DOCS_CMAKE_BOOL_OFF=	CMAKE_DISABLE_FIND_PACKAGE_Doxygen
 DOCS_CMAKE_ON=	-DCMAKE_INSTALL_DOCDIR:PATH=${DOCSDIR_REL:Q}
 DOCS_PORTDOCS=	*
 IMAGEMAGICK_USES=	magick
 IMAGEMAGICK_CMAKE_BOOL=	ENABLE_MAGICK
 IMAGEMAGICK_CMAKE_BOOL_OFF=	CMAKE_DISABLE_FIND_PACKAGE_ImageMagick
 OPENCV_LIB_DEPENDS=	libopencv_core.so:graphics/opencv \
 			libprotobuf.so:devel/protobuf
 OPENCV_CMAKE_BOOL=	ENABLE_OPENCV
 OPENCV_CMAKE_BOOL_OFF=	CMAKE_DISABLE_FIND_PACKAGE_OpenCV\
 			CMAKE_DISABLE_FIND_PACKAGE_Protobuf
 OPENCV_CMAKE_ON=	-DOpenCV_DIR:STRING=${LOCALBASE:Q}/cmake/opencv4
 RESVG_LIB_DEPENDS=	libresvg.so:graphics/resvg-capi
 RESVG_USE_OFF=	QT=svg
 RESVG_CMAKE_BOOL_OFF=	CMAKE_DISABLE_FIND_PACKAGE_Resvg
 RESVG_CMAKE_ON=	-DRESVGDIR:STRING=${LOCALBASE:Q}
 RUBY_USES=	ruby:build
 RUBY_CMAKE_BOOL=	ENABLE_RUBY
 RUBY_CMAKE_BOOL_OFF=	CMAKE_DISABLE_FIND_PACKAGE_Ruby
 
 .if !exists(/usr/include/omp.h)
 USES+=		compiler:gcc-c++11-lib
 .else
 USES+=		compiler:c++14-lang
 .endif
 
 .include <bsd.port.mk>
diff --git a/multimedia/lives/Makefile b/multimedia/lives/Makefile
index 70cfd62212d4..1e34327dae9e 100644
--- a/multimedia/lives/Makefile
+++ b/multimedia/lives/Makefile
@@ -1,163 +1,163 @@
 PORTNAME=	lives
 DISTVERSION=	3.2.0
-PORTREVISION=	15
+PORTREVISION=	16
 CATEGORIES=	multimedia
 MASTER_SITES=	http://lives-video.com/releases/
 DISTNAME=	LiVES-${PORTVERSION}
 
 MAINTAINER=	vvd@unislabs.com
 COMMENT=	Video editing system
 WWW=		http://lives-video.com/
 
 LICENSE=		GPLv3+ LGPL3+
 LICENSE_COMB=		multi
 LICENSE_FILE_GPLv3+ =	${WRKSRC}/COPYING
 LICENSE_FILE_LGPL3+ =	${WRKSRC}/COPYING.LGPL
 
 BUILD_DEPENDS=	${LOCALBASE}/include/linux/input.h:devel/evdev-proto \
 		analyseplugin:audio/ladspa
 LIB_DEPENDS=	liboil-0.3.so:devel/liboil \
 		libpng.so:graphics/png \
 		libavcodec.so:multimedia/ffmpeg \
 		libmjpegutils.so:multimedia/mjpegtools
 RUN_DEPENDS=	analyseplugin:audio/ladspa \
 		ffprobe:multimedia/ffmpeg \
 		sox:audio/sox
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 USES=		autoreconf compiler:c++11-lib gettext-runtime gettext-tools \
 		gl gnome libtool localbase pathfix perl5 pkgconfig python \
 		sdl shebangfix xorg
 SHEBANG_FILES=	build-lives-rfx-plugin build-lives-rfx-plugin-multi smogrify \
 		tools/autolives.pl lives-plugins/plugins/encoders/*_encoder \
 		lives-plugins/marcos-encoders/*encoder* \
 		lives-plugins/plugins/encoders/multi_encoder3 \
 		lives-plugins/plugins/playback/audiostream/audiostreamer.pl
 GNU_CONFIGURE=	yes
 USE_XORG=	x11 xrender
 USE_GL=		gl glu
 USE_SDL=	sdl sdl2
 USE_GNOME=	cairo gdkpixbuf2 gtk30 intltool
 USE_LDCONFIG=	yes
 
 CONFIGURE_ARGS=	--disable-ldvgrab --disable-prctl --disable-system-weed --disable-dirac
 INSTALL_TARGET=	install-strip
 
 DOC_FILES=	AUTHORS COPYING COPYING.LGPL ChangeLog FEATURES GETTING.STARTED NEWS README \
 		OMC/lives-OMC.txt RFX/LiVES-Perl.odt RFX/rfxbuilder.odt \
 		RFX/RFX.spec docs/c++-bindings.odt docs/clip_format.txt \
 		lives-plugins/marcos-encoders/README.multi_encoder \
 		weed-docs/weedspec.txt weed-docs/weedevents.txt
 
 OPTIONS_DEFINE=			ALSA DOCS DOXYGEN DV FFTW FREI0R JACK IMAGEMAGICK LIBEXPLAIN \
 				LIBVISUAL OGG OPENCV OPTIMIZED_CFLAGS NLS PROJECTM PULSEAUDIO \
 				THEORA V4L WAYLAND
 OPTIONS_GROUP=			RUNTIME EXT_WIN_CAPTURE MPLAYERS MP3
 OPTIONS_GROUP_RUNTIME=		CDDA2WAV GHOSTSCRIPT LAME MATROSKA MENCODER OGG123 OGM \
 				SSWF X264 XDG_SCREENSAVER XWININFO YTDLP
 OPTIONS_GROUP_EXT_WIN_CAPTURE=	WMCTRL XDOTOOL
 OPTIONS_GROUP_MP3=		MPG123 MPG321
 OPTIONS_GROUP_MPLAYERS=		MPLAYER MPV
 OPTIONS_DEFAULT=		CDDA2WAV DOCS DV FFTW GHOSTSCRIPT IMAGEMAGICK JACK LAME \
 				MPG123 MPLAYER NLS OGG OGG123 OGM OPENCV \
 				THEORA X264 XDG_SCREENSAVER XDOTOOL XWININFO YTDLP
 OPTIONS_SUB=			yes
 
 ALSA_CONFIGURE_OFF=		--disable-alsa
 ALSA_LIB_DEPENDS=		libasound.so:audio/alsa-lib
 CDDA2WAV_RUN_DEPENDS=		cdda2wav:sysutils/cdrtools
 DOXYGEN_BUILD_DEPENDS=		doxygen:devel/doxygen
 DOXYGEN_CONFIGURE_OFF=		--disable-doxygen
 DV_CONFIGURE_OFF=		--disable-libdv
 DV_LIB_DEPENDS=			libdv.so:multimedia/libdv
 DV_RUN_DEPENDS=			encodedv:multimedia/libdv
 EXT_WIN_CAPTURE_DESC=		Allows external window capture via xdotool or wmctrl
 FFTW_CONFIGURE_OFF=		--disable-fftw3f
 FFTW_LIB_DEPENDS=		libfftw3.so:math/fftw3 \
 				libfftw3f.so:math/fftw3-float
 FREI0R_BUILD_DEPENDS=		frei0r>0:graphics/frei0r
 FREI0R_CONFIGURE_OFF=		--disable-frei0r
 FREI0R_RUN_DEPENDS=		frei0r>0:graphics/frei0r
 GHOSTSCRIPT_USES=		ghostscript:run
 IMAGEMAGICK_USES=		magick:run
 JACK_CONFIGURE_OFF=		--disable-jack
 JACK_LIB_DEPENDS=		libjack.so:audio/jack \
 				libjackserver.so:audio/jack
 LAME_RUN_DEPENDS=		lame:audio/lame
 LIBEXPLAIN_CONFIGURE_OFF=	--disable-libexplain
 LIBEXPLAIN_DESC=		Used to explain Unix and Linux system call errors
 LIBEXPLAIN_LIB_DEPENDS=		libexplain.so:devel/libexplain
 LIBVISUAL_CONFIGURE_OFF=	--disable-libvisual
 LIBVISUAL_LIB_DEPENDS=		libvisual-0.4.so:graphics/libvisual04
 MATROSKA_RUN_DEPENDS=		mkvmerge:multimedia/mkvtoolnix
 MENCODER_RUN_DEPENDS=		mencoder:multimedia/mencoder
 MENCODER_DESC=			Use mencoder as video file and movie encoder
 MP3_DESC=			Runtime check order is: mpg321, mpg123, mplayer, mplayer2, mpv
 MPG123_RUN_DEPENDS=		mpg123:audio/mpg123
 MPG321_DESC=			MP3 decoding support via mpg321
 MPG321_RUN_DEPENDS=		mpg321:audio/mpg321
 MPLAYER_RUN_DEPENDS=		mplayer:multimedia/mplayer
 MPLAYERS_DESC=			Install mplayer/mpv (runtime check)
 MPV_DESC=			MPV media player support
 MPV_RUN_DEPENDS=		mpv:multimedia/mpv
 NLS_USES=			gettext-tools
 OGG_CONFIGURE_OFF=		--disable-ogg
 OGG_LIB_DEPENDS=		libogg.so:audio/libogg
 OGG123_DESC=			Use ogg123 from vorbis-tools
 OGG123_RUN_DEPENDS=		ogg123:audio/vorbis-tools
 OGM_DESC=			Use ogmtools for manipulating with OGM files
 OGM_RUN_DEPENDS=		ogmmerge:multimedia/ogmtools
 OPENCV_CONFIGURE_OFF=		--disable-opencv
 OPENCV_LIB_DEPENDS=		libopencv_calib3d.so:graphics/opencv \
 				libopencv_core.so:graphics/opencv
 SSWF_DESC=			Use sswf for manipulating with Flash movies
 SSWF_RUN_DEPENDS=		sswf:graphics/sswf
 THEORA_CONFIGURE_OFF=		--disable-theora
 THEORA_LIB_DEPENDS=		libtheora.so:multimedia/libtheora
 OPTIMIZED_CFLAGS_CONFIGURE_ON=	--enable-turbo
 PROJECTM_CONFIGURE_OFF=		--disable-projectM
 PROJECTM_DESC=			projectM support
 PROJECTM_LIB_DEPENDS=		libprojectM.so:graphics/libprojectm
 PULSEAUDIO_CONFIGURE_OFF=	--disable-pulse
 PULSEAUDIO_LIB_DEPENDS=		libpulse.so:audio/pulseaudio
 RUNTIME_DESC=			Runtime detected utilities
 V4L_BUILD_DEPENDS=		${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat
 V4L_CONFIGURE_OFF=		--disable-v4l
 V4L_LIB_DEPENDS=		libv4l2.so:multimedia/libv4l
 WAYLAND_CONFIGURE_OFF=		--disable-wayland
 WAYLAND_LIB_DEPENDS=		libwayland-client.so:graphics/wayland \
 				libwayland-egl.so:graphics/wayland \
 				libwayland-cursor.so:graphics/wayland
 WMCTRL_DESC=			Install wmctrl
 WMCTRL_RUN_DEPENDS=		wmctrl:x11/wmctrl
 YTDLP_DESC=			Install yt-dlp (youtube-dl fork) - requires SYMLINK option
 YTDLP_RUN_DEPENDS=		yt-dlp:www/yt-dlp
 X264_RUN_DEPENDS=		x264:multimedia/x264
 XDG_SCREENSAVER_DESC=		Used to disable screensaver during playback
 XDG_SCREENSAVER_RUN_DEPENDS=	xdg-screensaver:devel/xdg-utils
 XDOTOOL_DESC=			Install xdotool
 XDOTOOL_RUN_DEPENDS=		xdotool:x11/xdotool
 XWININFO_DESC=			Used for external window capture
 XWININFO_RUN_DEPENDS=		xwininfo:x11/xwininfo
 
 post-patch:
 	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} \
 		's/^LIBS = $$/&@LIBS@/'
 	@${REINPLACE_CMD} -e 's|/usr/local/lib/|${LOCALBASE}/lib/|g' \
 		${WRKSRC}/lives-plugins/weed-plugins/frei0r.c
 	@${REINPLACE_CMD} 's|/usr/bin/perl|${perl_CMD}|' \
 		${WRKSRC}/build-lives-rfx-plugin
 
 pre-build-NLS-on:
 	@(cd ${WRKSRC}/po && ${DO_MAKE_BUILD} update-po)
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${DOC_FILES:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 post-install-DOXYGEN-on:
 	@(cd ${STAGEDIR}${PREFIX} && ${FIND} ${DOCSDIR_REL}/html \
 		-not -type d >> ${TMPPLIST})
 
 .include <bsd.port.mk>
diff --git a/multimedia/mlt6-qt5/Makefile b/multimedia/mlt6-qt5/Makefile
index 55057ea95533..9c6b0f7bc8fa 100644
--- a/multimedia/mlt6-qt5/Makefile
+++ b/multimedia/mlt6-qt5/Makefile
@@ -1,40 +1,40 @@
 MASTERDIR=	${.CURDIR:H}/mlt6
 SLAVEPORT=	qt5
 
-PORTREVISION=	3
+PORTREVISION=	4
 PKGNAMESUFFIX=	-qt5
 
 COMMENT=	Qt plugin for the MLT multimedia framework
 CATEGORIES=	multimedia kde
 
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	multi
 
 LIB_DEPENDS=	libexif.so:graphics/libexif \
 		libfftw3.so:math/fftw3
 
 USES=		qt:5 xorg
 USE_CXXSTD=	c++11
 USE_QT=		core gui svg widgets xml \
 		buildtools:build qmake:build
 USE_XORG=	x11
 
 CONFLICTS_INSTALL=	mlt7-qt5
 
 # Only enable Qt binding, and disable everything else
 CMAKE_ON=	MOD_QT
 CMAKE_OFF=	MOD_AVFORMAT MOD_DECKLINK MOD_FEEDS MOD_FREI0R MOD_GDK MOD_GTK2 \
 		MOD_JACKRACK MOD_KDENLIVE MOD_LUMAS MOD_MOTION_EST MOD_NORMALIZE \
 		MOD_OLDFILM MOD_OPENCV MOD_OPENGL MOD_PLUSGPL MOD_PLUS MOD_RESAMPLE \
 		MOD_RTAUDIO MOD_RUBBERBAND MOD_SDL2 MOD_SOX MOD_VIDSTAB MOD_VMFX \
 		MOD_VORBIS MOD_XINE MOD_XML \
 		SWIG_CSHARP SWIG_JAVA SWIG_LUA SWIG_NODEJS SWIG_PERL \
 		SWIG_PHP SWIG_PYTHON SWIG_RUBY SWIG_TCL
 
 BUILD_WRKSRC=	${WRKDIR}/.build/src/modules/qt
 
 # Dummy placeholder target.
 common-post-install:
 	@${TRUE}
 
 .include "${MASTERDIR}/Makefile"
diff --git a/multimedia/mlt6/Makefile b/multimedia/mlt6/Makefile
index a36fb79d0fb8..1979b44a585b 100644
--- a/multimedia/mlt6/Makefile
+++ b/multimedia/mlt6/Makefile
@@ -1,197 +1,197 @@
 PORTNAME=		${_MLT_PORTNAME}
 DISTVERSION=		${_MLT_VERSION}
-PORTREVISION?=		7
+PORTREVISION?=		8
 CATEGORIES?=		multimedia
 # Don't use GitHub "fake" downloads that are auto-generated from a
 # tag; the project uploads tarballs for each release.
 #               https://github.com/mltframework/mlt/releases/download/v6.26.1/mlt-6.26.1.tar.gz
 MASTER_SITES=		https://github.com/mltframework/mlt/releases/download/v${DISTVERSION}/
 DISTFILES=		mlt-${DISTVERSION}${EXTRACT_SUFX}
 WRKSRC=			${WRKDIR}/mlt-${DISTVERSION}
 
 MAINTAINER=		kde@FreeBSD.org
 COMMENT?=		Multimedia framework for TV broadcasting
 WWW=		https://www.mltframework.org/
 
 LICENSE?=		GPLv2 GPLv3 LGPL21
 LICENSE_COMB?=		multi
 
 USES+=			alias cmake compiler:c++11-lang eigen:3 localbase pkgconfig
 
 DATADIR=		${PREFIX}/share/mlt
 
 .ifndef(SLAVEPORT) # Master port.
 CONFLICTS_INSTALL=	mlt-6.*
 
 BROKEN_sparc64=		does not compile on sparc64 (invokes i386 asm)
 
 USES+=			mlt:6,nodepend
 
 # Explicitly disabled modules that are ouddated, unnecessary, or have
 # their own port.
 CMAKE_OFF=		MOD_SDL1 MOD_QT \
 			SWIG_CSHARP SWIG_JAVA SWIG_LUA SWIG_NODEJS SWIG_PERL \
 			SWIG_PHP SWIG_PYTHON SWIG_RUBY SWIG_TCL
 
 PORTDOCS=		AUTHORS NEWS README docs
 PORTEXAMPLES=		demo
 
 OPTIONS_DEFINE=		DOCS EXAMPLES
 OPTIONS_DEFAULT=	AVFORMAT FREI0R GDK KDENLIVE OPENGL PLUS PLUSGPL RESAMPLE \
 			SDL2 SOX VIDSTAB VORBIS XML
 
 OPTIONS_GROUP=		MODULES
 OPTIONS_GROUP_MODULES=	AVFORMAT DECKLINK FEEDS FREI0R GDK GTK2 JACKRACK \
 			KDENLIVE LUMAS MOTION_EST NORMALIZE OLDFILM OPENCV \
 			OPENGL PLUS PLUSGPL RESAMPLE RTAUDIO RUBBERBAND \
 			SDL2 SOX VIDSTAB VMFX VORBIS XINE XML
 
 OPTIONS_SUB=		yes
 
 AVFORMAT_DESC=		Enable avformat module
 AVFORMAT_LIB_DEPENDS=	libavformat.so:multimedia/ffmpeg
 AVFORMAT_CMAKE_BOOL=	MOD_AVFORMAT
 
 DECKLINK_DESC=		Enable decklink module
 DECKLINK_CMAKE_BOOL=	MOD_DECKLINK
 
 FEEDS_DESC=		Enable feeds module
 FEEDS_CMAKE_BOOL=	MOD_FEEDS
 
 FREI0R_DESC=		Enable frei0r module
 FREI0R_BUILD_DEPENDS=	${LOCALBASE}/include/frei0r.h:graphics/frei0r
 FREI0R_CMAKE_BOOL=	MOD_FREI0R
 
 GDK_DESC=		Enable gdk module
 GDK_LIB_DEPENDS=	libexif.so:graphics/libexif \
 			libfontconfig.so:x11-fonts/fontconfig \
 			libfreetype.so:print/freetype2 \
 			libharfbuzz.so:print/harfbuzz
 GDK_USES=		gnome
 GDK_USE=		gnome=gdkpixbuf2,pango
 GDK_CMAKE_BOOL=		MOD_GDK
 
 GTK2_DESC=		Enable gtk2 module
 GTK2_USES=		gnome
 GTK2_USE=		gnome=cairo,gtk20
 GTK2_CMAKE_BOOL=	MOD_GTK2
 
 JACKRACK_DESC=		Enable jackrack module
 JACKRACK_BUILD_DEPENDS=	${LOCALBASE}/include/ladspa.h:audio/ladspa
 JACKRACK_LIB_DEPENDS=	libjack.so:audio/jack
 JACKRACK_USES=		gnome
 JACKRACK_USE=		gnome=glib20
 JACKRACK_CMAKE_BOOL=	MOD_JACKRACK
 
 KDENLIVE_DESC=		Enable kdenlive module
 KDENLIVE_CMAKE_BOOL=	MOD_KDENLIVE
 
 LUMAS_DESC=		Enable lumas module
 LUMAS_CMAKE_BOOL=	MOD_LUMAS
 
 MOTION_EST_DESC=	Enable motion estimation module
 MOTION_EST_CMAKE_BOOL=	MOD_MOTION_EST
 
 NORMALIZE_DESC=		Enable normalize module
 NORMALIZE_CMAKE_BOOL=	MOD_NORMALIZE
 
 OLDFILM_DESC=		Enable oldfilm module
 OLDFILM_CMAKE_BOOL=	MOD_OLDFILM
 
 OPENCV_DESC=		Enable OpenCV module
 OPENCV_LIB_DEPENDS=	libopencv_core.so:graphics/opencv
 OPENCV_CMAKE_BOOL=	MOD_OPENCV
 
 OPENGL_DESC=		Enable OpenGL module
 OPENGL_CMAKE_BOOL=	MOD_OPENGL
 OPENGL_LIB_DEPENDS=	libepoxy.so:graphics/libepoxy \
 			libmovit.so:graphics/movit
 OPENGL_USES=		gl xorg
 OPENGL_USE=		gl=gl xorg=x11
 
 PLUSGPL_DESC=		Enable plus GPL module
 PLUSGPL_CMAKE_BOOL=	MOD_PLUSGPL
 
 PLUS_DESC=		Enable plus module
 PLUS_LIB_DEPENDS=	libfftw3.so:math/fftw3
 PLUS_CMAKE_BOOL=	MOD_PLUS
 
 RESAMPLE_DESC=		Enable resample module
 RESAMPLE_LIB_DEPENDS=	libsamplerate.so:audio/libsamplerate
 RESAMPLE_CMAKE_BOOL=	MOD_RESAMPLE
 
 RTAUDIO_DESC=		Enable RtAudio module
 RTAUDIO_LIB_DEPENDS=	librtaudio.so:audio/rtaudio \
 			libpulse-simple.so:audio/pulseaudio
 RTAUDIO_CMAKE_BOOL=	MOD_RTAUDIO
 
 RUBBERBAND_DESC=	Enable rubberband module
 RUBBERBAND_LIB_DEPENDS=	librubberband.so:audio/rubberband
 RUBBERBAND_CMAKE_BOOL=	MOD_RUBBERBAND
 
 SDL2_DESC=		Enable SDL2 module
 SDL2_USES=		sdl
 SDL2_USE=		sdl=image2
 SDL2_CMAKE_BOOL=	MOD_SDL2
 
 SOX_DESC=		Enable SoX module
 SOX_LIB_DEPENDS=	libsox.so:audio/sox
 SOX_CMAKE_BOOL=		MOD_SOX
 
 VIDSTAB_DESC=		Enable vid.stab module
 VIDSTAB_LIB_DEPENDS=	libvidstab.so:multimedia/vid.stab
 VIDSTAB_CMAKE_BOOL=	MOD_VIDSTAB
 
 VMFX_DESC=		Enable vmfx module
 VMFX_CMAKE_BOOL=	MOD_VMFX
 
 VORBIS_DESC=		Enable Vorbis module
 VORBIS_LIB_DEPENDS=	libvorbis.so:audio/libvorbis libogg.so:audio/libogg
 VORBIS_CMAKE_BOOL=	MOD_VORBIS
 
 XINE_DESC=		Enable xine module
 XINE_CMAKE_BOOL=	MOD_XINE
 
 XML_DESC=		Enable XML module
 XML_USES=		gnome
 XML_USE=		gnome=libxml2
 XML_CMAKE_BOOL=		MOD_XML
 
 pre-configure:
 	@${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},' \
 		${WRKSRC}/src/modules/frei0r/factory.c \
 		${WRKSRC}/src/modules/jackrack/plugin_mgr.c
 
 common-post-install:
 	${INSTALL_MAN} ${WRKSRC}/docs/melt.1 ${STAGEDIR}${MANPREFIX}/share/man/man1/melt.1
 	@${RM} ${WRKSRC}/docs/melt.1
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/melt
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libmlt.so.${PORTVERSION}
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libmlt++.so.${PORTVERSION}
 
 post-install-DOCS-on:
 .for f in ${PORTDOCS}
 	cd ${WRKSRC} && ${COPYTREE_SHARE} ${f} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 post-install-EXAMPLES-on:
 .for f in ${PORTEXAMPLES}
 	cd ${WRKSRC} && ${COPYTREE_SHARE} ${f} ${STAGEDIR}${EXAMPLESDIR}
 .endfor
 
 .else # Slave port.
 PORTSCOUT=		ignore:1
 
 # Depend on multimedia/mlt6 for child ports
 USES+=			mlt:6
 
 PLIST?=			${.CURDIR}/pkg-plist
 
 INSTALL_WRKSRC?=	${BUILD_WRKSRC}
 .endif
 
 post-install: common-post-install
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/* 2>/dev/null || ${TRUE}
 	@${RMDIR} -p ${STAGEDIR}${PREFIX}/lib/${PORTNAME} 2>/dev/null || ${TRUE}
 
 .include <bsd.port.mk>
diff --git a/multimedia/mlt7-glaxnimate/Makefile b/multimedia/mlt7-glaxnimate/Makefile
index 06e3ed8b2af7..ffdac722e13f 100644
--- a/multimedia/mlt7-glaxnimate/Makefile
+++ b/multimedia/mlt7-glaxnimate/Makefile
@@ -1,38 +1,38 @@
 MASTERDIR=	${.CURDIR:H}/mlt7
 SLAVEPORT=	glaxnimate
 
-PORTREVISION=	0
+PORTREVISION=	1
 PKGNAMESUFFIX=	-glaxnimate
 
 COMMENT=	2D animations plugin for the MLT multimedia framework
 CATEGORIES=	multimedia kde
 
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	multi
 
 LIB_DEPENDS=	libexif.so:graphics/libexif \
 		libfftw3.so:math/fftw3
 
 USES=		qt:5 xorg
 USE_CXXSTD=	c++11
 USE_QT=		core gui svg widgets xml \
 		buildtools:build qmake:build
 USE_XORG=	x11
 
 # Only enable Qt binding, and disable everything else
 CMAKE_ON=	MOD_GLAXNIMATE
 CMAKE_OFF=	MOD_AVFORMAT MOD_DECKLINK MOD_FEEDS MOD_FREI0R MOD_GDK MOD_GTK2 \
 		MOD_JACKRACK MOD_KDENLIVE MOD_LUMAS MOD_MOTION_EST MOD_NORMALIZE \
 		MOD_OLDFILM MOD_OPENCV MOD_OPENGL MOD_PLUSGPL MOD_PLUS MOD_QT MOD_RESAMPLE \
 		MOD_RTAUDIO MOD_RUBBERBAND MOD_SDL2 MOD_SOX MOD_VIDSTAB MOD_VMFX \
 		MOD_VORBIS MOD_XINE MOD_XML \
 		SWIG_CSHARP SWIG_JAVA SWIG_LUA SWIG_NODEJS SWIG_PERL \
 		SWIG_PHP SWIG_PYTHON SWIG_RUBY SWIG_TCL
 
 BUILD_WRKSRC=	${WRKDIR}/.build/src/modules/glaxnimate
 
 # Dummy placeholder target.
 common-post-install:
 	@${TRUE}
 
 .include "${MASTERDIR}/Makefile"
diff --git a/multimedia/mlt7-qt/Makefile b/multimedia/mlt7-qt/Makefile
index 292cfb7f26a0..3db9723d3abf 100644
--- a/multimedia/mlt7-qt/Makefile
+++ b/multimedia/mlt7-qt/Makefile
@@ -1,57 +1,57 @@
 MASTERDIR=	${.CURDIR:H}/mlt7
 SLAVEPORT=	qt
 
-PORTREVISION=	0
+PORTREVISION=	2
 PKGNAMESUFFIX=	-${FLAVOR}
 
 COMMENT=	Qt plugin for the MLT multimedia framework
 CATEGORIES=	multimedia kde
 
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	multi
 
 LIB_DEPENDS=	libexif.so:graphics/libexif \
 		libfftw3.so:math/fftw3
 
 FLAVORS=	qt5 qt6
 FLAVOR?=	qt5
 
 USES=		qt:${FLAVOR:S/qt//} xorg
 USE_CXXSTD=	c++11
 
 USE_QT=		${_USE_QT_${FLAVOR}}
 USE_XORG=	x11
 
 CONFLICTS_INSTALL=	mlt6-qt5
 
 # Flavor handling
 _USE_QT_qt5=	core gui svg widgets xml \
 		buildtools:build qmake:build
 _USE_QT_qt6=	5compat base svg
 _CMAKE_ON_qt5=	MOD_QT
 _CMAKE_ON_qt6=	MOD_QT6
 _CMAKE_OFF_qt5=	MOD_QT6
 _CMAKE_OFF_qt6=	MOD_QT
 _PLIST_SUB_qt5=	QT_VERSION_SUFFIX=
 _PLIST_SUB_qt6=	QT_VERSION_SUFFIX=6
 
 # Only enable Qt binding, and disable everything else
 CMAKE_ON=	${_CMAKE_ON_${FLAVOR}}
 CMAKE_OFF=	MOD_AVFORMAT MOD_DECKLINK MOD_FEEDS MOD_FREI0R MOD_GDK MOD_GTK2 \
 		MOD_JACKRACK MOD_KDENLIVE MOD_LUMAS MOD_MOTION_EST MOD_NORMALIZE \
 		MOD_OLDFILM MOD_OPENCV MOD_OPENGL MOD_PLUSGPL MOD_PLUS MOD_RESAMPLE \
 		MOD_RTAUDIO MOD_RUBBERBAND MOD_SDL2 MOD_SOX MOD_VIDSTAB MOD_VMFX \
 		MOD_VORBIS MOD_XINE MOD_XML \
 		SWIG_CSHARP SWIG_JAVA SWIG_LUA SWIG_NODEJS SWIG_PERL \
 		SWIG_PHP SWIG_PYTHON SWIG_RUBY SWIG_TCL \
 		${_CMAKE_OFF_${FLAVOR}}
 
 PLIST_SUB+=	${_PLIST_SUB_${FLAVOR}}
 
 BUILD_WRKSRC=	${WRKDIR}/.build/src/modules/qt
 
 # Dummy placeholder target.
 common-post-install:
 	@${TRUE}
 
 .include "${MASTERDIR}/Makefile"
diff --git a/multimedia/mlt7/Makefile b/multimedia/mlt7/Makefile
index 9d4bd8652024..14594cdb7f94 100644
--- a/multimedia/mlt7/Makefile
+++ b/multimedia/mlt7/Makefile
@@ -1,179 +1,179 @@
 PORTNAME=		${_MLT_PORTNAME}
 DISTVERSION=		${_MLT_VERSION}
-PORTREVISION=		0
+PORTREVISION=		1
 CATEGORIES?=		multimedia
 # Don't use GitHub "fake" downloads that are auto-generated from a
 # tag; the project uploads tarballs for each release.
 #               https://github.com/mltframework/mlt/releases/download/v6.26.1/mlt-6.26.1.tar.gz
 MASTER_SITES=		https://github.com/mltframework/mlt/releases/download/v${DISTVERSION}/
 DISTFILES=		mlt-${DISTVERSION}${EXTRACT_SUFX}
 WRKSRC=			${WRKDIR}/mlt-${DISTVERSION}
 
 MAINTAINER=		kde@FreeBSD.org
 COMMENT?=		Multimedia framework for TV broadcasting
 WWW=		https://www.mltframework.org/
 
 LICENSE?=		GPLv2 GPLv3 LGPL21
 LICENSE_COMB?=		multi
 
 USES+=			alias cmake compiler:c++11-lang eigen:3 localbase pkgconfig
 USE_LDCONFIG=		yes
 
 DATADIR=		${PREFIX}/share/mlt-7
 
 .ifndef(SLAVEPORT) # Master port.
 BROKEN_sparc64=		does not compile on sparc64 (invokes i386 asm)
 
 USES+=			gnome mlt:7,nodepend
 USE_GNOME=		libxml2
 
 CMAKE_ON=		MOD_XML
 
 # Explicitly disabled modules that are ouddated, unnecessary, or have
 # their own port.
 CMAKE_OFF=		MOD_GLAXNIMATE MOD_SDL1 MOD_QT \
 			MOD_NDI \
 			SWIG_CSHARP SWIG_JAVA SWIG_LUA SWIG_NODEJS SWIG_PERL \
 			SWIG_PHP SWIG_PYTHON SWIG_RUBY SWIG_TCL
 
 PORTDOCS=		AUTHORS NEWS
 PORTEXAMPLES=		demo
 
 OPTIONS_DEFINE=		DOCS EXAMPLES
 OPTIONS_DEFAULT=	AVFORMAT FREI0R GDK MOVIT KDENLIVE NORMALIZE PLUS PLUSGPL RESAMPLE SDL2 SOX \
 			VIDSTAB VORBIS
 
 OPTIONS_GROUP=		MODULES
 OPTIONS_GROUP_MODULES=	AVFORMAT DECKLINK FREI0R GDK JACKRACK KDENLIVE MOVIT NORMALIZE \
 			OLDFILM OPENCV PLUS PLUSGPL RESAMPLE RTAUDIO RUBBERBAND SDL2 \
 			SOX VIDSTAB VORBIS XINE
 OPTIONS_SUB=		yes
 
 AVFORMAT_DESC=		Enable avformat module
 AVFORMAT_LIB_DEPENDS=	libavformat.so:multimedia/ffmpeg
 AVFORMAT_CMAKE_BOOL=	MOD_AVFORMAT
 
 DECKLINK_DESC=		Enable decklink module
 DECKLINK_CMAKE_BOOL=	MOD_DECKLINK
 
 FREI0R_DESC=		Enable frei0r module
 FREI0R_BUILD_DEPENDS=	${LOCALBASE}/include/frei0r.h:graphics/frei0r
 FREI0R_CMAKE_BOOL=	MOD_FREI0R
 
 GDK_DESC=		Enable gdk module
 GDK_LIB_DEPENDS=	libexif.so:graphics/libexif \
 			libfontconfig.so:x11-fonts/fontconfig \
 			libfreetype.so:print/freetype2 \
 			libharfbuzz.so:print/harfbuzz
 GDK_USE=		gnome=gdkpixbuf2,pango
 GDK_CMAKE_BOOL=		MOD_GDK
 
 JACKRACK_DESC=		Enable jackrack module
 JACKRACK_BUILD_DEPENDS=	${LOCALBASE}/include/ladspa.h:audio/ladspa
 JACKRACK_LIB_DEPENDS=	libjack.so:audio/jack
 JACKRACK_USE=		gnome=glib20
 JACKRACK_CMAKE_BOOL=	MOD_JACKRACK
 
 KDENLIVE_DESC=		Enable kdenlive module
 KDENLIVE_CMAKE_BOOL=	MOD_KDENLIVE
 
 MOVIT_DESC=		Enable OpenGL module
 MOVIT_USES=		gl xorg
 MOVIT_USE=		gl=opengl xorg=x11
 MOVIT_LIB_DEPENDS=	libmovit.so:graphics/movit \
 			libepoxy.so:graphics/libepoxy
 MOVIT_CMAKE_BOOL=	MOD_MOVIT
 
 NORMALIZE_DESC=		Enable normalize module
 NORMALIZE_CMAKE_BOOL=	MOD_NORMALIZE
 
 OLDFILM_DESC=		Enable oldfilm module
 OLDFILM_CMAKE_BOOL=	MOD_OLDFILM
 
 OPENCV_DESC=		Enable OpenCV module
 OPENCV_LIB_DEPENDS=	libopencv_core.so:graphics/opencv
 OPENCV_CMAKE_BOOL=	MOD_OPENCV
 
 OPENGL_DESC=		Enable OpenGL module
 OPENGL_CMAKE_BOOL=	MOD_OPENGL
 OPENGL_LIB_DEPENDS=	libepoxy.so:graphics/libepoxy \
 			libmovit.so:graphics/movit
 OPENGL_USES=		gl xorg
 OPENGL_USE=		gl=gl xorg=x11
 
 PLUSGPL_DESC=		Enable plus GPL module
 PLUSGPL_CMAKE_BOOL=	MOD_PLUSGPL
 
 PLUS_DESC=		Enable plus module
 PLUS_LIB_DEPENDS=	libfftw3.so:math/fftw3
 PLUS_CMAKE_BOOL=	MOD_PLUS
 
 RESAMPLE_DESC=		Enable resample module
 RESAMPLE_LIB_DEPENDS=	libsamplerate.so:audio/libsamplerate
 RESAMPLE_CMAKE_BOOL=	MOD_RESAMPLE
 
 RTAUDIO_DESC=		Enable RtAudio module
 RTAUDIO_LIB_DEPENDS=	librtaudio.so:audio/rtaudio \
 			libpulse-simple.so:audio/pulseaudio
 RTAUDIO_CMAKE_BOOL=	MOD_RTAUDIO
 
 RUBBERBAND_DESC=	Enable rubberband module
 RUBBERBAND_LIB_DEPENDS=	librubberband.so:audio/rubberband
 RUBBERBAND_CMAKE_BOOL=	MOD_RUBBERBAND
 
 SDL2_DESC=		Enable SDL2 module
 SDL2_USES=		sdl
 SDL2_USE=		sdl=image2
 SDL2_CMAKE_BOOL=	MOD_SDL2
 
 SOX_DESC=		Enable SoX module
 SOX_LIB_DEPENDS=	libsox.so:audio/sox
 SOX_CMAKE_BOOL=		MOD_SOX
 
 VIDSTAB_DESC=		Enable vid.stab module
 VIDSTAB_LIB_DEPENDS=	libvidstab.so:multimedia/vid.stab
 VIDSTAB_CMAKE_BOOL=	MOD_VIDSTAB
 
 VORBIS_DESC=		Enable Vorbis module
 VORBIS_LIB_DEPENDS=	libvorbis.so:audio/libvorbis libogg.so:audio/libogg
 VORBIS_CMAKE_BOOL=	MOD_VORBIS
 
 XINE_DESC=		Enable xine module
 XINE_CMAKE_BOOL=	MOD_XINE
 
 pre-configure:
 	${RM} ${STAGEDIR}${PREFIX}/man/man1/melt.1
 	@${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},' \
 		${WRKSRC}/src/modules/frei0r/factory.c \
 		${WRKSRC}/src/modules/jackrack/plugin_mgr.c
 
 common-post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/melt-7
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libmlt-7.so.${PORTVERSION}
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libmlt++-7.so.${PORTVERSION}
 
 post-install-DOCS-on:
 .for f in ${PORTDOCS}
 	cd ${WRKSRC} && ${COPYTREE_SHARE} ${f} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 post-install-EXAMPLES-on:
 .for f in ${PORTEXAMPLES}
 	cd ${WRKSRC} && ${COPYTREE_SHARE} ${f} ${STAGEDIR}${EXAMPLESDIR}
 .endfor
 
 .else # Slave port.
 PORTSCOUT=		ignore:1
 
 # Depend on multimedia/mlt7 for child ports
 USES+=			mlt:7
 PLIST?=			${.CURDIR}/pkg-plist
 
 INSTALL_WRKSRC?=	${BUILD_WRKSRC}
 .endif
 
 post-install: common-post-install
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/* 2>/dev/null || ${TRUE}
 	@${RMDIR} -p ${STAGEDIR}${PREFIX}/lib/${PORTNAME} 2>/dev/null || ${TRUE}
 
 .include <bsd.port.mk>
diff --git a/multimedia/olive/Makefile b/multimedia/olive/Makefile
index 7df337e9fb83..19da3d53f680 100644
--- a/multimedia/olive/Makefile
+++ b/multimedia/olive/Makefile
@@ -1,38 +1,39 @@
 PORTNAME=	olive
 DISTVERSION=	0.1.2-20230320
+PORTREVISION=	1
 CATEGORIES=	multimedia
 PKGNAMESUFFIX=	-video-editor
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Non-linear video editor
 WWW=		https://olivevideoeditor.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	frei0r>0:graphics/frei0r
 LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg \
 		libImath-3_1.so:math/Imath \
 		libOpenColorIO.so:graphics/opencolorio \
 		libOpenEXR-3_1.so:graphics/openexr \
 		libOpenImageIO.so:graphics/openimageio \
 		libportaudio.so:audio/portaudio
 RUN_DEPENDS=	frei0r>0:graphics/frei0r
 #		libopentimelineio.so:multimedia/opentimelineio
 
 USES=		cmake compiler:c++17-lang desktop-file-utils gl pkgconfig qt:5 shared-mime-info
 USE_QT=		concurrent core dbus gui multimedia network opengl svg widgets x11extras \
 		buildtools:build linguisttools:build qmake:build testlib:build
 USE_GL=		gl
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	olive-editor
 GH_TAGNAME=	8ca1672
 GH_TUPLE=	olive-editor:core:2777928:core/ext/core \
 		KDAB:KDDockWidgets:8d2d0a5:KDDockWidgets/ext/KDDockWidgets
 
 PORTSCOUT=	limit:^.*[1-9]\..* # prevent tags like 20181223
 
 CONFLICTS_BUILD=	opentimelineio # fails to build with the opentimelineio optional dependency, see https://github.com/olive-editor/olive/issues/2201
 
 .include <bsd.port.mk>
diff --git a/multimedia/openshot/Makefile b/multimedia/openshot/Makefile
index c8026eae3051..b059f0043297 100644
--- a/multimedia/openshot/Makefile
+++ b/multimedia/openshot/Makefile
@@ -1,48 +1,49 @@
 PORTNAME=	openshot
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.1.0
+PORTREVISION=	1
 CATEGORIES=	multimedia
 
 MAINTAINER=	tatsuki_makino@hotmail.com
 COMMENT=	OpenShot Video Editor
 WWW=		https://www.openshot.org/
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}libopenshot>=0.3.1:multimedia/libopenshot@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sentry-sdk>=0:devel/py-sentry-sdk@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyzmq>=0:net/py-pyzmq@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}distro>=0:sysutils/py-distro@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR}
 
 USES=		desktop-file-utils pyqt:5 python shared-mime-info shebangfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	OpenShot
 GH_PROJECT=	${PORTNAME}-qt
 USE_PYQT=	pyqt5
 USE_PYTHON=	distutils optsuffix
 SHEBANG_FILES=	src/language/generate_translations.py\
 		src/language/show_translations.py\
 		src/language/test_translations.py
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=	DOCS
 OPTIONS_DEFAULT=
 DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=0:textproc/py-sphinx@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>=0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR}
 DOCS_BINARY_ALIAS=	sphinx-build=sphinx-build-${PYTHON_VER}
 DOCS_PORTDOCS=	*
 
 do-build-DOCS-on:
 	@(cd ${BUILD_WRKSRC}/doc; if ! ${DO_MAKE_BUILD} html; then \
 		(${ECHO_CMD} "===> ${.TARGET} failed unexpectedly.") | ${FMT_80} ; \
 		${FALSE}; \
 		fi)
 
 do-install-DOCS-on:
 	@(cd ${INSTALL_WRKSRC}/doc/_build &&\
 		${COPYTREE_SHARE} html ${STAGEDIR}${DOCSDIR} "-not -name \.*")
 
 .include <bsd.port.mk>
diff --git a/multimedia/opentoonz/Makefile b/multimedia/opentoonz/Makefile
index da0fb427c6da..123b6df91556 100644
--- a/multimedia/opentoonz/Makefile
+++ b/multimedia/opentoonz/Makefile
@@ -1,66 +1,66 @@
 PORTNAME=	opentoonz
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.5.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	multimedia
 
 MAINTAINER=	rozhuk.im@gmail.com
 COMMENT=	Open-source full-featured 2D animation creation software
 WWW=		https://opentoonz.github.io/e/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BUILD_DEPENDS=	boost-libs>0:devel/boost-libs
 LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 		liblz4.so:archivers/liblz4 \
 		liblzo2.so:archivers/lzo2 \
 		libmypaint.so:graphics/libmypaint \
 		libopencv_core.so:graphics/opencv \
 		libpng.so:graphics/png \
 		libsuperlu.so:math/superlu \
 		libturbojpeg.so:graphics/libjpeg-turbo
 RUN_DEPENDS=	${LOCALBASE}/bin/ffprobe:multimedia/ffmpeg
 
 USES=		cmake:noninja compiler:c++11-lang gl \
 		gnome jpeg pkgconfig qt:5
 USE_GITHUB=	yes
 USE_GL=		gl glew glu glut
 USE_QT=		core gui multimedia network opengl printsupport \
 		script serialport svg widgets xml \
 		buildtools:build linguisttools:build qmake:build
 CMAKE_ARGS=	-DWITH_SYSTEM_LZO:BOOL=ON \
 		-DWITH_SYSTEM_SUPERLU:BOOL=ON
 CMAKE_SOURCE_PATH=	${WRKSRC}/toonz/sources
 
 OPTIONS_SINGLE=		BLASLIB
 OPTIONS_SINGLE_BLASLIB=	CBLAS GSLCBLAS NETLIB OPENBLAS
 OPTIONS_DEFAULT=	OPENBLAS
 
 CBLAS_LIB_DEPENDS=	libcblas.so:math/cblas
 CBLAS_VARS=		BLASLIBS="cblas"
 CBLAS_DESC=		C interface to the legacy Fortran BLAS
 GSLCBLAS_LIB_DEPENDS=	libgslcblas.so:math/gsl
 GSLCBLAS_VARS=		BLASLIBS="gslcblas"
 GSLCBLAS_DESC=		The GNU Scientific Library - mathematical libs
 NETLIB_USES=		blaslapack:netlib
 NETLIB_VARS=		BLASLIBS="blas"
 OPENBLAS_USES=		blaslapack:openblas
 OPENBLAS_VARS=		BLASLIBS="openblas"
 
 .include <bsd.port.options.mk>
 
 .if defined(WITH_DEBUG)
 CXXFLAGS+=	-DDEBUG -g3 -ggdb
 .else
 CXXFLAGS+=	-DNDEBUG
 .endif
 
 post-extract:
 	${FIND} ${WRKSRC} -name '*.gitkeep' -delete
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|find_library(OPENBLAS_LIB NAMES.*|find_library(OPENBLAS_LIB NAMES ${BLASLIBS})|g" \
 		${WRKSRC}/toonz/sources/CMakeLists.txt
 
 .include <bsd.port.mk>
diff --git a/multimedia/pitivi/Makefile b/multimedia/pitivi/Makefile
index 56de4ace1999..d89daa017b68 100644
--- a/multimedia/pitivi/Makefile
+++ b/multimedia/pitivi/Makefile
@@ -1,35 +1,35 @@
 PORTNAME=	pitivi
 PORTVERSION=	2022.06
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	GNOME/sources/${PORTNAME}/${PORTVERSION:R}
 
 MAINTAINER=	kwm@FreeBSD.org
 COMMENT=	Gstreamer based non-linear audio/video editor
 WWW=		https://www.pitivi.org
 
 LICENSE=	LGPL21+
 
 BUILD_DEPENDS=	gst-validate-launcher:multimedia/gstreamer1-validate \
 		itstool:textproc/itstool
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gstreamer1>=1.14.0:multimedia/py-gstreamer1@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cairo>=0:graphics/py-cairo@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>=1.4:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
 		${PYNUMPY}
 
 USES=		cpe desktop-file-utils gettext gnome gstreamer meson pkgconfig python:3.7+ \
 		shared-mime-info shebangfix tar:xz
 SHEBANG_FILES=	bin/pitivi.in \
 		getenvvar.py \
 		tests/__init__.py \
 		tests/validate-tests/manager.py \
 		tests/validate-tests/runtests
 USE_GNOME=	cairo intltool gdkpixbuf2 gsound gtk30 pygobject3
 USE_GSTREAMER=	bad editing-services gdkpixbuf good gtk
 USE_LDCONFIG=	yes
 MESON_ARGS=	-Db_lundef=false
 
 BINARY_ALIAS=	python3=${PYTHON_VERSION}
 
 .include <bsd.port.mk>
diff --git a/multimedia/py-PySceneDetect/Makefile b/multimedia/py-PySceneDetect/Makefile
index bbe84bdaf87d..e214c9e753b8 100644
--- a/multimedia/py-PySceneDetect/Makefile
+++ b/multimedia/py-PySceneDetect/Makefile
@@ -1,27 +1,28 @@
 PORTNAME=	PySceneDetect
 PORTVERSION=	0.6.1
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	multimedia python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	OpenCV-based video scene detection program and Python library
 WWW=		https://pyscenedetect.readthedocs.io/en/latest/
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner@${PY_FLAVOR}
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}click>=3.2:devel/py-click@${PY_FLAVOR} \
 		opencv>=0:graphics/opencv \
 		mkvmerge:multimedia/mkvtoolnix
 
 USES=		python:3.6+
 USE_GITHUB=	yes
 GH_ACCOUNT=	Breakthrough
 USE_PYTHON=	autoplist distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/multimedia/py-mlt6/Makefile b/multimedia/py-mlt6/Makefile
index 47003a80f5fc..a34708312d65 100644
--- a/multimedia/py-mlt6/Makefile
+++ b/multimedia/py-mlt6/Makefile
@@ -1,61 +1,61 @@
 MASTERDIR=	${.CURDIR:H}/mlt6
 SLAVEPORT=	python
 
-PORTREVISION=	3
+PORTREVISION=	4
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 COMMENT=	Python bindings for the MLT multimedia framework
 CATEGORIES=	multimedia python
 
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	multi
 
 BUILD_DEPENDS=	swig:devel/swig
 LIB_DEPENDS=	libexif.so:graphics/libexif \
 		libfftw3.so:math/fftw3
 
 PORTEXAMPLES=	*
 
 USES=		gettext-runtime python:3.6+ shebangfix
 USE_PYTHON=	flavors
 
 # Only enable python swig binding, and disable everything else
 CMAKE_ON=	SWIG_PYTHON
 CMAKE_OFF=	MOD_AVFORMAT MOD_DECKLINK MOD_FEEDS MOD_FREI0R MOD_GDK MOD_GTK2 \
 		MOD_JACKRACK MOD_KDENLIVE MOD_LUMAS MOD_MOTION_EST MOD_NORMALIZE \
 		MOD_OLDFILM MOD_OPENCV MOD_OPENGL MOD_PLUSGPL MOD_PLUS MOD_RESAMPLE \
 		MOD_RTAUDIO MOD_RUBBERBAND MOD_SDL2 MOD_SOX MOD_VIDSTAB MOD_VMFX \
 		MOD_VORBIS MOD_XINE MOD_XML \
 		SWIG_CSHARP SWIG_JAVA SWIG_LUA SWIG_NODEJS SWIG_PERL \
 		SWIG_PHP SWIG_RUBY SWIG_TCL \
 		MOD_QT
 
 # Enforce the correct python version
 CMAKE_ARGS=	-DPython3_EXECUTABLE="${PYTHON_CMD}"
 
 OPTIONS_DEFINE=	EXAMPLES
 
 SHEBANG_FILES=	src/swig/python/codecs.py \
 		src/swig/python/switcher.py \
 		src/swig/python/getimage.py \
 		src/swig/python/test_animation.py \
 		src/swig/python/webvfx_generator.py \
 		src/swig/python/play.py \
 		src/swig/python/waveforms.py
 
 BUILD_WRKSRC=	${WRKDIR}/.build/src/swig/python
 
 common-post-install:
 	@${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 	${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py -d \
 		${PYTHONPREFIX_SITELIBDIR} -f ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 	${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py -d \
 		${PYTHONPREFIX_SITELIBDIR} -f ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/${PYTHON_VER}
 .for f in codecs getimage play switcher waveforms webvfx_generator
 	${INSTALL_DATA} ${WRKSRC}/src/swig/python/${f}.py ${STAGEDIR}${EXAMPLESDIR}/${PYTHON_VER}/
 .endfor
 
 .include "${MASTERDIR}/Makefile"
diff --git a/multimedia/py-moviepy/Makefile b/multimedia/py-moviepy/Makefile
index 33870b0d1d64..0bafcd407fe3 100644
--- a/multimedia/py-moviepy/Makefile
+++ b/multimedia/py-moviepy/Makefile
@@ -1,29 +1,29 @@
 PORTNAME=	moviepy
 PORTVERSION=	1.0.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Video editing with Python
 WWW=		https://github.com/Zulko/moviepy
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENCE.txt
 
 RUN_DEPENDS=	ffmpeg:multimedia/ffmpeg \
 		${PYTHON_PKGNAMEPREFIX}decorator>=4.0.2<6.0:devel/py-decorator@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}imageio>=2.5<3.0:graphics/py-imageio@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}imageio-ffmpeg>=0.2.0:graphics/py-imageio-ffmpeg@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpy>=0,1:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}proglog<=1.0.0:devel/py-proglog@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.8.1<3.0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tqdm>=4.11.2<5.0:misc/py-tqdm@${PY_FLAVOR} \
 
 USES=		magick:run python:3.8+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/multimedia/py-pretty_midi/Makefile b/multimedia/py-pretty_midi/Makefile
index 4a8b73f6d3c1..7aca72430512 100644
--- a/multimedia/py-pretty_midi/Makefile
+++ b/multimedia/py-pretty_midi/Makefile
@@ -1,21 +1,22 @@
 PORTNAME=	pretty_midi
 DISTVERSION=	0.2.9
+PORTREVISION=	1
 CATEGORIES=	multimedia python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Utility functions for handling MIDI data in a nice/intuitive way
 WWW=		https://github.com/craffel/pretty-midi
 
 LICENSE=	MIT
 
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}mido>=1.1.16:multimedia/py-mido@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_PYTHON=	autoplist distutils
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/multimedia/shotcut/Makefile b/multimedia/shotcut/Makefile
index 1216cb9ae9ad..91cddb0c1cea 100644
--- a/multimedia/shotcut/Makefile
+++ b/multimedia/shotcut/Makefile
@@ -1,42 +1,43 @@
 PORTNAME=	shotcut
 DISTVERSION=	22.06.23
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	https://github.com/${GH_ACCOUNT}/${PORTNAME}/releases/download/v${DISTVERSION}/
 DISTNAME=	${PORTNAME}-src-${DISTVERSION:C/\.//g}
 
 MAINTAINER=	vishwin@FreeBSD.org
 COMMENT=	Free, open source, cross-platform video editor
 WWW=		https://shotcut.org/
 
 LICENSE=	GPLv3
 
 LIB_DEPENDS=	libfftw3.so:math/fftw3
 RUN_DEPENDS=	ffmpeg:multimedia/ffmpeg \
 		${LOCALBASE}/lib/libjack.so:audio/jack
 
 USES=		cmake compiler:c++11-lang cpe desktop-file-utils gl mlt:7 pkgconfig \
 		qmake:no_env qt:5 sdl shared-mime-info tar:txz xorg
 CPE_VENDOR=	meltytech
 
 GH_ACCOUNT=	mltframework
 
 USE_GL=	gl
 USE_QT=		core declarative gui multimedia network opengl quickcontrols2 sql \
 		websockets widgets xml buildtools:build concurrent:build linguisttools:build
 USE_SDL=	sdl2
 USE_XORG=	x11
 # Needed to be able to correctly check for updates in-app.
 CMAKE_ARGS=	-D${PORTNAME:tu}_VERSION="${DISTVERSION}"
 
 WRKSRC=	${WRKDIR}/src
 WRKSRC_SUBDIR=	${PORTNAME}
 
 OPTIONS_DEFINE=	FREI0R LADSPA NLS
 OPTIONS_DEFAULT=FREI0R LADSPA
 OPTIONS_SUB=	yes
 
 FREI0R_RUN_DEPENDS=	frei0r-plugins>=0:graphics/frei0r-plugins
 
 LADSPA_RUN_DEPENDS=	swhplugins>=0:audio/swhplugins
 
 .include <bsd.port.mk>
diff --git a/multimedia/subsync/Makefile b/multimedia/subsync/Makefile
index 18ac6557089d..b05cd3427d68 100644
--- a/multimedia/subsync/Makefile
+++ b/multimedia/subsync/Makefile
@@ -1,30 +1,31 @@
 PORTNAME=	subsync
 DISTVERSION=	g20190702
+PORTREVISION=	1
 CATEGORIES=	multimedia python
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Synchronize your subtitles using machine learning
 WWW=		https://github.com/smacke/subsync
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}argparse>0:devel/py-argparse@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ffmpeg-python>0:multimedia/py-ffmpeg-python@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pysrt>0:textproc/py-pysrt@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-learn>0:science/py-scikit-learn@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tqdm>0:misc/py-tqdm@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}webrtcvad>0:audio/py-webrtcvad@${PY_FLAVOR}
 
 USES=		python:3.5+
 USE_GITHUB=	yes
 GH_ACCOUNT=	smacke # tympanix account has another version of the same project requiring tensorflow
 GH_TAGNAME=	d9798a5
 USE_PYTHON=	distutils concurrent noflavors autoplist
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/multimedia/xanim/Makefile b/multimedia/xanim/Makefile
index 59efca712152..6c5e099c0069 100644
--- a/multimedia/xanim/Makefile
+++ b/multimedia/xanim/Makefile
@@ -1,61 +1,61 @@
 PORTNAME=	xanim
 PORTVERSION=	2.92.0
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	multimedia graphics
 MASTER_SITES=	ftp://ftp.nstu.ru/pub/mirrors/xanim.va.pubnix.com/:main \
 		LOCAL/dinoex:main,DEFAULT \
 		ftp://ftp.nstu.ru/pub/mirrors/xanim.va.pubnix.com/dlls/
 DISTNAME=	xanim2920
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:main ${EXTRA_FILES}
 
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Play most popular animation formats and show pictures
 WWW=		http://xanim.polter.net/
 
 # Converted from NO_CDROM
 LICENSE=	xanim
 LICENSE_NAME=	xanim
 LICENSE_TEXT=	Must be redistributed without fee
 LICENSE_PERMS=	dist-mirror pkg-mirror auto-accept
 
 # clang's cpp destroys whitespace, particularly hard tabs in makefiles,
 # which is fatal for imake.
 USES=		alias imake xorg
 USE_GCC=	yes
 USE_XORG=	xext xt sm ice xext x11
 MAKE_ARGS+=	-j 2 # safe and helps even the single-CPU machines
 DLLDIR=		${PREFIX}/lib/X11/xanim
 PLIST_FILES+=	bin/xanim man/man1/xanim.1.gz
 
 post-extract:
 	${CP} ${WRKSRC}/docs/xanim.man ${WRKSRC}
 
 .include <bsd.port.pre.mk>
 
 .if (${ARCH} == "i386")
 EXTRA_FILES=	vid_cvid_2.1_freebsdELFx86.tgz \
 		vid_cyuv_1.0_freebsdELFx86.tgz \
 		vid_h261_1.0_freebsdELFx86.tgz \
 		vid_h263_1.0_freebsdELFx86.tgz \
 		vid_iv32_2.1_freebsdELFx86.tgz \
 		vid_iv41_1.1_freebsdELFx86.tgz \
 		vid_iv50_1.0_freebsdELFx86.tgz
 PLIST_FILES+=	lib/X11/xanim/cvid.readme lib/X11/xanim/cyuv.readme \
 		lib/X11/xanim/h261.readme lib/X11/xanim/h263.readme \
 		lib/X11/xanim/iv32.readme lib/X11/xanim/iv41.readme \
 		lib/X11/xanim/iv50.readme \
 		lib/X11/xanim/vid_cvid_2.1_freebsdELFx86.xa \
 		lib/X11/xanim/vid_cyuv_1.0_freebsdELFx86.xa \
 		lib/X11/xanim/vid_h261_1.0_freebsdELFx86.xa \
 		lib/X11/xanim/vid_h263_1.0_freebsdELFx86.xa \
 		lib/X11/xanim/vid_iv32_2.1_freebsdELFx86.xa \
 		lib/X11/xanim/vid_iv41_1.1_freebsdELFx86.xa \
 		lib/X11/xanim/vid_iv50_1.0_freebsdELFx86.xa
 
 post-install:
 	${MKDIR} ${STAGEDIR}${DLLDIR}
 	${INSTALL_DATA} ${WRKDIR}/*.readme ${STAGEDIR}${DLLDIR}/
 	${INSTALL_DATA} ${WRKDIR}/*.xa ${STAGEDIR}${DLLDIR}/
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/multimedia/zart/Makefile b/multimedia/zart/Makefile
index 23cb8b8097ab..8f826cb06101 100644
--- a/multimedia/zart/Makefile
+++ b/multimedia/zart/Makefile
@@ -1,42 +1,42 @@
 PORTNAME=	zart
 PORTVERSION=	g20191124
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	multimedia
 MASTER_SITES=	https://gmic.eu/files/source/:gmic
 DISTFILES=	gmic_${GMIC_VERSION}.tar.gz:gmic
 
 PATCH_SITES=	https://github.com/c-koi/zart/commit/
 PATCHFILES=	6ca1964690afbbc78627d7c868a692401043a584.patch:-p1
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	GMIC GUI for video streams
 WWW=		https://github.com/c-koi/zart
 
 LICENSE=	CeCILL
 LICENSE_NAME=	CeCILL
 LICENSE_FILE=	${WRKSRC}/LICENSE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 LIB_DEPENDS=	libgmic.so:graphics/gmic \
 		libopencv_core.so:graphics/opencv \
 		libfftw3.so:math/fftw3
 
 USES=		compiler:c++11-lang pkgconfig qmake qt:5
 USE_GITHUB=	yes
 GH_ACCOUNT=	c-koi
 GH_TAGNAME=	099554f
 USE_QT=		core gui network widgets xml buildtools:build
 
 GMIC_VERSION=	2.8.1
 
 QMAKE_ARGS=	"GMIC_PATH=${WRKDIR}/gmic-${GMIC_VERSION}/src"
 
 PLIST_FILES=	bin/${PORTNAME}
 
 post-patch:
 	@${REINPLACE_CMD} 's|SYS_gettid|SYS_thr_self|' ${WRKDIR}/gmic-${GMIC_VERSION}/src/gmic.cpp
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/net-im/signal-desktop/Makefile b/net-im/signal-desktop/Makefile
index 94654a71b309..cf6b2944b10a 100644
--- a/net-im/signal-desktop/Makefile
+++ b/net-im/signal-desktop/Makefile
@@ -1,243 +1,244 @@
 PORTNAME=	signal-desktop
 DISTVERSIONPREFIX=	v
 DISTVERSION=	6.15.0
+PORTREVISION=	1
 CATEGORIES=	net-im
 MASTER_SITES=	LOCAL/mikael/signal-desktop/:npm \
 		LOCAL/mikael/signal-desktop/:sqlite \
 		LOCAL/mikael/signal-desktop/:yarn \
 		https://nodejs.org/download/release/v${NODE_VERSION}/:node \
 		https://electronjs.org/headers/v${ELECTRON_GYP_VERSION}/:electron_gyp \
 		https://build-artifacts.signal.org/desktop/:sqlcipher
 DISTFILES=	signal-desktop-${DISTVERSION}-yarn-cache.tar.gz:yarn \
 		signal-desktop-6.4.1-npm-cache.tar.gz:npm \
 		node-v${NODE_VERSION}-headers.tar.gz:node \
 		node-v${ELECTRON_GYP_VERSION}-headers.tar.gz:electron_gyp \
 		${SQLCIPHER}.tar.gz:sqlcipher
 
 MAINTAINER=	mikael@FreeBSD.org
 COMMENT=	Cross-platform centralized encrypted messaging service
 WWW=		https://signal.org/
 
 LICENSE=	AGPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 ONLY_FOR_ARCHS=	aarch64 amd64
 
 EXTRACT_DEPENDS=jq:textproc/jq \
 		yarn-node16>0:www/yarn-node16
 BUILD_DEPENDS=	${LOCALBASE}/lib/libringrtc.so:multimedia/ringrtc \
 		${LOCALBASE}/lib/libsignal_node.so:net-im/libsignal-node \
 		${LOCALBASE}/lib/libsignal_tokenizer.a:devel/signal-fts5-extension \
 		app-builder>0:devel/app-builder \
 		jq:textproc/jq \
 		electron${ELECTRON_VER_MAJOR}:devel/electron${ELECTRON_VER_MAJOR} \
 		npm:www/npm-node16 \
 		${LOCALBASE}/lib/libcrypto.a:security/openssl30 \
 		vips>0:graphics/vips \
 		yarn:www/yarn-node16
 LIB_DEPENDS=	libasound.so:audio/alsa-lib \
 		libatk-bridge-2.0.so:accessibility/at-spi2-core \
 		libatspi.so:accessibility/at-spi2-core \
 		libcups.so:print/cups \
 		libdbus-1.so:devel/dbus \
 		libdrm.so:graphics/libdrm \
 		libexpat.so:textproc/expat2 \
 		libFLAC.so:audio/flac \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libharfbuzz.so:print/harfbuzz \
 		libnspr4.so:devel/nspr \
 		libnss3.so:security/nss \
 		libopenh264.so:multimedia/openh264 \
 		libopus.so:audio/opus \
 		libpci.so:devel/libpci \
 		libpng16.so:graphics/png \
 		libsnappy.so:archivers/snappy \
 		libwebp.so:graphics/webp \
 		libxkbcommon.so:x11/libxkbcommon \
 		libxshmfence.so:x11/libxshmfence
 
 USES=		desktop-file-utils gettext-runtime gl gnome jpeg xorg
 USE_GITHUB=	yes
 GH_ACCOUNT=	signalapp
 GH_PROJECT=	Signal-Desktop
 
 USE_GL=		gbm gl
 USE_GNOME=	atk cairo gdkpixbuf2 glib20 gtk30 libxml2 libxslt pango
 USE_XORG=	x11 xcb xcomposite xdamage xext xfixes xi xrandr xrender xtst
 
 PACKAGE_ENV=	SIGNAL_ENV=production
 MAKE_ENV+=	ELECTRON_OVERRIDE_DIST_PATH=${LOCALBASE}/share/electron${ELECTRON_VER_MAJOR} \
 		HOME=${WRKDIR} \
 		USE_SYSTEM_APP_BUILDER=true \
 		SOURCE_DATE_EPOCH=${_BUILD_DATE}
 
 # Don't download electron binary distribution on electron node_modules installation
 MAKE_ENV+=	ELECTRON_SKIP_BINARY_DOWNLOAD=1
 
 # Don't create __pycache__ directory when executing node-gyp
 # This is a workaround to avoid filesystem violations during poudriere build
 MAKE_ENV+=	PYTHONDONTWRITEBYTECODE=1
 
 MAKE_ENV+=	ESBUILD_BINARY_PATH=${WRKDIR}/esbuild-freebsd-64/package/bin/esbuild
 
 _BUILD_DATE=	$$(date +'%s')
 
 ELECTRON_VER_MAJOR=	22
 # keep NODE_VERSION in sync with www/node16 DISTVERSION
 NODE_VERSION=		16.20.0
 # bump ELECTRON_GYP_VERSION when ELECTRON_VER_MAJOR is changed
 ELECTRON_GYP_VERSION=	22.3.5
 
 # sh get_deps.sh
 NPM_SIGNAL_DIR=		npm-@signalapp-libsignal-client-0.22.0-d57441612df46f90df68fc5d9ad45b857b9d2c44-integrity
 NPM_RINGRTC_DIR=	npm-@signalapp-ringrtc-2.26.2-6ca91cd4b2d3ed545eb87c4aaddcb3f8735ad85a-integrity
 NPM_SQLITE3_DIR=	npm-@signalapp-better-sqlite3-8.4.3-7ffa8d03d2a12543247936bfb7b9f74cdbc6fe9b-integrity
 NPM_ESBUILD_VERS=	0.17.11
 SQLCIPHER=		sqlcipher-4.5.3-fts--3.0.7--0.2.1-b633825cf7e0fdd39a6cdf128f2bd76552a88d325f2b9cd07bb87a457cefb986
 
 ESBUILD_ARCH=		${ARCH:S/aarch64/arm64/:S/amd64/x64/}
 NODE_ARCH=		${ARCH:S/aarch64/arm64/:S/amd64/x64/}
 APP_OUT_DIR=		linux-${ARCH:S/aarch64/arm64-/:S/amd64//}unpacked
 
 PLIST_SUB=		NODE_ARCH=${NODE_ARCH} \
 			SHARP_ARCH=${ARCH:S/aarch64/arm64v8/:S/amd64/x64/}
 
 YARN_TIMESTAMP=	1661146515
 
 fetch-yarn:
 	if [ ! -f ${DISTDIR}/signal-desktop-${DISTVERSION}-yarn-cache.tar.gz ]; then \
 		${MKDIR} /tmp/signal-desktop; \
 		${FETCH_CMD} -o - https://raw.githubusercontent.com/signalapp/Signal-Desktop/v${DISTVERSION}/package.json | \
 			${PREFIX}/bin/jq '.engines.node = "${NODE_VERSION}"' > /tmp/signal-desktop/package.json; \
 		${FETCH_CMD} -o /tmp/signal-desktop/yarn.lock https://raw.githubusercontent.com/signalapp/Signal-Desktop/v${DISTVERSION}/yarn.lock; \
 		${ECHO_CMD} 'yarn-offline-mirror "./yarn-offline-cache"' >> \
 			/tmp/signal-desktop/.yarnrc; \
 		${PREFIX}/bin/jq 'del(.devDependencies."@signalapp/mock-server")' /tmp/signal-desktop/package.json > /tmp/signal-desktop/package.json.tmp; \
 		${MV} /tmp/signal-desktop/package.json.tmp /tmp/signal-desktop/package.json; \
 		cd /tmp/signal-desktop && ${SETENV} HOME=/tmp/signal-desktop XDG_CACHE_HOME=/tmp/signal-desktop/.cache \
 			yarn --frozen-lockfile --ignore-scripts; \
 		${MTREE_CMD} -cbnSp yarn-offline-cache | ${MTREE_CMD} -C | ${SED} \
 			-e 's:time=[0-9.]*:time=${YARN_TIMESTAMP}.000000000:' \
 			-e 's:\([gu]id\)=[0-9]*:\1=0:g' \
 			-e 's:flags=.*:flags=none:' \
 			-e 's:^\.:./yarn-offline-cache:' > yarn-offline-cache.mtree; \
 		${TAR} cJf ${DISTDIR}/signal-desktop-${DISTVERSION}-yarn-cache.tar.gz  \
 			@yarn-offline-cache.mtree; \
 		${RM} -r ${WRKDIR}; \
 	fi
 
 post-patch:
 	${REINPLACE_CMD} "s#%%EPOCH%%#${_BUILD_DATE}#" \
 		${WRKSRC}/ts/scripts/get-expire-time.ts
 
 post-extract:
 	${MKDIR} ${WRKDIR}/.cache/node-gyp/${NODE_VERSION} \
 		 ${WRKDIR}/.electron-gyp/${ELECTRON_GYP_VERSION}
 	${MV} ${WRKDIR}/node-v${NODE_VERSION}/include ${WRKDIR}/.cache/node-gyp/${NODE_VERSION}
 	${MV} ${WRKDIR}/node_headers/include ${WRKDIR}/.electron-gyp/${ELECTRON_GYP_VERSION}
 	${ECHO_CMD} '9' > ${WRKDIR}/.cache/node-gyp/${NODE_VERSION}/installVersion
 	${ECHO_CMD} '9' > ${WRKDIR}/.electron-gyp/${ELECTRON_GYP_VERSION}/installVersion
 
 	# install yarn modules and fail silently
 	${ECHO_CMD} 'yarn-offline-mirror "../yarn-offline-cache"' > ${WRKSRC}/.yarnrc
 	# Update node engine
 	${PREFIX}/bin/jq '.engines.node = "${NODE_VERSION}"' ${WRKSRC}/package.json > ${WRKSRC}/package.json.tmp
 	${MV} ${WRKSRC}/package.json.tmp ${WRKSRC}/package.json
 	# remove mock-server as it doesn't build and is useless
 	${PREFIX}/bin/jq 'del(.devDependencies."@signalapp/mock-server")' ${WRKSRC}/package.json > ${WRKSRC}/package.json.tmp
 	${MV} ${WRKSRC}/package.json.tmp ${WRKSRC}/package.json
 	cd ${WRKSRC} && \
 		${SETENV} ${MAKE_ENV} yarn install --frozen-lockfile --ignore-optional --offline || ${TRUE}
 
 do-build:
 	${ECHO_CMD} 'yarn-offline-mirror "../yarn-offline-cache"' > ${WRKSRC}/.yarnrc
 
 # electron-builder is stupid and tries to open ${LOCALBASE}/share/electron22/electron with WRITE priv
 # copy ${LOCALBASE}/share/electron22 in WRKDIR
 # it's needed for the do-install phase, it's here because of this issue
 # https://github.com/MikaelUrankar/signal-desktop/issues/6 (I don't know why it fails though)
 	@${RM} -r ${WRKDIR}/electron${ELECTRON_VER_MAJOR}
 	@${CP} -pR ${LOCALBASE}/share/electron${ELECTRON_VER_MAJOR} ${WRKDIR}/electron${ELECTRON_VER_MAJOR}
 	${CHMOD} -R a+w ${WRKDIR}/electron${ELECTRON_VER_MAJOR}
 
 	# Install libsignal_node.so and libringrtc.so binaries in the yarn cache
 	${MKDIR} ${WRKDIR}/.cache/yarn/v6/${NPM_SIGNAL_DIR}/node_modules/@signalapp/libsignal-client/prebuilds/freebsd-${NODE_ARCH} \
 		 ${WRKDIR}/.cache/yarn/v6/${NPM_RINGRTC_DIR}/node_modules/@signalapp/ringrtc/build/freebsd
 	${CP} ${LOCALBASE}/lib/libsignal_node.so \
 		${WRKDIR}/.cache/yarn/v6/${NPM_SIGNAL_DIR}/node_modules/@signalapp/libsignal-client/prebuilds/freebsd-${NODE_ARCH}/node.napi.node
 	${CP} ${LOCALBASE}/lib/libringrtc.so \
 		${WRKDIR}/.cache/yarn/v6/${NPM_RINGRTC_DIR}/node_modules/@signalapp/ringrtc/build/freebsd/libringrtc-${NODE_ARCH}.node
 
 	${MKDIR} ${WRKDIR}/.cache/yarn/v6/${NPM_SQLITE3_DIR}/node_modules/@signalapp/better-sqlite3/deps
 	${CP} ${DISTDIR}/${SQLCIPHER}.tar.gz \
 		${WRKDIR}/.cache/yarn/v6/${NPM_SQLITE3_DIR}/node_modules/@signalapp/better-sqlite3/deps/sqlcipher.tar.gz
 
 	${CP} ${FILESDIR}/fetch-prebuild.js \
 		${WRKDIR}/.cache/yarn/v6/${NPM_RINGRTC_DIR}/node_modules/@signalapp/ringrtc/scripts/fetch-prebuild.js
 	${CP} ${FILESDIR}/download.js \
 		${WRKDIR}/.cache/yarn/v6/${NPM_SQLITE3_DIR}/node_modules/@signalapp/better-sqlite3/deps/download.js
 
 	# patch-package can't patch sqlite3 on aarch64, patch the yarn cache instead
 	cd ${WRKDIR}/.cache/yarn/v6 && ${PATCH} -s -N -i ${FILESDIR}/sqlite3.gyp.diff
 
 	${MKDIR} ${WRKDIR}/esbuild-freebsd-64
 	${TAR} -xf ${WRKDIR}/yarn-offline-cache/@esbuild-freebsd-${ESBUILD_ARCH}-${NPM_ESBUILD_VERS}.tgz -C ${WRKDIR}/esbuild-freebsd-64
 
 # 	# For online build
 #	${RM} ${WRKDIR}/.npmrc
 #	cd ${WRKSRC} && \
 #		${SETENV} ${MAKE_ENV} yarn install --frozen-lockfile --ignore-optional
 #	cd ${WRKSRC} && \
 #		${SETENV} ${MAKE_ENV} yarn generate
 #	cd ${WRKSRC} && \
 #		${SETENV} ${MAKE_ENV} yarn build:esbuild:prod
 
 	# For offline build
 	${ECHO_CMD} offline=true > ${WRKDIR}/.npmrc
 	cd ${WRKSRC} && \
 		${SETENV} ${MAKE_ENV} yarn install --frozen-lockfile --ignore-optional --offline
 	cd ${WRKSRC} && \
 		${SETENV} ${MAKE_ENV} yarn --offline generate
 	cd ${WRKSRC} && \
 		${SETENV} ${MAKE_ENV} yarn --offline build:esbuild:prod
 
 do-install:
 # taken from https://github.com/tagattie/FreeBSD-Electron/blob/master/Mk/Uses/electron.mk#L387
 # and editors/vscode
 	cd ${WRKSRC} && \
 		${SETENV} ${MAKE_ENV} ${PACKAGE_ENV} yarn run electron-builder \
 			--linux --dir --config.npmRebuild=false \
 			--config.electronVersion=${ELECTRON_VER_MAJOR} \
 			--config.electronDist=${WRKDIR}/electron${ELECTRON_VER_MAJOR}
 
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	cd ${BUILD_WRKSRC}/dist/${APP_OUT_DIR} && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}
 
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps
 	${INSTALL_DATA} ${WRKSRC}/images/signal-logo-desktop-linux.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps/signal-desktop.png
 	${INSTALL_DATA} ${FILESDIR}/${PORTNAME}.desktop \
 		${STAGEDIR}${PREFIX}/share/applications
 
 .for f in chromedriver mksnapshot v8_context_snapshot_generator
 	${RM} ${STAGEDIR}${DATADIR}/${f}
 .endfor
 	${RM} -r ${STAGEDIR}${DATADIR}/gen
 	${RM} -r ${STAGEDIR}${DATADIR}/node_headers
 	${RM} -r ${STAGEDIR}${DATADIR}/resources/completions
 	${RLN} ${STAGEDIR}${DATADIR}/signal-desktop ${STAGEDIR}${PREFIX}/bin
 
 create-caches-tarball:
 	# do some cleanup first
 	${RM} -r  ${WRKDIR}/.npm/_logs ${WRKDIR}/.npm/_update-notifier-last-checked ${WRKDIR}/.cache/yarn/v6/.tmp
 	${FIND} ${WRKDIR}/.cache -type f -perm 755 -exec file {} \; | ${EGREP} "ELF|PE32+|Mach-O" | ${AWK} -F ':' '{print $$1}' | ${XARGS} ${RM}
 
 	cd ${WRKDIR} && \
 		${TAR} czf signal-desktop-${DISTVERSION}-yarn-cache.tar.gz .cache yarn-cache
 	cd ${WRKDIR} && \
 		${TAR} czf signal-desktop-${DISTVERSION}-electron-gyp-cache.tar.gz .electron-gyp
 	cd ${WRKDIR} && \
 		${TAR} czf signal-desktop-${DISTVERSION}-npm-cache.tar.gz .npm
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/aircrack-ng/Makefile b/net-mgmt/aircrack-ng/Makefile
index 3ed4094058b3..84198d48ce7f 100644
--- a/net-mgmt/aircrack-ng/Makefile
+++ b/net-mgmt/aircrack-ng/Makefile
@@ -1,69 +1,69 @@
 PORTNAME=	aircrack-ng
 DISTVERSION=	1.5.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net-mgmt security
 MASTER_SITES=	http://download.aircrack-ng.org/
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	802.11 WEP and WPA-PSK keys cracking program
 WWW=		https://www.aircrack-ng.org/
 
 LICENSE=	GPLv2 BSD3CLAUSE APACHE20
 LICENSE_COMB=	dual
 
 BROKEN_aarch64=		fails to configure: _AX_COMPILER_VERSION_GNU unknown gcc major
 BROKEN_armv6=		fails to configure: _AX_COMPILER_VERSION_GNU unknown gcc major
 BROKEN_armv7=		fails to configure: _AX_COMPILER_VERSION_GNU unknown gcc major
 BROKEN_i386=		fails to configure: _AX_COMPILER_VERSION_GNU unknown gcc major
 
 USES=		autoreconf cpe dos2unix gmake libtool pkgconfig
 USE_GCC=	yes
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-experimental
 CPE_VERSION=	${DISTVERSION:C/-.*//}
 CPE_UPDATE=	${DISTVERSION:C/^[^-]*$//:C/.*-//}
 DOS2UNIX_FILES=	src/aircrack-osdep/byteorder.h
 INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE=	GCRYPT HWLOC PCRE SQLITE
 OPTIONS_DEFAULT=	HWLOC PCRE SQLITE
 OPTIONS_SUB=	yes
 
 GCRYPT_LIB_DEPENDS=	libgcrypt.so:security/libgcrypt \
 			libgpg-error.so:security/libgpg-error
 GCRYPT_CONFIGURE_ON=	--with-gcrypt
 GCRYPT_USES_OFF=	ssl
 GCRYPT_VARS_OFF=	CFLAGS+=-I${OPENSSLINC} LDFLAGS+=-L${OPENSSLLIB}
 
 HWLOC_DESC=	Use Hardware Locality to improve performance
 HWLOC_LIB_DEPENDS=	libhwloc.so:devel/hwloc2
 HWLOC_CONFIGURE_OFF=	--disable-hwloc
 
 PCRE_DESC=	Use Perl Compatible Regular Expressions for wesside
 PCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
 PCRE_CONFIGURE_OFF=	--disable-pcre
 
 SQLITE_DESC=	Use SQLite for storing pre-computed key tables
 SQLITE_USES=	sqlite
 SQLITE_CONFIGURE_OFF=	--without-sqlite3
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH:Mpowerpc*}
 PLIST_SUB+=	PPC="" \
 		X86="@comment "
 .elif ${ARCH} == amd64 || ${ARCH} == i386
 PLIST_SUB+=	PPC="@comment " \
 		X86=""
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,/usr/local/etc/aircrack-ng,${ETCDIR},' \
 		${WRKSRC}/scripts/airodump-ng-oui-update
 
 post-install:
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 
 .include <bsd.port.post.mk>
diff --git a/net-mgmt/chillispot/Makefile b/net-mgmt/chillispot/Makefile
index dbd9dcbcd392..0812bccd58dd 100644
--- a/net-mgmt/chillispot/Makefile
+++ b/net-mgmt/chillispot/Makefile
@@ -1,43 +1,43 @@
 PORTNAME=	chillispot
 PORTVERSION=	1.0
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://www.chillispot.info/download/ \
 		http://www.geeklan.co.uk/files/ \
 		http://www.venture37.com/files/
 
 MAINTAINER=	venture37@geeklan.co.uk
 COMMENT=	Wireless LAN Access Point Controller
 WWW=		http://www.chillispot.info
 
 CONFLICTS=	coovachilli
 
 USES=		compiler:nestedfct shebangfix
 SHEBANG_FILES=	doc/hotspotlogin.cgi
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=-sysconfdir=${PREFIX}/etc
 USE_RC_SUBR=	chillispot
 SUB_FILES=	pkg-message installguide.txt
 
 OPTIONS_DEFINE=		APACHE RADIUS
 OPTIONS_SINGLE=		RADIUS
 OPTIONS_SINGLE_RADIUS=	FREERADIUS OPENRADIUS
 
 FREERADIUS_DESC=depend on FreeRADIUS
 OPENRADIUS_DESC=depend on OpenRADIUS
 
 APACHE_USES=	apache:run
 FREERADIUS_RUN_DEPENDS=	radiusd:net/freeradius
 OPENRADIUS_RUN_DEPENDS=	radiusd:net/openradius
 
 post-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/chilli.conf ${STAGEDIR}${DATADIR}/chilli.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/doc/dictionary.chillispot ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/freeradius.users ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/hotspotlogin.cgi ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKDIR}/installguide.txt ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${FILESDIR}/pf.conf.sample ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${FILESDIR}/ipfw-config.sample ${STAGEDIR}${DATADIR}
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/ipv6mon/Makefile b/net-mgmt/ipv6mon/Makefile
index 93f29be1084d..d6ae478ad6c6 100644
--- a/net-mgmt/ipv6mon/Makefile
+++ b/net-mgmt/ipv6mon/Makefile
@@ -1,47 +1,47 @@
 PORTNAME=	ipv6mon
 PORTVERSION=	1.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net-mgmt
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Tool for monitoring IPv6 address usage
 WWW=		https://www.si6networks.com/tools/ipv6mon/
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE.TXT
 
 USES=		uidfix
 GH_ACCOUNT=	fgont
 GH_PROJECT=	ipv6mon
 GH_TAGNAME=	454292a393ddd79db7131b6e7a8d005a7f49bd92
 USE_GCC=	yes
 USE_GITHUB=	nodefault
 CFLAGS+=	-DIPV6MON_CONF=\\\"${PREFIX}/etc/ipv6mon.conf\\\"
 USERS=		${PORTNAME}
 GROUPS=		${PORTNAME}
 USE_RC_SUBR=	${PORTNAME}
 
 PORTDOCS=	README.TXT \
 		ipv6mon-installation-notes.odt \
 		ipv6mon-installation-notes.pdf \
 		ipv6mon-manual.odt \
 		ipv6mon-manual.pdf
 WRKSRC=		${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME}
 
 OPTIONS_DEFINE=	DOCS
 
 post-extract:
 	${INSTALL_DATA} ${FILESDIR}/Makefile ${WRKSRC}
 	${INSTALL_DATA} ${WRKSRC}/manuals/* ${WRKSRC}
 	@${REINPLACE_CMD} 's|/etc/|${PREFIX}/etc/|'\
 		${WRKSRC}/ipv6mon.8 ${WRKSRC}/ipv6mon.conf.5
 
 post-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/etc/rc.d
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && \
 		${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/metronome/Makefile b/net-mgmt/metronome/Makefile
index 9e7d26584621..54937acb86f6 100644
--- a/net-mgmt/metronome/Makefile
+++ b/net-mgmt/metronome/Makefile
@@ -1,32 +1,32 @@
 PORTNAME=	metronome
 DISTVERSION=	0.9.0
-PORTREVISION=	15
+PORTREVISION=	16
 CATEGORIES=	net-mgmt dns
 
 MAINTAINER=	krion@FreeBSD.org
 COMMENT=	Client-side java script to render graphs w/o depending on graphite
 WWW=		https://github.com/ahupowerdns/metronome
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libboost_thread.so:devel/boost-libs
 
 USES=		autoreconf:build compiler:c++11-lang eigen:3 libtool:build \
 		pathfix pkgconfig
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	ahupowerdns
 
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib
 USE_LDCONFIG=	yes
 SUB_FILES=	pkg-message
 INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE=	DOCS
 
 pre-configure:
 	(cd ${WRKSRC}; ./bootstrap )
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/netbox/Makefile b/net-mgmt/netbox/Makefile
index d68e25e939f5..ac7c8fa007b9 100644
--- a/net-mgmt/netbox/Makefile
+++ b/net-mgmt/netbox/Makefile
@@ -1,95 +1,96 @@
 PORTNAME=	netbox
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.4.8
+PORTREVISION=	1
 CATEGORIES=	net-mgmt python
 
 MAINTAINER=	kai@FreeBSD.org
 COMMENT=	IP address management tool
 WWW=		https://github.com/netbox-community/netbox
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 # NetBox has fixed Python package dependencies listed in "requirements.txt"
 # which are not checked during build/runtime because they're usually installed
 # via devel/py-pip.
 #
 # As a rule, slight deviations are usually not a problem, but there are a few
 # Django packages that are known for regressions in conjunction with NetBox and
 # should therefore only be updated with caution.
 #
 # - devel/py-dj41-django-rq
 # - www/py-dj41-django-filter
 # - www/py-dj41-django-tables2
 # - www/py-dj41-djangorestframework (in conjunction with www/py-dj41-drf-yasg)
 #
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django41>=4.1.7<4.2:www/py-django41@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dj41-django-cors-headers>=3.14.0<4:www/py-dj41-django-cors-headers@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dj41-django-debug-toolbar>=3.7.0<5:www/py-dj41-django-debug-toolbar@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dj41-django-filter>=23.1<24:www/py-dj41-django-filter@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dj41-django-graphiql-debug-toolbar>=0.2.0<1:www/py-dj41-django-graphiql-debug-toolbar@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dj41-django-mptt>=0.14.0<0.15:www/py-dj41-django-mptt@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dj41-django-prometheus>=2.2.0<2.3:www/py-dj41-django-prometheus@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dj41-django-redis>=5.2.0<6:www/py-dj41-django-redis@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dj41-django-rich>=1.5.0<2:www/py-dj41-django-rich@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dj41-django-rq>=2.7.0<2.8:devel/py-dj41-django-rq@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dj41-django-tables2>=2.5.3<2.6:www/py-dj41-django-tables2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dj41-django-taggit>=3.1.0<4:www/py-dj41-django-taggit@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dj41-django-timezone-field>=5.0<6:www/py-dj41-django-timezone-field@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dj41-djangorestframework>=3.14.0<3.15.0:www/py-dj41-djangorestframework@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dj41-drf-yasg>=1.21.5<1.22:www/py-dj41-drf-yasg@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dj41-graphene-django>=3.0.0<4:devel/py-dj41-graphene-django@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}django-pglocks>=1.0.4<1.1:www/py-django-pglocks@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}bleach>=5.0.1<6:www/py-bleach@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=3.1.2<4:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}markdown>=3.3.7<3.4:textproc/py-markdown@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}markdown-include>=0.7.0<1:textproc/py-markdown-include@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mkdocs-material>=9.1.4<10:textproc/py-mkdocs-material@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mkdocstrings>=0.17.0<1:textproc/py-mkdocstrings@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}netaddr>=0.8.0<1:net/py-netaddr@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pillow>=9.4.0:graphics/py-pillow@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psycopg2>=2.9.5<3:databases/py-psycopg2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sentry-sdk>=1.5.12<2:devel/py-sentry-sdk@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}social-auth-app-django>=5.0.0<6:www/py-social-auth-app-django@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}social-auth-core>=4.3.0<5:security/py-social-auth-core@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}svgwrite>=1.4.3<2:graphics/py-svgwrite@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tablib>=3.3.0<4:textproc/py-tablib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tzdata>=2023.2:devel/py-tzdata@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>=6.0<7:devel/py-yaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}gunicorn>=20.1.0<21:www/py-gunicorn@${PY_FLAVOR}
 
 USES=		cpe pgsql:11+ python:3.8+
 CPE_VENDOR=	netbox_project
 USE_GITHUB=	yes
 GH_ACCOUNT=	netbox-community
 
 SUB_FILES=	850.netbox-housekeeping.sample netbox_rq.sample netboxrc.sample pkg-message
 SUB_LIST=	DATADIR=${DATADIR} PYTHON_CMD=${PYTHON_CMD} PYTHON_VER=${PYTHON_VER} WWWOWN=${WWWOWN}
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=	EXAMPLES
 
 do-install:
 	cd ${WRKSRC}/netbox ; \
 	for src in $$( ${FIND} . ! -name '*.bak' ) ; do \
 		dst=${STAGEDIR}${DATADIR}$${src#.} ; \
 		if ${TEST} -d "$$src" ; then \
 			${MKDIR} "$$dst" ; \
 		else \
 			${INSTALL_DATA} "$$src" "$$dst" ; \
 		fi \
 	done
 	cd ${WRKSRC} && ${COPYTREE_SHARE} docs ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/mkdocs.yml ${STAGEDIR}${DATADIR}
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKDIR}/850.netbox-housekeeping.sample ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKDIR}/netbox_rq.sample ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKDIR}/netboxrc.sample ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/contrib/apache.conf ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/contrib/gunicorn.py ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/contrib/nginx.conf ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/net-p2p/bazarr/Makefile b/net-p2p/bazarr/Makefile
index 37d5915c0762..29cf3ce648c9 100644
--- a/net-p2p/bazarr/Makefile
+++ b/net-p2p/bazarr/Makefile
@@ -1,47 +1,48 @@
 PORTNAME=	bazarr
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.2.0
+PORTREVISION=	1
 CATEGORIES=	net-p2p python
 MASTER_SITES=	https://github.com/morpheus65535/bazarr/releases/download/${DISTVERSIONPREFIX}${DISTVERSION}/
 DISTNAME=	bazarr
 DIST_SUBDIR=	${PORTNAME}/${DISTVERSION}
 
 MAINTAINER=	michiel@vanbaak.eu
 COMMENT=	Automatic subtitle downloader for Radarr and Sonarr
 
 LICENSE=	GPLv3
 
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}lxml>=4.3.0:devel/py-lxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}webrtcvad>=2.0.10:audio/py-webrtcvad@${PY_FLAVOR} \
 		ffprobe:multimedia/ffmpeg \
 		unrar:archivers/unrar
 
 USES=		python:3.7+ zip
 
 USE_RC_SUBR=	bazarr
 
 SUB_FILES=	${PORTNAME} package_info
 SUB_LIST=	MAINTAINER=${MAINTAINER} \
 		PKGVERSION=${PKGVERSION} \
 		PYTHON_CMD=${PYTHON_CMD} \
 		USERS=${USERS}
 
 NO_WRKSUBDIR=	yes
 
 USERS=		bazarr
 GROUPS=		bazarr
 
 do-build:
 	@${PYTHON_CMD} -m compileall ${WRKSRC}
 	@${PYTHON_CMD} -O -m compileall ${WRKSRC}
 
 do-install:
 	${INSTALL} -d -m 755 ${STAGEDIR}/${DATADIR}/bin/
 	cd ${WRKSRC} && ${COPYTREE_SHARE} \* ${STAGEDIR}/${DATADIR}/bin/
 
 post-install:
 	${INSTALL_DATA} ${WRKDIR}/package_info ${STAGEDIR}/${DATADIR}/
 
 .include <bsd.port.mk>
diff --git a/net-p2p/cpuminer/Makefile b/net-p2p/cpuminer/Makefile
index e7f3116ead4b..1aae76f8354e 100644
--- a/net-p2p/cpuminer/Makefile
+++ b/net-p2p/cpuminer/Makefile
@@ -1,38 +1,39 @@
 PORTNAME=	cpuminer
 PORTVERSION=	2.5.1
+PORTREVISION=	1
 CATEGORIES=	net-p2p math
 MASTER_SITES=	SF/cpuminer
 DISTNAME=	pooler-${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	mm@FreeBSD.org
 COMMENT=	CPU miner for Litecoin and Bitcoin
 WWW=		https://sourceforge.net/projects/cpuminer/
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libjansson.so:devel/jansson
 
 OPTIONS_DEFINE=	GCC DOCS
 OPTIONS_DEFAULT=GCC
 
 USES=		autoreconf cpe
 GNU_CONFIGURE=	yes
 CPE_VENDOR=	cpuminer_project
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 PLIST_FILES=	bin/minerd man/man1/minerd.1.gz
 PORTDOCS=	NEWS README
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MGCC}
 # gcc yields higher hashrates on newer CPUs
 USE_GCC?=	yes
 .endif
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/net-p2p/deluge/Makefile b/net-p2p/deluge/Makefile
index 3f47db71c10d..6120e8374194 100644
--- a/net-p2p/deluge/Makefile
+++ b/net-p2p/deluge/Makefile
@@ -1,21 +1,21 @@
 PORTNAME=	deluge
 PORTVERSION=	2.0.3
-PORTREVISION=	3
+PORTREVISION=	4
 PORTEPOCH=	2
 CATEGORIES=	net-p2p python
 
 MAINTAINER=	rm@FreeBSD.org
 COMMENT=	Bittorrent client using Python, GTK3, and libtorrent-rasterbar
 WWW=		https://deluge-torrent.org/
 
 LICENSE=	GPLv3
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>=0.83:devel/py-dbus@${PY_FLAVOR} \
 		${PYGAME} \
 		xdg-utils>=1.0.2:devel/xdg-utils \
 		deluge:net-p2p/deluge-cli
 
 USES=		gnome metaport python:3.5+
 USE_GNOME=	gtk30 librsvg2 pygobject3
 
 .include <bsd.port.mk>
diff --git a/net/R-cran-pingr/Makefile b/net/R-cran-pingr/Makefile
index 75ffbbf7985b..2c37f7c71ba1 100644
--- a/net/R-cran-pingr/Makefile
+++ b/net/R-cran-pingr/Makefile
@@ -1,19 +1,20 @@
 PORTNAME=	pingr
 DISTVERSION=	2.0.2
+PORTREVISION=	1
 CATEGORIES=	net
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	ygy@FreeBSD.org
 COMMENT=	Check if a Remote Computer is Up
 WWW=		https://github.com/r-lib/pingr#readme
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	R-cran-processx>0:sysutils/R-cran-processx
 TEST_DEPENDS=	R-cran-covr>0:devel/R-cran-covr \
 		R-cran-testthat>0:devel/R-cran-testthat
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/net/R-cran-twitteR/Makefile b/net/R-cran-twitteR/Makefile
index 76f4662b86fc..5db3e01e0f5d 100644
--- a/net/R-cran-twitteR/Makefile
+++ b/net/R-cran-twitteR/Makefile
@@ -1,20 +1,20 @@
 PORTNAME=	twitteR
 PORTVERSION=	1.1.9
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	R based Twitter client
 WWW=		https://cran.r-project.org/web/packages/twitteR/
 
 LICENSE=	ART20
 
 RUN_DEPENDS=	R-cran-bit64>0:devel/R-cran-bit64 \
 		R-cran-rjson>0:converters/R-cran-rjson \
 		R-cran-DBI>=0.3.1:databases/R-cran-DBI \
 		R-cran-httr>=1.0.0:www/R-cran-httr
 
 USES=	cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/net/aluminum/Makefile b/net/aluminum/Makefile
index e48cedae0af4..72ecf1921e6f 100644
--- a/net/aluminum/Makefile
+++ b/net/aluminum/Makefile
@@ -1,30 +1,31 @@
 PORTNAME=	Aluminum
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.3.0
+PORTREVISION=	1
 CATEGORIES=	net
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Generic interface to high-performance communication libraries
 WWW=		https://github.com/LLNL/Aluminum
 
 LICENSE=	APACHE20
 
 LIB_DEPENDS=	libhwloc.so:devel/hwloc2
 TEST_DEPENDS=	cxxopts>0:devel/cxxopts
 
 USES=		cmake:testing compiler:c++17-lang mpi:openmpi
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	LLNL
 
 CMAKE_TESTING_ON=	ALUMINUM_ENABLE_TESTS # tests crash, see https://github.com/LLNL/Aluminum/issues/179
 
 LDFLAGS+=	-lexecinfo
 
 post-test:
 .for t in test_exchange test_ops; do
 	@cd ${TEST_WRKSRC}/test && ./${t}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/net/charm/Makefile b/net/charm/Makefile
index 4d80238f3da6..15673f32e9fe 100644
--- a/net/charm/Makefile
+++ b/net/charm/Makefile
@@ -1,71 +1,71 @@
 PORTNAME=	charm
 DISTVERSION=	6.8.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net
 MASTER_SITES=	http://charm.cs.illinois.edu/distrib/
 PKGNAMESUFFIX=	-uiuc
 DIST_SUBDIR=	${PORTNAME}${PKGNAMESUFFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Message-passing parallel language and runtime system
 WWW=		https://www.ks.uiuc.edu/Research/namd/
 
 LICENSE=	CHARMPP_CONVERSE_LICENSE
 LICENSE_NAME=	Charm++/Converse License
 LICENSE_FILE=	${WRKSRC}/LICENSE
 LICENSE_PERMS=	none # No redistribution is allowed, no commercial use: commercial use requires a commercial license
 
 ONLY_FOR_ARCHS=	amd64 i386 powerpc powerpc64 powerpc64le
 ONLY_FOR_ARCHS_REASON=	not clear if it can be built on other architectures
 
 FETCH_DEPENDS=	git:devel/git
 BUILD_DEPENDS=	bash:shells/bash
 
 USES=		fortran gmake localbase:ldflags shebangfix
 SHEBANG_GLOB=	*.sh
 SHEBANG_FILES=	src/scripts/*
 USE_LDCONFIG=	yes
 
 #ARCH_STR=	linux${ARCH:S/amd64/64/:S/i386/32/:C/powerpc.*/ppc/}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-v${DISTVERSION}
 INSTALL_WRKSRC=	${WRKSRC}/${VERSION}-${ARCH_STR}-gfortran-clang/tmp
 
 BINARY_ALIAS=	gfortran=gfortran${GCC_DEFAULT}
 
 OPTIONS_SINGLE=		MULTIPROCESSING
 OPTIONS_SINGLE_MULTIPROCESSING=	MULTICORE ETHERNET MPI
 OPTIONS_DEFAULT=	MULTICORE
 MULTIPROCESSING_DESC=	Multiprocessing
 OPTIONS_SUB=		yes
 
 MULTICORE_DESC=		Single-node multicore version
 MULTICORE_VARS=		VERSION=multicore ARCH_STR=linux${ARCH:S/amd64/64/:S/i386/32/:C/powerpc.*/-ppc/}
 
 ETHERNET_DESC=		Ethernet version
 ETHERNET_VARS=		VERSION=netlrts ARCH_STR=linux${ARCH:S/amd64/-x86_64/:S/i386//:C/powerpc.*/-ppc/}
 
 MPI_VARS=		VERSION=mpi ARCH_STR=linux${ARCH:S/amd64/-x86_64/:S/i386//:C/powerpc.*/-ppc/}
 MPI_LDFLAGS=		-lmpich
 MPI_LIB_DEPENDS=	libmpich.so:net/mpich
 
 post-patch:
 	@${REINPLACE_CMD} 's|which gfortran |which gfortran${GCC_DEFAULT} |' ${WRKSRC}/src/arch/common/conv-mach-gfortran.sh
 	@${FIND} ${WRKSRC} -name conv-mach.h | ${XARGS} ${REINPLACE_CMD} 's|CMK_THREADS_ARE_WIN32_FIBERS *1|CMK_THREADS_ARE_WIN32_FIBERS 0|'
 	@${FIND} ${WRKSRC} -name "*.c" -o -name "*.C" -o -name "*.h" -o -name "configure" | \
 		${XARGS} ${REINPLACE_CMD} -i '' 's|include <malloc\.h>|include <stdlib.h>|; s|include "malloc\.h"|include <stdlib.h>|'
 	@${REINPLACE_CMD} -E 's|(CMK_CC)="(.*)"|\1="\2 ${CFLAGS} "|' ${WRKSRC}/src/arch/common/cc-clang.sh
 	@${REINPLACE_CMD} -E 's|(CMK_CXX)="(.*)"|\1="\2 ${CXXFLAGS} "|' ${WRKSRC}/src/arch/common/cc-clang.sh
 	@${REINPLACE_CMD} -E 's|(CMK_LD)="(.*)"|\1="\2 ${LDFLAGS} "|' ${WRKSRC}/src/arch/common/cc-clang.sh
 	@${REINPLACE_CMD} -E 's|-shared -o libqt\.so|-shared -o libqt.so -Wl,-soname,libqt.so|' ${WRKSRC}/src/QuickThreads/mkfiles/*
 
 do-build:
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./build charm++ ${VERSION}-${ARCH_STR} clang gfortran --build-shared -j${MAKE_JOBS_NUMBER} ${CFLAGS}
 
 post-install:
 .for d in bin include lib
 	@cd ${STAGEDIR} && ${MV} ${d}/* ./${PREFIX}/${d} && ${RMDIR} $d
 .endfor
 	@cd ${STAGEDIR} && ${MV} lib_so/* ./${PREFIX}/lib && ${RMDIR} lib_so
 
 .include <bsd.port.mk>
diff --git a/net/corosync3/Makefile b/net/corosync3/Makefile
index c677d1340cfc..84000e7ae2a1 100644
--- a/net/corosync3/Makefile
+++ b/net/corosync3/Makefile
@@ -1,13 +1,13 @@
 PORTVERSION=		2.99.5
-PORTREVISION=		1
+PORTREVISION=		2
 PKGNAMESUFFIX=		3
 
 WWW=		https://corosync.github.io/corosync/
 
 .include "${.CURDIR}/../corosync2/Makefile.common"
 
 LIB_DEPENDS+=		libknet.so:devel/kronosnet
 
 CONFLICTS=		corosync2
 
 .include <bsd.port.mk>
diff --git a/net/ecal/Makefile b/net/ecal/Makefile
index d4ce6a79c089..763efb84464e 100644
--- a/net/ecal/Makefile
+++ b/net/ecal/Makefile
@@ -1,60 +1,61 @@
 PORTNAME=	ecal
 DISTVERSIONPREFIX=	v
 DISTVERSION=	5.11.4
+PORTREVISION=	1
 CATEGORIES=	net devel
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Enhanced Communication Abstraction Layer
 WWW=		https://eclipse-ecal.github.io/ecal/index.html
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BUILD_DEPENDS=	asio>0:net/asio \
 		termcolor>0:devel/termcolor
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libfmt.so:devel/libfmt \
 		libfineftp-server.so:ftp/fineftp-server \
 		libftxui-component.so:devel/ftxui \
 		libhdf5.so:science/hdf5 \
 		libprotobuf.so:devel/protobuf \
 		libqwt6.so:x11-toolkits/qwt6 \
 		libspdlog.so:devel/spdlog \
 		libtinyxml2.so:textproc/tinyxml2 \
 		libyaml-cpp.so:devel/yaml-cpp
 		# binaries aren't linked with libfineftp-server.so, see https://github.com/continental/ecal/issues/381; same with libcurl.so
 
 USES=		cmake desktop-file-utils localbase:ldflags qt:5 shared-mime-info
 USE_QT=		core gui widgets buildtools:build qmake:build
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	eclipse-ecal
 GH_TUPLE=	eclipse-ecal:tcp_pubsub:f59da78:tcp_pubsub/thirdparty/tcp_pubsub \
 		brofield:simpleini:9b3ed7e:simpleini/thirdparty/simpleini \
 		steinwurf:recycle:c542570:recycle/thirdparty/recycle \
 		xguerin:tclap:349170a:tclap/thirdparty/tclap
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 CMAKE_OFF=	BUILD_SAMPLES \
 		ECAL_THIRDPARTY_BUILD_SPDLOG ECAL_THIRDPARTY_BUILD_TINYXML2 ECAL_THIRDPARTY_BUILD_FINEFTP ECAL_THIRDPARTY_BUILD_TERMCOLOR \
 		ECAL_THIRDPARTY_BUILD_FTXUI ECAL_THIRDPARTY_BUILD_GTEST ECAL_THIRDPARTY_BUILD_PROTOBUF \
 		ECAL_THIRDPARTY_BUILD_CURL ECAL_THIRDPARTY_BUILD_HDF5 ECAL_THIRDPARTY_BUILD_YAML-CPP ECAL_THIRDPARTY_BUILD_UDPCAP \
 		CPACK_PACK_WITH_INNOSETUP
 CMAKE_ARGS=	-DGIT_REVISION_MAJOR=${DISTVERSION:R:R} \
 		-DGIT_REVISION_MINOR=${DISTVERSION:R:E} \
 		-DGIT_REVISION_PATCH=${DISTVERSION:E} \
 		-Dasio_INCLUDE_DIR=${LOCALBASE}/include \
 		-Dqwt_INCLUDE_DIR=${LOCALBASE}/include/qt5/qwt6 \
 		-Dqwt_LIBRARY=${LOCALBASE}/lib/qt5/libqwt6.so
 
 CXXFLAGS+=	-pthread # see https://github.com/eclipse-ecal/ecal/issues/933
 
 PLIST_SUB=	VERSION=${DISTVERSION}
 
 CONFLICTS_BUILD=	tclap simpleini # epub isn't compatible with tclap-1.4rc1, epub isn't compatible with simpleini, because some header isn't installed
 
 post-install: # not sure why isn't this installed automatically
 	${INSTALL_LIB} ${BUILD_WRKSRC}/lib/libsys_core.so ${STAGEDIR}${PREFIX}/lib
 
 .include <bsd.port.mk>
diff --git a/net/ipxe/Makefile b/net/ipxe/Makefile
index cae55f603e4f..10756be8c1b6 100644
--- a/net/ipxe/Makefile
+++ b/net/ipxe/Makefile
@@ -1,138 +1,139 @@
 PORTNAME=	ipxe
 DISTVERSION=	g20230211
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	net
 
 MAINTAINER=	egypcio@FreeBSD.org
 COMMENT=	Open source network boot firmware
 WWW=		https://ipxe.org
 
 LICENSE=	GPLv2
 
 ONLY_FOR_ARCHS=	amd64 i386
 ONLY_FOR_ARCHS_REASON=	not yet ported to anything other than amd64/i386
 
 BUILD_DEPENDS=	bash:shells/bash \
 		syslinux:sysutils/syslinux
 
 USES=		gmake perl5 shebangfix
 USE_BINUTILS=	yes
 USE_GCC=	yes:build
 USE_GITHUB=	yes
 GH_TAGNAME=	3c83843e111ece30
 USE_PERL5=	build
 MAKE_ARGS=	AR=${AR} \
 		ARCH=${ARCH:S/amd64/i386/} \
 		AS=${AS} \
 		CC=${CC} \
 		HOST_CC=${CC} \
 		LD=${LD} \
 		NM=${NM} \
 		NO_WERROR=1 \
 		OBJCOPY=${OBJCOPY} \
 		OBJDUMP=${OBJDUMP} \
 		PERL=${PERL} \
 		RANLIB=${RANLIB} \
 		SIZE=${SIZE} \
 		V=1
 
 # Append user-settable build args from make.conf
 MAKE_ARGS+=	${IPXE_MAKE_ARGS}
 ALL_TARGET=	bin/ipxe.dsk bin/ipxe.lkrn bin/ipxe.pxe bin/ipxe.usb \
 		bin/undionly.kpxe
 # VMware ROMs
 ALL_TARGET+=	bin/8086100f.mrom bin/808610d3.mrom bin/10222000.rom \
 		bin/15ad07b0.rom
 SUB_FILES=	pkg-message
 WRKSRC_SUBDIR=	src
 PLIST_FILES=	${ALL_TARGET:S@^bin/@${DATADIR}/@}
 
 # Possible options are listed in ${WRKSRC}/config/*.h and
 # http://ipxe.org/buildcfg.  Add a ! prefix to an option to undef it
 # i.e. turn it off.
 _IPXE_BUILDCFG=	branding:PRODUCT_NAME="${PKGNAME} (${OPSYS} ${OSREL}/${ARCH})" \
 		console:CONSOLE_SERIAL \
 		console:KEYBOARD_MAP=us \
 		general:!DOWNLOAD_PROTO_FTP \
 		general:DOWNLOAD_PROTO_HTTPS \
 		general:DOWNLOAD_PROTO_NFS \
 		general:IMAGE_TRUST_CMD \
 		general:NET_PROTO_IPV6 \
 		general:PING_CMD \
 		general:POWEROFF_CMD
 
 OPTIONS_DEFINE=		EFI ISO
 OPTIONS_DEFAULT=	EFI ISO
 
 EFI_DESC=	Create EFI images
 ISO_DESC=	Create bootable CD image
 
 EFI_BUILD_DEPENDS=	mformat:emulators/mtools
 _EFI_ARCHS=		${ARCH:Mamd64:S/amd64/x86_64/} i386
 _EFI_TARGETS=		ipxe snp snponly
 .for _arch in ${_EFI_ARCHS}
 . for _target in ${_EFI_TARGETS}
 EFI_PLIST_FILES+=	${DATADIR}/${_target}.efi-${_arch}
 . endfor
 EFI_PLIST_FILES+=	${DATADIR}/ipxe.efi-${_arch}.usb
 .endfor
 
 ISO_BUILD_DEPENDS=	mkisofs:sysutils/cdrtools
 ISO_MAKE_ARGS=		ISOLINUX_BIN="${WRKSRC}/isolinux.bin" \
 			LDLINUX_C32="${LOCALBASE}/share/syslinux/bios/com32/elflink/ldlinux/ldlinux.c32"
 ISO_ALL_TARGET=		bin/ipxe.iso
 
 PORTSCOUT=	skipv:1.21.1,v1.21.1
 
 .include <bsd.port.pre.mk>
 
 # Add user supplied build configuration after port options etc have
 # been processed as they might want to overwrite some settings.
 _IPXE_BUILDCFG+=	${IPXE_BUILDCFG}
 
 # XXX: iPXE uses csplit when embedding certificates and assumes
 # it's GNU csplit, so give it what it wants as a workaround if
 # CERT=... is in {IPXE_,}MAKE_ARGS.
 .if ${MAKE_ARGS:MCERT=*}
 BUILD_DEPENDS+=	gcsplit:sysutils/coreutils
 MAKE_ARGS+=	CSPLIT=gcsplit
 .endif
 
 # https://github.com/ipxe/ipxe/pull/794
 post-patch:
 	${REINPLACE_CMD} "s|VERSION_MINOR.*0|VERSION_MINOR=21|; s|VERSION_PATCH.*0|VERSION_PATCH=1|" \
 		${WRKSRC}/Makefile
 
 do-configure:
 .for _cat _opt in ${_IPXE_BUILDCFG:C/\:/ /}
 	@${ECHO_CMD} '#undef ${_opt:S/^!//:C/(.*)=(.*)/\1/}' >> ${WRKSRC}/config/local/${_cat}.h
 .if ${_opt:N!*}
 	@${ECHO_CMD} '#define ${_opt:C/=/ /:S/^'//:S/'$//}' >> ${WRKSRC}/config/local/${_cat}.h
 .endif
 .endfor
 
 pre-build-ISO-on:
 # ISO creation fails if isolinux.bin is read only
 	${INSTALL} -m 644 ${LOCALBASE}/share/syslinux/bios/core/isolinux.bin ${WRKSRC}/isolinux.bin
 
 do-build-EFI-on:
 .for _arch in ${_EFI_ARCHS}
 	${DO_MAKE_BUILD} ARCH=${_arch} -C ${WRKSRC} ${_EFI_TARGETS:@.target.@bin-${_arch}-efi/${.target.}.efi@} \
 		bin-${_arch}-efi/ipxe.usb
 .endfor
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${ALL_TARGET} ${STAGEDIR}${DATADIR}
 
 do-install-EFI-on:
 .for _arch in ${_EFI_ARCHS}
 . for _target in ${_EFI_TARGETS}
 	${INSTALL_DATA} ${WRKSRC}/bin-${_arch}-efi/${_target}.efi \
 		${STAGEDIR}${DATADIR}/${_target}.efi-${_arch}
 . endfor
 	${INSTALL_DATA} ${WRKSRC}/bin-${_arch}-efi/ipxe.usb \
 		${STAGEDIR}${DATADIR}/ipxe.efi-${_arch}.usb
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/net/l2tpd/Makefile b/net/l2tpd/Makefile
index 3df829361176..170599154d43 100644
--- a/net/l2tpd/Makefile
+++ b/net/l2tpd/Makefile
@@ -1,37 +1,37 @@
 PORTNAME=	l2tpd
 PORTVERSION=	0.69
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	net
 MASTER_SITES=	SF/${PORTNAME}/L2TPd/${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Implementation of the layer two tunneling protocol
 
 BROKEN_armv6=	fails to link: undefined reference to check_control
 BROKEN_armv7=	fails to link: undefined reference to check_control
 
 USES=		compiler:nestedfct cpe
 CFLAGS+=	-fcommon
 
 PORTDOCS=	README
 ETCDIR=		${PREFIX}/etc/l2tp
 
 OPTIONS_DEFINE=	DOCS
 
 do-configure:
 	${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/doc/l2tpd.8 \
 		${WRKSRC}/doc/l2tpd.conf.sample ${WRKSRC}/doc/l2tp-secrets.5 \
 		${WRKSRC}/doc/l2tpd.conf.5
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/l2tpd ${STAGEDIR}${PREFIX}/bin
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_MAN} ${WRKSRC}/doc/l2tpd.8 ${STAGEDIR}${PREFIX}/man/man8
 	${INSTALL_MAN} ${WRKSRC}/doc/l2tp-secrets.5 ${STAGEDIR}${PREFIX}/man/man5
 	${INSTALL_MAN} ${WRKSRC}/doc/l2tpd.conf.5 ${STAGEDIR}${PREFIX}/man/man5
 	@${MKDIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/l2tpd.conf.sample ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/l2tp-secrets.sample ${STAGEDIR}${ETCDIR}
 
 .include <bsd.port.mk>
diff --git a/net/libtnl/Makefile b/net/libtnl/Makefile
index 77bb25907b25..e3fcc4d54a62 100644
--- a/net/libtnl/Makefile
+++ b/net/libtnl/Makefile
@@ -1,37 +1,37 @@
 PORTNAME=	libtnl
 PORTVERSION=	1.5.0
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	net devel
 MASTER_SITES=	SF/opentnl/TNL%20Source/${PORTVERSION}
 DISTNAME=	tnl-${PORTVERSION}-source
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Robust, secure, easy to use cross-platform C++ networking API
 WWW=		https://sourceforge.net/projects/opentnl/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/../LICENSE.txt
 
 USES=		uidfix
 USE_GCC=	yes
 WRKSRC=		${WRKDIR}/tnl/tnl
 USE_LDCONFIG=	yes
 MAKEFILE=	${FILESDIR}/Makefile.bsd
 # Other arches can be added easily, provided there is hardware to test:
 ONLY_FOR_ARCHS=	i386 amd64 powerpc powerpc64 powerpc64le
 .if defined(NO_PROFILE) || defined(NOPROFILE)
 PLIST_SUB+=	PROFILE='@comment '
 .else
 PLIST_SUB+=	PROFILE=''
 .endif
 
 # When security/libtomcrypt is fixed to provide a shared version, we'll
 # stop extracting our own and will LIB_DEPEND on theirs instead:
 #LIB_DEPENDS=	tomcrypt:security/libtomcrypt
 #
 #EXTRACT_AFTER_ARGS=|${TAR} -xpf - --exclude tnl/libtomcrypt
 
 pre-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/include/tnl
 
 .include <bsd.port.mk>
diff --git a/net/mpich/Makefile b/net/mpich/Makefile
index 5ea3cb59a771..db5167c7b4f9 100644
--- a/net/mpich/Makefile
+++ b/net/mpich/Makefile
@@ -1,107 +1,107 @@
 PORTNAME=	mpich
 PORTVERSION=	3.4.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net parallel
 MASTER_SITES=	https://www.mpich.org/static/downloads/${DISTVERSION}/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Portable implementation of MPI-1, MPI-2 and MPI-3
 WWW=		https://www.mpich.org/
 
 LICENSE=	MPICH
 LICENSE_NAME=	MPICH
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 # Unfortunately mpicc is BROKEN with sh (Bad substitution on arrays)
 BUILD_DEPENDS=	bash:shells/bash
 LIB_DEPENDS=	libhwloc.so:devel/hwloc2	\
 		libjson-c.so:devel/json-c	\
 		libfabric.so:net/libfabric	\
 		libslurm.so:sysutils/slurm-wlm	\
 		libepoll-shim.so:devel/libepoll-shim
 RUN_DEPENDS=	bash:shells/bash
 
 CONFLICTS=	mpd mpich2
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 USES=		compiler:c11 libtool perl5 pkgconfig
 USE_LDCONFIG=	yes
 TEST_TARGET=	check
 
 OPTIONS_DEFINE=		DOCS FORTRAN L0
 OPTIONS_GROUP=		PM
 OPTIONS_GROUP_PM=	GFORKER HYDRA
 OPTIONS_RADIO=		DEFAULTPM
 OPTIONS_RADIO_DEFAULTPM=DGFORKER DHYDRA
 OPTIONS_DEFAULT=	FORTRAN GFORKER HYDRA DHYDRA L0
 OPTIONS_SUB=		yes
 
 FORTRAN_USES=			fortran
 FORTRAN_CONFIGURE_ENABLE=	fortran
 FORTRAN_CONFIGURE_ON=		\
 	MPICH_MPICC_LDFLAGS="${MPICH_LDFLAGS}" \
 	MPICH_MPICXX_LDFLAGS="${MPICH_LDFLAGS}" \
 	MPICH_MPIF77_LDFLAGS="${MPICH_LDFLAGS}" \
 	MPICH_MPIFORT_LDFLAGS="${MPICH_LDFLAGS}"
 MPICH_LDFLAGS=	-Wl,-rpath=${LOCALBASE}/lib/gcc${_GCC_VER} \
 		-L${LOCALBASE}/lib/gcc${_GCC_VER} -B${LOCALBASE}/bin
 
 PM_DESC=	Process managers
 GFORKER_DESC=	Simple local process manager
 HYDRA_DESC=	Parallel process manager
 DEFAULTPM_DESC=	Default process manager
 DGFORKER_DESC=	Make gforker the default process manager
 DHYDRA_DESC=	Make hydra the default process manager
 
 L0_DESC=		oneAPI Level Zero support
 L0_LIB_DEPENDS=		libze_loader.so:devel/level-zero
 L0_CONFIGURE_OFF=	--without-ze
 
 CONFIGURE_ARGS=	--enable-fast="" --with-hwloc-prefix=${LOCALBASE} \
 		--with-libfabric=${LOCALBASE} \
 		pkgconfigdir="${PREFIX}/libdata/pkgconfig" \
 		MPICHLIB_CFLAGS="${CFLAGS}" \
 		CFLAGS="-I${LOCALBASE}/include/json-c" \
 		MPICHLIB_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="" \
 		MPICHLIB_CXXFLAGS="${CXXFLAGS}" CXXFLAGS="" \
 		MPICHLIB_FFLAGS="${FFLAGS}" FFLAGS="" \
 		MPICHLIB_FCFLAGS="${FCFLAGS}" FCFLAGS="" \
 		MPICHLIB_LDFLAGS="${LDFLAGS}" LDFLAGS="" \
 		MPICHLIB_LIBS="${LIBS}" \
 		LIBS="-L${LOCALBASE}/lib -lepoll-shim -ljson-c -lm"	\
 		BASH_SHELL=${LOCALBASE}/bin/bash
 
 CFLAGS_powerpc64=	-D__BIG_ENDIAN
 
 .include <bsd.port.options.mk>
 
 .for pm in ${OPTIONS_GROUP_PM}
 . if ${PORT_OPTIONS:M${pm}}
 .  if empty(PMLIST)
 PMLIST=		${pm:tl}
 .  elif ${PORT_OPTIONS:MD${pm}}
 PMLIST:=	${pm:tl},${PMLIST}
 .  else
 PMLIST:=	${PMLIST},${pm:tl}
 .  endif
 . endif
 .endfor
 
 .if empty(PMLIST)
 CONFIGURE_ARGS+=--without-pm
 PLIST_SUB+=	EXEC="@comment " EXECGFORKER="@comment "
 .else
 CONFIGURE_ARGS+=--with-pm=${PMLIST}
 PLIST_SUB+=	EXEC=""
 .if ${PMLIST:M*,gforker*}
 PLIST_SUB+=	EXECGFORKER=""
 .else
 PLIST_SUB+=	EXECGFORKER="@comment "
 .endif
 .endif
 
 post-patch:
 	${RM} -r ${WRKSRC}/www
 
 .include <bsd.port.mk>
diff --git a/net/mpifx/Makefile b/net/mpifx/Makefile
index 3ace5ac5532b..dba4313bb448 100644
--- a/net/mpifx/Makefile
+++ b/net/mpifx/Makefile
@@ -1,36 +1,37 @@
 PORTNAME=	mpifx
 DISTVERSION=	1.3.1
+PORTREVISION=	1
 CATEGORIES=	net devel
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Modern Fortran wrappers around MPI routines
 WWW=		https://github.com/dftbplus/mpifx
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	fypp:devel/py-fypp@${PY_FLAVOR}
 LIB_DEPENDS=	libmpi.so:net/mpich
 
 USES=		cmake:testing fortran python:build
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	dftbplus
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 
 post-test: # run test programs # at least one test crashes, see https://github.com/dftbplus/mpifx/issues/35
 .for f in test_allgather test_allgatherv test_allreduce test_bcast test_comm_split test_gather test_gatherv test_reduce test_scatter test_scatterv
 	cd ${BUILD_WRKSRC}/test && ./${f}
 .endfor
 
 .include <bsd.port.pre.mk>
 
 .if ${GCC_DEFAULT} >= 10
 # workaround for Type mismatch in argument 'cc' at (1); passed COMPLEX(8) to REAL(8)
 FFLAGS+=	-fallow-argument-mismatch
 .endif
 
 # tests fail to build: https://github.com/dftbplus/mpifx/issues/43
 
 .include <bsd.port.post.mk>
diff --git a/net/nepenthes/Makefile b/net/nepenthes/Makefile
index 4ee336c54fec..083ab5f9a09e 100644
--- a/net/nepenthes/Makefile
+++ b/net/nepenthes/Makefile
@@ -1,51 +1,51 @@
 PORTNAME=	nepenthes
 PORTVERSION=	0.2.2
-PORTREVISION=	16
+PORTREVISION=	17
 CATEGORIES=	net
 MASTER_SITES=	SF/${PORTNAME}/Nepenthes%20development/${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Determine the malware activity on a network
 WWW=		http://nepenthes.carnivore.it/
 
 LIB_DEPENDS=	libpcre.so:devel/pcre \
 		libadns.so:dns/adns \
 		libcurl.so:ftp/curl \
 		libmagic.so.1:sysutils/file
 
 USES=		dos2unix libtool perl5
 USE_CXXSTD=	gnu++98
 USE_GCC=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=/var
 INSTALL_TARGET=	install-strip
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 OPTIONS_DEFINE=		DEBUG_LOGGING PRELUDE
 
 DEBUG_LOGGING_CONFIGURE_ENABLE=	debug-logging
 PRELUDE_LIB_DEPENDS=	libprelude.so:security/libprelude
 PRELUDE_CONFIGURE_ENABLE=	prelude
 
 post-patch:
 	@${FIND} ${WRKSRC} -name Makefile.in -print0 | ${XARGS} -0 \
 		${REINPLACE_CMD} -e \
 		's|-Werror|| ; \
 		 s|-D.*_GNU_SOURCE||'
 	@${FIND} ${WRKSRC}/modules -name "*.[ch]pp" -print0 | ${XARGS} -0 \
 		${REINPLACE_CMD} -e \
 		'/<curl\/types.h>/d'
 	@${REINPLACE_CMD} -e \
 		's|-I/usr/local/include|| ; \
 		 s|-I/usr/src/contrib/file/|| ; \
 		 s|-L/usr/local/lib|| ; \
 		 s|-R/usr/local/lib||' ${WRKSRC}/configure
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}/signatures
 	(cd ${WRKSRC}/modules/shellcode-signatures && ${INSTALL_DATA} \
 		shellcode-signatures.sc ${STAGEDIR}${DATADIR}/signatures)
 
 .include <bsd.port.mk>
diff --git a/net/onedrive/Makefile b/net/onedrive/Makefile
index 86a3d878f0a6..1ddc28cd1058 100644
--- a/net/onedrive/Makefile
+++ b/net/onedrive/Makefile
@@ -1,49 +1,49 @@
 PORTNAME=	onedrive
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.4.23
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net
 
 MAINTAINER=	hiroo.ono+freebsd@gmail.com
 COMMENT=	OneDrive Free client
 WWW=		https://github.com/abraunegg/onedrive
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	ldc2:lang/ldc
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libinotify.so:devel/libinotify
 RUN_DEPENDS=	${LOCALBASE}/sbin/logrotate:sysutils/logrotate
 
 USES=		autoreconf gmake pkgconfig sqlite
 USE_GITHUB=	yes
 GH_ACCOUNT=	abraunegg
 
 GNU_CONFIGURE=	yes
 
 PORTDOCS=	*
 
 OPTIONS_DEFINE=		DOCS NOTIFY COMPLETION
 OPTIONS_DEFAULT=	NOTIFY COMPLETION
 OPTIONS_SUB=		yes
 
 COMPLETION_DESC=		Install completion for BASH, FISH and ZSH
 COMPLETION_BUILD_DEPENDS=	bash-completion>0:shells/bash-completion
 COMPLETION_RUN_DEPENDS=		bash-completion>0:shells/bash-completion
 COMPLETION_CONFIGURE_ENABLE=	completions
 
 NOTIFY_LIB_DEPENDS=	libnotify.so:devel/libnotify
 NOTIFY_USES=		gnome
 NOTIFY_USE=		GNOME=glib20,gdkpixbuf2
 NOTIFY_CONFIGURE_ENABLE=	notifications
 
 ONEDRIVE_LOGDIR=	/var/log/${PORTNAME}
 
 post-extract:
 	${CP} ${FILESDIR}/freebsd_inotify.d ${WRKSRC}/src
 
 post-install:
 	${INSTALL} -d -m 0775 ${STAGEDIR}${ONEDRIVE_LOGDIR}
 
 .include <bsd.port.mk>
diff --git a/net/openmpi/Makefile b/net/openmpi/Makefile
index 07be6fa46ec5..7b520b507b35 100644
--- a/net/openmpi/Makefile
+++ b/net/openmpi/Makefile
@@ -1,130 +1,131 @@
 PORTNAME=	openmpi
 PORTVERSION=	4.1.5
+PORTREVISION=	1
 CATEGORIES=	net parallel
 MASTER_SITES=	http://www.open-mpi.org/software/ompi/v${PORTVERSION:R}/downloads/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	High Performance Message Passing Library
 WWW=		https://www.open-mpi.org/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libhwloc.so.15:devel/hwloc2 \
 		libltdl.so:devel/libltdl \
 		libevent.so:devel/libevent \
 		libmunge.so:security/munge
 
 # :keepla because port uses lt_dlopen
 USES=		fortran gmake libtool:keepla localbase perl5 \
 		pkgconfig shebangfix tar:bzip2
 
 HAS_CONFIGURE=	yes
 USE_PERL5=	build
 
 MPIBASE?=	mpi
 MPIDIR?=	${MPIBASE}/${PKGBASE}
 
 PLIST_SUB+=	MPIBASE=${MPIBASE}
 PLIST_SUB+=	MPIDIR=${MPIDIR}
 
 # Workaround for https://github.com/open-mpi/ompi/issues/7516
 CONFIGURE_ENV+=		DISABLE_gds_ds12=1 DISABLE_gds_ds21=1
 
 CONFIGURE_ARGS+=	--prefix=${PREFIX}/${MPIDIR} \
 			--mandir=${PREFIX}/${MPIDIR}/man \
 			--program-prefix= \
 			--with-hwloc=external \
 			--with-libltdl \
 			--without-ofi \
 			--enable-mpi-fortran=usempi \
 			--enable-mpi-cxx \
 			--enable-cxx-exceptions \
 			--with-libevent=external \
 			--enable-mca-no-build=verbs,btl_openib,oob_ud \
 			--without-verbs \
 			--with-wrapper-ldflags=-Wl,-rpath=-Wl,-rpath=${LOCALBASE}/lib/gcc${_GCC_VER} \
 			ompi_cv_fortran_ignore_tkr_data=0
 
 USE_LDCONFIG=	${PREFIX}/${MPIDIR}/lib
 
 MANPREFIX=	${PREFIX}/${MPIDIR}
 
 SHEBANG_FILES=	ompi/mca/common/monitoring/profile2mat.pl \
 		ompi/mca/common/monitoring/aggregate_profile.pl
 
 OPTIONS_DEFINE=			AVX DEBUG IPV6 SLURM TORQUE
 OPTIONS_DEFAULT=		SLURM
 OPTIONS_EXCLUDE_aarch64=	AVX
 OPTIONS_EXCLUDE_armv6=		AVX SLURM
 OPTIONS_EXCLUDE_armv7=		AVX SLURM
 OPTIONS_EXCLUDE_i386=		SLURM
 OPTIONS_EXCLUDE_mips=		AVX SLURM
 OPTIONS_EXCLUDE_mips64=		AVX
 OPTIONS_EXCLUDE_powerpc=	AVX SLURM
 OPTIONS_EXCLUDE_powerpc64=	AVX
 OPTIONS_EXCLUDE_powerpc64le=	AVX
 OPTIONS_EXCLUDE_riscv64=	AVX
 OPTIONS_SUB=			yes
 
 AVX_DESC=	Enable AVX instructions
 SLURM_DESC=	Enable SLURM support
 TORQUE_DESC=	Enable Torque support
 
 AVX_CONFIGURE_OFF=	--enable-mca-no-build=op-avx
 
 DEBUG_CONFIGURE_ENABLE=	debug
 DEBUG_INSTALL_TARGET_OFF=	install-strip
 
 IPV6_CONFIGURE_ENABLE=	ipv6
 
 TORQUE_CONFIGURE_WITH=	tm
 TORQUE_LIB_DEPENDS=	libtorque.so:sysutils/torque
 TORQUE_PLIST_FILES=	${MPIDIR}/lib/openmpi/mca_plm_tm.so \
 			${MPIDIR}/lib/openmpi/mca_plm_tm.la \
 			${MPIDIR}/lib/openmpi/mca_ras_tm.la \
 			${MPIDIR}/lib/openmpi/mca_ras_tm.so \
 			${MPIDIR}/lib/openmpi/mca_ess_tm.so \
 			${MPIDIR}/lib/openmpi/mca_ess_tm.la \
 			${MPIDIR}/share/openmpi/help-plm-tm.txt \
 			${MPIDIR}/share/openmpi/help-ras-tm.txt
 
 SLURM_CONFIGURE_WITH=	slurm
 SLURM_LIB_DEPENDS=	libslurm.so:sysutils/slurm-wlm
 SLURM_PLIST_FILES=	${MPIDIR}/lib/openmpi/mca_ess_slurm.la \
 			${MPIDIR}/lib/openmpi/mca_ess_slurm.so \
 			${MPIDIR}/lib/openmpi/mca_plm_slurm.la \
 			${MPIDIR}/lib/openmpi/mca_plm_slurm.so \
 			${MPIDIR}/lib/openmpi/mca_ras_slurm.la \
 			${MPIDIR}/lib/openmpi/mca_ras_slurm.so \
 			${MPIDIR}/lib/openmpi/mca_schizo_slurm.la \
 			${MPIDIR}/lib/openmpi/mca_schizo_slurm.so \
 			${MPIDIR}/share/openmpi/help-plm-slurm.txt \
 			${MPIDIR}/share/openmpi/help-ras-slurm.txt
 
 .include <bsd.port.options.mk>
 
 .if ${FORTRAN_DEFAULT} == gfortran && ${GCC_DEFAULT} >= 10
 FCFLAGS+=	-fallow-argument-mismatch
 .endif
 
 .if ${ARCH} != aarch64 && ${ARCH} != amd64 && ${ARCH} != i386 && !${ARCH:Mpowerpc*}
 PLIST_SUB+=	NO_MCA_PATCHER_OVERWRITE="@comment "
 .else
 PLIST_SUB+=	NO_MCA_PATCHER_OVERWRITE=""
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|${LOCALBASE}/libdata/pkgconfig|g' \
 		${WRKSRC}/ompi/tools/wrappers/Makefile.am \
 		${WRKSRC}/ompi/tools/wrappers/Makefile.in \
 		${WRKSRC}/opal/tools/wrappers/Makefile.am \
 		${WRKSRC}/opal/tools/wrappers/Makefile.in \
 		${WRKSRC}/orte/tools/wrappers/Makefile.am \
 		${WRKSRC}/orte/tools/wrappers/Makefile.in \
 		${WRKSRC}/opal/mca/pmix/pmix3x/pmix/Makefile.am \
 		${WRKSRC}/opal/mca/pmix/pmix3x/pmix/Makefile.in
 	@${REINPLACE_CMD} 's|define MCA_hwloc_external_.*header "|&${LOCALBASE}/include/|' \
 		${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/net/openmpi3/Makefile b/net/openmpi3/Makefile
index 06197c13b855..9a8006f97aef 100644
--- a/net/openmpi3/Makefile
+++ b/net/openmpi3/Makefile
@@ -1,111 +1,111 @@
 PORTNAME=	openmpi
 PORTVERSION=	3.1.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net parallel
 MASTER_SITES=	http://www.open-mpi.org/software/ompi/v${PORTVERSION:R}/downloads/
 PKGNAMESUFFIX=	3
 
 MAINTAINER=	danilo@FreeBSD.org
 COMMENT=	High Performance Message Passing Library
 WWW=		https://www.open-mpi.org/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_armv6=		fails to package: pkg-static: mca_patcher_overwrite.la: No such file or directory
 BROKEN_armv7=		fails to package: pkg-static: mca_patcher_overwrite.la: No such file or directory
 BROKEN_sparc64=		fails to compile on sparc64
 
 LIB_DEPENDS=	libltdl.so:devel/libltdl \
 		libevent.so:devel/libevent \
 		libmunge.so:security/munge
 
 # :keepla because port uses lt_dlopen
 USES=		fortran gmake libtool:keepla localbase perl5 \
 		pkgconfig shebangfix tar:bzip2
 
 HAS_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 USE_PERL5=	build
 
 MPIBASE?=	mpi
 MPIDIR?=	${MPIBASE}/${PKGBASE}
 
 PLIST_SUB+=	MPIBASE=${MPIBASE}
 PLIST_SUB+=	MPIDIR=${MPIDIR}
 
 CONFIGURE_ARGS+=	--prefix=${PREFIX}/${MPIDIR} \
 			--mandir=${PREFIX}/${MPIDIR}/man \
 			--program-prefix= \
 			--with-hwloc=internal \
 			--with-libltdl \
 			--enable-mpi-fortran=usempi \
 			--enable-mpi-cxx \
 			--enable-cxx-exceptions \
 			--with-libevent=external \
 			--enable-mca-no-build=verbs,btl_openib,oob_ud \
 			--without-verbs \
 			--with-wrapper-ldflags=-Wl,-rpath=-Wl,-rpath=${LOCALBASE}/lib/gcc${_GCC_VER} \
 			ompi_cv_fortran_ignore_tkr_data=0
 
 USE_LDCONFIG=	${PREFIX}/${MPIDIR}/lib \
 		${PREFIX}/${MPIDIR}/lib/openmpi
 
 MANPREFIX=	${PREFIX}/${MPIDIR}
 
 SHEBANG_FILES=	ompi/mca/common/monitoring/profile2mat.pl \
 		ompi/mca/common/monitoring/aggregate_profile.pl
 
 OPTIONS_DEFINE=	DEBUG IPV6 SLURM TORQUE
 TORQUE_DESC=	Enable Torque support
 SLURM_DESC=	Enable SLURM support
 OPTIONS_DEFAULT=	SLURM
 OPTIONS_EXCLUDE_i386=	SLURM
 OPTIONS_SUB=	yes
 
 DEBUG_CONFIGURE_ENABLE=	debug
 
 IPV6_CONFIGURE_ENABLE=	ipv6
 
 TORQUE_CONFIGURE_WITH=	tm
 TORQUE_LIB_DEPENDS=	libtorque.so:sysutils/torque
 TORQUE_PLIST_FILES=	${MPIDIR}/lib/openmpi/mca_plm_tm.so \
 			${MPIDIR}/lib/openmpi/mca_plm_tm.la \
 			${MPIDIR}/lib/openmpi/mca_ras_tm.la \
 			${MPIDIR}/lib/openmpi/mca_ras_tm.so \
 			${MPIDIR}/lib/openmpi/mca_ess_tm.so \
 			${MPIDIR}/lib/openmpi/mca_ess_tm.la \
 			${MPIDIR}/share/openmpi/help-plm-tm.txt \
 			${MPIDIR}/share/openmpi/help-ras-tm.txt
 
 SLURM_CONFIGURE_WITH=	slurm
 SLURM_LIB_DEPENDS=	libslurm.so:sysutils/slurm-wlm
 SLURM_PLIST_FILES=	${MPIDIR}/lib/openmpi/mca_ess_slurm.la \
 			${MPIDIR}/lib/openmpi/mca_ess_slurm.so \
 			${MPIDIR}/lib/openmpi/mca_plm_slurm.la \
 			${MPIDIR}/lib/openmpi/mca_plm_slurm.so \
 			${MPIDIR}/lib/openmpi/mca_ras_slurm.la \
 			${MPIDIR}/lib/openmpi/mca_ras_slurm.so \
 			${MPIDIR}/lib/openmpi/mca_schizo_slurm.la \
 			${MPIDIR}/lib/openmpi/mca_schizo_slurm.so \
 			${MPIDIR}/share/openmpi/help-plm-slurm.txt \
 			${MPIDIR}/share/openmpi/help-ras-slurm.txt
 
 .include <bsd.port.options.mk>
 
 .if ${FORTRAN_DEFAULT} == gfortran && ${GCC_DEFAULT} >= 10
 FCFLAGS+=	-fallow-argument-mismatch
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|${PREFIX}/${MPIDIR}/libdata/pkgconfig|g' \
 		${WRKSRC}/ompi/tools/wrappers/Makefile.am \
 		${WRKSRC}/ompi/tools/wrappers/Makefile.in \
 		${WRKSRC}/opal/tools/wrappers/Makefile.am \
 		${WRKSRC}/opal/tools/wrappers/Makefile.in \
 		${WRKSRC}/orte/tools/wrappers/Makefile.am \
 		${WRKSRC}/orte/tools/wrappers/Makefile.in
 	@${REINPLACE_CMD} 's|define MCA_hwloc_external_.*header "|&${LOCALBASE}/include/|' \
 		${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/net/py-mpi4py/Makefile b/net/py-mpi4py/Makefile
index 6d07657a3734..84e6568aed3e 100644
--- a/net/py-mpi4py/Makefile
+++ b/net/py-mpi4py/Makefile
@@ -1,54 +1,55 @@
 PORTNAME=	mpi4py
 DISTVERSION=	3.1.4
+PORTREVISION=	1
 CATEGORIES=	net parallel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Python bindings for MPI
 WWW=		https://bitbucket.org/mpi4py/mpi4py/
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.rst
 
 USES=		python:3.6+
 USE_PYTHON=	distutils cython autoplist concurrent
 LDFLAGS+=	${MPI_LIBS}
 
 OPTIONS_DEFINE=		DOCS MANPAGES
 OPTIONS_SINGLE=		MP
 OPTIONS_SINGLE_MP=	MPICH OPENMPI
 OPTIONS_DEFAULT=	OPENMPI # the only non-failing MPI implementation
 MP_DESC=		MPI Implementation
 
 MPICH_USES=		fortran mpi:mpich
 MPICH_LDFLAGS=		${LOCALBASE}/lib/gcc${GCC_DEFAULT}/libgcc_s.so
 
 OPENMPI_USES=		mpi:openmpi
 
 PORTDOCS=		*
 
 pre-configure:
 	${CP} ${FILESDIR}/mpi.cfg ${WRKSRC}/
 	${REINPLACE_CMD} -e 's|%%LOCALBASE%%/mpi/openmpi|${MPI_HOME}|'	\
 		${WRKSRC}/mpi.cfg
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.rst ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
 	@${RM} ${STAGEDIR}${DOCSDIR}/${PORTNAME}.1
 
 do-install-MANPAGES-on:
 	${INSTALL_MAN} ${WRKSRC}/docs/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/man/man1
 	@${ECHO} man/man1/mpi4py.1.gz >> ${TMPPLIST}
 
 post-install:
 	@cd ${STAGEDIR}${PYTHON_SITELIBDIR}/mpi4py && ${STRIP_CMD} dl*.so MPI*.so lib-pmpi/libvt-hyb*.so lib-pmpi/libvt*.so lib-pmpi/libvt-mpi*.so lib-pmpi/libmpe*.so
 
 do-test:
 	# tests fail with MPICH2=on: https://bitbucket.org/mpi4py/mpi4py/issues/110/tests-fail-with-mpich2-on-freebsd-error
 	# tests fail with OPENMPI2=on: https://bitbucket.org/mpi4py/mpi4py/issues/109/tests-fail-with-openmpi2-on-freebsd
 	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test
 
 .include <bsd.port.mk>
diff --git a/net/yate/Makefile b/net/yate/Makefile
index dbc551c0e077..1c1942c31c64 100644
--- a/net/yate/Makefile
+++ b/net/yate/Makefile
@@ -1,99 +1,99 @@
 PORTNAME=	yate
 PORTVERSION=	6.4.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	http://yate.null.ro/tarballs/yate6/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-1
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Yet Another Telephony Engine
 WWW=		http://yate.null.ro
 
 LICENSE=	GPLv2
 
 ONLY_FOR_ARCHS=		amd64 armv6 armv7 i386 powerpc powerpc64 powerpc64le sparc64
 
 LIB_DEPENDS=	libasound.so:audio/alsa-lib \
 		libspeex.so:audio/speex \
 		libgsm.so:audio/gsm
 
 USES=		autoreconf bison gmake shebangfix
 USE_GCC=	yes
 SHEBANG_FILES=	share/scripts/banbrutes.php \
 		share/scripts/leavemail.php \
 		share/scripts/queue_in.php \
 		share/scripts/queue_out.php \
 		share/scripts/route.php \
 		share/scripts/tts.sh \
 		share/scripts/voicemail.php
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS=	--without-fdsize \
 		--without-libqt4 \
 		--with-zlib=/usr
 PLIST_SUB=	VERSION="${PORTVERSION}"
 
 MAKE_JOBS_UNSAFE=yes
 
 SUB_FILES=	pkg-message
 USE_RC_SUBR=	yate
 USERS=		yate
 GROUPS=		yate
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
 
 OPTIONS_DEFINE=	AMRNB DOCS DAHDI H323 ILBC MYSQL PGSQL SCTP SPANDSP SQLITE
 OPTIONS_DEFAULT=SCTP
 
 AMRNB_DESC=	Adaptive Multi-Rate Narrowband support
 DAHDI_DESC=	Dahdi support
 H323_DESC=	H323 software channel/protocol support
 ILBC_DESC=	iLBC narrowband speech codec support
 SCTP_DESC=	Stream Control Transmission Protocol support
 
 OPTIONS_SUB=	yes
 
 AMRNB_CONFIGURE_WITH=	amrnb=${LOCALBASE}
 AMRNB_LIB_DEPENDS=	libamrnb.so:audio/libamrnb
 
 DAHDI_CONFIGURE_ENABLE=	dahdi
 DAHDI_BUILD_DEPENDS=	libpri>=1.4.10:misc/libpri \
 			${LOCALBASE}/include/dahdi/user.h:misc/dahdi
 DAHDI_LIB_DEPENDS=	libpri.so:misc/libpri \
 			libopenr2.so:misc/openr2
 
 H323_CONFIGURE_WITH=	openh323=${LOCALBASE}
 H323_LIB_DEPENDS=	libopenh323.so:net/h323plus \
 			libpt.so:devel/ptlib
 
 ILBC_CONFIGURE_ENABLE=	ilbc
 ILBC_LIB_DEPENDS=	libilbc.so:net/ilbc
 
 MYSQL_CONFIGURE_WITH=	mysql
 MYSQL_USES=		mysql ssl
 
 PGSQL_CONFIGURE_WITH=	libpq=${LOCALBASE}
 PGSQL_USES=		pgsql
 
 SCTP_CONFIGURE_ENABLE=	sctp
 
 SPANDSP_CONFIGURE_WITH=	spandsp
 SPANDSP_LIB_DEPENDS=	libspandsp.so:comms/spandsp
 
 SQLITE_CONFIGURE_WITH=	sqlite
 SQLITE_USES=		pkgconfig sqlite
 
 post-extract:
 	@${MV} ${WRKDIR}/${PORTNAME} ${WRKSRC}
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/yate
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libyate*.so.${PORTVERSION}
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/yate/*.yate
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/yate/radio/*.yate
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/yate/sig/*.yate
 .for dir in client server jabber sip
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/yate/${dir}/*.yate
 .endfor
 
 .include <bsd.port.mk>
diff --git a/ports-mgmt/porttree/Makefile b/ports-mgmt/porttree/Makefile
index 7482302b7d73..a1121c6e0954 100644
--- a/ports-mgmt/porttree/Makefile
+++ b/ports-mgmt/porttree/Makefile
@@ -1,42 +1,42 @@
 PORTNAME=	porttree
 PORTVERSION=	1.1.r${SVN_REV}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	ports-mgmt python
 MASTER_SITES=	SF/${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Show dependencies of FreeBSD port as pseudo graphical tree
 WWW=		https://sourceforge.net/projects/porttree/
 
 LICENSE=	MIT
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}networkx>=2.0:math/py-networkx@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}configargparse>0:devel/py-configargparse@${PY_FLAVOR}
 
 USES=		python:3.6+ tar:bzip2 shebangfix
 #USE_PYTHON=	concurrent
 
 SVN_REV=	114
 NO_BUILD=	yes
 PLIST_FILES=	bin/porttree man/man1/porttree.1.gz
 NO_ARCH=	yes
 
 SHEBANG_FILES=	src/porttree.py
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/src/porttree.py ${STAGEDIR}${PREFIX}/bin/porttree
 	${INSTALL_MAN} ${WRKSRC}/src/porttree.1 ${STAGEDIR}${MANPREFIX}/man/man1
 
 do-test:
 	LC_ALL="en_US.UTF-8" ${WRKSRC}/tests/tests.sh
 
 # maintainer section:
 # require: devel/subversion
 SVNROOT?=	https://svn.code.sf.net/p/porttree/code/trunk
 gen-dist:
 	${MKDIR} ${WRKDIR}
 	${RM} -r ${WRKSRC}
 	svn export -r ${SVN_REV} ${SVNROOT} ${WRKSRC}
 	${TAR} -cvy -C ${WRKDIR} --exclude FreeBSDport -f ${DISTDIR}/${DISTNAME}.tar.bz2 ${DISTNAME}
 
 .include <bsd.port.mk>
diff --git a/ports-mgmt/synth/Makefile b/ports-mgmt/synth/Makefile
index 45d89403fcca..0e5a1e857fdd 100644
--- a/ports-mgmt/synth/Makefile
+++ b/ports-mgmt/synth/Makefile
@@ -1,72 +1,73 @@
 PORTNAME=	synth
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.13
+PORTREVISION=	1
 CATEGORIES=	ports-mgmt
 
 MAINTAINER=	fluffy@FreeBSD.org
 COMMENT=	Custom package repository builder for FreeBSD and DragonFly
 WWW=		https://github.com/jrmarino/synth
 
 LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/License.txt
 
 BUILD_DEPENDS=	${GPR}/ini_file_manager.gpr:misc/ini_file_manager \
 		${GPR}/adacurses.gpr:devel/adacurses
 
 USES=		ada:6 ncurses:base
 USE_GITHUB=	yes
 GH_ACCOUNT=	jrmarino
 
 GPR=		${LOCALBASE}/lib/gnat
 MAKE_ENV=	NCURSES_LINK=static
 
 OPTIONS_DEFINE=	WATCHDOG
 OPTIONS_DEFAULT=WATCHDOG
 
 WATCHDOG_DESC=	Build with watchdog monitor
 
 WATCHDOG_EXTRA_PATCHES_OFF=	${FILESDIR}/extrapatch-nowatchdog-portscan-buildcycle.adb
 
 .include <bsd.port.options.mk>
 
 .if ${OPSYS} == "FreeBSD" && ${OSVERSION} >= 1300079
 USES+=		ncurses:base
 .else
 USES+=		ncurses:port
 .endif
 
 .include <bsd.port.pre.mk>
 
 post-extract:
 .if ${OPSYS} == DragonFly && ${OSVERSION} < 400600
 	@${REINPLACE_CMD} -e 's|"re"|"r"|' ${WRKSRC}/src/unix.adb
 .endif
 	@${REINPLACE_CMD} -e "s|/usr/local|${LOCALBASE}|" \
 		${WRKSRC}/src/definitions.ads
 
 do-build:
 	(cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} \
 		gcc -c unix_core.c -o ../build/unix_core.o)
 	(cd ${WRKSRC}/synthexec && ${SETENV} ${MAKE_ENV} \
 		gcc synthexec.c -o ../build/synthexec)
 	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} gnatmake -P default \
 		-largs build/unix_core.o)
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d \
 		${STAGEDIR}${PREFIX}/share/zsh/site-functions \
 		${STAGEDIR}${PREFIX}/share/synth \
 		${STAGEDIR}/var/log/synth \
 		${STAGEDIR}/var/synth/live_packages
 	${INSTALL_PROGRAM} ${WRKSRC}/build/synth \
 		${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/build/synthexec \
 		${STAGEDIR}${PREFIX}/libexec
 	${INSTALL_MAN} ${WRKSRC}/synth.1 ${STAGEDIR}${MANPREFIX}/man/man1
 	${INSTALL_SCRIPT} ${WRKSRC}/shell-completers/_synth.bash \
 		${STAGEDIR}${PREFIX}/etc/bash_completion.d
 	${INSTALL_DATA} ${WRKSRC}/shell-completers/_synth \
 		${STAGEDIR}${PREFIX}/share/zsh/site-functions
 	${INSTALL_DATA} ${WRKSRC}/www/* ${STAGEDIR}${PREFIX}/share/synth
 
 .include <bsd.port.post.mk>
diff --git a/print/R-cran-knitr/Makefile b/print/R-cran-knitr/Makefile
index dbc19c34b57b..12087e77ce0a 100644
--- a/print/R-cran-knitr/Makefile
+++ b/print/R-cran-knitr/Makefile
@@ -1,22 +1,23 @@
 PORTNAME=	knitr
 PORTVERSION=	1.40
+PORTREVISION=	1
 CATEGORIES=	print
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	General-Purpose Package for Dynamic Report Generation in R
 WWW=		https://cran.r-project.org/web/packages/knitr/
 
 LICENSE=	GPLv2+
 
 CRAN_DEPENDS=	R-cran-evaluate>=0.15:devel/R-cran-evaluate \
 		R-cran-highr>0:textproc/R-cran-highr \
 		R-cran-stringr>=0.6:textproc/R-cran-stringr \
 		R-cran-yaml>=2.1.19:textproc/R-cran-yaml \
 		R-cran-xfun>=0.29:misc/R-cran-xfun
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=	cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/print/R-cran-tinytex/Makefile b/print/R-cran-tinytex/Makefile
index 7a0a875fde62..ed36c82f6457 100644
--- a/print/R-cran-tinytex/Makefile
+++ b/print/R-cran-tinytex/Makefile
@@ -1,18 +1,19 @@
 PORTNAME=	tinytex
 DISTVERSION=	0.41
+PORTREVISION=	1
 CATEGORIES=	print
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Helper functions to maintain LaTeX distribution
 WWW=		https://cran.r-project.org/web/packages/tinytex/
 
 LICENSE=	MIT
 
 CRAN_DEPENDS=	R-cran-xfun>=0.29:misc/R-cran-xfun
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/print/auctex/Makefile b/print/auctex/Makefile
index 5b77190816c7..8fe507ac7e83 100644
--- a/print/auctex/Makefile
+++ b/print/auctex/Makefile
@@ -1,34 +1,34 @@
 PORTNAME=	auctex
 PORTVERSION=	13.1
-PORTREVISION=	2
+PORTREVISION=	4
 CATEGORIES=	print elisp
 MASTER_SITES=	GNU
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Integrated environment for writing LaTeX using GNU Emacs
 WWW=		https://www.gnu.org/software/auctex/
 
 LICENSE=	GPLv3
 
 .if ${FLAVOR:U} == devel_full || ${FLAVOR:U} == devel_nox
 BROKEN=		tex.el:0:0: error: wrong-type-argument: (stringp nil)
 .endif
 
 USES=		emacs ghostscript gmake tex
 USE_TEX=	latex texhash
 TEXHASHDIRS=	${TEXMFDIR}
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-lispdir=${PREFIX}/${EMACS_VERSION_SITE_LISPDIR} \
 	--with-auto-dir=${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/auctex/auto \
 	--with-texmf-dir=${PREFIX}/${TEXMFDIR}
 PORTDOCS=	tex-ref.pdf
 INFO=		auctex preview-latex
 SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=	DOCS
 DOCS_CONFIGURE_ON=	--docdir=${DOCSDIR}
 DOCS_CONFIGURE_OFF=	WITHOUT_AUCTEX_DOCSDIR=yes
 
 .include <bsd.port.mk>
diff --git a/print/derelict-ft/Makefile b/print/derelict-ft/Makefile
index a50c03527cf7..1138a831d06d 100644
--- a/print/derelict-ft/Makefile
+++ b/print/derelict-ft/Makefile
@@ -1,38 +1,38 @@
 PORTNAME=	derelict-ft
 PORTVERSION=	1.1.3
-PORTREVISION=	6
+PORTREVISION=	7
 DISTVERSIONPREFIX=	v
 CATEGORIES=	print
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Dynamic binding to the FreeType library for the D lang
 WWW=		https://github.com/DerelictOrg/DerelictFT
 
 LICENSE=	BSL
 
 BUILD_DEPENDS=	ldmd2:lang/ldc \
 		dub:devel/dub \
 		${LOCALBASE}/lib/d/libDerelictUtil.a:devel/derelict-util
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	DerelictOrg
 GH_PROJECT=	DerelictFT
 
 DUB_CMD=	${LOCALBASE}/bin/dub build --build=release
 D_INCLUDE_DIR=	${PREFIX}/include/d
 D_LIB_DIR=	${PREFIX}/lib/d
 DC=		${PREFIX}/bin/ldmd2
 
 post-patch:
 	@${REINPLACE_CMD} -e '13,15d' ${WRKSRC}/dub.json
 
 do-build:
 	@cd ${WRKSRC} && DC=${DC} ${DUB_CMD}
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${D_INCLUDE_DIR}
 	@${MKDIR} ${STAGEDIR}${D_LIB_DIR}
 	${INSTALL_DATA} ${WRKSRC}/lib/libDerelictFT.a ${STAGEDIR}${D_LIB_DIR}
 	cd ${WRKSRC}/source && ${COPYTREE_SHARE} . ${STAGEDIR}${D_INCLUDE_DIR} "-name *\.d"
 
 .include <bsd.port.mk>
diff --git a/print/hyperlatex/Makefile b/print/hyperlatex/Makefile
index bbbafc976b01..8ebe34bb5831 100644
--- a/print/hyperlatex/Makefile
+++ b/print/hyperlatex/Makefile
@@ -1,43 +1,43 @@
 PORTNAME=	Hyperlatex
 DISTVERSION=	2.9a
-PORTREVISION=	17
+PORTREVISION=	19
 CATEGORIES=	print
 MASTER_SITES=	SF/${PORTNAME:tl}/${PORTNAME:tl}/2.9a
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Produce HTML and printed documents from LaTeX source
 WWW=		http://hyperlatex.sourceforge.net/
 
 RUN_DEPENDS=	ppmtogif:graphics/netpbm
 
 USES=		emacs tex
 USE_TEX=	latex
 
 CONFLICTS_INSTALL=	 Hyperlatex Hyperlatex-emacs_*
 
 LATEX_DIR=	${PREFIX}/share/texmf/tex/latex/hyperlatex
 HYPERLATEX_DIR=	${PREFIX}/share/hyperlatex
 
 do-configure:
 	@(cd ${WRKSRC} && \
 	${REINPLACE_CMD} -e 's|http://www.cs.uu.nl/\\~{}otfried/img/||' hlx/siteinit.hlx && \
 	${REINPLACE_CMD} -e 's|$$HOME/Hyperlatex/Hlx|${HYPERLATEX_DIR}|' bin/hyperlatex && \
 	${REINPLACE_CMD} -e '1s|^#$$|#\!/usr/bin/awk|' bin/normalize-eps.awk)
 
 do-build:
 	cd ${WRKSRC}/hlx; emacs -batch -q -no-site-file -l hyperlatex.el -f hyperlatex-compile
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${HYPERLATEX_DIR}
 	@${MKDIR} ${STAGEDIR}${LATEX_DIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/hyperlatex ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/ps2image ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/normalize-eps.awk \
 		${STAGEDIR}${PREFIX}/bin/normalize-eps
 	${INSTALL_DATA} ${WRKSRC}/etc/hyperlatex.sty ${STAGEDIR}${LATEX_DIR}
 	cd ${WRKSRC}/hlx; for f in *.el *.elc *.hlx *.xbm *.awk ; do \
 	    if [ -f $$f ]; then ${INSTALL_DATA} $$f \
 	    ${STAGEDIR}${HYPERLATEX_DIR}; fi; done
 
 .include <bsd.port.mk>
diff --git a/print/pdf-tools/Makefile b/print/pdf-tools/Makefile
index 9d9d5a209350..77eaa4010a7c 100644
--- a/print/pdf-tools/Makefile
+++ b/print/pdf-tools/Makefile
@@ -1,54 +1,54 @@
 PORTNAME=	pdf-tools
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.0.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	print elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	jrm@FreeBSD.org
 COMMENT=	Emacs support library for PDF files
 WWW=		https://github.com/vedang/pdf-tools
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BROKEN_FreeBSD_12_powerpc64=	fails to configure on powerpc64 elfv1: cannot find necessary poppler-private header (see README.org)
 
 BUILD_DEPENDS=	cask${EMACS_PKGNAMESUFFIX}>0:devel/cask@${EMACS_FLAVOR} \
 		tablist${EMACS_PKGNAMESUFFIX}>=0.70.4:devel/tablist@${EMACS_FLAVOR}
 LIB_DEPENDS=	libpng.so:graphics/png \
 		libpoppler-glib.so:graphics/poppler-glib \
 		libpoppler.so:graphics/poppler
 RUN_DEPENDS=	tablist${EMACS_PKGNAMESUFFIX}>=0.70:devel/tablist@${EMACS_FLAVOR}
 
 USES=		autoreconf:build emacs gettext-runtime gmake gnome magick:7
 USE_GITHUB=	yes
 GH_ACCOUNT=	vedang
 USE_GNOME=	cairo glib20
 
 EMACS_FLAVORS_EXCLUDE=	devel_nox nox
 
 CONFLICTS_INSTALL=	pdf-tools pdf-tools-emacs_* # bin/epdfinfo
 
 do-build:
 	cd ${WRKSRC}/server && ./autogen.sh && ./configure -q && make
 	${EMACS_CMD} -q --batch -L ${WRKSRC}/lisp -f batch-byte-compile \
 		${WRKSRC}/lisp/*.el
 .if ${FLAVOR:U} == devel_full
 	 ${EMACS_CMD} -q --batch -f loaddefs-generate-batch \
 		${WRKSRC}/lisp/${PORTNAME}-loaddefs.el ${WRKSRC}/lisp
 .else
 	${EMACS_CMD} -q --batch \
 	--eval "(setq generated-autoload-file \
 		\"${WRKSRC}/lisp/${PORTNAME}-loaddefs.el\" \
 		backup-inhibited t)" \
 	-f batch-update-autoloads ${WRKSRC}/lisp
 .endif
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/${PORTNAME}
 	${INSTALL_PROGRAM} ${WRKSRC}/server/epdfinfo ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/lisp/* ${FILESDIR}/${PORTNAME}-init.el \
 		${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/print/py-collidoscope/Makefile b/print/py-collidoscope/Makefile
index f4e5ea88389a..edcf84fb512e 100644
--- a/print/py-collidoscope/Makefile
+++ b/print/py-collidoscope/Makefile
@@ -1,23 +1,24 @@
 PORTNAME=	collidoscope
 PORTVERSION=	0.5.2
+PORTREVISION=	1
 CATEGORIES=	print python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Brute force detection of glyph collisions
 WWW=		https://github.com/simoncozens/collidoscope
 
 LICENSE=	MIT
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beziers>=0.0.3:graphics/py-beziers@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}fonttools>=0:print/py-fonttools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}glyphtools>=0:print/py-glyphtools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}uharfbuzz>=0:print/py-uharfbuzz@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/print/py-fontbakery/Makefile b/print/py-fontbakery/Makefile
index 43f10d013011..6a9cf6709fa7 100644
--- a/print/py-fontbakery/Makefile
+++ b/print/py-fontbakery/Makefile
@@ -1,59 +1,60 @@
 PORTNAME=	fontbakery
 PORTVERSION=	0.8.11
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	print python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Well designed Font QA tool
 WWW=		https://github.com/googlefonts/fontbakery
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>=6.2:devel/py-setuptools_scm@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}axisregistry>=0.3.0:x11-fonts/py-axisregistry@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}beautifulsoup>=0:www/py-beautifulsoup@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}beziers>=0.5.0:graphics/py-beziers@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cmarkgfm>=0:textproc/py-cmarkgfm@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}collidoscope>=0.5.2:print/py-collidoscope@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}defcon>=0:x11-fonts/py-defcon@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dehinter>=3.1.0:print/py-dehinter@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}font-v>=0:print/py-font-v@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}fonttools>=4.36.0:print/py-fonttools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}gflanguages>=0.3.0:x11-fonts/py-gflanguages@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}glyphsets>=0.5.0:print/py-glyphsets@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}munkres>=0:math/py-munkres@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}opentype-sanitizer>=7.1.9:x11-fonts/py-opentype-sanitizer@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}opentypespec>=0:x11-fonts/py-opentypespec@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}packaging>=0:devel/py-packaging@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pip-api>=0:devel/py-pip-api@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}protobuf>=3.7.0,1:devel/py-protobuf@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}rich>=0:textproc/py-rich@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}stringbrewer>=0:devel/py-stringbrewer@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}toml>=0:textproc/py-toml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ufo2ft>=2.25.2:x11-fonts/py-ufo2ft@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ufolint>=0:x11-fonts/py-ufolint@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}unicodedata2>=0:devel/py-unicodedata2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}vharfbuzz>=0.2.0:print/py-vharfbuzz@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 GH_ACCOUNT=	googlefonts
 USE_GITHUB=	yes
 
 OPTIONS_DEFINE=	FREETYPE
 
 FREETYPE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}freetype-py>=0:print/py-freetype-py@${PY_FLAVOR}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PORTVERSION%%|${PORTVERSION}|' ${WRKSRC}/setup.py
 
 .include <bsd.port.mk>
diff --git a/print/py-glyphtools/Makefile b/print/py-glyphtools/Makefile
index 41c2c1d7dcf8..ee775a9ea9b4 100644
--- a/print/py-glyphtools/Makefile
+++ b/print/py-glyphtools/Makefile
@@ -1,23 +1,23 @@
 PORTNAME=	glyphtools
 PORTVERSION=	0.8.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	print python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Routines for extracting information from fontTools glyphs
 WWW=		https://github.com/simoncozens/glyphtools
 
 LICENSE=	APACHE20
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beziers>=0:graphics/py-beziers@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}glyphsLib>=0:x11-fonts/py-glyphsLib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpy>=0,1:math/py-numpy@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/science/ALPSCore/Makefile b/science/ALPSCore/Makefile
index df74fa0c6b57..377687bb628c 100644
--- a/science/ALPSCore/Makefile
+++ b/science/ALPSCore/Makefile
@@ -1,57 +1,57 @@
 PORTNAME=	ALPSCore
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.2.0
-PORTREVISION=	17
+PORTREVISION=	18
 CATEGORIES=	science
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Generic algorithms and utilities for condensed matter physics
 WWW=		https://github.com/ALPSCore/ALPSCore
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE.TXT
 
 BROKEN_i386=	fails to build: no matching member function for call to 'read'
 
 LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 		libhdf5.so:science/hdf5 \
 		libsz.so:science/libaec
 
 USES=		cmake compiler:c++11-lang eigen:3
 USE_GITHUB=	yes
 USE_LDCONFIG=	yes
 TEST_TARGET=	test # 2 to 3 tests fail: https://github.com/ALPSCore/ALPSCore/issues/388
 
 CMAKE_ARGS+=	-DTesting:BOOL=OFF # enable only for the 'test' target
 CMAKE_ARGS_TEST=	-DTesting:BOOL=ON -DExtensiveTesting:BOOL=ON
 CXXFLAGS+=	-DNDEBUG # see https://github.com/ALPSCore/ALPSCore/issues/389
 LDFLAGS+=	-lexecinfo # https://github.com/ALPSCore/ALPSCore/issues/390
 
 OPTIONS_DEFINE=	DOXYGEN DOCS OPENMPI
 OPTIONS_DEFAULT=	OPENMPI
 
 DOXYGEN_IMPLIES=	DOCS
 DOXYGEN_CMAKE_BOOL=	Documentation
 DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
 
 OPENMPI_CMAKE_BOOL=	ENABLE_MPI
 OPENMPI_LIB_DEPENDS=	libmpi.so:net/openmpi
 
 PORTDOCS=	*
 
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MOPENMPI}
 CC=	${LOCALBASE}/mpi/openmpi/bin/mpicc
 CXX=	${LOCALBASE}/mpi/openmpi/bin/mpicxx
 .endif
 
 post-install-DOXYGEN-on:
 	@${RM} ${STAGEDIR}${DOCSDIR}/.tag
 
 pre-test:
 	@cd ${CONFIGURE_WRKSRC} && \
 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} ${CMAKE_ARGS_TEST} ${CMAKE_SOURCE_PATH} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS}
 
 .include <bsd.port.post.mk>
diff --git a/science/InsightToolkit/Makefile b/science/InsightToolkit/Makefile
index 1678d6855d2d..9e58cc33ed77 100644
--- a/science/InsightToolkit/Makefile
+++ b/science/InsightToolkit/Makefile
@@ -1,97 +1,98 @@
 PORTNAME=	InsightToolkit
 DISTVERSIONPREFIX=	v
 DISTVERSION=	5.3.0
+PORTREVISION=	1
 CATEGORIES=	science biology
 MASTER_SITES=	https://github.com/InsightSoftwareConsortium/ITK/releases/download/v${DISTVERSION}/:data
 DISTFILES=	InsightData-${DISTVERSION}.tar.gz:data
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Insight Toolkit
 WWW=		https://www.itk.org
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	googletest>=0:devel/googletest # gtest required for build, see https://github.com/InsightSoftwareConsortium/ITK/issues/3750
 LIB_DEPENDS=	libdouble-conversion.so:devel/double-conversion \
 		libfreetype.so:print/freetype2 \
 		libgdcmCommon.so:devel/gdcm \
 		libexpat.so:textproc/expat2 \
 		libfftw.so:math/fftw \
 		libhdf5.so:science/hdf5 \
 		libpng.so:graphics/png \
 		libsz.so:science/libaec \
 		libtiff.so:graphics/tiff \
 		libvcl.so:misc/vxl
 # dependencies for optional modules
 LIB_DEPENDS+=	libdcmjpls.so:graphics/dcmtk \
 		libvtkCommonCore-${VTK_VER}.so:math/vtk${VTK_VER:R}
 TEST_DEPENDS=	googletest>0:devel/googletest
 
 USES=		cmake:testing compiler:c++11-lang eigen:3,build,run gl jpeg localbase:ldflags pkgconfig python:run,test xorg
 USE_GL=		opengl
 USE_XORG=	x11
 USE_LDCONFIG=	${PREFIX}/lib/InsightToolkit
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	InsightSoftwareConsortium
 GH_PROJECT=	ITK
 
 CMAKE_ON=	BUILD_SHARED_LIBS \
 		ITK_LEGACY_SILENT \
 		ITK_USE_SYSTEM_DCMTK \
 		ITK_USE_SYSTEM_DOUBLECONVERSION \
 		ITK_USE_SYSTEM_EIGEN \
 		ITK_USE_SYSTEM_EXPAT \
 		ITK_USE_SYSTEM_FFTW \
 		ITK_USE_SYSTEM_GDCM \
 		ITK_USE_SYSTEM_HDF5 \
 		ITK_USE_SYSTEM_JPEG \
 		ITK_USE_SYSTEM_LIBRARIES \
 		ITK_USE_SYSTEM_PNG \
 		ITK_USE_SYSTEM_TIFF \
 		ITK_USE_SYSTEM_VXL \
 		ITK_USE_SYSTEM_ZLIB \
 		Module_ITKIOTransformMINC \
 		Module_ITKIOPNG \
 		Module_ITKReview
 CMAKE_ARGS=	-DPython3_EXECUTABLE=${PYTHON_CMD}
 CMAKE_OFF=	ITK_USE_KWSTYLE BUILD_TESTING
 CMAKE_TESTING_ON=	BUILD_TESTING # 4 tests are known to fail, see https://github.com/InsightSoftwareConsortium/ITK/issues/3739
 
 #LDFLAGS+=	-lcompat # workaround for: ld: error: lib/liblpsolve55.so.5.5.2: undefined reference to ftime
 LDFLAGS+=	-L${WRKSRC} -lftime # workaround for: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=257789, otherwise the above line should suffice
 
 ITK_VER=	${PORTVERSION:R}
 
 PLIST_SUB+=	ITK_VER=${ITK_VER}
 
 OPTIONS_DEFINE=	EXAMPLES
 EXAMPLES_DESC=	Build examples (very time consuming)
 
 EXAMPLES_CMAKE_BOOL=	BUILD_EXAMPLES
 
 BINARY_ALIAS=	git=${FILESDIR}/fake-git fetch=false
 
 .include <bsd.port.pre.mk>
 
 .if ${CHOSEN_COMPILER_TYPE} == gcc
 PLIST_SUB+=	CHOSEN_COMPILER_TYPE="GNU"
 .else
 PLIST_SUB+=	CHOSEN_COMPILER_TYPE="Clang"
 .endif
 
 post-extract:
 	@${MV} ${WRKDIR}/${PORTNAME}-${DISTVERSION}/.ExternalData/* ${WRKSRC}/.ExternalData/
 	@${RM} -r ${WRKDIR}/${PORTNAME}-${DISTVERSION}
 
 pre-configure: # workaround for https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=257789
 	@${SETENV} ${MAKE_ENV} ${CC} -c -fPIC ${FILESDIR}/ftime.c -o ${WRKSRC}/libftime.o
 	@${AR} -rcs ${WRKSRC}/libftime.a ${WRKSRC}/libftime.o
 
 post-install: # remove contentless docs
 	@${RM} -r ${STAGEDIR}${PREFIX}/share
 
 .include <Makefile.remote_modules>
 .include <../../math/vtk9/Makefile.version>
 .include <bsd.port.post.mk>
diff --git a/science/InsightToolkit501/Makefile b/science/InsightToolkit501/Makefile
index 3e4f0149f3c4..ddbd8a45aae3 100644
--- a/science/InsightToolkit501/Makefile
+++ b/science/InsightToolkit501/Makefile
@@ -1,67 +1,68 @@
 PORTNAME=	InsightToolkit
 PORTVERSION=	5.0.1
+PORTREVISION=	1
 DISTVERSIONPREFIX=v
 CATEGORIES=	science biology
 MASTER_SITES=	https://github.com/InsightSoftwareConsortium/ITK/releases/download/v5.0.1/:data
 PKGNAMESUFFIX=	501
 DISTFILES=	InsightData-5.0.1.tar.gz:data
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Insight Toolkit
 WWW=		https://www.itk.org
 
 LICENSE=	APACHE20
 
 BUILD_DEPENDS=	googletest>=0:devel/googletest
 LIB_DEPENDS=	libgdcmCommon.so:devel/gdcm \
 		libexpat.so:textproc/expat2 \
 		libfftw.so:math/fftw \
 		libhdf5.so:science/hdf5 \
 		libpng.so:graphics/png \
 		libsz.so:science/libaec \
 		libtiff.so:graphics/tiff
 
 USES=		cmake compiler:c++11-lang eigen:3 jpeg pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	InsightSoftwareConsortium
 GH_PROJECT=	ITK
 CMAKE_ARGS+=	-DBUILD_SHARED_LIBS:BOOL=ON \
 		-DITK_FORBID_DOWNLOADS:BOOL=ON \
 		-DITK_LEGACY_SILENT:BOOL=ON \
 		-DITK_USE_KWSTYLE:BOOL=OFF \
 		-DITK_USE_SYSTEM_EXPAT:BOOL=ON \
 		-DITK_USE_SYSTEM_FFTW:BOOL=ON \
 		-DITK_USE_SYSTEM_GDCM:BOOL=ON \
 		-DITK_USE_SYSTEM_HDF5:BOOL=ON \
 		-DITK_USE_SYSTEM_JPEG:BOOL=ON \
 		-DITK_USE_SYSTEM_LIBRARIES:BOOL=ON \
 		-DITK_USE_SYSTEM_PNG:BOOL=ON \
 		-DITK_USE_SYSTEM_TIFF:BOOL=ON \
 		-DITK_USE_SYSTEM_ZLIB:BOOL=ON \
 		-DModule_ITKIOMIC:BOOL=ON \
 		-DModule_ITKIOTransformMINC:BOOL=ON \
 		-DModule_ITKReview:BOOL=ON
 USE_LDCONFIG=	${PREFIX}/lib/InsightToolkit
 ITK_VER=	${PORTVERSION:R}
 PLIST_SUB+=	ITK_VER=${ITK_VER}
 
 OPTIONS_DEFINE=	EXAMPLES TESTING
 EXAMPLES_DESC=	Build examples (very time consuming)
 TESTING_DESC=	Build testing programs (very time consuming)
 
 EXAMPLES_CMAKE_ON=	-DBUILD_EXAMPLES:BOOL=ON
 TESTING_CMAKE_ON=	-DBUILD_TESTING:BOOL=ON
 
 .include <bsd.port.pre.mk>
 
 .if ${CHOSEN_COMPILER_TYPE} == gcc
 PLIST_SUB+=	CHOSEN_COMPILER_TYPE="GNU"
 .else
 PLIST_SUB+=	CHOSEN_COMPILER_TYPE="Clang"
 .endif
 
 post-extract:
 	${MV} ${WRKDIR}/${PORTNAME}-${PORTVERSION}/.ExternalData/* ${WRKSRC}/.ExternalData/
 	${RM} -r ${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 .include <bsd.port.post.mk>
diff --git a/science/PETSc/Makefile b/science/PETSc/Makefile
index 01006c41387f..9ef7b0f64f5a 100644
--- a/science/PETSc/Makefile
+++ b/science/PETSc/Makefile
@@ -1,60 +1,61 @@
 PORTNAME=	PETSc
 DISTVERSION=	3.19.0
+PORTREVISION=	1
 CATEGORIES=	science devel
 MASTER_SITES=	https://ftp.mcs.anl.gov/pub/petsc/release-snapshots/
 DISTNAME=	${PORTNAME:tl}-${DISTVERSION}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Suite of data structures and routines from Argonne National Laboratory
 WWW=		https://www.mcs.anl.gov/petsc
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	cmake:devel/cmake-core
 LIB_DEPENDS=	libmpich.so:net/mpich
 
 USES=		blaslapack fortran gmake python:3.7+ shebangfix xorg
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-shared-libraries=1 \
 		--with-mpi-dir=${LOCALBASE} \
 		--with-python=1 --with-python-pkg-config=${LOCALBASE}/libdata/pkgconfig \
 		FCFLAGS="${FCFLAGS}" FFLAGS="${FCFLAGS}"	\
 		${CONFIGURE_ARGS_${ARCH}} CPPFLAGS="${CPPFLAGS}" \
 		AR=${AR} RANLIB=${RANLIB} \
 		MAKEFLAGS="${MAKEFLAGS}" LDFLAGS="${LDFLAGS}" LIBS=""
 CONFIGURE_ARGS_amd64=	CFLAGS="${CFLAGS} -msse2" CXXFLAGS="${CXXFLAGS} -msse2"
 CONFIGURE_ARGS_i386=	CFLAGS="${CFLAGS} -msse2" CXXFLAGS="${CXXFLAGS} -msse2"
 CONFIGURE_ARGS=	--with-64-bit-indices # as opposed to 32-bit indices that are default
 CONFIGURE_LOG=	configure.log
 USE_XORG=	x11
 MAKEFILE=	makefile
 SHEBANG_FILES=	configure lib/petsc/bin/*.py lib/petsc/bin/saws/SAWs.py lib/petsc/bin/saws/*.bash config/*.py	\
 		lib/petsc/bin/petscnagfor share/petsc/chkerrconvert.py
 USE_LDCONFIG=	yes
 TEST_TARGET=	test # 152 of 11396 tests (1.3%) fail due to missing files like /usr/local/share/petsc/datafiles/meshes/square_periodic.msh (tests expect the packe to be installed)
 BINARY_ALIAS=	python=${PYTHON_CMD}
 
 LDFLAGS+=	${LOCALBASE}/lib/libmpi.so
 
 DATADIR=	${PREFIX}/share/${PORTNAME:tl}
 PLIST_SUB=	SHLIB=${DISTVERSION} SHL=${DISTVERSION:C/\.[0-9]$//}
 
 OPTIONS_DEFINE=		METIS
 OPTIONS_DEFAULT=	METIS
 
 METIS_DESC=		Enable metis support for graph partitioning algorithms
 METIS_CONFIGURE_ON=	--with-metis=1 # --with-parmetis=1 to use include/parmetis.h
 METIS_LIB_DEPENDS=	libmetis.so:math/metis
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpetsc.so.${DISTVERSION}
 	@${FIND} ${STAGEDIR}${PREFIX} -name "*.html" -delete
 	@cd ${STAGEDIR}${PREFIX} && ${RM} -r bin/win32fe lib/petsc/conf/uninstall.py
 	@${REINPLACE_CMD} -i '' -e 's|^PYTHON = .*|PYTHON = ${PYTHON_CMD}|' ${STAGEDIR}${PREFIX}/lib/petsc/conf/petscvariables
 	@${REINPLACE_CMD} -i '' -e 's|#!/.*|#!${PYTHON_CMD}|' ${STAGEDIR}${PREFIX}/lib/petsc/conf/reconfigure-arch-*-c-debug.py
 	@${RMDIR} ${STAGEDIR}${PREFIX}/lib/petsc/bin/__pycache__ # stray directory
 
 # the file /usr/local/share/petsc/examples/config/gmakegen.py is expected by some dependencies, at least by math/slepc
 
 .include <bsd.port.mk>
diff --git a/science/R-cran-DCluster/Makefile b/science/R-cran-DCluster/Makefile
index f4692449cd30..b5b77130af7f 100644
--- a/science/R-cran-DCluster/Makefile
+++ b/science/R-cran-DCluster/Makefile
@@ -1,16 +1,17 @@
 PORTNAME=	DCluster
 DISTVERSION=	0.2-8
+PORTREVISION=	1
 CATEGORIES=	science
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Functions for the detection of spatial clusters of diseases
 WWW=		https://cran.r-project.org/web/packages/DCluster/
 
 LICENSE=	GPLv2+
 
 RUN_DEPENDS=	R-cran-spdep>0:math/R-cran-spdep
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/science/R-cran-Epi/Makefile b/science/R-cran-Epi/Makefile
index 17bfa0c63ef4..100dafda42d2 100644
--- a/science/R-cran-Epi/Makefile
+++ b/science/R-cran-Epi/Makefile
@@ -1,25 +1,26 @@
 PORTNAME=	Epi
 PORTVERSION=	2.47
+PORTREVISION=	1
 CATEGORIES=	science
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Package for statistical analysis in epidemiology
 WWW=		https://cran.r-project.org/web/packages/Epi/
 
 LICENSE=	GPLv2
 
 CRAN_DEPENDS=	R-cran-cmprsk>0:science/R-cran-cmprsk \
 		R-cran-etm>0:science/R-cran-etm \
 		R-cran-plyr>0:devel/R-cran-plyr \
 		R-cran-dplyr>0:math/R-cran-dplyr \
 		R-cran-numDeriv>0:math/R-cran-numDeriv \
 		R-cran-data.table>0:devel/R-cran-data.table \
 		R-cran-zoo>0:math/R-cran-zoo \
 		R-cran-magrittr>0:devel/R-cran-magrittr
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=	cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/science/R-cran-FAdist/Makefile b/science/R-cran-FAdist/Makefile
index e7406c59c529..393fc9c56df3 100644
--- a/science/R-cran-FAdist/Makefile
+++ b/science/R-cran-FAdist/Makefile
@@ -1,14 +1,15 @@
 PORTNAME=	FAdist
 PORTVERSION=	2.4
+PORTREVISION=	1
 CATEGORIES=	science
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Probability distributions that are sometimes useful in hydrology
 WWW=		https://cran.r-project.org/web/packages/FAdist/index.html
 
 LICENSE=	GPLv2
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/science/R-cran-bayesm/Makefile b/science/R-cran-bayesm/Makefile
index baacd6c3610b..d3bc2a86a828 100644
--- a/science/R-cran-bayesm/Makefile
+++ b/science/R-cran-bayesm/Makefile
@@ -1,17 +1,18 @@
 PORTNAME=	bayesm
 DISTVERSION=	3.1-5
+PORTREVISION=	1
 CATEGORIES=	science
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Bayesian Inference for Marketing/Micro-econometrics
 WWW=		https://www.perossi.org/home/bsm-1
 
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	R-cran-RcppArmadillo>=0:math/R-cran-RcppArmadillo
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/science/R-cran-cmprsk/Makefile b/science/R-cran-cmprsk/Makefile
index 16d79ca315ae..86bb1edc9a1b 100644
--- a/science/R-cran-cmprsk/Makefile
+++ b/science/R-cran-cmprsk/Makefile
@@ -1,14 +1,15 @@
 PORTNAME=	cmprsk
 DISTVERSION=	2.2-11
+PORTREVISION=	1
 CATEGORIES=	science
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Subdistribution Analysis of Competing Risks
 WWW=		https://cran.r-project.org/web/packages/cmprsk/
 
 LICENSE=	GPLv2+
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/science/R-cran-e1071/Makefile b/science/R-cran-e1071/Makefile
index a531adce9257..8f1a8ffbbc6f 100644
--- a/science/R-cran-e1071/Makefile
+++ b/science/R-cran-e1071/Makefile
@@ -1,18 +1,19 @@
 PORTNAME=	e1071
 DISTVERSION=	1.7-11
+PORTREVISION=	1
 CATEGORIES=	science
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Misc Functions of the Department of Statistics (e1071), TU Wien
 WWW=		https://cran.r-project.org/web/packages/e1071/
 
 LICENSE=	GPLv2+
 
 CRAN_DEPENDS=	R-cran-proxy>0:math/R-cran-proxy
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=	cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/science/R-cran-eco/Makefile b/science/R-cran-eco/Makefile
index f5bc518e189e..c792a1d023b9 100644
--- a/science/R-cran-eco/Makefile
+++ b/science/R-cran-eco/Makefile
@@ -1,13 +1,13 @@
 PORTNAME=	eco
 PORTVERSION=	3.1.6
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	science
 DISTNAME=	${PORTNAME}_${PORTVERSION:C/\./-/g:C/-/./1}
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	R Package for Ecological Inference in 2x2 Tables
 WWW=		https://imai.princeton.edu/software/eco.html
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/science/R-cran-epicalc/Makefile b/science/R-cran-epicalc/Makefile
index 255ab8bbffa5..a3df792bf11f 100644
--- a/science/R-cran-epicalc/Makefile
+++ b/science/R-cran-epicalc/Makefile
@@ -1,13 +1,13 @@
 PORTNAME=	epicalc
 PORTVERSION=	2.15.1.0
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	science
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Epidemiological calculator
 WWW=		https://cran.r-project.org/web/packages/epicalc/
 
 USES=	cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/science/R-cran-etm/Makefile b/science/R-cran-etm/Makefile
index f1bdd4814e1d..9cfb1600bdd1 100644
--- a/science/R-cran-etm/Makefile
+++ b/science/R-cran-etm/Makefile
@@ -1,20 +1,21 @@
 PORTNAME=	etm
 DISTVERSION=	1.1.1
+PORTREVISION=	1
 CATEGORIES=	science
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Empirical Transition Matrix
 WWW=		https://cran.r-project.org/web/packages/etm/
 
 LICENSE=	MIT
 
 CRAN_DEPENDS=	R-cran-data.table>0:devel/R-cran-data.table \
 		R-cran-Rcpp>=0.11.4:devel/R-cran-Rcpp \
 		R-cran-RcppArmadillo>0:math/R-cran-RcppArmadillo
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/science/R-cran-fastICA/Makefile b/science/R-cran-fastICA/Makefile
index 2929a205a6dc..94c60055dbce 100644
--- a/science/R-cran-fastICA/Makefile
+++ b/science/R-cran-fastICA/Makefile
@@ -1,15 +1,16 @@
 PORTNAME=	fastICA
 DISTVERSION=	1.2-3
+PORTREVISION=	1
 CATEGORIES=	science math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	ygy@FreeBSD.org
 COMMENT=	FastICA Algorithms to Perform ICA and Projection Pursuit
 WWW=		https://CRAN.R-project.org/package=fastICA
 
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/science/R-cran-kernlab/Makefile b/science/R-cran-kernlab/Makefile
index bf7b4364e5c6..e2649af21c18 100644
--- a/science/R-cran-kernlab/Makefile
+++ b/science/R-cran-kernlab/Makefile
@@ -1,14 +1,15 @@
 PORTNAME=	kernlab
 DISTVERSION=	0.9-31
+PORTREVISION=	1
 CATEGORIES=	science
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Kernel-Based Machine Learning Lab
 WWW=		https://cran.r-project.org/web/packages/kernlab/
 
 LICENSE=	GPLv2
 
 USES=		compiler:c++11-lang cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/science/R-cran-ks/Makefile b/science/R-cran-ks/Makefile
index 7e977b7b8cd5..87dc24561e90 100644
--- a/science/R-cran-ks/Makefile
+++ b/science/R-cran-ks/Makefile
@@ -1,23 +1,24 @@
 PORTNAME=	ks
 PORTVERSION=	1.14.0
+PORTREVISION=	1
 CATEGORIES=	science
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Kernel Smoothing
 WWW=		https://cran.r-project.org/package=ks
 
 LICENSE=	GPLv2+
 
 RUN_DEPENDS=	R-cran-FNN>0:math/R-cran-FNN	\
 		R-cran-mclust>0:math/R-cran-mclust	\
 		R-cran-plot3D>0:math/R-cran-plot3D	\
 		R-cran-pracma>0:math/R-cran-pracma	\
 		R-cran-mvtnorm>0:math/R-cran-mvtnorm	\
 		R-cran-kernlab>0:science/R-cran-kernlab	\
 		R-cran-multicool>0:devel/R-cran-multicool
 #TEST_DEPENDS=	R-cran-oz>0:graphics/R-cran-oz
 
 USES=		cran:compiles
 
 .include <bsd.port.mk>
diff --git a/science/R-cran-snow/Makefile b/science/R-cran-snow/Makefile
index c4c9ecf186f9..69bbbc62f561 100644
--- a/science/R-cran-snow/Makefile
+++ b/science/R-cran-snow/Makefile
@@ -1,14 +1,15 @@
 PORTNAME=	snow
 DISTVERSION=	0.4-4
+PORTREVISION=	1
 CATEGORIES=	science
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Support for simple parallel computing in R
 WWW=		https://cran.r-project.org/web/packages/snow/
 
 LICENSE=	GPLv2+
 
 USES=	cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/science/R-cran-som/Makefile b/science/R-cran-som/Makefile
index 9142d51b4231..e6bc316c05c3 100644
--- a/science/R-cran-som/Makefile
+++ b/science/R-cran-som/Makefile
@@ -1,15 +1,15 @@
 PORTNAME=	som
 DISTVERSION=	0.3-5.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	science
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Self-Organizing Map
 WWW=		https://cran.r-project.org/web/packages/som/
 
 LICENSE=	GPLv3
 
 USES=	cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/science/R-cran-udunits2/Makefile b/science/R-cran-udunits2/Makefile
index d0011272ee8e..3825ea143033 100644
--- a/science/R-cran-udunits2/Makefile
+++ b/science/R-cran-udunits2/Makefile
@@ -1,17 +1,18 @@
 PORTNAME=	udunits2
 PORTVERSION=	0.13.2.1
+PORTREVISION=	1
 CATEGORIES=	science
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Udunits-2 Bindings for R
 WWW=		https://cran.r-project.org/web/packages/udunits2/
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libudunits2.so:science/udunits \
 		libexpat.so:textproc/expat2
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/science/abinit/Makefile b/science/abinit/Makefile
index 8abce29c2717..26f3e310280b 100644
--- a/science/abinit/Makefile
+++ b/science/abinit/Makefile
@@ -1,98 +1,98 @@
 PORTNAME=	abinit
 DISTVERSION=	9.6.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Full-featured atomic-scale first-principles simulation software
 WWW=		https://www.abinit.org
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 ONLY_FOR_ARCHS=	amd64 powerpc64 powerpc64le
 
 BUILD_DEPENDS=	gm4:devel/m4	\
 		${PYNUMPY}	\
 		${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}graphviz>0:graphics/py-graphviz@${PY_FLAVOR}
 LIB_DEPENDS=	libelpa.so:math/elpa		\
 		libsz.so:science/libaec		\
 		libelpa.so:math/elpa		\
 		libxc.so:science/libxc		\
 		libfftw3.so:math/fftw3		\
 		libhdf5.so:science/hdf5		\
 		libxml2.so:textproc/libxml2	\
 		libnetcdf.so:science/netcdf	\
 		libxmlf90.so:textproc/xmlf90	\
 		libwannier.so:science/wannier90	\
 		libnetcdff.so:science/netcdf-fortran
 RUN_DEPENDS=	atompaw:science/atompaw
 TEST_DEPENDS=	${PYNUMPY}	\
 		libyaml>0:textproc/libyaml
 
 USES=		autoreconf:build blaslapack:netlib fortran gmake gnome localbase:ldflags	\
 		python:3.7+ shebangfix
 USE_GITHUB=	yes
 USE_GNOME=	libxml2
 SHEBANG_FILES=	config/scripts/* doc/tutorial/paral_gspw_assets/abinit.sub.*
 SHEBANG_GLOB=	*.py
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CC_LDFLAGS="${LDFLAGS}" CXX_LDFLAGS="${LDFLAGS}" FC_LDFLAGS="${LDFLAGS}"	\
 		H5CC="${LOCALBASE}/bin/h5cc" \
 		HDF5_CFLAGS="-I${LOCALBASE}/include" \
 		HDF5_LDFLAGS="-L${LOCALBASE}/lib -lhdf5" \
 		LINALG_FCFLAGS="-I${LOCALBASE}/include/elpa-2019.05.002/modules"	\
 		LINALG_LIBS="${BLASLIB}  ${LAPACKLIB} -lelpa"	\
 		NETCDF_FORTRAN_FCFLAGS=-I${LOCALBASE}/include	\
 		XMLF90_FCFLAGS=-I${LOCALBASE}/include	\
 		WANNIER90_LIBS="${BLASLIB}  ${LAPACKLIB} -lwannier"
 CONFIGURE_ARGS=	--with-fft --with-libxc --with-libxml2 --with-netcdf	\
 		--with-netcdf-fortran --with-wannier90 --with-xmlf90
 FCFLAGS+=	-ffree-line-length-none
 TEST_TARGET=	tests_abirules tests_buildsys
 TEST_WRKSRC=	${WRKSRC}/abichecks
 PORTDOCS=	*
 
 OPTIONS_DEFINE=			DOCS OPENMP MPI
 OPTIONS_DEFAULT=		OPENMP MPI
 
 OPENMP_CONFIGURE_ENABLE=	openmp
 OPENMP_LDFLAGS=			-lomp
 
 MPI_CONFIGURE_WITH=		mpi=yes
 # fftw3 not enabled because libfftw3_mpi is required but not packaged
 MPI_VARS=			FFLAGS+=-I${LOCALBASE}/include FCFLAGS+=-I${LOCALBASE}/include	\
 				CONFIGURE_ENV+=MPI_LIBS="`pkg-config --libs mpich` -lmpifort"	\
 				CONFIGURE_ENV+MPI_LDFLAGS="`pkg-config --libs mpich` -lmpifort"
 MPI_BUILD_DEPENDS=		mpich>0:net/mpich
 MPI_RUN_DEPENDS=		mpich>0:net/mpich
 
 .if defined(WITH_LEVMAR)
 # --with-levmar seems deprecated
 LIB_DEPENDS+=	liblevmar.so:math/levmar
 CONFIGURE_ENV+=	LEVMAR_LIBS="-llevmar ${BLASLIB} ${LAPACKLIB}"
 CONFIGURE_ARGS+=	--with-levmar
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${GCC_DEFAULT} >= 10
 FCFLAGS+=	-fallow-argument-mismatch # see https://github.com/abinit/abinit/issues/41
 .endif
 
 pre-configure:
 	(cd ${WRKSRC} && ./autogen.sh)
 
 post-install-DOCS-on:
 	${REINPLACE_CMD} -e 's|/usr/bin/env  python|${PYTHON_CMD}|'	\
 		${WRKSRC}/doc/tutorial/paral_moldyn_assets/diag_moldyn.py
 	${RM} ${WRKSRC}/doc/tutorial/paral_moldyn_assets/diag_moldyn.py.bak
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${CP} -R ${WRKSRC}/doc/tutorial ${STAGEDIR}${DOCSDIR}
 
 pre-test:
 	${TOUCH} ${TEST_WRKSRC}/make.log
 
 .include <bsd.port.post.mk>
diff --git a/science/afni/Makefile b/science/afni/Makefile
index 23fb65643d76..acad0c866244 100644
--- a/science/afni/Makefile
+++ b/science/afni/Makefile
@@ -1,164 +1,165 @@
 PORTNAME=		afni
 DISTVERSIONPREFIX=	AFNI_
 DISTVERSION=		23.1.01
+PORTREVISION=	1
 CATEGORIES=		science biology graphics perl5 python
 
 MAINTAINER=	fernape@FreeBSD.org
 COMMENT=	Advanced Functional Neuro Imaging
 WWW=		https://afni.nimh.nih.gov/afni/
 
 LICENSE=	GPLv2
 
 BROKEN_aarch64=	fails to build: statement requires expression of scalar type \
 		('va_list' (aka '__builtin_va_list') invalid)
 
 CRAN_DEPENDS=	R-cran-lme4>0:math/R-cran-lme4 \
 		R-cran-snow>0:science/R-cran-snow \
 		R-cran-psych>0:math/R-cran-psych
 BUILD_DEPENDS=	gm4:devel/m4 \
 		R:math/R \
 		${CRAN_DEPENDS}
 LIB_DEPENDS=	libexpat.so:textproc/expat2 \
 		libXm.so:x11-toolkits/open-motif \
 		libf2c.so:lang/f2c \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libgsl.so:math/gsl \
 		libicudata.so:devel/icu \
 		libnetcdff.so:science/netcdf-fortran \
 		libnetpbm.so:graphics/netpbm \
 		libpcre2-8.so:devel/pcre2 \
 		libpng16.so:graphics/png \
 		libxml2.so:textproc/libxml2
 
 # Remote execution of suma.  Also needed for glxinfo.
 RUN_DEPENDS=	endian:sysutils/endian \
 		mpeg_encode:multimedia/mpeg_encode \
 		qhull:math/qhull \
 		R:math/R \
 		${CRAN_DEPENDS}
 
 USES=		gettext gl gmake gnome iconv jpeg:run motif readline
 USES+=		perl5 python shebangfix tar:xz xorg
 USE_GITHUB=	yes
 USE_GL=		gl glu
 USE_GNOME=	glib20
 USE_XORG= 	ice sm x11 xau xcb xdmcp xext xft xi xmu xrender xt
 
 SHEBANG_FILES=	scripts_install/* \
 		python_scripts/afnipy/*.py \
 		python_scripts/scripts/*.py \
 		jzosky/*.py \
 		jzosky/lib_RetroTS/*.py \
 		discoraj/ClusterExplorer/*.py \
 		pkundu/*.py \
 		pkundu/meica.libs/*.py \
 		pkundu/meica.libs/*/*.py \
 		pkundu/meica.libs/*/*/*.py
 
 MAKE_ENV=	CC="${CC}" R_SHARE_DIR=${LOCALBASE}/lib/R/share
 MAKE_JOBS_UNSAFE=yes
 ALL_TARGET=	vastness suma
 
 CFLAGS+=	-fcommon
 
 ###########################################################################
 # Install parameters
 
 SUB_FILES=	pkg-message afni.cshrc afni.profile
 
 INSTALL_WRKSRC=	${WRKSRC}/BSD
 WRKSRC_SUBDIR=	src
 
 OPTIONS_DEFINE=	DOCS
 
 INSTALL_TMP=	${INSTALL_WRKSRC}-temp
 PRESTAGE=	${WRKSRC}/prestage
 
 .include <bsd.port.options.mk>
 
 CONFLICTS=	im \
 		nifticlib \
 		open-usp-tukubai
 
 X11R6_FILES=	coxplot/Makefile \
 		coxplot/Makefile.f2c
 
 PKG_COMPRESSION_LEVEL= 	-6
 
 post-extract:
 .for f in ${X11R6_FILES}
 	@${REINPLACE_CMD} \
 		-e 's|/usr/X11R6|$${LOCALBASE}|g' ${WRKSRC}/${f}
 .endfor
 	@${REINPLACE_CMD} \
 		-E 's|AFNI_[0-9_]+|${PORTVERSION}|g' ${WRKSRC}/AFNI_label.h
 	@${CP} ${FILESDIR}/Makefile ${WRKSRC}
 	@${RM} ${WRKSRC}/3DEdge/src/Makefile.orig
 
 pre-configure:
 	@${REINPLACE_CMD} -e "s|-lglib|-lglib-2.0|g" \
 		${WRKSRC}/SUMA/SUMA_Makefile
 	@${REINPLACE_CMD} \
 		-e 's|os\.path\.dirname(os\.path\.abspath(os\.path\.expanduser(sys\.argv\[0\])))|"${DATADIR}"|g' \
 		${WRKSRC}/pkundu/meica.py
 
 do-install:
 	# AFNI install just dumps everything into one flat directory
 	# ${WRKSRC}/BSD == ${INSTALL_WRKSRC}.
 	# Preserve ${INSTALL_WRKSRC} and make a sacrificial temp copy
 	# to be pruned and rearranged for easy staging
 	@${RM} -r ${INSTALL_TMP}
 	@${CP} -R ${INSTALL_WRKSRC} ${INSTALL_TMP}
 
 	# Clean up and organize files into ${PRESTAGE}, destroying
 	# ${INSTALL_TMP} in the process
 	@${RM} -rf ${PRESTAGE}
 	@${MKDIR} ${PRESTAGE}/bin \
 		${PRESTAGE}/scripts \
 		${PRESTAGE}/lib \
 		${PRESTAGE}/include \
 		${PRESTAGE}/trash \
 		${PRESTAGE}/doc \
 		${PRESTAGE}/share \
 		${PRESTAGE}/pylib
 	@${RM}	${INSTALL_TMP}/libf2c.a
 	@${MV}	${INSTALL_TMP}/meica.libs \
 		${INSTALL_TMP}/shiny \
 		${INSTALL_TMP}/lib_RetroTS \
 		${INSTALL_TMP}/funstuff \
 		${INSTALL_TMP}/AFNI.*rc \
 		${INSTALL_TMP}/afnigui* \
 		${PRESTAGE}/share
 	@${MV}	${INSTALL_TMP}/*.a \
 		${INSTALL_TMP}/*.so \
 		${PRESTAGE}/lib
 	@${MV}	${INSTALL_TMP}/*.h ${PRESTAGE}/include
 	@${MV}	${INSTALL_TMP}/afnipy ${PRESTAGE}/pylib
 	@${CP}	${WRKDIR}/afni-AFNI_${PORTVERSION}/doc/README/* ${PRESTAGE}/doc
 	@for binary in `${FILE} ${INSTALL_TMP}/* | fgrep 'ELF' | ${AWK} -F ':' ' { print $$1 }'` ; do \
 		${MV} $${binary} ${PRESTAGE}/bin ; \
 	done
 	@${MV}	${INSTALL_TMP}/* ${PRESTAGE}/scripts
 
 	# Install to STAGEDIR using proper ports tools
 	@${MKDIR} \
 		${STAGEDIR}${DATADIR} \
 		${STAGEDIR}${PREFIX}/lib/afni \
 		${STAGEDIR}${PREFIX}/include/afni \
 		${STAGEDIR}${DOCSDIR} \
 		${STAGEDIR}${PREFIX}/etc/mri
 	${INSTALL_PROGRAM} ${PRESTAGE}/bin/* ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${PRESTAGE}/scripts/* ${STAGEDIR}${PREFIX}/bin
 	(cd ${PRESTAGE}/pylib && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${PYTHON_SITELIBDIR})
 	${INSTALL_DATA} ${PRESTAGE}/lib/* ${STAGEDIR}${PREFIX}/lib/afni
 	${INSTALL_DATA} ${PRESTAGE}/include/* ${STAGEDIR}${PREFIX}/include/afni
 	(cd ${PRESTAGE}/share && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR})
 	${INSTALL_SCRIPT} ${WRKDIR}/afni.cshrc ${WRKDIR}/afni.profile \
 		${STAGEDIR}${PREFIX}/etc/mri
 
 do-install-DOCS-on:
 	${INSTALL_DATA} ${PRESTAGE}/doc/* ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/science/agrum/Makefile b/science/agrum/Makefile
index fa53c8d5cf13..692a0754e656 100644
--- a/science/agrum/Makefile
+++ b/science/agrum/Makefile
@@ -1,64 +1,65 @@
 PORTNAME=	agrum
 DISTVERSION=	1.5.2
+PORTREVISION=	1
 CATEGORIES=	science math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Graphical modeler for Bayesian networks, influence diagrams, etc
 WWW=		https://agrum.gitlab.io/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_FreeBSD_12=	requires modern C++ compiler: error: invalid value 'c++2b'
 
 USES=		cmake compiler:c++20-lang shebangfix # the 'act' executable uses 'python' and is broken, when act is broken CMakeLists.txt builds with default configuration which is fine
 USE_LDCONFIG=	yes
 
 LLD_UNSAFE=	yes
 
 USE_GITLAB=	yes
 GL_ACCOUNT=	agrumery
 GL_PROJECT=	aGrUM
 GL_COMMIT=	9534f1a9e4855c9ec31883cb9b3acc88113a13e1
 
 SHEBANG_FILES=	act
 
 CMAKE_ARGS=	-DPython_EXECUTABLE=${PYTHON_CMD}
 CMAKE_OFF=	USE_SWIG
 
 PLIST_SUB+=	VERSION=${PORTVERSION}
 
 OPTIONS_DEFINE=		ODBC OPENMP PYTHON
 OPTIONS_DEFAULT=	OPENMP PYTHON
 OPTIONS_SUB=		yes
 
 ODBC_CMAKE_BOOL=	USE_NANODBC
 ODBC_USES=		localbase:ldflags
 ODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC
 
 OPENMP_CMAKE_BOOL=	USE_OPENMP
 
 PYTHON_CMAKE_BOOL=	BUILD_PYTHON
 PYTHON_USES=		python:3.7+
 PYTHON_PLIST_SUB=	PYTHON_VER_MAJ=${PYTHON_VER:R}
 PYTHON_RUN_DEPENDS=	${PYNUMPY} \
 			${PYTHON_PKGNAMEPREFIX}configparser>0:devel/py-configparser@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}ipython>0:devel/ipython@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}nbconvert>0:devel/py-nbconvert@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}nbformat>0:devel/py-nbformat@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}pydotplus>0:graphics/py-pydotplus@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}scikit-learn>0:science/py-scikit-learn@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}tqdm>0:misc/py-tqdm@${PY_FLAVOR}
 			# see wrappers/pyAgrum/requirements.txt and wrappers/pyAgrum/testunits/optional_requirements.txt
 
 BINARY_ALIAS=	gcc=${CC} g++=${CXX} # only for tests, see https://gitlab.com/agrumery/aGrUM/-/issues/100
 
 do-test:
 	@cd ${WRKSRC} && \
 		${SETENV} ${MAKE_ENV} ./act test release agrum -t all
 
 .include <bsd.port.mk>
diff --git a/science/aircraft-datcom/Makefile b/science/aircraft-datcom/Makefile
index ed0e43877704..9557dada4757 100644
--- a/science/aircraft-datcom/Makefile
+++ b/science/aircraft-datcom/Makefile
@@ -1,25 +1,25 @@
 PORTNAME=	aircraft-datcom
 DISTVERSION=	0.0.20120723
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	science
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Modified USAF Aircraft Stability and Control Data Compendium
 WWW=		https://www.pdas.com/datcom.html
 
 LICENSE=	GPLv3
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	arktools
 GH_TAGNAME=	ed877bb
 
 USES=	fortran cmake
 FFLAGS+=	-std=legacy
 
 OPTIONS_DEFINE=	DOCS
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/* ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/science/antioch/Makefile b/science/antioch/Makefile
index 4f6175a378a7..b7f7acb96e81 100644
--- a/science/antioch/Makefile
+++ b/science/antioch/Makefile
@@ -1,36 +1,36 @@
 PORTNAME=	antioch
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.4.0-156
 DISTVERSIONSUFFIX=	-g90ffa43
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	C++ Chemical Kinetics, Thermodynaimics, and Transport Library
 WWW=		https://libantioch.github.io/
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${LOCALBASE}/include/metaphysicl/metaphysicl_version.h:science/metaphysicl \
 		${LOCALBASE}/include/viennacl/vector.hpp:math/viennacl
 LIB_DEPENDS=	libgsl.so:math/gsl \
 		libOpenCL.so:devel/ocl-icd
 
 USES=		autoreconf compiler:c++11-lang eigen:3 gmake libtool localbase
 USE_GITHUB=	yes
 GH_ACCOUNT=	libantioch
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
 CONFIGURE_ARGS=	--disable-static \
 		--enable-eigen --with-eigen-include=${LOCALBASE}/include/eigen3 \
 		--enable-opencl \
 		--with-metaphysicl=${LOCALBASE} \
 		--with-viennacl=${LOCALBASE}/include \
 		--with-gsl=${LOCALBASE}
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libantioch.so.0.0.0
 
 .include <bsd.port.mk>
diff --git a/science/ascent/Makefile b/science/ascent/Makefile
index ae8c1c5ed88b..93046b5de338 100644
--- a/science/ascent/Makefile
+++ b/science/ascent/Makefile
@@ -1,52 +1,53 @@
 PORTNAME=	ascent
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.9.0
+PORTREVISION=	1
 CATEGORIES=	science
 PKGNAMESUFFIX=	-visualizer
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Visualization and analysis runtime for multi-physics HPC simulations
 WWW=		https://ascent.readthedocs.io/en/latest/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/../LICENSE
 
 LIB_DEPENDS=	libconduit.so:science/conduit \
 		libhdf5.so:science/hdf5 \
 		libsiloh5.so:science/silo \
 		libsysinfo.so:devel/libsysinfo \
 		libsz.so:science/libaec
 
 USES=		cmake:testing compiler:c++11-lang fortran localbase:ldflags
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Alpine-DAV
 GH_TUPLE=	Alpine-DAV:spack_configs:26ea412:spack_configs/../scripts/uberenv_configs/spack_configs \
 		LLNL:blt:86a7d6b:blt/blt \
 		llnl:uberenv:105e384:uberenv/../scripts/uberenv
 
 CMAKE_OFF=	ENABLE_PYTHON ENABLE_DOCS ENABLE_TESTS ENABLE_EXAMPLES
 CMAKE_OFF+=	ENABLE_UTILS # utils are installed into a non-standard path, see https://github.com/Alpine-DAV/ascent/issues/814
 CMAKE_ARGS=	-DCONDUIT_DIR=${LOCALBASE}
 CMAKE_TESTING_ON=	ENABLE_TESTS # one testcase fails because conduit lacks HDF5, see https://github.com/LLNL/conduit/issues/840
 
 LDFLAGS+=	-lsysinfo
 
 WRKSRC_SUBDIR=	src
 
 OPTIONS_SINGLE=		MPI
 OPTIONS_SINGLE_MPI=	NOMPI MPICH OPENMPI
 OPTIONS_DEFAULT=	MPICH
 OPTIONS_SUB=		yes
 
 NOMPI_DESC=		Build without parallel processing support
 NOMPI_CMAKE_ON=		-DENABLE_MPI=OFF
 
 MPICH_USES=		mpi:mpich
 MPICH_CMAKE_ON=		-DENABLE_MPI=ON
 
 OPENMPI_USES=		mpi:openmpi
 OPENMPI_CMAKE_ON=	-DENABLE_MPI=ON
 OPENMPI_BROKEN=		still chooses mpich, see https://github.com/Alpine-DAV/ascent/issues/1091
 
 .include <bsd.port.mk>
diff --git a/science/atompaw/Makefile b/science/atompaw/Makefile
index e2c7cf001a65..183e39a92e55 100644
--- a/science/atompaw/Makefile
+++ b/science/atompaw/Makefile
@@ -1,32 +1,32 @@
 PORTNAME=	atompaw
 DISTVERSION=	4.2.0.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	science
 MASTER_SITES=	http://users.wfu.edu/natalie/papers/pwpaw/
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Tool for projector augmented wave functions for molecular simulations
 WWW=		https://users.wfu.edu/natalie/papers/pwpaw/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	liblapack.so:math/lapack \
 		libblas.so:math/blas
 
 USES=		fortran gmake libtool
 GNU_CONFIGURE=	yes
 
 OPTIONS_DEFINE=		DOCS LIBXC
 OPTIONS_DEFAULT=	LIBXC
 
 LIBXC_DESC=		Build with libxc
 LIBXC_CONFIGURE_ENABLE=	libxc
 LIBXC_LIB_DEPENDS=	libxc.so:science/libxc
 
 PORTDOCS=	*
 
 PLIST_FILES=	bin/atompaw \
 		bin/graphatom
 
 .include <bsd.port.mk>
diff --git a/science/avogadro2/Makefile b/science/avogadro2/Makefile
index 3902ae15ca0b..751d314ffbd3 100644
--- a/science/avogadro2/Makefile
+++ b/science/avogadro2/Makefile
@@ -1,29 +1,30 @@
 PORTNAME=	avogadro2
 DISTVERSION=	1.97.0
+PORTREVISION=	1
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Chemical editor and visualization application
 WWW=		https://two.avogadro.cc/ # also https://www.openchemistry.org/projects/avogadro2/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	hdf5>0:science/hdf5
 LIB_DEPENDS=	libAvogadroCore.so:science/avogadrolibs \
 		libMoleQueueClient.so:misc/molequeue
 
 USES=		cmake compiler:c++11-lang desktop-file-utils gl libarchive qt:5
 USE_QT=		core concurrent gui network widgets buildtools:build qmake:build
 USE_GL=		gl glew glu
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	OpenChemistry
 GH_PROJECT=	avogadroapp
 GH_TUPLE=	flathub:shared-modules:1bb5393:flathub_shared_modules/flatpak/shared-modules \
 		openchemistry:avogadro-i18n:16142cf:i18n/../avogadro-i18n
 
 post-install:
 	@${RM} -r ${STAGEDIR}${PREFIX}/share/doc
 
 .include <bsd.port.mk>
diff --git a/science/avogadrolibs/Makefile b/science/avogadrolibs/Makefile
index dd2f0f21d2a2..80d49b2cea1b 100644
--- a/science/avogadrolibs/Makefile
+++ b/science/avogadrolibs/Makefile
@@ -1,78 +1,78 @@
 PORTNAME=	avogadrolibs
 DISTVERSION=	1.97.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Avogadro2 libraries for chemical editor and visualization applications
 WWW=		https://www.openchemistry.org/projects/avogadro2/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 TEST_DEPENDS=	googletest>0:devel/googletest \
 		molequeue>0:misc/molequeue
 
 USES=		cmake:testing compiler:c++17-lang eigen:3,build,run # eigen needs to be 'run' because it is written into cmake files
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	OpenChemistry
 GH_TUPLE=	OpenChemistry:molecules:b1e16c5:molecules/../molecules \
 		OpenChemistry:crystals:73a5bbc:crystals/../crystals
 
 CMAKE_ON=		BUILD_SHARED_LIBS
 CMAKE_TESTING_ON=	ENABLE_TESTING
 
 OPTIONS_DEFINE=		HDF5 LIBARCHIVE LIBMSYM MMTF OPENGL QT5 SPGLIB VTK
 OPTIONS_DEFAULT=	LIBARCHIVE LIBMSYM OPENGL QT5 SPGLIB # MMTF
 OPTIONS_SUB=		yes
 
 HDF5_CMAKE_BOOL=	USE_HDF5
 HDF5_LIB_DEPENDS=	libhdf5.so:science/hdf5 \
 			libsz.so:science/libaec
 
 LIBARCHIVE_DESC=	Enable optional Libarchive features
 LIBARCHIVE_CMAKE_BOOL=	USE_LIBARCHIVE
 LIBARCHIVE_USES=	libarchive
 LIBARCHIVE_IMPLIES=	QT5
 
 LIBMSYM_DESC=		Enable optional features using libmsym
 LIBMSYM_CMAKE_BOOL=	USE_LIBMSYM
 LIBMSYM_LIB_DEPENDS=	libmsym.so:science/libmsym
 LIBMSYM_IMPLIES=	QT5 # enables the 'symmetry' Qt plugin
 
 MMTF_DESC=		Enable optional features using mmtf
 MMTF_CMAKE_BOOL=	USE_MMTF
 MMTF_BUILD_DEPENDS=	mmtf-cpp>0:science/mmtf-cpp
 MMTF_BROKEN=		see https://github.com/OpenChemistry/avogadrolibs/issues/1185
 
 OPENGL_CMAKE_BOOL=	USE_OPENGL
 OPENGL_USES=		gl
 OPENGL_USE=		GL=gl,glew,glu
 
 QT5_CMAKE_BOOL=		USE_QT
 QT5_USES=		qt:5
 QT5_USE=		QT=core,concurrent,gui,network,svg,widgets,buildtools:build,qmake:build
 QT5_IMPLIES=		OPENGL
 
 SPGLIB_DESC=		Enable optional features using spglib
 SPGLIB_CMAKE_BOOL=	USE_SPGLIB
 SPGLIB_CMAKE_ON=	-DSPGLIB_INCLUDE_DIR=${LOCALBASE}/include/spglib
 SPGLIB_LIB_DEPENDS=	libsymspg.so:science/spglib
 SPGLIB_IMPLIES=		QT5 # USE_SPGLIB only installs header file without USE_QT, and also installs SpaceGroup.a with USE_QT, see https://github.com/OpenChemistry/avogadrolibs/issues/610
 
 VTK_DESC=		Enable libraries that use VTK
 VTK_USES=		xorg
 VTK_USE=		QT=opengl XORG=x11
 VTK_CMAKE_BOOL=		USE_VTK
 VTK_LIB_DEPENDS=	libvtksys-${VTK_VER}.so:math/vtk${VTK_VER:R} \
 			libfreetype.so:print/freetype2
 VTK_IMPLIES=		QT5
 VTK_BROKEN=		Needs https://github.com/psavery/genXrdPattern, see https://github.com/OpenChemistry/avogadrolibs/issues/1186
 
 post-install:
 	@${RM} -r ${STAGEDIR}${PREFIX}/share/doc
 
 .include <../../math/vtk9/Makefile.version>
 .include <bsd.port.mk>
diff --git a/science/axom/Makefile b/science/axom/Makefile
index 239fdbe60804..2274fec799cd 100644
--- a/science/axom/Makefile
+++ b/science/axom/Makefile
@@ -1,77 +1,78 @@
 PORTNAME=	axom
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.7.0
+PORTREVISION=	1
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Infrastructure for development of multi-physics applications and tools
 WWW=		https://github.com/LLNL/axom
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/../LICENSE
 
 BROKEN_armv7=	use of overloaded operator '[]' is ambiguous, see https://github.com/LLNL/axom/issues/743
 BROKEN_i386=	use of overloaded operator '[]' is ambiguous, see https://github.com/LLNL/axom/issues/743
 BROKEN_powerpc=	use of overloaded operator '[]' is ambiguous, see https://github.com/LLNL/axom/issues/743
 
 LIB_DEPENDS=	libconduit.so:science/conduit \
 		libhdf5.so:science/hdf5 \
 		libsiloh5.so:science/silo \
 		libsz.so:science/libaec
 RUN_DEPENDS=	sparsehash>0:devel/sparsehash
 
 USES=		cmake:testing compiler:c++11-lang
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	LLNL
 GH_TUPLE=	LLNL:axom_data:185f28f:axom_data/../data \
 		LLNL:blt:7c8ac7e:blt/cmake/blt \
 		LLNL:uberenv:f46566f:uberenv/../scripts/uberenv
 
 CMAKE_OFF=	AXOM_ENABLE_DOCS AXOM_ENABLE_EXAMPLES AXOM_ENABLE_TESTS AXOM_ENABLE_EXAMPLES
 CMAKE_ON=	BUILD_SHARED_LIBS
 CMAKE_TESTING_ON=	AXOM_ENABLE_TESTS
 CMAKE_ARGS=	-DCONDUIT_DIR=${LOCALBASE} \
 		-DHDF5_DIR=${LOCALBASE} \
 		-DBLT_CXX_STD=c++14 # BLT_CXX_STD=c++14 is required for LLNL/serac
 
 LDFLAGS+=	-lexecinfo
 
 WRKSRC_SUBDIR=	src
 
 CONFLICTS_INSTALL=	libfmt # bundles and installs an incompatible libfmt version: https://github.com/LLNL/axom/issues/561, axom headers include fmt unnecessarily
 
 OPTIONS_DEFINE=		LUA MFEM OPENMP
 OPTIONS_SINGLE=		MPI
 OPTIONS_SINGLE_MPI=	NOMPI MPICH OPENMPI
 OPTIONS_DEFAULT=	LUA MFEM MPICH #OPENMP     LUA,MFEM,MPI are required for LLNL/serac
 OPTIONS_SUB=		yes
 
 LUA_USES=		lua:54
 LUA_CMAKE_ON=		-DLUA_DIR=${LUA_BASE} \
 			-DFREEBSD_LUA_VER_STR=${LUA_VER_STR} \
 			-DFREEBSD_LUA_VER=${LUA_VER}
 
 MFEM_DESC=		Use mfem - library for finite element methods
 MFEM_CMAKE_ON=		-DMFEM_DIR=${LOCALBASE}
 MFEM_LIB_DEPENDS=	libmfem.so:math/mfem
 
 NOMPI_DESC=		Build without parallel processing support
 NOMPI_BROKEN=		https://github.com/LLNL/axom/issues/913
 
 MPICH_USES=		mpi:mpich
 MPICH_CMAKE_ON=		-DENABLE_MPI=ON
 
 OPENMPI_USES=		mpi:openmpi
 OPENMPI_CMAKE_ON=	-DENABLE_MPI=ON
 
 OPENMP_CMAKE_BOOL=	ENABLE_OPENMP
 OPENMP_BROKEN=		https://github.com/LLNL/axom/issues/911
 
 post-install: # installs headers of a third party library sparsehash: https://github.com/LLNL/axom/issues/365
 	@${RM} -r ${STAGEDIR}${PREFIX}/include/sparsehash
 
 # 2 tests are known to fail, see https://github.com/LLNL/axom/issues/912
 # tests don't run in newer revisions, see https://github.com/LLNL/axom/issues/915
 
 .include <bsd.port.mk>
diff --git a/science/bagel/Makefile b/science/bagel/Makefile
index 19d550be827e..64c134d0396d 100644
--- a/science/bagel/Makefile
+++ b/science/bagel/Makefile
@@ -1,60 +1,60 @@
 PORTNAME=	bagel
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.2.2-132
-PORTREVISION=	3
+PORTREVISION=	4
 DISTVERSIONSUFFIX=	-g2955e4d1a
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Brilliantly Advanced General Electronic-structure Library
 WWW=		https://nubakery.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BROKEN_i386=	error: static_assert failed "size_t is assumed to be the same size as unsigned long long"
 
 LIB_DEPENDS=	libboost_serialization.so:devel/boost-libs
 TEST_DEPENDS=	cblas>0:math/cblas
 
 USES=		autoreconf blaslapack:openblas compiler:c++11-lang fortran gmake libtool localbase python:build
 USE_CXXSTD=	c++11
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	qsimulate-open
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--datarootdir=${DATADIR}
 
 INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE=			MPI LIBXC SCALAPACK SMITH # SLATER (needs a separate lib)
 OPTIONS_DEFAULT=		MPI LIBXC SCALAPACK SMITH
 
 MPI_CONFIGURE_ON=		--with-mpi=openmpi
 MPI_CONFIGURE_OFF=		--with-mpi=no
 MPI_LIB_DEPENDS=		libmpicxx.so:net/mpich # openmpi option erroneously links to mpich (due to a name clash)
 
 LIBXC_DESC=			Build DFT with libxc
 LIBXC_CONFIGURE_WITH=		libxc
 LIBXC_LIB_DEPENDS=		libxc.so:science/libxc
 
 SCALAPACK_DESC=			Use ScaLapack library for parallelized linear algebra
 SCALAPACK_CONFIGURE_ENABLE=	scalapack
 SCALAPACK_VARS=			LDFLAGS+="-lscalapack"
 SCALAPACK_VARS_OFF=		LDFLAGS+="${BLASLIB} ${LAPACKLIB}" # -llapack -lblas are a replacement of libscalapack
 SCALAPACK_LIB_DEPENDS=		libscalapack.so:math/scalapack
 SCALAPACK_IMPLIES=		MPI
 
 SMITH_DESC=			Compile SMITH generated code
 SMITH_CONFIGURE_ENABLE=		smith
 SMITH_IMPLIES=			MPI
 
 TEST_TARGET=			check
 TEST_ARGS=			LDFLAGS+="-lcblas -lblas" ${TEST_TARGET}
 
 post-test: # tests fail, see https://github.com/qsimulate-open/bagel/issues/248
 	@cd ${WRKSRC}/src && ./TestSuite --log_level=all
 
 .include <bsd.port.mk>
diff --git a/science/berkeleygw/Makefile b/science/berkeleygw/Makefile
index 2278bf1c60e8..6d9902cf416f 100644
--- a/science/berkeleygw/Makefile
+++ b/science/berkeleygw/Makefile
@@ -1,48 +1,49 @@
 PORTNAME=	BerkeleyGW
 DISTVERSION=	3.0.1
+PORTREVISION=	1
 CATEGORIES=	science
 MASTER_SITES=	https://berkeley.box.com/shared/static/
 DISTFILES=	m1dgnhiemo47lhxczrn6si71bwxoxor8.gz
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Scientific program aimed at the ab initio virtual experimentation
 WWW=		https://berkeleygw.org
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/license.txt
 
 BUILD_DEPENDS=	bash:shells/bash
 LIB_DEPENDS=	libfftw3.so:math/fftw3
 RUN_DEPENDS=	bash:shells/bash
 
 USES=		blaslapack:openblas gmake fortran python shebangfix
 
 SHEBANG_GLOB=	*.sh *.py *awk
 
 BINARY_ALIAS=	make=${GMAKE} gcc=${CC}
 
 MAKE_ARGS=	FREEBSD_GCC_DEFAULT=${GCC_DEFAULT} FREEBSD_PREFIX=${PREFIX} INSTDIR=${STAGEDIR}${PREFIX}
 
 TEST_TARGET=	check # 2 testcases fail: https://groups.google.com/a/berkeleygw.org/g/help/c/jVdxCAzM7A4
 
 OPTIONS_DEFINE=	EXAMPLES
 
 EXAMPLES_MAKE_ARGS=	INSTALL_EXAMPLES=yes
 
 PORTEXAMPLES=	*
 
 .include <bsd.port.pre.mk>
 
 .if ${GCC_DEFAULT} >= 10
 BROKEN_i386=	f951: internal compiler error: Segmentation fault
 .endif
 
 post-patch:
 	@${LN} -s ${WRKSRC}/config/generic.serial.freebsd.mk ${WRKSRC}/arch.mk
 	@${LN} -s ${WRKSRC}/flavor_real.mk ${WRKSRC}/flavor.mk
 	@${FIND} ${WRKSRC} -name "script*" -o -name "*.scr" | ${XARGS} ${REINPLACE_CMD} -i '' 's|#! */bin/bash.*|#!/bin/sh|'
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*.x
 
 .include <bsd.port.post.mk>
diff --git a/science/bout++-merging-filaments/Makefile b/science/bout++-merging-filaments/Makefile
index a12cd45ed17f..4668815be574 100644
--- a/science/bout++-merging-filaments/Makefile
+++ b/science/bout++-merging-filaments/Makefile
@@ -1,29 +1,30 @@
 PORTNAME=	bout++-merging-filaments
 DISTVERSION=	g20200812
+PORTREVISION=	1
 CATEGORIES=	science # physics
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Simulation of reconnection during merging of current filaments
 WWW=		https://github.com/boutproject/merging-filaments
 
 LICENSE=	GPLv3 # based on the parent project BOUT++
 
 BUILD_DEPENDS=	gmake:devel/gmake
 LIB_DEPENDS=	libbout++.so:science/bout++ # also wronglfully linked with all dependencies of BOUT++, see https://github.com/boutproject/BOUT-dev/issues/2622
 
 USES=		cmake:testing gettext
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	boutproject
 GH_PROJECT=	merging-filaments
 GH_TAGNAME=	ee5a7b9
 
 BINARY_ALIAS=	make=${GMAKE}
 
 PLIST_FILES=	bin/merging-flux
 
 post-patch:
 	@${CP} ${FILESDIR}/CMakeLists.txt ${WRKSRC}
 
 .include <bsd.port.mk>
diff --git a/science/bout++/Makefile b/science/bout++/Makefile
index b901aa12150f..21e32f1e991a 100644
--- a/science/bout++/Makefile
+++ b/science/bout++/Makefile
@@ -1,114 +1,114 @@
 PORTNAME=	bout++
 DISTVERSIONPREFIX=	v
 DISTVERSION=	4.4.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	science math # physics
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Plasma fluid finite-difference simulation code
 WWW=		https://boutproject.github.io/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	gmake:devel/gmake
 LIB_DEPENDS=	libfftw3.so:math/fftw3 \
 		libopenblas.so:math/openblas \
 		libuuid.so:misc/e2fsprogs-libuuid
 RUN_DEPENDS=	bash:shells/bash
 
 USES=		cmake:testing python:3.6+ gettext-runtime shebangfix
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	boutproject
 GH_PROJECT=	BOUT-dev
 GH_TUPLE=	boutproject:boutdata:3a66e6c:boutdata/externalpackages/boutdata \
 		boutproject:boututils:a79a00a:boututils/externalpackages/boututils \
 		google:googletest:96f4ce0:googletest/externalpackages/googletest \
 		meitar:git-archive-all.sh:fc86194:git_archive_all_sh/externalpackages/git-archive-all.sh \
 		mpark:variant:0b488da:variant/externalpackages/mpark.variant
 
 SHEBANG_GLOB=	*.sh
 SHEBANG_FILES=	bin/bout-boutdata-restart-create \
 		bin/bout-pylib-cmd-to-bin \
 		bin/bout-sonnet \
 		bin/bout-stop-script \
 		bin/bout_3to4.py \
 		bin/bout_4to5
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 CMAKE_OFF=	BOUT_TESTS
 CMAKE_TESTING_ON=	BOUT_TESTS # tests fail to build, see https://github.com/boutproject/BOUT-dev/issues/2618
 
 CXXFLAGS+=	-I${WRKSRC}/include
 LDFLAGS+=	-lexecinfo
 
 OPTIONS_DEFINE=		OPENMP PETSC SLEPC SUNDIALS
 OPTIONS_MULTI=		FORMAT
 OPTIONS_MULTI_FORMAT=	HDF5 NETCDF
 OPTIONS_SINGLE=		MPI
 OPTIONS_SINGLE_MPI=	MPICH OPENMPI
 OPTIONS_DEFAULT=	MPICH NETCDF # PETSC SLEPC: not compatible with the latest petsc-3.18.4
 
 FORMAT_DESC=		File format support
 
 HDF5_CMAKE_BOOL=	BOUT_USE_HDF5
 HDF5_LIB_DEPENDS=	libhdf5.so:science/hdf5
 
 NETCDF_USES=		localbase:ldflags pkgconfig # because of the cmake patch in files/
 NETCDF_CMAKE_BOOL=	BOUT_USE_NETCDF
 NETCDF_LIB_DEPENDS=	libnetcdf_c++4.so:science/netcdf-cxx \
 			libnetcdf.so:science/netcdf
 
 MPICH_USES=		mpi:mpich
 
 OPENMP_CMAKE_BOOL=	BOUT_ENABLE_OPENMP
 OPRNMP_BROKEN=		SEGV when OpenMP is enabled, see https://github.com/boutproject/BOUT-dev/issues/2620
 
 OPENMPI_USES=		mpi:openmpi
 
 PETSC_DESC=		Build with PETSc support
 PETSC_CMAKE_BOOL=	BOUT_USE_PETSC
 PETSC_LIB_DEPENDS=	libpetsc.so:science/PETSc
 
 SLEPC_DESC=		Build with SLEPc support
 SLEPC_CMAKE_BOOL=	BOUT_USE_SLEPC
 SLEPC_LIB_DEPENDS=	libslepc.so:math/slepc
 SLEPC_IMPLIES=		PETSC # build breaks w/out petsc
 
 SUNDIALS_DESC=		Build with Sundials support
 SUNDIALS_CMAKE_BOOL=	BOUT_USE_SUNDIALS
 SUNDIALS_CMAKE_ON=	-DBOUT_DOWNLOAD_SUNDIALS=OFF
 SUNDIALS_BROKEN=	fails to build with sundials, see https://github.com/boutproject/BOUT-dev/issues/2617
 
 BINARY_ALIAS=		make=${GMAKE}
 
 .if defined(WITH_EXAMPLES) # Build executables demonstrating BOUT++ capabilities. They aren't installed and don't need to be built for packaging.
 CMAKE_ON+=	BOUT_BUILD_EXAMPLES
 .endif
 
 post-install:
 	# workaround for /usr/local/lib/cmake/bout++/bout++Config.cmake:if
 	@${REINPLACE_CMD} -i '' \
 		-e 's|${BUILD_WRKSRC}/externalpackages/mpark.variant|${PREFIX}/lib/cmake/mpark_variant|' \
 		-e 's|${BUILD_WRKSRC}/externalpackages/PVODE|${PREFIX}/lib/cmake/PVODE|' \
 		-e 's|${WRKSRC}/cmake|${PREFIX}/lib/cmake/bout++|' \
 		${STAGEDIR}${PREFIX}/lib/cmake/bout++/bout++Config.cmake
 	# remove *.orig files created by patching
 	@${RM} ${STAGEDIR}${PREFIX}/include/*.orig
 	# install missing PVODE cmake files
 	@${RM} ${STAGEDIR}${PREFIX}/lib/cmake/PVODE/*
 	${INSTALL_DATA} ${BUILD_WRKSRC}/externalpackages/PVODE/PVODEConfig.cmake ${STAGEDIR}${PREFIX}/lib/cmake/PVODE
 	${INSTALL_DATA} ${BUILD_WRKSRC}/externalpackages/PVODE/PVODEConfigVersion.cmake ${STAGEDIR}${PREFIX}/lib/cmake/PVODE
 	@${REINPLACE_CMD} -i '' \
 		-e 's|${BUILD_WRKSRC}/lib|${PREFIX}/lib|' \
 		-e 's|${PORTSDIR}/.*/BOUT-dev-${PORTVERSION}/externalpackages/PVODE/include|${PREFIX}/include|g' \
 		${STAGEDIR}${PREFIX}/lib/cmake/PVODE/*
 	@${REINPLACE_CMD} -i '' \
 		-e 's|INTERFACE_INCLUDE_DIRECTORIES .*|INTERFACE_INCLUDE_DIRECTORIES "${PREFIX}/include"|' \
 		${STAGEDIR}${PREFIX}/lib/cmake/PVODE/PVODEConfig.cmake
 	# remove broken link, see https://github.com/boutproject/BOUT-dev/issues/2623
 	@${RM} ${STAGEDIR}${PREFIX}/bin/bout-squashoutput
 
 .include <bsd.port.mk>
diff --git a/science/cantera/Makefile b/science/cantera/Makefile
index 26c37e182566..4d17ffaf6863 100644
--- a/science/cantera/Makefile
+++ b/science/cantera/Makefile
@@ -1,82 +1,82 @@
 PORTNAME=	cantera
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.6.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	science # chemistry physics
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Chemical kinetics, thermodynamics, and transport tool suite
 WWW=		https://cantera.org/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/License.txt
 
 BUILD_DEPENDS=	googletest>0:devel/googletest \
 		${LOCALBASE}/include/boost/algorithm/string.hpp:devel/boost-libs
 LIB_DEPENDS=	libfmt.so:devel/libfmt \
 		libyaml-cpp.so:devel/yaml-cpp
 
 USES=		compiler:c++11-lang eigen:3 scons
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Cantera
 GH_TUPLE=	LLNL:sundials:887af43:sundials/ext/sundials # bundled sundials is only needed for the Octave option
 
 MAKE_ARGS=	system_eigen='y' \
 		system_sundials='n' \
 		system_fmt='y' \
 		system_yamlcpp='y' \
 		googletest='system' \
 		sundials_include='${LOCALBASE}/include/sundials' \
 		extra_inc_dirs="${LOCALBASE}/include:${LOCALBASE}/include/eigen3" \
 		extra_lib_dirs="${LOCALBASE}/lib" \
 		debug='no' \
 		cc_flags="${CXXFLAGS}" \
 		prefix="${PREFIX}"
 
 ALL_TARGET=	build
 TEST_TARGET=	test # some tests fail, see https://github.com/Cantera/cantera/issues/1095
 
 OPTIONS_DEFINE=		OCTAVE PYTHON
 OPTIONS_DEFAULT=	# PYTHON is broken; OCTAVE is off by default because Octave interface is not as frequently requested feature
 OPTIONS_SUB=		yes
 
 OCTAVE_DESC=		Octave support
 OCTAVE_MAKE_ARGS=	matlab_toolbox=y matlab_path=${LOCALBASE}
 OCTAVE_CXXFLAGS=	-I${LOCALBASE}/include/octave-${OCTAVE_VERSION}/octave
 OCTAVE_LIB_DEPENDS=	liboctave.so:math/octave
 OCTAVE_SUB_FILES=	pkg-message-octave
 OCTAVE_USES=		octave:env
 
 PYTHON_USES=		python:3.6+
 PYTHON_USE=		PYTHON=cython
 PYTHON_MAKE_ARGS=	python_cmd=${PYTHON_CMD} python_package=full
 PYTHON_MAKE_ARGS_OFF=	python_package="none"
 PYTHON_BUILD_DEPENDS=	${PYNUMPY}
 PYTHON_RUN_DEPENDS=	${PYNUMPY} \
 			${PYTHON_PKGNAMEPREFIX}h5py>0:science/py-h5py@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}ruamel.yaml>0:devel/py-ruamel.yaml@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR}
 PYTHON_BROKEN=		https://github.com/Cantera/cantera/issues/1269
 
 do-install:
 	cd ${WRKSRC} && \
 		${MAKE_CMD} install \
 			stage_dir="${STAGEDIR}"
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libcantera_shared.so.2.6.0
 
 do-install-PYTHON-on:
 	@${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/cantera/_cantera.cpython-${PYTHON_SUFFIX}.so
 
 post-patch-OCTAVE-on: # adjust Octave version in SConscript (python styled os.environ['OCTAVE_VERSION'] somehow doesn't work for this)
 	@${REINPLACE_CMD} -e "s|, 'bin', 'glnx.*')|, 'lib', 'octave', '${OCTAVE_VERSION}')|" ${WRKSRC}/src/matlab/SConscript
 
 post-install-OCTAVE-on: # adjust .mex file name
 	@${MV} \
 		${STAGEDIR}${PREFIX}/lib/cantera/matlab/toolbox/ctmethods.mexa64 \
 		${STAGEDIR}${PREFIX}/lib/cantera/matlab/toolbox/ctmethods.mex
 
 .include <bsd.port.mk>
diff --git a/science/cardioid/Makefile b/science/cardioid/Makefile
index 39d3c8c33fab..0b7784b1a42c 100644
--- a/science/cardioid/Makefile
+++ b/science/cardioid/Makefile
@@ -1,53 +1,54 @@
 PORTNAME=	cardioid
 PORTVERSION=	g20211026
+PORTREVISION=	1
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Cardiac simulation toolkit
 WWW=		https://github.com/LLNL/cardioid
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libblas.so:math/blas \
 		liblapack.so:math/lapack
 RUN_DEPENDS=	bash:shells/bash
 
 USES=		cmake:testing compiler:c++11-lang shebangfix
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	LLNL
 GH_TAGNAME=	2f66d9f
 GH_TUPLE=	mfem:mfem:v4.4:mfem
 
 SHEBANG_FILES=	elec/compileReaction.template
 
 CMAKE_TESTING_ON=	ENABLE_TESTS
 
 PLIST_FILES=	bin/cardioid \
 		bin/compileReaction \
 		bin/singleCell
 
 OPTIONS_DEFINE=		MFEM OPENMP
 OPTIONS_SINGLE=		MFEM MPI
 OPTIONS_SINGLE_MPI=	NOMPI MPICH OPENMPI
 OPTIONS_DEFAULT=	MPICH OPENMP
 OPTIONS_SUB=		yes
 
 MFEM_DESC=		Build with MFEM mesh library
 MFEM_CMAKE_ON=		-DMFEM_DIR=${WRKSRC_mfem}
 MFEM_BROKEN=		see https://github.com/LLNL/cardioid/issues/15
 
 NOMPI_DESC=		Build without parallel processing support
 NOMPI_BROKEN=		https://github.com/LLNL/axom/issues/913
 
 MPICH_USES=		mpi:mpich
 MPICH_CMAKE_ON=		-DENABLE_MPI=ON
 
 OPENMPI_USES=		mpi:openmpi
 OPENMPI_CMAKE_ON=	-DENABLE_MPI=ON
 
 OPENMP_CMAKE_BOOL=	ENABLE_OPENMP
 OPENMP_BROKEN_OFF=	https://github.com/LLNL/cardioid/issues/14
 
 .include <bsd.port.mk>
diff --git a/science/cdf/Makefile b/science/cdf/Makefile
index f90fac4d0c05..826abf145414 100644
--- a/science/cdf/Makefile
+++ b/science/cdf/Makefile
@@ -1,54 +1,55 @@
 PORTNAME=	cdf3
 PORTVERSION=	3.8.0
+PORTREVISION=	1
 CATEGORIES=	science
 MASTER_SITES=	https://spdf.gsfc.nasa.gov/pub/software/cdf/dist/cdf38_0/
 DISTNAME=	cdf${VER}-dist-cdf
 DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Device independent view of the CDF data model
 WWW=		https://cdf.gsfc.nasa.gov/
 
 LICENSE=	NASA-G
 LICENSE_NAME=	NASA/Goddard Space Flight Center
 LICENSE_FILE=	${WRKSRC}/CDF_copyright.txt
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 BUILD_DEPENDS=	bash:shells/bash
 
 USES=		fortran ncurses gmake
 
 USE_LDCONFIG=	yes
 MAKE_FLAGS=	INSTALLDIR=${STAGEDIR}${PREFIX} OS=freebsd ENV=gnu \
 		FORTRAN=yes FC_freebsd=${F77}
 MAKE_JOBS_UNSAFE=	yes
 TEST_TARGET=	test  # XXX: test segfaults
 FFLAGS+=	-std=legacy
 
 WRKSRC=		${WRKDIR}/cdf${VER}-dist
 SUB_FILES=	pkg-message
 
 VER=		${PORTVERSION:S/.//:S/./_/}
 DEFS=		B C K
 
 PORTDOCS=	CDF_copyright.txt CHANGES.txt Release.notes Welcome.txt
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 MAKE_ARGS+=	OS=freebsd ENV=gnu all
 
 post-patch:
 .for def in ${DEFS}
 	@${REINPLACE_CMD} -e 's|<path>|${PREFIX}|' \
 		 ${WRKSRC}/src/definitions/definitions.${def}
 .endfor
 
 post-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/samples/* ${STAGEDIR}${EXAMPLESDIR}
 	${SED} -i '' 's,${STAGEDIR},,g' ${STAGEDIR}${PREFIX}/bin/definitions.?
 	${RM} -f ${STAGEDIR}${PREFIX}/CDFLeapSeconds.txt
 
 .include <bsd.port.mk>
diff --git a/science/cdo/Makefile b/science/cdo/Makefile
index a762f1b984a4..f8ee410fcce6 100644
--- a/science/cdo/Makefile
+++ b/science/cdo/Makefile
@@ -1,81 +1,81 @@
 PORTNAME=	cdo
 PORTVERSION=	2.1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science
 MASTER_SITES=	https://code.mpimet.mpg.de/attachments/download/27654/ \
 		LOCAL/sunpoet
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Climate Data Operators
 WWW=		https://code.mpimet.mpg.de/projects/cdo
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 OPTIONS_DEFINE=	CGRIBEX ECCODES HDF5 JASPER NETCDF PROJ SZIP UDUNITS UUID
 OPTIONS_DEFAULT=CGRIBEX ECCODES HDF5 JASPER NETCDF PROJ SZIP UDUNITS UUID
 OPTIONS_SUB=	yes
 CGRIBEX_DESC=	Use CGRIBEX library for GRIB1 files
 ECCODES_DESC=	Use ecCodes for GRIB files
 HDF5_IMPLIES=	SZIP
 NETCDF_IMPLIES=	HDF5
 UUID_DESC=	UUID support
 
 PORTSCOUT=	site:https://code.mpimet.mpg.de/projects/cdo/files
 
 USES=		compiler:c++17-lang gmake libtool localbase pathfix python:build
 
 CONFIGURE_ARGS=	--disable-data \
 		--disable-extra \
 		--disable-fortran \
 		--disable-ieg \
 		--disable-openmp \
 		--disable-service \
 		--enable-cdi-lib \
 		--program-transform-name="" \
 		--with-zlib=/usr
 CONFIGURE_ENV=	PYTHON=${PYTHON_CMD}
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 MAKE_JOBS_UNSAFE=	yes
 TEST_TARGET=	check
 USE_CXXSTD=	c++17
 USE_LDCONFIG=	yes
 
 CGRIBEX_CONFIGURE_WITH=	cgribex
 CGRIBEX_LIB_DEPENDS=	libcgribex.so:science/cgribex
 ECCODES_CONFIGURE_WITH=	eccodes
 ECCODES_LIB_DEPENDS=	libeccodes.so:science/eccodes
 HDF5_CONFIGURE_WITH=	hdf5
 HDF5_LIB_DEPENDS=	libhdf5.so:science/hdf5
 JASPER_CONFIGURE_WITH=	jasper
 JASPER_LIB_DEPENDS=	libjasper.so:graphics/jasper
 NETCDF_CONFIGURE_WITH=	netcdf
 NETCDF_LIB_DEPENDS=	libnetcdf.so:science/netcdf
 PROJ_CONFIGURE_WITH=	proj
 PROJ_LIB_DEPENDS=	libproj.so:graphics/proj
 SZIP_CONFIGURE_WITH=	szlib
 SZIP_LIB_DEPENDS=	libsz.so:science/libaec
 UDUNITS_CONFIGURE_WITH=	udunits2
 UDUNITS_LIB_DEPENDS=	libudunits2.so:science/udunits
 UUID_CONFIGURE_OFF=	ac_cv_func_uuid_create=no ac_cv_have_decl_uuid_create=no ac_cv_have_decl_uuid_generate=no ac_cv_lib_uuid_uuid_generate=no
 UUID_LIB_DEPENDS=	libuuid.so:misc/e2fsprogs-libuuid
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} != "sparc64"
 CFLAGS+=	-DPTHREAD_MUTEXATTR
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e '/^SUBDIRS = / s| contrib||' ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e 's|$$(libdir)/\($$$$pkgconfigfile\)|${PREFIX}/libdata/\1|' ${WRKSRC}/libcdi/src/Makefile.in
 	@${REINPLACE_CMD} -e 's|unsigned32 |uint32_t |' ${WRKSRC}/libcdi/src/cdilib.c ${WRKSRC}/libcdi/src/util.c
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/libcdi/src/cdi.inc ${STAGEDIR}${PREFIX}/include/cdi.inc
 
 test-NETCDF-on:
 	@cd ${WRKSRC}/ && ${SETENV} CDO_PATH=src/cdo src/cdotest
 
 .include <bsd.port.post.mk>
diff --git a/science/cgnslib/Makefile b/science/cgnslib/Makefile
index ea20558fa2b7..358d661ae2e4 100644
--- a/science/cgnslib/Makefile
+++ b/science/cgnslib/Makefile
@@ -1,64 +1,64 @@
 PORTNAME=	cgnslib
 PORTVERSION=	4.3.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	science
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	CFD General Notation System library code
 WWW=		https://cgns.github.io/
 
 LICENSE=	AS-IS
 LICENSE_NAME=	AS-IS
 LICENSE_FILE=	${WRKSRC}/license.txt
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 USES=		cmake
 USE_GITHUB=	yes
 GH_ACCOUNT=	CGNS
 GH_PROJECT=	CGNS
 USE_LDCONFIG=	yes
 MAKE_JOBS_UNSAFE=	yes
 
 #CMAKE_ARGS=	-DOpenGL_GL_PREFERENCE:STRING="GLVND"
 CMAKE_ARGS=	-DOpenGL_GL_PREFERENCE:STRING="LEGACY"
 FFLAGS+=	-fPIC -std=legacy
 TEST_TARGET=	test
 
 OPTIONS_DEFINE=		FORTRAN HDF5 TESTS TOOLS
 OPTIONS_DEFAULT=	FORTRAN HDF5 TESTS TOOLS
 OPTIONS_SUB=		yes
 
 HDF5_DESC=		Enable HDF5 interface
 TESTS_DESC=		Enable test programs
 TOOLS_DESC=		Build the CGNSTools package
 
 FORTRAN_USES=		fortran
 FORTRAN_CMAKE_BOOL=	CGNS_ENABLE_FORTRAN
 
 HDF5_LIB_DEPENDS=	libhdf5.so:science/hdf5	\
 			libsz.so:science/libaec
 HDF5_CMAKE_BOOL=	CGNS_ENABLE_HDF5
 HDF5_CMAKE_ON=		-DHDF5_INCLUDE_PATH:PATH="${LOCALBASE}/include"
 
 TESTS_CMAKE_BOOL=	CGNS_ENABLE_TESTS
 
 TOOLS_USES=		gl localbase tk xorg
 TOOLS_LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig	\
 			libfreetype.so:print/freetype2
 TOOLS_USE=		GL=egl,gl,glu	\
 			XORG=ice,sm,x11,xau,xcomposite,xcursor,xdamage,xdmcp,xext,xfixes,xft,xi,xinerama,xkbfile,xmu,xpm,xrandr,xrender,xres,xscrnsaver,xt,xtst,xv,xxf86vm
 TOOLS_CMAKE_BOOL=	CGNS_BUILD_CGNSTOOLS
 TOOLS_CMAKE_ON=		-DTCL_INCLUDE_PATH:STRING="${TCL_INCLUDEDIR}" \
 			-DTK_INCLUDE_PATH:STRING="${TK_INCLUDEDIR}"
 
 post-install:
 	${RLN} ${STAGEDIR}${PREFIX}/lib/libcgns.so.${PORTVERSION:R} \
 		${STAGEDIR}${PREFIX}/lib/libcgns.so.${PORTVERSION:R:R}
 
 do-test:
 	cd ${TEST_WRKSRC} && \
 	${SETENV} ${TEST_ENV} ctest -C ${CMAKE_BUILD_TYPE}
 
 .include <bsd.port.mk>
diff --git a/science/chemicalfun/Makefile b/science/chemicalfun/Makefile
index 6f1d9755098f..0da460672483 100644
--- a/science/chemicalfun/Makefile
+++ b/science/chemicalfun/Makefile
@@ -1,56 +1,57 @@
 PORTNAME=	chemicalfun
 DISTVERSION=	0.1.8
+PORTREVISION=	1
 CATEGORIES=	science # chemistry
 MASTER_SITES=	https://bitbucket.org/${BB_ACCOUNT}/${PORTNAME}/get/${BB_COMMIT}${EXTRACT_SUFX}?dummy=/:src
 DISTFILES=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}:src
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	C++ library for working with chemical reactions and formulas
 WWW=		https://bitbucket.org/gems4/chemicalfun/src/master/
 
 BUILD_DEPENDS=	nlohmann-json>0:devel/nlohmann-json \
 		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${PY_FLAVOR}
 LIB_DEPENDS=	libfmt.so:devel/libfmt # due to SPDLOG_FMT_EXTERNAL
 LIB_DEPENDS+=	libspdlog.so:devel/spdlog
 
 USES=		cmake:testing compiler:c++17-lang eigen:3 localbase
 
 BB_ACCOUNT=	gems4
 BB_COMMIT=	46c628fef376
 
 WRKSRC=		${WRKDIR}/${BB_ACCOUNT}-${PORTNAME}-${BB_COMMIT}
 
 CMAKE_ARGS=	-DFREEBSD_PREFIX=${PREFIX} -DFREEBSD_STAGEDIR=${STAGEDIR} \
 		-DPython_EXECUTABLE=${PYTHON_CMD}
 CMAKE_TESTING_ON=	CHEMICALFUN_BUILD_TESTS # tests fail to compile, BitBucket offers no easy way to report this
 CMAKE_TESTING_TARGET=	${ALL_TARGET} # hack to prevent test run
 
 CXXFLAGS+=	-DSPDLOG_FMT_EXTERNAL # see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=258073#c3
 LDFLAGS+=	-L${LOCALBASE}/lib -lfmt # due to SPDLOG_FMT_EXTERNAL
 
 OPTIONS_DEFINE=		PYTHON
 OPTIONS_DEFAULT=	PYTHON
 OPTIONS_SUB=		yes
 
 PYTHON_USES=		python
 PYTHON_CMAKE_BOOL=	CHEMICALFUN_BUILD_PYTHON
 PYTHON_CMAKE_ON=	-DFREEBSD_PREFIX=${PREFIX}
 PYTHON_BUILD_DEPENDS=	pybind11>0:devel/pybind11
 
 post-install-PYTHON-on:
 	# remove wrong *.pyc, see related bug https://bitbucket.org/gems4/chemicalfun/issues/1/please-support-stagedir
 	@${FIND} ${STAGEDIR} -name "*.pyc" -delete
 	@${FIND} ${STAGEDIR} -name __pycache__ -delete
 	# strip binary
 	@${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/chemicalfun/PyChemicalFun${PYTHON_EXT_SUFFIX}.so
 
 post-test:
 	@${ECHO} "==> run C++ tests"
 	@cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} tests/test_main
 
 post-test-PYTHON-on:
 	@${ECHO} "==> run Python tests"
 	@cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} ${PYTHON_CMD} ${FILESDIR}/test.py
 
 .include <bsd.port.mk>
diff --git a/science/chemps2/Makefile b/science/chemps2/Makefile
index ed0271890e36..951ee73b8c3a 100644
--- a/science/chemps2/Makefile
+++ b/science/chemps2/Makefile
@@ -1,29 +1,29 @@
 PORTNAME=	CheMPS2
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.8.12
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Spin-adapted implementation of DMRG for ab initio quantum chemistry
 WWW=		https://github.com/SebWouters/CheMPS2
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libhdf5.so:science/hdf5 \
 		libsz.so:science/libaec
 
 USES=		blaslapack:openblas cmake fortran
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	SebWouters
 
 CMAKE_ARGS+=	-DSHARED_ONLY:BOOL=ON
 CMAKE_ARGS+=	-DENABLE_TESTS:BOOL=OFF
 CMAKE_ARGS+=	-DENABLE_XHOST:BOOL=OFF # shouldn't optimize the port in case of central build
 CMAKE_ARGS+=	-DENABLE_OPENMP:BOOL=OFF # find_package(OpenMP) is broken since the merge into cmake: bug#223678
 CMAKE_ARGS+=	-DLAPACK_LIBRARIES="-lopenblas" # can't find it using find_package for some reason
 
 .include <bsd.port.mk>
diff --git a/science/chimes-calculator/Makefile b/science/chimes-calculator/Makefile
index 7168c6be12bc..cc3d3fcc9649 100644
--- a/science/chimes-calculator/Makefile
+++ b/science/chimes-calculator/Makefile
@@ -1,25 +1,26 @@
 PORTNAME=	chimes-calculator
 DISTVERSIONPREFIX=	v.
 DISTVERSION=	1.0.2
+PORTREVISION=	1
 CATEGORIES=	science # chemistry
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Chebyshev Interaction Model for Efficient Simulation
 WWW=		https://github.com/rk-lindsey/chimes_calculator
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		cmake:testing fortran shebangfix python:3.7+,test
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	rk-lindsey
 GH_PROJECT=	${PORTNAME:C/-/_/}
 
 SHEBANG_GLOB=	*.sh
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|PYTH3=python.*|PYTH3=${PYTHON_CMD}|' ${WRKSRC}/serial_interface/tests/run_tests.sh
 
 .include <bsd.port.mk>
diff --git a/science/chrono/Makefile b/science/chrono/Makefile
index 5ab39d623295..b5780538ae6a 100644
--- a/science/chrono/Makefile
+++ b/science/chrono/Makefile
@@ -1,120 +1,121 @@
 PORTNAME=	chrono
 DISTVERSION=	8.0.0
+PORTREVISION=	1
 CATEGORIES=	science devel
 PKGNAMESUFFIX=	-physics-simulation-engine
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	C++ library for multi-physics simulation
 WWW=		https://projectchrono.org/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_i386=	use of overloaded operator '[]' is ambiguous (with operand types 'chrono::quaternion' and 'int'): https://github.com/projectchrono/chrono/issues/158
 BROKEN_aarch64=	cannot find -lFALSE, see https://github.com/projectchrono/chrono/issues/389
 
 BUILD_DEPENDS=	openmpi>0:net/openmpi
 LIB_DEPENDS=	libblas.so:math/blas \
 		libepoll-shim.so:devel/libepoll-shim \
 		libfabric.so:net/libfabric \
 		libhwloc.so:devel/hwloc2 \
 		libjson-c.so:devel/json-c \
 		libmetis.so:math/metis \
 		libpciaccess.so:devel/libpciaccess \
 		libpng16.so:graphics/png \
 		libscotch.so:cad/scotch \
 		libze_loader.so:devel/level-zero
 
 USES=		cmake compiler:c++14-lang eigen:3 fortran gnome jpeg xorg
 USE_LDCONFIG=	yes
 USE_GNOME=	libxml2
 USE_XORG=	x11 xau xcb xdmcp xext xxf86vm
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	project${PORTNAME}
 
 ALL_MODULES=		Cascade Cosimulation Distributed FSI Irrlicht Multicore MUMPS OpenGL Pardiso_Project Postprocess Sensor SynChrono Vehicle
 # module names in a human readable case; for the list of available modules: grep -r "option(ENABLE_MODULE" work
 
 OPTIONS_DEFINE=			HDF5 DEMOS
 OPTIONS_GROUP=			MODULES
 OPTIONS_GROUP_MODULES=		${ALL_MODULES:tu}
 MODULES_DESC=			Enable modules:
 OPTIONS_DEFAULT=		HDF5
 OPTIONS_SUB=			yes
 
 HDF5_CMAKE_BOOL=		ENABLE_HDF5
 HDF5_LIB_DEPENDS=		libhdf5.so:science/hdf5
 
 DEMOS_DESC=			Build and install demo programs
 DEMOS_CMAKE_BOOL=		BUILD_DEMOS
 DEMOS_BROKEN=			/usr/local/lib/libdmumps.so: undefined reference to `mpi_pack_'
 
 CASCADE_CMAKE_ON=		-DCASCADE_INCLUDE_DIR:STRING=${LOCALBASE}/include/OpenCASCADE -DCASCADE_LIBDIR:STRING=${LOCALBASE}/lib
 CASCADE_LIB_DEPENDS=		libTKernel.so:cad/opencascade740
 
 DISTRIBUTED_BROKEN=		requires cuda_runtime_api.h in thrust package which is missing for some reason
 DISTRIBUTED_IMPLIES=		MULTICORE
 
 FSI_BROKEN=			requires CUDA
 
 IRRLICHT_LIB_DEPENDS=		libIrrlicht.so:x11-toolkits/irrlicht
 
 MULTICORE_BUILD_DEPENDS=	blaze>0:math/blaze \
 				thrust>0:devel/thrust
 
 MUMPS_CMAKE_ON=			-DMUMPS_ROOT:STRING=${LOCALBASE}
 MUMPS_LIB_DEPENDS=		libdmumps.so:math/mumps \
 				libopenblas.so:math/openblas
 
 PARDISO_PROJECT_BROKEN=		Not available for FreeBSD; License is restrictive
 
 SENSOR_BROKEN=			requires CUDA
 
 SYNCHRONO_USES=			localbase
 SYNCHRONO_BUILD_DEPENDS=	flatc:devel/flatbuffers205 # until https://github.com/projectchrono/chrono/issues/391 is fixed
 SYNCHRONO_LIB_DEPENDS=		libmpi.so:net/mpich
 SYNCHRONO_IMPLIES=		VEHICLE
 
 OPENGL_USES=			gl
 OPENGL_USE=			GL=gl,glu,glew
 OPENGL_BUILD_DEPENDS=		${LOCALBASE}/include/glm/glm.hpp:math/glm
 OPENGL_LIB_DEPENDS=		libglfw.so:graphics/glfw
 
 VEHICLE_LIB_DEPENDS=		libsz.so:science/libaec \
 				libmpi.so:net/openmpi
 
 .for module in ${ALL_MODULES}
 ${module:tu}_DESC=		Chrono ${module} module
 ${module:tu}_CMAKE_BOOL=	ENABLE_MODULE_${module:tu}
 .if "${${module:tu}_BROKEN}" == ""
 OPTIONS_DEFAULT+=	${module:tu}
 .endif
 .endfor
 
 #.include <bsd.port.options.mk>
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MVEHICLE} && ${PORT_OPTIONS:MIRRLICHT}
 PLIST_FILES+=	lib/libChronoEngine_vehicle_irrlicht.so
 .endif
 
 #.include <bsd.port.pre.mk>
 
 .if ${CHOSEN_COMPILER_TYPE} == gcc
 CXXFLAGS+=	-Wno-error=narrowing
 .endif
 
 post-extract:
 	@${RM} ${WRKSRC}/data/opensim/Rajagopal2015.orig
 
 post-patch:
 	@${FIND} ${WRKSRC} -name CMakeLists.txt -o -name "*.cmake*" | ${XARGS} ${REINPLACE_CMD} -i '' 's|lib64|lib|'
 
 do-test:
 	@cd ${BUILD_WRKSRC} && \
 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBUILD_TESTING:BOOL=ON ${CMAKE_SOURCE_PATH} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
 		ctest -C ${CMAKE_BUILD_TYPE} ${_MAKE_JOBS}
 
 .include <bsd.port.post.mk>
diff --git a/science/clipper/Makefile b/science/clipper/Makefile
index 5f706b4d0587..d586cc96f44a 100644
--- a/science/clipper/Makefile
+++ b/science/clipper/Makefile
@@ -1,26 +1,26 @@
 PORTNAME=	clipper
 DISTVERSION=	2.1.20180802
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	science
 MASTER_SITES=	https://www2.mrc-lmb.cam.ac.uk/personal/pemsley/coot/dependencies/
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Libraries for the organisation of crystallographic data
 WWW=		http://www.ysbl.york.ac.uk/~cowtan/clipper/
 
 LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libccp4c.so:science/libccp4 \
 		libmmdb2.so:science/mmdb2 \
 		libsfftw.so:math/fftw-float
 
 USES=		compiler:c++11-lang fortran gmake libtool localbase:ldflags
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared --disable-static \
 		--enable-phs --enable-cns --enable-mmdb --enable-minimol --enable-cif --enable-ccp4 --enable-fortran
 USE_LDCONFIG=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION:C/\.[0-9]+$//}
 
 .include <bsd.port.mk>
diff --git a/science/code_saturne/Makefile b/science/code_saturne/Makefile
index 31bf5d188ec3..e7e57bf59db6 100644
--- a/science/code_saturne/Makefile
+++ b/science/code_saturne/Makefile
@@ -1,130 +1,130 @@
 PORTNAME=	code_saturne
 PORTVERSION=	7.1.1
 DISTVERSIONPREFIX=	v
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	science parallel
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	EDF's general purpose Computational Fluid Dynamics (CFD) software
 WWW=		https://www.code-saturne.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	gsed:textproc/gsed
 LIB_DEPENDS=	libsysinfo.so:devel/libsysinfo	\
 		libcgns.so:science/cgnslib	\
 		libhdf5.so:science/hdf5		\
 		libmedC.so:french/med
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR}	\
 		xmgrace:math/grace	\
 		bash:shells/bash	\
 		xterm:x11/xterm
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	code-saturne
 
 USES=		autoreconf bison compiler:c11 fortran gettext gnome gmake \
 		iconv localbase libtool pyqt:5 python:3.7+ shebangfix xorg
 USE_GNOME=	libxml2
 USE_PYQT=	pyqt5 sip
 USE_XORG=	x11
 SHEBANG_FILES=	install_saturne.py tests/unittests.py bin/*.py build-aux/*.py
 CFLAGS+=	-D__XSI_VISIBLE
 CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/libxml2
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-salome --without-salome-yacs --without-salome-kernel	\
 		--without-salome-gui --enable-python
 CONFIGURE_ENV=	ac_cv_path_SED=${LOCALBASE}/bin/gsed
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 BINARY_ALIAS=	python=${PYTHON_CMD} \
 		pyrcc5=pyrcc5-${PYTHON_VER} \
 		pyuic5=pyuic5-${PYTHON_VER}
 
 OPTIONS_DEFINE=		DOCS EXAMPLES BATCH BLAS HYPRE MPICH MUMPS PETSC SCOTCH
 OPTIONS_DEFAULT=	BATCH BLAS HYPRE METIS MPICH MUMPS PETSC SCOTCH
 OPTIONS_RADIO=		METIS
 OPTIONS_RADIO_METIS=	METIS PARMETIS
 OPTIONS_SUB=		yes
 BLAS_DESC=		Support of BLAS
 BLAS_USES=		blaslapack
 BLAS_CONFIGURE_ON=	--with-blas=yes --with-blas-type=BLAS	\
 			--with-blas-include=${LOCALBASE}/include/cblas	\
 			--with-blas-lib=${LOCALBASE}/lib
 BLAS_LIB_DEPENDS=	libcblas.so:math/cblas
 BATCH_DESC=		Use Torque to submit batches
 BATCH_RUN_DEPENDS=	pbs-config:sysutils/torque
 HYPRE_DESC=		Support of HYPRE
 HYPRE_BUILD_DEPENDS=	hypre>0:science/hypre
 HYPRE_RUN_DEPENDS=	hypre>0:science/hypre
 HYPRE_CONFIGURE_ON=	--with-hypre="${LOCALBASE}"
 MPICH_USES=		mpi
 MPICH_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mpi4py>0:net/py-mpi4py@${PY_FLAVOR}
 MPICH_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mpi4py>0:net/py-mpi4py@${PY_FLAVOR}
 MPICH_CONFIGURE_WITH=	mpi
 METIS_DESC=		Support of METIS
 METIS_LIB_DEPENDS=	libmetis.so:math/metis
 METIS_CONFIGURE_ON=	--with-metis-include="${LOCALBASE}/include"
 MUMPS_DESC=		Support of MUMPS
 MUMPS_LIB_DEPENDS=	libsmumps.so:math/mumps
 MUMPS_CONFIGURE_ON=	--with-mumps="${LOCALBASE}"
 MUMPS_CONFIGURE_ENV=	MUMPS_LIBS="-lmpiseq -llapack"
 PARMETIS_DESC=		Support of ParMETIS
 PARMETIS_LIB_DEPENDS=	libparmetis.so:math/parmetis
 PARMETIS_CONFIGURE_ON=	--with-metis-include="${LOCALBASE}/include/parmetis"	\
 			--with-metis-lib="${LOCALBASE}/lib/parmetis"
 PARMETIS_CONFIGURE_ENV=	LIBS=-lexecinfo
 PETSC_DESC=		Support of PETSc
 PETSC_LIB_DEPENDS=	libpetsc.so:science/PETSc
 PETSC_CONFIGURE_ON=	--with-petsc="${LOCALBASE}"
 SCOTCH_DESC=		Support of Scotch
 SCOTCH_LIB_DEPENDS=	libscotch.so:cad/scotch
 SCOTCH_CONFIGURE_ON=	--with-scotch-include="${LOCALBASE}/include"
 
 TEST_TARGET=	check
 
 .if defined(PACKAGE_BUILDING)
 TERM=		vt100	# Force for pointyhat to override su
 .else
 TERM?=		vt100	# Default value needed for tput in jail or tinderbox
 .endif
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == "i386"
 # /wrkdirs/usr/ports/science/code_saturne/work/code_saturne-5.3.0/src/apps/.libs
 # /libsaturne.so:
 # undefined reference to `__atomic_compare_exchange'
 CONFIGURE_ARGS+=	--disable-openmp
 .endif
 
 .if ${PORT_OPTIONS:MDOCS}
 USES+=		tex
 USE_TEX=	tex:build
 BUILD_DEPENDS+=	fig2dev:print/fig2dev		\
 		doxygen:devel/doxygen		\
 		dot:graphics/graphviz		\
 		dvips:print/tex-dvipsk		\
 		${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR}
 BINARY_ALIAS+=	sphinx-build=sphinx-build-${PYTHON_VER}
 ALL_TARGET=	all pdf
 DOCS=		AUTHORS ChangeLog README
 .endif
 
 pre-configure:
 	${REINPLACE_CMD} -e 's|/usr/bin/env python|${PYTHON_CMD}|'	\
 		${WRKSRC}/Makefile.am
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/code_saturne/cs_solver
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${DOCS:C|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/science/conduit/Makefile b/science/conduit/Makefile
index 4cc55be7764a..417580ce7a5e 100644
--- a/science/conduit/Makefile
+++ b/science/conduit/Makefile
@@ -1,49 +1,50 @@
 PORTNAME=	conduit
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.8.7
+PORTREVISION=	1
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Simplified data exchange for HPC simulations
 WWW=		https://github.com/LLNL/conduit
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/../LICENSE
 
 LIB_DEPENDS=	libhdf5.so:science/hdf5 \
 		libsiloh5.so:science/silo \
 		libsz.so:science/libaec
 
 USES=		cmake:testing compiler:c++11-lang fortran
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	LLNL
 GH_TUPLE=	LLNL:blt:86a7d6b:blt/blt \
 		Alpine-DAV:spack_configs:85f7382:spack_configs/../scripts/uberenv_configs/spack_configs \
 		LLNL:uberenv:105e384:LLNL_uberenv/../scripts/uberenv
 
 WRKSRC_SUBDIR=	src
 
 CMAKE_ON=	ENABLE_FORTRAN
 CMAKE_OFF=	CONDUIT_ENABLE_TESTS ENABLE_DOCS ENABLE_EXAMPLES ENABLE_GIT ENABLE_TESTS ENABLE_VALGRIND
 CMAKE_ARGS=	-DHDF5_DIR=${LOCALBASE} \
 		-DSILO_DIR=${LOCALBASE} \
 		-DFREEBSD_EXAMPLESDIR=${EXAMPLESDIR} # complete list of optional dependencies (enabled with *_DIR): https://llnl-conduit.readthedocs.io/en/latest/building.html
 #CMAKE_ARGS+=	-DADIOS_DIR=${LOCALBASE} # broken, see https://github.com/LLNL/conduit/issues/841
 CMAKE_TESTING_ON=	ENABLE_TESTS
 
 OPTIONS_SINGLE=		MPI
 OPTIONS_SINGLE_MPI=	NOMPI MPICH OPENMPI
 OPTIONS_DEFAULT=	MPICH
 OPTIONS_SUB=		yes
 
 NOMPI_DESC=		Build without parallel processing support
 
 MPICH_USES=		mpi:mpich
 MPICH_CMAKE_ON=		-DENABLE_MPI=ON
 
 OPENMPI_USES=		mpi:openmpi
 OPENMPI_CMAKE_ON=	-DENABLE_MPI=ON
 
 .include <bsd.port.mk>
diff --git a/science/cp2k/Makefile b/science/cp2k/Makefile
index 50458ec12b80..3a486dffb124 100644
--- a/science/cp2k/Makefile
+++ b/science/cp2k/Makefile
@@ -1,122 +1,123 @@
 PORTNAME=	cp2k
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2022.2
+PORTREVISION=	1
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Quantum chemistry and solid state physics software package
 WWW=		https://www.cp2k.org/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 .if !exists(/usr/include/omp.h)
 BROKEN=		requires OpenMP support that is missing on this architecture
 .endif
 
 BUILD_DEPENDS=	fypp:devel/py-fypp@${PY_FLAVOR}
 LIB_DEPENDS=	libblas.so:math/blas \
 		libfftw3.so:math/fftw3 \
 		liblapack.so:math/lapack
 RUN_DEPENDS=	cp2k-data>0:science/cp2k-data
 TEST_DEPENDS=	bash:shells/bash
 
 USES=		fortran gmake localbase:ldflags python:build shebangfix tar:bz2
 
 USE_GITHUB=	yes
 GH_TUPLE=	cp2k:dbcsr:c134996:cp2k_dbcsr/exts/dbcsr \
 		pseewald:fprettify:71781aa:pseewald_fprettify/tools/prettify/fprettify
 
 SHEBANG_FILES=	tools/regtesting/do_regtest
 
 GCC_VERSION=	${GCC_DEFAULT} # ${_USE_GCC}
 
 MAKE_ARGS=	XARCH=FreeBSD-gfortran VERSION=${VERSION} FC=gfortran${GCC_VERSION} CC=${CC} LD=gfortran${GCC_VERSION} \
 		DATA_DIR=${DATADIR}
 
 BINARY_ALIAS=	python=${PYTHON_CMD} python3=${PYTHON_CMD} make=${GMAKE} # make - only for tests
 
 OPTIONS_DEFINE=		LIBINT
 OPTIONS_SINGLE=		MULTIPROCESSING
 OPTIONS_SINGLE_MULTIPROCESSING=		SERIAL OPENMP MPI OPENMP_MPI # for the complete list see https://github.com/cp2k/cp2k/blob/master/INSTALL.md
 OPTIONS_DEFAULT=	LIBINT OPENMP
 MULTIPROCESSING_DESC=	Multiprocessing
 
 LIBINT_DESC=		Use libint to evaluate integrals
 LIBINT_LIB_DEPENDS=	libint.so:science/libint
 
 SERIAL_DESC=		Single core (no multiprocessing)
 SERIAL_VARS=		VERSION=sopt EFFECTIVE_VERSION=ssmp # now is a flavor of ssmp with NUM_THEADS=1
 SERIAL_CFLAGS=		${OPENMP_CFLAGS}
 SERIAL_CXXFLAGS=	${OPENMP_CXXFLAGS}
 SERIAL_LDFLAGS=		${OPENMP_LDFLAGS}
 SERIAL_PLIST_FILES=	${EXECUTABLES_CORE:C/(.*)/bin\/\1.${VERSION}/} # symlinks
 
 OPENMP_VARS=		VERSION=ssmp EFFECTIVE_VERSION=ssmp
 OPENMP_CFLAGS=		-fopenmp
 OPENMP_CXXFLAGS=	-fopenmp
 OPENMP_LDFLAGS=		/usr/lib/libgomp.so
 
 MPI_VARS=		VERSION=popt EFFECTIVE_VERSION=psmp # now is a flavor of psmp with NUM_THEADS=1
 MPI_LIB_DEPENDS=	libmpich.so:net/mpich \
 			libscalapack.so:math/scalapack
 MPI_LDFLAGS=		-lmpifort
 MPI_PLIST_FILES=	${EXECUTABLES_CORE:C/(.*)/bin\/\1.${VERSION}/} # symlinks
 MPI_BROKEN=		https://github.com/cp2k/cp2k/issues/2128
 
 OPENMP_MPI_DESC=	Enable both OpenMP and MPI
 OPENMP_MPI_VARS=	VERSION=psmp EFFECTIVE_VERSION=psmp
 OPENMP_MPI_CFLAGS=	${OPENMP_CFLAGS}
 OPENMP_MPI_CXXFLAGS=	${OPENMP_CXXFLAGS}
 OPENMP_MPI_LDFLAGS=	${OPENMP_LDFLAGS}
 OPENMP_MPI_LIB_DEPENDS=	${MPI_LIB_DEPENDS}
 OPENMP_MPI_LDFLAGS=	${MPI_LDFLAGS}
 OPENMP_MPI_BROKEN=	https://github.com/cp2k/cp2k/issues/2128
 
 EXECUTABLES_CORE=	cp2k cp2k_shell
 EXECUTABLES_EXTRA=	dumpdcd graph grid_miniapp xyz2dcd
 EXECUTABLES=		${EXECUTABLES_CORE} ${EXECUTABLES_EXTRA}
 
 PLIST_FILES=		${EXECUTABLES:C/(.*)/bin\/\1.${EFFECTIVE_VERSION}/}
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MOPENMP} || ${PORT_OPTIONS:MOPENMP_MPI}
 pre-configure:
 	@if [ ! -e ${LOCALBASE}/lib/libfftw3_omp.so ] ; then \
 	  ${ECHO_MSG} "The OPENMP and OPENMP_MPI options require math/fftw3" ; \
 	  ${ECHO_MSG} "to be built and installed with the OPENMP option ON" ; \
 	  exit 1; \
 	fi
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -i '' 's|LIBS.*=.*|& ${LDFLAGS}|; s|^FCFLAGS.*=.*|& -I${LOCALBASE}/include|; s| -march=native||' ${WRKSRC}/arch/FreeBSD-*
 
 xpre-build:
 	@${ECHO} ${PORTVERSION} > ${WRKSRC}/REVISION
 
 do-install:
 .for e in ${EXECUTABLES}
 	${INSTALL_PROGRAM} ${WRKSRC}/exe/*/${e}.${EFFECTIVE_VERSION} ${STAGEDIR}${PREFIX}/bin
 .endfor
 
 do-install-SERIAL-on:
 .for e in ${EXECUTABLES_CORE}
 	cd ${STAGEDIR}${PREFIX}/bin && ${LN} -s ${e}.${EFFECTIVE_VERSION} ${e}.${VERSION}
 .endfor
 
 do-test: # fails to run: some Linux-only commands are present, also /usr/local/bin/ar: invalid option -- /
 	@cd ${WRKSRC} && \
 		${TOUCH} arch/local.${EFFECTIVE_VERSION} && \
 		${SETENV} ${MAKE_ENV} ./tools/regtesting/do_regtest -maxtasks 8
 
 .include <bsd.port.pre.mk>
 
 .  if ${GCC_DEFAULT} >= 10 # only needed when MPI is on, but flags aren't passed into DBCSR sub-project, see https://github.com/cp2k/cp2k/issues/2128
 FCFLAGS+=	-fallow-argument-mismatch
 .  endif
 
 # build instructions: https://github.com/cp2k/cp2k/blob/master/INSTALL.md
 
 .include <bsd.port.post.mk>
diff --git a/science/dakota/Makefile b/science/dakota/Makefile
index e4a8345ca6c4..2821609404a9 100644
--- a/science/dakota/Makefile
+++ b/science/dakota/Makefile
@@ -1,100 +1,100 @@
 PORTNAME=	dakota
 DISTVERSION=	6.17.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science
 MASTER_SITES=	https://dakota.sandia.gov/sites/default/files/distributions/public/
 DISTNAME=	${PORTNAME}-${DISTVERSION}-release-public-src-cli
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Interface between analysis codes & iterative systems analysis methods
 WWW=		https://dakota.sandia.gov/
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	nanoflann>0:math/nanoflann
 LIB_DEPENDS=	libblas.so:math/blas \
 		libboost_system.so:devel/boost-libs \
 		libexpat.so:textproc/expat2 \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libgsl.so:math/gsl \
 		libhdf5.so:science/hdf5 \
 		libicui18n.so:devel/icu \
 		liblapack.so:math/lapack \
 		libnlopt.so:math/nlopt \
 		libpng16.so:graphics/png \
 		libsz.so:science/libaec
 RUN_DEPENDS=	bash:shells/bash
 
 USES=		cmake compiler:c++11-lang fortran gettext-runtime jpeg motif perl5 pkgconfig python shebangfix xorg
 USE_XORG=	ice sm x11 xau xcb xdmcp xext xft xmu xrender xt
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	nodefault
 GH_TUPLE=	stan-dev:math:v2.18.0:stanmath/stanmath
 
 SHEBANG_GLOB=	*.sh *.py
 SHEBANG_FILES=	interfaces/Python/mpitile \
 		scripts/pyprepro/dprepro \
 		scripts/pyprepro/pyprepro \
 		scripts/dprepro.perl \
 		test/dakota_test.perl
 
 CMAKE_ON=	HAVE_X_GRAPHICS # always enable graphics because w/out it a lot of unrelated files aren't installed due to bugs in the project
 CMAKE_ON+=	Boost_NO_BOOST_CMAKE \
 		DAKOTA_GIT_checkout
 #CMAKE_ON+=	HAVE_C3 # causes "duplicate include" error
 #CMAKE_ON+=	DAKOTA_DL_SOLVER # fails to compile: error: declaration of anonymous class must be a definition
 #CMAKE_ON+=	HAVE_NOWPAC # installs files into $PORTSDIR
 CMAKE_ON+=	HAVE_QUESO \
 		HAVE_MUQ MUQ_USE_PYTHON \
 		# enable some methods that aren't enabled by default, see the list @ src/DakotaIterator.cpp
 CMAKE_ON+=	DAKOTA_HAVE_GSL DAKOTA_HAVE_HDF5
 
 CMAKE_OFF=	DAKOTA_ENABLE_TESTS
 CMAKE_ARGS=	-DDakota_VERSION_SRC:STRING=${DISTVERSION} -DDakota_GIT_REVL:STRING=unknown -DDakota_RELEASE_DATE:${STRING}=20211115 \
 		-DPython_EXECUTABLE=${PYTHON_CMD} \
 		-DMUQ_STANMATH_DIR=${WRKSRC}/stanmath \
 		-DPython_EXECUTABLE=${PYTHON_CMD}
 
 CFLAGS+=	-DH5_USE_110_API=1
 FFLAGS+=	-fallow-argument-mismatch
 LDFLAGS+=	-lexecinfo
 
 CONFLICTS_BUILD=	dakota # self: picks up some bundled packages from the pre-installed dakota package and then fails to install them
 
 post-extract:
 	@${FIND} ${WRKSRC} -name "*.orig" -delete
 	@${ECHO} ${DISTVERSION} > ${WRKSRC}/VERSION # expected by the 'install' target
 
 pre-configure: # MUQ_STANMATH_DIR is lost otherwise
 	@${REINPLACE_CMD} 's|find_package(PkgConfig)|set(MUQ_STANMATH_DIR ${WRKSRC}/stanmath)|' ${WRKSRC}/packages/external/muq2/cmake/finds/FindSTANMATH.cmake
 
 post-install:
 	# remove eigen3 that Dakota installs
 	cd ${STAGEDIR}${PREFIX} && ${RM} -r include/eigen3 share/eigen3
 	# remove cblas.h that Dakota installs
 	${RM} ${STAGEDIR}${PREFIX}/include/cblas.h
 	# remove *.orig files
 	${RM} ${STAGEDIR}${PREFIX}/include/colin/AppResponse.h.orig
 	# install libraries that it fails to install
 .for l in libmuqSamplingAlgorithms.so libmuqModeling.so libmuqUtilities.so
 	${INSTALL_LIB} ${BUILD_WRKSRC}/packages/external/muq2/lib/${l} ${STAGEDIR}${PREFIX}/lib
 .endfor
 
 do-test: install # from Additional Test Suites @ https://dakota.sandia.gov/content/additional-test-suites (many tests are known to fail)
 	## minimal set of fast-running tests that should NOT FAIL (may DIFF, depending on platform / compiler)
 	cd ${WRKSRC}/test && ./dakota_test.perl
 	## test suite that should PASS on any supported platform (NO DIFF or FAIL)
 	#cd ${WRKSRC}/test && ./dakota_test.perl --label-regex=AcceptanceTest
 	## run all Dakota tests active in this build (should PASS or DIFF)
 	#cd ${WRKSRC}/test && ./dakota_test.perl --label-regex=dakota_
 	# Tests should be this way, but this fails:
 	#@cd ${BUILD_WRKSRC} && \
 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DDAKOTA_ENABLE_TESTS:BOOL=ON ${CMAKE_SOURCE_PATH} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
 		(cd ${WRKSRC} && ctest -j 4 -L FastTest -LE Diff)
 
 .include <bsd.port.mk>
diff --git a/science/dalton/Makefile b/science/dalton/Makefile
index fc472c17e205..a8726c5bf813 100644
--- a/science/dalton/Makefile
+++ b/science/dalton/Makefile
@@ -1,37 +1,38 @@
 PORTNAME=	dalton
 DISTVERSION=	2020.0
+PORTREVISION=	1
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Powerful molecular electronic structure program for quantum chemistry
 WWW=		https://daltonprogram.org/
 
 LICENSE=	LGPL21
 
 BROKEN_armv7=	fortran runs out of memory
 
 LIB_DEPENDS=	liblapack.so:math/lapack \
 		libopenblas.so:math/openblas
 RUN_DEPENDS=	bash:shells/bash
 
 USES=		cmake:noninja fortran python:build shebangfix
 SHEBANG_FILES=	dalton.in
 
 USE_GITLAB=	yes
 GL_COMMIT=	66052b3af5ea7225e31178bf9a8b031913c72190
 GL_TUPLE=	bingao:gen1int:1e4148ecd676761b3399801acba443925a1fee6b:gen1int/external/gen1int \
 		pe-software:pelib-public:cf49a6e04fdca09af6245fb68a36d20b68552ace:pelib/external/pelib
 
 USE_GITHUB=	nodefault
 GH_TUPLE=	cstein:qfitlib:1acdc9863fdeae2cdbc7f5a599413257a095b8ad:qfitlib/external/qfitlib
 
 BINARY_ALIAS=	python=${PYTHON_CMD}
 
 post-install:
 	@${MV} ${STAGEDIR}${PREFIX}/${PORTNAME} ${STAGEDIR}${DATADIR}
 	@${REINPLACE_CMD} -i '' 's|%%SCRIPT_DIR%%|${DATADIR}|; s|%%PREFIX%%|${PREFIX}|' ${STAGEDIR}${DATADIR}/${PORTNAME}
 	@${MV} ${STAGEDIR}${DATADIR}/${PORTNAME}* ${STAGEDIR}${PREFIX}/bin/
 	@cd ${STAGEDIR}${DATADIR}/tools && ${STRIP_CMD} aces2dalton distances FChk2HES labread xyz2dalton
 	@cd ${STAGEDIR}${DATADIR} && ${RM} -r tools/CMakeFiles tools/Makefile tools/cmake_install.cmake
 
 .include <bsd.port.mk>
diff --git a/science/dftbplus/Makefile b/science/dftbplus/Makefile
index d90e535ebb05..bdd6c90e99ab 100644
--- a/science/dftbplus/Makefile
+++ b/science/dftbplus/Makefile
@@ -1,109 +1,109 @@
 PORTNAME=	dftbplus
 DISTVERSION=	22.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	DFTB+: Package for performing fast atomistic simulations
 WWW=		https://dftbplus.org/
 
 LICENSE=	GPLv3 # main code is under LGPL3+, the bundled dftd3-lib is under GPLv1+, this makes the result GPLv3 (based on https://www.gnu.org/licenses/gpl-faq.html#AllCompatibility)
 
 BROKEN_aarch64=	Lack of IEEE754 support in gcc causes "Cannot find an intrinsic module named 'ieee_arithmetic'", see bug\#255890
 BROKEN_FreeBSD_12_powerpc=	Lack of IEEE754 support in gcc causes "Cannot find an intrinsic module named 'ieee_arithmetic'", see bug\#255890
 BROKEN_FreeBSD_12_powerpc64=	Lack of IEEE754 support in gcc causes "Cannot find an intrinsic module named 'ieee_arithmetic'", see bug\#255890
 
 LIB_DEPENDS=	libblas.so:math/blas \
 		liblapack.so:math/lapack \
 		libopenblas.so:math/openblas
 RUN_DEPENDS=	${PYNUMPY}
 TEST_DEPENDS=	bash:shells/bash
 
 USES=		cmake compiler:gcc-c++11-lib fortran pkgconfig python:build shebangfix
 USE_LDCONFIG=	yes
 
 SHEBANG_FILES=	tools/dptools/bin/* tools/misc/* utils/srcmanip/* utils/build/* external/fypp/bin/* utils/get_opt_externals \
 		external/fypp/bin/fypp utils/test/testlist_to_fypp
 SHEBANG_GLOB=	*.py *.sh
 
 USE_GITHUB=	yes
 GH_TUPLE=	\
 		aradi:fytest:94e05ac:aradi_fytest/external/fytest/origin \
 		dftbplus:testparams:cd7536f:testparams/external/slakos/origin \
 		dftd4:dftd4:1189af7:dftd4_dftd4/external/dftd4/origin \
 		grimme-lab:gbsa-parameters:6836c4d:grimme_lab_gbsa/external/gbsa/origin
 
 TEST_TARGET=	test
 
 BINARY_ALIAS=	git=false
 
 CMAKE_ON=	BLAS_DETECTION BUILD_SHARED_LIBS WITH_API ENABLE_DYNAMIC_LOADING
 CMAKE_ARGS=	-DLAPACK_LIBRARY=lapack -DSCALAPACK_LIBRARY=scalapack
 
 BINARY_ALIAS=		python=${PYTHON_CMD} python3=${PYTHON_CMD}
 
 OPTIONS_DEFINE=		ARPACK CHIMES DFTD3 MBD MPI PLUMED POISSON PYTHON SOCKETS TBLITE TRANSPORT # see config.cmake for a complete list
 OPTIONS_DEFAULT=	CHIMES DFTD3 MBD MPI PLUMED POISSON TRANSPORT SOCKETS # PYTHON TBLITE
 OPTIONS_SUB=		yes
 
 ARPACK_DESC=		Build with ARPACK for large eigenvalue problems
 ARPACK_CMAKE_BOOL=	WITH_ARPACK
 ARPACK_LIB_DEPENDS=	libarpack.so:math/arpack-ng
 ARPACK_PREVENTS=	MPI # ARPACK is only used in a single-core application
 
 CHIMES_DESC=		Build with ChIMES
 CHIMES_CMAKE_BOOL=	WITH_CHIMES
 CHIMES_LIB_DEPENDS=	libchimescalc.so:science/chimes-calculator
 
 DFTD3_DESC=		Build with s-dft3
 DFTD3_CMAKE_BOOL=	WITH_SDFTD3
 DFTD3_LIB_DEPENDS=	libs-dftd3.so:science/simple-dftd3 \
 			libmctc-lib.so:science/mctc-lib \
 			libmstore.so:science/mstore \
 			libtoml-f.so:textproc/toml-f # binaries not linked with libtoml-f.so, see https://github.com/dftbplus/dftbplus/issues/1040
 
 MBD_DESC=		Build with many-body-dispersion support
 MBD_CMAKE_BOOL=		WITH_MBD
 MBD_LIB_DEPENDS=	libmbd.so:science/libmbd
 
 MPI_CMAKE_BOOL=		WITH_MPI
 MPI_LIB_DEPENDS=	libmpich.so:net/mpich \
 			libmpifx.so:net/mpifx \
 			libscalapack.so:math/scalapack \
 			libscalapackfx.so:math/scalapackfx
 MPI_LDFLAGS=		${LOCALBASE}/lib/libmpich.so ${LOCALBASE}/lib/libmpifort.so ${LOCALBASE}/lib/libmpi.so
 
 PLUMED_DESC=		Do metadynamics via the PLUMED2 library
 PLUMED_CMAKE_BOOL=	WITH_PLUMED
 PLUMED_LIB_DEPENDS=	libplumed.so:science/plumed
 
 POISSON_DESC=		Include Poisson-solver
 POISSON_CMAKE_BOOL=	WITH_POISSON
 
 PYTHON_USES=		python
 PYTHON_CMAKE_BOOL=	WITH_PYTHON
 PYTHON_BROKEN=		fails to install into stage directory: https://github.com/dftbplus/dftbplus/issues/931
 
 SOCKETS_DESC=		Build with sockets library
 SOCKETS_CMAKE_BOOL=	WITH_SOCKETS
 SOCKETS_BINARY_ALIAS=	gcc=${CC}
 
 TBLITE_DESC=		Include xTB support via tblite
 TBLITE_CMAKE_BOOL=	WITH_TBLITE
 TBLITE_BROKEN=		Fails to build, see https://github.com/dftbplus/dftbplus/issues/1041
 
 TRANSPORT_DESC=		Transport via libNEGF
 TRANSPORT_CMAKE_BOOL=	WITH_TRANSPORT
 TRANSPORT_LIB_DEPENDS=	libnegf.so:science/libnegf \
 			libmpi.so:net/mpich \
 			libmpifx.so:net/mpifx
 
 .include <bsd.port.pre.mk>
 
 .if ${GCC_DEFAULT} >= 10
 # workaround for Type mismatch between actual argument at (1) and actual argument at (2) (COMPLEX(8)/CHARACTER(*)).
 # in theory, this should set FCFLAGS, but the port does not conform
 FFLAGS+=	-fallow-argument-mismatch
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/science/dftd3/Makefile b/science/dftd3/Makefile
index 5506e1290457..a39c51befdfd 100644
--- a/science/dftd3/Makefile
+++ b/science/dftd3/Makefile
@@ -1,21 +1,22 @@
 PORTNAME=	dftd3
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.2.0-3
+PORTREVISION=	1
 DISTVERSIONSUFFIX=	-g8e5463e
 CATEGORIES=	science # quantum-chemistry
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	S. Grimme's dispersion correction for DFT, Hartree-Fock methods
 WWW=		https://www.chemie.uni-bonn.de/pctc/mulliken-center/software/dft-d3
 
 LICENSE=	GPLv1+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		cmake fortran
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	loriab
 
 PLIST_FILES=	bin/dftd3
 
 .include <bsd.port.mk>
diff --git a/science/dftd4/Makefile b/science/dftd4/Makefile
index b2679f1da76b..8f6ff1ebd6fd 100644
--- a/science/dftd4/Makefile
+++ b/science/dftd4/Makefile
@@ -1,35 +1,36 @@
 PORTNAME=	dftd4
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.4.0
+PORTREVISION=	1
 CATEGORIES=	science # chemistry
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Atomic-charge dependent london dispersion correction computation
 WWW=		https://www.chemie.uni-bonn.de/pctc/mulliken-center/software/dftd4
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BROKEN_aarch64=	Cannot open module file 'ieee_arithmetic.mod' for reading at (1): No such file or directory
 
 BUILD_DEPENDS=	mstore>0:science/mstore
 LIB_DEPENDS=	libmctc-lib.so:science/mctc-lib \
 		libmulticharge.so:science/multicharge \
 		libopenblas.so:math/openblas
 
 USES=		cmake:testing fortran
 USE_GITHUB=	yes
 USE_LDCONFIG=	yes
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 
 .include <bsd.port.options.mk>
 .if (${ARCH} == powerpc64le || ${ARCH} == powerpc64 || ${ARCH} == powerpc) && ${OSVERSION} < 1301510 # support added in e09d209d1a74a3caca95dea303db9bc605fce1a7
 BROKEN_powerpc64=	Cannot open module file 'ieee_arithmetic.mod' for reading at (1): No such file or directory
 BROKEN_powerpc64le=	Cannot open module file 'ieee_arithmetic.mod' for reading at (1): No such file or directory
 .endif
 
 post-patch: # see https://github.com/toml-f/toml-f/issues/51
 	@${REINPLACE_CMD} -e 's|$${CMAKE_Fortran_COMPILER_ID}-$${CMAKE_Fortran_COMPILER_VERSION}||' ${WRKSRC}/config/CMakeLists.txt
 
 .include <bsd.port.mk>
diff --git a/science/dirac/Makefile b/science/dirac/Makefile
index 2eb4308f0c2d..08924f2a530f 100644
--- a/science/dirac/Makefile
+++ b/science/dirac/Makefile
@@ -1,47 +1,48 @@
 PORTNAME=	dirac
 DISTVERSION=	22.0
+PORTREVISION=	1
 CATEGORIES=	science # chemistry
 MASTER_SITES=	https://zenodo.org/record/6010450/files/
 PKGNAMESUFFIX=	-quantum-chemistry-software
 DISTNAME=	${PORTNAME:tu}-${DISTVERSION}-Source
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Program for atomic & molecular relativistic all-electron calculations
 WWW=		http://diracprogram.org/doku.php
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_armv7=	compilation fails: Error: Old-style type declaration REAL*16 not supported at (1)
 BROKEN_i386=	error: Type mismatch in argument 'dsetid' at (1); passed INTEGER(8) to INTEGER(4), see https://gitlab.com/dirac/dirac/-/issues/36
 
 BUILD_DEPENDS=	gmake:devel/gmake
 LIB_DEPENDS=	libblas.so:math/blas \
 		libhdf5.so:science/hdf5 \
 		liblapack.so:math/lapack
 
 USES=		cmake:noninja,testing fortran python shebangfix
 
 #USE_GITLAB=	yes
 #GL_COMMIT=	37b755410d9fdcd9b5e7bba6e43ceb7d5c7b9dae
 
 SHEBANG_FILES=	pam.in \
 		utils/process_schema.py \
 		utils/dirac_data.py
 
 CMAKE_OFF=	ENABLE_EXATENSOR \
 		ENABLE_PCMSOLVER # PCMSolver integration is broken, see https://gitlab.com/dirac/dirac/-/issues/33 and https://gitlab.com/dirac/dirac/-/issues/34
 CMAKE_ARGS=	-DMKL_FLAG=off
 
 CFLAGS+=	-DSYS_LINUX # see https://gitlab.com/dirac/dirac/-/issues/32
 CXXFLAGS+=	-DSYS_LINUX
 FFLAGS+=	-DSYS_LINUX
 LDFLAGS+=	-llapack -lblas
 
 BINARY_ALIAS=	make=${GMAKE} \
 		python=${PYTHON_CMD} \
 		python3=${PYTHON_CMD}
 
 # 2 tests are known to fail, see https://gitlab.com/dirac/dirac/-/issues/35
 
 .include <bsd.port.mk>
diff --git a/science/dkh/Makefile b/science/dkh/Makefile
index 5bafeaae98ad..63c8040acfdf 100644
--- a/science/dkh/Makefile
+++ b/science/dkh/Makefile
@@ -1,23 +1,23 @@
 PORTNAME=	dkh
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Wolf, Reiher, and Hess's Douglas-Kroll-Hess relativistic correction
 WWW=		http://www.reiher.ethz.ch/software/dkh-x2c.html
 
 LICENSE=	GPLv3
 
 USES=		cmake fortran
 .if !exists(/usr/include/omp.h)
 CMAKE_OFF=	ENABLE_OPENMP
 .endif
 USE_GITHUB=	yes
 GH_ACCOUNT=	psi4
 USE_LDCONFIG=	yes
 
 CMAKE_ARGS=	-DBUILD_SHARED_LIBS:BOOL=ON
 
 .include <bsd.port.mk>
diff --git a/science/dvc/Makefile b/science/dvc/Makefile
index 50e06892a5fd..5cdf7c545416 100644
--- a/science/dvc/Makefile
+++ b/science/dvc/Makefile
@@ -1,37 +1,37 @@
 PORTNAME=	dvc
 DISTVERSION=	0.30.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	science python
 MASTER_SITES=	PYPI
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Git for data scientists: manage code and data together
 WWW=		https://dvc.org/
 
 LICENSE=	APACHE20
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}appdirs>=1.4.3:devel/py-appdirs@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}asciimatics>=1.10.0:devel/py-asciimatics@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}colorama>=0.3.9:devel/py-colorama@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}configobj>=5.0.6:devel/py-configobj@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}configparser>=3.5.0:devel/py-configparser@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}distro>=1.3.0:sysutils/py-distro@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}future>=0.16.0:devel/py-future@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}gitpython>=2.1.8:devel/py-gitpython@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}grandalf==0.7:math/py-grandalf@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jsonpath-rw>0:devel/py-jsonpath-rw@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}nanotime>=0.5.2:devel/py-nanotime@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}networkx>=2.1:math/py-networkx@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ply>=3.9:devel/py-ply@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyasn1>=0.4.1:devel/py-pyasn1@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>=3.12:devel/py-yaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.18.4:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}schema>=0.6.7:devel/py-schema@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}zclockfile>0:devel/py-zclockfile@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_PYTHON=	distutils autoplist noflavors
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/science/dynare/Makefile b/science/dynare/Makefile
index 6949c7688e6a..7fbb34ed7398 100644
--- a/science/dynare/Makefile
+++ b/science/dynare/Makefile
@@ -1,61 +1,62 @@
 PORTNAME=	dynare
 DISTVERSION=	5.4
+PORTREVISION=	1
 CATEGORIES=	science # economics
 MASTER_SITES=	https://www.dynare.org/release/source/
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Software platform for handling a wide class of economic models
 WWW=		https://www.dynare.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BROKEN_aarch64=	cannot open module file 'ieee_arithmetic.mod' for reading at (1): No such file or directory
 
 BUILD_DEPENDS=	${LOCALBASE}/include/boost/tokenizer.hpp:devel/boost-libs
 LIB_DEPENDS=	libhdf5.so:science/hdf5 \
 		libmatio.so:math/matio \
 		libopenblas.so:math/openblas \
 		libsz.so:science/libaec
 RUN_DEPENDS=	epstool:graphics/epstool \
 		gnuplot:math/gnuplot \
 		pstoedit:graphics/pstoedit \
 		xfig:graphics/xfig # README says that these executables are required for the test suite
 
 USES=		bison compiler:c++17-lang fortran gmake localbase tar:xz tex
 USE_TEX=	pdftex
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-matlab \
 		--disable-doc
 
 FCFLAGS+=	-fPIC # required because configure tests with -shared
 
 SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=			OCTAVE
 OPTIONS_DEFAULT=		OCTAVE
 OPTIONS_SUB=			yes
 
 OCTAVE_DESC=			Integrate with Octave (main way to use Dynare)
 OCTAVE_CONFIGURE_ENABLE=	octave
 OCTAVE_CONFIGURE_ON=		--disable-mex-kalman-steady-state # Kalman Steady State MEX file for Octave - requires the non-free library slicot-5.0
 OCTAVE_BUILD_DEPENDS=		octave:math/octave
 OCTAVE_LIB_DEPENDS=		libfftw3.so:math/fftw3 \
 				libfftw3f.so:math/fftw3-float \
 				libgsl.so:math/gsl \
 				libumfpack.so:math/suitesparse-umfpack
 OCTAVE_RUN_DEPENDS=		octave:math/octave \
 				octave-forge-statistics>0:math/octave-forge-statistics
 
 .include <bsd.port.options.mk>
 .if (${ARCH} == powerpc64le || ${ARCH} == powerpc64 || ${ARCH} == powerpc) && ${OSVERSION} < 1301510 # support added in e09d209d1a74a3caca95dea303db9bc605fce1a7
 BROKEN_powerpc64=	cannot open module file 'ieee_arithmetic.mod' for reading at (1): No such file or directory
 BROKEN_powerpc64le=	cannot open module file 'ieee_arithmetic.mod' for reading at (1): No such file or directory
 .endif
 
 post-install:
 	# remove empty directories, see https://git.dynare.org/Dynare/dynare/-/issues/1835
 	@${FIND} ${STAGEDIR}${PREFIX} -type d -empty -delete
 
 .include <bsd.port.mk>
diff --git a/science/eccodes/Makefile b/science/eccodes/Makefile
index b52a22fd3a32..cc4a98a88aca 100644
--- a/science/eccodes/Makefile
+++ b/science/eccodes/Makefile
@@ -1,55 +1,56 @@
 PORTNAME=	eccodes
 PORTVERSION=	2.30.0
+PORTREVISION=	1
 DISTVERSIONSUFFIX=	-Source
 CATEGORIES=	science
 MASTER_SITES=	https://confluence.ecmwf.int/download/attachments/45757960/ \
 		LOCAL/sunpoet
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	ECMWF API for WMO FM-92 GRIB and FM-94 BUFR messages
 WWW=		https://confluence.ecmwf.int/display/ECC
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libnetcdf.so:science/netcdf \
 		libpng.so:graphics/png
 
 USES=		cmake localbase perl5 shebangfix
 
 CMAKE_ARGS=	-DBUILD_SHARED_LIBS=BOTH
 CMAKE_OFF=	ENABLE_ALIGN_MEMORY \
 		ENABLE_ECCODES_OMP_THREADS \
 		ENABLE_EXTRA_TESTS \
 		ENABLE_FORTRAN \
 		ENABLE_MEMFS \
 		ENABLE_MEMORY_MANAGEMENT \
 		ENABLE_PYTHON
 CMAKE_ON=	ECCODES_INSTALL_EXTRA_TOOLS \
 		ENABLE_ECCODES_THREADS \
 		ENABLE_EXAMPLES \
 		ENABLE_INSTALL_ECCODES_DEFINITIONS \
 		ENABLE_JPG \
 		ENABLE_NETCDF \
 		ENABLE_PNG
 USE_CSTD=	c99
 USE_LDCONFIG=	yes
 
 CONFLICTS_INSTALL=	grib_api
 
 PORTSCOUT=	site:https://confluence.ecmwf.int/display/ECC/Releases
 
 SHEBANG_FILES=	tools/bufr_compare_dir
 
 OPTIONS_DEFINE=	AEC
 OPTIONS_SINGLE=	JPEG
 OPTIONS_SINGLE_JPEG=	JASPER OPENJPEG
 OPTIONS_DEFAULT=AEC OPENJPEG
 AEC_DESC=	Adaptive Entropy Coding support
 
 AEC_CMAKE_BOOL=		ENABLE_AEC
 AEC_LIB_DEPENDS=	libaec.so:science/libaec
 JASPER_LIB_DEPENDS=	libjasper.so:graphics/jasper
 OPENJPEG_LIB_DEPENDS=	libopenjp2.so:graphics/openjpeg
 
 .include <bsd.port.mk>
diff --git a/science/elk/Makefile b/science/elk/Makefile
index 39ab943faf65..136b5bf73459 100644
--- a/science/elk/Makefile
+++ b/science/elk/Makefile
@@ -1,82 +1,83 @@
 PORTNAME=	elk
 DISTVERSION=	8.7.2
+PORTREVISION=	1
 CATEGORIES=	science
 MASTER_SITES=	SF/${PORTNAME}/
 PKGNAMESUFFIX=	-chemistry
 DIST_SUBDIR=	${PORTNAME}${PKGNAMESUFFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	All-electron full-potential linearised augmented-planewave code
 WWW=		http://elk.sourceforge.net/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libblas.so:math/blas \
 		libblis.so:math/blis \
 		libfftw3.so:math/fftw3 \
 		libfftw3f.so:math/fftw3-float \
 		liblapack.so:math/lapack \
 		libopenblas.so:math/openblas \
 		libwannier.so:science/wannier90 \
 		libxc.so:science/libxc
 
 USES=		fortran gmake tar:tgz
 
 BINARY_ALIAS=	make=${GMAKE}
 
 LDFLAGS+=	${LOCALBASE}/lib/gcc${GCC_DEFAULT}/libgcc_s.so
 
 OPTIONS_DEFINE=		DOCS EXAMPLES NATIVE OPENMP
 OPTIONS_RADIO=		MPI
 OPTIONS_RADIO_MPI=	MPICH OPENMPI
 OPTIONS_DEFAULT=	OPENMP MPICH
 PARALLEL_DESC=		Enable parallelizations:
 
 NATIVE_MAKE_ARGS=	FFLAGS="${FFLAGS} -march=native -mtune=native"
 NATIVE_VARS=		FFLAGS="-march=native -mtune=native"
 
 OPENMP_VARS=		OPENMP_FLAGS=-fopenmp
 
 MPICH_USES=		mpi:mpich
 MPICH_MAKE_ARGS=	F90=${MPIF90}
 
 OPENMPI_USES=		mpi:openmpi
 OPENMPI_MAKE_ARGS=	F90=${MPIF90}
 
 PORTDOCS=		*
 PORTEXAMPLES=		*
 
 MAKE_JOBS_UNSAFE=	yes
 
 PLIST_FILES=		bin/${PORTNAME}
 
 .include <bsd.port.pre.mk>
 
 .if ${GCC_DEFAULT} >= 10
 # workaround for Type mismatch in argument 'cc' at (1); passed COMPLEX(8) to REAL(8)
 FCFLAGS+=	-fallow-argument-mismatch
 .endif
 
 post-patch:
 	@${SED} 's|%%GMAKE%%|${GMAKE}|; s|%%FC%%|${FC}|; \
 		s|%%FCFLAGS%%|${FCFLAGS}|; \
 		s|%%OPENMP_FLAGS%%|${OPENMP_FLAGS}|' \
 		< ${FILESDIR}/make.inc.in \
 		> ${WRKSRC}/make.inc
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/*.pdf ${STAGEDIR}${DOCSDIR}
 
 do-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
 
 do-test: # several tests fail, see https://sourceforge.net/p/elk/discussion/897822/thread/5d7862dd8b/
 	@cd ${WRKSRC}/tests && ./test.sh
 
 .include <bsd.port.post.mk>
diff --git a/science/elmerfem/Makefile b/science/elmerfem/Makefile
index 047bd7dbe95e..ea2d3ba4cb0c 100644
--- a/science/elmerfem/Makefile
+++ b/science/elmerfem/Makefile
@@ -1,119 +1,119 @@
 PORTNAME=	elmerfem
 DISTVERSIONPREFIX=	release-
 DISTVERSION=	9.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	science
 
 MAINTAINER=	henrik@gulbra.net
 COMMENT=	Multiphysical simulation software
 WWW=		https://www.csc.fi/web/elmer
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libblas.so:math/blas \
 		libhdf5.so:science/hdf5 \
 		libmetis.so:math/metis \
 		libmpich.so:net/mpich \
 		libnetcdf.so:science/netcdf \
 		libopenblas.so:math/openblas \
 		libparpack.so:math/arpack-ng
 
 USES=		cmake compiler:c++11-lang fortran
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	ElmerCSC
 
 USE_LDCONFIG=	${PREFIX}/lib/elmersolver
 CMAKE_ARGS=	-DELMER_FEM_REVISION:STRING=${GH_TAGNAME}
 
 ALL_TARGET=	# empty
 
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 PORTSCOUT=	limit:^release-[1-9]
 
 CMAKE_ARGS+=	-DHAVE_INTTYPES_H=ON
 .if !defined(MAINTAINER_MODE)
 CMAKE_ARGS+=	-Wno-dev
 .endif
 
 OPTIONS_DEFINE=		GUI OCC
 OPTIONS_DEFAULT=	GUI OCC
 OPTIONS_SUB=		yes
 
 GUI_DESC=		Build with ElmerGUI (Graphical User Interface)
 OCC_DESC=		Use OpenCASCADE for CAD import in ElmerGUI
 
 GUI_LIB_DEPENDS=	libqwt6.so:x11-toolkits/qwt6
 GUI_USES=		gl jpeg qt:5 xorg
 GUI_USE=		gl=gl,glu xorg=ice,sm,x11,xext,xt qt=${_QT5_LIBS:ts,}
 GUI_CMAKE_BOOL=		WITH_ELMERGUI WITH_PARAVIEW
 GUI_CMAKE_ON=		-DQWT_LIBRARY=${QT_LIBDIR}/libqwt6.so \
 			-DQWT_INCLUDE_DIR=${QT_INCDIR}/qwt6 \
 			-DDESIRED_QT_VERSION=5 \
 			-DWITH_QT5:BOOL=TRUE \
 			-DQT_FOUND:BOOL=TRUE
 
 OCC_IMPLIES=		GUI
 OCC_LIB_DEPENDS=	libexpat.so:textproc/expat2 \
 			libfreetype.so:print/freetype2 \
 			libpng.so:graphics/png \
 			libpython${_PYVERSION}.so:lang/python${PYTHON_SUFFIX} \
 			libtiff.so:graphics/tiff \
 			libTKernel.so:cad/opencascade \
 			libvtksys-${VTK_VER}.so:math/vtk${VTK_VER:R}
 OCC_USES=		python
 OCC_CMAKE_BOOL=		WITH_OCC
 OCC_CMAKE_ON=		-DVTK_DIR=${LOCALBASE}/lib/cmake/vtk-9.0 \
 			-DPython3_EXECUTABLE=${PYTHON_CMD}
 
 _LIBSTAGEDIR=	${STAGEDIR}/${PREFIX}/lib/elmersolver
 _PYVERSION=	${PYTHON_VER}${PYTHON_ABIVER}
 _QT5_LIBS=	buildtools:build concurrent core declarative gui location \
 		network opengl printsupport qmake:build script sensors \
 		sql svg webchannel webkit widgets xml
 
 .include <../../math/vtk9/Makefile.version>
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "amd64"
 CFLAGS_${ARCH}=	-fPIC
 CXXFLAGS_${ARCH}= -fPIC
 FCFLAGS+=	-fPIC
 FFLAGS+=	-fPIC
 .endif
 
 .if ${GCC_DEFAULT} >= 10
 # workaround for Type mismatch between actual argument at (1) and actual argument at (2) (REAL(8)/COMPLEX(8)).
 # in theory, this should set FCFLAGS, but the port does not conform
 FFLAGS+=	-fallow-argument-mismatch
 .endif
 
 post-patch:
 	@${RM} ${WRKSRC}/cmake/Modules/CMakeParseArguments.cmake
 	@${RM} -r ${WRKSRC}/elmergrid/src/metis-5.1.0
 	@${REINPLACE_CMD} -e 's,"metis.*/metis\.h",<metis.h>,' \
 		${WRKSRC}/elmergrid/src/egparallel.c
 
 post-patch-OCC-on:
 	@${REINPLACE_CMD} -e "s|\$${VERSION}|`${PKG_QUERY} '%v' opencascade`|" \
 		"${WRKSRC}/cmake/Modules/FindOCE.cmake"
 	@${REINPLACE_CMD} -e 's|$${INCLUDE}|${LOCALBASE}/include/OpenCASCADE|' \
 		"${WRKSRC}/cmake/Modules/FindOCE.cmake"
 
 post-configure:
 	# workaround for https://github.com/ElmerCSC/elmerfem/issues/334
 	@${REINPLACE_CMD} -e 's| -lMPI::MPI_C | |' ${BUILD_WRKSRC}/ElmerGUI/Application/CMakeFiles/ElmerGUI.dir/link.txt
 
 post-install:
 	${LN} -sf ElmerSolver_mpi ${STAGEDIR}${PREFIX}/bin/ElmerSolver
 	${LN} -sf libelmersolver.so ${_LIBSTAGEDIR}/libelmersolver.so.0
 	${LN} -sf libfhuti.so ${_LIBSTAGEDIR}/libfhuti.so.0
 	${LN} -sf libmatc.so ${_LIBSTAGEDIR}/libmatc.so.0
 	${LN} -sf libmpi_stubs.so ${_LIBSTAGEDIR}/libmpi_stubs.so.0
 	@${STRIP_CMD} ${STAGEDIR}/${PREFIX}/bin/ElmerGrid
 
 do-test:
 	@cd ${TEST_WRKSRC} && ctest -C ${CMAKE_BUILD_TYPE} ${_MAKE_JOBS}
 
 .include <bsd.port.post.mk>
diff --git a/science/erd/Makefile b/science/erd/Makefile
index 2629c3a8ef98..941506f8d4ef 100644
--- a/science/erd/Makefile
+++ b/science/erd/Makefile
@@ -1,25 +1,25 @@
 PORTNAME=	erd
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.0.6
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	AcesIII electron repulsion integrals
 WWW=		https://github.com/psi4/erd
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		cmake fortran
 .if !exists(/usr/include/omp.h)
 CMAKE_OFF=	ENABLE_OPENMP
 .endif
 USE_GITHUB=	yes
 GH_ACCOUNT=	psi4
 USE_LDCONFIG=	yes
 
 CMAKE_ARGS=	-DBUILD_SHARED_LIBS:BOOL=ON \
 		-DENABLE_XHOST:BOOL=OFF
 
 .include <bsd.port.mk>
diff --git a/science/ergo/Makefile b/science/ergo/Makefile
index b6e23913c386..8b81f73907f2 100644
--- a/science/ergo/Makefile
+++ b/science/ergo/Makefile
@@ -1,34 +1,35 @@
 PORTNAME=	ergo
 DISTVERSION=	3.8
+PORTREVISION=	1
 CATEGORIES=	science
 MASTER_SITES=	http://www.ergoscf.org/source/tarfiles/
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Quantum chemistry program for large-scale atomic calculations
 WWW=		http://www.ergoscf.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libblas.so:math/blas \
 		liblapack.so:math/lapack
 TEST_DEPENDS=	bash:shells/bash
 
 USES=		compiler:c++11-lang gmake localbase shebangfix
 
 SHEBANG_FILES=	test/check_eigenvectors.sh test/compare_homo_lumo.sh
 
 GNU_CONFIGURE=	yes
 
 CONFLICTS_INSTALL=	ergo-irc-server # bin/ergo
 
 TEST_TARGET=	check
 
 OPTIONS_DEFINE_amd64=	SSE
 OPTIONS_DEFINE_i386=	SSE
 OPTIONS_DEFAULT_amd64=	SSE
 OPTIONS_DEFAULT_i386=	SSE
 
 SSE_CONFIGURE_ENABLE=	sse-intrinsics
 
 .include <bsd.port.mk>
diff --git a/science/erkale/Makefile b/science/erkale/Makefile
index e556c356bfea..4d397e560501 100644
--- a/science/erkale/Makefile
+++ b/science/erkale/Makefile
@@ -1,69 +1,69 @@
 PORTNAME=	erkale
 DISTVERSION=	g20220405
-PORTREVISION=	5
+PORTREVISION=	7
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Quantum chemistry program to solve the electronic structure of atoms
 WWW=		https://github.com/susilehtola/erkale
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BROKEN_i386=	liberkale_omp.so.0.1.0: undefined reference to `__atomic_compare_exchange'
 
 BUILD_DEPENDS=	armadillo>0:math/armadillo
 LIB_DEPENDS=	libderiv.so:science/libint \
 		libgsl.so:math/gsl \
 		libhdf5.so:science/hdf5 \
 		libint.so:science/libint \
 		libsz.so:science/libaec \
 		libxc.so:science/libxc
 RUN_DEPENDS=	${LOCALBASE}/share/erkale/basis/6-21G.gbs:science/erkale-pseudopotentials
 
 FLAVORS=	parallel serial
 FLAVOR?=	${FLAVORS:[1]}
 serial_PKGNAMESUFFIX=	-serial
 
 USES=		cmake:noninja compiler:c11 fortran pkgconfig
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	susilehtola
 GH_TAGNAME=	f005a9ed588d7b6fcda54648db16523419308cbd
 
 TEST_TARGET=	test
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 CMAKE_ARGS=	-DERKALE_SYSTEM_LIBRARY=${DATADIR}/basis
 
 PLIST_SUB=	SUFFIX="${SUFFIX}"
 
 .if ${FLAVOR} == serial
 CMAKE_OFF=	USE_OPENMP
 .else # parallel
 CMAKE_ON+=	USE_OPENMP
 SUFFIX=		_omp
 .endif
 
 OPTIONS_SINGLE=		LINALG
 OPTIONS_SINGLE_LINALG=	NETLIB OPENBLAS
 OPTIONS_DEFAULT=	OPENBLAS
 LINALG_DESC=		Linear algebra library
 
 NETLIB_USES=		blaslapack:netlib
 NETLIB_CMAKE_ON=	-DLAPACK_LIBRARIES:STRING=-llapack -DBLAS_LIBRARIES:STRING=-lblas
 NETLIB_LDFLAGS=		${LOCALBASE}/lib/libcblas.so ${LOCALBASE}/lib/liblapack.so ${LOCALBASE}/lib/libblas.so
 NETLIB_LIB_DEPENDS=	libcblas.so:math/cblas
 NETLIB_BROKEN=		choosing NETLIB causes a conflict: openblas-0.3.7_3,1 conflicts with cblas-1.0_12 on /usr/local/include/cblas.h
 
 OPENBLAS_USES=		blaslapack:openblas
 OPENBLAS_CMAKE_ON=	-DLAPACK_LIBRARIES:STRING=-lopenblas -DBLAS_LIBRARIES:STRING=-lopenblas
 
 .if ${FLAVOR} == parallel
 post-install:
 	@${MV} ${STAGEDIR}${PREFIX}/include/erkale ${STAGEDIR}${PREFIX}/include/erkale${SUFFIX}
 	@${MV} ${STAGEDIR}${PREFIX}/bin/erkale_bastool ${STAGEDIR}${PREFIX}/bin/erkale_bastool${SUFFIX}
 .endif
 
 .include <bsd.port.mk>
diff --git a/science/fastjet/Makefile b/science/fastjet/Makefile
index 3f7f5d44404a..25bd850a9775 100644
--- a/science/fastjet/Makefile
+++ b/science/fastjet/Makefile
@@ -1,57 +1,57 @@
 PORTNAME=	fastjet
 DISTVERSION=	3.4.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	science
 MASTER_SITES=	https://fastjet.fr/repo/
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Package for jet finding in pp and e+e- collisions
 WWW=		https://fastjet.fr/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	bash:shells/bash
 
 USES=		fortran gmake libtool shebangfix
 USE_LDCONFIG=	yes
 
 SHEBANG_FILES=	fastjet-config.in
 
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS=	--enable-allplugins
 
 LDFLAGS+=	-lexecinfo
 
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} LD_LIBRARY_PATH=${STAGEDIR}${PREFIX}/lib
 
 OPTIONS_DEFINE=			CGAL PYTHON
 OPTIONS_DEFAULT=		CGAL PYTHON
 OPTIONS_SUB=			yes
 
 CGAL_DESC=			Build with CGAL computational geometry library
 CGAL_USES=			localbase
 CGAL_CONFIGURE_ENABLE=		cgal-header-only cgal # cgal is still needed with cgal-header-only contrary to what configure says
 CGAL_BUILD_DEPENDS=		cgal>0:math/cgal \
 				${LOCALBASE}/include/mpfr.h:math/mpfr
 CGAL_LIB_DEPENDS=		libgmp.so:math/gmp
 
 PYTHON_USES=			python
 PYTHON_CONFIGURE_ENABLE=	pyext swig
 PYTHON_CONFIGURE_ENV=		PYTHON_CONFIG=${PYTHON_CMD}-config
 PYTHON_BUILD_DEPENDS=		swig:devel/swig
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib*.so*
 
 post-install-PYTHON-on:
 	@${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/_fastjet.so.0.0.0
 
 do-test:
 	# python tests
 .for e in 01-basic 02-area 03-tools 04-multi-event 05-user-info 06-selector 07-recombiner
 	@cd ${WRKSRC}/example/python && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} ./${e}.py
 .endfor
 
 .include <bsd.port.mk>
diff --git a/science/feff10/Makefile b/science/feff10/Makefile
index 437d78e3f333..0eb2b3ea71bd 100644
--- a/science/feff10/Makefile
+++ b/science/feff10/Makefile
@@ -1,43 +1,44 @@
 PORTNAME=	feff10
 DISTVERSIONPREFIX=	v
 DISTVERSION=	10.0.0-16
+PORTREVISION=	1
 DISTVERSIONSUFFIX=	-gaa99129
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Ab initio scattering calculations of X-ray absorption fine structure
 WWW=		https://times-software.github.io/feff10/
 
 LICENSE=	FEFF10
 LICENSE_NAME=	FEFF10
 LICENSE_FILE=	${WRKSRC}/../LICENSE
 LICENSE_PERMS=	auto-accept dist-mirror pkg-mirror
 
 BUILD_DEPENDS=	bash:shells/bash
 RUN_DEPENDS=	bash:shells/bash
 
 USES=		fortran gmake python:run shebangfix
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	times-software
 
 WRKSRC_SUBDIR=	src
 
 SHEBANG_GLOB=	*.script
 
 FFLAGS+=	-ffree-line-length-512 -fallow-argument-mismatch
 
 MAKE_ARGS=	FLAGS="${FFLAGS}"
 
 BINARY_ALIAS=	make=${GMAKE} ifort=${FC}
 
 do-install:
 	for f in ${WRKSRC}/../bin/Seq/*; do \
 		if readelf -V $${f} > /dev/null 2>&1; then \
 			${INSTALL_PROGRAM} $${f} ${STAGEDIR}${PREFIX}/bin; \
 		else \
 			${INSTALL_SCRIPT} $${f} ${STAGEDIR}${PREFIX}/bin; \
 		fi \
 	done
 
 .include <bsd.port.mk>
diff --git a/science/fleur/Makefile b/science/fleur/Makefile
index 552cf38ec42c..82a456eec869 100644
--- a/science/fleur/Makefile
+++ b/science/fleur/Makefile
@@ -1,84 +1,84 @@
 PORTNAME=	fleur
 DISTVERSION=	6.0-20220715
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science # chemistry
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	FLAPW code for atomic computations in quantum chemistry and physics
 WWW=		https://www.flapw.de/master/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_aarch64=	Fatal Error: Cannot find an intrinsic module named 'ieee_arithmetic' at (1)
 
 LIB_DEPENDS=	libfftw3.so:math/fftw3 \
 		liblapack.so:math/lapack \
 		libopenblas.so:math/openblas
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
 
 USES=		cmake:noninja fortran gnome localbase:ldflags python:test tar:tgz
 USE_GNOME=	libxml2
 
 USE_GITLAB=	yes
 GL_SITE=	https://iffgit.fz-juelich.de
 GL_COMMIT=	a2934446e0eb1fcbf7a69d4d652c969cef0c8c8d
 
 FFLAGS=		-I${LOCALBASE}/include
 LDFLAGS+=	-llapack -lopenblas -lxml2 # to fix missing symbols, see https://iffgit.fz-juelich.de/fleur/fleur/-/issues/670
 
 OPTIONS_DEFINE=		HDF5 KPLIB MPI SCALAPACK ELPA LIBXC WANNIER
 OPTIONS_DEFAULT=	MPI SCALAPACK ELPA WANNIER # HDF5 KPLIB LIBXC
 
 HDF5_CMAKE_BOOL=	CLI_FLEUR_USE_HDF5
 HDF5_CMAKE_ON=		-DHDF5_INCLUDE_DIRS=${LOCALBASE}/include
 HDF5_LIB_DEPENDS=	libhdf5.so:science/hdf5
 HDF5_BROKEN=		Missing hdf5.mod in hdf5 # hdf5 doesn't include Fortran binding
 
 KPLIB_DESC=		Use kpLib library
 #KPLIB_CMAKE_BOOL=	CLI_FLEUR_USE_KPLIB
 KPLIB_DEPENDS=		libkplib.so:science/kplib
 KPLIB_BROKEN=		Fails to find the pre-installed libkplib.so library, see https://iffgit.fz-juelich.de/fleur/fleur/-/issues/691
 
 MPI_CMAKE_BOOL=		CLI_FLEUR_USE_MPI
 MPI_LDFLAGS=		-lmpich -lmpifort
 MPI_LIB_DEPENDS=	libmpich.so:net/mpich
 MPI_VARS=		SUFFIX=_MPI
 
 SCALAPACK_DESC=		Use the ScaLAPACK Scalable LAPACK library
 SCALAPACK_CMAKE_BOOL=	FLEUR_USE_SCALAPACK # no such variable, see https://iffgit.fz-juelich.de/fleur/fleur/-/issues/692, it works only through LDFLAGS set below
 SCALAPACK_VARS=		FFLAGS+=-fallow-argument-mismatch
 SCALAPACK_LDFLAGS=	-lscalapack
 SCALAPACK_LIB_DEPENDS=	libscalapack.so:math/scalapack
 SCALAPACK_IMPLIES=	MPI
 
 ELPA_DESC=		Use libelpa, Eigenvalue SoLver for Petaflop Applications
 ELPA_CMAKE_BOOL=	FLEUR_USE_ELPA # no such variable, see https://iffgit.fz-juelich.de/fleur/fleur/-/issues/689, it works only through FFLAGS set below
 ELPA_VARS=		FFLAGS+=-I${LOCALBASE}/include/elpa-2021.11.001/modules
 ELPA_LDFLAGS=		-lelpa
 ELPA_LIB_DEPENDS=	libelpa.so:math/elpa
 
 LIBXC_DESC=		Use libxc library
 LIBXC_CMAKE_BOOL=	CLI_FLEUR_USE_LIBXC
 LIBXC_LIB_DEPENDS=	libxc.so:science/libxc
 LIBXC_BROKEN=		Silently links with libxc when CLI_FLEUR_USE_LIBXC=OFF, see https://iffgit.fz-juelich.de/fleur/fleur/-/issues/690
 
 WANNIER_DESC=		Use Wannier library
 WANNIER_CMAKE_BOOL=	CLI_FLEUR_USE_WANNIER
 WANNIER_LIB_DEPENDS=	libwannier.so:science/wannier90
 
 EXECUTABLES=	bin/fleur${SUFFIX} \
 		bin/inpgen
 PLIST_FILES=	${EXECUTABLES}
 
 CONFLICTS_BUILD=	libxc # see https://iffgit.fz-juelich.de/fleur/fleur/-/issues/690
 
 post-install: # strip
 	@cd ${STAGEDIR}${PREFIX} && ${STRIP_CMD} ${EXECUTABLES}
 
 do-test:
 	# now: some tests fail or freeze, possibly because of missing hdf5 and kplib dependencies
 	# was: 9 testcases are known to fail, see https://iffgit.fz-juelich.de/fleur/fleur/-/issues/671
 	@cd ${WRKSRC}/tests && pytest ../tests --build_dir=${TEST_WRKSRC}
 
 .include <bsd.port.mk>
diff --git a/science/frontistr/Makefile b/science/frontistr/Makefile
index dddc7fd9c04a..15e88905fab9 100644
--- a/science/frontistr/Makefile
+++ b/science/frontistr/Makefile
@@ -1,55 +1,56 @@
 PORTNAME=	FrontISTR
 PORTVERSION=	5.2
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	science cad
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Large-Scale Parallel FEM Program for Nonlinear Structural Analysis
 WWW=		https://gitlab.com/FrontISTR-Commons/FrontISTR
 
 LICENSE=	MIT
 
 LIB_DEPENDS=	libmetis.so:math/metis		\
 		libscotch.so:cad/scotch		\
 		libcmumps.so.5:math/mumps	\
 		libscalapack.so:math/scalapack
 TEST_DEPENDS=	bash:shells/bash	\
 		gawk:lang/gawk
 
 USE_GITLAB=	yes
 GL_ACCOUNT=	${PORTNAME}-Commons
 GL_COMMIT=	c66bdc397de319ca59a0565b3f3b1a3b33f0c50c
 
 USES=		blaslapack:openblas cmake:testing fortran mpi shebangfix
 SHEBANG_GLOB=	*.sh
 FFLAGS+=	-fallow-argument-mismatch
 ALL_TARGET=	all
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 DOCS_USES=		python:build
 DOCS_BUILD_DEPENDS=	doxygen:devel/doxygen	\
 			dot:graphics/graphviz	\
 			${PYTHON_PKGNAMEPREFIX}mkdocs>0:textproc/py-mkdocs@${PY_FLAVOR}
 DOCS_CMAKE_BOOL=	WITH_DOC
 DOCS_ALL_TARGET=	doc
 
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
 pre-configure:
 	${REINPLACE_CMD} -e 's/awk/gawk/' ${WRKSRC}/tests/test.sh
 
 do-install-DOCS-on:
 	${FIND} ${BUILD_WRKSRC}/doc/html -type d -empty -delete
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${BUILD_WRKSRC}/doc/html && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
 
 do-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
 
 do-test:
 	(cd ${TEST_WRKSRC} && ctest)
 
 .include <bsd.port.mk>
diff --git a/science/fvcom-mpi/Makefile b/science/fvcom-mpi/Makefile
index 1dce0bafd3ff..d4cef77f79ff 100644
--- a/science/fvcom-mpi/Makefile
+++ b/science/fvcom-mpi/Makefile
@@ -1,13 +1,13 @@
-PORTREVISION=	15
+PORTREVISION=	16
 PKGNAMESUFFIX=	-openmpi
 
 MPIPREFIX=	mpi/openmpi/
 
 LIB_DEPENDS+=	libmpi.so:net/openmpi
 
 MASTERDIR=	${.CURDIR}/../fvcom
 
 MAKE_ARGS+=	FC=${LOCALBASE}/${MPIPREFIX}bin/mpif90 \
 		PORT_CPP_FLAGS+=-DMULTIPROCESSOR
 
 .include "${MASTERDIR}/Makefile"
diff --git a/science/fvcom/Makefile b/science/fvcom/Makefile
index 1ece2cd699bb..013b83191322 100644
--- a/science/fvcom/Makefile
+++ b/science/fvcom/Makefile
@@ -1,58 +1,58 @@
 PORTNAME=	fvcom
 PORTVERSION=	2.7.1
-PORTREVISION?=	17
+PORTREVISION?=	18
 CATEGORIES=	science
 MASTER_SITES=	http://fvcom.smast.umassd.edu/FVCOM/index.html/
 DISTNAME=	sourcecode1
 DIST_SUBDIR=	fvcom
 
 MAINTAINER=	jwb@FreeBSD.org
 COMMENT=	Unstructured Grid Finite Volume Coastal Ocean Model
 WWW=		http://fvcom.smast.umassd.edu/FVCOM/index.html
 
 # Converted from RESTRICTED
 LICENSE=	fvcom
 LICENSE_NAME=	fvcom
 LICENSE_TEXT=	Requires (free) registration
 LICENSE_PERMS=	auto-accept
 
 # Check netcdf lib for Fortran support!
 LIB_DEPENDS+=	libnetcdff.so:science/netcdf-fortran \
 		liblapack.so:math/lapack \
 		libblas.so:math/lapack
 
 USES=		fortran
 USE_GCC=	yes
 WRKSRC=		${WRKDIR}/FVCOM2.7.1/FVCOM_source
 
 PLIST_FILES=	${MPIPREFIX}bin/${PORTNAME}${PKGNAMESUFFIX}
 
 .include <bsd.port.pre.mk>
 
 .if !exists(${DISTDIR}/${DIST_SUBDIR}/${DISTFILES})
 IGNORE=	may not be redistributed because of licensing reasons.\
 	Please register at http://fvcom.smast.umassd.edu/FVCOM/index.html\
 	in order to download the source code ${DISTFILES}\
 	and place it in ${DISTDIR}/${DIST_SUBDIR}/
 .endif
 
 MAKE_JOBS_UNSAFE=	yes
 
 post-extract:
 	${MV} ${WRKSRC}/makefile ${WRKSRC}/Makefile
 
 post-patch:
 	${REINPLACE_CMD} -e 's|gcc|${CC}|g' \
 		${WRKDIR}/FVCOM2.7.1/METIS_source/makefile
 	${REINPLACE_CMD} -e 's|cpp|${CPP}|g' \
 		${WRKDIR}/FVCOM2.7.1/FVCOM_source/Makefile
 
 pre-build:
 	(cd ${WRKSRC}/../METIS_source && make)
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${MPIPREFIX}bin
 	${INSTALL_PROGRAM} ${WRKSRC}/fvcom \
 		${STAGEDIR}${PREFIX}/${MPIPREFIX}bin/${PORTNAME}${PKGNAMESUFFIX}
 
 .include <bsd.port.post.mk>
diff --git a/science/gamess-us/Makefile b/science/gamess-us/Makefile
index 45850271454e..ffbd47761322 100644
--- a/science/gamess-us/Makefile
+++ b/science/gamess-us/Makefile
@@ -1,90 +1,90 @@
 PORTNAME=	gamess
 DISTVERSION=	20181013
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	science
 PKGNAMESUFFIX=	-us # "US" fork
 DISTNAME=	gamess-current
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	General Atomic and Molecular Electronic Structure System (US)
 WWW=		https://www.msg.chem.iastate.edu/gamess/
 
 LICENSE=	GAMESS_LICENSE
 LICENSE_NAME=	GAMESS User License Agreement
 LICENSE_FILE=	${FILESDIR}/license.txt
 LICENSE_PERMS=	# none
 
 ONLY_FOR_ARCHS=	amd64 i386
 ONLY_FOR_ARCHS_REASON=	only implemented for 64 and 32 bit Intel architectures
 BROKEN_i386=	Integer too big for its kind at (1) (in file quanpo.f:16518:34)
 
 USES=		fortran gmake
 
 WRKSRC=		${WRKDIR}/gamess
 
 BINARY_ALIAS=	gcc=${CC} gfortran=gfortran${GCC_DEFAULT}
 
 GAMES_VERNO=	00
 GAMES_ENV=	GMS_PATH=${WRKSRC} GMS_BUILD_DIR=${WRKSRC} GMS_TARGET=${ARCH:S/amd64/linux64/:S/i386/linux32/} \
 		GMS_FORTRAN=gfortran GMS_GFORTRAN_VERNO=7.3 \
 		GMS_VERSION=${GAMES_VERNO} GMS_BUILD_PATH=${WRKSRC} \
 		GMS_OPENMP=false GMS_BG_MODEL="" GMS_SUN_OS_VERNO="" GMS_MAC_OSX_VERNO="" \
 		GMS_IFORT_VERNO="" GMS_SUN_FORT_VERNO="" GMS_L64_OPT="" GMS_MATHLIB="${GMS_MATHLIB}" GMS_MATHLIB_PATH=${LOCALBASE}/lib \
 		GMS_MKL_VERNO="" GMS_DDI_COMM="sockets" GMS_MPI_LIB="" GMS_MPI_PATH="" GMS_MVAPICH2_VERNO="" \
 		GMS_OFED_PATH="" GMS_ARMCI_PATH="" GMS_MSUCC="" GMS_LIBCCHEM="" GMS_PHI="" GMS_SHMTYPE="posix"
 
 PLIST_SUB+=	GAMES_VERNO=${GAMES_VERNO}
 SUB_LIST+=	GAMES_VERNO=${GAMES_VERNO}
 SUB_FILES=	pkg-message
 
 OPTIONS_RADIO=		MATHLIB
 OPTIONS_RADIO_MATHLIB=	ATLAS OPENBLAS
 OPTIONS_DEFAULT=	OPENBLAS
 MATHLIB_DESC=		Math library
 
 ATLAS_VARS=		GMS_MATHLIB=atlas
 ATLAS_LIB_DEPENDS=	libatlas.so:math/atlas
 
 OPENBLAS_VARS=		GMS_MATHLIB=openblas
 OPENBLAS_LIB_DEPENDS=	libopenblas.so:math/openblas
 
 .include <bsd.port.pre.mk>
 
 # Check for gamess sources and prompt how to download them
 .if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})
 IGNORE=	license restrictions require registration and manual fetching of the distribution\
 	source. Please visit https://www.msg.chem.iastate.edu/gamess/License_Agreement.html\
 	with a browser. You will be required to agree to the license terms, enter your e-mail\
 	address, check any box under "Source Code Distributions", and submit your download request.\
 	Once you download the file ${DISTFILES}, please put it into ${DISTDIR}/${DISTFILES} and\
 	run 'make' again
 .endif
 
 do-configure:
 	@cd ${WRKSRC} && \
 		${SETENV} ${MAKE_ENV} ${GAMES_ENV} ./config
 
 do-build:
 	@cd ${WRKSRC}/ddi && ${SETENV} ${MAKE_ENV} ./compddi && ${MV} ddikick.x ..
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./compall
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./lked gamess ${GAMES_VERNO}
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/rungms ${STAGEDIR}${PREFIX}/bin
 	@${REINPLACE_CMD} -i '' 's|^set GMSPATH=.*|set GMSPATH=${DATADIR}|' ${STAGEDIR}${PREFIX}/bin/rungms
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/gamess.${GAMES_VERNO}.x ${STAGEDIR}${DATADIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/ddikick.x ${STAGEDIR}${DATADIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/gms-files.csh ${STAGEDIR}${DATADIR}
 	@${MKDIR} ${STAGEDIR}${DATADIR}/tools
 	${INSTALL_SCRIPT} ${WRKSRC}/tools/remd.csh ${STAGEDIR}${DATADIR}/tools/remd.csh
 	cd ${WRKSRC} && ${COPYTREE_SHARE} auxdata ${STAGEDIR}${DATADIR}/
 
 do-test:
 	@${REINPLACE_CMD} -i '' 's|^set GMSPATH=.*|set GMSPATH=${WRKSRC}|' ${WRKSRC}/rungms
 	@cd ${WRKSRC} && \
 		${MKDIR} ../gamess-devv && \
 		${SETENV} ${MAKE_ENV} ./runall ${GAMES_VERNO} && \
 		${SETENV} ${MAKE_ENV} tests/standard/checktst
 
 .include <bsd.port.post.mk>
diff --git a/science/gbtolib/Makefile b/science/gbtolib/Makefile
index 4fffc22a24ef..842fd3224579 100644
--- a/science/gbtolib/Makefile
+++ b/science/gbtolib/Makefile
@@ -1,34 +1,34 @@
 PORTNAME=	gbtolib
 DISTVERSION=	3.0.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science # chemistry, physics
 MASTER_SITES=	https://zenodo.org/record/5798035/files/
 DISTNAME=	GBTOLib-${DISTVERSION}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	High-performance library for evaluation of molecular integrals
 WWW=		https://zenodo.org/record/5798035 #.Yo1sazXMKV4
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 .if !exists(/usr/include/omp.h)
 BROKEN=		requires OpenMP support that is missing on this architecture
 .endif
 
 LIB_DEPENDS=	libopenblas.so:math/openblas
 
 USES=		cmake fortran zip
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 CMAKE_OFF=	BUILD_DOC BUILD_TESTING
 
 FFLAGS=		-fdefault-integer-8
 
 OPTIONS_DEFINE=	MPI
 
 MPI_CMAKE_BOOL=	WITH_MPI
 MPI_CMAKE_ON=	-DMPIEXEC_EXECUTABLE=${LOCALBASE}/bin/mpiexec
 MPI_BROKEN=	MPI build fails with error: Failed to detemine MPI integer interface.
 
 .include <bsd.port.mk>
diff --git a/science/gdma/Makefile b/science/gdma/Makefile
index 2af8978ca9cd..227c46b8d95d 100644
--- a/science/gdma/Makefile
+++ b/science/gdma/Makefile
@@ -1,27 +1,27 @@
 PORTNAME=	gdma
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.2.6
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Anthony Stone's Gaussian Distributed Multipole Analysis
 WWW=		https://github.com/psi4/gdma
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		cmake fortran
 USE_GITHUB=	yes
 GH_ACCOUNT=	psi4
 USE_LDCONFIG=	yes
 
 CMAKE_ARGS=	-DBUILD_SHARED_LIBS:BOOL=ON \
 		-DENABLE_XHOST:BOOL=OFF
 .if !exists(/usr/include/omp.h)
 CMAKE_ARGS+=	-DENABLE_OPENMP:BOOL=OFF
 .else
 CMAKE_ARGS+=	-DENABLE_OPENMP:BOOL=ON
 .endif
 
 .include <bsd.port.mk>
diff --git a/science/getdp/Makefile b/science/getdp/Makefile
index 31b8136c78a4..a5f881b8e5d7 100644
--- a/science/getdp/Makefile
+++ b/science/getdp/Makefile
@@ -1,31 +1,32 @@
 PORTNAME=	getdp
 PORTVERSION=	3.5.0
+PORTREVISION=	1
 CATEGORIES=	science
 MASTER_SITES=	http://www.geuz.org/getdp/src/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-source
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Rather general finite element solver using mixed finite elements
 WWW=		https://www.geuz.org/getdp/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 LIB_DEPENDS=	libgsl.so:math/gsl	\
 		liblapack.so:math/lapack
 
 USES=		fortran tar:tgz cmake
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 .include <bsd.port.pre.mk>
 
 .if ${GCC_DEFAULT} >= 10
 # workaround for Rank mismatch in argument 'lines' at (1) (rank-1 and scalar)
 FFLAGS+=	-fallow-argument-mismatch
 .endif
 
 do-test:
 	cd ${WRKSRC}/demos && yes "" | ${STAGEDIR}${PREFIX}/bin/${PORTNAME} magnet.pro -solve MagSta_phi
 
 .include <bsd.port.post.mk>
diff --git a/science/ghemical/Makefile b/science/ghemical/Makefile
index aa2f1ce55a9f..ea81c1713426 100644
--- a/science/ghemical/Makefile
+++ b/science/ghemical/Makefile
@@ -1,45 +1,45 @@
 PORTNAME=	ghemical
 PORTVERSION=	3.0.0
-PORTREVISION=	24
+PORTREVISION=	25
 CATEGORIES=	science
 MASTER_SITES=	http://bioinformatics.org/ghemical/download/%SUBDIR%/
 MASTER_SITE_SUBDIR=	release20111012 current
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Computational chemistry software package
 WWW=		https://www.bioinformatics.org/ghemical/ghemical/index.html
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libblas.so:math/blas \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libghemical.so:science/libghemical \
 		libgtkglext-x11-1.0.so:x11-toolkits/gtkglext \
 		libint.so:science/libint \
 		liblapack.so:math/lapack \
 		liboglappth.so:science/liboglappth \
 		libmopac.so:science/mopac \
 		libmpqc.so:science/mpqc
 RUN_DEPENDS=	xdg-open:devel/xdg-utils
 
 USES=		compiler:c++11-lang fortran gettext gl gmake gnome pathfix \
 		pkgconfig xorg
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-gtk --enable-threads --disable-openbabel # not compatible with OpenBabel-3 so it is disabled
 USE_GNOME=	cairo gdkpixbuf2 gtk20 libglade2 intltool pangox-compat
 USE_GL=		gl glu
 USE_XORG=	x11
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 CXXFLAGS+=	-Wno-c++11-narrowing # prevent build errors: non-constant-expression cannot be narrowed from type 'double' to 'fGL' (aka 'float')
 
 PLIST_SUB=	GHEMICAL_VERSION="${PORTVERSION}"
 
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|"mozilla "|"xdg-open "|' ${WRKSRC}/src/gtk_app.cpp
 	@${REINPLACE_CMD} -e 's|openbabel-2.0|openbabel-3|' ${WRKSRC}/configure # attempt at OpenBabel-3 compatibility
 
 .include <bsd.port.mk>
diff --git a/science/gnudatalanguage/Makefile b/science/gnudatalanguage/Makefile
index 8c9f5456a1f0..935418402fdc 100644
--- a/science/gnudatalanguage/Makefile
+++ b/science/gnudatalanguage/Makefile
@@ -1,154 +1,154 @@
 PORTNAME=	gnudatalanguage
 PORTVERSION=	1.0.2
-PORTREVISION=	2
+PORTREVISION=	3
 DISTVERSIONPREFIX=	v
 CATEGORIES=	science lang
 .if defined(BUILD_PYTHON_MODULE)
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 .endif
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT?=	Free IDL-compatible incremental compiler
 WWW=		https://github.com/gnudatalanguage/gdl
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS+=	libgeotiff.so:graphics/libgeotiff\
 		libexpat.so:textproc/expat2	\
 		libplplot.so:math/plplot	\
 		libtiff.so:graphics/tiff	\
 		libshp.so:devel/shapelib	\
 		libpng.so:graphics/png		\
 		libsz.so:science/libaec		\
 		libps.so:print/pslib		\
 		libgsl.so:math/gsl
 
 USE_GITHUB=	yes
 GH_PROJECT=	gdl
 GH_TAGNAME=	6546898e7f2d23ae1bf67ebe70dc0f38886e5de7
 
 USES=		cmake compiler:c++11-lang fortran ncurses pkgconfig readline \
 		xorg
 USE_WX=		3.0+
 USE_XORG=	x11 sm ice xext
 
 # Disable ncurses and readline from ports
 # TODO:	create a port for Astron http://idlastro.gsfc.nasa.gov/ftp/astron.tar.gz
 
 CMAKE_ARGS=	-DREADLINEDIR:STRING="/usr"	\
 		-DOPENMP:BOOL=ON		\
 		-DNCURSESDIR:STRING="/usr"	\
 		-DPYTHON:BOOL=NO
 CPPFLAGS+=	${CFLAGS} -fno-inline -DNPY_NO_DEPRECATED_API -DNPY_1_7_API_VERSION
 CXXFLAGS+=	-std=gnu++11
 LDFLAGS+=	-lpthread -L${LOCALBASE}/lib
 TEST_TARGET=	test
 
 SLAVEDIRS=	science/py-gnudatalanguage
 
 # Upstream prefer GraphicsMagick over ImageMackick
 # see https://github.com/gnudatalanguage/gdl/issues/611
 # and https://github.com/gnudatalanguage/gdl/issues/1044 for ImageMagick 7
 OPTIONS_DEFINE=	EIGEN EXAMPLES FFTW GLPK GRAPHICSMAGICK GRIB HDF5 LIBPROJ4	\
 		MPI NETCDF PYTHON QHULL UDUNITS
 OPTIONS_DEFAULT=EIGEN FFTW GLPK GRAPHICSMAGICK GRIB HDF5 LIBPROJ4 NETCDF PYTHON	\
 		QHULL UDUNITS
 
 EIGEN_DESC=		Eigen3 support (boost performance)
 EIGEN_USES=		eigen:3
 EIGEN_CMAKE_ON=		-DEIGEN3:BOOL=YES
 EIGEN_CMAKE_OFF=	-DEIGEN3:BOOL=NO
 
 FFTW_LIB_DEPENDS=	libfftw3.so:math/fftw3		\
 			libfftw3f.so:math/fftw3-float
 FFTW_CMAKE_ON=		-DFFTW:BOOL=YES
 FFTW_CMAKE_OFF=		-DFFTW:BOOL=NO
 
 GLPK_DESC=		Support GLPK for Simplex (Linear programming)
 GLPK_LIB_DEPENDS=	libglpk.so:math/glpk
 GLPK_CMAKE_ON=		-DGLPK=ON:BOOL=YES
 GLPK_CMAKE_OFF=		-DGLPK=OFF:BOOL=NO
 
 GRAPHICSMAGICK_DESC=		Support GraphicsMagick
 GRAPHICSMAGICK_LIB_DEPENDS=	libGraphicsMagick.so:graphics/GraphicsMagick
 GRAPHICSMAGICK_CMAKE_ON=	-DGRAPHICSMAGICK:BOOL=YES
 GRAPHICSMAGICK_CMAKE_OFF=	-DGRAPHICSMAGICK:BOOL=NO
 # Temporary swith to ImageMagick
 #IMAGEMAGICK_DESC=	Support ImageMagick
 #IMAGEMAGICK_LIB_DEPENDS=libMagick++-7.so:graphics/ImageMagick7
 #IMAGEMAGICK_CMAKE_ON=	-DGRAPHICSMAGICK:BOOL=NO -DMAGICK:BOOL=YES -DMAGICKDIR=${LOCALBASE}
 #IMAGEMAGICK_CMAKE_OFF=	-DMAGICK:BOOL=NO
 
 GRIB_DESC=		Support GRIB messages
 GRIB_LIB_DEPENDS=	libeccodes.so:science/eccodes
 GRIB_CMAKE_ON=		-DGRIB:BOOL=YES
 GRIB_CMAKE_OFF=		-DGRIB:BOOL=NO
 
 HDF5_LIB_DEPENDS=	libhdf5.so:science/hdf5
 HDF5_CMAKE_ON=		-DHDF5:BOOL=YES
 HDF5_CMAKE_OFF=		-DHDF5:BOOL=NO -DHDF:BOOL=NO
 
 LIBPROJ4_DESC=		Support cartographic processes
 LIBPROJ4_LIB_DEPENDS=	libproj.so:graphics/proj
 LIBPROJ4_CMAKE_ON=	-DLIBPROJ:BOOL=YES
 LIBPROJ4_CMAKE_OFF=	-DLIBPROJ:BOOL=NO
 
 MPI_LIB_DEPENDS=	libmpich.so:net/mpich
 MPI_CMAKE_ON=		-DMPI:BOOL=ON
 MPI_CMAKE_OFF=		-DMPI:BOOL=OFF -DMPIDIR=/none
 
 NETCDF_LIB_DEPENDS=	libnetcdf.so:science/netcdf
 NETCDF_CMAKE_ON=	-DNETCDF:BOOL=YES -DHDF:BOOL=NO
 NETCDF_CMAKE_OFF=	-DNETCDF:BOOL=NO
 
 PYTHON_USES=		python:3.7+
 PYTHON_BUILD_DEPENDS=	${PYNUMPY}
 PYTHON_RUN_DEPENDS=	${PYNUMPY} \
 			${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR}
 PYTHON_CMAKE_ON=	-DPYTHON:BOOL=YES -DPYTHONVERSION:STRING="${PYTHON_VER}"
 PYTHON_CMAKE_OFF=	-DPYTHON:BOOL=NO
 
 QHULL_DESC=		Enable Triangulate and Qhull support
 QHULL_LIB_DEPENDS=	libqhull_r.so:math/qhull
 QHULL_CMAKE_ON=		-DQHULL:BOOL=YES
 QHULL_CMAKE_OFF=	-DQHULL:BOOL=NO
 
 UDUNITS_LIB_DEPENDS=	libudunits2.so:science/udunits
 UDUNITS_CMAKE_ON=	-DUDUNITS2:BOOL=YES
 UDUNITS_CMAKE_OFF=	-DUDUNITS2:BOOL=NO
 
 .if defined(BUILD_PYTHON_MODULE)
 CATEGORIES+=	python
 CMAKE_ARGS+=	-DPYTHON_MODULE:BOOL=YES
 PLIST=		${.CURDIR}/pkg-plist.pymod
 .else
 CMAKE_ARGS+=	-DPYTHON_MODULE:BOOL=NO
 .endif
 
 .if defined(BUILD_PYTHON_MODULE)
 do-install:
 	${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}
 	${INSTALL_DATA} ${INSTALL_WRKSRC}/src/GDL.so ${STAGEDIR}${PYTHON_SITELIBDIR}/
 .endif
 
 .if !defined(BUILD_PYTHON_MODULE)
 post-install:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/testsuite
 	(cd ${WRKSRC}/testsuite && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR}/testsuite/)
 .endif
 
 .if defined(MAINTAINER_MODE)
 regression-test:	install
 . if defined(BUILD_PYTHON_MODULE)
 	@${ECHO_CMD} 'import GDL' > ${WRKDIR}/testgdl.py
 	@${ECHO_CMD} 'print GDL.function("sin",(1,))' >> ${WRKDIR}/testgdl.py
 	${PYTHON_CMD} ${WRKDIR}/testgdl.py
 . else
 	@${ECHO_CMD} ".RUN ${EXAMPLESDIR}/testsuite/test_suite.pro"	\
 		> ${WRKDIR}/testgdl
 	@${ECHO_CMD} "exit" >> ${WRKDIR}/testgdl
 	${PREFIX}/bin/gdl < ${WRKDIR}/testgdl
 . endif
 .endif
 
 .include <bsd.port.mk>
diff --git a/science/grib_api/Makefile b/science/grib_api/Makefile
index 3ba49620c3f2..d34df5f9a650 100644
--- a/science/grib_api/Makefile
+++ b/science/grib_api/Makefile
@@ -1,43 +1,43 @@
 PORTNAME=	grib_api
 PORTVERSION=	1.28.0
 DISTVERSIONSUFFIX=	-Source
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	science
 MASTER_SITES=	https://confluence.ecmwf.int/download/attachments/3473437/ \
 		LOCAL/sunpoet
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	ECMWF API for WMO FM-92 GRIB messages
 WWW=		https://confluence.ecmwf.int/display/GRIB
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libnetcdf.so:science/netcdf \
 		libpng.so:graphics/png
 
 CONFLICTS_INSTALL=	eccodes
 
 OPTIONS_SINGLE=	JPEG
 OPTIONS_SINGLE_JPEG=	JASPER OPENJPEG
 OPTIONS_DEFAULT=OPENJPEG
 
 PORTSCOUT=	site:https://software.ecmwf.int/wiki/display/GRIB/Releases
 
 USES=		libtool pathfix
 
 CONFIGURE_ARGS=	--enable-pthread --with-netcdf=${LOCALBASE} --with-png-support
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 
 JASPER_CONFIGURE_ON=	--with-jasper=${LOCALBASE}
 JASPER_LIB_DEPENDS=	libjasper.so:graphics/jasper
 OPENJPEG_CFLAGS=	-I${LOCALBASE}/include/openjpeg-1.5
 OPENJPEG_CONFIGURE_ON=	--with-openjpeg=${LOCALBASE}
 OPENJPEG_LIB_DEPENDS=	libopenjpeg.so:graphics/openjpeg15
 
 post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/tools/grib1to2 ${STAGEDIR}${PREFIX}/bin/grib1to2
 
 .include <bsd.port.mk>
diff --git a/science/gromacs/Makefile b/science/gromacs/Makefile
index 7b952e14331c..a920ac7ee605 100644
--- a/science/gromacs/Makefile
+++ b/science/gromacs/Makefile
@@ -1,101 +1,102 @@
 PORTNAME=	gromacs
 DISTVERSION=	2022.4
+PORTREVISION=	1
 CATEGORIES=	science
 MASTER_SITES=	ftp://ftp.gromacs.org/pub/gromacs/
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Compute molecular dynamics
 WWW=		https://www.gromacs.org/
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BROKEN_i386=	undefined reference to `__atomic_load' and `__atomic_compare_exchange' #`
 
 BUILD_DEPENDS=	boost-libs>=1.44:devel/boost-libs
 LIB_DEPENDS=	libhwloc.so:devel/hwloc2
 
 USES=		cmake compiler:c++17-lang fortran gnome perl5 pkgconfig python:build shebangfix xorg
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
 
 SHEBANG_FILES=	admin/*.sh scripts/*.pl scripts/*.sh src/gromacs/selection/*.sh
 bash_CMD=	${SH}
 
 CMAKE_OFF=	GMX_USE_RDTSCP \
 		USE_PYTHON_SCRIPTS
 CMAKE_ARGS=	-DPython3_EXECUTABLE=${PYTHON_CMD}
 
 TEST_TARGET=	check
 
 OPTIONS_DEFINE=		ATLAS FLOAT LEGACY OPENCL OPENMP SIMD X11
 OPTIONS_SINGLE=		MP
 OPTIONS_SINGLE_MP=	NOMP MPICH OPENMPI THREAD_MPI
 OPTIONS_DEFAULT=	LEGACY OPENMP THREAD_MPI X11 # FLOAT should not a default because science/votca needs double precision. This is likely the same for many other uses.
 OPTIONS_SUB=		yes
 
 ATLAS_DESC=		Use ATLAS for BLAS and LAPACK
 ATLAS_USES=		blaslapack:atlas
 ATLAS_USES_OFF=		blaslapack
 ATLAS_CMAKE_ON=		-DBLAS_LIBRARIES:FILEPATH="${LOCALBASE}/lib/libcblas.so;${LOCALBASE}/lib/libf77blas.so" \
 			-DLAPACK_LIBRARIES:FILEPATH="${LOCALBASE}/lib/libalapack.so"
 ATLAS_CMAKE_OFF=	-DBLAS_LIBRARIES:FILEPATH="${LOCALBASE}/lib/libblas.so" \
 			-DLAPACK_LIBRARIES:FILEPATH="${LOCALBASE}/lib/liblapack.so"
 
 FLOAT_DESC=		Use single instead of double precision
 FLOAT_BUILD_DEPENDS=	fftw3>0:math/fftw3
 FLOAT_LIB_DEPENDS=	libfftw3f.so:math/fftw3-float
 FLOAT_LIB_DEPENDS_OFF=	libfftw3.so:math/fftw3
 FLOAT_CMAKE_ON=		-DGMX_DOUBLE:BOOL=OFF
 FLOAT_CMAKE_OFF=	-DGMX_DOUBLE:BOOL=ON
 FLOAT_PLIST_SUB=	SUFFIX_D=""
 FLOAT_PLIST_SUB_OFF=	SUFFIX_D="_d"
 
 LEGACY_DESC=		Install legacy API # expected by science/votca
 LEGACY_CMAKE_BOOL=	GMX_INSTALL_LEGACY_API
 
 OPENCL_CMAKE_BOOL=	GMX_USE_OPENCL
 OPENCL_CMAKE_ON=	-DGMX_GPU:STRING=OpenCL # one of: OFF, CUDA, OpenCL, SYCL
 OPENCL_CMAKE_OFF=	-DGMX_GPU:STRING=OFF
 OPENCL_LIB_DEPENDS=	libOpenCL.so:devel/ocl-icd
 
 OPENMP_CMAKE_ON=	-DGMX_CXX11:BOOL=OFF
 OPENMP_CMAKE_OFF=	-DGMX_OPENMP:BOOL=OFF
 
 SIMD_CMAKE_OFF=		-DGMX_SIMD:STRING="None"
 
 X11_USE=		XORG=ice,sm,xext,x11
 X11_CMAKE_BOOL=		GMX_X11
 
 MP_DESC=		Multiprocessing
 
 NOMP_DESC=		No multiprocessing support
 NOMP_PLIST_SUB=		SUFFIX_MPI=""
 
 MPICH_LIB_DEPENDS=	libmpich.so:net/mpich
 MPICH_CMAKE_ON=		-DGMX_MPI:BOOL=ON \
 			-DMPI_C_COMPILER:FILEPATH="${LOCALBASE}/bin/mpicc"
 MPICH_PLIST_SUB=	SUFFIX_MPI="_mpi"
 
 OPENMPI_BUILD_DEPENDS=	openmpi>0:net/openmpi
 OPENMPI_RUN_DEPENDS=	openmpi>0:net/openmpi
 OPENMPI_CMAKE_ON=	-DGMX_MPI:BOOL=ON \
 			-DMPI_C_COMPILER:FILEPATH="${LOCALBASE}/mpi/openmpi/bin/mpicc"
 OPENMPI_PLIST_SUB=	SUFFIX_MPI="_mpi"
 
 THREAD_MPI_DESC=	Build a thread-MPI-based multithreaded version of GROMACS
 THREAD_MPI_CMAKE_BOOL=	GMX_THREAD_MPI
 THREAD_MPI_PLIST_SUB=	SUFFIX_MPI=""
 
 post-patch:
 	@${FIND} ${WRKSRC} -name "CMakeLists.txt" | ${XARGS} \
 		${REINPLACE_CMD} -e \
 		's|share/man|man| ; \
 		 /pkgconfig/s|LIB_INSTALL_DIR}|CMAKE_INSTALL_PREFIX}/libdata|'
 	@${FIND} ${WRKSRC} -name "GMXRC.*" | ${XARGS} ${REINPLACE_CMD} -e \
 		's|LDLIB/pkgconfig|LDLIB/../libdata/pkgconfig| ; \
 		 s|LDLIB}/pkgconfig|LDLIB}/../libdata/pkgconfig|'
 	@${REINPLACE_CMD} -e '/CMAKE_REQUIRED_LIBRARIES/d' \
 		${WRKSRC}/cmake/gmxTestdlopen.cmake
 
 .include <bsd.port.mk>
diff --git a/science/h5utils/Makefile b/science/h5utils/Makefile
index 6b063f7a2839..c069f8700dc9 100644
--- a/science/h5utils/Makefile
+++ b/science/h5utils/Makefile
@@ -1,38 +1,39 @@
 PORTNAME=	h5utils
 DISTVERSION=	1.13.2
+PORTREVISION=	1
 CATEGORIES=	science
 MASTER_SITES=	https://github.com/NanoComp/${PORTNAME}/releases/download/${DISTVERSION}/
 
 MAINTAINER=	eduardo@FreeBSD.org
 COMMENT=	Set of utilities for visualization and conversion of HDF5 format
 WWW=		https://github.com/NanoComp/h5utils
 
 LICENSE=	GPLv2 MIT
 LICENSE_COMB=	multi
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	gawk:lang/gawk
 LIB_DEPENDS=	libdf.so:science/hdf \
 		libhdf5.so:science/hdf5 \
 		libmatheval.so:devel/libmatheval \
 		libpng.so:graphics/png
 
 USES=		autoreconf compiler:c++11-lang jpeg localbase
 GNU_CONFIGURE=	yes
 
 CFLAGS+=	-pthread
 CXXFLAGS+=	-std=c++11
 
 OPTIONS_DEFINE=	OCTAVE
 OPTIONS_SUB=	yes
 
 OCTAVE_DESC=		With Octave support
 OCTAVE_CONFIGURE_WITH=	octave
 OCTAVE_BUILD_DEPENDS=	${LOCALBASE}/include/octave-${OCTAVE_VERSION}/octave/octave.h:math/octave
 OCTAVE_USES=		octave:env
 OCTAVE_VARS=		PLIST_SUB+="OCTAVE_VERSION=${OCTAVE_VERSION} CONFIGURE_TARGET=${CONFIGURE_TARGET}"
 
 post-install-OCTAVE-on:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/octave/${OCTAVE_VERSION}/site/oct/${CONFIGURE_TARGET}/h5read.oct
 
 .include <bsd.port.mk>
diff --git a/science/h5z-zfp/Makefile b/science/h5z-zfp/Makefile
index b72ac01ff038..b2d19fecde8f 100644
--- a/science/h5z-zfp/Makefile
+++ b/science/h5z-zfp/Makefile
@@ -1,27 +1,28 @@
 PORTNAME=	h5z-zfp
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.1.0
+PORTREVISION=	1
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Registered ZFP compression plugin for HDF5
 WWW=		https://h5z-zfp.readthedocs.io/en/latest/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libhdf5.so:science/hdf5 \
 		libzfp.so:devel/zfp
 
 USES=		cmake fortran localbase
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	LLNL
 GH_PROJECT=	${PORTNAME:tu}
 
 OPTIONS_DEFINE=		FORTRAN
 
 FORTRAN_CMAKE_BOOL=	FORTRAN_INTERFACE
 
 .include <bsd.port.mk>
diff --git a/science/harminv/Makefile b/science/harminv/Makefile
index 249c0064fac8..96e4d1247352 100644
--- a/science/harminv/Makefile
+++ b/science/harminv/Makefile
@@ -1,22 +1,22 @@
 PORTNAME=	harminv
 PORTVERSION=	1.3.1
-PORTREVISION=	19
+PORTREVISION=	20
 CATEGORIES=	science
 MASTER_SITES=	http://ab-initio.mit.edu/harminv/
 
 MAINTAINER=	devel@stasyan.com
 COMMENT=	Solver of harmonic inversion
 WWW=		http://ab-initio.mit.edu/wiki/index.php/Harminv
 
 LIB_DEPENDS=	libguile-2.2.so:lang/guile2
 
 USES=		blaslapack fortran gmake libtool pathfix
 GNU_CONFIGURE=	yes
 USE_GCC=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include -fPIC
 LD_LIBRARY_PATH=	-L${LOCALBASE}/lib -L/usr/lib
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ENV+=	LD_LIBRARY_PATH="${LD_LIBRARY_PATH}"
 USE_LDCONFIG=	yes
 
 .include <bsd.port.mk>
diff --git a/science/hdf/Makefile b/science/hdf/Makefile
index df7d31ed0648..bc2ab25e8b70 100644
--- a/science/hdf/Makefile
+++ b/science/hdf/Makefile
@@ -1,55 +1,55 @@
 PORTNAME=	hdf
 PORTVERSION=	4.2.15
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	science archivers graphics
 MASTER_SITES=	http://www.hdfgroup.org/ftp/HDF/releases/HDF${PORTVERSION}/src/ \
 		ftp://ftp.hdfgroup.org/HDF/releases/HDF${PORTVERSION}/src/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Hierarchical Data Format library (from NCSA)
 WWW=		https://www.hdfgroup.org/products/hdf4/
 
 NOT_FOR_ARCHS=		aarch64 armv6 armv7
 NOT_FOR_ARCHS_REASON=	fails to compile: no machine type has been defined
 
 LIB_DEPENDS=	libsz.so:science/libaec
 
 CONFLICTS_INSTALL=	netcdf-4.[0-9]*
 
 USES=		fortran jpeg libtool
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared --with-jpeg=${LOCALBASE} \
 		--with-szlib=${LOCALBASE}
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check
 
 PORTDATA=	*
 PORTEXAMPLES=	*
 
 OPTIONS_DEFINE=	EXAMPLES
 
 .include <bsd.port.pre.mk>
 
 .if ${GCC_DEFAULT} >= 10
 # workaround for Type mismatch between actual argument at (1) and actual argument at (2) (CHARACTER(0)/INTEGER(4)).
 # in theory, this should set FCFLAGS, but the port does not conform
 FFLAGS+=	-fallow-argument-mismatch
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e '/PROD_/ s|=.*|=""|' ${WRKSRC}/config/freebsd
 	@${REINPLACE_CMD} -e 's/ || (__APPLE__.*//' \
 		${WRKSRC}/hdf/test/fortest.c
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/man/hdfunpac.1 \
 		${STAGEDIR}${MAN1PREFIX}/man/man1
 	# Allow to build on PowerPC
 	@${REINPLACE_CMD} -e '/if defined (__APPLE__)/ \
 		s,),) || defined(__powerpc__),' ${WRKSRC}/hdf/src/hdfi.h
 	${INSTALL_MAN} ${WRKSRC}/man/gr_chunk.3 \
 		${STAGEDIR}${MAN3PREFIX}/man/man3
 
 .include <bsd.port.post.mk>
diff --git a/science/hdf5/Makefile b/science/hdf5/Makefile
index e3ce9b421ca6..84f1c5ce59a6 100644
--- a/science/hdf5/Makefile
+++ b/science/hdf5/Makefile
@@ -1,77 +1,77 @@
 PORTNAME=	hdf5
 PORTVERSION=	1.12.2
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	science archivers graphics
 MASTER_SITES=	https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-${PORTVERSION:R}/hdf5-${PORTVERSION}/src/
 DISTNAME=	CMake-hdf5-${PORTVERSION}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Hierarchical Data Format library (from NCSA) (latest)
 WWW=		https://www.hdfgroup.org/
 
 LICENSE=	BSD4CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		cmake compiler:c11 localbase perl5
 USE_PERL5=	build
 
 CFLAGS+=	-D__LONG_LONG_SUPPORTED
 CMAKE_ARGS=	-DDEFAULT_API_VERSION=v112 \
 		-DHDF5_INSTALL_CMAKE_DIR=lib/cmake/hdf5 \
 		-DHDF5_INSTALL_INCLUDE_DIR=${PREFIX}/include
 CMAKE_ON=	HDF5_BUILD_HL_LIB HDF5_BUILD_TOOLS HDF5_ENABLE_INSTRUMENT HDF5_ENABLE_Z_LIB_SUPPORT HDF5_STRICT_FORMAT_CHECKS
 TEST_TARGET=	test
 USE_LDCONFIG=	yes
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 WRKSRC_SUBDIR=	hdf5-${PORTVERSION}
 
 CONFLICTS_INSTALL=	hdf
 
 CPE_VENDOR=	hdfgroup
 
 OPTIONS_DEFINE=	DEBUG EXAMPLES FORTRAN SZIP
 OPTIONS_RADIO=	SUPPORT
 OPTIONS_RADIO_SUPPORT=	CXX PARALLEL
 OPTIONS_DEFAULT=CXX FORTRAN SZIP
 OPTIONS_SUB=	yes
 PARALLEL_DESC=	Parallel support
 PARALLEL_IMPLIES=	FORTRAN
 
 CXX_CMAKE_BOOL=		HDF5_BUILD_CPP_LIB
 EXAMPLES_CMAKE_BOOL=	HDF5_BUILD_EXAMPLES HDF5_TEST_EXAMPLES HDF5_PACK_EXAMPLES
 FORTRAN_CMAKE_BOOL=	HDF5_BUILD_FORTRAN
 FORTRAN_CONFIGURE_ENV=	F9X=${FC}
 FORTRAN_USES=		fortran
 PARALLEL_CMAKE_BOOL=	HDF5_ENABLE_PARALLEL
 PARALLEL_USES=		localbase:ldflags mpi:mpich
 PARALLEL_VARS=		FCFLAGS+=-I${LOCALBASE}/include
 SZIP_CMAKE_BOOL=	HDF5_ENABLE_SZIP_SUPPORT
 SZIP_LIB_DEPENDS=	libsz.so:science/libaec
 
 post-patch-EXAMPLES-on:
 	@${MKDIR} ${WRKDIR}/.build
 	@${TAR} -C ${WRKDIR}/.build -xf ${WRKSRC}/../HDF5Examples-1.12.9-Source.tar.gz
 
 post-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	${RM} ${STAGEDIR}${PREFIX}/share/COPYING
 	${RM} ${STAGEDIR}${DATADIR}/COPYING
 	cd ${STAGEDIR}${PREFIX}/share && ${MV} RELEASE.txt USING_HDF5_CMake.txt ${STAGEDIR}${DATADIR}/
 	${LN} -fs hdf5.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig/hdf5-${PORTVERSION}.pc
 	${LN} -fs hdf5_hl.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig/hdf5_hl-${PORTVERSION}.pc
 
 post-install-CXX-on:
 	${LN} -fs hdf5_cpp.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig/hdf5_cpp-${PORTVERSION}.pc
 	${LN} -fs hdf5_hl_cpp.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig/hdf5_hl_cpp-${PORTVERSION}.pc
 
 post-install-EXAMPLES-on:
 	cd ${STAGEDIR}${PREFIX}/share && ${MV} CTestScript.cmake HDF5_Examples.cmake HDF5_Examples_options.cmake USING_CMake_Examples.txt ${STAGEDIR}${DATADIR}/
 	${MV} ${STAGEDIR}${PREFIX}/share/HDF5Examples ${STAGEDIR}${EXAMPLESDIR}
 
 post-install-FORTRAN-on:
 	${LN} -fs hdf5_fortran.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig/hdf5_fortran-${PORTVERSION}.pc
 	${LN} -fs hdf5_hl_fortran.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig/hdf5_hl_fortran-${PORTVERSION}.pc
 
 .include <bsd.port.mk>
diff --git a/science/helfem/Makefile b/science/helfem/Makefile
index c4192f849664..1db307c0ff0a 100644
--- a/science/helfem/Makefile
+++ b/science/helfem/Makefile
@@ -1,31 +1,31 @@
 PORTNAME=	helfem
 DISTVERSION=	g20210912
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	science # chemistry
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
 PATCHFILES=	4c0196c3ef3f254a22030eda787105c8a48df919.patch:-p1 # https://github.com/susilehtola/HelFEM/pull/7
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Finite element methods for electronic structure calculations
 WWW=		https://github.com/susilehtola/HelFEM
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libarmadillo.so:math/armadillo \
 		libgsl.so:math/gsl \
 		libhdf5_cpp.so:science/hdf5 \
 		libsz.so:science/libaec \
 		libxc.so:science/libxc
 
 USES=		cmake fortran
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	susilehtola
 GH_PROJECT=	HelFEM
 GH_TAGNAME=	21461e9
 
 CMAKE_ON=	HELFEM_FIND_DEPS BUILD_SHARED_LIBS
 
 .include <bsd.port.mk>
diff --git a/science/highfive/Makefile b/science/highfive/Makefile
index a04960abe045..a989de6219a4 100644
--- a/science/highfive/Makefile
+++ b/science/highfive/Makefile
@@ -1,34 +1,35 @@
 PORTNAME=	highfive
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.7.1
+PORTREVISION=	1
 CATEGORIES=	science devel
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Header-only C++ HDF5 interface
 WWW=		https://github.com/BlueBrain/HighFive
 
 LICENSE=	BSL
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libhdf5.so:science/hdf5
 RUN_DEPENDS=	${LOCALBASE}/include/boost/multi_array.hpp:devel/boost-libs \
 		${LOCALBASE}/include/xtensor/xtensor.hpp:math/xtensor
 TEST_DEPENDS=	catch2>0:devel/catch2
 
 USES=		cmake eigen:3,run
 USE_GITHUB=	yes
 GH_ACCOUNT=	BlueBrain
 GH_PROJECT=	HighFive
 
 CMAKE_OFF=	HIGHFIVE_USE_BOOST HIGHFIVE_UNIT_TESTS HIGHFIVE_EXAMPLES
 
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 do-test: # one test fails, see https://github.com/BlueBrain/HighFive/issues/634
 	@cd ${BUILD_WRKSRC} && \
 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DHIGHFIVE_UNIT_TESTS:BOOL=ON -DHIGHFIVE_USE_BOOST=ON -DHIGHFIVE_USE_EIGEN:BOOL=ON -DHIGHFIVE_USE_XTENSOR=ON ${CMAKE_SOURCE_PATH} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
 
 .include <bsd.port.mk>
diff --git a/science/hypre/Makefile b/science/hypre/Makefile
index 637b95f3351d..c4ba292c7484 100644
--- a/science/hypre/Makefile
+++ b/science/hypre/Makefile
@@ -1,47 +1,48 @@
 PORTNAME=	hypre
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.28.0
+PORTREVISION=	1
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Scalable Linear Solvers and Multigrid Methods
 WWW=		https://computing.llnl.gov/projects/hypre-scalable-linear-solvers-multigrid-methods
 
 LICENSE=	APACHE20 MIT
 LICENSE_COMB=	dual
 LICENSE_FILE_APACHE20=	${WRKSRC}/../LICENSE-APACHE
 LICENSE_FILE_MIT=	${WRKSRC}/../LICENSE-MIT
 
 USES=		blaslapack cmake:testing fortran localbase
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	hypre-space
 
 WRKSRC_SUBDIR=	src
 
 CMAKE_ON=	HYPRE_ENABLE_SHARED HYPRE_WITH_OPENMP
 CMAKE_TESTING_ON=	HYPRE_BUILD_TESTS # tests are only built and not run, see https://github.com/hypre-space/hypre/issues/502
 
 OPTIONS_DEFINE=		DOCS
 OPTIONS_SINGLE=		MPI
 OPTIONS_SINGLE_MPI=	NOMPI MPICH OPENMPI
 OPTIONS_DEFAULT=	MPICH
 
 NOMPI_DESC=		Build without parallel processing support
 NOMPI_CMAKE_ON=		-DHYPRE_WITH_MPI=OFF
 
 MPICH_USES=		mpi:mpich
 MPICH_CMAKE_ON=		-DHYPRE_WITH_MPI=ON
 
 OPENMPI_USES=		mpi:openmpi
 OPENMPI_CMAKE_ON=	-DHYPRE_WITH_MPI=ON
 OPENMPI_BROKEN=		doesn't switch to openmpi in cmake build, see https://github.com/hypre-space/hypre/issues/720
 
 PORTDOCS=	*
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/docs && ${COPYTREE_SHARE} usr-manual ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/science/iboview/Makefile b/science/iboview/Makefile
index 766a460f6ebd..bc963113ca84 100644
--- a/science/iboview/Makefile
+++ b/science/iboview/Makefile
@@ -1,29 +1,29 @@
 PORTNAME=	iboview
 PORTVERSION=	20150427
-PORTREVISION=	24
+PORTREVISION=	25
 CATEGORIES=	science
 MASTER_SITES=	http://www.iboview.org/bin/
 DISTNAME=	ibo-view.20150427
 
 MAINTAINER=	jmd@FreeBSD.org
 COMMENT=	Program for analyzing molecular electronic structure
 WWW=		http://www.iboview.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	boost-libs>=0:devel/boost-libs
 RUN_DEPENDS=	boost-libs>=0:devel/boost-libs
 
 ONLY_FOR_ARCHS=	amd64
 
 USES=		blaslapack:openblas fortran gl qmake:outsource qt:5 tar:bz2
 USE_GL=		gl glu
 USE_QT=		buildtools:build core gui widgets opengl script svg
 
 PLIST_FILES=	bin/iboview
 
 do-install:
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/iboview ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/science/isaac-cfd/Makefile b/science/isaac-cfd/Makefile
index ac1751e5f195..812edb9cef7d 100644
--- a/science/isaac-cfd/Makefile
+++ b/science/isaac-cfd/Makefile
@@ -1,56 +1,56 @@
 PORTNAME=	isaac
 PORTVERSION=	4.2
-PORTREVISION=	16
+PORTREVISION=	17
 CATEGORIES=	science
 MASTER_SITES=	SF/${PORTNAME}-cfd/${PORTNAME}-cfd/ISAAC%20Version%20${PORTVERSION}
 DISTFILES=	${PORTNAME}src.4_2${EXTRACT_SUFX} ${PORTNAME}mk.4_2${EXTRACT_SUFX}
 DIST_SUBDIR=	isaac-cfd
 EXTRACT_ONLY=	${PORTNAME}src.4_2${EXTRACT_SUFX} ${PORTNAME}mk.4_2${EXTRACT_SUFX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Integrated Solution Algorithm for Arbitrary Configuration
 WWW=		http://isaac-cfd.sourceforge.net/
 
 LICENSE=	ISAAC
 LICENSE_NAME=	ISAAC_LICENSE
 LICENSE_FILE=	${WRKSRC}/license.txt
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 NO_WRKSUBDIR=	yes
 MAKEFILE=	makefile
 MAKE_ARGS=	CPPFLAGS=-I.
 USES=		fortran gmake
 FFLAGS+=	-std=legacy
 
 PLIST_FILES=	bin/isaac
 PORTDOCS=	man.4_2.ps.gz
 PORTEXAMPLES=	*
 
 OPTIONS_DEFINE=	DOCS EXAMPLES OPTIMIZED_FFLAGS
 
 DOCS_DISTFILES=	man.4_2.ps.gz
 EXAMPLES_DISTFILES=	example_cases${EXTRACT_SUFX}
 
 OPTIMIZED_FFLAGS_DESC=	Use extra compiler (fortran) optimizations
 OPTIMIZED_FFLAGS_VARS=	FFLAGS+="-O2 -ffast-math"
 
 pre-configure:
 	@${REINPLACE_CMD} -e 's+%%FC%%+${FC}+g ; s+%%FFLAGS%%+${FFLAGS}+;' \
 		${WRKSRC}/makefile
 	@${FIND} ${WRKSRC} -name "*.mk" -exec	\
 		${REINPLACE_CMD} -e 's|SRC= $$(HOME)/ISAAC/src|SRC= ${WRKSRC}|; \
 			s|$$(FFLAGS)|${FFLAGS} -I.|' {} \;
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/isaac ${STAGEDIR}${PREFIX}/bin/isaac
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${CP} ${DISTDIR}/${DIST_SUBDIR}/${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 do-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${TAR} -xzf ${DISTDIR}/${DIST_SUBDIR}/example_cases${EXTRACT_SUFX} \
 		-C ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/science/jdftx/Makefile b/science/jdftx/Makefile
index 48f98099e1a9..8fabad00ac29 100644
--- a/science/jdftx/Makefile
+++ b/science/jdftx/Makefile
@@ -1,58 +1,58 @@
 PORTNAME=	jdftx
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.7.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Software for joint density functional theory in chemistry
 WWW=		https://jdftx.org/
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	bash:shells/bash
 LIB_DEPENDS=	libblas.so:math/blas \
 		libcblas.so:math/cblas \
 		libfftw3.so:math/fftw3 \
 		libgsl.so:math/gsl \
 		liblapack.so:math/lapack
 RUN_DEPENDS=	bash:shells/bash
 TEST_DEPENDS=	bash:shells/bash
 
 USES=		compiler:c++11-lang cmake fortran localbase:ldflags shebangfix
 SHEBANG_GLOB=	*.sh
 SHEBANG_FILES=	scripts/*
 SHEBANG_LANG=	octave
 USE_GITHUB=	yes
 GH_ACCOUNT=	shankar1729
 USE_LDCONFIG=	yes
 
 TEST_TARGET=	test
 
 WRKSRC_SUBDIR=	${PORTNAME}
 
 CMAKE_ARGS=	-DLAPACK_LIBRARIES:STRING="-llapack -lblas"
 
 OPTIONS_DEFINE=		MPI LIBXC HDF5 SCALAPACK OCTAVE
 OPTIONS_DEFAULT=	MPI LIBXC
 
 MPI_CMAKE_BOOL=		EnableMPI
 MPI_LIB_DEPENDS=	libmpich.so:net/mpich
 
 LIBXC_DESC=		Use LibXC for additional exchange-correlation functionals
 LIBXC_CMAKE_BOOL=	EnableLibXC
 LIBXC_LIB_DEPENDS=	libxc.so:science/libxc
 
 HDF5_CMAKE_BOOL=	EnableHDF5
 HDF5_LIB_DEPENDS=	libhdf5.so:science/hdf5
 HDF5_BROKEN=		use of undeclared identifier 'H5Pset_dxpl_mpio' # https://github.com/shankar1729/jdftx/issues/37
 
 SCALAPACK_DESC=		Enable ScaLAPACK support
 SCALAPACK_CMAKE_BOOL=	EnableScaLAPACK
 SCALAPACK_LIB_DEPENDS=	libscalapack.so:math/scalapack
 
 OCTAVE_DESC=		With Octave support (only for one script: dryRunToPDB)
 OCTAVE_RUN_DEPENDS=	octave:math/octave
 
 .include <bsd.port.mk>
diff --git a/science/kalzium/Makefile b/science/kalzium/Makefile
index 3b6ee7652626..06b711900f7e 100644
--- a/science/kalzium/Makefile
+++ b/science/kalzium/Makefile
@@ -1,38 +1,39 @@
 PORTNAME=	kalzium
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	science education kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Periodic table of elements for KDE
 WWW=		https://www.kde.org/applications/education/kalzium
 
 LICENSE=	GPLv2 LGPL20 GFDL
 LICENSE_COMB=	multi
 
 LIB_DEPENDS=	libopenbabel.so:science/openbabel \
 		libAvogadroCore.so:science/avogadrolibs
 BUILD_DEPENDS=	${LOCALBASE}/lib/ocaml/facile/facile.a:math/facile \
 		${LOCALBASE}/libdata/pkgconfig/chemical-mime-data.pc:science/chemical-mime-data
 RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/chemical-mime-data.pc:science/chemical-mime-data
 
 USES=		cmake compiler:c++11-lang desktop-file-utils gettext gl kde:5 \
 		pkgconfig qt:5 tar:xz xorg
 USE_GL=		gl glew glu
 USE_KDE=	auth archive attica bookmarks codecs completion config configwidgets \
 		coreaddons crash doctools emoticons guiaddons i18n \
 		iconthemes itemmodels itemviews jobwidgets js kdelibs4support \
 		khtml kio newstuff notifications parts plotting service solid \
 		sonnet textwidgets unitconversion widgetsaddons windowsystem \
 		xmlgui \
 		ecm:build
 USE_OCAML=	yes
 NO_OCAML_RUNDEPENDS=	yes
 USE_QT=		concurrent core dbus declarative gui network opengl printsupport script svg \
 		widgets xml \
 		buildtools:build qmake:build
 USE_XORG=	x11
 USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.mk>
diff --git a/science/kim-api/Makefile b/science/kim-api/Makefile
index 6b67c89ade96..bcfc3fe9f454 100644
--- a/science/kim-api/Makefile
+++ b/science/kim-api/Makefile
@@ -1,22 +1,23 @@
 PORTNAME=	kim-api
 DISTVERSION=	2.3.0
+PORTREVISION=	1
 CATEGORIES=	science
 MASTER_SITES=	https://s3.openkim.org/kim-api/
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Framework for reliable, reproducible, portable molecular simulations
 WWW=		https://openkim.org/
 
 LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/LICENSE.LGPL
 
 BUILD_DEPENDS=	xxd:editors/vim
 
 USES=		cmake:noninja fortran tar:txz
 USE_LDCONFIG=	yes
 
 post-install:
 	${REINPLACE_CMD} -i '' -e 's|#!/bin/bash|#!/bin/sh|' ${STAGEDIR}${PREFIX}/bin/kim-api-collections-management
 	${RM} -r ${STAGEDIR}${PREFIX}/share/doc
 
 .include <bsd.port.mk>
diff --git a/science/kst2/Makefile b/science/kst2/Makefile
index 907755cdba19..7b771d90b776 100644
--- a/science/kst2/Makefile
+++ b/science/kst2/Makefile
@@ -1,60 +1,60 @@
 PORTNAME=	kst
 DISTVERSION=	${KST_VERSION}.${KST_DATE}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	science
 
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Data viewing and plotting tool
 WWW=		https://kst-plot.kde.org
 
 LICENSE=	GPLv2 GFDL LGPL20
 LICENSE_COMB=	multi
 LICENSE_FILE_GPLv2=	${WRKSRC}/COPYING
 LICENSE_FILE_GFDL=	${WRKSRC}/COPYING-DOCS
 LICENSE_FILE_LGPL20=	${WRKSRC}/COPYING.LGPL
 
 LIB_DEPENDS=	libgsl.so:math/gsl \
 		libtiff.so:graphics/tiff
 
 USES=		cmake compiler:c++11-lang desktop-file-utils kde:5 pkgconfig \
 		qt:5 shared-mime-info
 USE_QT=		concurrent core gui network printsupport svg widgets xml \
 		buildtools:build linguisttools:build qmake:build
 USE_LDCONFIG=	yes
 
 KST_VERSION=	2.0.8
 KST_DATE=	20220216
 KST_COMMIT=	40cdf2d3
 KDE_INVENT=	40cdf2d397e4277ee7226188ef89ae3e0f12d884 graphics kst-plot
 
 CMAKE_ARGS=	-Dkst_install_prefix=${PREFIX} \
 		-Dkst_pch=off \
 		-Dkst_version_string=${KST_VERSION} \
 		-Dkst_revision="${KST_COMMIT} ${KST_DATE}" \
 		-DCMAKE_DISABLE_FIND_PACKAGE_Getdata=ON \
 		-Dkst_qt5=on
 
 PLIST_SUB=	SHLIB_VER=${KST_VERSION}
 
 OPTIONS_DEFINE=	FITS HDF5 MATLAB NETCDF
 OPTIONS_DEFAULT=	FITS HDF5 MATLAB
 OPTIONS_SUB=	yes
 
 FITS_DESC=	Support for data in FITS format
 FITS_LIB_DEPENDS=	libcfitsio.so:astro/cfitsio
 FITS_CMAKE_OFF=	-DCMAKE_DISABLE_FIND_PACKAGE_CFITSIO=ON
 
 HDF5_DESC=	Support for data in HDF5 format
 HDF5_LIB_DEPENDS=	libhdf5.so:science/hdf5
 HDF5_CMAKE_OFF=	-DCMAKE_DISABLE_FIND_PACKAGE_HDF5=ON
 
 MATLAB_DESC=	Support for data in MATLAB format
 MATLAB_LIB_DEPENDS=	libmatio.so:math/matio
 MATLAB_CMAKE_OFF=	-DCMAKE_DISABLE_FIND_PACKAGE_Matio=ON
 
 NETCDF_DESC=	Support for data in NetCDF format (broken)
 NETCDF_LIB_DEPENDS=	libnetcdf.so:science/netcdf
 NETCDF_IGNORE=	does not support NetCDF 4
 NETCDF_CMAKE_OFF=	-DCMAKE_DISABLE_FIND_PACKAGE_Netcdf=ON
 
 .include <bsd.port.mk>
diff --git a/science/lammps/Makefile b/science/lammps/Makefile
index 44cc90b0d31b..0ef821d697e4 100644
--- a/science/lammps/Makefile
+++ b/science/lammps/Makefile
@@ -1,157 +1,157 @@
 PORTNAME=	lammps
 PORTVERSION=	${GH_TAGNAME:C/(stable|patch)_([0-9]{1,2})([A-Z][a-z][a-z])([0-9]{4})/\4.\3.\2/S/Jan/01/S/Feb/02/S/Mar/03/S/Apr/04/S/May/05/S/Jun/06/S/Jul/07/S/Aug/08/S/Sep/09/S/Oct/10/S/Nov/11/S/Dec/12/S/_update/./}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Classical molecular dynamics code with a focus on materials modeling
 WWW=		https://lammps.sandia.gov/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_i386=	undefined reference to `__atomic_load'
 
 LIB_DEPENDS=	libevent.so:devel/libevent \
 		libfftw3.so:math/fftw3 \
 		libhwloc.so:devel/hwloc2 \
 		libnghttp2.so:www/libnghttp2 \
 		libpciaccess.so:devel/libpciaccess \
 		libssh2.so:security/libssh2 \
 		libzstd.so:archivers/zstd
 
 USES=		blaslapack:openblas cmake:noninja compiler:c++14-lang eigen:3 fortran gnome localbase:ldflags python shebangfix
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
 USE_PYTHON=	cython
 
 USE_GITHUB=	yes
 GH_TAGNAME=	stable_23Jun2022_update1
 
 SHEBANG_GLOB=	*.sh *.bash
 SHEBANG_FILES=	lib/kokkos/bin/nvcc_wrapper
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 CMAKE_SOURCE_PATH=	${WRKSRC}/cmake
 CMAKE_ARGS=	-DBLA_VENDOR:STRING="OpenBLAS" ${CMAKE_ARGS_${CHOSEN_COMPILER_TYPE}} \
 		-DPython_EXECUTABLE=${PYTHON_CMD}
 CMAKE_ARGS_gcc=	-DBUILD_OMP:BOOL=false
 
 # enable packages (for a complete list see STANDARD_PACKAGES in cmake/CMakeLists.txt)
 CMAKE_ON+=	PKG_ASPHERE PKG_ATC PKG_AWPMD PKG_BOCS PKG_BODY PKG_BROWNIAN PKG_CG-DNA PKG_CG-SDK PKG_CLASS2
 CMAKE_ON+=	PKG_COLLOID PKG_COLVARS PKG_COMPRESS PKG_DIELECTRIC PKG_DIFFRACTION PKG_DIPOLE PKG_DPD-BASIC PKG_DPD-MESO PKG_DPD-REACT PKG_DPD-SMOOTH
 CMAKE_ON+=	PKG_DRUDE PKG_EFF PKG_EXTRA-COMPUTE PKG_EXTRA-DUMP PKG_EXTRA-FIX PKG_EXTRA-MOLECULE PKG_EXTRA-PAIR PKG_FEP PKG_GRANULAR PKG_H5MD
 CMAKE_ON+=	PKG_INTERLAYER PKG_KIM PKG_KSPACE PKG_LATBOLTZ PKG_LATTE PKG_MACHDYN PKG_MANIFOLD PKG_MANYBODY PKG_MC
 CMAKE_ON+=	PKG_MEAM PKG_MESSAGE PKG_MGPT PKG_MISC PKG_ML-IAP PKG_ML-RANN
 CMAKE_ON+=	PKG_ML-SNAP PKG_MOFFF PKG_MOLECULE PKG_MOLFILE PKG_MPIIO PKG_ORIENT PKG_PERI PKG_PHONON
 CMAKE_ON+=	PKG_PLUGIN PKG_PLUMED PKG_POEMS PKG_PTM PKG_PYTHON PKG_QEQ PKG_QMMM PKG_QTB PKG_REACTION PKG_REAXFF
 CMAKE_ON+=	PKG_REPLICA PKG_RIGID PKG_SHOCK PKG_SMTBQ PKG_SPH PKG_SPIN PKG_SRD PKG_TALLY PKG_UEF
 CMAKE_ON+=	PKG_VORONOI PKG_YAFF
 # Packages requiring extra downloades or dependencies: PKG_MSCG PKG_ADIOS PKG_MDI PKG_MESONT PKG_ML-PACE PKG_NETCDF PKG_ML-QUIP PKG_SCAFACOS PKG_VTK
 # PKG_ML-HDNNP downloads https://github.com/CompPhysVienna/n2p2/archive/v2.1.4.tar.gz
 
 OPTIONS_DEFINE=		EXCEPTIONS JPEG PNG GZIP FFMPEG
 OPTIONS_GROUP=		PARALLEL PACKAGES
 OPTIONS_DEFAULT=	EXCEPTIONS MPI OPENMP JPEG PNG GZIP FFMPEG H5MD KIM KOKKOS LATTE NETCDF PLUMED VORONOI ${OPTIONS_DEFAULT_${CHOSEN_COMPILER_TYPE}}
 OPTIONS_SUB=		yes
 PARALLEL_DESC=		Enable parallelizations:
 PACKAGES_DESC=		Enable packages:
 OPTIONS_GROUP_PARALLEL=	MPI OPENMP ${OPTIONS_DEFINE_${CHOSEN_COMPILER_TYPE}}
 OPTIONS_GROUP_PACKAGES=	H5MD KIM KOKKOS LATTE NETCDF PLUMED VORONOI VTK
 
 EXCEPTIONS_DESC=	Enable the use of C++ exceptions
 EXCEPTIONS_CMAKE_BOOL=	LAMMPS_EXCEPTIONS
 
 MPI_CMAKE_BOOL=		BUILD_MPI PKG_MPIIO
 MPI_LIB_DEPENDS=	libmpi.so:net/openmpi
 MPI_USES=		compiler:c11
 
 FFMPEG_CMAKE_BOOL=	WITH_FFMPEG
 FFMPEG_BUILD_DEPENDS=	ffmpeg:multimedia/ffmpeg
 FFMPEG_RUN_DEPENDS=	ffmpeg:multimedia/ffmpeg
 
 JPEG_CMAKE_BOOL=	WITH_JPEG
 JPEG_USES=		jpeg
 
 PNG_CMAKE_BOOL=		WITH_PNG
 PNG_LIB_DEPENDS=	libpng.so:graphics/png
 
 GZIP_DESC=		Enable GZIP support
 GZIP_CMAKE_BOOL=	WITH_GZIP
 
 H5MD_DESC=		H5MD package based on the libhdf5 library
 H5MD_CMAKE_BOOL=	PKG_H5MD
 H5MD_LIB_DEPENDS=	libhdf5.so:science/hdf5 \
 			libsz.so:science/libaec
 
 KIM_DESC=		KIM package based on the OpenKim library/repository
 KIM_USES=		pkgconfig
 KIM_CMAKE_BOOL=		PKG_KIM
 KIM_CMAKE_ON=		-DDOWNLOAD_KIM:BOOL=OFF
 KIM_LIB_DEPENDS=	libkim-api.so:science/kim-api \
 			libcurl.so:ftp/curl
 KIM_RUN_DEPENDS=	openkim-models>0:science/openkim-models
 
 KOKKOS_DESC=		Kokkos package based on the libkokkos library
 KOKKOS_CMAKE_BOOL=	PKG_KOKKOS EXTERNAL_KOKKOS
 KOKKOS_LIB_DEPENDS=	libkokkoscore.so:devel/kokkos
 
 LATTE_DESC=		Latte package based on the liblatte library
 LATTE_CMAKE_BOOL=	PKG_LATTE
 LATTE_LIB_DEPENDS=	liblatte.so:science/latte
 
 NETCDF_DESC=		NetCDF package based on the NetCDF library
 NETCDF_CMAKE_BOOL=	PKG_NETCDF
 NETCDF_LIB_DEPENDS=	libnetcdf.so:science/netcdf
 
 PLUMED_DESC=		Plumed package based on the plumed library
 PLUMED_USES=		pkgconfig
 PLUMED_CMAKE_BOOL=	PKG_PLUMED
 PLUMED_CMAKE_ON=	-DPLUMED_MODE=shared
 PLUMED_LIB_DEPENDS=	libplumed.so:science/plumed
 
 VORONOI_DESC=		Voro++, Voronoi tessellation package
 VORONOI_CMAKE_BOOL=	PKG_VORONOI
 VORONOI_LIB_DEPENDS=	libvoro++.so:science/voro++
 
 VTK_DESC=		VTK package based on the external VTK-${VTK_VER:R} library
 VTK_CMAKE_BOOL=		PKG_VTK
 VTK_CMAKE_ON=		-DVTK_DIR:PATH=${LOCALBASE}/lib/cmake/vtk-${VTK_VER}
 VTK_USES=		gl qt:5 xorg
 VTK_USE=		GL=opengl qt=core,declarative,gui,network,opengl,sql,widgets xorg=ice,sm,x11,xext,xt
 VTK_LIB_DEPENDS=	libvtkCommonCore-${VTK_VER}.so:math/vtk${VTK_VER:R} \
 			libexpat.so:textproc/expat2 \
 			libfreetype.so:print/freetype2 \
 			libtiff.so:graphics/tiff
 
 PORTSCOUT=	ignore:1 # due to a special version tagging scheme that this project uses portscout fails to find new versions, watching their GitHub release page instead
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MOPENMP}
 CMAKE_ARGS+=	-DBUILD_OMP:BOOL=true
 .endif
 
 xpost-patch:
 	# adjust SHELL in Makefile
 	@${REINPLACE_CMD} 's|SHELL = /bin/bash|SHELL = ${LOCALBASE}/bin/bash|' ${WRKSRC}/src/Makefile
 	# fix python version, also see https://github.com/lammps/lammps/issues/3098, https://github.com/lammps/lammps/issues/3099
 	@${FIND} ${WRKSRC} -name "CMakeLists.txt" -o -name "*.cmake" | ${XARGS} ${REINPLACE_CMD} -e ' \
 		s|find_package(Python3 REQUIRED |find_package(Python $${FREEBSD_PYTHON_VER} EXACT REQUIRED |; \
 		s|find_package(Python 3.5 COMPONENTS |find_package(Python $${FREEBSD_PYTHON_VER} EXACT COMPONENTS |; \
 		s|find_package(Python 3.6 COMPONENTS |find_package(Python $${FREEBSD_PYTHON_VER} EXACT COMPONENTS |; \
 		s|find_package(Python3 REQUIRED |find_package(Python $${FREEBSD_PYTHON_VER} EXACT REQUIRED |; \
 		s|find_package(Python COMPONENTS |find_package(Python3 $${FREEBSD_PYTHON_VER} EXACT COMPONENTS |; \
 		s|find_package(Python3 COMPONENTS |find_package(Python3 $${FREEBSD_PYTHON_VER} EXACT COMPONENTS |; \
 		s|find_package(Python QUIET COMPONENTS |find_package(Python3 $${FREEBSD_PYTHON_VER} EXACT QUIET COMPONENTS |; \
 		s|find_package(Python REQUIRED COMPONENTS |find_package(Python3 $${FREEBSD_PYTHON_VER} EXACT REQUIRED COMPONENTS | \
 		'
 
 post-patch-FFMPEG-off:
 	@${REINPLACE_CMD} 's|find_program(FFMPEG_EXECUTABLE|#&|' ${WRKSRC}/cmake/CMakeLists.txt
 
 post-install:
 	@${RM} -r ${STAGEDIR}${PREFIX}/lib/python*
 
 .include <../../math/vtk9/Makefile.version>
 .include <bsd.port.mk>
diff --git a/science/latte/Makefile b/science/latte/Makefile
index 8745adb234a9..739ee649739d 100644
--- a/science/latte/Makefile
+++ b/science/latte/Makefile
@@ -1,51 +1,51 @@
 PORTNAME=	latte
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.2.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Quantum chemistry: Density functional tight binding molecular dynamics
 WWW=		https://github.com/lanl/LATTE
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE_GPL-2.0
 
 USES=		blaslapack:openblas cmake:noninja fortran shebangfix
 SHEBANG_FILES=	tests/run_test.sh
 USE_GITHUB=	yes
 GH_ACCOUNT=	lanl
 GH_PROJECT=	${PORTNAME:tu}
 USE_LDCONFIG=	yes
 
 CMAKE_SOURCE_PATH=	${WRKSRC}/cmake
 CMAKE_ON=	BUILD_SHARED_LIBS
 CMAKE_ARGS=	-DBLA_VENDOR:STRING="OpenBLAS"
 
 OPTIONS_DEFINE=		DBCSR OPENMP MPI # TODO PROGRESS needs to be ported
 OPTIONS_DEFAULT=	OPENMP MPI
 
 DBCSR_DESC=		Use distributed block compressed sparse row matrix library
 DBCSR_CMAKE_BOOL=	DBCSR_OPT
 DBCSR_LIB_DEPENDS=	libdbcsr.so:math/dbcsr
 DBCSR_BROKEN=		see https://github.com/lanl/LATTE/issues/92
 
 OPENMP_CMAKE_BOOL=	OPENMP
 
 MPI_CMAKE_BOOL=		DO_MPI
 MPI_LIB_DEPENDS=	libmpi.so:net/openmpi
 MPI_LDFLAGS=		${LOCALBASE}/mpi/openmpi/lib/libmpi_mpifh.so
 MPI_PLIST_FILES=	bin/LATTE_MPI_DOUBLE
 MPI_PLIST_FILES_OFF=	bin/LATTE_DOUBLE
 
 CONFLICTS_INSTALL=	latte-integrale
 
 .include <bsd.port.pre.mk>
 
 .if ${GCC_DEFAULT} >= 10
 # workaround for Type mismatch between actual argument at (1) and actual argument at (2) (COMPLEX(8)/REAL(8)).
 # in theory, this should set FCFLAGS, but the port does not conform
 FFLAGS+=	-fallow-argument-mismatch
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/science/libccp4/Makefile b/science/libccp4/Makefile
index f0ca3f82e095..6173f170f825 100644
--- a/science/libccp4/Makefile
+++ b/science/libccp4/Makefile
@@ -1,33 +1,33 @@
 PORTNAME=	libccp4
 DISTVERSION=	6.5.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	science education
 MASTER_SITES=	ftp://ftp.ccp4.ac.uk/opensource/
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Protein X-ray crystallography toolkit
 WWW=		https://www.ccp4.ac.uk/
 
 LICENSE=	GPLv3 LGPL3
 LICENSE_COMB=	dual
 LICENSE_FILE_GPLv3=	${WRKSRC}/COPYING
 LICENSE_FILE_LGPL3=	${WRKSRC}/COPYING.LESSER
 
 BROKEN_aarch64=		ccp4/ccp4_sysdep.h:244:4: error: "Can't determine machine number format"
 
 LIB_DEPENDS=	libmmdb2.so:science/mmdb2
 
 USES=		fortran gmake libtool localbase:ldflags
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared --disable-static
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 
 CFLAGS+=	-fPIC
 FFLAGS+=	-fPIC -std=legacy
 
 post-configure:
 	${REINPLACE_CMD} -e 's| -Wl,--as-needed||; s| -Wl,--no-as-needed||' ${WRKSRC}/Makefile
 	${REINPLACE_CMD} -e 's|^archive_cmds=|wl="-Wl,"; archive_cmds=|' ${WRKSRC}/libtool # wl is missing otherwise for some reason
 
 .include <bsd.port.mk>
diff --git a/science/libcint/Makefile b/science/libcint/Makefile
index a579f9425772..d211a50680cf 100644
--- a/science/libcint/Makefile
+++ b/science/libcint/Makefile
@@ -1,41 +1,42 @@
 PORTNAME=	libcint
 DISTVERSIONPREFIX=	v
 DISTVERSION=	5.3.0
+PORTREVISION=	1
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	General GTO integrals for quantum chemistry
 WWW=		https://github.com/sunqm/libcint
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libopenblas.so:math/openblas
 TEST_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}pyscf>0:science/py-pyscf@${PY_FLAVOR}
 
 USES=		cmake blaslapack:openblas python:test
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	sunqm
 
 PLIST_FILES=	include/cint.h \
 		include/cint_funcs.h \
 		lib/libcint.so \
 		lib/libcint.so.${PORTVERSION:R:R} \
 		lib/libcint.so.${PORTVERSION}
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|numpy\\.ctypeslib\\.load_library('libcint', .*$$|numpy.ctypeslib.load_library('libcint', '${BUILD_WRKSRC}')|" \
 		${WRKSRC}/testsuite/test_cint4c1e.py \
 		${WRKSRC}/testsuite/test_cint.py \
 		${WRKSRC}/testsuite/test_3c2e.py
 
 do-test: # needs science/py-pyscf, pending https://github.com/pyscf/pyscf/issues/935
 	@cd ${BUILD_WRKSRC} && \
 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DENABLE_TEST:BOOL=ON ${CMAKE_SOURCE_PATH} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
 
 .include <bsd.port.mk>
diff --git a/science/libctl/Makefile b/science/libctl/Makefile
index 284a38f254c3..cd8a7d386d2c 100644
--- a/science/libctl/Makefile
+++ b/science/libctl/Makefile
@@ -1,38 +1,39 @@
 PORTNAME=	libctl
 DISTVERSION=	4.5.0
+PORTREVISION=	1
 CATEGORIES=	science math
 MASTER_SITES=	https://github.com/NanoComp/libctl/releases/download/v${DISTVERSION}/
 
 MAINTAINER=	devel@stasyan.com
 COMMENT=	Control Language Library
 WWW=		https://libctl.readthedocs.io/en/latest/
 
 LICENSE=	GPLv2
 
 BROKEN_sparc64=	does not build
 
 LIB_DEPENDS=	libgc-threaded.so:devel/boehm-gc-threaded \
 		libguile-2.2.so:lang/guile2
 
 USES=		fortran libtool pkgconfig
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared
 USE_LDCONFIG=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib -lm
 
 OPTIONS_DEFINE=		NLOPT DOCS EXAMPLES
 OPTIONS_DEFAULT=	NLOPT
 NLOPT_DESC=		Use NLopt, an external NonLinear OPTimizer
 
 NLOPT_LIB_DEPENDS=	libnlopt.so:math/nlopt
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${CP} -R ${WRKSRC}/doc/ ${STAGEDIR}${DOCSDIR}
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${CP} -R ${WRKSRC}/examples/ ${STAGEDIR}${EXAMPLESDIR}
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libctl.so.7.3.0
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libctlgeom.so.7.3.0
 	@${STRIP_CMD} ${STAGEDIR}${EXAMPLESDIR}/.libs/example
 
 .include <bsd.port.mk>
diff --git a/science/libgeodecomp/Makefile b/science/libgeodecomp/Makefile
index 121084a4edfd..ae52ba927b87 100644
--- a/science/libgeodecomp/Makefile
+++ b/science/libgeodecomp/Makefile
@@ -1,41 +1,41 @@
 PORTNAME=		libgeodecomp
 PORTVERSION=		0.4.0
-PORTREVISION=		23
+PORTREVISION=		24
 CATEGORIES=		science devel
 MASTER_SITES=		http://www.libgeodecomp.org/archive/
 
 MAINTAINER=		kurt@kmk-computers.de
 COMMENT=		Auto-parallelizing library for computer simulations
 WWW=		http://www.libgeodecomp.org/
 
 LICENSE=		BSL
 LICENSE_FILE=		${WRKSRC}/LICENSE
 
 LIB_DEPENDS=		libboost_system.so:devel/boost-libs libboost_date_time.so:devel/boost-libs \
 			libboost_filesystem.so:devel/boost-libs
 
 BROKEN=			error: incomplete type 'LibFlatArray::detail::flat_array::offset<LibGeoDecomp::TestCell<3, LibGeoDecomp::Stencils::Moore<3, 1>, LibGeoDecomp::TopologiesHelpers::Topology<3, false, false, false>, LibGeoDecomp::TestCellHelpers::SoAAPI>, -1>' used in nested name specifier
 
 USES=			cmake compiler:c++11-lib
 USE_GCC=		yes
 USE_LDCONFIG=		yes
 
 CMAKE_ARGS=		-DWITH_CUDA:BOOL=FALSE -DWITH_VISIT:BOOL=FALSE \
 			-DWITH_HPX:BOOL=FALSE -DWITH_OPENCL:BOOL=FALSE \
 			-DWITH_OPENCV:BOOL=FALSE -DWITH_TYPEMAPS=FALSE
 
 OPTIONS_DEFINE=		MPI SILO SCOTCH
 OPTIONS_DEFAULT=	MPI SILO SCOTCH
 
 MPI_LIB_DEPENDS=	libmpich.so:net/mpich
 MPI_CMAKE_BOOL=		WITH_MPI
 
 SILO_DESC=		Enable Silo dependend output
 SILO_LIB_DEPENDS=	libsiloh5.so:science/silo
 SILO_CMAKE_BOOL=	WITH_SILO
 
 SCOTCH_DESC=		Enable graph partitioning based on Scotch/Scotch-PT
 SCOTCH_LIB_DEPENDS=	libscotch.so:cad/scotch
 SCOTCH_CMAKE_BOOL=	WITH_SCOTCH
 
 .include <bsd.port.mk>
diff --git a/science/libghemical/Makefile b/science/libghemical/Makefile
index f8e2886195b9..7b509d67a132 100644
--- a/science/libghemical/Makefile
+++ b/science/libghemical/Makefile
@@ -1,39 +1,39 @@
 PORTNAME=	libghemical
 PORTVERSION=	3.0.0
-PORTREVISION=	18
+PORTREVISION=	19
 CATEGORIES=	science
 MASTER_SITES=	http://bioinformatics.org/ghemical/download/release20111012/	\
 		http://bioinformatics.org/ghemical/download/current/
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Support libraries of science/ghemical port
 WWW=		https://www.bioinformatics.org/ghemical/ghemical/index.html
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	obabel:science/openbabel \
 		intltool-update:textproc/intltool \
 		ld:devel/binutils
 LIB_DEPENDS=	libblas.so:math/blas \
 		libint.so:science/libint \
 		libf2c.so:lang/f2c \
 		liblapack.so:math/lapack \
 		libmpqc.so:science/mpqc
 
 USES=		fortran gettext gl gmake libtool localbase pathfix pkgconfig
 USE_CXXSTD=	c++98
 USE_GL=		gl
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
 CONFIGURE_ARGS+=	--enable-mpqc
 LDFLAGS+=	-lSCbasis -lSCcints -lSCclass -lSCcontainer -lSCdft -lSCgroup \
 		-lSCintv3 -lSCisosurf -lSCkeyval -lSCmbpt -lSCmbptr12 -lSCmisc \
 		-lSCmolecule -lSCoint3 -lSCoptimize -lSCoptions -lSCpsi \
 		-lSCref -lSCrender -lSCscf -lSCscmat -lSCsolvent -lSCstate \
 		-lSCsymmetry -lSCwfn -lgfortran -lpthread -lblas -llapack
 PLIST_SUB=	LIBGHEMICAL_VERSION="${PORTVERSION}"
 INSTALL_TARGET=	install-strip
 
 .include <bsd.port.mk>
diff --git a/science/libgridxc/Makefile b/science/libgridxc/Makefile
index 778aa76f39f7..96cc4cec51c0 100644
--- a/science/libgridxc/Makefile
+++ b/science/libgridxc/Makefile
@@ -1,39 +1,40 @@
 PORTNAME=	libgridxc
 DISTVERSION=	1.1.0
+PORTREVISION=	1
 CATEGORIES=	science
 MASTER_SITES=	https://gitlab.com/siesta-project/libraries/${PORTNAME}/-/archive/${DISTVERSION}/
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Library to compute the exchange and correlation energy and potentials
 WWW=		https://gitlab.com/siesta-project/libraries/libgridxc
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		cmake fortran pkgconfig
 USE_LDCONFIG=	yes
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 
 OPTIONS_SINGLE=		MPI
 OPTIONS_SINGLE_MPI=	NOMPI MPICH OPENMPI
 OPTIONS_DEFINE=		LIBXC
 OPTIONS_DEFAULT=	LIBXC MPICH
 OPTIONS_SUB=		yes
 
 NOMPI_DESC=		Build without parallel processing support
 
 MPICH_USES=		mpi:mpich
 MPICH_CMAKE_ON=		-DWITH_MPI=ON
 MPICH_VARS=		FFLAGS+=-fallow-argument-mismatch
 
 OPENMPI_USES=		mpi:openmpi
 OPENMPI_CMAKE_ON=	-DWITH_MPI=ON
 OPENMPI_VARS=		FFLAGS+=-fallow-argument-mismatch
 
 LIBXC_DESC=		Use libxc for exchange-correlation functionals for DFT
 LIBXC_CMAKE_BOOL=	WITH_LIBXC
 LIBXC_VARS=		FCFLAGS+="-I${LOCALBASE}/include" LDFLAGS+="-L${LOCALBASE}/lib -lxcf90"
 LIBXC_LIB_DEPENDS=	libxc.so:science/libxc
 
 .include <bsd.port.mk>
diff --git a/science/libint2-psi4/Makefile b/science/libint2-psi4/Makefile
index ae4617206194..89bef520f0d3 100644
--- a/science/libint2-psi4/Makefile
+++ b/science/libint2-psi4/Makefile
@@ -1,35 +1,36 @@
 PORTNAME=	libint2-psi4
 DISTVERSION=	0.1
+PORTREVISION=	1
 CATEGORIES=	science
 MASTER_SITES=	https://github.com/loriab/libint/releases/download/v${DISTVERSION}/
 DISTFILES=	Libint2-export-5-4-3-6-5-4_mm4f12ob2.tgz
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Evaluate the integrals in modern atomic and molecular theory (psi4)
 WWW=		https://github.com/evaleev/libint
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 		libgmpxx.so:math/gmp
 
 USES=		cmake:testing eigen:3 python:build
 USE_LDCONFIG=	yes
 
 WRKSRC=		${WRKDIR}/libint-2.7.1
 
 CMAKE_ARGS=	-DLIBINT2_SHGAUSS_ORDERING=gaussian \
 		-DPython_EXECUTABLE=${PYTHON_CMD}
 CMAKE_ON=	BUILD_SHARED_LIBS \
 		REQUIRE_CXX_API
 CMAKE_OFF=	ENABLE_FORTRAN \
 		REQUIRE_CXX_API_COMPILED
 
 CONFLICTS=	libint2
 
 post-configure: # workaround for clang hanging on unity_1935_cxx.cxx, see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=265809
 	@cd ${BUILD_WRKSRC} && \
 		${SED} -e 's|%%BUILD_WRKSRC%%|${BUILD_WRKSRC}|g ; s|%%WRKDIR%%|${WRKDIR}|g' < ${FILESDIR}/build.patch | tee p | ${PATCH}
 
 .include <bsd.port.mk>
diff --git a/science/libmbd/Makefile b/science/libmbd/Makefile
index 7e35d120a0b4..d4900d7c8489 100644
--- a/science/libmbd/Makefile
+++ b/science/libmbd/Makefile
@@ -1,20 +1,21 @@
 PORTNAME=	libmbd
 DISTVERSION=	0.12.5
+PORTREVISION=	1
 CATEGORIES=	science # chemistry
 MASTER_SITES=	https://github.com/libmbd/libmbd/releases/download/${DISTVERSION}/
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Many-body dispersion library
 WWW=		https://github.com/libmbd/libmbd
 
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libopenblas.so:math/openblas
 
 USES=		cmake:testing fortran
 
 do-test: # fails to find tests, see https://github.com/libmbd/libmbd/issues/43
 	@cd ${BUILD_WRKSRC} && ctest --test-dir .
 
 .include <bsd.port.mk>
diff --git a/science/libnegf/Makefile b/science/libnegf/Makefile
index 3662d277b32f..b41dffc96e27 100644
--- a/science/libnegf/Makefile
+++ b/science/libnegf/Makefile
@@ -1,32 +1,33 @@
 PORTNAME=	libnegf
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.1.2
+PORTREVISION=	1
 CATEGORIES=	science # chemistry
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Non Equilibrium Green's Functions library
 WWW=		https://github.com/libnegf/libnegf
 
 LICENSE=	GPLv3
 
 LIB_DEPENDS=	libmpi.so:net/mpich \
 		libopenblas.so:math/openblas
 
 USES=		cmake:testing fortran python:build
 USE_GITHUB=	yes
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 
 BINARY_ALIAS=	python=${PYTHON_CMD} python3=${PYTHON_CMD}
 
 OPTIONS_DEFINE=		INELASTIC MPI
 OPTIONS_DEFAULT=	MPI # MPI default has to be in sync with science/dftbplus
 
 INELASTIC_DESC=		Build with inelastic scattering
 INELASTIC_CMAKE_BOOL=	WITH_INELASTIC
 INELASTIC_BROKEN=	Error: Can't open included file 'fftw3.f03', see https://github.com/libnegf/libnegf/issues/56
 
 MPI_CMAKE_BOOL=		WITH_MPI
 MPI_LIB_DEPENDS=	libmpifx.so:net/mpifx
 
 .include <bsd.port.mk>
diff --git a/science/libssm/Makefile b/science/libssm/Makefile
index 9ebb51ba1b1f..1454e1825594 100644
--- a/science/libssm/Makefile
+++ b/science/libssm/Makefile
@@ -1,24 +1,24 @@
 PORTNAME=	libssm
 DISTVERSION=	1.4.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	science
 MASTER_SITES=	ftp://ftp.ccp4.ac.uk/opensource/
 DISTNAME=	ssm-${DISTVERSION}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	C++ toolkit for superposition of macromolecules
 WWW=		https://launchpad.net/ssm
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libccp4c.so:science/libccp4 \
 		libmmdb2.so:science/mmdb2
 
 USES=		gmake libtool localbase:ldflags
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared --disable-static --enable-ccp4 --with-mmdb=${LOCALBASE}
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 
 .include <bsd.port.mk>
diff --git a/science/libxc/Makefile b/science/libxc/Makefile
index c24f1481fbab..97d3c876ff34 100644
--- a/science/libxc/Makefile
+++ b/science/libxc/Makefile
@@ -1,25 +1,26 @@
 PORTNAME=	libxc
 DISTVERSION=	6.0.0
+PORTREVISION=	1
 CATEGORIES=	science
 MASTER_SITES=	https://www.tddft.org/programs/${PORTNAME}/down/${DISTVERSION}/
 
 MAINTAINER=	jmd@FreeBSD.org
 COMMENT=	Library of exchange-correlation functionals for DFT
 WWW=		https://www.tddft.org/programs/libxc/
 
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		cmake:testing fortran python
 USE_LDCONFIG=	yes
 TEST_DEPENDS=	bash:shells/bash
 
 CMAKE_ON=	BUILD_SHARED_LIBS ENABLE_FORTRAN ENABLE_PYTHON
 CMAKE_OFF=	BUILD_TESTING
 
 pre-configure:
 	${REINPLACE_CMD} -e 's|$${CMAKE_INSTALL_LIBDIR}/pylibxc$$|${PYTHONPREFIX_SITELIBDIR}/pylibxc|'	\
 		-e 's|$${CMAKE_INSTALL_PREFIX}/$${CMAKE_INSTALL_LIBDIR}/pylibxc/|${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/pylibxc/|'\
 		${WRKSRC}/CMakeLists.txt
 
 .include <bsd.port.mk>
diff --git a/science/liggghts/Makefile b/science/liggghts/Makefile
index b61e17b9a047..5772058af74b 100644
--- a/science/liggghts/Makefile
+++ b/science/liggghts/Makefile
@@ -1,46 +1,46 @@
 PORTNAME=	liggghts
 DISTVERSION=	3.8.0-58
-PORTREVISION=	1
+PORTREVISION=	2
 DISTVERSIONSUFFIX=	-g6e28cfe3
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Discrete element method particle simulation software
 WWW=		https://www.cfdem.com/liggghts-open-source-discrete-element-method-particle-simulation-code
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/../LICENSE
 
 BUILD_DEPENDS=	gsed:textproc/gsed
 LIB_DEPENDS=	libexpat.so:textproc/expat2 \
 		libfreetype.so:print/freetype2 \
 		libhdf5_hl.so:science/hdf5 \
 		libmpi.so:net/mpich \
 		libnetcdf.so:science/netcdf \
 		libpng.so:graphics/png \
 		libtiff.so:graphics/tiff \
 		libvtkViewsCore-${VTK_VER}.so:math/vtk${VTK_VER:R}
 
 USES=		compiler:c++17-lang cmake fortran gl jpeg python qt:5 xorg
 USE_XORG=	ice sm x11 xext xt
 USE_QT=		core declarative gui network opengl sql widgets qmake:build buildtools:build
 USE_GL=		gl
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	CFDEMproject
 GH_PROJECT=	${PORTNAME:tu}-PUBLIC
 
 CMAKE_ARGS=	-DVTK_DIR=${LOCALBASE}/lib/cmake/vtk-${VTK_VER} \
 		-DPython3_EXECUTABLE=${PYTHON_CMD}
 
 WRKSRC_SUBDIR=	src
 
 CFLAGS+=	-fPIC
 CXXFLAGS+=	-fPIC \
 		-I${LOCALBASE}/include/vtk-${VTK_VER}
 
 BINARY_ALIAS=	sed=gsed
 
 .include <../../math/vtk9/Makefile.version>
 .include <bsd.port.mk>
diff --git a/science/m-aneos/Makefile b/science/m-aneos/Makefile
index bda9434fbb57..5e7dc10bd963 100644
--- a/science/m-aneos/Makefile
+++ b/science/m-aneos/Makefile
@@ -1,32 +1,33 @@
 PORTNAME=	m-aneos
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.0-1
+PORTREVISION=	1
 DISTVERSIONSUFFIX=	-g58d75bc
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	M-ANEOS: program for construction of thermodynamic equations of state
 WWW=		https://github.com/isale-code/M-ANEOS
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/../LICENSE
 
 USES=		gmake fortran
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	isale-code
 GH_PROJECT=	M-ANEOS
 
 WRKSRC_SUBDIR=	src
 
 MAKE_ARGS=	FC=${FC} FCFLAGS="${FFLAGS}"
 
 ALL_TARGET=	default
 
 PLIST_FILES=	bin/m-aneos
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/m-aneos ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/science/madness/Makefile b/science/madness/Makefile
index 10a7c24195f5..defee10a83b7 100644
--- a/science/madness/Makefile
+++ b/science/madness/Makefile
@@ -1,35 +1,35 @@
 PORTNAME=	madness
 DISTVERSION=	0.10.1.20180823
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Multiresolution adaptive numeric environment for scientific simulation
 WWW=		https://github.com/m-a-d-n-e-s-s/madness
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	libsysinfo>0:devel/libsysinfo
 LIB_DEPENDS=	libblas.so:math/blas \
 		liblapack.so:math/lapack \
 		libmpich.so:net/mpich \
 		libtcmalloc.so:devel/google-perftools \
 		libxc.so:science/libxc
 
 USES=		cmake compiler:c++14-lang fortran localbase:ldflags python:build
 USE_GITHUB=	yes
 GH_ACCOUNT=	m-a-d-n-e-s-s
 GH_TAGNAME=	ebb3fd7
 USE_LDCONFIG=	yes
 
 CMAKE_ARGS=	-DLAPACK_LIBRARIES:STRING="-L${LOCALBASE}/lib -llapack -lblas -L${LOCALBASE}/lib/gcc${GCC_DEFAULT} -lgcc_s" -DPYTHON_EXECUTABLE=${PYTHON_CMD}
 
 OPTIONS_DEFINE=		TBB
 #OPTIONS_DEFAULT=	TBB # oneTBB support needs to be fixed: https://github.com/m-a-d-n-e-s-s/madness/issues/366
 
 TBB_DESC=		Enables use of Intel Thread Building Blocks
 TBB_CMAKE_BOOL=		ENABLE_TBB
 TBB_LIB_DEPENDS=	libtbb.so:devel/tbb
 
 .include <bsd.port.mk>
diff --git a/science/mbdyn/Makefile b/science/mbdyn/Makefile
index 857d17cba947..4b1ee1f8fb93 100644
--- a/science/mbdyn/Makefile
+++ b/science/mbdyn/Makefile
@@ -1,74 +1,74 @@
 PORTNAME=	mbdyn
 DISTVERSION=	1.7.3
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	science
 MASTER_SITES=	https://www.mbdyn.org/userfiles/downloads/
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	MultiBody Dynamics analysis system
 WWW=		https://www.mbdyn.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BROKEN_powerpc=		Does not compile on powerpc
 
 BUILD_DEPENDS=	libatomic_ops>0:devel/libatomic_ops
 LIB_DEPENDS=	libltdl.so:devel/libltdl \
 		libarpack.so:math/arpack-ng \
 		libumfpack.so:math/suitesparse-umfpack
 
 USES=		compiler:c++11-lib fortran gmake libtool:build localbase
 USE_LDCONFIG=	yes
 
 CPPFLAGS+=	-fpermissive -I${LOCALBASE}/include/suitesparse
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--program-prefix='' --enable-multithread --with-mpi=no \
 		--with-ginac=no
 
 INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE=	METIS CHACO
 OPTIONS_RADIO=	BLAS
 OPTIONS_RADIO_BLAS=	REFERENCE GOTOBLAS ATLAS
 OPTIONS_DEFAULT=	REFERENCE
 
 ATLAS_DESC=	ATLAS
 CHACO_DESC=	Enable chaco-support
 GOTOBLAS_DESC=	GotoBLAS2
 METIS_DESC=	Enable metis-support
 REFERENCE_DESC=	Blas / Lapack
 
 ATLAS_CONFIGURE_ON=	--with-blas=atlas
 ATLAS_USES=	blaslapack:atlas
 
 CHACO_BUILD_DEPENDS=	${LOCALBASE}/lib/libchaco.a:math/chaco
 CHACO_CONFIGURE_ON=	--with-chaco=yes
 CHACO_CONFIGURE_OFF=	--with-chaco=no
 
 GOTOBLAS_CONFIGURE_ON=	--with-blas=goto --with-goto=goto2
 GOTOBLAS_USES=	blaslapack:gotoblas
 
 METIS_CONFIGURE_ON=	--with-metis=yes
 METIS_CONFIGURE_OFF=	--with-metis=no
 METIS_CPPFLAGS=		-I${LOCALBASE}/include/metis
 METIS_LIB_DEPENDS=	libmetis.so:math/metis
 
 REFERENCE_CONFIGURE_ON=	--with-blas=blas
 REFERENCE_USES=	blaslapack:netlib
 
 .include <bsd.port.pre.mk>
 
 .if ${GCC_DEFAULT} >= 10
 # workaround for Type mismatch in argument 't' at (1); passed REAL(4) to INTEGER(4)
 # in theory, this should set FCFLAGS, but the port does not conform
 FFLAGS+=	-fallow-argument-mismatch
 .endif
 
 pre-configure:
 	${REINPLACE_CMD} -e '/try_lapack_LIBS=/s/-llapack/${LAPACKLIB}/' \
 		-e 's/ -lxerbla//; s/-lcholmod/-lcholmod ${BLASLIB} ${LAPACKLIB} -lsuitesparseconfig/'	\
 		${WRKSRC}/configure
 
 .include <bsd.port.post.mk>
diff --git a/science/mcstas-comps/Makefile b/science/mcstas-comps/Makefile
index 51c09ca3a13a..8cd750f7121f 100644
--- a/science/mcstas-comps/Makefile
+++ b/science/mcstas-comps/Makefile
@@ -1,29 +1,29 @@
 PORTNAME=	mcstas-comps
 PORTVERSION=	2.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	science
 MASTER_SITES=	http://download.mcstas.org/${PORTNAME:C/-comps\$//}-${PORTVERSION}/unix/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
 MAINTAINER=	erkn@fysik.dtu.dk
 COMMENT=	Component Library for the McStas neutron ray tracing package
 WWW=		https://www.mcstas.org
 
 LICENSE=	GPLv2
 
 RUN_DEPENDS=	mcstas:science/mcstas
 
 USES=		cmake:noninja fortran shebangfix
 
 SHEBANG_FILES=	samples/sasview_generator.py
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
 MCEXECS=	cif2hkl mcpl2ssw mcpltool ssw2mcpl
 
 post-install:
 .for e in ${MCEXECS}
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/mcstas/${PORTVERSION}/bin/${e}
 	${RLN} ${STAGEDIR}${PREFIX}/mcstas/${PORTVERSION}/bin/${e} ${STAGEDIR}${PREFIX}/bin/${e}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/science/mctc-lib/Makefile b/science/mctc-lib/Makefile
index d338ac794bb5..e2a52217490c 100644
--- a/science/mctc-lib/Makefile
+++ b/science/mctc-lib/Makefile
@@ -1,24 +1,25 @@
 PORTNAME=	mctc-lib
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.3.1
+PORTREVISION=	1
 CATEGORIES=	science # chemistry
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Computation tool chain library to work with molecular structure data
 WWW=		https://grimme-lab.github.io/mctc-lib/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		cmake:testing fortran
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	grimme-lab
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 
 post-patch: # same as https://github.com/grimme-lab/mctc-lib/pull/55
 	@${REINPLACE_CMD} -e 's|$${CMAKE_Fortran_COMPILER_ID}-$${CMAKE_Fortran_COMPILER_VERSION}||' ${WRKSRC}/config/CMakeLists.txt
 
 .include <bsd.port.mk>
diff --git a/science/mdynamix/Makefile b/science/mdynamix/Makefile
index 70e120df0093..f5ebdc3a632a 100644
--- a/science/mdynamix/Makefile
+++ b/science/mdynamix/Makefile
@@ -1,36 +1,36 @@
 PORTNAME=	mdynamix
 DISTVERSION=	5.2.8
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	science
 MASTER_SITES=	http://www.fos.su.se/~sasha/${PORTNAME}/versions/
 DISTNAME=	md${DISTVERSION:S/.//g}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	General purpose molecular dynamics code
 WWW=		http://www.fos.su.se/~sasha/mdynamix/
 
 LICENSE=	GPLv2+
 
 LIB_DEPENDS=	libmpich.so:net/mpich
 
 USES=		fortran gmake
 
 ALL_TARGET=	default mpi
 MAKE_ARGS=	FFLAGS="${FFLAGS} -ffast-math" LDFLAGS="${LDFLAGS}"
 BINARY_ALIAS=	make=gmake gfortran=gfortran${GCC_DEFAULT}
 
 PLIST_FILES=	bin/md bin/mdp
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/md ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/mdp ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.pre.mk>
 
 .if ${GCC_DEFAULT} >= 10
 # workaround for Type mismatch between actual argument at (1) and actual argument at (2) (INTEGER(4)/REAL(4)).
 # in theory, this should set FCFLAGS, but the port does not conform
 FFLAGS+=	-fallow-argument-mismatch
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/science/meep/Makefile b/science/meep/Makefile
index d6400199882f..04f2f953f23d 100644
--- a/science/meep/Makefile
+++ b/science/meep/Makefile
@@ -1,54 +1,55 @@
 PORTNAME=	meep
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.26.0
+PORTREVISION=	1
 CATEGORIES=	science cad
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Finite-difference time-domain software for electromagnetic simulations
 WWW=		https://github.com/NanoComp/meep
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libharminv.a:science/harminv
 LIB_DEPENDS=	libblas.so:math/blas \
 		libctlgeom.so:science/libctl \
 		libfftw3.so:math/fftw3 \
 		libGDSII.so:cad/libgdsii \
 		libhdf5.so:science/hdf5 \
 		liblapack.so:math/lapack \
 		libopenblas.so:math/openblas
 
 USES=		autoreconf compiler:c++11-lang fortran gmake libtool localbase
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	NanoComp
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-scheme
 
 CXXFLAGS_i386=	-msse2 # to fix this error: '_mm_getcsr' needs target feature sse
 
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check # some python binding's tests fail due to bug#270105 (in needed dependency science/mpb) and https://github.com/NanoComp/meep/issues/2434
 
 BINARY_ALIAS=	make=${GMAKE}
 
 OPTIONS_DEFINE=			PYTHON
 OPTIONS_DEFAULT=		PYTHON
 OPTIONS_SUB=			yes
 
 PYTHON_CONFIGURE_WITH=		python
 PYTHON_CONFIGURE_ENABLE=	maintainer-mode
 PYTHON_USES=			python
 PYTHON_BUILD_DEPENDS=		swig:devel/swig
 PYTHON_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}autograd>0:math/py-autograd@${PY_FLAVOR} \
 				${PYTHON_PKGNAMEPREFIX}h5py>0:science/py-h5py@${PY_FLAVOR} \
 				${PYTHON_PKGNAMEPREFIX}jax>0:math/py-jax@${PY_FLAVOR} \
 				${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \
 				${PYNUMPY} \
 				${PYTHON_PKGNAMEPREFIX}parameterized>0:devel/py-parameterized@${PY_FLAVOR} \
 				${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR}
 
 .include <bsd.port.mk>
diff --git a/science/minc2/Makefile b/science/minc2/Makefile
index 60f4ed80542d..033c703744ef 100644
--- a/science/minc2/Makefile
+++ b/science/minc2/Makefile
@@ -1,43 +1,43 @@
 PORTNAME=	minc
 PORTVERSION=	2.2.00
 DISTVERSIONPREFIX=	release-
-PORTREVISION=	13
+PORTREVISION=	14
 PORTEPOCH=	1
 CATEGORIES=	science biology
 PKGNAMESUFFIX=	2
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Medical Imaging NetCDF
 WWW=		https://www.bic.mni.mcgill.ca/ServicesSoftware/MINC
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libhdf5.so:science/hdf5 \
 		libnetcdf.so:science/netcdf
 RUN_DEPENDS=	bash:shells/bash
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	BIC-MNI
 
 MAKE_JOBS_UNSAFE=	yes
 
 USES=		autoreconf bison gmake libtool perl5 shebangfix
 SHEBANG_FILES=	progs/mincview/mincview
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared=yes --enable-static=yes
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 
 CFLAGS+=	-Wno-error=return-type
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 CONFLICTS=	minc-1* zh-tk
 
 pre-patch:
 	@${RM} ${WRKSRC}/ac_config_aux/*
 	@${RM} ${WRKSRC}/progs/minccalc/gram.[ch]
 	@${RM} ${WRKSRC}/progs/mincgen/ncgentab.[ch]
 
 .include <bsd.port.mk>
diff --git a/science/molscript/Makefile b/science/molscript/Makefile
index efbec7c216fd..89b93d83db32 100644
--- a/science/molscript/Makefile
+++ b/science/molscript/Makefile
@@ -1,47 +1,47 @@
 PORTNAME=	MolScript
 DISTVERSION=	2.1.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Display 3D molecules in schematic and detailed representations
 WWW=		https://kraulis.se/MolScript/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/../LICENSE.txt
 
 LIB_DEPENDS=	libpng.so:graphics/png
 RUN_DEPENDS=	render:graphics/raster3d # molscript use requires the executable 'render' to be present
 
 USES=		gl gmake jpeg localbase:ldflags xorg
 USE_GITHUB=	yes
 GH_ACCOUNT=	pekrau
 GH_TAGNAME=	280abee
 USE_GL=		gl glu glut
 USE_XORG=	x11 xext xmu
 
 MAKEFILE=	Makefile.complete
 
 MAKE_ARGS=	CC=${CC} COPT="${CFLAGS}"
 CFLAGS+=	-I${FILESDIR}
 WRKSRC_SUBDIR=	code
 
 BINARY_ALIAS=	make=${MAKE_CMD}
 
 PROGS=		${PORTNAME:tl} molauto
 
 PLIST_FILES=	${PROGS:S/^/bin\//}
 
 OPTIONS_DEFINE=	DOCS
 
 PORTDOCS=	*
 
 do-install:
 .for e in ${PROGS}
 	${INSTALL_PROGRAM} ${WRKSRC}/../${e} ${STAGEDIR}${PREFIX}/bin
 .endfor
 
 do-install-DOCS-on:
 	cd ${WRKSRC}/../docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/science/mopac/Makefile b/science/mopac/Makefile
index e0cc24aa691b..0a28520b8b26 100644
--- a/science/mopac/Makefile
+++ b/science/mopac/Makefile
@@ -1,32 +1,33 @@
 PORTNAME=	mopac
 DISTVERSIONPREFIX=	v
 DISTVERSION=	22.0.6
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	science # chemistry
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Semi-empirical (MNDO, etc.) molecular orbital calculation
 WWW=		http://openmopac.net/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 TEST_DEPENDS=	${PYNUMPY}
 
 USES=		blaslapack:openblas cmake:testing fortran python:test
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	openmopac
 
 CMAKE_OFF=	TESTS
 CMAKE_TESTING_ON=	TESTS
 CMAKE_ARGS=	-DPython3_EXECUTABLE=${PYTHON_CMD} #-DPython3_NumPy_INCLUDE_DIRS=${PYTHONPREFIX_SITELIBDIR}/numpy/core/include
 
 PLIST_FILES=	bin/mopac \
 		bin/mopac-makpol \
 		bin/mopac-param \
 		lib/libmopac.so \
 		lib/libmopac.so.1
 
 .include <bsd.port.mk>
diff --git a/science/mpb/Makefile b/science/mpb/Makefile
index 9d27d7ff8b87..8b5c40079d91 100644
--- a/science/mpb/Makefile
+++ b/science/mpb/Makefile
@@ -1,49 +1,49 @@
 PORTNAME=	mpb
 DISTVERSION=	1.11.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science
 MASTER_SITES=	https://github.com/NanoComp/mpb/releases/download/v${DISTVERSION}/
 
 MAINTAINER=	rhurlin@FreeBSD.org
 COMMENT=	MIT Photonic-Bands
 WWW=		https://mpb.readthedocs.io/en/latest/
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	bash:shells/bash
 LIB_DEPENDS=	libctl.so:science/libctl \
 		libfftw3.so:math/fftw3 \
 		libgc-threaded.so:devel/boehm-gc-threaded \
 		libguile-2.2.so:lang/guile2 \
 		libhdf5.so:science/hdf5
 
 USES=		fortran libtool pkgconfig readline
 GNU_CONFIGURE=	yes
 USE_GCC=	yes
 # Do not use --with-mpi, because it is not guaranted
 # that science/hdf5 also built with option PARALLEL
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAKE_JOBS_UNSAFE=	yes
 
 OPTIONS_DEFINE=		ATLAS NLOPT OPENMP
 OPTIONS_DEFAULT=	NLOPT
 
 ATLAS_DESC=	Use math/atlas instead of math/openblas
 NLOPT_DESC=	Use math/nlopt (enable also in science/libctl)
 OPENMP_DESC=	Use OpenMP (enable also in math/fftw3)
 
 ATLAS_LIB_DEPENDS=	libatlas.so:math/atlas
 ATLAS_USES_OFF=		blaslapack:openblas
 ATLAS_CONFIGURE_ON=	--with-lapack=-lalapack
 ATLAS_CONFIGURE_OFF=	--with-blas=openblas --with-lapack=-lopenblas
 NLOPT_LIB_DEPENDS=	libnlopt.so:math/nlopt
 OPENMP_CONFIGURE_ON=	--with-openmp
 
 post-install:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	(cd ${WRKSRC}/examples && \
 	${COPYTREE_SHARE} "*.ctl *.scm" ${STAGEDIR}${EXAMPLESDIR})
 
 .include <bsd.port.mk>
diff --git a/science/mpqc/Makefile b/science/mpqc/Makefile
index 7373b6b3dc81..ec4926759f4c 100644
--- a/science/mpqc/Makefile
+++ b/science/mpqc/Makefile
@@ -1,114 +1,114 @@
 PORTNAME=	mpqc
 PORTVERSION=	2.3.1
-PORTREVISION=	47
+PORTREVISION=	48
 CATEGORIES=	science parallel
 MASTER_SITES=	SF
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Massively Parallel Quantum Chemistry Program
 WWW=		https://mpqc.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	dot:graphics/graphviz
 LIB_DEPENDS=	libint.so:science/libint
 RUN_DEPENDS=	wish:x11-toolkits/tk-wrapper \
 		dot:graphics/graphviz
 
 USES=		fortran gmake libtool localbase perl5 shebangfix tar:bzip2
 
 CONFLICTS_BUILD=	ga # devel/ga: it links to libarmci.so, has HAVE_ARMCI defined, and hits some bug
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-production \
 		--enable-shared \
 		--with-cc-optflags="${CFLAGS}" \
 		--with-cxx-optflags="${CXXFLAGS}" \
 		--with-sc-datadir=${DATADIR}
 ALL_TARGET=	default
 INSTALL_TARGET=	install install_devel
 DESTDIRNAME=	installroot
 SHEBANG_FILES=	src/bin/mpqc/ccarunproc src/bin/mpqc/mpqcrunproc
 USE_LDCONFIG=	yes
 USE_CXXSTD=	c++98 # workaround https://github.com/ValeevGroup/mpqc/issues/57
 
 OPTIONS_DEFINE=		ATLAS DOXYGEN EXAMPLES ICC MPI OPTIFLAGS
 OPTIONS_DEFAULT=	DOXYGEN MPI
 OPTIONS_SUB=		yes
 
 ICC_DESC=		Build with ICC compiler instead
 ATLAS_DESC=		Link with ATLAS instead of BLAS
 OPTIFLAGS_DESC=		Build with optimized flags
 
 ATLAS_USES=		blaslapack:atlas
 ATLAS_USES_OFF=		blaslapack:netlib
 
 DOXYGEN_CONFIGURE_ENABLE=	doxygen-man
 DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen \
 			dot:graphics/graphviz
 DOXYGEN_USES=		tex
 DOXYGEN_USE=		TEX=base,dvipsk,pdftex
 
 ICC_BUILD_DEPENDS=	${LOCALBASE}/intel_cc_80/bin/icc:lang/icc
 
 MPI_CONFIGURE_ENABLE=	parallel
 MPI_LIB_DEPENDS=	libmpich.so:net/mpich
 MPI_LDFLAGS=		-lmpich # build fails to supply libmpich.so to link
 
 OPTIFLAGS_CFLAGS=	-ffast-math
 OPTIFLAGS_CXXFLAGS=	-ffast-math
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MICC}
 CC=		${LOCALBASE}/intel_cc_80/bin/icc
 CXX=		${LOCALBASE}/intel_cc_80/bin/icpc
 CFLAGS=		-O3 -tpp7 -xMKW -Vaxlib
 CXXFLAGS=	-O3 -tpp7 -xMKW -Vaxlib
 LIBS+=		-lsvml
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} \
 		-e 's/-lblas/${BLASLIB}/' -e 's/-llapack/${LAPACKLIB}/' \
 		-e 's/pthread_join(0,0)/pthread_create(0,0,0,0)/' \
 		-e 's|/usr/bin/wish|${LOCALBASE}/bin/wish|' \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} \
 		's|#include <chemistry/qc/mbptr12/f77sym.h>|#include <${WRKSRC}/src/lib/chemistry/qc/mbptr12/f77sym.h>|' \
 		${WRKSRC}/src/lib/chemistry/qc/mbptr12/blas.h \
 		${WRKSRC}/src/lib/chemistry/qc/mbptr12/lapack.h
 
 post-configure: # workaround: https://github.com/ValeevGroup/mpqc/issues/56
 	@${REINPLACE_CMD} -e ' \
 		s|/\* #undef USING_NAMESPACE_STD \*/|#define USING_NAMESPACE_STD 1|; \
 		s|/\* #undef HAVE_SGETN \*/|#define HAVE_SGETN 1|' \
 		${WRKSRC}/src/lib/scconfig.h
 
 do-build-DOXYGEN-on:
 	@(cd ${WRKSRC}/doc && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS})
 	${RM} ${WRKSRC}/doc/man/man1/_* ${WRKSRC}/doc/man/man3/_*
 
 do-install-DOXYGEN-on:
 	@(cd ${WRKSRC}/doc && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} \
 		install install_man)
 	${MV} ${STAGEDIR}${PREFIX}/html ${STAGEDIR}${DOCSDIR}
 
 do-install-EXAMPLES-on:
 	@(cd ${WRKSRC}/doc && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} \
 		install_samples)
 	${MV} ${STAGEDIR}${PREFIX}/examples/mp2 ${STAGEDIR}${EXAMPLESDIR}
 	${RMDIR} ${STAGEDIR}${PREFIX}/examples
 
 post-install:
 	(cd ${STAGEDIR}${PREFIX}/bin && ${STRIP_CMD} scpr molrender mpqc scls)
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so
 
 validate:
 	(cd ${WRKSRC}/src/bin/mpqc/validate && \
 		${MAKE_CMD} check0 && \
 		${MAKE_CMD} check0_run && \
 		${MAKE_CMD} check0_chk)
 
 .include <bsd.port.mk>
diff --git a/science/mrchem/Makefile b/science/mrchem/Makefile
index f7b4cc7fcb29..2d60e7d71b98 100644
--- a/science/mrchem/Makefile
+++ b/science/mrchem/Makefile
@@ -1,58 +1,59 @@
 PORTNAME=	mrchem
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.1.2
+PORTREVISION=	1
 CATEGORIES=	science # chemistry
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	MultiResolution Chemistry
 WWW=		https://github.com/MRChemSoft/mrchem
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	nlohmann-json>0:devel/nlohmann-json
 LIB_DEPENDS=	libmrcpp.so:science/mrcpp \
 		libxcfun.so:science/xcfun
 
 USES=		cmake:testing compiler:c++14-lang eigen:3 shebangfix
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	MRChemSoft
 
 SHEBANG_FILES=	python/mrchem.in tests/*/test
 
 OPTIONS_DEFINE=		ARCH_FLAGS PYTHON # the Python module also exists in the separate port science/py-mrchem, so it should be off by default here
 OPTIONS_SINGLE=		MPI
 OPTIONS_SINGLE_MPI=	NOMPI MPICH OPENMPI
 OPTIONS_DEFAULT=	MPICH
 OPTIONS_SUB=		yes
 
 ARCH_FLAGS_DESC=	Enable architecture-specific compiler flags
 ARCH_FLAGS_CMAKE_BOOL=	ENABLE_ARCH_FLAGS
 
 NOMPI_DESC=		Build without parallel processing support
 
 MPICH_USES=		mpi:mpich
 MPICH_CMAKE_ON=		-DENABLE_MPI=ON
 
 OPENMPI_USES=		mpi:openmpi
 OPENMPI_CMAKE_ON=	-DENABLE_MPI=ON
 OPENMPI_BROKEN=		fails to compile with OpenMPI, see https://github.com/MRChemSoft/mrchem/issues/438
 
 PYTHON_USES=		python
 PYTHON_CMAKE_BOOL=	BUILD_PYTHON
 PYTHON_CMAKE_ON=	-DPython3_EXECUTABLE=${PYTHON_CMD} \
 			-DPYMOD_INSTALL_LIBDIR=${PYTHON_SITELIBDIR:S;${PREFIX}/lib/;;}
 
 post-install-PYTHON-on:
 	@${RMDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/mrchem/input_parser/docs
 
 .include <bsd.port.options.mk>
 
 .if !${PORT_OPTIONS:MPYTHON}
 pre-test:
 	@${ECHO} "tests require the port to be built with PYTHON=ON" && false
 
 .endif
 
 .include <bsd.port.mk>
diff --git a/science/mrcpp/Makefile b/science/mrcpp/Makefile
index 51025361b56b..676bf6babdc1 100644
--- a/science/mrcpp/Makefile
+++ b/science/mrcpp/Makefile
@@ -1,41 +1,42 @@
 PORTNAME=	mrcpp
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.4.2
+PORTREVISION=	1
 CATEGORIES=	science # chemistry
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	MultiResolution Computation Program Package
 WWW=		https://github.com/MRChemSoft/mrcpp
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		cmake:testing compiler:c++14-lang eigen:3
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	MRChemSoft
 GH_TAGNAME=	e865a7e
 
 CMAKE_OFF=	ENABLE_TESTS
 CMAKE_TESTING_ON=	ENABLE_TESTS
 
 BINARY_ALIAS=	git=false
 
 OPTIONS_DEFINE=		ARCH_FLAGS
 OPTIONS_SINGLE=		MPI
 OPTIONS_SINGLE_MPI=	NOMPI MPICH OPENMPI
 OPTIONS_DEFAULT=	MPICH # should be same default as in science/mrchem
 
 ARCH_FLAGS_DESC=	Enable architecture-specific compiler flags
 ARCH_FLAGS_CMAKE_BOOL=	ENABLE_ARCH_FLAGS
 
 NOMPI_DESC=		Build without parallel processing support
 
 MPICH_USES=		mpi:mpich
 MPICH_CMAKE_ON=		-DENABLE_MPI=ON
 
 OPENMPI_USES=		mpi:openmpi
 OPENMPI_CMAKE_ON=	-DENABLE_MPI=ON
 
 .include <bsd.port.mk>
diff --git a/science/mstore/Makefile b/science/mstore/Makefile
index 904553d3aed4..18ca83e6b49b 100644
--- a/science/mstore/Makefile
+++ b/science/mstore/Makefile
@@ -1,27 +1,27 @@
 PORTNAME=	mstore
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science # chemistry
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Molecular structure store for testing
 WWW=		https://github.com/grimme-lab/mstore
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libmctc-lib.so:science/mctc-lib
 
 USES=		cmake fortran
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	grimme-lab
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 
 post-patch: # see https://github.com/toml-f/toml-f/issues/51
 	@${REINPLACE_CMD} -e 's|$${CMAKE_Fortran_COMPILER_ID}-$${CMAKE_Fortran_COMPILER_VERSION}||' ${WRKSRC}/config/CMakeLists.txt
 
 .include <bsd.port.mk>
diff --git a/science/multicharge/Makefile b/science/multicharge/Makefile
index 6c7b4363ac04..342698812a07 100644
--- a/science/multicharge/Makefile
+++ b/science/multicharge/Makefile
@@ -1,28 +1,29 @@
 PORTNAME=	multicharge
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.2.0
+PORTREVISION=	1
 CATEGORIES=	science # chemistry
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Electronegativity equilibration model for atomic partial charges
 WWW=		https://github.com/grimme-lab/mstore
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	mstore>0:science/mstore
 LIB_DEPENDS=	libmctc-lib.so:science/mctc-lib \
 		libopenblas.so:math/openblas
 
 USES=		cmake:testing fortran
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	grimme-lab
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 
 post-patch: # see https://github.com/toml-f/toml-f/issues/51
 	@${REINPLACE_CMD} -e 's|$${CMAKE_Fortran_COMPILER_ID}-$${CMAKE_Fortran_COMPILER_VERSION}||' ${WRKSRC}/config/CMakeLists.txt
 
 .include <bsd.port.mk>
diff --git a/science/multiwfn/Makefile b/science/multiwfn/Makefile
index 574b90953ccf..e28612c55a43 100644
--- a/science/multiwfn/Makefile
+++ b/science/multiwfn/Makefile
@@ -1,29 +1,29 @@
 PORTNAME=	multiwfn
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.4.1-0-14
-PORTREVISION=	5
+PORTREVISION=	6
 DISTVERSIONSUFFIX=	-ge873677
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Multifunctional wavefunction analysis for quantum chemistry
 WWW=		http://sobereva.com/multiwfn/index.html
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libopenblas.so:math/openblas
 RUN_DEPENDS=	bash:shells/bash
 
 USES=		autoreconf gmake fortran shebangfix
 SHEBANG_GLOB=	*.sh
 SHEBANG_FILES=	init/Multiwfn.01
 GNU_CONFIGURE=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	stecue
 GH_PROJECT=	gMultiwfn
 
 PLIST_FILES=	bin/Multiwfn \
 		lib/gMultiwfn/Multiwfn
 
 .include <bsd.port.mk>
diff --git a/science/namd/Makefile b/science/namd/Makefile
index f5456bddf8db..f82656c3cdfd 100644
--- a/science/namd/Makefile
+++ b/science/namd/Makefile
@@ -1,70 +1,70 @@
 PORTNAME=	namd
 DISTVERSION=	2.12
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	science
 DISTNAME=	${PORTNAME:tu}_${DISTVERSION}_Source
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Computer software for molecular dynamics simulation
 WWW=		https://www.ks.uiuc.edu/Research/namd/
 
 LICENSE=	NAMD_MOLECULAR_DYNAMICS_LICENSE
 LICENSE_NAME=	NAMD Molecular Dynamics Software
 LICENSE_FILE=	${WRKSRC}/license.txt
 LICENSE_PERMS=	no-auto-accept no-dist-mirror no-pkg-mirror # No redistribution is allowed, commercial use requires a commercial license
 
 ONLY_FOR_ARCHS=	amd64 i386
 ONLY_FOR_ARCHS_REASON=	not clear if it can be built on other architectures
 
 BROKEN_i386=	need to fix the fft library handling
 
 BUILD_DEPENDS=	bash:shells/bash \
 		${LOCALBASE}/include/fftw3.h:math/fftw3
 LIB_DEPENDS=	libck.so:net/charm \
 		libfftw3f.so:math/fftw3-float
 
 USES=		fortran gmake localbase:ldflags python:build shebangfix tcl
 SHEBANG_FILES=	config
 
 ARCH_STR=	Linux-${ARCH:S/amd64/x86_64/:S/i386/x86/}-g++
 ARCH_STR_CHARM=	linux${ARCH:S/amd64/64/:S/i386/32/}
 
 PATCH_WRKSRC=	${WRKSRC}
 BUILD_WRKSRC=	${WRKSRC}/${ARCH_STR}
 
 CFLAGS+=	-D_NO_MALLOC_H -D_NO_ALLOCA_H
 CXXFLAGS+=	-D_NO_MALLOC_H -D_NO_ALLOCA_H
 
 BINARY_ALIAS=	gcc=${CC} g++=${CXX}
 
 PLIST_FILES=	bin/flipbinpdb \
 		bin/flipdcd \
 		bin/namd2 \
 		bin/psfgen \
 		bin/sortreplicas
 
 .include <bsd.port.pre.mk>
 
 .if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})
 IGNORE=	please download the release tarball of the version ${DISTVERSION} (${DISTFILES}) from https://www.ks.uiuc.edu/Development/Download/download.cgi?PackageName=NAMD, put it into ${DISTDIR}, and run 'make' again
 .endif
 
 do-configure:
 	@cd ${WRKSRC} && ${ECHO} "CHARMBASE=${LOCALBASE}" > Make.config
 	@cd ${WRKSRC} && ./config ${ARCH_STR} --charm-arch multicore-${ARCH_STR_CHARM} ${ARCH:S/amd64/--with-fftw3/:S/${ARCH}//}
 	@${REINPLACE_CMD} 's|CHARMBASE = .*|CHARMBASE = ${LOCALBASE}|' ${WRKSRC}/Make.charm
 	@${REINPLACE_CMD} '\
 		s|FFTDIR=.*|FFTDIR=${LOCALBASE}|; \
 		s|-lsfftw|-lfft3f|; \
 		s|-lsrfftw|-lrfft3f|; \
 		s|TCLDIR=.*|TCLDIR=${LOCALBASE}/include/tcl8.6|; \
 		s|TCLINCL=.*|TCLINCL=-I${LOCALBASE}/include/tcl8.6|; \
 		s|TCLLIB=.*|TCLLIB=-L${LOCALBASE}/lib -ltcl86 -lpthread|' \
 		${WRKSRC}/arch/Linux*
 
 do-install:
 .for e in namd2 flipbinpdb flipdcd psfgen sortreplicas
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${e} ${STAGEDIR}${PREFIX}/bin
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/science/netcdf-cxx/Makefile b/science/netcdf-cxx/Makefile
index 05d418e5b5dc..d7164882b1b4 100644
--- a/science/netcdf-cxx/Makefile
+++ b/science/netcdf-cxx/Makefile
@@ -1,28 +1,28 @@
 PORTNAME=	netcdf-cxx
 PORTVERSION=	4.3.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	science
 MASTER_SITES=	https://downloads.unidata.ucar.edu/netcdf-cxx/${PORTVERSION}/ \
 		LOCAL/sunpoet
 DISTNAME=	${PORTNAME}4-${PORTVERSION}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	C++ library for machine-independent, array-oriented data access
 WWW=		https://www.unidata.ucar.edu/software/netcdf/
 
 LICENSE=	UCAR_UNIDATA
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 LICENSE_NAME=	University Corporation for Atmospheric Research/Unidata
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 LIB_DEPENDS=	libnetcdf.so:science/netcdf
 
 USES=		libtool localbase pathfix
 
 CPPFLAGS+=	-fPIC -DPIC
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check
 USE_LDCONFIG=	yes
 
 .include <bsd.port.mk>
diff --git a/science/netcdf-fortran/Makefile b/science/netcdf-fortran/Makefile
index bf563cc941eb..5d1395c1322c 100644
--- a/science/netcdf-fortran/Makefile
+++ b/science/netcdf-fortran/Makefile
@@ -1,29 +1,30 @@
 PORTNAME=	netcdf-fortran
 PORTVERSION=	4.5.4
+PORTREVISION=	1
 CATEGORIES=	science
 MASTER_SITES=	https://downloads.unidata.ucar.edu/netcdf-fortran/${PORTVERSION}/ \
 		LOCAL/sunpoet
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Fortran library for machine-independent, array-oriented data access
 WWW=		https://www.unidata.ucar.edu/software/netcdf/
 
 LICENSE=	UCAR_UNIDATA
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 LICENSE_NAME=	University Corporation for Atmospheric Research/Unidata
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 BUILD_DEPENDS=	netcdf>=4.7.4:science/netcdf
 LIB_DEPENDS=	libnetcdf.so:science/netcdf
 
 USES=		fortran gmake libtool localbase makeinfo pathfix
 
 CPPFLAGS+=	-fPIC -DPIC -DgFortran
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 MAKE_ENV=	MAKEINFOFLAGS=--no-split
 MAKE_JOBS_UNSAFE=	yes
 TEST_TARGET=	check
 USE_LDCONFIG=	yes
 
 .include <bsd.port.mk>
diff --git a/science/netcdf/Makefile b/science/netcdf/Makefile
index 232e56a0ef85..aaf9395bd61d 100644
--- a/science/netcdf/Makefile
+++ b/science/netcdf/Makefile
@@ -1,54 +1,54 @@
 PORTNAME=	netcdf
 PORTVERSION=	4.9.0
 DISTVERSIONPREFIX=	c-
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	science
 MASTER_SITES=	https://downloads.unidata.ucar.edu/netcdf-c/${PORTVERSION}/ \
 		LOCAL/sunpoet
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	C library for machine-independent, array-oriented data access
 WWW=		https://www.unidata.ucar.edu/software/netcdf/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libhdf5.so:science/hdf5
 
 USES=		gmake libtool localbase ncurses pathfix pkgconfig:run
 
 CONFIGURE_ARGS=	--disable-filter-testing --disable-libxml2 \
 		--enable-byterange --enable-dap --enable-netcdf-4
 CPPFLAGS+=	-fPIC -DPIC
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 LIBS+=		-lexecinfo
 TEST_TARGET=	check
 USE_LDCONFIG=	yes
 
 CONFLICTS_INSTALL=	hdf-4.[0-9]* netcdf-3.[0-9]* netcdf3-3.[0-9]*
 
 OPTIONS_DEFINE=	DOCS DOXYGEN SZIP
 OPTIONS_DEFAULT=SZIP
 OPTIONS_SUB=	yes
 DOXYGEN_IMPLIES=DOCS
 SZIP_DESC=	SZIP support (required if HDF5 was built with SZIP)
 
 DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
 DOXYGEN_CONFIGURE_ENABLE=	doxygen
 SZIP_LIB_DEPENDS=	libsz.so:science/libaec
 SZIP_LIBS=		-lsz
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-ldl ||g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e '/ int fileno(FILE\*);/d' ${WRKSRC}/libdispatch/d*.c ${WRKSRC}/ncgen/ncgen* ${WRKSRC}/ncgen3/ncgen* ${WRKSRC}/oc2/ocdump.c
 
 post-build-DOXYGEN-on:
 	cd ${WRKSRC}/docs/ && ${LOCALBASE}/bin/doxygen .
 
 post-install-DOXYGEN-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/
 	cd ${WRKSRC}/docs/html/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/science/nlcglib/Makefile b/science/nlcglib/Makefile
index 66a366377c66..5d40cb206a33 100644
--- a/science/nlcglib/Makefile
+++ b/science/nlcglib/Makefile
@@ -1,39 +1,39 @@
 PORTNAME=	nlcglib
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.9-148
-PORTREVISION=	1
+PORTREVISION=	2
 DISTVERSIONSUFFIX=	-g9a1bca6
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Nonlinear CG methods for wave-function optimization in DFT
 WWW=		https://github.com/simonpintarelli/nlcglib
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	nlohmann-json>0:devel/nlohmann-json
 LIB_DEPENDS=	libkokkoscore.so:devel/kokkos \
 		libopenblas.so:math/openblas
 TEST_DEPENDS=	googletest>0:devel/googletest
 
 USES=		cmake:testing pkgconfig
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	simonpintarelli
 
 CMAKE_TESTING_ON=	BUILD_TESTS # tests fail to compile, see https://github.com/simonpintarelli/nlcglib/issues/14
 
 OPTIONS_DEFINE=		OPENMP
 OPTIONS_SINGLE=		MPI
 OPTIONS_SINGLE_MPI=	MPICH OPENMPI
 OPTIONS_DEFAULT=	MPICH OPENMP
 
 MPICH_USES=		mpi:mpich
 
 OPENMPI_USES=		mpi:openmpi
 
 OPENMP_CMAKE_BOOL=	USE_OPENMP # binaries are still linked with libomp when USE_OPENMP=OFF, see https://github.com/simonpintarelli/nlcglib/issues/13
 
 .include <bsd.port.mk>
diff --git a/science/nwchem/Makefile b/science/nwchem/Makefile
index d04842659465..19c7ac45a9aa 100644
--- a/science/nwchem/Makefile
+++ b/science/nwchem/Makefile
@@ -1,102 +1,103 @@
 PORTNAME=	nwchem
 DISTVERSIONPREFIX=	v
 DISTVERSION=	7.2.0
+PORTREVISION=	1
 DISTVERSIONSUFFIX=	-release
 CATEGORIES=	science
 MASTER_SITES=	https://www.chemie.uni-bonn.de/pctc/mulliken-center/software/dft-d3/:dftd3 \
 		https://web.archive.org/web/20210527062154if_/https://www.chemie.uni-bonn.de/pctc/mulliken-center/software/dft-d3/:dft3 \
 		https://gitlab.com/libxc/libxc/-/archive/${LIBXC_VERSION}/:libxc
 DISTFILES=	dftd3.tgz:dft3 \
 		libxc-${LIBXC_VERSION}.tar.gz:libxc
 DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
 EXTRACT_ONLY=	${DISTNAME}.tar.gz
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	High-performance computational chemistry software
 WWW=		https://nwchemgit.github.io/
 
 LICENSE=	ECL20
 LICENSE_NAME=	Educational Community License (ECL) 2.0
 LICENSE_FILE=	${WRKSRC}/../LICENSE.TXT
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 BROKEN_aarch64=	fails to build: gfortran10: error: unrecognized command-line option '-m64'
 
 BUILD_DEPENDS=	bash:shells/bash
 LIB_DEPENDS=	libblas.so:math/blas \
 		libga.so:devel/ga \
 		libhwloc.so:devel/hwloc2
 RUN_DEPENDS=	nwchem-data>0:science/nwchem-data
 TEST_DEPENDS=	bash:shells/bash
 
 USES=		fortran gettext-runtime gmake perl5 pkgconfig
 USE_PERL5=	build
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	nwchemgit
 
 MAKEFILE=	GNUmakefile
 ARCH_64BIT=	${ARCH:C/.*64.*/64/:S/${ARCH}//}
 MAKE_ENV=	NWCHEM_TOP=${WRKSRC}/.. NWCHEM_MODULES=all NWCHEM_LONG_PATHS=Y NWCHEM_TARGET=LINUX${ARCH_64BIT} USE_INTERNALBLAS=Y EXTERNAL_GA_PATH=${LOCALBASE} \
 		BLAS_SIZE=4 USE_64TO32=y
 
 SUB_FILES=	nwchemrc
 
 WRKSRC_SUBDIR=	src
 
 BINARY_ALIAS=	gcc=${CC} gfortran=gfortran${GCC_DEFAULT}
 BINARY_ALIAS+=	make=${GMAKE} # only for LIBXC
 
 PLIST_FILES=	bin/nwchem etc/nwchemrc
 
 LIBXC_VERSION=	6.1.0 # from src/libext/libxc/build_libxc.sh
 
 OPTIONS_DEFINE=		LIBXC PYTHON # more potential optional dependencies are listed in src/libext/GNUmakefile
 OPTIONS_DEFAULT=	LIBXC PYTHON MPICH # the default should be the same as for the MPI option in math/scalapack and devel/ga
 OPTIONS_RADIO=		MPI
 OPTIONS_RADIO_MPI=	NOMPI MPICH OPENMPI
 
 NOMPI_DESC=		MPI isn't used
 NOMPI_BROKEN=		Fails to build without MPI
 
 MPICH_MAKE_ENV=		USE_MPI=Y
 MPICH_LIB_DEPENDS=	libmpich.so:net/mpich
 
 OPENMPI_MAKE_ENV=	USE_MPI=Y PATH=${LOCALBASE}/mpi/openmpi/bin:$${PATH} # mpif90 in path determines which MPI library to use, see https://www.nwchem-sw.org/index-php/Compiling_NWChem.html#MPI_variables
 OPENMPI_BUILD_DEPENDS=	openmpi>0:net/openmpi
 OPENMPI_RUN_DEPENDS=	openmpi>0:net/openmpi
 OPENMPI_VARS=		CONFLICTS_BUILD=mpich
 
 LIBXC_DESC=		Use libxc
 LIBXC_BUILD_DEPENDS=	cmake:devel/cmake-core
 LIBXC_MAKE_ENV=		USE_LIBXC=Y
 
 PYTHON_DESC=		Enable Python syntax in input files
 PYTHON_USES=		python
 PYTHON_MAKE_ENV=	PYTHONVERSION=${PYTHON_VER} NWCHEM_MODULES="all python"
 
 post-extract:
 	@${RM} ${WRKSRC}/atomscf/src.orig
 	# symlink the downloaded dftd3.tgz
 	@${LN} -s ${DISTDIR}/${DIST_SUBDIR}/dftd3.tgz ${WRKSRC}/nwpw/nwpwlib/nwpwxc/
 
 post-extract-LIBXC-on:
 	# symlink the downloaded libxc
 	@${LN} -s ${DISTDIR}/${DIST_SUBDIR}/libxc-${LIBXC_VERSION}.tar.gz ${WRKSRC}/libext/libxc/
 
 post-patch:
 	@${REINPLACE_CMD} 's|nwchrc="/etc/nwchemrc"|nwchrc="${PREFIX}/etc/nwchemrc"|' ${WRKSRC}/util/util_nwchemrc.F
 
 pre-build:
 	@cd ${WRKSRC} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} nwchem_config && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} 64_to_32
 
 do-install:
 	${INSTALL_DATA} ${WRKDIR}/nwchemrc ${STAGEDIR}${PREFIX}/etc/nwchemrc
 	${INSTALL_PROGRAM} ${WRKSRC}/../bin/LINUX${ARCH_64BIT}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 
 do-test:
 	@cd ${WRKSRC}/../QA && NWCHEM_TOP=${WRKSRC}/.. NWCHEM_TARGET=LINUX64 ./doqmtests.mpi
 
 .include <bsd.port.mk>
diff --git a/science/ocean/Makefile b/science/ocean/Makefile
index 877ba1b7cd66..2261bfa71099 100644
--- a/science/ocean/Makefile
+++ b/science/ocean/Makefile
@@ -1,54 +1,55 @@
 PORTNAME=	ocean
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.0.0
+PORTREVISION=	1
 CATEGORIES=	science
 PKGNAMESUFFIX=	-spectroscopy-code
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	BSE code for core spectroscopy
 WWW=		https://github.com/times-software/OCEAN
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/License
 
 LIB_DEPENDS=	libfftw3.so:math/fftw3 \
 		libopenblas.so:math/openblas
 RUN_DEPENDS=	abinit>0:science/abinit \
 		quantum-espresso>0:science/quantum-espresso
 
 USES=		fortran gmake localbase perl5 shebangfix
 USE_PERL5=	run
 
 SHEBANG_GLOB=	*.pl
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	times-software
 GH_PROJECT=	${PORTNAME:tu}
 
 MAKE_ARGS=	MPIFC=${MPIFC} MPI_HOME=${MPI_HOME}
 
 BINARY_ALIAS=	make=${GMAKE}
 
 OPTIONS_SINGLE=		MPI
 OPTIONS_SINGLE_MPI=	MPICH OPENMPI
 OPTIONS_DEFAULT=	OPENMPI
 
 MPICH_USES=		mpi:mpich
 
 OPENMPI_USES=		mpi:openmpi
 
 post-extract:
 	# copy in the Makefile.arch file
 	@${LN} -s ${FILESDIR}/Makefile.arch ${WRKSRC}/
 	# set execution flag on all *.pl files
 	@${FIND} ${WRKSRC} -name "*.pl" | ${XARGS} ${CHMOD} +x
 
 post-patch:
 	# patch the bash path (but run_examples.pl is currently dysfunctional, according to README)
 	@${REINPLACE_CMD} -i '' -e 's|#!/bin/bash|#!${LOCALBASE}/bin/bash|' ${WRKSRC}/EXAMPLE/run_examples.pl
 
 post-install:
 	# strip binaries
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*.x
 
 .include <bsd.port.mk>
diff --git a/science/octopus/Makefile b/science/octopus/Makefile
index 48cc8f647a26..e79942628927 100644
--- a/science/octopus/Makefile
+++ b/science/octopus/Makefile
@@ -1,67 +1,67 @@
 PORTNAME=	octopus
 DISTVERSION=	11.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	science # chemistry
 MASTER_SITES=	https://octopus-code.org/download/${DISTVERSION}/
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Scientific program aimed at the ab initio virtual experimentation
 WWW=		https://octopus-code.org/wiki/Main_Page
 
 LICENSE=	GPLv2
 
 BROKEN_aarch64=	undefined reference to `__aarch64_cas8_acq_rel' #'`
 
 BUILD_DEPENDS=	bash:shells/bash
 LIB_DEPENDS=	libarpack.so:math/arpack-ng \
 		libblas.so:math/blas \
 		libfftw3.so:math/fftw3 \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libgd.so:graphics/gd \
 		libgmp.so:math/gmp \
 		libgsl.so:math/gsl \
 		liblapack.so:math/lapack \
 		libmpfr.so:math/mpfr \
 		libnlopt.so:math/nlopt \
 		libpng.so:graphics/png \
 		libsymspg.so:science/spglib \
 		libtiff.so:graphics/tiff \
 		libvdwxcfort.so:science/libvdwxc \
 		libwebp.so:graphics/webp \
 		libxc.so:science/libxc \
 		libyaml.so:textproc/libyaml
 
 USES=		compiler:c++14-lang fortran gmake jpeg libtool localbase:ldflags perl5 python shebangfix
 USE_CXXSTD=	c++14
 USE_LDCONFIG=	yes
 USE_GCC=	11 # pending resolution of https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=266196 (see also https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=266196)
 
 SHEBANG_FILES=	src/fdep/fortran_dependencies.pl testsuite/performance/create_combinations.py
 
 GNU_CONFIGURE=	yes
 CONFIGURE_SHELL=	${PREFIX}/bin/bash
 CONFIGURE_ARGS=	--enable-shared --disable-static
 
 LDFLAGS+=	-lsymspg
 FCFLAGS+=	-I${LOCALBASE}/include -ffree-line-length-none
 
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check-short # some tests fail, see https://gitlab.com/octopus-code/octopus/-/issues/558
 
 OPTIONS_DEFINE=			OPENMP
 OPTIONS_DEFAULT=		OPENMP
 OPENMP_CONFIGURE_ENABLE=	openmp
 
 .include <bsd.port.pre.mk>
 
 # workaround for:
 # Error: BOZ literal constant at (1) is neither a data-stmt-constant nor an actual argument to INT, REAL, DBLE, or CMPLX intrinsic function [see '-fno-allow-invalid-boz']
 .if ${GCC_DEFAULT} >= 10
 FCFLAGS+=	-fallow-argument-mismatch -fallow-invalid-boz
 .endif
 
 post-stage: # https://gitlab.com/octopus-code/octopus/issues/108
 	@${RM} ${STAGEDIR}${PREFIX}/include/yaml.h
 
 .include <bsd.port.post.mk>
diff --git a/science/openbabel/Makefile b/science/openbabel/Makefile
index 9907494431c4..fb4f04212e51 100644
--- a/science/openbabel/Makefile
+++ b/science/openbabel/Makefile
@@ -1,63 +1,63 @@
 PORTNAME=	openbabel
 DISTVERSION=	3.1.1
-PORTREVISION=	7
+PORTREVISION=	8
 DISTVERSIONSUFFIX=	-source
 CATEGORIES=	science
 MASTER_SITES=	https://github.com/openbabel/openbabel/releases/download/openbabel-${PORTVERSION:C/\./-/g}/
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Chemical toolbox designed to speak the many languages of chemical data
 WWW=		https://openbabel.org/wiki/Main_Page
 
 LICENSE=	GPLv2+
 
 BUILD_DEPENDS=	rapidjson>0:devel/rapidjson
 LIB_DEPENDS=	libmaeparser.so:science/maeparser	\
 		libcoordgen.so:science/coordgenlibs	\
 		libboost_thread.so:devel/boost-libs
 
 CONFLICTS_INSTALL=	babel
 
 USES=		cmake compiler:c++11-lang eigen:3 gnome pkgconfig tar:bz2
 USE_CXXSTD=	gnu++98
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
 
 CMAKE_ON=	WITH_COORDGEN WITH_JSON OPENBABEL_USE_SYSTEM_RAPIDJSON WITH_MAEPARSER
 CMAKE_OFF=	PYTHON_BINDINGS
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 PLIST_SUB=	VERSION=3.1.0	# To be replaced by ${PORTVERSION} nexttime!
 
 OPTIONS_DEFINE=		CAIRO GUI
 OPTIONS_DEFAULT=	CAIRO GUI
 OPTIONS_SUB=		yes
 
 CAIRO_DESC=		PNG support via cairo library
 CAIRO_USE=		GNOME=cairo
 
 GUI_CMAKE_BOOL=		BUILD_GUI
 GUI_CMAKE_ON=		-DwxWidgets_CONFIG_EXECUTABLE:STRING=${WX_CONFIG}
 GUI_USE=		WX=3.0
 
 .include <bsd.port.pre.mk>
 
 .if ${CHOSEN_COMPILER_TYPE} == gcc
 CXXFLAGS+=	-Wno-narrowing
 USE_CXXSTD=	c++11
 .endif
 
 pre-configure:
 	${REINPLACE_CMD} -e '/pkgconfig/s,$${LIB_INSTALL_DIR},libdata,' \
 		${WRKSRC}/CMakeLists.txt
 
 pre-configure-CAIRO-off:
 	${REINPLACE_CMD} -e '/find_package(Cairo)/d' \
 		${WRKSRC}/CMakeLists.txt
 
 post-install-PYTHON-on:
 	(cd ${STAGEDIR}${PREFIX} && ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
 		-d ${PREFIX} -f ${PYTHONPREFIX_SITELIBDIR:S,${PREFIX}/,,})
 	(cd ${STAGEDIR}${PREFIX} && ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
 		-d ${PREFIX} -f ${PYTHONPREFIX_SITELIBDIR:S,${PREFIX}/,,})
 
 .include <bsd.port.post.mk>
diff --git a/science/openems/Makefile b/science/openems/Makefile
index b269e1c11f3b..cdc46c9d5cbf 100644
--- a/science/openems/Makefile
+++ b/science/openems/Makefile
@@ -1,46 +1,47 @@
 PORTNAME=	openems
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.0.35-97
+PORTREVISION=	1
 DISTVERSIONSUFFIX=	-g0342eef
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Electromagnetic field solver using the EC-FDTD method
 WWW=		https://openems.de/start/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 ONLY_FOR_ARCHS=	amd64 powerpc64 powerpc64le
 ONLY_FOR_ARCHS_REASON=	upstream only supports amd64 and powerpc64
 
 LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 		libCSXCAD.so:cad/csxcad \
 		libexpat.so:textproc/expat2 \
 		libfparser-4.5.so:math/fparser \
 		libhdf5.so:science/hdf5 \
 		libpng16.so:graphics/png \
 		libsz.so:science/libaec \
 		libtiff.so:graphics/tiff \
 		libtinyxml.so:textproc/tinyxml \
 		libvtkCommonCore-${VTK_VER}.so:math/vtk${VTK_VER:R}
 
 USES=		cmake jpeg pkgconfig
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	thliebig
 GH_PROJECT=	openEMS
 
 CMAKE_ARGS=	-DVTK_DIR=${LOCALBASE}/lib/cmake/vtk-${VTK_VER} \
 		-DLOCALBASE=${LOCALBASE}
 
 CXXFLAGS+=	-I${LOCALBASE}/include/fparser # fparser.pc probably returns a wrong value
 
 DATADIR=	${PREFIX}/share/openEMS
 
 post-install:
 	@${REINPLACE_CMD} -i '' -e 's|#!/bin/bash|#!/bin/sh|' ${STAGEDIR}${PREFIX}/bin/openEMS.sh
 
 .include <../../math/vtk9/Makefile.version>
 .include <bsd.port.mk>
diff --git a/science/openkim-models/Makefile b/science/openkim-models/Makefile
index 35563970d860..4bb0a791f5aa 100644
--- a/science/openkim-models/Makefile
+++ b/science/openkim-models/Makefile
@@ -1,19 +1,19 @@
 PORTNAME=	openkim-models
 DISTVERSION=	2021-08-11
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science
 MASTER_SITES=	https://s3.openkim.org/archives/collection/
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Open Knowledgebase of Interatomic Models
 WWW=		https://openkim.org/
 
 LICENSE=	CDDL
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	xxd:editors/vim
 LIB_DEPENDS=	libkim-api.so:science/kim-api
 
 USES=		cmake:noninja compiler:c++11-lang fortran tar:txz
 
 .include <bsd.port.mk>
diff --git a/science/openmc/Makefile b/science/openmc/Makefile
index 685318aedfa5..d77afddceabe 100644
--- a/science/openmc/Makefile
+++ b/science/openmc/Makefile
@@ -1,47 +1,48 @@
 PORTNAME=	openmc
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.13.3
+PORTREVISION=	1
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Monte Carlo neutron and photon transport simulation code
 WWW=		https://openmc.org/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	xtensor>0:math/xtensor
 LIB_DEPENDS=	libfmt.so:devel/libfmt \
 		libhdf5.so:science/hdf5 \
 		libpng16.so:graphics/png \
 		libpugixml.so:textproc/pugixml \
 		libsz.so:science/libaec
 
 USES=		cmake:noninja,testing eigen:3 pkgconfig
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	${PORTNAME}-dev
 GH_TUPLE=	martinmoene:gsl-lite:913e86d:gsl_lite/vendor/gsl-lite # gsl-lite isn't ported yet
 
 CMAKE_OFF=	OPENMC_BUILD_TESTS
 CMAKE_TESTING_ON=	OPENMC_BUILD_TESTS # tests are broken, see https://github.com/openmc-dev/openmc/issues/2449
 
 BINARY_ALIAS=	git=false
 
 OPTIONS_DEFINE=		LIBMESH MPI OPENMP
 OPTIONS_DEFAULT=	MPI OPENMP
 
 LIBMESH_DESC=		Support for libMesh unstructured mesh tallies
 LIBMESH_CMAKE_BOOL=	libmesh
 LIBMESH_LIB_DEPENDS=	libmesh_opt.so:math/libmesh
 
 MPI_VARS=		CXX=${LOCALBASE}/bin/mpic++ # compilation breaks with OpenMPI-{3,4} and LIBMESH=ON
 MPI_BUILD_DEPENDS=	mpich>0:net/mpich
 MPI_RUN_DEPENDS=	mpich>0:net/mpich
 
 OPENMP_CMAKE_BOOL=	openmp
 
 post-install:
 	${RM} -r ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/science/openmodelica/Makefile b/science/openmodelica/Makefile
index 9106edbf6a84..9723a2c336c0 100644
--- a/science/openmodelica/Makefile
+++ b/science/openmodelica/Makefile
@@ -1,120 +1,121 @@
 PORTNAME=	openmodelica
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.20.0
+PORTREVISION=	1
 CATEGORIES=	science cad java
 MASTER_SITES=	https://build.openmodelica.org/omc/bootstrap/:bootstrap
 DISTFILES=	sources.tar.gz:bootstrap
 DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
 
 PATCH_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/commit/
 PATCHFILES=	01b6764df51f4f097d1c2e093e945ebd9a2f15a3.patch:-p1 # backport of https://github.com/OpenModelica/OpenModelica/pull/10261
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Modelica-based modeling and simulation environment
 WWW=		https://openmodelica.org/
 
 LICENSE=	OSMC-PL
 LICENSE_NAME=	Public license for OpenModelica
 LICENSE_TEXT=	See https://github.com/OpenModelica/OpenModelica/blob/master/OSMC-License.txt
 LICENSE_PERMS=	auto-accept dist-mirror dist-sell pkg-mirror pkg-sell
 
 BROKEN_aarch64=	link fails: /usr/local/bin/ld: cannot find -lquadmath: No such file or directory
 BROKEN_i386=	compilation fails: /wrkdirs/usr/ports/science/openmodelica/work/OpenModelica-1.20.0/OMCompiler/3rdParty/libffi/src/x86/sysv.S:841:1: error: changed section flags for .eh_frame, expected: 0x2
 
 BUILD_DEPENDS=	asciidoc:textproc/asciidoc \
 		autoconf>0:devel/autoconf \
 		automake:devel/automake \
 		gmake:devel/gmake \
 		libtool>0:devel/libtool \
 		${LOCALBASE}/include/readline/readline.h:devel/readline
 LIB_DEPENDS=	libboost_filesystem.so:devel/boost-libs \
 		libcurl.so:ftp/curl \
 		libosg.so:graphics/osg \
 		libuuid.so:misc/e2fsprogs-libuuid
 RUN_DEPENDS=	bash:shells/bash \
 		gmake:devel/gmake
 
 USES=		cmake compiler:c++14-lang dos2unix iconv fortran gettext-runtime gl gnome blaslapack localbase:ldflags qt:5 pkgconfig python:build shebangfix
 USE_QT=		concurrent core gui network opengl printsupport svg webkit widgets xml xmlpatterns buildtools:build qmake:build
 USE_GL=		gl opengl
 USE_GNOME=	libxml2
 USE_JAVA=	yes
 USE_LDCONFIG=	${PREFIX}/lib/omc ${PREFIX}/lib/omc/OMSimulator ${PREFIX}/lib/omc/cpp ${PREFIX}/lib/omc/ffi # https://github.com/OpenModelica/OpenModelica/issues/9925
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	OpenModelica
 GH_PROJECT=	OpenModelica
 
 DOS2UNIX_FILES=	OMSimulator/OMTLMSimulator/3rdParty/Makefile \
 		OMCompiler/3rdParty/FMIL/ThirdParty/Expat/expat-2.1.0/CMakeLists.txt
 
 SHEBANG_GLOB=	*.sh *.in *.ac
 SHEBANG_FILES=	OMSimulator/OMTLMSimulator/OMFMISimulatorWrapper/StartTLMOMFMISimulatorWrapper \
 		OMSimulator/OMTLMSimulator/Hopsan/StartTLMHopsan \
 		OMSimulator/testsuite/tlm/StartTLMFmiWrapper \
 		OMSimulator/OMTLMSimulator/FMIWrapper/StartTLMFmiWrapper \
 		OMSimulator/OMTLMSimulator/OpenModelica/StartTLMOpenModelica
 
 GH_TUPLE=	\
 		OpenModelica:OMOptim:4116ef7:OMOptim/OMOptim \
 			OpenModelica:OpenModelica-common:08a0180:OMOptim_common/OMOptim/common \
 		OpenModelica:OMSimulator:af996ad:OMSimulator/OMSimulator \
 			OpenModelica:OMSimulator-3rdParty:6202ca1:OMSimulator_3rdParty/OMSimulator/3rdParty \
 			OpenModelica:OMTLMSimulator:07d5353:OMSimulator_OMTLMSimulator/OMSimulator/OMTLMSimulator \
 		OpenModelica:OMCompiler-3rdParty:a60ba6c:OMCompiler_3rdParty/OMCompiler/3rdParty \
 		OpenModelica:OMSens:66b920b:OMSens/OMSens \
 		OpenModelica:OMSens_Qt:ef85128:OMSens_Qt/OMSens_Qt
 			#OpenModelica:OpenModelica-common:08a0180:OMSens_Qt_common/OMSens_Qt/common
 
 # this should change make program everywhere, but it doesn't,
 # hence the patches in OMCompiler/Compiler/runtime/CMakeLists.txt, OMEdit/OMEditLIB/Simulation/SimulationOutputWidget.cpp
 CMAKE_ARGS=	-DCMAKE_MAKE_PROGRAM=gmake \
 		-DPython_EXECUTABLE=${PYTHON_CMD}
 
 CMAKE_ARGS+=	-DOM_USE_CCACHE:BOOL=${CCACHE_ENABLED:S/yes/ON/:S/no/OFF/} # if refuses to build w/out ccache by default
 
 LDFLAGS+=	-lexecinfo -lintl -pthread
 
 BINARY_ALIAS=	make=${GMAKE} gcc=${FILESDIR}/gcc.sh git=false
 
 CONFLICTS_BUILD=	sundials
 
 post-extract:
 	# remove stray *.orig files
 	@${FIND} ${WRKSRC} -name "*.orig" -delete
 	# remove rtime that isn't used on FreeBSD
 	@${RM} -r ${WRKSRC}/OMSimulator/OMTLMSimulator/3rdParty/rtime
 	# create symlink for sources.tar.gz
 	@${MKDIR} ${WRKSRC}/OMCompiler/Compiler/boot/bomc
 	@${LN} -s ${DISTDIR}/${DIST_SUBDIR}/sources.tar.gz ${WRKSRC}/OMCompiler/Compiler/boot/bomc/sources.tar.gz
 	# workaround for broken fetch
 	@${RLN} ${WRKSRC}/OMOptim/common ${WRKSRC}/OMSens_Qt/common
 
 post-patch:
 	# fix bash shebangs
 	@${REINPLACE_CMD} -e 's|#!/bin/bash|#!${LOCALBASE}/bin/bash|' \
 		${WRKSRC}/OMCompiler/Examples/GenerateDoc.mos \
 		${WRKSRC}/OMCompiler/3rdParty/tbb/build/generate_tbbvars.sh
 	# add path to libgfortran to link flags for OM internal builds
 	@${REINPLACE_CMD} \
 		-e 's|@RT_LDFLAGS_GENERATED_CODE_SIM@|& -L${LOCALBASE}/lib/gcc${FC:S/gfortran//}|' \
 		${WRKSRC}/OMCompiler/Compiler/Util/Autoconf.mo.in
 
 post-install:
 	# workaround for https://github.com/OpenModelica/OpenModelica/issues/9919
 	cd ${STAGEDIR}${PREFIX} && ${CHMOD} +x \
 		bin/OMSimulator bin/OMSimulatorPython3 bin/StartTLMFmiWrapper
 	# remove unnecessary files
 	${RM} -r \
 		${STAGEDIR}${PREFIX}/share/zmq \
 		${STAGEDIR}${PREFIX}/doc \
 		${STAGEDIR}${PREFIX}/share/doc
 	# remove empty directories
 	${FIND} ${STAGEDIR}${PREFIX}/include -type d -empty -delete
 	# strip binaries
 	cd ${STAGEDIR}${PREFIX} && ${STRIP_CMD} \
 		bin/OMSimulator bin/FMIWrapper \
 		lib/omc/OMSimulator/libomtlmsimulator.so lib/omc/OMSimulator/libOMSimulator.so \
 		lib/omc/libomtlmsimulator.so lib/omc/libOMSimulator.so
 
 .include <bsd.port.mk>
diff --git a/science/openmolcas/Makefile b/science/openmolcas/Makefile
index c909b16cadbb..864f9acea101 100644
--- a/science/openmolcas/Makefile
+++ b/science/openmolcas/Makefile
@@ -1,67 +1,67 @@
 PORTNAME=	openmolcas
 DISTVERSION=	22.06
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science # chemistry
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Quantum chemistry software package
 WWW=		https://gitlab.com/Molcas/OpenMolcas
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_armv7=	build breaks: Symbol 'maxfilesize' at (1) has no IMPLICIT type; did you mean 'mxfile'? - see https://gitlab.com/Molcas/OpenMolcas/-/issues/375
 BROKEN_i386=	build breaks: Symbol 'maxfilesize' at (1) has no IMPLICIT type; did you mean 'mxfile'? - see https://gitlab.com/Molcas/OpenMolcas/-/issues/375
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyparsing>0:devel/py-pyparsing@${PY_FLAVOR} \
 		chemps2:science/chemps2
 LIB_DEPENDS=	libhdf5.so:science/hdf5 \
 		libsz.so:science/libaec \
 		libxc.so:science/libxc
 
 USES=		cmake:testing fortran python shebangfix
 USE_GCC=	yes # see https://gitlab.com/Molcas/OpenMolcas/-/issues/351
 
 USE_GITLAB=	yes
 GL_ACCOUNT=	Molcas
 GL_PROJECT=	OpenMolcas
 GL_COMMIT=	17238da5c339c41ddf14ceb88f139d57143d7a14
 
 USE_GITHUB=	nodefault
 GH_TUPLE=	Reference-LAPACK:lapack:aa631b4b:lapack/External/lapack \
 		ilyak:libefp:7d1ff5fd:libefp/External/efp \
 		mcodev31:libmsym:0c47befe:libmsym/External/libmsym \
 		libwfa:libwfa:bbe3392a:libwfa/External/libwfa
 
 SHEBANG_FILES=	sbin/help_doc sbin/help_func sbin/help_basis sbin/setup sbin/verify sbin/version
 SHEBANG_GLOB=	*.py
 
 CMAKE_ON=	CHEMPS2 EFPLIB MSYM # TODO GEN1INT - package doesn't install itself, WFA - breaks due to https://gitlab.com/conradsnicta/armadillo-code/-/issues/216
 CMAKE_ARGS=	-DEXTERNAL_LIBXC:STRING=${LOCALBASE} \
 		-DFREEBSD_PYTHON_VER:STRING=${PYTHON_VER}
 CMAKE_OFF=	BUILD_TESTING
 
 CMAKE_INSTALL_PREFIX=	${DATADIR} # installed into DATADIR because it doesn't respect UNIX file path conventions, see https://gitlab.com/Molcas/OpenMolcas/-/issues/352
 
 BINARY_ALIAS=	cpp=${CPP} # cpp is called from cmake scripts
 BINARY_ALIAS+=	python3=${PYTHON_CMD} # cpp is called from cmake scripts
 
 post-patch:
 	# fix python path
 	@${REINPLACE_CMD} -e "s|'/usr/bin/env python3'|'${PYTHON_CMD}'|" ${WRKSRC}/Tools/pymolcas/export.py
 
 post-install:
 	# remove unused static libraries, see https://gitlab.com/Molcas/OpenMolcas/-/issues/354
 	@${RM} -r ${STAGEDIR}${CMAKE_INSTALL_PREFIX}/lib
 	# remove unnecessary fines
 	@${RM} ${STAGEDIR}${CMAKE_INSTALL_PREFIX}/CONTRIBUTORS.md
 	@${RM} ${STAGEDIR}${CMAKE_INSTALL_PREFIX}/LICENSE
 	# remove empty include directory
 	@${RMDIR} ${STAGEDIR}${DATADIR}/include
 	# remove empty doc directory
 	@${RMDIR} ${STAGEDIR}${DATADIR}/doc
 
 post-test: # A total of 5 test(s) failed, with 3 critical failure(s), see https://gitlab.com/Molcas/OpenMolcas/-/issues/369
 	@cd ${BUILD_WRKSRC} && ${STAGEDIR}${DATADIR}/pymolcas verify
 
 .include <bsd.port.mk>
diff --git a/science/openmx/Makefile b/science/openmx/Makefile
index 0067a982e5fa..73263c984d62 100644
--- a/science/openmx/Makefile
+++ b/science/openmx/Makefile
@@ -1,72 +1,72 @@
 PORTNAME=	openmx
 DISTVERSION=	3.8.5 # the 18June12 patch upgrades 3.8 -> 3.8.5
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	science
 MASTER_SITES=	http://www.openmx-square.org/ \
 		http://www.openmx-square.org/bugfixed/18June12/:patch
 DISTFILES=	${PORTNAME}${DISTVERSION:R}${EXTRACT_SUFX} \
 		patch${DISTVERSION}${EXTRACT_SUFX}:patch # this patch isn't a patch, but a set of file updates
 DIST_SUBDIR=	${PORTNAME}
 EXTRACT_ONLY=	${PORTNAME}${DISTVERSION:R}${EXTRACT_SUFX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Nanoscale material simulations using density functional theories (DFT)
 WWW=		http://www.openmx-square.org/
 
 LICENSE=	GPLv2
 
 BROKEN_i386=	undefined reference to `__atomic_load', see bug#229605 and https://reviews.llvm.org/D42154
 
 LIB_DEPENDS=	libblas.so:math/blas \
 		libfftw3.so:math/fftw3 \
 		liblapack.so:math/lapack \
 		libmpich.so:net/mpich
 
 USES=		dos2unix fortran gmake localbase:ldflags
 USE_CXXSTD=	c++11
 
 DOS2UNIX_FILES=	openmx_common.h
 
 MAKEFILE=	makefile
 
 WRKSRC=		${WRKDIR}/${PORTNAME}${DISTVERSION:R}
 
 CFLAGS+=	-Dkcomp -fcommon
 LDFLAGS+=	-lmpifort
 FFLAGS+=	-fallow-argument-mismatch
 
 WRKSRC_SUBDIR=	source
 
 MAKE_ENV=	MPICH_CC=${CC}
 
 BINARY_ALIAS=	gcc=${CXX}
 
 UTIL_PROGS=	DosMain jx analysis_example esp polB bandgnu13 bin2txt cube2xsf intensity_map md2axsf
 
 PLIST_FILES=	bin/${PORTNAME} ${UTIL_PROGS:C/^/bin\//}
 
 OPTIONS_DEFINE_amd64=	SIMD
 OPTIONS_DEFINE_i386=	SIMD
 OPTIONS_DEFAULT_amd64=	SIMD
 OPTIONS_DEFAULT_i386=	SIMD
 
 SIMD_CFLAGS=		-msse -msse2 -mfpmath=sse
 SIMD_CFLAGS_OFF=	-Dnosse
 CFLAGS+=		${ARCH:S/amd64//:S/i386//:S/${ARCH}/-Dnosse/}
 
 pre-patch: # overlay files before patching
 	@cd ${WRKSRC} && ${TAR} xzf ${DISTDIR}/${DIST_SUBDIR}/patch${DISTVERSION}${EXTRACT_SUFX}
 
 post-patch:
 	@cd ${WRKSRC} && ${REINPLACE_CMD} 's|DFT_DATA_PATH|"${DATADIR}/DFT_DATA13"|' Input_std.c check_lead.c SetPara_DFT.c OutData.c OutData_Binary.c
 
 post-install:
 .for u in ${UTIL_PROGS}
 	${INSTALL_PROGRAM} ${WRKSRC}/${u} ${STAGEDIR}${PREFIX}/bin
 .endfor
 	cd ${WRKSRC}/.. && ${COPYTREE_SHARE} DFT_DATA13 ${STAGEDIR}${DATADIR}
 	# autoplist for potentials: about 500 files in DATADIR
 	@cd ${STAGEDIR}${PREFIX} && \
 		${FIND} ${DATADIR:S/^${PREFIX}\///} -type f >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/science/opensim-core/Makefile b/science/opensim-core/Makefile
index 1b9bf1ca74b4..585b30dae8ca 100644
--- a/science/opensim-core/Makefile
+++ b/science/opensim-core/Makefile
@@ -1,55 +1,55 @@
 PORTNAME=	OpenSim
 DISTVERSION=	4.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	science
 PKGNAMESUFFIX=	-core
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Software for modeling of musculoskeletal structures
 WWW=		https://opensim.stanford.edu/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BUILD_DEPENDS=	bash:shells/bash
 LIB_DEPENDS=	libdocopt.so:devel/docopt.cpp \
 		libSimTKcommon.so:science/simbody
 
 USES=		blaslapack:openblas cmake compiler:c++11-lib fortran gl shebangfix xorg # fortran only for simbody/openblas
 SHEBANG_FILES=	Applications/opensim-install-command-line.sh
 USE_GITHUB=	yes
 GH_ACCOUNT=	${PORTNAME:tl}-org
 GH_PROJECT=	${PORTNAME:tl}-core
 USE_GL=		gl glu glut
 USE_XORG=	xi xmu
 USE_LDCONFIG=	yes
 
 CXXFLAGS+=	-I${LOCALBASE}/include/docopt
 CONFIGURE_ENV+=	SIMBODY_HOME=${LOCALBASE}
 CMAKE_OFF=	OPENSIM_COPY_DEPENDENCIES DO_TESTING
 
 OPTIONS_DEFINE=		PYTHON JAVA DOCS
 OPTIONS_DEFAULT=	PYTHON JAVA
 OPTIONS_SUB=		yes
 
 PYTHON_CMAKE_BOOL=	BUILD_PYTHON_WRAPPING
 PYTHON_USES=		python
 PYTHON_BUILD_DEPENDS=	swig:devel/swig
 
 JAVA_CMAKE_BOOL=	BUILD_JAVA_WRAPPING
 JAVA_CMAKE_ON=		-DJAVA_AWT_LIBRARY=${LOCALBASE}/openjdk8/jre/lib/amd64/libawt.so \
 			-DJAVA_JVM_LIBRARY=${LOCALBASE}/openjdk8/jre/lib/amd64/server/libjvm.so \
 			-DJAVA_INCLUDE_PATH=${LOCALBASE}/openjdk8/include
 JAVA_USE=		JAVA=yes
 JAVA_BUILD_DEPENDS=	swig:devel/swig
 
 DOCS_CMAKE_BOOL=	INSTALL_DOCS
 PORTDOCS=		*
 
 do-test: # 4 testcases are known to fail: https://github.com/opensim-org/opensim-core/issues/2379
 	@cd ${BUILD_WRKSRC} && \
 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DDO_TESTING=ON ${CMAKE_SOURCE_PATH} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
 
 .include <bsd.port.mk>
diff --git a/science/opensph/Makefile b/science/opensph/Makefile
index d7fbe7bd95a9..a7b7dbd37458 100644
--- a/science/opensph/Makefile
+++ b/science/opensph/Makefile
@@ -1,77 +1,77 @@
 PORTNAME=	OpenSPH
 DISTVERSION=	0.4.0
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Library and graphical tools for running SPH and N-body simulations
 WWW=		https://gitlab.com/sevecekp/sph
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 ONLY_FOR_ARCHS=	amd64 i386
 ONLY_FOR_ARCHS_REASON=	unconditional use of -msse4.1 and inclusion of immintrin.h
 
 TEST_DEPENDS=	catch>0:devel/catch
 
 USES=		compiler:c++14-lang qmake qt:5
 USE_GITLAB=	yes
 USE_WX=		3.2
 
 GL_SITE=	https://gitlab.com
 GL_ACCOUNT=	sevecekp
 GL_PROJECT=	sph
 GL_COMMIT=	a8aac69f63e38d45339ddbc87855f77a71b2459d
 
 QMAKE_SOURCE_PATH=	${WRKSRC}/sph.pro
 QMAKE_ARGS=		CONFIG+=release
 
 CXXFLAGS+=	-DSPH_CONFIG_SET
 
 TEST_WRKSRC=	${WRKDIR}/test
 
 BINARY_ALIAS=	wx-config=${LOCALBASE}/bin/wxgtk3u-3.2-config
 
 PLIST_FILES=	bin/opensph bin/opensph-cli bin/opensph-info
 
 OPTIONS_DEFINE=			CHAISCRIPT EIGEN HDF5 OPENMP TBB VDB
 OPTIONS_DEFAULT=		CHAISCRIPT EIGEN HDF5 OPENMP TBB VDB
 
 CHAISCRIPT_DESC=		Be able to read and modify particle data from a script
 CHAISCRIPT_QMAKE_ON=		CONFIG+=use_chaiscript
 CHAISCRIPT_BUILD_DEPENDS=	${LOCALBASE}/include/chaiscript/chaiscript.hpp:lang/chaiscript
 
 EIGEN_DESC=			Eigen for additional methods to set up initial conditions
 EIGEN_QMAKE_ON=			CONFIG+=use_eigen
 EIGEN_USES=			eigen:3
 
 HDF5_DESC=			Be able to read files generated by miluphcuda code
 HDF5_QMAKE_ON=			CONFIG+=use_hdf5
 HDF5_LIB_DEPENDS=		libhdf5.so:science/hdf5
 
 OPENMP_QMAKE_ON=		CONFIG+=use_openmp
 
 TBB_DESC=			Parallelize with Intel Threading Building Blocks
 TBB_QMAKE_ON=			CONFIG+=use_tbb
 TBB_LIB_DEPENDS=		libtbb.so:devel/onetbb
 
 VDB_DESC=			Use OpenVDB for converting particles to volumetric data
 VDB_QMAKE_ON=			CONFIG+=use_vdb
 VDB_LIB_DEPENDS=		libImath.so:math/Imath \
 				libopenvdb.so:misc/openvdb \
 				libtbb.so:devel/onetbb
 
 do-test:
 	@${REINPLACE_CMD} -e 's|Path(.*|Path("${TEST_WRKSRC}");|' ${WRKSRC}/test/utils/Config.h
 	@${MKDIR} ${TEST_WRKSRC}
 	@cd ${_QMAKE_WRKSRC} && \
 		${SETENV} ${QMAKE_ENV} ${_QMAKE} ${QMAKE_ARGS}  \
 			${WRKSRC}/test.pro \
 			${QMAKE_CONFIGURE_ARGS:?--:} ${QMAKE_CONFIGURE_ARGS}
 	@cd ${BUILD_WRKSRC}  && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${_MAKE_JOBS} ${MAKE_ARGS}
 	@cd ${TEST_WRKSRC}  && \
 		${WRKSRC}/test/test
 
 .include <bsd.port.mk>
diff --git a/science/p5-Mcstas-Tools/Makefile b/science/p5-Mcstas-Tools/Makefile
index 79c44aba52bd..11d81787f725 100644
--- a/science/p5-Mcstas-Tools/Makefile
+++ b/science/p5-Mcstas-Tools/Makefile
@@ -1,52 +1,52 @@
 PORTNAME=	Mcstas-Tools
 PORTVERSION=	2.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science
 MASTER_SITES=	http://download.mcstas.org/mcstas-${PORTVERSION}/unix/
 PKGNAMEPREFIX=	p5-
 DISTFILES=	mcstas-tools-perl-${PORTVERSION}-src.tar.gz \
 		mcstas-tools-perl-cmdline-${PORTVERSION}-src.tar.gz
 
 MAINTAINER=	erkn@fysik.dtu.dk
 COMMENT=	Perl based tools for the McStas neutron ray tracing package
 WWW=		https://www.mcstas.org
 
 LICENSE=	GPLv2
 
 RUN_DEPENDS=	mcstas:science/mcstas \
 		p5-PGPLOT>=2.21:graphics/p5-PGPLOT \
 		p5-Tk>0:x11-toolkits/p5-Tk \
 		PDL>0:math/PDL
 
 USES=		cmake perl5 shebangfix
 
 NO_WRKSUBDIR=	yes
 CMAKE_ARGS=	-Denable_mcstas=1
 SHEBANG_GLOB=	*.pl
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
 EXECS=		mcdaemon.pl mcdisplay.pl mcdoc.pl mcformatgui.pl mcgui.pl \
 		mcplot.pl mcresplot.pl mcrun.pl mcrun.pl mcstas2vitess.pl
 WRKSRC_SUBDIRS=	${DISTFILES:S/.tar.gz$//}
 
 do-configure:
 .for f in ${WRKSRC_SUBDIRS}
 	 @${ECHO_MSG} ${_CMAKE_MSG}
 	 ${MKDIR} ${WRKSRC}/${f}/.build
 	 @cd ${WRKSRC}/${f}/.build; ${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} ..
 .endfor
 
 do-build:
 .for f in ${WRKSRC_SUBDIRS}
 	 @cd ${WRKSRC}/${f}/.build; ${DO_MAKE_BUILD} ${ALL_TARGET}
 .endfor
 
 do-install:
 .for f in ${WRKSRC_SUBDIRS}
 	@(cd ${WRKSRC}/${f}/.build && ${SETENV} ${MAKE_ENV} ${FAKEROOT} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
 .endfor
 .for e in ${EXECS}
 	${RLN} ${STAGEDIR}/${PREFIX}/mcstas/${PORTVERSION}/bin/${e} ${STAGEDIR}${PREFIX}/bin/${e}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/science/packmol/Makefile b/science/packmol/Makefile
index 9bc1a8ae9d98..a591f8ec2a4b 100644
--- a/science/packmol/Makefile
+++ b/science/packmol/Makefile
@@ -1,18 +1,19 @@
 PORTNAME=	packmol
 DISTVERSION=	18.169
+PORTREVISION=	1
 CATEGORIES=	science
 
 MAINTAINER=	jwb@FreeBSD.org
 COMMENT=	Pack molecules in defined regions of space
 WWW=		http://m3g.iqm.unicamp.br/packmol/home.shtml
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		cmake:noninja fortran
 USE_GITHUB=	yes
 GH_ACCOUNT=	mcubeg
 
 PLIST_FILES=	bin/packmol
 
 .include <bsd.port.mk>
diff --git a/science/pagmo2/Makefile b/science/pagmo2/Makefile
index 5fb460260c41..baf985e870fd 100644
--- a/science/pagmo2/Makefile
+++ b/science/pagmo2/Makefile
@@ -1,33 +1,34 @@
 PORTNAME=	pagmo2
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.19.0
+PORTREVISION=	1
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Platform to perform parallel computations of optimization tasks
 WWW=		https://esa.github.io/pagmo2/
 
 LICENSE=	GPLv3 LGPL3
 LICENSE_COMB=	dual
 LICENSE_FILE_GPLv3=	${WRKSRC}/COPYING.gpl3
 LICENSE_FILE_LGPL3=	${WRKSRC}/COPYING.lgpl3
 
 LIB_DEPENDS=	libboost_serialization.so:devel/boost-libs \
 		libipopt.so:math/ipopt \
 		libnlopt.so:math/nlopt \
 		libtbb.so:devel/onetbb
 
 USES=		cmake compiler:c++17-lang eigen:3,build,run
 USE_GITHUB=	yes
 GH_ACCOUNT=	esa
 USE_LDCONFIG=	yes
 
 CMAKE_ON=	PAGMO_WITH_EIGEN3 PAGMO_WITH_NLOPT PAGMO_WITH_IPOPT PAGMO_ENABLE_IPO
 
 do-test:
 	@cd ${BUILD_WRKSRC} && \
 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DPAGMO_BUILD_TESTS:BOOL=ON ${CMAKE_SOURCE_PATH} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
 
 .include <bsd.port.mk>
diff --git a/science/paraview/Makefile b/science/paraview/Makefile
index 09605ed9cb29..d8eae6d8074f 100644
--- a/science/paraview/Makefile
+++ b/science/paraview/Makefile
@@ -1,169 +1,169 @@
 PORTNAME=	paraview
 DISTVERSION=	${PARAVIEW_VER}.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science graphics
 MASTER_SITES=	http://www.paraview.org/files/v${PARAVIEW_VER}/
 DISTNAME=	ParaView-v${PORTVERSION}
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Powerful scientific data visualization application
 WWW=		https://www.paraview.org/
 
 LICENSE=	ParaView_License_1.2
 LICENSE_NAME=	ParaView_License
 LICENSE_FILE=	${WRKSRC}/License_v1.2.txt
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 BROKEN_aarch64=	fails to link: undefined reference to `sbrk'
 
 BUILD_DEPENDS=	${PYNUMPY}	\
 		cli11>0:devel/cli11	\
 		utf8cpp>0:devel/utf8cpp	\
 		nlohmann-json>0:devel/nlohmann-json	\
 		${LOCALBASE}/include/exprtk.hpp:math/exprtk	\
 		${PYTHON_SITELIBDIR}/matplotlib/pyplot.py:math/py-matplotlib@${PY_FLAVOR}
 LIB_DEPENDS=	libhdf5.so:science/hdf5 \
 		libpng.so:graphics/png \
 		libtiff.so:graphics/tiff \
 		libfreetype.so:print/freetype2 \
 		libexpat.so:textproc/expat2 \
 		libjbig.so:graphics/jbigkit \
 		liborc-0.4.so:devel/orc \
 		libpcre.so:devel/pcre \
 		libicuuc.so:devel/icu \
 		libffi.so:devel/libffi \
 		liblas.so:devel/liblas \
 		libtbb.so:devel/onetbb \
 		libogg.so:audio/libogg \
 		libgl2ps.so:print/gl2ps \
 		libOT.so:math/openturns \
 		libgdal.so:graphics/gdal \
 		libgeos.so:graphics/geos \
 		libhpdf.so:print/libharu \
 		libproj.so:graphics/proj \
 		libpdal_base.so:math/pdal \
 		libdrm.so:graphics/libdrm \
 		libcgns.so:science/cgnslib \
 		liblz4.so:archivers/liblz4 \
 		libverdict.so:math/verdict \
 		libnetcdf.so:science/netcdf \
 		libjsoncpp.so:devel/jsoncpp \
 		libprotobuf.so:devel/protobuf \
 		libpugixml.so:textproc/pugixml \
 		libavutil.so:multimedia/ffmpeg \
 		libcgraph.so:graphics/graphviz \
 		libtheora.so:multimedia/libtheora \
 		libgeotiff.so:graphics/libgeotiff \
 		libboost_thread.so:devel/boost-libs \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libdouble-conversion.so:devel/double-conversion
 RUN_DEPENDS=	${PYNUMPY}	\
 		bash:shells/bash	\
 		vtk${VTK_VER:R}>0:math/vtk${VTK_VER:R} \
 		${PYTHON_SITELIBDIR}/matplotlib/pyplot.py:math/py-matplotlib@${PY_FLAVOR}
 
 USES=		alias cmake compiler:c11 eigen:3 fortran gl gnome jpeg localbase	\
 		pkgconfig python qt:5 shebangfix sqlite tar:xz xorg
 USE_GL=		gl glew glu glut
 USE_GNOME=	libxml2
 USE_QT=		buildtools:build core gui help network opengl qmake:build sql svg	\
 		webengine widgets x11extras xmlpatterns
 USE_XORG=	ice sm x11 xau xcb xcursor xdamage xdmcp xext xfixes xorgproto xrender	\
 		xxf86vm
 USE_LDCONFIG=	yes
 
 CMAKE_ARGS+=	-DPARAVIEW_BUILD_SHARED_LIBS=ON \
 		-DPARAVIEW_BUILD_WITH_EXTERNAL=ON \
 		-DVTK_HAVE_GETSOCKNAME_WITH_SOCKLEN_T=1 \
 		-DPARAVIEW_USE_PYTHON:BOOL=ON \
 		-DPARAVIEW_ENABLE_FFMPEG:BOOL=ON \
 		-DPARAVIEW_ENABLE_LAS:BOOL=ON \
 		-DPARAVIEW_ENABLE_WEB:BOOL=ON \
 		-DPARAVIEW_ENABLE_GDAL:BOOL=ON \
 		-DPARAVIEW_ENABLE_PDAL:BOOL=ON \
 		-DPARAVIEW_ENABLE_OPENTURNS:BOOL=ON \
 		-DPARAVIEW_ENABLE_OPENTURNS:BOOL=ON \
 		-DPARAVIEW_ENABLE_MOTIONFX:BOOL=ON \
 		-DPARAVIEW_ENABLE_XDMF2:BOOL=ON \
 		-DPARAVIEW_ENABLE_XDMF3:BOOL=ON \
 		-DVTK_MODULE_USE_EXTERNAL_VTK_fmt:BOOL=OFF \
 		-DVTK_MODULE_USE_EXTERNAL_VTK_ioss:BOOL=OFF \
 		-DVTK_MODULE_USE_EXTERNAL_VTK_pegtl=OFF \
 		-DVTK_MODULE_USE_EXTERNAL_ParaView_vtkcatalyst:BOOL=OFF \
 		-DExternalData_OBJECT_STORES="${WRKDIR}/VTK/ExternalData/MD5" \
 		-DFREETYPE_INCLUDE_DIRS="${LOCALBASE}/include/freetype2"
 .if !defined(MAINTAINER_MODE)
 CMAKE_ARGS+=	-DVTK_FORBID_DOWNLOADS:BOOL=ON
 .endif
 MAKE_ENV=	XDG_CONFIG_HOME=${WRKDIR}
 
 SHEBANG_GLOB=	*.py
 SHEBANG_FILES=	VTK/Examples/SearchScript.sh	\
 		VTK/Utilities/Maintenance/*.sh	\
 		Clients/CommandLineExecutables/paraview-config.in
 
 OPTIONS_DEFINE=	DOCS EXAMPLES MPI OSMESA
 OPTIONS_SUB=	yes
 OSMESA_DESC=	Use Mesa for off-screen rendering
 
 # mpi4py and other programs must be compiled against the same MPI provider
 MPI_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mpi4py>0:net/py-mpi4py@${PY_FLAVOR}
 MPI_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mpi4py>0:net/py-mpi4py@${PY_FLAVOR}
 MPI_USES=		mpi # mpich is set by default, use mpi:openmpi if needed
 MPI_CMAKE_ON=		-DPARAVIEW_USE_MPI:BOOL=ON
 MPI_CMAKE_OFF=		-DPARAVIEW_USE_MPI:BOOL=OFF
 
 OSMESA_LIB_DEPENDS=	libOSMesa.so:graphics/libosmesa
 OSMESA_USES_OFF=	desktop-file-utils
 OSMESA_CMAKE_BOOL=	VTK_OPENGL_HAS_OSMESA
 OSMESA_CMAKE_ON=	-DVTK_USE_X:BOOL="OFF" \
 			-DOSMESA_INCLUDE_DIR:PATH=${LOCALBASE}/include/Mesa \
 			-DOSMESA_LIBRARY:FILEPATH=${LOCALBASE}/lib/libOSMesa.so
 OSMESA_CMAKE_OFF=	-DVTK_USE_X:BOOL="ON"
 
 EXAMPLES_CMAKE_BOOL=	PARAVIEW_ENABLE_EXAMPLES
 PORTEXAMPLES=		*
 
 #TEST_CMAKE_ON=		-DPARAVIEW_BUILD_TESTING=WANT	\
 			-DPARAVIEW_BUILD_VTK_TESTING=WANT
 
 # Error with ADIOS2
 #LIB_DEPENDS+=	libadios2_c.so:misc/adios2
 #CMAKE_ARGS+=	-DPARAVIEW_ENABLE_ADIOS2:BOOL=ON
 # Missing GenericIO for CosmoTools
 #CMAKE_ARGS+=	-DPARAVIEW_ENABLE_COSMOTOOLS:BOOL=ON
 # Errors with VisItBridge / VisItLib
 #CMAKE_ARGS+=	-DPARAVIEW_ENABLE_VISITBRIDGE:BOOL=ON
 # MomentInvariants needs to download a module
 #CMAKE_ARGS+=	-DPARAVIEW_ENABLE_MOMENTINVARIANTS:BOOL=ON
 # No package for graphics/ospray
 #LIB_DEPENDS+=	libospray.so:graphics/ospray
 #CMAKE_ARGS+=	-DPARAVIEW_ENABLE_RAYTRACING
 
 PLIST_SUB+=	VERMAJORMINOR=${PARAVIEW_VER}
 
 VTK9_CONFLICTS=	vtk.py vtkmodules/__init__.py vtkmodules/all.py	\
 		vtkmodules/gtk vtkmodules/numpy_interface	\
 		vtkmodules/qt vtkmodules/test vtkmodules/tk	\
 		vtkmodules/util vtkmodules/wx vtkmodules/generate_pyi.py	\
 		vtkmodules/web/errors.py
 
 pre-configure:
 	${REINPLACE_CMD} -e 's|png_set_gray_1_2_4_to_8|png_set_expand_gray_1_2_4_to_8|' \
 		${PATCH_WRKSRC}/VTK/IO/Image/vtkPNGReader.cxx
 	${REINPLACE_CMD} -e 's|/bin/bash|${LOCALBASE}/bin/bash|'	\
 		${PATCH_WRKSRC}/VTK/Utilities/Maintenance/vtk_site_history.py
 
 post-install:
 	# vtk9 is not a real run dependency, but it installs several common files
 .for py in ${VTK9_CONFLICTS}
 	${RM} -r ${STAGEDIR}${PYTHON_SITELIBDIR}/${py}
 .endfor
 
 post-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/Examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
 
 .include <./Makefile.version>
 .include <../../math/vtk9/Makefile.version>
 .include <bsd.port.mk>
diff --git a/science/pastix/Makefile b/science/pastix/Makefile
index 2e1b2093deab..0996af03bb1f 100644
--- a/science/pastix/Makefile
+++ b/science/pastix/Makefile
@@ -1,48 +1,49 @@
 PORTNAME=	pastix
 PORTVERSION=	6.2.2
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	science
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	PaStiX: a sparse direct solver
 WWW=		https://solverstack.gitlabpages.inria.fr/pastix/
 
 LICENSE=	LGPL3
 
 BUILD_DEPENDS=	bash:shells/bash	\
 		${PYNUMPY}
 LIB_DEPENDS=	libcblas.so:math/cblas	\
 		libmetis.so:math/metis	\
 		libscotch.so:cad/scotch	\
 		liblapacke.so:math/lapacke	\
 		libhwloc.so:devel/hwloc2
 RUN_DEPENDS=	bash:shells/bash	\
 		${PYNUMPY}
 
 USES=		cmake blaslapack:openblas fortran pkgconfig python
 
 USE_GITLAB=	yes
 GL_SITE=	https://gitlab.inria.fr/
 GL_ACCOUNT=	solverstack
 GL_PROJECT=	pastix spm:s morse_cmake:m
 GL_COMMIT=	6e35c2ba179013b058f5d4e1afd4b451953149c6	\
 		14e36c1586c9ba13f938b1a89f51c080d6551392:s	\
 		31cd2bbb0d76f2b9fd83011d8f079d97540b0ba8:m
 GL_SUBDIR=	spm:s cmake_modules/morse_cmake:m
 
 CMAKE_ARGS=	-DBUILD_SHARED_LIBS:BOOL=ON	\
 		-DPASTIX_ORDERING_METIS:BOOL=ON
 USE_LDCONFIG=	yes
 TEST_TARGET=	test
 
 OPTIONS_DEFINE=	EXAMPLES
 EX2FIX=		example spm/examples spm/wrappers/fortran90 spm/wrappers/python	\
 		wrappers/fortran90 wrappers/python example/old
 
 pre-configure:
 .for ex in ${EX2FIX}
 	${REINPLACE_CMD} -e 's|DESTINATION examples|DESTINATION ${EXAMPLESDIR}/${ex:C/examples//:C/example//}|'	\
 		${WRKSRC}/${ex}/CMakeLists.txt
 .endfor
 
 .include <bsd.port.mk>
diff --git a/science/pcmsolver/Makefile b/science/pcmsolver/Makefile
index 88bd4167f924..a82b52073727 100644
--- a/science/pcmsolver/Makefile
+++ b/science/pcmsolver/Makefile
@@ -1,33 +1,34 @@
 PORTNAME=	pcmsolver
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.3.0
+PORTREVISION=	1
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	API for the Polarizable Continuum Model
 WWW=		https://github.com/PCMSolver/pcmsolver
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		cmake compiler:c11 fortran python
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	PCMSolver
 
 BINARY_ALIAS=	git=true # see https://github.com/PCMSolver/pcmsolver/issues/198
 
 do-configure: # full CMAKE_ARGS breaks configure: -DCMAKE_EXE_LINKER_FLAGS="${LDFLAGS}" causes configure to fail to find fortran's libraries
 	@${MKDIR} ${CONFIGURE_WRKSRC}
 	@cd ${CONFIGURE_WRKSRC} && \
 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} \
 			-DCMAKE_BUILD_TYPE:STRING="Release" \
 			-DCMAKE_C_FLAGS_RELEASE:STRING="${CFLAGS}" \
 			-DCMAKE_CXX_FLAGS_RELEASE:STRING="${CXXFLAGS}" \
 			-DCMAKE_C_COMPILER:STRING="${CC}" \
 			-DCMAKE_CXX_COMPILER:STRING="${CXX}" \
 			-DPYTHON_INTERPRETER:STRING="${PYTHON_CMD}" \
 			${CMAKE_SOURCE_PATH}
 
 .include <bsd.port.mk>
diff --git a/science/plumed/Makefile b/science/plumed/Makefile
index 42cf1557b32c..5543d2937068 100644
--- a/science/plumed/Makefile
+++ b/science/plumed/Makefile
@@ -1,48 +1,49 @@
 PORTNAME=	plumed
 DISTVERSION=	2.8.0
+PORTREVISION=	1
 CATEGORIES=	science graphics
 MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}2/releases/download/v${DISTVERSION}/
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	PLUgin for MolEcular Dynamics
 WWW=		https://www.plumed.org/
 
 LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/COPYING.LESSER
 
 BROKEN_i386=	undefined reference to `__atomic_load'
 
 BUILD_DEPENDS=	bash:shells/bash
 LIB_DEPENDS=	libblas.so:math/blas \
 		libfftw3.so:math/fftw3 \
 		libgsl.so:math/gsl \
 		liblapack.so:math/lapack
 RUN_DEPENDS=	bash:shells/bash
 TEST_DEPENDS=	gawk:lang/gawk
 
 USES=		autoreconf compiler:c++11-lang gmake localbase pkgconfig shebangfix tar:tgz
 USE_LDCONFIG=	yes
 
 SHEBANG_GLOB=	*.sh
 SHEBANG_FILES=	src/maketools/makecmd \
 		src/maketools/xxd \
 		regtest/scripts/check \
 		regtest/scripts/run \
 		regtest/scripts/what
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared --disable-python
 
 TEST_TARGET=	check # the 'installcheck' target checks installed version
 # 1 test is known to fail: https://github.com/plumed/plumed2/issues/782
 
 BINARY_ALIAS=	make=${GMAKE} # only needed for tests
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|#! /bin/bash|#! ${LOCALBASE}/bin/bash|' ${WRKSRC}/src/lib/Makefile
 
 post-install:
 	@${RMDIR} ${STAGEDIR}${PREFIX}/lib/plumed/obj
 	@cd ${STAGEDIR}${PREFIX} && ${STRIP_CMD} bin/plumed lib/plumed/plumed-runtime lib/libplumed.so lib/libplumedKernel.so
 
 .include <bsd.port.mk>
diff --git a/science/pnetcdf/Makefile b/science/pnetcdf/Makefile
index b2040297690b..689427acbc1e 100644
--- a/science/pnetcdf/Makefile
+++ b/science/pnetcdf/Makefile
@@ -1,47 +1,48 @@
 PORTNAME=	pnetcdf
 PORTVERSION=	1.12.3
+PORTREVISION=	1
 CATEGORIES=	science parallel
 MASTER_SITES=	https://parallel-netcdf.github.io/Release/ \
 		LOCAL/sunpoet
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Library providing high-performance I/O
 WWW=		https://parallel-netcdf.github.io/
 
 USES=		fortran gmake libtool pathfix perl5
 USE_PERL5=	build
 
 CFLAGS+=	-fPIC
 CONFIGURE_ARGS=	--with-mpi=${MPI_HOME} ac_cv_fc_compiler_nag=no
 GNU_CONFIGURE=	yes
 MAKE_JOBS_UNSAFE=	yes
 
 CONFLICTS_INSTALL=	hdf-4.*
 
 OPTIONS_SINGLE=	MPI
 OPTIONS_SINGLE_MPI=	OPENMPI MPICH
 OPTIONS_DEFAULT=OPENMPI
 OPTIONS_DEFAULT_armv6=	MPICH
 OPTIONS_DEFAULT_armv7=	MPICH
 OPTIONS_DEFAULT_i386=	MPICH
 OPTIONS_DEFAULT_powerpc=MPICH
 OPTIONS_EXCLUDE_armv6=	OPENMPI
 OPTIONS_EXCLUDE_armv7=	OPENMPI
 OPTIONS_EXCLUDE_i386=	OPENMPI
 OPTIONS_EXCLUDE_powerpc=OPENMPI
 
 MPICH_USES=	mpi:mpich
 OPENMPI_USES=	mpi:openmpi
 
 .include <bsd.port.pre.mk>
 
 .if ${GCC_DEFAULT} >= 10
 # Workaround for Type mismatch between actual argument at (1) and actual argument at (2) (INTEGER(8)/CHARACTER(*)).
 FCFLAGS+=	-fallow-argument-mismatch
 .endif
 
 .if (${ARCH} == armv6 || ${ARCH} == armv7 || ${ARCH} == i386 || ${ARCH} == powerpc) && ${PORT_OPTIONS:MOPENMPI}
 BROKEN=		Use MPICH option instead. PnetCDF requires MPI_Offset >= 8 but Open MPI sets MPI_Offset to 4 on 32-bit architecture regardless of LFS. See https://github.com/open-mpi/ompi/issues/3195 for details
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/science/polytope/Makefile b/science/polytope/Makefile
index cfc938fe27b1..78a3437079b3 100644
--- a/science/polytope/Makefile
+++ b/science/polytope/Makefile
@@ -1,32 +1,33 @@
 PORTNAME=	polytope
 DISTVERSION=	0.7.0
+PORTREVISION=	1
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Library for generating Voronoi and Voronoi-like tessellations
 WWW=		https://github.com/pbtoast/polytope
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${LOCALBASE}/include/boost/geometry.hpp:devel/boost-libs
 LIB_DEPENDS=	libsz.so:science/libaec
 
 USES=		cmake:testing
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	pbtoast
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 CMAKE_OFF=	TESTING
 CMAKE_TESTING_ON=	TESTING # 1 test is known to fail, see https://github.com/pbtoast/polytope/issues/18
 
 OPTIONS_DEFINE=		SILO
 OPTIONS_DEFAULT=	SILO
 
 SILO_DESC=		Use SILO reader/writer
 SILO_CMAKE_BOOL=	USE_SILO
 SILO_LIB_DEPENDS=	libsiloh5.so:science/silo
 
 .include <bsd.port.mk>
diff --git a/science/precice/Makefile b/science/precice/Makefile
index 7a9da2b722b7..8a30a4dc97f9 100644
--- a/science/precice/Makefile
+++ b/science/precice/Makefile
@@ -1,44 +1,44 @@
 PORTNAME=	precice
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.5.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science # physics
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Coupling library for partitioned multi-physics simulations
 WWW=		https://precice.org/
 
 LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 		libmpicxx.so:net/mpich
 
 USES=		cmake:noninja,testing compiler:c++14-lang eigen:3 gnome pkgconfig # fails with ninja: phony target 'binprecice' names itself as an input; ignoring
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 
 CMAKE_OFF=	BUILD_TESTING PRECICE_ENABLE_FORTRAN PRECICE_PythonActions
 
 OPTIONS_DEFINE=	MPI PETSC EXAMPLES
 
 MPI_CMAKE_BOOL=		PRECICE_MPICommunication
 MPI_BUILD_DEPENDS=	openmpi>0:net/openmpi
 MPI_RUN_DEPENDS=	openmpi>0:net/openmpi
 MPI_BROKEN=		all tests crash with MPI, see https://github.com/precice/precice/issues/1331
 
 PETSC_DESC=		Use PETSc linear algebra library
 PETSC_CMAKE_BOOL=	PRECICE_PETScMapping
 PETSC_LIB_DEPENDS=	libpetsc.so:science/PETSc
 PETSC_IMPLIES=		MPI
 
 PORTEXAMPLES=		*
 
 # 3 tests time out, see https://github.com/precice/precice/issues/1331
 
 post-install: # remove files which aren't docs
 	@${RM} -r ${STAGEDIR}${PREFIX}/share/doc
 
 .include <bsd.port.mk>
diff --git a/science/psi4/Makefile b/science/psi4/Makefile
index 20867840049c..622a66b64629 100644
--- a/science/psi4/Makefile
+++ b/science/psi4/Makefile
@@ -1,98 +1,99 @@
 PORTNAME=	psi4
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.7
+PORTREVISION=	1
 CATEGORIES=	science # quantum-chemistry
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Open-source suite of ab initio quantum chemistry programs
 WWW=		https://psicode.org/
 
 LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 PY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gau2grid>0:math/py-gau2grid@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}optking>0:science/py-optking@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}qcelemental>0:science/py-qcelemental@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}qcengine>0:science/py-qcengine@${PY_FLAVOR}
 BUILD_DEPENDS=	boost-libs>0:devel/boost-libs \
 		${LOCALBASE}/include/pybind11/pybind11.h:devel/pybind11 \
 		${PY_DEPENDS} \
 		libint2-psi4>0:science/libint2-psi4 # has to be this library
 LIB_DEPENDS=	libgg.so:math/gau2grid \
 		libxc.so:science/libxc
 RUN_DEPENDS=	${PY_DEPENDS} \
 		libint2-psi4>0:science/libint2-psi4
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}
 
 USES=		blaslapack:openblas cmake compiler:c++17-lang eigen:3 fortran localbase:ldflags python:3.8+
 USE_GITHUB=	yes
 
 CMAKE_ARGS=	-DLibxc_DIR=${LOCALBASE} \
 		-DFREEBSD_PYTHON_VER=${PYTHON_VER} \
 		-DPython_EXECUTABLE=${PYTHON_CMD} \
 		-DPYMOD_INSTALL_LIBDIR=${PYTHONPREFIX_SITELIBDIR:S|${PREFIX}/lib||}
 CONFIGURE_ENV=	FREEBSD_PYTHON_VER=${PYTHON_VER}
 
 LDFLAGS+=	-lexecinfo # for backtrace_symbols
 
 TEST_ENV=	${MAKE_ENV} \
 		PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}:${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/psi4/tests \
 		PSIDATADIR=${STAGEDIR}${DATADIR} \
 		PSIPATH=${STAGEDIR}${DATADIR}/basis
 
 BINARY_ALIAS=	python=${PYTHON_CMD} # only for tests
 
 OPTIONS_DEFINE=	NATIVE
 
 NATIVE_CMAKE_BOOL=	ENABLE_XHOST
 
 post-patch:
 	# correct the default data dir
 	@${REINPLACE_CMD} \
 		-E 's|%%DATADIR%%|${DATADIR}|' \
 		${WRKSRC}/psi4/run_psi4.py
 
 do-install: # project fails to install itself into a stage directory due to a convoluted cmake code structure (DESTDIR isn't handled correctly)
 	# main
 	cd ${BUILD_WRKSRC}/stage && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}
 	${FIND} ${STAGEDIR}${PREFIX} -name "*.pyc" -delete
 	# samples
 	cd ${WRKSRC} && ${COPYTREE_SHARE} samples ${STAGEDIR}${DATADIR}
 	${FIND} ${STAGEDIR}${PREFIX} -name "example_psi4rc_file" -delete
 	# delete empty directories
 	${FIND} ${STAGEDIR} -type d -empty -delete
 	# set executable flag
 	${CHMOD} +x ${STAGEDIR}${PREFIX}/bin/psi4
 	# correct version number
 	@${REINPLACE_CMD} -i '' -e "s|__version__ = 'undefined'|__version__ = '${DISTVERSION}'|" \
 		${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/psi4/metadata.py
 	@${REINPLACE_CMD} -i '' -e "s|__version_long = 'undefined+11'|__version_long = '${DISTVERSION}'|" \
 		${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/psi4/metadata.py
 
 	# psi4 sometimes fails to print its version: https://github.com/psi4/psi4/issues/2831
 
 do-test: # tests are generally broken, but virtually all individual tests pass separately
 	# based on https://psicode.org/psi4manual/master/build_planning.html#faq-minutetests
 	#@cd ${WRKSRC}/tests && ${SETENV} ${TEST_ENV} pytest # pytest-based tests fail, see https://github.com/psi4/psi4/issues/2802 https://github.com/psi4/psi4/issues/2830
 
 	# samples as tests, this also fails down the line: https://github.com/psi4/psi4/issues/2803
 	#@cd ${WRKSRC} && ( \
 	#	for f in $$(${FIND} samples/cc24 -name test.in | ${XARGS} dirname); do \
 	#		echo "===> runing test in $$f"; \
 	#		(cd $$f && ${SETENV} ${TEST_ENV} ${STAGEDIR}${PREFIX}/bin/psi4 test.in) \
 	#	done \
 	#)
 
 	# api tests
 	@cd ${WRKSRC}/tests/pytests && ${SETENV} ${TEST_ENV} pytest
 
 	# cli tests
 	#@cd ${WRKSRC}/tests && ( \
 	#	for f in $$(${FIND} . -name input.dat | ${XARGS} dirname); do \
 	#		echo "===> runing input.dat $$f"; \
 	#		(cd $$f && ${SETENV} ${TEST_ENV} ${STAGEDIR}${PREFIX}/bin/psi4 input.dat) \
 	#	done \
 	#)
 
 .include <bsd.port.mk>
diff --git a/science/py-GPy/Makefile b/science/py-GPy/Makefile
index a540822d963b..114f5a9a0176 100644
--- a/science/py-GPy/Makefile
+++ b/science/py-GPy/Makefile
@@ -1,27 +1,28 @@
 PORTNAME=	GPy
 DISTVERSION=	1.10.0
+PORTREVISION=	1
 CATEGORIES=	science python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Gaussian process toolbox
 WWW=		https://sheffieldml.github.io/GPy/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 .if !exists(/usr/include/omp.h)
 BROKEN=		requires OpenMP support that is missing on this architecture
 .endif
 
 BUILD_DEPENDS=	${PYNUMPY}
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=1.3.0:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}paramz>=0.9.0:science/py-paramz@${PY_FLAVOR}
 
 USES=		localbase python:3.6+
 USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/science/py-GPyOpt/Makefile b/science/py-GPyOpt/Makefile
index a66826a6377c..939bfa3f7049 100644
--- a/science/py-GPyOpt/Makefile
+++ b/science/py-GPyOpt/Makefile
@@ -1,23 +1,24 @@
 PORTNAME=	GPyOpt
 DISTVERSION=	1.2.6
+PORTREVISION=	1
 CATEGORIES=	science python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Bayesian optimization toolbox based on GPy
 WWW=		https://sheffieldml.github.io/GPyOpt/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=0.16:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}GPy>=1.8:science/py-GPy@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_PYTHON=	distutils concurrent autoplist
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/science/py-MDAnalysis/Makefile b/science/py-MDAnalysis/Makefile
index 3f8036bb8fe4..b66c3cb4c137 100644
--- a/science/py-MDAnalysis/Makefile
+++ b/science/py-MDAnalysis/Makefile
@@ -1,39 +1,40 @@
 PORTNAME=	MDAnalysis
 DISTVERSION=	2.3.0
+PORTREVISION=	1
 CATEGORIES=	science python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Python library to analyze molecular dynamics trajectories
 WWW=		https://www.mdanalysis.org
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}packaging>=2.0:devel/py-packaging@${PY_FLAVOR}
 RUN_DEPENDS=	${PYNUMPY} \
 		clustalw2:biology/clustalw \
 		rdkit>0:science/rdkit \
 		${PYTHON_PKGNAMEPREFIX}biopython>=1.71:biology/py-biopython@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}GridDataFormats>=0.4.0:math/py-GridDataFormats@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}fasteners>0:devel/py-fasteners@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}gsd>=1.9.3:science/py-gsd@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}joblib>0:devel/py-joblib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>=1.5.1:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mmtf-python>=1.0.0:science/py-mmtf-python@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}networkx>=2.0:math/py-networkx@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=1.5.0:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}seaborn>0:math/py-seaborn@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.4.0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tqdm>=4.43.0:misc/py-tqdm@${PY_FLAVOR}
 
 USES=		compiler:c++11-lang python:3.7+
 USE_PYTHON=	distutils cython autoplist
 
 .if !defined(WITH_DEBUG)
 LDFLAGS+=	-s
 .endif
 
 .include <bsd.port.mk>
diff --git a/science/py-MDAnalysisTests/Makefile b/science/py-MDAnalysisTests/Makefile
index 199e378e3188..439ecd8a4670 100644
--- a/science/py-MDAnalysisTests/Makefile
+++ b/science/py-MDAnalysisTests/Makefile
@@ -1,22 +1,23 @@
 PORTNAME=	MDAnalysisTests
 DISTVERSION=	2.3.0
+PORTREVISION=	1
 CATEGORIES=	science python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Test code and the trajectory data for test cases of MDAnalysis
 WWW=		https://www.mdanalysis.org
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}MDAnalysis>0:science/py-MDAnalysis@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}hypothesis>0:devel/py-hypothesis@${PY_FLAVOR}
 
 USES=		python:3.8+
 USE_PYTHON=	distutils autoplist pytest
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/science/py-OpenFermion-Dirac/Makefile b/science/py-OpenFermion-Dirac/Makefile
index d00ece8806d8..867cc98f6c18 100644
--- a/science/py-OpenFermion-Dirac/Makefile
+++ b/science/py-OpenFermion-Dirac/Makefile
@@ -1,26 +1,27 @@
 PORTNAME=	OpenFermion-Dirac
 DISTVERSION=	g20220812
+PORTREVISION=	1
 CATEGORIES=	science python # chemistry, quantum-computing
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Interface between OpenFermion and Dirac
 WWW=		https://github.com/bsenjean/Openfermion-Dirac
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}OpenFermion>0:science/py-OpenFermion@${PY_FLAVOR} \
 		dirac-quantum-chemistry-software>0:science/dirac
 
 USES=		python
 USE_PYTHON=	distutils autoplist
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	bsenjean
 GH_PROJECT=	Openfermion-Dirac
 GH_TAGNAME=	2770eb1
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/science/py-OpenFermion-PySCF/Makefile b/science/py-OpenFermion-PySCF/Makefile
index d177a12710a1..945623b7551b 100644
--- a/science/py-OpenFermion-PySCF/Makefile
+++ b/science/py-OpenFermion-PySCF/Makefile
@@ -1,26 +1,27 @@
 PORTNAME=	py-OpenFermion-PySCF
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.5
+PORTREVISION=	1
 CATEGORIES=	science python # chemistry, quantum-computing
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Interface between OpenFermion and PySCF
 WWW=		https://github.com/quantumlib/OpenFermion-PySCF
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}OpenFermion>0:science/py-OpenFermion@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyscf>0:science/py-pyscf@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	distutils autoplist pytest # 2 tests are known to fail, see https://github.com/quantumlib/OpenFermion-PySCF/issues/65
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	quantumlib
 GH_PROJECT=	OpenFermion-PySCF
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/science/py-OpenFermion/Makefile b/science/py-OpenFermion/Makefile
index e9189618eb8b..0bc782fa369f 100644
--- a/science/py-OpenFermion/Makefile
+++ b/science/py-OpenFermion/Makefile
@@ -1,36 +1,36 @@
 PORTNAME=	OpenFermion
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.5.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science python # quantum-computing
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Electronic structure package for quantum computers
 WWW=		https://github.com/quantumlib/OpenFermion
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 PY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cirq-core>=0.15.0:science/py-cirq-core@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cirq-google>=0.15.0:science/py-cirq-google@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}deprecation>0:devel/py-deprecation@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}h5py>=2.8:science/py-h5py@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}networkx>0:math/py-networkx@${PY_FLAVOR} \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}PubChemPy>0:science/py-PubChemPy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.18:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=1.1.0:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sympy>0:math/py-sympy@${PY_FLAVOR}
 BUILD_DEPENDS=	${PY_DEPENDS}
 RUN_DEPENDS=	${PY_DEPENDS}
 
 USES=		python:3.7+
 USE_PYTHON=	distutils autoplist
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	quantumlib
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/science/py-OpenMC/Makefile b/science/py-OpenMC/Makefile
index 91fdbd38d559..df936574a155 100644
--- a/science/py-OpenMC/Makefile
+++ b/science/py-OpenMC/Makefile
@@ -1,48 +1,49 @@
 PORTNAME=	OpenMC
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.13.3
+PORTREVISION=	1
 CATEGORIES=	science
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Monte Carlo neutron and photon transport simulation code (Python)
 WWW=		https://openmc.org/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 PY_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}h5py>0:science/py-h5py@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ipython>0:devel/ipython@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}uncertainties>0:math/py-uncertainties@${PY_FLAVOR}
 BUILD_DEPENDS=	openmc>0:science/openmc \
 		${PY_DEPENDS}
 RUN_DEPENDS=	openmc>0:science/openmc \
 		${PY_DEPENDS}
 
 USES=		python
 USE_PYTHON=	distutils cython concurrent autoplist pytest # tests fail and abort in the middle, see https://github.com/openmc-dev/openmc/issues/2186
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	${PORTNAME:tl}-dev
 GH_PROJECT=	${PORTNAME:tl}
 
 PLIST_FILES=	${PYTHON_SITELIBDIR}/openmc/lib/libopenmc.so
 
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 
 post-install:
 	# strip
 	@${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/openmc/data/*.so
 	# link the library
 	@${LN} -s ${LOCALBASE}/lib/libopenmc.so ${STAGEDIR}${PYTHON_SITELIBDIR}/openmc/lib/libopenmc.so
 
 pre-test:
 	# link the library
 	@if ! [ -e ${WRKSRC}/openmc/lib/libopenmc.so ]; then ${LN} -s ${LOCALBASE}/lib/libopenmc.so ${WRKSRC}/openmc/lib/libopenmc.so; fi
 
 .include <bsd.port.mk>
diff --git a/science/py-PyFR/Makefile b/science/py-PyFR/Makefile
index af9edf8c79fa..1e563e806f14 100644
--- a/science/py-PyFR/Makefile
+++ b/science/py-PyFR/Makefile
@@ -1,46 +1,47 @@
 PORTNAME=	PyFR
 DISTVERSION=	1.15.0
+PORTREVISION=	1
 CATEGORIES=	science python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	pyfr-${DISTVERSION}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Framework for solving advection-diffusion type problems
 WWW=		https://www.pyfr.org/
 
 LICENSE=	BSD3CLAUSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}appdirs>=1.4.0:devel/py-appdirs@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}gimmik>=2.3:math/py-gimmik@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}h5py>=2.10:science/py-h5py@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mako>=1.0.0:textproc/py-mako@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mpi4py>=3.1.0:net/py-mpi4py@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}platformdirs>=2.2.0:devel/py-platformdirs@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytools>=2016.2.1:devel/py-pytools@${PY_FLAVOR} \
 		${PYNUMPY}
 
 USES=		python:3.7+ shebangfix
 USE_PYTHON=	distutils concurrent autoplist pytest
 
 SHEBANG_FILES=	setup.py pyfr/__main__.py
 
 NO_ARCH=	yes
 
 OPTIONS_MULTI=		PARALLEL
 OPTIONS_MULTI_PARALLEL=	OPENCL OPENMP # CUDA isn't supported on FreeBSD
 OPTIONS_DEFAULT=	${OPTIONS_MULTI_PARALLEL}
 PARALLEL_DESC=		Parallelization backends to install
 
 OPENCL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyopencl>0:devel/py-pyopencl@${PY_FLAVOR} \
 			clblas>0:math/clblas
 OPENMP_RUN_DEPENDS=	libxsmm>0:math/libxsmm
 
 pre-build: # patch in pre-build to make the patch less error-prone (it has %%LOCALBASE%%)
 	@${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/pyfr/backends/openmp/compiler.py
 
 post-install: # workaround: https://groups.google.com/forum/#!topic/pyfrmailinglist/RNi_LcizGBo
 	@${RM} ${STAGEDIR}${PREFIX}/__main__.py
 	@${REINPLACE_CMD} 's|^${PREFIX}/__main__\.py||' ${_PYTHONPKGLIST}
 
 .include <bsd.port.mk>
diff --git a/science/py-PyNE/Makefile b/science/py-PyNE/Makefile
index e6138af77211..7c2bce8f1236 100644
--- a/science/py-PyNE/Makefile
+++ b/science/py-PyNE/Makefile
@@ -1,78 +1,78 @@
 PORTNAME=	PyNE
 DISTVERSION=	0.7.7
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	science # physics
 MASTER_SITES=	https://raw.githubusercontent.com/pyne/data/master/:decay \
 		https://raw.githubusercontent.com/pyne/data/master/:cram \
 		https://raw.githubusercontent.com/pyne/data/master/:dlc \
 		https://raw.githubusercontent.com/pyne/data/master/:clc \
 		https://github.com/pyne/data/master/:nuc_data
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTFILES=	decay.tar.gz:decay \
 		cram.tar.gz:cram \
 		decay-linux-clang.tar.gz:dlc \
 		cram-linux-clang.tar.gz:clc \
 		prebuilt_nuc_data.h5:nuc_data
 DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
 EXTRACT_ONLY=	${DISTNAME}.tar.gz
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	PyNE: The Nuclear Engineering Toolkit
 WWW=		https://pyne.io/
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/license.txt
 
 BROKEN_armv7=	clang runs out of memory
 
 PY_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}tables>0:devel/py-tables@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
 BUILD_DEPENDS=	cmake:devel/cmake-core \
 		${PY_DEPENDS}
 LIB_DEPENDS=	libhdf5.so:science/hdf5 \
 		libMOAB.so:math/moab \
 		libsz.so:science/libaec
 RUN_DEPENDS=	${PY_DEPENDS}
 
 USES=		compiler:c++17-lang fortran python:3.7+
 USE_PYTHON=	distutils cython flavors
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	pyne
 GH_PROJECT=	pyne
 
 MAKE_ENV=	DESTDIR=${STAGEDIR}
 FFLAGS+=	-fallow-argument-mismatch
 
 # all arguments are described here: http://pyne.io/install/source.html#source
 PY_EXTRA_ARGS=	--slow	# this chooses slow compilation of sources from {decay,cram}.tar.gz
 			# over incompatible pre-compiled assembly from {decay,cram}-linux-clang.tar.gz
 PY_EXTRA_ARGS+=	${_MAKE_JOBS}
 PY_EXTRA_ARGS+=	--hdf5 ${LOCALBASE}
 PY_EXTRA_ARGS+=	--moab ${LOCALBASE}
 
 PYDISTUTILS_CONFIGUREARGS=	${PY_EXTRA_ARGS}
 PYDISTUTILS_BUILDARGS=		${PY_EXTRA_ARGS}
 
 BINARY_ALIAS=	python=${PYTHON_CMD}
 
 post-extract:
 .for f in decay.tar.gz cram.tar.gz decay-linux-clang.tar.gz cram-linux-clang.tar.gz
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${f} ${WRKSRC}/src
 .endfor
 
 do-install:
 	# install project
 	cd ${INSTALL_WRKSRC} && \
 		${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYDISTUTILS_SETUP} ${PYDISTUTILS_INSTALL_TARGET}
 	# also install nuc_data.h5 because it is referred to in the code and is required by Jupyter notebooks
 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/prebuilt_nuc_data.h5 ${STAGEDIR}${PYTHON_SITELIBDIR}/pyne/nuc_data.h5
 	# strip
 	${STRIP_CMD} \
 		${STAGEDIR}${LOCALBASE}/lib/lib*.so \
 		${STAGEDIR}${PYTHON_SITELIBDIR}/pyne/*.so \
 		${STAGEDIR}${PYTHON_SITELIBDIR}/pyne/xs/models.so
 
 .include <bsd.port.mk>
diff --git a/science/py-SimpleSpectral/Makefile b/science/py-SimpleSpectral/Makefile
index c476fb819770..bcc3f35554b2 100644
--- a/science/py-SimpleSpectral/Makefile
+++ b/science/py-SimpleSpectral/Makefile
@@ -1,21 +1,21 @@
 PORTNAME=	SimpleSpectral
 DISTVERSION=	1.0.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	science python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Simplified scipy.signal.spectral module with only pyFFTW support
 WWW=		https://github.com/xmikos/simplespectral
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYNUMPY}
 
 USES=		python:3.4+
 USE_PYTHON=	distutils autoplist
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/science/py-abipy/Makefile b/science/py-abipy/Makefile
index cae0849e3e16..8701cf005c26 100644
--- a/science/py-abipy/Makefile
+++ b/science/py-abipy/Makefile
@@ -1,38 +1,38 @@
 PORTNAME=	abipy
 DISTVERSION=	0.9.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Library for analyzing the results produced by ABINIT
 WWW=		https://abinit.github.io/abipy/
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}apscheduler>=2.1.0:devel/py-apscheduler@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}html2text>0:textproc/py-html2text@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}monty>0:devel/py-monty@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}netCDF4>0:science/py-netCDF4@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pydispatcher>=2.0.5:devel/py-pydispatcher@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pymatgen>=2022.0.4:science/py-pymatgen@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}seaborn>0:math/py-seaborn@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}spglib>0:science/py-spglib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sympy>0:math/py-sympy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tabulate>0:devel/py-tabulate@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tqdm>0:misc/py-tqdm@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${PY_FLAVOR}
 
 USES=		python:3.7+ shebangfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	abinit
 SHEBANG_GLOB=	*.py
 USE_PYTHON=	distutils concurrent autoplist
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/science/py-access/Makefile b/science/py-access/Makefile
index ea824d9cbeea..2f6dcd5a9f3c 100644
--- a/science/py-access/Makefile
+++ b/science/py-access/Makefile
@@ -1,25 +1,26 @@
 PORTNAME=	access
 PORTVERSION=	1.1.9
+PORTREVISION=	1
 CATEGORIES=	science python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Calculate spatial accessibility metrics
 WWW=		https://pysal.org/access/ \
 		https://access.readthedocs.io/en/latest/ \
 		https://github.com/pysal/access
 
 LICENSE=	BSD3CLAUSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}geopandas>=0:graphics/py-geopandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpy>=1.3,1:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pandas>=0.23.4,1:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2:www/py-requests@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/science/py-arch/Makefile b/science/py-arch/Makefile
index b601ee6b210d..c1bfc19c0072 100644
--- a/science/py-arch/Makefile
+++ b/science/py-arch/Makefile
@@ -1,32 +1,33 @@
 PORTNAME=	arch
 DISTVERSION=	5.3.1
+PORTREVISION=	1
 CATEGORIES=	science python # economics
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Autoregressive Conditional Heteroskedasticity (ARCH) models
 WWW=		https://github.com/RomelTorres/alpha_vantage
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 PY_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}pandas>=1.0:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}property-cached>=1.6.4:devel/py-property-cached@${PY_FLAVOR}  \
 		${PYTHON_PKGNAMEPREFIX}scipy>=1.3:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}statsmodels>=0.11:math/py-statsmodels@${PY_FLAVOR}
 BUILD_DEPENDS=	${PY_DEPENDS}
 RUN_DEPENDS=	${PY_DEPENDS}
 
 USES=		python:3.8+
 USE_PYTHON=	distutils cython autoplist pytest
 
 TEST_WRKSRC=	${WRKSRC}/arch/tests
 
 post-install:
 	@${STRIP_CMD} \
 		${STAGEDIR}${PYTHON_SITELIBDIR}/arch/bootstrap/_samplers${PYTHON_EXT_SUFFIX}.so \
 		${STAGEDIR}${PYTHON_SITELIBDIR}/arch/univariate/recursions${PYTHON_EXT_SUFFIX}.so
 
 .include <bsd.port.mk>
diff --git a/science/py-asap3/Makefile b/science/py-asap3/Makefile
index f2941cdbd7cf..c0704db76cfa 100644
--- a/science/py-asap3/Makefile
+++ b/science/py-asap3/Makefile
@@ -1,25 +1,26 @@
 PORTNAME=	asap3
 DISTVERSION=	3.12.8
+PORTREVISION=	1
 CATEGORIES=	science python # chemistry
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Classical potentials for MD with ASE
 WWW=		https://wiki.fysik.dtu.dk/asap
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYNUMPY}
 LIB_DEPENDS=	libmpich.so:net/mpich # not sure if this is used
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}ase>0:science/py-ase@${PY_FLAVOR}
 
 USES=		localbase python:3.7+
 USE_PYTHON=	distutils concurrent autoplist pytest
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/_asap.cpython-${PYTHON_SUFFIX}.so
 
 .include <bsd.port.mk>
diff --git a/science/py-asdf/Makefile b/science/py-asdf/Makefile
index 58659eafcbb4..fe72077bdbb0 100644
--- a/science/py-asdf/Makefile
+++ b/science/py-asdf/Makefile
@@ -1,45 +1,46 @@
 PORTNAME=	asdf
 PORTVERSION=	2.15.0
+PORTREVISION=	1
 CATEGORIES=	science python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Python tools to handle ASDF files
 WWW=		https://github.com/asdf-format/asdf
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=60:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}setuptools_scm>=3.4:devel/py-setuptools_scm@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}asdf-standard>=1.0.1:science/py-asdf-standard@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}asdf-transform-schemas>=0.3:science/py-asdf-transform-schemas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}asdf-unit-schemas>=0.1:science/py-asdf-unit-schemas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}importlib-metadata>=4.11.4:devel/py-importlib-metadata@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jmespath>=0.6.2:devel/py-jmespath@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jsonschema>=4.0.1<4.18:devel/py-jsonschema@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpy>=1.20,1:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}packaging>=19:devel/py-packaging@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>=5.4.1:devel/py-yaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}semantic-version>=2.8:devel/py-semantic-version@${PY_FLAVOR}
 
 USES=		python:3.8+
 USE_PYTHON=	autoplist concurrent pep517
 
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=	ALL
 OPTIONS_DEFAULT=ALL
 ALL_DESC=	Lz4 compression algorithm support
 
 ALL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lz4>=0.10:archivers/py-lz4@${PY_FLAVOR}
 
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} < 30900
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}importlib-resources>=3:devel/py-importlib-resources@${PY_FLAVOR}
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/science/py-ase/Makefile b/science/py-ase/Makefile
index 54789c0a1528..2f0ebcafb6e6 100644
--- a/science/py-ase/Makefile
+++ b/science/py-ase/Makefile
@@ -1,31 +1,32 @@
 PORTNAME=	ase
 DISTVERSION=	3.22.1
+PORTREVISION=	1
 CATEGORIES=	science python # chemistry
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Atomic simulation environment
 WWW=		https://wiki.fysik.dtu.dk/ase/
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING.LESSER
 
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>=3.1.0:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=1.1.0:science/py-scipy@${PY_FLAVOR} \
 		nwchem:science/nwchem
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest-mock>0:devel/py-pytest-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-xdist>=1.30.0:devel/py-pytest-xdist@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}asap3>0:science/py-asap3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Flask>0:www/py-flask@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}netCDF4>0:science/py-netCDF4@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}spglib>0:science/py-spglib@${PY_FLAVOR}
 # optional dependencies: x11-toolkits/py-tkinter, www/py-flask (see https://wiki.fysik.dtu.dk/ase/install.html)
 
 USES=		python:3.7+
 USE_PYTHON=	distutils concurrent autoplist pytest
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/science/py-atomium/Makefile b/science/py-atomium/Makefile
index 8917627c227a..6270e74da9cf 100644
--- a/science/py-atomium/Makefile
+++ b/science/py-atomium/Makefile
@@ -1,33 +1,34 @@
 PORTNAME=	atomium
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.0.11
+PORTREVISION=	1
 CATEGORIES=	science biology python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Molecular modeller and file parser
 WWW=		https://atomium.bio/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 PY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}coveralls>0:devel/py-coveralls@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}msgpack>=0.6.1:devel/py-msgpack@${PY_FLAVOR} \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}paramiko>0:security/py-paramiko@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}rmsd>0:science/py-rmsd@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tqdm>0:misc/py-tqdm@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}valerius>=0.2:biology/py-valerius@${PY_FLAVOR}
 BUILD_DEPENDS=	${PY_DEPENDS}
 RUN_DEPENDS=	${PY_DEPENDS}
 
 USES=		python
 USE_PYTHON=	distutils autoplist pytest
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	samirelanduk
 
 .include <bsd.port.mk>
diff --git a/science/py-avogadrolibs/Makefile b/science/py-avogadrolibs/Makefile
index 3e6de7923e53..eac1d5400a4c 100644
--- a/science/py-avogadrolibs/Makefile
+++ b/science/py-avogadrolibs/Makefile
@@ -1,30 +1,31 @@
 PORTNAME=	avogadrolibs
 DISTVERSION=	1.97.0
+PORTREVISION=	1
 CATEGORIES=	science
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Python bindings for Avogadro2 chemistry libraries
 WWW=		https://www.openchemistry.org/projects/avogadro2/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/../LICENSE
 
 BUILD_DEPENDS=	${LOCALBASE}/include/pybind11/pybind11.h:devel/pybind11
 LIB_DEPENDS=	libAvogadroCore.so:science/avogadrolibs
 
 USES=		cmake compiler:c++11-lang eigen:3 python:3.5+
 USE_PYTHON=	flavors
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	OpenChemistry
 
 WRKSRC_SUBDIR=	python
 
 CMAKE_ARGS=	-DINSTALL_LIBRARY_DIR:STRING=${PYTHON_SITELIBDIR}
 
 PLIST_FILES=	${PYTHON_SITELIBDIR}/avogadro/__init__.py \
 		${PYTHON_SITELIBDIR}/avogadro/core${PYTHON_EXT_SUFFIX}.so \
 		${PYTHON_SITELIBDIR}/avogadro/io${PYTHON_EXT_SUFFIX}.so
 
 .include <bsd.port.mk>
diff --git a/science/py-boutdata/Makefile b/science/py-boutdata/Makefile
index c9748b2da906..8bdc38402028 100644
--- a/science/py-boutdata/Makefile
+++ b/science/py-boutdata/Makefile
@@ -1,30 +1,31 @@
 PORTNAME=	boutdata
 DISTVERSION=	0.1.10
+PORTREVISION=	1
 CATEGORIES=	science education
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Python package for collecting BOUT++ data
 WWW=		https://github.com/boutproject/boutdata
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 PY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}boututils>0:science/py-boututils@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>=3.2.1:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}natsort>=8.1.0:devel/py-natsort@${PY_FLAVOR} \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=1.4.1:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sympy>=1.5.1:math/py-sympy@${PY_FLAVOR}
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}setuptools_scm_git_archive>0:devel/py-setuptools_scm_git_archive@${PY_FLAVOR} \
 		${PY_DEPENDS}
 RUN_DEPENDS=	${PY_DEPENDS}
 
 USES=		python:3.6+
 USE_PYTHON=	distutils autoplist pytest
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/science/py-boututils/Makefile b/science/py-boututils/Makefile
index 211449c1ba1c..cbd51b05ccf6 100644
--- a/science/py-boututils/Makefile
+++ b/science/py-boututils/Makefile
@@ -1,32 +1,32 @@
 PORTNAME=	boututils
 DISTVERSION=	0.1.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science education
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Python package containing BOUT++ utils
 WWW=		https://github.com/boutproject/boututils
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 PY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}h5py>0:science/py-h5py@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>=3.2.1:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mayavi>0:graphics/py-mayavi@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}netCDF4>=1.5.3:science/py-netCDF4@${PY_FLAVOR} \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=1.4.1:science/py-scipy@${PY_FLAVOR}
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}setuptools_scm_git_archive>0:devel/py-setuptools_scm_git_archive@${PY_FLAVOR} \
 		${PY_DEPENDS}
 RUN_DEPENDS=	${PY_DEPENDS}
 
 USES=		python:3.6+ pyqt:5
 USE_PYTHON=	distutils autoplist pytest
 USE_PYQT=	pyqt5
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/science/py-cdo/Makefile b/science/py-cdo/Makefile
index 76104a029ad1..323169cd2fe6 100644
--- a/science/py-cdo/Makefile
+++ b/science/py-cdo/Makefile
@@ -1,21 +1,22 @@
 PORTNAME=	cdo
 PORTVERSION=	1.5.7
+PORTREVISION=	1
 CATEGORIES=	science python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Python binding to CDO (Climate Data Operators)
 WWW=		https://code.mpimet.mpg.de/projects/cdo/wiki/Cdo%7Brbpy%7D
 
 LICENSE=	GPLv2
 
 RUN_DEPENDS=	cdo:science/cdo \
 		${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/science/py-cfgrib/Makefile b/science/py-cfgrib/Makefile
index fa8340c69c04..97ecb26f1447 100644
--- a/science/py-cfgrib/Makefile
+++ b/science/py-cfgrib/Makefile
@@ -1,34 +1,35 @@
 PORTNAME=	cfgrib
 PORTVERSION=	0.9.10.3
+PORTREVISION=	1
 CATEGORIES=	science python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Map GRIB files to the NetCDF Common Data Model following the CF Convention using ecCodes
 WWW=		https://github.com/ecmwf/cfgrib
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}attrs>=19.2:devel/py-attrs@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}click>=0:devel/py-click@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}eccodes>=0.9.8:science/py-eccodes@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpy>=0,1:math/py-numpy@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dask>=0:devel/py-dask@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}flake8>=0:devel/py-flake8@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=0:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xarray>=0.15:devel/py-xarray@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_PYTHON=	autoplist concurrent distutils pytest
 
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=	XARRAY
 XARRAY_DESC=	Xarray support
 
 XARRAY_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}xarray>=0.15:devel/py-xarray@${PY_FLAVOR}
 
 .include <bsd.port.mk>
diff --git a/science/py-chainer-chemistry/Makefile b/science/py-chainer-chemistry/Makefile
index 98010c51c061..1ddd7ea1bbc3 100644
--- a/science/py-chainer-chemistry/Makefile
+++ b/science/py-chainer-chemistry/Makefile
@@ -1,27 +1,28 @@
 PORTNAME=	chainer-chemistry
 DISTVERSION=	0.7.1
+PORTREVISION=	1
 CATEGORIES=	science biology # machine-learning
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Library for deep learning in biology and chemistry
 WWW=		https://github.com/pfnet-research/chainer-chemistry
 
 LICENSE=	MIT
 
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}chainer>=7.0.0:science/py-chainer@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}joblib>0:devel/py-joblib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-learn>0:science/py-scikit-learn@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tqdm>0:misc/py-tqdm@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	distutils autoplist
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/science/py-chainer/Makefile b/science/py-chainer/Makefile
index 24d35b59f918..bb338e069f70 100644
--- a/science/py-chainer/Makefile
+++ b/science/py-chainer/Makefile
@@ -1,26 +1,26 @@
 PORTNAME=	chainer
 DISTVERSION=	7.8.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	science # machine-learning
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Deep learning framework
 WWW=		https://chainer.org/
 
 LICENSE=	MIT
 
 LIB_DEPENDS=	libprotobuf.so:devel/protobuf
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}filelock>0:sysutils/py-filelock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}protobuf>=3.0.0:devel/py-protobuf@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}typing-extensions>0:devel/py-typing-extensions@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_PYTHON=	distutils autoplist
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/science/py-chempy/Makefile b/science/py-chempy/Makefile
index 18e3bf8aec20..1f65af31b808 100644
--- a/science/py-chempy/Makefile
+++ b/science/py-chempy/Makefile
@@ -1,52 +1,52 @@
 PORTNAME=	chempy
 DISTVERSION=	0.8.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science python # chemistry
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Package useful for solving problems in chemistry
 WWW=		https://github.com/bjodah/chempy
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 PY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dot2tex>=2.11.3:print/dot2tex@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>=2.2.3:math/py-matplotlib@${PY_FLAVOR} \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}PuLP>=1.6.8:math/py-PuLP@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyneqsys>=0.5.5:math/py-pyneqsys@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyodesys>=0.14.1:math/py-pyodesys@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyparsing>=2.0.3:devel/py-pyparsing@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}quantities>=0.12.1:science/py-quantities@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=1.0.1:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sym>=0.3.4:math/py-sym@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sympy>=1.1.1:math/py-sympy@${PY_FLAVOR}
 BUILD_DEPENDS=	${PY_DEPENDS}
 RUN_DEPENDS=	${PY_DEPENDS}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}black>0:devel/py-black@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-cov>0:devel/py-pytest-cov@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-flakes>0:devel/py-pytest-flakes@${PY_FLAVOR}
 
 USES=		python:3.8+
 USE_PYTHON=	distutils autoplist pytest
 
 NO_ARCH=	yes
 
 CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}pymol # https://github.com/schrodinger/pymol-open-source/issues/100
 
 OPTIONS_DEFINE=		EXTRAS
 OPTIONS_DEFAULT=	EXTRAS
 
 EXTRAS_DESC=		Install optional dependencies for additional functionality
 EXTRAS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}appdirs>0:devel/py-appdirs@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}bokeh>=0.13.0:www/py-bokeh@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}ipywidgets>0:devel/py-ipywidgets@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}pycodeexport>=0.1.3:devel/py-pycodeexport@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}pycompilation>=0.4.12:devel/py-pycompilation@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}pygslodeiv2>=0.9.4:math/py-pygslodeiv2@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}pyodeint>=0.10.4:math/py-pyodeint@${PY_FLAVOR}
 			# TODO pycvodes>=0.14.0, pykinsol>=0.1.6
 
 .include <bsd.port.mk>
diff --git a/science/py-cirq-aqt/Makefile b/science/py-cirq-aqt/Makefile
index fb439da9c4aa..ef3e3333f204 100644
--- a/science/py-cirq-aqt/Makefile
+++ b/science/py-cirq-aqt/Makefile
@@ -1,28 +1,29 @@
 PORTNAME=	cirq-aqt
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.1.0
+PORTREVISION=	1
 CATEGORIES=	science python # quantum-computing
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Cirq module to run on AQT quantum computers
 WWW=		https://github.com/quantumlib/cirq
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cirq-core>0:science/py-cirq-core@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.18:www/py-requests@${PY_FLAVOR}
 
 USES=		python:3.8+
 USE_PYTHON=	distutils autoplist
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	quantumlib
 GH_PROJECT=	Cirq
 
 WRKSRC_SUBDIR=	cirq-aqt
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/science/py-cirq-core/Makefile b/science/py-cirq-core/Makefile
index 5ec1f3118415..81e6b7ea24ca 100644
--- a/science/py-cirq-core/Makefile
+++ b/science/py-cirq-core/Makefile
@@ -1,38 +1,39 @@
 PORTNAME=	cirq-core
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.1.0
+PORTREVISION=	1
 CATEGORIES=	science python # quantum-computing
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Framework for Noisy Intermediate Scale Quantum (NISQ) circuits
 WWW=		https://github.com/quantumlib/cirq
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}cirq-google>0:science/py-cirq-google@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}duet>=0.2.6:net/py-duet@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}networkx>0:math/py-networkx@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sortedcontainers>0:devel/py-sortedcontainers@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sympy>0:math/py-sympy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tqdm>0:misc/py-tqdm@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}typing-extensions>0:devel/py-typing-extensions@${PY_FLAVOR}
 
 USES=		python:3.8+
 USE_PYTHON=	distutils autoplist
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	quantumlib
 GH_PROJECT=	Cirq
 
 WRKSRC_SUBDIR=	cirq-core
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/science/py-cirq-ionq/Makefile b/science/py-cirq-ionq/Makefile
index 66cae0b6eaed..f5b676dfda2a 100644
--- a/science/py-cirq-ionq/Makefile
+++ b/science/py-cirq-ionq/Makefile
@@ -1,28 +1,29 @@
 PORTNAME=	cirq-ionq
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.1.0
+PORTREVISION=	1
 CATEGORIES=	science python # quantum-computing
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Cirq module to run on IonQ quantum computers
 WWW=		https://github.com/quantumlib/cirq
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cirq-core>0:science/py-cirq-core@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR}
 
 USES=		python:3.8+
 USE_PYTHON=	distutils autoplist
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	quantumlib
 GH_PROJECT=	Cirq
 
 WRKSRC_SUBDIR=	cirq-ionq
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/science/py-cirq-pasqal/Makefile b/science/py-cirq-pasqal/Makefile
index 97ad5dce6eb7..ced19461ce07 100644
--- a/science/py-cirq-pasqal/Makefile
+++ b/science/py-cirq-pasqal/Makefile
@@ -1,28 +1,29 @@
 PORTNAME=	cirq-pasqal
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.1.0
+PORTREVISION=	1
 CATEGORIES=	science python # quantum-computing
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Cirq module to run on pasqal quantum computers
 WWW=		https://github.com/quantumlib/cirq
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cirq-core>0:science/py-cirq-core@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR}
 
 USES=		python:3.8+
 USE_PYTHON=	distutils autoplist
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	quantumlib
 GH_PROJECT=	Cirq
 
 WRKSRC_SUBDIR=	cirq-pasqal
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/science/py-cirq-rigetti/Makefile b/science/py-cirq-rigetti/Makefile
index eea245a036d6..a683664bb7e8 100644
--- a/science/py-cirq-rigetti/Makefile
+++ b/science/py-cirq-rigetti/Makefile
@@ -1,28 +1,29 @@
 PORTNAME=	cirq-rigetti
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.1.0
+PORTREVISION=	1
 CATEGORIES=	science python # quantum-computing
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Cirq module to run on Rigetti quantum computers
 WWW=		https://github.com/quantumlib/cirq
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cirq-core>0:science/py-cirq-core@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyquil>=3.0.0:devel/py-pyquil@${PY_FLAVOR}
 
 USES=		python:3.8+
 USE_PYTHON=	distutils autoplist
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	quantumlib
 GH_PROJECT=	Cirq
 
 WRKSRC_SUBDIR=	cirq-rigetti
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/science/py-dimod/Makefile b/science/py-dimod/Makefile
index 59ef162a8ddc..79ce4d8e7c7d 100644
--- a/science/py-dimod/Makefile
+++ b/science/py-dimod/Makefile
@@ -1,30 +1,31 @@
 PORTNAME=	dimod
 DISTVERSION=	0.12.4
+PORTREVISION=	1
 CATEGORIES=	science python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	DWave: Shared API for QUBO/Ising samplers
 WWW=		https://github.com/dwavesystems/dimod
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYNUMPY}
 RUN_DEPENDS=	${PYNUMPY}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}parameterized>0:devel/py-parameterized@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mypy>0:devel/py-mypy@${PY_FLAVOR}
 
 USES=		compiler:c++11-lang python:3.7+
 USE_PYTHON=	distutils cython autoplist unittest
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	dwavesystems
 
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 TEST_WRKSRC=	${WRKSRC}/tests
 
 post-install:
 	@${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME} -name "*${PYTHON_EXT_SUFFIX}.so" | ${XARGS} ${STRIP_CMD}
 
 .include <bsd.port.mk>
diff --git a/science/py-dipy/Makefile b/science/py-dipy/Makefile
index d186368d8cec..b92edeb48802 100644
--- a/science/py-dipy/Makefile
+++ b/science/py-dipy/Makefile
@@ -1,30 +1,31 @@
 PORTNAME=	dipy
 DISTVERSION=	1.6.0
+PORTREVISION=	1
 CATEGORIES=	science python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Python toolbox for analysis of MR diffusion imaging
 WWW=		https://dipy.org/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 PY_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}h5py>0:science/py-h5py@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}nibabel>0:science/py-nibabel@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tqdm>0:misc/py-tqdm@${PY_FLAVOR}
 BUILD_DEPENDS=	${PY_DEPENDS}
 RUN_DEPENDS=	${PY_DEPENDS}
 
 USES=		python:3.7+
 USE_PYTHON=	distutils cython concurrent autoplist pytest # pkg-plist also exists and contains files missing from the python-generated plist
 
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}/*/*.so
 
 .include <bsd.port.mk>
diff --git a/science/py-dwave-cloud-client/Makefile b/science/py-dwave-cloud-client/Makefile
index 9875d6008367..79f81d0f1ec0 100644
--- a/science/py-dwave-cloud-client/Makefile
+++ b/science/py-dwave-cloud-client/Makefile
@@ -1,40 +1,41 @@
 PORTNAME=	dwave-cloud-client
 DISTVERSION=	0.10.4
+PORTREVISION=	1
 CATEGORIES=	science python www # quantum-computing
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	DWave: REST interface to communicate with D-Wave Solver API servers
 WWW=		https://github.com/dwavesystems/dwave-cloud-client
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 PY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}click>=7:devel/py-click@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dateutil>=2.7:devel/py-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dimod>=0.10.5:science/py-dimod@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}diskcache>=5.2.1:devel/py-diskcache@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}homebase>=1.0:devel/py-homebase@${PY_FLAVOR} \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}plucky>=0.4.3:devel/py-plucky@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pydantic>=1.7.3:devel/py-pydantic@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.18:www/py-requests@${PY_FLAVOR}
 BUILD_DEPENDS=	${PY_DEPENDS}
 RUN_DEPENDS=	${PY_DEPENDS}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}coverage>0:devel/py-coverage@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dwave-networkx>=0.8.9:science/py-dwave-networkx@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}parameterized>0:devel/py-parameterized@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests-mock>0:www/py-requests-mock@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	distutils cython autoplist unittest # 1 test fail, probably due to devel/py-homebase issues, also https://github.com/dwavesystems/dwave-cloud-client/issues/533
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	dwavesystems
 
 NO_ARCH=	yes
 
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 
 .include <bsd.port.mk>
diff --git a/science/py-dwave-greedy/Makefile b/science/py-dwave-greedy/Makefile
index cec156aa139a..261f22e5c7fc 100644
--- a/science/py-dwave-greedy/Makefile
+++ b/science/py-dwave-greedy/Makefile
@@ -1,33 +1,34 @@
 PORTNAME=	dwave-greedy
 DISTVERSION=	0.3.0
+PORTREVISION=	1
 CATEGORIES=	science python # quantum-computing
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	DWave: Greedy binary quadratic model solvers
 WWW=		https://docs.ocean.dwavesys.com/projects/greedy/en/latest/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 PY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dwave-samplers>=1.0.0:science/py-dwave-samplers@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}importlib-metadata>0:devel/py-importlib-metadata@${PY_FLAVOR}
 BUILD_DEPENDS=	${PY_DEPENDS} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0.30.0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PY_DEPENDS}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dimod>0:science/py-dimod@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dwave-system>0:science/py-dwave-system@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}parameterized>0:devel/py-parameterized@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	distutils cython autoplist unittest
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	dwavesystems
 
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 TEST_WRKSRC=	${WRKSRC}/tests
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/science/py-dwave-hybrid/Makefile b/science/py-dwave-hybrid/Makefile
index b7495c5fa1bc..242017f7b83f 100644
--- a/science/py-dwave-hybrid/Makefile
+++ b/science/py-dwave-hybrid/Makefile
@@ -1,38 +1,39 @@
 PORTNAME=	dwave-hybrid
 DISTVERSION=	0.6.10
+PORTREVISION=	1
 CATEGORIES=	science python # quantum-computing
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	DWave: Hybrid asynchronous decomposition sampler prototype framework
 WWW=		https://docs.ocean.dwavesys.com/projects/hybrid/en/stable/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 PY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}click>5:devel/py-click@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dimod>=0.10.13:science/py-dimod@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dwave-greedy>=0.3.0:science/py-dwave-greedy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dwave-networkx>=0.8.10:science/py-dwave-networkx@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dwave-neal>=0.5.4:science/py-dwave-neal@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dwave-preprocessing>0:science/py-dwave-preprocessing@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dwave-system>=1.13.0:science/py-dwave-system@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dwave-tabu>=0.5.0:science/py-dwave-tabu@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}networkx>0:math/py-networkx@${PY_FLAVOR} \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}minorminer>=0.2.7:math/py-minorminer@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}plucky>=0.4.3:devel/py-plucky@${PY_FLAVOR}
 BUILD_DEPENDS=	${PY_DEPENDS}
 RUN_DEPENDS=	${PY_DEPENDS}
 
 USES=		python:3.9+
 USE_PYTHON=	distutils autoplist unittest # several tests fail, see https://github.com/dwavesystems/dwave-hybrid/issues/276
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	dwavesystems
 
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/science/py-dwave-inspector/Makefile b/science/py-dwave-inspector/Makefile
index 9f2a2dfb6d37..762d648a00c5 100644
--- a/science/py-dwave-inspector/Makefile
+++ b/science/py-dwave-inspector/Makefile
@@ -1,37 +1,38 @@
 PORTNAME=	dwave-inspector
 DISTVERSION=	0.4.0
+PORTREVISION=	1
 CATEGORIES=	science python # quantum-computing
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	DWave: Problem Inspector
 WWW=		https://docs.ocean.dwavesys.com/projects/inspector/en/latest/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dimod>=0.10.0:science/py-dimod@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dwave-cloud-client>=0.8.3:science/py-dwave-cloud-client@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dwave-system>=1.3.0:science/py-dwave-system@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Flask>=2.2:www/py-flask@${PY_FLAVOR} \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}werkzeug>0:www/py-werkzeug@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}vcrpy>0:devel/py-vcrpy@${PY_FLAVOR}
 
 USES=		python:3.9+
 USE_PYTHON=	distutils cython unittest # few tests fail, see https://github.com/dwavesystems/dwave-inspector/issues/151
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	dwavesystems
 
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 
 NO_ARCH=	yes
 
 post-install:
 	# remove conflicting __init__.py, see https://github.com/dwavesystems/dwave-system/issues/462
 	@${RM} -r \
 		${STAGEDIR}${PYTHON_SITELIBDIR}/dwave/__init__.py \
 		${STAGEDIR}${PYTHON_SITELIBDIR}/dwave/__pycache__
 
 .include <bsd.port.mk>
diff --git a/science/py-dwave-neal/Makefile b/science/py-dwave-neal/Makefile
index ccc9f838ac3a..310881f516f3 100644
--- a/science/py-dwave-neal/Makefile
+++ b/science/py-dwave-neal/Makefile
@@ -1,26 +1,27 @@
 PORTNAME=	dwave-neal
 DISTVERSION=	0.6.0
+PORTREVISION=	1
 CATEGORIES=	science python # quantum-computing
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	DWave: Simulated annealing sampler for general Ising model graphs
 WWW=		https://github.com/dwavesystems/dwave-neal
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dwave-samplers>=1.0.0:science/py-dwave-samplers@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	distutils autoplist unittest
 
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 
 NO_ARCH=	yes
 
 do-test:
 	@${SETENV} ${TEST_ENV} ${PYTHON_CMD} ${FILESDIR}/example.py
 
 .include <bsd.port.mk>
diff --git a/science/py-dwave-networkx/Makefile b/science/py-dwave-networkx/Makefile
index 17fcae38859c..1d7073c04581 100644
--- a/science/py-dwave-networkx/Makefile
+++ b/science/py-dwave-networkx/Makefile
@@ -1,31 +1,32 @@
 PORTNAME=	dwave-networkx
 DISTVERSION=	0.8.13
+PORTREVISION=	1
 CATEGORIES=	science python # quantum-computing
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	${PORTNAME:S/-/_/}-${DISTVERSION}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	DWave: Extension of the NetworkX Python package for graphs
 WWW=		https://github.com/dwavesystems/dwave-networkx
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 PY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dimod>=0.10.8:science/py-dimod@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}networkx>=2.4:math/py-networkx@${PY_FLAVOR}
 BUILD_DEPENDS=	${PY_DEPENDS}
 RUN_DEPENDS=	${PY_DEPENDS}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}parameterized>0:devel/py-parameterized@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	distutils cython autoplist unittest
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	dwavesystems
 
 NO_ARCH=	yes
 
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 
 .include <bsd.port.mk>
diff --git a/science/py-dwave-ocean-sdk/Makefile b/science/py-dwave-ocean-sdk/Makefile
index 1d7317917ce0..e9fb555d431c 100644
--- a/science/py-dwave-ocean-sdk/Makefile
+++ b/science/py-dwave-ocean-sdk/Makefile
@@ -1,41 +1,42 @@
 PORTNAME=	dwave-ocean-sdk
 DISTVERSION=	6.2.0
+PORTREVISION=	1
 CATEGORIES=	science python # quantum-computing
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	DWave: Meta-package for D-Wave's Ocean tools
 WWW=		https://docs.ocean.dwavesys.com/en/stable/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 PY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dimod>=0.12.3:science/py-dimod@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dwave-cloud-client>=0.10.4:science/py-dwave-cloud-client@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dwave-greedy>=0.3.0:science/py-dwave-greedy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dwave-hybrid>=0.6.10:science/py-dwave-hybrid@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dwave-inspector>=0.4.0:science/py-dwave-inspector@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dwave-neal>=0.6.0:science/py-dwave-neal@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dwave-networkx>=0.8.13:science/py-dwave-networkx@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dwave-preprocessing>=0.5.4:science/py-dwave-preprocessing@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dwave-samplers>=1.0.0:science/py-dwave-samplers@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dwave-system>=1.18.0:science/py-dwave-system@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dwave-tabu>=0.5.0:science/py-dwave-tabu@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dwavebinarycsp>=0.2.0:science/py-dwavebinarycsp@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}minorminer>=0.2.10:math/py-minorminer@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}penaltymodel>=1.0.2:science/py-penaltymodel@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyqubo>=1.4.0:science/py-pyqubo@${PY_FLAVOR}
 BUILD_DEPENDS=	${PY_DEPENDS}
 RUN_DEPENDS=	${PY_DEPENDS}
 
 USES=		python:3.7+
 USE_PYTHON=	distutils autoplist unittest
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	dwavesystems
 
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/science/py-dwave-preprocessing/Makefile b/science/py-dwave-preprocessing/Makefile
index 66e04f7f77f0..da3956a12803 100644
--- a/science/py-dwave-preprocessing/Makefile
+++ b/science/py-dwave-preprocessing/Makefile
@@ -1,39 +1,40 @@
 PORTNAME=	dwave-preprocessing
 DISTVERSION=	0.5.4
+PORTREVISION=	1
 CATEGORIES=	science python # quantum-computing
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	DWave: Preprocessing tools to aid in solving binary quadratic models
 WWW=		https://github.com/dwavesystems/dwave-preprocessing
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 PY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dimod>=0.12.2:science/py-dimod@${PY_FLAVOR} \
 		${PYNUMPY}
 BUILD_DEPENDS=	${PY_DEPENDS} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0.30.0:devel/py-wheel@${PY_FLAVOR}
 LIB_DEPENDS=	libspdlog.so:devel/spdlog
 RUN_DEPENDS=	${PY_DEPENDS}
 
 USES=		localbase:ldflags python:3.7+
 USE_PYTHON=	distutils cython unittest # 1 test fails, see https://github.com/dwavesystems/dwave-preprocessing/issues/74
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	dwavesystems
 
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 TEST_WRKSRC=	${WRKSRC}/tests
 
 post-install:
 	# strip binaries
 	@${STRIP_CMD} \
 		${STAGEDIR}${PYTHON_SITELIBDIR}/dwave/preprocessing/cyfix_variables${PYTHON_EXT_SUFFIX}.so \
 		${STAGEDIR}${PYTHON_SITELIBDIR}/dwave/preprocessing/presolve/cypresolve${PYTHON_EXT_SUFFIX}.so
 	# remove conflicting __init__.py, see https://github.com/dwavesystems/dwave-preprocessing/issues/45
 	@${RM} -r \
 		${STAGEDIR}${PYTHON_SITELIBDIR}/dwave/__init__.py \
 		${STAGEDIR}${PYTHON_SITELIBDIR}/dwave/__pycache__
 
 .include <bsd.port.mk>
diff --git a/science/py-dwave-samplers/Makefile b/science/py-dwave-samplers/Makefile
index 8eb4e72c32eb..a061f9cb4be5 100644
--- a/science/py-dwave-samplers/Makefile
+++ b/science/py-dwave-samplers/Makefile
@@ -1,46 +1,47 @@
 PORTNAME=	dwave-samplers
 DISTVERSION=	1.0.0
+PORTREVISION=	1
 CATEGORIES=	science python # quantum-computing
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	DWave: Classical algorithms for solving binary quadratic models
 WWW=		https://github.com/dwavesystems/dwave-samplers
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 PY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dimod>=0.12.0:science/py-dimod@${PY_FLAVOR} \
 		${PYNUMPY}
 BUILD_DEPENDS=	${PY_DEPENDS}
 RUN_DEPENDS=	${PY_DEPENDS}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}parameterized>0:devel/py-parameterized@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	distutils cython unittest
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	dwavesystems
 
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 TEST_WRKSRC=	${WRKSRC}/tests
 
 post-install:
 	# fix file paths, workaround for https://github.com/dwavesystems/dwave-samplers/issues/31
 	@cd ${STAGEDIR}${PYTHON_SITELIBDIR} && ( \
 		for f in `${FIND} samplers -name "*.so"`; do \
 			${MV} $$f dwave/$$f; \
 		done; \
 		${RM} -r samplers; \
 	)
 	# strip binaries
 	@${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR}/dwave/samplers -name "*${PYTHON_EXT_SUFFIX}.so" | ${XARGS} ${STRIP_CMD}
 	# remove conflicting __init__.py, see https://github.com/dwavesystems/dwave-system/issues/462
 	@${RM} -r \
 		${STAGEDIR}${PYTHON_SITELIBDIR}/dwave/__init__.py \
 		${STAGEDIR}${PYTHON_SITELIBDIR}/dwave/__pycache__
 
 post-test:
 	@${SETENV} ${TEST_ENV} ${PYTHON_CMD} ${FILESDIR}/example.py
 
 .include <bsd.port.mk>
diff --git a/science/py-dwave-system/Makefile b/science/py-dwave-system/Makefile
index 58b71e33d53d..ec17f5664004 100644
--- a/science/py-dwave-system/Makefile
+++ b/science/py-dwave-system/Makefile
@@ -1,43 +1,44 @@
 PORTNAME=	dwave-system
 DISTVERSION=	1.18.0
+PORTREVISION=	1
 CATEGORIES=	science python # quantum-computing
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	DWave: API for incorporating the D-Wave system as a sampler
 WWW=		https://github.com/dwavesystems/dwave-system
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 PY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dimod>=0.12.0:science/py-dimod@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dwave-cloud-client>=0.9.1:science/py-dwave-cloud-client@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dwave-greedy>=0.2.5:science/py-dwave-greedy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dwave-networkx>=0.8.10:science/py-dwave-networkx@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dwave-preprocessing>=0.5.0:science/py-dwave-preprocessing@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dwave-samplers>=1.0.0:science/py-dwave-samplers@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}homebase>=1.0.1:devel/py-homebase@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}minorminer>=0.2.9:math/py-minorminer@${PY_FLAVOR} \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=1.7.3:science/py-scipy@${PY_FLAVOR}
 BUILD_DEPENDS=	${PY_DEPENDS}
 RUN_DEPENDS=	${PY_DEPENDS}
 
 USES=		python:3.7+
 USE_PYTHON=	distutils unittest # 1 test fails because the closed source dwave.drivers optional dependency is missing
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	dwavesystems
 
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 TEST_WRKSRC=	${WRKSRC}/tests
 
 NO_ARCH=	yes
 
 post-install:
 	# remove conflicting __init__.py, see https://github.com/dwavesystems/dwave-system/issues/462
 	@${RM} -r \
 		${STAGEDIR}${PYTHON_SITELIBDIR}/dwave/__init__.py \
 		${STAGEDIR}${PYTHON_SITELIBDIR}/dwave/__pycache__
 
 .include <bsd.port.mk>
diff --git a/science/py-dwave-tabu/Makefile b/science/py-dwave-tabu/Makefile
index 6c209d6eab08..ff934edf99e7 100644
--- a/science/py-dwave-tabu/Makefile
+++ b/science/py-dwave-tabu/Makefile
@@ -1,29 +1,30 @@
 PORTNAME=	dwave-tabu
 DISTVERSION=	0.5.0
+PORTREVISION=	1
 CATEGORIES=	science python # quantum-computing
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	DWave: Tabu solver for QUBO/Ising problems
 WWW=		https://github.com/dwavesystems/dwave-tabu
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 PY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dwave-samplers>=1.0.0:science/py-dwave-samplers@${PY_FLAVOR}
 BUILD_DEPENDS=	${PY_DEPENDS} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0.30.0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PY_DEPENDS}
 
 USES=		python:3.7+
 USE_PYTHON=	distutils cython autoplist
 
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 
 NO_ARCH=	yes
 
 do-test:
 	@${SETENV} ${TEST_ENV} ${PYTHON_CMD} ${FILESDIR}/example.py
 
 .include <bsd.port.mk>
diff --git a/science/py-dwavebinarycsp/Makefile b/science/py-dwavebinarycsp/Makefile
index 466570b90a92..d08cb01306fb 100644
--- a/science/py-dwavebinarycsp/Makefile
+++ b/science/py-dwavebinarycsp/Makefile
@@ -1,29 +1,30 @@
 PORTNAME=	dwavebinarycsp
 DISTVERSION=	0.2.0
+PORTREVISION=	1
 CATEGORIES=	science python # quantum-computing
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	DWave: Map CSP with binary variables to binary quadratic models
 WWW=		https://docs.ocean.dwavesys.com/projects/binarycsp/en/latest/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 PY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dimod>=0.10.17:science/py-dimod@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}networkx>0:math/py-networkx@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}penaltymodel>=1.0.0:science/py-penaltymodel@${PY_FLAVOR}
 BUILD_DEPENDS=	${PY_DEPENDS}
 RUN_DEPENDS=	${PY_DEPENDS}
 
 USES=		python:3.9+
 USE_PYTHON=	distutils autoplist unittest
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	dwavesystems
 
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/science/py-earthpy/Makefile b/science/py-earthpy/Makefile
index 96b31df1a8cd..e5e2c6e6e6be 100644
--- a/science/py-earthpy/Makefile
+++ b/science/py-earthpy/Makefile
@@ -1,30 +1,31 @@
 PORTNAME=	earthpy
 PORTVERSION=	0.9.4
+PORTREVISION=	1
 CATEGORIES=	science geography python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Plot and manipulate spatial data in Python
 WWW=		https://github.com/earthlab/earthpy
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYNUMPY}	\
 		${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR}	\
 		${PYTHON_PKGNAMEPREFIX}rasterio>=0:graphics/py-rasterio@${PY_FLAVOR}	\
 		${PYTHON_PKGNAMEPREFIX}matplotlib>=0:math/py-matplotlib@${PY_FLAVOR}	\
 		${PYTHON_PKGNAMEPREFIX}geopandas>=0:graphics/py-geopandas@${PY_FLAVOR}	\
 		${PYTHON_PKGNAMEPREFIX}scikit-image>=0:graphics/py-scikit-image@${PY_FLAVOR}
 RUN_DEPENDS=	${PYNUMPY}	\
 		${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR}	\
 		${PYTHON_PKGNAMEPREFIX}rasterio>=0:graphics/py-rasterio@${PY_FLAVOR}	\
 		${PYTHON_PKGNAMEPREFIX}matplotlib>=0:math/py-matplotlib@${PY_FLAVOR}	\
 		${PYTHON_PKGNAMEPREFIX}geopandas>=0:graphics/py-geopandas@${PY_FLAVOR}	\
 		${PYTHON_PKGNAMEPREFIX}scikit-image>=0:graphics/py-scikit-image@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	distutils
 
 .include <bsd.port.mk>
diff --git a/science/py-eccodes/Makefile b/science/py-eccodes/Makefile
index 0234e41749a8..4b0c23293a4b 100644
--- a/science/py-eccodes/Makefile
+++ b/science/py-eccodes/Makefile
@@ -1,29 +1,30 @@
 PORTNAME=	eccodes
 PORTVERSION=	1.5.2
+PORTREVISION=	1
 CATEGORIES=	science python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Python interface to the ecCodes BUFR and GRIB de/encoder
 WWW=		https://github.com/ecmwf/eccodes-python
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libeccodes.so:science/eccodes
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}attrs>=0:devel/py-attrs@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cffi>=0:devel/py-cffi@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}findlibs>=0:devel/py-findlibs@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpy>=0,1:math/py-numpy@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-flakes>=0:devel/py-pytest-flakes@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}typing-extensions>=0:devel/py-typing-extensions@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	autoplist concurrent distutils pytest
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/science/py-esda/Makefile b/science/py-esda/Makefile
index 369a6c0c2300..b5d3b0f88647 100644
--- a/science/py-esda/Makefile
+++ b/science/py-esda/Makefile
@@ -1,31 +1,31 @@
 PORTNAME=	esda
 PORTVERSION=	2.4.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Exploratory Spatial Data Analysis
 WWW=		https://pysal.org/esda/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}libpysal>=0:science/py-libpysal@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pandas>=0,1:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-learn>=0:science/py-scikit-learn@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=0.11:science/py-scipy@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=	SHAPE
 SHAPE_DESC=	Shape statistics support
 
 SHAPE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}geopandas>=0:graphics/py-geopandas@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}pygeos>=0:graphics/py-pygeos@${PY_FLAVOR}
 
 .include <bsd.port.mk>
diff --git a/science/py-geometer/Makefile b/science/py-geometer/Makefile
index f44cc046888a..5ca84b672cb5 100644
--- a/science/py-geometer/Makefile
+++ b/science/py-geometer/Makefile
@@ -1,21 +1,22 @@
 PORTNAME=	geometer
 PORTVERSION=	0.3.5
+PORTREVISION=	1
 CATEGORIES=	science python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Python geometry package based on projective geometry and numpy
 WWW=		https://github.com/jan-mue/geometer
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=1.15,1:math/py-numpy@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/science/py-geometric/Makefile b/science/py-geometric/Makefile
index 2145c5a04554..8c0287c25702 100644
--- a/science/py-geometric/Makefile
+++ b/science/py-geometric/Makefile
@@ -1,23 +1,24 @@
 PORTNAME=	geometric
 DISTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	science python # chemistry
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Geometry optimization for quantum chemistry
 WWW=		https://github.com/leeping/geomeTRIC
 
 LICENSE=	BSD3CLAUSE
 
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}networkx>0:math/py-networkx@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ase>0:science/py-ase@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_PYTHON=	distutils concurrent autoplist pytest # some tests fail because of missing large test files
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/science/py-gpaw/Makefile b/science/py-gpaw/Makefile
index b2d36ccd7f1f..eb7041c8572b 100644
--- a/science/py-gpaw/Makefile
+++ b/science/py-gpaw/Makefile
@@ -1,45 +1,45 @@
 PORTNAME=	gpaw
 DISTVERSION=	22.1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	DFT and beyond within the projector-augmented wave method in chemistry
 WWW=		https://wiki.fysik.dtu.dk/gpaw/
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYNUMPY}
 LIB_DEPENDS=	libblas.so:math/blas \
 		libmpich.so:net/mpich \
 		libopenblas.so:math/openblas \
 		libxc.so:science/libxc
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ase>0:science/py-ase@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=0:science/py-scipy@${PY_FLAVOR} \
 		gpaw-setups>0:science/gpaw-setups
 
 USES=		gettext-runtime localbase python:3.7+ shebangfix
 USE_PYTHON=	distutils concurrent autoplist
 
 SHEBANG_FILES=	tools/*
 
 LDFLAGS=	-lmpi # otherwise: ImportError: /usr/local/lib/python3.8/site-packages/_gpaw.cpython-38.so: Undefined symbol "MPI_Comm_rank"
 
 post-patch:
 	@${REINPLACE_CMD} "s|'/usr/local/|'${LOCALBASE}/|" ${WRKSRC}/gpaw/__init__.py
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/_gpaw*.so
 
 do-test: install
 	@${ECHO} "== Performing a test calculation on one CPU =="
 	@gpaw test
 	@${ECHO} "== Performing a test calculation on 8 CPUs =="
 	@gpaw -P 8 test
 
 .include <bsd.port.mk>
diff --git a/science/py-gsd/Makefile b/science/py-gsd/Makefile
index 2e196f30bde0..4942ab5908ee 100644
--- a/science/py-gsd/Makefile
+++ b/science/py-gsd/Makefile
@@ -1,27 +1,28 @@
 PORTNAME=	gsd
 DISTVERSION=	2.6.0
+PORTREVISION=	1
 CATEGORIES=	science python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	GSD (General Simulation Data) file format for Python
 WWW=		https://bitbucket.org/glotzer/gsd/wiki/Home
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYNUMPY}
 RUN_DEPENDS=	${PYNUMPY}
 
 USES=		python:3.6+
 USE_PYTHON=	distutils cython autoplist pytest
 
 TEST_WRKSRC=	${WRKSRC}/gsd/test
 #TEST_ARGS=	--pyargs gsd -p gsd.pytest_plugin_validate --validate # enable this line to run longer tests, see https://gsd.readthedocs.io/en/v2.6.0/installation.html#run-tests
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/gsd/fl*.so
 
 .include <bsd.port.mk>
diff --git a/science/py-h5json/Makefile b/science/py-h5json/Makefile
index 126ee58a4395..440eb97bef01 100644
--- a/science/py-h5json/Makefile
+++ b/science/py-h5json/Makefile
@@ -1,23 +1,24 @@
 PORTNAME=	h5json
 DISTVERSION=	1.1.3
+PORTREVISION=	1
 CATEGORIES=	science python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Tools and library for representing HDF5 in JSON
 WWW=		https://github.com/HDFGroup/hdf5-json
 
 LICENSE=	BSD3CLAUSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pkgconfig>0:devel/py-pkgconfig@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}h5py>0:science/py-h5py@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	distutils concurrent autoplist
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/science/py-h5py/Makefile b/science/py-h5py/Makefile
index 2eb8548b8e3b..7b0b27ddb76d 100644
--- a/science/py-h5py/Makefile
+++ b/science/py-h5py/Makefile
@@ -1,36 +1,37 @@
 PORTNAME=	h5py
 PORTVERSION=	3.8.0
+PORTREVISION=	1
 CATEGORIES=	science python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	General-purpose Python interface to the HDF5 library
 WWW=		https://www.h5py.org/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/licenses/license.txt
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pkgconfig>=0,1:devel/py-pkgconfig@${PY_FLAVOR} \
 		${RUN_DEPENDS}
 LIB_DEPENDS=	libhdf5.so:science/hdf5
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=1.14.5,1:math/py-numpy@${PY_FLAVOR}
 
 USES=		localbase pkgconfig python:3.7+
 USE_PYTHON=	autoplist concurrent cython distutils pytest
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 post-install:
 	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' -exec ${STRIP_CMD} {} +
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.rst ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/docs/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/*.py ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/science/py-hiphive/Makefile b/science/py-hiphive/Makefile
index dea48c3652c2..b01d232fc46a 100644
--- a/science/py-hiphive/Makefile
+++ b/science/py-hiphive/Makefile
@@ -1,30 +1,31 @@
 PORTNAME=	hiphive
 DISTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	science python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	High-order force constants for the masses
 WWW=		https://hiphive.materialsmodeling.org/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ase>0:science/py-ase@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}h5py>0:science/py-h5py@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numba>0:devel/py-numba@${PY_FLAVOR} \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=1.0.0:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-learn>0:science/py-scikit-learn@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}spglib>0:science/py-spglib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sympy>=1.1:math/py-sympy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}trainstation>=0.2:science/py-trainstation@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_PYTHON=	distutils autoplist
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/science/py-hoomd-blue/Makefile b/science/py-hoomd-blue/Makefile
index 4a2a89b2665b..cc654b16f290 100644
--- a/science/py-hoomd-blue/Makefile
+++ b/science/py-hoomd-blue/Makefile
@@ -1,60 +1,61 @@
 PORTNAME=	hoomd-blue
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.11.0
+PORTREVISION=	1
 CATEGORIES=	science # physics
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Molecular dynamics and Monte Carlo soft matter simulation
 WWW=		https://glotzerlab.engin.umich.edu/hoomd-blue/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	pybind11>0:devel/pybind11
 
 USES=		cmake:testing compiler:c++17-lang eigen:3 localbase:ldflags python shebangfix # see https://github.com/glotzerlab/hoomd-blue/issues/1204
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	glotzerlab
 
 GH_TUPLE=	glotzerlab:upp11:0c1fb8d:glotzerlab_upp11/hoomd/extern/upp11 \
 		glotzerlab:nano-signal-slot:34223a4:glotzerlab_nano_signal_slot/hoomd/extern/nano-signal-slot \
 		glotzerlab:quickhull:a706b5b:glotzerlab_quickhull/hoomd/extern/quickhull \
 		glotzerlab:random123:a2c4f04:glotzerlab_random123/hoomd/extern/random123 \
 		glotzerlab:HIP:d211f99:glotzerlab_HIP/hoomd/extern/HIP \
 		glotzerlab:hipCUB:c70e193:glotzerlab_hipCUB/hoomd/extern/hipCUB \
 		mphowardlab:neighbor:ba0f068:mphowardlab_neighbor/hoomd/extern/neighbor \
 		mphowardlab:hipper:b6da049:mphowardlab_hipper/hoomd/extern/hipper
 
 SHEBANG_GLOB=	*.sh
 
 CMAKE_OFF=	BUILD_TESTING
 
 LDFLAGS+=	-lexecinfo
 
 OPTIONS_DEFINE=		TBB
 OPTIONS_SINGLE=		MPI
 OPTIONS_SINGLE_MPI=	NOMPI MPICH OPENMPI
 OPTIONS_DEFAULT=	MPICH TBB
 OPTIONS_SUB=		yes
 
 NOMPI_DESC=		Build without parallel processing support
 NOMPI_CMAKE_ON=		-DENABLE_MPI=OFF
 
 MPICH_USES=		mpi:mpich
 MPICH_CMAKE_ON=		-DENABLE_MPI=ON
 MPICH_BUILD_DEPENDS=	cereal>0:devel/cereal
 
 OPENMPI_USES=		mpi:openmpi
 OPENMPI_CMAKE_ON=	-DENABLE_MPI=ON
 OPENMPI_BUILD_DEPENDS=	cereal>0:devel/cereal
 OPENMPI_BROKEN=		see https://github.com/glotzerlab/hoomd-blue/issues/1397
 
 TBB_DESC=		Enable support for Threading Building Blocks (TBB)
 TBB_CMAKE_BOOL=		ENABLE_TBB
 TBB_LIB_DEPENDS=	libtbb.so:devel/onetbb
 
 # the test mpi-test_communication requires excessive resources, see https://github.com/glotzerlab/hoomd-blue/issues/1396
 
 .include <bsd.port.mk>
diff --git a/science/py-inequality/Makefile b/science/py-inequality/Makefile
index 23725265969d..f2ac966b96e0 100644
--- a/science/py-inequality/Makefile
+++ b/science/py-inequality/Makefile
@@ -1,21 +1,22 @@
 PORTNAME=	inequality
 PORTVERSION=	1.0.0
+PORTREVISION=	1
 CATEGORIES=	science python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Spatial inequality analysis for PySAL
 WWW=		https://inequality.readthedocs.io/en/latest/
 
 LICENSE=	BSD3CLAUSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=1.3,1:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=0.11:science/py-scipy@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/science/py-ipygany/Makefile b/science/py-ipygany/Makefile
index 329499c3ed09..b81c56ae4ac9 100644
--- a/science/py-ipygany/Makefile
+++ b/science/py-ipygany/Makefile
@@ -1,25 +1,26 @@
 PORTNAME=	ipygany
 DISTVERSION=	0.5.0
+PORTREVISION=	1
 CATEGORIES=	science python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	3-D scientific visualization in Jupyter Notebooks
 WWW=		https://github.com/martinRenou/ipygany
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}jupyter-packaging>0:devel/py-jupyter-packaging@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ipywidgets>0:devel/py-ipywidgets@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}traittypes>0:devel/py-traittypes@${PY_FLAVOR} \
 		${PYNUMPY}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ipydatawidgets>0:devel/py-ipydatawidgets@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_PYTHON=	distutils concurrent autoplist pytest
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/science/py-jupyter_jsmol/Makefile b/science/py-jupyter_jsmol/Makefile
index 662c978f3f95..279ee352176e 100644
--- a/science/py-jupyter_jsmol/Makefile
+++ b/science/py-jupyter_jsmol/Makefile
@@ -1,41 +1,41 @@
 PORTNAME=	jupyter-jsmol
 PORTVERSION=	2021.3.0
-PORTREVISION=	1
+PORTREVISION=	2
 DISTVERSIONPREFIX=	v
 CATEGORIES=	science devel python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	JSmol viewer widget for Jupyter Notebooks and JupyterLab
 WWW=		https://github.com/fekad/jupyter-jsmol
 
 LICENSE=	BSD3CLAUSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}widgetsnbextension>0:devel/py-widgetsnbextension@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ipykernel>=5.0.0:devel/py-ipykernel@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ipywidgets>0:devel/py-ipywidgets@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ipython>=7.0.0:devel/ipython@${PY_FLAVOR}
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	fekad
 
 USES=		python:3.7+ pytest
 USE_PYTHON=	distutils
 PYDISTUTILS_CONFIGUREARGS=	--skip-npm
 PYDISTUTILS_BUILDARGS=		--skip-npm
 
 OPTIONS_DEFINE=		EXAMPLES
 EXAMPLES_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ase>0:science/py-ase@${PY_FLAVOR}	\
 			${PYTHON_PKGNAMEPREFIX}plotly>0:graphics/py-plotly@${PY_FLAVOR}	\
 			${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR}
 
 PORTEXAMPLES=	*
 PLIST_SUB+=	VER=${PORTVERSION}
 NO_ARCH=	yes
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/science/py-kimpy/Makefile b/science/py-kimpy/Makefile
index c24894e05c9a..89e5c68a3cb6 100644
--- a/science/py-kimpy/Makefile
+++ b/science/py-kimpy/Makefile
@@ -1,24 +1,25 @@
 PORTNAME=	kimpy
 DISTVERSION=	2.1.0
+PORTREVISION=	1
 CATEGORIES=	science python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Python interface to the KIM-API
 WWW=		https://openkim.org/kim-api/
 
 LICENSE=	CDDL
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pybind11>0:devel/py-pybind11@${PY_FLAVOR}
 LIB_DEPENDS=	libkim-api.so:science/kim-api
 RUN_DEPENDS=	${PYNUMPY}
 
 USES=		compiler:c++20-lang pkgconfig python:3.6+
 USE_PYTHON=	distutils autoplist pytest # tests fail to run, see https://github.com/openkim/kimpy/issues/16
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/kimpy/*${PYTHON_EXT_SUFFIX}.so
 
 .include <bsd.port.mk>
diff --git a/science/py-kinematics/Makefile b/science/py-kinematics/Makefile
index a02e39719899..9ff56acadac1 100644
--- a/science/py-kinematics/Makefile
+++ b/science/py-kinematics/Makefile
@@ -1,23 +1,24 @@
 PORTNAME=	kinematics
 PORTVERSION=	0.1.7
+PORTREVISION=	1
 CATEGORIES=	science python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Python module to do attitude kinematics
 WWW=		https://github.com/skulumani/kinematics
 
 LICENSE=	GPLv3
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=0,1:math/py-numpy@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}coverage>=0:devel/py-coverage@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/science/py-kliff/Makefile b/science/py-kliff/Makefile
index f7fab2b99948..08ba5cddd14b 100644
--- a/science/py-kliff/Makefile
+++ b/science/py-kliff/Makefile
@@ -1,29 +1,30 @@
 PORTNAME=	kliff
 DISTVERSION=	0.4.1
+PORTREVISION=	1
 CATEGORIES=	science python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	KIM-based Learning-Integrated Fitting Framework
 WWW=		https://github.com/mjwen/kliff
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pybind11>0:devel/py-pybind11@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}kimpy>0:science/py-kimpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}loguru>0:devel/py-loguru@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}monty>0:devel/py-monty@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pybind11>0:devel/py-pybind11@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
 
 USES=		compiler:c++11-lang python:3.6+
 USE_PYTHON=	distutils autoplist pytest # tests fail to run, see https://github.com/openkim/kliff/issues/81
 
 post-install:
 	@${FIND} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} -name "*.so" | ${XARGS} ${STRIP_CMD}
 
 .include <bsd.port.mk>
diff --git a/science/py-kpLib/Makefile b/science/py-kpLib/Makefile
index 28096ae8d464..c5faaf353ac0 100644
--- a/science/py-kpLib/Makefile
+++ b/science/py-kpLib/Makefile
@@ -1,29 +1,30 @@
 PORTNAME=	kpLib
 DISTVERSION=	1.1.1
+PORTREVISION=	1
 CATEGORIES=	science python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Library for finding optimal Generalized Monkhorst-Pack k-points grid
 WWW=		https://gitlab.com/muellergroup/kplib
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 PY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}click>=7.1.2:devel/py-click@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pymatgen>=2021.3.9:science/py-pymatgen@${PY_FLAVOR}
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pybind11>0:devel/py-pybind11@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm@${PY_FLAVOR} \
 		${PY_DEPENDS}
 RUN_DEPENDS=	${PY_DEPENDS}
 
 USES=		compiler:c++17-lang localbase python
 USE_LDCONFIG=	yes
 
 USE_PYTHON=	distutils concurrent autoplist
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/kpLib/lib${PYTHON_EXT_SUFFIX}.so
 
 .include <bsd.port.mk>
diff --git a/science/py-libgetar/Makefile b/science/py-libgetar/Makefile
index 90341e111091..63ef47520f89 100644
--- a/science/py-libgetar/Makefile
+++ b/science/py-libgetar/Makefile
@@ -1,33 +1,34 @@
 PORTNAME=	libgetar
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.1.3
+PORTREVISION=	1
 CATEGORIES=	science # physics
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Library to read and write GEneric Trajectory ARchives
 WWW=		https://github.com/glotzerlab/libgetar
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 PY_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}breathe>0:devel/py-breathe@${PY_FLAVOR}
 BUILD_DEPENDS=	${PY_DEPENDS}
 RUN_DEPENDS=	${PY_DEPENDS}
 
 USES=		python
 USE_PYTHON=	distutils cython autoplist
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	glotzerlab
 
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/gtar/_gtar${PYTHON_EXT_SUFFIX}.so
 
 do-test:
 	@cd ${WRKSRC}/test && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m unittest discover
 
 .include <bsd.port.mk>
diff --git a/science/py-libpysal/Makefile b/science/py-libpysal/Makefile
index 97f3f93ddf59..61b7fd39b00d 100644
--- a/science/py-libpysal/Makefile
+++ b/science/py-libpysal/Makefile
@@ -1,28 +1,29 @@
 PORTNAME=	libpysal
 PORTVERSION=	4.7.0
+PORTREVISION=	1
 CATEGORIES=	science python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Core components of PySAL A library of spatial analysis functions
 WWW=		https://pysal.org/libpysal/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=0:www/py-beautifulsoup@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpy>=1.3,1:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}packaging>=0:devel/py-packaging@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pandas>=0,1:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}platformdirs>=0:devel/py-platformdirs@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=0.11:science/py-scipy@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/science/py-lifelines/Makefile b/science/py-lifelines/Makefile
index f69769cf4211..d8d46a68e249 100644
--- a/science/py-lifelines/Makefile
+++ b/science/py-lifelines/Makefile
@@ -1,27 +1,27 @@
 PORTNAME=	lifelines
 DISTVERSION=	0.19.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	rm@FreeBSD.org
 COMMENT=	Survival analysis in Python
 WWW=		https://github.com/CamDavidsonPilon/lifelines/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}pandas>=0.18:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>1.0:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>2.0:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}bottleneck>=1.0:math/py-bottleneck@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}autograd>=1.2:math/py-autograd@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	autoplist distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/science/py-mdp/Makefile b/science/py-mdp/Makefile
index 63746407ca40..b0bc0f772141 100644
--- a/science/py-mdp/Makefile
+++ b/science/py-mdp/Makefile
@@ -1,29 +1,29 @@
 PORTNAME=	mdp
 PORTVERSION=	3.5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	science python
 MASTER_SITES=	SF/${PORTNAME}-toolkit/${PORTNAME}-toolkit/${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	${PORTNAME:tu}-${PORTVERSION}
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Modular toolkit for Data Processing
 WWW=		http://mdp-toolkit.sourceforge.net/
 
 LICENSE=	BSD3CLAUSE
 
 RUN_DEPENDS=	${PYNUMPY}
 
 USES=		python:3.6+
 USE_PYTHON=	distutils autoplist
 
 OPTIONS_DEFINE=	LIBSVM SCIPY
 
 LIBSVM_DESC=	Provide the LibSVMClassifier node
 SCIPY_DESC=	Instal SciPy versions of eigensolver, FFT and convolution
 
 LIBSVM_RUN_DEPENDS=	libsvm>2.91:science/libsvm \
 			libsvm-python>2.91:science/libsvm-python
 SCIPY_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}scipy>=0.5.2:science/py-scipy@${PY_FLAVOR}
 
 .include <bsd.port.mk>
diff --git a/science/py-meshio/Makefile b/science/py-meshio/Makefile
index 1d3b955fd3aa..24d82384167e 100644
--- a/science/py-meshio/Makefile
+++ b/science/py-meshio/Makefile
@@ -1,32 +1,33 @@
 PORTNAME=	meshio
 PORTVERSION=	5.3.4
+PORTREVISION=	1
 CATEGORIES=	science cad python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	I/O for many mesh formats
 WWW=		https://github.com/nschloe/meshio
 
 LICENSE=	MIT
 
 BUILD_DEPENDS=	${PYNUMPY}	\
 		${PYTHON_PKGNAMEPREFIX}h5py>0:science/py-h5py@${PY_FLAVOR}
 RUN_DEPENDS=	${PYNUMPY}	\
 		${PYTHON_PKGNAMEPREFIX}h5py>0:science/py-h5py@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}rich>0:textproc/py-rich@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}netCDF4>0:science/py-netCDF4@${PY_FLAVOR}
 
 USES=		pytest python:3.7+
 USE_PYTHON=	distutils
 
 NO_ARCH=	yes
 
 PLIST_SUB=	PARAVIEW_VER=${PARAVIEW_VER}
 
 post-stage:
 	${MV} ${STAGEDIR}${PREFIX}/share/paraview-5.9	\
 		${STAGEDIR}${PREFIX}/lib/paraview-${PARAVIEW_VER}
 
 .include <../../science/paraview/Makefile.version>
 .include <bsd.port.mk>
diff --git a/science/py-mmtf-python/Makefile b/science/py-mmtf-python/Makefile
index 6bff6c6cf5ff..3679976ff1bc 100644
--- a/science/py-mmtf-python/Makefile
+++ b/science/py-mmtf-python/Makefile
@@ -1,31 +1,32 @@
 PORTNAME=	mmtf-python
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.1.3
+PORTREVISION=	1
 CATEGORIES=	science python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	MMTF (Macromolecular Transmission Format) Python API
 WWW=		https://github.com/rcsb/mmtf-python
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}msgpack>=1.0.0:devel/py-msgpack@${PY_FLAVOR} \
 		${PYNUMPY}
 
 USES=		python:3.6+
 USE_PYTHON=	distutils autoplist
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	rcsb
 
 NO_ARCH=	yes
 
 post-build:
 	@${RM} ${STAGEDIR}${PREFIX}/bin/sample
 
 post-plist:
 	@${REINPLACE_CMD} -e '|bin/sample|d' ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/science/py-molmod/Makefile b/science/py-molmod/Makefile
index 8e07a6f72ee8..92bf8827c12c 100644
--- a/science/py-molmod/Makefile
+++ b/science/py-molmod/Makefile
@@ -1,27 +1,28 @@
 PORTNAME=	molmod
 DISTVERSION=	1.4.8
+PORTREVISION=	1
 CATEGORIES=	science python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Collection of molecular modelling tools for python
 WWW=		https://github.com/molmod/molmod
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BUILD_DEPENDS=	${PYNUMPY}
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR}
 
 USES=		python:3.6+ shebangfix
 SHEBANG_GLOB=	*.py
 USE_PYTHON=	distutils cython cython_run autoplist
 
 do-test: # Tests fail: https://github.com/molmod/molmod/issues/27
 	@cd ${WRKSRC} && \
 		${SETENV} ${MAKE_ENV} nosetests-${PYTHON_VER} -v molmod
 
 .include <bsd.port.mk>
diff --git a/science/py-moltemplate/Makefile b/science/py-moltemplate/Makefile
index e65711959c2d..ec87e5eced96 100644
--- a/science/py-moltemplate/Makefile
+++ b/science/py-moltemplate/Makefile
@@ -1,42 +1,43 @@
 PORTNAME=	moltemplate
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.20.17
+PORTREVISION=	1
 CATEGORIES=	science python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Tool to prepare simulations of molecules, complex molecular assemblies
 WWW=		https://www.moltemplate.org/
 
 LICENSE=	MIT
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner@${PY_FLAVOR}
 RUN_DEPENDS=	${PYNUMPY} \
 		bash:shells/bash
 TEST_DEPENDS=	shunit2>0:devel/shunit2
 
 USES=		python:3.6+ shebangfix
 USE_PYTHON=	distutils concurrent autoplist
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	jewettaij
 
 SHEBANG_FILES=	moltemplate/scripts/molc.sh #shunit2/shunit2
 
 NO_ARCH=	yes
 
 BINARY_ALIAS=	python3=${PYTHON_CMD}
 
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} PATH=${STAGEDIR}${LOCALBASE}/bin:${PATH}
 
 do-test: # testsuite instructions: https://github.com/jewettaij/moltemplate/issues/65#issuecomment-1022740972
 	# 1 test fails, see https://github.com/jewettaij/moltemplate/issues/86
 	@cd ${WRKSRC} && \
 		([ -e shunit2 ] || (${MKDIR} tests/shunit2 && ${RM} tests/shunit2/shunit2 && ${LN} -s ${LOCALBASE}/bin/shunit2 tests/shunit2/shunit2)) && \
 		${SETENV} ${TEST_ENV} bash tests/test_read_coords_pdb.sh && \
 		${SETENV} ${TEST_ENV} bash tests/test_ltemplify.sh && \
 		${SETENV} ${TEST_ENV} bash tests/test_oplsaa.sh && \
 		${SETENV} ${TEST_ENV} bash tests/test_compass.sh && \
 		${SETENV} ${TEST_ENV} python3 tests/test_genpoly_lt.py
 
 .include <bsd.port.mk>
diff --git a/science/py-mrchem/Makefile b/science/py-mrchem/Makefile
index 149218f88ffd..49f2edbf89f7 100644
--- a/science/py-mrchem/Makefile
+++ b/science/py-mrchem/Makefile
@@ -1,37 +1,38 @@
 PORTNAME=	mrchem
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.1.2
+PORTREVISION=	1
 CATEGORIES=	science python # chemistry
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	MultiResolution Chemistry
 WWW=		https://github.com/MRChemSoft/mrchem
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/../LICENSE
 
 RUN_DEPENDS=	mrchem>0:science/mrchem
 
 USES=		cmake python shebangfix
 USE_PYTHON=	concurrent flavors
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	MRChemSoft
 
 SHEBANG_FILES=	mrchem.in ../tests/*/test
 
 WRKSRC_SUBDIR=	python
 
 NO_ARCH=	yes
 
 CMAKE_ARGS=	-DPython3_EXECUTABLE=${PYTHON_CMD} \
 		-DCMAKE_INSTALL_BINDIR=bin \
 		-DPYMOD_INSTALL_LIBDIR=${PYTHON_SITELIBDIR:S;${PREFIX}/lib/;;}
 
 post-install:
 	@${RMDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/mrchem/input_parser/docs
 
 # tests should be run in science/mrchem
 
 .include <bsd.port.mk>
diff --git a/science/py-netCDF4/Makefile b/science/py-netCDF4/Makefile
index 35a5314e886f..4a9b8f575a62 100644
--- a/science/py-netCDF4/Makefile
+++ b/science/py-netCDF4/Makefile
@@ -1,53 +1,54 @@
 PORTNAME=	netCDF4
 PORTVERSION=	1.6.3
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 DISTVERSIONSUFFIX=	rel
 CATEGORIES=	science python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Python Interface to the NetCDF Library (versions 3 and 4)
 WWW=		https://unidata.github.io/netcdf4-python/
 
 LICENSE=	MIT
 
 BUILD_DEPENDS=	${PYNUMPY}
 LIB_DEPENDS=	libhdf5.so:science/hdf5 \
 		libnetcdf.so:science/netcdf
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}cftime>=0:devel/py-cftime@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_GITHUB=	yes
 GH_ACCOUNT=	Unidata
 GH_PROJECT=	netcdf4-python
 USE_PYTHON=	autoplist concurrent cython cython_run distutils
 
 DOCSDIR=	${PREFIX}/share/doc/py-${PORTNAME}
 EXAMPLESDIR=	${PREFIX}/share/examples/py-${PORTNAME}
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 post-patch:
 	@${ECHO_CMD} -n > ${WRKSRC}/setup.cfg
 	@${ECHO_CMD} "[options]" >> ${WRKSRC}/setup.cfg
 	@${ECHO_CMD} "use_ncconfig=True" >> ${WRKSRC}/setup.cfg
 	@${ECHO_CMD} "ncconfig=${LOCALBASE}/bin/nc-config" >> ${WRKSRC}/setup.cfg
 	@${ECHO_CMD} "[directories]" >> ${WRKSRC}/setup.cfg
 	@${ECHO_CMD} "HDF5_libdir=${LOCALBASE}/lib" >> ${WRKSRC}/setup.cfg
 	@${ECHO_CMD} "HDF5_incdir=${LOCALBASE}/include" >> ${WRKSRC}/setup.cfg
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/netCDF4/_netCDF4*.so
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	(cd ${WRKSRC}/examples && ${INSTALL_DATA} * ${STAGEDIR}${EXAMPLESDIR})
 
 .include <bsd.port.mk>
diff --git a/science/py-netcdf-flattener/Makefile b/science/py-netcdf-flattener/Makefile
index 16ed80bb8e28..100244ebca7a 100644
--- a/science/py-netcdf-flattener/Makefile
+++ b/science/py-netcdf-flattener/Makefile
@@ -1,25 +1,26 @@
 PORTNAME=	netcdf-flattener
 PORTVERSION=	1.2.0
+PORTREVISION=	1
 CATEGORIES=	science python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Flatten NetCDF files while preserving references
 WWW=		https://gitlab.eumetsat.int/open-source/netcdf-flattener
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}netCDF4>=0:science/py-netCDF4@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 do-test:
 	cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -rs -v
 
 .include <bsd.port.mk>
diff --git a/science/py-nibabel/Makefile b/science/py-nibabel/Makefile
index 3f82b2add214..4396ad1629ac 100644
--- a/science/py-nibabel/Makefile
+++ b/science/py-nibabel/Makefile
@@ -1,22 +1,23 @@
 PORTNAME=	nibabel
 DISTVERSION=	3.2.2
+PORTREVISION=	1
 CATEGORIES=	science python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Read/write some common neuroimaging file formats
 WWW=		https://nipy.org/nibabel/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_PYTHON=	distutils concurrent autoplist
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/science/py-nilearn/Makefile b/science/py-nilearn/Makefile
index 9cbf9a081ec6..3f4e5346bbac 100644
--- a/science/py-nilearn/Makefile
+++ b/science/py-nilearn/Makefile
@@ -1,39 +1,40 @@
 PORTNAME=	nilearn
 DISTVERSION=	0.8.1
+PORTREVISION=	1
 CATEGORIES=	science python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Statistical learning for neuroimaging in Python
 WWW=		https://nilearn.github.io/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN=		does not install: No module named 'threadpoolctl'. Module "sklearn" could not be found. Core reason is that threadpoolctl is broken, see https://reviews.freebsd.org/D35513
 
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}codecov>0:devel/py-codecov@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}joblib>0:devel/py-joblib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}nibabel>0:science/py-nibabel@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-learn>0:science/py-scikit-learn@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \
 		bash:shells/bash
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAVOR}
 
 USES=		python:3.7+ shebangfix
 USE_PYTHON=	distutils autoplist
 
 SHEBANG_FILES=	nilearn/datasets/tests/data/list_archive_contents.sh
 
 NO_ARCH=	yes
 
 do-test:
 	@cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -rs -v
 
 .include <bsd.port.mk>
diff --git a/science/py-obspy/Makefile b/science/py-obspy/Makefile
index 8f0c35dcef96..14802342acf5 100644
--- a/science/py-obspy/Makefile
+++ b/science/py-obspy/Makefile
@@ -1,37 +1,38 @@
 PORTNAME=	obspy
 PORTVERSION=	1.4.0
+PORTREVISION=	1
 CATEGORIES=	science python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Python framework for seismological observatories
 WWW=		https://www.obspy.org/
 
 LICENSE=	LGPL3
 
 BUILD_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=1.7.0:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}future>=0.12.4:devel/py-future@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>=3.3.0:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}lxml>=2.2:devel/py-lxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}decorator>=0:devel/py-decorator@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0:databases/py-sqlalchemy10@${PY_FLAVOR}
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		fortran python:3.8+ shebangfix
 SHEBANG_FILES=	obspy/taup/tests/data/TauP_test_data/gendata.sh
 USE_LDCONFIG=	yes
 LDFLAGS+=	-shared
 USE_PYTHON=	autoplist distutils
 
 LDFLAGS+=	-shared
 
 post-patch:
 	${REINPLACE_CMD} -e "s#FC#${FC}#g" ${WRKSRC}/setup.py
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/obspy/lib/*.so
 
 .include <bsd.port.mk>
diff --git a/science/py-oddt/Makefile b/science/py-oddt/Makefile
index 590fda7e9a44..8c4b99a6b6ee 100644
--- a/science/py-oddt/Makefile
+++ b/science/py-oddt/Makefile
@@ -1,29 +1,29 @@
 PORTNAME=	oddt
 DISTVERSION=	0.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Open Drug Discovery Toolkit
 WWW=		https://github.com/oddt/oddt
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 PY_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}joblib>=0.9.4:devel/py-joblib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pandas>=0.19.2:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-learn>=0.18:science/py-scikit-learn@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=0.17:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
 BUILD_DEPENDS=	${PY_DEPENDS}
 RUN_DEPENDS=	${PY_DEPENDS}
 
 USES=		python:3.7+
 USE_GITHUB=	yes
 USE_PYTHON=	distutils concurrent autoplist
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/science/py-openpiv/Makefile b/science/py-openpiv/Makefile
index 7f3d34a64466..35079a2ab12b 100644
--- a/science/py-openpiv/Makefile
+++ b/science/py-openpiv/Makefile
@@ -1,34 +1,35 @@
 PORTNAME=	openpiv
 PORTVERSION=	0.23.8
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	science python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Python module for Particle Image Velocimetry
 WWW=		http://www.openpiv.net/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BUILD_DEPENDS=	${PYNUMPY}
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=0:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-image>=0.12.0:graphics/py-scikit-image@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	autoplist distutils
 USE_GITHUB=	yes
 GH_ACCOUNT=	OpenPIV
 GH_PROJECT=	openpiv-python
 
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=	EXTRA
 EXTRA_DESC=	Install additional Python packages (for tutorial/examples)
 
 EXTRA_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}matplotlib>=0:math/py-matplotlib@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}natsort>=0:devel/py-natsort@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}imageio>=0:graphics/py-imageio@${PY_FLAVOR}
 
 .include <bsd.port.mk>
diff --git a/science/py-optking/Makefile b/science/py-optking/Makefile
index 0a5c2740691b..d8ce33ce22e5 100644
--- a/science/py-optking/Makefile
+++ b/science/py-optking/Makefile
@@ -1,27 +1,28 @@
 PORTNAME=	optking
 DISTVERSION=	0.2.1
+PORTREVISION=	1
 CATEGORIES=	science python # chemistry
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Python version of the PSI4 geometry optimization program by R.A. King
 WWW=		https://github.com/psi-rking/optking
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}msgpack>=1.0:devel/py-msgpack@${PY_FLAVOR} \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}qcelemental>=0.20.0:science/py-qcelemental@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}qcengine>=0.20.0:science/py-qcengine@${PY_FLAVOR}
 TEST_DEPENDS=	dftd3:science/dftd3
 
 USES=		python:3.6+
 USE_PYTHON=	distutils autoplist pytest # some tests fail
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	psi-rking
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/science/py-paramz/Makefile b/science/py-paramz/Makefile
index a67853780707..bf9ff0a778fc 100644
--- a/science/py-paramz/Makefile
+++ b/science/py-paramz/Makefile
@@ -1,25 +1,25 @@
 PORTNAME=	paramz
 DISTVERSION=	0.9.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Parameterization framework
 WWW=		https://github.com/sods/paramz
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}decorator>=4.0.10:devel/py-decorator@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_PYTHON=	distutils autoplist
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/science/py-penaltymodel/Makefile b/science/py-penaltymodel/Makefile
index 93585899c799..ef23e347dd28 100644
--- a/science/py-penaltymodel/Makefile
+++ b/science/py-penaltymodel/Makefile
@@ -1,33 +1,34 @@
 PORTNAME=	penaltymodel
 DISTVERSION=	1.0.2
+PORTREVISION=	1
 CATEGORIES=	science python # quantum-computing
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	DWave: Utilities and interfaces for using penalty models
 WWW=		https://docs.ocean.dwavesys.com/projects/penaltymodel/en/latest/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 PY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dimod>=0.10.10:science/py-dimod@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}homebase>=1.0.1:devel/py-homebase@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}networkx>=2.4:math/py-networkx@${PY_FLAVOR} \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}reno>0:textproc/py-reno@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=1.7.3:science/py-scipy@${PY_FLAVOR}
 BUILD_DEPENDS=	${PY_DEPENDS}
 RUN_DEPENDS=	${PY_DEPENDS}
 
 USES=		python:3.7+
 USE_PYTHON=	distutils cython autoplist unittest
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	dwavesystems
 
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 TEST_WRKSRC=	${WRKSRC}/tests
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/science/py-phono3py/Makefile b/science/py-phono3py/Makefile
index 6b64ead2e4d7..e82b5a773de3 100644
--- a/science/py-phono3py/Makefile
+++ b/science/py-phono3py/Makefile
@@ -1,27 +1,28 @@
 PORTNAME=	phono3py
 DISTVERSION=	1.22.3
+PORTREVISION=	1
 CATEGORIES=	science python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Software to calculate phonon-phonon interaction and related properties
 WWW=		https://atztogo.github.io/phono3py/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 PY_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}h5py>0:science/py-h5py@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}phonopy>=2.9.3:science/py-phonopy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}spglib>0:science/py-spglib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
 BUILD_DEPENDS=	${PY_DEPENDS}
 RUN_DEPENDS=	${PY_DEPENDS}
 
 USES=		blaslapack:openblas fortran localbase python:3.7+
 USE_PYTHON=	distutils cython autoplist
 
 .include <bsd.port.mk>
diff --git a/science/py-phonopy/Makefile b/science/py-phonopy/Makefile
index dd320bcc0ed5..8837dcfb825b 100644
--- a/science/py-phonopy/Makefile
+++ b/science/py-phonopy/Makefile
@@ -1,33 +1,34 @@
 PORTNAME=	phonopy
 DISTVERSION=	2.18.0
+PORTREVISION=	1
 CATEGORIES=	science python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Package for phonon calculations at harmonic and quasi-harmonic levels
 WWW=		https://phonopy.github.io/phonopy/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 PY_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}h5py>0:science/py-h5py@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>=2.2.2:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}spglib>0:science/py-spglib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
 BUILD_DEPENDS=	${PY_DEPENDS}
 RUN_DEPENDS=	${PY_DEPENDS}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}hiphive>0:science/py-hiphive@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	distutils cython autoplist pytest
 
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 TEST_WRKSRC=	${WRKSRC}/test
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/phonopy/_phonopy${PYTHON_EXT_SUFFIX}.so
 
 .include <bsd.port.mk>
diff --git a/science/py-pupynere/Makefile b/science/py-pupynere/Makefile
index 6875c7665982..d3d2dccf93cb 100644
--- a/science/py-pupynere/Makefile
+++ b/science/py-pupynere/Makefile
@@ -1,21 +1,21 @@
 PORTNAME=	pupynere
 PORTVERSION=	1.0.15
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	science python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	NetCDF file reader and writer
 WWW=		https://bitbucket.org/robertodealmeida/pupynere
 
 LICENSE=	MIT
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=0,1:math/py-numpy@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/science/py-pyberny/Makefile b/science/py-pyberny/Makefile
index dd128308d747..a2e59b68739f 100644
--- a/science/py-pyberny/Makefile
+++ b/science/py-pyberny/Makefile
@@ -1,25 +1,26 @@
 PORTNAME=	pyberny
 DISTVERSION=	0.6.3
+PORTREVISION=	1
 CATEGORIES=	science # chemistry
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Optimizer of molecular geometries with respect to the total energy
 WWW=		https://github.com/jhrmnn/pyberny
 
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYNUMPY}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}
 
 USES=		python:3.5+
 USE_PYTHON=	distutils concurrent autoplist
 
 NO_ARCH=	yes
 
 do-test: install # no tests run, see https://github.com/jhrmnn/pyberny/issues/36
 	@cd ${WRKSRC} && pytest -rs --pyargs berny
 
 .include <bsd.port.mk>
diff --git a/science/py-pygmo2/Makefile b/science/py-pygmo2/Makefile
index 25485a04ae10..136baff7253c 100644
--- a/science/py-pygmo2/Makefile
+++ b/science/py-pygmo2/Makefile
@@ -1,40 +1,41 @@
 PORTNAME=	pygmo2
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.19.3
+PORTREVISION=	1
 CATEGORIES=	science graphics
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Python platform to perform parallel computations of optimisation tasks
 WWW=		https://esa.github.io/pygmo2/
 
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	pybind11>0:devel/pybind11
 LIB_DEPENDS=	libpagmo.so:science/pagmo2 \
 		libboost_serialization.so:devel/boost-libs \
 		libnlopt.so:math/nlopt
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}cloudpickle>0:devel/py-cloudpickle@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dill>0:devel/py-dill@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ipython>0:devel/ipython@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}networkx>0:math/py-networkx@${PY_FLAVOR}
 
 USES=		cmake compiler:c++17-lang python:3.7+
 USE_PYTHON=	flavors
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	esa
 
 CMAKE_ON=	PYGMO_ENABLE_IPO
 CMAKE_ARGS=	-DFREEBSD_PYTHON_DISTVERSION=${PYTHON_DISTVERSION}
 
 CXXFLAGS+=	-I${LOCALBASE}/include/coin # see https://github.com/esa/pygmo2/issues/58
 
 do-test: install # tests require sysctl sudo sysctl kern.threads.max_threads_per_proc variable to be at least 15000 ; test taken from azure-pipelines.yml
 	# some tests fail, see https://github.com/esa/pygmo2/issues/135
 	@${PYTHON_CMD} -c "import pygmo; pygmo.test.run_test_suite(1); pygmo.mp_island.shutdown_pool(); pygmo.mp_bfe.shutdown_pool()"
 
 .include <bsd.port.mk>
diff --git a/science/py-pyked/Makefile b/science/py-pyked/Makefile
index 997a49a52200..ffa643a1760d 100644
--- a/science/py-pyked/Makefile
+++ b/science/py-pyked/Makefile
@@ -1,32 +1,33 @@
 PORTNAME=	pyked
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.4.1-16
+PORTREVISION=	1
 DISTVERSIONSUFFIX=	-gfcccaf8
 CATEGORIES=	science python
 #MASTER_SITES=	PYPI 0.4.1 is broken there
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Package for manipulating Chemical Kinetics Experimental Data files
 WWW=		https://pr-omethe-us.github.io/PyKED/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}Cerberus>=1.0.0:devel/py-cerberus@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}habanero>=0.6.0:www/py-habanero@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pint>=0.7.2:devel/py-pint@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}uncertainties>=3.0.1:math/py-uncertainties@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>=3.12:devel/py-yaml@${PY_FLAVOR} \
 
 USES=		python:3.8+
 USE_PYTHON=	distutils concurrent autoplist
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	pr-omethe-us
 GH_PROJECT=	PyKED
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/science/py-pymatgen/Makefile b/science/py-pymatgen/Makefile
index 461f8b6e542e..f37e4e3cfb93 100644
--- a/science/py-pymatgen/Makefile
+++ b/science/py-pymatgen/Makefile
@@ -1,48 +1,49 @@
 PORTNAME=	pymatgen
 DISTVERSION=	2022.7.19
+PORTREVISION=	1
 CATEGORIES=	science python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Python Materials Genomics is a robust materials analysis code
 WWW=		https://pymatgen.org/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.rst
 
 BUILD_DEPENDS=	${PYNUMPY}
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}beautifulsoup>0:www/py-beautifulsoup@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}monty>0:devel/py-monty@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}networkx>0:math/py-networkx@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}palettable>=3.3.0:misc/py-palettable@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}plotly>0:graphics/py-plotly@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ruamel.yaml>0:devel/py-ruamel.yaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=1.7.3:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}spglib>0:science/py-spglib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sympy>0:math/py-sympy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tabulate>0:devel/py-tabulate@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tqdm>0:misc/py-tqdm@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}typing-extensions>0:devel/py-typing-extensions@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}uncertainties>=3.1.6:math/py-uncertainties@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pybtex>0:textproc/py-pybtex@${PY_FLAVOR}
 
 USES=		compiler:c++11-lang python:3.7+ pytest
 USE_PYTHON=	distutils cython concurrent autoplist
 
 post-install:
 	@cd ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/${PORTNAME} && ${STRIP_CMD} \
 		optimization/linear_assignment*.so \
 		optimization/neighbors*.so \
 		util/coord_cython*.so
 
 # tests fail: https://github.com/materialsproject/pymatgen/issues/2275, https://github.com/materialsproject/pymatgen/issues/2592
 pre-test:
 	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} build_ext --inplace
 
 .include <bsd.port.mk>
diff --git a/science/py-pymbd/Makefile b/science/py-pymbd/Makefile
index aacf2e66973d..dc3baefe0106 100644
--- a/science/py-pymbd/Makefile
+++ b/science/py-pymbd/Makefile
@@ -1,29 +1,30 @@
 PORTNAME=	pymbd
 DISTVERSION=	0.12.5
+PORTREVISION=	1
 CATEGORIES=	science # chemistry
 MASTER_SITES=	https://github.com/libmbd/libmbd/releases/download/${DISTVERSION}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Many-body dispersion library
 WWW=		https://github.com/libmbd/libmbd
 
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cffi>:devel/py-cffi@${PY_FLAVOR}
 LIB_DEPENDS=	libmbd.so:science/libmbd
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cffi>:devel/py-cffi@${PY_FLAVOR}
 
 USES=		localbase python
 USE_PYTHON=	distutils autoplist
 
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 
 post-install: # strip binary
 	@${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME}/_libmbd.abi3.so
 
 do-test: # also see https://github.com/libmbd/libmbd/issues/44
 	@${SETENV} ${TEST_ENV} ${PYTHON_CMD} ${FILESDIR}/example.py
 
 .include <bsd.port.mk>
diff --git a/science/py-pymol/Makefile b/science/py-pymol/Makefile
index a8f87b52626d..6b0d8024a565 100644
--- a/science/py-pymol/Makefile
+++ b/science/py-pymol/Makefile
@@ -1,59 +1,60 @@
 PORTNAME=	pymol
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.5.0-97
+PORTREVISION=	1
 DISTVERSIONSUFFIX=	-gd24468af
 CATEGORIES=	science biology python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	OpenGL-based molecular visualization system
 WWW=		https://pymol.org/2/
 
 LICENSE=	PyMOL
 LICENSE_NAME=	Open-Source PyMOL Copyright
 LICENSE_FILE=	${WRKSRC}/LICENSE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 BUILD_DEPENDS=	${PYNUMPY} \
 		${LOCALBASE}/include/glm/glm.hpp:math/glm \
 		${LOCALBASE}/include/mmtf.hpp:science/mmtf-cpp
 LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 		libpng.so:graphics/png \
 		libmsgpackc.so:devel/msgpack-c \
 		libnetcdf.so:science/netcdf
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}msgpack>0:devel/py-msgpack@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Pmw>0:x11-toolkits/py-Pmw@${PY_FLAVOR} \
 		${PYNUMPY}
 
 USES=		compiler:c++11-lang gl gnome python:3.5+ tar:bz2
 USE_GL=		gl glew glu glut
 USE_GNOME=	libxml2
 USE_PYTHON=	distutils concurrent # autoplist is broken: https://github.com/schrodinger/pymol-open-source/issues/99
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	schrodinger
 GH_PROJECT=	${PORTNAME}-open-source
 
 CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}chempy # chempy port is unrelated, see https://github.com/schrodinger/pymol-open-source/issues/100
 
 CXXFLAGS+=	-DMSGPACK_NO_BOOST # in line with MSGPACK_USE_BOOST=OFF in devel/msgpack-cxx
 
 OPTIONS_SINGLE=		GUI
 OPTIONS_SINGLE_GUI=	QT5 TK
 OPTIONS_DEFAULT=	QT5
 
 QT5_USES=		pyqt:5
 QT5_USE=		PYQT=pyqt5:run
 
 post-patch-TK-on:
 	@${REINPLACE_CMD} -e ' \
 		23s|if not PYQT_NAME:|if False:| ; \
 		s|from PyQt5 import|from X import|' \
 		${WRKSRC}/modules/${PORTNAME}/Qt/__init__.py
 
 post-install:
 	@${REINPLACE_CMD} -i '' -e 's|#!/bin/bash|#!/bin/sh|' ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	@${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}/_cmd*.so
 	@${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/chempy/champ/_champ*.so
 
 .include <bsd.port.mk>
diff --git a/science/py-pyprecice/Makefile b/science/py-pyprecice/Makefile
index fe1729729a93..5149fbe5732a 100644
--- a/science/py-pyprecice/Makefile
+++ b/science/py-pyprecice/Makefile
@@ -1,34 +1,35 @@
 PORTNAME=	pyprecice
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.5.0.1
+PORTREVISION=	1
 CATEGORIES=	science # physics
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Coupling library for partitioned multi-physics simulations
 WWW=		https://precice.org/
 
 LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 PY_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}mpi4py>0:net/py-mpi4py@${PY_FLAVOR}
 BUILD_DEPENDS=	${PY_DEPENDS} \
 		${PYTHON_PKGNAMEPREFIX}pkgconfig>0:devel/py-pkgconfig@${PY_FLAVOR}
 LIB_DEPENDS=	libprecice.so:science/precice
 RUN_DEPENDS=	${PY_DEPENDS}
 
 USES=		localbase pkgconfig python:3.6+
 USE_PYTHON=	distutils cython autoplist pytest
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	precice
 GH_PROJECT=	python-bindings
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/cyprecice.cpython-${PYTHON_SUFFIX}.so
 
 do-test:
 	@cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} ${PYSETUP} test
 
 .include <bsd.port.mk>
diff --git a/science/py-pyqubo/Makefile b/science/py-pyqubo/Makefile
index 7354d1ce91d1..d309d0211b4d 100644
--- a/science/py-pyqubo/Makefile
+++ b/science/py-pyqubo/Makefile
@@ -1,44 +1,45 @@
 PORTNAME=	pyqubo
 DISTVERSION=	1.4.0
+PORTREVISION=	1
 CATEGORIES=	science python # quantum-computing
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	DWave: Python DSL for constructing QUBOs from mathematical expressions
 WWW=		https://pyqubo.readthedocs.io/en/latest/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 PY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}deprecated>=1.2.10:devel/py-deprecated@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dimod>=0.9.14:science/py-dimod@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dwave-neal>=0.5.7:science/py-dwave-neal@${PY_FLAVOR} \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.15.0:devel/py-six@${PY_FLAVOR}
 BUILD_DEPENDS=	${PY_DEPENDS} \
 		${PYTHON_PKGNAMEPREFIX}nbsphinx>=0.8.3:textproc/py-nbsphinx@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-build>=0.11.1:devel/py-scikit-build@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0.36.2:devel/py-wheel@${PY_FLAVOR} \
 		boost-libs>0:devel/boost-libs \
 		cimod>0:math/cimod \
 		cmake:devel/cmake-core \
 		ninja:devel/ninja \
 		pybind11>0:devel/pybind11 \
 		robin-hood-hashing>0:devel/robin-hood-hashing
 RUN_DEPENDS=	${PY_DEPENDS}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}codecov>=2.1.9:devel/py-codecov@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}coverage>=4.5.1:devel/py-coverage@${PY_FLAVOR}
 
 USES=		eigen:3 python:3.8+
 USE_PYTHON=	distutils cython autoplist unittest
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	recruit-communications
 
 CXXFLAGS+=	-I${LOCALBASE}/include/cimod \
 		-I${LOCALBASE}/include/eigen3
 
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 TEST_WRKSRC=	${WRKSRC}/tests
 
 .include <bsd.port.mk>
diff --git a/science/py-pysal/Makefile b/science/py-pysal/Makefile
index c07a1b00dddd..2492d59c77e2 100644
--- a/science/py-pysal/Makefile
+++ b/science/py-pysal/Makefile
@@ -1,38 +1,39 @@
 PORTNAME=	pysal
 PORTVERSION=	2.7.0
+PORTREVISION=	1
 CATEGORIES=	science python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Cross-platform library of spatial analysis functions
 WWW=		https://pysal.org/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}access>=1.1.8:science/py-access@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}esda>=2.4.1:science/py-esda@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}giddy>=2.3.3:graphics/py-giddy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}inequality>=1.0.0:science/py-inequality@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}libpysal>=4.6.2:science/py-libpysal@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mapclassify>=2.4.3:graphics/py-mapclassify@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mgwr>=2.1.2:graphics/py-mgwr@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}momepy>=0.5.3:graphics/py-momepy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pointpats>=2.2.0:graphics/py-pointpats@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}segregation>=2.3.1:science/py-segregation@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}spaghetti>=1.6.6:science/py-spaghetti@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}spglm>=1.0.8:math/py-spglm@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}spint>=1.0.7:math/py-spint@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}splot>=1.1.5.post1:math/py-splot@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}spopt>=0.4.1:math/py-spopt@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}spreg>=1.2.4:math/py-spreg@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}spvcm>=0.3.0:math/py-spvcm@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tobler>=0.8.2:science/py-tobler@${PY_FLAVOR}
 
 USES=		python:3.8+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/science/py-pyscf/Makefile b/science/py-pyscf/Makefile
index fc3c35934d23..7df21d56c0bf 100644
--- a/science/py-pyscf/Makefile
+++ b/science/py-pyscf/Makefile
@@ -1,43 +1,44 @@
 PORTNAME=	pyscf
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.2.0
+PORTREVISION=	1
 CATEGORIES=	science python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Python module for quantum chemistry
 WWW=		https://pyscf.org/
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 PY_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}h5py>=2.7:science/py-h5py@${PY_FLAVOR}
 BUILD_DEPENDS=	${PY_DEPENDS} \
 		cmake:devel/cmake-core \
 		gmake:devel/gmake
 LIB_DEPENDS=	libcint.so:science/libcint \
 		libxc.so:science/libxc \
 		libxcfun.so:science/xcfun
 RUN_DEPENDS=	${PY_DEPENDS}
 
 USES=		fortran blaslapack:openblas compiler:c++11-lang python:3.6+
 USE_PYTHON=	distutils autoplist pytest # 3818 warnings, 57 errors in tests, see https://github.com/pyscf/pyscf/issues/1536
 USE_GITHUB=	yes
 
 POST_PLIST=	fix-plist
 
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/pyscf/lib/lib*.so
 
 fix-plist:
 	@${REINPLACE_CMD} -e 's|.*pyscf_lib_placeholder.so$$||' ${TMPPLIST}
 
 post-test:
 	@${ECHO} "==> simple test ..."
 	@${SETENV} ${TEST_ENV} ${PYTHON_CMD} ${FILESDIR}/test.py
 
 .include <bsd.port.mk>
diff --git a/science/py-pyteomics/Makefile b/science/py-pyteomics/Makefile
index eea5bc6126ea..16d0696f07d4 100644
--- a/science/py-pyteomics/Makefile
+++ b/science/py-pyteomics/Makefile
@@ -1,34 +1,35 @@
 PORTNAME=	pyteomics
 PORTVERSION=	4.5.6
+PORTREVISION=	1
 CATEGORIES=	science python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Python modules for proteomics data analysis
 WWW=		https://pyteomics.readthedocs.io/
 
 LICENSE=	APACHE20
 
 USES=		python:3.7+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=	DF GRAPHICS TDA UNIMOD XML
 OPTIONS_DEFAULT=DF GRAPHICS TDA UNIMOD XML
 DF_DESC=	DataFrame support
 GRAPHICS_DESC=	Graphics support
 TDA_DESC=	Target-decoy approach support
 UNIMOD_DESC=	Unimod database support
 XML_DESC=	XML support
 
 DF_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}pandas>=0,1:math/py-pandas@${PY_FLAVOR}
 GRAPHICS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}matplotlib>=0:math/py-matplotlib@${PY_FLAVOR}
 TDA_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=0,1:math/py-numpy@${PY_FLAVOR}
 UNIMOD_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}sqlalchemy14>=0:databases/py-sqlalchemy14@${PY_FLAVOR}
 XML_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}numpy>=0,1:math/py-numpy@${PY_FLAVOR}
 
 .include <bsd.port.mk>
diff --git a/science/py-qcelemental/Makefile b/science/py-qcelemental/Makefile
index c3f383b7a639..66093bfb024d 100644
--- a/science/py-qcelemental/Makefile
+++ b/science/py-qcelemental/Makefile
@@ -1,30 +1,31 @@
 PORTNAME=	qcelemental
 DISTVERSION=	0.25.1
+PORTREVISION=	1
 CATEGORIES=	science python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Essentials for quantum chemistry
 WWW=		https://github.com/MolSSI/QCElemental
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}pint>=0.10.0:devel/py-pint@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pydantic>=1.8.2:devel/py-pydantic@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=4.0.0:devel/py-pytest@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-cov>0:devel/py-pytest-cov@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}py3Dmol>0:science/py-py3Dmol@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}msgpack>0:devel/py-msgpack@${PY_FLAVOR}
 
 USES=		python:3.8+
 USE_PYTHON=	distutils autoplist
 
 NO_ARCH=	yes
 
 do-test: # 2 tests fail, see https://github.com/MolSSI/QCElemental/issues/293
 	@cd ${WRKSRC} && ${SETENV} ${TEST_ENV} pytest -rs --pyargs qcelemental
 
 .include <bsd.port.mk>
diff --git a/science/py-qcengine/Makefile b/science/py-qcengine/Makefile
index f70bed65f215..c4a46525e9a4 100644
--- a/science/py-qcengine/Makefile
+++ b/science/py-qcengine/Makefile
@@ -1,38 +1,39 @@
 PORTNAME=	qcengine
 DISTVERSION=	0.26.0
+PORTREVISION=	1
 CATEGORIES=	science python # chemistry
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Quantum chemistry program executor and IO standardizer (QCSchema)
 WWW=		https://github.com/MolSSI/QCEngine
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}py-cpuinfo>0:sysutils/py-py-cpuinfo@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pydantic>=1.8.2:devel/py-pydantic@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}qcelemental>=0.24.0:science/py-qcelemental@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
 		dftd4:science/dftd4 \
 		mopac:science/mopac \
 		mp2d:science/mp2d \
 		mrchem:science/py-mrchem@${PY_FLAVOR} \
 		nwchem:science/nwchem \
 		rdkit>0:science/rdkit \
 		s-dftd3:science/simple-dftd3 \
 		xtb:science/xtb \
 		${PYTHON_PKGNAMEPREFIX}msgpack>0:devel/py-msgpack@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyberny>0:science/py-pyberny@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}geometric>0:science/py-geometric@${PY_FLAVOR}
 		# last dependencies above are for specific quantum chemistry packages to test with TODO torchani,openmm,psi4,torsiondrive,mdi
 
 USES=		python:3.8+
 USE_PYTHON=	distutils concurrent autoplist pytest # 1 test fails, see https://github.com/MolSSI/QCEngine/issues/377, psi4 test hangs, see https://github.com/MolSSI/QCEngine/issues/390
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/science/py-qiskit-aer/Makefile b/science/py-qiskit-aer/Makefile
index b9fc1a853a42..a914ded13cf0 100644
--- a/science/py-qiskit-aer/Makefile
+++ b/science/py-qiskit-aer/Makefile
@@ -1,54 +1,55 @@
 PORTNAME=	qiskit-aer
 DISTVERSION=	0.10.4
+PORTREVISION=	1
 CATEGORIES=	science python # quantum-computing
 #MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
 PATCHFILES=	46d86944f349a177acb40fb8a3adc301c395fe60.patch:-p1 # https://github.com/Qiskit/qiskit-aer/pull/1576
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Aer submodule of the Quiskit framework for quantum computing
 WWW=		https://qiskit.org/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}scikit-build>0:devel/py-scikit-build@${PY_FLAVOR} \
 		cmake:devel/cmake-core \
 		nlohmann-json>0:devel/nlohmann-json \
 		${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pybind11>0:devel/py-pybind11@${PY_FLAVOR} \
 		${PYNUMPY}
 LIB_DEPENDS=	libmuparserx.so:math/muparserx \
 		libspdlog.so:devel/spdlog # binaries aren't linked with these for some reason
 RUN_DEPENDS=	${PYNUMPY}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}fixtures>0:devel/py-fixtures@${PY_FLAVOR}
 
 USES=		python:3.7+ localbase:ldflags
 USE_PYTHON=	distutils pytest # all tests fail, see https://github.com/Qiskit/qiskit-aer/issues/1577
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Qiskit
 
 CONFIGURE_ENV=	DISABLE_CONAN=ON DISABLE_DEPENDENCY_INSTALL=ON
 MAKE_ENV=	DISABLE_CONAN=ON DISABLE_DEPENDENCY_INSTALL=ON
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 
 post-install:
 	# strip binaries
 .for f in pulse/controllers/pulse_utils pulse/controllers/test_python_to_cpp backends/controller_wrappers
 	@${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/qiskit/providers/aer/${f}.cpython-${PYTHON_SUFFIX}.so
 .endfor
 	# remove stray files, see https://github.com/Qiskit/qiskit-aer/issues/1574
 	@cd ${STAGEDIR}${PREFIX} && ${RM} -r \
 		CMakeLists.txt \
 		MANIFEST.in \
 		README.md \
 		cmake \
 		contrib \
 		pyproject.toml \
 		qiskit \
 		src
 
 .include <bsd.port.mk>
diff --git a/science/py-qiskit-dynamics/Makefile b/science/py-qiskit-dynamics/Makefile
index e3137028e1ed..752484015473 100644
--- a/science/py-qiskit-dynamics/Makefile
+++ b/science/py-qiskit-dynamics/Makefile
@@ -1,36 +1,37 @@
 PORTNAME=	qiskit-dynamics
 DISTVERSION=	0.4.0
+PORTREVISION=	1
 CATEGORIES=	science python # quantum-computing
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Qiskit ODE solver
 WWW=		https://qiskit.org/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 PY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}matplotlib>=3.0:math/py-matplotlib@${PY_FLAVOR} \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>=3.0:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}multiset>=3.0.1:devel/py-multiset@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}qiskit-terra>=0.23.0:science/py-qiskit-terra@${PY_FLAVOR}
 BUILD_DEPENDS=	${PY_DEPENDS}
 RUN_DEPENDS=	${PY_DEPENDS}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}jax>0:math/py-jax@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}qiskit-aer>0:science/py-qiskit-aer@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}qiskit-experiments>0:science/py-qiskit-experiments@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}qutip>0:devel/py-qutip@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sympy>0:math/py-sympy@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	distutils autoplist pytest # one test hangs forever, see https://github.com/Qiskit/qiskit-experiments/issues/873
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Qiskit
 
 NO_ARCH=	yes
 
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 
 .include <bsd.port.mk>
diff --git a/science/py-qiskit-experiments/Makefile b/science/py-qiskit-experiments/Makefile
index 187aae5a8aea..de32e9df4ef0 100644
--- a/science/py-qiskit-experiments/Makefile
+++ b/science/py-qiskit-experiments/Makefile
@@ -1,36 +1,37 @@
 PORTNAME=	qiskit-experiments
 DISTVERSION=	0.5.0
+PORTREVISION=	1
 CATEGORIES=	science python # quantum-computing
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Experiments submodule for Quiskit framework for quantum computing
 WWW=		https://qiskit.org/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 PY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lmfit>0:math/py-lmfit@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>=3.4:math/py-matplotlib@${PY_FLAVOR} \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}qiskit-terra>=0.22:science/py-qiskit-terra@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}qiskit-ibm-experiment>=0.2.5:science/py-qiskit-ibm-experiment@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}qiskit-ibmq-provider>=0.16.0:science/py-qiskit-ibmq-provider@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}rustworkx>0:math/py-rustworkx@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=1.4:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}uncertainties>0:math/py-uncertainties@${PY_FLAVOR}
 BUILD_DEPENDS=	${PY_DEPENDS}
 RUN_DEPENDS=	${PY_DEPENDS}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qiskit-aer>0:science/py-qiskit-aer@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	distutils autoplist pytest # one test hangs forever, see https://github.com/Qiskit/qiskit-experiments/issues/873
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Qiskit
 
 NO_ARCH=	yes
 
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 
 .include <bsd.port.mk>
diff --git a/science/py-qiskit-finance/Makefile b/science/py-qiskit-finance/Makefile
index a3762fd2ba6c..d9275f823c0e 100644
--- a/science/py-qiskit-finance/Makefile
+++ b/science/py-qiskit-finance/Makefile
@@ -1,37 +1,38 @@
 PORTNAME=	qiskit-finance
 DISTVERSION=	0.3.4
+PORTREVISION=	1
 CATEGORIES=	science finance python # quantum-computing
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Quantum Finance module from the Qiskit quantum computing framework
 WWW=		https://qiskit.org/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 PY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}certifi>0:security/py-certifi@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}fastdtw>0:math/py-fastdtw@${PY_FLAVOR} \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}Nasdaq-Data-Link>0:finance/py-Nasdaq-Data-Link@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psutil>=5:sysutils/py-psutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}qiskit-optimization>=0.2.0:science/py-qiskit-optimization@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}qiskit-terra>=0.20.0:science/py-qiskit-terra@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=1.4:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}urllib3>0:net/py-urllib3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yfinance>=0.1.70:finance/py-yfinance@${PY_FLAVOR}
 BUILD_DEPENDS=	${PY_DEPENDS}
 RUN_DEPENDS=	${PY_DEPENDS}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ddt>0:devel/py-ddt@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	distutils autoplist pytest # one test hangs forever, see https://github.com/Qiskit/qiskit-experiments/issues/873
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Qiskit
 GH_TAGNAME=	88091bc
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/science/py-qiskit-ibm-experiment/Makefile b/science/py-qiskit-ibm-experiment/Makefile
index 6ddb4ceb14a2..89884527db99 100644
--- a/science/py-qiskit-ibm-experiment/Makefile
+++ b/science/py-qiskit-ibm-experiment/Makefile
@@ -1,35 +1,35 @@
 PORTNAME=	qiskit-ibm-experiment
 DISTVERSION=	0.2.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science python # quantum-computing
 #MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	IBM Experiment submodule for Quiskit framework for quantum computing
 WWW=		https://qiskit.org/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 PY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>=2.8.0:devel/py-dateutil@${PY_FLAVOR} \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}qiskit-terra>=0.18.0:science/py-qiskit-terra@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.19:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests_ntlm>=1.1.0:www/py-requests_ntlm@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}typing-extensions>=4.0.0:devel/py-typing-extensions@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}urllib3>=1.21.1:net/py-urllib3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}websocket-client>0:www/py-websocket-client@${PY_FLAVOR}
 BUILD_DEPENDS=	${PY_DEPENDS}
 RUN_DEPENDS=	${PY_DEPENDS}
 
 USES=		python:3.7+
 USE_PYTHON=	distutils autoplist pytest # Many tests are skipped: Only runs on staging, see https://github.com/Qiskit/qiskit-ibm-experiment/issues/49
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Qiskit
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/science/py-qiskit-ibm-provider/Makefile b/science/py-qiskit-ibm-provider/Makefile
index fe2dbe6ca45b..a4b7e1ea6e92 100644
--- a/science/py-qiskit-ibm-provider/Makefile
+++ b/science/py-qiskit-ibm-provider/Makefile
@@ -1,39 +1,39 @@
 PORTNAME=	qiskit-ibm-provider
 PORTVERSION=	g20220804
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science python # quantum-computing
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Qiskit Provider for accessing IBM quantum devices and simulators
 WWW=		https://qiskit.org/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 PY_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}dateutil>=2.8.0:devel/py-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}qiskit-terra>=0.18.0:science/py-qiskit-terra@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.19:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests_ntlm>=1.1.0:www/py-requests_ntlm@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}urllib3>=1.21.1:net/py-urllib3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}websocket-client>0:www/py-websocket-client@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}websockets>=10.0:devel/py-websockets@${PY_FLAVOR}
 BUILD_DEPENDS=	${PY_DEPENDS}
 RUN_DEPENDS=	${PY_DEPENDS}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ipywidgets>0:devel/py-ipywidgets@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}nbconvert>=5.3.1:devel/py-nbconvert@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}nbformat>=4.4.0:devel/py-nbformat@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	distutils autoplist pytest # one test fails, see https://github.com/Qiskit/qiskit-ibm-provider/issues/378
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Qiskit
 GH_TAGNAME=	aa98156
 
 NO_ARCH=	yes
 
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 
 .include <bsd.port.mk>
diff --git a/science/py-qiskit-ibmq-provider/Makefile b/science/py-qiskit-ibmq-provider/Makefile
index ca12815e4467..a27a63b25ec3 100644
--- a/science/py-qiskit-ibmq-provider/Makefile
+++ b/science/py-qiskit-ibmq-provider/Makefile
@@ -1,38 +1,38 @@
 PORTNAME=	qiskit-ibmq-provider # is being split into qiskit-ibm-provider, qiskit-ibm-runtime, qiskit-ibm-experiment
 DISTVERSION=	0.19.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science python # quantum-computing
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Qiskit Provider for accessing IBM quantum devices and simulators
 WWW=		https://qiskit.org/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 PY_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}dateutil>=2.8.0:devel/py-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}qiskit-terra>=0.18.0:science/py-qiskit-terra@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.19:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests_ntlm>=1.1.0:www/py-requests_ntlm@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}urllib3>=1.21.1:net/py-urllib3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}websocket-client>0:www/py-websocket-client@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}websockets>=10.0:devel/py-websockets@${PY_FLAVOR}
 BUILD_DEPENDS=	${PY_DEPENDS}
 RUN_DEPENDS=	${PY_DEPENDS}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ipywidgets>0:devel/py-ipywidgets@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}nbconvert>=5.3.1:devel/py-nbconvert@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}nbformat>=4.4.0:devel/py-nbformat@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	distutils autoplist pytest
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Qiskit
 
 NO_ARCH=	yes
 
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 
 .include <bsd.port.mk>
diff --git a/science/py-qiskit-nature/Makefile b/science/py-qiskit-nature/Makefile
index 9a1f35574f18..763bb46cf769 100644
--- a/science/py-qiskit-nature/Makefile
+++ b/science/py-qiskit-nature/Makefile
@@ -1,47 +1,48 @@
 PORTNAME=	qiskit-nature
 DISTVERSION=	0.4.5
+PORTREVISION=	1
 CATEGORIES=	science python # quantum-computing, quantum-chemistry
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Natural science submodule for Quiskit framework for quantum computing
 WWW=		https://qiskit.org/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 PY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}h5py>0:science/py-h5py@${PY_FLAVOR} \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}psutil>=5:sysutils/py-psutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}qiskit-terra>=0.21.0:science/py-qiskit-terra@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}rustworkx>=0.10.1:math/py-rustworkx@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-learn>=0.20.0:science/py-scikit-learn@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=1.4:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}typing-extensions>0:devel/py-typing-extensions@${PY_FLAVOR}
 QC_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyscf>0:science/py-pyscf@${PY_FLAVOR} # quantum-chemistry drivers, other supported drivers are PyQuante, PSI4
 BUILD_DEPENDS=	${PY_DEPENDS}
 RUN_DEPENDS=	${PY_DEPENDS} \
 		${QC_DEPENDS}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ddt>0:devel/py-ddt@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}joblib>0:devel/py-joblib@${PY_FLAVOR} # also threadctl is required but it is currently broken on FreeBSD
 
 USES=		python:3.7+
 USE_PYTHON=	distutils autoplist pytest # several tests fail with "No module named 'threadpoolctl'", see https://reviews.freebsd.org/D35513
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Qiskit
 
 NO_ARCH=	yes
 
 POST_PLIST=	fix-plist
 
 post-patch: # project was renamed, see https://github.com/Qiskit/rustworkx/issues/656
 	@${FIND} ${WRKSRC} -name "*.py" | ${XARGS} ${REINPLACE_CMD} -i '' -e 's|retworkx|rustworkx|'
 
 post-install: # installs many binaries accessing commercial Gaussian software not available on FreeBSD, see https://github.com/Qiskit/qiskit-nature/issues/778
 	@${FIND} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} -name "qcmatrixio.cpython-*.so" -delete
 
 fix-plist: # see post-install
 	@${REINPLACE_CMD} -e "s|.*/qcmatrixio\.cpython-.*\.so$$||" ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/science/py-qiskit-optimization/Makefile b/science/py-qiskit-optimization/Makefile
index 12223bb4cda2..e9fd4f3ca7f7 100644
--- a/science/py-qiskit-optimization/Makefile
+++ b/science/py-qiskit-optimization/Makefile
@@ -1,34 +1,35 @@
 PORTNAME=	qiskit-optimization
 DISTVERSION=	0.5.0
+PORTREVISION=	1
 CATEGORIES=	science python # quantum-computing
 #MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Optimization submodule of the Quiskit framework for quantum computing
 WWW=		https://qiskit.org/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 PY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}docplex>=2.21.207:math/py-docplex@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}networkx>=2.2:math/py-networkx@${PY_FLAVOR} \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=1.4:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}qiskit-terra>=0.22.4:science/py-qiskit-terra@${PY_FLAVOR}
 BUILD_DEPENDS=	${PY_DEPENDS}
 RUN_DEPENDS=	${PY_DEPENDS}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cvxpy>0:math/py-cvxpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}qiskit-aer>0:science/py-qiskit-aer@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	distutils autoplist pytest
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Qiskit
 
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/science/py-qiskit-terra/Makefile b/science/py-qiskit-terra/Makefile
index b93b05559fd1..b6a1eba5d86a 100644
--- a/science/py-qiskit-terra/Makefile
+++ b/science/py-qiskit-terra/Makefile
@@ -1,121 +1,122 @@
 PORTNAME=	qiskit-terra
 DISTVERSION=	0.23.3
+PORTREVISION=	1
 CATEGORIES=	science python # quantum-computing
 #MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Terra submodule of the Quiskit framework for quantum computing
 WWW=		https://qiskit.org/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 PY_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}ply>=3.10:devel/py-ply@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psutil>=5:sysutils/py-psutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}rustworkx>=0.12.0:math/py-rustworkx@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=1.5:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sympy>=1.3:math/py-sympy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dill>=0.3:devel/py-dill@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dateutil>=2.8.0:devel/py-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}stevedore>=3.0.0:devel/py-stevedore@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}symengine>=0.9:math/py-symengine@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tweedledum>=1.1:science/py-tweedledum@${PY_FLAVOR}
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools-rust>0:devel/py-setuptools-rust@${PY_FLAVOR} \
 		${PY_DEPENDS}
 RUN_DEPENDS=	${PY_DEPENDS}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ddt>0:devel/py-ddt@${PY_FLAVOR} # no test requirements are listed in setup.py, see https://github.com/Qiskit/qiskit-terra/issues/8498
 
 USES=		cargo python:3.8+
 USE_PYTHON=	distutils autoplist pytest # tests fail to run through pytest, see https://github.com/Qiskit/qiskit-terra/issues/8500
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Qiskit
 
 CARGO_CRATES=	ahash-0.7.6 \
 		ahash-0.8.0 \
 		autocfg-1.1.0 \
 		bitflags-1.3.2 \
 		cfg-if-1.0.0 \
 		crossbeam-channel-0.5.6 \
 		crossbeam-deque-0.8.2 \
 		crossbeam-epoch-0.9.11 \
 		crossbeam-utils-0.8.12 \
 		either-1.8.0 \
 		fixedbitset-0.4.2 \
 		getrandom-0.2.8 \
 		hashbrown-0.11.2 \
 		hashbrown-0.12.3 \
 		hermit-abi-0.1.19 \
 		indexmap-1.7.0 \
 		indoc-1.0.7 \
 		libc-0.2.137 \
 		libm-0.2.5 \
 		lock_api-0.4.9 \
 		matrixmultiply-0.3.2 \
 		memoffset-0.6.5 \
 		memoffset-0.8.0 \
 		ndarray-0.15.6 \
 		num-bigint-0.4.3 \
 		num-complex-0.4.2 \
 		num-integer-0.1.45 \
 		num-traits-0.2.15 \
 		num_cpus-1.13.1 \
 		numpy-0.18.0 \
 		once_cell-1.16.0 \
 		parking_lot-0.12.1 \
 		parking_lot_core-0.9.4 \
 		petgraph-0.6.2 \
 		ppv-lite86-0.2.16 \
 		priority-queue-1.2.0 \
 		proc-macro2-1.0.47 \
 		pyo3-0.18.1 \
 		pyo3-build-config-0.18.1 \
 		pyo3-ffi-0.18.1 \
 		pyo3-macros-0.18.1 \
 		pyo3-macros-backend-0.18.1 \
 		quote-1.0.21 \
 		rand-0.8.5 \
 		rand_chacha-0.3.1 \
 		rand_core-0.6.4 \
 		rand_distr-0.4.3 \
 		rand_pcg-0.3.1 \
 		rawpointer-0.2.1 \
 		rayon-1.6.0 \
 		rayon-core-1.10.1 \
 		redox_syscall-0.2.16 \
 		rustc-hash-1.1.0 \
 		rustworkx-core-0.12.1 \
 		scopeguard-1.1.0 \
 		smallvec-1.10.0 \
 		syn-1.0.103 \
 		target-lexicon-0.12.4 \
 		unicode-ident-1.0.5 \
 		unindent-0.1.10 \
 		version_check-0.9.4 \
 		wasi-0.11.0+wasi-snapshot-preview1 \
 		windows-sys-0.42.0 \
 		windows_aarch64_gnullvm-0.42.0 \
 		windows_aarch64_msvc-0.42.0 \
 		windows_i686_gnu-0.42.0 \
 		windows_i686_msvc-0.42.0 \
 		windows_x86_64_gnu-0.42.0 \
 		windows_x86_64_gnullvm-0.42.0 \
 		windows_x86_64_msvc-0.42.0
 CARGO_BUILD=	no
 CARGO_INSTALL=	no
 CARGO_TEST=	no
 CARGO_TARGET_DIR=	${WRKSRC}/target
 
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 
 PLIST_FILES=	${PYTHON_SITELIBDIR}/qiskit/_accelerate${PYTHON_EXT_SUFFIX}.so
 
 post-patch: # project was renamed, see https://github.com/Qiskit/rustworkx/issues/656
 	@${FIND} ${WRKSRC} -name "*.py" | ${XARGS} ${REINPLACE_CMD} -i '' -e 's|retworkx|rustworkx|'
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/qiskit/_accelerate.cpython-${PYTHON_SUFFIX}.so
 
 .include <bsd.port.mk>
diff --git a/science/py-qiskit/Makefile b/science/py-qiskit/Makefile
index 87d78192b70b..c3f910150ae8 100644
--- a/science/py-qiskit/Makefile
+++ b/science/py-qiskit/Makefile
@@ -1,34 +1,35 @@
 PORTNAME=	qiskit
 DISTVERSION=	0.37.2
+PORTREVISION=	1
 CATEGORIES=	science python # quantum-computing
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Qiskit meta-package: SDK for working with quantum computers
 WWW=		https://qiskit.org/
 
 LICENSE=	BSD2CLAUSE
 
 # required submodules
 PY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qiskit-aer>0:science/py-qiskit-aer@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}qiskit-terra>0:science/py-qiskit-terra@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}qiskit-ibmq-provider>0:science/py-qiskit-ibmq-provider@${PY_FLAVOR}
 # optional submodules (list: https://github.com/Qiskit/qiskit#optional-components)
 OPT_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qiskit-finance>0:science/py-qiskit-finance@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}qiskit-optimization>0:science/py-qiskit-optimization@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}qiskit-machine-learning>0:misc/py-qiskit-machine-learning@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}qiskit-nature>0:science/py-qiskit-nature@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}qiskit-experiments>0:science/py-qiskit-experiments@${PY_FLAVOR}
 BUILD_DEPENDS=	${PY_DEPENDS}
 RUN_DEPENDS=	${PY_DEPENDS} \
 		${OPT_DEPENDS}
 
 USES=		python:3.7+
 USE_PYTHON=	distutils autoplist pytest
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Qiskit
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/science/py-qspin/Makefile b/science/py-qspin/Makefile
index 452262f20784..810fdb11527c 100644
--- a/science/py-qspin/Makefile
+++ b/science/py-qspin/Makefile
@@ -1,21 +1,22 @@
 PORTNAME=	qspin
 DISTVERSION=	2.3.2
+PORTREVISION=	1
 CATEGORIES=	science education
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Learn quantum spin and entanglement
 WWW=		https://bitbucket.org/donald_gavel/qspin
 
 LICENSE=	MIT
 
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_PYTHON=	autoplist distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/science/py-quantities/Makefile b/science/py-quantities/Makefile
index 24b464c96f19..2c69e3eb344a 100644
--- a/science/py-quantities/Makefile
+++ b/science/py-quantities/Makefile
@@ -1,23 +1,24 @@
 PORTNAME=	quantities
 DISTVERSION=	0.13.0
+PORTREVISION=	1
 CATEGORIES=	science python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Support for physical quantities with units, based on numpy
 WWW=		https://github.com/python-quantities/python-quantities
 
 LICENSE=	BSD3CLAUSE
 
 RUN_DEPENDS=	${PYNUMPY}
 
 USES=		python:3.7+
 USE_PYTHON=	distutils autoplist
 
 NO_ARCH=	yes
 
 do-test:
 	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} test
 
 .include <bsd.port.mk>
diff --git a/science/py-rmf/Makefile b/science/py-rmf/Makefile
index 90e7727526bb..404cff7c8b67 100644
--- a/science/py-rmf/Makefile
+++ b/science/py-rmf/Makefile
@@ -1,37 +1,38 @@
 PORTNAME=	rmf
 DISTVERSION=	1.5.0
+PORTREVISION=	1
 CATEGORIES=	science graphics
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Library to support reading and writing of Rich Molecular Format files
 WWW=		https://integrativemodeling.org/rmf/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	swig:devel/swig
 LIB_DEPENDS=	libRMF.so:science/rmf
 
 USES=		cmake compiler:c++11-lang python:3.6+ shebangfix
 USE_PYTHON=	flavors
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	salilab
 
 SHEBANG_GLOB=	*.py
 
 CMAKE_ARGS=	-DCMAKE_INSTALL_PYTHONDIR:STRING=${PYTHON_SITELIBDIR}
 
 LDFLAGS+=	-lRMF
 
 BINARY_ALIAS=	python=${PYTHON_CMD}
 
 do-test: # one testcase fails: https://github.com/salilab/rmf/issues/126
 	@${RM} ${WRKSRC}/test/*.cpp
 	@cd ${BUILD_WRKSRC} && \
 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DFREEBSD_BUILS_WITH_TESTS:BOOL=ON ${CMAKE_SOURCE_PATH} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
 
 .include <bsd.port.mk>
diff --git a/science/py-rmsd/Makefile b/science/py-rmsd/Makefile
index a211d2d938be..40150de6cb30 100644
--- a/science/py-rmsd/Makefile
+++ b/science/py-rmsd/Makefile
@@ -1,19 +1,20 @@
 PORTNAME=	rmsd
 DISTVERSION=	1.4
+PORTREVISION=	1
 CATEGORIES=	science
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Calculate root-mean-square deviation (RMSD) between coordinate sets
 WWW=		https://github.com/charnley/rmsd
 
 LICENSE=	BSD2CLAUSE
 
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_PYTHON=	distutils autoplist concurrent
 
 .include <bsd.port.mk>
diff --git a/science/py-scikit-fuzzy/Makefile b/science/py-scikit-fuzzy/Makefile
index 2be1cf3ab5a6..2a4a14374132 100644
--- a/science/py-scikit-fuzzy/Makefile
+++ b/science/py-scikit-fuzzy/Makefile
@@ -1,24 +1,24 @@
 PORTNAME=	scikit-fuzzy
 DISTVERSION=	0.4.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	science python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Fuzzy logic toolkit for SciPy
 WWW=		https://github.com/scikit-fuzzy/scikit-fuzzy/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}networkx>=1.9.0:math/py-networkx@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=0.9.0:science/py-scipy@${PY_FLAVOR}
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		python:3.6+
 USE_PYTHON=	autoplist distutils
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/science/py-scikit-learn/Makefile b/science/py-scikit-learn/Makefile
index edf02f8e9ac1..f40c89b4d766 100644
--- a/science/py-scikit-learn/Makefile
+++ b/science/py-scikit-learn/Makefile
@@ -1,34 +1,35 @@
 PORTNAME=	scikit-learn
 DISTVERSION=	1.2.2
+PORTREVISION=	1
 CATEGORIES=	science python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Machine learning algorithms for python
 WWW=		https://scikit-learn.org/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}joblib>0:devel/py-joblib@${PY_FLAVOR} \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=1.3.2:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}threadpoolctl>=0:devel/py-threadpoolctl@${PY_FLAVOR}
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		fortran python:3.8+ localbase
 USE_PYTHON=	distutils autoplist cython
 
 POST_PLIST=	fix-plist
 
 fix-plist: # https://github.com/scikit-learn/scikit-learn/issues/12681
 	@${REINPLACE_CMD} -e "s|lib/python.*/sklearn/datasets/tests/data/openml$$||" ${TMPPLIST}
 
 post-install: # strip binaries
 	@${STRIP_CMD} \
 		${STAGEDIR}${PYTHON_SITELIBDIR}/sklearn/*.cpython*.so \
 		${STAGEDIR}${PYTHON_SITELIBDIR}/sklearn/*/*.cpython*.so \
 		${STAGEDIR}${PYTHON_SITELIBDIR}/sklearn/*/*/*.cpython*.so
 
 .include <bsd.port.mk>
diff --git a/science/py-scikit-optimize/Makefile b/science/py-scikit-optimize/Makefile
index b74d98c32233..d7faf6418fb3 100644
--- a/science/py-scikit-optimize/Makefile
+++ b/science/py-scikit-optimize/Makefile
@@ -1,30 +1,31 @@
 PORTNAME=	scikit-optimize
 PORTVERSION=	0.9.0
+PORTREVISION=	1
 CATEGORIES=	science python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Sequential model-based optimization toolbox
 WWW=		https://github.com/scikit-optimize/scikit-optimize
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}joblib>=0.11:devel/py-joblib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpy>=1.13.3,1:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyaml>=16.9:textproc/py-pyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-learn>=0.20.0:science/py-scikit-learn@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=0.19.1:science/py-scipy@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=	PLOTS
 PLOTS_DESC=	Plotting support
 
 PLOTS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}matplotlib>=2.0.0:math/py-matplotlib@${PY_FLAVOR}
 
 .include <bsd.port.mk>
diff --git a/science/py-scikit-sparse/Makefile b/science/py-scikit-sparse/Makefile
index cf02d785531f..eeb03b9dee5c 100644
--- a/science/py-scikit-sparse/Makefile
+++ b/science/py-scikit-sparse/Makefile
@@ -1,30 +1,30 @@
 PORTNAME=	scikit-sparse
 DISTVERSION=	0.4.6
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	science python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Sparse matrix package
 WWW=		https://github.com/scikit-sparse/scikit-sparse
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 LIB_DEPENDS=	libumfpack.so:math/suitesparse-umfpack	\
 		libcholmod.so:math/suitesparse-cholmod
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR}
 
 USES=		fortran python:3.6+
 USE_PYTHON=	distutils cython autoplist
 
 CFLAGS+=	-I${LOCALBASE}/include/suitesparse
 LDFLAGS+=	-shared
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/sksparse/cholmod*.so
 
 .include <bsd.port.mk>
diff --git a/science/py-scimath/Makefile b/science/py-scimath/Makefile
index 374383b68c03..45814cb4ad37 100644
--- a/science/py-scimath/Makefile
+++ b/science/py-scimath/Makefile
@@ -1,21 +1,22 @@
 PORTNAME=	scimath
 PORTVERSION=	5.0.0
+PORTREVISION=	1
 CATEGORIES=	science math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Scientific and Mathematical calculations
 WWW=		https://pypi.org/project/scimath/
 
 LICENSE=	BSD3CLAUSE LGPL3
 LICENSE_COMB=	dual
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}traits>=0:devel/py-traits@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${PY_FLAVOR}
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		python:3.7+
 USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/science/py-scipy/Makefile b/science/py-scipy/Makefile
index 743189a26643..9f5326990fee 100644
--- a/science/py-scipy/Makefile
+++ b/science/py-scipy/Makefile
@@ -1,58 +1,59 @@
 PORTNAME=	scipy
 DISTVERSION=	1.10.1
+PORTREVISION=	1
 CATEGORIES=	science python
 MASTER_SITES=	https://docs.scipy.org/doc/${PORTNAME}-${DISTVERSION}/:doc \
 		PYPI:source \
 		SF:source
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:source \
 		scipy-html-${DISTVERSION}.zip:doc
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	python@FreeBSD.org
 COMMENT=	Scientific tools for Python
 WWW=		https://www.scipy.org/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BUILD_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pybind11>0:devel/py-pybind11@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pythran>=0:devel/py-pythran@${PY_FLAVOR} \
 		unzip>0:archivers/unzip
 LIB_DEPENDS=	libblas.so:math/blas \
 		libopenblas.so:math/openblas
 RUN_DEPENDS=	${PYNUMPY}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gmpy2>0:math/py-gmpy2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mpmath>0:math/py-mpmath@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pooch>0:devel/py-pooch@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-cov>0:devel/py-pytest-cov@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-timeout>0:devel/py-pytest-timeout@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-xdist>0:devel/py-pytest-xdist@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-umfpack>0:math/py-scikit-umfpack@${PY_FLAVOR}
 
 USES=		compiler:c++14-lang cpe fortran python:3.8-3.10 shebangfix
 USE_PYTHON=	autoplist concurrent cython distutils
 
 FFLAGS+=	-std=legacy
 LDFLAGS+=	-shared
 PYDISTUTILS_BUILDARGS=	--fcompiler=gnu95
 PYDISTUTILS_CONFIGUREARGS=	--fcompiler=gnu95
 
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS
 
 post-install:
 	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR}/scipy/ -name '*.so' | ${XARGS} ${STRIP_CMD}
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@${UNZIP_CMD} -d ${STAGEDIR}${DOCSDIR} ${DISTDIR}/scipy-html-${DISTVERSION}.zip
 	@${RM} ${STAGEDIR}${PREFIX}/share/doc/${PYTHON_PKGNAMEPREFIX}${PORTNAME}/.buildinfo
 
 do-test:
 	@cd ${WRKSRC} && ${TOUCH} .coveragerc && ${PYTHON_CMD} runtests.py
 
 .include <bsd.port.mk>
diff --git a/science/py-scoria/Makefile b/science/py-scoria/Makefile
index 25bb2e3f3402..4c24d49d4e34 100644
--- a/science/py-scoria/Makefile
+++ b/science/py-scoria/Makefile
@@ -1,20 +1,21 @@
 PORTNAME=	scoria
 DISTVERSION=	1.0.5
+PORTREVISION=	1
 CATEGORIES=	science python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Lightweight molecule manipulation codebase
 WWW=		https://git.durrantlab.pitt.edu/jdurrant/scoria
 
 LICENSE=	APACHE20
 
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_PYTHON=	autoplist distutils
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/science/py-sdf/Makefile b/science/py-sdf/Makefile
index b9b13cbe5d7a..ed64158e8b38 100644
--- a/science/py-sdf/Makefile
+++ b/science/py-sdf/Makefile
@@ -1,36 +1,37 @@
 PORTNAME=	sdf
 PORTVERSION=	0.1
+PORTREVISION=	1
 CATEGORIES=	science cad python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Simple SDF mesh generation in Python
 WWW=		https://github.com/nschloe/meshio
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 RUN_DEPENDS=	${PYNUMPY}	\
 		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}meshio>0:science/py-meshio@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-image>0:graphics/py-scikit-image@${PY_FLAVOR}
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	fogleman
 GH_TAGNAME=	cee1dac	# No release yet
 
 USES=		python:3.7+
 USE_PYTHON=	distutils
 
 OPTIONS_DEFINE=	EXAMPLES
 PORTEXAMPLES=	*
 
 NO_ARCH=	yes
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	(cd ${WRKSRC}/examples && ${INSTALL_DATA} * ${STAGEDIR}${EXAMPLESDIR})
 
 .include <bsd.port.mk>
diff --git a/science/py-segregation/Makefile b/science/py-segregation/Makefile
index f364baa0bf36..70f10a1024a4 100644
--- a/science/py-segregation/Makefile
+++ b/science/py-segregation/Makefile
@@ -1,39 +1,39 @@
 PORTNAME=	segregation
 PORTVERSION=	2.3.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Analytics for spatial and non-spatial segregation in Python
 WWW=		https://pysal.org/segregation/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}deprecation>=0:devel/py-deprecation@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}geopandas>=0.9:graphics/py-geopandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}joblib>=0:devel/py-joblib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}libpysal>=0:science/py-libpysal@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mapclassify>=0:graphics/py-mapclassify@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>=0:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numba>=0:devel/py-numba@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpy>=0,1:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pandas>=0,1:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pip>=0:devel/py-pip@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pygeos>=0:graphics/py-pygeos@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyproj>=3:graphics/py-pyproj@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}quilt3>=0:www/py-quilt3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}rvlib>=0.0.5:math/py-rvlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-learn>=0.21.3:science/py-scikit-learn@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=0:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}seaborn>=0:math/py-seaborn@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tqdm>=0:misc/py-tqdm@${PY_FLAVOR}
 
 USES=		python:3.8+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/science/py-segyio/Makefile b/science/py-segyio/Makefile
index 3dc9e6c0e93d..25743d945251 100644
--- a/science/py-segyio/Makefile
+++ b/science/py-segyio/Makefile
@@ -1,39 +1,40 @@
 PORTNAME=	segyio
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.9.11
+PORTREVISION=	1
 CATEGORIES=	science python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Python binding for segyio, the seismic data library
 WWW=		https://github.com/equinor/segyio
 
 LICENSE=	LGPL3+
 
 BUILD_DEPENDS=	cmake:devel/cmake-core \
 		pybind11>0:devel/pybind11 \
 		${PYTHON_PKGNAMEPREFIX}distro>0:sysutils/py-distro@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-runner>=0:devel/py-pytest-runner@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-build>0:devel/py-scikit-build@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm@${PY_FLAVOR}
 LIB_DEPENDS=	libsegyio.so:science/segyio
 RUN_DEPENDS=	${PYNUMPY}
 
 USES=		compiler:c++11-lang python:3.6+ pytest
 USE_PYTHON=	distutils autoplist
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	equinor
 
 WRKSRC_SUBDIR=	python
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/segyio/_segyio*.so
 	${PYTHON_CMD} -m compileall -d ${PYTHON_SITELIBDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}
 	${PYTHON_CMD} -O -m compileall -d ${PYTHON_SITELIBDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}
 
 pre-test:
 	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} build_ext --inplace
 
 .include <bsd.port.mk>
diff --git a/science/py-sklearn-pandas/Makefile b/science/py-sklearn-pandas/Makefile
index 4c935e4e9a59..dba5819d6471 100644
--- a/science/py-sklearn-pandas/Makefile
+++ b/science/py-sklearn-pandas/Makefile
@@ -1,25 +1,26 @@
 PORTNAME=	sklearn-pandas
 PORTVERSION=	2.2.0
+PORTREVISION=	1
 CATEGORIES=	science python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Pandas integration with sklearn
 WWW=		https://github.com/scikit-learn-contrib/sklearn-pandas
 
 LICENSE=	BSD2CLAUSE ZLIB
 LICENSE_COMB=	multi
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=1.18.1,1:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pandas>=1.1.4,1:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-learn>=0.23.0:science/py-scikit-learn@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=1.5.1:science/py-scipy@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/science/py-skrebate/Makefile b/science/py-skrebate/Makefile
index f126c7b1d57f..f0a7996e88ed 100644
--- a/science/py-skrebate/Makefile
+++ b/science/py-skrebate/Makefile
@@ -1,23 +1,24 @@
 PORTNAME=	skrebate
 PORTVERSION=	0.62
+PORTREVISION=	1
 CATEGORIES=	science python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Relief-based feature selection algorithms
 WWW=		https://github.com/EpistasisLab/scikit-rebate
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=0,1:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-learn>=0:science/py-scikit-learn@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=0:science/py-scipy@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/science/py-spaghetti/Makefile b/science/py-spaghetti/Makefile
index 5224db485e1f..9b5e14a4e2e2 100644
--- a/science/py-spaghetti/Makefile
+++ b/science/py-spaghetti/Makefile
@@ -1,26 +1,27 @@
 PORTNAME=	spaghetti
 PORTVERSION=	1.6.10
+PORTREVISION=	1
 CATEGORIES=	science python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Analysis of Network-constrained Spatial Data
 WWW=		https://pysal.org/spaghetti/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}esda>=0:science/py-esda@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}libpysal>=0:science/py-libpysal@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpy>=1.3,1:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pandas>=1.0,1:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}rtree>=0:devel/py-rtree@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=1.0:science/py-scipy@${PY_FLAVOR}
 
 USES=		python:3.8+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/science/py-spglib/Makefile b/science/py-spglib/Makefile
index 9e2d8a7502a7..d5a76101bc9d 100644
--- a/science/py-spglib/Makefile
+++ b/science/py-spglib/Makefile
@@ -1,25 +1,26 @@
 PORTNAME=	spglib
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.0.2
+PORTREVISION=	1
 CATEGORIES=	science python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Library for finding and handling crystal symmetries (python binding)
 WWW=		https://atztogo.github.io/spglib/
 
 LICENSE=	BSD3CLAUSE
 
 BUILD_DEPENDS=	${PYNUMPY}
 RUN_DEPENDS=	${PYNUMPY}
 
 USES=		python:3.6+
 USE_PYTHON=	distutils autoplist pytest # tests fail to run, see https://github.com/spglib/spglib/issues/192
 USE_GITHUB=	yes
 
 WRKSRC_SUBDIR=	python
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/spglib/_spglib*.so
 
 .include <bsd.port.mk>
diff --git a/science/py-tensorflow/Makefile b/science/py-tensorflow/Makefile
index 5e63309b8d7e..b0b50cfcd2ed 100644
--- a/science/py-tensorflow/Makefile
+++ b/science/py-tensorflow/Makefile
@@ -1,232 +1,232 @@
 PORTNAME=	tensorflow
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.9.1
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	science python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DIST_SUBDIR=	${PORTNAME}
 EXTRACT_ONLY=	${DISTNAME}.tar.gz
 
 MAINTAINER=	amzo1337@gmail.com
 COMMENT=	Computation using data flow graphs for scalable machine learning
 WWW=		https://www.tensorflow.org
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 ONLY_FOR_ARCHS=	amd64
 
 BUILD_DEPENDS=	${RUN_DEPENDS} \
 		${PYTHON_PKGNAMEPREFIX}grpcio-tools>=1.22.0:devel/py-grpcio-tools@${PY_FLAVOR} \
 		bash:shells/bash \
 		cython:lang/cython \
 		swig:devel/swig \
 		bazel:devel/bazel \
 		git:devel/git
 LIB_DEPENDS=	libnsync.so:devel/nsync \
 		libgpr.so:devel/grpc \
 		libpng.so:graphics/png \
 		libsnappy.so:archivers/snappy \
 		liblmdb.so:databases/lmdb \
 		libsqlite3.so:databases/sqlite3 \
 		libicuio.so:devel/icu \
 		libjsoncpp.so:devel/jsoncpp \
 		libpcre.so:devel/pcre \
 		libnsync.so:devel/nsync \
 		libprotobuf.so:devel/protobuf \
 		libprotobuf-c.so:devel/protobuf-c \
 		libre2.so:devel/re2 \
 		libgif.so:graphics/giflib \
 		libcurl.so:ftp/curl \
 		libflatbuffers.so:devel/flatbuffers \
 		libdouble-conversion.so:devel/double-conversion
 RUN_DEPENDS=	pybind11>=2.6.2:devel/pybind11 \
 		${PYTHON_PKGNAMEPREFIX}absl-py>=1.0.0:devel/py-absl-py \
 		${PYTHON_PKGNAMEPREFIX}astunparse>=1.6.3:devel/py-astunparse@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}typing-extensions>=4.3.0:devel/py-typing-extensions@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}h5py>=2.9.0:science/py-h5py@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}flatbuffers>=2.0:devel/py-flatbuffers@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}gast>=0.5.3:devel/py-gast@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpy>=1.20.0:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}google-pasta>=0.1.7:devel/py-google-pasta@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}protobuf>=3.7.1:devel/py-protobuf@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}termcolor>=1.1.0:devel/py-termcolor@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}grpcio>=1.22.0:devel/py-grpcio@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}keras-preprocessing>=1.1.1:math/py-keras-preprocessing@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wrapt>=1.14.1:devel/py-wrapt@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0.30.0:devel/py-wheel@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}opt-einsum>=3.3.0:math/py-opt-einsum@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}packaging>=21.3:devel/py-packaging@${PY_FLAVOR} \
 		pybind11>=2.6.2:devel/pybind11
 
 USES=		jpeg llvm:16 python:3.7+ shebangfix ssl
 USE_CXXSTD=     c++17
 USE_GITHUB=	yes
 USE_PYTHON=	distutils
 
 SHEBANG_GLOB=	*.py
 
 BAZEL_BOOT=	--output_user_root=${WRKDIR}/bazel_out
 
 PLIST_SUB=	TF_PORT_VERSION=${PORTVERSION}
 
 OPTIONS_DEFINE=			CPU_OPTS XLA
 OPTIONS_RADIO=			PARALLEL_JOBS
 OPTIONS_RADIO_PARALLEL_JOBS=	JOBS_1 JOBS_HALF JOBS_ALL
 PARALLEL_JOBS_DESC=		How many jobs to run during build?
 OPTIONS_DEFAULT=		JOBS_1
 
 JOBS_1_DESC=			Run one job
 JOBS_1_VARS=			TF_JOBS_NUMBER=1
 JOBS_HALF_DESC=			Run half jobs
 JOBS_HALF_VARS=			TF_JOBS_NUMBER="`expr \( ${MAKE_JOBS_NUMBER} + 1 \) / 2`"
 JOBS_ALL_DESC=			Run all jobs
 JOBS_ALL_VARS=			TF_JOBS_NUMBER=${MAKE_JOBS_NUMBER}
 
 CPU_OPTS_DESC=			Enable optimisations using features available on your CPU
 CPU_OPTS_VARS=			CPU_TARGET=native BAZEL_COPT="-c opt --copt=-march=native --copt=-mfpmath=sse"
 CPU_OPTS_VARS_OFF=		CPU_TARGET=x86-64
 
 XLA_DESC=			Accelerated Linear Algebra
 XLA_VARS=			XLA_OPT="1"
 XLA_VARS_OFF=			XLA_OPT="0"
 
 .include "Makefile.MASTER_SITES"
 
 post-patch:
 	# Set up a local repository with our pre-downloaded packages
 	# This prevents bazel downloading the files without modifying
 	# the bzl files.
 	@${MKDIR} ${WRKDIR}/bazel-cache
 	@${MKDIR} ${WRKDIR}/bazel-dist
 	@${MKDIR} ${WRKDIR}/.bin
 
 .for file in ${DISTFILES:C/\:(.*)//}
 	@${ECHO} "Moving ${file} to ${WRKDIR}/bazel-dist"
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${file} ${WRKDIR}/bazel-dist
 .endfor
 
 	@${CP} ${PATCHDIR}/bazelrc ${WRKDIR}/bazelrc
 	@${CP} -R ${PATCHDIR}/bazel/* \
 		${WRKSRC}/third_party/
 
 	@${LN} -s ${PYTHON_CMD} ${WRKDIR}/.bin/python3
 	
 	@cd ${WRKSRC} && \
 		${REINPLACE_CMD} "s#--batch#${BAZEL_BOOT}\', \'--batch#" \
 		configure.py
 
 	${REINPLACE_CMD} "s#%%PYTHON%%#${PYTHON_VERSION}#" ${WRKSRC}/configure \
 		${WRKSRC}/third_party/freebsd_python_fix.patch \
 		${WRKSRC}/tensorflow/compiler/mlir/quantization/tensorflow/BUILD
 
 	@${REINPLACE_CMD} "s#%%BAZEL_DIR%%#${WRKDIR}#" ${WRKDIR}/bazelrc
 	@${REINPLACE_CMD} "s#%%BAZEL_DIST%%#${WRKDIR}#" ${WRKDIR}/bazelrc
 	@${REINPLACE_CMD} "s#%%MLIR_LLVM_PATCH%%#/${WRKSRC}/bazel/bazel_llvm-raw_utils_bazel_configure.bzl#" \
 		${WRKSRC}/tensorflow/compiler/mlir/hlo/WORKSPACE
 
 	# use system pybind11, but use sed to fix includes, too many to maintain with patches
 	@${FIND} ${WRKSRC} -type f -name '*.cc' | ${XARGS} ${REINPLACE_CMD} "s#include\/pybind11#pybind11#"
 
 
 	# copy the toolchain over
 	@${CP} -R ${PATCHDIR}/freebsd \
 		${WRKSRC}/
 
 	@${REINPLACE_CMD} "s#%%PATH%%#${PATH}#" ${WRKDIR}/bazelrc
 
 	@${REINPLACE_CMD} "s#%%PYTHON%%#${PYTHON_CMD}#" ${WRKSRC}/.bazelrc
 
 	@${REINPLACE_CMD} \
 		-e "s#%%LOCALBASE%%#${LOCALBASE}#" \
 		-e "s#%%LLVM_PREFIX%%#${LLVM_PREFIX}#g" \
 		-e "s#%%LLVM_VERSION%%#${LLVM_VERSION}#g" \
 		${WRKDIR}/bazelrc \
 		${WRKSRC}/third_party/absl/system.absl.strings.BUILD \
 		${WRKSRC}/freebsd/cc_toolchain_config.bzl \
 		${WRKSRC}/.bazelrc \
 		${WRKSRC}/tensorflow/tools/proto_text/BUILD \
 		${WRKSRC}/tensorflow/BUILD \
 		${WRKSRC}/tensorflow/core/BUILD \
 		${WRKSRC}/third_party/systemlibs/protobuf.BUILD
 
 
 do-configure:
 	@cd ${WRKSRC} && ${SETENV} \
 		PYTHON_BIN_PATH=${PYTHON_CMD} \
 		PYTHON_LIB_PATH="${PYTHON_SITELIBDIR}" \
 		KERAS_HOME="${WRKDIR}/.keras" \
 		TF_NEED_OPENCL_SYCL=0 \
 		TF_ENABLE_XLA=${XLA_OPT} \
 		TF_NEED_OPENCL=0 \
 		TF_NEED_MPI=0 \
 		TF_NEED_TENSORRT=0 \
 		TF_NEED_NGRAPH=0 \
 		TF_NEED_IGNITE=0 \
 		TF_NEED_ROCM=0 \
 		TF_NEED_CUDA=0 \
 		TF_SET_ANDROID_WORKSPACE=0 \
 		TF_DOWNLOAD_CLANG=0 \
 		TF_NEED_NCCL=0 \
 		TF_IGNORE_MAX_BAZEL_VERSION=1 \
 		CC_OPT_FLAGS="-march=${CPU_TARGET} -I${LOCALBASE}/include" \
 		PREFIX="${LOCALBASE}" \
 		TF_SYSTEM_LIBS="absl_py astor_archive astunparse_archive boringssl com_github_googlecloudplatform_google_cloud_cpp com_github_grpc_grpc \
 				com_google_absl com_google_protobuf curl cython dill_archive double_conversion functools32_archive gast_archive \
 				gif hwloc icu jsoncpp_git libjpeg_turbo lmdb nasm nsync opt_einsum_archive org_sqlite pasta png pybind11 six_archive snappy \
 				tblib_archive termcolor_archive typing_extensions_archive wrapt zlib" \
 		./configure
 
 do-build:
 	@cd ${WRKSRC} && \
 		bazel --bazelrc="${WRKDIR}/bazelrc" ${BAZEL_BOOT} build --jobs ${TF_JOBS_NUMBER} ${BAZEL_COPT} --host_copt="-I${LOCALBASE}/include" \
 		--host_linkopt="-L${LOCALBASE}/lib -lexecinfo" --linkopt="-L${LOCALBASE}/lib -lexecinfo" --copt="-I${LOCALBASE}/include" \
 		--verbose_failures -s \
 		--distdir=${WRKDIR}/bazel-dist \
 		//tensorflow:libtensorflow_framework.so \
 		//tensorflow:libtensorflow.so \
 		//tensorflow:libtensorflow_cc.so \
 		//tensorflow:install_headers \
 		//tensorflow/tools/pip_package:build_pip_package
 
 
 	@cd ${WRKSRC} && ${SETENV} TMPDIR=${WRKDIR} \
 		bazel-bin/tensorflow/tools/pip_package/build_pip_package \
 		${WRKDIR}/whl
 
 do-install:
 	@${MKDIR} ${STAGEDIR}/${PYTHON_SITELIBDIR}
 	@${MKDIR} ${STAGEDIR}/${LOCALBASE}/include/tensorflow
 
 	@${UNZIP_NATIVE_CMD} -d ${STAGEDIR}/${PYTHON_SITELIBDIR} ${WRKDIR}/whl/${PORTNAME}-${PORTVERSION}-*.whl
 
 	# put headers in the right folder
 	${CP} -R ${WRKSRC}/bazel-bin/tensorflow/include/tensorflow \
 		${STAGEDIR}/${LOCALBASE}/include/
 
 	# pc files and libraries
 	${INSTALL_DATA} ${PATCHDIR}/tensorflow.pc ${STAGEDIR}/${LOCALBASE}/libdata/pkgconfig/
 	${INSTALL_DATA} ${PATCHDIR}/tensorflow_cc.pc ${STAGEDIR}/${LOCALBASE}/libdata/pkgconfig/
 
 	@${REINPLACE_CMD} "s#%%LOCALBASE%%#${LOCALBASE}#" \
 		${STAGEDIR}/${LOCALBASE}/libdata/pkgconfig/tensorflow.pc \
 		${STAGEDIR}/${LOCALBASE}/libdata/pkgconfig/tensorflow_cc.pc
 
 	@${REINPLACE_CMD} "s#%%VERSION%%#${PORTVERSION}#" \
 		${STAGEDIR}/${LOCALBASE}/libdata/pkgconfig/tensorflow.pc	
 
 	#cleanup
 	${RM} ${STAGEDIR}/${LOCALBASE}/libdata/pkgconfig/*.bak
 
 	# install the libraries and strip
 	@${FIND} ${WRKSRC}/bazel-bin/tensorflow/ -depth 1 -name "*.so*" | ${XARGS} -I{} \
 		${INSTALL_LIB} {} ${STAGEDIR}/${LOCALBASE}/lib/
 
 	@${FIND} ${STAGEDIR}/${LOCALBASE}/lib -name "*.so*" | ${XARGS} ${STRIP_CMD}
 
 post-install: # autoplist: thousands of files, all under ${PYTHON_SITELIBDIR}
 	@cd ${STAGEDIR}${PREFIX} && \
 		${FIND} ${PYTHON_SITELIBDIR:C|^${LOCALBASE}/||} -type f -or -type l | grep -v "egg-info/" >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/science/py-thewalrus/Makefile b/science/py-thewalrus/Makefile
index 2d4f65ee6a8f..21102b74feb4 100644
--- a/science/py-thewalrus/Makefile
+++ b/science/py-thewalrus/Makefile
@@ -1,39 +1,40 @@
 PORTNAME=	thewalrus
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.20.0
+PORTREVISION=	1
 CATEGORIES=	science python
 #MASTER_SITES=	PYPI # doesn't contain tests
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Open source library for hafnian calculation
 WWW=		https://github.com/XanaduAI/thewalrus
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 PY_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}dask>0:devel/py-dask@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numba>0:devel/py-numba@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sympy>0:math/py-sympy@${PY_FLAVOR}
 BUILD_DEPENDS=	${PY_DEPENDS}
 RUN_DEPENDS=	${PY_DEPENDS}
 TEST_DEPENDS=	gmake:devel/gmake \
 		${PYTHON_PKGNAMEPREFIX}flaky>=3.7.0:devel/py-flaky@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-randomly>0:devel/py-pytest-randomly@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_PYTHON=	distutils autoplist pytest
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	XanaduAI
 
 NO_ARCH=	yes
 
 BINARY_ALIAS=	python3=${PYTHON_CMD}
 
 do-test: # testsuite fails to run: https://github.com/XanaduAI/thewalrus/issues/344
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} test
 
 .include <bsd.port.mk>
diff --git a/science/py-tobler/Makefile b/science/py-tobler/Makefile
index ae2d2df17ef3..3c83ea974047 100644
--- a/science/py-tobler/Makefile
+++ b/science/py-tobler/Makefile
@@ -1,30 +1,30 @@
 PORTNAME=	tobler
 PORTVERSION=	0.9.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Areal Interpolation
 WWW=		https://pysal.org/tobler/
 
 LICENSE=	BSD3CLAUSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}geopandas>=0:graphics/py-geopandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}joblib>=0:devel/py-joblib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}libpysal>=0:science/py-libpysal@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpy>=0,1:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pandas>=0,1:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}rasterio>=0:graphics/py-rasterio@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}rasterstats>=0:graphics/py-rasterstats@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=0:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}statsmodels>=0:math/py-statsmodels@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tqdm>=0:misc/py-tqdm@${PY_FLAVOR}
 
 USES=		python:3.8+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/science/py-trainstation/Makefile b/science/py-trainstation/Makefile
index be622527fe95..3a85d0bd017e 100644
--- a/science/py-trainstation/Makefile
+++ b/science/py-trainstation/Makefile
@@ -1,24 +1,25 @@
 PORTNAME=	trainstation
 DISTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	science python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Convenient training of linear models
 WWW=		https://trainstation.materialsmodeling.org/
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 xBUILD_DEPENDS=	${PYNUMPY}
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-learn>0:science/py-scikit-learn@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_PYTHON=	distutils autoplist
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/science/py-vedo/Makefile b/science/py-vedo/Makefile
index a5ca452e249a..b8055b453bbb 100644
--- a/science/py-vedo/Makefile
+++ b/science/py-vedo/Makefile
@@ -1,28 +1,29 @@
 PORTNAME=	vedo
 DISTVERSION=	2023.4.4
+PORTREVISION=	1
 CATEGORIES=	science graphics python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Python module for scientific analysis and visualization of 3D objects
 WWW=		https://vedo.embl.es/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}deprecated>0:devel/py-deprecated@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments@${PY_FLAVOR} \
 		${PYNUMPY} \
 		vtk${VTK_VER:R}>0:math/vtk${VTK_VER:R} \
 		bash:shells/bash
 
 USES=		python:3.6+ shebangfix
 USE_PYTHON=	distutils autoplist
 
 SHEBANG_GLOB=	*.sh
 
 NO_ARCH=	yes
 
 .include <../../math/vtk9/Makefile.version>
 .include <bsd.port.mk>
diff --git a/science/py-veusz/Makefile b/science/py-veusz/Makefile
index 0652ee3e2905..5f6053e852ea 100644
--- a/science/py-veusz/Makefile
+++ b/science/py-veusz/Makefile
@@ -1,36 +1,36 @@
 PORTNAME=	veusz
 DISTVERSIONPREFIX=	${PORTNAME}-
 DISTVERSION=	3.6.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Scientific plotting package
 WWW=		https://veusz.github.io/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}tomli>0:textproc/py-tomli@${PY_FLAVOR}
 RUN_DEPENDS=	${PYNUMPY}
 
 USES=		compiler:c++11-lang python:3.5+ pyqt:5 qt:5 shebangfix
 USE_GITHUB=	yes
 USE_PYQT=	pyqt5 sip
 USE_PYTHON=	distutils concurrent autoplist pytest
 USE_QT=		core gui xml widgets qmake:build
 
 SHEBANG_FILES=	tests/runselftest.py examples/embedexample.py
 
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 
 post-install:
 	# strip
 	${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/veusz/helpers/*.so
 
 do-test:
 	@cd ${WRKSRC}/tests && ${SETENV} ${TEST_ENV} ./runselftest.py
 
 .include <bsd.port.mk>
diff --git a/science/py-xbout/Makefile b/science/py-xbout/Makefile
index f2479416bbb6..75975d8c3b90 100644
--- a/science/py-xbout/Makefile
+++ b/science/py-xbout/Makefile
@@ -1,35 +1,36 @@
 PORTNAME=	xbout
 DISTVERSION=	0.3.5
+PORTREVISION=	1
 CATEGORIES=	science education
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Collect data from BOUT++ runs in python using xarray
 WWW=		https://github.com/boutproject/xBOUT
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 PY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}animatplot>=0.4.2:math/py-animatplot@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}boutdata>=0.1.4:science/py-boutdata@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dask>=2.10.0:devel/py-dask@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}gelidum>=0.5.3:devel/py-gelidum@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>=3.1.1:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}natsort>=5.5.0:devel/py-natsort@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}netCDF4>=1.4.0:science/py-netCDF4@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pillow>=6.1.0:graphics/py-pillow@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xarray>=0.18.0:devel/py-xarray@${PY_FLAVOR}
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}setuptools_scm_git_archive>0:devel/py-setuptools_scm_git_archive@${PY_FLAVOR} \
 		${PY_DEPENDS}
 RUN_DEPENDS=	${PY_DEPENDS}
 
 USES=		python:3.8+
 USE_PYTHON=	autoplist distutils pytest
 
 NO_ARCH=	yes
 
 TEST_WRKSRC=	${WRKSRC}/xbout/tests
 
 .include <bsd.port.mk>
diff --git a/science/pybrain/Makefile b/science/pybrain/Makefile
index 37e70249d79d..3f81ca711969 100644
--- a/science/pybrain/Makefile
+++ b/science/pybrain/Makefile
@@ -1,19 +1,19 @@
 PORTNAME=	pybrain
 PORTVERSION=	0.3.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	science python
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Swiss Army knife for neural networking
 WWW=		http://pybrain.org/
 
 LICENSE=	BSD3CLAUSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}scipy>=0.7.1:science/py-scipy@${PY_FLAVOR}
 
 USE_GITHUB=	yes
 
 USES=		python:3.6+
 USE_PYTHON=	autoplist distutils concurrent optsuffix
 
 .include <bsd.port.mk>
diff --git a/science/pynn/Makefile b/science/pynn/Makefile
index 0a87dd6f64f4..0bccf9cdbc7b 100644
--- a/science/pynn/Makefile
+++ b/science/pynn/Makefile
@@ -1,26 +1,27 @@
 PORTNAME=	pynn
 PORTVERSION=	0.10.1
+PORTREVISION=	1
 CATEGORIES=	science python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	PyNN-${PORTVERSION}
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Simulator-independent language for building neuronal network models
 WWW=		https://neuralensemble.org/PyNN
 
 LICENSE=	CeCILL
 LICENSE_NAME=	CeCILL Free Software License Version 2.0
 LICENSE_FILE=	${WRKSRC}/LICENSE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 BUILD_DEPENDS=	${PYNUMPY}
 RUN_DEPENDS=	${PYNUMPY}
 
 NO_ARCH=	yes
 
 USES=		python:3.6+
 USE_PYTHON=	autoplist distutils
 PYDISTUTILS_PKGNAME=	PyNN
 
 .include <bsd.port.mk>
diff --git a/science/q/Makefile b/science/q/Makefile
index f7c4314c0965..06a21db399e2 100644
--- a/science/q/Makefile
+++ b/science/q/Makefile
@@ -1,36 +1,37 @@
 PORTNAME=	q
 DISTVERSIONPREFIX=	v
 DISTVERSION=	6.0
+PORTREVISION=	1
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Molecular Dynamics (MD) tools
 WWW=		https://github.com/qusers/Q6
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/../LICENSE
 
 USES=		fortran gmake
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	qusers
 GH_PROJECT=	Q6
 
 MAKEFILE=	makefile
 
 WRKSRC_SUBDIR=	src
 
 BINARY_ALIAS=	make=${GMAKE} gfortran=gfortran${GCC_DEFAULT}
 
 MAKE_JOBS_UNSAFE=	yes
 
 EXECUTABLES=	Qcalc6 Qdum6 Qdyn6 Qfep6 Qpi6 Qprep6
 
 PLIST_FILES=	${EXECUTABLES:C/(.*)/bin\/\1/}
 
 do-install:
 .for e in ${EXECUTABLES}
 	${INSTALL_PROGRAM} ${WRKSRC}/../bin/${e} ${STAGEDIR}${PREFIX}/bin
 .endfor
 
 .include <bsd.port.mk>
diff --git a/science/qbox/Makefile b/science/qbox/Makefile
index b7598f10c4eb..64edd5ec5b84 100644
--- a/science/qbox/Makefile
+++ b/science/qbox/Makefile
@@ -1,43 +1,44 @@
 PORTNAME=	qbox
 DISTVERSIONPREFIX=	rel
 DISTVERSION=	1_75_1
+PORTREVISION=	1
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	First-principles molecular dynamics code
 WWW=		http://qboxcode.org/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/../COPYING
 
 LIB_DEPENDS=	libblas.so:math/blas \
 		libcurl.so:ftp/curl \
 		libfftw3.so:math/fftw3 \
 		liblapack.so:math/lapack \
 		libmpich.so:net/mpich \
 		libscalapack.so:math/scalapack \
 		libuuid.so:misc/e2fsprogs-libuuid \
 		libxerces-c.so:textproc/xerces-c3
 
 USES=		compiler:c++11-lang gmake iconv:wchar_t localbase:ldflags
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	qboxcode
 GH_PROJECT=	qbox-public
 
 WRKSRC_SUBDIR=	src
 
 MAKE_ARGS=	TARGET=freebsd
 
 ALL_TARGET=	qb
 TEST_TARGET=	tests # only builds tests, but doesn't run them: https://github.com/qboxcode/qbox-public/issues/6
 
 PLIST_FILES=	bin/qb
 
 post-extract:
 	@${SED} -e 's|%%LOCALBASE%%|${LOCALBASE}|; s|%%CXXFLAGS%%|${CXXFLAGS}|; s|%%LDFLAGS%%|${LDFLAGS}|' < ${FILESDIR}/freebsd.mk.in > ${WRKSRC}/freebsd.mk
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/qb ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/science/qiskit-aer/Makefile b/science/qiskit-aer/Makefile
index 4568eb2f2a1a..838a66029a9c 100644
--- a/science/qiskit-aer/Makefile
+++ b/science/qiskit-aer/Makefile
@@ -1,32 +1,32 @@
 PORTNAME=	qiskit-aer
 DISTVERSION=	0.10.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science # quantum-computing
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
 PATCHFILES=	46d86944f349a177acb40fb8a3adc301c395fe60.patch:-p1 # https://github.com/Qiskit/qiskit-aer/pull/1576
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Quantum circuits simulator submodule of the Qiskit framework
 WWW=		https://qiskit.org/aer/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BROKEN_i386=	undefined reference to `__atomic_load'
 
 BUILD_DEPENDS=	nlohmann-json>0:devel/nlohmann-json
 LIB_DEPENDS=	libfmt.so:devel/libfmt \
 		libopenblas.so:math/openblas \
 		libspdlog.so:devel/spdlog
 
 USES=		cmake compiler:c++11-lang localbase:ldflags
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Qiskit
 
 CONFIGURE_ENV=	DISABLE_CONAN=yes
 
 PLIST_FILES=	bin/qasm_simulator
 
 .include <bsd.port.mk>
diff --git a/science/qmcpack/Makefile b/science/qmcpack/Makefile
index 1e1aecfc2d07..515f9118e397 100644
--- a/science/qmcpack/Makefile
+++ b/science/qmcpack/Makefile
@@ -1,63 +1,64 @@
 PORTNAME=	qmcpack
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.15.0
+PORTREVISION=	1
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Many-body ab initio Quantum Monte Carlo code for quantum chemistry
 WWW=		https://www.qmcpack.org/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_i386=	undefined reference to `__atomic_load'
 
 LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 		libfftw3.so:math/fftw3 \
 		libhdf5.so:science/hdf5 \
 		libmpich.so:net/mpich \
 		libopenblas.so:math/openblas \
 		libsz.so:science/libaec
 TEST_DEPENDS=	bash:shells/bash
 
 USES=		cmake:testing compiler:c++17-lang fortran gnome localbase:ldflags pkgconfig python shebangfix
 USE_GNOME=	libxml2
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	${PORTNAME:tu}
 
 SHEBANG_FILES=	src/QMCTools/gpaw4qmcpack.py \
 		${NEXUS_PLIST_FILES:C/^/nexus\//}
 SHEBANG_GLOB=	check.sh
 
 CMAKE_OFF=	BUILD_UNIT_TESTS
 CMAKE_ARGS=	-DFREEBSD_PYTHON_VER=${PYTHON_VER}
 CMAKE_TESTING_ON=	BUILD_UNIT_TESTS # many tests fail, see https://github.com/QMCPACK/qmcpack/issues/4274
 
 PROGS=		convert4qmc convertpw4qmc gpaw4qmcpack.py ppconvert qmc-check-affinity qmc-extract-eshdf-kvectors qmc-get-supercell qmcfinitesize qmcpack qmcpack.settings
 PLIST_FILES=	${PROGS:C/^/bin\//}
 
 BINARY_ALIAS=	python=${PYTHON_CMD} python3=${PYTHON_CMD}
 
 OPTIONS_DEFINE=		NEXUS
 OPTIONS_DEFAULT=	NEXUS
 OPTIONS_SUB=		yes
 
 NEXUS_DESC=		Install Nexus (workflow utility) alongside QMCPACK
 NEXUS_CMAKE_BOOL=	INSTALL_NEXUS
 NEXUS_PY_DEPENDS=	${PYNUMPY} \
 			${PYTHON_PKGNAMEPREFIX}h5py>0:science/py-h5py@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}pyscf>0:science/py-pyscf@${PY_FLAVOR}
 NEXUS_BUILD_DEPENDS=	${NEXUS_PY_DEPENDS}
 NEXUS_RUN_DEPENDS=	${NEXUS_PY_DEPENDS}
 NEXUS_PLIST_FILES=	bin/eshdf \
 			bin/nxs-redo \
 			bin/nxs-sim \
 			bin/nxs-test \
 			bin/qdens \
 			bin/qdens-radial \
 			bin/qmc-fit \
 			bin/qmca
 
 .include <bsd.port.mk>
diff --git a/science/quantum-espresso-pseudopotentials/Makefile b/science/quantum-espresso-pseudopotentials/Makefile
index c2fc2a2ea5d3..00b254eab610 100644
--- a/science/quantum-espresso-pseudopotentials/Makefile
+++ b/science/quantum-espresso-pseudopotentials/Makefile
@@ -1,40 +1,40 @@
 PORTNAME=	quantum-espresso-pseudopotentials
 DISTVERSION=	g20180406
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Pseudopotentials for use with Quantum Espresso
 WWW=		https://www.quantum-espresso.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/License
 
 BUILD_DEPENDS=	quantum-espresso>0:science/quantum-espresso \
 		bash:shells/bash
 RUN_DEPENDS=	quantum-espresso>0:science/quantum-espresso
 
 USES=		shebangfix
 SHEBANG_GLOB=	*.job make_*
 SHEBANG_FILES=	QE_path clean clean_all
 USE_GITHUB=	yes
 GH_ACCOUNT=	dalcorso
 GH_PROJECT=	pslibrary
 GH_TAGNAME=	9dd5cf7
 
 NO_ARCH=	yes
 
 DATADIR=	${PREFIX}/share/quantum-espresso
 PORTDATA=	*
 
 post-patch:
 	@${REINPLACE_CMD} 's|/path_to_quantum_espresso/|${LOCALBASE}|' ${WRKSRC}/QE_path
 
 do-build:
 	@cd ${WRKSRC} && ./make_all_ps
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	${FIND} ${WRKSRC} -name "*.UPF" -and -exec ${INSTALL_DATA} {} ${STAGEDIR}${DATADIR} \;
 
 .include <bsd.port.mk>
diff --git a/science/quantum-espresso/Makefile b/science/quantum-espresso/Makefile
index bc2fd4cc23ad..69fea8e2c5b2 100644
--- a/science/quantum-espresso/Makefile
+++ b/science/quantum-espresso/Makefile
@@ -1,62 +1,63 @@
 PORTNAME=	quantum-espresso
 DISTVERSIONPREFIX=	qe-
 DISTVERSION=	6.7.0
+PORTREVISION=	1
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Package for research in electronic structure, simulation, optimization
 WWW=		https://www.quantum-espresso.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/License
 
 BROKEN_armv6=	fails to build: gfortran8: error: iotk_base_tmp.f90: No such file or directory
 BROKEN_armv7=	fails to build: gfortran8: error: iotk_base_tmp.f90: No such file or directory
 
 BUILD_DEPENDS=	fox-xml>0:textproc/fox-xml \
 		bash:shells/bash
 LIB_DEPENDS=	libmpich.so:net/mpich \
 		libblas.so:math/blas \
 		liblapack.so:math/lapack
 
 USES=		fortran gmake python shebangfix
 SHEBANG_FILES=	configure
 GNU_CONFIGURE=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	QEF
 GH_PROJECT=	q-e
 
 MAKE_ARGS=	TOPDIR=${WRKSRC}
 BINARY_ALIAS=	make=gmake cpp=/usr/local/bin/cpp${GCC_DEFAULT}
 FFLAGS+=	-x f95-cpp-input
 LDFLAGS+=	${LOCALBASE}/lib/gcc${GCC_DEFAULT}/libgfortran.so -lm
 
 MAKE_JOBS_UNSAFE=	yes # https://github.com/QEF/q-e/issues/9
 
 .include <bsd.port.pre.mk>
 
 .  if ${GCC_DEFAULT} >= 10
 FFLAGS+=	-fallow-argument-mismatch # workaround for https://github.com/QEF/q-e/issues/34
 .  endif
 
 post-extract:
 	@${RM} ${WRKSRC}/archive/lapack-3.6.1.tgz
 	@cd ${WRKSRC} && ${MKDIR} FoX && ${LN} -s ${LOCALBASE}/include FoX/finclude
 
 pre-build:
 	@${REINPLACE_CMD} -i '' -e ' \
 		s|$$(CPP) $$(CPPFLAGS)|$$(CPP) -P -traditional $$(CPPFLAGS)| ; \
 		s|LD *=.*|LD=${CC}| ; \
 		s|LAPACK_LIBS *=.*|LAPACK_LIBS=-L${LOCALBASE}/lib -llapack| ; \
 		s|BLAS_LIBS *=.*|BLAS_LIBS=-L${LOCALBASE}/lib -lblas|' \
 		${WRKSRC}/make.inc
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*.x
 
 run-examples: build
 .for c in PP PW PWCOND PHonon
 	@cd ${WRKSRC}/$c/examples && PREFIX=${STAGEDIR}${PREFIX} ./run_all_examples
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/science/quantum-jet/Makefile b/science/quantum-jet/Makefile
index 20629fc20aec..02a52677bff6 100644
--- a/science/quantum-jet/Makefile
+++ b/science/quantum-jet/Makefile
@@ -1,36 +1,37 @@
 PORTNAME=	quantum-jet
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.2.2-2
+PORTREVISION=	1
 DISTVERSIONSUFFIX=	-g99c55ce
 CATEGORIES=	science # quantum-computing
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Cross-platform header-only library for simulating quantum circuits
 WWW=		https://github.com/XanaduAI/jet
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	openblas>0:math/openblas
 RUN_DEPENDS=	taskflow>0:devel/taskflow \
 		openblas>0:math/openblas
 TEST_DEPENDS=	git:devel/git
 
 USES=		cmake:testing compiler:c++17-lang
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	XanaduAI
 GH_PROJECT=	jet
 
 CMAKE_TESTING_ON=	BUILD_TESTS
 
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 do-configure: # no configure because it clones the taskflow repository
 	@${NADA}
 
 do-install: # tests fail to compile, see https://github.com/XanaduAI/jet/issues/77
 	@cd ${WRKSRC} && ${COPYTREE_SHARE} include ${STAGEDIR}${PREFIX}
 
 .include <bsd.port.mk>
diff --git a/science/qwalk/Makefile b/science/qwalk/Makefile
index ad007aa06c88..570c53ed651f 100644
--- a/science/qwalk/Makefile
+++ b/science/qwalk/Makefile
@@ -1,26 +1,26 @@
 PORTNAME=	qwalk
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.0.1-300
-PORTREVISION=	5
+PORTREVISION=	6
 DISTVERSIONSUFFIX=	-g1b7e381
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Quantum Monte Carlo package for quantum chemistry computations
 WWW=		https://qwalk.github.io/mainline/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/../COPYING
 
 PORTSCOUT=	limit:^.*[1-9]\. # prevent words like 'broken'
 
 USES=		compiler:c++11-lang fortran gmake gnome perl5
 USE_GITHUB=	yes
 GH_ACCOUNT=	QWalk
 GH_PROJECT=	mainline
 USE_GNOME=	libxml2
 
 WRKSRC_SUBDIR=	src
 MAKE_ARGS=	INSTALLPATH=${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/science/rdkit/Makefile b/science/rdkit/Makefile
index 41dd9e43a03e..05c514298464 100644
--- a/science/rdkit/Makefile
+++ b/science/rdkit/Makefile
@@ -1,81 +1,81 @@
 PORTNAME=	rdkit
 DISTVERSIONPREFIX=	Release_
 DISTVERSION=	2022_03_5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	science
 MASTER_SITES=	https://fonts.google.com/download?family=Comic%20Neue&dummy=/:font
 DISTFILES=	Comic_Neue.zip:font
 DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Collection of cheminformatics and machine-learning software
 WWW=		https://www.rdkit.org/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/license.txt
 
 BROKEN_i386=	non-constant-expression cannot be narrowed from type 'unsigned int' to 'npy_intp', see https://github.com/rdkit/rdkit/issues/4934
 
 BUILD_DEPENDS=	catch>0:devel/catch \
 		flex:textproc/flex \
 		rapidjson>=0:devel/rapidjson
 LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 		libcoordgen.so:science/coordgenlibs \
 		libfreetype.so:print/freetype2 \
 		libmaeparser.so:science/maeparser
 
 USES=		bison:build cmake compiler:c++11-lang eigen:3 python:3.7+
 USE_GITHUB=	yes
 GH_TUPLE=	rareylab:RingDecomposerLib:v1.1.3_rdkit:RingDecomposerLib/External/RingFamilies/RingDecomposerLib
 USE_LDCONFIG=	yes
 
 CMAKE_OFF=	RDK_INSTALL_INTREE RDK_USE_FLEXBISON \
 		RDK_INSTALL_STATIC_LIBS RDK_SWIG_STATIC RDK_PGSQL_STATIC \
 		RDK_OPTIMIZE_NATIVE \
 		RDK_BUILD_CPP_TESTS
 CMAKE_ARGS=	-DCATCH_DIR=${LOCALBASE}/include/catch2
 
 DATADIR=	${PREFIX}/share/RDKit
 DOCSDIR=	${PREFIX}/share/doc/RDKit
 
 PLIST_SUB=	SHLIB_VER=${PORTVERSION}
 
 OPTIONS_DEFINE=		DOCS PGSQL PYTHON
 OPTIONS_DEFAULT=	PYTHON
 OPTIONS_SUB=		yes
 
 DOCS_CMAKE_BOOL=	FREEBSD_INSTALL_DOCS
 DOCS_CMAKE_ON=		-DFREEBSD_DOCSDIR:PATH=${DOCSDIR}
 
 PGSQL_USES=		pgsql
 PGSQL_DESC=		Build the PostgreSQL cartridge
 PGSQL_CMAKE_BOOL=	RDK_BUILD_PGSQL
 
 PYTHON_CMAKE_BOOL=	RDK_BUILD_PYTHON_WRAPPERS
 PYTHON_BUILD_DEPENDS=	${PYNUMPY}
 PYTHON_LIB_DEPENDS=	${PY_BOOST}
 PYTHON_RUN_DEPENDS=	${PYNUMPY} \
 			${PY_PILLOW} \
 			${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}reportlab>0:print/py-reportlab@${PY_FLAVOR}
 
 PORTDOCS=	*
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == aarch64 || ${ARCH} == amd64 || ${ARCH:Marm*} || ${ARCH} == i386 || ${ARCH:Mmips*el*} || ${ARCH} == riscv
 PLIST_SUB+=	LITTLE_ENDIAN=""
 .else
 PLIST_SUB+=	LITTLE_ENDIAN="@comment "
 .endif
 
 post-extract:
 	@${MKDIR} ${WRKSRC}/External/rapidjson-1.1.0
 	@cd ${WRKSRC}/External/rapidjson-1.1.0 && ${LN} -s ${LOCALBASE}/include/rapidjson include
 	@cd ${WRKSRC}/Data/Fonts && unzip ${DISTDIR}/${DIST_SUBDIR}/Comic_Neue.zip
 
 post-stage: # https://github.com/rdkit/rdkit/issues/2094
 	#@${MKDIR} ${STAGEDIR}${PREFIX}/lib/cmake
 	#@${MV} ${STAGEDIR}${PREFIX}/lib/*.cmake ${STAGEDIR}${PREFIX}/lib/cmake
 
 .include <bsd.port.mk>
diff --git a/science/rmf/Makefile b/science/rmf/Makefile
index 9106fb80f4af..2510d0de4c0d 100644
--- a/science/rmf/Makefile
+++ b/science/rmf/Makefile
@@ -1,35 +1,36 @@
 PORTNAME=	rmf
 DISTVERSION=	1.5.0
+PORTREVISION=	1
 CATEGORIES=	science graphics
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Library to support reading and writing of Rich Molecular Format files
 WWW=		https://integrativemodeling.org/rmf/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 		libhdf5.so:science/hdf5 \
 		libsz.so:science/libaec
 
 USES=		compiler:c++17-lang cmake:testing python:build shebangfix
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	salilab
 
 SHEBANG_GLOB=	*.py
 
 LDFLAGS+=	-lhdf5
 
 BINARY_ALIAS=	python=${PYTHON_CMD}
 
 do-test:
 	@${RM} ${WRKSRC}/test/*.py
 	@cd ${BUILD_WRKSRC} && \
 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DFREEBSD_BUILS_WITH_TESTS:BOOL=ON ${CMAKE_SOURCE_PATH} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
 
 .include <bsd.port.mk>
diff --git a/science/rubygem-cdo/Makefile b/science/rubygem-cdo/Makefile
index a51b4ccecd08..5f5511fd37a0 100644
--- a/science/rubygem-cdo/Makefile
+++ b/science/rubygem-cdo/Makefile
@@ -1,18 +1,19 @@
 PORTNAME=	cdo
 PORTVERSION=	1.5.1
+PORTREVISION=	1
 CATEGORIES=	science rubygems
 MASTER_SITES=	RG
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Ruby binding to CDO (Climate Data Operators)
 WWW=		https://code.mpimet.mpg.de/projects/cdo/wiki/Cdo%7Brbpy%7D
 
 LICENSE=	BSD3CLAUSE
 
 RUN_DEPENDS=	cdo:science/cdo
 
 USES=		gem
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/science/rubygem-ruby-netcdf/Makefile b/science/rubygem-ruby-netcdf/Makefile
index 7d6120ea70fb..19153b2de293 100644
--- a/science/rubygem-ruby-netcdf/Makefile
+++ b/science/rubygem-ruby-netcdf/Makefile
@@ -1,19 +1,20 @@
 PORTNAME=	ruby-netcdf
 PORTVERSION=	0.8.0
+PORTREVISION=	1
 CATEGORIES=	science rubygems
 MASTER_SITES=	RG
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Ruby interface to the NetCDF scientific IO library
 WWW=		https://www.gfd-dennou.org/arch/ruby/products/ruby-netcdf/
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 LIB_DEPENDS=	libnetcdf.so:science/netcdf
 RUN_DEPENDS=	rubygem-narray>=0:math/rubygem-narray \
 		rubygem-narray_miss>=0:math/rubygem-narray_miss
 
 USES=		gem
 
 .include <bsd.port.mk>
diff --git a/science/serac/Makefile b/science/serac/Makefile
index 69b66956e07a..d748842a5575 100644
--- a/science/serac/Makefile
+++ b/science/serac/Makefile
@@ -1,54 +1,54 @@
 PORTNAME=	serac
 PORTVERSION=	g20220823
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	High order nonlinear thermomechanical simulation code
 WWW=		https://github.com/LLNL/serac
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libaxom.so:science/axom \
 		libconduit.so:science/conduit \
 		libhdf5.so:science/hdf5 \
 		libHYPRE.so:science/hypre \
 		libmfem.so:math/mfem \
 		libsiloh5.so:science/silo
 
 USES=		cmake:testing compiler:c++17-lang
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	LLNL
 GH_TAGNAME=	07b8ef1
 GH_TUPLE=	LLNL:blt:49971b88e631aba76a9990c7702ceee47a7c3216:LLNL_blt/cmake/blt \
 		LLNL:uberenv:2cd030dd8fa9ff381900bfbe12fe1eea44a57bb5:LLNL_uberenv/scripts/uberenv \
 		LLNL:serac_tests:2fee9739eadeb218e99f7f5549e0800df81ca757:LLNL_serac_tests/tests
 
 CMAKE_TESTING_ON=	ENABLE_TESTS # tests fail to compile, see https://github.com/LLNL/serac/issues/786
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 CMAKE_OFF=	ENABLE_TESTS
 CMAKE_ARGS=	-DAXOM_DIR=${LOCALBASE} \
 		-DCONDUIT_DIR=${LOCALBASE} \
 		-DMFEM_DIR=${LOCALBASE}
 
 OPTIONS_SINGLE=		MPI
 OPTIONS_SINGLE_MPI=	MPICH OPENMPI
 OPTIONS_DEFAULT=	MPICH
 OPTIONS_SUB=		yes
 
 MPICH_USES=		mpi:mpich
 MPICH_CMAKE_ON=		-DENABLE_MPI=ON \
 			-DMPI_C_COMPILER=${MPICC} \
 			-DMPI_CXX_COMPILER=${MPICXX}
 
 OPENMPI_USES=		mpi:openmpi
 OPENMPI_CMAKE_ON=	-DENABLE_MPI=ON \
 			-DMPI_C_COMPILER=${MPICC} \
 			-DMPI_CXX_COMPILER=${MPICXX}
 OPENMPI_BROKEN=		mixes OpenMPI and MPICH when both are installed, see https://github.com/LLNL/serac/issues/787
 
 .include <bsd.port.mk>
diff --git a/science/siconos/Makefile b/science/siconos/Makefile
index 72d38099778d..ee49b2ec24c6 100644
--- a/science/siconos/Makefile
+++ b/science/siconos/Makefile
@@ -1,49 +1,49 @@
 PORTNAME=	siconos
 DISTVERSION=	4.4.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Simulation framework for nonsmooth dynamical systems
 WWW=		https://nonsmooth.gricad-pages.univ-grenoble-alpes.fr/siconos/index.html
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BROKEN_i386=		non-constant-expression cannot be narrowed from type 'unsigned int' to 'npy_intp', see https://github.com/siconos/siconos/issues/416
 
 BUILD_DEPENDS=	boost-libs>0:devel/boost-libs \
 		${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR} \
 		help2man:misc/help2man
 LIB_DEPENDS=	libcxsparse.so:math/suitesparse-cxsparse \
 		libgmp.so:math/gmp \
 		libldl.so:math/suitesparse-ldl \
 		libopenblas.so:math/openblas
 TEST_DEPENDS=	cppunit>0:devel/cppunit
 
 USES=		cmake:testing compiler:c++17-lang fortran pkgconfig
 USE_GITHUB=	yes
 USE_LDCONFIG=	yes
 
 CMAKE_ARGS=	-DFREEBSD_PYTHON_VER=${PYTHON_VER}
 CMAKE_TESTING_ON=	WITH_TESTING # tests are broken, see https://github.com/siconos/siconos/issues/415
 
 CFLAGS+=	-DCLOCKTIME -DCLOCKS_PER_SEC=128 # workaround for 'Undefined symbol "ftime"', see https://github.com/siconos/siconos/issues/411
 
 BINARY_ALIAS=	python3=${PYTHON_CMD}
 
 OPTIONS_DEFINE=		PYTHON
 OPTIONS_DEFAULT=	#PYTHON
 OPTIONS_SUB=		yes
 
 PYTHON_CMAKE_BOOL=	WITH_PYTHON_WRAPPER
 PYTHON_USES=		python
 PYTHON_USES_OFF=	python:build
 PYTHON_PY_DEPENDS=	${PYNUMPY} \
 			${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR}
 PYTHON_BUILD_DEPENDS=	${PYTHON_PY_DEPENDS} \
 			swig:devel/swig
 PYTHON_RUN_DEPENDS=	${PYTHON_PY_DEPENDS}
 PYTHON_BROKEN=		Fails to import, see https://github.com/siconos/siconos/issues/420
 
 .include <bsd.port.mk>
diff --git a/science/siesta/Makefile b/science/siesta/Makefile
index d23082014e88..11d1f5909b77 100644
--- a/science/siesta/Makefile
+++ b/science/siesta/Makefile
@@ -1,46 +1,47 @@
 PORTNAME=	siesta
 DISTVERSION=	4.1.5
+PORTREVISION=	1
 CATEGORIES=	science # chemistry
 MASTER_SITES=	https://gitlab.com/siesta-project/${PORTNAME}/-/releases/v${DISTVERSION}/downloads/
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Program to perform efficient electronic structure calculations
 WWW=		https://icmab.es/siesta
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/../COPYING
 
 BROKEN_aarch64=	Lack of IEEE754 support in gcc causes "Cannot find an intrinsic module named 'ieee_arithmetic'", see bug#255890
 BROKEN_FreeBSD_12_powerpc=	Lack of IEEE754 support in gcc causes "Cannot find an intrinsic module named 'ieee_arithmetic'", see bug#255890
 BROKEN_FreeBSD_12_powerpc64=	Lack of IEEE754 support in gcc causes "Cannot find an intrinsic module named 'ieee_arithmetic'", see bug#255890
 
 LIB_DEPENDS=	libblas.so:math/blas \
 		liblapack.so:math/lapack
 
 USES=		fortran gmake localbase:ldflags
 
 ALL_TARGET=	default
 
 WRKSRC_SUBDIR=	Obj
 
 PLIST_FILES=	bin/${PORTNAME}
 
 BINARY_ALIAS=	gfortran=gfortran${GCC_DEFAULT} gcc=gcc${GCC_DEFAULT}
 
 .include <bsd.port.pre.mk>
 
 .if ${GCC_DEFAULT} >= 10
 # workaround for Type mismatch between actual argument at (1) and actual argument at (2) (COMPLEX(8)/REAL(8)).
 FFLAGS+=	-fallow-argument-mismatch
 MAKE_ARGS=	FFLAGS="${FFLAGS} -O2 -fPIC -ftree-vectorize"
 .endif
 
 pre-configure:
 	@cd ${WRKSRC} && \
 		${SETENV} ${MAKE_ENV} ${SH} ../Src/obj_setup.sh && \
 		${LN} -s gfortran.make arch.make
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.post.mk>
diff --git a/science/silo/Makefile b/science/silo/Makefile
index 5b4c5b58e662..9759d1b7565c 100644
--- a/science/silo/Makefile
+++ b/science/silo/Makefile
@@ -1,50 +1,51 @@
 PORTNAME=	silo
 DISTVERSION=	4.11-68
+PORTREVISION=	1
 DISTVERSIONSUFFIX=	-g819658e
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Mesh and field I/O library and scientific database
 WWW=		https://wci.llnl.gov/simulation/computer-codes/silo
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
 USES=		cmake:testing perl5 readline
 USE_PERL5=	build
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	LLNL
 GH_PROJECT=	Silo
 
 CMAKE_TESTING_ON=		SILO_ENABLE_TESTS # 3 tests fail, see https://github.com/LLNL/Silo/issues/289
 CMAKE_TESTING_TARGET=		check
 
 FFLAGS+=			-fallow-argument-mismatch # needed only for tests
 
 CONFLICTS_INSTALL=		deforaos-browser # bin/browser
 
 OPTIONS_DEFINE=			BROWSER FORTRAN HDF5 PYTHON SILOCK
 OPTIONS_DEFAULT=		BROWSER FORTRAN HDF5 PYTHON SILOCK
 OPTIONS_SUB=			yes
 
 BROWSER_DESC=			Enable building of browser
 BROWSER_CMAKE_BOOL=		SILO_ENABLE_BROWSER
 
 FORTRAN_CMAKE_BOOL=		SILO_ENABLE_FORTRAN
 FORTRAN_USES=			fortran
 
 HDF5_CMAKE_BOOL=		SILO_ENABLE_HDF5
 HDF5_CFLAGS=			-DH5_USE_110_API=1
 HDF5_LIB_DEPENDS=		libhdf5.so:science/hdf5
 HDF5_PLIST_SUB=			SUFX_HDF5="h5"
 HDF5_PLIST_SUB_OFF=		SUFX_HDF5=""
 
 PYTHON_CMAKE_BOOL=		SILO_ENABLE_PYTHON_MODULE
 PYTHON_USES=			python
 
 SILOCK_DESC=			Enable building of silock
 SILOCK_CMAKE_BOOL=		SILO_ENABLE_SILOCK
 
 .include <bsd.port.mk>
diff --git a/science/simbody/Makefile b/science/simbody/Makefile
index 83e815429162..a40a3738e189 100644
--- a/science/simbody/Makefile
+++ b/science/simbody/Makefile
@@ -1,52 +1,52 @@
 PORTNAME=	simbody
 DISTVERSIONPREFIX=	Simbody-
 DISTVERSION=	3.7
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	science biology
 
 PATCH_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/commit/
 PATCHFILES=	1b306f66bcd15e9bf6b27882e2daa6375ac4cd2e.patch:-p1
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Multibody dynamics library for (bio)mechanical systems simulation
 WWW=		https://simtk.org/projects/simbody
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 LIB_DEPENDS=	libopenblas.so:math/openblas
 
 USES=		blaslapack:openblas cmake compiler:c++11-lang fortran # fortran only for openblas
 USE_GITHUB=	yes
 USE_LDCONFIG=	yes
 
 CMAKE_OFF=	BUILD_TESTING
 CMAKE_ARGS=	-DBLAS_LIBRARIES:STRING=${LOCALBASE}/lib/libopenblas.so -DLAPACK_LIBRARIES:STRING=${LOCALBASE}/lib/libopenblas.so -DFREEBSD_EXAMPLESDIR=${EXAMPLESDIR}
 
 OPTIONS_DEFINE=		DOCS VISUALIZER EXAMPLE_PROGRAMS # EXAMPLE_PROGRAMS significanly increases the build time and package size, so it is not called EXAMPLES to prevent it from being installed by default
 OPTIONS_DEFAULT=	VISUALIZER
 OPTIONS_SUB=		yes
 
 DOCS_CMAKE_BOOL=	INSTALL_DOCS
 
 VISUALIZER_DESC=	Build the visualizer component
 VISUALIZER_CMAKE_BOOL=	BUILD_VISUALIZER
 VISUALIZER_USES=	gl xorg
 VISUALIZER_USE=		GL=gl,glu,glut XORG=xi,xmu
 
 EXAMPLE_PROGRAMS_DESC=	Build and install example programs
 EXAMPLE_PROGRAMS_CMAKE_BOOL=	BUILD_EXAMPLES
 
 PORTDOCS=	*
 # this port installs examples into ${EXAMPLESDIR} when EXAMPLE_PROGRAMS=ON, but check-plist doesn't complain for some reason
 
 post-install-DOCS-on: # https://github.com/simbody/simbody/issues/652
 	@${RMDIR} ${STAGEDIR}${DOCSDIR}/api
 
 do-test:
 	@cd ${BUILD_WRKSRC} && \
 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBUILD_TESTING=ON ${CMAKE_SOURCE_PATH} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
 
 .include <bsd.port.mk>
diff --git a/science/simple-dftd3/Makefile b/science/simple-dftd3/Makefile
index 945c727f0782..7c635e492662 100644
--- a/science/simple-dftd3/Makefile
+++ b/science/simple-dftd3/Makefile
@@ -1,32 +1,32 @@
 PORTNAME=	simple-dftd3
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.6.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science # chemistry
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Reimplementation of the DFT-D3 program
 WWW=		https://github.com/awvwgk/simple-dftd3
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BROKEN_aarch64=	cannot open module file 'ieee_arithmetic.mod' for reading at (1): No such file or directory
 
 BUILD_DEPENDS=	mstore>0:science/mstore
 LIB_DEPENDS=	libmctc-lib.so:science/mctc-lib \
 		libopenblas.so:math/openblas \
 		libtoml-f.so:textproc/toml-f
 
 USES=		cmake:testing fortran
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	awvwgk
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 
 post-patch: # see https://github.com/toml-f/toml-f/issues/51
 	@${REINPLACE_CMD} -e 's|$${CMAKE_Fortran_COMPILER_ID}-$${CMAKE_Fortran_COMPILER_VERSION}||' ${WRKSRC}/config/CMakeLists.txt
 
 .include <bsd.port.mk>
diff --git a/science/sirius/Makefile b/science/sirius/Makefile
index 6aae457f4d03..13d09dc7d7d3 100644
--- a/science/sirius/Makefile
+++ b/science/sirius/Makefile
@@ -1,52 +1,52 @@
 PORTNAME=	sirius
 DISTVERSIONPREFIX=	v
 DISTVERSION=	7.3.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	science
 PKGNAMESUFFIX=	-quantum-chemistry # other software also has the name "sirius"
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
 PATCHFILES=	c45ef15637958885b1b299c09ec1bf9376e50ecc.patch:-p1 # https://github.com/electronic-structure/SIRIUS/pull/757
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Domain specific library for electronic structure calculations
 WWW=		https://github.com/electronic-structure/SIRIUS
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libcosta.so:math/costa \
 		libgsl.so:math/gsl \
 		libhdf5.so:science/hdf5 \
 		libopenblas.so:math/openblas \
 		libscalapack.so:math/scalapack \
 		libspfft.so:math/spfft \
 		libspla.so:math/spla \
 		libsymspg.so:science/spglib \
 		libxc.so:science/libxc
 
 USES=		cmake:testing compiler:c++14-lang eigen:3,test fortran pkgconfig
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	electronic-structure
 GH_PROJECT=	SIRIUS
 
 OPTIONS_DEFINE=		NLCGLIB
 OPTIONS_SINGLE=		MPI
 OPTIONS_SINGLE_MPI=	MPICH OPENMPI
 OPTIONS_DEFAULT=	MPICH # NLCGLIB
 
 NLCGLIB_DESC=		Enable nlcglib
 NLCGLIB_CMAKE_BOOL=	USE_NLCGLIB
 NLCGLIB_LIB_DEPENDS=	libnlcglib.so:science/nlcglib \
 			libkokkoscore.so:devel/kokkos
 NLCGLIB_BROKEN=		build breaks, see https://github.com/electronic-structure/SIRIUS/issues/759
 
 MPICH_USES=		mpi:mpich
 
 OPENMPI_USES=		mpi:openmpi
 
 # many tests fail, see https://github.com/electronic-structure/SIRIUS/issues/760
 
 .include <bsd.port.mk>
diff --git a/science/sparta/Makefile b/science/sparta/Makefile
index 6b8389a9d6bc..014bd562f412 100644
--- a/science/sparta/Makefile
+++ b/science/sparta/Makefile
@@ -1,49 +1,50 @@
 PORTNAME=	sparta
 PORTVERSION=	${GH_TAGNAME:C/([0-9]{1,2})([A-Z][a-z][a-z])([0-9]{4})/\3.\2.\1/S/Jan/01/S/Feb/02/S/Mar/03/S/Apr/04/S/May/05/S/Jun/06/S/Jul/07/S/Aug/08/S/Sep/09/S/Oct/10/S/Nov/11/S/Dec/12/}
+PORTREVISION=	1
 CATEGORIES=	science
 PKGNAMESUFFIX=	-dsmc # Direct Simulation Monte Carlo
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Gas simulator: SPARTA DSMC software package
 WWW=		https://sparta.sandia.gov/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/../LICENSE
 
 BUILD_DEPENDS=	bash:shells/bash
 
 USES=		compiler:c++11-lang gmake localbase
 USE_GITHUB=	yes
 GH_TAGNAME=	18Jul2022
 
 CXXFLAGS+=	-DSPARTA_UNORDERED_MAP
 
 WRKSRC_SUBDIR=	src
 MAKE_ARGS=	CC=${CXX} CCFLAGS="${CXXFLAGS}" LINK=${CXX} LINKFLAGS="${LDFLAGS}" mode=exe
 
 OPTIONS_SINGLE=			PARALLEL
 OPTIONS_SINGLE_PARALLEL=	SERIAL MPI
 OPTIONS_DEFAULT=		MPI
 PARALLEL_DESC=			Parallelization
 
 SERIAL_DESC=			Serial: no parallelization
 SERIAL_ALL_TARGET=		serial
 SERIAL_PLIST_FILES=		bin/spa_serial
 
 MPI_ALL_TARGET=			mpi
 MPI_PLIST_FILES=		bin/spa_mpi
 MPI_CXXFLAGS=			-I${LOCALBASE}/mpi/openmpi/include
 MPI_LDFLAGS=			${LOCALBASE}/mpi/openmpi/lib/libmpi.so \
 				${LOCALBASE}/mpi/openmpi/lib/libmpi_cxx.so \
 				-Wl,-rpath=${LOCALBASE}/mpi/openmpi/lib
 MPI_LIB_DEPENDS=		libmpi.so:net/openmpi
 
 PORTSCOUT=	ignore:1 # due to a special version tagging scheme that this project uses portscout fails to find new versions, watching their release page instead
 
 post-patch:
 	@${REINPLACE_CMD} 's|SHELL = /bin/bash|SHELL = ${LOCALBASE}/bin/bash|' ${WRKSRC}/Makefile
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/spa_* ${STAGEDIR}${PREFIX}/bin/
 
 .include <bsd.port.mk>
diff --git a/science/spglib/Makefile b/science/spglib/Makefile
index b2f70ba0b754..0f3dcdf481fb 100644
--- a/science/spglib/Makefile
+++ b/science/spglib/Makefile
@@ -1,37 +1,38 @@
 PORTNAME=	spglib
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.0.2
+PORTREVISION=	1
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	C library for finding and handling crystal symmetries
 WWW=		https://spglib.github.io/spglib/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		cmake
 USE_GITHUB=	yes
 USE_LDCONFIG=	yes
 
 .if !exists(/usr/include/omp.h)
 CMAKE_OFF+=	USE_OMP
 .else
 FORTRAN_LDFLAGS=	-lomp # workaround for: undefined reference to `__kmpc_fork_call'
 .endif
 
 OPTIONS_DEFINE=		FORTRAN
 OPTIONS_DEFAULT=	FORTRAN
 OPTIONS_SUB=		yes
 
 FORTRAN_USES=		fortran
 FORTRAN_CMAKE_BOOL=	WITH_Fortran
 
 do-test: # from test/README.md
 	cd ${WRKSRC}/test && \
 		${CMAKE_BIN} -S . -B build -DUSE_SANITIZER="Address" -DCMAKE_BUILD_TYPE="Debug" && \
 		${CMAKE_BIN} --build build -j ${_MAKE_JOBS} && \
 		cd build && \
 		ctest
 
 .include <bsd.port.mk>
diff --git a/science/spheral/Makefile b/science/spheral/Makefile
index e25b709b89ea..ffe15e07902e 100644
--- a/science/spheral/Makefile
+++ b/science/spheral/Makefile
@@ -1,65 +1,66 @@
 PORTNAME=	spheral
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2023.03.0
+PORTREVISION=	1
 CATEGORIES=	science # physics
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Environment for hydrodynamical & gravitational numerical simulations
 WWW=		https://github.com/LLNL/spheral
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/License.txt
 
 BUILD_DEPENDS=	${LOCALBASE}/include/polyclipper2d.hh:math/polyclipper
 LIB_DEPENDS=	libaxom.so:science/axom \
 		libboost_filesystem.so:devel/boost-libs \
 		libconduit.so:science/conduit \
 		libhdf5.so:science/hdf5 \
 		libmfem.so:math/mfem \
 		libosdCPU.so:graphics/opensubdiv \
 		libpolytope.so:science/polytope \
 		libqhull_r.so:math/qhull \
 		libsiloh5.so:science/silo
 
 USES=		cmake:testing compiler:c++14-lang eigen:3 fortran lua mpi:mpich python
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	LLNL
 GH_TUPLE=	llnl:blt:ddd5a0c:blt/cmake/blt \
 		llnl:uberenv:126f8de:uberenv/scripts/devtools/uberenv
 
 CMAKE_ARGS=	-Daneos_DIR=${LOCALBASE} \
 		-Daxom_DIR=${LOCALBASE} \
 		-Dboost_DIR=${LOCALBASE} \
 		-Dconduit_DIR=${LOCALBASE} \
 		-Deigen_DIR=${LOCALBASE} \
 		-Dhdf5_DIR=${LOCALBASE} \
 		-Dopensubdiv_DIR=${LOCALBASE} \
 		-Dpython_DIR=${LOCALBASE} \
 		-Dpolyclipper_DIR=${LOCALBASE} \
 		-Dpolytope_DIR=${LOCALBASE} \
 		-Dpybind11_DIR=${LOCALBASE} \
 		-Dqhull_DIR=${LOCALBASE} \
 		-Dsilo_DIR=${LOCALBASE} \
 		-Dzlib_DIR=/usr
 CMAKE_OFF=	ENABLE_TESTS ENABLE_DOCS \
 		ENABLE_ANEOS
 CMAKE_ON=	ENABLE_CXXONLY # disable Python support which is still for Python-2.7, see https://github.com/LLNL/spheral/issues/183
 CMAKE_TESTING_ON=	ENABLE_TESTS # tests fail to configure, see https://github.com/LLNL/spheral/issues/207
 
 CXXFLAGS+=	-I${LOCALBASE}/include/eigen3
 
 BINARY_ALIAS=	git=false python=${PYTHON_CMD}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|\.a|.so|; s|qhullstatic|qhull_r|; s|python2\.7|python${PYTHON_VER}|g' ${WRKSRC}/cmake/tpl/*.cmake
 	@${CHMOD} +x ${WRKSRC}/src/helpers/InstantiationGenerator.py
 
 post-install:
 	# workaround for https://github.com/LLNL/spheral/issues/188
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/cmake
 	@${MV} ${STAGEDIR}${PREFIX}/Spheral/lib/cmake/* ${STAGEDIR}${PREFIX}/lib/cmake
 	@${RM} -r ${STAGEDIR}${PREFIX}/Spheral
 
 .include <bsd.port.mk>
diff --git a/science/step/Makefile b/science/step/Makefile
index f49105d0f5c9..ce1e9cececb2 100644
--- a/science/step/Makefile
+++ b/science/step/Makefile
@@ -1,38 +1,39 @@
 PORTNAME=	step
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	science education kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE interactive physics simulator
 WWW=		https://edu.kde.org/step
 
 LIB_DEPENDS=	libcln.so:math/cln \
 		libgsl.so:math/gsl \
 		libqalculate.so:math/libqalculate
 
 USES=		cmake compiler:c++11-lang desktop-file-utils eigen:3 gettext kde:5 \
 		pkgconfig python:3.5+ qt:5 shared-mime-info shebangfix tar:xz xorg
 USE_KDE=	attica auth bookmarks codecs completion config configwidgets \
 		coreaddons crash doctools emoticons guiaddons i18n \
 		iconthemes init itemmodels itemviews jobwidgets js \
 		kdelibs4support khtml kio newstuff notifications parts \
 		plotting service solid sonnet textwidgets unitconversion \
 		widgetsaddons windowsystem xmlgui \
 		ecm:build
 USE_QT=		concurrent core dbus declarative gui network opengl printsupport svg \
 		widgets xml \
 		buildtools:build qmake:build
 USE_XORG=	x11
 CXXFLAGS_sparc64=	-Wno-error=return-type
 
 SHEBANG_FILES=	step/data/extractxml
 
 OPTIONS_DEFINE=	DOCS
 
 pre-configure:
 # Avoid building translations, should the user pass
 # CURRENT_LANG to CMake.
 	${REINPLACE_CMD} -e '/set(STEP_BUILD_TRANSLATIONS 1)/ d' \
 		${WRKSRC}/${PORTNAME}/data/CMakeLists.txt
 
 .include <bsd.port.mk>
diff --git a/science/tblite/Makefile b/science/tblite/Makefile
index 4ad06241f5a6..0ac9b18139f3 100644
--- a/science/tblite/Makefile
+++ b/science/tblite/Makefile
@@ -1,35 +1,35 @@
 PORTNAME=	tblite
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science # chemistry
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Light-weight tight-binding framework
 WWW=		https://github.com/tblite/tblite
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 .if !exists(/usr/include/omp.h)
 BROKEN=		requires OpenMP support that is missing on this architecture
 .endif
 
 BUILD_DEPENDS=	mstore>0:science/mstore # unclear if this is really needed
 LIB_DEPENDS=	libdftd4.so:science/dftd4 \
 		libmctc-lib.so:science/mctc-lib \
 		libmulticharge.so:science/multicharge \
 		libopenblas.so:math/openblas \
 		libs-dftd3.so:science/simple-dftd3 \
 		libtoml-f.so:textproc/toml-f
 
 USES=		cmake:testing fortran
 USE_GITHUB=	yes
 USE_LDCONFIG=	yes
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 
 post-patch: # see https://github.com/toml-f/toml-f/issues/51
 	@${REINPLACE_CMD} -e 's|$${CMAKE_Fortran_COMPILER_ID}-$${CMAKE_Fortran_COMPILER_VERSION}||' ${WRKSRC}/config/CMakeLists.txt
 
 .include <bsd.port.mk>
diff --git a/science/tfel-edf/Makefile b/science/tfel-edf/Makefile
index 665e93260bae..6dd5ebdbfba5 100644
--- a/science/tfel-edf/Makefile
+++ b/science/tfel-edf/Makefile
@@ -1,53 +1,53 @@
 PORTNAME=	tfel
 DISTVERSION=	3.2.1-1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	science
 PKGNAMESUFFIX=	-mfront-edf
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Code generation tool dedicated to material knowledge
 WWW=		http://tfel.sourceforge.net/
 
 LICENSE=	GPLv3
 
 BUILD_DEPENDS=	gnuplot:math/gnuplot	\
 		${PYNUMPY}
 LIB_DEPENDS=	${PY_BOOST}		\
 		libboost_thread.so:devel/boost-libs
 RUN_DEPENDS=	gnuplot:math/gnuplot	\
 		${PYNUMPY}
 
 USES=		cmake compiler:c++0x fortran localbase python
 
 CONFLICTS=	tfel-mfront-3.*
 
 OPTIONS_DEFINE=	DOCS
 OPTIONS_DEFAULT=DOCS
 OPTIONS_SUB=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
 CMAKE_ON=	enable-aster enable-calculix enable-fortran	\
 		enable-python enable-python-bindings
 CMAKE_ARGS+=	-DCOMPILER_CXXFLAGS="${CXXFLAGS}" -DCOMPILER_FLAGS="${CFLAGS}"
 USE_LDCONFIG=	yes
 
 .ifdef PACKAGE_BUILDING
 CMAKE_ON+=	enable-portable-build
 .endif
 
 TEST_TARGET=	check
 
 .include <bsd.port.pre.mk>
 .include "${.CURDIR}/../../french/aster/bsd.aster.mk"
 
 .if ${FORTRAN_DEFAULT} == gfortran && ${GCC_DEFAULT} >= 10
 FCFLAGS+=	-fallow-argument-mismatch
 .endif
 
 post-install:
 	(cd ${STAGEDIR}${PREFIX} && ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
 		-d ${PREFIX} -f ${PYTHONPREFIX_SITELIBDIR:S,${PREFIX}/,,})
 	(cd ${STAGEDIR}${PREFIX} && ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
 		-d ${PREFIX} -f ${PYTHONPREFIX_SITELIBDIR:S,${PREFIX}/,,})
 
 .include <bsd.port.post.mk>
diff --git a/science/tfel/Makefile b/science/tfel/Makefile
index cf9dde10e2c9..445ee570f8cf 100644
--- a/science/tfel/Makefile
+++ b/science/tfel/Makefile
@@ -1,50 +1,50 @@
 PORTNAME=	tfel
 PORTVERSION=	4.0.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	science
 MASTER_SITES=	SF/${PORTNAME}/
 PKGNAMESUFFIX=	-mfront
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Code generation tool dedicated to material knowledge
 WWW=		https://github.com/thelfer/tfel
 
 LICENSE=	GPLv3
 
 BUILD_DEPENDS=	gnuplot:math/gnuplot
 RUN_DEPENDS=	gnuplot:math/gnuplot
 
 USES=		cmake compiler:c++0x fortran
 
 CONFLICTS_INSTALL=	tfel-mfront-edf-3.*
 
 OPTIONS_DEFINE=		DOCS PYTHON
 OPTIONS_DEFAULT=	DOCS PYTHON
 
 OPTIONS_SUB=		yes
 
 PYTHON_USES=		localbase python
 PYTHON_BUILD_DEPENDS=	${PYNUMPY}
 PYTHON_LIB_DEPENDS=	${PY_BOOST}	\
 			libboost_thread.so:devel/boost-libs
 PYTHON_RUN_DEPENDS=	${PYNUMPY}
 PYTHON_CMAKE_BOOL=	enable-python enable-python-bindings
 
 CMAKE_ON=	enable-aster enable-calculix enable-fortran
 CMAKE_ARGS+=	-DCOMPILER_CXXFLAGS="${CXXFLAGS}" -DCOMPILER_FLAGS="${CFLAGS}"
 PLIST_SUB=	VER=${PORTVERSION}
 USE_LDCONFIG=	yes
 
 .ifdef PACKAGE_BUILDING
 CMAKE_ON+=	enable-portable-build
 .endif
 
 TEST_TARGET=	check
 
 post-install:
 	(cd ${STAGEDIR}${PREFIX} && ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
 		-d ${PREFIX} -f ${PYTHONPREFIX_SITELIBDIR:S,${PREFIX}/,,})
 	(cd ${STAGEDIR}${PREFIX} && ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
 		-d ${PREFIX} -f ${PYTHONPREFIX_SITELIBDIR:S,${PREFIX}/,,})
 
 .include <bsd.port.mk>
diff --git a/science/tinker/Makefile b/science/tinker/Makefile
index 47e41ca83976..cad65ea47aa3 100644
--- a/science/tinker/Makefile
+++ b/science/tinker/Makefile
@@ -1,87 +1,87 @@
 PORTNAME=	tinker
 DISTVERSION=	8.10.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science
 MASTER_SITES=	https://dasher.wustl.edu/tinker/downloads/
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	General purpose molecular modelling package
 WWW=		https://dasher.wustl.edu/tinker/
 
 LICENSE=	TINKER
 LICENSE_NAME=	TINKER license agreement
 LICENSE_FILE=	${WRKSRC}/doc/license.pdf
 LICENSE_PERMS=	auto-accept # internal academic purposes only, no commercial use
 
 LIB_DEPENDS=	libfftw3.so:math/fftw3
 
 USES=		fortran gmake
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 BUILD_WRKSRC=	${WRKSRC}/source
 INSTALL_WRKSRC=	${WRKSRC}/source
 
 MAKE_ENV=	HAVE_G2C=yes
 MAKE_ARGS=	RANLIB=ranlib BINDIR=${STAGEDIR}${PREFIX}/bin
 MAKEFILE=	${WRKSRC}/make/Makefile
 EXTRACT_AFTER_ARGS=--exclude fftw --exclude windows --exclude macosx
 
 SUB_FILES=	pkg-message
 
 BINARY_ALIAS=	gfortran=gfortran${GCC_DEFAULT}
 
 OPTIONS_DEFINE=	OPTIMIZED_FFLAGS DOCS EXAMPLES
 
 OPTIONS_DEFINE_amd64=	SSE
 OPTIONS_DEFINE_i386=	SSE
 OPTIONS_DEFAULT_amd64=	SSE
 OPTIONS_DEFAULT_i386=	SSE
 
 SSE_MAKE_ARGS=	PORT_SIMD_FLAGS="-msse -msse2 -mfpmath=sse"
 
 OPTIMIZED_FFLAGS_DESC=	compilation optimizations
 
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MOPTIMIZED_FFLAGS}
 FFLAGS+=	-O3 -ffast-math -finline-functions -fomit-frame-pointer -funroll-loops -fexpensive-optimizations
 .if (${ARCH} == "i386")
 FFLAGS+=	-mfancy-math-387 -malign-double
 .endif # i386
 .endif
 
 post-extract:
 	@${RM} ${BUILD_WRKSRC}/*.c
 	@${RM} ${WRKSRC}/other/eopbend.orig
 	# remove bundled linux libraries
 	@${RM} ${WRKSRC}/lib/linux/*
 
 post-patch:
 	@${REINPLACE_CMD} -i '' 's|\.\./bin/|${STAGEDIR}${PREFIX}/bin/|' ${BUILD_WRKSRC}/../bench/bench*.run
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	@${MKDIR} ${STAGEDIR}${DATADIR}/params
 	cd ${WRKSRC}/params && ${INSTALL_DATA} * ${STAGEDIR}${DATADIR}/params
 	@${MKDIR} ${STAGEDIR}${DATADIR}/test
 	cd ${WRKSRC}/test && ${INSTALL_DATA} * ${STAGEDIR}${DATADIR}/test
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/doc && ${INSTALL_DATA} 0README *.pdf ${STAGEDIR}${DOCSDIR}
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/example && ${INSTALL_DATA} \
 		0README *.make *.dyn *.int *.frac *.key *.seq *.pdb *.xyz \
 		${STAGEDIR}${EXAMPLESDIR}
 
 benchmarks: stage
 .for n in 1 2 3 4 5 6 7 8 9
 	@cd ${BUILD_WRKSRC}/../bench && ./bench${n}.run
 .endfor
 
 .include <bsd.port.mk>
diff --git a/science/trilinos/Makefile b/science/trilinos/Makefile
index 8386418935c1..0e647df3c917 100644
--- a/science/trilinos/Makefile
+++ b/science/trilinos/Makefile
@@ -1,86 +1,86 @@
 PORTNAME=	trilinos
 DISTVERSIONPREFIX=	trilinos-release-
 DISTVERSION=	13-4-1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	science # physics
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Solver for multi-physics engineering and scientific problems
 WWW=		https://trilinos.github.io/
 
 LICENSE=	BSD3CLAUSE LGPL20 # Trilinos is licensed on a per-package basis. Most packages are under a BSD license, some are published under the (L)GPL.
 LICENSE_COMB=	multi
 
 BROKEN_armv6=	kokkos assumes a 64-bit build; i.e., 8-byte pointers, but found 4-byte
 BROKEN_armv7=	kokkos assumes a 64-bit build; i.e., 8-byte pointers, but found 4-byte
 BROKEN_i386=	kokkos assumes a 64-bit build; i.e., 8-byte pointers, but found 4-byte
 
 BUILD_DEPENDS=	bash:shells/bash \
 		boost-libs>0:devel/boost-libs \
 		swig:devel/swig \
 		${PYNUMPY}
 LIB_DEPENDS=	libamd.so:math/suitesparse-amd \
 		libblas.so:math/blas \
 		liblapack.so:math/lapack \
 		libumfpack.so:math/suitesparse-umfpack
 RUN_DEPENDS=	bash:shells/bash
 
 USES=		cmake compiler:c++14-lang fortran perl5 python shebangfix
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_PROJECT=	Trilinos
 
 SHEBANG_FILES=	packages/kokkos/bin/kokkos_launch_compiler \
 		packages/kokkos/bin/nvcc_wrapper \
 		packages/phalanx/scripts/phalanx_create_evaluator.py
 
 CXXFLAGS+=	-DBOOST_STACKTRACE_GNU_SOURCE_NOT_REQUIRED # fails otherwise with backtrace-related symbol error explicitly printed by Boost
 LDFLAGS+=	-lexecinfo # only for kokkos (?), to prevent missing symbols
 
 CONFLICTS=	kokkos # installs bundled kokkos, need to figure out how to prevent this
 CONFLICTS_INSTALL=	googletest # see https://github.com/trilinos/Trilinos/issues/11271
 
 ## configure Trilinos
 
 # general
 #CMAKE_ARGS+=	-DTrilinos_VERBOSE_CONFIGURE=ON
 CMAKE_ARGS+=	-DCMAKE_INSTALL_PREFIX:PATH=${PREFIX}
 CMAKE_ARGS+=	-DBUILD_SHARED_LIBS:BOOL=ON
 
 # package selection
 CMAKE_ARGS+=	-DTrilinos_ENABLE_ALL_PACKAGES:BOOL=ON
 CMAKE_ARGS+=	-DTrilinos_ENABLE_ALL_OPTIONAL_PACKAGES:BOOL=ON
 CMAKE_ARGS+=	-DTrilinos_ENABLE_SEACAS:BOOL=OFF # because of pumagon, etc failure (need to retest)
 
 # parallelism-related
 CMAKE_ARGS+=	-DTrilinos_ENABLE_OpenMP:BOOL=OFF
 #CMAKE_ARGS+=	-DKokkos_ENABLE_Pthread:BOOL=ON
 #CMAKE_ARGS+=	-DTPL_ENABLE_Pthread:BOOL=ON
 #CMAKE_ARGS+=	-DTPL_ENABLE_MPI:BOOL=ON
 #CMAKE_ARGS+=	-DMPI_BASE_DIR:PATH="${LOCALBASE}/mpi/openmpi"
 #CMAKE_ARGS+=	-DMPI_BIN_DIR:PATH="${LOCALBASE}/mpi/openmpi/bin"
 
 ## additional features/packages required by Xyce
 
 CMAKE_ON+=	EpetraExt_BUILD_BTF
 CMAKE_ON+=	EpetraExt_BUILD_EXPERIMENTAL
 CMAKE_ON+=	EpetraExt_BUILD_GRAPH_REORDERINGS
 #CMAKE_ON+=	Teuchos_ENABLE_COMPLEX # this feature is broken in Trilinos
 CMAKE_ON+=	Trilinos_ENABLE_COMPLEX_DOUBLE
 # Enabling the UMFPACK feature required by the above features.
 CMAKE_ON+=	TPL_ENABLE_UMFPACK
 CMAKE_ON+=	TPL_ENABLE_AMD
 CMAKE_ARGS+=	-DUMFPACK_INCLUDE_DIRS=${LOCALBASE}/include/suitesparse
 CMAKE_ARGS+=	-DTPL_AMD_INCLUDE_DIRS=${LOCALBASE}/include/suitesparse
 CMAKE_ARGS+=	-DAMD_LIBRARY_DIRS=${LOCALBASE}/lib
 
 # users: https://duongdo27.github.io/Trilinos/users.html
 
 CONFLICTS_INSTALL=	googletest # installs files into the same place, problematic file: /usr/local/include/gtest/gtest.h, see https://github.com/trilinos/Trilinos/issues/11184
 
 post-install:
 	# remove MPI headers that it installs
 	@${RM} ${STAGEDIR}${PREFIX}/include/mpi*.h
 
 .include <bsd.port.mk>
diff --git a/science/ttk/Makefile b/science/ttk/Makefile
index 288df0f6626f..64242a276626 100644
--- a/science/ttk/Makefile
+++ b/science/ttk/Makefile
@@ -1,45 +1,45 @@
 PORTNAME=	ttk
 DISTVERSION=	1.1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Topology ToolKit: Topological data analysis and visualization
 WWW=		https://topology-tool-kit.github.io/
 
 LICENSE=	BSD4CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_i386=	compilation fails: cannot initialize a parameter of type 'const ttk::LongSimplexId *' (aka 'const long long *') with an lvalue ..., see https://github.com/topology-tool-kit/ttk/issues/852
 
 PY_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}scikit-build>0:devel/py-scikit-build@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR}
 BUILD_DEPENDS=	${LOCALBASE}/include/boost/functional/hash.hpp:devel/boost-libs \
 		cli11>0:devel/cli11 \
 		exprtk>0:math/exprtk \
 		spectra>0:math/spectra \
 		utf8cpp>0:devel/utf8cpp \
 		websocketpp>0:devel/websocketpp \
 		${PY_DEPENDS}
 BUILD_DEPENDS+=	nlohmann-json>0:devel/nlohmann-json # is required by lib/cmake/paraview-5.11/vtk/VTK-vtk-module-find-packages.cmake:1167
 LIB_DEPENDS=	libcgraph.so:graphics/graphviz \
 		libembree3.so:graphics/embree \
 		libfreetype.so:print/freetype2 \
 		libjsoncpp.so:devel/jsoncpp \
 		libvtkRenderingCore-pv${PARAVIEW_VER}.so:science/paraview \
 		libzfp.so:devel/zfp
 RUN_DEPENDS=	${PY_DEPENDS}
 
 USES=		cmake eigen:3 compiler:c++11-lang gl python sqlite xorg
 USE_GL=		glew
 USE_XORG=	x11
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	topology-tool-kit
 
 post-stage:
 	${RM} ${STAGEDIR}${PREFIX}/include/Python.h
 
 .include <../../science/paraview/Makefile.version>
 .include <bsd.port.mk>
diff --git a/science/ukrmol+/Makefile b/science/ukrmol+/Makefile
index 36c82f92da71..e4961b91fef3 100644
--- a/science/ukrmol+/Makefile
+++ b/science/ukrmol+/Makefile
@@ -1,53 +1,53 @@
 PORTNAME=	ukrmol+
 DISTVERSION=	3.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	science # chemistry, physics
 MASTER_SITES=	https://zenodo.org/record/5799134/files/:out \
 		https://zenodo.org/record/5799110/files/:in # the project is a sum of two projects, "in" and "out"
 DISTFILES=	ukrmol-out-${DISTVERSION}${EXTRACT_SUFX}:out \
 		ukrmol-in-${DISTVERSION}${EXTRACT_SUFX}:in
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Code to compute electron and positron scattering from molecules
 WWW=		https://zenodo.org/record/5799134 #.Yo1lCknMKV4
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BROKEN_aarch64=	fails to build: Cannot open module file 'ieee_arithmetic.mod' for reading
 
 LIB_DEPENDS=	libGBTO.so:science/gbtolib \
 		libopenblas.so:math/openblas
 
 USES=		cmake:testing fortran python:test
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 CMAKE_OFF=	WITH_MPI BUILD_DOC WITH_GIT BUILD_TESTING
 CMAKE_TESTING_ON=	BUILD_TESTING
 CMAKE_ARGS=	-DFREEBSD_DOCSDIR=${DOCSDIR} \
 		-DFREEBSD_PYTHON_VER=${PYTHON_VER}
 CMAKE_ARGS+=	-DUKRMOL_OUT_DIR=${WRKSRC_OUT} # the "out" project is built and installed from the "in" project
 
 FFLAGS+=	-I${LOCALBASE}/include/gbtolib \
 		-fdefault-integer-8
 LDFLAGS+=	-lGBTO
 
 WRKSRC_OUT=	${WRKDIR}/ukrmol-out-${PORTVERSION}
 WRKSRC_IN=	${WRKDIR}/ukrmol-in-${PORTVERSION}
 WRKSRC=		${WRKSRC_IN}
 
 OPTIONS_DEFINE=	DOCS
 
 PORTDOCS=	*
 
 post-extract:
 	@cd ${WRKDIR} && ${LN} -s ukrmol-out-${PORTVERSION} ukrmol-out
 
 post-install:
 	# remove GBTOlib that it bundles
 	@cd ${STAGEDIR}${PREFIX} && \
 		${RM} -r bin/basis_read bin/print_orbital_table bin/scatci_integrals include/gbtolib lib/libGBTO.so
 	# remove an empty directory
 	@${RMDIR} ${STAGEDIR}${PREFIX}/include/den
 
 .include <bsd.port.mk>
diff --git a/science/v_sim/Makefile b/science/v_sim/Makefile
index c2c3b9552b3e..232324680272 100644
--- a/science/v_sim/Makefile
+++ b/science/v_sim/Makefile
@@ -1,102 +1,102 @@
 PORTNAME=	v_sim
 DISTVERSION=	3.8.0
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	science
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Visualization of atomic structures
 WWW=		https://gitlab.com/l_sim/v_sim
 
 LICENSE=	CeCILL
 LICENSE_NAME=	CeCILL
 LICENSE_FILE=	${WRKSRC}/COPYING
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 BUILD_DEPENDS=	p5-XML-LibXML>0:textproc/p5-XML-LibXML	\
 		libarchive>0:archivers/libarchive	\
 		xcrysden:science/xcrysden	\
 		bash:shells/bash
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig	\
 		libopenbabel.so:science/openbabel	\
 		libfreetype.so:print/freetype2	\
 		libharfbuzz.so:print/harfbuzz	\
 		libyaml.so:textproc/libyaml	\
 		libnetcdf.so:science/netcdf	\
 		libmsym.so:science/libmsym	\
 		libftgl.so:graphics/ftgl	\
 		libxc.so:science/libxc
 RUN_DEPENDS=	${PYNUMPY}	\
 		xcrysden:science/xcrysden	\
 		libarchive>0:archivers/libarchive	\
 		${PYTHON_PKGNAMEPREFIX}gobject3>0:devel/py-gobject3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR}
 
 USES=		autoreconf blaslapack compiler:c11 fortran gl gmake gnome	\
 		libtool:keepla localbase:ldflags pkgconfig python:3.7+		\
 		shebangfix tar:bzip2 xorg
 SHEBANG_GLOB=	*.py
 USE_XORG=	x11
 USE_GNOME=	cairo gtk30 gdkpixbuf2 intltool introspection
 USE_GL=		gl glu
 USE_GITLAB=	yes
 GL_ACCOUNT=	l_sim
 GL_COMMIT=	9dc8e5a0b2f4e7237ac50a922b87d234ff56a6e5
 
 GNU_CONFIGURE=	yes
 CONFIGURE_SHELL=${LOCALBASE}/bin/bash
 CONFIGURE_ARGS=	--htmldir=${PREFIX}/share/doc --with-openbabel		\
 		--with-netcdf=${LOCALBASE} --with-etsf-file-format	\
 		--with-xsf --with-cube --with-msym=${LOCALBASE}		\
 		--with-msym-inc=-I${LOCALBASE}/include/libmsym		\
 		--with-libxc=${LOCALBASE} --enable-python-module
 CPPFLAGS+=	${CFLAGS}
 USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=	DOCS NLS EXAMPLES
 OPTIONS_SUB=	yes
 
 .if defined(WITH_DEBUG)
 CONFIGURE_ARGS+=--enable-debug-messages
 .endif
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH:Mamd64*} || ${ARCH:Mpowerpc64*}
 BUILD_DEPENDS+=	abinit:science/abinit
 RUN_DEPENDS+=	abinit:science/abinit
 CONFIGURE_ARGS+=--with-abinit
 PLIST_SUB+=	AB=""
 .else
 PLIST_SUB+=	AB="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MNLS}
 USES+=		gettext
 .else
 USES+=		gettext-tools
 .endif
 
 pre-configure:
 	${REINPLACE_CMD} -e 's|$${docdir}/examples|${EXAMPLESDIR}|'	\
 		${WRKSRC}/configure.ac
 	${REINPLACE_CMD} -e 's|print sys.prefix|print (sys.prefix)|'	\
 		-e 's|print sys.exec_prefix|print (sys.exec_prefix)|'	\
 		${WRKSRC}/m4/python.m4
 
 pre-configure-NLS-off:
 	${REINPLACE_CMD} -e '/^	po /d' ${WRKSRC}/Makefile.am
 
 pre-configure-DOCS-off:
 	${REINPLACE_CMD} -e '/^	Documentation/d' ${WRKSRC}/Makefile.am
 
 pre-configure-EXAMPLES-off:
 	${REINPLACE_CMD} -e '/^	examples/d'	\
 		${WRKSRC}/Makefile.am
 	${REINPLACE_CMD} -e 's|: install-v_simexamplesDATA|:|'	\
 		${WRKSRC}/lib/python/Makefile.am
 
 post-install:
 	${FIND} ${STAGEDIR}${PREFIX}/lib -type f -name "lib*.so.8.0.0" | \
 		${XARGS} ${STRIP_CMD}
 
 .include <bsd.port.mk>
diff --git a/science/vmd/Makefile b/science/vmd/Makefile
index 0e7d654e40c8..7eae5b0ac5eb 100644
--- a/science/vmd/Makefile
+++ b/science/vmd/Makefile
@@ -1,167 +1,168 @@
 PORTNAME=	vmd
 DISTVERSION=	1.9.4
+PORTREVISION=	1
 DISTVERSIONSUFFIX=	a57
 CATEGORIES=	science graphics python tcl tk
 MASTER_SITES=	http://jedi.ks.uiuc.edu/~johns/raytracer/files/0.99b6/:tachyon \
 		http://www.phoronix-test-suite.com/benchmark-files/:tachyon \
 		http://www.photonlimited.com/~johns/tachyon/files/0.99b6/:tachyon \
 		http://webclu.bio.wzw.tum.de/stride/:stride \
 		ftp://ftp.ebi.ac.uk/pub/software/unix/stride/src/:stride
 DISTFILES=	${VMD_DIST} \
 		${TACHYON_DIST}:tachyon \
 		${STRIDE_DIST}:stride
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Molecular visualization program
 WWW=		http://www.ks.uiuc.edu/Research/vmd/
 
 LICENSE=	VMD BSD3CLAUSE STRIDE
 LICENSE_COMB=	multi
 
 ONLY_FOR_ARCHS=	amd64 i386
 
 BUILD_DEPENDS=	makedepend:devel/makedepend \
 		${PYNUMPY}
 LIB_DEPENDS=	libexpat.so:textproc/expat2 \
 		libfltk.so:x11-toolkits/fltk \
 		libnetcdf.so:science/netcdf
 RUN_DEPENDS=	${PYNUMPY}
 
 USES=		gl gmake perl5 python shebangfix sqlite tcl tk xorg
 SHEBANG_FILES=	${WRKDIR}/plugins/topotools/*.tcl \
 		${WRKDIR}/plugins/mdff/resetmaps.sh
 USE_PERL5=	build
 USE_GL=		gl glu
 USE_XORG=	x11
 
 LICENSE_FILE_VMD=	${WRKSRC}/LICENSE
 LICENSE_PERMS_VMD=	no-auto-accept
 LICENSE_NAME_VMD=	Visual Molecular Dynamics Software License Agreement
 LICENSE_DISTFILES_VMD=	${VMD_DIST}
 
 LICENSE_FILE_BSD3CLAUSE=	${WRKSRC}/lib/tachyon/Copyright
 LICENSE_DISTFILES_BSD3CLAUSE=	${TACHYON_DIST}
 
 LICENSE_TEXT_STRIDE=	${FILESDIR}/stride.txt
 LICENSE_PERMS_STRIDE=	dist-mirror pkg-mirror auto-accept
 LICENSE_NAME_STRIDE=	Stride Copyright Notice
 LICENSE_DISTFILES_STRIDE=${STRIDE_DIST}
 
 CONFIGURE_ENV=	PYTHON_INCLUDE_DIR=${PYTHON_INCLUDEDIR} \
 		PYTHON_LIBRARY_DIR=${PYTHON_LIBDIR} \
 		NUMPY_INCLUDE_DIR=${PYTHON_SITELIBDIR}/numpy/core/include \
 		NUMPY_LIBRARY_DIR=${PYTHON_SITELIBDIR} \
 		TCL_INCLUDE_DIR=${TCL_INCLUDEDIR} \
 		TCL_LIBRARY_DIR=${LOCALBASE}/lib \
 		TK_INCLUDE_DIR=${TK_INCLUDEDIR} \
 		TK_LIBRARY_DIR=${LOCALBASE}/lib
 CONFIGURE_ARGS=	${VMD_ARCH} OPENGL FLTK TK IMD TCL PTHREADS LIBTACHYON NETCDF NUMPY PYTHON
 INSTALL_WRKSRC=	${WRKSRC}/src
 MAKE_ENV=	EXPATINC=-I${LOCALBASE}/include \
 		EXPATLIB=-L${LOCALBASE}/lib \
 		EXPATLDFLAGS=-lexpat \
 		EXPATDYNAMIC=1 \
 		NETCDFINC=-I${LOCALBASE}/include \
 		NETCDFLIB=-L${LOCALBASE}/lib \
 		NETCDFLDFLAGS=-lnetcdf \
 		SQLITEINC=-I${LOCALBASE}/include \
 		SQLITELIB=-L${LOCALBASE}/lib \
 		SQLITELDFLAGS=-lsqlite3 \
 		SQLITEDYNAMIC=1 \
 		TCLLIB=-L${LOCALBASE}/lib \
 		TCLINC=-I${TCL_INCLUDEDIR} \
 		TCLLDFLAGS=-ltcl${TCL_VER:S/.//} \
 		TKLDFLAGS="-ltk${TK_VER:S/.//} -lX11"
 
 VMD_DIST=	${PORTNAME}-${DISTVERSION}${DISTVERSIONSUFFIX}.src.tar.gz
 TACHYON_DIST=	tachyon-0.99b6.tar.gz
 STRIDE_DIST=	stride.tar.gz
 STRIDE_DOC=	stride.doc
 
 .include <bsd.port.pre.mk>
 
 .if !exists(${DISTDIR}/${VMD_DIST})
 IGNORE=	license restrictions require manual fetching of the distribution\
 	source.  Please visit http://www.ks.uiuc.edu/Development/Download/download.cgi?PackageName=VMD\
 	with a browser.  You will be required to register, log in, and accept\
 	the University of Illinois agreement before you can download the\
 	${VMD_DIST} source.  Place this distfile in ${DISTDIR} and try again.
 .endif
 
 .if ${ARCH} == "amd64"
 VMD_ARCH=		FREEBSDAMD64
 .else
 VMD_ARCH=		FREEBSD
 .endif
 
 PLIST_SUB+=		VMD_ARCH=${VMD_ARCH}
 
 do-extract:
 	${MKDIR} ${WRKDIR} ${WRKSRC}/lib/stride
 	${TAR} -xzf ${DISTDIR}/${VMD_DIST} -C ${WRKDIR}
 	${TAR} -xzf ${WRKSRC}/lib/surf/surf.tar.Z -C ${WRKSRC}/lib/surf
 	${TAR} -xzf ${DISTDIR}/${TACHYON_DIST} -C ${WRKSRC}/lib
 	${TAR} -xzf ${DISTDIR}/${STRIDE_DIST} -C ${WRKSRC}/lib/stride
 
 post-patch:
 	${REINPLACE_CMD} \
 		-e "s|-lpython2.5|-l${PYTHON_VERSION}${PYTHON_ABIVER}|" \
 		-e "s|/usr/local|${LOCALBASE}|g"  \
 		-e "s|-fno-for-scope||g" \
 		-e "s/\"gcc\"/\"${CC}\"/;s/\"g++\"/\"${CXX}\"/" \
 		${WRKSRC}/configure
 	${REINPLACE_CMD} -e "s/.SILENT:/#.SILENT:/" ${WRKDIR}/plugins/Makefile
 	${REINPLACE_CMD} "s/.SILENT:/#.SILENT:/" ${WRKDIR}/plugins/*/Makefile
 	${REINPLACE_CMD} "s%log2f(\([^ ,]*\))%logf(\1)/(float)M_LN2%g" \
 		${WRKSRC}/src/Orbital.C
 	${REINPLACE_CMD} -E "s/(SHLD[[:space:]]*=[[:space:]]*)gcc/\1${CC}/" \
 		${WRKDIR}/plugins/Make-arch
 	${REINPLACE_CMD} -E "s/(CC[[:space:]]*=[[:space:]]*)(gcc|cc)/\1${CC}/" \
 		${WRKSRC}/lib/stride/Makefile \
 		${WRKSRC}/lib/surf/Makefile \
 		${WRKSRC}/lib/tachyon/unix/Make-arch \
 		${WRKDIR}/plugins/cionize/Makefile.specialbuilds \
 		${WRKDIR}/plugins/cionize/Makefile.mine \
 		${WRKDIR}/plugins/cionize/Makefile.testing \
 		${WRKDIR}/plugins/Make-arch \
 		${WRKDIR}/plugins/molfile_plugin/f77/Makefile
 	${REINPLACE_CMD} -E "s/(CXX[[:space:]]*=[[:space:]]*)g\+\+/\1${CXX}/" \
 		${WRKDIR}/plugins/fmtool/Makefile.specialbuilds \
 		${WRKDIR}/plugins/hesstrans/src/foo/Makefile \
 		${WRKDIR}/plugins/hesstrans/src/foo/nm_gnu.mak \
 		${WRKDIR}/plugins/Make-arch
 	${REINPLACE_CMD} -e "s/return *;/return 0;/g" \
 		${WRKSRC}/lib/surf/*.c
 
 do-build:
 	${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${_MAKE_JOBS} bsd -C ${WRKSRC}/lib/tachyon/unix
 		${MV} ${WRKSRC}/lib/tachyon/compile/bsd/tachyon ${WRKSRC}/lib/tachyon/tachyon_${VMD_ARCH}
 	${SETENV} ${MAKE_ENV} PLUGINDIR=${WRKSRC}/plugins ${MAKE_CMD} ${VMD_ARCH} distrib -C ${WRKDIR}/plugins
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${CONFIGURE_CMD} ${CONFIGURE_ARGS}
 	${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${_MAKE_JOBS} all -C ${WRKSRC}/src
 	${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${_MAKE_JOBS} depend -C ${WRKSRC}/lib/surf
 	${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${_MAKE_JOBS} surf -C ${WRKSRC}/lib/surf
 		${MV} ${WRKSRC}/lib/surf/surf ${WRKSRC}/lib/surf/surf_${VMD_ARCH}
 	${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${_MAKE_JOBS} -C ${WRKSRC}/lib/stride
 		${MV} ${WRKSRC}/lib/stride/stride ${WRKSRC}/lib/stride/stride_${VMD_ARCH}
 
 post-install:
 	${REINPLACE_CMD} -i '' -e 's|${STAGEDIR}||g' ${STAGEDIR}${PREFIX}/bin/vmd
 	${STRIP_CMD} ${STAGEDIR}${LOCALBASE}/lib/vmd/*${VMD_ARCH} \
 	    ${STAGEDIR}${LOCALBASE}/lib/vmd/plugins/${VMD_ARCH}/molfile/*.so
 .for f in tcl/autopsf1.8/psfcheck.so tcl/hesstrans1.0/hesstrans.so \
 	  tcl/mutator1.5/libalchemify.so tcl/pmepot1.0/libpmepot.so \
 	  tcl/psfgen2.0/libpsfgen.so tcl/rnaview1.1/rnaview \
 	  tcl/signalproc1.1/specden.so tcl/signalproc1.1/fftcmds.so \
 	  tcl/signalproc1.1/sgsmooth.so tcl/volutil1.3/volutil \
 	  tcl/clustalw1.1/clustalw tcl/libbiokit1.1/tcl_libbiokit.so \
 	  tcl/libbiokit1.1/q tcl/libbiokit1.1/seqqr \
 	  tcl/libbiokit1.1/structqr tcl/libbiokit1.1/qpair \
 	  tcl/libbiokit1.1/rmsd tcl/libbiokit1.1/percid \
 	  tcl/phylotree1.2/upgmaclu tcl/stamp1.2/stamp \
 	  tcl/bossconvert1.0/Topology \
 	  bin/catdcd5.2/catdcd bin/cionize1.0/cionize
 	${STRIP_CMD} ${STAGEDIR}${LOCALBASE}/lib/vmd/plugins/${VMD_ARCH}/${f}
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/science/votca/Makefile b/science/votca/Makefile
index 2eb048be7471..bca133480179 100644
--- a/science/votca/Makefile
+++ b/science/votca/Makefile
@@ -1,66 +1,66 @@
 PORTNAME=	votca
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2022
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	science
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${PORTNAME}/commit/
 PATCHFILES=	078c6814797749cd1b92a2b19f0302265ccf6463.patch:-p1 # fix testsuite build
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	CSG and XTP: libraries for atomistic simulations
 WWW=		https://github.com/votca/votca
 
 LICENSE=	APACHE20
 
 BROKEN_i386=	undefined reference to `__atomic_load'
 
 PY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}h5py>0:science/py-h5py@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
 		rdkit>0:science/rdkit
 BUILD_DEPENDS=	bash:shells/bash \
 		lmp:science/lammps \
 		${PY_DEPENDS}
 LIB_DEPENDS=	libboost_program_options.so:devel/boost-libs \
 		libecpint.so:science/libecpint \
 		libexpat.so:textproc/expat2 \
 		libfftw3.so:math/fftw3 \
 		libgromacs_d.so:science/gromacs \
 		libhdf5.so:science/hdf5 \
 		libint2.so:science/libint2 \
 		libsz.so:science/libaec \
 		libxc.so:science/libxc
 RUN_DEPENDS=	bash:shells/bash \
 		${PYNUMPY} \
 		${PY_DEPENDS}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}
 
 USES=		cmake compiler:c++14-lang eigen:3 perl5 pkgconfig python:run \
 		shebangfix
 USE_GITHUB=	yes
 USE_LDCONFIG=	yes
 
 SHEBANG_GLOB=	*.sh *.pl *.py
 SHEBANG_FILES=	csg/scripts/csg_call.in csg/scripts/csg_inverse.in \
 		tools/scripts/votca_compare.in tools/scripts/votca_help2doc.in \
 		xtp/scripts/xtp_update_mapfile.in xtp/scripts/xtp_basisset.in xtp/share/benchmark/xtp_benchmark.in xtp/scripts/xtp_autogen_mapping.in \
 		xtp/scripts/xtp_modify_jobfile.in \
 		xtp/scripts/xtp_qmmm2qm.in
 
 CMAKE_ON=	BUILD_XTP
 CMAKE_ARGS=	-DLOCALBASE=${LOCALBASE} -DPython_EXECUTABLE=${PYTHON_CMD}
 
 OPTIONS_DEFINE=		APPS
 OPTIONS_DEFAULT=	APPS
 OPTIONS_SUB=		yes
 
 APPS_DESC=		Build applications
 APPS_CMAKE_BOOL=	BUILD_CSGAPPS
 
 do-test:
 	@cd ${BUILD_WRKSRC} && \
 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DENABLE_TESTING:BOOL=ON ${CMAKE_SOURCE_PATH} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
 
 .include <bsd.port.mk>
diff --git a/science/wannier90/Makefile b/science/wannier90/Makefile
index 7a78d6d6e4ed..623d202d733d 100644
--- a/science/wannier90/Makefile
+++ b/science/wannier90/Makefile
@@ -1,46 +1,46 @@
 PORTNAME=	wannier90
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Maximally-localized Wannier functions (MLWFs) and Wannier90
 WWW=		http://www.wannier.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		blaslapack:netlib fortran gmake python:test shebangfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	wannier-developers
 SHEBANG_FILES=	test-suite/run_tests test-suite/clean_tests	\
 		test-suite/tools/fprettify-wrapper.py	\
 		test-suite/testcode/bin/testcode.py	\
 		test-suite/library-mode-test/compare_results.py	\
 		utility/k_mapper.py utility/gw2wannier90.py
 USE_LDCONFIG=	yes
 
 MAKE_ARGS=	FCOPTS="-fPIC -O3"
 
 TEST_TARGET=	tests # most tests using --numprocs=4 fail: https://github.com/wannier-developers/wannier90/issues/351
 
 PLIST_FILES=	bin/postw90.x \
 		bin/w90chk2chk.x \
 		bin/wannier90.x \
 		lib/libwannier.so \
 		lib/libwannier.so.0
 
 post-patch:
 	@${REINPLACE_CMD} 's|F90 = gfortran|&${GCC_DEFAULT}|' ${WRKSRC}/config/make.inc.gfort
 	@${RLN} ${WRKSRC}/config/make.inc.gfort ${WRKSRC}/make.inc
 	@${REINPLACE_CMD} 's|make|${GMAKE}|' ${WRKSRC}/test-suite/run_tests
 
 do-install:
 .for p in wannier90.x postw90.x w90chk2chk.x
 	${INSTALL_PROGRAM} ${WRKSRC}/${p} ${STAGEDIR}${PREFIX}/bin/${p}
 .endfor
 	${INSTALL_LIB} ${WRKSRC}/src/obj/libwannier.so ${STAGEDIR}${PREFIX}/lib/libwannier.so.0
 	${LN} -sf libwannier.so.0 ${STAGEDIR}${PREFIX}/lib/libwannier.so
 
 .include <bsd.port.mk>
diff --git a/science/wwplot/Makefile b/science/wwplot/Makefile
index 2e40a3351b11..23b3896134ea 100644
--- a/science/wwplot/Makefile
+++ b/science/wwplot/Makefile
@@ -1,35 +1,36 @@
 PORTNAME=	wwplot
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.0.9
+PORTREVISION=	1
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Plotting tool for experimental physics classes
 WWW=		https://github.com/wwmm/wwplot
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 BUILD_DEPENDS=	${PY_DEPENDS}
 RUN_DEPENDS=	${PY_DEPENDS} \
 		qt5-core>0:devel/qt5-core \
 		qt5-declarative>0:x11-toolkits/qt5-declarative \
 		qt5-gui>0:x11-toolkits/qt5-gui
 PY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}pyside2>0:devel/pyside2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR}
 
 USES=		desktop-file-utils gettext meson python:3.7+ shebangfix
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	wwmm
 
 SHEBANG_FILES=	wwplot.in
 
 NO_ARCH=	yes
 
 post-patch:
 	@${REINPLACE_CMD} "s|find_installation('python3',|find_installation('python${PYTHON_VER}',|" ${WRKSRC}/meson.build
 
 .include <bsd.port.mk>
diff --git a/science/xcrysden/Makefile b/science/xcrysden/Makefile
index 9369f8f711f5..9af116de35bf 100644
--- a/science/xcrysden/Makefile
+++ b/science/xcrysden/Makefile
@@ -1,54 +1,54 @@
 PORTNAME=	xcrysden
 PORTVERSION=	1.6.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	science
 MASTER_SITES=	http://www.xcrysden.org/download/
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Crystalline and molecular structure visualisation program
 WWW=		http://www.xcrysden.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libfftw3.so:math/fftw3 \
 		libgl2ps.so:print/gl2ps \
 		libTogl2.0.so:graphics/togl
 RUN_DEPENDS=	bwidget>0:x11-toolkits/bwidget \
 		obabel:science/openbabel \
 		ppmtompeg:graphics/netpbm \
 		xwd:x11/xwd
 
 USES=		fortran gl gmake localbase:ldflags magick:run tcl tk xorg
 USE_GL=		gl glu
 USE_XORG=	x11 xmu
 
 CONFLICTS_INSTALL=	cgnslib-4.1.2,1	# bin/unitconv
 
 MAKE_ARGS=	prefix=${STAGEDIR}${PREFIX}
 
 CFLAGS+=	-fcommon # notified xcrysden ML on Sep 20, 2020
 
 BINARY_ALIAS=	make=gmake gcc=cc gfortran=gfortran${GCC_DEFAULT}
 
 OPTIONS_DEFINE=	EXAMPLES
 
 PORTEXAMPLES=	*
 
 post-patch:
 	@${CP} ${FILESDIR}/Make.sys ${WRKSRC}
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/Make.sys
 	@${RM} -r ${WRKSRC}/external/src
 
 post-install:
 	# stagedir shouldn't be in executables
 	@${REINPLACE_CMD} -i '' -e 's|${STAGEDIR}||' ${STAGEDIR}${PREFIX}/bin/*
 	# remove bad symlinks
 	@${RM} \
 		${STAGEDIR}${PREFIX}/share/doc/xcrysden/examples/examples \
 		${STAGEDIR}${PREFIX}/share/xcrysden/examples
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/xcrysden/*
 	# move examples from the docs dir
 	@${MV} ${STAGEDIR}${DOCSDIR}/examples ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/science/xtb/Makefile b/science/xtb/Makefile
index edcdc5cc735a..1bae17e247a3 100644
--- a/science/xtb/Makefile
+++ b/science/xtb/Makefile
@@ -1,28 +1,29 @@
 PORTNAME=	xtb
 DISTVERSIONPREFIX=	v
 DISTVERSION=	6.5.1
+PORTREVISION=	1
 CATEGORIES=	science
 
 MAINTAINER=	jmd@FreeBSD.org
 COMMENT=	Semiempirical Extended Tight-Binding Program Package
 WWW=		https://github.com/grimme-lab/xtb
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 .if !exists(/usr/include/omp.h)
 BROKEN=		requires OpenMP support that is missing on this architecture
 .endif
 
 LIB_DEPENDS=	libmctc-lib.so:science/mctc-lib
 TEST_DEPENDS=	test-drive>0:devel/test-drive
 
 USES=		blaslapack:openblas cmake:testing fortran blaslapack:openblas
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	grimme-lab
 
 USE_LDCONFIG=	yes
 FFLAGS+=	-std=legacy
 
 .include <bsd.port.mk>
diff --git a/security/R-cran-ROAuth/Makefile b/security/R-cran-ROAuth/Makefile
index 58f1d8fe8703..acac601ef2f4 100644
--- a/security/R-cran-ROAuth/Makefile
+++ b/security/R-cran-ROAuth/Makefile
@@ -1,18 +1,18 @@
 PORTNAME=	ROAuth
 PORTVERSION=	0.9.6
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	security
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	R interface for OAuth
 WWW=		https://cran.r-project.org/web/packages/ROAuth/
 
 LICENSE=	ART20
 
 RUN_DEPENDS=	R-cran-RCurl>0:ftp/R-cran-RCurl \
 		R-cran-digest>0:security/R-cran-digest
 
 USES=	cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/security/R-cran-askpass/Makefile b/security/R-cran-askpass/Makefile
index 097dd80738b2..a1a2344a32d9 100644
--- a/security/R-cran-askpass/Makefile
+++ b/security/R-cran-askpass/Makefile
@@ -1,19 +1,19 @@
 PORTNAME=	askpass
 PORTVERSION=	1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Safe Password Entry for R, Git, and SSH
 WWW=		https://cran.r-project.org/web/packages/askpass/
 
 LICENSE=	MIT
 
 CRAN_DEPENDS=	R-cran-sys>0:devel/R-cran-sys
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/security/R-cran-credentials/Makefile b/security/R-cran-credentials/Makefile
index 81a9f7b14859..15c9b04311e9 100644
--- a/security/R-cran-credentials/Makefile
+++ b/security/R-cran-credentials/Makefile
@@ -1,22 +1,23 @@
 PORTNAME=	credentials
 DISTVERSION=	1.3.0
+PORTREVISION=	1
 CATEGORIES=	security
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	jpbeconne@free.fr
 COMMENT=	Tools for Managing SSH and Git Credentials
 WWW=		https://docs.ropensci.org/credentials
 
 LICENSE=	MIT
 
 CRAN_DEPENDS=	R-cran-openssl>=1.3:security/R-cran-openssl \
 		R-cran-sys>=2.1:devel/R-cran-sys \
 		R-cran-curl>0:ftp/R-cran-curl \
 		R-cran-jsonlite>0:converters/R-cran-jsonlite \
 		R-cran-askpass>0:security/R-cran-askpass
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/security/R-cran-digest/Makefile b/security/R-cran-digest/Makefile
index b95f546bc487..5039bb38a0f1 100644
--- a/security/R-cran-digest/Makefile
+++ b/security/R-cran-digest/Makefile
@@ -1,14 +1,15 @@
 PORTNAME=	digest
 PORTVERSION=	0.6.29
+PORTREVISION=	1
 CATEGORIES=	security
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Create cryptographic hash digests of R objects
 WWW=		https://cran.r-project.org/web/packages/digest/
 
 LICENSE=	GPLv2+
 
 USES=	cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/security/R-cran-gitcreds/Makefile b/security/R-cran-gitcreds/Makefile
index 6a28c89c2dd7..6a360c39f4ab 100644
--- a/security/R-cran-gitcreds/Makefile
+++ b/security/R-cran-gitcreds/Makefile
@@ -1,23 +1,24 @@
 PORTNAME=	gitcreds
 DISTVERSION=	0.1.2
+PORTREVISION=	1
 CATEGORIES=	security
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	ygy@FreeBSD.org
 COMMENT=	Query 'git' Credentials from 'R'
 WWW=		https://gitcreds.r-lib.org/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	R-cran-knitr>0:print/R-cran-knitr
 TEST_DEPENDS=	R-cran-covr>0:devel/R-cran-covr \
 		R-cran-mockery>0:devel/R-cran-mockery \
 		R-cran-testthat>=3.0.0:devel/R-cran-testthat \
 		R-cran-withr>0:devel/R-cran-withr \
 		R-cran-knitr>0:print/R-cran-knitr \
 		R-cran-rmarkdown>0:textproc/R-cran-rmarkdown
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/security/R-cran-openssl/Makefile b/security/R-cran-openssl/Makefile
index 25061508f9f4..38bf1412acdd 100644
--- a/security/R-cran-openssl/Makefile
+++ b/security/R-cran-openssl/Makefile
@@ -1,21 +1,22 @@
 PORTNAME=	openssl
 PORTVERSION=	2.0.3
+PORTREVISION=	1
 CATEGORIES=	security
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Toolkit for Encryption, Signatures and Certificates Based on OpenSSL
 WWW=		https://cran.r-project.org/web/packages/openssl/
 
 LICENSE=	MIT
 
 CRAN_DEPENDS=	R-cran-askpass>0:security/R-cran-askpass
 BUILD_DEPENDS=	bash:shells/bash \
 		${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		cran:auto-plist,compiles shebangfix ssl
 
 SHEBANG_FILES=	${WRKSRC}/tests/google.dk/generate.bash
 
 .include <bsd.port.mk>
diff --git a/security/afl++/Makefile b/security/afl++/Makefile
index f5f21406e237..2525265d39ee 100644
--- a/security/afl++/Makefile
+++ b/security/afl++/Makefile
@@ -1,81 +1,82 @@
 PORTNAME=	afl
 PORTVERSION=	4.05c
+PORTREVISION=	1
 CATEGORIES=	security
 PKGNAMESUFFIX=	++-${FLAVOR}
 
 MAINTAINER=	salvadore@FreeBSD.org
 COMMENT=	Fast instrumented fuzzer
 WWW=		https://aflplus.plus/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/docs/COPYING
 
 ONLY_FOR_ARCHS=	aarch64 amd64 i386 powerpc powerpc64 powerpc64le riscv64
 ONLY_FOR_ARCHS_REASON=	uses x86-only instrumentation or requires complete LLVM support
 
 BUILD_DEPENDS=	ginstall:sysutils/coreutils
 
 FLAVORS=	llvm gcc
 FLAVOR?=	${FLAVORS:[1]}
 
 _LLVM_VER=		13
 llvm_BUILD_DEPENDS=	clang${_LLVM_VER}:devel/llvm${_LLVM_VER}
 llvm_RUN_DEPENDS=	clang${_LLVM_VER}:devel/llvm${_LLVM_VER}
 
 USES=		gmake shebangfix tar:tgz
 .if ${FLAVOR} == gcc
 USE_GCC=	yes
 .endif
 USE_GITHUB=	yes
 GH_ACCOUNT=	AFLplusplus
 GH_PROJECT=	AFLplusplus
 SHEBANG_FILES=	afl-persistent-config
 
 MAKEFILE=	GNUmakefile
 MAKE_ARGS=	${${ARCH} != amd64 && ${ARCH} != i386:?AFL_NO_X86=1:} \
 		PREFIX="${PREFIX}/${PKGBASE}"
 .if ${FLAVOR} == llvm
 CFLAGS_riscv64=	-mno-relax
 MAKE_ARGS+=	CC=clang${_LLVM_VER} \
 		CXX=clang++${_LLVM_VER} \
 		LLVM_CONFIG=llvm-config${_LLVM_VER}
 .endif
 ALL_TARGET=	distrib
 QA_ENV=		IGNORE_QA_stripped=1 # unstripped to keep it functional
 
 DOCSDIR=	${PREFIX}/${PKGBASE}/share/doc/afl
 MANDIRS=	${PREFIX}/${PKGBASE}/share/man/man8
 BINARY_ALIAS=	install=ginstall
 PORTDOCS=	*
 
 OPTIONS_DEFINE=		DEBUG DOCS PYTHON
 OPTIONS_DEFAULT=	PYTHON
 
 PYTHON_DESC=	Python mutators support
 
 PYTHON_USES=		gettext-runtime python
 PYTHON_BINARY_ALIAS=	python3-config=${PYTHON_CMD}-config \
 			python3=${PYTHON_CMD}
 
 post-patch:
 	@${REINPLACE_CMD} '/alt_cc/ s,"gcc","gcc${GCC_DEFAULT:S/-devel$//}",' \
 		${WRKSRC}/src/afl-cc.c
 .if ${FLAVOR} == gcc
 	@${REINPLACE_CMD} 's@\(  as_params\[0\] = afl_as ? afl_as : \)\(.*\)@\1(u8*)"${LOCALBASE}/bin/as";@' \
 		${WRKSRC}/src/afl-as.c
 .elif ${FLAVOR} == llvm
 	@${ECHO_CMD} "all:" >${WRKSRC}/GNUmakefile.gcc_plugin
 .endif
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/man.d
 	@${ECHO_CMD} "MANPATH ${PREFIX}/${PKGBASE}/share/man" >${STAGEDIR}${PREFIX}/etc/man.d/${PKGBASE}.conf
 	@${ECHO_CMD} "etc/man.d/${PKGBASE}.conf" >>${TMPPLIST}
 	@cd ${STAGEDIR}${PREFIX}; \
 		${FIND} ${PKGBASE} -not -path '${PKGBASE}/share/doc/*' -and \( -type f -or -type l \) | \
 		${SED} -Ee 's,^afl\+\+-${FLAVOR}/share/man/.*,&.gz,' \
 			-e 's,^.*/afl-${${FLAVOR} == gcc:?(clang|llvm):(gcc|g\+\+)}.*,@comment &,'  | \
 		${SORT} >> ${TMPPLIST}
 	@${CAT} ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/security/howdy/Makefile b/security/howdy/Makefile
index 05b4813b38ed..1a194585ee81 100644
--- a/security/howdy/Makefile
+++ b/security/howdy/Makefile
@@ -1,54 +1,54 @@
 PORTNAME=	howdy
 PORTVERSION=	3.0.0.b.20230306
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 
 MAINTAINER=	arrowd@FreeBSD.org
 COMMENT=	Windows Hello(TM) style authentication provider
 WWW=		https://github.com/boltgolt/howdy
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	opencv>0:graphics/opencv \
 		${PYTHON_PKGNAMEPREFIX}python-pam>0:security/py-python-pam@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dlib>0:science/py-dlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy@${PY_FLAVOR} \
 		${LOCALBASE}/share/dlib-models/shape_predictor_5_face_landmarks.dat:misc/dlib-models
 
 USES=		python:3.7-3.10,run shebangfix
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	boltgolt
 GH_PROJECT=	howdy
 GH_TAGNAME=	30728a6d36
 
 SHEBANG_GLOB=	*.py
 
 NO_BUILD=	yes
 NO_ARCH=	yes
 STRIP=
 
 post-patch:
 	${ECHO_CMD} 'config_dir = "${ETCDIR}"' >> ${WRKSRC}/howdy/src/paths.py
 	${ECHO_CMD} 'dlib_data_dir = "${LOCALBASE}/share/dlib-models/"' >> ${WRKSRC}/howdy/src/paths.py
 	${ECHO_CMD} 'user_models_dir = "/var/db/howdy/models/"' >> ${WRKSRC}/howdy/src/paths.py
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/libexec/howdy
 	cd ${WRKSRC}/howdy/src/ && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/libexec/howdy
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 	${MV} ${STAGEDIR}${PREFIX}/libexec/howdy/config.ini ${STAGEDIR}${ETCDIR}/config.ini.sample
 	${LN} -s ../libexec/howdy/cli.py ${STAGEDIR}${PREFIX}/bin/howdy
 	${INSTALL_PROGRAM} ${WRKSRC}/howdy/src/cli.py ${STAGEDIR}${PREFIX}/libexec/howdy
 
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/bash-completion/completions
 	${INSTALL_DATA}  ${WRKSRC}/howdy/src/autocomplete/howdy ${STAGEDIR}${PREFIX}/share/bash-completion/completions/
 
 	${RM} -r ${STAGEDIR}${PREFIX}/libexec/howdy/autocomplete
 	${RM} -r ${STAGEDIR}${PREFIX}/libexec/howdy/dlib-data
 	${RM} -r ${STAGEDIR}${PREFIX}/libexec/howdy/pam
 	${RM} -r ${STAGEDIR}${PREFIX}/libexec/howdy/pam-config
 
 .include <bsd.port.mk>
diff --git a/security/pam_howdy/Makefile b/security/pam_howdy/Makefile
index 86c7be83a412..d76c89cfe5af 100644
--- a/security/pam_howdy/Makefile
+++ b/security/pam_howdy/Makefile
@@ -1,41 +1,41 @@
 PORTNAME=	pam_howdy
 PORTVERSION=	3.0.0.b.20230306
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 
 MAINTAINER=	arrowd@FreeBSD.org
 COMMENT=	PAM module for Howdy Face Recognition
 WWW=		https://github.com/boltgolt/howdy
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/../../../LICENSE
 
 BUILD_DEPENDS=	${LOCALBASE}/include/linux/input.h:devel/evdev-proto
 LIB_DEPENDS=	libevdev.so:devel/libevdev \
 		libinih.so:devel/inih \
 		libINIReader.so:devel/inih \
 		libepoll-shim.so:devel/libepoll-shim
 RUN_DEPENDS=	${HOWDY_CMD}:security/howdy
 
 USES=		gettext-runtime localbase:ldflags pkgconfig python:env meson ninja
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	boltgolt
 GH_PROJECT=	howdy
 GH_TAGNAME=	30728a6d36
 
 WRKSRC_SUBDIR=	howdy/src/pam
 PLIST_FILES=	lib/pam_howdy.so
 
 HOWDY_CMD=	${LOCALBASE}/libexec/howdy/compare.py
 
 post-patch:
 	${REINPLACE_CMD} \
 		-e 's|/lib/security|${LOCALBASE}/lib|' \
 		${WRKSRC}/meson.build
 	${REINPLACE_CMD} \
 		-e 's|"python3"|"${PYTHON_CMD}"|' \
 		-e 's|"/lib/security/howdy/compare.py"|"${HOWDY_CMD}"|' \
 		${WRKSRC}/main.cc
 
 .include <bsd.port.mk>
diff --git a/security/py-angr/Makefile b/security/py-angr/Makefile
index 9f1a23cc7f0b..bd9f07e21145 100644
--- a/security/py-angr/Makefile
+++ b/security/py-angr/Makefile
@@ -1,91 +1,91 @@
 PORTNAME=	angr
 DISTVERSIONPREFIX=	v
 DISTVERSION=	${ANGR_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security devel python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Multi-architecture binary analysis toolkit
 WWW=		https://github.com/angr/angr
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyvex>=${ANGR_VERSION}:security/py-pyvex@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}unicorn>0:emulators/py-unicorn@${PY_FLAVOR}
 LIB_DEPENDS=	libunicorn.so:emulators/unicorn \
 		libz3.so:math/z3
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ailment>=${ANGR_VERSION}:security/py-ailment@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cachetools>=0:devel/py-cachetools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}capstone>=3.0.5:devel/py-capstone@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cffi>=1.14.0:devel/py-cffi@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}claripy>=${ANGR_VERSION}:math/py-claripy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cle>=${ANGR_VERSION}:devel/py-cle@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cppheaderparser>=0:devel/py-cppheaderparser@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dpkt>=0:net/py-dpkt@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}gitpython>=0:devel/py-gitpython@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}itanium_demangler>=0:devel/py-itanium_demangler@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mulpyplexer>=0:devel/py-mulpyplexer@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}networkx>=2.0:math/py-networkx@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}progressbar2>=0:misc/py-progressbar2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}protobuf>=3.12.0:devel/py-protobuf@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psutil>=0:sysutils/py-psutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pycparser>2.18:devel/py-pycparser@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyvex>=${ANGR_VERSION}:security/py-pyvex@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}rpyc>0:devel/py-RPyC@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sortedcontainers>=0:devel/py-sortedcontainers@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}unicorn>0:emulators/py-unicorn@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}keystone-engine>=0:devel/py-keystone-engine@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${PY_FLAVOR}
 
 USES=		angr:binaries gmake localbase:ldflags python:3.6+
 USE_GITHUB=	yes
 USE_PYTHON=	autoplist distutils
 
 TEST_ENV=	${MAKE_ENV} \
 		NOSE_EXCLUDE="${_NOSE_EXCLUDE}"
 
 # Problem: the following tests require PySoot: https://github.com/angr/pysoot
 _EXCLUDED_TESTS+=	test_simple1
 _EXCLUDED_TESTS+=	test_simple2
 _EXCLUDED_TESTS+=	test_fauxware
 _EXCLUDED_TESTS+=	test_cmd_line_args
 _EXCLUDED_TESTS+=	test_jni_version_information
 _EXCLUDED_TESTS+=	test_jni_global_and_local_refs
 _EXCLUDED_TESTS+=	test_jni_object_operations
 _EXCLUDED_TESTS+=	test_jni_string_operations
 _EXCLUDED_TESTS+=	test_jni_field_access
 _EXCLUDED_TESTS+=	test_jni_method_calls
 _EXCLUDED_TESTS+=	test_jni_primitive_datatypes
 _EXCLUDED_TESTS+=	test_jni_object_arrays
 _EXCLUDED_TESTS+=	test_jni_array_operations
 _EXCLUDED_TESTS+=	test_method_calls
 _EXCLUDED_TESTS+=	test_array_operations
 _EXCLUDED_TESTS+=	test_multiarray_operations
 _EXCLUDED_TESTS+=	test_loading
 _EXCLUDED_TESTS+=	test_toggling_of_simstate
 # Problem: "TypeError: %d format: a number is required, not NoneType"
 _EXCLUDED_TESTS+=	test_fastmem.*
 # Problem: "angr.errors.AngrIncongruencyError: Different constraints!"
 _EXCLUDED_TESTS+=	test_similarity_fauxware
 # Problem: "IndexError: list index out of range"
 _EXCLUDED_TESTS+=	test_self_modifying_code
 # Problem: "Exception: Not a valid binary file: '/bin/false'"
 _EXCLUDED_TESTS+=	test_project
 # Problem: the test is hanging
 _EXCLUDED_TESTS+=	test_veritesting_a
 # There are far more tests which are failing at the moment...
 
 # Create a regular expression out of the excluded tests,
 # but first remove double spaces.
 _NOSE_EXCLUDE=	(${_EXCLUDED_TESTS:S,  , ,g:S, ,|,gW})
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME}/lib/angr_native*.so
 
 do-test:
 	@(cd ${WRKSRC}/tests && ${SETENV} ${TEST_ENV} nosetests-${PYTHON_VER} -v)
 
 .include <bsd.port.mk>
diff --git a/security/py-badkeys/Makefile b/security/py-badkeys/Makefile
index 80ae322f81fa..e6e2430d6306 100644
--- a/security/py-badkeys/Makefile
+++ b/security/py-badkeys/Makefile
@@ -1,22 +1,23 @@
 PORTNAME=	badkeys
 DISTVERSION=	0.0.5
+PORTREVISION=	1
 CATEGORIES=	security python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	otis@FreeBSD.org
 COMMENT=	Tool to check public keys for known vulnerabilities
 WWW=		https://github.com/badkeys/badkeys
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}gmpy2>0:math/py-gmpy2@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/security/py-bitbox02/Makefile b/security/py-bitbox02/Makefile
index 7b0148657ceb..4ed09763f182 100644
--- a/security/py-bitbox02/Makefile
+++ b/security/py-bitbox02/Makefile
@@ -1,26 +1,27 @@
 PORTNAME=	bitbox02
 PORTVERSION=	6.1.1
+PORTREVISION=	1
 CATEGORIES=	security python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Python API for communicating with the BitBox02 device
 WWW=		https://pypi.org/project/bitbox02/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}base58>=2.0.0:security/py-base58@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ecdsa>=0.14:security/py-ecdsa@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}hidapi>=0:comms/py-hidapi@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}noiseprotocol>=0.3:security/py-noiseprotocol@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}protobuf>=3.7:devel/py-protobuf@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}semver>=2.8.1:devel/py-semver@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_PYTHON=	autoplist distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/security/py-btchip-python/Makefile b/security/py-btchip-python/Makefile
index 27fb32eb795c..beeb51a4cd8c 100644
--- a/security/py-btchip-python/Makefile
+++ b/security/py-btchip-python/Makefile
@@ -1,22 +1,23 @@
 PORTNAME=	btchip-python
 PORTVERSION=	0.1.32
+PORTREVISION=	1
 CATEGORIES=	security python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Python communication library for Ledger Hardware Wallet
 WWW=		https://github.com/LedgerHQ/btchip-python
 
 LICENSE=	APACHE20
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mnemonic>=0:security/py-mnemonic@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyscard>=1.6.12.4.b1:security/py-pyscard@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ecdsa>=0.9:security/py-ecdsa@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}hidapi>=0.7.99:comms/py-hidapi@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_PYTHON=	autoplist distutils
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/security/py-ckcc-protocol/Makefile b/security/py-ckcc-protocol/Makefile
index a4e2e4f57d05..d6f7c2f30015 100644
--- a/security/py-ckcc-protocol/Makefile
+++ b/security/py-ckcc-protocol/Makefile
@@ -1,23 +1,24 @@
 PORTNAME=	ckcc-protocol
 PORTVERSION=	1.3.2
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Coldcard CLI and python interface library
 WWW=		https://pypi.org/project/ckcc-protocol/
 
 LICENSE=	LGPL3
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}click>=6.7:devel/py-click@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ecdsa>=0.13:security/py-ecdsa@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}hidapi>=0.7.99.post21:comms/py-hidapi@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyaes>=0:security/py-pyaes@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/security/py-ecdsa/Makefile b/security/py-ecdsa/Makefile
index 9fc3d25c0f78..9a122315b773 100644
--- a/security/py-ecdsa/Makefile
+++ b/security/py-ecdsa/Makefile
@@ -1,31 +1,32 @@
 PORTNAME=	ecdsa
 PORTVERSION=	0.18.0
+PORTREVISION=	1
 CATEGORIES=	security python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	ECDSA cryptographic signature library (pure python)
 WWW=		https://github.com/tlsfuzzer/python-ecdsa
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}hypothesis>=0:devel/py-hypothesis@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_PYTHON=	autoplist concurrent distutils pytest
 
 NO_ARCH=	yes
 
 OPTIONS_RADIO=	FASTER
 OPTIONS_RADIO_FASTER=	GMPY GMPY2
 OPTIONS_DEFAULT=GMPY2
 GMPY_DESC=	GMPY support
 GMPY2_DESC=	GMPY2 support
 
 GMPY_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gmpy>=0:math/py-gmpy@${PY_FLAVOR}
 GMPY2_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gmpy2>=0:math/py-gmpy2@${PY_FLAVOR}
 
 .include <bsd.port.mk>
diff --git a/security/py-keepkey/Makefile b/security/py-keepkey/Makefile
index 446671af7e51..6c9be331fefc 100644
--- a/security/py-keepkey/Makefile
+++ b/security/py-keepkey/Makefile
@@ -1,28 +1,29 @@
 PORTNAME=	keepkey
 PORTVERSION=	7.2.1
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	security
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Library for communicating with KeepKey Hardware Wallet
 WWW=		https://github.com/keepkey/python-keepkey
 
 LICENSE=	LGPL3
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ecdsa>=0.9:security/py-ecdsa@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}hidapi>=0.7.99.post15:comms/py-hidapi@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}libusb1>=1.6:devel/py-libusb1@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mnemonic>=0.8:security/py-mnemonic@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}protobuf>=3.0.0:devel/py-protobuf@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_GITHUB=	yes
 GH_PROJECT=	python-keepkey
 GH_TUPLE=	keepkey:device-protocol:84d438b:devproto/device-protocol \
 		keepkey:ethereum-lists:e216e92:ethlist/keepkeylib/eth/ethereum-lists
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/security/py-onlykey/Makefile b/security/py-onlykey/Makefile
index 4e30cc5e3e74..b5ec66dd9710 100644
--- a/security/py-onlykey/Makefile
+++ b/security/py-onlykey/Makefile
@@ -1,40 +1,41 @@
 PORTNAME=	onlykey
 PORTVERSION=	1.2.2
+PORTREVISION=	1
 CATEGORIES=	security python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	dmytro@posteo.net
 COMMENT=	Python command line tool for configuring and using OnlyKey
 WWW=		https://github.com/trustcrypto/python-onlykey
 
 LICENSE=	MIT
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}hidapi>0:comms/py-hidapi@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}aenum>0:devel/py-aenum@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}prompt-toolkit>=2:devel/py-prompt-toolkit@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pynacl>=1.4.0:security/py-pynacl@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ecdsa>=0.13:security/py-ecdsa@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cython>=0.23.4:lang/cython@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}libusb1>0:devel/py-libusb1@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}uhid-freebsd>0:devel/py-uhid-freebsd@${PY_FLAVOR} \
 		u2f-host:security/libu2f-host
 
 USES=		python:3.7+
 USE_PYTHON=	autoplist distutils
 
 SUB_FILES=	pkg-message
 
 PLIST_FILES=	"@sample ${PREFIX}/etc/devd/onlykey.conf.sample" \
 		"${PREFIX}/man/man1/onlykey-cli.1.gz"
 
 NO_ARCH=	yes
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/devd
 	${INSTALL_DATA} ${FILESDIR}/onlykey.conf.sample \
 		${STAGEDIR}${PREFIX}/etc/devd
 	${INSTALL_MAN} ${FILESDIR}/onlykey-cli.1 ${STAGEDIR}${PREFIX}/man/man1
 
 .include <bsd.port.mk>
diff --git a/security/py-python-jose/Makefile b/security/py-python-jose/Makefile
index 3c93171ace6c..e46843c0d53e 100644
--- a/security/py-python-jose/Makefile
+++ b/security/py-python-jose/Makefile
@@ -1,24 +1,25 @@
 PORTNAME=	python-jose
 PORTVERSION=	3.3.0
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	dvl@FreeBSD.org
 COMMENT=	Client SDK for TIP API which require Authentication Tokens
 WWW=		https://github.com/mpdavis/python-jose
 
 LICENSE=	MIT
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner@${PY_FLAVOR}
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ecdsa>0:security/py-ecdsa@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pycryptodome>0:security/py-pycryptodome@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}rsa>0:security/py-rsa@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/security/py-social-auth-core/Makefile b/security/py-social-auth-core/Makefile
index 526d935a67ec..ffeb892c8737 100644
--- a/security/py-social-auth-core/Makefile
+++ b/security/py-social-auth-core/Makefile
@@ -1,41 +1,42 @@
 PORTNAME=	social-auth-core
 DISTVERSION=	4.4.1
+PORTREVISION=	1
 CATEGORIES=	security www python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	ultima@FreeBSD.org
 COMMENT=	Social authentication/registration mechanism for several frameworks
 WWW=		https://github.com/python-social-auth/social-core
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cryptography>=2.1.1:security/py-cryptography@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}defusedxml>=0.5.0:devel/py-defusedxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python3-openid>=3.0.10:security/py-python3-openid@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyjwt>=2.0.0:www/py-pyjwt@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}oauthlib>=1.0.3:security/py-oauthlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.9.1:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests-oauthlib>=0.6.1:www/py-requests-oauthlib@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}httpretty>=0.9.6:www/py-httpretty@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}coverage>=3.6:devel/py-coverage@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-cov>=2.7.1:devel/py-pytest-cov@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_PYTHON=	autoplist distutils pytest
 
 TEST_ENV=	PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=	OPENID SAML
 OPTIONS_DEFAULT=	OPENID SAML
 
 OPENID_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}python-jose>=3.0.0:security/py-python-jose@${PY_FLAVOR}
 OPENID_DESC?=	OpenID connect Support
 
 SAML_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}python3-saml>=1.5.0:security/py-python3-saml@${PY_FLAVOR}
 SAML_DESC?=	SAML Support
 
 .include <bsd.port.mk>
diff --git a/security/py-sshpubkeys/Makefile b/security/py-sshpubkeys/Makefile
index f9ac9a6a480e..6a2b5be59969 100644
--- a/security/py-sshpubkeys/Makefile
+++ b/security/py-sshpubkeys/Makefile
@@ -1,21 +1,22 @@
 PORTNAME=	sshpubkeys
 PORTVERSION=	3.3.1
+PORTREVISION=	1
 CATEGORIES=	security python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	SSH public key parser
 WWW=		https://github.com/ojarva/python-sshpubkeys
 
 LICENSE=	BSD3CLAUSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cryptography>=2.1.4:security/py-cryptography@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ecdsa>=0.13:security/py-ecdsa@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/security/py-tlslite-ng/Makefile b/security/py-tlslite-ng/Makefile
index c66e714a8695..112325aefc8f 100644
--- a/security/py-tlslite-ng/Makefile
+++ b/security/py-tlslite-ng/Makefile
@@ -1,22 +1,23 @@
 PORTNAME=	tlslite-ng
 PORTVERSION=	0.7.6
+PORTREVISION=	1
 CATEGORIES=	security python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Pure python implementation of SSL and TLS
 WWW=		https://github.com/tlsfuzzer/tlslite-ng
 
 LICENSE=	BSD3CLAUSE LGPL21 PD
 LICENSE_COMB=	multi
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ecdsa>=0:security/py-ecdsa@${PY_FLAVOR}
 
 USES=		python:3.3+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/security/py-trezor/Makefile b/security/py-trezor/Makefile
index 612af72ac165..01a645ebafe9 100644
--- a/security/py-trezor/Makefile
+++ b/security/py-trezor/Makefile
@@ -1,33 +1,34 @@
 PORTNAME=	trezor
 PORTVERSION=	0.13.5
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Client side implementation for TREZOR Bitcoin hardware wallets
 WWW=		https://pypi.org/project/trezor/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}protobuf>=2.5.0:devel/py-protobuf@${PY_FLAVOR} \
 		protoc:devel/protobuf
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}click>=7:devel/py-click@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}construct-classes>=0.1.2:devel/py-construct-classes@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}construct>=2.9:devel/py-construct@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ecdsa>=0.9:security/py-ecdsa@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}hidapi>=0.7.99.post20:comms/py-hidapi@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}libusb1>=1.6.4:devel/py-libusb1@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mnemonic>=0.20:security/py-mnemonic@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}protobuf>=2.5.0:devel/py-protobuf@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyblake2>=0.9.3:security/py-pyblake2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.4.0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}typing-extensions>=3.10:devel/py-typing-extensions@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/security/seccure/Makefile b/security/seccure/Makefile
index 845710769a8e..b342b78cacf9 100644
--- a/security/seccure/Makefile
+++ b/security/seccure/Makefile
@@ -1,19 +1,19 @@
 PORTNAME=	seccure
 PORTVERSION=	0.5
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	security
 MASTER_SITES=	http://point-at-infinity.org/seccure/ \
 		NETBSD
 
 MAINTAINER=	zi@FreeBSD.org
 COMMENT=	Elliptic Curve Crypto Utility for Reliable Encryption
 WWW=		http://point-at-infinity.org/seccure/
 
 LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libgcrypt.so:security/libgcrypt
 
 USE_GCC=	yes
 
 .include <bsd.port.mk>
diff --git a/security/starttls/Makefile b/security/starttls/Makefile
index bc92ca253b6c..63bba8fb71ac 100644
--- a/security/starttls/Makefile
+++ b/security/starttls/Makefile
@@ -1,16 +1,16 @@
 PORTNAME=	starttls
 PORTVERSION=	0.10
-PORTREVISION=	26
+PORTREVISION=	28
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.opaopa.org/pub/elisp/
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple wrapper program for STARTTLS on ${EMACS_PORT_NAME}
 
 USES=		emacs gmake ssl
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-openssl=${OPENSSLBASE}
 
 .include <bsd.port.mk>
diff --git a/sysutils/R-cran-fs/Makefile b/sysutils/R-cran-fs/Makefile
index 34b151c1b79d..44a4f2ba8a7f 100644
--- a/sysutils/R-cran-fs/Makefile
+++ b/sysutils/R-cran-fs/Makefile
@@ -1,25 +1,26 @@
 PORTNAME=	fs
 DISTVERSION=	1.6.1
+PORTREVISION=	1
 CATEGORIES=	sysutils
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	ygy@FreeBSD.org
 COMMENT=	Cross-Platform File System Operations Based on 'libuv'
 WWW=		https://fs.r-lib.org
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	R-cran-knitr>0:print/R-cran-knitr
 TEST_DEPENDS=	R-cran-covr>0:devel/R-cran-covr \
 		R-cran-crayon>0:devel/R-cran-crayon \
 		R-cran-pillar>=1.0.0:devel/R-cran-pillar \
 		R-cran-testthat>=3.0.0:devel/R-cran-testthat \
 		R-cran-tibble>=1.1.0:devel/R-cran-tibble \
 		R-cran-knitr>0:print/R-cran-knitr \
 		R-cran-rmarkdown>0:textproc/R-cran-rmarkdown \
 		R-cran-spelling>0:textproc/R-cran-spelling
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/sysutils/R-cran-processx/Makefile b/sysutils/R-cran-processx/Makefile
index 1c14ea451b2d..afa3c4356146 100644
--- a/sysutils/R-cran-processx/Makefile
+++ b/sysutils/R-cran-processx/Makefile
@@ -1,25 +1,26 @@
 PORTNAME=	processx
 DISTVERSION=	3.8.0
+PORTREVISION=	1
 CATEGORIES=	sysutils
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	ygy@FreeBSD.org
 COMMENT=	Execute and Control System Processes
 WWW=		https://processx.r-lib.org
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	R-cran-R6>0:devel/R-cran-R6 \
 		R-cran-ps>=1.2.0:sysutils/R-cran-ps
 TEST_DEPENDS=	R-cran-callr>=3.7.0:devel/R-cran-callr \
 		R-cran-cli>=3.3.0:devel/R-cran-cli \
 		R-cran-covr>0:devel/R-cran-covr \
 		R-cran-rlang>=1.0.2:devel/R-cran-rlang \
 		R-cran-testthat>=3.0.0:devel/R-cran-testthat \
 		R-cran-withr>0:devel/R-cran-withr \
 		R-cran-curl>0:ftp/R-cran-curl
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/sysutils/R-cran-ps/Makefile b/sysutils/R-cran-ps/Makefile
index a2bc41c49571..7237b47f00db 100644
--- a/sysutils/R-cran-ps/Makefile
+++ b/sysutils/R-cran-ps/Makefile
@@ -1,25 +1,26 @@
 PORTNAME=	ps
 DISTVERSION=	1.7.4
+PORTREVISION=	1
 CATEGORIES=	sysutils
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	ygy@FreeBSD.org
 COMMENT=	List, Query, Manipulate System Processes
 WWW=		https://github.com/r-lib/ps#readme
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 TEST_DEPENDS=	R-cran-R6>0:devel/R-cran-R6 \
 		R-cran-callr>0:devel/R-cran-callr \
 		R-cran-covr>0:devel/R-cran-covr \
 		R-cran-pillar>0:devel/R-cran-pillar \
 		R-cran-rlang>0:devel/R-cran-rlang \
 		R-cran-testthat>=3.0.0:devel/R-cran-testthat \
 		R-cran-curl>0:ftp/R-cran-curl \
 		R-cran-pingr>0:net/R-cran-pingr \
 		R-cran-processx>=3.1.0:sysutils/R-cran-processx
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/sysutils/R-cran-xopen/Makefile b/sysutils/R-cran-xopen/Makefile
index d966ce91fb1a..740a8b2537aa 100644
--- a/sysutils/R-cran-xopen/Makefile
+++ b/sysutils/R-cran-xopen/Makefile
@@ -1,19 +1,20 @@
 PORTNAME=	xopen
 DISTVERSION=	1.0.0
+PORTREVISION=	1
 CATEGORIES=	sysutils
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	ygy@FreeBSD.org
 COMMENT=	Open System Files, 'URLs', Anything
 WWW=		https://github.com/r-lib/xopen #readme
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	R-cran-processx>0:sysutils/R-cran-processx
 TEST_DEPENDS=	R-cran-testthat>0:devel/R-cran-testthat \
 		R-cran-ps>0:sysutils/R-cran-ps
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/sysutils/arcconf/Makefile b/sysutils/arcconf/Makefile
index 851b9b0206be..f7426138f837 100644
--- a/sysutils/arcconf/Makefile
+++ b/sysutils/arcconf/Makefile
@@ -1,46 +1,47 @@
 PORTNAME=	arcconf
 DISTVERSION=	4_01_24763
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	https://download.adaptec.com/raid/storage_manager/
 DISTNAME=	arcconf_v${DISTVERSION}
 
 MAINTAINER=	michael@fuckner.net
 COMMENT=	Adaptec SCSI/SAS RAID administration tool
 WWW=		https://storage.microsemi.com/en-us/support/
 
 LICENSE=	Microsemi
 LICENSE_NAME=	Microsemi License
 LICENSE_FILE=	${WRKSRC}/freebsd${DIST_TYPE}/cmdline/License.txt
 LICENSE_PERMS=	no-pkg-sell no-dist-sell no-dist-mirror auto-accept
 
 ONLY_FOR_ARCHS=	amd64
 LIB_DEPENDS=	libstdc++.so.6:lang/gcc${GCC_DEFAULT}
 
 USES=		zip
 USE_GCC=	yes
 
 SUB_FILES+=	${PERIODICSCRIPT}
 
 PERIODICSCRIPT=	410.status-aac-raid
 
 .include <bsd.port.pre.mk>
 
 .if ${OSREL:R} == 12
 DIST_TYPE=	12_x86_64
 .else
 DIST_TYPE=	13_x86_64
 .endif
 
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
 PLIST_FILES=	etc/periodic/daily/410.status-aac-raid \
 		sbin/arcconf
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/freebsd${DIST_TYPE}/cmdline/arcconf ${STAGEDIR}${PREFIX}/sbin
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/periodic/daily
 	${INSTALL_SCRIPT} ${WRKDIR}/${PERIODICSCRIPT} ${STAGEDIR}${PREFIX}/etc/periodic/daily
 
 .include <bsd.port.post.mk>
diff --git a/sysutils/atf-master/Makefile b/sysutils/atf-master/Makefile
index 9096ddbee35d..32ae352d3c65 100644
--- a/sysutils/atf-master/Makefile
+++ b/sysutils/atf-master/Makefile
@@ -1,51 +1,52 @@
 PORTNAME=	atf
 PORTVERSION?=	${ATF_VERSION}
+PORTREVISION=	1
 CATEGORIES=	sysutils
 PKGNAMESUFFIX?=	-${PLAT}
 
 MAINTAINER=	uboot@FreeBSD.org
 COMMENT=	ARM TF-A for platform ${PLAT}
 
 LICENSE=	BSD3CLAUSE
 
 BUILD_DEPENDS+=	aarch64-none-elf-gcc:devel/aarch64-none-elf-gcc
 
 USES=	gmake
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	ARM-software
 GH_PROJECT=	arm-trusted-firmware
 GH_TAGNAME=	${ATF_VERSION}
 
 SSP_UNSAFE=	yes
 MAKE_ENV+=	CROSS_COMPILE="aarch64-none-elf-"
 ATF_TARGET?=	bl31
 ALL_TARGET=	ARCH="aarch64" PLAT=${PLAT} V=1 CFLAGS= HOSTCC=${CC} ${ATF_TARGET}
 
 # Default to the latest release
 ATF_VERSION?=	v2.8.0
 
 PLIST_FILES?=	${PREFIX}/share/${PORTNAME}-${PLAT}/${BL31:T}
 .if defined(FIP)
 PLIST_FILES+=	${PREFIX}/share/${PORTNAME}-${PLAT}/${FIP:T}
 .endif
 
 DESCR?=		${.CURDIR}/pkg-descr
 
 NO_ARCH=	yes
 
 LDFLAGS+=	--no-warn-rwx-segments
 
 .if !defined(PLAT)
 PLAT=		NONE
 IGNORE=		is a metaport; there is nothing to build
 .endif
 
 do-install:
 	${MKDIR} ${STAGEDIR}/${PREFIX}/share/${PORTNAME}-${PLAT}/
 	${INSTALL_DATA} ${WRKSRC}/build/${PLAT}/release/${BL31} ${STAGEDIR}/${PREFIX}/share/${PORTNAME}-${PLAT}/
 .if defined(FIP)
 	${INSTALL_DATA} ${WRKSRC}/build/${PLAT}/release/${FIP} ${STAGEDIR}/${PREFIX}/share/${PORTNAME}-${PLAT}/
 .endif
 
 .include <bsd.port.mk>
diff --git a/sysutils/btop/Makefile b/sysutils/btop/Makefile
index 76f64c37a605..d23dc7ef277f 100644
--- a/sysutils/btop/Makefile
+++ b/sysutils/btop/Makefile
@@ -1,22 +1,23 @@
 PORTNAME=	btop
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.2.13
+PORTREVISION=	1
 CATEGORIES=	sysutils
 
 MAINTAINER=	pkubaj@FreeBSD.org
 COMMENT=	Monitor of resources
 WWW=		https://github.com/aristocratos/btop
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		gmake
 USE_GCC=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	aristocratos
 
 CXXFLAGS_i386=	-latomic
 CXXFLAGS_powerpc=	-latomic
 MAKE_ARGS=	STRIP=true ADDFLAGS="${CXXFLAGS} ${LDFLAGS}" VERBOSE=true
 
 .include <bsd.port.mk>
diff --git a/sysutils/dvdisaster/Makefile b/sysutils/dvdisaster/Makefile
index d71fd5a159f0..9d20fa11b953 100644
--- a/sysutils/dvdisaster/Makefile
+++ b/sysutils/dvdisaster/Makefile
@@ -1,67 +1,67 @@
 PORTNAME=	dvdisaster
 PORTVERSION=	0.79.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.ml1.org.uk/distfiles/ \
 		http://www.ancientgeek.org.uk/distfiles/
 
 MAINTAINER=	bob@eager.cx
 COMMENT=	Optical disc error correction data and recovery tool
 WWW=		https://www.bobeager.uk/software.html
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	bash:shells/bash
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2
 
 USES=		gmake gnome pkgconfig
 USE_GCC=	yes
 USE_GNOME=	gdkpixbuf2 gtk20 cairo
 
 CFLAGS+=	-Wno-stringop-overflow
 MAKEFILE=	GNUmakefile
 HAS_CONFIGURE=	yes
 CONFIGURE_LOG=	configure.log
 CONFIGURE_ARGS=	--docsubdir="/" \
 		--localedir=${PREFIX}/share/locale \
 		--buildroot=${STAGEDIR}
 MAKE_JOBS_UNSAFE=	yes
 
 PORTDOCS=	*
 SUB_FILES=	pkg-message DEVICES.md DEVICES.html
 
 OPTIONS_DEFINE=	DOCS NLS
 OPTIONS_SUB=	yes
 
 DOCS_CONFIGURE_ON=	--docdir=${DOCSDIR}
 NLS_USES=	gettext
 NLS_CONFIGURE_OFF=	-with-nls=no
 
 post-patch:
 	${REINPLACE_CMD} -e '/dvdisaster uninstaller/,+19 d' \
 			${WRKSRC}/GNUmakefile.template
 
 post-patch-DOCS-off:
 	${REINPLACE_CMD} -e 's|THESE_ARE_THE_DEVEL_SOURCES;|GNUmakefile;|; \
 		/install -d $$(BUILDROOT)$$(DOCSUBDIR)/,+7 d' \
 			${WRKSRC}/GNUmakefile.template
 
 post-patch-NLS-off:
 	${REINPLACE_CMD} -Ee 's|(PO_LOCALES)|#\1|; \
 		s|install -m 644 CREDITS\*|install -m 644 CREDITS\.en|' \
 			${WRKSRC}/GNUmakefile.template
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps
 	${INSTALL_DATA} ${WRKSRC}/contrib/dvdisaster48.png ${STAGEDIR}${PREFIX}/share/pixmaps/
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/applications
 	${INSTALL_DATA} ${WRKSRC}/contrib/dvdisaster.desktop ${STAGEDIR}${PREFIX}/share/applications/
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 
 post-install-DOCS-on:
 	${INSTALL_MAN} ${WRKDIR}/DEVICES.md ${STAGEDIR}${DOCSDIR}
 	${INSTALL_MAN} ${WRKDIR}/DEVICES.html ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/sysutils/edk2/Makefile b/sysutils/edk2/Makefile
index c2ba0adbabc8..cefcbd8d3eef 100644
--- a/sysutils/edk2/Makefile
+++ b/sysutils/edk2/Makefile
@@ -1,224 +1,224 @@
 PORTNAME=	edk2
 PORTVERSION=	g202202
-PORTREVISION=	2
+PORTREVISION=	10
 CATEGORIES=	sysutils
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
 PATCHFILES=	22130dcd98b4d4b76ac8d922adb4a2dbc86fa52c.patch:-p1 \
 		85021f8cf22d1bd4114803c6c610dea5ef0059f1.patch:-p1
 
 MAINTAINER=	uboot@FreeBSD.org
 COMMENT=	EDK2 Firmware for ${FLAVOR}
 WWW=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/ReadMe.rst
 
 LICENSE=	BSD3CLAUSE
 
 ONLY_FOR_ARCHS=		aarch64 amd64
 ONLY_FOR_ARCHS_REASON=	only provides firmware for aarch64 and amd64
 
 PKGNAMESUFFIX=	-${FLAVOR:C/_/-/g}
 FLAVORS=	macchiatobin fvp rpi3 rpi4 xen_x64 bhyve qemu_x64 qemu_i386
 
 USES=	cpe gmake python:3.7+,build
 CPE_VENDOR=	tianocore
 USE_GCC=	yes:build
 
 BUILD_DEPENDS+=	dtc>=1.4.1:sysutils/dtc \
 		bash:shells/bash
 
 # Both platform and non-osi repository don't have release, use latest known to work tag
 PLATFORM_TAG=	38855c56
 NONOSI_TAG=	6996a45d
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	tianocore
 GH_TAGNAME=	edk2-stable202202
 GH_TUPLE=	tianocore:edk2-platforms:${PLATFORM_TAG}:platforms \
 		tianocore:edk2-non-osi:${NONOSI_TAG}:nonosi \
 		openssl:openssl:OpenSSL_1_1_1j:openssl/CryptoPkg/Library/OpensslLib/openssl \
 		ucb-bar:berkeley-softfloat-3:master:softfloat/ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 \
 		kkos:oniguruma:v6.9.4_mark1:oniguruma/MdeModulePkg/Universal/RegularExpressionDxe/oniguruma \
 		google:brotli:v1.0.9-35-gf4153a0:brotli/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli \
 		akheron:jansson:v2.13.1:jansson/RedfishPkg/Library/JsonLib/jansson
 
 .include <bsd.port.pre.mk>
 
 # Heavily dependent on bsd.port.pre.mk definitions for lang/gcc* details:
 BINARY_ALIAS=	make=${LOCALBASE}/bin/gmake \
 		dtc=${LOCALBASE}/bin/dtc \
 		ar=${AR} \
 		gcc=${LOCALBASE}/bin/${CC} \
 		gcc-ar=${LOCALBASE}/bin/${CC:S/gcc/&-ar/} \
 		g++=${LOCALBASE}/bin/${CXX} \
 		python3=${PYTHON_CMD} python=${PYTHON_CMD}
 
 # Avoid: "ld-elf.so.1: /lib/libgcc_s.so.1: version GCC_4.5.0
 #         required by /usr/local/lib/gcc11/libstdc++.so.6 not found"
 # (that is from /lib/libgcc_s.so.1 having incomplete/inaccurate
 # coverage for aarch64 g++ code generation's use of libgcc_s.so.1 ):
 EXTRA_LDFLAGS+=	-Wl,-rpath=${_GCC_RUNTIME}
 
 # Global args
 PLAT_ARGS=	-D NETWORK_IP6_ENABLE
 
 .if ${FLAVOR} == fvp
 PLAT=		fvp
 PLAT_ARCH=	AARCH64
 PLAT_ARGS+=	-D X64EMU_ENABLE=FALSE -D CAPSULE_ENABLE=FALSE
 PLAT_TARGET=	RELEASE
 PLATFILE=	Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc
 PLAT_RESULT=	ArmVExpress-FVP-AArch64/${PLAT_TARGET}_GCC5/FV/FVP_AARCH64_EFI.fd
 PLAT_FILENAME=	FVP_AARCH64_EFI.fd
 .endif
 
 .if ${FLAVOR} == macchiatobin
 PLAT=		macchiatobin
 PLAT_ARCH=	AARCH64
 PLAT_ARGS+=	-D X64EMU_ENABLE=TRUE -D CAPSULE_ENABLE=FALSE
 PLAT_TARGET=	RELEASE
 PLATFILE=	Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.dsc
 PLAT_RESULT=	Armada80x0McBin-AARCH64/${PLAT_TARGET}_GCC5/FV/ARMADA_EFI.fd
 PLAT_FILENAME=	ARMADA_EFI.fd
 .endif
 
 .if ${FLAVOR} == rpi3
 PLAT=		rpi3
 PLAT_ARCH=	AARCH64
 PLAT_ARGS+=	-D X64EMU_ENABLE=FALSE -D CAPSULE_ENABLE=FALSE
 PLAT_TARGET=	RELEASE
 PLATFILE=	Platform/RaspberryPi/RPi3/RPi3.dsc
 PLAT_RESULT=	RPi3/${PLAT_TARGET}_GCC5/FV/RPI_EFI.fd
 PLAT_FILENAME=	RPI_EFI.fd
 .endif
 
 .if ${FLAVOR} == rpi4
 PLAT=		rpi4
 PLAT_ARCH=	AARCH64
 PLAT_ARGS+=	-D X64EMU_ENABLE=FALSE -D CAPSULE_ENABLE=FALSE
 PLAT_TARGET=	RELEASE
 PLATFILE=	Platform/RaspberryPi/RPi4/RPi4.dsc
 PLAT_RESULT=	RPi4/${PLAT_TARGET}_GCC5/FV/RPI_EFI.fd
 PLAT_FILENAME=	RPI_EFI.fd
 .endif
 
 .if ${FLAVOR} == xen_x64
 ONLY_FOR_ARCHS=	amd64
 ONLY_FOR_ARCHS_REASON=	Do not compile on hardware other than amd64
 PLAT=		xen
 PLAT_ARCH=	X64
 PLAT_TARGET=	RELEASE
 PLATFILE=	OvmfPkg/OvmfXen.dsc
 PLAT_RESULT=	OvmfXen/${PLAT_TARGET}_GCC5/FV/OVMF.fd
 PLAT_FILENAME=	XEN_X64_EFI.fd
 .endif
 
 .if ${FLAVOR} == bhyve
 ONLY_FOR_ARCHS=	amd64
 ONLY_FOR_ARCHS_REASON=	Bhyve only runs on x64
 PLAT=		bhyve
 PLAT_ARCH=	X64
 PLAT_TARGET=	RELEASE
 PLATFILE=	OvmfPkg/Bhyve/BhyveX64.dsc
 PLAT_RESULT=	BhyveX64/${PLAT_TARGET}_GCC5/FV/BHYVE.fd
 PLAT_RESULT_CODE=	BhyveX64/${PLAT_TARGET}_GCC5/FV/BHYVE_CODE.fd
 PLAT_RESULT_VARS=	BhyveX64/${PLAT_TARGET}_GCC5/FV/BHYVE_VARS.fd
 PLAT_FILENAME=	BHYVE_UEFI.fd
 PLAT_FILENAME_CODE=	BHYVE_UEFI_CODE.fd
 PLAT_FILENAME_VARS=	BHYVE_UEFI_VARS.fd
 .endif
 
 .if ${FLAVOR} == qemu_x64
 ONLY_FOR_ARCHS=	amd64
 ONLY_FOR_ARCHS_REASON=	Do not compile on hardware other than amd64
 PLAT=		qemu
 PLAT_ARCH=	X64
 PLAT_TARGET=	RELEASE
 PLATFILE=	OvmfPkg/OvmfPkgX64.dsc
 PLAT_RESULT=	OvmfX64/${PLAT_TARGET}_GCC5/FV/OVMF.fd
 PLAT_RESULT_CODE=	OvmfX64/${PLAT_TARGET}_GCC5/FV/OVMF_CODE.fd
 PLAT_RESULT_VARS=	OvmfX64/${PLAT_TARGET}_GCC5/FV/OVMF_VARS.fd
 PLAT_FILENAME=	QEMU_UEFI-x86_64.fd
 PLAT_FILENAME_CODE=	QEMU_UEFI_CODE-x86_64.fd
 PLAT_FILENAME_VARS=	QEMU_UEFI_VARS-x86_64.fd
 .endif
 
 .if ${FLAVOR} == qemu_i386
 ONLY_FOR_ARCHS=	amd64
 ONLY_FOR_ARCHS_REASON=	Do not compile on hardware other than amd64
 PLAT=		qemu
 PLAT_ARCH=	IA32
 PLAT_TARGET=	RELEASE
 PLATFILE=	OvmfPkg/OvmfPkgIa32.dsc
 PLAT_RESULT=	OvmfIa32/${PLAT_TARGET}_GCC5/FV/OVMF.fd
 PLAT_RESULT_CODE=	OvmfIa32/${PLAT_TARGET}_GCC5/FV/OVMF_CODE.fd
 PLAT_RESULT_VARS=	OvmfIa32/${PLAT_TARGET}_GCC5/FV/OVMF_VARS.fd
 PLAT_FILENAME=	QEMU_UEFI-i386.fd
 PLAT_FILENAME_CODE=	QEMU_UEFI_CODE-i386.fd
 PLAT_FILENAME_VARS=	QEMU_UEFI_VARS-i386.fd
 .endif
 
 PLIST_FILES=	${PREFIX}/share/${PORTNAME}-${PLAT}/${PLAT_FILENAME}
 .if defined(PLAT_FILENAME_CODE)
 PLIST_FILES+=	${PREFIX}/share/${PORTNAME}-${PLAT}/${PLAT_FILENAME_CODE}
 .endif
 .if defined(PLAT_FILENAME_VARS)
 PLIST_FILES+=	${PREFIX}/share/${PORTNAME}-${PLAT}/${PLAT_FILENAME_VARS}
 .endif
 .if ${FLAVOR} == bhyve
 PLIST_FILES+=	${PREFIX}/share/uefi-firmware/${PLAT_FILENAME}
 PLIST_FILES+=	${PREFIX}/share/uefi-firmware/${PLAT_FILENAME_CODE}
 PLIST_FILES+=	${PREFIX}/share/uefi-firmware/${PLAT_FILENAME_VARS}
 .endif
 
 # Emulate source edk2/edksetup.sh
 MAKE_ENV+=	WORKSPACE=${WRKDIR} \
 		PACKAGES_PATH=${WRKDIR}/edk2-${GH_TAGNAME}:${WRKDIR}/edk2-platforms-${PLATFORM_TAG}:${WRKDIR}/edk2-non-osi-${NONOSI_TAG} \
 		CONF_PATH=${WRKDIR}/edk2-${GH_TAGNAME}/Conf \
 		EDK_TOOLS_PATH=${WRKDIR}/edk2-${GH_TAGNAME}/BaseTools \
 		PATH=${WRKDIR}/edk2-${GH_TAGNAME}/BaseTools/BinWrappers/PosixLike:${PATH} \
 		PYTHON_COMMAND=python3 \
 		PYTHONHASHSEED=1 \
 		EXTRA_LDFLAGS=${EXTRA_LDFLAGS}
 
 .if ${PLAT_ARCH} == AARCH64 && ${ARCH} != aarch64
 BUILD_DEPENDS+=	aarch64-none-elf-gcc:devel/aarch64-none-elf-gcc
 MAKE_ENV+=	GCC5_AARCH64_PREFIX=aarch64-none-elf-
 .endif
 
 .if ${PLAT_ARCH} == X64 || ${PLAT_ARCH} == IA32
 BUILD_DEPENDS+=	nasm:devel/nasm
 .endif
 
 # We can't have two submodule with the same origin in GH_TUPLE
 post-extract:
 	(cd ${WRKDIR}/edk2-${GH_TAGNAME}/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli && tar cf - * | tar xf - -C ../../../../BaseTools/Source/C/BrotliCompress/brotli)
 
 do-build:
 	# This is normaly done during source edksetup.sh
 	(cp ${WRKDIR}/edk2-${GH_TAGNAME}/BaseTools/Conf/build_rule.template ${WRKDIR}/edk2-${GH_TAGNAME}/Conf/build_rule.txt)
 	(cp ${WRKDIR}/edk2-${GH_TAGNAME}/BaseTools/Conf/tools_def.template ${WRKDIR}/edk2-${GH_TAGNAME}/Conf/tools_def.txt)
 	(cp ${WRKDIR}/edk2-${GH_TAGNAME}/BaseTools/Conf/target.template ${WRKDIR}/edk2-${GH_TAGNAME}/Conf/target.txt)
 	# Build the basetools
 	(cd ${WRKDIR} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} -C edk2-${GH_TAGNAME}/BaseTools ${_MAKE_JOBS})
 	# Build EDK2
 	(cd ${WRKDIR}/edk2-${GH_TAGNAME} && ${SETENV} ${MAKE_ENV} BaseTools/BinWrappers/PosixLike/build -a ${PLAT_ARCH} -p ${PLATFILE} -n ${MAKE_JOBS_NUMBER} -t GCC5 -b ${PLAT_TARGET} ${PLAT_ARGS})
 
 do-install:
 	${MKDIR} ${STAGEDIR}/${PREFIX}/share/${PORTNAME}-${PLAT}/
 	${INSTALL_DATA} ${WRKDIR}/Build/${PLAT_RESULT} ${STAGEDIR}/${PREFIX}/share/${PORTNAME}-${PLAT}/${PLAT_FILENAME}
 .if defined(PLAT_FILENAME_CODE)
 	${INSTALL_DATA} ${WRKDIR}/Build/${PLAT_RESULT_CODE} ${STAGEDIR}/${PREFIX}/share/${PORTNAME}-${PLAT}/${PLAT_FILENAME_CODE}
 .endif
 .if defined(PLAT_FILENAME_VARS)
 	${INSTALL_DATA} ${WRKDIR}/Build/${PLAT_RESULT_VARS} ${STAGEDIR}/${PREFIX}/share/${PORTNAME}-${PLAT}/${PLAT_FILENAME_VARS}
 .endif
 .if ${FLAVOR} == bhyve
 	${INSTALL_DATA} ${WRKDIR}/Build/${PLAT_RESULT_CODE} ${STAGEDIR}/${PREFIX}/share/${PORTNAME}-${PLAT}/${PLAT_FILENAME}
 	# For backwards compatibility
 	${MKDIR} ${STAGEDIR}/${PREFIX}/share/uefi-firmware/
 	${RLN} ${STAGEDIR}/${PREFIX}/share/${PORTNAME}-${PLAT}/${PLAT_FILENAME} ${STAGEDIR}/${PREFIX}/share/uefi-firmware/${PLAT_FILENAME}
 	${RLN} ${STAGEDIR}/${PREFIX}/share/${PORTNAME}-${PLAT}/${PLAT_FILENAME_CODE} ${STAGEDIR}/${PREFIX}/share/uefi-firmware/${PLAT_FILENAME_CODE}
 	${RLN} ${STAGEDIR}/${PREFIX}/share/${PORTNAME}-${PLAT}/${PLAT_FILENAME_VARS} ${STAGEDIR}/${PREFIX}/share/uefi-firmware/${PLAT_FILENAME_VARS}
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/sysutils/fusefs-lkl/Makefile b/sysutils/fusefs-lkl/Makefile
index e4a3ced502f5..4aa7661c4ffe 100644
--- a/sysutils/fusefs-lkl/Makefile
+++ b/sysutils/fusefs-lkl/Makefile
@@ -1,42 +1,42 @@
 PORTNAME=	lkl
 DISTVERSION=	4.16.g20180628
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	sysutils
 PKGNAMEPREFIX=	fusefs-
 
 MAINTAINER=	cem@FreeBSD.org
 COMMENT=	Full-featured Linux BTRFS, Ext4, XFS as a FUSE module
 WWW=		https://github.com/lkl/linux/
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	gnubc>0:math/gnubc \
 		gnustat:sysutils/coreutils \
 		gsed:textproc/gsed
 
 USES=		bison:build fuse gmake python:build shebangfix
 SHEBANG_FILES=	../../arch/lkl/scripts/headers_install.py
 BINARY_ALIAS=	sed=gsed \
 		stat=gnustat
 USE_BINUTILS=	yes
 USE_GCC=	yes
 USE_GITHUB=	yes
 GH_PROJECT=	linux
 GH_TAGNAME=	86dd3afb590eccc1903611bdaa8bac87757eb80d
 
 ONLY_FOR_ARCHS=	amd64
 ONLY_FOR_ARCHS_REASON=ld formats not available for other architectures
 
 WRKSRC_SUBDIR=	tools/lkl
 MAKE_JOBS_UNSAFE=yes
 MAKE_ARGS+=	V=1
 # Need ports versions of 'bc', 'ld' to build!
 MAKE_ARGS+=	PATH="${LOCALBASE}/bin:${PATH}" CC="${CC}" HOSTCC="${CC}"
 
 PLIST_FILES=	bin/lklfuse lib/liblkl.a
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/lklfuse ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/liblkl.a ${STAGEDIR}${PREFIX}/lib
 
 .include <bsd.port.mk>
diff --git a/sysutils/grub2-bhyve/Makefile b/sysutils/grub2-bhyve/Makefile
index 9c9512715b4a..b220b10b1273 100644
--- a/sysutils/grub2-bhyve/Makefile
+++ b/sysutils/grub2-bhyve/Makefile
@@ -1,40 +1,40 @@
 PORTNAME=	grub2-bhyve
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.40
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	sysutils
 
 PATCH_SITES+=	https://github.com/grehan-freebsd/grub2-bhyve/commit/
 PATCHFILES+=	b080876e0711ee9d7a9c86661df173d98f2d0845.diff:-p1 \
 		a2a1a8f716a00a8f42b36a8b91ac5b3e2328d39c.diff:-p1
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Grub-emu loader for bhyve
 WWW=		https://github.com/grehan-freebsd/grub2-bhyve
 
 LICENSE=	GPLv3
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/flex:textproc/flex \
 		help2man:misc/help2man
 
 ONLY_FOR_ARCHS=	amd64
 SSP_UNSAFE=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	grehan-freebsd
 USES=		bison gmake
 USE_GCC=	yes:build
 PLIST_FILES=	sbin/grub-bhyve
 MAKE_JOBS_UNSAFE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-platform=emu CPP="" LEX=${LOCALBASE}/bin/flex \
 		--enable-grub-mount=no --enable-grub-mkfont=no \
 		--enable-grub-emu-sdl=no --disable-nls --disable-werror
 
 post-patch:
 	@${REINPLACE_CMD} -e "s/libintl\.h/I_do_not_want_libintl.h/g" ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e "s/-lintl//g" ${WRKSRC}/grub-core/Makefile.in
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/grub-core/grub-emu ${STAGEDIR}${LOCALBASE}/sbin/grub-bhyve
 
 .include <bsd.port.mk>
diff --git a/sysutils/grub2-efi/Makefile b/sysutils/grub2-efi/Makefile
index 04546d26cb14..81d426743104 100644
--- a/sysutils/grub2-efi/Makefile
+++ b/sysutils/grub2-efi/Makefile
@@ -1,54 +1,54 @@
 PORTNAME=	grub2-efi
 PORTVERSION=	2.02
-PORTREVISION=	20
+PORTREVISION=	21
 CATEGORIES=	sysutils
 MASTER_SITES=	LOCAL/kevlo
 DISTNAME=	grub-${PORTVERSION}_7
 
 MAINTAINER=	kevlo@FreeBSD.org
 COMMENT=	Multiboot EFI boot loader
 WWW=		https://www.gnu.org/software/grub/
 
 LICENSE=	GPLv3
 
 RUN_DEPENDS=	${LOCALBASE}/bin/mformat:emulators/mtools \
 		${LOCALBASE}/bin/grub-mkrescue:sysutils/grub2-pcbsd
 BUILD_DEPENDS=	${LOCALBASE}/bin/flex:textproc/flex \
 		${LOCALBASE}/bin/bash:shells/bash \
 		help2man:misc/help2man
 
 ONLY_FOR_ARCHS=	amd64
 USES=		autoreconf:build bison cpe gettext gmake python tar:xz
 
 WRKSRC=		${WRKDIR}/grub-${PORTVERSION}
 SSP_UNSAFE=	yes
 USE_GCC=	yes
 GNU_CONFIGURE=	yes
 MAKE_JOBS_UNSAFE=	yes
 
 CPE_PRODUCT=	grub
 CPE_VENDOR=	gnu
 
 CONFIGURE_ARGS=	--with-platform=efi --disable-werror --localedir=${PREFIX}/share/locale
 CONFIGURE_ENV=	CPP="${CC} -E" \
 		LEX=${LOCALBASE}/bin/flex
 
 .include <bsd.port.pre.mk>
 
 post-patch:
 	@${LN} -s ${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf ${WRKSRC}
 	@${TOUCH} -t 200001010000 ${WRKSRC}/Makefile.util.def
 
 pre-configure:
 	@${REINPLACE_CMD} -e 's|python|${PYTHON_CMD}|g' ${WRKSRC}/autogen.sh
 	cd ${WRKSRC} && ./autogen.sh
 
 post-configure:
 	@${LN} -sfh /usr/include/machine /usr/include/sys /usr/include/x86 ${WRKSRC}/grub-core
 
 do-install:
 	@cd ${WRKSRC}/grub-core && ${GMAKE} install DESTDIR=${STAGEDIR}
 
 RUN_DEPENDS:=	${RUN_DEPENDS:Ngcc*}
 
 .include <bsd.port.post.mk>
diff --git a/sysutils/grub2-pcbsd/Makefile b/sysutils/grub2-pcbsd/Makefile
index 5fe107bc121b..e8545c62ecc2 100644
--- a/sysutils/grub2-pcbsd/Makefile
+++ b/sysutils/grub2-pcbsd/Makefile
@@ -1,92 +1,92 @@
 PORTNAME=	grub2-pcbsd
 PORTVERSION=	2.02q
-PORTREVISION=	17
+PORTREVISION=	18
 CATEGORIES=	sysutils
 MASTER_SITES=	LOCAL/kevlo
 DISTNAME=	grub-2.02_8
 
 MAINTAINER=	kevlo@FreeBSD.org
 COMMENT=	Multiboot boot loader
 WWW=		https://www.gnu.org/software/grub/
 
 LICENSE=	GPLv3
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/flex:textproc/flex \
 		${LOCALBASE}/bin/bash:shells/bash \
 		help2man:misc/help2man
 
 ONLY_FOR_ARCHS=	amd64
 USES=		autoreconf:build bison cpe gettext gmake makeinfo pkgconfig python tar:xz
 
 WRKSRC=		${WRKDIR}/grub-2.02
 CONFLICTS=	grub2-2*
 SSP_UNSAFE=	yes
 USE_GCC=	yes
 GNU_CONFIGURE=	yes
 INFO=		grub grub-dev
 MAKE_JOBS_UNSAFE=	yes
 
 CPE_PRODUCT=	grub
 CPE_VENDOR=	gnu
 
 CONFIGURE_ARGS=	--disable-werror --localedir=${PREFIX}/share/locale
 CONFIGURE_ENV=	CPP="${CC} -E" \
 		LEX=${LOCALBASE}/bin/flex
 
 SUB_FILES=	00_header 10_kfreebsd 10_ktrueos 30_os-prober 50_otherbe
 
 OPTIONS_DEFINE=	MKFONT FUSE
 OPTIONS_DEFAULT=MKFONT
 OPTIONS_SUB=	yes
 
 MKFONT_DESC=	Build grub-mkfont (require freetype2)
 FUSE_DESC=	Build grub-mount (require FUSE)
 
 BINARY_ALIAS=	freetype-config=true
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} != "amd64"
 EFIEMU=		"@comment "
 .endif
 
 PLIST_SUB+=	EFIEMU=${EFIEMU}
 
 .if ${PORT_OPTIONS:MMKFONT}
 LIB_DEPENDS+=	libfreetype.so:print/freetype2
 BUILD_DEPENDS+=	${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf:x11-fonts/dejavu \
 		${LOCALBASE}/share/fonts/gnu-unifont/unifont.pcf.gz:x11-fonts/gnu-unifont
 CONFIGURE_ARGS+=	--enable-grub-mkfont
 .else
 CONFIGURE_ARGS+=	--disable-grub-mkfont
 .endif
 
 .if ${PORT_OPTIONS:MFUSE}
 LIB_DEPENDS+=	libfuse.so:sysutils/fusefs-libs
 CONFIGURE_ARGS+=	--enable-grub-mount
 .else
 CONFIGURE_ARGS+=	--disable-grub-mount
 .endif
 
 post-patch:
 	@${TOUCH} -t 200001010000 ${WRKSRC}/Makefile.util.def
 
 pre-configure:
 	@${REINPLACE_CMD} -e 's|python|${PYTHON_CMD}|g' ${WRKSRC}/autogen.sh
 	cd ${WRKSRC} && ./autogen.sh
 
 post-configure:
 	@${LN} -sfh /usr/include/machine /usr/include/sys /usr/include/x86 ${WRKSRC}/grub-core
 
 post-install:
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/charset.alias
 	${INSTALL_SCRIPT} ${WRKDIR}/00_header ${STAGEDIR}${PREFIX}/etc/grub.d/
 	${INSTALL_SCRIPT} ${WRKDIR}/10_kfreebsd ${STAGEDIR}${PREFIX}/etc/grub.d/
 	${INSTALL_SCRIPT} ${WRKDIR}/10_ktrueos ${STAGEDIR}${PREFIX}/etc/grub.d/
 	${INSTALL_SCRIPT} ${WRKDIR}/30_os-prober ${STAGEDIR}${PREFIX}/etc/grub.d/
 	${INSTALL_SCRIPT} ${WRKDIR}/50_otherbe ${STAGEDIR}${PREFIX}/etc/grub.d/
 	${MV} ${STAGEDIR}${PREFIX}/etc/grub.d/40_custom ${STAGEDIR}/${PREFIX}/etc/grub.d/40_custom.dist
 
 RUN_DEPENDS:=	${RUN_DEPENDS:Ngcc*}
 
 .include <bsd.port.post.mk>
diff --git a/sysutils/libretto-config/Makefile b/sysutils/libretto-config/Makefile
index 760b595d6d32..5ff93a2d443b 100644
--- a/sysutils/libretto-config/Makefile
+++ b/sysutils/libretto-config/Makefile
@@ -1,31 +1,31 @@
 PORTNAME=	libretto-config
 PORTVERSION=	1.0.b5
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	sysutils
 MASTER_SITES=	http://club.pep.ne.jp/~ishioka/Software/Linux/libapm/
 DISTNAME=	libapm-linux-1.0beta5
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Libretto BIOS Setting Program
 
 ONLY_FOR_ARCHS=	i386
 
 WRKSRC=		${WRKDIR}/libapm
 
 USE_GCC=	yes
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/libapm-j.man ${STAGEDIR}${MAN8PREFIX}/man/ja/man8/${PORTNAME}.8
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README-e.1st ${STAGEDIR}${DOCSDIR}/README.1st
 	${INSTALL_DATA} ${WRKSRC}/APM-EXBIOS-e.txt ${STAGEDIR}${DOCSDIR}/APM-EXBIOS.txt
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/ja
 	${INSTALL_DATA} ${WRKSRC}/README-j.1st ${STAGEDIR}${DOCSDIR}/ja/README.1st
 	${INSTALL_DATA} ${WRKSRC}/APM-EXBIOS-j.txt ${STAGEDIR}${DOCSDIR}/ja/APM-EXBIOS.txt
 
 .include <bsd.port.mk>
diff --git a/sysutils/memtest86+/Makefile b/sysutils/memtest86+/Makefile
index b0d9c6516491..d7af147888cf 100644
--- a/sysutils/memtest86+/Makefile
+++ b/sysutils/memtest86+/Makefile
@@ -1,76 +1,76 @@
 PORTNAME=	memtest86+
 PORTVERSION=	5.01
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.memtest.org/download/${PORTVERSION}/
 
 MAINTAINER=	avg@FreeBSD.org
 COMMENT=	Stand-alone memory test for x86 architecture computers
 WWW=		https://www.memtest.org/
 
 LICENSE=	GPLv2
 
 ONLY_FOR_ARCHS=	i386 amd64
 
 USES=	gmake
 ALL_TARGET=	all
 PORTDOCS=	*
 
 USE_GCC=	yes:build
 
 # Please provide absolute path below (cannot be root)
 BOOT_DIR?=	/boot/opt
 
 OPTIONS_DEFINE=	SERIAL HISPEED DOCS
 OPTIONS_DEFAULT=	BOOT
 OPTIONS_MULTI=	BOOT_TYPE
 OPTIONS_MULTI_BOOT_TYPE=	ISO BOOT
 ISO_DESC=	Build bootable ISO image
 BOOT_DESC=	Build ELF image loadable by boot2 and loader
 SERIAL_DESC=	Enable serial console at COM1/9600
 HISPEED_DESC=	Set COM1 serial console speed to 115200
 
 ISO_PLIST_FILES=	${DATADIR}/mt${PORTVERSION:C/\.//}.iso
 ISO_BUILD_DEPENDS=	genisoimage:sysutils/genisoimage
 ISO_ALL_TARGET=	iso
 BOOT_PLIST_FILES=	${BOOT_DIR}/memtest86+
 BOOT_PLIST_DIRS=	${BOOT_DIR}
 BOOT_SUB_FILES=	pkg-message
 BOOT_SUB_LIST+=	BOOT_DIR=${BOOT_DIR}
 
 pre-fetch:
 .if !defined(PACKAGE_BUILDING)
 	@${ECHO} "If you only need bootable ISO image of memtest86+, you can"
 	@${ECHO} "simply download it from http://www.memtest.org/.  Use this"
 	@${ECHO} "port if you need ELF image of memtest86+ that can be loaded"
 	@${ECHO} "by boot2 or loader(8), or if you want to use this port to"
 	@${ECHO} "build ISO image with custom tweaks in memtest86+ code."
 .endif
 
 .include <bsd.port.options.mk>
 
 post-patch:
 	${REINPLACE_CMD} -e 's|gcc|${CC}|' ${WRKSRC}/Makefile
 .if ${PORT_OPTIONS:MSERIAL}
 	${REINPLACE_CMD} -e 's|SERIAL_CONSOLE_DEFAULT 0|SERIAL_CONSOLE_DEFAULT 1|' ${WRKSRC}/config.h
 . if ${PORT_OPTIONS:MHISPEED}
 	${REINPLACE_CMD} -e 's|9600|115200|' ${WRKSRC}/config.h
 . endif
 .endif
 
 do-install:
 .if ${PORT_OPTIONS:MISO}
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/mt${PORTVERSION:C/\.//}.iso ${STAGEDIR}${DATADIR}
 .endif
 .if ${PORT_OPTIONS:MBOOT}
 	@${MKDIR} ${STAGEDIR}${BOOT_DIR}
 # XXX is INSTALL_KLD really appropriate here? XXX
 	${INSTALL_KLD} ${WRKSRC}/memtest ${STAGEDIR}${BOOT_DIR}/memtest86+
 .endif
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/sysutils/nut-devel/Makefile b/sysutils/nut-devel/Makefile
index f26a85a97d38..58e9f1d3baa5 100644
--- a/sysutils/nut-devel/Makefile
+++ b/sysutils/nut-devel/Makefile
@@ -1,177 +1,177 @@
 PORTNAME=	nut
 PORTVERSION=	${NUT_COMMIT_DATE}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 PKGNAMESUFFIX=	-devel
 # MASTER_SITES=	http://www.networkupstools.org/source/${PORTVERSION:R}/
 # DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 # EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	Network UPS Tools
 WWW=		https://www.networkupstools.org/
 
 LICENSE=	GPLv2+ GPLv3+ ART10 GPLv1+
 LICENSE_COMB=	multi
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 CONFLICTS=	nut-[0-9]*
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	networkupstools
 GH_TAGNAME=	73ee107fa
 NUT_COMMIT_DATE=	2023.04.13
 
 MAKE_JOBS_UNSAFE=	yes
 USE_GCC=	yes
 GNU_CONFIGURE=	yes
 USES=		autoreconf:build compiler:c11 gmake libtool pkgconfig python
 USE_LDCONFIG=	yes
 
 NUT_USER?=	nut
 NUT_GROUP?=	nut
 USERS=		${NUT_USER} 
 GROUPS=		${NUT_GROUP} dialer
 STATEDIR?=	/var/db/nut
 PLIST_SUB+=	NUT_USER=${NUT_USER}
 PLIST_SUB+=	NUT_GROUP=${NUT_GROUP}
 CGIDIR?=	${PREFIX}/www/cgi-bin/${PORTNAME}
 CGIDIR_REL?=	${CGIDIR:S,^${PREFIX}/,,}
 PLIST_SUB+=	CGIDIR="${CGIDIR_REL}"
 PLIST_SUB+=	CGIETCDIR="etc/nut/"
 
 OPTIONS_DEFAULT=	SERIAL USB SNMP NEON PDU MODBUS CGI BASH AVAHI FREEIPMI DOCS MANPAGES OPENSSL
 OPTIONS_DEFAULT_armv6=	SERIAL USB SNMP NEON PDU MODBUS CGI BASH AVAHI DOCS MANPAGES OPENSSL
 OPTIONS_DEFAULT_armv7=	SERIAL USB SNMP NEON PDU MODBUS CGI BASH AVAHI DOCS MANPAGES OPENSSL
 OPTIONS_DEFAULT_armv64=	SERIAL USB SNMP NEON PDU MODBUS CGI BASH AVAHI DOCS MANPAGES OPENSSL
 OPTIONS_DEFINE=	SERIAL USB SNMP NEON PDU MODBUS CGI BASH AVAHI IPMIPSU FREEIPMI DOCS MANPAGES
 OPTIONS_SINGLE=	SSL
 OPTIONS_SINGLE_SSL=	SSL_OFF OPENSSL NSS
 OPTIONS_SUB=	yes
 
 SERIAL_DESC=	SERIAL support
 USB_DESC=	USB support
 NEON_DESC=	NEON XML/HTTP support
 PDU_DESC=	Powerman PDU support
 MODBUS_DESC=	Modbus support
 CGI_DESC=	Web CGI interface
 FREEIPMI_DESC=	freeipmi support
 IPMIPSU_DESC=	Use nut-ipmipsu support (experimental)
 SSL_OFF_DESC=	No SSL support
 
 USE_RC_SUBR=	nut nut_upsmon nut_upslog
 SUB_LIST+=	STATEDIR=${STATEDIR} NUT_USER=${NUT_USER} NUT_GROUP=${NUT_GROUP}
 PLIST_SUB+=	STATEDIR=${STATEDIR}
 
 PORTDOCS=	*
 
 TMPDIR?=	/tmp
 INSTALL_TARGET=	install-strip
 CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc/nut \
 		--program-transform-name="" \
 		--localstatedir=${STATEDIR} \
 		--datadir=${PREFIX}/etc/nut \
 		--with-devd-dir=${PREFIX}/etc/devd \
 		--with-drvpath=${PREFIX}/libexec/nut \
 		--with-statepath=${STATEDIR} \
 		--with-altpidpath=${STATEDIR} \
 		--with-pidpath=${STATEDIR} \
 		--with-pkgconfig-dir=${PREFIX}/libdata/pkgconfig \
 		--with-user=${NUT_USER} \
 		--with-group=${NUT_GROUP} \
 		--with-python=${PYTHON_CMD} \
 		--without-python2 \
 		--with-python3=${PYTHON_CMD} \
 		--with-dev \
 		--with-ltdl --with-nut-scanner
 
 CFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
 LIB_DEPENDS+=	libltdl.so:devel/libltdl
 
 # XXX Remove this when copying this port to sysutils/nut. The GA version
 # XXX of nut ships with preformatted files and therefore does not need
 # XXX asciidoc.
 BUILD_DEPENDS=	asciidoc:textproc/asciidoc
 
 MANPAGES_CONFIGURE_ON=	--with-doc=man=auto
 MANPAGES_CONFIGURE_OFF=	--with-doc=no
 
 CGI_LIB_DEPENDS=	libgd.so:graphics/gd
 CGI_CONFIGURE_WITH=	cgi
 CGI_CONFIGURE_ON=	--with-cgipath=${CGIDIR} \
 			--with-htmlpath=${WWWDIR} \
 			--with-gd-includes=-I${LOCALBASE}/include \
 			--with-gd-libs="-L${LOCALBASE}/lib -lgd"
 
 SERIAL_CONFIGURE_WITH=	serial
 
 USB_CONFIGURE_WITH=	usb=auto
 
 SNMP_LIB_DEPENDS=	libnetsnmp.so:net-mgmt/net-snmp
 SNMP_CONFIGURE_WITH=	snmp
 
 NEON_LIB_DEPENDS=	libneon.so:www/neon
 NEON_CONFIGURE_WITH=	neon
 
 PDU_LIB_DEPENDS=	libpowerman.so:sysutils/powerman
 PDU_CONFIGURE_WITH=	powerman
 
 MODBUS_LIB_DEPENDS=	libmodbus.so:comms/libmodbus
 MODBUS_CONFIGURE_WITH=	modbus
 
 AVAHI_BUILD_DEPENDS=	${LOCALBASE}/include/avahi-ui/avahi-ui.h:net/avahi-header
 AVAHI_BUILD_DEPENDS=	avahi-daemon:net/avahi-app
 AVAHI_RUN_DEPENDS=	avahi-daemon:net/avahi-app
 AVAHI_CONFIGURE_WITH=	avahi
 
 FREEIPMI_LIB_DEPENDS=	libfreeipmi.so:sysutils/freeipmi
 FREEIPMI_CONFIGURE_WITH=freeipmi
 
 IPMIPSU_LIB_DEPENDS=	libfreeipmi.so:sysutils/freeipmi
 IPMIPSU_CONFIGURE_WITH=	ipmi
 
 OPENSSL_USES=		ssl
 OPENSSL_CONFIGURE_WITH=	openssl
 
 NSS_LIB_DEPENDS=	libnss3.so:security/nss
 NSS_CONFIGURE_WITH=	nss
 
 .include <bsd.port.pre.mk>
 
 post-patch:
 	@${REINPLACE_CMD} -i '' -e 's|python|${PYTHON_CMD}|' ${WRKSRC}/autogen.sh
 	@${FIND} ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} -i '' -e 's|/usr/bin/env python|${PYTHON_CMD}|'
 	@${FIND} ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} -i '' -e 's|/usr/local/ups|${PREFIX}|'
 
 pre-configure:
 	cd ${WRKSRC} && ./autogen.sh
 
 pre-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/libexec/nut
 .if ${PORT_OPTIONS:MUSB}
 	@${REINPLACE_CMD} -e 's/device-name\*/cdev/g' ${WRKSRC}/scripts/devd/nut-usb.conf
 .endif
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${STATEDIR}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/syslog.d
 .if ${PORT_OPTIONS:MBASH}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d/
 	${INSTALL_DATA} ${WRKSRC}/scripts/misc/nut.bash_completion ${STAGEDIR}${PREFIX}/etc/bash_completion.d/
 .endif
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/cables
 	${INSTALL_DATA} ${WRKSRC}/docs/cables/*.txt ${STAGEDIR}${DOCSDIR}/cables
 	${INSTALL_DATA} ${WRKSRC}/docs/*.txt ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/FAQ.txt ${STAGEDIR}${DOCSDIR}
 .for file in AUTHORS COPYING INSTALL MAINTAINERS NEWS README UPGRADING
 	${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR}
 .endfor
 .endif
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${PATCHDIR}/nut.syslog ${STAGEDIR}${EXAMPLESDIR}/syslog.sample
 	${INSTALL_DATA} ${PATCHDIR}/nut.newsyslog ${STAGEDIR}${EXAMPLESDIR}/newsyslog.sample
 	${INSTALL_DATA} ${PATCHDIR}/nut_upslog.sample ${STAGEDIR}${EXAMPLESDIR}/nut_upslog.sample
 	${MKDIR} ${STAGEDIR}/var/log/nut
 
 .include <bsd.port.post.mk>
diff --git a/sysutils/puppet-mode.el/Makefile b/sysutils/puppet-mode.el/Makefile
index 7a5f39ddcbbd..d4c1a4cb46df 100644
--- a/sysutils/puppet-mode.el/Makefile
+++ b/sysutils/puppet-mode.el/Makefile
@@ -1,28 +1,28 @@
 PORTNAME=	puppet-mode.el
 PORTVERSION=	0.2
-PORTREVISION=	13
+PORTREVISION=	15
 CATEGORIES=	sysutils elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	Simple mode for editing puppet manifests
 WWW=		https://github.com/puppetlabs/puppet-syntax-emacs
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		emacs
 USE_GITHUB=	yes
 GH_ACCOUNT=	puppetlabs
 GH_PROJECT=	puppet-syntax-emacs
 GH_TAGNAME=	be5d708
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 PLIST_FILES=	${EMACS_SITE_LISPDIR}/puppet-mode.el
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/puppet-mode.el ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}
 
 .include <bsd.port.mk>
diff --git a/sysutils/py-qmk/Makefile b/sysutils/py-qmk/Makefile
index 44e5c0acccb3..1c1fb16aff9a 100644
--- a/sysutils/py-qmk/Makefile
+++ b/sysutils/py-qmk/Makefile
@@ -1,50 +1,51 @@
 PORTNAME=	qmk
 DISTVERSION=	1.0.0
+PORTREVISION=	1
 CATEGORIES=	sysutils python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	0mp@FreeBSD.org
 COMMENT=	CLI program for working with QMK firmware
 WWW=		https://github.com/qmk/qmk_cli
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dotty-dict>=0:devel/py-dotty-dict@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}flake8>=0:devel/py-flake8@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}hid>=0:comms/py-hid@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}hjson>=0:textproc/py-hjson@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jsonschema>=3:devel/py-jsonschema@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}milc>=1.4.0:devel/py-milc@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}nose2>=0:devel/py-nose2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyrsistent>=0:devel/py-pyrsistent@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyusb>=0:devel/py-pyusb@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yapf>=0:textproc/py-yapf@${PY_FLAVOR} \
 		arm-none-eabi-gcc>0:devel/arm-none-eabi-gcc \
 		avr-gcc>0:devel/avr-gcc \
 		avr-libc>0:devel/avr-libc \
 		avrdude>0:devel/avrdude \
 		dfu-programmer>0:comms/dfu-programmer \
 		dfu-util>0:comms/dfu-util \
 		git:devel/git
 
 USES=		python shebangfix
 USE_PYTHON=	autoplist concurrent distutils
 SHEBANG_GLOB=	*.py
 
 # Upstream stopped providing a setup.py
 post-patch:
 	@${ECHO_CMD} 'import setuptools; setuptools.setup()' > ${WRKSRC}/setup.py
 
 TEST_ENV=	PYTHONPATH="${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}"
 TEST_TARGET=	config
 DO_MAKE_TEST=	${SETENV} ${TEST_ENV} ${STAGEDIR}${PREFIX}/bin/qmk >/dev/null
 
 NO_ARCH=	yes
 
 SUB_FILES=	pkg-message
 SUB_LIST=	PYTHON_CMD=${PYTHON_CMD}
 
 .include <bsd.port.mk>
diff --git a/sysutils/rpi-firmware/Makefile b/sysutils/rpi-firmware/Makefile
index e82ab20ebc74..639770dfe035 100644
--- a/sysutils/rpi-firmware/Makefile
+++ b/sysutils/rpi-firmware/Makefile
@@ -1,51 +1,52 @@
 PORTNAME=	rpi-firmware
 PORTVERSION=	1.20210303.g20210303
+PORTREVISION=	1
 CATEGORIES=	sysutils
 
 MAINTAINER=	uboot@FreeBSD.org
 COMMENT=	Firmware for RaspberryPi Single Board Computer
 WWW=		https://github.com/raspberrypi/firmware
 
 LICENSE=	BROADCOM
 LICENSE_NAME=	Broadcom Corporation
 LICENSE_FILE=	${WRKSRC}/boot/LICENCE.broadcom
 LICENSE_PERMS=	dist-mirror no-dist-sell pkg-mirror no-pkg-sell auto-accept
 
 BUILD_DEPENDS=	aarch64-none-elf-gcc:devel/aarch64-none-elf-gcc
 
 USE_GITHUB=	yes
 
 GH_ACCOUNT=	raspberrypi gonzoua:pscimon
 GH_PROJECT=	firmware rpi3-psci-monitor:pscimon
 FW_TAG=		fcf8d2f
 PSCI_TAG=	558620c
 GH_TAGNAME=	${FW_TAG} ${PSCI_TAG}:pscimon
 
 BUILD_WRKSRC=	${WRKSRC_pscimon}
 INSTALL_DIR=	${PREFIX}/share/${PORTNAME}
 
 CONFIG_TXT_FILES=	config.txt \
 			config_rpi_0_w.txt \
 			config_rpi3.txt \
 			config_rpi3_edk2.txt \
 			config_rpi4.txt \
 			config_arm64.txt
 
 do-patch:
 .for i in ${CONFIG_TXT_FILES}
 	${CP} ${FILESDIR}/${i} ${WRKSRC}/boot/
 .endfor
 
 post-patch:
 	${RM} ${WRKSRC}/boot/kernel.img
 	${RM} ${WRKSRC}/boot/kernel7.img
 	${RM} ${WRKSRC}/boot/kernel7l.img
 	${RM} ${WRKSRC}/boot/kernel8.img
 
 do-install:
 	${MKDIR} ${STAGEDIR}/${INSTALL_DIR}
 	cd ${WRKSRC}/boot && ${COPYTREE_SHARE} . ${STAGEDIR}/${INSTALL_DIR}/
 	${INSTALL_DATA} ${WRKSRC_pscimon}/armstub8.bin \
 	    ${WRKSRC_pscimon}/armstub8-gic.bin ${STAGEDIR}/${INSTALL_DIR}/
 
 .include <bsd.port.mk>
diff --git a/sysutils/shim/Makefile b/sysutils/shim/Makefile
index a986dbea37d5..d4b1061d1f98 100644
--- a/sysutils/shim/Makefile
+++ b/sysutils/shim/Makefile
@@ -1,40 +1,40 @@
 PORTNAME=	shim
 PORTVERSION=	0.9
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	sysutils
 
 MAINTAINER=	egypcio@FreeBSD.org
 COMMENT=	UEFI Secure Boot shim loader
 WWW=		https://github.com/mjg59/shim
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libgnuefi.a:devel/gnu-efi \
 		bash:shells/bash
 
 USES=		compiler gmake shebangfix
 USE_CSTD=	gnu99
 USE_GCC=	yes
 
 SHEBANG_FILES=	make-certs
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	mjg59
 
 MAKE_ARGS=	CC="${CC} ${CFLAGS:M-std=*}" LD="${LD}" OBJCOPY="${OBJCOPY}"
 MAKE_JOBS_UNSAFE=	yes
 
 PLIST_FILES=	lib/shim/shim.pem lib/shim/shim.key \
 		lib/shim/MokManager.efi lib/shim/fallback.efi lib/shim/shim.efi
 
 do-install:
 	# Note that before this step, the shim.pem contains the _private_ key.
 	openssl x509 -inform der -in ${WRKSRC}/shim.cer -outform pem -out ${WRKSRC}/shim.pem
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/shim
 	${INSTALL_DATA} -m 600 ${WRKSRC}/shim.key ${STAGEDIR}${PREFIX}/lib/shim
 .for file in shim.pem MokManager.efi fallback.efi shim.efi
 	${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${PREFIX}/lib/shim
 .endfor
 
 .include <bsd.port.mk>
diff --git a/sysutils/slurm-wlm/Makefile b/sysutils/slurm-wlm/Makefile
index cf7909c844d1..acc08dafa461 100644
--- a/sysutils/slurm-wlm/Makefile
+++ b/sysutils/slurm-wlm/Makefile
@@ -1,138 +1,138 @@
 PORTNAME=	slurm
 DISTVERSION=	20.02.7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils python
 MASTER_SITES=	https://ftp.icm.edu.pl/packages/slurm/
 PKGNAMESUFFIX=	-wlm
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple Linux Utility for Resource Management
 WWW=		https://slurm.schedmd.com/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 NOT_FOR_ARCHS=		armv6 armv7 i386 mips powerpc powerpcspe
 NOT_FOR_ARCHS_REASON=	32-bit support is deprecated
 
 LIB_DEPENDS=	libjson-c.so:devel/json-c \
 		libsysinfo.so:devel/libsysinfo \
 		libmunge.so:security/munge \
 		liblz4.so:archivers/liblz4
 
 USES=		compiler:c11 cpe gmake gnome libtool localbase lua perl5 \
 		pkgconfig python:build readline shebangfix ssl tar:bz2
 USE_PERL5=	build
 CPE_VENDOR=	schedmd
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	slurmctld slurmd
 
 USERS=		slurm
 GROUPS=		${USERS}
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 PLIST_SUB=	PORTVERSION="${PORTVERSION}"
 SHEBANG_FILES=	doc/html/shtml2html.py doc/man/man2html.py
 
 OPTIONS_DEFINE=		CURL DOCS GUI HDF5 HWLOC IPMI MYSQL RRD
 OPTIONS_DEFAULT=	HDF5 HWLOC
 OPTIONS_SUB=		yes
 
 CURL_DESC=	Require cURL for elasticsearch plugins
 GUI_DESC=	Build sview GUI config tool
 HDF5_DESC=	Job profiling using HDF5
 HWLOC_DESC=	Portable hardware locality
 IPMI_DESC=	IPMI energy consumption accounting
 RRD_DESC=	RRD external sensor data collection
 
 DOCS_BUILD_DEPENDS=	man2html:textproc/man2html
 
 CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 CURL_CONFIGURE_WITH=	libcurl
 
 GUI_USE=		GNOME=cairo,gdkpixbuf2,glib20,gtk20
 GUI_LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 			libfreetype.so:print/freetype2
 GUI_USES=		gettext
 GUI_CONFIGURE_ENABLE=	glibtest gtktest x11
 # Neither of these work.  See post-patch below.
 #GTK2_CONFIGURE_ENV_OFF=	ac_gtk_test=no
 #GTK2_CONFIGURE_OFF=	--disable-gtktest
 
 HDF5_LIB_DEPENDS=	libhdf5_cpp.so:science/hdf5 \
 			libsz.so:science/libaec
 HDF5_CONFIGURE_WITH=	hdf5
 HDF5_CONFIGURE_ENV=	H5CC=${LOCALBASE}/bin/h5cc
 
 HWLOC_LIB_DEPENDS=	libhwloc.so.15:devel/hwloc2
 HWLOC_CONFIGURE_WITH=	hwloc
 
 IPMI_LIB_DEPENDS=	libfreeipmi.so:sysutils/freeipmi
 IPMI_CONFIGURE_WITH=	freeipmi
 
 MYSQL_USES=		mysql
 MYSQL_CONFIGURE_OFF=	--with-mysql_config=/nonexistent
 
 RRD_LIB_DEPENDS=	librrd.so:databases/rrdtool
 RRD_CONFIGURE_WITH=	rrdtool
 
 # --docdir is non-functional
 # CONFIGURE_ARGS=	--docdir=${DOCSDIR}
 # FreeBSD Infiniband support is still experimental
 # slurmrestd does not build on FreeBSD
 CONFIGURE_ARGS=	--without-ofed --disable-slurmrestd
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${DISTVERSION}
 
 CFLAGS+=	-I${WRKSRC}/slurm -I${LOCALBASE}/include -fcommon
 LDFLAGS+=	-L${LOCALBASE}/lib -lsysinfo -lprocstat -fcommon
 
 # Hack around nonfunctional --disable-gtktest flag
 pre-configure-GUI-off:
 	@${REINPLACE_CMD} -e 's|min_gtk_version=.*|min_gtk_version=2000.0.0|' \
 		${WRKSRC}/configure
 
 # SLURM's configure enables interactive jobs if pty.h exists.  Replacing
 # #include <pty.h> with appropriate headers will therefore not work, so instead
 # add a pty.h for the build.
 pre-configure:
 	@${CP} ${FILESDIR}/pty.h ${WRKSRC}/slurm
 	@${REINPLACE_CMD} -e 's|sched_setaffinity|cpuset_setaffinity|g' \
 		-e 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/configure
 
 	@${REINPLACE_CMD} -e 's|"/proc|"/compat/linux/proc|g' \
 		-e 's|(/proc)|(/compat/linux/proc)|g' \
 		${WRKSRC}/src/slurmd/slurmstepd/req.c \
 		${WRKSRC}/src/slurmd/slurmstepd/pdebug.c \
 		${WRKSRC}/src/slurmd/common/xcpuinfo.c \
 		${WRKSRC}/src/slurmd/common/xcgroup.c \
 		${WRKSRC}/src/slurmd/common/set_oomadj.c \
 		${WRKSRC}/src/slurmd/common/proctrack.c \
 		${WRKSRC}/src/common/callerid.c \
 		${WRKSRC}/src/plugins/task/affinity/affinity.c \
 		${WRKSRC}/src/plugins/acct_gather_energy/rapl/acct_gather_energy_rapl.c \
 		${WRKSRC}/src/plugins/jobacct_gather/cgroup/jobacct_gather_cgroup.c \
 		${WRKSRC}/src/plugins/jobacct_gather/common/common_jag.c \
 		${WRKSRC}/src/plugins/jobacct_gather/linux/jobacct_gather_linux.c \
 		${WRKSRC}/src/plugins/switch/cray_aries/scaling.c \
 		${WRKSRC}/src/plugins/proctrack/cray_aries/proctrack_cray_aries.c \
 		${WRKSRC}/src/plugins/proctrack/cgroup/proctrack_cgroup.c \
 		${WRKSRC}/src/plugins/proctrack/pgid/proctrack_pgid.c \
 		${WRKSRC}/src/plugins/proctrack/linuxproc/kill_tree.c \
 		${WRKSRC}/src/plugins/acct_gather_filesystem/lustre/acct_gather_filesystem_lustre.c \
 		${WRKSRC}/src/plugins/node_features/knl_generic/node_features_knl_generic.c \
 		${WRKSRC}/contribs/cray/pam_job.c
 
 	@if ${WHICH} sbatch > /dev/null; then \
 		${ECHO_CMD} "********************************************"; \
 		${ECHO_CMD} "Build may fail while slurm-wlm is installed."; \
 		${ECHO_CMD} "Deinstall slurm-wlm and run make again."; \
 		${ECHO_CMD} "********************************************"; \
 		false; \
 	fi
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/etc/slurm.conf.example \
 		${STAGEDIR}${PREFIX}/etc/slurm.conf.sample
 
 .include <bsd.port.mk>
diff --git a/sysutils/u-boot-utilite/Makefile b/sysutils/u-boot-utilite/Makefile
index 9e2d5afa22df..c7e0900985da 100644
--- a/sysutils/u-boot-utilite/Makefile
+++ b/sysutils/u-boot-utilite/Makefile
@@ -1,53 +1,53 @@
 PORTNAME=	u-boot
 PORTVERSION=	2015.07
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.denx.de/pub/u-boot/:source1 \
 		http://www.compulab.co.il/wp-content/uploads/2015/10/:source2
 PKGNAMESUFFIX=	-utilite
 DISTFILES=	u-boot-2015.07.tar.bz2:source1 \
 		cm-fx6_u-boot_2015-10-18.zip:source2
 
 MAINTAINER=	martin@waschbuesch.de
 COMMENT=	Cross-build U-Boot loader for Utilite (and Utilite Pro)
 WWW=		https://www.denx.de/wiki/U-Boot
 
 LICENSE=	GPLv2
 
 DEPRECATED=	This port depends on the long time unsupported upstream devel/arm-none-eabi-gcc492.
 EXPIRATION_DATE=	2023-04-30
 
 BUILD_DEPENDS=	${CROSS_GCC}:devel/arm-none-eabi-gcc492
 
 USES=		gmake
 
 MAKE_ARGS+=     ARCH=arm \
                 CC=${CROSS_GCC} \
                 CROSS_COMPILE=arm-none-eabi- \
                 HOSTCC=cc
 
 EXTRA_PATCHES=	${WRKDIR}/cm-fx6-u-boot/u-boot/u-boot-2015.07-cm-fx6-3.patch:-p1
 
 NO_ARCH=	yes
 
 PORTSCOUT=	ignore:1
 
 U_BOOT_DIR=	share/u-boot/${PORTNAME}${PKGNAMESUFFIX}
 
 do-configure:
 	cd ${WRKSRC}; ${MAKE_CMD} ${MAKE_ARGS} cm_fx6_config
 
 CROSS_GCC=	arm-none-eabi-gcc-4.9.2
 
 # The build results in two output files: SPL, and u-boot.img.
 # Combine them into a single u-boot.imx so that there is only one file to be
 # copied onto the boot media starting at a 1K offset on the disk.
 CM_FX6_FIRMWARE=	${STAGEDIR}/${PREFIX}/${U_BOOT_DIR}/cm-fx6-firmware
 do-install:
 	cd ${WRKSRC}; ./tools/mkimage -n arch/arm/imx-common/spl_sd.cfg.cfgtmp -T imximage -e 0x00908000 -d spl/u-boot-spl.bin spl.img
 	${MKDIR} ${STAGEDIR}/${PREFIX}/${U_BOOT_DIR}
 	dd if=/dev/zero count=500 bs=1K | ${TR} '\000' '\377' > ${CM_FX6_FIRMWARE}
 	dd if=${WRKSRC}/spl.img of=${CM_FX6_FIRMWARE} bs=1K seek=1 conv=notrunc && dd if=${WRKSRC}/u-boot.img of=${CM_FX6_FIRMWARE} bs=1K seek=64 conv=notrunc
 	${INSTALL_DATA} ${DESCR} ${STAGEDIR}/${PREFIX}/${U_BOOT_DIR}/README
 
 .include <bsd.port.mk>
diff --git a/sysutils/uefi-edk2-bhyve-csm/Makefile b/sysutils/uefi-edk2-bhyve-csm/Makefile
index e9cfba6350e0..3bec471bee58 100644
--- a/sysutils/uefi-edk2-bhyve-csm/Makefile
+++ b/sysutils/uefi-edk2-bhyve-csm/Makefile
@@ -1,78 +1,78 @@
 PORTNAME=	uefi-edk2-bhyve-csm
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.2
-PORTREVISION=	3
+PORTREVISION=	4
 PORTEPOCH=	1
 CATEGORIES=	sysutils
 
 MAINTAINER=	bcran@FreeBSD.org
 COMMENT=	UEFI EDK2 firmware for bhyve with CSM (16-bit BIOS)
 WWW=		https://github.com/freebsd/uefi-edk2/tree/bhyve/UDK2014.SP1
 
 LICENSE=	BSD2CLAUSE
 
 DEPRECATED=     Requires old edk2 version and gcc 4.8.
 EXPIRATION_DATE=2024-04-01
 
 ONLY_FOR_ARCHS=	amd64
 
 BUILD_DEPENDS=	bash:shells/bash \
 		nasm:devel/nasm \
 		${PYTHON_LIBDIR}/lib-dynload/_sqlite3.so:databases/py-sqlite3@${PY_FLAVOR}
 
 USES=		gmake \
 		python:2.7,build
 USE_GCC=	4.8:build
 USE_GITHUB=	yes
 GH_ACCOUNT=	freebsd
 GH_PROJECT=	uefi-edk2
 GH_TAGNAME=	aa8d718
 
 PLIST_FILES=	${PREFIX}/share/uefi-firmware/BHYVE_UEFI_CSM.fd
 
 OPTIONS_DEFINE=	DEBUG
 
 DEBUG_VARS=	uefi_target=DEBUG
 DEBUG_VARS_OFF=	uefi_target=RELEASE
 
 MAKE_ARGS+=	AS=${LOCALBASE}/bin/as \
 		AR=${LOCALBASE}/bin/ar \
 		LD=${LOCALBASE}/bin/ld \
 		OBJCOPY=${LOCALBASE}/bin/objcopy \
 		CC=${LOCALBASE}/bin/gcc48 \
 		CXX=${LOCALBASE}/bin/g++48
 
 BUILD_ARGS=-DDEBUG_ON_SERIAL_PORT=TRUE -D FD_SIZE_2MB -DCSM_ENABLE=TRUE
 
 post-extract:
 	@${REINPLACE_CMD} -e 's|python|${PYTHON_CMD}|' ${WRKSRC}/BaseTools/Tests/GNUmakefile \
 							${WRKSRC}/BaseTools/BinWrappers/PosixLike/*
 
 do-build:
 	unset ARCH; unset MAKEFLAGS; ${MAKE_CMD} ${MAKE_ARGS} -C ${BUILD_WRKSRC}/BaseTools
 	${MKDIR} ${BUILD_WRKSRC}/Build;
 	${LN} -sf ${LOCALBASE}/bin/gcc48 ${BUILD_WRKSRC}/Build/gcc
 	${LN} -sf ${LOCALBASE}/bin/ld ${BUILD_WRKSRC}/Build/ld
 	${LN} -sf ${LOCALBASE}/bin/gmake ${BUILD_WRKSRC}/Build/make
 	${LN} -sf ${LOCALBASE}/bin/ar ${BUILD_WRKSRC}/Build/ar
 	${LN} -sf ${LOCALBASE}/bin/objcopy ${BUILD_WRKSRC}/Build/objcopy
 	${LN} -sf ${LOCALBASE}/bin/nasm ${BUILD_WRKSRC}/Build/nasm
 	bash -c " \
 		cd ${BUILD_WRKSRC}; \
 		source edksetup.sh;\
 		unset ARCH; unset MAKEFLAGS; \
 		${MAKE_CMD} ${MAKE_ARGS} GCC48_BIN=${BUILD_WRKSRC}/Build/ -C ${BUILD_WRKSRC}/BhyvePkg/Csm/BhyveCsm16/"
 	bash -c " \
 		cd ${BUILD_WRKSRC}; \
 		source edksetup.sh;\
 		unset ARCH; unset MAKEFLAGS; \
 		export GCC48_BIN=${BUILD_WRKSRC}/Build/; \
 		build -t GCC48 -a X64 -b ${UEFI_TARGET} -p BhyvePkg/BhyvePkgX64.dsc ${BUILD_ARGS} \
 	"
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/uefi-firmware/
 	${INSTALL} ${BUILD_WRKSRC}/Build/BhyveX64/${UEFI_TARGET}_GCC48/FV/BHYVE.fd \
 		${STAGEDIR}${PREFIX}/share/uefi-firmware/BHYVE_UEFI_CSM.fd
 
 .include <bsd.port.mk>
diff --git a/sysutils/wiimms/Makefile b/sysutils/wiimms/Makefile
index e852adff5896..da85ae0c329c 100644
--- a/sysutils/wiimms/Makefile
+++ b/sysutils/wiimms/Makefile
@@ -1,48 +1,48 @@
 PORTNAME=	wiimms
 DISTVERSION=	2.23a
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	sysutils
 MASTER_SITES=	http://gugus69.free.fr/wiimms/ \
 		LOCAL/martymac
 DISTNAME=	wit-${DISTVERSION}
 
 MAINTAINER=	olivier@FreeBSD.org
 COMMENT=	Wiimms ISO Tools
 WWW=		https://wit.wiimm.de/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/gpl-2.0.txt
 
 BUILD_DEPENDS=	bash:shells/bash
 RUN_DEPENDS=	bash:shells/bash
 
 WRKSRC=	${WRKDIR}/wiimms-iso-tools
 USES+=		gmake
 USE_GCC=	yes
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/bin/bash|${LOCALBASE}/bin/bash|g' \
 		${WRKSRC}/*.sh \
 		${WRKSRC}/scripts/*.sh \
 		${WRKSRC}/setup/*.sh \
 		${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -e 's|/share/wit|/share/wiimms|g' \
 		${WRKSRC}/Makefile
 
 pre-configure:
 	@${CHMOD} +x ${WRKSRC}/setup.sh
 
 do-configure:
 	@cd ${WRKSRC} && ./setup.sh
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/wit ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/wwt ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/wdf ${STAGEDIR}${PREFIX}/bin
 	${LN} -sf wdf ${STAGEDIR}${PREFIX}/bin/wdf-cat
 	${LN} -sf wdf ${STAGEDIR}${PREFIX}/bin/wdf-dump
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/share/* ${STAGEDIR}${DATADIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/load-titles.sh ${STAGEDIR}${DATADIR}
 
 .include <bsd.port.mk>
diff --git a/textproc/R-cran-DT/Makefile b/textproc/R-cran-DT/Makefile
index 072593ba5dd5..5208c276c4cc 100644
--- a/textproc/R-cran-DT/Makefile
+++ b/textproc/R-cran-DT/Makefile
@@ -1,24 +1,25 @@
 PORTNAME=	DT
 PORTVERSION=	0.25
+PORTREVISION=	1
 CATEGORIES=	textproc
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Wrapper of the JavaScript Library 'DataTables'
 WWW=		https://cran.r-project.org/web/packages/DT/
 
 LICENSE=	GPLv3
 
 CRAN_DEPENDS=	R-cran-htmltools>=0.3.6:textproc/R-cran-htmltools \
 		R-cran-htmlwidgets>=1.3:www/R-cran-htmlwidgets \
 		R-cran-jsonlite>=0.9.16:converters/R-cran-jsonlite \
 		R-cran-magrittr>0:devel/R-cran-magrittr \
 		R-cran-crosstalk>0:www/R-cran-crosstalk \
 		R-cran-jquerylib>0:www/R-cran-jquerylib \
 		R-cran-promises>0:devel/R-cran-promises
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=	cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/textproc/R-cran-R2HTML/Makefile b/textproc/R-cran-R2HTML/Makefile
index 1ebb694dd769..0d20a2e764f5 100644
--- a/textproc/R-cran-R2HTML/Makefile
+++ b/textproc/R-cran-R2HTML/Makefile
@@ -1,14 +1,15 @@
 PORTNAME=	R2HTML
 PORTVERSION=	2.3.3
+PORTREVISION=	1
 CATEGORIES=	textproc
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	HTML exportation for R objects
 WWW=		https://cran.r-project.org/package=R2HTML
 
 LICENSE=	GPLv2
 
 USES=		cran
 
 .include <bsd.port.mk>
diff --git a/textproc/R-cran-XML/Makefile b/textproc/R-cran-XML/Makefile
index 9095e71ccc0f..aa00f9b6b357 100644
--- a/textproc/R-cran-XML/Makefile
+++ b/textproc/R-cran-XML/Makefile
@@ -1,15 +1,16 @@
 PORTNAME=	XML
 DISTVERSION=	3.99-0.10
+PORTREVISION=	1
 CATEGORIES=	textproc
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Tools for parsing and generating XML
 WWW=		https://cran.r-project.org/web/packages/XML/
 
 LICENSE=	BSD3CLAUSE
 
 USES=		cran:auto-plist,compiles gnome
 USE_GNOME=	libxml2
 
 .include <bsd.port.mk>
diff --git a/textproc/R-cran-bibtex/Makefile b/textproc/R-cran-bibtex/Makefile
index d91619c6bd73..b21c101d75e4 100644
--- a/textproc/R-cran-bibtex/Makefile
+++ b/textproc/R-cran-bibtex/Makefile
@@ -1,18 +1,19 @@
 PORTNAME=	bibtex
 DISTVERSION=	0.4.2.3
+PORTREVISION=	1
 CATEGORIES=	textproc
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Bibtex Parser
 WWW=		https://cran.r-project.org/web/packages/bibtex/
 
 LICENSE=	GPLv2+
 
 CRAN_DEPENDS=	R-cran-stringr>0:textproc/R-cran-stringr
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/textproc/R-cran-brew/Makefile b/textproc/R-cran-brew/Makefile
index af93f9353f93..5c0c96658d1e 100644
--- a/textproc/R-cran-brew/Makefile
+++ b/textproc/R-cran-brew/Makefile
@@ -1,14 +1,15 @@
 PORTNAME=	brew
 DISTVERSION=	1.0-7
+PORTREVISION=	1
 CATEGORIES=	textproc
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Templating Framework for Report Generation
 WWW=		https://cran.r-project.org/web/packages/brew/
 
 LICENSE=	GPLv2
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/textproc/R-cran-cellranger/Makefile b/textproc/R-cran-cellranger/Makefile
index 7cf7029dac69..81e7ce4391f4 100644
--- a/textproc/R-cran-cellranger/Makefile
+++ b/textproc/R-cran-cellranger/Makefile
@@ -1,24 +1,24 @@
 PORTNAME=	cellranger
 DISTVERSION=	1.1.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	textproc
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Translate Spreadsheet Cell Ranges to Rows and Columns
 WWW=		https://github.com/rsheets/cellranger
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	R-cran-knitr>0:print/R-cran-knitr
 RUN_DEPENDS=	R-cran-tibble>0:devel/R-cran-tibble \
 		R-cran-rematch>0:textproc/R-cran-rematch
 TEST_DEPENDS=	R-cran-covr>0:devel/R-cran-covr \
 		R-cran-testthat>=1.0.0:devel/R-cran-testthat \
 		R-cran-knitr>0:print/R-cran-knitr \
 		R-cran-rmarkdown>0:textproc/R-cran-rmarkdown
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/textproc/R-cran-commonmark/Makefile b/textproc/R-cran-commonmark/Makefile
index 75ea7025e04d..2f0bcb316dc7 100644
--- a/textproc/R-cran-commonmark/Makefile
+++ b/textproc/R-cran-commonmark/Makefile
@@ -1,14 +1,15 @@
 PORTNAME=	commonmark
 DISTVERSION=	1.8.0
+PORTREVISION=	1
 CATEGORIES=	textproc
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	High Performance CommonMark and Github Markdown Rendering in R
 WWW=		https://cran.r-project.org/web/packages/commonmark/
 
 LICENSE=	BSD2CLAUSE
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/textproc/R-cran-formatR/Makefile b/textproc/R-cran-formatR/Makefile
index cf7803185c3e..5c2e36d15bb6 100644
--- a/textproc/R-cran-formatR/Makefile
+++ b/textproc/R-cran-formatR/Makefile
@@ -1,14 +1,15 @@
 PORTNAME=	formatR
 DISTVERSION=	1.12
+PORTREVISION=	1
 CATEGORIES=	textproc
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Format R Code Automatically
 WWW=		https://cran.r-project.org/web/packages/formatR/
 
 LICENSE=	GPLv2+
 
 USES=	cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/textproc/R-cran-highr/Makefile b/textproc/R-cran-highr/Makefile
index f81b3d593f30..81e819d022e4 100644
--- a/textproc/R-cran-highr/Makefile
+++ b/textproc/R-cran-highr/Makefile
@@ -1,18 +1,19 @@
 PORTNAME=	highr
 PORTVERSION=	0.9
+PORTREVISION=	1
 CATEGORIES=	textproc
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Syntax Highlighting for R Source Code
 WWW=		https://cran.r-project.org/web/packages/highr/
 
 LICENSE=	GPLv2+
 
 CRAN_DEPENDS=	R-cran-xfun>=0.18:misc/R-cran-xfun
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=	cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/textproc/R-cran-htmlTable/Makefile b/textproc/R-cran-htmlTable/Makefile
index 9117866d1ca1..8901bbc00ad9 100644
--- a/textproc/R-cran-htmlTable/Makefile
+++ b/textproc/R-cran-htmlTable/Makefile
@@ -1,22 +1,23 @@
 PORTNAME=	htmlTable
 DISTVERSION=	2.4.0
+PORTREVISION=	1
 CATEGORIES=	textproc
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	skreuzer@FreeBSD.org
 COMMENT=	Advanced tables for Markdown/HTML
 WWW=		https://cran.r-project.org/web/packages/htmlTable/
 
 LICENSE=	GPLv3
 
 CRAN_DEPENDS=	R-cran-stringr>0:textproc/R-cran-stringr \
 		R-cran-knitr>0:print/R-cran-knitr \
 		R-cran-htmlwidgets>0:www/R-cran-htmlwidgets \
 		R-cran-rstudioapi>0:devel/R-cran-rstudioapi \
 		R-cran-checkmate>0:devel/R-cran-checkmate
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/textproc/R-cran-htmltools/Makefile b/textproc/R-cran-htmltools/Makefile
index acb8feb56ce0..2d7b31bc1268 100644
--- a/textproc/R-cran-htmltools/Makefile
+++ b/textproc/R-cran-htmltools/Makefile
@@ -1,21 +1,22 @@
 PORTNAME=	htmltools
 PORTVERSION=	0.5.3
+PORTREVISION=	1
 CATEGORIES=	textproc
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Tools for HTML generation and output
 WWW=		https://cran.r-project.org/web/packages/htmltools/
 
 LICENSE=	GPLv2+
 
 CRAN_DEPENDS=	R-cran-digest>0:security/R-cran-digest \
 		R-cran-base64enc>0:converters/R-cran-base64enc \
 		R-cran-rlang>=0.4.10:devel/R-cran-rlang \
 		R-cran-fastmap>=1.1.0:databases/R-cran-fastmap
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=	cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/textproc/R-cran-hunspell/Makefile b/textproc/R-cran-hunspell/Makefile
index 63f4e6edc11a..ebd2ac3954ac 100644
--- a/textproc/R-cran-hunspell/Makefile
+++ b/textproc/R-cran-hunspell/Makefile
@@ -1,23 +1,24 @@
 PORTNAME=	hunspell
 DISTVERSION=	3.0.2
+PORTREVISION=	1
 CATEGORIES=	textproc
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	ygy@FreeBSD.org
 COMMENT=	High-Performance Stemmer, Tokenizer, and Spell Checker
 WWW=		https://docs.ropensci.org/hunspell/
 
 LICENSE=	GPLv2 LGPL21 MPL11
 LICENSE_COMB=	dual
 
 BUILD_DEPENDS=	R-cran-knitr>0:print/R-cran-knitr
 RUN_DEPENDS=	R-cran-Rcpp>0:devel/R-cran-Rcpp \
 		R-cran-digest>0:security/R-cran-digest
 TEST_DEPENDS=	R-cran-testthat>0:devel/R-cran-testthat \
 		R-cran-knitr>0:print/R-cran-knitr \
 		R-cran-rmarkdown>0:textproc/R-cran-rmarkdown \
 		R-cran-spelling>0:textproc/R-cran-spelling
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/textproc/R-cran-markdown/Makefile b/textproc/R-cran-markdown/Makefile
index 5b5196a0aaee..75987224622c 100644
--- a/textproc/R-cran-markdown/Makefile
+++ b/textproc/R-cran-markdown/Makefile
@@ -1,20 +1,20 @@
 PORTNAME=	markdown
 PORTVERSION=	1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Markdown Rendering for R
 WWW=		https://cran.r-project.org/web/packages/markdown/
 
 LICENSE=	GPLv2
 
 CRAN_DEPENDS=	R-cran-xfun>0:misc/R-cran-xfun \
 		R-cran-mime>=0.3:misc/R-cran-mime
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/textproc/R-cran-openxlsx/Makefile b/textproc/R-cran-openxlsx/Makefile
index cf157580aecd..7e44ce1be1bd 100644
--- a/textproc/R-cran-openxlsx/Makefile
+++ b/textproc/R-cran-openxlsx/Makefile
@@ -1,20 +1,21 @@
 PORTNAME=	openxlsx
 DISTVERSION=	4.2.5.2
+PORTREVISION=	1
 CATEGORIES=	textproc
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Read, Write and Edit XLSX Files
 WWW=		https://github.com/awalker89/openxlsx
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	R-cran-knitr>0:print/R-cran-knitr
 RUN_DEPENDS=	R-cran-zip>0:archivers/R-cran-zip \
 		R-cran-Rcpp>0:devel/R-cran-Rcpp
 TEST_DEPENDS=	R-cran-knitr>0:print/R-cran-knitr
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/textproc/R-cran-pystr/Makefile b/textproc/R-cran-pystr/Makefile
index 280cf2763c92..40c2371b8f85 100644
--- a/textproc/R-cran-pystr/Makefile
+++ b/textproc/R-cran-pystr/Makefile
@@ -1,15 +1,15 @@
 PORTNAME=	pystr
-PORTREVISION=	5
+PORTREVISION=	6
 DISTVERSION=	2.0.0
 CATEGORIES=	textproc
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	skreuzer@FreeBSD.org
 COMMENT=	String operations the Python way
 WWW=		http://cran.r-project.org/web/pystr/
 
 RUN_DEPENDS=	R-cran-Rcpp>=0.11.4.6:devel/R-cran-Rcpp
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/textproc/R-cran-rbibutils/Makefile b/textproc/R-cran-rbibutils/Makefile
index 6eaab7ca81e4..2c906b98b62f 100644
--- a/textproc/R-cran-rbibutils/Makefile
+++ b/textproc/R-cran-rbibutils/Makefile
@@ -1,14 +1,15 @@
 PORTNAME=	rbibutils
 PORTVERSION=	2.2.9
+PORTREVISION=	1
 CATEGORIES=	textproc
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Convert Between Bibliography Formats
 WWW=		https://cran.r-project.org/web/packages/rbibutils/
 
 LICENSE=	GPLv2
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/textproc/R-cran-readr/Makefile b/textproc/R-cran-readr/Makefile
index ee5a143a4911..e25934ed321b 100644
--- a/textproc/R-cran-readr/Makefile
+++ b/textproc/R-cran-readr/Makefile
@@ -1,28 +1,29 @@
 PORTNAME=	readr
 PORTVERSION=	2.1.2
+PORTREVISION=	1
 CATEGORIES=	textproc
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Read Rectangular Text Data
 WWW=		https://cran.r-project.org/web/packages/readr/
 
 LICENSE=	MIT
 
 CRAN_DEPENDS=	R-cran-cli>0:devel/R-cran-cli \
 		R-cran-clipr>0:devel/R-cran-clipr \
 		R-cran-crayon>0:devel/R-cran-crayon \
 		R-cran-hms>=0.4.1:devel/R-cran-hms \
 		R-cran-lifecycle>=0.2.0:devel/R-cran-lifecycle \
 		R-cran-R6>0:devel/R-cran-R6 \
 		R-cran-rlang>0:devel/R-cran-rlang \
 		R-cran-tibble>0:devel/R-cran-tibble \
 		R-cran-vroom>=1.5.6:textproc/R-cran-vroom \
 		R-cran-cpp11>0:devel/R-cran-cpp11 \
 		R-cran-tzdb>=0.1.1:devel/R-cran-tzdb
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		compiler:c++11-lang cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/textproc/R-cran-readxl/Makefile b/textproc/R-cran-readxl/Makefile
index df92aed4ba11..5bde5ba15789 100644
--- a/textproc/R-cran-readxl/Makefile
+++ b/textproc/R-cran-readxl/Makefile
@@ -1,27 +1,28 @@
 PORTNAME=	readxl
 DISTVERSION=	1.4.1
+PORTREVISION=	1
 CATEGORIES=	textproc
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Read Excel Files
 WWW=		https://readxl.tidyverse.org
 
 LICENSE=	MIT
 
 BUILD_DEPENDS=	R-cran-knitr>0:print/R-cran-knitr \
 		R-cran-cpp11>=0.4.0:devel/R-cran-cpp11 \
 		R-cran-progress>0:devel/R-cran-progress
 RUN_DEPENDS=	R-cran-cpp11>=0.4.0:devel/R-cran-cpp11 \
 		R-cran-tibble>=1.3.1:devel/R-cran-tibble \
 		R-cran-cellranger>0:textproc/R-cran-cellranger \
 		R-cran-progress>0:devel/R-cran-progress
 TEST_DEPENDS=	R-cran-covr>0:devel/R-cran-covr \
 		R-cran-rprojroot>=1.1:devel/R-cran-rprojroot \
 		R-cran-testthat>0:devel/R-cran-testthat \
 		R-cran-knitr>0:print/R-cran-knitr \
 		R-cran-rmarkdown>0:textproc/R-cran-rmarkdown
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/textproc/R-cran-rematch/Makefile b/textproc/R-cran-rematch/Makefile
index 2575c501a927..9f5b34d105e0 100644
--- a/textproc/R-cran-rematch/Makefile
+++ b/textproc/R-cran-rematch/Makefile
@@ -1,16 +1,16 @@
 PORTNAME=	rematch
 DISTVERSION=	1.0.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	textproc
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Match Regular Expressions with a Nicer 'API'
 WWW=		https://github.com/MangoTheCat/rematch
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/textproc/R-cran-rex/Makefile b/textproc/R-cran-rex/Makefile
index d0aaa5f8868e..470b8bb37389 100644
--- a/textproc/R-cran-rex/Makefile
+++ b/textproc/R-cran-rex/Makefile
@@ -1,29 +1,30 @@
 PORTNAME=	rex
 DISTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES=	textproc
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	ygy@FreeBSD.org
 COMMENT=	Friendly Regular Expressions
 WWW=		https://github.com/kevinushey/rex
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	R-cran-knitr>0:print/R-cran-knitr
 RUN_DEPENDS=	R-cran-lazyeval>0:math/R-cran-lazyeval
 TEST_DEPENDS=	R-cran-Hmisc>0:devel/R-cran-Hmisc \
 		R-cran-covr>0:devel/R-cran-covr \
 		R-cran-magrittr>0:devel/R-cran-magrittr \
 		R-cran-roxygen2>0:devel/R-cran-roxygen2 \
 		R-cran-testthat>0:devel/R-cran-testthat \
 		R-cran-ggplot2>0:graphics/R-cran-ggplot2 \
 		R-cran-dplyr>0:math/R-cran-dplyr \
 		R-cran-knitr>0:print/R-cran-knitr \
 		R-cran-rmarkdown>0:textproc/R-cran-rmarkdown \
 		R-cran-stringr>0:textproc/R-cran-stringr \
 		R-cran-rvest>0:www/R-cran-rvest
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/textproc/R-cran-rio/Makefile b/textproc/R-cran-rio/Makefile
index d411259394cd..e76c091eab9d 100644
--- a/textproc/R-cran-rio/Makefile
+++ b/textproc/R-cran-rio/Makefile
@@ -1,30 +1,31 @@
 PORTNAME=	rio
 DISTVERSION=	0.5.29
+PORTREVISION=	1
 CATEGORIES=	textproc
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Swiss-Army knife for data I/O
 WWW=		https://github.com/leeper/rio
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	R-cran-knitr>0:print/R-cran-knitr
 RUN_DEPENDS=	R-cran-data.table>=1.9.8:devel/R-cran-data.table \
 		R-cran-tibble>0:devel/R-cran-tibble \
 		R-cran-curl>=0.6:ftp/R-cran-curl \
 		R-cran-haven>=1.1.0:math/R-cran-haven \
 		R-cran-openxlsx>0:textproc/R-cran-openxlsx \
 		R-cran-readxl>=0.1.1:textproc/R-cran-readxl
 TEST_DEPENDS=	R-cran-jsonlite>0:converters/R-cran-jsonlite \
 		R-cran-bit64>0:devel/R-cran-bit64 \
 		R-cran-magrittr>0:devel/R-cran-magrittr \
 		R-cran-testthat>0:devel/R-cran-testthat \
 		R-cran-knitr>0:print/R-cran-knitr \
 		R-cran-readr>0:textproc/R-cran-readr \
 		R-cran-xml2>=1.2.0:textproc/R-cran-xml2 \
 		R-cran-yaml>0:textproc/R-cran-yaml
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/textproc/R-cran-rmarkdown/Makefile b/textproc/R-cran-rmarkdown/Makefile
index fcc4eb2ce01f..c0ff490d8068 100644
--- a/textproc/R-cran-rmarkdown/Makefile
+++ b/textproc/R-cran-rmarkdown/Makefile
@@ -1,28 +1,29 @@
 PORTNAME=	rmarkdown
 PORTVERSION=	2.16
+PORTREVISION=	1
 CATEGORIES=	textproc
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Dynamic Documents for R
 WWW=		https://cran.r-project.org/web/packages/rmarkdown/
 
 LICENSE=	GPLv3
 
 CRAN_DEPENDS=	R-cran-bslib>=0.2.5.1:www/R-cran-bslib \
 		R-cran-evaluate>=0.13:devel/R-cran-evaluate \
 		R-cran-htmltools>=0.5.1:textproc/R-cran-htmltools \
 		R-cran-jquerylib>0:www/R-cran-jquerylib \
 		R-cran-jsonlite>0:converters/R-cran-jsonlite \
 		R-cran-knitr>=1.22:print/R-cran-knitr \
 		R-cran-stringr>=1.2.0:textproc/R-cran-stringr \
 		R-cran-tinytex>=0.31:print/R-cran-tinytex \
 		R-cran-xfun>=0.30:misc/R-cran-xfun \
 		R-cran-yaml>=2.1.19:textproc/R-cran-yaml
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	hs-pandoc>=1.14:textproc/hs-pandoc \
 		${CRAN_DEPENDS}
 
 USES=	cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/textproc/R-cran-sass/Makefile b/textproc/R-cran-sass/Makefile
index 4ae1d20a1f3b..59da9cb5c056 100644
--- a/textproc/R-cran-sass/Makefile
+++ b/textproc/R-cran-sass/Makefile
@@ -1,22 +1,23 @@
 PORTNAME=	sass
 PORTVERSION=	0.4.2
+PORTREVISION=	1
 CATEGORIES=	textproc
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Syntactically Awesome Style Sheets ('Sass')
 WWW=		https://cran.r-project.org/web/packages/sass/
 
 LICENSE=	MIT
 
 CRAN_DEPENDS=	R-cran-fs>0:sysutils/R-cran-fs \
 		R-cran-rlang>=0.4.10:devel/R-cran-rlang \
 		R-cran-htmltools>=0.5.1:textproc/R-cran-htmltools \
 		R-cran-R6>0:devel/R-cran-R6 \
 		R-cran-rappdirs>0:devel/R-cran-rappdirs
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/textproc/R-cran-spelling/Makefile b/textproc/R-cran-spelling/Makefile
index f94abde2f534..227f37660ea5 100644
--- a/textproc/R-cran-spelling/Makefile
+++ b/textproc/R-cran-spelling/Makefile
@@ -1,20 +1,21 @@
 PORTNAME=	spelling
 DISTVERSION=	2.2.1
+PORTREVISION=	1
 CATEGORIES=	textproc
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	ygy@FreeBSD.org
 COMMENT=	Tools for Spell Checking in R
 WWW=		https://docs.ropensci.org/spelling/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	R-cran-knitr>0:print/R-cran-knitr \
 		R-cran-commonmark>0:textproc/R-cran-commonmark \
 		R-cran-hunspell>=3.0:textproc/R-cran-hunspell \
 		R-cran-xml2>0:textproc/R-cran-xml2
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/textproc/R-cran-stringi/Makefile b/textproc/R-cran-stringi/Makefile
index f36f3ad7c678..9a1e82a43cd4 100644
--- a/textproc/R-cran-stringi/Makefile
+++ b/textproc/R-cran-stringi/Makefile
@@ -1,17 +1,17 @@
 PORTNAME=	stringi
 DISTVERSION=	1.7.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Character String Processing Facilities
 WWW=		http://www.gagolewski.com/software/stringi/
 
 LICENSE=	BSD3CLAUSE
 
 LIB_DEPENDS=	libicui18n.so:devel/icu
 
 USES=	compiler:c++11-lang cran:auto-plist,compiles pkgconfig:build
 
 .include <bsd.port.mk>
diff --git a/textproc/R-cran-stringr/Makefile b/textproc/R-cran-stringr/Makefile
index d19b68eb8daa..fcc7c1d6b21a 100644
--- a/textproc/R-cran-stringr/Makefile
+++ b/textproc/R-cran-stringr/Makefile
@@ -1,20 +1,21 @@
 PORTNAME=	stringr
 PORTVERSION=	1.4.1
+PORTREVISION=	1
 CATEGORIES=	textproc
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Make it easier to work with strings
 WWW=		https://cran.r-project.org/web/packages/stringr/
 
 LICENSE=	GPLv2
 
 CRAN_DEPENDS=	R-cran-glue>=1.2.0:devel/R-cran-glue \
 		R-cran-magrittr>0:devel/R-cran-magrittr \
 		R-cran-stringi>=1.1.7:textproc/R-cran-stringi
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=	cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/textproc/R-cran-utf8/Makefile b/textproc/R-cran-utf8/Makefile
index 8725cb8f690f..4789f1595f14 100644
--- a/textproc/R-cran-utf8/Makefile
+++ b/textproc/R-cran-utf8/Makefile
@@ -1,15 +1,16 @@
 PORTNAME=	utf8
 PORTVERSION=	1.2.2
+PORTREVISION=	1
 CATEGORIES=	textproc
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Unicode Text Processing
 WWW=		https://cran.r-project.org/web/packages/utf8/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/textproc/R-cran-vroom/Makefile b/textproc/R-cran-vroom/Makefile
index 6f89b871300c..bc4859d39795 100644
--- a/textproc/R-cran-vroom/Makefile
+++ b/textproc/R-cran-vroom/Makefile
@@ -1,33 +1,34 @@
 PORTNAME=	vroom
 PORTVERSION=	1.5.7
+PORTREVISION=	1
 CATEGORIES=	textproc
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Read and Write Rectangular Text Data Quickly
 WWW=		https://cran.r-project.org/web/packages/vroom/
 
 LICENSE=	MIT
 
 CRAN_DEPENDS=	R-cran-bit64>0:devel/R-cran-bit64 \
 		R-cran-crayon>0:devel/R-cran-crayon \
 		R-cran-cli>0:devel/R-cran-cli \
 		R-cran-glue>0:devel/R-cran-glue \
 		R-cran-hms>0:devel/R-cran-hms \
 		R-cran-lifecycle>0:devel/R-cran-lifecycle \
 		R-cran-rlang>=0.4.2:devel/R-cran-rlang \
 		R-cran-tibble>=2.0.0:devel/R-cran-tibble \
 		R-cran-tzdb>=0.1.1:devel/R-cran-tzdb \
 		R-cran-vctrs>=0.2.0:devel/R-cran-vctrs \
 		R-cran-tidyselect>0:devel/R-cran-tidyselect \
 		R-cran-withr>0:devel/R-cran-withr \
 		R-cran-progress>=1.2.1:devel/R-cran-progress \
 		R-cran-cpp11>=0.2.0:devel/R-cran-cpp11
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		compiler:c++11-lang cran:auto-plist,compiles shebangfix
 
 SHEBANG_FILES=	inst/bench/*.sh
 
 .include <bsd.port.mk>
diff --git a/textproc/R-cran-xml2/Makefile b/textproc/R-cran-xml2/Makefile
index 2a417ed6844f..f3668ac56120 100644
--- a/textproc/R-cran-xml2/Makefile
+++ b/textproc/R-cran-xml2/Makefile
@@ -1,16 +1,16 @@
 PORTNAME=	xml2
 PORTVERSION=	1.3.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Parse XML
 WWW=		https://cran.r-project.org/web/packages/xml2/
 
 LICENSE=	MIT
 
 USES=	cran:auto-plist,compiles gnome
 USE_GNOME=	libxml2
 
 .include <bsd.port.mk>
diff --git a/textproc/R-cran-xmlparsedata/Makefile b/textproc/R-cran-xmlparsedata/Makefile
index 085fb8164324..c03d45a43c93 100644
--- a/textproc/R-cran-xmlparsedata/Makefile
+++ b/textproc/R-cran-xmlparsedata/Makefile
@@ -1,19 +1,20 @@
 PORTNAME=	xmlparsedata
 DISTVERSION=	1.0.5
+PORTREVISION=	1
 CATEGORIES=	textproc
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	ygy@FreeBSD.org
 COMMENT=	Parse Data of 'R' Code as an 'XML' Tree
 WWW=		https://github.com/r-lib/xmlparsedata #readme
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 TEST_DEPENDS=	R-cran-covr>0:devel/R-cran-covr \
 		R-cran-testthat>0:devel/R-cran-testthat \
 		R-cran-xml2>0:textproc/R-cran-xml2
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/textproc/R-cran-xtable/Makefile b/textproc/R-cran-xtable/Makefile
index 6282cc4d85c3..d5eee1c80ef6 100644
--- a/textproc/R-cran-xtable/Makefile
+++ b/textproc/R-cran-xtable/Makefile
@@ -1,15 +1,15 @@
 PORTNAME=	xtable
 DISTVERSION=	1.8-4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Export tables to LaTeX or HTML
 WWW=		https://cran.r-project.org/web/packages/xtable/
 
 LICENSE=	GPLv2+
 
 USES=	cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/textproc/R-cran-yaml/Makefile b/textproc/R-cran-yaml/Makefile
index b76649ebfc41..59defc329c33 100644
--- a/textproc/R-cran-yaml/Makefile
+++ b/textproc/R-cran-yaml/Makefile
@@ -1,14 +1,15 @@
 PORTNAME=	yaml
 PORTVERSION=	2.3.5
+PORTREVISION=	1
 CATEGORIES=	textproc
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Methods to convert R data to YAML and back
 WWW=		https://cran.r-project.org/web/packages/yaml/
 
 LICENSE=	BSD3CLAUSE
 
 USES=	cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/textproc/dictem/Makefile b/textproc/dictem/Makefile
index 33ce7e13fa7a..043f50247200 100644
--- a/textproc/dictem/Makefile
+++ b/textproc/dictem/Makefile
@@ -1,46 +1,46 @@
 PORTNAME=	dictem
 PORTVERSION=	1.0.4
-PORTREVISION=	15
+PORTREVISION=	17
 CATEGORIES=	textproc net elisp
 MASTER_SITES=	SF/dictem/dictem/dictem-${PORTVERSION}
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	max.n.boyarov@gmail.com
 COMMENT=	DICT protocol client for [X]Emacs
 WWW=		https://sourceforge.net/projects/dictem/
 
 LICENSE=	GPLv2
 
 RUN_DEPENDS=	${LOCALBASE}/bin/dict:textproc/dict
 
 USES=		emacs
 
 SRC_EL=		dictem.el dictem-lingvo-dsl.el dictem-elisp.el
 
 .for f in ${SRC_EL}
 PLIST_FILES+=	${LISPDIR}/${f} ${LISPDIR}/${f}c
 .endfor
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 PORTDOCS=	README AUTHORS NEWS COPYING TODO
 
 LISPDIR=	${EMACS_VERSION_SITE_LISPDIR}/dictem
 
 OPTIONS_DEFINE=	DOCS
 
 do-build:
 	(cd ${WRKSRC} && ${EMACS_CMD} --no-site-file --no-init-file -batch \
 		-l compile.el -f compile-dictem ${SRC_EL})
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${LISPDIR}
 	(cd ${WRKSRC} && ${INSTALL_DATA} ${SRC_EL} ${SRC_EL:S/.el$/.elc/} \
 		 ${STAGEDIR}${PREFIX}/${LISPDIR}/)
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for doc in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/textproc/dictionary/Makefile b/textproc/dictionary/Makefile
index 5ee26a43da85..d700b2586563 100644
--- a/textproc/dictionary/Makefile
+++ b/textproc/dictionary/Makefile
@@ -1,38 +1,38 @@
 PORTNAME=	dictionary
 PORTVERSION=	1.8.7
-PORTREVISION=	31
+PORTREVISION=	33
 CATEGORIES=	textproc net elisp
 MASTER_SITES=	http://me.in-berlin.de/~myrkr/dictionary/ \
 		http://bsdchat.com/dist/dryice/
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Dictionary client for Emacs
 WWW=		https://www.myrkr.in-berlin.de/dictionary/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/GPL
 
 USES=		emacs
 
 LISPDIR=	${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
 ELS=		connection.el dictionary.el link.el
 
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS
 
 do-build:
 	cd ${WRKSRC} && ${EMACS_CMD} -batch -l lpath.el -f batch-byte-compile ${ELS}
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${LISPDIR}
 .for i in ${ELS} *.elc dictionary-init.el
 	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${LISPDIR}
 .endfor
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/textproc/doc-mode.el/Makefile b/textproc/doc-mode.el/Makefile
index a92b17a97a88..3c65e7bf163d 100644
--- a/textproc/doc-mode.el/Makefile
+++ b/textproc/doc-mode.el/Makefile
@@ -1,20 +1,20 @@
 PORTNAME=	doc-mode.el
 PORTVERSION=	1.1
-PORTREVISION=	24
+PORTREVISION=	26
 CATEGORIES=	textproc elisp
 MASTER_SITES=	SF/xpt/doc-mode/doc-mode-${PORTVERSION}
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 DISTNAME=	doc-mode-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Asciidoc fontlocking for emacs
 WWW=		http://xpt.sourceforge.net/tools/doc-mode/
 
 USES=		emacs tar:tgz
 
 NO_BUILD=	yes
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/doc-mode.el ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/doc-mode.el
 
 .include <bsd.port.mk>
diff --git a/textproc/fox-xml/Makefile b/textproc/fox-xml/Makefile
index 2d1ab3cf6547..19991ed1f274 100644
--- a/textproc/fox-xml/Makefile
+++ b/textproc/fox-xml/Makefile
@@ -1,23 +1,23 @@
 PORTNAME=	fox
 DISTVERSION=	4.1.2-91
-PORTREVISION=	4
+PORTREVISION=	5
 DISTVERSIONSUFFIX=	-g9c6716e
 CATEGORIES=	textproc
 PKGNAMESUFFIX=	-xml
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Fortran XML library
 WWW=		https://homepages.see.leeds.ac.uk/~earawa/FoX/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 CONFLICTS_INSTALL=	xmlf90
 
 GNU_CONFIGURE=	yes
 USES=		fortran gmake
 USE_GITHUB=	yes
 GH_ACCOUNT=	andreww
 ALL_TARGET=	default
 
 .include <bsd.port.mk>
diff --git a/textproc/markdown-mode.el/Makefile b/textproc/markdown-mode.el/Makefile
index fad7edd06239..776d5fa227fe 100644
--- a/textproc/markdown-mode.el/Makefile
+++ b/textproc/markdown-mode.el/Makefile
@@ -1,39 +1,39 @@
 PORTNAME=	markdown-mode.el
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.5
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	textproc elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Emacs major mode for editing Markdown-formatted text
 WWW=		https://jblevins.org/projects/markdown-mode/
 
 LICENSE=	GPLv3+
 
 USES=		emacs gmake
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	jrblevin
 GH_PROJECT=	markdown-mode
 
 NO_ARCH=	yes
 
 PLIST_FILES=	${EMACS_VERSION_SITE_LISPDIR}/markdown-mode.el \
 		${EMACS_VERSION_SITE_LISPDIR}/markdown-mode.elc
 PORTDOCS=	CHANGES.md CONTRIBUTING.md README.md
 
 OPTIONS_DEFINE=	DOCS
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}
 	${INSTALL_DATA} ${WRKSRC}/*.el ${WRKSRC}/*.elc \
 		${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/textproc/muse/Makefile b/textproc/muse/Makefile
index 7adac386a655..31d0994f997b 100644
--- a/textproc/muse/Makefile
+++ b/textproc/muse/Makefile
@@ -1,41 +1,41 @@
 PORTNAME=	muse
 PORTVERSION=	3.20
-PORTREVISION=	22
+PORTREVISION=	24
 CATEGORIES=	textproc elisp
 MASTER_SITES=	http://download.gna.org/muse-el/ \
 		LOCAL/dryice \
 		http://dryice.name/computer/FreeBSD/distfiles/
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Authoring and publishing environment for Emacs
 WWW=		https://www.emacswiki.org/cgi-bin/wiki/MuseMode
 
 USES=		emacs gmake makeinfo
 
 INFO=		muse
 
 LISPDIR=	${PREFIX}/${EMACS_SITE_LISPDIR}/${PORTNAME}
 
 PORTDOCS=	AUTHORS ChangeLog ChangeLog.1 ChangeLog.2 ChangeLog.3 NEWS \
 		README scripts COPYING
 
 OPTIONS_DEFINE=	DOCS
 
 .if ${FLAVOR:Ufull:Mfull}
 PKGNAMESUFFIX=	-emacs
 .endif
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${LISPDIR}/contrib
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} contrib  ${STAGEDIR}${LISPDIR})
 	${INSTALL_DATA} ${WRKSRC}/experimental/* \
 		${STAGEDIR}${LISPDIR}/experimental
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|scripts||:S|^|${WRKSRC}/|} \
 		${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} scripts ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
diff --git a/textproc/p5-Search-VectorSpace/Makefile b/textproc/p5-Search-VectorSpace/Makefile
index 92870d7f7430..244dd2055bb7 100644
--- a/textproc/p5-Search-VectorSpace/Makefile
+++ b/textproc/p5-Search-VectorSpace/Makefile
@@ -1,19 +1,19 @@
 PORTNAME=	Search-VectorSpace
 PORTVERSION=	0.02
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Very basic vector-space search engine perl module
 WWW=		https://metacpan.org/release/Search-VectorSpace
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	PDL>=0:math/PDL \
 		p5-Lingua-Stem>=0:textproc/p5-Lingua-Stem
 
 USES=		perl5
 USE_PERL5=	configure
 
 .include <bsd.port.mk>
diff --git a/textproc/p5-Senna/Makefile b/textproc/p5-Senna/Makefile
index e4af90704f79..c4ffd4ec8b37 100644
--- a/textproc/p5-Senna/Makefile
+++ b/textproc/p5-Senna/Makefile
@@ -1,23 +1,23 @@
 PORTNAME=	Senna
 PORTVERSION=	0.51
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DMAKI
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl module for Embeddable Fulltext Search Engine
 WWW=		https://metacpan.org/release/Senna
 
 LICENSE=	LGPL21
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	senna-cfg:textproc/senna
 
 USES=		perl5
 USE_PERL5=	modbuild
 CONFIGURE_ARGS+=</dev/null
 CFLAGS+=	-I${LOCALBASE}/include
 
 .include <bsd.port.mk>
diff --git a/textproc/py-gensim/Makefile b/textproc/py-gensim/Makefile
index c2ac351365f5..41896285617e 100644
--- a/textproc/py-gensim/Makefile
+++ b/textproc/py-gensim/Makefile
@@ -1,25 +1,26 @@
 PORTNAME=	gensim
 DISTVERSION=	4.3.1
+PORTREVISION=	1
 CATEGORIES=	textproc python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Python framework for fast Vector Space Modelling
 WWW=		https://radimrehurek.com/gensim/
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${PYNUMPY}
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=1.7.0:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}smart-open>=1.8.1:net/py-smart-open@${PY_FLAVOR}
 
 USES=		compiler:c++11-lang python:3.8+
 USE_PYTHON=	distutils cython autoplist
 
 post-install:
 	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name "*.so" | ${XARGS} ${STRIP_CMD}
 
 .include <bsd.port.mk>
diff --git a/textproc/py-langid/Makefile b/textproc/py-langid/Makefile
index 3581047402d1..236e989ad9dc 100644
--- a/textproc/py-langid/Makefile
+++ b/textproc/py-langid/Makefile
@@ -1,31 +1,32 @@
 PORTNAME=	langid
 DISTVERSION=	1.1.6-20170715
+PORTREVISION=	1
 CATEGORIES=	textproc devel python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Standalone Language Identification (LangID) tool
 WWW=		https://github.com/saffsd/langid.py
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYNUMPY}
 RUN_DEPENDS=	${PYNUMPY}
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	saffsd
 GH_PROJECT=	${PORTNAME}.py
 GH_TAGNAME=	4153583
 
 USES=		python:3.6+ shebangfix
 USE_PYTHON=	distutils
 SHEBANG_GLOB=	*.py
 
 NO_ARCH=	yes
 
 post-extract:
 	${MKDIR} ${WRKDIR}/unsupported-Python-2.7
 	${MV} ${WRKSRC}/langid/train ${WRKDIR}/unsupported-Python-2.7
 
 .include <bsd.port.mk>
diff --git a/textproc/py-orange3-text/Makefile b/textproc/py-orange3-text/Makefile
index e2b4093bcd37..a1a8d5694811 100644
--- a/textproc/py-orange3-text/Makefile
+++ b/textproc/py-orange3-text/Makefile
@@ -1,38 +1,39 @@
 PORTNAME=	orange3-text
 DISTVERSION=	1.3.1
+PORTREVISION=	1
 CATEGORIES=	textproc python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Text Mining add-on for Orange3
 WWW=		https://github.com/biolab/orange3-text
 
 LICENSE=	AGPLv3
 
 RUN_DEPENDS=	orange3>0:misc/orange3 \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}beautifulsoup>0:www/py-beautifulsoup@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}biopython>0:biology/py-biopython@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dateutil>=2.8.0:devel/py-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}docx2txt>=0.6:textproc/py-docx2txt@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}gensim>=0.12.3:textproc/py-gensim@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}nltk>=3.0.5:textproc/py-nltk@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}odfpy>=1.3.5:devel/py-odfpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pdfminer3k>=1.3.1:textproc/py-pdfminer3k@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-learn>0:science/py-scikit-learn@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}simhash>=1.11:math/py-simhash@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tweepy>0:net/py-tweepy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ufal.udpipe>0:textproc/py-ufal.udpipe@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wikipedia>0:www/py-wikipedia@${PY_FLAVOR}
 
 USES=		python:3.4+
 USE_PYTHON=	distutils autoplist
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	biolab
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/textproc/py-tablib/Makefile b/textproc/py-tablib/Makefile
index 60dc835c40d3..81fd171021a2 100644
--- a/textproc/py-tablib/Makefile
+++ b/textproc/py-tablib/Makefile
@@ -1,45 +1,45 @@
 PORTNAME=	tablib
 PORTVERSION=	3.4.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	kai@FreeBSD.org
 COMMENT=	Format agnostic tabular data library (XLS, JSON, YAML, CSV)
 WWW=		https://github.com/jazzband/tablib
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PY_SETUPTOOLS} \
 		${PYTHON_PKGNAMEPREFIX}setuptools_scm>=6.2:devel/py-setuptools_scm@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
 
 USES=		cpe python:3.7+
 CPE_VENDOR=	python
 USE_PYTHON=	autoplist pep517 pytest
 
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=	CLI HTML ODS PANDAS XLS XLSX YAML
 OPTIONS_DEFAULT=CLI HTML ODS PANDAS XLS XLSX YAML
 
 CLI_DESC=	Command-line support
 HTML_DESC=	HTML format support
 ODS_DESC=	Open Document .ods support
 PANDAS_DESC=	Pandas Dataframe support
 XLS_DESC=	Microsoft Excel .xls support
 XLSX_DESC=	Microsoft Excel .xlsx support
 YAML_DESC=	YAML format support
 
 CLI_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tabulate>=0:devel/py-tabulate@${PY_FLAVOR}
 HTML_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}markuppy>=0:textproc/py-markuppy@${PY_FLAVOR}
 ODS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}odfpy>=0:devel/py-odfpy@${PY_FLAVOR}
 PANDAS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pandas>=0:math/py-pandas@${PY_FLAVOR}
 XLS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}xlrd>=0:textproc/py-xlrd@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}xlwt>=0:textproc/py-xlwt@${PY_FLAVOR}
 XLSX_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}openpyxl>=2.6.0:textproc/py-openpyxl@${PY_FLAVOR}
 YAML_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${PY_FLAVOR}
 
 .include <bsd.port.mk>
diff --git a/textproc/py-textdistance/Makefile b/textproc/py-textdistance/Makefile
index 7c8446a83633..0e650990ca35 100644
--- a/textproc/py-textdistance/Makefile
+++ b/textproc/py-textdistance/Makefile
@@ -1,21 +1,22 @@
 PORTNAME=	textdistance
 PORTVERSION=	4.5.0
+PORTREVISION=	1
 CATEGORIES=	textproc python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	rhurlin@FreeBSD.org
 COMMENT=	Comparing distance between two or more sequences by many algorithms
 WWW=		https://github.com/life4/textdistance
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYNUMPY}
 
 USES=		python:3.7+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/textproc/py-wordcloud/Makefile b/textproc/py-wordcloud/Makefile
index 8f5b710918db..dea8f36cf910 100644
--- a/textproc/py-wordcloud/Makefile
+++ b/textproc/py-wordcloud/Makefile
@@ -1,31 +1,32 @@
 PORTNAME=	wordcloud
 DISTVERSION=	1.8.2.2
+PORTREVISION=	1
 CATEGORIES=	textproc python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Little word cloud generator in Python
 WWW=		https://amueller.github.io/word_cloud/
 
 LICENSE=	MIT
 
 BUILD_DEPENDS=	${PYNUMPY}	\
 		${PY_PILLOW}
 RUN_DEPENDS=	${PYNUMPY}	\
 		${PY_PILLOW}	\
 		${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR}
 
 #USE_GITHUB=	yes
 #GH_ACCOUNT=	amueller
 
 USES=		python:3.7+
 USE_PYTHON=	distutils
 
 PLIST_SUB+=	VER=${PORTVERSION}
 
 .if !defined(WITH_DEBUG)
 LDFLAGS+=	-s
 .endif
 
 .include <bsd.port.mk>
diff --git a/textproc/scss/Makefile b/textproc/scss/Makefile
index 966efd367091..210a62a56564 100644
--- a/textproc/scss/Makefile
+++ b/textproc/scss/Makefile
@@ -1,31 +1,31 @@
 PORTNAME=	scss
 PORTVERSION=	0.4.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc scheme
 MASTER_SITES=	SAVANNAH \
 		http://www.c-s.li/ports/
 
 MAINTAINER=	cs@FreeBSD.org
 COMMENT=	Scheme module for W3C Cascading Stylesheets recommendation
 WWW=		https://www.nongnu.org/scss/
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	guile:lang/guile
 
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 FILES=		lexer.scm parser.scm scss.scm properties.scm \
 		interface/sdom.scm common.scm
 INFO=		scss
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/guile/scss
 .for f in ${FILES}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/share/guile/scss
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/scss.info ${STAGEDIR}${PREFIX}/${INFO_PATH}
 
 .include <bsd.port.mk>
diff --git a/textproc/senna/Makefile b/textproc/senna/Makefile
index 6906edb093f6..d209bb5f423f 100644
--- a/textproc/senna/Makefile
+++ b/textproc/senna/Makefile
@@ -1,39 +1,39 @@
 PORTNAME=	senna
 PORTVERSION=	1.1.5
-PORTREVISION=	9
+PORTREVISION=	10
 PORTEPOCH=	1
 CATEGORIES=	textproc
 MASTER_SITES=	OSDN/senna
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Embeddable Fulltext Search Engine
 WWW=		http://qwik.jp/senna/
 
 BROKEN_aarch64=		does not build: libsenna.so: undefined reference to SEN_ATOMIC_ADD_EX
 BROKEN_armv6=		does not build: libsenna.so: undefined reference to SEN_ATOMIC_ADD_EX
 BROKEN_armv7=		does not build: libsenna.so: undefined reference to SEN_ATOMIC_ADD_EX
 BROKEN_sparc64=		does not build: libsenna.so: undefined reference to SEN_ATOMIC_ADD_EX
 
 USES=		compiler:c11 gmake libtool pathfix
 GNU_CONFIGURE=	yes
 USE_GCC=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--with-sennahome=${SENNA_HOME}
 LDFLAGS+=	-lpthread -L${LOCALBASE}/lib
 CFLAGS+=	-I${LOCALBASE}/include
 MAKE_ARGS=	CFLAGS="${CFLAGS}"
 WRKSRC=		${WRKDIR}/${DISTNAME}
 
 SENNA_HOME?=	/var/senna
 
 OPTIONS_DEFINE=	MECAB NFKC
 OPTIONS_DEFAULT=	MECAB NFKC
 MECAB_DESC=	Use MeCab for morphological analysis
 NFKC_DESC=	Use NFKC-based UTF-8 normalization
 
 MECAB_LIB_DEPENDS=	libmecab.so:japanese/mecab
 MECAB_CONFIGURE_OFF=	--without-mecab
 
 NFKC_CONFIGURE_OFF=	--disable-nfkc
 
 .include <bsd.port.mk>
diff --git a/textproc/toml-f/Makefile b/textproc/toml-f/Makefile
index 0fa53eb1e633..6749b9ceb674 100644
--- a/textproc/toml-f/Makefile
+++ b/textproc/toml-f/Makefile
@@ -1,24 +1,25 @@
 PORTNAME=	toml-f
 DISTVERSION=	0.3.1
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/v${DISTVERSION}/
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	TOML parser for data serialization and deserialization in Fortran
 WWW=		https://toml-f.github.io/toml-f/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE-MIT
 
 BROKEN_aarch64=	cannot find an intrinsic module named 'ieee_arithmetic'
 
 USES=		cmake:testing fortran tar:xz
 USE_LDCONFIG=	yes
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 CMAKE_TESTING_ON=	FREEBSD_BUILD_TESTS
 
 post-patch: # see https://github.com/toml-f/toml-f/issues/51
 	@${REINPLACE_CMD} -e 's|$${CMAKE_Fortran_COMPILER_ID}-$${CMAKE_Fortran_COMPILER_VERSION}||' ${WRKSRC}/config/CMakeLists.txt
 
 .include <bsd.port.mk>
diff --git a/textproc/uim-el/Makefile b/textproc/uim-el/Makefile
index ffa7e3abe0d1..acd6a28beb61 100644
--- a/textproc/uim-el/Makefile
+++ b/textproc/uim-el/Makefile
@@ -1,54 +1,54 @@
 PORTNAME=	uim-el
 PORTVERSION=	1.9.0.b.${SNAPDATE}
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	textproc
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	nobutaka@FreeBSD.org
 COMMENT?=	Emacs lisp for uim input method library
 WWW=		https://github.com/uim/uim
 
 LICENSE=	BSD3CLAUSE GPLv2+ GPLv3+ LGPL21+ PD
 LICENSE_COMB=	multi
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	uim-el-agent:textproc/uim
 
 USES=		autoreconf:build,2.69 emacs gettext gmake gnome iconv libtool \
 		pathfix perl5 pkgconfig
 USE_GNOME=	intltool
 USE_PERL5=	build
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	uim
 GH_PROJECT=	uim
 GH_TAGNAME=	15f0788
 
 SNAPDATE=	20220927
 
 GNU_CONFIGURE=	yes
 
 BUILD_WRKSRC=	${WRKSRC}/emacs
 INSTALL_WRKSRC=	${WRKSRC}/emacs
 
 CONFIGURE_ARGS?=--enable-maintainer-mode --enable-emacs \
 		--with-lispdir=${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}
 CONFIGURE_ENV=	EMACS="${EMACS_CMD}"
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
 
 DOCSDIR_JA=	${PREFIX}/share/doc/ja/uim-el
 PLIST_SUB+=	DOCSDIR_JA="${DOCSDIR_JA:S,^${PREFIX}/,,}"
 
 OPTIONS_DEFINE=	DOCS
 
 pre-configure:
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ./autogen.sh
 
 post-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${MKDIR} ${STAGEDIR}${DOCSDIR_JA}
 	${INSTALL_DATA} ${WRKSRC}/emacs/README ${STAGEDIR}${DOCSDIR}/README
 	${INSTALL_DATA} ${WRKSRC}/emacs/README.ja ${STAGEDIR}${DOCSDIR_JA}/README.ja
 
 .include <bsd.port.mk>
diff --git a/textproc/xml-lite.el/Makefile b/textproc/xml-lite.el/Makefile
index fee3d5892931..46d1ab5b3d36 100644
--- a/textproc/xml-lite.el/Makefile
+++ b/textproc/xml-lite.el/Makefile
@@ -1,36 +1,36 @@
 PORTNAME=	xml-lite.el
 PORTVERSION=	1.1
-PORTREVISION=	19
+PORTREVISION=	21
 PORTEPOCH=	1
 CATEGORIES=	textproc elisp
 MASTER_SITES=	http://dogbiscuit.org/mdub/software/
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 DISTNAME=	${PORTNAME}
 EXTRACT_SUFX=	# empty
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple XML-editing for GNU Emacs
 WWW=		https://www.dogbiscuit.org/mdub/software/
 
 LICENSE=	GPLv2+
 
 USES=		emacs
 
 NO_WRKSUBDIR=	yes
 EXTRACT_CMD=	${CP}
 EXTRACT_BEFORE_ARGS=
 EXTRACT_AFTER_ARGS=${WRKSRC}/${PORTNAME}
 
 PLIST_FILES=	${EMACS_SITE_LISPDIR}/${PORTNAME} \
 		${EMACS_SITE_LISPDIR}/${PORTNAME}c
 
 do-build:
 	cd ${WRKSRC}; ${EMACS_CMD} -batch -q -f batch-byte-compile ${PORTNAME}
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME} \
 		${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}c \
 		${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}
 
 .include <bsd.port.mk>
diff --git a/textproc/xmlada/Makefile b/textproc/xmlada/Makefile
index 43012a6cb047..f18b2a7dbe25 100644
--- a/textproc/xmlada/Makefile
+++ b/textproc/xmlada/Makefile
@@ -1,45 +1,45 @@
 PORTNAME=	xmlada
 DISTVERSIONPREFIX=v
 DISTVERSION=	23.0.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Adacore XML suite for the Ada language
 WWW=		https://github.com/AdaCore/xmlada
 
 LICENSE=	GPLv3RLE
 
 BUILD_DEPENDS=	gprbuild>=23:devel/gprbuild
 
 USES=		ada:12,run gmake
 USE_BINUTILS=	yes
 GNU_CONFIGURE=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	AdaCore
 GH_PROJECT=	xmlada
 
 MAKE_ARGS+=	PROCESSORS=${MAKE_JOBS_NUMBER} \
 		LIBVER=${PORTVERSION}
 TEST_TARGET=	test
 TEST_ENV+=	GPR_PROJECT_PATH=${PREFIX}/share/gpr	\
 		PATH=${LOCALBASE}/gnat12/bin:${PATH}
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
 DOCS_BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx
 
 do-build-DOCS-on:
 	(cd ${WRKSRC}/docs && ${DO_MAKE_BUILD} html )
 
 post-install:
 	(cd ${STAGEDIR}${PREFIX}/lib/ && \
 		${STRIP_CMD} libxmlada* )
 
 post-install-DOCS-on:
 	${RM} ${STAGEDIR}${DOCSDIR}/.buildinfo
 
 .include <bsd.port.mk>
diff --git a/textproc/xmlf90/Makefile b/textproc/xmlf90/Makefile
index ea9d1e9ed330..ddccfc2ea5ca 100644
--- a/textproc/xmlf90/Makefile
+++ b/textproc/xmlf90/Makefile
@@ -1,27 +1,28 @@
 PORTNAME=	xmlf90
 DISTVERSION=	1.5.5
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	https://gitlab.com/siesta-project/libraries/xmlf90/-/archive/1.5.5/
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Suite of light-weight libraries to work with XML in Fortran
 WWW=		https://launchpad.net/xmlf90
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 CONFLICTS_INSTALL=	fox-xml
 
 USES=		autoreconf fortran gmake libtool
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-static
 
 INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE=	DOCS
 
 PORTDOCS=	*
 
 .include <bsd.port.mk>
diff --git a/textproc/yaml-mode.el/Makefile b/textproc/yaml-mode.el/Makefile
index b2fe970e6c96..7378484a94a2 100644
--- a/textproc/yaml-mode.el/Makefile
+++ b/textproc/yaml-mode.el/Makefile
@@ -1,34 +1,34 @@
 PORTNAME=	yaml-mode.el
 PORTVERSION=	0.0.15
-PORTREVISION=	6
+PORTREVISION=	8
 CATEGORIES=	textproc elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	yasu@FreeBSD.org
 COMMENT=	Simple major mode to edit YAML file for Emacsen
 WWW=		https://github.com/yoshiki/yaml-mode
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 USES=		emacs
 USE_GITHUB=	yes
 GH_ACCOUNT=	yoshiki
 GH_PROJECT=	yaml-mode
 
 MAKE_ENV=	LISPDIR=${LISPDIR}
 
 OPTIONS_DEFINE=	DOCS
 
 LISPDIR=	${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}
 
 pre-install:
 	@${MKDIR} ${LISPDIR}
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for file in Changes README
 	${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/textproc/yaml.el/Makefile b/textproc/yaml.el/Makefile
index 29f7f2c3d7b6..aa48dcef1c4d 100644
--- a/textproc/yaml.el/Makefile
+++ b/textproc/yaml.el/Makefile
@@ -1,31 +1,32 @@
 PORTNAME=	yaml.el
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.5.2
+PORTREVISION=	2
 CATEGORIES=	textproc elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	yasu@FreeBSD.org
 COMMENT=	YAML parser in Elisp
 WWW=		https://github.com/zkry/yaml.el
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		emacs
 USE_GITHUB=	yes
 GH_ACCOUNT=	zkry
 
 NO_ARCH=	yes
 PLIST_FILES=	${EMACS_VERSION_SITE_LISPDIR}/yaml.el \
 		${EMACS_VERSION_SITE_LISPDIR}/yaml.elc
 
 do-build:
 	(cd ${WRKSRC} \
 	&& ${EMACS_CMD} -Q -batch -L . -f batch-byte-compile yaml.el)
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}
 	(cd ${WRKSRC} && ${INSTALL_DATA} yaml.el* \
 	    ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR})
 
 .include <bsd.port.mk>
diff --git a/www/R-cran-RgoogleMaps/Makefile b/www/R-cran-RgoogleMaps/Makefile
index 608d4aed042b..3fb167cf2fb0 100644
--- a/www/R-cran-RgoogleMaps/Makefile
+++ b/www/R-cran-RgoogleMaps/Makefile
@@ -1,20 +1,20 @@
 PORTNAME=	RgoogleMaps
 PORTVERSION=	1.4.5.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Overlays on Google map tiles in R
 WWW=		https://cran.r-project.org/web/packages/RgoogleMaps/
 
 LICENSE=	GPLv2+
 
 CRAN_DEPENDS=	R-cran-png>0:graphics/R-cran-png \
 		R-cran-sp>0:math/R-cran-sp
 RUN_DEPENDS=	${CRAN_DEPENDS}
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 
 USES=	cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/www/R-cran-Rook/Makefile b/www/R-cran-Rook/Makefile
index 10ce3538487b..3f6cb919646a 100644
--- a/www/R-cran-Rook/Makefile
+++ b/www/R-cran-Rook/Makefile
@@ -1,19 +1,19 @@
 PORTNAME=	Rook
 DISTVERSION=	1.1-1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	www
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Web server interface for R
 WWW=		https://cran.r-project.org/web/packages/Rook/
 
 LICENSE=	GPLv2
 
 CRAN_DEPENDS=	R-cran-brew>0:textproc/R-cran-brew
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/www/R-cran-bslib/Makefile b/www/R-cran-bslib/Makefile
index 15209a8019d9..0c711d2a10fc 100644
--- a/www/R-cran-bslib/Makefile
+++ b/www/R-cran-bslib/Makefile
@@ -1,24 +1,25 @@
 PORTNAME=	bslib
 PORTVERSION=	0.4.0
+PORTREVISION=	1
 CATEGORIES=	www
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Custom 'Bootstrap' 'Sass' Themes for 'shiny' and 'rmarkdown'
 WWW=		https://cran.r-project.org/web/packages/bslib/
 
 LICENSE=	MIT
 
 CRAN_DEPENDS=	R-cran-htmltools>=0.5.2:textproc/R-cran-htmltools \
 		R-cran-jsonlite>0:converters/R-cran-jsonlite \
 		R-cran-sass>=0.4.0:textproc/R-cran-sass \
 		R-cran-jquerylib>=0.1.3:www/R-cran-jquerylib \
 		R-cran-rlang>0:devel/R-cran-rlang \
 		R-cran-cachem>0:databases/R-cran-cachem \
 		R-cran-memoise>0:devel/R-cran-memoise
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/www/R-cran-crosstalk/Makefile b/www/R-cran-crosstalk/Makefile
index c47c11990b05..eaae2a45962c 100644
--- a/www/R-cran-crosstalk/Makefile
+++ b/www/R-cran-crosstalk/Makefile
@@ -1,21 +1,22 @@
 PORTNAME=	crosstalk
 PORTVERSION=	1.2.0
+PORTREVISION=	1
 CATEGORIES=	www
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Inter-Widget Interactivity for HTML Widgets
 WWW=		https://cran.r-project.org/web/packages/crosstalk/
 
 LICENSE=	MIT
 
 CRAN_DEPENDS=	R-cran-htmltools>=0.3.6:textproc/R-cran-htmltools \
 		R-cran-jsonlite>0:converters/R-cran-jsonlite \
 		R-cran-lazyeval>0:math/R-cran-lazyeval \
 		R-cran-R6>0:devel/R-cran-R6
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/www/R-cran-downloader/Makefile b/www/R-cran-downloader/Makefile
index 0b99cc6e92b7..2698e33d4388 100644
--- a/www/R-cran-downloader/Makefile
+++ b/www/R-cran-downloader/Makefile
@@ -1,19 +1,19 @@
 PORTNAME=	downloader
 PORTVERSION=	0.4
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	www
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Download Files over HTTP and HTTPS
 WWW=		https://cran.r-project.org/web/packages/downloader/
 
 LICENSE=	GPLv2
 
 CRAN_DEPENDS=	R-cran-digest>0:security/R-cran-digest
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/www/R-cran-gh/Makefile b/www/R-cran-gh/Makefile
index 92fd23cbd5a6..c180baf33cc2 100644
--- a/www/R-cran-gh/Makefile
+++ b/www/R-cran-gh/Makefile
@@ -1,30 +1,31 @@
 PORTNAME=	gh
 DISTVERSION=	1.3.1
+PORTREVISION=	1
 CATEGORIES=	www
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	ygy@FreeBSD.org
 COMMENT=	'GitHub' 'API'
 WWW=		https://gh.r-lib.org/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	R-cran-knitr>0:print/R-cran-knitr
 RUN_DEPENDS=	R-cran-jsonlite>0:converters/R-cran-jsonlite \
 		R-cran-cli>=3.0.1:devel/R-cran-cli \
 		R-cran-ini>0:devel/R-cran-ini \
 		R-cran-gitcreds>0:security/R-cran-gitcreds \
 		R-cran-httr>=1.2:www/R-cran-httr
 TEST_DEPENDS=	R-cran-covr>0:devel/R-cran-covr \
 		R-cran-mockery>0:devel/R-cran-mockery \
 		R-cran-rprojroot>0:devel/R-cran-rprojroot \
 		R-cran-testthat>=3.0.0:devel/R-cran-testthat \
 		R-cran-withr>0:devel/R-cran-withr \
 		R-cran-knitr>0:print/R-cran-knitr \
 		R-cran-rmarkdown>0:textproc/R-cran-rmarkdown \
 		R-cran-spelling>0:textproc/R-cran-spelling
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/www/R-cran-htmlwidgets/Makefile b/www/R-cran-htmlwidgets/Makefile
index 07fa9c3861ed..c9415ba574d3 100644
--- a/www/R-cran-htmlwidgets/Makefile
+++ b/www/R-cran-htmlwidgets/Makefile
@@ -1,20 +1,21 @@
 PORTNAME=	htmlwidgets
 PORTVERSION=	1.5.4
+PORTREVISION=	1
 CATEGORIES=	www
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	HTML Widgets for R
 WWW=		https://cran.r-project.org/web/packages/htmlwidgets/
 
 LICENSE=	MIT
 
 CRAN_DEPENDS=	R-cran-htmltools>=0.3:textproc/R-cran-htmltools \
 		R-cran-jsonlite>=0.9.16:converters/R-cran-jsonlite \
 		R-cran-yaml>0:textproc/R-cran-yaml
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=	cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/www/R-cran-httpuv/Makefile b/www/R-cran-httpuv/Makefile
index 7ec8e1550736..fbb55e0a6fe3 100644
--- a/www/R-cran-httpuv/Makefile
+++ b/www/R-cran-httpuv/Makefile
@@ -1,21 +1,22 @@
 PORTNAME=	httpuv
 PORTVERSION=	1.6.6
+PORTREVISION=	1
 CATEGORIES=	www
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	HTTP and WebSocket server library for R
 WWW=		https://cran.r-project.org/web/packages/httpuv/
 
 LICENSE=	GPLv2+
 
 CRAN_DEPENDS=	R-cran-Rcpp>=1.0.7:devel/R-cran-Rcpp \
 		R-cran-R6>0:devel/R-cran-R6 \
 		R-cran-promises>0:devel/R-cran-promises \
 		R-cran-later>=0.8.0:devel/R-cran-later
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		compiler:c++11-lang cran:auto-plist,compiles
 
 .include <bsd.port.mk>
diff --git a/www/R-cran-httr/Makefile b/www/R-cran-httr/Makefile
index 5ff9d5304bf4..119b2dddfe3b 100644
--- a/www/R-cran-httr/Makefile
+++ b/www/R-cran-httr/Makefile
@@ -1,22 +1,23 @@
 PORTNAME=	httr
 PORTVERSION=	1.4.4
+PORTREVISION=	1
 CATEGORIES=	www
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Tools for Working with URLs and HTTP
 WWW=		https://cran.r-project.org/web/packages/httr/
 
 LICENSE=	MIT
 
 CRAN_DEPENDS=	R-cran-curl>=3.0.0:ftp/R-cran-curl \
 		R-cran-jsonlite>0:converters/R-cran-jsonlite \
 		R-cran-mime>0:misc/R-cran-mime \
 		R-cran-openssl>=0.8:security/R-cran-openssl \
 		R-cran-R6>0:devel/R-cran-R6
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=	cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/www/R-cran-jquerylib/Makefile b/www/R-cran-jquerylib/Makefile
index d0c88e8ecd91..a963c3071140 100644
--- a/www/R-cran-jquerylib/Makefile
+++ b/www/R-cran-jquerylib/Makefile
@@ -1,18 +1,19 @@
 PORTNAME=	jquerylib
 PORTVERSION=	0.1.4
+PORTREVISION=	1
 CATEGORIES=	www
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Obtain 'jQuery' as an HTML Dependency Object
 WWW=		https://cran.r-project.org/web/packages/jquerylib/
 
 LICENSE=	MIT
 
 CRAN_DEPENDS=	R-cran-htmltools>0:textproc/R-cran-htmltools
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/www/R-cran-rvest/Makefile b/www/R-cran-rvest/Makefile
index 5065507da3db..4369ec41f2f9 100644
--- a/www/R-cran-rvest/Makefile
+++ b/www/R-cran-rvest/Makefile
@@ -1,27 +1,28 @@
 PORTNAME=	rvest
 PORTVERSION=	1.0.3
+PORTREVISION=	1
 CATEGORIES=	www
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Easily Harvest (Scrape) Web Pages
 WWW=		https://cran.r-project.org/web/packages/rvest/
 
 LICENSE=	MIT
 
 CRAN_DEPENDS=	R-cran-glue>0:devel/R-cran-glue \
 		R-cran-cli>0:devel/R-cran-cli \
 		R-cran-httr>=0.5:www/R-cran-httr \
 		R-cran-lifecycle>=1.0.0:devel/R-cran-lifecycle \
 		R-cran-magrittr>0:devel/R-cran-magrittr \
 		R-cran-rlang>=1.0.0:devel/R-cran-rlang \
 		R-cran-selectr>0:www/R-cran-selectr \
 		R-cran-tibble>0:devel/R-cran-tibble \
 		R-cran-xml2>=1.3:textproc/R-cran-xml2 \
 		R-cran-withr>0:devel/R-cran-withr
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=	cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/www/R-cran-scrapeR/Makefile b/www/R-cran-scrapeR/Makefile
index 704f1f1c49c5..902414d2fe6f 100644
--- a/www/R-cran-scrapeR/Makefile
+++ b/www/R-cran-scrapeR/Makefile
@@ -1,16 +1,16 @@
 PORTNAME=	scrapeR
 PORTVERSION=	0.1.6
-PORTREVISION=	17
+PORTREVISION=	18
 CATEGORIES=	www
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Tools for Scraping Data from HTML and XML Documents
 WWW=		https://cran.r-project.org/web/packages/scrapeR/
 
 RUN_DEPENDS=	R-cran-XML>0:textproc/R-cran-XML \
 		R-cran-RCurl>0:ftp/R-cran-RCurl
 
 USES=	cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/www/R-cran-selectr/Makefile b/www/R-cran-selectr/Makefile
index 9a522583ff26..68f95967efbe 100644
--- a/www/R-cran-selectr/Makefile
+++ b/www/R-cran-selectr/Makefile
@@ -1,20 +1,20 @@
 PORTNAME=	selectr
 DISTVERSION=	0.4-2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Translate CSS Selectors to XPath Expressions
 WWW=		https://cran.r-project.org/web/packages/selectr/
 
 LICENSE=	BSD3CLAUSE
 
 CRAN_DEPENDS=	R-cran-stringr>0:textproc/R-cran-stringr \
 		R-cran-R6>0:devel/R-cran-R6
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=	cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/www/R-cran-servr/Makefile b/www/R-cran-servr/Makefile
index 430f7cab1fc3..9706d3080279 100644
--- a/www/R-cran-servr/Makefile
+++ b/www/R-cran-servr/Makefile
@@ -1,21 +1,22 @@
 PORTNAME=	servr
 PORTVERSION=	0.24
+PORTREVISION=	1
 CATEGORIES=	www
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Simple HTTP Server to Serve Static Files or Dynamic Documents
 WWW=		https://cran.r-project.org/web/packages/servr/
 
 LICENSE=	GPLv2+
 
 CRAN_DEPENDS=	R-cran-mime>=0.2:misc/R-cran-mime \
 		R-cran-httpuv>=1.5.2:www/R-cran-httpuv \
 		R-cran-xfun>0:misc/R-cran-xfun \
 		R-cran-jsonlite>0:converters/R-cran-jsonlite
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/www/R-cran-shiny/Makefile b/www/R-cran-shiny/Makefile
index 8a9bc3bb41de..a5103feafcbf 100644
--- a/www/R-cran-shiny/Makefile
+++ b/www/R-cran-shiny/Makefile
@@ -1,38 +1,39 @@
 PORTNAME=	shiny
 PORTVERSION=	1.7.2
+PORTREVISION=	1
 CATEGORIES=	www
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Web Application Framework for R
 WWW=		https://shiny.rstudio.com/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 CRAN_DEPENDS=	R-cran-httpuv>=1.5.2:www/R-cran-httpuv \
 		R-cran-mime>=0.3:misc/R-cran-mime \
 		R-cran-jsonlite>=0.9.16:converters/R-cran-jsonlite \
 		R-cran-xtable>0:textproc/R-cran-xtable \
 		R-cran-fontawesome>=0.2.1:devel/R-cran-fontawesome \
 		R-cran-htmltools>=0.5.2:textproc/R-cran-htmltools \
 		R-cran-R6>=2.0:devel/R-cran-R6 \
 		R-cran-sourcetools>0:devel/R-cran-sourcetools \
 		R-cran-later>=1.0.0:devel/R-cran-later \
 		R-cran-promises>=1.1.0:devel/R-cran-promises \
 		R-cran-crayon>0:devel/R-cran-crayon \
 		R-cran-rlang>=0.4.10:devel/R-cran-rlang \
 		R-cran-fastmap>=1.1.0:databases/R-cran-fastmap \
 		R-cran-withr>0:devel/R-cran-withr \
 		R-cran-commonmark>=1.7:textproc/R-cran-commonmark \
 		R-cran-glue>=1.3.2:devel/R-cran-glue \
 		R-cran-bslib>=0.3.0:www/R-cran-bslib \
 		R-cran-cachem>0:databases/R-cran-cachem \
 		R-cran-ellipsis>0:devel/R-cran-ellipsis \
 		R-cran-lifecycle>=0.2.0:devel/R-cran-lifecycle
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=	cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/www/R-cran-webshot/Makefile b/www/R-cran-webshot/Makefile
index 299b19a4c76c..d3d913920c5a 100644
--- a/www/R-cran-webshot/Makefile
+++ b/www/R-cran-webshot/Makefile
@@ -1,18 +1,19 @@
 PORTNAME=	webshot
 DISTVERSION=	0.5.4
+PORTREVISION=	1
 CATEGORIES=	www
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	ygy@FreeBSD.org
 COMMENT=	Take Screenshots of Web Pages
 WWW=		http://wch.github.io/webshot/
 
 LICENSE=	GPLv2
 
 RUN_DEPENDS=	R-cran-jsonlite>0:converters/R-cran-jsonlite \
 		R-cran-callr>0:devel/R-cran-callr \
 		R-cran-magrittr>0:devel/R-cran-magrittr
 
 USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/www/cgicc/Makefile b/www/cgicc/Makefile
index 533393d1cde9..f81537a4168d 100644
--- a/www/cgicc/Makefile
+++ b/www/cgicc/Makefile
@@ -1,29 +1,29 @@
 PORTNAME=	cgicc
 PORTVERSION=	3.2.19
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www devel
 MASTER_SITES=	GNU
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	C++ class library for writing CGI applications
 WWW=		https://www.gnu.org/software/cgicc/
 
 LICENSE=	LGPL3+
 
 USES=		autoreconf:build compiler:gcc-c++11-lib libtool pathfix
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOXYGEN DOCS
 DOXYGEN_IMPLIES=	DOCS
 DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
 DOXYGEN_CONFIGURE_ENV_OFF=	ac_cv_prog_DOXYGEN="${ECHO_CMD}"
 
 post-patch:
 	@${REINPLACE_CMD} -e \
 		'/^docdir/s|=.*|= @docdir@|' ${WRKSRC}/doc/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/www/emacs-w3m/Makefile b/www/emacs-w3m/Makefile
index 91a6e04796a8..db9bf1da0917 100644
--- a/www/emacs-w3m/Makefile
+++ b/www/emacs-w3m/Makefile
@@ -1,71 +1,72 @@
 PORTNAME=	emacs-w3m
 PORTVERSION=	1.4.632.b.${SNAPDATE}
+PORTREVISION=	5
 CATEGORIES=	www elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	nobutaka@FreeBSD.org
 COMMENT=	Simple front-end to w3m for emacs
 WWW=		http://emacs-w3m.namazu.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	w3m:www/w3m
 RUN_DEPENDS=	w3m:www/w3m
 
 USES=		autoreconf emacs tar:xz
 USE_GITHUB=	yes
 GH_TAGNAME=	9cd8135
 
 ALL_TARGET=	default
 INSTALL_TARGET=	install install-icons
 
 NO_ARCH=	yes
 SNAPDATE=	20221130
 MAKE_JOBS_UNSAFE=	yes
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-emacs=${EMACS_CMD} \
 		--with-lispdir=${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/w3m \
 		--with-icondir=${PREFIX}/${EMACS_LIBDIR}/etc/w3m/icons \
 		--without-compress-install
 
 INFO=		emacs-w3m-ja emacs-w3m
 PORTDOCS=	README*
 
 OPTIONS_DEFINE=		DOCS OCTET_VIEWER SHIMBUN
 OPTIONS_DEFAULT=	OCTET_VIEWER SHIMBUN
 OPTIONS_SUB=		yes
 
 OCTET_VIEWER_DESC=	Octet stream viewer support
 SHIMBUN_DESC=		Build and/or install Shimbun
 
 SHIMBUN_EXTRA_PATCHES_OFF=	${PATCHDIR}/extra-patch-Makefile.in
 SHIMBUN_BUILD_DEPENDS=	flim${EMACS_PKGNAMESUFFIX}>0:editors/flim@${EMACS_FLAVOR}
 SHIMBUN_RUN_DEPENDS=	flim${EMACS_PKGNAMESUFFIX}>0:editors/flim@${EMACS_FLAVOR}
 
 OCTET_VIEWER_RUN_DEPENDS=\
 		semi${EMACS_PKGNAMESUFFIX}>0:editors/semi@${EMACS_FLAVOR} \
 		wvHtml:textproc/wv \
 		xlhtml:textproc/xlhtml
 
 .include <bsd.port.pre.mk>
 
 .if ${EMACS_MAJOR_VER} == 28
 PLIST_SUB+=	EMACS28=""
 .else
 PLIST_SUB+=	EMACS28="@comment "
 .endif
 
 post-patch:
 	@${MV} ${WRKSRC}/aclocal.m4 ${WRKSRC}/acinclude.m4
 
 post-install:
 	${RM} ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/w3m/mew-shimbun.elc \
 	      ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/w3m/mew-w3m.elc
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.post.mk>
diff --git a/www/fgallery/Makefile b/www/fgallery/Makefile
index d3855970c116..e3096486a553 100644
--- a/www/fgallery/Makefile
+++ b/www/fgallery/Makefile
@@ -1,51 +1,52 @@
 PORTNAME=	fgallery
 PORTVERSION=	1.9.1
+PORTREVISION=	1
 CATEGORIES=	www graphics
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Modern, static javascript photo gallery generator
 WWW=		https://www.thregr.org/~wavexx/software/fgallery/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING.txt
 
 LIB_DEPENDS=	liblcms2.so:graphics/lcms2
 RUN_DEPENDS=	exiftool:graphics/p5-Image-ExifTool \
 		exiftran:graphics/exiftran \
 		p5-Cpanel-JSON-XS>=0:converters/p5-Cpanel-JSON-XS
 
 USES=		magick:6,run
 USE_GITHUB=	yes
 GH_ACCOUNT=	wavexx
 GH_TAGNAME=	45a8629
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 OPTIONS_DEFINE=		7ZIP FACEDETECT JPEGOPTIM PNGCRUSH
 OPTIONS_DEFAULT=	7ZIP FACEDETECT JPEGOPTIM PNGCRUSH
 
 7ZIP_DESC=		Use 7-Zip for better zip compression
 FACEDETECT_DESC=	Face detection for improved thumbnail centering
 JPEGOPTIM_DESC=		Use jpegoptim for JPEG size optimization
 PNGCRUSH_DESC=		Use pngcrush for PNG size optimization
 
 7ZIP_RUN_DEPENDS=	7zz:archivers/7-zip
 7ZIP_RUN_DEPENDS_OFF=	zip:archivers/zip
 FACEDETECT_RUN_DEPENDS=	facedetect:graphics/facedetect
 JPEGOPTIM_RUN_DEPENDS=	jpegoptim:graphics/jpegoptim
 PNGCRUSH_RUN_DEPENDS=	pngcrush:graphics/pngcrush
 
 post-patch-7ZIP-on:
 	@${REINPLACE_CMD} -e 's|7za|7zz|g' ${WRKSRC}/${PORTNAME}
 
 do-install:
 .for d in album view
 	(cd ${WRKSRC} && \
 	${COPYTREE_SHARE} ${d} ${STAGEDIR}${DATADIR})
 .endfor
 	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${DATADIR}
 	${LN} -s ${DATADIR}/${PORTNAME} ${STAGEDIR}/${PREFIX}/bin/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile
index 495ceadb9b8d..606ee78ff465 100644
--- a/www/gitlab-ce/Makefile
+++ b/www/gitlab-ce/Makefile
@@ -1,448 +1,448 @@
 PORTNAME=	gitlab-ce
 PORTVERSION=	15.10.3
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	www devel
 
 MAINTAINER=	mfechner@FreeBSD.org
 COMMENT=	Web GUI for managing git repositories
 WWW=		https://gitlab.com/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 # the rubygems of RUN_DEPENDS matches the order of the Gemfile
 # which makes maintaining this long list much easier!
 # devel/rubygem-parser is required for database upgrade process
 # see https://gitlab.com/gitlab-org/gitlab/-/issues/350866
 # mail/rubygem-net-smtp is required as ruby 3.1 removed it
 # textproc/rubygem-psych3 is required as ruby 3.1 applied an update to psych 4.0 which has breaking changes
 # mail/rubygem-net-pop is required as ruby 3.1 removed it
 MY_DEPENDS=	git>=2.39.2:devel/git \
 	gitaly>=${PORTVERSION}:devel/gitaly \
 	gitlab-elasticsearch-indexer>=4.1.0:textproc/gitlab-elasticsearch-indexer \
 	gitlab-agent>=15.10.0:net/gitlab-agent \
 	gitlab-metrics-exporter>0:devel/gitlab-metrics-exporter \
 	gitlab-pages>=${PORTVERSION}:www/gitlab-pages \
 	gitlab-shell>=14.18.0:devel/gitlab-shell \
 	gitlab-workhorse>=${PORTVERSION}:www/gitlab-workhorse \
 	redis>=6.2.11:databases/redis \
 	yarn${NODEJS_SUFFIX}>=1.10.0:www/yarn${NODEJS_SUFFIX} \
 	gtar>0:archivers/gtar \
 	bash>0:shells/bash \
 	rubygem-net-smtp>=0:mail/rubygem-net-smtp \
 	rubygem-net-pop>=0:mail/rubygem-net-pop \
 	rubygem-psych3>=3.1<4:textproc/rubygem-psych3 \
 	rubygem-rails61>=6.1.7.2<6.1.8:www/rubygem-rails61 \
 	rubygem-bootsnap>=1.16.0<1.17:devel/rubygem-bootsnap \
 	rubygem-openssl2>=2.2.2<2.3:security/rubygem-openssl2 \
 	rubygem-ipaddr122>=1.2.2<1.2.3:net/rubygem-ipaddr122 \
 	rubygem-responders-rails61>=3.0<4.0:www/rubygem-responders-rails61 \
 	rubygem-sprockets3>=3.7<3.8:devel/rubygem-sprockets3 \
 	rubygem-view_component-rails61>=2.74.1<2.75:devel/rubygem-view_component-rails61 \
 	rubygem-pg>=1.4.5<1.5:databases/rubygem-pg \
 	rubygem-rugged>=1.5<2:devel/rubygem-rugged \
 	rubygem-grape-path-helpers>=1.7.1<1.8:devel/rubygem-grape-path-helpers \
 	rubygem-faraday1>=1.10.0<2:www/rubygem-faraday1 \
 	rubygem-marginalia>=1.11.1<1.12:databases/rubygem-marginalia \
 	rubygem-declarative_policy>=1.1.0<1.2:security/rubygem-declarative_policy \
 	rubygem-devise-rails61>=4.8.1<4.9:devel/rubygem-devise-rails61 \
 	rubygem-bcrypt>=3.1.14<3.2:security/rubygem-bcrypt \
 	rubygem-doorkeeper562>=5.5.4<5.6.3:security/rubygem-doorkeeper562 \
 	rubygem-doorkeeper-openid_connect>=1.8.3<2:security/rubygem-doorkeeper-openid_connect \
 	rubygem-rexml>=3.2.5<3.3:textproc/rubygem-rexml \
 	rubygem-ruby-saml>=1.13.0<1.14:security/rubygem-ruby-saml \
 	rubygem-omniauth>=2.1.0<3:security/rubygem-omniauth \
 	rubygem-omniauth-auth0>=3.0.0<3.1.0:net/rubygem-omniauth-auth0 \
 	rubygem-omniauth-azure-activedirectory-v2>=2.0<3:net/rubygem-omniauth-azure-activedirectory-v2 \
 	rubygem-omniauth-cas3-oauth2>=1.1.4<1.2.0:security/rubygem-omniauth-cas3-oauth2 \
 	rubygem-omniauth-dingtalk-oauth2>=1.0.1<2:security/rubygem-omniauth-dingtalk-oauth2 \
 	rubygem-omniauth-alicloud>=2.0.1<2.1:security/rubygem-omniauth-alicloud \
 	rubygem-omniauth-facebook>=4.0.0:net/rubygem-omniauth-facebook \
 	rubygem-omniauth-github>=2.0.1<2.1:net/rubygem-omniauth-github \
 	rubygem-omniauth-google-oauth2>=1.1<2:net/rubygem-omniauth-google-oauth2 \
 	rubygem-omniauth-oauth2-generic>=0.2.2<0.3.0:security/rubygem-omniauth-oauth2-generic \
 	rubygem-omniauth-saml>=2.0.0<3:security/rubygem-omniauth-saml \
 	rubygem-omniauth-twitter>=1.4<2.0:net/rubygem-omniauth-twitter \
 	rubygem-omniauth_openid_connect>=0.6.1<0.7.0:net/rubygem-omniauth_openid_connect \
 	rubygem-openid_connect>=1.3.0<1.3.1:net/rubygem-openid_connect \
 	rubygem-omniauth-atlassian-oauth2>=0.2.0<0.3:security/rubygem-omniauth-atlassian-oauth2 \
 	rubygem-rack-oauth21>=1.21.3<1.22.0:security/rubygem-rack-oauth21 \
 	rubygem-jwt25>=2.5.0<2.6:www/rubygem-jwt25 \
 	rubygem-gssapi>=1.3.1<1.4:security/rubygem-gssapi \
 	rubygem-recaptcha>=5.12<6.0:devel/rubygem-recaptcha \
 	rubygem-akismet>=3.0<4.0:devel/rubygem-akismet \
 	rubygem-invisible_captcha>=2.0.0<2.1.0:graphics/rubygem-invisible_captcha \
 	rubygem-devise-two-factor-rails61>=4.0.2<4.1:security/rubygem-devise-two-factor-rails61 \
 	rubygem-rqrcode-rails3>=0.1.7<0.2.0:www/rubygem-rqrcode-rails3 \
 	rubygem-u2f0>=0.2.1<0.3.0:net/rubygem-u2f0 \
 	rubygem-validates_hostname>=1.0.11<1.1.0:dns/rubygem-validates_hostname \
 	rubygem-rubyzip>=2.3.2<2.4:archivers/rubygem-rubyzip \
 	rubygem-acme-client>=2.0.9<3:security/rubygem-acme-client \
 	rubygem-browser>=5.3.1<5.4:www/rubygem-browser \
 	rubygem-ohai>=16.10<17:sysutils/rubygem-ohai \
 	rubygem-gpgme>=2.0.22<2.1.0:security/rubygem-gpgme \
 	rubygem-gitlab_omniauth-ldap>=2.2.0<2.3.0:net/rubygem-gitlab_omniauth-ldap \
 	rubygem-net-ldap017>=0.17.1<0.18:net/rubygem-net-ldap017 \
 	rubygem-grape15>=1.5.2<1.6:devel/rubygem-grape15 \
 	rubygem-grape-entity>=0.10.0<0.11.0,1:devel/rubygem-grape-entity \
 	rubygem-rack-cors>=1.1.1<1.2.0:www/rubygem-rack-cors \
 	rubygem-grape-swagger>=1.5.0<1.6:devel/rubygem-grape-swagger \
 	rubygem-grape-swagger-entity>=0.5.1<0.6:devel/rubygem-grape-swagger-entity \
 	rubygem-graphql>=1.13.12<1.14:devel/rubygem-graphql \
 	rubygem-graphiql-rails>=1.8<2:devel/rubygem-graphiql-rails \
 	rubygem-apollo_upload_server>=2.1.0<2.2:net/rubygem-apollo_upload_server \
 	rubygem-graphql-docs>=2.1.0<2.2.0:devel/rubygem-graphql-docs \
 	rubygem-graphlient>=0.5.0<0.6:devel/rubygem-graphlient \
 	rubygem-hashie>=5.0.0<5.1:devel/rubygem-hashie \
 	rubygem-kaminari-rails61>=1.2.2<1.3:www/rubygem-kaminari-rails61 \
 	rubygem-hamlit>=2.15.0<2.16:www/rubygem-hamlit \
 	rubygem-carrierwave>=1.3.2<2.0:www/rubygem-carrierwave \
 	rubygem-mini_magick410>=4.10.1<4.11:graphics/rubygem-mini_magick410 \
 	rubygem-fog-aws>=3.18<4:net/rubygem-fog-aws \
 	rubygem-fog-core210>=2.1.0<2.1.1:devel/rubygem-fog-core210 \
 	rubygem-fog-google>=1.19<2:net/rubygem-fog-google \
 	rubygem-fog-local>=0.8<1.0:net/rubygem-fog-local \
 	rubygem-fog-aliyun>=0.4<1.0:net/rubygem-fog-aliyun \
 	rubygem-gitlab-fog-azure-rm>=1.7.0<1.8:net/rubygem-gitlab-fog-azure-rm \
 	rubygem-google-cloud-storage>=1.44.0<1.45:net/rubygem-google-cloud-storage \
 	rubygem-google-apis-core>=0.10.0<0.12:devel/rubygem-google-apis-core \
 	rubygem-google-apis-compute_v1_057>=0.57.0<0.58:devel/rubygem-google-apis-compute_v1_057 \
 	rubygem-google-apis-container_v1>=0.43.0<0.44:devel/rubygem-google-apis-container_v1 \
 	rubygem-google-apis-container_v1beta1>=0.43.0<0.44:devel/rubygem-google-apis-container_v1beta1 \
 	rubygem-google-apis-cloudbilling_v1>=0.21.0<0.22:devel/rubygem-google-apis-cloudbilling_v1 \
 	rubygem-google-apis-cloudresourcemanager_v1>=0.31.0<0.32:devel/rubygem-google-apis-cloudresourcemanager_v1 \
 	rubygem-google-apis-iam_v1>=0.36.0<0.37:devel/rubygem-google-apis-iam_v1 \
 	rubygem-google-apis-serviceusage_v1>=0.28.0<0.29:devel/rubygem-google-apis-serviceusage_v1 \
 	rubygem-google-apis-sqladmin_v1beta4_041>=0.41.0<0.42:devel/rubygem-google-apis-sqladmin_v1beta4_041 \
 	rubygem-unf>=0.1.4<0.2.0:textproc/rubygem-unf \
 	rubygem-seed-fu>=2.3.7<2.4.0:databases/rubygem-seed-fu \
 	rubygem-elasticsearch-model713>=7.2<8:textproc/rubygem-elasticsearch-model713 \
 	rubygem-elasticsearch-rails>=7.2<8:textproc/rubygem-elasticsearch-rails \
 	rubygem-elasticsearch-api713>=7.13.3<7.13.4:textproc/rubygem-elasticsearch-api713 \
 	rubygem-aws-sdk-core3170>=3.170.0<3.171:devel/rubygem-aws-sdk-core3170 \
 	rubygem-aws-sdk-cloudformation>=1<2:devel/rubygem-aws-sdk-cloudformation \
 	rubygem-aws-sdk-s31119>=1.119.1<1.120:devel/rubygem-aws-sdk-s31119 \
 	rubygem-faraday_middleware-aws-sigv403>=0.3.0<0.4:devel/rubygem-faraday_middleware-aws-sigv403 \
 	rubygem-typhoeus>=1.4.0<1.5:www/rubygem-typhoeus \
 	rubygem-html-pipeline>=2.14.3<2.15:textproc/rubygem-html-pipeline \
 	rubygem-deckar01-task_list>=2.3.2<2.4:www/rubygem-deckar01-task_list \
 	rubygem-gitlab-markup>=1.9.0<1.10.0:textproc/rubygem-gitlab-markup \
 	rubygem-commonmarker>=0.23.6<0.24:textproc/rubygem-commonmarker \
 	rubygem-kramdown23>=2.3.1<2.4:textproc/rubygem-kramdown23 \
 	rubygem-redcloth>=4.3.2<4.4.0:www/rubygem-redcloth \
 	rubygem-rdoc63>=6.3.2<7:devel/rubygem-rdoc63 \
 	rubygem-org-ruby>=0.9.12<0.10.0:textproc/rubygem-org-ruby \
 	rubygem-creole>=0.5.0<0.6.0:textproc/rubygem-creole \
 	rubygem-wikicloth081>=0.8.1<0.8.2:textproc/rubygem-wikicloth081 \
 	rubygem-asciidoctor>=2.0.18<2.1.0:textproc/rubygem-asciidoctor \
 	rubygem-asciidoctor-include-ext>=0.4.0<0.5.0:textproc/rubygem-asciidoctor-include-ext \
 	rubygem-asciidoctor-plantuml00>=0.0.16<0.1:textproc/rubygem-asciidoctor-plantuml00 \
 	rubygem-asciidoctor-kroki>=0.8.0<0.9:textproc/rubygem-asciidoctor-kroki \
 	rubygem-rouge>=4.1.0<4.2:textproc/rubygem-rouge \
 	rubygem-truncato>=0.7.11<0.8.0:textproc/rubygem-truncato \
 	rubygem-nokogiri>=1.14.2<1.15:textproc/rubygem-nokogiri \
 	rubygem-icalendar>=0:devel/rubygem-icalendar \
 	rubygem-diffy>=3.4<4:textproc/rubygem-diffy \
 	rubygem-diff_match_patch>=0.1.0<0.2.0:textproc/rubygem-diff_match_patch \
 	rubygem-rack22>=2.2.6.2<2.3,3:www/rubygem-rack22 \
 	rubygem-rack-timeout>=0.6.3<0.7:www/rubygem-rack-timeout \
 	rubygem-puma>=5.6.5<5.7:www/rubygem-puma \
 	rubygem-puma_worker_killer>=0.3.1:www/rubygem-puma_worker_killer \
 	rubygem-sd_notify>=0.1.1<0.2:devel/rubygem-sd_notify \
 	rubygem-state_machines-activerecord>=0.8.0<0.9.0:databases/rubygem-state_machines-activerecord \
 	rubygem-acts-as-taggable-on>=9.0<10:www/rubygem-acts-as-taggable-on \
 	rubygem-sidekiq6>=6.5.7<6.6:devel/rubygem-sidekiq6 \
 	rubygem-sidekiq-cron18>=1.8.0<1.9:devel/rubygem-sidekiq-cron18 \
 	rubygem-redis-namespace19>=1.9.0<1.10.0:databases/rubygem-redis-namespace19 \
 	rubygem-gitlab-sidekiq-fetcher>=0.9.0<0.10:devel/rubygem-gitlab-sidekiq-fetcher \
 	rubygem-fugit>=1.8.1<1.9:devel/rubygem-fugit \
 	rubygem-httparty>=0.20.0<0.21:www/rubygem-httparty \
 	rubygem-rainbow>=3.1.1<4.0:devel/rubygem-rainbow \
 	rubygem-ruby-progressbar>=1.11<2:devel/rubygem-ruby-progressbar \
 	rubygem-settingslogic>=2.0.9<2.1.0:devel/rubygem-settingslogic \
 	rubygem-re2>=1.6.0<1.7.0:devel/rubygem-re2 \
 	rubygem-version_sorter>=2.3<3:textproc/rubygem-version_sorter \
 	rubygem-js_regex>=3.8<4.0:textproc/rubygem-js_regex \
 	rubygem-device_detector>=0:devel/rubygem-device_detector \
 	rubygem-redis4>=4.8.0<5:databases/rubygem-redis4 \
 	rubygem-connection_pool>=2.2.5<3.0:net/rubygem-connection_pool \
 	rubygem-redis-actionpack-rails61>=5.3.0<5.4:databases/rubygem-redis-actionpack-rails61 \
 	rubygem-discordrb-webhooks>=3.4<4.0:net-im/rubygem-discordrb-webhooks \
 	rubygem-jira-ruby21>=2.1.4<2.2:devel/rubygem-jira-ruby21 \
 	rubygem-atlassian-jwt>=0.2.0<0.3.0:www/rubygem-atlassian-jwt \
 	rubygem-slack-messenger>=2.3.4<2.4.0:devel/rubygem-slack-messenger \
 	rubygem-hangouts-chat>=0.0.5<0.1.0:net/rubygem-hangouts-chat \
 	rubygem-asana0>=0.10.13<0.11:www/rubygem-asana0 \
 	rubygem-ruby-fogbugz>=0.3.0<0.4.0:devel/rubygem-ruby-fogbugz \
 	rubygem-kubeclient>=4.11.0<4.12.0:www/rubygem-kubeclient \
 	rubygem-sanitize>=6.0<7:textproc/rubygem-sanitize \
 	rubygem-babosa>=1.0.4<1.1.0:textproc/rubygem-babosa \
 	rubygem-loofah219>=2.19.1<2.20:textproc/rubygem-loofah219 \
 	rubygem-licensee>=9.15<10:devel/rubygem-licensee \
 	rubygem-charlock_holmes>=0.7.7<0.8.0:textproc/rubygem-charlock_holmes \
 	rubygem-ruby-magic>=0.6<1:devel/rubygem-ruby-magic \
 	rubygem-fast_blank>=0:devel/rubygem-fast_blank \
 	rubygem-gitlab-chronic>=0.10.5<0.11.0:devel/rubygem-gitlab-chronic \
 	rubygem-gitlab_chronic_duration>=0.10.6.2<0.10.7:devel/rubygem-gitlab_chronic_duration \
 	rubygem-rack-proxy>=0.7.6<0.8.0:www/rubygem-rack-proxy \
 	rubygem-sassc-rails-rails61>=2.1.0<2.2.0:textproc/rubygem-sassc-rails-rails61 \
 	rubygem-autoprefixer-rails1025>=10.2.5.1<10.2.6:textproc/rubygem-autoprefixer-rails1025 \
 	rubygem-terser>=1.0.2:textproc/rubygem-terser \
 	rubygem-addressable>=2.8<3:www/rubygem-addressable \
 	rubygem-tanuki_emoji>=0.6<1:graphics/rubygem-tanuki_emoji \
 	rubygem-gon-rails61>=6.4.0<6.5:www/rubygem-gon-rails61 \
 	rubygem-request_store>=1.5.1<2.0:devel/rubygem-request_store \
 	rubygem-base32>=0.3.0<0.4.0:converters/rubygem-base32 \
 	rubygem-gitlab-license>=2.2.1<2.3:devel/rubygem-gitlab-license \
 	rubygem-rack-attack>=6.6.1<6.7:www/rubygem-rack-attack \
 	rubygem-sentry-raven>=3.1<4.0:devel/rubygem-sentry-raven \
 	rubygem-sentry-ruby>=5.1.1<5.2:devel/rubygem-sentry-ruby \
 	rubygem-sentry-rails>=5.1.1<5.2:devel/rubygem-sentry-rails \
 	rubygem-sentry-sidekiq>=5.1.1<5.2:devel/rubygem-sentry-sidekiq \
 	rubygem-pg_query>=2.2.1<3:databases/rubygem-pg_query \
 	rubygem-premailer-rails-rails61>=1.10.3<1.11:mail/rubygem-premailer-rails-rails61 \
 	rubygem-gitlab-labkit>=0.31.1<0.32:devel/rubygem-gitlab-labkit \
 	rubygem-thrift>=0.16.0:devel/rubygem-thrift \
 	rubygem-ruby_parser>=3.19<4.0:devel/rubygem-ruby_parser \
 	rubygem-rails-i18n-rails61>=7.0<8:devel/rubygem-rails-i18n-rails61 \
 	rubygem-gettext_i18n_rails18>=1.8.0<1.9.0:devel/rubygem-gettext_i18n_rails18 \
 	rubygem-gettext_i18n_rails_js-rails61>=1.3<2.0:devel/rubygem-gettext_i18n_rails_js-rails61 \
 	rubygem-gettext>=3.3<4:devel/rubygem-gettext \
 	rubygem-batch-loader>=2.0.1<2.1:devel/rubygem-batch-loader \
 	rubygem-peek-rails61>=1.1.0<2.0:devel/rubygem-peek-rails61 \
 	rubygem-snowplow-tracker>=0.8.0<1:devel/rubygem-snowplow-tracker \
 	rubygem-webrick17>=1.7.0<1.8:www/rubygem-webrick17 \
 	rubygem-prometheus-client-mmap>=0.19<1:devel/rubygem-prometheus-client-mmap \
 	rubygem-warning>=1.3.0<1.4:devel/rubygem-warning \
 	rubygem-license_finder>=7.0.0<8:devel/rubygem-license_finder \
 	rubygem-gitlab-dangerfiles>=3.8.0<3.9:devel/rubygem-gitlab-dangerfiles \
 	rubygem-octokit>=4.20<5.0:net/rubygem-octokit \
 	rubygem-gitlab-mail_room>=0.0.9<0.1.0:mail/rubygem-gitlab-mail_room \
 	rubygem-email_reply_trimmer>=0.1<1.0:mail/rubygem-email_reply_trimmer \
 	rubygem-html2text>=0:textproc/rubygem-html2text \
 	rubygem-stackprof>=0.2.23<0.3:devel/rubygem-stackprof \
 	rubygem-rbtrace>=0.4.14<1.0:devel/rubygem-rbtrace \
 	rubygem-memory_profiler>=1.0<2.0:devel/rubygem-memory_profiler \
 	rubygem-benchmark-memory>=0.1<1.0:benchmarks/rubygem-benchmark-memory \
 	rubygem-activerecord-explain-analyze>=0.1<1.0:databases/rubygem-activerecord-explain-analyze \
 	rubygem-oauth2>=2.0<3:net/rubygem-oauth2 \
 	rubygem-health_check>=3.0<4:devel/rubygem-health_check \
 	rubygem-vmstat>=2.3.0<2.4.0:sysutils/rubygem-vmstat \
 	rubygem-sys-filesystem>=1.4.3<1.5:sysutils/rubygem-sys-filesystem \
 	rubygem-net-ntp>0:net/rubygem-net-ntp \
 	rubygem-ssh_data>=1.3<2:security/rubygem-ssh_data \
 	rubygem-spamcheck>=1.0.0<1.1:net/rubygem-spamcheck \
 	rubygem-gitaly>=15.9.0.pre.rc3<15.10.0:net/rubygem-gitaly \
 	rubygem-kas-grpc>=0.0.2,1<0.0.3,1:net/rubygem-kas-grpc \
 	rubygem-grpc>=1.42.0<2:net/rubygem-grpc \
 	rubygem-google-protobuf>=3.22.2<4:devel/rubygem-google-protobuf \
 	rubygem-toml-rb>=2.2.0<3:www/rubygem-toml-rb \
 	rubygem-flipper025>=0.25.0<0.26:devel/rubygem-flipper025 \
 	rubygem-flipper-active_record-rails61>=0.25.0<0.26:databases/rubygem-flipper-active_record-rails61 \
 	rubygem-flipper-active_support_cache_store-rails61>=0.25.0<0.26:devel/rubygem-flipper-active_support_cache_store-rails61 \
 	rubygem-unleash>=3.2.2<3.3:devel/rubygem-unleash \
 	rubygem-gitlab-experiment>=0.7.0<0.8:devel/rubygem-gitlab-experiment \
 	rubygem-lograge-rails61>=0.11.2<1.0:www/rubygem-lograge-rails61 \
 	rubygem-grape_logging>=1.8<2.0:devel/rubygem-grape_logging \
 	rubygem-gitlab-net-dns>=0.9.1<0.10:dns/rubygem-gitlab-net-dns \
 	rubygem-countries>=4.1.3<4.2.0:devel/rubygem-countries \
 	rubygem-retriable>=3.1.2<3.2.0:devel/rubygem-retriable \
 	rubygem-lru_redux>0:devel/rubygem-lru_redux \
 	rubygem-mail>=2.8.1<2.8.2,2:mail/rubygem-mail \
 	rubygem-lockbox>=1.1.1<1.2:security/rubygem-lockbox \
 	rubygem-valid_email>=0.1<1:mail/rubygem-valid_email \
 	rubygem-json>=2.6.3<3:devel/rubygem-json \
 	rubygem-json_schemer>=0.2.18<0.3:devel/rubygem-json_schemer \
 	rubygem-oj>=3.13.21<3.14:devel/rubygem-oj \
 	rubygem-oj-introspect>=0.7<1:devel/rubygem-oj-introspect \
 	rubygem-multi_json114>=1.14.1<1.15:devel/rubygem-multi_json114 \
 	rubygem-yajl-ruby>=1.4.3<1.5:devel/rubygem-yajl-ruby \
 	rubygem-webauthn>=3.0<4:security/rubygem-webauthn \
 	rubygem-ipaddress>=0.8.3<0.9:net/rubygem-ipaddress \
 	rubygem-parslet1>=1.8<2:textproc/rubygem-parslet1 \
 	rubygem-ed25519>=1.3.0<1.4:security/rubygem-ed25519 \
 	rubygem-parser>=0:devel/rubygem-parser \
 	rubygem-cvss-suite>=3.0.1<3.1:security/rubygem-cvss-suite \
 	rubygem-arr-pm>=0.0.12<0.1:devel/rubygem-arr-pm \
 	rubygem-CFPropertyList>=3.0.0<3.1:devel/rubygem-CFPropertyList \
 	rubygem-app_store_connect>=0:net/rubygem-app_store_connect \
 	rubygem-telesignenterprise>=2.2<3:devel/rubygem-telesignenterprise \
 	rubygem-net-protocol01>=0.1.3<0.2:net/rubygem-net-protocol01 \
 	rubygem-duo_api>=1.3<2:security/rubygem-duo_api \
 	rubygem-google-cloud-profiler-v2>=0.3<1:textproc/rubygem-google-cloud-profiler-v2
 
 BUILD_DEPENDS=	gem:devel/ruby-gems \
 	${MY_DEPENDS}
 
 RUN_DEPENDS=	${MY_DEPENDS}
 
 CONFLICTS_INSTALL=	gitolite \
 			gitolite2 \
 			gogs \
 			gitea \
 			gitosis
 
 USES=		go:modules nodejs:env ruby shebangfix
 
 USE_RC_SUBR=	gitlab
 USE_GITLAB=	yes
 GL_ACCOUNT=	gitlab-org
 GL_PROJECT=	gitlab-foss
 # Find the here: https://gitlab.com/gitlab-org/gitlab-foss/-/tags
 GL_COMMIT=	1b7933f32303f102555ce078716a33a701e434e1
 
 USERS=	git
 GROUPS=	git
 
 NO_BUILD=	yes
 
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=			KERBEROS
 OPTIONS_DEFAULT=		KERBEROS
 
 KERBEROS_BUILD_DEPENDS=		rubygem-timfel-krb5-auth>=0.8<1:security/rubygem-timfel-krb5
 KERBEROS_RUN_DEPENDS=		rubygem-timfel-krb5-auth>=0.8<1:security/rubygem-timfel-krb5
 KERBEROS_EXTRA_PATCHES_OFF=	${FILESDIR}/extra-patch-Gemfile-kerberos-off
 
 SHEBANG_FILES=	scripts/build_qa_image \
 		scripts/db_tasks \
 		scripts/rails-update-bisect \
 		scripts/generate-e2e-pipeline \
 		scripts/frontend/execute-on-staged-files.sh \
 		scripts/frontend/start_storybook.sh \
 		scripts/partitioning/generate-fk \
 		.lefthook/pre-push/merge_conflicts \
 		qa/gdk/launch \
 		qa/bin/test
 
 post-patch:
 	${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/config/gitlab.yml.example \
 		${WRKSRC}/config/puma.rb.example \
 		${WRKSRC}/lib/support/nginx/gitlab \
 		${WRKSRC}/lib/support/nginx/gitlab-ssl
 	# Remove symlink a create a file with content
 	${RM} ${WRKSRC}/GITLAB_WORKHORSE_VERSION
 	${ECHO} ${PORTVERSION} > ${WRKSRC}/GITLAB_WORKHORSE_VERSION
 
 do-install:
 	${CP} ${WRKSRC}/config/database.yml.postgresql ${WRKSRC}/config/database.yml.sample
 	(cd ${WRKSRC} && ${RM} Gemfile.lock && bundle install --local)
 	${RM} -R ${WRKSRC}/workhorse
 	# Has only a Gemfile.lock, so remove it, is maybe fixed by a newer version
 	${RM} -R ${WRKSRC}/vendor/gems/omniauth-google-oauth2
 	${FIND} ${WRKSRC} -name '*.orig' -delete
 	${FIND} ${WRKSRC} -name '*.bak' -delete
 	${FIND} ${WRKSRC} -name '*.gitkeep' -delete
 	${FIND} ${WRKSRC} -name '*.gitignore' -delete
 	${FIND} ${WRKSRC} -name "Gemfile.lock" -delete
 	${MV} ${WRKSRC}/config/initializers/relative_url.rb.sample ${WRKSRC}/config/initializers/relative_url.rb.example
 	# get files for workdir with: find . -name "*.example"
 	${MV} ${WRKSRC}/config/puma.rb.example ${WRKSRC}/config/puma.rb.sample
 	${MV} ${WRKSRC}/config/secrets.yml.example ${WRKSRC}/config/secrets.yml.sample
 	${MV} ${WRKSRC}/config/sidekiq.yml.example ${WRKSRC}/config/sidekiq.yml.sample
 	${MV} ${WRKSRC}/config/cable.yml.example ${WRKSRC}/config/cable.yml.sample
 	${MV} ${WRKSRC}/config/gitlab.yml.example ${WRKSRC}/config/gitlab.yml.sample
 	${MV} ${WRKSRC}/config/initializers/devise_password_length.rb.example ${WRKSRC}/config/initializers/devise_password_length.rb.sample
 	${MV} ${WRKSRC}/config/resque.yml.example ${WRKSRC}/config/resque.yml.sample
 	${MV} ${WRKSRC}/lib/support/nginx/gitlab ${WRKSRC}/lib/support/nginx/gitlab.sample
 	${MV} ${WRKSRC}/lib/support/nginx/gitlab-ssl ${WRKSRC}/lib/support/nginx/gitlab-ssl.sample
 	${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/public/assets
 	${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/public/uploads
 	${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/tmp/cache
 	${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/tmp/sessions
 	${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/tmp/backups
 	${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/tmp/sockets/private/internal
 	${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/shared/tmp
 	${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/shared/artifacts/tmp/work
 	${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/vendor/assets/stylesheets
 	${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/workhorse/changelogs/unreleased
 	# Skip file having an executable bit
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/www/${PORTNAME} "-not ( -type f -perm -a=x )")
 	# now copy all files having an execution bit and preserve to x bit (this fixes some issues we saw)
 	(cd ${WRKSRC} && ${COPYTREE_BIN} . ${STAGEDIR}${PREFIX}/www/${PORTNAME} "-type f -perm -a=x")
 
 post-install:
 	${FIND} -s ${STAGEDIR}${WWWDIR} -not -type d | ${SORT} | \
 		${SED} -e 's#^${STAGEDIR}${PREFIX}/##' | \
 		${SED} -E -e '/sample$$/ s#^#@sample #; \
 		/secrets.yml.sample$$/ s#^@sample #@sample(git,www,0600) #; \
 		s#${WWWDIR_REL}/bin#@(git,,544) ${WWWDIR_REL}/bin#; \
 		/db\/schema.rb$$|gitlab.po$$|gitlab.pot$$|gitlab.po.time_stamp$$|locale\/index.js$$/ s#^#@(git,,) #;' >> ${TMPPLIST}
 	@${ECHO_CMD} "@owner git" >> ${TMPPLIST}
 	@${ECHO_CMD} "@group www" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(git,git) ${WWWDIR_REL}/" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir ${WWWDIR_REL}/app/assets/images/auth_buttons/" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir ${WWWDIR_REL}/app/assets/javascripts/locale/" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir ${WWWDIR_REL}/app/assets/javascripts/pipeline_wizard/templates/" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(git,git,554) ${WWWDIR_REL}/bin" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir ${WWWDIR_REL}/config" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/builds" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir ${WWWDIR_REL}/lib/assets" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/bg" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/de" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/eo" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/es" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/fil_PH" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/fr" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/id_ID" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/it" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/ja" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/ko" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/nl_NL" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/pl_PL" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/pt_BR" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/ru" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/tr_TR" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/uk" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/zh_CN" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/zh_HK" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/zh_TW" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/log" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir ${WWWDIR_REL}/public" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir ${WWWDIR_REL}/public/assets" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/public/uploads" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir ${WWWDIR_REL}/qa/qa/specs/features/api/2_plan" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir ${WWWDIR_REL}/qa/qa/specs/features/api/4_verify" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir ${WWWDIR_REL}/qa/qa/specs/features/api/5_package" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir ${WWWDIR_REL}/qa/qa/specs/features/api/6_release" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir ${WWWDIR_REL}/qa/qa/specs/features/api/7_configure" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir ${WWWDIR_REL}/qa/qa/specs/features/api/8_monitor" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir ${WWWDIR_REL}/qa/qa/specs/features/browser_ui/5_package" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir ${WWWDIR_REL}/qa/qa/specs/features/browser_ui/8_monitor" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir ${WWWDIR_REL}/qa/tmp" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir ${WWWDIR_REL}/spec/support/gitlab-git-test.git/refs/heads" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir ${WWWDIR_REL}/spec/support/gitlab-git-test.git/refs/tags" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/shared" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/shared/artifacts" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/shared/artifacts/tmp" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/shared/artifacts/tmp/cache" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/shared/artifacts/tmp/uploads" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/shared/artifacts/tmp/work" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/shared/packages" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/shared/pages" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/shared/terraform_state" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/shared/tmp" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/shared/lfs-objects" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/shared/registry" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/backups" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/cache" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/feature_flags" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/pids" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/prometheus_multiproc_dir" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/prometheus_multiproc_dir/puma" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/prometheus_multiproc_dir/sidekiq" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/prometheus_multiproc_dir/unicorn" >> ${TMPPLIST}
 	#@${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/run" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/sessions" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/sockets" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/sockets/private" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/sockets/private/internal" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/vendor" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/vendor/assets" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/vendor/assets/stylesheets" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/workhorse/changelogs/unreleased" >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/www/kannel-sqlbox/Makefile b/www/kannel-sqlbox/Makefile
index 35c27c5c5c76..1acc18fdc2e9 100644
--- a/www/kannel-sqlbox/Makefile
+++ b/www/kannel-sqlbox/Makefile
@@ -1,44 +1,44 @@
 PORTNAME=	kannel-sqlbox
 PORTVERSION=	1.0.1
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	www
 
 MAINTAINER=	dbaio@FreeBSD.org
 # Co-maintainer: Alberto Mijares <amijaresp@gmail.com> (PR/173889)
 COMMENT=	Add-on module for www/kannel (svn rev.55)
 WWW=		https://redmine.kannel.org/projects/kannel-sq-lbox
 
 LICENSE=	The_Kannel_Software_License
 LICENSE_NAME=	The Kannel Software License, Version 1.0
 LICENSE_FILE=	${WRKSRC}/KannelLICENSE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 BUILD_DEPENDS=	${LOCALBASE}/include/kannel/gw-config.h:www/kannel
 RUN_DEPENDS=	${LOCALBASE}/sbin/bearerbox:www/kannel
 LIB_DEPENDS=	libpcreposix.so:devel/pcre
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	dbaio
 
 USES=		gmake gnome iconv ssl
 USE_GCC=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	libxml2
 
 OPTIONS_MULTI=	DATABASE
 OPTIONS_MULTI_DATABASE=	MYSQL PGSQL SQLITE3
 OPTIONS_DEFAULT=	MYSQL
 
 MYSQL_USES=	mysql
 
 PGSQL_USES=	pgsql
 
 SQLITE3_USES=	sqlite:3
 
 USE_RC_SUBR=	kannel_sqlbox
 SUB_FILES=	pkg-message
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/example/sqlbox.conf.example \
 	${STAGEDIR}${PREFIX}/etc/sqlbox.conf.sample
 .include <bsd.port.mk>
diff --git a/www/kannel/Makefile b/www/kannel/Makefile
index 0b0c2f4018de..9a5137ef14e7 100644
--- a/www/kannel/Makefile
+++ b/www/kannel/Makefile
@@ -1,64 +1,64 @@
 PORTNAME=	kannel
 PORTVERSION=	1.4.4
-PORTREVISION=	11
+PORTREVISION=	12
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	http://www.kannel.org/download/${PORTVERSION}/
 DISTNAME=	gateway-${PORTVERSION}
 
 MAINTAINER=	dbaio@FreeBSD.org
 COMMENT=	WAP/SMS gateway
 WWW=		http://www.kannel.org/
 
 LICENSE=	The_Kannel_Software_License
 LICENSE_NAME=	The Kannel Software License, Version 1.0
 LICENSE_FILE=	${WRKSRC}/LICENSE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 LIB_DEPENDS=	libpcre.so:devel/pcre
 
 PORTSCOUT=	skipv:1.5.0
 
 USERS=		kannel
 GROUPS=		kannel
 
 USES=		cpe gmake gnome iconv ssl tar:bzip2
 USE_GCC=	yes
 USE_GNOME=	libxml2
 USE_RC_SUBR=	${PORTNAME}_bearerbox ${PORTNAME}_smsbox ${PORTNAME}_wapbox
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-pcre=yes --enable-docs=no --with-malloc=native \
 		--enable-start-stop-daemon=no
 CFLAGS+=	-fcommon
 
 OPTIONS_DEFINE=	MYSQL PGSQL SQLITE3
 OPTIONS_DEFAULT=	MYSQL
 
 SQLITE3_USES=	sqlite:3
 SQLITE3_CONFIGURE_WITH=	sqlite3
 
 MYSQL_USES=	mysql
 MYSQL_CONFIGURE_WITH=	mysql
 MYSQL_VARS=	IGNORE_WITH_MYSQL=80
 
 PGSQL_USES=	pgsql
 PGSQL_CONFIGURE_WITH=	pgsql
 
 post-patch:
 	@${RM} ${WRKSRC}/wmlscript/wsgram.y
 
 post-install:
 .for filename in wapkannel.conf smskannel.conf
 	${INSTALL_DATA} ${WRKSRC}/gw/${filename} \
 		${STAGEDIR}${PREFIX}/etc/${filename}.sample
 .endfor
 .for filename in mtbatch seewbmp wmlsc wmlsdasm decode_emimsg
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${filename}
 .endfor
 .for filename in bearerbox run_kannel_box smsbox wapbox
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/${filename}
 .endfor
 	@${MKDIR} ${STAGEDIR}/var/log/kannel
 	@${MKDIR} ${STAGEDIR}/var/run/kannel
 
 .include <bsd.port.mk>
diff --git a/www/novnc-websockify/Makefile b/www/novnc-websockify/Makefile
index 3b7eb4957daf..0078c0428404 100644
--- a/www/novnc-websockify/Makefile
+++ b/www/novnc-websockify/Makefile
@@ -1,35 +1,36 @@
 PORTNAME=	websockify
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.9.0
+PORTREVISION=	1
 CATEGORIES=	www
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Websockify implementation for noVNC
 WWW=		https://github.com/novnc/websockify
 
 LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	novnc>0:www/novnc \
 		${PYNUMPY}
 
 USES=		python shebangfix python
 
 SHEBANG_FILES=	run
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	novnc
 GH_PROJECT=	websockify
 
 NO_BUILD=	yes
 NO_ARCH=	yes
 TARGET_DIR=	${PREFIX}/libexec/novnc/utils/websockify
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${TARGET_DIR}
 	cd ${WRKSRC} && ${RM} .gitignore .gitmodules .travis.yml
 	cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${TARGET_DIR}
 	@${CHMOD} +x ${STAGEDIR}${TARGET_DIR}/run
 	@${CHMOD} +x ${STAGEDIR}${TARGET_DIR}/rebind
 
 .include <bsd.port.mk>
diff --git a/www/py-bokeh/Makefile b/www/py-bokeh/Makefile
index 71337aff7631..66f07d0cf1de 100644
--- a/www/py-bokeh/Makefile
+++ b/www/py-bokeh/Makefile
@@ -1,29 +1,30 @@
 PORTNAME=	bokeh
 PORTVERSION=	2.4.3
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	pkubaj@FreeBSD.org
 COMMENT=	Interactive Web Plotting for Python
 WWW=		https://bokeh.pydata.org/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Jinja2>=2.7:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}packaging>=16.8:devel/py-packaging@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:devel/py-dateutil@${PY_FLAVOR} \
 		${PY_PILLOW} \
 		${PYTHON_PKGNAMEPREFIX}yaml>=3.10:devel/py-yaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.5.2:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tornado>=5:www/py-tornado@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}typing-extensions>=3.7.4:devel/py-typing-extensions@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_PYTHON=	autoplist distutils concurrent
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/www/py-folium/Makefile b/www/py-folium/Makefile
index 0d6d7d1af409..c96759a889fe 100644
--- a/www/py-folium/Makefile
+++ b/www/py-folium/Makefile
@@ -1,27 +1,27 @@
 PORTNAME=	folium
 PORTVERSION=	0.12.1
 DISTVERSIONSUFFIX=	.post1
-PORTREVISION=	1
+PORTREVISION=	2
 MASTER_SITES=	PYPI
 CATEGORIES=	www python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Make beautiful maps with Leaflet.js & Python
 WWW=		https://github.com/python-visualization/folium
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}branca>=0.3.0:www/py-branca@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.9:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpy>=0,1:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/www/py-instabot/Makefile b/www/py-instabot/Makefile
index 9984090b635b..b1088308f975 100644
--- a/www/py-instabot/Makefile
+++ b/www/py-instabot/Makefile
@@ -1,37 +1,37 @@
 PORTNAME=	instabot
 PORTVERSION=	0.117.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Instagram bot scripts and API wrapper
 WWW=		https://github.com/instagrambot/instabot
 
 LICENSE=	APACHE20
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}certifi>=2019.11.28:security/py-certifi@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}chardet>=3.0.4,1:textproc/py-chardet@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}future>=0.18.2:devel/py-future@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}huepy>=1.2.1:misc/py-huepy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}idna>=2.8:dns/py-idna@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mock>=3.0.5:devel/py-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}moviepy>=1.0.1:multimedia/py-moviepy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pillow>=6.2.2:graphics/py-pillow@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pysocks>=1.7.1:net/py-pysocks@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytz>=2019.3,1:devel/py-pytz@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.22.0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests-toolbelt>=0.9.1:www/py-requests-toolbelt@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}responses>=0.10.9:devel/py-responses@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}schedule>=0.6.0:devel/py-schedule@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.14.0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tqdm>=4.41.1:misc/py-tqdm@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}urllib3>=1.25.7,1:net/py-urllib3@${PY_FLAVOR}
 
 USES=		python:3.8+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/www/py-sentinelhub/Makefile b/www/py-sentinelhub/Makefile
index e3c60d2c2aa8..3539d1fb17d3 100644
--- a/www/py-sentinelhub/Makefile
+++ b/www/py-sentinelhub/Makefile
@@ -1,44 +1,45 @@
 PORTNAME=	sentinelhub
 PORTVERSION=	3.9.0
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Sentinel Hub Utilities
 WWW=		https://github.com/sentinel-hub/sentinelhub-py
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}hatchling>=0:devel/py-hatchling@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}aenum>=2.1.4:devel/py-aenum@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}click>=0:devel/py-click@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dataclasses-json>=0:devel/py-dataclasses-json@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpy>=0,1:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}oauthlib>=0:security/py-oauthlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pillow>=9.2.0:graphics/py-pillow@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyproj>=2.2.0:graphics/py-pyproj@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.27.0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests-oauthlib>=1.0.0:www/py-requests-oauthlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Shapely>=0:devel/py-shapely@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tifffile>=2020.9.30:graphics/py-tifffile@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tomli>=0:textproc/py-tomli@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tomli-w>=0:textproc/py-tomli-w@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tqdm>=0:misc/py-tqdm@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}typing-extensions>=0:devel/py-typing-extensions@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}utm>=0:graphics/py-utm@${PY_FLAVOR}
 
 USES=		python:3.8+
 USE_PYTHON=	autoplist concurrent pep517
 
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=	AWS
 AWS_DESC=	AWS support
 
 AWS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}boto3>=0:www/py-boto3@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}botocore>=0:devel/py-botocore@${PY_FLAVOR}
 
 .include <bsd.port.mk>
diff --git a/www/py-social-auth-app-django/Makefile b/www/py-social-auth-app-django/Makefile
index 2b74ac22f96b..7d78ca35f5d6 100644
--- a/www/py-social-auth-app-django/Makefile
+++ b/www/py-social-auth-app-django/Makefile
@@ -1,30 +1,31 @@
 PORTNAME=	social-auth-app-django
 DISTVERSION=	5.0.0
+PORTREVISION=	1
 CATEGORIES=	www security python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	kai@FreeBSD.org
 COMMENT=	Social Authentication and Django integration
 WWW=		https://github.com/python-social-auth/social-app-django
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}social-auth-core>=4.1.0:security/py-social-auth-core@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django32>0:www/py-django32@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_GITHUB=	yes
 GH_ACCOUNT=	python-social-auth
 GH_PROJECT=	social-app-django
 USE_PYTHON=	autoplist distutils
 
 TEST_ENV=	PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 
 NO_ARCH=	yes
 
 do-test:
 	@cd ${WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} manage.py test -v3
 
 .include <bsd.port.mk>
diff --git a/www/redmine50/Makefile b/www/redmine50/Makefile
index 8d712517eda9..c9752b46e63e 100644
--- a/www/redmine50/Makefile
+++ b/www/redmine50/Makefile
@@ -1,120 +1,120 @@
 PORTNAME=	redmine
 PORTVERSION=	5.0.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	https://www.redmine.org/releases/
 PKGNAMESUFFIX=	50
 
 MAINTAINER=	mikael@FreeBSD.org
 COMMENT=	Flexible project management web application
 WWW=		https://www.redmine.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/doc/COPYING
 
 RUN_DEPENDS=	rubygem-bundler>=1.12.0:sysutils/rubygem-bundler \
 		rubygem-globalid-rails61>0:databases/rubygem-globalid-rails61 \
 		rubygem-rails61>=6.1:www/rubygem-rails61 \
 		rubygem-rouge3>=3.28.0:textproc/rubygem-rouge3 \
 		rubygem-request_store>=1.5.0:devel/rubygem-request_store \
 		rubygem-mini_mime>=1.0.1:mail/rubygem-mini_mime \
 		rubygem-actionpack-xml_parser-rails61>=0:textproc/rubygem-actionpack-xml_parser-rails61 \
 		rubygem-roadie-rails-rails61>=3.0.0:mail/rubygem-roadie-rails-rails61 \
 		rubygem-marcel>0:devel/rubygem-marcel \
 		rubygem-mail>=2.7.1:mail/rubygem-mail \
 		rubygem-csv>=3.2.0:devel/rubygem-csv \
 		rubygem-nokogiri>=1.13.8:textproc/rubygem-nokogiri \
 		rubygem-i18n>=1.10.0:devel/rubygem-i18n \
 		rubygem-rbpdf>=1.20.0:print/rubygem-rbpdf \
 		rubygem-addressable>0:www/rubygem-addressable \
 		rubygem-rubyzip>0:archivers/rubygem-rubyzip \
 		rubygem-net-smtp>0:mail/rubygem-net-smtp \
 		rubygem-net-imap>0:mail/rubygem-net-imap \
 		rubygem-net-pop>0:mail/rubygem-net-pop \
 		rubygem-psych>0:textproc/rubygem-psych \
 		rubygem-net-ldap>=0.17.0:net/rubygem-net-ldap \
 		rubygem-rotp>=5.0.0:devel/rubygem-rotp \
 		rubygem-rqrcode>0:www/rubygem-rqrcode \
 		rubygem-erb>0:devel/rubygem-erb
 
 # Per https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=264638#c9
 # to be removed if https://www.redmine.org/issues/37394 is fixed
 RUN_DEPENDS+=	rubygem-redcarpet>=3.5.1:textproc/rubygem-redcarpet \
 		rubygem-html-pipeline>=2.13.2:textproc/rubygem-html-pipeline \
 		rubygem-commonmarker>=0.23.6:textproc/rubygem-commonmarker \
 		rubygem-sanitize>=6.0:textproc/rubygem-sanitize \
 		rubygem-deckar01-task_list>=2.3.1:www/rubygem-deckar01-task_list
 
 USES=		cpe ruby
 
 CONFLICTS_INSTALL=	redmine42
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 USERS=		${WWWOWN}
 GROUPS=		${WWWGRP}
 PLIST_SUB=	WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
 SUB_LIST=	RUBY_SUFFIX=${RUBY_SUFFIX}
 
 OPTIONS_DEFINE=	MYSQL POSTGRESQL MARKDOWN RMAGIC THIN
 OPTIONS_DEFAULT=MYSQL MARKDOWN RMAGIC THIN
 OPTIONS_SUB=	yes
 POSTGRESQL_DESC=Enable PostgreSQL support
 MARKDOWN_DESC=	Enable Markdown support
 RMAGIC_DESC=	Enable Gantt charts support
 THIN_DESC=	Use Thin WEB server
 MYSQL_DESC=	MySQL database support (via mysql2 rubygem)
 NO_OPTIONS_SORT=	yes
 MYSQL_RUN_DEPENDS=	rubygem-mysql2>=0.5.0:databases/rubygem-mysql2
 POSTGRESQL_RUN_DEPENDS=	rubygem-pg>=1.2.2:databases/rubygem-pg
 MARKDOWN_RUN_DEPENDS=	rubygem-redcarpet>=3.5.1:textproc/rubygem-redcarpet
 RMAGIC_RUN_DEPENDS=	rubygem-mini_magick>=4.11.0:graphics/rubygem-mini_magick
 THIN_RUN_DEPENDS=	rubygem-thin>=1.6.2:www/rubygem-thin
 THIN_SUB_LIST=		WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
 THIN_VARS=		USE_RC_SUBR=redmine
 
 .include <bsd.port.options.mk>
 
 post-extract:
 	@${RM} -r ${WRKSRC}/.hgignore ${WRKSRC}/.gitignore ${WRKSRC}/.github \
 		${WRKSRC}/files/delete.me ${WRKSRC}/log/delete.me
 	@${MV} ${WRKSRC}/config/settings.yml ${WRKSRC}/config/settings.yml.sample
 	@${MV} ${WRKSRC}/config/database.yml.example ${WRKSRC}/config/database.yml.sample
 
 post-patch:
 	@${RM} ${WRKSRC}/Gemfile.orig
 
 do-install:
 	${MKDIR} ${STAGEDIR}${WWWDIR}
 	${MKDIR} ${STAGEDIR}${WWWDIR}/bundler.d
 	${MKDIR} ${STAGEDIR}${WWWDIR}/log
 	${MKDIR} ${STAGEDIR}${WWWDIR}/public/plugin_assets
 	${MKDIR} ${STAGEDIR}${WWWDIR}/tmp
 
 	# https://www.redmine.org/issues/37394
 	${CP} ${FILESDIR}/commonmark.rb ${STAGEDIR}${WWWDIR}/bundler.d
 	cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}
 	${TOUCH} ${STAGEDIR}${WWWDIR}/Gemfile.lock
 
 do-install-MYSQL-on:
 	${CP} ${FILESDIR}/mysql.rb ${STAGEDIR}${WWWDIR}/bundler.d
 
 do-install-POSTGRESQL-on:
 	${CP} ${FILESDIR}/pg.rb ${STAGEDIR}${WWWDIR}/bundler.d
 
 do-install-MARKDOWN-on:
 	${CP} ${FILESDIR}/markdown.rb ${STAGEDIR}${WWWDIR}/bundler.d
 
 do-install-RMAGIC-on:
 	${CP} ${FILESDIR}/mini_magick.rb ${STAGEDIR}${WWWDIR}/bundler.d
 
 do-install-THIN-on:
 	${CP} ${FILESDIR}/thin.rb ${STAGEDIR}${WWWDIR}/bundler.d
 
 post-install:
 	(cd ${STAGEDIR}${WWWDIR} && ${RM} Gemfile.lock && bundle install --local)
 	${RM} ${STAGEDIR}${WWWDIR}/package.json \
 		${STAGEDIR}${WWWDIR}/yarn.lock
 
 .include <bsd.port.mk>
diff --git a/www/rubygem-rails-settings-cached-rails61/Makefile b/www/rubygem-rails-settings-cached-rails61/Makefile
index 38c56a086dee..360db0fd9142 100644
--- a/www/rubygem-rails-settings-cached-rails61/Makefile
+++ b/www/rubygem-rails-settings-cached-rails61/Makefile
@@ -1,19 +1,20 @@
 PORTNAME=	rails-settings-cached
 PORTVERSION=	0.7.2
+PORTREVISION=	1
 CATEGORIES=	www rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	-rails61
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Rails settings plugin for easily managing key-value pairs table
 WWW=		https://github.com/huacnlee/rails-settings-cached
 
 LICENSE=	MIT
 
 RUN_DEPENDS=	rubygem-rails61>=0:www/rubygem-rails61
 
 USES=		gem
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/www/rubygem-rails60/Makefile b/www/rubygem-rails60/Makefile
index 7a65365fb801..1e1189279688 100644
--- a/www/rubygem-rails60/Makefile
+++ b/www/rubygem-rails60/Makefile
@@ -1,57 +1,58 @@
 PORTNAME=	rails
 PORTVERSION=	6.0.6.1
+PORTREVISION=	1
 CATEGORIES=	www rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	60
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Full-stack web application framework
 WWW=		https://github.com/rails/rails \
 		https://rubyonrails.org/
 
 LICENSE=	MIT
 
 RUN_DEPENDS=	rubygem-actioncable60>=${PORTVERSION}<${PORTVERSION}_99:www/rubygem-actioncable60 \
 		rubygem-actionmailbox60>=${PORTVERSION}<${PORTVERSION}_99:mail/rubygem-actionmailbox60 \
 		rubygem-actionmailer60>=${PORTVERSION}<${PORTVERSION}_99:mail/rubygem-actionmailer60 \
 		rubygem-actionpack60>=${PORTVERSION}<${PORTVERSION}_99:www/rubygem-actionpack60 \
 		rubygem-actiontext60>=${PORTVERSION}<${PORTVERSION}_99:textproc/rubygem-actiontext60 \
 		rubygem-actionview60>=${PORTVERSION}<${PORTVERSION}_99:devel/rubygem-actionview60 \
 		rubygem-activejob60>=${PORTVERSION}<${PORTVERSION}_99:devel/rubygem-activejob60 \
 		rubygem-activemodel60>=${PORTVERSION}<${PORTVERSION}_99:databases/rubygem-activemodel60 \
 		rubygem-activerecord60>=${PORTVERSION}<${PORTVERSION}_99:databases/rubygem-activerecord60 \
 		rubygem-activestorage60>=${PORTVERSION}<${PORTVERSION}_99:net/rubygem-activestorage60 \
 		rubygem-activesupport60>=${PORTVERSION}<${PORTVERSION}_99:devel/rubygem-activesupport60 \
 		rubygem-bundler>=1.3.0:sysutils/rubygem-bundler \
 		rubygem-railties60>=${PORTVERSION}<${PORTVERSION}_99:www/rubygem-railties60 \
 		rubygem-sprockets-rails-rails60>=2.0.0:devel/rubygem-sprockets-rails-rails60 \
 		rubygem-bootsnap>=1.4.2:devel/rubygem-bootsnap \
 		rubygem-byebug>=0:devel/rubygem-byebug \
 		rubygem-capybara>=2.15:devel/rubygem-capybara \
 		rubygem-dalli>=0:databases/rubygem-dalli \
 		rubygem-image_processing>=1.2<2:graphics/rubygem-image_processing \
 		rubygem-jbuilder-rails60>=0:devel/rubygem-jbuilder-rails60 \
 		rubygem-nokogiri>=1.8.1:textproc/rubygem-nokogiri \
 		rubygem-puma>=0:www/rubygem-puma \
 		rubygem-rake>=11.1:devel/rubygem-rake \
 		rubygem-sass-rails-rails60>=0:textproc/rubygem-sass-rails-rails60 \
 		rubygem-selenium-webdriver>=3.141.5.92:www/rubygem-selenium-webdriver \
 		rubygem-spring>=0:devel/rubygem-spring \
 		rubygem-sqlite3>=1.4<2:databases/rubygem-sqlite3 \
 		rubygem-turbolinks>=5<6:www/rubygem-turbolinks \
 		rubygem-uglifier>=1.3.0:www/rubygem-uglifier \
 		rubygem-web-console-rails60>=3.3.0:devel/rubygem-web-console-rails60 \
 		rubygem-webdrivers>=0:www/rubygem-webdrivers \
 		rubygem-webmock>=0:www/rubygem-webmock \
 		rubygem-webpacker4-rails60>=4.0<5:devel/rubygem-webpacker4-rails60
 
 USES=		cpe gem
 
 NO_ARCH=	yes
 
 CPE_VENDOR=	rubyonrails
 CPE_PRODUCT=	ruby_on_rails
 
 PORTSCOUT=	limit:^6\.0\.
 
 .include <bsd.port.mk>
diff --git a/www/rubygem-rails61/Makefile b/www/rubygem-rails61/Makefile
index 705551e07868..b13e1227c783 100644
--- a/www/rubygem-rails61/Makefile
+++ b/www/rubygem-rails61/Makefile
@@ -1,58 +1,59 @@
 PORTNAME=	rails
 PORTVERSION=	6.1.7.3
+PORTREVISION=	1
 CATEGORIES=	www rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	61
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Full-stack web application framework
 WWW=		https://github.com/rails/rails \
 		https://rubyonrails.org/
 
 LICENSE=	MIT
 
 RUN_DEPENDS=	rubygem-actioncable61>=${PORTVERSION}<${PORTVERSION}_99:www/rubygem-actioncable61 \
 		rubygem-actionmailbox61>=${PORTVERSION}<${PORTVERSION}_99:mail/rubygem-actionmailbox61 \
 		rubygem-actionmailer61>=${PORTVERSION}<${PORTVERSION}_99:mail/rubygem-actionmailer61 \
 		rubygem-actionpack61>=${PORTVERSION}<${PORTVERSION}_99:www/rubygem-actionpack61 \
 		rubygem-actiontext61>=${PORTVERSION}<${PORTVERSION}_99:textproc/rubygem-actiontext61 \
 		rubygem-actionview61>=${PORTVERSION}<${PORTVERSION}_99:devel/rubygem-actionview61 \
 		rubygem-activejob61>=${PORTVERSION}<${PORTVERSION}_99:devel/rubygem-activejob61 \
 		rubygem-activemodel61>=${PORTVERSION}<${PORTVERSION}_99:databases/rubygem-activemodel61 \
 		rubygem-activerecord61>=${PORTVERSION}<${PORTVERSION}_99:databases/rubygem-activerecord61 \
 		rubygem-activestorage61>=${PORTVERSION}<${PORTVERSION}_99:net/rubygem-activestorage61 \
 		rubygem-activesupport61>=${PORTVERSION}<${PORTVERSION}_99:devel/rubygem-activesupport61 \
 		rubygem-bundler>=1.15.0:sysutils/rubygem-bundler \
 		rubygem-railties61>=${PORTVERSION}<${PORTVERSION}_99:www/rubygem-railties61 \
 		rubygem-sprockets-rails-rails61>=2.0.0:devel/rubygem-sprockets-rails-rails61 \
 		rubygem-bootsnap>=1.4.4:devel/rubygem-bootsnap \
 		rubygem-byebug>=0:devel/rubygem-byebug \
 		rubygem-capybara>=3.26:devel/rubygem-capybara \
 		rubygem-dalli>=0:databases/rubygem-dalli \
 		rubygem-image_processing>=1.2<2:graphics/rubygem-image_processing \
 		rubygem-jbuilder-rails61>=0:devel/rubygem-jbuilder-rails61 \
 		rubygem-nokogiri>=1.8.1:textproc/rubygem-nokogiri \
 		rubygem-puma>=0:www/rubygem-puma \
 		rubygem-rake>=11.1:devel/rubygem-rake \
 		rubygem-sass-rails-rails61>=0:textproc/rubygem-sass-rails-rails61 \
 		rubygem-selenium-webdriver>=4.0.0:www/rubygem-selenium-webdriver \
 		rubygem-spring>=0:devel/rubygem-spring \
 		rubygem-sqlite3>=1.4<2:databases/rubygem-sqlite3 \
 		rubygem-turbolinks>=5<6:www/rubygem-turbolinks \
 		rubygem-uglifier>=1.3.0:www/rubygem-uglifier \
 		rubygem-web-console-rails61>=3.3.0:devel/rubygem-web-console-rails61 \
 		rubygem-webdrivers>=0:www/rubygem-webdrivers \
 		rubygem-webmock>=0:www/rubygem-webmock \
 		rubygem-webpacker-rails61>=5.0<6:devel/rubygem-webpacker-rails61 \
 		rubygem-webrick>=0:www/rubygem-webrick
 
 USES=		cpe gem
 
 NO_ARCH=	yes
 
 CPE_VENDOR=	rubyonrails
 CPE_PRODUCT=	ruby_on_rails
 
 PORTSCOUT=	limit:^6\.1\.
 
 .include <bsd.port.mk>
diff --git a/www/rubygem-rails70/Makefile b/www/rubygem-rails70/Makefile
index 1a228ac9b786..a4dffe6be194 100644
--- a/www/rubygem-rails70/Makefile
+++ b/www/rubygem-rails70/Makefile
@@ -1,67 +1,68 @@
 PORTNAME=	rails
 PORTVERSION=	7.0.4.3
+PORTREVISION=	1
 CATEGORIES=	www rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	70
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Full-stack web application framework
 WWW=		https://github.com/rails/rails \
 		https://rubyonrails.org/
 
 LICENSE=	MIT
 
 RUN_DEPENDS=	rubygem-actioncable70>=${PORTVERSION}<${PORTVERSION}_99:www/rubygem-actioncable70 \
 		rubygem-actionmailbox70>=${PORTVERSION}<${PORTVERSION}_99:mail/rubygem-actionmailbox70 \
 		rubygem-actionmailer70>=${PORTVERSION}<${PORTVERSION}_99:mail/rubygem-actionmailer70 \
 		rubygem-actionpack70>=${PORTVERSION}<${PORTVERSION}_99:www/rubygem-actionpack70 \
 		rubygem-actiontext70>=${PORTVERSION}<${PORTVERSION}_99:textproc/rubygem-actiontext70 \
 		rubygem-actionview70>=${PORTVERSION}<${PORTVERSION}_99:devel/rubygem-actionview70 \
 		rubygem-activejob70>=${PORTVERSION}<${PORTVERSION}_99:devel/rubygem-activejob70 \
 		rubygem-activemodel70>=${PORTVERSION}<${PORTVERSION}_99:databases/rubygem-activemodel70 \
 		rubygem-activerecord70>=${PORTVERSION}<${PORTVERSION}_99:databases/rubygem-activerecord70 \
 		rubygem-activestorage70>=${PORTVERSION}<${PORTVERSION}_99:net/rubygem-activestorage70 \
 		rubygem-activesupport70>=${PORTVERSION}<${PORTVERSION}_99:devel/rubygem-activesupport70 \
 		rubygem-bundler>=1.15.0:sysutils/rubygem-bundler \
 		rubygem-railties70>=${PORTVERSION}<${PORTVERSION}_99:www/rubygem-railties70 \
 		rubygem-bootsnap>=1.4.4:devel/rubygem-bootsnap \
 		rubygem-capybara>=3.26:devel/rubygem-capybara \
 		rubygem-connection_pool>=0:net/rubygem-connection_pool \
 		rubygem-cssbundling-rails>=0:www/rubygem-cssbundling-rails \
 		rubygem-dalli>=3.0.1:databases/rubygem-dalli \
 		rubygem-image_processing>=1.2<2:graphics/rubygem-image_processing \
 		rubygem-importmap-rails>=0:www/rubygem-importmap-rails \
 		rubygem-jsbundling-rails>=0:www/rubygem-jsbundling-rails \
 		rubygem-json>=2.0.0:devel/rubygem-json \
 		rubygem-libxml-ruby>=0:textproc/rubygem-libxml-ruby \
 		rubygem-listen>=3.3<4:devel/rubygem-listen \
 		rubygem-minitest>=5.15.0:devel/rubygem-minitest \
 		rubygem-nokogiri>=1.8.1:textproc/rubygem-nokogiri \
 		rubygem-propshaft>=0.1.7:www/rubygem-propshaft \
 		rubygem-puma>=0:www/rubygem-puma \
 		rubygem-que>=0:devel/rubygem-que \
 		rubygem-rack-cache>=1.2<2:www/rubygem-rack-cache \
 		rubygem-rake>=11.1:devel/rubygem-rake \
 		rubygem-redis-namespace>=0:databases/rubygem-redis-namespace \
 		rubygem-rexml>=0:textproc/rubygem-rexml \
 		rubygem-selenium-webdriver>=4.0.0:www/rubygem-selenium-webdriver \
 		rubygem-sprockets-rails-rails70>=2.0.0:devel/rubygem-sprockets-rails-rails70 \
 		rubygem-sqlite3>=1.4<2:databases/rubygem-sqlite3 \
 		rubygem-stimulus-rails>=0:www/rubygem-stimulus-rails \
 		rubygem-sucker_punch>=0:devel/rubygem-sucker_punch \
 		rubygem-tailwindcss-rails>=0:www/rubygem-tailwindcss-rails \
 		rubygem-turbo-rails>=0:www/rubygem-turbo-rails \
 		rubygem-webdrivers>=0:www/rubygem-webdrivers \
 		rubygem-webmock>=0:www/rubygem-webmock \
 		rubygem-webrick>=0:www/rubygem-webrick
 
 USES=		cpe gem
 
 NO_ARCH=	yes
 
 CPE_VENDOR=	rubyonrails
 CPE_PRODUCT=	ruby_on_rails
 
 PORTSCOUT=	limit:^7\.0\.
 
 .include <bsd.port.mk>
diff --git a/www/thundercache/Makefile b/www/thundercache/Makefile
index b2b9555ecd97..e0df74988dcc 100644
--- a/www/thundercache/Makefile
+++ b/www/thundercache/Makefile
@@ -1,106 +1,106 @@
 PORTNAME=	thundercache
 PORTVERSION=	6.1
-PORTREVISION=	15
+PORTREVISION=	16
 CATEGORIES=	www
 MASTER_SITES=	http://www.thundercache.com.br/dist/ \
 		http://www.bmsoftware.org/packs/ \
 		http://www8.freebsdbrasil.com.br/~eksffa/thunder/ \
 		http://www6.freebsdbrasil.com.br/~eksffa/l/dev/thunder/ \
 		LOCAL/jmelo
 DISTNAME=	thundercache-6.1.201104260900-${BITS}-fbsd
 
 MAINTAINER=	eksffa@freebsdbrasil.com.br
 COMMENT=	High-performance and high-efficiency caching proxy system
 WWW=		https://www.bmsoftware.org
 
 LICENSE=	commercial
 LICENSE_NAME=	commercial
 LICENSE_TEXT=	Commercial software with shareware license to 50 threads
 LICENSE_PERMS=	dist-mirror pkg-mirror auto-accept
 
 OPTIONS_DEFINE=	DEPENDACK APACHE PHP PGSQL
 OPTIONS_DEFAULT=DEPENDACK APACHE PHP PGSQL
 DEPENDACK_DESC=	I have read and understood the depends needs
 APACHE_DESC=	Install apache for reporting viewing
 PHP_DESC=	Install PHP for reporting generating
 PGSQL_DESC=	Install PostgreSQL (report data storing)
 
 USES=		php shebangfix tar:bzip2 ssl
 SHEBANG_FILES=	sbin/thunderlog.php
 USE_GCC=	yes
 
 ONLY_FOR_ARCHS=	i386 amd64
 
 USE_RC_SUBR=	thundercache
 
 NO_BUILD=	yes
 
 .include <bsd.port.options.mk>
 
 BITS=		${ARCH:S/amd64/64/:S/x86_64/64/:S/i386/32/}bits
 WRKSRC=		${WRKDIR}/thunder
 
 .if ${PORT_OPTIONS:MAPACHE}
 USES+=		apache:run
 .endif
 
 .if ${PORT_OPTIONS:MPGSQL}
 USES+=		pgsql
 WANT_PGSQL=	server
 .endif
 
 .if ${PORT_OPTIONS:MPHP}
 USE_PHP+=	curl bcmath pdo mcrypt session
 .  if ${PORT_OPTIONS:MPGSQL}
 USE_PHP+=	pdo_pgsql pgsql
 .  endif
 .endif
 
 LIB_DEPENDS+=	libcurl.so:ftp/curl \
 		libutil.so:misc/compat8x
 
 SUB_FILES=	pkg-message log.sh test-deps.sh
 SUB_LIST=	"GREP=${GREP}"
 
 show-info:
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "ATTENTION:"
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} " It is very important that you carefully read and respect"
 	@${ECHO_MSG} " the special build options for the following depends:"
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} " ftp/curl		LIBSSH2=yes OPENSSL=yes PROXY=yes"
 	@${ECHO_MSG} " security/openssl	ZLIB=yes"
 	@${ECHO_MSG} " devel/php5-pcre	BUNDLED_PCRE=yes (for apache20)"
 	@${ECHO_MSG} " postgresql${PGSQL_VER}-server \
 					NLS=yes PAM=yes OPTIMIZED_CFLAGS=yes TZDATA=yes"
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} " After you understood it correctly, select DEPENDACK on"
 	@${ECHO_MSG} " the OPTIONS screen. Run ''make config'' to acknowledge"
 	@${ECHO_MSG} ""
 .if ! ${PORT_OPTIONS:MDEPENDACK}
 	@${FALSE}
 .endif
 
 pre-everything::show-info
 
 do-install:
 	@${CP} -r ${WRKSRC} ${STAGEDIR}${PREFIX}/
 	@${INSTALL_SCRIPT} ${WRKDIR}/log.sh ${STAGEDIR}${PREFIX}/thunder/sbin/
 	@${MKDIR} -m 755 ${STAGEDIR}/var/run/thunder
 
 	@(${CHMOD} +x ${WRKDIR}/test-deps.sh ; \
 	if ! ${WRKDIR}/test-deps.sh > /dev/null 2>&1 ; then \
 		${ECHO_MSG} "**** FATAL **** " ; \
 		${ECHO_MSG} "**** THIS PORT MAY NOT WORK PROPERLY **** " ; \
 		${ECHO_MSG} "Some depends are not built with required features." ; \
 		${ECHO_MSG} "You must always honor at least the following options" ; \
 		${ECHO_MSG} "depends as listed:" ; \
 		${ECHO_MSG} "" ; \
 		${ECHO_MSG} "ftp/curl	   LIBSSH2=yes OPENSSL=yes PROXY=yes" ; \
 		${ECHO_MSG} "" ; \
 		${ECHO_MSG} "Type ''make show-info'' to read further information." ; \
 		${ECHO_MSG} "" ; \
 	fi)
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/py-babelfont/Makefile b/x11-fonts/py-babelfont/Makefile
index 4ae59b08f283..61dacec9fe08 100644
--- a/x11-fonts/py-babelfont/Makefile
+++ b/x11-fonts/py-babelfont/Makefile
@@ -1,27 +1,28 @@
 PORTNAME=	babelfont
 PORTVERSION=	3.0.0
+PORTREVISION=	1
 CATEGORIES=	x11-fonts python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Abstract interface to font source files based on fontParts
 WWW=		https://github.com/simoncozens/babelfont
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cu2qu>=1.6.7<2.0.0:x11-fonts/py-cu2qu@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}fontfeatures>=1.0.6<2.0.0:x11-fonts/py-fontfeatures@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}fonttools>=4.21.1:print/py-fonttools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}glyphsLib>=5.3.2:x11-fonts/py-glyphsLib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}openstep-plist>=0.2.2:textproc/py-openstep-plist@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}orjson>=3.5.1<4.0.0:devel/py-orjson@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ufolib2>=0.11.1:print/py-ufolib2@${PY_FLAVOR}
 
 USES=		python:3.8+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/py-fontfeatures/Makefile b/x11-fonts/py-fontfeatures/Makefile
index b0db21e2f32f..daf60efcdbd3 100644
--- a/x11-fonts/py-fontfeatures/Makefile
+++ b/x11-fonts/py-fontfeatures/Makefile
@@ -1,26 +1,27 @@
 PORTNAME=	fontfeatures
 PORTVERSION=	1.7.4
+PORTREVISION=	1
 CATEGORIES=	x11-fonts python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	fontFeatures-${PORTVERSION}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Python library for manipulating OpenType font features
 WWW=		https://github.com/simoncozens/fontFeatures
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beziers>=0.1.0:graphics/py-beziers@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}fonttools>=4.28.0:print/py-fonttools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}fs2>=0:devel/py-fs2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}glyphtools>=0.7.0:print/py-glyphtools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/x11-themes/adapta-gtk-theme/Makefile b/x11-themes/adapta-gtk-theme/Makefile
index 1ac08a8b4b74..d6a7fd8adab7 100644
--- a/x11-themes/adapta-gtk-theme/Makefile
+++ b/x11-themes/adapta-gtk-theme/Makefile
@@ -1,77 +1,77 @@
 PORTNAME=	adapta-gtk-theme
 PORTVERSION=	3.95.0.11
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-themes
 
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	Adaptive Gtk+ theme based on Material Design Guidelines
 WWW=		https://github.com/adapta-project/adapta-gtk-theme
 
 LICENSE=	GPLv2 CC-BY-SA-4.0
 LICENSE_COMB=	multi
 LICENSE_FILE_GPLv2=	${WRKSRC}/COPYING
 LICENSE_FILE_CC-BY-SA-4.0=	${WRKSRC}/LICENSE_CC_BY_SA4
 
 BUILD_DEPENDS=	gsed:textproc/gsed \
 		inkscape:graphics/inkscape \
 		bash:shells/bash \
 		sassc:textproc/sassc
 RUN_DEPENDS=	noto>=1.0.5:x11-fonts/noto \
 		roboto-fonts-ttf>=2.134:x11-fonts/roboto-fonts-ttf
 
 USES=		autoreconf gmake gnome pathfix pkgconfig shebangfix
 
 CHROME_CONFIGURE_ENABLE=	chrome_legacy
 CHROME_DESC=	Support for legacy Chrome(ium) browser (<= R59)
 CINNAMON_CONFIGURE_ENABLE=	cinnamon
 CINNAMON_DESC=	Support for Cinnamon Desktop Environment
 CINNAMON_IMPLIES=	METACITY
 CONFIGURE_ARGS=	--disable-flashback \
 		--disable-gtk_next \
 		--disable-plank \
 		--disable-telegram \
 		--disable-tweetdeck
 
 DOCS_MAKE_ENV=	ADAPTA_DOCS=yes
 
 GH_ACCOUNT=	adapta-project
 GNOMESHELL_CONFIGURE_ENABLE=	gnome
 GNOMESHELL_DESC=	Support for Gnome-Shell Desktop Environment
 GNU_CONFIGURE=	yes
 
 MATE_CONFIGURE_ENABLE=	mate
 MATE_DESC=	Support for Mate Desktop Environment
 MATE_IMPLIES=	METACITY
 METACITY_DESC=	Support for metacity Window Manager
 
 NO_ARCH=	yes
 
 OPENBOX_CONFIGURE_ENABLE=	openbox
 OPENBOX_DESC=	Support for Openbox Desktop Environment
 OPTIONS_DEFAULT=	CHROME CINNAMON GNOMESHELL MATE METACITY OPENBOX PARALLEL XFCE
 OPTIONS_DEFINE=	CHROME CINNAMON DOCS GNOMESHELL MATE METACITY OPENBOX PARALLEL XFCE
 OPTIONS_SUB=	yes
 
 PARALLEL_BUILD_DEPENDS=	parallel:sysutils/parallel
 PARALLEL_CONFIGURE_ENABLE=	parallel
 PARALLEL_DESC=	parallel-build support
 
 SHEBANG_REGEX=	'.*\.sh$$'
 
 USE_GITHUB=	yes
 USE_GNOME=	gdkpixbuf2 glib20 librsvg2 libxml2
 
 XFCE_CONFIGURE_ENABLE=	xfce
 XFCE_DESC=	Support for XFce Desktop Environment
 
 post-patch:
 # use textproc/gsed
 	@(cd ${WRKSRC} && \
 	${FIND} . -type f -iregex '${SHEBANG_REGEX}' \
 		-exec ${SED} -i '' -e 's,sed -i,${LOCALBASE}/bin/g&,g' {} ";")
 # replace deprecated inkscape flags
 	@(cd ${WRKSRC} && \
 	${FIND} . -type f -iregex '${SHEBANG_REGEX}' \
 		-exec ${SED} -i '' -e 's|--export-png=|--export-filename=|g' {} ";")
 
 .include <bsd.port.mk>
diff --git a/x11-themes/plata-theme/Makefile b/x11-themes/plata-theme/Makefile
index b6c7f4ac4aec..a3f006953b42 100644
--- a/x11-themes/plata-theme/Makefile
+++ b/x11-themes/plata-theme/Makefile
@@ -1,84 +1,84 @@
 PORTNAME=	plata-theme
 PORTVERSION=	0.9.9
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-themes
 
 MAINTAINER=	tagattie@FreeBSD.org
 COMMENT=	Gtk theme based on Material Design Refresh
 WWW=		https://gitlab.com/tista500/plata-theme
 
 LICENSE=	GPLv2 CC-BY-SA-4.0
 LICENSE_COMB=	multi
 LICENSE_FILE_GPLv2=	${WRKSRC}/COPYING
 LICENSE_FILE_CC-BY-SA-4.0=	${WRKSRC}/LICENSE_CC_BY_SA4
 
 BUILD_DEPENDS=	inkscape:graphics/inkscape \
 		sassc:textproc/sassc \
 		bash:shells/bash
 RUN_DEPENDS=	gtk-murrine-engine>0:x11-themes/gtk-murrine-engine \
 		roboto-fonts-ttf>0:x11-fonts/roboto-fonts-ttf
 
 USES=		autoreconf gmake gnome pkgconfig shebangfix
 USE_GNOME=	gdkpixbuf2 gtk30 libxml2
 
 USE_GITLAB=	yes
 GL_ACCOUNT=	tista500
 GL_COMMIT=	1dd0953f1d6a35777388d39f46e2428c038042be
 
 NO_ARCH=	yes
 
 SHEBANG_REGEX=	./src/.*\.sh$$
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-gtk_next \
 		--disable-flashback \
 		--disable-telegram \
 		--disable-tweetdeck \
 		--disable-airforsteam
 
 PORTDOCS=	README.md README.window-list
 
 OPTIONS_DEFINE=	CINNAMON DOCS GNOME MATE METACITY OPENBOX PARALLEL PLANK XFCE
 OPTIONS_DEFAULT=	CINNAMON GNOME MATE METACITY OPENBOX PARALLEL PLANK XFCE
 OPTIONS_SUB=	yes
 
 CINNAMON_DESC=	Enable Cinnamon support
 CINNAMON_CONFIGURE_ENABLE=	cinnamon
 CINNAMON_IMPLIES=	METACITY
 GNOME_DESC=	Enable Gnome support
 GNOME_CONFIGURE_ENABLE=	gnome
 MATE_DESC=	Enable Mate support
 MATE_CONFIGURE_ENABLE=	mate
 MATE_IMPLIES=	METACITY
 MATE_BUILD_DEPENDS=	${LOCALBASE}/lib/libmarco-private.so:x11-wm/marco
 METACITY_DESC=	Enable Metacity support
 OPENBOX_DESC=	Enable Openbox support
 OPENBOX_CONFIGURE_ENABLE=	openbox
 PARALLEL_DESC=	Enable parallel build
 PARALLEL_BUILD_DEPENDS=	parallel:sysutils/parallel
 PARALLEL_CONFIGURE_ENABLE=	parallel
 PLANK_DESC=	Enable Plank support
 PLANK_CONFIGURE_ENABLE=	plank
 XFCE_DESC=	Enable Xfce support
 XFCE_CONFIGURE_ENABLE=	xfce
 
 post-extract:
 	${CP} ${WRKSRC}/src/shell/sass/gnome-shell/README.window-list ${WRKSRC}
 
 post-patch:
 	(cd ${WRKSRC} && \
 	${FIND} . -type f -iregex '${SHEBANG_REGEX}' \
 		-exec ${SED} -i '' -e "s/sed -i/& ''/g" {} ';')
 	${REINPLACE_CMD} -e 's|/usr|${LOCALBASE}|; s|$${prefix}|${PREFIX}|' \
 		${WRKSRC}/README.window-list
 
 post-install:
 	${RM} ${STAGEDIR}${PREFIX}/share/themes/Plata/COPYING
 	${RM} ${STAGEDIR}${PREFIX}/share/themes/Plata/LICENSE_CC_BY_SA4
 	${RM} ${STAGEDIR}${PREFIX}/share/themes/Plata/gnome-shell/extensions/window-list/README
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_MAN} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/gtkd/Makefile b/x11-toolkits/gtkd/Makefile
index 9556919ea22c..4c326a5e1a92 100644
--- a/x11-toolkits/gtkd/Makefile
+++ b/x11-toolkits/gtkd/Makefile
@@ -1,27 +1,27 @@
 PORTNAME=	gtkd
 PORTVERSION=	3.10.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	https://gtkd.org/Downloads/sources/
 DISTNAME=	GtkD-${PORTVERSION}
 
 MAINTAINER=	romain@FreeBSD.org
 COMMENT=	D binding and OO wrapper of GTK+
 WWW=		https://gtkd.org/index.html
 
 LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	ldc2:lang/ldc
 
 USES=		gmake zip
 WRKSRC=		${WRKDIR}
 MAKEFILE=	GNUmakefile
 
 SSP_UNSAFE=	ldc2 does not support -fstack-protector-strong
 
 post-patch:
 	${REINPLACE_CMD} -e 's:\$$(libdir)/pkgconfig:libdata/pkgconfig:' \
 		${WRKSRC}/${MAKEFILE}
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/pangolin/Makefile b/x11-toolkits/pangolin/Makefile
index 15bb6a31112a..d0ec31432a9b 100644
--- a/x11-toolkits/pangolin/Makefile
+++ b/x11-toolkits/pangolin/Makefile
@@ -1,35 +1,36 @@
 PORTNAME=	pangolin
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.8-54
+PORTREVISION=	1
 DISTVERSIONSUFFIX=	-gfe57db53
 CATEGORIES=	x11-toolkits
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Lightweight rapid development library for managing OpenGL display
 WWW=		https://github.com/stevenlovegrove/Pangolin
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENCE
 
 LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg \
 		liblz4.so:archivers/liblz4 \
 		libpng.so:graphics/png \
 		libtiff.so:graphics/tiff \
 		libzstd.so:archivers/zstd \
 		libwayland-client.so:graphics/wayland \
 		libxkbcommon.so:x11/libxkbcommon
 
 USES=		cmake compiler:c++17-lang eigen:3 gl jpeg localbase:ldflags pkgconfig xorg
 USE_XORG=	ice sm x11 xext
 USE_GL=		gl glew glu
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	stevenlovegrove
 GH_PROJECT=	Pangolin
 
 CMAKE_OFF=	BUILD_PANGOLIN_PYTHON
 
 LDFLAGS+=	-pthread
 
 .include <bsd.port.mk>
diff --git a/x11/gnome/Makefile b/x11/gnome/Makefile
index d0437fa78a2b..4dccc7308174 100644
--- a/x11/gnome/Makefile
+++ b/x11/gnome/Makefile
@@ -1,76 +1,76 @@
 PORTNAME=	gnome
 PORTVERSION=	42
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES?=	x11 gnome
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Metaport for the GNOME integrated X11 desktop
 WWW=		https://www.FreeBSD.org/gnome/
 
 FLAVORS=	full lite
 FLAVOR?=	full
 
 RUN_DEPENDS?=	dconf-editor:devel/dconf-editor \
 		gdm>=3.0.0:x11/gdm \
 		gnome-session>=3.0.0:x11/gnome-session \
 		gnome-themes-extra>=3.28:x11-themes/gnome-themes-extra \
 		gnome-icon-theme-extras>=3.0.0:misc/gnome-icon-theme-extras \
 		gnome-icon-theme-symbolic>=3.0.0:x11-themes/gnome-icon-theme-symbolic \
 		gnome-keyring>=3.0.0:security/gnome-keyring \
 		gnome-power-manager>=3.0.0:sysutils/gnome-power-manager \
 		orca>=3.0.0:accessibility/orca \
 		gnome-shell>=3.0.0:x11/gnome-shell \
 		gnome-shell-extensions>=3.0.0:x11/gnome-shell-extensions \
 		gnome-tweaks:deskutils/gnome-tweaks \
 		sushi>=0:x11-fm/sushi \
 		nautilus>=3.0.0:x11-fm/nautilus \
 		${LOCALBASE}/share/fonts/bitstream-vera/Vera.ttf:x11-fonts/bitstream-vera \
 		yelp>=3.0.0:x11/yelp \
 		zenity>=3.0.0:x11/zenity \
 		seahorse>=3.0.0:security/seahorse \
 		gnome-control-center>=3.0.0:sysutils/gnome-control-center \
 		gnome-backgrounds>=0:x11-themes/gnome-backgrounds \
 		caribou>=0:accessibility/caribou \
 		${LOCALBASE}/share/sounds/freedesktop/index.theme:audio/freedesktop-sound-theme
 
 OPTIONS_DEFINE=	DOCS
 
 USES=		metaport
 
 .if ${FLAVOR} ==lite
 OPTIONS_EXCLUDE=	DOCS
 PKGNAMESUFFIX=	-lite
 COMMENT=	The "meta-port" of the GNOME desktop slimmed down for only the basics
 PKGMESSAGE=	${.CURDIR}/pkg-message-lite
 DESCR=		${.CURDIR}/pkg-descr-lite
 .endif
 
 .if ${FLAVOR} == "full"
 RUN_DEPENDS+=	epiphany>=3.0.0:www/epiphany \
 		gucharmap>=3.0.0:deskutils/gucharmap \
 		gnome-characters>=3.0.0:deskutils/gnome-characters \
 		gnome-calendar>=3.0:deskutils/gnome-calendar \
 		eog>=3.0.0:graphics/eog \
 		eog-plugins>=3.0.0:graphics/eog-plugins \
 		gedit>=3.0.0:editors/gedit \
 		gedit-plugins>=3.0.0:editors/gedit-plugins \
 		gnome-terminal>=3.0.0:x11/gnome-terminal \
 		brasero>=3.0.0:sysutils/brasero \
 		accerciser>=3.0.0:accessibility/accerciser \
 		gnome-calculator>=3.0.0:math/gnome-calculator \
 		gnome-utils>=3.6.0:deskutils/gnome-utils \
 		file-roller>=3.0.0:archivers/file-roller \
 		evince>=3.0.0:graphics/evince \
 		vino>=3.0.0:net/vino \
 		gnome-connections>=42:net/gnome-connections \
 		gnome-games>=3.0.0:games/gnome-games \
 		totem>=3.0.0:multimedia/totem \
 		evolution>=3.0.0:mail/evolution \
 		cheese>=3.0.0:multimedia/cheese
 
 .endif # !gnome3-lite section
 
 DOCS_RUN_DEPENDS=	gnome-user-docs>=0:misc/gnome-user-docs \
 			gnome-getting-started-docs>=0:misc/gnome-getting-started-docs
 
 .include <bsd.port.mk>
diff --git a/x11/i3lock-color/Makefile b/x11/i3lock-color/Makefile
index cb49dcda3233..f3172aaa2bf0 100644
--- a/x11/i3lock-color/Makefile
+++ b/x11/i3lock-color/Makefile
@@ -1,56 +1,57 @@
 PORTNAME=	i3lock-color
 DISTVERSION=	2.13.c.4
+PORTREVISION=	1
 CATEGORIES=	x11
 
 MAINTAINER=	fjachuf@gmail.com
 COMMENT=	Enhanced i3lock with higher capacity
 WWW=		https://github.com/Raymo111/i3lock-color
 
 LICENSE=	BSD3CLAUSE
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/pam_helper:security/pam_helper
 LIB_DEPENDS=	libev.so:devel/libev \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libxcb-image.so:x11/xcb-util-image \
 		libxcb-keysyms.so:x11/xcb-util-keysyms \
 		libxcb-util.so:x11/xcb-util \
 		libxcb-xrm.so:x11/xcb-util-xrm \
 		libxkbcommon.so:x11/libxkbcommon \
 		libxkbfile.so:x11/libxkbfile
 
 USES=		autoreconf gmake gnome iconv jpeg localbase pkgconfig tar:bzip2 xorg
 USE_CSTD=	c99
 USE_GCC=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	Raymo111
 USE_GNOME=	cairo
 USE_XORG=	x11 xcb xext xinerama xorgproto xrandr xt
 
 GNU_CONFIGURE=	yes
 
 MAKE_ARGS=	PREFIX="${PREFIX}" X11LIB="${LOCALBASE}/lib" \
 		X11INC="${LOCALBASE}/include" CC="${CC}" \
 		MANDIR="${MANPREFIX}/man"
 
 LDFLAGS+=	${ICONV_LIB}
 
 CONFLICTS_INSTALL=	i3lock
 
 PLIST_FILES=	"@(,,4755) bin/i3lock" \
 		man/man1/i3lock.1.gz
 
 OPTIONS_DEFINE=	DOCS
 
 DOC_FILES=	CHANGELOG README.md
 DOCS_PLIST_FILES=	${DOC_FILES:S|^|${DOCSDIR_REL}/|}
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/i3lock
 	@${RM} ${STAGEDIR}${PREFIX}/etc/pam.d/i3lock
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${DOC_FILES:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/x11/kde5/Makefile b/x11/kde5/Makefile
index 4e9ad1073f5f..f1c2c2e3780d 100644
--- a/x11/kde5/Makefile
+++ b/x11/kde5/Makefile
@@ -1,49 +1,50 @@
 PORTNAME=	kde5
 DISTVERSION=	${KDE_PLASMA_VERSION}.${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	x11 kde
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE Plasma Desktop and Applications (current)
 WWW=		https://www.kde.org
 
 RUN_DEPENDS=	kde-baseapps>=0:x11/kde-baseapps \
 		kwalletmanager5:security/kwalletmanager \
 		plasma5-plasma>=0:x11/plasma5-plasma
 
 USES=		kde:5 metaport qt:5
 USE_QT=		# empty
 
 OPTIONS_DEFINE=	KDEADMIN KDEEDU \
 		KDEGAMES KDEGRAPHICS KDEMULTIMEDIA KDENETWORK \
 		KDEPIM KDEUTILS \
 		PULSEAUDIO
 
 OPTIONS_DEFAULT=${OPTIONS_DEFINE:NPULSEAUDIO}
 
 KDEADMIN_DESC=		Administration utilities
 KDEADMIN_RUN_DEPENDS=	kdeadmin>=${KDE_APPLICATIONS_VERSION}:sysutils/kdeadmin
 
 KDEEDU_DESC=		Entertaining, educational programs
 KDEEDU_RUN_DEPENDS=	kdeedu>=${KDE_APPLICATIONS_VERSION}:misc/kdeedu
 
 KDEGAMES_DESC=		Collection of games
 KDEGAMES_RUN_DEPENDS=	kdegames>=${KDE_APPLICATIONS_VERSION}:games/kdegames
 
 KDEGRAPHICS_DESC=	Graphics utilities
 KDEGRAPHICS_RUN_DEPENDS=	kdegraphics>=${KDE_APPLICATIONS_VERSION}:graphics/kdegraphics
 
 KDEMULTIMEDIA_DESC=	Multimedia applications
 KDEMULTIMEDIA_RUN_DEPENDS=	kdemultimedia>=${KDE_APPLICATIONS_VERSION}:multimedia/kdemultimedia
 
 KDENETWORK_DESC=	Network-related programs
 KDENETWORK_RUN_DEPENDS=	kdenetwork>=${KDE_APPLICATIONS_VERSION}:net/kdenetwork
 
 KDEPIM_DESC=		Personal information management
 KDEPIM_RUN_DEPENDS=	kdepim>=${KDE_APPLICATIONS_VERSION}:deskutils/kdepim
 
 KDEUTILS_DESC=		Collection of utilities for KDE
 KDEUTILS_RUN_DEPENDS=	kdeutils>=${KDE_APPLICATIONS_VERSION}:misc/kdeutils
 
 PULSEAUDIO_USE=		KDE=plasma-pa
 
 .include <bsd.port.mk>
diff --git a/x11/kitty/Makefile b/x11/kitty/Makefile
index 0dbbb82ab2e2..7e959c94acc3 100644
--- a/x11/kitty/Makefile
+++ b/x11/kitty/Makefile
@@ -1,104 +1,105 @@
 PORTNAME=	kitty
 DISTVERSION=	0.28.0
+PORTREVISION=	1
 DISTVERSIONPREFIX=v
 CATEGORIES=	x11 wayland
 
 MAINTAINER=	alexis.praga@proton.me
 COMMENT=	Cross-platform, fast, featureful, GPU-based terminal emulator
 WWW=		https://sw.kovidgoyal.net/kitty/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}furo>0:textproc/py-furo@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sphinx-copybutton>0:textproc/py-sphinx-copybutton@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sphinx-inline-tabs>0:textproc/py-sphinx-inline-tabs@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sphinxext-opengraph>0:textproc/py-sphinxext-opengraph@${PY_FLAVOR} \
 		sphinx-build:textproc/py-sphinx@${PY_FLAVOR} \
 		wayland-protocols>=0:graphics/wayland-protocols
 LIB_DEPENDS=	libdbus-1.so:devel/dbus \
 		libepoll-shim-interpose.so:devel/libepoll-shim \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libharfbuzz.so:print/harfbuzz \
 		liblcms2.so:graphics/lcms2 \
 		libpng.so:graphics/png \
 		librsync.so:net/librsync \
 		libwayland-client.so:graphics/wayland \
 		libwayland-cursor.so:graphics/wayland \
 		libxkbcommon.so:x11/libxkbcommon
 
 USES=		compiler:c11 cpe desktop-file-utils gettext-runtime gl gmake \
 		go:modules pkgconfig python:3.5+ shebangfix ssl tar:xz terminfo xorg
 CPE_VENDOR=	kitty_project
 USE_GL=		gl
 USE_XORG=	x11 xcb xcursor xi xinerama xrandr
 
 GO_MODULE=	github.com/kovidgoyal/kitty
 SHEBANG_FILES=	build-terminfo count-lines-of-code mypy-editor-integration \
 		update-on-ox update-on-ubuntu
 SHEBANG_GLOB=	*.py
 
 TEST_ENV=	PATH="${STAGEDIR}${PREFIX}/bin:${PATH}"
 TEST_TARGET=	test
 
 CPPFLAGS+=	`pkg-config --cflags epoll-shim-interpose`
 LDFLAGS+=	`pkg-config --libs epoll-shim-interpose`
 
 BINARY_ALIAS=	python3=${PYTHON_CMD} python=${PYTHON_CMD}
 
 GH_TUPLE=	\
 		ALTree:bigfloat:38c8b72a9924:altree_bigfloat/vendor/github.com/ALTree/bigfloat \
 		disintegration:imaging:v1.6.2:disintegration_imaging/vendor/github.com/disintegration/imaging \
 		golang:exp:54bba9f4231b:golang_exp/vendor/golang.org/x/exp \
 		golang:image:v0.3.0:golang_image/vendor/golang.org/x/image \
 		golang:sys:v0.4.0:golang_sys/vendor/golang.org/x/sys \
 		google:go-cmp:v0.5.8:google_go_cmp/vendor/github.com/google/go-cmp \
 		google:uuid:v1.3.0:google_uuid/vendor/github.com/google/uuid \
 		jamesruan:go-rfc1924:2767ca7c638f:jamesruan_go_rfc1924/vendor/github.com/jamesruan/go-rfc1924 \
 		seancfoley:bintree:v1.2.1:seancfoley_bintree/vendor/github.com/seancfoley/bintree \
 		seancfoley:ipaddress-go:v1.5.3:seancfoley_ipaddress_go/vendor/github.com/seancfoley/ipaddress-go
 
 INSTALL_WRKSRC=	${WRKSRC}/linux-package
 
 _STRIP_TARGETS=	lib/kitty/kitty/fast_data_types.so lib/kitty/kitty/glfw-x11.so \
 		lib/kitty/kittens/diff/diff_speedup.so \
 		lib/kitty/kittens/unicode_input/unicode_names.so \
 		lib/kitty/kitty/glfw-wayland.so \
 		bin/kitten bin/kitty \
 		lib/kitty/kittens/transfer/rsync.so
 
 _EMPTY_DIRS=	kittens/choose kittens/diff kittens/unicode_input kittens kitty
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == powerpc64 || ${ARCH:Mriscv64*}
 MAKE_ENV+=	KITTY_NO_LTO=1
 .endif
 
 # ncursesw and tinfo >= 6.1 seem to be neededd
 .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1400035
 USES+=		ncurses:port
 .else
 USES+=		ncurses
 .endif
 
 # fix clang static_assert on 12.x releases, https://github.com/kovidgoyal/kitty/pull/5398
 .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1300000
 EXTRA_PATCHES=	${PATCHDIR}/extra-patch-kitty_data-types.h
 .endif
 
 # For librsync, we need to set header and library path
 do-build:
 	(cd ${WRKSRC} && \
 	        ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} setup.py linux-package --update-check-interval 0 --extra-include-dirs ${LOCALBASE}/include/ --extra-library-dirs ${LOCALBASE}/lib)
 	${FIND} ${INSTALL_WRKSRC} -name __pycache__ -type d -exec ${RM} -r -- {} +
 
 do-install:
 	${CP} -a ${INSTALL_WRKSRC}/ ${STAGEDIR}${PREFIX}
 	${STRIP_CMD} ${_STRIP_TARGETS:S|^|${STAGEDIR}${PREFIX}/|}
 	${INSTALL_DATA} ${WRKSRC}/terminfo/kitty.terminfo \
 		${STAGEDIR}${PREFIX}/share/misc/
 
 .include <bsd.port.mk>
diff --git a/x11/mate/Makefile b/x11/mate/Makefile
index d734a00de5b0..ed42ea3c4a17 100644
--- a/x11/mate/Makefile
+++ b/x11/mate/Makefile
@@ -1,29 +1,30 @@
 PORTNAME=	mate
 PORTVERSION=	1.26.0
+PORTREVISION=	1
 CATEGORIES=	x11 mate
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	"meta-port" for the MATE integrated X11 desktop
 WWW=		https://www.FreeBSD.org/gnome/
 
 USES=		mate metaport
 
 RUN_DEPENDS=	mate-base>=1.22.0:x11/mate-base \
 		mate-themes>=0:x11-themes/mate-themes \
 		mate-terminal:x11/mate-terminal \
 		mate-screensaver:x11/mate-screensaver \
 		mate-calc:math/mate-calc \
 		mate-screenshot:deskutils/mate-utils \
 		mate-system-monitor:sysutils/mate-system-monitor \
 		eom:graphics/eom \
 		engrampa:archivers/engrampa \
 		atril:graphics/atril \
 		mate-volume-control:audio/mate-media \
 		mate-power-manager:sysutils/mate-power-manager \
 		caja-sendto:deskutils/caja-extensions \
 		mozo:deskutils/mozo \
 		mate-applets>=1.22.0:x11/mate-applets
 
 USE_MATE=	pluma:run
 
 .include <bsd.port.mk>
diff --git a/x11/py-xdot/Makefile b/x11/py-xdot/Makefile
index ffed2d1b261f..12a3a6e24553 100644
--- a/x11/py-xdot/Makefile
+++ b/x11/py-xdot/Makefile
@@ -1,23 +1,23 @@
 PORTNAME=	xdot
 PORTVERSION=	1.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11 python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	dbaio@FreeBSD.org
 COMMENT=	Interactive viewer for Graphviz dot files
 WWW=		https://pypi.org/project/xdot/
 
 LICENSE=	LGPL3+
 
 RUN_DEPENDS=	dot:graphics/graphviz \
 		${PYNUMPY}
 
 USES=		gnome python:3.4+
 USE_PYTHON=	autoplist distutils
 USE_GNOME=	cairo gtk30 pygobject3
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/x11/tilix/Makefile b/x11/tilix/Makefile
index 892264d254b9..bbbc67a38dd3 100644
--- a/x11/tilix/Makefile
+++ b/x11/tilix/Makefile
@@ -1,29 +1,30 @@
 PORTNAME=	tilix
 PORTVERSION=	1.9.5
+PORTREVISION=	1
 CATEGORIES=	x11
 
 MAINTAINER=	romain@FreeBSD.org
 COMMENT=	Tiling terminal emulator using GTK+ 3
 WWW=		https://gnunn1.github.io/tilix-web/
 
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	cmake:devel/cmake-core \
 		po4a-translate:textproc/po4a \
 		${LOCALBASE}/libdata/pkgconfig/undead.pc:devel/undead \
 		${LOCALBASE}/libdata/pkgconfig/vted-3.pc:x11-toolkits/gtkd
 LIB_DEPENDS=	libdruntime-ldc-shared.so:lang/ldc \
 		libharfbuzz.so:print/harfbuzz \
 		libsecret-1.so:security/libsecret \
 		libunwind.so:devel/libunwind
 
 USES=		desktop-file-utils gettext gnome meson pkgconfig shebangfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	gnunn1
 USE_GNOME=	cairo gdkpixbuf2 librsvg2 vte3
 USE_XORG=	x11
 GLIB_SCHEMAS=	com.gexperts.Tilix.gschema.xml
 SHEBANG_FILES=	data/scripts/tilix_int.sh
 
 .include <bsd.port.mk>
diff --git a/x11/xpra/Makefile b/x11/xpra/Makefile
index f219d80d9944..2a177941891a 100644
--- a/x11/xpra/Makefile
+++ b/x11/xpra/Makefile
@@ -1,130 +1,131 @@
 PORTNAME=	xpra
 PORTVERSION=	4.4.4
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	https://xpra.org/src/
 
 MAINTAINER=	arrowd@FreeBSD.org
 COMMENT=	Persistent remote applications for X
 WWW=		https://xpra.org/
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	pandoc:textproc/hs-pandoc
 LIB_DEPENDS=	libbrotlidec.so:archivers/brotli \
 		libharfbuzz.so:print/harfbuzz \
 		liblz4.so:archivers/liblz4 \
 		libwebp.so:graphics/webp
 RUN_DEPENDS=	${PY_PILLOW} \
 		${PYTHON_PKGNAMEPREFIX}bencode.py>1:converters/py-bencode.py@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}brotli>1:archivers/py-brotli@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cryptography>1:security/py-cryptography@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dbus>1:devel/py-dbus@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}lz4>=0.7.0_1:archivers/py-lz4@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}netifaces>0:net/py-netifaces@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}paramiko>0:security/py-paramiko@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyinotify>0:devel/py-pyinotify@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}PyOpenGL-accelerate>=3.1.0:graphics/py-PyOpenGL-accelerate@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}PyOpenGL>=3.1.0:graphics/py-PyOpenGL@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}rencode>1:converters/py-rencode@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xdg>0:devel/py-xdg@${PY_FLAVOR} \
 		setxkbmap:x11/setxkbmap \
 		ssh-askpass:security/openssh-askpass \
 		xauth:x11/xauth \
 		xkbcomp:x11/xkbcomp \
 		Xvfb:x11-servers/xorg-server@xvfb
 
 USES=		desktop-file-utils gettext-runtime gnome localbase pkgconfig \
 		python:3.6+ shared-mime-info shebangfix tar:xz xorg
 
 USE_GNOME=	cairo gdkpixbuf2 gtk30 pygobject3
 USE_PYTHON=	cython distutils noflavors
 USE_XORG=	x11 xcomposite xdamage xext xfixes xi xkbfile xrandr xres xtst
 PLIST_SUB+=	PORTVERSION=${PORTVERSION} \
 		PYTHON_SUFFIX=${PYTHON_SUFFIX} \
 		PYTHON_VER=${PYTHON_VER}
 SHEBANG_FILES=	fs/lib/cups/backend/xpraforwarder fs/libexec/xpra/auth_dialog \
 		fs/libexec/xpra/gnome-open fs/libexec/xpra/gvfs-open \
 		fs/libexec/xpra/xdg-open fs/libexec/xpra/xpra_signal_listener \
 		fs/libexec/xpra/xpra_udev_product_version
 
 OPTIONS_DEFINE=		AVAHI AVCODEC CUPS DOCS FFMPEG GSTREAMER LIBYUV SWSCALE \
 			WEBCAM X265
 OPTIONS_DEFAULT=	AVAHI CUPS GSTREAMER X264
 OPTIONS_RADIO=		CODEC
 OPTIONS_RADIO_CODEC=	VPX X264
 OPTIONS_SUB=		yes
 
 AVCODEC_DESC=	Enable avcodec2 (FFmpeg) decoder
 CUPS_DESC=	Enable CUPS for printer forwarding
 FFMPEG_DESC=	Enable FFmpeg encoder
 GSTREAMER_DESC=	Enable GStreamer for sound forwarding
 LIBYUV_DESC=	Enable libyuv CSC module (fastest)
 SWSCALE_DESC=	Enable swscale (FFmpeg) CSC module
 VPX_DESC=	Enable VP8 and VP9 codec
 WEBCAM_DESC=	Enable webcam forwarding (client only)
 X264_DESC=	Enable X264 encoder
 X265_DESC=	Enable X265 encoder
 
 AVAHI_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}avahi>0:net/py-avahi@${PY_FLAVOR}
 AVAHI_VARS=			XPRA_OPTIONS+=mdns
 AVCODEC_LIB_DEPENDS=		libavcodec.so:multimedia/ffmpeg
 AVCODEC_VARS=			XPRA_OPTIONS+=dec_avcodec2
 CUPS_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}pycups>1:print/py-pycups@${PY_FLAVOR}
 CUPS_VARS=			XPRA_OPTIONS+=printing
 FFMPEG_LIB_DEPENDS=		libavcodec.so:multimedia/ffmpeg
 FFMPEG_VARS=			XPRA_OPTIONS+=enc_ffmpeg
 GSTREAMER_USES=			gstreamer
 GSTREAMER_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gstreamer1>1:multimedia/py-gstreamer1@${PY_FLAVOR}
 GSTREAMER_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}gstreamer1>1:multimedia/py-gstreamer1@${PY_FLAVOR}
 GSTREAMER_USE=			GSTREAMER=flac,lame,mpg123,ogg,opus,pulse,vorbis,wavpack
 GSTREAMER_VARS=			XPRA_OPTIONS+=sound
 LIBYUV_LIB_DEPENDS=		libyuv.so:graphics/libyuv
 LIBYUV_VARS=			XPRA_OPTIONS+=csc_libyuv
 SWSCALE_LIB_DEPENDS=		libswscale.so:multimedia/ffmpeg
 SWSCALE_VARS=			XPRA_OPTIONS+=csc_swscale
 VPX_LIB_DEPENDS=		libvpx.so:multimedia/libvpx
 VPX_VARS=			XPRA_OPTIONS+=vpx
 WEBCAM_RUN_DEPENDS=		opencv>2:graphics/opencv
 WEBCAM_VARS=			XPRA_OPTIONS+=webcam
 X264_LIB_DEPENDS=		libx264.so:multimedia/libx264
 X264_VARS=			XPRA_OPTIONS+=enc_x264
 X265_LIB_DEPENDS=		libx265.so:multimedia/x265
 X265_VARS=			XPRA_OPTIONS+=enc_x265
 
 PYDISTUTILS_PKGNAME=	xpra_all
 XPRA_OPTIONS_ALL+=	${XPRA_OPTIONS_DISABLED} csc_libyuv csc_swscale \
 			dec_avcodec2 enc_ffmpeg enc_x264 enc_x265 \
 			mdns printing sound vpx webcam
 XPRA_OPTIONS_DISABLED=	strict uinput Xdummy Xdummy_wrapper
 
 .include <bsd.port.options.mk>
 
 .for opt in ${XPRA_OPTIONS_ALL}
 .if empty(XPRA_OPTIONS:M${opt})
 PYDISTUTILS_ARGS+=	--without-${opt}
 .else
 PYDISTUTILS_ARGS+=	--with-${opt}
 .endif
 .endfor
 
 .include <bsd.port.pre.mk>
 
 PYDISTUTILS_BUILDARGS+=	${PYDISTUTILS_ARGS}
 PYDISTUTILS_CONFIGUREARGS+=	${PYDISTUTILS_ARGS}
 PYDISTUTILS_INSTALLARGS+=	${PYDISTUTILS_ARGS}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/share|${LOCALBASE}/share|' \
 	    ${WRKSRC}/xpra/platform/pycups_printing.py
 	@${REINPLACE_CMD} -e 's|/usr/sbin|${LOCALBASE}/sbin|' \
 	    ${WRKSRC}/fs/etc/xpra/conf.d/16_printing.conf.in
 
 post-install:
 	@${MV} ${STAGEDIR}${ETCDIR}/xorg.conf \
 	    ${STAGEDIR}${ETCDIR}/xorg.conf.sample
 	@${MV} ${STAGEDIR}${ETCDIR}/xpra.conf \
 	    ${STAGEDIR}${ETCDIR}/xpra.conf.sample
 	@${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME} -name '*.so' \
 	    -exec ${STRIP_CMD} {} +
 
 .include <bsd.port.post.mk>