Changes 8.4.15:

* Minor bugfixes

6 files changed, 35 insertions, 36 deletions

diff --git a/x11/tk/Makefile.version b/x11/tk/Makefile.version
index 3c711ed1065..f1b41092b97 100644
--- a/x11/tk/Makefile.version
+++ b/x11/tk/Makefile.version
@@ -1,3 +1,3 @@
-# $NetBSD: Makefile.version,v 1.5 2006/11/02 17:42:03 adam Exp $
+# $NetBSD: Makefile.version,v 1.6 2007/05/31 13:02:06 adam Exp $
 
-TK_VERSION=	8.4.14
+TK_VERSION=	8.4.15
diff --git a/x11/tk/PLIST b/x11/tk/PLIST
index 1442645881f..03f712b162f 100644
--- a/x11/tk/PLIST
+++ b/x11/tk/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2006/04/27 08:18:09 adam Exp $
+@comment $NetBSD: PLIST,v 1.9 2007/05/31 13:02:06 adam Exp $
 bin/wish
 bin/wish8.4
 include/tk.h
@@ -131,7 +131,6 @@ 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 c718ce07d7f..826d3bd8f56 100644
--- a/x11/tk/distinfo
+++ b/x11/tk/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.29 2006/11/02 17:42:03 adam Exp $
+$NetBSD: distinfo,v 1.30 2007/05/31 13:02:06 adam Exp $
 
-SHA1 (tk8.4.14-src.tar.gz) = d3a8d1240fe37408a3d39613cb1d845764b7a5b1
-RMD160 (tk8.4.14-src.tar.gz) = 055ea75b91fe0e33ac9d96bd3b9099622008820e
-Size (tk8.4.14-src.tar.gz) = 3268223 bytes
+SHA1 (tk8.4.15-src.tar.gz) = 832b39fc3e64dcbbfff4fc192e33d3fc8ef76c43
+RMD160 (tk8.4.15-src.tar.gz) = 8facb8033ce811097a3568373581687a749dda2d
+Size (tk8.4.15-src.tar.gz) = 3340313 bytes
 SHA1 (patch-aa) = 8425d47efc6feab4a19a79b7d857b9da8042aedf
-SHA1 (patch-ab) = 034f05b45dd9ec824c59fbd9182c8a0476d52523
-SHA1 (patch-ac) = 814e990db42a3a4b8dfb86c91d7c00e970372e48
-SHA1 (patch-ad) = a5881628ec98095e5d95429a6de324a681a14535
+SHA1 (patch-ab) = 81f203519a75dd270d9eaf9d9551cde3c6c52beb
+SHA1 (patch-ac) = 90cb841327d21d606bcebd9d13061115ec791581
+SHA1 (patch-ad) = 408cb4e1f6dbcc00d66e4a817c65d4ed0f0230a7
diff --git a/x11/tk/patches/patch-ab b/x11/tk/patches/patch-ab
index de6c22a7c9e..e0fe3a974c7 100644
--- a/x11/tk/patches/patch-ab
+++ b/x11/tk/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.26 2006/11/02 17:42:03 adam Exp $
+$NetBSD: patch-ab,v 1.27 2007/05/31 13:02:06 adam Exp $
 
---- unix/configure.orig	2006-10-19 19:27:34.000000000 +0200
+--- unix/configure.orig	2007-05-25 18:09:53.000000000 +0200
 +++ unix/configure
-@@ -2055,12 +2055,13 @@ fi
+@@ -2062,12 +2062,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.26 2006/11/02 17:42:03 adam Exp $
      CFLAGS_DEBUG=-g
      CFLAGS_OPTIMIZE=-O
      if test "$GCC" = "yes" ; then
-@@ -2747,7 +2748,6 @@ if eval "test \"`echo '$ac_cv_header_'$a
+@@ -2794,7 +2795,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.26 2006/11/02 17:42:03 adam Exp $
  		SHLIB_LD_LIBS='${LIBS}'
  		SHLIB_SUFFIX=".so"
  		DL_OBJS="tclLoadDl.o"
-@@ -2782,6 +2782,9 @@ rm -f conftest*
+@@ -2829,6 +2829,9 @@ rm -f conftest*
  fi
  
  echo "$ac_t""$tcl_cv_ld_elf" 1>&6
@@ -35,7 +35,7 @@ $NetBSD: patch-ab,v 1.26 2006/11/02 17:42:03 adam Exp $
  		if test $tcl_cv_ld_elf = yes; then
  		    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
  		else
-@@ -2879,12 +2882,13 @@ echo "$ac_t""$tcl_cv_ld_elf" 1>&6
+@@ -2926,12 +2929,13 @@ echo "$ac_t""$tcl_cv_ld_elf" 1>&6
  	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
  	    TCL_LIB_VERSIONS_OK=nodots
  	    ;;
@@ -50,7 +50,7 @@ $NetBSD: patch-ab,v 1.26 2006/11/02 17:42:03 adam Exp $
  	    DL_OBJS="tclLoadDl.o"
  	    DL_LIBS=""
  	    LDFLAGS="$LDFLAGS -export-dynamic"
-@@ -3635,7 +3639,7 @@ fi
+@@ -3758,7 +3762,7 @@ fi
  		    ;;
  		IRIX*)
  		    ;;
@@ -59,7 +59,7 @@ $NetBSD: patch-ab,v 1.26 2006/11/02 17:42:03 adam Exp $
  		    ;;
  		Darwin-*)
  		    ;;
-@@ -3653,16 +3657,16 @@ fi
+@@ -3776,16 +3780,16 @@ fi
      fi
  
      if test "$SHARED_LIB_SUFFIX" = "" ; then
@@ -80,7 +80,7 @@ $NetBSD: patch-ab,v 1.26 2006/11/02 17:42:03 adam Exp $
      else
          LIB_SUFFIX=${UNSHARED_LIB_SUFFIX}
  
-@@ -5213,7 +5217,11 @@ echo "configure:5211: checking for X11 l
+@@ -5336,7 +5340,11 @@ echo "configure:5334: 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
@@ -93,7 +93,7 @@ $NetBSD: patch-ab,v 1.26 2006/11/02 17:42:03 adam Exp $
  		x_libraries="$i"
  		break
  	    fi
-@@ -5222,7 +5230,11 @@ echo "configure:5211: checking for X11 l
+@@ -5345,7 +5353,11 @@ echo "configure:5334: checking for X11 l
  	if test "$x_libraries" = ""; then
  	    XLIBSW=-lX11
  	else
@@ -106,7 +106,7 @@ $NetBSD: patch-ab,v 1.26 2006/11/02 17:42:03 adam Exp $
  	fi
      fi
      if test "$XLIBSW" = nope ; then
-@@ -5294,6 +5306,10 @@ if test "x${x_libraries}" != "x"; then
+@@ -5417,6 +5429,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'`
@@ -117,7 +117,7 @@ $NetBSD: patch-ab,v 1.26 2006/11/02 17:42:03 adam Exp $
  fi
  
  # The statement below is very tricky!  It actually *evaluates* the
-@@ -5827,11 +5843,18 @@ else
+@@ -5951,11 +5967,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}"
diff --git a/x11/tk/patches/patch-ac b/x11/tk/patches/patch-ac
index a2cf63a30be..ee7bd33afb2 100644
--- a/x11/tk/patches/patch-ac
+++ b/x11/tk/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.16 2006/11/02 17:42:03 adam Exp $
+$NetBSD: patch-ac,v 1.17 2007/05/31 13:02:06 adam Exp $
 
---- unix/tcl.m4.orig	2006-10-19 19:27:34.000000000 +0200
+--- unix/tcl.m4.orig	2007-05-25 18:09:54.000000000 +0200
 +++ unix/tcl.m4
 @@ -1033,6 +1033,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
      # Step 3: set configuration options based on system name and version.
@@ -10,7 +10,7 @@ $NetBSD: patch-ac,v 1.16 2006/11/02 17:42:03 adam Exp $
      LDFLAGS_ORIG="$LDFLAGS"
      TCL_EXPORT_FILE_SUFFIX=""
      UNSHARED_LIB_SUFFIX=""
-@@ -1280,6 +1281,9 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1284,6 +1285,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.16 2006/11/02 17:42:03 adam Exp $
  	    ;;
  	IRIX-6.*)
  	    SHLIB_CFLAGS=""
-@@ -1305,6 +1309,9 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1309,6 +1313,9 @@ dnl AC_CHECK_TOOL(AR, ar)
  		esac
  		LDFLAGS="$LDFLAGS -n32"
  	    fi
@@ -30,7 +30,7 @@ $NetBSD: patch-ac,v 1.16 2006/11/02 17:42:03 adam Exp $
  	    ;;
  	IRIX64-6.*)
  	    SHLIB_CFLAGS=""
-@@ -1328,6 +1335,9 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1332,6 +1339,9 @@ dnl AC_CHECK_TOOL(AR, ar)
  	            LDFLAGS="$LDFLAGS -64"
  	        fi
  	    fi
@@ -40,7 +40,7 @@ $NetBSD: patch-ac,v 1.16 2006/11/02 17:42:03 adam Exp $
  	    ;;
  	Linux*)
  	    SHLIB_CFLAGS="-fPIC"
-@@ -1373,6 +1383,9 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1388,6 +1398,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.16 2006/11/02 17:42:03 adam Exp $
  	    ;;
  	GNU*)
  	    SHLIB_CFLAGS="-fPIC"
-@@ -1432,23 +1445,27 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1447,23 +1460,27 @@ dnl AC_CHECK_TOOL(AR, ar)
  	    LD_SEARCH_FLAGS=""
  	    ;;
  	NetBSD-*|FreeBSD-[[1-2]].*)
@@ -80,7 +80,7 @@ $NetBSD: patch-ac,v 1.16 2006/11/02 17:42:03 adam Exp $
  		if test $tcl_cv_ld_elf = yes; then
  		    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
  		else
-@@ -1881,6 +1898,9 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1923,6 +1940,9 @@ dnl AC_CHECK_TOOL(AR, ar)
  		CC_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}'
  		LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}'
  	    fi
@@ -90,7 +90,7 @@ $NetBSD: patch-ac,v 1.16 2006/11/02 17:42:03 adam Exp $
  	    ;;
  	ULTRIX-4.*)
  	    SHLIB_CFLAGS="-G 0"
-@@ -2059,8 +2079,8 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -2107,8 +2127,8 @@ dnl # preprocessing tests use only CPPFL
  
      if test "${SHARED_BUILD}" = "1" && test "${SHLIB_SUFFIX}" != "" ; then
          LIB_SUFFIX=${SHARED_LIB_SUFFIX}
@@ -101,7 +101,7 @@ $NetBSD: patch-ac,v 1.16 2006/11/02 17:42:03 adam Exp $
      else
          LIB_SUFFIX=${UNSHARED_LIB_SUFFIX}
  
-@@ -2090,10 +2110,10 @@ dnl        esac
+@@ -2138,10 +2158,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 67bd8d6a3b2..e3afe578ccc 100644
--- a/x11/tk/patches/patch-ad
+++ b/x11/tk/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.10 2006/11/02 17:42:03 adam Exp $
+$NetBSD: patch-ad,v 1.11 2007/05/31 13:02:06 adam Exp $
 
---- unix/configure.in.orig	2006-10-19 19:27:34.000000000 +0200
+--- unix/configure.in.orig	2007-05-25 18:09:53.000000000 +0200
 +++ unix/configure.in
-@@ -302,6 +302,10 @@ if test "x${x_libraries}" != "x"; then
+@@ -301,6 +301,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'`