7 files changed, 27 insertions, 20 deletions

diff --git a/cad/gtkwave/Makefile b/cad/gtkwave/Makefile
index f64c32731841..c487a82c73b8 100644
--- a/cad/gtkwave/Makefile
+++ b/cad/gtkwave/Makefile
@@ -2,22 +2,28 @@
 # $FreeBSD$
 
 PORTNAME=	gtkwave
-PORTVERSION=	3.3.69
+PORTVERSION=	3.3.73
 CATEGORIES=	cad
 MASTER_SITES=	http://gtkwave.sourceforge.net/
 
 MAINTAINER=	zeising@FreeBSD.org
 COMMENT=	Electronic Waveform Viewer
 
-USES=		desktop-file-utils gmake gperf pkgconfig shared-mime-info
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+LIB_DEPENDS=	libfreetype.so:print/freetype2 \
+		libfontconfig.so:x11-fonts/fontconfig
+
+USES=		desktop-file-utils gettext gmake gperf pkgconfig shared-mime-info
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-mime-update
-USE_GNOME=	gtk20
+USE_GNOME=	cairo gtk20
 INSTALLS_ICONS=	yes
 
 OPTIONS_DEFINE=	TCL GCONF
 TCL_DESC=	Enable support for TCL/TK
-TCL_USES=	tk
+TCL_USES=	tcl tk
 TCL_CONFIGURE_ON=	--with-tcl=${TCL_LIBDIR} \
 			--with-tk=${TK_LIBDIR}
 TCL_CONFIGURE_OFF=	--disable-tcl
@@ -27,7 +33,6 @@ GCONF_USE=		GNOME=gconf2
 
 PORTDOCS=	gtkwave.odt
 
-
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for doc in ${PORTDOCS}
diff --git a/cad/gtkwave/distinfo b/cad/gtkwave/distinfo
index fe4f99c017cb..e0a23c034c76 100644
--- a/cad/gtkwave/distinfo
+++ b/cad/gtkwave/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gtkwave-3.3.69.tar.gz) = d3f45beb0517b3dc63901bd35fb8ed4c1e489696936d806cca5ca8fc67d3f3a1
-SIZE (gtkwave-3.3.69.tar.gz) = 4097780
+TIMESTAMP = 1466954022
+SHA256 (gtkwave-3.3.73.tar.gz) = 57bc88efa248c9f76950a49e7ff6a3f4a2062cb512fe7eb2e86976eb7f2be86a
+SIZE (gtkwave-3.3.73.tar.gz) = 4122802
diff --git a/cad/gtkwave/files/patch-Makefile.in b/cad/gtkwave/files/patch-Makefile.in
index 4b20a153a89e..bd5609e9a5ce 100644
--- a/cad/gtkwave/files/patch-Makefile.in
+++ b/cad/gtkwave/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig	2014-01-03 05:17:31.000000000 +0100
-+++ Makefile.in	2014-06-06 21:51:39.000000000 +0200
-@@ -310,7 +310,7 @@
+--- Makefile.in.orig	2014-01-03 04:17:31 UTC
++++ Makefile.in
+@@ -310,7 +310,7 @@ target_alias = @target_alias@
  top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
diff --git a/cad/gtkwave/files/patch-configure b/cad/gtkwave/files/patch-configure
index 05c8c2e344bb..32d08946572d 100644
--- a/cad/gtkwave/files/patch-configure
+++ b/cad/gtkwave/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2012-04-19 14:52:53.532889214 +0600
-+++ configure	2012-04-19 14:52:32.373895264 +0600
-@@ -9212,6 +9212,7 @@
+--- configure.orig	2016-05-11 18:22:21 UTC
++++ configure
+@@ -10257,6 +10257,7 @@ OLD_LDFLAGS="${LDFLAGS}"
  TCLSPEC_LHS="${TCL_LIB_SPEC% *}"
  TKLSPEC_LHS="${TK_LIB_SPEC% *}"
  LDFLAGS="${LDFLAGS} ${TCLSPEC_LHS} ${TKLSPEC_LHS}"
diff --git a/cad/gtkwave/files/patch-doc__Makefile.in b/cad/gtkwave/files/patch-doc__Makefile.in
index 963e5e9d49b9..cdbc0f420406 100644
--- a/cad/gtkwave/files/patch-doc__Makefile.in
+++ b/cad/gtkwave/files/patch-doc__Makefile.in
@@ -1,6 +1,6 @@
---- doc/Makefile.in.orig	2013-05-13 14:24:11.641084031 +0200
-+++ doc/Makefile.in	2013-05-13 14:24:58.487075336 +0200
-@@ -32,7 +32,7 @@
+--- doc/Makefile.in.orig	2014-01-03 04:17:31 UTC
++++ doc/Makefile.in
+@@ -32,7 +32,7 @@ am__make_dryrun = \
      esac; \
      test $$am__dry = yes; \
    }
diff --git a/cad/gtkwave/files/patch-examples__Makefile.in b/cad/gtkwave/files/patch-examples__Makefile.in
index 51d363357db3..f1891abcf84c 100644
--- a/cad/gtkwave/files/patch-examples__Makefile.in
+++ b/cad/gtkwave/files/patch-examples__Makefile.in
@@ -1,6 +1,6 @@
---- examples/Makefile.in.orig	2014-01-03 05:17:31.000000000 +0100
-+++ examples/Makefile.in	2014-06-06 22:30:58.000000000 +0200
-@@ -32,7 +32,7 @@
+--- examples/Makefile.in.orig	2014-01-03 04:17:31 UTC
++++ examples/Makefile.in
+@@ -32,7 +32,7 @@ am__make_dryrun = \
      esac; \
      test $$am__dry = yes; \
    }
@@ -9,7 +9,7 @@
  pkgincludedir = $(includedir)/@PACKAGE@
  pkglibdir = $(libdir)/@PACKAGE@
  pkglibexecdir = $(libexecdir)/@PACKAGE@
-@@ -258,7 +258,7 @@
+@@ -258,7 +258,7 @@ top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  dist_examples_DATA = des.gtkw des.tcl des.v des.fst transaction.fst transaction.gtkw transaction.c gtkwaverc
diff --git a/cad/gtkwave/pkg-plist b/cad/gtkwave/pkg-plist
index 46f6b2b5855c..9a311b270a4b 100644
--- a/cad/gtkwave/pkg-plist
+++ b/cad/gtkwave/pkg-plist
@@ -84,6 +84,7 @@ 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
+share/icons/hicolor/scalable/apps/gtkwave.svg
 %%EXAMPLESDIR%%/des.fst
 %%EXAMPLESDIR%%/des.gtkw
 %%EXAMPLESDIR%%/des.tcl