Changes 8.4.9:

* Fixed segfault in info vars trivial matching branch (new in 8.4.8)
* Fixed the treatment of backslashes in file join on Windows
* Improved readdir_r detection and usage on unix
* Fixed potential unix fileevent issue on 64-bit systems
* Remove file normalize on tcl_findLibrary search path uniqification
  added in 8.4.8
* Ensure tilde paths are not returned specially by 'glob'
* Fixed clipping of partially transparent images on buttons on unix to
  avoid X error
* Fix Tk_PhotoPut(Zoomed)Block overlay compositing of partially
  transparent areas on blank targets

4 files changed, 29 insertions, 30 deletions

diff --git a/lang/tcl/Makefile b/lang/tcl/Makefile
index d77c8620dec..2fc9310fec7 100644
--- a/lang/tcl/Makefile
+++ b/lang/tcl/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.44 2004/12/30 17:01:27 kristerw Exp $
+# $NetBSD: Makefile,v 1.45 2005/01/05 09:15:29 adam Exp $
 
-DISTNAME=	tcl8.4.8-src
-PKGNAME=	tcl-8.4.8
-PKGREVISION=	1
+DISTNAME=	tcl8.4.9-src
+PKGNAME=	tcl-8.4.9
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=tcl/}
 
diff --git a/lang/tcl/distinfo b/lang/tcl/distinfo
index 33db5f4ef37..a5b9d5d1282 100644
--- a/lang/tcl/distinfo
+++ b/lang/tcl/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.27 2004/11/26 10:30:01 adam Exp $
+$NetBSD: distinfo,v 1.28 2005/01/05 09:15:29 adam Exp $
 
-SHA1 (tcl8.4.8-src.tar.gz) = 6b3f618aa8525cde1f10a613bd013fb9138f618b
-Size (tcl8.4.8-src.tar.gz) = 3492731 bytes
+SHA1 (tcl8.4.9-src.tar.gz) = 77370577ded22315fb8f60e20500920352412e58
+Size (tcl8.4.9-src.tar.gz) = 3496364 bytes
 SHA1 (patch-aa) = b9a40bcc2873065714f802e8605709da8532eeee
-SHA1 (patch-ab) = 44aff6dfb3c87d36a9aca16e33f693e356346238
+SHA1 (patch-ab) = adbc7e77190469e49712d25d3683288d8de9be0d
 SHA1 (patch-ac) = ca2409270eee18ca2c8ddf9a002d9fff95053e4d
 SHA1 (patch-ae) = f086af46134e7698e71a9cf1b5668f32ae722d46
-SHA1 (patch-af) = 86a31fbab57616868991661afbccaedc2dadaa32
+SHA1 (patch-af) = bd59ac1331b2e314ed245d7bd60fbf05643fcb29
 SHA1 (patch-ag) = 0a11bfc878d43b15f6444923fac18b4876b62398
 SHA1 (patch-ah) = 0aaa349fcf9ce736e1f7d3dad377ee355f549ecb
diff --git a/lang/tcl/patches/patch-ab b/lang/tcl/patches/patch-ab
index 5b7c8d4688e..d4a04901d7f 100644
--- a/lang/tcl/patches/patch-ab
+++ b/lang/tcl/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.27 2004/11/26 10:30:01 adam Exp $
+$NetBSD: patch-ab,v 1.28 2005/01/05 09:15:29 adam Exp $
 
---- configure.orig	2004-11-19 18:49:51.000000000 +0000
+--- configure.orig	2004-12-07 00:23:45.000000000 +0000
 +++ configure
-@@ -2103,12 +2103,13 @@ fi
+@@ -2192,12 +2192,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.27 2004/11/26 10:30:01 adam Exp $
      CFLAGS_DEBUG=-g
      CFLAGS_OPTIMIZE=-O
      if test "$GCC" = "yes" ; then
-@@ -2778,6 +2779,9 @@ fi
+@@ -2867,6 +2868,9 @@ fi
  	    LD_SEARCH_FLAGS=""
  	    ;;
  	NetBSD-*|FreeBSD-[1-2].*)
@@ -27,7 +27,7 @@ $NetBSD: patch-ab,v 1.27 2004/11/26 10:30:01 adam Exp $
  	    # 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
-@@ -2810,13 +2814,11 @@ if eval "test \"`echo '$ac_cv_header_'$a
+@@ -2899,13 +2903,11 @@ if eval "test \"`echo '$ac_cv_header_'$a
    
  		# NetBSD/SPARC needs -fPIC, -fpic will not do.
  		SHLIB_CFLAGS="-fPIC"
@@ -39,9 +39,9 @@ $NetBSD: patch-ab,v 1.27 2004/11/26 10:30:01 adam Exp $
  		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:2822: checking for ELF" >&5
+ echo "configure:2911: checking for ELF" >&5
  		cat > conftest.$ac_ext <<EOF
-@@ -2831,11 +2833,20 @@ EOF
+@@ -2920,11 +2922,20 @@ EOF
  if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
    egrep "yes" >/dev/null 2>&1; then
    rm -rf conftest*
@@ -64,7 +64,7 @@ $NetBSD: patch-ab,v 1.27 2004/11/26 10:30:01 adam Exp $
  		    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0'
  		
  fi
-@@ -3451,16 +3462,16 @@ fi
+@@ -3540,16 +3551,16 @@ fi
      fi
  
      if test "$SHARED_LIB_SUFFIX" = "" ; then
@@ -85,7 +85,7 @@ $NetBSD: patch-ab,v 1.27 2004/11/26 10:30:01 adam Exp $
      else
          LIB_SUFFIX=${UNSHARED_LIB_SUFFIX}
  
-@@ -7282,7 +7293,7 @@ elif test "$SHARED_BUILD" = "0" || test 
+@@ -7430,7 +7441,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}"
@@ -94,7 +94,7 @@ $NetBSD: patch-ab,v 1.27 2004/11/26 10:30:01 adam Exp $
  else
      TCL_BUILD_EXP_FILE="lib.exp"
      eval "TCL_EXP_FILE=libtcl${TCL_EXPORT_FILE_SUFFIX}"
-@@ -7312,13 +7323,19 @@ VERSION=${TCL_VERSION}
+@@ -7460,13 +7471,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 7f27ea9788f..fbdc7ab8e3c 100644
--- a/lang/tcl/patches/patch-af
+++ b/lang/tcl/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.13 2004/11/26 10:30:01 adam Exp $
+$NetBSD: patch-af,v 1.14 2005/01/05 09:15:29 adam Exp $
 
---- tcl.m4.orig	2004-11-19 18:49:51.000000000 +0000
+--- tcl.m4.orig	2004-12-07 00:23:45.000000000 +0000
 +++ tcl.m4
-@@ -826,6 +826,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [
+@@ -865,6 +865,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-af,v 1.13 2004/11/26 10:30:01 adam Exp $
      LDFLAGS_ORIG="$LDFLAGS"
      TCL_EXPORT_FILE_SUFFIX=""
      UNSHARED_LIB_SUFFIX=""
-@@ -1100,6 +1101,9 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1139,6 +1140,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-af,v 1.13 2004/11/26 10:30:01 adam Exp $
  	    ;;
  	IRIX-6.*)
  	    SHLIB_CFLAGS=""
-@@ -1125,6 +1129,9 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1164,6 +1168,9 @@ dnl AC_CHECK_TOOL(AR, ar)
  		esac
  		LDFLAGS="$LDFLAGS -n32"
  	    fi
@@ -30,7 +30,7 @@ $NetBSD: patch-af,v 1.13 2004/11/26 10:30:01 adam Exp $
  	    ;;
  	IRIX64-6.*)
  	    SHLIB_CFLAGS=""
-@@ -1148,6 +1155,9 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1187,6 +1194,9 @@ dnl AC_CHECK_TOOL(AR, ar)
  	            LDFLAGS="$LDFLAGS -64"
  	        fi
  	    fi
@@ -40,7 +40,7 @@ $NetBSD: patch-af,v 1.13 2004/11/26 10:30:01 adam Exp $
  	    ;;
  	Linux*)
  	    SHLIB_CFLAGS="-fPIC"
-@@ -1193,6 +1203,9 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1232,6 +1242,9 @@ dnl AC_CHECK_TOOL(AR, ar)
  	    # XIM peeking works under XFree86.
  	    AC_DEFINE(PEEK_XCLOSEIM)
  
@@ -50,7 +50,7 @@ $NetBSD: patch-af,v 1.13 2004/11/26 10:30:01 adam Exp $
  	    ;;
  	GNU*)
  	    SHLIB_CFLAGS="-fPIC"
-@@ -1240,28 +1253,36 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1279,28 +1292,36 @@ dnl AC_CHECK_TOOL(AR, ar)
  	    LD_SEARCH_FLAGS=""
  	    ;;
  	NetBSD-*|FreeBSD-[[1-2]].*)
@@ -91,7 +91,7 @@ $NetBSD: patch-af,v 1.13 2004/11/26 10:30:01 adam Exp $
  	    ], [
  		SHLIB_CFLAGS=""
  		SHLIB_LD="echo tclLdAout $CC \{$SHLIB_CFLAGS\} | `pwd`/tclsh -r"
-@@ -1570,6 +1591,9 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1609,6 +1630,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-af,v 1.13 2004/11/26 10:30:01 adam Exp $
  	    ;;
  	ULTRIX-4.*)
  	    SHLIB_CFLAGS="-G 0"
-@@ -1749,8 +1773,8 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1788,8 +1812,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-af,v 1.13 2004/11/26 10:30:01 adam Exp $
      else
          LIB_SUFFIX=${UNSHARED_LIB_SUFFIX}
  
-@@ -1780,10 +1804,10 @@ dnl        esac
+@@ -1819,10 +1843,10 @@ dnl        esac
  
      # Stub lib does not depend on shared/static configuration
      if test "$RANLIB" = "" ; then