Finish moving MAINTAINER for my ports.

andrews@technologist.com -> will@FreeBSD.org. :-)

Reminded by:	asami

63 files changed, 63 insertions, 63 deletions

diff --git a/archivers/makeself/Makefile b/archivers/makeself/Makefile
index 0c16d0cdb0bf..bd65d7e5ea11 100644
--- a/archivers/makeself/Makefile
+++ b/archivers/makeself/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	archivers
 MASTER_SITES=	http://www.lokigames.com/~megastep/makeself/
 EXTRACT_SUFX=	.gz.sh
 
-MAINTAINER=	andrews@technologist.com
+MAINTAINER=	will@FreeBSD.org
 
 EXTRACT_CMD=	${CP}
 EXTRACT_BEFORE_ARGS=
diff --git a/astro/pyweather/Makefile b/astro/pyweather/Makefile
index dd1b2c163825..47eee525b3dd 100644
--- a/astro/pyweather/Makefile
+++ b/astro/pyweather/Makefile
@@ -11,7 +11,7 @@ PKGNAME=	pyWeather-0.1b
 CATEGORIES=	astro python
 MASTER_SITES=	http://members.bellatlantic.net/~rasclkng/
 
-MAINTAINER=	andrews@technologist.com
+MAINTAINER=	will@FreeBSD.org
 
 RUN_DEPENDS=	${PYTHON}:${PORTSDIR}/lang/python
 
diff --git a/astro/wmglobe/Makefile b/astro/wmglobe/Makefile
index fb6806ea353a..130a84ae5332 100644
--- a/astro/wmglobe/Makefile
+++ b/astro/wmglobe/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	wmglobe-1.0
 CATEGORIES=	astro windowmaker
 MASTER_SITES=	http://perso.linuxfr.org/jdumont/wmg/
 
-MAINTAINER=	andrews@technologist.com
+MAINTAINER=	will@FreeBSD.org
 
 LIB_DEPENDS=	wraster.3:${PORTSDIR}/x11-wm/windowmaker
 
diff --git a/astro/xearth/Makefile b/astro/xearth/Makefile
index e7fe21f99fe9..83d71f22fde7 100644
--- a/astro/xearth/Makefile
+++ b/astro/xearth/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	ftp://cag.lcs.mit.edu/pub/tuna/ \
 		${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR= applications
 
-MAINTAINER=	andrews@technologist.com
+MAINTAINER=	will@FreeBSD.org
 
 USE_IMAKE=	yes
 
diff --git a/astro/xphoon/Makefile b/astro/xphoon/Makefile
index f982d37ecc0a..dc34480e2591 100644
--- a/astro/xphoon/Makefile
+++ b/astro/xphoon/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES=	ftp://ftp.cdrom.com/pub/X11/R5contrib/ \
 		ftp://ftp.is.co.za/pub/x/R5contrib/
 EXTRACT_SUFX=	.tar.Z
 
-MAINTAINER=	andrews@technologist.com
+MAINTAINER=	will@FreeBSD.org
 
 USE_IMAKE=	yes
 
diff --git a/astro/xplanet/Makefile b/astro/xplanet/Makefile
index e5c3ec7b9631..ab4bfe17e582 100644
--- a/astro/xplanet/Makefile
+++ b/astro/xplanet/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	http://www.alumni.caltech.edu/~hari/xplanet/ \
 		http://www.radcyberzine.com/xglobe/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} photo_1600.jpg
 
-MAINTAINER=	andrews@technologist.com
+MAINTAINER=	will@FreeBSD.org
 
 LIB_DEPENDS=	Imlib.5:${PORTSDIR}/graphics/imlib \
 		GL.14:${PORTSDIR}/graphics/Mesa3
diff --git a/benchmarks/httperf/Makefile b/benchmarks/httperf/Makefile
index 975582a68e98..f2b6b5b4083c 100644
--- a/benchmarks/httperf/Makefile
+++ b/benchmarks/httperf/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	httperf-0.6
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.hpl.hp.com/pub/httperf/
 
-MAINTAINER=	andrews@technologist.com
+MAINTAINER=	will@FreeBSD.org
 
 WRKSRC=		${WRKDIR}/${PKGNAME}
 USE_GMAKE=	yes
diff --git a/cad/qcad/Makefile b/cad/qcad/Makefile
index 6afe01868c74..e0c067ddfa8a 100644
--- a/cad/qcad/Makefile
+++ b/cad/qcad/Makefile
@@ -11,7 +11,7 @@ PKGNAME=	qcad-1.3.3
 CATEGORIES=	cad
 MASTER_SITES=	http://www.ultraviolet.org/qcad/
 
-MAINTAINER=	andrews@technologist.com
+MAINTAINER=	will@FreeBSD.org
 
 USE_XLIB=	yes
 MAKEFILE=	makefile
diff --git a/cad/qcad2/Makefile b/cad/qcad2/Makefile
index 6afe01868c74..e0c067ddfa8a 100644
--- a/cad/qcad2/Makefile
+++ b/cad/qcad2/Makefile
@@ -11,7 +11,7 @@ PKGNAME=	qcad-1.3.3
 CATEGORIES=	cad
 MASTER_SITES=	http://www.ultraviolet.org/qcad/
 
-MAINTAINER=	andrews@technologist.com
+MAINTAINER=	will@FreeBSD.org
 
 USE_XLIB=	yes
 MAKEFILE=	makefile
diff --git a/devel/cervisia/Makefile b/devel/cervisia/Makefile
index ff2739dba625..c96cbc56a44c 100644
--- a/devel/cervisia/Makefile
+++ b/devel/cervisia/Makefile
@@ -9,7 +9,7 @@ DISTNAME=	cervisia-0.5.0
 CATEGORIES=	devel
 MASTER_SITES=	http://download.sourceforge.net/cervisia/
 
-MAINTAINER=	andrews@technologist.com
+MAINTAINER=	will@FreeBSD.org
 
 LIB_DEPENDS=	kdecore.3:${PORTSDIR}/x11/kdelibs11
 RUN_DEPENDS=	kwm:${PORTSDIR}/x11/kdebase11
diff --git a/devel/flux/Makefile b/devel/flux/Makefile
index 54f90a8b5fde..96f7ff9987ee 100644
--- a/devel/flux/Makefile
+++ b/devel/flux/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	flux-0.3.0
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.styx.net/projects/flux/
 
-MAINTAINER=	andrews@technologist.com
+MAINTAINER=	will@FreeBSD.org
 
 USE_LIBTOOL=	yes
 USE_GMAKE=	yes
diff --git a/devel/kdevelop/Makefile b/devel/kdevelop/Makefile
index 61b4e2959c16..5a494cf8848a 100644
--- a/devel/kdevelop/Makefile
+++ b/devel/kdevelop/Makefile
@@ -17,7 +17,7 @@ MASTER_SITES=	ftp://fara.cs.uni-potsdam.de/pub/kdevelop/ \
 		ftp://apcs.shellx.org/pub/KDevelop/ \
 		ftp://ftp.mpg.goe.ni.schule.de/pub/linux/ide/KDevelop/
 
-MAINTAINER=	andrews@technologist.com
+MAINTAINER=	will@FreeBSD.org
 
 LIB_DEPENDS=	kdeui.3:${PORTSDIR}/x11/kdelibs11
 RUN_DEPENDS=	autoconf:${PORTSDIR}/devel/autoconf
diff --git a/devel/kpp/Makefile b/devel/kpp/Makefile
index dcf207311318..44ceaef8b5f3 100644
--- a/devel/kpp/Makefile
+++ b/devel/kpp/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	kpp-0.15c
 CATEGORIES=	devel
 MASTER_SITES=	http://www.msoe.edu/~geiseri/files/
 
-MAINTAINER=	andrews@technologist.com
+MAINTAINER=	will@FreeBSD.org
 
 LIB_DEPENDS=	kdeui.3:${PORTSDIR}/x11/kdelibs11
 
diff --git a/devel/libcache/Makefile b/devel/libcache/Makefile
index f91948195a6c..91c0a5653a36 100644
--- a/devel/libcache/Makefile
+++ b/devel/libcache/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	libcache-1.0.0
 CATEGORIES=	devel
 MASTER_SITES=	http://www.afro-productions.com/
 
-MAINTAINER=	andrews@technologist.com
+MAINTAINER=	will@FreeBSD.org
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--enable-shared
diff --git a/devel/newt/Makefile b/devel/newt/Makefile
index 68f1a8d45e72..e1b1578aea1d 100644
--- a/devel/newt/Makefile
+++ b/devel/newt/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES=	\
 	ftp://ftp.infomagic.com/pub/mirrors/linux/RedHat/redhat-6.1/SRPMS/SRPMS/
 EXTRACT_SUFX=	.src.rpm
 
-MAINTAINER=	andrews@technologist.com
+MAINTAINER=	will@FreeBSD.org
 
 LIB_DEPENDS=	slang.1:${PORTSDIR}/devel/libslang
 BUILD_DEPENDS=	rpm2cpio:${PORTSDIR}/misc/rpm \
diff --git a/devel/p5-IO-Stty/Makefile b/devel/p5-IO-Stty/Makefile
index 8f35ad7a56ca..4ee82caf2bcd 100644
--- a/devel/p5-IO-Stty/Makefile
+++ b/devel/p5-IO-Stty/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	IO
 
-MAINTAINER=	andrews@technologist.com
+MAINTAINER=	will@FreeBSD.org
 
 USE_PERL5=	yes
 
diff --git a/devel/p5-IO-Tty/Makefile b/devel/p5-IO-Tty/Makefile
index c5ccd033c19c..080dc1367091 100644
--- a/devel/p5-IO-Tty/Makefile
+++ b/devel/p5-IO-Tty/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	IO
 
-MAINTAINER=	andrews@technologist.com
+MAINTAINER=	will@FreeBSD.org
 
 USE_PERL5=	yes
 IS_INTERACTIVE=	yes
diff --git a/devel/qtk/Makefile b/devel/qtk/Makefile
index d00eac500460..a6b3674e4a74 100644
--- a/devel/qtk/Makefile
+++ b/devel/qtk/Makefile
@@ -11,7 +11,7 @@ PKGNAME=	qtk-0.50
 CATEGORIES=	devel tk82
 MASTER_SITES=	http://www.psn.net/~andrews/dist/
 
-MAINTAINER=	andrews@technologist.com
+MAINTAINER=	will@FreeBSD.org
 
 RUN_DEPENDS=	${LOCALBASE}/bin/wish8.2:${PORTSDIR}/x11-toolkits/tk82
 
diff --git a/devel/robodoc/Makefile b/devel/robodoc/Makefile
index 2f10fd184d6a..285d7c152b10 100644
--- a/devel/robodoc/Makefile
+++ b/devel/robodoc/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	devel
 MASTER_SITES=	http://www.xs4all.nl/~rfsber/Robo/
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	andrews@technologist.com
+MAINTAINER=	will@FreeBSD.org
 
 FETCH_BEFORE_ARGS+= -b
 WRKSRC=		${WRKDIR}/Robodoc
diff --git a/editors/joe-devel/Makefile b/editors/joe-devel/Makefile
index a6e533a94278..837fa20725ab 100644
--- a/editors/joe-devel/Makefile
+++ b/editors/joe-devel/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.std.com/src/editors/
 EXTRACT_SUFX=	.tar.Z
 
-MAINTAINER=	andrews@technologist.com
+MAINTAINER=	will@FreeBSD.org
 
 WRKSRC=		${WRKDIR}/joe
 ALL_TARGET=	joe
diff --git a/editors/joe/Makefile b/editors/joe/Makefile
index a6e533a94278..837fa20725ab 100644
--- a/editors/joe/Makefile
+++ b/editors/joe/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.std.com/src/editors/
 EXTRACT_SUFX=	.tar.Z
 
-MAINTAINER=	andrews@technologist.com
+MAINTAINER=	will@FreeBSD.org
 
 WRKSRC=		${WRKDIR}/joe
 ALL_TARGET=	joe
diff --git a/editors/joe2/Makefile b/editors/joe2/Makefile
index a6e533a94278..837fa20725ab 100644
--- a/editors/joe2/Makefile
+++ b/editors/joe2/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.std.com/src/editors/
 EXTRACT_SUFX=	.tar.Z
 
-MAINTAINER=	andrews@technologist.com
+MAINTAINER=	will@FreeBSD.org
 
 WRKSRC=		${WRKDIR}/joe
 ALL_TARGET=	joe
diff --git a/emulators/ksnes9x/Makefile b/emulators/ksnes9x/Makefile
index 25a6ee832010..88094adc2922 100644
--- a/emulators/ksnes9x/Makefile
+++ b/emulators/ksnes9x/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	ksnes9x-1.2
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.esquadro.com.br/~ismore/
 
-MAINTAINER=	andrews@technologist.com
+MAINTAINER=	will@FreeBSD.org
 
 LIB_DEPENDS=	kdeui.3:${PORTSDIR}/x11/kdelibs11
 RUN_DEPENDS=	snes9x:${PORTSDIR}/emulators/snes9x
diff --git a/finance/qhacc/Makefile b/finance/qhacc/Makefile
index d1b2427325df..9cce0ee32f67 100644
--- a/finance/qhacc/Makefile
+++ b/finance/qhacc/Makefile
@@ -11,7 +11,7 @@ PKGNAME=	qhacc-0.3.1
 CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.ostrich-emulators.cx/qhacc/
 
-MAINTAINER=	andrews@technologist.com
+MAINTAINER=	will@FreeBSD.org
 
 USE_X_PREFIX=	yes
 USE_QT2=	yes
diff --git a/finance/wmstock/Makefile b/finance/wmstock/Makefile
index d2bf1680a2f7..0e8b6f14fb6c 100644
--- a/finance/wmstock/Makefile
+++ b/finance/wmstock/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	misc windowmaker
 MASTER_SITES=	http://mattfischer.com/wmstock/src/ \
 		http://www.psn.net/~andrews/wmstock/
 
-MAINTAINER=	andrews@technologist.com
+MAINTAINER=	will@FreeBSD.org
 
 LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
 
diff --git a/games/gno3dtet/Makefile b/games/gno3dtet/Makefile
index 4b6feccaeb01..19c485b4a5d9 100644
--- a/games/gno3dtet/Makefile
+++ b/games/gno3dtet/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	games
 MASTER_SITES=	ftp://webdat.com/pub/seb/gno3dtet/
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	andrews@technologist.com
+MAINTAINER=	will@FreeBSD.org
 
 LIB_DEPENDS=	gnomeui.3:${PORTSDIR}/x11/gnomelibs
 
diff --git a/games/hex/Makefile b/games/hex/Makefile
index 1c0cea49ffd9..b8d360db6717 100644
--- a/games/hex/Makefile
+++ b/games/hex/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	games
 MASTER_SITES=	http://www.nott.ac.uk/~psystrj/ \
 		http://www.psn.net/~andrews/dist/
 
-MAINTAINER=	andrews@technologist.com
+MAINTAINER=	will@FreeBSD.org
 
 LIB_DEPENDS=	Imlib.5:${PORTSDIR}/graphics/imlib \
 		gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
diff --git a/games/kbubbles/Makefile b/games/kbubbles/Makefile
index 2e8304179939..72f6cebc5c71 100644
--- a/games/kbubbles/Makefile
+++ b/games/kbubbles/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	kbubbles-0.8.6
 CATEGORIES=	games
 MASTER_SITES=	http://hem.passagen.se/tonybj/kbubbles/
 
-MAINTAINER=	andrews@technologist.com
+MAINTAINER=	will@FreeBSD.org
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext
 LIB_DEPENDS=	QwSpriteField.7:${PORTSDIR}/converters/kdesupport11 \
diff --git a/games/krogue/Makefile b/games/krogue/Makefile
index 81ef00472717..fa335f183b2b 100644
--- a/games/krogue/Makefile
+++ b/games/krogue/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	games
 MASTER_SITES=	http://ksi.ii.uj.edu.pl/krogue/dl/
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	andrews@technologist.com
+MAINTAINER=	will@FreeBSD.org
 
 LIB_DEPENDS=	kdecore.3:${PORTSDIR}/x11/kdelibs11
 BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext
diff --git a/games/rubix/Makefile b/games/rubix/Makefile
index e318441f951c..794592d76110 100644
--- a/games/rubix/Makefile
+++ b/games/rubix/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	rubix-1.0.1
 CATEGORIES=	games
 MASTER_SITES=	http://sed.free.fr/rubix/
 
-MAINTAINER=	andrews@technologist.com
+MAINTAINER=	will@FreeBSD.org
 
 USE_GMAKE=	yes
 MAKE_ENV=	GMAKE=${GMAKE}
diff --git a/games/tkmoo/Makefile b/games/tkmoo/Makefile
index 499c0519e42e..8e2cc1e77cb2 100644
--- a/games/tkmoo/Makefile
+++ b/games/tkmoo/Makefile
@@ -11,7 +11,7 @@ PKGNAME=	tkmoo-0.3.23
 CATEGORIES=	games tk82
 MASTER_SITES=	http://www.awns.com/tkMOO-light/Source/
 
-MAINTAINER=	andrews@technologist.com
+MAINTAINER=	will@FreeBSD.org
 
 RUN_DEPENDS=	${WISH82}:${PORTSDIR}/x11-toolkits/tk82
 
diff --git a/games/wmminichess/Makefile b/games/wmminichess/Makefile
index 39882066a603..cc9553d2decc 100644
--- a/games/wmminichess/Makefile
+++ b/games/wmminichess/Makefile
@@ -11,7 +11,7 @@ PKGNAME=	wmminichess-0.8
 CATEGORIES=	games
 MASTER_SITES=	http://www.electricrain.com/edavis/miniCHESS/
 
-MAINTAINER=	andrews@technologist.com
+MAINTAINER=	will@FreeBSD.org
 
 LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
 RUN_DEPENDS=	${LOCALBASE}/bin/gnuchessx:${PORTSDIR}/games/gnuchess
diff --git a/graphics/gcolor/Makefile b/graphics/gcolor/Makefile
index bb19a350c1b2..ce0e4c6505f8 100644
--- a/graphics/gcolor/Makefile
+++ b/graphics/gcolor/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	gcolor-0.4
 CATEGORIES=	graphics gnome x11
 MASTER_SITES=	http://download.sourceforge.net/gcolor/
 
-MAINTAINER=	andrews@technologist.com
+MAINTAINER=	will@FreeBSD.org
 
 LIB_DEPENDS=	gnomeui.3:${PORTSDIR}/x11/gnomelibs
 
diff --git a/graphics/gnofract4d/Makefile b/graphics/gnofract4d/Makefile
index 19ce896ec459..8a6a917ab0be 100644
--- a/graphics/gnofract4d/Makefile
+++ b/graphics/gnofract4d/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	gnofract4d-1.2
 CATEGORIES=	graphics
 MASTER_SITES=	http://download.sourceforge.net/gnofract4d/
 
-MAINTAINER=	andrews@technologist.com
+MAINTAINER=	will@FreeBSD.org
 
 LIB_DEPENDS=	gnomeui.3:${PORTSDIR}/x11/gnomelibs
 
diff --git a/graphics/twinlib/Makefile b/graphics/twinlib/Makefile
index a50e028c7dd1..b2d5c543bc93 100644
--- a/graphics/twinlib/Makefile
+++ b/graphics/twinlib/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	graphics devel
 MASTER_SITES=	http://rio.xdev.org/paintlib/
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	andrews@technologist.com
+MAINTAINER=	will@FreeBSD.org
 
 USE_QT2=	yes
 USE_X_PREFIX=	yes
diff --git a/graphics/zimg/Makefile b/graphics/zimg/Makefile
index de66f3ba04ce..2a1cd92ff307 100644
--- a/graphics/zimg/Makefile
+++ b/graphics/zimg/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	zimg-2.4.0
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.zellner.org/zimg/download/
 
-MAINTAINER=	andrews@technologist.com
+MAINTAINER=	will@FreeBSD.org
 
 LIB_DEPENDS=	gd.0:${PORTSDIR}/graphics/gd
 
diff --git a/irc/blackened/Makefile b/irc/blackened/Makefile
index 0b12555183fe..a2cddab14fdd 100644
--- a/irc/blackened/Makefile
+++ b/irc/blackened/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	blackened-${VERSION}
 CATEGORIES=	irc
 MASTER_SITES=	ftp://ftp.blackened.com/pub/irc/blackened/
 
-MAINTAINER=	andrews@technologist.com
+MAINTAINER=	will@FreeBSD.org
 
 GNU_CONFIGURE=	yes
 WRKSRC=		${WRKDIR}/${PKGNAME}
diff --git a/irc/kvirc-devel/Makefile b/irc/kvirc-devel/Makefile
index 885443e32f1b..8e14a6c94c94 100644
--- a/irc/kvirc-devel/Makefile
+++ b/irc/kvirc-devel/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	irc
 MASTER_SITES=	ftp://ftp.kvirc.bz.nu/pub/mirror/kvirc/ \
 		http://www.kvirc.org/
 
-MAINTAINER=	andrews@technologist.com
+MAINTAINER=	will@FreeBSD.org
 
 USE_QT2=	yes
 USE_X_PREFIX=	yes
diff --git a/irc/kvirc/Makefile b/irc/kvirc/Makefile
index 885443e32f1b..8e14a6c94c94 100644
--- a/irc/kvirc/Makefile
+++ b/irc/kvirc/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	irc
 MASTER_SITES=	ftp://ftp.kvirc.bz.nu/pub/mirror/kvirc/ \
 		http://www.kvirc.org/
 
-MAINTAINER=	andrews@technologist.com
+MAINTAINER=	will@FreeBSD.org
 
 USE_QT2=	yes
 USE_X_PREFIX=	yes
diff --git a/irc/nethirc/Makefile b/irc/nethirc/Makefile
index ada0b10c7575..3aa0e69f63e5 100644
--- a/irc/nethirc/Makefile
+++ b/irc/nethirc/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	irc
 MASTER_SITES=	http://people.FreeBSD.org/~cpiazza/distfiles/
 EXTRACT_SUFX=	.tar.Z
 
-MAINTAINER=	andrews@technologist.com
+MAINTAINER=	will@FreeBSD.org
 
 RUN_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/5.005/Net/IRC.pm:${PORTSDIR}/irc/p5-IRC
 
diff --git a/irc/scrollz/Makefile b/irc/scrollz/Makefile
index 6a2e5f332fe7..fc6dc417e225 100644
--- a/irc/scrollz/Makefile
+++ b/irc/scrollz/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	irc
 MASTER_SITES=	ftp://ns0.hole.org/pub/ScrollZ/Bins/
 EXTRACT_SUFX=	.bz2
 
-MAINTAINER=	andrews@technologist.com
+MAINTAINER=	will@FreeBSD.org
 
 USE_BZIP2=	YES
 NO_BUILD=	YES
diff --git a/lang/p5-Expect/Makefile b/lang/p5-Expect/Makefile
index d003db5ad381..9e457c341d93 100644
--- a/lang/p5-Expect/Makefile
+++ b/lang/p5-Expect/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	lang perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Expect
 
-MAINTAINER=	andrews@technologist.com
+MAINTAINER=	will@FreeBSD.org
 
 BUILD_DEPENDS=	${SITE_PERL}/IO-Tty.pm:${PORTSDIR}/devel/p5-IO-Tty \
 		${SITE_PERL}/IO-Stty.pm:${PORTSDIR}/devel/p5-IO-Stty
diff --git a/mail/glacier/Makefile b/mail/glacier/Makefile
index 0aa66ee118e6..1f3843d5784c 100644
--- a/mail/glacier/Makefile
+++ b/mail/glacier/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	glacier-0.0.2
 CATEGORIES=	mail gnome
 MASTER_SITES=	http://glacier.linuxbox.com/
 
-MAINTAINER=	andrews@technologist.com
+MAINTAINER=	will@FreeBSD.org
 
 LIB_DEPENDS=	gnomeui.3:${PORTSDIR}/x11/gnomelibs
 
diff --git a/mail/mreport/Makefile b/mail/mreport/Makefile
index 461f65844c68..25c841ee4933 100644
--- a/mail/mreport/Makefile
+++ b/mail/mreport/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	mreport-0.9
 CATEGORIES=	mail sysutils
 MASTER_SITES=	ftp://ftp.datrix.co.za/pub/mreport/
 
-MAINTAINER=	andrews@technologist.com
+MAINTAINER=	will@FreeBSD.org
 
 ALL_TARGET=	ALL
 MAN8=		mreport.8
diff --git a/misc/bidwatcher/Makefile b/misc/bidwatcher/Makefile
index 7dcedf0e26ec..479ae830e92f 100644
--- a/misc/bidwatcher/Makefile
+++ b/misc/bidwatcher/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	${MASTER_SITE_SUNSITE} \
 		http://people.FreeBSD.org/~mph/distfiles/
 MASTER_SITE_SUBDIR=	apps/misc
 
-MAINTAINER=	andrews@technologist.com
+MAINTAINER=	will@FreeBSD.org
 
 USE_GMAKE=	YES
 USE_QT=		YES
diff --git a/misc/qhacc/Makefile b/misc/qhacc/Makefile
index d1b2427325df..9cce0ee32f67 100644
--- a/misc/qhacc/Makefile
+++ b/misc/qhacc/Makefile
@@ -11,7 +11,7 @@ PKGNAME=	qhacc-0.3.1
 CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.ostrich-emulators.cx/qhacc/
 
-MAINTAINER=	andrews@technologist.com
+MAINTAINER=	will@FreeBSD.org
 
 USE_X_PREFIX=	yes
 USE_QT2=	yes
diff --git a/misc/wmstock/Makefile b/misc/wmstock/Makefile
index d2bf1680a2f7..0e8b6f14fb6c 100644
--- a/misc/wmstock/Makefile
+++ b/misc/wmstock/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	misc windowmaker
 MASTER_SITES=	http://mattfischer.com/wmstock/src/ \
 		http://www.psn.net/~andrews/wmstock/
 
-MAINTAINER=	andrews@technologist.com
+MAINTAINER=	will@FreeBSD.org
 
 LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
 
diff --git a/net-mgmt/dhcpconf/Makefile b/net-mgmt/dhcpconf/Makefile
index 8ca2fff6bd88..39b430bdd76e 100644
--- a/net-mgmt/dhcpconf/Makefile
+++ b/net-mgmt/dhcpconf/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	net sysutils
 MASTER_SITES=	http://members.xoom.com/vschade/dhcp-conf/
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	andrews@technologist.com
+MAINTAINER=	will@FreeBSD.org
 
 LIB_DEPENDS=	gdbm.2:${PORTSDIR}/databases/gdbm \
 		newt.0:${PORTSDIR}/devel/newt
diff --git a/net/dhcpconf/Makefile b/net/dhcpconf/Makefile
index 8ca2fff6bd88..39b430bdd76e 100644
--- a/net/dhcpconf/Makefile
+++ b/net/dhcpconf/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	net sysutils
 MASTER_SITES=	http://members.xoom.com/vschade/dhcp-conf/
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	andrews@technologist.com
+MAINTAINER=	will@FreeBSD.org
 
 LIB_DEPENDS=	gdbm.2:${PORTSDIR}/databases/gdbm \
 		newt.0:${PORTSDIR}/devel/newt
diff --git a/print/pclprint/Makefile b/print/pclprint/Makefile
index 1da44d38eed0..b5e58c220bb6 100644
--- a/print/pclprint/Makefile
+++ b/print/pclprint/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	ftp://andrsn.stanford.edu/pub/print/ \
 		http://www.psn.net/~andrews/dist/
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	andrews@technologist.com
+MAINTAINER=	will@FreeBSD.org
 
 NO_BUILD=	YES
 
diff --git a/shells/flash/Makefile b/shells/flash/Makefile
index 6450c6b123b8..4f5c3c14860f 100644
--- a/shells/flash/Makefile
+++ b/shells/flash/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	flash-0.9.1
 CATEGORIES=	shells
 MASTER_SITES=	ftp://ftp.netsoc.ucd.ie/pub/computing/flash/
 
-MAINTAINER=	andrews@technologist.com
+MAINTAINER=	will@FreeBSD.org
 
 .include <bsd.port.pre.mk>
 
diff --git a/shells/perlsh/Makefile b/shells/perlsh/Makefile
index b59a8f2077a8..69513addf12c 100644
--- a/shells/perlsh/Makefile
+++ b/shells/perlsh/Makefile
@@ -11,7 +11,7 @@ PKGNAME=	perlsh-${VERSION}
 CATEGORIES=	shells perl5
 MASTER_SITES=	http://www.focusresearch.com/gregor/psh/
 
-MAINTAINER=	andrews@technologist.com
+MAINTAINER=	will@FreeBSD.org
 
 VERSION=	0.007
 USE_PERL5=	yes
diff --git a/shells/psh/Makefile b/shells/psh/Makefile
index b59a8f2077a8..69513addf12c 100644
--- a/shells/psh/Makefile
+++ b/shells/psh/Makefile
@@ -11,7 +11,7 @@ PKGNAME=	perlsh-${VERSION}
 CATEGORIES=	shells perl5
 MASTER_SITES=	http://www.focusresearch.com/gregor/psh/
 
-MAINTAINER=	andrews@technologist.com
+MAINTAINER=	will@FreeBSD.org
 
 VERSION=	0.007
 USE_PERL5=	yes
diff --git a/sysutils/wmbattery/Makefile b/sysutils/wmbattery/Makefile
index 4ffe1f71d2df..61a91b88f5bf 100644
--- a/sysutils/wmbattery/Makefile
+++ b/sysutils/wmbattery/Makefile
@@ -11,7 +11,7 @@ PKGNAME=	${DISTNAME}-1.11
 CATEGORIES=	sysutils windowmaker
 MASTER_SITES=	http://kitenet.net/programs/code/wmbattery/
 
-MAINTAINER=	andrews@technologist.com
+MAINTAINER=	will@FreeBSD.org
 
 LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
 
diff --git a/www/fhttpd/Makefile b/www/fhttpd/Makefile
index fe297573e67e..a53dcda149d6 100644
--- a/www/fhttpd/Makefile
+++ b/www/fhttpd/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	fhttpd-0.4.2
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.fhttpd.org/
 
-MAINTAINER=	andrews@technologist.com
+MAINTAINER=	will@FreeBSD.org
 
 LOGFILE=	share/fhttpd/fhttpd.log
 PLIST_SUB+=	LOGFILE=${LOGFILE}
diff --git a/www/httperf/Makefile b/www/httperf/Makefile
index 975582a68e98..f2b6b5b4083c 100644
--- a/www/httperf/Makefile
+++ b/www/httperf/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	httperf-0.6
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.hpl.hp.com/pub/httperf/
 
-MAINTAINER=	andrews@technologist.com
+MAINTAINER=	will@FreeBSD.org
 
 WRKSRC=		${WRKDIR}/${PKGNAME}
 USE_GMAKE=	yes
diff --git a/www/kdreamsite/Makefile b/www/kdreamsite/Makefile
index 90b35de8a433..ba53b5d04814 100644
--- a/www/kdreamsite/Makefile
+++ b/www/kdreamsite/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	kdreamsite-0.2
 CATEGORIES=	www kde
 MASTER_SITES=	http://neptune.spaceports.com/%7Eatnet/files/
 
-MAINTAINER=	andrews@technologist.com
+MAINTAINER=	will@FreeBSD.org
 
 LIB_DEPENDS=	kdeui.3:${PORTSDIR}/x11/kdelibs11/
 
diff --git a/x11-toolkits/qt145/Makefile b/x11-toolkits/qt145/Makefile
index 796cb23c51d9..190523e4a470 100644
--- a/x11-toolkits/qt145/Makefile
+++ b/x11-toolkits/qt145/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	qt-1.45
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://ftp.troll.no/qt/source/
 
-MAINTAINER=	andrews@technologist.com
+MAINTAINER=	will@FreeBSD.org
 
 LIB_DEPENDS=	GL.14:${PORTSDIR}/graphics/Mesa3
 
diff --git a/x11-wm/ude/Makefile b/x11-wm/ude/Makefile
index 7920271d9ce1..e70a8bee346e 100644
--- a/x11-wm/ude/Makefile
+++ b/x11-wm/ude/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	x11-wm
 MASTER_SITES=	ftp://download.sourceforge.net/pub/sourceforge/udeproject/ \
 		ftp://ude.the-coffeeshop.dk/pub/UDE/
 
-MAINTAINER=	andrews@technologist.com
+MAINTAINER=	will@FreeBSD.org
 
 LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
 BUILD_DEPENDS=	${LOCALBASE}/include/libintl.h:${PORTSDIR}/devel/gettext
diff --git a/x11-wm/wmanager/Makefile b/x11-wm/wmanager/Makefile
index 1519e9c04954..252029ccefab 100644
--- a/x11-wm/wmanager/Makefile
+++ b/x11-wm/wmanager/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	x11-wm
 MASTER_SITES=	http://heuss.techfak.uni-bielefeld.de/www/mtessmer/wmanager/
 EXTRACT_SUFX=	.src.tar.bz2
 
-MAINTAINER=	andrews@technologist.com
+MAINTAINER=	will@FreeBSD.org
 
 LIB_DEPENDS=	fltk.1:${PORTSDIR}/x11-toolkits/fltk/
 
diff --git a/x11/rxvt-devel/Makefile b/x11/rxvt-devel/Makefile
index 670e0b39ccb1..1a628cce4b31 100644
--- a/x11/rxvt-devel/Makefile
+++ b/x11/rxvt-devel/Makefile
@@ -16,7 +16,7 @@ MASTER_SITES=	ftp://ftp.rxvt.org/pub/rxvt/ \
 		${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	X11/terms
 
-MAINTAINER=	andrews@technologist.com
+MAINTAINER=	will@FreeBSD.org
 
 LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
 
diff --git a/x11/rxvt-unicode/Makefile b/x11/rxvt-unicode/Makefile
index 670e0b39ccb1..1a628cce4b31 100644
--- a/x11/rxvt-unicode/Makefile
+++ b/x11/rxvt-unicode/Makefile
@@ -16,7 +16,7 @@ MASTER_SITES=	ftp://ftp.rxvt.org/pub/rxvt/ \
 		${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	X11/terms
 
-MAINTAINER=	andrews@technologist.com
+MAINTAINER=	will@FreeBSD.org
 
 LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
 
diff --git a/x11/rxvt/Makefile b/x11/rxvt/Makefile
index 670e0b39ccb1..1a628cce4b31 100644
--- a/x11/rxvt/Makefile
+++ b/x11/rxvt/Makefile
@@ -16,7 +16,7 @@ MASTER_SITES=	ftp://ftp.rxvt.org/pub/rxvt/ \
 		${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	X11/terms
 
-MAINTAINER=	andrews@technologist.com
+MAINTAINER=	will@FreeBSD.org
 
 LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm