Take in olivierd@'s commit bit on his request.

Submitted by:	olivierd@
With hat:	portmgr-secretary

74 files changed, 74 insertions, 74 deletions

diff --git a/audio/lollypop/Makefile b/audio/lollypop/Makefile
index 978a29bb3a48..91740a857f42 100644
--- a/audio/lollypop/Makefile
+++ b/audio/lollypop/Makefile
@@ -6,7 +6,7 @@ PORTVERSION=	0.9.15
 CATEGORIES=	audio
 MASTER_SITES=	https://github.com/gnumdk/${PORTNAME}/releases/download/${PORTVERSION}/
 
-MAINTAINER=	olivierd@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Play and organize your music collection
 
 LICENSE=	GPLv3
diff --git a/audio/pragha/Makefile b/audio/pragha/Makefile
index 571b182c6be8..802a51737e9c 100644
--- a/audio/pragha/Makefile
+++ b/audio/pragha/Makefile
@@ -7,7 +7,7 @@ PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	https://github.com/pragha-music-player/${PORTNAME}/releases/download/v${PORTVERSION}/
 
-MAINTAINER=	olivierd@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Lightweight music player
 
 LICENSE=	GPLv3
diff --git a/audio/siren/Makefile b/audio/siren/Makefile
index a7ccf9f0059b..38ae499d04f0 100644
--- a/audio/siren/Makefile
+++ b/audio/siren/Makefile
@@ -7,7 +7,7 @@ PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://www.kariliq.nl/${PORTNAME}/dist/
 
-MAINTAINER=	olivierd@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Text-based audio player
 
 LICENSE=	ISCL
diff --git a/devel/dee/Makefile b/devel/dee/Makefile
index 8c1b11b1ad75..4a1f248de3fd 100644
--- a/devel/dee/Makefile
+++ b/devel/dee/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	devel
 MASTER_SITES=	https://launchpadlibrarian.net/151383425/ \
 	https://launchpad.net/${PORTNAME}/1.0/${PORTVERSION}/+download/
 
-MAINTAINER=	olivierd@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Model to synchronize multiple instances over DBus
 
 LICENSE=	GPLv3
diff --git a/devel/libburn/Makefile b/devel/libburn/Makefile
index 76e880e90522..d31714f019df 100644
--- a/devel/libburn/Makefile
+++ b/devel/libburn/Makefile
@@ -6,7 +6,7 @@ PORTVERSION=	1.4.6
 CATEGORIES=	devel
 MASTER_SITES=	http://files.libburnia-project.org/releases/
 
-MAINTAINER=	olivierd@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Libburnia library to read/write optical discs
 
 LICENSE=	GPLv2
diff --git a/devel/libdbusmenu/Makefile b/devel/libdbusmenu/Makefile
index cdd6b965f682..1d9890c1493d 100644
--- a/devel/libdbusmenu/Makefile
+++ b/devel/libdbusmenu/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	devel
 MASTER_SITES=	https://launchpadlibrarian.net/243440794/ \
 	https://launchpad.net/${PORTNAME}/${PORTVERSION:R}/${PORTVERSION}/+download/
 
-MAINTAINER=	olivierd@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GLib and Gtk Implementation of the DBusMenu protocol
 
 LICENSE=	GPLv3 LGPL21 LGPL3
diff --git a/devel/libisofs/Makefile b/devel/libisofs/Makefile
index 0cc850bf9229..ade1b30b5103 100644
--- a/devel/libisofs/Makefile
+++ b/devel/libisofs/Makefile
@@ -6,7 +6,7 @@ PORTVERSION=	1.4.6
 CATEGORIES=	devel
 MASTER_SITES=	http://files.libburnia-project.org/releases/
 
-MAINTAINER=	olivierd@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Libburnia ISO9660 filesystem creation library
 
 LICENSE=	GPLv2
diff --git a/devel/liblxqt-l10n/Makefile b/devel/liblxqt-l10n/Makefile
index 4188a36d396c..828975a5354a 100644
--- a/devel/liblxqt-l10n/Makefile
+++ b/devel/liblxqt-l10n/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	devel
 MASTER_SITES=	LXQT/lxqt-l10n
 DISTNAME=	lxqt-l10n-${DISTVERSION}
 
-MAINTAINER=	olivierd@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Translations of liblxqt
 
 LICENSE=	LGPL21+
diff --git a/devel/liblxqt/Makefile b/devel/liblxqt/Makefile
index 75acd0f3b02c..41be25d2fd99 100644
--- a/devel/liblxqt/Makefile
+++ b/devel/liblxqt/Makefile
@@ -6,7 +6,7 @@ PORTVERSION=	0.11.1
 CATEGORIES=	devel
 MASTER_SITES=	LXQT
 
-MAINTAINER=	olivierd@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Shared library for LXQt applications
 
 LICENSE=	LGPL21+
diff --git a/devel/libnsutils/Makefile b/devel/libnsutils/Makefile
index dede90295677..5758e203da0d 100644
--- a/devel/libnsutils/Makefile
+++ b/devel/libnsutils/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	devel
 MASTER_SITES=	http://download.netsurf-browser.org/libs/releases/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
-MAINTAINER=	olivierd@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	NetSurf generalised utility library
 
 LICENSE=	MIT
diff --git a/devel/libparserutils/Makefile b/devel/libparserutils/Makefile
index 0dff09b8c673..70f5e2edfce0 100644
--- a/devel/libparserutils/Makefile
+++ b/devel/libparserutils/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	devel
 MASTER_SITES=	http://download.netsurf-browser.org/libs/releases/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
-MAINTAINER=	olivierd@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Lexer/parser utility functions for NetSurf
 
 LICENSE=	MIT
diff --git a/devel/libqtxdg/Makefile b/devel/libqtxdg/Makefile
index 1224b2e0a3eb..3ab991292942 100644
--- a/devel/libqtxdg/Makefile
+++ b/devel/libqtxdg/Makefile
@@ -7,7 +7,7 @@ PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	LXQT/${PORTNAME}
 
-MAINTAINER=	olivierd@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Qt implementation of freedesktop.org xdg specs
 
 LICENSE=	LGPL21+
diff --git a/devel/lxqt-build-tools/Makefile b/devel/lxqt-build-tools/Makefile
index 6fc9f3d4ba9a..ab7620266422 100644
--- a/devel/lxqt-build-tools/Makefile
+++ b/devel/lxqt-build-tools/Makefile
@@ -6,7 +6,7 @@ PORTVERSION=	0.3.2
 CATEGORIES=	devel
 MASTER_SITES=	LXQT/${PORTNAME}
 
-MAINTAINER=	olivierd@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Helpers CMake modules for LXQt
 
 LICENSE=	BSD3CLAUSE
diff --git a/devel/netsurf-buildsystem/Makefile b/devel/netsurf-buildsystem/Makefile
index 3b8b7479848c..69a991dfae12 100644
--- a/devel/netsurf-buildsystem/Makefile
+++ b/devel/netsurf-buildsystem/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	devel
 MASTER_SITES=	http://download.netsurf-browser.org/libs/releases/
 PKGNAMEPREFIX=	netsurf-
 
-MAINTAINER=	olivierd@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	NetSurf project buildsystem
 
 LICENSE=	MIT
diff --git a/devel/nsgenbind/Makefile b/devel/nsgenbind/Makefile
index 1e66ecd44f48..98f04aed61a5 100644
--- a/devel/nsgenbind/Makefile
+++ b/devel/nsgenbind/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	devel
 MASTER_SITES=	http://download.netsurf-browser.org/libs/releases/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
-MAINTAINER=	olivierd@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	NetSurf Generator for JavaScript bindings
 
 LICENSE=	MIT
diff --git a/devel/py-gdata/Makefile b/devel/py-gdata/Makefile
index 95574a7816ba..58d2eca3d360 100644
--- a/devel/py-gdata/Makefile
+++ b/devel/py-gdata/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	olivierd@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GData Python Client Library
 
 LICENSE=	APACHE20
diff --git a/devel/py-speaklater/Makefile b/devel/py-speaklater/Makefile
index 03807c1e0165..d8cd0d8400cd 100644
--- a/devel/py-speaklater/Makefile
+++ b/devel/py-speaklater/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	olivierd@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Lazy string Python module for translations
 
 LICENSE=	BSD3CLAUSE
diff --git a/dns/libnspsl/Makefile b/dns/libnspsl/Makefile
index 8fd32eade583..b88e9f728368 100644
--- a/dns/libnspsl/Makefile
+++ b/dns/libnspsl/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	dns
 MASTER_SITES=	http://download.netsurf-browser.org/libs/releases/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
-MAINTAINER=	olivierd@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	NetSurf public suffix list handling
 
 LICENSE=	MIT
diff --git a/editors/latexila/Makefile b/editors/latexila/Makefile
index 0686dc2acb0e..e9718af46071 100644
--- a/editors/latexila/Makefile
+++ b/editors/latexila/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	editors
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
 
-MAINTAINER=	olivierd@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Integrated LaTeX environment
 
 LICENSE=	GPLv3
diff --git a/editors/vanubi/Makefile b/editors/vanubi/Makefile
index 29b08026c8ae..69a7bfe5f6a7 100644
--- a/editors/vanubi/Makefile
+++ b/editors/vanubi/Makefile
@@ -7,7 +7,7 @@ DISTVERSIONPREFIX=	v
 PORTREVISION=	1
 CATEGORIES=	editors
 
-MAINTAINER=	olivierd@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Programming editor written in Vala
 
 LICENSE=	GPLv3
diff --git a/graphics/electrix/Makefile b/graphics/electrix/Makefile
index a60428cba19d..9a218a535827 100644
--- a/graphics/electrix/Makefile
+++ b/graphics/electrix/Makefile
@@ -6,7 +6,7 @@ PORTREVISION=	9
 CATEGORIES=	graphics print
 MASTER_SITES=	SF/${PORTNAME:tl}/${PORTVERSION}
 
-MAINTAINER=	olivierd@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Application to view PDF files
 
 LICENSE=	GPLv2
diff --git a/graphics/libnsbmp/Makefile b/graphics/libnsbmp/Makefile
index 788f96979ebc..a78ed8bbb183 100644
--- a/graphics/libnsbmp/Makefile
+++ b/graphics/libnsbmp/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	graphics
 MASTER_SITES=	http://download.netsurf-browser.org/libs/releases/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
-MAINTAINER=	olivierd@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	NetSurf BMP decoder
 
 LICENSE=	MIT
diff --git a/graphics/libnsgif/Makefile b/graphics/libnsgif/Makefile
index 916f089d5845..d624b2c8b176 100644
--- a/graphics/libnsgif/Makefile
+++ b/graphics/libnsgif/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	graphics
 MASTER_SITES=	http://download.netsurf-browser.org/libs/releases/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
-MAINTAINER=	olivierd@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	NetSurf GIF Decoder
 
 LICENSE=	MIT
diff --git a/graphics/lximage-qt/Makefile b/graphics/lximage-qt/Makefile
index fb03a68ab76d..a2116306532f 100644
--- a/graphics/lximage-qt/Makefile
+++ b/graphics/lximage-qt/Makefile
@@ -6,7 +6,7 @@ PORTVERSION=	0.5.1
 CATEGORIES=	graphics
 MASTER_SITES=	LXQT/${PORTNAME}
 
-MAINTAINER=	olivierd@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Image viewer and screenshot tool
 
 LICENSE=	GPLv2
diff --git a/graphics/lximageqt-l10n/Makefile b/graphics/lximageqt-l10n/Makefile
index c522e9f28d98..6dda85922132 100644
--- a/graphics/lximageqt-l10n/Makefile
+++ b/graphics/lximageqt-l10n/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	graphics
 MASTER_SITES=	LXQT/lxqt-l10n
 DISTNAME=	lxqt-l10n-${DISTVERSION}
 
-MAINTAINER=	olivierd@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Translations of lximage-qt
 
 LICENSE=	LGPL21+
diff --git a/graphics/phototonic/Makefile b/graphics/phototonic/Makefile
index ba452efbcbf9..f67b42104f08 100644
--- a/graphics/phototonic/Makefile
+++ b/graphics/phototonic/Makefile
@@ -7,7 +7,7 @@ DISTVERSIONPREFIX=	v
 PORTREVISION=	1
 CATEGORIES=	graphics
 
-MAINTAINER=	olivierd@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Image viewer and organizer
 
 LICENSE=	GPLv3
diff --git a/graphics/py-wand/Makefile b/graphics/py-wand/Makefile
index 1d71c224b9dd..e8c7f75a0569 100644
--- a/graphics/py-wand/Makefile
+++ b/graphics/py-wand/Makefile
@@ -6,7 +6,7 @@ CATEGORIES=	graphics python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	olivierd@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	MagickWand Python binding
 
 LICENSE=	MIT
diff --git a/graphics/pysvg/Makefile b/graphics/pysvg/Makefile
index 064016675ecb..9a7711c35866 100644
--- a/graphics/pysvg/Makefile
+++ b/graphics/pysvg/Makefile
@@ -6,7 +6,7 @@ PORTVERSION=	0.2.2
 CATEGORIES=	graphics python
 MASTER_SITES=	CHEESESHOP
 
-MAINTAINER=	olivierd@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	pySVG - creating svg with python
 
 LICENSE=	BSD2CLAUSE
diff --git a/math/pantheon-calculator/Makefile b/math/pantheon-calculator/Makefile
index d299c12eab95..8b1c4206122f 100644
--- a/math/pantheon-calculator/Makefile
+++ b/math/pantheon-calculator/Makefile
@@ -8,7 +8,7 @@ MASTER_SITES=	https://launchpadlibrarian.net/303135059/ \
 	https://launchpad.net/${PORTNAME}/0.4-loki/${PORTVERSION}/+download/
 DIST_SUBDIR=	pantheon
 
-MAINTAINER=	olivierd@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple calculator written in Vala
 
 LICENSE=	GPLv3
diff --git a/misc/qt5ct/Makefile b/misc/qt5ct/Makefile
index 64b83ecf5faf..95fb0095b5f4 100644
--- a/misc/qt5ct/Makefile
+++ b/misc/qt5ct/Makefile
@@ -5,7 +5,7 @@ PORTVERSION=	0.30
 CATEGORIES=	misc
 MASTER_SITES=	SF/${PORTNAME}
 
-MAINTAINER=	olivierd@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Qt 5 configuration tool
 
 LICENSE=	BSD2CLAUSE
diff --git a/multimedia/audacious-gtk3/Makefile b/multimedia/audacious-gtk3/Makefile
index fa8159bf22e9..6ba349cc67e5 100644
--- a/multimedia/audacious-gtk3/Makefile
+++ b/multimedia/audacious-gtk3/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	multimedia audio
 MASTER_SITES=	http://distfiles.audacious-media-player.org/
 PKGNAMESUFFIX=	${DISTVERSIONSUFFIX}
 
-MAINTAINER=	olivierd@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Gtk+3 port of lightweight and versatile audio player
 
 LICENSE=	GPLv3
diff --git a/multimedia/audacious-plugins-gtk3/Makefile b/multimedia/audacious-plugins-gtk3/Makefile
index a64018b121f8..e9ea69a0b9cc 100644
--- a/multimedia/audacious-plugins-gtk3/Makefile
+++ b/multimedia/audacious-plugins-gtk3/Makefile
@@ -9,7 +9,7 @@ CATEGORIES=	multimedia audio
 MASTER_SITES=	http://distfiles.audacious-media-player.org/
 PKGNAMESUFFIX=	${DISTVERSIONSUFFIX}
 
-MAINTAINER=	olivierd@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Plugins needed for audacious-gtk3
 
 LICENSE=	GPLv3
diff --git a/multimedia/audacious-plugins/Makefile b/multimedia/audacious-plugins/Makefile
index c8a15e29ec95..5d4235f57ea1 100644
--- a/multimedia/audacious-plugins/Makefile
+++ b/multimedia/audacious-plugins/Makefile
@@ -7,7 +7,7 @@ PORTREVISION=	1
 CATEGORIES=	multimedia audio
 MASTER_SITES=	http://distfiles.audacious-media-player.org/
 
-MAINTAINER=	olivierd@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Plugins needed for audacious
 
 LICENSE=	GPLv3
diff --git a/multimedia/audacious/Makefile b/multimedia/audacious/Makefile
index b491bea7627e..37141f05bd03 100644
--- a/multimedia/audacious/Makefile
+++ b/multimedia/audacious/Makefile
@@ -6,7 +6,7 @@ PORTVERSION=	3.8.2
 CATEGORIES=	multimedia audio
 MASTER_SITES=	http://distfiles.audacious-media-player.org/
 
-MAINTAINER=	olivierd@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Lightweight and versatile audio player
 
 LICENSE=	GPLv3
diff --git a/net/py-urllib3/Makefile b/net/py-urllib3/Makefile
index 156efc8ba1a3..a10aa589a012 100644
--- a/net/py-urllib3/Makefile
+++ b/net/py-urllib3/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	net python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	olivierd@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Enhance HTTP Python's standard library
 
 LICENSE=	MIT
diff --git a/net/uget/Makefile b/net/uget/Makefile
index 5d25213406b0..ecf1352889ef 100644
--- a/net/uget/Makefile
+++ b/net/uget/Makefile
@@ -6,7 +6,7 @@ PORTVERSION=	2.0.9
 CATEGORIES=	net
 MASTER_SITES=	SF/urlget/${PORTNAME}%20%28stable%29/${PORTVERSION}
 
-MAINTAINER=	olivierd@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Download manager application
 
 LICENSE=	LGPL21
diff --git a/security/py-itsdangerous/Makefile b/security/py-itsdangerous/Makefile
index 84b7d32bcc16..734a60fe3261 100644
--- a/security/py-itsdangerous/Makefile
+++ b/security/py-itsdangerous/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	security python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	olivierd@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Various helpers to pass data in untrusted environments
 
 LICENSE=	BSD3CLAUSE
diff --git a/shells/mksh/Makefile b/shells/mksh/Makefile
index f59d48fad670..3caaae63c14e 100644
--- a/shells/mksh/Makefile
+++ b/shells/mksh/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	shells
 MASTER_SITES=	http://www.mirbsd.org/MirOS/dist/mir/mksh/ \
 		http://pub.allbsd.org/MirOS/dist/mir/mksh/
 
-MAINTAINER=	olivierd@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	MirBSD Korn Shell
 
 LICENSE=	BSD3CLAUSE ISCL ML PD
diff --git a/sysutils/bamf/Makefile b/sysutils/bamf/Makefile
index c0aeb5789038..bc4f40f8e266 100644
--- a/sysutils/bamf/Makefile
+++ b/sysutils/bamf/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	sysutils
 MASTER_SITES=	https://launchpadlibrarian.net/280921055/ \
 	https://launchpad.net/${PORTNAME}/${PORTVERSION:R}/${PORTVERSION}/+download/
 
-MAINTAINER=	olivierd@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	BAMF Application Matching Framework
 
 LICENSE=	LGPL3
diff --git a/sysutils/contractor/Makefile b/sysutils/contractor/Makefile
index 77a181628fe9..dc144aca5030 100644
--- a/sysutils/contractor/Makefile
+++ b/sysutils/contractor/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	sysutils
 MASTER_SITES=	https://launchpadlibrarian.net/278375346/ \
 	https://launchpad.net/${PORTNAME}/loki/${PORTVERSION}/+download/
 
-MAINTAINER=	olivierd@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Desktop-wide extension service
 
 LICENSE=	GPLv3
diff --git a/sysutils/py-iowait/Makefile b/sysutils/py-iowait/Makefile
index 5edf88138d5e..f2619c41f0ac 100644
--- a/sysutils/py-iowait/Makefile
+++ b/sysutils/py-iowait/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	sysutils python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	olivierd@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Python module for I/O completion events
 
 LICENSE=	GPLv3
diff --git a/textproc/gspell/Makefile b/textproc/gspell/Makefile
index 412a86c2a093..22206f002329 100644
--- a/textproc/gspell/Makefile
+++ b/textproc/gspell/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	textproc
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
 
-MAINTAINER=	olivierd@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Spell checking for GTK+
 
 LICENSE=	GPLv2
diff --git a/textproc/libcss/Makefile b/textproc/libcss/Makefile
index a942632c96b5..e078cc203459 100644
--- a/textproc/libcss/Makefile
+++ b/textproc/libcss/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	textproc
 MASTER_SITES=	http://download.netsurf-browser.org/libs/releases/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
-MAINTAINER=	olivierd@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Cascading Style Sheets library
 
 LICENSE=	MIT
diff --git a/textproc/libutf8proc/Makefile b/textproc/libutf8proc/Makefile
index 5e52c90bc2bf..c8d78b581411 100644
--- a/textproc/libutf8proc/Makefile
+++ b/textproc/libutf8proc/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	textproc
 MASTER_SITES=	http://download.netsurf-browser.org/libs/releases/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.2$//}${DISTVERSIONSUFFIX}
 
-MAINTAINER=	olivierd@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	UTF8 Processing library
 
 LICENSE=	MIT
diff --git a/textproc/libwapcaplet/Makefile b/textproc/libwapcaplet/Makefile
index d09402bf785c..ed715ce61228 100644
--- a/textproc/libwapcaplet/Makefile
+++ b/textproc/libwapcaplet/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	textproc
 MASTER_SITES=	http://download.netsurf-browser.org/libs/releases/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
-MAINTAINER=	olivierd@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	String internment library
 
 LICENSE=	MIT
diff --git a/textproc/py-docutils/Makefile b/textproc/py-docutils/Makefile
index c01a7eaf4b15..f952173abb40 100644
--- a/textproc/py-docutils/Makefile
+++ b/textproc/py-docutils/Makefile
@@ -8,7 +8,7 @@ MASTER_SITES=	SF \
 		CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	olivierd@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Python Documentation Utilities
 
 LICENSE=	BSD2CLAUSE GPLv3+ PD PSFL
diff --git a/textproc/py-rst2html5/Makefile b/textproc/py-rst2html5/Makefile
index 104eb1fddaa1..0e637ba713e8 100644
--- a/textproc/py-rst2html5/Makefile
+++ b/textproc/py-rst2html5/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	textproc python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	olivierd@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Produces HTML5 documents from reStructuredText sources
 
 LICENSE=	MIT
diff --git a/textproc/py-rstyoutube/Makefile b/textproc/py-rstyoutube/Makefile
index ca7ab14fb88b..85dce65bcf3d 100644
--- a/textproc/py-rstyoutube/Makefile
+++ b/textproc/py-rstyoutube/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	textproc python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	olivierd@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Embed YouTube videos in reStructuredText documents
 
 LICENSE=	MIT
diff --git a/www/libdom/Makefile b/www/libdom/Makefile
index 11c52ec15cd5..3f67617fd8c5 100644
--- a/www/libdom/Makefile
+++ b/www/libdom/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	www
 MASTER_SITES=	http://download.netsurf-browser.org/libs/releases/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
-MAINTAINER=	olivierd@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Document Object Model library
 
 LICENSE=	MIT
diff --git a/www/libhubbub/Makefile b/www/libhubbub/Makefile
index d6fa54ce4a27..42586570d3cc 100644
--- a/www/libhubbub/Makefile
+++ b/www/libhubbub/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	www
 MASTER_SITES=	http://download.netsurf-browser.org/libs/releases/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
-MAINTAINER=	olivierd@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	HTML5 parser library
 
 LICENSE=	MIT
diff --git a/www/netsurf/Makefile b/www/netsurf/Makefile
index b0421561aca4..9df5ae91f1da 100644
--- a/www/netsurf/Makefile
+++ b/www/netsurf/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	www
 MASTER_SITES=	http://download.netsurf-browser.org/netsurf/releases/source/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
-MAINTAINER=	olivierd@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Lightweight web browser
 
 LICENSE=	GPLv2 MIT
diff --git a/www/py-bjoern/Makefile b/www/py-bjoern/Makefile
index 8592e22c38f8..b1988bfaf767 100644
--- a/www/py-bjoern/Makefile
+++ b/www/py-bjoern/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	olivierd@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Fast Python WSGI server
 
 LICENSE=	BSD2CLAUSE
diff --git a/www/py-flask/Makefile b/www/py-flask/Makefile
index c90148f06413..389daabd5611 100644
--- a/www/py-flask/Makefile
+++ b/www/py-flask/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	olivierd@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Micro web framework
 
 LICENSE=	BSD3CLAUSE
diff --git a/www/py-waitress/Makefile b/www/py-waitress/Makefile
index 3e192536a0f4..4d388a145fe5 100644
--- a/www/py-waitress/Makefile
+++ b/www/py-waitress/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	olivierd@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Python WSGI server
 
 LICENSE=	ZPL21
diff --git a/x11-fm/pcmanfm-qt/Makefile b/x11-fm/pcmanfm-qt/Makefile
index 96e27a053fb4..112e0137c1fd 100644
--- a/x11-fm/pcmanfm-qt/Makefile
+++ b/x11-fm/pcmanfm-qt/Makefile
@@ -6,7 +6,7 @@ PORTVERSION=	0.11.3
 CATEGORIES=	x11-fm
 MASTER_SITES=	LXQT/${PORTNAME}
 
-MAINTAINER=	olivierd@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	LXQt file manager
 
 LICENSE=	GPLv2
diff --git a/x11-fm/pcmanfmqt-l10n/Makefile b/x11-fm/pcmanfmqt-l10n/Makefile
index a267ca953179..ab30136a8c4a 100644
--- a/x11-fm/pcmanfmqt-l10n/Makefile
+++ b/x11-fm/pcmanfmqt-l10n/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	x11-fm
 MASTER_SITES=	LXQT/lxqt-l10n
 DISTNAME=	lxqt-l10n-${DISTVERSION}
 
-MAINTAINER=	olivierd@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Translations of pcmanfm-qt
 
 LICENSE=	LGPL21+
diff --git a/x11-themes/adwaita-common/Makefile b/x11-themes/adwaita-common/Makefile
index b557024768d1..43fbe16ab13b 100644
--- a/x11-themes/adwaita-common/Makefile
+++ b/x11-themes/adwaita-common/Makefile
@@ -6,7 +6,7 @@ PORTVERSION=	0.98
 CATEGORIES=	x11-themes
 PKGNAMESUFFIX=	-common
 
-MAINTAINER=	olivierd@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Adwaita theme for Qt applications
 
 LICENSE=	GPLv2 LGPL20
diff --git a/x11-themes/adwaita-qt4/Makefile b/x11-themes/adwaita-qt4/Makefile
index 40571a719dbd..e0791d0dec80 100644
--- a/x11-themes/adwaita-qt4/Makefile
+++ b/x11-themes/adwaita-qt4/Makefile
@@ -6,7 +6,7 @@ PORTVERSION=	0.98
 CATEGORIES=	x11-themes
 PKGNAMESUFFIX=	-qt4
 
-MAINTAINER=	olivierd@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Adwaita theme for Qt4 applications
 
 LICENSE=	GPLv2 LGPL20
diff --git a/x11-themes/adwaita-qt5/Makefile b/x11-themes/adwaita-qt5/Makefile
index 1c04c94b4cd0..de569b555336 100644
--- a/x11-themes/adwaita-qt5/Makefile
+++ b/x11-themes/adwaita-qt5/Makefile
@@ -6,7 +6,7 @@ PORTVERSION=	0.98
 CATEGORIES=	x11-themes
 PKGNAMESUFFIX=	-qt5
 
-MAINTAINER=	olivierd@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Adwaita theme for Qt5 applications
 
 LICENSE=	GPLv2 LGPL20
diff --git a/x11-themes/clearlooks-phenix-theme/Makefile b/x11-themes/clearlooks-phenix-theme/Makefile
index 8959b87f7dee..3e40487e58fd 100644
--- a/x11-themes/clearlooks-phenix-theme/Makefile
+++ b/x11-themes/clearlooks-phenix-theme/Makefile
@@ -6,7 +6,7 @@ PORTVERSION=	7.0.1
 CATEGORIES=	x11-themes xfce
 PKGNAMESUFFIX=	-theme
 
-MAINTAINER=	olivierd@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Gtk3 port of Clearlooks theme for the Xfce Desktop
 
 LICENSE=	GPLv3
diff --git a/x11-themes/greybird-theme/Makefile b/x11-themes/greybird-theme/Makefile
index 231412012ac4..9895f53878fc 100644
--- a/x11-themes/greybird-theme/Makefile
+++ b/x11-themes/greybird-theme/Makefile
@@ -7,7 +7,7 @@ DISTVERSIONPREFIX=	v
 CATEGORIES=	x11-themes xfce
 PKGNAMESUFFIX=	-theme
 
-MAINTAINER=	olivierd@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Gtk and xfwm4 themes for the Xfce Desktop
 
 LICENSE=	GPLv2 CC-BY-SA-3.0
diff --git a/x11-themes/gtk3-unico-engine/Makefile b/x11-themes/gtk3-unico-engine/Makefile
index 149f4f5b8072..88c8bf15ce6f 100644
--- a/x11-themes/gtk3-unico-engine/Makefile
+++ b/x11-themes/gtk3-unico-engine/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	https://launchpadlibrarian.net/98881788/ \
 PKGNAMEPREFIX=	gtk3-
 PKGNAMESUFFIX=	-engine
 
-MAINTAINER=	olivierd@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Gtk+ 3.0 engine
 
 LICENSE=	LGPL3
diff --git a/x11-themes/numix-theme/Makefile b/x11-themes/numix-theme/Makefile
index 752591a4abb3..7753811cb3e9 100644
--- a/x11-themes/numix-theme/Makefile
+++ b/x11-themes/numix-theme/Makefile
@@ -6,7 +6,7 @@ PORTVERSION=	2.6.6
 CATEGORIES=	x11-themes xfce
 PKGNAMESUFFIX=	-theme
 
-MAINTAINER=	olivierd@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Gtk flat themes
 
 LICENSE=	GPLv3
diff --git a/x11-themes/plank-theme-moka/Makefile b/x11-themes/plank-theme-moka/Makefile
index b1312e0d14bc..e819c23a40ad 100644
--- a/x11-themes/plank-theme-moka/Makefile
+++ b/x11-themes/plank-theme-moka/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	x11-themes
 MASTER_SITES=	http://mokaproject.com/packages/zip/
 DISTNAME=	${PORTNAME}
 
-MAINTAINER=	olivierd@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Moka Plank theme
 
 LICENSE=	GPLv3
diff --git a/x11-toolkits/granite/Makefile b/x11-toolkits/granite/Makefile
index d7651bac019c..2a292b6c6c70 100644
--- a/x11-toolkits/granite/Makefile
+++ b/x11-toolkits/granite/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	x11-toolkits
 MASTER_SITES=	https://launchpadlibrarian.net/277504431/ \
 	https://launchpad.net/${PORTNAME}/0.4/loki-beta2/+download/
 
-MAINTAINER=	olivierd@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Extensions of GTK+3 toolkit
 
 LICENSE=	LGPL3
diff --git a/x11-wm/lxappearance-obconf/Makefile b/x11-wm/lxappearance-obconf/Makefile
index a2ec898f211a..92583ffabfa7 100644
--- a/x11-wm/lxappearance-obconf/Makefile
+++ b/x11-wm/lxappearance-obconf/Makefile
@@ -6,7 +6,7 @@ PORTVERSION=	0.2.3
 CATEGORIES=	x11-wm
 MASTER_SITES=	SF/lxde/LXAppearance%20Obconf/
 
-MAINTAINER=	olivierd@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	LXAppearance ObConf plugin
 
 LICENSE=	GPLv2
diff --git a/x11-wm/plank/Makefile b/x11-wm/plank/Makefile
index f334024a3f4e..cf089baf08a4 100644
--- a/x11-wm/plank/Makefile
+++ b/x11-wm/plank/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	x11-wm
 MASTER_SITES=	https://launchpadlibrarian.net/296808043/ \
 	https://launchpad.net/${PORTNAME}/1.0/${PORTVERSION}/+download/
 
-MAINTAINER=	olivierd@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Elegant, simple, and clean dock
 
 LICENSE=	GPLv3
diff --git a/x11/libfm-extra/Makefile b/x11/libfm-extra/Makefile
index d89fdc36fb12..0e3d0556ef9a 100644
--- a/x11/libfm-extra/Makefile
+++ b/x11/libfm-extra/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	libfm
 PKGNAMESUFFIX=	-extra
 
-MAINTAINER=	olivierd@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	LibFM-Extra library
 
 LICENSE=	LGPL21
diff --git a/x11/libfm-qt/Makefile b/x11/libfm-qt/Makefile
index 7de1f7819500..c59a2af30ba2 100644
--- a/x11/libfm-qt/Makefile
+++ b/x11/libfm-qt/Makefile
@@ -6,7 +6,7 @@ PORTVERSION=	0.11.2
 CATEGORIES=	x11
 MASTER_SITES=	LXQT/${PORTNAME}
 
-MAINTAINER=	olivierd@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Qt port of libfm
 
 LICENSE=	LGPL21+
diff --git a/x11/libfm/Makefile b/x11/libfm/Makefile
index 6edb5c64c94d..a76e8b864e57 100644
--- a/x11/libfm/Makefile
+++ b/x11/libfm/Makefile
@@ -6,7 +6,7 @@ PORTVERSION=	1.2.5
 CATEGORIES=	x11
 MASTER_SITES=	SF/pcmanfm/PCManFM%20%2B%20Libfm%20%28tarball%20release%29/LibFM/
 
-MAINTAINER=	olivierd@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT?=	Core library of PCManFM file manager
 
 LICENSE=	LGPL21
diff --git a/x11/libfmqt-l10n/Makefile b/x11/libfmqt-l10n/Makefile
index 41d8353d6cbe..e44459a9a9f4 100644
--- a/x11/libfmqt-l10n/Makefile
+++ b/x11/libfmqt-l10n/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	x11
 MASTER_SITES=	LXQT/lxqt-l10n
 DISTNAME=	lxqt-l10n-${DISTVERSION}
 
-MAINTAINER=	olivierd@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Translations of libfm-qt
 
 LICENSE=	LGPL21+
diff --git a/x11/lxhotkey/Makefile b/x11/lxhotkey/Makefile
index c2245c11d07a..dcfa21a403ca 100644
--- a/x11/lxhotkey/Makefile
+++ b/x11/lxhotkey/Makefile
@@ -6,7 +6,7 @@ PORTVERSION=	0.1.0
 CATEGORIES=	x11
 MASTER_SITES=	SF/lxde/LXHotkey/
 
-MAINTAINER=	olivierd@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Keyboard shortcuts settings
 
 LICENSE=	GPLv2
diff --git a/x11/lxqt-l10n/Makefile b/x11/lxqt-l10n/Makefile
index 5a114a223e1f..413d6e317eff 100644
--- a/x11/lxqt-l10n/Makefile
+++ b/x11/lxqt-l10n/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	lxqt-l10n
 PORTVERSION=	0.11.2
 CATEGORIES=	x11
 
-MAINTAINER=	olivierd@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Translations of LXQt components
 
 LICENSE=	LGPL21+
diff --git a/x11/menu-cache/Makefile b/x11/menu-cache/Makefile
index c10eb286f9ac..e0fa393c8ef8 100644
--- a/x11/menu-cache/Makefile
+++ b/x11/menu-cache/Makefile
@@ -6,7 +6,7 @@ PORTVERSION=	1.0.2
 CATEGORIES=	x11
 MASTER_SITES=	SF/lxde/${PORTNAME}/${PORTVERSION:R}/
 
-MAINTAINER=	olivierd@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Library used to read freedesktop.org menus
 
 LICENSE=	LGPL21+