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.

4 files changed, 33 insertions, 65 deletions

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