aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRene Ladan <rene@FreeBSD.org>2023-04-11 20:34:04 +0000
committerRene Ladan <rene@FreeBSD.org>2023-04-11 20:34:04 +0000
commit4f538db960da5a685c2ddfa6428089654b0ad72d (patch)
treee73effc7e694b6162ae60ebcc8ef514d915c72ed
parent4d555f0d5aceec726179224ae3fda53ee6f8bef0 (diff)
downloadports-4f538db960da5a685c2ddfa6428089654b0ad72d.tar.gz
ports-4f538db960da5a685c2ddfa6428089654b0ad72d.zip
all: return swills' ports to the pools after safeeping his ports bit.
With hat: portmgr-secretary
-rw-r--r--astro/sunwait/Makefile2
-rw-r--r--databases/memcached/Makefile2
-rw-r--r--databases/redisdesktopmanager/Makefile2
-rw-r--r--deskutils/birdtray/Makefile2
-rw-r--r--deskutils/syncthingtray/Makefile2
-rw-r--r--deskutils/tasksh/Makefile2
-rw-r--r--deskutils/timewarrior/Makefile2
-rw-r--r--devel/athens/Makefile2
-rw-r--r--devel/bloaty/Makefile2
-rw-r--r--devel/creduce/Makefile2
-rw-r--r--devel/ctypes.sh/Makefile2
-rw-r--r--devel/cvise/Makefile2
-rw-r--r--devel/gammaray/Makefile2
-rw-r--r--devel/genie/Makefile2
-rw-r--r--devel/git-codereview/Makefile2
-rw-r--r--devel/gitlab-runner/Makefile2
-rw-r--r--devel/go-bindata/Makefile2
-rw-r--r--devel/gocheese/Makefile2
-rw-r--r--devel/jiri/Makefile2
-rw-r--r--devel/lab/Makefile2
-rw-r--r--devel/libbpfjit/Makefile2
-rw-r--r--devel/libcdb/Makefile2
-rw-r--r--devel/libgnt/Makefile2
-rw-r--r--devel/libindicator/Makefile2
-rw-r--r--devel/libjitterentropy/Makefile2
-rw-r--r--devel/liblpm/Makefile2
-rw-r--r--devel/libqsbr/Makefile2
-rw-r--r--devel/libthmap/Makefile2
-rw-r--r--devel/libzim/Makefile2
-rw-r--r--devel/ncurses/Makefile2
-rw-r--r--devel/p5-CPAN-Reporter-Smoker/Makefile2
-rw-r--r--devel/p5-CPAN-Reporter/Makefile2
-rw-r--r--devel/p5-CPAN-Testers-Report/Makefile2
-rw-r--r--devel/p5-Config-YAML/Makefile2
-rw-r--r--devel/p5-Date-Manip/Makefile2
-rw-r--r--devel/p5-Devel-Autoflush/Makefile2
-rw-r--r--devel/p5-Dir-Self/Makefile2
-rw-r--r--devel/p5-File-Assets/Makefile2
-rw-r--r--devel/p5-HOP-Lexer/Makefile2
-rw-r--r--devel/p5-HOP-Stream/Makefile2
-rw-r--r--devel/p5-Metabase-Client-Simple/Makefile2
-rw-r--r--devel/p5-Metabase-Fact/Makefile2
-rw-r--r--devel/p5-Module-Install/Makefile2
-rw-r--r--devel/p5-Path-Abstract/Makefile2
-rw-r--r--devel/p5-Path-Resource/Makefile2
-rw-r--r--devel/p5-Tee/Makefile2
-rw-r--r--devel/p5-Term-Title/Makefile2
-rw-r--r--devel/p5-Test-Net-RabbitMQ/Makefile2
-rw-r--r--devel/p5-Test-Reporter-Transport-Metabase/Makefile2
-rw-r--r--devel/p5-Test-Timer/Makefile2
-rw-r--r--devel/p5-Tie-LLHash/Makefile2
-rw-r--r--devel/p5-UUID/Makefile2
-rw-r--r--devel/p5-libxml-enno/Makefile2
-rw-r--r--devel/please/Makefile2
-rw-r--r--devel/py-aioice/Makefile2
-rw-r--r--devel/py-aiortc/Makefile2
-rw-r--r--devel/py-aspy.yaml/Makefile2
-rw-r--r--devel/py-babi_grammars/Makefile2
-rw-r--r--devel/py-cfgv/Makefile2
-rw-r--r--devel/py-coverage_enable_subprocess/Makefile2
-rw-r--r--devel/py-crc32c/Makefile2
-rw-r--r--devel/py-epdb/Makefile2
-rw-r--r--devel/py-fs2/Makefile2
-rw-r--r--devel/py-identify/Makefile2
-rw-r--r--devel/py-importlib-metadata/Makefile2
-rw-r--r--devel/py-importlib-resources/Makefile2
-rw-r--r--devel/py-jira/Makefile2
-rw-r--r--devel/py-jitterentropy/Makefile2
-rw-r--r--devel/py-jupyter_console/Makefile2
-rw-r--r--devel/py-mac-vendor-lookup/Makefile2
-rw-r--r--devel/py-nodeenv/Makefile2
-rw-r--r--devel/py-onigurumacffi/Makefile2
-rw-r--r--devel/py-pipdeptree/Makefile2
-rw-r--r--devel/py-pre-commit/Makefile2
-rw-r--r--devel/py-proselint/Makefile2
-rw-r--r--devel/py-pylibsrtp/Makefile2
-rw-r--r--devel/py-pytest-env/Makefile2
-rw-r--r--devel/py-pytest-fixture-config/Makefile2
-rw-r--r--devel/py-pytest-freezegun/Makefile2
-rw-r--r--devel/py-pytest-randomly/Makefile2
-rw-r--r--devel/py-pytest-rerunfailures/Makefile2
-rw-r--r--devel/py-pytest-shutil/Makefile2
-rw-r--r--devel/py-pytest-virtualenv/Makefile2
-rw-r--r--devel/py-python-easyconfig/Makefile2
-rw-r--r--devel/py-pyupgrade/Makefile2
-rw-r--r--devel/py-qtconsole/Makefile2
-rw-r--r--devel/py-resource/Makefile2
-rw-r--r--devel/py-tokenize-rt/Makefile2
-rw-r--r--devel/py-zipp/Makefile2
-rw-r--r--devel/pystring/Makefile2
-rw-r--r--devel/radare2/Makefile2
-rw-r--r--devel/rubygem-annoy/Makefile2
-rw-r--r--devel/rubygem-arr-pm/Makefile2
-rw-r--r--devel/rubygem-cabin/Makefile2
-rw-r--r--devel/rubygem-caesars/Makefile2
-rw-r--r--devel/sd-mux-ctrl/Makefile2
-rw-r--r--dns/denominator/Makefile2
-rw-r--r--editors/nedit/Makefile2
-rw-r--r--editors/py-babi/Makefile2
-rw-r--r--games/2048-qt/Makefile2
-rw-r--r--games/2048/Makefile2
-rw-r--r--games/cdogs-sdl/Makefile2
-rw-r--r--games/dunelegacy/Makefile2
-rw-r--r--graphics/acidwarp-sdl/Makefile2
-rw-r--r--graphics/acidwarp/Makefile2
-rw-r--r--irc/bip/Makefile2
-rw-r--r--java/visualvm/Makefile2
-rw-r--r--lang/spidermonkey78/Makefile2
-rw-r--r--math/bsdnt/Makefile2
-rw-r--r--math/p5-Math-SigFigs/Makefile2
-rw-r--r--math/p5-Number-Fraction/Makefile2
-rw-r--r--math/p5-Statistics-Frequency/Makefile2
-rw-r--r--math/p5-Statistics-Regression/Makefile2
-rw-r--r--misc/exercism/Makefile2
-rw-r--r--misc/py-powerline-status/Makefile2
-rw-r--r--multimedia/jmref/Makefile2
-rw-r--r--multimedia/mjpg-streamer/Makefile2
-rw-r--r--multimedia/obs-qtwebkit/Makefile2
-rw-r--r--multimedia/py-PySceneDetect/Makefile2
-rw-r--r--multimedia/py-av/Makefile2
-rw-r--r--multimedia/xporthdmv/Makefile2
-rw-r--r--net-im/chatterino2/Makefile2
-rw-r--r--net-im/matterbridge/Makefile2
-rw-r--r--net-im/purple-discord/Makefile2
-rw-r--r--net-im/purple-facebook/Makefile2
-rw-r--r--net-im/purple-mattermost/Makefile2
-rw-r--r--net-im/purple-plugin-pack/Makefile2
-rw-r--r--net-im/talkatu/Makefile2
-rw-r--r--net/google-cloud-sdk/Makefile2
-rw-r--r--net/goreplay/Makefile2
-rw-r--r--net/nng/Makefile2
-rw-r--r--net/p5-Net-AMQP-RabbitMQ/Makefile2
-rw-r--r--net/p5-Net-RabbitMQ/Makefile2
-rw-r--r--net/py-ec2-cli-tools/Makefile2
-rw-r--r--net/py-magic-wormhole/Makefile2
-rw-r--r--net/rubygem-amazon-ec2/Makefile2
-rw-r--r--net/rubygem-aws-s3/Makefile2
-rw-r--r--net/rubygem-rudy/Makefile2
-rw-r--r--net/rubygem-rye/Makefile2
-rw-r--r--net/syncthing/Makefile2
-rw-r--r--ports-mgmt/create-rb-port/Makefile2
-rw-r--r--ports-mgmt/py-FreeBSD-ports/Makefile2
-rw-r--r--science/p5-Chemistry-3DBuilder/Makefile2
-rw-r--r--science/p5-Chemistry-Bond-Find/Makefile2
-rw-r--r--science/p5-Chemistry-Canonicalize/Makefile2
-rw-r--r--science/p5-Chemistry-File-MDLMol/Makefile2
-rw-r--r--science/p5-Chemistry-File-Mopac/Makefile2
-rw-r--r--science/p5-Chemistry-File-SLN/Makefile2
-rw-r--r--science/p5-Chemistry-File-SMARTS/Makefile2
-rw-r--r--science/p5-Chemistry-File-SMILES/Makefile2
-rw-r--r--science/p5-Chemistry-File-VRML/Makefile2
-rw-r--r--science/p5-Chemistry-File-XYZ/Makefile2
-rw-r--r--science/p5-Chemistry-FormulaPattern/Makefile2
-rw-r--r--science/p5-Chemistry-InternalCoords/Makefile2
-rw-r--r--science/p5-Chemistry-Isotope/Makefile2
-rw-r--r--science/p5-Chemistry-MidasPattern/Makefile2
-rw-r--r--science/p5-Chemistry-Mok/Makefile2
-rw-r--r--science/p5-Chemistry-Pattern/Makefile2
-rw-r--r--science/p5-Chemistry-Reaction/Makefile2
-rw-r--r--science/p5-Chemistry-Ring/Makefile2
-rw-r--r--science/p5-PerlMol/Makefile2
-rw-r--r--security/p5-Crypt-T_e_a/Makefile2
-rw-r--r--security/please/Makefile2
-rw-r--r--security/py-hkdf/Makefile2
-rw-r--r--security/py-spake2/Makefile2
-rw-r--r--security/sslsplit/Makefile2
-rw-r--r--security/vault/Makefile2
-rw-r--r--sysutils/consul/Makefile3
-rw-r--r--sysutils/direnv/Makefile2
-rw-r--r--sysutils/envconsul/Makefile2
-rw-r--r--sysutils/ipfs-go-fs-repo-migrations/Makefile2
-rw-r--r--sysutils/openseachest/Makefile2
-rw-r--r--sysutils/p5-BSD-Process/Makefile2
-rw-r--r--sysutils/py-psutil121/Makefile2
-rw-r--r--sysutils/serf/Makefile2
-rw-r--r--sysutils/tarsnap-gui/Makefile2
-rw-r--r--sysutils/tmate-ssh-server/Makefile2
-rw-r--r--sysutils/tmate/Makefile2
-rw-r--r--textproc/consul-template/Makefile3
-rw-r--r--textproc/docbookrx/Makefile2
-rw-r--r--textproc/fist/Makefile2
-rw-r--r--textproc/jo/Makefile2
-rw-r--r--textproc/p5-Algorithm-CheckDigits/Makefile2
-rw-r--r--textproc/p5-Spreadsheet-XLSX/Makefile2
-rw-r--r--textproc/p5-WWW-Wordnik-API/Makefile2
-rw-r--r--textproc/p5-XML-RSS/Makefile2
-rw-r--r--textproc/p5-YAML-Shell/Makefile2
-rw-r--r--textproc/py-asciinema/Makefile2
-rw-r--r--textproc/py-sphinx-argparse/Makefile2
-rw-r--r--textproc/py-sphinx_press_theme/Makefile2
-rw-r--r--textproc/spiff/Makefile2
-rw-r--r--www/gitlab-pages/Makefile2
-rw-r--r--www/mattermost-server/Makefile2
-rw-r--r--www/mattermost-webapp/Makefile2
-rw-r--r--www/minio/Makefile2
-rw-r--r--www/p5-CGI-Application-Plugin-Config-YAML/Makefile2
-rw-r--r--www/p5-CGI-Application-Plugin-JSON/Makefile2
-rw-r--r--www/p5-CGI-EncryptForm/Makefile2
-rw-r--r--x11-fonts/powerline-fonts/Makefile2
-rw-r--r--x11-toolkits/p5-Gtk2/Makefile2
-rw-r--r--x11/py-pyscreenshot/Makefile2
-rw-r--r--x11/radare-cutter/Makefile2
202 files changed, 202 insertions, 204 deletions
diff --git a/astro/sunwait/Makefile b/astro/sunwait/Makefile
index 619000a4e37c..2669134dd647 100644
--- a/astro/sunwait/Makefile
+++ b/astro/sunwait/Makefile
@@ -3,7 +3,7 @@ PORTVERSION= 20041208
CATEGORIES= astro
MASTER_SITES= http://www.risacher.org/sunwait/
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Calculate sunrise and sunset
WWW= http://www.risacher.org/sunwait/
diff --git a/databases/memcached/Makefile b/databases/memcached/Makefile
index 8feaf2de274f..5313f3e9ca37 100644
--- a/databases/memcached/Makefile
+++ b/databases/memcached/Makefile
@@ -4,7 +4,7 @@ CATEGORIES= databases
MASTER_SITES= http://www.memcached.org/files/ \
GENTOO
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= High-performance distributed memory object cache system
WWW= https://memcached.org/
diff --git a/databases/redisdesktopmanager/Makefile b/databases/redisdesktopmanager/Makefile
index 7ab1b1e04230..fc7b80d136ae 100644
--- a/databases/redisdesktopmanager/Makefile
+++ b/databases/redisdesktopmanager/Makefile
@@ -2,7 +2,7 @@ PORTNAME= redisdesktopmanager
PORTVERSION= 2022.2
CATEGORIES= databases
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Redis DB management tool
WWW= https://redisdesktop.com/
diff --git a/deskutils/birdtray/Makefile b/deskutils/birdtray/Makefile
index de73190ea2ce..4023d8ed3f63 100644
--- a/deskutils/birdtray/Makefile
+++ b/deskutils/birdtray/Makefile
@@ -3,7 +3,7 @@ PORTVERSION= 1.9.0
DISTVERSIONPREFIX= v
CATEGORIES= deskutils mail
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= System tray new mail notification for Thunderbird
WWW= https://github.com/gyunaev/birdtray
diff --git a/deskutils/syncthingtray/Makefile b/deskutils/syncthingtray/Makefile
index 84c76b70089c..33eef30ef055 100644
--- a/deskutils/syncthingtray/Makefile
+++ b/deskutils/syncthingtray/Makefile
@@ -4,7 +4,7 @@ PORTREVISION= 3
DISTVERSIONPREFIX= v
CATEGORIES= deskutils
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Qt 5-based Syncthing tray application
WWW= https://github.com/Martchus/syncthingtray
diff --git a/deskutils/tasksh/Makefile b/deskutils/tasksh/Makefile
index c9c1a453c2af..7aa37326c923 100644
--- a/deskutils/tasksh/Makefile
+++ b/deskutils/tasksh/Makefile
@@ -4,7 +4,7 @@ PORTREVISION= 4
CATEGORIES= deskutils
MASTER_SITES= http://taskwarrior.org/download/
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Shell command that wraps Taskwarrior commands
WWW= https://tasktools.org/projects/tasksh.html
diff --git a/deskutils/timewarrior/Makefile b/deskutils/timewarrior/Makefile
index c5f451a096ff..fa8db5dee187 100644
--- a/deskutils/timewarrior/Makefile
+++ b/deskutils/timewarrior/Makefile
@@ -3,7 +3,7 @@ PORTVERSION= 1.4.3
DISTVERSIONPREFIX= v
CATEGORIES= deskutils
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Track time from the command line
WWW= https://timewarrior.net/
diff --git a/devel/athens/Makefile b/devel/athens/Makefile
index 2a2793345ea6..a554494268ff 100644
--- a/devel/athens/Makefile
+++ b/devel/athens/Makefile
@@ -4,7 +4,7 @@ DISTVERSIONPREFIX= v
PORTREVISION= 13
CATEGORIES= devel
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Proxy server for the Go Modules download API
WWW= https://github.com/gomods/athens
diff --git a/devel/bloaty/Makefile b/devel/bloaty/Makefile
index 7d3e331963ec..59323051734b 100644
--- a/devel/bloaty/Makefile
+++ b/devel/bloaty/Makefile
@@ -4,7 +4,7 @@ DISTVERSIONPREFIX= v
PORTREVISION= 8
CATEGORIES= devel
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Size profiler for binaries
WWW= https://github.com/google/bloaty
diff --git a/devel/creduce/Makefile b/devel/creduce/Makefile
index 0e03944435a6..cee53b1f57f9 100644
--- a/devel/creduce/Makefile
+++ b/devel/creduce/Makefile
@@ -2,7 +2,7 @@ PORTNAME= creduce
DISTVERSION= 2.11.0.20220927
CATEGORIES= devel
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Produces small test cases
WWW= https://github.com/csmith-project/creduce
diff --git a/devel/ctypes.sh/Makefile b/devel/ctypes.sh/Makefile
index 5bed78fb34f5..017d58a4a381 100644
--- a/devel/ctypes.sh/Makefile
+++ b/devel/ctypes.sh/Makefile
@@ -5,7 +5,7 @@ CATEGORIES= devel
MASTER_SITES= https://github.com/taviso/${PORTNAME}/releases/download/v${PORTVERSION}/
DISTNAME= ctypes-sh-${PORTVERSION}
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Foreign function interface for bash
WWW= https://github.com/taviso/ctypes.sh
diff --git a/devel/cvise/Makefile b/devel/cvise/Makefile
index 9f84c749be86..a2db70faad52 100644
--- a/devel/cvise/Makefile
+++ b/devel/cvise/Makefile
@@ -3,7 +3,7 @@ PORTVERSION= 2.7.0
DISTVERSIONPREFIX= v
CATEGORIES= devel python
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= C-Vise is a super-parallel Python port of the C-Reduce
WWW= https://github.com/marxin/cvise
diff --git a/devel/gammaray/Makefile b/devel/gammaray/Makefile
index 73a2140d8f10..cc7695af792b 100644
--- a/devel/gammaray/Makefile
+++ b/devel/gammaray/Makefile
@@ -4,7 +4,7 @@ PORTREVISION= 2
DISTVERSIONPREFIX= v
CATEGORIES= devel
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Debugging tool for Qt-application
WWW= https://www.kdab.com/development-resources/qt-tools/gammaray/
diff --git a/devel/genie/Makefile b/devel/genie/Makefile
index 2f41c2bf35a6..e8d4e1bb105e 100644
--- a/devel/genie/Makefile
+++ b/devel/genie/Makefile
@@ -2,7 +2,7 @@ PORTNAME= genie
PORTVERSION= g2020082801
CATEGORIES= devel
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= GENie Project generator tool
WWW= https://github.com/bkaradzic/GENie
diff --git a/devel/git-codereview/Makefile b/devel/git-codereview/Makefile
index 2705a6052bde..29f1f315cf60 100644
--- a/devel/git-codereview/Makefile
+++ b/devel/git-codereview/Makefile
@@ -4,7 +4,7 @@ DISTVERSIONPREFIX= v
PORTREVISION= 12
CATEGORIES= devel
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Command-line tool for working with Gerrit
WWW= https://godoc.org/golang.org/x/review/git-codereview
diff --git a/devel/gitlab-runner/Makefile b/devel/gitlab-runner/Makefile
index c9fa29a6ea45..d5a06c7d1f55 100644
--- a/devel/gitlab-runner/Makefile
+++ b/devel/gitlab-runner/Makefile
@@ -7,7 +7,7 @@ MASTER_SITES= https://gitlab-runner-downloads.s3.amazonaws.com/master/docker/:do
DISTFILES= prebuilt-x86_64.tar.xz:dockerx64 \
prebuilt-arm.tar.xz:dockerarm
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Official GitLab Runner written in Go
WWW= https://gitlab.com/gitlab-org/gitlab-runner
diff --git a/devel/go-bindata/Makefile b/devel/go-bindata/Makefile
index f200afa916dc..dcda8ecda226 100644
--- a/devel/go-bindata/Makefile
+++ b/devel/go-bindata/Makefile
@@ -4,7 +4,7 @@ DISTVERSIONPREFIX= v
PORTREVISION= 12
CATEGORIES= devel
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Generates Go code from any file
WWW= https://github.com/go-bindata/go-bindata
diff --git a/devel/gocheese/Makefile b/devel/gocheese/Makefile
index 8a046a9f2992..9d9ff8bfb9e6 100644
--- a/devel/gocheese/Makefile
+++ b/devel/gocheese/Makefile
@@ -4,7 +4,7 @@ PORTREVISION= 5
CATEGORIES= devel python
MASTER_SITES= http://www.gocheese.cypherpunks.ru/download/
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Python private package repository and caching proxy
WWW= http://www.gocheese.cypherpunks.ru/
diff --git a/devel/jiri/Makefile b/devel/jiri/Makefile
index 6f1278f5fba7..9aceb4bc815b 100644
--- a/devel/jiri/Makefile
+++ b/devel/jiri/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES= LOCAL/swills
DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
DIST_SUBDIR= jiri
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Tool for multi-repo development
WWW= https://fuchsia.googlesource.com/jiri
diff --git a/devel/lab/Makefile b/devel/lab/Makefile
index 072e20f3babd..6d17e0ca6cfa 100644
--- a/devel/lab/Makefile
+++ b/devel/lab/Makefile
@@ -4,7 +4,7 @@ PORTREVISION= 2
DISTVERSIONPREFIX= v
CATEGORIES= devel
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Lab makes it simple to work with repositories on GitLab
WWW= https://zaquestion.github.io/lab
diff --git a/devel/libbpfjit/Makefile b/devel/libbpfjit/Makefile
index fdb85c172e42..853602a86616 100644
--- a/devel/libbpfjit/Makefile
+++ b/devel/libbpfjit/Makefile
@@ -2,7 +2,7 @@ PORTNAME= libbpfjit
PORTVERSION= g2020082801
CATEGORIES= devel
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Just-in-Time compilation of bpf
WWW= https://github.com/rmind/bpfjit
diff --git a/devel/libcdb/Makefile b/devel/libcdb/Makefile
index ab48cb0a73db..83d9919886ed 100644
--- a/devel/libcdb/Makefile
+++ b/devel/libcdb/Makefile
@@ -2,7 +2,7 @@ PORTNAME= libcdb
PORTVERSION= g2020082801
CATEGORIES= devel
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Constant database library
WWW= https://github.com/rmind/libcdb
diff --git a/devel/libgnt/Makefile b/devel/libgnt/Makefile
index 35ce6d89edb4..ad12e066326a 100644
--- a/devel/libgnt/Makefile
+++ b/devel/libgnt/Makefile
@@ -4,7 +4,7 @@ PORTREVISION= 3
CATEGORIES= devel
MASTER_SITES= SF/pidgin/${PORTNAME}/${PORTVERSION}/
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Toolkit based on glib and ncurses for text-mode user interfaces
WWW= https://keep.imfreedom.org/libgnt/libgnt/
diff --git a/devel/libindicator/Makefile b/devel/libindicator/Makefile
index f16c5179f7c2..02dddfa8f536 100644
--- a/devel/libindicator/Makefile
+++ b/devel/libindicator/Makefile
@@ -4,7 +4,7 @@ PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= https://launchpad.net/${PORTNAME}/${PORTVERSION:R}/${PORTVERSION}/+download/
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Symbols and convience functions for desktop indicators
WWW= https://launchpad.net/libindicator
diff --git a/devel/libjitterentropy/Makefile b/devel/libjitterentropy/Makefile
index 4ccfd532af29..ca05db7caa85 100644
--- a/devel/libjitterentropy/Makefile
+++ b/devel/libjitterentropy/Makefile
@@ -3,7 +3,7 @@ PORTVERSION= 3.3.1
DISTVERSIONPREFIX= v
CATEGORIES= devel
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Hardware RNG based on CPU timing jitter
WWW= https://www.chronox.de/jent.html
diff --git a/devel/liblpm/Makefile b/devel/liblpm/Makefile
index 678593215faf..9e6d5c7e9ee6 100644
--- a/devel/liblpm/Makefile
+++ b/devel/liblpm/Makefile
@@ -2,7 +2,7 @@ PORTNAME= liblpm
PORTVERSION= g2020082801
CATEGORIES= devel
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Longest Prefix Match library
WWW= https://github.com/rmind/liblpm
diff --git a/devel/libqsbr/Makefile b/devel/libqsbr/Makefile
index e418503ec026..1e8448763467 100644
--- a/devel/libqsbr/Makefile
+++ b/devel/libqsbr/Makefile
@@ -2,7 +2,7 @@ PORTNAME= libqsbr
PORTVERSION= g2020082801
CATEGORIES= devel
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= QSBR and EBR library
WWW= https://github.com/rmind/libqsbr
diff --git a/devel/libthmap/Makefile b/devel/libthmap/Makefile
index 3034b6a1f827..a22b04788984 100644
--- a/devel/libthmap/Makefile
+++ b/devel/libthmap/Makefile
@@ -2,7 +2,7 @@ PORTNAME= libthmap
PORTVERSION= g2020082801
CATEGORIES= devel
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Concurrent trie-hash map library
WWW= https://github.com/rmind/thmap
diff --git a/devel/libzim/Makefile b/devel/libzim/Makefile
index bb7b223b05f6..20dfb4b449d4 100644
--- a/devel/libzim/Makefile
+++ b/devel/libzim/Makefile
@@ -4,7 +4,7 @@ PORTREVISION= 3
CATEGORIES= devel
MASTER_SITES= https://download.openzim.org/release/libzim/
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Reference implementation of the ZIM specification
WWW= https://www.openzim.org/wiki/OpenZIM
diff --git a/devel/ncurses/Makefile b/devel/ncurses/Makefile
index b6e94854ecd5..e057cabada71 100644
--- a/devel/ncurses/Makefile
+++ b/devel/ncurses/Makefile
@@ -5,7 +5,7 @@ MASTER_SITES= ftp://ftp.invisible-island.net/${PORTNAME}/ \
https://invisible-mirror.net/archives/ncurses/
DIST_SUBDIR= ${PORTNAME}
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Library for terminal-independent, full-screen output
WWW= https://invisible-island.net/ncurses/
diff --git a/devel/p5-CPAN-Reporter-Smoker/Makefile b/devel/p5-CPAN-Reporter-Smoker/Makefile
index e55e5b551440..f859933180b0 100644
--- a/devel/p5-CPAN-Reporter-Smoker/Makefile
+++ b/devel/p5-CPAN-Reporter-Smoker/Makefile
@@ -5,7 +5,7 @@ MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:DAGOLDEN
PKGNAMEPREFIX= p5-
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= perl@FreeBSD.org
COMMENT= Turnkey CPAN Testers smoking
WWW= https://metacpan.org/release/CPAN-Reporter-Smoker
diff --git a/devel/p5-CPAN-Reporter/Makefile b/devel/p5-CPAN-Reporter/Makefile
index 568d92f5f4bf..d41f404c0a11 100644
--- a/devel/p5-CPAN-Reporter/Makefile
+++ b/devel/p5-CPAN-Reporter/Makefile
@@ -5,7 +5,7 @@ MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:DAGOLDEN
PKGNAMEPREFIX= p5-
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= perl@FreeBSD.org
COMMENT= Adds CPAN Testers reporting to CPAN.pm
WWW= https://metacpan.org/release/CPAN-Reporter
diff --git a/devel/p5-CPAN-Testers-Report/Makefile b/devel/p5-CPAN-Testers-Report/Makefile
index 8ee5c15eb331..f936f2fd39c2 100644
--- a/devel/p5-CPAN-Testers-Report/Makefile
+++ b/devel/p5-CPAN-Testers-Report/Makefile
@@ -5,7 +5,7 @@ MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:DAGOLDEN
PKGNAMEPREFIX= p5-
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= perl@FreeBSD.org
COMMENT= CPAN Testers report object
WWW= https://metacpan.org/release/CPAN-Testers-Report
diff --git a/devel/p5-Config-YAML/Makefile b/devel/p5-Config-YAML/Makefile
index 16095ddcba76..62999d42718b 100644
--- a/devel/p5-Config-YAML/Makefile
+++ b/devel/p5-Config-YAML/Makefile
@@ -5,7 +5,7 @@ CATEGORIES= devel textproc perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= perl@FreeBSD.org
COMMENT= Simple configuration automation
WWW= https://metacpan.org/release/Config-YAML
diff --git a/devel/p5-Date-Manip/Makefile b/devel/p5-Date-Manip/Makefile
index 8cfff5db80e3..4d2235b676ea 100644
--- a/devel/p5-Date-Manip/Makefile
+++ b/devel/p5-Date-Manip/Makefile
@@ -5,7 +5,7 @@ MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:SBECK
PKGNAMEPREFIX= p5-
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= perl@FreeBSD.org
COMMENT= Perl5 module containing date manipulation routines
WWW= https://metacpan.org/release/Date-Manip
diff --git a/devel/p5-Devel-Autoflush/Makefile b/devel/p5-Devel-Autoflush/Makefile
index 74196deab14a..cbeb5d744653 100644
--- a/devel/p5-Devel-Autoflush/Makefile
+++ b/devel/p5-Devel-Autoflush/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:DAGOLDEN
PKGNAMEPREFIX= p5-
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= perl@FreeBSD.org
COMMENT= Set autoflush from the command line
WWW= https://metacpan.org/release/Devel-Autoflush
diff --git a/devel/p5-Dir-Self/Makefile b/devel/p5-Dir-Self/Makefile
index 0b93e1739149..abbf3f8a11c0 100644
--- a/devel/p5-Dir-Self/Makefile
+++ b/devel/p5-Dir-Self/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:MAUKE
PKGNAMEPREFIX= p5-
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= perl@FreeBSD.org
COMMENT= __DIR__ constant for the directory your source file is in
WWW= https://metacpan.org/release/Dir-Self
diff --git a/devel/p5-File-Assets/Makefile b/devel/p5-File-Assets/Makefile
index 0cc951e8b775..3badb9837741 100644
--- a/devel/p5-File-Assets/Makefile
+++ b/devel/p5-File-Assets/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:RKRIMEN
PKGNAMEPREFIX= p5-
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= perl@FreeBSD.org
COMMENT= Perl module to Manage .css and .js assets
WWW= https://metacpan.org/release/File-Assets
diff --git a/devel/p5-HOP-Lexer/Makefile b/devel/p5-HOP-Lexer/Makefile
index a591e2d977f7..365f9c8d1804 100644
--- a/devel/p5-HOP-Lexer/Makefile
+++ b/devel/p5-HOP-Lexer/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:OVID
PKGNAMEPREFIX= p5-
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= perl@FreeBSD.org
COMMENT= Higher Order Perl Lexer
WWW= https://metacpan.org/release/HOP-Lexer
diff --git a/devel/p5-HOP-Stream/Makefile b/devel/p5-HOP-Stream/Makefile
index 09f0b9547051..dda0d55c29d5 100644
--- a/devel/p5-HOP-Stream/Makefile
+++ b/devel/p5-HOP-Stream/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:OVID
PKGNAMEPREFIX= p5-
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= perl@FreeBSD.org
COMMENT= Higher Order Perl Streams
WWW= https://metacpan.org/release/HOP-Stream
diff --git a/devel/p5-Metabase-Client-Simple/Makefile b/devel/p5-Metabase-Client-Simple/Makefile
index 54a63da2c7cb..81f90a0dff61 100644
--- a/devel/p5-Metabase-Client-Simple/Makefile
+++ b/devel/p5-Metabase-Client-Simple/Makefile
@@ -5,7 +5,7 @@ MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:DAGOLDEN
PKGNAMEPREFIX= p5-
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= perl@FreeBSD.org
COMMENT= Client that submits to Metabase servers
WWW= https://metacpan.org/release/Metabase-Client-Simple
diff --git a/devel/p5-Metabase-Fact/Makefile b/devel/p5-Metabase-Fact/Makefile
index b2cc1261d555..fe4a9ef2c77e 100644
--- a/devel/p5-Metabase-Fact/Makefile
+++ b/devel/p5-Metabase-Fact/Makefile
@@ -5,7 +5,7 @@ MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:DAGOLDEN
PKGNAMEPREFIX= p5-
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= perl@FreeBSD.org
COMMENT= Metabase Facts
WWW= https://metacpan.org/release/Metabase-Fact
diff --git a/devel/p5-Module-Install/Makefile b/devel/p5-Module-Install/Makefile
index eb6db4e8bba1..ef8477e015d8 100644
--- a/devel/p5-Module-Install/Makefile
+++ b/devel/p5-Module-Install/Makefile
@@ -4,7 +4,7 @@ CATEGORIES= devel perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= perl@FreeBSD.org
COMMENT= Standalone, extensible Perl module installer
WWW= https://metacpan.org/release/Module-Install
diff --git a/devel/p5-Path-Abstract/Makefile b/devel/p5-Path-Abstract/Makefile
index add66fefc0d0..4407691b9be3 100644
--- a/devel/p5-Path-Abstract/Makefile
+++ b/devel/p5-Path-Abstract/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:ROKR
PKGNAMEPREFIX= p5-
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= perl@FreeBSD.org
COMMENT= Fast and featureful UNIX-style path parsing and manipulation
WWW= https://metacpan.org/release/Path-Abstract
diff --git a/devel/p5-Path-Resource/Makefile b/devel/p5-Path-Resource/Makefile
index 0a4092c12915..41d41d07bb8f 100644
--- a/devel/p5-Path-Resource/Makefile
+++ b/devel/p5-Path-Resource/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:RKRIMEN
PKGNAMEPREFIX= p5-
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= perl@FreeBSD.org
COMMENT= Perl module for combining local path manipulation and URI manipulation
WWW= https://metacpan.org/release/Path-Resource
diff --git a/devel/p5-Tee/Makefile b/devel/p5-Tee/Makefile
index f48b09596797..587255b6e7ba 100644
--- a/devel/p5-Tee/Makefile
+++ b/devel/p5-Tee/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:DAGOLDEN
PKGNAMEPREFIX= p5-
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= perl@FreeBSD.org
COMMENT= Pure Perl emulation of GNU tee
WWW= https://metacpan.org/release/Tee
diff --git a/devel/p5-Term-Title/Makefile b/devel/p5-Term-Title/Makefile
index 90bc108af0aa..858b371046b9 100644
--- a/devel/p5-Term-Title/Makefile
+++ b/devel/p5-Term-Title/Makefile
@@ -5,7 +5,7 @@ MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:DAGOLDEN
PKGNAMEPREFIX= p5-
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= perl@FreeBSD.org
COMMENT= Portable API to set the terminal titlebar
WWW= https://metacpan.org/release/Term-Title
diff --git a/devel/p5-Test-Net-RabbitMQ/Makefile b/devel/p5-Test-Net-RabbitMQ/Makefile
index 631012596f88..dd3b9dcad701 100644
--- a/devel/p5-Test-Net-RabbitMQ/Makefile
+++ b/devel/p5-Test-Net-RabbitMQ/Makefile
@@ -4,7 +4,7 @@ CATEGORIES= devel perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= perl@FreeBSD.org
COMMENT= Perl mock RabbitMQ implementation for use when testing
WWW= https://metacpan.org/release/Test-Net-RabbitMQ
diff --git a/devel/p5-Test-Reporter-Transport-Metabase/Makefile b/devel/p5-Test-Reporter-Transport-Metabase/Makefile
index 1c90ed01bd88..b37b4881cb3c 100644
--- a/devel/p5-Test-Reporter-Transport-Metabase/Makefile
+++ b/devel/p5-Test-Reporter-Transport-Metabase/Makefile
@@ -5,7 +5,7 @@ MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:DAGOLDEN
PKGNAMEPREFIX= p5-
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= perl@FreeBSD.org
COMMENT= Metabase transport for Test::Reporter
WWW= https://metacpan.org/release/Test-Reporter-Transport-Metabase
diff --git a/devel/p5-Test-Timer/Makefile b/devel/p5-Test-Timer/Makefile
index a02b5d32423a..9fadf584f09c 100644
--- a/devel/p5-Test-Timer/Makefile
+++ b/devel/p5-Test-Timer/Makefile
@@ -4,7 +4,7 @@ CATEGORIES= devel perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= perl@FreeBSD.org
COMMENT= Perl test module to test/assert response times
WWW= https://metacpan.org/release/Test-Timer
diff --git a/devel/p5-Tie-LLHash/Makefile b/devel/p5-Tie-LLHash/Makefile
index 83e054ebd26d..74459bb8a2fa 100644
--- a/devel/p5-Tie-LLHash/Makefile
+++ b/devel/p5-Tie-LLHash/Makefile
@@ -4,7 +4,7 @@ CATEGORIES= devel perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= perl@FreeBSD.org
COMMENT= Perl module which implements an ordered hash-like object
WWW= https://metacpan.org/release/Tie-LLHash
diff --git a/devel/p5-UUID/Makefile b/devel/p5-UUID/Makefile
index fb905aa84ad4..9c7dfded7d25 100644
--- a/devel/p5-UUID/Makefile
+++ b/devel/p5-UUID/Makefile
@@ -5,7 +5,7 @@ MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:JNH
PKGNAMEPREFIX= p5-
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= perl@FreeBSD.org
COMMENT= Perl extension for using UUID interfaces as defined in e2fsprogs
WWW= https://metacpan.org/release/UUID
diff --git a/devel/p5-libxml-enno/Makefile b/devel/p5-libxml-enno/Makefile
index b773103c2a6c..6bc379f9ede4 100644
--- a/devel/p5-libxml-enno/Makefile
+++ b/devel/p5-libxml-enno/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:ENNO
PKGNAMEPREFIX= p5-
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= perl@FreeBSD.org
COMMENT= Group of Perl modules for XML parsing
WWW= https://metacpan.org/release/libxml-enno
diff --git a/devel/please/Makefile b/devel/please/Makefile
index d8f191e9889f..904ce97454eb 100644
--- a/devel/please/Makefile
+++ b/devel/please/Makefile
@@ -5,7 +5,7 @@ PORTREVISION= 13
CATEGORIES= devel
PKGNAMESUFFIX= .build
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= High-performance extensible build system for reproducible builds
WWW= https://please.build/
diff --git a/devel/py-aioice/Makefile b/devel/py-aioice/Makefile
index d3bea9e605ec..1beffbd18629 100644
--- a/devel/py-aioice/Makefile
+++ b/devel/py-aioice/Makefile
@@ -4,7 +4,7 @@ CATEGORIES= devel python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Interactive Connectivity Establishment (RFC 5245) in Python
WWW= https://github.com/jlaine/aioice
diff --git a/devel/py-aiortc/Makefile b/devel/py-aiortc/Makefile
index 1b84a3bff437..90953cc7fefd 100644
--- a/devel/py-aiortc/Makefile
+++ b/devel/py-aiortc/Makefile
@@ -5,7 +5,7 @@ CATEGORIES= devel multimedia python www
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= WebRTC and ORTC in Python
WWW= https://github.com/jlaine/aiortc/
diff --git a/devel/py-aspy.yaml/Makefile b/devel/py-aspy.yaml/Makefile
index 27e3ca9c0559..a6c8a5517195 100644
--- a/devel/py-aspy.yaml/Makefile
+++ b/devel/py-aspy.yaml/Makefile
@@ -4,7 +4,7 @@ CATEGORIES= devel
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Extensions to pyyaml
WWW= https://github.com/asottile/aspy.yaml
diff --git a/devel/py-babi_grammars/Makefile b/devel/py-babi_grammars/Makefile
index 949403dd2beb..0a0a2a0b93a0 100644
--- a/devel/py-babi_grammars/Makefile
+++ b/devel/py-babi_grammars/Makefile
@@ -4,7 +4,7 @@ CATEGORIES= devel python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Grammars for the babi text editor
WWW= https://github.com/asottile/babi-grammars
diff --git a/devel/py-cfgv/Makefile b/devel/py-cfgv/Makefile
index 14b58b1a909f..1e9709cec3a4 100644
--- a/devel/py-cfgv/Makefile
+++ b/devel/py-cfgv/Makefile
@@ -4,7 +4,7 @@ CATEGORIES= devel
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Validate configuration and produce human readable error messages
WWW= https://github.com/asottile/cfgv
diff --git a/devel/py-coverage_enable_subprocess/Makefile b/devel/py-coverage_enable_subprocess/Makefile
index 5084700b9dfe..8330580cdde3 100644
--- a/devel/py-coverage_enable_subprocess/Makefile
+++ b/devel/py-coverage_enable_subprocess/Makefile
@@ -4,7 +4,7 @@ CATEGORIES= devel python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Enable python coverage for subprocesses
WWW= https://github.com/bukzor/python-coverage-enable-subprocess
diff --git a/devel/py-crc32c/Makefile b/devel/py-crc32c/Makefile
index 674e4e940da8..041e34a53c7e 100644
--- a/devel/py-crc32c/Makefile
+++ b/devel/py-crc32c/Makefile
@@ -4,7 +4,7 @@ CATEGORIES= devel python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Python package exposing the intel sse4.2 crc32c instruction
USES= python:3.6+
diff --git a/devel/py-epdb/Makefile b/devel/py-epdb/Makefile
index 3a74be11ff2e..6f538709808a 100644
--- a/devel/py-epdb/Makefile
+++ b/devel/py-epdb/Makefile
@@ -4,7 +4,7 @@ DISTVERSIONPREFIX= ${PORTNAME}-
CATEGORIES= devel python
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Enhanced Python Debugger
WWW= https://github.com/sassoftware/epdb
diff --git a/devel/py-fs2/Makefile b/devel/py-fs2/Makefile
index 80a133394cd7..cc25b03a2822 100644
--- a/devel/py-fs2/Makefile
+++ b/devel/py-fs2/Makefile
@@ -5,7 +5,7 @@ MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
PKGNAMESUFFIX= 2
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Python Filesystem abstraction layer, version 2.x
WWW= https://www.pyfilesystem.org/
diff --git a/devel/py-identify/Makefile b/devel/py-identify/Makefile
index 5ff58ca6c0e2..1e618c2af070 100644
--- a/devel/py-identify/Makefile
+++ b/devel/py-identify/Makefile
@@ -4,7 +4,7 @@ CATEGORIES= devel
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= File identification library for Python
WWW= https://github.com/pre-commit/identify
diff --git a/devel/py-importlib-metadata/Makefile b/devel/py-importlib-metadata/Makefile
index 23d206180789..d17f088592a6 100644
--- a/devel/py-importlib-metadata/Makefile
+++ b/devel/py-importlib-metadata/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= importlib_metadata-${PORTVERSION}
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Read metadata from Python packages
WWW= https://github.com/python/importlib_metadata
diff --git a/devel/py-importlib-resources/Makefile b/devel/py-importlib-resources/Makefile
index 423bfaaf203a..b4205a5b40e3 100644
--- a/devel/py-importlib-resources/Makefile
+++ b/devel/py-importlib-resources/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= importlib_resources-${PORTVERSION}
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Read resources from Python packages
WWW= https://github.com/python/importlib_resources
diff --git a/devel/py-jira/Makefile b/devel/py-jira/Makefile
index 5662acf75774..a601be818fa0 100644
--- a/devel/py-jira/Makefile
+++ b/devel/py-jira/Makefile
@@ -5,7 +5,7 @@ CATEGORIES= devel python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Library to ease use of the JIRA 5 REST APIs
WWW= https://bitbucket.org/bspeakmon/jira-python
diff --git a/devel/py-jitterentropy/Makefile b/devel/py-jitterentropy/Makefile
index 576ae01fa338..5ad01df96808 100644
--- a/devel/py-jitterentropy/Makefile
+++ b/devel/py-jitterentropy/Makefile
@@ -4,7 +4,7 @@ CATEGORIES= devel python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Use libjitterentropy to get random bytes
WWW= https://github.com/swills/py-jitterentropy
diff --git a/devel/py-jupyter_console/Makefile b/devel/py-jupyter_console/Makefile
index 74b36a84c10a..4e2e13ff1ab4 100644
--- a/devel/py-jupyter_console/Makefile
+++ b/devel/py-jupyter_console/Makefile
@@ -5,7 +5,7 @@ CATEGORIES= devel python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= IPython-like terminal frontend for Jupyter kernels in any language
WWW= https://jupyter-console.readthedocs.io/
diff --git a/devel/py-mac-vendor-lookup/Makefile b/devel/py-mac-vendor-lookup/Makefile
index e8e92c3dcf02..d00879bb4932 100644
--- a/devel/py-mac-vendor-lookup/Makefile
+++ b/devel/py-mac-vendor-lookup/Makefile
@@ -3,7 +3,7 @@ PORTVERSION= 0.1.11
CATEGORIES= devel python
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Find the vendor for a given MAC address
WWW= https://github.com/bauerj/mac_vendor_lookup
diff --git a/devel/py-nodeenv/Makefile b/devel/py-nodeenv/Makefile
index f7430da5333f..7e90e4df8ab3 100644
--- a/devel/py-nodeenv/Makefile
+++ b/devel/py-nodeenv/Makefile
@@ -4,7 +4,7 @@ CATEGORIES= devel
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Node.js virtual environment builder
WWW= https://ekalinin.github.io/nodeenv/
diff --git a/devel/py-onigurumacffi/Makefile b/devel/py-onigurumacffi/Makefile
index 3831f77ffa39..49fbb9994981 100644
--- a/devel/py-onigurumacffi/Makefile
+++ b/devel/py-onigurumacffi/Makefile
@@ -4,7 +4,7 @@ CATEGORIES= devel python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Python cffi bindings for the oniguruma regex engine
WWW= https://github.com/asottile/onigurumacffi
diff --git a/devel/py-pipdeptree/Makefile b/devel/py-pipdeptree/Makefile
index 4a138e5fe3eb..f11f97f0470b 100644
--- a/devel/py-pipdeptree/Makefile
+++ b/devel/py-pipdeptree/Makefile
@@ -4,7 +4,7 @@ CATEGORIES= devel python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Command line utility to show dependency tree of packages
WWW= https://github.com/naiquevin/pipdeptree
diff --git a/devel/py-pre-commit/Makefile b/devel/py-pre-commit/Makefile
index 49af24c341fe..31e2800e7163 100644
--- a/devel/py-pre-commit/Makefile
+++ b/devel/py-pre-commit/Makefile
@@ -5,7 +5,7 @@ MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= pre_commit-${PORTVERSION}
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Framework for managing and maintaining multi-language pre-commit hooks
WWW= https://pre-commit.com/
diff --git a/devel/py-proselint/Makefile b/devel/py-proselint/Makefile
index 36d3ec61bd4c..6c78ae748bd2 100644
--- a/devel/py-proselint/Makefile
+++ b/devel/py-proselint/Makefile
@@ -4,7 +4,7 @@ CATEGORIES= devel python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Linter for prose
WWW= https://github.com/amperser/proselint
diff --git a/devel/py-pylibsrtp/Makefile b/devel/py-pylibsrtp/Makefile
index 3e0055a17fd9..ff4a1117d81e 100644
--- a/devel/py-pylibsrtp/Makefile
+++ b/devel/py-pylibsrtp/Makefile
@@ -4,7 +4,7 @@ CATEGORIES= devel python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Python wrapper around libsrtp
WWW= https://github.com/jlaine/pylibsrtp
diff --git a/devel/py-pytest-env/Makefile b/devel/py-pytest-env/Makefile
index 5abbb6c71e07..8ef0291bd822 100644
--- a/devel/py-pytest-env/Makefile
+++ b/devel/py-pytest-env/Makefile
@@ -4,7 +4,7 @@ CATEGORIES= devel python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Py.test plugin that allows you to add environment variables
WWW= https://github.com/MobileDynasty/pytest-env
diff --git a/devel/py-pytest-fixture-config/Makefile b/devel/py-pytest-fixture-config/Makefile
index 4184a63bf5a9..857293d1384c 100644
--- a/devel/py-pytest-fixture-config/Makefile
+++ b/devel/py-pytest-fixture-config/Makefile
@@ -4,7 +4,7 @@ CATEGORIES= devel python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Fixture configuration utils for py.test
WWW= https://github.com/manahl/pytest-plugins/tree/master/pytest-fixture-config
diff --git a/devel/py-pytest-freezegun/Makefile b/devel/py-pytest-freezegun/Makefile
index 4529589c1e26..20ea25ac21f9 100644
--- a/devel/py-pytest-freezegun/Makefile
+++ b/devel/py-pytest-freezegun/Makefile
@@ -4,7 +4,7 @@ CATEGORIES= devel python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Wrap tests with fixtures in freeze_time
WWW= https://github.com/ktosiek/pytest-freezegun
diff --git a/devel/py-pytest-randomly/Makefile b/devel/py-pytest-randomly/Makefile
index c8590aa67d06..ce7c97a3ae40 100644
--- a/devel/py-pytest-randomly/Makefile
+++ b/devel/py-pytest-randomly/Makefile
@@ -4,7 +4,7 @@ CATEGORIES= devel python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Pytest plugin to randomly order tests and control random.seed
WWW= https://github.com/pytest-dev/pytest-randomly
diff --git a/devel/py-pytest-rerunfailures/Makefile b/devel/py-pytest-rerunfailures/Makefile
index 06a5b3b62e8f..278cbbc15c42 100644
--- a/devel/py-pytest-rerunfailures/Makefile
+++ b/devel/py-pytest-rerunfailures/Makefile
@@ -4,7 +4,7 @@ CATEGORIES= devel python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Re-run tests to eliminate flaky failures
WWW= https://github.com/pytest-dev/pytest-rerunfailures
diff --git a/devel/py-pytest-shutil/Makefile b/devel/py-pytest-shutil/Makefile
index 3269060c2e0c..f57223d87761 100644
--- a/devel/py-pytest-shutil/Makefile
+++ b/devel/py-pytest-shutil/Makefile
@@ -4,7 +4,7 @@ CATEGORIES= devel python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Collection of unix shell and environment tools for py.test
WWW= https://github.com/manahl/pytest-plugins/tree/master/pytest-shutil
diff --git a/devel/py-pytest-virtualenv/Makefile b/devel/py-pytest-virtualenv/Makefile
index 214234c764f9..4294ead77a73 100644
--- a/devel/py-pytest-virtualenv/Makefile
+++ b/devel/py-pytest-virtualenv/Makefile
@@ -4,7 +4,7 @@ CATEGORIES= devel python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Virtualenv fixture for py.test
WWW= https://github.com/manahl/pytest-plugins/tree/master/pytest-virtualenv
diff --git a/devel/py-python-easyconfig/Makefile b/devel/py-python-easyconfig/Makefile
index 643979ad15d3..543d366953b1 100644
--- a/devel/py-python-easyconfig/Makefile
+++ b/devel/py-python-easyconfig/Makefile
@@ -5,7 +5,7 @@ MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= Python-EasyConfig-${PORTVERSION}
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Library for loading configurations easily in Python
WWW= https://github.com/RussellLuo/easyconfig
diff --git a/devel/py-pyupgrade/Makefile b/devel/py-pyupgrade/Makefile
index 9d7ef3d33680..e31adc4928f2 100644
--- a/devel/py-pyupgrade/Makefile
+++ b/devel/py-pyupgrade/Makefile
@@ -4,7 +4,7 @@ CATEGORIES= devel
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Tool to automatically upgrade Python syntax for newer versions
WWW= https://github.com/asottile/pyupgrade
diff --git a/devel/py-qtconsole/Makefile b/devel/py-qtconsole/Makefile
index 333bc0bf4c3e..eaaddc212437 100644
--- a/devel/py-qtconsole/Makefile
+++ b/devel/py-qtconsole/Makefile
@@ -5,7 +5,7 @@ CATEGORIES= devel python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Qt-based console for Jupyter with support for rich media output
WWW= https://qtconsole.readthedocs.io/en/stable/
diff --git a/devel/py-resource/Makefile b/devel/py-resource/Makefile
index 5b42d176610a..bfc3ee142af6 100644
--- a/devel/py-resource/Makefile
+++ b/devel/py-resource/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= Resource-${PORTVERSION}
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Library concentrated on the Resource layer of RESTful APIs
WWW= https://github.com/RussellLuo/resource
diff --git a/devel/py-tokenize-rt/Makefile b/devel/py-tokenize-rt/Makefile
index fc60454249f8..8fee95810c7c 100644
--- a/devel/py-tokenize-rt/Makefile
+++ b/devel/py-tokenize-rt/Makefile
@@ -5,7 +5,7 @@ MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= tokenize_rt-${PORTVERSION}
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Wrapper around the stdlib `tokenize` which roundtrips
WWW= https://github.com/asottile/tokenize-rt
diff --git a/devel/py-zipp/Makefile b/devel/py-zipp/Makefile
index 9e70dfed4e7c..8543a07d60da 100644
--- a/devel/py-zipp/Makefile
+++ b/devel/py-zipp/Makefile
@@ -4,7 +4,7 @@ CATEGORIES= devel
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Backport of pathlib-compatible object wrapper for zip files
WWW= https://github.com/jaraco/zipp
diff --git a/devel/pystring/Makefile b/devel/pystring/Makefile
index e3bb7fa2a509..6ea76ee0e236 100644
--- a/devel/pystring/Makefile
+++ b/devel/pystring/Makefile
@@ -3,7 +3,7 @@ PORTVERSION= 1.1.3
DISTVERSIONPREFIX= v
CATEGORIES= devel
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Collection of C++ functions which match python's string class
WWW= https://github.com/imageworks/pystring
diff --git a/devel/radare2/Makefile b/devel/radare2/Makefile
index aa79c4782f4f..d801245dd013 100644
--- a/devel/radare2/Makefile
+++ b/devel/radare2/Makefile
@@ -3,7 +3,7 @@ DISTVERSION= 5.1.1
PORTREVISION= 1
CATEGORIES= devel
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Tools to disasm, debug, analyze, and manipulate binary files
WWW= https://www.radare.org
diff --git a/devel/rubygem-annoy/Makefile b/devel/rubygem-annoy/Makefile
index 5c50969120ea..8261f28ed08c 100644
--- a/devel/rubygem-annoy/Makefile
+++ b/devel/rubygem-annoy/Makefile
@@ -3,7 +3,7 @@ PORTVERSION= 0.5.6
CATEGORIES= devel rubygems
MASTER_SITES= RG
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Present the user with a simple question before a destructive action
WWW= https://rubygems.org/gems/annoy
diff --git a/devel/rubygem-arr-pm/Makefile b/devel/rubygem-arr-pm/Makefile
index f4464c219fe1..3896bb302689 100644
--- a/devel/rubygem-arr-pm/Makefile
+++ b/devel/rubygem-arr-pm/Makefile
@@ -3,7 +3,7 @@ PORTVERSION= 0.0.12
CATEGORIES= devel rubygems
MASTER_SITES= RG
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ruby@FreeBSD.org
COMMENT= Read and write rpm packages
WWW= https://rubygems.org/gems/arr-pm
diff --git a/devel/rubygem-cabin/Makefile b/devel/rubygem-cabin/Makefile
index eebc8c5d43da..f3f94973e288 100644
--- a/devel/rubygem-cabin/Makefile
+++ b/devel/rubygem-cabin/Makefile
@@ -3,7 +3,7 @@ PORTVERSION= 0.9.0
CATEGORIES= devel rubygems
MASTER_SITES= RG
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ruby@FreeBSD.org
COMMENT= Structured+contextual logging experiments in Ruby
WWW= https://github.com/jordansissel/ruby-cabin
diff --git a/devel/rubygem-caesars/Makefile b/devel/rubygem-caesars/Makefile
index 780c26c8c53d..09876e67630c 100644
--- a/devel/rubygem-caesars/Makefile
+++ b/devel/rubygem-caesars/Makefile
@@ -4,7 +4,7 @@ PORTREVISION= 1
CATEGORIES= devel rubygems
MASTER_SITES= RG
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ruby@FreeBSD.org
COMMENT= Rapid DSL prototyping in Ruby
WWW= https://github.com/delano/caesars
diff --git a/devel/sd-mux-ctrl/Makefile b/devel/sd-mux-ctrl/Makefile
index 874022f99c6e..3f6ab7be33d8 100644
--- a/devel/sd-mux-ctrl/Makefile
+++ b/devel/sd-mux-ctrl/Makefile
@@ -7,7 +7,7 @@ MASTER_SITES= https://git.tizen.org/cgit/tools/testlab/sd-mux/snapshot/sd-mux-9d
PATCH_SITES= https://github.com/emaste/sd-mux/commit/
PATCHFILES= 83f2783ac56bbf42f9bb877c5937cd1f17bb2999.patch:-p1
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Control utility for Tizen SD card multiplexer
WWW= https://git.tizen.org/cgit/tools/testlab/sd-mux/
diff --git a/dns/denominator/Makefile b/dns/denominator/Makefile
index 10d1bb0099a1..53c5258df222 100644
--- a/dns/denominator/Makefile
+++ b/dns/denominator/Makefile
@@ -5,7 +5,7 @@ MASTER_SITES= https://bintray.com/artifact/download/netflixoss/maven/com/netflix
DISTNAME= ${PORTNAME}-cli-${PORTVERSION}-fat.jar
EXTRACT_SUFX=
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Portably control DNS clouds
WWW= https://github.com/Netflix/denominator
diff --git a/editors/nedit/Makefile b/editors/nedit/Makefile
index ff417bd50313..8ad1d9a7d697 100644
--- a/editors/nedit/Makefile
+++ b/editors/nedit/Makefile
@@ -6,7 +6,7 @@ DISTFILES= nedit-${PORTVERSION}-src.tar.gz \
nedit.app-defaults
EXTRACT_ONLY= nedit-${PORTVERSION}-src.tar.gz
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= X11/Motif GUI text editor for programs and plain text files
WWW= http://www.nedit.org/
diff --git a/editors/py-babi/Makefile b/editors/py-babi/Makefile
index 9b2892be0e93..a4b20906b0d5 100644
--- a/editors/py-babi/Makefile
+++ b/editors/py-babi/Makefile
@@ -4,7 +4,7 @@ CATEGORIES= editors python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Text Editor written in Python
WWW= https://github.com/asottile/babi
diff --git a/games/2048-qt/Makefile b/games/2048-qt/Makefile
index a43de2c60d33..2f02949892dc 100644
--- a/games/2048-qt/Makefile
+++ b/games/2048-qt/Makefile
@@ -4,7 +4,7 @@ DISTVERSIONPREFIX= v
PORTREVISION= 3
CATEGORIES= games
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= 2048 game implemented in QT
WWW= https://github.com/xiaoyong/2048-Qt
diff --git a/games/2048/Makefile b/games/2048/Makefile
index 46ab241b8506..2f7302f6e337 100644
--- a/games/2048/Makefile
+++ b/games/2048/Makefile
@@ -3,7 +3,7 @@ PORTVERSION= 0.9.1
DISTVERSIONPREFIX= v
CATEGORIES= games
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Command line version of 2048
WWW= https://github.com/Tiehuis/2048-cli
diff --git a/games/cdogs-sdl/Makefile b/games/cdogs-sdl/Makefile
index df68e605ecdb..34fb38285280 100644
--- a/games/cdogs-sdl/Makefile
+++ b/games/cdogs-sdl/Makefile
@@ -3,7 +3,7 @@ PORTVERSION= 1.4.0
PORTREVISION= 1
CATEGORIES= games
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Classic overhead run-and-gun game
WWW= https://github.com/cxong/cdogs-sdl
diff --git a/games/dunelegacy/Makefile b/games/dunelegacy/Makefile
index 9d8b2d305dc8..8e7a40e5d4e3 100644
--- a/games/dunelegacy/Makefile
+++ b/games/dunelegacy/Makefile
@@ -5,7 +5,7 @@ CATEGORIES= games
MASTER_SITES= SF
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Open source clone of Dune II
WWW= http://dunelegacy.sourceforge.net/website/
diff --git a/graphics/acidwarp-sdl/Makefile b/graphics/acidwarp-sdl/Makefile
index 2ccf2b6fd98e..964bf485baa3 100644
--- a/graphics/acidwarp-sdl/Makefile
+++ b/graphics/acidwarp-sdl/Makefile
@@ -2,7 +2,7 @@ PORTNAME= acidwarp-sdl
PORTVERSION= g2020062101
CATEGORIES= graphics
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Eye candy program which displays various patterns
WWW= https://github.com/dreamlayers/acidwarp
diff --git a/graphics/acidwarp/Makefile b/graphics/acidwarp/Makefile
index 27a46cf905da..5c008a6c929c 100644
--- a/graphics/acidwarp/Makefile
+++ b/graphics/acidwarp/Makefile
@@ -3,7 +3,7 @@ PORTVERSION= 1.0
CATEGORIES= graphics
MASTER_SITES= SUNSITE/apps/graphics/hacks/svgalib
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= SVGAlib demo which displays trippy mathematical images in cycling colors
WWW= http://www.noah.org/acidwarp/index.html
diff --git a/irc/bip/Makefile b/irc/bip/Makefile
index e82a04b2b369..c787f4464d23 100644
--- a/irc/bip/Makefile
+++ b/irc/bip/Makefile
@@ -3,7 +3,7 @@ DISTVERSION= 0.9.0-rc4
CATEGORIES= irc
MASTER_SITES= https://projects.duckcorp.org/attachments/download/97/
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Simple IRC proxy with SSL support
WWW= https://bip.milkypond.org/
diff --git a/java/visualvm/Makefile b/java/visualvm/Makefile
index 9345c6b10880..c57a9486e0ab 100644
--- a/java/visualvm/Makefile
+++ b/java/visualvm/Makefile
@@ -4,7 +4,7 @@ CATEGORIES= java devel
MASTER_SITES= https://github.com/oracle/visualvm/releases/download/${PORTVERSION}/
DISTNAME= visualvm_${PORTVERSION:S/.//g}
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= GUI tool combining CLI JDK tools and profiling capabilities
WWW= https://visualvm.github.io/
diff --git a/lang/spidermonkey78/Makefile b/lang/spidermonkey78/Makefile
index 539818c29fb3..bc9c15437889 100644
--- a/lang/spidermonkey78/Makefile
+++ b/lang/spidermonkey78/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES= MOZILLA/firefox/releases/${DISTVERSION}esr/source
PKGNAMESUFFIX= ${SP_VER}
DISTNAME= firefox-${DISTVERSION}esr.source
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Standalone JavaScript based from Mozilla 78-esr
WWW= https://spidermonkey.dev/
diff --git a/math/bsdnt/Makefile b/math/bsdnt/Makefile
index 65d96bf5858b..122a77a7960d 100644
--- a/math/bsdnt/Makefile
+++ b/math/bsdnt/Makefile
@@ -3,7 +3,7 @@ PORTVERSION= 1.0
PORTREVISION= 1
CATEGORIES= math
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Bignum Library
WWW= https://github.com/wbhart/bsdnt
diff --git a/math/p5-Math-SigFigs/Makefile b/math/p5-Math-SigFigs/Makefile
index f68f2d81ad6e..0ded41de6da1 100644
--- a/math/p5-Math-SigFigs/Makefile
+++ b/math/p5-Math-SigFigs/Makefile
@@ -4,7 +4,7 @@ CATEGORIES= math perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= perl@FreeBSD.org
COMMENT= Do math with correct handling of significant figures
WWW= https://metacpan.org/release/Math-SigFigs
diff --git a/math/p5-Number-Fraction/Makefile b/math/p5-Number-Fraction/Makefile
index 06f9c6258a6e..1cd9012c6e5f 100644
--- a/math/p5-Number-Fraction/Makefile
+++ b/math/p5-Number-Fraction/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:DAVECROSS
PKGNAMEPREFIX= p5-
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= perl@FreeBSD.org
COMMENT= Perl extension to model fractions
WWW= https://metacpan.org/release/Number-Fraction
diff --git a/math/p5-Statistics-Frequency/Makefile b/math/p5-Statistics-Frequency/Makefile
index 4c7b36250089..ba61bbedd674 100644
--- a/math/p5-Statistics-Frequency/Makefile
+++ b/math/p5-Statistics-Frequency/Makefile
@@ -4,7 +4,7 @@ CATEGORIES= math perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= perl@FreeBSD.org
COMMENT= Simple counting of elements
WWW= https://metacpan.org/release/Statistics-Frequency
diff --git a/math/p5-Statistics-Regression/Makefile b/math/p5-Statistics-Regression/Makefile
index f7a2b44a63b1..fa12e8b20c06 100644
--- a/math/p5-Statistics-Regression/Makefile
+++ b/math/p5-Statistics-Regression/Makefile
@@ -5,7 +5,7 @@ CATEGORIES= math perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= perl@FreeBSD.org
COMMENT= Perl module to perform weighted linear regression
WWW= https://metacpan.org/release/Statistics-Regression
diff --git a/misc/exercism/Makefile b/misc/exercism/Makefile
index 3d4c053ac7f3..754381e3c616 100644
--- a/misc/exercism/Makefile
+++ b/misc/exercism/Makefile
@@ -4,7 +4,7 @@ DISTVERSION= 3.0.13
PORTREVISION= 13
CATEGORIES= misc
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= CLI client for exercism.io
WWW= https://exercism.io/
diff --git a/misc/py-powerline-status/Makefile b/misc/py-powerline-status/Makefile
index d4aa0d56f8fb..f8877c7dda3a 100644
--- a/misc/py-powerline-status/Makefile
+++ b/misc/py-powerline-status/Makefile
@@ -3,7 +3,7 @@ PORTVERSION= 2.8.2
CATEGORIES= misc python
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Statusline plugin for vim, zsh, bash, and more
WWW= https://github.com/powerline/powerline
diff --git a/multimedia/jmref/Makefile b/multimedia/jmref/Makefile
index 3cd5d68632a3..3f57f43ab1b2 100644
--- a/multimedia/jmref/Makefile
+++ b/multimedia/jmref/Makefile
@@ -5,7 +5,7 @@ CATEGORIES= multimedia
MASTER_SITES= http://iphome.hhi.de/suehring/tml/download/
DISTNAME= jm${PORTVERSION}
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= JM Reference Software
WWW= https://iphome.hhi.de/suehring/tml
diff --git a/multimedia/mjpg-streamer/Makefile b/multimedia/mjpg-streamer/Makefile
index f73ef4729cc2..f87b974baf45 100644
--- a/multimedia/mjpg-streamer/Makefile
+++ b/multimedia/mjpg-streamer/Makefile
@@ -3,7 +3,7 @@ PORTVERSION= g2021081601
PORTEPOCH= 1
CATEGORIES= multimedia net
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= HTTP video streaming daemon
WWW= https://github.com/jacksonliam/mjpg-streamer
diff --git a/multimedia/obs-qtwebkit/Makefile b/multimedia/obs-qtwebkit/Makefile
index 5ebf8aea13b8..d4869d354b43 100644
--- a/multimedia/obs-qtwebkit/Makefile
+++ b/multimedia/obs-qtwebkit/Makefile
@@ -3,7 +3,7 @@ PORTVERSION= g2018090201
PORTREVISION= 4
CATEGORIES= multimedia
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Browser source plugin for obs-studio
WWW= https://github.com/swills/obs-qtwebkit
diff --git a/multimedia/py-PySceneDetect/Makefile b/multimedia/py-PySceneDetect/Makefile
index ced0a1e26603..6a1efcdb1e13 100644
--- a/multimedia/py-PySceneDetect/Makefile
+++ b/multimedia/py-PySceneDetect/Makefile
@@ -5,7 +5,7 @@ PORTREVISION= 1
CATEGORIES= multimedia python
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= OpenCV-based video scene detection program and Python library
WWW= https://pyscenedetect.readthedocs.io/en/latest/
diff --git a/multimedia/py-av/Makefile b/multimedia/py-av/Makefile
index 32fce747ae42..800bd4abf335 100644
--- a/multimedia/py-av/Makefile
+++ b/multimedia/py-av/Makefile
@@ -4,7 +4,7 @@ CATEGORIES= multimedia python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Pythonic binding for FFmpeg
WWW= https://docs.mikeboers.com/pyav/develop/
diff --git a/multimedia/xporthdmv/Makefile b/multimedia/xporthdmv/Makefile
index d4db5b39b07f..73621f11bd29 100644
--- a/multimedia/xporthdmv/Makefile
+++ b/multimedia/xporthdmv/Makefile
@@ -4,7 +4,7 @@ CATEGORIES= multimedia
MASTER_SITES= http://www.w6rz.net/
DISTNAME= xport
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= The xport Transport Stream Demuxer
WWW= https://www.w6rz.net/
diff --git a/net-im/chatterino2/Makefile b/net-im/chatterino2/Makefile
index 07a509e5a1fd..59448fccba6a 100644
--- a/net-im/chatterino2/Makefile
+++ b/net-im/chatterino2/Makefile
@@ -4,7 +4,7 @@ PORTREVISION= 4
DISTVERSIONPREFIX= v
CATEGORIES= net-im
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Twitch chat client
WWW= https://chatterino.com/
diff --git a/net-im/matterbridge/Makefile b/net-im/matterbridge/Makefile
index 8aa06ef979cd..52302058110f 100644
--- a/net-im/matterbridge/Makefile
+++ b/net-im/matterbridge/Makefile
@@ -4,7 +4,7 @@ DISTVERSIONPREFIX= v
PORTREVISION= 13
CATEGORIES= net-im
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Chat network bridge
WWW= https://github.com/42wim/matterbridge
diff --git a/net-im/purple-discord/Makefile b/net-im/purple-discord/Makefile
index 005fa2c6a313..ebd4b408903b 100644
--- a/net-im/purple-discord/Makefile
+++ b/net-im/purple-discord/Makefile
@@ -2,7 +2,7 @@ PORTNAME= purple-discord
PORTVERSION= g20210729
CATEGORIES= net-im
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Discord plugin for libpurple
WWW= https://github.com/EionRobb/purple-discord
diff --git a/net-im/purple-facebook/Makefile b/net-im/purple-facebook/Makefile
index 6302952078e2..a6fe0403363d 100644
--- a/net-im/purple-facebook/Makefile
+++ b/net-im/purple-facebook/Makefile
@@ -5,7 +5,7 @@ MASTER_SITES= https://github.com/dequis/purple-facebook/releases/download/v${POR
DISTNAME= ${PORTNAME}-${PORTVERSION}
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Facebook plugin for libpurple
WWW= https://github.com/dequis/purple-facebook
diff --git a/net-im/purple-mattermost/Makefile b/net-im/purple-mattermost/Makefile
index 3e28f46ed1b7..7c56a54d8ab3 100644
--- a/net-im/purple-mattermost/Makefile
+++ b/net-im/purple-mattermost/Makefile
@@ -3,7 +3,7 @@ PORTVERSION= 2.0
DISTVERSIONPREFIX= v
CATEGORIES= net-im
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Mattermost plugin for libpurple
WWW= https://github.com/EionRobb/purple-mattermost
diff --git a/net-im/purple-plugin-pack/Makefile b/net-im/purple-plugin-pack/Makefile
index f876b9ac8f22..7214f5b99316 100644
--- a/net-im/purple-plugin-pack/Makefile
+++ b/net-im/purple-plugin-pack/Makefile
@@ -3,7 +3,7 @@ PORTVERSION= 2.8.0
CATEGORIES= net-im
MASTER_SITES= https://dl.bintray.com/pidgin/releases/
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Collection of libpurple plugins
WWW= https://keep.imfreedom.org/pidgin/purple-plugin-pack
diff --git a/net-im/talkatu/Makefile b/net-im/talkatu/Makefile
index 0cdd2660f7ea..424bd638a8d0 100644
--- a/net-im/talkatu/Makefile
+++ b/net-im/talkatu/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES= https://bitbucket.org/pidgin/talkatu/get/
DISTNAME= 1b7433db5cd5
DIST_SUBDIR= ${PORTNAME}
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Collection of Gtk+ widgets that are useful for chat applications
WWW= https://bitbucket.org/pidgin/talkatu/overview
diff --git a/net/google-cloud-sdk/Makefile b/net/google-cloud-sdk/Makefile
index c6557b43055a..10224577ee29 100644
--- a/net/google-cloud-sdk/Makefile
+++ b/net/google-cloud-sdk/Makefile
@@ -4,7 +4,7 @@ CATEGORIES= net
MASTER_SITES= https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/
DISTNAME= google-cloud-sdk-${PORTVERSION}-linux-x86_64
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Google Cloud SDK for Google Cloud Platform
WWW= https://developers.google.com/cloud/sdk/
diff --git a/net/goreplay/Makefile b/net/goreplay/Makefile
index 092f1b732c83..326605597d43 100644
--- a/net/goreplay/Makefile
+++ b/net/goreplay/Makefile
@@ -4,7 +4,7 @@ DISTVERSION= 1.3.2
PORTREVISION= 5
CATEGORIES= net
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Tool for capturing and replaying live HTTP traffic
WWW= https://goreplay.org/
diff --git a/net/nng/Makefile b/net/nng/Makefile
index 8489e1179efd..beb6707c889f 100644
--- a/net/nng/Makefile
+++ b/net/nng/Makefile
@@ -3,7 +3,7 @@ DISTVERSIONPREFIX= v
DISTVERSION= 1.5.2
CATEGORIES= net
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Lightweight, broker-less messaging
WWW= https://nanomsg.github.io/nng/
diff --git a/net/p5-Net-AMQP-RabbitMQ/Makefile b/net/p5-Net-AMQP-RabbitMQ/Makefile
index d1b18907557b..cf2ee4daa48b 100644
--- a/net/p5-Net-AMQP-RabbitMQ/Makefile
+++ b/net/p5-Net-AMQP-RabbitMQ/Makefile
@@ -4,7 +4,7 @@ CATEGORIES= net perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= perl@FreeBSD.org
COMMENT= Interact with RabbitMQ over AMQP using librabbitmq
WWW= https://github.com/net-amqp-rabbitmq/net-amqp-rabbitmq
diff --git a/net/p5-Net-RabbitMQ/Makefile b/net/p5-Net-RabbitMQ/Makefile
index 619ffa05c498..7148c52a2831 100644
--- a/net/p5-Net-RabbitMQ/Makefile
+++ b/net/p5-Net-RabbitMQ/Makefile
@@ -7,7 +7,7 @@ MASTER_SITE_SUBDIR= CPAN:JESUS
PKGNAMEPREFIX= p5-
DISTNAME= Net--RabbitMQ-${PORTVERSION}
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= perl@FreeBSD.org
COMMENT= Perl module to interact with RabbitMQ over AMQP using librabbitmq
WWW= https://metacpan.org/release/Net--RabbitMQ
diff --git a/net/py-ec2-cli-tools/Makefile b/net/py-ec2-cli-tools/Makefile
index 25cef7294e58..f14e5f771bf6 100644
--- a/net/py-ec2-cli-tools/Makefile
+++ b/net/py-ec2-cli-tools/Makefile
@@ -5,7 +5,7 @@ CATEGORIES= net python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Helpful CLI utilities for querying and connecting to EC2 instances
WWW= https://github.com/FlipPath/ec2-cli-tools
diff --git a/net/py-magic-wormhole/Makefile b/net/py-magic-wormhole/Makefile
index 822ccdaa755f..44fdbbfcc7b2 100644
--- a/net/py-magic-wormhole/Makefile
+++ b/net/py-magic-wormhole/Makefile
@@ -4,7 +4,7 @@ CATEGORIES= net
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Get things from one computer to another, safely
WWW= https://github.com/warner/magic-wormhole
diff --git a/net/rubygem-amazon-ec2/Makefile b/net/rubygem-amazon-ec2/Makefile
index 47240caa4a7a..15b41907afd3 100644
--- a/net/rubygem-amazon-ec2/Makefile
+++ b/net/rubygem-amazon-ec2/Makefile
@@ -3,7 +3,7 @@ PORTVERSION= 0.9.17
CATEGORIES= net rubygems
MASTER_SITES= RG
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ruby@FreeBSD.org
COMMENT= Library for accessing the Amazon Web Services APIs
WWW= https://github.com/grempe/amazon-ec2
diff --git a/net/rubygem-aws-s3/Makefile b/net/rubygem-aws-s3/Makefile
index 0962be228f53..a44c6dae87d6 100644
--- a/net/rubygem-aws-s3/Makefile
+++ b/net/rubygem-aws-s3/Makefile
@@ -3,7 +3,7 @@ PORTVERSION= 0.6.3
CATEGORIES= net rubygems
MASTER_SITES= RG
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ruby@FreeBSD.org
COMMENT= Client library for Amazon S3 REST API
WWW= https://rubygems.org/gems/aws-s3
diff --git a/net/rubygem-rudy/Makefile b/net/rubygem-rudy/Makefile
index 90edb5c0892a..df9e27c6a92f 100644
--- a/net/rubygem-rudy/Makefile
+++ b/net/rubygem-rudy/Makefile
@@ -4,7 +4,7 @@ PORTREVISION= 1
CATEGORIES= net rubygems
MASTER_SITES= RG
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ruby@FreeBSD.org
COMMENT= EC2 deployment tool
WWW= http://solutious.com/projects/rudy/
diff --git a/net/rubygem-rye/Makefile b/net/rubygem-rye/Makefile
index d9ea5886b4c2..18fe79d4c554 100644
--- a/net/rubygem-rye/Makefile
+++ b/net/rubygem-rye/Makefile
@@ -4,7 +4,7 @@ PORTREVISION= 1
CATEGORIES= net rubygems
MASTER_SITES= RG
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ruby@FreeBSD.org
COMMENT= Safely run SSH commands on a bunch of machines at the same time
WWW= https://github.com/delano/rye/
diff --git a/net/syncthing/Makefile b/net/syncthing/Makefile
index c540df1b56d9..da48b13967e0 100644
--- a/net/syncthing/Makefile
+++ b/net/syncthing/Makefile
@@ -7,7 +7,7 @@ MASTER_SITES= https://github.com/syncthing/syncthing/releases/download/v${PORTVE
DISTNAME= ${PORTNAME}-source-${DISTVERSIONPREFIX}${PORTVERSION}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Encrypted file sync tool
WWW= https://syncthing.net/
diff --git a/ports-mgmt/create-rb-port/Makefile b/ports-mgmt/create-rb-port/Makefile
index 05e9eb0c5cbb..12ff96659ae5 100644
--- a/ports-mgmt/create-rb-port/Makefile
+++ b/ports-mgmt/create-rb-port/Makefile
@@ -2,7 +2,7 @@ PORTNAME= create-rb-port
PORTVERSION= 0.0.3
CATEGORIES= ports-mgmt
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ruby@FreeBSD.org
COMMENT= Script to ease creation of rubygem- ports
WWW= https://github.com/swills/freebsd-ruby
diff --git a/ports-mgmt/py-FreeBSD-ports/Makefile b/ports-mgmt/py-FreeBSD-ports/Makefile
index db01b0b8bea1..55ca06b5add7 100644
--- a/ports-mgmt/py-FreeBSD-ports/Makefile
+++ b/ports-mgmt/py-FreeBSD-ports/Makefile
@@ -4,7 +4,7 @@ CATEGORIES= ports-mgmt python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Parse FreeBSD Ports INDEX, provide search API
WWW= https://github.com/swills/py-FreeBSD-ports/
diff --git a/science/p5-Chemistry-3DBuilder/Makefile b/science/p5-Chemistry-3DBuilder/Makefile
index b23772241a7e..f62d155152d2 100644
--- a/science/p5-Chemistry-3DBuilder/Makefile
+++ b/science/p5-Chemistry-3DBuilder/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:ITUB
PKGNAMEPREFIX= p5-
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= perl@FreeBSD.org
COMMENT= Generate 3D coordinates from a connection table
WWW= https://metacpan.org/release/Chemistry-3DBuilder
diff --git a/science/p5-Chemistry-Bond-Find/Makefile b/science/p5-Chemistry-Bond-Find/Makefile
index f9de344c97cf..250379e69b3d 100644
--- a/science/p5-Chemistry-Bond-Find/Makefile
+++ b/science/p5-Chemistry-Bond-Find/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:ITUB
PKGNAMEPREFIX= p5-
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= perl@FreeBSD.org
COMMENT= Detect bonds in a molecule and assign formal bond orders
WWW= https://metacpan.org/release/Chemistry-Bond-Find
diff --git a/science/p5-Chemistry-Canonicalize/Makefile b/science/p5-Chemistry-Canonicalize/Makefile
index cb180b55bc32..f2ae2d9a9ccc 100644
--- a/science/p5-Chemistry-Canonicalize/Makefile
+++ b/science/p5-Chemistry-Canonicalize/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:ITUB
PKGNAMEPREFIX= p5-
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= perl@FreeBSD.org
COMMENT= Number the atoms in a molecule in a unique way
WWW= https://metacpan.org/release/Chemistry-Canonicalize
diff --git a/science/p5-Chemistry-File-MDLMol/Makefile b/science/p5-Chemistry-File-MDLMol/Makefile
index 22a431baf036..c9a55861fec1 100644
--- a/science/p5-Chemistry-File-MDLMol/Makefile
+++ b/science/p5-Chemistry-File-MDLMol/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:ITUB
PKGNAMEPREFIX= p5-
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= perl@FreeBSD.org
COMMENT= MDL molfile reader/write
WWW= https://metacpan.org/release/Chemistry-File-SMARTS
diff --git a/science/p5-Chemistry-File-Mopac/Makefile b/science/p5-Chemistry-File-Mopac/Makefile
index 7fad7d65067b..9b218a88fdfe 100644
--- a/science/p5-Chemistry-File-Mopac/Makefile
+++ b/science/p5-Chemistry-File-Mopac/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:ITUB
PKGNAMEPREFIX= p5-
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= perl@FreeBSD.org
COMMENT= MOPAC 6 input file reader/writer
WWW= https://metacpan.org/release/Chemistry-File-Mopac
diff --git a/science/p5-Chemistry-File-SLN/Makefile b/science/p5-Chemistry-File-SLN/Makefile
index 09e40f17b49c..459db258ded2 100644
--- a/science/p5-Chemistry-File-SLN/Makefile
+++ b/science/p5-Chemistry-File-SLN/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:ITUB
PKGNAMEPREFIX= p5-
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= perl@FreeBSD.org
COMMENT= SLN linear notation parser/writer
WWW= https://metacpan.org/release/Chemistry-File-SLN
diff --git a/science/p5-Chemistry-File-SMARTS/Makefile b/science/p5-Chemistry-File-SMARTS/Makefile
index 5bf5e7f4057b..445c205dd92c 100644
--- a/science/p5-Chemistry-File-SMARTS/Makefile
+++ b/science/p5-Chemistry-File-SMARTS/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:ITUB
PKGNAMEPREFIX= p5-
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= perl@FreeBSD.org
COMMENT= SMARTS chemical substructure pattern linear notation parser
WWW= https://metacpan.org/release/Chemistry-File-SMARTS
diff --git a/science/p5-Chemistry-File-SMILES/Makefile b/science/p5-Chemistry-File-SMILES/Makefile
index 873128622b29..fb5120018ec1 100644
--- a/science/p5-Chemistry-File-SMILES/Makefile
+++ b/science/p5-Chemistry-File-SMILES/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:ITUB
PKGNAMEPREFIX= p5-
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= perl@FreeBSD.org
COMMENT= SMILES linear notation parser/writer
WWW= https://metacpan.org/release/Chemistry-File-SMILES
diff --git a/science/p5-Chemistry-File-VRML/Makefile b/science/p5-Chemistry-File-VRML/Makefile
index 54d80427602a..0c528764015a 100644
--- a/science/p5-Chemistry-File-VRML/Makefile
+++ b/science/p5-Chemistry-File-VRML/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:ITUB
PKGNAMEPREFIX= p5-
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= perl@FreeBSD.org
COMMENT= Generate VRML models for molecules
WWW= https://metacpan.org/release/Chemistry-File-VRML
diff --git a/science/p5-Chemistry-File-XYZ/Makefile b/science/p5-Chemistry-File-XYZ/Makefile
index a00f8faab31b..c3ecb831646e 100644
--- a/science/p5-Chemistry-File-XYZ/Makefile
+++ b/science/p5-Chemistry-File-XYZ/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:ITUB
PKGNAMEPREFIX= p5-
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= perl@FreeBSD.org
COMMENT= XYZ molecule format reader/writer
WWW= https://metacpan.org/release/Chemistry-File-XYZ
diff --git a/science/p5-Chemistry-FormulaPattern/Makefile b/science/p5-Chemistry-FormulaPattern/Makefile
index 6eaafc7aa6cc..940f609a857a 100644
--- a/science/p5-Chemistry-FormulaPattern/Makefile
+++ b/science/p5-Chemistry-FormulaPattern/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:ITUB
PKGNAMEPREFIX= p5-
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= perl@FreeBSD.org
COMMENT= Match molecule by formula
WWW= https://metacpan.org/release/Chemistry-FormulaPattern
diff --git a/science/p5-Chemistry-InternalCoords/Makefile b/science/p5-Chemistry-InternalCoords/Makefile
index 4fdf819a3c70..a407d0e0cfb8 100644
--- a/science/p5-Chemistry-InternalCoords/Makefile
+++ b/science/p5-Chemistry-InternalCoords/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:ITUB
PKGNAMEPREFIX= p5-
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= perl@FreeBSD.org
COMMENT= Represent the position of an atom using internal coordinates
WWW= https://metacpan.org/release/Chemistry-InternalCoords
diff --git a/science/p5-Chemistry-Isotope/Makefile b/science/p5-Chemistry-Isotope/Makefile
index 140520c2e268..46dc54865845 100644
--- a/science/p5-Chemistry-Isotope/Makefile
+++ b/science/p5-Chemistry-Isotope/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:ITUB
PKGNAMEPREFIX= p5-
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= perl@FreeBSD.org
COMMENT= Table of the isotopes exact mass data
WWW= https://metacpan.org/release/Chemistry-Isotope
diff --git a/science/p5-Chemistry-MidasPattern/Makefile b/science/p5-Chemistry-MidasPattern/Makefile
index d8a2345deb09..24a760125b41 100644
--- a/science/p5-Chemistry-MidasPattern/Makefile
+++ b/science/p5-Chemistry-MidasPattern/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:ITUB
PKGNAMEPREFIX= p5-
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= perl@FreeBSD.org
COMMENT= Select atoms in macromolecules
WWW= https://metacpan.org/release/Chemistry-MidasPattern
diff --git a/science/p5-Chemistry-Mok/Makefile b/science/p5-Chemistry-Mok/Makefile
index 6b5adb48765b..5213a1c8d5bf 100644
--- a/science/p5-Chemistry-Mok/Makefile
+++ b/science/p5-Chemistry-Mok/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:ITUB
PKGNAMEPREFIX= p5-
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= perl@FreeBSD.org
COMMENT= Molecular awk interpreter
WWW= https://metacpan.org/release/Chemistry-Mok
diff --git a/science/p5-Chemistry-Pattern/Makefile b/science/p5-Chemistry-Pattern/Makefile
index 23647b617323..e01f3e834f88 100644
--- a/science/p5-Chemistry-Pattern/Makefile
+++ b/science/p5-Chemistry-Pattern/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:ITUB
PKGNAMEPREFIX= p5-
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= perl@FreeBSD.org
COMMENT= Chemical substructure pattern matching
WWW= https://metacpan.org/release/Chemistry-Pattern
diff --git a/science/p5-Chemistry-Reaction/Makefile b/science/p5-Chemistry-Reaction/Makefile
index 15eb202ef4a0..7dd71c9448a4 100644
--- a/science/p5-Chemistry-Reaction/Makefile
+++ b/science/p5-Chemistry-Reaction/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:ITUB
PKGNAMEPREFIX= p5-
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= perl@FreeBSD.org
COMMENT= Represent a ring as a substructure of a molecule
WWW= https://metacpan.org/release/Chemistry-Reaction
diff --git a/science/p5-Chemistry-Ring/Makefile b/science/p5-Chemistry-Ring/Makefile
index 6c0d2f19e886..3c79927c01f0 100644
--- a/science/p5-Chemistry-Ring/Makefile
+++ b/science/p5-Chemistry-Ring/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:ITUB
PKGNAMEPREFIX= p5-
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= perl@FreeBSD.org
COMMENT= Represent a ring as a substructure of a molecule
WWW= https://metacpan.org/release/Chemistry-Ring
diff --git a/science/p5-PerlMol/Makefile b/science/p5-PerlMol/Makefile
index 41d57520f51f..e0dca4791349 100644
--- a/science/p5-PerlMol/Makefile
+++ b/science/p5-PerlMol/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:ITUB
PKGNAMEPREFIX= p5-
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= perl@FreeBSD.org
COMMENT= Perl modules for molecular chemistry
WWW= https://metacpan.org/release/PerlMol
diff --git a/security/p5-Crypt-T_e_a/Makefile b/security/p5-Crypt-T_e_a/Makefile
index a83a09477586..dd7abad3baa6 100644
--- a/security/p5-Crypt-T_e_a/Makefile
+++ b/security/p5-Crypt-T_e_a/Makefile
@@ -7,7 +7,7 @@ MASTER_SITE_SUBDIR= CPAN:PJB
PKGNAMEPREFIX= p5-
DISTNAME= Crypt-Tea-${PORTVERSION}
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= perl@FreeBSD.org
COMMENT= The Tiny Encryption Algorithm in Perl and JavaScript
WWW= https://metacpan.org/release/PJB/Crypt-Tea-2.12
diff --git a/security/please/Makefile b/security/please/Makefile
index 0bd0c9783755..615870bb6bd0 100644
--- a/security/please/Makefile
+++ b/security/please/Makefile
@@ -2,7 +2,7 @@ PORTNAME= please
PORTVERSION= 2.8
CATEGORIES= security
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Execute a command as root
WWW= https://github.com/MagikBSD/please
diff --git a/security/py-hkdf/Makefile b/security/py-hkdf/Makefile
index 5e5438fdfae6..ec06c2629aa1 100644
--- a/security/py-hkdf/Makefile
+++ b/security/py-hkdf/Makefile
@@ -4,7 +4,7 @@ CATEGORIES= security
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= HMAC-based Extract-and-Expand Key Derivation Function (HKDF)
WWW= https://github.com/casebeer/python-hkdf
diff --git a/security/py-spake2/Makefile b/security/py-spake2/Makefile
index 47ef0b798f92..d3db1a157dcd 100644
--- a/security/py-spake2/Makefile
+++ b/security/py-spake2/Makefile
@@ -4,7 +4,7 @@ CATEGORIES= security
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= SPAKE2 password-authenticated key exchange (pure python)
WWW= https://github.com/warner/python-spake2
diff --git a/security/sslsplit/Makefile b/security/sslsplit/Makefile
index e67c4d89eaca..29e2e73a9208 100644
--- a/security/sslsplit/Makefile
+++ b/security/sslsplit/Makefile
@@ -4,7 +4,7 @@ PORTREVISION= 1
CATEGORIES= security
MASTER_SITES= http://mirror.roe.ch/rel/sslsplit/
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Transparent and scalable SSL/TLS interception
WWW= https://www.roe.ch/SSLsplit
diff --git a/security/vault/Makefile b/security/vault/Makefile
index c41a2abbe215..5dec66dc57a2 100644
--- a/security/vault/Makefile
+++ b/security/vault/Makefile
@@ -4,7 +4,7 @@ DISTVERSIONPREFIX= v
PORTREVISION= 12
CATEGORIES= security
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
# co-maintainer: brd
COMMENT= Tool for securely accessing secrets
WWW= https://vaultproject.io/
diff --git a/sysutils/consul/Makefile b/sysutils/consul/Makefile
index 70ec44d9a12f..882b96ea77f5 100644
--- a/sysutils/consul/Makefile
+++ b/sysutils/consul/Makefile
@@ -4,8 +4,7 @@ PORTREVISION= 8
DISTVERSIONPREFIX= v
CATEGORIES= sysutils
-MAINTAINER= swills@FreeBSD.org
-# co-maintainer: brd
+MAINTAINER= ports@FreeBSD.org
COMMENT= Service discovery and configuration made easy
WWW= https://www.consul.io/
diff --git a/sysutils/direnv/Makefile b/sysutils/direnv/Makefile
index 7dfd073eb5e9..32f59ae61a29 100644
--- a/sysutils/direnv/Makefile
+++ b/sysutils/direnv/Makefile
@@ -4,7 +4,7 @@ DISTVERSIONPREFIX= v
PORTREVISION= 13
CATEGORIES= sysutils
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Environment variable manager for your shell
WWW= https://direnv.net/
diff --git a/sysutils/envconsul/Makefile b/sysutils/envconsul/Makefile
index febba6f1d6e5..040462990cd2 100644
--- a/sysutils/envconsul/Makefile
+++ b/sysutils/envconsul/Makefile
@@ -4,7 +4,7 @@ DISTVERSIONPREFIX= v
PORTREVISION= 13
CATEGORIES= sysutils
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Populate values from Consul into a process environment
WWW= https://github.com/hashicorp/envconsul
diff --git a/sysutils/ipfs-go-fs-repo-migrations/Makefile b/sysutils/ipfs-go-fs-repo-migrations/Makefile
index e2e90a00a5a4..d9a952f74856 100644
--- a/sysutils/ipfs-go-fs-repo-migrations/Makefile
+++ b/sysutils/ipfs-go-fs-repo-migrations/Makefile
@@ -5,7 +5,7 @@ PORTREVISION= 12
CATEGORIES= sysutils
MASTER_SITES= https://github.com/ipfs/fs-repo-migrations/archive/${DISTVERSIONFULL}${EXTRACT_SUFX}?dummy=/
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Migrations for the filesystem repository of ipfs clients
WWW= https://github.com/ipfs/fs-repo-migrations
diff --git a/sysutils/openseachest/Makefile b/sysutils/openseachest/Makefile
index 81a3b32753d6..2e4f8b1faa1c 100644
--- a/sysutils/openseachest/Makefile
+++ b/sysutils/openseachest/Makefile
@@ -3,7 +3,7 @@ PORTVERSION= 21.06.21
DISTVERSIONPREFIX= v
CATEGORIES= sysutils
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Utilities for managing storage devices
WWW= https://github.com/Seagate/openSeaChest
diff --git a/sysutils/p5-BSD-Process/Makefile b/sysutils/p5-BSD-Process/Makefile
index 9d768c570b35..3f1be61cc854 100644
--- a/sysutils/p5-BSD-Process/Makefile
+++ b/sysutils/p5-BSD-Process/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:DLAND
PKGNAMEPREFIX= p5-
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Information about running processes on BSD platforms
WWW= https://metacpan.org/release/BSD-Process
diff --git a/sysutils/py-psutil121/Makefile b/sysutils/py-psutil121/Makefile
index 89d3ba30ada1..823a03be6c1c 100644
--- a/sysutils/py-psutil121/Makefile
+++ b/sysutils/py-psutil121/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
PKGNAMESUFFIX= 121
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Process utilities module for Python
WWW= https://pypi.org/project/psutil/
diff --git a/sysutils/serf/Makefile b/sysutils/serf/Makefile
index 8d4172712010..5cbd2cfb0197 100644
--- a/sysutils/serf/Makefile
+++ b/sysutils/serf/Makefile
@@ -5,7 +5,7 @@ DISTVERSIONPREFIX= v
CATEGORIES= sysutils
PKGNAMEPREFIX= hashicorp-
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Service discovery and configuration made easy
WWW= https://serfdom.io/
diff --git a/sysutils/tarsnap-gui/Makefile b/sysutils/tarsnap-gui/Makefile
index 37a4c0a6d0ad..95f782a5bb79 100644
--- a/sysutils/tarsnap-gui/Makefile
+++ b/sysutils/tarsnap-gui/Makefile
@@ -4,7 +4,7 @@ PORTREVISION= 4
DISTVERSIONPREFIX= v
CATEGORIES= sysutils
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Cross platform GUI for the Tarsnap command line client
WWW= https://github.com/Tarsnap/tarsnap-gui/wiki
diff --git a/sysutils/tmate-ssh-server/Makefile b/sysutils/tmate-ssh-server/Makefile
index 2497f81b0cb5..98c85302abcd 100644
--- a/sysutils/tmate-ssh-server/Makefile
+++ b/sysutils/tmate-ssh-server/Makefile
@@ -4,7 +4,7 @@ PORTEPOCH= 1
PORTREVISION= 1
CATEGORIES= sysutils
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Instant terminal sharing server
WWW= https://tmate.io/
diff --git a/sysutils/tmate/Makefile b/sysutils/tmate/Makefile
index f9d4c66ef599..e139e619f035 100644
--- a/sysutils/tmate/Makefile
+++ b/sysutils/tmate/Makefile
@@ -3,7 +3,7 @@ PORTVERSION= 2.4.0
PORTREVISION= 2
CATEGORIES= sysutils
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Instant terminal sharing
WWW= https://tmate.io/
diff --git a/textproc/consul-template/Makefile b/textproc/consul-template/Makefile
index 279691683f3d..2b5e723314d3 100644
--- a/textproc/consul-template/Makefile
+++ b/textproc/consul-template/Makefile
@@ -4,8 +4,7 @@ PORTREVISION= 8
DISTVERSIONPREFIX= v
CATEGORIES= textproc
-MAINTAINER= swills@FreeBSD.org
-# co-maintainer: brd
+MAINTAINER= ports@FreeBSD.org
COMMENT= Generic template rendering and notifications with Consul
WWW= https://github.com/hashicorp/consul-template
diff --git a/textproc/docbookrx/Makefile b/textproc/docbookrx/Makefile
index 34c4fc6c9943..2f35db178ead 100644
--- a/textproc/docbookrx/Makefile
+++ b/textproc/docbookrx/Makefile
@@ -2,7 +2,7 @@ PORTNAME= docbookrx
DISTVERSION= 1.0.0.dev
CATEGORIES= textproc
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= DocBook to AsciiDoc converter
WWW= https://github.com/asciidoctor/docbookrx
diff --git a/textproc/fist/Makefile b/textproc/fist/Makefile
index f49b1a039cd5..b7b8cae9da5a 100644
--- a/textproc/fist/Makefile
+++ b/textproc/fist/Makefile
@@ -3,7 +3,7 @@ PORTVERSION= 4.0
CATEGORIES= textproc
MASTER_SITES= https://www.fourmilab.ch/fist/
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Emphatic message generator
WWW= https://www.fourmilab.ch/fist/
diff --git a/textproc/jo/Makefile b/textproc/jo/Makefile
index 1c4d65c9ab67..7cf0bd77801d 100644
--- a/textproc/jo/Makefile
+++ b/textproc/jo/Makefile
@@ -3,7 +3,7 @@ PORTVERSION= 1.6
CATEGORIES= textproc
MASTER_SITES= https://github.com/jpmens/${PORTNAME}/releases/download/${PORTVERSION}/
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Small utility to create JSON objects
WWW= https://github.com/jpmens/jo
diff --git a/textproc/p5-Algorithm-CheckDigits/Makefile b/textproc/p5-Algorithm-CheckDigits/Makefile
index 3f994b2895af..a044a91f5f65 100644
--- a/textproc/p5-Algorithm-CheckDigits/Makefile
+++ b/textproc/p5-Algorithm-CheckDigits/Makefile
@@ -5,7 +5,7 @@ CATEGORIES= textproc perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= perl@FreeBSD.org
COMMENT= Perl extension to generate and test check digits
WWW= https://metacpan.org/release/Algorithm-CheckDigits
diff --git a/textproc/p5-Spreadsheet-XLSX/Makefile b/textproc/p5-Spreadsheet-XLSX/Makefile
index 82e895e0d058..2ff9d7ff1d45 100644
--- a/textproc/p5-Spreadsheet-XLSX/Makefile
+++ b/textproc/p5-Spreadsheet-XLSX/Makefile
@@ -4,7 +4,7 @@ CATEGORIES= textproc perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= perl@FreeBSD.org
COMMENT= Perl extension for reading MS Excel 2007 files
WWW= https://metacpan.org/release/Spreadsheet-XLSX
diff --git a/textproc/p5-WWW-Wordnik-API/Makefile b/textproc/p5-WWW-Wordnik-API/Makefile
index 5fd357d828bf..18460ab10faf 100644
--- a/textproc/p5-WWW-Wordnik-API/Makefile
+++ b/textproc/p5-WWW-Wordnik-API/Makefile
@@ -7,7 +7,7 @@ MASTER_SITE_SUBDIR= CPAN:PSILVA
PKGNAMEPREFIX= p5-
DISTNAME= ${PORTNAME}-v${PORTVERSION}
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= perl@FreeBSD.org
COMMENT= Wordnik API implementation
WWW= https://metacpan.org/release/WWW-Wordnik-API
diff --git a/textproc/p5-XML-RSS/Makefile b/textproc/p5-XML-RSS/Makefile
index 38b5885016bb..3fbd0b991dff 100644
--- a/textproc/p5-XML-RSS/Makefile
+++ b/textproc/p5-XML-RSS/Makefile
@@ -4,7 +4,7 @@ CATEGORIES= textproc perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= perl@FreeBSD.org
COMMENT= Perl extension to manage RDF Site Summary (RSS) files
WWW= https://metacpan.org/release/XML-RSS
diff --git a/textproc/p5-YAML-Shell/Makefile b/textproc/p5-YAML-Shell/Makefile
index d0b33a93c22f..93bb45b3d84b 100644
--- a/textproc/p5-YAML-Shell/Makefile
+++ b/textproc/p5-YAML-Shell/Makefile
@@ -4,7 +4,7 @@ CATEGORIES= textproc perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= perl@FreeBSD.org
COMMENT= YAML Test Shell
WWW= https://metacpan.org/release/YAML-Shell
diff --git a/textproc/py-asciinema/Makefile b/textproc/py-asciinema/Makefile
index bd7976f44d4e..f5548a2b8898 100644
--- a/textproc/py-asciinema/Makefile
+++ b/textproc/py-asciinema/Makefile
@@ -4,7 +4,7 @@ CATEGORIES= textproc python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Tool for recording and sharing terminal sessions
WWW= https://asciinema.org/
diff --git a/textproc/py-sphinx-argparse/Makefile b/textproc/py-sphinx-argparse/Makefile
index 91fda5c56dcf..56b935004a63 100644
--- a/textproc/py-sphinx-argparse/Makefile
+++ b/textproc/py-sphinx-argparse/Makefile
@@ -4,7 +4,7 @@ CATEGORIES= textproc python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Sphinx extension that automatically documents argparse
WWW= https://github.com/ribozz/sphinx-argparse
diff --git a/textproc/py-sphinx_press_theme/Makefile b/textproc/py-sphinx_press_theme/Makefile
index 36965d8ad7b5..9ed8ca188843 100644
--- a/textproc/py-sphinx_press_theme/Makefile
+++ b/textproc/py-sphinx_press_theme/Makefile
@@ -4,7 +4,7 @@ CATEGORIES= textproc python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Them for py-sphinx based on VuePress
WWW= https://schettino72.github.io/sphinx_press_site/
diff --git a/textproc/spiff/Makefile b/textproc/spiff/Makefile
index ae1680bd6dca..6e12b4fa9534 100644
--- a/textproc/spiff/Makefile
+++ b/textproc/spiff/Makefile
@@ -4,7 +4,7 @@ DISTVERSIONPREFIX= v
PORTREVISION= 13
CATEGORIES= textproc
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Declarative YAML templating system tuned for BOSH deployment manifests
WWW= https://github.com/cloudfoundry-incubator/spiff
diff --git a/www/gitlab-pages/Makefile b/www/gitlab-pages/Makefile
index 6ee50f8bd58e..345931b0969d 100644
--- a/www/gitlab-pages/Makefile
+++ b/www/gitlab-pages/Makefile
@@ -6,7 +6,7 @@ CATEGORIES= www
MASTER_SITES+= https://gitlab.com/gitlab-org/gitlab-pages/-/raw/v${DISTVERSION}/
DISTFILES+= go.mod
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Official GitLab Pages daemon
WWW= https://gitlab.com/gitlab-org/gitlab-pages
diff --git a/www/mattermost-server/Makefile b/www/mattermost-server/Makefile
index 604ad7ac97b4..7f5c89407612 100644
--- a/www/mattermost-server/Makefile
+++ b/www/mattermost-server/Makefile
@@ -6,7 +6,7 @@ CATEGORIES= www
MASTER_SITES= https://raw.githubusercontent.com/${GH_ACCOUNT}/${GH_PROJECT}/${DISTVERSIONFULL}/:gomod
DISTFILES= go.mod:gomod
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Open source Slack-alternative in Golang and React
WWW= https://mattermost.org/
diff --git a/www/mattermost-webapp/Makefile b/www/mattermost-webapp/Makefile
index 65d401932426..dbb3ef1f2552 100644
--- a/www/mattermost-webapp/Makefile
+++ b/www/mattermost-webapp/Makefile
@@ -5,7 +5,7 @@ CATEGORIES= www
MASTER_SITES= https://releases.mattermost.com/${PORTVERSION}/
DISTNAME= mattermost-${PORTVERSION}-linux-amd64
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Webapp of Mattermost server
WWW= https://mattermost.org/
diff --git a/www/minio/Makefile b/www/minio/Makefile
index 46f8574a04e3..48016a89bcac 100644
--- a/www/minio/Makefile
+++ b/www/minio/Makefile
@@ -4,7 +4,7 @@ PORTREVISION= 1
CATEGORIES= www
DIST_SUBDIR= minio
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Amazon S3 compatible object storage server
WWW= https://minio.io/
diff --git a/www/p5-CGI-Application-Plugin-Config-YAML/Makefile b/www/p5-CGI-Application-Plugin-Config-YAML/Makefile
index 2df0c3487263..981424c5889a 100644
--- a/www/p5-CGI-Application-Plugin-Config-YAML/Makefile
+++ b/www/p5-CGI-Application-Plugin-Config-YAML/Makefile
@@ -5,7 +5,7 @@ CATEGORIES= www perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= perl@FreeBSD.org
COMMENT= Add Config::YAML support to CGI::Application
WWW= https://metacpan.org/release/CGI-Application-Plugin-Config-YAML
diff --git a/www/p5-CGI-Application-Plugin-JSON/Makefile b/www/p5-CGI-Application-Plugin-JSON/Makefile
index f1d67bf9a4ac..76d89eef81ef 100644
--- a/www/p5-CGI-Application-Plugin-JSON/Makefile
+++ b/www/p5-CGI-Application-Plugin-JSON/Makefile
@@ -5,7 +5,7 @@ CATEGORIES= www perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= perl@FreeBSD.org
COMMENT= Easy manipulation of JSON headers for CGI::Application
WWW= https://metacpan.org/release/CGI-Application-Plugin-JSON
diff --git a/www/p5-CGI-EncryptForm/Makefile b/www/p5-CGI-EncryptForm/Makefile
index 772fae1fd52b..cd6c2f2d047a 100644
--- a/www/p5-CGI-EncryptForm/Makefile
+++ b/www/p5-CGI-EncryptForm/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:MARAL
PKGNAMEPREFIX= p5-
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= perl@FreeBSD.org
COMMENT= Implement trusted stateful CGI Form Data using cryptography
WWW= https://metacpan.org/release/CGI-EncryptForm
diff --git a/x11-fonts/powerline-fonts/Makefile b/x11-fonts/powerline-fonts/Makefile
index 894783380b84..b4571756069f 100644
--- a/x11-fonts/powerline-fonts/Makefile
+++ b/x11-fonts/powerline-fonts/Makefile
@@ -2,7 +2,7 @@ PORTNAME= powerline-fonts
PORTVERSION= 0.0.0.2020.08.28
CATEGORIES= x11-fonts
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Fixed width sans fonts for use with powerline
WWW= https://github.com/powerline/fonts
diff --git a/x11-toolkits/p5-Gtk2/Makefile b/x11-toolkits/p5-Gtk2/Makefile
index 38190db15d8b..5f287311f98a 100644
--- a/x11-toolkits/p5-Gtk2/Makefile
+++ b/x11-toolkits/p5-Gtk2/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES= CPAN \
SF/${PORTNAME:tl}-perl/${PORTNAME}/${PORTVERSION}
PKGNAMEPREFIX= p5-
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= perl@FreeBSD.org
COMMENT= Perl module for Gtk+ 2.x graphical user interface library
WWW= http://gtk2-perl.sourceforge.net/
diff --git a/x11/py-pyscreenshot/Makefile b/x11/py-pyscreenshot/Makefile
index e710dafc6467..ea1f4676a07b 100644
--- a/x11/py-pyscreenshot/Makefile
+++ b/x11/py-pyscreenshot/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
#DISTNAME= PyVirtualDisplay-${PORTVERSION}
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Python module for taking screenshots
WWW= https://github.com/ponty/pyscreenshot
diff --git a/x11/radare-cutter/Makefile b/x11/radare-cutter/Makefile
index 6ed3a8adb3ef..a408e0f3c206 100644
--- a/x11/radare-cutter/Makefile
+++ b/x11/radare-cutter/Makefile
@@ -4,7 +4,7 @@ PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= x11
-MAINTAINER= swills@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= GUI for radare2 reverse engineering framework
WWW= https://github.com/radareorg/cutter