Update to gtkwave-3.1.1. The old 2.* branch is no longer being maintained.

There are a large number of changes in this update.  Many bugs have been fixed,
VCD writing has been improved, the build system has migrated to a fully
autoconf/automake system from a partial gnu system.

The code written as part of the 2007 Google summer of code has been incorporated
which allows waveform reloading and provides the framework for further enhancements.

For the complete set of changes, see CHANGELOG.TXT in the distribution file.

13 files changed, 51 insertions, 214 deletions

diff --git a/cad/gtkwave/Makefile b/cad/gtkwave/Makefile
index fbd579f72a4..aa69dae5364 100644
--- a/cad/gtkwave/Makefile
+++ b/cad/gtkwave/Makefile
@@ -1,21 +1,21 @@
-# $NetBSD: Makefile,v 1.16 2006/10/04 20:47:44 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2007/09/23 13:22:45 dmcmahill Exp $
 #
 
-DISTNAME=		gtkwave-2.0.0pre5
-PKGREVISION=		1
+DISTNAME=		gtkwave-3.1.1
 CATEGORIES=		cad
-MASTER_SITES=		ftp://ftp.cs.man.ac.uk/pub/amulet/gtkwave/2.0/
+MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=gtkwave/}
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://www.cs.manchester.ac.uk/apt/projects/tools/gtkwave/
+HOMEPAGE=		http://home.nc.rr.com/gtkwave/
 COMMENT=		Electronic waveform viewer
 
-USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
+USE_TOOLS+=		gmake pkg-config
 
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../devel/glib/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
-.include "../../x11/gtk/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/gtkwave/PLIST b/cad/gtkwave/PLIST
index 3b294ba8665..c3ae7810335 100644
--- a/cad/gtkwave/PLIST
+++ b/cad/gtkwave/PLIST
@@ -1,38 +1,43 @@
-@comment $NetBSD: PLIST,v 1.3 2005/08/22 12:25:00 cube Exp $
+@comment $NetBSD: PLIST,v 1.4 2007/09/23 13:22:45 dmcmahill Exp $
+bin/ghwdump
 bin/gtkwave
+bin/lxt2miner
+bin/lxt2vcd
+bin/mvl2lxt
+bin/mvl2vcd
+bin/rtlbrowse
+bin/shmidcat
+bin/tex2vcd
+bin/tla2vcd
+bin/twinwave
 bin/vcd2lxt
-include/gtkwave/format/data.h
-include/gtkwave/format/dictionary.h
-include/gtkwave/format/external.h
-include/gtkwave/format/format.h
-lib/gtkwave/libformat.la
-lib/gtkwave/reader_hhh.la
-lib/gtkwave/reader_lxt.la
-lib/gtkwave/reader_out.la
-lib/gtkwave/reader_vcd.la
-share/gtkwave/pixmaps/insert_trace.xpm
-share/gtkwave/pixmaps/menu_16.xpm
-share/gtkwave/pixmaps/next_page.xpm
-share/gtkwave/pixmaps/prev_page.xpm
-share/gtkwave/pixmaps/stock_cut.xpm
-share/gtkwave/pixmaps/stock_first.xpm
-share/gtkwave/pixmaps/stock_last.xpm
-share/gtkwave/pixmaps/stock_left.xpm
-share/gtkwave/pixmaps/stock_open_16.xpm
-share/gtkwave/pixmaps/stock_paste.xpm
-share/gtkwave/pixmaps/stock_redo_16.xpm
-share/gtkwave/pixmaps/stock_redo.xpm
-share/gtkwave/pixmaps/stock_right.xpm
-share/gtkwave/pixmaps/stock_undo.xpm
-share/gtkwave/pixmaps/stock_zoom_1.xpm
-share/gtkwave/pixmaps/stock_zoom_fit.xpm
-share/gtkwave/pixmaps/stock_zoom_in.xpm
-share/gtkwave/pixmaps/stock_zoom_out.xpm
-share/gtkwave/pixmaps/time_16.xpm
-share/gtkwave/pixmaps/vcd_mime.xpm
-share/gtkwave/pixmaps/wave_alert.xpm
-@dirrm share/gtkwave/pixmaps
+bin/vcd2lxt2
+bin/vcd2vzt
+bin/vermin
+bin/vzt2vcd
+bin/vztminer
+man/man1/ghwdump.1
+man/man1/gtkwave.1
+man/man1/lxt2miner.1
+man/man1/lxt2vcd.1
+man/man1/mvl2lxt.1
+man/man1/mvl2vcd.1
+man/man1/rtlbrowse.1
+man/man1/shmidcat.1
+man/man1/tex2vcd.1
+man/man1/tla2vcd.1
+man/man1/twinwave.1
+man/man1/vcd2lxt.1
+man/man1/vcd2lxt2.1
+man/man1/vcd2vzt.1
+man/man1/vermin.1
+man/man1/vzt2vcd.1
+man/man1/vztminer.1
+man/man5/gtkwaverc.5
+share/gtkwave/examples/des.sav
+share/gtkwave/examples/des.script
+share/gtkwave/examples/des.v
+share/gtkwave/examples/des.vzt
+share/gtkwave/gtkwave.odt
+@dirrm share/gtkwave/examples
 @dirrm share/gtkwave
-@dirrm lib/gtkwave
-@dirrm include/gtkwave/format
-@dirrm include/gtkwave
diff --git a/cad/gtkwave/distinfo b/cad/gtkwave/distinfo
index 8792e9a0ac4..5aed3ef8cdc 100644
--- a/cad/gtkwave/distinfo
+++ b/cad/gtkwave/distinfo
@@ -1,15 +1,5 @@
-$NetBSD: distinfo,v 1.6 2006/10/15 13:29:08 agc Exp $
+$NetBSD: distinfo,v 1.7 2007/09/23 13:22:45 dmcmahill Exp $
 
-SHA1 (gtkwave-2.0.0pre5.tar.gz) = 03ad81b6c196f01fe9c0d93755965f5a91b7043d
-RMD160 (gtkwave-2.0.0pre5.tar.gz) = bf70e21895ec6d7ce081a98d09f72b3b70ff9446
-Size (gtkwave-2.0.0pre5.tar.gz) = 720414 bytes
-SHA1 (patch-aa) = 8daee531dc540a8fa76b8dedb6f23edf883b7dd2
-SHA1 (patch-ab) = 28e9c5ace91f99335097df4f901ab90c73f196d7
-SHA1 (patch-ac) = 1be7a41e8918281e8129b461fb0b253985333de8
-SHA1 (patch-ad) = 3b583846580361fe7c89f94b15f6c1bf7a7c62e2
-SHA1 (patch-ae) = dcba5cd4d607365d43e03ee4f385287987ce52ce
-SHA1 (patch-af) = f423597f6948547886162a686667e43e52c8e3d2
-SHA1 (patch-ag) = 30e6bc918f13977535fb3223e034b40588ce10f0
-SHA1 (patch-ah) = 4f85b76dc937cbda1e41f801ebe9fbaac15c9f70
-SHA1 (patch-ai) = c747757290e55fe4d51bcb38bc794acd22c4ea99
-SHA1 (patch-aj) = 95f51301fcd9198344700dcd89396c8f3e73b50e
+SHA1 (gtkwave-3.1.1.tar.gz) = badbc85ff3b4a74a79180f6610205b8f0cafbc12
+RMD160 (gtkwave-3.1.1.tar.gz) = cb8fcc31d5bcfc0bf700a62f72f1376fa66c349e
+Size (gtkwave-3.1.1.tar.gz) = 2736384 bytes
diff --git a/cad/gtkwave/patches/patch-aa b/cad/gtkwave/patches/patch-aa
deleted file mode 100644
index 63a8ed0168e..00000000000
--- a/cad/gtkwave/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2005/08/22 12:25:01 cube Exp $
-
---- src/Makefile.in.orig	2004-05-27 15:40:48.000000000 +0200
-+++ src/Makefile.in
-@@ -218,7 +218,7 @@ am_gtkwave_OBJECTS = addtrace.$(OBJEXT) 
- 	event.$(OBJEXT) utils.$(OBJEXT) view.$(OBJEXT)
- gtkwave_OBJECTS = $(am_gtkwave_OBJECTS)
- gtkwave_DEPENDENCIES = config/libwaveconfig.a format/libformat.la
--gtkwave_LDFLAGS =
-+gtkwave_LDFLAGS = -export-dynamic
- am_talk_OBJECTS = talk.$(OBJEXT) error.$(OBJEXT) fileio.$(OBJEXT) \
- 	str.$(OBJEXT)
- talk_OBJECTS = $(am_talk_OBJECTS)
diff --git a/cad/gtkwave/patches/patch-ab b/cad/gtkwave/patches/patch-ab
deleted file mode 100644
index 71846c14558..00000000000
--- a/cad/gtkwave/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2005/08/22 12:25:01 cube Exp $
-
---- src/event.c.orig	2003-11-07 10:56:33.000000000 +0100
-+++ src/event.c
-@@ -249,7 +249,7 @@ void wave_event_position_free (WaveEvent
-  * freed so this is OK...
-  */
- #ifndef HISTENT_GRANULARITY
--#define HISTENT_GRANULARITY 100
-+#define HISTENT_GRANULARITY ((64*1024)/sizeof(HistEnt))
- #endif
- 
- HistEnt *wave_new_hist_ent_raw (void)
diff --git a/cad/gtkwave/patches/patch-ac b/cad/gtkwave/patches/patch-ac
deleted file mode 100644
index 9c4a099bf60..00000000000
--- a/cad/gtkwave/patches/patch-ac
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2005/10/28 03:53:34 itohy Exp $
-
---- src/format/data.h.orig	Sun Sep 28 05:31:46 2003
-+++ src/format/data.h	Fri Oct 28 11:17:57 2005
-@@ -50,7 +50,11 @@
- typedef struct
- {
- 	unsigned wordCount;
--	unsigned words[]; /* Alloc more here to size `wordCount' */
-+	unsigned words[
-+#if defined(__GNUC__) && __GNUC__ <= 2
-+		0
-+#endif
-+	]; /* Alloc more here to size `wordCount' */
- }
- FormatData;
- 
diff --git a/cad/gtkwave/patches/patch-ad b/cad/gtkwave/patches/patch-ad
deleted file mode 100644
index a33e490ea73..00000000000
--- a/cad/gtkwave/patches/patch-ad
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2005/10/28 03:53:34 itohy Exp $
-
---- src/format/data.c.orig	Fri Apr  2 11:36:14 2004
-+++ src/format/data.c	Fri Oct 28 11:19:18 2005
-@@ -595,6 +595,7 @@ bool FormatDataEqual (FormatData *data1,
- 	unsigned *longData;
- 	unsigned shortLength;
- 	unsigned longLength;
-+	int i = 0;
- 
- 	/* Sort the short and long data out, then compare upto the length of the
- 		short data, then check the remainder of the long word to make sure it's 0 */
-@@ -610,8 +611,6 @@ bool FormatDataEqual (FormatData *data1,
- 		shortLength = data2->wordCount;
- 		longLength = data1->wordCount;
- 	}
--	
--	int i = 0;
- 
- 	while (i < shortLength && equal)
- 	{
diff --git a/cad/gtkwave/patches/patch-ae b/cad/gtkwave/patches/patch-ae
deleted file mode 100644
index b7f14a8a7ab..00000000000
--- a/cad/gtkwave/patches/patch-ae
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2005/10/28 03:53:34 itohy Exp $
-
---- src/format/external.c.orig	Sun Nov 23 06:17:29 2003
-+++ src/format/external.c	Fri Oct 28 11:21:00 2005
-@@ -518,8 +518,9 @@ Format FormatListExternalToInternal (con
- 							/* Now expecting `"name" value' */
- 							if (*stringPtr == '\"')
- 							{
-+								char *endQuote;
- 								stringPtr ++;
--								char *endQuote = strchr (stringPtr, '\"');
-+								endQuote = strchr (stringPtr, '\"');
- 
- 								if (endQuote)
- 								{
diff --git a/cad/gtkwave/patches/patch-af b/cad/gtkwave/patches/patch-af
deleted file mode 100644
index ce3eb1784da..00000000000
--- a/cad/gtkwave/patches/patch-af
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-af,v 1.1 2005/10/28 03:53:34 itohy Exp $
-
---- src/hhh.c.orig	Mon May 17 10:32:29 2004
-+++ src/hhh.c	Fri Oct 28 11:22:34 2005
-@@ -647,12 +647,13 @@ static TimeType hhh_load_declarations (W
- 
- Node *hhh_signal_key_find (WaveReader *reader ,const char *key)
- {
-+  Node *node;
-   int channel_num = atoi (key);
- 
-   if (channel_num <= 0 || channel_num > HHH_PRIVATE (reader, nodes_allocated_size))
-     return NULL;
- 
--  Node *node = HHH_PRIVATE (reader, nodes)[channel_num - 1];
-+  node = HHH_PRIVATE (reader, nodes)[channel_num - 1];
- 
-   return node;
- }
diff --git a/cad/gtkwave/patches/patch-ag b/cad/gtkwave/patches/patch-ag
deleted file mode 100644
index 14d7a08d223..00000000000
--- a/cad/gtkwave/patches/patch-ag
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2005/10/28 03:53:34 itohy Exp $
-
---- src/tracepane.c.orig	Mon Apr 26 04:23:42 2004
-+++ src/tracepane.c	Fri Oct 28 12:26:37 2005
-@@ -750,6 +750,7 @@ static void draw_event_trace (WaveDrawin
-     TimeType tim;
-     int height = 1 + add_extensions (t, which) - which;
- 	int top, bottom;
-+	TimeType last_time;
- 
- 	wave_drawing_context_set_trace (context, t);
- 
-@@ -781,7 +782,7 @@ static void draw_event_trace (WaveDrawin
-     ytext = yu + (wavefont->ascent / 2);
- 
-     do_horizontal_grid_line (context, bottom - 2, window);
--	TimeType last_time = -1;
-+	last_time = -1;
- 
- 	/* No events? don't bother to show anything */
- 	if (! event_iter->current)
diff --git a/cad/gtkwave/patches/patch-ah b/cad/gtkwave/patches/patch-ah
deleted file mode 100644
index d248c34f103..00000000000
--- a/cad/gtkwave/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2006/10/15 13:29:08 agc Exp $
-
---- src/currenttime.h.orig	2003-11-11 23:53:27.000000000 +0100
-+++ src/currenttime.h	2006-10-15 14:42:19.000000000 +0200
-@@ -51,8 +51,6 @@
- 
- extern BlackoutRegion *blackout_regions;
- 
--extern gdouble page_divisor;    /* allows fractional page scrolls */
--
- extern int font_height_override; /* force fontheight to be larger */
- 
- extern char *fontname_signals, *fontname_waves;
diff --git a/cad/gtkwave/patches/patch-ai b/cad/gtkwave/patches/patch-ai
deleted file mode 100644
index 36e17b210af..00000000000
--- a/cad/gtkwave/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2006/10/15 13:29:08 agc Exp $
-
---- src/navigate.c.orig	2004-04-25 21:23:42.000000000 +0200
-+++ src/navigate.c	2006-10-15 14:43:01.000000000 +0200
-@@ -41,7 +41,7 @@
- 
- static TimeType step_length = 0;
- 
--static gdouble page_divisor = (gdouble) 1.0;
-+static gdouble page_divisor = (gdouble) 1.0; /* allows fractional page scrolls */
- 
- /* wave_calculate_zoom_for_span : calculate the zoom factor to show the span of
- 	time from `from' to `to'. */
diff --git a/cad/gtkwave/patches/patch-aj b/cad/gtkwave/patches/patch-aj
deleted file mode 100644
index b0d2ab30cda..00000000000
--- a/cad/gtkwave/patches/patch-aj
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2006/10/15 13:29:08 agc Exp $
-
---- src/draw.h.orig	2003-11-09 23:21:33.000000000 +0100
-+++ src/draw.h	2006-10-15 14:43:16.000000000 +0200
-@@ -32,8 +32,6 @@
- #include "event.h"
- #include "view.h"
- 
--extern GdkPixmap *wavepixmap;
--
- /* Destination device for drawing.  Used as indices into wave_drawing_functions */
- typedef enum
- {