Update to the gEDA/gaf 20030901 development snapshot

Release notes for the gEDA/gaf 20030901 development snapshot
------------------------------------------------------------
CHANGES:

   General / Summary

        * The biggest change in this release is the addition of gtk+ 2.2.x
          support.  Now you can build gEDA/gaf with either gtk+ 1.2.x or
          gtk+ 2.2.x.  Some programs like setup and geda still require
          gtk+ 1.2.x, but that will be fixed in a future release.
          The original gtk+ 2.2.x patch was by Ye Ma (Thanks!).

        * Added --with-gtk12 commandline flag to all ./configure scripts
          to force the use of gtk+ 1.2.x.  Just add this to the opt=
          variable in the toplevel Makefile to force all of gEDA/gaf to
          use gtk+ 1.2.x instead of gtk+ 2.2.x.  The default used gtk+
          library if both 1.2.x and 2.2.x are installed is gtk+ 2.2.x.

        * In order support above, pkg-config is now REQUIRED to successfully
          ./configure the packages.  pkg-config is also required if you
          are building/linking against gtk+ 1.2.x.   You can get pkg-config
          from either:
                [1]http://www.geda.seul.org/dist
                or [2]http://www.freedesktop.org/software/pkgconfig/

        * If you do not keep all of your packages installed in one
          place or if it is not in a standard location (like
          /usr/lib/pkgconfig), then you must tell pkg-config where
          to look by using the PKG_CONFIG_PATH environment variable.
          I keep all of my *.pc files in /usr/local/lib/pkgconfig,
          so my PKG_CONFIG_PATH is set like this:

          export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig

        * Rewrote and simplified all the ./configure.ac files.  Here are
          the versions of the auto* tools I use:

                autoconf (GNU Autoconf) 2.54
                automake (GNU automake) 1.7.1
                ltmain.sh (GNU libtool) 1.4.2
                aclocal (GNU automake) 1.7.1
                gettext (GNU gettext) 0.11.5

          If you use any other versions, good luck. :-)

   libgeda

        * Shared library version number now at 19.

        * Removed libgeda-config, replaced with libgeda.pc (pkg-config file).
          In order for gschem and the other libgeda programs to find this
          file during the ./configure stage, you must set the PKG_CONFIG_PATH
          environment variable to something like this:

          export PKG_CONFIG_PATH=$HOME/geda/lib/pkgconfig:$PKG_CONFIG_PATH

          The settings for this variable is printed when you type 'make'
          in the upper most directory (toplevel) where you untarred all
          the source tarballs.

        * libgdgeda 2.0.15 is now required to build libgeda.

        * No significant code changes.

   gschem

        * Applied Carlos Nieves Onega's multi attribute patch.  With this
          patch, the multi attribute add/edit dialog box behaves a lot
          more intelligently when adding or changing attributes.

        * Bunch of work to support both gtk+ 1.2.x and 2.2.x.

        * Rewrote the exit dialog box to look better under both 1.2.x
          and 2.2.x.  Quite a few of the dialog box look bad under
          1.2.x, but look absolutely dreadful under 2.2.x, so they
          will be recreated (and hopefully improved in the process)
          in future releases.

   gnetlist

        * Applied Carlos Nieves Onega's commandline (-l filename) load
          scheme patch.  The scheme code is loaded and executed from the
          specified file before the backend is loaded.

        * Added the -m commandline flag which allows scheme code to be
          loaded from a file after the backend is loaded but before it is
          executed.

        * Integrated Carlos Nieves Onega's DRC2 backend.

        * Applied Carlos Nieves Onega's warning cleanup patch.

        * The required work to get gnetlist to work with both gtk+ 1.2.x and
          2.2.x.

        * Added Bill Wilson's gnet-gsch2pcb backend.

        * Applied Stuart Brorson's latest changes to the spice-sdb
          netlister.  His changes included the -s command line flag
          (sort output netlist) and the gnetlist:get-calling-flags as
          well as improvements to the spice-sdb backend itself.

   gsymcheck

        * No significant changes other than the gtk+ 2.2.x support changes.

   symbols

        * Werner Hoch updated a bunch of symbols in various directories
          including memory and 74.

        * Removed gesym-config.  The new ./configure.ac files do not use
          this file anymore.

        * Added a bunch of contributed symbols (not all though, some are
          still pending for various reasons).

        * The author= and email= attribute on five symbols have been
          merged into one (author=).

   geda (gManager)

        * No changes

   setup

        * No changes

   utils

        * Finally integrated Werner Hoch's tragesym 0.0.5 into the
          utils package.  tragesym is a symbol creator for gEDA/gaf written
          in python.

        * Applied patch by Holger Dietze to update gmk_sym to be current.

        * Integrated Bill Wilson's gsch2pcb package.
          gsch2pcb is conceptually based on the gschem2pcb shell script
          distributed with gnetlist, but additionally handles multiple
          schematics, handles element file footprints, and removes pc
          board elements corresponding to components deleted from the
          schematics.  It also forward annotates component value changes

        * The necessary changes to support gtk+ 2.2.x.

        * Integrated pads backannotation script by Dan McMahill.
          A perl program which implements backannotation from Pads
          PowerPCB board layouts to gschem schematics.

   docs

        * Documented the merge of author= and email= (suggestion by
          Werner Hoch)

        * Updated spice-sdb document with a the latest version from
          Stuart Brorson.

        * Added Dan McMahill's documentation for the pads_backannotate
          script.

   examples

        * No changes.


   For more a detailed ChangeLog please look in the appropriate source
   directories.

5 files changed, 53 insertions, 22 deletions

diff --git a/cad/gnetlist/Makefile b/cad/gnetlist/Makefile
index 3627d739623..fdb17297ae3 100644
--- a/cad/gnetlist/Makefile
+++ b/cad/gnetlist/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2003/07/17 21:25:01 grant Exp $
+# $NetBSD: Makefile,v 1.21 2003/09/10 23:43:35 dmcmahill Exp $
 #
 
 DISTNAME=		geda-gnetlist-${PKGVERSION}
@@ -13,27 +13,31 @@ MAINTAINER=		dmcmahill@NetBSD.org
 HOMEPAGE=		http://www.geda.seul.org/
 COMMENT=		Netlist generation program
 
-DIST_SUBDIR=		geda
-PKGVERSION=		20030525
-
 DEPENDS+=		geda-symbols-${PKGVERSION}:../../cad/geda-symbols
 # needs GNU m4 for the PCBboard netlister
 DEPENDS+=		m4>=1.4:../../devel/m4
 
+DIST_SUBDIR=		geda
+PKGVERSION=		20030901
+
 CONFLICTS+=		gEDA<19991011
 
 GNU_CONFIGURE=		YES
-USE_X11BASE=		YES
 USE_LIBTOOL=		YES
 USE_GMAKE=		YES
 USE_BUILDLINK2=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
+EVAL_PREFIX+=   PCBDIR=pcb
+
 post-patch:
-	${MV} -f ${WRKSRC}/scheme/gnet-PCBboard.scm ${WRKSRC}/scheme/gnet-PCBboard.scm.bak
-	${SED} 's;@pcb_confdir@;${PKG_SYSCONFDIR}/pcb;g' \
-		${WRKSRC}/scheme/gnet-PCBboard.scm.bak > ${WRKSRC}/scheme/gnet-PCBboard.scm
-	${RM} -f ${WRKSRC}/scheme/gnet-PCBboard.scm.bak
+.for f in gnet-PCBboard.scm gnet-gsch2pcb.scm
+	${MV} -f ${WRKSRC}/scheme/${f} ${WRKSRC}/scheme/${f}.bak
+	${SED} -e 's;@pcb_confdir@;${PKG_SYSCONFDIR}/pcb;g' \
+	       -e 's;@pcb_m4dir@;${PCBDIR}/share/pcb/m4;g' \
+		${WRKSRC}/scheme/${f}.bak > ${WRKSRC}/scheme/${f}
+	${RM} -f ${WRKSRC}/scheme/${f}.bak
+.endfor
 
 .include "../../cad/libgeda/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/gnetlist/PLIST b/cad/gnetlist/PLIST
index 277f93649ef..3cb39c77a98 100644
--- a/cad/gnetlist/PLIST
+++ b/cad/gnetlist/PLIST
@@ -1,10 +1,9 @@
-@comment $NetBSD: PLIST,v 1.5 2003/07/15 09:23:34 dmcmahill Exp $
+@comment $NetBSD: PLIST,v 1.6 2003/09/10 23:43:35 dmcmahill Exp $
 bin/gnetlist
 bin/gschem2pcb
 bin/mk_verilog_syms
 bin/sw2asc
 man/man1/gnetlist.1
-share/gEDA/system-gnetlistrc
 share/gEDA/scheme/gnet-PCB.scm
 share/gEDA/scheme/gnet-PCBboard.scm
 share/gEDA/scheme/gnet-allegro.scm
@@ -12,8 +11,10 @@ share/gEDA/scheme/gnet-bae.scm
 share/gEDA/scheme/gnet-bom.scm
 share/gEDA/scheme/gnet-bom2.scm
 share/gEDA/scheme/gnet-drc.scm
+share/gEDA/scheme/gnet-drc2.scm
 share/gEDA/scheme/gnet-geda.scm
 share/gEDA/scheme/gnet-gossip.scm
+share/gEDA/scheme/gnet-gsch2pcb.scm
 share/gEDA/scheme/gnet-maxascii.scm
 share/gEDA/scheme/gnet-pads.scm
 share/gEDA/scheme/gnet-partslist-common.scm
@@ -21,8 +22,8 @@ share/gEDA/scheme/gnet-partslist1.scm
 share/gEDA/scheme/gnet-partslist2.scm
 share/gEDA/scheme/gnet-partslist3.scm
 share/gEDA/scheme/gnet-protelII.scm
-share/gEDA/scheme/gnet-spice.scm
 share/gEDA/scheme/gnet-spice-sdb.scm
+share/gEDA/scheme/gnet-spice.scm
 share/gEDA/scheme/gnet-switcap.scm
 share/gEDA/scheme/gnet-tango.scm
 share/gEDA/scheme/gnet-vams.scm
@@ -30,5 +31,6 @@ share/gEDA/scheme/gnet-verilog.scm
 share/gEDA/scheme/gnet-vhdl.scm
 share/gEDA/scheme/gnet-vipec.scm
 share/gEDA/scheme/gnetlist.scm
+share/gEDA/system-gnetlistrc
 @unexec ${RMDIR} %D/share/gEDA/scheme 2>/dev/null || ${TRUE}
 @unexec ${RMDIR} %D/share/gEDA 2>/dev/null || ${TRUE}
diff --git a/cad/gnetlist/distinfo b/cad/gnetlist/distinfo
index ddf14b38932..ad32db7fb64 100644
--- a/cad/gnetlist/distinfo
+++ b/cad/gnetlist/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.10 2003/07/15 09:23:34 dmcmahill Exp $
+$NetBSD: distinfo,v 1.11 2003/09/10 23:43:35 dmcmahill Exp $
 
-SHA1 (geda/geda-gnetlist-20030525.tar.gz) = 9888301831446dffcdf728b7ca46abc4d217382b
-Size (geda/geda-gnetlist-20030525.tar.gz) = 286441 bytes
-SHA1 (patch-aa) = 29dbe6b993dcf6e3c29ce8710b81aafd230ffc50
+SHA1 (geda/geda-gnetlist-20030901.tar.gz) = e0e997fa2043befb0abce8b60f780f8e22fcadfb
+Size (geda/geda-gnetlist-20030901.tar.gz) = 259134 bytes
+SHA1 (patch-aa) = bb6db6fe92e8c3d32ee13b47d42ade1d1a83ecc4
+SHA1 (patch-ab) = b31951b7162621262a7e2c923a4a383b4e7c0f1e
diff --git a/cad/gnetlist/patches/patch-aa b/cad/gnetlist/patches/patch-aa
index bfcb3e49c9d..e4f3ebe6892 100644
--- a/cad/gnetlist/patches/patch-aa
+++ b/cad/gnetlist/patches/patch-aa
@@ -1,22 +1,23 @@
-$NetBSD: patch-aa,v 1.6 2003/07/15 09:23:34 dmcmahill Exp $
+$NetBSD: patch-aa,v 1.7 2003/09/10 23:43:36 dmcmahill Exp $
 
---- scheme/gnet-PCBboard.scm.orig	Mon Mar 10 02:56:44 2003
+--- scheme/gnet-PCBboard.scm.orig	Sun Aug 24 01:36:06 2003
 +++ scheme/gnet-PCBboard.scm
-@@ -134,7 +134,7 @@
+@@ -134,7 +134,8 @@
  ;;
  ;;
  
 -(define *m4-pcbdir* "/usr/X11R6/lib/X11/pcb/m4")
-+(define *m4-pcbdir* "@pcb_confdir@")
++(define *m4-pcbdir* "@pcb_m4dir@")
++(define *m4-pcbconfdir* "@pcb_confdir@")
  
  ;; To emulate popen. Guileish again.
  ; Needed after guile ver. 1.3.2. To save 1.3a users, wrap it in.
-@@ -153,7 +153,7 @@
+@@ -153,7 +154,7 @@
  ;; Original pipe command commented out by AVH (bugfix by Rich Walker)
  ;;  (let ((pipe (open-output-pipe (string-append "m4 " *m4-pcbdir* "/common.m4 - >> " output-filename))))
  ;; Fixed pipe command (AVH 1/27/02)
 -   (let ((pipe (open-output-pipe (string-append "m4 -d -I" *m4-pcbdir* " " *m4-pcbdir* "/common.m4 - >> " output-filename))))
-+   (let ((pipe (open-output-pipe (string-append "gm4 -d -I" *m4-pcbdir* " -I@pcb_confdir@ -I$HOME/.pcb -I. " *m4-pcbdir* "/common.m4 - >> " output-filename))))
++   (let ((pipe (open-output-pipe (string-append "gm4 -d -I" *m4-pcbdir* " -I" *m4-pcbconfdir* " -I$HOME/.pcb -I. " *m4-pcbdir* "/common.m4 - >> " output-filename))))
  
  
         ;; packages is a list with the different uref value
diff --git a/cad/gnetlist/patches/patch-ab b/cad/gnetlist/patches/patch-ab
new file mode 100644
index 00000000000..6eeb9a96d7f
--- /dev/null
+++ b/cad/gnetlist/patches/patch-ab
@@ -0,0 +1,23 @@
+$NetBSD: patch-ab,v 1.5 2003/09/10 23:43:36 dmcmahill Exp $
+
+--- scheme/gnet-gsch2pcb.scm.orig	Wed Sep 10 16:26:08 2003
++++ scheme/gnet-gsch2pcb.scm
+@@ -133,7 +133,8 @@
+ ;;
+ ;;
+ 
+-(define *m4-pcbdir* "/usr/X11R6/lib/X11/pcb/m4")
++(define *m4-pcbdir* "@pcb_m4dir@")
++(define *m4-pcbconfdir* "@pcb_confdir@")
+ 
+ ;; To emulate popen. Guileish again.
+ ; Needed after guile ver. 1.3.2. To save 1.3a users, wrap it in.
+@@ -150,7 +151,7 @@
+ ;; Original pipe command commented out by AVH (bugfix by Rich Walker)
+ ;;  (let ((pipe (open-output-pipe (string-append "m4 " *m4-pcbdir* "/common.m4 - >> " output-filename))))
+ ;; Fixed pipe command (AVH 1/27/02)
+-   (let ((pipe (open-output-pipe (string-append "m4 -d -I" *m4-pcbdir* " " *m4-pcbdir* "/common.m4 - >> " output-filename))))
++   (let ((pipe (open-output-pipe (string-append "gm4 -d -I" *m4-pcbdir* " -I" *m4-pcbconfdir* " -I$HOME/.pcb -I. " *m4-pcbdir* "/common.m4 - >> " output-filename))))
+ 
+ 
+        ;; packages is a list with the different refdes value