FreeBSD.ORG -> FreeBSD.org

Prompted by PR:  13476, 13477
Submitted by:  KATO Tsuguru

44 files changed, 51 insertions, 51 deletions

diff --git a/www/arena/Makefile b/www/arena/Makefile
index 98096c03916e..adb365e6317f 100644
--- a/www/arena/Makefile
+++ b/www/arena/Makefile
@@ -11,7 +11,7 @@ PKGNAME=        arena-i18n-beta3b
 CATEGORIES=     www
 MASTER_SITES=   ftp://ftp-eu.w3.org/pub/Arena/beta-3/
 
-MAINTAINER=     ache@FreeBSD.ORG
+MAINTAINER=     ache@FreeBSD.org
 
 LIB_DEPENDS+=   jpeg.9:${PORTSDIR}/graphics/jpeg
 LIB_DEPENDS+=   png.3:${PORTSDIR}/graphics/png
diff --git a/www/ashe/Makefile b/www/ashe/Makefile
index df81527abc04..4c96746f0fe2 100644
--- a/www/ashe/Makefile
+++ b/www/ashe/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	ftp://ftp.cs.rpi.edu/pub/puninj/ASHE/ASHE-1.1.2/src/ \
 		ftp://ftp.cs.rpi.edu/pub/puninj/ASHE/ASHE-1.1.2/libhtmlw/
 DISTFILES=	ashe_cci.tar.Z cci.tar.Z libhtmlw.tar.Z
 
-MAINTAINER=	ports@FreeBSD.ORG
+MAINTAINER=	ports@FreeBSD.org
 
 MAN1=		xhtml.1
 MANCOMPRESSED=	yes
diff --git a/www/bsdi-netscape47-communicator/Makefile b/www/bsdi-netscape47-communicator/Makefile
index 9e00ea4e0ffb..eb3f558962a1 100644
--- a/www/bsdi-netscape47-communicator/Makefile
+++ b/www/bsdi-netscape47-communicator/Makefile
@@ -9,7 +9,7 @@
 MASTER_SITES?=	ftp://ftp.netscape.com/pub/communicator/english/4.61/unix/unsupported/freebsd/complete_install/
 DISTFILES?=	communicator-v461-export.x86-unknown-freebsd.tar.gz
 
-MAINTAINER?=	sada@FreeBSD.ORG
+MAINTAINER?=	sada@FreeBSD.org
 
 MASTERDIR=	${.CURDIR}/../netscape4-communicator
 NO_LATEST_LINK=	yes
diff --git a/www/bsdi-netscape47-navigator/Makefile b/www/bsdi-netscape47-navigator/Makefile
index 2b5adf0e0970..dda7f112f146 100644
--- a/www/bsdi-netscape47-navigator/Makefile
+++ b/www/bsdi-netscape47-navigator/Makefile
@@ -9,7 +9,7 @@
 MASTER_SITES=	ftp://ftp.netscape.com/pub/communicator/english/4.61/unix/unsupported/freebsd/navigator_standalone/
 DISTFILES=	navigator-v461-export.x86-unknown-freebsd.tar.gz
 
-MAINTAINER?=	sada@FreeBSD.ORG
+MAINTAINER?=	sada@FreeBSD.org
 
 BROWSER=	navigator
 INFILE_HEAD=	'Navigator,4.61.0.99147'
diff --git a/www/cgiparse/Makefile b/www/cgiparse/Makefile
index 924a7f93e9f6..1d662fa5e33a 100644
--- a/www/cgiparse/Makefile
+++ b/www/cgiparse/Makefile
@@ -11,6 +11,6 @@ CATEGORIES=	devel
 MASTER_SITES=	http://resnet.uoregon.edu/~gurney_j/	\
 		http://d182-89.uoregon.edu/~jmg/
 
-MAINTAINER=	jmg@FreeBSD.ORG
+MAINTAINER=	jmg@FreeBSD.org
 
 .include <bsd.port.mk>
diff --git a/www/checkbot/Makefile b/www/checkbot/Makefile
index 2ca9dc569195..fc1f0d3384bc 100644
--- a/www/checkbot/Makefile
+++ b/www/checkbot/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	www perl5
 MASTER_SITES=	http://www.xs4all.nl/~graaff/checkbot/ \
 		http://www.freebsd.org/~wosch/src/
 
-MAINTAINER=	wosch@FreeBSD.ORG
+MAINTAINER=	wosch@FreeBSD.org
 
 site_perl=${PREFIX}/lib/perl5/site_perl/${PERL_VER}
 BUILD_DEPENDS=  \
diff --git a/www/chimera/Makefile b/www/chimera/Makefile
index b9abb82c0e3c..17be1557f979 100644
--- a/www/chimera/Makefile
+++ b/www/chimera/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	chimera-1.70p0
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.cs.unlv.edu/pub/chimera/
 
-MAINTAINER=	jseger@FreeBSD.ORG
+MAINTAINER=	jseger@FreeBSD.org
 
 BROKEN=		build
 
diff --git a/www/cocoon/Makefile b/www/cocoon/Makefile
index a73631f19ea2..74100f952ce0 100644
--- a/www/cocoon/Makefile
+++ b/www/cocoon/Makefile
@@ -1,7 +1,7 @@
 # New ports collection makefile for:	Coccon
 # Version required:	1.3.1
 # Date created:		27 June 1999
-# Whom:			Jun Kuriyama <kuriyama@FreeBSD.ORG>
+# Whom:			Jun Kuriyama <kuriyama@FreeBSD.org>
 #
 # $FreeBSD$
 #
@@ -12,7 +12,7 @@ CATEGORIES=	textproc www java
 MASTER_SITES=	http://java.apache.org/cocoon/dist/
 EXTRACT_SUFX=	.jar
 
-MAINTAINER=	kuriyama@FreeBSD.ORG
+MAINTAINER=	kuriyama@FreeBSD.org
 
 RUN_DEPENDS=	${PREFIX}/libexec/apache/mod_jserv.so:${PORTSDIR}/www/apache-jserv
 #		${PREFIX}/share/java/classes/lotusxsl.jar:${PORTSDIR}/textproc/lotusxsl
diff --git a/www/grail/Makefile b/www/grail/Makefile
index 4fc4ec2df81d..ab5d5798d264 100644
--- a/www/grail/Makefile
+++ b/www/grail/Makefile
@@ -1,7 +1,7 @@
 # Ports collection Makefile for:	Grail
 # Version required:			0.5
 # Date created:				1/11/1999
-# Whom:					nectar@FreeBSD.ORG
+# Whom:					nectar@FreeBSD.org
 #
 # $FreeBSD$
 #
diff --git a/www/harvest/Makefile b/www/harvest/Makefile
index 7b09cc4db6a2..7f58fd483cc2 100644
--- a/www/harvest/Makefile
+++ b/www/harvest/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES=	ftp://ftp.tardis.ed.ac.uk/pub/harvest/ \
 		http://www3.uniovi.es/~mirror/harvest-net/
 EXTRACT_SUFX=	-src.tar.gz
 
-MAINTAINER=	andreas@FreeBSD.ORG
+MAINTAINER=	andreas@FreeBSD.org
 
 pre-install:
 	${MKDIR} ${PREFIX}/harvest
diff --git a/www/htmlpp/Makefile b/www/htmlpp/Makefile
index 712b3d4fd494..05604b538cc0 100644
--- a/www/htmlpp/Makefile
+++ b/www/htmlpp/Makefile
@@ -1,7 +1,7 @@
 # New ports collection makefile for:    htmlpp
 # Version required:     3.9d
 # Date created:         9 Nov 1997
-# Whom:                 Donald Burr <dburr@FreeBSD.ORG>
+# Whom:                 Donald Burr <dburr@FreeBSD.org>
 #
 # $FreeBSD$
 #
@@ -12,7 +12,7 @@ CATEGORIES=	www
 MASTER_SITES=	http://www.imatix.com/pub/tools/
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	dburr@FreeBSD.ORG
+MAINTAINER=	dburr@FreeBSD.org
 
 USE_PERL5=	YES
 
diff --git a/www/http-analyze/Makefile b/www/http-analyze/Makefile
index 97d36b053ec4..57bd7fd07377 100644
--- a/www/http-analyze/Makefile
+++ b/www/http-analyze/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.rent-a-guru.de/pub/http-analyze2.01/
 EXTRACT_SUFX=	-src.tar.gz
 
-MAINTAINER=	andreas@FreeBSD.ORG
+MAINTAINER=	andreas@FreeBSD.org
 
 BUILD_DEPENDS=	${PREFIX}/lib/libgd.a:${PORTSDIR}/graphics/gd
 
diff --git a/www/libghttp/Makefile b/www/libghttp/Makefile
index c3f36593d787..69ca73feff17 100644
--- a/www/libghttp/Makefile
+++ b/www/libghttp/Makefile
@@ -1,7 +1,7 @@
 # New ports collection makefile for:	libghttp
 # Version required:			1.0.4
 # Date Created:				24 Dec 1998
-# Whom:					Vanilla I. Shu <vanilla@FreeBSD.ORG>
+# Whom:					Vanilla I. Shu <vanilla@FreeBSD.org>
 #
 # $FreeBSD$
 #
@@ -11,7 +11,7 @@ CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/libghttp
 
-MAINTAINER=	vanilla@FreeBSD.ORG
+MAINTAINER=	vanilla@FreeBSD.org
 
 USE_LIBTOOL=	yes
 
diff --git a/www/lynx-current/Makefile b/www/lynx-current/Makefile
index b0c07acc3edf..be028e821b10 100644
--- a/www/lynx-current/Makefile
+++ b/www/lynx-current/Makefile
@@ -11,7 +11,7 @@ PKGNAME=        lynx-2.8.3dev.5
 CATEGORIES=	www
 MASTER_SITES=   http://sol.slcc.edu/lynx/current/
 
-MAINTAINER=	ache@FreeBSD.ORG
+MAINTAINER=	ache@FreeBSD.org
 
 USE_BZIP2=      YES
 NO_LATEST_LINK=	YES
diff --git a/www/lynx/Makefile b/www/lynx/Makefile
index 25731fab5d5e..235a8caea0ca 100644
--- a/www/lynx/Makefile
+++ b/www/lynx/Makefile
@@ -11,7 +11,7 @@ PKGNAME=        lynx-2.8.2rel.1
 CATEGORIES=	www
 MASTER_SITES=   http://sol.slcc.edu/lynx/current/
 
-MAINTAINER=	jseger@FreeBSD.ORG
+MAINTAINER=	jseger@FreeBSD.org
 
 USE_BZIP2=      YES
 WRKSRC=         ${WRKDIR}/lynx2-8-2
diff --git a/www/mapedit/Makefile b/www/mapedit/Makefile
index ef667ee39327..9e81d42814c4 100644
--- a/www/mapedit/Makefile
+++ b/www/mapedit/Makefile
@@ -11,7 +11,7 @@ PKGNAME=	mapedit-2.3
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.boutell.com/pub/boutell/mapedit/
 
-MAINTAINER=	andreas@FreeBSD.ORG
+MAINTAINER=	andreas@FreeBSD.org
 
 RUN_DEPENDS=	${PREFIX}/java/bin/java:${PORTSDIR}/java/jdk
 
diff --git a/www/netscape3/Makefile b/www/netscape3/Makefile
index 20bf746dec9f..b92e49e4bf3f 100644
--- a/www/netscape3/Makefile
+++ b/www/netscape3/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	www
 MASTER_SITES?=   ftp://archive:oldies@archive.netscape.com/archive/navigator/3.04/shipping/english/unix/bsdi11/navigator_complete/
 DISTFILES=      netscape-v304-export.x86-unknown-bsd.tar.gz
 
-MAINTAINER=	sada@FreeBSD.ORG
+MAINTAINER=	sada@FreeBSD.org
 
 Y2K=		http://home.netscape.com/products/year2000/faq/client.html
 
diff --git a/www/netscape4-communicator.us/Makefile b/www/netscape4-communicator.us/Makefile
index f58f4d56e25c..7d0737c0dddd 100644
--- a/www/netscape4-communicator.us/Makefile
+++ b/www/netscape4-communicator.us/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	communicator-v407-us.x86-unknown-linux2.0_libc5
 PKGNAME=	netscape-communicator-4.07.us
 CATEGORIES=	www
 
-MAINTAINER=	obrien@FreeBSD.ORG
+MAINTAINER=	obrien@FreeBSD.org
 
 Y2K=		http://home.netscape.com/products/year2000/faq/client.html
 
diff --git a/www/netscape4-communicator/Makefile b/www/netscape4-communicator/Makefile
index 728b901ae6e4..bf84073c772f 100644
--- a/www/netscape4-communicator/Makefile
+++ b/www/netscape4-communicator/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	www
 MASTER_SITES?=	ftp://ftp.netscape.com/pub/communicator/4.08/english/unix/unsupported/freebsd/professional_edition/
 DISTFILES?=	communicator-v408-export.x86-unknown-freebsd.tar.gz
 
-MAINTAINER?=	sada@FreeBSD.ORG
+MAINTAINER?=	sada@FreeBSD.org
 
 Y2K=		http://home.netscape.com/products/year2000/faq/client.html
 
diff --git a/www/netscape4-navigator/Makefile b/www/netscape4-navigator/Makefile
index fbaca8bd49d6..22186eda916b 100644
--- a/www/netscape4-navigator/Makefile
+++ b/www/netscape4-navigator/Makefile
@@ -9,7 +9,7 @@
 MASTER_SITES=	ftp://ftp.netscape.com/pub/communicator/${BROWSER_VER}/english/unix/unsupported/freebsd/navigator_standalone/
 DISTFILES=	navigator-v408-export.x86-unknown-freebsd.tar.gz
 
-MAINTAINER?=	sada@FreeBSD.ORG
+MAINTAINER?=	sada@FreeBSD.org
 
 MASTERDIR=	${.CURDIR}/../netscape4-communicator
 
diff --git a/www/netscape47-communicator/Makefile b/www/netscape47-communicator/Makefile
index 9e00ea4e0ffb..eb3f558962a1 100644
--- a/www/netscape47-communicator/Makefile
+++ b/www/netscape47-communicator/Makefile
@@ -9,7 +9,7 @@
 MASTER_SITES?=	ftp://ftp.netscape.com/pub/communicator/english/4.61/unix/unsupported/freebsd/complete_install/
 DISTFILES?=	communicator-v461-export.x86-unknown-freebsd.tar.gz
 
-MAINTAINER?=	sada@FreeBSD.ORG
+MAINTAINER?=	sada@FreeBSD.org
 
 MASTERDIR=	${.CURDIR}/../netscape4-communicator
 NO_LATEST_LINK=	yes
diff --git a/www/netscape47-navigator/Makefile b/www/netscape47-navigator/Makefile
index 2b5adf0e0970..dda7f112f146 100644
--- a/www/netscape47-navigator/Makefile
+++ b/www/netscape47-navigator/Makefile
@@ -9,7 +9,7 @@
 MASTER_SITES=	ftp://ftp.netscape.com/pub/communicator/english/4.61/unix/unsupported/freebsd/navigator_standalone/
 DISTFILES=	navigator-v461-export.x86-unknown-freebsd.tar.gz
 
-MAINTAINER?=	sada@FreeBSD.ORG
+MAINTAINER?=	sada@FreeBSD.org
 
 BROWSER=	navigator
 INFILE_HEAD=	'Navigator,4.61.0.99147'
diff --git a/www/netscape48-communicator/Makefile b/www/netscape48-communicator/Makefile
index 728b901ae6e4..bf84073c772f 100644
--- a/www/netscape48-communicator/Makefile
+++ b/www/netscape48-communicator/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	www
 MASTER_SITES?=	ftp://ftp.netscape.com/pub/communicator/4.08/english/unix/unsupported/freebsd/professional_edition/
 DISTFILES?=	communicator-v408-export.x86-unknown-freebsd.tar.gz
 
-MAINTAINER?=	sada@FreeBSD.ORG
+MAINTAINER?=	sada@FreeBSD.org
 
 Y2K=		http://home.netscape.com/products/year2000/faq/client.html
 
diff --git a/www/p5-Apache/Makefile b/www/p5-Apache/Makefile
index 814706eb83fd..6ccc17c77175 100644
--- a/www/p5-Apache/Makefile
+++ b/www/p5-Apache/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Apache
 
-MAINTAINER=	jfitz@FreeBSD.ORG
+MAINTAINER=	jfitz@FreeBSD.org
 
 BUILD_DEPENDS=	/nonexistent:${PORTSDIR}/www/apache13:patch
 
diff --git a/www/p5-CGI-modules/Makefile b/www/p5-CGI-modules/Makefile
index 4214264c7c1b..7f4728e2614a 100644
--- a/www/p5-CGI-modules/Makefile
+++ b/www/p5-CGI-modules/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	CGI
 
-MAINTAINER=	jfitz@FreeBSD.ORG
+MAINTAINER=	jfitz@FreeBSD.org
 
 BUILD_DEPENDS= 	${PREFIX}/lib/perl5/site_perl/URI/Escape.pm:${PORTSDIR}/www/p5-libwww
 
diff --git a/www/p5-CGI/Makefile b/www/p5-CGI/Makefile
index 4214264c7c1b..7f4728e2614a 100644
--- a/www/p5-CGI/Makefile
+++ b/www/p5-CGI/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	CGI
 
-MAINTAINER=	jfitz@FreeBSD.ORG
+MAINTAINER=	jfitz@FreeBSD.org
 
 BUILD_DEPENDS= 	${PREFIX}/lib/perl5/site_perl/URI/Escape.pm:${PORTSDIR}/www/p5-libwww
 
diff --git a/www/p5-CGI_Lite/Makefile b/www/p5-CGI_Lite/Makefile
index bf52ab7bad0b..322cb4ed93a9 100644
--- a/www/p5-CGI_Lite/Makefile
+++ b/www/p5-CGI_Lite/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	CGI_Lite
 
-MAINTAINER=	jfitz@FreeBSD.ORG
+MAINTAINER=	jfitz@FreeBSD.org
 
 USE_PERL5=	YES
 
diff --git a/www/p5-HTML-Parser/Makefile b/www/p5-HTML-Parser/Makefile
index dfe8e0c6cca1..42afcabd6b2b 100644
--- a/www/p5-HTML-Parser/Makefile
+++ b/www/p5-HTML-Parser/Makefile
@@ -1,7 +1,7 @@
 # New ports collection makefile for:	p5-HTML-Parser
 # Version required:                     2.*
 # Date Created:				28 April 1998
-# Whom:					Vanilla I. Shu <vanilla@FreeBSD.ORG>
+# Whom:					Vanilla I. Shu <vanilla@FreeBSD.org>
 #
 # $FreeBSD$
 #
@@ -12,7 +12,7 @@ CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	HTML
 
-MAINTAINER=	ports@FreeBSD.ORG
+MAINTAINER=	ports@FreeBSD.org
 
 USE_PERL5=	yes
 
diff --git a/www/p5-HTML-QuickCheck/Makefile b/www/p5-HTML-QuickCheck/Makefile
index efbe25546a96..049c75079df8 100644
--- a/www/p5-HTML-QuickCheck/Makefile
+++ b/www/p5-HTML-QuickCheck/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	HTML
 
-MAINTAINER=	jfitz@FreeBSD.ORG
+MAINTAINER=	jfitz@FreeBSD.org
 
 USE_PERL5=	YES
 
diff --git a/www/p5-HTML-Stream/Makefile b/www/p5-HTML-Stream/Makefile
index 4c319576ee6d..182a9e7ccef0 100644
--- a/www/p5-HTML-Stream/Makefile
+++ b/www/p5-HTML-Stream/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	HTML
 
-MAINTAINER=	jfitz@FreeBSD.ORG
+MAINTAINER=	jfitz@FreeBSD.org
 
 USE_PERL5=	YES
 
diff --git a/www/p5-HTML/Makefile b/www/p5-HTML/Makefile
index fb01a1e587c1..98eacbf5b22a 100644
--- a/www/p5-HTML/Makefile
+++ b/www/p5-HTML/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	HTML
 
-MAINTAINER=	jfitz@FreeBSD.ORG
+MAINTAINER=	jfitz@FreeBSD.org
 
 USE_PERL5=	YES
 
diff --git a/www/p5-HTTPD-Tools/Makefile b/www/p5-HTTPD-Tools/Makefile
index dbe5e2a29d70..370e53dde5a4 100644
--- a/www/p5-HTTPD-Tools/Makefile
+++ b/www/p5-HTTPD-Tools/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	HTTPD
 
-MAINTAINER=	jfitz@FreeBSD.ORG
+MAINTAINER=	jfitz@FreeBSD.org
 
 USE_PERL5=	YES
 
diff --git a/www/p5-HTTPD-User-Manage/Makefile b/www/p5-HTTPD-User-Manage/Makefile
index dbe5e2a29d70..370e53dde5a4 100644
--- a/www/p5-HTTPD-User-Manage/Makefile
+++ b/www/p5-HTTPD-User-Manage/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	HTTPD
 
-MAINTAINER=	jfitz@FreeBSD.ORG
+MAINTAINER=	jfitz@FreeBSD.org
 
 USE_PERL5=	YES
 
diff --git a/www/p5-ParallelUA/Makefile b/www/p5-ParallelUA/Makefile
index 1dd10e799928..d113e5765d0f 100644
--- a/www/p5-ParallelUA/Makefile
+++ b/www/p5-ParallelUA/Makefile
@@ -13,7 +13,7 @@ CATEGORIES=     www perl5 devel
 MASTER_SITES=   ${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=     LWP
 
-MAINTAINER=     ache@FreeBSD.ORG
+MAINTAINER=     ache@FreeBSD.org
 
 BUILD_DEPENDS=	${PREFIX}/lib/perl5/site_perl/${PERL_VER}/LWP.pm:${PORTSDIR}/www/p5-libwww \
 		${PREFIX}/lib/perl5/site_perl/${PERL_VER}/URI.pm:${PORTSDIR}/net/p5-URI \
diff --git a/www/p5-WWW-Search/Makefile b/www/p5-WWW-Search/Makefile
index cb28467b299d..5cf6e70c2e53 100644
--- a/www/p5-WWW-Search/Makefile
+++ b/www/p5-WWW-Search/Makefile
@@ -1,7 +1,7 @@
 # New ports collection makefile for:    p5-WWW-Search
 # Version required:			1.021
 # Date created:				June 26th 1997
-# Whom:	      				James FitzGibbon <jfitz@FreeBSD.ORG>
+# Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
 # $FreeBSD$
 #
@@ -12,7 +12,7 @@ CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	WWW
 
-MAINTAINER=	jfitz@FreeBSD.ORG
+MAINTAINER=	jfitz@FreeBSD.org
 
 BUILD_DEPENDS=	${PREFIX}/lib/perl5/site_perl/${PERL_VER}/LWP.pm:${PORTSDIR}/www/p5-libwww
 
diff --git a/www/p5-libwww/Makefile b/www/p5-libwww/Makefile
index 9af910248f12..27d476e0139b 100644
--- a/www/p5-libwww/Makefile
+++ b/www/p5-libwww/Makefile
@@ -13,7 +13,7 @@ CATEGORIES=     www perl5 devel
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=     LWP
 
-MAINTAINER=	jfitz@FreeBSD.ORG
+MAINTAINER=	jfitz@FreeBSD.org
 
 BUILD_DEPENDS=  ${PREFIX}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Digest.pm:${PORTSDIR}/security/p5-Digest-MD5 \
 		${PREFIX}/lib/perl5/site_perl/${PERL_VER}/URI.pm:${PORTSDIR}/net/p5-URI \
diff --git a/www/py-HTMLgen/Makefile b/www/py-HTMLgen/Makefile
index 13241ff4dc52..8ecf02414453 100644
--- a/www/py-HTMLgen/Makefile
+++ b/www/py-HTMLgen/Makefile
@@ -1,7 +1,7 @@
 # Ports collection Makefile for:	HTMLgen
 # Version required:			2.1
 # Date created:				03/20/1999
-# Whom:					nectar@FreeBSD.ORG
+# Whom:					nectar@FreeBSD.org
 #
 # $FreeBSD$
 #
@@ -12,7 +12,7 @@ CATEGORIES=		www python
 MASTER_SITES=		http://starship.skyport.net/crew/friedrich/ \
 			http://www.nectar.cc/distfiles/
 
-MAINTAINER=		nectar@FreeBSD.ORG
+MAINTAINER=		nectar@FreeBSD.org
 
 BUILD_DEPENDS=		python:${PORTSDIR}/lang/python
 RUN_DEPENDS=		python:${PORTSDIR}/lang/python
diff --git a/www/sitecopy/Makefile b/www/sitecopy/Makefile
index baea64a9e44c..f4635846319a 100644
--- a/www/sitecopy/Makefile
+++ b/www/sitecopy/Makefile
@@ -10,7 +10,7 @@ DISTNAME=       sitecopy-0.6.0
 CATEGORIES=	www
 MASTER_SITES=   http://www.lyra.org/sitecopy/
 
-MAINTAINER=     nik@FreeBSD.ORG
+MAINTAINER=     nik@FreeBSD.org
 
 FETCH_BEFORE_ARGS=	-b
 GNU_CONFIGURE=  yes
diff --git a/www/snarf/Makefile b/www/snarf/Makefile
index f451b5e787d2..b4d586ea047b 100644
--- a/www/snarf/Makefile
+++ b/www/snarf/Makefile
@@ -1,7 +1,7 @@
 # New ports collection makefile for:   snarf
 # Version required:    2.0.5
 # Date created:        2 January 1999
-# Whom:                Kris Kennaway <kris@FreeBSD.ORG>
+# Whom:                Kris Kennaway <kris@FreeBSD.org>
 #
 # $FreeBSD$
 #
@@ -10,7 +10,7 @@ DISTNAME=	snarf-2.0.5
 CATEGORIES=	www
 MASTER_SITES=	http://www.xach.com/snarf/
 
-MAINTAINER=	kris@FreeBSD.ORG
+MAINTAINER=	kris@FreeBSD.org
 
 GNU_CONFIGURE=	yes
 
diff --git a/www/transproxy/Makefile b/www/transproxy/Makefile
index be1ad1953bed..ece349ac9d60 100644
--- a/www/transproxy/Makefile
+++ b/www/transproxy/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	www net
 MASTER_SITES=	ftp://ftp.nlc.net.au/pub/linux/www/
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	peter@FreeBSD.ORG
+MAINTAINER=	peter@FreeBSD.org
 
 ALL_TARGET=	tproxy
 
diff --git a/www/wcol/Makefile b/www/wcol/Makefile
index 2f70163392e2..5ab6f3745d6e 100644
--- a/www/wcol/Makefile
+++ b/www/wcol/Makefile
@@ -11,7 +11,7 @@ PKGNAME=	wcolEpre-1998.07.13
 CATEGORIES=	www
 MASTER_SITES=	http://shika.aist-nara.ac.jp/products/DEST/Wcol/
 
-MAINTAINER=	shige@FreeBSD.ORG
+MAINTAINER=	shige@FreeBSD.org
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 
diff --git a/www/webcopy/Makefile b/www/webcopy/Makefile
index f5192a063e1c..e86dc8b9fcc3 100644
--- a/www/webcopy/Makefile
+++ b/www/webcopy/Makefile
@@ -13,7 +13,7 @@ CATEGORIES=     www
 MASTER_SITES=   ftp://ftp.inf.utfsm.cl/pub/utfsm/perl/
 DISTFILES=      webcopy.tgz
 
-MAINTAINER=     ache@FreeBSD.ORG
+MAINTAINER=     ache@FreeBSD.org
 
 NO_PACKAGE= "This program cannot be distributed if modified in any way"
 NO_CDROM= "Don't sell for profit without written permission"
diff --git a/www/weblint/Makefile b/www/weblint/Makefile
index 9b1c8e823da1..f77a15a17c3c 100644
--- a/www/weblint/Makefile
+++ b/www/weblint/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	weblint-1.020
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.cre.canon.co.uk/pub/weblint/
 
-MAINTAINER=	pst@FreeBSD.ORG
+MAINTAINER=	pst@FreeBSD.org
 
 MAN1=		weblint.1
 
diff --git a/www/wwwstat/Makefile b/www/wwwstat/Makefile
index 3bdcbd5db920..931e0992af0e 100644
--- a/www/wwwstat/Makefile
+++ b/www/wwwstat/Makefile
@@ -15,7 +15,7 @@ DISTFILES=	wwwstat-2.0.tar.gz
 PATCH_SITES=	${MASTER_SITES}
 PATCHFILES=	patch-2.01.txt
 
-MAINTAINER=	andreas@FreeBSD.ORG
+MAINTAINER=	andreas@FreeBSD.org
 
 RUN_DEPENDS=    ${PREFIX}/etc/apache/httpd.conf:${PORTSDIR}/www/apache13