Update Tcl/Tk to 8.4.6.

  * Tcl_Obj sharing fixed in [binary scan]
  * Updated errno usage for recent glibc
  * Fixed [file normalize ~unknownuser] error
  * Fixed two memory leaks in VFS code
  * Fixed possible infinite loop in TclFinalizeFilesystem
  * Updated HP-UX 11 build libraries setup
  * Unix std channels forced to exist at startup
  * Stopped broken [exec] quoting of '{'
  * Fixed memory leak with very long host names
  * Corrected level interpretation of Tcl_CreateTrace
  * Allow 64-bit configure on IRIX64-6.5*
  * Several OS X/Aqua native integration improvements (scrollbar,
    event generate, unicode clipboard, tk_messageBox, mousewheel event,
    alpha blending for partially transparent images)
  * Recognized native hand2/fleur cursors on Windows
  * Post menubuttons so they stay on screen better
  * Fixed crash during intra-image copy/resize
  * New msg catalogs for Esperanto and Polish
  * Corrections bold/italic font handling (width calculations) on Windows
  * Fixed shrinking grid geometry calculations

5 files changed, 31 insertions, 69 deletions

diff --git a/x11/tk/Makefile b/x11/tk/Makefile
index 3570fc2a644..26240ea19f7 100644
--- a/x11/tk/Makefile
+++ b/x11/tk/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.29 2004/03/08 20:29:43 minskim Exp $
+# $NetBSD: Makefile,v 1.30 2004/03/08 22:14:19 minskim Exp $
 
-DISTNAME=	tk8.4.5-src
-PKGNAME=	tk-8.4.5
+DISTNAME=	tk8.4.6-src
+PKGNAME=	tk-8.4.6
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=tcl/}
 
diff --git a/x11/tk/PLIST b/x11/tk/PLIST
index a18fabdcb9a..a25c36739b1 100644
--- a/x11/tk/PLIST
+++ b/x11/tk/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2004/03/08 20:29:43 minskim Exp $
+@comment $NetBSD: PLIST,v 1.4 2004/03/08 22:14:19 minskim Exp $
 bin/wish
 bin/wish8.4
 include/tk.h
@@ -133,10 +133,12 @@ lib/tk8.4/msgs/de.msg
 lib/tk8.4/msgs/el.msg
 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/fr.msg
 lib/tk8.4/msgs/it.msg
 lib/tk8.4/msgs/nl.msg
+lib/tk8.4/msgs/pl.msg
 lib/tk8.4/msgs/ru.msg
 lib/tk8.4/obsolete.tcl
 lib/tk8.4/optMenu.tcl
diff --git a/x11/tk/distinfo b/x11/tk/distinfo
index d225dfda5be..bfdf2fea390 100644
--- a/x11/tk/distinfo
+++ b/x11/tk/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.12 2004/03/08 20:29:43 minskim Exp $
+$NetBSD: distinfo,v 1.13 2004/03/08 22:14:19 minskim Exp $
 
-SHA1 (tk8.4.5-src.tar.gz) = 8877357e39e5327d878ef115ad9be87cbdc3996b
-Size (tk8.4.5-src.tar.gz) = 3218856 bytes
+SHA1 (tk8.4.6-src.tar.gz) = a0b2f364be20c3e312d1ba582d3a1b4b4b1d4d88
+Size (tk8.4.6-src.tar.gz) = 3230760 bytes
 SHA1 (patch-aa) = 77344c94315f7b1cc24f2f31413e8d75973e0cda
-SHA1 (patch-ab) = 51da6559c85ae95a7430f00916cf9ba8b9c0e557
-SHA1 (patch-ac) = 22cd66b38227dc42da965074bcfe3bc25ef1c0ce
+SHA1 (patch-ab) = c0d4d2cb135f605757bea55aad90d8151f6f8dc7
+SHA1 (patch-ac) = 6a5b303de8a0f2c2f1345f7c13b62a62d1c3c60c
 SHA1 (patch-ad) = 2f65cb36160794991d940bb3ffc9a754dcd9febc
diff --git a/x11/tk/patches/patch-ab b/x11/tk/patches/patch-ab
index 5f8c18647b3..98016bd6044 100644
--- a/x11/tk/patches/patch-ab
+++ b/x11/tk/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.12 2004/03/08 20:29:43 minskim Exp $
+$NetBSD: patch-ab,v 1.13 2004/03/08 22:14:19 minskim Exp $
 
---- configure.orig	2003-11-21 14:17:23.000000000 -0600
+--- configure.orig	2004-03-01 18:04:48.000000000 -0600
 +++ configure
-@@ -2016,6 +2016,7 @@ fi
+@@ -2071,6 +2071,7 @@ fi
      # Step 3: set configuration options based on system name and version.
  
      do64bit_ok=no
@@ -10,47 +10,7 @@ $NetBSD: patch-ab,v 1.12 2004/03/08 20:29:43 minskim Exp $
      EXTRA_CFLAGS=""
      TCL_EXPORT_FILE_SUFFIX=""
      UNSHARED_LIB_SUFFIX=""
-@@ -2435,6 +2436,9 @@ fi
- 	    LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
- 	    EXTRA_CFLAGS=""
- 	    LDFLAGS=""
-+	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
-+	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
-+	    TCL_LIB_VERSIONS_OK=nodots
- 	    ;;
- 	IRIX-6.*|IRIX64-6.5*)
- 	    SHLIB_CFLAGS=""
-@@ -2460,6 +2464,9 @@ fi
- 		esac
- 		LDFLAGS="-n32"
- 	    fi
-+	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
-+	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
-+	    TCL_LIB_VERSIONS_OK=nodots
- 	    ;;
- 	IRIX64-6.*)
- 	    SHLIB_CFLAGS=""
-@@ -2484,6 +2491,9 @@ fi
- 	            LDFLAGS="-64"
- 	        fi
- 	    fi
-+	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
-+	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
-+	    TCL_LIB_VERSIONS_OK=nodots
- 	    ;;
- 	Linux*)
- 	    SHLIB_CFLAGS="-fPIC"
-@@ -2565,6 +2575,9 @@ fi
- EOF
- 
- 
-+	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
-+	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
-+	    TCL_LIB_VERSIONS_OK=nodots
- 	    ;;
- 	GNU*)
- 	    SHLIB_CFLAGS="-fPIC"
-@@ -2678,7 +2691,6 @@ if eval "test \"`echo '$ac_cv_header_'$a
+@@ -2739,7 +2740,6 @@ if eval "test \"`echo '$ac_cv_header_'$a
    
  		# NetBSD/SPARC needs -fPIC, -fpic will not do.
  		SHLIB_CFLAGS="-fPIC"
@@ -58,7 +18,7 @@ $NetBSD: patch-ab,v 1.12 2004/03/08 20:29:43 minskim Exp $
  		SHLIB_LD_LIBS=""
  		SHLIB_SUFFIX=".so"
  		DL_OBJS="tclLoadDl.o"
-@@ -2700,13 +2712,23 @@ EOF
+@@ -2761,13 +2761,23 @@ EOF
  if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
    egrep "yes" >/dev/null 2>&1; then
    rm -rf conftest*
@@ -84,7 +44,7 @@ $NetBSD: patch-ab,v 1.12 2004/03/08 20:29:43 minskim Exp $
  fi
  rm -f conftest*
  
-@@ -3023,6 +3045,9 @@ EOF
+@@ -3084,6 +3094,9 @@ EOF
  		CC_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}'
  		LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}'
  	    fi
@@ -94,7 +54,7 @@ $NetBSD: patch-ab,v 1.12 2004/03/08 20:29:43 minskim Exp $
  	    ;;
  	ULTRIX-4.*)
  	    SHLIB_CFLAGS="-G 0"
-@@ -3294,8 +3319,8 @@ fi
+@@ -3355,8 +3368,8 @@ fi
  
      if test "${SHARED_BUILD}" = "1" && test "${SHLIB_SUFFIX}" != "" ; then
          LIB_SUFFIX=${SHARED_LIB_SUFFIX}
@@ -105,7 +65,7 @@ $NetBSD: patch-ab,v 1.12 2004/03/08 20:29:43 minskim Exp $
      else
          LIB_SUFFIX=${UNSHARED_LIB_SUFFIX}
  
-@@ -4367,7 +4392,11 @@ echo "configure:4365: checking for X11 l
+@@ -4428,7 +4441,11 @@ echo "configure:4426: 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
@@ -118,7 +78,7 @@ $NetBSD: patch-ab,v 1.12 2004/03/08 20:29:43 minskim Exp $
  		x_libraries="$i"
  		break
  	    fi
-@@ -4376,7 +4405,11 @@ echo "configure:4365: checking for X11 l
+@@ -4437,7 +4454,11 @@ echo "configure:4426: checking for X11 l
  	if test "$x_libraries" = ""; then
  	    XLIBSW=-lX11
  	else
@@ -131,7 +91,7 @@ $NetBSD: patch-ab,v 1.12 2004/03/08 20:29:43 minskim Exp $
  	fi
      fi
      if test "$XLIBSW" = nope ; then
-@@ -4446,6 +4479,10 @@ if test "x${x_libraries}" != "x"; then
+@@ -4507,6 +4528,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'`
@@ -142,7 +102,7 @@ $NetBSD: patch-ab,v 1.12 2004/03/08 20:29:43 minskim Exp $
  fi
  
  # The statement below is very tricky!  It actually *evaluates* the
-@@ -5095,11 +5132,18 @@ eval "TK_LIB_FILE=${TK_LIB_FILE}"
+@@ -5156,11 +5181,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}"
diff --git a/x11/tk/patches/patch-ac b/x11/tk/patches/patch-ac
index d839980deae..a6f4c3703c0 100644
--- a/x11/tk/patches/patch-ac
+++ b/x11/tk/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.5 2004/03/08 20:29:43 minskim Exp $
+$NetBSD: patch-ac,v 1.6 2004/03/08 22:14:19 minskim Exp $
 
---- tcl.m4.orig	2003-11-21 14:17:23.000000000 -0600
+--- tcl.m4.orig	2004-03-01 18:04:48.000000000 -0600
 +++ tcl.m4
-@@ -795,6 +795,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [
+@@ -796,6 +796,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.5 2004/03/08 20:29:43 minskim Exp $
      EXTRA_CFLAGS=""
      TCL_EXPORT_FILE_SUFFIX=""
      UNSHARED_LIB_SUFFIX=""
-@@ -1207,7 +1220,6 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1214,7 +1215,6 @@ dnl AC_CHECK_TOOL(AR, ar)
  	    AC_CHECK_HEADER(dlfcn.h, [
  		# NetBSD/SPARC needs -fPIC, -fpic will not do.
  		SHLIB_CFLAGS="-fPIC"
@@ -18,7 +18,7 @@ $NetBSD: patch-ac,v 1.5 2004/03/08 20:29:43 minskim Exp $
  		SHLIB_LD_LIBS=""
  		SHLIB_SUFFIX=".so"
  		DL_OBJS="tclLoadDl.o"
-@@ -1220,11 +1232,19 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1227,11 +1227,19 @@ dnl AC_CHECK_TOOL(AR, ar)
  #ifdef __ELF__
  	yes
  #endif
@@ -40,7 +40,7 @@ $NetBSD: patch-ac,v 1.5 2004/03/08 20:29:43 minskim Exp $
  		)
  	    ], [
  		SHLIB_CFLAGS=""
-@@ -1519,6 +1539,9 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1526,6 +1534,9 @@ dnl AC_CHECK_TOOL(AR, ar)
  		CC_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}'
  		LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}'
  	    fi
@@ -50,7 +50,7 @@ $NetBSD: patch-ac,v 1.5 2004/03/08 20:29:43 minskim Exp $
  	    ;;
  	ULTRIX-4.*)
  	    SHLIB_CFLAGS="-G 0"
-@@ -1703,8 +1726,8 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1710,8 +1721,8 @@ dnl AC_CHECK_TOOL(AR, ar)
  
      if test "${SHARED_BUILD}" = "1" && test "${SHLIB_SUFFIX}" != "" ; then
          LIB_SUFFIX=${SHARED_LIB_SUFFIX}
@@ -61,7 +61,7 @@ $NetBSD: patch-ac,v 1.5 2004/03/08 20:29:43 minskim Exp $
      else
          LIB_SUFFIX=${UNSHARED_LIB_SUFFIX}
  
-@@ -2049,7 +2072,11 @@ AC_DEFUN(SC_PATH_X, [
+@@ -2056,7 +2067,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)
@@ -74,7 +74,7 @@ $NetBSD: patch-ac,v 1.5 2004/03/08 20:29:43 minskim Exp $
  		x_libraries="$i"
  		break
  	    fi
-@@ -2058,7 +2085,11 @@ AC_DEFUN(SC_PATH_X, [
+@@ -2065,7 +2080,11 @@ AC_DEFUN(SC_PATH_X, [
  	if test "$x_libraries" = ""; then
  	    XLIBSW=-lX11
  	else