From c4f4439746d1fbe01a43f9550fc963380e94862d Mon Sep 17 00:00:00 2001
From: joerg <joerg@pkgsrc.org>
Date: Tue, 4 Feb 2014 00:11:43 +0000
Subject: Fix build with TCL 8.6.

---
 cad/tkgate/distinfo         |  6 +++---
 cad/tkgate/patches/patch-aa |  4 ++--
 cad/tkgate/patches/patch-ab | 12 ++++++++++--
 3 files changed, 15 insertions(+), 7 deletions(-)

(limited to 'cad')

diff --git a/cad/tkgate/distinfo b/cad/tkgate/distinfo
index c64ef3bea92..e532d8de319 100644
--- a/cad/tkgate/distinfo
+++ b/cad/tkgate/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.7 2013/03/02 18:29:03 joerg Exp $
+$NetBSD: distinfo,v 1.8 2014/02/04 00:11:43 joerg Exp $
 
 SHA1 (tkgate-1.6i.tgz) = 6eece2eb4aaa2f45c2b1c68b9c5b79a76b3bb084
 RMD160 (tkgate-1.6i.tgz) = 651ac3194c7b2b8dc8fc8fb28d409672586d4f98
 Size (tkgate-1.6i.tgz) = 1459011 bytes
-SHA1 (patch-aa) = b285f85cf8e894fa02714a5bc2c2277837395bf9
-SHA1 (patch-ab) = 8c0fb6b4f2e9e4fb7af2621fb6546e4e99ba69e5
+SHA1 (patch-aa) = 035171eb490ea74fcd0fc0788585aa87703fe171
+SHA1 (patch-ab) = 1b80671b8ad504970f35d6413151439138269a1b
 SHA1 (patch-src_tkgate_edit.c) = d955226ff73d232310dc3f4f9b7e2381432b81de
 SHA1 (patch-src_tkgate_tclfuncs.c) = e7d9f0fef83c8c1b66eb6b510493908360997608
diff --git a/cad/tkgate/patches/patch-aa b/cad/tkgate/patches/patch-aa
index 9d673e5adbb..6e93bd6c50f 100644
--- a/cad/tkgate/patches/patch-aa
+++ b/cad/tkgate/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2012/08/21 21:37:56 marino Exp $
+$NetBSD: patch-aa,v 1.4 2014/02/04 00:11:43 joerg Exp $
 
 --- config.h.orig	2002-02-11 19:31:49.000000000 +0000
 +++ config.h
@@ -7,7 +7,7 @@ $NetBSD: patch-aa,v 1.3 2012/08/21 21:37:56 marino Exp $
    Tcl/Tk Version numbers to use.
  */
 -#define TKGATE_TCLTK_VERSIONS		"8.4 8.3 8.2 8.1 8.0"
-+#define TKGATE_TCLTK_VERSIONS		"8.5 8.4 8.3 8.2 8.1 8.0"
++#define TKGATE_TCLTK_VERSIONS		"8.6 8.5 8.4 8.3 8.2 8.1 8.0"
  
  /*
    Japanese Tcl/Tk Version numbers to use.
diff --git a/cad/tkgate/patches/patch-ab b/cad/tkgate/patches/patch-ab
index 94ffb4ff67f..173893fe31d 100644
--- a/cad/tkgate/patches/patch-ab
+++ b/cad/tkgate/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.3 2007/01/20 01:47:00 rillig Exp $
+$NetBSD: patch-ab,v 1.4 2014/02/04 00:11:43 joerg Exp $
 
---- configure.orig	2001-06-11 22:44:36.000000000 +0200
+--- configure.orig	2001-06-11 20:44:36.000000000 +0000
 +++ configure
 @@ -70,7 +70,7 @@ done
  #
@@ -23,3 +23,11 @@ $NetBSD: patch-ab,v 1.3 2007/01/20 01:47:00 rillig Exp $
        echo "Tcl/Tk Version: $tcltk_ver"
    else
        echo "Tcl/Tk Version: not found"
+@@ -679,6 +684,7 @@ showvalues()
+ editconfigh()
+ {
+   cat > options.h << -eof-
++#define USE_INTERP_RESULT
+ #ifndef TKGATE_CC
+ #define TKGATE_CC		$CC
+ #endif
-- 
cgit v1.2.3