5 files changed, 50 insertions, 30 deletions

diff --git a/cad/gtkwave3/Makefile b/cad/gtkwave3/Makefile
index 2a4b7a5b0334..a38f08371b86 100644
--- a/cad/gtkwave3/Makefile
+++ b/cad/gtkwave3/Makefile
@@ -6,13 +6,12 @@
 #
 
 PORTNAME=	gtkwave3
-PORTVERSION=	3.3.18
-PORTREVISION=	0
+PORTVERSION=	3.3.27
 CATEGORIES=	cad
 MASTER_SITES=	http://gtkwave.sourceforge.net/
 DISTNAME=	gtkwave-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	niclas.zeising@gmail.com
 COMMENT=	Electronic Waveform Viewer
 
 CONFLICTS=	gtkwave-[0-9]*
@@ -21,6 +20,19 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk20
 
+OPTIONS=	TCL "Enable support for TCL/TK" off
+
+.include	<bsd.port.options.mk>
+
+.if defined(WITH_TCL)
+USE_TCL=	84+
+USE_TK=		84+
+CONFIGURE_ARGS+=	--with-tcl=${TCL_LIBDIR} \
+			--with-tk=${TK_LIBDIR}
+.else
+CONFIGURE_ARGS+=	--disable-tcl
+.endif
+
 MAN1=	ghwdump.1 gtkwave.1 evcd2vcd.1 fst2vcd.1 lxt2miner.1 \
 	lxt2vcd.1 rtlbrowse.1 shmidcat.1 twinwave.1 vcd2fst.1 \
 	vcd2lxt.1 vcd2lxt2.1 vcd2vzt.1 vermin.1 vzt2vcd.1 vztminer.1
diff --git a/cad/gtkwave3/distinfo b/cad/gtkwave3/distinfo
index 4da277a8f884..1d305d7904ef 100644
--- a/cad/gtkwave3/distinfo
+++ b/cad/gtkwave3/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gtkwave-3.3.18.tar.gz) = e08bbfc1071028193a33fa53725482cb06c16b0da74cf092afbb27b53f95eead
-SIZE (gtkwave-3.3.18.tar.gz) = 3172987
+SHA256 (gtkwave-3.3.27.tar.gz) = c9bcf294c7e261ba53587b71bbec3e5dc2e4ce0422575a7935947207a73b50db
+SIZE (gtkwave-3.3.27.tar.gz) = 3187541
diff --git a/cad/gtkwave3/files/patch-configure b/cad/gtkwave3/files/patch-configure
index 28c2fe0e87ad..054b69241f02 100644
--- a/cad/gtkwave3/files/patch-configure
+++ b/cad/gtkwave3/files/patch-configure
@@ -1,20 +1,28 @@
---- 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}
+--- configure.orig	2011-10-24 06:55:23.000000000 +0200
++++ configure	2011-10-28 16:12:33.000000000 +0200
+@@ -594,7 +594,7 @@
+ SHELL=${CONFIG_SHELL-/bin/sh}
  
  # Identity of this package.
 -PACKAGE_NAME='gtkwave'
 +PACKAGE_NAME='gtkwave3'
  PACKAGE_TARNAME='gtkwave'
- PACKAGE_VERSION='3.3.18'
- PACKAGE_STRING='gtkwave 3.3.18'
-@@ -1664,7 +1664,7 @@
+ PACKAGE_VERSION='3.3.27'
+ PACKAGE_STRING='gtkwave 3.3.27'
+@@ -2417,7 +2417,7 @@
  
  
  # Define the identity of the package.
 - PACKAGE='gtkwave'
 + PACKAGE='gtkwave3'
-  VERSION='3.3.18'
+  VERSION='3.3.27'
  
  
+@@ -13096,6 +13096,7 @@
+ TKLSPEC_LHS="${TK_LIB_SPEC% *}"
+ LDFLAGS="${LDFLAGS} ${TCLSPEC_LHS} ${TKLSPEC_LHS}"
+ as_ac_Lib=`$as_echo "ac_cv_lib_tcl${TCL_VERSION}''_Tcl_CreateInterp" | $as_tr_sh`
++TCL_VERSION=${TCL_VERSION%.*}${TCL_VERSION#*.}
+ { $as_echo "$as_me:$LINENO: checking for Tcl_CreateInterp in -ltcl${TCL_VERSION}" >&5
+ $as_echo_n "checking for Tcl_CreateInterp in -ltcl${TCL_VERSION}... " >&6; }
+ if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
diff --git a/cad/gtkwave3/files/patch-doc__Makefile.in b/cad/gtkwave3/files/patch-doc__Makefile.in
index 4909558c236e..be411ba3b3e3 100644
--- a/cad/gtkwave3/files/patch-doc__Makefile.in
+++ b/cad/gtkwave3/files/patch-doc__Makefile.in
@@ -1,11 +1,11 @@
---- doc/Makefile.in.orig	2009-03-31 07:21:12.000000000 +0100
-+++ doc/Makefile.in	2009-09-18 14:08:54.000000000 +0100
-@@ -17,7 +17,7 @@
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
+--- doc/Makefile.in.orig	2011-10-20 08:19:36.000000000 +0200
++++ doc/Makefile.in	2011-10-28 09:57:03.000000000 +0200
+@@ -16,7 +16,7 @@
+ @SET_MAKE@
+ 
  VPATH = @srcdir@
 -pkgdatadir = $(datadir)/@PACKAGE@
 +pkgdatadir = $(datadir)/doc/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
  pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ..
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkglibexecdir = $(libexecdir)/@PACKAGE@
diff --git a/cad/gtkwave3/files/patch-examples__Makefile.in b/cad/gtkwave3/files/patch-examples__Makefile.in
index 7cf56c6a13f7..d6f36015dc78 100644
--- a/cad/gtkwave3/files/patch-examples__Makefile.in
+++ b/cad/gtkwave3/files/patch-examples__Makefile.in
@@ -1,17 +1,17 @@
---- 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@
+--- examples/Makefile.in.orig	2011-10-20 08:19:36.000000000 +0200
++++ examples/Makefile.in	2011-10-28 09:59:56.000000000 +0200
+@@ -16,7 +16,7 @@
+ @SET_MAKE@
+ 
  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@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkglibexecdir = $(libexecdir)/@PACKAGE@
+@@ -194,7 +194,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
 -examplesdir = $(pkgdatadir)/examples
 +examplesdir = $(pkgdatadir)/examples/@PACKAGE@