summaryrefslogtreecommitdiff
path: root/lang/tcl
diff options
context:
space:
mode:
authoradam <adam@pkgsrc.org>2018-02-03 17:51:19 +0000
committeradam <adam@pkgsrc.org>2018-02-03 17:51:19 +0000
commit42a5fed3ca0953f62ba9c8ec02a6886df0e015ac (patch)
treeb91355fcf7e2503046a128bd7b17c14a1eb61bca /lang/tcl
parenta36341f63825dcb67d6f73b2cc761b32e28a35dd (diff)
downloadpkgsrc-42a5fed3ca0953f62ba9c8ec02a6886df0e015ac.tar.gz
tcl: updated to 8.6.8
8.6.8: [array names -regexp] supports backrefs Fix gcc build failures due to #pragma placement (bug)[b50fb2] exec redir append stdout and stderr to file (bug)[2a9465] http state 100 continue handling broken (bug)[0e4d88] replace command, delete trace kills namespace (bug)[1a5655] [info * methods] includes mixins tzdata updated to Olson's tzdata2017c (bug)[fc1409] segfault in method cloning, oo-15.15 (bug)[6f2f83] More robust [load] for ReactOS (bug)[3298012] Stop crash when hash tables overflow 32 bits (bug)[5d6de6] Close failing case of [package prefer stable] (bug)[fab924] Fix misleading [load] message on Windows (bug)[4f6a1e] Crash when ensemble map and list are same (bug)[ce3a21] file normalize failure when tail is empty (new)[TIP 477] nmake build system reform (bug)[586e71] EvalObjv exception handling at level 0
Diffstat (limited to 'lang/tcl')
-rw-r--r--lang/tcl/Makefile3
-rw-r--r--lang/tcl/Makefile.version12
-rw-r--r--lang/tcl/PLIST6
-rw-r--r--lang/tcl/buildlink3.mk6
-rw-r--r--lang/tcl/distinfo31
-rw-r--r--lang/tcl/patches/patch-pkgs_itcl4.1.0_configure63
-rw-r--r--lang/tcl/patches/patch-pkgs_itcl4.1.1_configure62
-rw-r--r--lang/tcl/patches/patch-pkgs_sqlite3.21.0_Makefile.in (renamed from lang/tcl/patches/patch-pkgs_sqlite3.20.0_Makefile.in)6
-rw-r--r--lang/tcl/patches/patch-pkgs_sqlite3.21.0_configure (renamed from lang/tcl/patches/patch-pkgs_sqlite3.20.0_configure)20
-rw-r--r--lang/tcl/patches/patch-pkgs_tdbc1.0.5_configure63
-rw-r--r--lang/tcl/patches/patch-pkgs_tdbc1.0.6_configure62
-rw-r--r--lang/tcl/patches/patch-pkgs_tdbcmysql1.0.6_configure (renamed from lang/tcl/patches/patch-pkgs_tdbcmysql1.0.5_configure)20
-rw-r--r--lang/tcl/patches/patch-pkgs_tdbcodbc1.0.6_configure (renamed from lang/tcl/patches/patch-pkgs_tdbcodbc1.0.5_configure)20
-rw-r--r--lang/tcl/patches/patch-pkgs_tdbcpostgres1.0.6_configure (renamed from lang/tcl/patches/patch-pkgs_tdbcpostgres1.0.5_configure)20
-rw-r--r--lang/tcl/patches/patch-pkgs_thread2.8.2_configure (renamed from lang/tcl/patches/patch-pkgs_thread2.8.1_configure)20
-rw-r--r--lang/tcl/patches/patch-unix_Makefile.in8
-rw-r--r--lang/tcl/patches/patch-unix_tclUnixPort.h6
-rw-r--r--lang/tcl/patches/patch-unix_tclUnixSock.c34
18 files changed, 212 insertions, 250 deletions
diff --git a/lang/tcl/Makefile b/lang/tcl/Makefile
index 1e82ca6dc99..f19ca0a91d4 100644
--- a/lang/tcl/Makefile
+++ b/lang/tcl/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.99 2017/11/30 16:45:29 adam Exp $
+# $NetBSD: Makefile,v 1.100 2018/02/03 17:51:19 adam Exp $
DISTNAME= tcl${TCL_VERSION}-src
PKGNAME= tcl-${TCL_VERSION}
-PKGREVISION= 2
CATEGORIES= lang
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tcl/}
diff --git a/lang/tcl/Makefile.version b/lang/tcl/Makefile.version
index 194f6d04047..279fbfb3ec1 100644
--- a/lang/tcl/Makefile.version
+++ b/lang/tcl/Makefile.version
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.version,v 1.22 2017/08/25 11:05:33 adam Exp $
+# $NetBSD: Makefile.version,v 1.23 2018/02/03 17:51:19 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.7
+TCL_VERSION= 8.6.8
# Update bundled versions in lang/tcl/buildlink3.mk
-ITCL_VERSION= 4.1.0
-SQLITE3_VERSION=3.20.0
-TDBC_VERSION= 1.0.5
-THREAD_VERSION= 2.8.1
+ITCL_VERSION= 4.1.1
+SQLITE3_VERSION=3.21.0
+TDBC_VERSION= 1.0.6
+THREAD_VERSION= 2.8.2
diff --git a/lang/tcl/PLIST b/lang/tcl/PLIST
index 2e39147a4d2..18a4cd42e3e 100644
--- a/lang/tcl/PLIST
+++ b/lang/tcl/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.23 2017/08/25 11:05:33 adam Exp $
+@comment $NetBSD: PLIST,v 1.24 2018/02/03 17:51:19 adam Exp $
bin/sqlite3_analyzer
bin/tclsh
bin/tclsh${BASEVER}
@@ -292,15 +292,15 @@ 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.4/tcltest.tcl
lib/tcl${BASEVER}/tcltest2.4/pkgIndex.tcl
+lib/tcl${BASEVER}/tcltest2.4/tcltest.tcl
lib/tcl${BASEVER}/tm.tcl
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.4.1.tm
-lib/tcl8/8.6/http-2.8.11.tm
+lib/tcl8/8.6/http-2.8.12.tm
lib/tcl8/8.6/tdbc/sqlite3-${TDBC_VERSION}.tm
lib/tclConfig.sh
lib/tclooConfig.sh
diff --git a/lang/tcl/buildlink3.mk b/lang/tcl/buildlink3.mk
index fb69e566af8..dd6b75a980a 100644
--- a/lang/tcl/buildlink3.mk
+++ b/lang/tcl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.29 2016/10/21 11:45:44 kamil Exp $
+# $NetBSD: buildlink3.mk,v 1.30 2018/02/03 17:51:19 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.0.5
-TDBC_VERSION= 1.0.4
+ITCL_VERSION= 4.1.1
+TDBC_VERSION= 1.0.6
.include "../../devel/zlib/buildlink3.mk"
.include "../../mk/dlopen.buildlink3.mk"
diff --git a/lang/tcl/distinfo b/lang/tcl/distinfo
index 06e9f7a1cc7..b79654af754 100644
--- a/lang/tcl/distinfo
+++ b/lang/tcl/distinfo
@@ -1,27 +1,26 @@
-$NetBSD: distinfo,v 1.75 2017/09/27 02:53:43 taca Exp $
+$NetBSD: distinfo,v 1.76 2018/02/03 17:51:19 adam Exp $
-SHA1 (tcl8.6.7-src.tar.gz) = 68934c6ecf827348085e0f06c7396b31fb539d83
-RMD160 (tcl8.6.7-src.tar.gz) = 5f114bbd95c7208f929fe9ddb3432636d376844c
-SHA512 (tcl8.6.7-src.tar.gz) = 67f6a4266dbaf5858508a8533e0334f5a76ffc6372cf321922fd032fe34f74df0368f9a3059a885e29bb0f4f7f99c78d91b8fc3700d4fa7a7f1653b436c3a154
-Size (tcl8.6.7-src.tar.gz) = 9687799 bytes
+SHA1 (tcl8.6.8-src.tar.gz) = 0d014d97ca38534d4be1dfc6c563a7a3a6aa737f
+RMD160 (tcl8.6.8-src.tar.gz) = 53723adf560606dc0403af568b6fc0d27a4fd93d
+SHA512 (tcl8.6.8-src.tar.gz) = 14fb8fd880ecedda61119556f404fa1da34146f82dbf771be2ab322c6c575a898e194016dc3300f6764008d8f3bf59b07e31723bf8a3aafdcee6b4ef7667b18e
+Size (tcl8.6.8-src.tar.gz) = 9793786 bytes
SHA1 (patch-generic_tclInt.h) = fde6a5458a138b6d61fdbab1269b1c5111a28b22
SHA1 (patch-generic_tclPort.h) = 36ff05b22591d588952e55d0f13c2ef52e371d1e
SHA1 (patch-generic_tclPosixStr.c) = 68da211865282fe7124cad71381658f8dfb986d6
-SHA1 (patch-pkgs_itcl4.1.0_configure) = 98339559decd7ebc8fe17b5d68a325caca7eda4f
-SHA1 (patch-pkgs_sqlite3.20.0_Makefile.in) = fae382e994aa4d64f7a378a79052f0ab0fe31ad5
-SHA1 (patch-pkgs_sqlite3.20.0_configure) = 89558eb615ecb8bc77a93daf3aec008eef7c108a
-SHA1 (patch-pkgs_tdbc1.0.5_configure) = 56c18f7db759b55395c9afb93ce35d0ebf249f59
-SHA1 (patch-pkgs_tdbcmysql1.0.5_configure) = d2378b6f84549436bc754f3de3662546a4e481fb
-SHA1 (patch-pkgs_tdbcodbc1.0.5_configure) = c823f391169f2169d9336d31623e0342ac81ba44
-SHA1 (patch-pkgs_tdbcpostgres1.0.5_configure) = 77a0310fb607f08617b04494056cab614d504d7c
-SHA1 (patch-pkgs_thread2.8.1_configure) = 6989cf8c8aca8b1ff4a25226449e1dbfed47c298
+SHA1 (patch-pkgs_itcl4.1.1_configure) = 6c028591222d64c428503cfebcd31a12cd27dd5b
+SHA1 (patch-pkgs_sqlite3.21.0_Makefile.in) = 4b3aee3a46d076cfce2ec09b04bafe9fa7fe55f5
+SHA1 (patch-pkgs_sqlite3.21.0_configure) = f4e679405cb21b06d4c5b32696e065f1b149f84b
+SHA1 (patch-pkgs_tdbc1.0.6_configure) = 5631f7e295ed3fedee42c97e9c6a7d7a65a8abfc
+SHA1 (patch-pkgs_tdbcmysql1.0.6_configure) = efc7538436ac5641fc3efeeb9e956a628010dcfa
+SHA1 (patch-pkgs_tdbcodbc1.0.6_configure) = d6611925fd8297a8fb768ccd9cdf1b3c6f9b4b63
+SHA1 (patch-pkgs_tdbcpostgres1.0.6_configure) = d4dece122331aa8ca293888abef85767cf71d0e1
+SHA1 (patch-pkgs_thread2.8.2_configure) = 22b494adca5a8ea1f70d9b02baddfdd554d71064
SHA1 (patch-tests_load.test) = 438695ab76e01646e49aadc01c44344a5495eabb
SHA1 (patch-tests_pkgMkIndex.test) = 70d1042c1f4743052c5fa191fa7c4732a08e28a2
-SHA1 (patch-unix_Makefile.in) = 883559e3292ad984a145d0686ae98d73064d2961
+SHA1 (patch-unix_Makefile.in) = 6a8df92fb7dc97142ad60c72eece1062f5de1096
SHA1 (patch-unix_configure) = 16d5030085a66b69e61ab3d55e1fd97e9a8c1836
SHA1 (patch-unix_tclConfig.sh.in) = 341ac4f1bbfb29551dea87ade98b3b7b59652a31
SHA1 (patch-unix_tclUnixCompat.c) = 7ffa40a1a56345f5b86cd896e8e3b0d5748d8c5e
SHA1 (patch-unix_tclUnixFCmd.c) = e715d9419a36a8414355252bb3da0ef48b07fe4f
SHA1 (patch-unix_tclUnixInit.c) = 50eafafdd10e35266f9fe5b73a80e7b50f393f88
-SHA1 (patch-unix_tclUnixPort.h) = f7d2e7b8912b9bff1709ac2c34aee1f4725e90ac
-SHA1 (patch-unix_tclUnixSock.c) = 77c09de2786ec5f8c4a5ab4004acf5172fa1fe3b
+SHA1 (patch-unix_tclUnixPort.h) = 9eff7a5d5842fe208b467fd2ad844192e2e6aec7
diff --git a/lang/tcl/patches/patch-pkgs_itcl4.1.0_configure b/lang/tcl/patches/patch-pkgs_itcl4.1.0_configure
deleted file mode 100644
index 49a53652dd2..00000000000
--- a/lang/tcl/patches/patch-pkgs_itcl4.1.0_configure
+++ /dev/null
@@ -1,63 +0,0 @@
-$NetBSD: patch-pkgs_itcl4.1.0_configure,v 1.1 2017/08/25 11:05:33 adam Exp $
-
-Add support for DragonFly.
-
-Honor LDFLAGS on NetBSD.
-https://core.tcl.tk/tcl/tktview/fed5069f8a8e59e97af0a784b534919f5b789b1e
-
---- pkgs/itcl4.1.0/configure.orig 2016-07-12 15:29:40.000000000 +0000
-+++ pkgs/itcl4.1.0/configure
-@@ -7443,8 +7443,7 @@ fi
- CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
- fi
- LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
-- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so${SHLIB_VERSION}'
-- LDFLAGS="-Wl,-export-dynamic"
-+ LDFLAGS="-Wl,--export-dynamic"
- ;;
- esac
- case "$arch" in
-@@ -7464,13 +7463,11 @@ 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
- SHLIB_CFLAGS="-fPIC"
-- SHLIB_LD='${CC} -shared ${SHLIB_CFLAGS}'
-+ SHLIB_LD='${CC} -shared ${SHLIB_CFLAGS} ${LDFLAGS_DEFAULT}'
- SHLIB_SUFFIX=".so"
- LDFLAGS="$LDFLAGS -export-dynamic"
- if test $doRpath = yes; then :
-@@ -7487,7 +7484,7 @@ fi
-
- fi
- ;;
-- FreeBSD-*)
-+ FreeBSD-*|DragonFly-*)
- # This configuration from FreeBSD Ports.
- SHLIB_CFLAGS="-fPIC"
- SHLIB_LD="${CC} -shared"
-@@ -7509,10 +7506,6 @@ fi
- case $system in
- FreeBSD-3.*)
- # Version numbers are dot-stripped by system policy.
-- TCL_TRIM_DOTS=`echo ${PACKAGE_VERSION} | tr -d .`
-- UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
-- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'
-- TCL_LIB_VERSIONS_OK=nodots
- ;;
- esac
- ;;
-@@ -8123,7 +8116,7 @@ fi
- BSD/OS*) ;;
- CYGWIN_*|MINGW32_*) ;;
- IRIX*) ;;
-- NetBSD-*|FreeBSD-*|OpenBSD-*) ;;
-+ NetBSD-*|FreeBSD-*|OpenBSD-*|DragonFly-*) ;;
- Darwin-*) ;;
- SCO_SV-3.2*) ;;
- windows) ;;
diff --git a/lang/tcl/patches/patch-pkgs_itcl4.1.1_configure b/lang/tcl/patches/patch-pkgs_itcl4.1.1_configure
new file mode 100644
index 00000000000..cc2e5104920
--- /dev/null
+++ b/lang/tcl/patches/patch-pkgs_itcl4.1.1_configure
@@ -0,0 +1,62 @@
+$NetBSD: patch-pkgs_itcl4.1.1_configure,v 1.1 2018/02/03 17:51:19 adam Exp $
+
+Add support for DragonFly.
+
+Honor LDFLAGS on NetBSD.
+https://core.tcl.tk/tcl/tktview/fed5069f8a8e59e97af0a784b534919f5b789b1e
+
+--- pkgs/itcl4.1.1/configure.orig 2017-12-15 18:00:37.000000000 +0000
++++ pkgs/itcl4.1.1/configure
+@@ -7428,7 +7428,7 @@ 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 :
+
+@@ -7439,13 +7439,11 @@ 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
+ SHLIB_CFLAGS="-fPIC"
+- SHLIB_LD='${CC} ${SHLIB_CFLAGS} -shared'
++ SHLIB_LD='${CC} ${SHLIB_CFLAGS} -shared ${LDFLAGS_DEFAULT}'
+ SHLIB_SUFFIX=".so"
+ LDFLAGS="$LDFLAGS -export-dynamic"
+ if test $doRpath = yes; then :
+@@ -7462,7 +7460,7 @@ fi
+
+ fi
+ ;;
+- FreeBSD-*)
++ FreeBSD-*|DragonFly-*)
+ # This configuration from FreeBSD Ports.
+ SHLIB_CFLAGS="-fPIC"
+ SHLIB_LD="${CC} -shared"
+@@ -7484,10 +7482,6 @@ fi
+ case $system in
+ FreeBSD-3.*)
+ # Version numbers are dot-stripped by system policy.
+- TCL_TRIM_DOTS=`echo ${PACKAGE_VERSION} | tr -d .`
+- UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
+- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'
+- TCL_LIB_VERSIONS_OK=nodots
+ ;;
+ esac
+ ;;
+@@ -8098,7 +8092,7 @@ fi
+ BSD/OS*) ;;
+ CYGWIN_*|MINGW32_*) ;;
+ IRIX*) ;;
+- NetBSD-*|FreeBSD-*|OpenBSD-*) ;;
++ NetBSD-*|FreeBSD-*|OpenBSD-*|DragonFly-*) ;;
+ Darwin-*) ;;
+ SCO_SV-3.2*) ;;
+ windows) ;;
diff --git a/lang/tcl/patches/patch-pkgs_sqlite3.20.0_Makefile.in b/lang/tcl/patches/patch-pkgs_sqlite3.21.0_Makefile.in
index ec630d091c3..3ae500bae37 100644
--- a/lang/tcl/patches/patch-pkgs_sqlite3.20.0_Makefile.in
+++ b/lang/tcl/patches/patch-pkgs_sqlite3.21.0_Makefile.in
@@ -1,9 +1,9 @@
-$NetBSD: patch-pkgs_sqlite3.20.0_Makefile.in,v 1.1 2017/08/25 11:05:33 adam Exp $
+$NetBSD: patch-pkgs_sqlite3.21.0_Makefile.in,v 1.1 2018/02/03 17:51:19 adam Exp $
Fix building with system sqlite3.
---- pkgs/sqlite3.20.0/Makefile.in.orig 2016-01-07 15:38:22.000000000 +0000
-+++ pkgs/sqlite3.20.0/Makefile.in
+--- pkgs/sqlite3.21.0/Makefile.in.orig 2016-01-07 15:38:22.000000000 +0000
++++ pkgs/sqlite3.21.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.20.0_configure b/lang/tcl/patches/patch-pkgs_sqlite3.21.0_configure
index a214dcb88e8..98e7abc47e2 100644
--- a/lang/tcl/patches/patch-pkgs_sqlite3.20.0_configure
+++ b/lang/tcl/patches/patch-pkgs_sqlite3.21.0_configure
@@ -1,13 +1,13 @@
-$NetBSD: patch-pkgs_sqlite3.20.0_configure,v 1.1 2017/08/25 11:05:33 adam Exp $
+$NetBSD: patch-pkgs_sqlite3.21.0_configure,v 1.1 2018/02/03 17:51:19 adam Exp $
Add support for DragonFly.
Honor LDFLAGS on NetBSD.
https://core.tcl.tk/tcl/tktview/fed5069f8a8e59e97af0a784b534919f5b789b1e
---- pkgs/sqlite3.20.0/configure.orig 2017-08-04 11:57:41.000000000 +0000
-+++ pkgs/sqlite3.20.0/configure
-@@ -7409,7 +7409,7 @@ fi
+--- pkgs/sqlite3.21.0/configure.orig 2017-12-21 13:58:19.000000000 +0000
++++ pkgs/sqlite3.21.0/configure
+@@ -7399,7 +7399,7 @@ fi
fi
LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so${SHLIB_VERSION}'
@@ -16,7 +16,7 @@ https://core.tcl.tk/tcl/tktview/fed5069f8a8e59e97af0a784b534919f5b789b1e
CFLAGS_OPTIMIZE="-O2"
if test "${TCL_THREADS}" = "1"; then :
-@@ -7420,13 +7420,11 @@ fi
+@@ -7410,13 +7410,11 @@ fi
fi
# OpenBSD doesn't do version numbers with dots.
@@ -26,12 +26,12 @@ https://core.tcl.tk/tcl/tktview/fed5069f8a8e59e97af0a784b534919f5b789b1e
NetBSD-*)
# NetBSD has ELF and can use 'cc -shared' to build shared libs
SHLIB_CFLAGS="-fPIC"
-- SHLIB_LD='${CC} -shared ${SHLIB_CFLAGS}'
-+ SHLIB_LD='${CC} -shared ${SHLIB_CFLAGS} ${LDFLAGS_DEFAULT}'
+- SHLIB_LD='${CC} ${SHLIB_CFLAGS} -shared'
++ SHLIB_LD='${CC} ${SHLIB_CFLAGS} -shared ${LDFLAGS_DEFAULT}'
SHLIB_SUFFIX=".so"
LDFLAGS="$LDFLAGS -export-dynamic"
if test $doRpath = yes; then :
-@@ -7443,7 +7441,7 @@ fi
+@@ -7433,7 +7431,7 @@ fi
fi
;;
@@ -40,7 +40,7 @@ https://core.tcl.tk/tcl/tktview/fed5069f8a8e59e97af0a784b534919f5b789b1e
# This configuration from FreeBSD Ports.
SHLIB_CFLAGS="-fPIC"
SHLIB_LD="${CC} -shared"
-@@ -7465,10 +7463,6 @@ fi
+@@ -7455,10 +7453,6 @@ fi
case $system in
FreeBSD-3.*)
# Version numbers are dot-stripped by system policy.
@@ -51,7 +51,7 @@ https://core.tcl.tk/tcl/tktview/fed5069f8a8e59e97af0a784b534919f5b789b1e
;;
esac
;;
-@@ -8079,7 +8073,7 @@ fi
+@@ -8069,7 +8063,7 @@ fi
BSD/OS*) ;;
CYGWIN_*|MINGW32_*) ;;
IRIX*) ;;
diff --git a/lang/tcl/patches/patch-pkgs_tdbc1.0.5_configure b/lang/tcl/patches/patch-pkgs_tdbc1.0.5_configure
deleted file mode 100644
index f6bcc445eae..00000000000
--- a/lang/tcl/patches/patch-pkgs_tdbc1.0.5_configure
+++ /dev/null
@@ -1,63 +0,0 @@
-$NetBSD: patch-pkgs_tdbc1.0.5_configure,v 1.1 2017/08/25 11:05:33 adam Exp $
-
-Add support for DragonFly.
-
-Honor LDFLAGS on NetBSD.
-https://core.tcl.tk/tcl/tktview/fed5069f8a8e59e97af0a784b534919f5b789b1e
-
---- pkgs/tdbc1.0.5/configure.orig 2017-05-04 18:55:32.000000000 +0000
-+++ pkgs/tdbc1.0.5/configure
-@@ -7559,8 +7559,7 @@ fi
- CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
- fi
- LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
-- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so${SHLIB_VERSION}'
-- LDFLAGS="-Wl,-export-dynamic"
-+ LDFLAGS="-Wl,--export-dynamic"
- ;;
- esac
- case "$arch" in
-@@ -7580,13 +7579,11 @@ 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
- SHLIB_CFLAGS="-fPIC"
-- SHLIB_LD='${CC} -shared ${SHLIB_CFLAGS}'
-+ SHLIB_LD='${CC} -shared ${SHLIB_CFLAGS} ${LDFLAGS_DEFAULT}'
- SHLIB_SUFFIX=".so"
- LDFLAGS="$LDFLAGS -export-dynamic"
- if test $doRpath = yes; then :
-@@ -7603,7 +7600,7 @@ fi
-
- fi
- ;;
-- FreeBSD-*)
-+ FreeBSD-*|DragonFly-*)
- # This configuration from FreeBSD Ports.
- SHLIB_CFLAGS="-fPIC"
- SHLIB_LD="${CC} -shared"
-@@ -7625,10 +7622,6 @@ fi
- case $system in
- FreeBSD-3.*)
- # Version numbers are dot-stripped by system policy.
-- TCL_TRIM_DOTS=`echo ${PACKAGE_VERSION} | tr -d .`
-- UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
-- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'
-- TCL_LIB_VERSIONS_OK=nodots
- ;;
- esac
- ;;
-@@ -8239,7 +8232,7 @@ fi
- BSD/OS*) ;;
- CYGWIN_*|MINGW32_*) ;;
- IRIX*) ;;
-- NetBSD-*|FreeBSD-*|OpenBSD-*) ;;
-+ NetBSD-*|FreeBSD-*|OpenBSD-*|DragonFly-*) ;;
- Darwin-*) ;;
- SCO_SV-3.2*) ;;
- windows) ;;
diff --git a/lang/tcl/patches/patch-pkgs_tdbc1.0.6_configure b/lang/tcl/patches/patch-pkgs_tdbc1.0.6_configure
new file mode 100644
index 00000000000..bbb3af62d04
--- /dev/null
+++ b/lang/tcl/patches/patch-pkgs_tdbc1.0.6_configure
@@ -0,0 +1,62 @@
+$NetBSD: patch-pkgs_tdbc1.0.6_configure,v 1.1 2018/02/03 17:51:19 adam Exp $
+
+Add support for DragonFly.
+
+Honor LDFLAGS on NetBSD.
+https://core.tcl.tk/tcl/tktview/fed5069f8a8e59e97af0a784b534919f5b789b1e
+
+--- pkgs/tdbc1.0.6/configure.orig 2017-12-19 14:13:49.000000000 +0000
++++ pkgs/tdbc1.0.6/configure
+@@ -7544,7 +7544,7 @@ 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 :
+
+@@ -7555,13 +7555,11 @@ 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
+ SHLIB_CFLAGS="-fPIC"
+- SHLIB_LD='${CC} ${SHLIB_CFLAGS} -shared'
++ SHLIB_LD='${CC} ${SHLIB_CFLAGS} -shared ${LDFLAGS_DEFAULT}'
+ SHLIB_SUFFIX=".so"
+ LDFLAGS="$LDFLAGS -export-dynamic"
+ if test $doRpath = yes; then :
+@@ -7578,7 +7576,7 @@ fi
+
+ fi
+ ;;
+- FreeBSD-*)
++ FreeBSD-*|DragonFly-*)
+ # This configuration from FreeBSD Ports.
+ SHLIB_CFLAGS="-fPIC"
+ SHLIB_LD="${CC} -shared"
+@@ -7600,10 +7598,6 @@ fi
+ case $system in
+ FreeBSD-3.*)
+ # Version numbers are dot-stripped by system policy.
+- TCL_TRIM_DOTS=`echo ${PACKAGE_VERSION} | tr -d .`
+- UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
+- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'
+- TCL_LIB_VERSIONS_OK=nodots
+ ;;
+ esac
+ ;;
+@@ -8214,7 +8208,7 @@ fi
+ BSD/OS*) ;;
+ CYGWIN_*|MINGW32_*) ;;
+ IRIX*) ;;
+- NetBSD-*|FreeBSD-*|OpenBSD-*) ;;
++ NetBSD-*|FreeBSD-*|OpenBSD-*|DragonFly-*) ;;
+ Darwin-*) ;;
+ SCO_SV-3.2*) ;;
+ windows) ;;
diff --git a/lang/tcl/patches/patch-pkgs_tdbcmysql1.0.5_configure b/lang/tcl/patches/patch-pkgs_tdbcmysql1.0.6_configure
index 69b63d42117..8e21c4297e1 100644
--- a/lang/tcl/patches/patch-pkgs_tdbcmysql1.0.5_configure
+++ b/lang/tcl/patches/patch-pkgs_tdbcmysql1.0.6_configure
@@ -1,13 +1,13 @@
-$NetBSD: patch-pkgs_tdbcmysql1.0.5_configure,v 1.1 2017/08/25 11:05:33 adam Exp $
+$NetBSD: patch-pkgs_tdbcmysql1.0.6_configure,v 1.1 2018/02/03 17:51:19 adam Exp $
Add support for DragonFly.
Honor LDFLAGS on NetBSD.
https://core.tcl.tk/tcl/tktview/fed5069f8a8e59e97af0a784b534919f5b789b1e
---- pkgs/tdbcmysql1.0.5/configure.orig 2017-07-28 18:41:39.000000000 +0000
-+++ pkgs/tdbcmysql1.0.5/configure
-@@ -7901,7 +7901,7 @@ fi
+--- pkgs/tdbcmysql1.0.6/configure.orig 2017-12-19 14:16:04.000000000 +0000
++++ pkgs/tdbcmysql1.0.6/configure
+@@ -7890,7 +7890,7 @@ fi
fi
LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so${SHLIB_VERSION}'
@@ -16,7 +16,7 @@ https://core.tcl.tk/tcl/tktview/fed5069f8a8e59e97af0a784b534919f5b789b1e
CFLAGS_OPTIMIZE="-O2"
if test "${TCL_THREADS}" = "1"; then :
-@@ -7912,13 +7912,11 @@ fi
+@@ -7901,13 +7901,11 @@ fi
fi
# OpenBSD doesn't do version numbers with dots.
@@ -26,12 +26,12 @@ https://core.tcl.tk/tcl/tktview/fed5069f8a8e59e97af0a784b534919f5b789b1e
NetBSD-*)
# NetBSD has ELF and can use 'cc -shared' to build shared libs
SHLIB_CFLAGS="-fPIC"
-- SHLIB_LD='${CC} -shared ${SHLIB_CFLAGS}'
-+ SHLIB_LD='${CC} -shared ${SHLIB_CFLAGS} ${LDFLAGS_DEFAULT}'
+- SHLIB_LD='${CC} ${SHLIB_CFLAGS} -shared'
++ SHLIB_LD='${CC} ${SHLIB_CFLAGS} -shared ${LDFLAGS_DEFAULT}'
SHLIB_SUFFIX=".so"
LDFLAGS="$LDFLAGS -export-dynamic"
if test $doRpath = yes; then :
-@@ -7935,7 +7933,7 @@ fi
+@@ -7924,7 +7922,7 @@ fi
fi
;;
@@ -40,7 +40,7 @@ https://core.tcl.tk/tcl/tktview/fed5069f8a8e59e97af0a784b534919f5b789b1e
# This configuration from FreeBSD Ports.
SHLIB_CFLAGS="-fPIC"
SHLIB_LD="${CC} -shared"
-@@ -7957,10 +7955,6 @@ fi
+@@ -7946,10 +7944,6 @@ fi
case $system in
FreeBSD-3.*)
# Version numbers are dot-stripped by system policy.
@@ -51,7 +51,7 @@ https://core.tcl.tk/tcl/tktview/fed5069f8a8e59e97af0a784b534919f5b789b1e
;;
esac
;;
-@@ -8571,7 +8565,7 @@ fi
+@@ -8560,7 +8554,7 @@ fi
BSD/OS*) ;;
CYGWIN_*|MINGW32_*) ;;
IRIX*) ;;
diff --git a/lang/tcl/patches/patch-pkgs_tdbcodbc1.0.5_configure b/lang/tcl/patches/patch-pkgs_tdbcodbc1.0.6_configure
index 3156488ed75..7d68479f0b1 100644
--- a/lang/tcl/patches/patch-pkgs_tdbcodbc1.0.5_configure
+++ b/lang/tcl/patches/patch-pkgs_tdbcodbc1.0.6_configure
@@ -1,13 +1,13 @@
-$NetBSD: patch-pkgs_tdbcodbc1.0.5_configure,v 1.1 2017/08/25 11:05:33 adam Exp $
+$NetBSD: patch-pkgs_tdbcodbc1.0.6_configure,v 1.1 2018/02/03 17:51:19 adam Exp $
Add support for DragonFly.
Honor LDFLAGS on NetBSD.
https://core.tcl.tk/tcl/tktview/fed5069f8a8e59e97af0a784b534919f5b789b1e
---- pkgs/tdbcodbc1.0.5/configure.orig 2017-07-28 18:41:55.000000000 +0000
-+++ pkgs/tdbcodbc1.0.5/configure
-@@ -7911,7 +7911,7 @@ fi
+--- pkgs/tdbcodbc1.0.6/configure.orig 2017-12-19 14:16:21.000000000 +0000
++++ pkgs/tdbcodbc1.0.6/configure
+@@ -7900,7 +7900,7 @@ fi
fi
LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so${SHLIB_VERSION}'
@@ -16,7 +16,7 @@ https://core.tcl.tk/tcl/tktview/fed5069f8a8e59e97af0a784b534919f5b789b1e
CFLAGS_OPTIMIZE="-O2"
if test "${TCL_THREADS}" = "1"; then :
-@@ -7922,13 +7922,11 @@ fi
+@@ -7911,13 +7911,11 @@ fi
fi
# OpenBSD doesn't do version numbers with dots.
@@ -26,12 +26,12 @@ https://core.tcl.tk/tcl/tktview/fed5069f8a8e59e97af0a784b534919f5b789b1e
NetBSD-*)
# NetBSD has ELF and can use 'cc -shared' to build shared libs
SHLIB_CFLAGS="-fPIC"
-- SHLIB_LD='${CC} -shared ${SHLIB_CFLAGS}'
-+ SHLIB_LD='${CC} -shared ${SHLIB_CFLAGS} ${LDFLAGS_DEFAULT}'
+- SHLIB_LD='${CC} ${SHLIB_CFLAGS} -shared'
++ SHLIB_LD='${CC} ${SHLIB_CFLAGS} -shared ${LDFLAGS_DEFAULT}'
SHLIB_SUFFIX=".so"
LDFLAGS="$LDFLAGS -export-dynamic"
if test $doRpath = yes; then :
-@@ -7945,7 +7943,7 @@ fi
+@@ -7934,7 +7932,7 @@ fi
fi
;;
@@ -40,7 +40,7 @@ https://core.tcl.tk/tcl/tktview/fed5069f8a8e59e97af0a784b534919f5b789b1e
# This configuration from FreeBSD Ports.
SHLIB_CFLAGS="-fPIC"
SHLIB_LD="${CC} -shared"
-@@ -7967,10 +7965,6 @@ fi
+@@ -7956,10 +7954,6 @@ fi
case $system in
FreeBSD-3.*)
# Version numbers are dot-stripped by system policy.
@@ -51,7 +51,7 @@ https://core.tcl.tk/tcl/tktview/fed5069f8a8e59e97af0a784b534919f5b789b1e
;;
esac
;;
-@@ -8581,7 +8575,7 @@ fi
+@@ -8570,7 +8564,7 @@ fi
BSD/OS*) ;;
CYGWIN_*|MINGW32_*) ;;
IRIX*) ;;
diff --git a/lang/tcl/patches/patch-pkgs_tdbcpostgres1.0.5_configure b/lang/tcl/patches/patch-pkgs_tdbcpostgres1.0.6_configure
index e3e255899f6..ac9528714f9 100644
--- a/lang/tcl/patches/patch-pkgs_tdbcpostgres1.0.5_configure
+++ b/lang/tcl/patches/patch-pkgs_tdbcpostgres1.0.6_configure
@@ -1,13 +1,13 @@
-$NetBSD: patch-pkgs_tdbcpostgres1.0.5_configure,v 1.1 2017/08/25 11:05:33 adam Exp $
+$NetBSD: patch-pkgs_tdbcpostgres1.0.6_configure,v 1.1 2018/02/03 17:51:19 adam Exp $
Add support for DragonFly.
Honor LDFLAGS on NetBSD.
https://core.tcl.tk/tcl/tktview/fed5069f8a8e59e97af0a784b534919f5b789b1e
---- pkgs/tdbcpostgres1.0.5/configure.orig 2017-08-09 14:45:57.000000000 +0000
-+++ pkgs/tdbcpostgres1.0.5/configure
-@@ -7901,7 +7901,7 @@ fi
+--- pkgs/tdbcpostgres1.0.6/configure.orig 2017-12-21 18:16:25.000000000 +0000
++++ pkgs/tdbcpostgres1.0.6/configure
+@@ -7890,7 +7890,7 @@ fi
fi
LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so${SHLIB_VERSION}'
@@ -16,7 +16,7 @@ https://core.tcl.tk/tcl/tktview/fed5069f8a8e59e97af0a784b534919f5b789b1e
CFLAGS_OPTIMIZE="-O2"
if test "${TCL_THREADS}" = "1"; then :
-@@ -7912,13 +7912,11 @@ fi
+@@ -7901,13 +7901,11 @@ fi
fi
# OpenBSD doesn't do version numbers with dots.
@@ -26,12 +26,12 @@ https://core.tcl.tk/tcl/tktview/fed5069f8a8e59e97af0a784b534919f5b789b1e
NetBSD-*)
# NetBSD has ELF and can use 'cc -shared' to build shared libs
SHLIB_CFLAGS="-fPIC"
-- SHLIB_LD='${CC} -shared ${SHLIB_CFLAGS}'
-+ SHLIB_LD='${CC} -shared ${SHLIB_CFLAGS} ${LDFLAGS_DEFAULT}'
+- SHLIB_LD='${CC} ${SHLIB_CFLAGS} -shared'
++ SHLIB_LD='${CC} ${SHLIB_CFLAGS} -shared ${LDFLAGS_DEFAULT}'
SHLIB_SUFFIX=".so"
LDFLAGS="$LDFLAGS -export-dynamic"
if test $doRpath = yes; then :
-@@ -7935,7 +7933,7 @@ fi
+@@ -7924,7 +7922,7 @@ fi
fi
;;
@@ -40,7 +40,7 @@ https://core.tcl.tk/tcl/tktview/fed5069f8a8e59e97af0a784b534919f5b789b1e
# This configuration from FreeBSD Ports.
SHLIB_CFLAGS="-fPIC"
SHLIB_LD="${CC} -shared"
-@@ -7957,10 +7955,6 @@ fi
+@@ -7946,10 +7944,6 @@ fi
case $system in
FreeBSD-3.*)
# Version numbers are dot-stripped by system policy.
@@ -51,7 +51,7 @@ https://core.tcl.tk/tcl/tktview/fed5069f8a8e59e97af0a784b534919f5b789b1e
;;
esac
;;
-@@ -8571,7 +8565,7 @@ fi
+@@ -8560,7 +8554,7 @@ fi
BSD/OS*) ;;
CYGWIN_*|MINGW32_*) ;;
IRIX*) ;;
diff --git a/lang/tcl/patches/patch-pkgs_thread2.8.1_configure b/lang/tcl/patches/patch-pkgs_thread2.8.2_configure
index 6e2678ee46c..71f9e96fefd 100644
--- a/lang/tcl/patches/patch-pkgs_thread2.8.1_configure
+++ b/lang/tcl/patches/patch-pkgs_thread2.8.2_configure
@@ -1,13 +1,13 @@
-$NetBSD: patch-pkgs_thread2.8.1_configure,v 1.1 2017/08/25 11:05:33 adam Exp $
+$NetBSD: patch-pkgs_thread2.8.2_configure,v 1.1 2018/02/03 17:51:19 adam Exp $
Add support for DragonFly.
Honor LDFLAGS on NetBSD.
https://core.tcl.tk/tcl/tktview/fed5069f8a8e59e97af0a784b534919f5b789b1e
---- pkgs/thread2.8.1/configure.orig 2017-05-23 13:17:07.000000000 +0000
-+++ pkgs/thread2.8.1/configure
-@@ -7514,7 +7514,7 @@ fi
+--- pkgs/thread2.8.2/configure.orig 2017-12-14 13:34:48.000000000 +0000
++++ pkgs/thread2.8.2/configure
+@@ -7504,7 +7504,7 @@ fi
fi
LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so${SHLIB_VERSION}'
@@ -16,7 +16,7 @@ https://core.tcl.tk/tcl/tktview/fed5069f8a8e59e97af0a784b534919f5b789b1e
CFLAGS_OPTIMIZE="-O2"
if test "${TCL_THREADS}" = "1"; then :
-@@ -7525,13 +7525,11 @@ fi
+@@ -7515,13 +7515,11 @@ fi
fi
# OpenBSD doesn't do version numbers with dots.
@@ -26,12 +26,12 @@ https://core.tcl.tk/tcl/tktview/fed5069f8a8e59e97af0a784b534919f5b789b1e
NetBSD-*)
# NetBSD has ELF and can use 'cc -shared' to build shared libs
SHLIB_CFLAGS="-fPIC"
-- SHLIB_LD='${CC} -shared ${SHLIB_CFLAGS}'
-+ SHLIB_LD='${CC} -shared ${SHLIB_CFLAGS} ${LDFLAGS_DEFAULT}'
+- SHLIB_LD='${CC} ${SHLIB_CFLAGS} -shared'
++ SHLIB_LD='${CC} ${SHLIB_CFLAGS} -shared ${LDFLAGS_DEFAULT}'
SHLIB_SUFFIX=".so"
LDFLAGS="$LDFLAGS -export-dynamic"
if test $doRpath = yes; then :
-@@ -7548,7 +7546,7 @@ fi
+@@ -7538,7 +7536,7 @@ fi
fi
;;
@@ -40,7 +40,7 @@ https://core.tcl.tk/tcl/tktview/fed5069f8a8e59e97af0a784b534919f5b789b1e
# This configuration from FreeBSD Ports.
SHLIB_CFLAGS="-fPIC"
SHLIB_LD="${CC} -shared"
-@@ -7570,10 +7568,6 @@ fi
+@@ -7560,10 +7558,6 @@ fi
case $system in
FreeBSD-3.*)
# Version numbers are dot-stripped by system policy.
@@ -51,7 +51,7 @@ https://core.tcl.tk/tcl/tktview/fed5069f8a8e59e97af0a784b534919f5b789b1e
;;
esac
;;
-@@ -8184,7 +8178,7 @@ fi
+@@ -8174,7 +8168,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 40732c952db..d2ccc82ab87 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.13 2017/08/25 11:05:33 adam Exp $
+$NetBSD: patch-unix_Makefile.in,v 1.14 2018/02/03 17:51:19 adam Exp $
Honour LDFLAGS.
---- unix/Makefile.in.orig 2016-07-26 14:07:18.000000000 +0000
+--- unix/Makefile.in.orig 2017-12-21 18:16:25.000000000 +0000
+++ unix/Makefile.in
@@ -8,6 +8,7 @@ VERSION = @TCL_VERSION@
MAJOR_VERSION = @TCL_MAJOR_VERSION@
@@ -106,8 +106,8 @@ Honour LDFLAGS.
echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \
@@ -842,6 +858,8 @@ install-libraries: libraries
done;
- @echo "Installing package http 2.8.11 as a Tcl Module";
- @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.6/http-2.8.11.tm;
+ @echo "Installing package http 2.8.12 as a Tcl Module";
+ @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.6/http-2.8.12.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/";
diff --git a/lang/tcl/patches/patch-unix_tclUnixPort.h b/lang/tcl/patches/patch-unix_tclUnixPort.h
index 7eda90a809d..db3e2ff2c39 100644
--- a/lang/tcl/patches/patch-unix_tclUnixPort.h
+++ b/lang/tcl/patches/patch-unix_tclUnixPort.h
@@ -1,9 +1,9 @@
-$NetBSD: patch-unix_tclUnixPort.h,v 1.4 2016/03/06 11:47:49 adam Exp $
+$NetBSD: patch-unix_tclUnixPort.h,v 1.5 2018/02/03 17:51:19 adam Exp $
---- unix/tclUnixPort.h.orig 2016-02-25 20:12:38.000000000 +0000
+--- unix/tclUnixPort.h.orig 2017-10-13 13:41:43.000000000 +0000
+++ unix/tclUnixPort.h
@@ -145,11 +145,7 @@ typedef off_t Tcl_SeekOffset;
- #if HAVE_STDINT_H
+ #ifdef HAVE_STDINT_H
# include <stdint.h>
#endif
-#ifdef HAVE_UNISTD_H
diff --git a/lang/tcl/patches/patch-unix_tclUnixSock.c b/lang/tcl/patches/patch-unix_tclUnixSock.c
deleted file mode 100644
index 8275f185153..00000000000
--- a/lang/tcl/patches/patch-unix_tclUnixSock.c
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-unix_tclUnixSock.c,v 1.1 2017/09/27 02:53:43 taca Exp $
-
-* Move pragmas to make gcc happy;
- http://core.tcl.tk/tcl/vinfo/dce77b1b201e9329
-
---- unix/tclUnixSock.c.orig 2017-04-28 18:05:52.000000000 +0000
-+++ unix/tclUnixSock.c
-@@ -700,6 +700,8 @@ TcpClose2Proc(
- */
-
- #ifndef NEED_FAKE_RFC2553
-+#pragma GCC diagnostic push
-+#pragma GCC diagnostic ignored "-Wstrict-aliasing"
- static inline int
- IPv6AddressNeedsNumericRendering(
- struct in6_addr addr)
-@@ -713,16 +715,14 @@ IPv6AddressNeedsNumericRendering(
- * at least some versions of OSX.
- */
-
--#pragma GCC diagnostic push
--#pragma GCC diagnostic ignored "-Wstrict-aliasing"
- if (!IN6_IS_ADDR_V4MAPPED(&addr)) {
--#pragma GCC diagnostic pop
- return 0;
- }
-
- return (addr.s6_addr[12] == 0 && addr.s6_addr[13] == 0
- && addr.s6_addr[14] == 0 && addr.s6_addr[15] == 0);
- }
-+#pragma GCC diagnostic pop
- #endif /* NEED_FAKE_RFC2553 */
-
- static void