Update my email address to my @FreeBSD.org address.

Approved by:	garga (mentor)

29 files changed, 45 insertions, 45 deletions

diff --git a/devel/compiz-bcop/Makefile b/devel/compiz-bcop/Makefile
index 42980346d3db..656b9b37f1b4 100644
--- a/devel/compiz-bcop/Makefile
+++ b/devel/compiz-bcop/Makefile
@@ -1,6 +1,6 @@
 # New ports collection makefile for:	compiz-bcop
 # Date created:				2007-08-15
-# Whom:					Robert Noland <rnoland@2hip.net>
+# Whom:					Robert Noland <rnoland@FreeBSD.org>
 #
 # $FreeBSD$
 #
@@ -12,7 +12,7 @@ PORTREVISION=	1
 CATEGORIES=	devel x11-wm
 MASTER_SITES=	http://releases.compiz-fusion.org/${PORTVERSION}/
 
-MAINTAINER=	rnoland@2hip.net
+MAINTAINER=	rnoland@FreeBSD.org
 COMMENT=	Code generator for Compiz Fusion Plugins
 
 # This annoys me...
diff --git a/multimedia/libdvdread/Makefile b/multimedia/libdvdread/Makefile
index 71053c467983..a80216372b37 100644
--- a/multimedia/libdvdread/Makefile
+++ b/multimedia/libdvdread/Makefile
@@ -11,7 +11,7 @@ PORTREVISION=	3
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.dtek.chalmers.se/groups/dvd/dist/
 
-MAINTAINER=	rnoland@2hip.net
+MAINTAINER=	rnoland@FreeBSD.org
 COMMENT=	This is needed by ogle, which is a DVD player that supports DVD menus
 
 .if !defined(PACKAGE_BUILDING)
diff --git a/net-p2p/azureus/Makefile b/net-p2p/azureus/Makefile
index ed04509c90a2..5df070f83acd 100644
--- a/net-p2p/azureus/Makefile
+++ b/net-p2p/azureus/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	net-p2p java
 MASTER_SITES=	SF
 DISTNAME=	Vuze_${PORTVERSION}_source
 
-MAINTAINER=	rnoland@2hip.net
+MAINTAINER=	rnoland@FreeBSD.org
 COMMENT=	A BitTorrent client written in Java
 
 BUILD_DEPENDS=	${JAVALIBDIR}/log4j.jar:${PORTSDIR}/devel/log4j \
diff --git a/net-p2p/vuze/Makefile b/net-p2p/vuze/Makefile
index ed04509c90a2..5df070f83acd 100644
--- a/net-p2p/vuze/Makefile
+++ b/net-p2p/vuze/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	net-p2p java
 MASTER_SITES=	SF
 DISTNAME=	Vuze_${PORTVERSION}_source
 
-MAINTAINER=	rnoland@2hip.net
+MAINTAINER=	rnoland@FreeBSD.org
 COMMENT=	A BitTorrent client written in Java
 
 BUILD_DEPENDS=	${JAVALIBDIR}/log4j.jar:${PORTSDIR}/devel/log4j \
diff --git a/ports-mgmt/portmanager/Makefile b/ports-mgmt/portmanager/Makefile
index 1398bdaca77b..79026604b1d2 100644
--- a/ports-mgmt/portmanager/Makefile
+++ b/ports-mgmt/portmanager/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	ports-mgmt
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	portmanager
 
-MAINTAINER=	rnoland@2hip.net
+MAINTAINER=	rnoland@FreeBSD.org
 COMMENT=	FreeBSD installed ports status and safe update utility
 
 MAN1=		portmanager.1
diff --git a/x11-themes/emerald-themes/Makefile b/x11-themes/emerald-themes/Makefile
index 87a607bbcf9f..a773c7fe761d 100644
--- a/x11-themes/emerald-themes/Makefile
+++ b/x11-themes/emerald-themes/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	0.5.2
 CATEGORIES=	x11-themes
 MASTER_SITES=	http://releases.compiz-fusion.org/${PORTVERSION}/
 
-MAINTAINER=	rnoland@2hip.net
+MAINTAINER=	rnoland@FreeBSD.org
 COMMENT=	Themes for the Emerald Window Decorator
 
 BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
diff --git a/x11-toolkits/swt-devel/Makefile b/x11-toolkits/swt-devel/Makefile
index 540d67cedde8..a3ae4cff6b0b 100644
--- a/x11-toolkits/swt-devel/Makefile
+++ b/x11-toolkits/swt-devel/Makefile
@@ -1,6 +1,6 @@
 # New ports collection makefile for:	swt-devel
 # Date created:				2006-11-16
-# Whom:					Robert C. Noland III <rnoland@2hip.net>
+# Whom:					Robert C. Noland III <rnoland@FreeBSD.org>
 #
 # $FreeBSD$
 #
@@ -14,7 +14,7 @@ MASTER_SITES=	${MASTER_SITE_ECLIPSE}
 MASTER_SITE_SUBDIR=	R-3.4-200806172000
 DISTNAME=	swt-${DISTVERSION}-${DIST_EXT}
 
-MAINTAINER=	rnoland@2hip.net
+MAINTAINER=	rnoland@FreeBSD.org
 COMMENT=	Standard Widget Toolkit for Java
 
 ONLY_FOR_ARCHS=	i386 amd64
diff --git a/x11-toolkits/swt/Makefile b/x11-toolkits/swt/Makefile
index 80f6b29c6b0d..4f5866834d67 100644
--- a/x11-toolkits/swt/Makefile
+++ b/x11-toolkits/swt/Makefile
@@ -1,6 +1,6 @@
 # New ports collection makefile for:	swt
 # Date created:				2006-11-16
-# Whom:					Robert C. Noland III <rnoland@2hip.net>
+# Whom:					Robert C. Noland III <rnoland@FreeBSD.org>
 #
 # $FreeBSD$
 #
@@ -13,7 +13,7 @@ MASTER_SITES=	${MASTER_SITE_ECLIPSE}
 MASTER_SITE_SUBDIR=	R-${DISTVERSION}-200802211800
 DISTNAME=	swt-${DISTVERSION}-${DIST_EXT}
 
-MAINTAINER=	rnoland@2hip.net
+MAINTAINER=	rnoland@FreeBSD.org
 COMMENT=	Standard Widget Toolkit for Java
 
 ONLY_FOR_ARCHS=	i386 amd64
diff --git a/x11-wm/beryl-core/Makefile b/x11-wm/beryl-core/Makefile
index 06bf200c9157..0c0105dfd1e8 100644
--- a/x11-wm/beryl-core/Makefile
+++ b/x11-wm/beryl-core/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://releases.beryl-project.org/${PORTVERSION}/ \
 		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	flz/beryl/
 
-MAINTAINER=	rnoland@2hip.net
+MAINTAINER=	rnoland@FreeBSD.org
 COMMENT=	Beryl Composite/Window Manager
 
 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
diff --git a/x11-wm/beryl-manager/Makefile b/x11-wm/beryl-manager/Makefile
index d5f51ce1f798..775f12db30ac 100644
--- a/x11-wm/beryl-manager/Makefile
+++ b/x11-wm/beryl-manager/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://releases.beryl-project.org/${PORTVERSION}/ \
 		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	flz/beryl/
 
-MAINTAINER=	rnoland@2hip.net
+MAINTAINER=	rnoland@FreeBSD.org
 COMMENT=	Manager for Beryl Composite/Window Manager
 
 GNU_CONFIGURE=		yes
diff --git a/x11-wm/beryl-plugins-unsupported/Makefile b/x11-wm/beryl-plugins-unsupported/Makefile
index a20285b665dd..60253b6c29b7 100644
--- a/x11-wm/beryl-plugins-unsupported/Makefile
+++ b/x11-wm/beryl-plugins-unsupported/Makefile
@@ -1,6 +1,6 @@
 # New ports collection makefile for:	beryl-plugins-unsupported
 # Date created:		2007-06-08
-# Whom:			Robert Noland <rnoland@2hip.net>
+# Whom:			Robert Noland <rnoland@FreeBSD.org>
 #
 # $FreeBSD$
 #
@@ -11,7 +11,7 @@ PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://releases.beryl-project.org/${PORTVERSION}/
 
-MAINTAINER=	rnoland@2hip.net
+MAINTAINER=	rnoland@FreeBSD.org
 COMMENT=	Additional Plugins for Beryl Composite/Window Manager
 
 # XXX - Might depends on graphics/libsvg-cairo instead.
diff --git a/x11-wm/beryl-plugins/Makefile b/x11-wm/beryl-plugins/Makefile
index 0e89dba47cb3..f8afbc48065c 100644
--- a/x11-wm/beryl-plugins/Makefile
+++ b/x11-wm/beryl-plugins/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://releases.beryl-project.org/${PORTVERSION}/ \
 		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	flz/beryl/
 
-MAINTAINER=	rnoland@2hip.net
+MAINTAINER=	rnoland@FreeBSD.org
 COMMENT=	Plugins for Beryl Composite/Window Manager
 
 # XXX - Might depends on graphics/libsvg-cairo instead.
diff --git a/x11-wm/beryl-settings-bindings/Makefile b/x11-wm/beryl-settings-bindings/Makefile
index 2137d4abb1b4..3b33ec02cebf 100644
--- a/x11-wm/beryl-settings-bindings/Makefile
+++ b/x11-wm/beryl-settings-bindings/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://releases.beryl-project.org/${PORTVERSION}/ \
 		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	flz/beryl/
 
-MAINTAINER=	rnoland@2hip.net
+MAINTAINER=	rnoland@FreeBSD.org
 COMMENT=	Beryl Settings Bindings
 
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/berylsettings.pc:${PORTSDIR}/x11-wm/beryl-core \
diff --git a/x11-wm/beryl-settings/Makefile b/x11-wm/beryl-settings/Makefile
index 899cd973465d..6bd71dfe1583 100644
--- a/x11-wm/beryl-settings/Makefile
+++ b/x11-wm/beryl-settings/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://releases.beryl-project.org/${PORTVERSION}/ \
 		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	flz/beryl/
 
-MAINTAINER=	rnoland@2hip.net
+MAINTAINER=	rnoland@FreeBSD.org
 COMMENT=	Beryl Settings Manager
 
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/beryl.pc:${PORTSDIR}/x11-wm/beryl-core \
diff --git a/x11-wm/beryl/Makefile b/x11-wm/beryl/Makefile
index 1be122ddb51c..d82d0779463c 100644
--- a/x11-wm/beryl/Makefile
+++ b/x11-wm/beryl/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	# none
 DISTFILES=	# none
 EXTRACT_ONLY=	# none
 
-MAINTAINER=	rnoland@2hip.net
+MAINTAINER=	rnoland@FreeBSD.org
 COMMENT=	Beryl Composite/Window Manager meta-port
 
 NO_BUILD=	yes
diff --git a/x11-wm/ccsm/Makefile b/x11-wm/ccsm/Makefile
index d90e823aa08a..e85ab37309ab 100644
--- a/x11-wm/ccsm/Makefile
+++ b/x11-wm/ccsm/Makefile
@@ -1,6 +1,6 @@
 # New ports collection makefile for:	ccsm
 # Date created:		2007-08-17
-# Whom:			Robert Noland <rnoland@2hip.net>
+# Whom:			Robert Noland <rnoland@FreeBSD.org>
 #
 # $FreeBSD$
 #
@@ -12,7 +12,7 @@ PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://releases.compiz-fusion.org/${PORTVERSION}/
 
-MAINTAINER=	rnoland@2hip.net
+MAINTAINER=	rnoland@FreeBSD.org
 COMMENT=	A Python/GTK based settings manager for CompizConfig
 
 RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/compizconfig-python.pc:${PORTSDIR}/x11-wm/compizconfig-python
diff --git a/x11-wm/compiz-fusion-plugins-extra/Makefile b/x11-wm/compiz-fusion-plugins-extra/Makefile
index 390271bf2f96..074611f36700 100644
--- a/x11-wm/compiz-fusion-plugins-extra/Makefile
+++ b/x11-wm/compiz-fusion-plugins-extra/Makefile
@@ -1,6 +1,6 @@
 # New ports collection makefile for:	compiz-fusion-plugins-extra
 # Date created:				2007-08-17
-# Whom:					Robert Noland <rnoland@2hip.net>
+# Whom:					Robert Noland <rnoland@FreeBSD.org>
 #
 # $FreeBSD$
 #
@@ -12,7 +12,7 @@ PORTREVISION=	2
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://releases.compiz-fusion.org/${PORTVERSION}/
 
-MAINTAINER=	rnoland@2hip.net
+MAINTAINER=	rnoland@FreeBSD.org
 COMMENT=	Plugins for Compiz Composite Window Manager
 
 LIB_DEPENDS=	cairo.2:${PORTSDIR}/graphics/cairo
diff --git a/x11-wm/compiz-fusion-plugins-main/Makefile b/x11-wm/compiz-fusion-plugins-main/Makefile
index 123eb7760b1e..3bc1b0b3193c 100644
--- a/x11-wm/compiz-fusion-plugins-main/Makefile
+++ b/x11-wm/compiz-fusion-plugins-main/Makefile
@@ -1,6 +1,6 @@
 # New ports collection makefile for:	compiz-fusion-plugins-main
 # Date created:				2007-08-15
-# Whom:					Robert Noland <rnoland@2hip.net>
+# Whom:					Robert Noland <rnoland@FreeBSD.org>
 #
 # $FreeBSD$
 #
@@ -12,7 +12,7 @@ PORTREVISION=	2
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://releases.compiz-fusion.org/${PORTVERSION}/
 
-MAINTAINER=	rnoland@2hip.net
+MAINTAINER=	rnoland@FreeBSD.org
 COMMENT=	Plugins for Compiz Composite Window Manager
 
 LIB_DEPENDS=	cairo.2:${PORTSDIR}/graphics/cairo \
diff --git a/x11-wm/compiz-fusion-plugins-unsupported/Makefile b/x11-wm/compiz-fusion-plugins-unsupported/Makefile
index 5e1ef7e4ba67..cf83dd9bd6c4 100644
--- a/x11-wm/compiz-fusion-plugins-unsupported/Makefile
+++ b/x11-wm/compiz-fusion-plugins-unsupported/Makefile
@@ -1,6 +1,6 @@
 # New ports collection makefile for:	compiz-fusion-plugins-unsupported
 # Date created:				2007-08-17
-# Whom:					Robert Noland <rnoland@2hip.net>
+# Whom:					Robert Noland <rnoland@FreeBSD.org>
 #
 # $FreeBSD$
 #
@@ -12,7 +12,7 @@ PORTREVISION=	2
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://releases.compiz-fusion.org/${PORTVERSION}/
 
-MAINTAINER=	rnoland@2hip.net
+MAINTAINER=	rnoland@FreeBSD.org
 COMMENT=	Plugins for Compiz Composite Window Manager
 
 LIB_DEPENDS=	cairo.2:${PORTSDIR}/graphics/cairo
diff --git a/x11-wm/compiz-fusion/Makefile b/x11-wm/compiz-fusion/Makefile
index 654731f2a3c3..69cf333caa7d 100644
--- a/x11-wm/compiz-fusion/Makefile
+++ b/x11-wm/compiz-fusion/Makefile
@@ -1,6 +1,6 @@
 # New ports collection makefile for:	compiz-fusion
 # Date created:				2007-10-22
-# Whom:					Robert C. Noland III <rnoland@2hip.net>
+# Whom:					Robert C. Noland III <rnoland@FreeBSD.org>
 #
 # $FreeBSD$
 #
@@ -14,7 +14,7 @@ MASTER_SITES=	# none
 DISTFILES=	# none
 EXTRACT_ONLY=	# none
 
-MAINTAINER=	rnoland@2hip.net
+MAINTAINER=	rnoland@FreeBSD.org
 COMMENT=	Metaport of compiz-fusion
 
 LIB_DEPENDS=	compizconfig:${PORTSDIR}/x11-wm/libcompizconfig
diff --git a/x11-wm/compiz-plugins-extra/Makefile b/x11-wm/compiz-plugins-extra/Makefile
index 390271bf2f96..074611f36700 100644
--- a/x11-wm/compiz-plugins-extra/Makefile
+++ b/x11-wm/compiz-plugins-extra/Makefile
@@ -1,6 +1,6 @@
 # New ports collection makefile for:	compiz-fusion-plugins-extra
 # Date created:				2007-08-17
-# Whom:					Robert Noland <rnoland@2hip.net>
+# Whom:					Robert Noland <rnoland@FreeBSD.org>
 #
 # $FreeBSD$
 #
@@ -12,7 +12,7 @@ PORTREVISION=	2
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://releases.compiz-fusion.org/${PORTVERSION}/
 
-MAINTAINER=	rnoland@2hip.net
+MAINTAINER=	rnoland@FreeBSD.org
 COMMENT=	Plugins for Compiz Composite Window Manager
 
 LIB_DEPENDS=	cairo.2:${PORTSDIR}/graphics/cairo
diff --git a/x11-wm/compiz-plugins-main/Makefile b/x11-wm/compiz-plugins-main/Makefile
index 123eb7760b1e..3bc1b0b3193c 100644
--- a/x11-wm/compiz-plugins-main/Makefile
+++ b/x11-wm/compiz-plugins-main/Makefile
@@ -1,6 +1,6 @@
 # New ports collection makefile for:	compiz-fusion-plugins-main
 # Date created:				2007-08-15
-# Whom:					Robert Noland <rnoland@2hip.net>
+# Whom:					Robert Noland <rnoland@FreeBSD.org>
 #
 # $FreeBSD$
 #
@@ -12,7 +12,7 @@ PORTREVISION=	2
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://releases.compiz-fusion.org/${PORTVERSION}/
 
-MAINTAINER=	rnoland@2hip.net
+MAINTAINER=	rnoland@FreeBSD.org
 COMMENT=	Plugins for Compiz Composite Window Manager
 
 LIB_DEPENDS=	cairo.2:${PORTSDIR}/graphics/cairo \
diff --git a/x11-wm/compiz-plugins-unsupported/Makefile b/x11-wm/compiz-plugins-unsupported/Makefile
index 5e1ef7e4ba67..cf83dd9bd6c4 100644
--- a/x11-wm/compiz-plugins-unsupported/Makefile
+++ b/x11-wm/compiz-plugins-unsupported/Makefile
@@ -1,6 +1,6 @@
 # New ports collection makefile for:	compiz-fusion-plugins-unsupported
 # Date created:				2007-08-17
-# Whom:					Robert Noland <rnoland@2hip.net>
+# Whom:					Robert Noland <rnoland@FreeBSD.org>
 #
 # $FreeBSD$
 #
@@ -12,7 +12,7 @@ PORTREVISION=	2
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://releases.compiz-fusion.org/${PORTVERSION}/
 
-MAINTAINER=	rnoland@2hip.net
+MAINTAINER=	rnoland@FreeBSD.org
 COMMENT=	Plugins for Compiz Composite Window Manager
 
 LIB_DEPENDS=	cairo.2:${PORTSDIR}/graphics/cairo
diff --git a/x11-wm/compiz/Makefile b/x11-wm/compiz/Makefile
index 90ce176424c9..166f0dc655c3 100644
--- a/x11-wm/compiz/Makefile
+++ b/x11-wm/compiz/Makefile
@@ -11,7 +11,7 @@ PORTVERSION=	0.6.2
 PORTREVISION=	2
 CATEGORIES=	x11-wm
 
-MAINTAINER=	rnoland@2hip.net
+MAINTAINER=	rnoland@FreeBSD.org
 COMMENT=	Compiz Composite/Window Manager
 
 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
diff --git a/x11-wm/compizconfig-backend-gconf/Makefile b/x11-wm/compizconfig-backend-gconf/Makefile
index 04cf322b5c94..2d985565c1a4 100644
--- a/x11-wm/compizconfig-backend-gconf/Makefile
+++ b/x11-wm/compizconfig-backend-gconf/Makefile
@@ -1,6 +1,6 @@
 # New ports collection makefile for:	compizconfig-backend-gconf
 # Date created:				2007-08-17
-# Whom:					Robert Noland <rnoland@2hip.net>
+# Whom:					Robert Noland <rnoland@FreeBSD.org>
 #
 # $FreeBSD$
 #
@@ -11,7 +11,7 @@ PORTREVISION=	2
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://releases.compiz-fusion.org/${PORTVERSION}/
 
-MAINTAINER=	rnoland@2hip.net
+MAINTAINER=	rnoland@FreeBSD.org
 COMMENT=	The gconf backend for CompizConfig
 
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/compiz.pc:${PORTSDIR}/x11-wm/compiz
diff --git a/x11-wm/compizconfig-python/Makefile b/x11-wm/compizconfig-python/Makefile
index 6f6629f30aa7..e5245c928d5c 100644
--- a/x11-wm/compizconfig-python/Makefile
+++ b/x11-wm/compizconfig-python/Makefile
@@ -1,6 +1,6 @@
 # New ports collection makefile for:	compizconfig-python
 # Date created:				2007-08-17
-# Whom:					Robert Noland <rnoland@2hip.net>
+# Whom:					Robert Noland <rnoland@FreeBSD.org>
 #
 # $FreeBSD$
 #
@@ -12,7 +12,7 @@ PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://releases.compiz-fusion.org/${PORTVERSION}/
 
-MAINTAINER=	rnoland@2hip.net
+MAINTAINER=	rnoland@FreeBSD.org
 COMMENT=	Python bindings for the compizconfig library
 
 BUILD_DEPENDS=	\
diff --git a/x11-wm/emerald/Makefile b/x11-wm/emerald/Makefile
index 250e2a7d763f..a1a449e66655 100644
--- a/x11-wm/emerald/Makefile
+++ b/x11-wm/emerald/Makefile
@@ -11,7 +11,7 @@ PORTREVISION=	2
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://releases.compiz-fusion.org/${PORTVERSION}/
 
-MAINTAINER=	rnoland@2hip.net
+MAINTAINER=	rnoland@FreeBSD.org
 COMMENT=	Emerald Window Decorator
 
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/compiz.pc:${PORTSDIR}/x11-wm/compiz
diff --git a/x11-wm/heliodor/Makefile b/x11-wm/heliodor/Makefile
index 4d5c4160908e..6cf0e43d8137 100644
--- a/x11-wm/heliodor/Makefile
+++ b/x11-wm/heliodor/Makefile
@@ -1,6 +1,6 @@
 # New ports collection makefile for:	heliodor
 # Date created:				2007-02-05
-# Whom:					Robert Noland <rnoland@2hip.net>
+# Whom:					Robert Noland <rnoland@FreeBSD.org>
 #
 # $FreeBSD$
 #
@@ -11,7 +11,7 @@ PORTREVISION=	2
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://releases.beryl-project.org/${PORTVERSION}/
 
-MAINTAINER=	rnoland@2hip.net
+MAINTAINER=	rnoland@FreeBSD.org
 COMMENT=	Heliodor Window Decorator
 
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/beryl.pc:${PORTSDIR}/x11-wm/beryl-core
diff --git a/x11-wm/libcompizconfig/Makefile b/x11-wm/libcompizconfig/Makefile
index 8c017d954737..c91453650829 100644
--- a/x11-wm/libcompizconfig/Makefile
+++ b/x11-wm/libcompizconfig/Makefile
@@ -1,6 +1,6 @@
 # New ports collection makefile for:	libcompizconfig
 # Date created:				2007-08-16
-# Whom:					Robert Noland <rnoland@2hip.net>
+# Whom:					Robert Noland <rnoland@FreeBSD.org>
 #
 # $FreeBSD$
 #
@@ -11,7 +11,7 @@ PORTVERSION=	0.6.0
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://releases.compiz-fusion.org/${PORTVERSION}/
 
-MAINTAINER=	rnoland@2hip.net
+MAINTAINER=	rnoland@FreeBSD.org
 COMMENT=	An alternative configuration system for Compiz
 
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/compiz.pc:${PORTSDIR}/x11-wm/compiz