s/netbsd.org/NetBSD.org/

39 files changed, 78 insertions, 78 deletions

diff --git a/wm/9wm/Makefile b/wm/9wm/Makefile
index e372b21ec90..e3e8e9e680b 100644
--- a/wm/9wm/Makefile
+++ b/wm/9wm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/06/02 01:16:17 jschauma Exp $
+# $NetBSD: Makefile,v 1.9 2003/07/17 22:55:08 grant Exp $
 # FreeBSD Id: Makefile,v 1.4 1997/05/28 06:18:20 fenner Exp
 #
 
@@ -9,7 +9,7 @@ CATEGORIES=		plan9 wm
 MASTER_SITES=		ftp://ftp.freefriends.org/arnold/Source/
 EXTRACT_SUFX=		.shar.gz
 
-MAINTAINER=		tech-pkg@netbsd.org
+MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://dhog.g7.org/dhog/9wm.html
 COMMENT=		8 1/2-like Window Manager for X
 
diff --git a/wm/afterstep/Makefile b/wm/afterstep/Makefile
index d07c4cb91f4..5a85eab3190 100644
--- a/wm/afterstep/Makefile
+++ b/wm/afterstep/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2002/10/02 19:40:15 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2003/07/17 22:55:08 grant Exp $
 
 DISTNAME=	AfterStep-1.8.11
 PKGNAME=	afterstep-1.8.11
@@ -8,7 +8,7 @@ MASTER_SITES=	ftp://ftp.afterstep.org/stable/ \
 		ftp://ftp.digex.net/pub/X11/window-managers/afterstep/AfterStep/stable/
 EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=		fredb@netbsd.org
+MAINTAINER=		fredb@NetBSD.org
 HOMEPAGE=		http://www.afterstep.org/
 COMMENT=		NeXT-like window manager for X11
 
diff --git a/wm/amaterus/Makefile b/wm/amaterus/Makefile
index 42c51cb037b..bddc8e08b39 100644
--- a/wm/amaterus/Makefile
+++ b/wm/amaterus/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.9 2003/07/13 13:53:40 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2003/07/17 22:55:09 grant Exp $
 
 DISTNAME=	amaterus-0.34.1
 PKGREVISION=	2
 CATEGORIES=	wm
 MASTER_SITES=	http://www.taiyaki.org/src/
 
-MAINTAINER=	tech-pkg@netbsd.org
+MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.taiyaki.org/
 COMMENT=	GTK+ window manager
 
diff --git a/wm/bbconf/Makefile b/wm/bbconf/Makefile
index ef347b8b7e4..2c65a13e4db 100644
--- a/wm/bbconf/Makefile
+++ b/wm/bbconf/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2003/06/02 01:16:16 jschauma Exp $
+# $NetBSD: Makefile,v 1.4 2003/07/17 22:55:09 grant Exp $
 #
 
 DISTNAME=	bbconf-1.4
 CATEGORIES=	wm
 MASTER_SITES=	http://bbconf.sourceforge.net/code/
 
-MAINTAINER=	tech-pkg@netbsd.org
+MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://bbconf.sourceforge.net/
 COMMENT=	configuration tool for the blackbox window manager
 
diff --git a/wm/bbkeys/Makefile b/wm/bbkeys/Makefile
index 7615fd007ea..02d4942f39b 100644
--- a/wm/bbkeys/Makefile
+++ b/wm/bbkeys/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.9 2003/05/22 15:39:31 jschauma Exp $
+# $NetBSD: Makefile,v 1.10 2003/07/17 22:55:09 grant Exp $
 #
 
 DISTNAME=	bbkeys-0.8.6
 CATEGORIES=	x11 wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=bbkeys/}
 
-MAINTAINER=	jschauma@netbsd.org
+MAINTAINER=	jschauma@NetBSD.org
 HOMEPAGE=	http://bbkeys.sourceforge.net/
 COMMENT=	General X Window keygrabber
 
diff --git a/wm/bbpager/Makefile b/wm/bbpager/Makefile
index 5ebf3767e11..83dcc04d4de 100644
--- a/wm/bbpager/Makefile
+++ b/wm/bbpager/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2003/06/02 01:16:16 jschauma Exp $
+# $NetBSD: Makefile,v 1.6 2003/07/17 22:55:09 grant Exp $
 #
 
 DISTNAME=	bbpager-0.3.1
@@ -6,7 +6,7 @@ PKGREVISION=	1
 CATEGORIES=	wm x11
 MASTER_SITES=	http://bbtools.thelinuxcommunity.org/sources/
 
-MAINTAINER=	tech-pkg@netbsd.org
+MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://bbtools.thelinuxcommunity.org/available.phtml
 COMMENT=	pager for the blackbox window manager
 
diff --git a/wm/blackbox/Makefile b/wm/blackbox/Makefile
index b8323eb5191..fd6d5abc0ef 100644
--- a/wm/blackbox/Makefile
+++ b/wm/blackbox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2003/07/13 13:53:40 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2003/07/17 22:55:10 grant Exp $
 #
 
 DISTNAME=	blackbox-0.65.0
@@ -6,7 +6,7 @@ PKGREVISION=	4
 CATEGORIES=	wm x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=blackboxwm/}
 
-MAINTAINER=	jschauma@netbsd.org
+MAINTAINER=	jschauma@NetBSD.org
 HOMEPAGE=	http://blackboxwm.sourceforge.net/
 COMMENT=	small and fast X11R6 window manager
 
diff --git a/wm/bsetroot/Makefile b/wm/bsetroot/Makefile
index 57889bf27d0..3706374c8be 100644
--- a/wm/bsetroot/Makefile
+++ b/wm/bsetroot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/07/13 13:53:40 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2003/07/17 22:55:10 grant Exp $
 #
 
 DISTNAME=	blackbox-0.65.0
@@ -7,7 +7,7 @@ PKGREVISION=	4
 CATEGORIES=	wm x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=blackboxwm/}
 
-MAINTAINER=	jschauma@netbsd.org
+MAINTAINER=	jschauma@NetBSD.org
 HOMEPAGE=	http://blackboxwm.sourceforge.net/
 COMMENT=	tools to set the root windows background
 
diff --git a/wm/ctwm/Makefile b/wm/ctwm/Makefile
index 1c5bc93e87d..6dba8825dcb 100644
--- a/wm/ctwm/Makefile
+++ b/wm/ctwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2003/06/10 07:40:52 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2003/07/17 22:55:10 grant Exp $
 #
 
 DISTNAME=	ctwm-3.6
@@ -7,7 +7,7 @@ MASTER_SITES=	http://ctwm.free.lp.se/dist/
 # XXX: 3.6 didn't include the XPMs, XPM tarball generated from 3.5.2 manually
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}-xpm${EXTRACT_SUFX}
 
-MAINTAINER=	tech-pkg@netbsd.org
+MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://ctwm.free.lp.se/
 COMMENT=	Window manager with support for multiple virtual screens and GNOME 1.x
 
diff --git a/wm/enlightenment/Makefile b/wm/enlightenment/Makefile
index 074a7f1d274..461cba3f775 100644
--- a/wm/enlightenment/Makefile
+++ b/wm/enlightenment/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2003/07/13 13:53:41 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2003/07/17 22:55:10 grant Exp $
 #
 
 DISTNAME=		enlightenment-0.16.4
@@ -6,7 +6,7 @@ PKGREVISION=		4
 CATEGORIES=		x11 gnome wm
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=enlightenment/}
 
-MAINTAINER=		tech-pkg@netbsd.org
+MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://www.enlightenment.org/
 COMMENT=		Highly themeable and configurable window manager
 
diff --git a/wm/ethemes/Makefile b/wm/ethemes/Makefile
index b1d3e17e7b1..131ce1e41bf 100644
--- a/wm/ethemes/Makefile
+++ b/wm/ethemes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2003/06/02 01:16:15 jschauma Exp $
+# $NetBSD: Makefile,v 1.8 2003/07/17 22:55:11 grant Exp $
 
 #
 # There is no distinfo file since the files change contents so often on the
@@ -11,7 +11,7 @@ CATEGORIES=	x11 wm
 MASTER_SITES=	ftp://themes.org/pub/themes/e/
 DISTFILES=	${E_THEMES}
 
-MAINTAINER=	tech-pkg@netbsd.org
+MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://e.themes.org/
 COMMENT=	Themes for the window manager Enlightenment
 
diff --git a/wm/fluxbox/Makefile b/wm/fluxbox/Makefile
index bdf2e5d2386..9257ac831bd 100644
--- a/wm/fluxbox/Makefile
+++ b/wm/fluxbox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2003/05/29 23:14:10 grant Exp $
+# $NetBSD: Makefile,v 1.11 2003/07/17 22:55:11 grant Exp $
 #
 
 DISTNAME=	fluxbox-0.1.14
@@ -7,7 +7,7 @@ CATEGORIES=	wm x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=fluxbox/}
 EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=	jmcneill@netbsd.org
+MAINTAINER=	jmcneill@NetBSD.org
 HOMEPAGE=	http://fluxbox.sourceforge.net/
 COMMENT=	Window Manager for X based on Blackbox
 
diff --git a/wm/flwm/Makefile b/wm/flwm/Makefile
index 7ef422b3dc3..85bb00dddac 100644
--- a/wm/flwm/Makefile
+++ b/wm/flwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2003/06/02 01:16:15 jschauma Exp $
+# $NetBSD: Makefile,v 1.11 2003/07/17 22:55:11 grant Exp $
 #
 
 DISTNAME=	flwm-1.00
@@ -6,7 +6,7 @@ CATEGORIES=	x11 wm
 MASTER_SITES=	http://flwm.sourceforge.net/
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	tech-pkg@netbsd.org
+MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://flwm.sourceforge.net/
 COMMENT=	The Fast, Light Window Manager
 
diff --git a/wm/fvwm1/Makefile b/wm/fvwm1/Makefile
index d2ea706f6a8..b6fd3c9b725 100644
--- a/wm/fvwm1/Makefile
+++ b/wm/fvwm1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2003/03/03 03:32:32 jschauma Exp $
+# $NetBSD: Makefile,v 1.10 2003/07/17 22:55:12 grant Exp $
 # FreeBSD Id: Makefile,v 1.12 1997/10/11 10:42:43 jkh Exp
 #
 
@@ -7,7 +7,7 @@ PKGNAME=	${DISTNAME:S/fvwm/fvwm1/}
 CATEGORIES=	x11 wm
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 
-MAINTAINER=	cjs@netbsd.org
+MAINTAINER=	cjs@NetBSD.org
 HOMEPAGE=	http://www.fvwm.org/
 COMMENT=	Virtual window manager for X
 
diff --git a/wm/fvwm2-themes/Makefile b/wm/fvwm2-themes/Makefile
index 753d76993ff..2f6a5958ac4 100644
--- a/wm/fvwm2-themes/Makefile
+++ b/wm/fvwm2-themes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/02/16 08:04:20 salo Exp $
+# $NetBSD: Makefile,v 1.2 2003/07/17 22:55:12 grant Exp $
 #
 
 DISTNAME=	fvwm-themes-${THEM_VER}
@@ -9,7 +9,7 @@ EXTRACT_SUFX=	.tar.bz2
 DISTFILES+=	${DISTNAME}${EXTRACT_SUFX}	\
 		fvwm-themes-extra-${THEM_VER}.tar.bz2
 
-MAINTAINER=	gendalia@netbsd.org
+MAINTAINER=	gendalia@NetBSD.org
 HOMEPAGE=	http://fvwm-themes.sourceforge.net
 COMMENT=	configuration framework for fvwm2 with samples
 
diff --git a/wm/fvwm2/Makefile b/wm/fvwm2/Makefile
index bd9a01c4761..e18711b77fa 100644
--- a/wm/fvwm2/Makefile
+++ b/wm/fvwm2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2003/07/13 13:53:41 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2003/07/17 22:55:12 grant Exp $
 # FreeBSD Id: Makefile,v 1.12 1997/10/11 10:42:43 jkh Exp
 #
 
@@ -11,7 +11,7 @@ MASTER_SITES=	ftp://ftp.fvwm.org/pub/fvwm/version-2/ \
 		ftp://ftp.hpc.uh.edu/pub/fvwm/version-2/
 DISTFILES+=	fvwm-${FVWM_VER}.tar.gz fvwm_icons.tgz
 
-MAINTAINER=	martti@netbsd.org
+MAINTAINER=	martti@NetBSD.org
 HOMEPAGE=	http://www.fvwm.org/
 COMMENT=	Newer version of X11 Virtual window manager
 
diff --git a/wm/icewm/Makefile.common b/wm/icewm/Makefile.common
index 8d99e86e4c8..33051156ef8 100644
--- a/wm/icewm/Makefile.common
+++ b/wm/icewm/Makefile.common
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.common,v 1.27 2003/07/16 07:41:33 tron Exp $
+# $NetBSD: Makefile.common,v 1.28 2003/07/17 22:55:12 grant Exp $
 
 DISTNAME=		icewm-1.2.9
 CATEGORIES=		x11 wm
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=icewm/}
 
-MAINTAINER=		tech-pkg@netbsd.org
+MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://icewm.sourceforge.net/
 
 GNU_CONFIGURE=		# defined
diff --git a/wm/icewmconf/Makefile b/wm/icewmconf/Makefile
index 19a41f33fbd..55b84b5e53e 100644
--- a/wm/icewmconf/Makefile
+++ b/wm/icewmconf/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.4 2003/06/02 01:16:14 jschauma Exp $
+# $NetBSD: Makefile,v 1.5 2003/07/17 22:55:13 grant Exp $
 
 DISTNAME=	icewmconf-2.1.0
 WRKSRC=		${WRKDIR}
 CATEGORIES=	wm
 MASTER_SITES=	http://sdboyd.dyndns.org/icewmconf/
 
-MAINTAINER=	tech-pkg@netbsd.org
+MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://sdboyd.dyndns.org/icewmconf/
 COMMENT=	Graphical configuration tool for IceWM
 
diff --git a/wm/ion/Makefile b/wm/ion/Makefile
index 86416f04d3f..dac9d8b62e1 100644
--- a/wm/ion/Makefile
+++ b/wm/ion/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.7 2003/03/07 01:25:09 salo Exp $
+# $NetBSD: Makefile,v 1.8 2003/07/17 22:55:13 grant Exp $
 #
 
 DISTNAME=	ion-20020207
 CATEGORIES=	x11 wm
 MASTER_SITES=	http://modeemi.cs.tut.fi/~tuomov/dl/
 
-MAINTAINER=	daniel@codefactory.se,zuntum@netbsd.org
+MAINTAINER=	daniel@codefactory.se,zuntum@NetBSD.org
 HOMEPAGE=	http://modeemi.cs.tut.fi/~tuomov/ion/
 COMMENT=	keyboard friendly tiling window manager
 
diff --git a/wm/larswm/Makefile b/wm/larswm/Makefile
index c130c502b13..88ae3acd41a 100644
--- a/wm/larswm/Makefile
+++ b/wm/larswm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2003/05/16 08:21:50 salo Exp $
+# $NetBSD: Makefile,v 1.4 2003/07/17 22:55:14 grant Exp $
 #
 
 DISTNAME=	larswm-7.2.10
@@ -6,7 +6,7 @@ CATEGORIES=	wm x11
 MASTER_SITES=	http://www-personal.umich.edu/~larsb/larswm/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DOCFILES}
 
-MAINTAINER=	jschauma@netbsd.org
+MAINTAINER=	jschauma@NetBSD.org
 HOMEPAGE=	http://www-personal.umich.edu/~larsb/larswm/
 COMMENT=	9wm-like window manager
 
diff --git a/wm/lwm/Makefile b/wm/lwm/Makefile
index 48fe42fd940..1731fd2fcd2 100644
--- a/wm/lwm/Makefile
+++ b/wm/lwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/08/22 17:39:00 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2003/07/17 22:55:14 grant Exp $
 #
 
 DISTNAME=	lwm
@@ -7,7 +7,7 @@ WRKSRC=		${WRKDIR}/lwm-1.00
 CATEGORIES=	x11 wm
 MASTER_SITES=	http://users.ch.genedata.com/~enh/lwm/
 
-MAINTAINER=	jwise@netbsd.org
+MAINTAINER=	jwise@NetBSD.org
 HOMEPAGE=	http://users.ch.genedata.com/~enh/lwm/
 COMMENT=	Lightweight Window Manager
 
diff --git a/wm/matchbox/Makefile b/wm/matchbox/Makefile
index 76997209387..498cb6f8158 100644
--- a/wm/matchbox/Makefile
+++ b/wm/matchbox/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.8 2003/06/17 15:09:59 agc Exp $
+# $NetBSD: Makefile,v 1.9 2003/07/17 22:55:14 grant Exp $
 #
 
 DISTNAME=	matchbox-0.3.6
 CATEGORIES=	wm x11
 MASTER_SITES=	http://handhelds.org/~mallum/downloadables/matchbox/
 
-MAINTAINER=	tech-pkg@netbsd.org
+MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://handhelds.org/~mallum/matchbox/
 COMMENT=	window manager designed for computers with small displays
 
diff --git a/wm/metacity-setup/Makefile b/wm/metacity-setup/Makefile
index ac1a59aed4a..ffb131c149e 100644
--- a/wm/metacity-setup/Makefile
+++ b/wm/metacity-setup/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2003/07/13 13:53:43 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2003/07/17 22:55:15 grant Exp $
 #
 
 DISTNAME=	metacity-setup-0.7.1
@@ -6,7 +6,7 @@ PKGREVISION=	1
 CATEGORIES=	wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=metacity-setup/}
 
-MAINTAINER=	tech-pkg@netbsd.org
+MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.sourceforge.net/projects/metacity-setup/
 COMMENT=	Configuration editor for Metacity
 
diff --git a/wm/metacity/Makefile b/wm/metacity/Makefile
index 2e1d5138566..4dafa98c93b 100644
--- a/wm/metacity/Makefile
+++ b/wm/metacity/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2003/07/13 13:53:43 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2003/07/17 22:55:14 grant Exp $
 #
 
 DISTNAME=	metacity-2.4.34
@@ -7,7 +7,7 @@ CATEGORIES=	wm x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/metacity/2.4/}
 EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=	tech-pkg@netbsd.org
+MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.gnome.org/softwaremap/projects/Metacity
 COMMENT=	GNOME-compliant window manager
 
diff --git a/wm/piewm/Makefile b/wm/piewm/Makefile
index 953031fafcf..58747db0693 100644
--- a/wm/piewm/Makefile
+++ b/wm/piewm/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2003/06/02 01:16:13 jschauma Exp $
+# $NetBSD: Makefile,v 1.4 2003/07/17 22:55:15 grant Exp $
 
 DISTNAME=	piewm-1.02
 PKGREVISION=	1
 CATEGORIES=	wm
 MASTER_SITES=	ftp://ftp.crynwr.com/piewm/
 
-MAINTAINER=	tech-pkg@netbsd.org
+MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.crynwr.com/piewm/
 COMMENT=	minimalist window manager based on tvtwm with pie menus
 
diff --git a/wm/pwm/Makefile b/wm/pwm/Makefile
index fd51e4862a6..ef1aa9c5bf9 100644
--- a/wm/pwm/Makefile
+++ b/wm/pwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/06/13 03:55:17 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2003/07/17 22:55:15 grant Exp $
 #
 
 DISTNAME=	pwm-20030528
@@ -7,7 +7,7 @@ PKGREVISION=	1
 CATEGORIES=	wm x11
 MASTER_SITES=	http://modeemi.cs.tut.fi/~tuomov/dl/
 
-MAINTAINER=	salo@netbsd.org
+MAINTAINER=	salo@NetBSD.org
 HOMEPAGE=	http://www.students.tut.fi/~tuomov/pwm/
 COMMENT=	Window manager that frames multiple client windows in a single frame
 
diff --git a/wm/qvwm/Makefile b/wm/qvwm/Makefile
index 1c40ee97c62..da3a19892bd 100644
--- a/wm/qvwm/Makefile
+++ b/wm/qvwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/07/13 13:53:43 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2003/07/17 22:55:16 grant Exp $
 #
 
 DISTNAME=	qvwm-1.1.12
@@ -6,7 +6,7 @@ PKGREVISION=	1
 CATEGORIES=	wm
 MASTER_SITES=	ftp://www.qvwm.org/pub/qvwm/
 
-MAINTAINER=	tech-pkg@netbsd.org
+MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.qvwm.org/
 COMMENT=	Windows 95/98/NT like window manager for X11
 
diff --git a/wm/ratpoison/Makefile b/wm/ratpoison/Makefile
index 6804e03c4e9..dc4752f1b23 100644
--- a/wm/ratpoison/Makefile
+++ b/wm/ratpoison/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.9 2003/07/12 01:37:55 zuntum Exp $
+# $NetBSD: Makefile,v 1.10 2003/07/17 22:55:16 grant Exp $
 #
 
 DISTNAME=	ratpoison-1.2.2
 CATEGORIES=	wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ratpoison/}
 
-MAINTAINER=	zuntum@netbsd.org
+MAINTAINER=	zuntum@NetBSD.org
 HOMEPAGE=	http://ratpoison.sourceforge.net/
 COMMENT=	Simple window manager with no fat library dependencies
 
diff --git a/wm/sawfish-themes/Makefile b/wm/sawfish-themes/Makefile
index 64ba3923b00..3ad3a4bfe7e 100644
--- a/wm/sawfish-themes/Makefile
+++ b/wm/sawfish-themes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/03/28 21:14:38 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2003/07/17 22:55:16 grant Exp $
 
 DISTNAME=		sawfish-themes-0.2
 PKGREVISION=		1
@@ -6,7 +6,7 @@ CATEGORIES=		x11 wm
 DYNAMIC_MASTER_SITES=	yes
 DISTFILES=		${SAWFISH_THEMES}
 
-MAINTAINER=		jschauma@netbsd.org
+MAINTAINER=		jschauma@NetBSD.org
 HOMEPAGE=		http://themes.freshmeat.net/browse/926/
 COMMENT=		Themes for the sawfish window manager
 
diff --git a/wm/sawfish/Makefile.common b/wm/sawfish/Makefile.common
index b5482e5c8c4..e7251fc1d84 100644
--- a/wm/sawfish/Makefile.common
+++ b/wm/sawfish/Makefile.common
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile.common,v 1.15 2003/05/02 12:15:29 wiz Exp $
+# $NetBSD: Makefile.common,v 1.16 2003/07/17 22:55:16 grant Exp $
 
 DISTNAME=		sawfish-${SF_VERS}-gtk1
 SF_VERS=		1.2
 CATEGORIES=		x11 gnome wm
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=sawmill/}
 
-MAINTAINER=		jlam@netbsd.org
+MAINTAINER=		jlam@NetBSD.org
 HOMEPAGE=		http://sawmill.sourceforge.net/
 
 DEPENDS+=		rep-gtk>=0.15nb2:../../x11/rep-gtk
diff --git a/wm/tvtwm/Makefile b/wm/tvtwm/Makefile
index 0cec600451f..ae97931de16 100644
--- a/wm/tvtwm/Makefile
+++ b/wm/tvtwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2003/06/02 01:16:13 jschauma Exp $
+# $NetBSD: Makefile,v 1.8 2003/07/17 22:55:17 grant Exp $
 
 DISTNAME=	tvtwm.pl11
 PKGNAME=	tvtwm-11
@@ -7,7 +7,7 @@ WRKSRC=		${WRKDIR}/tvtwm
 CATEGORIES=	x11 wm
 MASTER_SITES=	${MASTER_SITE_XCONTRIB:=window_managers/}
 
-MAINTAINER=	tech-pkg@netbsd.org
+MAINTAINER=	tech-pkg@NetBSD.org
 COMMENT=	Classic twm with virtual desktop support
 
 USE_BUILDLINK2=	YES
diff --git a/wm/uwm/Makefile b/wm/uwm/Makefile
index 14280dac830..2be8a4cfc49 100644
--- a/wm/uwm/Makefile
+++ b/wm/uwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/06/02 01:16:12 jschauma Exp $
+# $NetBSD: Makefile,v 1.7 2003/07/17 22:55:17 grant Exp $
 
 DISTNAME=	X.V11R3uwm
 PKGNAME=	uwm-19881027
@@ -7,7 +7,7 @@ WRKSRC=		${WRKDIR}/X.V11R3/clients/uwm
 CATEGORIES=	x11 wm
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 
-MAINTAINER=	tech-pkg@netbsd.org
+MAINTAINER=	tech-pkg@NetBSD.org
 #HOMEPAGE=	http://www.x.org/
 COMMENT=	X11R3 window manager
 
diff --git a/wm/wampager/Makefile b/wm/wampager/Makefile
index 63109942b82..0fd4b5a56fc 100644
--- a/wm/wampager/Makefile
+++ b/wm/wampager/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2003/06/02 01:16:12 jschauma Exp $
+# $NetBSD: Makefile,v 1.4 2003/07/17 22:55:17 grant Exp $
 #
 
 DISTNAME=	wampager-0.9.1
 CATEGORIES=	wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=waimea/}
 
-MAINTAINER=	tech-pkg@netbsd.org
+MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.waimea.org/wampager_info.html
 COMMENT=	Virtual pager dockapp for the Waimea Window Manager
 
diff --git a/wm/whiteBOX/Makefile b/wm/whiteBOX/Makefile
index 71cd9ca1cd6..80e94fd2933 100644
--- a/wm/whiteBOX/Makefile
+++ b/wm/whiteBOX/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2003/05/17 05:45:09 salo Exp $
+# $NetBSD: Makefile,v 1.8 2003/07/17 22:55:17 grant Exp $
 #
 
 DISTNAME=	whiteBOX-0.5
@@ -6,7 +6,7 @@ PKGREVISION=	2
 CATEGORIES=	wm x11
 MASTER_SITES=	http://whitebox.sourceforge.net/dist/
 
-MAINTAINER=	jschauma@netbsd.org
+MAINTAINER=	jschauma@NetBSD.org
 HOMEPAGE=	http://whitebox.sourceforge.net/
 COMMENT=	Multi-purpose configuration tool for Blackbox
 
diff --git a/wm/windowmaker/Makefile b/wm/windowmaker/Makefile
index 4600db9fac2..188eb1ff6f7 100644
--- a/wm/windowmaker/Makefile
+++ b/wm/windowmaker/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2003/07/13 13:53:44 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2003/07/17 22:55:18 grant Exp $
 
 DISTNAME=		WindowMaker-0.80.2
 PKGNAME=		windowmaker-0.80.2
@@ -8,7 +8,7 @@ MASTER_SITES=		ftp://ftp.windowmaker.org/pub/source/release/ \
 			ftp://ftp.ics.es.osaka-u.ac.jp/mirrors/WindowMaker/source/release/
 EXTRACT_SUFX=		.tar.bz2
 
-MAINTAINER=		jlam@netbsd.org
+MAINTAINER=		jlam@NetBSD.org
 HOMEPAGE=		http://www.windowmaker.org/
 COMMENT=		GNUStep-compliant NEXTSTEP(tm) window manager clone
 
diff --git a/wm/wmakerconf/Makefile b/wm/wmakerconf/Makefile
index 8f5b1dfda17..5c8b62937f2 100644
--- a/wm/wmakerconf/Makefile
+++ b/wm/wmakerconf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2003/07/13 13:53:45 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2003/07/17 22:55:18 grant Exp $
 #
 
 DISTNAME=	wmakerconf-2.8.1
@@ -7,7 +7,7 @@ CATEGORIES=	x11 wm windowmaker
 MASTER_SITES=	http://ulli.on.openave.net/wmakerconf/
 EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=	wiz@netbsd.org
+MAINTAINER=	wiz@NetBSD.org
 HOMEPAGE=	http://ulli.on.openave.net/wmakerconf/
 COMMENT=	Gtk+ based configuration tool for Window Maker
 
diff --git a/wm/wmextra/Makefile b/wm/wmextra/Makefile
index c3340eb6d98..a21821c93b2 100644
--- a/wm/wmextra/Makefile
+++ b/wm/wmextra/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/04/26 09:49:37 jmmv Exp $
+# $NetBSD: Makefile,v 1.7 2003/07/17 22:55:18 grant Exp $
 #
 
 DISTNAME=		WindowMaker-extra-0.1
@@ -7,7 +7,7 @@ PKGREVISION=		1
 CATEGORIES=		x11 wm windowmaker
 MASTER_SITES=		ftp://ftp.windowmaker.org/pub/source/release/
 
-MAINTAINER=		jlam@netbsd.org
+MAINTAINER=		jlam@NetBSD.org
 HOMEPAGE=		http://www.windowmaker.org/
 COMMENT=		Extras for Window Maker window manager
 
diff --git a/wm/wmthemes/Makefile b/wm/wmthemes/Makefile
index 330c588b004..a0c02a2b5a1 100644
--- a/wm/wmthemes/Makefile
+++ b/wm/wmthemes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2003/06/02 01:16:12 jschauma Exp $
+# $NetBSD: Makefile,v 1.16 2003/07/17 22:55:19 grant Exp $
 
 #
 # There is no distinfo file since the files change contents so often on the
@@ -11,7 +11,7 @@ CATEGORIES=	x11 wm windowmaker
 MASTER_SITES=	http://download.themes.org/wm/
 DISTFILES=	${THEME_FILES}
 
-MAINTAINER=	tech-pkg@netbsd.org
+MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://wm.themes.org/
 COMMENT=	Themes for the window manager WindowMaker
 
diff --git a/wm/wmx/Makefile.common b/wm/wmx/Makefile.common
index bad7444b356..986422976f7 100644
--- a/wm/wmx/Makefile.common
+++ b/wm/wmx/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.4 2003/05/05 16:15:17 fredb Exp $
+# $NetBSD: Makefile.common,v 1.5 2003/07/17 22:55:19 grant Exp $
 
 DISTNAME=	wmx-6
 WMX_VERS=	6.0
@@ -6,7 +6,7 @@ PKGREVISION=	1
 CATEGORIES+=	x11 wm
 MASTER_SITES=	http://www.all-day-breakfast.com/wmx/
 
-MAINTAINER=	jlam@netbsd.org
+MAINTAINER=	jlam@NetBSD.org
 HOMEPAGE=	http://www.all-day-breakfast.com/wmx/
 
 CONFLICTS+=	wmx-[0-9]* wmx-gnome-[0-9]*