Changes 8.4.7:

* Fixed [glob -path] bug when in the root directory
* Fixed unicode-char path installation on Windows NT-based platforms
* Properly subsitute more values in Windows tclConfig.sh
* Improved stack overflow prevention on Windows
* Fixed mem leak in [fconfigure $serial -xchar]
* Fixed crash with [cd] with a volumerelative $HOME
* Fixed clock %G %V formats for ISO8601 week numbers
* Fixed support for non-WIDE_INT aware math functions
* Added [http::config -urlencoding] option
* Fixed utf-8 encoding of \u0000 on system I/O
* Prevented dde hangs with non-responsive apps
* Added round() wide integer support
* Cleaner exit and correction of mem leaks when using the threaded
  memory allocator and reinitializing
* Improved build configuration on 64-bit systems
* Added read support of PPM/PGM with the -data option
* Correct issue with displaying maximize window button on KDE-3.2.1
* Fix drawing of unicode chars in menu titles on Windows
* Correctly post Tk clipboard data to the Windows clipboard on exit
* Fix the panedwindow -opaqueresize option to work as per the docs
* Reduce Tk tk_messageBox default font size to 14-point
* Prevent possible segfault in -maxundo
* Fix XIM initialization on Solaris
* Complete the implementation of the CG version of the X drawing
  emulation layer on Mac OS X
* Fix several Mac OS X usability issues

7 files changed, 54 insertions, 864 deletions

diff --git a/lang/tcl/Makefile b/lang/tcl/Makefile
index 3261fa76bd9..34ecb5ae91f 100644
--- a/lang/tcl/Makefile
+++ b/lang/tcl/Makefile
@@ -1,15 +1,13 @@
-# $NetBSD: Makefile,v 1.36 2004/09/19 19:51:04 he Exp $
-#
+# $NetBSD: Makefile,v 1.37 2004/10/01 13:35:37 adam Exp $
 
-DISTNAME=		tcl8.4.6-src
-PKGNAME=		tcl-8.4.6
-PKGREVISION=		5
-CATEGORIES=		lang
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=tcl/}
+DISTNAME=	tcl8.4.7-src
+PKGNAME=	tcl-8.4.7
+CATEGORIES=	lang
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=tcl/}
 
-MAINTAINER=		jwise@NetBSD.org
-HOMEPAGE=		http://www.tcl.tk/
-COMMENT=		Ousterhout's Tool Command Language, a scripting language
+MAINTAINER=	jwise@NetBSD.org
+HOMEPAGE=	http://www.tcl.tk/
+COMMENT=	Ousterhout's Tool Command Language, a scripting language
 
 CONFLICTS+=		tclman80-[0-9]*
 
@@ -27,7 +25,6 @@ INSTALL_TARGET=		install
 
 # Initially install the man pages into ${WRKDIR}/man, as we need a staged
 # install to avoid overwriting existing manpages in ${PREFIX}/man.
-#
 CONFIGURE_ARGS+=	--mandir=${WRKDIR}/man
 
 .include "../../mk/bsd.prefs.mk"
@@ -45,7 +42,6 @@ CONFIGURE_ENV+=		TCL_PACKAGE_PATH="${VIEWBASE}/lib/tcl"
 
 # NetBSD-1.5.x-m68k platforms apparently have a compiler optimization bug
 # tickled by the Tcl code that manifests in code generation problems.
-#
 .if (${MACHINE_PLATFORM:MNetBSD-1.5*-m68k} != "")
 CONFIGURE_ENV+=		COMPILER_OPTIMIZATION_BUG=YES
 .endif
@@ -58,7 +54,6 @@ CONFIGURE_ENV+=		COMPILER_OPTIMIZATION_BUG=YES
 
 # Modify mkLinks script to remove the short-filename manpage if it was
 # linked to a longer filename.
-#
 post-patch:
 	@cd ${WRKSRC};							\
 	${MV} -f mkLinks mkLinks.tmp;					\
diff --git a/lang/tcl/distinfo b/lang/tcl/distinfo
index cbf69cd862e..bce3ce70fc4 100644
--- a/lang/tcl/distinfo
+++ b/lang/tcl/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.24 2004/06/22 18:34:09 drochner Exp $
+$NetBSD: distinfo,v 1.25 2004/10/01 13:35:37 adam Exp $
 
-SHA1 (tcl8.4.6-src.tar.gz) = d21495ca04419fc3b1594b96b19116040c33a3f0
-Size (tcl8.4.6-src.tar.gz) = 3448711 bytes
-SHA1 (patch-aa) = c23a611dd51dd030f6c77578eb455aa3d63d5c08
-SHA1 (patch-ab) = 7b5dc8c937fedf43042a558f7afdec2a93ba3a62
-SHA1 (patch-ac) = efc40f45f73cec2770231ff515314fc41bbd166e
-SHA1 (patch-ae) = 9a6f9b47c926f851a799ece713668f0955344ce3
-SHA1 (patch-af) = 164fa9ee7fe4baa9b3f3a13716aefbf415e3be0a
+SHA1 (tcl8.4.7-src.tar.gz) = 1529d8473bde5ba3430a93047d546697fe6dee7b
+Size (tcl8.4.7-src.tar.gz) = 3472974 bytes
+SHA1 (patch-aa) = 5c5034b02b753f129124ee3a337772abaf83ef48
+SHA1 (patch-ab) = 7981c3ec9c4aaa1fb81755705478a996adcdf967
+SHA1 (patch-ac) = ca2409270eee18ca2c8ddf9a002d9fff95053e4d
+SHA1 (patch-ae) = 1a5d12dc602dcde257e6b3e139f0d975ece74983
+SHA1 (patch-af) = e28694b1dcd5ffd423469b3c15a7786398c187d1
 SHA1 (patch-ag) = 24d047f68140b15ebb7823426ae06d83204b1da9
 SHA1 (patch-ah) = 0aaa349fcf9ce736e1f7d3dad377ee355f549ecb
diff --git a/lang/tcl/patches/patch-aa b/lang/tcl/patches/patch-aa
index 26c5128675e..b9fb68a272e 100644
--- a/lang/tcl/patches/patch-aa
+++ b/lang/tcl/patches/patch-aa
@@ -1,16 +1,7 @@
-$NetBSD: patch-aa,v 1.11 2004/04/09 23:37:28 danw Exp $
+$NetBSD: patch-aa,v 1.12 2004/10/01 13:35:37 adam Exp $
 
---- Makefile.in.orig	Mon Mar  1 18:58:59 2004
+--- Makefile.in.orig	2004-07-26 21:40:46.000000000 +0000
 +++ Makefile.in
-@@ -95,7 +95,7 @@ CFLAGS			= @CFLAGS@ @CFLAGS_DEFAULT@ -DT
- # Flags to pass to the linker
- LDFLAGS_DEBUG		= @LDFLAGS_DEBUG@
- LDFLAGS_OPTIMIZE	= @LDFLAGS_OPTIMIZE@
--LDFLAGS			= @LDFLAGS@ @LDFLAGS_DEFAULT@
-+LDFLAGS			= @LD_FLAGS@ @LDFLAGS@ @LDFLAGS_DEFAULT@
- 
- # To disable ANSI-C procedure prototypes reverse the comment characters
- # on the following lines:
 @@ -172,8 +172,8 @@ SHELL			= /bin/sh
  INSTALL_STRIP_PROGRAM   = -s
  INSTALL_STRIP_LIBRARY  = -S -S
diff --git a/lang/tcl/patches/patch-ab b/lang/tcl/patches/patch-ab
index d860b17c32f..c1eecc8fb24 100644
--- a/lang/tcl/patches/patch-ab
+++ b/lang/tcl/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.25 2004/04/09 23:37:28 danw Exp $
+$NetBSD: patch-ab,v 1.26 2004/10/01 13:35:37 adam Exp $
 
---- configure.orig	Mon Mar  1 18:58:59 2004
+--- configure.orig	2004-07-26 21:40:46.000000000 +0000
 +++ configure
-@@ -5613,12 +5613,13 @@ fi
+@@ -2076,12 +2076,13 @@ fi
      # Step 3: set configuration options based on system name and version.
  
      do64bit_ok=no
 +    TCL_LIB_SPEC_RPATH=""
-     EXTRA_CFLAGS=""
+     LDFLAGS_ORIG="$LDFLAGS"
      TCL_EXPORT_FILE_SUFFIX=""
      UNSHARED_LIB_SUFFIX=""
      TCL_TRIM_DOTS='`echo ${VERSION} | tr -d .`'
@@ -17,216 +17,17 @@ $NetBSD: patch-ab,v 1.25 2004/04/09 23:37:28 danw Exp $
      CFLAGS_DEBUG=-g
      CFLAGS_OPTIMIZE=-O
      if test "$GCC" = "yes" ; then
-@@ -5682,7 +5683,7 @@ fi
- 	    SHLIB_SUFFIX=".so"
- 
- 	    DL_OBJS="tclLoadDl.o"
--	    LDFLAGS=""
-+	    LD_FLAGS=""
- 
- 	    LD_LIBRARY_PATH_VAR="LIBPATH"
- 
-@@ -5693,7 +5694,7 @@ fi
- 		else 
- 		    do64bit_ok=yes
- 		    EXTRA_CFLAGS="-q64"
--		    LDFLAGS="-q64"
-+		    LD_FLAGS="-q64"
- 		    RANLIB="${RANLIB} -X64"
- 		    AR="${AR} -X64"
- 		    SHLIB_LD_FLAGS="-b64"
-@@ -5734,7 +5735,7 @@ fi
- 	    SHLIB_SUFFIX=".so"
- 	    DL_OBJS="tclLoadDl.o"
- 	    DL_LIBS="-ldl"
--	    LDFLAGS=""
-+	    LD_FLAGS=""
- 	    CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
- 	    LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
- 	    LD_LIBRARY_PATH_VAR="LIBPATH"
-@@ -5754,7 +5755,7 @@ fi
- 		else 
- 		    do64bit_ok=yes
- 		    EXTRA_CFLAGS="-q64"
--		    LDFLAGS="-q64"
-+		    LD_FLAGS="-q64"
- 		    RANLIB="${RANLIB} -X64"
- 		    AR="${AR} -X64"
- 		    SHLIB_LD_FLAGS="-b64"
-@@ -5830,7 +5831,7 @@ EOF
- 	    SHLIB_SUFFIX=".so"
- 	    DL_OBJS="tclLoadDl.o"
- 	    DL_LIBS="-ldl"
--	    LDFLAGS=""
-+	    LD_FLAGS=""
- 	    CC_SEARCH_FLAGS=""
- 	    LD_SEARCH_FLAGS=""
- 	    ;;
-@@ -5841,7 +5842,7 @@ EOF
- 	    SHLIB_SUFFIX=".so"
- 	    DL_OBJS="tclLoadDl.o"
- 	    DL_LIBS="-ldl"
--	    LDFLAGS="-export-dynamic"
-+	    LD_FLAGS="-export-dynamic"
- 	    CC_SEARCH_FLAGS=""
- 	    LD_SEARCH_FLAGS=""
- 	    ;;
-@@ -5852,7 +5853,7 @@ EOF
- 	    SHLIB_SUFFIX=".so"
- 	    DL_OBJS="tclLoadDl.o"
- 	    DL_LIBS="-ldl"
--	    LDFLAGS=""
-+	    LD_FLAGS=""
- 	    CC_SEARCH_FLAGS=""
- 	    LD_SEARCH_FLAGS=""
- 	    ;;
-@@ -5916,7 +5917,7 @@ fi
- 		SHLIB_LD_LIBS='${LIBS}'
- 		DL_OBJS="tclLoadShl.o"
- 		DL_LIBS="-ldld"
--		LDFLAGS="-Wl,-E"
-+		LD_FLAGS="-Wl,-E"
- 		CC_SEARCH_FLAGS='-Wl,+s,+b,${LIB_RUNTIME_DIR}:.'
- 		LD_SEARCH_FLAGS='+s +b ${LIB_RUNTIME_DIR}:.'
- 		LD_LIBRARY_PATH_VAR="SHLIB_PATH"
-@@ -5952,10 +5953,10 @@ fi
- 		    do64bit_ok=yes
- 		    if test "`uname -m`" = "ia64" ; then
- 			EXTRA_CFLAGS="+DD64"
--			LDFLAGS="+DD64 $LDFLAGS"
-+			LD_FLAGS="+DD64 $LD_FLAGS"
- 		    else
- 			EXTRA_CFLAGS="+DA2.0W"
--			LDFLAGS="+DA2.0W $LDFLAGS"
-+			LD_FLAGS="+DA2.0W $LD_FLAGS"
- 		    fi
- 		fi
- 	    fi
-@@ -6009,7 +6010,7 @@ fi
- 		SHLIB_LD_LIBS=""
- 		DL_OBJS="tclLoadShl.o"
- 		DL_LIBS="-ldld"
--		LDFLAGS="-Wl,-E"
-+		LD_FLAGS="-Wl,-E"
- 		CC_SEARCH_FLAGS='-Wl,+s,+b,${LIB_RUNTIME_DIR}:.'
- 		LD_SEARCH_FLAGS='+s +b ${LIB_RUNTIME_DIR}:.'
- 		LD_LIBRARY_PATH_VAR="SHLIB_PATH"
-@@ -6022,7 +6023,7 @@ fi
- 	    SHLIB_LD_LIBS='${LIBS}'
- 	    DL_OBJS="tclLoadAout.o"
- 	    DL_LIBS=""
--	    LDFLAGS="-Wl,-D,08000000"
-+	    LD_FLAGS="-Wl,-D,08000000"
- 	    CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
- 	    LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
- 	    SHARED_LIB_SUFFIX='${VERSION}\$\{DBGX\}.a'
-@@ -6037,7 +6038,7 @@ fi
- 	    CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
- 	    LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
- 	    EXTRA_CFLAGS=""
--	    LDFLAGS=""
-+	    LD_FLAGS=""
- 	    ;;
- 	IRIX-6.*)
- 	    SHLIB_CFLAGS=""
-@@ -6050,7 +6051,7 @@ fi
- 	    LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
- 	    if test "$GCC" = "yes" ; then
- 		EXTRA_CFLAGS="-mabi=n32"
--		LDFLAGS="-mabi=n32"
-+		LD_FLAGS="-mabi=n32"
- 	    else
- 		case $system in
- 		    IRIX-6.3)
-@@ -6061,7 +6062,7 @@ fi
- 			EXTRA_CFLAGS="-n32"
- 			;;
- 		esac
--		LDFLAGS="-n32"
-+		LD_FLAGS="-n32"
- 	    fi
- 	    ;;
- 	IRIX64-6.*)
-@@ -6071,7 +6072,7 @@ fi
- 	    SHLIB_SUFFIX=".so"
- 	    DL_OBJS="tclLoadDl.o"
- 	    DL_LIBS=""
--	    LDFLAGS=""
-+	    LD_FLAGS=""
- 	    CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
- 	    LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
- 
-@@ -6084,7 +6085,7 @@ fi
- 	            do64bit_ok=yes
- 	            SHLIB_LD="ld -64 -shared -rdata_shared"
- 	            EXTRA_CFLAGS="-64"
--	            LDFLAGS="-64"
-+	            LD_FLAGS="-64"
- 	        fi
- 	    fi
- 	    ;;
-@@ -6103,7 +6104,7 @@ fi
- 		SHLIB_LD="${CC} -shared"
- 		DL_OBJS="tclLoadDl.o"
- 		DL_LIBS="-ldl"
--		LDFLAGS="-rdynamic"
-+		LD_FLAGS="-rdynamic"
- 		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
- 		LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
- 	    else
-@@ -6139,7 +6140,7 @@ if eval "test \"`echo '$ac_cv_header_'$a
- 		    SHLIB_LD="ld -shared"
- 		    DL_OBJS="tclLoadDld.o"
- 		    DL_LIBS="-ldld"
--		    LDFLAGS=""
-+		    LD_FLAGS=""
- 		    CC_SEARCH_FLAGS=""
- 		    LD_SEARCH_FLAGS=""
- else
-@@ -6178,7 +6179,7 @@ EOF
- 		SHLIB_LD="${CC} -shared"
- 		DL_OBJS=""
- 		DL_LIBS="-ldl"
--		LDFLAGS="-rdynamic"
-+		LD_FLAGS="-rdynamic"
- 		CC_SEARCH_FLAGS=""
- 		LD_SEARCH_FLAGS=""
- 	    else
-@@ -6214,7 +6215,7 @@ if eval "test \"`echo '$ac_cv_header_'$a
- 		    SHLIB_LD="ld -shared"
- 		    DL_OBJS=""
- 		    DL_LIBS="-ldld"
--		    LDFLAGS=""
-+		    LD_FLAGS=""
- 		    CC_SEARCH_FLAGS=""
- 		    LD_SEARCH_FLAGS=""
- else
-@@ -6233,7 +6234,7 @@ fi
- 	    SHLIB_SUFFIX=".so"
- 	    DL_OBJS="tclLoadDl.o"
- 	    DL_LIBS="-ldl"
--	    LDFLAGS=""
-+	    LD_FLAGS=""
- 	    CC_SEARCH_FLAGS=""
- 	    LD_SEARCH_FLAGS=""
- 	    ;;
-@@ -6244,11 +6245,14 @@ fi
- 	    SHLIB_SUFFIX=".so"
- 	    DL_OBJS="tclLoadDl.o"
- 	    DL_LIBS="-ldl"
--	    LDFLAGS="-Wl,-Bexport"
-+	    LD_FLAGS="-Wl,-Bexport"
- 	    CC_SEARCH_FLAGS=""
+@@ -2751,6 +2752,9 @@ fi
  	    LD_SEARCH_FLAGS=""
  	    ;;
- 	NetBSD-*|FreeBSD-[1-2].*|OpenBSD-*)
+ 	NetBSD-*|FreeBSD-[1-2].*)
 +	    if test "X${COMPILER_OPTIMIZATION_BUG}" = "XYES"; then
 +		CFLAGS_OPTIMIZE=-O0
 +	    fi
  	    # 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
-@@ -6281,18 +6285,16 @@ if eval "test \"`echo '$ac_cv_header_'$a
+@@ -2783,13 +2787,11 @@ if eval "test \"`echo '$ac_cv_header_'$a
    
  		# NetBSD/SPARC needs -fPIC, -fpic will not do.
  		SHLIB_CFLAGS="-fPIC"
@@ -235,20 +36,12 @@ $NetBSD: patch-ab,v 1.25 2004/04/09 23:37:28 danw Exp $
  		SHLIB_SUFFIX=".so"
  		DL_OBJS="tclLoadDl.o"
  		DL_LIBS=""
--		LDFLAGS=""
-+		LD_FLAGS=""
  		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:6294: checking for ELF" >&5
-+echo "configure:6308: checking for ELF" >&5
+ echo "configure:2795: checking for ELF" >&5
  		cat > conftest.$ac_ext <<EOF
--#line 6296 "configure"
-+#line 6310 "configure"
- #include "confdefs.h"
- 
- #ifdef __ELF__
-@@ -6303,11 +6305,20 @@ EOF
+@@ -2804,11 +2806,20 @@ EOF
  if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
    egrep "yes" >/dev/null 2>&1; then
    rm -rf conftest*
@@ -271,197 +64,7 @@ $NetBSD: patch-ab,v 1.25 2004/04/09 23:37:28 danw Exp $
  		    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0'
  		
  fi
-@@ -6323,7 +6334,7 @@ else
- 		SHLIB_SUFFIX=".a"
- 		DL_OBJS="tclLoadAout.o"
- 		DL_LIBS=""
--		LDFLAGS=""
-+		LD_FLAGS=""
- 		CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
- 		LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
- 		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
-@@ -6344,14 +6355,14 @@ fi
- 	    SHLIB_SUFFIX=".so"
- 	    DL_OBJS="tclLoadDl.o"
- 	    DL_LIBS=""
--	    LDFLAGS="-export-dynamic"
-+	    LD_FLAGS="-export-dynamic"
- 	    CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
- 	    LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
- 	    if test "${TCL_THREADS}" = "1" ; then
- 		# The -pthread needs to go in the CFLAGS, not LIBS
- 		LIBS=`echo $LIBS | sed s/-pthread//`
- 		EXTRA_CFLAGS="-pthread"
--	    	LDFLAGS="$LDFLAGS -pthread"
-+	    	LD_FLAGS="$LD_FLAGS -pthread"
- 	    fi
- 	    case $system in
- 	    FreeBSD-3.*)
-@@ -6372,7 +6383,7 @@ fi
- 	    DL_OBJS="tclLoadDyld.o"
- 	    PLAT_OBJS="tclMacOSXBundle.o"
- 	    DL_LIBS=""
--	    LDFLAGS="-prebind"
-+	    LD_FLAGS="-prebind"
- 	    CC_SEARCH_FLAGS=""
- 	    LD_SEARCH_FLAGS=""
- 	    CFLAGS_OPTIMIZE="-Os"
-@@ -6389,7 +6400,7 @@ fi
- 	    SHLIB_SUFFIX=".so"
- 	    DL_OBJS="tclLoadNext.o"
- 	    DL_LIBS=""
--	    LDFLAGS=""
-+	    LD_FLAGS=""
- 	    CC_SEARCH_FLAGS=""
- 	    LD_SEARCH_FLAGS=""
- 	    ;;
-@@ -6409,7 +6420,7 @@ EOF
- 	    SHLIB_SUFFIX=".so"
- 	    DL_OBJS="tclLoadOSF.o"
- 	    DL_LIBS=""
--	    LDFLAGS=""
-+	    LD_FLAGS=""
- 	    CC_SEARCH_FLAGS=""
- 	    LD_SEARCH_FLAGS=""
- 	    ;;
-@@ -6425,7 +6436,7 @@ EOF
- 	    SHLIB_SUFFIX=".so"
- 	    DL_OBJS="tclLoadDl.o"
- 	    DL_LIBS=""
--	    LDFLAGS=""
-+	    LD_FLAGS=""
- 	    CC_SEARCH_FLAGS=""
- 	    LD_SEARCH_FLAGS=""
- 	    ;;
-@@ -6441,7 +6452,7 @@ EOF
- 	    SHLIB_SUFFIX=".so"
- 	    DL_OBJS="tclLoadDl.o"
- 	    DL_LIBS=""
--	    LDFLAGS=""
-+	    LD_FLAGS=""
- 	    CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
- 	    LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
- 	    if test "$GCC" = "yes" ; then
-@@ -6458,7 +6469,7 @@ EOF
- 		    LIBS="$LIBS -lpthread -lmach -lexc"
- 		else
- 		    EXTRA_CFLAGS="${EXTRA_CFLAGS} -pthread"
--		    LDFLAGS="-pthread"
-+		    LD_FLAGS="-pthread"
- 		fi
- 	    fi
- 
-@@ -6473,7 +6484,7 @@ EOF
- 	    DL_OBJS="tclLoadDl.o"
- 	    # dlopen is in -lc on QNX
- 	    DL_LIBS=""
--	    LDFLAGS=""
-+	    LD_FLAGS=""
- 	    CC_SEARCH_FLAGS=""
- 	    LD_SEARCH_FLAGS=""
- 	    ;;
-@@ -6484,7 +6495,7 @@ EOF
- 	    SHLIB_SUFFIX=".a"
- 	    DL_OBJS="tclLoadAout.o"
- 	    DL_LIBS=""
--	    LDFLAGS="-Wl,-D,08000000"
-+	    LD_FLAGS="-Wl,-D,08000000"
- 	    CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
- 	    LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
- 	    ;;
-@@ -6494,10 +6505,10 @@ EOF
- 	    # below.
- 	    if test "$GCC" = "yes" ; then
- 	    	SHLIB_CFLAGS="-fPIC -melf"
--	    	LDFLAGS="-melf -Wl,-Bexport"
-+	    	LD_FLAGS="-melf -Wl,-Bexport"
- 	    else
- 	    	SHLIB_CFLAGS="-Kpic -belf"
--	    	LDFLAGS="-belf -Wl,-Bexport"
-+	    	LD_FLAGS="-belf -Wl,-Bexport"
- 	    fi
- 	    SHLIB_LD="ld -G"
- 	    SHLIB_LD_LIBS=""
-@@ -6514,7 +6525,7 @@ EOF
- 	    SHLIB_SUFFIX=".so"
- 	    DL_OBJS="tclLoadDl.o"
- 	    DL_LIBS="-ldl"
--	    LDFLAGS=""
-+	    LD_FLAGS=""
- 	    CC_SEARCH_FLAGS=""
- 	    LD_SEARCH_FLAGS=""
- 	    ;;
-@@ -6525,7 +6536,7 @@ EOF
- 	    SHLIB_SUFFIX=".so"
- 	    DL_OBJS="tclLoadDl.o"
- 	    DL_LIBS="-ldl"
--	    LDFLAGS=""
-+	    LD_FLAGS=""
- 	    CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
- 	    LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
- 
-@@ -6561,7 +6572,7 @@ EOF
- 	    SHLIB_SUFFIX=".so"
- 	    DL_OBJS="tclLoadDl.o"
- 	    DL_LIBS="-ldl"
--	    LDFLAGS=""
-+	    LD_FLAGS=""
- 	    if test "$GCC" = "yes" ; then
- 		SHLIB_LD="$CC -shared"
- 		CC_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}'
-@@ -6587,7 +6598,7 @@ EOF
- 
- 
- 	    SHLIB_CFLAGS="-KPIC"
--	    LDFLAGS=""
-+	    LD_FLAGS=""
-     
- 	    # Check to enable 64-bit flags for compiler/linker
- 	    if test "$do64bit" = "yes" ; then
-@@ -6599,10 +6610,10 @@ EOF
- 			    do64bit_ok=yes
- 			    if test "$do64bitVIS" = "yes" ; then
- 				EXTRA_CFLAGS="-xarch=v9a"
--			    	LDFLAGS="-xarch=v9a"
-+			    	LD_FLAGS="-xarch=v9a"
- 			    else
- 				EXTRA_CFLAGS="-xarch=v9"
--			    	LDFLAGS="-xarch=v9"
-+			    	LD_FLAGS="-xarch=v9"
- 			    fi
- 			fi
- 		else
-@@ -6634,7 +6645,7 @@ EOF
- 	    SHLIB_LD_LIBS='${LIBS}'
- 	    DL_OBJS="tclLoadAout.o"
- 	    DL_LIBS=""
--	    LDFLAGS="-Wl,-D,08000000"
-+	    LD_FLAGS="-Wl,-D,08000000"
- 	    CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
- 	    LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
- 	    if test "$GCC" != "yes" ; then
-@@ -6675,9 +6686,9 @@ rm -f conftest*
- 	    LDFLAGS=$hold_ldflags
- 	    echo "$ac_t""$found" 1>&6
- 	    if test $found = yes; then
--	    LDFLAGS="-Wl,-Bexport"
-+	    LD_FLAGS="-Wl,-Bexport"
- 	    else
--	    LDFLAGS=""
-+	    LD_FLAGS=""
- 	    fi
- 	    CC_SEARCH_FLAGS=""
- 	    LD_SEARCH_FLAGS=""
-@@ -6852,7 +6863,7 @@ fi
- 	SHLIB_SUFFIX=""
- 	DL_OBJS="tclLoadNone.o"
- 	DL_LIBS=""
--	LDFLAGS=""
-+	LD_FLAGS=""
- 	CC_SEARCH_FLAGS=""
- 	LD_SEARCH_FLAGS=""
- 	BUILD_DLTEST=""
-@@ -6889,16 +6900,16 @@ fi
+@@ -3424,16 +3435,16 @@ fi
      fi
  
      if test "$SHARED_LIB_SUFFIX" = "" ; then
@@ -482,7 +85,7 @@ $NetBSD: patch-ab,v 1.25 2004/04/09 23:37:28 danw Exp $
      else
          LIB_SUFFIX=${UNSHARED_LIB_SUFFIX}
  
-@@ -7217,7 +7228,7 @@ elif test "$SHARED_BUILD" = "0" || test 
+@@ -7251,7 +7262,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}"
@@ -491,7 +94,7 @@ $NetBSD: patch-ab,v 1.25 2004/04/09 23:37:28 danw Exp $
  else
      TCL_BUILD_EXP_FILE="lib.exp"
      eval "TCL_EXP_FILE=libtcl${TCL_EXPORT_FILE_SUFFIX}"
-@@ -7247,13 +7258,19 @@ VERSION=${TCL_VERSION}
+@@ -7281,13 +7292,19 @@ VERSION=${TCL_VERSION}
  #--------------------------------------------------------------------
  
  if test "$FRAMEWORK_BUILD" = "1" ; then
@@ -515,11 +118,3 @@ $NetBSD: patch-ab,v 1.25 2004/04/09 23:37:28 danw Exp $
  #--------------------------------------------------------------------
  #       The statements below define various symbols relating to Tcl
  #       stub support.
-@@ -7487,6 +7504,7 @@ s%@LDFLAGS_DEBUG@%$LDFLAGS_DEBUG%g
- s%@LDFLAGS_OPTIMIZE@%$LDFLAGS_OPTIMIZE%g
- s%@CC_SEARCH_FLAGS@%$CC_SEARCH_FLAGS%g
- s%@LD_SEARCH_FLAGS@%$LD_SEARCH_FLAGS%g
-+s%@LD_FLAGS@%$LD_FLAGS%g
- s%@STLIB_LD@%$STLIB_LD%g
- s%@SHLIB_LD@%$SHLIB_LD%g
- s%@TCL_SHLIB_LD_EXTRAS@%$TCL_SHLIB_LD_EXTRAS%g
diff --git a/lang/tcl/patches/patch-ac b/lang/tcl/patches/patch-ac
index b5553ef4886..3f5b155447f 100644
--- a/lang/tcl/patches/patch-ac
+++ b/lang/tcl/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.4 2004/03/08 22:14:19 minskim Exp $
+$NetBSD: patch-ac,v 1.5 2004/10/01 13:35:37 adam Exp $
 
---- tclUnixInit.c.orig	2004-02-17 17:46:54.000000000 -0600
+--- tclUnixInit.c.orig	2004-03-29 18:49:36.000000000 +0000
 +++ tclUnixInit.c
 @@ -28,6 +28,11 @@
  #	include <dlfcn.h>
@@ -14,7 +14,7 @@ $NetBSD: patch-ac,v 1.4 2004/03/08 22:14:19 minskim Exp $
  
  /*
   * The Init script (common to Windows and Unix platforms) is
-@@ -730,6 +735,11 @@ TclpSetVariables(interp)
+@@ -733,6 +738,11 @@ TclpSetVariables(interp)
      int unameOK;
      CONST char *user;
      Tcl_DString ds;
@@ -26,7 +26,7 @@ $NetBSD: patch-ac,v 1.4 2004/03/08 22:14:19 minskim Exp $
  
  #ifdef HAVE_CFBUNDLE
      char tclLibPath[MAXPATHLEN + 1];
-@@ -832,8 +842,16 @@ TclpSetVariables(interp)
+@@ -835,8 +845,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 ded40f77a3b..caa1372f83e 100644
--- a/lang/tcl/patches/patch-ae
+++ b/lang/tcl/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.4 2004/03/08 19:55:35 minskim Exp $
+$NetBSD: patch-ae,v 1.5 2004/10/01 13:35:37 adam Exp $
 
---- configure.in.orig	2003-11-21 14:17:14.000000000 -0600
+--- configure.in.orig	2004-07-26 21:40:46.000000000 +0000
 +++ configure.in
-@@ -479,7 +479,7 @@ elif test "$SHARED_BUILD" = "0" || test 
+@@ -478,7 +478,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}"
@@ -11,7 +11,7 @@ $NetBSD: patch-ae,v 1.4 2004/03/08 19:55:35 minskim Exp $
  else
      TCL_BUILD_EXP_FILE="lib.exp"
      eval "TCL_EXP_FILE=libtcl${TCL_EXPORT_FILE_SUFFIX}"
-@@ -509,13 +509,19 @@ VERSION=${TCL_VERSION}
+@@ -508,13 +508,19 @@ VERSION=${TCL_VERSION}
  #--------------------------------------------------------------------
  
  if test "$FRAMEWORK_BUILD" = "1" ; then
diff --git a/lang/tcl/patches/patch-af b/lang/tcl/patches/patch-af
index 30bc1088630..135f4f3ed9d 100644
--- a/lang/tcl/patches/patch-af
+++ b/lang/tcl/patches/patch-af
@@ -1,154 +1,28 @@
-$NetBSD: patch-af,v 1.11 2004/03/25 22:49:15 jlam Exp $
+$NetBSD: patch-af,v 1.12 2004/10/01 13:35:37 adam Exp $
 
---- tcl.m4.orig	Mon Mar  1 18:58:59 2004
+--- tcl.m4.orig	2004-07-26 21:40:46.000000000 +0000
 +++ tcl.m4
-@@ -651,7 +651,7 @@ AC_DEFUN(SC_CONFIG_MANPAGES, [
- #                       loading for Tcl on this system.
- #       DL_LIBS -       Library file(s) to include in tclsh and other base
- #                       applications in order for the "load" command to work.
--#       LDFLAGS -      Flags to pass to the compiler when linking object
-+#       LD_FLAGS -      Flags to pass to the compiler when linking object
- #                       files into an executable application binary such
- #                       as tclsh.
- #       LD_SEARCH_FLAGS-Flags to pass to ld, such as "-R /usr/local/tcl/lib",
-@@ -796,6 +796,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [
+@@ -802,6 +802,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [
      # Step 3: set configuration options based on system name and version.
  
      do64bit_ok=no
 +    TCL_LIB_SPEC_RPATH=""
-     EXTRA_CFLAGS=""
+     LDFLAGS_ORIG="$LDFLAGS"
      TCL_EXPORT_FILE_SUFFIX=""
      UNSHARED_LIB_SUFFIX=""
-@@ -839,7 +840,7 @@ dnl AC_CHECK_TOOL(AR, ar)
- 	    SHLIB_SUFFIX=".so"
- 
- 	    DL_OBJS="tclLoadDl.o"
--	    LDFLAGS=""
-+	    LD_FLAGS=""
- 
- 	    LD_LIBRARY_PATH_VAR="LIBPATH"
- 
-@@ -850,7 +851,7 @@ dnl AC_CHECK_TOOL(AR, ar)
- 		else 
- 		    do64bit_ok=yes
- 		    EXTRA_CFLAGS="-q64"
--		    LDFLAGS="-q64"
-+		    LD_FLAGS="-q64"
- 		    RANLIB="${RANLIB} -X64"
- 		    AR="${AR} -X64"
- 		    SHLIB_LD_FLAGS="-b64"
-@@ -891,7 +892,7 @@ dnl AC_CHECK_TOOL(AR, ar)
- 	    SHLIB_SUFFIX=".so"
- 	    DL_OBJS="tclLoadDl.o"
- 	    DL_LIBS="-ldl"
--	    LDFLAGS=""
-+	    LD_FLAGS=""
- 	    CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
- 	    LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
- 	    LD_LIBRARY_PATH_VAR="LIBPATH"
-@@ -911,7 +912,7 @@ dnl AC_CHECK_TOOL(AR, ar)
- 		else 
- 		    do64bit_ok=yes
- 		    EXTRA_CFLAGS="-q64"
--		    LDFLAGS="-q64"
-+		    LD_FLAGS="-q64"
- 		    RANLIB="${RANLIB} -X64"
- 		    AR="${AR} -X64"
- 		    SHLIB_LD_FLAGS="-b64"
-@@ -944,7 +945,7 @@ dnl AC_CHECK_TOOL(AR, ar)
- 	    SHLIB_SUFFIX=".so"
- 	    DL_OBJS="tclLoadDl.o"
- 	    DL_LIBS="-ldl"
--	    LDFLAGS=""
-+	    LD_FLAGS=""
- 	    CC_SEARCH_FLAGS=""
- 	    LD_SEARCH_FLAGS=""
- 	    ;;
-@@ -955,7 +956,7 @@ dnl AC_CHECK_TOOL(AR, ar)
- 	    SHLIB_SUFFIX=".so"
- 	    DL_OBJS="tclLoadDl.o"
- 	    DL_LIBS="-ldl"
--	    LDFLAGS="-export-dynamic"
-+	    LD_FLAGS="-export-dynamic"
- 	    CC_SEARCH_FLAGS=""
- 	    LD_SEARCH_FLAGS=""
- 	    ;;
-@@ -966,7 +967,7 @@ dnl AC_CHECK_TOOL(AR, ar)
- 	    SHLIB_SUFFIX=".so"
- 	    DL_OBJS="tclLoadDl.o"
- 	    DL_LIBS="-ldl"
--	    LDFLAGS=""
-+	    LD_FLAGS=""
- 	    CC_SEARCH_FLAGS=""
- 	    LD_SEARCH_FLAGS=""
- 	    ;;
-@@ -984,7 +985,7 @@ dnl AC_CHECK_TOOL(AR, ar)
- 		SHLIB_LD_LIBS='${LIBS}'
- 		DL_OBJS="tclLoadShl.o"
- 		DL_LIBS="-ldld"
--		LDFLAGS="-Wl,-E"
-+		LD_FLAGS="-Wl,-E"
- 		CC_SEARCH_FLAGS='-Wl,+s,+b,${LIB_RUNTIME_DIR}:.'
- 		LD_SEARCH_FLAGS='+s +b ${LIB_RUNTIME_DIR}:.'
- 		LD_LIBRARY_PATH_VAR="SHLIB_PATH"
-@@ -1020,10 +1021,10 @@ dnl AC_CHECK_TOOL(AR, ar)
- 		    do64bit_ok=yes
- 		    if test "`uname -m`" = "ia64" ; then
- 			EXTRA_CFLAGS="+DD64"
--			LDFLAGS="+DD64 $LDFLAGS"
-+			LD_FLAGS="+DD64 $LD_FLAGS"
- 		    else
- 			EXTRA_CFLAGS="+DA2.0W"
--			LDFLAGS="+DA2.0W $LDFLAGS"
-+			LD_FLAGS="+DA2.0W $LD_FLAGS"
- 		    fi
- 		fi
- 	    fi
-@@ -1037,7 +1038,7 @@ dnl AC_CHECK_TOOL(AR, ar)
- 		SHLIB_LD_LIBS=""
- 		DL_OBJS="tclLoadShl.o"
- 		DL_LIBS="-ldld"
--		LDFLAGS="-Wl,-E"
-+		LD_FLAGS="-Wl,-E"
- 		CC_SEARCH_FLAGS='-Wl,+s,+b,${LIB_RUNTIME_DIR}:.'
- 		LD_SEARCH_FLAGS='+s +b ${LIB_RUNTIME_DIR}:.'
- 		LD_LIBRARY_PATH_VAR="SHLIB_PATH"
-@@ -1050,7 +1051,7 @@ dnl AC_CHECK_TOOL(AR, ar)
- 	    SHLIB_LD_LIBS='${LIBS}'
- 	    DL_OBJS="tclLoadAout.o"
+@@ -1076,6 +1077,9 @@ dnl AC_CHECK_TOOL(AR, ar)
  	    DL_LIBS=""
--	    LDFLAGS="-Wl,-D,08000000"
-+	    LD_FLAGS="-Wl,-D,08000000"
- 	    CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
- 	    LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
- 	    SHARED_LIB_SUFFIX='${VERSION}\$\{DBGX\}.a'
-@@ -1065,7 +1066,10 @@ dnl AC_CHECK_TOOL(AR, ar)
  	    CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
  	    LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
- 	    EXTRA_CFLAGS=""
--	    LDFLAGS=""
-+	    LD_FLAGS=""
 +	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
 +	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
 +	    TCL_LIB_VERSIONS_OK=nodots
  	    ;;
  	IRIX-6.*)
  	    SHLIB_CFLAGS=""
-@@ -1078,7 +1082,7 @@ dnl AC_CHECK_TOOL(AR, ar)
- 	    LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
- 	    if test "$GCC" = "yes" ; then
- 		EXTRA_CFLAGS="-mabi=n32"
--		LDFLAGS="-mabi=n32"
-+		LD_FLAGS="-mabi=n32"
- 	    else
- 		case $system in
- 		    IRIX-6.3)
-@@ -1089,8 +1093,11 @@ dnl AC_CHECK_TOOL(AR, ar)
- 			EXTRA_CFLAGS="-n32"
- 			;;
+@@ -1101,6 +1105,9 @@ dnl AC_CHECK_TOOL(AR, ar)
  		esac
--		LDFLAGS="-n32"
-+		LD_FLAGS="-n32"
+ 		LDFLAGS="$LDFLAGS -n32"
  	    fi
 +	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
 +	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
@@ -156,21 +30,8 @@ $NetBSD: patch-af,v 1.11 2004/03/25 22:49:15 jlam Exp $
  	    ;;
  	IRIX64-6.*)
  	    SHLIB_CFLAGS=""
-@@ -1099,7 +1106,7 @@ dnl AC_CHECK_TOOL(AR, ar)
- 	    SHLIB_SUFFIX=".so"
- 	    DL_OBJS="tclLoadDl.o"
- 	    DL_LIBS=""
--	    LDFLAGS=""
-+	    LD_FLAGS=""
- 	    CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
- 	    LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
- 
-@@ -1112,9 +1119,12 @@ dnl AC_CHECK_TOOL(AR, ar)
- 	            do64bit_ok=yes
- 	            SHLIB_LD="ld -64 -shared -rdata_shared"
- 	            EXTRA_CFLAGS="-64"
--	            LDFLAGS="-64"
-+	            LD_FLAGS="-64"
+@@ -1124,6 +1131,9 @@ dnl AC_CHECK_TOOL(AR, ar)
+ 	            LDFLAGS="$LDFLAGS -64"
  	        fi
  	    fi
 +	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
@@ -179,25 +40,7 @@ $NetBSD: patch-af,v 1.11 2004/03/25 22:49:15 jlam Exp $
  	    ;;
  	Linux*)
  	    SHLIB_CFLAGS="-fPIC"
-@@ -1131,7 +1141,7 @@ dnl AC_CHECK_TOOL(AR, ar)
- 		SHLIB_LD="${CC} -shared"
- 		DL_OBJS="tclLoadDl.o"
- 		DL_LIBS="-ldl"
--		LDFLAGS="-rdynamic"
-+		LD_FLAGS="-rdynamic"
- 		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
- 		LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
- 	    else
-@@ -1139,7 +1149,7 @@ dnl AC_CHECK_TOOL(AR, ar)
- 		    SHLIB_LD="ld -shared"
- 		    DL_OBJS="tclLoadDld.o"
- 		    DL_LIBS="-ldld"
--		    LDFLAGS=""
-+		    LD_FLAGS=""
- 		    CC_SEARCH_FLAGS=""
- 		    LD_SEARCH_FLAGS=""])
- 	    fi
-@@ -1161,6 +1171,9 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1169,6 +1179,9 @@ dnl AC_CHECK_TOOL(AR, ar)
  	    # XIM peeking works under XFree86.
  	    AC_DEFINE(PEEK_XCLOSEIM)
  
@@ -207,43 +50,10 @@ $NetBSD: patch-af,v 1.11 2004/03/25 22:49:15 jlam Exp $
  	    ;;
  	GNU*)
  	    SHLIB_CFLAGS="-fPIC"
-@@ -1171,7 +1184,7 @@ dnl AC_CHECK_TOOL(AR, ar)
- 		SHLIB_LD="${CC} -shared"
- 		DL_OBJS=""
- 		DL_LIBS="-ldl"
--		LDFLAGS="-rdynamic"
-+		LD_FLAGS="-rdynamic"
- 		CC_SEARCH_FLAGS=""
- 		LD_SEARCH_FLAGS=""
- 	    else
-@@ -1179,7 +1192,7 @@ dnl AC_CHECK_TOOL(AR, ar)
- 		    SHLIB_LD="ld -shared"
- 		    DL_OBJS=""
- 		    DL_LIBS="-ldld"
--		    LDFLAGS=""
-+		    LD_FLAGS=""
- 		    CC_SEARCH_FLAGS=""
- 		    LD_SEARCH_FLAGS=""])
- 	    fi
-@@ -1194,7 +1207,7 @@ dnl AC_CHECK_TOOL(AR, ar)
- 	    SHLIB_SUFFIX=".so"
- 	    DL_OBJS="tclLoadDl.o"
- 	    DL_LIBS="-ldl"
--	    LDFLAGS=""
-+	    LD_FLAGS=""
- 	    CC_SEARCH_FLAGS=""
- 	    LD_SEARCH_FLAGS=""
- 	    ;;
-@@ -1205,34 +1218,42 @@ dnl AC_CHECK_TOOL(AR, ar)
- 	    SHLIB_SUFFIX=".so"
- 	    DL_OBJS="tclLoadDl.o"
- 	    DL_LIBS="-ldl"
--	    LDFLAGS="-Wl,-Bexport"
-+	    LD_FLAGS="-Wl,-Bexport"
- 	    CC_SEARCH_FLAGS=""
+@@ -1216,28 +1229,36 @@ dnl AC_CHECK_TOOL(AR, ar)
  	    LD_SEARCH_FLAGS=""
  	    ;;
- 	NetBSD-*|FreeBSD-[[1-2]].*|OpenBSD-*)
+ 	NetBSD-*|FreeBSD-[[1-2]].*)
 +	    if test "X${COMPILER_OPTIMIZATION_BUG}" = "XYES"; then
 +		CFLAGS_OPTIMIZE=-O0
 +	    fi
@@ -256,8 +66,6 @@ $NetBSD: patch-af,v 1.11 2004/03/25 22:49:15 jlam Exp $
  		SHLIB_SUFFIX=".so"
  		DL_OBJS="tclLoadDl.o"
  		DL_LIBS=""
--		LDFLAGS=""
-+		LD_FLAGS=""
  		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
 -		LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
  		AC_MSG_CHECKING(for ELF)
@@ -268,11 +76,10 @@ $NetBSD: patch-af,v 1.11 2004/03/25 22:49:15 jlam Exp $
 -		],
 +		], [
  		    AC_MSG_RESULT(yes)
--		    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so',
+ 		    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so',
 +		    SHLIB_LD='${TCL_CC} -shared -Wl,-x'
 +		    LD_SEARCH_FLAGS='-Wl,-R${LIB_RUNTIME_DIR}'
 +		    TCL_LIB_SPEC_RPATH="-Wl,-R${exec_prefix}/lib"
-+		    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
 +		], [
  		    AC_MSG_RESULT(no)
 +		    SHLIB_LD="ld -Bshareable -x"
@@ -284,167 +91,7 @@ $NetBSD: patch-af,v 1.11 2004/03/25 22:49:15 jlam Exp $
  	    ], [
  		SHLIB_CFLAGS=""
  		SHLIB_LD="echo tclLdAout $CC \{$SHLIB_CFLAGS\} | `pwd`/tclsh -r"
-@@ -1240,7 +1261,7 @@ dnl AC_CHECK_TOOL(AR, ar)
- 		SHLIB_SUFFIX=".a"
- 		DL_OBJS="tclLoadAout.o"
- 		DL_LIBS=""
--		LDFLAGS=""
-+		LD_FLAGS=""
- 		CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
- 		LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
- 		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
-@@ -1259,14 +1280,14 @@ dnl AC_CHECK_TOOL(AR, ar)
- 	    SHLIB_SUFFIX=".so"
- 	    DL_OBJS="tclLoadDl.o"
- 	    DL_LIBS=""
--	    LDFLAGS="-export-dynamic"
-+	    LD_FLAGS="-export-dynamic"
- 	    CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
- 	    LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
- 	    if test "${TCL_THREADS}" = "1" ; then
- 		# The -pthread needs to go in the CFLAGS, not LIBS
- 		LIBS=`echo $LIBS | sed s/-pthread//`
- 		EXTRA_CFLAGS="-pthread"
--	    	LDFLAGS="$LDFLAGS -pthread"
-+	    	LD_FLAGS="$LD_FLAGS -pthread"
- 	    fi
- 	    case $system in
- 	    FreeBSD-3.*)
-@@ -1287,7 +1308,7 @@ dnl AC_CHECK_TOOL(AR, ar)
- 	    DL_OBJS="tclLoadDyld.o"
- 	    PLAT_OBJS="tclMacOSXBundle.o"
- 	    DL_LIBS=""
--	    LDFLAGS="-prebind"
-+	    LD_FLAGS="-prebind"
- 	    CC_SEARCH_FLAGS=""
- 	    LD_SEARCH_FLAGS=""
- 	    CFLAGS_OPTIMIZE="-Os"
-@@ -1304,7 +1325,7 @@ dnl AC_CHECK_TOOL(AR, ar)
- 	    SHLIB_SUFFIX=".so"
- 	    DL_OBJS="tclLoadNext.o"
- 	    DL_LIBS=""
--	    LDFLAGS=""
-+	    LD_FLAGS=""
- 	    CC_SEARCH_FLAGS=""
- 	    LD_SEARCH_FLAGS=""
- 	    ;;
-@@ -1321,7 +1342,7 @@ dnl AC_CHECK_TOOL(AR, ar)
- 	    SHLIB_SUFFIX=".so"
- 	    DL_OBJS="tclLoadOSF.o"
- 	    DL_LIBS=""
--	    LDFLAGS=""
-+	    LD_FLAGS=""
- 	    CC_SEARCH_FLAGS=""
- 	    LD_SEARCH_FLAGS=""
- 	    ;;
-@@ -1337,7 +1358,7 @@ dnl AC_CHECK_TOOL(AR, ar)
- 	    SHLIB_SUFFIX=".so"
- 	    DL_OBJS="tclLoadDl.o"
- 	    DL_LIBS=""
--	    LDFLAGS=""
-+	    LD_FLAGS=""
- 	    CC_SEARCH_FLAGS=""
- 	    LD_SEARCH_FLAGS=""
- 	    ;;
-@@ -1353,7 +1374,7 @@ dnl AC_CHECK_TOOL(AR, ar)
- 	    SHLIB_SUFFIX=".so"
- 	    DL_OBJS="tclLoadDl.o"
- 	    DL_LIBS=""
--	    LDFLAGS=""
-+	    LD_FLAGS=""
- 	    CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
- 	    LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
- 	    if test "$GCC" = "yes" ; then
-@@ -1370,7 +1391,7 @@ dnl AC_CHECK_TOOL(AR, ar)
- 		    LIBS="$LIBS -lpthread -lmach -lexc"
- 		else
- 		    EXTRA_CFLAGS="${EXTRA_CFLAGS} -pthread"
--		    LDFLAGS="-pthread"
-+		    LD_FLAGS="-pthread"
- 		fi
- 	    fi
- 
-@@ -1385,7 +1406,7 @@ dnl AC_CHECK_TOOL(AR, ar)
- 	    DL_OBJS="tclLoadDl.o"
- 	    # dlopen is in -lc on QNX
- 	    DL_LIBS=""
--	    LDFLAGS=""
-+	    LD_FLAGS=""
- 	    CC_SEARCH_FLAGS=""
- 	    LD_SEARCH_FLAGS=""
- 	    ;;
-@@ -1396,7 +1417,7 @@ dnl AC_CHECK_TOOL(AR, ar)
- 	    SHLIB_SUFFIX=".a"
- 	    DL_OBJS="tclLoadAout.o"
- 	    DL_LIBS=""
--	    LDFLAGS="-Wl,-D,08000000"
-+	    LD_FLAGS="-Wl,-D,08000000"
- 	    CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
- 	    LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
- 	    ;;
-@@ -1406,10 +1427,10 @@ dnl AC_CHECK_TOOL(AR, ar)
- 	    # below.
- 	    if test "$GCC" = "yes" ; then
- 	    	SHLIB_CFLAGS="-fPIC -melf"
--	    	LDFLAGS="-melf -Wl,-Bexport"
-+	    	LD_FLAGS="-melf -Wl,-Bexport"
- 	    else
- 	    	SHLIB_CFLAGS="-Kpic -belf"
--	    	LDFLAGS="-belf -Wl,-Bexport"
-+	    	LD_FLAGS="-belf -Wl,-Bexport"
- 	    fi
- 	    SHLIB_LD="ld -G"
- 	    SHLIB_LD_LIBS=""
-@@ -1426,7 +1447,7 @@ dnl AC_CHECK_TOOL(AR, ar)
- 	    SHLIB_SUFFIX=".so"
- 	    DL_OBJS="tclLoadDl.o"
- 	    DL_LIBS="-ldl"
--	    LDFLAGS=""
-+	    LD_FLAGS=""
- 	    CC_SEARCH_FLAGS=""
- 	    LD_SEARCH_FLAGS=""
- 	    ;;
-@@ -1437,7 +1458,7 @@ dnl AC_CHECK_TOOL(AR, ar)
- 	    SHLIB_SUFFIX=".so"
- 	    DL_OBJS="tclLoadDl.o"
- 	    DL_LIBS="-ldl"
--	    LDFLAGS=""
-+	    LD_FLAGS=""
- 	    CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
- 	    LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
- 
-@@ -1467,7 +1488,7 @@ dnl AC_CHECK_TOOL(AR, ar)
- 	    SHLIB_SUFFIX=".so"
- 	    DL_OBJS="tclLoadDl.o"
- 	    DL_LIBS="-ldl"
--	    LDFLAGS=""
-+	    LD_FLAGS=""
- 	    if test "$GCC" = "yes" ; then
- 		SHLIB_LD="$CC -shared"
- 		CC_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}'
-@@ -1487,7 +1508,7 @@ dnl AC_CHECK_TOOL(AR, ar)
- 	    AC_DEFINE(_POSIX_PTHREAD_SEMANTICS)
- 
- 	    SHLIB_CFLAGS="-KPIC"
--	    LDFLAGS=""
-+	    LD_FLAGS=""
-     
- 	    # Check to enable 64-bit flags for compiler/linker
- 	    if test "$do64bit" = "yes" ; then
-@@ -1499,10 +1520,10 @@ dnl AC_CHECK_TOOL(AR, ar)
- 			    do64bit_ok=yes
- 			    if test "$do64bitVIS" = "yes" ; then
- 				EXTRA_CFLAGS="-xarch=v9a"
--			    	LDFLAGS="-xarch=v9a"
-+			    	LD_FLAGS="-xarch=v9a"
- 			    else
- 				EXTRA_CFLAGS="-xarch=v9"
--			    	LDFLAGS="-xarch=v9"
-+			    	LD_FLAGS="-xarch=v9"
- 			    fi
- 			fi
- 		else
-@@ -1526,6 +1547,9 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1546,6 +1567,9 @@ dnl AC_CHECK_TOOL(AR, ar)
  		CC_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}'
  		LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}'
  	    fi
@@ -454,37 +101,7 @@ $NetBSD: patch-af,v 1.11 2004/03/25 22:49:15 jlam Exp $
  	    ;;
  	ULTRIX-4.*)
  	    SHLIB_CFLAGS="-G 0"
-@@ -1534,7 +1558,7 @@ dnl AC_CHECK_TOOL(AR, ar)
- 	    SHLIB_LD_LIBS='${LIBS}'
- 	    DL_OBJS="tclLoadAout.o"
- 	    DL_LIBS=""
--	    LDFLAGS="-Wl,-D,08000000"
-+	    LD_FLAGS="-Wl,-D,08000000"
- 	    CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
- 	    LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
- 	    if test "$GCC" != "yes" ; then
-@@ -1557,9 +1581,9 @@ dnl AC_CHECK_TOOL(AR, ar)
- 	    LDFLAGS=$hold_ldflags
- 	    AC_MSG_RESULT($found)
- 	    if test $found = yes; then
--	    LDFLAGS="-Wl,-Bexport"
-+	    LD_FLAGS="-Wl,-Bexport"
- 	    else
--	    LDFLAGS=""
-+	    LD_FLAGS=""
- 	    fi
- 	    CC_SEARCH_FLAGS=""
- 	    LD_SEARCH_FLAGS=""
-@@ -1665,7 +1689,7 @@ dnl AC_CHECK_TOOL(AR, ar)
- 	SHLIB_SUFFIX=""
- 	DL_OBJS="tclLoadNone.o"
- 	DL_LIBS=""
--	LDFLAGS=""
-+	LD_FLAGS=""
- 	CC_SEARCH_FLAGS=""
- 	LD_SEARCH_FLAGS=""
- 	BUILD_DLTEST=""
-@@ -1710,8 +1734,8 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1725,8 +1749,8 @@ dnl AC_CHECK_TOOL(AR, ar)
  
      if test "${SHARED_BUILD}" = "1" && test "${SHLIB_SUFFIX}" != "" ; then
          LIB_SUFFIX=${SHARED_LIB_SUFFIX}
@@ -495,7 +112,7 @@ $NetBSD: patch-af,v 1.11 2004/03/25 22:49:15 jlam Exp $
      else
          LIB_SUFFIX=${UNSHARED_LIB_SUFFIX}
  
-@@ -1741,10 +1765,10 @@ dnl        esac
+@@ -1756,10 +1780,10 @@ dnl        esac
  
      # Stub lib does not depend on shared/static configuration
      if test "$RANLIB" = "" ; then
@@ -508,11 +125,3 @@ $NetBSD: patch-af,v 1.11 2004/03/25 22:49:15 jlam Exp $
          INSTALL_STUB_LIB='$(INSTALL_LIBRARY) $(STUB_LIB_FILE) $(LIB_INSTALL_DIR)/$(STUB_LIB_FILE) ; (cd $(LIB_INSTALL_DIR) ; $(RANLIB) $(STUB_LIB_FILE))'
      fi
  
-@@ -1762,6 +1786,7 @@ dnl        esac
-     AC_SUBST(LDFLAGS)
-     AC_SUBST(LDFLAGS_DEBUG)
-     AC_SUBST(LDFLAGS_OPTIMIZE)
-+    AC_SUBST(LD_FLAGS)
-     AC_SUBST(CC_SEARCH_FLAGS)
-     AC_SUBST(LD_SEARCH_FLAGS)
-