Update tcl to 8.4.5. Too many changes since 8.3.4. Please see

ChangeLog in the distfile.

5 files changed, 136 insertions, 213 deletions

diff --git a/lang/tcl/patches/patch-aa b/lang/tcl/patches/patch-aa
index 6ea7ae8e39f..3db196b92b4 100644
--- a/lang/tcl/patches/patch-aa
+++ b/lang/tcl/patches/patch-aa
@@ -1,17 +1,17 @@
-$NetBSD: patch-aa,v 1.8 2003/10/08 03:13:21 jschauma Exp $
+$NetBSD: patch-aa,v 1.9 2004/03/08 19:55:35 minskim Exp $
 
---- Makefile.in.orig	Fri Oct 19 20:24:15 2001
-+++ Makefile.in	Tue Oct  7 21:57:52 2003
-@@ -87,7 +87,7 @@
+--- Makefile.in.orig	2003-11-21 14:17:14.000000000 -0600
++++ Makefile.in
+@@ -90,7 +90,7 @@ CFLAGS_OPTIMIZE		= @CFLAGS_OPTIMIZE@
  #CFLAGS			= $(CFLAGS_DEBUG)
  #CFLAGS			= $(CFLAGS_OPTIMIZE)
  #CFLAGS			= $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE)
--CFLAGS			= @CFLAGS@ @CFLAGS_DEFAULT@
-+CFLAGS			+= @CFLAGS@ @CFLAGS_DEFAULT@
+-CFLAGS			= @CFLAGS@ @CFLAGS_DEFAULT@ -DTCL_DBGX=$(TCL_DBGX)
++CFLAGS			+= @CFLAGS@ @CFLAGS_DEFAULT@ -DTCL_DBGX=$(TCL_DBGX)
  
  # Flags to pass to the linker
  LDFLAGS_DEBUG		= @LDFLAGS_DEBUG@
-@@ -169,8 +169,8 @@
+@@ -172,8 +172,8 @@ SHELL			= /bin/sh
  INSTALL_STRIP_PROGRAM   = -s
  INSTALL_STRIP_LIBRARY  = -S -S
  
@@ -22,7 +22,7 @@ $NetBSD: patch-aa,v 1.8 2003/10/08 03:13:21 jschauma Exp $
  INSTALL_LIBRARY		= ${INSTALL}
  INSTALL_DATA		= ${INSTALL} -m 644
  
-@@ -187,8 +187,8 @@
+@@ -190,8 +190,8 @@ TCL_EXE			= tclsh
  # configure script.  You shouldn't normally need to modify any of
  # these definitions by hand.
  
@@ -31,56 +31,43 @@ $NetBSD: patch-aa,v 1.8 2003/10/08 03:13:21 jschauma Exp $
 +STLIB_LD		= ${LIBTOOL} --mode=link @CC@ -rpath ${PREFIX}/lib
 +SHLIB_LD		= ${LIBTOOL} --mode=link @CC@ -rpath ${PREFIX}/lib
  SHLIB_CFLAGS		= @SHLIB_CFLAGS@
- 
- SHLIB_SUFFIX		= @SHLIB_SUFFIX@
-@@ -235,8 +235,9 @@
+ SHLIB_LD_FLAGS		= @SHLIB_LD_FLAGS@
+ SHLIB_LD_LIBS		= @SHLIB_LD_LIBS@
+@@ -254,8 +254,9 @@ DLTEST_DIR		= @TCL_SRC_DIR@/unix/dltest
  # Must be absolute to so the corresponding tcltest's tcl_library is absolute.
  TCL_BUILDTIME_LIBRARY	= @TCL_SRC_DIR@/library
  
 -CC			= @CC@
  #CC			= purify -best-effort @CC@ -DPURIFY
-+CC                      = ${LIBTOOL} --mode=compile @CC@
-+LD                      = ${LIBTOOL} --mode=link @CC@ ${LDFLAGS}
- 
- #----------------------------------------------------------------
- # The information below should be usable as is.  The configure
-@@ -420,6 +421,7 @@
- 	@MAKE_LIB@
- 	if test "x@DL_OBJS@" = "xtclLoadAout.o"; then \
- 		$(RANLIB) ${TCL_LIB_FILE}; \
-+		$(TOUCH) ${TCL_LIB_FILE}; \
- 	fi
++CC			= ${LIBTOOL} --mode=compile @CC@
++LD			= ${LIBTOOL} --mode=link @CC@
  
- ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
-@@ -440,11 +442,11 @@
+ # Flags to be passed to mkLinks to control whether the manpages
+ # should be compressed and linked with softlinks
+@@ -474,7 +475,7 @@ objs: ${OBJS}
  
  
  tclsh: ${TCLSH_OBJS} ${TCL_LIB_FILE}
 -	${CC} ${LDFLAGS} ${TCLSH_OBJS} @TCL_BUILD_LIB_SPEC@ ${LIBS} \
 +	${LD} ${LDFLAGS} ${TCLSH_OBJS} @TCL_BUILD_LIB_SPEC@ ${LIBS} \
- 		@TCL_LD_SEARCH_FLAGS@ -o tclsh
+ 		${CC_SEARCH_FLAGS} -o tclsh
+ 
+ # Resetting the LIB_RUNTIME_DIR below is required so that
+@@ -486,7 +487,7 @@ tcltest: ${TCLTEST_OBJS} ${TCL_LIB_FILE}
+ 	$(MAKE) tcltest-real LIB_RUNTIME_DIR=`pwd`
  
- tcltest: ${TCLTEST_OBJS} ${TCL_LIB_FILE} ${BUILD_DLTEST}
+ tcltest-real:
 -	${CC} ${LDFLAGS} ${TCLTEST_OBJS} @TCL_BUILD_LIB_SPEC@ ${LIBS} \
 +	${LD} ${LDFLAGS} ${TCLTEST_OBJS} @TCL_BUILD_LIB_SPEC@ ${LIBS} \
- 		@TCL_LD_SEARCH_FLAGS@ -o tcltest
+ 		${CC_SEARCH_FLAGS} -o tcltest
  
  # 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_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 @@
+@@ -1054,7 +1055,7 @@ tclMacOSXBundle.o: $(MAC_OSX_DIR)/tclMac
  
  xttest:  ${XTTEST_OBJS} ${GENERIC_OBJS} ${UNIX_OBJS} ${COMPAT_OBJS} \
  	@DL_OBJS@ ${BUILD_DLTEST}
 -	${CC} ${XTTEST_OBJS} ${GENERIC_OBJS} ${UNIX_OBJS} ${COMPAT_OBJS} \
 +	${LD} ${XTTEST_OBJS} ${GENERIC_OBJS} ${UNIX_OBJS} ${COMPAT_OBJS} \
  		@DL_OBJS@ @TCL_BUILD_LIB_SPEC@ ${LIBS} \
- 		@TCL_LD_SEARCH_FLAGS@ -L/usr/openwin/lib -lXt -o xttest
+ 		${CC_SEARCH_FLAGS} -L/usr/openwin/lib -lXt -o xttest
  
diff --git a/lang/tcl/patches/patch-ab b/lang/tcl/patches/patch-ab
index d037a05115b..6a736e11796 100644
--- a/lang/tcl/patches/patch-ab
+++ b/lang/tcl/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.21 2004/02/07 05:30:19 minskim Exp $
+$NetBSD: patch-ab,v 1.22 2004/03/08 19:55:35 minskim Exp $
 
---- configure.orig	Fri Oct 19 19:24:15 2001
+--- configure.orig	2004-02-07 21:57:29.000000000 -0600
 +++ configure
-@@ -4776,6 +4776,7 @@ fi
+@@ -5558,6 +5558,7 @@ fi
      # Step 3: set configuration options based on system name and version.
  
      do64bit_ok=no
@@ -10,8 +10,8 @@ $NetBSD: patch-ab,v 1.21 2004/02/07 05:30:19 minskim Exp $
      EXTRA_CFLAGS=""
      TCL_EXPORT_FILE_SUFFIX=""
      UNSHARED_LIB_SUFFIX=""
-@@ -5114,6 +5115,9 @@ fi
- 	    LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
+@@ -5977,6 +5978,9 @@ fi
+ 	    LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
  	    EXTRA_CFLAGS=""
  	    LDFLAGS=""
 +	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
@@ -20,7 +20,7 @@ $NetBSD: patch-ab,v 1.21 2004/02/07 05:30:19 minskim Exp $
  	    ;;
  	IRIX-6.*|IRIX64-6.5*)
  	    SHLIB_CFLAGS=""
-@@ -5138,6 +5142,9 @@ fi
+@@ -6002,6 +6006,9 @@ fi
  		esac
  		LDFLAGS="-n32"
  	    fi
@@ -30,19 +30,19 @@ $NetBSD: patch-ab,v 1.21 2004/02/07 05:30:19 minskim Exp $
  	    ;;
  	IRIX64-6.*)
  	    SHLIB_CFLAGS=""
-@@ -5148,6 +5155,9 @@ fi
- 	    DL_LIBS=""
- 	    LDFLAGS=""
- 	    LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
+@@ -6026,6 +6033,9 @@ fi
+ 	            LDFLAGS="-64"
+ 	        fi
+ 	    fi
 +	    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"
-@@ -5221,6 +5231,9 @@ fi
-                 EXTRA_CFLAGS="${EXTRA_CFLAGS} -fno-inline"
-             fi
+@@ -6107,6 +6117,9 @@ fi
+ EOF
+ 
  
 +	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
 +	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
@@ -50,7 +50,7 @@ $NetBSD: patch-ab,v 1.21 2004/02/07 05:30:19 minskim Exp $
  	    ;;
  	GNU*)
  	    SHLIB_CFLAGS="-fPIC"
-@@ -5298,6 +5311,9 @@ fi
+@@ -6188,6 +6201,9 @@ fi
  	    LD_SEARCH_FLAGS=""
  	    ;;
  	NetBSD-*|FreeBSD-[1-2].*|OpenBSD-*)
@@ -60,7 +60,7 @@ $NetBSD: patch-ab,v 1.21 2004/02/07 05:30:19 minskim 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
-@@ -5330,17 +5346,15 @@ if eval "test \"`echo '$ac_cv_header_'$a
+@@ -6220,18 +6236,16 @@ if eval "test \"`echo '$ac_cv_header_'$a
    
  		# NetBSD/SPARC needs -fPIC, -fpic will not do.
  		SHLIB_CFLAGS="-fPIC"
@@ -70,17 +70,18 @@ $NetBSD: patch-ab,v 1.21 2004/02/07 05:30:19 minskim Exp $
  		DL_OBJS="tclLoadDl.o"
  		DL_LIBS=""
  		LDFLAGS=""
--		LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
+ 		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
+-		LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
  		echo $ac_n "checking for ELF""... $ac_c" 1>&6
--echo "configure:5342: checking for ELF" >&5
-+echo "configure:5356: checking for ELF" >&5
+-echo "configure:6233: checking for ELF" >&5
++echo "configure:6247: checking for ELF" >&5
  		cat > conftest.$ac_ext <<EOF
--#line 5344 "configure"
-+#line 5358 "configure"
+-#line 6235 "configure"
++#line 6249 "configure"
  #include "confdefs.h"
  
  #ifdef __ELF__
-@@ -5351,11 +5365,20 @@ EOF
+@@ -6242,11 +6256,20 @@ EOF
  if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
    egrep "yes" >/dev/null 2>&1; then
    rm -rf conftest*
@@ -103,18 +104,8 @@ $NetBSD: patch-ab,v 1.21 2004/02/07 05:30:19 minskim Exp $
  		    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0'
  		
  fi
-@@ -5569,6 +5592,9 @@ EOF
- 	    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*)
- 
-@@ -5616,6 +5642,9 @@ EOF
- 	    else
+@@ -6565,6 +6588,9 @@ EOF
+ 		CC_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}'
  		LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}'
  	    fi
 +	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
@@ -123,74 +114,27 @@ $NetBSD: patch-ab,v 1.21 2004/02/07 05:30:19 minskim Exp $
  	    ;;
  	ULTRIX-4.*)
  	    SHLIB_CFLAGS="-G 0"
-@@ -6103,7 +6132,7 @@ if test "${SHARED_BUILD}" = "1" -a "${SH
-     if test "x$DL_OBJS" = "xtclLoadAout.o"; then
- 	MAKE_LIB="\${STLIB_LD} \$@ \${OBJS}"
-     else
--	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
-     case $system in
-@@ -6141,7 +6170,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}"
--    TCL_LIB_SPEC="-L${exec_prefix}/lib ${TCL_LIB_FLAG}"
-+    TCL_LIB_SPEC="${TCL_LIB_SPEC_RPATH} -L${exec_prefix}/lib ${TCL_LIB_FLAG}"
- else
-     TCL_BUILD_EXP_FILE="lib.exp"
-     eval "TCL_EXP_FILE=libtcl${TCL_EXPORT_FILE_SUFFIX}"
-@@ -6171,10 +6200,17 @@ VERSION=${TCL_VERSION}
- #--------------------------------------------------------------------
- 
- if test "$prefix" != "$exec_prefix"; then
--    TCL_PACKAGE_PATH="${exec_prefix}/lib ${prefix}/lib"
-+    TCL_PACKAGE_PATH_ADD="${exec_prefix}/lib/tcl ${prefix}/lib"
- else
--    TCL_PACKAGE_PATH="${prefix}/lib"
-+    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
+@@ -6836,8 +6862,8 @@ fi
  
- #--------------------------------------------------------------------
- #       The statements below define various symbols relating to Tcl
-@@ -6186,7 +6222,7 @@ eval "TCL_STUB_LIB_FILE=libtclstub${TCL_
- # 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 +6298,8 @@ TCL_SHARED_BUILD=${SHARED_BUILD}
+     if test "${SHARED_BUILD}" = "1" && test "${SHLIB_SUFFIX}" != "" ; then
+         LIB_SUFFIX=${SHARED_LIB_SUFFIX}
+-        MAKE_LIB='${SHLIB_LD} -o $@ ${SHLIB_LD_FLAGS} ${OBJS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS}'
+-        INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) $(LIB_INSTALL_DIR)/$(LIB_FILE)'
++        MAKE_LIB='${SHLIB_LD} -o ${@:C/\.so.*/.la/} ${SHLIB_LD_FLAGS} ${OBJS:.o=.lo} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS} -version-info 1:0'
++        INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE:C/\.so.*/.la/) $(LIB_INSTALL_DIR)/$(LIB_FILE)'
+     else
+         LIB_SUFFIX=${UNSHARED_LIB_SUFFIX}
  
+@@ -6854,10 +6880,10 @@ fi
  
+     # Stub lib does not depend on shared/static configuration
+     if test "$RANLIB" = "" ; then
+-        MAKE_STUB_LIB='${STLIB_LD} $@ ${STUB_LIB_OBJS}'
++        MAKE_STUB_LIB='${STLIB_LD} -o $@ ${STUB_LIB_OBJS}'
+         INSTALL_STUB_LIB='$(INSTALL_LIBRARY) $(STUB_LIB_FILE) $(LIB_INSTALL_DIR)/$(STUB_LIB_FILE)'
+     else
+-        MAKE_STUB_LIB='${STLIB_LD} $@ ${STUB_LIB_OBJS} ; ${RANLIB} $@'
++        MAKE_STUB_LIB='${STLIB_LD} -o $@ ${STUB_LIB_OBJS} ; ${RANLIB} $@'
+         INSTALL_STUB_LIB='$(INSTALL_LIBRARY) $(STUB_LIB_FILE) $(LIB_INSTALL_DIR)/$(STUB_LIB_FILE) ; (cd $(LIB_INSTALL_DIR) ; $(RANLIB) $(STUB_LIB_FILE))'
+     fi
  
-+
-+
- trap '' 1 2 15
- cat > confcache <<\EOF
- # This file is a shell script that caches the results of configure
-@@ -6437,12 +6475,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
-+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 694343cae0e..1e36aa04390 100644
--- a/lang/tcl/patches/patch-ac
+++ b/lang/tcl/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.2 2001/12/23 17:02:31 bjoern Exp $
+$NetBSD: patch-ac,v 1.3 2004/03/08 19:55:35 minskim Exp $
 
---- tclUnixInit.c.orig	Fri Aug 24 19:13:22 2001
+--- tclUnixInit.c.orig	Mon Nov 10 07:41:58 2003
 +++ tclUnixInit.c
-@@ -22,6 +22,11 @@
+@@ -28,6 +28,11 @@
  #	include <dlfcn.h>
  #   endif
  #endif
@@ -14,9 +14,9 @@ $NetBSD: patch-ac,v 1.2 2001/12/23 17:02:31 bjoern Exp $
  
  /*
   * The Init script (common to Windows and Unix platforms) is
-@@ -550,6 +555,11 @@
+@@ -717,6 +722,11 @@ TclpSetVariables(interp)
      int unameOK;
-     char *user;
+     CONST char *user;
      Tcl_DString ds;
 +#if defined(__NetBSD__)
 +    char machine_arch[SYS_NMLN];
@@ -24,9 +24,9 @@ $NetBSD: patch-ac,v 1.2 2001/12/23 17:02:31 bjoern Exp $
 +    size_t len = sizeof(machine_arch);
 +#endif
  
-     Tcl_SetVar(interp, "tclDefaultLibrary", defaultLibraryDir, TCL_GLOBAL_ONLY);
-     Tcl_SetVar(interp, "tcl_pkgPath", pkgPath, TCL_GLOBAL_ONLY);
-@@ -585,8 +595,16 @@
+ #ifdef HAVE_CFBUNDLE
+     char tclLibPath[MAXPATHLEN + 1];
+@@ -819,8 +829,16 @@ TclpSetVariables(interp)
  	    Tcl_SetVar2(interp, "tcl_platform", "osVersion", name.release,
  		    TCL_GLOBAL_ONLY|TCL_APPEND_VALUE);
  	}
diff --git a/lang/tcl/patches/patch-ae b/lang/tcl/patches/patch-ae
index 64665e13b0c..ded40f77a3b 100644
--- a/lang/tcl/patches/patch-ae
+++ b/lang/tcl/patches/patch-ae
@@ -1,60 +1,37 @@
-$NetBSD: patch-ae,v 1.3 2004/01/05 11:22:13 jlam Exp $
+$NetBSD: patch-ae,v 1.4 2004/03/08 19:55:35 minskim Exp $
 
---- 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}"
-     else
--	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
-     case $system in
-@@ -424,7 +424,7 @@
+--- configure.in.orig	2003-11-21 14:17:14.000000000 -0600
++++ configure.in
+@@ -479,7 +479,7 @@ elif test "$SHARED_BUILD" = "0" || test 
          TCL_LIB_FLAG="-ltcl`echo ${TCL_VERSION} | tr -d .`\${TCL_DBGX}"
      fi
      TCL_BUILD_LIB_SPEC="-L`pwd` ${TCL_LIB_FLAG}"
--    TCL_LIB_SPEC="-L${exec_prefix}/lib ${TCL_LIB_FLAG}"
-+    TCL_LIB_SPEC="${TCL_LIB_SPEC_RPATH} -L${exec_prefix}/lib ${TCL_LIB_FLAG}"
+-    TCL_LIB_SPEC="-L${libdir} ${TCL_LIB_FLAG}"
++    TCL_LIB_SPEC="${TCL_LIB_SPEC_RPATH} -L${libdir} ${TCL_LIB_FLAG}"
  else
      TCL_BUILD_EXP_FILE="lib.exp"
      eval "TCL_EXP_FILE=libtcl${TCL_EXPORT_FILE_SUFFIX}"
-@@ -454,10 +454,17 @@
+@@ -509,13 +509,19 @@ VERSION=${TCL_VERSION}
  #--------------------------------------------------------------------
  
- if test "$prefix" != "$exec_prefix"; then
--    TCL_PACKAGE_PATH="${exec_prefix}/lib ${prefix}/lib"
-+    TCL_PACKAGE_PATH_ADD="${exec_prefix}/lib/tcl ${prefix}/lib"
+ if test "$FRAMEWORK_BUILD" = "1" ; then
+-    TCL_PACKAGE_PATH="${libdir}/Resources/Scripts"
++    TCL_PACKAGE_PATH_ADD="${libdir}/Resources/Scripts"
+ elif test "$prefix" != "$exec_prefix"; then
+-    TCL_PACKAGE_PATH="${libdir} ${prefix}/lib"
++    TCL_PACKAGE_PATH_ADD="${libdir}/tcl ${prefix}/lib"
  else
 -    TCL_PACKAGE_PATH="${prefix}/lib"
 +    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"
++      TCL_PACKAGE_PATH="$dir"
 +    else
-+	TCL_PACKAGE_PATH="${TCL_PACKAGE_PATH} $dir"
++      TCL_PACKAGE_PATH="${TCL_PACKAGE_PATH} $dir"
 +    fi
 +done
- 
  #--------------------------------------------------------------------
  #       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}\""
- 
--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 +518,8 @@
- AC_SUBST(CFG_TCL_EXPORT_FILE_SUFFIX)
- 
- AC_SUBST(CFLAGS)
-+AC_SUBST(LDFLAGS_DEBUG)
-+AC_SUBST(LDFLAGS_OPTIMIZE)
- AC_SUBST(CFLAGS_DEFAULT)
- AC_SUBST(EXTRA_CFLAGS)
- AC_SUBST(DL_OBJS)
+ #       stub support.
diff --git a/lang/tcl/patches/patch-af b/lang/tcl/patches/patch-af
index 32fa842d3bc..bee8b668303 100644
--- a/lang/tcl/patches/patch-af
+++ b/lang/tcl/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.8 2004/02/07 05:30:19 minskim Exp $
+$NetBSD: patch-af,v 1.9 2004/03/08 19:55:35 minskim Exp $
 
---- tcl.m4.orig	Fri Oct 19 19:24:15 2001
+--- tcl.m4.orig	Fri Nov 21 14:17:14 2003
 +++ tcl.m4
-@@ -601,6 +601,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [
+@@ -795,6 +795,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [
      # Step 3: set configuration options based on system name and version.
  
      do64bit_ok=no
@@ -10,8 +10,8 @@ $NetBSD: patch-af,v 1.8 2004/02/07 05:30:19 minskim Exp $
      EXTRA_CFLAGS=""
      TCL_EXPORT_FILE_SUFFIX=""
      UNSHARED_LIB_SUFFIX=""
-@@ -790,6 +791,9 @@ dnl AC_CHECK_TOOL(AR, ar, :)
- 	    LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
+@@ -1059,6 +1060,9 @@ dnl AC_CHECK_TOOL(AR, ar)
+ 	    LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
  	    EXTRA_CFLAGS=""
  	    LDFLAGS=""
 +	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
@@ -20,7 +20,7 @@ $NetBSD: patch-af,v 1.8 2004/02/07 05:30:19 minskim Exp $
  	    ;;
  	IRIX-6.*|IRIX64-6.5*)
  	    SHLIB_CFLAGS=""
-@@ -814,6 +818,9 @@ dnl AC_CHECK_TOOL(AR, ar, :)
+@@ -1084,6 +1088,9 @@ dnl AC_CHECK_TOOL(AR, ar)
  		esac
  		LDFLAGS="-n32"
  	    fi
@@ -30,19 +30,19 @@ $NetBSD: patch-af,v 1.8 2004/02/07 05:30:19 minskim Exp $
  	    ;;
  	IRIX64-6.*)
  	    SHLIB_CFLAGS=""
-@@ -824,6 +831,9 @@ dnl AC_CHECK_TOOL(AR, ar, :)
- 	    DL_LIBS=""
- 	    LDFLAGS=""
- 	    LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
+@@ -1108,6 +1115,9 @@ dnl AC_CHECK_TOOL(AR, ar)
+ 	            LDFLAGS="-64"
+ 	        fi
+ 	    fi
 +	    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"
-@@ -865,6 +875,9 @@ dnl AC_CHECK_TOOL(AR, ar, :)
-                 EXTRA_CFLAGS="${EXTRA_CFLAGS} -fno-inline"
-             fi
+@@ -1154,6 +1164,9 @@ dnl AC_CHECK_TOOL(AR, ar)
+ 	    # XIM peeking works under XFree86.
+ 	    AC_DEFINE(PEEK_XCLOSEIM)
  
 +	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
 +	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
@@ -50,7 +50,7 @@ $NetBSD: patch-af,v 1.8 2004/02/07 05:30:19 minskim Exp $
  	    ;;
  	GNU*)
  	    SHLIB_CFLAGS="-fPIC"
-@@ -910,28 +923,36 @@ dnl AC_CHECK_TOOL(AR, ar, :)
+@@ -1203,29 +1216,37 @@ dnl AC_CHECK_TOOL(AR, ar)
  	    LD_SEARCH_FLAGS=""
  	    ;;
  	NetBSD-*|FreeBSD-[[1-2]].*|OpenBSD-*)
@@ -67,7 +67,8 @@ $NetBSD: patch-af,v 1.8 2004/02/07 05:30:19 minskim Exp $
  		DL_OBJS="tclLoadDl.o"
  		DL_LIBS=""
  		LDFLAGS=""
--		LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
+ 		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
+-		LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
  		AC_MSG_CHECKING(for ELF)
  		AC_EGREP_CPP(yes, [
  #ifdef __ELF__
@@ -92,18 +93,8 @@ $NetBSD: patch-af,v 1.8 2004/02/07 05:30:19 minskim Exp $
  	    ], [
  		SHLIB_CFLAGS=""
  		SHLIB_LD="echo tclLdAout $CC \{$SHLIB_CFLAGS\} | `pwd`/tclsh -r"
-@@ -1129,6 +1150,9 @@ dnl AC_CHECK_TOOL(AR, ar, :)
- 	    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*)
- 
-@@ -1173,6 +1197,9 @@ dnl AC_CHECK_TOOL(AR, ar, :)
- 	    else
+@@ -1519,6 +1540,9 @@ dnl AC_CHECK_TOOL(AR, ar)
+ 		CC_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}'
  		LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}'
  	    fi
 +	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
@@ -112,3 +103,27 @@ $NetBSD: patch-af,v 1.8 2004/02/07 05:30:19 minskim Exp $
  	    ;;
  	ULTRIX-4.*)
  	    SHLIB_CFLAGS="-G 0"
+@@ -1703,8 +1727,8 @@ dnl AC_CHECK_TOOL(AR, ar)
+ 
+     if test "${SHARED_BUILD}" = "1" && test "${SHLIB_SUFFIX}" != "" ; then
+         LIB_SUFFIX=${SHARED_LIB_SUFFIX}
+-        MAKE_LIB='${SHLIB_LD} -o [$]@ ${SHLIB_LD_FLAGS} ${OBJS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS}'
+-        INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) $(LIB_INSTALL_DIR)/$(LIB_FILE)'
++        MAKE_LIB='${SHLIB_LD} -o ${@:C/\.so.*/.la/} ${SHLIB_LD_FLAGS} ${OBJS:.o=.lo} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS} -version-info 1:0'
++        INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE:C/\.so.*/.la/) $(LIB_INSTALL_DIR)/$(LIB_FILE)'
+     else
+         LIB_SUFFIX=${UNSHARED_LIB_SUFFIX}
+ 
+@@ -1734,10 +1758,10 @@ dnl        esac
+ 
+     # Stub lib does not depend on shared/static configuration
+     if test "$RANLIB" = "" ; then
+-        MAKE_STUB_LIB='${STLIB_LD} [$]@ ${STUB_LIB_OBJS}'
++        MAKE_STUB_LIB='${STLIB_LD} -o [$]@ ${STUB_LIB_OBJS}'
+         INSTALL_STUB_LIB='$(INSTALL_LIBRARY) $(STUB_LIB_FILE) $(LIB_INSTALL_DIR)/$(STUB_LIB_FILE)'
+     else
+-        MAKE_STUB_LIB='${STLIB_LD} [$]@ ${STUB_LIB_OBJS} ; ${RANLIB} [$]@'
++        MAKE_STUB_LIB='${STLIB_LD} -o [$]@ ${STUB_LIB_OBJS} ; ${RANLIB} [$]@'
+         INSTALL_STUB_LIB='$(INSTALL_LIBRARY) $(STUB_LIB_FILE) $(LIB_INSTALL_DIR)/$(STUB_LIB_FILE) ; (cd $(LIB_INSTALL_DIR) ; $(RANLIB) $(STUB_LIB_FILE))'
+     fi
+