- Add NetBSD RCSids

- Make this compile and work on NetBSD

8 files changed, 198 insertions, 115 deletions

diff --git a/mbone/vic/Makefile b/mbone/vic/Makefile
index 606623e7757..05d2ca03b17 100644
--- a/mbone/vic/Makefile
+++ b/mbone/vic/Makefile
@@ -1,3 +1,11 @@
+# $NetBSD: Makefile,v 1.2 1997/11/19 16:28:18 is Exp $
+#
+# NetBSD package for:	vic
+# Version required:	2.8
+# Date created:		1997 Nov 19
+# By:			is
+# 
+# based on:
 # New ports collection makefile for:	vic
 # Version required:	2.6
 # Date created:		14 December 1994
@@ -11,7 +19,7 @@ CATEGORIES=	mbone tk80
 MASTER_SITES=	ftp://ftp.ee.lbl.gov/conferencing/vic/
 DISTFILES=	vicsrc-2.8.tar.gz
 
-MAINTAINER=	fenner@FreeBSD.ORG
+MAINTAINER=	is@netbsd.org
 
 LIB_DEPENDS=	tk80\\.1:${PORTSDIR}/x11/tk80
 
diff --git a/mbone/vic/patches/patch-aa b/mbone/vic/patches/patch-aa
index 982d9f9a509..ee725ee8faa 100644
--- a/mbone/vic/patches/patch-aa
+++ b/mbone/vic/patches/patch-aa
@@ -1,5 +1,5 @@
---- configure.orig	Sun Jun 23 17:59:45 1996
-+++ configure	Tue Sep  9 11:20:59 1997
+--- /usr/local/pkgsrc//mbone/vic/work/vic-2.8/configure	Mon Jun 24 02:59:45 1996
++++ configure	Wed Nov 19 15:53:44 1997
 @@ -1,7 +1,7 @@
  #! /bin/sh
  
@@ -803,8 +803,16 @@
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=no"
  fi
-@@ -1478,8 +1589,8 @@
- 		echo "can't find tcl.h in $d/include"
+@@ -1473,13 +1584,13 @@
+ 		echo "'$d' is not a directory"
+ 		exit 1
+ 	fi
+-	V_INCLUDE_TCL=-I$d/include
+-	if test ! -r $d/include/tcl.h ; then
+-		echo "can't find tcl.h in $d/include"
++	V_INCLUDE_TCL=-I$d
++	if test ! -r $d/tcl.h ; then
++		echo "can't find tcl.h in $d"
  		exit 1
  	fi
 -	places="$d/lib/libtcl7.5.so \
@@ -823,7 +831,7 @@
  		$d/lib/tcl"
  	V_LIBRARY_TCL=FAIL
  	for dir in $places; do
-@@ -1508,31 +1619,34 @@
+@@ -1508,31 +1619,36 @@
  	fi
  else
  	cat > conftest.$ac_ext <<EOF
@@ -858,29 +866,31 @@
  			$prefix/include \
  			$x_includes/tk \
  			$x_includes \
++			/usr/pkg/include \
++			/usr/pkg/include/tcl8.0 \
  			/usr/local/include \
 +			/usr/local/include/tcl8.0 \
  			/usr/contrib/include \
  			/usr/include"
  		for dir in $places; do
-@@ -1546,26 +1660,28 @@
+@@ -1546,26 +1662,28 @@
  			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_'`
-+	echo $ac_n "checking for main in -ltcl8.0""... $ac_c" 1>&6
-+echo "configure:1665: checking for main in -ltcl8.0" >&5
-+ac_lib_var=`echo tcl8.0'_'main | sed 'y%./+-%__p_%'`
++	echo $ac_n "checking for main in -ltcl80""... $ac_c" 1>&6
++echo "configure:1667: checking for main in -ltcl80" >&5
++ac_lib_var=`echo tcl80'_'main | sed 'y%./+-%__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"
-+LIBS="-ltcl8.0  $LIBS"
++LIBS="-ltcl80  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 1558 "configure"
-+#line 1673 "configure"
++#line 1675 "configure"
  #include "confdefs.h"
  
 -int main() { return 0; }
@@ -890,7 +900,7 @@
  ; return 0; }
  EOF
 -if { (eval echo configure:1566: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-+if { (eval echo configure:1680: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:1682: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
@@ -899,16 +909,20 @@
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=no"
  fi
-@@ -1575,7 +1691,7 @@
+@@ -1575,7 +1693,7 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
 -  V_LIB_TCL="-ltcl7.5"
-+  V_LIB_TCL="-ltcl8.0"
++  V_LIB_TCL="-ltcl80"
  else
    echo "$ac_t""no" 1>&6
  V_LIB_TCL="FAIL"
-@@ -1589,13 +1705,13 @@
+@@ -1586,16 +1704,17 @@
+ 		places="\
+ 			$prefix/lib \
+ 			$x_libraries \
++			/usr/pkg/lib \
  			/usr/contrib/lib \
  			/usr/local/lib \
  			/usr/lib \
@@ -927,7 +941,7 @@
  				break
  			fi
  			if test -r $dir/libtcl.so -o -r $dir/libtcl.a; then
-@@ -1614,13 +1730,13 @@
+@@ -1614,13 +1733,14 @@
  	fi
  	echo "checking for tcl/init.tcl"
  	V_LIBRARY_TCL=FAIL
@@ -939,6 +953,7 @@
 -		$prefix/lib/tcl7.5 \
 -		$x_libraries/tcl7.5 \
 +	places="/usr/local/lib/tcl8.0 \
++		/usr/pkg/lib/tcl8.0 \
 +		/usr/contrib/lib/tcl8.0 \
 +		/usr/lib/tcl8.0 \
 +		/usr/lib/tk/tcl8.0 \
@@ -948,8 +963,16 @@
  		/usr/local/lib/tcl \
  		/usr/lib/tcl \
  		/usr/lib/tk/tcl \
-@@ -1661,8 +1777,8 @@
- 		echo "can't find tk.h in $d/include"
+@@ -1656,13 +1776,13 @@
+ 		echo "'$d' is not a directory"
+ 		exit 1
+ 	fi
+-	V_INCLUDE_TK=-I$d/include
+-	if test ! -r $d/include/tk.h ; then
+-		echo "can't find tk.h in $d/include"
++	V_INCLUDE_TK=-I$d
++	if test ! -r $d/tk.h ; then
++		echo "can't find tk.h in $d"
  		exit 1
  	fi
 -	places="$d/lib/libtk4.1.so \
@@ -959,7 +982,7 @@
  		$d/lib/libtk.so \
  		$d/lib/libtk.a"
  	V_LIB_TK=FAIL
-@@ -1676,7 +1792,7 @@
+@@ -1676,7 +1796,7 @@
  		echo "can't find libtk.a in $d/lib"
  		exit 1
  	fi
@@ -968,18 +991,18 @@
  		$d/lib/tk"
  	V_LIBRARY_TK=FAIL
  	for dir in $places; do
-@@ -1691,36 +1807,39 @@
+@@ -1691,36 +1811,41 @@
  	fi
  else
  	cat > conftest.$ac_ext <<EOF
 -#line 1695 "configure"
-+#line 1811 "configure"
++#line 1815 "configure"
  #include "confdefs.h"
  #include <tk.h>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 -{ (eval echo configure:1700: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:1816: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:1820: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out`
  if test -z "$ac_err"; then
    rm -rf conftest*
@@ -998,6 +1021,8 @@
 +		V_INCLUDE_TK="FAIL"
  		places="\
  			$prefix/include \
++			/usr/pkg/include \
++			/usr/pkg/include/tk8.0 \
  			/usr/local/include \
 +			/usr/local/include/tk8.0 \
  			/usr/contrib/include \
@@ -1014,24 +1039,24 @@
  			"
  		for dir in $places; do
  			if test -r $dir/tk.h ; then
-@@ -1733,26 +1852,28 @@
+@@ -1733,26 +1858,28 @@
  			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_'`
-+	echo $ac_n "checking for main in -ltk8.0""... $ac_c" 1>&6
-+echo "configure:1857: checking for main in -ltk8.0" >&5
-+ac_lib_var=`echo tk8.0'_'main | sed 'y%./+-%__p_%'`
++	echo $ac_n "checking for main in -ltk80""... $ac_c" 1>&6
++echo "configure:1863: checking for main in -ltk80" >&5
++ac_lib_var=`echo tk80'_'main | sed 'y%./+-%__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"
-+LIBS="-ltk8.0  $LIBS"
++LIBS="-ltk80  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 1745 "configure"
-+#line 1865 "configure"
++#line 1871 "configure"
  #include "confdefs.h"
  
 -int main() { return 0; }
@@ -1041,7 +1066,7 @@
  ; return 0; }
  EOF
 -if { (eval echo configure:1753: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-+if { (eval echo configure:1872: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:1878: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
@@ -1050,16 +1075,21 @@
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=no"
  fi
-@@ -1762,7 +1883,7 @@
+@@ -1762,7 +1889,7 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
 -  V_LIB_TK="-ltk4.1"
-+  V_LIB_TK="-ltk8.0"
++  V_LIB_TK="-ltk80"
  else
    echo "$ac_t""no" 1>&6
  V_LIB_TK="FAIL"
-@@ -1775,13 +1896,13 @@
+@@ -1771,17 +1898,18 @@
+ 	if test "$V_LIB_TK" = FAIL; then
+ 		echo "checking for libtk.a"
+ 		places="/usr/local/lib \
++			/usr/pkg/lib \
+ 			/usr/contrib/lib \
  			/usr/lib \
  			/usr/lib/tk \
  			/import/tcl/lib \
@@ -1077,7 +1107,7 @@
  				break
  			fi
  			if test -r $dir/libtk.so -o -r $dir/libtk.a; then
-@@ -1800,15 +1921,15 @@
+@@ -1800,15 +1928,16 @@
  	fi
  	echo "checking for tk/tk.tcl"
  	V_LIBRARY_TK=FAIL
@@ -1091,6 +1121,7 @@
 -		$PWD/../tk4.1/library \
 -		/usr/src/local/tk4.1/library \
 +	places="/usr/local/lib/tk8.0 \
++		/usr/pkg/lib/tk8.0 \
 +		/usr/contrib/lib/tk8.0 \
 +		/usr/lib/tk8.0 \
 +		/usr/lib/tk/tk8.0 \
@@ -1102,24 +1133,29 @@
  		/usr/local/lib/tk \
  		/usr/lib/tk \
  		/usr/lib/tk/tk \
-@@ -2074,6 +2195,9 @@
- 	V_TARCMD="tar -h -c -f"
- 	V_LIB="$V_LIB -L/usr/local/lib"
+@@ -2071,8 +2200,13 @@
+ 	V_LIB="$V_LIB -lipc"
  	;;
-+*-*-freebsd*)
+ *-*-netbsd*)
 +	V_STATIC=""
+ 	V_TARCMD="tar -h -c -f"
+-	V_LIB="$V_LIB -L/usr/local/lib"
++	V_LIB="$V_LIB -L/usr/pkg/lib"
++	V_SHM=""
 +	;;
++*-*-freebsd*)
++	V_STATIC=""
+ 	;;
  *-*-hpux*)
  	V_CCOPT="-O"
- 	;;
-@@ -2131,30 +2255,32 @@
+@@ -2131,30 +2264,32 @@
  		V_LIB_DL="dld"
  		;;
  	*-*-linux*)
 -		echo $ac_n "checking for -ldl""... $ac_c" 1>&6
 -ac_lib_var=`echo dl'_'dlopen | tr './+\055' '__p_'`
 +		echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-+echo "configure:2260: checking for dlopen in -ldl" >&5
++echo "configure:2269: checking for dlopen in -ldl" >&5
 +ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
@@ -1128,7 +1164,7 @@
  LIBS="-ldl  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 2143 "configure"
-+#line 2268 "configure"
++#line 2277 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
@@ -1142,7 +1178,7 @@
  ; return 0; }
  EOF
 -if { (eval echo configure:2155: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-+if { (eval echo configure:2279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:2288: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
@@ -1151,14 +1187,14 @@
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=no"
  fi
-@@ -2176,26 +2302,28 @@
+@@ -2176,26 +2311,28 @@
  		;;
  	esac
  	if test ! -z "$V_LIB_DL" ; then
 -		echo $ac_n "checking for -l$V_LIB_DL""... $ac_c" 1>&6
 -ac_lib_var=`echo $V_LIB_DL'_'main | tr './+\055' '__p_'`
 +		echo $ac_n "checking for main in -l$V_LIB_DL""... $ac_c" 1>&6
-+echo "configure:2307: checking for main in -l$V_LIB_DL" >&5
++echo "configure:2316: checking for main in -l$V_LIB_DL" >&5
 +ac_lib_var=`echo $V_LIB_DL'_'main | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
@@ -1167,7 +1203,7 @@
  LIBS="-l$V_LIB_DL $V_STATIC $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 2188 "configure"
-+#line 2315 "configure"
++#line 2324 "configure"
  #include "confdefs.h"
  
 -int main() { return 0; }
@@ -1177,7 +1213,7 @@
  ; return 0; }
  EOF
 -if { (eval echo configure:2196: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-+if { (eval echo configure:2322: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:2331: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
@@ -1186,7 +1222,7 @@
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=no"
  fi
-@@ -2205,7 +2333,8 @@
+@@ -2205,7 +2342,8 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
@@ -1196,7 +1232,7 @@
    cat >> confdefs.h <<EOF
  #define $ac_tr_lib 1
  EOF
-@@ -2279,11 +2408,25 @@
+@@ -2279,11 +2417,25 @@
  # --recheck option to rerun configure.
  #
  EOF
@@ -1224,7 +1260,7 @@
  if cmp -s $cache_file confcache; then
    :
  else
-@@ -2350,7 +2493,7 @@
+@@ -2350,7 +2502,7 @@
      echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
      exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
    -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
@@ -1233,7 +1269,7 @@
      exit 0 ;;
    -help | --help | --hel | --he | --h)
      echo "\$ac_cs_usage"; exit 0 ;;
-@@ -2439,20 +2582,56 @@
+@@ -2439,20 +2591,56 @@
  
  CEOF
  EOF
@@ -1293,7 +1329,7 @@
  
    # Remove last slash and all that follows it.  Not all systems have dirname.
    ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
-@@ -2476,6 +2655,7 @@
+@@ -2476,6 +2664,7 @@
      top_srcdir="$ac_dots$ac_given_srcdir" ;;
    esac
  
@@ -1301,7 +1337,7 @@
    echo creating "$ac_file"
    rm -f "$ac_file"
    configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
-@@ -2484,15 +2664,21 @@
+@@ -2484,15 +2673,21 @@
  # $configure_input" ;;
    *) ac_comsub= ;;
    esac
@@ -1325,22 +1361,35 @@
  
  exit 0
  EOF
---- configure.in.orig	Thu Jun 20 23:36:47 1996
-+++ configure.in	Tue Sep  9 11:20:32 1997
-@@ -228,6 +228,9 @@
- 	V_TARCMD="tar -h -c -f"
- 	V_LIB="$V_LIB -L/usr/local/lib"
+--- /usr/local/pkgsrc//mbone/vic/work/vic-2.8/configure.in	Fri Jun 21 08:36:47 1996
++++ configure.in	Wed Nov 19 15:53:36 1997
+@@ -225,8 +225,13 @@
+ 	V_LIB="$V_LIB -lipc"
  	;;
-+*-*-freebsd*)
+ *-*-netbsd*)
 +	V_STATIC=""
+ 	V_TARCMD="tar -h -c -f"
+-	V_LIB="$V_LIB -L/usr/local/lib"
++	V_LIB="$V_LIB -L/usr/pkg/lib"
++	V_SHM=""
 +	;;
++*-*-freebsd*)
++	V_STATIC=""
+ 	;;
  *-*-hpux*)
  	V_CCOPT="-O"
- 	;;
---- configure.in.tk.orig	Thu May 16 01:06:05 1996
-+++ configure.in.tk	Tue Sep  9 11:01:36 1997
-@@ -12,8 +12,8 @@
- 		echo "can't find tcl.h in $d/include"
+--- /usr/local/pkgsrc//mbone/vic/work/vic-2.8/configure.in.tk	Thu May 16 10:06:05 1996
++++ configure.in.tk	Wed Nov 19 15:45:22 1997
+@@ -7,13 +7,13 @@
+ 		echo "'$d' is not a directory"
+ 		exit 1
+ 	fi
+-	V_INCLUDE_TCL=-I$d/include
+-	if test ! -r $d/include/tcl.h ; then
+-		echo "can't find tcl.h in $d/include"
++	V_INCLUDE_TCL=-I$d
++	if test ! -r $d/tcl.h ; then
++		echo "can't find tcl.h in $d"
  		exit 1
  	fi
 -	places="$d/lib/libtcl7.5.so \
@@ -1359,7 +1408,7 @@
  		$d/lib/tcl"
  	V_LIBRARY_TCL=FAIL
  	for dir in $places; do
-@@ -44,13 +44,14 @@
+@@ -44,13 +44,16 @@
  	AC_TEST_CPP([#include <tcl.h>], V_INCLUDE_TCL="", V_INCLUDE_TCL=FAIL)
  	if test "$V_INCLUDE_TCL" = FAIL; then
  		echo "checking for tcl.h"
@@ -1372,21 +1421,25 @@
  			$prefix/include \
  			$x_includes/tk \
  			$x_includes \
++			/usr/pkg/include \
++			/usr/pkg/include/tcl8.0 \
  			/usr/local/include \
 +			/usr/local/include/tcl8.0 \
  			/usr/contrib/include \
  			/usr/include"
  		for dir in $places; do
-@@ -64,7 +65,7 @@
+@@ -64,22 +67,23 @@
  			exit 1
  		fi
  	fi
 -	AC_CHECK_LIB(tcl7.5, main, V_LIB_TCL="-ltcl7.5", V_LIB_TCL="FAIL")
-+	AC_CHECK_LIB(tcl8.0, main, V_LIB_TCL="-ltcl8.0", V_LIB_TCL="FAIL")
++	AC_CHECK_LIB(tcl80, main, V_LIB_TCL="-ltcl80", V_LIB_TCL="FAIL")
  	if test "$V_LIB_TCL" = FAIL; then
  		echo "checking for libtcl.a"
  		places="\
-@@ -73,13 +74,13 @@
+ 			$prefix/lib \
+ 			$x_libraries \
++			/usr/pkg/lib \
  			/usr/contrib/lib \
  			/usr/local/lib \
  			/usr/lib \
@@ -1405,7 +1458,7 @@
  				break
  			fi
  			if test -r $dir/libtcl.so -o -r $dir/libtcl.a; then
-@@ -98,13 +99,13 @@
+@@ -98,13 +102,14 @@
  	fi
  	echo "checking for tcl/init.tcl"
  	V_LIBRARY_TCL=FAIL
@@ -1417,6 +1470,7 @@
 -		$prefix/lib/tcl7.5 \
 -		$x_libraries/tcl7.5 \
 +	places="/usr/local/lib/tcl8.0 \
++		/usr/pkg/lib/tcl8.0 \
 +		/usr/contrib/lib/tcl8.0 \
 +		/usr/lib/tcl8.0 \
 +		/usr/lib/tk/tcl8.0 \
@@ -1426,8 +1480,16 @@
  		/usr/local/lib/tcl \
  		/usr/lib/tcl \
  		/usr/lib/tk/tcl \
-@@ -138,8 +139,8 @@
- 		echo "can't find tk.h in $d/include"
+@@ -133,13 +138,13 @@
+ 		echo "'$d' is not a directory"
+ 		exit 1
+ 	fi
+-	V_INCLUDE_TK=-I$d/include
+-	if test ! -r $d/include/tk.h ; then
+-		echo "can't find tk.h in $d/include"
++	V_INCLUDE_TK=-I$d
++	if test ! -r $d/tk.h ; then
++		echo "can't find tk.h in $d"
  		exit 1
  	fi
 -	places="$d/lib/libtk4.1.so \
@@ -1437,7 +1499,7 @@
  		$d/lib/libtk.so \
  		$d/lib/libtk.a"
  	V_LIB_TK=FAIL
-@@ -153,7 +154,7 @@
+@@ -153,7 +158,7 @@
  		echo "can't find libtk.a in $d/lib"
  		exit 1
  	fi
@@ -1446,7 +1508,7 @@
  		$d/lib/tk"
  	V_LIBRARY_TK=FAIL
  	for dir in $places; do
-@@ -170,18 +171,19 @@
+@@ -170,18 +175,21 @@
  	AC_TEST_CPP([#include <tk.h>], V_INCLUDE_TK="", V_INCLUDE_TK=FAIL)
  	if test "$V_INCLUDE_TK" = FAIL; then
  		echo "checking for tk.h"
@@ -1454,6 +1516,8 @@
 +		V_INCLUDE_TK="FAIL"
  		places="\
  			$prefix/include \
++			/usr/pkg/include \
++			/usr/pkg/include/tk8.0 \
  			/usr/local/include \
 +			/usr/local/include/tk8.0 \
  			/usr/contrib/include \
@@ -1470,16 +1534,17 @@
  			"
  		for dir in $places; do
  			if test -r $dir/tk.h ; then
-@@ -194,7 +196,7 @@
+@@ -194,21 +202,22 @@
  			exit 1
  		fi
  	fi
 -	AC_CHECK_LIB(tk4.1, main, V_LIB_TK="-ltk4.1", V_LIB_TK="FAIL")
-+	AC_CHECK_LIB(tk8.0, main, V_LIB_TK="-ltk8.0", V_LIB_TK="FAIL")
++	AC_CHECK_LIB(tk80, main, V_LIB_TK="-ltk80", V_LIB_TK="FAIL")
  	if test "$V_LIB_TK" = FAIL; then
  		echo "checking for libtk.a"
  		places="/usr/local/lib \
-@@ -202,13 +204,13 @@
++			/usr/pkg/lib \
+ 			/usr/contrib/lib \
  			/usr/lib \
  			/usr/lib/tk \
  			/import/tcl/lib \
@@ -1497,7 +1562,7 @@
  				break
  			fi
  			if test -r $dir/libtk.so -o -r $dir/libtk.a; then
-@@ -227,15 +229,15 @@
+@@ -227,15 +236,16 @@
  	fi
  	echo "checking for tk/tk.tcl"
  	V_LIBRARY_TK=FAIL
@@ -1511,6 +1576,7 @@
 -		$PWD/../tk4.1/library \
 -		/usr/src/local/tk4.1/library \
 +	places="/usr/local/lib/tk8.0 \
++		/usr/pkg/lib/tk8.0 \
 +		/usr/contrib/lib/tk8.0 \
 +		/usr/lib/tk8.0 \
 +		/usr/lib/tk/tk8.0 \
@@ -1522,8 +1588,8 @@
  		/usr/local/lib/tk \
  		/usr/lib/tk \
  		/usr/lib/tk/tk \
---- Makefile.in.orig	Mon Jul 22 09:32:53 1996
-+++ Makefile.in	Tue Sep  9 11:01:36 1997
+--- /usr/local/pkgsrc//mbone/vic/work/vic-2.8/Makefile.in	Mon Jul 22 18:32:53 1996
++++ Makefile.in	Tue Nov 18 13:16:25 1997
 @@ -303,7 +303,7 @@
  	 chown bin @prefix@/bin/vic
  	 chgrp bin @prefix@/bin/vic
diff --git a/mbone/vic/patches/patch-ab b/mbone/vic/patches/patch-ab
index fc83412a4b4..5922d8cc7b7 100644
--- a/mbone/vic/patches/patch-ab
+++ b/mbone/vic/patches/patch-ab
@@ -1,30 +1,18 @@
-*** grabber-spigot.cc.orig	Fri Nov  1 16:11:59 1996
---- grabber-spigot.cc	Fri Nov  1 16:17:36 1996
-***************
-*** 202,212 ****
-  		hstart_ = 1;
-  		hstop_ = blkw_ - 1;
-  
-  		int	voff = (outh_ - inh_) / 2;
-- 		hwrap_ = outw_ - inw_ ;
-  		int	hoff = hwrap_ / 2;
-  		loff_ = outw_ * voff + hoff;
-  		coff_ = (outw_ >> 1) * (voff >> 1) + (hoff >> 1);
-  		hskip_ = 0;
-  		break;
-  	case f_411:
---- 202,215 ----
-  		hstart_ = 1;
-  		hstop_ = blkw_ - 1;
-  
-+ 		{
-  		int	voff = (outh_ - inh_) / 2;
-  		int	hoff = hwrap_ / 2;
-+ 
-+ 		hwrap_ = outw_ - inw_ ;
-  		loff_ = outw_ * voff + hoff;
-  		coff_ = (outw_ >> 1) * (voff >> 1) + (hoff >> 1);
-+ 		}
-  		hskip_ = 0;
-  		break;
-  	case f_411:
+--- /usr/local/pkgsrc//mbone/vic/work/vic-2.8/grabber-spigot.cc	Sat Jan 13 22:35:28 1996
++++ grabber-spigot.cc	Tue Nov 18 13:16:25 1997
+@@ -202,11 +202,14 @@
+ 		hstart_ = 1;
+ 		hstop_ = blkw_ - 1;
+ 
++		{
+ 		int	voff = (outh_ - inh_) / 2;
+-		hwrap_ = outw_ - inw_ ;
+ 		int	hoff = hwrap_ / 2;
++
++		hwrap_ = outw_ - inw_ ;
+ 		loff_ = outw_ * voff + hoff;
+ 		coff_ = (outw_ >> 1) * (voff >> 1) + (hoff >> 1);
++		}
+ 		hskip_ = 0;
+ 		break;
+ 	case f_411:
diff --git a/mbone/vic/patches/patch-ac b/mbone/vic/patches/patch-ac
index 3b4c4da44ca..b4514856a3a 100644
--- a/mbone/vic/patches/patch-ac
+++ b/mbone/vic/patches/patch-ac
@@ -1,5 +1,5 @@
---- grabber-qcam.cc.orig	Sat Nov  2 23:22:46 1996
-+++ grabber-qcam.cc	Sat Nov  2 23:23:34 1996
+--- /usr/local/pkgsrc//mbone/vic/work/vic-2.8/grabber-qcam.cc	Fri Jun 21 06:39:36 1996
++++ grabber-qcam.cc	Tue Nov 18 13:16:25 1997
 @@ -84,6 +84,11 @@
  #define CIF_HEIGHT 288
  
diff --git a/mbone/vic/patches/patch-ad b/mbone/vic/patches/patch-ad
index b05eaed5d11..2bb0ab8b991 100644
--- a/mbone/vic/patches/patch-ad
+++ b/mbone/vic/patches/patch-ad
@@ -1,5 +1,5 @@
---- main.cc.orig	Mon Jul 22 13:12:22 1996
-+++ main.cc	Tue Sep  9 10:25:36 1997
+--- /usr/local/pkgsrc//mbone/vic/work/vic-2.8/main.cc	Mon Jul 22 22:12:22 1996
++++ main.cc	Tue Nov 18 13:16:25 1997
 @@ -177,7 +177,7 @@
  		else {
  			Tk_Window tk = t.tkmain();
diff --git a/mbone/vic/patches/patch-ae b/mbone/vic/patches/patch-ae
index 8424b66fc78..b420debcde9 100644
--- a/mbone/vic/patches/patch-ae
+++ b/mbone/vic/patches/patch-ae
@@ -1,5 +1,5 @@
---- tkStripchart.c.orig	Tue Sep  9 11:00:42 1997
-+++ tkStripchart.c	Tue Sep  9 10:52:30 1997
+--- /usr/local/pkgsrc//mbone/vic/work/vic-2.8/tkStripchart.c	Sat Mar 16 22:14:00 1996
++++ tkStripchart.c	Tue Nov 18 13:16:26 1997
 @@ -148,7 +148,7 @@
  	int scrollrequired;
  	int guarantee_draw;
diff --git a/mbone/vic/patches/patch-af b/mbone/vic/patches/patch-af
new file mode 100644
index 00000000000..d4c101cfa54
--- /dev/null
+++ b/mbone/vic/patches/patch-af
@@ -0,0 +1,20 @@
+--- /usr/local/pkgsrc//mbone/vic/work/vic-2.8/config.h	Thu May 16 14:27:06 1996
++++ config.h	Wed Nov 19 15:46:41 1997
+@@ -36,7 +36,7 @@
+ #ifndef vic_config_h
+ #define vic_config_h
+ 
+-#if defined(sgi) || defined(__bsdi__) || defined(__FreeBSD__)
++#if defined(sgi) || defined(__bsdi__) || defined(__FreeBSD__) || defined(__NetBSD__)
+ #include <sys/types.h>
+ #elif defined(linux)
+ #include <sys/bitypes.h>
+@@ -83,7 +83,7 @@
+ #include <arpa/inet.h>
+ int strcasecmp(const char *, const char *);
+ clock_t clock(void);
+-#if !defined(sco) && !defined(sgi) && !defined(__bsdi__) && !defined(__FreeBSD__)
++#if !defined(sco) && !defined(sgi) && !defined(__bsdi__) && !defined(__FreeBSD__) && !defined(__NetBSD__)
+ int gethostid(void);
+ #endif
+ time_t time(time_t *);
diff --git a/mbone/vic/pkg/PLIST b/mbone/vic/pkg/PLIST
index 8d9d7aad4e7..c65a7701fca 100644
--- a/mbone/vic/pkg/PLIST
+++ b/mbone/vic/pkg/PLIST
@@ -1,3 +1,4 @@
+@comment $NetBSD: PLIST,v 1.2 1997/11/19 16:28:28 is Exp $
 bin/vic
 bin/histtolut
 man/man1/vic.1.gz