[pkgsrc/trunk]: pkgsrc/cad/gwave - gcc3-ify (multi-line strings)

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/07c17645bacf
branches:  trunk
changeset: 463321:07c17645bacf
user:      dmcmahill <dmcmahill%pkgsrc.org@localhost>
date:      Wed Nov 05 22:31:43 2003 +0000

description:
- gcc3-ify (multi-line strings)
- be explicit about the location of graph (from plotutils) to help systems
  which have a graph program that doesn't work here.

diffstat:

 cad/gwave/Makefile         |    9 ++-
 cad/gwave/distinfo         |   13 ++++-
 cad/gwave/patches/patch-aa |  102 ++++++++++++++++++++++++++++++++++
 cad/gwave/patches/patch-ab |   52 +++++++++++++++++
 cad/gwave/patches/patch-ac |   67 ++++++++++++++++++++++
 cad/gwave/patches/patch-ad |   90 ++++++++++++++++++++++++++++++
 cad/gwave/patches/patch-ae |   59 +++++++++++++++++++
 cad/gwave/patches/patch-af |   55 ++++++++++++++++++
 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 ++++++
 13 files changed, 658 insertions(+), 2 deletions(-)

diffs (truncated from 725 to 300 lines):

diff -r f80e7c373035 -r 07c17645bacf cad/gwave/Makefile
--- a/cad/gwave/Makefile        Wed Nov 05 22:11:58 2003 +0000
+++ b/cad/gwave/Makefile        Wed Nov 05 22:31:43 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2003/09/12 20:47:11 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.18 2003/11/05 22:31:43 dmcmahill Exp $
 #
 
 DISTNAME=      gwave-20030804
@@ -12,6 +12,13 @@
 USE_BUILDLINK2=        YES
 GNU_CONFIGURE= YES
 
+EVAL_PREFIX+=  GRAPHDIR=plotutils
+CONFIGURE_ENV+=        GRAPH=${GRAPHDIR}/bin/graph
+
+# make this file get rebuilt in a way that gcc3 can deal with
+post-extract:
+       ${RM} ${WRKSRC}/src/init_scheme_string.c
+
 .include "../../devel/guile-gtk/buildlink2.mk"
 .include "../../graphics/plotutils/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r f80e7c373035 -r 07c17645bacf cad/gwave/distinfo
--- a/cad/gwave/distinfo        Wed Nov 05 22:11:58 2003 +0000
+++ b/cad/gwave/distinfo        Wed Nov 05 22:31:43 2003 +0000
@@ -1,4 +1,15 @@
-$NetBSD: distinfo,v 1.5 2003/09/12 20:47:12 dmcmahill Exp $
+$NetBSD: distinfo,v 1.6 2003/11/05 22:31:43 dmcmahill Exp $
 
 SHA1 (gwave-20030804.tar.gz) = 22983d0b6b646467eab584a6de0aef86d5148186
 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) = e4023dc78ef7032a127e4d72507ac6f128aa3aec
+SHA1 (patch-af) = bbdc40ac47611fe8ef16c44993b4874eebe2f0cd
+SHA1 (patch-ag) = b112064e3abdee36c66df027412580e18f90f686
+SHA1 (patch-ah) = 1f66028878250d183d532c36a1602b44f2d6d476
+SHA1 (patch-ai) = 4d785aa7dc9b5831b7f3c699cc61f7ecedb37374
+SHA1 (patch-aj) = 9783b900e9bbdefef97616109cde1dcac9e45a7a
+SHA1 (patch-ak) = 1fb4e1cfb7a9e687b7f76c6479f7857d0c0944c8
diff -r f80e7c373035 -r 07c17645bacf cad/gwave/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/cad/gwave/patches/patch-aa        Wed Nov 05 22:31:43 2003 +0000
@@ -0,0 +1,102 @@
+$NetBSD: patch-aa,v 1.4 2003/11/05 22:31:43 dmcmahill Exp $
+
+--- 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.");
+ 
+ /*
+  * 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'"
++"";
+ 
+ int
+ main(int argc, char **argv)
diff -r f80e7c373035 -r 07c17645bacf cad/gwave/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/cad/gwave/patches/patch-ab        Wed Nov 05 22:31:43 2003 +0000
@@ -0,0 +1,52 @@
+$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 f80e7c373035 -r 07c17645bacf cad/gwave/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/cad/gwave/patches/patch-ac        Wed Nov 05 22:31:43 2003 +0000
@@ -0,0 +1,67 @@
+$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)
+ 
+ XSCM_DEFINE(wtable_insert_panel_x, "wtable-insert-panel!", 2, 1, 0, 
+          (SCM wp, SCM minheight, SCM showlabels),
+-"Add a new panel after the existing panel WP, or
+-at the end if WP is #f.
+-The new panel has minimum height MINHEIGHT and has visible y-labels
+-unless SHOWLABELS is #f")
++"Add a new panel after the existing panel WP, or"
++"at the end if WP is #f."
++"The new panel has minimum height MINHEIGHT and has visible y-labels"
++"unless SHOWLABELS is #f")
+ #define FUNC_NAME s_wtable_insert_panel_x
+ {
+       WavePanel *cwp;
diff -r f80e7c373035 -r 07c17645bacf cad/gwave/patches/patch-ad
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/cad/gwave/patches/patch-ad        Wed Nov 05 22:31:43 2003 +0000
@@ -0,0 +1,90 @@
+$NetBSD: patch-ad,v 1.1 2003/11/05 22:31:43 dmcmahill Exp $
+
+--- src/wavelist.c.orig        2003-07-13 19:44:42.000000000 -0400
++++ src/wavelist.c
+@@ -149,15 +149,15 @@ static gint wavelist_button_click(GtkWid
+                                 GdkEventButton *event, gpointer data);
+ 
+ XSCM_HOOK(new_wavefile_hook,"new-wavefile-hook", 1, (SCM DF),
+-"This hook is invoked when a new waveform file is successfully loaded.
+-It is called with the new GWDataFile, DF, as its only argument.");
++"This hook is invoked when a new waveform file is successfully loaded."
++"It is called with the new GWDataFile, DF, as its only argument.");
+ 
+ XSCM_HOOK(new_wavelist_hook,"new-wavelist-hook", 1, (SCM DF),
+-"This hook is invoked when the variable list window for a
+-GWDataFile is created.  The GWDataFile object, DF, is passed as an
+-argument.  Note that variable-list windows can be created and
+-destroyed many times during the life of a GWDataFile.  One of the principle
+-uses of this hook is creating the menus such for the variable-list window.");
++"This hook is invoked when the variable list window for a"