66 files changed, 66 insertions, 66 deletions

diff --git a/archivers/p5-Compress-Raw-Bzip2/Makefile b/archivers/p5-Compress-Raw-Bzip2/Makefile
index c06cc857efc1..172bfd92827f 100644
--- a/archivers/p5-Compress-Raw-Bzip2/Makefile
+++ b/archivers/p5-Compress-Raw-Bzip2/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Compress
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	thomas@goodking.ca
+MAINTAINER=	tabthorpe@FreeBSD.org
 COMMENT=	Low-Level Interface to bzip2 compression library
 
 PERL_CONFIGURE=	YES
diff --git a/archivers/p5-Compress-Raw-Zlib/Makefile b/archivers/p5-Compress-Raw-Zlib/Makefile
index f61a61aa26eb..b477b3f7f957 100644
--- a/archivers/p5-Compress-Raw-Zlib/Makefile
+++ b/archivers/p5-Compress-Raw-Zlib/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Compress
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	thomas@goodking.ca
+MAINTAINER=	tabthorpe@FreeBSD.org
 COMMENT=	Low-Level Interface to zlib compression library
 
 PERL_CONFIGURE=	YES
diff --git a/archivers/p5-IO-Compress-Base/Makefile b/archivers/p5-IO-Compress-Base/Makefile
index 336b691c93ab..d6d6f58d3002 100644
--- a/archivers/p5-IO-Compress-Base/Makefile
+++ b/archivers/p5-IO-Compress-Base/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	IO
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	thomas@goodking.ca
+MAINTAINER=	tabthorpe@FreeBSD.org
 COMMENT=	Base Class for IO::Uncompress modules
 
 PERL_CONFIGURE=	YES
diff --git a/archivers/p5-IO-Compress-Bzip2/Makefile b/archivers/p5-IO-Compress-Bzip2/Makefile
index 32e2ea06e245..5faf80515e9e 100644
--- a/archivers/p5-IO-Compress-Bzip2/Makefile
+++ b/archivers/p5-IO-Compress-Bzip2/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	IO
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	thomas@goodking.ca
+MAINTAINER=	tabthorpe@FreeBSD.org
 COMMENT=	An interface to allow writing bzip2 compressed data to files or buffer
 
 BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Compress/Raw/Bzip2.pm:${PORTSDIR}/archivers/p5-Compress-Raw-Bzip2 \
diff --git a/cad/gplcver/Makefile b/cad/gplcver/Makefile
index 561f9293d846..a5a265d42a4f 100644
--- a/cad/gplcver/Makefile
+++ b/cad/gplcver/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	cad
 MASTER_SITES=	http://www.pragmatic-c.com/gpl-cver/downloads/
 DISTNAME=	${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}.src
 
-MAINTAINER=	thomas@goodking.ca
+MAINTAINER=	tabthorpe@FreeBSD.org
 COMMENT=	A Verilog HDL simulator
 
 USE_BZIP2=	yes
diff --git a/converters/p5-Convert-TNEF/Makefile b/converters/p5-Convert-TNEF/Makefile
index 943b51b49e9f..3be95edcfc84 100644
--- a/converters/p5-Convert-TNEF/Makefile
+++ b/converters/p5-Convert-TNEF/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Convert
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	thomas@goodking.ca
+MAINTAINER=	tabthorpe@FreeBSD.org
 COMMENT=	Perl module to read TNEF files
 
 BUILD_DEPENDS=	${SITE_PERL}/IO/Wrap.pm:${PORTSDIR}/devel/p5-IO-stringy \
diff --git a/databases/mrtg-mysql-load/Makefile b/databases/mrtg-mysql-load/Makefile
index 202c6ac55c29..4a3fe837d7c6 100644
--- a/databases/mrtg-mysql-load/Makefile
+++ b/databases/mrtg-mysql-load/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	databases net-mgmt
 MASTER_SITES=	http://www.bitbybit.dk/mysql/mrtg-mysql-load/ \
 		http://freebsd.unixfreunde.de/sources/
 
-MAINTAINER=	thomas@goodking.ca
+MAINTAINER=	tabthorpe@FreeBSD.org
 COMMENT=	A MySQL load analysis fetcher for MRTG
 
 RUN_DEPENDS=	mrtg:${PORTSDIR}/net-mgmt/mrtg
diff --git a/databases/pear-DB/Makefile b/databases/pear-DB/Makefile
index a27722871510..d67194d63eff 100644
--- a/databases/pear-DB/Makefile
+++ b/databases/pear-DB/Makefile
@@ -11,7 +11,7 @@ PORTEPOCH=	1
 CATEGORIES=	databases www pear
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/RC/}
 
-MAINTAINER=	thomas@goodking.ca
+MAINTAINER=	tabthorpe@FreeBSD.org
 COMMENT=	PEAR Database Abstraction Layer
 
 BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
diff --git a/deskutils/kompose/Makefile b/deskutils/kompose/Makefile
index aec686922b1b..638ac88bdb8f 100644
--- a/deskutils/kompose/Makefile
+++ b/deskutils/kompose/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	deskutils kde
 MASTER_SITES=	${MASTER_SITE_BERLIOS}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	thomas@goodking.ca
+MAINTAINER=	tabthorpe@FreeBSD.org
 COMMENT=	Full-screen task manager similar to Expose(tm)
 
 LIB_DEPENDS=	Imlib2.4:${PORTSDIR}/graphics/imlib2
diff --git a/devel/global/Makefile b/devel/global/Makefile
index ed07d41f9bd6..1365c440427a 100644
--- a/devel/global/Makefile
+++ b/devel/global/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	thomas@goodking.ca
+MAINTAINER=	tabthorpe@FreeBSD.org
 COMMENT=	A source code tag system
 
 GNU_CONFIGURE=	yes
diff --git a/devel/libcwd/Makefile b/devel/libcwd/Makefile
index 8368f9347d31..cdc6aba64dc0 100644
--- a/devel/libcwd/Makefile
+++ b/devel/libcwd/Makefile
@@ -11,7 +11,7 @@ PORTVERSION=	0.99.47
 CATEGORIES=	devel
 MASTER_SITES=	SF
 
-MAINTAINER=	thomas@goodking.ca
+MAINTAINER=	tabthorpe@FreeBSD.org
 COMMENT=	The C++ Debugging Support Library
 
 USE_AUTOTOOLS=	libtool:15
diff --git a/devel/pear-Console_Getargs/Makefile b/devel/pear-Console_Getargs/Makefile
index 4107fa5481e7..d3a287d748f6 100644
--- a/devel/pear-Console_Getargs/Makefile
+++ b/devel/pear-Console_Getargs/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Console_Getargs
 PORTVERSION=	1.3.4
 CATEGORIES=	devel www pear
 
-MAINTAINER=	thomas@goodking.ca
+MAINTAINER=	tabthorpe@FreeBSD.org
 COMMENT=	PEAR command-line arguments parser
 
 BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
diff --git a/devel/pear-Date/Makefile b/devel/pear-Date/Makefile
index 6702a476d041..84a45f06cc6a 100644
--- a/devel/pear-Date/Makefile
+++ b/devel/pear-Date/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Date
 PORTVERSION=	1.4.7
 CATEGORIES=	devel www pear
 
-MAINTAINER=	thomas@goodking.ca
+MAINTAINER=	tabthorpe@FreeBSD.org
 COMMENT=	PEAR Date and Time Zone Classes
 
 BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
diff --git a/devel/pear-Date_Holidays/Makefile b/devel/pear-Date_Holidays/Makefile
index 350940f9c501..998fedf76f59 100644
--- a/devel/pear-Date_Holidays/Makefile
+++ b/devel/pear-Date_Holidays/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Date_Holidays
 PORTVERSION=	0.17.1
 CATEGORIES=	devel www pear
 
-MAINTAINER=	thomas@goodking.ca
+MAINTAINER=	tabthorpe@FreeBSD.org
 COMMENT=	PEAR driver based class to calculate holidays
 
 BUILD_DEPENDS=	${PEARDIR}/Date.php:${PORTSDIR}/devel/pear-Date \
diff --git a/devel/pear-XML_Parser/Makefile b/devel/pear-XML_Parser/Makefile
index 6e79b67ab68a..3cbb0144ebe1 100644
--- a/devel/pear-XML_Parser/Makefile
+++ b/devel/pear-XML_Parser/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	XML_Parser
 PORTVERSION=	1.2.8
 CATEGORIES=	devel pear
 
-MAINTAINER=	thomas@goodking.ca
+MAINTAINER=	tabthorpe@FreeBSD.org
 COMMENT=	PEAR XML parsing class based on PHP's bundled expat
 
 BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
diff --git a/devel/pear-XML_Serializer/Makefile b/devel/pear-XML_Serializer/Makefile
index 36dab7a97581..38f8ccafbc84 100644
--- a/devel/pear-XML_Serializer/Makefile
+++ b/devel/pear-XML_Serializer/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	XML_Serializer
 PORTVERSION=	0.18.0
 CATEGORIES=	devel www pear
 
-MAINTAINER=	thomas@goodking.ca
+MAINTAINER=	tabthorpe@FreeBSD.org
 COMMENT=	PEAR Swiss-army knive for reading and writing XML files
 
 BUILD_DEPENDS=	${PEARDIR}/XML/Parser.php:${PORTSDIR}/devel/pear-XML_Parser \
diff --git a/devel/pear-XML_Util/Makefile b/devel/pear-XML_Util/Makefile
index f87e3f12e12f..55dff4b0acf2 100644
--- a/devel/pear-XML_Util/Makefile
+++ b/devel/pear-XML_Util/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	XML_Util
 PORTVERSION=	1.1.4
 CATEGORIES=	devel www pear
 
-MAINTAINER=	thomas@goodking.ca
+MAINTAINER=	tabthorpe@FreeBSD.org
 COMMENT=	PEAR XML utility class
 
 BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
diff --git a/devel/pharmacy/Makefile b/devel/pharmacy/Makefile
index 33f67c070096..5b87ac6f78f1 100644
--- a/devel/pharmacy/Makefile
+++ b/devel/pharmacy/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	0.3
 CATEGORIES=	devel gnome
 MASTER_SITES=	SF
 
-MAINTAINER=	thomas@goodking.ca
+MAINTAINER=	tabthorpe@FreeBSD.org
 COMMENT=	GNOME frontend for CVS
 
 USE_X_PREFIX=	yes
diff --git a/devel/strace/Makefile b/devel/strace/Makefile
index c6300cad4957..05629ce3fa3e 100644
--- a/devel/strace/Makefile
+++ b/devel/strace/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	4.5.5
 CATEGORIES=	devel sysutils
 MASTER_SITES=	SF
 
-MAINTAINER=	thomas@goodking.ca
+MAINTAINER=	tabthorpe@FreeBSD.org
 COMMENT=	A portable process tracer
 
 USE_BZIP2=	yes
diff --git a/ftp/jftp/Makefile b/ftp/jftp/Makefile
index 1f409729df7f..a1f68edb316e 100644
--- a/ftp/jftp/Makefile
+++ b/ftp/jftp/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	j-ftp
 DISTNAME=	j-ftp-${PORTVERSION}
 
-MAINTAINER=	thomas@goodking.ca
+MAINTAINER=	tabthorpe@FreeBSD.org
 COMMENT=	Java Network Browser
 
 RUN_DEPENDS=	java:${PORTSDIR}/java/javavmwrapper
diff --git a/german/citrix_ica/Makefile b/german/citrix_ica/Makefile
index c5ac65ca0f36..8b4d2fe90f58 100644
--- a/german/citrix_ica/Makefile
+++ b/german/citrix_ica/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	german net comms linux
 MASTER_SITES=
 DISTNAME=	${PORTNAME}-linuxx86-de-${PORTVERSION}
 
-MAINTAINER=	thomas@goodking.ca
+MAINTAINER=	tabthorpe@FreeBSD.org
 COMMENT=	Citrix(R) Presentation Server(TM) client
 
 RUN_DEPENDS=	${LINUXBASE}/usr/X11R6/lib/libXm.so.3:${PORTSDIR}/x11-toolkits/linux-openmotif
diff --git a/german/citrix_xenapp/Makefile b/german/citrix_xenapp/Makefile
index c5ac65ca0f36..8b4d2fe90f58 100644
--- a/german/citrix_xenapp/Makefile
+++ b/german/citrix_xenapp/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	german net comms linux
 MASTER_SITES=
 DISTNAME=	${PORTNAME}-linuxx86-de-${PORTVERSION}
 
-MAINTAINER=	thomas@goodking.ca
+MAINTAINER=	tabthorpe@FreeBSD.org
 COMMENT=	Citrix(R) Presentation Server(TM) client
 
 RUN_DEPENDS=	${LINUXBASE}/usr/X11R6/lib/libXm.so.3:${PORTSDIR}/x11-toolkits/linux-openmotif
diff --git a/japanese/citrix_ica/Makefile b/japanese/citrix_ica/Makefile
index 61ceed4c6182..bbb731bdbaae 100644
--- a/japanese/citrix_ica/Makefile
+++ b/japanese/citrix_ica/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	japanese net comms linux
 MASTER_SITES=
 DISTNAME=	${PORTNAME}-linuxx86-ja-${PORTVERSION}
 
-MAINTAINER=	thomas@goodking.ca
+MAINTAINER=	tabthorpe@FreeBSD.org
 COMMENT=	Citrix(R) Presentation Server(TM) client
 
 RUN_DEPENDS=	${LINUXBASE}/usr/X11R6/lib/libXm.so.3:${PORTSDIR}/x11-toolkits/linux-openmotif
diff --git a/japanese/citrix_xenapp/Makefile b/japanese/citrix_xenapp/Makefile
index 61ceed4c6182..bbb731bdbaae 100644
--- a/japanese/citrix_xenapp/Makefile
+++ b/japanese/citrix_xenapp/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	japanese net comms linux
 MASTER_SITES=
 DISTNAME=	${PORTNAME}-linuxx86-ja-${PORTVERSION}
 
-MAINTAINER=	thomas@goodking.ca
+MAINTAINER=	tabthorpe@FreeBSD.org
 COMMENT=	Citrix(R) Presentation Server(TM) client
 
 RUN_DEPENDS=	${LINUXBASE}/usr/X11R6/lib/libXm.so.3:${PORTSDIR}/x11-toolkits/linux-openmotif
diff --git a/mail/spamass-milter/Makefile b/mail/spamass-milter/Makefile
index b3cffdd8bf91..2ba2b906cfb7 100644
--- a/mail/spamass-milter/Makefile
+++ b/mail/spamass-milter/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	spamass-milt
 
-MAINTAINER=	thomas@goodking.ca
+MAINTAINER=	tabthorpe@FreeBSD.org
 COMMENT=	Sendmail Milter (mail filter) plugin for SpamAssassin
 
 BUILD_DEPENDS=	spamc:${PORTSDIR}/mail/p5-Mail-SpamAssassin
diff --git a/mail/squirrelmail-change_ldappass-plugin/Makefile b/mail/squirrelmail-change_ldappass-plugin/Makefile
index 29cf7d885961..0d3e0b8cd744 100644
--- a/mail/squirrelmail-change_ldappass-plugin/Makefile
+++ b/mail/squirrelmail-change_ldappass-plugin/Makefile
@@ -13,7 +13,7 @@ PKGNAMESUFFIX=	-plugin
 DISTNAME=	${PORTNAME}-${PORTVERSION}-1.4.0
 DIST_SUBDIR=	squirrelmail
 
-MAINTAINER=	thomas@goodking.ca
+MAINTAINER=	tabthorpe@FreeBSD.org
 COMMENT=	Allows users to change their passwords stored in LDAP Tree
 
 RUN_DEPENDS=	${SQUIRRELDIR}/index.php:${PORTSDIR}/mail/squirrelmail
diff --git a/mail/squirrelmail-compatibility-plugin/Makefile b/mail/squirrelmail-compatibility-plugin/Makefile
index 0c30915ca3de..bbb1929fa2fa 100644
--- a/mail/squirrelmail-compatibility-plugin/Makefile
+++ b/mail/squirrelmail-compatibility-plugin/Makefile
@@ -13,7 +13,7 @@ PKGNAMESUFFIX=	-plugin
 DISTNAME=	${PORTNAME}-${PORTVERSION}-1.0
 DIST_SUBDIR=	squirrelmail
 
-MAINTAINER=	thomas@goodking.ca
+MAINTAINER=	tabthorpe@FreeBSD.org
 COMMENT=	Required by many plugins for compatibility with SquirrelMail
 
 RUN_DEPENDS=	squirrelmail>=1.4.10:${PORTSDIR}/mail/squirrelmail
diff --git a/mail/squirrelmail-compatibility-plugin1/Makefile b/mail/squirrelmail-compatibility-plugin1/Makefile
index 8b134127f4bf..01a1d07b056f 100644
--- a/mail/squirrelmail-compatibility-plugin1/Makefile
+++ b/mail/squirrelmail-compatibility-plugin1/Makefile
@@ -13,7 +13,7 @@ PKGNAMEPREFIX=	squirrelmail-
 PKGNAMESUFFIX=	-plugin
 DIST_SUBDIR=	squirrelmail
 
-MAINTAINER=	thomas@goodking.ca
+MAINTAINER=	tabthorpe@FreeBSD.org
 COMMENT=	Required by many plugins for compatibility with SquirrelMail
 
 RUN_DEPENDS=	${SQUIRRELDIR}/index.php:${PORTSDIR}/mail/squirrelmail
diff --git a/mail/squirrelmail-newuser_wiz-plugin/Makefile b/mail/squirrelmail-newuser_wiz-plugin/Makefile
index 4469f81fabd2..6a3c10db962a 100644
--- a/mail/squirrelmail-newuser_wiz-plugin/Makefile
+++ b/mail/squirrelmail-newuser_wiz-plugin/Makefile
@@ -15,7 +15,7 @@ PKGNAMESUFFIX=	-plugin
 DISTNAME=	${PORTNAME}-${PORTVERSION}
 DIST_SUBDIR=	squirrelmail
 
-MAINTAINER=	thomas@goodking.ca
+MAINTAINER=	tabthorpe@FreeBSD.org
 COMMENT=	Force user to enter Full name and Email address at initial logon
 
 RUN_DEPENDS=	${SQUIRRELDIR}/index.php:${PORTSDIR}/mail/squirrelmail \
diff --git a/mail/squirrelmail-pupdate-plugin/Makefile b/mail/squirrelmail-pupdate-plugin/Makefile
index 14c53f150829..597344f9bec7 100644
--- a/mail/squirrelmail-pupdate-plugin/Makefile
+++ b/mail/squirrelmail-pupdate-plugin/Makefile
@@ -15,7 +15,7 @@ PKGNAMESUFFIX=	-plugin
 DISTNAME=	${PORTNAME}.${PORTVERSION}-1.4.2
 DIST_SUBDIR=	squirrelmail
 
-MAINTAINER=	thomas@goodking.ca
+MAINTAINER=	tabthorpe@FreeBSD.org
 COMMENT=	Checks for plugin updates by parsing the SM site
 
 RUN_DEPENDS=	${SQUIRRELDIR}/index.php:${PORTSDIR}/mail/squirrelmail
diff --git a/mail/squirrelmail-secure_login-plugin/Makefile b/mail/squirrelmail-secure_login-plugin/Makefile
index 50665f011338..7ce46918e1f9 100644
--- a/mail/squirrelmail-secure_login-plugin/Makefile
+++ b/mail/squirrelmail-secure_login-plugin/Makefile
@@ -14,7 +14,7 @@ PKGNAMESUFFIX=	-plugin
 DISTNAME=	${PORTNAME}-${PORTVERSION}-1.2.8
 DIST_SUBDIR=	squirrelmail
 
-MAINTAINER=	thomas@goodking.ca
+MAINTAINER=	tabthorpe@FreeBSD.org
 COMMENT=	This plugin will automatically turn on SSL security during login
 
 RUN_DEPENDS=	${SQUIRRELDIR}/index.php:${PORTSDIR}/mail/squirrelmail
diff --git a/mail/squirrelmail-timeout_user-plugin/Makefile b/mail/squirrelmail-timeout_user-plugin/Makefile
index 5d80fb3a247f..249ea9380c9a 100644
--- a/mail/squirrelmail-timeout_user-plugin/Makefile
+++ b/mail/squirrelmail-timeout_user-plugin/Makefile
@@ -15,7 +15,7 @@ PKGNAMESUFFIX=	-plugin
 DISTNAME=	${PORTNAME}-${PORTVERSION}-0.5
 DIST_SUBDIR=	squirrelmail
 
-MAINTAINER=	thomas@goodking.ca
+MAINTAINER=	tabthorpe@FreeBSD.org
 COMMENT=	Automatically logs a user out if they're idle for a set amount of time
 
 RUN_DEPENDS=	${SQUIRRELDIR}/index.php:${PORTSDIR}/mail/squirrelmail \
diff --git a/misc/bibletime-devel/Makefile b/misc/bibletime-devel/Makefile
index 478391d684c4..14a54fecb75c 100644
--- a/misc/bibletime-devel/Makefile
+++ b/misc/bibletime-devel/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	thomas@goodking.ca
+MAINTAINER=	tabthorpe@FreeBSD.org
 COMMENT=	A powerful Bible study application for KDE3
 
 RUN_DEPENDS=	${LOCALBASE}/lib/libsword.so:${PORTSDIR}/misc/sword \
diff --git a/misc/bibletime-kde3/Makefile b/misc/bibletime-kde3/Makefile
index 478391d684c4..14a54fecb75c 100644
--- a/misc/bibletime-kde3/Makefile
+++ b/misc/bibletime-kde3/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	thomas@goodking.ca
+MAINTAINER=	tabthorpe@FreeBSD.org
 COMMENT=	A powerful Bible study application for KDE3
 
 RUN_DEPENDS=	${LOCALBASE}/lib/libsword.so:${PORTSDIR}/misc/sword \
diff --git a/misc/bibletime-kde4/Makefile b/misc/bibletime-kde4/Makefile
index 478391d684c4..14a54fecb75c 100644
--- a/misc/bibletime-kde4/Makefile
+++ b/misc/bibletime-kde4/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	thomas@goodking.ca
+MAINTAINER=	tabthorpe@FreeBSD.org
 COMMENT=	A powerful Bible study application for KDE3
 
 RUN_DEPENDS=	${LOCALBASE}/lib/libsword.so:${PORTSDIR}/misc/sword \
diff --git a/misc/bibletime/Makefile b/misc/bibletime/Makefile
index 478391d684c4..14a54fecb75c 100644
--- a/misc/bibletime/Makefile
+++ b/misc/bibletime/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	thomas@goodking.ca
+MAINTAINER=	tabthorpe@FreeBSD.org
 COMMENT=	A powerful Bible study application for KDE3
 
 RUN_DEPENDS=	${LOCALBASE}/lib/libsword.so:${PORTSDIR}/misc/sword \
diff --git a/misc/colortail/Makefile b/misc/colortail/Makefile
index 437e694b9299..25afb66876cf 100644
--- a/misc/colortail/Makefile
+++ b/misc/colortail/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://joakimandersson.se/files/ \
 		${MASTER_SITE_GENTOO}
 MASTER_SITE_SUBDIR=	distfiles
 
-MAINTAINER=	thomas@goodking.ca
+MAINTAINER=	tabthorpe@FreeBSD.org
 COMMENT=	A colour-able replacement for tail(1)
 
 USE_GETOPT_LONG=	yes
diff --git a/misc/gnomesword/Makefile b/misc/gnomesword/Makefile
index 4cb310c255c7..a478378f50f0 100644
--- a/misc/gnomesword/Makefile
+++ b/misc/gnomesword/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	misc gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	thomas@goodking.ca
+MAINTAINER=	tabthorpe@FreeBSD.org
 COMMENT=	A bible interface utilizing the sword framework
 
 RUN_DEPENDS=	${LOCALBASE}/lib/gnome-spell/libgnome-spell-component-0.3.so:${PORTSDIR}/textproc/gnome-spell \
diff --git a/misc/iso-codes/Makefile b/misc/iso-codes/Makefile
index 21ef19d55dfd..65e655588a0e 100644
--- a/misc/iso-codes/Makefile
+++ b/misc/iso-codes/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	misc
 MASTER_SITES=	ftp://pkg-isocodes.alioth.debian.org/pub/pkg-isocodes/ \
 		http://freebsd.powered.net/distfiles/
 
-MAINTAINER=	thomas@goodking.ca
+MAINTAINER=	tabthorpe@FreeBSD.org
 COMMENT=	Lists of the country, language and currency iso names
 
 BUILD_DEPENDS=	xmlproc_parse:${PORTSDIR}/textproc/py-xml
diff --git a/misc/kcd-devel/Makefile b/misc/kcd-devel/Makefile
index 4343c568fa8f..98cc400390aa 100644
--- a/misc/kcd-devel/Makefile
+++ b/misc/kcd-devel/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	kcd
 DISTNAME=	kcd-${PORTVERSION}
 
-MAINTAINER=	thomas@goodking.ca
+MAINTAINER=	tabthorpe@FreeBSD.org
 COMMENT=	Change directory in full-screen visual mode
 
 USE_GETTEXT=	yes
diff --git a/misc/kcd/Makefile b/misc/kcd/Makefile
index 9ee556200946..2a803acb3421 100644
--- a/misc/kcd/Makefile
+++ b/misc/kcd/Makefile
@@ -11,7 +11,7 @@ PORTEPOCH=	1
 CATEGORIES=	misc
 MASTER_SITES=	SF
 
-MAINTAINER=	thomas@goodking.ca
+MAINTAINER=	tabthorpe@FreeBSD.org
 COMMENT=	Change directory in full-screen visual mode
 
 USE_GETTEXT=	yes
diff --git a/misc/since/Makefile b/misc/since/Makefile
index ab93377082ff..a29343049323 100644
--- a/misc/since/Makefile
+++ b/misc/since/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	misc
 MASTER_SITES=	http://fresh.t-systems-sfr.com/linux/src/ \
 		http://www.goodking.ca/pub/files/
 
-MAINTAINER=	thomas@goodking.ca
+MAINTAINER=	tabthorpe@FreeBSD.org
 COMMENT=	View the end of a file like tail(1), but save state between sessions
 
 MAN1=		since.1
diff --git a/misc/sword/Makefile b/misc/sword/Makefile
index 56259faed6ea..5445ed44521c 100644
--- a/misc/sword/Makefile
+++ b/misc/sword/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	ftp://ftp.crosswire.org/pub/sword/source/v1.5/ \
 		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	bibletime
 
-MAINTAINER=	thomas@goodking.ca
+MAINTAINER=	tabthorpe@FreeBSD.org
 COMMENT=	A project framework for manipulating Bible texts
 
 USE_GNOME=	pkgconfig
diff --git a/misc/sword15/Makefile b/misc/sword15/Makefile
index 56259faed6ea..5445ed44521c 100644
--- a/misc/sword15/Makefile
+++ b/misc/sword15/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	ftp://ftp.crosswire.org/pub/sword/source/v1.5/ \
 		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	bibletime
 
-MAINTAINER=	thomas@goodking.ca
+MAINTAINER=	tabthorpe@FreeBSD.org
 COMMENT=	A project framework for manipulating Bible texts
 
 USE_GNOME=	pkgconfig
diff --git a/misc/xiphos/Makefile b/misc/xiphos/Makefile
index 4cb310c255c7..a478378f50f0 100644
--- a/misc/xiphos/Makefile
+++ b/misc/xiphos/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	misc gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	thomas@goodking.ca
+MAINTAINER=	tabthorpe@FreeBSD.org
 COMMENT=	A bible interface utilizing the sword framework
 
 RUN_DEPENDS=	${LOCALBASE}/lib/gnome-spell/libgnome-spell-component-0.3.so:${PORTSDIR}/textproc/gnome-spell \
diff --git a/net-mgmt/arpwatch/Makefile b/net-mgmt/arpwatch/Makefile
index 845b2a26ca52..277fe18eddac 100644
--- a/net-mgmt/arpwatch/Makefile
+++ b/net-mgmt/arpwatch/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	ftp://ftp.ee.lbl.gov/ \
 MASTER_SITE_SUBDIR=	distfiles
 DISTNAME=	${PORTNAME}-${PORTVERSION:C/\.([^\.]*)$/\1/}
 
-MAINTAINER=	thomas@goodking.ca
+MAINTAINER=	tabthorpe@FreeBSD.org
 COMMENT=	Monitor arp & rarp requests
 
 GNU_CONFIGURE=	yes
diff --git a/net-mgmt/nbtscan/Makefile b/net-mgmt/nbtscan/Makefile
index fb422eade05b..268bc4f8d43a 100644
--- a/net-mgmt/nbtscan/Makefile
+++ b/net-mgmt/nbtscan/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	http://www.inetcat.net/software/ \
 		${MASTER_SITE_GENTOO}
 MASTER_SITE_SUBDIR=	distfiles
 
-MAINTAINER=	thomas@goodking.ca
+MAINTAINER=	tabthorpe@FreeBSD.org
 COMMENT=	NetBIOS name network scanner
 
 GNU_CONFIGURE=	yes
diff --git a/net-mgmt/p5-Net-CIDR/Makefile b/net-mgmt/p5-Net-CIDR/Makefile
index 41b4c4bfcc32..83bcdd4e06cc 100644
--- a/net-mgmt/p5-Net-CIDR/Makefile
+++ b/net-mgmt/p5-Net-CIDR/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Net
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	thomas@goodking.ca
+MAINTAINER=	tabthorpe@FreeBSD.org
 COMMENT=	Perl module to manipulate IPv4/IPv6 netblocks in CIDR notation
 
 PERL_CONFIGURE=	yes
diff --git a/net/citrix_ica/Makefile b/net/citrix_ica/Makefile
index 20c2fcd9bf28..0c28b4b58363 100644
--- a/net/citrix_ica/Makefile
+++ b/net/citrix_ica/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	net comms linux
 MASTER_SITES=
 DISTNAME=	${PORTNAME}-linuxx86-${PORTVERSION}
 
-MAINTAINER=	thomas@goodking.ca
+MAINTAINER=	tabthorpe@FreeBSD.org
 COMMENT=	Citrix(R) Presentation Server(TM) client
 
 RUN_DEPENDS=	${LINUXBASE}/usr/X11R6/lib/libXm.so.3:${PORTSDIR}/x11-toolkits/linux-openmotif
diff --git a/net/citrix_xenapp/Makefile b/net/citrix_xenapp/Makefile
index 20c2fcd9bf28..0c28b4b58363 100644
--- a/net/citrix_xenapp/Makefile
+++ b/net/citrix_xenapp/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	net comms linux
 MASTER_SITES=
 DISTNAME=	${PORTNAME}-linuxx86-${PORTVERSION}
 
-MAINTAINER=	thomas@goodking.ca
+MAINTAINER=	tabthorpe@FreeBSD.org
 COMMENT=	Citrix(R) Presentation Server(TM) client
 
 RUN_DEPENDS=	${LINUXBASE}/usr/X11R6/lib/libXm.so.3:${PORTSDIR}/x11-toolkits/linux-openmotif
diff --git a/security/p5-Digest-MD5/Makefile b/security/p5-Digest-MD5/Makefile
index 95b625343b0c..9c0c30c8b390 100644
--- a/security/p5-Digest-MD5/Makefile
+++ b/security/p5-Digest-MD5/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Digest
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	thomas@goodking.ca
+MAINTAINER=	tabthorpe@FreeBSD.org
 COMMENT=	Perl5 interface to the MD5 algorithm
 
 BUILD_DEPENDS=	${SITE_PERL}/Digest.pm:${PORTSDIR}/security/p5-Digest
diff --git a/security/p5-MD5/Makefile b/security/p5-MD5/Makefile
index 4ed912d0ec5b..02b7a5ceb987 100644
--- a/security/p5-MD5/Makefile
+++ b/security/p5-MD5/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	MD5/GAAS
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	thomas@goodking.ca
+MAINTAINER=	tabthorpe@FreeBSD.org
 COMMENT=	Perl5 interface to MD5 Message-Digest Algorithm
 
 PERL_CONFIGURE=	yes
diff --git a/security/pear-Crypt_Blowfish/Makefile b/security/pear-Crypt_Blowfish/Makefile
index 37ae2bc0bb76..75a403527f93 100644
--- a/security/pear-Crypt_Blowfish/Makefile
+++ b/security/pear-Crypt_Blowfish/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	1.1.0.r1
 CATEGORIES=	security www pear
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/RC/}
 
-MAINTAINER=	thomas@goodking.ca
+MAINTAINER=	tabthorpe@FreeBSD.org
 COMMENT=	PEAR class for blowfish encryption
 
 BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
diff --git a/security/pear-Crypt_CBC/Makefile b/security/pear-Crypt_CBC/Makefile
index c112f3622cac..34536c005df0 100644
--- a/security/pear-Crypt_CBC/Makefile
+++ b/security/pear-Crypt_CBC/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	0.4
 PORTREVISION=	3
 CATEGORIES=	security www pear
 
-MAINTAINER=	thomas@goodking.ca
+MAINTAINER=	tabthorpe@FreeBSD.org
 COMMENT=	PEAR class to emulate Perl's Crypt::CBC module
 
 BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
diff --git a/security/pear-Crypt_CHAP/Makefile b/security/pear-Crypt_CHAP/Makefile
index a695f47f3c4b..1213e631aa17 100644
--- a/security/pear-Crypt_CHAP/Makefile
+++ b/security/pear-Crypt_CHAP/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Crypt_CHAP
 PORTVERSION=	1.0.1
 CATEGORIES=	security www pear
 
-MAINTAINER=	thomas@goodking.ca
+MAINTAINER=	tabthorpe@FreeBSD.org
 COMMENT=	PEAR class for generating CHAP packets
 
 BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
diff --git a/security/pear-Crypt_HMAC/Makefile b/security/pear-Crypt_HMAC/Makefile
index 5d809c60e8d2..d3c0a9f23463 100644
--- a/security/pear-Crypt_HMAC/Makefile
+++ b/security/pear-Crypt_HMAC/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Crypt_HMAC
 PORTVERSION=	1.0.1
 CATEGORIES=	security www pear
 
-MAINTAINER=	thomas@goodking.ca
+MAINTAINER=	tabthorpe@FreeBSD.org
 COMMENT=	PEAR class to calculate RFC 2104 compliant hashes
 
 BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
diff --git a/security/pear-Crypt_RC4/Makefile b/security/pear-Crypt_RC4/Makefile
index d63a6ecd8059..161c3b8dec57 100644
--- a/security/pear-Crypt_RC4/Makefile
+++ b/security/pear-Crypt_RC4/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Crypt_RC4
 PORTVERSION=	1.0.2
 CATEGORIES=	security www pear
 
-MAINTAINER=	thomas@goodking.ca
+MAINTAINER=	tabthorpe@FreeBSD.org
 COMMENT=	PEAR encryption class for RC4 encryption
 
 BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
diff --git a/security/pear-Crypt_RSA/Makefile b/security/pear-Crypt_RSA/Makefile
index 0bb59a1f36fb..2aaf82c92597 100644
--- a/security/pear-Crypt_RSA/Makefile
+++ b/security/pear-Crypt_RSA/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Crypt_RSA
 PORTVERSION=	1.0.0
 CATEGORIES=	security www pear
 
-MAINTAINER=	thomas@goodking.ca
+MAINTAINER=	tabthorpe@FreeBSD.org
 COMMENT=	PEAR class allows you to use two-key strong cryptography
 
 BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
diff --git a/shells/rssh/Makefile b/shells/rssh/Makefile
index 84cb4a7df2a2..58bedd9c1783 100644
--- a/shells/rssh/Makefile
+++ b/shells/rssh/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	shells security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	thomas@goodking.ca
+MAINTAINER=	tabthorpe@FreeBSD.org
 COMMENT=	A Restricted Secure SHell only for sftp or/and scp
 
 GNU_CONFIGURE=	yes
diff --git a/sysutils/pear-Log/Makefile b/sysutils/pear-Log/Makefile
index 9133f849b58b..1d3f77c0189e 100644
--- a/sysutils/pear-Log/Makefile
+++ b/sysutils/pear-Log/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	1.9.11
 PORTREVISION=	1
 CATEGORIES=	sysutils www pear
 
-MAINTAINER=	thomas@goodking.ca
+MAINTAINER=	tabthorpe@FreeBSD.org
 COMMENT=	PEAR logging utilities
 
 BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
diff --git a/sysutils/tree/Makefile b/sysutils/tree/Makefile
index 09b8d6eee2a4..45ae14f7a3af 100644
--- a/sysutils/tree/Makefile
+++ b/sysutils/tree/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	sysutils
 MASTER_SITES=	ftp://mama.indstate.edu/linux/tree/ CENKES
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	thomas@goodking.ca
+MAINTAINER=	tabthorpe@FreeBSD.org
 COMMENT=	Display a tree-view of directories with optional color or HTML output
 
 MAKE_ENV+=	MKDIR="${MKDIR}"
diff --git a/sysutils/virtualmin/Makefile b/sysutils/virtualmin/Makefile
index dcb73e3dd6ae..d7063a97ca02 100644
--- a/sysutils/virtualmin/Makefile
+++ b/sysutils/virtualmin/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	http://download.webmin.com/download/virtualmin/
 DISTNAME=	virtual-server-${PORTVERSION}.gpl
 EXTRACT_SUFX=	.wbm.gz
 
-MAINTAINER=	thomas@goodking.ca
+MAINTAINER=	tabthorpe@FreeBSD.org
 COMMENT=	A virtual hosting management system based on webmin
 
 RUN_DEPENDS=	${LOCALBASE}/lib/webmin/webmin-init:${PORTSDIR}/sysutils/webmin
diff --git a/textproc/pear-Numbers_Roman/Makefile b/textproc/pear-Numbers_Roman/Makefile
index be13a130aa5d..ee1d1dfd9abd 100644
--- a/textproc/pear-Numbers_Roman/Makefile
+++ b/textproc/pear-Numbers_Roman/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Numbers_Roman
 PORTVERSION=	0.2.0
 CATEGORIES=	textproc devel pear
 
-MAINTAINER=	thomas@goodking.ca
+MAINTAINER=	tabthorpe@FreeBSD.org
 COMMENT=	PEAR methods for converting to and from Roman Numerals
 
 BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
diff --git a/www/pear-HTTP/Makefile b/www/pear-HTTP/Makefile
index 54d50c71705d..97033261f6c4 100644
--- a/www/pear-HTTP/Makefile
+++ b/www/pear-HTTP/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	HTTP
 PORTVERSION=	1.4.0
 CATEGORIES=	www devel pear
 
-MAINTAINER=	thomas@goodking.ca
+MAINTAINER=	tabthorpe@FreeBSD.org
 COMMENT=	PEAR miscellaneous HTTP utilities
 
 BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
diff --git a/www/pear-HTTP_Header/Makefile b/www/pear-HTTP_Header/Makefile
index cc627bab65e2..8c7c4510ef9c 100644
--- a/www/pear-HTTP_Header/Makefile
+++ b/www/pear-HTTP_Header/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	HTTP_Header
 PORTVERSION=	1.2.0
 CATEGORIES=	www devel pear
 
-MAINTAINER=	thomas@goodking.ca
+MAINTAINER=	tabthorpe@FreeBSD.org
 COMMENT=	PEAR OO interface to modify and handle HTTP headers and status codes
 
 BUILD_DEPENDS=	${PEARDIR}/HTTP.php:${PORTSDIR}/www/pear-HTTP
diff --git a/x11-wm/sapphire/Makefile b/x11-wm/sapphire/Makefile
index 9289f6754c66..c2d31008688f 100644
--- a/x11-wm/sapphire/Makefile
+++ b/x11-wm/sapphire/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	0.15.7
 CATEGORIES=	x11-wm
 MASTER_SITES=	SF
 
-MAINTAINER=	thomas@goodking.ca
+MAINTAINER=	tabthorpe@FreeBSD.org
 COMMENT=	Small window manager
 
 USE_GMAKE=	yes