66 files changed, 66 insertions, 66 deletions

diff --git a/deskutils/taskstep/Makefile b/deskutils/taskstep/Makefile
index b835032c22b2..6adaadbb3db4 100644
--- a/deskutils/taskstep/Makefile
+++ b/deskutils/taskstep/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	deskutils www
 MASTER_SITES=	http://taskstep.cunningtitle.co.uk/releases/
 DISTNAME=	${PORTNAME}-05
 
-MAINTAINER=	babak@farrokhi.net
+MAINTAINER=	farrokhi@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 fe5019f368dc..a5ae7ed59709 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=	babak@farrokhi.net
+MAINTAINER=	farrokhi@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 5e7bc0c5a2ae..fdb2b6b5ecc5 100644
--- a/devel/upnp/Makefile
+++ b/devel/upnp/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	pupnp
 DISTNAME=	lib${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	babak@farrokhi.net
+MAINTAINER=	farrokhi@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 c8f3cdd1a7d7..7e8ca98c662b 100644
--- a/dns/adns/Makefile
+++ b/dns/adns/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	dns
 MASTER_SITES=	ftp://ftp.chiark.greenend.org.uk/users/ian/adns/ \
 		http://www.chiark.greenend.org.uk/~ian/adns/ftp/
 
-MAINTAINER=	babak@farrokhi.net
+MAINTAINER=	farrokhi@FreeBSD.org
 COMMENT=	Easy to use, asynchronous-capable DNS client library and utilities
 
 GNU_CONFIGURE=	yes
diff --git a/dns/dnsmasq/Makefile b/dns/dnsmasq/Makefile
index c3a9f5a0fdb8..67a6248b0619 100644
--- a/dns/dnsmasq/Makefile
+++ b/dns/dnsmasq/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	http://www.thekelleys.org.uk/dnsmasq/ \
 		${MASTER_SITE_GENTOO}
 MASTER_SITE_SUBDIR=	distfiles
 
-MAINTAINER=	babak@farrokhi.net
+MAINTAINER=	farrokhi@FreeBSD.org
 COMMENT=	Lightweight, easy to configure DNS forwarder and DHCP server
 
 MAN8=		dnsmasq.8
diff --git a/dns/sleuth/Makefile b/dns/sleuth/Makefile
index 5ec6d0569a8d..d5bb13666cc2 100644
--- a/dns/sleuth/Makefile
+++ b/dns/sleuth/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	1.4.1
 CATEGORIES=	dns
 MASTER_SITES=	ftp://atrey.karlin.mff.cuni.cz/pub/local/mj/net/
 
-MAINTAINER=	babak@farrokhi.net
+MAINTAINER=	farrokhi@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 242b104b13f5..90c5ac3d1907 100644
--- a/games/hlstats/Makefile
+++ b/games/hlstats/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	games www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	babak@farrokhi.net
+MAINTAINER=	farrokhi@FreeBSD.org
 COMMENT=	A real-time stats parser for Half Life & its mods
 
 RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql
diff --git a/games/hlstatsx/Makefile b/games/hlstatsx/Makefile
index cf0cb3314c8d..828c0db94bde 100644
--- a/games/hlstatsx/Makefile
+++ b/games/hlstatsx/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	games www
 MASTER_SITES=	http://www.hlstatsx.com/downloads/
 DISTNAME=	HLstatsX_V${PORTVERSION}
 
-MAINTAINER=	babak@farrokhi.net
+MAINTAINER=	farrokhi@FreeBSD.org
 COMMENT=	Real-time player and clan rankings and statistics for HL2 and mods
 
 RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql
diff --git a/games/phpua-bf/Makefile b/games/phpua-bf/Makefile
index ab10fd1e4a94..f8ba4e2e5fb2 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=	babak@farrokhi.net
+MAINTAINER=	farrokhi@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 1d2719cadcd9..cfb6d17d9c46 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=	babak@farrokhi.net
+MAINTAINER=	farrokhi@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 4331ed224084..c4f9b1fab117 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=	babak@farrokhi.net
+MAINTAINER=	farrokhi@FreeBSD.org
 COMMENT=	Game server monitor & admin tool
 
 NO_BUILD=	yes
diff --git a/games/phpua-hl/Makefile b/games/phpua-hl/Makefile
index 348a37fa5fa3..bacdb08955d2 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=	babak@farrokhi.net
+MAINTAINER=	farrokhi@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 27e052d15c4d..bd18cf8cee7a 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=	babak@farrokhi.net
+MAINTAINER=	farrokhi@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 0ba74164615b..9899c5d8a172 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=	babak@farrokhi.net
+MAINTAINER=	farrokhi@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 15d5da493934..35b31bf7a7ae 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=	babak@farrokhi.net
+MAINTAINER=	farrokhi@FreeBSD.org
 COMMENT=	An Unreal Tournament 2003 plugin for phpUA
 
 BUILD_DEPENDS=	${LOCALBASE}/${PHPUA}/index.php:${PORTSDIR}/games/phpua-engine
diff --git a/mail/fetchyahoo/Makefile b/mail/fetchyahoo/Makefile
index 5d677aa1ce6b..4df70012bf04 100644
--- a/mail/fetchyahoo/Makefile
+++ b/mail/fetchyahoo/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	2.10.6
 CATEGORIES=	mail
 MASTER_SITES=	http://fetchyahoo.sourceforge.net/
 
-MAINTAINER=	babak@farrokhi.net
+MAINTAINER=	farrokhi@FreeBSD.org
 COMMENT=	Download e-mail from a Yahoo account to a Berkeley mailbox
 
 RUN_DEPENDS=	\
diff --git a/mail/gld/Makefile b/mail/gld/Makefile
index 8b19ac5553ab..965059a6107d 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=	babak@farrokhi.net
+MAINTAINER=	farrokhi@FreeBSD.org
 COMMENT=	Greylisting daemon for Postfix
 
 USE_RC_SUBR=	gld
diff --git a/mail/grepmail/Makefile b/mail/grepmail/Makefile
index 7a7eda36e322..be674a957160 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=	babak@farrokhi.net
+MAINTAINER=	farrokhi@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 90fc23b1a4cb..eddcd498e67c 100644
--- a/mail/p5-Mail-Webmail-Gmail/Makefile
+++ b/mail/p5-Mail-Webmail-Gmail/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Mail
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	babak@farrokhi.net
+MAINTAINER=	farrokhi@FreeBSD.org
 COMMENT=	Perl interface to Google webmail service
 
 BUILD_DEPENDS=	${SITE_PERL}/LWP/UserAgent.pm:${PORTSDIR}/www/p5-libwww \
diff --git a/mail/roundcube/Makefile b/mail/roundcube/Makefile
index e618482c7d0d..244506d126ba 100644
--- a/mail/roundcube/Makefile
+++ b/mail/roundcube/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://www.farrokhi.net/roundcube/:unixified \
 MASTER_SITE_SUBDIR=	flz/${PORTNAME}/:freebsd
 DISTFILES=	${PORTNAME}-${PORTVERSION:S/.${SNAPSHOT}//}-${SNAPSHOT}${EXTRACT_SUFX}:unixified
 
-MAINTAINER=	babak@farrokhi.net
+MAINTAINER=	farrokhi@FreeBSD.org
 COMMENT=	Fully skinnable XHTML/CSS webmail written in PHP
 
 SNAPSHOT=	20061013
diff --git a/misc/p5-Asterisk/Makefile b/misc/p5-Asterisk/Makefile
index 34b20e6ab9db..2a784cdfc6c4 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=		babak@farrokhi.net
+MAINTAINER=		farrokhi@FreeBSD.org
 COMMENT=		Asterisk perl library
 
 PERL_CONFIGURE=		yes
diff --git a/net-mgmt/asused/Makefile b/net-mgmt/asused/Makefile
index fb5fce165b24..e028d181ec45 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=	babak@farrokhi.net
+MAINTAINER=	farrokhi@FreeBSD.org
 COMMENT=	Command-line tool to run a check on the usage of the RIPE Whois DB
 
 USE_PERL5=	yes
diff --git a/net-mgmt/ipacco/Makefile b/net-mgmt/ipacco/Makefile
index 1c0309c39865..36ba6ccac1d4 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=	babak@farrokhi.net
+MAINTAINER=	farrokhi@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/junipoll/Makefile b/net-mgmt/junipoll/Makefile
index 79122542cd8e..ca4b7eee1ec4 100644
--- a/net-mgmt/junipoll/Makefile
+++ b/net-mgmt/junipoll/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	net-mgmt perl5
 MASTER_SITES=	http://net.doit.wisc.edu/~plonka/junipoll/
 MASTER_SITE_SUBDIR=	. old
 
-MAINTAINER=	babak@farrokhi.net
+MAINTAINER=	farrokhi@FreeBSD.org
 COMMENT=	JUNIper router snmp POLLer for firewall filter counters
 
 RUN_DEPENDS=	rrdtool:${PORTSDIR}/net/rrdtool \
diff --git a/net-mgmt/nefu/Makefile b/net-mgmt/nefu/Makefile
index 570fb18f2528..471ecff81c74 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=	babak@farrokhi.net
+MAINTAINER=	farrokhi@FreeBSD.org
 COMMENT=	A network monitoring daemon
 
 GNU_CONFIGURE=		yes
diff --git a/net-mgmt/p0f/Makefile b/net-mgmt/p0f/Makefile
index 6465b98660c3..a56ab9bcc109 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=	babak@farrokhi.net
+MAINTAINER=	farrokhi@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 8172fc91917d..94b88095bd78 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=	babak@farrokhi.net
+MAINTAINER=	farrokhi@FreeBSD.org
 COMMENT=	Analyze raw flow files written by cflowd (Cisco NetFlow data)
 
 .if defined(WITH_FLOW_TOOLS)
diff --git a/net-p2p/opendchub/Makefile b/net-p2p/opendchub/Makefile
index ebe722a92cec..b9431ddf8733 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=	babak@farrokhi.net
+MAINTAINER=	farrokhi@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 932df70ae00e..d612d5079b78 100644
--- a/net/gsk/Makefile
+++ b/net/gsk/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	net devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	babak@farrokhi.net
+MAINTAINER=	farrokhi@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 12a81320701e..cb37d04f62da 100644
--- a/net/htpdate/Makefile
+++ b/net/htpdate/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	0.9.3
 CATEGORIES=	net ipv6
 MASTER_SITES=	http://www.clevervest.com/htp/archive/c/
 
-MAINTAINER=	babak@farrokhi.net
+MAINTAINER=	farrokhi@FreeBSD.org
 COMMENT=	Time synchronization over http utility
 
 USE_BZIP2=	yes
diff --git a/net/mping/Makefile b/net/mping/Makefile
index 21b997be4a60..e1d876ab2bc4 100644
--- a/net/mping/Makefile
+++ b/net/mping/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	2.01
 CATEGORIES=	net ipv6
 MASTER_SITES=	http://mping.uninett.no/
 
-MAINTAINER=	babak@farrokhi.net
+MAINTAINER=	farrokhi@FreeBSD.org
 COMMENT=	Mping network statistics collector
 
 GNU_CONFIGURE=	yes
diff --git a/net/openradius/Makefile b/net/openradius/Makefile
index e586dbc4c5b4..78a64704beef 100644
--- a/net/openradius/Makefile
+++ b/net/openradius/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	net
 MASTER_SITES=	http://www.xs4all.nl/~evbergen/openradius/download/ \
 		http://www.mirrors.wiretapped.net/security/authentication/radius/openradius/
 
-MAINTAINER=	babak@farrokhi.net
+MAINTAINER=	farrokhi@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 0f42e4d093bf..d3ae34645052 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=	babak@farrokhi.net
+MAINTAINER=	farrokhi@FreeBSD.org
 COMMENT=	Perl interface to GNU Gnats daemon
 
 PERL_CONFIGURE=	yes
diff --git a/net/pathneck/Makefile b/net/pathneck/Makefile
index 4ea620ae5d06..71b18df93269 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=	babak@farrokhi.net
+MAINTAINER=	farrokhi@FreeBSD.org
 COMMENT=	Active network path probing tool
 
 PLIST_FILES=	sbin/pathneck \
diff --git a/net/tapidbus/Makefile b/net/tapidbus/Makefile
index cfdb1e1f05cf..d24f872351db 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=	babak@farrokhi.net
+MAINTAINER=	farrokhi@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 06e5d666066e..3c173cc32597 100644
--- a/net/tcpslice/Makefile
+++ b/net/tcpslice/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	2006.04.17
 CATEGORIES=	net
 MASTER_SITES=	http://www.tcpdump.org/weekly/
 
-MAINTAINER=	babak@farrokhi.net
+MAINTAINER=	farrokhi@FreeBSD.org
 COMMENT=	A tool for extracting portions of pcap files
 
 MAN1=		tcpslice.1
diff --git a/security/lsh/Makefile b/security/lsh/Makefile
index e125b617e7f5..5b16e41a147e 100644
--- a/security/lsh/Makefile
+++ b/security/lsh/Makefile
@@ -14,7 +14,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.asc
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
-MAINTAINER=	babak@farrokhi.net
+MAINTAINER=	farrokhi@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/rkhunter/Makefile b/security/rkhunter/Makefile
index 260ab29558a2..8a23280f1c0b 100644
--- a/security/rkhunter/Makefile
+++ b/security/rkhunter/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	security
 MASTER_SITES=	http://downloads.rootkit.nl/ \
 		http://mirror.trouble-free.net/sources/
 
-MAINTAINER=	babak@farrokhi.net
+MAINTAINER=	farrokhi@FreeBSD.org
 COMMENT=	Rootkit detection tool
 
 OPTIONS=	LSOF "Use LSOF" on \
diff --git a/security/super/Makefile b/security/super/Makefile
index 54434f08d329..af6364987255 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=	babak@farrokhi.net
+MAINTAINER=	farrokhi@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 7ba284f94f32..2768566b0c5e 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=	babak@farrokhi.net
+MAINTAINER=	farrokhi@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 6385af7ef5ca..45b92649db93 100644
--- a/sysutils/ntfsprogs/Makefile
+++ b/sysutils/ntfsprogs/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	linux-ntfs
 
-MAINTAINER=	babak@farrokhi.net
+MAINTAINER=	farrokhi@FreeBSD.org
 COMMENT=	Utilities and library to manipulate NTFS partitions
 
 GNU_CONFIGURE=	yes
diff --git a/textproc/fa-aspell/Makefile b/textproc/fa-aspell/Makefile
index 4977dea9e309..192a14db8282 100644
--- a/textproc/fa-aspell/Makefile
+++ b/textproc/fa-aspell/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	${DICT}-aspell
 DISTVERSION=	6-fa-0.10-0
 CATEGORIES=	textproc
 
-MAINTAINER=	babak@farrokhi.net
+MAINTAINER=	farrokhi@FreeBSD.org
 COMMENT=	Aspell Persian (Farsi) dictionary
 
 DICT=	 	fa
diff --git a/www/awstats-devel/Makefile b/www/awstats-devel/Makefile
index af38dfb4bce1..0e38413861c3 100644
--- a/www/awstats-devel/Makefile
+++ b/www/awstats-devel/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	www
 MASTER_SITES=	http://awstats.sourceforge.net/files/
 DISTNAME=	awstats-${PORTVERSION}
 
-MAINTAINER=	babak@farrokhi.net
+MAINTAINER=	farrokhi@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 7394f0504639..18d7c3f0def4 100644
--- a/www/bluefish/Makefile
+++ b/www/bluefish/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	www editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	babak@farrokhi.net
+MAINTAINER=	farrokhi@FreeBSD.org
 COMMENT=	HTML editor designed for the experienced web designer
 
 LIB_DEPENDS=	pcre.0:${PORTSDIR}/devel/pcre-utf8 \
diff --git a/www/coppermine/Makefile b/www/coppermine/Makefile
index 268f195fe316..138c0fb36935 100644
--- a/www/coppermine/Makefile
+++ b/www/coppermine/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=	cpg${PORTVERSION}
 
-MAINTAINER=	babak@farrokhi.net
+MAINTAINER=	farrokhi@FreeBSD.org
 COMMENT=	A web picture gallery script
 
 USE_PHP=	mysql pcre
diff --git a/www/eventum/Makefile b/www/eventum/Makefile
index fae0645bea69..e0dd467ce55c 100644
--- a/www/eventum/Makefile
+++ b/www/eventum/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MYSQL}
 MASTER_SITE_SUBDIR=	eventum
 
-MAINTAINER=	babak@farrokhi.net
+MAINTAINER=	farrokhi@FreeBSD.org
 COMMENT=	Eventum issue tracking system
 
 NO_BUILD=	YES
diff --git a/www/iwebcal/Makefile b/www/iwebcal/Makefile
index 35136b60a5ff..58a7e5a40d45 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=	babak@farrokhi.net
+MAINTAINER=	farrokhi@FreeBSD.org
 COMMENT=	Webbased iCal calendar viewer
 
 NO_BUILD=	yes
diff --git a/www/kannel/Makefile b/www/kannel/Makefile
index 470217a8ec94..524e458c0a78 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=	babak@farrokhi.net
+MAINTAINER=	farrokhi@FreeBSD.org
 COMMENT=	WAP / SMS Gateway
 
 LIB_DEPENDS=	pcre.0:${PORTSDIR}/devel/pcre
diff --git a/www/openxmldir/Makefile b/www/openxmldir/Makefile
index 9158e1f5444d..d6b83b5c15e9 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=	babak@farrokhi.net
+MAINTAINER=	farrokhi@FreeBSD.org
 COMMENT=	PHP based XML menuing system for cisco 79xx IP phones
 
 NO_BUILD=	YES
diff --git a/www/phpmyfaq/Makefile b/www/phpmyfaq/Makefile
index 48a10f51752f..9f0709c8b6ff 100644
--- a/www/phpmyfaq/Makefile
+++ b/www/phpmyfaq/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	www
 MASTER_SITES=	http://www.phpmyfaq.de/download/
 DISTNAME=	${PORTNAME}-${PORTVERSION}.full
 
-MAINTAINER=	babak@farrokhi.net
+MAINTAINER=	farrokhi@FreeBSD.org
 COMMENT=	A multilingual, completely database-driven FAQ-system
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/www/phproxy/Makefile b/www/phproxy/Makefile
index 7d573627e791..ae9afb3b29c8 100644
--- a/www/phproxy/Makefile
+++ b/www/phproxy/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	poxy
 DISTNAME=	poxy-${DISTVERSION}
 
-MAINTAINER=	babak@farrokhi.net
+MAINTAINER=	farrokhi@FreeBSD.org
 COMMENT=	PHP based web proxy
 
 NO_BUILD=	YES
diff --git a/www/phpwiki/Makefile b/www/phpwiki/Makefile
index 0c33e83fd799..b3f0b7078cf0 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=	babak@farrokhi.net
+MAINTAINER=	farrokhi@FreeBSD.org
 COMMENT=	A PHP WikiWikiWeb
 
 CONFLICTS=	phpwiki-1.3*
diff --git a/www/phpwiki13/Makefile b/www/phpwiki13/Makefile
index b70bc94fb030..0ab2aaab774d 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=	babak@farrokhi.net
+MAINTAINER=	farrokhi@FreeBSD.org
 COMMENT=	A PHP WikiWikiWeb
 
 CONFLICTS+=	phpwiki-1.2*
diff --git a/www/pmwiki/Makefile b/www/pmwiki/Makefile
index c46cf5e683e5..56fb3fbed1e2 100644
--- a/www/pmwiki/Makefile
+++ b/www/pmwiki/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	babak@farrokhi.net
+MAINTAINER=	farrokhi@FreeBSD.org
 COMMENT=	A WikiWikiWeb clone using PHP
 
 USE_PHP=	mbstring
diff --git a/www/serendipity-devel/Makefile b/www/serendipity-devel/Makefile
index 8b820f67b973..9d113b083061 100644
--- a/www/serendipity-devel/Makefile
+++ b/www/serendipity-devel/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	www
 MASTER_SITES=	http://www.s9y.org/snapshots/
 DISTNAME=	s9y_${SNAPSHOT}
 
-MAINTAINER=	babak@farrokhi.net
+MAINTAINER=	farrokhi@FreeBSD.org
 COMMENT=	PHP based weblog software
 
 RUN_DEPENDS=	${LOCALBASE}/share/pear/File/Archive.php:${PORTSDIR}/archivers/pear-File_Archive
diff --git a/www/serendipity/Makefile b/www/serendipity/Makefile
index a93b7ebf0e42..998af41ec9d0 100644
--- a/www/serendipity/Makefile
+++ b/www/serendipity/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	php-blog
 
-MAINTAINER=	babak@farrokhi.net
+MAINTAINER=	farrokhi@FreeBSD.org
 COMMENT=	PHP based weblog software
 
 RUN_DEPENDS=	${LOCALBASE}/share/pear/File/Archive.php:${PORTSDIR}/archivers/pear-File_Archive
diff --git a/www/textpattern/Makefile b/www/textpattern/Makefile
index cbf5bbdcca27..7717693c58af 100644
--- a/www/textpattern/Makefile
+++ b/www/textpattern/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	4.0.4
 CATEGORIES=	www
 MASTER_SITES=	http://www.farrokhi.net/distfiles/
 
-MAINTAINER=	babak@farrokhi.net
+MAINTAINER=	farrokhi@FreeBSD.org
 COMMENT=	A free, flexible, elegant, easy-to-use content management system
 
 NO_BUILD=	YES
diff --git a/www/tikiwiki/Makefile b/www/tikiwiki/Makefile
index bea569f3ce1c..1f1a30879342 100644
--- a/www/tikiwiki/Makefile
+++ b/www/tikiwiki/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	babak@farrokhi.net
+MAINTAINER=	farrokhi@FreeBSD.org
 COMMENT=	Powerful PHP based Wiki/CMS/Groupware
 
 USE_PHP=	gettext pcre posix session xml zlib
diff --git a/www/wikindx/Makefile b/www/wikindx/Makefile
index 44cab5507eee..f2ad313b7b6f 100644
--- a/www/wikindx/Makefile
+++ b/www/wikindx/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wikindx
 DISTNAME=	${PORTNAME}${PORTVERSION:S/./_/g}
 
-MAINTAINER=	babak@farrokhi.net
+MAINTAINER=	farrokhi@FreeBSD.org
 COMMENT=	Bibliographic and quotations/notes management system
 
 USE_PHP=	session mysql
diff --git a/x11-fonts/farsifonts/Makefile b/x11-fonts/farsifonts/Makefile
index 1b3fdd1dad36..1e5b29062a7f 100644
--- a/x11-fonts/farsifonts/Makefile
+++ b/x11-fonts/farsifonts/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	x11-fonts
 MASTER_SITES=	http://www.unixified.net/distfiles/ \
 		http://www.farsiweb.info/font/
 
-MAINTAINER=	babak@farrokhi.net
+MAINTAINER=	farrokhi@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 19b54927e77b..ae4eea1c44dd 100644
--- a/x11-themes/cursor-grounation-theme/Makefile
+++ b/x11-themes/cursor-grounation-theme/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	x11-themes
 MASTER_SITES=	http://www.gnome-look.org/content/files/
 DISTNAME=	14484-Grounation-${PORTVERSION}
 
-MAINTAINER=	babak@farrokhi.net
+MAINTAINER=	farrokhi@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 cca04737720c..95eee5047cf2 100644
--- a/x11-themes/cursor-neutral-theme/Makefile
+++ b/x11-themes/cursor-neutral-theme/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	x11-themes
 MASTER_SITES=	http://www.gnome-look.org/content/files/
 DISTNAME=	28310-neutral-${DISTVERSION}
 
-MAINTAINER=	babak@farrokhi.net
+MAINTAINER=	farrokhi@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 1e0e3af64251..ab5e79e12d18 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=	babak@farrokhi.net
+MAINTAINER=	farrokhi@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 346094d3c68c..98488ec7a5ab 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/files/
 DISTNAME=	35093-Envy
 
-MAINTAINER=	babak@farrokhi.net
+MAINTAINER=	farrokhi@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 60802c22146f..c055348e2de6 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/files/
 DISTNAME=	34132-Gray
 
-MAINTAINER=	babak@farrokhi.net
+MAINTAINER=	farrokhi@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 15fce380726a..9cc6afd37ec4 100644
--- a/x11-wm/jwm/Makefile
+++ b/x11-wm/jwm/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://joewing.net/programs/
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	babak@farrokhi.net
+MAINTAINER=	farrokhi@FreeBSD.org
 COMMENT=	Joe's Window Manager
 
 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png