diff --git a/devel/bazel/Makefile b/devel/bazel/Makefile
index 58f55b5f1dbd..29f1b671891f 100644
--- a/devel/bazel/Makefile
+++ b/devel/bazel/Makefile
@@ -1,107 +1,107 @@
 PORTNAME=	bazel
 DISTVERSION=	5.3.0 # please make sure that science/py-tensorflow builds before updating
 CATEGORIES=	devel java
 MASTER_SITES=	https://storage.googleapis.com/bazel/${PORTVERSION}/rc${FINALRC}/
 DISTNAME=	bazel-${PORTVERSION}rc${FINALRC}-dist
 
-MAINTAINER=	aehlig@linta.de
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Fast and correct build system
 WWW=		https://bazel.build/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_armv6=	fails to package: cp: bazel: No such file or directory
 BROKEN_armv7=	fails to package: cp: bazel: No such file or directory
 BROKEN_i386=	fails to build: ./src/tools/singlejar/mapped_file_posix.inc:31:2: error: This code for 64 bit Unix
 BROKEN_FreeBSD_12_powerpc64=	fails to compile: Action failed to execute: java.io.IOException: Cannot run program /usr/bin/clang
 
 BUILD_DEPENDS=	bash:shells/bash \
 		zip:archivers/zip
 
 USES=		cpe python:3.3+ shebangfix zip:infozip
 
 CPE_VENDOR=	google
 
 USE_JAVA=	yes
 JAVA_VERSION=	11
 JAVA_VENDOR=	openjdk
 JAVA_BUILD=	yes
 JAVA_RUN=	yes
 
 SHEBANG_REGEX=	.*(sh|txt|_stub|stub_.*|bazel|get_workspace_status|protobuf_support|_so)
 
 CONFLICTS_INSTALL=	bazel029
 
 # The bazel binary is also a zip archive (extracted by the elf part), it must not be stripped
 STRIP=
 
 NO_WRKSUBDIR=	YES
 
 # In bazel, a release is always code-wise identical to the final release candidate.
 # Hence we can also download that one and so have a simple way to also test earlier release
 # candidates.
 FINALRC=	2
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "i386"
 EXTRA_PATCHES+=	${FILESDIR}/extra-i386_tools_cpp_BUILD.static.bsd
 .endif
 
 .if ${ARCH} == "aarch64"
 BAZEL_JAVAC_OPTS+=	"-J-Xmx1g -J-Xms128m"
 .endif
 
 pre-patch:
 	@${CP} ${FILESDIR}/extra-patch-absl_base_internal_unscaledcycleclock.cc \
 		${WRKSRC}/third_party/py/abseil/
 	@${CP} ${FILESDIR}/extra-patch-bazel_grpc__deps.bzl \
 		${FILESDIR}/extra-patch-bazel_build_defs.bzl \
 		${WRKSRC}/third_party/grpc/
 
 # Have the location of the system-wide rc file reside ${ETCDIR}.
 # Also adapt the sample file to disable persistent java workers as they
 # do not work reliably on FreeBSD.
 post-patch:
 	@${REINPLACE_CMD} \
 	-e "s|/etc/bazel.bazelrc|${ETCDIR}/bazel.bazelrc|" \
 	${WRKSRC}/src/main/cpp/BUILD
 	@${ECHO_CMD} build --strategy=Javac=standalone >> ${WRKSRC}/scripts/packages/bazel.bazelrc
 	@${ECHO_CMD} build --java_runtime_version=${JAVA_VERSION} >> ${WRKSRC}/scripts/packages/bazel.bazelrc
 	@${ECHO_CMD} build --tool_java_runtime_version=${JAVA_VERSION} >> ${WRKSRC}/scripts/packages/bazel.bazelrc
 	@${ECHO_CMD} build --action_env=PATH=/bin:/usr/bin/:${LOCALBASE}/bin >> ${WRKSRC}/scripts/packages/bazel.bazelrc
 	@${REINPLACE_CMD} \
 	-e 's|^\(PYTHON_BIN=.*\)|if [ "%VERSION%" = "3" ] ; then PYTHON_BIN=${PYTHON_CMD}; else \1 ; fi|' \
 	${WRKSRC}/tools/python/pywrapper_template.txt
 	@${REINPLACE_CMD} \
 	-e 's|%%PYTHON_CMD%%|${PYTHON_CMD}|' \
 	${WRKSRC}/src/main/java/com/google/devtools/build/lib/bazel/rules/python/BazelPythonSemantics.java
 	@${REINPLACE_CMD} \
 	-e 's|%%JAVA_HOME%%|${JAVA_HOME}|' \
 	${WRKSRC}/src/main/cpp/blaze_util_bsd.cc
 
 do-build:
 	@${MKDIR} ${WRKDIR}/bazel_tmp
 	(if [ -z "$${SOURCE_DATE_EPOCH}" ] ; \
 	  then SOURCE_DATE_EPOCH=`grep TIMESTAMP ${DISTINFO_FILE} \
 	    | ${SED} -e 's/[^0-9]//g'`; \
 	fi ; \
 	cd ${WRKSRC} && \
 	${SETENV} BAZEL_SH=${LOCALBASE}/bin/bash \
 	JAVA_HOME=${JAVA_HOME} \
 	JAVA_VERSION=${JAVA_VERSION} \
 	TMPDIR=${WRKDIR}/bazel_tmp \
 	EMBED_LABEL='${PORTVERSION}' \
 	PATH=${LOCALBASE}/bin:$$PATH \
 	SOURCE_DATE_EPOCH=$${SOURCE_DATE_EPOCH} \
 	BAZEL_JAVAC_OPTS=${BAZEL_JAVAC_OPTS} \
 	EXTRA_BAZEL_ARGS='--host_javabase=@local_jdk//:jdk --tool_java_runtime_version=local_jdk   --java_language_version=${JAVA_VERSION}  --tool_java_language_version=${JAVA_VERSION}' \
 	${LOCALBASE}/bin/bash ./compile.sh)
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/output/bazel ${STAGEDIR}${PREFIX}/bin
 	@${MKDIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${WRKSRC}/scripts/packages/bazel.bazelrc ${STAGEDIR}${ETCDIR}/bazel.bazelrc.sample
 
 .include <bsd.port.post.mk>
diff --git a/devel/cvsadmin/Makefile b/devel/cvsadmin/Makefile
index 00c37a16a39d..a3e92c3a577c 100644
--- a/devel/cvsadmin/Makefile
+++ b/devel/cvsadmin/Makefile
@@ -1,21 +1,21 @@
 PORTNAME=	cvsadmin
 PORTVERSION=	1.0.3
 PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	LOCAL/gabor
 
-MAINTAINER=	aehlig@linta.de
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple program to administrate users of a CVS repository
 
 GNU_CONFIGURE=	yes
 
 PLIST_FILES=	bin/cvsadmin \
 		man/man1/cvsadmin.1.gz
 
 post-configure:
 	${ECHO_CMD} "#define HAVE_MKDTEMP 1" >> ${WRKSRC}/config.h
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/man/cvsadmin.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
 
 .include <bsd.port.mk>
diff --git a/devel/py-wsgitools/Makefile b/devel/py-wsgitools/Makefile
index b31c59df5541..c4e4bec30bc6 100644
--- a/devel/py-wsgitools/Makefile
+++ b/devel/py-wsgitools/Makefile
@@ -1,18 +1,18 @@
 PORTNAME=	wsgitools
 PORTVERSION=	0.3.1
 CATEGORIES=	devel
 MASTER_SITES=	http://subdivi.de/~helmut/${PORTNAME}/dist/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.asc
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
-MAINTAINER=	aehlig@linta.de
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Useful middlewares and filters for wsgi as well as scgi servers
 WWW=		https://subdivi.de/~helmut/wsgitools/
 
 LICENSE=	GPLv2+
 
 USES=		python:3.5+
 USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/lang/haskell-mode.el/Makefile b/lang/haskell-mode.el/Makefile
index 5b6e83eed2af..a657c991aed3 100644
--- a/lang/haskell-mode.el/Makefile
+++ b/lang/haskell-mode.el/Makefile
@@ -1,81 +1,81 @@
 PORTNAME=	haskell-mode
 DISTVERSION=	17.2
 PORTREVISION=	4
 CATEGORIES=	lang elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
-MAINTAINER=	aehlig@linta.de
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Emacs lisp mode for editing haskell programs
 WWW=		https://projects.haskell.org/haskellmode-emacs/
 
 LICENSE=	GPLv3
 
 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/science/h5utils/Makefile b/science/h5utils/Makefile
index 77f39ae930d8..a32d97be6151 100644
--- a/science/h5utils/Makefile
+++ b/science/h5utils/Makefile
@@ -1,39 +1,39 @@
 PORTNAME=	h5utils
 DISTVERSION=	1.13.1
 PORTREVISION=	6
 CATEGORIES=	science
 
-MAINTAINER=	aehlig@linta.de
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Set of utilities for visualization and conversion of HDF5 format
 WWW=		https://github.com/stevengj/h5utils
 
 LICENSE=	MIT GPLv2
 LICENSE_COMB=	multi
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	gawk:lang/gawk
 LIB_DEPENDS=	libhdf5.so:science/hdf5 \
 		libpng.so:graphics/png \
 		libmatheval.so:devel/libmatheval
 
 USES=		autoreconf compiler:c++11-lang
 GNU_CONFIGURE=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	stevengj
 
 CFLAGS+=	-L${LOCALBASE}/lib -I${LOCALBASE}/include -lpthread
 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_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 "../../math/octave/Makefile.version"
 .include <bsd.port.mk>
diff --git a/x11-clocks/tclock/Makefile b/x11-clocks/tclock/Makefile
index 0a7185f93ce5..4ef05259ddc9 100644
--- a/x11-clocks/tclock/Makefile
+++ b/x11-clocks/tclock/Makefile
@@ -1,20 +1,20 @@
 PORTNAME=	tclock
 PORTVERSION=	1.0.1
 PORTREVISION=	3
 CATEGORIES=	x11-clocks
 MASTER_SITES=	http://www.linta.de/distfiles/ \
 		ftp://ftp.uni-potsdam.de/pub/X11/tools/clocks/
 
-MAINTAINER=	aehlig@linta.de
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Transparent analog clock for x11
 
 LICENSE=	GPLv1
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		imake tar:Z xorg
 USE_XORG=	x11 xext
 
 PLIST_FILES=	bin/tclock man/man1/${PORTNAME}.1.gz
 NO_WRKSUBDIR=	yes
 
 .include <bsd.port.mk>