- Update to 3.3.35

PR:		167092
Submitted by:	Muhammad Moinur Rahman <5u623l20@gmail.com>
Approved by:	maintainer

5 files changed, 38 insertions, 17 deletions

diff --git a/cad/gtkwave3/Makefile b/cad/gtkwave3/Makefile
index 004d1607a670..4538ffe8ce3a 100644
--- a/cad/gtkwave3/Makefile
+++ b/cad/gtkwave3/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gtkwave3
-PORTVERSION=	3.3.34
+PORTVERSION=	3.3.35
 CATEGORIES=	cad
 MASTER_SITES=	http://gtkwave.sourceforge.net/
 DISTNAME=	gtkwave-${PORTVERSION}
@@ -21,6 +21,8 @@ INSTALLS_ICONS=	yes
 
 OPTIONS=	TCL "Enable support for TCL/TK" off
 
+PORTDOCS=	gtkwave.odt
+
 .include	<bsd.port.options.mk>
 
 .if defined(WITH_TCL)
@@ -37,4 +39,12 @@ MAN1=	ghwdump.1 gtkwave.1 evcd2vcd.1 fst2vcd.1 lxt2miner.1 \
 	vcd2lxt.1 vcd2lxt2.1 vcd2vzt.1 vermin.1 vzt2vcd.1 vztminer.1
 MAN5=	gtkwaverc.5
 
+post-install:
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+.for doc in ${PORTDOCS}
+	${INSTALL_DATA} ${WRKSRC}/doc/${doc} ${DOCSDIR}
+.endfor
+.endif
+
 .include <bsd.port.mk>
diff --git a/cad/gtkwave3/distinfo b/cad/gtkwave3/distinfo
index 0d69e4edde7f..aa4858d4af21 100644
--- a/cad/gtkwave3/distinfo
+++ b/cad/gtkwave3/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gtkwave-3.3.34.tar.gz) = 9f65b0f70e6d6f5d7e8a422dcdeb803c94a1cd01e6e9cc69b9736150cf65764e
-SIZE (gtkwave-3.3.34.tar.gz) = 3796576
+SHA256 (gtkwave-3.3.35.tar.gz) = f2fe27f8fefe37089dbd2a1608f43b7165dc0dc0e575d06a78b1cd33735bcb5e
+SIZE (gtkwave-3.3.35.tar.gz) = 3826695
diff --git a/cad/gtkwave3/files/patch-Makefile.in b/cad/gtkwave3/files/patch-Makefile.in
new file mode 100644
index 000000000000..3f38adbd4b29
--- /dev/null
+++ b/cad/gtkwave3/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	2012-04-19 15:57:02.615900602 +0600
++++ Makefile.in	2012-04-19 15:57:09.500888219 +0600
+@@ -254,7 +254,7 @@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-SUBDIRS = doc examples man src contrib share
++SUBDIRS = examples man src contrib share
+ EXTRA_DIST = ANALOG_README.TXT CHANGELOG.TXT GNU.TXT INSTALL.TXT LICENSE.TXT MIT.TXT SYSTEMVERILOG_README.TXT \
+ 	autogen.sh wave_locale.h tcl.m4
+ 
diff --git a/cad/gtkwave3/files/patch-configure b/cad/gtkwave3/files/patch-configure
index f83b09821ca3..7ae84603ce60 100644
--- a/cad/gtkwave3/files/patch-configure
+++ b/cad/gtkwave3/files/patch-configure
@@ -1,28 +1,28 @@
---- 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}
+--- configure.orig	2012-04-19 14:52:53.532889214 +0600
++++ configure	2012-04-19 14:52:32.373895264 +0600
+@@ -558,7 +558,7 @@
+ MAKEFLAGS=
  
  # Identity of this package.
 -PACKAGE_NAME='gtkwave'
 +PACKAGE_NAME='gtkwave3'
  PACKAGE_TARNAME='gtkwave'
- PACKAGE_VERSION='3.3.34'
- PACKAGE_STRING='gtkwave 3.3.34'
-@@ -2417,7 +2417,7 @@
+ PACKAGE_VERSION='3.3.35'
+ PACKAGE_STRING='gtkwave 3.3.35'
+@@ -2972,7 +2972,7 @@
  
  
  # Define the identity of the package.
 - PACKAGE='gtkwave'
 + PACKAGE='gtkwave3'
-  VERSION='3.3.34'
+  VERSION='3.3.35'
  
  
-@@ -13096,6 +13096,7 @@
+@@ -9212,6 +9212,7 @@
+ TCLSPEC_LHS="${TCL_LIB_SPEC% *}"
  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_ac_Lib=`$as_echo "ac_cv_lib_tcl${TCL_VERSION}''_Tcl_CreateInterp" | $as_tr_sh`
+ { $as_echo "$as_me:${as_lineno-$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/pkg-plist b/cad/gtkwave3/pkg-plist
index e8669376304d..0a610dea6aed 100644
--- a/cad/gtkwave3/pkg-plist
+++ b/cad/gtkwave3/pkg-plist
@@ -76,7 +76,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
-%%DOCSDIR%%/gtkwave.odt
+%%PORTDOCS%%%%DOCSDIR%%/gtkwave.odt
 %%EXAMPLESDIR%%/des.gtkw
 %%EXAMPLESDIR%%/des.tcl
 %%EXAMPLESDIR%%/des.v
@@ -86,7 +86,7 @@ share/icons/gtkwave_savefiles_256x256x32.png
 %%EXAMPLESDIR%%/transaction.c
 %%EXAMPLESDIR%%/gtkwaverc
 @dirrm %%EXAMPLESDIR%%
-@dirrm %%DOCSDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrmtry share/mime/application
 @dirrmtry share/mime/packages
 @dirrmtry share/mime