28 files changed, 373 insertions, 518 deletions

diff --git a/cad/gattrib/Makefile b/cad/gattrib/Makefile
index d3ab3f9c295..828b8cf1328 100644
--- a/cad/gattrib/Makefile
+++ b/cad/gattrib/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2006/04/17 13:46:17 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2006/09/01 12:00:42 dmcmahill Exp $
 
 DISTNAME=		geda-gattrib-${PKGVERSION}
 PKGNAME=		gattrib-${PKGVERSION}
-PKGREVISION=		2
 CATEGORIES=		cad
 
 MAINTAINER=		wulf@NetBSD.org
diff --git a/cad/gattrib/distinfo b/cad/gattrib/distinfo
index 5b9662be586..41e325665ec 100644
--- a/cad/gattrib/distinfo
+++ b/cad/gattrib/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.10 2006/01/25 01:51:34 dmcmahill Exp $
+$NetBSD: distinfo,v 1.11 2006/09/01 12:00:43 dmcmahill Exp $
 
-SHA1 (geda/geda-gattrib-20060123.tar.gz) = f71ce68ae71de4f9526f011e6fe1b1850036322d
-RMD160 (geda/geda-gattrib-20060123.tar.gz) = 6993fe6dbfeefda8a30b97329a6ad3a61ad1ca87
-Size (geda/geda-gattrib-20060123.tar.gz) = 317978 bytes
+SHA1 (geda/geda-gattrib-20060824.tar.gz) = 7326d67f3e8de3f7712deb435bf6410ec957d3ec
+RMD160 (geda/geda-gattrib-20060824.tar.gz) = 391d50548995e9e192be1d69017734ed0a2ee317
+Size (geda/geda-gattrib-20060824.tar.gz) = 275775 bytes
diff --git a/cad/geda-docs/Makefile b/cad/geda-docs/Makefile
index 62406524f6d..ac0ae293c5f 100644
--- a/cad/geda-docs/Makefile
+++ b/cad/geda-docs/Makefile
@@ -1,16 +1,15 @@
-# $NetBSD: Makefile,v 1.17 2006/02/05 23:08:21 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2006/09/01 12:00:43 dmcmahill Exp $
 #
 
 DISTNAME=		geda-docs-${PKGVERSION}
-PKGREVISION=		1
 CATEGORIES=		cad
 
 MAINTAINER=		dmcmahill@NetBSD.org
 HOMEPAGE=		http://www.geda.seul.org/
 COMMENT=		HTML documentation for gEDA
 
-DEPENDS+=		geda-symbols-${PKGVERSION}nb1:../../cad/geda-symbols
-BUILD_DEPENDS+=		geda-symbols>=${PKGVERSION}:../../cad/geda-symbols
+DEPENDS+=		geda-symbols-${PKGVERSION}{,nb[0-9]*}:../../cad/geda-symbols
+BUILD_DEPENDS+=		geda-symbols-${PKGVERSION}{,nb[0-9]*}:../../cad/geda-symbols
 
 CONFLICTS+=		gEDA<19991011
 
diff --git a/cad/geda-docs/PLIST b/cad/geda-docs/PLIST
index d394af300c6..f6c21771274 100644
--- a/cad/geda-docs/PLIST
+++ b/cad/geda-docs/PLIST
@@ -1,368 +1,5 @@
-@comment $NetBSD: PLIST,v 1.10 2005/08/23 00:02:20 dmcmahill Exp $
-share/doc/geda-doc/attributes/WARNINGS
-share/doc/geda-doc/attributes/attributes.css
-share/doc/geda-doc/attributes/attributes.dvi
-share/doc/geda-doc/attributes/attributes.html
-share/doc/geda-doc/attributes/attributes.pdf
-share/doc/geda-doc/attributes/attributes.ps
-share/doc/geda-doc/attributes/contents.png
-share/doc/geda-doc/attributes/index.html
-share/doc/geda-doc/attributes/internals.pl
-share/doc/geda-doc/attributes/labels.pl
-share/doc/geda-doc/attributes/next.png
-share/doc/geda-doc/attributes/next_g.png
-share/doc/geda-doc/attributes/node1.html
-share/doc/geda-doc/attributes/node10.html
-share/doc/geda-doc/attributes/node11.html
-share/doc/geda-doc/attributes/node12.html
-share/doc/geda-doc/attributes/node13.html
-share/doc/geda-doc/attributes/node14.html
-share/doc/geda-doc/attributes/node15.html
-share/doc/geda-doc/attributes/node16.html
-share/doc/geda-doc/attributes/node17.html
-share/doc/geda-doc/attributes/node18.html
-share/doc/geda-doc/attributes/node19.html
-share/doc/geda-doc/attributes/node2.html
-share/doc/geda-doc/attributes/node20.html
-share/doc/geda-doc/attributes/node21.html
-share/doc/geda-doc/attributes/node22.html
-share/doc/geda-doc/attributes/node23.html
-share/doc/geda-doc/attributes/node24.html
-share/doc/geda-doc/attributes/node25.html
-share/doc/geda-doc/attributes/node26.html
-share/doc/geda-doc/attributes/node27.html
-share/doc/geda-doc/attributes/node28.html
-share/doc/geda-doc/attributes/node29.html
-share/doc/geda-doc/attributes/node3.html
-share/doc/geda-doc/attributes/node30.html
-share/doc/geda-doc/attributes/node31.html
-share/doc/geda-doc/attributes/node32.html
-share/doc/geda-doc/attributes/node33.html
-share/doc/geda-doc/attributes/node34.html
-share/doc/geda-doc/attributes/node35.html
-share/doc/geda-doc/attributes/node36.html
-share/doc/geda-doc/attributes/node4.html
-share/doc/geda-doc/attributes/node5.html
-share/doc/geda-doc/attributes/node6.html
-share/doc/geda-doc/attributes/node7.html
-share/doc/geda-doc/attributes/node8.html
-share/doc/geda-doc/attributes/node9.html
-share/doc/geda-doc/attributes/prev.png
-share/doc/geda-doc/attributes/prev_g.png
-share/doc/geda-doc/attributes/up.png
-share/doc/geda-doc/attributes/up_g.png
-share/doc/geda-doc/cascade/WARNINGS
-share/doc/geda-doc/cascade/cascade.css
-share/doc/geda-doc/cascade/cascade.dvi
-share/doc/geda-doc/cascade/cascade.html
-share/doc/geda-doc/cascade/cascade.pdf
-share/doc/geda-doc/cascade/cascade.ps
-share/doc/geda-doc/cascade/contents.png
-share/doc/geda-doc/cascade/images.aux
-share/doc/geda-doc/cascade/images.log
-share/doc/geda-doc/cascade/images.out
-share/doc/geda-doc/cascade/images.pl
-share/doc/geda-doc/cascade/images.tex
-share/doc/geda-doc/cascade/img1.png
-share/doc/geda-doc/cascade/img2.png
-share/doc/geda-doc/cascade/index.html
-share/doc/geda-doc/cascade/internals.pl
-share/doc/geda-doc/cascade/labels.pl
-share/doc/geda-doc/cascade/next.png
-share/doc/geda-doc/cascade/next_g.png
-share/doc/geda-doc/cascade/node1.html
-share/doc/geda-doc/cascade/node10.html
-share/doc/geda-doc/cascade/node11.html
-share/doc/geda-doc/cascade/node12.html
-share/doc/geda-doc/cascade/node13.html
-share/doc/geda-doc/cascade/node14.html
-share/doc/geda-doc/cascade/node15.html
-share/doc/geda-doc/cascade/node16.html
-share/doc/geda-doc/cascade/node2.html
-share/doc/geda-doc/cascade/node3.html
-share/doc/geda-doc/cascade/node4.html
-share/doc/geda-doc/cascade/node5.html
-share/doc/geda-doc/cascade/node6.html
-share/doc/geda-doc/cascade/node7.html
-share/doc/geda-doc/cascade/node8.html
-share/doc/geda-doc/cascade/node9.html
-share/doc/geda-doc/cascade/prev.png
-share/doc/geda-doc/cascade/prev_g.png
-share/doc/geda-doc/cascade/up.png
-share/doc/geda-doc/cascade/up_g.png
-share/doc/geda-doc/fileformats/WARNINGS
-share/doc/geda-doc/fileformats/contents.png
-share/doc/geda-doc/fileformats/fileformats.css
-share/doc/geda-doc/fileformats/fileformats.dvi
-share/doc/geda-doc/fileformats/fileformats.html
-share/doc/geda-doc/fileformats/fileformats.pdf
-share/doc/geda-doc/fileformats/fileformats.ps
-share/doc/geda-doc/fileformats/images.aux
-share/doc/geda-doc/fileformats/images.log
-share/doc/geda-doc/fileformats/images.out
-share/doc/geda-doc/fileformats/images.pl
-share/doc/geda-doc/fileformats/images.tex
-share/doc/geda-doc/fileformats/img1.png
-share/doc/geda-doc/fileformats/img2.png
-share/doc/geda-doc/fileformats/index.html
-share/doc/geda-doc/fileformats/labels.pl
-share/doc/geda-doc/fileformats/next.png
-share/doc/geda-doc/fileformats/next_g.png
-share/doc/geda-doc/fileformats/node1.html
-share/doc/geda-doc/fileformats/node10.html
-share/doc/geda-doc/fileformats/node11.html
-share/doc/geda-doc/fileformats/node12.html
-share/doc/geda-doc/fileformats/node13.html
-share/doc/geda-doc/fileformats/node14.html
-share/doc/geda-doc/fileformats/node15.html
-share/doc/geda-doc/fileformats/node16.html
-share/doc/geda-doc/fileformats/node17.html
-share/doc/geda-doc/fileformats/node18.html
-share/doc/geda-doc/fileformats/node19.html
-share/doc/geda-doc/fileformats/node2.html
-share/doc/geda-doc/fileformats/node20.html
-share/doc/geda-doc/fileformats/node21.html
-share/doc/geda-doc/fileformats/node22.html
-share/doc/geda-doc/fileformats/node3.html
-share/doc/geda-doc/fileformats/node4.html
-share/doc/geda-doc/fileformats/node5.html
-share/doc/geda-doc/fileformats/node6.html
-share/doc/geda-doc/fileformats/node7.html
-share/doc/geda-doc/fileformats/node8.html
-share/doc/geda-doc/fileformats/node9.html
-share/doc/geda-doc/fileformats/prev.png
-share/doc/geda-doc/fileformats/prev_g.png
-share/doc/geda-doc/fileformats/up.png
-share/doc/geda-doc/fileformats/up_g.png
+@comment $NetBSD: PLIST,v 1.11 2006/09/01 12:00:43 dmcmahill Exp $
 share/doc/geda-doc/gedadocs.html
-share/doc/geda-doc/gnetlist/WARNINGS
-share/doc/geda-doc/gnetlist/contents.png
-share/doc/geda-doc/gnetlist/gnetlist.css
-share/doc/geda-doc/gnetlist/gnetlist.dvi
-share/doc/geda-doc/gnetlist/gnetlist.html
-share/doc/geda-doc/gnetlist/gnetlist.pdf
-share/doc/geda-doc/gnetlist/gnetlist.ps
-share/doc/geda-doc/gnetlist/index.html
-share/doc/geda-doc/gnetlist/labels.pl
-share/doc/geda-doc/gnetlist/next.png
-share/doc/geda-doc/gnetlist/next_g.png
-share/doc/geda-doc/gnetlist/node1.html
-share/doc/geda-doc/gnetlist/node10.html
-share/doc/geda-doc/gnetlist/node11.html
-share/doc/geda-doc/gnetlist/node12.html
-share/doc/geda-doc/gnetlist/node13.html
-share/doc/geda-doc/gnetlist/node14.html
-share/doc/geda-doc/gnetlist/node15.html
-share/doc/geda-doc/gnetlist/node16.html
-share/doc/geda-doc/gnetlist/node17.html
-share/doc/geda-doc/gnetlist/node18.html
-share/doc/geda-doc/gnetlist/node2.html
-share/doc/geda-doc/gnetlist/node3.html
-share/doc/geda-doc/gnetlist/node4.html
-share/doc/geda-doc/gnetlist/node5.html
-share/doc/geda-doc/gnetlist/node6.html
-share/doc/geda-doc/gnetlist/node7.html
-share/doc/geda-doc/gnetlist/node8.html
-share/doc/geda-doc/gnetlist/node9.html
-share/doc/geda-doc/gnetlist/prev.png
-share/doc/geda-doc/gnetlist/prev_g.png
-share/doc/geda-doc/gnetlist/up.png
-share/doc/geda-doc/gnetlist/up_g.png
-share/doc/geda-doc/gschem/WARNINGS
-share/doc/geda-doc/gschem/contents.png
-share/doc/geda-doc/gschem/gschem.css
-share/doc/geda-doc/gschem/gschem.dvi
-share/doc/geda-doc/gschem/gschem.html
-share/doc/geda-doc/gschem/gschem.pdf
-share/doc/geda-doc/gschem/gschem.ps
-share/doc/geda-doc/gschem/index.html
-share/doc/geda-doc/gschem/labels.pl
-share/doc/geda-doc/gschem/next.png
-share/doc/geda-doc/gschem/next_g.png
-share/doc/geda-doc/gschem/node1.html
-share/doc/geda-doc/gschem/node10.html
-share/doc/geda-doc/gschem/node11.html
-share/doc/geda-doc/gschem/node12.html
-share/doc/geda-doc/gschem/node13.html
-share/doc/geda-doc/gschem/node14.html
-share/doc/geda-doc/gschem/node15.html
-share/doc/geda-doc/gschem/node16.html
-share/doc/geda-doc/gschem/node17.html
-share/doc/geda-doc/gschem/node18.html
-share/doc/geda-doc/gschem/node19.html
-share/doc/geda-doc/gschem/node2.html
-share/doc/geda-doc/gschem/node20.html
-share/doc/geda-doc/gschem/node21.html
-share/doc/geda-doc/gschem/node22.html
-share/doc/geda-doc/gschem/node23.html
-share/doc/geda-doc/gschem/node3.html
-share/doc/geda-doc/gschem/node4.html
-share/doc/geda-doc/gschem/node5.html
-share/doc/geda-doc/gschem/node6.html
-share/doc/geda-doc/gschem/node7.html
-share/doc/geda-doc/gschem/node8.html
-share/doc/geda-doc/gschem/node9.html
-share/doc/geda-doc/gschem/prev.png
-share/doc/geda-doc/gschem/prev_g.png
-share/doc/geda-doc/gschem/up.png
-share/doc/geda-doc/gschem/up_g.png
-share/doc/geda-doc/hooks/hooks_and_scheme.txt
-share/doc/geda-doc/keymapping/keymapping.html
-share/doc/geda-doc/netattrib/WARNINGS
-share/doc/geda-doc/netattrib/contents.png
-share/doc/geda-doc/netattrib/index.html
-share/doc/geda-doc/netattrib/labels.pl
-share/doc/geda-doc/netattrib/netattrib.css
-share/doc/geda-doc/netattrib/netattrib.dvi
-share/doc/geda-doc/netattrib/netattrib.html
-share/doc/geda-doc/netattrib/netattrib.pdf
-share/doc/geda-doc/netattrib/netattrib.ps
-share/doc/geda-doc/netattrib/next.png
-share/doc/geda-doc/netattrib/next_g.png
-share/doc/geda-doc/netattrib/node1.html
-share/doc/geda-doc/netattrib/node2.html
-share/doc/geda-doc/netattrib/node3.html
-share/doc/geda-doc/netattrib/node4.html
-share/doc/geda-doc/netattrib/node5.html
-share/doc/geda-doc/netattrib/node6.html
-share/doc/geda-doc/netattrib/node7.html
-share/doc/geda-doc/netattrib/node8.html
-share/doc/geda-doc/netattrib/prev.png
-share/doc/geda-doc/netattrib/prev_g.png
-share/doc/geda-doc/netattrib/up.png
-share/doc/geda-doc/netattrib/up_g.png
-share/doc/geda-doc/pads_backannotate/WARNINGS
-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.out
-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/WARNINGS
-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.out
-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/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/WARNINGS
-share/doc/geda-doc/symbols/contents.png
-share/doc/geda-doc/symbols/images.aux
-share/doc/geda-doc/symbols/images.log
-share/doc/geda-doc/symbols/images.out
-share/doc/geda-doc/symbols/images.pl
-share/doc/geda-doc/symbols/images.tex
-share/doc/geda-doc/symbols/img1.png
-share/doc/geda-doc/symbols/img2.png
-share/doc/geda-doc/symbols/index.html
-share/doc/geda-doc/symbols/labels.pl
-share/doc/geda-doc/symbols/next.png
-share/doc/geda-doc/symbols/next_g.png
-share/doc/geda-doc/symbols/node1.html
-share/doc/geda-doc/symbols/node10.html
-share/doc/geda-doc/symbols/node11.html
-share/doc/geda-doc/symbols/node12.html
-share/doc/geda-doc/symbols/node13.html
-share/doc/geda-doc/symbols/node14.html
-share/doc/geda-doc/symbols/node15.html
-share/doc/geda-doc/symbols/node16.html
-share/doc/geda-doc/symbols/node17.html
-share/doc/geda-doc/symbols/node18.html
-share/doc/geda-doc/symbols/node19.html
-share/doc/geda-doc/symbols/node2.html
-share/doc/geda-doc/symbols/node20.html
-share/doc/geda-doc/symbols/node21.html
-share/doc/geda-doc/symbols/node22.html
-share/doc/geda-doc/symbols/node3.html
-share/doc/geda-doc/symbols/node4.html
-share/doc/geda-doc/symbols/node5.html
-share/doc/geda-doc/symbols/node6.html
-share/doc/geda-doc/symbols/node7.html
-share/doc/geda-doc/symbols/node8.html
-share/doc/geda-doc/symbols/node9.html
-share/doc/geda-doc/symbols/prev.png
-share/doc/geda-doc/symbols/prev_g.png
-share/doc/geda-doc/symbols/symbols.css
-share/doc/geda-doc/symbols/symbols.dvi
-share/doc/geda-doc/symbols/symbols.html
-share/doc/geda-doc/symbols/symbols.pdf
-share/doc/geda-doc/symbols/symbols.ps
-share/doc/geda-doc/symbols/up.png
-share/doc/geda-doc/symbols/up_g.png
 share/doc/geda-doc/tutorials/gsch2pcb/gschem-warmup.html
 share/doc/geda-doc/tutorials/gsch2pcb/images/board-1.png
 share/doc/geda-doc/tutorials/gsch2pcb/images/board-2.png
@@ -385,42 +22,293 @@ share/doc/geda-doc/tutorials/gsch2pcb/images/warmup-0.png
 share/doc/geda-doc/tutorials/gsch2pcb/images/warmup-1.png
 share/doc/geda-doc/tutorials/gsch2pcb/images/warmup-2.png
 share/doc/geda-doc/tutorials/gsch2pcb/transistor-guide.html
-share/doc/geda-doc/tutorials/gsch2pcb/tutorial.html
 share/doc/geda-doc/tutorials/gsch2pcb/tutorial-old.html
-share/doc/geda-doc/tutorials/tragesym/gedit_corrected.jpg
-share/doc/geda-doc/tutorials/tragesym/gedit_pasted.jpg
-share/doc/geda-doc/tutorials/tragesym/gnumeric_dot.jpg
-share/doc/geda-doc/tutorials/tragesym/gnumeric_export.jpg
-share/doc/geda-doc/tutorials/tragesym/gnumeric_filled.jpg
-share/doc/geda-doc/tutorials/tragesym/gnumeric_import.jpg
-share/doc/geda-doc/tutorials/tragesym/gnumeric_import2.jpg
-share/doc/geda-doc/tutorials/tragesym/gnumeric_moved.jpg
-share/doc/geda-doc/tutorials/tragesym/gnumeric_posit.jpg
-share/doc/geda-doc/tutorials/tragesym/gnumeric_pwr.jpg
-share/doc/geda-doc/tutorials/tragesym/gnumeric_save.jpg
-share/doc/geda-doc/tutorials/tragesym/gnumeric_sorted.jpg
-share/doc/geda-doc/tutorials/tragesym/gnumeric_start.jpg
-share/doc/geda-doc/tutorials/tragesym/gnumeric_type.jpg
-share/doc/geda-doc/tutorials/tragesym/gschem_edited.jpg
-share/doc/geda-doc/tutorials/tragesym/tragesym.html
-share/doc/geda-doc/tutorials/tragesym/xpdf_block.jpg
-share/doc/geda-doc/tutorials/tragesym/xpdf_open.jpg
-share/doc/geda-doc/tutorials/tragesym/xpdf_pins.jpg
-share/doc/geda-doc/tutorials/tragesym/xpdf_selected.jpg
-@dirrm share/doc/geda-doc/tutorials/tragesym
+share/doc/geda-doc/tutorials/gsch2pcb/tutorial.html
+share/doc/geda-doc/wiki/001geda_documentation.html
+share/doc/geda-doc/wiki/001geda_faq-attribs.html
+share/doc/geda-doc/wiki/001geda_faq-gnetlist.html
+share/doc/geda-doc/wiki/001geda_faq-gsch2pcb.html
+share/doc/geda-doc/wiki/001geda_faq-gschem.html
+share/doc/geda-doc/wiki/001geda_faq-simulation.html
+share/doc/geda-doc/wiki/001geda_faq.html
+share/doc/geda-doc/wiki/001geda_glossary.html
+share/doc/geda-doc/wiki/001geda_gschem_mp.html
+share/doc/geda-doc/wiki/001geda_gschem_ug.html
+share/doc/geda-doc/wiki/001geda_hse_howto.html
+share/doc/geda-doc/wiki/001geda_installation.html
+share/doc/geda-doc/wiki/001geda_kig_howto.html
+share/doc/geda-doc/wiki/001geda_pcb-quick_reference.html
+share/doc/geda-doc/wiki/001geda_pcb_tips.html
+share/doc/geda-doc/wiki/001geda_scg.html
+share/doc/geda-doc/wiki/001geda_tasks.html
+share/doc/geda-doc/wiki/001geda_todos.html
+share/doc/geda-doc/wiki/001geda_usage.html
+share/doc/geda-doc/wiki/_detail/geda_ambiguous1.html
+share/doc/geda-doc/wiki/_detail/geda_ambiguous1_fixed.html
+share/doc/geda-doc/wiki/_detail/geda_coordinatespace.html
+share/doc/geda-doc/wiki/_detail/geda_design_flow.html
+share/doc/geda-doc/wiki/_detail/geda_faq_attrib.html
+share/doc/geda-doc/wiki/_detail/geda_fileformat_textgraphic.html
+share/doc/geda-doc/wiki/_detail/geda_geda_flow.html
+share/doc/geda-doc/wiki/_detail/geda_gschem_screenshot_001.html
+share/doc/geda-doc/wiki/_detail/geda_gschem_workflow_01.html
+share/doc/geda-doc/wiki/_detail/geda_net.html
+share/doc/geda-doc/wiki/_detail/geda_nets.html
+share/doc/geda-doc/wiki/_detail/geda_rf_cascade_figure1.html
+share/doc/geda-doc/wiki/_detail/geda_rf_cascade_figure2.html
+share/doc/geda-doc/wiki/_detail/geda_status_screenshot.html
+share/doc/geda-doc/wiki/_detail/geda_switcap_figure1.html
+share/doc/geda-doc/wiki/_detail/geda_switcap_figure2.html
+share/doc/geda-doc/wiki/_detail/geda_switcap_figure3.html
+share/doc/geda-doc/wiki/_detail/geda_switcap_figure4.html
+share/doc/geda-doc/wiki/_detail/geda_terminal_screenshot_001.html
+share/doc/geda-doc/wiki/_media/001geda_ambiguous1.png
+share/doc/geda-doc/wiki/_media/001geda_ambiguous1_fixed.png
+share/doc/geda-doc/wiki/_media/001geda_coordinatespace.jpg
+share/doc/geda-doc/wiki/_media/001geda_design_flow.jpg
+share/doc/geda-doc/wiki/_media/001geda_faq_attrib.jpg
+share/doc/geda-doc/wiki/_media/001geda_fileformat_textgraphic.jpg
+share/doc/geda-doc/wiki/_media/001geda_geda_flow.png
+share/doc/geda-doc/wiki/_media/001geda_gschem_screenshot_001.jpg
+share/doc/geda-doc/wiki/_media/001geda_gschem_workflow_01.jpg
+share/doc/geda-doc/wiki/_media/001geda_net.jpg
+share/doc/geda-doc/wiki/_media/001geda_nets.jpg
+share/doc/geda-doc/wiki/_media/001geda_rf_cascade_figure1.jpg
+share/doc/geda-doc/wiki/_media/001geda_rf_cascade_figure2.jpg
+share/doc/geda-doc/wiki/_media/001geda_status_screenshot.jpg
+share/doc/geda-doc/wiki/_media/001geda_switcap_figure1.jpg
+share/doc/geda-doc/wiki/_media/001geda_switcap_figure2.jpg
+share/doc/geda-doc/wiki/_media/001geda_switcap_figure3.jpg
+share/doc/geda-doc/wiki/_media/001geda_switcap_figure4.jpg
+share/doc/geda-doc/wiki/_media/001geda_terminal_screenshot_001.jpg
+share/doc/geda-doc/wiki/_media/002geda_ambiguous1.png
+share/doc/geda-doc/wiki/_media/002geda_ambiguous1_fixed.png
+share/doc/geda-doc/wiki/_media/002geda_coordinatespace.jpg
+share/doc/geda-doc/wiki/_media/002geda_design_flow.jpg
+share/doc/geda-doc/wiki/_media/002geda_faq_attrib.jpg
+share/doc/geda-doc/wiki/_media/002geda_fileformat_textgraphic.jpg
+share/doc/geda-doc/wiki/_media/002geda_geda_flow.png
+share/doc/geda-doc/wiki/_media/002geda_gschem_screenshot_001.jpg
+share/doc/geda-doc/wiki/_media/002geda_gschem_workflow_01.jpg
+share/doc/geda-doc/wiki/_media/002geda_net.jpg
+share/doc/geda-doc/wiki/_media/002geda_nets.jpg
+share/doc/geda-doc/wiki/_media/002geda_rf_cascade_figure1.jpg
+share/doc/geda-doc/wiki/_media/002geda_rf_cascade_figure2.jpg
+share/doc/geda-doc/wiki/_media/002geda_status_screenshot.jpg
+share/doc/geda-doc/wiki/_media/002geda_switcap_figure1.jpg
+share/doc/geda-doc/wiki/_media/002geda_switcap_figure2.jpg
+share/doc/geda-doc/wiki/_media/002geda_switcap_figure3.jpg
+share/doc/geda-doc/wiki/_media/002geda_switcap_figure4.jpg
+share/doc/geda-doc/wiki/_media/002geda_terminal_screenshot_001.jpg
+share/doc/geda-doc/wiki/_media/geda_ambiguous1.png
+share/doc/geda-doc/wiki/_media/geda_ambiguous1_fixed.png
+share/doc/geda-doc/wiki/_media/geda_coordinatespace.jpg
+share/doc/geda-doc/wiki/_media/geda_design_flow.jpg
+share/doc/geda-doc/wiki/_media/geda_faq_attrib.jpg
+share/doc/geda-doc/wiki/_media/geda_fileformat_textgraphic.jpg
+share/doc/geda-doc/wiki/_media/geda_geda_flow.png
+share/doc/geda-doc/wiki/_media/geda_gschem_screenshot_001.jpg
+share/doc/geda-doc/wiki/_media/geda_gschem_workflow_01.jpg
+share/doc/geda-doc/wiki/_media/geda_net.jpg
+share/doc/geda-doc/wiki/_media/geda_nets.jpg
+share/doc/geda-doc/wiki/_media/geda_rf_cascade_figure1.jpg
+share/doc/geda-doc/wiki/_media/geda_rf_cascade_figure2.jpg
+share/doc/geda-doc/wiki/_media/geda_status_screenshot.jpg
+share/doc/geda-doc/wiki/_media/geda_switcap_figure1.jpg
+share/doc/geda-doc/wiki/_media/geda_switcap_figure2.jpg
+share/doc/geda-doc/wiki/_media/geda_switcap_figure3.jpg
+share/doc/geda-doc/wiki/_media/geda_switcap_figure4.jpg
+share/doc/geda-doc/wiki/_media/geda_terminal_screenshot_001.jpg
+share/doc/geda-doc/wiki/docs_20060124_gschem_ug_app_a.html
+share/doc/geda-doc/wiki/docs_20060124_gschem_ug_app_b.html
+share/doc/geda-doc/wiki/docs_20060124_gschem_ug_app_c.html
+share/doc/geda-doc/wiki/docs_20060124_gschem_ug_components_symbols_objects_attributes.html
+share/doc/geda-doc/wiki/docs_20060124_gschem_ug_electrical_connectivity.html
+share/doc/geda-doc/wiki/docs_20060124_gschem_ug_how_to_ask_questions.html
+share/doc/geda-doc/wiki/docs_20060124_gschem_ug_installing_gschem.html
+share/doc/geda-doc/wiki/docs_20060124_gschem_ug_resources.html
+share/doc/geda-doc/wiki/docs_20060124_gschem_ug_the_main_window.html
+share/doc/geda-doc/wiki/docs_20060124_gschem_ug_the_status_window.html
+share/doc/geda-doc/wiki/geda_bom_readme.html
+share/doc/geda-doc/wiki/geda_covered_mp.html
+share/doc/geda-doc/wiki/geda_covered_rv.html
+share/doc/geda-doc/wiki/geda_csygas.html
+share/doc/geda-doc/wiki/geda_cygwin.html
+share/doc/geda-doc/wiki/geda_documentation.html
+share/doc/geda-doc/wiki/geda_eagle_pcb_netlister_readme.html
+share/doc/geda-doc/wiki/geda_example_hsm.html
+share/doc/geda-doc/wiki/geda_example_usbjtag.html
+share/doc/geda-doc/wiki/geda_faq-attribs.html
+share/doc/geda-doc/wiki/geda_faq-gnetlist.html
+share/doc/geda-doc/wiki/geda_faq-gsch2pcb.html
+share/doc/geda-doc/wiki/geda_faq-gschem.html
+share/doc/geda-doc/wiki/geda_faq-simulation.html
+share/doc/geda-doc/wiki/geda_faq.html
+share/doc/geda-doc/wiki/geda_fbabgapp.html
+share/doc/geda-doc/wiki/geda_fc1.html
+share/doc/geda-doc/wiki/geda_fc2.html
+share/doc/geda-doc/wiki/geda_fc3.html
+share/doc/geda-doc/wiki/geda_fc4.html
+share/doc/geda-doc/wiki/geda_file_format_spec.html
+share/doc/geda-doc/wiki/geda_footprint_creation.html
+share/doc/geda-doc/wiki/geda_gattrib_readme.html
+share/doc/geda-doc/wiki/geda_gerbv_mp.html
+share/doc/geda-doc/wiki/geda_gerbv_pnp_readme.html
+share/doc/geda-doc/wiki/geda_gfdl.html
+share/doc/geda-doc/wiki/geda_glossary.html
+share/doc/geda-doc/wiki/geda_gnetlist_mp.html
+share/doc/geda-doc/wiki/geda_gnetlist_ug.html
+share/doc/geda-doc/wiki/geda_grcsan.html
+share/doc/geda-doc/wiki/geda_grenum_mp.html
+share/doc/geda-doc/wiki/geda_gsch2pcb_readme.html
+share/doc/geda-doc/wiki/geda_gschem2pcb_readme.html
+share/doc/geda-doc/wiki/geda_gschem_mp.html
+share/doc/geda-doc/wiki/geda_gschem_ug.html
+share/doc/geda-doc/wiki/geda_gsymcheck_mp.html
+share/doc/geda-doc/wiki/geda_gtkwave_lxt2miner_mp.html
+share/doc/geda-doc/wiki/geda_gtkwave_lxt2vcd_mp.html
+share/doc/geda-doc/wiki/geda_gtkwave_mp.html
+share/doc/geda-doc/wiki/geda_gtkwave_mvl2lxt_mp.html
+share/doc/geda-doc/wiki/geda_gtkwave_mvl2vcd_mp.html
+share/doc/geda-doc/wiki/geda_gtkwave_tex2vcd_mp.html
+share/doc/geda-doc/wiki/geda_gtkwave_tla2vcd_mp.html
+share/doc/geda-doc/wiki/geda_gtkwave_vcd2lxt2_mp.html
+share/doc/geda-doc/wiki/geda_gtkwave_vcd2lxt_mp.html
+share/doc/geda-doc/wiki/geda_gtkwave_vcd2vzt_mp.html
+share/doc/geda-doc/wiki/geda_gtkwave_vzt2vcd_mp.html
+share/doc/geda-doc/wiki/geda_gtkwave_vztminer_mp.html
+share/doc/geda-doc/wiki/geda_hse_howto.html
+share/doc/geda-doc/wiki/geda_icarus_anc.html
+share/doc/geda-doc/wiki/geda_icarus_extensions.html
+share/doc/geda-doc/wiki/geda_icarus_glossary.html
+share/doc/geda-doc/wiki/geda_icarus_ieee1364.html
+share/doc/geda-doc/wiki/geda_icarus_mp.html
+share/doc/geda-doc/wiki/geda_icarus_opcodes.html
+share/doc/geda-doc/wiki/geda_icarus_quick_start.html
+share/doc/geda-doc/wiki/geda_icarus_readme.html
+share/doc/geda-doc/wiki/geda_icarus_vpi_mp.html
+share/doc/geda-doc/wiki/geda_icarus_vpi_within_vvp.html
+share/doc/geda-doc/wiki/geda_icarus_vvp_runtime.html
+share/doc/geda-doc/wiki/geda_icarus_vvp_simulation.html
+share/doc/geda-doc/wiki/geda_icarus_xilinx_hints.html
+share/doc/geda-doc/wiki/geda_icarus_xnf.html
+share/doc/geda-doc/wiki/geda_igarus_fpga_lcg.html
+share/doc/geda-doc/wiki/geda_installation.html
+share/doc/geda-doc/wiki/geda_installed_plugins.html
+share/doc/geda-doc/wiki/geda_kig_howto.html
+share/doc/geda-doc/wiki/geda_master_attributes_list.html
+share/doc/geda-doc/wiki/geda_mcalc_readme.html
+share/doc/geda-doc/wiki/geda_na_howto.html
+share/doc/geda-doc/wiki/geda_ngnutmeg_mp.html
+share/doc/geda-doc/wiki/geda_ngsconvert_mp.html
+share/doc/geda-doc/wiki/geda_ngspice_mp.html
+share/doc/geda-doc/wiki/geda_olib_readme.html
+share/doc/geda-doc/wiki/geda_pcb-quick_reference.html
+share/doc/geda-doc/wiki/geda_pcb.html
+share/doc/geda-doc/wiki/geda_pcb_mp.html
+share/doc/geda-doc/wiki/geda_pcb_tips.html
+share/doc/geda-doc/wiki/geda_pcb_ug.html
+share/doc/geda-doc/wiki/geda_scg.html
+share/doc/geda-doc/wiki/geda_sdb_howto.html
+share/doc/geda-doc/wiki/geda_sn_readme.html
+share/doc/geda-doc/wiki/geda_ssan.html
+share/doc/geda-doc/wiki/geda_style_guide.html
+share/doc/geda-doc/wiki/geda_suse_10.html
+share/doc/geda-doc/wiki/geda_suse_9.html
+share/doc/geda-doc/wiki/geda_syntax_features.html
+share/doc/geda-doc/wiki/geda_systemc_netlister_readme.html
+share/doc/geda-doc/wiki/geda_tasks.html
+share/doc/geda-doc/wiki/geda_todos.html
+share/doc/geda-doc/wiki/geda_tragesym_readme.html
+share/doc/geda-doc/wiki/geda_usage.html
+share/doc/geda-doc/wiki/geda_vams_netlister_readme.html
+share/doc/geda-doc/wiki/geda_verilog_netlister_readme.html
+share/doc/geda-doc/wiki/geda_vhdl_netlister_readme.html
+share/doc/geda-doc/wiki/geda_wcalc_mp.html
+share/doc/geda-doc/wiki/geda_wcalc_readme.html
+share/doc/geda-doc/wiki/geda_wcalc_stdio_mp.html
+share/doc/geda-doc/wiki/index.html
+share/doc/geda-doc/wiki/lib/exe/001css
+share/doc/geda-doc/wiki/lib/exe/css
+share/doc/geda-doc/wiki/lib/images/error.png
+share/doc/geda-doc/wiki/lib/images/fileicons/conf.png
+share/doc/geda-doc/wiki/lib/images/fileicons/deb.png
+share/doc/geda-doc/wiki/lib/images/fileicons/doc.png
+share/doc/geda-doc/wiki/lib/images/fileicons/file.png
+share/doc/geda-doc/wiki/lib/images/fileicons/gz.png
+share/doc/geda-doc/wiki/lib/images/fileicons/htm.png
+share/doc/geda-doc/wiki/lib/images/fileicons/html.png
+share/doc/geda-doc/wiki/lib/images/fileicons/odc.png
+share/doc/geda-doc/wiki/lib/images/fileicons/odf.png
+share/doc/geda-doc/wiki/lib/images/fileicons/odg.png
+share/doc/geda-doc/wiki/lib/images/fileicons/odi.png
+share/doc/geda-doc/wiki/lib/images/fileicons/odp.png
+share/doc/geda-doc/wiki/lib/images/fileicons/ods.png
+share/doc/geda-doc/wiki/lib/images/fileicons/odt.png
+share/doc/geda-doc/wiki/lib/images/fileicons/pdf.png
+share/doc/geda-doc/wiki/lib/images/fileicons/ppt.png
+share/doc/geda-doc/wiki/lib/images/fileicons/ps.png
+share/doc/geda-doc/wiki/lib/images/fileicons/rpm.png
+share/doc/geda-doc/wiki/lib/images/fileicons/rtf.png
+share/doc/geda-doc/wiki/lib/images/fileicons/sxc.png
+share/doc/geda-doc/wiki/lib/images/fileicons/sxd.png
+share/doc/geda-doc/wiki/lib/images/fileicons/sxi.png
+share/doc/geda-doc/wiki/lib/images/fileicons/sxw.png
+share/doc/geda-doc/wiki/lib/images/fileicons/tgz.png
+share/doc/geda-doc/wiki/lib/images/fileicons/txt.png
+share/doc/geda-doc/wiki/lib/images/fileicons/xls.png
+share/doc/geda-doc/wiki/lib/images/fileicons/xml.png
+share/doc/geda-doc/wiki/lib/images/fileicons/zip.png
+share/doc/geda-doc/wiki/lib/images/info.png
+share/doc/geda-doc/wiki/lib/images/interwiki.png
+share/doc/geda-doc/wiki/lib/images/interwiki/amazon.de.gif
+share/doc/geda-doc/wiki/lib/images/interwiki/amazon.gif
+share/doc/geda-doc/wiki/lib/images/interwiki/amazon.uk.gif
+share/doc/geda-doc/wiki/lib/images/interwiki/bug.gif
+share/doc/geda-doc/wiki/lib/images/interwiki/coral.gif
+share/doc/geda-doc/wiki/lib/images/interwiki/doku.gif
+share/doc/geda-doc/wiki/lib/images/interwiki/google.gif
+share/doc/geda-doc/wiki/lib/images/interwiki/meatball.gif
+share/doc/geda-doc/wiki/lib/images/interwiki/phpfn.gif
+share/doc/geda-doc/wiki/lib/images/interwiki/sb.gif
+share/doc/geda-doc/wiki/lib/images/interwiki/wiki.gif
+share/doc/geda-doc/wiki/lib/images/interwiki/wp.gif
+share/doc/geda-doc/wiki/lib/images/interwiki/wpde.gif
+share/doc/geda-doc/wiki/lib/images/interwiki/wpmeta.gif
+share/doc/geda-doc/wiki/lib/images/smileys/icon_smile.gif
+share/doc/geda-doc/wiki/lib/images/success.png
+share/doc/geda-doc/wiki/lib/plugins/definitionlist/images/bullet.gif
+share/doc/geda-doc/wiki/lib/plugins/note/images/important.png
+share/doc/geda-doc/wiki/lib/plugins/note/images/note.png
+share/doc/geda-doc/wiki/lib/plugins/note/images/tip.png
+share/doc/geda-doc/wiki/lib/plugins/note/images/warning.png
+share/doc/geda-doc/wiki/lib/tpl/default/images/closed.gif
+share/doc/geda-doc/wiki/lib/tpl/default/images/favicon
+share/doc/geda-doc/wiki/lib/tpl/default/images/link_icon.gif
+share/doc/geda-doc/wiki/lib/tpl/default/images/mail_icon.gif
+share/doc/geda-doc/wiki/lib/tpl/default/images/open.gif
+share/doc/geda-doc/wiki/lib/tpl/default/images/tocdot2.gif
+share/doc/geda-doc/wiki/lib/tpl/default/images/windows.gif
+share/doc/geda-doc/wiki/start_es.html
+share/doc/geda-doc/wiki/start_fr.html
+@dirrm share/doc/geda-doc/wiki/lib/tpl/default/images
+@dirrm share/doc/geda-doc/wiki/lib/tpl/default
+@dirrm share/doc/geda-doc/wiki/lib/tpl
+@dirrm share/doc/geda-doc/wiki/lib/plugins/note/images
+@dirrm share/doc/geda-doc/wiki/lib/plugins/note
+@dirrm share/doc/geda-doc/wiki/lib/plugins/definitionlist/images
+@dirrm share/doc/geda-doc/wiki/lib/plugins/definitionlist
+@dirrm share/doc/geda-doc/wiki/lib/plugins
+@dirrm share/doc/geda-doc/wiki/lib/images/smileys
+@dirrm share/doc/geda-doc/wiki/lib/images/interwiki
+@dirrm share/doc/geda-doc/wiki/lib/images/fileicons
+@dirrm share/doc/geda-doc/wiki/lib/images
+@dirrm share/doc/geda-doc/wiki/lib/exe
+@dirrm share/doc/geda-doc/wiki/lib
+@dirrm share/doc/geda-doc/wiki/_media
+@dirrm share/doc/geda-doc/wiki/_detail
+@dirrm share/doc/geda-doc/wiki
 @dirrm share/doc/geda-doc/tutorials/gsch2pcb/images
 @dirrm share/doc/geda-doc/tutorials/gsch2pcb
 @dirrm share/doc/geda-doc/tutorials
-@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
-@dirrm share/doc/geda-doc/gschem
-@dirrm share/doc/geda-doc/gnetlist
-@dirrm share/doc/geda-doc/fileformats
-@dirrm share/doc/geda-doc/cascade
-@dirrm share/doc/geda-doc/attributes
-@unexec ${RMDIR} %D/share/doc/geda-doc 2>/dev/null || ${TRUE}
+@dirrm share/doc/geda-doc
diff --git a/cad/geda-docs/distinfo b/cad/geda-docs/distinfo
index 5ad3c44289f..24201b5c137 100644
--- a/cad/geda-docs/distinfo
+++ b/cad/geda-docs/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.14 2006/01/25 01:51:34 dmcmahill Exp $
+$NetBSD: distinfo,v 1.15 2006/09/01 12:00:43 dmcmahill Exp $
 
-SHA1 (geda/geda-docs-20060123.tar.gz) = 913b883397cf48aab133f03691ec1690d23707a5
-RMD160 (geda/geda-docs-20060123.tar.gz) = 470ff0c86afe19bbc5c25e2a1d452f4d2296f8f6
-Size (geda/geda-docs-20060123.tar.gz) = 2881092 bytes
+SHA1 (geda/geda-docs-20060824.tar.gz) = 5bcf494f2293982f3ff8a19ef74da60771105b2c
+RMD160 (geda/geda-docs-20060824.tar.gz) = d5790e220dc330aea76018f3242f6d9dcad9aa43
+Size (geda/geda-docs-20060824.tar.gz) = 2321318 bytes
diff --git a/cad/geda-examples/Makefile b/cad/geda-examples/Makefile
index 81a94739f53..2dc15f28022 100644
--- a/cad/geda-examples/Makefile
+++ b/cad/geda-examples/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2006/06/26 05:59:00 rillig Exp $
+# $NetBSD: Makefile,v 1.15 2006/09/01 12:00:43 dmcmahill Exp $
 #
 
 DISTNAME=	geda-examples-${PKGVERSION}
-PKGREVISION=	1
 CATEGORIES=	cad
 
 MAINTAINER=	dmcmahill@NetBSD.org
diff --git a/cad/geda-examples/distinfo b/cad/geda-examples/distinfo
index 4277b20f2be..dbc111d4cd4 100644
--- a/cad/geda-examples/distinfo
+++ b/cad/geda-examples/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.7 2006/01/25 01:51:34 dmcmahill Exp $
+$NetBSD: distinfo,v 1.8 2006/09/01 12:00:43 dmcmahill Exp $
 
-SHA1 (geda/geda-examples-20060123.tar.gz) = a4cb477266d125eeb0d2ffa5267d0ffa92f18fd1
-RMD160 (geda/geda-examples-20060123.tar.gz) = e5e1f4c0d28e08012c26dd7513878921ff5e446c
-Size (geda/geda-examples-20060123.tar.gz) = 244695 bytes
+SHA1 (geda/geda-examples-20060824.tar.gz) = fae9726ec1b963f8cd45c6b352d9e971e56999c5
+RMD160 (geda/geda-examples-20060824.tar.gz) = ac40781d05ff80f32f8bc82c11d8cfb5ccf1951d
+Size (geda/geda-examples-20060824.tar.gz) = 247213 bytes
diff --git a/cad/geda-symbols/Makefile b/cad/geda-symbols/Makefile
index 94cea73fb7b..e22aac9736b 100644
--- a/cad/geda-symbols/Makefile
+++ b/cad/geda-symbols/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2006/02/05 23:08:21 joerg Exp $
+# $NetBSD: Makefile,v 1.20 2006/09/01 12:00:43 dmcmahill Exp $
 #
 
 DISTNAME=	geda-symbols-${PKGVERSION}
-PKGREVISION=	1
 CATEGORIES=	cad
 
 MAINTAINER=	dmcmahill@NetBSD.org
diff --git a/cad/geda-symbols/PLIST b/cad/geda-symbols/PLIST
index 430cffff9a5..59826c85caa 100644
--- a/cad/geda-symbols/PLIST
+++ b/cad/geda-symbols/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2006/01/25 01:51:34 dmcmahill Exp $
+@comment $NetBSD: PLIST,v 1.15 2006/09/01 12:00:43 dmcmahill Exp $
 share/doc/geda-doc/nc.pdf
 share/gEDA/sym/4000/4000-1.sym
 share/gEDA/sym/4000/4000-2.sym
@@ -574,8 +574,16 @@ share/gEDA/sym/asic/asic-cap-1.sym
 share/gEDA/sym/asic/asic-cap-2.sym
 share/gEDA/sym/asic/asic-cap-3.sym
 share/gEDA/sym/asic/asic-diode-1.sym
+share/gEDA/sym/asic/asic-nhv-1.sym
+share/gEDA/sym/asic/asic-nhhv-1.sym
 share/gEDA/sym/asic/asic-nmos-1.sym
+share/gEDA/sym/asic/asic-nmmv-1.sym
+share/gEDA/sym/asic/asic-nmv-1.sym
+share/gEDA/sym/asic/asic-phhv-1.sym
+share/gEDA/sym/asic/asic-phv-1.sym
 share/gEDA/sym/asic/asic-pmos-1.sym
+share/gEDA/sym/asic/asic-pmv-1.sym
+share/gEDA/sym/asic/asic-pmmv-1.sym
 share/gEDA/sym/asic/asic-res-1.sym
 share/gEDA/sym/asic/asic-res-2.sym
 share/gEDA/sym/asic/asic-res-3.sym
@@ -999,11 +1007,13 @@ share/gEDA/sym/maxim/max1211-1.sym
 share/gEDA/sym/maxim/max122-1.sym
 share/gEDA/sym/maxim/max12527-1.sym
 share/gEDA/sym/maxim/max12528-1.sym
+share/gEDA/sym/maxim/max12529-1.sym
 share/gEDA/sym/maxim/max12553-1.sym
 share/gEDA/sym/maxim/max12554-1.sym
 share/gEDA/sym/maxim/max12555-1.sym
 share/gEDA/sym/maxim/max12557-1.sym
 share/gEDA/sym/maxim/max12558-1.sym
+share/gEDA/sym/maxim/max12559-1.sym
 share/gEDA/sym/maxim/max135-1.sym
 share/gEDA/sym/maxim/max1407-1.sym
 share/gEDA/sym/maxim/max147-1.sym
diff --git a/cad/geda-symbols/distinfo b/cad/geda-symbols/distinfo
index 99b65706983..8038bc33ae5 100644
--- a/cad/geda-symbols/distinfo
+++ b/cad/geda-symbols/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.14 2006/01/25 01:51:34 dmcmahill Exp $
+$NetBSD: distinfo,v 1.15 2006/09/01 12:00:43 dmcmahill Exp $
 
-SHA1 (geda/geda-symbols-20060123.tar.gz) = d64dc77b238b3b0f0f20cb3575f8bf08f3d8bc96
-RMD160 (geda/geda-symbols-20060123.tar.gz) = 476b45bc94dc94c9f53b85cb99113c24eb7d58d9
-Size (geda/geda-symbols-20060123.tar.gz) = 677354 bytes
+SHA1 (geda/geda-symbols-20060824.tar.gz) = 60f7e55df21e526dfc22c429dd9ede897d5e50ca
+RMD160 (geda/geda-symbols-20060824.tar.gz) = 371e053aa98484c63d609fa9227a7604279e3c76
+Size (geda/geda-symbols-20060824.tar.gz) = 685264 bytes
diff --git a/cad/geda-utils/Makefile b/cad/geda-utils/Makefile
index ba560610be4..e4b209457b1 100644
--- a/cad/geda-utils/Makefile
+++ b/cad/geda-utils/Makefile
@@ -1,15 +1,14 @@
-# $NetBSD: Makefile,v 1.37 2006/04/17 13:46:17 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2006/09/01 12:00:43 dmcmahill Exp $
 #
 
 DISTNAME=		geda-utils-${PKGVERSION}
-PKGREVISION=		2
 CATEGORIES=		cad
 
 MAINTAINER=		dmcmahill@NetBSD.org
 HOMEPAGE=		http://www.geda.seul.org/
 COMMENT=		Set of utilities for gEDA
 
-BUILD_DEPENDS+=		geda-symbols>=${PKGVERSION}:../../cad/geda-symbols
+BUILD_DEPENDS+=		geda-symbols-${PKGVERSION}{,nb[0-9]*}:../../cad/geda-symbols
 
 CONFLICTS+=		gEDA<19991011
 
diff --git a/cad/geda-utils/distinfo b/cad/geda-utils/distinfo
index be1436eecd5..e9f11d03ee1 100644
--- a/cad/geda-utils/distinfo
+++ b/cad/geda-utils/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.14 2006/01/25 01:51:34 dmcmahill Exp $
+$NetBSD: distinfo,v 1.15 2006/09/01 12:00:43 dmcmahill Exp $
 
-SHA1 (geda/geda-utils-20060123.tar.gz) = fa009f00cc1f8f981c0fe0f11ab75d4d934dd6cb
-RMD160 (geda/geda-utils-20060123.tar.gz) = e6efd644ce8c56b21493edea035cf4f0538f9f06
-Size (geda/geda-utils-20060123.tar.gz) = 261074 bytes
+SHA1 (geda/geda-utils-20060824.tar.gz) = c23005b56364d6e65f3d6ac7770695cc9e6d2109
+RMD160 (geda/geda-utils-20060824.tar.gz) = 6616328185cae900b2ef42e9b1dbc4150bdf7aeb
+Size (geda/geda-utils-20060824.tar.gz) = 267519 bytes
diff --git a/cad/geda/Makefile b/cad/geda/Makefile
index 6a726c5d7aa..ae3bca70fb8 100644
--- a/cad/geda/Makefile
+++ b/cad/geda/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.48 2006/07/19 19:14:37 jlam Exp $
+# $NetBSD: Makefile,v 1.49 2006/09/01 12:00:43 dmcmahill Exp $
 #
 
 DISTNAME=	geda-${PKGVERSION}
-PKGREVISION=	2
 CATEGORIES=	cad
 
 MAINTAINER=	dmcmahill@NetBSD.org
@@ -19,12 +18,12 @@ DEPENDS+=	geda-examples-${PKGVERSION}{,nb[0-9]*}:../../cad/geda-examples
 
 .include "Makefile.common"
 
-GNU_CONFIGURE=		YES
-USE_LIBTOOL=		YES
-USE_PKGLOCALEDIR=	YES
-USE_TOOLS+=		pkg-config
+EXTRACT_ONLY=   # none
+NO_CHECKSUM=	yes
+NO_CONFIGURE=   yes
+NO_BUILD=       yes
+NO_MTREE=       yes
+
+do-install:     # empty
 
-.include "../../cad/libgeda/buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/geda/Makefile.common b/cad/geda/Makefile.common
index fbe18650325..1861bbc7945 100644
--- a/cad/geda/Makefile.common
+++ b/cad/geda/Makefile.common
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.6 2006/01/25 01:51:34 dmcmahill Exp $
+# $NetBSD: Makefile.common,v 1.7 2006/09/01 12:00:43 dmcmahill Exp $
 #
 
 DIST_SUBDIR=	geda
-PKGVERSION=	20060123
+PKGVERSION=	20060824
 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}/ \
diff --git a/cad/geda/PLIST b/cad/geda/PLIST
index 76cc9fb4538..6313379fc4c 100644
--- a/cad/geda/PLIST
+++ b/cad/geda/PLIST
@@ -1,9 +1 @@
-@comment $NetBSD: PLIST,v 1.7 2006/04/17 07:07:13 jlam Exp $
-bin/geda
-bin/graphman
-bin/raw2gw
-share/locale/de_DE/LC_MESSAGES/geda.mo
-share/locale/fr_FR/LC_MESSAGES/geda.mo
-share/locale/it/LC_MESSAGES/geda.mo
-share/locale/pt_BR/LC_MESSAGES/geda.mo
-share/locale/ru/LC_MESSAGES/geda.mo
+@comment $NetBSD: PLIST,v 1.8 2006/09/01 12:00:43 dmcmahill Exp $
diff --git a/cad/geda/distinfo b/cad/geda/distinfo
index 7683681ce3c..64b7427ac1d 100644
--- a/cad/geda/distinfo
+++ b/cad/geda/distinfo
@@ -1,5 +1,2 @@
-$NetBSD: distinfo,v 1.10 2006/01/25 01:51:34 dmcmahill Exp $
+$NetBSD: distinfo,v 1.11 2006/09/01 12:00:43 dmcmahill Exp $
 
-SHA1 (geda/geda-20060123.tar.gz) = 549141faad4db12b737a463cd71b4028650abfa8
-RMD160 (geda/geda-20060123.tar.gz) = 95345e8e3be35cf630c1d3db67c9c0ff5f7194ad
-Size (geda/geda-20060123.tar.gz) = 398714 bytes
diff --git a/cad/gnetlist/Makefile b/cad/gnetlist/Makefile
index 7211f2e2fe7..95d79b47e2e 100644
--- a/cad/gnetlist/Makefile
+++ b/cad/gnetlist/Makefile
@@ -1,16 +1,15 @@
-# $NetBSD: Makefile,v 1.41 2006/07/19 19:14:37 jlam Exp $
+# $NetBSD: Makefile,v 1.42 2006/09/01 12:00:43 dmcmahill Exp $
 #
 
 DISTNAME=		geda-gnetlist-${PKGVERSION}
 PKGNAME=		gnetlist-${PKGVERSION}
-PKGREVISION=		2
 CATEGORIES=		cad
 
 MAINTAINER=		dmcmahill@NetBSD.org
 HOMEPAGE=		http://www.geda.seul.org/
 COMMENT=		Netlist generation program
 
-DEPENDS+=		geda-symbols-${PKGVERSION}nb1:../../cad/geda-symbols
+DEPENDS+=		geda-symbols-${PKGVERSION}{,nb[0-9]*}:../../cad/geda-symbols
 
 .include "../../cad/geda/Makefile.common"
 
diff --git a/cad/gnetlist/distinfo b/cad/gnetlist/distinfo
index d13afb43b41..6f7b6548641 100644
--- a/cad/gnetlist/distinfo
+++ b/cad/gnetlist/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.17 2006/01/25 01:51:34 dmcmahill Exp $
+$NetBSD: distinfo,v 1.18 2006/09/01 12:00:43 dmcmahill Exp $
 
-SHA1 (geda/geda-gnetlist-20060123.tar.gz) = 7f9df9a5a8338b7eb1276fb97115cac9b8f0c2eb
-RMD160 (geda/geda-gnetlist-20060123.tar.gz) = 4b80f7955b61c4c15e65bad36d6a6e19d136f677
-Size (geda/geda-gnetlist-20060123.tar.gz) = 323201 bytes
+SHA1 (geda/geda-gnetlist-20060824.tar.gz) = 4c5916dbfe31feba21976d87c015ec41237b93c7
+RMD160 (geda/geda-gnetlist-20060824.tar.gz) = 26ea8bb2ea08664cd30a1af531b4c11eeae61346
+Size (geda/geda-gnetlist-20060824.tar.gz) = 332739 bytes
diff --git a/cad/gschem/Makefile b/cad/gschem/Makefile
index 48269d7a88f..b66b47f820a 100644
--- a/cad/gschem/Makefile
+++ b/cad/gschem/Makefile
@@ -1,25 +1,23 @@
-# $NetBSD: Makefile,v 1.40 2006/04/17 13:46:17 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2006/09/01 12:00:43 dmcmahill Exp $
 #
 
 DISTNAME=		geda-gschem-${PKGVERSION}
 PKGNAME=		gschem-${PKGVERSION}
-PKGREVISION=		2
 CATEGORIES=		cad
 
 MAINTAINER=		dmcmahill@NetBSD.org
 HOMEPAGE=		http://www.geda.seul.org/
 COMMENT=		Schematic capture tool
 
-DEPENDS+=		geda-symbols-${PKGVERSION}nb1:../../cad/geda-symbols
+DEPENDS+=		geda-symbols-${PKGVERSION}{,nb[0-9]*}:../../cad/geda-symbols
 
 CONFLICTS+=		gEDA<19991011
 
 .include "../../cad/geda/Makefile.common"
 
 GNU_CONFIGURE=		YES
-USE_TOOLS+=		makeinfo pkg-config
+USE_TOOLS+=		pkg-config
 USE_PKGLOCALEDIR=	YES
-INFO_FILES=		# PLIST
 
 .include "../../cad/libgeda/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/cad/gschem/PLIST b/cad/gschem/PLIST
index b361e42617f..70f77fdfa4a 100644
--- a/cad/gschem/PLIST
+++ b/cad/gschem/PLIST
@@ -1,8 +1,6 @@
-@comment $NetBSD: PLIST,v 1.15 2006/04/17 07:07:13 jlam Exp $
+@comment $NetBSD: PLIST,v 1.16 2006/09/01 12:00:43 dmcmahill Exp $
 bin/gschem
-info/gschemdoc.info
 man/man1/gschem.1
-share/doc/geda-doc/man/gschem.html
 share/gEDA/bitmap/gschem-bus.xpm
 share/gEDA/bitmap/gschem-comp.xpm
 share/gEDA/bitmap/gschem-copy.xpm
@@ -23,10 +21,14 @@ share/gEDA/bitmap/gschem-warning.png
 share/gEDA/gschem-darkbg
 share/gEDA/gschem-gtkrc
 share/gEDA/gschem-lightbg
+share/gEDA/scheme/auto-place-attribs.scm
 share/gEDA/scheme/auto-uref.scm
 share/gEDA/scheme/generate_netlist.scm
 share/gEDA/scheme/gschem.scm
+share/gEDA/scheme/image.scm
 share/gEDA/scheme/list-keys.scm
+share/gEDA/scheme/pcb.scm
+share/gEDA/scheme/print.scm
 share/gEDA/scheme/print-NB-attribs.scm
 share/gEDA/system-gschemrc
 share/locale/de_DE/LC_MESSAGES/geda-gschem.mo
@@ -38,7 +40,6 @@ share/locale/nl_NL/LC_MESSAGES/geda-gschem.mo
 share/locale/pt_BR/LC_MESSAGES/geda-gschem.mo
 share/locale/ru/LC_MESSAGES/geda-gschem.mo
 @dirrm share/gEDA/bitmap
-@unexec ${RMDIR} %D/share/doc/geda-doc/man 2>/dev/null || ${TRUE}
 @unexec ${RMDIR} %D/share/doc/geda-doc 2>/dev/null || ${TRUE}
 @unexec ${RMDIR} %D/share/gEDA/scheme 2>/dev/null || ${TRUE}
 @unexec ${RMDIR} %D/share/gEDA 2>/dev/null || ${TRUE}
diff --git a/cad/gschem/distinfo b/cad/gschem/distinfo
index 69937be4294..74c05341cb1 100644
--- a/cad/gschem/distinfo
+++ b/cad/gschem/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.17 2006/02/06 22:23:29 dmcmahill Exp $
+$NetBSD: distinfo,v 1.18 2006/09/01 12:00:43 dmcmahill Exp $
 
-SHA1 (geda/geda-gschem-20060123.tar.gz) = 6163477230c0403cc234f2407b11e2eecc1381ce
-RMD160 (geda/geda-gschem-20060123.tar.gz) = 9da64ea7397da9e34c296467003a6af70e90921d
-Size (geda/geda-gschem-20060123.tar.gz) = 1652829 bytes
-SHA1 (patch-aa) = 3c3743fdca61dd549c035aec030a6dc0bf4de4c6
+SHA1 (geda/geda-gschem-20060824.tar.gz) = deedd13a39c484f0f134e3f5cd6751219d368eed
+RMD160 (geda/geda-gschem-20060824.tar.gz) = 50880ff2f5c851a2d762cead8fcdcfdcda77cc63
+Size (geda/geda-gschem-20060824.tar.gz) = 999687 bytes
diff --git a/cad/gschem/patches/patch-aa b/cad/gschem/patches/patch-aa
deleted file mode 100644
index 9efef902cc4..00000000000
--- a/cad/gschem/patches/patch-aa
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-aa,v 1.9 2006/02/06 22:23:29 dmcmahill Exp $
-
---- src/x_image.c.orig	2006-01-24 03:24:02.000000000 +0000
-+++ src/x_image.c
-@@ -205,6 +205,7 @@ void x_image_lowlevel(TOPLEVEL * w_curre
-   GdkPixbuf *pixbuf;
-   char *filetype;
- #endif
-+  float prop;
- 
-   width = w_current->image_width;
-   height = w_current->image_height;
-@@ -227,7 +228,7 @@ void x_image_lowlevel(TOPLEVEL * w_curre
-   page_center_top = save_page_top + (page_height / 2);
- 
-   /* Preserve proportions */
--  float prop = (float) width / height;
-+  prop = (float) width / height;
-   if (page_width > page_height) {
-     page_height = (page_width / prop);
-   } else {
diff --git a/cad/gsymcheck/Makefile b/cad/gsymcheck/Makefile
index 2313ad8684e..e3aa56d8183 100644
--- a/cad/gsymcheck/Makefile
+++ b/cad/gsymcheck/Makefile
@@ -1,16 +1,15 @@
-# $NetBSD: Makefile,v 1.33 2006/07/19 19:14:37 jlam Exp $
+# $NetBSD: Makefile,v 1.34 2006/09/01 12:00:43 dmcmahill Exp $
 #
 
 DISTNAME=		geda-gsymcheck-${PKGVERSION}
 PKGNAME=		gsymcheck-${PKGVERSION}
-PKGREVISION=		2
 CATEGORIES=		cad
 
 MAINTAINER=		dmcmahill@NetBSD.org
 HOMEPAGE=		http://www.geda.seul.org/
 COMMENT=		EDA (Electronic Design Automation) symbol checker
 
-DEPENDS+=		geda-symbols-${PKGVERSION}nb1:../../cad/geda-symbols
+DEPENDS+=		geda-symbols-${PKGVERSION}{,nb[0-9]*}:../../cad/geda-symbols
 
 CONFLICTS+=		gEDA<19991011
 
diff --git a/cad/gsymcheck/distinfo b/cad/gsymcheck/distinfo
index 72f724e11a5..2078e1b6c51 100644
--- a/cad/gsymcheck/distinfo
+++ b/cad/gsymcheck/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.14 2006/01/25 01:51:35 dmcmahill Exp $
+$NetBSD: distinfo,v 1.15 2006/09/01 12:00:43 dmcmahill Exp $
 
-SHA1 (geda/geda-gsymcheck-20060123.tar.gz) = ef29bb8950cfb239115eed13ce52739c615ba628
-RMD160 (geda/geda-gsymcheck-20060123.tar.gz) = 4138319964b62a5c631fae7de9ab1fe01cf8dd61
-Size (geda/geda-gsymcheck-20060123.tar.gz) = 133134 bytes
+SHA1 (geda/geda-gsymcheck-20060824.tar.gz) = bf17ab28a4ffd0b2df8d4b2f6942745766a5efa0
+RMD160 (geda/geda-gsymcheck-20060824.tar.gz) = c80841070aa76cadf033455a71201a995bbc7e7b
+Size (geda/geda-gsymcheck-20060824.tar.gz) = 137452 bytes
diff --git a/cad/libgeda/Makefile b/cad/libgeda/Makefile
index ea703b5ddb8..ffcbde5b52b 100644
--- a/cad/libgeda/Makefile
+++ b/cad/libgeda/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.40 2006/04/17 13:46:02 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2006/09/01 12:00:43 dmcmahill Exp $
 #
 
 DISTNAME=		libgeda-${PKGVERSION}
-PKGREVISION=		2
 CATEGORIES=		cad
 
 MAINTAINER=		dmcmahill@NetBSD.org
@@ -16,7 +15,6 @@ CONFLICTS+=		gEDA<19991011
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 USE_TOOLS+=		pkg-config
-INFO_FILES=		# PLIST
 
 .include "../../graphics/libgdgeda/buildlink3.mk"
 .include "../../lang/guile/buildlink3.mk"
diff --git a/cad/libgeda/PLIST b/cad/libgeda/PLIST
index 6bb11477d5a..29a86440ff3 100644
--- a/cad/libgeda/PLIST
+++ b/cad/libgeda/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2006/03/30 03:44:41 jlam Exp $
+@comment $NetBSD: PLIST,v 1.12 2006/09/01 12:00:43 dmcmahill Exp $
 include/libgeda/colors.h
 include/libgeda/defines.h
 include/libgeda/funcs.h
@@ -9,7 +9,8 @@ include/libgeda/o_types.h
 include/libgeda/papersizes.h
 include/libgeda/prototype.h
 include/libgeda/struct.h
-info/libgedadoc.info
 lib/libgeda.la
 lib/pkgconfig/libgeda.pc
+share/gEDA/prolog.ps
+@dirrm share/gEDA
 @dirrm include/libgeda
diff --git a/cad/libgeda/buildlink3.mk b/cad/libgeda/buildlink3.mk
index 9ed05189b57..11350b8878b 100644
--- a/cad/libgeda/buildlink3.mk
+++ b/cad/libgeda/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.18 2006/07/08 23:10:38 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2006/09/01 12:00:43 dmcmahill Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBGEDA_BUILDLINK3_MK:=	${LIBGEDA_BUILDLINK3_MK}+
@@ -12,8 +12,8 @@ BUILDLINK_PACKAGES+=	libgeda
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libgeda
 
 .if !empty(LIBGEDA_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.libgeda+=	libgeda-20060123{,nb[0-9]*}
-BUILDLINK_ABI_DEPENDS.libgeda?=	libgeda>=20060123nb2
+BUILDLINK_API_DEPENDS.libgeda+=	libgeda-20060824{,nb[0-9]*}
+BUILDLINK_ABI_DEPENDS.libgeda?=	libgeda>=20060824
 BUILDLINK_PKGSRCDIR.libgeda?=	../../cad/libgeda
 .endif	# LIBGEDA_BUILDLINK3_MK
 
diff --git a/cad/libgeda/distinfo b/cad/libgeda/distinfo
index dbf18d224e2..888bb992526 100644
--- a/cad/libgeda/distinfo
+++ b/cad/libgeda/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.14 2006/01/25 01:51:35 dmcmahill Exp $
+$NetBSD: distinfo,v 1.15 2006/09/01 12:00:43 dmcmahill Exp $
 
-SHA1 (geda/libgeda-20060123.tar.gz) = 9608db1b1e3d6796d7625dad108f78a814d9f6fa
-RMD160 (geda/libgeda-20060123.tar.gz) = 4b4cf4523d96204deef3fa28a1cc0aa74fb3861c
-Size (geda/libgeda-20060123.tar.gz) = 1047712 bytes
+SHA1 (geda/libgeda-20060824.tar.gz) = cf12efa37ca2c654121ff8545b8892176049546c
+RMD160 (geda/libgeda-20060824.tar.gz) = 5da483118a0c291cd0dbbc34cc3937971d5147d7
+Size (geda/libgeda-20060824.tar.gz) = 679481 bytes