tcl/tk: updated to 8.6.10

Changes in Tcl/Tk 8.6.10 Tcl Changes New unsupported commands tcl::unsupported::timerate tcl::unsupported::corotype Tk Changes New Commands tk::mac::PerformService tk::mac::LaunchURL tk::mac::GetAppPath tk::mac::PrintDocument Expanded Syntax / New Options menubutton post x y index combobox current end Updated packages http 2.9.1 Itcl 4.2.0 Thread 2.8.5 sqlite 3.30.1 tdbc 1.1.1
author: adam <adam@pkgsrc.org> 2020-04-16 17:07:07 +0000
committer: adam <adam@pkgsrc.org> 2020-04-16 17:07:07 +0000
commit: c3e9a4dd7bb35f5cbbb3ef960570933b4e427466 (patch)
tree: 25bda357476e187ff769e9c4d99978b15c52afbc /lang/tcl
parent: 89a371814cdfc06ecd43d297e26541ab1ce6a628 (diff)
download: pkgsrc-c3e9a4dd7bb35f5cbbb3ef960570933b4e427466.tar.gz
16 files changed, 146 insertions, 149 deletions
diff --git a/lang/tcl/Makefile b/lang/tcl/Makefile
index bdb0f79469e..f0646ad085e 100644
--- a/lang/tcl/Makefile
+++ b/lang/tcl/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.109 2020/04/12 08:28:55 adam Exp $
+# $NetBSD: Makefile,v 1.110 2020/04/16 17:07:07 adam Exp $
 
 DISTNAME=	tcl${TCL_VERSION}-src
 PKGNAME=	tcl-${TCL_VERSION}
-PKGREVISION=	3
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=tcl/}
 
diff --git a/lang/tcl/Makefile.version b/lang/tcl/Makefile.version
index 34e8224f78d..1d334e84709 100644
--- a/lang/tcl/Makefile.version
+++ b/lang/tcl/Makefile.version
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.version,v 1.25 2019/11/03 19:04:09 rillig Exp $
+# $NetBSD: Makefile.version,v 1.26 2020/04/16 17:07:07 adam Exp $
 # used by cad/xcircuit/Makefile
 # used by devel/tcl-tclcl/Makefile
 # used by lang/tcl/Makefile
@@ -7,10 +7,10 @@
 
 TCL_SONUM=	86
 TCL_BASEVER=	8.6
-TCL_VERSION=	8.6.9
+TCL_VERSION=	8.6.10
 
 # Update bundled versions in lang/tcl/buildlink3.mk
-ITCL_VERSION=		4.1.2
-SQLITE3_VERSION=	3.25.3
-TDBC_VERSION=		1.1.0
-THREAD_VERSION=		2.8.4
+ITCL_VERSION=		4.2.0
+SQLITE3_VERSION=	3.30.1.2
+TDBC_VERSION=		1.1.1
+THREAD_VERSION=		2.8.5
diff --git a/lang/tcl/PLIST b/lang/tcl/PLIST
index 3bca2951632..ac28a7c97a5 100644
--- a/lang/tcl/PLIST
+++ b/lang/tcl/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.25 2018/12/09 18:33:55 adam Exp $
+@comment $NetBSD: PLIST,v 1.26 2020/04/16 17:07:07 adam Exp $
 bin/sqlite3_analyzer
 bin/tclsh
 bin/tclsh${BASEVER}
@@ -299,8 +299,8 @@ lib/tcl${BASEVER}/word.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.1.tm
-lib/tcl8/8.5/tcltest-2.5.0.tm
-lib/tcl8/8.6/http-2.9.0.tm
+lib/tcl8/8.5/tcltest-2.5.1.tm
+lib/tcl8/8.6/http-2.9.1.tm
 lib/tcl8/8.6/tdbc/sqlite3-${TDBC_VERSION}.tm
 lib/tclConfig.sh
 lib/tclooConfig.sh
@@ -322,6 +322,9 @@ lib/thread${THREAD_VERSION}/libthread${THREAD_VERSION}.so
 lib/thread${THREAD_VERSION}/pkgIndex.tcl
 lib/thread${THREAD_VERSION}/ttrace.tcl
 man/man1/tclsh.1
+man/man3/DString.3
+man/man3/Notifier.3
+man/man3/RegExp.3
 man/man3/TCL_MEM_DEBUG.3
 man/man3/Tcl_Access.3
 man/man3/Tcl_AddErrorInfo.3
@@ -970,6 +973,7 @@ man/man3/Tcl_ZlibStreamGetCommandName.3
 man/man3/Tcl_ZlibStreamInit.3
 man/man3/Tcl_ZlibStreamPut.3
 man/man3/Tdbc_Init.3
+man/man3/Thread.3
 man/man3/attemptckalloc.3
 man/man3/attemptckrealloc.3
 man/man3/ckalloc.3
@@ -1051,6 +1055,7 @@ man/mann/itclwidget.n
 man/mann/join.n
 man/mann/lappend.n
 man/mann/lassign.n
+man/mann/library.n
 man/mann/lindex.n
 man/mann/linsert.n
 man/mann/list.n
@@ -1080,8 +1085,10 @@ man/mann/oo_objdefine.n
 man/mann/oo_object.n
 man/mann/open.n
 man/mann/package.n
+man/mann/packagens.n
 man/mann/parray.n
 man/mann/pid.n
+man/mann/pkgMkIndex.n
 man/mann/pkg_create.n
 man/mann/pkg_mkIndex.n
 man/mann/platform.n
@@ -1145,6 +1152,7 @@ man/mann/tell.n
 man/mann/thread.n
 man/mann/throw.n
 man/mann/time.n
+man/mann/timerate.n
 man/mann/tm.n
 man/mann/tpool.n
 man/mann/trace.n
diff --git a/lang/tcl/buildlink3.mk b/lang/tcl/buildlink3.mk
index 08a0e3337d1..763a660fd7e 100644
--- a/lang/tcl/buildlink3.mk
+++ b/lang/tcl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.31 2018/12/09 18:33:55 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.32 2020/04/16 17:07:07 adam Exp $
 
 BUILDLINK_TREE+=	tcl
 
@@ -22,8 +22,8 @@ _TOOLS_USE_PKGSRC.tclsh=	yes
 TCLCONFIG_SH?=		${BUILDLINK_PREFIX.tcl}/lib/tclConfig.sh
 TCLSH=			${BUILDLINK_PREFIX.tcl}/bin/tclsh
 # Bundled library
-ITCL_VERSION=		4.1.2
-TDBC_VERSION=		1.1.0
+ITCL_VERSION=		4.2.0
+TDBC_VERSION=		1.1.1
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"
diff --git a/lang/tcl/distinfo b/lang/tcl/distinfo
index be9804912d4..a6a55ca133c 100644
--- a/lang/tcl/distinfo
+++ b/lang/tcl/distinfo
@@ -1,24 +1,24 @@
-$NetBSD: distinfo,v 1.77 2018/12/09 18:33:55 adam Exp $
+$NetBSD: distinfo,v 1.78 2020/04/16 17:07:07 adam Exp $
 
-SHA1 (tcl8.6.9-src.tar.gz) = 861c5c8bbce9eda892c5e63b6035e09fad90a25f
-RMD160 (tcl8.6.9-src.tar.gz) = 73d064888101ab3a4a832bd9b242937e5f26315c
-SHA512 (tcl8.6.9-src.tar.gz) = 707fc0fb4f45c85e8f21692e5035d727cde27d87a2e1cd2e748ad373ebd3517aeca25ecaef3382a2f0e0a1feff96ce94a62b87abcf085e1a0afe2a23ef460112
-Size (tcl8.6.9-src.tar.gz) = 10000896 bytes
-SHA1 (patch-generic_tclInt.h) = fde6a5458a138b6d61fdbab1269b1c5111a28b22
+SHA1 (tcl8.6.10-src.tar.gz) = 0ba1dcc40db79749c322258781879a3c17093295
+RMD160 (tcl8.6.10-src.tar.gz) = e44c76e48b77c825dc6fb7a78ef8f7297106784a
+SHA512 (tcl8.6.10-src.tar.gz) = c89b886e483320a284033de51b5363758ef4748d6248ae73eb8e90fbe76c180395f485135ca9bf1246dd567159a77ffc1e8cb537bc2fc4a09b01448928d0afd7
+Size (tcl8.6.10-src.tar.gz) = 10144235 bytes
+SHA1 (patch-generic_tclInt.h) = f41a50e6461d0afacd1c8656944403e438ea6baf
 SHA1 (patch-generic_tclPort.h) = 36ff05b22591d588952e55d0f13c2ef52e371d1e
 SHA1 (patch-generic_tclPosixStr.c) = 68da211865282fe7124cad71381658f8dfb986d6
-SHA1 (patch-pkgs_itcl4.1.2_configure) = 508efecf058cfd10cc1c815fa948616ee248d6ef
-SHA1 (patch-pkgs_sqlite3.25.3_Makefile.in) = 985bef7d2d6d8b96a9dd8072a3194620dc32b495
-SHA1 (patch-pkgs_sqlite3.25.3_configure) = 98dd6187eb3317d1c486f439fe889160a13415ef
-SHA1 (patch-pkgs_tdbc1.1.0_configure) = ba65923172774dcd80151aa507a5633c8b7df3ba
-SHA1 (patch-pkgs_tdbcmysql1.1.0_configure) = 6cc5957be85cfca9df7b75dc7a932256d283d3dc
-SHA1 (patch-pkgs_tdbcodbc1.1.0_configure) = a082e2b0cd424bc19a3253a8ead2cd0ead9fb568
-SHA1 (patch-pkgs_tdbcpostgres1.1.0_configure) = 6693bad209d40d8909eb35a08f93a6bbcb63d2c1
-SHA1 (patch-pkgs_thread2.8.4_configure) = 5a02414b95cd7a41ff3d6be181e9cf1fe573cf13
+SHA1 (patch-pkgs_itcl4.2.0_configure) = e84e707c48094f120cc600b660d4370c22a03de7
+SHA1 (patch-pkgs_sqlite3.30.1.2_Makefile.in) = 3e7035f0949007ffd27db3a7ae2632d9f1469aed
+SHA1 (patch-pkgs_sqlite3.30.1.2_configure) = f0ec2cea5b80c624108a30435fb32662426b96c1
+SHA1 (patch-pkgs_tdbc1.1.1_configure) = 6a8ca5f4a18d69a2838ae56133eab263c7579d14
+SHA1 (patch-pkgs_tdbcmysql1.1.1_configure) = 2b82599a4fcd2114c815ef9583cb66130f06ba34
+SHA1 (patch-pkgs_tdbcodbc1.1.1_configure) = 5c0b4e2adf39c6c6a9488d1aab80768cf8bee489
+SHA1 (patch-pkgs_tdbcpostgres1.1.1_configure) = dcecad9c96bd0f52cb4fc89228621b55495f7b79
+SHA1 (patch-pkgs_thread2.8.5_configure) = 0f11827bea5ca7f6419289a0b1cfa17843a184ee
 SHA1 (patch-tests_load.test) = 438695ab76e01646e49aadc01c44344a5495eabb
 SHA1 (patch-tests_pkgMkIndex.test) = 70d1042c1f4743052c5fa191fa7c4732a08e28a2
-SHA1 (patch-unix_Makefile.in) = a67bf7793579c80d363a62ef2efa6ed4ee1e2cbd
-SHA1 (patch-unix_configure) = f5b281877a6a40db1c1850be98819ff6612b16ce
+SHA1 (patch-unix_Makefile.in) = ec1cd7d020502bfc3ff41b2652602fe9500a97f3
+SHA1 (patch-unix_configure) = 94b3a54fb4e15022f2fb966f942fd7f32b370d32
 SHA1 (patch-unix_tclConfig.sh.in) = 341ac4f1bbfb29551dea87ade98b3b7b59652a31
 SHA1 (patch-unix_tclUnixCompat.c) = 7ffa40a1a56345f5b86cd896e8e3b0d5748d8c5e
 SHA1 (patch-unix_tclUnixFCmd.c) = e715d9419a36a8414355252bb3da0ef48b07fe4f
diff --git a/lang/tcl/patches/patch-generic_tclInt.h b/lang/tcl/patches/patch-generic_tclInt.h
index d07fcafbc35..fad3125f08c 100644
--- a/lang/tcl/patches/patch-generic_tclInt.h
+++ b/lang/tcl/patches/patch-generic_tclInt.h
@@ -1,6 +1,6 @@
-$NetBSD: patch-generic_tclInt.h,v 1.2 2016/09/03 11:58:01 adam Exp $
+$NetBSD: patch-generic_tclInt.h,v 1.3 2020/04/16 17:07:07 adam Exp $
 
---- generic/tclInt.h.orig	2016-07-11 11:51:23.000000000 +0000
+--- generic/tclInt.h.orig	2019-11-13 17:57:08.000000000 +0000
 +++ generic/tclInt.h
 @@ -38,16 +38,8 @@
  #include <stdio.h>
@@ -17,5 +17,5 @@ $NetBSD: patch-generic_tclInt.h,v 1.2 2016/09/03 11:58:01 adam Exp $
  #include <string.h>
 -#endif
  #if defined(STDC_HEADERS) || defined(__STDC__) || defined(__C99__FUNC__) \
-      || defined(__cplusplus) || defined(_MSC_VER)
+      || defined(__cplusplus) || defined(_MSC_VER) || defined(__ICC)
  #include <stddef.h>
diff --git a/lang/tcl/patches/patch-pkgs_itcl4.1.2_configure b/lang/tcl/patches/patch-pkgs_itcl4.2.0_configure
index 4af555f50ba..e7d0e5cc03d 100644
--- a/lang/tcl/patches/patch-pkgs_itcl4.1.2_configure
+++ b/lang/tcl/patches/patch-pkgs_itcl4.2.0_configure
@@ -1,22 +1,21 @@
-$NetBSD: patch-pkgs_itcl4.1.2_configure,v 1.1 2018/12/09 18:33:55 adam Exp $
+$NetBSD: patch-pkgs_itcl4.2.0_configure,v 1.1 2020/04/16 17:07:07 adam Exp $
 
 Honor LDFLAGS on NetBSD.
 https://core.tcl.tk/tcl/tktview/fed5069f8a8e59e97af0a784b534919f5b789b1e
 
---- pkgs/itcl4.1.2/configure.orig	2018-11-01 15:59:41.000000000 +0000
-+++ pkgs/itcl4.1.2/configure
-@@ -6935,7 +6935,7 @@ fi
+--- pkgs/itcl4.2.0/configure.orig	2019-11-20 16:38:54.000000000 +0000
++++ pkgs/itcl4.2.0/configure
+@@ -6920,20 +6920,18 @@ fi
  fi
  	    LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
  	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so${SHLIB_VERSION}'
 -	    LDFLAGS="-Wl,-export-dynamic"
 +	    LDFLAGS="-Wl,--export-dynamic"
  	    CFLAGS_OPTIMIZE="-O2"
- 	    if test "${TCL_THREADS}" = "1"; then :
- 
-@@ -6946,13 +6946,11 @@ fi
- 
- fi
+ 	    # On OpenBSD:	Compile with -pthread
+ 	    #		Don't link with -lpthread
+ 	    LIBS=`echo $LIBS | sed s/-lpthread//`
+ 	    CFLAGS="$CFLAGS -pthread"
  	    # OpenBSD doesn't do version numbers with dots.
 -	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
 -	    TCL_LIB_VERSIONS_OK=nodots
@@ -29,7 +28,7 @@ https://core.tcl.tk/tcl/tktview/fed5069f8a8e59e97af0a784b534919f5b789b1e
  	    SHLIB_SUFFIX=".so"
  	    LDFLAGS="$LDFLAGS -export-dynamic"
  	    if test $doRpath = yes; then :
-@@ -6991,10 +6989,6 @@ fi
+@@ -6965,10 +6963,6 @@ fi
  	    case $system in
  	    FreeBSD-3.*)
  		# Version numbers are dot-stripped by system policy.
diff --git a/lang/tcl/patches/patch-pkgs_sqlite3.25.3_Makefile.in b/lang/tcl/patches/patch-pkgs_sqlite3.30.1.2_Makefile.in
index 579ee4a8e9c..bed06d54eb9 100644
--- a/lang/tcl/patches/patch-pkgs_sqlite3.25.3_Makefile.in
+++ b/lang/tcl/patches/patch-pkgs_sqlite3.30.1.2_Makefile.in
@@ -1,9 +1,9 @@
-$NetBSD: patch-pkgs_sqlite3.25.3_Makefile.in,v 1.1 2018/12/09 18:33:55 adam Exp $
+$NetBSD: patch-pkgs_sqlite3.30.1.2_Makefile.in,v 1.1 2020/04/16 17:07:07 adam Exp $
 
 Fix building with system sqlite3.
 
---- pkgs/sqlite3.25.3/Makefile.in.orig	2016-01-07 15:38:22.000000000 +0000
-+++ pkgs/sqlite3.25.3/Makefile.in
+--- pkgs/sqlite3.30.1.2/Makefile.in.orig	2016-01-07 15:38:22.000000000 +0000
++++ pkgs/sqlite3.30.1.2/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_tdbcmysql1.1.0_configure b/lang/tcl/patches/patch-pkgs_sqlite3.30.1.2_configure
index 4ebdd771d9c..17e0bf92c47 100644
--- a/lang/tcl/patches/patch-pkgs_tdbcmysql1.1.0_configure
+++ b/lang/tcl/patches/patch-pkgs_sqlite3.30.1.2_configure
@@ -1,22 +1,21 @@
-$NetBSD: patch-pkgs_tdbcmysql1.1.0_configure,v 1.1 2018/12/09 18:33:55 adam Exp $
+$NetBSD: patch-pkgs_sqlite3.30.1.2_configure,v 1.1 2020/04/16 17:07:07 adam Exp $
 
 Honor LDFLAGS on NetBSD.
 https://core.tcl.tk/tcl/tktview/fed5069f8a8e59e97af0a784b534919f5b789b1e
 
---- pkgs/tdbcmysql1.1.0/configure.orig	2018-11-01 16:08:41.000000000 +0000
-+++ pkgs/tdbcmysql1.1.0/configure
-@@ -7393,7 +7393,7 @@ fi
+--- pkgs/sqlite3.30.1.2/configure.orig	2019-11-21 19:01:58.000000000 +0000
++++ pkgs/sqlite3.30.1.2/configure
+@@ -6876,20 +6876,18 @@ fi
  fi
  	    LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
  	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so${SHLIB_VERSION}'
 -	    LDFLAGS="-Wl,-export-dynamic"
 +	    LDFLAGS="-Wl,--export-dynamic"
  	    CFLAGS_OPTIMIZE="-O2"
- 	    if test "${TCL_THREADS}" = "1"; then :
- 
-@@ -7404,13 +7404,11 @@ fi
- 
- fi
+ 	    # On OpenBSD:	Compile with -pthread
+ 	    #		Don't link with -lpthread
+ 	    LIBS=`echo $LIBS | sed s/-lpthread//`
+ 	    CFLAGS="$CFLAGS -pthread"
  	    # OpenBSD doesn't do version numbers with dots.
 -	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
 -	    TCL_LIB_VERSIONS_OK=nodots
@@ -29,7 +28,7 @@ https://core.tcl.tk/tcl/tktview/fed5069f8a8e59e97af0a784b534919f5b789b1e
  	    SHLIB_SUFFIX=".so"
  	    LDFLAGS="$LDFLAGS -export-dynamic"
  	    if test $doRpath = yes; then :
-@@ -7449,10 +7447,6 @@ fi
+@@ -6921,10 +6919,6 @@ fi
  	    case $system in
  	    FreeBSD-3.*)
  		# Version numbers are dot-stripped by system policy.
diff --git a/lang/tcl/patches/patch-pkgs_tdbc1.1.0_configure b/lang/tcl/patches/patch-pkgs_tdbc1.1.1_configure
index 7c35e3ced02..550c3d0e9da 100644
--- a/lang/tcl/patches/patch-pkgs_tdbc1.1.0_configure
+++ b/lang/tcl/patches/patch-pkgs_tdbc1.1.1_configure
@@ -1,22 +1,21 @@
-$NetBSD: patch-pkgs_tdbc1.1.0_configure,v 1.1 2018/12/09 18:33:55 adam Exp $
+$NetBSD: patch-pkgs_tdbc1.1.1_configure,v 1.1 2020/04/16 17:07:07 adam Exp $
 
 Honor LDFLAGS on NetBSD.
 https://core.tcl.tk/tcl/tktview/fed5069f8a8e59e97af0a784b534919f5b789b1e
 
---- pkgs/tdbc1.1.0/configure.orig	2018-11-01 16:02:33.000000000 +0000
-+++ pkgs/tdbc1.1.0/configure
-@@ -7049,7 +7049,7 @@ fi
+--- pkgs/tdbc1.1.1/configure.orig	2019-11-20 16:33:00.000000000 +0000
++++ pkgs/tdbc1.1.1/configure
+@@ -7034,20 +7034,18 @@ fi
  fi
  	    LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
  	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so${SHLIB_VERSION}'
 -	    LDFLAGS="-Wl,-export-dynamic"
 +	    LDFLAGS="-Wl,--export-dynamic"
  	    CFLAGS_OPTIMIZE="-O2"
- 	    if test "${TCL_THREADS}" = "1"; then :
- 
-@@ -7060,13 +7060,11 @@ fi
- 
- fi
+ 	    # On OpenBSD:	Compile with -pthread
+ 	    #		Don't link with -lpthread
+ 	    LIBS=`echo $LIBS | sed s/-lpthread//`
+ 	    CFLAGS="$CFLAGS -pthread"
  	    # OpenBSD doesn't do version numbers with dots.
 -	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
 -	    TCL_LIB_VERSIONS_OK=nodots
@@ -29,7 +28,7 @@ https://core.tcl.tk/tcl/tktview/fed5069f8a8e59e97af0a784b534919f5b789b1e
  	    SHLIB_SUFFIX=".so"
  	    LDFLAGS="$LDFLAGS -export-dynamic"
  	    if test $doRpath = yes; then :
-@@ -7105,10 +7103,6 @@ fi
+@@ -7079,10 +7077,6 @@ fi
  	    case $system in
  	    FreeBSD-3.*)
  		# Version numbers are dot-stripped by system policy.
diff --git a/lang/tcl/patches/patch-pkgs_sqlite3.25.3_configure b/lang/tcl/patches/patch-pkgs_tdbcmysql1.1.1_configure
index 149a5ab58b1..e8d24b3e66a 100644
--- a/lang/tcl/patches/patch-pkgs_sqlite3.25.3_configure
+++ b/lang/tcl/patches/patch-pkgs_tdbcmysql1.1.1_configure
@@ -1,22 +1,21 @@
-$NetBSD: patch-pkgs_sqlite3.25.3_configure,v 1.1 2018/12/09 18:33:55 adam Exp $
+$NetBSD: patch-pkgs_tdbcmysql1.1.1_configure,v 1.1 2020/04/16 17:07:07 adam Exp $
 
 Honor LDFLAGS on NetBSD.
 https://core.tcl.tk/tcl/tktview/fed5069f8a8e59e97af0a784b534919f5b789b1e
 
---- pkgs/sqlite3.25.3/configure.orig	2018-11-12 18:03:27.000000000 +0000
-+++ pkgs/sqlite3.25.3/configure
-@@ -6974,7 +6974,7 @@ fi
+--- pkgs/tdbcmysql1.1.1/configure.orig	2019-11-20 16:33:39.000000000 +0000
++++ pkgs/tdbcmysql1.1.1/configure
+@@ -7378,20 +7378,18 @@ fi
  fi
  	    LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
  	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so${SHLIB_VERSION}'
 -	    LDFLAGS="-Wl,-export-dynamic"
 +	    LDFLAGS="-Wl,--export-dynamic"
  	    CFLAGS_OPTIMIZE="-O2"
- 	    if test "${TCL_THREADS}" = "1"; then :
- 
-@@ -6985,13 +6985,11 @@ fi
- 
- fi
+ 	    # On OpenBSD:	Compile with -pthread
+ 	    #		Don't link with -lpthread
+ 	    LIBS=`echo $LIBS | sed s/-lpthread//`
+ 	    CFLAGS="$CFLAGS -pthread"
  	    # OpenBSD doesn't do version numbers with dots.
 -	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
 -	    TCL_LIB_VERSIONS_OK=nodots
@@ -29,7 +28,7 @@ https://core.tcl.tk/tcl/tktview/fed5069f8a8e59e97af0a784b534919f5b789b1e
  	    SHLIB_SUFFIX=".so"
  	    LDFLAGS="$LDFLAGS -export-dynamic"
  	    if test $doRpath = yes; then :
-@@ -7030,10 +7028,6 @@ fi
+@@ -7423,10 +7421,6 @@ fi
  	    case $system in
  	    FreeBSD-3.*)
  		# Version numbers are dot-stripped by system policy.
diff --git a/lang/tcl/patches/patch-pkgs_tdbcodbc1.1.0_configure b/lang/tcl/patches/patch-pkgs_tdbcodbc1.1.1_configure
index 772c0505723..ce818150640 100644
--- a/lang/tcl/patches/patch-pkgs_tdbcodbc1.1.0_configure
+++ b/lang/tcl/patches/patch-pkgs_tdbcodbc1.1.1_configure
@@ -1,22 +1,21 @@
-$NetBSD: patch-pkgs_tdbcodbc1.1.0_configure,v 1.1 2018/12/09 18:33:55 adam Exp $
+$NetBSD: patch-pkgs_tdbcodbc1.1.1_configure,v 1.1 2020/04/16 17:07:07 adam Exp $
 
 Honor LDFLAGS on NetBSD.
 https://core.tcl.tk/tcl/tktview/fed5069f8a8e59e97af0a784b534919f5b789b1e
 
---- pkgs/tdbcodbc1.1.0/configure.orig	2018-11-01 16:09:19.000000000 +0000
-+++ pkgs/tdbcodbc1.1.0/configure
-@@ -7393,7 +7393,7 @@ fi
+--- pkgs/tdbcodbc1.1.1/configure.orig	2019-11-20 16:34:11.000000000 +0000
++++ pkgs/tdbcodbc1.1.1/configure
+@@ -7378,20 +7378,18 @@ fi
  fi
  	    LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
  	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so${SHLIB_VERSION}'
 -	    LDFLAGS="-Wl,-export-dynamic"
 +	    LDFLAGS="-Wl,--export-dynamic"
  	    CFLAGS_OPTIMIZE="-O2"
- 	    if test "${TCL_THREADS}" = "1"; then :
- 
-@@ -7404,13 +7404,11 @@ fi
- 
- fi
+ 	    # On OpenBSD:	Compile with -pthread
+ 	    #		Don't link with -lpthread
+ 	    LIBS=`echo $LIBS | sed s/-lpthread//`
+ 	    CFLAGS="$CFLAGS -pthread"
  	    # OpenBSD doesn't do version numbers with dots.
 -	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
 -	    TCL_LIB_VERSIONS_OK=nodots
@@ -29,7 +28,7 @@ https://core.tcl.tk/tcl/tktview/fed5069f8a8e59e97af0a784b534919f5b789b1e
  	    SHLIB_SUFFIX=".so"
  	    LDFLAGS="$LDFLAGS -export-dynamic"
  	    if test $doRpath = yes; then :
-@@ -7449,10 +7447,6 @@ fi
+@@ -7423,10 +7421,6 @@ fi
  	    case $system in
  	    FreeBSD-3.*)
  		# Version numbers are dot-stripped by system policy.
diff --git a/lang/tcl/patches/patch-pkgs_tdbcpostgres1.1.0_configure b/lang/tcl/patches/patch-pkgs_tdbcpostgres1.1.1_configure
index 047ceeef2c2..99aac8c795e 100644
--- a/lang/tcl/patches/patch-pkgs_tdbcpostgres1.1.0_configure
+++ b/lang/tcl/patches/patch-pkgs_tdbcpostgres1.1.1_configure
@@ -1,22 +1,21 @@
-$NetBSD: patch-pkgs_tdbcpostgres1.1.0_configure,v 1.1 2018/12/09 18:33:55 adam Exp $
+$NetBSD: patch-pkgs_tdbcpostgres1.1.1_configure,v 1.1 2020/04/16 17:07:07 adam Exp $
 
 Honor LDFLAGS on NetBSD.
 https://core.tcl.tk/tcl/tktview/fed5069f8a8e59e97af0a784b534919f5b789b1e
 
---- pkgs/tdbcpostgres1.1.0/configure.orig	2018-11-01 16:09:49.000000000 +0000
-+++ pkgs/tdbcpostgres1.1.0/configure
-@@ -7393,7 +7393,7 @@ fi
+--- pkgs/tdbcpostgres1.1.1/configure.orig	2019-11-20 16:34:44.000000000 +0000
++++ pkgs/tdbcpostgres1.1.1/configure
+@@ -7378,20 +7378,18 @@ fi
  fi
  	    LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
  	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so${SHLIB_VERSION}'
 -	    LDFLAGS="-Wl,-export-dynamic"
 +	    LDFLAGS="-Wl,--export-dynamic"
  	    CFLAGS_OPTIMIZE="-O2"
- 	    if test "${TCL_THREADS}" = "1"; then :
- 
-@@ -7404,13 +7404,11 @@ fi
- 
- fi
+ 	    # On OpenBSD:	Compile with -pthread
+ 	    #		Don't link with -lpthread
+ 	    LIBS=`echo $LIBS | sed s/-lpthread//`
+ 	    CFLAGS="$CFLAGS -pthread"
  	    # OpenBSD doesn't do version numbers with dots.
 -	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
 -	    TCL_LIB_VERSIONS_OK=nodots
@@ -29,7 +28,7 @@ https://core.tcl.tk/tcl/tktview/fed5069f8a8e59e97af0a784b534919f5b789b1e
  	    SHLIB_SUFFIX=".so"
  	    LDFLAGS="$LDFLAGS -export-dynamic"
  	    if test $doRpath = yes; then :
-@@ -7449,10 +7447,6 @@ fi
+@@ -7423,10 +7421,6 @@ fi
  	    case $system in
  	    FreeBSD-3.*)
  		# Version numbers are dot-stripped by system policy.
diff --git a/lang/tcl/patches/patch-pkgs_thread2.8.4_configure b/lang/tcl/patches/patch-pkgs_thread2.8.5_configure
index 5a32abe605c..494d6a37b2a 100644
--- a/lang/tcl/patches/patch-pkgs_thread2.8.4_configure
+++ b/lang/tcl/patches/patch-pkgs_thread2.8.5_configure
@@ -1,22 +1,21 @@
-$NetBSD: patch-pkgs_thread2.8.4_configure,v 1.1 2018/12/09 18:33:55 adam Exp $
+$NetBSD: patch-pkgs_thread2.8.5_configure,v 1.1 2020/04/16 17:07:07 adam Exp $
 
 Honor LDFLAGS on NetBSD.
 https://core.tcl.tk/tcl/tktview/fed5069f8a8e59e97af0a784b534919f5b789b1e
 
---- pkgs/thread2.8.4/configure.orig	2018-11-01 16:11:06.000000000 +0000
-+++ pkgs/thread2.8.4/configure
-@@ -6984,7 +6984,7 @@ fi
+--- pkgs/thread2.8.5/configure.orig	2019-11-20 16:36:54.000000000 +0000
++++ pkgs/thread2.8.5/configure
+@@ -6934,20 +6934,18 @@ fi
  fi
  	    LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
  	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so${SHLIB_VERSION}'
 -	    LDFLAGS="-Wl,-export-dynamic"
 +	    LDFLAGS="-Wl,--export-dynamic"
  	    CFLAGS_OPTIMIZE="-O2"
- 	    if test "${TCL_THREADS}" = "1"; then :
- 
-@@ -6995,13 +6995,11 @@ fi
- 
- fi
+ 	    # On OpenBSD:	Compile with -pthread
+ 	    #		Don't link with -lpthread
+ 	    LIBS=`echo $LIBS | sed s/-lpthread//`
+ 	    CFLAGS="$CFLAGS -pthread"
  	    # OpenBSD doesn't do version numbers with dots.
 -	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
 -	    TCL_LIB_VERSIONS_OK=nodots
@@ -29,7 +28,7 @@ https://core.tcl.tk/tcl/tktview/fed5069f8a8e59e97af0a784b534919f5b789b1e
  	    SHLIB_SUFFIX=".so"
  	    LDFLAGS="$LDFLAGS -export-dynamic"
  	    if test $doRpath = yes; then :
-@@ -7040,10 +7038,6 @@ fi
+@@ -6979,10 +6977,6 @@ fi
  	    case $system in
  	    FreeBSD-3.*)
  		# Version numbers are dot-stripped by system policy.
diff --git a/lang/tcl/patches/patch-unix_Makefile.in b/lang/tcl/patches/patch-unix_Makefile.in
index 277c2945f57..135e44cd297 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.15 2018/12/09 18:33:55 adam Exp $
+$NetBSD: patch-unix_Makefile.in,v 1.16 2020/04/16 17:07:07 adam Exp $
 
 Honour LDFLAGS.
 
---- unix/Makefile.in.orig	2017-12-21 18:16:25.000000000 +0000
+--- unix/Makefile.in.orig	2019-11-21 19:10:50.000000000 +0000
 +++ unix/Makefile.in
 @@ -8,6 +8,7 @@ VERSION 		= @TCL_VERSION@
  MAJOR_VERSION		= @TCL_MAJOR_VERSION@
@@ -12,7 +12,7 @@ Honour LDFLAGS.
  
  #--------------------------------------------------------------------------
  # Things you can change to personalize the Makefile for your own site (you can
-@@ -54,6 +55,8 @@ SCRIPT_INSTALL_DIR	= $(INSTALL_ROOT)$(TC
+@@ -55,6 +56,8 @@ SCRIPT_INSTALL_DIR	= $(INSTALL_ROOT)$(TC
  
  # Directory in which to install the include file tcl.h:
  INCLUDE_INSTALL_DIR	= $(INSTALL_ROOT)$(includedir)
@@ -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		= @CFLAGS_OPTIMIZE@
+@@ -104,7 +107,7 @@ CFLAGS_OPTIMIZE		= @CFLAGS_OPTIMIZE@
  #CFLAGS			= $(CFLAGS_DEBUG)
  #CFLAGS			= $(CFLAGS_OPTIMIZE)
  #CFLAGS			= $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE)
@@ -30,7 +30,7 @@ Honour LDFLAGS.
  
  # Flags to pass to the linker
  LDFLAGS_DEBUG		= @LDFLAGS_DEBUG@
-@@ -144,7 +147,7 @@ NO_DEPRECATED_FLAGS	=
+@@ -145,7 +148,7 @@ NO_DEPRECATED_FLAGS	=
  
  # Some versions of make, like SGI's, use the following variable to determine
  # which shell to use for executing commands:
@@ -39,7 +39,7 @@ Honour LDFLAGS.
  
  # Tcl used to let the configure script choose which program to use for
  # installing, but there are just too many different versions of "install"
-@@ -189,7 +192,7 @@ DLTEST_TARGETS		= dltest.marker
+@@ -191,7 +194,7 @@ DLTEST_TARGETS		= dltest.marker
  # run-time. The first symbol is for use when creating a binary with cc, and
  # the second is for use when running ld directly.
  CC_SEARCH_FLAGS	= @CC_SEARCH_FLAGS@
@@ -48,7 +48,7 @@ Honour LDFLAGS.
  
  # The following symbol is defined to "$(DLTEST_TARGETS)" if dynamic loading is
  # available; this causes everything in the "dltest" subdirectory to be built
-@@ -200,6 +203,7 @@ BUILD_DLTEST		= @BUILD_DLTEST@
+@@ -202,6 +205,7 @@ BUILD_DLTEST		= @BUILD_DLTEST@
  #BUILD_DLTEST		=
  
  TCL_LIB_FILE		= @TCL_LIB_FILE@
@@ -56,7 +56,7 @@ Honour LDFLAGS.
  #TCL_LIB_FILE		= libtcl.a
  
  # Generic lib name used in rules that apply to tcl and tk
-@@ -614,7 +618,7 @@ SRCS = $(GENERIC_SRCS) $(TOMMATH_SRCS) $
+@@ -712,7 +716,7 @@ SRCS = $(GENERIC_SRCS) $(TOMMATH_SRCS) $
  
  all: binaries libraries doc packages
  
@@ -65,7 +65,7 @@ Honour LDFLAGS.
  
  libraries:
  
-@@ -633,6 +637,11 @@ ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
+@@ -731,6 +735,11 @@ ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
  	rm -f $@
  	@MAKE_STUB_LIB@
  
@@ -77,7 +77,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
-@@ -795,9 +804,16 @@ install-binaries: binaries
+@@ -893,9 +902,16 @@ install-binaries: binaries
  	    done;
  	@echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/"
  	@@INSTALL_LIB@
@@ -95,7 +95,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)/"
-@@ -821,7 +837,7 @@ install-libraries: libraries
+@@ -919,7 +935,7 @@ install-libraries: libraries
  		else true; \
  		fi; \
  	    done;
@@ -104,23 +104,23 @@ Honour LDFLAGS.
  	    do \
  	    if [ ! -d "$(SCRIPT_INSTALL_DIR)"/$$i ] ; then \
  		echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \
-@@ -842,6 +858,8 @@ install-libraries: libraries
+@@ -940,6 +956,8 @@ install-libraries: libraries
  	    done;
- 	@echo "Installing package http 2.9.0 as a Tcl Module";
- 	@$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.6/http-2.9.0.tm;
+ 	@echo "Installing package http 2.9.1 as a Tcl Module";
+ 	@$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.6/http-2.9.1.tm;
 +	@$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/http/http.tcl;
 +	@$(INSTALL_DATA) $(TOP_DIR)/library/http/pkgIndex.tcl "$(SCRIPT_INSTALL_DIR)"/http/pkgIndex.tcl;
  	@echo "Installing package opt0.4 files to $(SCRIPT_INSTALL_DIR)/opt0.4/";
  	@for i in $(TOP_DIR)/library/opt/*.tcl ; \
  	    do \
-@@ -849,13 +867,21 @@ install-libraries: libraries
+@@ -947,13 +965,21 @@ install-libraries: libraries
  	    done;
  	@echo "Installing package msgcat 1.6.1 as a Tcl Module";
  	@$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/msgcat-1.6.1.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.5.0 as a Tcl Module";
- 	@$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/tcltest-2.5.0.tm;
+ 	@echo "Installing package tcltest 2.5.1 as a Tcl Module";
+ 	@$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/tcltest-2.5.1.tm;
 +	@$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/tcltest2.5/tcltest.tcl;
 +	@$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/pkgIndex.tcl "$(SCRIPT_INSTALL_DIR)"/tcltest2.5/pkgIndex.tcl;
  
@@ -135,7 +135,7 @@ Honour LDFLAGS.
  
  	@echo "Installing encoding files to $(SCRIPT_INSTALL_DIR)/encoding/";
  	@for i in $(TOP_DIR)/library/encoding/*.enc ; do \
-@@ -940,7 +966,7 @@ install-doc: doc
+@@ -1038,7 +1064,7 @@ install-doc: doc
  	done
  
  install-headers:
@@ -144,7 +144,7 @@ Honour LDFLAGS.
  	    do \
  	    if [ ! -d "$$i" ] ; then \
  		echo "Making directory $$i"; \
-@@ -949,13 +975,17 @@ install-headers:
+@@ -1047,13 +1073,17 @@ install-headers:
  		fi; \
  	    done;
  	@echo "Installing header files to $(INCLUDE_INSTALL_DIR)/";
@@ -168,7 +168,7 @@ Honour LDFLAGS.
  	    done;
  
  # Optional target to install private headers
-@@ -1725,7 +1755,7 @@ configure-packages:
+@@ -1811,7 +1841,7 @@ configure-packages:
  	      mkdir -p $(PKG_DIR)/$$pkg; \
  	      if [ ! -f $(PKG_DIR)/$$pkg/Makefile ]; then \
  		( cd $(PKG_DIR)/$$pkg; \
diff --git a/lang/tcl/patches/patch-unix_configure b/lang/tcl/patches/patch-unix_configure
index eaea6cb7a84..2c8083fe060 100644
--- a/lang/tcl/patches/patch-unix_configure
+++ b/lang/tcl/patches/patch-unix_configure
@@ -1,8 +1,8 @@
-$NetBSD: patch-unix_configure,v 1.11 2018/12/09 18:33:55 adam Exp $
+$NetBSD: patch-unix_configure,v 1.12 2020/04/16 17:07:07 adam Exp $
 
---- unix/configure.orig	2017-08-09 14:45:58.000000000 +0000
+--- unix/configure.orig	2019-11-21 19:10:50.000000000 +0000
 +++ unix/configure
-@@ -6839,12 +6839,12 @@ fi
+@@ -6778,12 +6778,12 @@ fi
  	    LD_SEARCH_FLAGS=""
  	    ;;
  	BSD/OS-4.*)
@@ -17,7 +17,7 @@ $NetBSD: patch-unix_configure,v 1.11 2018/12/09 18:33:55 adam Exp $
  	    CC_SEARCH_FLAGS=""
  	    LD_SEARCH_FLAGS=""
  	    ;;
-@@ -7515,7 +7515,7 @@ fi
+@@ -7454,7 +7454,7 @@ fi
  	    CC_SEARCH_FLAGS=""
  	    LD_SEARCH_FLAGS=""
  	    ;;
@@ -26,7 +26,7 @@ $NetBSD: patch-unix_configure,v 1.11 2018/12/09 18:33:55 adam Exp $
  	    arch=`arch -s`
  	    case "$arch" in
  	    alpha|sparc64)
-@@ -7536,7 +7536,7 @@ fi
+@@ -7475,7 +7475,7 @@ fi
  
  	    LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
  	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so${SHLIB_VERSION}'
@@ -35,7 +35,7 @@ $NetBSD: patch-unix_configure,v 1.11 2018/12/09 18:33:55 adam Exp $
  	    CFLAGS_OPTIMIZE="-O2"
  	    if test "${TCL_THREADS}" = "1"; then
  
-@@ -7558,7 +7558,7 @@ fi
+@@ -7497,7 +7497,7 @@ fi
  	    SHLIB_SUFFIX=".so"
  	    DL_OBJS="tclLoadDl.o"
  	    DL_LIBS=""
@@ -44,7 +44,7 @@ $NetBSD: patch-unix_configure,v 1.11 2018/12/09 18:33:55 adam Exp $
  	    if test $doRpath = yes; then
  
  		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
-@@ -7609,7 +7609,6 @@ fi
+@@ -7548,7 +7548,6 @@ fi
  	    esac
  	    ;;
  	Darwin-*)
@@ -52,7 +52,7 @@ $NetBSD: patch-unix_configure,v 1.11 2018/12/09 18:33:55 adam Exp $
  	    SHLIB_CFLAGS="-fno-common"
  	    # To avoid discrepancies between what headers configure sees during
  	    # preprocessing tests and compiling tests, move any -isysroot and
-@@ -8825,7 +8824,11 @@ fi
+@@ -8757,7 +8756,11 @@ fi
  
  else
  
@@ -65,7 +65,7 @@ $NetBSD: patch-unix_configure,v 1.11 2018/12/09 18:33:55 adam Exp $
  
  fi
  
-@@ -8860,7 +8863,7 @@ else
+@@ -8792,7 +8795,7 @@ else
  
  fi
  
@@ -74,7 +74,7 @@ $NetBSD: patch-unix_configure,v 1.11 2018/12/09 18:33:55 adam Exp $
  
      # Define TCL_LIBS now that we know what DL_LIBS is.
      # The trick here is that we don't want to change the value of TCL_LIBS if
-@@ -18891,9 +18894,9 @@ fi
+@@ -18700,9 +18703,9 @@ fi
  #	building libtcl as a shared library instead of a static library.
  #--------------------------------------------------------------------
  
@@ -87,7 +87,7 @@ $NetBSD: patch-unix_configure,v 1.11 2018/12/09 18:33:55 adam Exp $
  
  # tclConfig.sh needs a version of the _LIB_SUFFIX that has been eval'ed
  # since on some platforms TCL_LIB_FILE contains shell escapes.
-@@ -19006,13 +19009,10 @@ else
+@@ -18815,13 +18818,10 @@ else
      eval libdir="$libdir"
      # default install directory for bundled packages
      PACKAGE_DIR="$libdir"
@@ -104,22 +104,19 @@ $NetBSD: patch-unix_configure,v 1.11 2018/12/09 18:33:55 adam Exp $
  fi
  VERSION='${VERSION}'
  eval "CFG_TCL_SHARED_LIB_SUFFIX=${TCL_SHARED_LIB_SUFFIX}"
-@@ -19031,12 +19031,11 @@ if test "$FRAMEWORK_BUILD" = "1" ; then
- 	TCL_PACKAGE_PATH="~/Library/Tcl /Library/Tcl /System/Library/Tcl ~/Library/Frameworks /Library/Frameworks /System/Library/Frameworks"
+@@ -18840,10 +18840,8 @@ if test "$FRAMEWORK_BUILD" = "1" ; then
+ 	TCL_PACKAGE_PATH="~/Library/Tcl /Library/Tcl ~/Library/Frameworks /Library/Frameworks"
      test -z "$TCL_MODULE_PATH"  && \
- 	TCL_MODULE_PATH="~/Library/Tcl /Library/Tcl /System/Library/Tcl"
+ 	TCL_MODULE_PATH="~/Library/Tcl /Library/Tcl"
 -elif test "$prefix/lib" != "$libdir"; then
--    TCL_PACKAGE_PATH="${libdir} ${prefix}/lib ${TCL_PACKAGE_PATH}"
+-    test -z "$TCL_PACKAGE_PATH" && TCL_PACKAGE_PATH="${libdir} ${prefix}/lib ${TCL_PACKAGE_PATH}"
  else
--    TCL_PACKAGE_PATH="${prefix}/lib ${TCL_PACKAGE_PATH}"
-+    TCL_PACKAGE_PATH="${prefix}/lib/tcl ${prefix}/lib"
+-    test -z "$TCL_PACKAGE_PATH" && TCL_PACKAGE_PATH="${prefix}/lib ${TCL_PACKAGE_PATH}"
++    test -z "$TCL_PACKAGE_PATH" && TCL_PACKAGE_PATH="${prefix}/lib/tcl ${prefix}/lib"
  fi
  
-+
  #--------------------------------------------------------------------
- #       The statements below define various symbols relating to Tcl
- #       stub support.
-@@ -19049,12 +19048,7 @@ eval "TCL_STUB_LIB_FILE=libtclstub${TCL_
+@@ -18858,12 +18856,7 @@ eval "TCL_STUB_LIB_FILE=libtclstub${TCL_
  eval "TCL_STUB_LIB_FILE=\"${TCL_STUB_LIB_FILE}\""
  eval "TCL_STUB_LIB_DIR=${libdir}"
  
@@ -133,7 +130,7 @@ $NetBSD: patch-unix_configure,v 1.11 2018/12/09 18:33:55 adam Exp $
  TCL_BUILD_STUB_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TCL_STUB_LIB_FLAG}"
  TCL_STUB_LIB_SPEC="-L${TCL_STUB_LIB_DIR} ${TCL_STUB_LIB_FLAG}"
  TCL_BUILD_STUB_LIB_PATH="`pwd`/${TCL_STUB_LIB_FILE}"
-@@ -19208,34 +19202,15 @@ fi
+@@ -19017,34 +19010,15 @@ fi
  # Transform confdefs.h into DEFS.
  # Protect against shell expansion while executing Makefile rules.
  # Protect against Makefile macro expansion.
@@ -177,7 +174,7 @@ $NetBSD: patch-unix_configure,v 1.11 2018/12/09 18:33:55 adam Exp $
  
  
  
-@@ -19863,6 +19838,7 @@ s,@EXTRA_BUILD_HTML@,$EXTRA_BUILD_HTML,;
+@@ -19672,6 +19646,7 @@ s,@EXTRA_BUILD_HTML@,$EXTRA_BUILD_HTML,;
  s,@EXTRA_TCLSH_LIBS@,$EXTRA_TCLSH_LIBS,;t t
  s,@DLTEST_LD@,$DLTEST_LD,;t t
  s,@DLTEST_SUFFIX@,$DLTEST_SUFFIX,;t t
author	adam <adam@pkgsrc.org>	2020-04-16 17:07:07 +0000
committer	adam <adam@pkgsrc.org>	2020-04-16 17:07:07 +0000
commit	c3e9a4dd7bb35f5cbbb3ef960570933b4e427466 (patch)
tree	25bda357476e187ff769e9c4d99978b15c52afbc /lang/tcl
parent	89a371814cdfc06ecd43d297e26541ab1ce6a628 (diff)
download	pkgsrc-c3e9a4dd7bb35f5cbbb3ef960570933b4e427466.tar.gz