Fix build against TCL 8.6.

4 files changed, 30 insertions, 21 deletions

diff --git a/mbone/vat/distinfo b/mbone/vat/distinfo
index ea59bc427a3..7cc1952a7a1 100644
--- a/mbone/vat/distinfo
+++ b/mbone/vat/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2012/08/21 21:47:28 marino Exp $
+$NetBSD: distinfo,v 1.14 2014/02/04 00:17:35 joerg Exp $
 
 SHA1 (vatsrc-4.0b2.tar.gz) = 92390be72438647bef422c7a493ee520e82e33b3
 RMD160 (vatsrc-4.0b2.tar.gz) = 3540a371f2d4bbd388561157009dc744bec24a0a
@@ -11,11 +11,11 @@ SHA1 (patch-af) = 1cfe73e1a1e7f179d6293c451cd55f0fd558e8d3
 SHA1 (patch-ag) = cee2e711190a0d33ed7ff95e87f00e811c7d8286
 SHA1 (patch-ai) = 72b94bfaa14daabb07c65194c9068c23157307f8
 SHA1 (patch-aj) = 15a00276ea8758f6f3ca96324a5596eb60399c92
-SHA1 (patch-ak) = e79273c0b7d101bf9cbdc7ad8e6348bda8fa2e45
+SHA1 (patch-ak) = 1456f6e3e3aa8cc1520a24871dba35587da09647
 SHA1 (patch-al) = 1e135bf818a4b35901ecabe8442aa57414fa46d1
 SHA1 (patch-am) = 3513e9495e460b9d2923f6dfdfa048c0e5872b3f
 SHA1 (patch-an) = 2793bea8c9a9a4c73c82c20da65d549252144eb3
-SHA1 (patch-ao) = c2b4cc90f591f8a37a5255f83e93b819221146d2
-SHA1 (patch-ap) = dc396b9d19a526c01970b7a7882435729916f632
+SHA1 (patch-ao) = c7647a45ed9edde9c47a8bcf39f94d27b5149406
+SHA1 (patch-ap) = b32ff760912c2ca03b5992c80a9c2172f0b12797
 SHA1 (patch-aq) = 7fe27d23fb5164ae98f4ef0a4e377b50d9f2d3b3
 SHA1 (patch-ar) = cc92e2e1fd7d4c084f899977a2453d4622d0d461
diff --git a/mbone/vat/patches/patch-ak b/mbone/vat/patches/patch-ak
index e640576fd80..cfc01c11949 100644
--- a/mbone/vat/patches/patch-ak
+++ b/mbone/vat/patches/patch-ak
@@ -1,8 +1,8 @@
-$NetBSD: patch-ak,v 1.3 2008/06/20 01:09:25 joerg Exp $
+$NetBSD: patch-ak,v 1.4 2014/02/04 00:17:35 joerg Exp $
 
---- Makefile.in.orig	Thu Apr 25 15:20:32 1996
-+++ Makefile.in	Mon Mar 13 14:11:24 2000
-@@ -48,6 +48,7 @@
+--- Makefile.in.orig	1996-04-25 13:20:32.000000000 +0000
++++ Makefile.in
+@@ -48,6 +48,7 @@ CC = @CC@
  C++ = @CXX@
  TABCC = @V_TABCC@
  CCOPT = @V_CCOPT@
@@ -10,7 +10,16 @@ $NetBSD: patch-ak,v 1.3 2008/06/20 01:09:25 joerg Exp $
  
  INCLUDE_TK = @V_INCLUDE_TK@
  INCLUDE_TCL = @V_INCLUDE_TCL@
-@@ -175,7 +176,7 @@
+@@ -85,7 +86,7 @@ SRC_AUDIO = $(OBJ_AUDIO:.o=.cc) 
+ LIB = $(LIB_AUDIO) @V_LIB_TK@ @V_LIB_TCL@ @V_LIB_GSM@ @V_LIB_X11@ @V_LIB@ -lm
+ INCLUDE = $(INCLUDE_MISC) $(INCLUDE_AUDIO) $(INCLUDE_TK) $(INCLUDE_TCL) \
+ 	$(INCLUDE_X11) $(MD_INC)
+-DEFINE = @V_DEFINE@ -DSIGRET=@V_SIGRET@ -DFRAMESIZE=160
++DEFINE = @V_DEFINE@ -DSIGRET=@V_SIGRET@ -DFRAMESIZE=160 -DUSE_INTERP_RESULT
+ BFLAGS = $(DEFINE) $(INCLUDE)
+ CFLAGS = $(CCOPT) $(BFLAGS)
+ 
+@@ -175,7 +176,7 @@ $(OBJ3): $(SRC3)
  	$(TABCC) $(RFLAG) -c $*.c
  
  $(SRC3): mktab.c
@@ -19,7 +28,7 @@ $NetBSD: patch-ak,v 1.3 2008/06/20 01:09:25 joerg Exp $
  	rm -f $(SRC3)
  	./mktab -mulaw > tabmulaw.c
  	./mktab -sum > tabmix.c
-@@ -184,7 +185,7 @@
+@@ -184,7 +185,7 @@ $(SRC3): mktab.c
  	rm -f mktab
  
  vat-gsm.o: vat-gsm.c
@@ -28,7 +37,7 @@ $NetBSD: patch-ak,v 1.3 2008/06/20 01:09:25 joerg Exp $
  
  tar: force
  	tar=vatbin-`cat VERSION`-@V_TAR_TARGET@.tar.gz ; \
-@@ -209,16 +210,10 @@
+@@ -209,16 +210,10 @@ srctar: force
  	     rm ../$$name; chmod 444 $$tar
  
  install: force
diff --git a/mbone/vat/patches/patch-ao b/mbone/vat/patches/patch-ao
index d3ee5343e3e..f9c65c680f0 100644
--- a/mbone/vat/patches/patch-ao
+++ b/mbone/vat/patches/patch-ao
@@ -1,4 +1,4 @@
-$NetBSD: patch-ao,v 1.4 2012/08/21 21:47:28 marino Exp $
+$NetBSD: patch-ao,v 1.5 2014/02/04 00:17:35 joerg Exp $
 
 --- configure.orig	1996-05-16 08:03:58.000000000 +0000
 +++ configure
@@ -6,8 +6,8 @@ $NetBSD: patch-ao,v 1.4 2012/08/21 21:47:28 marino Exp $
    d=""
  fi
  
-+tcldir=tcl8.5
-+tcllib=tcl85
++tcldir=tcl8.6
++tcllib=tcl86
  if test "$d" != "" ; then 
  	if test ! -d $d ; then 
  		echo "'$d' is not a directory"
@@ -173,8 +173,8 @@ $NetBSD: patch-ao,v 1.4 2012/08/21 21:47:28 marino Exp $
    d=""
  fi
  
-+tkdir=tk8.5
-+tklib=tk85
++tkdir=tk8.6
++tklib=tk86
  if test "$d" != "" ; then 
  	if test ! -d $d ; then 
  		echo "'$d' is not a directory"
diff --git a/mbone/vat/patches/patch-ap b/mbone/vat/patches/patch-ap
index 69c62b851d9..f5e472c5116 100644
--- a/mbone/vat/patches/patch-ap
+++ b/mbone/vat/patches/patch-ap
@@ -1,12 +1,12 @@
-$NetBSD: patch-ap,v 1.3 2012/08/21 21:47:28 marino Exp $
+$NetBSD: patch-ap,v 1.4 2014/02/04 00:17:35 joerg Exp $
 
 --- configure.in.tk.orig	Thu May 16 04:06:05 1996
 +++ configure.in.tk	Wed Jan 26 16:03:04 2000
 @@ -3,5 +3,7 @@
  
  AC_ARG_WITH(tcl,	--with-tcl=path	specify a pathname for tcl, d=$withval, d="")
-+tcldir=tcl8.5
-+tcllib=tcl85
++tcldir=tcl8.6
++tcllib=tcl86
  if test "$d" != "" ; then 
  	if test ! -d $d ; then 
  		echo "'$d' is not a directory"
@@ -130,8 +130,8 @@ $NetBSD: patch-ap,v 1.3 2012/08/21 21:47:28 marino Exp $
  AC_SUBST(V_LIBRARY_TCL)
  
  AC_ARG_WITH(tk,	--with-tk=path	specify a pathname for tk, d=$withval, d="")
-+tkdir=tk8.5
-+tklib=tk85
++tkdir=tk8.6
++tklib=tk86
  if test "$d" != "" ; then 
  	if test ! -d $d ; then 
  		echo "'$d' is not a directory"