26 files changed, 22 insertions, 32 deletions
diff --git a/archivers/bzip/Makefile b/archivers/bzip/Makefile
index 116fd7bd7325..cc3f9ed518fc 100644
--- a/archivers/bzip/Makefile
+++ b/archivers/bzip/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	archivers
 MASTER_SITES=	http://custom.lab.unb.br/pub/compression/bzip/ \
 		http://www.freebsdbrasil.com.br/~jmelo/
 
-MAINTAINER=	jmelo@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A block-sorting file compressor
 
 DEPRECATED=	see full description
diff --git a/audio/abcde/Makefile b/audio/abcde/Makefile
index d386b14af935..9af1d0bb35c5 100644
--- a/audio/abcde/Makefile
+++ b/audio/abcde/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	audio
 MASTER_SITES=	http://www.hispalinux.es/~data/files/
 DISTNAME=	abcde_${PORTVERSION}.orig
 
-MAINTAINER=	jmelo@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Front-end shell script to encode CDs in flac/mp3/ogg/speex format
 
 RUN_DEPENDS=	cd-discid:${PORTSDIR}/audio/cd-discid \
diff --git a/benchmarks/dbench/Makefile b/benchmarks/dbench/Makefile
index ca7e807026e7..8ba4d0e7be82 100644
--- a/benchmarks/dbench/Makefile
+++ b/benchmarks/dbench/Makefile
@@ -11,7 +11,7 @@ PORTREVISION=	2
 CATEGORIES=	benchmarks
 MASTER_SITES=	http://samba.org/ftp/tridge/dbench/
 
-MAINTAINER=	jmelo@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A simulation of the Ziff-Davis netbench benchmark
 
 GNU_CONFIGURE=	yes
diff --git a/benchmarks/httperf/Makefile b/benchmarks/httperf/Makefile
index 9e653b6dc041..d6ad0b86448d 100644
--- a/benchmarks/httperf/Makefile
+++ b/benchmarks/httperf/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	0.9.0
 CATEGORIES=	benchmarks www
 MASTER_SITES=	ftp://ftp.hpl.hp.com/pub/httperf/
 
-MAINTAINER=	jmelo@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A tool for measuring webserver performance
 
 USE_OPENSSL=	yes
diff --git a/benchmarks/httperf/pkg-descr b/benchmarks/httperf/pkg-descr
index dfb9e97fd124..15bc81493cf1 100644
--- a/benchmarks/httperf/pkg-descr
+++ b/benchmarks/httperf/pkg-descr
@@ -17,5 +17,3 @@ realizing this tool."
 think I could possibly summarize it better than the above paragraph.
 
 WWW: http://www.hpl.hp.com/research/linux/httperf/
-
-- Will <andrews@technologist.com>
diff --git a/benchmarks/siege/Makefile b/benchmarks/siege/Makefile
index 0883a68bf7fb..73c329006460 100644
--- a/benchmarks/siege/Makefile
+++ b/benchmarks/siege/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	2.69
 CATEGORIES=	benchmarks
 MASTER_SITES=	ftp://sid.joedog.org/pub/siege/
 
-MAINTAINER=	jmelo@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A http regression testing and benchmarking utility
 
 GNU_CONFIGURE=	yes
diff --git a/cad/slffea/Makefile b/cad/slffea/Makefile
index f81d40f88cf4..cdee2d93c3c5 100644
--- a/cad/slffea/Makefile
+++ b/cad/slffea/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	SF/${PORTNAME}/SLFFEA/${PORTVERSION}
 DISTNAME=	${PORTNAME}13
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	jmelo@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	San Le's Free Finite Element Analysis
 
 CONFLICTS=	swi-pl-[0-9]* TenDRA-[0-9]*
diff --git a/devel/libepp-nicbr/Makefile b/devel/libepp-nicbr/Makefile
index 6bdd79cf7448..d37850e9140f 100644
--- a/devel/libepp-nicbr/Makefile
+++ b/devel/libepp-nicbr/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	1.7
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.registro.br/pub/libepp-nicbr/
 
-MAINTAINER=	jmelo@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Partial Extensible Provisioning Protocol to .br domains
 
 LIB_DEPENDS=	xerces-c:${PORTSDIR}/textproc/xerces-c2
diff --git a/devel/preps-gui/Makefile b/devel/preps-gui/Makefile
index b8ed63adfdd0..69da1f319bcb 100644
--- a/devel/preps-gui/Makefile
+++ b/devel/preps-gui/Makefile
@@ -14,7 +14,7 @@ PKGNAMESUFFIX=	-gui
 DISTNAME=	preps-${PORTVERSION}
 DIST_SUBDIR=	prep
 
-MAINTAINER=	jmelo@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Problem reporting system
 
 RUN_DEPENDS=	prepsdb_tool:${PORTSDIR}/devel/prepstools
diff --git a/devel/prepstools/Makefile b/devel/prepstools/Makefile
index 0eaf4790668b..588f57c897c6 100644
--- a/devel/prepstools/Makefile
+++ b/devel/prepstools/Makefile
@@ -11,7 +11,7 @@ PORTREVISION=	7
 CATEGORIES=	devel
 MASTER_SITES=	http://webpages.charter.net/stuffle/preps/download/files/
 
-MAINTAINER=	jmelo@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Problem reporting system
 
 RUN_DEPENDS=	postgres:${PORTSDIR}/databases/postgresql${DEFAULT_PGSQL_VER}-server
diff --git a/games/senken/Makefile b/games/senken/Makefile
index 459083811f16..a834540b2ea9 100644
--- a/games/senken/Makefile
+++ b/games/senken/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_GENTOO}
 MASTER_SITE_SUBDIR=	distfiles
 
-MAINTAINER=	jmelo@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A city simulation game
 
 USE_GNOME=	gnometarget gtk20
diff --git a/games/senken/pkg-descr b/games/senken/pkg-descr
index 9cbf9c28092d..836991c66a21 100644
--- a/games/senken/pkg-descr
+++ b/games/senken/pkg-descr
@@ -2,6 +2,3 @@ Senken is a city simulation game. Players buy the land, build the
 infrastructure, balance the books, and convince people to move in. The
 game has both goal-oriented and just play modes. There is multiplayer
 support but it is not well tested.
-
-- Tim Martin
-tmartin@andrew.cmu.edu
diff --git a/graphics/show/Makefile b/graphics/show/Makefile
index 1e796bfdaaca..4b9299e06e8d 100644
--- a/graphics/show/Makefile
+++ b/graphics/show/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	graphics
 MASTER_SITES=	http://www.ibiblio.org/propaganda/ \
 		http://www.freebsdbrasil.com.br/~jmelo/
 
-MAINTAINER=	jmelo@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A fast, flexible, extensible and bloat-free image viewer for X11
 
 LIB_DEPENDS=	jpeg.11:${PORTSDIR}/graphics/jpeg	\
diff --git a/graphics/show/pkg-descr b/graphics/show/pkg-descr
index 16fcd1bd2998..cd22cf02b181 100644
--- a/graphics/show/pkg-descr
+++ b/graphics/show/pkg-descr
@@ -8,6 +8,3 @@ wildcard support, and logging abilities. It can also be easilly incorporated
 into multimedia presentations, shell scripts, and other utilities.
 
 WWW: http://www.ibiblio.org/propaganda
-
-- roop
-i6a2@ugrad.cs.ubc.ca
diff --git a/japanese/namazu/Makefile b/japanese/namazu/Makefile
index b56ebf113981..04546a96fffe 100644
--- a/japanese/namazu/Makefile
+++ b/japanese/namazu/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	http://www.namazu.org/stable/ \
 		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	flathill
 
-MAINTAINER=	jmelo@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Search engine software intended for easy use
 
 BUILD_DEPENDS=	kakasi:${PORTSDIR}/japanese/kakasi \
diff --git a/mail/mailman/Makefile b/mail/mailman/Makefile
index 4238200331dc..65df589b51c5 100644
--- a/mail/mailman/Makefile
+++ b/mail/mailman/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	SF/${PORTNAME}/Mailman%202.1%20%28stable%29/${PORTVERSION} \
 EXTRACT_SUFX=	.tgz
 DIST_SUBDIR=	mailman
 
-MAINTAINER?=	jmelo@FreeBSD.org
+MAINTAINER?=	ports@FreeBSD.org
 COMMENT?=	A mailing list manager (MLM) with a user-friendly web front-end
 
 OPTIONS=	SENDMAIL "for use with sendmail" off \
diff --git a/mail/qmail-activedir/Makefile b/mail/qmail-activedir/Makefile
index df128f85e5e7..59f5ff78384d 100644
--- a/mail/qmail-activedir/Makefile
+++ b/mail/qmail-activedir/Makefile
@@ -11,7 +11,7 @@ PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://fo2k.com/qmail-activedir/
 
-MAINTAINER=	jmelo@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Programs to allow qmail to authenticate users through a MS ad
 
 USE_QMAIL_RUN=	yes
diff --git a/mail/uebimiau/Makefile b/mail/uebimiau/Makefile
index f46196deb29b..0ebc616dc42d 100644
--- a/mail/uebimiau/Makefile
+++ b/mail/uebimiau/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	http://www.uebimiau.org/downloads/ \
 		http://www.freebsdbrasil.com.br/~jmelo/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-any
 
-MAINTAINER=	jmelo@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	UebiMiau is a simple yet efficient WebMail written in PHP
 
 WRKSRC=		${WRKDIR}/webmail
diff --git a/net/bing/Makefile b/net/bing/Makefile
index 2aff330aca92..def4e5e7f18c 100644
--- a/net/bing/Makefile
+++ b/net/bing/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	net
 MASTER_SITES=	http://www.freebsdbrasil.com.br/~jmelo/ \
 		ftp://ftp.ens.fr/pub/unix/syst/
 
-MAINTAINER=	jmelo@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A point-to-point bandwith measurement tool
 
 MAN8=		bing.8
diff --git a/security/pear-Text_Password/Makefile b/security/pear-Text_Password/Makefile
index a3fe4c4a34d6..816a455b59dd 100644
--- a/security/pear-Text_Password/Makefile
+++ b/security/pear-Text_Password/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Text_password
 PORTVERSION=	1.1.1
 CATEGORIES=	security www pear
 
-MAINTAINER=	jmelo@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	PEAR random password creator
 
 USE_PHP=	yes
diff --git a/security/samba-vscan/Makefile b/security/samba-vscan/Makefile
index e7b1e9f02f88..b6fbb168e01d 100644
--- a/security/samba-vscan/Makefile
+++ b/security/samba-vscan/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	security
 MASTER_SITES=	http://www.openantivirus.org/download/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-beta5
 
-MAINTAINER=	jmelo@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	On-access virus scanning with Samba
 
 BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/net/${VSCAN_SAMBA_PORT}:configure
diff --git a/sysutils/chgrep/Makefile b/sysutils/chgrep/Makefile
index aaafbde1332e..ea3d2afb9e39 100644
--- a/sysutils/chgrep/Makefile
+++ b/sysutils/chgrep/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	sysutils
 MASTER_SITES=	http://www.bmk-it.com/projects/chgrep/files/
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	jmelo@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Fast string substitution across multiple files
 
 GNU_CONFIGURE=	yes
diff --git a/sysutils/stress/Makefile b/sysutils/stress/Makefile
index 0790c25be155..b2530076aab0 100644
--- a/sysutils/stress/Makefile
+++ b/sysutils/stress/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	sysutils
 MASTER_SITES=	http://weather.ou.edu/~apw/projects/stress/ \
 		http://fresh.t-systems-sfr.com/unix/src/privat2/
 
-MAINTAINER=	jmelo@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tool to impose load on and stress test Unix-like systems
 
 GNU_CONFIGURE=	yes
diff --git a/sysutils/stress/pkg-descr b/sysutils/stress/pkg-descr
index 00d454cb6522..6fa337b6dc1e 100644
--- a/sysutils/stress/pkg-descr
+++ b/sysutils/stress/pkg-descr
@@ -12,5 +12,3 @@ classes of bugs which only or more frequently manifest
 themselves when the system is under heavy load. 
 
 WWW: http://weather.ou.edu/~apw/projects/stress/
-
-setagllib@optusnet.com.au
diff --git a/www/admuser/Makefile b/www/admuser/Makefile
index a6fd72e7d31c..c9505de89127 100644
--- a/www/admuser/Makefile
+++ b/www/admuser/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	2.3.2
 CATEGORIES=	www
 MASTER_SITES=	http://sarg.sourceforge.net/
 
-MAINTAINER=	jmelo@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Handle your Squid or Web users and passwords using your browser
 
 HAS_CONFIGURE=	yes
diff --git a/www/chpasswd/Makefile b/www/chpasswd/Makefile
index 6e6a5a5f741e..bc61fbaf174c 100644
--- a/www/chpasswd/Makefile
+++ b/www/chpasswd/Makefile
@@ -11,7 +11,7 @@ PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	SF/orso${PORTNAME}/orso${PORTNAME}/${PORTVERSION}
 
-MAINTAINER=	jmelo@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Allow users to change their Squid or Web password using the browser
 
 HAS_CONFIGURE=	yes