diff --git a/cad/kicad-devel/Makefile b/cad/kicad-devel/Makefile
index 8c9cad0e5809..e244e872e863 100644
--- a/cad/kicad-devel/Makefile
+++ b/cad/kicad-devel/Makefile
@@ -1,182 +1,182 @@
 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
 
 BROKEN_i386=    doesn't buld on pkg builder
 
 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 \
 		libgit2.so:devel/libgit2 \
 		libharfbuzz.so:print/harfbuzz \
 		libngspice.so:cad/ngspice_rework@shlib \
 		libTKernel.so:cad/opencascade \
 		libpixman-1.so:x11/pixman \
 		libpng.so:graphics/png \
 		libprotobuf.so:devel/protobuf \
 		libcurl.so:ftp/curl \
 		libGLEW-wayland.so:graphics/glew-wayland \
 		libnng.so:net/nng \
 		libpoppler-glib.so:graphics/poppler-glib \
 		libspnav.so:misc/libspnav \
 		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++20-lang desktop-file-utils gl \
 		gettext gnome pkgconfig python shared-mime-info shebangfix ssl \
 		tar:bzip2 xorg 
 USE_GITLAB=	yes
 GL_ACCOUNT=	kicad/code
 GL_PROJECT=	kicad
 GL_TAGNAME=	${GIT_SRC_HASH}
 USE_GL=		egl gl glu glut opengl
 USE_WX=		3.2
 WX_COMPS=	wx python:lib
 USE_GNOME=	atk cairo gtk30 gdkpixbuf 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++14 -I${WRKSRC} -I${WRKSRC}/include -I${LOCALBASE}/include
 CXXFLAGS+=	-g -DBOOST_STACKTRACE_GNU_SOURCE_NOT_REQUIRED # error: "Boost.Stacktrace requires `_Unwind_Backtrace` function. Define `_GNU_SOURCE` macro or `BOOST_STACKTRACE_GNU_SOURCE_NOT_REQUIRED` if _Unwind_Backtrace is available without `_GNU_SOURCE`."
 # -undefined dynamic_lookup
 CXXFLAGS_powerpc=	-O0
 CMAKE_ARGS=	-DLOCALBASE="${LOCALBASE}" \
 		-DCMAKE_BUILD_TYPE="Debug" \
 		-DKICAD_BUILD_I18N=ON \
 		-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_SPICE=ON \
 		-DKICAD_USE_OCE=OFF \
 		-DKICAD_USE_OCC=ON \
 		-DKICAD_USE_EGL=ON \
 		-DKICAD_USE_BUNDLED_GLEW=ON \
 		-DNANODBC_ENABLE_BOOST=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/Makefile b/cad/kicad/Makefile
index b7422d64336a..2f1b27b55507 100644
--- a/cad/kicad/Makefile
+++ b/cad/kicad/Makefile
@@ -1,83 +1,84 @@
 PORTNAME=	kicad
 DISTVERSION=	9.0.7
+PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	cad
 
 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_locale.so:devel/boost-libs	\
 		libabsl_log_internal_check_op.so:devel/abseil		\
 		libgit2.so:devel/libgit2		\
 		libprotobuf.so:devel/protobuf		\
 		libnng.so:net/nng			\
 		libharfbuzz.so:print/harfbuzz		\
 		libngspice.so:cad/ngspice_rework@shlib	\
 		libTKernel.so:cad/opencascade		\
 		libpixman-1.so:x11/pixman		\
 		libzstd.so:archivers/zstd		\
 		libcurl.so:ftp/curl			\
 		libwayland-client.so:graphics/wayland	\
 		libfreetype.so:print/freetype2		\
 		libsecret-1.so:security/libsecret	\
 		libfontconfig.so:x11-fonts/fontconfig	\
 		libodbc.so:databases/unixODBC
 
 USES=		cmake:noninja compiler:c++20-lang desktop-file-utils \
 		gnome pkgconfig python shared-mime-info shebangfix \
 		tar:bz2 xorg
 SHEBANG_FILES=	pcbnew/python/plugins/touch_slider_wizard.py
 
 USE_XORG=	ice x11 xext
 USE_GL=		egl gl glu glut opengl
 USE_WX=		3.2
 WX_COMPS=	python:lib wx
 USE_GNOME=	atk cairo gdkpixbuf gtk30 pango
 
 USE_GITLAB=	yes
 GL_ACCOUNT=	kicad/code
 GL_PROJECT=	kicad
 
 CXXFLAGS+=	-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_SPICE_QA=ON				\
 		-DKICAD_USE_SENTRY=OFF				\
 		-DKICAD_SIGNAL_INTEGRITY=ON			\
 		-DKICAD_BUILD_QA_TESTS=ON			\
 		-DKICAD_SCRIPTING_WXPYTHON=ON			\
 		-DKICAD_UPDATE_CHECK=OFF			\
 		-DKICAD_USE_EGL=ON				\
 		-DKICAD_USE_BUNDLED_GLEW=ON 			\
 		-DKICAD_WAYLAND=ON				\
 		-DKICAD_INSTALL_DEMOS=ON			\
 		-DNANODBC_ENABLE_BOOST=ON			\
 		-DOCC_INCLUDE_DIR=${LOCALBASE}/include/OpenCASCADE
 CMAKE_ENV+=	DODBC_PATH=${LOCALBASE}
 USE_LDCONFIG=	yes
 
 # SOVERSION helps testing rc packages
 PLIST_SUB=	DESKTOPDIR=${DESKTOPDIR:S|^${PREFIX}/||} \
 		SOVERSION=${PORTVERSION:C/.r[0-9]*//}
 
 OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=	yes
 
 NLS_USES=	gettext
 NLS_CMAKE_BOOL= KICAD_BUILD_I18N
 
 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/comms/chirp/Makefile b/comms/chirp/Makefile
index 257c17b458a7..95123f71c0b7 100644
--- a/comms/chirp/Makefile
+++ b/comms/chirp/Makefile
@@ -1,58 +1,58 @@
 PORTNAME=	chirp
 DISTVERSION=	20251106
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	comms hamradio
 PKGNAMESUFFIX=	${PYTHON_PKGNAMESUFFIX}
 DIST_SUBDIR=	chirp
 
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Free, open-source tool for programming your amateur radio
 WWW=		https://chirpmyradio.com/ \
 		https://github.com/kk7ds/chirp/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${PY_SETUPTOOLS} \
 		${PYTHON_PKGNAMEPREFIX}versioningit>0:devel/py-versioningit@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyserial>0:comms/py-pyserial@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yattag>0:devel/py-yattag@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}suds>0:net/py-suds@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}lark>0:devel/py-lark@${PY_FLAVOR}
 
 USES=		desktop-file-utils gnome python:3.10+ shebangfix
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	kk7ds
 GH_TAGNAME=	0d2703ec
 
 USE_PYTHON=	autoplist distutils pytest
 USE_WX=		3.2
 WX_COMPS=	python:run
 
 SHEBANG_GLOB=	*.py
 
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=	yes
 
 post-patch:
 	@${ECHO} "Version: ${PORTVERSION}" > ${WRKSRC}/PKG-INFO
 
 post-install:
 	@cd ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}/share && \
 		${INSTALL_DATA} ${PORTNAME}.png ${STAGEDIR}${PREFIX}/share/pixmaps && \
 		${INSTALL_DATA} ${PORTNAME}.desktop ${STAGEDIR}${DESKTOPDIR}
 
 post-install-NLS-on:
 	@${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}/share/locale
 	@cd ${WRKSRC}/chirp && \
 		${COPYTREE_SHARE}  locale ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME}/share
 	@${RM} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}/share/locale/Makefile
 	@${RM} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}/share/locale/check_parameters.py
 	@${RM} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}/share/locale/README.md
 
 .include <bsd.port.mk>
diff --git a/comms/quisk/Makefile b/comms/quisk/Makefile
index d5522a7793a8..6d0ffde62bd7 100644
--- a/comms/quisk/Makefile
+++ b/comms/quisk/Makefile
@@ -1,36 +1,36 @@
 PORTNAME=	quisk
 DISTVERSION=	4.2.36
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	comms hamradio
 MASTER_SITES=	PYPI
 
 MAINTAINER=	fbsd@thesoo.org
 COMMENT=	Software Defined Radio (SDR)
 WWW=		https://james.ahlstrom.name/quisk/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/license.txt
 
 LIB_DEPENDS=	libasound.so:audio/alsa-lib \
 		libfftw3.so:math/fftw3 \
 		libportaudio.so:audio/portaudio \
 		libpulse.so:audio/pulseaudio
 
 USES=		python
 USE_PYTHON=	autoplist distutils noflavors
 USE_WX=		3.2
 
 WX_COMPS=	python
 
 post-extract:
 	@${RM} ${WRKSRC}/_quisk.so ${WRKSRC}/sdriqpkg/sdriq.so \
 		${WRKSRC}/freedvpkg/libcodec2_32.so \
 		${WRKSRC}/freedvpkg/libcodec2_64.so
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/setup.py
 
 post-stage:
 	@${FIND} ${STAGEDIR}${PREFIX} -name "*.so" | ${XARGS} ${STRIP_CMD}
 
 .include <bsd.port.mk>
diff --git a/databases/grass8/Makefile b/databases/grass8/Makefile
index 17c46b0f6d7a..15d56920cc01 100644
--- a/databases/grass8/Makefile
+++ b/databases/grass8/Makefile
@@ -1,152 +1,152 @@
 PORTNAME=	grass
 DISTVERSION=	8.4.2
-PORTREVISION=	2
+PORTREVISION=	3
 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 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=	libpdalcpp.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/emulators/playonbsd/Makefile b/emulators/playonbsd/Makefile
index 59c9ca98ac61..f6d29cc33b16 100644
--- a/emulators/playonbsd/Makefile
+++ b/emulators/playonbsd/Makefile
@@ -1,74 +1,74 @@
 PORTNAME=	playonbsd
 PORTVERSION=	4.2.10
-PORTREVISION=	17
+PORTREVISION=	18
 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 \
 		wget:ftp/wget \
 		xdg-open:devel/xdg-utils \
 		xterm:x11/xterm
 
 USES=		perl5 python:run shebangfix sudo
 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}${PREFIX}/share/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/graphics/py-mayavi/Makefile b/graphics/py-mayavi/Makefile
index 47ed81c0fcfa..784fa4bd8a65 100644
--- a/graphics/py-mayavi/Makefile
+++ b/graphics/py-mayavi/Makefile
@@ -1,59 +1,59 @@
 PORTNAME=	mayavi
 DISTVERSION=	4.8.2
-PORTREVISION=	6
+PORTREVISION=	7
 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
 
 BROKEN_i386=	stage fails: Building TVTK classes... Fatal Python error: Illegal instruction
 
 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 shebangfix
 USE_PYTHON=	distutils autoplist
 
 USE_WX=		3.2
 WX_COMPS=	python:run
 
 SHEBANG_FILES=	mayavi/scripts/mayavi2 \
 		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/misc/pyobd/Makefile b/misc/pyobd/Makefile
index 8aa6b9b5ba01..40fc193c707d 100644
--- a/misc/pyobd/Makefile
+++ b/misc/pyobd/Makefile
@@ -1,42 +1,42 @@
 PORTNAME=	pyobd
 DISTVERSION=	0.9.3
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	misc
 MASTER_SITES=	http://www.obdtester.com/download/
 DISTNAME=	pyobd_${PORTVERSION}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	OBD-II compliant car diagnostic tool
 WWW=		http://www.obdtester.com/pyobd
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyserial>0:comms/py-pyserial@${PY_FLAVOR}
 
 USES=		dos2unix gnome magick:6,build python shebangfix
 DOS2UNIX_FILES=	${PORTNAME}.desktop
 SHEBANG_FILES=	${PORTNAME}
 USE_WX=		3.2
 WX_COMPS=	python
 
 NO_ARCH=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 do-build:
 	@convert ${WRKSRC}/${PORTNAME}.gif ${WRKSRC}/${PORTNAME}.png
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.desktop \
 		${STAGEDIR}${PREFIX}/share/applications/${PORTNAME}.desktop
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/32x32/apps
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.png \
 		${STAGEDIR}${PREFIX}/share/icons/hicolor/32x32/apps/${PORTNAME}.png
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME} ${WRKSRC}/*.py ${WRKSRC}/*.pyc \
 		${STAGEDIR}${DATADIR}
 	@${CHMOD} +x ${STAGEDIR}${DATADIR}/${PORTNAME}
 	@${LN} -sf ../share/${PORTNAME}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/multimedia/photofilmstrip/Makefile b/multimedia/photofilmstrip/Makefile
index ee8586706115..4f0d26488b53 100644
--- a/multimedia/photofilmstrip/Makefile
+++ b/multimedia/photofilmstrip/Makefile
@@ -1,31 +1,31 @@
 PORTNAME=	photofilmstrip
 DISTVERSION=	3.7.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	multimedia python
 MASTER_SITES=	https://github.com/PhotoFilmStrip/PFS/releases/download/v${DISTVERSION}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Creates movies out of your pictures
 WWW=		https://www.photofilmstrip.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
 		${PY_PILLOW}
 RUN_DEPENDS=	mencoder:multimedia/mencoder \
 		mplayer:multimedia/mplayer
 
 USES=		python gettext gstreamer
 USE_GSTREAMER=	jpeg
 USE_PYTHON=	distutils
 USE_WX=		3.2
 WX_COMPS=	python:lib
 ALL_TARGET=	compile
 NO_ARCH=	yes
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|python3|${PYTHON_CMD}|g' ${WRKSRC}/Makefile
 
 .include <bsd.port.mk>