diff options
author | jlam <jlam> | 2004-01-05 11:17:10 +0000 |
---|---|---|
committer | jlam <jlam> | 2004-01-05 11:17:10 +0000 |
commit | 8e67dd560513885380ef3f726caa6fc811f41f0e (patch) | |
tree | 0376c3e6dc6e2c84e788f7b7470da2a462f95a78 /lang/tcl | |
parent | a52e23e1fda3720a8333267e914647545a15013f (diff) | |
download | pkgsrc-8e67dd560513885380ef3f726caa6fc811f41f0e.tar.gz |
bl3ify
Diffstat (limited to 'lang/tcl')
-rw-r--r-- | lang/tcl/Makefile | 9 | ||||
-rw-r--r-- | lang/tcl/distinfo | 6 | ||||
-rw-r--r-- | lang/tcl/patches/patch-ab | 395 | ||||
-rw-r--r-- | lang/tcl/patches/patch-ae | 24 |
4 files changed, 55 insertions, 379 deletions
diff --git a/lang/tcl/Makefile b/lang/tcl/Makefile index 4552d14d980..a222f9fc05e 100644 --- a/lang/tcl/Makefile +++ b/lang/tcl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2003/10/08 03:13:21 jschauma Exp $ +# $NetBSD: Makefile,v 1.22 2004/01/05 11:22:13 jlam Exp $ # DISTNAME= tcl8.3.4 @@ -16,11 +16,13 @@ COMMENT= Ousterhout's Tool Command Language, a scripting language CONFLICTS+= tclman80-[0-9]* +PKG_INSTALLATION_TYPES= overwrite pkgviews + GNU_CONFIGURE= yes MAKE_ENV+= TOUCH="${TOUCH}" TEST_TARGET= test -USE_BUILDLINK2= yes +USE_BUILDLINK3= yes USE_LIBTOOL= yes INSTALL_TARGET= install @@ -32,6 +34,9 @@ PLIST_SUBST+= SHLIB_SUFX="${SHLIB_SUFX}" # CONFIGURE_ARGS+= --mandir=${WRKDIR}/man +# Add ${VIEWBASE}/lib/tcl to the list of locations for Tcl packages. +CONFIGURE_ENV+= TCL_PACKAGE_PATH="${VIEWBASE}/lib/tcl" + .include "../../mk/bsd.prefs.mk" .if ${OPSYS} == "Darwin" diff --git a/lang/tcl/distinfo b/lang/tcl/distinfo index 62bb026972c..8b182865b54 100644 --- a/lang/tcl/distinfo +++ b/lang/tcl/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.14 2003/10/08 03:13:21 jschauma Exp $ +$NetBSD: distinfo,v 1.15 2004/01/05 11:22:13 jlam Exp $ SHA1 (tcl8.3.4.tar.gz) = b179f1f51b322b7045cf152b73df4f3d01da82ec Size (tcl8.3.4.tar.gz) = 2654756 bytes SHA1 (patch-aa) = 3e9fa9427f40a4c6b1f97bcda58fefe9d5cf20ce -SHA1 (patch-ab) = c5c0092bdcb0f7d5d44a36b5c3e05af805987e5b +SHA1 (patch-ab) = 0350ffd17fe5e88d3e179b960d374248b41f9ad5 SHA1 (patch-ac) = d1e1b6ed334ff424140a678ed098504cc14614e8 -SHA1 (patch-ae) = a0237d220cf0f8475614497cabaae738621a7729 +SHA1 (patch-ae) = 5eee14adec88cf0cac5715fe0cfe7420b9b83774 SHA1 (patch-af) = e19764a58f5ddd6b5b62e785ae305069c535f865 diff --git a/lang/tcl/patches/patch-ab b/lang/tcl/patches/patch-ab index 4233613fa36..05be65aa30c 100644 --- a/lang/tcl/patches/patch-ab +++ b/lang/tcl/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.18 2003/10/08 03:13:21 jschauma Exp $ +$NetBSD: patch-ab,v 1.19 2004/01/05 11:22:13 jlam Exp $ ---- configure.orig Fri Oct 19 20:24:15 2001 -+++ configure Tue Oct 7 21:40:04 2003 -@@ -4776,6 +4776,7 @@ +--- configure.orig Fri Oct 19 17:24:15 2001 ++++ configure +@@ -4776,6 +4776,7 @@ fi # Step 3: set configuration options based on system name and version. do64bit_ok=no @@ -10,165 +10,7 @@ $NetBSD: patch-ab,v 1.18 2003/10/08 03:13:21 jschauma Exp $ EXTRA_CFLAGS="" TCL_EXPORT_FILE_SUFFIX="" UNSHARED_LIB_SUFFIX="" -@@ -4795,7 +4796,7 @@ - # Extract the first word of "ar", so it can be a program name with args. - set dummy ar; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:4799: checking for $ac_word" >&5 -+echo "configure:4800: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -4900,7 +4901,7 @@ - # known GMT value. - - echo $ac_n "checking for gettimeofday in -lbsd""... $ac_c" 1>&6 --echo "configure:4904: checking for gettimeofday in -lbsd" >&5 -+echo "configure:4905: checking for gettimeofday in -lbsd" >&5 - ac_lib_var=`echo bsd'_'gettimeofday | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -4908,7 +4909,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lbsd $LIBS" - cat > conftest.$ac_ext <<EOF --#line 4912 "configure" -+#line 4913 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -4919,7 +4920,7 @@ - gettimeofday() - ; return 0; } - EOF --if { (eval echo configure:4923: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4924: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -4981,7 +4982,7 @@ - HP-UX-*.11.*) - SHLIB_SUFFIX=".sl" - echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6 --echo "configure:4985: checking for shl_load in -ldld" >&5 -+echo "configure:4986: checking for shl_load in -ldld" >&5 - ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -4989,7 +4990,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-ldld $LIBS" - cat > conftest.$ac_ext <<EOF --#line 4993 "configure" -+#line 4994 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -5000,7 +5001,7 @@ - shl_load() - ; return 0; } - EOF --if { (eval echo configure:5004: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5005: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -5043,7 +5044,7 @@ - HP-UX-*.08.*|HP-UX-*.09.*|HP-UX-*.10.*) - SHLIB_SUFFIX=".sl" - echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6 --echo "configure:5047: checking for shl_load in -ldld" >&5 -+echo "configure:5048: checking for shl_load in -ldld" >&5 - ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -5051,7 +5052,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-ldld $LIBS" - cat > conftest.$ac_ext <<EOF --#line 5055 "configure" -+#line 5056 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -5062,7 +5063,7 @@ - shl_load() - ; return 0; } - EOF --if { (eval echo configure:5066: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5067: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -5123,6 +5124,9 @@ - DL_OBJS="tclLoadDl.o" - DL_LIBS="" - LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' -+ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' -+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so' -+ TCL_LIB_VERSIONS_OK=nodots - if test "$GCC" = "yes" ; then - EXTRA_CFLAGS="-mabi=n32" - LDFLAGS="-mabi=n32" -@@ -5148,6 +5152,9 @@ - DL_LIBS="" - LDFLAGS="" - LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' -+ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' -+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so' -+ TCL_LIB_VERSIONS_OK=nodots - ;; - Linux*) - SHLIB_CFLAGS="-fPIC" -@@ -5166,20 +5173,23 @@ - DL_LIBS="-ldl" - LDFLAGS="-rdynamic" - LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' -+ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' -+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so' -+ TCL_LIB_VERSIONS_OK=nodots - else - ac_safe=`echo "dld.h" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for dld.h""... $ac_c" 1>&6 --echo "configure:5173: checking for dld.h" >&5 -+echo "configure:5174: checking for dld.h" >&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 --#line 5178 "configure" -+#line 5179 "configure" - #include "confdefs.h" - #include <dld.h> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:5183: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:5184: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -5236,17 +5246,17 @@ - else - ac_safe=`echo "dld.h" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for dld.h""... $ac_c" 1>&6 --echo "configure:5240: checking for dld.h" >&5 -+echo "configure:5241: checking for dld.h" >&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 --#line 5245 "configure" -+#line 5246 "configure" - #include "confdefs.h" - #include <dld.h> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:5250: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:5251: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -5298,20 +5308,23 @@ +@@ -5298,6 +5299,9 @@ fi LD_SEARCH_FLAGS="" ;; NetBSD-*|FreeBSD-[1-2].*|OpenBSD-*) @@ -178,24 +20,7 @@ $NetBSD: patch-ab,v 1.18 2003/10/08 03:13:21 jschauma Exp $ # Not available on all versions: check for include file. ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6 --echo "configure:5305: checking for dlfcn.h" >&5 -+echo "configure:5309: checking for dlfcn.h" >&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 --#line 5310 "configure" -+#line 5314 "configure" - #include "confdefs.h" - #include <dlfcn.h> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:5315: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:5319: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -5330,17 +5343,15 @@ +@@ -5330,17 +5334,15 @@ if eval "test \"`echo '$ac_cv_header_'$a # NetBSD/SPARC needs -fPIC, -fpic will not do. SHLIB_CFLAGS="-fPIC" @@ -215,12 +40,13 @@ $NetBSD: patch-ab,v 1.18 2003/10/08 03:13:21 jschauma Exp $ #include "confdefs.h" #ifdef __ELF__ -@@ -5351,11 +5362,20 @@ +@@ -5351,11 +5353,20 @@ EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "yes" >/dev/null 2>&1; then rm -rf conftest* +- echo "$ac_t""yes" 1>&6 + - echo "$ac_t""yes" 1>&6 ++ echo "$ac_t""yes" 1>&6 + SHLIB_LD='${TCL_CC} -shared -Wl,-x' + LD_SEARCH_FLAGS='-Wl,-R${LIB_RUNTIME_DIR}' + TCL_LIB_SPEC_RPATH="-Wl,-R${exec_prefix}/lib" @@ -228,34 +54,16 @@ $NetBSD: patch-ab,v 1.18 2003/10/08 03:13:21 jschauma Exp $ + else rm -rf conftest* +- echo "$ac_t""no" 1>&6 + - echo "$ac_t""no" 1>&6 ++ echo "$ac_t""no" 1>&6 + SHLIB_LD="ld -Bshareable -x" + LD_SEARCH_FLAGS='-R${LIB_RUNTIME_DIR}' + TCL_LIB_SPEC_RPATH="-R${exec_prefix}/lib" SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0' fi -@@ -5401,7 +5421,7 @@ - Rhapsody-*|Darwin-*) - SHLIB_CFLAGS="-fno-common" - SHLIB_LD="cc -dynamiclib \${LDFLAGS}" -- TCL_SHLIB_LD_EXTRAS="-compatibility_version ${TCL_MAJOR_VERSION} -current_version \${VERSION} -install_name \${LIB_RUNTIME_DIR}/\${TCL_LIB_FILE} -prebind -seg1addr a000000" -+ TCL_SHLIB_LD_EXTRAS="-compatibility_version ${TCL_MAJOR_VERSION} -current_version \${VERSION} -install_name \${LIB_RUNTIME_DIR}/\${TCL_LIB_FILE} -prebind -seg1addr a000000 -dynamiclib" - SHLIB_LD_LIBS="${LIBS}" - SHLIB_SUFFIX=".dylib" - DL_OBJS="tclLoadDyld.o" -@@ -5410,6 +5430,9 @@ - LD_SEARCH_FLAGS="" - CFLAGS_OPTIMIZE="-O3" - EXTRA_CFLAGS="-arch ppc -pipe" -+ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' -+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}\$\{SHLIB_SUFFIX\}' -+ TCL_LIB_VERSIONS_OK=nodots - ;; - NEXTSTEP-*) - SHLIB_CFLAGS="" -@@ -5569,6 +5592,9 @@ +@@ -5569,6 +5580,9 @@ EOF DL_LIBS="-ldl" LDFLAGS="" LD_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}' @@ -265,7 +73,7 @@ $NetBSD: patch-ab,v 1.18 2003/10/08 03:13:21 jschauma Exp $ ;; SunOS-5*) -@@ -5616,6 +5642,9 @@ +@@ -5616,6 +5630,9 @@ EOF else LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}' fi @@ -275,160 +83,7 @@ $NetBSD: patch-ab,v 1.18 2003/10/08 03:13:21 jschauma Exp $ ;; ULTRIX-4.*) SHLIB_CFLAGS="-G 0" -@@ -5641,17 +5670,17 @@ - # that don't grok the -Bexport option. Test that it does. - hold_ldflags=$LDFLAGS - echo $ac_n "checking for ld accepts -Bexport flag""... $ac_c" 1>&6 --echo "configure:5645: checking for ld accepts -Bexport flag" >&5 -+echo "configure:5662: checking for ld accepts -Bexport flag" >&5 - LDFLAGS="${LDFLAGS} -Wl,-Bexport" - cat > conftest.$ac_ext <<EOF --#line 5648 "configure" -+#line 5665 "configure" - #include "confdefs.h" - - int main() { - int i; - ; return 0; } - EOF --if { (eval echo configure:5655: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5672: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - found=yes - else -@@ -5697,9 +5726,9 @@ - - if test "x$DL_OBJS" = "xtclLoadAout.o" ; then - echo $ac_n "checking sys/exec.h""... $ac_c" 1>&6 --echo "configure:5701: checking sys/exec.h" >&5 -+echo "configure:5718: checking sys/exec.h" >&5 - cat > conftest.$ac_ext <<EOF --#line 5703 "configure" -+#line 5720 "configure" - #include "confdefs.h" - #include <sys/exec.h> - int main() { -@@ -5717,7 +5746,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:5721: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:5738: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - tcl_ok=usable - else -@@ -5735,9 +5764,9 @@ - - else - echo $ac_n "checking a.out.h""... $ac_c" 1>&6 --echo "configure:5739: checking a.out.h" >&5 -+echo "configure:5756: checking a.out.h" >&5 - cat > conftest.$ac_ext <<EOF --#line 5741 "configure" -+#line 5758 "configure" - #include "confdefs.h" - #include <a.out.h> - int main() { -@@ -5755,7 +5784,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:5759: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:5776: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - tcl_ok=usable - else -@@ -5773,9 +5802,9 @@ - - else - echo $ac_n "checking sys/exec_aout.h""... $ac_c" 1>&6 --echo "configure:5777: checking sys/exec_aout.h" >&5 -+echo "configure:5794: checking sys/exec_aout.h" >&5 - cat > conftest.$ac_ext <<EOF --#line 5779 "configure" -+#line 5796 "configure" - #include "confdefs.h" - #include <sys/exec_aout.h> - int main() { -@@ -5793,7 +5822,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:5797: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:5814: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - tcl_ok=usable - else -@@ -5890,7 +5919,7 @@ - - - echo $ac_n "checking for build with symbols""... $ac_c" 1>&6 --echo "configure:5894: checking for build with symbols" >&5 -+echo "configure:5911: checking for build with symbols" >&5 - # Check whether --enable-symbols or --disable-symbols was given. - if test "${enable_symbols+set}" = set; then - enableval="$enable_symbols" -@@ -5927,17 +5956,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:5931: checking for $ac_hdr" >&5 -+echo "configure:5948: 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 --#line 5936 "configure" -+#line 5953 "configure" - #include "confdefs.h" - #include <$ac_hdr> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:5941: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:5958: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -5967,17 +5996,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:5971: checking for $ac_hdr" >&5 -+echo "configure:5988: 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 --#line 5976 "configure" -+#line 5993 "configure" - #include "confdefs.h" - #include <$ac_hdr> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:5981: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:5998: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -6004,7 +6033,7 @@ - done - - echo $ac_n "checking FIONBIO vs. O_NONBLOCK for nonblocking I/O""... $ac_c" 1>&6 --echo "configure:6008: checking FIONBIO vs. O_NONBLOCK for nonblocking I/O" >&5 -+echo "configure:6025: checking FIONBIO vs. O_NONBLOCK for nonblocking I/O" >&5 - if test -f /usr/lib/NextStep/software_version; then - system=NEXTSTEP-`awk '/3/,/3/' /usr/lib/NextStep/software_version` - else -@@ -6066,7 +6095,7 @@ - - - echo $ac_n "checking how to build libraries""... $ac_c" 1>&6 --echo "configure:6070: checking how to build libraries" >&5 -+echo "configure:6087: checking how to build libraries" >&5 - # Check whether --enable-shared or --disable-shared was given. - if test "${enable_shared+set}" = set; then - enableval="$enable_shared" -@@ -6103,7 +6132,7 @@ +@@ -6103,7 +6120,7 @@ if test "${SHARED_BUILD}" = "1" -a "${SH if test "x$DL_OBJS" = "xtclLoadAout.o"; then MAKE_LIB="\${STLIB_LD} \$@ \${OBJS}" else @@ -437,7 +92,7 @@ $NetBSD: patch-ab,v 1.18 2003/10/08 03:13:21 jschauma Exp $ fi else case $system in -@@ -6141,7 +6170,7 @@ +@@ -6141,7 +6158,7 @@ if test "$SHARED_BUILD" = "0" -o $TCL_NE TCL_LIB_FLAG="-ltcl`echo ${TCL_VERSION} | tr -d .`\${TCL_DBGX}" fi TCL_BUILD_LIB_SPEC="-L`pwd` ${TCL_LIB_FLAG}" @@ -446,19 +101,27 @@ $NetBSD: patch-ab,v 1.18 2003/10/08 03:13:21 jschauma Exp $ else TCL_BUILD_EXP_FILE="lib.exp" eval "TCL_EXP_FILE=libtcl${TCL_EXPORT_FILE_SUFFIX}" -@@ -6171,9 +6200,9 @@ +@@ -6171,10 +6188,17 @@ VERSION=${TCL_VERSION} #-------------------------------------------------------------------- if test "$prefix" != "$exec_prefix"; then - TCL_PACKAGE_PATH="${exec_prefix}/lib ${prefix}/lib" -+ TCL_PACKAGE_PATH="${exec_prefix}/lib/tcl ${prefix}/lib" ++ TCL_PACKAGE_PATH_ADD="${exec_prefix}/lib/tcl ${prefix}/lib" else - TCL_PACKAGE_PATH="${prefix}/lib" -+ TCL_PACKAGE_PATH="${prefix}/lib/tcl" ++ TCL_PACKAGE_PATH_ADD="${prefix}/lib/tcl" fi ++for dir in ${TCL_PACKAGE_PATH_ADD}; do ++ if test -z "${TCL_PACKAGE_PATH}"; then ++ TCL_PACKAGE_PATH="$dir" ++ else ++ TCL_PACKAGE_PATH="${TCL_PACKAGE_PATH} $dir" ++ fi ++done #-------------------------------------------------------------------- -@@ -6186,7 +6215,7 @@ + # The statements below define various symbols relating to Tcl +@@ -6186,7 +6210,7 @@ eval "TCL_STUB_LIB_FILE=libtclstub${TCL_ # Replace DBGX with TCL_DBGX eval "TCL_STUB_LIB_FILE=\"${TCL_STUB_LIB_FILE}\"" @@ -467,7 +130,7 @@ $NetBSD: patch-ab,v 1.18 2003/10/08 03:13:21 jschauma Exp $ if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then TCL_STUB_LIB_FLAG="-ltclstub${TCL_VERSION}\${TCL_DBGX}" -@@ -6262,6 +6291,8 @@ +@@ -6262,6 +6286,8 @@ TCL_SHARED_BUILD=${SHARED_BUILD} @@ -476,7 +139,7 @@ $NetBSD: patch-ab,v 1.18 2003/10/08 03:13:21 jschauma Exp $ trap '' 1 2 15 cat > confcache <<\EOF # This file is a shell script that caches the results of configure -@@ -6437,12 +6468,12 @@ +@@ -6437,12 +6463,12 @@ s%@TCL_DBGX@%$TCL_DBGX%g s%@CFG_TCL_SHARED_LIB_SUFFIX@%$CFG_TCL_SHARED_LIB_SUFFIX%g s%@CFG_TCL_UNSHARED_LIB_SUFFIX@%$CFG_TCL_UNSHARED_LIB_SUFFIX%g s%@CFG_TCL_EXPORT_FILE_SUFFIX@%$CFG_TCL_EXPORT_FILE_SUFFIX%g diff --git a/lang/tcl/patches/patch-ae b/lang/tcl/patches/patch-ae index 3d3e64a5814..64665e13b0c 100644 --- a/lang/tcl/patches/patch-ae +++ b/lang/tcl/patches/patch-ae @@ -1,7 +1,7 @@ -$NetBSD: patch-ae,v 1.2 2001/12/23 17:02:31 bjoern Exp $ +$NetBSD: patch-ae,v 1.3 2004/01/05 11:22:13 jlam Exp $ ---- configure.in.orig Sat Oct 20 02:24:15 2001 -+++ configure.in +--- configure.in.orig Fri Oct 19 17:24:15 2001 ++++ configure.in Tue Nov 25 05:16:06 2003 @@ -386,7 +386,7 @@ if test "x$DL_OBJS" = "xtclLoadAout.o"; then MAKE_LIB="\${STLIB_LD} \[$]@ \${OBJS}" @@ -20,19 +20,27 @@ $NetBSD: patch-ae,v 1.2 2001/12/23 17:02:31 bjoern Exp $ else TCL_BUILD_EXP_FILE="lib.exp" eval "TCL_EXP_FILE=libtcl${TCL_EXPORT_FILE_SUFFIX}" -@@ -454,9 +454,9 @@ +@@ -454,10 +454,17 @@ #-------------------------------------------------------------------- if test "$prefix" != "$exec_prefix"; then - TCL_PACKAGE_PATH="${exec_prefix}/lib ${prefix}/lib" -+ TCL_PACKAGE_PATH="${exec_prefix}/lib/tcl ${prefix}/lib" ++ TCL_PACKAGE_PATH_ADD="${exec_prefix}/lib/tcl ${prefix}/lib" else - TCL_PACKAGE_PATH="${prefix}/lib" -+ TCL_PACKAGE_PATH="${prefix}/lib/tcl" ++ TCL_PACKAGE_PATH_ADD="${prefix}/lib/tcl" fi ++for dir in ${TCL_PACKAGE_PATH_ADD}; do ++ if test -z "${TCL_PACKAGE_PATH}"; then ++ TCL_PACKAGE_PATH="$dir" ++ else ++ TCL_PACKAGE_PATH="${TCL_PACKAGE_PATH} $dir" ++ fi ++done #-------------------------------------------------------------------- -@@ -469,7 +469,7 @@ + # The statements below define various symbols relating to Tcl +@@ -469,7 +476,7 @@ # Replace DBGX with TCL_DBGX eval "TCL_STUB_LIB_FILE=\"${TCL_STUB_LIB_FILE}\"" @@ -41,7 +49,7 @@ $NetBSD: patch-ae,v 1.2 2001/12/23 17:02:31 bjoern Exp $ if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then TCL_STUB_LIB_FLAG="-ltclstub${TCL_VERSION}\${TCL_DBGX}" -@@ -511,6 +511,8 @@ +@@ -511,6 +518,8 @@ AC_SUBST(CFG_TCL_EXPORT_FILE_SUFFIX) AC_SUBST(CFLAGS) |