update to 3.3.7

changes: some feature additions, many fixes

4 files changed, 34 insertions, 16 deletions

diff --git a/cad/gtkwave/Makefile b/cad/gtkwave/Makefile
index 528c82aeaa1..d7ebea2f290 100644
--- a/cad/gtkwave/Makefile
+++ b/cad/gtkwave/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2010/06/13 22:43:55 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2010/06/16 19:24:47 drochner Exp $
 #
 
-DISTNAME=		gtkwave-3.3.2
-PKGREVISION=		1
+DISTNAME=		gtkwave-3.3.7
 CATEGORIES=		cad
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=gtkwave/}
 #MASTER_SITES=		http://home.nc.rr.com/gtkwave/
@@ -21,6 +20,7 @@ USE_TOOLS+=		gmake pkg-config
 PTHREAD_AUTO_VARS=	yes
 
 .include "../../archivers/bzip2/buildlink3.mk"
+.include "../../archivers/xz/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
diff --git a/cad/gtkwave/PLIST b/cad/gtkwave/PLIST
index f1930e210ca..d45a997ae99 100644
--- a/cad/gtkwave/PLIST
+++ b/cad/gtkwave/PLIST
@@ -1,16 +1,12 @@
-@comment $NetBSD: PLIST,v 1.6 2010/01/22 17:19:58 drochner Exp $
+@comment $NetBSD: PLIST,v 1.7 2010/06/16 19:24:47 drochner Exp $
 bin/evcd2vcd
 bin/fst2vcd
 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
@@ -25,12 +21,8 @@ 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/vcd2fst.1
 man/man1/vcd2lxt.1
@@ -44,4 +36,7 @@ share/gtkwave/examples/des.sav
 share/gtkwave/examples/des.tcl
 share/gtkwave/examples/des.v
 share/gtkwave/examples/des.vzt
+share/gtkwave/examples/transaction.c
+share/gtkwave/examples/transaction.fst
+share/gtkwave/examples/transaction.sav
 share/gtkwave/gtkwave.odt
diff --git a/cad/gtkwave/distinfo b/cad/gtkwave/distinfo
index e27d374fff9..d1acfdd5435 100644
--- a/cad/gtkwave/distinfo
+++ b/cad/gtkwave/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.8 2010/01/22 17:19:58 drochner Exp $
+$NetBSD: distinfo,v 1.9 2010/06/16 19:24:47 drochner Exp $
 
-SHA1 (gtkwave-3.3.2.tar.gz) = f5562e79b5e416ed207795d0de24f9d5381ae996
-RMD160 (gtkwave-3.3.2.tar.gz) = ca0176fba6e249a0dfeb08bfca8f9d15d5d8195a
-Size (gtkwave-3.3.2.tar.gz) = 3095151 bytes
+SHA1 (gtkwave-3.3.7.tar.gz) = 682d08969e1c10b5ba32f2b28c65eb0c53374c3c
+RMD160 (gtkwave-3.3.7.tar.gz) = 41fb3b55372b43910189dca18cb0ce1ff29020e9
+Size (gtkwave-3.3.7.tar.gz) = 3120825 bytes
+SHA1 (patch-aa) = 713ceee5ea1408fcfc1c7387f1d5802d31aea672
diff --git a/cad/gtkwave/patches/patch-aa b/cad/gtkwave/patches/patch-aa
new file mode 100644
index 00000000000..88a14ebfb00
--- /dev/null
+++ b/cad/gtkwave/patches/patch-aa
@@ -0,0 +1,22 @@
+$NetBSD: patch-aa,v 1.5 2010/06/16 19:24:47 drochner Exp $
+
+--- configure.orig	2010-03-09 22:21:28.000000000 +0000
++++ configure
+@@ -5076,7 +5076,7 @@ $as_echo "$EXZ" >&6; }
+ 
+ LIBXZ_LDADD=
+ LIBXZ_CFLAGS=
+-if test "X$EXZ" == "Xyes"; then
++if test "X$EXZ" = "Xyes"; then
+ 	have_liblzma=no
+ 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+@@ -5169,7 +5169,7 @@ $as_echo "$EJUDY" >&6; }
+ 
+ LIBJUDY_LDADD=
+ LIBJUDY_CFLAGS=
+-if test "X$EJUDY" == "Xyes"; then
++if test "X$EJUDY" = "Xyes"; then
+ 	have_libjudy=no
+ 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */