head 1.6; access; symbols pkgsrc-2026Q1:1.6.0.98 pkgsrc-2026Q1-base:1.6 pkgsrc-2025Q4:1.6.0.96 pkgsrc-2025Q4-base:1.6 pkgsrc-2025Q3:1.6.0.94 pkgsrc-2025Q3-base:1.6 pkgsrc-2025Q2:1.6.0.92 pkgsrc-2025Q2-base:1.6 pkgsrc-2025Q1:1.6.0.90 pkgsrc-2025Q1-base:1.6 pkgsrc-2024Q4:1.6.0.88 pkgsrc-2024Q4-base:1.6 pkgsrc-2024Q3:1.6.0.86 pkgsrc-2024Q3-base:1.6 pkgsrc-2024Q2:1.6.0.84 pkgsrc-2024Q2-base:1.6 pkgsrc-2024Q1:1.6.0.82 pkgsrc-2024Q1-base:1.6 pkgsrc-2023Q4:1.6.0.80 pkgsrc-2023Q4-base:1.6 pkgsrc-2023Q3:1.6.0.78 pkgsrc-2023Q3-base:1.6 pkgsrc-2023Q2:1.6.0.76 pkgsrc-2023Q2-base:1.6 pkgsrc-2023Q1:1.6.0.74 pkgsrc-2023Q1-base:1.6 pkgsrc-2022Q4:1.6.0.72 pkgsrc-2022Q4-base:1.6 pkgsrc-2022Q3:1.6.0.70 pkgsrc-2022Q3-base:1.6 pkgsrc-2022Q2:1.6.0.68 pkgsrc-2022Q2-base:1.6 pkgsrc-2022Q1:1.6.0.66 pkgsrc-2022Q1-base:1.6 pkgsrc-2021Q4:1.6.0.64 pkgsrc-2021Q4-base:1.6 pkgsrc-2021Q3:1.6.0.62 pkgsrc-2021Q3-base:1.6 pkgsrc-2021Q2:1.6.0.60 pkgsrc-2021Q2-base:1.6 pkgsrc-2021Q1:1.6.0.58 pkgsrc-2021Q1-base:1.6 pkgsrc-2020Q4:1.6.0.56 pkgsrc-2020Q4-base:1.6 pkgsrc-2020Q3:1.6.0.54 pkgsrc-2020Q3-base:1.6 pkgsrc-2020Q2:1.6.0.50 pkgsrc-2020Q2-base:1.6 pkgsrc-2020Q1:1.6.0.30 pkgsrc-2020Q1-base:1.6 pkgsrc-2019Q4:1.6.0.52 pkgsrc-2019Q4-base:1.6 pkgsrc-2019Q3:1.6.0.48 pkgsrc-2019Q3-base:1.6 pkgsrc-2019Q2:1.6.0.46 pkgsrc-2019Q2-base:1.6 pkgsrc-2019Q1:1.6.0.44 pkgsrc-2019Q1-base:1.6 pkgsrc-2018Q4:1.6.0.42 pkgsrc-2018Q4-base:1.6 pkgsrc-2018Q3:1.6.0.40 pkgsrc-2018Q3-base:1.6 pkgsrc-2018Q2:1.6.0.38 pkgsrc-2018Q2-base:1.6 pkgsrc-2018Q1:1.6.0.36 pkgsrc-2018Q1-base:1.6 pkgsrc-2017Q4:1.6.0.34 pkgsrc-2017Q4-base:1.6 pkgsrc-2017Q3:1.6.0.32 pkgsrc-2017Q3-base:1.6 pkgsrc-2017Q2:1.6.0.28 pkgsrc-2017Q2-base:1.6 pkgsrc-2017Q1:1.6.0.26 pkgsrc-2017Q1-base:1.6 pkgsrc-2016Q4:1.6.0.24 pkgsrc-2016Q4-base:1.6 pkgsrc-2016Q3:1.6.0.22 pkgsrc-2016Q3-base:1.6 pkgsrc-2016Q2:1.6.0.20 pkgsrc-2016Q2-base:1.6 pkgsrc-2016Q1:1.6.0.18 pkgsrc-2016Q1-base:1.6 pkgsrc-2015Q4:1.6.0.16 pkgsrc-2015Q4-base:1.6 pkgsrc-2015Q3:1.6.0.14 pkgsrc-2015Q3-base:1.6 pkgsrc-2015Q2:1.6.0.12 pkgsrc-2015Q2-base:1.6 pkgsrc-2015Q1:1.6.0.10 pkgsrc-2015Q1-base:1.6 pkgsrc-2014Q4:1.6.0.8 pkgsrc-2014Q4-base:1.6 pkgsrc-2014Q3:1.6.0.6 pkgsrc-2014Q3-base:1.6 pkgsrc-2014Q2:1.6.0.4 pkgsrc-2014Q2-base:1.6 pkgsrc-2014Q1:1.6.0.2 pkgsrc-2014Q1-base:1.6 pkgsrc-2013Q4:1.5.0.12 pkgsrc-2013Q4-base:1.5 pkgsrc-2013Q3:1.5.0.10 pkgsrc-2013Q3-base:1.5 pkgsrc-2013Q2:1.5.0.8 pkgsrc-2013Q2-base:1.5 pkgsrc-2013Q1:1.5.0.6 pkgsrc-2013Q1-base:1.5 pkgsrc-2012Q4:1.5.0.4 pkgsrc-2012Q4-base:1.5 pkgsrc-2012Q3:1.5.0.2 pkgsrc-2012Q3-base:1.5 pkgsrc-2012Q2:1.4.0.20 pkgsrc-2012Q2-base:1.4 pkgsrc-2012Q1:1.4.0.18 pkgsrc-2012Q1-base:1.4 pkgsrc-2011Q4:1.4.0.16 pkgsrc-2011Q4-base:1.4 pkgsrc-2011Q3:1.4.0.14 pkgsrc-2011Q3-base:1.4 pkgsrc-2011Q2:1.4.0.12 pkgsrc-2011Q2-base:1.4 pkgsrc-2011Q1:1.4.0.10 pkgsrc-2011Q1-base:1.4 pkgsrc-2010Q4:1.4.0.8 pkgsrc-2010Q4-base:1.4 pkgsrc-2010Q3:1.4.0.6 pkgsrc-2010Q3-base:1.4 pkgsrc-2010Q2:1.4.0.4 pkgsrc-2010Q2-base:1.4 pkgsrc-2010Q1:1.4.0.2 pkgsrc-2010Q1-base:1.4 pkgsrc-2009Q4:1.3.0.62 pkgsrc-2009Q4-base:1.3 pkgsrc-2009Q3:1.3.0.60 pkgsrc-2009Q3-base:1.3 pkgsrc-2009Q2:1.3.0.58 pkgsrc-2009Q2-base:1.3 pkgsrc-2009Q1:1.3.0.56 pkgsrc-2009Q1-base:1.3 pkgsrc-2008Q4:1.3.0.54 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.52 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.50 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.48 pkgsrc-2008Q2-base:1.3 cwrapper:1.3.0.46 pkgsrc-2008Q1:1.3.0.44 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.42 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.40 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.3.0.38 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.3.0.36 pkgsrc-2007Q1-base:1.3 pkgsrc-2006Q4:1.3.0.34 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.3.0.32 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.3.0.30 pkgsrc-2006Q2-base:1.3 pkgsrc-2006Q1:1.3.0.28 pkgsrc-2006Q1-base:1.3 pkgsrc-2005Q4:1.3.0.26 pkgsrc-2005Q4-base:1.3 pkgsrc-2005Q3:1.3.0.24 pkgsrc-2005Q3-base:1.3 pkgsrc-2005Q2:1.3.0.22 pkgsrc-2005Q2-base:1.3 pkgsrc-2005Q1:1.3.0.20 pkgsrc-2005Q1-base:1.3 pkgsrc-2004Q4:1.3.0.18 pkgsrc-2004Q4-base:1.3 pkgsrc-2004Q3:1.3.0.16 pkgsrc-2004Q3-base:1.3 pkgsrc-2004Q2:1.3.0.14 pkgsrc-2004Q2-base:1.3 pkgsrc-2004Q1:1.3.0.12 pkgsrc-2004Q1-base:1.3 pkgsrc-2003Q4:1.3.0.10 pkgsrc-2003Q4-base:1.3 netbsd-1-6-1:1.3.0.6 netbsd-1-6-1-base:1.3 netbsd-1-6:1.3.0.8 netbsd-1-6-RELEASE-base:1.3 pkgviews:1.3.0.4 pkgviews-base:1.3 buildlink2:1.3.0.2 buildlink2-base:1.3 netbsd-1-5-PATCH003:1.3 netbsd-1-5-PATCH001:1.3 netbsd-1-5-RELEASE:1.3 netbsd-1-4-PATCH003:1.3 netbsd-1-4-PATCH002:1.2; locks; strict; comment @# @; 1.6 date 2014.02.04.00.16.09; author joerg; state Exp; branches; next 1.5; commitid 1oApOWw2H0fHpInx; 1.5 date 2012.08.21.21.49.30; author marino; state Exp; branches; next 1.4; 1.4 date 2010.01.25.21.14.45; author is; state Exp; branches; next 1.3; 1.3 date 2000.09.08.00.48.16; author jwise; state Exp; branches; next 1.2; 1.2 date 2000.02.02.04.03.00; author wiz; state Exp; branches; next 1.1; 1.1 date 2000.01.26.23.15.19; author jlam; state Exp; branches; next ; desc @@ 1.6 log @Fix build with TCL 8.6. @ text @$NetBSD: patch-ai,v 1.5 2012/08/21 21:49:30 marino 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.6 +tcllib=tcl86 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.6 +tklib=tk86 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 \ @ 1.5 log @mbone/vic: Patch in tcl/tk 8.5 support vic's patches specify tcl/tk 8.4, so update the patches to specify 8.5 to fix build. @ text @d1 1 a1 1 $NetBSD: patch-ai,v 1.4 2010/01/25 21:14:45 is Exp $ d8 2 a9 2 +tcldir=tcl8.5 +tcllib=tcl85 d133 2 a134 2 +tkdir=tk8.5 +tklib=tk85 @ 1.4 log @Convert to use tcl/tk 8.4. @ text @d1 1 a1 1 $NetBSD: patch-ai,v 1.3 2000/09/08 00:48:16 jwise Exp $ d8 2 a9 2 +tcldir=tcl8.4 +tcllib=tcl84 d133 2 a134 2 +tkdir=tk8.4 +tklib=tk84 @ 1.3 log @Adapt this package to tk-8.3.2. @ text @d1 1 a1 1 $NetBSD: patch-ai,v 1.2 2000/02/02 04:03:00 wiz Exp $ d8 2 a9 2 +tcldir=tcl8.3 +tcllib=tcl83 d133 2 a134 2 +tkdir=tk8.3 +tklib=tk83 @ 1.2 log @defuzz @ text @d1 1 a1 1 $NetBSD: patch-ai,v 1.1 2000/01/26 23:15:19 jlam Exp $ d8 2 a9 2 +tcldir=tcl8.0 +tcllib=tcl80 d133 2 a134 2 +tkdir=tk8.0 +tklib=tk80 @ 1.1 log @* Split out mega-patch patch-ag in to separate patches. * Duplicate changes in Tcl/Tk handling from mbone/vat. * USE_X11, instead of USE_X11BASE @ text @d1 1 a1 1 $NetBSD$ d5 1 a5 2 @@@@ -2,6 +2,8 @@@@ dnl $Header: configure.in.tk,v 1.2 96/05/16 01:03:40 van Exp $ (LBL) @