s/netbsd.org/NetBSD.org/

author: grant <grant> 2003-07-17 22:50:55 +0000
committer: grant <grant> 2003-07-17 22:50:55 +0000
commit: 016914e7f9e5498e9fdf870d12d99bfeb4e66d4a (patch)
tree: cd3d4acc598dfb939f2f2a0803f1432f55ec4ada /x11
parent: 8a11869b703aead0cb98488574404b2b233f0b64 (diff)
download: pkgsrc-016914e7f9e5498e9fdf870d12d99bfeb4e66d4a.tar.gz
160 files changed, 322 insertions, 322 deletions
diff --git a/x11/9term/Makefile b/x11/9term/Makefile
index d00d74945cc..0a24c02c5ec 100644
--- a/x11/9term/Makefile
+++ b/x11/9term/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2003/06/02 01:15:47 jschauma Exp $
+# $NetBSD: Makefile,v 1.13 2003/07/17 22:56:19 grant Exp $
 # FreeBSD Id: Makefile,v 1.5 1996/12/07 23:43:56 asami Exp
 #
 
@@ -8,7 +8,7 @@ WRKSRC=			${WRKDIR}
 CATEGORIES=		plan9 x11
 MASTER_SITES=		ftp://ftp.ecf.toronto.edu/pub/plan9/matty/
 
-MAINTAINER=		tech-pkg@netbsd.org
+MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://www.psrg.cs.usyd.edu.au/~matty/9term/index.html
 COMMENT=		X11 program which emulates a plan9 window
 
diff --git a/x11/XF86Setup/Makefile b/x11/XF86Setup/Makefile
index f4a7ff7a82c..55600c70540 100644
--- a/x11/XF86Setup/Makefile
+++ b/x11/XF86Setup/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2003/06/02 01:15:47 jschauma Exp $
+# $NetBSD: Makefile,v 1.28 2003/07/17 22:56:19 grant Exp $
 
 DISTNAME=		XF86Setup-3.3.6
 PKGREVISION=		1
@@ -7,7 +7,7 @@ CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_LOCAL}
 EXTRACT_SUFX=		.tar.bz2
 
-MAINTAINER=		tech-pkg@netbsd.org
+MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://www.xfree86.org/
 COMMENT=		Graphical configuration tool for XFree86
 
diff --git a/x11/XaoS/Makefile b/x11/XaoS/Makefile
index 88882942c22..86d91bb5c4e 100644
--- a/x11/XaoS/Makefile
+++ b/x11/XaoS/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2002/08/25 21:52:26 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2003/07/17 22:56:20 grant Exp $
 #
 
 DISTNAME=		XaoS-3.0
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=xaos/}
 
-MAINTAINER=		atatat@netbsd.org
+MAINTAINER=		atatat@NetBSD.org
 HOMEPAGE=		http://xaos.theory.org/
 COMMENT=		Zoomable fractal rendering doodad
 
diff --git a/x11/Xaw3d/Makefile b/x11/Xaw3d/Makefile
index b8c5970a192..7d765612f3d 100644
--- a/x11/Xaw3d/Makefile
+++ b/x11/Xaw3d/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2003/06/12 15:46:03 jschauma Exp $
+# $NetBSD: Makefile,v 1.34 2003/07/17 22:56:20 grant Exp $
 #
 
 DISTNAME=	Xaw3d-1.5
@@ -6,7 +6,7 @@ WRKSRC=		${WRKDIR}/xc/lib/Xaw3d
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XCONTRIB:=widgets/Xaw3d/R6.3/}
 
-MAINTAINER=	tech-pkg@netbsd.org
+MAINTAINER=	tech-pkg@NetBSD.org
 COMMENT=	3-D widgets based on the Athena Widget set
 
 CONFLICTS=	Xaw-Xpm-[0-9]*
diff --git a/x11/Xbae/Makefile b/x11/Xbae/Makefile
index cf0fef1f801..d4edefc66a9 100644
--- a/x11/Xbae/Makefile
+++ b/x11/Xbae/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.15 2002/08/25 21:52:27 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2003/07/17 22:56:20 grant Exp $
 #
 
 DISTNAME=	Xbae-4.9.1
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.hungry.com/pub/hungry/lesstif/srcdist/
 
-MAINTAINER=	drochner@netbsd.org
+MAINTAINER=	drochner@NetBSD.org
 HOMEPAGE=	http://www.lesstif.org/Xbae.html
 COMMENT=	Motif-compatible widgets: XbaeMatrix, XbaeCaption, XbaeInput
 
diff --git a/x11/Xrender/Makefile b/x11/Xrender/Makefile
index 6a45a4ef894..e983c1335e0 100644
--- a/x11/Xrender/Makefile
+++ b/x11/Xrender/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2003/03/29 12:42:58 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2003/07/17 22:56:20 grant Exp $
 
 DISTNAME=	fcpackage.2_1
 PKGNAME=	Xrender-${XRENDER_VERSION}
@@ -6,7 +6,7 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/Xrender
 CATEGORIES=	x11
 MASTER_SITES=	http://fontconfig.org/release/
 
-MAINTAINER=	jlam@netbsd.org
+MAINTAINER=	jlam@NetBSD.org
 HOMEPAGE=	http://fontconfig.org/
 COMMENT=	client library for the X Rendering Extension protocol
 
diff --git a/x11/asnap/Makefile b/x11/asnap/Makefile
index e5f750b3378..7468a48d5a8 100644
--- a/x11/asnap/Makefile
+++ b/x11/asnap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:42:58 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/07/17 22:56:21 grant Exp $
 
 DISTNAME=		asnap
 PKGNAME=		${DISTNAME}-1.0
@@ -6,7 +6,7 @@ WRKSRC=			${WRKDIR}
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_XCONTRIB:S/contrib/R5contrib/}
 
-MAINTAINER=		he@netbsd.org
+MAINTAINER=		he@NetBSD.org
 COMMENT=		Takes a snapshot of a region of the screen
 
 USE_IMAKE=		yes
diff --git a/x11/aterm/Makefile b/x11/aterm/Makefile
index 2363e649b86..ecd3d4a36bf 100644
--- a/x11/aterm/Makefile
+++ b/x11/aterm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2003/07/02 12:13:10 jmmv Exp $
+# $NetBSD: Makefile,v 1.12 2003/07/17 22:56:21 grant Exp $
 #
 
 DISTNAME=	aterm-0.4.2
@@ -6,7 +6,7 @@ PKGREVISION=	3
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=aterm/}
 
-MAINTAINER=	hubertf@netbsd.org
+MAINTAINER=	hubertf@NetBSD.org
 HOMEPAGE=	http://aterm.sourceforge.net/
 COMMENT=	aterm (Afterstep XVT) - a VT102 emulator for the X window system
 
diff --git a/x11/bbapm/Makefile b/x11/bbapm/Makefile
index 4348c7e627e..2e425907bb4 100644
--- a/x11/bbapm/Makefile
+++ b/x11/bbapm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2003/05/06 17:43:07 jmmv Exp $
+# $NetBSD: Makefile,v 1.6 2003/07/17 22:56:21 grant Exp $
 # based on
 #    FreeBSD port:
 #    ID: ports/x11-wm/bbapm/Makefile,v 1.5 2002/09/02 01:30:15 lioux Exp
@@ -9,7 +9,7 @@ DISTNAME=	bbapm-0.0.1
 CATEGORIES=	x11 wm
 MASTER_SITES=	http://bbtools.windsofstorm.net/sources/
 
-MAINTAINER=	jschauma@netbsd.org
+MAINTAINER=	jschauma@NetBSD.org
 HOMEPAGE=	http://bbtools.windsofstorm.net/
 COMMENT=	APM monitor for Blackbox
 
diff --git a/x11/controlcenter/Makefile b/x11/controlcenter/Makefile
index 37b0bb3daf5..3d6b46ae3d3 100644
--- a/x11/controlcenter/Makefile
+++ b/x11/controlcenter/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.49 2003/07/13 13:53:53 wiz Exp $
+# $NetBSD: Makefile,v 1.50 2003/07/17 22:56:21 grant Exp $
 
 DISTNAME=		control-center-1.4.0.4
 PKGREVISION=		3
 CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/control-center/1.4/}
 
-MAINTAINER=		jlam@netbsd.org
+MAINTAINER=		jlam@NetBSD.org
 HOMEPAGE=		http://www.gnome.org/
 COMMENT=		GNOME control-center development library
 
diff --git a/x11/dfm/Makefile b/x11/dfm/Makefile
index 11f17013fe9..003a4232836 100644
--- a/x11/dfm/Makefile
+++ b/x11/dfm/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2003/07/13 13:53:53 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2003/07/17 22:56:22 grant Exp $
 #
 
 PKGREVISION=	1
 CATEGORIES=	x11
 
-MAINTAINER=	hubertf@netbsd.org
+MAINTAINER=	hubertf@NetBSD.org
 COMMENT=	Desktop File Manager
 
 post-install:
diff --git a/x11/dtx11session/Makefile b/x11/dtx11session/Makefile
index 4bb5ede3723..84bdf8e4c5f 100644
--- a/x11/dtx11session/Makefile
+++ b/x11/dtx11session/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/07/10 11:15:55 tron Exp $
+# $NetBSD: Makefile,v 1.2 2003/07/17 22:56:22 grant Exp $
 
 DISTNAME=	dtxsession-1.0
 CATEGORIES=	x11
 MASTER_SITES=	# empty
 DISTFILES=	# empty
 
-MAINTAINER=	tron@netbsd.org
+MAINTAINER=	tron@NetBSD.org
 HOMEPAGE=	http://www.sun.com/solaris/cde/
 COMMENT=	Launch a X11 session from CDE login service
 
diff --git a/x11/dxpc/Makefile b/x11/dxpc/Makefile
index dc3b2e3c8aa..78c474c1bd5 100644
--- a/x11/dxpc/Makefile
+++ b/x11/dxpc/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.16 2003/06/02 01:15:46 jschauma Exp $
+# $NetBSD: Makefile,v 1.17 2003/07/17 22:56:22 grant Exp $
 #
 
 DISTNAME=		dxpc-3.8.1
 CATEGORIES=		x11
 MASTER_SITES=		http://www.vigor.nu/dxpc/3.8.1/
 
-MAINTAINER=		tech-pkg@netbsd.org
+MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://www.vigor.nu/dxpc/
 COMMENT=		Differential X Protocol Compressor
 
diff --git a/x11/ebuilder/Makefile b/x11/ebuilder/Makefile
index 5b83c468056..185ac1f8d10 100644
--- a/x11/ebuilder/Makefile
+++ b/x11/ebuilder/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2002/08/25 21:52:34 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2003/07/17 22:56:23 grant Exp $
 #
 
 DISTNAME=	ebuilder-0.56d
@@ -7,7 +7,7 @@ WRKSRC=		${WRKDIR}/${DISTNAME}
 CATEGORIES=	x11 devel
 MASTER_SITES=	http://web.inter.nl.net/users/eavdmeer/src/
 
-MAINTAINER=	drochner@netbsd.org
+MAINTAINER=	drochner@NetBSD.org
 HOMEPAGE=	http://web.inter.nl.net/users/eavdmeer/index.html
 COMMENT=	GUI builder for the Qt library
 
diff --git a/x11/egtk/Makefile b/x11/egtk/Makefile
index b9fed4b997d..ab8676edf64 100644
--- a/x11/egtk/Makefile
+++ b/x11/egtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2003/07/13 13:53:53 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2003/07/17 22:56:23 grant Exp $
 #
 
 DISTNAME=	eGTK_0.3.4
@@ -8,7 +8,7 @@ WRKSRC=		${WRKDIR}/eGTK
 CATEGORIES=	x11
 MASTER_SITES=	http://www.netlabs.net/hp/richieb/downloads/
 
-MAINTAINER=	jlam@netbsd.org
+MAINTAINER=	jlam@NetBSD.org
 HOMEPAGE=	http://www.netlabs.net/hp/richieb/gtk_eiffel.html
 COMMENT=	Eiffel/GTK+ interface for SmallEiffel
 
diff --git a/x11/eterm/Makefile b/x11/eterm/Makefile
index 3dd785db32e..bb1de37a07a 100644
--- a/x11/eterm/Makefile
+++ b/x11/eterm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2003/07/13 13:53:54 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2003/07/17 22:56:24 grant Exp $
 #
 
 DISTNAME=		Eterm-0.9.2
@@ -13,7 +13,7 @@ SITES_Eterm-bg-scale-1.tar.gz= ${MASTER_SITE_BACKUP}
 SITES_Eterm-bg-scale-2.tar.gz= ${MASTER_SITE_BACKUP}
 SITES_Eterm-bg-tile.tar.gz=    ${MASTER_SITE_BACKUP}
 
-MAINTAINER=		tech-pkg@netbsd.org
+MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://www.eterm.org/
 COMMENT=		Enlightened terminal emulator for the X Window System
 
diff --git a/x11/filerunner/Makefile b/x11/filerunner/Makefile
index 580bc6dc620..9aa36eda18e 100644
--- a/x11/filerunner/Makefile
+++ b/x11/filerunner/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2003/06/02 01:15:45 jschauma Exp $
+# $NetBSD: Makefile,v 1.18 2003/07/17 22:56:24 grant Exp $
 # $FreeBSD Id: Makefile,v 1.12 1998/02/24 21:43:11 jseger Exp
 #
 
@@ -7,7 +7,7 @@ PKGNAME=	filerunner-2.4.2
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SUNSITE:=X11/desktop/}
 
-MAINTAINER=	tech-pkg@netbsd.org
+MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.cd.chalmers.se/~hch/filerunner.html
 COMMENT=	Filemanager with FTP capabilities. Uses Tcl/Tk
 
diff --git a/x11/fltk/Makefile b/x11/fltk/Makefile
index 6d4016a47e4..f1f3baf86d4 100644
--- a/x11/fltk/Makefile
+++ b/x11/fltk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2003/03/09 19:28:15 jschauma Exp $
+# $NetBSD: Makefile,v 1.29 2003/07/17 22:56:24 grant Exp $
 #
 
 DISTNAME=	fltk-1.0.11-source
@@ -15,7 +15,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=fltk/} \
 		ftp://ftp.kddlabs.co.jp/pub/lang/fltk/${VERS}/
 EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=	jlam@netbsd.org
+MAINTAINER=	jlam@NetBSD.org
 HOMEPAGE=	http://www.fltk.org/
 COMMENT=	Fast Light Tool Kit for graphical user interfaces
 
diff --git a/x11/fox/Makefile b/x11/fox/Makefile
index 05437dbfc58..2b9c244da91 100644
--- a/x11/fox/Makefile
+++ b/x11/fox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2003/03/09 19:28:16 jschauma Exp $
+# $NetBSD: Makefile,v 1.12 2003/07/17 22:56:24 grant Exp $
 # FreeBSD Id: ports/x11-toolkits/fox/Makefile,v 1.14 2001/02/23 19:00:05 knu Exp
 
 DISTNAME=	fox-0.99.174
@@ -7,7 +7,7 @@ CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.cfdrc.com/pub/FOX/ \
 		ftp://SunSITE.Informatik.RWTH-Aachen.DE/pub/Linux/fox/
 
-MAINTAINER=	sakamoto@netbsd.org
+MAINTAINER=	sakamoto@NetBSD.org
 HOMEPAGE=	http://www.cfdrc.com/FOX/fox.html
 COMMENT=	Fast and extensive C++ GUI toolkit
 
diff --git a/x11/gdkxft/Makefile b/x11/gdkxft/Makefile
index b439b527fd8..2e57f3834af 100644
--- a/x11/gdkxft/Makefile
+++ b/x11/gdkxft/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2003/07/13 13:53:54 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2003/07/17 22:56:25 grant Exp $
 #
 
 DISTNAME=		gdkxft-1.5
@@ -6,7 +6,7 @@ PKGREVISION=		3
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=gdkxft/}
 
-MAINTAINER=		tech-pkg@netbsd.org
+MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://gdkxft.sourceforge.net/
 COMMENT=		transparently add anti-aliased font support to gtk+ applications
 
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index f6607133a37..2187c58b1e7 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2003/07/13 13:53:54 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2003/07/17 22:56:25 grant Exp $
 
 DISTNAME=	gdm-2.2.0
 PKGREVISION=	4
@@ -7,7 +7,7 @@ MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gdm/2.2/} \
 		${MASTER_SITE_LOCAL}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} Daemon.README Daemon.png
 
-MAINTAINER=	mjl@netbsd.org
+MAINTAINER=	mjl@NetBSD.org
 HOMEPAGE=	http://www.gnome.org/
 COMMENT=	Gnome Display Manager - a re-implementation of the xdm program
 
diff --git a/x11/gnome--/Makefile b/x11/gnome--/Makefile
index 6bcfcdd6c92..ebb07f49dfe 100644
--- a/x11/gnome--/Makefile
+++ b/x11/gnome--/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2003/07/13 13:53:55 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2003/07/17 22:56:25 grant Exp $
 #
 
 DISTNAME=	gnomemm-1.2.2
@@ -7,7 +7,7 @@ PKGREVISION=	3
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gtkmm/}
 
-MAINTAINER=	tech-pkg@netbsd.org
+MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://gtkmm.sourceforge.net/
 COMMENT=	C++ binding for the GNOME libraries
 
diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile
index a7d46b393c8..4f3851e52e6 100644
--- a/x11/gnome-applets/Makefile
+++ b/x11/gnome-applets/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2003/07/13 13:53:55 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2003/07/17 22:56:26 grant Exp $
 #
 
 DISTNAME=		gnome-applets-1.4.0.4
@@ -7,7 +7,7 @@ CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-applets/1.4/}
 EXTRACT_SUFX=		.tar.bz2
 
-MAINTAINER=		tech-pkg@netbsd.org
+MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://www.gnome.org/
 COMMENT=		Applets for GNOME
 
diff --git a/x11/gnome-core/Makefile.common b/x11/gnome-core/Makefile.common
index 8833eac908b..25cd3059002 100644
--- a/x11/gnome-core/Makefile.common
+++ b/x11/gnome-core/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2003/05/02 12:16:04 wiz Exp $
+# $NetBSD: Makefile.common,v 1.4 2003/07/17 22:56:26 grant Exp $
 #
 
 DISTNAME=		gnome-core-1.4.2
@@ -6,7 +6,7 @@ CATEGORIES?=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-core/1.4/}
 EXTRACT_SUFX=		.tar.bz2
 
-MAINTAINER?=		rh@netbsd.org
+MAINTAINER?=		rh@NetBSD.org
 HOMEPAGE?=		http://www.gnome.org/
 
 BUILD_USES_MSGFMT=	YES
diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index 331fad5757a..322dc9ad969 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2003/07/13 13:53:55 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2003/07/17 22:56:26 grant Exp $
 #
 
 DISTNAME=		gnome-desktop-2.2.0.1
@@ -7,7 +7,7 @@ CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-desktop/2.2/}
 EXTRACT_SUFX=		.tar.bz2
 
-MAINTAINER=		jmmv@netbsd.org
+MAINTAINER=		jmmv@NetBSD.org
 HOMEPAGE=		http://www.gnome.org/
 COMMENT=		Common GNOME2 desktop files and libgnome-desktop library
 
diff --git a/x11/gnome-gkrellm/Makefile b/x11/gnome-gkrellm/Makefile
index 6107ba7b1da..ee3f94bff5d 100644
--- a/x11/gnome-gkrellm/Makefile
+++ b/x11/gnome-gkrellm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2003/07/13 13:53:56 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2003/07/17 22:56:27 grant Exp $
 
 DISTNAME=	gkrellm-gnome
 PKGNAME=	gnome-gkrellm-0.1
@@ -6,7 +6,7 @@ PKGREVISION=	3
 CATEGORIES=	gnome sysutils
 MASTER_SITES=	http://web.wt.net/~billw/gkrellm/Plugins/
 
-MAINTAINER=	damon@netbsd.org
+MAINTAINER=	damon@NetBSD.org
 HOMEPAGE=	http://web.wt.net/~billw/gkrellm/Plugins.html
 COMMENT=	gkrellm gnome plugin
 
diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile
index 23856969a0b..447598c76b2 100644
--- a/x11/gnome-libs/Makefile
+++ b/x11/gnome-libs/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.88 2003/07/13 13:53:56 wiz Exp $
+# $NetBSD: Makefile,v 1.89 2003/07/17 22:56:27 grant Exp $
 
 DISTNAME=		gnome-libs-1.4.1.4
 PKGREVISION=		6
 CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-libs/1.4/}
 
-MAINTAINER=		tron@netbsd.org
+MAINTAINER=		tron@NetBSD.org
 HOMEPAGE=		http://www.gnome.org/
 COMMENT=		Libraries for the GNU Network Object Model Environment
 
diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index 772a0f2d714..7389580afd6 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2003/07/13 13:53:56 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2003/07/17 22:56:27 grant Exp $
 #
 
 DISTNAME=		gnome-panel-2.2.2.2
@@ -7,7 +7,7 @@ CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-panel/2.2/}
 EXTRACT_SUFX=		.tar.bz2
 
-MAINTAINER=		jmmv@netbsd.org
+MAINTAINER=		jmmv@NetBSD.org
 HOMEPAGE=		http://www.gnome.org/
 COMMENT=		GNOME2 panel application
 
diff --git a/x11/gnome-python/Makefile b/x11/gnome-python/Makefile
index 8f01c16af87..43bf714681e 100644
--- a/x11/gnome-python/Makefile
+++ b/x11/gnome-python/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2003/07/13 13:53:57 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2003/07/17 22:56:27 grant Exp $
 
 DISTNAME=		gnome-python-1.4.4
 PKGNAME=		${PYPKGPREFIX}-gnome-1.4.4
@@ -6,7 +6,7 @@ PKGREVISION=		2
 CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-python/1.4/}
 
-MAINTAINER=		drochner@netbsd.org
+MAINTAINER=		drochner@NetBSD.org
 HOMEPAGE=		http://www.daa.com.au/~james/gnome/
 COMMENT=		Python Bindings for the GNU Network Object Model Environment
 
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index 27eeff7b8d0..6f99ab7bdd5 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2003/07/13 13:53:57 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2003/07/17 22:56:28 grant Exp $
 #
 
 DISTNAME=		gnome-session-2.2.1
@@ -7,7 +7,7 @@ CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-session/2.2/}
 EXTRACT_SUFX=		.tar.bz2
 
-MAINTAINER=		jmmv@netbsd.org
+MAINTAINER=		jmmv@NetBSD.org
 HOMEPAGE=		http://www.gnome.org/
 COMMENT=		GNOME2 session management utilities
 
diff --git a/x11/gnome-users-guide/Makefile b/x11/gnome-users-guide/Makefile
index e53157b009f..0b23238b532 100644
--- a/x11/gnome-users-guide/Makefile
+++ b/x11/gnome-users-guide/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2003/05/02 11:57:02 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2003/07/17 22:56:28 grant Exp $
 
 DISTNAME=	users-guide-1.2
 PKGNAME=	gnome-users-guide-1.2
@@ -6,7 +6,7 @@ PKGREVISION=	2
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/users-guide/1.2/}
 
-MAINTAINER=	tron@netbsd.org
+MAINTAINER=	tron@NetBSD.org
 HOMEPAGE=	http://www.gnome.org/users-guide/project.shtml
 COMMENT=	User documentation for GNOME
 
diff --git a/x11/gnome2-applets/Makefile b/x11/gnome2-applets/Makefile
index 21c74189924..8c98dba2ace 100644
--- a/x11/gnome2-applets/Makefile
+++ b/x11/gnome2-applets/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/07/13 13:53:58 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2003/07/17 22:56:28 grant Exp $
 #
 
 DISTNAME=		gnome-applets-2.2.1
@@ -7,7 +7,7 @@ CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-applets/2.2/}
 EXTRACT_SUFX=		.tar.bz2
 
-MAINTAINER=		tech-pkg@netbsd.org
+MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://www.gnome.org/
 COMMENT=		GNOME2 panel applets
 
diff --git a/x11/gnome2-control-center/Makefile b/x11/gnome2-control-center/Makefile
index 15d29c81683..1dec3557c07 100644
--- a/x11/gnome2-control-center/Makefile
+++ b/x11/gnome2-control-center/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2003/07/13 13:53:58 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2003/07/17 22:56:29 grant Exp $
 #
 
 DISTNAME=	control-center-2.2.1
@@ -8,7 +8,7 @@ CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/control-center/2.2/}
 EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=	jmmv@netbsd.org
+MAINTAINER=	jmmv@NetBSD.org
 HOMEPAGE=	http://www.gnome.org/
 COMMENT=	GNOME2 configuration utility
 
diff --git a/x11/gnustep-back/Makefile b/x11/gnustep-back/Makefile
index 08e4d93087a..01cb2f20a4a 100644
--- a/x11/gnustep-back/Makefile
+++ b/x11/gnustep-back/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/07/13 13:54:00 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2003/07/17 22:56:29 grant Exp $
 #
 
 DISTNAME=	gnustep-back-0.8.5
@@ -6,7 +6,7 @@ PKGREVISION=	2
 CATEGORIES=	x11 gnustep
 MASTER_SITES=	${MASTER_SITE_GNUSTEP:=core/}
 
-MAINTAINER=	rh@netbsd.org
+MAINTAINER=	rh@NetBSD.org
 HOMEPAGE=	http://www.gnustep.org/
 COMMENT=	AppKit backend for GNUstep
 
diff --git a/x11/gnustep-gui/Makefile b/x11/gnustep-gui/Makefile
index 257fa950813..68f28fe46a3 100644
--- a/x11/gnustep-gui/Makefile
+++ b/x11/gnustep-gui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/07/13 13:54:01 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2003/07/17 22:56:29 grant Exp $
 #
 
 DISTNAME=	gnustep-gui-0.8.5
@@ -6,7 +6,7 @@ PKGREVISION=	2
 CATEGORIES=	x11 gnustep
 MASTER_SITES=	${MASTER_SITE_GNUSTEP:=core/}
 
-MAINTAINER=	rh@netbsd.org
+MAINTAINER=	rh@NetBSD.org
 HOMEPAGE=	http://www.gnustep.org/
 COMMENT=	GNUstep AppKit Implementation
 
diff --git a/x11/gnustep-preferences/Makefile b/x11/gnustep-preferences/Makefile
index 8921e6497ac..54f4f7774b2 100644
--- a/x11/gnustep-preferences/Makefile
+++ b/x11/gnustep-preferences/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/07/13 13:54:01 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2003/07/17 22:56:29 grant Exp $
 #
 
 DISTNAME=	Preferences-1.2.0
@@ -8,7 +8,7 @@ CATEGORIES=	x11 gnustep
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=prefsapp/}
 EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=	tech-pkg@netbsd.org
+MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://prefsapp.sourceforge.net/
 COMMENT=	Application for setting preferences for the GNUstep system
 
diff --git a/x11/gtk+extra/Makefile b/x11/gtk+extra/Makefile
index 906e8999180..a5fe74834f1 100644
--- a/x11/gtk+extra/Makefile
+++ b/x11/gtk+extra/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2003/07/13 13:54:01 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2003/07/17 22:56:30 grant Exp $
 #
 
 DISTNAME=	gtk+extra-0.99.17
@@ -6,7 +6,7 @@ PKGREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	http://gtkextra.sourceforge.net/src/
 
-MAINTAINER=	rh@netbsd.org
+MAINTAINER=	rh@NetBSD.org
 HOMEPAGE=	http://gtkextra.sourceforge.net/
 COMMENT=	useful set of GTK+ widgets for creating GUIs
 
diff --git a/x11/gtk-engines/Makefile b/x11/gtk-engines/Makefile
index fc1b613fae7..f22761e19a2 100644
--- a/x11/gtk-engines/Makefile
+++ b/x11/gtk-engines/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.16 2003/07/13 13:54:02 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2003/07/17 22:56:30 grant Exp $
 
 DISTNAME=		gtk-engines-0.12
 PKGREVISION=		4
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gtk-engines/0.12/}
 
-MAINTAINER=		tron@netbsd.org
+MAINTAINER=		tron@NetBSD.org
 HOMEPAGE=		http://www.gnome.org/
 COMMENT=		Theme engines for GTK+
 
diff --git a/x11/gtk/Makefile b/x11/gtk/Makefile
index b3b48e8c793..9fd901c4ae4 100644
--- a/x11/gtk/Makefile
+++ b/x11/gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.86 2003/07/13 13:54:03 wiz Exp $
+# $NetBSD: Makefile,v 1.87 2003/07/17 22:56:30 grant Exp $
 
 DISTNAME=		gtk+-1.2.10
 PKGREVISION=		5
@@ -7,7 +7,7 @@ MASTER_SITES=		ftp://ftp.gtk.org/pub/gtk/v1.2/ \
 			ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.2/ \
 			${MASTER_SITE_GNOME:=sources/gtk+/1.2/}
 
-MAINTAINER=		tech-pkg@netbsd.org
+MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://www.gtk.org/
 COMMENT=		Gimp toolkit. Libraries for building X11 user interfaces
 
diff --git a/x11/gtk2-engines/Makefile b/x11/gtk2-engines/Makefile
index db81799cf50..17912b29fc1 100644
--- a/x11/gtk2-engines/Makefile
+++ b/x11/gtk2-engines/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2003/07/13 13:54:03 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2003/07/17 22:56:31 grant Exp $
 #
 
 DISTNAME=		gtk-engines-2.2.0
@@ -8,7 +8,7 @@ CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gtk-engines/2.2/}
 EXTRACT_SUFX=		.tar.bz2
 
-MAINTAINER=		jmmv@netbsd.org
+MAINTAINER=		jmmv@NetBSD.org
 HOMEPAGE=		http://www.gnome.org/
 COMMENT=		Theme engines for GTK+ version 2
 
diff --git a/x11/gtk2/Makefile b/x11/gtk2/Makefile
index 29a51ead43a..2f9492b1f09 100644
--- a/x11/gtk2/Makefile
+++ b/x11/gtk2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2003/07/13 13:54:03 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2003/07/17 22:56:30 grant Exp $
 #
 
 DISTNAME=		gtk+-2.2.2
@@ -10,7 +10,7 @@ MASTER_SITES=		ftp://ftp.gtk.org/pub/gtk/v2.2/ \
 			${MASTER_SITE_GNOME:=sources/gtk+/2.2/}
 EXTRACT_SUFX=		.tar.bz2
 
-MAINTAINER=		tech-pkg@netbsd.org
+MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://www.gtk.org/
 COMMENT=		Gimp toolkit. Libraries for building X11 user interfaces
 
diff --git a/x11/gtkglarea/Makefile b/x11/gtkglarea/Makefile
index b3ca7a08953..b3fc8b63080 100644
--- a/x11/gtkglarea/Makefile
+++ b/x11/gtkglarea/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.29 2003/07/13 13:54:04 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2003/07/17 22:56:31 grant Exp $
 
 DISTNAME=		gtkglarea-1.2.2
 PKGREVISION=		3
 CATEGORIES=		x11 graphics
 MASTER_SITES=		http://www.student.oulu.fi/~jlof/gtkglarea/download/
 
-MAINTAINER=		hubertf@netbsd.org
+MAINTAINER=		hubertf@NetBSD.org
 HOMEPAGE=		http://www.student.oulu.fi/~jlof/gtkglarea/
 COMMENT=		OpenGL/Mesa widget for GTK+ GUI toolkit
 
diff --git a/x11/gtkmm/Makefile b/x11/gtkmm/Makefile
index eb615384640..73302ae4080 100644
--- a/x11/gtkmm/Makefile
+++ b/x11/gtkmm/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.8 2003/07/16 15:35:25 adam Exp $
+# $NetBSD: Makefile,v 1.9 2003/07/17 22:56:31 grant Exp $
 #
 
 DISTNAME=	gtkmm-2.2.3
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gtkmm/}
 
-MAINTAINER=	adam@netbsd.org
+MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://www.gtkmm.org/
 COMMENT=	C++ interface to Gtk+ v2
 
diff --git a/x11/gtkstep/Makefile b/x11/gtkstep/Makefile
index a68ef9c2cbf..ab8d9c70610 100644
--- a/x11/gtkstep/Makefile
+++ b/x11/gtkstep/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2003/07/13 13:54:05 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2003/07/17 22:56:32 grant Exp $
 
 DISTNAME=		gtkstep-1.10
 PKGREVISION=		3
@@ -6,7 +6,7 @@ CATEGORIES=		x11
 MASTER_SITES=		http://ulli.linuxave.net/gtkstep/
 EXTRACT_SUFX=		.tar.bz2
 
-MAINTAINER=		jlam@netbsd.org
+MAINTAINER=		jlam@NetBSD.org
 HOMEPAGE=		http://ulli.linuxave.net/gtkstep/index.html
 COMMENT=		GTK theme-engine to yield a NEXTSTEP(tm) look and feel
 
diff --git a/x11/gtoolkit/Makefile.common b/x11/gtoolkit/Makefile.common
index c207ba9fccc..ab5f64405cd 100644
--- a/x11/gtoolkit/Makefile.common
+++ b/x11/gtoolkit/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.5 2003/06/23 14:23:14 jschauma Exp $
+# $NetBSD: Makefile.common,v 1.6 2003/07/17 22:56:32 grant Exp $
 #
 
 DISTNAME=		gtoolkit-0.9.5
@@ -6,7 +6,7 @@ PKGREVISION=		1
 CATEGORIES?=		x11
 MASTER_SITES?=		ftp://ftp.inf.uos.de/pub/elmar/gtk/objc-gtoolkit/
 
-MAINTAINER?=		tech-pkg@netbsd.org
+MAINTAINER?=		tech-pkg@NetBSD.org
 HOMEPAGE?=		http://www.informatik.uni-osnabrueck.de/elmar/projects/gtoolkit/
 
 GNU_CONFIGURE=		YES
diff --git a/x11/hanterm/Makefile b/x11/hanterm/Makefile
index c2292d4f4a8..f3a7c4efa80 100644
--- a/x11/hanterm/Makefile
+++ b/x11/hanterm/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.7 2003/06/02 01:15:43 jschauma Exp $
+# $NetBSD: Makefile,v 1.8 2003/07/17 22:56:32 grant Exp $
 
 DISTNAME=	hanterm-3.1.6
 PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://hanterm.org/download/
 
-MAINTAINER=	tech-pkg@netbsd.org
+MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://hanterm.org/
 COMMENT=	X11R6-based xterm hacked for managing Korean languages
 
diff --git a/x11/hot-babe/Makefile b/x11/hot-babe/Makefile
index 1da467ace03..56b6eba57c3 100644
--- a/x11/hot-babe/Makefile
+++ b/x11/hot-babe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2003/07/13 13:54:05 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2003/07/17 22:56:32 grant Exp $
 #
 
 DISTNAME=	hot-babe-0.1.2
@@ -6,7 +6,7 @@ PKGREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	http://dindinx.net/hotbabe/downloads/
 
-MAINTAINER=	hubertf@netbsd.org
+MAINTAINER=	hubertf@NetBSD.org
 HOMEPAGE=	http://dindinx.net/hotbabe/
 COMMENT=	System monitor
 
diff --git a/x11/imwheel/Makefile b/x11/imwheel/Makefile
index a995935820c..a9f5e3dfdd7 100644
--- a/x11/imwheel/Makefile
+++ b/x11/imwheel/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.4 2002/08/25 21:52:39 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2003/07/17 22:56:33 grant Exp $
 #
 
 DISTNAME=	imwheel-0.9.9
 CATEGORIES=	x11
 MASTER_SITES=	http://jonatkins.org/imwheel/files/
 
-MAINTAINER=	zuntum@netbsd.org
+MAINTAINER=	zuntum@NetBSD.org
 HOMEPAGE=	http://jcatki.dhs.org/imwheel/
 COMMENT=	tool which helps to use mousewheels
 
diff --git a/x11/kde/Makefile b/x11/kde/Makefile
index 5685ef95eea..ea9f22d91e4 100644
--- a/x11/kde/Makefile
+++ b/x11/kde/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2003/06/02 01:15:42 jschauma Exp $
+# $NetBSD: Makefile,v 1.32 2003/07/17 22:56:33 grant Exp $
 #
 
 DISTNAME=	kde-1.1.2
@@ -7,7 +7,7 @@ CATEGORIES=	x11 kde
 MASTER_SITES=	# empty
 DISTFILES=	# empty
 
-MAINTAINER=	tech-pkg@netbsd.org
+MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.kde.org/
 COMMENT=	"meta-package" for the KDE integrated X11 desktop
 
diff --git a/x11/kde2/Makefile b/x11/kde2/Makefile
index f992028e412..b1107d6e911 100644
--- a/x11/kde2/Makefile
+++ b/x11/kde2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2003/07/13 17:56:09 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2003/07/17 22:56:33 grant Exp $
 
 DISTNAME=	kde-2.2.2
 PKGREVISION=	7
@@ -6,7 +6,7 @@ CATEGORIES=	x11 kde
 MASTER_SITES=	# empty
 DISTFILES=	# empty
 
-MAINTAINER=	tech-pkg@netbsd.org
+MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.kde.org/
 COMMENT=	"meta-package" for the KDE integrated X11 desktop
 
diff --git a/x11/kde3/Makefile b/x11/kde3/Makefile
index fc2532cf0d8..be1d315c55a 100644
--- a/x11/kde3/Makefile
+++ b/x11/kde3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2003/07/13 17:54:29 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2003/07/17 22:56:33 grant Exp $
 
 DISTNAME=	kde-3.1.2
 PKGREVISION=	1
@@ -6,7 +6,7 @@ CATEGORIES=	x11 kde
 MASTER_SITES=	# empty
 DISTFILES=	# empty
 
-MAINTAINER=	skrll@netbsd.org
+MAINTAINER=	skrll@NetBSD.org
 HOMEPAGE=	http://www.kde.org/
 COMMENT=	"meta-package" for the KDE integrated X11 desktop
 
diff --git a/x11/kde3/Makefile.kde3 b/x11/kde3/Makefile.kde3
index cf01e9ce16f..9d8a12c20a3 100644
--- a/x11/kde3/Makefile.kde3
+++ b/x11/kde3/Makefile.kde3
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.kde3,v 1.11 2003/05/22 02:42:39 markd Exp $
+# $NetBSD: Makefile.kde3,v 1.12 2003/07/17 22:56:34 grant Exp $
 #
 # This Makefile fragment is included at the top of package Makefiles for
 # KDE3-distributed packages (they all share common configure and build
@@ -12,7 +12,7 @@ MASTER_SITES_KDE=	ftp://ftp.kde.org/pub/kde/stable/${_KDE_VERSION}/src/ \
 MASTER_SITES?=	${MASTER_SITES_KDE}
 EXTRACT_SUFX?=	.tar.bz2
 
-MAINTAINER?=	skrll@netbsd.org
+MAINTAINER?=	skrll@NetBSD.org
 HOMEPAGE?=	http://www.kde.org/
 
 USE_GMAKE=		YES
diff --git a/x11/kdebase/Makefile b/x11/kdebase/Makefile
index c39fd54af57..cf2dfed954b 100644
--- a/x11/kdebase/Makefile
+++ b/x11/kdebase/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.90 2003/07/13 13:54:22 wiz Exp $
+# $NetBSD: Makefile,v 1.91 2003/07/17 22:56:34 grant Exp $
 # FreeBSD Id: Makefile,v 1.6 1997/11/27 00:35:27 se Exp
 
 DISTNAME=	kdebase-1.1.2
@@ -8,7 +8,7 @@ MASTER_SITES=	${MASTER_SITE_LOCAL}/kde1
 EXTRACT_SUFX=	.tar.bz2
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} Daemon.png Daemon.README
 
-MAINTAINER=	tron@netbsd.org
+MAINTAINER=	tron@NetBSD.org
 HOMEPAGE=       http://www.kde.org/
 COMMENT=	Base modules for the KDE integrated X11 desktop
 
diff --git a/x11/kdelibs/Makefile b/x11/kdelibs/Makefile
index f4718d91d38..ffc057b1318 100644
--- a/x11/kdelibs/Makefile
+++ b/x11/kdelibs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.64 2003/06/02 01:15:42 jschauma Exp $
+# $NetBSD: Makefile,v 1.65 2003/07/17 22:56:34 grant Exp $
 # FreeBSD Id: Makefile,v 1.5 1997/11/27 00:25:46 se Exp
 #
 
@@ -8,7 +8,7 @@ CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_LOCAL}/kde1
 EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=	tech-pkg@netbsd.org
+MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=       http://www.kde.org/
 COMMENT=	Support libraries for the KDE integrated X11 desktop
 
diff --git a/x11/keylaunch/Makefile b/x11/keylaunch/Makefile
index 00a73b28aa9..7ad333ff1a3 100644
--- a/x11/keylaunch/Makefile
+++ b/x11/keylaunch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/06/02 01:15:41 jschauma Exp $
+# $NetBSD: Makefile,v 1.5 2003/07/17 22:56:35 grant Exp $
 #
 
 DISTNAME=	keylaunch-1.3.0
@@ -6,7 +6,7 @@ WRKSRC=		${WRKDIR}/keylaunch
 CATEGORIES=	x11
 MASTER_SITES=	http://www.kensden.pwp.blueyonder.co.uk/Oroborus/files/
 
-MAINTAINER=	tech-pkg@netbsd.org
+MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.kensden.pwp.blueyonder.co.uk/Oroborus/download.htm
 COMMENT=	X utility for binding commands to a hot key
 
diff --git a/x11/kterm/Makefile b/x11/kterm/Makefile
index 42a14156856..74145a59f8b 100644
--- a/x11/kterm/Makefile
+++ b/x11/kterm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2003/07/13 13:54:25 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2003/07/17 22:56:35 grant Exp $
 
 DISTNAME=	kterm-6.2.0
 PKGREVISION=	3
@@ -10,7 +10,7 @@ PATCH_SITES=	ftp://ftp.kame.net/pub/kame/misc/
 PATCHFILES+=	kterm-620-0213-20010706.diff.gz
 PATCH_DIST_STRIP= -p1
 
-MAINTAINER=	sakamoto@netbsd.org
+MAINTAINER=	sakamoto@NetBSD.org
 COMMENT=	Multi-lingual terminal emulator for X
 
 USE_BUILDLINK2=	YES
diff --git a/x11/lablgtk/Makefile b/x11/lablgtk/Makefile
index cac5f2066f2..89e804b073f 100644
--- a/x11/lablgtk/Makefile
+++ b/x11/lablgtk/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.7 2003/07/13 13:54:26 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2003/07/17 22:56:35 grant Exp $
 
 DISTNAME=	lablgtk-1.2.5
 PKGREVISION=	3
 CATEGORIES=	x11
 MASTER_SITES=	http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/
 
-MAINTAINER=	dillo@netbsd.org
+MAINTAINER=	dillo@NetBSD.org
 HOMEPAGE=	http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgtk.html
 COMMENT=	GTK+ bindings for ocaml
 
diff --git a/x11/lesstif/Makefile b/x11/lesstif/Makefile
index 95cba1f45f3..343a023c4c5 100644
--- a/x11/lesstif/Makefile
+++ b/x11/lesstif/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2002/12/05 19:10:42 drochner Exp $
+# $NetBSD: Makefile,v 1.64 2003/07/17 22:56:35 grant Exp $
 
 DISTNAME=		lesstif-0.93.36
 CATEGORIES=		x11
@@ -9,7 +9,7 @@ MASTER_SITES=		ftp://ftp.hungry.com/pub/hungry/lesstif/srcdist/ \
 			http://gd.tuwien.ac.at/hci/lesstif/srcdist/ \
 			http://www.damtp.cam.ac.uk/mirror/ftp.hungry.com/pub/hungry/lesstif/srcdist/
 
-MAINTAINER=		jlam@netbsd.org
+MAINTAINER=		jlam@NetBSD.org
 HOMEPAGE=		http://www.lesstif.org/
 COMMENT=	API compatible clone of the OSF/Motif toolkit
 
diff --git a/x11/lesstif12/Makefile.common b/x11/lesstif12/Makefile.common
index 5a052291749..ac5276c5212 100644
--- a/x11/lesstif12/Makefile.common
+++ b/x11/lesstif12/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1 2002/12/05 18:49:56 drochner Exp $
+# $NetBSD: Makefile.common,v 1.2 2003/07/17 22:56:36 grant Exp $
 
 DISTNAME=		lesstif-${LESSTIF_VERSION}
 LESSTIF_VERSION=	0.93.0
@@ -10,7 +10,7 @@ MASTER_SITES=		ftp://ftp.hungry.com/pub/hungry/lesstif/srcdist/ \
 			http://gd.tuwien.ac.at/hci/lesstif/srcdist/ \
 			http://www.damtp.cam.ac.uk/mirror/ftp.hungry.com/pub/hungry/lesstif/srcdist/
 
-MAINTAINER=		jlam@netbsd.org
+MAINTAINER=		jlam@NetBSD.org
 HOMEPAGE=		http://www.lesstif.org/
 
 USE_X11BASE=		# defined
diff --git a/x11/mlterm/Makefile b/x11/mlterm/Makefile
index 74541265514..ae700a07579 100644
--- a/x11/mlterm/Makefile
+++ b/x11/mlterm/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.15 2003/07/13 13:54:27 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2003/07/17 22:56:36 grant Exp $
 
 DISTNAME=	mlterm-2.7.0
 PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mlterm/}
 
-MAINTAINER=	uebayasi@netbsd.org
+MAINTAINER=	uebayasi@NetBSD.org
 HOMEPAGE=	http://mlterm.sourceforge.net/
 COMMENT=	Multilingual terminal emulator
 
diff --git a/x11/modeline/Makefile b/x11/modeline/Makefile
index c8890d516e2..2d4cf8b6ac2 100644
--- a/x11/modeline/Makefile
+++ b/x11/modeline/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2003/06/02 01:15:41 jschauma Exp $
+# $NetBSD: Makefile,v 1.8 2003/07/17 22:56:36 grant Exp $
 
 DISTNAME=		modeline_vfr.c
 PKGNAME=		modeline-20001121
@@ -7,7 +7,7 @@ CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_LOCAL}
 EXTRACT_SUFX=		# empty
 
-MAINTAINER=		tech-pkg@netbsd.org
+MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://www.dkfz-heidelberg.de/spec/linux/modeline/
 COMMENT=		calculates XF86 Modelines to configure your monitor for X11R6
 
diff --git a/x11/mowitz/Makefile b/x11/mowitz/Makefile
index 09ad988247b..8bd6ae644ae 100644
--- a/x11/mowitz/Makefile
+++ b/x11/mowitz/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2003/06/02 01:15:41 jschauma Exp $
+# $NetBSD: Makefile,v 1.4 2003/07/17 22:56:37 grant Exp $
 
 DISTNAME=	Mowitz-0.2.2
 CATEGORIES=	x11
 MASTER_SITES=	ftp://siag.nu/pub/mowitz/
 
-MAINTAINER=	tech-pkg@netbsd.org
+MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://siag.nu/mowitz/
 COMMENT=	"More widgets" library
 
diff --git a/x11/multi-gnome-terminal/Makefile b/x11/multi-gnome-terminal/Makefile
index 476bef83f7f..8cf080dff5c 100644
--- a/x11/multi-gnome-terminal/Makefile
+++ b/x11/multi-gnome-terminal/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.12 2003/07/13 13:54:27 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2003/07/17 22:56:37 grant Exp $
 
 DISTNAME=	multi-gnome-terminal-1.6.1
 PKGREVISION=	3
 CATEGORIES=	gnome x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=multignometerm/}
 
-MAINTAINER=	damon@netbsd.org
+MAINTAINER=	damon@NetBSD.org
 HOMEPAGE=	http://multignometerm.sourceforge.net/
 COMMENT=	Gnome tabbed terminal emulator
 
diff --git a/x11/neXtaw/Makefile b/x11/neXtaw/Makefile
index f89b0d601ed..b7cb9cf8134 100644
--- a/x11/neXtaw/Makefile
+++ b/x11/neXtaw/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.8 2003/06/02 14:05:08 abs Exp $
+# $NetBSD: Makefile,v 1.9 2003/07/17 22:56:37 grant Exp $
 
 DISTNAME=	neXtaw-0.14.0
 CATEGORIES=	x11
 MASTER_SITES=	http://siag.nu/pub/neXtaw/
 
-MAINTAINER=	tech-pkg@netbsd.org
+MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://siag.nu/neXtaw/
 COMMENT=	NeXTstep-like widgets based on the Athena Widget set
 
diff --git a/x11/openmotif/Makefile b/x11/openmotif/Makefile
index 86ee6c41e72..8b5f74ccb64 100644
--- a/x11/openmotif/Makefile
+++ b/x11/openmotif/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2003/06/02 01:15:40 jschauma Exp $
+# $NetBSD: Makefile,v 1.19 2003/07/17 22:56:38 grant Exp $
 # FreeBSD: /c/ncvs/ports/x11-toolkits/open-motif/Makefile,v 1.18 2000/10/09 01:40:02 asami Exp
 # OpenBSD: Makefile,v 1.5 2000/10/23 16:08:12 espie Exp
 
@@ -17,7 +17,7 @@ PATCH_SITES=		${MOTIF_SITES:=fixes/}
 PATCHFILES=		patch1 patch2 patch3 patch4 patch5
 PATCH_DIST_STRIP=	-p1
 
-MAINTAINER=		tech-pkg@netbsd.org
+MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://www.opengroup.org/openmotif/
 COMMENT=		Open Motif
 
diff --git a/x11/p5-Tk/Makefile b/x11/p5-Tk/Makefile
index e59dcb6dad2..7dc95e8ecea 100644
--- a/x11/p5-Tk/Makefile
+++ b/x11/p5-Tk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2003/03/29 12:43:08 jmmv Exp $
+# $NetBSD: Makefile,v 1.34 2003/07/17 22:56:38 grant Exp $
 # FreeBSD Id: Makefile,v 1.14 1997/09/14 04:00:00 jfitz Exp
 #
 
@@ -9,7 +9,7 @@ WRKSRC=		${WRKDIR}/Tk800.024
 CATEGORIES=	x11 tk perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Tk/}
 
-MAINTAINER=	shell@netbsd.org
+MAINTAINER=	shell@NetBSD.org
 HOMEPAGE=	http://theory.uwinnipeg.ca/CPAN/data/Tk/pod/overview.html
 COMMENT=	Perl5 interface to Tk
 
diff --git a/x11/paragui/Makefile b/x11/paragui/Makefile
index f8fb0771b18..37ad125af9c 100644
--- a/x11/paragui/Makefile
+++ b/x11/paragui/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/07/13 20:54:32 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2003/07/17 22:56:39 grant Exp $
 #
 
 DISTNAME=		paragui-1.0.4
 CATEGORIES=		x11
 MASTER_SITES=		http://savannah.nongnu.org/download/paragui/stable.pkg/1.0.4/
 
-MAINTAINER=		tech-pkg@netbsd.org
+MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://www.paragui.org/
 COMMENT=		cross-platform high-level application framework and GUI library
 
diff --git a/x11/py-Pmw/Makefile b/x11/py-Pmw/Makefile
index 2bcb286798d..fe2cc9d3127 100644
--- a/x11/py-Pmw/Makefile
+++ b/x11/py-Pmw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2003/03/29 12:43:08 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2003/07/17 22:56:39 grant Exp $
 #
 
 DISTNAME=	Pmw.0.8.5
@@ -7,7 +7,7 @@ WRKSRC=		${WRKDIR}/Pmw
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pmw/}
 
-MAINTAINER=	lukem@netbsd.org
+MAINTAINER=	lukem@NetBSD.org
 HOMEPAGE=	http://pmw.sourceforge.net/
 COMMENT=	python meta widgets
 
diff --git a/x11/py-Tk/Makefile b/x11/py-Tk/Makefile
index 714f32b1513..0aabf7809b3 100644
--- a/x11/py-Tk/Makefile
+++ b/x11/py-Tk/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.22 2002/09/23 22:55:30 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2003/07/17 22:56:40 grant Exp $
 #
 
 PKGNAME=	${PYPKGPREFIX}-Tk-0
 CATEGORIES=	x11
 
-MAINTAINER=	tsarna@netbsd.org
+MAINTAINER=	tsarna@NetBSD.org
 HOMEPAGE=	http://www.python.org/topics/tkinter/
 COMMENT=	Tkinter -- Python interface to Tcl/Tk
 
diff --git a/x11/py-qt2-sip/Makefile b/x11/py-qt2-sip/Makefile
index 62a0463cfbb..f001532f495 100644
--- a/x11/py-qt2-sip/Makefile
+++ b/x11/py-qt2-sip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2002/09/21 23:47:01 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2003/07/17 22:56:40 grant Exp $
 #
 
 DISTNAME=	sip-3.1
@@ -6,7 +6,7 @@ PKGNAME=	${PYPKGPREFIX}-qt2-sip-3.1
 CATEGORIES=	x11 devel
 MASTER_SITES=	http://www.riverbankcomputing.co.uk/download/sip/
 
-MAINTAINER=	drochner@netbsd.org
+MAINTAINER=	drochner@NetBSD.org
 HOMEPAGE=	http://www.riverbankcomputing.co.uk/sip/index.php
 COMMENT=	tool to create Python bindings for C++ libraries
 
diff --git a/x11/py-qt2/Makefile b/x11/py-qt2/Makefile
index 72a2d6bd39d..95a3000b51c 100644
--- a/x11/py-qt2/Makefile
+++ b/x11/py-qt2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/09/21 23:47:02 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2003/07/17 22:56:40 grant Exp $
 #
 
 DISTNAME=	PyQt-3.1-Qt-2.3.1
@@ -7,7 +7,7 @@ WRKSRC=		${WRKDIR}/PyQt-3.1
 CATEGORIES=	x11
 MASTER_SITES=	http://www.riverbankcomputing.co.uk/download/PyQt/
 
-MAINTAINER=	drochner@netbsd.org
+MAINTAINER=	drochner@NetBSD.org
 HOMEPAGE=	http://www.riverbankcomputing.co.uk/pyqt/index.php
 COMMENT=	Python bindings for the Qt tooltit
 
diff --git a/x11/py-qt3-sip/Makefile b/x11/py-qt3-sip/Makefile
index af63871e4d3..5dd98403b80 100644
--- a/x11/py-qt3-sip/Makefile
+++ b/x11/py-qt3-sip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/07/15 16:40:45 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2003/07/17 22:56:41 grant Exp $
 #
 
 DISTNAME=	sip-x11-gpl-3.7
@@ -6,7 +6,7 @@ PKGNAME=	${PYPKGPREFIX}-qt3-sip-3.7
 CATEGORIES=	x11 devel
 MASTER_SITES=	http://www.river-bank.demon.co.uk/download/sip/
 
-MAINTAINER=	tech-pkg@netbsd.org
+MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.riverbankcomputing.co.uk/sip/index.php
 COMMENT=	Tool to create Python bindings for C++ libraries
 
diff --git a/x11/py-wxWindows/Makefile b/x11/py-wxWindows/Makefile
index a1defddab4e..93f8db16c13 100644
--- a/x11/py-wxWindows/Makefile
+++ b/x11/py-wxWindows/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2003/07/13 13:54:28 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2003/07/17 22:56:41 grant Exp $
 #
 
 DISTNAME=	wxPythonSrc-2.4.0.7
@@ -7,7 +7,7 @@ PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=wxpython/}
 
-MAINTAINER=	tsarna@netbsd.org
+MAINTAINER=	tsarna@NetBSD.org
 HOMEPAGE=	http://wxpython.org/
 COMMENT=	wxPython: Python bindings for wxWindows
 
diff --git a/x11/pygtk/Makefile b/x11/pygtk/Makefile
index 9fd505b4144..919aa625857 100644
--- a/x11/pygtk/Makefile
+++ b/x11/pygtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2003/07/13 13:54:28 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2003/07/17 22:56:41 grant Exp $
 #
 
 DISTNAME=	pygtk-0.6.9
@@ -7,7 +7,7 @@ PKGREVISION=	3
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.gtk.org/pub/gtk/python/
 
-MAINTAINER=	tech-pkg@netbsd.org
+MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.daa.com.au/~james/pygtk/
 COMMENT=	Python Bindings for the GTK Widget Set
 
diff --git a/x11/qt1/Makefile b/x11/qt1/Makefile
index 1826df26ade..d086079a041 100644
--- a/x11/qt1/Makefile
+++ b/x11/qt1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2003/06/02 01:15:39 jschauma Exp $
+# $NetBSD: Makefile,v 1.12 2003/07/17 22:56:41 grant Exp $
 #
 
 DISTNAME=	qt-1.44
@@ -7,7 +7,7 @@ CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.troll.no/qt/source/ \
 		ftp://ftp.fu-berlin.de/unix/X11/gui/Qt/source/
 
-MAINTAINER=	tech-pkg@netbsd.org
+MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.troll.no/products/qt.html
 COMMENT=	C++ X GUI toolkit
 
diff --git a/x11/qt2/Makefile.common b/x11/qt2/Makefile.common
index 60b2d6dc69f..f8bceb7aa35 100644
--- a/x11/qt2/Makefile.common
+++ b/x11/qt2/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.5 2001/06/17 19:10:37 drochner Exp $
+# $NetBSD: Makefile.common,v 1.6 2003/07/17 22:56:42 grant Exp $
 #
 
 QTVERSION=	2.3.1
 
-MAINTAINER=	skrll@netbsd.org
+MAINTAINER=	skrll@NetBSD.org
 HOMEPAGE=	http://www.trolltech.com/products/qt.html
 
 USE_X11BASE=	yes
diff --git a/x11/qt3-qscintilla/Makefile b/x11/qt3-qscintilla/Makefile
index ed98811e63a..ea647680b3c 100644
--- a/x11/qt3-qscintilla/Makefile
+++ b/x11/qt3-qscintilla/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/07/15 15:55:00 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2003/07/17 22:56:42 grant Exp $
 #
 
 DISTNAME=		qscintilla-1.53-x11-gpl-1.1
@@ -6,7 +6,7 @@ PKGNAME=		qt3-qscintilla-1.1
 CATEGORIES=		x11
 MASTER_SITES=		http://www.river-bank.demon.co.uk/download/QScintilla/
 
-MAINTAINER=		tech-pkg@netbsd.org
+MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://www.river-bank.demon.co.uk/download/QScintilla/
 COMMENT=		C++ editor class
 
diff --git a/x11/qt3/Makefile.common b/x11/qt3/Makefile.common
index 277e93d90f7..fc53e67f09d 100644
--- a/x11/qt3/Makefile.common
+++ b/x11/qt3/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.9 2003/03/18 08:36:26 skrll Exp $
+# $NetBSD: Makefile.common,v 1.10 2003/07/17 22:56:42 grant Exp $
 #
 
 QTVERSION=	3.1.2
 
-MAINTAINER=	skrll@netbsd.org
+MAINTAINER=	skrll@NetBSD.org
 HOMEPAGE=	http://www.trolltech.com/products/qt.html
diff --git a/x11/qtarch/Makefile b/x11/qtarch/Makefile
index b3e700d5d73..02e56265aba 100644
--- a/x11/qtarch/Makefile
+++ b/x11/qtarch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2003/06/02 01:15:39 jschauma Exp $
+# $NetBSD: Makefile,v 1.19 2003/07/17 22:56:43 grant Exp $
 #
 
 DISTNAME=	qtarch-2.1-1
@@ -8,7 +8,7 @@ WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 CATEGORIES=	x11 devel
 MASTER_SITES=	ftp://qtarch.sourceforge.net/pub/qtarch/
 
-MAINTAINER=	tech-pkg@netbsd.org
+MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://qtarch.sourceforge.net/
 COMMENT=	Graphical dialog editor for the Qt widget set
 
diff --git a/x11/qwspritefield/Makefile b/x11/qwspritefield/Makefile
index 5e60b40d93a..1a82a15f7e1 100644
--- a/x11/qwspritefield/Makefile
+++ b/x11/qwspritefield/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2003/06/02 01:15:39 jschauma Exp $
+# $NetBSD: Makefile,v 1.17 2003/07/17 22:56:43 grant Exp $
 
 DISTNAME=	QwSpriteField1.6
 PKGNAME=	qwspritefield-1.6
@@ -6,7 +6,7 @@ WRKSRC=		${WRKDIR}/QwSpriteField
 CATEGORIES=	x11 graphics
 MASTER_SITES=	ftp://ftp.troll.no/contrib/
 
-MAINTAINER=	tech-pkg@netbsd.org
+MAINTAINER=	tech-pkg@NetBSD.org
 COMMENT=	Efficiently redrawn sprites in the Qt GUI Toolkit
 
 DEPENDS+=	qt1-1.44:../../x11/qt1
diff --git a/x11/qwt/Makefile b/x11/qwt/Makefile
index 4a718bffa9c..9207b3e4d0c 100644
--- a/x11/qwt/Makefile
+++ b/x11/qwt/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.17 2003/06/02 01:15:38 jschauma Exp $
+# $NetBSD: Makefile,v 1.18 2003/07/17 22:56:43 grant Exp $
 
 DISTNAME=	qwt-0.3.0
 PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=   ${MASTER_SITE_SOURCEFORGE:=qwt/}
 
-MAINTAINER=	tech-pkg@netbsd.org
+MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://sourceforge.net/projects/qwt
 COMMENT=	Qt widget library for technical purposes
 
diff --git a/x11/rep-gtk/Makefile b/x11/rep-gtk/Makefile
index c284ea2bd79..1bc58dd0c54 100644
--- a/x11/rep-gtk/Makefile
+++ b/x11/rep-gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2003/07/13 13:54:29 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2003/07/17 22:56:44 grant Exp $
 #
 
 DISTNAME=		rep-gtk-0.15
@@ -6,7 +6,7 @@ PKGREVISION=		4
 CATEGORIES=		x11 lang
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=rep-gtk/}
 
-MAINTAINER=		danw@netbsd.org
+MAINTAINER=		danw@NetBSD.org
 HOMEPAGE=		http://rep-gtk.sourceforge.net/
 COMMENT=		librep bindings for gtk (used by sawmill)
 
diff --git a/x11/ruby-fox/Makefile b/x11/ruby-fox/Makefile
index 09526d48a15..7f350ce1740 100644
--- a/x11/ruby-fox/Makefile
+++ b/x11/ruby-fox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2003/07/13 13:54:29 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2003/07/17 22:56:44 grant Exp $
 
 DISTNAME=	FXRuby-0.99.174
 PKGNAME=	${RUBY_PKGNAMEPREFIX}fox-0.99.174
@@ -7,7 +7,7 @@ WRKSRC=		${WRKDIST}/ext/fox
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=fxruby/}
 
-MAINTAINER=	sakamoto@netbsd.org
+MAINTAINER=	sakamoto@NetBSD.org
 HOMEPAGE=	http://fxruby.sourceforge.net/
 COMMENT=	Ruby interface to FOX GUI library
 
diff --git a/x11/ruby-gtk/Makefile b/x11/ruby-gtk/Makefile
index aadef7911e2..08562ae846e 100644
--- a/x11/ruby-gtk/Makefile
+++ b/x11/ruby-gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2003/07/13 13:54:30 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2003/07/17 22:56:44 grant Exp $
 # FreeBSD: ports/x11-toolkits/ruby-gtk/Makefile,v 1.16 2000/10/15 15:45:59 knu Exp
 
 DISTNAME=	ruby-gtk-0.25
@@ -8,7 +8,7 @@ WRKSRC=		${WRKDIR}/${DISTNAME:S/ruby-//}
 CATEGORIES=	x11
 MASTER_SITES=	http://www.ruby-lang.org/gtk/download/
 
-MAINTAINER=	taca@netbsd.org
+MAINTAINER=	taca@NetBSD.org
 HOMEPAGE=	http://www.ruby-lang.org/gtk/en/
 COMMENT=	Ruby interface to Gtk+ toolkits
 
diff --git a/x11/ruby-tcltklib/Makefile b/x11/ruby-tcltklib/Makefile
index ee0848c95d8..117eebfae9a 100644
--- a/x11/ruby-tcltklib/Makefile
+++ b/x11/ruby-tcltklib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2003/03/29 12:43:09 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2003/07/17 22:56:45 grant Exp $
 # FreeBSD: ports/lang/ruby-tcltklib/Makefile,v 1.21 2000/10/20 19:56:04 knu Exp
 
 DISTNAME=	${RUBY_DISTNAME}
@@ -7,7 +7,7 @@ WRKSRC=		${RUBY_WRKSRC}/ext/tcltklib
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_RUBY}
 
-MAINTAINER=	taca@netbsd.org
+MAINTAINER=	taca@NetBSD.org
 HOMEPAGE=	http://www.ruby-lang.org/en/
 COMMENT=	Ruby interface to Tcl/Tk libraries
 
diff --git a/x11/ruby-tk/Makefile b/x11/ruby-tk/Makefile
index 1d1abc5ff37..007d27d7130 100644
--- a/x11/ruby-tk/Makefile
+++ b/x11/ruby-tk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2003/03/29 12:43:09 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2003/07/17 22:56:45 grant Exp $
 # FreeBSD: ports/x11-toolkits/ruby-tk/Makefile,v 1.21 2000/10/20 19:56:04 knu Exp
 
 DISTNAME=	${RUBY_DISTNAME}
@@ -7,7 +7,7 @@ WRKSRC=		${RUBY_WRKSRC}/ext/tk
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_RUBY}
 
-MAINTAINER=	taca@netbsd.org
+MAINTAINER=	taca@NetBSD.org
 HOMEPAGE=	http://www.ruby-lang.org/en/
 COMMENT=	Ruby interface to the Tk widget set
 
diff --git a/x11/speyes/Makefile b/x11/speyes/Makefile
index deeb3489ee4..0c66318a39d 100644
--- a/x11/speyes/Makefile
+++ b/x11/speyes/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2002/10/21 01:34:28 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2003/07/17 22:56:45 grant Exp $
 
 DISTNAME=	speyes-1.2.0
 CATEGORIES=	x11
 MASTER_SITES=	http://www.halcyon.com/amalmin/speyes/
 
-MAINTAINER=	jlam@netbsd.org
+MAINTAINER=	jlam@NetBSD.org
 HOMEPAGE=	http://www.halcyon.com/amalmin/speyes/speyes.html
 COMMENT=	South Park Eyes
 
diff --git a/x11/ssystem/Makefile b/x11/ssystem/Makefile
index e192a899777..624b65906af 100644
--- a/x11/ssystem/Makefile
+++ b/x11/ssystem/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2003/03/09 19:28:18 jschauma Exp $
+# $NetBSD: Makefile,v 1.8 2003/07/17 22:56:45 grant Exp $
 #
 
 DISTNAME=	ssystem-1.6
@@ -6,7 +6,7 @@ PKGREVISION=	1
 CATEGORIES=	x11 graphics
 MASTER_SITES=	${HOMEPAGE}			# ${HOMEPAGE}/hires/
 
-MAINTAINER=	fredb@netbsd.org
+MAINTAINER=	fredb@NetBSD.org
 HOMEPAGE=	http://www1.las.es/~amil/ssystem/
 COMMENT=	Solar System Flyby Simulator
 
diff --git a/x11/swing/Makefile b/x11/swing/Makefile
index 888d367ead3..88433a00c0d 100644
--- a/x11/swing/Makefile
+++ b/x11/swing/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2003/03/28 21:14:41 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2003/07/17 22:56:46 grant Exp $
 
 DISTNAME=	swing1_1_1
 PKGNAME=	swing-1.1.1
@@ -8,7 +8,7 @@ CATEGORIES=	devel x11
 MASTER_SITES=	# empty
 EXTRACT_SUFX=	.zip
 
-MAINTAINER=	jwise@netbsd.org
+MAINTAINER=	jwise@NetBSD.org
 HOMEPAGE=	http://www.javasoft.com/products/jfc/
 DOWNLOAD=	http://java.sun.com/products/jfc/download.archive.html
 COMMENT=	Sun's Java Foundation Classes (the Swing UI toolkit), version 1.1.1
diff --git a/x11/tk-Tix/Makefile b/x11/tk-Tix/Makefile
index 108538bed4d..436bc3324e6 100644
--- a/x11/tk-Tix/Makefile
+++ b/x11/tk-Tix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/02/17 15:28:03 dillo Exp $
+# $NetBSD: Makefile,v 1.5 2003/07/17 22:56:47 grant Exp $
 #
 
 DISTNAME=	tix8.2.0b1
@@ -7,7 +7,7 @@ WRKSRC=		${WRKDIR}/tix8.2.0/unix
 CATEGORIES=	x11 tcl tk
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=tixlibrary/}
 
-MAINTAINER=	he@netbsd.org
+MAINTAINER=	he@NetBSD.org
 HOMEPAGE=	http://tixlibrary.sourceforge.net/
 COMMENT=	Powerful widget library for Tcl/Tk
 
diff --git a/x11/tk/Makefile b/x11/tk/Makefile
index 7bba500297b..6a32ae72c42 100644
--- a/x11/tk/Makefile
+++ b/x11/tk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2003/04/10 01:28:32 grant Exp $
+# $NetBSD: Makefile,v 1.23 2003/07/17 22:56:46 grant Exp $
 
 DISTNAME=	tk8.3.4
 PKGNAME=	tk-8.3.4
@@ -7,7 +7,7 @@ CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.scriptics.com/pub/tcl/tcl8_3/ \
 		ftp://ftp.informatik.uni-hamburg.de/pub/soft/lang/tcl/tcl8_3/
 
-MAINTAINER=	jwise@netbsd.org
+MAINTAINER=	jwise@NetBSD.org
 HOMEPAGE=	http://www.tcltk.com/
 COMMENT=	Graphical toolkit for TCL
 
diff --git a/x11/tkinfo/Makefile b/x11/tkinfo/Makefile
index fec055a20ae..5f756f65d22 100644
--- a/x11/tkinfo/Makefile
+++ b/x11/tkinfo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2003/06/02 01:15:38 jschauma Exp $
+# $NetBSD: Makefile,v 1.17 2003/07/17 22:56:47 grant Exp $
 # FreeBSD Id: Makefile,v 1.15 1997/12/16 09:26:12 tg Exp
 #
 
@@ -7,7 +7,7 @@ CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SUNSITE:=apps/doctools/info/} \
 		http://math-www.uni-paderborn.de/~axel/tkinfo/
 
-MAINTAINER=	tech-pkg@netbsd.org
+MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://math-www.uni-paderborn.de/~axel/tkinfo/
 COMMENT=	Tk script to read and display GNU "info" files
 
diff --git a/x11/tkman/Makefile b/x11/tkman/Makefile
index 0a9fad21499..e3c758b8c53 100644
--- a/x11/tkman/Makefile
+++ b/x11/tkman/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2003/06/18 09:22:27 agc Exp $
+# $NetBSD: Makefile,v 1.34 2003/07/17 22:56:47 grant Exp $
 # FreeBSD Id: Makefile,v 1.28 1997/12/08 15:51:20 tg Exp
 #
 
@@ -9,7 +9,7 @@ CATEGORIES=		x11
 MASTER_SITES=		ftp://tkman.sourceforge.net/pub/tkman/ \
 			http://tkman.sourceforge.net/
 
-MAINTAINER=		tech-pkg@netbsd.org
+MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://tkman.sourceforge.net/
 COMMENT=		Tcl/Tk based manual browser
 
diff --git a/x11/unclutter/Makefile b/x11/unclutter/Makefile
index e28c437e39b..811eeb576f1 100644
--- a/x11/unclutter/Makefile
+++ b/x11/unclutter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2003/03/29 12:43:10 jmmv Exp $
+# $NetBSD: Makefile,v 1.12 2003/07/17 22:56:47 grant Exp $
 #
 
 DISTNAME=	unclutter-8
@@ -7,7 +7,7 @@ CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XCONTRIB:=utilities/}
 EXTRACT_SUFX=	.tar.Z
 
-MAINTAINER=	mycroft@netbsd.org
+MAINTAINER=	mycroft@NetBSD.org
 COMMENT=	Remove idle cursor image from screen
 
 USE_IMAKE=	yes
diff --git a/x11/wdm/Makefile b/x11/wdm/Makefile
index 1dfe0268953..625526ba2ed 100644
--- a/x11/wdm/Makefile
+++ b/x11/wdm/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.8 2003/07/13 13:54:30 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2003/07/17 22:56:48 grant Exp $
 
 DISTNAME=		wdm-1.24
 PKGREVISION=		1
 CATEGORIES=		x11 windowmaker
 MASTER_SITES=		http://voins.program.ru/wdm/
 
-MAINTAINER=		tech-pkg@netbsd.org
+MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://voins.program.ru/wdm/
 COMMENT=		WINGs display manager
 
diff --git a/x11/wmavgload/Makefile b/x11/wmavgload/Makefile
index 701700dea39..09677af1797 100644
--- a/x11/wmavgload/Makefile
+++ b/x11/wmavgload/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2003/04/26 09:49:38 jmmv Exp $
+# $NetBSD: Makefile,v 1.6 2003/07/17 22:56:48 grant Exp $
 
 DISTNAME=	wmavgload-0.7.0
 CATEGORIES=	x11 windowmaker
 MASTER_SITES=	ftp://ftp.windowmaker.org/pub/contrib/srcs/utils/
 
-MAINTAINER=	ad@netbsd.org
+MAINTAINER=	ad@NetBSD.org
 COMMENT=	Another WindowMaker load gauge
 
 USE_BUILDLINK2=		YES
diff --git a/x11/wmessage/Makefile b/x11/wmessage/Makefile
index 587b94fd46a..2c921c1a942 100644
--- a/x11/wmessage/Makefile
+++ b/x11/wmessage/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.19 2003/07/13 13:54:30 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2003/07/17 22:56:48 grant Exp $
 
 DISTNAME=	wmessage-0.10
 PKGREVISION=	2
 CATEGORIES=	x11 windowmaker
 MASTER_SITES=	http://www.ozemail.com.au/~crn/wmessage/
 
-MAINTAINER=	jlam@netbsd.org
+MAINTAINER=	jlam@NetBSD.org
 HOMEPAGE=	http://www.ozemail.com.au/~crn/wmessage/
 COMMENT=	WINGs based message viewer similar to xmessage
 
diff --git a/x11/wmfire/Makefile b/x11/wmfire/Makefile
index 0acecae4ee8..890fad7991e 100644
--- a/x11/wmfire/Makefile
+++ b/x11/wmfire/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2002/08/25 21:52:49 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2003/07/17 22:56:48 grant Exp $
 #
 
 DISTNAME=	wmfire-0.0.3.9pre4
@@ -6,7 +6,7 @@ PKGNAME=	wmfire-0.0.3.9.4
 CATEGORIES=	x11
 MASTER_SITES=	http://staff.xmms.org/zinx/misc/
 
-MAINTAINER=	hubertf@netbsd.org
+MAINTAINER=	hubertf@NetBSD.org
 COMMENT=	Displays generated fire according to system load
 
 USE_BUILDLINK2=	YES
diff --git a/x11/wmfstatus/Makefile b/x11/wmfstatus/Makefile
index 8b7ac7fd208..697f63610af 100644
--- a/x11/wmfstatus/Makefile
+++ b/x11/wmfstatus/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.7 2003/03/29 12:43:10 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2003/07/17 22:56:49 grant Exp $
 
 DISTNAME=	wmfstatus-0.4
 WRKSRC=		${WRKDIR}/${DISTNAME}/wmfstatus
 CATEGORIES=	x11
 MASTER_SITES=	http://www.finik.net/files/
 
-MAINTAINER=	sakamoto@netbsd.org
+MAINTAINER=	sakamoto@NetBSD.org
 HOMEPAGE=	http://www.finik.net/software.html
 COMMENT=	general purpose 8x5 LCD screen for WindowMaker
 
diff --git a/x11/wmweather/Makefile b/x11/wmweather/Makefile
index f94f8e7c68c..fddbeef2876 100644
--- a/x11/wmweather/Makefile
+++ b/x11/wmweather/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2002/10/27 13:41:25 bouyer Exp $
+# $NetBSD: Makefile,v 1.12 2003/07/17 22:56:49 grant Exp $
 #
 
 DISTNAME=	wmWeather-1.31
@@ -6,7 +6,7 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/Src
 CATEGORIES=	x11
 MASTER_SITES=	http://nis-www.lanl.gov/~mgh/WindowMaker/
 
-MAINTAINER=	rh@netbsd.org
+MAINTAINER=	rh@NetBSD.org
 HOMEPAGE=	http://nis-www.lanl.gov/~mgh/WindowMaker/DockApps.shtml
 COMMENT=	WindowMaker DockApp showing local weather conditions
 
diff --git a/x11/wterm/Makefile b/x11/wterm/Makefile
index 8204c8b834b..4941bd94d5e 100644
--- a/x11/wterm/Makefile
+++ b/x11/wterm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2003/07/13 13:54:31 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2003/07/17 22:56:49 grant Exp $
 
 DISTNAME=	wterm-6.2.9
 PKGREVISION=	2
@@ -6,7 +6,7 @@ CATEGORIES=	x11 windowmaker
 MASTER_SITES=	http://largo.windowmaker.org/files/
 EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=	rh@netbsd.org
+MAINTAINER=	rh@NetBSD.org
 HOMEPAGE=	http://largo.windowmaker.org/files.php\#wterm
 COMMENT=	NeXTStep(tm) style X11 terminal emulator for WindowMaker
 
diff --git a/x11/wxGTK/Makefile b/x11/wxGTK/Makefile
index b8a7fa6ee02..5140834c504 100644
--- a/x11/wxGTK/Makefile
+++ b/x11/wxGTK/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2003/07/13 13:54:31 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2003/07/17 22:56:50 grant Exp $
 #
 
 DISTNAME=		wxGTK-2.4.0
@@ -6,7 +6,7 @@ PKGREVISION=		3
 CATEGORIES=		x11
 MASTER_SITES=		ftp://biolpc22.york.ac.uk/pub/2.4.0/
 
-MAINTAINER=		tsarna@netbsd.org
+MAINTAINER=		tsarna@NetBSD.org
 HOMEPAGE=		http://www.wxwindows.org
 COMMENT=		GTK-based implementation of the wxWindows GUI library
 
diff --git a/x11/wxWindows-docs/Makefile b/x11/wxWindows-docs/Makefile
index 8a3fe7224c7..ca7b0098944 100644
--- a/x11/wxWindows-docs/Makefile
+++ b/x11/wxWindows-docs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/02/17 17:06:56 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2003/07/17 22:56:50 grant Exp $
 
 DISTNAME=		wxHTML22
 PKGNAME=		wxWindows-docs-2.2
@@ -7,7 +7,7 @@ CATEGORIES=		x11
 MASTER_SITES=		ftp://wesley.informatik.uni-freiburg.de/pub/linux/wxxt/docs/
 EXTRACT_SUFX=		.tgz
 
-MAINTAINER=		jlam@netbsd.org
+MAINTAINER=		jlam@NetBSD.org
 HOMEPAGE=		http://www.freiburg.linux.de/~wxxt/docs.html
 COMMENT=		HTML documentation for wxWindows
 
diff --git a/x11/x2x/Makefile b/x11/x2x/Makefile
index c32f47be71a..b810ee58667 100644
--- a/x11/x2x/Makefile
+++ b/x11/x2x/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2003/06/02 01:15:37 jschauma Exp $
+# $NetBSD: Makefile,v 1.6 2003/07/17 22:56:50 grant Exp $
 
 DISTNAME=	x2x-1.27
 PKGREVISION=	1
@@ -6,7 +6,7 @@ CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.digital.com/pub/Digital/SRC/x2x/ \
 		ftp://ftp.digital.de/Digital/SRC/x2x/
 
-MAINTAINER=	tech-pkg@netbsd.org
+MAINTAINER=	tech-pkg@NetBSD.org
 COMMENT=	One keyboard and mouse to control multiple X displays
 
 USE_X11BASE=	yes
diff --git a/x11/xaniroc/Makefile b/x11/xaniroc/Makefile
index a3d39a36536..b0f9d3964e6 100644
--- a/x11/xaniroc/Makefile
+++ b/x11/xaniroc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/06/02 01:15:36 jschauma Exp $
+# $NetBSD: Makefile,v 1.7 2003/07/17 22:56:50 grant Exp $
 # from FreeBSD: ports/x11/xaniroc/Makefile,v 1.4 1999/08/31 02:50:46 peter Exp
 #
 
@@ -10,7 +10,7 @@ MASTER_SITES=	ftp://ftp.freebird.org/unixware/freebird/x11/utils/ \
 		ftp://netlab1.usu.edu/pub/mirror/freebird/x11/utils/
 EXTRACT_SUFX=	.src.tar.Z
 
-MAINTAINER=	tech-pkg@netbsd.org
+MAINTAINER=	tech-pkg@NetBSD.org
 COMMENT=	animate your root-cursor
 
 USE_IMAKE=	yes
diff --git a/x11/xautolock/Makefile b/x11/xautolock/Makefile
index 653f470ffd2..b43d39db711 100644
--- a/x11/xautolock/Makefile
+++ b/x11/xautolock/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2003/01/08 10:58:21 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2003/07/17 22:56:51 grant Exp $
 
 DISTNAME=	xautolock-pl15
 PKGNAME=	xautolock-1.15
@@ -6,7 +6,7 @@ CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XCONTRIB:=applications/}
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	tron@netbsd.org
+MAINTAINER=	tron@NetBSD.org
 COMMENT=	Activate xlock after a user defined time of inactivity
 
 USE_BUILDLINK2=	YES
diff --git a/x11/xbindkeys-config/Makefile b/x11/xbindkeys-config/Makefile
index 16217613d35..c5f80f7edca 100644
--- a/x11/xbindkeys-config/Makefile
+++ b/x11/xbindkeys-config/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/07/13 13:54:32 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2003/07/17 22:56:51 grant Exp $
 
 DISTNAME=	xbindkeys_config-0.1.2
 PKGNAME=	xbindkeys-config-0.1.2
@@ -6,7 +6,7 @@ PKGREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	http://www.netchampagne.com/xbindkeys_config/
 
-MAINTAINER=	jmmv@netbsd.org
+MAINTAINER=	jmmv@NetBSD.org
 HOMEPAGE=	http://www.netchampagne.com/xbindkeys_config/
 COMMENT=	Tool to configure xbindkeys graphically
 
diff --git a/x11/xbindkeys/Makefile b/x11/xbindkeys/Makefile
index 3b3bebf265d..1aafda4c3fd 100644
--- a/x11/xbindkeys/Makefile
+++ b/x11/xbindkeys/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.4 2003/01/03 15:27:01 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2003/07/17 22:56:51 grant Exp $
 #
 
 DISTNAME=	xbindkeys-1.5.5
 CATEGORIES=	x11
 MASTER_SITES=	http://hocwp.free.fr/xbindkeys/
 
-MAINTAINER=	jmmv@netbsd.org
+MAINTAINER=	jmmv@NetBSD.org
 HOMEPAGE=	http://hocwp.free.fr/xbindkeys/xbindkeys.html
 COMMENT=	Launches shell commands with your keyboard or your mouse
 
diff --git a/x11/xcb/Makefile b/x11/xcb/Makefile
index 85cfa218d24..e75bb041342 100644
--- a/x11/xcb/Makefile
+++ b/x11/xcb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2003/03/03 04:17:41 jschauma Exp $
+# $NetBSD: Makefile,v 1.6 2003/07/17 22:56:51 grant Exp $
 
 DISTNAME=	xcb-2.3i
 PKGNAME=	xcb-2.3.9
@@ -6,7 +6,7 @@ PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://www.goof.com/pcg/marc/data/
 
-MAINTAINER=	tron@netbsd.org
+MAINTAINER=	tron@NetBSD.org
 HOMEPAGE=	http://www.goof.com/pcg/marc/xcb.html
 COMMENT=	Extensible, multiple cut buffers for X
 
diff --git a/x11/xclip/Makefile b/x11/xclip/Makefile
index 1ae9b50e7b1..ff60c16173c 100644
--- a/x11/xclip/Makefile
+++ b/x11/xclip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/06/02 01:15:36 jschauma Exp $
+# $NetBSD: Makefile,v 1.5 2003/07/17 22:56:52 grant Exp $
 #
 
 DISTNAME=	xclip-0.08
@@ -7,7 +7,7 @@ WRKSRC=		${WRKDIR}/xclip
 CATEGORIES=	x11
 MASTER_SITES=	http://people.debian.org/~kims/xclip/
 
-MAINTAINER=	tech-pkg@netbsd.org
+MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://people.debian.org/~kims/xclip/
 COMMENT=	Command line interface to the X windows clipboard
 
diff --git a/x11/xcolors/Makefile b/x11/xcolors/Makefile
index 37c0baf44bc..ef17f8ba3eb 100644
--- a/x11/xcolors/Makefile
+++ b/x11/xcolors/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2003/06/02 01:15:36 jschauma Exp $
+# $NetBSD: Makefile,v 1.11 2003/07/17 22:56:52 grant Exp $
 # FreeBSD: Makefile,v 1.9 1998/01/22 00:41:36 fenner Exp
 #
 
@@ -9,7 +9,7 @@ WRKSRC=		${WRKDIR}/xcolors
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.tut.ac.jp/X11/X11R6/contrib/programs/
 
-MAINTAINER=	tech-pkg@netbsd.org
+MAINTAINER=	tech-pkg@NetBSD.org
 COMMENT=	Display all (ok, most of) the colors in the universe
 
 USE_IMAKE=	yes
diff --git a/x11/xcolorsel/Makefile b/x11/xcolorsel/Makefile
index 9a7ca82b95d..04071125ff8 100644
--- a/x11/xcolorsel/Makefile
+++ b/x11/xcolorsel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2003/03/29 12:43:11 jmmv Exp $
+# $NetBSD: Makefile,v 1.12 2003/07/17 22:56:52 grant Exp $
 #
 
 DISTNAME=	xcolorsel-1.1a-src
@@ -8,7 +8,7 @@ WRKSRC=		${WRKDIR}/xcolorsel
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XCONTRIB:=utilities/}
 
-MAINTAINER=	perry@netbsd.org
+MAINTAINER=	perry@NetBSD.org
 COMMENT=	Browse and select named X colors from rgb.txt
 
 USE_BUILDLINK2=	yes
diff --git a/x11/xcruise/Makefile b/x11/xcruise/Makefile
index 6e187807ff4..131d7c7b459 100644
--- a/x11/xcruise/Makefile
+++ b/x11/xcruise/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.5 2001/02/17 17:07:02 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2003/07/17 22:56:52 grant Exp $
 #
 
 DISTNAME=	xcruise-0.24
 CATEGORIES=	x11 graphics
 MASTER_SITES=	http://tanaka-www.cs.titech.ac.jp/%7Eeuske/prog/
 
-MAINTAINER=	minoura@netbsd.org
+MAINTAINER=	minoura@NetBSD.org
 HOMEPAGE=	http://tanaka-www.cs.titech.ac.jp/%7Eeuske/prog/
 COMMENT=	Navigate through a three-dimensional view of a file system
 
diff --git a/x11/xcursorgen/Makefile b/x11/xcursorgen/Makefile
index 37763a228d2..49cc0791b7a 100644
--- a/x11/xcursorgen/Makefile
+++ b/x11/xcursorgen/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2003/05/19 22:56:12 jmc Exp $
+# $NetBSD: Makefile,v 1.6 2003/07/17 22:56:53 grant Exp $
 
 DISTNAME=	xcursorgen-4.3.0
 WRKSRC=		${WRKDIR}/${DISTNAME:C/-.*//}
@@ -6,7 +6,7 @@ CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=	xsrc-manager@netbsd.org
+MAINTAINER=	xsrc-manager@NetBSD.org
 HOMEPAGE=	http://www.xfree86.org/
 COMMENT=	Create an X cursor file from a collection of PNG images
 
diff --git a/x11/xdaemon/Makefile b/x11/xdaemon/Makefile
index 41cfd7c2c49..8800e762b04 100644
--- a/x11/xdaemon/Makefile
+++ b/x11/xdaemon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2003/03/29 12:43:12 jmmv Exp $
+# $NetBSD: Makefile,v 1.11 2003/07/17 22:56:53 grant Exp $
 
 DISTNAME=	xdaemon-1.0
 WRKSRC=		${WRKDIR}
@@ -6,8 +6,8 @@ CATEGORIES=	games x11
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 DISTFILES=	${PIX} Daemon.README
 
-MAINTAINER=	hubertf@netbsd.org
-HOMEPAGE=	http://www.netbsd.org/
+MAINTAINER=	hubertf@NetBSD.org
+HOMEPAGE=	http://www.NetBSD.org/
 COMMENT=	BSD Daemon sticking on your desktop (like xteddy)
 
 DEPENDS+=	xteddy-1.*:../xteddy
diff --git a/x11/xdaemon2/Makefile b/x11/xdaemon2/Makefile
index 42e090ae7df..7492949f497 100644
--- a/x11/xdaemon2/Makefile
+++ b/x11/xdaemon2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2003/03/29 12:43:12 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2003/07/17 22:56:53 grant Exp $
 
 DISTNAME=	xdaemon-2.0
 PKGREVISION=	1
@@ -7,8 +7,8 @@ CATEGORIES=	games x11
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 DISTFILES=	${PIX} Daemon.README
 
-MAINTAINER=	hubertf@netbsd.org
-HOMEPAGE=	http://www.netbsd.org/
+MAINTAINER=	hubertf@NetBSD.org
+HOMEPAGE=	http://www.NetBSD.org/
 COMMENT=	BSD Daemon sticking on your desktop (like xteddy)
 
 DEPENDS+=	xteddy-2.*:../xteddy2
diff --git a/x11/xdialog/Makefile b/x11/xdialog/Makefile
index b2554779ea7..85622db980b 100644
--- a/x11/xdialog/Makefile
+++ b/x11/xdialog/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2003/07/13 13:54:32 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2003/07/17 22:56:54 grant Exp $
 #
 
 DISTNAME=		Xdialog-2.1.1
@@ -9,7 +9,7 @@ MASTER_SITES=		http://thgodef.nerim.net/xdialog/	\
 			http://thgodef.nerim.net/xdialog/archives/
 EXTRACT_SUFX=		.tar.bz2
 
-MAINTAINER=		jlam@netbsd.org
+MAINTAINER=		jlam@NetBSD.org
 HOMEPAGE=		http://xdialog.dyns.net/
 COMMENT=		X11 drop-in replacement for the curses dialog program
 
diff --git a/x11/xearth/Makefile b/x11/xearth/Makefile
index 9c316ac0c97..8b3ea96697a 100644
--- a/x11/xearth/Makefile
+++ b/x11/xearth/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2003/03/03 04:17:38 jschauma Exp $
+# $NetBSD: Makefile,v 1.12 2003/07/17 22:56:55 grant Exp $
 #
 
 DISTNAME=	xearth-1.1
@@ -7,7 +7,7 @@ CATEGORIES=	x11
 MASTER_SITES=	ftp://cag.lcs.mit.edu/pub/tuna/ \
 		ftp://ftp.cs.colorado.edu/users/tuna/
 
-MAINTAINER=	agc@netbsd.org
+MAINTAINER=	agc@NetBSD.org
 HOMEPAGE=	http://www.cs.colorado.edu/~tuna/xearth/index.html
 COMMENT=	Rotating map of the Earth in X11 root window
 
diff --git a/x11/xephem/Makefile b/x11/xephem/Makefile
index 02ab6bb270d..adb32521fd8 100644
--- a/x11/xephem/Makefile
+++ b/x11/xephem/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2003/06/11 20:51:00 abs Exp $
+# $NetBSD: Makefile,v 1.20 2003/07/17 22:56:55 grant Exp $
 
 DISTNAME=	xephem-3.5.2
 PKGREVISION=	1
@@ -7,7 +7,7 @@ CATEGORIES=	x11
 MASTER_SITES=	http://www.clearskyinstitute.com/xephem/ \
 		ftp://iphcip1.physik.uni-mainz.de/pub/xephem/
 
-MAINTAINER=	tech-pkg@netbsd.org
+MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.clearskyinstitute.com/xephem/
 COMMENT=	Interactive astronomical ephemeris program
 
diff --git a/x11/xfce/Makefile b/x11/xfce/Makefile
index 476aadc1078..22b3e6d4ac9 100644
--- a/x11/xfce/Makefile
+++ b/x11/xfce/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.35 2003/07/13 13:54:32 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2003/07/17 22:56:55 grant Exp $
 
 DISTNAME=		xfce-3.8.18
 PKGREVISION=		2
 CATEGORIES=		x11
 MASTER_SITES=		http://www.xfce.org/archive/
 
-MAINTAINER=		martti@netbsd.org
+MAINTAINER=		martti@NetBSD.org
 HOMEPAGE=		http://www.xfce.org/
 COMMENT=		Lightweight desktop environment with CDE look and feel
 
diff --git a/x11/xfishtank/Makefile b/x11/xfishtank/Makefile
index 0a3e9354ac5..9d60f49466d 100644
--- a/x11/xfishtank/Makefile
+++ b/x11/xfishtank/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/06/02 01:15:35 jschauma Exp $
+# $NetBSD: Makefile,v 1.9 2003/07/17 22:56:55 grant Exp $
 # FreeBSD Id: Makefile,v 1.2 1997/06/17 07:45:12 asami Exp
 #
 
@@ -7,7 +7,7 @@ WRKSRC=			${WRKDIR}/xfishtank2.0
 CATEGORIES=		x11
 MASTER_SITES=		ftp://ftp.uni-koeln.de/windows/xcontrib/
 
-MAINTAINER=		tech-pkg@netbsd.org
+MAINTAINER=		tech-pkg@NetBSD.org
 COMMENT=		Make fish swim in the background of your screen
 
 USE_IMAKE=		yes
diff --git a/x11/xflame/Makefile b/x11/xflame/Makefile
index b5b58589890..338a29bc751 100644
--- a/x11/xflame/Makefile
+++ b/x11/xflame/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2001/02/17 17:07:07 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2003/07/17 22:56:56 grant Exp $
 #
 
 DISTNAME=	xflame-1.1.1
 CATEGORIES=	x11
 MASTER_SITES=	http://www.owlnet.rice.edu/~rahul/
 
-MAINTAINER=	hubertf@netbsd.org
+MAINTAINER=	hubertf@NetBSD.org
 COMMENT=	Draws a flame on the screen
 
 USE_IMAKE=	yes
diff --git a/x11/xforms/Makefile b/x11/xforms/Makefile
index 0b2470b1a98..6229bddff89 100644
--- a/x11/xforms/Makefile
+++ b/x11/xforms/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2003/06/02 01:15:35 jschauma Exp $
+# $NetBSD: Makefile,v 1.48 2003/07/17 22:56:56 grant Exp $
 #
 
 DISTNAME=	xforms-1.0-release
@@ -9,7 +9,7 @@ MASTER_SITES=	ftp://ncmir.ucsd.edu/pub/xforms/OpenSource/ \
 		http://archive.cs.uu.nl/mirror/XFORMS/OpenSource/
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	tech-pkg@netbsd.org
+MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://world.std.com/~xforms/
 COMMENT=	Graphical user interface toolkit for X Window System
 
diff --git a/x11/xfstt/Makefile b/x11/xfstt/Makefile
index 6d49220632d..b62eaa14ecb 100644
--- a/x11/xfstt/Makefile
+++ b/x11/xfstt/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.14 2003/06/02 01:15:35 jschauma Exp $
+# $NetBSD: Makefile,v 1.15 2003/07/17 22:56:56 grant Exp $
 #
 
 DISTNAME=		xfstt-1.4
 CATEGORIES=		x11 net fonts
 MASTER_SITES=		http://download.berlios.de/xfstt/
 
-MAINTAINER=		tech-pkg@netbsd.org
+MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://developer.berlios.de/projects/xfstt
 COMMENT=		TrueType font server for X11
 
diff --git a/x11/xglobe/Makefile b/x11/xglobe/Makefile
index d298d931472..cf830c3c1ba 100644
--- a/x11/xglobe/Makefile
+++ b/x11/xglobe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2002/07/10 17:15:18 mycroft Exp $
+# $NetBSD: Makefile,v 1.18 2003/07/17 22:56:57 grant Exp $
 #
 
 DISTNAME=	xglobe-0.5
@@ -13,7 +13,7 @@ MASTER_SITES=	http://www.cs.unc.edu/~scheuerm/xglobe/ \
 		http://www.ngdc.noaa.gov/mgg/image/
 DISTFILES+=	${MAPS} ${DISTNAME}${EXTRACT_SUFX}
 
-MAINTAINER=	hubertf@netbsd.org
+MAINTAINER=	hubertf@NetBSD.org
 HOMEPAGE=	http://www.cs.unc.edu/~scheuerm/xglobe/
 COMMENT=	Displays the earth as seen from space, similar to xearth
 
diff --git a/x11/xhangglider/Makefile b/x11/xhangglider/Makefile
index c923f4d7e52..249676b4f45 100644
--- a/x11/xhangglider/Makefile
+++ b/x11/xhangglider/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.5 2002/03/09 17:05:46 hubertf Exp $
+# $NetBSD: Makefile,v 1.6 2003/07/17 22:56:57 grant Exp $
 #
 
 DISTNAME=	xhangglider-0.94.0
 CATEGORIES=	x11
 MASTER_SITES=	http://www.netfort.gr.jp/~take/linux/
 
-MAINTAINER=	hubertf@netbsd.org
+MAINTAINER=	hubertf@NetBSD.org
 HOMEPAGE=	http://www.netfort.gr.jp/~take/linux/xhang-en.html
 COMMENT=	Hanggliders fly in the background of the X screen
 
diff --git a/x11/xjman/Makefile b/x11/xjman/Makefile
index a73a6acd867..bcb83e21885 100644
--- a/x11/xjman/Makefile
+++ b/x11/xjman/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:13 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/07/17 22:56:58 grant Exp $
 # FreeBSD Id: ports/japanese/xjman/Makefile,v 1.10 1999/10/30 15:34:24 sada Exp
 
 DISTNAME=	xjman-0.5
@@ -7,7 +7,7 @@ CATEGORIES=	japanese x11
 MASTER_SITES=	http://xjman.dsl.gr.jp/
 EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=	sakamoto@netbsd.org
+MAINTAINER=	sakamoto@NetBSD.org
 HOMEPAGE=	http://xjman.dsl.gr.jp/
 COMMENT=	Japanized X manual from "The X Japanese Documentation Project"
 
diff --git a/x11/xkbd/Makefile b/x11/xkbd/Makefile
index 14372ff8e6a..9ce788378df 100644
--- a/x11/xkbd/Makefile
+++ b/x11/xkbd/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2003/02/05 21:58:05 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.4 2003/07/17 22:56:58 grant Exp $
 #
 
 DISTNAME=	xkbd-0.8.5
 CATEGORIES=	x11
 MASTER_SITES=	http://handhelds.org/~mallum/downloadables/xkbd/
 
-MAINTAINER=	tsarna@netbsd.org
+MAINTAINER=	tsarna@NetBSD.org
 HOMEPAGE=	http://handhelds.org/~mallum/
 COMMENT=	On-screen keyboard for X, useful for palmtops
 
diff --git a/x11/xkbset/Makefile b/x11/xkbset/Makefile
index 3a0074558d0..9d8e7933e50 100644
--- a/x11/xkbset/Makefile
+++ b/x11/xkbset/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2002/12/28 07:40:41 uebayasi Exp $
+# $NetBSD: Makefile,v 1.4 2003/07/17 22:56:58 grant Exp $
 #
 
 DISTNAME=	xkbset-0.3
@@ -6,7 +6,7 @@ PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://www.math.missouri.edu/~stephen/software/xkbset/
 
-MAINTAINER=	hubertf@netbsd.org
+MAINTAINER=	hubertf@NetBSD.org
 HOMEPAGE=	http://www.math.missouri.edu/~stephen/software/#xkbset
 COMMENT=	Manages XKB features of the X window system
 
diff --git a/x11/xkeycaps/Makefile b/x11/xkeycaps/Makefile
index 38674c51ab2..2fe3841fe3e 100644
--- a/x11/xkeycaps/Makefile
+++ b/x11/xkeycaps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2003/06/02 01:15:34 jschauma Exp $
+# $NetBSD: Makefile,v 1.11 2003/07/17 22:56:58 grant Exp $
 #
 
 DISTNAME=	xkeycaps-2.46
@@ -8,7 +8,7 @@ MASTER_SITES=	${MASTER_SITE_XCONTRIB:=applications/} \
 		http://www.jwz.org/xkeycaps/
 EXTRACT_SUFX=	.tar.Z
 
-MAINTAINER=	tech-pkg@netbsd.org
+MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.jwz.org/xkeycaps/
 COMMENT=	Graphical front-end to xmodmap
 
diff --git a/x11/xless/Makefile b/x11/xless/Makefile
index 2227ba56867..e303e028502 100644
--- a/x11/xless/Makefile
+++ b/x11/xless/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2003/06/02 01:15:34 jschauma Exp $
+# $NetBSD: Makefile,v 1.12 2003/07/17 22:56:59 grant Exp $
 # FreeBSD Id: Makefile,v 1.2 1996/12/29 00:51:27 obrien Exp
 #
 
@@ -8,7 +8,7 @@ CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_XCONTRIB:=applications/} \
 		ftp://ftp.cs.berkeley.edu/ucb/people/dglo/xless/
 
-MAINTAINER=	tech-pkg@netbsd.org
+MAINTAINER=	tech-pkg@NetBSD.org
 COMMENT=	X11 text viewer; useful as an add-on tool for other apps
 
 USE_BUILDLINK2=	yes
diff --git a/x11/xlockmore/Makefile.common b/x11/xlockmore/Makefile.common
index 2bd23c0a348..c28744f80ad 100644
--- a/x11/xlockmore/Makefile.common
+++ b/x11/xlockmore/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.5 2003/07/15 14:49:05 hubertf Exp $
+# $NetBSD: Makefile.common,v 1.6 2003/07/17 22:56:59 grant Exp $
 #
 # This Makefile.common is included by:
 #
@@ -14,7 +14,7 @@ MASTER_SITES=	ftp://ftp.tux.org/pub/tux/bagleyd/xlockmore/ \
 		${MASTER_SITE_XCONTRIB:=applications/}
 EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=	hubertf@netbsd.org
+MAINTAINER=	hubertf@NetBSD.org
 HOMEPAGE=	http://www.tux.org/~bagleyd/xlockmore.html
 
 CONFLICTS+=	xlockmore-[0-9]* xlockmore-lite-[0-9]*
diff --git a/x11/xlogout/Makefile b/x11/xlogout/Makefile
index 94d4b56f032..7e2e0eec0f8 100644
--- a/x11/xlogout/Makefile
+++ b/x11/xlogout/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/06/02 01:15:34 jschauma Exp $
+# $NetBSD: Makefile,v 1.5 2003/07/17 22:56:59 grant Exp $
 #
 
 DISTNAME=	xlogout
@@ -7,7 +7,7 @@ PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 
-MAINTAINER=	tech-pkg@netbsd.org
+MAINTAINER=	tech-pkg@NetBSD.org
 COMMENT=	Quick logout button
 
 USE_IMAKE=	yes
diff --git a/x11/xmon/Makefile b/x11/xmon/Makefile
index 9da615e021f..dca3dbdf043 100644
--- a/x11/xmon/Makefile
+++ b/x11/xmon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/06/02 01:15:34 jschauma Exp $
+# $NetBSD: Makefile,v 1.5 2003/07/17 22:56:59 grant Exp $
 #
 
 DISTNAME=	xmon.1.5.4
@@ -7,7 +7,7 @@ PKGREVISION=	1
 CATEGORIES=	x11 devel
 MASTER_SITES=	${MASTER_SITE_XCONTRIB:=devel_tools/}
 
-MAINTAINER=	tech-pkg@netbsd.org
+MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.ee.ryerson.ca/~elf/xapps/Q-XVIII.html
 COMMENT=	interactive X protocol monitor
 
diff --git a/x11/xmountains/Makefile b/x11/xmountains/Makefile
index c72f9dc2281..ea3c1fb478e 100644
--- a/x11/xmountains/Makefile
+++ b/x11/xmountains/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/03/29 12:43:13 jmmv Exp $
+# $NetBSD: Makefile,v 1.9 2003/07/17 22:57:00 grant Exp $
 #
 
 DISTNAME=	xmountains_2.6
@@ -8,7 +8,7 @@ WRKSRC=		${WRKDIR}
 CATEGORIES=	x11
 MASTER_SITES=	http://www.epcc.ed.ac.uk/~spb/xmountains/
 
-MAINTAINER=	fredb@netbsd.org
+MAINTAINER=	fredb@NetBSD.org
 HOMEPAGE=	http://www.epcc.ed.ac.uk/~spb/xmountains/
 COMMENT=	Fractal terrain generator for X11
 
diff --git a/x11/xmove/Makefile b/x11/xmove/Makefile
index 31929dfcdf4..c128fce6983 100644
--- a/x11/xmove/Makefile
+++ b/x11/xmove/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2003/06/02 01:15:33 jschauma Exp $
+# $NetBSD: Makefile,v 1.10 2003/07/17 22:57:00 grant Exp $
 #
 
 DISTNAME=	xmove.2.0beta2
@@ -7,7 +7,7 @@ WRKSRC=		${WRKDIR}/xmove
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.cs.columbia.edu/pub/xmove/
 
-MAINTAINER=	tech-pkg@netbsd.org
+MAINTAINER=	tech-pkg@NetBSD.org
 COMMENT=	Move an X11 display between screens and displays
 
 USE_IMAKE=	yes
diff --git a/x11/xmx/Makefile b/x11/xmx/Makefile
index e8888aba6b5..d30499ccae3 100644
--- a/x11/xmx/Makefile
+++ b/x11/xmx/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.4 2003/06/02 01:15:33 jschauma Exp $
+# $NetBSD: Makefile,v 1.5 2003/07/17 22:56:54 grant Exp $
 
 DISTNAME=	xmx-2.1alpha.pl7
 PKGNAME=	xmx-2.1a7
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.cs.brown.edu/pub/xmx/
 
-MAINTAINER=	tech-pkg@netbsd.org
+MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.cs.brown.edu/software/xmx/
 COMMENT=	X11 Protocol Multiplexor
 
diff --git a/x11/xneko/Makefile b/x11/xneko/Makefile
index b03f8bcd35a..d80a43c1115 100644
--- a/x11/xneko/Makefile
+++ b/x11/xneko/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2003/06/02 01:15:33 jschauma Exp $
+# $NetBSD: Makefile,v 1.14 2003/07/17 22:57:00 grant Exp $
 # FreeBSD Id: Makefile,v 1.6 1997/03/12 08:21:35 asami Exp
 #
 
@@ -8,7 +8,7 @@ WRKSRC=		${WRKDIR}/pub/bsd-sources/4.4BSD-Lite/usr/src/games/xneko
 CATEGORIES=	x11 games
 MASTER_SITES=	ftp://ftp.cdrom.com/pub/bsd-sources/4.4BSD-Lite/usr/src/games/
 
-MAINTAINER=	tech-pkg@netbsd.org
+MAINTAINER=	tech-pkg@NetBSD.org
 COMMENT=	Classic BSD4.4 cat-and-mouse
 
 USE_X11BASE=	yes
diff --git a/x11/xosd/Makefile.common b/x11/xosd/Makefile.common
index 7d717e44634..9f49ee4451f 100644
--- a/x11/xosd/Makefile.common
+++ b/x11/xosd/Makefile.common
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile.common,v 1.3 2003/06/29 11:45:01 jmmv Exp $
+# $NetBSD: Makefile.common,v 1.4 2003/07/17 22:57:01 grant Exp $
 #
 
 DISTNAME=	xosd-2.2.2
 CATEGORIES=	x11
 MASTER_SITES=	http://www.ignavus.net/
 
-MAINTAINER=	jmmv@netbsd.org
+MAINTAINER=	jmmv@NetBSD.org
 HOMEPAGE=	http://www.ignavus.net/software.html
 
 DISTINFO_FILE=		${.CURDIR}/../../x11/xosd/distinfo
diff --git a/x11/xp/Makefile b/x11/xp/Makefile
index 231fa36c7a7..4cb0c998ec0 100644
--- a/x11/xp/Makefile
+++ b/x11/xp/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.5 2003/03/03 04:17:31 jschauma Exp $
+# $NetBSD: Makefile,v 1.6 2003/07/17 22:57:01 grant Exp $
 
 DISTNAME=	xp-1.2b10
 PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.ncl.ac.uk/pub/users/ngmt/X11/
 
-MAINTAINER=	jdc@netbsd.org
+MAINTAINER=	jdc@NetBSD.org
 COMMENT=	Fast X11 text file viewer using Athena widgets
 
 USE_IMAKE=	yes
diff --git a/x11/xpenguins/Makefile b/x11/xpenguins/Makefile
index 7be170b0994..5620c8671e7 100644
--- a/x11/xpenguins/Makefile
+++ b/x11/xpenguins/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.11 2002/08/25 21:52:51 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2003/07/17 22:57:01 grant Exp $
 #
 
 DISTNAME=	xpenguins-2.1
 CATEGORIES=	games x11
 MASTER_SITES=	http://xpenguins.seul.org/
 
-MAINTAINER=	hubertf@netbsd.org
+MAINTAINER=	hubertf@NetBSD.org
 HOMEPAGE=	http://xpenguins.seul.org/
 COMMENT=	Little penguins walking along the tops of your windows
 
diff --git a/x11/xplanet/Makefile b/x11/xplanet/Makefile
index 5369a4ad740..c444d8fc9e1 100644
--- a/x11/xplanet/Makefile
+++ b/x11/xplanet/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.11 2003/07/05 09:07:55 wulf Exp $
+# $NetBSD: Makefile,v 1.12 2003/07/17 22:57:01 grant Exp $
 #
 
 DISTNAME=		xplanet-1.0.1
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=xplanet/}
 
-MAINTAINER=		atatat@netbsd.org
+MAINTAINER=		atatat@NetBSD.org
 HOMEPAGE=		http://xplanet.sourceforge.net/
 COMMENT=		Rotating rendered map of the Earth in X11 root window
 
diff --git a/x11/xpmroot/Makefile b/x11/xpmroot/Makefile
index b294ae2a9be..482accacb65 100644
--- a/x11/xpmroot/Makefile
+++ b/x11/xpmroot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2003/06/01 06:53:28 martti Exp $
+# $NetBSD: Makefile,v 1.40 2003/07/17 22:57:02 grant Exp $
 #
 
 DISTNAME=       fvwm-${PKG_VERSION}
@@ -7,7 +7,7 @@ CATEGORIES=	x11
 MASTER_SITES=   ftp://ftp.fvwm.org/pub/fvwm/version-2/ \
 		ftp://ftp.hpc.uh.edu/pub/fvwm/version-2/
 
-MAINTAINER=	martti@netbsd.org
+MAINTAINER=	martti@NetBSD.org
 HOMEPAGE=	http://www.fvwm.org/generated/manpages/xpmroot.html
 COMMENT=	Sets the root window to an Xpm pixmap
 
diff --git a/x11/xpostit/Makefile b/x11/xpostit/Makefile
index 8f82818a146..0f2289a6ffe 100644
--- a/x11/xpostit/Makefile
+++ b/x11/xpostit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/06/02 01:15:32 jschauma Exp $
+# $NetBSD: Makefile,v 1.5 2003/07/17 22:57:02 grant Exp $
 #
 
 DISTNAME=	xpostit3.3.1
@@ -10,7 +10,7 @@ MASTER_SITES=	ftp://ftp.x.org/R5contrib/ \
 		ftp://ftp.freesoftware.com/pub/X11/R5contrib/
 EXTRACT_SUFX=	.tar.Z
 
-MAINTAINER=	tech-pkg@netbsd.org
+MAINTAINER=	tech-pkg@NetBSD.org
 COMMENT=	Post notes to yourself on the screen
 #HOMEPAGE=
 
diff --git a/x11/xscreensaver/Makefile.common b/x11/xscreensaver/Makefile.common
index d196214653a..b57a4daa53f 100644
--- a/x11/xscreensaver/Makefile.common
+++ b/x11/xscreensaver/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.51 2003/06/24 10:22:46 wiz Exp $
+# $NetBSD: Makefile.common,v 1.52 2003/07/17 22:57:02 grant Exp $
 #
 
 DISTNAME=		xscreensaver-4.11
@@ -6,7 +6,7 @@ CATEGORIES=		x11
 MASTER_SITES=		${HOMEPAGE} \
 			ftp://ftp.fu-berlin.de/unix/X11/graphics/xscreensaver/
 
-MAINTAINER=		tech-pkg@netbsd.org
+MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://www.jwz.org/xscreensaver/
 
 USE_BUILDLINK2=		yes
diff --git a/x11/xscribble/Makefile b/x11/xscribble/Makefile
index 82f06a9eddc..e7244b1276e 100644
--- a/x11/xscribble/Makefile
+++ b/x11/xscribble/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/06/02 01:15:32 jschauma Exp $
+# $NetBSD: Makefile,v 1.7 2003/07/17 22:57:03 grant Exp $
 
 DISTNAME=	xscribble
 PKGNAME=	xscribble-20000616
@@ -6,7 +6,7 @@ CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.handhelds.org/pub/apps/src/
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	tech-pkg@netbsd.org
+MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.handhelds.org/projects/xscribble.html
 COMMENT=	Handwriting recognition (like graffiti)
 
diff --git a/x11/xscript/Makefile b/x11/xscript/Makefile
index 8a60f990604..63ef655651c 100644
--- a/x11/xscript/Makefile
+++ b/x11/xscript/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2003/06/02 01:15:32 jschauma Exp $
+# $NetBSD: Makefile,v 1.6 2003/07/17 22:57:03 grant Exp $
 #
 
 DISTNAME=	xscript.tar
@@ -13,7 +13,7 @@ MASTER_SITES=	ftp://ftp.x.org/R5contrib/ \
 		ftp://ftp.darenet.dk/ny/mirrors/ftp.x.org/R5contrib/
 EXTRACT_SUFX=	.Z
 
-MAINTAINER=	tech-pkg@netbsd.org
+MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.ee.ryerson.ca/~elf/xapps/Q-XVIII.html
 COMMENT=	X Window system script recording and playback
 
diff --git a/x11/xservers/Makefile b/x11/xservers/Makefile
index 2f337229695..f47474daf99 100644
--- a/x11/xservers/Makefile
+++ b/x11/xservers/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.11 2002/12/07 02:39:08 schmonz Exp $#
+# $NetBSD: Makefile,v 1.12 2003/07/17 22:57:03 grant Exp $#
 
 DISTNAME=	xservers-3.3.6.3
 CATEGORIES=	x11
 MASTER_SITES=	# empty
 DISTFILES=	# empty
 
-MAINTAINER=	tron@netbsd.org
+MAINTAINER=	tron@NetBSD.org
 HOMEPAGE=	http://www.xfree86.org/
 COMMENT=	Old X11 servers for use under XFree86 4.x
 
diff --git a/x11/xsnow/Makefile b/x11/xsnow/Makefile
index ce2baf81f18..85a8d652012 100644
--- a/x11/xsnow/Makefile
+++ b/x11/xsnow/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2003/05/06 17:43:15 jmmv Exp $
+# $NetBSD: Makefile,v 1.15 2003/07/17 22:57:03 grant Exp $
 # FreeBSD Id: Makefile,v 1.7 1996/11/18 09:56:45 asami Exp
 #
 
@@ -7,7 +7,7 @@ PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://www.euronet.nl/~rja/Xsnow/
 
-MAINTAINER=	is@netbsd.org
+MAINTAINER=	is@NetBSD.org
 HOMEPAGE=	http://www.euronet.nl/~rja/Xsnow/
 COMMENT=	Create a snowy and Santa-y desktop
 
diff --git a/x11/xterm/Makefile b/x11/xterm/Makefile
index fb73eab2c91..0310f412a3e 100644
--- a/x11/xterm/Makefile
+++ b/x11/xterm/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.6 2003/07/15 13:19:44 tron Exp $
+# $NetBSD: Makefile,v 1.7 2003/07/17 22:57:04 grant Exp $
 
 DISTNAME=	xterm-164
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 
-MAINTAINER=	tech-pkg@netbsd.org
+MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://dickey.his.com/xterm/xterm.html
 COMMENT=	Latest terminal emulator for the X Window System
 
diff --git a/x11/xtermset/Makefile b/x11/xtermset/Makefile
index 90aec545d53..e2406c8371f 100644
--- a/x11/xtermset/Makefile
+++ b/x11/xtermset/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.7 2002/08/25 21:53:01 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2003/07/17 22:57:04 grant Exp $
 #
 
 DISTNAME=	xtermset-0.4
 CATEGORIES=	x11
 MASTER_SITES=	http://xtermset.netpedia.net/src/
 
-MAINTAINER=	hubertf@netbsd.org
+MAINTAINER=	hubertf@NetBSD.org
 HOMEPAGE=	http://xtermset.netpedia.net/
 COMMENT=	Change things like foreground color, size etc. on an xterm
 
diff --git a/x11/xtoolwait/Makefile b/x11/xtoolwait/Makefile
index bde1b1184b4..14c0af432ef 100644
--- a/x11/xtoolwait/Makefile
+++ b/x11/xtoolwait/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/03/03 04:17:27 jschauma Exp $
+# $NetBSD: Makefile,v 1.5 2003/07/17 22:57:04 grant Exp $
 #
 
 DISTNAME=	xtoolwait-1.3
@@ -6,7 +6,7 @@ PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://www.hacom.nl/~richard/software/
 
-MAINTAINER=	minoura@netbsd.org
+MAINTAINER=	minoura@NetBSD.org
 HOMEPAGE=	http://www.hacom.nl/~richard/software/xtoolwait.html
 COMMENT=	Free implementation of SunOS toolwait(1)
 
diff --git a/x11/xvattr/Makefile b/x11/xvattr/Makefile
index fd2999f8e3d..2ab473a6409 100644
--- a/x11/xvattr/Makefile
+++ b/x11/xvattr/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.7 2003/07/13 13:54:34 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2003/07/17 22:57:04 grant Exp $
 
 DISTNAME=	xvattr-1.3
 PKGREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	http://www.dtek.chalmers.se/groups/dvd/dist/
 
-MAINTAINER=	veego@netbsd.org
+MAINTAINER=	veego@NetBSD.org
 HOMEPAGE=	http://www.dtek.chalmers.se/groups/dvd/
 COMMENT=	Modify Xv attributes
 
diff --git a/x11/xview-clients/Makefile b/x11/xview-clients/Makefile
index 5863366ce55..1000a6b3ead 100644
--- a/x11/xview-clients/Makefile
+++ b/x11/xview-clients/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2003/03/29 12:43:15 jmmv Exp $
+# $NetBSD: Makefile,v 1.21 2003/07/17 22:57:05 grant Exp $
 # $FreeBSD Id: Makefile,v 1.11 1996/11/16 10:49:52 asami Exp
 #
 
@@ -9,7 +9,7 @@ WRKSRC=			${WRKDIR}/${DISTNAME}/clients
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_LOCAL}
 
-MAINTAINER=		jlam@netbsd.org
+MAINTAINER=		jlam@NetBSD.org
 COMMENT=		OpenLook applications and man pages
 
 NOT_FOR_PLATFORM=       *-*-alpha       # it builds but everything segfaults...
diff --git a/x11/xview-config/Makefile b/x11/xview-config/Makefile
index bbc29193818..cc787da6284 100644
--- a/x11/xview-config/Makefile
+++ b/x11/xview-config/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2003/03/29 12:43:15 jmmv Exp $
+# $NetBSD: Makefile,v 1.16 2003/07/17 22:57:05 grant Exp $
 # $FreeBSD Id: Makefile,v 1.9 1998/05/04 03:34:50 steve Exp
 #
 
@@ -9,7 +9,7 @@ WRKSRC=      		${WRKDIR}/${EXTRACT_ELEMENTS}
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_LOCAL}
 
-MAINTAINER=		jlam@netbsd.org
+MAINTAINER=		jlam@NetBSD.org
 COMMENT=		OpenLook Toolkit config files
 
 NO_SRC_ON_FTP=		Already in MASTER_SITE_LOCAL
diff --git a/x11/xview-lib/Makefile b/x11/xview-lib/Makefile
index be47229eb25..8352bdb9ac5 100644
--- a/x11/xview-lib/Makefile
+++ b/x11/xview-lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2003/03/03 04:17:26 jschauma Exp $
+# $NetBSD: Makefile,v 1.22 2003/07/17 22:57:06 grant Exp $
 # $FreeBSD Id: Makefile,v 1.13 1997/07/17 15:13:03 max Exp
 #
 
@@ -8,7 +8,7 @@ PKGREVISION=		3
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_LOCAL}
 
-MAINTAINER=		jlam@netbsd.org
+MAINTAINER=		jlam@NetBSD.org
 COMMENT=		OpenLook Toolkit libs, includes, and man pages
 
 DEPENDS=		xview-config>=3.2.1nb2:../../x11/xview-config
diff --git a/x11/xview/Makefile b/x11/xview/Makefile
index 8e2420d2ad0..6779172528f 100644
--- a/x11/xview/Makefile
+++ b/x11/xview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2003/03/28 21:14:42 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2003/07/17 22:57:05 grant Exp $
 #
 
 DISTNAME=	xview3.2p1-X11R6
@@ -7,7 +7,7 @@ CATEGORIES=	x11
 MASTER_SITES=	# empty
 DISTFILES=	# empty
 
-MAINTAINER=	jlam@netbsd.org
+MAINTAINER=	jlam@NetBSD.org
 COMMENT=	OpenLook Toolkit meta-package
 
 DEPENDS+=	xview-config>=3.2.1:../xview-config
diff --git a/x11/xwatchwin/Makefile b/x11/xwatchwin/Makefile
index c1a4f641575..a7b5019b46b 100644
--- a/x11/xwatchwin/Makefile
+++ b/x11/xwatchwin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2003/06/02 01:15:31 jschauma Exp $
+# $NetBSD: Makefile,v 1.8 2003/07/17 22:57:06 grant Exp $
 
 DISTNAME=	xwatchwin
 PKGNAME=	xwatchwin-1.1.1
@@ -6,7 +6,7 @@ PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	ftp://sunsite.uio.no/pub/X11/contrib/utilities/
 
-MAINTAINER=	tech-pkg@netbsd.org
+MAINTAINER=	tech-pkg@NetBSD.org
 COMMENT=	watch a window on another X server
 
 USE_BUILDLINK2=	yes
diff --git a/x11/xwit/Makefile b/x11/xwit/Makefile
index b3afdd42e3b..a569351d330 100644
--- a/x11/xwit/Makefile
+++ b/x11/xwit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/03/03 04:17:23 jschauma Exp $
+# $NetBSD: Makefile,v 1.5 2003/07/17 22:57:06 grant Exp $
 #
 
 DISTNAME=	xwit-3.4
@@ -6,7 +6,7 @@ PKGREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XCONTRIB:=utilities/}
 
-MAINTAINER=	seb@netbsd.org
+MAINTAINER=	seb@NetBSD.org
 COMMENT=	Utility for calling X11 functions from the shell
 
 USE_BUILDLINK2=	yes
diff --git a/x11/xwrits/Makefile b/x11/xwrits/Makefile
index a03ea231168..816d751765a 100644
--- a/x11/xwrits/Makefile
+++ b/x11/xwrits/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.12 2003/04/10 04:05:39 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.13 2003/07/17 22:57:06 grant Exp $
 
 DISTNAME=	xwrits-2.21
 CATEGORIES=	x11
 MASTER_SITES=	http://www.lcdf.org/~eddietwo/xwrits/
 
-MAINTAINER=	dmcmahill@netbsd.org
+MAINTAINER=	dmcmahill@NetBSD.org
 HOMEPAGE=	http://www.lcdf.org/~eddietwo/xwrits/
 COMMENT=	Wrist break reminder for prevention of repetitive stress injuries
author	grant <grant>	2003-07-17 22:50:55 +0000
committer	grant <grant>	2003-07-17 22:50:55 +0000
commit	016914e7f9e5498e9fdf870d12d99bfeb4e66d4a (patch)
tree	cd3d4acc598dfb939f2f2a0803f1432f55ec4ada /x11
parent	8a11869b703aead0cb98488574404b2b233f0b64 (diff)
download	pkgsrc-016914e7f9e5498e9fdf870d12d99bfeb4e66d4a.tar.gz