- Update to version 3.3.29 [1]

- Delete CONFLICTS, cad/gtkwave is no more [1]
- Port installs icons now, use INSTALLS_ICONS
- Use update-desktop-database to register filetype associations

PR:		ports/163987 [1]
Submitted by:	maintainer [1]

5 files changed, 99 insertions, 15 deletions

diff --git a/cad/gtkwave3/Makefile b/cad/gtkwave3/Makefile
index 8f8b32b4de2a..057c70a4e78a 100644
--- a/cad/gtkwave3/Makefile
+++ b/cad/gtkwave3/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gtkwave3
-PORTVERSION=	3.3.28
+PORTVERSION=	3.3.29
 CATEGORIES=	cad
 MASTER_SITES=	http://gtkwave.sourceforge.net/
 DISTNAME=	gtkwave-${PORTVERSION}
@@ -14,11 +14,10 @@ DISTNAME=	gtkwave-${PORTVERSION}
 MAINTAINER=	niclas.zeising@gmail.com
 COMMENT=	Electronic Waveform Viewer
 
-CONFLICTS=	gtkwave-[0-9]*
-
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gtk20
+USE_GNOME=	gtk20 desktopfileutils
+INSTALLS_ICONS=	yes
 
 OPTIONS=	TCL "Enable support for TCL/TK" off
 
diff --git a/cad/gtkwave3/distinfo b/cad/gtkwave3/distinfo
index af464caaf46b..a1a39b7ebf3f 100644
--- a/cad/gtkwave3/distinfo
+++ b/cad/gtkwave3/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gtkwave-3.3.28.tar.gz) = e0b3f2091aaa5b8734b424a0a2d19cec76fcd2dd7d4aee86a883f19e46af6d78
-SIZE (gtkwave-3.3.28.tar.gz) = 3225502
+SHA256 (gtkwave-3.3.29.tar.gz) = 8319054d3ca3c8b5e909737ccba6763d76c052d9d6b564a0389aadd8c23ccc17
+SIZE (gtkwave-3.3.29.tar.gz) = 3745981
diff --git a/cad/gtkwave3/files/patch-configure b/cad/gtkwave3/files/patch-configure
index c1570f31feb9..83073d34499c 100644
--- a/cad/gtkwave3/files/patch-configure
+++ b/cad/gtkwave3/files/patch-configure
@@ -7,15 +7,15 @@
 -PACKAGE_NAME='gtkwave'
 +PACKAGE_NAME='gtkwave3'
  PACKAGE_TARNAME='gtkwave'
- PACKAGE_VERSION='3.3.28'
- PACKAGE_STRING='gtkwave 3.3.28'
+ PACKAGE_VERSION='3.3.29'
+ PACKAGE_STRING='gtkwave 3.3.29'
 @@ -2417,7 +2417,7 @@
  
  
  # Define the identity of the package.
 - PACKAGE='gtkwave'
 + PACKAGE='gtkwave3'
-  VERSION='3.3.28'
+  VERSION='3.3.29'
  
  
 @@ -13096,6 +13096,7 @@
diff --git a/cad/gtkwave3/files/patch-examples__Makefile.in b/cad/gtkwave3/files/patch-examples__Makefile.in
index d6f36015dc78..dbcb24e21b22 100644
--- a/cad/gtkwave3/files/patch-examples__Makefile.in
+++ b/cad/gtkwave3/files/patch-examples__Makefile.in
@@ -1,5 +1,5 @@
---- examples/Makefile.in.orig	2011-10-20 08:19:36.000000000 +0200
-+++ examples/Makefile.in	2011-10-28 09:59:56.000000000 +0200
+--- examples/Makefile.in.orig	2011-12-22 21:31:41.000000000 +0100
++++ examples/Makefile.in	2012-01-10 11:46:28.000000000 +0100
 @@ -16,7 +16,7 @@
  @SET_MAKE@
  
@@ -9,10 +9,10 @@
  pkgincludedir = $(includedir)/@PACKAGE@
  pkglibdir = $(libdir)/@PACKAGE@
  pkglibexecdir = $(libexecdir)/@PACKAGE@
-@@ -194,7 +194,7 @@
+@@ -200,7 +200,7 @@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
- dist_examples_DATA = des.sav des.tcl des.v des.vzt transaction.fst transaction.sav transaction.c
+ dist_examples_DATA = des.gtkw des.tcl des.v des.vzt transaction.fst transaction.gtkw transaction.c .gtkwaverc
 -examplesdir = $(pkgdatadir)/examples
 +examplesdir = $(pkgdatadir)/examples/@PACKAGE@
  all: all-am
diff --git a/cad/gtkwave3/pkg-plist b/cad/gtkwave3/pkg-plist
index 207f25db19f4..87643e9bba55 100644
--- a/cad/gtkwave3/pkg-plist
+++ b/cad/gtkwave3/pkg-plist
@@ -14,13 +14,98 @@ bin/vcd2vzt
 bin/vermin
 bin/vzt2vcd
 bin/vztminer
+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-lxt2.xml
+share/mime/application/vnd.gtkwave-lxt.xml
+share/mime/application/vnd.gtkwave-vcd.xml
+share/mime/application/vnd.gtkwave-vzt.xml
+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-lxt2.xml
+share/mime/packages/x-gtkwave-extension-lxt.xml
+share/mime/packages/x-gtkwave-extension-vcd.xml
+share/mime/packages/x-gtkwave-extension-vzt.xml
+share/applications/x-gtkwave-extension-ae2.desktop
+share/applications/x-gtkwave-extension-aet.desktop
+share/applications/x-gtkwave-extension-evcd.desktop
+share/applications/x-gtkwave-extension-fst.desktop
+share/applications/x-gtkwave-extension-ghw.desktop
+share/applications/x-gtkwave-extension-gtkw.desktop
+share/applications/x-gtkwave-extension-lx2.desktop
+share/applications/x-gtkwave-extension-lxt2.desktop
+share/applications/x-gtkwave-extension-lxt.desktop
+share/applications/x-gtkwave-extension-vcd.desktop
+share/applications/x-gtkwave-extension-vzt.desktop
+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-lxt2.png
+share/icons/gnome/16x16/mimetypes/gnome-mime-application-vnd.gtkwave-lxt.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/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-lxt2.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-application-vnd.gtkwave-lxt.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/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-lxt2.png
+share/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.gtkwave-lxt.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/gtkwave_256x256x32.png
+share/icons/gtkwave_files_256x256x32.png
+share/icons/gtkwave_savefiles_256x256x32.png
 %%DOCSDIR%%/gtkwave.odt
-%%EXAMPLESDIR%%/des.sav
+%%EXAMPLESDIR%%/des.gtkw
 %%EXAMPLESDIR%%/des.tcl
 %%EXAMPLESDIR%%/des.v
 %%EXAMPLESDIR%%/des.vzt
 %%EXAMPLESDIR%%/transaction.fst
-%%EXAMPLESDIR%%/transaction.sav
+%%EXAMPLESDIR%%/transaction.gtkw
 %%EXAMPLESDIR%%/transaction.c
+%%EXAMPLESDIR%%/.gtkwaverc
 @dirrm %%EXAMPLESDIR%%
 @dirrm %%DOCSDIR%%
+@dirrmtry share/mime/application
+@dirrmtry share/mime/packages
+@dirrmtry share/mime
+@dirrmtry share/applications
+@dirrmtry share/icons/gnome/16x16/mimetypes
+@dirrmtry share/icons/gnome/16x16
+@dirrmtry share/icons/gnome/32x32/mimetypes
+@dirrmtry share/icons/gnome/32x32
+@dirrmtry share/icons/gnome/48x48/mimetypes
+@dirrmtry share/icons/gnome/48x48
+@dirrmtry share/icons/gnome
+@dirrmtry share/icons
+
+@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true