60 files changed, 61 insertions, 62 deletions

diff --git a/deskutils/taskstep/Makefile b/deskutils/taskstep/Makefile
index 98309f0304d9..dfbf4fa54cef 100644
--- a/deskutils/taskstep/Makefile
+++ b/deskutils/taskstep/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	deskutils www
 MASTER_SITES=	http://taskstep.cunningtitle.co.uk/releases/
 DISTNAME=	${PORTNAME}-06
 
-MAINTAINER=	farrokhi@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Web based to-do list manager written in php
 
 NO_BUILD=	YES
diff --git a/devel/libmba/Makefile b/devel/libmba/Makefile
index dec240e70781..18d72233a2d6 100644
--- a/devel/libmba/Makefile
+++ b/devel/libmba/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://www.ioplex.com/~miallen/libmba/dl/ \
 		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	miwi
 
-MAINTAINER=	farrokhi@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A collection of C modules potentially useful to any project
 
 LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
diff --git a/devel/upnp/Makefile b/devel/upnp/Makefile
index 48df44f0e4b7..8bede36a984a 100644
--- a/devel/upnp/Makefile
+++ b/devel/upnp/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	devel
 MASTER_SITES=	SF/pupnp
 DISTNAME=	lib${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	farrokhi@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Universal Plug and Play Software Development Kit
 
 CONFLICTS=	upnp-1.0.*
diff --git a/dns/adns/Makefile b/dns/adns/Makefile
index 419620b1cefa..bed9052127d0 100644
--- a/dns/adns/Makefile
+++ b/dns/adns/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	dns
 MASTER_SITES=	ftp://ftp.chiark.greenend.org.uk/users/ian/adns/ \
 		http://www.chiark.greenend.org.uk/~ian/adns/ftp/
 
-MAINTAINER=	farrokhi@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Easy to use, asynchronous-capable DNS client library and utilities
 
 GNU_CONFIGURE=	yes
diff --git a/dns/sleuth/Makefile b/dns/sleuth/Makefile
index b44cbe081b1e..36de9565be77 100644
--- a/dns/sleuth/Makefile
+++ b/dns/sleuth/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	1.4.4
 CATEGORIES=	dns
 MASTER_SITES=	ftp://atrey.karlin.mff.cuni.cz/pub/local/mj/net/
 
-MAINTAINER=	farrokhi@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A tool for checking DNS zones
 
 RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Net/DNS.pm:${PORTSDIR}/dns/p5-Net-DNS
diff --git a/games/hlstats/Makefile b/games/hlstats/Makefile
index 702bb34c001a..8fd72dee326d 100644
--- a/games/hlstats/Makefile
+++ b/games/hlstats/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	1.38
 CATEGORIES=	games www
 MASTER_SITES=	SF
 
-MAINTAINER=	farrokhi@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A real-time stats parser for Half Life & its mods
 
 RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/DBD/mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql
diff --git a/games/hlstatsx/Makefile b/games/hlstatsx/Makefile
index a10169223ed0..8fb7c361eed6 100644
--- a/games/hlstatsx/Makefile
+++ b/games/hlstatsx/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	games www
 MASTER_SITES=	http://www.hlstatsx.com/downloads/
 DISTNAME=	HLstatsX_V${PORTVERSION}
 
-MAINTAINER=	farrokhi@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Real-time player and clan rankings and statistics for HL2 and mods
 
 NO_BUILD=	yes
diff --git a/games/phpua-bf/Makefile b/games/phpua-bf/Makefile
index f8ba4e2e5fb2..5e106a9d392f 100644
--- a/games/phpua-bf/Makefile
+++ b/games/phpua-bf/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	games www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	phpua
 
-MAINTAINER=	farrokhi@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A Battlefield 1942 plugin for phpUA
 
 BUILD_DEPENDS=	${LOCALBASE}/${PHPUA}/index.php:${PORTSDIR}/games/phpua-engine
diff --git a/games/phpua-cod/Makefile b/games/phpua-cod/Makefile
index cfb6d17d9c46..4781a0071946 100644
--- a/games/phpua-cod/Makefile
+++ b/games/phpua-cod/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	games www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	phpua
 
-MAINTAINER=	farrokhi@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A Call of Duty plugin for phpUA
 
 BUILD_DEPENDS=	${LOCALBASE}/${PHPUA}/index.php:${PORTSDIR}/games/phpua-engine
diff --git a/games/phpua-engine/Makefile b/games/phpua-engine/Makefile
index c4f9b1fab117..ed6f0c66bd60 100644
--- a/games/phpua-engine/Makefile
+++ b/games/phpua-engine/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	games www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	phpua
 
-MAINTAINER=	farrokhi@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Game server monitor & admin tool
 
 NO_BUILD=	yes
diff --git a/games/phpua-hl/Makefile b/games/phpua-hl/Makefile
index bacdb08955d2..9fb3bcc6152a 100644
--- a/games/phpua-hl/Makefile
+++ b/games/phpua-hl/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	games www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	phpua
 
-MAINTAINER=	farrokhi@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A Half-Life plugin for phpUA
 
 BUILD_DEPENDS=	${LOCALBASE}/${PHPUA}/index.php:${PORTSDIR}/games/phpua-engine
diff --git a/games/phpua-q3/Makefile b/games/phpua-q3/Makefile
index bd18cf8cee7a..d7e0d54593f5 100644
--- a/games/phpua-q3/Makefile
+++ b/games/phpua-q3/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	games www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	phpua
 
-MAINTAINER=	farrokhi@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A Quake 3 plugin for phpUA
 
 BUILD_DEPENDS=	${LOCALBASE}/${PHPUA}/index.php:${PORTSDIR}/games/phpua-engine
diff --git a/games/phpua-ut/Makefile b/games/phpua-ut/Makefile
index 9899c5d8a172..549e6e7f6d6d 100644
--- a/games/phpua-ut/Makefile
+++ b/games/phpua-ut/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	games www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	phpua
 
-MAINTAINER=	farrokhi@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An Unreal Tournament plugin for phpUA
 
 BUILD_DEPENDS=	${LOCALBASE}/${PHPUA}/index.php:${PORTSDIR}/games/phpua-engine
diff --git a/games/phpua-ut2003/Makefile b/games/phpua-ut2003/Makefile
index 35b31bf7a7ae..68f5dc55a665 100644
--- a/games/phpua-ut2003/Makefile
+++ b/games/phpua-ut2003/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	games www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	phpua
 
-MAINTAINER=	farrokhi@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An Unreal Tournament 2003 plugin for phpUA
 
 BUILD_DEPENDS=	${LOCALBASE}/${PHPUA}/index.php:${PORTSDIR}/games/phpua-engine
diff --git a/mail/gld/Makefile b/mail/gld/Makefile
index 965059a6107d..7836554b47a5 100644
--- a/mail/gld/Makefile
+++ b/mail/gld/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	mail
 MASTER_SITES=	http://www.gasmi.net/down/
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	farrokhi@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Greylisting daemon for Postfix
 
 USE_RC_SUBR=	gld
diff --git a/mail/grepmail/Makefile b/mail/grepmail/Makefile
index b298a72caae0..de1128b4b448 100644
--- a/mail/grepmail/Makefile
+++ b/mail/grepmail/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	farrokhi@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Search mailboxes for a given regexp and display matching emails
 
 BUILD_DEPENDS=	${SITE_PERL}/Date/Parse.pm:${PORTSDIR}/devel/p5-TimeDate \
diff --git a/mail/p5-Mail-Webmail-Gmail/Makefile b/mail/p5-Mail-Webmail-Gmail/Makefile
index d4c1530b473c..8c7d4acf8de2 100644
--- a/mail/p5-Mail-Webmail-Gmail/Makefile
+++ b/mail/p5-Mail-Webmail-Gmail/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	farrokhi@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Perl interface to Google webmail service
 
 BUILD_DEPENDS=	${SITE_PERL}/LWP/UserAgent.pm:${PORTSDIR}/www/p5-libwww \
diff --git a/misc/p5-Asterisk/Makefile b/misc/p5-Asterisk/Makefile
index d2ac54cc9427..5a9ad536b5ea 100644
--- a/misc/p5-Asterisk/Makefile
+++ b/misc/p5-Asterisk/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=		http://asterisk.gnuinter.net/files/
 PKGNAMEPREFIX=		p5-
 DISTNAME=		asterisk-perl-${PORTVERSION}
 
-MAINTAINER=		farrokhi@FreeBSD.org
+MAINTAINER=		ports@FreeBSD.org
 COMMENT=		Asterisk perl library
 
 PERL_CONFIGURE=		yes
diff --git a/net-mgmt/asused/Makefile b/net-mgmt/asused/Makefile
index fc2e1f928731..a8018b52afa6 100644
--- a/net-mgmt/asused/Makefile
+++ b/net-mgmt/asused/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	ftp://ftp.ripe.net/tools/ \
 		http://ftp.belnet.be/pub/mirror/ftp.ripe.net/ripe/tools/
 DISTNAME=	${PORTNAME}-${PORTVERSION}_whois_new_query_fix
 
-MAINTAINER=	farrokhi@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Command-line tool to run a check on the usage of the RIPE Whois DB
 
 PERL_CONFIGURE=	yes
diff --git a/net-mgmt/bgpq/Makefile b/net-mgmt/bgpq/Makefile
index 45ecd62c8b40..04a70fbb3cbf 100644
--- a/net-mgmt/bgpq/Makefile
+++ b/net-mgmt/bgpq/Makefile
@@ -10,7 +10,7 @@ CATEGORIES=	net-mgmt
 MASTER_SITES=	ftp://ftp.lexa.ru/pub/domestic/snar/
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	farrokhi@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Bgpq - lightweight access-list generator for cisco routers
 
 MAN8=		bgpq.8
diff --git a/net-mgmt/ipacco/Makefile b/net-mgmt/ipacco/Makefile
index f55c4fb4dfcc..ed97561292b8 100644
--- a/net-mgmt/ipacco/Makefile
+++ b/net-mgmt/ipacco/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	net-mgmt www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	ipacco
 
-MAINTAINER=	farrokhi@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Web based tool to analyze Cisco IP accounting data
 
 RUN_DEPENDS=	${LOCALBASE}/include/tclExtend.h:${PORTSDIR}/lang/tclX \
diff --git a/net-mgmt/ipsectrace/Makefile b/net-mgmt/ipsectrace/Makefile
index f007e6f71e4b..434ddda37f65 100644
--- a/net-mgmt/ipsectrace/Makefile
+++ b/net-mgmt/ipsectrace/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	net-mgmt security
 MASTER_SITES=	http://chewies.net/ \
 		http://farrokhi.net/distfiles/
 
-MAINTAINER=	farrokhi@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	IPSEC Traffic Profiler
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
diff --git a/net-mgmt/jffnms/Makefile b/net-mgmt/jffnms/Makefile
index f057dd286bdc..edabefe1afcf 100644
--- a/net-mgmt/jffnms/Makefile
+++ b/net-mgmt/jffnms/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	net-mgmt
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=${PORTNAME}
 
-MAINTAINER=	farrokhi@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Very advanced network monitoring and control system
 
 RUN_DEPENDS=	neato:${PORTSDIR}/graphics/graphviz \
diff --git a/net-mgmt/junipoll/Makefile b/net-mgmt/junipoll/Makefile
index f7e012583de6..53af275ab86d 100644
--- a/net-mgmt/junipoll/Makefile
+++ b/net-mgmt/junipoll/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	net-mgmt perl5
 MASTER_SITES=	http://net.doit.wisc.edu/~plonka/junipoll/
 MASTER_SITE_SUBDIR=	. old
 
-MAINTAINER=	farrokhi@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	JUNIper router snmp POLLer for firewall filter counters
 
 RUN_DEPENDS=	rrdtool:${PORTSDIR}/databases/rrdtool \
diff --git a/net-mgmt/nefu/Makefile b/net-mgmt/nefu/Makefile
index 0301b42edd23..5982aa3b0e2f 100644
--- a/net-mgmt/nefu/Makefile
+++ b/net-mgmt/nefu/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	net-mgmt
 MASTER_SITES=	http://rsug.itd.umich.edu/software/nefu/files/
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	farrokhi@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A network monitoring daemon
 
 GNU_CONFIGURE=		yes
diff --git a/net-mgmt/p0f/Makefile b/net-mgmt/p0f/Makefile
index a56ab9bcc109..f239168e2c71 100644
--- a/net-mgmt/p0f/Makefile
+++ b/net-mgmt/p0f/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	http://lcamtuf.coredump.cx/p0f/ \
 		http://farrokhi.net/distfiles/
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	farrokhi@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Passive OS fingerprinting tool
 
 USE_GMAKE=	yes
diff --git a/net-mgmt/p5-Cflow/Makefile b/net-mgmt/p5-Cflow/Makefile
index 94b88095bd78..cc611ed740a4 100644
--- a/net-mgmt/p5-Cflow/Makefile
+++ b/net-mgmt/p5-Cflow/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	http://net.doit.wisc.edu/~plonka/Cflow/ \
 		http://net.doit.wisc.edu/~plonka/Cflow/old/
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	farrokhi@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Analyze raw flow files written by cflowd (Cisco NetFlow data)
 
 .if defined(WITH_FLOW_TOOLS)
diff --git a/net-mgmt/rcpd/Makefile b/net-mgmt/rcpd/Makefile
index ae37e73f42a0..70b82861f58d 100644
--- a/net-mgmt/rcpd/Makefile
+++ b/net-mgmt/rcpd/Makefile
@@ -10,12 +10,11 @@ PORTVERSION=	1.2
 CATEGORIES=	net-mgmt net
 MASTER_SITES=	ftp://ftp.shrubbery.net/pub/rcpd/
 
-MAINTAINER=	farrokhi@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	RCP server for routers and network devices
 
 GNU_CONFIGURE=	yes
 MAN1=		rcpd.1
 PLIST_FILES=	sbin/rcpd
 
-.include <bsd.port.pre.mk>
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net-mgmt/sjitter/Makefile b/net-mgmt/sjitter/Makefile
index 1b086f6c8c77..592d627189d5 100644
--- a/net-mgmt/sjitter/Makefile
+++ b/net-mgmt/sjitter/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	net-mgmt net
 MASTER_SITES=	http://www.alcasat.net/dev/sjitter/
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	farrokhi@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A client/server jitter measurement utility
 
 WRKSRC=		${WRKDIR}
diff --git a/net-p2p/opendchub/Makefile b/net-p2p/opendchub/Makefile
index 8a53b1901bc3..b7323f5739fa 100644
--- a/net-p2p/opendchub/Makefile
+++ b/net-p2p/opendchub/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	net-p2p
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	farrokhi@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Unofficial Unix version of the Direct Connect Hub software
 
 USE_PERL5=	yes
diff --git a/net/gsk/Makefile b/net/gsk/Makefile
index c4e9941e4179..72337c44687f 100644
--- a/net/gsk/Makefile
+++ b/net/gsk/Makefile
@@ -11,7 +11,7 @@ PORTREVISION=	1
 CATEGORIES=	net devel
 MASTER_SITES=	SF
 
-MAINTAINER=	farrokhi@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A C library for writing servers
 
 USE_GNOME=	glib20 gnomehack gnometarget
diff --git a/net/htpdate/Makefile b/net/htpdate/Makefile
index e9e91b352f66..64fceabcd1f8 100644
--- a/net/htpdate/Makefile
+++ b/net/htpdate/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	1.0.4
 CATEGORIES=	net ipv6
 MASTER_SITES=	http://www.clevervest.com/htp/archive/c/
 
-MAINTAINER=	farrokhi@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Time synchronization over http utility
 
 USE_BZIP2=	yes
diff --git a/net/openbgpd/Makefile b/net/openbgpd/Makefile
index 19f4f80e06f9..3d57b7d23863 100644
--- a/net/openbgpd/Makefile
+++ b/net/openbgpd/Makefile
@@ -17,7 +17,7 @@ DISTFILES+=	if_media.h:freebsd hash.h:freebsd strtonum.c:freebsd
 DIST_SUBDIR=	openbgpd
 EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}.tgz
 
-MAINTAINER=	farrokhi@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Free implementation of the Border Gateway Protocol, Version 4
 
 CONFLICTS=	zebra-0* quagga-0*
diff --git a/net/openradius/Makefile b/net/openradius/Makefile
index d38f40c819a3..9958ced3d74a 100644
--- a/net/openradius/Makefile
+++ b/net/openradius/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	net
 MASTER_SITES=	http://www.xs4all.nl/~evbergen/openradius/download/ \
 		http://www.mirrors.wiretapped.net/security/authentication/radius/openradius/
 
-MAINTAINER=	farrokhi@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A RADIUS server with some actual documentation
 
 LOGFILE?=	/var/log/openradius.log
diff --git a/net/p5-Net-Gnats/Makefile b/net/p5-Net-Gnats/Makefile
index 9c263754a7fa..dbbd6858a40e 100644
--- a/net/p5-Net-Gnats/Makefile
+++ b/net/p5-Net-Gnats/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR=	gnatsperl
 PKGNAMEPREFIX=	p5-
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	farrokhi@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Perl interface to GNU Gnats daemon
 
 PERL_CONFIGURE=	yes
diff --git a/net/panoptis/Makefile b/net/panoptis/Makefile
index 1422cfb24299..7153a3137f2c 100644
--- a/net/panoptis/Makefile
+++ b/net/panoptis/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	net security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	farrokhi@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Detect and block DoS/DDoS attacks
 
 LIB_DEPENDS=	ccgnu2-1.6.0:${PORTSDIR}/devel/commoncpp
diff --git a/net/pathneck/Makefile b/net/pathneck/Makefile
index 71b18df93269..a98a2c956470 100644
--- a/net/pathneck/Makefile
+++ b/net/pathneck/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://www.cs.cmu.edu/~hnn/pathneck/ \
 		http://www.unixified.net/distfiles/
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	farrokhi@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Active network path probing tool
 
 PLIST_FILES=	sbin/pathneck \
diff --git a/net/tapidbus/Makefile b/net/tapidbus/Makefile
index 8d72a2c776e4..089bc4fe01f3 100644
--- a/net/tapidbus/Makefile
+++ b/net/tapidbus/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	tapioca-voip
 
-MAINTAINER=	farrokhi@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Abstraction layer for interprocess communication
 
 LIB_DEPENDS=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
diff --git a/net/tcpslice/Makefile b/net/tcpslice/Makefile
index d6d1652f9e59..a06f71c89006 100644
--- a/net/tcpslice/Makefile
+++ b/net/tcpslice/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	net
 MASTER_SITES=	http://www.tcpdump.org/weekly/ \
 		http://freebsd.unixfreunde.de/sources/
 
-MAINTAINER=	farrokhi@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A tool for extracting portions of pcap files
 
 MAN1=		tcpslice.1
diff --git a/net/tcpxd/Makefile b/net/tcpxd/Makefile
index 0fa503d1f5c5..69663712320f 100644
--- a/net/tcpxd/Makefile
+++ b/net/tcpxd/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	net net-mgmt
 MASTER_SITES=	http://quozl.us.netrek.org/tcpxd/ \
 		http://fresh.t-systems-sfr.com/unix/src/privat2/
 
-MAINTAINER=	farrokhi@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	General purpose TCP/IP relay
 
 HAS_CONFIGURE=	yes
diff --git a/security/lsh/Makefile b/security/lsh/Makefile
index 9b313c435369..4b752be6633d 100644
--- a/security/lsh/Makefile
+++ b/security/lsh/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	${MASTER_SITE_GNUPG} \
 		ftp://ftp.lysator.liu.se/pub/security/%SUBDIR%/
 MASTER_SITE_SUBDIR=	lsh lsh/old
 
-MAINTAINER=	farrokhi@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A secure (encrypted) remote shell compatible with ssh 2.0
 
 BUILD_DEPENDS+=	${LOCALBASE}/include/gmp.h:${PORTSDIR}/math/libgmp4 \
diff --git a/security/super/Makefile b/security/super/Makefile
index 9ec9bd9f6165..da08e6080998 100644
--- a/security/super/Makefile
+++ b/security/super/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	ftp://ftp.ucolick.org/pub/users/will/ \
 		http://www.ucolick.org/~will/RUE/super/
 EXTRACT_SUFX=	-tar.gz
 
-MAINTAINER=	farrokhi@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Allow others to run commands as root
 
 GNU_CONFIGURE=	yes
diff --git a/sysutils/log_analysis/Makefile b/sysutils/log_analysis/Makefile
index 2768566b0c5e..23066f607c11 100644
--- a/sysutils/log_analysis/Makefile
+++ b/sysutils/log_analysis/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	0.45
 CATEGORIES=	sysutils
 MASTER_SITES=	http://userpages.umbc.edu/~mabzug1/
 
-MAINTAINER=	farrokhi@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A utility that extracts a summary of useful data from logs
 
 USE_PERL5=	yes
diff --git a/sysutils/ntfsprogs/Makefile b/sysutils/ntfsprogs/Makefile
index 2f895959f800..38d709171504 100644
--- a/sysutils/ntfsprogs/Makefile
+++ b/sysutils/ntfsprogs/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	sysutils
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	linux-ntfs
 
-MAINTAINER=	farrokhi@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Utilities and library to manipulate NTFS partitions
 
 BUILD_DEPENDS=	fusefs-libs>2.5:${PORTSDIR}/sysutils/fusefs-libs
diff --git a/textproc/fa-aspell/Makefile b/textproc/fa-aspell/Makefile
index 241c4354da26..aa3e456a70ba 100644
--- a/textproc/fa-aspell/Makefile
+++ b/textproc/fa-aspell/Makefile
@@ -11,7 +11,7 @@ PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	textproc
 
-MAINTAINER=	farrokhi@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Aspell Persian (Farsi) dictionary
 
 DICT=	 	fa
diff --git a/www/awstats-devel/Makefile b/www/awstats-devel/Makefile
index a01b3243b58a..210996e64811 100644
--- a/www/awstats-devel/Makefile
+++ b/www/awstats-devel/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://awstats.sourceforge.net/files/
 PKGNAMESUFFIX=	-devel
 DISTNAME=	${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	farrokhi@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Free real-time logfile analyzer to get advanced web statistics
 
 RUN_DEPENDS=	${SITE_PERL}/Net/XWhois.pm:${PORTSDIR}/net/p5-Net-XWhois
diff --git a/www/bluefish/Makefile b/www/bluefish/Makefile
index 56bae581439e..eb459002acc2 100644
--- a/www/bluefish/Makefile
+++ b/www/bluefish/Makefile
@@ -13,7 +13,7 @@ CATEGORIES=	www editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	farrokhi@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	HTML editor designed for the experienced web designer
 
 LIB_DEPENDS=	pcre.0:${PORTSDIR}/devel/pcre \
diff --git a/www/iwebcal/Makefile b/www/iwebcal/Makefile
index 640e3bab1d97..33360dd5baab 100644
--- a/www/iwebcal/Makefile
+++ b/www/iwebcal/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	farrokhi@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Webbased iCal calendar viewer
 
 NO_BUILD=	yes
diff --git a/www/kannel/Makefile b/www/kannel/Makefile
index 033b78b6d843..b31c7e6bfdd7 100644
--- a/www/kannel/Makefile
+++ b/www/kannel/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	http://www.kannel.org/download/%SUBDIR%/ \
 MASTER_SITE_SUBDIR=	${PORTVERSION}
 DISTNAME=	gateway-${PORTVERSION}
 
-MAINTAINER=	farrokhi@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	WAP / SMS Gateway
 
 LIB_DEPENDS=	pcre.0:${PORTSDIR}/devel/pcre
diff --git a/www/openxmldir/Makefile b/www/openxmldir/Makefile
index d6b83b5c15e9..ba644111bb75 100644
--- a/www/openxmldir/Makefile
+++ b/www/openxmldir/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	open79xxdir
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
-MAINTAINER=	farrokhi@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	PHP based XML menuing system for cisco 79xx IP phones
 
 NO_BUILD=	YES
diff --git a/www/phproxy/Makefile b/www/phproxy/Makefile
index d55b39fb0efc..fe94406fbda0 100644
--- a/www/phproxy/Makefile
+++ b/www/phproxy/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	poxy
 DISTNAME=	poxy-${DISTVERSION}
 
-MAINTAINER=	farrokhi@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	PHP based web proxy
 
 NO_BUILD=	YES
diff --git a/www/phpwiki/Makefile b/www/phpwiki/Makefile
index 645be4d1df9e..091fcf0f2145 100644
--- a/www/phpwiki/Makefile
+++ b/www/phpwiki/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	phpwiki
 
-MAINTAINER=	farrokhi@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A PHP WikiWikiWeb
 
 CONFLICTS=	phpwiki-1.3*
diff --git a/www/phpwiki13/Makefile b/www/phpwiki13/Makefile
index a0a9670c5210..c3bacaf69321 100644
--- a/www/phpwiki13/Makefile
+++ b/www/phpwiki13/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	phpwiki
 
-MAINTAINER=	farrokhi@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A PHP WikiWikiWeb
 
 CONFLICTS+=	phpwiki-1.2*
diff --git a/x11-fonts/farsifonts/Makefile b/x11-fonts/farsifonts/Makefile
index 529202c77666..8018fd5b35c7 100644
--- a/x11-fonts/farsifonts/Makefile
+++ b/x11-fonts/farsifonts/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	x11-fonts
 MASTER_SITES=	http://www.unixified.net/distfiles/ \
 		http://www.farsiweb.info/font/
 
-MAINTAINER=	farrokhi@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Standard set of Unicode Persian fonts
 
 BUILD_DEPENDS=	ttmkfdir:${PORTSDIR}/x11-fonts/ttmkfdir
diff --git a/x11-themes/cursor-grounation-theme/Makefile b/x11-themes/cursor-grounation-theme/Makefile
index eda5e550ce72..0cf4aae6fde1 100644
--- a/x11-themes/cursor-grounation-theme/Makefile
+++ b/x11-themes/cursor-grounation-theme/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	x11-themes
 MASTER_SITES=	http://www.gnome-look.org/CONTENT/content-files/
 DISTNAME=	14484-Grounation-${PORTVERSION}
 
-MAINTAINER=	farrokhi@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Moshi's Grounation cursors
 
 NO_BUILD=	yes
diff --git a/x11-themes/cursor-neutral-theme/Makefile b/x11-themes/cursor-neutral-theme/Makefile
index 72ea0787a233..981893e19d61 100644
--- a/x11-themes/cursor-neutral-theme/Makefile
+++ b/x11-themes/cursor-neutral-theme/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	x11-themes
 MASTER_SITES=	http://www.gnome-look.org/CONTENT/content-files/
 DISTNAME=	28310-neutral-${DISTVERSION}
 
-MAINTAINER=	farrokhi@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Extended Jaguar X cursor theme
 
 NO_BUILD=	yes
diff --git a/x11-themes/gnome-icons-snowish/Makefile b/x11-themes/gnome-icons-snowish/Makefile
index ab5e79e12d18..dd4e64b71e10 100644
--- a/x11-themes/gnome-icons-snowish/Makefile
+++ b/x11-themes/gnome-icons-snowish/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	http://nuovext.pwsp.net/snowish/files/ \
 MASTER_SITE_SUBDIR=	tmclaugh
 DISTNAME=	SnowIsh-${PORTVERSION}_PNG
 
-MAINTAINER=	farrokhi@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A Mac inspired icon theme for GNOME
 
 RESTRICTED=	${REASON}
diff --git a/x11-themes/gtk-envy-theme/Makefile b/x11-themes/gtk-envy-theme/Makefile
index 8609ab3cc9f3..1ce92aff328a 100644
--- a/x11-themes/gtk-envy-theme/Makefile
+++ b/x11-themes/gtk-envy-theme/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	x11-themes gnome
 MASTER_SITES=	http://www.gnome-look.org/CONTENT/content-files/
 DISTNAME=	35093-Envy
 
-MAINTAINER=	farrokhi@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Envy theme for GTK+ 2.0
 
 #RUN_DEPENDS=	${LOCALBASE}/share/icons/Tango:${PORTSDIR}/x11-themes/icons-tango
diff --git a/x11-themes/gtk-gray-theme/Makefile b/x11-themes/gtk-gray-theme/Makefile
index 91b4e1d04400..4540f264fe23 100644
--- a/x11-themes/gtk-gray-theme/Makefile
+++ b/x11-themes/gtk-gray-theme/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	x11-themes gnome
 MASTER_SITES=	http://www.gnome-look.org/CONTENT/content-files/
 DISTNAME=	34132-Gray
 
-MAINTAINER=	farrokhi@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Gray theme for GTK+ 2.0
 
 RUN_DEPENDS=	${LOCALBASE}/share/icons/Tango:${PORTSDIR}/x11-themes/icons-tango
diff --git a/x11-wm/jwm/Makefile b/x11-wm/jwm/Makefile
index 473d9d2392d9..9356f26dc7c8 100644
--- a/x11-wm/jwm/Makefile
+++ b/x11-wm/jwm/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	SF \
 		http://joewing.net/programs/
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	farrokhi@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Joe's Window Manager
 
 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png