summaryrefslogtreecommitdiff
path: root/lang/tcl
diff options
context:
space:
mode:
Diffstat (limited to 'lang/tcl')
-rw-r--r--lang/tcl/distinfo6
-rw-r--r--lang/tcl/patches/patch-ab237
-rw-r--r--lang/tcl/patches/patch-af26
3 files changed, 255 insertions, 14 deletions
diff --git a/lang/tcl/distinfo b/lang/tcl/distinfo
index 6f621bb6bef..09072483d4e 100644
--- a/lang/tcl/distinfo
+++ b/lang/tcl/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.8 2001/07/25 19:42:58 jlam Exp $
+$NetBSD: distinfo,v 1.9 2001/07/29 07:09:51 tron Exp $
SHA1 (tcl8.3.2.tar.gz) = be2701bca3f4fd9c49ef3e2e8932f8b0a10d28fa
Size (tcl8.3.2.tar.gz) = 2594407 bytes
SHA1 (patch-aa) = 3f5afe145a5e05f512d3a66c774091e26bf380bf
-SHA1 (patch-ab) = 6633874bf48c019d7b7072bf8b7d1eed40b7570b
+SHA1 (patch-ab) = c23d5426626172e347b86dc12fb36a800d973581
SHA1 (patch-ac) = 6f6f8e8b0ab6744662e7365511161e29affe62fc
SHA1 (patch-ad) = 22412c6b564e7b6baced01c4c35bc6efa994fc8f
SHA1 (patch-ae) = 0ec38469f8f9dbfdce6a6c3f5311f03903e10741
-SHA1 (patch-af) = 5c41885d0fa4633d04da1e7c741c64a6941a9206
+SHA1 (patch-af) = fe3122bfcb3b7a613e1863d2a16a4c53da2135e4
diff --git a/lang/tcl/patches/patch-ab b/lang/tcl/patches/patch-ab
index 124702b00d2..5e07d35c4d9 100644
--- a/lang/tcl/patches/patch-ab
+++ b/lang/tcl/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.11 2001/07/25 19:42:58 jlam Exp $
+$NetBSD: patch-ab,v 1.12 2001/07/29 07:09:52 tron Exp $
---- configure.orig Tue Aug 8 12:17:11 2000
-+++ configure
+--- configure.orig Tue Aug 8 21:17:11 2000
++++ configure Sun Jul 29 08:58:02 2001
@@ -4766,6 +4766,7 @@
do64bit_ok=no
@@ -10,6 +10,54 @@ $NetBSD: patch-ab,v 1.11 2001/07/25 19:42:58 jlam Exp $
EXTRA_CFLAGS=""
TCL_EXPORT_FILE_SUFFIX=""
UNSHARED_LIB_SUFFIX=""
+@@ -4856,7 +4857,7 @@
+ HP-UX-*.08.*|HP-UX-*.09.*|HP-UX-*.10.*|HP-UX-*.11.*)
+ SHLIB_SUFFIX=".sl"
+ echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
+-echo "configure:4860: checking for shl_load in -ldld" >&5
++echo "configure:4861: 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
+@@ -4864,7 +4865,7 @@
+ ac_save_LIBS="$LIBS"
+ LIBS="-ldld $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 4868 "configure"
++#line 4869 "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
+@@ -4875,7 +4876,7 @@
+ shl_load()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4879: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4880: \"$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
+@@ -4971,17 +4972,17 @@
+ else
+ ac_safe=`echo "dld.h" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for dld.h""... $ac_c" 1>&6
+-echo "configure:4975: checking for dld.h" >&5
++echo "configure:4976: 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 4980 "configure"
++#line 4981 "configure"
+ #include "confdefs.h"
+ #include <dld.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:4985: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:4986: \"$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*
@@ -5033,20 +5034,23 @@
LD_SEARCH_FLAGS=""
;;
@@ -80,7 +128,180 @@ $NetBSD: patch-ab,v 1.11 2001/07/25 19:42:58 jlam Exp $
SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0'
fi
-@@ -5789,7 +5800,7 @@
+@@ -5265,6 +5276,9 @@
+ DL_LIBS="-ldl"
+ LDFLAGS=""
+ LD_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}'
++ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
++ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
++ TCL_LIB_VERSIONS_OK=nodots
+ ;;
+ SunOS-5*)
+ SHLIB_CFLAGS="-KPIC"
+@@ -5304,6 +5318,9 @@
+ else
+ LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}'
+ fi
++ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
++ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
++ TCL_LIB_VERSIONS_OK=nodots
+ ;;
+ ULTRIX-4.*)
+ SHLIB_CFLAGS="-G 0"
+@@ -5329,17 +5346,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:5333: checking for ld accepts -Bexport flag" >&5
++echo "configure:5350: checking for ld accepts -Bexport flag" >&5
+ LDFLAGS="${LDFLAGS} -Wl,-Bexport"
+ cat > conftest.$ac_ext <<EOF
+-#line 5336 "configure"
++#line 5353 "configure"
+ #include "confdefs.h"
+
+ int main() {
+ int i;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5343: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5360: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ found=yes
+ else
+@@ -5385,9 +5402,9 @@
+
+ if test "x$DL_OBJS" = "xtclLoadAout.o" ; then
+ echo $ac_n "checking sys/exec.h""... $ac_c" 1>&6
+-echo "configure:5389: checking sys/exec.h" >&5
++echo "configure:5406: checking sys/exec.h" >&5
+ cat > conftest.$ac_ext <<EOF
+-#line 5391 "configure"
++#line 5408 "configure"
+ #include "confdefs.h"
+ #include <sys/exec.h>
+ int main() {
+@@ -5405,7 +5422,7 @@
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5409: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:5426: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ tcl_ok=usable
+ else
+@@ -5423,9 +5440,9 @@
+
+ else
+ echo $ac_n "checking a.out.h""... $ac_c" 1>&6
+-echo "configure:5427: checking a.out.h" >&5
++echo "configure:5444: checking a.out.h" >&5
+ cat > conftest.$ac_ext <<EOF
+-#line 5429 "configure"
++#line 5446 "configure"
+ #include "confdefs.h"
+ #include <a.out.h>
+ int main() {
+@@ -5443,7 +5460,7 @@
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5447: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:5464: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ tcl_ok=usable
+ else
+@@ -5461,9 +5478,9 @@
+
+ else
+ echo $ac_n "checking sys/exec_aout.h""... $ac_c" 1>&6
+-echo "configure:5465: checking sys/exec_aout.h" >&5
++echo "configure:5482: checking sys/exec_aout.h" >&5
+ cat > conftest.$ac_ext <<EOF
+-#line 5467 "configure"
++#line 5484 "configure"
+ #include "confdefs.h"
+ #include <sys/exec_aout.h>
+ int main() {
+@@ -5481,7 +5498,7 @@
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5485: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:5502: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ tcl_ok=usable
+ else
+@@ -5576,7 +5593,7 @@
+
+
+ echo $ac_n "checking for build with symbols""... $ac_c" 1>&6
+-echo "configure:5580: checking for build with symbols" >&5
++echo "configure:5597: 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"
+@@ -5613,17 +5630,17 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:5617: checking for $ac_hdr" >&5
++echo "configure:5634: 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 5622 "configure"
++#line 5639 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:5627: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:5644: \"$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*
+@@ -5653,17 +5670,17 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:5657: checking for $ac_hdr" >&5
++echo "configure:5674: 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 5662 "configure"
++#line 5679 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:5667: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:5684: \"$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*
+@@ -5690,7 +5707,7 @@
+ done
+
+ echo $ac_n "checking FIONBIO vs. O_NONBLOCK for nonblocking I/O""... $ac_c" 1>&6
+-echo "configure:5694: checking FIONBIO vs. O_NONBLOCK for nonblocking I/O" >&5
++echo "configure:5711: 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
+@@ -5752,7 +5769,7 @@
+
+
+ echo $ac_n "checking how to build libraries""... $ac_c" 1>&6
+-echo "configure:5756: checking how to build libraries" >&5
++echo "configure:5773: 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"
+@@ -5789,7 +5806,7 @@
if test "x$DL_OBJS" = "xtclLoadAout.o"; then
MAKE_LIB="ar cr \${TCL_LIB_FILE} \${OBJS}"
else
@@ -89,7 +310,7 @@ $NetBSD: patch-ab,v 1.11 2001/07/25 19:42:58 jlam Exp $
RANLIB=":"
fi
else
-@@ -5829,7 +5840,7 @@
+@@ -5829,7 +5846,7 @@
TCL_LIB_FLAG="-ltcl`echo ${TCL_VERSION} | tr -d .`\${TCL_DBGX}"
fi
TCL_BUILD_LIB_SPEC="-L`pwd` ${TCL_LIB_FLAG}"
@@ -98,7 +319,7 @@ $NetBSD: patch-ab,v 1.11 2001/07/25 19:42:58 jlam Exp $
else
TCL_BUILD_EXP_FILE="lib.exp"
eval "TCL_EXP_FILE=libtcl${TCL_EXPORT_FILE_SUFFIX}"
-@@ -5859,9 +5870,9 @@
+@@ -5859,9 +5876,9 @@
#--------------------------------------------------------------------
if test "$prefix" != "$exec_prefix"; then
@@ -110,7 +331,7 @@ $NetBSD: patch-ab,v 1.11 2001/07/25 19:42:58 jlam Exp $
fi
#--------------------------------------------------------------------
-@@ -5943,6 +5954,8 @@
+@@ -5943,6 +5960,8 @@
@@ -119,7 +340,7 @@ $NetBSD: patch-ab,v 1.11 2001/07/25 19:42:58 jlam Exp $
trap '' 1 2 15
cat > confcache <<\EOF
# This file is a shell script that caches the results of configure
-@@ -6106,6 +6119,8 @@
+@@ -6106,6 +6125,8 @@
s%@TCL_STUB_LIB_PATH@%$TCL_STUB_LIB_PATH%g
s%@MAKE_STUB_LIB@%$MAKE_STUB_LIB%g
s%@BUILD_DLTEST@%$BUILD_DLTEST%g
diff --git a/lang/tcl/patches/patch-af b/lang/tcl/patches/patch-af
index 026a20d7070..b2d904cb607 100644
--- a/lang/tcl/patches/patch-af
+++ b/lang/tcl/patches/patch-af
@@ -1,7 +1,7 @@
-$NetBSD: patch-af,v 1.3 2001/07/25 19:42:58 jlam Exp $
+$NetBSD: patch-af,v 1.4 2001/07/29 07:09:52 tron Exp $
---- tcl.m4.orig Tue Aug 8 12:17:11 2000
-+++ tcl.m4
+--- tcl.m4.orig Tue Aug 8 21:17:11 2000
++++ tcl.m4 Sun Jul 29 08:54:14 2001
@@ -595,6 +595,7 @@
do64bit_ok=no
@@ -52,3 +52,23 @@ $NetBSD: patch-af,v 1.3 2001/07/25 19:42:58 jlam Exp $
], [
SHLIB_CFLAGS=""
SHLIB_LD="echo tclLdAout $CC \{$SHLIB_CFLAGS\} | `pwd`/tclsh -r"
+@@ -973,6 +982,9 @@
+ DL_LIBS="-ldl"
+ LDFLAGS=""
+ LD_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}'
++ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
++ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
++ TCL_LIB_VERSIONS_OK=nodots
+ ;;
+ SunOS-5*)
+ SHLIB_CFLAGS="-KPIC"
+@@ -1012,6 +1024,9 @@
+ else
+ LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}'
+ fi
++ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
++ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
++ TCL_LIB_VERSIONS_OK=nodots
+ ;;
+ ULTRIX-4.*)
+ SHLIB_CFLAGS="-G 0"