[pkgsrc/trunk]: pkgsrc/cad/gwave update to gwave-20060606

[dmcmahill <dmcmahill%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e4a598051c4e
branches:  trunk
changeset: 535389:e4a598051c4e
user:      dmcmahill <dmcmahill%pkgsrc.org@localhost>
date:      Thu Nov 15 23:53:48 2007 +0000

description:
update to gwave-20060606

Most of the previous pkgsrc patches have been incorporated upstream (yay!).

New in 20060606
- ??

New in 20051222
- full-height vertical scrollbar appears if the total height of all
panels becomes larger than the window.
- new panel type "jumbo" stays larger even when things get crowded
- most deprecated guile calls removed.  Guile 1.6 or later is now required.

New in 20050928
- ALPHA RELEASE: may crash.  do not rely on for production use.
- handling of multi-sweep datafiles
- vertical scrollbars on label/measure area in each wavepanel make handling
large numbers of waveforms easier.

New in 20031202
- Got docstring extraction from C source to .txt files in doc directory working again
- applied submitted patch that cleans up warnings from gcc3 about multiline text strings in C code

New in 20030917
- bugfixes to make the new print/plot stuff work better
- path to working gnu graph found by configure is passed to scheme code

diffstat:

 cad/gwave/Makefile         |    8 +-
 cad/gwave/PLIST            |    4 +-
 cad/gwave/distinfo         |   20 +-----
 cad/gwave/patches/patch-aa |  115 +++++---------------------------------
 cad/gwave/patches/patch-ab |   52 -----------------
 cad/gwave/patches/patch-ac |   67 ----------------------
 cad/gwave/patches/patch-ad |   90 ------------------------------
 cad/gwave/patches/patch-ae |   71 -----------------------
 cad/gwave/patches/patch-af |   63 ---------------------
 cad/gwave/patches/patch-ag |   26 --------
 cad/gwave/patches/patch-ah |   17 -----
 cad/gwave/patches/patch-ai |  134 ---------------------------------------------
 cad/gwave/patches/patch-aj |   18 ------
 cad/gwave/patches/patch-ak |   18 ------
 14 files changed, 28 insertions(+), 675 deletions(-)

diffs (truncated from 783 to 300 lines):

diff -r 1d7ff54d08f7 -r e4a598051c4e cad/gwave/Makefile
--- a/cad/gwave/Makefile        Thu Nov 15 22:31:19 2007 +0000
+++ b/cad/gwave/Makefile        Thu Nov 15 23:53:48 2007 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.30 2007/06/18 00:41:16 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.31 2007/11/15 23:53:48 dmcmahill Exp $
 #
 
-DISTNAME=      gwave-20030804
-PKGREVISION=   6
+DISTNAME=      gwave-20060606
 CATEGORIES=    cad
-MASTER_SITES=  http://www.cs.unc.edu/~tell/dist/
+MASTER_SITES=  ftp://ftp.geda.seul.org/pub/geda/dist/ \
+               http://www.geda.seul.org/dist/
 
 MAINTAINER=    dmcmahill%NetBSD.org@localhost
 HOMEPAGE=      http://www.cs.unc.edu/~tell/gwave.html
diff -r 1d7ff54d08f7 -r e4a598051c4e cad/gwave/PLIST
--- a/cad/gwave/PLIST   Thu Nov 15 22:31:19 2007 +0000
+++ b/cad/gwave/PLIST   Thu Nov 15 23:53:48 2007 +0000
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.2 2003/09/12 20:47:12 dmcmahill Exp $
+@comment $NetBSD: PLIST,v 1.3 2007/11/15 23:53:48 dmcmahill Exp $
 bin/gwave
 bin/gwave-exec
 bin/gwaverepl
 bin/sp2sp
+bin/sweepsplit
 man/man1/sp2sp.1
 share/guile/app/gwave/cmds.scm
 share/guile/app/gwave/dynlink.scm
@@ -12,6 +13,7 @@
 share/guile/app/gwave/extra-menus.scm
 share/guile/app/gwave/globals.scm
 share/guile/app/gwave/gtk-helpers.scm
+share/guile/app/gwave/gwave-config.scm
 share/guile/app/gwave/gwave-startup.scm
 share/guile/app/gwave/minimal.scm
 share/guile/app/gwave/std-args.scm
diff -r 1d7ff54d08f7 -r e4a598051c4e cad/gwave/distinfo
--- a/cad/gwave/distinfo        Thu Nov 15 22:31:19 2007 +0000
+++ b/cad/gwave/distinfo        Thu Nov 15 23:53:48 2007 +0000
@@ -1,16 +1,6 @@
-$NetBSD: distinfo,v 1.9 2007/01/23 02:49:23 dmcmahill Exp $
+$NetBSD: distinfo,v 1.10 2007/11/15 23:53:48 dmcmahill Exp $
 
-SHA1 (gwave-20030804.tar.gz) = 22983d0b6b646467eab584a6de0aef86d5148186
-RMD160 (gwave-20030804.tar.gz) = fd772026b1e62b7ddb7fa24e83bc5cb7678dc86d
-Size (gwave-20030804.tar.gz) = 437860 bytes
-SHA1 (patch-aa) = ae837194a751eb25bbda4dee551d1d57ec696d24
-SHA1 (patch-ab) = cedd28158b2a467c93536ddd5a39dec8dd7d7c64
-SHA1 (patch-ac) = 7f535a13925577fa6a3acda2a1ab61eda4a2aad2
-SHA1 (patch-ad) = 2378a782cb99a2aebed0e058a88b4343604f38e8
-SHA1 (patch-ae) = a3e192f11a6bc8529a9c36f165f29d8944c9930c
-SHA1 (patch-af) = 8c3a5811711e521df2835208f7f1d4f421579cd1
-SHA1 (patch-ag) = b112064e3abdee36c66df027412580e18f90f686
-SHA1 (patch-ah) = 1f66028878250d183d532c36a1602b44f2d6d476
-SHA1 (patch-ai) = 4d785aa7dc9b5831b7f3c699cc61f7ecedb37374
-SHA1 (patch-aj) = 9783b900e9bbdefef97616109cde1dcac9e45a7a
-SHA1 (patch-ak) = 1fb4e1cfb7a9e687b7f76c6479f7857d0c0944c8
+SHA1 (gwave-20060606.tar.gz) = e335822815ec7580b1e66ac253fe438ef439dfbe
+RMD160 (gwave-20060606.tar.gz) = 67c6e9bb5a001352f627662bd6eb225a78d028e8
+Size (gwave-20060606.tar.gz) = 490107 bytes
+SHA1 (patch-aa) = 2125f457fccd9f57f700a46852393ae0688be71d
diff -r 1d7ff54d08f7 -r e4a598051c4e cad/gwave/patches/patch-aa
--- a/cad/gwave/patches/patch-aa        Thu Nov 15 22:31:19 2007 +0000
+++ b/cad/gwave/patches/patch-aa        Thu Nov 15 23:53:48 2007 +0000
@@ -1,102 +1,19 @@
-$NetBSD: patch-aa,v 1.4 2003/11/05 22:31:43 dmcmahill Exp $
+$NetBSD: patch-aa,v 1.5 2007/11/15 23:53:48 dmcmahill Exp $
+
+- fix __inline__ which sunpro doesn't like
 
---- src/gwave.c.orig   2003-08-04 23:43:45.000000000 -0400
-+++ src/gwave.c
-@@ -74,30 +74,30 @@ GtkWidget *win_xlabel_left, *win_xlabel_
- /* variables accessible from C and guile */
- 
- XSCM_VCELL_INIT(scm_gwave_version, "gwave-version-string",  gh_str02scm(VERSION),
--"This variable is initialized to contain the version string for gwave, as
--set in configure.in.");
-+"This variable is initialized to contain the version string for gwave, as"
-+"set in configure.in.");
- 
- XSCM_VCELL_INIT(scm_gwave_datadir, "gwave-datadir",  gh_str02scm(DATADIR),
--"This variable is initialized to contain the compiled-in pathname to
--the installed data directory, typicaly PREFIX/share, as set by configure.
--It is used by the startup code as a default location for finding gwave's
--guile modules.");
-+"This variable is initialized to contain the compiled-in pathname to"
-+"the installed data directory, typicaly PREFIX/share, as set by configure."
-+"It is used by the startup code as a default location for finding gwave's"
-+"guile modules.");
- 
- XSCM_VCELL_INIT(scm_gwave_bingwave, "gwave-bin-gwave-path", gh_str02scm(BINGWAVE),
--"This variable is initialized to contain the compiled-in pathname to
--the installed gwave executable, typicaly PREFIX/bin/gwave, as set by configure.
--It is used by the procedures that write out gwave configuration-restoring
--scripts so that when run from the command line command line, the scripts
--can use gwave as their interpreter.");
-+"This variable is initialized to contain the compiled-in pathname to"
-+"the installed gwave executable, typicaly PREFIX/bin/gwave, as set by configure."
-+"It is used by the procedures that write out gwave configuration-restoring"
-+"scripts so that when run from the command line command line, the scripts"
-+"can use gwave as their interpreter.");
- 
- XSCM_VCELL(scm_gwave_debug, "gwave-debug",
--"This variable is set to #t very early in gwave's startup when the -x flag
--is passed on the command line.  It enables debugging output to stdout
--in the startup code and in various modules.");
-+"This variable is set to #t very early in gwave's startup when the -x flag"
-+"is passed on the command line.  It enables debugging output to stdout"
-+"in the startup code and in various modules.");
- 
- XSCM_GLOBAL_VCELL(scm_gwave_tooltips, "gwave-tooltips",
--"This variable is a GtkTooltips object used for controlling all
--of the popup tooltips in the user interface.");
-+"This variable is a GtkTooltips object used for controlling all"
-+"of the popup tooltips in the user interface.");
+--- src/scwm_guile.c.orig      2005-12-23 05:07:36.000000000 +0000
++++ src/scwm_guile.c
+@@ -42,6 +42,12 @@
+ #include "dmalloc.h"
+ #endif
  
- /*
-  * usage -- prints the standard switch info, then exits.
-@@ -124,28 +124,28 @@ static void usage(char *fmt, ...)
- /* if we don't set up some colors, users without a gwave.gtkrc get black
-  * waves on black background
-  */
--static const gchar *gwave_base_gtkrc = "
--style 'wavecolor0' { fg[NORMAL] = {1.0, 0.0, 0.0} }
--style 'wavecolor1' { fg[NORMAL] = {1.0, 1.0, 0.0} }
--style 'wavecolor2' { fg[NORMAL] = {0.0, 1.0, 0.0} }
--style 'wavecolor3' { fg[NORMAL] = {0.4, 0.5, 1.0} }
--style 'wavecolor4' { fg[NORMAL] = {0.0, 1.0, 1.0} }
--style 'wavecolor5' { fg[NORMAL] = {1.0, 0.0, 1.0} }
--widget '*wavecolor0' style 'wavecolor0'
--widget '*wavecolor1' style 'wavecolor1'
--widget '*wavecolor2' style 'wavecolor2'
--widget '*wavecolor3' style 'wavecolor3'
--widget '*wavecolor4' style 'wavecolor4'
--widget '*wavecolor5' style 'wavecolor5'
--style 'cursor0color' { fg[NORMAL] = {1.0, 1.0, 1.0} }
--style 'cursor1color' { fg[NORMAL] = {1.0, 1.0, 0.0} }
--style 'cursorDcolor' { fg[NORMAL] = {00, 1.0, 0.0} }
--widget '*cursor1color' style 'cursor1color'
--widget '*cursor0color' style 'cursor0color'
--widget '*cursorDcolor' style 'cursorDcolor'
--style 'wavebutton' { bg[NORMAL] = { 0.25, 0.25, 0.25 } }
--widget '*wavebutton' style 'wavebutton'
--";
-+static const gchar *gwave_base_gtkrc = ""
-+"style 'wavecolor0' { fg[NORMAL] = {1.0, 0.0, 0.0} }"
-+"style 'wavecolor1' { fg[NORMAL] = {1.0, 1.0, 0.0} }"
-+"style 'wavecolor2' { fg[NORMAL] = {0.0, 1.0, 0.0} }"
-+"style 'wavecolor3' { fg[NORMAL] = {0.4, 0.5, 1.0} }"
-+"style 'wavecolor4' { fg[NORMAL] = {0.0, 1.0, 1.0} }"
-+"style 'wavecolor5' { fg[NORMAL] = {1.0, 0.0, 1.0} }"
-+"widget '*wavecolor0' style 'wavecolor0'"
-+"widget '*wavecolor1' style 'wavecolor1'"
-+"widget '*wavecolor2' style 'wavecolor2'"
-+"widget '*wavecolor3' style 'wavecolor3'"
-+"widget '*wavecolor4' style 'wavecolor4'"
-+"widget '*wavecolor5' style 'wavecolor5'"
-+"style 'cursor0color' { fg[NORMAL] = {1.0, 1.0, 1.0} }"
-+"style 'cursor1color' { fg[NORMAL] = {1.0, 1.0, 0.0} }"
-+"style 'cursorDcolor' { fg[NORMAL] = {00, 1.0, 0.0} }"
-+"widget '*cursor1color' style 'cursor1color'"
-+"widget '*cursor0color' style 'cursor0color'"
-+"widget '*cursorDcolor' style 'cursorDcolor'"
-+"style 'wavebutton' { bg[NORMAL] = { 0.25, 0.25, 0.25 } }"
-+"widget '*wavebutton' style 'wavebutton'"
-+"";
++#ifndef __GNUC__
++#ifndef __inline__
++#define __inline__ 
++#endif
++#endif
++
+ extern char *prog_name;
  
- int
- main(int argc, char **argv)
+ XSCM_HOOK(error_hook, "error-hook", 5, (SCM a, SCM b, SCM c, SCM d, SCM e),
diff -r 1d7ff54d08f7 -r e4a598051c4e cad/gwave/patches/patch-ab
--- a/cad/gwave/patches/patch-ab        Thu Nov 15 22:31:19 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2003/11/05 22:31:43 dmcmahill Exp $
-
---- src/cmd.c.orig     2003-02-12 22:54:17.000000000 -0500
-+++ src/cmd.c
-@@ -42,9 +42,9 @@
- #include <measurebtn.h>
- 
- XSCM_HOOK(new_visiblewave_hook, "new-visiblewave-hook", 1, (SCM vw),
--"This hook is invoked with one VisibleWave argument, VW,
--when the VisibleWave is first created.   The main purpose of this hook 
--will be to create the button and menus attached to the VisibleWave.");
-+"This hook is invoked with one VisibleWave argument, VW,"
-+"when the VisibleWave is first created.   The main purpose of this hook "
-+"will be to create the button and menus attached to the VisibleWave.");
- 
- /* reset the x zoom scale of all panels */
- gint cmd_zoom_absolute(double start, double end)
-@@ -131,8 +131,8 @@ vw_wp_list_if_selected(gpointer p, gpoin
- }
- 
- XSCM_DEFINE(delete_selected_waves_x, "delete-selected-waves!", 0, 0, 0, (),
--  "Remove from panels any VisibleWaves that have been
--selected by clicking on their label-buttons.")
-+  "Remove from panels any VisibleWaves that have been"
-+"selected by clicking on their label-buttons.")
- #define FUNC_NAME s_delete_selected_waves_x
- {
-       int i;
-@@ -612,9 +612,9 @@ XSCM_DEFINE(visiblewave_panel, "visiblew
- #undef FUNC_NAME
- 
- XSCM_DEFINE(visiblewave_button, "visiblewave-button", 1, 0, 0, (SCM vw),
--"Given a VisibleWave VW, return the Gtk button associated with the
--wave.  Since the button already has a label, all you can do is
--add events to the button.")
-+"Given a VisibleWave VW, return the Gtk button associated with the"
-+"wave.  Since the button already has a label, all you can do is"
-+"add events to the button.")
- #define FUNC_NAME s_visiblewave_button
- {
-       VisibleWave *cvw;
-@@ -701,8 +701,8 @@ XSCM_DEFINE(set_visiblewave_color_x, "se
- 
- XSCM_DEFINE(set_visiblewave_measure_x, "set-visiblewave-measure!", 3, 0, 0, 
-          (SCM vw, SCM n, SCM func),
-- "Change the measurement box numbered N (0 or 1) of displayed waveform
-- VW to display the result of the measurement function FUNC")
-+ "Change the measurement box numbered N (0 or 1) of displayed waveform"
-+ "VW to display the result of the measurement function FUNC")
- #define FUNC_NAME s_set_visiblewave_measure_x
- {
-       VisibleWave *cvw;
diff -r 1d7ff54d08f7 -r e4a598051c4e cad/gwave/patches/patch-ac
--- a/cad/gwave/patches/patch-ac        Thu Nov 15 22:31:19 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,67 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2003/11/05 22:31:43 dmcmahill Exp $
-
---- src/wavewin.c.orig 2002-03-27 23:10:01.000000000 -0500
-+++ src/wavewin.c
-@@ -50,10 +50,10 @@
- #define WAVEPANEL_JGE_HEIGHT 25
- 
- XSCM_HOOK(new_wavewin_hook,"new-wavewin-hook", 0, (),
--"This hook is invoked with no arguments when the main waveform
--window is first created.
--The main purpose of this hook is to allow creation of the 
--contents of the menubar and toolbar.");
-+"This hook is invoked with no arguments when the main waveform"
-+"window is first created."
-+"The main purpose of this hook is to allow creation of the"
-+"contents of the menubar and toolbar.");
- 
- SCM wavepanel_mouse_binding[6];
- 
-@@ -99,8 +99,8 @@ GtkWidget *create_xlabel_hbox(WaveTable 
- /* global wtable: GtkTable widget for the main window. */
- 
- XSCM_DEFINE(wtable_start_xval, "wtable-start-xval", 0, 0, 0, (),
--"Return the X coordinate represented by the left edge of the
--displayed portion of the waveforms")
-+"Return the X coordinate represented by the left edge of the"
-+"displayed portion of the waveforms")
- #define FUNC_NAME s_wtable_start_xval
- {
-       return gh_double2scm(wtable->start_xval);
-@@ -108,8 +108,8 @@ displayed portion of the waveforms")
- #undef FUNC_NAME
- 
- XSCM_DEFINE(wtable_end_xval, "wtable-end-xval", 0, 0, 0, (),
--"Return the X coordinate represented by the right edge of the
--displayed portion of the waveforms")
-+"Return the X coordinate represented by the right edge of the"
-+"displayed portion of the waveforms")
- #define FUNC_NAME s_wtable_end_xval
- {
-       return gh_double2scm(wtable->end_xval);
-@@ -271,8 +271,8 @@ XSCM_DEFINE(get_wavewin, "get-wavewin", 
- #undef FUNC_NAME
- 
- XSCM_DEFINE(get_wavewin_toolbar, "get-wavewin-toolbar", 0, 0, 0, (),
--"Return the GtkHBox object for horizontal box to contain
--function buttons or icons in the main waveform window")
-+"Return the GtkHBox object for horizontal box to contain"
-+"function buttons or icons in the main waveform window")
- #define FUNC_NAME s_get_wavewin_toolbar
- {
-       return sgtk_wrap_gtkobj(GTK_OBJECT(win_main_toolbar));
-@@ -482,10 +482,10 @@ wavewin_delete_panel(WavePanel *dwp)