head 1.7; access; symbols pkgsrc-2013Q2:1.7.0.40 pkgsrc-2013Q2-base:1.7 pkgsrc-2012Q4:1.7.0.38 pkgsrc-2012Q4-base:1.7 pkgsrc-2011Q4:1.7.0.36 pkgsrc-2011Q4-base:1.7 pkgsrc-2011Q2:1.7.0.34 pkgsrc-2011Q2-base:1.7 pkgsrc-2009Q4:1.7.0.32 pkgsrc-2009Q4-base:1.7 pkgsrc-2008Q4:1.7.0.30 pkgsrc-2008Q4-base:1.7 pkgsrc-2008Q3:1.7.0.28 pkgsrc-2008Q3-base:1.7 cube-native-xorg:1.7.0.26 cube-native-xorg-base:1.7 pkgsrc-2008Q2:1.7.0.24 pkgsrc-2008Q2-base:1.7 pkgsrc-2008Q1:1.7.0.22 pkgsrc-2008Q1-base:1.7 pkgsrc-2007Q4:1.7.0.20 pkgsrc-2007Q4-base:1.7 pkgsrc-2007Q3:1.7.0.18 pkgsrc-2007Q3-base:1.7 pkgsrc-2007Q2:1.7.0.16 pkgsrc-2007Q2-base:1.7 pkgsrc-2007Q1:1.7.0.14 pkgsrc-2007Q1-base:1.7 pkgsrc-2006Q4:1.7.0.12 pkgsrc-2006Q4-base:1.7 pkgsrc-2006Q3:1.7.0.10 pkgsrc-2006Q3-base:1.7 pkgsrc-2006Q2:1.7.0.8 pkgsrc-2006Q2-base:1.7 pkgsrc-2006Q1:1.7.0.6 pkgsrc-2006Q1-base:1.7 pkgsrc-2005Q4:1.7.0.4 pkgsrc-2005Q4-base:1.7 pkgsrc-2005Q3:1.7.0.2 pkgsrc-2005Q3-base:1.7 pkgsrc-2005Q2:1.6.0.22 pkgsrc-2005Q2-base:1.6 pkgsrc-2005Q1:1.6.0.20 pkgsrc-2005Q1-base:1.6 pkgsrc-2004Q4:1.6.0.18 pkgsrc-2004Q4-base:1.6 pkgsrc-2004Q3:1.6.0.16 pkgsrc-2004Q3-base:1.6 pkgsrc-2004Q2:1.6.0.14 pkgsrc-2004Q2-base:1.6 pkgsrc-2004Q1:1.6.0.12 pkgsrc-2004Q1-base:1.6 pkgsrc-2003Q4:1.6.0.10 pkgsrc-2003Q4-base:1.6 netbsd-1-6-1:1.6.0.6 netbsd-1-6-1-base:1.6 netbsd-1-6:1.6.0.8 netbsd-1-6-RELEASE-base:1.6 pkgviews:1.6.0.4 pkgviews-base:1.6 buildlink2:1.6.0.2 buildlink2-base:1.6 netbsd-1-5-PATCH003:1.6 netbsd-1-5-PATCH001:1.6 netbsd-1-5-RELEASE:1.6 netbsd-1-4-PATCH003:1.6 netbsd-1-4-PATCH002:1.5 comdex-fall-1999:1.3 netbsd-1-4-PATCH001:1.3 netbsd-1-4-RELEASE:1.2 netbsd-1-3-PATCH003:1.2 netbsd-1-3-PATCH002:1.1; locks; strict; comment @# @; expand @o@; 1.7 date 2005.09.03.23.05.14; author rillig; state dead; branches; next 1.6; 1.6 date 2000.09.08.00.39.03; author jwise; state Exp; branches; next 1.5; 1.5 date 2000.01.26.22.14.27; author jlam; state Exp; branches; next 1.4; 1.4 date 99.12.08.10.20.37; author rh; state Exp; branches; next 1.3; 1.3 date 99.06.04.15.11.27; author mycroft; state Exp; branches; next 1.2; 1.2 date 98.08.07.11.10.04; author agc; state Exp; branches; next 1.1; 1.1 date 97.12.11.18.00.44; author is; state Exp; branches; next ; desc @@ 1.7 log @Replaced patch-ah with patch-ap, which is the same except that it does not contain an RCS Header tag. @ text @$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 \ @ 1.6 log @`mbone / I'm in mbone / and my heart it swells, so I can hardly speak' Adapt this package to tk-8.3.2. @ text @@ 1.5 log @* Get -lgsm from ${PREFIX}/lib * Get Tcl and Tk build variables from tcl/tkConfig.sh instead of pawing through directory trees. @ text @d9 2 a10 2 +tcldir=tcl8.0 +tcllib=tcl80 d134 2 a135 2 +tkdir=tk8.0 +tklib=tk80 @ 1.4 log @clean up multi-patch mess and defuzz. @ text @d3 3 a5 3 --- configure.in.tk.orig Wed Dec 8 11:19:14 1999 +++ configure.in.tk Wed Dec 8 11:18:55 1999 @@@@ -2,18 +2,19 @@@@ d9 2 a10 1 +tclposs="tcl8.0 tcl80 tcl" d14 2 a15 8 exit 1 fi - V_INCLUDE_TCL=-I$d/include - if test ! -r $d/include/tcl.h ; then - echo "can't find tcl.h in $d/include" + V_INCLUDE_TCL=-I$d + if test ! -r $d/tcl.h ; then + echo "can't find tcl.h in $d" d20 2 a21 2 + places="$d/lib/libtcl8.0.so \ + $d/lib/libtcl8.0.a \ d25 1 a25 1 @@@@ -27,7 +28,7 @@@@ d30 1 a30 1 + places="$d/lib/tcl8.0 \ d34 1 a34 1 @@@@ -44,13 +45,16 @@@@ d41 3 a43 3 + places="$PWD/../tcl8.0 \ + /usr/src/local/tcl8.0 \ + /import/tcl/include/tcl8.0 \ d45 1 a47 2 + /usr/pkg/include \ + /usr/pkg/include/tcl8.0 \ d49 1 a49 5 + /usr/local/include/tcl8.0 \ /usr/contrib/include \ /usr/include" for dir in $places; do @@@@ -64,26 +68,27 @@@@ d54 8 a61 10 + AC_CHECK_LIB(tcl80, main, V_LIB_TCL="-ltcl80", V_LIB_TCL="FAIL") if test "$V_LIB_TCL" = FAIL; then echo "checking for libtcl.a" places="\ $prefix/lib \ $x_libraries \ + /usr/pkg/lib \ /usr/contrib/lib \ /usr/local/lib \ /usr/lib \ d65 2 a66 5 + $PWD/../tcl8.0 \ + /usr/src/local/tcl8.0 \ + /import/tcl/lib/tcl8.0 \ " for dir in $places; do d69 3 a71 5 + if test -r $dir/libtcl80.so -o -r $dir/libtcl80.a; then + V_LIB_TCL="-Wl,-R$dir -L$dir -ltcl80" break fi if test -r $dir/libtcl.so -o -r $dir/libtcl.a; then d73 35 a107 5 + V_LIB_TCL="-Wl,-R$dir -L$dir -ltcl" break fi done @@@@ -98,13 +103,14 @@@@ d109 2 d120 7 a126 8 + places="/usr/local/lib/tcl8.0 \ + /usr/pkg/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 \ d130 1 a130 1 @@@@ -128,18 +134,19 @@@@ d134 2 a135 1 +tkposs="tk8.0 tk80 tk" d139 2 a140 8 exit 1 fi - V_INCLUDE_TK=-I$d/include - if test ! -r $d/include/tk.h ; then - echo "can't find tk.h in $d/include" + V_INCLUDE_TK=-I$d + if test ! -r $d/tk.h ; then + echo "can't find tk.h in $d" d145 2 a146 2 + places="$d/lib/libtk8.0.so \ + $d/lib/libtk8.0.a \ d150 1 a150 1 @@@@ -153,7 +160,7 @@@@ d155 1 a155 1 + places="$d/lib/tk8.0 \ d159 2 a160 6 @@@@ -170,18 +177,21 @@@@ AC_TEST_CPP([#include ], V_INCLUDE_TK="", V_INCLUDE_TK=FAIL) if test "$V_INCLUDE_TK" = FAIL; then echo "checking for tk.h" - V_INCLUDE_TK="" + V_INCLUDE_TK="FAIL" d163 1 a163 2 + /usr/pkg/include \ + /usr/pkg/include/tk8.0 \ a164 1 + /usr/local/include/tk8.0 \ d173 3 a175 3 + $PWD/../tk8.0 \ + /usr/src/local/tk8.0 \ + /import/tcl/include/tk8.0 \ d179 1 a179 1 @@@@ -194,25 +204,26 @@@@ d184 7 a190 9 + AC_CHECK_LIB(tk80, main, V_LIB_TK="-ltk80", V_LIB_TK="FAIL") if test "$V_LIB_TK" = FAIL; then echo "checking for libtk.a" places="/usr/local/lib \ + /usr/pkg/lib \ /usr/contrib/lib \ /usr/lib \ /usr/lib/tk \ /import/tcl/lib \ d193 3 a195 5 + $PWD/../tk8.0 \ + /usr/src/local/tk8.0 \ $prefix/lib \ $x_libraries" for dir in $places; do d198 3 a200 5 + if test -r $dir/libtk80.so -o -r $dir/libtk80.a; then + V_LIB_TK="-Wl,-R$dir -L$dir -ltk80" break fi if test -r $dir/libtk.so -o -r $dir/libtk.a; then d202 37 a238 5 + V_LIB_TK="-Wl,-R$dir -L$dir -ltk" break fi done @@@@ -227,15 +238,16 @@@@ d240 2 d253 9 a261 10 + places="/usr/local/lib/tk8.0 \ + /usr/pkg/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 \ @ 1.3 log @Add a generous dose of -Wl,-R so this builds on ELF platforms. @ text @d1 1 a1 1 $NetBSD: patch-ah,v 1.2 1998/08/07 11:10:04 agc Exp $ d3 232 a234 35 --- configure.in.original Thu Dec 11 18:14:48 1997 +++ configure.in Thu Dec 11 18:14:58 1997 @@@@ -166,6 +166,7 @@@@ *-*-netbsd*) V_TARCMD="tar -h -c -f" - V_LIB="$V_LIB -Wl,-R/usr/pkg/lib -L/usr/pkg/lib" + V_LIB="$V_LIB -Wl,-R/usr/pkg/lib -L/usr/pkg/lib -lossaudio" + V_OBJ_AUDIO="audio-voxware.o" ;; *-*-hpux*) V_DEFINE="$V_DEFINE" --- configure.original Thu Dec 11 18:21:14 1997 +++ configure Thu Dec 11 18:22:08 1997 @@@@ -2179,6 +2179,7 @@@@ *-*-netbsd*) V_TARCMD="tar -h -c -f" - V_LIB="$V_LIB -Wl,-R/usr/pkg/lib -L/usr/pkg/lib" + V_LIB="$V_LIB -Wl,-R/usr/pkg/lib -L/usr/pkg/lib -lossaudio" + V_OBJ_AUDIO="audio-voxware.o" ;; *-*-hpux*) V_DEFINE="$V_DEFINE" --- audio-voxware.cc.original Thu Nov 20 14:44:07 1997 +++ audio-voxware.cc Thu Dec 11 17:47:55 1997 @@@@ -44,8 +44,10 @@@@ #include #include #include +#elif defined(__NetBSD__) +#include #else #include #endif #include "audio.h" #include "Tcl.h" @ 1.2 log @Add NetBSD RCS Ids. @ text @d1 1 a1 1 $NetBSD$ d8 2 a9 2 - V_LIB="$V_LIB -L/usr/pkg/lib" + V_LIB="$V_LIB -L/usr/pkg/lib -lossaudio" d19 2 a20 2 - V_LIB="$V_LIB -L/usr/pkg/lib" + V_LIB="$V_LIB -L/usr/pkg/lib -lossaudio" @ 1.1 log @First try to make this work on NetBSD. Currently we're using -lossaudio. XXX not duplex yet XXX volume setting doesn't work yet @ text @d1 2 @