 @@ -1,36 +1,36 @@
-$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
 Size (vic-2.8_ov511p0.diff.gz) = 8836 bytes
 SHA1 (vicsrc-2.8.tar.gz) = ec58bf10aed99301f1e0e0828d0f2f32acdafe1d
 RMD160 (vicsrc-2.8.tar.gz) = 1c102bfb4effd54bb3ac90e8d86213c392f3e10f
 Size (vicsrc-2.8.tar.gz) = 605136 bytes
 SHA1 (patch-aa) = 6029ae5ee56452e2a4303a34a5ffa258e266dffb
 SHA1 (patch-ab) = 8a9f5fbacc8e90b62cbb4dc7335fab2c23512ef4
 SHA1 (patch-ac) = e95936892d83876c90edb5e81963350c60e56866
 SHA1 (patch-ad) = 707087b184b054e0e2935990ad1029f0e446a3df
 SHA1 (patch-ae) = 458a5eeac15620f4c5972c170bf087112f838bd4
 SHA1 (patch-af) = 4a82bb5322d16c8269923cd65c0e776a2570de90
 SHA1 (patch-ag) = 75fdeba7082c220cd105250f72e7899047c0d28a
 SHA1 (patch-ah) = 15a00276ea8758f6f3ca96324a5596eb60399c92
-SHA1 (patch-ai) = dc396b9d19a526c01970b7a7882435729916f632
+SHA1 (patch-ai) = b32ff760912c2ca03b5992c80a9c2172f0b12797
-SHA1 (patch-aj) = 31b068f5c8aa4ad7346f1ec41a5179dd1c6ff1e6
+SHA1 (patch-aj) = c17f0e1d2a14d89e618ecc24ffb56dbfdb329db8
 SHA1 (patch-ak) = 764766b60d93e3525bea01b65a43b6b9092e55d1
 SHA1 (patch-al) = ae870102e3badc8705ff517189b24766f5e13737
 SHA1 (patch-am) = b9a9e31d58eaddd57394dd7b4546f3668076333c
 SHA1 (patch-an) = 2f9e09c6da4d7800df43d0bb885ab293fa61e0b1
 SHA1 (patch-ao) = fd7409267aaaaa2d64f036b92c963a0fc85675df
 SHA1 (patch-ap) = a1e8efe7df75c428c09593e93d60b61584b06d50
 SHA1 (patch-aq) = 89b9441d6b713cd86d76411732b5f436f5d18dbd
 SHA1 (patch-ar) = 3386286e5bb2b0528fa20d6458f752d35381dff5
 SHA1 (patch-as) = 03c868e0f38ad590bee8ae9504404f05c6db5cef
 SHA1 (patch-at) = 416ca3e5125dc0b405268a7ab87572fa90b386eb
 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

 @@ -1,22 +1,22 @@
-$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
++tcldir=tcl8.6
-+tcllib=tcl85
++tcllib=tcl86
  if test "$d" != "" ; then
  	if test ! -d $d ; then
  		echo "'$d' is not a directory"
 @@ -12,8 +14,8 @@
  		echo "can't find tcl.h in $d/include"
  		exit 1
  	fi
 -	places="$d/lib/libtcl7.5.so \
 -		$d/lib/libtcl7.5.a \
 +	places="$d/lib/lib${tcllib}.so \
 +		$d/lib/lib${tcllib}.a \
  		$d/lib/libtcl.so \
  		$d/lib/libtcl.a"
 @@ -120,28 +120,28 @@ $NetBSD: patch-ai,v 1.5 2012/08/21 21:49
 +		/usr/contrib/lib/${tcldir} \
 +		/usr/lib/${tcldir} \
 +		/usr/lib/tk/${tcldir} \
 +		/import/tcl/lib/${tcldir} \
 +		$prefix/lib/${tcldir} \
 +		$x_libraries/${tcldir} \
  		/usr/local/lib/tcl \
  		/usr/lib/tcl \
  		/usr/lib/tk/tcl \
 @@ -128,6 +127,8 @@
  AC_SUBST(V_LIBRARY_TCL)
  AC_ARG_WITH(tk,	--with-tk=path	specify a pathname for tk, d=$withval, d="")
-+tkdir=tk8.5
++tkdir=tk8.6
-+tklib=tk85
++tklib=tk86
  if test "$d" != "" ; then
  	if test ! -d $d ; then
  		echo "'$d' is not a directory"
 @@ -138,8 +139,8 @@
  		echo "can't find tk.h in $d/include"
  		exit 1
  	fi
 -	places="$d/lib/libtk4.1.so \
 -		$d/lib/libtk4.1.a \
 +	places="$d/lib/lib${tklib}.so \
 +		$d/lib/lib${tklib}.a \
  		$d/lib/libtk.so \
  		$d/lib/libtk.a"

 @@ -1,23 +1,23 @@
-$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
 @@ -1468,6 +1468,8 @@ else
    d=""
  fi
-+tcldir=tcl8.5
++tcldir=tcl8.6
-+tcllib=tcl85
++tcllib=tcl86
  if test "$d" != "" ; then
  	if test ! -d $d ; then
  		echo "'$d' is not a directory"
 @@ -1478,8 +1480,8 @@ if test "$d" != "" ; then
  		echo "can't find tcl.h in $d/include"
  		exit 1
  	fi
 -	places="$d/lib/libtcl7.5.so \
 -		$d/lib/libtcl7.5.a \
 +	places="$d/lib/lib${tcllib}.so \
 +		$d/lib/lib${tcllib}.a \
  		$d/lib/libtcl.so \
  		$d/lib/libtcl.a"
 @@ -172,28 +172,28 @@ $NetBSD: patch-ay,v 1.5 2012/08/21 21:49
 +		/usr/contrib/lib/${tcldir} \
 +		/usr/lib/${tcldir} \
 +		/usr/lib/tk/${tcldir} \
 +		/import/tcl/lib/${tcldir} \
 +		$prefix/lib/${tcldir} \
 +		$x_libraries/${tcldir} \
  		/usr/local/lib/tcl \
  		/usr/lib/tcl \
  		/usr/lib/tk/tcl \
 @@ -1651,6 +1618,8 @@ else
    d=""
  fi
-+tkdir=tk8.5
++tkdir=tk8.6
-+tklib=tk85
++tklib=tk86
  if test "$d" != "" ; then
  	if test ! -d $d ; then
  		echo "'$d' is not a directory"
 @@ -1661,8 +1630,8 @@ if test "$d" != "" ; then
  		echo "can't find tk.h in $d/include"
  		exit 1
  	fi
 -	places="$d/lib/libtk4.1.so \
 -		$d/lib/libtk4.1.a \
 +	places="$d/lib/lib${tklib}.so \
 +		$d/lib/lib${tklib}.a \
  		$d/lib/libtk.so \
  		$d/lib/libtk.a"

 @@ -1,23 +1,43 @@
-$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
+@@ -35,5 +35,5 @@
  	$(CC) -o $@ $(CFLAGS) ppmtolut.c -lm $(STATIC)
 -.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
 -	 chown bin @prefix@/bin/vic
 -	 chgrp bin @prefix@/bin/vic
 -	 chmod 555 @prefix@/bin/vic
 -	 cp vic.1 @prefix@/man/vic.1
 -	 cp histtolut @prefix@/bin/histtolut
 -	 chown bin @prefix@/bin/histtolut
 -	 chgrp bin @prefix@/bin/histtolut
 -	 chmod 555 @prefix@/bin/histtolut
 +	${BSD_INSTALL_PROGRAM} vic ${DESTDIR}@prefix@/bin
 +	${BSD_INSTALL_MAN} vic.1 ${DESTDIR}@prefix@/man/man1
 +	${BSD_INSTALL_PROGRAM} histtolut ${DESTDIR}@prefix@/bin
  clean:
  	rm -f *.o jpeg/*.o p64/*.o core tcl2c++ mkbv bv.c mkhuff huffcode.c \