Changes 8.4.8:

  * Fixed possible deadlock in Tcl_Finalize
  * Fixed thread IDs on 64-bit systems
  * Fixed [scan %ld] handling LP64 systems
  * Fixed [string map $samevar $samevar] crash
  * Fixed broken [namespace forget] logic
  * Fixed [namespace import] cycle prevention
  * Improved control over int <-> wideInt conversion
  * Fixed buffer overflow when there is a syntax error in [subst]
  * Fixed [file executable] result for case insensitivity on Windows
  * Fixed [expr {NaN == NaN}] result
  * Make [tcl_findLibrary] search $::auto_path as well
  * Fixed crash in [fconfigure -ttycontrol] in threaded build
  * [TIP 222] implementation of [wm attributes -alpha] on Windows
  * [TIP 159] implementation of [wm iconphoto]
  * Make Tk [load]-able on OS X/Aqua
  * Handle color/screen resolution changes on Windows
  * Fixed [wm resizable] for Solaris/CDE
  * Handle Windows native dialog double clicks that fall through
  * Fixed [place forget] memory leak
  * Recompute menu geometry on named font size change
  * Fixed X/IME IC focus after creation
  * Improved multiple display Tk dialog window placement
  * Fixed compound buttons for OS X/Aqua
  * Documentation improvements and test suite expansion

6 files changed, 41 insertions, 50 deletions

diff --git a/x11/tk/Makefile b/x11/tk/Makefile
index dc7caa5e619..817666898b0 100644
--- a/x11/tk/Makefile
+++ b/x11/tk/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.37 2004/10/03 00:18:38 tv Exp $
+# $NetBSD: Makefile,v 1.38 2004/11/26 10:31:08 adam Exp $
 
-DISTNAME=	tk8.4.7-src
-PKGNAME=	tk-8.4.7
-PKGREVISION=	1
-CATEGORIES=	x11
+DISTNAME=	tk8.4.8-src
+PKGNAME=	tk-8.4.8
+CATEGORIES=	x11 lang
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=tcl/}
 
 MAINTAINER=	jwise@NetBSD.org
@@ -13,14 +12,15 @@ COMMENT=	Graphical toolkit for TCL
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 WRKSRC=			${WRKDIR}/${DISTNAME:C/-src//}/unix
+
+USE_X11=		yes
+USE_LIBTOOL=		yes
+USE_BUILDLINK3=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-tcl=${BUILDLINK_PREFIX.tcl}/lib
 CONFIGURE_ARGS+=	--enable-threads
 MAKE_ENV+=		TOUCH="${TOUCH}"
 
-USE_X11=		yes
-USE_LIBTOOL=		yes
-USE_BUILDLINK3=		yes
 TEST_TARGET=		test
 
 # Initially install the man pages into ${WRKDIR}/man, as we need a staged
diff --git a/x11/tk/PLIST b/x11/tk/PLIST
index 9f2a2250ae2..2d8e8ab04aa 100644
--- a/x11/tk/PLIST
+++ b/x11/tk/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2004/09/22 08:10:07 jlam Exp $
+@comment $NetBSD: PLIST,v 1.6 2004/11/26 10:31:08 adam Exp $
 bin/wish
 bin/wish8.4
 include/tk.h
@@ -311,6 +311,7 @@ man/man3/Tk_HandleEvent.3
 man/man3/Tk_Height.3
 man/man3/Tk_IdToWindow.3
 man/man3/Tk_ImageChanged.3
+man/man3/Tk_Init.3
 man/man3/Tk_InitImageArgs.3
 man/man3/Tk_InitOptions.3
 man/man3/Tk_InitStubs.3
@@ -417,21 +418,16 @@ man/mann/bitmap.n
 man/mann/button.n
 man/mann/canvas.n
 man/mann/checkbutton.n
-man/mann/chooseColor.n
-man/mann/chooseDirectory.n
 man/mann/clipboard.n
 man/mann/colors.n
 man/mann/console.n
 man/mann/cursors.n
 man/mann/destroy.n
-man/mann/dialog.n
 man/mann/entry.n
 man/mann/event.n
 man/mann/focus.n
-man/mann/focusNext.n
 man/mann/font.n
 man/mann/frame.n
-man/mann/getOpenFile.n
 man/mann/grab.n
 man/mann/grid.n
 man/mann/image.n
@@ -442,20 +438,15 @@ man/mann/listbox.n
 man/mann/loadTk.n
 man/mann/lower.n
 man/mann/menu.n
-man/mann/menubar.n
 man/mann/menubutton.n
 man/mann/message.n
-man/mann/messageBox.n
 man/mann/option.n
-man/mann/optionMenu.n
 man/mann/options.n
 man/mann/pack-old.n
 man/mann/pack.n
-man/mann/palette.n
 man/mann/panedwindow.n
 man/mann/photo.n
 man/mann/place.n
-man/mann/popup.n
 man/mann/radiobutton.n
 man/mann/raise.n
 man/mann/scale.n
diff --git a/x11/tk/distinfo b/x11/tk/distinfo
index 5d630d07b13..660d731ce62 100644
--- a/x11/tk/distinfo
+++ b/x11/tk/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.17 2004/10/01 13:35:53 adam Exp $
+$NetBSD: distinfo,v 1.18 2004/11/26 10:31:08 adam Exp $
 
-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 (tk8.4.8-src.tar.gz) = 0d4d50de5877ece0e6c1d63a2bcf28206fca2200
+Size (tk8.4.8-src.tar.gz) = 3265937 bytes
+SHA1 (patch-aa) = 0a241f1b2803f3d9bd998947d3284a3ee6659a76
+SHA1 (patch-ab) = c204afea18379273e97a14708d92635a0b7c3220
+SHA1 (patch-ac) = d0373617f76f6e62ecf80d7290fb4ae8388521bf
 SHA1 (patch-ad) = 24a677844b702f82b57af88ecc6659c858f87130
diff --git a/x11/tk/patches/patch-aa b/x11/tk/patches/patch-aa
index 48df80d03a0..83f172c8ceb 100644
--- a/x11/tk/patches/patch-aa
+++ b/x11/tk/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.12 2004/10/01 13:35:53 adam Exp $
+$NetBSD: patch-aa,v 1.13 2004/11/26 10:31:08 adam Exp $
 
---- Makefile.in.orig	Mon Mar  1 19:04:48 2004
+--- Makefile.in.orig	2004-11-19 18:50:17.000000000 +0000
 +++ Makefile.in
 @@ -80,7 +80,7 @@ MANN_INSTALL_DIR	= $(MAN_INSTALL_DIR)/ma
  # The directory containing the Tcl sources and headers appropriate
@@ -41,7 +41,7 @@ $NetBSD: patch-aa,v 1.12 2004/10/01 13:35:53 adam Exp $
  TK_SHLIB_LD_EXTRAS	= @TK_SHLIB_LD_EXTRAS@
 @@ -274,7 +275,8 @@ TOOL_DIR		= @TCL_SRC_DIR@/tools
  # should be compressed and linked with softlinks
- MKLINKS_FLAGS           = @MKLINKS_FLAGS@
+ MAN_FLAGS		= @MAN_FLAGS@
  
 -CC			= @CC@
 +CC			= ${LIBTOOL} --mode=compile @CC@
@@ -96,7 +96,7 @@ $NetBSD: patch-aa,v 1.12 2004/10/01 13:35:53 adam Exp $
  		@TK_BUILD_LIB_SPEC@ \
  		$(WISH_LIBS) $(LD_SEARCH_FLAGS) -lXt -o xttest
  
-@@ -507,7 +509,7 @@ install-strip:
+@@ -513,7 +515,7 @@ install-strip:
  # some ranlibs write to current directory, and this might not always be
  # possible (e.g. if installing as root).
  
diff --git a/x11/tk/patches/patch-ab b/x11/tk/patches/patch-ab
index 21bbdb97210..cae94b77b96 100644
--- a/x11/tk/patches/patch-ab
+++ b/x11/tk/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.17 2004/10/01 13:35:53 adam Exp $
+$NetBSD: patch-ab,v 1.18 2004/11/26 10:31:09 adam Exp $
 
---- configure.orig	2004-07-29 21:57:48.000000000 +0000
+--- configure.orig	2004-11-19 18:50:17.000000000 +0000
 +++ configure
-@@ -1788,12 +1788,13 @@ fi
+@@ -1815,12 +1815,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.17 2004/10/01 13:35:53 adam Exp $
      CFLAGS_DEBUG=-g
      CFLAGS_OPTIMIZE=-O
      if test "$GCC" = "yes" ; then
-@@ -2495,7 +2496,6 @@ if eval "test \"`echo '$ac_cv_header_'$a
+@@ -2522,7 +2523,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.17 2004/10/01 13:35:53 adam Exp $
  		SHLIB_LD_LIBS=""
  		SHLIB_SUFFIX=".so"
  		DL_OBJS="tclLoadDl.o"
-@@ -2516,13 +2516,23 @@ EOF
+@@ -2543,13 +2543,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.17 2004/10/01 13:35:53 adam Exp $
  fi
  rm -f conftest*
  
-@@ -3136,16 +3146,16 @@ fi
+@@ -3163,16 +3173,16 @@ fi
      fi
  
      if test "$SHARED_LIB_SUFFIX" = "" ; then
@@ -72,7 +72,7 @@ $NetBSD: patch-ab,v 1.17 2004/10/01 13:35:53 adam Exp $
      else
          LIB_SUFFIX=${UNSHARED_LIB_SUFFIX}
  
-@@ -4499,7 +4509,11 @@ echo "configure:4497: checking for X11 l
+@@ -4526,7 +4536,11 @@ echo "configure:4524: 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.17 2004/10/01 13:35:53 adam Exp $
  		x_libraries="$i"
  		break
  	    fi
-@@ -4508,7 +4522,11 @@ echo "configure:4497: checking for X11 l
+@@ -4535,7 +4549,11 @@ echo "configure:4524: checking for X11 l
  	if test "$x_libraries" = ""; then
  	    XLIBSW=-lX11
  	else
@@ -98,7 +98,7 @@ $NetBSD: patch-ab,v 1.17 2004/10/01 13:35:53 adam Exp $
  	fi
      fi
      if test "$XLIBSW" = nope ; then
-@@ -4578,6 +4596,10 @@ if test "x${x_libraries}" != "x"; then
+@@ -4605,6 +4623,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,7 +109,7 @@ $NetBSD: patch-ab,v 1.17 2004/10/01 13:35:53 adam Exp $
  fi
  
  # The statement below is very tricky!  It actually *evaluates* the
-@@ -5129,11 +5151,18 @@ eval "TK_LIB_FILE=${TK_LIB_FILE}"
+@@ -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}"
diff --git a/x11/tk/patches/patch-ac b/x11/tk/patches/patch-ac
index d1f89d2fb41..85438bc8bad 100644
--- a/x11/tk/patches/patch-ac
+++ b/x11/tk/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.9 2004/10/01 13:35:53 adam Exp $
+$NetBSD: patch-ac,v 1.10 2004/11/26 10:31:09 adam Exp $
 
---- tcl.m4.orig	2004-07-29 21:57:48.000000000 +0000
+--- tcl.m4.orig	2004-11-19 18:50:17.000000000 +0000
 +++ tcl.m4
-@@ -802,6 +802,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [
+@@ -826,6 +826,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.9 2004/10/01 13:35:53 adam Exp $
      LDFLAGS_ORIG="$LDFLAGS"
      TCL_EXPORT_FILE_SUFFIX=""
      UNSHARED_LIB_SUFFIX=""
-@@ -1076,6 +1077,9 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1100,6 +1101,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.9 2004/10/01 13:35:53 adam Exp $
  	    ;;
  	IRIX-6.*)
  	    SHLIB_CFLAGS=""
-@@ -1101,6 +1105,9 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1125,6 +1129,9 @@ dnl AC_CHECK_TOOL(AR, ar)
  		esac
  		LDFLAGS="$LDFLAGS -n32"
  	    fi
@@ -30,7 +30,7 @@ $NetBSD: patch-ac,v 1.9 2004/10/01 13:35:53 adam Exp $
  	    ;;
  	IRIX64-6.*)
  	    SHLIB_CFLAGS=""
-@@ -1124,6 +1131,9 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1148,6 +1155,9 @@ dnl AC_CHECK_TOOL(AR, ar)
  	            LDFLAGS="$LDFLAGS -64"
  	        fi
  	    fi
@@ -40,7 +40,7 @@ $NetBSD: patch-ac,v 1.9 2004/10/01 13:35:53 adam Exp $
  	    ;;
  	Linux*)
  	    SHLIB_CFLAGS="-fPIC"
-@@ -1169,6 +1179,9 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1193,6 +1203,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.9 2004/10/01 13:35:53 adam Exp $
  	    ;;
  	GNU*)
  	    SHLIB_CFLAGS="-fPIC"
-@@ -1216,28 +1229,36 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1240,28 +1253,36 @@ dnl AC_CHECK_TOOL(AR, ar)
  	    LD_SEARCH_FLAGS=""
  	    ;;
  	NetBSD-*|FreeBSD-[[1-2]].*)
@@ -91,7 +91,7 @@ $NetBSD: patch-ac,v 1.9 2004/10/01 13:35:53 adam Exp $
  	    ], [
  		SHLIB_CFLAGS=""
  		SHLIB_LD="echo tclLdAout $CC \{$SHLIB_CFLAGS\} | `pwd`/tclsh -r"
-@@ -1546,6 +1567,9 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1570,6 +1591,9 @@ dnl AC_CHECK_TOOL(AR, ar)
  		CC_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}'
  		LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}'
  	    fi
@@ -101,7 +101,7 @@ $NetBSD: patch-ac,v 1.9 2004/10/01 13:35:53 adam Exp $
  	    ;;
  	ULTRIX-4.*)
  	    SHLIB_CFLAGS="-G 0"
-@@ -1725,8 +1749,8 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1749,8 +1773,8 @@ dnl AC_CHECK_TOOL(AR, ar)
  
      if test "${SHARED_BUILD}" = "1" && test "${SHLIB_SUFFIX}" != "" ; then
          LIB_SUFFIX=${SHARED_LIB_SUFFIX}
@@ -112,7 +112,7 @@ $NetBSD: patch-ac,v 1.9 2004/10/01 13:35:53 adam Exp $
      else
          LIB_SUFFIX=${UNSHARED_LIB_SUFFIX}
  
-@@ -1756,10 +1780,10 @@ dnl        esac
+@@ -1780,10 +1804,10 @@ dnl        esac
  
      # Stub lib does not depend on shared/static configuration
      if test "$RANLIB" = "" ; then