From c6ac4c37007ebfb6c8e561d4bc20f135175d05a1 Mon Sep 17 00:00:00 2001 From: Bill Fenner Date: Thu, 11 Sep 1997 03:55:02 +0000 Subject: Make port work with tcl/tk 8.0 --- audio/vat/Makefile | 14 +- audio/vat/files/patch-aa | 1396 ++++++++++++++++++++++++++++++++++++++++++++-- audio/vat/files/patch-ab | 136 +++++ audio/vat/files/patch-ac | 11 + audio/vat/files/patch-ad | 70 +++ 5 files changed, 1564 insertions(+), 63 deletions(-) create mode 100644 audio/vat/files/patch-ab create mode 100644 audio/vat/files/patch-ac create mode 100644 audio/vat/files/patch-ad (limited to 'audio/vat') diff --git a/audio/vat/Makefile b/audio/vat/Makefile index 730256b041cb..18ab63e0669d 100644 --- a/audio/vat/Makefile +++ b/audio/vat/Makefile @@ -3,25 +3,29 @@ # Date created: 2 November 1996 # Whom: fenner # -# $Id: Makefile,v 1.2 1996/11/13 12:41:19 asami Exp $ +# $Id: Makefile,v 1.3 1997/04/20 13:19:26 wosch Exp $ # DISTNAME= vat-4.0b2 -CATEGORIES= mbone tk41 +CATEGORIES= mbone tk80 MASTER_SITES= ftp://ftp.ee.lbl.gov/conferencing/vat/alpha-test/ DISTFILES= vatsrc-4.0b2.tar.gz MAINTAINER= fenner@FreeBSD.ORG GSM_DIR= ${PORTSDIR}/audio/gsm +GSM_WORK= ${GSM_DIR}/work/gsm-1.0-pl10 -DEPENDS= ${GSM_DIR} -LIB_DEPENDS= tk41:${PORTSDIR}/x11/tk41 \ +# If configure is changed to look for libgsm.a in ${PREFIX}/lib, then +# we can use this first BUILD_DEPENDS and save some work. +#BUILD_DEPENDS= ${GSM_WORK}/inc/private.h:${GSM_DIR}:patch +BUILD_DEPENDS= ${GSM_WORK}/lib/libgsm.a:${GSM_DIR}:build +LIB_DEPENDS= tk80:${PORTSDIR}/x11/tk80 \ gsm:${GSM_DIR} USE_X11= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-gsm=${GSM_DIR}/work/gsm-1.0-pl10 +CONFIGURE_ARGS= --with-gsm=${GSM_WORK} INSTALL_TARGET= install install-man MAN1= vat.1 diff --git a/audio/vat/files/patch-aa b/audio/vat/files/patch-aa index c2acfc13d273..bd53697964a7 100644 --- a/audio/vat/files/patch-aa +++ b/audio/vat/files/patch-aa @@ -1,14 +1,817 @@ --- configure.orig Thu May 16 01:03:58 1996 -+++ configure Thu Nov 7 18:07:17 1996 -@@ -1468,6 +1468,7 @@ ++++ configure Tue Sep 9 11:36:10 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 <&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 <&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 < + 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 < + 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 <&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 < + #include +@@ -934,13 +1022,15 @@ + #include + 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 +@@ -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 +@@ -987,8 +1077,8 @@ + if test "$cross_compiling" = yes; then + : + else +-cat > conftest.$ac_ext < conftest.$ac_ext < + #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 + 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 <&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 <&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 <&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 <&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 <&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 + 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 <&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 <&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 +@@ -1468,6 +1579,7 @@ d="" fi -+tclposs="tcl7.5 tcl75 tcl" ++tclposs="tcl8.0 tcl80 tcl" if test "$d" != "" ; then if test ! -d $d ; then echo "'$d' is not a directory" -@@ -1478,18 +1479,18 @@ +@@ -1478,22 +1590,22 @@ echo "can't find tcl.h in $d/include" exit 1 fi @@ -35,41 +838,106 @@ echo "can't find libtcl.a in $d/lib" exit 1 fi -@@ -1508,12 +1509,12 @@ +- places="$d/lib/tcl7.5 \ ++ places="$d/lib/tcl8.0 \ + $d/lib/tcl" + V_LIBRARY_TCL=FAIL + for dir in $places; do +@@ -1508,31 +1620,34 @@ fi else cat > conftest.$ac_ext < 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:1518: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:1629: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* -@@ -1554,7 +1555,7 @@ + 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 +1661,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:1666: 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="-ltcl7.5 $LIBS" ++LIBS="-ltcl8.0 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; }; then -+if { (eval echo configure:1567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then ++if { (eval echo configure:1681: \"$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 -@@ -1594,12 +1595,17 @@ - /import/tcl/lib/tcl7.5 \ ++ 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 +1692,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,17 +1706,22 @@ + /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 @@ -92,23 +960,39 @@ break fi done -@@ -1623,6 +1629,7 @@ - $x_libraries/tcl7.5 \ +@@ -1614,15 +1736,16 @@ + 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/libdata/tcl \ /usr/lib/tk/tcl \ /import/tcl/lib/tcl \ $prefix/lib/tcl \ -@@ -1651,6 +1658,7 @@ +@@ -1651,6 +1774,7 @@ d="" fi -+tkposs="tk4.1 tk41 tk" ++tkposs="tk8.0 tk80 tk" if test "$d" != "" ; then if test ! -d $d ; then echo "'$d' is not a directory" -@@ -1661,18 +1669,18 @@ +@@ -1661,22 +1785,22 @@ echo "can't find tk.h in $d/include" exit 1 fi @@ -135,40 +1019,97 @@ echo "can't find libtk.a in $d/lib" exit 1 fi -@@ -1691,12 +1699,12 @@ +- places="$d/lib/tk4.1 \ ++ places="$d/lib/tk8.0 \ + $d/lib/tk" + V_LIBRARY_TK=FAIL + for dir in $places; do +@@ -1691,18 +1815,20 @@ fi else cat > conftest.$ac_ext < 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:1708: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:1824: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* -@@ -1741,7 +1749,7 @@ + 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 +@@ -1713,14 +1839,15 @@ + 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 +1860,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:1865: 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="-ltk4.1 $LIBS" ++LIBS="-ltk8.0 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; }; then -+if { (eval echo configure:1761: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then ++if { (eval echo configure:1880: \"$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 -@@ -1780,12 +1788,17 @@ ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" + fi +@@ -1775,17 +1904,22 @@ + /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 @@ -192,37 +1133,78 @@ break fi done -@@ -1944,12 +1957,12 @@ +@@ -1800,15 +1934,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 \ +@@ -1944,18 +2078,20 @@ fi cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1953: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:1966: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:2087: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* -@@ -1963,12 +1976,12 @@ + x=audio-sun.o + else + echo "$ac_err" >&5 ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 + rm -rf conftest* + x="" + fi +@@ -1963,18 +2099,20 @@ V_OBJ_AUDIO="$V_OBJ_AUDIO $x" cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1972: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:1985: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:2108: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* -@@ -2000,17 +2013,20 @@ + x=audio-sun.o + else + echo "$ac_err" >&5 ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 + rm -rf conftest* + x="" + fi +@@ -2000,17 +2138,20 @@ V_DEFINE="$V_DEFINE -DNEED_SUNOS_PROTOS" V_STATIC="-static" ;; @@ -250,7 +1232,7 @@ fi V_LIB_AUDIO="$V_LIB_AUDIO -laudio" V_OBJ_AUDIO="$V_OBJ_AUDIO audio-sgi.o" -@@ -2051,7 +2067,7 @@ +@@ -2051,7 +2192,7 @@ CXX="xlC -+ -qlanglvl=compat -I/usr/lpp/xlC/include -I/usr/include" CC="cc -Dinline=" V_OBJ_AUDIO="$V_OBJ_AUDIO audio-ibm.o" @@ -259,53 +1241,230 @@ ;; *-*-aix4*) V_DEFINE="$V_DEFINE -DSIGARGS=int -D_AIX41" -@@ -2094,7 +2110,7 @@ +@@ -2086,30 +2227,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:2232: 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 <&5; (eval $ac_link) 2>&5; }; then -+if { (eval echo configure:2126: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then ++if { (eval echo configure:2251: \"$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 -@@ -2136,7 +2152,7 @@ ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" + fi +@@ -2128,26 +2271,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:2276: 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 <&5; (eval $ac_link) 2>&5; }; then -+if { (eval echo configure:2164: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then ++if { (eval echo configure:2291: \"$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 +@@ -2157,7 +2302,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 <&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 +@@ -2302,7 +2462,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 ;; +@@ -2392,20 +2552,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 <> $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%/[^/][^/]*$%%'` +@@ -2429,6 +2625,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." +@@ -2437,15 +2634,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 <> $CONFIG_STATUS <<\EOF + + exit 0 + EOF --- configure.in.tk.orig Thu May 16 01:06:05 1996 -+++ configure.in.tk Thu Nov 7 18:05:18 1996 ++++ configure.in.tk Tue Sep 9 11:35:45 1997 @@ -2,6 +2,7 @@ dnl $Header: configure.in.tk,v 1.2 96/05/16 01:03:40 van Exp $ (LBL) AC_ARG_WITH(tcl, --with-tcl=path specify a pathname for tcl, d=$withval, d="") -+tclposs="tcl7.5 tcl75 tcl" ++tclposs="tcl8.0 tcl80 tcl" if test "$d" != "" ; then if test ! -d $d ; then echo "'$d' is not a directory" -@@ -12,18 +13,18 @@ +@@ -12,22 +13,22 @@ echo "can't find tcl.h in $d/include" exit 1 fi @@ -332,8 +1491,48 @@ echo "can't find libtcl.a in $d/lib" exit 1 fi -@@ -78,12 +79,17 @@ - /import/tcl/lib/tcl7.5 \ +- places="$d/lib/tcl7.5 \ ++ places="$d/lib/tcl8.0 \ + $d/lib/tcl" + V_LIBRARY_TCL=FAIL + for dir in $places; do +@@ -44,13 +45,14 @@ + AC_TEST_CPP([#include ], V_INCLUDE_TCL="", V_INCLUDE_TCL=FAIL) + 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 +@@ -64,7 +66,7 @@ + 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") + if test "$V_LIB_TCL" = FAIL; then + echo "checking for libtcl.a" + places="\ +@@ -73,17 +75,22 @@ + /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 @@ -356,23 +1555,39 @@ break fi done -@@ -107,6 +113,7 @@ - $x_libraries/tcl7.5 \ +@@ -98,15 +105,16 @@ + 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/libdata/tcl \ /usr/lib/tk/tcl \ /import/tcl/lib/tcl \ $prefix/lib/tcl \ -@@ -128,6 +135,7 @@ +@@ -128,6 +136,7 @@ AC_SUBST(V_LIBRARY_TCL) AC_ARG_WITH(tk, --with-tk=path specify a pathname for tk, d=$withval, d="") -+tkposs="tk4.1 tk41 tk" ++tkposs="tk8.0 tk80 tk" if test "$d" != "" ; then if test ! -d $d ; then echo "'$d' is not a directory" -@@ -138,18 +146,18 @@ +@@ -138,22 +147,22 @@ echo "can't find tk.h in $d/include" exit 1 fi @@ -399,7 +1614,47 @@ echo "can't find libtk.a in $d/lib" exit 1 fi -@@ -207,12 +215,17 @@ +- places="$d/lib/tk4.1 \ ++ places="$d/lib/tk8.0 \ + $d/lib/tk" + V_LIBRARY_TK=FAIL + for dir in $places; do +@@ -174,14 +183,15 @@ + 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 +@@ -194,7 +204,7 @@ + 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="-ltk4.1", V_LIB_TK="FAIL") + if test "$V_LIB_TK" = FAIL; then + echo "checking for libtk.a" + places="/usr/local/lib \ +@@ -202,17 +212,22 @@ + /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 @@ -423,3 +1678,28 @@ break fi done +@@ -227,15 +242,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 \ diff --git a/audio/vat/files/patch-ab b/audio/vat/files/patch-ab new file mode 100644 index 000000000000..8424b66fc784 --- /dev/null +++ b/audio/vat/files/patch-ab @@ -0,0 +1,136 @@ +--- tkStripchart.c.orig Tue Sep 9 11:00:42 1997 ++++ tkStripchart.c Tue Sep 9 10:52:30 1997 +@@ -148,7 +148,7 @@ + int scrollrequired; + int guarantee_draw; + int grow_up; +- XFontStruct *fontPtr; /* Information about text font, or NULL. */ ++ Tk_Font tkfont; /* Information about text font, or NULL. */ + XColor *textColorPtr; /* Color for drawing text. */ + GC textGC; /* GC for drawing text. */ + XColor *tickColorPtr; /* Color for drawing ticks. */ +@@ -257,7 +257,7 @@ + {TK_CONFIG_SYNONYM, "-fg", "stripcolor", 0, + 0, 0, 0}, + {TK_CONFIG_FONT, "-font", "font", "Font", +- DEF_STRIPCHART_FONT, Tk_Offset(Stripchart, fontPtr), ++ DEF_STRIPCHART_FONT, Tk_Offset(Stripchart, tkfont), + 0}, + {TK_CONFIG_BOOLEAN, "-guaranteedrawing", "guaranteedrawing", + "Guaranteedrawing", DEF_GUARANTEE_DRAW, +@@ -570,8 +570,8 @@ + if (StripchartPtr->value != NULL) + free(StripchartPtr->value); + +- if (StripchartPtr->fontPtr != NULL) +- Tk_FreeFontStruct(StripchartPtr->fontPtr); ++ if (StripchartPtr->tkfont != NULL) ++ Tk_FreeFont(StripchartPtr->tkfont); + + if (StripchartPtr->textColorPtr != NULL) + Tk_FreeColor(StripchartPtr->textColorPtr); +@@ -631,7 +631,7 @@ + + Tk_SetBackgroundFromBorder(StripchartPtr->tkwin, StripchartPtr->border); + +- gcValues.font = StripchartPtr->fontPtr->fid; ++ gcValues.font = Tk_FontId(StripchartPtr->tkfont); + gcValues.foreground = StripchartPtr->textColorPtr->pixel; + newGC = Tk_GetGC(StripchartPtr->tkwin, GCForeground|GCFont, &gcValues); + if (StripchartPtr->textGC != None && StripchartPtr->tkwin) { +@@ -692,8 +692,11 @@ + { + int tt = hasatitle(StripchartPtr); + int bd = StripchartPtr->borderWidth; +- int lineHeight = StripchartPtr->fontPtr->ascent + +- StripchartPtr->fontPtr->descent; ++ Tk_FontMetrics fm; ++ int lineHeight; ++ ++ Tk_GetFontMetrics(StripchartPtr->tkfont, &fm); ++ lineHeight = fm.ascent + fm.descent; + + Tk_GeometryRequest(StripchartPtr->tkwin, + 2 * (bd + PADDING) + StripchartPtr->num_strips * +@@ -726,11 +729,13 @@ + /* + * Variable declarations used in the title drawing routines + */ +- XFontStruct *fp = StripchartPtr->fontPtr; +- XCharStruct bbox; +- int x, dummy; +- int lineHeight = StripchartPtr->fontPtr->ascent + +- StripchartPtr->fontPtr->descent; ++ Tk_Font tkf = StripchartPtr->tkfont; ++ int x; ++ Tk_FontMetrics fm; ++ int lineHeight; ++ ++ Tk_GetFontMetrics(tkf, &fm); ++ lineHeight = fm.ascent + fm.descent; + + StripchartPtr->displaybits &= ~REDRAW_PENDING; + if ((StripchartPtr->tkwin == NULL) || !Tk_IsMapped(tkwin)) +@@ -747,18 +752,17 @@ + * space. Otherwise left justified and clipped on the right. + */ + if (tt && StripchartPtr->displaybits & DISPLAY_TITLE) { +- XTextExtents(fp, StripchartPtr->title, +- strlen(StripchartPtr->title), +- &dummy, &dummy, &dummy, &bbox); +- if (bbox.lbearing + bbox.rbearing < Tk_Width(tkwin) - 2 * bd) +- x = (Tk_Width(tkwin) - bbox.lbearing - bbox.rbearing)/2; ++ int width = Tk_TextWidth(tkf, StripchartPtr->title, ++ strlen(StripchartPtr->title)); ++ if (width < Tk_Width(tkwin) - 2 * bd) ++ x = (Tk_Width(tkwin) - width)/2; + else + x = bd + PADDING; + + XClearArea(Tk_Display(tkwin), Tk_WindowId(tkwin), bd, bd, + Tk_Width(tkwin) - 2 * bd, lineHeight + PADDING, False); + XDrawString(Tk_Display(tkwin), Tk_WindowId(tkwin), +- StripchartPtr->textGC, x, fp->max_bounds.ascent + bd, ++ StripchartPtr->textGC, x, fm.ascent + bd, /*XXX no max_bounds */ + StripchartPtr->title, strlen(StripchartPtr->title)); + } + /* +@@ -1057,7 +1061,8 @@ + DrawStripi(Stripchart* SPtr, int i) + { + Tk_Window tkwin = SPtr->tkwin; +- int lineHeight = SPtr->fontPtr->ascent + SPtr->fontPtr->descent; ++ Tk_FontMetrics fm; ++ int lineHeight; + int x = SPtr->borderWidth + PADDING + (i - 1) * SPtr->strip_width; + int y = SPtr->borderWidth + PADDING + + hasatitle(SPtr) * (lineHeight + PADDING); +@@ -1066,6 +1071,9 @@ + double maxv = SPtr->max_value; + double minv = SPtr->min_value; + ++ Tk_GetFontMetrics(SPtr->tkfont, &fm); ++ lineHeight = fm.ascent + fm.descent; ++ + if (i < 1 || i > SPtr->num_strips) + return; + +@@ -1136,7 +1144,8 @@ + ScrollStrips(Stripchart* SPtr) + { + Tk_Window tkwin = SPtr->tkwin; +- int lineHeight = SPtr->fontPtr->ascent + SPtr->fontPtr->descent; ++ Tk_FontMetrics fm; ++ int lineHeight; + int src_x = SPtr->borderWidth + PADDING + SPtr->strip_width; + int src_y = SPtr->borderWidth + PADDING + + hasatitle(SPtr) * (lineHeight + PADDING); +@@ -1144,6 +1153,8 @@ + int dest_y = src_y; + int w = (SPtr->num_strips - 1) * SPtr->strip_width; + int h = SPtr->max_height; ++ ++ Tk_GetFontMetrics(SPtr->tkfont, &fm); + + XCopyArea(Tk_Display(tkwin), Tk_WindowId(tkwin), Tk_WindowId(tkwin), + Tk_GetGC(tkwin, 0, NULL), src_x, src_y, w, h, dest_x, dest_y); diff --git a/audio/vat/files/patch-ac b/audio/vat/files/patch-ac new file mode 100644 index 000000000000..42144397d299 --- /dev/null +++ b/audio/vat/files/patch-ac @@ -0,0 +1,11 @@ +--- main.cc.orig Tue Sep 9 11:17:10 1997 ++++ main.cc Tue Sep 9 11:17:31 1997 +@@ -162,7 +162,7 @@ + else { + Tk_Window tk = t.tkmain(); + Tk_Uid uid = Tk_GetUid((char*)argv[1]); +- XFontStruct* p = Tk_GetFontStruct(t.interp(), tk, uid); ++ Tk_Font p = Tk_GetFont(t.interp(), tk, uid); + t.result(p != 0 ? "1" : "0"); + } + return (TCL_OK); diff --git a/audio/vat/files/patch-ad b/audio/vat/files/patch-ad new file mode 100644 index 000000000000..8577e53a9883 --- /dev/null +++ b/audio/vat/files/patch-ad @@ -0,0 +1,70 @@ +--- sitebox.cc.orig Tue Sep 9 11:24:41 1997 ++++ sitebox.cc Tue Sep 9 11:24:43 1997 +@@ -112,7 +112,7 @@ + static Drawable pixmap_; + static int pixw_; + static int pixh_; +- static XFontStruct* fs_; /* font metrics */ ++ static Tk_Font fs_; /* font metrics */ + }; + + class SiteBox : public TkWidget, public IdleCallback { +@@ -160,7 +160,7 @@ + GC Site::copy_gc_; + GC Site::fg_[4]; + GC Site::bg_[4]; +-XFontStruct* Site::fs_; ++Tk_Font Site::fs_; + XColor* Site::fc_; + XColor* Site::bc_; + XColor* Site::ac_; +@@ -190,15 +190,16 @@ + sitebox_(sb) + { + Tcl& tcl = Tcl::instance(); ++ Tk_FontMetrics fm; + if (fs_ == 0) { + const char* font = tcl.attr("siteFont"); +- fs_ = Tk_GetFontStruct(tcl.interp(), tk_, (char*)font); ++ fs_ = Tk_GetFont(tcl.interp(), tk_, (char*)font); + if (fs_ == 0) { + fprintf(stderr, + "vat: couldn't find font: %s\n", font); +- fs_ = Tk_GetFontStruct(tcl.interp(), tk_, "screen"); ++ fs_ = Tk_GetFont(tcl.interp(), tk_, "screen"); + if (fs_ == 0) +- fs_ = Tk_GetFontStruct(tcl.interp(), tk_, ++ fs_ = Tk_GetFont(tcl.interp(), tk_, + "fixed"); + if (fs_ == 0) { + fprintf(stderr, +@@ -220,8 +221,9 @@ + + copy_gc_ = sitebox_.lookup_gc(0, 0, 0); + } +- descent_ = fs_->descent; +- ascent_ = fs_->ascent; ++ Tk_GetFontMetrics(fs_, &fm); ++ descent_ = fm.descent; ++ ascent_ = fm.ascent; + major_ = ascent_; + minor_ = major_ / 2; + } +@@ -292,7 +294,7 @@ + */ + inline int Site::textwidth(const char* s) + { +- return (XTextWidth(fs_, s, strlen(s))); ++ return (Tk_TextWidth(fs_, s, strlen(s))); + } + + inline void Site::square(Display* dpy, Drawable window, GC gc, +@@ -450,7 +452,7 @@ + free_gc(bg_[0]); + free_gc(bg_[1]); + } +- Font fid = fs_->fid; ++ Font fid = Tk_FontId(fs_); + fg_[0] = raw_gc(fid, fc_, bc_, pixmap_); + fg_[2] = raw_gc(fid, dc_, bc_, pixmap_); + bg_[0] = raw_gc(fid, bc_, bc_, pixmap_); -- cgit v1.2.3