From e86009fff750ef9a43113666abb58b6417b7b635 Mon Sep 17 00:00:00 2001 From: Bill Fenner Date: Fri, 24 Jan 2003 02:27:37 +0000 Subject: Build with tcl/tk 8.3 --- mbone/vat/Makefile | 4 +-- mbone/vat/files/patch-aa | 70 ++++++++++++++++++++++++------------------------ 2 files changed, 37 insertions(+), 37 deletions(-) (limited to 'mbone') diff --git a/mbone/vat/Makefile b/mbone/vat/Makefile index e075cc623b01..ed6fdd84684e 100644 --- a/mbone/vat/Makefile +++ b/mbone/vat/Makefile @@ -8,7 +8,7 @@ PORTNAME= vat PORTVERSION= 4.0b2 PORTREVISION= 1 -CATEGORIES= mbone tk82 +CATEGORIES= mbone tk83 MASTER_SITES= ftp://ftp.ee.lbl.gov/conferencing/vat/alpha-test/ DISTFILES= vatsrc-4.0b2.tar.gz @@ -21,7 +21,7 @@ GSM_WORK= ${WRKDIRPREFIX}${GSM_DIR}/work/gsm-1.0-pl10 # 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= tk82.1:${PORTSDIR}/x11-toolkits/tk82 \ +LIB_DEPENDS= tk83.1:${PORTSDIR}/x11-toolkits/tk83 \ gsm.1:${GSM_DIR} USE_X_PREFIX= yes diff --git a/mbone/vat/files/patch-aa b/mbone/vat/files/patch-aa index 0937d2d2a5bc..574759971107 100644 --- a/mbone/vat/files/patch-aa +++ b/mbone/vat/files/patch-aa @@ -4,7 +4,7 @@ dnl $Header: /home/ncvs/ports/mbone/vat/patches/patch-aa,v 1.3 1998/06/26 19:05:34 fenner Exp $ (LBL) AC_ARG_WITH(tcl, --with-tcl=path specify a pathname for tcl, d=$withval, d="") -+tclposs="tcl8.2 tcl82 tcl" ++tclposs="tcl8.3 tcl83 tcl" if test "$d" != "" ; then if test ! -d $d ; then echo "'$d' is not a directory" @@ -36,7 +36,7 @@ exit 1 fi - places="$d/lib/tcl7.5 \ -+ places="$d/lib/tcl8.2 \ ++ places="$d/lib/tcl8.3 \ $d/lib/tcl" V_LIBRARY_TCL=FAIL for dir in $places; do @@ -47,14 +47,14 @@ - places="$PWD/../tcl7.5 \ - /usr/src/local/tcl7.5 \ - /import/tcl/include/tcl7.5 \ -+ places="$PWD/../tcl8.2 \ -+ /usr/src/local/tcl8.2 \ -+ /import/tcl/include/tcl8.2 \ ++ places="$PWD/../tcl8.3 \ ++ /usr/src/local/tcl8.3 \ ++ /import/tcl/include/tcl8.3 \ $prefix/include \ $x_includes/tk \ $x_includes \ /usr/local/include \ -+ /usr/local/include/tcl8.2 \ ++ /usr/local/include/tcl8.3 \ /usr/contrib/include \ /usr/include" for dir in $places; do @@ -63,7 +63,7 @@ fi fi - AC_CHECK_LIB(tcl7.5, main, V_LIB_TCL="-ltcl7.5", V_LIB_TCL="FAIL") -+ AC_CHECK_LIB(tcl8.2, main, V_LIB_TCL="-ltcl8.2", V_LIB_TCL="FAIL") ++ AC_CHECK_LIB(tcl8.3, main, V_LIB_TCL="-ltcl8.3", V_LIB_TCL="FAIL") if test "$V_LIB_TCL" = FAIL; then echo "checking for libtcl.a" places="\ @@ -74,9 +74,9 @@ - $PWD/../tcl7.5 \ - /usr/src/local/tcl7.5 \ - /import/tcl/lib/tcl7.5 \ -+ $PWD/../tcl8.2 \ -+ /usr/src/local/tcl8.2 \ -+ /import/tcl/lib/tcl8.2 \ ++ $PWD/../tcl8.3 \ ++ /usr/src/local/tcl8.3 \ ++ /import/tcl/lib/tcl8.3 \ " for dir in $places; do - if test -r $dir/libtcl7.5.so -o -r $dir/libtcl7.5.a; then @@ -110,13 +110,13 @@ - /import/tcl/lib/tcl7.5 \ - $prefix/lib/tcl7.5 \ - $x_libraries/tcl7.5 \ -+ places="/usr/local/lib/tcl8.2 \ -+ /usr/contrib/lib/tcl8.2 \ -+ /usr/lib/tcl8.2 \ -+ /usr/lib/tk/tcl8.2 \ -+ /import/tcl/lib/tcl8.2 \ -+ $prefix/lib/tcl8.2 \ -+ $x_libraries/tcl8.2 \ ++ places="/usr/local/lib/tcl8.3 \ ++ /usr/contrib/lib/tcl8.3 \ ++ /usr/lib/tcl8.3 \ ++ /usr/lib/tk/tcl8.3 \ ++ /import/tcl/lib/tcl8.3 \ ++ $prefix/lib/tcl8.3 \ ++ $x_libraries/tcl8.3 \ /usr/local/lib/tcl \ /usr/lib/tcl \ + /usr/libdata/tcl \ @@ -127,7 +127,7 @@ AC_SUBST(V_LIBRARY_TCL) AC_ARG_WITH(tk, --with-tk=path specify a pathname for tk, d=$withval, d="") -+tkposs="tk8.2 tk82 tk" ++tkposs="tk8.3 tk83 tk" if test "$d" != "" ; then if test ! -d $d ; then echo "'$d' is not a directory" @@ -159,7 +159,7 @@ exit 1 fi - places="$d/lib/tk4.1 \ -+ places="$d/lib/tk8.2 \ ++ places="$d/lib/tk8.3 \ $d/lib/tk" V_LIBRARY_TK=FAIL for dir in $places; do @@ -167,7 +167,7 @@ places="\ $prefix/include \ /usr/local/include \ -+ /usr/local/include/tk8.2 \ ++ /usr/local/include/tk8.3 \ /usr/contrib/include \ /usr/include/tcl \ /usr/include\ @@ -176,9 +176,9 @@ - $PWD/../tk4.1 \ - /usr/src/local/tk4.1 \ - /import/tcl/include/tk4.1 \ -+ $PWD/../tk8.2 \ -+ /usr/src/local/tk8.2 \ -+ /import/tcl/include/tk8.2 \ ++ $PWD/../tk8.3 \ ++ /usr/src/local/tk8.3 \ ++ /import/tcl/include/tk8.3 \ " for dir in $places; do if test -r $dir/tk.h ; then @@ -187,7 +187,7 @@ fi fi - AC_CHECK_LIB(tk4.1, main, V_LIB_TK="-ltk4.1", V_LIB_TK="FAIL") -+ AC_CHECK_LIB(tk8.2, main, V_LIB_TK="-ltk8.2", V_LIB_TK="FAIL") ++ AC_CHECK_LIB(tk8.3, main, V_LIB_TK="-ltk8.3", V_LIB_TK="FAIL") if test "$V_LIB_TK" = FAIL; then echo "checking for libtk.a" places="/usr/local/lib \ @@ -197,8 +197,8 @@ /import/tcl/lib \ - $PWD/../tk4.1 \ - /usr/src/local/tk4.1 \ -+ $PWD/../tk8.2 \ -+ /usr/src/local/tk8.2 \ ++ $PWD/../tk8.3 \ ++ /usr/src/local/tk8.3 \ $prefix/lib \ $x_libraries" for dir in $places; do @@ -235,15 +235,15 @@ - $x_libraries/tk4.1 \ - $PWD/../tk4.1/library \ - /usr/src/local/tk4.1/library \ -+ places="/usr/local/lib/tk8.2 \ -+ /usr/contrib/lib/tk8.2 \ -+ /usr/lib/tk8.2 \ -+ /usr/lib/tk/tk8.2 \ -+ /import/tcl/lib/tk8.2 \ -+ $prefix/lib/tk8.2 \ -+ $x_libraries/tk8.2 \ -+ $PWD/../tk8.2/library \ -+ /usr/src/local/tk8.2/library \ ++ places="/usr/local/lib/tk8.3 \ ++ /usr/contrib/lib/tk8.3 \ ++ /usr/lib/tk8.3 \ ++ /usr/lib/tk/tk8.3 \ ++ /import/tcl/lib/tk8.3 \ ++ $prefix/lib/tk8.3 \ ++ $x_libraries/tk8.3 \ ++ $PWD/../tk8.3/library \ ++ /usr/src/local/tk8.3/library \ /usr/local/lib/tk \ /usr/lib/tk \ /usr/lib/tk/tk \ -- cgit v1.2.3