24 files changed, 185 insertions, 94 deletions

diff --git a/cad/geda-docs/Makefile b/cad/geda-docs/Makefile
index 45485a3cfdb..215e91393f8 100644
--- a/cad/geda-docs/Makefile
+++ b/cad/geda-docs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2003/03/09 06:18:25 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.12 2003/07/15 09:23:32 dmcmahill Exp $
 #
 
 DISTNAME=		geda-docs-${PKGVERSION}
@@ -19,7 +19,7 @@ CONFLICTS+=		gEDA<19991011
 BUILD_DEPENDS+=		geda-symbols>=${PKGVERSION}:../../cad/geda-symbols
 
 DIST_SUBDIR=		geda
-PKGVERSION=		20030223
+PKGVERSION=		20030525
 
 GNU_CONFIGURE=		YES
 USE_X11BASE=		YES
diff --git a/cad/geda-docs/PLIST b/cad/geda-docs/PLIST
index 5488c4cf2fd..00068a56c4e 100644
--- a/cad/geda-docs/PLIST
+++ b/cad/geda-docs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2003/03/09 06:18:25 dmcmahill Exp $
+@comment $NetBSD: PLIST,v 1.5 2003/07/15 09:23:32 dmcmahill Exp $
 share/doc/geda-doc/attributes/attributes.css
 share/doc/geda-doc/attributes/attributes.dvi
 share/doc/geda-doc/attributes/attributes.html
@@ -96,6 +96,61 @@ share/doc/geda-doc/gschem/gschem.txt
 share/doc/geda-doc/hooks/hooks_and_scheme.txt
 share/doc/geda-doc/keymapping/keymapping.html
 share/doc/geda-doc/netattrib/netattrib.txt
+share/doc/geda-doc/spice-sdb/spice-sdb-howto.html
+share/doc/geda-doc/switcap/contents.png
+share/doc/geda-doc/switcap/images.aux
+share/doc/geda-doc/switcap/images.log
+share/doc/geda-doc/switcap/images.pl
+share/doc/geda-doc/switcap/images.tex
+share/doc/geda-doc/switcap/img1.png
+share/doc/geda-doc/switcap/img2.png
+share/doc/geda-doc/switcap/img3.png
+share/doc/geda-doc/switcap/img4.png
+share/doc/geda-doc/switcap/img5.png
+share/doc/geda-doc/switcap/img6.png
+share/doc/geda-doc/switcap/img7.png
+share/doc/geda-doc/switcap/index.html
+share/doc/geda-doc/switcap/internals.pl
+share/doc/geda-doc/switcap/labels.pl
+share/doc/geda-doc/switcap/next.png
+share/doc/geda-doc/switcap/next_g.png
+share/doc/geda-doc/switcap/node1.html
+share/doc/geda-doc/switcap/node10.html
+share/doc/geda-doc/switcap/node11.html
+share/doc/geda-doc/switcap/node12.html
+share/doc/geda-doc/switcap/node13.html
+share/doc/geda-doc/switcap/node14.html
+share/doc/geda-doc/switcap/node15.html
+share/doc/geda-doc/switcap/node16.html
+share/doc/geda-doc/switcap/node17.html
+share/doc/geda-doc/switcap/node18.html
+share/doc/geda-doc/switcap/node19.html
+share/doc/geda-doc/switcap/node2.html
+share/doc/geda-doc/switcap/node20.html
+share/doc/geda-doc/switcap/node21.html
+share/doc/geda-doc/switcap/node22.html
+share/doc/geda-doc/switcap/node23.html
+share/doc/geda-doc/switcap/node24.html
+share/doc/geda-doc/switcap/node25.html
+share/doc/geda-doc/switcap/node26.html
+share/doc/geda-doc/switcap/node27.html
+share/doc/geda-doc/switcap/node28.html
+share/doc/geda-doc/switcap/node3.html
+share/doc/geda-doc/switcap/node4.html
+share/doc/geda-doc/switcap/node5.html
+share/doc/geda-doc/switcap/node6.html
+share/doc/geda-doc/switcap/node7.html
+share/doc/geda-doc/switcap/node8.html
+share/doc/geda-doc/switcap/node9.html
+share/doc/geda-doc/switcap/prev.png
+share/doc/geda-doc/switcap/prev_g.png
+share/doc/geda-doc/switcap/switcap.css
+share/doc/geda-doc/switcap/switcap.dvi
+share/doc/geda-doc/switcap/switcap.html
+share/doc/geda-doc/switcap/switcap.pdf
+share/doc/geda-doc/switcap/switcap.ps
+share/doc/geda-doc/switcap/up.png
+share/doc/geda-doc/switcap/up_g.png
 share/doc/geda-doc/symbols/contents.png
 share/doc/geda-doc/symbols/images.aux
 share/doc/geda-doc/symbols/images.log
@@ -139,6 +194,8 @@ share/doc/geda-doc/symbols/symbols.ps
 share/doc/geda-doc/symbols/up.png
 share/doc/geda-doc/symbols/up_g.png
 @dirrm share/doc/geda-doc/symbols
+@dirrm share/doc/geda-doc/switcap
+@dirrm share/doc/geda-doc/spice-sdb
 @dirrm share/doc/geda-doc/netattrib
 @dirrm share/doc/geda-doc/keymapping
 @dirrm share/doc/geda-doc/hooks
diff --git a/cad/geda-docs/distinfo b/cad/geda-docs/distinfo
index d3b46af6d8f..e0b73b1bac2 100644
--- a/cad/geda-docs/distinfo
+++ b/cad/geda-docs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2003/03/09 06:18:25 dmcmahill Exp $
+$NetBSD: distinfo,v 1.7 2003/07/15 09:23:32 dmcmahill Exp $
 
-SHA1 (geda/geda-docs-20030223.tar.gz) = 94f507a0143d8431a2b13fa79d627608660324a8
-Size (geda/geda-docs-20030223.tar.gz) = 602854 bytes
+SHA1 (geda/geda-docs-20030525.tar.gz) = ed53b441031d93f70474d42813367643bbe083b5
+Size (geda/geda-docs-20030525.tar.gz) = 911047 bytes
diff --git a/cad/geda-symbols/Makefile b/cad/geda-symbols/Makefile
index d75c926ff04..a2e80b93057 100644
--- a/cad/geda-symbols/Makefile
+++ b/cad/geda-symbols/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2003/03/09 06:18:24 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.10 2003/07/15 09:23:33 dmcmahill Exp $
 #
 
 DISTNAME=	geda-symbols-${PKGVERSION}
@@ -15,7 +15,7 @@ COMMENT=	Library of symbols for gEDA
 CONFLICTS+=	gEDA<19991011
 
 DIST_SUBDIR=	geda
-PKGVERSION=	20030223
+PKGVERSION=	20030525
 
 GNU_CONFIGURE=	YES
 USE_X11BASE=	YES
diff --git a/cad/geda-symbols/PLIST b/cad/geda-symbols/PLIST
index 4ee3b9c7669..8a4cea9c8ea 100644
--- a/cad/geda-symbols/PLIST
+++ b/cad/geda-symbols/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2003/03/09 06:18:24 dmcmahill Exp $
+@comment $NetBSD: PLIST,v 1.8 2003/07/15 09:23:33 dmcmahill Exp $
 bin/gesym-config
 share/doc/geda-doc/nc.pdf
 share/gEDA/sym/4000/4000-1.sym
@@ -301,6 +301,7 @@ share/gEDA/sym/74/7430-1.sym
 share/gEDA/sym/74/7430-2.sym
 share/gEDA/sym/74/7431-1.sym
 share/gEDA/sym/74/7432-1.sym
+share/gEDA/sym/74/7432-2.sym
 share/gEDA/sym/74/74367-1.sym
 share/gEDA/sym/74/74373-1.sym
 share/gEDA/sym/74/74374-1.sym
@@ -471,6 +472,7 @@ share/gEDA/sym/analog/battery-2.sym
 share/gEDA/sym/analog/battery-3.sym
 share/gEDA/sym/analog/beeper-1.sym
 share/gEDA/sym/analog/bridge-1.sym
+share/gEDA/sym/analog/bridge-2.sym
 share/gEDA/sym/analog/capacitor-1.sym
 share/gEDA/sym/analog/capacitor-2.sym
 share/gEDA/sym/analog/capacitor-3.sym
@@ -482,6 +484,7 @@ share/gEDA/sym/analog/crystal-1.sym
 share/gEDA/sym/analog/current-1.sym
 share/gEDA/sym/analog/dual-opamp-1.sym
 share/gEDA/sym/analog/fuse-1.sym
+share/gEDA/sym/analog/fuse-2.sym
 share/gEDA/sym/analog/glow-lamp-1.sym
 share/gEDA/sym/analog/inamp-1.sym
 share/gEDA/sym/analog/inductor-1.sym
@@ -496,6 +499,8 @@ share/gEDA/sym/analog/nmos-3.sym
 share/gEDA/sym/analog/npn-1.sym
 share/gEDA/sym/analog/npn-2.sym
 share/gEDA/sym/analog/npn-3.sym
+share/gEDA/sym/analog/npn-IGBT-1.sym
+share/gEDA/sym/analog/ntc-1.sym
 share/gEDA/sym/analog/opamp-1.sym
 share/gEDA/sym/analog/opamp-2.sym
 share/gEDA/sym/analog/photo-resistor-1.sym
@@ -528,6 +533,10 @@ share/gEDA/sym/analog/rpack-1.sym
 share/gEDA/sym/analog/speaker-1.sym
 share/gEDA/sym/analog/speaker-2.sym
 share/gEDA/sym/analog/transformer-1.sym
+share/gEDA/sym/analog/transformer-2.sym
+share/gEDA/sym/analog/transformer-3.sym
+share/gEDA/sym/analog/transformer-4.sym
+share/gEDA/sym/analog/triac-1.sym
 share/gEDA/sym/analog/txo-1.sym
 share/gEDA/sym/analog/voltage-1.sym
 share/gEDA/sym/analog/voltage-2.sym
@@ -592,6 +601,7 @@ share/gEDA/sym/connector/mains-plug-1.sym
 share/gEDA/sym/connector/mains-plug-2.sym
 share/gEDA/sym/connector/pwrjack-1.sym
 share/gEDA/sym/connector/rs232-idc10.sym
+share/gEDA/sym/connector/smart-media-1.sym
 share/gEDA/sym/dec/DC003C-1.sym
 share/gEDA/sym/dec/DC004C-1.sym
 share/gEDA/sym/dec/DC310ES-1.sym
@@ -608,6 +618,8 @@ share/gEDA/sym/diode/diode-bridge-1.sym
 share/gEDA/sym/diode/led-2.sym
 share/gEDA/sym/diode/led-3.sym
 share/gEDA/sym/diode/mbr1545ct-1.sym
+share/gEDA/sym/diode/sa52-11-1.sym
+share/gEDA/sym/diode/sc52-11-1.sym
 share/gEDA/sym/diode/smda05-1.sym
 share/gEDA/sym/diode/zener-1.sym
 share/gEDA/sym/diode/zener-2.sym
@@ -748,6 +760,7 @@ share/gEDA/sym/linear/TDA2822M-1.sym
 share/gEDA/sym/linear/ad633JN-1.sym
 share/gEDA/sym/linear/ad633JN-2.sym
 share/gEDA/sym/linear/ad633JR-1.sym
+share/gEDA/sym/linear/l200-1.sym
 share/gEDA/sym/linear/lm135-1.sym
 share/gEDA/sym/linear/lm1877-1.sym
 share/gEDA/sym/linear/lm2822-1.sym
@@ -774,6 +787,7 @@ share/gEDA/sym/linear/lm7815-1.sym
 share/gEDA/sym/linear/lm7818-1.sym
 share/gEDA/sym/linear/lm7824-1.sym
 share/gEDA/sym/linear/lm7885-1.sym
+share/gEDA/sym/linear/lm7912-1.sym
 share/gEDA/sym/linear/lt1108-1.sym
 share/gEDA/sym/linear/lt1160-1.sym
 share/gEDA/sym/linear/lt1162-1.sym
@@ -788,14 +802,18 @@ share/gEDA/sym/linear/ltc2400-1.sym
 share/gEDA/sym/linear/volt_reg_adj-1.sym
 share/gEDA/sym/maxim/adc0820-1.sym
 share/gEDA/sym/maxim/max038-1.sym
+share/gEDA/sym/maxim/max038-2.sym
 share/gEDA/sym/maxim/max100-1.sym
 share/gEDA/sym/maxim/max1005-1.sym
+share/gEDA/sym/maxim/max1005-2.sym
 share/gEDA/sym/maxim/max1011-1.sym
+share/gEDA/sym/maxim/max1011-2.sym
 share/gEDA/sym/maxim/max101A-1.sym
 share/gEDA/sym/maxim/max1055-1.sym
 share/gEDA/sym/maxim/max1080-1.sym
 share/gEDA/sym/maxim/max1081-1.sym
 share/gEDA/sym/maxim/max1114-1.sym
+share/gEDA/sym/maxim/max1114-2.sym
 share/gEDA/sym/maxim/max135-1.sym
 share/gEDA/sym/maxim/max1407-1.sym
 share/gEDA/sym/maxim/max147-1.sym
@@ -844,6 +862,8 @@ share/gEDA/sym/maxim/max6018-1.sym
 share/gEDA/sym/maxim/max6314-1.sym
 share/gEDA/sym/maxim/max663-1.sym
 share/gEDA/sym/maxim/max664-1.sym
+share/gEDA/sym/maxim/max713-1.sym
+share/gEDA/sym/maxim/max7652-1.sym
 share/gEDA/sym/maxim/max807-1.sym
 share/gEDA/sym/maxim/max865EUA-1.sym
 share/gEDA/sym/maxim/max872-1.sym
@@ -874,6 +894,7 @@ share/gEDA/sym/micro/8255A-1.sym
 share/gEDA/sym/micro/8259A-1.sym
 share/gEDA/sym/micro/ACE1202-1.sym
 share/gEDA/sym/micro/AT43USB320A.sym
+share/gEDA/sym/micro/AT89C2051-1.sym
 share/gEDA/sym/micro/AT89C51_DIP.sym
 share/gEDA/sym/micro/AT89C51_PLCC.sym
 share/gEDA/sym/micro/AT89C51_TQFP.sym
@@ -903,12 +924,14 @@ share/gEDA/sym/micro/ATtiny11.sym
 share/gEDA/sym/micro/ATtiny12.sym
 share/gEDA/sym/micro/ATtiny28_DIP.sym
 share/gEDA/sym/micro/ATtiny28_TQFP.sym
+share/gEDA/sym/micro/DS1602-1.sym
 share/gEDA/sym/micro/DS2450-1.sym
 share/gEDA/sym/micro/DS2480B-1.sym
 share/gEDA/sym/micro/DS80C310-1.sym
 share/gEDA/sym/micro/DS80C310.sym
 share/gEDA/sym/micro/DS80C320-1.sym
 share/gEDA/sym/micro/DS80C320.sym
+share/gEDA/sym/micro/M41T00-SO8-1.sym
 share/gEDA/sym/micro/MSP430x11x1.sym
 share/gEDA/sym/micro/MSP430x11x2.sym
 share/gEDA/sym/micro/MSP430x12x.sym
@@ -921,6 +944,7 @@ share/gEDA/sym/micro/MSP430x44x.sym
 share/gEDA/sym/micro/TINIm390-RevD.sym
 share/gEDA/sym/micro/basicstamp-1.sym
 share/gEDA/sym/micro/mc68hc05j1a-1.sym
+share/gEDA/sym/micro/mc68hc705kj1-1.sym
 share/gEDA/sym/micro/mc68hc811e2fn-1.sym
 share/gEDA/sym/micro/mc68hc812a4-1.sym
 share/gEDA/sym/micro/mc68hc908gp32cp-1.sym
@@ -999,6 +1023,7 @@ share/gEDA/sym/opto/hcpl-2631-1.sym
 share/gEDA/sym/opto/hcpl-4534-1.sym
 share/gEDA/sym/opto/mct9001-1.sym
 share/gEDA/sym/opto/ps2501-1.sym
+share/gEDA/sym/opto/tfds4500-1.sym
 share/gEDA/sym/philips/PCA82C250-1.sym
 share/gEDA/sym/pla/22V10-DIP-1.sym
 share/gEDA/sym/pla/22V10-PLCC.sym
@@ -1059,7 +1084,14 @@ share/gEDA/sym/rf/xinger-splitter-1.sym
 share/gEDA/sym/spice/aop-spice-1.sym
 share/gEDA/sym/spice/cccs-1.sym
 share/gEDA/sym/spice/ccvs-1.sym
+share/gEDA/sym/spice/idc-1.sym
 share/gEDA/sym/spice/nullor-1.sym
+share/gEDA/sym/spice/spice-directive-1.sym
+share/gEDA/sym/spice/spice-include-1.sym
+share/gEDA/sym/spice/spice-model-1.sym
+share/gEDA/sym/spice/spice-options-1.sym
+share/gEDA/sym/spice/spice-subcircuit-IO-1.sym
+share/gEDA/sym/spice/spice-subcircuit-LL-1.sym
 share/gEDA/sym/spice/tline.sym
 share/gEDA/sym/spice/vac-1.sym
 share/gEDA/sym/spice/vccs-1.sym
@@ -1071,6 +1103,17 @@ share/gEDA/sym/spice/vpwl-1.sym
 share/gEDA/sym/spice/vsin-1.sym
 share/gEDA/sym/spice/wline-1x.sym
 share/gEDA/sym/supervisor/adm707.sym
+share/gEDA/sym/switcap/switcap-analysis-1.sym
+share/gEDA/sym/switcap/switcap-capacitor-1.sym
+share/gEDA/sym/switcap/switcap-clock-1.sym
+share/gEDA/sym/switcap/switcap-options-1.sym
+share/gEDA/sym/switcap/switcap-switch-1.sym
+share/gEDA/sym/switcap/switcap-timing-1.sym
+share/gEDA/sym/switcap/switcap-title-1.sym
+share/gEDA/sym/switcap/switcap-vcvs-1.sym
+share/gEDA/sym/switcap/switcap-vcvs-2.sym
+share/gEDA/sym/switcap/switcap-vcvs-3.sym
+share/gEDA/sym/switcap/switcap-vsrc-1.sym
 share/gEDA/sym/switch/relay-1.sym
 share/gEDA/sym/switch/ssrelay-spdt-lcc110-1.sym
 share/gEDA/sym/switch/ssrelay-spst-lcb110-1.sym
@@ -1301,6 +1344,7 @@ share/gEDA/system-commonrc
 @dirrm share/gEDA/sym/transistor
 @dirrm share/gEDA/sym/titleblock
 @dirrm share/gEDA/sym/switch
+@dirrm share/gEDA/sym/switcap
 @dirrm share/gEDA/sym/supervisor
 @dirrm share/gEDA/sym/spice
 @dirrm share/gEDA/sym/rf
diff --git a/cad/geda-symbols/distinfo b/cad/geda-symbols/distinfo
index 84b65fe0717..e319c1ea78a 100644
--- a/cad/geda-symbols/distinfo
+++ b/cad/geda-symbols/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2003/03/09 06:18:24 dmcmahill Exp $
+$NetBSD: distinfo,v 1.7 2003/07/15 09:23:33 dmcmahill Exp $
 
-SHA1 (geda/geda-symbols-20030223.tar.gz) = a763d2b9aa5a8e5883b3aa8afb6c8af13f443092
-Size (geda/geda-symbols-20030223.tar.gz) = 513583 bytes
+SHA1 (geda/geda-symbols-20030525.tar.gz) = d1fd907f3ff71c10c822107086fbd4c8a2218cf7
+Size (geda/geda-symbols-20030525.tar.gz) = 529013 bytes
diff --git a/cad/geda-utils/Makefile b/cad/geda-utils/Makefile
index a3c47a4dbe5..f716d4dc06b 100644
--- a/cad/geda-utils/Makefile
+++ b/cad/geda-utils/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2003/07/13 13:50:40 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2003/07/15 09:23:33 dmcmahill Exp $
 #
 
 DISTNAME=		geda-utils-${PKGVERSION}
-PKGREVISION=		2
 CATEGORIES=		cad
 MASTER_SITES=		ftp://ftp.geda.seul.org/pub/geda/devel/${PKGVERSION}/ \
 			ftp://ieee.ing.uniroma1.it/pub/geda/devel/${PKGVERSION}/ \
@@ -18,7 +17,7 @@ CONFLICTS+=		gEDA<19991011
 BUILD_DEPENDS+=		geda-symbols>=${PKGVERSION}:../../cad/geda-symbols
 
 DIST_SUBDIR=		geda
-PKGVERSION=		20030223
+PKGVERSION=		20030525
 
 GNU_CONFIGURE=		YES
 USE_X11BASE=		YES
diff --git a/cad/geda-utils/distinfo b/cad/geda-utils/distinfo
index 50cda2f9dcd..b1cda914323 100644
--- a/cad/geda-utils/distinfo
+++ b/cad/geda-utils/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2003/03/09 06:18:25 dmcmahill Exp $
+$NetBSD: distinfo,v 1.7 2003/07/15 09:23:33 dmcmahill Exp $
 
-SHA1 (geda/geda-utils-20030223.tar.gz) = fb9f520c38994998c9c68fae60f99af7462e68e7
-Size (geda/geda-utils-20030223.tar.gz) = 197527 bytes
+SHA1 (geda/geda-utils-20030525.tar.gz) = 36788ac91d6d61ddf700300036b9afb81b441fb7
+Size (geda/geda-utils-20030525.tar.gz) = 199671 bytes
diff --git a/cad/geda/Makefile b/cad/geda/Makefile
index 8bb84c642a1..de42f13b676 100644
--- a/cad/geda/Makefile
+++ b/cad/geda/Makefile
@@ -1,30 +1,32 @@
-# $NetBSD: Makefile,v 1.25 2003/07/13 17:47:50 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2003/07/15 09:23:31 dmcmahill Exp $
 #
 
-DISTNAME=	gEDA-${PKGVERSION}
-PKGREVISION=	2
+DISTNAME=	geda-${PKGVERSION}
 CATEGORIES=	cad
-MASTER_SITES=	# empty
-DISTFILES=	# empty
+MASTER_SITES=	ftp://ftp.geda.seul.org/pub/geda/devel/${PKGVERSION}/ \
+		ftp://ieee.ing.uniroma1.it/pub/geda/devel/${PKGVERSION}/ \
+		http://www.geda.seul.org/devel/${PKGVERSION}/ \
+		http://www.geda.coelacanth.com/devel/${PKGVERSION}/
 
 MAINTAINER=	dmcmahill@netbsd.org
 HOMEPAGE=	http://www.geda.seul.org/
 COMMENT=	Toolset for automating electronic design
 
-DEPENDS+=	gschem-${PKGVERSION}nb2:../../cad/gschem
-DEPENDS+=	gnetlist-${PKGVERSION}nb3:../../cad/gnetlist
-DEPENDS+=	gsymcheck-${PKGVERSION}nb2:../../cad/gsymcheck
-DEPENDS+=	geda-utils-${PKGVERSION}nb2:../../cad/geda-utils
+DEPENDS+=	gschem-${PKGVERSION}:../../cad/gschem
+DEPENDS+=	gnetlist-${PKGVERSION}:../../cad/gnetlist
+DEPENDS+=	gsymcheck-${PKGVERSION}:../../cad/gsymcheck
+DEPENDS+=	geda-utils-${PKGVERSION}:../../cad/geda-utils
 DEPENDS+=	geda-docs-${PKGVERSION}:../../cad/geda-docs
 
-USE_X11BASE=	yes
-EXTRACT_ONLY=	# empty
-NO_CHECKSUM=	yes
-NO_CONFIGURE=	yes
-NO_BUILD=	yes
+PKGVERSION=	20030525
 
-PKGVERSION=	20030223
+GNU_CONFIGURE=		YES
+USE_X11BASE=		YES
+USE_LIBTOOL=		YES
+USE_BUILDLINK2=		YES
 
-do-install:	# empty
+LTCONFIG_OVERRIDE=      ${WRKSRC}/ltconfig
 
+.include "../../cad/libgeda/buildlink2.mk"
+.include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/geda/PLIST b/cad/geda/PLIST
index 481dc981a91..3acfb555412 100644
--- a/cad/geda/PLIST
+++ b/cad/geda/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:47:59 zuntum Exp $
-@comment this plist intentionally left empty
+@comment $NetBSD: PLIST,v 1.2 2003/07/15 09:23:31 dmcmahill Exp $
+bin/geda
diff --git a/cad/geda/distinfo b/cad/geda/distinfo
new file mode 100644
index 00000000000..94b597756a7
--- /dev/null
+++ b/cad/geda/distinfo
@@ -0,0 +1,4 @@
+$NetBSD: distinfo,v 1.1 2003/07/15 09:23:31 dmcmahill Exp $
+
+SHA1 (geda-20030525.tar.gz) = ef57408c0e66315b09fb72ff92e0eaa5330ad901
+Size (geda-20030525.tar.gz) = 238313 bytes
diff --git a/cad/gnetlist/Makefile b/cad/gnetlist/Makefile
index 82c6627b71b..5b2578fd58f 100644
--- a/cad/gnetlist/Makefile
+++ b/cad/gnetlist/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2003/07/13 13:50:40 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2003/07/15 09:23:34 dmcmahill Exp $
 #
 
 DISTNAME=		geda-gnetlist-${PKGVERSION}
 PKGNAME=		gnetlist-${PKGVERSION}
-PKGREVISION=		3
 CATEGORIES=		cad
 MASTER_SITES=		ftp://ftp.geda.seul.org/pub/geda/devel/${PKGVERSION}/ \
 			ftp://ieee.ing.uniroma1.it/pub/geda/devel/${PKGVERSION}/ \
@@ -15,7 +14,7 @@ HOMEPAGE=		http://www.geda.seul.org/
 COMMENT=		Netlist generation program
 
 DIST_SUBDIR=		geda
-PKGVERSION=		20030223
+PKGVERSION=		20030525
 
 DEPENDS+=		geda-symbols-${PKGVERSION}:../../cad/geda-symbols
 # needs GNU m4 for the PCBboard netlister
diff --git a/cad/gnetlist/PLIST b/cad/gnetlist/PLIST
index 64072e580e9..277f93649ef 100644
--- a/cad/gnetlist/PLIST
+++ b/cad/gnetlist/PLIST
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.4 2002/12/09 16:01:14 tron Exp $
+@comment $NetBSD: PLIST,v 1.5 2003/07/15 09:23:34 dmcmahill Exp $
 bin/gnetlist
 bin/gschem2pcb
 bin/mk_verilog_syms
+bin/sw2asc
 man/man1/gnetlist.1
 share/gEDA/system-gnetlistrc
 share/gEDA/scheme/gnet-PCB.scm
@@ -21,6 +22,8 @@ share/gEDA/scheme/gnet-partslist2.scm
 share/gEDA/scheme/gnet-partslist3.scm
 share/gEDA/scheme/gnet-protelII.scm
 share/gEDA/scheme/gnet-spice.scm
+share/gEDA/scheme/gnet-spice-sdb.scm
+share/gEDA/scheme/gnet-switcap.scm
 share/gEDA/scheme/gnet-tango.scm
 share/gEDA/scheme/gnet-vams.scm
 share/gEDA/scheme/gnet-verilog.scm
diff --git a/cad/gnetlist/distinfo b/cad/gnetlist/distinfo
index 8e26040a81f..ddf14b38932 100644
--- a/cad/gnetlist/distinfo
+++ b/cad/gnetlist/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.9 2003/03/09 22:00:55 dmcmahill Exp $
+$NetBSD: distinfo,v 1.10 2003/07/15 09:23:34 dmcmahill Exp $
 
-SHA1 (geda/geda-gnetlist-20030223.tar.gz) = ef46d25e0cfd516148833ae7d9fa4768a3e803c4
-Size (geda/geda-gnetlist-20030223.tar.gz) = 255290 bytes
-SHA1 (patch-aa) = ece7634bdc38dfcd190e0038172a728ee3bf4af0
+SHA1 (geda/geda-gnetlist-20030525.tar.gz) = 9888301831446dffcdf728b7ca46abc4d217382b
+Size (geda/geda-gnetlist-20030525.tar.gz) = 286441 bytes
+SHA1 (patch-aa) = 29dbe6b993dcf6e3c29ce8710b81aafd230ffc50
diff --git a/cad/gnetlist/patches/patch-aa b/cad/gnetlist/patches/patch-aa
index e9f76f76bec..bfcb3e49c9d 100644
--- a/cad/gnetlist/patches/patch-aa
+++ b/cad/gnetlist/patches/patch-aa
@@ -1,23 +1,22 @@
-$NetBSD: patch-aa,v 1.5 2003/03/09 22:00:55 dmcmahill Exp $
+$NetBSD: patch-aa,v 1.6 2003/07/15 09:23:34 dmcmahill Exp $
 
-first patch is for guile-1.6.3.
-second is because (a) gnu m4 is needed for 1.6 and earlier NetBSD and probably
-all other OS's. and (b) we want to support site, user, and project config files
-the same way as the cad/pcb package.
-
---- scheme/gnet-PCBboard.scm.orig	Sun Jan 27 14:43:54 2002
-+++ scheme/gnet-PCBboard.scm	Sun Mar  9 15:51:29 2003
-@@ -139,5 +139,5 @@
+--- scheme/gnet-PCBboard.scm.orig	Mon Mar 10 02:56:44 2003
++++ scheme/gnet-PCBboard.scm
+@@ -134,7 +134,7 @@
+ ;;
+ ;;
+ 
+-(define *m4-pcbdir* "/usr/X11R6/lib/X11/pcb/m4")
++(define *m4-pcbdir* "@pcb_confdir@")
+ 
  ;; To emulate popen. Guileish again.
  ; Needed after guile ver. 1.3.2. To save 1.3a users, wrap it in.
--(false-if-exception (use-modules (ice-9 popen)))
-+(use-modules (ice-9 popen))
- 
- (define (PCBboard output-filename)
-@@ -152,5 +152,5 @@
+@@ -153,7 +153,7 @@
+ ;; Original pipe command commented out by AVH (bugfix by Rich Walker)
  ;;  (let ((pipe (open-output-pipe (string-append "m4 " *m4-pcbdir* "/common.m4 - >> " output-filename))))
  ;; Fixed pipe command (AVH 1/27/02)
 -   (let ((pipe (open-output-pipe (string-append "m4 -d -I" *m4-pcbdir* " " *m4-pcbdir* "/common.m4 - >> " output-filename))))
-+   (let ((pipe (open-output-pipe (string-append "gm4 -d -I" *m4-pcbdir* " -I/usr/X11R6/etc/pcb -I$HOME/.pcb -I. " *m4-pcbdir* "/common.m4 - >> " output-filename))))
++   (let ((pipe (open-output-pipe (string-append "gm4 -d -I" *m4-pcbdir* " -I@pcb_confdir@ -I$HOME/.pcb -I. " *m4-pcbdir* "/common.m4 - >> " output-filename))))
  
  
+        ;; packages is a list with the different uref value
diff --git a/cad/gschem/Makefile b/cad/gschem/Makefile
index 4115ef2dc22..a51ee430efd 100644
--- a/cad/gschem/Makefile
+++ b/cad/gschem/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2003/07/13 13:50:41 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2003/07/15 09:23:35 dmcmahill Exp $
 #
 
 DISTNAME=		geda-gschem-${PKGVERSION}
 PKGNAME=		gschem-${PKGVERSION}
-PKGREVISION=		2
 CATEGORIES=		cad
 MASTER_SITES=		ftp://ftp.geda.seul.org/pub/geda/devel/${PKGVERSION}/ \
 			ftp://ieee.ing.uniroma1.it/pub/geda/devel/${PKGVERSION}/ \
@@ -19,7 +18,7 @@ DEPENDS+=		geda-symbols-${PKGVERSION}:../../cad/geda-symbols
 CONFLICTS+=		gEDA<19991011
 
 DIST_SUBDIR=		geda
-PKGVERSION=		20030223
+PKGVERSION=		20030525
 
 GNU_CONFIGURE=		YES
 USE_X11BASE=		YES
diff --git a/cad/gschem/PLIST b/cad/gschem/PLIST
index c74e675e64d..c90b342ab22 100644
--- a/cad/gschem/PLIST
+++ b/cad/gschem/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2003/06/26 23:32:57 seb Exp $
+@comment $NetBSD: PLIST,v 1.8 2003/07/15 09:23:35 dmcmahill Exp $
 bin/gschem
 info/gschemdoc.info
 info/gschemdoc.info-1
@@ -11,7 +11,6 @@ info/gschemdoc.info-15
 info/gschemdoc.info-16
 info/gschemdoc.info-17
 info/gschemdoc.info-18
-info/gschemdoc.info-19
 info/gschemdoc.info-2
 info/gschemdoc.info-3
 info/gschemdoc.info-4
diff --git a/cad/gschem/distinfo b/cad/gschem/distinfo
index ddef0ca0030..fda67845c8a 100644
--- a/cad/gschem/distinfo
+++ b/cad/gschem/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.7 2003/07/09 14:45:59 drochner Exp $
+$NetBSD: distinfo,v 1.8 2003/07/15 09:23:35 dmcmahill Exp $
 
-SHA1 (geda/geda-gschem-20030223.tar.gz) = e8baf671b940d96a0f2d1f066b21200388a4d4af
-Size (geda/geda-gschem-20030223.tar.gz) = 1378177 bytes
-SHA1 (patch-aa) = 398b9fd4ac13dda138ea03bc8cd09bd5fb1082be
+SHA1 (geda/geda-gschem-20030525.tar.gz) = b2f6f9a8bb1aca95e9dca584340f215858cbe87e
+Size (geda/geda-gschem-20030525.tar.gz) = 1376449 bytes
 SHA1 (patch-ab) = b5806b57edd1d5ba3159c4f63a1b1c6678cedaec
diff --git a/cad/gschem/patches/patch-aa b/cad/gschem/patches/patch-aa
deleted file mode 100644
index 6e8c0dbd63f..00000000000
--- a/cad/gschem/patches/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2003/03/09 06:18:26 dmcmahill Exp $
-
---- scheme/gschem.scm.orig	Tue Feb 18 21:20:02 2003
-+++ scheme/gschem.scm	Sat Mar  8 16:48:32 2003
-@@ -32,5 +32,5 @@
- (define no-action
-   (lambda ()
--        ()
-+       nil
-   )
- )
diff --git a/cad/gsymcheck/Makefile b/cad/gsymcheck/Makefile
index 96b1c0a21e7..317605b457e 100644
--- a/cad/gsymcheck/Makefile
+++ b/cad/gsymcheck/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2003/07/13 13:50:41 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2003/07/15 09:23:36 dmcmahill Exp $
 #
 
 DISTNAME=		geda-gsymcheck-${PKGVERSION}
 PKGNAME=		gsymcheck-${PKGVERSION}
-PKGREVISION=		2
 CATEGORIES=		cad
 MASTER_SITES=		ftp://ftp.geda.seul.org/pub/geda/devel/${PKGVERSION}/ \
 			ftp://ieee.ing.uniroma1.it/pub/geda/devel/${PKGVERSION}/ \
@@ -19,7 +18,7 @@ DEPENDS+=		geda-symbols-${PKGVERSION}:../../cad/geda-symbols
 CONFLICTS+=		gEDA<19991011
 
 DIST_SUBDIR=		geda
-PKGVERSION=		20030223
+PKGVERSION=		20030525
 
 GNU_CONFIGURE=		YES
 USE_X11BASE=		YES
diff --git a/cad/gsymcheck/distinfo b/cad/gsymcheck/distinfo
index e5ca1bf8cc9..3293a358314 100644
--- a/cad/gsymcheck/distinfo
+++ b/cad/gsymcheck/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2003/03/09 06:18:26 dmcmahill Exp $
+$NetBSD: distinfo,v 1.7 2003/07/15 09:23:36 dmcmahill Exp $
 
-SHA1 (geda/geda-gsymcheck-20030223.tar.gz) = 2834f2e826508b7600565a69b855f9644e0c51ff
-Size (geda/geda-gsymcheck-20030223.tar.gz) = 138304 bytes
+SHA1 (geda/geda-gsymcheck-20030525.tar.gz) = 3005129585ac2b76ca6294b50bccfc30d21d8689
+Size (geda/geda-gsymcheck-20030525.tar.gz) = 138338 bytes
diff --git a/cad/libgeda/Makefile b/cad/libgeda/Makefile
index 531c943c66d..b096d67b415 100644
--- a/cad/libgeda/Makefile
+++ b/cad/libgeda/Makefile
@@ -1,22 +1,21 @@
-# $NetBSD: Makefile,v 1.17 2003/07/13 13:50:42 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2003/07/15 09:23:37 dmcmahill Exp $
 #
 
 DISTNAME=		libgeda-${PKGVERSION}
-PKGREVISION=		2
 CATEGORIES=		cad
 MASTER_SITES=		ftp://ftp.geda.seul.org/pub/geda/devel/${PKGVERSION}/ \
 			ftp://ieee.ing.uniroma1.it/pub/geda/devel/${PKGVERSION}/ \
 			http://www.geda.seul.org/devel/${PKGVERSION}/ \
 			http://www.geda.coelacanth.com/devel/${PKGVERSION}/
 
-MAINTAINER=		rh@netbsd.org
+MAINTAINER=		dmcmahill@netbsd.org
 HOMEPAGE=		http://www.geda.seul.org/
 COMMENT=		Library of shared modules for gEDA
 
 CONFLICTS+=		gEDA<19991011
 
 DIST_SUBDIR=		geda
-PKGVERSION=		20030223
+PKGVERSION=		20030525
 
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
diff --git a/cad/libgeda/buildlink2.mk b/cad/libgeda/buildlink2.mk
index 21273acd8f8..d84434500f9 100644
--- a/cad/libgeda/buildlink2.mk
+++ b/cad/libgeda/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.3 2003/03/09 06:18:23 dmcmahill Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2003/07/15 09:23:37 dmcmahill Exp $
 #
 # This Makefile fragment is included by packages that use libgeda.
 #
@@ -9,7 +9,7 @@
 LIBGEDA_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			libgeda
-BUILDLINK_DEPENDS.libgeda?=		libgeda>=20030223
+BUILDLINK_DEPENDS.libgeda?=		libgeda>=20030525
 BUILDLINK_PKGSRCDIR.libgeda?=		../../cad/libgeda
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.libgeda=libgeda
diff --git a/cad/libgeda/distinfo b/cad/libgeda/distinfo
index 6ecef92c135..1c0716492af 100644
--- a/cad/libgeda/distinfo
+++ b/cad/libgeda/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2003/03/09 06:18:23 dmcmahill Exp $
+$NetBSD: distinfo,v 1.7 2003/07/15 09:23:37 dmcmahill Exp $
 
-SHA1 (geda/libgeda-20030223.tar.gz) = 45d2d173a9caec356cab4d2e2472653104f77820
-Size (geda/libgeda-20030223.tar.gz) = 876821 bytes
+SHA1 (geda/libgeda-20030525.tar.gz) = 84b067d2ea97a4d997987ad9edc033342dc0e3d0
+Size (geda/libgeda-20030525.tar.gz) = 876919 bytes