- Change my mail address to araujo@.

Approved by:	stas (mentor)

87 files changed, 87 insertions, 87 deletions

diff --git a/audio/festlex-ogi/Makefile b/audio/festlex-ogi/Makefile
index 2f81865d1b05..efa1c36c9ef1 100644
--- a/audio/festlex-ogi/Makefile
+++ b/audio/festlex-ogi/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES=	${MASTER_SITE_FESTIVAL_OGI}
 DISTNAME=	OGIlexicon-2.2
 DIST_SUBDIR=	festival
 
-MAINTAINER=	araujo@bsdmail.org
+MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	Composite pronunciation dictionary from ogi.edu for Festival
 
 RUN_DEPENDS=	festival:${PORTSDIR}/audio/festival \
diff --git a/audio/festvox-abc/Makefile b/audio/festvox-abc/Makefile
index 6ad6a9ba8c62..7a0031c1a6fa 100644
--- a/audio/festvox-abc/Makefile
+++ b/audio/festvox-abc/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES=	${MASTER_SITE_FESTIVAL_OGI}
 DISTNAME=	voice_abc_di-${PORTVERSION}
 DIST_SUBDIR=	festival
 
-MAINTAINER=	araujo@bsdmail.org
+MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	Mexican Spanish male voice for Festival speech synthesis system
 
 RUN_DEPENDS=	\
diff --git a/audio/festvox-hvs/Makefile b/audio/festvox-hvs/Makefile
index 62633192bd88..a68671ccbd65 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.1
 DIST_SUBDIR=	festival
 
-MAINTAINER=	araujo@bsdmail.org
+MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	Mexican Spanish female voice for Festival
 
 RESTRICTED=	no-commercial-use
diff --git a/audio/mhwaveedit/Makefile b/audio/mhwaveedit/Makefile
index ca86638bb99f..29705312e94d 100644
--- a/audio/mhwaveedit/Makefile
+++ b/audio/mhwaveedit/Makefile
@@ -12,7 +12,7 @@ PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://download.gna.org/mhwaveedit/
 
-MAINTAINER=	araujo@bsdmail.org
+MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	A graphical program for editing sound files
 
 USE_BZIP2=	yes
diff --git a/audio/napster/Makefile b/audio/napster/Makefile
index f679b5807aee..1720b993c1be 100644
--- a/audio/napster/Makefile
+++ b/audio/napster/Makefile
@@ -11,7 +11,7 @@ CATEGORIES+=	audio net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	nap
 
-MAINTAINER?=	araujo@bsdmail.org
+MAINTAINER?=	araujo@FreeBSD.org
 COMMENT?=	An MP3 sharing, search, and chat client for the OpenNAP network
 
 CONFLICTS?=	ru-nap-*
diff --git a/cad/impact/Makefile b/cad/impact/Makefile
index 16ba38d774bf..40e709de69ce 100644
--- a/cad/impact/Makefile
+++ b/cad/impact/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=	Impact-${PORTVERSION}
 
-MAINTAINER=	araujo@bsdmail.org
+MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	Dynamic Finite Element Program Suite
 
 USE_ZIP=	yes
diff --git a/devel/adabooch-doc-html/Makefile b/devel/adabooch-doc-html/Makefile
index 5bd12630ec72..235408168f3f 100644
--- a/devel/adabooch-doc-html/Makefile
+++ b/devel/adabooch-doc-html/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	http://www.adapower.net/booch/download/
 DISTNAME=	bc-html-${PORTVERSION}
 EXTRACT_SUFX=	.zip
 
-MAINTAINER=	araujo@bsdmail.org
+MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	Manual for adabooch
 
 USE_ZIP=	yes
diff --git a/devel/adabooch/Makefile b/devel/adabooch/Makefile
index 500d1d1ff741..43a4c914cdec 100644
--- a/devel/adabooch/Makefile
+++ b/devel/adabooch/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	http://www.adapower.net/booch/download/
 DISTNAME=	bc-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	araujo@bsdmail.org
+MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	Library which provide container classes as well as powertools for Ada
 
 NO_BUILD=	yes
diff --git a/devel/adacurses/Makefile b/devel/adacurses/Makefile
index b160bbf36d28..20dffd3cebaf 100644
--- a/devel/adacurses/Makefile
+++ b/devel/adacurses/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=		${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	ncurses
 DISTNAME=		ncurses-${PORTVERSION}
 
-MAINTAINER=		araujo@bsdmail.org
+MAINTAINER=		araujo@FreeBSD.org
 COMMENT=		Curses library for Ada
 
 BUILD_DEPENDS=		gnat:${PORTSDIR}/lang/gnat
diff --git a/devel/c4/Makefile b/devel/c4/Makefile
index d5312c3a6fbe..e23d18325696 100644
--- a/devel/c4/Makefile
+++ b/devel/c4/Makefile
@@ -11,7 +11,7 @@ CATEGORIES+=	devel
 MASTER_SITES=	ftp://ftp.perforce.com/perforce/utils/c4/
 DISTNAME=	${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	araujo@bsdmail.org
+MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	A CVS-like Frontend to Perforce
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/devel/inilib/Makefile b/devel/inilib/Makefile
index 3004942c56ae..d6c054247ce5 100644
--- a/devel/inilib/Makefile
+++ b/devel/inilib/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	araujo@bsdmail.org
+MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	A C++ lib which provides a method of saving the "state" of a program
 
 GNU_CONFIGURE=	yes
diff --git a/devel/jep/Makefile b/devel/jep/Makefile
index 9515a1a0b872..230595c121ac 100644
--- a/devel/jep/Makefile
+++ b/devel/jep/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	devel java python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	jepp
 
-MAINTAINER=	araujo@bsdmail.org
+MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	Java Embedded Python
 
 HAS_CONFIGURE=	yes
diff --git a/devel/libol/Makefile b/devel/libol/Makefile
index 335667be0e09..f146e0fa8fc3 100644
--- a/devel/libol/Makefile
+++ b/devel/libol/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	0.3.18
 CATEGORIES=	devel
 MASTER_SITES=	http://www.balabit.com/downloads/libol/0.3/
 
-MAINTAINER=	araujo@bsdmail.org
+MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	Library needed by syslog-ng
 
 USE_AUTOTOOLS=	libtool:15
diff --git a/devel/nx/Makefile b/devel/nx/Makefile
index 5c5b63ca9acb..b9a3836af667 100644
--- a/devel/nx/Makefile
+++ b/devel/nx/Makefile
@@ -13,7 +13,7 @@ CATEGORIES=	devel
 MASTER_SITES=	https://networkx.lanl.gov/download/
 DISTNAME=	networkx-${PORTVERSION}
 
-MAINTAINER=	araujo@bsdmail.org
+MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	Python package for studying network structure, dynamics, and function
 
 BUILD_DEPENDS=	${PYNUMERIC} \
diff --git a/devel/pmk/Makefile b/devel/pmk/Makefile
index c98c24c4a2c6..8eb1a8cce950 100644
--- a/devel/pmk/Makefile
+++ b/devel/pmk/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	pmk
 
-MAINTAINER=	araujo@bsdmail.org
+MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	Pre Make Kit, a sane replacement for autoconf
 
 PKGINSTALL=	${WRKDIR}/pkg-install
diff --git a/devel/ruby-date2/Makefile b/devel/ruby-date2/Makefile
index 5445fbc6cc25..520d3ffc0d8e 100644
--- a/devel/ruby-date2/Makefile
+++ b/devel/ruby-date2/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	http://www.funaba.org/archive/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DIST_SUBDIR=	ruby
 
-MAINTAINER=	araujo@bsdmail.org
+MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	An alternative date class for Ruby
 
 USE_RUBY=	yes
diff --git a/games/glchess/Makefile b/games/glchess/Makefile
index 2540e5ac2930..a9802e083aa7 100644
--- a/games/glchess/Makefile
+++ b/games/glchess/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	araujo@bsdmail.org
+MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	A 3D OpenGL based chess game
 
 RUN_DEPENDS=	${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info \
diff --git a/graphics/eterm-bg/Makefile b/graphics/eterm-bg/Makefile
index fdb47072cc48..19a321fb214c 100644
--- a/graphics/eterm-bg/Makefile
+++ b/graphics/eterm-bg/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	graphics
 MASTER_SITES=	http://www.eterm.org/download/
 DISTNAME=	Eterm-bg-${PORTVERSION}
 
-MAINTAINER=	araujo@bsdmail.org
+MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	Image files for background of Eterm
 
 NO_WRKSUBDIR=	yes
diff --git a/graphics/gifsicle/Makefile b/graphics/gifsicle/Makefile
index 8932b783a465..a6030c89164b 100644
--- a/graphics/gifsicle/Makefile
+++ b/graphics/gifsicle/Makefile
@@ -11,7 +11,7 @@ PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.lcdf.org/gifsicle/
 
-MAINTAINER=	araujo@bsdmail.org
+MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	Manipulates GIF images and animations
 
 GNU_CONFIGURE=	yes
diff --git a/graphics/gliv/Makefile b/graphics/gliv/Makefile
index 05a742959d73..56bdc06adddb 100644
--- a/graphics/gliv/Makefile
+++ b/graphics/gliv/Makefile
@@ -11,7 +11,7 @@ PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://guichaz.free.fr/gliv/files/
 
-MAINTAINER=	araujo@bsdmail.org
+MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	An image viewer that uses Gdk-Pixbuf and OpenGL
 
 LIB_DEPENDS=	gtkglext-x11-1.0.0:${PORTSDIR}/x11-toolkits/gtkglext
diff --git a/graphics/ivtools/Makefile b/graphics/ivtools/Makefile
index bf29d0d1572f..1d4ca1aec1e3 100644
--- a/graphics/ivtools/Makefile
+++ b/graphics/ivtools/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	araujo@bsdmail.org
+MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	Drawing editors derived from idraw
 
 BUILD_DEPENDS=	imake:${X_IMAKE_PORT}
diff --git a/graphics/libqglviewer/Makefile b/graphics/libqglviewer/Makefile
index b83ffefed6de..6ef182b92ef1 100644
--- a/graphics/libqglviewer/Makefile
+++ b/graphics/libqglviewer/Makefile
@@ -13,7 +13,7 @@ CATEGORIES=	graphics
 MASTER_SITES=	http://artis.imag.fr/Members/Gilles.Debunne/QGLViewer/src/
 DISTNAME=	libQGLViewer-${PORTVERSION:R}-${PORTVERSION:E}
 
-MAINTAINER=	araujo@bsdmail.org
+MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	A C++ library helps development of 3D applications
 
 BUILD_DEPENDS=	${QMAKE}:${PORTSDIR}/devel/qmake
diff --git a/graphics/py-freeimagepy/Makefile b/graphics/py-freeimagepy/Makefile
index 93d9f345ef5d..2676d2726604 100644
--- a/graphics/py-freeimagepy/Makefile
+++ b/graphics/py-freeimagepy/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	FreeImagePy_w_dll_${PORTVERSION}
 
-MAINTAINER=	araujo@bsdmail.org
+MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	A FreeImage library python wrapper
 
 LIB_DEPENDS=	freeimage:${PORTSDIR}/graphics/freeimage
diff --git a/java/java-getopt/Makefile b/java/java-getopt/Makefile
index fa3140c45f46..0567379a3fc2 100644
--- a/java/java-getopt/Makefile
+++ b/java/java-getopt/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	ftp://ftp.urbanophile.com/pub/arenn/software/sources/
 PKGNAMEPREFIX=	java-
 DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	araujo@bsdmail.org
+MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	Java version of GNU getopt family functions
 
 USE_JAVA=	yes
diff --git a/java/jcalendar/Makefile b/java/jcalendar/Makefile
index 99318cf49f41..d74aa96af37c 100644
--- a/java/jcalendar/Makefile
+++ b/java/jcalendar/Makefile
@@ -12,7 +12,7 @@ PORTREVISION=	1
 CATEGORIES=	java misc
 MASTER_SITES=	http://www.toedter.com/download/
 
-MAINTAINER=	araujo@bsdmail.org
+MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	Java Date Chooser
 
 USE_ZIP=	yes
diff --git a/java/jcommon/Makefile b/java/jcommon/Makefile
index ae5f164c8f14..be7cfc06dd6d 100644
--- a/java/jcommon/Makefile
+++ b/java/jcommon/Makefile
@@ -13,7 +13,7 @@ CATEGORIES=	java devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	jfreechart
 
-MAINTAINER=	araujo@bsdmail.org
+MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	A collection of useful classes used by JFreeChart and JFreeReport
 
 USE_JAVA=	yes
diff --git a/java/jfreechart/Makefile b/java/jfreechart/Makefile
index 67632bc7814b..4dd8e330a90c 100644
--- a/java/jfreechart/Makefile
+++ b/java/jfreechart/Makefile
@@ -13,7 +13,7 @@ CATEGORIES=	java graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	araujo@bsdmail.org
+MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	A free Java class library for generating charts
 
 RUN_DEPENDS=	${JAVALIBDIR}/jcommon.jar:${PORTSDIR}/java/jcommon
diff --git a/lang/sisc/Makefile b/lang/sisc/Makefile
index 7e0b3c8f662f..82c4236acf36 100644
--- a/lang/sisc/Makefile
+++ b/lang/sisc/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	lang scheme java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	araujo@bsdmail.org
+MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	An extensible Java-based Scheme interpreter
 
 USE_JAVA=	yes
diff --git a/mail/ask/Makefile b/mail/ask/Makefile
index 3ad1225b6bd8..9ee9408faa25 100644
--- a/mail/ask/Makefile
+++ b/mail/ask/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	a-s-k
 
-MAINTAINER=	araujo@bsdmail.org
+MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	Anti Spam Killer content filtering
 
 USE_PYTHON=	yes
diff --git a/mail/exipick/Makefile b/mail/exipick/Makefile
index f2bf456ef6bc..542ead87a7b6 100644
--- a/mail/exipick/Makefile
+++ b/mail/exipick/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	http://jetmore.org/john/code/
 DISTNAME=	${PORTNAME}.${PORTVERSION}
 EXTRACT_SUFX=
 
-MAINTAINER=	araujo@bsdmail.org
+MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	Display messages from Exim queue based on a variety of criteria
 
 PLIST_FILES=	bin/${PORTNAME}
diff --git a/mail/gotmail/Makefile b/mail/gotmail/Makefile
index 3edd1300bada..b247e4bed79c 100644
--- a/mail/gotmail/Makefile
+++ b/mail/gotmail/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	mail perl5
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	araujo@bsdmail.org
+MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	A script to fetch mail from a Hotmail or MSN mailbox
 
 RUN_DEPENDS=	curl:${PORTSDIR}/ftp/curl \
diff --git a/mail/mailrep/Makefile b/mail/mailrep/Makefile
index b121531536e5..e54fc56971e6 100644
--- a/mail/mailrep/Makefile
+++ b/mail/mailrep/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	1.1
 CATEGORIES=	mail sysutils
 MASTER_SITES=	http://server3.bon.matrix.com.br/araujo/pub/mailrep/
 
-MAINTAINER=	araujo@bsdmail.org
+MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	Program for reporting mail log information
 
 NO_BUILD=	yes
diff --git a/mail/prom-wl/Makefile b/mail/prom-wl/Makefile
index 7bf7f6b80b86..0f48ef5a89c4 100644
--- a/mail/prom-wl/Makefile
+++ b/mail/prom-wl/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	2.7.0
 CATEGORIES=	mail elisp
 MASTER_SITES=	http://www.h6.dion.ne.jp/~nytheta/software/pub/
 
-MAINTAINER=	araujo@bsdmail.org
+MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	Procmail reader for Wanderlust on GNU Emacs
 
 # This port requires Wanderlust. But we can't decide which Wanderlust to
diff --git a/mail/pronto/Makefile b/mail/pronto/Makefile
index 550ef6180c18..52ca5d5e5a1e 100644
--- a/mail/pronto/Makefile
+++ b/mail/pronto/Makefile
@@ -10,7 +10,7 @@ PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	http://muhri.net/pronto/
 
-MAINTAINER=	araujo@bsdmail.org
+MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	A Mail Client for Gnome/Gtk written in Perl
 
 BUILD_DEPENDS=\
diff --git a/math/cln/Makefile b/math/cln/Makefile
index 552f8886bd96..27fbb18d85a9 100644
--- a/math/cln/Makefile
+++ b/math/cln/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://www.ginac.de/CLN/ \
 		http://www.mirrors.wiretapped.net/security/cryptography/libraries/math/cln/ \
 		ftp://ftpthep.physik.uni-mainz.de/pub/gnu/
 
-MAINTAINER=	araujo@bsdmail.org
+MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	Class Library for Numbers
 
 LIB_DEPENDS=	gmp.7:${PORTSDIR}/math/libgmp4
diff --git a/math/elmer-umfpack/Makefile b/math/elmer-umfpack/Makefile
index 1b4a51ab3e11..95e61283773c 100644
--- a/math/elmer-umfpack/Makefile
+++ b/math/elmer-umfpack/Makefile
@@ -13,7 +13,7 @@ CATEGORIES=	math
 MASTER_SITES=	ftp://ftp.funet.fi/pub/sci/physics/elmer/src/
 PKGNAMEPREFIX=	elmer-
 
-MAINTAINER=	araujo@bsdmail.org
+MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	UMFPACK library used by ELMER FEM package
 
 WANT_FORTRAN=yes #dummy but future use
diff --git a/math/gdcalc/Makefile b/math/gdcalc/Makefile
index 23d96b22229c..b39652e62a7b 100644
--- a/math/gdcalc/Makefile
+++ b/math/gdcalc/Makefile
@@ -11,7 +11,7 @@ PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	http://bhepple.freeshell.org/dcalc/unix/
 
-MAINTAINER=	araujo@bsdmail.org
+MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	Gnome-based scientific calculator
 
 RUN_DEPENDS=	${LOCALBASE}/bin/gunits:${PORTSDIR}/math/units
diff --git a/math/ruby-algebra/Makefile b/math/ruby-algebra/Makefile
index 8dbd58a04c81..8de8e5d267f7 100644
--- a/math/ruby-algebra/Makefile
+++ b/math/ruby-algebra/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	http://blade.nagaokaut.ac.jp/~sinara/ruby/math/algebra/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DIST_SUBDIR=	ruby
 
-MAINTAINER=	araujo@bsdmail.org
+MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	A Ruby library for mathematical (algebraic) computations
 
 USE_RUBY=	yes
diff --git a/net-mgmt/ipfm/Makefile b/net-mgmt/ipfm/Makefile
index 9d6975b6c67f..0bbdfc140b82 100644
--- a/net-mgmt/ipfm/Makefile
+++ b/net-mgmt/ipfm/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	net-mgmt
 MASTER_SITES=	http://robert.cheramy.net/ipfm/archive/
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	araujo@bsdmail.org
+MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	A bandwidth analysis tool
 
 GNU_CONFIGURE=	yes
diff --git a/net/c3270/Makefile b/net/c3270/Makefile
index b40c3e1f6fe9..53de618ec28b 100644
--- a/net/c3270/Makefile
+++ b/net/c3270/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	http://x3270.bgp.nu/download/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.//g}
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	araujo@bsdmail.org
+MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	Full-screen curses-based remote login to IBM mainframes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:C/([0-9]\.[0-9])(\..*)/\1/}
diff --git a/net/dgd-net/Makefile b/net/dgd-net/Makefile
index 377182e8a8c9..e4dd336bfb81 100644
--- a/net/dgd-net/Makefile
+++ b/net/dgd-net/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	ftp://ftp.dworkin.nl/pub/dgd/archive/ \
 		http://dl.droso.net/ports/
 DISTNAME=	dgd-${PORTVERSION}
 
-MAINTAINER=	araujo@bsdmail.org
+MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	Dworkin's Generic Driver + extra networking support + regexps
 
 NO_CDROM=	no distribution to corporate environment
diff --git a/net/gnet/Makefile b/net/gnet/Makefile
index c1b863e91a98..2deb4f08c257 100644
--- a/net/gnet/Makefile
+++ b/net/gnet/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	1.1.9
 CATEGORIES=	net
 MASTER_SITES=	http://www.gnetlibrary.org/src/
 
-MAINTAINER=	araujo@bsdmail.org
+MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	A simple network library built upon Glib
 
 USE_AUTOTOOLS=	libtool:15
diff --git a/net/hf6to4/Makefile b/net/hf6to4/Makefile
index 7c6dd2dc6592..f5f7cf09f29e 100644
--- a/net/hf6to4/Makefile
+++ b/net/hf6to4/Makefile
@@ -14,7 +14,7 @@ DISTFILES=	hf6to4\?rev=1.3\&content-type=text%2fplain \
 		hf6to4.conf\?rev=1.2\&content-type=text%2fplain
 DIST_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	araujo@bsdmail.org
+MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	Enables 6to4 IPv6 automatic tunnels
 
 NO_BUILD=	yes
diff --git a/net/java-beepcore/Makefile b/net/java-beepcore/Makefile
index cf667997be25..e8df3cd2bce7 100644
--- a/net/java-beepcore/Makefile
+++ b/net/java-beepcore/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}-java
 PKGNAMEPREFIX=	java-
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	araujo@bsdmail.org
+MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	An implementation of BEEP core and BEEP mapping for TCP in Java
 
 RUN_DEPENDS=	${JAVALIBDIR}/xercesImpl.jar:${PORTSDIR}/textproc/xerces-j
diff --git a/net/jcifs/Makefile b/net/jcifs/Makefile
index 3a6fa981805f..9b89b0f1eef9 100644
--- a/net/jcifs/Makefile
+++ b/net/jcifs/Makefile
@@ -13,7 +13,7 @@ CATEGORIES=	net java
 MASTER_SITES=	http://jcifs.samba.org/src/
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	araujo@bsdmail.org
+MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	The Java CIFS Client Library
 
 USE_JAVA=	yes
diff --git a/net/lft/Makefile b/net/lft/Makefile
index 190b52c4924b..74dddb6ef594 100644
--- a/net/lft/Makefile
+++ b/net/lft/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	3.0b
 CATEGORIES=	net
 MASTER_SITES=	GENTOO/distfiles
 
-MAINTAINER=	araujo@bsdmail.org
+MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	Layer 4 Traceroute program
 
 GNU_CONFIGURE=	yes
diff --git a/net/mars_nwe/Makefile b/net/mars_nwe/Makefile
index 538a7209a852..6722bcf51fb7 100644
--- a/net/mars_nwe/Makefile
+++ b/net/mars_nwe/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	ftp://www.compu-art.de/mars_nwe/ \
 DISTNAME=	mars_nwe-0.99.pl20
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	araujo@bsdmail.org
+MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	Netware server emulator for Un*x systems
 
 WRKSRC=		${WRKDIR}/mars_nwe
diff --git a/net/passlogd/Makefile b/net/passlogd/Makefile
index dbf7fdc59c16..cb4cb1656586 100644
--- a/net/passlogd/Makefile
+++ b/net/passlogd/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	0.1f
 CATEGORIES=	net
 MASTER_SITES=	http://www.morphine.com/void/
 
-MAINTAINER=	araujo@bsdmail.org
+MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	Intercept and dump syslog remote log packets
 
 PLIST_FILES=	sbin/passlogd
diff --git a/net/pygopherd/Makefile b/net/pygopherd/Makefile
index 106642245a01..b9bc9ef306e2 100644
--- a/net/pygopherd/Makefile
+++ b/net/pygopherd/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://gopher.quux.org:70/devel/gopher/Downloads/pygopherd/ \
 		http://gopher.quux.org:70/devel/gopher/Downloads/pygopherd/old/
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
-MAINTAINER=	araujo@bsdmail.org
+MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	Multiprotocol Information Server
 
 USE_PYTHON=	yes
diff --git a/palm/synce-kde/Makefile b/palm/synce-kde/Makefile
index 59db48cbcd03..ef9681849b11 100644
--- a/palm/synce-kde/Makefile
+++ b/palm/synce-kde/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	palm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	synce
 
-MAINTAINER=	araujo@bsdmail.org
+MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	SynCE KDE Utilities
 
 LIB_DEPENDS+=	synce.0:${PORTSDIR}/palm/synce-libsynce \
diff --git a/print/abcm2ps/Makefile b/print/abcm2ps/Makefile
index a823b540b43c..dea9eecd5d87 100644
--- a/print/abcm2ps/Makefile
+++ b/print/abcm2ps/Makefile
@@ -9,7 +9,7 @@ PORTVERSION=	5.4.1
 CATEGORIES=	print audio
 MASTER_SITES=	http://moinejf.free.fr/
 
-MAINTAINER=	araujo@bsdmail.org
+MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	Converts ABC to music sheet in PostScript format
 
 GNU_CONFIGURE=	yes
diff --git a/print/enscriptfonts/Makefile b/print/enscriptfonts/Makefile
index 1fa2770e9f53..6c6b6aa6add5 100644
--- a/print/enscriptfonts/Makefile
+++ b/print/enscriptfonts/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	http://muuz.deadbbs.com/FreeBSD/xenscript/
 DISTNAME=	enscript_fonts-0.81
 EXTRACT_SUFX=	.tbz
 
-MAINTAINER=	araujo@bsdmail.org
+MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	More than 120 free- and share-ware fonts to extend enscript-1.5
 
 NO_WRKSUBDIR=	YES
diff --git a/print/gl2ps/Makefile b/print/gl2ps/Makefile
index 0d8b18d69203..46613b92e42f 100644
--- a/print/gl2ps/Makefile
+++ b/print/gl2ps/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	print graphics
 MASTER_SITES=	http://www.geuz.org/gl2ps/src/
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	araujo@bsdmail.org
+MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	A C library providing vector output for OpenGL application
 
 USE_GL=		yes
diff --git a/print/libotf/Makefile b/print/libotf/Makefile
index 69881ecff7f2..545dadc77e82 100644
--- a/print/libotf/Makefile
+++ b/print/libotf/Makefile
@@ -11,7 +11,7 @@ PORTREVISION=	1
 CATEGORIES=	print devel
 MASTER_SITES=	http://www.m17n.org/libotf/
 
-MAINTAINER=	araujo@bsdmail.org
+MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	Library for handling OpenType fonts
 
 LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2
diff --git a/print/mup/Makefile b/print/mup/Makefile
index 90ccbc93d3eb..cc2fa5fccd0e 100644
--- a/print/mup/Makefile
+++ b/print/mup/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	print audio
 MASTER_SITES=	ftp://ftp.arkkra.com/pub/unix/
 DISTFILES=	mup${PORTVERSION:S/.//}src.tar.gz
 
-MAINTAINER=	araujo@bsdmail.org
+MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	A shareware program for typesetting music
 
 USE_XLIB=	yes
diff --git a/science/elmer-eio/Makefile b/science/elmer-eio/Makefile
index 14b86285a9f2..6de1ee1b5fc9 100644
--- a/science/elmer-eio/Makefile
+++ b/science/elmer-eio/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	science
 MASTER_SITES=	ftp://ftp.funet.fi/pub/sci/physics/elmer/src/
 PKGNAMEPREFIX=	elmer-
 
-MAINTAINER=	araujo@bsdmail.org
+MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	ELMER FEM Package Data base Interface
 
 BUILD_DEPENDS+=	gfortran42:${PORTSDIR}/lang/gcc42
diff --git a/science/elmer-hutiter/Makefile b/science/elmer-hutiter/Makefile
index bdbe3ab7ba5f..cf76cc784525 100644
--- a/science/elmer-hutiter/Makefile
+++ b/science/elmer-hutiter/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	science
 MASTER_SITES=	ftp://ftp.funet.fi/pub/sci/physics/elmer/src/
 PKGNAMEPREFIX=	elmer-
 
-MAINTAINER=	araujo@bsdmail.org
+MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	HUTIter library for use in the ELMER FEM package
 
 LIB_DEPENDS=	arpack.1:${PORTSDIR}/math/arpack
diff --git a/science/elmer-matc/Makefile b/science/elmer-matc/Makefile
index 45c6dc9e4949..0a6784c65147 100644
--- a/science/elmer-matc/Makefile
+++ b/science/elmer-matc/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	science
 MASTER_SITES=	ftp://ftp.funet.fi/pub/sci/physics/elmer/src/
 PKGNAMEPREFIX=	elmer-
 
-MAINTAINER=	araujo@bsdmail.org
+MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	MatC language library used by ELMER FEM package
 
 GNU_CONFIGURE=	yes
diff --git a/science/elmer-meshgen2d/Makefile b/science/elmer-meshgen2d/Makefile
index c719979ef752..cb8e9abf27f8 100644
--- a/science/elmer-meshgen2d/Makefile
+++ b/science/elmer-meshgen2d/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	science
 MASTER_SITES=	ftp://ftp.funet.fi/pub/sci/physics/elmer/src/
 PKGNAMEPREFIX=	elmer-
 
-MAINTAINER=	araujo@bsdmail.org
+MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	A Mesh Generation Utility for use with the ELMER FEM package
 
 WANT_FORTRAN=yes #dummy but future use
diff --git a/science/elmerfront/Makefile b/science/elmerfront/Makefile
index 1cf91d11ff8d..4fffeac7d978 100644
--- a/science/elmerfront/Makefile
+++ b/science/elmerfront/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	science
 MASTER_SITES=	ftp://ftp.funet.fi/pub/sci/physics/elmer/src/
 PKGNAMEPREFIX=	elmer
 
-MAINTAINER=	araujo@bsdmail.org
+MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	Graphical User Interface for the ELMER FEM package
 
 BUILD_DEPENDS=	wish8.4:${PORTSDIR}/x11-toolkits/tk84	\
diff --git a/science/elmergrid/Makefile b/science/elmergrid/Makefile
index 24e20b6548a2..fe9599064df3 100644
--- a/science/elmergrid/Makefile
+++ b/science/elmergrid/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	science
 MASTER_SITES=	ftp://ftp.funet.fi/pub/sci/physics/elmer/src/ \
 		ftp://ftp.funet.fi/pub/sci/physics/elmer/src/old/
 
-MAINTAINER=	araujo@bsdmail.org
+MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	A Mesh Manipulation Utility for use with the ELMER FEM package
 
 ALL_TARGET=
diff --git a/science/elmerpost/Makefile b/science/elmerpost/Makefile
index 11f8e366cfe5..17841924938b 100644
--- a/science/elmerpost/Makefile
+++ b/science/elmerpost/Makefile
@@ -11,7 +11,7 @@ PORTREVISION=	1
 CATEGORIES=	science
 MASTER_SITES=	ftp://ftp.funet.fi/pub/sci/physics/elmer/src/
 
-MAINTAINER=	araujo@bsdmail.org
+MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	Visualization of Numerical Results in the ELMER FEM package
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libmatc.a:${PORTSDIR}/science/elmer-matc	\
diff --git a/security/gss/Makefile b/security/gss/Makefile
index 1e37c4d4110f..7f507ae97fdc 100644
--- a/security/gss/Makefile
+++ b/security/gss/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	http://josefsson.org/${PORTNAME}/releases/ \
 		${MASTER_SITE_GNU_ALPHA}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	araujo@bsdmail.org
+MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	GNU Generic Security Service Library
 
 LIB_DEPENDS=	shishi.0:${PORTSDIR}/security/shishi
diff --git a/security/krb4/Makefile b/security/krb4/Makefile
index 682f97fb953c..ed31cb1dfa95 100644
--- a/security/krb4/Makefile
+++ b/security/krb4/Makefile
@@ -11,7 +11,7 @@ PORTREVISION=	3
 CATEGORIES=	security ipv6
 MASTER_SITES=	ftp://ftp.pdc.kth.se/pub/krb/src/
 
-MAINTAINER=	araujo@bsdmail.org
+MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	KTH Kerberos 4
 
 CONFLICTS=	krb5-[0-9]* heimdal-[0-9]* srp-[0-9]*
diff --git a/security/libwhisker/Makefile b/security/libwhisker/Makefile
index a0d8edcfe26d..81f7678e8247 100644
--- a/security/libwhisker/Makefile
+++ b/security/libwhisker/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	2.1
 CATEGORIES=	security perl5
 MASTER_SITES=	http://www.wiretrip.net/rfp/${PORTNAME}/
 
-MAINTAINER=	araujo@bsdmail.org
+MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	Perl module to create HTTP test scripts
 
 WRKSRC=		${WRKDIR}/${PORTNAME}2-${PORTVERSION}
diff --git a/security/tlswrap/Makefile b/security/tlswrap/Makefile
index 3ef2c0f3ae8e..77dfa9ac8317 100644
--- a/security/tlswrap/Makefile
+++ b/security/tlswrap/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	security
 MASTER_SITES=	http://tlswrap.sunsite.dk/
 DISTNAME=	${PORTNAME}-1.04
 
-MAINTAINER=	araujo@bsdmail.org
+MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	An FTP proxy that wraps data and control with TLS/SSL
 
 GNU_CONFIGURE=	yes
diff --git a/textproc/align/Makefile b/textproc/align/Makefile
index 7239619ec5ad..05b8c7b5408e 100644
--- a/textproc/align/Makefile
+++ b/textproc/align/Makefile
@@ -11,7 +11,7 @@ PORTVERSION=	1.7.1
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.cs.indiana.edu/~kinzler/align/
 
-MAINTAINER=	araujo@bsdmail.org
+MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	Text column alignment filter
 
 USE_PERL5=	yes
diff --git a/textproc/doclifter/Makefile b/textproc/doclifter/Makefile
index 5e8893a63923..06f84c79a7f7 100644
--- a/textproc/doclifter/Makefile
+++ b/textproc/doclifter/Makefile
@@ -11,7 +11,7 @@ PORTVERSION=	2.3
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.catb.org/~esr/doclifter/
 
-MAINTAINER=	araujo@bsdmail.org
+MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	Translates documents written in troff macros to DocBook
 
 USE_PYTHON=	yes
diff --git a/textproc/ruby-xmlconfigfile/Makefile b/textproc/ruby-xmlconfigfile/Makefile
index aad7be792769..de0be4a05a80 100644
--- a/textproc/ruby-xmlconfigfile/Makefile
+++ b/textproc/ruby-xmlconfigfile/Makefile
@@ -13,7 +13,7 @@ PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DISTNAME=	xml-configfile-${PORTVERSION}
 DIST_SUBDIR=	ruby
 
-MAINTAINER=	araujo@bsdmail.org
+MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	A Ruby module for easy handling of XML configuration files
 
 USE_RUBY=	yes
diff --git a/www/asterisk-fop/Makefile b/www/asterisk-fop/Makefile
index c8c6b7360d13..3b66c40e532b 100644
--- a/www/asterisk-fop/Makefile
+++ b/www/asterisk-fop/Makefile
@@ -10,7 +10,7 @@ PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://www.asternic.org/files/
 
-MAINTAINER=	araujo@bsdmail.org
+MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	Flash Operator Panel for the Asterisk PBX
 
 NO_BUILD=	yes
diff --git a/www/bins/Makefile b/www/bins/Makefile
index 4eb109bc6c65..74b7fba6c2d1 100644
--- a/www/bins/Makefile
+++ b/www/bins/Makefile
@@ -11,7 +11,7 @@ PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://download.gna.org/bins/
 
-MAINTAINER=	araujo@bsdmail.org
+MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	Tool to generate HTML photo albums with XML support
 
 RUN_DEPENDS=	\
diff --git a/www/mapedit/Makefile b/www/mapedit/Makefile
index 179f62d7c502..712892b2e6bb 100644
--- a/www/mapedit/Makefile
+++ b/www/mapedit/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	www
 MASTER_SITES=	http://www.boutell.com/mapedit/http/
 DISTNAME=	${PORTNAME}${PORTVERSION}
 
-MAINTAINER=	araujo@bsdmail.org
+MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	A WWW authoring tool to create clickable maps
 
 RUN_DEPENDS=	${LOCALBASE}/jdk${JDK_VERSION}/bin/java:${PORTSDIR}/java/jdk11
diff --git a/www/netoffice/Makefile b/www/netoffice/Makefile
index 84650b1180ce..1fc956954e86 100644
--- a/www/netoffice/Makefile
+++ b/www/netoffice/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	netoffice
 
-MAINTAINER=	araujo@bsdmail.org
+MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	NetOffice is a free web based project-management environment
 
 NO_BUILD=	yes
diff --git a/www/postnuke/Makefile b/www/postnuke/Makefile
index 2d446c914800..141fbd870545 100644
--- a/www/postnuke/Makefile
+++ b/www/postnuke/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	www
 MASTER_SITES=	http://noc.postnuke.com/frs/download.php/1340/
 DISTNAME=	PostNuke-0.764
 
-MAINTAINER=	araujo@bsdmail.org
+MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	An automated website package to distribute and manage content
 
 RUN_DEPENDS=	${LOCALBASE}/share/pear/System.php:${PORTSDIR}/devel/pear
diff --git a/www/wordpress-mu/Makefile b/www/wordpress-mu/Makefile
index eeb57538331b..dd1881e51798 100644
--- a/www/wordpress-mu/Makefile
+++ b/www/wordpress-mu/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://ftp.twaren.net/local-distfiles/wpmu/ \
 		ftp://ftp.stu.edu.tw/pub/wpmu/
 DISTNAME=	wordpressmu-${PORTVERSION}
 
-MAINTAINER=	araujo@bsdmail.org
+MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	Multi-user version of the famous WordPress blogging application
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/x11-clocks/sanduhr/Makefile b/x11-clocks/sanduhr/Makefile
index 42c51a5bac65..dc44e09a4570 100644
--- a/x11-clocks/sanduhr/Makefile
+++ b/x11-clocks/sanduhr/Makefile
@@ -11,7 +11,7 @@ PORTREVISION=	1
 CATEGORIES=	x11-clocks gnome
 MASTER_SITES=	http://seehuhn.de/data/
 
-MAINTAINER=	araujo@bsdmail.org
+MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	An alarm clock for GNOME desktop designed as a sand-glass
 
 USE_X_PREFIX=	yes
diff --git a/x11-fm/gnome-commander2/Makefile b/x11-fm/gnome-commander2/Makefile
index 5667b90e2748..f875779e888f 100644
--- a/x11-fm/gnome-commander2/Makefile
+++ b/x11-fm/gnome-commander2/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR=	sources/gnome-commander/1.2
 PKGNAMESUFFIX=	2
 DIST_SUBDIR=	gnome2
 
-MAINTAINER=	araujo@bsdmail.org
+MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	File manager for Gnome2
 
 LIB_DEPENDS=	id3-3.8.3:${PORTSDIR}/audio/id3lib \
diff --git a/x11-toolkits/fox10/Makefile b/x11-toolkits/fox10/Makefile
index 8571c44f8dbe..71b3cd402081 100644
--- a/x11-toolkits/fox10/Makefile
+++ b/x11-toolkits/fox10/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES=	http://www.fox-toolkit.org/ftp/ \
 		ftp://ftp.cfdrc.com/pub/FOX/ \
 		ftp://SunSITE.Informatik.RWTH-Aachen.DE/pub/Linux/fox/
 
-MAINTAINER?=	araujo@bsdmail.org
+MAINTAINER?=	araujo@FreeBSD.org
 COMMENT=	Fast and extensive C++ GUI toolkit
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
diff --git a/x11-toolkits/fox12/Makefile b/x11-toolkits/fox12/Makefile
index fb52929a7450..55a1f967c770 100644
--- a/x11-toolkits/fox12/Makefile
+++ b/x11-toolkits/fox12/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://www.fox-toolkit.org/ftp/ \
 		ftp://ftp.fox-toolkit.org/pub/ \
 		http://fresh.t-systems-sfr.com/unix/src/misc/
 
-MAINTAINER?=	araujo@bsdmail.org
+MAINTAINER?=	araujo@FreeBSD.org
 COMMENT=	Fast and extensive C++ GUI toolkit -- ver.1.2
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
diff --git a/x11-toolkits/fox14/Makefile b/x11-toolkits/fox14/Makefile
index de27cc5218ab..d0f5c30d5e75 100644
--- a/x11-toolkits/fox14/Makefile
+++ b/x11-toolkits/fox14/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://www.fox-toolkit.org/ftp/ \
 		ftp://ftp.fox-toolkit.org/pub/ \
 		http://fresh.t-systems-sfr.com/unix/src/misc/
 
-MAINTAINER?=	araujo@bsdmail.org
+MAINTAINER?=	araujo@FreeBSD.org
 COMMENT=	Fast and extensive C++ GUI toolkit
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
diff --git a/x11-toolkits/fox16/Makefile b/x11-toolkits/fox16/Makefile
index 4293c9fec2e0..a6d538498b1e 100644
--- a/x11-toolkits/fox16/Makefile
+++ b/x11-toolkits/fox16/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	http://www.fox-toolkit.org/ftp/ \
 		http://fresh.t-systems-sfr.com/unix/src/misc/ \
 		http://freebsd.unixfreunde.de/sources/
 
-MAINTAINER?=	araujo@bsdmail.org
+MAINTAINER?=	araujo@FreeBSD.org
 COMMENT=	Fast and extensive C++ GUI toolkit -- ver.1.6
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
diff --git a/x11-toolkits/fxscintilla/Makefile b/x11-toolkits/fxscintilla/Makefile
index ba2084a74000..021901bc453c 100644
--- a/x11-toolkits/fxscintilla/Makefile
+++ b/x11-toolkits/fxscintilla/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	araujo@bsdmail.org
+MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	A Fox toolkit reimplementation of Scintilla editing widget
 
 USE_AUTOTOOLS=	libtool:15
diff --git a/x11-toolkits/py-anygui/Makefile b/x11-toolkits/py-anygui/Makefile
index ff5de0d4cd57..93c75d8f7cb8 100644
--- a/x11-toolkits/py-anygui/Makefile
+++ b/x11-toolkits/py-anygui/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	araujo@bsdmail.org
+MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	Generic GUI-creation front-end for Python
 
 BUILD_DEPENDS=	${PYDISTUTILS}
diff --git a/x11-toolkits/ruby-fox10/Makefile b/x11-toolkits/ruby-fox10/Makefile
index e9a0e3f20f13..824101b93e11 100644
--- a/x11-toolkits/ruby-fox10/Makefile
+++ b/x11-toolkits/ruby-fox10/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DISTNAME=	FXRuby-${PORTVERSION}
 DIST_SUBDIR=	ruby
 
-MAINTAINER=	araujo@bsdmail.org
+MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	Ruby extension module to use FOX, aka FXRuby
 
 #BUILD_DEPENDS=	swig1.3:${PORTSDIR}/devel/swig13
diff --git a/x11-toolkits/ruby-fox12/Makefile b/x11-toolkits/ruby-fox12/Makefile
index afc8e13b38cb..a6cc38fb2117 100644
--- a/x11-toolkits/ruby-fox12/Makefile
+++ b/x11-toolkits/ruby-fox12/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DISTNAME=	FXRuby-${PORTVERSION}
 DIST_SUBDIR=	ruby
 
-MAINTAINER=	araujo@bsdmail.org
+MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	Ruby extension module to use FOX 1.2, aka FXRuby
 
 LIB_DEPENDS=	FOX-1.2:${PORTSDIR}/x11-toolkits/fox12 \
diff --git a/x11-toolkits/viewklass/Makefile b/x11-toolkits/viewklass/Makefile
index 42949bb9a62b..8acfedd088a9 100644
--- a/x11-toolkits/viewklass/Makefile
+++ b/x11-toolkits/viewklass/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=	ViewKlass-${PORTVERSION}
 
-MAINTAINER=	araujo@bsdmail.org
+MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	C++ Framework for Motif
 
 BUILD_DEPENDS=	xmkmf:${X_IMAKE_PORT}
diff --git a/x11/xbindkeys/Makefile b/x11/xbindkeys/Makefile
index 110812de9e9b..5f7597d5bc2e 100644
--- a/x11/xbindkeys/Makefile
+++ b/x11/xbindkeys/Makefile
@@ -12,7 +12,7 @@ PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://hocwp.free.fr/xbindkeys/
 
-MAINTAINER=	araujo@bsdmail.org
+MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	Allows you to launch shell commands under X with your keyboard
 
 OPTIONS=	GUILE "Guile support" off \