8 files changed, 32 insertions, 49 deletions

diff --git a/cad/gtkwave3/Makefile b/cad/gtkwave3/Makefile
index aa291f51656f..9a3574c4f10b 100644
--- a/cad/gtkwave3/Makefile
+++ b/cad/gtkwave3/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	gtkwave3
-PORTVERSION=	3.2.3
-PORTREVISION=	2
+PORTVERSION=	3.3.18
+PORTREVISION=	0
 CATEGORIES=	cad
 MASTER_SITES=	http://gtkwave.sourceforge.net/
 DISTNAME=	gtkwave-${PORTVERSION}
@@ -22,9 +22,8 @@ USE_GMAKE=	yes
 USE_GNOME=	gtk20
 
 MAN1=	ghwdump.1 gtkwave.1 evcd2vcd.1 fst2vcd.1 lxt2miner.1 \
-	lxt2vcd.1 mvl2lxt.1 mvl2vcd.1 rtlbrowse.1 shmidcat.1 \
-	tex2vcd.1 tla2vcd.1 twinwave.1 vcd2fst.1 vcd2lxt.1 \
-	vcd2lxt2.1 vcd2vzt.1 vermin.1 vzt2vcd.1 vztminer.1
+	lxt2vcd.1 rtlbrowse.1 shmidcat.1 twinwave.1 vcd2fst.1 \
+	vcd2lxt.1 vcd2lxt2.1 vcd2vzt.1 vermin.1 vzt2vcd.1 vztminer.1
 MAN5=	gtkwaverc.5
 
 .include <bsd.port.mk>
diff --git a/cad/gtkwave3/distinfo b/cad/gtkwave3/distinfo
index fd21f54e1dd0..4da277a8f884 100644
--- a/cad/gtkwave3/distinfo
+++ b/cad/gtkwave3/distinfo
@@ -1,3 +1,2 @@
-MD5 (gtkwave-3.2.3.tar.gz) = dcc427903a8f5e958c099f108958dce8
-SHA256 (gtkwave-3.2.3.tar.gz) = 40bb075f89284073cd65c07358ccb70fcff88e2fcac08f01b2cf9ccd0c77a8fa
-SIZE (gtkwave-3.2.3.tar.gz) = 3095929
+SHA256 (gtkwave-3.3.18.tar.gz) = e08bbfc1071028193a33fa53725482cb06c16b0da74cf092afbb27b53f95eead
+SIZE (gtkwave-3.3.18.tar.gz) = 3172987
diff --git a/cad/gtkwave3/files/patch-configure b/cad/gtkwave3/files/patch-configure
index 87c21f9a085f..28c2fe0e87ad 100644
--- a/cad/gtkwave3/files/patch-configure
+++ b/cad/gtkwave3/files/patch-configure
@@ -1,20 +1,20 @@
---- configure.orig	2009-08-26 19:53:11.000000000 +0100
-+++ configure	2009-09-18 14:08:54.000000000 +0100
-@@ -594,7 +594,7 @@
- SHELL=${CONFIG_SHELL-/bin/sh}
+--- configure.orig	2010-12-17 01:29:19.000000000 -0500
++++ configure	2010-12-31 08:06:37.989624430 -0500
+@@ -267,7 +267,7 @@
+ : ${ac_max_here_lines=38}
  
  # Identity of this package.
 -PACKAGE_NAME='gtkwave'
 +PACKAGE_NAME='gtkwave3'
  PACKAGE_TARNAME='gtkwave'
- PACKAGE_VERSION='3.x'
- PACKAGE_STRING='gtkwave 3.x'
-@@ -2219,7 +2219,7 @@
+ PACKAGE_VERSION='3.3.18'
+ PACKAGE_STRING='gtkwave 3.3.18'
+@@ -1664,7 +1664,7 @@
  
  
  # Define the identity of the package.
 - PACKAGE='gtkwave'
 + PACKAGE='gtkwave3'
-  VERSION='3.x'
+  VERSION='3.3.18'
  
  
diff --git a/cad/gtkwave3/files/patch-contrib_rtlbrowse_Makefile.in b/cad/gtkwave3/files/patch-contrib_rtlbrowse_Makefile.in
deleted file mode 100644
index febad4ba0e3c..000000000000
--- a/cad/gtkwave3/files/patch-contrib_rtlbrowse_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- contrib/rtlbrowse/Makefile.in.orig	2009-06-14 02:02:18.000000000 +0400
-+++ contrib/rtlbrowse/Makefile.in	2009-10-14 15:31:44.000000000 +0400
-@@ -186,7 +186,7 @@
- BIGFILES = -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
- LIBFST_CFLAGS = -I../../src/helpers/fst
- LIBLZMA_CFLAGS = -I../../src/liblzma
--LIBLZMA_LDADD = -L../../src/liblzma -llzma
-+LIBLZMA_LDADD = ../../src/liblzma/liblzma.a
- rtlbrowse_SOURCES = definehash.c fgetdynamic.c fgetdynamic.h \
- 	logfile.c splay.c tree_widget.c \
- 	$(srcdir)/../../src/helpers/fst/fastlz.c \
diff --git a/cad/gtkwave3/files/patch-examples__Makefile.in b/cad/gtkwave3/files/patch-examples__Makefile.in
index a20cbaa34910..7cf56c6a13f7 100644
--- a/cad/gtkwave3/files/patch-examples__Makefile.in
+++ b/cad/gtkwave3/files/patch-examples__Makefile.in
@@ -1,11 +1,20 @@
---- examples/Makefile.in.orig	2009-09-18 14:10:15.000000000 +0100
-+++ examples/Makefile.in	2009-09-18 14:10:20.000000000 +0100
-@@ -164,7 +164,7 @@
+--- examples/Makefile.in.orig	2010-12-31 08:31:25.861321395 -0500
++++ examples/Makefile.in	2010-12-31 08:32:32.709703831 -0500
+@@ -17,7 +17,7 @@
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+-pkgdatadir = $(datadir)/@PACKAGE@
++pkgdatadir = $(datadir)
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ..
+@@ -170,7 +170,7 @@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
- dist_examples_DATA = des.sav des.script des.tcl des.v des.vzt
+ dist_examples_DATA = des.sav des.tcl des.v des.vzt transaction.fst transaction.sav transaction.c
 -examplesdir = $(pkgdatadir)/examples
-+examplesdir = $(datadir)/examples/@PACKAGE@
++examplesdir = $(pkgdatadir)/examples/@PACKAGE@
  all: all-am
  
  .SUFFIXES:
diff --git a/cad/gtkwave3/files/patch-src_Makefile.in b/cad/gtkwave3/files/patch-src_Makefile.in
deleted file mode 100644
index c797dc6557d5..000000000000
--- a/cad/gtkwave3/files/patch-src_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Makefile.in.orig	2009-08-26 22:53:17.000000000 +0400
-+++ src/Makefile.in	2009-10-14 15:31:51.000000000 +0400
-@@ -211,7 +211,7 @@
- LIBFST_CFLAGS = -I./helpers/fst
- LIBFST_LDADD = -L./helpers/fst -lfst
- LIBLZMA_CFLAGS = -I./liblzma
--LIBLZMA_LDADD = -L./liblzma -llzma
-+LIBLZMA_LDADD = ./liblzma/liblzma.a
- AM_CFLAGS = -I$(srcdir)/.. -I$(srcdir)/helpers $(GTK_CFLAGS) $(LIBLZMA_CFLAGS) $(LIBZ_CFLAGS) $(LIBBZ2_CFLAGS) $(LIBFST_CFLAGS) $(AET2_CFLAGS) $(TCL_INCLUDE_SPEC) $(TCL_DEFADD) $(EXTLOAD_CFLAGS)
- gtkwave_SOURCES = \
- 	globals.c globals.h ae2.c ae2.h analyzer.c analyzer.h baseconvert.c bitvec.c \
diff --git a/cad/gtkwave3/pkg-descr b/cad/gtkwave3/pkg-descr
index 0d3ca0ee8e67..f08efac53f38 100644
--- a/cad/gtkwave3/pkg-descr
+++ b/cad/gtkwave3/pkg-descr
@@ -2,4 +2,4 @@ GTKWave is a fully featured GTK+ based wave viewer for Unix and
 Win32 which reads LXT, LXT2, VZT, and GHW files as well as standard
 Verilog VCD/EVCD files and allows their viewing.
 
-WWW: http://home.nc.rr.com/gtkwave/
+WWW:	http://gtkwave.sourceforge.net/
diff --git a/cad/gtkwave3/pkg-plist b/cad/gtkwave3/pkg-plist
index eabec8186093..207f25db19f4 100644
--- a/cad/gtkwave3/pkg-plist
+++ b/cad/gtkwave3/pkg-plist
@@ -4,12 +4,8 @@ bin/ghwdump
 bin/gtkwave
 bin/lxt2miner
 bin/lxt2vcd
-bin/mvl2lxt
-bin/mvl2vcd
 bin/rtlbrowse
 bin/shmidcat
-bin/tex2vcd
-bin/tla2vcd
 bin/twinwave
 bin/vcd2fst
 bin/vcd2lxt
@@ -20,9 +16,11 @@ bin/vzt2vcd
 bin/vztminer
 %%DOCSDIR%%/gtkwave.odt
 %%EXAMPLESDIR%%/des.sav
-%%EXAMPLESDIR%%/des.script
 %%EXAMPLESDIR%%/des.tcl
 %%EXAMPLESDIR%%/des.v
 %%EXAMPLESDIR%%/des.vzt
+%%EXAMPLESDIR%%/transaction.fst
+%%EXAMPLESDIR%%/transaction.sav
+%%EXAMPLESDIR%%/transaction.c
 @dirrm %%EXAMPLESDIR%%
 @dirrm %%DOCSDIR%%