48 files changed, 63 insertions, 63 deletions

diff --git a/games/awele/Makefile b/games/awele/Makefile
index 61df390d799e..81cbc562d87d 100644
--- a/games/awele/Makefile
+++ b/games/awele/Makefile
@@ -1,7 +1,7 @@
 # New ports collection makefile for:	awele
 # Version required:	1.0
 # Date created:		01 May 1998
-# Whom:			Thomas Gellekum <tg@FreeBSD.ORG>
+# Whom:			Thomas Gellekum <tg@FreeBSD.org>
 #
 # $FreeBSD$
 #
@@ -12,7 +12,7 @@ CATEGORIES=	games tk80
 MASTER_SITES=	http://www-rocq.inria.fr/air/ftp/Jean-Paul/
 EXTRACT_SUFX=	1.0.tgz
 
-MAINTAINER=	tg@FreeBSD.ORG
+MAINTAINER=	tg@FreeBSD.org
 
 LIB_DEPENDS=	tk80.1:${PORTSDIR}/x11-toolkits/tk80
 
diff --git a/games/crossfire-client/Makefile b/games/crossfire-client/Makefile
index 2eded2298893..3a2940bd3410 100644
--- a/games/crossfire-client/Makefile
+++ b/games/crossfire-client/Makefile
@@ -17,7 +17,7 @@ MASTER_SITES=	http://www.FreeBSD.org/~andreas/download/ \
 DISTFILES=	${CF_SOURCES} ${CF_DOC} ${CF_MAPS} ${CF_SOUNDS} \
 		${CF_ARCH} ${CF_CLSERV}
 
-MAINTAINER=	andreas@FreeBSD.ORG
+MAINTAINER=	andreas@FreeBSD.org
 
 BUILD_DEPENDS=	rplay:${PORTSDIR}/audio/rplay
 LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
diff --git a/games/crossfire-server/Makefile b/games/crossfire-server/Makefile
index 2eded2298893..3a2940bd3410 100644
--- a/games/crossfire-server/Makefile
+++ b/games/crossfire-server/Makefile
@@ -17,7 +17,7 @@ MASTER_SITES=	http://www.FreeBSD.org/~andreas/download/ \
 DISTFILES=	${CF_SOURCES} ${CF_DOC} ${CF_MAPS} ${CF_SOUNDS} \
 		${CF_ARCH} ${CF_CLSERV}
 
-MAINTAINER=	andreas@FreeBSD.ORG
+MAINTAINER=	andreas@FreeBSD.org
 
 BUILD_DEPENDS=	rplay:${PORTSDIR}/audio/rplay
 LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
diff --git a/games/crossfire/Makefile b/games/crossfire/Makefile
index 2eded2298893..3a2940bd3410 100644
--- a/games/crossfire/Makefile
+++ b/games/crossfire/Makefile
@@ -17,7 +17,7 @@ MASTER_SITES=	http://www.FreeBSD.org/~andreas/download/ \
 DISTFILES=	${CF_SOURCES} ${CF_DOC} ${CF_MAPS} ${CF_SOUNDS} \
 		${CF_ARCH} ${CF_CLSERV}
 
-MAINTAINER=	andreas@FreeBSD.ORG
+MAINTAINER=	andreas@FreeBSD.org
 
 BUILD_DEPENDS=	rplay:${PORTSDIR}/audio/rplay
 LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
diff --git a/games/fkiss/Makefile b/games/fkiss/Makefile
index 4c3e8a1224aa..738ae243cef7 100644
--- a/games/fkiss/Makefile
+++ b/games/fkiss/Makefile
@@ -11,7 +11,7 @@ PKGNAME=	fkiss-0.28
 CATEGORIES=	games
 MASTER_SITES=	http://www.oersted.co.jp/~yav/soft/fkiss/
 
-MAINTAINER=	flathill@FreeBSD.ORG
+MAINTAINER=	flathill@FreeBSD.org
 
 RUN_DEPENDS=	lha:${PORTSDIR}/archivers/lha
 
diff --git a/games/gnuchess/Makefile b/games/gnuchess/Makefile
index 6124f319ad1d..28439a1b6762 100644
--- a/games/gnuchess/Makefile
+++ b/games/gnuchess/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	gnuchess
 
-MAINTAINER=	markm@FreeBSD.ORG
+MAINTAINER=	markm@FreeBSD.org
 
 HAS_CONFIGURE=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
diff --git a/games/nethack-qt/Makefile b/games/nethack-qt/Makefile
index b2ed890d721c..57ee492f1ef9 100644
--- a/games/nethack-qt/Makefile
+++ b/games/nethack-qt/Makefile
@@ -17,7 +17,7 @@ QT_PATCH=	qnethack-3.2.2.1.0.1.src.tar.gz
 QT_SOUND=	nhs.tar.gz
 DISTFILES=	nethack-3.2.2.tar.gz ${QT_PATCH} ${QT_SOUND}
 
-MAINTAINER=	andreas@FreeBSD.ORG
+MAINTAINER=	andreas@FreeBSD.org
 
 BUILD_DEPENDS=	auplay:${PORTSDIR}/audio/nas \
 		xpmtoppm:${PORTSDIR}/graphics/netpbm
diff --git a/games/nethack/Makefile b/games/nethack/Makefile
index 4403d1c444c6..4d4edb7ee19e 100644
--- a/games/nethack/Makefile
+++ b/games/nethack/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	ftp://ftp.wtower.com/nethack/sources/ \
 		${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	nethack
 
-MAINTAINER=	ports@FreeBSD.ORG
+MAINTAINER=	ports@FreeBSD.org
 
 LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
 
diff --git a/games/nethack3-tty/Makefile b/games/nethack3-tty/Makefile
index 4403d1c444c6..4d4edb7ee19e 100644
--- a/games/nethack3-tty/Makefile
+++ b/games/nethack3-tty/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	ftp://ftp.wtower.com/nethack/sources/ \
 		${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	nethack
 
-MAINTAINER=	ports@FreeBSD.ORG
+MAINTAINER=	ports@FreeBSD.org
 
 LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
 
diff --git a/games/nethack3/Makefile b/games/nethack3/Makefile
index 4403d1c444c6..4d4edb7ee19e 100644
--- a/games/nethack3/Makefile
+++ b/games/nethack3/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	ftp://ftp.wtower.com/nethack/sources/ \
 		${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	nethack
 
-MAINTAINER=	ports@FreeBSD.ORG
+MAINTAINER=	ports@FreeBSD.org
 
 LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
 
diff --git a/games/nethack32/Makefile b/games/nethack32/Makefile
index 4403d1c444c6..4d4edb7ee19e 100644
--- a/games/nethack32/Makefile
+++ b/games/nethack32/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	ftp://ftp.wtower.com/nethack/sources/ \
 		${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	nethack
 
-MAINTAINER=	ports@FreeBSD.ORG
+MAINTAINER=	ports@FreeBSD.org
 
 LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
 
diff --git a/games/nethack33-nox11/Makefile b/games/nethack33-nox11/Makefile
index 4403d1c444c6..4d4edb7ee19e 100644
--- a/games/nethack33-nox11/Makefile
+++ b/games/nethack33-nox11/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	ftp://ftp.wtower.com/nethack/sources/ \
 		${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	nethack
 
-MAINTAINER=	ports@FreeBSD.ORG
+MAINTAINER=	ports@FreeBSD.org
 
 LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
 
diff --git a/games/nethack33-qt/Makefile b/games/nethack33-qt/Makefile
index b2ed890d721c..57ee492f1ef9 100644
--- a/games/nethack33-qt/Makefile
+++ b/games/nethack33-qt/Makefile
@@ -17,7 +17,7 @@ QT_PATCH=	qnethack-3.2.2.1.0.1.src.tar.gz
 QT_SOUND=	nhs.tar.gz
 DISTFILES=	nethack-3.2.2.tar.gz ${QT_PATCH} ${QT_SOUND}
 
-MAINTAINER=	andreas@FreeBSD.ORG
+MAINTAINER=	andreas@FreeBSD.org
 
 BUILD_DEPENDS=	auplay:${PORTSDIR}/audio/nas \
 		xpmtoppm:${PORTSDIR}/graphics/netpbm
diff --git a/games/nethack33/Makefile b/games/nethack33/Makefile
index 4403d1c444c6..4d4edb7ee19e 100644
--- a/games/nethack33/Makefile
+++ b/games/nethack33/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	ftp://ftp.wtower.com/nethack/sources/ \
 		${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	nethack
 
-MAINTAINER=	ports@FreeBSD.ORG
+MAINTAINER=	ports@FreeBSD.org
 
 LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
 
diff --git a/games/nethack34-nox11/Makefile b/games/nethack34-nox11/Makefile
index 4403d1c444c6..4d4edb7ee19e 100644
--- a/games/nethack34-nox11/Makefile
+++ b/games/nethack34-nox11/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	ftp://ftp.wtower.com/nethack/sources/ \
 		${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	nethack
 
-MAINTAINER=	ports@FreeBSD.ORG
+MAINTAINER=	ports@FreeBSD.org
 
 LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
 
diff --git a/games/nethack34-qt/Makefile b/games/nethack34-qt/Makefile
index b2ed890d721c..57ee492f1ef9 100644
--- a/games/nethack34-qt/Makefile
+++ b/games/nethack34-qt/Makefile
@@ -17,7 +17,7 @@ QT_PATCH=	qnethack-3.2.2.1.0.1.src.tar.gz
 QT_SOUND=	nhs.tar.gz
 DISTFILES=	nethack-3.2.2.tar.gz ${QT_PATCH} ${QT_SOUND}
 
-MAINTAINER=	andreas@FreeBSD.ORG
+MAINTAINER=	andreas@FreeBSD.org
 
 BUILD_DEPENDS=	auplay:${PORTSDIR}/audio/nas \
 		xpmtoppm:${PORTSDIR}/graphics/netpbm
diff --git a/games/nethack34/Makefile b/games/nethack34/Makefile
index 4403d1c444c6..4d4edb7ee19e 100644
--- a/games/nethack34/Makefile
+++ b/games/nethack34/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	ftp://ftp.wtower.com/nethack/sources/ \
 		${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	nethack
 
-MAINTAINER=	ports@FreeBSD.ORG
+MAINTAINER=	ports@FreeBSD.org
 
 LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
 
diff --git a/games/netrek-BRMH-bin/Makefile b/games/netrek-BRMH-bin/Makefile
index 6e2a1b9db380..1f7875493684 100644
--- a/games/netrek-BRMH-bin/Makefile
+++ b/games/netrek-BRMH-bin/Makefile
@@ -1,7 +1,7 @@
 # New ports collection makefile for:    netrek
 # Version required:     BRMH 2.2p2
 # Date created:         15 Mar 1999
-# Whom:                 Donald Burr <dburr@FreeBSD.ORG>
+# Whom:                 Donald Burr <dburr@FreeBSD.org>
 #
 # $FreeBSD$
 #
@@ -12,7 +12,7 @@ CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.solace.mh.se/pub/netrek/clients/bsd/
 EXTRACT_SUFX=	.gz
 
-MAINTAINER=	dburr@FreeBSD.ORG
+MAINTAINER=	dburr@FreeBSD.org
 
 USE_X_PREFIX=		YES
 NO_BUILD=		YES
diff --git a/games/netrek-COW3-bin/Makefile b/games/netrek-COW3-bin/Makefile
index c176dbd466d3..ca6e81a6b77d 100644
--- a/games/netrek-COW3-bin/Makefile
+++ b/games/netrek-COW3-bin/Makefile
@@ -1,7 +1,7 @@
 # New ports collection makefile for:    netrek
 # Version required:     COW 3.00pl0
 # Date created:         15 Mar 1999
-# Whom:                 Donald Burr <dburr@FreeBSD.ORG>
+# Whom:                 Donald Burr <dburr@FreeBSD.org>
 #
 # $FreeBSD$
 #
@@ -12,7 +12,7 @@ CATEGORIES=	games
 MASTER_SITES=	ftp://bigbang.astro.indiana.edu/pub/netrek/COW/COW-bin/
 EXTRACT_SUFX=	.gz
 
-MAINTAINER=	dburr@FreeBSD.ORG
+MAINTAINER=	dburr@FreeBSD.org
 
 USE_X_PREFIX=		YES
 NO_BUILD=		YES
diff --git a/games/pysol/Makefile b/games/pysol/Makefile
index 6c5dcbd5df2c..af4c24a92258 100644
--- a/games/pysol/Makefile
+++ b/games/pysol/Makefile
@@ -1,7 +1,7 @@
 # New ports collection makefile for:    PySol
 # Version required:     2.14
 # Date created:         11 September 1998
-# Whom:                 Thomas Gellekum <tg@FreeBSD.ORG>
+# Whom:                 Thomas Gellekum <tg@FreeBSD.org>
 #
 # $FreeBSD$
 #
@@ -11,7 +11,7 @@ CATEGORIES=	games
 MASTER_SITES=	http://wildsau.idv.uni-linz.ac.at/mfx/download/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${CARDSETS}${EXTRACT_SUFX}
 
-MAINTAINER=	tg@FreeBSD.ORG
+MAINTAINER=	tg@FreeBSD.org
 
 RUN_DEPENDS=	python:${PORTSDIR}/lang/python
 
diff --git a/games/qcc/Makefile b/games/qcc/Makefile
index 985a38c7cbb0..07febfbdadb1 100644
--- a/games/qcc/Makefile
+++ b/games/qcc/Makefile
@@ -1,7 +1,7 @@
 # New ports collection makefile for:		qcc
 # Version required:				1.01
 # Date created:					October 25th 1996
-# Whom:						jfitz@FreeBSD.ORG
+# Whom:						jfitz@FreeBSD.org
 #
 # $FreeBSD$
 #
diff --git a/games/quakeserver/Makefile b/games/quakeserver/Makefile
index 80b600b78367..bec0e66a4e4e 100644
--- a/games/quakeserver/Makefile
+++ b/games/quakeserver/Makefile
@@ -1,7 +1,7 @@
 # New ports collection makefile for:	quakeserver
 # Version required:			0.991
 # Date created:				October 26th 1996
-# Whom:					jfitz@FreeBSD.ORG
+# Whom:					jfitz@FreeBSD.org
 #
 # $FreeBSD$
 #
diff --git a/games/rocksndiamonds/Makefile b/games/rocksndiamonds/Makefile
index cb288533098e..d0a7be34afb8 100644
--- a/games/rocksndiamonds/Makefile
+++ b/games/rocksndiamonds/Makefile
@@ -1,7 +1,7 @@
 # New ports collection makefile for:	rocksndiamonds
 # Version required:	1.2.0
 # Date created:		27 May 1999
-# Whom:			Thomas Gellekum <tg@FreeBSD.ORG>
+# Whom:			Thomas Gellekum <tg@FreeBSD.org>
 #
 # $FreeBSD$
 #
@@ -11,7 +11,7 @@ CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	games
 
-MAINTAINER=	ports@FreeBSD.ORG
+MAINTAINER=	ports@FreeBSD.org
 
 USE_XLIB=	yes
 USE_GMAKE=	yes
diff --git a/games/seahaven/Makefile b/games/seahaven/Makefile
index 9c683e732743..0d4dcea5e224 100644
--- a/games/seahaven/Makefile
+++ b/games/seahaven/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	games
 MASTER_SITES=	http://www.cinenet.net/users/spitzak/seahaven/
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	imp@FreeBSD.ORG
+MAINTAINER=	imp@FreeBSD.org
 
 USE_XLIB=	yes
 GNU_CONFIGURE=	yes
diff --git a/games/spider/Makefile b/games/spider/Makefile
index b64f3a63fd35..3c523c9108f9 100644
--- a/games/spider/Makefile
+++ b/games/spider/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.uni-koeln.de/windows/xcontrib/ \
 		http://www.lovett.com/~ade/FreeBSD/
 
-MAINTAINER=	ports@FreeBSD.ORG
+MAINTAINER=	ports@FreeBSD.org
 
 USE_IMAKE=	yes
 INSTALL_TARGET=	install install.doc
diff --git a/games/tank/Makefile b/games/tank/Makefile
index 3aa84e0ee601..c9ac17f505a9 100644
--- a/games/tank/Makefile
+++ b/games/tank/Makefile
@@ -1,7 +1,7 @@
 # New ports collection makefile for:    tank
 # Version required:     0.4a
 # Date created:         4 Mar 1998
-# Whom:                 Donald Burr <dburr@FreeBSD.ORG>
+# Whom:                 Donald Burr <dburr@FreeBSD.org>
 #
 # $FreeBSD$
 #
@@ -11,7 +11,7 @@ PKGNAME=	tank-0.4a
 CATEGORIES=	games
 MASTER_SITES=	http://step.polymtl.ca/~coyote/tank/
 
-MAINTAINER=	dburr@FreeBSD.ORG
+MAINTAINER=	dburr@FreeBSD.org
 
 LIB_DEPENDS=	MesaGL.14:${PORTSDIR}/graphics/Mesa3
 
diff --git a/games/tksol/Makefile b/games/tksol/Makefile
index b4671c555c2b..3d5bae520608 100644
--- a/games/tksol/Makefile
+++ b/games/tksol/Makefile
@@ -1,7 +1,7 @@
 # New ports collection makefile for:    tksol
 # Version required:     1.0
 # Date created:         26 June 1995
-# Whom:                 Thomas Gellekum <tg@FreeBSD.ORG>
+# Whom:                 Thomas Gellekum <tg@FreeBSD.org>
 #
 # $FreeBSD$
 #
@@ -11,7 +11,7 @@ CATEGORIES=	games tk80
 MASTER_SITES=	ftp://ftp.cs.umd.edu/pub/misc_software/tksol/
 EXTRACT_SUFX=	.tar.Z
 
-MAINTAINER=	tg@FreeBSD.ORG
+MAINTAINER=	tg@FreeBSD.org
 
 RUN_DEPENDS=	wish8.0:${PORTSDIR}/x11-toolkits/tk80
 
diff --git a/games/uox3/Makefile b/games/uox3/Makefile
index d176f45d0e19..5398d5d457ff 100644
--- a/games/uox3/Makefile
+++ b/games/uox3/Makefile
@@ -1,7 +1,7 @@
 # New ports collection makefile for:    uox3
 # Version required:     0.69.02
 # Date created:         24 Feb 1999
-# Whom:                 Donald Burr <dburr@FreeBSD.ORG>
+# Whom:                 Donald Burr <dburr@FreeBSD.org>
 #
 # $FreeBSD$
 #
@@ -13,7 +13,7 @@ MASTER_SITES=	ftp://provolone.dynip.com/pub/ \
 		http://users.1st.net/magda/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} tqpsworld${EXTRACT_SUFX}
 
-MAINTAINER=	dburr@FreeBSD.ORG
+MAINTAINER=	dburr@FreeBSD.org
 
 BROKEN=		"Floating exception (core dumped)"
 
diff --git a/games/wmtimebomb/Makefile b/games/wmtimebomb/Makefile
index 4daaad0f5d09..0390f862e5be 100644
--- a/games/wmtimebomb/Makefile
+++ b/games/wmtimebomb/Makefile
@@ -1,7 +1,7 @@
 # New ports collection makefile for:	wmtimebomb
 # Version required:	0.2.0
 # Date created:		10 August 1998
-# Whom:			Thomas Gellekum <tg@FreeBSD.ORG>
+# Whom:			Thomas Gellekum <tg@FreeBSD.org>
 #
 # $FreeBSD$
 
@@ -10,7 +10,7 @@ PKGNAME=	wmtimebomb-0.2.0
 CATEGORIES=	games windowmaker
 MASTER_SITES=	ftp://ftp.netmug.org/pub/FreeBSD/distfiles/
 
-MAINTAINER=	ports@FreeBSD.ORG
+MAINTAINER=	ports@FreeBSD.org
 
 LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm \
 		PropList.1:${PORTSDIR}/devel/libPropList \
diff --git a/games/xbill/Makefile b/games/xbill/Makefile
index f880da806472..891af50cfdd8 100644
--- a/games/xbill/Makefile
+++ b/games/xbill/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	games
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	obrien@FreeBSD.ORG
+MAINTAINER=	obrien@FreeBSD.org
 
 LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
 
diff --git a/games/xblast/Makefile b/games/xblast/Makefile
index 89a57c9f0534..f944b21d93cc 100644
--- a/games/xblast/Makefile
+++ b/games/xblast/Makefile
@@ -15,7 +15,7 @@ CATEGORIES=	games
 # but right now only available from:
 MASTER_SITES=	http://www.ikp.uni-koeln.de/~vogel/archive/
 
-MAINTAINER=	se@FreeBSD.ORG
+MAINTAINER=	se@FreeBSD.org
 
 WRKSRC=		${WRKDIR}/XBlast-2.6.beta
 USE_IMAKE=      yes
diff --git a/games/xbomb/Makefile b/games/xbomb/Makefile
index 959081e8673a..728055aa67b8 100644
--- a/games/xbomb/Makefile
+++ b/games/xbomb/Makefile
@@ -1,7 +1,7 @@
 # New ports collection makefile for:    xbomb
 # Version required:     2.1
 # Date created:         20 Feb 1998
-# Whom:                 Thomas Gellekum <tg@FreeBSD.ORG>
+# Whom:                 Thomas Gellekum <tg@FreeBSD.org>
 #
 # $FreeBSD$
 #
@@ -11,7 +11,7 @@ CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.demon.co.uk/pub/unix/xwindows/games/
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	ports@FreeBSD.ORG
+MAINTAINER=	ports@FreeBSD.org
 
 USE_X_PREFIX=	yes
 MAN6=		xbomb.6
diff --git a/games/xchadance/Makefile b/games/xchadance/Makefile
index c772895c8052..9daeb6960f29 100644
--- a/games/xchadance/Makefile
+++ b/games/xchadance/Makefile
@@ -1,7 +1,7 @@
 # New ports collection makefile for:	xchadance
 # Version required:	1.0
 # Date created:		21 August 1998
-# Whom:			issei <issei@jp.FreeBSD.ORG>
+# Whom:			issei <issei@jp.FreeBSD.org>
 #
 # $FreeBSD$
 #
@@ -9,10 +9,10 @@
 DISTNAME=	xchada01
 PKGNAME=	xchadance-1.0
 CATEGORIES=	games
-MASTER_SITES=	http://home.jp.FreeBSD.ORG/~issei/LOCAL_PORTS/
+MASTER_SITES=	http://home.jp.FreeBSD.org/~issei/LOCAL_PORTS/
 EXTRACT_SUFX=	.lzh
 
-MAINTAINER=	issei@jp.FreeBSD.ORG
+MAINTAINER=	issei@jp.FreeBSD.org
 
 BUILD_DEPENDS=	lha:${PORTSDIR}/archivers/lha
 
diff --git a/games/xdemineur/Makefile b/games/xdemineur/Makefile
index 16ea0e031d0f..f67b6e00aa5f 100644
--- a/games/xdemineur/Makefile
+++ b/games/xdemineur/Makefile
@@ -1,7 +1,7 @@
 # New ports collection makefile for:    xdemineur
 # Version required:     2.1.1
 # Date created:         13 Feb 1998
-# Whom:                 Thomas Gellekum <tg@FreeBSD.ORG>
+# Whom:                 Thomas Gellekum <tg@FreeBSD.org>
 #
 # $FreeBSD$
 #
@@ -10,7 +10,7 @@ DISTNAME=       xdemineur-2.1.1
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.babafou.eu.org/pub/babafou/
 
-MAINTAINER=	ports@FreeBSD.ORG
+MAINTAINER=	ports@FreeBSD.org
 
 LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
 
diff --git a/games/xemeraldia/Makefile b/games/xemeraldia/Makefile
index e55bca94520b..ed59dacdb4f8 100644
--- a/games/xemeraldia/Makefile
+++ b/games/xemeraldia/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.kuis.kyoto-u.ac.jp/News.Archives/fj.sources/1995/
 DISTFILES=	271.gz
 
-MAINTAINER=	ports@FreeBSD.ORG
+MAINTAINER=	ports@FreeBSD.org
 
 USE_IMAKE=      yes
 NO_INSTALL_MANPAGES=	yes
diff --git a/games/xflame/Makefile b/games/xflame/Makefile
index adb866ab9b6e..164db98b9c40 100644
--- a/games/xflame/Makefile
+++ b/games/xflame/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	xflame-1.1.1
 CATEGORIES=	games
 MASTER_SITES=	http://www.owlnet.rice.edu/~rahul/
 
-MAINTAINER=	kris@FreeBSD.ORG
+MAINTAINER=	kris@FreeBSD.org
 
 USE_IMAKE=	yes
 
diff --git a/games/xgalaga/Makefile b/games/xgalaga/Makefile
index a24808f5f138..e1a94847b682 100644
--- a/games/xgalaga/Makefile
+++ b/games/xgalaga/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	games
 
-MAINTAINER=	ports@FreeBSD.ORG
+MAINTAINER=	ports@FreeBSD.org
 
 LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
 
diff --git a/games/xhime/Makefile b/games/xhime/Makefile
index 744f242d98cc..d87f31509830 100644
--- a/games/xhime/Makefile
+++ b/games/xhime/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	games
 MASTER_SITES=	http://www.tcp-ip.or.jp/~shochan/linux/
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	flathill@FreeBSD.ORG
+MAINTAINER=	flathill@FreeBSD.org
 
 WRKSRC=		${WRKDIR}/xhime1.51
 USE_IMAKE=	yes
diff --git a/games/xjig/Makefile b/games/xjig/Makefile
index 84f25ebf5d5f..e5ed08090d56 100644
--- a/games/xjig/Makefile
+++ b/games/xjig/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	games
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	vanilla@FreeBSD.ORG
+MAINTAINER=	vanilla@FreeBSD.org
 
 USE_XLIB=	yes
 MAKEFILE=	Makefile.Linux
diff --git a/games/xlife/Makefile b/games/xlife/Makefile
index af027f2f0321..b02b93f340d6 100644
--- a/games/xlife/Makefile
+++ b/games/xlife/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	ftp://ftp.cdrom.com/pub/X11/R5contrib/ \
 		ftp://ftp.kddlabs.co.jp/pub/X11/R5contrib/
 EXTRACT_SUFX=	.tar.Z
 
-MAINTAINER=	ports@FreeBSD.ORG
+MAINTAINER=	ports@FreeBSD.org
 
 USE_IMAKE=      yes
 MAN1=		xlife.1
diff --git a/games/xminehunter/Makefile b/games/xminehunter/Makefile
index a98db6541757..6657aa3d3124 100644
--- a/games/xminehunter/Makefile
+++ b/games/xminehunter/Makefile
@@ -1,7 +1,7 @@
 # New ports collection makefile for:	xminehunter
 # Version required:	0.4
 # Date created:		09 January 1997
-# Whom:			Thomas Gellekum <tg@FreeBSD.ORG>
+# Whom:			Thomas Gellekum <tg@FreeBSD.org>
 #
 # $FreeBSD$
 #
@@ -11,7 +11,7 @@ CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	games
 
-MAINTAINER=	tg@FreeBSD.ORG
+MAINTAINER=	tg@FreeBSD.org
 
 LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
 
diff --git a/games/xneko/Makefile b/games/xneko/Makefile
index 638ace8b6fd4..0f15319481d9 100644
--- a/games/xneko/Makefile
+++ b/games/xneko/Makefile
@@ -11,7 +11,7 @@ PKGNAME=	xneko-4.4
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.cdrom.com/pub/bsd-sources/4.4BSD-Lite/usr/src/games/
 
-MAINTAINER=	markm@FreeBSD.ORG
+MAINTAINER=	markm@FreeBSD.org
 
 MAN6=		xneko.6
 MANCOMPRESSED=	maybe
diff --git a/games/xosmulti/Makefile b/games/xosmulti/Makefile
index 58b8878fd109..f743d5321398 100644
--- a/games/xosmulti/Makefile
+++ b/games/xosmulti/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	games
 MASTER_SITES=	http://www01.u-page.so-net.ne.jp/ka2/nakanita/multi/
 EXTRACT_SUFX=	.gz
 
-MAINTAINER=	flathill@FreeBSD.ORG
+MAINTAINER=	flathill@FreeBSD.org
 
 WRKSRC=		${WRKDIR}/xosmulti
 USE_X_PREFIX=	yes
diff --git a/games/xroach/Makefile b/games/xroach/Makefile
index 9ec623230fc9..6be26139afd9 100644
--- a/games/xroach/Makefile
+++ b/games/xroach/Makefile
@@ -11,7 +11,7 @@ PKGNAME=	xroach-4.4
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.cdrom.com/pub/bsd-sources/4.4BSD-Lite/usr/src/games/
 
-MAINTAINER=	markm@FreeBSD.ORG
+MAINTAINER=	markm@FreeBSD.org
 
 MAN6=		xroach.6
 MANCOMPRESSED=	maybe
diff --git a/games/xscrabble/Makefile b/games/xscrabble/Makefile
index d68bfda9ebfe..b4b19b031cd9 100644
--- a/games/xscrabble/Makefile
+++ b/games/xscrabble/Makefile
@@ -11,7 +11,7 @@ PKGNAME=	xscrabble-1.0
 CATEGORIES=	games
 MASTER_SITES=	http://www.freebsd.org/~mph/distfiles/
 
-MAINTAINER=	ports@FreeBSD.ORG
+MAINTAINER=	ports@FreeBSD.org
 
 LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
 
diff --git a/games/xsok/Makefile b/games/xsok/Makefile
index 5777d636545c..aa41534b3431 100644
--- a/games/xsok/Makefile
+++ b/games/xsok/Makefile
@@ -1,7 +1,7 @@
 # New ports collection makefile for:    xsok
 # Version required:     1.02
 # Date created:         07 Feb 1998
-# Whom:                 Thomas Gellekum <tg@FreeBSD.ORG>
+# Whom:                 Thomas Gellekum <tg@FreeBSD.org>
 #
 # $FreeBSD$
 #
@@ -13,7 +13,7 @@ MASTER_SITES=	ftp://tsx-11.mit.edu/pub/linux/sources/usr.bin.X11/ \
 		ftp://ftp.cdrom.com/pub/linux/tsx-11/sources/usr.bin.X11/
 EXTRACT_SUFX=	-src.tar.gz
 
-MAINTAINER=	ports@FreeBSD.ORG
+MAINTAINER=	ports@FreeBSD.org
 
 LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
 
diff --git a/games/xspringies/Makefile b/games/xspringies/Makefile
index 9b262636c4f3..68e609afc120 100644
--- a/games/xspringies/Makefile
+++ b/games/xspringies/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	games
 MASTER_SITES=	http://aixpdslib.seas.ucla.edu/pub/xspringies/RISC/3.2/src/
 DISTFILES=	xspringies.1.1.tar.Z
 
-MAINTAINER=	jkh@FreeBSD.ORG
+MAINTAINER=	jkh@FreeBSD.org
 
 USE_IMAKE=	yes
 MAN1=		xspringies.1
diff --git a/games/xtic/Makefile b/games/xtic/Makefile
index 77f47cdb1511..e6aeb7e09db6 100644
--- a/games/xtic/Makefile
+++ b/games/xtic/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	games
 
-MAINTAINER=	ports@FreeBSD.ORG
+MAINTAINER=	ports@FreeBSD.org
 
 LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm