From 83b57495aeac916fa3e367e1b8c1e738049e9611 Mon Sep 17 00:00:00 2001 From: cube Date: Mon, 22 Aug 2005 12:25:00 +0000 Subject: Update to 2.0.0pre5. No ChangeLog available, unfortunately. --- cad/gtkwave/Makefile | 11 ++++------- cad/gtkwave/PLIST | 34 +++++++++++++++++++++------------- cad/gtkwave/distinfo | 13 ++++++------- cad/gtkwave/patches/patch-aa | 18 +++++++++--------- cad/gtkwave/patches/patch-ab | 10 +++++----- cad/gtkwave/patches/patch-ac | 12 ------------ 6 files changed, 45 insertions(+), 53 deletions(-) delete mode 100644 cad/gtkwave/patches/patch-ac (limited to 'cad') diff --git a/cad/gtkwave/Makefile b/cad/gtkwave/Makefile index 9569a9bfa66..fb72512575f 100644 --- a/cad/gtkwave/Makefile +++ b/cad/gtkwave/Makefile @@ -1,13 +1,10 @@ -# $NetBSD: Makefile,v 1.11 2005/06/01 18:02:40 jlam Exp $ +# $NetBSD: Makefile,v 1.12 2005/08/22 12:25:00 cube Exp $ # -#DISTNAME= gtkwave-2.0.0pre3 -DISTNAME= gtkwave-2.0.0pre3-20030319 -PKGNAME= gtkwave-2.0.0pre3.20030319 -PKGREVISION= 3 +DISTNAME= gtkwave-2.0.0pre5 +PKGNAME= gtkwave-2.0.0pre5 CATEGORIES= cad -#MASTER_SITES= ftp://ftp.cs.man.ac.uk/pub/amulet/gtkwave/2.0/ -MASTER_SITES= ftp://ftp.cs.man.ac.uk/pub/amulet/gtkwave/snapshots/ +MASTER_SITES= ftp://ftp.cs.man.ac.uk/pub/amulet/gtkwave/2.0/ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.cs.man.ac.uk/apt/tools/gtkwave/index.html diff --git a/cad/gtkwave/PLIST b/cad/gtkwave/PLIST index e9f20a08942..3b294ba8665 100644 --- a/cad/gtkwave/PLIST +++ b/cad/gtkwave/PLIST @@ -1,30 +1,38 @@ -@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:19 jlam Exp $ -bin/vcd2lxt +@comment $NetBSD: PLIST,v 1.3 2005/08/22 12:25:00 cube Exp $ bin/gtkwave +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_redo.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/stock_open_16.xpm -share/gtkwave/pixmaps/stock_redo_16.xpm -share/gtkwave/pixmaps/stock_cut.xpm -share/gtkwave/pixmaps/stock_paste.xpm -share/gtkwave/pixmaps/add_signals.xpm -share/gtkwave/pixmaps/insert_trace.xpm -share/gtkwave/pixmaps/next_page.xpm -share/gtkwave/pixmaps/prev_page.xpm -share/gtkwave/pixmaps/vcd_mime.xpm share/gtkwave/pixmaps/time_16.xpm -share/gtkwave/pixmaps/menu_16.xpm +share/gtkwave/pixmaps/vcd_mime.xpm +share/gtkwave/pixmaps/wave_alert.xpm @dirrm share/gtkwave/pixmaps @dirrm share/gtkwave @dirrm lib/gtkwave +@dirrm include/gtkwave/format +@dirrm include/gtkwave diff --git a/cad/gtkwave/distinfo b/cad/gtkwave/distinfo index 7992fc3fc7f..344abef9853 100644 --- a/cad/gtkwave/distinfo +++ b/cad/gtkwave/distinfo @@ -1,8 +1,7 @@ -$NetBSD: distinfo,v 1.3 2005/02/23 14:59:24 agc Exp $ +$NetBSD: distinfo,v 1.4 2005/08/22 12:25:00 cube Exp $ -SHA1 (gtkwave-2.0.0pre3-20030319.tar.gz) = 1eed6d1fba08ab5f92df0ba3b67c44fd252661f1 -RMD160 (gtkwave-2.0.0pre3-20030319.tar.gz) = 79d59ff1e6e881375c1a22f4ba816ef7946e741a -Size (gtkwave-2.0.0pre3-20030319.tar.gz) = 706605 bytes -SHA1 (patch-aa) = 1257d680ff1c6d4c0370261cdd025e9a00ab9a3a -SHA1 (patch-ab) = a7c78e231235c1c528019c6fd36e5737cf1735bc -SHA1 (patch-ac) = 4140c2c0204836147122b1c1051e5f68b0a1bf1d +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 diff --git a/cad/gtkwave/patches/patch-aa b/cad/gtkwave/patches/patch-aa index 6652135f847..63a8ed0168e 100644 --- a/cad/gtkwave/patches/patch-aa +++ b/cad/gtkwave/patches/patch-aa @@ -1,13 +1,13 @@ -$NetBSD: patch-aa,v 1.2 2003/07/15 12:32:59 drochner Exp $ +$NetBSD: patch-aa,v 1.3 2005/08/22 12:25:01 cube Exp $ ---- src/Makefile.in.orig 2003-03-19 14:07:27.000000000 +0100 -+++ src/Makefile.in 2003-07-14 17:24:23.000000000 +0200 -@@ -194,7 +194,7 @@ - tracefile.$(OBJEXT) tracewindow.$(OBJEXT) +--- 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 + gtkwave_DEPENDENCIES = config/libwaveconfig.a format/libformat.la -gtkwave_LDFLAGS = +gtkwave_LDFLAGS = -export-dynamic - - DEFS = @DEFS@ - DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) + 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 index f37783e51b4..71846c14558 100644 --- a/cad/gtkwave/patches/patch-ab +++ b/cad/gtkwave/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.1 2003/07/15 12:32:59 drochner Exp $ +$NetBSD: patch-ab,v 1.2 2005/08/22 12:25:01 cube Exp $ ---- src/utils.c.orig 2003-07-14 21:12:05.000000000 +0200 -+++ src/utils.c 2003-07-14 21:12:57.000000000 +0200 -@@ -186,7 +186,7 @@ +--- 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 @@ -10,4 +10,4 @@ $NetBSD: patch-ab,v 1.1 2003/07/15 12:32:59 drochner Exp $ +#define HISTENT_GRANULARITY ((64*1024)/sizeof(HistEnt)) #endif - HistEnt *histent_calloc (void) + 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 f2856122080..00000000000 --- a/cad/gtkwave/patches/patch-ac +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ac,v 1.1 2003/07/15 12:32:59 drochner Exp $ - ---- src/vcd.c.orig 2003-07-15 14:04:59.000000000 +0200 -+++ src/vcd.c 2003-07-15 14:16:09.000000000 +0200 -@@ -2174,6 +2174,7 @@ - filecachesize = 0; - - val_size = fsize - off; /* get size of file and amount of reads */ -+ wave_flags.load_whole_file = TRUE; /* XXX hack - partial reading does not work */ - if (val_size < 10485760 || wave_flags.load_whole_file) /* Create Something in here for files that are not split */ - { - wave_flags.load_whole_file = TRUE; -- cgit v1.2.3