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

6 files changed, 63 insertions, 880 deletions

diff --git a/x11/tk/Makefile b/x11/tk/Makefile
index 8e4b2445036..eb37e081015 100644
--- a/x11/tk/Makefile
+++ b/x11/tk/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.35 2004/06/15 16:39:12 jwise Exp $
+# $NetBSD: Makefile,v 1.36 2004/10/01 13:35:53 adam Exp $
 
-DISTNAME=	tk8.4.6-src
-PKGNAME=	tk-8.4.6
-PKGREVISION=	3
+DISTNAME=	tk8.4.7-src
+PKGNAME=	tk-8.4.7
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=tcl/}
 
@@ -25,14 +24,12 @@ TEST_TARGET=		test
 
 # 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 "../../lang/tcl/buildlink3.mk"
 
 # 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/x11/tk/distinfo b/x11/tk/distinfo
index 91cece2cefe..5d630d07b13 100644
--- a/x11/tk/distinfo
+++ b/x11/tk/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.16 2004/04/09 23:39:00 danw Exp $
+$NetBSD: distinfo,v 1.17 2004/10/01 13:35:53 adam Exp $
 
-SHA1 (tk8.4.6-src.tar.gz) = a0b2f364be20c3e312d1ba582d3a1b4b4b1d4d88
-Size (tk8.4.6-src.tar.gz) = 3230760 bytes
-SHA1 (patch-aa) = 60fd440a16607a9000fd16b1a6f6461d2d717fdd
-SHA1 (patch-ab) = 1673dd6d9e5a7bfd3e85004f34da1c28f3258353
-SHA1 (patch-ac) = 055e64d4a3a1e93f6e122ebdad270fb1490fe381
-SHA1 (patch-ad) = 2f65cb36160794991d940bb3ffc9a754dcd9febc
+SHA1 (tk8.4.7-src.tar.gz) = e91c16a640ce38c8f5b870647fb659fe7c7ae513
+Size (tk8.4.7-src.tar.gz) = 3186531 bytes
+SHA1 (patch-aa) = 55cbfbe84c3b952276b6ab7866f96680cd3d2b5b
+SHA1 (patch-ab) = e98e9b26d59326ac6f5bb9ee07c6fc4442bbc84a
+SHA1 (patch-ac) = 23ab38fa66e75b491e6652e8b0e4f3bd83618fa0
+SHA1 (patch-ad) = 24a677844b702f82b57af88ecc6659c858f87130
diff --git a/x11/tk/patches/patch-aa b/x11/tk/patches/patch-aa
index 228c5224865..48df80d03a0 100644
--- a/x11/tk/patches/patch-aa
+++ b/x11/tk/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.11 2004/04/09 23:39:00 danw Exp $
+$NetBSD: patch-aa,v 1.12 2004/10/01 13:35:53 adam Exp $
 
 --- Makefile.in.orig	Mon Mar  1 19:04:48 2004
 +++ Makefile.in
@@ -11,15 +11,6 @@ $NetBSD: patch-aa,v 1.11 2004/04/09 23:39:00 danw Exp $
  
  # The directory containing the Tcl library archive file appropriate
  # for this version of Tk:
-@@ -118,7 +118,7 @@ CFLAGS			= @CFLAGS@ @CFLAGS_DEFAULT@
- # Flags to pass to the linker
- LDFLAGS_DEBUG		= @LDFLAGS_DEBUG@
- LDFLAGS_OPTIMIZE	= @LDFLAGS_OPTIMIZE@
--LDFLAGS			= @LDFLAGS@ @LDFLAGS_DEFAULT@
-+LDFLAGS			= @LD_FLAGS@ @LDFLAGS@ @LDFLAGS_DEFAULT@
- 
- # A "-I" switch that can be used when compiling to make all of the
- # X11 include files accessible (the configure script will try to
 @@ -176,8 +176,8 @@ SHELL			= /bin/sh
  INSTALL_STRIP_PROGRAM   = -s
  INSTALL_STRIP_LIBRARY   = -S -S
diff --git a/x11/tk/patches/patch-ab b/x11/tk/patches/patch-ab
index 9a0ca28da75..21bbdb97210 100644
--- a/x11/tk/patches/patch-ab
+++ b/x11/tk/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.16 2004/04/09 23:39:00 danw Exp $
+$NetBSD: patch-ab,v 1.17 2004/10/01 13:35:53 adam Exp $
 
---- configure.orig	Mon Mar  1 19:04:48 2004
+--- configure.orig	2004-07-29 21:57:48.000000000 +0000
 +++ configure
-@@ -2071,12 +2071,13 @@ fi
+@@ -1788,12 +1788,13 @@ fi
      # Step 3: set configuration options based on system name and version.
  
      do64bit_ok=no
 +    RPATH_FLAG=""
-     EXTRA_CFLAGS=""
+     LDFLAGS_ORIG="$LDFLAGS"
      TCL_EXPORT_FILE_SUFFIX=""
      UNSHARED_LIB_SUFFIX=""
      TCL_TRIM_DOTS='`echo ${VERSION} | tr -d .`'
@@ -17,209 +17,7 @@ $NetBSD: patch-ab,v 1.16 2004/04/09 23:39:00 danw Exp $
      CFLAGS_DEBUG=-g
      CFLAGS_OPTIMIZE=-O
      if test "$GCC" = "yes" ; then
-@@ -2140,7 +2141,7 @@ fi
- 	    SHLIB_SUFFIX=".so"
- 
- 	    DL_OBJS="tclLoadDl.o"
--	    LDFLAGS=""
-+	    LD_FLAGS=""
- 
- 	    LD_LIBRARY_PATH_VAR="LIBPATH"
- 
-@@ -2151,7 +2152,7 @@ fi
- 		else 
- 		    do64bit_ok=yes
- 		    EXTRA_CFLAGS="-q64"
--		    LDFLAGS="-q64"
-+		    LD_FLAGS="-q64"
- 		    RANLIB="${RANLIB} -X64"
- 		    AR="${AR} -X64"
- 		    SHLIB_LD_FLAGS="-b64"
-@@ -2192,7 +2193,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"
-@@ -2212,7 +2213,7 @@ fi
- 		else 
- 		    do64bit_ok=yes
- 		    EXTRA_CFLAGS="-q64"
--		    LDFLAGS="-q64"
-+		    LD_FLAGS="-q64"
- 		    RANLIB="${RANLIB} -X64"
- 		    AR="${AR} -X64"
- 		    SHLIB_LD_FLAGS="-b64"
-@@ -2288,7 +2289,7 @@ EOF
- 	    SHLIB_SUFFIX=".so"
- 	    DL_OBJS="tclLoadDl.o"
- 	    DL_LIBS="-ldl"
--	    LDFLAGS=""
-+	    LD_FLAGS=""
- 	    CC_SEARCH_FLAGS=""
- 	    LD_SEARCH_FLAGS=""
- 	    ;;
-@@ -2299,7 +2300,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=""
- 	    ;;
-@@ -2310,7 +2311,7 @@ EOF
- 	    SHLIB_SUFFIX=".so"
- 	    DL_OBJS="tclLoadDl.o"
- 	    DL_LIBS="-ldl"
--	    LDFLAGS=""
-+	    LD_FLAGS=""
- 	    CC_SEARCH_FLAGS=""
- 	    LD_SEARCH_FLAGS=""
- 	    ;;
-@@ -2374,7 +2375,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"
-@@ -2410,10 +2411,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
-@@ -2467,7 +2468,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"
-@@ -2480,7 +2481,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'
-@@ -2495,7 +2496,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=""
-@@ -2508,7 +2509,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)
-@@ -2519,7 +2520,7 @@ fi
- 			EXTRA_CFLAGS="-n32"
- 			;;
- 		esac
--		LDFLAGS="-n32"
-+		LD_FLAGS="-n32"
- 	    fi
- 	    ;;
- 	IRIX64-6.*)
-@@ -2529,7 +2530,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}'
- 
-@@ -2542,7 +2543,7 @@ fi
- 	            do64bit_ok=yes
- 	            SHLIB_LD="ld -64 -shared -rdata_shared"
- 	            EXTRA_CFLAGS="-64"
--	            LDFLAGS="-64"
-+	            LD_FLAGS="-64"
- 	        fi
- 	    fi
- 	    ;;
-@@ -2561,7 +2562,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
-@@ -2597,7 +2598,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
-@@ -2636,7 +2637,7 @@ EOF
- 		SHLIB_LD="${CC} -shared"
- 		DL_OBJS=""
- 		DL_LIBS="-ldl"
--		LDFLAGS="-rdynamic"
-+		LD_FLAGS="-rdynamic"
- 		CC_SEARCH_FLAGS=""
- 		LD_SEARCH_FLAGS=""
- 	    else
-@@ -2672,7 +2673,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
-@@ -2691,7 +2692,7 @@ fi
- 	    SHLIB_SUFFIX=".so"
- 	    DL_OBJS="tclLoadDl.o"
- 	    DL_LIBS="-ldl"
--	    LDFLAGS=""
-+	    LD_FLAGS=""
- 	    CC_SEARCH_FLAGS=""
- 	    LD_SEARCH_FLAGS=""
- 	    ;;
-@@ -2702,7 +2703,7 @@ fi
- 	    SHLIB_SUFFIX=".so"
- 	    DL_OBJS="tclLoadDl.o"
- 	    DL_LIBS="-ldl"
--	    LDFLAGS="-Wl,-Bexport"
-+	    LD_FLAGS="-Wl,-Bexport"
- 	    CC_SEARCH_FLAGS=""
- 	    LD_SEARCH_FLAGS=""
- 	    ;;
-@@ -2739,12 +2740,11 @@ if eval "test \"`echo '$ac_cv_header_'$a
+@@ -2495,7 +2496,6 @@ if eval "test \"`echo '$ac_cv_header_'$a
    
  		# NetBSD/SPARC needs -fPIC, -fpic will not do.
  		SHLIB_CFLAGS="-fPIC"
@@ -227,13 +25,7 @@ $NetBSD: patch-ab,v 1.16 2004/04/09 23:39:00 danw Exp $
  		SHLIB_LD_LIBS=""
  		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
-@@ -2761,13 +2761,23 @@ EOF
+@@ -2516,13 +2516,23 @@ EOF
  if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
    egrep "yes" >/dev/null 2>&1; then
    rm -rf conftest*
@@ -259,197 +51,7 @@ $NetBSD: patch-ab,v 1.16 2004/04/09 23:39:00 danw Exp $
  fi
  rm -f conftest*
  
-@@ -2781,7 +2791,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'
-@@ -2802,14 +2812,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.*)
-@@ -2830,7 +2840,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"
-@@ -2847,7 +2857,7 @@ fi
- 	    SHLIB_SUFFIX=".so"
- 	    DL_OBJS="tclLoadNext.o"
- 	    DL_LIBS=""
--	    LDFLAGS=""
-+	    LD_FLAGS=""
- 	    CC_SEARCH_FLAGS=""
- 	    LD_SEARCH_FLAGS=""
- 	    ;;
-@@ -2867,7 +2877,7 @@ EOF
- 	    SHLIB_SUFFIX=".so"
- 	    DL_OBJS="tclLoadOSF.o"
- 	    DL_LIBS=""
--	    LDFLAGS=""
-+	    LD_FLAGS=""
- 	    CC_SEARCH_FLAGS=""
- 	    LD_SEARCH_FLAGS=""
- 	    ;;
-@@ -2883,7 +2893,7 @@ EOF
- 	    SHLIB_SUFFIX=".so"
- 	    DL_OBJS="tclLoadDl.o"
- 	    DL_LIBS=""
--	    LDFLAGS=""
-+	    LD_FLAGS=""
- 	    CC_SEARCH_FLAGS=""
- 	    LD_SEARCH_FLAGS=""
- 	    ;;
-@@ -2899,7 +2909,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
-@@ -2916,7 +2926,7 @@ EOF
- 		    LIBS="$LIBS -lpthread -lmach -lexc"
- 		else
- 		    EXTRA_CFLAGS="${EXTRA_CFLAGS} -pthread"
--		    LDFLAGS="-pthread"
-+		    LD_FLAGS="-pthread"
- 		fi
- 	    fi
- 
-@@ -2931,7 +2941,7 @@ EOF
- 	    DL_OBJS="tclLoadDl.o"
- 	    # dlopen is in -lc on QNX
- 	    DL_LIBS=""
--	    LDFLAGS=""
-+	    LD_FLAGS=""
- 	    CC_SEARCH_FLAGS=""
- 	    LD_SEARCH_FLAGS=""
- 	    ;;
-@@ -2942,7 +2952,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}
- 	    ;;
-@@ -2952,10 +2962,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=""
-@@ -2972,7 +2982,7 @@ EOF
- 	    SHLIB_SUFFIX=".so"
- 	    DL_OBJS="tclLoadDl.o"
- 	    DL_LIBS="-ldl"
--	    LDFLAGS=""
-+	    LD_FLAGS=""
- 	    CC_SEARCH_FLAGS=""
- 	    LD_SEARCH_FLAGS=""
- 	    ;;
-@@ -2983,7 +2993,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}
- 
-@@ -3019,7 +3029,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}'
-@@ -3045,7 +3055,7 @@ EOF
- 
- 
- 	    SHLIB_CFLAGS="-KPIC"
--	    LDFLAGS=""
-+	    LD_FLAGS=""
-     
- 	    # Check to enable 64-bit flags for compiler/linker
- 	    if test "$do64bit" = "yes" ; then
-@@ -3057,10 +3067,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
-@@ -3092,7 +3102,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
-@@ -3133,9 +3143,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=""
-@@ -3310,7 +3320,7 @@ fi
- 	SHLIB_SUFFIX=""
- 	DL_OBJS="tclLoadNone.o"
- 	DL_LIBS=""
--	LDFLAGS=""
-+	LD_FLAGS=""
- 	CC_SEARCH_FLAGS=""
- 	LD_SEARCH_FLAGS=""
- 	BUILD_DLTEST=""
-@@ -3347,16 +3357,16 @@ fi
+@@ -3136,16 +3146,16 @@ fi
      fi
  
      if test "$SHARED_LIB_SUFFIX" = "" ; then
@@ -470,7 +72,7 @@ $NetBSD: patch-ab,v 1.16 2004/04/09 23:39:00 danw Exp $
      else
          LIB_SUFFIX=${UNSHARED_LIB_SUFFIX}
  
-@@ -4428,7 +4438,11 @@ echo "configure:4426: checking for X11 l
+@@ -4499,7 +4509,11 @@ echo "configure:4497: checking for X11 l
  	for i in $dirs ; do
  	    if test -r $i/libX11.a -o -r $i/libX11.so -o -r $i/libX11.sl; then
  		echo "$ac_t""$i" 1>&6
@@ -483,7 +85,7 @@ $NetBSD: patch-ab,v 1.16 2004/04/09 23:39:00 danw Exp $
  		x_libraries="$i"
  		break
  	    fi
-@@ -4437,7 +4451,11 @@ echo "configure:4426: checking for X11 l
+@@ -4508,7 +4522,11 @@ echo "configure:4497: checking for X11 l
  	if test "$x_libraries" = ""; then
  	    XLIBSW=-lX11
  	else
@@ -496,7 +98,7 @@ $NetBSD: patch-ab,v 1.16 2004/04/09 23:39:00 danw Exp $
  	fi
      fi
      if test "$XLIBSW" = nope ; then
-@@ -4507,6 +4525,10 @@ if test "x${x_libraries}" != "x"; then
+@@ -4578,6 +4596,10 @@ if test "x${x_libraries}" != "x"; then
  fi
  if test "${TCL_LD_SEARCH_FLAGS}" = '-L${LIB_RUNTIME_DIR}'; then
      LIB_RUNTIME_DIR=`echo ${LIB_RUNTIME_DIR} |sed -e 's/:/ -L/g'`
@@ -507,7 +109,7 @@ $NetBSD: patch-ab,v 1.16 2004/04/09 23:39:00 danw Exp $
  fi
  
  # The statement below is very tricky!  It actually *evaluates* the
-@@ -5156,11 +5178,18 @@ eval "TK_LIB_FILE=${TK_LIB_FILE}"
+@@ -5129,11 +5151,18 @@ eval "TK_LIB_FILE=${TK_LIB_FILE}"
  if test "$SHARED_BUILD" = 0 -o $TCL_NEEDS_EXP_FILE = 0; then
      if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
  	eval TK_LIB_FLAG="-ltk${VERSION}\${TK_DBGX}"
@@ -527,11 +129,3 @@ $NetBSD: patch-ab,v 1.16 2004/04/09 23:39:00 danw Exp $
      TK_BUILD_EXP_FILE=""
      TK_EXP_FILE=""
  else
-@@ -5405,6 +5434,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/x11/tk/patches/patch-ac b/x11/tk/patches/patch-ac
index 6dc5c7da4ba..d1f89d2fb41 100644
--- a/x11/tk/patches/patch-ac
+++ b/x11/tk/patches/patch-ac
@@ -1,154 +1,28 @@
-$NetBSD: patch-ac,v 1.8 2004/03/25 22:49:15 jlam Exp $
+$NetBSD: patch-ac,v 1.9 2004/10/01 13:35:53 adam Exp $
 
---- tcl.m4.orig	Mon Mar  1 19:04:48 2004
+--- tcl.m4.orig	2004-07-29 21:57:48.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
-+    RPATH_FLAG=""
-     EXTRA_CFLAGS=""
++    TCL_LIB_SPEC_RPATH=""
+     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-ac,v 1.8 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-ac,v 1.8 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,14 @@ $NetBSD: patch-ac,v 1.8 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=""
+@@ -1216,28 +1229,36 @@ dnl AC_CHECK_TOOL(AR, ar)
  	    LD_SEARCH_FLAGS=""
  	    ;;
-@@ -1205,7 +1218,7 @@ 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=""
- 	    LD_SEARCH_FLAGS=""
- 	    ;;
-@@ -1214,12 +1227,11 @@ dnl AC_CHECK_TOOL(AR, ar)
+ 	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_CHECK_HEADER(dlfcn.h, [
  		# NetBSD/SPARC needs -fPIC, -fpic will not do.
  		SHLIB_CFLAGS="-fPIC"
@@ -252,194 +66,32 @@ $NetBSD: patch-ac,v 1.8 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}'
+-		LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
  		AC_MSG_CHECKING(for ELF)
-@@ -1227,11 +1239,19 @@ dnl AC_CHECK_TOOL(AR, ar)
+ 		AC_EGREP_CPP(yes, [
  #ifdef __ELF__
  	yes
  #endif
 -		],
 +		], [
  		    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'
-+		    RPATH_FLAG='-Wl,-R'
 +		    LD_SEARCH_FLAGS='-Wl,-R${LIB_RUNTIME_DIR}'
-+		    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
++		    TCL_LIB_SPEC_RPATH="-Wl,-R${exec_prefix}/lib"
 +		], [
  		    AC_MSG_RESULT(no)
 +		    SHLIB_LD="ld -Bshareable -x"
-+		    RPATH_FLAG='-R'
 +		    LD_SEARCH_FLAGS='-R${LIB_RUNTIME_DIR}'
++		    TCL_LIB_SPEC_RPATH="-R${exec_prefix}/lib"
  		    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0'
-+		]
- 		)
+-		)
++		])
  	    ], [
  		SHLIB_CFLAGS=""
-@@ -1240,7 +1260,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 +1279,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 +1307,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 +1324,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 +1341,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 +1357,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 +1373,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 +1390,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 +1405,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 +1416,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 +1426,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 +1446,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 +1457,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 +1487,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 +1507,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 +1519,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 +1546,9 @@ dnl AC_CHECK_TOOL(AR, ar)
+ 		SHLIB_LD="echo tclLdAout $CC \{$SHLIB_CFLAGS\} | `pwd`/tclsh -r"
+@@ -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
@@ -449,37 +101,7 @@ $NetBSD: patch-ac,v 1.8 2004/03/25 22:49:15 jlam Exp $
  	    ;;
  	ULTRIX-4.*)
  	    SHLIB_CFLAGS="-G 0"
-@@ -1534,7 +1557,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 +1580,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 +1688,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 +1733,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}
@@ -490,37 +112,16 @@ $NetBSD: patch-ac,v 1.8 2004/03/25 22:49:15 jlam Exp $
      else
          LIB_SUFFIX=${UNSHARED_LIB_SUFFIX}
  
-@@ -1764,6 +1787,7 @@ dnl        esac
-     AC_SUBST(LDFLAGS_OPTIMIZE)
-     AC_SUBST(CC_SEARCH_FLAGS)
-     AC_SUBST(LD_SEARCH_FLAGS)
-+    AC_SUBST(LD_FLAGS)
+@@ -1756,10 +1780,10 @@ dnl        esac
  
-     AC_SUBST(STLIB_LD)
-     AC_SUBST(SHLIB_LD)
-@@ -2056,7 +2080,11 @@ AC_DEFUN(SC_PATH_X, [
- 	for i in $dirs ; do
- 	    if test -r $i/libX11.a -o -r $i/libX11.so -o -r $i/libX11.sl; then
- 		AC_MSG_RESULT($i)
--		XLIBSW="-L$i -lX11"
-+		if test "${RPATH_FLAG}" != ""; then
-+		    XLIBSW="-L$i ${RPATH_FLAG}$i -lX11"
-+		else
-+		    XLIBSW="-L$i -lX11"
-+		fi
- 		x_libraries="$i"
- 		break
- 	    fi
-@@ -2065,7 +2093,11 @@ AC_DEFUN(SC_PATH_X, [
- 	if test "$x_libraries" = ""; then
- 	    XLIBSW=-lX11
- 	else
--	    XLIBSW="-L$x_libraries -lX11"
-+	    if test "${RPATH_FLAG}" != ""; then
-+		XLIBSW="-L$x_libraries ${RPATH_FLAG}$x_libraries -lX11"
-+	    else
-+		XLIBSW="-L$x_libraries -lX11"
-+	    fi
- 	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
-     if test "$XLIBSW" = nope ; then
+ 
diff --git a/x11/tk/patches/patch-ad b/x11/tk/patches/patch-ad
index d31ff6b3978..2d93244fbd6 100644
--- a/x11/tk/patches/patch-ad
+++ b/x11/tk/patches/patch-ad
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.4 2004/03/08 20:29:43 minskim Exp $
+$NetBSD: patch-ad,v 1.5 2004/10/01 13:35:53 adam Exp $
 
---- configure.in.orig	2003-11-21 14:17:23.000000000 -0600
+--- configure.in.orig	2004-07-29 21:57:48.000000000 +0000
 +++ configure.in
 @@ -249,6 +249,10 @@ if test "x${x_libraries}" != "x"; then
  fi
@@ -13,7 +13,7 @@ $NetBSD: patch-ad,v 1.4 2004/03/08 20:29:43 minskim Exp $
  fi
  
  # The statement below is very tricky!  It actually *evaluates* the
-@@ -376,11 +380,18 @@ eval "TK_LIB_FILE=${TK_LIB_FILE}"
+@@ -361,11 +365,18 @@ eval "TK_LIB_FILE=${TK_LIB_FILE}"
  if test "$SHARED_BUILD" = 0 -o $TCL_NEEDS_EXP_FILE = 0; then
      if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
  	eval TK_LIB_FLAG="-ltk${VERSION}\${TK_DBGX}"