Fix build with TCL 8.6.

4 files changed, 39 insertions, 19 deletions

diff --git a/mbone/vic/distinfo b/mbone/vic/distinfo
index 4155144ea6e..9d9306ad7c9 100644
--- a/mbone/vic/distinfo
+++ b/mbone/vic/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.16 2012/08/21 21:49:30 marino Exp $
+$NetBSD: distinfo,v 1.17 2014/02/04 00:16:09 joerg Exp $
 
 SHA1 (vic-2.8_ov511p0.diff.gz) = 780116733fb52058429ca7d006667e13623d008e
 RMD160 (vic-2.8_ov511p0.diff.gz) = 26a9c80697f3fe2650b2ed76875b9a51dd1a01d9
@@ -14,8 +14,8 @@ SHA1 (patch-ae) = 458a5eeac15620f4c5972c170bf087112f838bd4
 SHA1 (patch-af) = 4a82bb5322d16c8269923cd65c0e776a2570de90
 SHA1 (patch-ag) = 75fdeba7082c220cd105250f72e7899047c0d28a
 SHA1 (patch-ah) = 15a00276ea8758f6f3ca96324a5596eb60399c92
-SHA1 (patch-ai) = dc396b9d19a526c01970b7a7882435729916f632
-SHA1 (patch-aj) = 31b068f5c8aa4ad7346f1ec41a5179dd1c6ff1e6
+SHA1 (patch-ai) = b32ff760912c2ca03b5992c80a9c2172f0b12797
+SHA1 (patch-aj) = c17f0e1d2a14d89e618ecc24ffb56dbfdb329db8
 SHA1 (patch-ak) = 764766b60d93e3525bea01b65a43b6b9092e55d1
 SHA1 (patch-al) = ae870102e3badc8705ff517189b24766f5e13737
 SHA1 (patch-am) = b9a9e31d58eaddd57394dd7b4546f3668076333c
@@ -30,7 +30,7 @@ SHA1 (patch-au) = 46f3bee25bc2d9b983d29022ec3a86966ca07bbe
 SHA1 (patch-av) = 8811a912a1f166a5576ce0efdb1284941b62fa16
 SHA1 (patch-aw) = 735e7cda5f1cabe312decdcf992258ac8a895f63
 SHA1 (patch-ax) = 9f7ab611dc426a4f317b46803dbca218be903b10
-SHA1 (patch-ay) = b9f3886aba4658d45d9ee4631f2dccdd44e593cd
+SHA1 (patch-ay) = 00f7ef4cb19a18c83cfa6ed89fcbb928555e2561
 SHA1 (patch-az) = dabc8adce970fda55127e6667b250b5fa5d09bdb
 SHA1 (patch-ba) = f982dae92237ec416cc01ced042cdfe18a57ce8d
 SHA1 (patch-bb) = cc92e2e1fd7d4c084f899977a2453d4622d0d461
diff --git a/mbone/vic/patches/patch-ai b/mbone/vic/patches/patch-ai
index e9a0199116c..2c2979c4154 100644
--- a/mbone/vic/patches/patch-ai
+++ b/mbone/vic/patches/patch-ai
@@ -1,12 +1,12 @@
-$NetBSD: patch-ai,v 1.5 2012/08/21 21:49:30 marino Exp $
+$NetBSD: patch-ai,v 1.6 2014/02/04 00:16:09 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-ai,v 1.5 2012/08/21 21:49:30 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"
diff --git a/mbone/vic/patches/patch-aj b/mbone/vic/patches/patch-aj
index f17341b6ce9..32c9c794065 100644
--- a/mbone/vic/patches/patch-aj
+++ b/mbone/vic/patches/patch-aj
@@ -1,9 +1,30 @@
-$NetBSD: patch-aj,v 1.2 2010/03/03 14:30:13 is Exp $
+$NetBSD: patch-aj,v 1.3 2014/02/04 00:16:09 joerg Exp $
 
---- Makefile.in.orig	1996-07-22 18:32:53.000000000 +0200
+--- Makefile.in.orig	1996-07-22 16:32:53.000000000 +0000
 +++ Makefile.in
-@@ -299,15 +299,9 @@ ppmtolut: ppmtolut.c
- 	$(CC) -o $@ $(CFLAGS) ppmtolut.c -lm $(STATIC)
+@@ -35,5 +35,5 @@
+ #
+ 
+-.SUFFIXES: .cc $(.SUFFIXES)
++.SUFFIXES: .cc .cpp $(.SUFFIXES)
+ 
+ ALL = @V_ALL@ histtolut
+@@ -43,4 +43,7 @@ all:	$(ALL)
+ 	rm -f $@; $(C++) -o $@ -c $(CFLAGS) $*.cc
+ 
++.cpp.o:
++	rm -f $@; $(C++) -o $@ -c $(CFLAGS) $*.cpp
++
+ .c.o:
+ 	rm -f $@; $(CC) -o $@ -c $(CFLAGS) $*.c
+@@ -88,5 +91,5 @@ LIB = $(LIB_GRABBER) @V_LIB_TK@ @V_LIB_T
+ INCLUDE = $(INCLUDE_MISC) $(INCLUDE_GRABBER) $(INCLUDE_TK) $(INCLUDE_TCL) \
+ 	$(INCLUDE_X11) $(MD_INC) -I./jpeg -I./p64 -I.
+-DEFINE = @V_DEFINE@ -DED_YBITS=$(ED_YBITS) -DSIGRET=@V_SIGRET@
++DEFINE = @V_DEFINE@ -DED_YBITS=$(ED_YBITS) -DSIGRET=@V_SIGRET@ -DUSE_INTERP_RESULT
+ BFLAGS = $(DEFINE) $(INCLUDE)
+ CFLAGS = $(CCOPT) $(BFLAGS)
+@@ -300,13 +303,7 @@ ppmtolut: ppmtolut.c
  
  install: force
 -	 cp vic @prefix@/bin/vic
@@ -20,4 +41,3 @@ $NetBSD: patch-aj,v 1.2 2010/03/03 14:30:13 is Exp $
 +	${BSD_INSTALL_PROGRAM} histtolut ${DESTDIR}@prefix@/bin
  
  clean:
- 	rm -f *.o jpeg/*.o p64/*.o core tcl2c++ mkbv bv.c mkhuff huffcode.c \
diff --git a/mbone/vic/patches/patch-ay b/mbone/vic/patches/patch-ay
index 71d820c2359..1838599a366 100644
--- a/mbone/vic/patches/patch-ay
+++ b/mbone/vic/patches/patch-ay
@@ -1,4 +1,4 @@
-$NetBSD: patch-ay,v 1.5 2012/08/21 21:49:30 marino Exp $
+$NetBSD: patch-ay,v 1.6 2014/02/04 00:16:09 joerg Exp $
 
 --- configure.orig	1996-06-24 00:59:45.000000000 +0000
 +++ configure
@@ -6,8 +6,8 @@ $NetBSD: patch-ay,v 1.5 2012/08/21 21:49:30 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"
@@ -182,8 +182,8 @@ $NetBSD: patch-ay,v 1.5 2012/08/21 21:49:30 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"