- Update MAINTAINER to my FreeBSD.org address

Approved by:	pgollucci (mentor)

55 files changed, 55 insertions, 55 deletions

diff --git a/archivers/p5-Compress-Raw-Lzma/Makefile b/archivers/p5-Compress-Raw-Lzma/Makefile
index a41ce67fb626..8117645520ef 100644
--- a/archivers/p5-Compress-Raw-Lzma/Makefile
+++ b/archivers/p5-Compress-Raw-Lzma/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	archivers perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	sunpoet@sunpoet.net
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Low-Level Interface to lzma compression library
 
 PERL_CONFIGURE=	yes
diff --git a/archivers/p5-IO-Compress-Lzma/Makefile b/archivers/p5-IO-Compress-Lzma/Makefile
index 7d66f34d26bd..d0d7ff2c6aca 100644
--- a/archivers/p5-IO-Compress-Lzma/Makefile
+++ b/archivers/p5-IO-Compress-Lzma/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	archivers perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	sunpoet@sunpoet.net
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Write lzma files/buffers
 
 BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Compress/Raw/Lzma.pm:${PORTSDIR}/archivers/p5-Compress-Raw-Lzma \
diff --git a/archivers/unshield/Makefile b/archivers/unshield/Makefile
index 706392397265..cfd9bf1a334b 100644
--- a/archivers/unshield/Makefile
+++ b/archivers/unshield/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	0.6
 CATEGORIES=	archivers
 MASTER_SITES=	SF/synce/Unshield/${PORTVERSION}
 
-MAINTAINER=	sunpoet@sunpoet.net
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Extract data from InstallShield CAB files
 
 USE_AUTOTOOLS=	libtool:22
diff --git a/astro/py-metar/Makefile b/astro/py-metar/Makefile
index e48500e7c73c..d93f430a98fe 100644
--- a/astro/py-metar/Makefile
+++ b/astro/py-metar/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://www.schwarzvogel.de/pkgs/ \
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	${REALPORTNAME}-${PORTVERSION}
 
-MAINTAINER=	sunpoet@sunpoet.net
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Python module that provides access to NOAA's METAR weather reports
 
 DOCSDIR=	${PREFIX}/share/doc/py-${PORTNAME}
diff --git a/astro/weather/Makefile b/astro/weather/Makefile
index f9b2bc1386ab..ec073be4688a 100644
--- a/astro/weather/Makefile
+++ b/astro/weather/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	astro python
 MASTER_SITES=	http://fungi.yuggoth.org/weather/src/ \
 		http://sunpoet.net/distfiles/
 
-MAINTAINER=	sunpoet@sunpoet.net
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	An utility to provide current weather conditions and forecasts
 
 USE_PYTHON=	-2.7
diff --git a/audio/icecast2/Makefile b/audio/icecast2/Makefile
index 5918060eaef4..68907a59c2ee 100644
--- a/audio/icecast2/Makefile
+++ b/audio/icecast2/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	http://downloads.xiph.org/releases/icecast/ \
 		http://svn.xiph.org/releases/icecast/
 DISTNAME=	icecast-${PORTVERSION}
 
-MAINTAINER=	sunpoet@sunpoet.net
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	A streaming mp3/ogg-vorbis audio server
 
 LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl \
diff --git a/audio/id3v2/Makefile b/audio/id3v2/Makefile
index 0cb47bd23458..caeae051214e 100644
--- a/audio/id3v2/Makefile
+++ b/audio/id3v2/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	0.1.12
 CATEGORIES=	audio
 MASTER_SITES=	SF
 
-MAINTAINER=	sunpoet@sunpoet.net
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Command line id3v2 tag editor
 
 LIB_DEPENDS=	id3-3.8.3:${PORTSDIR}/audio/id3lib
diff --git a/audio/libfishsound/Makefile b/audio/libfishsound/Makefile
index a0e5393037f5..2277c1f96eec 100644
--- a/audio/libfishsound/Makefile
+++ b/audio/libfishsound/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	audio
 MASTER_SITES=	http://downloads.xiph.org/releases/libfishsound/ \
 		http://sunpoet.net/distfiles/
 
-MAINTAINER=	sunpoet@sunpoet.net
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	A programing interface to decode/encode audio data
 
 LIB_DEPENDS=	FLAC:${PORTSDIR}/audio/flac \
diff --git a/audio/libmp3-archive-perl/Makefile b/audio/libmp3-archive-perl/Makefile
index 0e13b0667439..9a8a48bea7d8 100644
--- a/audio/libmp3-archive-perl/Makefile
+++ b/audio/libmp3-archive-perl/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	audio perl5
 MASTER_SITES=	http://erislabs.net/ianb/projects/${PORTNAME}/ \
 		http://sunpoet.net/distfiles/
 
-MAINTAINER=	sunpoet@sunpoet.net
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Perl module to manipulate filenames containing music metadata
 
 PERL_CONFIGURE=	yes
diff --git a/audio/mp3-archive-tools/Makefile b/audio/mp3-archive-tools/Makefile
index 9246a70b5ef9..083bb7d428b3 100644
--- a/audio/mp3-archive-tools/Makefile
+++ b/audio/mp3-archive-tools/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	audio
 MASTER_SITES=	http://erislabs.net/ianb/projects/${PORTNAME}/ \
 		http://sunpoet.net/distfiles/
 
-MAINTAINER=	sunpoet@sunpoet.net
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	A set of tools to ease organising a collection of audio files
 
 BUILD_DEPENDS=	${SITE_PERL}/MP3/Archive.pm:${PORTSDIR}/audio/libmp3-archive-perl \
diff --git a/audio/mp3lint/Makefile b/audio/mp3lint/Makefile
index 8c29f73d4897..98344a467950 100644
--- a/audio/mp3lint/Makefile
+++ b/audio/mp3lint/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	audio perl5
 MASTER_SITES=	http://erislabs.net/ianb/projects/${PORTNAME}/ \
 		http://sunpoet.net/distfiles/
 
-MAINTAINER=	sunpoet@sunpoet.net
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	A configurable tool to check collections of audio files
 
 BUILD_DEPENDS=	${SITE_PERL}/MP3/Archive.pm:${PORTSDIR}/audio/libmp3-archive-perl
diff --git a/audio/mp3val/Makefile b/audio/mp3val/Makefile
index a220e5b5db10..b47c9d9ef383 100644
--- a/audio/mp3val/Makefile
+++ b/audio/mp3val/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=		audio
 MASTER_SITES=		SF/${PORTNAME}/${PORTNAME}/${PORTNAME}%20${PORTVERSION}
 DISTNAME=		${PORTNAME}-${PORTVERSION}-src
 
-MAINTAINER=		sunpoet@sunpoet.net
+MAINTAINER=		sunpoet@FreeBSD.org
 COMMENT=		A program for MPEG audio stream validation
 
 ALL_TARGET=		mp3val
diff --git a/chinese/tintin++/Makefile b/chinese/tintin++/Makefile
index 892cf61d89e8..dd0e079debba 100644
--- a/chinese/tintin++/Makefile
+++ b/chinese/tintin++/Makefile
@@ -7,7 +7,7 @@
 
 CATEGORIES?=	chinese
 
-MAINTAINER=	sunpoet@sunpoet.net
+MAINTAINER=	sunpoet@FreeBSD.org
 
 MASTERDIR=	${.CURDIR}/../../net/tintin++
 
diff --git a/databases/p5-PostgreSQL-PLPerl-Call/Makefile b/databases/p5-PostgreSQL-PLPerl-Call/Makefile
index 1ab3aa3e619b..a00389af2ca6 100644
--- a/databases/p5-PostgreSQL-PLPerl-Call/Makefile
+++ b/databases/p5-PostgreSQL-PLPerl-Call/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN/../../authors/id/T/TI/TIMB/
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	sunpoet@sunpoet.net
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Simple interface for calling SQL functions from PostgreSQL PL/Perl
 
 BUILD_DEPENDS=	p5-DBI>=1.60.5:${PORTSDIR}/databases/p5-DBI
diff --git a/databases/p5-PostgreSQL-PLPerl-Trace/Makefile b/databases/p5-PostgreSQL-PLPerl-Trace/Makefile
index c85cc7fecb7d..a833499814d3 100644
--- a/databases/p5-PostgreSQL-PLPerl-Trace/Makefile
+++ b/databases/p5-PostgreSQL-PLPerl-Trace/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN/../../authors/id/T/TI/TIMB/
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	sunpoet@sunpoet.net
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Simple way to trace execution of Perl statements in PL/Perl
 
 PERL_CONFIGURE=	yes
diff --git a/databases/pgsphere/Makefile b/databases/pgsphere/Makefile
index 5e8e9cad90e7..62b735a54735 100644
--- a/databases/pgsphere/Makefile
+++ b/databases/pgsphere/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	databases geography
 MASTER_SITES=	http://pgfoundry.org/frs/download.php/2558/ \
 		http://sunpoet.net/distfiles/
 
-MAINTAINER=	sunpoet@sunpoet.net
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Spherical data types, functions, and operators for PostgreSQL
 
 DATADIR=	${PREFIX}/share/postgresql
diff --git a/devel/libcheck/Makefile b/devel/libcheck/Makefile
index 07bd79cfe6ed..ef3b1eb0e517 100644
--- a/devel/libcheck/Makefile
+++ b/devel/libcheck/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	devel
 MASTER_SITES=	SF/check/check/${PORTVERSION}
 DISTNAME=	check-${PORTVERSION}
 
-MAINTAINER=	sunpoet@sunpoet.net
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	A unit test framework for C
 
 GNU_CONFIGURE=	yes
diff --git a/devel/libdap/Makefile b/devel/libdap/Makefile
index 182596980473..e7cc6eac2bfa 100644
--- a/devel/libdap/Makefile
+++ b/devel/libdap/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	devel
 MASTER_SITES=	http://www.opendap.org/pub/source/ \
 		http://sunpoet.net/distfiles/
 
-MAINTAINER=	sunpoet@sunpoet.net
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	SDK which contains an implementation of DAP 2.0 and 3.1
 
 LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl \
diff --git a/devel/libmaa/Makefile b/devel/libmaa/Makefile
index ad22a2d88aad..de8c5f8bf8d8 100644
--- a/devel/libmaa/Makefile
+++ b/devel/libmaa/Makefile
@@ -11,7 +11,7 @@ PORTEPOCH=	1
 CATEGORIES=	devel
 MASTER_SITES=	SF/dict/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	sunpoet@sunpoet.net
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Provides a few data structures and helpful functions
 
 GNU_CONFIGURE=	yes
diff --git a/devel/libpci/Makefile b/devel/libpci/Makefile
index 22bdddaa4146..f97d43a8c959 100644
--- a/devel/libpci/Makefile
+++ b/devel/libpci/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES=	ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/ \
 MASTER_SITE_SUBDIR=	software/utils/pciutils
 DISTNAME=	pciutils-${PORTVERSION}
 
-MAINTAINER=	sunpoet@sunpoet.net
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	PCI configuration space I/O made easy
 
 ALL_TARGET=	lib/libpci.a
diff --git a/devel/nant/Makefile b/devel/nant/Makefile
index 60d2e8128039..5e5719e7c565 100644
--- a/devel/nant/Makefile
+++ b/devel/nant/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	devel
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
-MAINTAINER=	sunpoet@sunpoet.net
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	A .NET build tool inspired by Ant
 
 BUILD_DEPENDS=	mono:${PORTSDIR}/lang/mono
diff --git a/devel/p5-Module-Version/Makefile b/devel/p5-Module-Version/Makefile
index d12bffc35567..156da8933c27 100644
--- a/devel/p5-Module-Version/Makefile
+++ b/devel/p5-Module-Version/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	sunpoet@sunpoet.net
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Get module versions
 
 PERL_CONFIGURE=	yes
diff --git a/devel/py-decoratortools/Makefile b/devel/py-decoratortools/Makefile
index 2cc40bf9f97a..8032a4743224 100644
--- a/devel/py-decoratortools/Makefile
+++ b/devel/py-decoratortools/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	sunpoet@sunpoet.net
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Class, function, and metaclass decorators
 
 USE_PYTHON=	2.4-2.6
diff --git a/devel/shapelib/Makefile b/devel/shapelib/Makefile
index 6bb070c35ae8..c82200875eff 100644
--- a/devel/shapelib/Makefile
+++ b/devel/shapelib/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	http://download.osgeo.org/shapelib/ \
 		http://sunpoet.net/distfiles/
 DISTNAME=	${PORTNAME}-${SHAPELIB_VER}
 
-MAINTAINER=	sunpoet@sunpoet.net
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	C API for reading and writing ArcView Shapefiles
 
 MAKE_JOBS_UNSAFE=	yes
diff --git a/dns/p5-Net-DNS-TestNS/Makefile b/dns/p5-Net-DNS-TestNS/Makefile
index adde526dd728..d253703a7efb 100644
--- a/dns/p5-Net-DNS-TestNS/Makefile
+++ b/dns/p5-Net-DNS-TestNS/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	dns perl5
 MASTER_SITES=	CPAN/../../authors/id/O/OL/OLAF/
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	sunpoet@sunpoet.net
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Perl extension for simulating simple Nameservers
 
 BUILD_DEPENDS=	p5-Net-DNS>0.64:${PORTSDIR}/dns/p5-Net-DNS \
diff --git a/graphics/libgeotiff/Makefile b/graphics/libgeotiff/Makefile
index 43c8785eff36..71c44353ea0b 100644
--- a/graphics/libgeotiff/Makefile
+++ b/graphics/libgeotiff/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	http://download.osgeo.org/geotiff/libgeotiff/ \
 		ftp://ftp.remotesensing.org/geotiff/libgeotiff/ \
 		http://sunpoet.net/distfiles/
 
-MAINTAINER=	sunpoet@sunpoet.net
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Library for reading and writing GeoTIFF information tags
 
 LIB_DEPENDS=	jbig:${PORTSDIR}/graphics/jbigkit \
diff --git a/misc/help2man/Makefile b/misc/help2man/Makefile
index c957e362ec14..42efebaaf1e1 100644
--- a/misc/help2man/Makefile
+++ b/misc/help2man/Makefile
@@ -13,7 +13,7 @@ CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	sunpoet@sunpoet.net
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Automatically generating simple manual pages from program output
 
 .if !defined(WITHOUT_NLS)
diff --git a/misc/p5-Text-FIGlet/Makefile b/misc/p5-Text-FIGlet/Makefile
index 30c2c7b40abf..bd0438f8c199 100644
--- a/misc/p5-Text-FIGlet/Makefile
+++ b/misc/p5-Text-FIGlet/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	sunpoet@sunpoet.net
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Perl module to provide FIGlet abilities, akin to banner
 
 RUN_DEPENDS=	${LOCALBASE}/bin/figlet:${PORTSDIR}/misc/figlet
diff --git a/multimedia/quvi/Makefile b/multimedia/quvi/Makefile
index 393a361633c0..661b9e136c67 100644
--- a/multimedia/quvi/Makefile
+++ b/multimedia/quvi/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	0.2.1
 CATEGORIES=	multimedia devel
 MASTER_SITES=	GOOGLE_CODE
 
-MAINTAINER=	sunpoet@sunpoet.net
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Query video library for Youtube like websites
 
 LIB_DEPENDS=	curl.6:${PORTSDIR}/ftp/curl \
diff --git a/multimedia/umph/Makefile b/multimedia/umph/Makefile
index 5afefd4ddee6..d1481f7d995a 100644
--- a/multimedia/umph/Makefile
+++ b/multimedia/umph/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	0.1.1
 CATEGORIES=	multimedia
 MASTER_SITES=	GOOGLE_CODE
 
-MAINTAINER=	sunpoet@sunpoet.net
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Youtube video playlist parser for cclive and alike tools
 
 RUN_DEPENDS=	p5-XML-DOM>=1.44:${PORTSDIR}/textproc/p5-XML-DOM \
diff --git a/net/mDNSResponder/Makefile b/net/mDNSResponder/Makefile
index ac07f732c318..3052b4ade11b 100644
--- a/net/mDNSResponder/Makefile
+++ b/net/mDNSResponder/Makefile
@@ -11,7 +11,7 @@ PORTVERSION=	214.3.2
 CATEGORIES=	net dns
 MASTER_SITES=	http://opensource.apple.com/tarballs/mDNSResponder/
 
-MAINTAINER=	sunpoet@sunpoet.net
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Apple's mDNSResponder
 
 LICENSE=	ASL BSD
diff --git a/net/mtr/Makefile b/net/mtr/Makefile
index 8521ddb1c557..4bfcd079337c 100644
--- a/net/mtr/Makefile
+++ b/net/mtr/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	ftp://ftp.bitwizard.nl/mtr/ \
 		http://mirrors.evolva.ro/util/mtr/ \
 		http://sunpoet.net/distfiles/
 
-MAINTAINER=	sunpoet@sunpoet.net
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Traceroute and ping in a single graphical network diagnostic tool
 
 GNU_CONFIGURE=	yes
diff --git a/net/p5-OAI-Harvester/Makefile b/net/p5-OAI-Harvester/Makefile
index e11188e0b414..886e8fdfe792 100644
--- a/net/p5-OAI-Harvester/Makefile
+++ b/net/p5-OAI-Harvester/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	net perl5
 MASTER_SITES=	CPAN/../../authors/id/T/TH/THB/
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	sunpoet@sunpoet.net
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	A module to harvest using the OAI protocol
 
 BUILD_DEPENDS=	${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww \
diff --git a/net/tcptraceroute/Makefile b/net/tcptraceroute/Makefile
index 85a40f770c37..f2abb18e9f65 100644
--- a/net/tcptraceroute/Makefile
+++ b/net/tcptraceroute/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	net
 MASTER_SITES=	http://michael.toren.net/code/tcptraceroute/ \
 		http://sunpoet.net/distfiles/
 
-MAINTAINER=	sunpoet@sunpoet.net
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	A traceroute implementation using TCP packets
 
 BUILD_DEPENDS=	${LIBNET_CONFIG}:${PORTSDIR}/net/libnet10
diff --git a/net/tintin++/Makefile b/net/tintin++/Makefile
index 1398a31d56eb..4934deec4ff0 100644
--- a/net/tintin++/Makefile
+++ b/net/tintin++/Makefile
@@ -11,7 +11,7 @@ CATEGORIES+=	net games
 MASTER_SITES=	SF/tintin/TinTin%2B%2B%20Source%20Code/${PORTVERSION}/
 DISTNAME=	tintin-${PORTVERSION}
 
-MAINTAINER=	sunpoet@sunpoet.net
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	A client program to help playing MUDs
 
 LIB_DEPENDS=	pcre.0:${PORTSDIR}/devel/pcre
diff --git a/print/py-cups/Makefile b/print/py-cups/Makefile
index 73dc93cdebe7..1a422e315e06 100644
--- a/print/py-cups/Makefile
+++ b/print/py-cups/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://cyberelk.net/tim/data/pycups/ \
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	py${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	sunpoet@sunpoet.net
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	CUPS bindings for Python
 
 LIB_DEPENDS=	cups.2:${PORTSDIR}/print/cups-client
diff --git a/science/cdo/Makefile b/science/cdo/Makefile
index 5da27b85e3fa..31c7f0c760a9 100644
--- a/science/cdo/Makefile
+++ b/science/cdo/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=		science
 MASTER_SITES=		https://code.zmaw.de/attachments/download/307/ \
 			http://sunpoet.net/distfiles/
 
-MAINTAINER=		sunpoet@sunpoet.net
+MAINTAINER=		sunpoet@FreeBSD.org
 COMMENT=		Climate Data Operators
 
 GNU_CONFIGURE=		yes
diff --git a/science/netcdf-ftn/Makefile b/science/netcdf-ftn/Makefile
index f1abbef0ddc2..3e15ca6c6214 100644
--- a/science/netcdf-ftn/Makefile
+++ b/science/netcdf-ftn/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	netcdf
 
-MAINTAINER=	sunpoet@sunpoet.net
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	NetCDF (network Common Data Form), with Fortran support
 
 LATEST_LINK=	netcdf-ftn
diff --git a/science/netcdf/Makefile b/science/netcdf/Makefile
index 04944196c74b..ca2ebb6d7cdd 100644
--- a/science/netcdf/Makefile
+++ b/science/netcdf/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://www.unidata.ucar.edu/downloads/netcdf/ftp/ \
 		ftp://ftp.unidata.ucar.edu/pub/netcdf/ \
 		http://sunpoet.net/distfiles/
 
-MAINTAINER=	sunpoet@sunpoet.net
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT?=	Library for machine-independent, array-oriented data access
 
 CONFLICTS=	hdf-4.* netcdf-4.*
diff --git a/science/netcdf3-ftn/Makefile b/science/netcdf3-ftn/Makefile
index 0f9260e0ab9d..234d729277c0 100644
--- a/science/netcdf3-ftn/Makefile
+++ b/science/netcdf3-ftn/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	netcdf
 
-MAINTAINER=	sunpoet@sunpoet.net
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	NetCDF (network Common Data Form), with Fortran support
 
 LATEST_LINK=	netcdf3-ftn
diff --git a/science/netcdf4/Makefile b/science/netcdf4/Makefile
index 42398017c1a9..6d5890a01589 100644
--- a/science/netcdf4/Makefile
+++ b/science/netcdf4/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	http://www.unidata.ucar.edu/downloads/netcdf/ftp/ \
 		ftp://ftp.unidata.ucar.edu/pub/netcdf/ \
 		http://sunpoet.net/distfiles/
 
-MAINTAINER=	sunpoet@sunpoet.net
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT?=	Library for machine-independent, array-oriented data access
 
 CONFLICTS=	hdf-4.* netcdf-3.*
diff --git a/science/udunits/Makefile b/science/udunits/Makefile
index e8b53ec8b187..27116dafb4ff 100644
--- a/science/udunits/Makefile
+++ b/science/udunits/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	science math
 MASTER_SITES=	ftp://ftp.unidata.ucar.edu/pub/udunits/ \
 		http://sunpoet.net/distfiles/
 
-MAINTAINER=	sunpoet@sunpoet.net
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	A library for manipulating units of physical quantities
 
 LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
diff --git a/sysutils/freeipmi/Makefile b/sysutils/freeipmi/Makefile
index d9aea1911af2..4e41892dadc0 100644
--- a/sysutils/freeipmi/Makefile
+++ b/sysutils/freeipmi/Makefile
@@ -18,7 +18,7 @@ MASTER_SITES=	GNU/${PORTNAME}/ \
 		http://ftp.gluster.com/pub/${PORTNAME}/${PORTVERSION}/ \
 		http://sunpoet.net/distfiles/
 
-MAINTAINER=	sunpoet@sunpoet.net
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Library and tools to support IPMI-capable hardware
 
 LIB_DEPENDS=	argp:${PORTSDIR}/devel/argp-standalone \
diff --git a/sysutils/psmisc/Makefile b/sysutils/psmisc/Makefile
index 037888eeb4a7..c5ca22925b9c 100644
--- a/sysutils/psmisc/Makefile
+++ b/sysutils/psmisc/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	22.12
 CATEGORIES=	sysutils
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}
 
-MAINTAINER=	sunpoet@sunpoet.net
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	A port of the Linux pstree, killall and pidof commands
 
 CONFLICTS=	pidof-[0-9]* pstree-2.[0-9]*
diff --git a/textproc/idnits/Makefile b/textproc/idnits/Makefile
index 0b2eb64ba561..c1829a0578d3 100644
--- a/textproc/idnits/Makefile
+++ b/textproc/idnits/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	http://tools.ietf.org/tools/idnits/ \
 		http://sunpoet.net/distfiles/
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	sunpoet@sunpoet.net
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Looks for problems in internet draft formatting
 
 RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
diff --git a/textproc/p5-CSS-Minifier-XS/Makefile b/textproc/p5-CSS-Minifier-XS/Makefile
index 8a62537f253d..ac6c4962bb7d 100644
--- a/textproc/p5-CSS-Minifier-XS/Makefile
+++ b/textproc/p5-CSS-Minifier-XS/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	textproc www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	sunpoet@sunpoet.net
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	XS based CSS minifier
 
 PERL_CONFIGURE=	yes
diff --git a/textproc/p5-JavaScript-Minifier-XS/Makefile b/textproc/p5-JavaScript-Minifier-XS/Makefile
index fe14e4ed0a35..f304d10f45cf 100644
--- a/textproc/p5-JavaScript-Minifier-XS/Makefile
+++ b/textproc/p5-JavaScript-Minifier-XS/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	textproc www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	sunpoet@sunpoet.net
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	XS based JavaScript minifier
 
 PERL_CONFIGURE=	yes
diff --git a/textproc/p5-Lingua-Ident/Makefile b/textproc/p5-Lingua-Ident/Makefile
index 253ab242814c..9a8714192bf9 100644
--- a/textproc/p5-Lingua-Ident/Makefile
+++ b/textproc/p5-Lingua-Ident/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN/../../authors/id/MPIOTR
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	sunpoet@sunpoet.net
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Statistical language identification
 
 PERL_CONFIGURE=	yes
diff --git a/textproc/p5-Validator-Custom/Makefile b/textproc/p5-Validator-Custom/Makefile
index af8a2a41b339..5fc01790b970 100644
--- a/textproc/p5-Validator-Custom/Makefile
+++ b/textproc/p5-Validator-Custom/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	sunpoet@sunpoet.net
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Validator::Custom for simple data validation
 
 BUILD_DEPENDS=	p5-Object-Simple>=3.0302:${PORTSDIR}/devel/p5-Object-Simple
diff --git a/textproc/tidyp/Makefile b/textproc/tidyp/Makefile
index 68f1158fc84d..088936ef889f 100644
--- a/textproc/tidyp/Makefile
+++ b/textproc/tidyp/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=		textproc www
 MASTER_SITES=		http://cloud.github.com/downloads/petdance/tidyp/ \
 			http://sunpoet.net/distfiles/
 
-MAINTAINER=		sunpoet@sunpoet.net
+MAINTAINER=		sunpoet@FreeBSD.org
 COMMENT=		A library and program to validate and fix HTML
 
 GNU_CONFIGURE=		yes
diff --git a/www/httrack/Makefile b/www/httrack/Makefile
index fe3cbd73d3c5..2fa3b8a60a7f 100644
--- a/www/httrack/Makefile
+++ b/www/httrack/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://www.httrack.com/ \
 		http://sunpoet.net/distfiles/
 DISTNAME=	${PORTNAME}-${PORTVERSION:C/.([0-9]*)$/-\1/}C
 
-MAINTAINER=	sunpoet@sunpoet.net
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Easy-to-use offline browser utility and website copier
 
 CONFIGURE_ARGS=	--docdir="${DOCSDIR}"
diff --git a/www/p5-Google-Code-Upload/Makefile b/www/p5-Google-Code-Upload/Makefile
index 3d249eb3c801..a838ec987eff 100644
--- a/www/p5-Google-Code-Upload/Makefile
+++ b/www/p5-Google-Code-Upload/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	sunpoet@sunpoet.net
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Uploading files to a Google Code project
 
 BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/List/MoreUtils.pm:${PORTSDIR}/lang/p5-List-MoreUtils \
diff --git a/www/tinymce3/Makefile b/www/tinymce3/Makefile
index 0444ceea523c..06f7111710d7 100644
--- a/www/tinymce3/Makefile
+++ b/www/tinymce3/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	www
 MASTER_SITES=	SF/${PORTNAME}/TinyMCE/${PORTVERSION}
 DISTNAME=	${PORTNAME}_${PORTVERSION:S/./_/g}
 
-MAINTAINER=	sunpoet@sunpoet.net
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	An open source Javascript HTML WYSIWYG editor for web sites
 
 NO_BUILD=	yes
diff --git a/www/wgetpaste/Makefile b/www/wgetpaste/Makefile
index 40e897bc83b2..5644ae0ffdf2 100644
--- a/www/wgetpaste/Makefile
+++ b/www/wgetpaste/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://wgetpaste.zlin.dk/ \
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${PORTNAME}.example zlin.conf
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
-MAINTAINER=	sunpoet@sunpoet.net
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Paste to several pastebin services via bash script
 
 RUN_DEPENDS=	${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash \
diff --git a/x11-fonts/dejavu/Makefile b/x11-fonts/dejavu/Makefile
index c56771f6ad51..9b2a1a2f5659 100644
--- a/x11-fonts/dejavu/Makefile
+++ b/x11-fonts/dejavu/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	x11-fonts
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-fonts-ttf-${PORTVERSION}
 
-MAINTAINER=	sunpoet@sunpoet.net
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Bitstream Vera Fonts clone with a wider range of characters
 
 BUILD_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig