25 files changed, 165 insertions, 108 deletions
diff --git a/cad/geda-docs/Makefile b/cad/geda-docs/Makefile
index 86ed6dcb753..e70e46d3355 100644
--- a/cad/geda-docs/Makefile
+++ b/cad/geda-docs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2003/07/17 21:24:57 grant Exp $
+# $NetBSD: Makefile,v 1.14 2003/09/10 23:43:33 dmcmahill Exp $
 #
 
 DISTNAME=		geda-docs-${PKGVERSION}
@@ -13,15 +13,13 @@ HOMEPAGE=		http://www.geda.seul.org/
 COMMENT=		HTML documentation for gEDA
 
 DEPENDS+=		geda-symbols-${PKGVERSION}:../../cad/geda-symbols
+BUILD_DEPENDS+=		geda-symbols>=${PKGVERSION}:../../cad/geda-symbols
 
 CONFLICTS+=		gEDA<19991011
 
-BUILD_DEPENDS+=		geda-symbols>=${PKGVERSION}:../../cad/geda-symbols
-
 DIST_SUBDIR=		geda
-PKGVERSION=		20030525
+PKGVERSION=		20030901
 
 GNU_CONFIGURE=		YES
-USE_X11BASE=		YES
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/geda-docs/PLIST b/cad/geda-docs/PLIST
index 00068a56c4e..3801b414dfe 100644
--- a/cad/geda-docs/PLIST
+++ b/cad/geda-docs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2003/07/15 09:23:32 dmcmahill Exp $
+@comment $NetBSD: PLIST,v 1.6 2003/09/10 23:43:33 dmcmahill Exp $
 share/doc/geda-doc/attributes/attributes.css
 share/doc/geda-doc/attributes/attributes.dvi
 share/doc/geda-doc/attributes/attributes.html
@@ -96,7 +96,37 @@ 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/pads_backannotate/contents.png
+share/doc/geda-doc/pads_backannotate/images.aux
+share/doc/geda-doc/pads_backannotate/images.log
+share/doc/geda-doc/pads_backannotate/images.pl
+share/doc/geda-doc/pads_backannotate/images.tex
+share/doc/geda-doc/pads_backannotate/img1.png
+share/doc/geda-doc/pads_backannotate/img2.png
+share/doc/geda-doc/pads_backannotate/index.html
+share/doc/geda-doc/pads_backannotate/labels.pl
+share/doc/geda-doc/pads_backannotate/next.png
+share/doc/geda-doc/pads_backannotate/next_g.png
+share/doc/geda-doc/pads_backannotate/node1.html
+share/doc/geda-doc/pads_backannotate/node2.html
+share/doc/geda-doc/pads_backannotate/node3.html
+share/doc/geda-doc/pads_backannotate/node4.html
+share/doc/geda-doc/pads_backannotate/node5.html
+share/doc/geda-doc/pads_backannotate/node6.html
+share/doc/geda-doc/pads_backannotate/node7.html
+share/doc/geda-doc/pads_backannotate/pads_backannotate.css
+share/doc/geda-doc/pads_backannotate/pads_backannotate.dvi
+share/doc/geda-doc/pads_backannotate/pads_backannotate.html
+share/doc/geda-doc/pads_backannotate/pads_backannotate.pdf
+share/doc/geda-doc/pads_backannotate/pads_backannotate.ps
+share/doc/geda-doc/pads_backannotate/prev.png
+share/doc/geda-doc/pads_backannotate/prev_g.png
+share/doc/geda-doc/pads_backannotate/up.png
+share/doc/geda-doc/pads_backannotate/up_g.png
+share/doc/geda-doc/spice-sdb/appendix.html
+share/doc/geda-doc/spice-sdb/intro.html
+share/doc/geda-doc/spice-sdb/netlist.html
+share/doc/geda-doc/spice-sdb/simulation.html
 share/doc/geda-doc/switcap/contents.png
 share/doc/geda-doc/switcap/images.aux
 share/doc/geda-doc/switcap/images.log
@@ -196,6 +226,7 @@ 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/pads_backannotate
 @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 e0b73b1bac2..136f40fc59c 100644
--- a/cad/geda-docs/distinfo
+++ b/cad/geda-docs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2003/07/15 09:23:32 dmcmahill Exp $
+$NetBSD: distinfo,v 1.8 2003/09/10 23:43:34 dmcmahill Exp $
 
-SHA1 (geda/geda-docs-20030525.tar.gz) = ed53b441031d93f70474d42813367643bbe083b5
-Size (geda/geda-docs-20030525.tar.gz) = 911047 bytes
+SHA1 (geda/geda-docs-20030901.tar.gz) = 4cad60424f610b41919023b6904a55cced743675
+Size (geda/geda-docs-20030901.tar.gz) = 669160 bytes
diff --git a/cad/geda-symbols/Makefile b/cad/geda-symbols/Makefile
index 9b68da954e4..c767b3d324b 100644
--- a/cad/geda-symbols/Makefile
+++ b/cad/geda-symbols/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2003/07/17 21:24:58 grant Exp $
+# $NetBSD: Makefile,v 1.12 2003/09/10 23:43:34 dmcmahill Exp $
 #
 
 DISTNAME=	geda-symbols-${PKGVERSION}
@@ -15,10 +15,9 @@ COMMENT=	Library of symbols for gEDA
 CONFLICTS+=	gEDA<19991011
 
 DIST_SUBDIR=	geda
-PKGVERSION=	20030525
+PKGVERSION=	20030901
 
 GNU_CONFIGURE=	YES
-USE_X11BASE=	YES
 USE_GMAKE=	YES
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/geda-symbols/PLIST b/cad/geda-symbols/PLIST
index 8a4cea9c8ea..2113e0d9e3d 100644
--- a/cad/geda-symbols/PLIST
+++ b/cad/geda-symbols/PLIST
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2003/07/15 09:23:33 dmcmahill Exp $
-bin/gesym-config
+@comment $NetBSD: PLIST,v 1.9 2003/09/10 23:43:34 dmcmahill Exp $
 share/doc/geda-doc/nc.pdf
 share/gEDA/sym/4000/4000-1.sym
 share/gEDA/sym/4000/4000-2.sym
@@ -269,6 +268,7 @@ share/gEDA/sym/74/74175-1.sym
 share/gEDA/sym/74/74181-1.sym
 share/gEDA/sym/74/74182-1.sym
 share/gEDA/sym/74/74189-1.sym
+share/gEDA/sym/74/74189-2.sym
 share/gEDA/sym/74/74190-1.sym
 share/gEDA/sym/74/74191-1.sym
 share/gEDA/sym/74/74191-2.sym
@@ -316,6 +316,7 @@ share/gEDA/sym/74/7448-1.sym
 share/gEDA/sym/74/7451-1.sym
 share/gEDA/sym/74/74520-1.sym
 share/gEDA/sym/74/74520-2.sym
+share/gEDA/sym/74/74520-3.sym
 share/gEDA/sym/74/7454-1.sym
 share/gEDA/sym/74/74541-1.sym
 share/gEDA/sym/74/7455-1.sym
@@ -325,8 +326,10 @@ share/gEDA/sym/74/74573-1.sym
 share/gEDA/sym/74/74574-1.sym
 share/gEDA/sym/74/74595-1.sym
 share/gEDA/sym/74/74673A-1.sym
+share/gEDA/sym/74/74673A-2.sym
 share/gEDA/sym/74/74684-1.sym
 share/gEDA/sym/74/74688-1.sym
+share/gEDA/sym/74/74688-2.sym
 share/gEDA/sym/74/7472-1.sym
 share/gEDA/sym/74/7473-1.sym
 share/gEDA/sym/74/7474-1.sym
@@ -545,6 +548,7 @@ share/gEDA/sym/analog/voltmeter-1.sym
 share/gEDA/sym/bus/pc104A-1.sym
 share/gEDA/sym/bus/pc104B-1.sym
 share/gEDA/sym/connector/BNC-1.sym
+share/gEDA/sym/connector/DB15-1.sym
 share/gEDA/sym/connector/DB25-1.sym
 share/gEDA/sym/connector/DB25-2.sym
 share/gEDA/sym/connector/DB31-1.sym
@@ -589,7 +593,9 @@ share/gEDA/sym/connector/header20-2.sym
 share/gEDA/sym/connector/header20-3.sym
 share/gEDA/sym/connector/header22-1.sym
 share/gEDA/sym/connector/header26-1.sym
+share/gEDA/sym/connector/header26-2.sym
 share/gEDA/sym/connector/header3-1.sym
+share/gEDA/sym/connector/header32-2.sym
 share/gEDA/sym/connector/header34-1.sym
 share/gEDA/sym/connector/header40-2.sym
 share/gEDA/sym/connector/header50-1.sym
@@ -763,6 +769,7 @@ 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/lm2576T-1.sym
 share/gEDA/sym/linear/lm2822-1.sym
 share/gEDA/sym/linear/lm2822m-1.sym
 share/gEDA/sym/linear/lm2902-1.sym
@@ -771,6 +778,7 @@ share/gEDA/sym/linear/lm311-1.sym
 share/gEDA/sym/linear/lm317-1.sym
 share/gEDA/sym/linear/lm324-1.sym
 share/gEDA/sym/linear/lm339-1.sym
+share/gEDA/sym/linear/lm339-2.sym
 share/gEDA/sym/linear/lm358-1.sym
 share/gEDA/sym/linear/lm386-1.sym
 share/gEDA/sym/linear/lm3909-1.sym
@@ -814,6 +822,7 @@ 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/max1211-1.sym
 share/gEDA/sym/maxim/max135-1.sym
 share/gEDA/sym/maxim/max1407-1.sym
 share/gEDA/sym/maxim/max147-1.sym
@@ -862,6 +871,7 @@ 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/max6674-1.sym
 share/gEDA/sym/maxim/max713-1.sym
 share/gEDA/sym/maxim/max7652-1.sym
 share/gEDA/sym/maxim/max807-1.sym
@@ -885,6 +895,7 @@ share/gEDA/sym/memory/ST39SF020A-1.sym
 share/gEDA/sym/memory/am27S13D-1.sym
 share/gEDA/sym/memory/am9128-1.sym
 share/gEDA/sym/micro/6821-1.sym
+share/gEDA/sym/micro/6821-2.sym
 share/gEDA/sym/micro/8031.sym
 share/gEDA/sym/micro/8052basic-1.sym
 share/gEDA/sym/micro/8086-1.sym
@@ -1013,6 +1024,7 @@ share/gEDA/sym/opto/4N29-1.sym
 share/gEDA/sym/opto/6N135-1.sym
 share/gEDA/sym/opto/6N136-1.sym
 share/gEDA/sym/opto/6n137-1.sym
+share/gEDA/sym/opto/810-1.sym
 share/gEDA/sym/opto/HCPL4502-1.sym
 share/gEDA/sym/opto/HCPL4701-1.sym
 share/gEDA/sym/opto/HCTL-2000-1.sym
diff --git a/cad/geda-symbols/distinfo b/cad/geda-symbols/distinfo
index e319c1ea78a..4250c86a9df 100644
--- a/cad/geda-symbols/distinfo
+++ b/cad/geda-symbols/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2003/07/15 09:23:33 dmcmahill Exp $
+$NetBSD: distinfo,v 1.8 2003/09/10 23:43:34 dmcmahill Exp $
 
-SHA1 (geda/geda-symbols-20030525.tar.gz) = d1fd907f3ff71c10c822107086fbd4c8a2218cf7
-Size (geda/geda-symbols-20030525.tar.gz) = 529013 bytes
+SHA1 (geda/geda-symbols-20030901.tar.gz) = 61e2122978421f62672eaa10adb182e4beb9f354
+Size (geda/geda-symbols-20030901.tar.gz) = 514174 bytes
diff --git a/cad/geda-utils/Makefile b/cad/geda-utils/Makefile
index 5ba989e7b3f..979cb2e8aec 100644
--- a/cad/geda-utils/Makefile
+++ b/cad/geda-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2003/07/17 21:24:59 grant Exp $
+# $NetBSD: Makefile,v 1.18 2003/09/10 23:43:35 dmcmahill Exp $
 #
 
 DISTNAME=		geda-utils-${PKGVERSION}
@@ -12,18 +12,26 @@ MAINTAINER=		dmcmahill@NetBSD.org
 HOMEPAGE=		http://www.geda.seul.org/
 COMMENT=		Set of utilites for gEDA
 
-CONFLICTS+=		gEDA<19991011
-
 BUILD_DEPENDS+=		geda-symbols>=${PKGVERSION}:../../cad/geda-symbols
 
+CONFLICTS+=		gEDA<19991011
+
 DIST_SUBDIR=		geda
-PKGVERSION=		20030525
+PKGVERSION=		20030901
 
 GNU_CONFIGURE=		YES
-USE_X11BASE=		YES
 USE_BUILDLINK2=		YES
 USE_PERL5=		YES
-REPLACE_PERL+=		scripts/gschupdate \
+
+EVAL_PREFIX+=		PYDIR=python
+
+REPLACE_INTERPRETER+=   python
+_REPLACE.python.old=	.*/bin/python
+_REPLACE.python.new=	${PYDIR}/bin/python
+_REPLACE_FILES.python=	scripts/tragesym
+
+REPLACE_PERL+=		scripts/pads_backannotate \
+			scripts/gschupdate \
 			scripts/gsymupdate \
 			scripts/refdes_renum \
 			scripts/sarlacc_sym
diff --git a/cad/geda-utils/PLIST b/cad/geda-utils/PLIST
index 87dac332acc..d8ea17b2605 100644
--- a/cad/geda-utils/PLIST
+++ b/cad/geda-utils/PLIST
@@ -1,13 +1,16 @@
-@comment $NetBSD: PLIST,v 1.3 2003/03/09 06:18:25 dmcmahill Exp $
+@comment $NetBSD: PLIST,v 1.4 2003/09/10 23:43:35 dmcmahill Exp $
 bin/convert_sym
 bin/gmk_sym
+bin/gsch2pcb
 bin/gschemdoc
 bin/gschlas
 bin/gschupdate
 bin/gsymupdate
 bin/olib
+bin/pads_backannotate
 bin/refdes_renum
 bin/sarlacc_schem
 bin/sarlacc_sym
 bin/smash_megafile
+bin/tragesym
 share/gEDA/system-gschlasrc
diff --git a/cad/geda-utils/distinfo b/cad/geda-utils/distinfo
index b1cda914323..d822c3e1f53 100644
--- a/cad/geda-utils/distinfo
+++ b/cad/geda-utils/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2003/07/15 09:23:33 dmcmahill Exp $
+$NetBSD: distinfo,v 1.8 2003/09/10 23:43:35 dmcmahill Exp $
 
-SHA1 (geda/geda-utils-20030525.tar.gz) = 36788ac91d6d61ddf700300036b9afb81b441fb7
-Size (geda/geda-utils-20030525.tar.gz) = 199671 bytes
+SHA1 (geda/geda-utils-20030901.tar.gz) = bd5238b8a2f3469311217e20263689aaa5f8ac0b
+Size (geda/geda-utils-20030901.tar.gz) = 196589 bytes
diff --git a/cad/geda/Makefile b/cad/geda/Makefile
index 7ddc7484f6c..822c7733ead 100644
--- a/cad/geda/Makefile
+++ b/cad/geda/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2003/07/17 21:24:56 grant Exp $
+# $NetBSD: Makefile,v 1.28 2003/09/10 23:43:32 dmcmahill Exp $
 #
 
 DISTNAME=	geda-${PKGVERSION}
@@ -17,11 +17,12 @@ DEPENDS+=	gnetlist-${PKGVERSION}:../../cad/gnetlist
 DEPENDS+=	gsymcheck-${PKGVERSION}:../../cad/gsymcheck
 DEPENDS+=	geda-utils-${PKGVERSION}:../../cad/geda-utils
 DEPENDS+=	geda-docs-${PKGVERSION}:../../cad/geda-docs
+DEPENDS+=	geda-examples-${PKGVERSION}:../../cad/geda-examples
 
-PKGVERSION=	20030525
+DIST_SUBDIR=	geda
+PKGVERSION=	20030901
 
 GNU_CONFIGURE=		YES
-USE_X11BASE=		YES
 USE_LIBTOOL=		YES
 USE_BUILDLINK2=		YES
 
@@ -29,4 +30,5 @@ LTCONFIG_OVERRIDE=      ${WRKSRC}/ltconfig
 
 .include "../../cad/libgeda/buildlink2.mk"
 .include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../x11/gtk/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/geda/distinfo b/cad/geda/distinfo
index 94b597756a7..16ba5bb938d 100644
--- a/cad/geda/distinfo
+++ b/cad/geda/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1 2003/07/15 09:23:31 dmcmahill Exp $
+$NetBSD: distinfo,v 1.2 2003/09/10 23:43:33 dmcmahill Exp $
 
-SHA1 (geda-20030525.tar.gz) = ef57408c0e66315b09fb72ff92e0eaa5330ad901
-Size (geda-20030525.tar.gz) = 238313 bytes
+SHA1 (geda/geda-20030901.tar.gz) = 15f7ba1298ccc712a466f4af870700259e975a3d
+Size (geda/geda-20030901.tar.gz) = 238373 bytes
diff --git a/cad/gnetlist/Makefile b/cad/gnetlist/Makefile
index 3627d739623..fdb17297ae3 100644
--- a/cad/gnetlist/Makefile
+++ b/cad/gnetlist/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2003/07/17 21:25:01 grant Exp $
+# $NetBSD: Makefile,v 1.21 2003/09/10 23:43:35 dmcmahill Exp $
 #
 
 DISTNAME=		geda-gnetlist-${PKGVERSION}
@@ -13,27 +13,31 @@ MAINTAINER=		dmcmahill@NetBSD.org
 HOMEPAGE=		http://www.geda.seul.org/
 COMMENT=		Netlist generation program
 
-DIST_SUBDIR=		geda
-PKGVERSION=		20030525
-
 DEPENDS+=		geda-symbols-${PKGVERSION}:../../cad/geda-symbols
 # needs GNU m4 for the PCBboard netlister
 DEPENDS+=		m4>=1.4:../../devel/m4
 
+DIST_SUBDIR=		geda
+PKGVERSION=		20030901
+
 CONFLICTS+=		gEDA<19991011
 
 GNU_CONFIGURE=		YES
-USE_X11BASE=		YES
 USE_LIBTOOL=		YES
 USE_GMAKE=		YES
 USE_BUILDLINK2=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
+EVAL_PREFIX+=   PCBDIR=pcb
+
 post-patch:
-	${MV} -f ${WRKSRC}/scheme/gnet-PCBboard.scm ${WRKSRC}/scheme/gnet-PCBboard.scm.bak
-	${SED} 's;@pcb_confdir@;${PKG_SYSCONFDIR}/pcb;g' \
-		${WRKSRC}/scheme/gnet-PCBboard.scm.bak > ${WRKSRC}/scheme/gnet-PCBboard.scm
-	${RM} -f ${WRKSRC}/scheme/gnet-PCBboard.scm.bak
+.for f in gnet-PCBboard.scm gnet-gsch2pcb.scm
+	${MV} -f ${WRKSRC}/scheme/${f} ${WRKSRC}/scheme/${f}.bak
+	${SED} -e 's;@pcb_confdir@;${PKG_SYSCONFDIR}/pcb;g' \
+	       -e 's;@pcb_m4dir@;${PCBDIR}/share/pcb/m4;g' \
+		${WRKSRC}/scheme/${f}.bak > ${WRKSRC}/scheme/${f}
+	${RM} -f ${WRKSRC}/scheme/${f}.bak
+.endfor
 
 .include "../../cad/libgeda/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/gnetlist/PLIST b/cad/gnetlist/PLIST
index 277f93649ef..3cb39c77a98 100644
--- a/cad/gnetlist/PLIST
+++ b/cad/gnetlist/PLIST
@@ -1,10 +1,9 @@
-@comment $NetBSD: PLIST,v 1.5 2003/07/15 09:23:34 dmcmahill Exp $
+@comment $NetBSD: PLIST,v 1.6 2003/09/10 23:43:35 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
 share/gEDA/scheme/gnet-PCBboard.scm
 share/gEDA/scheme/gnet-allegro.scm
@@ -12,8 +11,10 @@ share/gEDA/scheme/gnet-bae.scm
 share/gEDA/scheme/gnet-bom.scm
 share/gEDA/scheme/gnet-bom2.scm
 share/gEDA/scheme/gnet-drc.scm
+share/gEDA/scheme/gnet-drc2.scm
 share/gEDA/scheme/gnet-geda.scm
 share/gEDA/scheme/gnet-gossip.scm
+share/gEDA/scheme/gnet-gsch2pcb.scm
 share/gEDA/scheme/gnet-maxascii.scm
 share/gEDA/scheme/gnet-pads.scm
 share/gEDA/scheme/gnet-partslist-common.scm
@@ -21,8 +22,8 @@ share/gEDA/scheme/gnet-partslist1.scm
 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-spice.scm
 share/gEDA/scheme/gnet-switcap.scm
 share/gEDA/scheme/gnet-tango.scm
 share/gEDA/scheme/gnet-vams.scm
@@ -30,5 +31,6 @@ share/gEDA/scheme/gnet-verilog.scm
 share/gEDA/scheme/gnet-vhdl.scm
 share/gEDA/scheme/gnet-vipec.scm
 share/gEDA/scheme/gnetlist.scm
+share/gEDA/system-gnetlistrc
 @unexec ${RMDIR} %D/share/gEDA/scheme 2>/dev/null || ${TRUE}
 @unexec ${RMDIR} %D/share/gEDA 2>/dev/null || ${TRUE}
diff --git a/cad/gnetlist/distinfo b/cad/gnetlist/distinfo
index ddf14b38932..ad32db7fb64 100644
--- a/cad/gnetlist/distinfo
+++ b/cad/gnetlist/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.10 2003/07/15 09:23:34 dmcmahill Exp $
+$NetBSD: distinfo,v 1.11 2003/09/10 23:43:35 dmcmahill Exp $
 
-SHA1 (geda/geda-gnetlist-20030525.tar.gz) = 9888301831446dffcdf728b7ca46abc4d217382b
-Size (geda/geda-gnetlist-20030525.tar.gz) = 286441 bytes
-SHA1 (patch-aa) = 29dbe6b993dcf6e3c29ce8710b81aafd230ffc50
+SHA1 (geda/geda-gnetlist-20030901.tar.gz) = e0e997fa2043befb0abce8b60f780f8e22fcadfb
+Size (geda/geda-gnetlist-20030901.tar.gz) = 259134 bytes
+SHA1 (patch-aa) = bb6db6fe92e8c3d32ee13b47d42ade1d1a83ecc4
+SHA1 (patch-ab) = b31951b7162621262a7e2c923a4a383b4e7c0f1e
diff --git a/cad/gnetlist/patches/patch-aa b/cad/gnetlist/patches/patch-aa
index bfcb3e49c9d..e4f3ebe6892 100644
--- a/cad/gnetlist/patches/patch-aa
+++ b/cad/gnetlist/patches/patch-aa
@@ -1,22 +1,23 @@
-$NetBSD: patch-aa,v 1.6 2003/07/15 09:23:34 dmcmahill Exp $
+$NetBSD: patch-aa,v 1.7 2003/09/10 23:43:36 dmcmahill Exp $
 
---- scheme/gnet-PCBboard.scm.orig	Mon Mar 10 02:56:44 2003
+--- scheme/gnet-PCBboard.scm.orig	Sun Aug 24 01:36:06 2003
 +++ scheme/gnet-PCBboard.scm
-@@ -134,7 +134,7 @@
+@@ -134,7 +134,8 @@
  ;;
  ;;
  
 -(define *m4-pcbdir* "/usr/X11R6/lib/X11/pcb/m4")
-+(define *m4-pcbdir* "@pcb_confdir@")
++(define *m4-pcbdir* "@pcb_m4dir@")
++(define *m4-pcbconfdir* "@pcb_confdir@")
  
  ;; To emulate popen. Guileish again.
  ; Needed after guile ver. 1.3.2. To save 1.3a users, wrap it in.
-@@ -153,7 +153,7 @@
+@@ -153,7 +154,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@pcb_confdir@ -I$HOME/.pcb -I. " *m4-pcbdir* "/common.m4 - >> " output-filename))))
++   (let ((pipe (open-output-pipe (string-append "gm4 -d -I" *m4-pcbdir* " -I" *m4-pcbconfdir* " -I$HOME/.pcb -I. " *m4-pcbdir* "/common.m4 - >> " output-filename))))
  
  
         ;; packages is a list with the different uref value
diff --git a/cad/gnetlist/patches/patch-ab b/cad/gnetlist/patches/patch-ab
new file mode 100644
index 00000000000..6eeb9a96d7f
--- /dev/null
+++ b/cad/gnetlist/patches/patch-ab
@@ -0,0 +1,23 @@
+$NetBSD: patch-ab,v 1.5 2003/09/10 23:43:36 dmcmahill Exp $
+
+--- scheme/gnet-gsch2pcb.scm.orig	Wed Sep 10 16:26:08 2003
++++ scheme/gnet-gsch2pcb.scm
+@@ -133,7 +133,8 @@
+ ;;
+ ;;
+ 
+-(define *m4-pcbdir* "/usr/X11R6/lib/X11/pcb/m4")
++(define *m4-pcbdir* "@pcb_m4dir@")
++(define *m4-pcbconfdir* "@pcb_confdir@")
+ 
+ ;; To emulate popen. Guileish again.
+ ; Needed after guile ver. 1.3.2. To save 1.3a users, wrap it in.
+@@ -150,7 +151,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" *m4-pcbconfdir* " -I$HOME/.pcb -I. " *m4-pcbdir* "/common.m4 - >> " output-filename))))
+ 
+ 
+        ;; packages is a list with the different refdes value
diff --git a/cad/gschem/Makefile b/cad/gschem/Makefile
index a316ec83e30..0de7c53e046 100644
--- a/cad/gschem/Makefile
+++ b/cad/gschem/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2003/08/09 10:32:14 seb Exp $
+# $NetBSD: Makefile,v 1.23 2003/09/10 23:43:36 dmcmahill Exp $
 #
 
 DISTNAME=		geda-gschem-${PKGVERSION}
@@ -18,10 +18,9 @@ DEPENDS+=		geda-symbols-${PKGVERSION}:../../cad/geda-symbols
 CONFLICTS+=		gEDA<19991011
 
 DIST_SUBDIR=		geda
-PKGVERSION=		20030525
+PKGVERSION=		20030901
 
 GNU_CONFIGURE=		YES
-USE_X11BASE=		YES
 USE_BUILDLINK2=		YES
 USE_PKGLOCALEDIR=	YES
 INFO_FILES=		gschemdoc.info
diff --git a/cad/gschem/PLIST b/cad/gschem/PLIST
index c90b342ab22..69fa9b3aa14 100644
--- a/cad/gschem/PLIST
+++ b/cad/gschem/PLIST
@@ -1,24 +1,11 @@
-@comment $NetBSD: PLIST,v 1.8 2003/07/15 09:23:35 dmcmahill Exp $
+@comment $NetBSD: PLIST,v 1.9 2003/09/10 23:43:36 dmcmahill Exp $
 bin/gschem
 info/gschemdoc.info
 info/gschemdoc.info-1
-info/gschemdoc.info-10
-info/gschemdoc.info-11
-info/gschemdoc.info-12
-info/gschemdoc.info-13
-info/gschemdoc.info-14
-info/gschemdoc.info-15
-info/gschemdoc.info-16
-info/gschemdoc.info-17
-info/gschemdoc.info-18
 info/gschemdoc.info-2
 info/gschemdoc.info-3
 info/gschemdoc.info-4
 info/gschemdoc.info-5
-info/gschemdoc.info-6
-info/gschemdoc.info-7
-info/gschemdoc.info-8
-info/gschemdoc.info-9
 man/man1/gschem.1
 share/gEDA/bitmap/gschem-bus.xpm
 share/gEDA/bitmap/gschem-comp.xpm
@@ -39,12 +26,12 @@ share/gEDA/bitmap/gschem-undo.xpm
 share/gEDA/gschem-darkbg
 share/gEDA/gschem-gtkrc
 share/gEDA/gschem-lightbg
-share/gEDA/system-gschemrc
 share/gEDA/scheme/auto-uref.scm
 share/gEDA/scheme/generate_netlist.scm
 share/gEDA/scheme/gschem.scm
 share/gEDA/scheme/list-keys.scm
 share/gEDA/scheme/print-NB-attribs.scm
+share/gEDA/system-gschemrc
 ${PKGLOCALEDIR}/locale/de_DE/LC_MESSAGES/geda-gschem.mo
 ${PKGLOCALEDIR}/locale/ja_JP/LC_MESSAGES/geda-gschem.mo
 ${PKGLOCALEDIR}/locale/nl_NL/LC_MESSAGES/geda-gschem.mo
diff --git a/cad/gschem/distinfo b/cad/gschem/distinfo
index fda67845c8a..ad3f5699376 100644
--- a/cad/gschem/distinfo
+++ b/cad/gschem/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.8 2003/07/15 09:23:35 dmcmahill Exp $
+$NetBSD: distinfo,v 1.9 2003/09/10 23:43:36 dmcmahill Exp $
 
-SHA1 (geda/geda-gschem-20030525.tar.gz) = b2f6f9a8bb1aca95e9dca584340f215858cbe87e
-Size (geda/geda-gschem-20030525.tar.gz) = 1376449 bytes
+SHA1 (geda/geda-gschem-20030901.tar.gz) = 908449c72c01a157f588c22fc3a95e96799af4ef
+Size (geda/geda-gschem-20030901.tar.gz) = 1377117 bytes
 SHA1 (patch-ab) = b5806b57edd1d5ba3159c4f63a1b1c6678cedaec
diff --git a/cad/gsymcheck/Makefile b/cad/gsymcheck/Makefile
index 68a7b7b0688..e8ab84f500e 100644
--- a/cad/gsymcheck/Makefile
+++ b/cad/gsymcheck/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2003/07/17 21:25:05 grant Exp $
+# $NetBSD: Makefile,v 1.18 2003/09/10 23:43:37 dmcmahill Exp $
 #
 
 DISTNAME=		geda-gsymcheck-${PKGVERSION}
@@ -18,10 +18,9 @@ DEPENDS+=		geda-symbols-${PKGVERSION}:../../cad/geda-symbols
 CONFLICTS+=		gEDA<19991011
 
 DIST_SUBDIR=		geda
-PKGVERSION=		20030525
+PKGVERSION=		20030901
 
 GNU_CONFIGURE=		YES
-USE_X11BASE=		YES
 USE_LIBTOOL=		YES
 USE_BUILDLINK2=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
diff --git a/cad/gsymcheck/distinfo b/cad/gsymcheck/distinfo
index 3293a358314..f9f50a1e63d 100644
--- a/cad/gsymcheck/distinfo
+++ b/cad/gsymcheck/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2003/07/15 09:23:36 dmcmahill Exp $
+$NetBSD: distinfo,v 1.8 2003/09/10 23:43:37 dmcmahill Exp $
 
-SHA1 (geda/geda-gsymcheck-20030525.tar.gz) = 3005129585ac2b76ca6294b50bccfc30d21d8689
-Size (geda/geda-gsymcheck-20030525.tar.gz) = 138338 bytes
+SHA1 (geda/geda-gsymcheck-20030901.tar.gz) = 2ff9144d290a200fd962c7d1a2b770da7097c14f
+Size (geda/geda-gsymcheck-20030901.tar.gz) = 102523 bytes
diff --git a/cad/libgeda/Makefile b/cad/libgeda/Makefile
index 558508212c4..bc8f37ef9de 100644
--- a/cad/libgeda/Makefile
+++ b/cad/libgeda/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2003/08/09 10:32:14 seb Exp $
+# $NetBSD: Makefile,v 1.21 2003/09/10 23:43:37 dmcmahill Exp $
 #
 
 DISTNAME=		libgeda-${PKGVERSION}
@@ -15,11 +15,10 @@ COMMENT=		Library of shared modules for gEDA
 CONFLICTS+=		gEDA<19991011
 
 DIST_SUBDIR=		geda
-PKGVERSION=		20030525
+PKGVERSION=		20030901
 
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
-USE_X11BASE=		YES
 USE_BUILDLINK2=		YES
 
 INFO_FILES=		libgedadoc.info
@@ -29,5 +28,5 @@ LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 .include "../../devel/libstroke/buildlink2.mk"
 .include "../../graphics/libgdgeda/buildlink2.mk"
 .include "../../lang/guile/buildlink2.mk"
-.include "../../x11/gtk/buildlink2.mk"
+.include "../../x11/gtk2/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/libgeda/PLIST b/cad/libgeda/PLIST
index f9bdd3dc54f..512a5df7ce3 100644
--- a/cad/libgeda/PLIST
+++ b/cad/libgeda/PLIST
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2003/06/27 09:03:16 seb Exp $
-bin/libgeda-config
+@comment $NetBSD: PLIST,v 1.6 2003/09/10 23:43:37 dmcmahill Exp $
 include/libgeda/colors.h
 include/libgeda/defines.h
 include/libgeda/funcs.h
@@ -10,22 +9,12 @@ include/libgeda/prototype.h
 include/libgeda/struct.h
 info/libgedadoc.info
 info/libgedadoc.info-1
-info/libgedadoc.info-10
-info/libgedadoc.info-11
-info/libgedadoc.info-12
-info/libgedadoc.info-13
-info/libgedadoc.info-14
 info/libgedadoc.info-2
 info/libgedadoc.info-3
-info/libgedadoc.info-4
-info/libgedadoc.info-5
-info/libgedadoc.info-6
-info/libgedadoc.info-7
-info/libgedadoc.info-8
-info/libgedadoc.info-9
 lib/libgeda.a
 lib/libgeda.la
 lib/libgeda.so
-lib/libgeda.so.18
-lib/libgeda.so.18.0
+lib/libgeda.so.19
+lib/libgeda.so.19.0
+lib/pkgconfig/libgeda.pc
 @dirrm include/libgeda
diff --git a/cad/libgeda/buildlink2.mk b/cad/libgeda/buildlink2.mk
index d84434500f9..da36c4939d8 100644
--- a/cad/libgeda/buildlink2.mk
+++ b/cad/libgeda/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.4 2003/07/15 09:23:37 dmcmahill Exp $
+# $NetBSD: buildlink2.mk,v 1.5 2003/09/10 23:43: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>=20030525
+BUILDLINK_DEPENDS.libgeda?=		libgeda>=20030901
 BUILDLINK_PKGSRCDIR.libgeda?=		../../cad/libgeda
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.libgeda=libgeda
@@ -27,7 +27,7 @@ BUILDLINK_FILES.libgeda+=	lib/libgeda.*
 .include "../../devel/libstroke/buildlink2.mk"
 .include "../../graphics/libgdgeda/buildlink2.mk"
 .include "../../lang/guile/buildlink2.mk"
-.include "../../x11/gtk/buildlink2.mk"
+.include "../../x11/gtk2/buildlink2.mk"
 
 BUILDLINK_TARGETS+=	libgeda-buildlink
 
diff --git a/cad/libgeda/distinfo b/cad/libgeda/distinfo
index 1c0716492af..437feda937c 100644
--- a/cad/libgeda/distinfo
+++ b/cad/libgeda/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2003/07/15 09:23:37 dmcmahill Exp $
+$NetBSD: distinfo,v 1.8 2003/09/10 23:43:37 dmcmahill Exp $
 
-SHA1 (geda/libgeda-20030525.tar.gz) = 84b067d2ea97a4d997987ad9edc033342dc0e3d0
-Size (geda/libgeda-20030525.tar.gz) = 876919 bytes
+SHA1 (geda/libgeda-20030901.tar.gz) = 53dd0cc4b89010cb0a3fb8da3419488eae15669c
+Size (geda/libgeda-20030901.tar.gz) = 846307 bytes