From f268968a496ac86f2d853abcfd03c06f458f3541 Mon Sep 17 00:00:00 2001 From: rillig Date: Sat, 3 Sep 2005 23:05:14 +0000 Subject: Replaced patch-ah with patch-ap, which is the same except that it does not contain an RCS Header tag. --- mbone/vat/distinfo | 4 +- mbone/vat/patches/patch-ah | 264 --------------------------------------------- mbone/vat/patches/patch-ap | 263 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 265 insertions(+), 266 deletions(-) delete mode 100644 mbone/vat/patches/patch-ah create mode 100644 mbone/vat/patches/patch-ap (limited to 'mbone') diff --git a/mbone/vat/distinfo b/mbone/vat/distinfo index 8c6f691bace..248897e8465 100644 --- a/mbone/vat/distinfo +++ b/mbone/vat/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.6 2005/02/22 21:33:50 agc Exp $ +$NetBSD: distinfo,v 1.7 2005/09/03 23:05:14 rillig Exp $ SHA1 (vatsrc-4.0b2.tar.gz) = 92390be72438647bef422c7a493ee520e82e33b3 RMD160 (vatsrc-4.0b2.tar.gz) = 3540a371f2d4bbd388561157009dc744bec24a0a @@ -9,7 +9,6 @@ SHA1 (patch-ac) = 192236d6703b6ff05ea4da0331a59e6eccaa8094 SHA1 (patch-ad) = 29288eba884ba9ef59c0eac2d92d50ca9336a101 SHA1 (patch-af) = 840141bc62f5bc713e33b3b1a0c199402f51926c SHA1 (patch-ag) = cee2e711190a0d33ed7ff95e87f00e811c7d8286 -SHA1 (patch-ah) = 06a80c7eb41b1d4f7cc8cba63551b45e07e4a56f SHA1 (patch-ai) = 72b94bfaa14daabb07c65194c9068c23157307f8 SHA1 (patch-aj) = e9cf021b38735ab4737b5050502a9199b5e846bc SHA1 (patch-ak) = 779f4d8724dac84c9dcc964545004b75bb9eafc5 @@ -17,3 +16,4 @@ SHA1 (patch-al) = 1e135bf818a4b35901ecabe8442aa57414fa46d1 SHA1 (patch-am) = 3513e9495e460b9d2923f6dfdfa048c0e5872b3f SHA1 (patch-an) = 2793bea8c9a9a4c73c82c20da65d549252144eb3 SHA1 (patch-ao) = 99b5945339b30b62709784358af316d8185dd445 +SHA1 (patch-ap) = 2d651ec7bb05115ae655239716bde8856bab7ff2 diff --git a/mbone/vat/patches/patch-ah b/mbone/vat/patches/patch-ah deleted file mode 100644 index 42ffa84d657..00000000000 --- a/mbone/vat/patches/patch-ah +++ /dev/null @@ -1,264 +0,0 @@ -$NetBSD$ - ---- configure.in.tk.orig Thu May 16 04:06:05 1996 -+++ configure.in.tk Wed Jan 26 16:03:04 2000 -@@ -2,6 +2,8 @@ - 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="") -+tcldir=tcl8.3 -+tcllib=tcl83 - if test "$d" != "" ; then - if test ! -d $d ; then - echo "'$d' is not a directory" -@@ -12,8 +14,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/lib${tcllib}.so \ -+ $d/lib/lib${tcllib}.a \ - $d/lib/libtcl.so \ - $d/lib/libtcl.a" - V_LIB_TCL=FAIL -@@ -27,7 +29,7 @@ - echo "can't find libtcl.a in $d/lib" - exit 1 - fi -- places="$d/lib/tcl7.5 \ -+ places="$d/lib/${tcldir} \ - $d/lib/tcl" - V_LIBRARY_TCL=FAIL - for dir in $places; do -@@ -44,10 +46,11 @@ - 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/../${tcldir} \ -+ /usr/src/local/${tcldir} \ -+ /import/tcl/include/${tcldir} \ - $prefix/include \ -+ $prefix/include/${tcldir} \ - $x_includes/tk \ - $x_includes \ - /usr/local/include \ -@@ -64,47 +67,43 @@ - exit 1 - fi - fi -- AC_CHECK_LIB(tcl7.5, main, V_LIB_TCL="-ltcl7.5", V_LIB_TCL="FAIL") -- if test "$V_LIB_TCL" = FAIL; then -- echo "checking for libtcl.a" -- places="\ -- $prefix/lib \ -- $x_libraries \ -- /usr/contrib/lib \ -- /usr/local/lib \ -- /usr/lib \ -- $PWD/../tcl7.5 \ -- /usr/src/local/tcl7.5 \ -- /import/tcl/lib/tcl7.5 \ -- " -- 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" -- break -- fi -- if test -r $dir/libtcl.so -o -r $dir/libtcl.a; then -- V_LIB_TCL="-L$dir -ltcl" -- break -- fi -- done -- if test "$V_LIB_TCL" = FAIL; then -- echo "can't find libtcl.a" -- exit 1 -- else -- if test $solaris ; then -- V_LIB_TCL="-R$dir $V_LIB_TCL" -- fi -+ V_TCL_CONFIG=FAIL -+ echo "checking for tclConfig.sh" -+ places="/usr/local/lib/${tcldir} \ -+ /usr/contrib/lib/${tcldir} \ -+ /usr/lib/${tcldir} \ -+ /usr/lib/tk/${tcldir} \ -+ /import/tcl/lib/${tcldir} \ -+ $prefix/lib/${tcldir} \ -+ $x_libraries/${tcldir} \ -+ /usr/local/lib/tcl \ -+ /usr/lib/tcl \ -+ /usr/lib/tk/tcl \ -+ /import/tcl/lib/tcl \ -+ $prefix/lib/tcl \ -+ $x_libraries/tcl \ -+ $x_libraries/tcl" -+ for dir in $places; do -+ if test -r $dir/tclConfig.sh ; then -+ V_TCL_CONFIG=$dir/tclConfig.sh -+ break - fi -+ done -+ if test "$V_TCL_CONFIG" = FAIL; then -+ echo "can't find tclConfig.sh" -+ exit 1 - fi -+ . ${V_TCL_CONFIG} -+ V_LIB_TCL="${TCL_LIB_FLAG}" - 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/${tcldir} \ -+ /usr/contrib/lib/${tcldir} \ -+ /usr/lib/${tcldir} \ -+ /usr/lib/tk/${tcldir} \ -+ /import/tcl/lib/${tcldir} \ -+ $prefix/lib/${tcldir} \ -+ $x_libraries/${tcldir} \ - /usr/local/lib/tcl \ - /usr/lib/tcl \ - /usr/lib/tk/tcl \ -@@ -128,6 +127,8 @@ - AC_SUBST(V_LIBRARY_TCL) - - AC_ARG_WITH(tk, --with-tk=path specify a pathname for tk, d=$withval, d="") -+tkdir=tk8.3 -+tklib=tk83 - if test "$d" != "" ; then - if test ! -d $d ; then - echo "'$d' is not a directory" -@@ -138,8 +139,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/lib${tklib}.so \ -+ $d/lib/lib${tklib}.a \ - $d/lib/libtk.so \ - $d/lib/libtk.a" - V_LIB_TK=FAIL -@@ -153,7 +154,7 @@ - echo "can't find libtk.a in $d/lib" - exit 1 - fi -- places="$d/lib/tk4.1 \ -+ places="$d/lib/${tkdir} \ - $d/lib/tk" - V_LIBRARY_TK=FAIL - for dir in $places; do -@@ -173,15 +174,16 @@ - V_INCLUDE_TK="" - places="\ - $prefix/include \ -+ $prefix/include/${tkdir} \ - /usr/local/include \ - /usr/contrib/include \ - /usr/include/tcl \ - /usr/include\ - $x_includes/tk \ - $x_includes \ -- $PWD/../tk4.1 \ -- /usr/src/local/tk4.1 \ -- /import/tcl/include/tk4.1 \ -+ $PWD/../${tkdir} \ -+ /usr/src/local/${tkdir} \ -+ /import/tcl/include/${tkdir} \ - " - for dir in $places; do - if test -r $dir/tk.h ; then -@@ -194,48 +196,47 @@ - exit 1 - fi - fi -- AC_CHECK_LIB(tk4.1, 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 \ -- /usr/contrib/lib \ -- /usr/lib \ -- /usr/lib/tk \ -- /import/tcl/lib \ -- $PWD/../tk4.1 \ -- /usr/src/local/tk4.1 \ -- $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" -- break -- fi -- if test -r $dir/libtk.so -o -r $dir/libtk.a; then -- V_LIB_TK="-L$dir -ltk" -- break -- fi -- done -- if test "$V_LIB_TK" = FAIL; then -- echo "can't find libtk.a" -- exit 1 -- else -- if test $solaris ; then -- V_LIB_TK="-R$dir $V_LIB_TK" -- fi -+ V_TK_CONFIG=FAIL -+ echo "checking for tkConfig.sh" -+ places="/usr/local/lib/${tkdir} \ -+ /usr/contrib/lib/${tkdir} \ -+ /usr/lib/${tkdir} \ -+ /usr/lib/tk/${tkdir} \ -+ /import/tcl/lib/${tkdir} \ -+ $prefix/lib/${tkdir} \ -+ $x_libraries/${tkdir} \ -+ $PWD/../${tkdir}/library \ -+ /usr/src/local/${tkdir}/library \ -+ /usr/local/lib/tk \ -+ /usr/lib/tk \ -+ /usr/lib/tk/tk \ -+ /import/tcl/lib/tk \ -+ $prefix/lib/tk \ -+ $x_libraries/tk \ -+ $x_libraries/tk" -+ for dir in $places; do -+ if test -r $dir/tkConfig.sh ; then -+ V_TK_CONFIG=$dir/tkConfig.sh -+ break - fi -+ done -+ if test "$V_TK_CONFIG" = FAIL; then -+ echo "can't find tkConfig.sh" -+ exit 1 - fi -+ . ${V_TK_CONFIG} -+ V_LIB_TK="${TK_LIB_FLAG}" - 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/${tkdir} \ -+ /usr/contrib/lib/${tkdir} \ -+ /usr/lib/${tkdir} \ -+ /usr/lib/tk/${tkdir} \ -+ /import/tcl/lib/${tkdir} \ -+ $prefix/lib/${tkdir} \ -+ $x_libraries/${tkdir} \ -+ $PWD/../${tkdir}/library \ -+ /usr/src/local/${tkdir}/library \ - /usr/local/lib/tk \ - /usr/lib/tk \ - /usr/lib/tk/tk \ diff --git a/mbone/vat/patches/patch-ap b/mbone/vat/patches/patch-ap new file mode 100644 index 00000000000..d0193971b0f --- /dev/null +++ b/mbone/vat/patches/patch-ap @@ -0,0 +1,263 @@ +$NetBSD: patch-ap,v 1.1 2005/09/03 23:05:14 rillig Exp $ + +--- configure.in.tk.orig Thu May 16 04:06:05 1996 ++++ configure.in.tk Wed Jan 26 16:03:04 2000 +@@ -3,5 +3,7 @@ + + AC_ARG_WITH(tcl, --with-tcl=path specify a pathname for tcl, d=$withval, d="") ++tcldir=tcl8.3 ++tcllib=tcl83 + if test "$d" != "" ; then + if test ! -d $d ; then + echo "'$d' is not a directory" +@@ -12,8 +14,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/lib${tcllib}.so \ ++ $d/lib/lib${tcllib}.a \ + $d/lib/libtcl.so \ + $d/lib/libtcl.a" + V_LIB_TCL=FAIL +@@ -27,7 +29,7 @@ + echo "can't find libtcl.a in $d/lib" + exit 1 + fi +- places="$d/lib/tcl7.5 \ ++ places="$d/lib/${tcldir} \ + $d/lib/tcl" + V_LIBRARY_TCL=FAIL + for dir in $places; do +@@ -44,10 +46,11 @@ + 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/../${tcldir} \ ++ /usr/src/local/${tcldir} \ ++ /import/tcl/include/${tcldir} \ + $prefix/include \ ++ $prefix/include/${tcldir} \ + $x_includes/tk \ + $x_includes \ + /usr/local/include \ +@@ -64,47 +67,43 @@ + exit 1 + fi + fi +- AC_CHECK_LIB(tcl7.5, main, V_LIB_TCL="-ltcl7.5", V_LIB_TCL="FAIL") +- if test "$V_LIB_TCL" = FAIL; then +- echo "checking for libtcl.a" +- places="\ +- $prefix/lib \ +- $x_libraries \ +- /usr/contrib/lib \ +- /usr/local/lib \ +- /usr/lib \ +- $PWD/../tcl7.5 \ +- /usr/src/local/tcl7.5 \ +- /import/tcl/lib/tcl7.5 \ +- " +- 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" +- break +- fi +- if test -r $dir/libtcl.so -o -r $dir/libtcl.a; then +- V_LIB_TCL="-L$dir -ltcl" +- break +- fi +- done +- if test "$V_LIB_TCL" = FAIL; then +- echo "can't find libtcl.a" +- exit 1 +- else +- if test $solaris ; then +- V_LIB_TCL="-R$dir $V_LIB_TCL" +- fi ++ V_TCL_CONFIG=FAIL ++ echo "checking for tclConfig.sh" ++ places="/usr/local/lib/${tcldir} \ ++ /usr/contrib/lib/${tcldir} \ ++ /usr/lib/${tcldir} \ ++ /usr/lib/tk/${tcldir} \ ++ /import/tcl/lib/${tcldir} \ ++ $prefix/lib/${tcldir} \ ++ $x_libraries/${tcldir} \ ++ /usr/local/lib/tcl \ ++ /usr/lib/tcl \ ++ /usr/lib/tk/tcl \ ++ /import/tcl/lib/tcl \ ++ $prefix/lib/tcl \ ++ $x_libraries/tcl \ ++ $x_libraries/tcl" ++ for dir in $places; do ++ if test -r $dir/tclConfig.sh ; then ++ V_TCL_CONFIG=$dir/tclConfig.sh ++ break + fi ++ done ++ if test "$V_TCL_CONFIG" = FAIL; then ++ echo "can't find tclConfig.sh" ++ exit 1 + fi ++ . ${V_TCL_CONFIG} ++ V_LIB_TCL="${TCL_LIB_FLAG}" + 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/${tcldir} \ ++ /usr/contrib/lib/${tcldir} \ ++ /usr/lib/${tcldir} \ ++ /usr/lib/tk/${tcldir} \ ++ /import/tcl/lib/${tcldir} \ ++ $prefix/lib/${tcldir} \ ++ $x_libraries/${tcldir} \ + /usr/local/lib/tcl \ + /usr/lib/tcl \ + /usr/lib/tk/tcl \ +@@ -128,6 +127,8 @@ + AC_SUBST(V_LIBRARY_TCL) + + AC_ARG_WITH(tk, --with-tk=path specify a pathname for tk, d=$withval, d="") ++tkdir=tk8.3 ++tklib=tk83 + if test "$d" != "" ; then + if test ! -d $d ; then + echo "'$d' is not a directory" +@@ -138,8 +139,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/lib${tklib}.so \ ++ $d/lib/lib${tklib}.a \ + $d/lib/libtk.so \ + $d/lib/libtk.a" + V_LIB_TK=FAIL +@@ -153,7 +154,7 @@ + echo "can't find libtk.a in $d/lib" + exit 1 + fi +- places="$d/lib/tk4.1 \ ++ places="$d/lib/${tkdir} \ + $d/lib/tk" + V_LIBRARY_TK=FAIL + for dir in $places; do +@@ -173,15 +174,16 @@ + V_INCLUDE_TK="" + places="\ + $prefix/include \ ++ $prefix/include/${tkdir} \ + /usr/local/include \ + /usr/contrib/include \ + /usr/include/tcl \ + /usr/include\ + $x_includes/tk \ + $x_includes \ +- $PWD/../tk4.1 \ +- /usr/src/local/tk4.1 \ +- /import/tcl/include/tk4.1 \ ++ $PWD/../${tkdir} \ ++ /usr/src/local/${tkdir} \ ++ /import/tcl/include/${tkdir} \ + " + for dir in $places; do + if test -r $dir/tk.h ; then +@@ -194,48 +196,47 @@ + exit 1 + fi + fi +- AC_CHECK_LIB(tk4.1, 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 \ +- /usr/contrib/lib \ +- /usr/lib \ +- /usr/lib/tk \ +- /import/tcl/lib \ +- $PWD/../tk4.1 \ +- /usr/src/local/tk4.1 \ +- $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" +- break +- fi +- if test -r $dir/libtk.so -o -r $dir/libtk.a; then +- V_LIB_TK="-L$dir -ltk" +- break +- fi +- done +- if test "$V_LIB_TK" = FAIL; then +- echo "can't find libtk.a" +- exit 1 +- else +- if test $solaris ; then +- V_LIB_TK="-R$dir $V_LIB_TK" +- fi ++ V_TK_CONFIG=FAIL ++ echo "checking for tkConfig.sh" ++ places="/usr/local/lib/${tkdir} \ ++ /usr/contrib/lib/${tkdir} \ ++ /usr/lib/${tkdir} \ ++ /usr/lib/tk/${tkdir} \ ++ /import/tcl/lib/${tkdir} \ ++ $prefix/lib/${tkdir} \ ++ $x_libraries/${tkdir} \ ++ $PWD/../${tkdir}/library \ ++ /usr/src/local/${tkdir}/library \ ++ /usr/local/lib/tk \ ++ /usr/lib/tk \ ++ /usr/lib/tk/tk \ ++ /import/tcl/lib/tk \ ++ $prefix/lib/tk \ ++ $x_libraries/tk \ ++ $x_libraries/tk" ++ for dir in $places; do ++ if test -r $dir/tkConfig.sh ; then ++ V_TK_CONFIG=$dir/tkConfig.sh ++ break + fi ++ done ++ if test "$V_TK_CONFIG" = FAIL; then ++ echo "can't find tkConfig.sh" ++ exit 1 + fi ++ . ${V_TK_CONFIG} ++ V_LIB_TK="${TK_LIB_FLAG}" + 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/${tkdir} \ ++ /usr/contrib/lib/${tkdir} \ ++ /usr/lib/${tkdir} \ ++ /usr/lib/tk/${tkdir} \ ++ /import/tcl/lib/${tkdir} \ ++ $prefix/lib/${tkdir} \ ++ $x_libraries/${tkdir} \ ++ $PWD/../${tkdir}/library \ ++ /usr/src/local/${tkdir}/library \ + /usr/local/lib/tk \ + /usr/lib/tk \ + /usr/lib/tk/tk \ -- cgit v1.2.3