s/netbsd.org/NetBSD.org/

47 files changed, 94 insertions, 94 deletions

diff --git a/cad/acs/Makefile b/cad/acs/Makefile
index 969c5286e6d..d91bd875b30 100644
--- a/cad/acs/Makefile
+++ b/cad/acs/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.6 2001/07/05 12:01:32 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.7 2003/07/17 21:24:43 grant Exp $
 #
 
 DISTNAME=	acs-0.29
 CATEGORIES=	cad
 MASTER_SITES=	ftp://ftp.geda.seul.org/pub/geda/dist/
 
-MAINTAINER=	dmcmahill@netbsd.org
+MAINTAINER=	dmcmahill@NetBSD.org
 HOMEPAGE=	http://www.geda.seul.org/tools/acs/index.html
 COMMENT=	general purpose circuit simulator
 
diff --git a/cad/atlc/Makefile b/cad/atlc/Makefile
index 3493f3e6e1c..2e6bf5d118a 100644
--- a/cad/atlc/Makefile
+++ b/cad/atlc/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2003/02/01 15:16:24 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.3 2003/07/17 21:24:44 grant Exp $
 #
 
 DISTNAME=	atlc-4.2.10
 CATEGORIES=	cad
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=atlc/}
 
-MAINTAINER=	dmcmahill@netbsd.org
+MAINTAINER=	dmcmahill@NetBSD.org
 HOMEPAGE=	http://atlc.sourceforge.net
 COMMENT=	Calculates the impedance of arbitrary cross section transmission lines
 
diff --git a/cad/boolean/Makefile b/cad/boolean/Makefile
index 0cf2d875653..c09cfe227df 100644
--- a/cad/boolean/Makefile
+++ b/cad/boolean/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2003/07/13 13:50:40 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2003/07/17 21:24:45 grant Exp $
 #
 
 DISTNAME=	boolean
@@ -8,7 +8,7 @@ CATEGORIES=	cad graphics
 MASTER_SITES=	http://www.xs4all.nl/~kholwerd/download/boolzip/
 EXTRACT_SUFX=	.zip
 
-MAINTAINER=	dmcmahill@netbsd.org
+MAINTAINER=	dmcmahill@NetBSD.org
 HOMEPAGE=	http://www.xs4all.nl/~kholwerd/bool.html
 COMMENT=	GDSII viewer/editor + (boolean) operations on sets of 2d polygons
 
diff --git a/cad/cascade/Makefile b/cad/cascade/Makefile
index 12a16fbf88b..b435f92badd 100644
--- a/cad/cascade/Makefile
+++ b/cad/cascade/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2001/09/06 22:58:37 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.4 2003/07/17 21:24:46 grant Exp $
 #
 
 DISTNAME=	cascade-1.4
 CATEGORIES=	cad
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=rfcascade/}
 
-MAINTAINER=	dmcmahill@netbsd.org
+MAINTAINER=	dmcmahill@NetBSD.org
 HOMEPAGE=	http://rfcascade.sourceforge.net
 COMMENT=	Simple tool to analyze noise and distortion of a RF system
 
diff --git a/cad/covered-current/Makefile b/cad/covered-current/Makefile
index 2e5a61e869c..a33dbeff805 100644
--- a/cad/covered-current/Makefile
+++ b/cad/covered-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2003/02/22 13:46:50 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.4 2003/07/17 21:24:47 grant Exp $
 #
 
 DISTNAME=	covered-${SNAPDATE}
@@ -6,7 +6,7 @@ PKGNAME=	covered-current-${SNAPDATE}
 CATEGORIES=	cad
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=covered/}
 
-MAINTAINER=	dmcmahill@netbsd.org
+MAINTAINER=	dmcmahill@NetBSD.org
 HOMEPAGE=	http://covered.sourceforge.net
 COMMENT=	Verilog code coverage analyzer
 
diff --git a/cad/dinotrace-mode/Makefile b/cad/dinotrace-mode/Makefile
index aaad1784b74..1bb64e3e1b1 100644
--- a/cad/dinotrace-mode/Makefile
+++ b/cad/dinotrace-mode/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/04/21 02:08:59 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.2 2003/07/17 21:24:48 grant Exp $
 #
 
 DISTNAME=	dinotrace-9.1i
@@ -6,7 +6,7 @@ PKGNAME=	dinotrace-mode-9.1i
 CATEGORIES=	cad editors
 MASTER_SITES=	http://www.veripool.com/ftp/
 
-MAINTAINER=	dmcmahill@netbsd.org
+MAINTAINER=	dmcmahill@NetBSD.org
 HOMEPAGE= 	http://www.veripool.com/dinotrace/
 COMMENT=	Emacs major mode for dinotrace
 
diff --git a/cad/dinotrace/Makefile b/cad/dinotrace/Makefile
index 5a0fb053bf8..6d08dd6ba6e 100644
--- a/cad/dinotrace/Makefile
+++ b/cad/dinotrace/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.22 2003/07/15 09:48:35 drochner Exp $
+# $NetBSD: Makefile,v 1.23 2003/07/17 21:24:48 grant Exp $
 #
 
 DISTNAME=	dinotrace-9.1k
 CATEGORIES=	cad
 MASTER_SITES=	http://www.veripool.com/ftp/
 
-MAINTAINER=	dmcmahill@netbsd.org
+MAINTAINER=	dmcmahill@NetBSD.org
 HOMEPAGE= 	http://www.veripool.com/dinotrace/
 COMMENT=	tool for viewing the output of digital simulators
 
diff --git a/cad/eagle/Makefile b/cad/eagle/Makefile
index 3d392a1ef17..9fb8803dd38 100644
--- a/cad/eagle/Makefile
+++ b/cad/eagle/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2003/03/26 04:05:52 jschauma Exp $
+# $NetBSD: Makefile,v 1.8 2003/07/17 21:24:49 grant Exp $
 #
 
 DISTNAME=		eagle-4.09r2e
@@ -8,7 +8,7 @@ CATEGORIES=		cad
 MASTER_SITES=		ftp://ftp.cadsoft.de/pub/program/4.09r2/
 EXTRACT_SUFX=		.tgz
 
-MAINTAINER=		rh@netbsd.org
+MAINTAINER=		rh@NetBSD.org
 HOMEPAGE=		http://www.cadsoft.de/
 COMMENT=		easy to use printed circuit board editor
 
diff --git a/cad/electric/Makefile b/cad/electric/Makefile
index 1bbb5b43f83..4e365084ba7 100644
--- a/cad/electric/Makefile
+++ b/cad/electric/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.4 2003/02/09 14:38:52 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2003/07/17 21:24:51 grant Exp $
 #
 
 DISTNAME=	electric-6.05
 CATEGORIES=	cad
 MASTER_SITES=	${MASTER_SITE_GNU:=electric/}
 
-MAINTAINER=	dmcmahill@netbsd.org
+MAINTAINER=	dmcmahill@NetBSD.org
 HOMEPAGE=	http://www.gnu.org/software/electric/electric.html
 COMMENT=	Electrical CAD system
 
diff --git a/cad/fastcap/Makefile b/cad/fastcap/Makefile
index 8a7d11ddece..d3ac7775f6c 100644
--- a/cad/fastcap/Makefile
+++ b/cad/fastcap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2003/06/11 20:50:51 abs Exp $
+# $NetBSD: Makefile,v 1.12 2003/07/17 21:24:52 grant Exp $
 #
 
 DISTNAME=	fastcap-2.0-15Jul92
@@ -12,7 +12,7 @@ DISTFILES=	fastcap-2.0-15Jul92.tar.Z \
 		mtt.ps.Z \
 		tcad.ps.Z
 
-MAINTAINER=	dmcmahill@netbsd.org
+MAINTAINER=	dmcmahill@NetBSD.org
 HOMEPAGE=	http://kontiki.mit.edu/rle/research/info_research_proj.html
 COMMENT=	Fast 3-D capacitance solver
 
diff --git a/cad/fasthenry/Makefile b/cad/fasthenry/Makefile
index 8462ec06dcb..57e01ec8a16 100644
--- a/cad/fasthenry/Makefile
+++ b/cad/fasthenry/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2003/06/11 20:50:51 abs Exp $
+# $NetBSD: Makefile,v 1.15 2003/07/17 21:24:53 grant Exp $
 #
 
 DISTNAME=	fasthenry-3.0-12Nov96
@@ -8,7 +8,7 @@ CATEGORIES=	cad
 MASTER_SITES=	ftp://rle-vlsi.mit.edu/pub/fasthenry/
 EXTRACT_SUFX=	.tar.Z
 
-MAINTAINER=	dmcmahill@netbsd.org
+MAINTAINER=	dmcmahill@NetBSD.org
 HOMEPAGE=	http://kontiki.mit.edu/rle/research/info_research_proj.html
 COMMENT=	Three-dimensional inductance extraction program
 
diff --git a/cad/felt/Makefile b/cad/felt/Makefile
index 43dd3881b69..d2bdfe1d67e 100644
--- a/cad/felt/Makefile
+++ b/cad/felt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2003/06/02 01:21:28 jschauma Exp $
+# $NetBSD: Makefile,v 1.22 2003/07/17 21:24:54 grant Exp $
 
 DISTNAME=		felt-3.05.src
 PKGNAME=		felt-3.05
@@ -7,7 +7,7 @@ CATEGORIES=		cad
 MASTER_SITES=		ftp://ftp.sourceforge.net/pub/sourceforge/felt/
 DISTFILES=		felt-3.05.src.tar.gz felt-3.05.ps.gz
 
-MAINTAINER=		tech-pkg@netbsd.org
+MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://felt.sourceforge.net/
 COMMENT=		Free system for introductory level finite element analysis
 
diff --git a/cad/gdsreader/Makefile b/cad/gdsreader/Makefile
index e1af5d59528..6c9f755626c 100644
--- a/cad/gdsreader/Makefile
+++ b/cad/gdsreader/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2003/06/02 01:21:28 jschauma Exp $
+# $NetBSD: Makefile,v 1.3 2003/07/17 21:24:55 grant Exp $
 #
 
 DISTNAME=	GDSreader.0.3
@@ -6,7 +6,7 @@ PKGNAME=	gdsreader-0.3
 CATEGORIES=	cad
 MASTER_SITES=	http://home.netcom.com/~serbanp/
 
-MAINTAINER=	tech-pkg@netbsd.org
+MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://home.netcom.com/~serbanp/
 COMMENT=	GDS-II stream file to Postscript and HP/GL converter
 
diff --git a/cad/geda-docs/Makefile b/cad/geda-docs/Makefile
index 215e91393f8..86ed6dcb753 100644
--- a/cad/geda-docs/Makefile
+++ b/cad/geda-docs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2003/07/15 09:23:32 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.13 2003/07/17 21:24:57 grant Exp $
 #
 
 DISTNAME=		geda-docs-${PKGVERSION}
@@ -8,7 +8,7 @@ MASTER_SITES=		ftp://ftp.geda.seul.org/pub/geda/devel/${PKGVERSION}/ \
 			http://www.geda.seul.org/devel/${PKGVERSION}/ \
 			http://www.geda.coelacanth.com/devel/${PKGVERSION}/
 
-MAINTAINER=		dmcmahill@netbsd.org
+MAINTAINER=		dmcmahill@NetBSD.org
 HOMEPAGE=		http://www.geda.seul.org/
 COMMENT=		HTML documentation for gEDA
 
diff --git a/cad/geda-symbols/Makefile b/cad/geda-symbols/Makefile
index a2e80b93057..9b68da954e4 100644
--- a/cad/geda-symbols/Makefile
+++ b/cad/geda-symbols/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2003/07/15 09:23:33 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.11 2003/07/17 21:24:58 grant Exp $
 #
 
 DISTNAME=	geda-symbols-${PKGVERSION}
@@ -8,7 +8,7 @@ MASTER_SITES=	ftp://ftp.geda.seul.org/pub/geda/devel/${PKGVERSION}/ \
 		http://www.geda.seul.org/devel/${PKGVERSION}/ \
 		http://www.geda.coelacanth.com/devel/${PKGVERSION}/
 
-MAINTAINER=	dmcmahill@netbsd.org
+MAINTAINER=	dmcmahill@NetBSD.org
 HOMEPAGE=	http://www.geda.seul.org/
 COMMENT=	Library of symbols for gEDA
 
diff --git a/cad/geda-utils/Makefile b/cad/geda-utils/Makefile
index f716d4dc06b..5ba989e7b3f 100644
--- a/cad/geda-utils/Makefile
+++ b/cad/geda-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2003/07/15 09:23:33 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.17 2003/07/17 21:24:59 grant Exp $
 #
 
 DISTNAME=		geda-utils-${PKGVERSION}
@@ -8,7 +8,7 @@ MASTER_SITES=		ftp://ftp.geda.seul.org/pub/geda/devel/${PKGVERSION}/ \
 			http://www.geda.seul.org/devel/${PKGVERSION}/ \
 			http://www.geda.coelacanth.com/devel/${PKGVERSION}/
 
-MAINTAINER=		dmcmahill@netbsd.org
+MAINTAINER=		dmcmahill@NetBSD.org
 HOMEPAGE=		http://www.geda.seul.org/
 COMMENT=		Set of utilites for gEDA
 
diff --git a/cad/geda/Makefile b/cad/geda/Makefile
index de42f13b676..7ddc7484f6c 100644
--- a/cad/geda/Makefile
+++ b/cad/geda/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2003/07/15 09:23:31 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.27 2003/07/17 21:24:56 grant Exp $
 #
 
 DISTNAME=	geda-${PKGVERSION}
@@ -8,7 +8,7 @@ MASTER_SITES=	ftp://ftp.geda.seul.org/pub/geda/devel/${PKGVERSION}/ \
 		http://www.geda.seul.org/devel/${PKGVERSION}/ \
 		http://www.geda.coelacanth.com/devel/${PKGVERSION}/
 
-MAINTAINER=	dmcmahill@netbsd.org
+MAINTAINER=	dmcmahill@NetBSD.org
 HOMEPAGE=	http://www.geda.seul.org/
 COMMENT=	Toolset for automating electronic design
 
diff --git a/cad/gerbv/Makefile b/cad/gerbv/Makefile
index cadc42eeb3e..6349304341c 100644
--- a/cad/gerbv/Makefile
+++ b/cad/gerbv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2003/07/13 13:50:40 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2003/07/17 21:25:01 grant Exp $
 #
 
 DISTNAME=	gerbv-0.13
@@ -6,7 +6,7 @@ PKGREVISION=	2
 CATEGORIES=	cad
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gerbv/}
 
-MAINTAINER=	dmcmahill@netbsd.org
+MAINTAINER=	dmcmahill@NetBSD.org
 HOMEPAGE=	http://gerbv.sourceforge.net
 COMMENT=	Gerber file viewer
 
diff --git a/cad/gnetlist/Makefile b/cad/gnetlist/Makefile
index 5b2578fd58f..3627d739623 100644
--- a/cad/gnetlist/Makefile
+++ b/cad/gnetlist/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2003/07/15 09:23:34 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.20 2003/07/17 21:25:01 grant Exp $
 #
 
 DISTNAME=		geda-gnetlist-${PKGVERSION}
@@ -9,7 +9,7 @@ MASTER_SITES=		ftp://ftp.geda.seul.org/pub/geda/devel/${PKGVERSION}/ \
 			http://www.geda.seul.org/devel/${PKGVERSION}/ \
 			http://www.geda.coelacanth.com/devel/${PKGVERSION}/
 
-MAINTAINER=		dmcmahill@netbsd.org
+MAINTAINER=		dmcmahill@NetBSD.org
 HOMEPAGE=		http://www.geda.seul.org/
 COMMENT=		Netlist generation program
 
diff --git a/cad/gnucap/Makefile b/cad/gnucap/Makefile
index 0212c7d3fdb..2002b6fae63 100644
--- a/cad/gnucap/Makefile
+++ b/cad/gnucap/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.4 2003/07/12 13:01:01 dillo Exp $
+# $NetBSD: Makefile,v 1.5 2003/07/17 21:25:03 grant Exp $
 #
 
 DISTNAME=	gnucap-0.33
 CATEGORIES=	cad
 MASTER_SITES=	${MASTER_SITE_GNU:=gnucap/}
 
-MAINTAINER=	dmcmahill@netbsd.org
+MAINTAINER=	dmcmahill@NetBSD.org
 HOMEPAGE=	http://www.geda.seul.org/tools/acs/index.html
 COMMENT=	general purpose circuit simulator
 
diff --git a/cad/gschem/Makefile b/cad/gschem/Makefile
index a51ee430efd..434bf022b92 100644
--- a/cad/gschem/Makefile
+++ b/cad/gschem/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2003/07/15 09:23:35 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.21 2003/07/17 21:25:04 grant Exp $
 #
 
 DISTNAME=		geda-gschem-${PKGVERSION}
@@ -9,7 +9,7 @@ MASTER_SITES=		ftp://ftp.geda.seul.org/pub/geda/devel/${PKGVERSION}/ \
 			http://www.geda.seul.org/devel/${PKGVERSION}/ \
 			http://www.geda.coelacanth.com/devel/${PKGVERSION}/
 
-MAINTAINER=		dmcmahill@netbsd.org
+MAINTAINER=		dmcmahill@NetBSD.org
 HOMEPAGE=		http://www.geda.seul.org/
 COMMENT=		Schematic capture tool
 
diff --git a/cad/gsymcheck/Makefile b/cad/gsymcheck/Makefile
index 317605b457e..68a7b7b0688 100644
--- a/cad/gsymcheck/Makefile
+++ b/cad/gsymcheck/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2003/07/15 09:23:36 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.17 2003/07/17 21:25:05 grant Exp $
 #
 
 DISTNAME=		geda-gsymcheck-${PKGVERSION}
@@ -9,7 +9,7 @@ MASTER_SITES=		ftp://ftp.geda.seul.org/pub/geda/devel/${PKGVERSION}/ \
 			http://www.geda.seul.org/devel/${PKGVERSION}/ \
 			http://www.geda.coelacanth.com/devel/${PKGVERSION}/
 
-MAINTAINER=		dmcmahill@netbsd.org
+MAINTAINER=		dmcmahill@NetBSD.org
 HOMEPAGE=		http://www.geda.seul.org/
 COMMENT=		EDA (Electronic Design Automation) symbol checker
 
diff --git a/cad/gtkwave/Makefile b/cad/gtkwave/Makefile
index c845bfdc9dd..63863e9d729 100644
--- a/cad/gtkwave/Makefile
+++ b/cad/gtkwave/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2003/07/15 12:32:58 drochner Exp $
+# $NetBSD: Makefile,v 1.3 2003/07/17 21:25:06 grant Exp $
 #
 
 #DISTNAME=		gtkwave-2.0.0pre3
@@ -8,7 +8,7 @@ CATEGORIES=		cad
 #MASTER_SITES=		ftp://ftp.cs.man.ac.uk/pub/amulet/gtkwave/2.0/
 MASTER_SITES=	ftp://ftp.cs.man.ac.uk/pub/amulet/gtkwave/snapshots/
 
-MAINTAINER=		tech-pkg@netbsd.org
+MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		ftp://ftp.cs.man.ac.uk/pub/amulet/gtkwave/2.0/
 COMMENT=		Electronic waveform viewer
 
diff --git a/cad/gwave/Makefile b/cad/gwave/Makefile
index 2fa10842b32..20e2664c7b4 100644
--- a/cad/gwave/Makefile
+++ b/cad/gwave/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2003/07/13 13:50:41 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2003/07/17 21:25:07 grant Exp $
 #
 
 DISTNAME=	gwave-20020122
@@ -6,7 +6,7 @@ PKGREVISION=	2
 CATEGORIES=	cad
 MASTER_SITES=	http://www.cs.unc.edu/~tell/dist/
 
-MAINTAINER=	dmcmahill@netbsd.org
+MAINTAINER=	dmcmahill@NetBSD.org
 HOMEPAGE=	http://www.cs.unc.edu/~tell/gwave/
 COMMENT=	viewer for spice-like simulator output and other analog data
 
diff --git a/cad/ipal-current/Makefile b/cad/ipal-current/Makefile
index 6e9bf2ab59c..731f8ce6e1a 100644
--- a/cad/ipal-current/Makefile
+++ b/cad/ipal-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2003/07/13 13:50:42 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2003/07/17 21:25:09 grant Exp $
 #
 
 DISTNAME=	ipal-20001210
@@ -7,7 +7,7 @@ PKGREVISION=	2
 CATEGORIES=	cad
 MASTER_SITES=	ftp://icarus.com/pub/eda/ipal/snapshots/
 
-MAINTAINER=	dmcmahill@netbsd.org
+MAINTAINER=	dmcmahill@NetBSD.org
 HOMEPAGE=	http://www.icarus.com/eda/ipal/index.html
 COMMENT=	Libs and utils for manipulating PAL designs (development version)
 
diff --git a/cad/libgeda/Makefile b/cad/libgeda/Makefile
index b096d67b415..a691e475bb4 100644
--- a/cad/libgeda/Makefile
+++ b/cad/libgeda/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2003/07/15 09:23:37 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.19 2003/07/17 21:25:08 grant Exp $
 #
 
 DISTNAME=		libgeda-${PKGVERSION}
@@ -8,7 +8,7 @@ MASTER_SITES=		ftp://ftp.geda.seul.org/pub/geda/devel/${PKGVERSION}/ \
 			http://www.geda.seul.org/devel/${PKGVERSION}/ \
 			http://www.geda.coelacanth.com/devel/${PKGVERSION}/
 
-MAINTAINER=		dmcmahill@netbsd.org
+MAINTAINER=		dmcmahill@NetBSD.org
 HOMEPAGE=		http://www.geda.seul.org/
 COMMENT=		Library of shared modules for gEDA
 
diff --git a/cad/magic/Makefile b/cad/magic/Makefile
index 9ab0c410f57..93d6052295c 100644
--- a/cad/magic/Makefile
+++ b/cad/magic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/02/09 14:38:53 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2003/07/17 21:25:10 grant Exp $
 #
 
 DISTNAME=	magic-7.1
@@ -6,7 +6,7 @@ PKGREVISION=	1
 CATEGORIES=	cad
 MASTER_SITES=	http://vlsi.cornell.edu/magic/
 
-MAINTAINER=	dmcmahill@netbsd.org
+MAINTAINER=	dmcmahill@NetBSD.org
 HOMEPAGE=	http://vlsi.cornell.edu/magic/
 COMMENT=	Integrated circuit layout system
 
diff --git a/cad/mcalc/Makefile b/cad/mcalc/Makefile
index 609cd34bdd2..92fd45caca1 100644
--- a/cad/mcalc/Makefile
+++ b/cad/mcalc/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2002/08/23 01:31:24 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.3 2003/07/17 21:25:11 grant Exp $
 #
 
 DISTNAME=	mcalc-1.5
 CATEGORIES=	cad
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mcalc/}
 
-MAINTAINER=	dmcmahill@netbsd.org
+MAINTAINER=	dmcmahill@NetBSD.org
 HOMEPAGE=	http://mcalc.sourceforge.net
 COMMENT=	JavaScript based microstrip analysis/synthesis calculator
 
diff --git a/cad/mpac/Makefile b/cad/mpac/Makefile
index 2c0358d73a2..c6a992e3a43 100644
--- a/cad/mpac/Makefile
+++ b/cad/mpac/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/11/29 01:12:26 hubertf Exp $
+# $NetBSD: Makefile,v 1.4 2003/07/17 21:25:12 grant Exp $
 #
 
 DISTNAME=	mpac-0.2.2
@@ -6,7 +6,7 @@ PKGREVISION=	1
 CATEGORIES=	cad
 MASTER_SITES=	http://goemon.polito.it/ftp/pub/software/lethal/Elettronica/antenna/
 
-MAINTAINER=	dmcmahill@netbsd.org
+MAINTAINER=	dmcmahill@NetBSD.org
 COMMENT=	Microstrip Patch Antenna Calculator
 
 DEPENDS+=	tk>=8.1:../../x11/tk
diff --git a/cad/ng-spice/Makefile b/cad/ng-spice/Makefile
index e50e960b2f7..3e2d4cb765b 100644
--- a/cad/ng-spice/Makefile
+++ b/cad/ng-spice/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2003/07/13 13:50:42 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2003/07/17 21:25:13 grant Exp $
 #
 
 DISTNAME=	ng-spice-rework-14
@@ -7,7 +7,7 @@ PKGREVISION=	1
 CATEGORIES=	cad
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ngspice/}
 
-MAINTAINER=	dmcmahill@netbsd.org
+MAINTAINER=	dmcmahill@NetBSD.org
 HOMEPAGE=	http://ngspice.sourceforge.net
 COMMENT=	Next generation circuit simulation program
 
diff --git a/cad/ntesla/Makefile b/cad/ntesla/Makefile
index b337ae18466..3447242955e 100644
--- a/cad/ntesla/Makefile
+++ b/cad/ntesla/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.4 2001/02/16 13:46:26 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2003/07/17 21:25:14 grant Exp $
 #
 
 DISTNAME=		ntesla-1.7
 CATEGORIES=		cad
 MASTER_SITES=		${MASTER_SITE_SUNSITE:=apps/circuits/}
 
-MAINTAINER=		dmcmahill@netbsd.org
+MAINTAINER=		dmcmahill@NetBSD.org
 HOMEPAGE=		http://www.nic.funet.fi/pub/sci/electrical/tesla/
 COMMENT=		tesla coil design program
 
diff --git a/cad/oregano/Makefile b/cad/oregano/Makefile
index 9d33df34664..c9f8721cb94 100644
--- a/cad/oregano/Makefile
+++ b/cad/oregano/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2003/07/13 13:50:43 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2003/07/17 21:25:16 grant Exp $
 #
 
 DISTNAME=		oregano-0.20
@@ -6,7 +6,7 @@ PKGREVISION=		7
 CATEGORIES=		cad gnome
 MASTER_SITES=		http://www.dtek.chalmers.se/~d4hult/oregano/download/
 
-MAINTAINER=		rh@netbsd.org
+MAINTAINER=		rh@NetBSD.org
 HOMEPAGE=		http://www.dtek.chalmers.se/~d4hult/oregano/
 COMMENT=		application for schematic capture/simulation of electrical circuits
 
diff --git a/cad/pcb/Makefile b/cad/pcb/Makefile
index 77bd32cee03..b1b09a66810 100644
--- a/cad/pcb/Makefile
+++ b/cad/pcb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2003/06/27 12:09:39 seb Exp $
+# $NetBSD: Makefile,v 1.21 2003/07/17 21:25:17 grant Exp $
 # FreeBSD Id: Makefile,v 1.19 1998/10/31 18:05:31 jseger Exp
 #
 
@@ -11,7 +11,7 @@ EXTRACT_SUFX=	.tgz
 DISTFILES=	pcb-1.6.3.tgz \
 		pcb-docs-1.6.3.tar.gz
 
-MAINTAINER=	dmcmahill@netbsd.org
+MAINTAINER=	dmcmahill@NetBSD.org
 HOMEPAGE=	http://bach.ece.jhu.edu/~haceaton/pcb/
 COMMENT=	X11 interactive printed circuit board layout system
 
diff --git a/cad/py-MyHDL/Makefile b/cad/py-MyHDL/Makefile
index e9e5c0738bc..1de2e12153b 100644
--- a/cad/py-MyHDL/Makefile
+++ b/cad/py-MyHDL/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/06/05 18:50:54 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2003/07/17 21:25:18 grant Exp $
 #
 
 DISTNAME=	myhdl-0.2
@@ -6,7 +6,7 @@ PKGNAME=	${PYPKGPREFIX}-MyHDL-0.2
 CATEGORIES=	cad
 MASTER_SITES=	http://jandecaluwe.com/Tools/MyHDL/
 
-MAINTAINER=	packages@netbsd.org
+MAINTAINER=	packages@NetBSD.org
 HOMEPAGE=	http://jandecaluwe.com/Tools/MyHDL/Overview.html
 COMMENT=	Hardware description in Python
 
diff --git a/cad/qcad/Makefile b/cad/qcad/Makefile
index c5be3b0ac58..fae6da8086f 100644
--- a/cad/qcad/Makefile
+++ b/cad/qcad/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2003/06/02 01:21:28 jschauma Exp $
+# $NetBSD: Makefile,v 1.17 2003/07/17 21:25:19 grant Exp $
 
 DISTNAME=		qcad-1.5.4-src
 PKGNAME=		qcad-1.5.4
@@ -7,7 +7,7 @@ WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 CATEGORIES=		cad
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=qcad/}
 
-MAINTAINER=		tech-pkg@netbsd.org
+MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://www.qcad.org/
 COMMENT=		2D CAD System
 
diff --git a/cad/simian-docs/Makefile b/cad/simian-docs/Makefile
index 4a2076ad2f1..4c9f037fd27 100644
--- a/cad/simian-docs/Makefile
+++ b/cad/simian-docs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/03/29 12:40:15 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2003/07/17 21:25:21 grant Exp $
 #
 
 DISTNAME=	simian_man_12_98
@@ -8,7 +8,7 @@ CATEGORIES=	cad
 MASTER_SITES=	http://weewave.mer.utexas.edu/MED_files/MED_research/Intrcncts/SIMIAN_stuff/simian_mnl_ps_pdf/
 EXTRACT_SUFX=	.pdf
 
-MAINTAINER=	dmcmahill@netbsd.org
+MAINTAINER=	dmcmahill@NetBSD.org
 HOMEPAGE=	http://weewave.mer.utexas.edu/MED_files/MED_research/Intrcncts/SIMIAN_stuff/simian_links.html
 COMMENT=	PDF manual for SIMIAN
 
diff --git a/cad/simian/Makefile b/cad/simian/Makefile
index 1bbd520e8f3..6659ab3aa9f 100644
--- a/cad/simian/Makefile
+++ b/cad/simian/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/03/29 12:40:15 jmmv Exp $
+# $NetBSD: Makefile,v 1.7 2003/07/17 21:25:21 grant Exp $
 #
 
 DISTNAME=	simian_12_98
@@ -7,7 +7,7 @@ WRKSRC=		${WRKDIR}/Simian/src
 CATEGORIES=	cad
 MASTER_SITES=	http://weewave.mer.utexas.edu/MED_files/CODE_RQST/
 
-MAINTAINER=	dmcmahill@netbsd.org
+MAINTAINER=	dmcmahill@NetBSD.org
 HOMEPAGE=	http://weewave.mer.utexas.edu/MED_files/MED_research/Intrcncts/SIMIAN_stuff/simian_links.html
 COMMENT=	2-dimensional interconnect and transmission line simulator
 
diff --git a/cad/spice/Makefile b/cad/spice/Makefile
index a9267356ace..338fa63e844 100644
--- a/cad/spice/Makefile
+++ b/cad/spice/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2003/03/29 12:40:15 jmmv Exp $
+# $NetBSD: Makefile,v 1.23 2003/07/17 21:25:22 grant Exp $
 # FreeBSD Id: Makefile,v 1.10 1998/06/08 09:21:37 tg Exp
 #
 
@@ -9,7 +9,7 @@ CATEGORIES=	cad
 MASTER_SITES=	ftp://ic.eecs.berkeley.edu/pub/Spice3/
 EXTRACT_SUFX=   .tar.Z
 
-MAINTAINER=	dmcmahill@netbsd.org
+MAINTAINER=	dmcmahill@NetBSD.org
 HOMEPAGE=	http://bwrc.eecs.berkeley.edu/Classes/IcBook/SPICE/
 COMMENT=	General-purpose circuit simulation program
 
diff --git a/cad/spiceprm/Makefile b/cad/spiceprm/Makefile
index 1617fb37ee3..03b15efe185 100644
--- a/cad/spiceprm/Makefile
+++ b/cad/spiceprm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/06/02 01:21:27 jschauma Exp $
+# $NetBSD: Makefile,v 1.9 2003/07/17 21:25:23 grant Exp $
 #
 
 DISTNAME=	spiceprm-0.11
@@ -6,7 +6,7 @@ WRKSRC=		${WRKDIR}/spiceprm
 CATEGORIES=	cad
 MASTER_SITES=	http://metalab.unc.edu/pub/Linux/apps/circuits/
 
-MAINTAINER=	tech-pkg@netbsd.org
+MAINTAINER=	tech-pkg@NetBSD.org
 COMMENT=	Spice preprocessor for parameterized subcircuits
 
 USE_BUILDLINK2=		YES
diff --git a/cad/tkgate/Makefile b/cad/tkgate/Makefile
index 8a1036c06cb..5334eba2a15 100644
--- a/cad/tkgate/Makefile
+++ b/cad/tkgate/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/02/26 03:40:54 jschauma Exp $
+# $NetBSD: Makefile,v 1.7 2003/07/17 21:25:24 grant Exp $
 #
 
 DISTNAME=	tkgate-1.6i
@@ -7,7 +7,7 @@ CATEGORIES=	cad
 MASTER_SITES=	ftp://gadoid.ices.cmu.edu/pub/tkgate/
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	jmmv@netbsd.org
+MAINTAINER=	jmmv@NetBSD.org
 HOMEPAGE=	http://www-2.cs.cmu.edu/~hansen/tkgate/
 COMMENT=	Tcl/Tk based digital circuit editor and simulator
 
diff --git a/cad/transcalc/Makefile b/cad/transcalc/Makefile
index cdcbcb22441..2746ce05f96 100644
--- a/cad/transcalc/Makefile
+++ b/cad/transcalc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2003/07/13 13:50:43 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2003/07/17 21:25:25 grant Exp $
 #
 
 DISTNAME=	transcalc-0.13
@@ -7,7 +7,7 @@ CATEGORIES=	cad
 MASTER_SITES=	http://transcalc.sourceforge.net/
 #MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=transcalc/}
 
-MAINTAINER=	dmcmahill@netbsd.org
+MAINTAINER=	dmcmahill@NetBSD.org
 HOMEPAGE=	http://transcalc.sourceforge.net
 COMMENT=	Transmission line analysis/synthesis
 
diff --git a/cad/verilog-current/Makefile b/cad/verilog-current/Makefile
index 77b4db69518..b00f04c20bc 100644
--- a/cad/verilog-current/Makefile
+++ b/cad/verilog-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2003/07/14 09:51:48 drochner Exp $
+# $NetBSD: Makefile,v 1.34 2003/07/17 21:25:27 grant Exp $
 #
 
 DISTNAME=	verilog-${SNAPDATE}
@@ -6,7 +6,7 @@ PKGNAME=	verilog-current-${SNAPDATE}
 CATEGORIES=	cad
 MASTER_SITES=	ftp://icarus.com/pub/eda/verilog/snapshots/
 
-MAINTAINER=	dmcmahill@netbsd.org
+MAINTAINER=	dmcmahill@NetBSD.org
 HOMEPAGE=	http://icarus.com/eda/verilog/index.html
 COMMENT=	Verilog simulation and synthesis tool (development snapshot version)
 
diff --git a/cad/verilog-mode/Makefile b/cad/verilog-mode/Makefile
index 9f102136e38..2f988a34b42 100644
--- a/cad/verilog-mode/Makefile
+++ b/cad/verilog-mode/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2003/03/29 12:40:15 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2003/07/17 21:25:28 grant Exp $
 #
 
 DISTNAME=		verilog-mode-3.60
@@ -8,7 +8,7 @@ MASTER_SITES=		${MASTER_SITE_LOCAL}
 # The latest can be fetched interactively from
 # MASTER_SITES=		http://www.verilog.com/register.html
 
-MAINTAINER=		dmcmahill@netbsd.org
+MAINTAINER=		dmcmahill@NetBSD.org
 HOMEPAGE=		http://www.verilog.com/verilog-mode.html
 COMMENT=		Verilog mode for Emacs
 
diff --git a/cad/verilog/Makefile b/cad/verilog/Makefile
index aa28bad22e8..e823549bbcc 100644
--- a/cad/verilog/Makefile
+++ b/cad/verilog/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.13 2002/12/15 01:57:12 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.14 2003/07/17 21:25:26 grant Exp $
 #
 
 DISTNAME=	verilog-0.7
 CATEGORIES=	cad
 MASTER_SITES=	ftp://icarus.com/pub/eda/verilog/v0.7/
 
-MAINTAINER=	dmcmahill@netbsd.org
+MAINTAINER=	dmcmahill@NetBSD.org
 HOMEPAGE=	http://icarus.com/eda/verilog/index.html
 COMMENT=	Verilog simulation and synthesis tool (stable release version)
 
diff --git a/cad/vipec/Makefile b/cad/vipec/Makefile
index 1c7464bc993..7eb48f67882 100644
--- a/cad/vipec/Makefile
+++ b/cad/vipec/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.31 2003/02/07 10:34:07 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.32 2003/07/17 21:25:29 grant Exp $
 #
 
 DISTNAME=	ViPEC-3.1.3
 CATEGORIES=	cad
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=vipec/}
 
-MAINTAINER=	dmcmahill@netbsd.org
+MAINTAINER=	dmcmahill@NetBSD.org
 HOMEPAGE=	http://vipec.sourceforge.net
 COMMENT=	Network analyser for electrical networks
 
diff --git a/cad/xchiplogo/Makefile b/cad/xchiplogo/Makefile
index 81bc6053968..506a06005a9 100644
--- a/cad/xchiplogo/Makefile
+++ b/cad/xchiplogo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2002/12/28 21:22:54 jschauma Exp $
+# $NetBSD: Makefile,v 1.8 2003/07/17 21:25:30 grant Exp $
 #
 
 DISTNAME=	xchiplogo
@@ -7,7 +7,7 @@ PKGREVISION=	2
 CATEGORIES=	cad
 MASTER_SITES=	http://www.eleceng.adelaide.edu.au/Personal/moini/
 
-MAINTAINER=	dmcmahill@netbsd.org
+MAINTAINER=	dmcmahill@NetBSD.org
 HOMEPAGE=	http://www.eleceng.adelaide.edu.au/Personal/moini/chiplogo.html
 COMMENT=	Program for generating pretty logos on VLSI chips
 
diff --git a/cad/xcircuit/Makefile b/cad/xcircuit/Makefile
index 023e5d0d2cc..771f9b3a56e 100644
--- a/cad/xcircuit/Makefile
+++ b/cad/xcircuit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2003/07/10 08:03:57 jtb Exp $
+# $NetBSD: Makefile,v 1.13 2003/07/17 21:25:31 grant Exp $
 
 DISTNAME=	xcircuit-3.1.16
 WRKSRC=		${WRKDIR}/${DISTNAME}
@@ -6,7 +6,7 @@ CATEGORIES=	cad graphics
 MASTER_SITES=	http://bach.ece.jhu.edu/~tim/programs/xcircuit/archive/
 EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=	tech-pkg@netbsd.org
+MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://bach.ece.jhu.edu/~tim/programs/xcircuit/
 COMMENT=	Drawing program for X11 (especially for circuits)