56 files changed, 62 insertions, 62 deletions

diff --git a/benchmarks/iperf/Makefile b/benchmarks/iperf/Makefile
index 3b7dc4d66145..906ea52391b0 100644
--- a/benchmarks/iperf/Makefile
+++ b/benchmarks/iperf/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	http://dast.nlanr.net/Projects/Iperf2.0/ \
 		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	marcus@corp.grupos.com.br
+MAINTAINER=	mnag@FreeBSD.org
 COMMENT=	A tool to measure maximum TCP and UDP bandwidth
 
 NO_CDROM=	"can't charge a fee for the software"
diff --git a/databases/pecl-sqlite/Makefile b/databases/pecl-sqlite/Makefile
index c55c6b3e3803..a9fdf1e197e7 100644
--- a/databases/pecl-sqlite/Makefile
+++ b/databases/pecl-sqlite/Makefile
@@ -14,7 +14,7 @@ DISTNAME=	SQLite-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 DIST_SUBDIR=	PECL
 
-MAINTAINER=	marcus@corp.grupos.com.br
+MAINTAINER=	mnag@FreeBSD.org
 COMMENT=	PECL classes to access sqlite databases
 
 WRKSRC=		${WRKDIR}/SQLite-${PORTVERSION}
diff --git a/databases/py-MySQLdb-devel/Makefile b/databases/py-MySQLdb-devel/Makefile
index 290512058660..5c44f718111a 100644
--- a/databases/py-MySQLdb-devel/Makefile
+++ b/databases/py-MySQLdb-devel/Makefile
@@ -14,7 +14,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 PKGNAMESUFFIX=	-devel
 DISTNAME=	MySQL-python-${DISTVERSION}
 
-MAINTAINER=	marcus@corp.grupos.com.br
+MAINTAINER=	mnag@FreeBSD.org
 COMMENT=	Access a MySQL database through Python
 
 USE_PYTHON=		2.2+
diff --git a/databases/py-MySQLdb/Makefile b/databases/py-MySQLdb/Makefile
index fd1430fff038..866bb79ac3b7 100644
--- a/databases/py-MySQLdb/Makefile
+++ b/databases/py-MySQLdb/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR=	mysql-python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	MySQL-python-${PORTVERSION}
 
-MAINTAINER=	marcus@corp.grupos.com.br
+MAINTAINER=	mnag@FreeBSD.org
 COMMENT=	Access a MySQL database through Python
 
 USE_PYTHON=		yes
diff --git a/databases/py-PySQLite10/Makefile b/databases/py-PySQLite10/Makefile
index 47a239efe443..aa89a9c37f75 100644
--- a/databases/py-PySQLite10/Makefile
+++ b/databases/py-PySQLite10/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR=	pysqlite
 PKGNAMEPREFIX=		${PYTHON_PKGNAMEPREFIX}
 DISTNAME=		pysqlite-${PORTVERSION}
 
-MAINTAINER=		marcus@corp.grupos.com.br
+MAINTAINER=		mnag@FreeBSD.org
 COMMENT=		A DB-API v2 Python library for the SQLite 2 embedded SQL engine
 
 LIB_DEPENDS=		sqlite.2:${PORTSDIR}/databases/sqlite2
diff --git a/databases/py-PySQLite10/pkg-descr b/databases/py-PySQLite10/pkg-descr
index 835fe0b78b73..c1bc2076be10 100644
--- a/databases/py-PySQLite10/pkg-descr
+++ b/databases/py-PySQLite10/pkg-descr
@@ -6,4 +6,4 @@ transactions and triggers.
 
 WWW: http://pysqlite.org
 
-Marcus Grando <marcus@corp.grupos.com.br>
+Marcus Alves Grando <mnag@FreeBSD.org>
diff --git a/databases/py-PySQLite11/Makefile b/databases/py-PySQLite11/Makefile
index d2f415439945..e8124c3b1d24 100644
--- a/databases/py-PySQLite11/Makefile
+++ b/databases/py-PySQLite11/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR=	pysqlite
 PKGNAMEPREFIX=		${PYTHON_PKGNAMEPREFIX}
 DISTNAME=		pysqlite-${PORTVERSION}
 
-MAINTAINER=		marcus@corp.grupos.com.br
+MAINTAINER=		mnag@FreeBSD.org
 COMMENT=		A DB-API v2 Python library for the SQLite 3 embedded SQL engine
 
 LIB_DEPENDS=		sqlite3.8:${PORTSDIR}/databases/sqlite3
diff --git a/databases/py-PySQLite11/pkg-descr b/databases/py-PySQLite11/pkg-descr
index cae4fe8c0b61..5aaec324c4e9 100644
--- a/databases/py-PySQLite11/pkg-descr
+++ b/databases/py-PySQLite11/pkg-descr
@@ -6,4 +6,4 @@ transactions and triggers.
 
 WWW: http://pysqlite.org
 
-Marcus Grando <marcus@corp.grupos.com.br>
+Marcus Alves Grando <mnag@FreeBSD.org>
diff --git a/databases/py-PySQLite2/Makefile b/databases/py-PySQLite2/Makefile
index c2c439290bce..c6e7a80fc462 100644
--- a/databases/py-PySQLite2/Makefile
+++ b/databases/py-PySQLite2/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=		databases python
 MASTER_SITES=		http://initd.org/pub/software/pysqlite/releases/2.0/${PORTVERSION}/
 PKGNAMEPREFIX=		${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=		marcus@corp.grupos.com.br
+MAINTAINER=		mnag@FreeBSD.org
 COMMENT=		A DB-API v2 Python library for the SQLite 3 embedded SQL engine
 
 LIB_DEPENDS=		sqlite3.8:${PORTSDIR}/databases/sqlite3
diff --git a/databases/py-PySQLite2/pkg-descr b/databases/py-PySQLite2/pkg-descr
index cae4fe8c0b61..5aaec324c4e9 100644
--- a/databases/py-PySQLite2/pkg-descr
+++ b/databases/py-PySQLite2/pkg-descr
@@ -6,4 +6,4 @@ transactions and triggers.
 
 WWW: http://pysqlite.org
 
-Marcus Grando <marcus@corp.grupos.com.br>
+Marcus Alves Grando <mnag@FreeBSD.org>
diff --git a/databases/py-pysqlite20/Makefile b/databases/py-pysqlite20/Makefile
index c2c439290bce..c6e7a80fc462 100644
--- a/databases/py-pysqlite20/Makefile
+++ b/databases/py-pysqlite20/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=		databases python
 MASTER_SITES=		http://initd.org/pub/software/pysqlite/releases/2.0/${PORTVERSION}/
 PKGNAMEPREFIX=		${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=		marcus@corp.grupos.com.br
+MAINTAINER=		mnag@FreeBSD.org
 COMMENT=		A DB-API v2 Python library for the SQLite 3 embedded SQL engine
 
 LIB_DEPENDS=		sqlite3.8:${PORTSDIR}/databases/sqlite3
diff --git a/databases/py-pysqlite20/pkg-descr b/databases/py-pysqlite20/pkg-descr
index cae4fe8c0b61..5aaec324c4e9 100644
--- a/databases/py-pysqlite20/pkg-descr
+++ b/databases/py-pysqlite20/pkg-descr
@@ -6,4 +6,4 @@ transactions and triggers.
 
 WWW: http://pysqlite.org
 
-Marcus Grando <marcus@corp.grupos.com.br>
+Marcus Alves Grando <mnag@FreeBSD.org>
diff --git a/databases/py-pysqlite21/Makefile b/databases/py-pysqlite21/Makefile
index c2c439290bce..c6e7a80fc462 100644
--- a/databases/py-pysqlite21/Makefile
+++ b/databases/py-pysqlite21/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=		databases python
 MASTER_SITES=		http://initd.org/pub/software/pysqlite/releases/2.0/${PORTVERSION}/
 PKGNAMEPREFIX=		${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=		marcus@corp.grupos.com.br
+MAINTAINER=		mnag@FreeBSD.org
 COMMENT=		A DB-API v2 Python library for the SQLite 3 embedded SQL engine
 
 LIB_DEPENDS=		sqlite3.8:${PORTSDIR}/databases/sqlite3
diff --git a/databases/py-pysqlite21/pkg-descr b/databases/py-pysqlite21/pkg-descr
index cae4fe8c0b61..5aaec324c4e9 100644
--- a/databases/py-pysqlite21/pkg-descr
+++ b/databases/py-pysqlite21/pkg-descr
@@ -6,4 +6,4 @@ transactions and triggers.
 
 WWW: http://pysqlite.org
 
-Marcus Grando <marcus@corp.grupos.com.br>
+Marcus Alves Grando <mnag@FreeBSD.org>
diff --git a/databases/py-pysqlite22/Makefile b/databases/py-pysqlite22/Makefile
index c2c439290bce..c6e7a80fc462 100644
--- a/databases/py-pysqlite22/Makefile
+++ b/databases/py-pysqlite22/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=		databases python
 MASTER_SITES=		http://initd.org/pub/software/pysqlite/releases/2.0/${PORTVERSION}/
 PKGNAMEPREFIX=		${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=		marcus@corp.grupos.com.br
+MAINTAINER=		mnag@FreeBSD.org
 COMMENT=		A DB-API v2 Python library for the SQLite 3 embedded SQL engine
 
 LIB_DEPENDS=		sqlite3.8:${PORTSDIR}/databases/sqlite3
diff --git a/databases/py-pysqlite22/pkg-descr b/databases/py-pysqlite22/pkg-descr
index cae4fe8c0b61..5aaec324c4e9 100644
--- a/databases/py-pysqlite22/pkg-descr
+++ b/databases/py-pysqlite22/pkg-descr
@@ -6,4 +6,4 @@ transactions and triggers.
 
 WWW: http://pysqlite.org
 
-Marcus Grando <marcus@corp.grupos.com.br>
+Marcus Alves Grando <mnag@FreeBSD.org>
diff --git a/databases/py-pysqlite23/Makefile b/databases/py-pysqlite23/Makefile
index c2c439290bce..c6e7a80fc462 100644
--- a/databases/py-pysqlite23/Makefile
+++ b/databases/py-pysqlite23/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=		databases python
 MASTER_SITES=		http://initd.org/pub/software/pysqlite/releases/2.0/${PORTVERSION}/
 PKGNAMEPREFIX=		${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=		marcus@corp.grupos.com.br
+MAINTAINER=		mnag@FreeBSD.org
 COMMENT=		A DB-API v2 Python library for the SQLite 3 embedded SQL engine
 
 LIB_DEPENDS=		sqlite3.8:${PORTSDIR}/databases/sqlite3
diff --git a/databases/py-pysqlite23/pkg-descr b/databases/py-pysqlite23/pkg-descr
index cae4fe8c0b61..5aaec324c4e9 100644
--- a/databases/py-pysqlite23/pkg-descr
+++ b/databases/py-pysqlite23/pkg-descr
@@ -6,4 +6,4 @@ transactions and triggers.
 
 WWW: http://pysqlite.org
 
-Marcus Grando <marcus@corp.grupos.com.br>
+Marcus Alves Grando <mnag@FreeBSD.org>
diff --git a/databases/sqlite2/Makefile b/databases/sqlite2/Makefile
index 0980467a85da..4c7cde4a911d 100644
--- a/databases/sqlite2/Makefile
+++ b/databases/sqlite2/Makefile
@@ -16,7 +16,7 @@ PORTVERSION=	2.8.16
 CATEGORIES=	databases
 MASTER_SITES=	http://www.sqlite.org/
 
-MAINTAINER=	marcus@corp.grupos.com.br
+MAINTAINER=	mnag@FreeBSD.org
 COMMENT=	An SQL database engine in a C library w/ Tcl wrapper
 
 DOCSDIR=	${PREFIX}/share/doc/sqlite2
diff --git a/databases/tinycdb/Makefile b/databases/tinycdb/Makefile
index bc5e80c00411..98a79c95da17 100644
--- a/databases/tinycdb/Makefile
+++ b/databases/tinycdb/Makefile
@@ -11,7 +11,7 @@ PORTVERSION=	0.74
 CATEGORIES=	databases
 MASTER_SITES=	ftp://ftp.corpit.ru/pub/tinycdb/
 
-MAINTAINER=	marcus@corp.grupos.com.br
+MAINTAINER=	mnag@FreeBSD.org
 COMMENT=	Analogous to cdb, but faster
 
 USE_GMAKE=	yes
diff --git a/devel/mm/Makefile b/devel/mm/Makefile
index c8e8d45f7482..2abfa8993b1b 100644
--- a/devel/mm/Makefile
+++ b/devel/mm/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_OSSP}
 MASTER_SITE_SUBDIR=	lib/${PORTNAME}
 
-MAINTAINER=	marcus@corp.grupos.com.br
+MAINTAINER=	mnag@FreeBSD.org
 COMMENT=	Shared memory allocation library for pre-forked process models
 
 INSTALLS_SHLIB=	yes
diff --git a/devel/ossp-cfg/Makefile b/devel/ossp-cfg/Makefile
index 3897e5cf46ec..828f8809127b 100644
--- a/devel/ossp-cfg/Makefile
+++ b/devel/ossp-cfg/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	${MASTER_SITE_OSSP}
 MASTER_SITE_SUBDIR=	lib/${PORTNAME}
 PKGNAMEPREFIX=	ossp-
 
-MAINTAINER=	marcus@corp.grupos.com.br
+MAINTAINER=	mnag@FreeBSD.org
 COMMENT=	A library for parsing arbitrary C/C++-style configuration files
 
 LIB_DEPENDS=	ex.10:${PORTSDIR}/devel/ossp-ex
diff --git a/devel/ossp-l2/Makefile b/devel/ossp-l2/Makefile
index e2595eba7949..cdf5ea52980d 100644
--- a/devel/ossp-l2/Makefile
+++ b/devel/ossp-l2/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	${MASTER_SITE_OSSP}
 MASTER_SITE_SUBDIR=	lib/${PORTNAME}
 PKGNAMEPREFIX=	ossp-
 
-MAINTAINER=	marcus@corp.grupos.com.br
+MAINTAINER=	mnag@FreeBSD.org
 COMMENT=	A C library for a flexible and sophisticated Unix logging facility
 
 USE_LIBTOOL_VER=	15
diff --git a/devel/ossp-val/Makefile b/devel/ossp-val/Makefile
index dbf2205dac57..193a1053c722 100644
--- a/devel/ossp-val/Makefile
+++ b/devel/ossp-val/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	${MASTER_SITE_OSSP}
 MASTER_SITE_SUBDIR=	lib/${PORTNAME}
 PKGNAMEPREFIX=	ossp-
 
-MAINTAINER=	marcus@corp.grupos.com.br
+MAINTAINER=	mnag@FreeBSD.org
 COMMENT=	A flexible name to value mapping library for C variables
 
 LIB_DEPENDS=	ex.10:${PORTSDIR}/devel/ossp-ex
diff --git a/devel/ossp-var/Makefile b/devel/ossp-var/Makefile
index 92e9bf11e6be..4708b7de604d 100644
--- a/devel/ossp-var/Makefile
+++ b/devel/ossp-var/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	${MASTER_SITE_OSSP}
 MASTER_SITE_SUBDIR=	lib/${PORTNAME}
 PKGNAMEPREFIX=	ossp-
 
-MAINTAINER=	marcus@corp.grupos.com.br
+MAINTAINER=	mnag@FreeBSD.org
 COMMENT=	A flexible, full-featured and fast variable expansion library
 
 USE_GMAKE=	yes
diff --git a/devel/ossp-xds/Makefile b/devel/ossp-xds/Makefile
index 8610de35e9f9..965b2b8148d9 100644
--- a/devel/ossp-xds/Makefile
+++ b/devel/ossp-xds/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	${MASTER_SITE_OSSP}
 MASTER_SITE_SUBDIR=	lib/${PORTNAME}
 PKGNAMEPREFIX=	ossp-
 
-MAINTAINER=	marcus@corp.grupos.com.br
+MAINTAINER=	mnag@FreeBSD.org
 COMMENT=	A generic and extensible framework for serialization
 
 USE_LIBTOOL_VER=	15
diff --git a/devel/str/Makefile b/devel/str/Makefile
index b50d8223c7da..523c75bf1bbc 100644
--- a/devel/str/Makefile
+++ b/devel/str/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_OSSP}
 MASTER_SITE_SUBDIR=	lib/${PORTNAME}
 
-MAINTAINER=	marcus@corp.grupos.com.br
+MAINTAINER=	mnag@FreeBSD.org
 COMMENT=	Generic String Library
 
 USE_LIBTOOL_VER=	15
diff --git a/devel/viewcvs/Makefile b/devel/viewcvs/Makefile
index 8e6d3c507621..53b52d8c28f9 100644
--- a/devel/viewcvs/Makefile
+++ b/devel/viewcvs/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	marcus@corp.grupos.com.br
+MAINTAINER=	mnag@FreeBSD.org
 COMMENT=	Python version of Zeller's cvsweb
 
 USE_PYTHON=	yes
diff --git a/devel/viewvc/Makefile b/devel/viewvc/Makefile
index 8e6d3c507621..53b52d8c28f9 100644
--- a/devel/viewvc/Makefile
+++ b/devel/viewvc/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	marcus@corp.grupos.com.br
+MAINTAINER=	mnag@FreeBSD.org
 COMMENT=	Python version of Zeller's cvsweb
 
 USE_PYTHON=	yes
diff --git a/mail/libesmtp/Makefile b/mail/libesmtp/Makefile
index 64ea19fc6a56..0c8e08310ebd 100644
--- a/mail/libesmtp/Makefile
+++ b/mail/libesmtp/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://www.stafford.uklinux.net/libesmtp/ \
 		http://www.borgsdemons.com/distfiles/
 DISTNAME=	${PORTNAME}-${PORTVERSION}r1
 
-MAINTAINER=	marcus@corp.grupos.com.br
+MAINTAINER=	mnag@FreeBSD.org
 COMMENT=	A library for posting electronic mail
 
 USE_BZIP2=	yes
diff --git a/mail/libspf/Makefile b/mail/libspf/Makefile
index 41e3182f72ac..a628576683a8 100644
--- a/mail/libspf/Makefile
+++ b/mail/libspf/Makefile
@@ -11,7 +11,7 @@ PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://www.libspf.org/files/src/
 
-MAINTAINER=	marcus@corp.grupos.com.br
+MAINTAINER=	mnag@FreeBSD.org
 COMMENT=	Sender Policy Framework (SPF) library and client
 
 USE_BZIP2=	yes
diff --git a/mail/libspf2/Makefile b/mail/libspf2/Makefile
index 42e9c928ddae..62cc6cc93211 100644
--- a/mail/libspf2/Makefile
+++ b/mail/libspf2/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=		mail
 MASTER_SITES=		http://www.libspf2.org/%SUBDIR%/
 MASTER_SITE_SUBDIR=	spf
 
-MAINTAINER=		marcus@corp.grupos.com.br
+MAINTAINER=		mnag@FreeBSD.org
 COMMENT=		Sender Rewriting Scheme 2 C Implementation
 
 CONFLICTS=		${PORTNAME}-1.0.*
diff --git a/mail/pecl-mailparse/Makefile b/mail/pecl-mailparse/Makefile
index 67cddc10ead4..053033748068 100644
--- a/mail/pecl-mailparse/Makefile
+++ b/mail/pecl-mailparse/Makefile
@@ -14,7 +14,7 @@ PKGNAMEPREFIX=	pecl-
 EXTRACT_SUFX=	.tgz
 DIST_SUBDIR=	PECL
 
-MAINTAINER=	marcus@corp.grupos.com.br
+MAINTAINER=	mnag@FreeBSD.org
 COMMENT=	PECL extension to create and decode MIME messages
 
 USE_PHP=	mbstring
diff --git a/mail/pfqueue/Makefile b/mail/pfqueue/Makefile
index 45de3a370240..b56d383c211b 100644
--- a/mail/pfqueue/Makefile
+++ b/mail/pfqueue/Makefile
@@ -1,6 +1,6 @@
 # New ports collection makefile for:	pfqueue
 # Date created:				13 Jan 2004
-# Whom:					Marcus Grando <marcus@corp.grupos.com.br>
+# Whom:					Marcus Alves Grando <mnag@FreeBSD.org>
 #
 # $FreeBSD$
 #
@@ -11,7 +11,7 @@ CATEGORIES=		mail
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=		marcus@corp.grupos.com.br
+MAINTAINER=		mnag@FreeBSD.org
 COMMENT=		A console-based tool for handling Postfix 1, Postfix 2 and Exim queues
 
 USE_REINPLACE=		yes
diff --git a/mail/pfqueue/pkg-descr b/mail/pfqueue/pkg-descr
index d7ee2c80fa19..b09a6bf7ce76 100644
--- a/mail/pfqueue/pkg-descr
+++ b/mail/pfqueue/pkg-descr
@@ -9,5 +9,5 @@ what is falling into and unexpectedly crowding your deferred queue.
 
 WWW: http://pfqueue.sourceforge.net/
 
-- Marcus Grando
-marcus@corp.grupos.com.br
+- Marcus Alves Grando
+mnag@FreeBSD.org
diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile
index 601fb1b35576..6a740bf63843 100644
--- a/mail/postfix-current/Makefile
+++ b/mail/postfix-current/Makefile
@@ -19,7 +19,7 @@ MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/ \
 DISTNAME=	postfix-${DISTVERSION}
 DIST_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	marcus@corp.grupos.com.br
+MAINTAINER=	mnag@FreeBSD.org
 COMMENT=	A secure alternative to widely-used Sendmail
 
 CONFLICTS=	courier-0.* postfix-1.* postfix-2.0.* postfix-2.1.* postfix-2.2.* \
diff --git a/mail/postfix-policyd-spf/Makefile b/mail/postfix-policyd-spf/Makefile
index a75df1541e52..547cf86c1a4e 100644
--- a/mail/postfix-policyd-spf/Makefile
+++ b/mail/postfix-policyd-spf/Makefile
@@ -1,6 +1,6 @@
 # New ports collection makefile for:	policyd
 # Date created:				19 Dec 2004
-# Whom:					Marcus Grando <marcus@corp.grupos.com.br>
+# Whom:					Marcus Alves Grando <mnag@FreeBSD.org>
 #
 # $FreeBSD$
 #
@@ -13,7 +13,7 @@ MASTER_SITES=		http://www.libspf2.org/patch/
 PKGNAMEPREFIX=		postfix-
 PKGNAMESUFFIX=		-spf
 
-MAINTAINER=		marcus@corp.grupos.com.br
+MAINTAINER=		mnag@FreeBSD.org
 COMMENT=		Implements SPF for postfix, as a policy daemon
 
 LIB_DEPENDS=		spf2.1:${PORTSDIR}/mail/libspf2-10
diff --git a/mail/postfix-policyd-spf/pkg-descr b/mail/postfix-policyd-spf/pkg-descr
index 53010fa631e1..bd311851e0d1 100644
--- a/mail/postfix-policyd-spf/pkg-descr
+++ b/mail/postfix-policyd-spf/pkg-descr
@@ -4,4 +4,4 @@ It implements SPF for postfix, as a policy daemon.
 
 WWW: http://www.libspf2.org/
 
-Marcus Grando <marcus@corp.grupos.com.br>
+Marcus Alves Grando <mnag@FreeBSD.org>
diff --git a/mail/postfix1/Makefile b/mail/postfix1/Makefile
index 0b8c9b48e0e8..bf5aa4c445d8 100644
--- a/mail/postfix1/Makefile
+++ b/mail/postfix1/Makefile
@@ -25,7 +25,7 @@ MASTER_SITE_SUBDIR=	. old related/postfix
 DISTNAME=	postfix-${PORTVERSION}
 DIST_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	marcus@corp.grupos.com.br
+MAINTAINER=	mnag@FreeBSD.org
 COMMENT=	An alternative to widely-used Sendmail
 
 CONFLICTS=	courier-0.* postfix-2.* sendmail-8.* sendmail-*-8.* smail-3.* zmailer-2.*
diff --git a/mail/py-spf/Makefile b/mail/py-spf/Makefile
index 091fe06030d8..a3bd9b14ba27 100644
--- a/mail/py-spf/Makefile
+++ b/mail/py-spf/Makefile
@@ -1,6 +1,6 @@
 # New ports collection makefile for:	py-spf
 # Date created:				26 Dec 2004
-# Whom:					Marcus Grando <marcus@corp.grupos.com.br>
+# Whom:					Marcus Alves Grando <mnag@FreeBSD.org>
 #
 # $FreeBSD$
 #
@@ -12,7 +12,7 @@ MASTER_SITES=	http://www.wayforward.net/spf/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	py${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	marcus@corp.grupos.com.br
+MAINTAINER=	mnag@FreeBSD.org
 COMMENT=	Python implementation of SPF
 
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/DNS/__init__.py:${PORTSDIR}/dns/py-dns
diff --git a/mail/py-spf/pkg-descr b/mail/py-spf/pkg-descr
index 409ccb40d024..64089242b2a3 100644
--- a/mail/py-spf/pkg-descr
+++ b/mail/py-spf/pkg-descr
@@ -8,4 +8,4 @@ For news, bugfixes, etc. visit the home page for this implementation at
 
 WWW: http://www.wayforward.net/spf/
 
-Marcus Grando <marcus@corp.grupos.com.br>
+Marcus Alves Grando <mnag@FreeBSD.org>
diff --git a/mail/smtpmail/Makefile b/mail/smtpmail/Makefile
index 07784ce1d633..269a7a3b5787 100644
--- a/mail/smtpmail/Makefile
+++ b/mail/smtpmail/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	marcus@corp.grupos.com.br
+MAINTAINER=	mnag@FreeBSD.org
 COMMENT=	Tool to send e-mail via a remote smtp server
 
 GNU_CONFIGURE=	yes
diff --git a/mail/tumgreyspf/Makefile b/mail/tumgreyspf/Makefile
index 7353340000e6..a165db1eb772 100644
--- a/mail/tumgreyspf/Makefile
+++ b/mail/tumgreyspf/Makefile
@@ -1,6 +1,6 @@
 # New ports collection makefile for:	tumgreyspf
 # Date created:				31 Aug 2005
-# Whom:					Marcus Grando <marcus@corp.grupos.com.br>
+# Whom:					Marcus Alves Grando <mnag@FreeBSD.org>
 #
 # $FreeBSD$
 #
@@ -10,7 +10,7 @@ PORTVERSION=	1.09
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.tummy.com/pub/tummy/tumgreyspf/
 
-MAINTAINER=	marcus@corp.grupos.com.br
+MAINTAINER=	mnag@FreeBSD.org
 COMMENT=	External policy checker for the postfix mail server
 
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/spf.py:${PORTSDIR}/mail/py-spf
diff --git a/mail/tumgreyspf/pkg-descr b/mail/tumgreyspf/pkg-descr
index 07362dee60f1..92e1407384c1 100644
--- a/mail/tumgreyspf/pkg-descr
+++ b/mail/tumgreyspf/pkg-descr
@@ -14,4 +14,4 @@ database is required to use it.
 
 WWW: http://www.tummy.com/Community/software/tumgreyspf/
 
-Marcus Grando <marcus@corp.grupos.com.br>
+Marcus Alves Grando <mnag@FreeBSD.org>
diff --git a/misc/ossp-uuid/Makefile b/misc/ossp-uuid/Makefile
index fb7020cb2351..b0839955fe5c 100644
--- a/misc/ossp-uuid/Makefile
+++ b/misc/ossp-uuid/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	${MASTER_SITE_OSSP}
 MASTER_SITE_SUBDIR=	lib/${PORTNAME}
 PKGNAMEPREFIX=	ossp-
 
-MAINTAINER=	marcus@corp.grupos.com.br
+MAINTAINER=	mnag@FreeBSD.org
 COMMENT=	ISO-C & Perl API and CLI for generating Universally Unique Identifiers
 
 CONFLICTS=	e2fsprogs-[0-9]*
diff --git a/net-mgmt/ettercap/Makefile b/net-mgmt/ettercap/Makefile
index 054bf340a8fa..5a8fbab2beef 100644
--- a/net-mgmt/ettercap/Makefile
+++ b/net-mgmt/ettercap/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES=		${MASTER_SITE_SOURCEFORGE_EXTENDED} \
 			${MASTER_SITE_PACKETSTORM:S:%SUBDIR%:sniffers/ettercap:}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	marcus@corp.grupos.com.br
+MAINTAINER=	mnag@FreeBSD.org
 COMMENT=	A network sniffer/interceptor/injector/logger for switched LANs
 
 BUILD_DEPENDS=	${LOCALBASE}/include/libnet/libnet-types.h:${PORTSDIR}/net/libnet-devel
diff --git a/net/ossp-sa/Makefile b/net/ossp-sa/Makefile
index e46662314a1e..0418b896873d 100644
--- a/net/ossp-sa/Makefile
+++ b/net/ossp-sa/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	${MASTER_SITE_OSSP}
 MASTER_SITE_SUBDIR=	lib/${PORTNAME}
 PKGNAMEPREFIX=	ossp-
 
-MAINTAINER=	marcus@corp.grupos.com.br
+MAINTAINER=	mnag@FreeBSD.org
 COMMENT=	An abstraction library for the Unix socket API
 
 LIB_DEPENDS=	ex.10:${PORTSDIR}/devel/ossp-ex
diff --git a/net/py-soappy-devel/Makefile b/net/py-soappy-devel/Makefile
index 03d28d50eba6..7c8d08d085cb 100644
--- a/net/py-soappy-devel/Makefile
+++ b/net/py-soappy-devel/Makefile
@@ -14,7 +14,7 @@ PKGNAMEPREFIX=		${PYTHON_PKGNAMEPREFIX}
 PKGNAMESUFFIX=		-devel
 DISTNAME=		SOAPpy-${PORTVERSION}
 
-MAINTAINER=		marcus@corp.grupos.com.br
+MAINTAINER=		mnag@FreeBSD.org
 COMMENT=		A SOAP implementation
 
 USE_PYTHON=		yes
diff --git a/net/py-soappy/Makefile b/net/py-soappy/Makefile
index 7db6d0086d44..604b44445f3f 100644
--- a/net/py-soappy/Makefile
+++ b/net/py-soappy/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR=	pywebsvcs
 PKGNAMEPREFIX=		${PYTHON_PKGNAMEPREFIX}
 DISTNAME=		SOAPpy-${PORTVERSION}
 
-MAINTAINER=		marcus@corp.grupos.com.br
+MAINTAINER=		mnag@FreeBSD.org
 COMMENT=		A SOAP implementation
 
 USE_PYTHON=		yes
diff --git a/security/openssh-portable/Makefile b/security/openssh-portable/Makefile
index 0be82293c0fb..5d2ea6d0c994 100644
--- a/security/openssh-portable/Makefile
+++ b/security/openssh-portable/Makefile
@@ -18,7 +18,7 @@ MASTER_SITE_SUBDIR=	${MASTER_SITE_SUBDIR2}
 PKGNAMESUFFIX?=	${PORTABLE_SUFFIX}${GSSAPI_SUFFIX}${BASE_SUFFIX}${PKGNAMESUFFIX2}
 DISTNAME=	${DISTNAME2}
 
-MAINTAINER=	marcus@corp.grupos.com.br
+MAINTAINER=	mnag@FreeBSD.org
 COMMENT=	The portable version of OpenBSD's OpenSSH
 
 OPENSSHVERSION=	4.2p1
diff --git a/security/py-clamav/Makefile b/security/py-clamav/Makefile
index c01dcb1b6794..3aa41e242ae2 100644
--- a/security/py-clamav/Makefile
+++ b/security/py-clamav/Makefile
@@ -1,6 +1,6 @@
 # New ports collection makefile for:	py-clamav
 # Date created:				26 Dec 2004
-# Whom:					Marcus Grando <marcus@corp.grupos.com.br>
+# Whom:					Marcus Alves Grando <mnag@FreeBSD.org>
 #
 # $FreeBSD$
 #
@@ -12,7 +12,7 @@ MASTER_SITES=		http://xael.org/norman/python/pyclamav/
 PKGNAMEPREFIX=		${PYTHON_PKGNAMEPREFIX}
 DISTNAME=		py${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=		marcus@corp.grupos.com.br
+MAINTAINER=		mnag@FreeBSD.org
 COMMENT=		A python binding to libclamav written in C
 
 LIB_DEPENDS=		clamav.1:${PORTSDIR}/security/clamav
diff --git a/security/py-clamav/pkg-descr b/security/py-clamav/pkg-descr
index 41da534b18c8..49ca29c0af5c 100644
--- a/security/py-clamav/pkg-descr
+++ b/security/py-clamav/pkg-descr
@@ -7,4 +7,4 @@ and easy way.
 
 WWW: http://xael.org/norman/python/pyclamav/
 
-Marcus Grando <marcus@corp.grupos.com.br>
+Marcus Alves Grando <mnag@FreeBSD.org>
diff --git a/security/py-m2crypto/Makefile b/security/py-m2crypto/Makefile
index ea7e19a83036..61c43e1908d4 100644
--- a/security/py-m2crypto/Makefile
+++ b/security/py-m2crypto/Makefile
@@ -14,7 +14,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:S/.1$//}
 
 PATCH_SITES=	${MASTER_SITES}
 
-MAINTAINER=	marcus@corp.grupos.com.br
+MAINTAINER=	mnag@FreeBSD.org
 COMMENT=	Crypto and SSL toolkit for Python
 
 BUILD_DEPENDS=	swig1.3:${PORTSDIR}/devel/swig13
diff --git a/security/py-m2crypto/pkg-descr b/security/py-m2crypto/pkg-descr
index 60b4779ff6bd..964128e86728 100644
--- a/security/py-m2crypto/pkg-descr
+++ b/security/py-m2crypto/pkg-descr
@@ -11,4 +11,4 @@ M2Crypto is a crypto and SSL toolkit for Python featuring the following:
 
 WWW: http://sandbox.rulemaker.net/ngps/m2/
 
-Marcus Grando <marcus@corp.grupos.com.br>
+Marcus Alves Grando <mnag@FreeBSD.org>
diff --git a/www/pecl-APC-devel/Makefile b/www/pecl-APC-devel/Makefile
index 1515126726e4..8bd2ea9bfc38 100644
--- a/www/pecl-APC-devel/Makefile
+++ b/www/pecl-APC-devel/Makefile
@@ -13,7 +13,7 @@ PKGNAMEPREFIX=	pecl-
 EXTRACT_SUFX=	.tgz
 DIST_SUBDIR=	PECL
 
-MAINTAINER=	marcus@corp.grupos.com.br
+MAINTAINER=	mnag@FreeBSD.org
 COMMENT=	Alternative PHP Cache
 
 USE_PHP=	yes
diff --git a/www/pecl-APC/Makefile b/www/pecl-APC/Makefile
index 1515126726e4..8bd2ea9bfc38 100644
--- a/www/pecl-APC/Makefile
+++ b/www/pecl-APC/Makefile
@@ -13,7 +13,7 @@ PKGNAMEPREFIX=	pecl-
 EXTRACT_SUFX=	.tgz
 DIST_SUBDIR=	PECL
 
-MAINTAINER=	marcus@corp.grupos.com.br
+MAINTAINER=	mnag@FreeBSD.org
 COMMENT=	Alternative PHP Cache
 
 USE_PHP=	yes