Update to version 8.3.4

Besides more bug fixes and several enhancements some of the NetBSD relevant changes (taken from "changes" in the distribution): 2001-04-03 (doc fixes) numerous doc corrections and clarifications. Update of READMEs. 2001-03-29 (bug fix) prevent potential race condition and security leak in tmp filename creation on Unix. (max) 2001-03-13 (bug fix) Correctly possible memory corruption in string map {} $str (fellows) 2001-01-30 (bug fix) Fixed possible hangs in fcopy. (porter) 2000-11-23 (mem leak) fixed potential memory leak in error case of lsort (fellows) 2000-11-01 (mem leak) Corrected excessive mem use of info exists on a non-existent array element (hobbs) 2000-09-27 (bug fix) fixed a bug introduced by a partial fix in 8.3.2 that didn't set nonBlocking correctly when resetting the flags for the write side (mem leak) Correct mem leak in channels when statePtr was released (hobbs) 2001-07-18 (bug fix) corrected memory overwrite error when buffer size of a channel is changed after channel use has already begun (kupries, porter) 2001-08-07 (bug fix) corrected bytecode stack management during [break] (see test foreach-5.5) (sofer, tallneil, jstrot) 2001-08-08 (new features) updated packages msgcat 1.1.1, opt 0.4.3, tcltest 1.0.1, dependencies checked (porter) 2001-08-24 (bug fix) [auto_import] now matches patterns like [namespace import], not like [string match] (porter) **** POTENTIAL INCOMPATABILITY **** 2001-08-27 (new feature) added Tcl_SetMainLoop() to enable loading Tk as a true package (hobbs) 2001-09-06 (new feature) http 2.4: honor the Content-encoding and charset parameters; add -binary switch for forcing the issue (hobbs, saoukhi, orwell) 2001-09-10 (bug fix) protect against alias loops (hobbs) 2001-09-19 (bug fix) [format] and [scan] corrected for 64-bit machines (rmax) 2001-09-26 (bug fix) corrected potential deadlock in channels that do not provide a BlockModeProc (kupries, kogorman) 2001-10-11 (bug fix) corrected cleanup of self-referential bytecodes at interpreter deletion (sofer, rbrunner)
author: bjoern <bjoern> 2001-12-23 17:02:30 +0000
committer: bjoern <bjoern> 2001-12-23 17:02:30 +0000
commit: f191bc5c9fa4bdb0c4f54fed25feb366dbcb58f1 (patch)
tree: 18be57fd846401eed717890cdcb3d1ca865b42f7 /lang/tcl
parent: 5fe4074fc174595abff199e7baf1eb984b8c2493 (diff)
download: pkgsrc-f191bc5c9fa4bdb0c4f54fed25feb366dbcb58f1.tar.gz
10 files changed, 312 insertions, 221 deletions
diff --git a/lang/tcl/Makefile b/lang/tcl/Makefile
index 0e714332f8e..22d671a4e6f 100644
--- a/lang/tcl/Makefile
+++ b/lang/tcl/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2001/11/29 01:12:39 hubertf Exp $
+# $NetBSD: Makefile,v 1.14 2001/12/23 17:02:30 bjoern Exp $
 #
 
-DISTNAME=		tcl8.3.2
-PKGNAME=		tcl-8.3.2
-PKGREVISION=		2
+DISTNAME=		tcl8.3.4
+PKGNAME=		tcl-8.3.4
 CATEGORIES=		lang
 MASTER_SITES=		ftp://ftp.scriptics.com/pub/tcl/tcl8_3/ \
 			ftp://gd.tuwien.ac.at/languages/tcl/scriptics/tcl8_3/ \
diff --git a/lang/tcl/PLIST b/lang/tcl/PLIST
index 7e3310dea9d..4370d9143c7 100644
--- a/lang/tcl/PLIST
+++ b/lang/tcl/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:25:13 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/12/23 17:02:31 bjoern Exp $
 bin/tclsh
 bin/tclsh8.3
 include/tcl.h
@@ -16,6 +16,7 @@ include/tcl/generic/tclPort.h
 include/tcl/generic/tclRegexp.h
 include/tcl/unix/tclUnixPort.h
 include/tclDecls.h
+include/tclPlatDecls.h
 lib/libtcl83.a
 lib/libtcl83.la
 lib/libtcl83.so
@@ -55,6 +56,7 @@ lib/tcl8.3/encoding/cp936.enc
 lib/tcl8.3/encoding/cp949.enc
 lib/tcl8.3/encoding/cp950.enc
 lib/tcl8.3/encoding/dingbats.enc
+lib/tcl8.3/encoding/ebcdic.enc
 lib/tcl8.3/encoding/euc-cn.enc
 lib/tcl8.3/encoding/euc-jp.enc
 lib/tcl8.3/encoding/euc-kr.enc
@@ -65,6 +67,11 @@ lib/tcl8.3/encoding/iso2022-jp.enc
 lib/tcl8.3/encoding/iso2022-kr.enc
 lib/tcl8.3/encoding/iso2022.enc
 lib/tcl8.3/encoding/iso8859-1.enc
+lib/tcl8.3/encoding/iso8859-10.enc
+lib/tcl8.3/encoding/iso8859-13.enc
+lib/tcl8.3/encoding/iso8859-14.enc
+lib/tcl8.3/encoding/iso8859-15.enc
+lib/tcl8.3/encoding/iso8859-16.enc
 lib/tcl8.3/encoding/iso8859-2.enc
 lib/tcl8.3/encoding/iso8859-3.enc
 lib/tcl8.3/encoding/iso8859-4.enc
@@ -77,6 +84,7 @@ lib/tcl8.3/encoding/jis0201.enc
 lib/tcl8.3/encoding/jis0208.enc
 lib/tcl8.3/encoding/jis0212.enc
 lib/tcl8.3/encoding/koi8-r.enc
+lib/tcl8.3/encoding/koi8-u.enc
 lib/tcl8.3/encoding/ksc5601.enc
 lib/tcl8.3/encoding/macCentEuro.enc
 lib/tcl8.3/encoding/macCroatian.enc
@@ -92,16 +100,17 @@ lib/tcl8.3/encoding/macTurkish.enc
 lib/tcl8.3/encoding/macUkraine.enc
 lib/tcl8.3/encoding/shiftjis.enc
 lib/tcl8.3/encoding/symbol.enc
+lib/tcl8.3/encoding/tis-620.enc
 lib/tcl8.3/history.tcl
 lib/tcl8.3/http1.0/http.tcl
 lib/tcl8.3/http1.0/pkgIndex.tcl
-lib/tcl8.3/http2.3/http.tcl
-lib/tcl8.3/http2.3/pkgIndex.tcl
+lib/tcl8.3/http2.4/http.tcl
+lib/tcl8.3/http2.4/pkgIndex.tcl
 lib/tcl8.3/init.tcl
 lib/tcl8.3/ldAix
 lib/tcl8.3/ldAout.tcl
-lib/tcl8.3/msgcat1.0/msgcat.tcl
-lib/tcl8.3/msgcat1.0/pkgIndex.tcl
+lib/tcl8.3/msgcat1.1/msgcat.tcl
+lib/tcl8.3/msgcat1.1/pkgIndex.tcl
 lib/tcl8.3/opt0.4/optparse.tcl
 lib/tcl8.3/opt0.4/pkgIndex.tcl
 lib/tcl8.3/package.tcl
@@ -340,7 +349,6 @@ man/man3/Tcl_ListObjIndex.3
 man/man3/Tcl_ListObjLength.3
 man/man3/Tcl_ListObjReplace.3
 man/man3/Tcl_LogCommandInfo.3
-man/man3/Tcl_Main.3
 man/man3/Tcl_MakeFileChannel.3
 man/man3/Tcl_MakeSafe.3
 man/man3/Tcl_MakeTcpClientChannel.3
@@ -422,6 +430,7 @@ man/man3/Tcl_SetHashValue.3
 man/man3/Tcl_SetIntObj.3
 man/man3/Tcl_SetListObj.3
 man/man3/Tcl_SetLongObj.3
+man/man3/Tcl_SetMainLoop.3
 man/man3/Tcl_SetMaxBlockTime.3
 man/man3/Tcl_SetObjErrorCode.3
 man/man3/Tcl_SetObjLength.3
@@ -492,6 +501,7 @@ man/man3/Tcl_VarEvalVA.3
 man/man3/Tcl_VarTraceInfo.3
 man/man3/Tcl_VarTraceInfo2.3
 man/man3/Tcl_WaitForEvent.3
+man/man3/Tcl_WaitPid.3
 man/man3/Tcl_WinTCharToUtf.3
 man/man3/Tcl_WinUtfToTChar.3
 man/man3/Tcl_Write.3
@@ -614,8 +624,8 @@ man/mann/vwait.n
 man/mann/while.n
 @dirrm lib/tcl8.3/tcltest1.0
 @dirrm lib/tcl8.3/opt0.4
-@dirrm lib/tcl8.3/msgcat1.0
-@dirrm lib/tcl8.3/http2.3
+@dirrm lib/tcl8.3/msgcat1.1
+@dirrm lib/tcl8.3/http2.4
 @dirrm lib/tcl8.3/http1.0
 @dirrm lib/tcl8.3/encoding
 @dirrm lib/tcl8.3
diff --git a/lang/tcl/buildlink.mk b/lang/tcl/buildlink.mk
index 4c4e8bf58aa..d1f8e603acd 100644
--- a/lang/tcl/buildlink.mk
+++ b/lang/tcl/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.8 2001/11/30 17:21:56 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.9 2001/12/23 17:02:31 bjoern Exp $
 #
 # This Makefile fragment is included by packages that use tcl.
 #
@@ -17,13 +17,14 @@ TCL_BUILDLINK_MK=	# defined
 
 .include "../../mk/bsd.buildlink.mk"
 
-BUILDLINK_DEPENDS.tcl?=	tcl>=8.3.2
+BUILDLINK_DEPENDS.tcl?=	tcl>=8.3.4
 DEPENDS+=		${BUILDLINK_DEPENDS.tcl}:../../lang/tcl
 
 EVAL_PREFIX+=		BUILDLINK_PREFIX.tcl=tcl
 BUILDLINK_PREFIX.tcl_DEFAULT=	${LOCALBASE}
 BUILDLINK_FILES.tcl=	include/tcl.h
 BUILDLINK_FILES.tcl+=	include/tclDecls.h
+BUILDLINK_FILES.tcl+=	include/tclPlatDecls.h
 BUILDLINK_FILES.tcl+=	include/tcl/*/*.h
 BUILDLINK_FILES.tcl+=	lib/libtcl83.*
 BUILDLINK_FILES.tcl+=	lib/libtclstub83.*
diff --git a/lang/tcl/distinfo b/lang/tcl/distinfo
index f84b281790a..a5ff3cde7b0 100644
--- a/lang/tcl/distinfo
+++ b/lang/tcl/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.10 2001/10/23 09:55:00 jlam Exp $
+$NetBSD: distinfo,v 1.11 2001/12/23 17:02:31 bjoern Exp $
 
-SHA1 (tcl8.3.2.tar.gz) = be2701bca3f4fd9c49ef3e2e8932f8b0a10d28fa
-Size (tcl8.3.2.tar.gz) = 2594407 bytes
-SHA1 (patch-aa) = 3f5afe145a5e05f512d3a66c774091e26bf380bf
-SHA1 (patch-ab) = beb134f9abd4d813dfdf9446543085cb09d7f1fe
-SHA1 (patch-ac) = 6f6f8e8b0ab6744662e7365511161e29affe62fc
-SHA1 (patch-ad) = 22412c6b564e7b6baced01c4c35bc6efa994fc8f
-SHA1 (patch-ae) = 0ec38469f8f9dbfdce6a6c3f5311f03903e10741
-SHA1 (patch-af) = 390b5c54d3b24eb0b443458c3063f6c65fd5526f
+SHA1 (tcl8.3.4.tar.gz) = b179f1f51b322b7045cf152b73df4f3d01da82ec
+Size (tcl8.3.4.tar.gz) = 2654756 bytes
+SHA1 (patch-aa) = 5687bd635dc7a18b4bc3770389a42a42dacc1541
+SHA1 (patch-ab) = 1997064679e61c2e1572f537f9171584cf9955e8
+SHA1 (patch-ac) = d1e1b6ed334ff424140a678ed098504cc14614e8
+SHA1 (patch-ae) = a0237d220cf0f8475614497cabaae738621a7729
+SHA1 (patch-af) = e19764a58f5ddd6b5b62e785ae305069c535f865
diff --git a/lang/tcl/patches/patch-aa b/lang/tcl/patches/patch-aa
index 1cf2a83e2be..18e4340f9fb 100644
--- a/lang/tcl/patches/patch-aa
+++ b/lang/tcl/patches/patch-aa
@@ -1,28 +1,28 @@
-$NetBSD: patch-aa,v 1.5 2001/06/30 18:24:17 jlam Exp $
+$NetBSD: patch-aa,v 1.6 2001/12/23 17:02:31 bjoern Exp $
 
---- Makefile.in.orig	Tue Aug  8 15:17:11 2000
+--- Makefile.in.orig	Sat Oct 20 02:24:15 2001
 +++ Makefile.in
 @@ -87,7 +87,7 @@
  #CFLAGS			= $(CFLAGS_DEBUG)
  #CFLAGS			= $(CFLAGS_OPTIMIZE)
  #CFLAGS			= $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE)
--CFLAGS			= @CFLAGS@
-+CFLAGS			+= @CFLAGS@
+-CFLAGS			= @CFLAGS@ @CFLAGS_DEFAULT@
++CFLAGS			+= @CFLAGS@ @CFLAGS_DEFAULT@
  
- # To disable ANSI-C procedure prototypes reverse the comment characters
- # on the following lines:
-@@ -161,8 +161,8 @@
- # "install" around;  better to use the install-sh script that comes
- # with the distribution, which is slower but guaranteed to work.
+ # Flags to pass to the linker
+ LDFLAGS_DEBUG		= @LDFLAGS_DEBUG@
+@@ -169,8 +169,8 @@
+ INSTALL_STRIP_PROGRAM   = -s
+ INSTALL_STRIP_LIBRARY  = -S -S
  
 -INSTALL			= @srcdir@/install-sh -c
 -INSTALL_PROGRAM		= ${INSTALL}
-+INSTALL			:= ${LIBTOOL} --mode=install @srcdir@/install-sh -c
-+INSTALL_PROGRAM		= ${INSTALL} -s
++INSTALL                 := ${LIBTOOL} --mode=install @srcdir@/install-sh -c
++INSTALL_PROGRAM         = ${INSTALL} -s
+ INSTALL_LIBRARY		= ${INSTALL}
  INSTALL_DATA		= ${INSTALL} -m 644
  
- # The following specifies which Tcl executable to use for make targets
-@@ -178,8 +178,8 @@
+@@ -187,8 +187,8 @@
  # configure script.  You shouldn't normally need to modify any of
  # these definitions by hand.
  
@@ -33,7 +33,7 @@ $NetBSD: patch-aa,v 1.5 2001/06/30 18:24:17 jlam Exp $
  SHLIB_CFLAGS		= @SHLIB_CFLAGS@
  
  SHLIB_SUFFIX		= @SHLIB_SUFFIX@
-@@ -198,7 +198,7 @@
+@@ -207,7 +207,7 @@
  TCL_LIB_FILE		= @TCL_LIB_FILE@
  #TCL_LIB_FILE		= libtcl.a
  
@@ -42,57 +42,49 @@ $NetBSD: patch-aa,v 1.5 2001/06/30 18:24:17 jlam Exp $
  #TCL_LIB_FLAG		= -ltcl
  
  TCL_EXP_FILE		= @TCL_EXP_FILE@
-@@ -226,7 +226,8 @@
+@@ -235,8 +235,9 @@
+ # Must be absolute to so the corresponding tcltest's tcl_library is absolute.
  TCL_BUILDTIME_LIBRARY	= @TCL_SRC_DIR@/library
  
- #CC			= purify -best-effort @CC@
 -CC			= @CC@
-+CC			= ${LIBTOOL} --mode=compile @CC@
-+LD			= ${LIBTOOL} --mode=link @CC@ -Wl,-R${PREFIX}/lib
+ #CC			= purify -best-effort @CC@ -DPURIFY
++CC                      = ${LIBTOOL} --mode=compile @CC@
++LD                      = ${LIBTOOL} --mode=link @CC@ -Wl,-R${PREFIX}/lib
  
  #----------------------------------------------------------------
  # The information below should be usable as is.  The configure
-@@ -409,6 +410,7 @@
- 	rm -f ${TCL_LIB_FILE}
+@@ -420,6 +421,7 @@
  	@MAKE_LIB@
- 	$(RANLIB) ${TCL_LIB_FILE}
-+	${TOUCH} ${TCL_LIB_FILE}
+ 	if test "x@DL_OBJS@" = "xtclLoadAout.o"; then \
+ 		$(RANLIB) ${TCL_LIB_FILE}; \
++		$(TOUCH) ${TCL_LIB_FILE}; \
+ 	fi
  
  ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
- 	rm -f ${STUB_LIB_FILE}
-@@ -428,11 +430,11 @@
+@@ -440,11 +442,11 @@
  
  
  tclsh: ${TCLSH_OBJS} ${TCL_LIB_FILE}
--	${CC} @LDFLAGS@ ${TCLSH_OBJS} @TCL_BUILD_LIB_SPEC@ ${LIBS} \
-+	${LD} @LDFLAGS@ ${TCLSH_OBJS} libtcl83.la ${LIBS} \
+-	${CC} ${LDFLAGS} ${TCLSH_OBJS} @TCL_BUILD_LIB_SPEC@ ${LIBS} \
++	${LD} ${LDFLAGS} ${TCLSH_OBJS} libtcl83.la ${LIBS} \
  		@TCL_LD_SEARCH_FLAGS@ -o tclsh
  
  tcltest: ${TCLTEST_OBJS} ${TCL_LIB_FILE} ${BUILD_DLTEST}
--	${CC} @LDFLAGS@ ${TCLTEST_OBJS} @TCL_BUILD_LIB_SPEC@ ${LIBS} \
-+	${LD} @LDFLAGS@ ${TCLTEST_OBJS} libtcl83.la ${LIBS} \
+-	${CC} ${LDFLAGS} ${TCLTEST_OBJS} @TCL_BUILD_LIB_SPEC@ ${LIBS} \
++	${LD} ${LDFLAGS} ${TCLTEST_OBJS} libtcl83.la ${LIBS} \
  		@TCL_LD_SEARCH_FLAGS@ -o tcltest
  
- 
-@@ -522,7 +524,7 @@
+ # Note, in the target below TCL_LIBRARY needs to be set or else
+@@ -538,7 +540,7 @@
  	    chmod +x $(SRC_DIR)/install-sh; \
  	    fi
  	@echo "Installing $(TCL_LIB_FILE) to $(LIB_INSTALL_DIR)/"
--	@$(INSTALL_DATA) $(TCL_LIB_FILE) $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE)
-+	@$(INSTALL_DATA) $(TCL_LIB_FILE:C/\.so.*/.la/) $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE)
- 	@(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TCL_LIB_FILE))
- 	@chmod 555 $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE)
- 	@if test "$(TCL_BUILD_EXP_FILE)" != ""; then \
-@@ -646,7 +648,7 @@
- 	makedepend -- $(DEPEND_SWITCHES) -- $(SRCS)
- 
- bp: $(UNIX_DIR)/bp.c
--	$(CC) $(CC_SWITCHES) $(UNIX_DIR)/bp.c -o bp
-+	$(LD) $(CC_SWITCHES) $(UNIX_DIR)/bp.c -o bp
- 
- # Test binaries.  The rules for tclTestInit.o and xtTestInit.o are
- # complicated because they are compiled from tclAppInit.c.  Can't use
-@@ -956,7 +958,7 @@
+-	@$(INSTALL_LIBRARY) $(TCL_LIB_FILE) $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE)
++	@$(INSTALL_LIBRARY) $(TCL_LIB_FILE:C/\.so.*/.la/) $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE)
+ 	@if test "x@DL_OBJS@" = "xtclLoadAout.o"; then \
+ 	    (cd $(LIB_INSTALL_DIR); $(RANLIB) $(TCL_LIB_FILE)); \
+ 	    fi
+@@ -989,7 +991,7 @@
  
  xttest:  ${XTTEST_OBJS} ${GENERIC_OBJS} ${UNIX_OBJS} ${COMPAT_OBJS} \
  	@DL_OBJS@ ${BUILD_DLTEST}
diff --git a/lang/tcl/patches/patch-ab b/lang/tcl/patches/patch-ab
index 010a5f3c87b..0ffd294842b 100644
--- a/lang/tcl/patches/patch-ab
+++ b/lang/tcl/patches/patch-ab
@@ -1,64 +1,148 @@
-$NetBSD: patch-ab,v 1.13 2001/10/23 09:55:00 jlam Exp $
+$NetBSD: patch-ab,v 1.14 2001/12/23 17:02:31 bjoern Exp $
 
---- configure.orig	Tue Aug  8 21:17:11 2000
-+++ configure	Sun Jul 29 08:58:02 2001
-@@ -4766,6 +4766,7 @@
+--- configure.orig	Sat Oct 20 02:24:15 2001
++++ configure
+@@ -4776,6 +4776,7 @@
+     # Step 3: set configuration options based on system name and version.
  
      do64bit_ok=no
-     fullSrcDir=`cd $srcdir; pwd`
 +    TCL_LIB_SPEC_RPATH=""
      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.*)
+@@ -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:4860: checking for shl_load in -ldld" >&5
-+echo "configure:4861: checking for shl_load in -ldld" >&5
+-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
-@@ -4864,7 +4865,7 @@
+@@ -4989,7 +4990,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-ldld  $LIBS"
  cat > conftest.$ac_ext <<EOF
--#line 4868 "configure"
-+#line 4869 "configure"
+-#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
-@@ -4875,7 +4876,7 @@
+@@ -5000,7 +5001,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
+-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
-@@ -4971,17 +4972,17 @@
+@@ -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
+@@ -5169,17 +5170,17 @@
+ 	    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 +5237,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
+-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 4980 "configure"
-+#line 4981 "configure"
+-#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:4985: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:4986: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-{ (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*
-@@ -5033,20 +5034,23 @@
+@@ -5298,20 +5299,23 @@
  	    LD_SEARCH_FLAGS=""
  	    ;;
  	NetBSD-*|FreeBSD-[1-2].*|OpenBSD-*)
@@ -68,24 +152,24 @@ $NetBSD: patch-ab,v 1.13 2001/10/23 09:55:00 jlam 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:5040: checking for dlfcn.h" >&5
-+echo "configure:5044: checking for dlfcn.h" >&5
+-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 5045 "configure"
-+#line 5049 "configure"
+-#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:5050: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:5054: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-{ (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*
-@@ -5065,17 +5069,15 @@
+@@ -5330,17 +5334,15 @@
    
  		# NetBSD/SPARC needs -fPIC, -fpic will not do.
  		SHLIB_CFLAGS="-fPIC"
@@ -97,15 +181,15 @@ $NetBSD: patch-ab,v 1.13 2001/10/23 09:55:00 jlam Exp $
  		LDFLAGS=""
 -		LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
  		echo $ac_n "checking for ELF""... $ac_c" 1>&6
--echo "configure:5077: checking for ELF" >&5
-+echo "configure:5079: checking for ELF" >&5
+-echo "configure:5342: checking for ELF" >&5
++echo "configure:5344: checking for ELF" >&5
  		cat > conftest.$ac_ext <<EOF
--#line 5079 "configure"
-+#line 5081 "configure"
+-#line 5344 "configure"
++#line 5346 "configure"
  #include "confdefs.h"
  
  #ifdef __ELF__
-@@ -5086,11 +5088,20 @@
+@@ -5351,11 +5353,20 @@
  if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
    egrep "yes" >/dev/null 2>&1; then
    rm -rf conftest*
@@ -128,7 +212,7 @@ $NetBSD: patch-ab,v 1.13 2001/10/23 09:55:00 jlam Exp $
  		    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0'
  		
  fi
-@@ -5265,6 +5276,9 @@
+@@ -5569,6 +5580,9 @@
  	    DL_LIBS="-ldl"
  	    LDFLAGS=""
  	    LD_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}'
@@ -137,8 +221,8 @@ $NetBSD: patch-ab,v 1.13 2001/10/23 09:55:00 jlam Exp $
 +	    TCL_LIB_VERSIONS_OK=nodots
  	    ;;
  	SunOS-5*)
- 	    SHLIB_CFLAGS="-KPIC"
-@@ -5304,6 +5318,9 @@
+ 
+@@ -5616,6 +5630,9 @@
  	    else
  		LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}'
  	    fi
@@ -148,169 +232,169 @@ $NetBSD: patch-ab,v 1.13 2001/10/23 09:55:00 jlam Exp $
  	    ;;
  	ULTRIX-4.*)
  	    SHLIB_CFLAGS="-G 0"
-@@ -5329,17 +5346,17 @@
+@@ -5641,17 +5658,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
+-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 5336 "configure"
-+#line 5353 "configure"
+-#line 5648 "configure"
++#line 5665 "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
+-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
-@@ -5385,9 +5402,9 @@
+@@ -5697,9 +5714,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
+-echo "configure:5701: checking sys/exec.h" >&5
++echo "configure:5718: checking sys/exec.h" >&5
  	cat > conftest.$ac_ext <<EOF
--#line 5391 "configure"
-+#line 5408 "configure"
+-#line 5703 "configure"
++#line 5720 "configure"
  #include "confdefs.h"
  #include <sys/exec.h>
  int main() {
-@@ -5405,7 +5422,7 @@
+@@ -5717,7 +5734,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
+-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
-@@ -5423,9 +5440,9 @@
+@@ -5735,9 +5752,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
+-echo "configure:5739: checking a.out.h" >&5
++echo "configure:5756: checking a.out.h" >&5
  	    cat > conftest.$ac_ext <<EOF
--#line 5429 "configure"
-+#line 5446 "configure"
+-#line 5741 "configure"
++#line 5758 "configure"
  #include "confdefs.h"
  #include <a.out.h>
  int main() {
-@@ -5443,7 +5460,7 @@
+@@ -5755,7 +5772,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
+-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
-@@ -5461,9 +5478,9 @@
+@@ -5773,9 +5790,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
+-echo "configure:5777: checking sys/exec_aout.h" >&5
++echo "configure:5794: checking sys/exec_aout.h" >&5
  		cat > conftest.$ac_ext <<EOF
--#line 5467 "configure"
-+#line 5484 "configure"
+-#line 5779 "configure"
++#line 5796 "configure"
  #include "confdefs.h"
  #include <sys/exec_aout.h>
  int main() {
-@@ -5481,7 +5498,7 @@
+@@ -5793,7 +5810,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
+-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
-@@ -5576,7 +5593,7 @@
+@@ -5890,7 +5907,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
+-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"
-@@ -5613,17 +5630,17 @@
+@@ -5927,17 +5944,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
+-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 5622 "configure"
-+#line 5639 "configure"
+-#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:5627: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:5644: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-{ (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*
-@@ -5653,17 +5670,17 @@
+@@ -5967,17 +5984,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
+-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 5662 "configure"
-+#line 5679 "configure"
+-#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:5667: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:5684: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-{ (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*
-@@ -5690,7 +5707,7 @@
+@@ -6004,7 +6021,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
+-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
-@@ -5752,7 +5769,7 @@
+@@ -6066,7 +6083,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
+-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"
-@@ -5789,7 +5806,7 @@
+@@ -6103,7 +6120,7 @@
      if test "x$DL_OBJS" = "xtclLoadAout.o"; then
- 	MAKE_LIB="ar cr \${TCL_LIB_FILE} \${OBJS}"
+ 	MAKE_LIB="\${STLIB_LD} \$@ \${OBJS}"
      else
--	MAKE_LIB="\${SHLIB_LD} -o \${TCL_LIB_FILE} \${OBJS} ${SHLIB_LD_LIBS}"
-+	MAKE_LIB="\${SHLIB_LD} -o \${TCL_LIB_FILE:C/\.so.*/.la/} \${OBJS:.o=.lo} ${SHLIB_LD_LIBS} -version-info 1:0"
- 	RANLIB=":"
+-	MAKE_LIB="\${SHLIB_LD} ${TCL_SHLIB_LD_EXTRAS} -o \$@ \${OBJS} ${SHLIB_LD_LIBS}"
++	MAKE_LIB="\${SHLIB_LD} ${TCL_SHLIB_LD_EXTRAS} -o \${@:C/\.so.*/.la/} \${OBJS:.o=.lo} ${SHLIB_LD_LIBS} -version-info 1:0"
      fi
  else
-@@ -5829,7 +5846,7 @@
+     case $system in
+@@ -6141,7 +6158,7 @@
          TCL_LIB_FLAG="-ltcl`echo ${TCL_VERSION} | tr -d .`\${TCL_DBGX}"
      fi
      TCL_BUILD_LIB_SPEC="-L`pwd` ${TCL_LIB_FLAG}"
@@ -319,7 +403,7 @@ $NetBSD: patch-ab,v 1.13 2001/10/23 09:55:00 jlam Exp $
  else
      TCL_BUILD_EXP_FILE="lib.exp"
      eval "TCL_EXP_FILE=libtcl${TCL_EXPORT_FILE_SUFFIX}"
-@@ -5859,9 +5876,9 @@
+@@ -6171,9 +6188,9 @@
  #--------------------------------------------------------------------
  
  if test "$prefix" != "$exec_prefix"; then
@@ -331,7 +415,16 @@ $NetBSD: patch-ab,v 1.13 2001/10/23 09:55:00 jlam Exp $
  fi
  
  #--------------------------------------------------------------------
-@@ -5943,6 +5960,8 @@
+@@ -6186,7 +6203,7 @@
+ # Replace DBGX with TCL_DBGX
+ eval "TCL_STUB_LIB_FILE=\"${TCL_STUB_LIB_FILE}\""
+ 
+-MAKE_STUB_LIB="\${STLIB_LD} \$@ \${STUB_LIB_OBJS}"
++MAKE_STUB_LIB="\${STLIB_LD} -o \$@ \${STUB_LIB_OBJS}"
+ 
+ if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
+     TCL_STUB_LIB_FLAG="-ltclstub${TCL_VERSION}\${TCL_DBGX}"
+@@ -6262,6 +6279,8 @@
  
  
  
@@ -340,12 +433,18 @@ $NetBSD: patch-ab,v 1.13 2001/10/23 09:55:00 jlam Exp $
  trap '' 1 2 15
  cat > confcache <<\EOF
  # This file is a shell script that caches the results of configure
-@@ -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
-+s%@LDFLAGS_DEBUG@%$LDFLAGS_DEBUG%g
-+s%@LDFLAGS_OPTIMIZE@%$LDFLAGS_OPTIMIZE%g
+@@ -6437,12 +6456,12 @@
  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
++s%@LDFLAGS_DEBUG@%$LDFLAGS_DEBUG%g
++s%@LDFLAGS_OPTIMIZE@%$LDFLAGS_OPTIMIZE%g
+ s%@CFLAGS_DEFAULT@%$CFLAGS_DEFAULT%g
+ s%@EXTRA_CFLAGS@%$EXTRA_CFLAGS%g
+ s%@DL_OBJS@%$DL_OBJS%g
+ s%@LDFLAGS_DEFAULT@%$LDFLAGS_DEFAULT%g
+-s%@LDFLAGS_DEBUG@%$LDFLAGS_DEBUG%g
+-s%@LDFLAGS_OPTIMIZE@%$LDFLAGS_OPTIMIZE%g
+ s%@STLIB_LD@%$STLIB_LD%g
+ s%@SHLIB_LD@%$SHLIB_LD%g
+ s%@SHLIB_LD_LIBS@%$SHLIB_LD_LIBS%g
diff --git a/lang/tcl/patches/patch-ac b/lang/tcl/patches/patch-ac
index bbdbc47a5ce..694343cae0e 100644
--- a/lang/tcl/patches/patch-ac
+++ b/lang/tcl/patches/patch-ac
@@ -1,6 +1,7 @@
-$NetBSD: patch-ac,v 1.1.1.1 2000/08/24 19:53:33 jwise Exp $
---- tclUnixInit.c.orig	Mon Aug  7 17:31:12 2000
-+++ tclUnixInit.c	Thu Aug 24 14:24:13 2000
+$NetBSD: patch-ac,v 1.2 2001/12/23 17:02:31 bjoern Exp $
+
+--- tclUnixInit.c.orig	Fri Aug 24 19:13:22 2001
++++ tclUnixInit.c
 @@ -22,6 +22,11 @@
  #	include <dlfcn.h>
  #   endif
@@ -13,7 +14,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2000/08/24 19:53:33 jwise Exp $
  
  /*
   * The Init script (common to Windows and Unix platforms) is
-@@ -531,6 +536,11 @@
+@@ -550,6 +555,11 @@
      int unameOK;
      char *user;
      Tcl_DString ds;
@@ -25,7 +26,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2000/08/24 19:53:33 jwise Exp $
  
      Tcl_SetVar(interp, "tclDefaultLibrary", defaultLibraryDir, TCL_GLOBAL_ONLY);
      Tcl_SetVar(interp, "tcl_pkgPath", pkgPath, TCL_GLOBAL_ONLY);
-@@ -566,8 +576,16 @@
+@@ -585,8 +595,16 @@
  	    Tcl_SetVar2(interp, "tcl_platform", "osVersion", name.release,
  		    TCL_GLOBAL_ONLY|TCL_APPEND_VALUE);
  	}
diff --git a/lang/tcl/patches/patch-ad b/lang/tcl/patches/patch-ad
deleted file mode 100644
index 0a99a457e4c..00000000000
--- a/lang/tcl/patches/patch-ad
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2001/01/24 18:42:33 he Exp $
-
---- ../generic/tclIO.c.orig	Tue Aug  8 02:57:40 2000
-+++ ../generic/tclIO.c	Wed Jan 24 16:28:20 2001
-@@ -2181,10 +2181,13 @@
- 
-     /*
-      * There is only the TOP Channel, so we free the remaining
--     * pointers we have and then ourselves.
-+     * pointers we have and then ourselves.  Since this is the
-+     * last of the channels in the stack, make sure to free the
-+     * ChannelState structure associated with it.
-      */
-     chanPtr->typePtr = NULL;
- 
-+    Tcl_EventuallyFree((ClientData) statePtr, TCL_DYNAMIC);
-     Tcl_EventuallyFree((ClientData) chanPtr, TCL_DYNAMIC);
- 
-     return errorCode;
diff --git a/lang/tcl/patches/patch-ae b/lang/tcl/patches/patch-ae
index 07a149310af..3d3e64a5814 100644
--- a/lang/tcl/patches/patch-ae
+++ b/lang/tcl/patches/patch-ae
@@ -1,17 +1,17 @@
-$NetBSD: patch-ae,v 1.1 2001/05/24 02:58:16 jlam Exp $
+$NetBSD: patch-ae,v 1.2 2001/12/23 17:02:31 bjoern Exp $
 
---- configure.in.orig	Tue Aug  8 15:17:11 2000
+--- configure.in.orig	Sat Oct 20 02:24:15 2001
 +++ configure.in
-@@ -440,7 +440,7 @@
+@@ -386,7 +386,7 @@
      if test "x$DL_OBJS" = "xtclLoadAout.o"; then
- 	MAKE_LIB="ar cr \${TCL_LIB_FILE} \${OBJS}"
+ 	MAKE_LIB="\${STLIB_LD} \[$]@ \${OBJS}"
      else
--	MAKE_LIB="\${SHLIB_LD} -o \${TCL_LIB_FILE} \${OBJS} ${SHLIB_LD_LIBS}"
-+	MAKE_LIB="\${SHLIB_LD} -o \${TCL_LIB_FILE:C/\.so.*/.la/} \${OBJS:.o=.lo} ${SHLIB_LD_LIBS} -version-info 1:0"
- 	RANLIB=":"
+-	MAKE_LIB="\${SHLIB_LD} ${TCL_SHLIB_LD_EXTRAS} -o \[$]@ \${OBJS} ${SHLIB_LD_LIBS}"
++	MAKE_LIB="\${SHLIB_LD} ${TCL_SHLIB_LD_EXTRAS} -o \${@:C/\.so.*/.la/} \${OBJS:.o=.lo} ${SHLIB_LD_LIBS} -version-info 1:0"
      fi
  else
-@@ -480,7 +480,7 @@
+     case $system in
+@@ -424,7 +424,7 @@
          TCL_LIB_FLAG="-ltcl`echo ${TCL_VERSION} | tr -d .`\${TCL_DBGX}"
      fi
      TCL_BUILD_LIB_SPEC="-L`pwd` ${TCL_LIB_FLAG}"
@@ -20,7 +20,7 @@ $NetBSD: patch-ae,v 1.1 2001/05/24 02:58:16 jlam Exp $
  else
      TCL_BUILD_EXP_FILE="lib.exp"
      eval "TCL_EXP_FILE=libtcl${TCL_EXPORT_FILE_SUFFIX}"
-@@ -510,9 +510,9 @@
+@@ -454,9 +454,9 @@
  #--------------------------------------------------------------------
  
  if test "$prefix" != "$exec_prefix"; then
@@ -32,12 +32,21 @@ $NetBSD: patch-ae,v 1.1 2001/05/24 02:58:16 jlam Exp $
  fi
  
  #--------------------------------------------------------------------
-@@ -558,6 +558,8 @@
+@@ -469,7 +469,7 @@
+ # Replace DBGX with TCL_DBGX
+ eval "TCL_STUB_LIB_FILE=\"${TCL_STUB_LIB_FILE}\""
+ 
+-MAKE_STUB_LIB="\${STLIB_LD} \[$]@ \${STUB_LIB_OBJS}"
++MAKE_STUB_LIB="\${STLIB_LD} -o \[$]@ \${STUB_LIB_OBJS}"
+ 
+ if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
+     TCL_STUB_LIB_FLAG="-ltclstub${TCL_VERSION}\${TCL_DBGX}"
+@@ -511,6 +511,8 @@
+ AC_SUBST(CFG_TCL_EXPORT_FILE_SUFFIX)
  
- AC_SUBST(BUILD_DLTEST)
  AC_SUBST(CFLAGS)
 +AC_SUBST(LDFLAGS_DEBUG)
 +AC_SUBST(LDFLAGS_OPTIMIZE)
- AC_SUBST(CFG_TCL_SHARED_LIB_SUFFIX)
- AC_SUBST(CFG_TCL_UNSHARED_LIB_SUFFIX)
- AC_SUBST(CFG_TCL_EXPORT_FILE_SUFFIX)
+ AC_SUBST(CFLAGS_DEFAULT)
+ AC_SUBST(EXTRA_CFLAGS)
+ AC_SUBST(DL_OBJS)
diff --git a/lang/tcl/patches/patch-af b/lang/tcl/patches/patch-af
index d9d4f8e6e57..21608c0038b 100644
--- a/lang/tcl/patches/patch-af
+++ b/lang/tcl/patches/patch-af
@@ -1,16 +1,16 @@
-$NetBSD: patch-af,v 1.5 2001/10/23 09:55:01 jlam Exp $
+$NetBSD: patch-af,v 1.6 2001/12/23 17:02:32 bjoern Exp $
 
---- tcl.m4.orig	Tue Aug  8 21:17:11 2000
-+++ tcl.m4	Sun Jul 29 08:54:14 2001
-@@ -595,6 +595,7 @@
+--- tcl.m4.orig	Sat Oct 20 02:24:15 2001
++++ tcl.m4
+@@ -601,6 +601,7 @@
+     # Step 3: set configuration options based on system name and version.
  
      do64bit_ok=no
-     fullSrcDir=`cd $srcdir; pwd`
 +    TCL_LIB_SPEC_RPATH=""
      EXTRA_CFLAGS=""
      TCL_EXPORT_FILE_SUFFIX=""
      UNSHARED_LIB_SUFFIX=""
-@@ -790,28 +791,36 @@
+@@ -910,28 +911,36 @@
  	    LD_SEARCH_FLAGS=""
  	    ;;
  	NetBSD-*|FreeBSD-[[1-2]].*|OpenBSD-*)
@@ -52,7 +52,7 @@ $NetBSD: patch-af,v 1.5 2001/10/23 09:55:01 jlam Exp $
  	    ], [
  		SHLIB_CFLAGS=""
  		SHLIB_LD="echo tclLdAout $CC \{$SHLIB_CFLAGS\} | `pwd`/tclsh -r"
-@@ -973,6 +982,9 @@
+@@ -1129,6 +1138,9 @@
  	    DL_LIBS="-ldl"
  	    LDFLAGS=""
  	    LD_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}'
@@ -61,8 +61,8 @@ $NetBSD: patch-af,v 1.5 2001/10/23 09:55:01 jlam Exp $
 +	    TCL_LIB_VERSIONS_OK=nodots
  	    ;;
  	SunOS-5*)
- 	    SHLIB_CFLAGS="-KPIC"
-@@ -1012,6 +1024,9 @@
+ 
+@@ -1173,6 +1185,9 @@
  	    else
  		LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}'
  	    fi
author	bjoern <bjoern>	2001-12-23 17:02:30 +0000
committer	bjoern <bjoern>	2001-12-23 17:02:30 +0000
commit	f191bc5c9fa4bdb0c4f54fed25feb366dbcb58f1 (patch)
tree	18be57fd846401eed717890cdcb3d1ca865b42f7 /lang/tcl
parent	5fe4074fc174595abff199e7baf1eb984b8c2493 (diff)
download	pkgsrc-f191bc5c9fa4bdb0c4f54fed25feb366dbcb58f1.tar.gz