Bump version 3.3.28 to 3.3.53,

from the ChangeLog, the date lines are picked up:

3.3.29  31dec11 << short descriptions >>
3.3.30 17jan12  Updated ./configure to add --disable-mime-update flag.
3.3.31 30jan12  Added support for native file requesters in OSX Quartz.
3.3.32 13feb12  Turn off loader messages when Tcl is executing a command.
3.3.33 27feb12  Scan-build fix in vcd_recoder.c.
3.3.34 12mar12  Fix for marker time deltas when $timezero is used.
3.3.35 04apr12  Polarity fix for vcd_preserve_glitches in rcfile.  Default
3.3.36  04may12 Fixed destructive string convert in fstUtilityBinToEsc().
3.3.37  10jun12 Added patch for savefile.c that corrects an issue in which the
3.3.38  10jul12 Upgrading vermin parser to handle some > 1995 constructs.
3.3.39  08aug12 Fixed relative pathnames when generated in MinGW and used
3.3.40  10sep12 Fixed y-size of splash screen on MinGW with newest version
3.3.41  30sep12 Fix for gtkwave::addSignalsFromList when encountering
3.3.42  28nov12 Fix to prevent missing group openings from keeping other
3.3.43  26jan13 Fix for rtlbrowse for gtk_adjustment_get_page_increment and
3.3.44  16feb13 gdk_draw_layout assertion `GDK_IS_DRAWABLE (drawable)'
3.3.45  28feb13 Fix for VCDNAM_ESCAPE character in treesearch window.  This
3.3.46  29apr13 Upgraded to autoconf 2.69.
3.3.47  14may13 Fix for crash in 64-bit mode with array accesses in
3.3.48  04aug13 Fixed infinite loop hang on various helpers executables
3.3.49  11sep13 Fix crashed caused by X11 protocol limitation for pixmap size.
3.3.50  15oct13 Limit number of rows that can be displayed in mouseover in
3.3.51  27oct13 MAINTAINERS: Please add gedit to the list of dependencies
3.3.52  11nov13 Added LZ4 as compression type for FST.  When enabled with
3.3.53  15dec13 Made LZ4 the default compression routine selected for vcd2fst.

6 files changed, 193 insertions, 22 deletions

diff --git a/cad/gtkwave/Makefile b/cad/gtkwave/Makefile
index 0bebda4dac7..d42c01201ca 100644
--- a/cad/gtkwave/Makefile
+++ b/cad/gtkwave/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.51 2013/10/10 14:42:01 ryoon Exp $
+# $NetBSD: Makefile,v 1.52 2014/01/19 09:25:17 mef Exp $
 #
 
-DISTNAME=		gtkwave-3.3.28
-PKGREVISION=		13
+DISTNAME=		gtkwave-3.3.53
 CATEGORIES=		cad
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=gtkwave/}
 #MASTER_SITES=		http://home.nc.rr.com/gtkwave/
@@ -10,12 +9,14 @@ MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=gtkwave/}
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://gtkwave.sourceforge.net/
 COMMENT=		Electronic waveform viewer
+LICENSE=		gnu-gpl-v3
 
 BUILD_DEPENDS+=		gperf-[0-9]*:../../devel/gperf
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--disable-tcl
 USE_TOOLS+=		gmake pkg-config
+USE_LANGUAGES+=		c c++
 
 PTHREAD_AUTO_VARS=	yes
 
@@ -25,4 +26,7 @@ PTHREAD_AUTO_VARS=	yes
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../graphics/gnome-icon-theme/buildlink3.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/gtkwave/PLIST b/cad/gtkwave/PLIST
index d45a997ae99..52c73e466aa 100644
--- a/cad/gtkwave/PLIST
+++ b/cad/gtkwave/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.7 2010/06/16 19:24:47 drochner Exp $
+@comment $NetBSD: PLIST,v 1.8 2014/01/19 09:25:17 mef Exp $
 bin/evcd2vcd
 bin/fst2vcd
+bin/fstminer
 bin/ghwdump
 bin/gtkwave
 bin/lxt2miner
@@ -17,6 +18,7 @@ bin/vzt2vcd
 bin/vztminer
 man/man1/evcd2vcd.1
 man/man1/fst2vcd.1
+man/man1/fstminer.1
 man/man1/ghwdump.1
 man/man1/gtkwave.1
 man/man1/lxt2miner.1
@@ -32,11 +34,86 @@ man/man1/vermin.1
 man/man1/vzt2vcd.1
 man/man1/vztminer.1
 man/man5/gtkwaverc.5
-share/gtkwave/examples/des.sav
+share/applications/gtkwave.desktop
+share/gtkwave/examples/des.fst
+share/gtkwave/examples/des.gtkw
 share/gtkwave/examples/des.tcl
 share/gtkwave/examples/des.v
-share/gtkwave/examples/des.vzt
+share/gtkwave/examples/gtkwaverc
 share/gtkwave/examples/transaction.c
 share/gtkwave/examples/transaction.fst
-share/gtkwave/examples/transaction.sav
+share/gtkwave/examples/transaction.gtkw
 share/gtkwave/gtkwave.odt
+share/icons/gnome/16x16/mimetypes/gnome-mime-application-vnd.gtkwave-ae2.png
+share/icons/gnome/16x16/mimetypes/gnome-mime-application-vnd.gtkwave-aet.png
+share/icons/gnome/16x16/mimetypes/gnome-mime-application-vnd.gtkwave-evcd.png
+share/icons/gnome/16x16/mimetypes/gnome-mime-application-vnd.gtkwave-fst.png
+share/icons/gnome/16x16/mimetypes/gnome-mime-application-vnd.gtkwave-ghw.png
+share/icons/gnome/16x16/mimetypes/gnome-mime-application-vnd.gtkwave-gtkw.png
+share/icons/gnome/16x16/mimetypes/gnome-mime-application-vnd.gtkwave-lx2.png
+share/icons/gnome/16x16/mimetypes/gnome-mime-application-vnd.gtkwave-lxt.png
+share/icons/gnome/16x16/mimetypes/gnome-mime-application-vnd.gtkwave-lxt2.png
+share/icons/gnome/16x16/mimetypes/gnome-mime-application-vnd.gtkwave-vcd.png
+share/icons/gnome/16x16/mimetypes/gnome-mime-application-vnd.gtkwave-vzt.png
+share/icons/gnome/16x16/mimetypes/gtkwave.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-application-vnd.gtkwave-ae2.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-application-vnd.gtkwave-aet.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-application-vnd.gtkwave-evcd.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-application-vnd.gtkwave-fst.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-application-vnd.gtkwave-ghw.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-application-vnd.gtkwave-gtkw.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-application-vnd.gtkwave-lx2.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-application-vnd.gtkwave-lxt.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-application-vnd.gtkwave-lxt2.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-application-vnd.gtkwave-vcd.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-application-vnd.gtkwave-vzt.png
+share/icons/gnome/32x32/mimetypes/gtkwave.png
+share/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.gtkwave-ae2.png
+share/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.gtkwave-aet.png
+share/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.gtkwave-evcd.png
+share/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.gtkwave-fst.png
+share/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.gtkwave-ghw.png
+share/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.gtkwave-gtkw.png
+share/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.gtkwave-lx2.png
+share/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.gtkwave-lxt.png
+share/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.gtkwave-lxt2.png
+share/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.gtkwave-vcd.png
+share/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.gtkwave-vzt.png
+share/icons/gnome/48x48/mimetypes/gtkwave.png
+share/icons/gtkwave_256x256x32.png
+share/icons/gtkwave_files_256x256x32.png
+share/icons/gtkwave_savefiles_256x256x32.png
+share/mime/XMLnamespaces
+share/mime/aliases
+share/mime/application/vnd.gtkwave-ae2.xml
+share/mime/application/vnd.gtkwave-aet.xml
+share/mime/application/vnd.gtkwave-evcd.xml
+share/mime/application/vnd.gtkwave-fst.xml
+share/mime/application/vnd.gtkwave-ghw.xml
+share/mime/application/vnd.gtkwave-gtkw.xml
+share/mime/application/vnd.gtkwave-lx2.xml
+share/mime/application/vnd.gtkwave-lxt.xml
+share/mime/application/vnd.gtkwave-lxt2.xml
+share/mime/application/vnd.gtkwave-vcd.xml
+share/mime/application/vnd.gtkwave-vzt.xml
+share/mime/generic-icons
+share/mime/globs
+share/mime/globs2
+share/mime/icons
+share/mime/magic
+share/mime/mime.cache
+share/mime/packages/x-gtkwave-extension-ae2.xml
+share/mime/packages/x-gtkwave-extension-aet.xml
+share/mime/packages/x-gtkwave-extension-evcd.xml
+share/mime/packages/x-gtkwave-extension-fst.xml
+share/mime/packages/x-gtkwave-extension-ghw.xml
+share/mime/packages/x-gtkwave-extension-gtkw.xml
+share/mime/packages/x-gtkwave-extension-lx2.xml
+share/mime/packages/x-gtkwave-extension-lxt.xml
+share/mime/packages/x-gtkwave-extension-lxt2.xml
+share/mime/packages/x-gtkwave-extension-vcd.xml
+share/mime/packages/x-gtkwave-extension-vzt.xml
+share/mime/subclasses
+share/mime/treemagic
+share/mime/types
+share/mime/version
diff --git a/cad/gtkwave/distinfo b/cad/gtkwave/distinfo
index ce7c5661968..bc578fe2b53 100644
--- a/cad/gtkwave/distinfo
+++ b/cad/gtkwave/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.13 2011/12/16 10:58:14 drochner Exp $
+$NetBSD: distinfo,v 1.14 2014/01/19 09:25:17 mef Exp $
 
-SHA1 (gtkwave-3.3.28.tar.gz) = 05a502daba0532468af31576dd17971a7f276027
-RMD160 (gtkwave-3.3.28.tar.gz) = ff0d2a2da18b967aa6e25fbaee5f08998f692bfd
-Size (gtkwave-3.3.28.tar.gz) = 3225502 bytes
-SHA1 (patch-aa) = 47d8556b4d1356182d86404b2c2151613a5d714f
+SHA1 (gtkwave-3.3.53.tar.gz) = fdf1b748d58f08b00ddb68e45d9e1cd29ca835a4
+RMD160 (gtkwave-3.3.53.tar.gz) = 4cc5b099f674b3de83ea8f23c1f98c2216607617
+Size (gtkwave-3.3.53.tar.gz) = 4047679 bytes
+SHA1 (patch-aa) = b734be7195cfcddf15ddc7741a53e9d32b56b1f2
+SHA1 (patch-contrib_bundle__for__osx_gtkwave__bin__launcher.sh) = ca5fcdf744a4f89d06385f3d80696732295f8760
+SHA1 (patch-contrib_bundle__for__osx_launcher.sh) = 9b45d5ce7ef27e32700ef3e3d5c49b41c4d6b74d
diff --git a/cad/gtkwave/patches/patch-aa b/cad/gtkwave/patches/patch-aa
index b352f1bd7e8..c7f68be40ba 100644
--- a/cad/gtkwave/patches/patch-aa
+++ b/cad/gtkwave/patches/patch-aa
@@ -1,17 +1,19 @@
-$NetBSD: patch-aa,v 1.8 2011/12/16 10:58:14 drochner Exp $
+$NetBSD: patch-aa,v 1.9 2014/01/19 09:25:18 mef Exp $
 
---- configure.orig	2011-11-13 22:58:22.000000000 +0000
-+++ configure
-@@ -5567,7 +5567,7 @@ $as_echo "$EXZ" >&6; }
+ERROR: [check-portability.awk] => Found test ... == ...:
+
+--- configure~	2013-12-21 16:23:25.000000000 +0900
++++ configure	2013-12-21 16:24:48.000000000 +0900
+@@ -6834,7 +6834,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 >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -5714,7 +5714,7 @@ fi
+ 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+@@ -6924,7 +6924,7 @@ fi
  $as_echo "$FASTTREE" >&6; }
  
  FASTTREE_CFLAGS=
@@ -20,12 +22,12 @@ $NetBSD: patch-aa,v 1.8 2011/12/16 10:58:14 drochner Exp $
  	FASTTREE_CFLAGS='-DWAVE_DISABLE_FAST_TREE'
  fi
  
-@@ -5741,7 +5741,7 @@ $as_echo "$EJUDY" >&6; }
+@@ -6951,7 +6951,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 >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
+ 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
diff --git a/cad/gtkwave/patches/patch-contrib_bundle__for__osx_gtkwave__bin__launcher.sh b/cad/gtkwave/patches/patch-contrib_bundle__for__osx_gtkwave__bin__launcher.sh
new file mode 100644
index 00000000000..5335a59b349
--- /dev/null
+++ b/cad/gtkwave/patches/patch-contrib_bundle__for__osx_gtkwave__bin__launcher.sh
@@ -0,0 +1,42 @@
+$NetBSD: patch-contrib_bundle__for__osx_gtkwave__bin__launcher.sh,v 1.1 2014/01/19 09:25:18 mef Exp $
+
+ERROR: [check-portability.awk] => Found test ... == ...:
+
+--- contrib/bundle_for_osx/gtkwave_bin_launcher.sh~	2013-10-16 04:18:04.000000000 +0900
++++ contrib/bundle_for_osx/gtkwave_bin_launcher.sh	2013-12-21 16:32:27.000000000 +0900
+@@ -28,7 +28,7 @@ fi
+ 
+ export OWD="`pwd`"
+ 
+-if [[ $(echo $0 | awk '/^\//') == $0 ]]; then
++if [[ $(echo $0 | awk '/^\//') = $0 ]]; then
+     export NNAM=$(dirname $0)
+     name="$NNAM"
+     bundle="$NNAM/../../.."
+@@ -81,7 +81,7 @@ if test "$APPLELANGUAGES"; then
+         fi
+ 	#This is a special case, because often the original strings are in US
+ 	#English and there is no translation file.
+-	if test "x$L" == "xen_US"; then
++	if test "x$L" = "xen_US"; then
+ 	    export LANG=$L
+ 	    break
+ 	fi
+@@ -91,7 +91,7 @@ if test "$APPLELANGUAGES"; then
+ 	    break
+ 	fi
+ 	#Same thing, but checking for any english variant.
+-	if test "x${L:0:2}" == "xen"; then
++	if test "x${L:0:2}" = "xen"; then
+ 	    export LANG=$L
+ 	    break
+ 	fi;
+@@ -146,7 +146,7 @@ if test -n $LANG; then 
+ #english to set en_US
+ 
+ #   elif test $LANG == "en"; then
+-    if test $LANG == "en"; then
++    if test $LANG = "en"; then
+ 	export LC_MESSAGES="en_US"
+     else
+ 	LOC=`find $PREFIX/share/locale -name $LANG???`
diff --git a/cad/gtkwave/patches/patch-contrib_bundle__for__osx_launcher.sh b/cad/gtkwave/patches/patch-contrib_bundle__for__osx_launcher.sh
new file mode 100644
index 00000000000..4bfdef28326
--- /dev/null
+++ b/cad/gtkwave/patches/patch-contrib_bundle__for__osx_launcher.sh
@@ -0,0 +1,44 @@
+$NetBSD: patch-contrib_bundle__for__osx_launcher.sh,v 1.1 2014/01/19 09:25:18 mef Exp $
+
+ERROR: [check-portability.awk] => Found test ... == ...:
+
+--- contrib/bundle_for_osx/launcher.sh~	2013-10-22 03:27:08.000000000 +0900
++++ contrib/bundle_for_osx/launcher.sh	2013-12-21 16:28:17.000000000 +0900
+@@ -54,7 +54,7 @@ if test "$APPLELANGUAGES"; then
+         fi
+ 	#This is a special case, because often the original strings are in US
+ 	#English and there is no translation file.
+-	if test "x$L" == "xen_US"; then
++	if test "x$L" = "xen_US"; then
+ 	    export LANG=$L
+ 	    break
+ 	fi
+@@ -64,7 +64,7 @@ if test "$APPLELANGUAGES"; then
+ 	    break
+ 	fi
+ 	#Same thing, but checking for any english variant.
+-	if test "x${L:0:2}" == "xen"; then
++	if test "x${L:0:2}" = "xen"; then
+ 	    export LANG=$L
+ 	    break
+ 	fi;
+@@ -104,16 +104,16 @@ if test -n $LANG; then 
+ #If the language code matches the applelocale, then that's the message
+ #locale; otherwise, if it's longer than two characters, then it's
+ #probably a good message locale and we'll go with it.
+-    if test $LANG == ${APPLELOCALE:0:5} -o $LANG != ${LANG:0:2}; then
++    if test $LANG = ${APPLELOCALE:0:5} -o $LANG != ${LANG:0:2}; then
+ 	export LC_MESSAGES=$LANG
+ #Next try if the Applelocale is longer than 2 chars and the language
+ #bit matches $LANG
+-    elif test $LANG == ${APPLELOCALE:0:2} -a $APPLELOCALE > ${APPLELOCALE:0:2}; then
++    elif test $LANG = ${APPLELOCALE:0:2} -a $APPLELOCALE > ${APPLELOCALE:0:2}; then
+ 	export LC_MESSAGES=${APPLELOCALE:0:5}
+ #Fail. Get a list of the locales in $PREFIX/share/locale that match
+ #our two letter language code and pick the first one, special casing
+ #english to set en_US
+-    elif test $LANG == "en"; then
++    elif test $LANG = "en"; then
+ 	export LC_MESSAGES="en_US"
+     else
+ 	LOC=`find $PREFIX/share/locale -name $LANG???`