Changes 8.4.11:

* Bug fixes

7 files changed, 102 insertions, 101 deletions

diff --git a/x11/tk/Makefile b/x11/tk/Makefile
index 28dd8f77ca4..562fb10af56 100644
--- a/x11/tk/Makefile
+++ b/x11/tk/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.46 2005/06/01 18:03:31 jlam Exp $
+# $NetBSD: Makefile,v 1.47 2005/07/19 11:12:24 adam Exp $
 
-DISTNAME=	tk8.4.9-src
-PKGNAME=	tk-8.4.9
+DISTNAME=	tk8.4.11-src
+PKGNAME=	tk-8.4.11
 CATEGORIES=	x11 lang
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=tcl/}
 
diff --git a/x11/tk/PLIST b/x11/tk/PLIST
index 2d8e8ab04aa..1e98b51f3c6 100644
--- a/x11/tk/PLIST
+++ b/x11/tk/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2004/11/26 10:31:08 adam Exp $
+@comment $NetBSD: PLIST,v 1.7 2005/07/19 11:12:25 adam Exp $
 bin/wish
 bin/wish8.4
 include/tk.h
@@ -131,6 +131,7 @@ lib/tk8.4/msgs/en.msg
 lib/tk8.4/msgs/en_gb.msg
 lib/tk8.4/msgs/eo.msg
 lib/tk8.4/msgs/es.msg
+lib/tk8.4/msgs/es_ES.msg
 lib/tk8.4/msgs/fr.msg
 lib/tk8.4/msgs/it.msg
 lib/tk8.4/msgs/nl.msg
diff --git a/x11/tk/distinfo b/x11/tk/distinfo
index 39affe4899c..8c6753c9004 100644
--- a/x11/tk/distinfo
+++ b/x11/tk/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.21 2005/02/23 17:36:20 wiz Exp $
+$NetBSD: distinfo,v 1.22 2005/07/19 11:12:25 adam Exp $
 
-SHA1 (tk8.4.9-src.tar.gz) = 3d677d4327f035ddd43992c134f47b6f927cb14a
-RMD160 (tk8.4.9-src.tar.gz) = a9a2609d65094b2b6c5dabc702a6471f8d5eaa63
-Size (tk8.4.9-src.tar.gz) = 3266500 bytes
-SHA1 (patch-aa) = b1589a581bfdcee033306307c0d2b3488d978f63
-SHA1 (patch-ab) = c204afea18379273e97a14708d92635a0b7c3220
-SHA1 (patch-ac) = d0373617f76f6e62ecf80d7290fb4ae8388521bf
-SHA1 (patch-ad) = 24a677844b702f82b57af88ecc6659c858f87130
+SHA1 (tk8.4.11-src.tar.gz) = c05dec9163e6f75787aa2825122d424fc1a1edb6
+RMD160 (tk8.4.11-src.tar.gz) = 71b42c0f0ae5067c23d61a2d852a53fb3c546e2f
+Size (tk8.4.11-src.tar.gz) = 3236334 bytes
+SHA1 (patch-aa) = 5ddd25d23d4749acd251f7e06dde18bdf207da8f
+SHA1 (patch-ab) = 3f085c38c5169a81930571436a8ac1848435205f
+SHA1 (patch-ac) = 5dc59a8e26c114a847c511defc7a3d7cc77655e8
+SHA1 (patch-ad) = 51ba301ed6786791f0ef9ece73c4496231f1c031
diff --git a/x11/tk/patches/patch-aa b/x11/tk/patches/patch-aa
index 40f5461656c..f644a03c1c5 100644
--- a/x11/tk/patches/patch-aa
+++ b/x11/tk/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.14 2005/02/22 10:22:05 adam Exp $
+$NetBSD: patch-aa,v 1.15 2005/07/19 11:12:25 adam Exp $
 
---- Makefile.in.orig	2004-11-19 18:50:17.000000000 +0000
+--- Makefile.in.orig	2005-06-29 16:43:10.000000000 +0000
 +++ Makefile.in
-@@ -80,7 +80,7 @@ MANN_INSTALL_DIR	= $(MAN_INSTALL_DIR)/ma
+@@ -93,7 +93,7 @@ HTML_INSTALL_DIR	= $(INSTALL_ROOT)$(HTML
  # The directory containing the Tcl sources and headers appropriate
  # for this version of Tk ("srcdir" will be replaced or has already
  # been replaced by the configure script):
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.14 2005/02/22 10:22:05 adam Exp $
  
  # The directory containing the Tcl library archive file appropriate
  # for this version of Tk:
-@@ -176,8 +176,8 @@ SHELL			= /bin/sh
+@@ -194,8 +194,8 @@ SHELL			= /bin/sh
  INSTALL_STRIP_PROGRAM   = -s
  INSTALL_STRIP_LIBRARY   = -S -S
  
@@ -22,7 +22,7 @@ $NetBSD: patch-aa,v 1.14 2005/02/22 10:22:05 adam Exp $
  INSTALL_LIBRARY		= ${INSTALL}
  INSTALL_DATA		= ${INSTALL} -m 644
  
-@@ -208,6 +208,7 @@ TK_STUB_LIB_FLAG	= @TK_STUB_LIB_FLAG@
+@@ -225,6 +225,7 @@ TK_STUB_LIB_FLAG	= @TK_STUB_LIB_FLAG@
  #TK_STUB_LIB_FLAG	= -ltkstub
  
  TK_LIB_FILE		= @TK_LIB_FILE@
@@ -30,18 +30,18 @@ $NetBSD: patch-aa,v 1.14 2005/02/22 10:22:05 adam Exp $
  #TK_LIB_FILE		= libtk.a
  
  # Generic lib name used in rules that apply to tcl and tk
-@@ -234,7 +235,7 @@ WISH_LIBS = $(TCL_LIB_SPEC) @LIBS@ $(X11
- # The values of the symbolis normally set by the configure script.
+@@ -254,7 +255,7 @@ WISH_LIBS = $(TCL_LIB_SPEC) @LIBS@ $(X11
+ # these definitions by hand.
  
  STLIB_LD		= @STLIB_LD@
 -SHLIB_LD		= @SHLIB_LD@
 +SHLIB_LD		= ${LIBTOOL} --mode=link @CC@ -rpath ${PREFIX}/lib
- SHLIB_LD_FLAGS		= @SHLIB_LD_FLAGS@
  SHLIB_LD_LIBS		= @SHLIB_LD_LIBS@
  TK_SHLIB_LD_EXTRAS	= @TK_SHLIB_LD_EXTRAS@
-@@ -274,7 +275,8 @@ TOOL_DIR		= @TCL_SRC_DIR@/tools
+ 
+@@ -301,7 +302,8 @@ XLIB_DIR		= $(TOP_DIR)/xlib
  # should be compressed and linked with softlinks
- MAN_FLAGS		= @MAN_FLAGS@
+ MAN_FLAGS               = @MAN_FLAGS@
  
 -CC			= @CC@
 +CC			= ${LIBTOOL} --mode=compile @CC@
@@ -49,7 +49,7 @@ $NetBSD: patch-aa,v 1.14 2005/02/22 10:22:05 adam Exp $
  
  CC_SWITCHES_NO_STUBS = ${CFLAGS} ${CFLAGS_WARNING} ${SHLIB_CFLAGS} \
  -I${UNIX_DIR} -I${GENERIC_DIR} \
-@@ -390,7 +392,7 @@ DEMOPROGS = browse hello ixset rmt rolod
+@@ -471,7 +473,7 @@ DEMOPROGS = browse hello ixset rmt rolod
  
  all: binaries libraries doc
  
@@ -58,36 +58,36 @@ $NetBSD: patch-aa,v 1.14 2005/02/22 10:22:05 adam Exp $
  
  libraries:
  
-@@ -402,7 +404,7 @@ doc: $(SRC_DIR)/doc/man.macros
+@@ -483,7 +485,7 @@ doc: $(TOP_DIR)/doc/man.macros
  
  # The following target is configured by autoconf to generate either
  # a shared library or non-shared library for Tk.
--${LIB_FILE}: ${OBJS}
-+${TK_LA_FILE}: ${OBJS}
+-${LIB_FILE}: ${OBJS} ${STUB_LIB_FILE} @LIB_RSRC_FILE@
++${TK_LA_FILE}: ${OBJS} ${STUB_LIB_FILE} @LIB_RSRC_FILE@
  	rm -f $@
  	@MAKE_LIB@
  
-@@ -421,8 +423,8 @@ tkLibObjs:
+@@ -512,8 +514,8 @@ tkLibObjs:
  objs: ${OBJS}
  
  
--wish: $(WISH_OBJS) $(TK_LIB_FILE) $(TK_STUB_LIB_FILE)
+-wish: $(WISH_OBJS) $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) @APP_RSRC_FILE@
 -	$(CC) $(LDFLAGS) $(WISH_OBJS) \
-+wish: $(WISH_OBJS) $(TK_LA_FILE) $(TK_STUB_LIB_FILE)
++wish: $(WISH_OBJS) $(TK_LA_FILE) $(TK_STUB_LIB_FILE) @APP_RSRC_FILE@
 +	$(LD) $(LDFLAGS) $(WISH_OBJS) \
  		@TK_BUILD_LIB_SPEC@ \
  		$(WISH_LIBS) $(CC_SEARCH_FLAGS) -o wish
  
-@@ -436,7 +438,7 @@ tktest: $(TKTEST_OBJS) $(TK_LIB_FILE)
+@@ -527,7 +529,7 @@ tktest: $(TKTEST_OBJS) $(TK_LIB_FILE)
  	$(MAKE) tktest-real LIB_RUNTIME_DIR=`pwd`:$(TCL_BIN_DIR)
  
  tktest-real:
--	${CC} $(LDFLAGS) $(TKTEST_OBJS) \
-+	${LD} $(LDFLAGS) $(TKTEST_OBJS) \
- 		@TK_BUILD_LIB_SPEC@ \
+-	${CC} $(LDFLAGS) $(TKTEST_OBJS) @TK_BUILD_LIB_SPEC@ \
++	${LD} $(LDFLAGS) $(TKTEST_OBJS) @TK_BUILD_LIB_SPEC@ \
  		$(WISH_LIBS) $(CC_SEARCH_FLAGS) -o tktest
  
-@@ -445,7 +447,7 @@ tktest-real:
+ # FIXME: This xttest rule seems to be broken in a number of ways.
+@@ -535,7 +537,7 @@ tktest-real:
  # lib location logic from tktest, and it is not clear where this
  # test.o object file comes from.
  xttest: test.o tkTest.o tkSquare.o $(TK_LIB_FILE)
@@ -96,7 +96,7 @@ $NetBSD: patch-aa,v 1.14 2005/02/22 10:22:05 adam Exp $
  		@TK_BUILD_LIB_SPEC@ \
  		$(WISH_LIBS) $(LD_SEARCH_FLAGS) -lXt -o xttest
  
-@@ -513,7 +515,7 @@ install-strip:
+@@ -605,7 +607,7 @@ install-strip:
  # some ranlibs write to current directory, and this might not always be
  # possible (e.g. if installing as root).
  
@@ -104,4 +104,4 @@ $NetBSD: patch-aa,v 1.14 2005/02/22 10:22:05 adam Exp $
 +install-binaries: $(TK_LA_FILE) $(TK_STUB_LIB_FILE) $(TK_BUILD_EXP_FILE) wish
  	@for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) $(PKG_INSTALL_DIR); \
  	    do \
- 	    if [ ! -d $$i ] ; then \
+ 		if [ ! -d $$i ] ; then \
diff --git a/x11/tk/patches/patch-ab b/x11/tk/patches/patch-ab
index cae94b77b96..0ff43af2dba 100644
--- a/x11/tk/patches/patch-ab
+++ b/x11/tk/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.18 2004/11/26 10:31:09 adam Exp $
+$NetBSD: patch-ab,v 1.19 2005/07/19 11:12:25 adam Exp $
 
---- configure.orig	2004-11-19 18:50:17.000000000 +0000
+--- configure.orig	2005-06-29 16:43:10.000000000 +0000
 +++ configure
-@@ -1815,12 +1815,13 @@ fi
+@@ -1910,12 +1910,13 @@ fi
      # Step 3: set configuration options based on system name and version.
  
      do64bit_ok=no
@@ -17,7 +17,7 @@ $NetBSD: patch-ab,v 1.18 2004/11/26 10:31:09 adam Exp $
      CFLAGS_DEBUG=-g
      CFLAGS_OPTIMIZE=-O
      if test "$GCC" = "yes" ; then
-@@ -2522,7 +2523,6 @@ if eval "test \"`echo '$ac_cv_header_'$a
+@@ -2585,7 +2586,6 @@ if eval "test \"`echo '$ac_cv_header_'$a
    
  		# NetBSD/SPARC needs -fPIC, -fpic will not do.
  		SHLIB_CFLAGS="-fPIC"
@@ -25,7 +25,7 @@ $NetBSD: patch-ab,v 1.18 2004/11/26 10:31:09 adam Exp $
  		SHLIB_LD_LIBS=""
  		SHLIB_SUFFIX=".so"
  		DL_OBJS="tclLoadDl.o"
-@@ -2543,13 +2543,23 @@ EOF
+@@ -2606,13 +2606,23 @@ EOF
  if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
    egrep "yes" >/dev/null 2>&1; then
    rm -rf conftest*
@@ -51,7 +51,7 @@ $NetBSD: patch-ab,v 1.18 2004/11/26 10:31:09 adam Exp $
  fi
  rm -f conftest*
  
-@@ -3163,16 +3173,16 @@ fi
+@@ -3539,16 +3549,16 @@ fi
      fi
  
      if test "$SHARED_LIB_SUFFIX" = "" ; then
@@ -65,14 +65,14 @@ $NetBSD: patch-ab,v 1.18 2004/11/26 10:31:09 adam Exp $
  
      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}'
+-        MAKE_LIB='${SHLIB_LD} -o $@ ${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 $@ ${SHLIB_LD_FLAGS} ${OBJS:.o=.lo} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS} -version-info 1:0'
++        MAKE_LIB='${SHLIB_LD} -o $@ ${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) $(TK_LA_FILE) $(LIB_INSTALL_DIR)/$(LIB_FILE)'
      else
          LIB_SUFFIX=${UNSHARED_LIB_SUFFIX}
  
-@@ -4526,7 +4536,11 @@ echo "configure:4524: checking for X11 l
+@@ -5091,7 +5101,11 @@ echo "configure:5089: 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
@@ -85,7 +85,7 @@ $NetBSD: patch-ab,v 1.18 2004/11/26 10:31:09 adam Exp $
  		x_libraries="$i"
  		break
  	    fi
-@@ -4535,7 +4549,11 @@ echo "configure:4524: checking for X11 l
+@@ -5100,7 +5114,11 @@ echo "configure:5089: checking for X11 l
  	if test "$x_libraries" = ""; then
  	    XLIBSW=-lX11
  	else
@@ -98,7 +98,7 @@ $NetBSD: patch-ab,v 1.18 2004/11/26 10:31:09 adam Exp $
  	fi
      fi
      if test "$XLIBSW" = nope ; then
-@@ -4605,6 +4623,10 @@ if test "x${x_libraries}" != "x"; then
+@@ -5172,6 +5190,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'`
@@ -109,23 +109,23 @@ $NetBSD: patch-ab,v 1.18 2004/11/26 10:31:09 adam Exp $
  fi
  
  # The statement below is very tricky!  It actually *evaluates* the
-@@ -5156,11 +5178,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}"
-+	eval TK_BUILD_LIB_SPEC="libtk${VERSION}\${TK_DBGX}.la"
+@@ -5823,11 +5845,18 @@ else
+     if test "$SHARED_BUILD" = "0" || test "$TCL_NEEDS_EXP_FILE" = "0"; then
+         if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
+             eval TK_LIB_FLAG="-ltk${VERSION}\${TK_DBGX}"
++	    eval TK_BUILD_LIB_SPEC="libtk${VERSION}\${TK_DBGX}.la"
+         else
+             eval TK_LIB_FLAG="-ltk`echo ${VERSION} | tr -d .`\${TK_DBGX}"
++	    eval TK_BUILD_LIB_SPEC="libtk`echo ${VERSION} | tr -d .`\${TK_DBGX}.la"
+         fi
+-        TK_BUILD_LIB_SPEC="-L`pwd` ${TK_LIB_FLAG}"
+         TK_LIB_SPEC="-L${libdir} ${TK_LIB_FLAG}"
++	if test "${RPATH_FLAG}" != ""; then
++	    TK_LIB_SPEC_RPATH="${RPATH_FLAG}${exec_prefix}/lib"
++	else
++	    TK_LIB_SPEC_RPATH=""
++	fi
++	TK_LIB_SPEC="-L${exec_prefix}/lib ${TK_LIB_SPEC_RPATH} ${TK_LIB_FLAG}"
      else
- 	eval TK_LIB_FLAG="-ltk`echo ${VERSION} | tr -d .`\${TK_DBGX}"
-+	eval TK_BUILD_LIB_SPEC="libtk`echo ${VERSION} | tr -d .`\${TK_DBGX}.la"
-     fi
--    TK_BUILD_LIB_SPEC="-L`pwd` ${TK_LIB_FLAG}"
-     TK_LIB_SPEC="-L${libdir} ${TK_LIB_FLAG}"
-+    if test "${RPATH_FLAG}" != ""; then
-+	TK_LIB_SPEC_RPATH="${RPATH_FLAG}${exec_prefix}/lib"
-+    else
-+	TK_LIB_SPEC_RPATH=""
-+    fi
-+    TK_LIB_SPEC="-L${exec_prefix}/lib ${TK_LIB_SPEC_RPATH} ${TK_LIB_FLAG}"
-     TK_BUILD_EXP_FILE=""
-     TK_EXP_FILE=""
- else
+         TK_BUILD_EXP_FILE="lib.exp"
+         eval "TK_EXP_FILE=libtk${TCL_EXPORT_FILE_SUFFIX}"
diff --git a/x11/tk/patches/patch-ac b/x11/tk/patches/patch-ac
index 85438bc8bad..ce1bc86c42b 100644
--- a/x11/tk/patches/patch-ac
+++ b/x11/tk/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.10 2004/11/26 10:31:09 adam Exp $
+$NetBSD: patch-ac,v 1.11 2005/07/19 11:12:25 adam Exp $
 
---- tcl.m4.orig	2004-11-19 18:50:17.000000000 +0000
+--- tcl.m4.orig	2005-06-29 16:43:10.000000000 +0000
 +++ tcl.m4
-@@ -826,6 +826,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [
+@@ -866,6 +866,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [
      # Step 3: set configuration options based on system name and version.
  
      do64bit_ok=no
@@ -10,7 +10,7 @@ $NetBSD: patch-ac,v 1.10 2004/11/26 10:31:09 adam Exp $
      LDFLAGS_ORIG="$LDFLAGS"
      TCL_EXPORT_FILE_SUFFIX=""
      UNSHARED_LIB_SUFFIX=""
-@@ -1100,6 +1101,9 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1108,6 +1109,9 @@ dnl AC_CHECK_TOOL(AR, ar)
  	    DL_LIBS=""
  	    CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
  	    LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
@@ -20,7 +20,7 @@ $NetBSD: patch-ac,v 1.10 2004/11/26 10:31:09 adam Exp $
  	    ;;
  	IRIX-6.*)
  	    SHLIB_CFLAGS=""
-@@ -1125,6 +1129,9 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1133,6 +1137,9 @@ dnl AC_CHECK_TOOL(AR, ar)
  		esac
  		LDFLAGS="$LDFLAGS -n32"
  	    fi
@@ -30,7 +30,7 @@ $NetBSD: patch-ac,v 1.10 2004/11/26 10:31:09 adam Exp $
  	    ;;
  	IRIX64-6.*)
  	    SHLIB_CFLAGS=""
-@@ -1148,6 +1155,9 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1156,6 +1163,9 @@ dnl AC_CHECK_TOOL(AR, ar)
  	            LDFLAGS="$LDFLAGS -64"
  	        fi
  	    fi
@@ -40,7 +40,7 @@ $NetBSD: patch-ac,v 1.10 2004/11/26 10:31:09 adam Exp $
  	    ;;
  	Linux*)
  	    SHLIB_CFLAGS="-fPIC"
-@@ -1193,6 +1203,9 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1201,6 +1211,9 @@ dnl AC_CHECK_TOOL(AR, ar)
  	    # XIM peeking works under XFree86.
  	    AC_DEFINE(PEEK_XCLOSEIM)
  
@@ -50,7 +50,7 @@ $NetBSD: patch-ac,v 1.10 2004/11/26 10:31:09 adam Exp $
  	    ;;
  	GNU*)
  	    SHLIB_CFLAGS="-fPIC"
-@@ -1240,28 +1253,36 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1248,28 +1261,36 @@ dnl AC_CHECK_TOOL(AR, ar)
  	    LD_SEARCH_FLAGS=""
  	    ;;
  	NetBSD-*|FreeBSD-[[1-2]].*)
@@ -91,7 +91,7 @@ $NetBSD: patch-ac,v 1.10 2004/11/26 10:31:09 adam Exp $
  	    ], [
  		SHLIB_CFLAGS=""
  		SHLIB_LD="echo tclLdAout $CC \{$SHLIB_CFLAGS\} | `pwd`/tclsh -r"
-@@ -1570,6 +1591,9 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1668,6 +1689,9 @@ dnl AC_CHECK_TOOL(AR, ar)
  		CC_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}'
  		LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}'
  	    fi
@@ -101,18 +101,18 @@ $NetBSD: patch-ac,v 1.10 2004/11/26 10:31:09 adam Exp $
  	    ;;
  	ULTRIX-4.*)
  	    SHLIB_CFLAGS="-G 0"
-@@ -1749,8 +1773,8 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1847,8 +1871,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}'
+-        MAKE_LIB='${SHLIB_LD} -o [$]@ ${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'
++        MAKE_LIB='${SHLIB_LD} -o ${@:C/\.so.*/.la/} ${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}
  
-@@ -1780,10 +1804,10 @@ dnl        esac
+@@ -1878,10 +1902,10 @@ dnl        esac
  
      # Stub lib does not depend on shared/static configuration
      if test "$RANLIB" = "" ; then
diff --git a/x11/tk/patches/patch-ad b/x11/tk/patches/patch-ad
index 2d93244fbd6..dae84f0465a 100644
--- a/x11/tk/patches/patch-ad
+++ b/x11/tk/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.5 2004/10/01 13:35:53 adam Exp $
+$NetBSD: patch-ad,v 1.6 2005/07/19 11:12:25 adam Exp $
 
---- configure.in.orig	2004-07-29 21:57:48.000000000 +0000
+--- configure.in.orig	2005-06-29 16:43:10.000000000 +0000
 +++ configure.in
-@@ -249,6 +249,10 @@ if test "x${x_libraries}" != "x"; then
+@@ -283,6 +283,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'`
@@ -13,23 +13,23 @@ $NetBSD: patch-ad,v 1.5 2004/10/01 13:35:53 adam Exp $
  fi
  
  # The statement below is very tricky!  It actually *evaluates* the
-@@ -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}"
-+	eval TK_BUILD_LIB_SPEC="libtk${VERSION}\${TK_DBGX}.la"
+@@ -466,11 +470,18 @@ else
+     if test "$SHARED_BUILD" = "0" || test "$TCL_NEEDS_EXP_FILE" = "0"; then
+         if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
+             eval TK_LIB_FLAG="-ltk${VERSION}\${TK_DBGX}"
++	    eval TK_BUILD_LIB_SPEC="libtk${VERSION}\${TK_DBGX}.la"
+         else
+             eval TK_LIB_FLAG="-ltk`echo ${VERSION} | tr -d .`\${TK_DBGX}"
++	    eval TK_BUILD_LIB_SPEC="libtk`echo ${VERSION} | tr -d .`\${TK_DBGX}.la"
+         fi
+-        TK_BUILD_LIB_SPEC="-L`pwd` ${TK_LIB_FLAG}"
+         TK_LIB_SPEC="-L${libdir} ${TK_LIB_FLAG}"
++	if test "${RPATH_FLAG}" != ""; then
++	    TK_LIB_SPEC_RPATH="${RPATH_FLAG}${exec_prefix}/lib"
++	else
++	    TK_LIB_SPEC_RPATH=""
++	fi
++	TK_LIB_SPEC="-L${exec_prefix}/lib ${TK_LIB_SPEC_RPATH} ${TK_LIB_FLAG}"
      else
- 	eval TK_LIB_FLAG="-ltk`echo ${VERSION} | tr -d .`\${TK_DBGX}"
-+	eval TK_BUILD_LIB_SPEC="libtk`echo ${VERSION} | tr -d .`\${TK_DBGX}.la"
-     fi
--    TK_BUILD_LIB_SPEC="-L`pwd` ${TK_LIB_FLAG}"
-     TK_LIB_SPEC="-L${libdir} ${TK_LIB_FLAG}"
-+    if test "${RPATH_FLAG}" != ""; then
-+	TK_LIB_SPEC_RPATH="${RPATH_FLAG}${exec_prefix}/lib"
-+    else
-+	TK_LIB_SPEC_RPATH=""
-+    fi
-+    TK_LIB_SPEC="-L${exec_prefix}/lib ${TK_LIB_SPEC_RPATH} ${TK_LIB_FLAG}"
-     TK_BUILD_EXP_FILE=""
-     TK_EXP_FILE=""
- else
+         TK_BUILD_EXP_FILE="lib.exp"
+         eval "TK_EXP_FILE=libtk${TCL_EXPORT_FILE_SUFFIX}"