update to gwave-20011020

New in 20011020:
- better measurement: value at both cursors or difference in values at cursors
- enhanced handling of log scales
- yet more file-reading improvements and general bug fixes

5 files changed, 5 insertions, 169 deletions

diff --git a/cad/gwave/Makefile b/cad/gwave/Makefile
index 18067288435..4d26a97ca52 100644
--- a/cad/gwave/Makefile
+++ b/cad/gwave/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2001/09/27 23:17:46 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2001/10/23 01:39:16 dmcmahill Exp $
 #
 
-DISTNAME=	gwave-20001123
+DISTNAME=	gwave-20011021
 CATEGORIES=	cad
 MASTER_SITES=	http://www.cs.unc.edu/~tell/dist/
 
@@ -17,7 +17,4 @@ GNU_CONFIGURE=	YES
 # CPPFLAGS to get -I${LOCALBASE}/include for readline/readline.h
 CPPFLAGS+=	-I${LOCALBASE}/include
 
-post-extract:
-	${CP} ${FILESDIR}/sp2sp.1 ${WRKSRC}/doc/sp2sp.1
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/gwave/distinfo b/cad/gwave/distinfo
index ce1d2fe3428..6a87b1b235a 100644
--- a/cad/gwave/distinfo
+++ b/cad/gwave/distinfo
@@ -1,6 +1,4 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 16:26:59 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/10/23 01:39:16 dmcmahill Exp $
 
-SHA1 (gwave-20001123.tar.gz) = ac17fc599cfd31371fac9ae71ef5c884d04c69a3
-Size (gwave-20001123.tar.gz) = 367032 bytes
-SHA1 (patch-aa) = 26e19c970e9a145ab20dcad0459f7ede086fb66f
-SHA1 (patch-ab) = a40205d5f32117cf0ba951b916bf802953380215
+SHA1 (gwave-20011021.tar.gz) = a21e8c0fc75ab81576cce86871b355fb8bc90d73
+Size (gwave-20011021.tar.gz) = 375467 bytes
diff --git a/cad/gwave/files/sp2sp.1 b/cad/gwave/files/sp2sp.1
deleted file mode 100644
index fcf75484466..00000000000
--- a/cad/gwave/files/sp2sp.1
+++ /dev/null
@@ -1,127 +0,0 @@
-.\" This -*- nroff -*- file has been generated from
-.\" DocBook SGML with docbook-to-man on Debian GNU/Linux.
-...\"
-...\"	transcript compatibility for postscript use.
-...\"
-...\"	synopsis:  .P! <file.ps>
-...\"
-.de P!
-\\&.
-.fl			\" force out current output buffer
-\\!%PB
-\\!/showpage{}def
-...\" the following is from Ken Flowers -- it prevents dictionary overflows
-\\!/tempdict 200 dict def tempdict begin
-.fl			\" prolog
-.sy cat \\$1\" bring in postscript file
-...\" the following line matches the tempdict above
-\\!end % tempdict %
-\\!PE
-\\!.
-.sp \\$2u	\" move below the image
-..
-.de pF
-.ie     ^G\\*(f1^G^G .ds f1 \\n(.f
-.el .ie ^G\\*(f2^G^G .ds f2 \\n(.f
-.el .ie ^G\\*(f3^G^G .ds f3 \\n(.f
-.el .ie ^G\\*(f4^G^G .ds f4 \\n(.f
-.el .tm ? font overflow
-.ft \\$1
-..
-.de fP
-.ie     !^G\\*(f4^G^G \{\
-.	ft \\*(f4
-.	ds f4\"
-'	br \}
-.el .ie !^G\\*(f3^G^G \{\
-.	ft \\*(f3
-.	ds f3\"
-'	br \}
-.el .ie !^G\\*(f2^G^G \{\
-.	ft \\*(f2
-.	ds f2\"
-'	br \}
-.el .ie !^G\\*(f1^G^G \{\
-.	ft \\*(f1
-.	ds f1\"
-'	br \}
-.el .tm ? font underflow
-..
-.ds f1\"
-.ds f2\"
-.ds f3\"
-.ds f4\"
-'\" t 
-.ta 8n 16n 24n 32n 40n 48n 56n 64n 72n  
-.TH "sp2sp" "1" 
-.SH "NAME" 
-sp2sp \(em translate from one spice-type analog waveform file format to another 
-.iX "spice" "file" 
-.iX "waveform" 
-.SH "SYNOPSIS" 
-.PP 
-\fBsp2sp\fP [-c \fIoutput-format\fP]  [-f \fIfieldnamelist\fP]  [-n \fIfieldnumberlist\fP]  [-t \fIinput-format\fP]  [-v] \fIfilename\fP  
-.SH "Description" 
-.PP 
-\fBsp2sp\fPtranslates analog waveform data, such as that 
-produced by \fBspice\fP, from one format to another. 
-Several input and output formats are supported.  In addition,  
-a subset of the variables in the input file can be selected to appear 
-in the output. 
- 
-.PP 
-If no \fIfilename\fP is specified, \fBsp2sp\fP reads from the standard input. 
-Translated results are always sent to standard output. 
- 
-.PP 
-\fBsp2sp\fP accepts the following options: 
- 
-.IP "-c \fIoutput-format\fP" 10 
-Sets the format for the output file.  Available formats include 
-ascii, nohead, and cazm. 
-.IP "-f \fIfieldnamelist\fP" 10 
-A list of field names, seperated by commas.  Only the fields matching the specified 
-names are included in the output.  Field names comparisons are case-insensitive. 
-If a field name does not match exactly, sp2sp also looks for the field name with "v(" 
-prepended, to allow for the tendancy of \fBHSpice\fP to list voltages 
-this way in transient simulation output. 
-.IP "-n \fIfieldnumberlist\fP" 10 
-A list of field numbers, seperated by commas.  The independent variable, for example 
-the time axis of a transient simulation, is field number zero. 
-.IP "-t \fIinput-format\fP" 10 
-Sets the expected format for input file or standard input.  Input formats  
-supported include: cazm and hspice. 
-.IP "-v" 10 
-Turns on verbose mode to print detailed information about the input file.      
-.SH "FILE FORMATS SUPPORTED" 
-.PP 
-A number of file formats are supported by \fBsp2sp\fP, 
-with more to be added in the future.   Note that some formats are 
-only supported for input or output; this asymetry should also be corrected 
-where possible. 
- 
-.IP "ascii" 10 
-A simple tabular ascii format, with column headings.  Note that files 
-in this format may have very long lines.  Available for output only. 
-.IP "nohead" 10 
-Supported for output only, this format is similar to the 
-ascii format, except that there are no column headings. 
-This format is most useful for feeding into other unix 
-utilities, such as awk, for specialized postprocessing. 
-.IP "cazm" 10 
-This format, generated by the CAzM simulator, is accepted for 
-input and output.  It is essentialy the same as "ascii" except for its header. 
-.IP "hspice" 10 
-The formats produced by \fBHSpice\fP, from 
-transient, sweep, and AC analyses are supprorted for input only. 
-Both the ascii and binary subformats are supported for reading and 
-are automaticly detected.      
-.SH "EXAMPLES" 
-.PP 
- 
-.SH "BUGS" 
-.PP 
-For input file formats that support multiple sets of waveforms in the same file, 
-only the first one is recognized and translated. 
- 
-...\" created by instant / docbook-to-man, Fri 01 Sep 2000, 00:10 
diff --git a/cad/gwave/patches/patch-aa b/cad/gwave/patches/patch-aa
deleted file mode 100644
index 5838d0d79e0..00000000000
--- a/cad/gwave/patches/patch-aa
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2000/08/30 17:49:37 dmcmahill Exp $
-
---- 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>
-+#include <sys/wait.h>
-+
- #include <gtk/gtk.h>
--#include <config.h>
--#include <scwm_guile.h>
--#include <gwave.h>
--#include <wavewin.h>
-+#include "config.h"
-+#include "scwm_guile.h"
-+#include "gwave.h"
-+#include "wavewin.h"
- 
- static char *tmpdir = "/tmp";
diff --git a/cad/gwave/patches/patch-ab b/cad/gwave/patches/patch-ab
deleted file mode 100644
index 9f2d38fbd31..00000000000
--- a/cad/gwave/patches/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2000/08/31 17:21:59 dmcmahill Exp $
-
---- doc/Makefile.in.orig	Thu Aug 10 00:35:03 2000
-+++ doc/Makefile.in	Thu Aug 31 11:28:38 2000
-@@ -42,5 +42,5 @@
- DESTDIR =
- 
--pkgdatadir = $(datadir)/@PACKAGE@
-+pkgdatadir = $(datadir)/doc/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@