Reset maintainership to ports@ after ~4 months without any response to any

PR.

Thanks for contributing.

Since the acroread7 port is a somewhat important port for our users, I
will hand it over to emulation@ if no _active_ *committer* takes it
before the ports freeze.

While I'm here:
 - fix a little nit in the csound port (I think the intention was to
   create no backup file instead of creating one with a "-e" extension)
 - set ARCH to i386 in the amd64 case for the acroread7 port. This
   is a work-around to be able to install everything when a dependency
   is not already installed (ARCH is read-only in sub-makes, so the
   dependencies can't change it). This should be removed when the
   dependencies are fixed or converted to use bsd.linux-rpm.mk. [1]

Not objected to by:	portmgr (explicit: krion; silence: rest)
Maintainer timeout:	~4 months
Submitted by:		Sangwoo Shim <sangwoos@gmail.com> [1]
PR:			87985 [1]

105 files changed, 114 insertions, 107 deletions

diff --git a/astro/celestia/Makefile b/astro/celestia/Makefile
index 22b78697a9d4..c8d132d84c9a 100644
--- a/astro/celestia/Makefile
+++ b/astro/celestia/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=		astro
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	celestia
 
-MAINTAINER=		trevor@FreeBSD.org
+MAINTAINER=		ports@FreeBSD.org
 COMMENT=		Scriptable space flight simulator for X
 
 LIB_DEPENDS=		jpeg.9:${PORTSDIR}/graphics/jpeg \
diff --git a/astro/openuniverse/Makefile b/astro/openuniverse/Makefile
index fbb3ec592260..58a63b772d43 100644
--- a/astro/openuniverse/Makefile
+++ b/astro/openuniverse/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	openuniverse
 DISTNAME=	${PORTNAME}-1.0beta3
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	OpenGL Solar System simulator for X Window System
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
diff --git a/astro/rmap/Makefile b/astro/rmap/Makefile
index e6713556c70b..2fa6f4a3728a 100644
--- a/astro/rmap/Makefile
+++ b/astro/rmap/Makefile
@@ -11,7 +11,7 @@ PORTREVISION=	6
 CATEGORIES=	astro
 MASTER_SITES=	http://www.reza.net/rmap/
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Generates images of the Earth centered at a particular location
 
 LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd
diff --git a/audio/aumix/Makefile b/audio/aumix/Makefile
index 43b1950b5e52..4cef85118fa4 100644
--- a/audio/aumix/Makefile
+++ b/audio/aumix/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://jpj.net/~trevor/aumix/old/
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Audio mixer for X11, terminal, or command line
 
 USE_BZIP2=	yes
diff --git a/audio/autozen/Makefile b/audio/autozen/Makefile
index e79c7129741e..d0b711a73b83 100644
--- a/audio/autozen/Makefile
+++ b/audio/autozen/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	audio
 MASTER_SITES=	http://www.linuxlabs.com/software/download/
 DISTNAME=	AutoZen-${PORTVERSION}
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Adjust brain waves with sound
 
 WRKSRC=		${WRKDIR}/AutoZen-${PORTVERSION}
diff --git a/audio/csound-manual/Makefile b/audio/csound-manual/Makefile
index 379786276cd0..47603874aa6d 100644
--- a/audio/csound-manual/Makefile
+++ b/audio/csound-manual/Makefile
@@ -16,7 +16,7 @@ DISTFILES=	manual-docbook-${PORTVERSION}.tar.gz \
 		manual-text-${PORTVERSION}.tar.gz
 DIST_SUBDIR=	csound
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Manuals for Csound
 
 RUN_DEPENDS=	csound:${PORTSDIR}/audio/csound
diff --git a/audio/csound/Makefile b/audio/csound/Makefile
index 5034ac255f8b..d8e9877b754e 100644
--- a/audio/csound/Makefile
+++ b/audio/csound/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	ftp://sunsite.univie.ac.at/pub/sound/csound/newest/ \
 DISTNAME=	Csound${PORTVERSION}
 DIST_SUBDIR=	csound
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Sound synthesizer
 
 LIB_DEPENDS=	tcl84:${PORTSDIR}/lang/tcl84 \
@@ -52,7 +52,7 @@ post-build:
 	${ECHO_CMD} "thoroughly reviewed by the FreeBSD maintainer." >> ${PKGMESSAGE}
 
 post-patch:
-	@${REINPLACE_CMD} -i -e "s:/usr/local/lib:${DATADIR}:g" ${WRKSRC}/getstring.c
+	@${REINPLACE_CMD} -i "" -e "s:/usr/local/lib:${DATADIR}:g" ${WRKSRC}/getstring.c
 	@${FIND} ${WRKSRC} -type f -exec \
 		${REINPLACE_CMD} -i -e 's:<malloc.h>:<stdlib.h>:g' {} \;
 
diff --git a/audio/denemo/Makefile b/audio/denemo/Makefile
index d2f624a848ee..a182dba5b521 100644
--- a/audio/denemo/Makefile
+++ b/audio/denemo/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Graphical score editor
 
 LIB_DEPENDS=	xml.5:${PORTSDIR}/textproc/libxml
diff --git a/audio/festdoc/Makefile b/audio/festdoc/Makefile
index 919302abde08..87c51bba8951 100644
--- a/audio/festdoc/Makefile
+++ b/audio/festdoc/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	${MASTER_SITE_FESTIVAL}
 MASTER_SITE_SUBDIR=	1.4.1
 DIST_SUBDIR=	festival
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Documentation for Festival
 
 NO_BUILD=	yes
diff --git a/audio/festival+OGI/Makefile b/audio/festival+OGI/Makefile
index 85736229ec96..8e5f9c4b303b 100644
--- a/audio/festival+OGI/Makefile
+++ b/audio/festival+OGI/Makefile
@@ -19,7 +19,7 @@ DISTFILES=	festival-${PORTVERSION}.tar.gz \
 PATCH_SITES=	${MASTER_SITES}
 PATCHFILES=	OGIfestpatch-1.4.1.2.tar.gz
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Text-to-speech system with OGI residual LPC synthesizer
 
 LIB_DEPENDS=	audio.2:${PORTSDIR}/audio/nas \
diff --git a/audio/festival/Makefile b/audio/festival/Makefile
index ccfd92cd2ae6..2a93daf87ca7 100644
--- a/audio/festival/Makefile
+++ b/audio/festival/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	${PORTVERSION}
 DISTFILES=	${DISTNAME}-beta.tar.gz \
 		speech_tools-1.2.95-beta.tar.gz
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Multi-lingual speech synthesis system
 
 LIB_DEPENDS=	audio.2:${PORTSDIR}/audio/nas \
diff --git a/audio/festlex-cmu/Makefile b/audio/festlex-cmu/Makefile
index 0b254ada480b..2558d6d07b48 100644
--- a/audio/festlex-cmu/Makefile
+++ b/audio/festlex-cmu/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	${PORTVERSION}
 DISTNAME=	festlex_CMU
 DIST_SUBDIR=	festival
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	CMU American English pronunciation dictionary for Festival
 
 RUN_DEPENDS=	festival:${PORTSDIR}/audio/festival
diff --git a/audio/festlex-oald/Makefile b/audio/festlex-oald/Makefile
index bdf0433c786f..ca9d43a928a4 100644
--- a/audio/festlex-oald/Makefile
+++ b/audio/festlex-oald/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	${PORTVERSION}
 DISTNAME=	festlex_OALD
 DIST_SUBDIR=	festival
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Oxford Advanced Learner's pronunciation dictionary for Festival
 
 RUN_DEPENDS=	festival:${PORTSDIR}/audio/festival
diff --git a/audio/festlex-ogi/Makefile b/audio/festlex-ogi/Makefile
index f9d37f7c9862..7250d3d28b87 100644
--- a/audio/festlex-ogi/Makefile
+++ b/audio/festlex-ogi/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	${MASTER_SITE_FESTIVAL_OGI}
 DISTNAME=	OGIlexicon-2.0
 DIST_SUBDIR=	festival
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Composite pronunciation dictionary from ogi.edu for Festival
 
 RUN_DEPENDS=	festival:${.CURDIR}/../festival \
diff --git a/audio/festlex-poslex/Makefile b/audio/festlex-poslex/Makefile
index 8a9939a8300b..8f53897d02e4 100644
--- a/audio/festlex-poslex/Makefile
+++ b/audio/festlex-poslex/Makefile
@@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR=	${PORTVERSION}
 DISTNAME=	festlex_POSLEX
 DIST_SUBDIR=	festival
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	English lexicon for Festival
 
 RUN_DEPENDS=	festival:${PORTSDIR}/audio/festival
diff --git a/audio/festogi-spanish/Makefile b/audio/festogi-spanish/Makefile
index fa2e6001f634..55087dab2473 100644
--- a/audio/festogi-spanish/Makefile
+++ b/audio/festogi-spanish/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	${MASTER_SITE_NETBSD}
 DISTNAME=	OGIspanish-${PORTVERSION}
 DIST_SUBDIR=	festival
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Mexican Spanish support for Festival
 
 RUN_DEPENDS=	\
diff --git a/audio/festvox-abc/Makefile b/audio/festvox-abc/Makefile
index 714ff6746a61..254538528ecc 100644
--- a/audio/festvox-abc/Makefile
+++ b/audio/festvox-abc/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	${MASTER_SITE_FESTIVAL_OGI}
 DISTNAME=	voice_abc_di-2.0
 DIST_SUBDIR=	festival
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Mexican Spanish male voice for Festival speech synthesis system
 
 RUN_DEPENDS=	\
diff --git a/audio/festvox-aec/Makefile b/audio/festvox-aec/Makefile
index 102e922f27f3..68125532e5fc 100644
--- a/audio/festvox-aec/Makefile
+++ b/audio/festvox-aec/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	${MASTER_SITE_FESTIVAL_OGI}
 DISTNAME=	voice_aec_di-2.0
 DIST_SUBDIR=	festival
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	American English male voice for Festival speech synthesis system
 
 RUN_DEPENDS=	festival:${PORTSDIR}/audio/festival \
diff --git a/audio/festvox-don/Makefile b/audio/festvox-don/Makefile
index f633839c4b4f..a751fd1189a0 100644
--- a/audio/festvox-don/Makefile
+++ b/audio/festvox-don/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	1.4.1
 DISTNAME=	festvox_don
 DIST_SUBDIR=	festival
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	British English male voice for Festival speech synthesis system
 
 RUN_DEPENDS=	\
diff --git a/audio/festvox-el11/Makefile b/audio/festvox-el11/Makefile
index ab27f6708010..14dbfe6aece4 100644
--- a/audio/festvox-el11/Makefile
+++ b/audio/festvox-el11/Makefile
@@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR=	1.4.1
 DISTNAME=	festvox_ellpc11k
 DIST_SUBDIR=	festival
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Castilian Spanish male voice for Festival
 
 RUN_DEPENDS=	festival:${PORTSDIR}/audio/festival
diff --git a/audio/festvox-hvs/Makefile b/audio/festvox-hvs/Makefile
index 2d14fa7d160d..f923c267584d 100644
--- a/audio/festvox-hvs/Makefile
+++ b/audio/festvox-hvs/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	${MASTER_SITE_FESTIVAL_OGI}
 DISTNAME=	voice_hvs_di-2.0
 DIST_SUBDIR=	festival
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Mexican Spanish female voice for Festival
 
 RESTRICTED=	no-commercial-use
diff --git a/audio/festvox-jph/Makefile b/audio/festvox-jph/Makefile
index 4d24722a452b..6b4bac96fd4f 100644
--- a/audio/festvox-jph/Makefile
+++ b/audio/festvox-jph/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	${MASTER_SITE_FESTIVAL_OGI}
 DISTNAME=	voice_jph_di-2.0
 DIST_SUBDIR=	festival
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	American English male voice for Festival
 
 RESTRICTED=	no-commercial-use
diff --git a/audio/festvox-kal16/Makefile b/audio/festvox-kal16/Makefile
index 767a2140d6fb..cb79bbd7d214 100644
--- a/audio/festvox-kal16/Makefile
+++ b/audio/festvox-kal16/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	1.4.1
 DISTNAME=	festvox_kallpc16k
 DIST_SUBDIR=	festival
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	American English male voice, sampled at 16 kHz, for Festival
 
 RUN_DEPENDS=	\
diff --git a/audio/festvox-kal8/Makefile b/audio/festvox-kal8/Makefile
index a17a156e54e1..5748d247745d 100644
--- a/audio/festvox-kal8/Makefile
+++ b/audio/festvox-kal8/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	1.4.1
 DISTNAME=	festvox_kallpc8k
 DIST_SUBDIR=	festival
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	American English male voice, sampled at 8 kHz, for Festival
 
 RUN_DEPENDS=	\
diff --git a/audio/festvox-ked16/Makefile b/audio/festvox-ked16/Makefile
index 5bf6b5fa7955..5f0b7e78b4fb 100644
--- a/audio/festvox-ked16/Makefile
+++ b/audio/festvox-ked16/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	1.4.1
 DISTNAME=	festvox_kedlpc16k
 DIST_SUBDIR=	festival
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	American English male voice, sampled at 16 kHz, for Festival
 
 RUN_DEPENDS=	\
diff --git a/audio/festvox-ked8/Makefile b/audio/festvox-ked8/Makefile
index 282fa0284b5e..ed280b1c5435 100644
--- a/audio/festvox-ked8/Makefile
+++ b/audio/festvox-ked8/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	1.4.1
 DISTNAME=	festvox_kedlpc8k
 DIST_SUBDIR=	festival
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	American English male voice, sampled at 8 kHz, for Festival
 
 RUN_DEPENDS=	\
diff --git a/audio/festvox-mwm/Makefile b/audio/festvox-mwm/Makefile
index 79c50b64c479..d20d383b4b5e 100644
--- a/audio/festvox-mwm/Makefile
+++ b/audio/festvox-mwm/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	${MASTER_SITE_FESTIVAL_OGI}
 DISTNAME=	voice_mwm_di-2.0
 DIST_SUBDIR=	festival
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	American English male voice for Festival
 
 RESTRICTED=	no-commercial-use
diff --git a/audio/festvox-ogirab/Makefile b/audio/festvox-ogirab/Makefile
index b6404f9d6672..2454e65f54bd 100644
--- a/audio/festvox-ogirab/Makefile
+++ b/audio/festvox-ogirab/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	${MASTER_SITE_FESTIVAL_OGI}
 DISTNAME=	voice_ogirab_di-2.0
 DIST_SUBDIR=	festival
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=British English male voice for Festival (non-commercial use only)
 
 RUN_DEPENDS=	\
diff --git a/audio/festvox-rab16/Makefile b/audio/festvox-rab16/Makefile
index c74d66a9ff33..3eb12cf0908c 100644
--- a/audio/festvox-rab16/Makefile
+++ b/audio/festvox-rab16/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	${PORTVERSION}
 DISTNAME=	festvox_rablpc16k
 DIST_SUBDIR=	festival
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	16 kHz British English male voice for Festival
 
 RUN_DEPENDS=	\
diff --git a/audio/festvox-rab8/Makefile b/audio/festvox-rab8/Makefile
index 256b7cd8d211..7260a3e4aa89 100644
--- a/audio/festvox-rab8/Makefile
+++ b/audio/festvox-rab8/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	${PORTVERSION}
 DISTNAME=	festvox_rablpc8k
 DIST_SUBDIR=	festival
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	British English male voice, sampled at 8 kHz, for Festival
 
 RUN_DEPENDS=	\
diff --git a/audio/festvox-tll/Makefile b/audio/festvox-tll/Makefile
index 3cd7aee51061..e21aac691bf7 100644
--- a/audio/festvox-tll/Makefile
+++ b/audio/festvox-tll/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	${MASTER_SITE_FESTIVAL_OGI}
 DISTNAME=	voice_tll_di-2.0
 DIST_SUBDIR=	festival
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	American English female voice for Festival (no commercial use)
 
 RUN_DEPENDS=	\
diff --git a/audio/mbrola/Makefile b/audio/mbrola/Makefile
index 14d65bd160b5..74dc4ba7e16c 100644
--- a/audio/mbrola/Makefile
+++ b/audio/mbrola/Makefile
@@ -13,7 +13,7 @@ DISTNAME=	mbr301h
 EXTRACT_SUFX=	.zip
 DIST_SUBDIR?=	mbrola-freebsd
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	MBROLA voice synthesizer
 
 .include <bsd.port.pre.mk>
diff --git a/audio/mbrolavox/Makefile b/audio/mbrolavox/Makefile
index 8c5ff55ff190..f0fe5b58fc77 100644
--- a/audio/mbrolavox/Makefile
+++ b/audio/mbrolavox/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	mbrolavox
 PORTVERSION=	3.0.1
 CATEGORIES=	audio accessibility
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Voices for MBROLA voice synthesizer
 
 VOICESCONF=	${.CURDIR}/voices.conf
diff --git a/audio/mutemix/Makefile b/audio/mutemix/Makefile
index 8d1c56922734..0d955dbd4dab 100644
--- a/audio/mutemix/Makefile
+++ b/audio/mutemix/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	audio
 MASTER_SITES=	http://stud.fbi.fh-darmstadt.de/~koenig/pub/
 EXTRACT_SUFX=	.py
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Adjusts a mixer
 
 DEPRECATED=	"mastersite disappeared, no longer maintained by author"
diff --git a/audio/nogger/Makefile b/audio/nogger/Makefile
index 99325c11d89a..182cd0bb58a7 100644
--- a/audio/nogger/Makefile
+++ b/audio/nogger/Makefile
@@ -11,7 +11,7 @@ PORTREVISION=	6
 CATEGORIES=	audio
 MASTER_SITES=	http://www.efd.lth.se/~d00jkr/nogger/
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	No-frills, GTK-based Ogg Vorbis player
 
 LIB_DEPENDS=	vorbis.3:${PORTSDIR}/audio/libvorbis
diff --git a/audio/opmixer/Makefile b/audio/opmixer/Makefile
index 710f482e0199..b57ab0db176c 100644
--- a/audio/opmixer/Makefile
+++ b/audio/opmixer/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	optronic
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Adjusts a mixer
 
 LIB_DEPENDS=	gtkmm.2:${PORTSDIR}/x11-toolkits/gtk--
diff --git a/audio/pd/Makefile b/audio/pd/Makefile
index 773a2ebca6f5..9cde9d4cb13e 100644
--- a/audio/pd/Makefile
+++ b/audio/pd/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	audio
 MASTER_SITES=	http://www-crca.ucsd.edu/~msp/Software/
 DISTNAME=	pd-0.37-1test1.src
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Pure Data, a MIDI-capable real-time audio processor/synthesizer
 
 LIB_DEPENDS=	tcl84:${PORTSDIR}/lang/tcl84 \
diff --git a/audio/snd/Makefile b/audio/snd/Makefile
index 35f93565f1cf..945bede2b5b4 100644
--- a/audio/snd/Makefile
+++ b/audio/snd/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=		audio
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=		trevor@FreeBSD.org
+MAINTAINER=		ports@FreeBSD.org
 COMMENT=		Multitracking sound editor and utilities
 
 LIB_DEPENDS=		gsl.7:${PORTSDIR}/math/gsl
diff --git a/audio/sphinx/Makefile b/audio/sphinx/Makefile
index fa82ed8eb609..1c8570766cad 100644
--- a/audio/sphinx/Makefile
+++ b/audio/sphinx/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	cmusphinx
 DISTNAME=	sphinx2-0.4
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Speech recognition system
 
 DEST=		${WRKSRC}/src/libsphinx2/
diff --git a/audio/spiralloops/Makefile b/audio/spiralloops/Makefile
index b26bd3a6af90..61d2608c0f16 100644
--- a/audio/spiralloops/Makefile
+++ b/audio/spiralloops/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	audio
 MASTER_SITES=	http://www.pawfal.org/Software/SpiralLoops/dload/
 DISTNAME=	SpiralLoops-${PORTVERSION}
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Loop-based sampler
 
 LIB_DEPENDS=	fltk.1:${PORTSDIR}/x11-toolkits/fltk
diff --git a/audio/spiralsynth/Makefile b/audio/spiralsynth/Makefile
index 31d96c2907d1..f1915d30f236 100644
--- a/audio/spiralsynth/Makefile
+++ b/audio/spiralsynth/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	audio
 MASTER_SITES=	http://www.pawfal.org/Software/SpiralSynth/dload/
 DISTNAME=	SpiralSynth-${PORTVERSION}
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	MIDI-capable synthesizer for X
 
 LIB_DEPENDS=	fltk.1:${PORTSDIR}/x11-toolkits/fltk
diff --git a/audio/streamripper/Makefile b/audio/streamripper/Makefile
index 302d5dc559b2..91ad4c4a8d56 100644
--- a/audio/streamripper/Makefile
+++ b/audio/streamripper/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	streamripper
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Splits SHOUTcast stream into tracks
 
 LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv \
diff --git a/biology/xdrawchem/Makefile b/biology/xdrawchem/Makefile
index 5d046825dc16..5dea2843bb8b 100644
--- a/biology/xdrawchem/Makefile
+++ b/biology/xdrawchem/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	xdrawchem
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Chemical drawing program
 
 LIB_DEPENDS=	openbabel.1:${PORTSDIR}/science/openbabel
diff --git a/devel/bin86/Makefile b/devel/bin86/Makefile
index 19a5437850fa..e941d0ff4ffb 100644
--- a/devel/bin86/Makefile
+++ b/devel/bin86/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	0.16.16
 CATEGORIES=	devel
 MASTER_SITES=	http://www.cix.co.uk/~mayday/dev86/
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	16-bit assembler and loader (conflicts with devel/bcc)
 
 BINS=		as/as86 ld/ld86 ld/objchop ld/catimage ld/objdump86
diff --git a/devel/cvsgraph/Makefile b/devel/cvsgraph/Makefile
index 18dd97b45f2b..4d4ea319d2cd 100644
--- a/devel/cvsgraph/Makefile
+++ b/devel/cvsgraph/Makefile
@@ -11,7 +11,7 @@ PORTREVISION=	0
 CATEGORIES=	devel graphics
 MASTER_SITES=	http://www.akhphd.au.dk/~bertho/cvsgraph/release/
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Graph the life story of a file under CVS or RCS
 
 LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd
diff --git a/devel/maketool/Makefile b/devel/maketool/Makefile
index 79fe5c4ebbad..d6c0f34fca61 100644
--- a/devel/maketool/Makefile
+++ b/devel/maketool/Makefile
@@ -11,7 +11,7 @@ PORTREVISION=	5
 CATEGORIES=	devel
 MASTER_SITES=	http://www.alphalink.com.au/~gnb/maketool/downloads/
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GUI interface for make or gmake
 
 LIB_DEPENDS=	fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \
diff --git a/devel/ncurses-devel/Makefile b/devel/ncurses-devel/Makefile
index 087c25ec6470..d898289c82f9 100644
--- a/devel/ncurses-devel/Makefile
+++ b/devel/ncurses-devel/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	ncurses
 
-MAINTAINER=		trevor@FreeBSD.org
+MAINTAINER=		ports@FreeBSD.org
 COMMENT=		Library for terminal-independent, full-screen output
 
 LIB_DEPENDS=		utf-8:${PORTSDIR}/converters/libutf-8
diff --git a/devel/ncurses/Makefile b/devel/ncurses/Makefile
index 087c25ec6470..d898289c82f9 100644
--- a/devel/ncurses/Makefile
+++ b/devel/ncurses/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	ncurses
 
-MAINTAINER=		trevor@FreeBSD.org
+MAINTAINER=		ports@FreeBSD.org
 COMMENT=		Library for terminal-independent, full-screen output
 
 LIB_DEPENDS=		utf-8:${PORTSDIR}/converters/libutf-8
diff --git a/devel/p5-Class-MethodMaker/Makefile b/devel/p5-Class-MethodMaker/Makefile
index 926415953b6f..e9a264e0210b 100644
--- a/devel/p5-Class-MethodMaker/Makefile
+++ b/devel/p5-Class-MethodMaker/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=		${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Class
 PKGNAMEPREFIX=		p5-
 
-MAINTAINER=		trevor@FreeBSD.org
+MAINTAINER=		ports@FreeBSD.org
 COMMENT=		Perl module for creating generic methods
 
 BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/File/Spec/Functions.pm:${PORTSDIR}/devel/p5-PathTools
diff --git a/devel/sfio/Makefile b/devel/sfio/Makefile
index d1d7aa689862..55c828092588 100644
--- a/devel/sfio/Makefile
+++ b/devel/sfio/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	${MASTER_SITE_NETBSD}
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 EXTRACT_SUFX=	.src.unix.cpio
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The Safe/Fast I/O Library
 
 EXTRACT_CMD=	${CPIO}
diff --git a/emulators/linux_base-debian/Makefile b/emulators/linux_base-debian/Makefile
index 8b6655b4b0db..c8b5f83b066e 100644
--- a/emulators/linux_base-debian/Makefile
+++ b/emulators/linux_base-debian/Makefile
@@ -16,7 +16,7 @@ PKGNAMESUFFIX=	-debian
 DISTFILES=	basedebs.tar:base util-linux-locales_2.11n-7_all.deb:util
 EXTRACT_ONLY=	basedebs.tar
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Debian base set for the Linux mode
 
 CONFLICTS=	linux_base-7* linux_base-8* linux_base-gentoo* \
diff --git a/emulators/linux_base-gentoo-stage1/Makefile b/emulators/linux_base-gentoo-stage1/Makefile
index f458f747d5e0..66b7796a03e4 100644
--- a/emulators/linux_base-gentoo-stage1/Makefile
+++ b/emulators/linux_base-gentoo-stage1/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	emulators linux
 MASTER_SITES=	${MASTER_SITE_GENTOO}
 EXTRACT_ONLY=
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Files from Gentoo distribution, for Linux compatibility
 
 RESTRICTED=	"binaries licensed under GNU GPL without accompanying source"
diff --git a/emulators/linux_base-rh-9/Makefile b/emulators/linux_base-rh-9/Makefile
index 3f91f28387f6..95b88f57cb04 100644
--- a/emulators/linux_base-rh-9/Makefile
+++ b/emulators/linux_base-rh-9/Makefile
@@ -49,7 +49,7 @@ DISTFILES=	glibc-2.3.2-27.9.7.i386.rpm:new \
 		libgcc-3.2.2-5.i386.rpm \
 		freetype-2.1.3-6.i386.rpm
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Base set of packages needed in Linux mode (only for i386)
 
 EXTRACT_DEPENDS=	rpm:${PORTSDIR}/archivers/rpm
diff --git a/emulators/linux_base-src-rh-7.3/Makefile b/emulators/linux_base-src-rh-7.3/Makefile
index 4a182aeb420c..b5c265138d7a 100644
--- a/emulators/linux_base-src-rh-7.3/Makefile
+++ b/emulators/linux_base-src-rh-7.3/Makefile
@@ -45,7 +45,7 @@ DISTFILES=		\
 	rpm-4.0.4-7x.18.src.rpm
 EXTRACT_ONLY=
 
-MAINTAINER=		trevor@FreeBSD.org
+MAINTAINER=		ports@FreeBSD.org
 COMMENT=		GNU GPL sources to linux_base-rh-7.3, to satisfy licence
 
 RUN_DEPENDS=		${LINUXBASE}/usr/src:${PORTSDIR}/emulators/linux_base
diff --git a/emulators/linux_base-src-rh-8/Makefile b/emulators/linux_base-src-rh-8/Makefile
index 321ad298d4aa..30f1d8fa5efe 100644
--- a/emulators/linux_base-src-rh-8/Makefile
+++ b/emulators/linux_base-src-rh-8/Makefile
@@ -37,7 +37,7 @@ DISTFILES=		\
 	texinfo-4.2-5.src.rpm
 EXTRACT_ONLY=
 
-MAINTAINER=		trevor@FreeBSD.org
+MAINTAINER=		ports@FreeBSD.org
 COMMENT=		(L)GPL sources for linux_base-8, to comply with licences
 
 RUN_DEPENDS=		${LINUXBASE}/usr/src:${PORTSDIR}/emulators/linux_base-8
diff --git a/emulators/linux_base-suse-9.1/Makefile b/emulators/linux_base-suse-9.1/Makefile
index 20fb13529c4f..50b456164aaf 100644
--- a/emulators/linux_base-suse-9.1/Makefile
+++ b/emulators/linux_base-suse-9.1/Makefile
@@ -40,7 +40,7 @@ DISTFILES=	suse-release-9.1-0.i586.rpm \
 		termcap-2.0.8-876.i586.rpm \
 		freetype2-2.1.7-53.i586.rpm
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Basic packages for Linux mode from SUSE 9.1/i386
 
 EXTRACT_DEPENDS=	rpm:${PORTSDIR}/archivers/rpm
diff --git a/emulators/linux_base-suse-9.2/Makefile b/emulators/linux_base-suse-9.2/Makefile
index 4ff65c24d8ef..aec7428dbeec 100644
--- a/emulators/linux_base-suse-9.2/Makefile
+++ b/emulators/linux_base-suse-9.2/Makefile
@@ -42,7 +42,7 @@ DISTFILES=	\
 	libgcc-3.3.4-11.i586.rpm \
 	termcap-2.0.8-878.i586.rpm
 
-MAINTAINER=		trevor@FreeBSD.org
+MAINTAINER=		ports@FreeBSD.org
 COMMENT=		Basic packages for Linux mode from SUSE 9.2/i386
 
 EXTRACT_DEPENDS=	rpm:${PORTSDIR}/archivers/rpm
diff --git a/emulators/linux_base-suse-9.3/Makefile b/emulators/linux_base-suse-9.3/Makefile
index ba99b361e97c..4114503d147d 100644
--- a/emulators/linux_base-suse-9.3/Makefile
+++ b/emulators/linux_base-suse-9.3/Makefile
@@ -14,7 +14,7 @@ CATEGORIES=		emulators linux
 MASTER_SITES=		${MASTER_SITE_SUSE} ${MASTER_SITE_SUSE:S/$/:update/}
 MASTER_SITE_SUBDIR=	i386/9.3/suse/i586 i386/update/9.3/rpm/i586/:update
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Basic packages for Linux mode from SUSE 9.3/i386
 
 EXTRACT_DEPENDS=	rpm:${PORTSDIR}/archivers/rpm
diff --git a/emulators/linux_base/Makefile b/emulators/linux_base/Makefile
index 14a027d95f0a..7f7b765ccac4 100644
--- a/emulators/linux_base/Makefile
+++ b/emulators/linux_base/Makefile
@@ -44,7 +44,7 @@ DISTFILES=	\
 	zlib-1.1.3-25.7.i386.rpm \
 	XFree86-libs-4.3.0-78.EL.tj.i386.rpm:x11
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Basic packages for Linux mode from Red Hat 7.3/i386
 
 EXTRACT_DEPENDS=	rpm:${PORTSDIR}/archivers/rpm
diff --git a/emulators/linux_dist-gentoo-stage1/Makefile b/emulators/linux_dist-gentoo-stage1/Makefile
index f458f747d5e0..66b7796a03e4 100644
--- a/emulators/linux_dist-gentoo-stage1/Makefile
+++ b/emulators/linux_dist-gentoo-stage1/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	emulators linux
 MASTER_SITES=	${MASTER_SITE_GENTOO}
 EXTRACT_ONLY=
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Files from Gentoo distribution, for Linux compatibility
 
 RESTRICTED=	"binaries licensed under GNU GPL without accompanying source"
diff --git a/games/senso/Makefile b/games/senso/Makefile
index a9646e02e11d..4823c7c5c2f3 100644
--- a/games/senso/Makefile
+++ b/games/senso/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	games
 MASTER_SITES=	http://www.v-i-t.de/mirkos_hp/pub/
 EXTRACT_SUFX=	.py
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Game to challenge short-term memory
 
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter
diff --git a/graphics/qiv/Makefile b/graphics/qiv/Makefile
index e2f84bfc3236..eedd5dd41a72 100644
--- a/graphics/qiv/Makefile
+++ b/graphics/qiv/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	http://www.klografx.net/qiv/download/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Small, fast GDK/Imlib image viewer
 
 OPTIONS=	XINERAMA "use multiple monitors (XFree86 4 and X.org only)" off
diff --git a/mail/fetchyahoo/Makefile b/mail/fetchyahoo/Makefile
index 2a5206268744..a102282085ee 100644
--- a/mail/fetchyahoo/Makefile
+++ b/mail/fetchyahoo/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	2.9.0
 CATEGORIES=	mail
 MASTER_SITES=	http://fetchyahoo.sourceforge.net/
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Download e-mail from a Yahoo account to a Berkeley mailbox
 
 RUN_DEPENDS=	\
diff --git a/mail/xc-mail/Makefile b/mail/xc-mail/Makefile
index a5850155db3b..f47fb74237e8 100644
--- a/mail/xc-mail/Makefile
+++ b/mail/xc-mail/Makefile
@@ -13,7 +13,7 @@ CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	xcmail
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Mail client for X which supports POP and PGP
 
 LIB_DEPENDS=	Xclasses.1:${PORTSDIR}/x11-toolkits/xclasses
diff --git a/net-mgmt/p0f/Makefile b/net-mgmt/p0f/Makefile
index 09fe204b02a4..aec15c8bf3de 100644
--- a/net-mgmt/p0f/Makefile
+++ b/net-mgmt/p0f/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	net-mgmt
 MASTER_SITES=	http://lcamtuf.coredump.cx/p0f/
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Passive OS fingerprinting tool
 
 ALL_TARGET=	all p0fq tools
diff --git a/net/fspd/Makefile b/net/fspd/Makefile
index 6ff7f5aab00d..237840efbb1c 100644
--- a/net/fspd/Makefile
+++ b/net/fspd/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	fsp
 DISTNAME=	fsp-2.8.1b24
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	FSP daemon, clients and scanner
 
 CLIENTS=	fcatcmd fcdcmd fducmd ffindcmd fgetcmd fgrabcmd fhostcmd \
diff --git a/print/acroread7/Makefile b/print/acroread7/Makefile
index f7566dc1b20d..7dc57c9ac1d3 100644
--- a/print/acroread7/Makefile
+++ b/print/acroread7/Makefile
@@ -16,7 +16,7 @@ EXTRACT_SUFX=
 DIST_SUBDIR=	acroread
 EXTRACT_ONLY=
 
-MAINTAINER?=	trevor@FreeBSD.org
+MAINTAINER?=	ports@FreeBSD.org
 COMMENT?=	View, search and print PDF documents
 
 BUILD_DEPENDS=	rpm:${PORTSDIR}/archivers/rpm
@@ -32,6 +32,13 @@ PLIST=		${WRKDIR}/plist
 SUB_FILES=	acroread7
 SUB_LIST+=	INSTDIR=${INSTDIR}
 
+.include <bsd.port.pre.mk>
+
+.if (${ARCH} == "amd64")
+ARCH=          i386
+RPMFLAGS+=     --ignorearch
+.endif
+
 do-build:
 	@kldstat -v | ${GREP} -E 'linux(aout|elf)' >/dev/null ||\
 		{ ${ECHO_MSG} "Linux ABI compatibility must be enabled to install ${PORTNAME}-${PORTVERSION}"; \
@@ -56,4 +63,4 @@ do-install:
 	# disable the PPKLite plugin as it requires an LDAP share lib
 	${CHMOD} 0 ${PREFIX}/${INSTDIR}/usr/local/Adobe/Acrobat7.0/Reader/intellinux/plug_ins/PPKLite.api
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/security/l0phtcrack/Makefile b/security/l0phtcrack/Makefile
index 090d100543f1..34642cb203fa 100644
--- a/security/l0phtcrack/Makefile
+++ b/security/l0phtcrack/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://www.mavetju.org/download/adopted/ \
 DISTNAME=	lcsrc
 DIST_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Cracks SAMBA or Windows NT passwords
 
 DOCDIR=		share/doc/${PORTNAME}
diff --git a/security/mcrypt/Makefile b/security/mcrypt/Makefile
index fae910f8be1e..dfea6bf95232 100644
--- a/security/mcrypt/Makefile
+++ b/security/mcrypt/Makefile
@@ -17,7 +17,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		ftp://mcrypt.hellug.gr/pub/mcrypt/attic/
 MASTER_SITE_SUBDIR=	mcrypt
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Replacement for crypt(1)
 
 LIB_DEPENDS=	mcrypt.8:${PORTSDIR}/security/libmcrypt/ \
diff --git a/security/outguess/Makefile b/security/outguess/Makefile
index 62223fcc3a0a..be55fd1c4f19 100644
--- a/security/outguess/Makefile
+++ b/security/outguess/Makefile
@@ -18,7 +18,7 @@ MASTER_SITES=	http://www.outguess.org/ \
 		${MASTER_SITE_PACKETSTORM}
 MASTER_SITE_SUBDIR=	crypt/stego
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Steganographic tool
 
 DOCDIR=		share/doc/outguess
diff --git a/security/p5-GnuPG-Interface/Makefile b/security/p5-GnuPG-Interface/Makefile
index 2056b68d205b..157500adc479 100644
--- a/security/p5-GnuPG-Interface/Makefile
+++ b/security/p5-GnuPG-Interface/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	GnuPG/:cpan gnupg-interface/:sf
 PKGNAMEPREFIX=	p5-
 DISTFILES=		${DISTNAME}${EXTRACT_SUFX}:cpan,sf
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Perl module for interfacing with GnuPG
 
 BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Class/MethodMaker.pm:${PORTSDIR}/devel/p5-Class-MethodMaker
diff --git a/sysutils/rfstool/Makefile b/sysutils/rfstool/Makefile
index 8217398e8e35..3f50e1fcc788 100644
--- a/sysutils/rfstool/Makefile
+++ b/sysutils/rfstool/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_NETBSD}
 DISTNAME=	rfstool-0.14-source
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Read from a Reiser file system
 
 PLIST_FILES=	bin/rfstool
diff --git a/textproc/diffsplit/Makefile b/textproc/diffsplit/Makefile
index a3ca821f52c9..73f3453fb4e6 100644
--- a/textproc/diffsplit/Makefile
+++ b/textproc/diffsplit/Makefile
@@ -13,7 +13,7 @@ DISTNAME=	diffsplit
 EXTRACT_SUFX=
 EXTRACT_ONLY=
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Splits a unified diff into pieces which patch one file each
 
 NO_BUILD=	YES
diff --git a/textproc/diffstat/Makefile b/textproc/diffstat/Makefile
index 49683838bb6a..a931ecae2dbf 100644
--- a/textproc/diffstat/Makefile
+++ b/textproc/diffstat/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	textproc devel
 MASTER_SITES=	ftp://dickey.his.com/diffstat/
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Makes a histogram summarizing "diff" output
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/www/linux-beonex/Makefile b/www/linux-beonex/Makefile
index 98fe01d2fea7..dcf8029520b1 100644
--- a/www/linux-beonex/Makefile
+++ b/www/linux-beonex/Makefile
@@ -18,7 +18,7 @@ DISTNAME=	beonex-comm-${PORTVERSION}-stable-1-linux-i686
 PATCH_SITES=	${MASTER_SITE_LOCAL}
 PATCH_SITE_SUBDIR=trevor
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=Browser, HTML editor, mail and news client for use with Linux plugins
 
 RUN_DEPENDS=	\
diff --git a/www/linux-mozilla-devel/Makefile b/www/linux-mozilla-devel/Makefile
index 61896201fedb..44b10dc62548 100644
--- a/www/linux-mozilla-devel/Makefile
+++ b/www/linux-mozilla-devel/Makefile
@@ -17,7 +17,7 @@ PKGNAMEPREFIX=	linux-
 PKGNAMESUFFIX=	-devel
 DIST_SUBDIR=	linux-mozilla/${PORTVERSION}
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=Browser, HTML editor, MUA, news, and IRC client for Linux (unstable)
 
 RUN_DEPENDS=	${LINUXBASE}/usr/lib/libgtk-1.2.so.0:${PORTSDIR}/x11-toolkits/linux-gtk
diff --git a/www/linux-mozilla/Makefile b/www/linux-mozilla/Makefile
index ada9af957e86..ef5844f628a0 100644
--- a/www/linux-mozilla/Makefile
+++ b/www/linux-mozilla/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	mozilla/releases/mozilla${PORTVERSION}/linux-xpi
 PKGNAMEPREFIX=	linux-
 DIST_SUBDIR=	linux-mozilla/${PORTVERSION}
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=Browser, HTML editor, MUA and newsreader for use with Linux plugins
 
 RUN_DEPENDS=	${LINUXBASE}/usr/lib/libgtk-1.2.so.0:${PORTSDIR}/x11-toolkits/linux-gtk
diff --git a/x11-fm/gprename/Makefile b/x11-fm/gprename/Makefile
index efafed3985ba..e75b6548192b 100644
--- a/x11-fm/gprename/Makefile
+++ b/x11-fm/gprename/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	x11-fm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Perl script for renaming multiple files
 
 RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Gtk:${PORTSDIR}/x11-toolkits/p5-Gtk
diff --git a/x11-fm/workplace/Makefile b/x11-fm/workplace/Makefile
index a78b98549cd0..bb47c64dce56 100644
--- a/x11-fm/workplace/Makefile
+++ b/x11-fm/workplace/Makefile
@@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR=	trevor
 PATCH_SITES=	http://people.freebsd.org/~trevor/ports/
 PATCHFILES=	workplace-1.0.a3+tj1.diff.gz
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	File manager and launcher
 
 GNU_CONFIGURE=	yes
diff --git a/x11-fonts/sgifonts/Makefile b/x11-fonts/sgifonts/Makefile
index c6805c4e36b5..93b9256b62dc 100644
--- a/x11-fonts/sgifonts/Makefile
+++ b/x11-fonts/sgifonts/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	ftp://patches-europe.sgi.com/pub/linux/ProPack1.4/SRPMS/ \
 DISTNAME=	sgi-fonts-1.0-1.src
 EXTRACT_SUFX=	.rpm
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Fonts from the SGI ProPack 1.4 (originally for Linux)
 
 EXTRACT_DEPENDS=	rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio
diff --git a/x11-themes/sapphire-themes/Makefile b/x11-themes/sapphire-themes/Makefile
index b4718f9cfd27..df503a918f39 100644
--- a/x11-themes/sapphire-themes/Makefile
+++ b/x11-themes/sapphire-themes/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	x11-themes x11-wm
 MASTER_SITES=	http://jpj.net/~trevor/${PORTNAME}/
 EXTRACT_SUFX=	.tar
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Themes for sapphire
 
 RUN_DEPENDS=	xli:${PORTSDIR}/graphics/xli \
diff --git a/x11-toolkits/xclasses/Makefile b/x11-toolkits/xclasses/Makefile
index 6a962e70fb87..f5637cb19914 100644
--- a/x11-toolkits/xclasses/Makefile
+++ b/x11-toolkits/xclasses/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	xcmail
 DISTNAME=	Xclasses-public-${PORTVERSION}.src
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	C++ layout library for X
 
 INSTALLS_SHLIB=	yes
diff --git a/x11-wm/aewm/Makefile b/x11-wm/aewm/Makefile
index e657bbbb78fd..6fba3a78fcbb 100644
--- a/x11-wm/aewm/Makefile
+++ b/x11-wm/aewm/Makefile
@@ -11,7 +11,7 @@ PORTREVISION=	2
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://www.red-bean.com/~decklin/aewm/
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	ICCCM-compliant window manager based on 9wm
 
 GTKCLIENTS=	aemenu-gtk aepanel-gtk
diff --git a/x11-wm/alloywm/Makefile b/x11-wm/alloywm/Makefile
index 0b768e0af99e..e536ebaf02c6 100644
--- a/x11-wm/alloywm/Makefile
+++ b/x11-wm/alloywm/Makefile
@@ -11,7 +11,7 @@ PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://www.phatboydesigns.net/devel/
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Has title bars, shading, resizing, automatic placement, window list
 
 HAS_CONFIGURE=	yes
diff --git a/x11-wm/badwm/Makefile b/x11-wm/badwm/Makefile
index 36c29ab3bf23..2a276dd76cdb 100644
--- a/x11-wm/badwm/Makefile
+++ b/x11-wm/badwm/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=		BadWM-${PORTVERSION}
 
-MAINTAINER=		trevor@FreeBSD.org
+MAINTAINER=		ports@FreeBSD.org
 COMMENT=		Window manager based on evilwm
 
 DOCDIR=			share/doc/${PORTNAME}
diff --git a/x11-wm/blwm/Makefile b/x11-wm/blwm/Makefile
index 5e5bc4206195..eea6477ab494 100644
--- a/x11-wm/blwm/Makefile
+++ b/x11-wm/blwm/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	x11-wm portuguese
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	trevor
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Portuguese derivative of qvwm, simplified to conserve resources
 
 RUN_DEPENDS=	xsetbg:${PORTSDIR}/x11/xloadimage
diff --git a/x11-wm/clementine/Makefile b/x11-wm/clementine/Makefile
index 6da07e23d6a2..f8d459922b6b 100644
--- a/x11-wm/clementine/Makefile
+++ b/x11-wm/clementine/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Has title bars, iconizing, and styles (unstable)
 
 RUN_DEPENDS=	xv:${PORTSDIR}/graphics/xv \
diff --git a/x11-wm/epiwm/Makefile b/x11-wm/epiwm/Makefile
index a6349d34196a..44a9eeac9f97 100644
--- a/x11-wm/epiwm/Makefile
+++ b/x11-wm/epiwm/Makefile
@@ -11,7 +11,7 @@ PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://www.nongnu.org/epiwm/download/
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Another fast, small, configurable window manager
 
 LIB_DEPENDS=	Imlib.5:${PORTSDIR}/graphics/imlib \
diff --git a/x11-wm/evilwm/Makefile b/x11-wm/evilwm/Makefile
index f8a243d0fd97..7b674817c704 100644
--- a/x11-wm/evilwm/Makefile
+++ b/x11-wm/evilwm/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=		${PORTNAME}_${PORTVERSION}.orig
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Minimalist window manager based on 9wm
 
 DOCDIR=		share/doc/${PORTNAME}
diff --git a/x11-wm/jewel/Makefile b/x11-wm/jewel/Makefile
index 388f24ebde4c..a007353aaf1a 100644
--- a/x11-wm/jewel/Makefile
+++ b/x11-wm/jewel/Makefile
@@ -12,7 +12,7 @@ PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://mjr.towers.org.uk/comp/
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Window manager based on aewm++
 
 ALL_TARGET=	jewel
diff --git a/x11-wm/matchbox/Makefile b/x11-wm/matchbox/Makefile
index d92ad3eb958c..6f56ecfdf210 100644
--- a/x11-wm/matchbox/Makefile
+++ b/x11-wm/matchbox/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	0.3
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://handhelds.org/~mallum/downloadables/matchbox/
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Window manager suitable for low-resolution screens
 
 DOCS=		AUTHORS COPYING ChangeLog NEWS README TODO
diff --git a/x11-wm/obconf/Makefile b/x11-wm/obconf/Makefile
index 031a8d31276c..c862cb2ba870 100644
--- a/x11-wm/obconf/Makefile
+++ b/x11-wm/obconf/Makefile
@@ -11,7 +11,7 @@ PORTREVISION=	5
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://icculus.org/openbox/obconf/
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Preferences manager for the Openbox window manager
 
 BUILD_DEPENDS=	openbox:${PORTSDIR}/x11-wm/openbox
diff --git a/x11-wm/openbox/Makefile b/x11-wm/openbox/Makefile
index 57f43ccb0347..48e60ef8d30d 100644
--- a/x11-wm/openbox/Makefile
+++ b/x11-wm/openbox/Makefile
@@ -12,7 +12,7 @@ PORTREVISION=	3
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://icculus.org/openbox/releases/
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Derived from, and similar to, Blackbox
 
 LIB_DEPENDS=	Xft.2:${PORTSDIR}/x11-fonts/libXft
diff --git a/x11-wm/pawm/Makefile b/x11-wm/pawm/Makefile
index daeb96bded7d..d3198ce61009 100644
--- a/x11-wm/pawm/Makefile
+++ b/x11-wm/pawm/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	1.9.7
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://www.pleyades.net/pawm/files/
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The Puto Amo Window Manager
 
 BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash2
diff --git a/x11-wm/qlwm/Makefile b/x11-wm/qlwm/Makefile
index 859842a458f2..8f90cfbc8443 100644
--- a/x11-wm/qlwm/Makefile
+++ b/x11-wm/qlwm/Makefile
@@ -12,7 +12,7 @@ PORTVERSION=	3.1
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://www.alinden.mynetcologne.de/qlwm/
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Qt-based window manager
 
 DOCDIR=		share/doc/${PORTNAME}
diff --git a/x11-wm/sapphire/Makefile b/x11-wm/sapphire/Makefile
index 436cced5ca3d..46c766531108 100644
--- a/x11-wm/sapphire/Makefile
+++ b/x11-wm/sapphire/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Small window manager
 
 USE_GMAKE=	yes
diff --git a/x11-wm/swm/Makefile b/x11-wm/swm/Makefile
index 6f23ad733005..4f6b2b59027c 100644
--- a/x11-wm/swm/Makefile
+++ b/x11-wm/swm/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	x11-wm
 MASTER_SITES=	http://www.informatik.hu-berlin.de/~sperling/prog/
 EXTRACT_SUFX=	a-src.tgz
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=Window manager for low-memory systems, with title bars and shading
 
 BINS=		swm swmbg swmswitch
diff --git a/x11-wm/uwm/Makefile b/x11-wm/uwm/Makefile
index 4763042ce28f..b5d806166877 100644
--- a/x11-wm/uwm/Makefile
+++ b/x11-wm/uwm/Makefile
@@ -13,7 +13,7 @@ CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_NETBSD}
 DISTNAME=	X.V11R3uwm
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	X11R3 window manager
 
 MAN1=		uwm.1
diff --git a/x11-wm/yawm/Makefile b/x11-wm/yawm/Makefile
index e96eb50d7a89..46caa04dfadf 100644
--- a/x11-wm/yawm/Makefile
+++ b/x11-wm/yawm/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	x11-wm
 MASTER_SITES=	ftp://ftp.sai.msu.su/pub/X11/win_man/
 DISTNAME=	yawm-0.0.1-a4
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Has title bars, iconizing, maximizing, taskbar, placement, clock
 
 GNU_CONFIGURE=	yes
diff --git a/x11/buttonbox/Makefile b/x11/buttonbox/Makefile
index 96b7fab34500..5b52c4433579 100644
--- a/x11/buttonbox/Makefile
+++ b/x11/buttonbox/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	trevor
 DISTNAME=	${PORTNAME:S/b/B/g}-${PORTVERSION}
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Xlib-based application launcher
 
 DOCDIR=		share/doc/${PORTNAME}
diff --git a/x11/dynamag/Makefile b/x11/dynamag/Makefile
index 2b0d48bf2ed0..eaab4f00152e 100644
--- a/x11/dynamag/Makefile
+++ b/x11/dynamag/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	ftp://trace.wisc.edu/pub/access_utils/unix/
 DISTNAME=	unwindows
 EXTRACT_SUFX=	.tar.Z
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Magnifying utility which updates continuously
 
 ALL_TARGET=	dynamag
diff --git a/x11/portoseguro/Makefile b/x11/portoseguro/Makefile
index f3e8c398a109..5023099e1a05 100644
--- a/x11/portoseguro/Makefile
+++ b/x11/portoseguro/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	trevor
 DISTNAME=	${PORTNAME}-alpha4
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Launch applications by clicking on an icon bar
 
 CONFIGURE_ENV=	GTKCONFIG=${GTK_CONFIG}
diff --git a/x11/qrash/Makefile b/x11/qrash/Makefile
index 9c8af54c7895..2c4257d4e3da 100644
--- a/x11/qrash/Makefile
+++ b/x11/qrash/Makefile
@@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR=	X11/demos
 DISTNAME=	${PORTNAME}
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Animated musical demo for X11
 
 GNU_CONFIGURE=	yes
diff --git a/x11/vdesk/Makefile b/x11/vdesk/Makefile
index 2e67c7733038..0db1337b2b1e 100644
--- a/x11/vdesk/Makefile
+++ b/x11/vdesk/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	1.2
 CATEGORIES=	x11
 MASTER_SITES=	http://offog.org/files/
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Command-line utility for setting up and using virtual desktops
 
 DOCS=		AUTHORS COPYING ChangeLog INSTALL NEWS README
diff --git a/x11/wrapper/Makefile b/x11/wrapper/Makefile
index a34dac809572..0817e457df48 100644
--- a/x11/wrapper/Makefile
+++ b/x11/wrapper/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	x11
 DISTNAME=	# intentionally left blank
 EXTRACT_SUFX=	# intentionally left blank
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 
 CONFLICTS=	XFree86-3.3.6*
 NO_WRKSUBDIR=	yes