update to gwave-20000809.

Notable changes since the last pkged version are:
Gwave NEWS --- history of user-visible changes.  -*- text -*-

New in 20000518:
- Logarithmic scales working on both X and Y axis.

New in 20000509:
- First public guile/guile-gtk release.
- Popup menu on visible-wave button can activate per-waveform dialog box
- Logarithmic scale on Y axis working; on X axis it isn't quite there yet.

New in 20000108:
- Merged in guile and guile-gtk; the GUI is mostly written in guile now.
- Some additional improvements to reading of HSPICE input.  Reading partial
files from simulations still in progress works for ascii .tr0 files.

5 files changed, 32 insertions, 20 deletions

diff --git a/cad/gwave/Makefile b/cad/gwave/Makefile
index c5ba0e1024c..308c9a4da2f 100644
--- a/cad/gwave/Makefile
+++ b/cad/gwave/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/03/01 18:33:24 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.2 2000/08/30 17:49:36 dmcmahill Exp $
 #
 
-DISTNAME=	gwave-19990927
+DISTNAME=	gwave-20000809
 CATEGORIES=	cad
 MASTER_SITES=	http://www.cs.unc.edu/~tell/dist/
 
 MAINTAINER=	dmcmahill@netbsd.org
 HOMEPAGE=	http://www.cs.unc.edu/~tell/gwave/
 
-DEPENDS+=	gtk+>=1.2.0:../../x11/gtk
+DEPENDS+=	guile-gtk>=0.19:../../devel/guile-gtk
 DEPENDS+=	plotutils-*:../../graphics/plotutils
 
 GNU_CONFIGURE=	YES
diff --git a/cad/gwave/files/md5 b/cad/gwave/files/md5
index 51bd48811ba..9d3c52c06ac 100644
--- a/cad/gwave/files/md5
+++ b/cad/gwave/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1.1.1 2000/03/01 18:33:24 dmcmahill Exp $
+$NetBSD: md5,v 1.2 2000/08/30 17:49:37 dmcmahill Exp $
 
-MD5 (gwave-19990927.tar.gz) = 1d731751919a77575c00360bd5a94acd
+MD5 (gwave-20000809.tar.gz) = 2632c439da0d4414bbb7a9899c566805
diff --git a/cad/gwave/files/patch-sum b/cad/gwave/files/patch-sum
index 923e9acf99f..7c23bda79c4 100644
--- a/cad/gwave/files/patch-sum
+++ b/cad/gwave/files/patch-sum
@@ -1,3 +1,3 @@
-$NetBSD: patch-sum,v 1.1.1.1 2000/03/01 18:33:24 dmcmahill Exp $
+$NetBSD: patch-sum,v 1.2 2000/08/30 17:49:37 dmcmahill Exp $
 
-MD5 (patch-aa) = 0b9979ba1cb1f870d442000d3d2ec611
+MD5 (patch-aa) = e2d9da32736ed54259faed906fecfffd
diff --git a/cad/gwave/patches/patch-aa b/cad/gwave/patches/patch-aa
index a9a1f382d9d..5838d0d79e0 100644
--- a/cad/gwave/patches/patch-aa
+++ b/cad/gwave/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/03/01 18:33:24 dmcmahill Exp $
+$NetBSD: patch-aa,v 1.2 2000/08/30 17:49:37 dmcmahill Exp $
 
---- print.c.orig	Mon Sep 27 15:15:15 1999
-+++ print.c	Wed Mar  1 12:09:30 2000
-@@ -34,6 +34,9 @@
+--- src/print.c.orig	Fri Aug  4 23:14:53 2000
++++ src/print.c	Tue Aug 29 01:30:12 2000
+@@ -34,9 +34,12 @@
  #include <errno.h>
  
 +#include <sys/types.h>
@@ -10,13 +10,12 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/03/01 18:33:24 dmcmahill Exp $
 +
  #include <gtk/gtk.h>
 -#include <config.h>
+-#include <scwm_guile.h>
+-#include <gwave.h>
+-#include <wavewin.h>
 +#include "config.h"
- #include "gwave.h"
++#include "scwm_guile.h"
++#include "gwave.h"
++#include "wavewin.h"
  
-@@ -172,5 +175,5 @@
- 	graph_argv[graph_argc++] = NULL;
- 	printf("running %s", graph_prog);
--	for(i = 0; i < graph_argc; i++) {
-+	for(i = 0; i < (graph_argc-1); i++) {
- 		printf(" %s", graph_argv[i]);
- 	}
+ static char *tmpdir = "/tmp";
diff --git a/cad/gwave/pkg/PLIST b/cad/gwave/pkg/PLIST
index 02c3dc308b4..9d74456c5a5 100644
--- a/cad/gwave/pkg/PLIST
+++ b/cad/gwave/pkg/PLIST
@@ -1,2 +1,15 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2000/03/01 18:33:24 dmcmahill Exp $
+@comment $NetBSD: PLIST,v 1.2 2000/08/30 17:49:37 dmcmahill Exp $
 bin/gwave
+bin/sp2sp
+share/guile/app/gwave/cmds.scm
+share/guile/app/gwave/dynlink.scm
+share/guile/app/gwave/extra-menus.scm
+share/guile/app/gwave/globals.scm
+share/guile/app/gwave/minimal.scm
+share/guile/app/gwave/options.scm
+share/guile/app/gwave/std-args.scm
+share/guile/app/gwave/std-menus.scm
+share/guile/app/gwave/std-toolbar.scm
+share/guile/app/gwave/system.gwaverc
+share/guile/app/gwave/visiblewave-ops.scm
+@dirrm share/guile/app/gwave