 @@ -1,21 +1,21 @@
-$NetBSD: distinfo,v 1.11 2010/02/15 18:24:59 is Exp $
+$NetBSD: distinfo,v 1.12 2011/12/14 03:21:51 sbd Exp $
 SHA1 (vatsrc-4.0b2.tar.gz) = 92390be72438647bef422c7a493ee520e82e33b3
 RMD160 (vatsrc-4.0b2.tar.gz) = 3540a371f2d4bbd388561157009dc744bec24a0a
 Size (vatsrc-4.0b2.tar.gz) = 263799 bytes
 SHA1 (patch-aa) = 58021f5a9accc06efb168374036f9c737fb9cbe6
 SHA1 (patch-ab) = f1ba1d4877de8ab3650ba5e19f1197ac756560af
 SHA1 (patch-ac) = 989059394e3c322300a16f8aa7ed2508661f1863
 SHA1 (patch-ad) = 29288eba884ba9ef59c0eac2d92d50ca9336a101
 SHA1 (patch-af) = 1cfe73e1a1e7f179d6293c451cd55f0fd558e8d3
 SHA1 (patch-ag) = cee2e711190a0d33ed7ff95e87f00e811c7d8286
 SHA1 (patch-ai) = 72b94bfaa14daabb07c65194c9068c23157307f8
 SHA1 (patch-aj) = 15a00276ea8758f6f3ca96324a5596eb60399c92
 SHA1 (patch-ak) = e79273c0b7d101bf9cbdc7ad8e6348bda8fa2e45
 SHA1 (patch-al) = 1e135bf818a4b35901ecabe8442aa57414fa46d1
 SHA1 (patch-am) = 3513e9495e460b9d2923f6dfdfa048c0e5872b3f
 SHA1 (patch-an) = 2793bea8c9a9a4c73c82c20da65d549252144eb3
-SHA1 (patch-ao) = 45deb302ecf01a688332008194fbbf35441947f1
+SHA1 (patch-ao) = bc65da31051d5989ebcb8a6a4a34d3091c25ee0a
 SHA1 (patch-ap) = 439cc24d945d72c447bd4285fafea50cccd558d2
 SHA1 (patch-aq) = 7fe27d23fb5164ae98f4ef0a4e377b50d9f2d3b3
 SHA1 (patch-ar) = cc92e2e1fd7d4c084f899977a2453d4622d0d461

 @@ -1,77 +1,70 @@
-$NetBSD: patch-ao,v 1.2 2010/01/25 21:07:48 is Exp $
+$NetBSD: patch-ao,v 1.3 2011/12/14 03:21:52 sbd Exp $
---- configure.orig	Thu May 16 10:03:58 1996
+--- configure.orig	1996-05-16 08:03:58.000000000 +0000
 +++ configure
-@@ -1468,6 +1664,8 @@ else
+@@ -1468,6 +1468,8 @@ else
    d=""
  fi
 +tcldir=tcl8.4
 +tcllib=tcl84
  if test "$d" != "" ; then
  	if test ! -d $d ; then
  		echo "'$d' is not a directory"
-@@ -1478,8 +1676,8 @@ if test "$d" != "" ; then
+@@ -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"
  	V_LIB_TCL=FAIL
-@@ -1493,7 +1691,7 @@ if test "$d" != "" ; then
+@@ -1493,7 +1495,7 @@ if test "$d" != "" ; then
  		echo "can't find libtcl.a in $d/lib"
  		exit 1
  	fi
 -	places="$d/lib/tcl7.5 \
 +	places="$d/lib/${tcldir} \
  		$d/lib/tcl"
  	V_LIBRARY_TCL=FAIL
  	for dir in $places; do
-@@ -1513,23 +1711,26 @@ else
+@@ -1520,16 +1522,19 @@ if test -z "$ac_err"; then
  #include <tcl.h>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  { (eval echo configure:1517: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out`
  if test -z "$ac_err"; then
    rm -rf conftest*
    V_INCLUDE_TCL=""
  else
    echo "$ac_err" >&5
 +  echo "configure: failed program was:" >&5
 +  cat conftest.$ac_ext >&5
    rm -rf conftest*
    V_INCLUDE_TCL=FAIL
  fi
  rm -f conftest*
  	if test "$V_INCLUDE_TCL" = FAIL; then
  		echo "checking for tcl.h"
 -		places="$PWD/../tcl7.5 \
 -			/usr/src/local/tcl7.5 \
 -			/import/tcl/include/tcl7.5 \
 +		places="$PWD/../${tcldir} \
 +			/usr/src/local/${tcldir} \
 +			/import/tcl/include/${tcldir} \
  			$prefix/include \
 +			$prefix/include/${tcldir} \
  			$x_includes/tk \
  			$x_includes \
  			/usr/local/include \
-@@ -1546,81 +1747,43 @@ rm -f conftest*
+@@ -1546,81 +1551,43 @@ rm -f conftest*
  			exit 1
  		fi
  	fi
 -	echo $ac_n "checking for -ltcl7.5""... $ac_c" 1>&6
 -ac_lib_var=`echo tcl7.5'_'main | tr './+\055' '__p_'`
 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
 -  echo $ac_n "(cached) $ac_c" 1>&6
 -else
 -  ac_save_LIBS="$LIBS"
 -LIBS="-ltcl7.5  $LIBS"
 -cat > conftest.$ac_ext <<EOF
 -#line 1558 "configure"
 -#include "confdefs.h"
 @@ -166,76 +159,76 @@ $NetBSD: patch-ao,v 1.2 2010/01/25 21:07
 -		/import/tcl/lib/tcl7.5 \
 -		$prefix/lib/tcl7.5 \
 -		$x_libraries/tcl7.5 \
 +	places="/usr/local/lib/${tcldir} \
 +		/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 +1814,8 @@ else
+@@ -1651,6 +1618,8 @@ else
    d=""
  fi
 +tkdir=tk8.4
 +tklib=tk84
  if test "$d" != "" ; then
  	if test ! -d $d ; then
  		echo "'$d' is not a directory"
-@@ -1661,8 +1826,8 @@ if test "$d" != "" ; then
+@@ -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"
  	V_LIB_TK=FAIL
-@@ -1676,7 +1841,7 @@ if test "$d" != "" ; then
+@@ -1676,7 +1645,7 @@ if test "$d" != "" ; then
  		echo "can't find libtk.a in $d/lib"
  		exit 1
  	fi
 -	places="$d/lib/tk4.1 \
 +	places="$d/lib/${tkdir} \
  		$d/lib/tk"
  	V_LIBRARY_TK=FAIL
  	for dir in $places; do
-@@ -1712,15 +1879,16 @@ rm -f conftest*
+@@ -1712,15 +1681,16 @@ rm -f conftest*
  		V_INCLUDE_TK=""
  		places="\
  			$prefix/include \
 +			$prefix/include/${tkdir} \
  			/usr/local/include \
  			/usr/contrib/include \
  			/usr/include/tcl \
  			/usr/include\
  			$x_includes/tk \
  			$x_includes \
 -			$PWD/../tk4.1 \
 -			/usr/src/local/tk4.1 \
 -			/import/tcl/include/tk4.1 \
 +			$PWD/../${tkdir} \
 +			/usr/src/local/${tkdir} \
 +			/import/tcl/include/${tkdir} \
+ 			"
  		for dir in $places; do
  			if test -r $dir/tk.h ; then
-@@ -1733,82 +1901,47 @@ rm -f conftest*
+@@ -1733,82 +1703,47 @@ rm -f conftest*
  			exit 1
  		fi
  	fi
 -	echo $ac_n "checking for -ltk4.1""... $ac_c" 1>&6
 -ac_lib_var=`echo tk4.1'_'main | tr './+\055' '__p_'`
 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
 -  echo $ac_n "(cached) $ac_c" 1>&6
 -else
 -  ac_save_LIBS="$LIBS"
 -LIBS="-ltk4.1  $LIBS"
 -cat > conftest.$ac_ext <<EOF
 -#line 1745 "configure"
 -#include "confdefs.h"
 @@ -335,27 +328,27 @@ $NetBSD: patch-ao,v 1.2 2010/01/25 21:07
 -		/usr/src/local/tk4.1/library \
 +	places="/usr/local/lib/${tkdir} \
 +		/usr/contrib/lib/${tkdir} \
 +		/usr/lib/${tkdir} \
 +		/usr/lib/tk/${tkdir} \
 +		/import/tcl/lib/${tkdir} \
 +		$prefix/lib/${tkdir} \
 +		$x_libraries/${tkdir} \
 +		$PWD/../${tkdir}/library \
 +		/usr/src/local/${tkdir}/library \
  		/usr/local/lib/tk \
  		/usr/lib/tk \
  		/usr/lib/tk/tk \
-@@ -1872,22 +2005,93 @@ if test "$d" != "" ; then
+@@ -1872,22 +1807,93 @@ if test "$d" != "" ; then
  		exit 1
  	fi
  else
 -	echo "checking for libgsm.a"
 +	echo "checking for -lgsm"
  	V_LIB_GSM=FAIL
 -	places="$PWD/../gsm-1.0-pl7 \
 -		$PWD/../gsm-1.0 \
 -		$PWD/../gsm \
 -		/usr/src/local/gsm-1.0-pl7 \
 -		/usr/src/local/gsm-1.0 \
 -		/usr/src/local/gsm"
 -	for dir in $places; do
 @@ -444,24 +437,24 @@ $NetBSD: patch-ao,v 1.2 2010/01/25 21:07
++
 +else
 +  echo "$ac_t""no" 1>&6
 +fi
 +done
++
 +	if test "$ac_cv_header_private_h" = "yes"; then
 +		V_INCLUDE_GSM=
 +	fi
 +	if test "$V_LIB_GSM" = FAIL || test "$V_INCLUDES_GSM" = FAIL ; then
  		echo "configure: can't find gsm library ... you can get it at"
  		echo "   http://www.cs.tu-berlin.de/~jutta/toast.html"
  		exit 1
-@@ -2040,7 +2251,9 @@ sparc-sun-sunos*)
+@@ -2040,7 +2046,9 @@ sparc-sun-sunos*)
  	;;
  *-*-netbsd*)
  	V_TARCMD="tar -h -c -f"
 -	V_LIB="$V_LIB -L/usr/local/lib"
 +	V_LIB="${LDFLAGS} $V_LIB -lossaudio"
 +	V_OBJ_AUDIO="audio-voxware.o"
 +	V_CCOPT="${CPPFLAGS}"
  	;;
  *-*-hpux*)
  	V_DEFINE="$V_DEFINE"