FreeBSD.ORG -> FreeBSD.org

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

47 files changed, 57 insertions, 57 deletions

diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile
index 41d19eec6ef5..7b140256891d 100644
--- a/mail/balsa/Makefile
+++ b/mail/balsa/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	mail gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/balsa
 
-MAINTAINER=	ports@FreeBSD.ORG
+MAINTAINER=	ports@FreeBSD.org
 
 RUN_DEPENDS=	panel:${PORTSDIR}/x11/gnomecore
 LIB_DEPENDS=	gnome.2:${PORTSDIR}/x11/gnomelibs \
diff --git a/mail/balsa2/Makefile b/mail/balsa2/Makefile
index 41d19eec6ef5..7b140256891d 100644
--- a/mail/balsa2/Makefile
+++ b/mail/balsa2/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	mail gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/balsa
 
-MAINTAINER=	ports@FreeBSD.ORG
+MAINTAINER=	ports@FreeBSD.org
 
 RUN_DEPENDS=	panel:${PORTSDIR}/x11/gnomecore
 LIB_DEPENDS=	gnome.2:${PORTSDIR}/x11/gnomelibs \
diff --git a/mail/cucipop/Makefile b/mail/cucipop/Makefile
index aba121e9578c..e71bde0d5fec 100644
--- a/mail/cucipop/Makefile
+++ b/mail/cucipop/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES=	ftp://ftp.informatik.rwth-aachen.de/pub/packages/cucipop/
 
 #BUILD_DEPENDS=  ${PREFIX}/include/db2/db.h:${PORTSDIR}/databases/db
 
-MAINTAINER=	vanilla@FreeBSD.ORG
+MAINTAINER=	vanilla@FreeBSD.org
 
 MAN8=   cucipop.8 #makevpopdb.8
 
diff --git a/mail/cyrus-imapd/Makefile b/mail/cyrus-imapd/Makefile
index 444dbc8e338d..7cb7974c5c96 100644
--- a/mail/cyrus-imapd/Makefile
+++ b/mail/cyrus-imapd/Makefile
@@ -1,7 +1,7 @@
 # New ports collection makefile for:		cyrus
 # Version required:				1.5.19
 # Date created:					May 4th 1997
-# Whom:						jfitz@FreeBSD.ORG
+# Whom:						jfitz@FreeBSD.org
 #
 # $FreeBSD$
 #
@@ -13,7 +13,7 @@ MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
 		http://www.freebsd.org/~stb/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/ \
 		ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/
 
-MAINTAINER=	stb@FreeBSD.ORG
+MAINTAINER=	stb@FreeBSD.org
 
 Y2K=		http://andrew2.andrew.cmu.edu/cyrus/imapd/y2k.html
 
diff --git a/mail/cyrus-imapd2/Makefile b/mail/cyrus-imapd2/Makefile
index 444dbc8e338d..7cb7974c5c96 100644
--- a/mail/cyrus-imapd2/Makefile
+++ b/mail/cyrus-imapd2/Makefile
@@ -1,7 +1,7 @@
 # New ports collection makefile for:		cyrus
 # Version required:				1.5.19
 # Date created:					May 4th 1997
-# Whom:						jfitz@FreeBSD.ORG
+# Whom:						jfitz@FreeBSD.org
 #
 # $FreeBSD$
 #
@@ -13,7 +13,7 @@ MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
 		http://www.freebsd.org/~stb/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/ \
 		ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/
 
-MAINTAINER=	stb@FreeBSD.ORG
+MAINTAINER=	stb@FreeBSD.org
 
 Y2K=		http://andrew2.andrew.cmu.edu/cyrus/imapd/y2k.html
 
diff --git a/mail/cyrus-imapd22/Makefile b/mail/cyrus-imapd22/Makefile
index 444dbc8e338d..7cb7974c5c96 100644
--- a/mail/cyrus-imapd22/Makefile
+++ b/mail/cyrus-imapd22/Makefile
@@ -1,7 +1,7 @@
 # New ports collection makefile for:		cyrus
 # Version required:				1.5.19
 # Date created:					May 4th 1997
-# Whom:						jfitz@FreeBSD.ORG
+# Whom:						jfitz@FreeBSD.org
 #
 # $FreeBSD$
 #
@@ -13,7 +13,7 @@ MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
 		http://www.freebsd.org/~stb/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/ \
 		ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/
 
-MAINTAINER=	stb@FreeBSD.ORG
+MAINTAINER=	stb@FreeBSD.org
 
 Y2K=		http://andrew2.andrew.cmu.edu/cyrus/imapd/y2k.html
 
diff --git a/mail/cyrus-imapd23/Makefile b/mail/cyrus-imapd23/Makefile
index 444dbc8e338d..7cb7974c5c96 100644
--- a/mail/cyrus-imapd23/Makefile
+++ b/mail/cyrus-imapd23/Makefile
@@ -1,7 +1,7 @@
 # New ports collection makefile for:		cyrus
 # Version required:				1.5.19
 # Date created:					May 4th 1997
-# Whom:						jfitz@FreeBSD.ORG
+# Whom:						jfitz@FreeBSD.org
 #
 # $FreeBSD$
 #
@@ -13,7 +13,7 @@ MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
 		http://www.freebsd.org/~stb/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/ \
 		ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/
 
-MAINTAINER=	stb@FreeBSD.ORG
+MAINTAINER=	stb@FreeBSD.org
 
 Y2K=		http://andrew2.andrew.cmu.edu/cyrus/imapd/y2k.html
 
diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile
index 444dbc8e338d..7cb7974c5c96 100644
--- a/mail/cyrus-imapd24/Makefile
+++ b/mail/cyrus-imapd24/Makefile
@@ -1,7 +1,7 @@
 # New ports collection makefile for:		cyrus
 # Version required:				1.5.19
 # Date created:					May 4th 1997
-# Whom:						jfitz@FreeBSD.ORG
+# Whom:						jfitz@FreeBSD.org
 #
 # $FreeBSD$
 #
@@ -13,7 +13,7 @@ MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
 		http://www.freebsd.org/~stb/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/ \
 		ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/
 
-MAINTAINER=	stb@FreeBSD.ORG
+MAINTAINER=	stb@FreeBSD.org
 
 Y2K=		http://andrew2.andrew.cmu.edu/cyrus/imapd/y2k.html
 
diff --git a/mail/cyrus/Makefile b/mail/cyrus/Makefile
index 444dbc8e338d..7cb7974c5c96 100644
--- a/mail/cyrus/Makefile
+++ b/mail/cyrus/Makefile
@@ -1,7 +1,7 @@
 # New ports collection makefile for:		cyrus
 # Version required:				1.5.19
 # Date created:					May 4th 1997
-# Whom:						jfitz@FreeBSD.ORG
+# Whom:						jfitz@FreeBSD.org
 #
 # $FreeBSD$
 #
@@ -13,7 +13,7 @@ MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
 		http://www.freebsd.org/~stb/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/ \
 		ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/
 
-MAINTAINER=	stb@FreeBSD.ORG
+MAINTAINER=	stb@FreeBSD.org
 
 Y2K=		http://andrew2.andrew.cmu.edu/cyrus/imapd/y2k.html
 
diff --git a/mail/distribute/Makefile b/mail/distribute/Makefile
index 91f0788cff52..1b64fe9b2e11 100644
--- a/mail/distribute/Makefile
+++ b/mail/distribute/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	ftp://ftp.foretune.co.jp/pub/network/mail/distribute/
 PATCH_SITES=	${MASTER_SITES}BETA/
 PATCHFILES=	patch.20.gz patch.21e.gz patch.22e.gz patch.23e.gz patch.24e.gz
 
-MAINTAINER=	kuriyama@FreeBSD.ORG
+MAINTAINER=	kuriyama@FreeBSD.org
 
 WRKSRC=		${WRKDIR}/distribute-pl19
 MAN1=		distribute.1
diff --git a/mail/elm+ME/Makefile b/mail/elm+ME/Makefile
index f9386e28879e..c8becadbd54b 100644
--- a/mail/elm+ME/Makefile
+++ b/mail/elm+ME/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=   ftp://ftp.ozone.fmi.fi/KEH/ \
 		ftp://ftp.funet.fi/pub/unix/mail/elm/elm-2.4ME+/ \
 		ftp://ftp.ibp.fr/pub/unix/mail/elm-me/
 
-MAINTAINER=	ache@FreeBSD.ORG
+MAINTAINER=	ache@FreeBSD.org
 
 WRKSRC=         ${WRKDIR}/elm2.4.ME+.54
 MAN1=           answer.1 checkalias.1 elm.1 elmalias.1 fastmail.1 \
diff --git a/mail/elm/Makefile b/mail/elm/Makefile
index f9386e28879e..c8becadbd54b 100644
--- a/mail/elm/Makefile
+++ b/mail/elm/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=   ftp://ftp.ozone.fmi.fi/KEH/ \
 		ftp://ftp.funet.fi/pub/unix/mail/elm/elm-2.4ME+/ \
 		ftp://ftp.ibp.fr/pub/unix/mail/elm-me/
 
-MAINTAINER=	ache@FreeBSD.ORG
+MAINTAINER=	ache@FreeBSD.org
 
 WRKSRC=         ${WRKDIR}/elm2.4.ME+.54
 MAN1=           answer.1 checkalias.1 elm.1 elmalias.1 fastmail.1 \
diff --git a/mail/exim-devel/Makefile b/mail/exim-devel/Makefile
index 2dae3b56abdd..113af3beb452 100644
--- a/mail/exim-devel/Makefile
+++ b/mail/exim-devel/Makefile
@@ -1,7 +1,7 @@
 # New ports collection makefile for:	exim
 # Version required:	3.03
 # Date created:		23 June 1996
-# Whom:			markm@FreeBSD.ORG
+# Whom:			markm@FreeBSD.org
 #
 # $FreeBSD$
 #
diff --git a/mail/exim-old/Makefile b/mail/exim-old/Makefile
index 2dae3b56abdd..113af3beb452 100644
--- a/mail/exim-old/Makefile
+++ b/mail/exim-old/Makefile
@@ -1,7 +1,7 @@
 # New ports collection makefile for:	exim
 # Version required:	3.03
 # Date created:		23 June 1996
-# Whom:			markm@FreeBSD.ORG
+# Whom:			markm@FreeBSD.org
 #
 # $FreeBSD$
 #
diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index 2dae3b56abdd..113af3beb452 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -1,7 +1,7 @@
 # New ports collection makefile for:	exim
 # Version required:	3.03
 # Date created:		23 June 1996
-# Whom:			markm@FreeBSD.ORG
+# Whom:			markm@FreeBSD.org
 #
 # $FreeBSD$
 #
diff --git a/mail/faces/Makefile b/mail/faces/Makefile
index e2a109a5888a..6e3ca8941eca 100644
--- a/mail/faces/Makefile
+++ b/mail/faces/Makefile
@@ -2,7 +2,7 @@
 # Version required:	1.6.1
 # Date created:		09 December 96
 # Whom:			Lars Koeller <Lars_Koeller@odie.physik2.uni-rostock.de>
-#			Andreas Klemm <andreas@FreeBSD.ORG>
+#			Andreas Klemm <andreas@FreeBSD.org>
 #
 # $FreeBSD$
 #
diff --git a/mail/kbiff/Makefile b/mail/kbiff/Makefile
index ff43daf25f7a..875d28e927dc 100644
--- a/mail/kbiff/Makefile
+++ b/mail/kbiff/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	kbiff-2.3
 CATEGORIES=	mail kde
 MASTER_SITES=	http://home.sprintmail.com/~granroth/kbiff/
 
-MAINTAINER=	kris@FreeBSD.ORG
+MAINTAINER=	kris@FreeBSD.org
 
 LIB_DEPENDS=	kdeui.2:${PORTSDIR}/x11/kdelibs11 \
 		intl.1:${PORTSDIR}/devel/gettext
diff --git a/mail/mailagent/Makefile b/mail/mailagent/Makefile
index ca4a9012adcc..7af9a78cc72e 100644
--- a/mail/mailagent/Makefile
+++ b/mail/mailagent/Makefile
@@ -1,7 +1,7 @@
 # New ports collection makefile for:	mailagent
 # Version required:		3.0pl65
 # Date created:			23 Sep 1996
-# Whom:				Masafumi NAKANE <max@FreeBSD.ORG>
+# Whom:				Masafumi NAKANE <max@FreeBSD.org>
 #
 # $FreeBSD$
 #
@@ -12,7 +12,7 @@ CATEGORIES=		mail
 MASTER_SITES=		${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	../../authors/id/RAM
 
-MAINTAINER=	max@FreeBSD.ORG
+MAINTAINER=	max@FreeBSD.org
 
 USE_PERL5=	yes
 NO_PACKAGE=	"Correct FQDN needs to be hardcoded"
diff --git a/mail/mailx/Makefile b/mail/mailx/Makefile
index 08797014df8b..d4a191bc1a48 100644
--- a/mail/mailx/Makefile
+++ b/mail/mailx/Makefile
@@ -17,7 +17,7 @@ PATCH_SITES=	ftp://ports.jp.freebsd.org/pub/FreeBSD-jp/ports-jp/LOCAL_PORTS/ \
 PATCHFILES=	mailx.v05.patch.gz
 PATCH_DIST_STRIP=	-p1
 
-MAINTAINER=	issei@jp.FreeBSD.ORG
+MAINTAINER=	issei@jp.FreeBSD.org
 
 EXTRACT_ONLY=	mail-2.2.8.tar.gz
 WRKSRC=		${WRKDIR}/mail-2.2.8
diff --git a/mail/majorcool/Makefile b/mail/majorcool/Makefile
index 255c5e715599..e2cd38f50748 100644
--- a/mail/majorcool/Makefile
+++ b/mail/majorcool/Makefile
@@ -11,7 +11,7 @@ PKGNAME=	majorcool-1.3.0
 CATEGORIES=	mail
 MASTER_SITES=	http://ncrinfo.ncr.com/pub/contrib/unix/MajorCool/
 
-MAINTAINER=	andreas@FreeBSD.ORG
+MAINTAINER=	andreas@FreeBSD.org
 
 NO_BUILD=	yes
 NO_PACKAGE=	"Too many questions"
diff --git a/mail/majordomo/Makefile b/mail/majordomo/Makefile
index 01b4815e6b07..5dd4f19cb5fd 100644
--- a/mail/majordomo/Makefile
+++ b/mail/majordomo/Makefile
@@ -1,7 +1,7 @@
 # New ports collection makefile for:	majordomo
 # Version required:	1.94.4
 # Date created:		23 October 1996
-# Whom:			jfitz@FreeBSD.ORG
+# Whom:			jfitz@FreeBSD.org
 #
 # $FreeBSD$
 #
@@ -13,7 +13,7 @@ MASTER_SITES=	ftp://ftp.sgi.com/other/majordomo/1.94.4/ \
 #		ftp://ftp.greatcircle.com/pub/majordomo/1.94.3/ \
 EXTRACT_SUFX=   .tgz
 
-MAINTAINER=	jfitz@FreeBSD.ORG
+MAINTAINER=	jfitz@FreeBSD.org
 
 Y2K=		http://www.greatcircle.com/majordomo/majordomo-faq.html#1.8
 
diff --git a/mail/metamail/Makefile b/mail/metamail/Makefile
index a54ab4fd36af..eddc5a1d06d5 100644
--- a/mail/metamail/Makefile
+++ b/mail/metamail/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	mail
 MASTER_SITES=	ftp://thumper.bellcore.com/pub/nsb/
 EXTRACT_SUFX=	.tar.Z
 
-MAINTAINER=	torstenb@FreeBSD.ORG
+MAINTAINER=	torstenb@FreeBSD.org
 
 USE_XLIB=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
diff --git a/mail/mh/Makefile b/mail/mh/Makefile
index f9b9ace9b3b6..45d4ad5f7ec2 100644
--- a/mail/mh/Makefile
+++ b/mail/mh/Makefile
@@ -15,7 +15,7 @@ EXTRACT_SUFX=	.tar.Z
 PATCH_SITES=	ftp://ftp.ics.uci.edu/pub/mh/updates/
 PATCHFILES=	MH.6.8.4.Z
 
-MAINTAINER=	pst@FreeBSD.ORG
+MAINTAINER=	pst@FreeBSD.org
 
 MAN1=	ali.1 anno.1 burst.1 comp.1 dist.1 folder.1 forw.1 inc.1 mark.1  \
 	mh-chart.1 mh.1 mhl.1 mhook.1 mhmail.1 mhn.1 mhparam.1 mhpath.1  \
diff --git a/mail/movemail/Makefile b/mail/movemail/Makefile
index d7ee5986afe7..1d77509953fb 100644
--- a/mail/movemail/Makefile
+++ b/mail/movemail/Makefile
@@ -10,7 +10,7 @@ DISTNAME=      movemail-1.0
 CATEGORIES=    mail
 MASTER_SITES=  http://www.freebsd.org/~wosch/src/
 
-MAINTAINER=    wosch@FreeBSD.ORG
+MAINTAINER=    wosch@FreeBSD.org
 
 MAN1=		movemail.1
 MANCOMPRESSED=	maybe
diff --git a/mail/p5-MIME-Tools/Makefile b/mail/p5-MIME-Tools/Makefile
index 0807833c9482..91132ffe74e8 100644
--- a/mail/p5-MIME-Tools/Makefile
+++ b/mail/p5-MIME-Tools/Makefile
@@ -1,7 +1,7 @@
 # New ports collection makefile for:	p5-MIME-Tools
 # Version required:			4.122
 # Date created:				April 27th 1998
-# Whom:	      				Eivind Eklund <eivind@FreeBSD.ORG>
+# Whom:	      				Eivind Eklund <eivind@FreeBSD.org>
 #
 # $FreeBSD$
 #
@@ -12,7 +12,7 @@ CATEGORIES=	mail perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	MIME
 
-MAINTAINER=	eivind@FreeBSD.ORG
+MAINTAINER=	eivind@FreeBSD.org
 
 RUN_DEPENDS=	${PREFIX}/lib/perl5/site_perl/${PERL_VER}/Mail/Header.pm:${PORTSDIR}/mail/p5-Mail-Tools \
 		${PREFIX}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64	\
diff --git a/mail/p5-Mail-Folder/Makefile b/mail/p5-Mail-Folder/Makefile
index da1d11006cdc..5b09db2826e2 100644
--- a/mail/p5-Mail-Folder/Makefile
+++ b/mail/p5-Mail-Folder/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	mail perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Mail
 
-MAINTAINER=	jfitz@FreeBSD.ORG
+MAINTAINER=	jfitz@FreeBSD.org
 
 BUILD_DEPENDS=	${PREFIX}/lib/perl5/site_perl/${PERL_VER}/Mail/Internet.pm:${PORTSDIR}/mail/p5-Mail-Tools \
 		${PREFIX}/lib/perl5/site_perl/${PERL_VER}/Date/Format.pm:${PORTSDIR}/devel/p5-TimeDate \
diff --git a/mail/p5-Mail-POP3Client/Makefile b/mail/p5-Mail-POP3Client/Makefile
index f2327d0e6585..2ce71570aa97 100644
--- a/mail/p5-Mail-POP3Client/Makefile
+++ b/mail/p5-Mail-POP3Client/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	mail perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Mail
 
-MAINTAINER=	jfitz@FreeBSD.ORG
+MAINTAINER=	jfitz@FreeBSD.org
 
 USE_PERL5=	YES
 
diff --git a/mail/p5-Mail-Tools/Makefile b/mail/p5-Mail-Tools/Makefile
index 7e70795c77e4..25c0a23ecff6 100644
--- a/mail/p5-Mail-Tools/Makefile
+++ b/mail/p5-Mail-Tools/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	mail perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Mail
 
-MAINTAINER=	jfitz@FreeBSD.ORG
+MAINTAINER=	jfitz@FreeBSD.org
 
 BUILD_DEPENDS=	${PREFIX}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Net/SMTP.pm:${PORTSDIR}/net/p5-Net \
 		${PREFIX}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Net/Domain.pm:${PORTSDIR}/net/p5-Net
diff --git a/mail/pgpsendmail/Makefile b/mail/pgpsendmail/Makefile
index 02193bbbf8c8..0b1ccc41ad7f 100644
--- a/mail/pgpsendmail/Makefile
+++ b/mail/pgpsendmail/Makefile
@@ -11,7 +11,7 @@ PKGNAME=	pgpsendmail-1.4
 CATEGORIES=	mail
 MASTER_SITES=   ftp://ftp.dhp.com/pub/crypto/pgp/PGPsendmail/
 
-MAINTAINER=     ache@FreeBSD.ORG
+MAINTAINER=     ache@FreeBSD.org
 
 BUILD_DEPENDS += pgp:${PORTSDIR}/security/pgp
 
diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile
index dab678f74dc5..552b4df43d0f 100644
--- a/mail/postfix-current/Makefile
+++ b/mail/postfix-current/Makefile
@@ -16,7 +16,7 @@ MASTER_SITES=	ftp://ftp.merit.edu/postfix/official/ \
 		ftp://ftp.cs.tu-berlin.de/pub/net/mail/postfix/official/ \
 		ftp://ftp.postfix.oaktree.co.uk/pub/postfix/official/
 
-MAINTAINER=	torstenb@FreeBSD.ORG
+MAINTAINER=	torstenb@FreeBSD.org
 
 ALL_TARGET=	default
 
diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index dab678f74dc5..552b4df43d0f 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -16,7 +16,7 @@ MASTER_SITES=	ftp://ftp.merit.edu/postfix/official/ \
 		ftp://ftp.cs.tu-berlin.de/pub/net/mail/postfix/official/ \
 		ftp://ftp.postfix.oaktree.co.uk/pub/postfix/official/
 
-MAINTAINER=	torstenb@FreeBSD.ORG
+MAINTAINER=	torstenb@FreeBSD.org
 
 ALL_TARGET=	default
 
diff --git a/mail/postfix1/Makefile b/mail/postfix1/Makefile
index dab678f74dc5..552b4df43d0f 100644
--- a/mail/postfix1/Makefile
+++ b/mail/postfix1/Makefile
@@ -16,7 +16,7 @@ MASTER_SITES=	ftp://ftp.merit.edu/postfix/official/ \
 		ftp://ftp.cs.tu-berlin.de/pub/net/mail/postfix/official/ \
 		ftp://ftp.postfix.oaktree.co.uk/pub/postfix/official/
 
-MAINTAINER=	torstenb@FreeBSD.ORG
+MAINTAINER=	torstenb@FreeBSD.org
 
 ALL_TARGET=	default
 
diff --git a/mail/postfix20/Makefile b/mail/postfix20/Makefile
index dab678f74dc5..552b4df43d0f 100644
--- a/mail/postfix20/Makefile
+++ b/mail/postfix20/Makefile
@@ -16,7 +16,7 @@ MASTER_SITES=	ftp://ftp.merit.edu/postfix/official/ \
 		ftp://ftp.cs.tu-berlin.de/pub/net/mail/postfix/official/ \
 		ftp://ftp.postfix.oaktree.co.uk/pub/postfix/official/
 
-MAINTAINER=	torstenb@FreeBSD.ORG
+MAINTAINER=	torstenb@FreeBSD.org
 
 ALL_TARGET=	default
 
diff --git a/mail/postfix21/Makefile b/mail/postfix21/Makefile
index dab678f74dc5..552b4df43d0f 100644
--- a/mail/postfix21/Makefile
+++ b/mail/postfix21/Makefile
@@ -16,7 +16,7 @@ MASTER_SITES=	ftp://ftp.merit.edu/postfix/official/ \
 		ftp://ftp.cs.tu-berlin.de/pub/net/mail/postfix/official/ \
 		ftp://ftp.postfix.oaktree.co.uk/pub/postfix/official/
 
-MAINTAINER=	torstenb@FreeBSD.ORG
+MAINTAINER=	torstenb@FreeBSD.org
 
 ALL_TARGET=	default
 
diff --git a/mail/postfix22/Makefile b/mail/postfix22/Makefile
index dab678f74dc5..552b4df43d0f 100644
--- a/mail/postfix22/Makefile
+++ b/mail/postfix22/Makefile
@@ -16,7 +16,7 @@ MASTER_SITES=	ftp://ftp.merit.edu/postfix/official/ \
 		ftp://ftp.cs.tu-berlin.de/pub/net/mail/postfix/official/ \
 		ftp://ftp.postfix.oaktree.co.uk/pub/postfix/official/
 
-MAINTAINER=	torstenb@FreeBSD.ORG
+MAINTAINER=	torstenb@FreeBSD.org
 
 ALL_TARGET=	default
 
diff --git a/mail/postfix23/Makefile b/mail/postfix23/Makefile
index dab678f74dc5..552b4df43d0f 100644
--- a/mail/postfix23/Makefile
+++ b/mail/postfix23/Makefile
@@ -16,7 +16,7 @@ MASTER_SITES=	ftp://ftp.merit.edu/postfix/official/ \
 		ftp://ftp.cs.tu-berlin.de/pub/net/mail/postfix/official/ \
 		ftp://ftp.postfix.oaktree.co.uk/pub/postfix/official/
 
-MAINTAINER=	torstenb@FreeBSD.ORG
+MAINTAINER=	torstenb@FreeBSD.org
 
 ALL_TARGET=	default
 
diff --git a/mail/postfix24/Makefile b/mail/postfix24/Makefile
index dab678f74dc5..552b4df43d0f 100644
--- a/mail/postfix24/Makefile
+++ b/mail/postfix24/Makefile
@@ -16,7 +16,7 @@ MASTER_SITES=	ftp://ftp.merit.edu/postfix/official/ \
 		ftp://ftp.cs.tu-berlin.de/pub/net/mail/postfix/official/ \
 		ftp://ftp.postfix.oaktree.co.uk/pub/postfix/official/
 
-MAINTAINER=	torstenb@FreeBSD.ORG
+MAINTAINER=	torstenb@FreeBSD.org
 
 ALL_TARGET=	default
 
diff --git a/mail/postfix25/Makefile b/mail/postfix25/Makefile
index dab678f74dc5..552b4df43d0f 100644
--- a/mail/postfix25/Makefile
+++ b/mail/postfix25/Makefile
@@ -16,7 +16,7 @@ MASTER_SITES=	ftp://ftp.merit.edu/postfix/official/ \
 		ftp://ftp.cs.tu-berlin.de/pub/net/mail/postfix/official/ \
 		ftp://ftp.postfix.oaktree.co.uk/pub/postfix/official/
 
-MAINTAINER=	torstenb@FreeBSD.ORG
+MAINTAINER=	torstenb@FreeBSD.org
 
 ALL_TARGET=	default
 
diff --git a/mail/postfix26/Makefile b/mail/postfix26/Makefile
index dab678f74dc5..552b4df43d0f 100644
--- a/mail/postfix26/Makefile
+++ b/mail/postfix26/Makefile
@@ -16,7 +16,7 @@ MASTER_SITES=	ftp://ftp.merit.edu/postfix/official/ \
 		ftp://ftp.cs.tu-berlin.de/pub/net/mail/postfix/official/ \
 		ftp://ftp.postfix.oaktree.co.uk/pub/postfix/official/
 
-MAINTAINER=	torstenb@FreeBSD.ORG
+MAINTAINER=	torstenb@FreeBSD.org
 
 ALL_TARGET=	default
 
diff --git a/mail/postfix27/Makefile b/mail/postfix27/Makefile
index dab678f74dc5..552b4df43d0f 100644
--- a/mail/postfix27/Makefile
+++ b/mail/postfix27/Makefile
@@ -16,7 +16,7 @@ MASTER_SITES=	ftp://ftp.merit.edu/postfix/official/ \
 		ftp://ftp.cs.tu-berlin.de/pub/net/mail/postfix/official/ \
 		ftp://ftp.postfix.oaktree.co.uk/pub/postfix/official/
 
-MAINTAINER=	torstenb@FreeBSD.ORG
+MAINTAINER=	torstenb@FreeBSD.org
 
 ALL_TARGET=	default
 
diff --git a/mail/postfix28/Makefile b/mail/postfix28/Makefile
index dab678f74dc5..552b4df43d0f 100644
--- a/mail/postfix28/Makefile
+++ b/mail/postfix28/Makefile
@@ -16,7 +16,7 @@ MASTER_SITES=	ftp://ftp.merit.edu/postfix/official/ \
 		ftp://ftp.cs.tu-berlin.de/pub/net/mail/postfix/official/ \
 		ftp://ftp.postfix.oaktree.co.uk/pub/postfix/official/
 
-MAINTAINER=	torstenb@FreeBSD.ORG
+MAINTAINER=	torstenb@FreeBSD.org
 
 ALL_TARGET=	default
 
diff --git a/mail/premail/Makefile b/mail/premail/Makefile
index d1214374a34a..9498a4d9ee89 100644
--- a/mail/premail/Makefile
+++ b/mail/premail/Makefile
@@ -13,7 +13,7 @@ CATEGORIES=     security mail
 MASTER_SITES=   ftp://ftp.jpunix.com/pub/remailer-tools/ \
 		ftp://ftp.kiarchive.ru/unix/crypto/
 
-MAINTAINER=	ache@FreeBSD.ORG
+MAINTAINER=	ache@FreeBSD.org
 
 BUILD_DEPENDS+= pgp:${PORTSDIR}/security/pgp
 
diff --git a/mail/procmail/Makefile b/mail/procmail/Makefile
index 122776222490..4611c9014692 100644
--- a/mail/procmail/Makefile
+++ b/mail/procmail/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.procmail.org/pub/procmail/ \
 		ftp://ftp.informatik.rwth-aachen.de/pub/packages/procmail/
 
-MAINTAINER=     ache@FreeBSD.ORG
+MAINTAINER=     ache@FreeBSD.org
 
 INSTALL_TARGET= install-suid install.man
 
diff --git a/mail/smail/Makefile b/mail/smail/Makefile
index 8701e4a4957c..20a72afc117f 100644
--- a/mail/smail/Makefile
+++ b/mail/smail/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	ftp://ftp.uu.net/networking/mail/smail/ \
 		ftp://ftp.planix.com/pub/Smail/ \
 		ftp://ftp.fu-berlin.de/unix/mail/smail/
 
-MAINTAINER=	torstenb@FreeBSD.ORG
+MAINTAINER=	torstenb@FreeBSD.org
 
 BUILD_DEPENDS=	${PREFIX}/lib/libident.a:${PORTSDIR}/security/libident
 .if !exists(/usr/include/tcpd.h)
diff --git a/mail/xfaces/Makefile b/mail/xfaces/Makefile
index d230f1e90ac4..14bb1d3d0c5e 100644
--- a/mail/xfaces/Makefile
+++ b/mail/xfaces/Makefile
@@ -3,7 +3,7 @@
 # Date created:		11 December 96
 # Whom:			Lars Koeller <Lars_Koeller@odie.physik2.uni-rostock.de>
 # With some 
-# modifications from:	Andreas Klemm <andreas@FreeBSD.ORG>
+# modifications from:	Andreas Klemm <andreas@FreeBSD.org>
 #
 # $FreeBSD$
 #
diff --git a/mail/xmail/Makefile b/mail/xmail/Makefile
index 9b22af8ed9a2..3a1829f8984f 100644
--- a/mail/xmail/Makefile
+++ b/mail/xmail/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	applications
 
-MAINTAINER=	andreas@FreeBSD.ORG
+MAINTAINER=	andreas@FreeBSD.org
 
 LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
 
diff --git a/mail/youbin/Makefile b/mail/youbin/Makefile
index 6218958d89ec..f126895527be 100644
--- a/mail/youbin/Makefile
+++ b/mail/youbin/Makefile
@@ -2,7 +2,7 @@
 # http://www.agusa.nuie.nagoya-u.ac.jp/software/youbin/youbin-e.html
 # Version required:		2.13
 # Date created:			09 Aug 1996
-# Whom:				Masafumi NAKANE <max@FreeBSD.ORG>
+# Whom:				Masafumi NAKANE <max@FreeBSD.org>
 #
 # $FreeBSD$
 #
@@ -12,7 +12,7 @@ CATEGORIES=	mail
 MASTER_SITES=	ftp://nuis.nuie.nagoya-u.ac.jp/info/nagoya-u/ \
 		ftp://ftp.kyoto.wide.ad.jp/pub/net/
 
-MAINTAINER=	max@FreeBSD.ORG
+MAINTAINER=	max@FreeBSD.org
 
 LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm