update to 20050820 snapshot.

Major changes since the last snapshot:

- gsch2pcb updated to work with latest pcb
- pcb library directories default to something sane for gsch2pcb
- grenum utility for refdes renumbering added
- add a few new symbols
- added -p option to autoplace the windows.  Useful for scripting.
- gattrib can now change attribute visibility
- improvements to the spice-sdb netlist backend
- added support for printing pictures in schematics to postscript
- added german translation
- fixed a segfault in the geda manager.

23 files changed, 93 insertions, 144 deletions

diff --git a/cad/gattrib/distinfo b/cad/gattrib/distinfo
index 770f1775466..ef6ffb69efe 100644
--- a/cad/gattrib/distinfo
+++ b/cad/gattrib/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.7 2005/04/29 22:14:46 rillig Exp $
+$NetBSD: distinfo,v 1.8 2005/08/23 00:02:19 dmcmahill Exp $
 
-SHA1 (geda/geda-gattrib-20050313.tar.gz) = 9c15fce90ffe18f65e8c8b2167523108af31fdbb
-RMD160 (geda/geda-gattrib-20050313.tar.gz) = 3d27f337f4e5890e7f82e2547644186344a13e02
-Size (geda/geda-gattrib-20050313.tar.gz) = 314382 bytes
+SHA1 (geda/geda-gattrib-20050820.tar.gz) = 5fadbe552b5a9ab3e31259f4ec104ae41681879b
+RMD160 (geda/geda-gattrib-20050820.tar.gz) = b4a7a82a1187fe5f400cb1852ed2ca5cedc2424f
+Size (geda/geda-gattrib-20050820.tar.gz) = 317601 bytes
 SHA1 (patch-aa) = 557c19cf8f86968ebe7905ed21f1d509b7aa5d3d
diff --git a/cad/gattrib/patches/patch-aa b/cad/gattrib/patches/patch-aa
deleted file mode 100644
index d7b5da3941b..00000000000
--- a/cad/gattrib/patches/patch-aa
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2005/04/29 22:14:46 rillig Exp $
-
-Needed for ISO C90 compliance.
-
---- src/gattrib.c.orig	Sun Mar  6 00:54:08 2005
-+++ src/gattrib.c	Tue Apr 12 02:41:21 2005
-@@ -205,7 +205,7 @@ void gattrib_main(void *closure, int arg
-   i = argv_index;
-   while(argv[i] != NULL) {
- 
--    gchar *temp_filename;
-+    gchar *temp_filename, *filename;
- #ifdef __MINGW32__
-     if (argv[i][1] == ':' && (argv[i][2] == G_DIR_SEPARATOR ||
-                               argv[i][2] == OTHER_PATH_SEPARATER_CHAR))
-@@ -219,7 +219,7 @@ void gattrib_main(void *closure, int arg
-       temp_filename = g_build_path (G_DIR_SEPARATOR_S, cwd, argv[i], NULL);
-     }
- 
--    gchar *filename = f_normalize_filename(temp_filename);
-+    filename = f_normalize_filename(temp_filename);
-     g_free(temp_filename);
- 
-     s_log_message("Loading file [%s]\n", filename);
diff --git a/cad/geda-docs/PLIST b/cad/geda-docs/PLIST
index 87315f1b1aa..d394af300c6 100644
--- a/cad/geda-docs/PLIST
+++ b/cad/geda-docs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2005/03/24 02:05:11 dmcmahill Exp $
+@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
@@ -386,6 +386,7 @@ 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
diff --git a/cad/geda-docs/distinfo b/cad/geda-docs/distinfo
index bd07f268ee4..bcc54218752 100644
--- a/cad/geda-docs/distinfo
+++ b/cad/geda-docs/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.12 2005/03/24 02:05:11 dmcmahill Exp $
+$NetBSD: distinfo,v 1.13 2005/08/23 00:02:20 dmcmahill Exp $
 
-SHA1 (geda/geda-docs-20050313.tar.gz) = 343106cf5207882e2fe6fdca6e7a3a942a4ed5e7
-RMD160 (geda/geda-docs-20050313.tar.gz) = 9cffb9c71b032b36e6a24866d70ab7daf8a0c5bb
-Size (geda/geda-docs-20050313.tar.gz) = 2852012 bytes
+SHA1 (geda/geda-docs-20050820.tar.gz) = 5b1032722b4eab12d8698abe76b12c4d5f2ad871
+RMD160 (geda/geda-docs-20050820.tar.gz) = b770ce9490fec8a574870027d76430040267fa4f
+Size (geda/geda-docs-20050820.tar.gz) = 2870917 bytes
diff --git a/cad/geda-examples/Makefile b/cad/geda-examples/Makefile
index 78dd6ba3e58..bd31acc87e3 100644
--- a/cad/geda-examples/Makefile
+++ b/cad/geda-examples/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2005/06/15 01:50:58 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.11 2005/08/23 00:02:20 dmcmahill Exp $
 #
 
 DISTNAME=	geda-examples-${PKGVERSION}
-PKGREVISION=	1
 CATEGORIES=	cad
 
 MAINTAINER=	dmcmahill@NetBSD.org
@@ -21,7 +20,6 @@ pre-install:
 	${RM} -f ${WRKSRC}/configure.lineno
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/geda
 	cd ${WRKSRC} && ${PAX} -s '/.*Makefile.*//' -s '/.config.log//' \
 		-s '/.*config.status//' \
 		-rw . ${PREFIX}/share/examples/geda
diff --git a/cad/geda-examples/distinfo b/cad/geda-examples/distinfo
index 7b27ffd6dcd..2a9a4a018a9 100644
--- a/cad/geda-examples/distinfo
+++ b/cad/geda-examples/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.5 2005/03/24 02:05:11 dmcmahill Exp $
+$NetBSD: distinfo,v 1.6 2005/08/23 00:02:20 dmcmahill Exp $
 
-SHA1 (geda/geda-examples-20050313.tar.gz) = f08b29ddc68bef36a6ee6865182309110dcc0f0e
-RMD160 (geda/geda-examples-20050313.tar.gz) = 659d6d142297979b7c8c51846bf787939bae5c0c
-Size (geda/geda-examples-20050313.tar.gz) = 244625 bytes
+SHA1 (geda/geda-examples-20050820.tar.gz) = 8f2ddc9318c30aa5ac996d8aa6aac4e8239160e6
+RMD160 (geda/geda-examples-20050820.tar.gz) = bd589db4d4371731513742063bd869b84f591331
+Size (geda/geda-examples-20050820.tar.gz) = 244593 bytes
diff --git a/cad/geda-symbols/Makefile b/cad/geda-symbols/Makefile
index 4b358341f23..2184aa54c85 100644
--- a/cad/geda-symbols/Makefile
+++ b/cad/geda-symbols/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/05/22 20:07:41 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2005/08/23 00:02:20 dmcmahill Exp $
 #
 
 DISTNAME=	geda-symbols-${PKGVERSION}
@@ -15,4 +15,7 @@ CONFLICTS+=	gEDA<19991011
 GNU_CONFIGURE=	YES
 USE_TOOLS+=	gmake gsed
 
+post-install:
+	${RM} -f ${PREFIX}/share/gEDA/sym/micro/gschem.log.old
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/geda-symbols/PLIST b/cad/geda-symbols/PLIST
index 857ca0797ef..a29628176ea 100644
--- a/cad/geda-symbols/PLIST
+++ b/cad/geda-symbols/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2005/03/24 02:05:11 dmcmahill Exp $
+@comment $NetBSD: PLIST,v 1.13 2005/08/23 00:02:20 dmcmahill Exp $
 share/doc/geda-doc/nc.pdf
 share/gEDA/sym/4000/4000-1.sym
 share/gEDA/sym/4000/4000-2.sym
@@ -477,6 +477,7 @@ share/gEDA/sym/allegro/3967-2.sym
 share/gEDA/sym/altera/10K10LC84-1.sym
 share/gEDA/sym/altera/EPC1LC20-1.sym
 share/gEDA/sym/altera/EPF10K-1.sym
+share/gEDA/sym/amphenol/31-71043-1.sym
 share/gEDA/sym/analog/CS5396-1.sym
 share/gEDA/sym/analog/HA5221-1.sym
 share/gEDA/sym/analog/aop-std-1.sym
@@ -1014,6 +1015,7 @@ share/gEDA/sym/maxim/max1674-1.sym
 share/gEDA/sym/maxim/max186-1.sym
 share/gEDA/sym/maxim/max186-2.sym
 share/gEDA/sym/maxim/max189-1.sym
+share/gEDA/sym/maxim/max19538-1.sym
 share/gEDA/sym/maxim/max202-1.sym
 share/gEDA/sym/maxim/max214-1.sym
 share/gEDA/sym/maxim/max218-1.sym
@@ -1655,6 +1657,7 @@ share/gEDA/system-gafrc
 @dirrm share/gEDA/sym/asic
 @dirrm share/gEDA/sym/apex
 @dirrm share/gEDA/sym/analog
+@dirrm share/gEDA/sym/amphenol
 @dirrm share/gEDA/sym/altera
 @dirrm share/gEDA/sym/allegro
 @dirrm share/gEDA/sym/IEC417
diff --git a/cad/geda-symbols/distinfo b/cad/geda-symbols/distinfo
index ae9b1e4730a..42c63596d4c 100644
--- a/cad/geda-symbols/distinfo
+++ b/cad/geda-symbols/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.12 2005/03/24 02:05:11 dmcmahill Exp $
+$NetBSD: distinfo,v 1.13 2005/08/23 00:02:20 dmcmahill Exp $
 
-SHA1 (geda/geda-symbols-20050313.tar.gz) = 035055f16c6fb7e013b94c1071d88f1a3cc27ed6
-RMD160 (geda/geda-symbols-20050313.tar.gz) = cb4ccae82ef9a508d8887fbe9758028bf777461c
-Size (geda/geda-symbols-20050313.tar.gz) = 659616 bytes
+SHA1 (geda/geda-symbols-20050820.tar.gz) = fc1d7c2b16c9f7cc1c3463e3d8437701b190f7e7
+RMD160 (geda/geda-symbols-20050820.tar.gz) = 29533c2f0ab87f309d46056bee43431fca2bea77
+Size (geda/geda-symbols-20050820.tar.gz) = 663249 bytes
diff --git a/cad/geda-utils/Makefile b/cad/geda-utils/Makefile
index fabf954c4b6..3b6d9cf6ac0 100644
--- a/cad/geda-utils/Makefile
+++ b/cad/geda-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2005/08/10 20:56:12 jlam Exp $
+# $NetBSD: Makefile,v 1.32 2005/08/23 00:02:20 dmcmahill Exp $
 #
 
 DISTNAME=		geda-utils-${PKGVERSION}
@@ -9,18 +9,13 @@ HOMEPAGE=		http://www.geda.seul.org/
 COMMENT=		Set of utilities for gEDA
 
 BUILD_DEPENDS+=		geda-symbols>=${PKGVERSION}:../../cad/geda-symbols
-.if !exists(/usr/bin/lex) && !exists(/usr/bin/flex)
-BUILD_DEPENDS+=		flex-[0-9]*:../../devel/flex
-EVAL_PREFIX+=		LEXDIR=flex
-LEX=			${LEXDIR}/bin/flex
-.endif
 
 CONFLICTS+=		gEDA<19991011
 
 .include "../../cad/geda/Makefile.common"
 
 GNU_CONFIGURE=		YES
-USE_TOOLS+=		perl:run pkg-config
+USE_TOOLS+=		lex perl:run pkg-config
 
 # let (f)lex rebuild this file.  The distributed one doesn't
 # always work.
@@ -42,4 +37,5 @@ REPLACE_PERL+=		scripts/pads_backannotate \
 			scripts/sarlacc_sym
 
 .include "../../cad/libgeda/buildlink3.mk"
+.include "../../devel/libgetopt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/geda-utils/PLIST b/cad/geda-utils/PLIST
index f205cac6538..26fda6549b1 100644
--- a/cad/geda-utils/PLIST
+++ b/cad/geda-utils/PLIST
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.6 2005/01/11 03:16:23 dmcmahill Exp $
+@comment $NetBSD: PLIST,v 1.7 2005/08/23 00:02:20 dmcmahill Exp $
 bin/convert_sym
 bin/garchive
 bin/gmk_sym
+bin/grenum
 bin/gsch2pcb
 bin/gschemdoc
 bin/gschlas
@@ -15,6 +16,8 @@ bin/sarlacc_schem
 bin/sarlacc_sym
 bin/smash_megafile
 bin/tragesym
+man/man1/grenum.1
+share/doc/geda-doc/readmes/README.grenum
 share/doc/geda-doc/readmes/README.gsch2pcb
 share/doc/geda-doc/readmes/README.olib
 share/doc/geda-doc/readmes/README.tragesym
diff --git a/cad/geda-utils/distinfo b/cad/geda-utils/distinfo
index ffa2b5e558a..06c00ee5ec6 100644
--- a/cad/geda-utils/distinfo
+++ b/cad/geda-utils/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.12 2005/03/24 02:05:11 dmcmahill Exp $
+$NetBSD: distinfo,v 1.13 2005/08/23 00:02:20 dmcmahill Exp $
 
-SHA1 (geda/geda-utils-20050313.tar.gz) = 7ed7fbb9f55dbf513ba83f854b28cbf3b5e1b43b
-RMD160 (geda/geda-utils-20050313.tar.gz) = b716b92b2f1b35a92372ddcf3728589b8bb79fb4
-Size (geda/geda-utils-20050313.tar.gz) = 247507 bytes
+SHA1 (geda/geda-utils-20050820.tar.gz) = 9e0f1afdcb297be0c294f2dde692f083fe546c0a
+RMD160 (geda/geda-utils-20050820.tar.gz) = 1ef955b6fc5c699dec4eaccfbdfa3e0a413b103e
+Size (geda/geda-utils-20050820.tar.gz) = 260172 bytes
diff --git a/cad/geda/Makefile.common b/cad/geda/Makefile.common
index c293d6f7e28..a2a273e68df 100644
--- a/cad/geda/Makefile.common
+++ b/cad/geda/Makefile.common
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.4 2005/03/24 02:05:11 dmcmahill Exp $
+# $NetBSD: Makefile.common,v 1.5 2005/08/23 00:02:19 dmcmahill Exp $
 #
 
 DIST_SUBDIR=	geda
-PKGVERSION=	20050313
+PKGVERSION=	20050820
 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 dd6dc67f63a..2fbaccd1c87 100644
--- a/cad/geda/PLIST
+++ b/cad/geda/PLIST
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.5 2005/03/24 02:05:11 dmcmahill Exp $
+@comment $NetBSD: PLIST,v 1.6 2005/08/23 00:02:19 dmcmahill Exp $
 bin/geda
 bin/graphman
 bin/raw2gw
+${PKGLOCALEDIR}/locale/de_DE/LC_MESSAGES/geda.mo
 ${PKGLOCALEDIR}/locale/fr_FR/LC_MESSAGES/geda.mo
 ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/geda.mo
 ${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/geda.mo
diff --git a/cad/geda/distinfo b/cad/geda/distinfo
index 8aac65a6be0..647616fd30e 100644
--- a/cad/geda/distinfo
+++ b/cad/geda/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.8 2005/03/24 02:05:11 dmcmahill Exp $
+$NetBSD: distinfo,v 1.9 2005/08/23 00:02:20 dmcmahill Exp $
 
-SHA1 (geda/geda-20050313.tar.gz) = 8f8345f5e7ea346b7046d1c3bdabd8b328f923c0
-RMD160 (geda/geda-20050313.tar.gz) = a3aaf96c70062496c8d8a5ef7c9f5ddb753e20c1
-Size (geda/geda-20050313.tar.gz) = 393221 bytes
+SHA1 (geda/geda-20050820.tar.gz) = 543fe155c4cc23dc81e5b0f81d1eda6fae5e7234
+RMD160 (geda/geda-20050820.tar.gz) = 5bdf283ceccaabf8cf3674af027b5252add98579
+Size (geda/geda-20050820.tar.gz) = 397955 bytes
diff --git a/cad/gnetlist/Makefile b/cad/gnetlist/Makefile
index ccf7eeef17c..b72888f0a01 100644
--- a/cad/gnetlist/Makefile
+++ b/cad/gnetlist/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2005/08/10 20:56:12 jlam Exp $
+# $NetBSD: Makefile,v 1.36 2005/08/23 00:02:20 dmcmahill Exp $
 #
 
 DISTNAME=		geda-gnetlist-${PKGVERSION}
@@ -10,8 +10,6 @@ HOMEPAGE=		http://www.geda.seul.org/
 COMMENT=		Netlist generation program
 
 DEPENDS+=		geda-symbols-${PKGVERSION}:../../cad/geda-symbols
-# needs GNU m4 for the PCBboard netlister
-USE_TOOLS+=		gm4:run pkg-config
 
 .include "../../cad/geda/Makefile.common"
 
@@ -19,20 +17,14 @@ CONFLICTS+=		gEDA<19991011
 
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
-USE_TOOLS+=		gmake pkg-config
+
+# needs GNU m4 for the PCBboard and gsch2pcb netlisters
+USE_TOOLS+=		gmake m4:run pkg-config
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
 EVAL_PREFIX+=   PCBDIR=pcb
-
-post-patch:
-.for f in gnet-PCBboard.scm gnet-gsch2pcb.scm
-	${MV} -f ${WRKSRC}/scheme/${f} ${WRKSRC}/scheme/${f}.bak
-	${SED} -e 's;@M4@;${TOOLS_M4:Q};g' \
-	       -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
+CONFIGURE_ARGS+=	--with-pcbm4dir=${PCBDIR}/share/pcb/m4
+CONFIGURE_ARGS+=	--with-pcbconfdir=${PKG_SYSCONFDIR}/pcb
 
 .include "../../cad/libgeda/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/gnetlist/distinfo b/cad/gnetlist/distinfo
index 0b65f3bd97c..e15e330d015 100644
--- a/cad/gnetlist/distinfo
+++ b/cad/gnetlist/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.15 2005/03/24 02:05:11 dmcmahill Exp $
+$NetBSD: distinfo,v 1.16 2005/08/23 00:02:20 dmcmahill Exp $
 
-SHA1 (geda/geda-gnetlist-20050313.tar.gz) = de54606d06c40c0b82ca286dc533ebcca9e16844
-RMD160 (geda/geda-gnetlist-20050313.tar.gz) = f2ab962a46f0964416c9dcf2870a5d9e9fa25292
-Size (geda/geda-gnetlist-20050313.tar.gz) = 317092 bytes
-SHA1 (patch-aa) = 4e3e871512a99ad1ea55bf8215c3cc8b773b6867
-SHA1 (patch-ab) = 6a44e80b2e80ccc12e3e4e206de2cfe8f85897fa
+SHA1 (geda/geda-gnetlist-20050820.tar.gz) = 051227799c3f2139191464c6489b62eb178a9df7
+RMD160 (geda/geda-gnetlist-20050820.tar.gz) = 0cd1df690fe5ab3b5dd77081538e0e533f0dbad3
+Size (geda/geda-gnetlist-20050820.tar.gz) = 319827 bytes
+SHA1 (patch-aa) = 7ca56beaa321e41f1cbabf43076b419240fe8395
+SHA1 (patch-ab) = 8f0a2538f21af3bfb8be391fc7c19c3bb0a63161
diff --git a/cad/gnetlist/patches/patch-aa b/cad/gnetlist/patches/patch-aa
index 7102989fa30..3659fa81b70 100644
--- a/cad/gnetlist/patches/patch-aa
+++ b/cad/gnetlist/patches/patch-aa
@@ -1,23 +1,11 @@
-$NetBSD: patch-aa,v 1.8 2004/03/05 13:03:47 dmcmahill Exp $
+$NetBSD: patch-aa,v 1.9 2005/08/23 00:02:20 dmcmahill Exp $
 
---- scheme/gnet-PCBboard.scm.orig	Sun Aug 24 01:36:06 2003
-+++ scheme/gnet-PCBboard.scm
-@@ -134,7 +134,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.
-@@ -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 "@M4@ -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
+--- configure.ac.orig	2005-08-20 14:13:28.000000000 +0000
++++ configure.ac	2005-08-22 02:36:15.000000000 +0000
+@@ -31,5 +31,5 @@
+ 
+ # Change default location for pcb's m4 site configuration directory
+-AC_ARG_WITH(pcbm4dir,
++AC_ARG_WITH(pcbconfdir,
+ 	[  --with-pcbconfdir=path     Change where the PCB site config files are installed [[default=${sysconfdir}/pcb]]],
+         [PCBCONFDIR=$withval],
diff --git a/cad/gnetlist/patches/patch-ab b/cad/gnetlist/patches/patch-ab
index 80b30953300..cbae96ce449 100644
--- a/cad/gnetlist/patches/patch-ab
+++ b/cad/gnetlist/patches/patch-ab
@@ -1,25 +1,13 @@
-$NetBSD: patch-ab,v 1.6 2004/03/05 13:03:47 dmcmahill Exp $
+$NetBSD: patch-ab,v 1.7 2005/08/23 00:02:20 dmcmahill Exp $
 
---- scheme/gnet-gsch2pcb.scm.orig	Fri Jan  2 19:49:31 2004
-+++ scheme/gnet-gsch2pcb.scm
-@@ -133,9 +133,10 @@
- ;;
- ;;
- 
--(define m4-command "m4")
--(define m4-pcbdir "/usr/X11R6/lib/X11/pcb/m4")
-+(define m4-command "@M4@")
-+(define m4-pcbdir "@pcb_m4dir@")
- (define m4-files "")
-+(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.
-@@ -149,6 +150,7 @@
-   	;; pipe with the macro define in pcb program
-   	(let ((pipe (open-output-pipe (string-append
- 			m4-command " -d -I. -I" m4-pcbdir " "
-+			" -I " m4-pcbconfdir " -I$HOME/.pcb -I. "
- 			m4-pcbdir "/common.m4 " m4-files " - >> "
- 			output-filename))))
+--- configure.orig	2005-08-20 14:28:33.000000000 +0000
++++ configure	2005-08-22 02:36:57.000000000 +0000
+@@ -1816,6 +1816,6 @@
  
+ # Check whether --with-pcbm4dir or --without-pcbm4dir was given.
+-if test "${with_pcbm4dir+set}" = set; then
+-  withval="$with_pcbm4dir"
++if test "${with_pcbconfdir+set}" = set; then
++  withval="$with_pcbconfdir"
+   PCBCONFDIR=$withval
+ else
diff --git a/cad/gschem/distinfo b/cad/gschem/distinfo
index ba47e5ccaa6..51804887f1e 100644
--- a/cad/gschem/distinfo
+++ b/cad/gschem/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.13 2005/03/24 02:05:11 dmcmahill Exp $
+$NetBSD: distinfo,v 1.14 2005/08/23 00:02:20 dmcmahill Exp $
 
-SHA1 (geda/geda-gschem-20050313.tar.gz) = fe64615cf3612e824929b14497d309bbd464a737
-RMD160 (geda/geda-gschem-20050313.tar.gz) = a500b2d82feb3d8157c5d40edf29f88c1e9340cc
-Size (geda/geda-gschem-20050313.tar.gz) = 1586084 bytes
+SHA1 (geda/geda-gschem-20050820.tar.gz) = 5f9f89b065b456f87d5d4d784325d787ff1ff3f1
+RMD160 (geda/geda-gschem-20050820.tar.gz) = 1afa28f8166cef38879768f849b0a6858e631e69
+Size (geda/geda-gschem-20050820.tar.gz) = 1595185 bytes
diff --git a/cad/gsymcheck/distinfo b/cad/gsymcheck/distinfo
index fa1181fb4c4..002cd6a302a 100644
--- a/cad/gsymcheck/distinfo
+++ b/cad/gsymcheck/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.12 2005/03/24 02:05:12 dmcmahill Exp $
+$NetBSD: distinfo,v 1.13 2005/08/23 00:02:20 dmcmahill Exp $
 
-SHA1 (geda/geda-gsymcheck-20050313.tar.gz) = c1f1a7db2603b991ae28016ebca6928fdb99a65f
-RMD160 (geda/geda-gsymcheck-20050313.tar.gz) = 357bb5fbba5c4e20105716fc9c5bddb41383aa8d
-Size (geda/geda-gsymcheck-20050313.tar.gz) = 131689 bytes
+SHA1 (geda/geda-gsymcheck-20050820.tar.gz) = 07610ddfaabb22cb2d0bf3ac24f09c4a2264c44b
+RMD160 (geda/geda-gsymcheck-20050820.tar.gz) = 1c57a23355794c5a952831e2b789751890b4ea8c
+Size (geda/geda-gsymcheck-20050820.tar.gz) = 132972 bytes
diff --git a/cad/libgeda/buildlink3.mk b/cad/libgeda/buildlink3.mk
index 7f6fb683dbf..d72517c1377 100644
--- a/cad/libgeda/buildlink3.mk
+++ b/cad/libgeda/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2005/03/24 02:05:12 dmcmahill Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2005/08/23 00:02:20 dmcmahill Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBGEDA_BUILDLINK3_MK:=	${LIBGEDA_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibgeda}
 BUILDLINK_PACKAGES+=	libgeda
 
 .if !empty(LIBGEDA_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libgeda+=	libgeda-20050313
+BUILDLINK_DEPENDS.libgeda+=	libgeda-20050820
 BUILDLINK_PKGSRCDIR.libgeda?=	../../cad/libgeda
 .endif	# LIBGEDA_BUILDLINK3_MK
 
diff --git a/cad/libgeda/distinfo b/cad/libgeda/distinfo
index 137776edbd4..fbaaa9ae12d 100644
--- a/cad/libgeda/distinfo
+++ b/cad/libgeda/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.12 2005/03/24 02:05:12 dmcmahill Exp $
+$NetBSD: distinfo,v 1.13 2005/08/23 00:02:20 dmcmahill Exp $
 
-SHA1 (geda/libgeda-20050313.tar.gz) = c0a8154e2a3d9c7f9298759932e9e8faf3134ea8
-RMD160 (geda/libgeda-20050313.tar.gz) = 7d0790b1f34b75dcdfb9de702b2af16f88b1b54a
-Size (geda/libgeda-20050313.tar.gz) = 1023201 bytes
+SHA1 (geda/libgeda-20050820.tar.gz) = 3aaa3fb87e3a1ff3bb482f447cafd3e711072a34
+RMD160 (geda/libgeda-20050820.tar.gz) = 39b0c3fa0b975e11b3e7c5bcc7fa0e982a352e3e
+Size (geda/libgeda-20050820.tar.gz) = 1027436 bytes