16 files changed, 101 insertions, 60 deletions

diff --git a/cad/gattrib/distinfo b/cad/gattrib/distinfo
index 0ee5de2e224..651bf34f0ed 100644
--- a/cad/gattrib/distinfo
+++ b/cad/gattrib/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.12 2006/09/10 19:47:54 dmcmahill Exp $
+$NetBSD: distinfo,v 1.13 2006/10/23 09:43:12 dmcmahill Exp $
 
-SHA1 (geda/geda-gattrib-20060906.tar.gz) = a2a114731b880269214d4e7879ed162f93bee989
-RMD160 (geda/geda-gattrib-20060906.tar.gz) = f28570a10a123741c130fb46d5cb7b55e49e3feb
-Size (geda/geda-gattrib-20060906.tar.gz) = 276564 bytes
+SHA1 (geda/geda-gattrib-20061020.tar.gz) = 970fe10bc4d8b714dc04a37fcb27f2bbd0d50c3f
+RMD160 (geda/geda-gattrib-20061020.tar.gz) = a8183e9547a41221f067180e4cf7e2829afa3625
+Size (geda/geda-gattrib-20061020.tar.gz) = 271549 bytes
diff --git a/cad/geda-docs/PLIST b/cad/geda-docs/PLIST
index 982a71ea51c..24d14b0c800 100644
--- a/cad/geda-docs/PLIST
+++ b/cad/geda-docs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2006/09/10 19:47:54 dmcmahill Exp $
+@comment $NetBSD: PLIST,v 1.13 2006/10/23 09:43:13 dmcmahill Exp $
 share/doc/geda-doc/gedadocs.html
 share/doc/geda-doc/tutorials/gsch2pcb/gschem-warmup.html
 share/doc/geda-doc/tutorials/gsch2pcb/images/board-1.png
@@ -24,6 +24,7 @@ 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-old.html
 share/doc/geda-doc/tutorials/gsch2pcb/tutorial.html
+share/doc/geda-doc/wiki/001geda_debian.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
@@ -44,6 +45,7 @@ share/doc/geda-doc/wiki/001geda_suse_10.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/001geda_design_flow.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
@@ -63,6 +65,17 @@ 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/_detail/tragesym_acroread_selectiontable.html
+share/doc/geda-doc/wiki/_detail/tragesym_gschem_finished.html
+share/doc/geda-doc/wiki/_detail/tragesym_gschem_showhidden.html
+share/doc/geda-doc/wiki/_detail/tragesym_kpdf_pinconfiguration.html
+share/doc/geda-doc/wiki/_detail/tragesym_kpdf_pindescription.html
+share/doc/geda-doc/wiki/_detail/tragesym_ooo_attributes.html
+share/doc/geda-doc/wiki/_detail/tragesym_ooo_changedpins.html
+share/doc/geda-doc/wiki/_detail/tragesym_ooo_rearanged.html
+share/doc/geda-doc/wiki/_detail/tragesym_ooo_selection.html
+share/doc/geda-doc/wiki/_detail/tragesym_xemacs_modifiedselection.html
+share/doc/geda-doc/wiki/_detail/tragesym_xemacs_rawselection.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
@@ -82,6 +95,17 @@ 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/001tragesym_acroread_selectiontable.png
+share/doc/geda-doc/wiki/_media/001tragesym_gschem_finished.png
+share/doc/geda-doc/wiki/_media/001tragesym_gschem_showhidden.png
+share/doc/geda-doc/wiki/_media/001tragesym_kpdf_pinconfiguration.png
+share/doc/geda-doc/wiki/_media/001tragesym_kpdf_pindescription.png
+share/doc/geda-doc/wiki/_media/001tragesym_ooo_attributes.png
+share/doc/geda-doc/wiki/_media/001tragesym_ooo_changedpins.png
+share/doc/geda-doc/wiki/_media/001tragesym_ooo_rearanged.png
+share/doc/geda-doc/wiki/_media/001tragesym_ooo_selection.png
+share/doc/geda-doc/wiki/_media/001tragesym_xemacs_modifiedselection.png
+share/doc/geda-doc/wiki/_media/001tragesym_xemacs_rawselection.png
 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
@@ -101,6 +125,17 @@ 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/002tragesym_acroread_selectiontable.png
+share/doc/geda-doc/wiki/_media/002tragesym_gschem_finished.png
+share/doc/geda-doc/wiki/_media/002tragesym_gschem_showhidden.png
+share/doc/geda-doc/wiki/_media/002tragesym_kpdf_pinconfiguration.png
+share/doc/geda-doc/wiki/_media/002tragesym_kpdf_pindescription.png
+share/doc/geda-doc/wiki/_media/002tragesym_ooo_attributes.png
+share/doc/geda-doc/wiki/_media/002tragesym_ooo_changedpins.png
+share/doc/geda-doc/wiki/_media/002tragesym_ooo_rearanged.png
+share/doc/geda-doc/wiki/_media/002tragesym_ooo_selection.png
+share/doc/geda-doc/wiki/_media/002tragesym_xemacs_modifiedselection.png
+share/doc/geda-doc/wiki/_media/002tragesym_xemacs_rawselection.png
 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
@@ -120,6 +155,19 @@ 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/_media/tragesym_acroread_selectiontable.png
+share/doc/geda-doc/wiki/_media/tragesym_gschem_finished.png
+share/doc/geda-doc/wiki/_media/tragesym_gschem_showhidden.png
+share/doc/geda-doc/wiki/_media/tragesym_kpdf_pinconfiguration.png
+share/doc/geda-doc/wiki/_media/tragesym_kpdf_pindescription.png
+share/doc/geda-doc/wiki/_media/tragesym_ooo_attributes.png
+share/doc/geda-doc/wiki/_media/tragesym_ooo_changedpins.png
+share/doc/geda-doc/wiki/_media/tragesym_ooo_rearanged.png
+share/doc/geda-doc/wiki/_media/tragesym_ooo_selection.png
+share/doc/geda-doc/wiki/_media/tragesym_template
+share/doc/geda-doc/wiki/_media/tragesym_template.txt
+share/doc/geda-doc/wiki/_media/tragesym_xemacs_modifiedselection.png
+share/doc/geda-doc/wiki/_media/tragesym_xemacs_rawselection.png
 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
@@ -222,6 +270,8 @@ 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_tragesym_tutorial.html
+share/doc/geda-doc/wiki/geda_ubuntu.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
@@ -278,6 +328,7 @@ 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/smileys/icon_wink.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
@@ -313,4 +364,4 @@ share/doc/geda-doc/wiki/start_fr.html
 @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
+@unexec ${RMDIR} %D/share/doc/geda-doc 2>/dev/null || ${TRUE}
diff --git a/cad/geda-docs/distinfo b/cad/geda-docs/distinfo
index 636e3951bf4..173d57278be 100644
--- a/cad/geda-docs/distinfo
+++ b/cad/geda-docs/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.16 2006/09/10 19:47:54 dmcmahill Exp $
+$NetBSD: distinfo,v 1.17 2006/10/23 09:43:13 dmcmahill Exp $
 
-SHA1 (geda/geda-docs-20060906.tar.gz) = dd69419fa3634c04936a2bbe5723a85f8b714f6d
-RMD160 (geda/geda-docs-20060906.tar.gz) = b6623ea7b2e6cb291b59174c0b4877968d8dea22
-Size (geda/geda-docs-20060906.tar.gz) = 2324563 bytes
+SHA1 (geda/geda-docs-20061020.tar.gz) = 8b93c1518deff6f18133a2b896f9d72b5440bcd6
+RMD160 (geda/geda-docs-20061020.tar.gz) = 6a37af4c04e784df98eec2fd9713b88c4980ae50
+Size (geda/geda-docs-20061020.tar.gz) = 3110190 bytes
diff --git a/cad/geda-examples/distinfo b/cad/geda-examples/distinfo
index 5fcb4980514..a9740fb7aaf 100644
--- a/cad/geda-examples/distinfo
+++ b/cad/geda-examples/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.9 2006/09/10 19:47:54 dmcmahill Exp $
+$NetBSD: distinfo,v 1.10 2006/10/23 09:43:13 dmcmahill Exp $
 
-SHA1 (geda/geda-examples-20060906.tar.gz) = 7b954752774ed7747602fd6ccb1520e2428e15aa
-RMD160 (geda/geda-examples-20060906.tar.gz) = 620e260fd3ed91db71f0d3b02f36ce3da59d87c2
-Size (geda/geda-examples-20060906.tar.gz) = 247937 bytes
+SHA1 (geda/geda-examples-20061020.tar.gz) = 324ae7c23018b76b74c847487be231eecc9e9959
+RMD160 (geda/geda-examples-20061020.tar.gz) = 241d15dc4f48578ac1977579450fc2ab8a9295a8
+Size (geda/geda-examples-20061020.tar.gz) = 247995 bytes
diff --git a/cad/geda-symbols/PLIST b/cad/geda-symbols/PLIST
index 59826c85caa..702f63ee592 100644
--- a/cad/geda-symbols/PLIST
+++ b/cad/geda-symbols/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2006/09/01 12:00:43 dmcmahill Exp $
+@comment $NetBSD: PLIST,v 1.16 2006/10/23 09:43:13 dmcmahill Exp $
 share/doc/geda-doc/nc.pdf
 share/gEDA/sym/4000/4000-1.sym
 share/gEDA/sym/4000/4000-2.sym
@@ -1680,4 +1680,4 @@ share/gEDA/system-gafrc
 @dirrm share/gEDA/sym/4000
 @dirrm share/gEDA/sym
 @dirrm share/gEDA
-@dirrm share/doc/geda-doc
+@unexec ${RMDIR} %D/share/doc/geda-doc 2>/dev/null || ${TRUE}
diff --git a/cad/geda-symbols/distinfo b/cad/geda-symbols/distinfo
index 929d55d0bfe..a21d18244c9 100644
--- a/cad/geda-symbols/distinfo
+++ b/cad/geda-symbols/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.16 2006/09/10 19:47:54 dmcmahill Exp $
+$NetBSD: distinfo,v 1.17 2006/10/23 09:43:13 dmcmahill Exp $
 
-SHA1 (geda/geda-symbols-20060906.tar.gz) = 834b39ca87d3be739e96bf9d6a84f352cd4087dc
-RMD160 (geda/geda-symbols-20060906.tar.gz) = 9b14d8babe1d2961e99df63056a72b6cb75b63c2
-Size (geda/geda-symbols-20060906.tar.gz) = 685339 bytes
+SHA1 (geda/geda-symbols-20061020.tar.gz) = cfb93b9f15e70bf14021f75731960092230d809e
+RMD160 (geda/geda-symbols-20061020.tar.gz) = 8ebb5252b33948d2c08f208662bc25595b50b58e
+Size (geda/geda-symbols-20061020.tar.gz) = 685214 bytes
diff --git a/cad/geda-utils/distinfo b/cad/geda-utils/distinfo
index 4c0d410ee5e..123f70b3da9 100644
--- a/cad/geda-utils/distinfo
+++ b/cad/geda-utils/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.16 2006/09/10 19:47:54 dmcmahill Exp $
+$NetBSD: distinfo,v 1.17 2006/10/23 09:43:13 dmcmahill Exp $
 
-SHA1 (geda/geda-utils-20060906.tar.gz) = ccff404d3c85e7b188b787693308c97b65f163bd
-RMD160 (geda/geda-utils-20060906.tar.gz) = a50c9f5a806ab9028df5ef5c3011eb454f8ef8c2
-Size (geda/geda-utils-20060906.tar.gz) = 267368 bytes
+SHA1 (geda/geda-utils-20061020.tar.gz) = 892ff9fd664054838f6e1f925e959f85cfcee916
+RMD160 (geda/geda-utils-20061020.tar.gz) = 0a93851ae554edf1b30ffa3021e7c22b9fd9b781
+Size (geda/geda-utils-20061020.tar.gz) = 268215 bytes
diff --git a/cad/geda/Makefile b/cad/geda/Makefile
index 556a2fcdb11..365be6f88a3 100644
--- a/cad/geda/Makefile
+++ b/cad/geda/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2006/09/24 17:15:35 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.51 2006/10/23 09:43:13 dmcmahill Exp $
 #
 
 DISTNAME=	geda-${PKGVERSION}
@@ -16,6 +16,7 @@ DEPENDS+=	gsymcheck-${PKGVERSION}{,nb[0-9]*}:../../cad/gsymcheck
 DEPENDS+=	geda-utils-${PKGVERSION}{,nb[0-9]*}:../../cad/geda-utils
 DEPENDS+=	geda-docs-${PKGVERSION}{,nb[0-9]*}:../../cad/geda-docs
 DEPENDS+=	geda-examples-${PKGVERSION}{,nb[0-9]*}:../../cad/geda-examples
+DEPENDS+=	geda-symbols-${PKGVERSION}{,nb[0-9]*}:../../cad/geda-symbols
 
 .include "Makefile.common"
 
diff --git a/cad/geda/Makefile.common b/cad/geda/Makefile.common
index 8483bbe7a23..fe548640548 100644
--- a/cad/geda/Makefile.common
+++ b/cad/geda/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.9 2006/09/28 00:40:32 dmcmahill Exp $
+# $NetBSD: Makefile.common,v 1.10 2006/10/23 09:43:13 dmcmahill Exp $
 #
 
 DIST_SUBDIR=	geda
-PKGVERSION=	20060906
+PKGVERSION=	20061020
 MASTER_SITES=	ftp://ftp.geda.seul.org/pub/geda/devel/${PKGVERSION}/ \
 		http://www.geda.seul.org/devel/${PKGVERSION}/
diff --git a/cad/gnetlist/distinfo b/cad/gnetlist/distinfo
index 861dfe5e605..1771e8703aa 100644
--- a/cad/gnetlist/distinfo
+++ b/cad/gnetlist/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.19 2006/09/10 19:47:54 dmcmahill Exp $
+$NetBSD: distinfo,v 1.20 2006/10/23 09:43:12 dmcmahill Exp $
 
-SHA1 (geda/geda-gnetlist-20060906.tar.gz) = 2014299f47ba45a4cae053004a478e896edd7386
-RMD160 (geda/geda-gnetlist-20060906.tar.gz) = f9e36336875f72481908d346150eb3b25637e2b9
-Size (geda/geda-gnetlist-20060906.tar.gz) = 332971 bytes
+SHA1 (geda/geda-gnetlist-20061020.tar.gz) = b4f2121464ff22db8f0eb08a398df91b055032b2
+RMD160 (geda/geda-gnetlist-20061020.tar.gz) = c05d3bee1db520c8f86c0e4ca6b1707b9c0b4cf8
+Size (geda/geda-gnetlist-20061020.tar.gz) = 332027 bytes
diff --git a/cad/gschem/distinfo b/cad/gschem/distinfo
index d2f5ee15c1c..c0cc9129e3a 100644
--- a/cad/gschem/distinfo
+++ b/cad/gschem/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.20 2006/10/21 19:22:12 rillig Exp $
+$NetBSD: distinfo,v 1.21 2006/10/23 09:43:12 dmcmahill Exp $
 
-SHA1 (geda/geda-gschem-20060906.tar.gz) = 5ab076f08597c6367a172b90a6c12bd4d59f0d8b
-RMD160 (geda/geda-gschem-20060906.tar.gz) = 620569efa3f0cdb06a9c780ba57545f83b7cb86b
-Size (geda/geda-gschem-20060906.tar.gz) = 1002074 bytes
-SHA1 (patch-aa) = b3116a09ccf477e931aadfa0c9212a19f62175ea
+SHA1 (geda/geda-gschem-20061020.tar.gz) = 828bc6517fefc3a5f36c7e5a57752e0315eb2c6e
+RMD160 (geda/geda-gschem-20061020.tar.gz) = 83166aae8be23d7a21ebf82d82a5b4cae97f1350
+Size (geda/geda-gschem-20061020.tar.gz) = 943519 bytes
 SHA1 (patch-ab) = cea6b45ebd34dd846bcef6a0967b4644e077cc7e
diff --git a/cad/gschem/patches/patch-aa b/cad/gschem/patches/patch-aa
deleted file mode 100644
index 73188a1647e..00000000000
--- a/cad/gschem/patches/patch-aa
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-aa,v 1.11 2006/09/10 19:47:54 dmcmahill Exp $
-
---- src/x_print.c.orig	2006-08-30 03:42:03.000000000 +0000
-+++ src/x_print.c	2006-09-09 16:37:05.000000000 +0000
-@@ -449,4 +449,5 @@
-  *
-  */
-+static void
- print_dialog_get_property (GObject * object,
-                           guint property_id,
diff --git a/cad/gsymcheck/distinfo b/cad/gsymcheck/distinfo
index f9b34613a06..2096746ba19 100644
--- a/cad/gsymcheck/distinfo
+++ b/cad/gsymcheck/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.16 2006/09/10 19:47:54 dmcmahill Exp $
+$NetBSD: distinfo,v 1.17 2006/10/23 09:43:13 dmcmahill Exp $
 
-SHA1 (geda/geda-gsymcheck-20060906.tar.gz) = b8851a4799aa0d34bbada4916f952505d3bc2e89
-RMD160 (geda/geda-gsymcheck-20060906.tar.gz) = 98e3aec05cbaec8a5ef75962a66988ce3b358556
-Size (geda/geda-gsymcheck-20060906.tar.gz) = 137678 bytes
+SHA1 (geda/geda-gsymcheck-20061020.tar.gz) = 2902c254dfa8c7e7906bc2be8a83301ad5dc05ba
+RMD160 (geda/geda-gsymcheck-20061020.tar.gz) = de9536f60ec9ab8522e19a587b15a6833fe7952b
+Size (geda/geda-gsymcheck-20061020.tar.gz) = 138184 bytes
diff --git a/cad/libgeda/Makefile b/cad/libgeda/Makefile
index ffcbde5b52b..dfab2acc9ab 100644
--- a/cad/libgeda/Makefile
+++ b/cad/libgeda/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2006/09/01 12:00:43 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.42 2006/10/23 09:43:12 dmcmahill Exp $
 #
 
 DISTNAME=		libgeda-${PKGVERSION}
@@ -16,7 +16,7 @@ GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 USE_TOOLS+=		pkg-config
 
-.include "../../graphics/libgdgeda/buildlink3.mk"
+.include "../../graphics/gd/buildlink3.mk"
 .include "../../lang/guile/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/libgeda/buildlink3.mk b/cad/libgeda/buildlink3.mk
index bc89f4ec3f4..b049ab201b5 100644
--- a/cad/libgeda/buildlink3.mk
+++ b/cad/libgeda/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.20 2006/09/10 19:47:54 dmcmahill Exp $
+# $NetBSD: buildlink3.mk,v 1.21 2006/10/23 09:43:12 dmcmahill Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBGEDA_BUILDLINK3_MK:=	${LIBGEDA_BUILDLINK3_MK}+
@@ -12,12 +12,12 @@ BUILDLINK_PACKAGES+=	libgeda
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libgeda
 
 .if !empty(LIBGEDA_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.libgeda+=	libgeda-20060906{,nb[0-9]*}
-BUILDLINK_ABI_DEPENDS.libgeda?=	libgeda>=20060906
+BUILDLINK_API_DEPENDS.libgeda+=	libgeda-20061020{,nb[0-9]*}
+BUILDLINK_ABI_DEPENDS.libgeda?=	libgeda>=20061020
 BUILDLINK_PKGSRCDIR.libgeda?=	../../cad/libgeda
 .endif	# LIBGEDA_BUILDLINK3_MK
 
-.include "../../graphics/libgdgeda/buildlink3.mk"
+.include "../../graphics/gd/buildlink3.mk"
 .include "../../lang/guile/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 
diff --git a/cad/libgeda/distinfo b/cad/libgeda/distinfo
index d306ee1bf09..17fe075ebf1 100644
--- a/cad/libgeda/distinfo
+++ b/cad/libgeda/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.16 2006/09/10 19:47:54 dmcmahill Exp $
+$NetBSD: distinfo,v 1.17 2006/10/23 09:43:12 dmcmahill Exp $
 
-SHA1 (geda/libgeda-20060906.tar.gz) = 54a0c05c87943798ddce3b1971c0c8388c82b668
-RMD160 (geda/libgeda-20060906.tar.gz) = ee4c983efb7e2068c3d9f86f625c8bfb0b141efb
-Size (geda/libgeda-20060906.tar.gz) = 680960 bytes
+SHA1 (geda/libgeda-20061020.tar.gz) = eaa691ce88a60f85925bff3f8ee8c9dc5d8a76d6
+RMD160 (geda/libgeda-20061020.tar.gz) = b62ef82138c967f0c935d0bc7d6a0bf319c46f0d
+Size (geda/libgeda-20061020.tar.gz) = 615370 bytes