diff options
Diffstat (limited to 'mbone')
| -rw-r--r-- | mbone/vic/Makefile | 4 | ||||
| -rw-r--r-- | mbone/vic/files/patch-aa | 1336 | ||||
| -rw-r--r-- | mbone/vic/files/patch-af | 136 | ||||
| -rw-r--r-- | mbone/vic/files/patch-al | 295 |
4 files changed, 100 insertions, 1671 deletions
diff --git a/mbone/vic/Makefile b/mbone/vic/Makefile index e603957..6cb3856 100644 --- a/mbone/vic/Makefile +++ b/mbone/vic/Makefile @@ -3,7 +3,7 @@ # Date created: 14 December 1994 # Whom: wollman # -# $Id: Makefile,v 1.13 1998/02/24 21:43:36 jseger Exp $ +# $Id: Makefile,v 1.14 1998/03/17 07:47:52 tg Exp $ # DISTNAME= vic-2.8 @@ -15,7 +15,7 @@ MAINTAINER= fenner@FreeBSD.ORG LIB_DEPENDS= tk80\\.1:${PORTSDIR}/x11/tk80 -GNU_CONFIGURE= yes +USE_AUTOCONF= yes USE_X11= yes MAN1= vic.1 diff --git a/mbone/vic/files/patch-aa b/mbone/vic/files/patch-aa index 982d9f9..eaee861 100644 --- a/mbone/vic/files/patch-aa +++ b/mbone/vic/files/patch-aa @@ -1,1332 +1,14 @@ ---- configure.orig Sun Jun 23 17:59:45 1996 -+++ configure Tue Sep 9 11:20:59 1997 -@@ -1,7 +1,7 @@ - #! /bin/sh - - # Guess values for system-dependent variables and create Makefiles. --# Generated automatically using autoconf version 2.10 -+# Generated automatically using autoconf version 2.12 - # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. - # - # This configure script is free software; the Free Software Foundation -@@ -61,6 +61,8 @@ - # Initialize some other variables. - subdirs= - MFLAGS= MAKEFLAGS= -+# Maximum number of lines to put in a shell here document. -+ac_max_here_lines=12 - - ac_prev= - for ac_option -@@ -342,7 +344,7 @@ - verbose=yes ;; - - -version | --version | --versio | --versi | --vers) -- echo "configure generated by autoconf version 2.10" -+ echo "configure generated by autoconf version 2.12" - exit 0 ;; - - -with-* | --with-*) -@@ -444,11 +446,14 @@ - done - - # NLS nuisances. --# Only set LANG and LC_ALL to C if already set. --# These must not be set unconditionally because not all systems understand --# e.g. LANG=C (notably SCO). --if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi -+# Only set these to C if already set. These must not be set unconditionally -+# because not all systems understand e.g. LANG=C (notably SCO). -+# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'! -+# Non-C LC_CTYPE values break the ctype check. - if test "${LANG+set}" = set; then LANG=C; export LANG; fi -+if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi -+if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi -+if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi - - # confdefs.h avoids OS command line length limits that DEFS can exceed. - rm -rf conftest* confdefs.h -@@ -510,6 +515,7 @@ - ac_cpp='$CPP $CPPFLAGS' - ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' - ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -+cross_compiling=$ac_cv_prog_cc_cross - - if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then - # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. -@@ -577,6 +583,7 @@ - fi - - echo $ac_n "checking host system type""... $ac_c" 1>&6 -+echo "configure:587: checking host system type" >&5 - - host_alias=$host - case "$host_alias" in -@@ -591,12 +598,13 @@ - esac - - host=`$ac_config_sub $host_alias` --host_cpu=`echo $host | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\1/'` --host_vendor=`echo $host | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\2/'` --host_os=`echo $host | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\3/'` -+host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -+host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -+host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` - echo "$ac_t""$host" 1>&6 - - echo $ac_n "checking target system type""... $ac_c" 1>&6 -+echo "configure:608: checking target system type" >&5 - - target_alias=$target - case "$target_alias" in -@@ -608,12 +616,13 @@ - esac - - target=`$ac_config_sub $target_alias` --target_cpu=`echo $target | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\1/'` --target_vendor=`echo $target | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\2/'` --target_os=`echo $target | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\3/'` -+target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -+target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -+target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` - echo "$ac_t""$target" 1>&6 - - echo $ac_n "checking build system type""... $ac_c" 1>&6 -+echo "configure:626: checking build system type" >&5 - - build_alias=$build - case "$build_alias" in -@@ -625,9 +634,9 @@ - esac - - build=`$ac_config_sub $build_alias` --build_cpu=`echo $build | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\1/'` --build_vendor=`echo $build | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\2/'` --build_os=`echo $build | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\3/'` -+build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -+build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -+build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` - echo "$ac_t""$build" 1>&6 - - test "$host_alias" != "$target_alias" && -@@ -639,6 +648,7 @@ - # Extract the first word of "gcc", so it can be a program name with args. - set dummy gcc; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -+echo "configure:652: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -667,6 +677,7 @@ - # Extract the first word of "cc", so it can be a program name with args. - set dummy cc; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -+echo "configure:681: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -713,7 +724,47 @@ - test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } - fi - -+echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -+echo "configure:729: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 -+ -+ac_ext=c -+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -+ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -+cross_compiling=$ac_cv_prog_cc_cross -+ -+cat > conftest.$ac_ext <<EOF -+#line 739 "configure" -+#include "confdefs.h" -+main(){return(0);} -+EOF -+if { (eval echo configure:743: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then -+ ac_cv_prog_cc_works=yes -+ # If we can't run a trivial program, we are probably using a cross compiler. -+ if (./conftest; exit) 2>/dev/null; then -+ ac_cv_prog_cc_cross=no -+ else -+ ac_cv_prog_cc_cross=yes -+ fi -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ ac_cv_prog_cc_works=no -+fi -+rm -fr conftest* -+ -+echo "$ac_t""$ac_cv_prog_cc_works" 1>&6 -+if test $ac_cv_prog_cc_works = no; then -+ { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } -+fi -+echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -+echo "configure:763: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 -+echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 -+cross_compiling=$ac_cv_prog_cc_cross -+ - echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -+echo "configure:768: checking whether we are using GNU C" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -722,7 +773,7 @@ - yes; - #endif - EOF --if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:726: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then -+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:777: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then - ac_cv_prog_gcc=yes - else - ac_cv_prog_gcc=no -@@ -730,40 +781,46 @@ - fi - - echo "$ac_t""$ac_cv_prog_gcc" 1>&6 -+ - if test $ac_cv_prog_gcc = yes; then - GCC=yes -- if test "${CFLAGS+set}" != set; then -- echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 --if eval "test \"`echo '$''{'ac_cv_prog_gcc_g'+set}'`\" = set"; then -+ ac_test_CFLAGS="${CFLAGS+set}" -+ ac_save_CFLAGS="$CFLAGS" -+ CFLAGS= -+ echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -+echo "configure:792: checking whether ${CC-cc} accepts -g" >&5 -+if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - echo 'void f(){}' > conftest.c - if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then -- ac_cv_prog_gcc_g=yes -+ ac_cv_prog_cc_g=yes - else -- ac_cv_prog_gcc_g=no -+ ac_cv_prog_cc_g=no - fi - rm -f conftest* - - fi - --echo "$ac_t""$ac_cv_prog_gcc_g" 1>&6 -- if test $ac_cv_prog_gcc_g = yes; then -- CFLAGS="-g -O" -- else -- CFLAGS="-O" -- fi -+echo "$ac_t""$ac_cv_prog_cc_g" 1>&6 -+ if test "$ac_test_CFLAGS" = set; then -+ CFLAGS="$ac_save_CFLAGS" -+ elif test $ac_cv_prog_cc_g = yes; then -+ CFLAGS="-g -O2" -+ else -+ CFLAGS="-O2" - fi - else - GCC= - test "${CFLAGS+set}" = set || CFLAGS="-g" - fi - --for ac_prog in $CCC c++ g++ gcc CC cxx -+for ac_prog in $CCC c++ g++ gcc CC cxx cc++ - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -+echo "configure:824: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -793,7 +850,53 @@ - test -n "$CXX" || CXX="gcc" - - -+echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -+echo "configure:855: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 -+ -+ac_ext=C -+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -+ac_cpp='$CXXCPP $CPPFLAGS' -+ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -+ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -+cross_compiling=$ac_cv_prog_cxx_cross -+ -+cat > conftest.$ac_ext <<EOF -+#line 865 "configure" -+#include "confdefs.h" -+main(){return(0);} -+EOF -+if { (eval echo configure:869: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then -+ ac_cv_prog_cxx_works=yes -+ # If we can't run a trivial program, we are probably using a cross compiler. -+ if (./conftest; exit) 2>/dev/null; then -+ ac_cv_prog_cxx_cross=no -+ else -+ ac_cv_prog_cxx_cross=yes -+ fi -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ ac_cv_prog_cxx_works=no -+fi -+rm -fr conftest* -+ac_ext=c -+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -+ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -+cross_compiling=$ac_cv_prog_cc_cross -+ -+echo "$ac_t""$ac_cv_prog_cxx_works" 1>&6 -+if test $ac_cv_prog_cxx_works = no; then -+ { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } -+fi -+echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -+echo "configure:895: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 -+echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 -+cross_compiling=$ac_cv_prog_cxx_cross -+ - echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -+echo "configure:900: checking whether we are using GNU C++" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -802,7 +905,7 @@ - yes; - #endif - EOF --if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:806: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then -+if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:909: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then - ac_cv_prog_gxx=yes - else - ac_cv_prog_gxx=no -@@ -810,29 +913,34 @@ - fi - - echo "$ac_t""$ac_cv_prog_gxx" 1>&6 -+ - if test $ac_cv_prog_gxx = yes; then - GXX=yes -- if test "${CXXFLAGS+set}" != set; then -- echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 --if eval "test \"`echo '$''{'ac_cv_prog_gxx_g'+set}'`\" = set"; then -+ ac_test_CXXFLAGS="${CXXFLAGS+set}" -+ ac_save_CXXFLAGS="$CXXFLAGS" -+ CXXFLAGS= -+ echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 -+echo "configure:924: checking whether ${CXX-g++} accepts -g" >&5 -+if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - echo 'void f(){}' > conftest.cc - if test -z "`${CXX-g++} -g -c conftest.cc 2>&1`"; then -- ac_cv_prog_gxx_g=yes -+ ac_cv_prog_cxx_g=yes - else -- ac_cv_prog_gxx_g=no -+ ac_cv_prog_cxx_g=no - fi - rm -f conftest* - - fi - --echo "$ac_t""$ac_cv_prog_gxx_g" 1>&6 -- if test $ac_cv_prog_gxx_g = yes; then -- CXXFLAGS="-g -O" -- else -- CXXFLAGS="-O" -- fi -+echo "$ac_t""$ac_cv_prog_cxx_g" 1>&6 -+ if test "$ac_test_CXXFLAGS" = set; then -+ CXXFLAGS="$ac_save_CXXFLAGS" -+ elif test $ac_cv_prog_cxx_g = yes; then -+ CXXFLAGS="-g -O2" -+ else -+ CXXFLAGS="-O2" - fi - else - GXX= -@@ -840,6 +948,7 @@ - fi - - echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -+echo "configure:952: checking how to run the C preprocessor" >&5 - # On Suns, sometimes $CPP names a directory. - if test -n "$CPP" && test -d "$CPP"; then - CPP= -@@ -854,33 +963,37 @@ - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. - cat > conftest.$ac_ext <<EOF --#line 858 "configure" -+#line 967 "configure" - #include "confdefs.h" - #include <assert.h> - Syntax Error - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:864: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:973: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out` - if test -z "$ac_err"; then - : - else - echo "$ac_err" >&5 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 - rm -rf conftest* - CPP="${CC-cc} -E -traditional-cpp" - cat > conftest.$ac_ext <<EOF --#line 873 "configure" -+#line 984 "configure" - #include "confdefs.h" - #include <assert.h> - Syntax Error - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:879: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:990: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out` - if test -z "$ac_err"; then - : - else - echo "$ac_err" >&5 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 - rm -rf conftest* - CPP=/lib/cpp - fi -@@ -895,38 +1008,13 @@ - fi - echo "$ac_t""$CPP" 1>&6 - --# If we cannot run a trivial program, we must be cross compiling. --echo $ac_n "checking whether cross-compiling""... $ac_c" 1>&6 --if eval "test \"`echo '$''{'ac_cv_c_cross'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- if test "$cross_compiling" = yes; then -- ac_cv_c_cross=yes --else --cat > conftest.$ac_ext <<EOF --#line 908 "configure" --#include "confdefs.h" --main(){return(0);} --EOF --{ (eval echo configure:912: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } --if test -s conftest && (./conftest; exit) 2>/dev/null; then -- ac_cv_c_cross=no --else -- ac_cv_c_cross=yes --fi --fi --rm -fr conftest* --fi -- --echo "$ac_t""$ac_cv_c_cross" 1>&6 --cross_compiling=$ac_cv_c_cross -- - echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -+echo "configure:1013: checking for ANSI C header files" >&5 - if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 930 "configure" -+#line 1018 "configure" - #include "confdefs.h" - #include <stdlib.h> - #include <stdarg.h> -@@ -934,13 +1022,15 @@ - #include <float.h> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:938: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:1026: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out` - if test -z "$ac_err"; then - rm -rf conftest* - ac_cv_header_stdc=yes - else - echo "$ac_err" >&5 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_header_stdc=no - fi -@@ -949,7 +1039,7 @@ - if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat > conftest.$ac_ext <<EOF --#line 953 "configure" -+#line 1043 "configure" - #include "confdefs.h" - #include <string.h> - EOF -@@ -967,7 +1057,7 @@ - if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat > conftest.$ac_ext <<EOF --#line 971 "configure" -+#line 1061 "configure" - #include "confdefs.h" - #include <stdlib.h> - EOF -@@ -987,8 +1077,8 @@ - if test "$cross_compiling" = yes; then - : - else --cat > conftest.$ac_ext <<EOF --#line 992 "configure" -+ cat > conftest.$ac_ext <<EOF -+#line 1082 "configure" - #include "confdefs.h" - #include <ctype.h> - #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -@@ -999,15 +1089,19 @@ - exit (0); } - - EOF --{ (eval echo configure:1003: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } --if test -s conftest && (./conftest; exit) 2>/dev/null; then -+if { (eval echo configure:1093: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null -+then - : - else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -fr conftest* - ac_cv_header_stdc=no - fi --fi - rm -fr conftest* - fi -+ -+fi - fi - - echo "$ac_t""$ac_cv_header_stdc" 1>&6 -@@ -1020,24 +1114,27 @@ - - for ac_hdr in string.h - do --ac_safe=`echo "$ac_hdr" | tr './\055' '___'` -+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -+echo "configure:1120: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 1030 "configure" -+#line 1125 "configure" - #include "confdefs.h" - #include <$ac_hdr> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:1035: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:1130: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out` - if test -z "$ac_err"; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" - else - echo "$ac_err" >&5 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" - fi -@@ -1045,7 +1142,7 @@ - fi - if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- ac_tr_hdr=HAVE_`echo $ac_hdr | tr 'abcdefghijklmnopqrstuvwxyz./\055' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ___'` -+ ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <<EOF - #define $ac_tr_hdr 1 - EOF -@@ -1066,26 +1163,28 @@ - V_TARCMD="tar cfh" - V_SIGRET="void" - --echo $ac_n "checking for -lXbsd""... $ac_c" 1>&6 --ac_lib_var=`echo Xbsd'_'main | tr './+\055' '__p_'` -+echo $ac_n "checking for main in -lXbsd""... $ac_c" 1>&6 -+echo "configure:1168: checking for main in -lXbsd" >&5 -+ac_lib_var=`echo Xbsd'_'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="-lXbsd $LIBS" - cat > conftest.$ac_ext <<EOF --#line 1078 "configure" -+#line 1176 "configure" - #include "confdefs.h" - --int main() { return 0; } --int t() { -+int main() { - main() - ; return 0; } - EOF --if { (eval echo configure:1086: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then -+if { (eval echo configure:1183: \"$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 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" - fi -@@ -1100,30 +1199,32 @@ - echo "$ac_t""no" 1>&6 - fi - --echo $ac_n "checking for -lsocket""... $ac_c" 1>&6 --ac_lib_var=`echo socket'_'poll | tr './+\055' '__p_'` -+echo $ac_n "checking for poll in -lsocket""... $ac_c" 1>&6 -+echo "configure:1204: checking for poll in -lsocket" >&5 -+ac_lib_var=`echo socket'_'poll | 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="-lsocket $LIBS" - cat > conftest.$ac_ext <<EOF --#line 1112 "configure" -+#line 1212 "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 - builtin and then its argument prototype would still apply. */ - char poll(); - --int main() { return 0; } --int t() { -+int main() { - poll() - ; return 0; } - EOF --if { (eval echo configure:1124: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then -+if { (eval echo configure:1223: \"$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 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" - fi -@@ -1138,30 +1239,32 @@ - echo "$ac_t""no" 1>&6 - fi - --echo $ac_n "checking for -lnsl""... $ac_c" 1>&6 --ac_lib_var=`echo nsl'_'gethostbyname | tr './+\055' '__p_'` -+echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -+echo "configure:1244: checking for gethostbyname in -lnsl" >&5 -+ac_lib_var=`echo nsl'_'gethostbyname | 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="-lnsl $LIBS" - cat > conftest.$ac_ext <<EOF --#line 1150 "configure" -+#line 1252 "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 - builtin and then its argument prototype would still apply. */ - char gethostbyname(); - --int main() { return 0; } --int t() { -+int main() { - gethostbyname() - ; return 0; } - EOF --if { (eval echo configure:1162: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then -+if { (eval echo configure:1263: \"$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 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" - fi -@@ -1176,30 +1279,32 @@ - echo "$ac_t""no" 1>&6 - fi - --echo $ac_n "checking for -ldnet_stub""... $ac_c" 1>&6 --ac_lib_var=`echo dnet_stub'_'getnodebyname | tr './+\055' '__p_'` -+echo $ac_n "checking for getnodebyname in -ldnet_stub""... $ac_c" 1>&6 -+echo "configure:1284: checking for getnodebyname in -ldnet_stub" >&5 -+ac_lib_var=`echo dnet_stub'_'getnodebyname | 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="-ldnet_stub $LIBS" - cat > conftest.$ac_ext <<EOF --#line 1188 "configure" -+#line 1292 "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 - builtin and then its argument prototype would still apply. */ - char getnodebyname(); - --int main() { return 0; } --int t() { -+int main() { - getnodebyname() - ; return 0; } - EOF --if { (eval echo configure:1200: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then -+if { (eval echo configure:1303: \"$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 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" - fi -@@ -1304,18 +1409,20 @@ - echo "checking for X11 header files" - if test "$x_includes" = NONE ; then - cat > conftest.$ac_ext <<EOF --#line 1308 "configure" -+#line 1413 "configure" - #include "confdefs.h" - #include <X11/Intrinsic.h> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:1313: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:1418: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out` - if test -z "$ac_err"; then - rm -rf conftest* - x_includes="" - else - echo "$ac_err" >&5 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 - rm -rf conftest* - x_includes=NONE - fi -@@ -1340,30 +1447,32 @@ - - echo "checking for X11 library archive" - if test "$x_libraries" = NONE ; then -- echo $ac_n "checking for -lX11""... $ac_c" 1>&6 --ac_lib_var=`echo X11'_'XOpenDisplay | tr './+\055' '__p_'` -+ echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6 -+echo "configure:1452: checking for XOpenDisplay in -lX11" >&5 -+ac_lib_var=`echo X11'_'XOpenDisplay | 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="-lX11 $LIBS" - cat > conftest.$ac_ext <<EOF --#line 1352 "configure" -+#line 1460 "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 - builtin and then its argument prototype would still apply. */ - char XOpenDisplay(); - --int main() { return 0; } --int t() { -+int main() { - XOpenDisplay() - ; return 0; } - EOF --if { (eval echo configure:1364: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then -+if { (eval echo configure:1471: \"$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 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" - fi -@@ -1397,30 +1506,32 @@ - - if test -n "$V_SHM" ; then - if test -z "$x_libraries" ; then -- echo $ac_n "checking for -lXext""... $ac_c" 1>&6 --ac_lib_var=`echo Xext'_'XShmAttach | tr './+\055' '__p_'` -+ echo $ac_n "checking for XShmAttach in -lXext""... $ac_c" 1>&6 -+echo "configure:1511: checking for XShmAttach in -lXext" >&5 -+ac_lib_var=`echo Xext'_'XShmAttach | 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="-lXext -lX11 $LIBS" - cat > conftest.$ac_ext <<EOF --#line 1409 "configure" -+#line 1519 "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 - builtin and then its argument prototype would still apply. */ - char XShmAttach(); - --int main() { return 0; } --int t() { -+int main() { - XShmAttach() - ; return 0; } - EOF --if { (eval echo configure:1421: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then -+if { (eval echo configure:1530: \"$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 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 - 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" - exit 1 - fi -- places="$d/lib/libtcl7.5.so \ -- $d/lib/libtcl7.5.a \ -+ places="$d/lib/libtcl8.0.so \ -+ $d/lib/libtcl8.0.a \ - $d/lib/libtcl.so \ - $d/lib/libtcl.a" - V_LIB_TCL=FAIL -@@ -1493,7 +1604,7 @@ - echo "can't find libtcl.a in $d/lib" - exit 1 - fi -- places="$d/lib/tcl7.5 \ -+ places="$d/lib/tcl8.0 \ - $d/lib/tcl" - V_LIBRARY_TCL=FAIL - for dir in $places; do -@@ -1508,31 +1619,34 @@ - fi - else - cat > conftest.$ac_ext <<EOF --#line 1512 "configure" -+#line 1623 "configure" - #include "confdefs.h" - #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; } -+{ (eval echo configure:1628: \"$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/../tcl8.0 \ -+ /usr/src/local/tcl8.0 \ -+ /import/tcl/include/tcl8.0 \ - $prefix/include \ - $x_includes/tk \ - $x_includes \ - /usr/local/include \ -+ /usr/local/include/tcl8.0 \ - /usr/contrib/include \ - /usr/include" - for dir in $places; do -@@ -1546,26 +1660,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_%'` - 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" - cat > conftest.$ac_ext <<EOF --#line 1558 "configure" -+#line 1673 "configure" - #include "confdefs.h" - --int main() { return 0; } --int t() { -+int main() { - main() - ; 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 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" - fi -@@ -1575,7 +1691,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" - else - echo "$ac_t""no" 1>&6 - V_LIB_TCL="FAIL" -@@ -1589,13 +1705,13 @@ - /usr/contrib/lib \ - /usr/local/lib \ - /usr/lib \ -- $PWD/../tcl7.5 \ -- /usr/src/local/tcl7.5 \ -- /import/tcl/lib/tcl7.5 \ -+ $PWD/../tcl8.0 \ -+ /usr/src/local/tcl8.0 \ -+ /import/tcl/lib/tcl8.0 \ - " - for dir in $places; do -- if test -r $dir/libtcl7.5.so -o -r $dir/libtcl7.5.a; then -- V_LIB_TCL="-L$dir -ltcl7.5" -+ if test -r $dir/libtcl80.so -o -r $dir/libtcl80.a; then -+ V_LIB_TCL="-L$dir -ltcl80" - break - fi - if test -r $dir/libtcl.so -o -r $dir/libtcl.a; then -@@ -1614,13 +1730,13 @@ - fi - echo "checking for tcl/init.tcl" - V_LIBRARY_TCL=FAIL -- places="/usr/local/lib/tcl7.5 \ -- /usr/contrib/lib/tcl7.5 \ -- /usr/lib/tcl7.5 \ -- /usr/lib/tk/tcl7.5 \ -- /import/tcl/lib/tcl7.5 \ -- $prefix/lib/tcl7.5 \ -- $x_libraries/tcl7.5 \ -+ places="/usr/local/lib/tcl8.0 \ -+ /usr/contrib/lib/tcl8.0 \ -+ /usr/lib/tcl8.0 \ -+ /usr/lib/tk/tcl8.0 \ -+ /import/tcl/lib/tcl8.0 \ -+ $prefix/lib/tcl8.0 \ -+ $x_libraries/tcl8.0 \ - /usr/local/lib/tcl \ - /usr/lib/tcl \ - /usr/lib/tk/tcl \ -@@ -1661,8 +1777,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/libtk8.0.so \ -+ $d/lib/libtk8.0.a \ - $d/lib/libtk.so \ - $d/lib/libtk.a" - V_LIB_TK=FAIL -@@ -1676,7 +1792,7 @@ - echo "can't find libtk.a in $d/lib" - exit 1 - fi -- places="$d/lib/tk4.1 \ -+ places="$d/lib/tk8.0 \ - $d/lib/tk" - V_LIBRARY_TK=FAIL - for dir in $places; do -@@ -1691,36 +1807,39 @@ - fi - else - cat > conftest.$ac_ext <<EOF --#line 1695 "configure" -+#line 1811 "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; } - ac_err=`grep -v '^ *+' conftest.out` - if test -z "$ac_err"; then - rm -rf conftest* - V_INCLUDE_TK="" - else - echo "$ac_err" >&5 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 - rm -rf conftest* - V_INCLUDE_TK=FAIL - fi - rm -f conftest* - if test "$V_INCLUDE_TK" = FAIL; then - echo "checking for tk.h" -- V_INCLUDE_TK="" -+ V_INCLUDE_TK="FAIL" - places="\ - $prefix/include \ - /usr/local/include \ -+ /usr/local/include/tk8.0 \ - /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/../tk8.0 \ -+ /usr/src/local/tk8.0 \ -+ /import/tcl/include/tk8.0 \ - " - for dir in $places; do - if test -r $dir/tk.h ; then -@@ -1733,26 +1852,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_%'` - 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" - cat > conftest.$ac_ext <<EOF --#line 1745 "configure" -+#line 1865 "configure" - #include "confdefs.h" - --int main() { return 0; } --int t() { -+int main() { - main() - ; 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 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" - fi -@@ -1762,7 +1883,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" - else - echo "$ac_t""no" 1>&6 - V_LIB_TK="FAIL" -@@ -1775,13 +1896,13 @@ - /usr/lib \ - /usr/lib/tk \ - /import/tcl/lib \ -- $PWD/../tk4.1 \ -- /usr/src/local/tk4.1 \ -+ $PWD/../tk8.0 \ -+ /usr/src/local/tk8.0 \ - $prefix/lib \ - $x_libraries" - for dir in $places; do -- if test -r $dir/libtk4.1.so -o -r $dir/libtk4.1.a; then -- V_LIB_TK="-L$dir -ltk4.1" -+ if test -r $dir/libtk80.so -o -r $dir/libtk80.a; then -+ V_LIB_TK="-L$dir -ltk80" - break - fi - if test -r $dir/libtk.so -o -r $dir/libtk.a; then -@@ -1800,15 +1921,15 @@ - fi - echo "checking for tk/tk.tcl" - V_LIBRARY_TK=FAIL -- places="/usr/local/lib/tk4.1 \ -- /usr/contrib/lib/tk4.1 \ -- /usr/lib/tk4.1 \ -- /usr/lib/tk/tk4.1 \ -- /import/tcl/lib/tk4.1 \ -- $prefix/lib/tk4.1 \ -- $x_libraries/tk4.1 \ -- $PWD/../tk4.1/library \ -- /usr/src/local/tk4.1/library \ -+ places="/usr/local/lib/tk8.0 \ -+ /usr/contrib/lib/tk8.0 \ -+ /usr/lib/tk8.0 \ -+ /usr/lib/tk/tk8.0 \ -+ /import/tcl/lib/tk8.0 \ -+ $prefix/lib/tk8.0 \ -+ $x_libraries/tk8.0 \ -+ $PWD/../tk8.0/library \ -+ /usr/src/local/tk8.0/library \ - /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" - ;; -+*-*-freebsd*) -+ V_STATIC="" -+ ;; - *-*-hpux*) - V_CCOPT="-O" - ;; -@@ -2131,30 +2255,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 -+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 - else - ac_save_LIBS="$LIBS" - LIBS="-ldl $LIBS" - cat > conftest.$ac_ext <<EOF --#line 2143 "configure" -+#line 2268 "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 - builtin and then its argument prototype would still apply. */ - char dlopen(); - --int main() { return 0; } --int t() { -+int main() { - dlopen() - ; 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 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" - fi -@@ -2176,26 +2302,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 -+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 - else - ac_save_LIBS="$LIBS" - LIBS="-l$V_LIB_DL $V_STATIC $LIBS" - cat > conftest.$ac_ext <<EOF --#line 2188 "configure" -+#line 2315 "configure" - #include "confdefs.h" - --int main() { return 0; } --int t() { -+int main() { - main() - ; 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 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" - fi -@@ -2205,7 +2333,8 @@ - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- ac_tr_lib=HAVE_LIB`echo $V_LIB_DL | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` -+ ac_tr_lib=HAVE_LIB`echo $V_LIB_DL | sed -e 's/[^a-zA-Z0-9_]/_/g' \ -+ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` - cat >> confdefs.h <<EOF - #define $ac_tr_lib 1 - EOF -@@ -2279,11 +2408,25 @@ - # --recheck option to rerun configure. - # - EOF -+# The following way of writing the cache mishandles newlines in values, -+# but we know of no workaround that is simple, portable, and efficient. -+# So, don't put newlines in cache variables' values. - # Ultrix sh set writes to stderr and can't be redirected directly, - # and sets the high bit in the cache file unless we assign to the vars. - (set) 2>&1 | -- sed -n "s/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=\${\1='\2'}/p" \ -- >> confcache -+ case `(ac_space=' '; set) 2>&1` in -+ *ac_space=\ *) -+ # `set' does not quote correctly, so add quotes (double-quote substitution -+ # turns \\\\ into \\, and sed turns \\ into \). -+ sed -n \ -+ -e "s/'/'\\\\''/g" \ -+ -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p" -+ ;; -+ *) -+ # `set' quotes correctly as required by POSIX, so do not add quotes. -+ sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p' -+ ;; -+ esac >> confcache - if cmp -s $cache_file confcache; then - : - else -@@ -2350,7 +2493,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) -- echo "$CONFIG_STATUS generated by autoconf version 2.10" -+ echo "$CONFIG_STATUS generated by autoconf version 2.12" - exit 0 ;; - -help | --help | --hel | --he | --h) - echo "\$ac_cs_usage"; exit 0 ;; -@@ -2439,20 +2582,56 @@ - - CEOF - EOF -+ -+cat >> $CONFIG_STATUS <<\EOF -+ -+# Split the substitutions into bite-sized pieces for seds with -+# small command number limits, like on Digital OSF/1 and HP-UX. -+ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script. -+ac_file=1 # Number of current file. -+ac_beg=1 # First line for current file. -+ac_end=$ac_max_sed_cmds # Line after last line for current file. -+ac_more_lines=: -+ac_sed_cmds="" -+while $ac_more_lines; do -+ if test $ac_beg -gt 1; then -+ sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file -+ else -+ sed "${ac_end}q" conftest.subs > conftest.s$ac_file -+ fi -+ if test ! -s conftest.s$ac_file; then -+ ac_more_lines=false -+ rm -f conftest.s$ac_file -+ else -+ if test -z "$ac_sed_cmds"; then -+ ac_sed_cmds="sed -f conftest.s$ac_file" -+ else -+ ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file" -+ fi -+ ac_file=`expr $ac_file + 1` -+ ac_beg=$ac_end -+ ac_end=`expr $ac_end + $ac_max_sed_cmds` -+ fi -+done -+if test -z "$ac_sed_cmds"; then -+ ac_sed_cmds=cat -+fi -+EOF -+ - cat >> $CONFIG_STATUS <<EOF - - CONFIG_FILES=\${CONFIG_FILES-"Makefile"} - EOF - cat >> $CONFIG_STATUS <<\EOF - for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then -- # Support "outfile[:infile]", defaulting infile="outfile.in". -+ # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". - case "$ac_file" in -- *:*) ac_file_in=`echo "$ac_file"|sed 's%.*:%%'` -+ *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'` - ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; - *) ac_file_in="${ac_file}.in" ;; - esac - -- # Adjust relative srcdir, etc. for subdirectories. -+ # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories. - - # Remove last slash and all that follows it. Not all systems have dirname. - ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'` -@@ -2476,6 +2655,7 @@ - top_srcdir="$ac_dots$ac_given_srcdir" ;; - esac - -+ - 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 @@ - # $configure_input" ;; - *) ac_comsub= ;; - esac -+ -+ ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` - sed -e "$ac_comsub - s%@configure_input@%$configure_input%g - s%@srcdir@%$srcdir%g - s%@top_srcdir@%$top_srcdir%g --" -f conftest.subs $ac_given_srcdir/$ac_file_in > $ac_file -+" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file - fi; done --rm -f conftest.subs -+rm -f conftest.s* - -+EOF -+cat >> $CONFIG_STATUS <<EOF - -+EOF -+cat >> $CONFIG_STATUS <<\EOF - - exit 0 - EOF --- configure.in.orig Thu Jun 20 23:36:47 1996 +++ configure.in Tue Sep 9 11:20:32 1997 +@@ -34,7 +34,7 @@ + + V_LIB_GRABBER="" + V_INCLUDE_GRABBER="" +-V_OBJ_GRABBER="" ++V_OBJ_GRABBER="grabber-x11.cc" + V_LIB_XIL="" + V_OBJ_XIL="" + @@ -228,6 +228,9 @@ V_TARCMD="tar -h -c -f" V_LIB="$V_LIB -L/usr/local/lib" diff --git a/mbone/vic/files/patch-af b/mbone/vic/files/patch-af index 9d72ea2..cd4e0bc 100644 --- a/mbone/vic/files/patch-af +++ b/mbone/vic/files/patch-af @@ -1,5 +1,5 @@ ---- grabber-meteor.cc.orig Sat May 18 11:44:54 1996 -+++ grabber-meteor.cc Thu Dec 18 18:35:09 1997 +--- grabber-meteor.cc.orig Fri Jun 26 11:25:55 1998 ++++ grabber-meteor.cc Fri Jun 26 11:18:53 1998 @@ -43,7 +43,6 @@ * */ @@ -8,7 +8,7 @@ #include <stdio.h> #include <stdlib.h> #include <unistd.h> -@@ -51,14 +50,13 @@ +@@ -51,16 +50,16 @@ #include <sys/types.h> #include <sys/ioctl.h> #include <sys/mman.h> @@ -24,8 +24,11 @@ +#include "bsd-endian.h" #include <machine/ioctl_meteor.h> ++#include <machine/ioctl_bt848.h> -@@ -72,62 +70,85 @@ + /*XXX*/ + #define NTSC_WIDTH 320 +@@ -72,62 +71,78 @@ class MeteorGrabber : public Grabber { @@ -63,6 +66,7 @@ - struct meteor_counts cnts_; /* pointer to counters */ - double start_time_; -#endif ++ int tuner_ ; /* tuner device... */ }; -static const int f_411 = 0; /* coder_format_s */ @@ -108,50 +112,43 @@ MeteorScanner::MeteorScanner(const int n) { - char* devname_template = "/dev/meteor%d"; - char* nickname_template = "Matrox Meteor %d"; -+ char* devname_template1 = "/dev/bktr%d"; -+ char* nickname_template1 = "BrookTree848 %d"; -+ -+ +- char* devname_template = "/dev/meteor%d"; +- char* nickname_template = "Matrox Meteor %d"; ++ static char *d[] = { "/dev/bktr%d", "/dev/meteor%d", NULL }; ++ char *nickname_template = "meteor-%d"; for(int i = 0; i < n; i++) { - char *devname = new char[strlen(devname_template) + 3]; +- char *devname = new char[strlen(devname_template) + 3]; ++ for (int j = 0 ; d[j] != NULL ; j++) { ++ char *devname = new char[strlen(d[j]) + 3]; char *nickname = new char[strlen(nickname_template) + 3]; -+ char *devname1 = new char[strlen(devname_template1) + 3]; -+ char *nickname1 = new char[strlen(nickname_template1) + 3]; ++ sprintf(devname, d[j], i); sprintf(nickname, nickname_template, i + 1); - sprintf(devname, devname_template, i); -+ -+ sprintf(nickname1, nickname_template1, i + 1); -+ sprintf(devname1, devname_template1, i); +- sprintf(devname, devname_template, i); if(access(devname, R_OK) == 0) { int fd = open(devname, O_RDONLY); if(fd < 0) { -@@ -140,7 +161,21 @@ +@@ -140,8 +155,9 @@ delete nickname; delete devname; } -+ -+ if(access(devname1, R_OK) == 0) { -+ int fd = open(devname1, O_RDONLY); -+ if(fd < 0) { -+ new MeteorDevice(nickname1, devname1, 0); -+ } else { -+ (void)close(fd); -+ new MeteorDevice(nickname1, devname1, 1); + } -+ } else { -+ delete nickname1; -+ delete devname1; + } } -+ - } +-} MeteorDevice::MeteorDevice(const char* nickname, const char *devname, int free): -@@ -160,7 +195,10 @@ + InputDevice(nickname), name_(devname) +@@ -149,6 +165,7 @@ + if(free) + attributes_ = "\ + format {422 411} \ ++type {pal ntsc secam auto} \ + size {large normal small cif} \ + port {RCA Port-1 Port-2 Port-3 S-Video RGB}"; + else +@@ -160,7 +177,10 @@ Tcl& tcl = Tcl::instance(); if ((argc == 3) && (strcmp(argv[1], "open") == 0)) { TclObject* o = 0; @@ -163,7 +160,7 @@ if (o != 0) tcl.result(o->name()); return (TCL_OK); -@@ -168,19 +206,8 @@ +@@ -168,19 +188,15 @@ return (InputDevice::command(argc, argv)); } @@ -181,11 +178,22 @@ - abort(); - } - ++ int devnum; ++ if (sscanf(name, "/dev/bktr%d", &devnum) == 1) { ++ char *tunerdev = new char[strlen(name) + 3]; ++ sprintf(tunerdev, "/dev/tuner%d", devnum); ++ tuner_ = open(tunerdev, O_RDONLY); ++ } else ++ tuner_ = -1; dev_ = open(name, O_RDONLY); if (dev_ == -1) { status_ = -1; -@@ -205,27 +232,27 @@ +@@ -203,52 +219,33 @@ + if (dev_ != -1) { + close(dev_); } ++ if (tuner_ != -1) ++ close(tuner_); } -void MeteorGrabber::setsize() @@ -206,22 +214,24 @@ * means do so. */ unsigned short status; - ioctl(dev_, METEORSTATUS, &status); +- ioctl(dev_, METEORSTATUS, &status); - if(status & METEOR_STATUS_HCLK) { /* do we have a source? */ - /* No source, assume ntsc*/ -+ if(status & METEOR_STATUS_HCLK) { -+ /* No source, assume ntsc */ ++ // ioctl(dev_, METEORSTATUS, &status); ++ if ( video_format_ == METEOR_FMT_NTSC ) { if(geom.rows <= NTSC_HEIGHT && geom.columns <= NTSC_WIDTH) geom.oformat |= METEOR_GEO_EVEN_ONLY; } else { - if(status & METEOR_STATUS_FIDT) { /* is it pal or ntsc? */ -+ /* is it pal or ntsc? */ -+ if(status & METEOR_STATUS_FIDT) { - /* 60 hz */ - if(geom.rows<=NTSC_HEIGHT && geom.columns<=NTSC_WIDTH) +- /* 60 hz */ +- if(geom.rows<=NTSC_HEIGHT && geom.columns<=NTSC_WIDTH) +- geom.oformat |= METEOR_GEO_EVEN_ONLY; +- } else { /* 50 hz */ + if(geom.rows<=PAL_HEIGHT && geom.columns<=PAL_WIDTH) geom.oformat |= METEOR_GEO_EVEN_ONLY; -@@ -237,18 +264,6 @@ - + } +- } +- if(ioctl(dev_, METEORSETGEO, &geom) < 0) perror("vic: METERSETGEO: "); - @@ -239,7 +249,7 @@ } void MeteorGrabber::format() -@@ -285,11 +300,6 @@ +@@ -285,11 +282,6 @@ baseheight_ = PAL_HEIGHT * 2; basewidth_ = PAL_WIDTH * 2; } @@ -251,7 +261,7 @@ setsize(); } -@@ -299,15 +309,6 @@ +@@ -299,15 +291,6 @@ format(); int cmd = METEOR_CAP_SINGLE; ioctl(dev_, METEORCAPTUR, (char*)&cmd); @@ -267,7 +277,7 @@ cmd = METEOR_CAP_CONTINOUS; ioctl(dev_, METEORCAPTUR, (char*)&cmd); -@@ -319,19 +320,6 @@ +@@ -319,19 +302,6 @@ int cmd = METEOR_CAP_STOP_CONT; ioctl(dev_, METEORCAPTUR, (char*)&cmd); @@ -287,7 +297,7 @@ Grabber::stop(); } -@@ -345,15 +333,15 @@ +@@ -345,15 +315,15 @@ int MeteorGrabber::command(int argc, const char*const* argv) { @@ -305,7 +315,7 @@ decimate_ = dec; if(running_) { stop(); -@@ -362,7 +350,8 @@ +@@ -362,7 +332,8 @@ } } return (TCL_OK); @@ -315,17 +325,39 @@ int p = port_; if(!strcmp(argv[2], "RCA")) p = METEOR_INPUT_DEV0; if(!strcmp(argv[2], "Port-1")) p = METEOR_INPUT_DEV1; -@@ -377,7 +366,8 @@ +@@ -377,7 +348,30 @@ ioctl(dev_, METEORSINPUT, &port_); } return (TCL_OK); - } else if (strcmp(argv[1], "format") == 0 || + } ++ if (strcmp(argv[1], "freeze") == 0) { ++ int cmd = METEOR_CAP_CONTINOUS ; ++ if ( atoi(argv[2]) != 0 ) ++ cmd = METEOR_CAP_STOP_CONT; ++ ioctl(dev_, METEORCAPTUR, (char*)&cmd); ++ return (TCL_OK); ++ } ++ if (strcmp(argv[1], "chan") == 0) { ++ int p = port_; ++ int c = atoi(argv[2]); ++ if (c > 0 && c < 199) ++ p = METEOR_INPUT_DEV1 ; ++ else ++ p = METEOR_INPUT_DEV0 ; ++ if (p != port_) { ++ port_ = p; ++ ioctl(dev_, METEORSINPUT, &port_); ++ } ++ if (p == METEOR_INPUT_DEV1) ++ ioctl(tuner_, TVTUNER_SETCHNL, &c); ++ return (TCL_OK); ++ } + if (strcmp(argv[1], "format") == 0 || strcmp(argv[1], "type") == 0) { if (strcmp(argv[2], "auto") == 0) video_format_ = METEOR_FMT_AUTOMODE; -@@ -390,14 +380,35 @@ +@@ -390,14 +384,35 @@ if (running_) format(); return (TCL_OK); @@ -365,14 +397,14 @@ switch (video_format_) { case METEOR_FMT_AUTOMODE: -@@ -423,54 +434,316 @@ +@@ -423,54 +438,316 @@ return (TCL_OK); } + if (strcmp(argv[1], "brightness") == 0) { + u_char val; + ioctl(dev_, METEORGBRIG, &val); -+ tcl.resultf("%d", (int)val); ++ tcl.resultf("%d", (unsigned int)val); + return (TCL_OK); + } + if (strcmp(argv[1], "contrast") == 0) { diff --git a/mbone/vic/files/patch-al b/mbone/vic/files/patch-al index 668feff..6aa1658 100644 --- a/mbone/vic/files/patch-al +++ b/mbone/vic/files/patch-al @@ -1,216 +1,5 @@ -diff -ubwr ./grabber-meteor.cc /home/old_wd0f/ports/mbone/vic/work.luigi/vic-2.8-luigi/grabber-meteor.cc ---- ./grabber-meteor.cc Fri May 29 17:06:00 1998 -+++ /home/old_wd0f/ports/mbone/vic/work.luigi/vic-2.8-luigi/grabber-meteor.cc Mon Apr 13 20:47:54 1998 -@@ -59,6 +59,7 @@ - #include "bsd-endian.h" - - #include <machine/ioctl_meteor.h> -+#include <machine/ioctl_bt848.h> - - /*XXX*/ - #define NTSC_WIDTH 320 -@@ -92,6 +93,7 @@ - u_int baseheight_; /* Width of frame to be captured */ - u_int decimate_; /* division of base sizes */ - volatile u_int* pyuv_; /* pointer to yuv data */ -+ int tuner_ ; /* tuner device... */ - }; - - class Meteor422Grabber : public MeteorGrabber { -@@ -131,24 +133,16 @@ - - MeteorScanner::MeteorScanner(const int n) - { -- char* devname_template = "/dev/meteor%d"; -- char* nickname_template = "Matrox Meteor %d"; -- char* devname_template1 = "/dev/bktr%d"; -- char* nickname_template1 = "BrookTree848 %d"; -- -- -+ static char *d[] = { "/dev/bktr%d", "/dev/meteor%d", NULL }; -+ char *nickname_template = "meteor-%d"; - - for(int i = 0; i < n; i++) { -- char *devname = new char[strlen(devname_template) + 3]; -+ for (int j = 0 ; d[j] != NULL ; j++) { -+ char *devname = new char[strlen(d[j]) + 3]; - char *nickname = new char[strlen(nickname_template) + 3]; -- char *devname1 = new char[strlen(devname_template1) + 3]; -- char *nickname1 = new char[strlen(nickname_template1) + 3]; - -+ sprintf(devname, d[j], i); - sprintf(nickname, nickname_template, i + 1); -- sprintf(devname, devname_template, i); -- -- sprintf(nickname1, nickname_template1, i + 1); -- sprintf(devname1, devname_template1, i); - if(access(devname, R_OK) == 0) { - int fd = open(devname, O_RDONLY); - if(fd < 0) { -@@ -161,29 +155,17 @@ - delete nickname; - delete devname; - } -- -- if(access(devname1, R_OK) == 0) { -- int fd = open(devname1, O_RDONLY); -- if(fd < 0) { -- new MeteorDevice(nickname1, devname1, 0); -- } else { -- (void)close(fd); -- new MeteorDevice(nickname1, devname1, 1); - } -- } else { -- delete nickname1; -- delete devname1; - } - } - --} -- - MeteorDevice::MeteorDevice(const char* nickname, const char *devname, int free): - InputDevice(nickname), name_(devname) - { - if(free) - attributes_ = "\ - format {422 411} \ -+type {pal ntsc secam auto} \ - size {large normal small cif} \ - port {RCA Port-1 Port-2 Port-3 S-Video RGB}"; - else -@@ -208,6 +190,7 @@ - - MeteorGrabber::MeteorGrabber(const char* name) - { -+ tuner_ = open("/dev/tuner", O_RDONLY); - dev_ = open(name, O_RDONLY); - if (dev_ == -1) { - status_ = -1; -@@ -230,6 +213,8 @@ - if (dev_ != -1) { - close(dev_); - } -+ if (tuner_ != -1) -+ close(tuner_); - } - - void MeteorGrabber::set_size_meteor(int w, int h) -@@ -245,23 +230,14 @@ - * means do so. - */ - unsigned short status; -- ioctl(dev_, METEORSTATUS, &status); -- if(status & METEOR_STATUS_HCLK) { -- /* No source, assume ntsc */ -+ // ioctl(dev_, METEORSTATUS, &status); -+ if ( video_format_ == METEOR_FMT_NTSC ) { - if(geom.rows <= NTSC_HEIGHT && geom.columns <= NTSC_WIDTH) - geom.oformat |= METEOR_GEO_EVEN_ONLY; - } else { -- /* is it pal or ntsc? */ -- if(status & METEOR_STATUS_FIDT) { -- /* 60 hz */ -- if(geom.rows<=NTSC_HEIGHT && geom.columns<=NTSC_WIDTH) -- geom.oformat |= METEOR_GEO_EVEN_ONLY; -- } else { /* 50 hz */ - if(geom.rows<=PAL_HEIGHT && geom.columns<=PAL_WIDTH) - geom.oformat |= METEOR_GEO_EVEN_ONLY; - } -- } -- - if(ioctl(dev_, METEORSETGEO, &geom) < 0) - perror("vic: METERSETGEO: "); - } -@@ -326,7 +302,7 @@ - void MeteorGrabber::fps(int f) - { - u_short met_fps = (u_short)f; -- (void)ioctl(dev_, METEORSFPS, &met_fps); -+ // (void)ioctl(dev_, METEORSFPS, &met_fps); - - Grabber::fps(f); - } -@@ -367,6 +343,28 @@ - } - return (TCL_OK); - } -+ if (strcmp(argv[1], "freeze") == 0) { -+ int cmd = METEOR_CAP_CONTINOUS ; -+ if ( atoi(argv[2]) != 0 ) -+ cmd = METEOR_CAP_STOP_CONT; -+ ioctl(dev_, METEORCAPTUR, (char*)&cmd); -+ return (TCL_OK); -+ } -+ if (strcmp(argv[1], "chan") == 0) { -+ int p = port_; -+ int c = atoi(argv[2]); -+ if (c > 0 && c < 199) -+ p = METEOR_INPUT_DEV1 ; -+ else -+ p = METEOR_INPUT_DEV0 ; -+ if (p != port_) { -+ port_ = p; -+ ioctl(dev_, METEORSINPUT, &port_); -+ } -+ if (p == METEOR_INPUT_DEV1) -+ ioctl(dev_, TVTUNER_SETCHNL, &c); -+ return (TCL_OK); -+ } - if (strcmp(argv[1], "format") == 0 || - strcmp(argv[1], "type") == 0) { - if (strcmp(argv[2], "auto") == 0) -@@ -437,7 +435,7 @@ - if (strcmp(argv[1], "brightness") == 0) { - u_char val; - ioctl(dev_, METEORGBRIG, &val); -- tcl.resultf("%d", (int)val); -+ tcl.resultf("%d", (unsigned int)val); - return (TCL_OK); - } - if (strcmp(argv[1], "contrast") == 0) { -@@ -507,10 +505,10 @@ - return 0; - - int istride = inw_ * 2; -- suppress((u_char*)pyuv_, istride); -- saveblks((u_char*)pyuv_, istride); -+ suppress((u_char*)pyuv_, istride); // compute which ones to send -+ saveblks((u_char*)pyuv_, istride); // save copied blocks - u_int32_t ts = media_ts(); -- YuvFrame f(ts, frame_, crvec_, outw_, outh_); -+ YuvFrame f(ts, frame_, crvec_, outw_, outh_); // new obj. - return (target_->consume(&f)); - } - -@@ -724,6 +722,7 @@ - u_char* chm = lum + off; - off >>= 2; - -+int to_send = 0 ; - crv += vstart_ * blkw_ + hstart_; - lum += vstart_ * outw_ * 16 + hstart_ * 16; - chm += vstart_ * (outw_ >> 1) * 8 + hstart_ * 8; -@@ -734,9 +733,10 @@ - const u_char* nin = in; - for (int x = hstart_; x < hstop_; ++x) { - int s = *crv++; -- if ((s & CR_SEND) != 0) -+ if ((s & CR_SEND) != 0) { - saveblk(in, lum, chm, chm + off, outw_, is); -- -+ to_send++ ; -+ } - in += 32; - lum += 16; - chm += 8; -@@ -746,4 +746,5 @@ - chm += 7 * (outw_ >> 1) + skip * 8; - in = nin + 16 * is; - } -+ // fprintf(stderr, "this time send %d\n", to_send); - } diff -ubwr ./grabber.cc /home/old_wd0f/ports/mbone/vic/work.luigi/vic-2.8-luigi/grabber.cc ---- ./grabber.cc Tue Feb 6 00:02:00 1996 +--- grabber.cc Tue Feb 6 00:02:00 1996 +++ /home/old_wd0f/ports/mbone/vic/work.luigi/vic-2.8-luigi/grabber.cc Fri Apr 10 15:36:42 1998 @@ -69,6 +69,7 @@ hstart_(0), hstop_(0), @@ -231,31 +20,8 @@ diff -ubwr ./grabber.cc /home/old_wd0f/ports/mbone/vic/work.luigi/vic-2.8-luigi/ if (strcmp(argv[1], "fps") == 0) { /*XXX assume value in range */ fps(atoi(argv[2])); -@@ -194,11 +199,14 @@ - * favoring the more restrictive metric. If we're more than - * 200ms behind (e.g., the cpu is saturated or we've been - * suspended), give up and reset the frame clock. -+ * The argument passed is the number of bytes transmitted. - */ - double Grabber::tick(int n) - { -+ // how much it took to send the data (microseconds) - double frametime = 8e6 * double(n) / double(bps_); - if (frametime < frametime_) { -+ // took less than one frame... - if (frametime * 2. < frametime_) - delta_ += (frametime - delta_) * .25; - else -@@ -207,6 +215,7 @@ - } else - delta_ = frametime; - -+ // when to get next frame (not earlier than now! - frameclock_ += frametime; - double now = gettimeofday(); - double delta = frameclock_ - now; diff -ubwr ./grabber.h /home/old_wd0f/ports/mbone/vic/work.luigi/vic-2.8-luigi/grabber.h ---- ./grabber.h Tue Feb 6 00:02:00 1996 +--- grabber.h Tue Feb 6 00:02:00 1996 +++ /home/old_wd0f/ports/mbone/vic/work.luigi/vic-2.8-luigi/grabber.h Fri Apr 10 15:37:28 1998 @@ -87,6 +87,7 @@ int vstop_; @@ -290,29 +56,8 @@ diff -ubwr ./grabber.h /home/old_wd0f/ports/mbone/vic/work.luigi/vic-2.8-luigi/g center = 1; \ } \ diff -ubwr ./ui-ctrlmenu.tcl /home/old_wd0f/ports/mbone/vic/work.luigi/vic-2.8-luigi/ui-ctrlmenu.tcl ---- ./ui-ctrlmenu.tcl Thu Jun 27 01:27:48 1996 +--- ui-ctrlmenu.tcl Thu Jun 27 01:27:48 1996 +++ /home/old_wd0f/ports/mbone/vic/work.luigi/vic-2.8-luigi/ui-ctrlmenu.tcl Fri Apr 10 16:39:04 1998 -@@ -124,6 +124,7 @@ - catch "wm resizable $w false false" - - frame $w.session -+ # luigi - move next 2 lines to ui-main - frame $w.cb - build.xmit $w.cb - frame $w.encoder -@@ -139,9 +140,12 @@ - -relief raised -anchor c \ - -command "toggle_window $w" -font [mediumfont] - -+ # luigi $w.cb goes into main menu - pack $w.cb $w.encoder $w.decoder $w.session -padx 6 -fill x -+ # pack $w.encoder $w.decoder $w.session -padx 6 -fill x - pack $w.dismiss -anchor c -pady 4 - -+ # luigi - move next 3 lines to ui-main (must check something) - if [have_transmit_permission] { - selectInitialDevice - } @@ -390,11 +394,15 @@ -relief raised -command transmit \ -anchor w -variable transmitButtonState -font $f \ @@ -370,15 +115,6 @@ diff -ubwr ./ui-ctrlmenu.tcl /home/old_wd0f/ports/mbone/vic/work.luigi/vic-2.8-l insert_grabber_panel [$device nickname] -@@ -765,7 +780,7 @@ - -value secam -variable inputType -font $f - - global inputType typeButton -- set inputType auto -+ set inputType pal ; # auto - set typeButton $w - } - @@ -774,7 +789,8 @@ build.encoder_options $w.options build.device $w.device @@ -400,7 +136,7 @@ diff -ubwr ./ui-ctrlmenu.tcl /home/old_wd0f/ports/mbone/vic/work.luigi/vic-2.8-l setFillRate update diff -ubwr ./ui-grabber.tcl /home/old_wd0f/ports/mbone/vic/work.luigi/vic-2.8-luigi/ui-grabber.tcl ---- ./ui-grabber.tcl Fri Jun 21 04:39:35 1996 +--- ui-grabber.tcl Fri Jun 21 04:39:35 1996 +++ /home/old_wd0f/ports/mbone/vic/work.luigi/vic-2.8-luigi/ui-grabber.tcl Fri Apr 10 13:54:42 1998 @@ -39,65 +39,93 @@ # called foo-1, foo-2, etc. and you'll only need build.foo @@ -672,7 +408,7 @@ diff -ubwr ./ui-grabber.tcl /home/old_wd0f/ports/mbone/vic/work.luigi/vic-2.8-lu + +### end of file ### diff -ubwr ./ui-resource.tcl /home/old_wd0f/ports/mbone/vic/work.luigi/vic-2.8-luigi/ui-resource.tcl ---- ./ui-resource.tcl Wed Apr 3 02:33:56 1996 +--- ui-resource.tcl Wed Apr 3 02:33:56 1996 +++ /home/old_wd0f/ports/mbone/vic/work.luigi/vic-2.8-luigi/ui-resource.tcl Fri Apr 10 21:11:56 1998 @@ -140,7 +140,7 @@ option add Vic.useHardwareDecode false startupFile @@ -683,24 +419,3 @@ diff -ubwr ./ui-resource.tcl /home/old_wd0f/ports/mbone/vic/work.luigi/vic-2.8-l option add Vic.siteDropTime "300" startupFile # -diff -ubwr ./ui-util.tcl /home/old_wd0f/ports/mbone/vic/work.luigi/vic-2.8-luigi/ui-util.tcl ---- ./ui-util.tcl Tue Feb 6 00:02:20 1996 -+++ /home/old_wd0f/ports/mbone/vic/work.luigi/vic-2.8-luigi/ui-util.tcl Fri Apr 10 20:49:56 1998 -@@ -64,7 +64,7 @@ - global created$w - if { ! [info exists created$w] } { - set created$w 1 -- wm transient $w . -+ # wm transient $w . - update idletasks - set x [winfo rootx .] - set y [winfo rooty .] -@@ -103,7 +103,7 @@ - } - set title [resource iconPrefix]$title - wm withdraw $w -- wm transient $w . -+ # wm transient $w . - wm title $w $title - wm iconname $w $title - bind $w <Enter> "focus $w" |
