Changes 8.6.6:

Bug-fix release.

10 files changed, 86 insertions, 95 deletions

diff --git a/lang/tcl/Makefile b/lang/tcl/Makefile
index 7a9d90f3384..f28eac3b483 100644
--- a/lang/tcl/Makefile
+++ b/lang/tcl/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.90 2016/04/11 19:01:55 ryoon Exp $
+# $NetBSD: Makefile,v 1.91 2016/09/03 11:58:01 adam Exp $
 
 DISTNAME=	tcl${TCL_VERSION}-src
 PKGNAME=	tcl-${TCL_VERSION}
-PKGREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=tcl/}
 
@@ -55,13 +54,13 @@ SUBST_SED.sqllink=	-e "/LIBS=/s|-lsqlite3|-L${BUILDLINK_PREFIX.sqlite3}/lib ${CO
 
 .if ${OPSYS} == "Darwin"
 post-build:
-.  for lib in itcl4.0.4/libitcl4.0.4.dylib \
-	      sqlite3.11.0/libsqlite3.11.0.dylib \
+.  for lib in itcl4.0.5/libitcl4.0.5.dylib \
+	      sqlite3.13.0/libsqlite3.13.0.dylib \
 	      tdbc1.0.4/libtdbc1.0.4.dylib \
 	      tdbcmysql1.0.4/libtdbcmysql1.0.4.dylib \
 	      tdbcodbc1.0.4/libtdbcodbc1.0.4.dylib \
 	      tdbcpostgres1.0.4/libtdbcpostgres1.0.4.dylib \
-	      thread2.7.3/libthread2.7.3.dylib
+	      thread2.8.0/libthread2.8.0.dylib
 	install_name_tool -id ${PREFIX}/lib/${lib} ${WRKSRC}/unix/pkgs/${lib}
 .  endfor
 .endif
diff --git a/lang/tcl/Makefile.version b/lang/tcl/Makefile.version
index cd2f07b2bc8..02a931a32ac 100644
--- a/lang/tcl/Makefile.version
+++ b/lang/tcl/Makefile.version
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.version,v 1.18 2016/03/06 11:47:49 adam Exp $
+# $NetBSD: Makefile.version,v 1.19 2016/09/03 11:58:01 adam Exp $
 # used by cad/xcircuit/Makefile
 # used by devel/tcl-tclcl/Makefile
 # used by lang/tcl/Makefile
@@ -7,4 +7,4 @@
 
 TCL_SONUM=	86
 TCL_BASEVER=	8.6
-TCL_VERSION=	8.6.5
+TCL_VERSION=	8.6.6
diff --git a/lang/tcl/PLIST b/lang/tcl/PLIST
index 1e3f08d28dd..979acb60e48 100644
--- a/lang/tcl/PLIST
+++ b/lang/tcl/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2016/03/06 11:47:49 adam Exp $
+@comment $NetBSD: PLIST,v 1.20 2016/09/03 11:58:01 adam Exp $
 bin/sqlite3_analyzer
 bin/tclsh
 bin/tclsh${BASEVER}
@@ -36,6 +36,7 @@ include/tcl/generic/tclParse.h
 include/tcl/generic/tclPlatDecls.h
 include/tcl/generic/tclPort.h
 include/tcl/generic/tclRegexp.h
+include/tcl/generic/tclStringRep.h
 include/tcl/generic/tclStringTrim.h
 include/tcl/generic/tclTomMath.h
 include/tcl/generic/tclTomMathDecls.h
@@ -51,20 +52,20 @@ include/tclThread.h
 include/tdbc.h
 include/tdbcDecls.h
 include/tdbcInt.h
-lib/itcl4.0.4/itcl.tcl
-lib/itcl4.0.4/itclConfig.sh
-lib/itcl4.0.4/itclHullCmds.tcl
-lib/itcl4.0.4/itclWidget.tcl
-lib/itcl4.0.4/libitcl4.0.4.so
-lib/itcl4.0.4/libitclstub4.0.4.a
-lib/itcl4.0.4/pkgIndex.tcl
+lib/itcl4.0.5/itcl.tcl
+lib/itcl4.0.5/itclConfig.sh
+lib/itcl4.0.5/itclHullCmds.tcl
+lib/itcl4.0.5/itclWidget.tcl
+lib/itcl4.0.5/libitcl4.0.5.so
+lib/itcl4.0.5/libitclstub4.0.5.a
+lib/itcl4.0.5/pkgIndex.tcl
 lib/libtcl${SONUM}.a
 lib/libtcl${SONUM}.so
 lib/libtcl${SONUM}.so.1.0
 lib/libtclstub${SONUM}.a
 lib/pkgconfig/tcl.pc
-lib/sqlite3.11.0/libsqlite3.11.0.so
-lib/sqlite3.11.0/pkgIndex.tcl
+lib/sqlite3.11.0/libsqlite3.13.0.so
+lib/sqlite3.13.0/pkgIndex.tcl
 lib/tcl${BASEVER}/auto.tcl
 lib/tcl${BASEVER}/clock.tcl
 lib/tcl${BASEVER}/encoding/ascii.enc
@@ -291,16 +292,14 @@ lib/tcl${BASEVER}/shell1.1/pkgIndex.tcl
 lib/tcl${BASEVER}/shell1.1/shell.tcl
 lib/tcl${BASEVER}/tclAppInit.c
 lib/tcl${BASEVER}/tclIndex
-lib/tcl${BASEVER}/tcltest2.3/tcltest.tcl
-lib/tcl${BASEVER}/tcltest2.3/pkgIndex.tcl
+lib/tcl${BASEVER}/tcltest2.4/tcltest.tcl
+lib/tcl${BASEVER}/tcltest2.4/pkgIndex.tcl
 lib/tcl${BASEVER}/tm.tcl
 lib/tcl${BASEVER}/word.tcl
-lib/tcl8.6/msgcat1.6/msgcat.tcl
-lib/tcl8.6/msgcat1.6/pkgIndex.tcl
 lib/tcl8/8.4/platform-1.0.14.tm
 lib/tcl8/8.4/platform/shell-1.1.4.tm
 lib/tcl8/8.5/msgcat-1.6.0.tm
-lib/tcl8/8.5/tcltest-2.3.8.tm
+lib/tcl8/8.5/tcltest-2.4.0.tm
 lib/tcl8/8.6/http-2.8.9.tm
 lib/tcl8/8.6/tdbc/sqlite3-1.0.4.tm
 lib/tclConfig.sh
@@ -319,9 +318,9 @@ lib/tdbcodbc1.0.4/tdbcodbc.tcl
 lib/tdbcpostgres1.0.4/libtdbcpostgres1.0.4.so
 lib/tdbcpostgres1.0.4/pkgIndex.tcl
 lib/tdbcpostgres1.0.4/tdbcpostgres.tcl
-lib/thread2.7.3/libthread2.7.3.so
-lib/thread2.7.3/pkgIndex.tcl
-lib/thread2.7.3/ttrace.tcl
+lib/thread2.8.0/libthread2.8.0.so
+lib/thread2.8.0/pkgIndex.tcl
+lib/thread2.8.0/ttrace.tcl
 man/man1/tclsh.1
 man/man3/TCL_MEM_DEBUG.3
 man/man3/Tcl_Access.3
diff --git a/lang/tcl/distinfo b/lang/tcl/distinfo
index 36b6e18beb4..15bf4f84470 100644
--- a/lang/tcl/distinfo
+++ b/lang/tcl/distinfo
@@ -1,23 +1,23 @@
-$NetBSD: distinfo,v 1.68 2016/03/06 11:47:49 adam Exp $
+$NetBSD: distinfo,v 1.69 2016/09/03 11:58:01 adam Exp $
 
-SHA1 (tcl8.6.5-src.tar.gz) = c3a50ea58dac00a3c7e83cb4a4651c40d0f55160
-RMD160 (tcl8.6.5-src.tar.gz) = 6c31d99775fb7b2c7aeb0d0fb20f2796d75215c2
-SHA512 (tcl8.6.5-src.tar.gz) = e58177728eea14df0492f9e3ec20ce5ad53150954ea901f0f337ac07d5b2d2196709f1364d94104043b0f2939eeb7296888a3b6d4f92df209b5c6174638f039f
-Size (tcl8.6.5-src.tar.gz) = 9398130 bytes
-SHA1 (patch-generic_tclInt.h) = 13289d8fcf5021898b06a9608bc05fc968a1ba5c
+SHA1 (tcl8.6.6-src.tar.gz) = 169dd1589cad62c9fac4257c113db245da502cd0
+RMD160 (tcl8.6.6-src.tar.gz) = 2386a69eb841f8af51c1b124f68e0b812a225cca
+SHA512 (tcl8.6.6-src.tar.gz) = b8e707470655ceef2ef385b8a2e617c1c0ebced577732d1f5e818cd7295ca25da491b6024047cae2aff754d27e00d646f830c2049b96f306ac96bc69b02da7b0
+Size (tcl8.6.6-src.tar.gz) = 9553805 bytes
+SHA1 (patch-generic_tclInt.h) = fde6a5458a138b6d61fdbab1269b1c5111a28b22
 SHA1 (patch-generic_tclPort.h) = 36ff05b22591d588952e55d0f13c2ef52e371d1e
 SHA1 (patch-generic_tclPosixStr.c) = 68da211865282fe7124cad71381658f8dfb986d6
-SHA1 (patch-pkgs_itcl4.0.4_configure) = 29ecea7c992486dfa86305bddf4be4bf1c9dd2c1
-SHA1 (patch-pkgs_sqlite3.11.0_Makefile.in) = 33e2aefcd0e85ee14c4913280b317205e82e15b8
-SHA1 (patch-pkgs_sqlite3.11.0_configure) = 5a02597479936a844f04501d2bc76979e7c669f7
+SHA1 (patch-pkgs_itcl4.0.5_configure) = 8c48062e1f90f3843b6adcf2b5d61fa40b80f6e2
+SHA1 (patch-pkgs_sqlite3.13.0_Makefile.in) = 1205936335cda5d413c24da33608a9bbec6a65a9
+SHA1 (patch-pkgs_sqlite3.13.0_configure) = 80a40d46ffe693ed431c10a48a82401ba7707549
 SHA1 (patch-pkgs_tdbc1.0.4_configure) = 058f0ec3a6cf506c1998a30a81364f7856d17508
 SHA1 (patch-pkgs_tdbcmysql1.0.4_configure) = e633bb54d886f72dae485c2110488bb1441c965b
 SHA1 (patch-pkgs_tdbcodbc1.0.4_configure) = 5e93d9edc663f31e714726b4e3f9f4af6221fac8
 SHA1 (patch-pkgs_tdbcpostgres1.0.4_configure) = 182a106fd8559d08bb4d8d611972473640e9838a
-SHA1 (patch-pkgs_thread2.7.3_configure) = b7834c89b1dbad3aff82ab77434883e297466dc9
+SHA1 (patch-pkgs_thread2.8.0_configure) = 0dfc552a4cbce2e100c640722ec9837f02226819
 SHA1 (patch-tests_load.test) = 438695ab76e01646e49aadc01c44344a5495eabb
 SHA1 (patch-tests_pkgMkIndex.test) = 70d1042c1f4743052c5fa191fa7c4732a08e28a2
-SHA1 (patch-unix_Makefile.in) = d074b0e93c915be137f537050a80c549c9808b72
+SHA1 (patch-unix_Makefile.in) = 6fa60e07f21842e987bc20d23d4be82cba5bc905
 SHA1 (patch-unix_configure) = 497eebc6dfa614647a400c94847f5fdb82d6e361
 SHA1 (patch-unix_tclConfig.sh.in) = 341ac4f1bbfb29551dea87ade98b3b7b59652a31
 SHA1 (patch-unix_tclUnixCompat.c) = 7ffa40a1a56345f5b86cd896e8e3b0d5748d8c5e
diff --git a/lang/tcl/patches/patch-generic_tclInt.h b/lang/tcl/patches/patch-generic_tclInt.h
index 728e5fec410..d07fcafbc35 100644
--- a/lang/tcl/patches/patch-generic_tclInt.h
+++ b/lang/tcl/patches/patch-generic_tclInt.h
@@ -1,27 +1,21 @@
-$NetBSD: patch-generic_tclInt.h,v 1.1 2012/08/21 21:31:47 marino Exp $
+$NetBSD: patch-generic_tclInt.h,v 1.2 2016/09/03 11:58:01 adam Exp $
 
---- generic/tclInt.h.orig	2012-07-16 11:57:05.000000000 +0000
+--- generic/tclInt.h.orig	2016-07-11 11:51:23.000000000 +0000
 +++ generic/tclInt.h
-@@ -38,21 +38,9 @@
+@@ -38,16 +38,8 @@
  #include <stdio.h>
  
  #include <ctype.h>
 -#ifdef NO_STDLIB_H
 -#   include "../compat/stdlib.h"
 -#else
--#   include <stdlib.h>
+ #   include <stdlib.h>
 -#endif
 -#ifdef NO_STRING_H
 -#include "../compat/string.h"
 -#else
-+#include <stdlib.h>
  #include <string.h>
 -#endif
--#ifdef STDC_HEADERS
+ #if defined(STDC_HEADERS) || defined(__STDC__) || defined(__C99__FUNC__) \
+      || defined(__cplusplus) || defined(_MSC_VER)
  #include <stddef.h>
--#else
--typedef int ptrdiff_t;
--#endif
- 
- /*
-  * Ensure WORDS_BIGENDIAN is defined correctly:
diff --git a/lang/tcl/patches/patch-pkgs_itcl4.0.4_configure b/lang/tcl/patches/patch-pkgs_itcl4.0.5_configure
index f2aea3688a5..d9451e8fa69 100644
--- a/lang/tcl/patches/patch-pkgs_itcl4.0.4_configure
+++ b/lang/tcl/patches/patch-pkgs_itcl4.0.5_configure
@@ -1,10 +1,10 @@
-$NetBSD: patch-pkgs_itcl4.0.4_configure,v 1.1 2016/03/06 11:47:49 adam Exp $
+$NetBSD: patch-pkgs_itcl4.0.5_configure,v 1.1 2016/09/03 11:58:01 adam Exp $
 
 Add support for DragonFly.
 
---- pkgs/itcl4.0.4/configure.orig	2016-02-11 21:01:59.000000000 +0000
-+++ pkgs/itcl4.0.4/configure
-@@ -7397,8 +7397,7 @@ fi
+--- pkgs/itcl4.0.5/configure.orig	2016-07-12 15:29:40.000000000 +0000
++++ pkgs/itcl4.0.5/configure
+@@ -7443,8 +7443,7 @@ fi
  		    CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
  fi
  		LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
@@ -14,7 +14,7 @@ Add support for DragonFly.
  		;;
  	    esac
  	    case "$arch" in
-@@ -7418,8 +7417,6 @@ fi
+@@ -7464,8 +7463,6 @@ fi
  
  fi
  	    # OpenBSD doesn't do version numbers with dots.
@@ -23,7 +23,7 @@ Add support for DragonFly.
  	    ;;
  	NetBSD-*)
  	    # NetBSD has ELF and can use 'cc -shared' to build shared libs
-@@ -7441,7 +7438,7 @@ fi
+@@ -7487,7 +7484,7 @@ fi
  
  fi
  	    ;;
@@ -32,7 +32,7 @@ Add support for DragonFly.
  	    # This configuration from FreeBSD Ports.
  	    SHLIB_CFLAGS="-fPIC"
  	    SHLIB_LD="${CC} -shared"
-@@ -7463,10 +7460,6 @@ fi
+@@ -7509,10 +7506,6 @@ fi
  	    case $system in
  	    FreeBSD-3.*)
  		# Version numbers are dot-stripped by system policy.
@@ -43,7 +43,7 @@ Add support for DragonFly.
  		;;
  	    esac
  	    ;;
-@@ -8077,7 +8070,7 @@ fi
+@@ -8123,7 +8116,7 @@ fi
  	    BSD/OS*) ;;
  	    CYGWIN_*|MINGW32_*) ;;
  	    IRIX*) ;;
diff --git a/lang/tcl/patches/patch-pkgs_sqlite3.11.0_Makefile.in b/lang/tcl/patches/patch-pkgs_sqlite3.13.0_Makefile.in
index 1511f53f02e..cf2e2b9e84b 100644
--- a/lang/tcl/patches/patch-pkgs_sqlite3.11.0_Makefile.in
+++ b/lang/tcl/patches/patch-pkgs_sqlite3.13.0_Makefile.in
@@ -1,9 +1,9 @@
-$NetBSD: patch-pkgs_sqlite3.11.0_Makefile.in,v 1.1 2016/03/06 11:47:49 adam Exp $
+$NetBSD: patch-pkgs_sqlite3.13.0_Makefile.in,v 1.1 2016/09/03 11:58:01 adam Exp $
 
 Fix building with system sqlite3.
 
---- pkgs/sqlite3.11.0/Makefile.in.orig	2016-03-06 11:25:44.000000000 +0000
-+++ pkgs/sqlite3.11.0/Makefile.in
+--- pkgs/sqlite3.13.0/Makefile.in.orig	2016-01-07 15:38:22.000000000 +0000
++++ pkgs/sqlite3.13.0/Makefile.in
 @@ -150,7 +150,7 @@ SHARED_BUILD	= @SHARED_BUILD@
  INCLUDES	= @PKG_INCLUDES@ @TCL_INCLUDES@ -I$(srcdir)/..
  #INCLUDES	= @PKG_INCLUDES@ @TCL_INCLUDES@ @TK_INCLUDES@ @TK_XINCLUDES@
diff --git a/lang/tcl/patches/patch-pkgs_sqlite3.11.0_configure b/lang/tcl/patches/patch-pkgs_sqlite3.13.0_configure
index 58bd877c7f3..20c15f8f1a8 100644
--- a/lang/tcl/patches/patch-pkgs_sqlite3.11.0_configure
+++ b/lang/tcl/patches/patch-pkgs_sqlite3.13.0_configure
@@ -1,20 +1,19 @@
-$NetBSD: patch-pkgs_sqlite3.11.0_configure,v 1.1 2016/03/06 11:47:49 adam Exp $
+$NetBSD: patch-pkgs_sqlite3.13.0_configure,v 1.1 2016/09/03 11:58:01 adam Exp $
 
 Add support for DragonFly.
 
---- pkgs/sqlite3.11.0/configure.orig	2016-02-16 18:34:47.000000000 +0000
-+++ pkgs/sqlite3.11.0/configure
-@@ -7361,8 +7361,7 @@ fi
- 		    CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
+--- pkgs/sqlite3.13.0/configure.orig	2016-05-31 15:48:11.000000000 +0000
++++ pkgs/sqlite3.13.0/configure
+@@ -7290,7 +7290,7 @@ fi
  fi
  		LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
--		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so${SHLIB_VERSION}'
+ 		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.${SHLIB_VERSION}'
 -		LDFLAGS="-Wl,-export-dynamic"
 +		LDFLAGS="-Wl,--export-dynamic"
  		;;
  	    esac
  	    case "$arch" in
-@@ -7382,8 +7381,6 @@ fi
+@@ -7310,8 +7310,6 @@ fi
  
  fi
  	    # OpenBSD doesn't do version numbers with dots.
@@ -23,7 +22,7 @@ Add support for DragonFly.
  	    ;;
  	NetBSD-*)
  	    # NetBSD has ELF and can use 'cc -shared' to build shared libs
-@@ -7405,7 +7402,7 @@ fi
+@@ -7333,7 +7331,7 @@ fi
  
  fi
  	    ;;
@@ -32,18 +31,18 @@ Add support for DragonFly.
  	    # This configuration from FreeBSD Ports.
  	    SHLIB_CFLAGS="-fPIC"
  	    SHLIB_LD="${CC} -shared"
-@@ -7427,10 +7424,6 @@ fi
+@@ -7356,10 +7354,6 @@ fi
  	    case $system in
  	    FreeBSD-3.*)
  		# Version numbers are dot-stripped by system policy.
--		TCL_TRIM_DOTS=`echo ${PACKAGE_VERSION} | tr -d .`
+-		TCL_TRIM_DOTS=`echo ${VERSION} | tr -d .`
 -		UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
--		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'
+-		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so'
 -		TCL_LIB_VERSIONS_OK=nodots
  		;;
  	    esac
  	    ;;
-@@ -8041,7 +8034,7 @@ fi
+@@ -7970,7 +7964,7 @@ fi
  	    BSD/OS*) ;;
  	    CYGWIN_*|MINGW32_*) ;;
  	    IRIX*) ;;
diff --git a/lang/tcl/patches/patch-pkgs_thread2.7.3_configure b/lang/tcl/patches/patch-pkgs_thread2.8.0_configure
index 36e25265d01..dab1b522393 100644
--- a/lang/tcl/patches/patch-pkgs_thread2.7.3_configure
+++ b/lang/tcl/patches/patch-pkgs_thread2.8.0_configure
@@ -1,11 +1,11 @@
-$NetBSD: patch-pkgs_thread2.7.3_configure,v 1.1 2016/03/06 11:47:49 adam Exp $
+$NetBSD: patch-pkgs_thread2.8.0_configure,v 1.1 2016/09/03 11:58:01 adam Exp $
 
 Add support for DragonFly.
 
---- pkgs/thread2.7.3/configure.orig	2016-01-28 17:45:52.000000000 +0000
-+++ pkgs/thread2.7.3/configure
-@@ -9315,7 +9315,7 @@ fi
- 
+--- pkgs/thread2.8.0/configure.orig	2016-07-05 13:37:40.000000000 +0000
++++ pkgs/thread2.8.0/configure
+@@ -7520,7 +7520,7 @@ fi
+ fi
  		LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
  		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so${SHLIB_VERSION}'
 -		LDFLAGS="-Wl,-export-dynamic"
@@ -13,25 +13,25 @@ Add support for DragonFly.
  		;;
  	    esac
  	    case "$arch" in
-@@ -9336,8 +9336,6 @@ fi
- fi
+@@ -7540,8 +7540,6 @@ fi
  
+ fi
  	    # OpenBSD doesn't do version numbers with dots.
 -	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
 -	    TCL_LIB_VERSIONS_OK=nodots
  	    ;;
  	NetBSD-*)
  	    # NetBSD has ELF and can use 'cc -shared' to build shared libs
-@@ -9361,7 +9359,7 @@ fi
- fi
+@@ -7563,7 +7561,7 @@ fi
  
+ fi
  	    ;;
 -	FreeBSD-*)
 +	FreeBSD-*|DragonFly-*)
  	    # This configuration from FreeBSD Ports.
  	    SHLIB_CFLAGS="-fPIC"
  	    SHLIB_LD="${CC} -shared"
-@@ -9385,10 +9383,6 @@ fi
+@@ -7585,10 +7583,6 @@ fi
  	    case $system in
  	    FreeBSD-3.*)
  		# Version numbers are dot-stripped by system policy.
@@ -42,7 +42,7 @@ Add support for DragonFly.
  		;;
  	    esac
  	    ;;
-@@ -10239,7 +10233,7 @@ fi
+@@ -8199,7 +8193,7 @@ fi
  	    BSD/OS*) ;;
  	    CYGWIN_*|MINGW32_*) ;;
  	    IRIX*) ;;
diff --git a/lang/tcl/patches/patch-unix_Makefile.in b/lang/tcl/patches/patch-unix_Makefile.in
index bd6c8c8bad2..32d68594b07 100644
--- a/lang/tcl/patches/patch-unix_Makefile.in
+++ b/lang/tcl/patches/patch-unix_Makefile.in
@@ -1,8 +1,8 @@
-$NetBSD: patch-unix_Makefile.in,v 1.10 2016/03/06 11:47:49 adam Exp $
+$NetBSD: patch-unix_Makefile.in,v 1.11 2016/09/03 11:58:01 adam Exp $
 
 Honour LDFLAGS.
 
---- unix/Makefile.in.orig	2014-11-12 02:36:22.000000000 +0000
+--- unix/Makefile.in.orig	2016-07-26 14:07:18.000000000 +0000
 +++ unix/Makefile.in
 @@ -8,6 +8,7 @@ VERSION 		= @TCL_VERSION@
  MAJOR_VERSION		= @TCL_MAJOR_VERSION@
@@ -21,7 +21,7 @@ Honour LDFLAGS.
  
  # Path to the private tcl header dir:
  PRIVATE_INCLUDE_DIR	= @PRIVATE_INCLUDE_DIR@
-@@ -103,7 +106,7 @@ CFLAGS_OPTIMIZE		= -DNDEBUG @CFLAGS_OPTI
+@@ -103,7 +106,7 @@ CFLAGS_OPTIMIZE		= @CFLAGS_OPTIMIZE@
  #CFLAGS			= $(CFLAGS_DEBUG)
  #CFLAGS			= $(CFLAGS_OPTIMIZE)
  #CFLAGS			= $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE)
@@ -68,7 +68,7 @@ Honour LDFLAGS.
  # Make target which outputs the list of the .o contained in the Tcl lib useful
  # to build a single big shared library containing Tcl and other extensions.
  # Used for the Tcl Plugin.  -- dl
-@@ -799,9 +808,16 @@ install-binaries: binaries
+@@ -795,9 +804,16 @@ install-binaries: binaries
  	    done;
  	@echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/"
  	@@INSTALL_LIB@
@@ -86,7 +86,7 @@ Honour LDFLAGS.
  	@echo "Installing tclConfig.sh to $(CONFIG_INSTALL_DIR)/"
  	@$(INSTALL_DATA) tclConfig.sh "$(CONFIG_INSTALL_DIR)/tclConfig.sh"
  	@echo "Installing tclooConfig.sh to $(CONFIG_INSTALL_DIR)/"
-@@ -825,7 +841,7 @@ install-libraries: libraries
+@@ -821,7 +837,7 @@ install-libraries: libraries
  		else true; \
  		fi; \
  	    done;
@@ -95,7 +95,7 @@ Honour LDFLAGS.
  	    do \
  	    if [ ! -d "$(SCRIPT_INSTALL_DIR)"/$$i ] ; then \
  		echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \
-@@ -846,6 +862,8 @@ install-libraries: libraries
+@@ -842,6 +858,8 @@ install-libraries: libraries
  	    done;
  	@echo "Installing package http 2.8.9 as a Tcl Module";
  	@$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.6/http-2.8.9.tm;
@@ -104,16 +104,16 @@ Honour LDFLAGS.
  	@echo "Installing package opt0.4 files to $(SCRIPT_INSTALL_DIR)/opt0.4/";
  	@for i in $(TOP_DIR)/library/opt/*.tcl ; \
  	    do \
-@@ -853,13 +871,21 @@ install-libraries: libraries
+@@ -849,13 +867,21 @@ install-libraries: libraries
  	    done;
  	@echo "Installing package msgcat 1.6.0 as a Tcl Module";
  	@$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/msgcat-1.6.0.tm;
 +	@$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/msgcat1.6/msgcat.tcl;
 +	@$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/pkgIndex.tcl "$(SCRIPT_INSTALL_DIR)"/msgcat1.6/pkgIndex.tcl;
- 	@echo "Installing package tcltest 2.3.8 as a Tcl Module";
- 	@$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/tcltest-2.3.8.tm;
-+	@$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/tcltest2.3/tcltest.tcl;
-+	@$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/pkgIndex.tcl "$(SCRIPT_INSTALL_DIR)"/tcltest2.3/pkgIndex.tcl;
+ 	@echo "Installing package tcltest 2.4.0 as a Tcl Module";
+ 	@$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/tcltest-2.4.0.tm;
++	@$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/tcltest2.4/tcltest.tcl;
++	@$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/pkgIndex.tcl "$(SCRIPT_INSTALL_DIR)"/tcltest2.4/pkgIndex.tcl;
  
  	@echo "Installing package platform 1.0.14 as a Tcl Module";
  	@$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform-1.0.14.tm;
@@ -126,7 +126,7 @@ Honour LDFLAGS.
  
  	@echo "Installing encoding files to $(SCRIPT_INSTALL_DIR)/encoding/";
  	@for i in $(TOP_DIR)/library/encoding/*.enc ; do \
-@@ -944,7 +970,7 @@ install-doc: doc
+@@ -940,7 +966,7 @@ install-doc: doc
  	done
  
  install-headers:
@@ -135,7 +135,7 @@ Honour LDFLAGS.
  	    do \
  	    if [ ! -d "$$i" ] ; then \
  		echo "Making directory $$i"; \
-@@ -953,13 +979,17 @@ install-headers:
+@@ -949,13 +975,17 @@ install-headers:
  		fi; \
  	    done;
  	@echo "Installing header files to $(INCLUDE_INSTALL_DIR)/";