add tcl option (off per default), fix mime handling

4 files changed, 38 insertions, 27 deletions

diff --git a/cad/gtkwave/Makefile b/cad/gtkwave/Makefile
index d42c01201ca..14cb99a3d34 100644
--- a/cad/gtkwave/Makefile
+++ b/cad/gtkwave/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2014/01/19 09:25:17 mef Exp $
+# $NetBSD: Makefile,v 1.53 2014/01/21 15:07:38 drochner Exp $
 #
 
 DISTNAME=		gtkwave-3.3.53
@@ -14,11 +14,23 @@ 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
+CHECK_PORTABILITY_SKIP+= contrib/bundle_for_osx/launcher.sh
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.gtkwave
+PKG_SUPPORTED_OPTIONS=	gtkwave-tcl
+#PKG_SUGGESTED_OPTIONS=	gtkwave-tcl
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mgtkwave-tcl)
+.include "../../lang/tcl/buildlink3.mk"
+.include "../../x11/tk/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--disable-tcl
+.endif
 
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../archivers/xz/buildlink3.mk"
@@ -26,6 +38,7 @@ PTHREAD_AUTO_VARS=	yes
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
+.include "../../databases/shared-mime-info/mimedb.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../graphics/gnome-icon-theme/buildlink3.mk"
 
diff --git a/cad/gtkwave/PLIST b/cad/gtkwave/PLIST
index 52c73e466aa..701d1055f03 100644
--- a/cad/gtkwave/PLIST
+++ b/cad/gtkwave/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2014/01/19 09:25:17 mef Exp $
+@comment $NetBSD: PLIST,v 1.9 2014/01/21 15:07:38 drochner Exp $
 bin/evcd2vcd
 bin/fst2vcd
 bin/fstminer
@@ -83,25 +83,6 @@ 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
@@ -113,7 +94,3 @@ 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 bc578fe2b53..c83f15e58ae 100644
--- a/cad/gtkwave/distinfo
+++ b/cad/gtkwave/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.14 2014/01/19 09:25:17 mef Exp $
+$NetBSD: distinfo,v 1.15 2014/01/21 15:07:38 drochner Exp $
 
 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-ab) = 94da015f3e7541c2e2b57644d166324de67f1a2c
 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-ab b/cad/gtkwave/patches/patch-ab
new file mode 100644
index 00000000000..a1ac156015b
--- /dev/null
+++ b/cad/gtkwave/patches/patch-ab
@@ -0,0 +1,20 @@
+$NetBSD: patch-ab,v 1.4 2014/01/21 15:07:38 drochner Exp $
+
+--- src/tcl_helper.c.orig	2012-03-09 21:50:21.000000000 +0000
++++ src/tcl_helper.c
+@@ -2924,6 +2924,7 @@ void make_tcl_interpreter(char *argv[])
+ 	}
+   }
+ #else
++#ifdef WAVE_TCL_STUBIFY /* path used in set_globals_interp() */
+ #ifdef WIN32
+   if(!GetModuleFileName(NULL, commandName, 256))
+     n = -1 ;
+@@ -2936,6 +2937,7 @@ void make_tcl_interpreter(char *argv[])
+   } else {
+     commandName[n] = '\0' ;
+   }
++#endif /* STUBIFY */
+   set_globals_interp(commandName, 0);
+ #endif
+