diff --git a/cad/freecad-devel/Makefile b/cad/freecad-devel/Makefile
index 47f33f0ab247..c574aadb9074 100644
--- a/cad/freecad-devel/Makefile
+++ b/cad/freecad-devel/Makefile
@@ -1,147 +1,146 @@
 PORTNAME=	FreeCAD
 DISTVERSION=	r${GIT_SRC_DATE}
-#PORTREVISION=	1
 CATEGORIES=	cad
 PKGNAMESUFFIX=  -devel
 
 MAINTAINER=	mr@FreeBSD.org
 COMMENT=	General purpose 3D CAD modeller
 WWW=		https://www.freecadweb.org/
 
 LICENSE=	LGPL20+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 CONFLICTS_INSTALL=      freecad # bin/FreeCAD
 
 BUILD_DEPENDS=	doxygen:devel/doxygen \
 		pybind11-config:devel/py-pybind11@${PY_FLAVOR} \
 		pybind11>0:devel/pybind11 \
 		${PYTHON_PKGNAMEPREFIX}pyside6-tools>0:devel/pyside6-tools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pivy>0:graphics/py-pivy@${PY_FLAVOR} \
 		${PYTHON_SITELIBDIR}/matplotlib/__init__.py:math/py-matplotlib@${PY_FLAVOR} \
 		swig:devel/swig
 
 LIB_DEPENDS=	libexpat.so:textproc/expat2 \
 		libyaml-cpp.so:devel/yaml-cpp \
 		libfreetype.so:print/freetype2 \
 		libtbb.so:devel/onetbb \
 		${PY_BOOST} \
 		libpyside6.abi3.so:devel/pyside6 \
 		libCoin.so:graphics/Coin \
 		libfmt.so:devel/libfmt \
 		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 \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreeimage.so:graphics/freeimage \
 		libavutil.so.58:multimedia/ffmpeg \
 		libavformat.so.58:multimedia/ffmpeg4 \
 		libmed.so:french/med \
 		libshiboken6.abi3.so:devel/shiboken6@${PY_FLAVOR} \
 		libhdf5.so:science/hdf5 \
 		libicui18n.so:devel/icu
 
 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++20-lang cmake cpe gl eigen:3 fortran gmake jpeg \
 		localbase:ldflags mpi:openmpi pkgconfig python localbase qt:6 xorg \
 		desktop-file-utils shared-mime-info shebangfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	FreeCAD:ondsel google:gtest microsoft:gsl FreeCAD:addonmgr
 GH_PROJECT=	OndselSolver:ondsel googletest:gtest GSL:gsl AddonManager:addonmgr
 GH_TAGNAME=	${GIT_SRC_HASH} ${GIT_ONDSEL_HASH}:ondsel ${GIT_GTEST_HASH}:gtest ${GIT_GSL_HASH}:gsl ${GIT_ADDONMGR_HASH}:addonmgr
 GH_SUBDIR=	src/3rdParty/OndselSolver:ondsel tests/lib:gtest src/3rdParty/GSL:gsl src/Mod/AddonManager:addonmgr
 USE_XORG=	ice sm x11 xext xt
 USE_GL=		gl glu
 USE_QT=		base svg tools
 #USE_QT=		buildtools concurrent core declarative designer gui \
 #		linguisttools location network opengl printsupport \
 #		qmake:build svg webchannel widgets xml xmlpatterns
 USE_LDCONFIG=	yes
 
 CPE_VENDOR=	freecad_project
 
 VTK_VER=	9.5
 
 DOS2UNIX_GLOB=	*.txt *.h *.cpp *.py *.qss *.csv *.pov *.stp *.ui *.wrl *.WRL
 SHEBANG_FILES=	src/Tools/freecad-thumbnailer.in
 
 # our HDF5/CMake integration is messy, so workarounds are required below
 CMAKE_ARGS+=	-DOCC_INCLUDE_DIR="${LOCALBASE}/include/OpenCASCADE" \
 		-DOPENMPI_INCLUDE_DIRS="${LOCALBASE}/mpi/openmpi/include" \
 		-DFREECAD_QT_VERSION=6 \
 		-DBUILD_QT5="OFF" \
 		-DBUILD_QT6="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="ON" \
 		-DBUILD_DESIGNER_PLUGIN="ON" \
 		-DBUILD_FLAT_MESH="ON" \
 		-DBUILD_VR="OFF" \
 		-DFREECAD_USE_EXTERNAL_FMT="ON" \
 		-DFREECAD_CREATE_MAC_APP="OFF" \
 		-DFREECAD_FREECAD_LIBPACK_USE="OFF" \
 		-DFREECAD_USE_EXTERNAL_KDL="OFF" \
 		-DFREECAD_USE_EXTERNAL_SMESH="OFF" \
 		-DFREECAD_USE_FREETYPE="ON" \
 		-DFREECAD_USE_PYBIND11="ON" \
 		-DFREECAD_USE_PCL="OFF" \
 		-Dpybind11_DIR="${PYTHON_SITELIBDIR}/pybind11/share/cmake/pybind11" \
 		-DHDF5_CFLAGS="-I${LOCALBASE}/include" \
 		-DHDF5_FOUND=TRUE \
 		-DHDF5_VERSION="1.12.2" \
 		-DHDF5_INCLUDE_DIRS="${LOCALBASE}/include/hdf5" \
 		-DHDF5_LIBRARIES="-L${LOCALBASE}/lib -lhdf5" \
 		-DHDF5_LIBRARY_DIRS="${LOCALBASE}/lib" \
 		-DPYSIDE2RCCBINARY="${RCC}" \
 		-DPYSIDE2UICBINARY="${UIC}" \
 		-DBUILD_ENABLE_CXX_STD=C++20
 
 
 CMAKE_INSTALL_PREFIX=	${PREFIX}/${PORTNAME}
 # Install XDG icons and files to the standard path
 CMAKE_ARGS+=	-DXDG_DATADIR="${PREFIX}/share"
 
 OPTIONS_DEFINE=	COLLADA SPNAV
 
 COLLADA_DESC=		Install pycollada for Collada files import
 COLLADA_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycollada>0:graphics/py-pycollada@${PY_FLAVOR}
 OPTIONS_DEFINE= COLLADA SPNAV
 SPNAV_DESC=             Enable libspnav (SpaceMouse) support
 SPNAV_CMAKE_BOOL=       FREECAD_SPNAV_SUPPORT
 SPNAV_LIB_DEPENDS=      libspnav.so:misc/libspnav
 
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == aarch64 || ${ARCH} == amd64 || ${ARCH} == i386
 PLIST_SUB=	WEBENGINE=""
 USE_QT+=	webengine
 .else
 CMAKE_ARGS+=	-DBUILD_WEB:BOOL=OFF
 PLIST_SUB=	WEBENGINE="@comment "
 .endif
 
 .include "Makefile.git_rev"
 
 pre-configure:
 	@${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} -sf ../${PORTNAME}/bin/FreeCAD ${STAGEDIR}${LOCALBASE}/bin/FreeCAD
 	${LN} -sf ../${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/openscad-devel/Makefile b/cad/openscad-devel/Makefile
index 7d004feb09e6..b90f1726d1fb 100644
--- a/cad/openscad-devel/Makefile
+++ b/cad/openscad-devel/Makefile
@@ -1,73 +1,72 @@
 PORTNAME=	openscad
 PORTVERSION=	${GIT_SRC_DATE}
 PORTREVISION=	1
-#PORTREVISION=	1
 CATEGORIES=	cad
 PKGNAMESUFFIX=	-devel
 
 #PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
 #PATCHFILES+=	cc49ad8dac24.patch:-p1
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 MAINTAINER=	mr@FreeBSD.org
 COMMENT=	Programmer's solid 3D CAD modeller #'
 WWW=		https://www.openscad.org/
 
 BUILD_DEPENDS=	cgal>0:math/cgal \
 		evdev-proto>0:devel/evdev-proto \
 		${LOCALBASE}/include/glm/glm.hpp:math/glm \
 		${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy@${PY_FLAVOR}
 
 LIB_DEPENDS=	libzip.so:archivers/libzip \
 		libhidapi.so:comms/hidapi \
 		libboost_regex.so:devel/boost-libs \
 		libqscintilla2_qt6.so:devel/qscintilla2@qt6 \
 		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 \
 		libtbb.so:devel/onetbb \
 		lib3mf.so:cad/lib3mf
 
 CONFLICTS=	openscad
 
 USES=		bison cmake compiler:c++17-lang cpe desktop-file-utils eigen:3 gettext \
 		gl gnome pkgconfig python qt:6 shared-mime-info xorg
 USE_GITHUB=	yes
 USE_GL=		gl glu glew
 USE_GNOME=	cairo glib20 libxml2
 USE_QT=		base 5compat multimedia svg tools
 USE_XORG=	x11
 GH_ACCOUNT=	microsoft:mimalloc elalish:manifold arsenm:sanitizerscmake \
 		openscad:opencsg AngusJohnson:clipper2
 GH_PROJECT=	MCAD:mcad mimalloc:mimalloc manifold:manifold sanitizers-cmake:sanitizerscmake \
 		OpenCSG:opencsg Clipper2:clipper2
 GH_TAGNAME=	${GIT_SRC_HASH} ${GIT_MCAD_HASH}:mcad \
 		${GIT_CLIPPER2_HASH}:clipper2 ${GIT_OPENCSG_HASH}:opencsg \
 		${GIT_MANIFOLD_HASH}:manifold ${GIT_MIMALLOC_HASH}:mimalloc \
 		${GIT_SANITIZERSCMAKE_HASH}:sanitizerscmake
 GH_SUBDIR=	libraries/MCAD:mcad submodules/mimalloc:mimalloc submodules/manifold:manifold \
 		submodules/sanitizers-cmake:sanitizerscmake submodules/OpenCSG:opencsg \
 		submodules/Clipper2:clipper2
 # Avoid overlinking: kvm, procstat, boost(thread, system), Qt5(concurrent, network, printsupport)
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-Wl,--as-needed -L${LOCALBASE}/lib
 CMAKE_ARGS+=	-DUSE_QT6="ON" -DUSE_MIMALLOC="OFF" -DENABLE_CGAL="ON" -DUSE_BUILTIN_OPENCSG="ON" -DENABLE_GLX="ON" -DCMAKE_BUILD_TYPE=Debug
 
 .include "Makefile.git_rev"
 
 .include <bsd.port.pre.mk>
 
 post-patch:
 	@${REINPLACE_CMD} -e '/find_package/s| system||' \
 		${WRKSRC}/CMakeLists.txt
 
 do-install:
 	${CMAKE_BIN} --install ${BUILD_WRKSRC} --prefix ${STAGEDIR}${PREFIX}
 
 .include <bsd.port.post.mk>
diff --git a/comms/uhd/Makefile b/comms/uhd/Makefile
index 3c143330db7e..3b3d91b57b7b 100644
--- a/comms/uhd/Makefile
+++ b/comms/uhd/Makefile
@@ -1,82 +1,81 @@
 PORTNAME=	uhd
 DISTVERSIONPREFIX=	v
 DISTVERSION=	4.9.0.1
-#PORTREVISION=	1
 CATEGORIES=	comms hamradio
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	mr@FreeBSD.org
 COMMENT=	Ettus Research UHD driver framework
 WWW=		https://www.ettus.com/sdr-software/uhd-usrp-hardware-driver/
 
 # See https://www.ettus.com/sdr-software/licenses/.  Dual license
 # under GPLv3 and and "Alternate License" whose terms are not documented
 # on the web site (contact info@ettus.com).  Mark as GPLv3 for now
 # until terms of the "Alternate License" are made clear.  When that
 # is understood and if appropriate, we can add that license here.
 LICENSE=	GPLv3
 
 LIB_DEPENDS=	${PY_BOOST} \
 		libboost_thread.so:devel/boost-libs
 BUILD_DEPENDS=	\
 		orcc:devel/orc \
 		cheetah-analyze:devel/py-cheetah3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mako>0:textproc/py-mako@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
 		rst2html:textproc/py-docutils@${PY_FLAVOR} \
 		${PYNUMPY} \
 		${PY_SETUPTOOLS} \
 		${PYTHON_PKGNAMEPREFIX}ruamel.yaml>=0:devel/py-ruamel.yaml@${PY_FLAVOR}
 
 USES=		compiler:c++14-lang cmake ncurses pkgconfig \
 		dos2unix python shebangfix
 USE_LDCONFIG=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	EttusResearch
 
 BROKEN_FreeBSD_13_aarch64=	fails to configure: Could not find standard set_new_handler function
 BROKEN_FreeBSD_13_armv6=	fails to configure: Could not find standard set_new_handler function
 BROKEN_FreeBSD_13_armv7=	fails to configure: Could not find standard set_new_handler function
 
 CMAKE_SOURCE_PATH=	${WRKSRC}/host
 #CXXFLAGS_amd64=	-msse2 -std=c++11
 CXXFLAGS_i386=	-msse2
 
 LDFLAGS+=	${LDFLAGS_${CHOSEN_COMPILER_TYPE}}
 LDFLAGS_gcc=	-latomic
 
 SHEBANG_GLOB=	*.py *.py.in *_bist usrp_update*
 
 CMAKE_ARGS+=	-DPKG_LIB_DIR:STRING="share/uhd" -DUHD_TXRX_DEBUG_PRINTS="yes"
 # for excruciating debug use this -db
 CMAKE_ARGS+=	-DCMAKE_INCLUDE_PATH="${WRKSRC}/host/include ${LOCALBASE}/include"
 
 OPTIONS_DEFINE=		DOCS DOXYGEN
 OPTIONS_DEFAULT=	DOCS
 
 OPTIONS_SUB=		yes
 
 DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
 DOXYGEN_CMAKE_ON=	-DENABLE_DOXYGEN:STRING="ON"
 DOXYGEN_CMAKE_OFF=	-DENABLE_DOXYGEN:STRING="OFF" \
 			-DENABLE_MANUAL:STRING="OFF"
 DOXYGEN_PORTDOCS=	doxygen
 
 do-install:
 # install host component
 # hack the install prefix now
 	@${REINPLACE_CMD} -e 's|"${LOCALBASE}"|"${STAGEDIR}${PREFIX}"|g' \
 		${CONFIGURE_WRKSRC}/cmake_install.cmake
 	cd ${CONFIGURE_WRKSRC} && ${MAKE_CMD} install
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${DATADIR}/utils/b2xx_fx3_utils
 	${STRIP_CMD} ${STAGEDIR}${DATADIR}/utils/usrp_burn_mb_eeprom
 	${STRIP_CMD} ${STAGEDIR}${DATADIR}/utils/usrp_burn_db_eeprom
 	${STRIP_CMD} ${STAGEDIR}${DATADIR}/utils/query_gpsdo_sensors
 	${STRIP_CMD} ${STAGEDIR}${DATADIR}/utils/octoclock_burn_eeprom
 	${STRIP_CMD} ${STAGEDIR}${DATADIR}/utils/latency/responder
 	${STRIP_CMD} ${STAGEDIR}${DATADIR}/utils/fx2_init_eeprom
 	${STRIP_CMD} ${STAGEDIR}${DATADIR}/utils/converter_benchmark
 
 .include <bsd.port.mk>
diff --git a/devel/avrdude/Makefile b/devel/avrdude/Makefile
index e5aab7b96484..8321c3bf9952 100644
--- a/devel/avrdude/Makefile
+++ b/devel/avrdude/Makefile
@@ -1,31 +1,30 @@
 PORTNAME=	avrdude
 PORTVERSION=	7.3
 DISTVERSIONPREFIX=	v
-#PORTREVISION=	0
 CATEGORIES=	devel
 
 MAINTAINER=	joerg@FreeBSD.org
 COMMENT=	Program for programming the on-chip memory of Atmel AVR CPUs
 WWW=		https://github.com/avrdudes/avrdude/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		localbase readline cmake
 USE_GITHUB=	yes
 GH_ACCOUNT=	avrdudes
 GH_PROJECT=	avrdude
 
 OPTIONS_DEFINE=		FTDI PARPORT
 OPTIONS_DEFAULT=	FTDI
 FTDI_DESC=		libftdi support
 FTDI_LIB_DEPENDS=	libftdi1.so:devel/libftdi1
 PARPORT_DESC=		support for parallel-port programmers
 PARPORT_CMAKE_ON=	-DHAVE_PARPORT=1
 
 # man page currently not handled by CMake
 # https://github.com/avrdudes/avrdude/issues/947
 post-install:
 	${GZIP_CMD} < ${WRKSRC}/src/avrdude.1 > ${STAGEDIR}/${PREFIX}/share/man/man1/avrdude.1.gz
 
 .include <bsd.port.mk>
diff --git a/graphics/opencsg/Makefile b/graphics/opencsg/Makefile
index 41a1755e8f0a..4df292462956 100644
--- a/graphics/opencsg/Makefile
+++ b/graphics/opencsg/Makefile
@@ -1,21 +1,20 @@
 PORTNAME=	opencsg
 PORTVERSION=	1.6.0
-#PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.opencsg.org/
 DISTNAME=	OpenCSG-${PORTVERSION}
 
 MAINTAINER=	mr@FreeBSD.org
 COMMENT=	Constructive Solid Geometry rendering library
 WWW=		https://www.opencsg.org/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/copying.txt
 
 USES=		compiler:c++11-lang gl qmake qt:5
 USE_GL=		gl glu glut
 USE_LDCONFIG=	yes
 USE_QT=		opengl
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
 .include <bsd.port.mk>
diff --git a/misc/spnavcfg-devel/Makefile b/misc/spnavcfg-devel/Makefile
index 30545a74e8c9..40acfd9c8e75 100644
--- a/misc/spnavcfg-devel/Makefile
+++ b/misc/spnavcfg-devel/Makefile
@@ -1,52 +1,51 @@
 PORTNAME=	spnavcfg
 PORTVERSION=	r${GIT_SRC_DATE}
-#PORTREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES+=	https://github.com/FreeSpacenav/spnavcfg/raw/refs/heads/master/icons/:icons
 PKGNAMESUFFIX=	-devel
 DIST_SUBDIR=	${PORTNAME}
 EXTRACT_ONLY=	${GH_ACCOUNT}-${PORTNAME}-${DISTVERSION}-${GH_TAGNAME}_GH0${EXTRACT_SUFX}
 
 MAINTAINER=	mr@freebsd.org
 COMMENT=	Spacenav daemon interactive configuration program
 WWW=	http://spacenav.sourceforge.net
 
 LICENSE=	GPLv3+
 
 LIB_DEPENDS+=	libspnav.so:misc/libspnav
 
 USES=		desktop-file-utils gmake pkgconfig qt:6 xorg
 USE_GITHUB=	yes
 GH_ACCOUNT=	FreeSpacenav
 GH_PROJECT=	spnavcfg
 GH_TAGNAME=	${GIT_SRC_HASH}
 USE_QT=		base svg tools
 USE_XORG+=	x11
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-debug
 
 MAKE_ENV+=	MOC="${MOC}" RCC="${RCC}" UIC="${UIC}"
 ALL_TARGET=	${PORTNAME}
 
 ICONS=		devices.png spnavcfg-128x128.png spnavcfg-256x256.png spnavcfg-48x48.png spnavcfg.png
 .for f in ${ICONS}
 DISTFILES+=	$(f):icons
 .endfor
 
 PLIST_FILES=	bin/spnavcfg \
 		share/applications/spnavcfg.desktop \
 		share/icons/hicolor/128x128/apps/spnavcfg.png \
 		share/icons/hicolor/256x256/apps/spnavcfg.png \
 		share/icons/hicolor/48x48/apps/spnavcfg.png
 
 .include	"Makefile.git_rev"
 
 post-extract:
 .for f in ${ICONS}
 	(${CP} ${DISTDIR}/${DIST_SUBDIR}/${f} ${WRKSRC}/icons/${f})
 .endfor
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/spnavcfg
 
 .include <bsd.port.mk>
diff --git a/sysutils/i2c-tools/Makefile b/sysutils/i2c-tools/Makefile
index 56e690c986a6..02916467619d 100644
--- a/sysutils/i2c-tools/Makefile
+++ b/sysutils/i2c-tools/Makefile
@@ -1,26 +1,25 @@
 PORTNAME=	i2c-tools
 DISTVERSION=	4.3
-#PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	https://mirrors.edge.kernel.org/pub/software/utils/i2c-tools/
 
 MAINTAINER=	avg@FreeBSD.org
 COMMENT=	Heterogeneous set of I2C tools
 WWW=		https://i2c.wiki.kernel.org/index.php/I2C_Tools
 
 LICENSE=	GPLv2
 
 NO_BUILD=	yes
 USES=		perl5 shebangfix tar:xz
 USE_PERL5=	run
 
 PLIST_FILES=	sbin/decode-dimms share/man/man1/decode-dimms.1.gz
 SHEBANG_FILES=	eeprom/decode-dimms
 
 do-install:
 	${INSTALL_MAN} ${WRKSRC}/eeprom/decode-dimms.1 \
 		${STAGEDIR}${PREFIX}/share/man/man1/
 	${INSTALL_SCRIPT} ${WRKSRC}/eeprom/decode-dimms \
 		${STAGEDIR}${PREFIX}/sbin
 
 .include <bsd.port.mk>
diff --git a/www/typo3-12/Makefile b/www/typo3-12/Makefile
index 21e2b0f87e99..c9360b33bd75 100644
--- a/www/typo3-12/Makefile
+++ b/www/typo3-12/Makefile
@@ -1,74 +1,73 @@
 PORTNAME=	typo3
 DISTVERSION=	${PORT_V_MAJOR}.${PORT_V_MINOR}.${PORT_V_PATCH}
-#PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	https://cdn.typo3.com/typo3/${DISTVERSION}/
 PKGNAMESUFFIX=	-${PORT_V_MAJOR}${PHP_PKGNAMESUFFIX}
 DISTNAME=	${PORTNAME}_src-${DISTVERSION}
 
 MAINTAINER=	freebsd-ports@charlieroot.de
 COMMENT=	Typo3 content management system
 WWW=		https://typo3.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 USES=		cpe php:web,flavors shebangfix
 # php openssl extension is required but it's statically linked in default php
 USE_PHP=	ctype dom fileinfo filter gd intl mbstring pdo session \
 		simplexml tokenizer xml zip zlib
 
 SHEBANG_GLOB=	*.php *.sh
 NO_ARCH=	yes
 NO_BUILD=	yes
 PORTSCOUT=	limit:^${PORT_V_MAJOR}\.${PORT_V_MINOR}\.
 SUB_FILES=	pkg-message
 SUB_LIST+=	PREFIX=${PREFIX} \
 		TYPO3DIR=${TYPO3DIR} \
 		TYPO3WWW=${TYPO3WWW}
 WRKSRC=		${WRKDIR}/${PORTNAME}_src-${DISTVERSION}
 
 PORT_V_MAJOR=	12
 PORT_V_MINOR=	4
 PORT_V_PATCH=	34
 
 TYPO3DIR=	www/${PORTNAME}-${PORT_V_MAJOR}
 
 OPTIONS_DEFINE=		CURL GMP IMAGICK MYSQL POSTGRES SQLITE X11
 OPTIONS_DEFAULT=	MYSQL
 
 IMAGICK_DESC=	${IMAGEMAGICK_DESC}
 MYSQL_DESC=	Use MySQL as DBMS
 POSTGRES_DESC=	Use PostgreSQL as DBMS
 SQLITE_DESC=	Use SQLite as DBMS
 
 CURL_USE=	PHP=curl
 GMP_USE=	PHP=gmp
 MYSQL_USE=	PHP=mysqli
 POSTGRES_USE=	PHP=pgsql
 SQLITE_USE=	PHP=sqlite3
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MIMAGICK}
 .if ${PORT_OPTIONS:MX11}
 USES+=		magick:7,run
 .else
 USES+=		magick:7,run,nox11
 .endif
 .endif
 
 do-install:
 	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/${TYPO3DIR}
 
 post-install:
 	@${ECHO_CMD} "@owner ${WWWOWN}" >> ${TMPPLIST}
 	@${ECHO_CMD} "@group ${WWWGRP}" >> ${TMPPLIST}
 	@${ECHO_CMD} "@mode 755" >> ${TMPPLIST}
 	@${FIND} -s -d ${WRKSRC} -type f | ${SED} "s?${WRKSRC}?${TYPO3DIR}?g" >>${TMPPLIST}
 	@${FIND} -s -d ${WRKSRC} -type d  | ${SED} "s?${WRKSRC}?@dir ${TYPO3DIR}?g" >> ${TMPPLIST}
 	@${ECHO_CMD} "@mode" >> ${TMPPLIST}
 	@${ECHO_CMD} "@group" >> ${TMPPLIST}
 	@${ECHO_CMD} "@owner" >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/www/typo3-13/Makefile b/www/typo3-13/Makefile
index 08263f569d32..ad4f6d0b57ae 100644
--- a/www/typo3-13/Makefile
+++ b/www/typo3-13/Makefile
@@ -1,75 +1,74 @@
 PORTNAME=	typo3
 DISTVERSION=	${PORT_V_MAJOR}.${PORT_V_MINOR}.${PORT_V_PATCH}
-#PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	https://cdn.typo3.com/typo3/${DISTVERSION}/
 PKGNAMESUFFIX=	-${PORT_V_MAJOR}${PHP_PKGNAMESUFFIX}
 DISTNAME=	${PORTNAME}_src-${DISTVERSION}
 
 MAINTAINER=	freebsd-ports@charlieroot.de
 COMMENT=	Typo3 content management system
 WWW=		https://typo3.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 USES=		cpe php:web,flavors shebangfix
 # php openssl extension is required but it's statically linked in default php
 USE_PHP=	ctype dom exif fileinfo filter gd intl mbstring pdo session \
 		simplexml tokenizer xml zip zlib
 IGNORE_WITH_PHP=	81
 
 SHEBANG_GLOB=	*.php *.sh
 NO_ARCH=	yes
 NO_BUILD=	yes
 PORTSCOUT=	limit:^${PORT_V_MAJOR}\.${PORT_V_MINOR}\.
 SUB_FILES=	pkg-message
 SUB_LIST+=	PREFIX=${PREFIX} \
 		TYPO3DIR=${TYPO3DIR} \
 		TYPO3WWW=${TYPO3WWW}
 WRKSRC=		${WRKDIR}/${PORTNAME}_src-${DISTVERSION}
 
 PORT_V_MAJOR=	13
 PORT_V_MINOR=	4
 PORT_V_PATCH=	15
 
 TYPO3DIR=	www/${PORTNAME}-${PORT_V_MAJOR}
 
 OPTIONS_DEFINE=		CURL GMP IMAGICK MYSQL POSTGRES SQLITE
 OPTIONS_DEFAULT=	MYSQL
 
 IMAGICK_DESC=	${IMAGEMAGICK_DESC}
 MYSQL_DESC=	Use MySQL as DBMS
 POSTGRES_DESC=	Use PostgreSQL as DBMS
 SQLITE_DESC=	Use SQLite as DBMS
 
 CURL_USE=	PHP=curl
 GMP_USE=	PHP=gmp
 MYSQL_USE=	PHP=mysqli
 POSTGRES_USE=	PHP=pgsql
 SQLITE_USE=	PHP=sqlite3
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MIMAGICK}
 .if ${PORT_OPTIONS:MX11}
 USES+=		magick:7,run
 .else
 USES+=		magick:7,run,nox11
 .endif
 .endif
 
 do-install:
 	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/${TYPO3DIR}
 
 post-install:
 	@${ECHO_CMD} "@owner ${WWWOWN}" >> ${TMPPLIST}
 	@${ECHO_CMD} "@group ${WWWGRP}" >> ${TMPPLIST}
 	@${ECHO_CMD} "@mode 755" >> ${TMPPLIST}
 	@${FIND} -s -d ${WRKSRC} -type f | ${SED} "s?${WRKSRC}?${TYPO3DIR}?g" >>${TMPPLIST}
 	@${FIND} -s -d ${WRKSRC} -type d  | ${SED} "s?${WRKSRC}?@dir ${TYPO3DIR}?g" >> ${TMPPLIST}
 	@${ECHO_CMD} "@mode" >> ${TMPPLIST}
 	@${ECHO_CMD} "@group" >> ${TMPPLIST}
 	@${ECHO_CMD} "@owner" >> ${TMPPLIST}
 
 .include <bsd.port.mk>