Update my e-mail address

Approved by:	krion (mentor, implicit)

41 files changed, 70 insertions, 70 deletions

diff --git a/archivers/linux-unace/Makefile b/archivers/linux-unace/Makefile
index f3c2eab98031..ddf1e9b110d6 100644
--- a/archivers/linux-unace/Makefile
+++ b/archivers/linux-unace/Makefile
@@ -1,6 +1,6 @@
 # New ports collection makefile for: linunace
 # Date created:		9 November 2005
-# Whom:			Andrew Pantyukhin <infofarmer@gmail.com>
+# Whom:			Andrew Pantyukhin <infofarmer@FreeBSD.org>
 #
 # $FreeBSD$
 #
@@ -14,7 +14,7 @@ PKGNAMEPREFIX=	linux-
 DISTNAME=	lin${PORTNAME}${PORTVERSION:S/.//}
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	infofarmer@gmail.com
+MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	Extract, view & test ACE archives
 
 NO_PACKAGE=	"Distribution is permitted within the original package only"
diff --git a/audio/bmp-crossfade/Makefile b/audio/bmp-crossfade/Makefile
index bb2d4d562406..8d0ac5bbf3f0 100644
--- a/audio/bmp-crossfade/Makefile
+++ b/audio/bmp-crossfade/Makefile
@@ -1,6 +1,6 @@
 # New ports collection makefile for:	bmp-crossfade
 # Date created:		1 January 2006
-# Whom:			Andrew Pantyukhin <infofarmer@gmail.com>
+# Whom:			Andrew Pantyukhin <infofarmer@FreeBSD.org>
 #
 # $FreeBSD$
 #
diff --git a/audio/bmp-mac/Makefile b/audio/bmp-mac/Makefile
index 063c5460c78d..8ac11d08a9d5 100644
--- a/audio/bmp-mac/Makefile
+++ b/audio/bmp-mac/Makefile
@@ -1,6 +1,6 @@
 # New ports collection makefile for:	bmp-mac
 # Date Created:		17 January 2006
-# Whom:			Andrew Pantyukhin <infofarmer@gmail.com>
+# Whom:			Andrew Pantyukhin <infofarmer@FreeBSD.org>
 #
 # $FreeBSD$
 
@@ -12,7 +12,7 @@ MASTER_SITE_SUBDIR=	mac-port
 PKGNAMEPREFIX=	bmp-
 DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	infofarmer@gmail.com
+MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	Monkey's Audio Codec non-win32 port
 
 LIB_DEPENDS=	beep.2:${PORTSDIR}/multimedia/beep-media-player \
diff --git a/audio/bmp-modplug/Makefile b/audio/bmp-modplug/Makefile
index 75172cf62b79..1ddbe4d58524 100644
--- a/audio/bmp-modplug/Makefile
+++ b/audio/bmp-modplug/Makefile
@@ -1,6 +1,6 @@
 # New ports collection makefile for:	bmp-modplug
 # Date created:		2 January 2006
-# Whom:			Andrew Pantyukhin <infofarmer@gmail.com>
+# Whom:			Andrew Pantyukhin <infofarmer@FreeBSD.org>
 #
 # $FreeBSD$
 #
@@ -23,7 +23,7 @@ MASTER_SITES=	ftp://ftp.dvo.ru/pub/Gentoo/distfiles/ \
 PKGNAMEPREFIX=	bmp-
 DISTNAME=	${PORTNAME}${PKGNAMEPREFIX}2.05
 
-MAINTAINER=	infofarmer@gmail.com
+MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	A modplug-based plugin for beep-media-player
 
 LIB_DEPENDS?=	beep.2:${PORTSDIR}/multimedia/beep-media-player
diff --git a/audio/laudio/Makefile b/audio/laudio/Makefile
index 92d79c8c0372..90462eabac32 100644
--- a/audio/laudio/Makefile
+++ b/audio/laudio/Makefile
@@ -1,6 +1,6 @@
 # New ports collection makefile for:	laudio
 # Date created:		18 October 2005
-# Whom:			Andrew Pantyukhin <infofarmer@gmail.com>
+# Whom:			Andrew Pantyukhin <infofarmer@FreeBSD.org>
 #
 # $FreeBSD$
 #
@@ -12,7 +12,7 @@ MASTER_SITES=	http://www.lossless-audio.com/ \
 		http://www.csme.ru/filez/
 DISTNAME=	la04
 
-MAINTAINER=	infofarmer@gmail.com
+MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	A free lossless audio codec
 
 ONLY_FOR_ARCHS=	amd64 i386
diff --git a/audio/xmms-crossfade/Makefile b/audio/xmms-crossfade/Makefile
index 41cd6e72473f..84ab04d97b1d 100644
--- a/audio/xmms-crossfade/Makefile
+++ b/audio/xmms-crossfade/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES=	http://www.eisenlohr.org/xmms-crossfade/ \
 PKGNAMEPREFIX=	${APP}-
 DISTNAME=	xmms-${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	infofarmer@gmail.com
+MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	A Crossfading/Gapless Plugin
 
 LIB_DEPENDS?=	xmms.4:${PORTSDIR}/multimedia/xmms
diff --git a/audio/xmms-modplug/Makefile b/audio/xmms-modplug/Makefile
index 3bc27be64c81..177a54ba1c2c 100644
--- a/audio/xmms-modplug/Makefile
+++ b/audio/xmms-modplug/Makefile
@@ -1,6 +1,6 @@
 # New ports collection makefile for:	xmms-modplug
 # Date created:		8 January 2006
-# Whom:			Andrew Pantyukhin <infofarmer@gmail.com>
+# Whom:			Andrew Pantyukhin <infofarmer@FreeBSD.org>
 #
 # $FreeBSD$
 #
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}-${PKGNAMEPREFIX:S/-//}
 PKGNAMEPREFIX=	xmms-
 DISTNAME=	${PORTNAME}${PKGNAMEPREFIX}2.05
 
-MAINTAINER=	infofarmer@gmail.com
+MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	A modplug-based plugin for XMMS
 
 LIB_DEPENDS?=	xmms.4:${PORTSDIR}/multimedia/xmms
diff --git a/converters/htx/Makefile b/converters/htx/Makefile
index cef935debecf..61057da14abf 100644
--- a/converters/htx/Makefile
+++ b/converters/htx/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://stuff.myrealm.co.uk/htx/ \
 		http://bsd2.csme.ru/myports/ \
 		http://bsd3.csme.ru/myports/
 
-MAINTAINER=	infofarmer@gmail.com
+MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	HTML to XHTML converter
 
 USE_PERL5=	yes
diff --git a/deskutils/bitcollider/Makefile b/deskutils/bitcollider/Makefile
index 15951f49589a..11793e73726e 100644
--- a/deskutils/bitcollider/Makefile
+++ b/deskutils/bitcollider/Makefile
@@ -1,6 +1,6 @@
 # New ports collection makefile for:	bitcollider
 # Date created:		7 January 2006
-# Whom:			Andrew Pantyukhin <infofarmer@gmail.com>
+# Whom:			Andrew Pantyukhin <infofarmer@FreeBSD.org>
 #
 # $FreeBSD$
 #
@@ -11,7 +11,7 @@ CATEGORIES=	deskutils multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	infofarmer@gmail.com
+MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	A Bitzi metadata generator
 
 .include <bsd.port.pre.mk>
diff --git a/deskutils/plans/Makefile b/deskutils/plans/Makefile
index f61ef49ce922..c3ecdacbfb43 100644
--- a/deskutils/plans/Makefile
+++ b/deskutils/plans/Makefile
@@ -23,7 +23,7 @@ DISTFILES=	${PORTNAME}_${PORTVERSION}${EXTRACT_SUFX}:plans \
 DIST_SUBDIR=	${PORTNAME}
 EXTRACT_ONLY=	${PORTNAME}_${PORTVERSION}${EXTRACT_SUFX}
 
-MAINTAINER=	infofarmer@gmail.com
+MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	A Good Web Calendar
 
 USE_ZIP=	yes
diff --git a/deskutils/when/Makefile b/deskutils/when/Makefile
index 670f5e13dd14..1144365b6053 100644
--- a/deskutils/when/Makefile
+++ b/deskutils/when/Makefile
@@ -1,6 +1,6 @@
 # New ports collection makefile for:	when
 # Date created:		1 May 2006
-# Whom:			Andrew Pantyukhin <infofarmer@gmail.com>
+# Whom:			Andrew Pantyukhin <infofarmer@FreeBSD.org>
 #
 # $FreeBSD$
 #
@@ -12,7 +12,7 @@ MASTER_SITES=	http://bsd1.csme.ru/myports/ \
 		http://bsd2.csme.ru/myports/ \
 		http://bsd3.csme.ru/myports/
 
-MAINTAINER=	infofarmer@gmail.com
+MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	A very simple personal calendar
 
 USE_BZIP2=	yes
diff --git a/ftp/cmdftp/Makefile b/ftp/cmdftp/Makefile
index 97c29f0089e5..3d85506c9df9 100644
--- a/ftp/cmdftp/Makefile
+++ b/ftp/cmdftp/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	ftp
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	infofarmer@gmail.com
+MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	Command line shell-like ftp client
 
 GNU_CONFIGURE=	yes
diff --git a/games/freeciv/Makefile b/games/freeciv/Makefile
index 6c6d478f31dc..c9e414b8a911 100644
--- a/games/freeciv/Makefile
+++ b/games/freeciv/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	ftp://ftp.freeciv.org/pub/freeciv/stable/ \
 		ftp://ftp.netc.pt/pub/freeciv/stable/ \
 		ftp://ftp.pvv.ntnu.no/pub/freeciv/stable/
 
-MAINTAINER?=	infofarmer@gmail.com
+MAINTAINER?=	infofarmer@FreeBSD.org
 COMMENT?=	A civilisation clone for X11; multiplayer
 
 LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff \
diff --git a/graphics/dcraw/Makefile b/graphics/dcraw/Makefile
index a50f36e15796..24d9ca0a6b4a 100644
--- a/graphics/dcraw/Makefile
+++ b/graphics/dcraw/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://bsd1.csme.ru/myports/ \
 		http://bsd3.csme.ru/myports/ \
 		http://www.piwebs.com/distfiles/${PORTNAME}/
 
-MAINTAINER=	infofarmer@gmail.com
+MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	Decoder for RAW files from digital cameras
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
diff --git a/mail/linux-thunderbird/Makefile b/mail/linux-thunderbird/Makefile
index dc706fc3e067..5100aa12e4f0 100644
--- a/mail/linux-thunderbird/Makefile
+++ b/mail/linux-thunderbird/Makefile
@@ -1,6 +1,6 @@
 # New ports collection makefile for:	linux-thunderbird
 # Date created:		17 April 2006
-# Whom:			Andrew Pantyukhin <infofarmer@gmail.com>
+# Whom:			Andrew Pantyukhin <infofarmer@FreeBSD.org>
 #
 # $FreeBSD$
 #
@@ -10,7 +10,7 @@ PORTVERSION=	1.5.0.2
 CATEGORIES=	mail
 MASTER_SITE_SUBDIR?=	${PORTNAME}/releases/${PORTVERSION}/linux-i686/en-US
 
-MAINTAINER=	infofarmer@gmail.com
+MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	Mozilla Thunderbird is standalone mail and news that stands above
 
 .include "${.CURDIR}/../../www/linux-seamonkey/Makefile.common"
diff --git a/multimedia/subtools/Makefile b/multimedia/subtools/Makefile
index 604e72b908f8..0fdf2d1e4151 100644
--- a/multimedia/subtools/Makefile
+++ b/multimedia/subtools/Makefile
@@ -1,6 +1,6 @@
 # New ports collection makefile for:	subtools
 # Date created:		10 January 2005
-# Whom:			Andrew Pantyukhin <infofarmer@gmail.com>
+# Whom:			Andrew Pantyukhin <infofarmer@FreeBSD.org>
 #
 # $FreeBSD$
 #
@@ -12,7 +12,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=	${PORTNAME}-${PORTVERSION}alpha
 
-MAINTAINER=	infofarmer@gmail.com
+MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	Command-line tools for movie subtitles in SubRipper format
 
 PLIST_FILES=	bin/laudio
diff --git a/net-im/cjc/Makefile b/net-im/cjc/Makefile
index fab842b89799..b8db1fa8eb98 100644
--- a/net-im/cjc/Makefile
+++ b/net-im/cjc/Makefile
@@ -1,6 +1,6 @@
 # New ports collection makefile for:	cjc
 # Date created:		19 April 2006
-# Whom:			Andrew Pantyukhin <infofarmer@gmail.com>
+# Whom:			Andrew Pantyukhin <infofarmer@FreeBSD.org>
 #
 # $FreeBSD$
 #
@@ -10,7 +10,7 @@ PORTVERSION=	1.0.0
 CATEGORIES=	net-im python
 MASTER_SITES=	http://jabberstudio.2nw.net/cjc/
 
-MAINTAINER=	infofarmer@gmail.com
+MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	The Console Jabber Client
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyxmpp>=1.0.0:${PORTSDIR}/net-im/py-pyxmpp
diff --git a/net-im/py-xmpppy-irc/Makefile b/net-im/py-xmpppy-irc/Makefile
index 831edccf33d5..762580f27c60 100644
--- a/net-im/py-xmpppy-irc/Makefile
+++ b/net-im/py-xmpppy-irc/Makefile
@@ -1,6 +1,6 @@
 # Ports collection makefile for:	py-irc-transport
 # Date created:				21 April 2006
-# Whom:					Andrew Pantyukhin <infofarmer@gmail.com>
+# Whom:					Andrew Pantyukhin <infofarmer@FreeBSD.org>
 #
 # $FreeBSD$
 #
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR=	xmpppy
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	irc-transport-${PORTVERSION}
 
-MAINTAINER=	infofarmer@gmail.com
+MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	An xmpp to irc transport
 
 RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/xmpp/__init__.py:${PORTSDIR}/net-im/py-xmpppy \
diff --git a/net-im/py-xmpppy/Makefile b/net-im/py-xmpppy/Makefile
index cb16cfca2edc..9075da8b77db 100644
--- a/net-im/py-xmpppy/Makefile
+++ b/net-im/py-xmpppy/Makefile
@@ -1,6 +1,6 @@
 # Ports collection makefile for:	py-xmpppy
 # Date created:				21 April 2006
-# Whom:					Andrew Pantyukhin <infofarmer@gmail.com>
+# Whom:					Andrew Pantyukhin <infofarmer@FreeBSD.org>
 #
 # $FreeBSD$
 #
@@ -12,7 +12,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	infofarmer@gmail.com
+MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	A Python library that provides easy scripting with Jabber
 
 USE_PYTHON=	2.3+
diff --git a/net/spoofer/Makefile b/net/spoofer/Makefile
index 75d747163a0a..4acae4cbc062 100644
--- a/net/spoofer/Makefile
+++ b/net/spoofer/Makefile
@@ -1,6 +1,6 @@
 # New ports collection makefile for:	spoofer
 # Date created:		6 February 2006
-# Whom:			Andrew Pantyukhin <infofarmer@gmail.com>
+# Whom:			Andrew Pantyukhin <infofarmer@FreeBSD.org>
 #
 # $FreeBSD$
 #
@@ -10,7 +10,7 @@ PORTVERSION=	0.4
 CATEGORIES=	net
 MASTER_SITES=	http://spoofer.csail.mit.edu/
 
-MAINTAINER=	infofarmer@gmail.com
+MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	ANA Spoofer Project testing software
 
 PLIST_FILES=	bin/spoofer
diff --git a/print/cups-smb-backend/Makefile b/print/cups-smb-backend/Makefile
index bdd5f580a832..67c7a51e049c 100644
--- a/print/cups-smb-backend/Makefile
+++ b/print/cups-smb-backend/Makefile
@@ -1,6 +1,6 @@
 # New ports collection makefile for:	cups-smb-backend
 # Date created:		12 November 2005
-# Whom:			Andrew Pantyukhin <infofarmer@gmail.com>
+# Whom:			Andrew Pantyukhin <infofarmer@FreeBSD.org>
 #
 # $FreeBSD$
 #
@@ -11,7 +11,7 @@ CATEGORIES=	print
 MASTER_SITES=	# empty
 DISTFILES=	# empty
 
-MAINTAINER=	infofarmer@gmail.com
+MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	A CUPS backend for printing to Windows servers
 
 RUN_DEPENDS=	smbspool:${PORTSDIR}/net/samba3 \
diff --git a/security/parano/Makefile b/security/parano/Makefile
index 838993054b54..4994f51c6457 100644
--- a/security/parano/Makefile
+++ b/security/parano/Makefile
@@ -1,6 +1,6 @@
 # New ports collection makefile for:	parano
 # Date created:		3 May 2006
-# Whom:			Andrew Pantyukhin <infofarmer@gmail.com>
+# Whom:			Andrew Pantyukhin <infofarmer@FreeBSD.org>
 #
 # $FreeBSD$
 #
@@ -12,7 +12,7 @@ MASTER_SITES=	http://download.berlios.de/%SUBDIR%/ \
 		http://download2.berlios.de/%SUBDIR%/
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	infofarmer@gmail.com
+MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	A Gnome program to deal with hashfiles
 
 RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/gtk-2.0/gtk/__init__.py:${PORTSDIR}/x11-toolkits/py-gtk2
diff --git a/security/secpanel/Makefile b/security/secpanel/Makefile
index 25b4fa63c67f..e7762da8c6b5 100644
--- a/security/secpanel/Makefile
+++ b/security/secpanel/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES=	http://www.pingx.net/secpanel/ \
 		http://bsd2.csme.ru/myports/ \
 		http://bsd3.csme.ru/myports/
 
-MAINTAINER=	infofarmer@gmail.com
+MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	GUI for managing and running ssh and related utilities
 
 RUN_DEPENDS=	ssh-askpass:${PORTSDIR}/security/openssh-askpass
diff --git a/textproc/archmage/Makefile b/textproc/archmage/Makefile
index 60740023091d..0a70f70b4724 100644
--- a/textproc/archmage/Makefile
+++ b/textproc/archmage/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	textproc python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	infofarmer@gmail.com
+MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	Extensible reader/decompiler of files in CHM format
 
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/chm/chm.py:${PORTSDIR}/textproc/pychm
diff --git a/textproc/redet/Makefile b/textproc/redet/Makefile
index 66e45ef8f8b0..28212bc88bec 100644
--- a/textproc/redet/Makefile
+++ b/textproc/redet/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	http://bsd1.csme.ru/myports/ \
 		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	vsevolod
 
-MAINTAINER=	infofarmer@gmail.com
+MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	Visual regexp constructors with many regexp types support
 
 RUN_DEPENDS=	${LOCALBASE}/lib/iwidgets/iwidgets.tcl:${PORTSDIR}/x11-toolkits/iwidgets
diff --git a/www/aria2/Makefile b/www/aria2/Makefile
index 1c34b2bcf4a7..e1666654c4ec 100644
--- a/www/aria2/Makefile
+++ b/www/aria2/Makefile
@@ -1,6 +1,6 @@
 # New ports collection makefile for:	aria2
 # Date created:		1 May 2006
-# Whom:			Andrew Pantyukhin <infofarmer@gmail.com>
+# Whom:			Andrew Pantyukhin <infofarmer@FreeBSD.org>
 #
 # $FreeBSD$
 #
@@ -11,7 +11,7 @@ CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	infofarmer@gmail.com
+MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	Yet another download tool
 
 LIB_DEPENDS=	gnutls.15:${PORTSDIR}/security/gnutls \
diff --git a/www/conkeror/Makefile b/www/conkeror/Makefile
index 9737d2f3337e..78434ff0b1db 100644
--- a/www/conkeror/Makefile
+++ b/www/conkeror/Makefile
@@ -1,6 +1,6 @@
 # New ports collection makefile for:	conkeror
 # Date created:		27 April 2006
-# Whom:			Andrew Pantyukhin <infofarmer@gmail.com>
+# Whom:			Andrew Pantyukhin <infofarmer@FreeBSD.org>
 #
 # $FreeBSD$
 #
@@ -13,7 +13,7 @@ MASTER_SITES=	${MASTER_SITE_MOZDEV}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 PKGNAMEPREFIX?=
 
-MAINTAINER=	infofarmer@gmail.com
+MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	A completely keyboard driven browser based on firefox
 
 RUN_DEPENDS=	${CONK_APP}:${PORTSDIR}/www/${CONK_APP}
diff --git a/www/linux-flock/Makefile b/www/linux-flock/Makefile
index 5bb548f30480..a42145860f47 100644
--- a/www/linux-flock/Makefile
+++ b/www/linux-flock/Makefile
@@ -1,6 +1,6 @@
 # New ports collection makefile for:	linux-flock
 # Date created:		30 March 2006
-# Whom:			Andrew Pantyukhin <infofarmer@gmail.com>
+# Whom:			Andrew Pantyukhin <infofarmer@FreeBSD.org>
 #
 # $FreeBSD$
 #
@@ -16,7 +16,7 @@ MASTER_SITES=	http://ftp.acc.umu.se/mirror/%SUBDIR%/ \
 		ftp://ftp.mozilla.org/pub/%SUBDIR%/
 MASTER_SITE_SUBDIR=	${PORTNAME}/releases/${PORTVERSION:R}
 
-MAINTAINER=	infofarmer@gmail.com
+MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	The free web browser that makes it easier to share with your friends
 
 .include "${.CURDIR}/../linux-seamonkey/Makefile.common"
diff --git a/www/linux-mozilla/Makefile b/www/linux-mozilla/Makefile
index 9042f4c88e57..c66dc8469030 100644
--- a/www/linux-mozilla/Makefile
+++ b/www/linux-mozilla/Makefile
@@ -12,7 +12,7 @@ PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITE_SUBDIR=	${PORTNAME}/releases/${PORTNAME}${PORTVERSION}
 
-MAINTAINER=	infofarmer@gmail.com
+MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	The open source, standards compliant web browser
 
 RUN_DEPENDS=	${LINUXBASE}/usr/lib/libgtk-1.2.so.0:${PORTSDIR}/x11-toolkits/linux-gtk
diff --git a/www/xpi-adblock/Makefile b/www/xpi-adblock/Makefile
index 41d152dfedce..e8ba753e14ac 100644
--- a/www/xpi-adblock/Makefile
+++ b/www/xpi-adblock/Makefile
@@ -1,6 +1,6 @@
 # New ports collection makefile for:	xpi-adblock
 # Date created:		28 March 2006
-# Whom:			Andrew Pantyukhin <infofarmer@gmail.com>
+# Whom:			Andrew Pantyukhin <infofarmer@FreeBSD.org>
 #
 # $FreeBSD$
 #
@@ -10,7 +10,7 @@ PORTVERSION=	0.5.3.042
 DISTVERSIONSUFFIX=	-fx+fl+mz+ns
 CATEGORIES=	www
 
-MAINTAINER=	infofarmer@gmail.com
+MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	A content filtering extension
 
 XPI_ID=		{34274bf4-1d97-a289-e984-17e546307e4f}
diff --git a/www/xpi-adblock/Makefile.xpi b/www/xpi-adblock/Makefile.xpi
index 3ed401a08397..1c3de09914ca 100644
--- a/www/xpi-adblock/Makefile.xpi
+++ b/www/xpi-adblock/Makefile.xpi
@@ -1,6 +1,6 @@
 # New ports collection makefile for:	xpi infrastructure
 # Date created:		28 March 2006
-# Whom:			Andrew Pantyukhin <infofarmer@gmail.com>
+# Whom:			Andrew Pantyukhin <infofarmer@FreeBSD.org>
 #
 # $FreeBSD$
 #
diff --git a/www/xpi-colorfultabs/Makefile b/www/xpi-colorfultabs/Makefile
index 138ac3fe1d4c..ae157d2f395e 100644
--- a/www/xpi-colorfultabs/Makefile
+++ b/www/xpi-colorfultabs/Makefile
@@ -1,6 +1,6 @@
 # New ports collection makefile for:	xpi-colorfultabs
 # Date created:		29 March 2006
-# Whom:			Andrew Pantyukhin <infofarmer@gmail.com>
+# Whom:			Andrew Pantyukhin <infofarmer@FreeBSD.org>
 #
 # $FreeBSD$
 #
@@ -10,7 +10,7 @@ PORTVERSION=	1.1
 DISTVERSIONSUFFIX=	-fx+mz
 CATEGORIES=	www
 
-MAINTAINER=	infofarmer@gmail.com
+MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	An extension that colors every tab in a different color
 
 XPI_ID=		{0545b830-f0aa-4d7e-8820-50a4629a56fe}
diff --git a/www/xpi-conkeror/Makefile b/www/xpi-conkeror/Makefile
index 9737d2f3337e..78434ff0b1db 100644
--- a/www/xpi-conkeror/Makefile
+++ b/www/xpi-conkeror/Makefile
@@ -1,6 +1,6 @@
 # New ports collection makefile for:	conkeror
 # Date created:		27 April 2006
-# Whom:			Andrew Pantyukhin <infofarmer@gmail.com>
+# Whom:			Andrew Pantyukhin <infofarmer@FreeBSD.org>
 #
 # $FreeBSD$
 #
@@ -13,7 +13,7 @@ MASTER_SITES=	${MASTER_SITE_MOZDEV}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 PKGNAMEPREFIX?=
 
-MAINTAINER=	infofarmer@gmail.com
+MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	A completely keyboard driven browser based on firefox
 
 RUN_DEPENDS=	${CONK_APP}:${PORTSDIR}/www/${CONK_APP}
diff --git a/www/xpi-fasterfox/Makefile b/www/xpi-fasterfox/Makefile
index 23da28d74e74..88358ee3d54a 100644
--- a/www/xpi-fasterfox/Makefile
+++ b/www/xpi-fasterfox/Makefile
@@ -1,6 +1,6 @@
 # New ports collection makefile for:	xpi-fasterfox
 # Date created:		28 March 2006
-# Whom:			Andrew Pantyukhin <infofarmer@gmail.com>
+# Whom:			Andrew Pantyukhin <infofarmer@FreeBSD.org>
 #
 # $FreeBSD$
 #
@@ -10,7 +10,7 @@ PORTVERSION=	1.0.3
 DISTVERSIONSUFFIX=	-fx
 CATEGORIES=	www
 
-MAINTAINER=	infofarmer@gmail.com
+MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	Performance and network tweaks for Firefox
 
 XPI_ID=		{c36177c0-224a-11da-8cd6-0800200c9a66}
diff --git a/www/xpi-mldonkey/Makefile b/www/xpi-mldonkey/Makefile
index d2a1c693b321..8a3afab97797 100644
--- a/www/xpi-mldonkey/Makefile
+++ b/www/xpi-mldonkey/Makefile
@@ -1,6 +1,6 @@
 # New ports collection makefile for:	xpi-mldonkey
 # Date created:		18 April 2006
-# Whom:			Andrew Pantyukhin <infofarmer@gmail.com>
+# Whom:			Andrew Pantyukhin <infofarmer@FreeBSD.org>
 #
 # $FreeBSD$
 #
@@ -11,7 +11,7 @@ CATEGORIES=	www net-p2p
 MASTER_SITES=	http://www.informatik.uni-oldenburg.de/~dyna/${PORTNAME}/${PORTVERSION}/
 DISTNAME=	mldonkey_protocol_handler-${PORTVERSION}
 
-MAINTAINER=	infofarmer@gmail.com
+MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	A ed2k, magnet and sig2dat protocol handling extension
 
 XPI_ID=		{bc72206d-b3ce-4b49-88b9-d59b388a0cde}
diff --git a/www/xpi-noscript/Makefile b/www/xpi-noscript/Makefile
index b74929807b30..826f49c370ce 100644
--- a/www/xpi-noscript/Makefile
+++ b/www/xpi-noscript/Makefile
@@ -1,6 +1,6 @@
 # New ports collection makefile for:	xpi-noscript
 # Date created:		28 March 2006
-# Whom:			Andrew Pantyukhin <infofarmer@gmail.com>
+# Whom:			Andrew Pantyukhin <infofarmer@FreeBSD.org>
 #
 # $FreeBSD$
 #
@@ -10,7 +10,7 @@ PORTVERSION=	1.1.3.9
 DISTVERSIONSUFFIX=	-fx+fl+mz
 CATEGORIES=	www
 
-MAINTAINER=	infofarmer@gmail.com
+MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	A security-enhancing Java/JS filtering extension
 
 XPI_ID=		{73a6fe31-595d-460b-a920-fcc0f8843232}
diff --git a/www/xpi-tabmixplus/Makefile b/www/xpi-tabmixplus/Makefile
index 6acf13acf762..5da30df1aa5e 100644
--- a/www/xpi-tabmixplus/Makefile
+++ b/www/xpi-tabmixplus/Makefile
@@ -1,6 +1,6 @@
 # New ports collection makefile for:	xpi-tabmixplus
 # Date created:		29 March 2006
-# Whom:			Andrew Pantyukhin <infofarmer@gmail.com>
+# Whom:			Andrew Pantyukhin <infofarmer@FreeBSD.org>
 #
 # $FreeBSD$
 #
@@ -10,7 +10,7 @@ PORTVERSION=	0.3.0.5
 DISTVERSIONSUFFIX=	-fx
 CATEGORIES=	www
 
-MAINTAINER=	infofarmer@gmail.com
+MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	An extension that enhances tab browsing capabilities
 
 XPI_ID=		{dc572301-7619-498c-a57d-39143191b318}
diff --git a/www/yabb/Makefile b/www/yabb/Makefile
index aef2a0fe1fca..7736580135c8 100644
--- a/www/yabb/Makefile
+++ b/www/yabb/Makefile
@@ -1,6 +1,6 @@
 # New ports collection makefile for:	yabb
 # Date created:		20 October 2005
-# Whom:			Andrew Pantyukhin <infofarmer@gmail.com>
+# Whom:			Andrew Pantyukhin <infofarmer@FreeBSD.org>
 #
 # $FreeBSD$
 #
@@ -13,7 +13,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=	YaBB_${PORTVERSION}
 
-MAINTAINER=	infofarmer@gmail.com
+MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	The original free open-source forum written in Perl
 
 NO_PACKAGE=	complicated (de)installation paradigm
diff --git a/x11-themes/linux-f10-hicolor-icon-theme/Makefile b/x11-themes/linux-f10-hicolor-icon-theme/Makefile
index 0ed9ba154b82..62295bdcf697 100644
--- a/x11-themes/linux-f10-hicolor-icon-theme/Makefile
+++ b/x11-themes/linux-f10-hicolor-icon-theme/Makefile
@@ -1,6 +1,6 @@
 # New ports collection makefile for:	linux-hicolor-icon-theme
 # Date created:		7 February 2006
-# Whom:			Andrew Pantyukhin <infofarmer@gmail.com>
+# Whom:			Andrew Pantyukhin <infofarmer@FreeBSD.org>
 #
 # $FreeBSD$
 #
@@ -12,7 +12,7 @@ MASTER_SITES=	# empty
 PKGNAMEPREFIX=	linux-
 DISTFILES=	# empty
 
-MAINTAINER=	infofarmer@gmail.com
+MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	A high-color icon theme shell from the FreeDesktop project
 
 RUN_DEPENDS=	${X11BASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
diff --git a/x11-themes/linux-f8-hicolor-icon-theme/Makefile b/x11-themes/linux-f8-hicolor-icon-theme/Makefile
index 0ed9ba154b82..62295bdcf697 100644
--- a/x11-themes/linux-f8-hicolor-icon-theme/Makefile
+++ b/x11-themes/linux-f8-hicolor-icon-theme/Makefile
@@ -1,6 +1,6 @@
 # New ports collection makefile for:	linux-hicolor-icon-theme
 # Date created:		7 February 2006
-# Whom:			Andrew Pantyukhin <infofarmer@gmail.com>
+# Whom:			Andrew Pantyukhin <infofarmer@FreeBSD.org>
 #
 # $FreeBSD$
 #
@@ -12,7 +12,7 @@ MASTER_SITES=	# empty
 PKGNAMEPREFIX=	linux-
 DISTFILES=	# empty
 
-MAINTAINER=	infofarmer@gmail.com
+MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	A high-color icon theme shell from the FreeDesktop project
 
 RUN_DEPENDS=	${X11BASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
diff --git a/x11-themes/linux-hicolor-icon-theme/Makefile b/x11-themes/linux-hicolor-icon-theme/Makefile
index 0ed9ba154b82..62295bdcf697 100644
--- a/x11-themes/linux-hicolor-icon-theme/Makefile
+++ b/x11-themes/linux-hicolor-icon-theme/Makefile
@@ -1,6 +1,6 @@
 # New ports collection makefile for:	linux-hicolor-icon-theme
 # Date created:		7 February 2006
-# Whom:			Andrew Pantyukhin <infofarmer@gmail.com>
+# Whom:			Andrew Pantyukhin <infofarmer@FreeBSD.org>
 #
 # $FreeBSD$
 #
@@ -12,7 +12,7 @@ MASTER_SITES=	# empty
 PKGNAMEPREFIX=	linux-
 DISTFILES=	# empty
 
-MAINTAINER=	infofarmer@gmail.com
+MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	A high-color icon theme shell from the FreeDesktop project
 
 RUN_DEPENDS=	${X11BASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme