summaryrefslogtreecommitdiff
path: root/lang/tcl
diff options
context:
space:
mode:
authoradam <adam@pkgsrc.org>2016-03-06 11:47:49 +0000
committeradam <adam@pkgsrc.org>2016-03-06 11:47:49 +0000
commitd6f6ecbcf3dcc406599fbaf1908300d5fd8c8533 (patch)
tree3d24ce798b15797ebc932720a5bb7f32bf80e917 /lang/tcl
parent9d08802609025a755b00917ffc2cf90206c49cd5 (diff)
downloadpkgsrc-d6f6ecbcf3dcc406599fbaf1908300d5fd8c8533.tar.gz
Changes 8.6.5:
Bug fixes.
Diffstat (limited to 'lang/tcl')
-rw-r--r--lang/tcl/Makefile21
-rw-r--r--lang/tcl/Makefile.version4
-rw-r--r--lang/tcl/PLIST71
-rw-r--r--lang/tcl/distinfo31
-rw-r--r--lang/tcl/patches/patch-pkgs_itcl4.0.4_configure (renamed from lang/tcl/patches/patch-pkgs_itcl4.0.3_configure)16
-rw-r--r--lang/tcl/patches/patch-pkgs_sqlite3.11.0_Makefile.in15
-rw-r--r--lang/tcl/patches/patch-pkgs_sqlite3.11.0_configure (renamed from lang/tcl/patches/patch-pkgs_tdbcodbc1.0.3_configure)16
-rw-r--r--lang/tcl/patches/patch-pkgs_tdbc1.0.4_configure (renamed from lang/tcl/patches/patch-pkgs_tdbc1.0.3_configure)16
-rw-r--r--lang/tcl/patches/patch-pkgs_tdbcmysql1.0.4_configure (renamed from lang/tcl/patches/patch-pkgs_tdbcmysql1.0.3_configure)16
-rw-r--r--lang/tcl/patches/patch-pkgs_tdbcodbc1.0.4_configure (renamed from lang/tcl/patches/patch-pkgs_sqlite3.8.8.3_configure)16
-rw-r--r--lang/tcl/patches/patch-pkgs_tdbcpostgres1.0.4_configure (renamed from lang/tcl/patches/patch-pkgs_tdbcpostgres1.0.3_configure)16
-rw-r--r--lang/tcl/patches/patch-pkgs_thread2.7.3_configure (renamed from lang/tcl/patches/patch-pkgs_thread2.7.2_configure)19
-rw-r--r--lang/tcl/patches/patch-unix_Makefile.in18
-rw-r--r--lang/tcl/patches/patch-unix_configure44
-rw-r--r--lang/tcl/patches/patch-unix_tclUnixPort.h15
15 files changed, 172 insertions, 162 deletions
diff --git a/lang/tcl/Makefile b/lang/tcl/Makefile
index e583c899337..f1075b23a58 100644
--- a/lang/tcl/Makefile
+++ b/lang/tcl/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.88 2016/02/25 14:42:57 jperkin Exp $
+# $NetBSD: Makefile,v 1.89 2016/03/06 11:47:49 adam Exp $
DISTNAME= tcl${TCL_VERSION}-src
PKGNAME= tcl-${TCL_VERSION}
-PKGREVISION= 6
CATEGORIES= lang
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tcl/}
@@ -50,23 +49,23 @@ PLIST_SUBST+= BASEVER=${TCL_BASEVER}
CONFIGURE_ARGS+= --with-system-sqlite
SUBST_CLASSES+= sqllink
SUBST_STAGE.sqllink= pre-configure
-SUBST_FILES.sqllink= pkgs/sqlite3.8.8.3/configure
+SUBST_FILES.sqllink= pkgs/sqlite3.11.0/configure
SUBST_SED.sqllink= -e "/LIBS=/s|-lsqlite3|-L${BUILDLINK_PREFIX.sqlite3}/lib ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.sqlite3}/lib -lsqlite3|g"
.if ${OPSYS} == "Darwin"
post-build:
-. for lib in itcl4.0.3/libitcl4.0.3.dylib \
- sqlite3.8.8.3/libsqlite3.8.8.3.dylib \
- tdbc1.0.3/libtdbc1.0.3.dylib \
- tdbcmysql1.0.3/libtdbcmysql1.0.3.dylib \
- tdbcodbc1.0.3/libtdbcodbc1.0.3.dylib \
- tdbcpostgres1.0.3/libtdbcpostgres1.0.3.dylib \
- thread2.7.2/libthread2.7.2.dylib
+. for lib in itcl4.0.4/libitcl4.0.4.dylib \
+ sqlite3.11.0/libsqlite3.11.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
install_name_tool -id ${PREFIX}/lib/${lib} ${WRKSRC}/unix/pkgs/${lib}
. endfor
.endif
-BUILDLINK_API_DEPENDS.sqlite3+= sqlite3>=3.8.3
+BUILDLINK_API_DEPENDS.sqlite3+= sqlite3>=3.11.0
.include "../../databases/sqlite3/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/lang/tcl/Makefile.version b/lang/tcl/Makefile.version
index 783fa153311..cd2f07b2bc8 100644
--- a/lang/tcl/Makefile.version
+++ b/lang/tcl/Makefile.version
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.version,v 1.17 2015/06/28 17:11:12 joerg Exp $
+# $NetBSD: Makefile.version,v 1.18 2016/03/06 11:47:49 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.4
+TCL_VERSION= 8.6.5
diff --git a/lang/tcl/PLIST b/lang/tcl/PLIST
index af7681cfbd7..1e3f08d28dd 100644
--- a/lang/tcl/PLIST
+++ b/lang/tcl/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.18 2015/05/21 10:37:59 adam Exp $
+@comment $NetBSD: PLIST,v 1.19 2016/03/06 11:47:49 adam Exp $
+bin/sqlite3_analyzer
bin/tclsh
bin/tclsh${BASEVER}
include/fakemysql.h
@@ -50,20 +51,20 @@ include/tclThread.h
include/tdbc.h
include/tdbcDecls.h
include/tdbcInt.h
-lib/itcl4.0.3/itcl.tcl
-lib/itcl4.0.3/itclConfig.sh
-lib/itcl4.0.3/itclHullCmds.tcl
-lib/itcl4.0.3/itclWidget.tcl
-lib/itcl4.0.3/libitcl4.0.3.so
-lib/itcl4.0.3/libitclstub4.0.3.a
-lib/itcl4.0.3/pkgIndex.tcl
+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/libtcl${SONUM}.a
lib/libtcl${SONUM}.so
lib/libtcl${SONUM}.so.1.0
lib/libtclstub${SONUM}.a
lib/pkgconfig/tcl.pc
-lib/sqlite3.8.8.3/libsqlite3.8.8.3.so
-lib/sqlite3.8.8.3/pkgIndex.tcl
+lib/sqlite3.11.0/libsqlite3.11.0.so
+lib/sqlite3.11.0/pkgIndex.tcl
lib/tcl${BASEVER}/auto.tcl
lib/tcl${BASEVER}/clock.tcl
lib/tcl${BASEVER}/encoding/ascii.enc
@@ -150,8 +151,8 @@ lib/tcl${BASEVER}/http/pkgIndex.tcl
lib/tcl${BASEVER}/http1.0/http.tcl
lib/tcl${BASEVER}/http1.0/pkgIndex.tcl
lib/tcl${BASEVER}/init.tcl
-lib/tcl${BASEVER}/msgcat1.5/msgcat.tcl
-lib/tcl${BASEVER}/msgcat1.5/pkgIndex.tcl
+lib/tcl${BASEVER}/msgcat1.6/msgcat.tcl
+lib/tcl${BASEVER}/msgcat1.6/pkgIndex.tcl
lib/tcl${BASEVER}/msgs/af.msg
lib/tcl${BASEVER}/msgs/af_za.msg
lib/tcl${BASEVER}/msgs/ar.msg
@@ -294,31 +295,33 @@ lib/tcl${BASEVER}/tcltest2.3/tcltest.tcl
lib/tcl${BASEVER}/tcltest2.3/pkgIndex.tcl
lib/tcl${BASEVER}/tm.tcl
lib/tcl${BASEVER}/word.tcl
-lib/tcl8/8.4/platform-1.0.13.tm
+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.5.2.tm
+lib/tcl8/8.5/msgcat-1.6.0.tm
lib/tcl8/8.5/tcltest-2.3.8.tm
-lib/tcl8/8.6/http-2.8.8.tm
-lib/tcl8/8.6/tdbc/sqlite3-1.0.3.tm
+lib/tcl8/8.6/http-2.8.9.tm
+lib/tcl8/8.6/tdbc/sqlite3-1.0.4.tm
lib/tclConfig.sh
lib/tclooConfig.sh
-lib/tdbc1.0.3/libtdbc1.0.3.so
-lib/tdbc1.0.3/libtdbcstub1.0.3.a
-lib/tdbc1.0.3/pkgIndex.tcl
-lib/tdbc1.0.3/tdbc.tcl
-lib/tdbc1.0.3/tdbcConfig.sh
-lib/tdbcmysql1.0.3/libtdbcmysql1.0.3.so
-lib/tdbcmysql1.0.3/pkgIndex.tcl
-lib/tdbcmysql1.0.3/tdbcmysql.tcl
-lib/tdbcodbc1.0.3/libtdbcodbc1.0.3.so
-lib/tdbcodbc1.0.3/pkgIndex.tcl
-lib/tdbcodbc1.0.3/tdbcodbc.tcl
-lib/tdbcpostgres1.0.3/libtdbcpostgres1.0.3.so
-lib/tdbcpostgres1.0.3/pkgIndex.tcl
-lib/tdbcpostgres1.0.3/tdbcpostgres.tcl
-lib/thread2.7.2/libthread2.7.2.so
-lib/thread2.7.2/pkgIndex.tcl
-lib/thread2.7.2/ttrace.tcl
+lib/tdbc1.0.4/libtdbc1.0.4.so
+lib/tdbc1.0.4/libtdbcstub1.0.4.a
+lib/tdbc1.0.4/pkgIndex.tcl
+lib/tdbc1.0.4/tdbc.tcl
+lib/tdbc1.0.4/tdbcConfig.sh
+lib/tdbcmysql1.0.4/libtdbcmysql1.0.4.so
+lib/tdbcmysql1.0.4/pkgIndex.tcl
+lib/tdbcmysql1.0.4/tdbcmysql.tcl
+lib/tdbcodbc1.0.4/libtdbcodbc1.0.4.so
+lib/tdbcodbc1.0.4/pkgIndex.tcl
+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
man/man1/tclsh.1
man/man3/TCL_MEM_DEBUG.3
man/man3/Tcl_Access.3
@@ -931,6 +934,8 @@ man/man3/Tcl_UtfBackslash.3
man/man3/Tcl_UtfCharComplete.3
man/man3/Tcl_UtfFindFirst.3
man/man3/Tcl_UtfFindLast.3
+man/man3/Tcl_UtfNcasecmp.3
+man/man3/Tcl_UtfNcmp.3
man/man3/Tcl_UtfNext.3
man/man3/Tcl_UtfPrev.3
man/man3/Tcl_UtfToExternal.3
diff --git a/lang/tcl/distinfo b/lang/tcl/distinfo
index 4e9c63465d5..36b6e18beb4 100644
--- a/lang/tcl/distinfo
+++ b/lang/tcl/distinfo
@@ -1,25 +1,26 @@
-$NetBSD: distinfo,v 1.67 2015/11/03 22:50:45 agc Exp $
+$NetBSD: distinfo,v 1.68 2016/03/06 11:47:49 adam Exp $
-SHA1 (tcl8.6.4-src.tar.gz) = 33c5a083a23cf54f15e25a9e787dc39ef3fa0a2b
-RMD160 (tcl8.6.4-src.tar.gz) = 9a30b9083edba13aeef53ba6483b88202264f6dc
-SHA512 (tcl8.6.4-src.tar.gz) = f348224f6c63aa899345a5c9b84d6ad1c0bfce5e22a86e4319900b561787855473888bd284f7ee55edf552ce32792b78649526af3641b0dff46590cad53b2489
-Size (tcl8.6.4-src.tar.gz) = 8915556 bytes
+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 (patch-generic_tclPort.h) = 36ff05b22591d588952e55d0f13c2ef52e371d1e
SHA1 (patch-generic_tclPosixStr.c) = 68da211865282fe7124cad71381658f8dfb986d6
-SHA1 (patch-pkgs_itcl4.0.3_configure) = 8350140809004c1157f9650b9c29e49af0120304
-SHA1 (patch-pkgs_sqlite3.8.8.3_configure) = e49e8b345330a08e4f931bf21d45d89c72b9099f
-SHA1 (patch-pkgs_tdbc1.0.3_configure) = 39c1f010155a9b10ebcdefce065b3dfe26a09491
-SHA1 (patch-pkgs_tdbcmysql1.0.3_configure) = b38503fce5fe49213cf3612a0fe589dd79e4ab9c
-SHA1 (patch-pkgs_tdbcodbc1.0.3_configure) = 5e4d10312768ad42e6b5d2a033ca4b3ee98cf861
-SHA1 (patch-pkgs_tdbcpostgres1.0.3_configure) = 57e99769900fc8d55f61096badc037aed6c4b60e
-SHA1 (patch-pkgs_thread2.7.2_configure) = 1912b6411bf7b0dc0719fcb6d67c0aa848de85e3
+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_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-tests_load.test) = 438695ab76e01646e49aadc01c44344a5495eabb
SHA1 (patch-tests_pkgMkIndex.test) = 70d1042c1f4743052c5fa191fa7c4732a08e28a2
-SHA1 (patch-unix_Makefile.in) = 70cd193ca4bf93a0dc635c4ea0681686699277bf
-SHA1 (patch-unix_configure) = a3a0965e82b81093ba53cb5bb31842138272450a
+SHA1 (patch-unix_Makefile.in) = d074b0e93c915be137f537050a80c549c9808b72
+SHA1 (patch-unix_configure) = 497eebc6dfa614647a400c94847f5fdb82d6e361
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) = 6efe848c16c550f6adee4bec011891755bb23620
+SHA1 (patch-unix_tclUnixPort.h) = f7d2e7b8912b9bff1709ac2c34aee1f4725e90ac
diff --git a/lang/tcl/patches/patch-pkgs_itcl4.0.3_configure b/lang/tcl/patches/patch-pkgs_itcl4.0.4_configure
index 373a76814f3..f2aea3688a5 100644
--- a/lang/tcl/patches/patch-pkgs_itcl4.0.3_configure
+++ b/lang/tcl/patches/patch-pkgs_itcl4.0.4_configure
@@ -1,10 +1,10 @@
-$NetBSD: patch-pkgs_itcl4.0.3_configure,v 1.2 2015/06/29 09:49:51 joerg Exp $
+$NetBSD: patch-pkgs_itcl4.0.4_configure,v 1.1 2016/03/06 11:47:49 adam Exp $
Add support for DragonFly.
---- pkgs/itcl4.0.3/configure.orig 2015-03-06 18:19:29.000000000 +0000
-+++ pkgs/itcl4.0.3/configure
-@@ -7338,8 +7338,7 @@ fi
+--- pkgs/itcl4.0.4/configure.orig 2016-02-11 21:01:59.000000000 +0000
++++ pkgs/itcl4.0.4/configure
+@@ -7397,8 +7397,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
-@@ -7359,8 +7358,6 @@ fi
+@@ -7418,8 +7417,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
-@@ -7382,7 +7379,7 @@ fi
+@@ -7441,7 +7438,7 @@ fi
fi
;;
@@ -32,7 +32,7 @@ Add support for DragonFly.
# This configuration from FreeBSD Ports.
SHLIB_CFLAGS="-fPIC"
SHLIB_LD="${CC} -shared"
-@@ -7404,10 +7401,6 @@ fi
+@@ -7463,10 +7460,6 @@ fi
case $system in
FreeBSD-3.*)
# Version numbers are dot-stripped by system policy.
@@ -43,7 +43,7 @@ Add support for DragonFly.
;;
esac
;;
-@@ -8018,7 +8011,7 @@ fi
+@@ -8077,7 +8070,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.11.0_Makefile.in
new file mode 100644
index 00000000000..1511f53f02e
--- /dev/null
+++ b/lang/tcl/patches/patch-pkgs_sqlite3.11.0_Makefile.in
@@ -0,0 +1,15 @@
+$NetBSD: patch-pkgs_sqlite3.11.0_Makefile.in,v 1.1 2016/03/06 11:47:49 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
+@@ -150,7 +150,7 @@ SHARED_BUILD = @SHARED_BUILD@
+ INCLUDES = @PKG_INCLUDES@ @TCL_INCLUDES@ -I$(srcdir)/..
+ #INCLUDES = @PKG_INCLUDES@ @TCL_INCLUDES@ @TK_INCLUDES@ @TK_XINCLUDES@
+
+-PKG_CFLAGS = @PKG_CFLAGS@ -DSQLITE_API=MODULE_SCOPE -DSQLITE_EXTERN=
++PKG_CFLAGS = @PKG_CFLAGS@
+
+ # TCL_DEFS is not strictly need here, but if you remove it, then you
+ # must make sure that configure.in checks for the necessary components
diff --git a/lang/tcl/patches/patch-pkgs_tdbcodbc1.0.3_configure b/lang/tcl/patches/patch-pkgs_sqlite3.11.0_configure
index d93345b36e3..58bd877c7f3 100644
--- a/lang/tcl/patches/patch-pkgs_tdbcodbc1.0.3_configure
+++ b/lang/tcl/patches/patch-pkgs_sqlite3.11.0_configure
@@ -1,10 +1,10 @@
-$NetBSD: patch-pkgs_tdbcodbc1.0.3_configure,v 1.2 2015/06/29 09:49:51 joerg Exp $
+$NetBSD: patch-pkgs_sqlite3.11.0_configure,v 1.1 2016/03/06 11:47:49 adam Exp $
Add support for DragonFly.
---- pkgs/tdbcodbc1.0.3/configure.orig 2015-03-06 18:35:24.000000000 +0000
-+++ pkgs/tdbcodbc1.0.3/configure
-@@ -7808,8 +7808,7 @@ fi
+--- 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}'
fi
LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
@@ -14,7 +14,7 @@ Add support for DragonFly.
;;
esac
case "$arch" in
-@@ -7829,8 +7828,6 @@ fi
+@@ -7382,8 +7381,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
-@@ -7852,7 +7849,7 @@ fi
+@@ -7405,7 +7402,7 @@ fi
fi
;;
@@ -32,7 +32,7 @@ Add support for DragonFly.
# This configuration from FreeBSD Ports.
SHLIB_CFLAGS="-fPIC"
SHLIB_LD="${CC} -shared"
-@@ -7874,10 +7871,6 @@ fi
+@@ -7427,10 +7424,6 @@ fi
case $system in
FreeBSD-3.*)
# Version numbers are dot-stripped by system policy.
@@ -43,7 +43,7 @@ Add support for DragonFly.
;;
esac
;;
-@@ -8488,7 +8481,7 @@ fi
+@@ -8041,7 +8034,7 @@ fi
BSD/OS*) ;;
CYGWIN_*|MINGW32_*) ;;
IRIX*) ;;
diff --git a/lang/tcl/patches/patch-pkgs_tdbc1.0.3_configure b/lang/tcl/patches/patch-pkgs_tdbc1.0.4_configure
index 551fb61affa..0721ddc3fab 100644
--- a/lang/tcl/patches/patch-pkgs_tdbc1.0.3_configure
+++ b/lang/tcl/patches/patch-pkgs_tdbc1.0.4_configure
@@ -1,10 +1,10 @@
-$NetBSD: patch-pkgs_tdbc1.0.3_configure,v 1.2 2015/06/29 09:49:51 joerg Exp $
+$NetBSD: patch-pkgs_tdbc1.0.4_configure,v 1.1 2016/03/06 11:47:49 adam Exp $
Add support for DragonFly.
---- pkgs/tdbc1.0.3/configure.orig 2015-03-06 18:30:36.000000000 +0000
-+++ pkgs/tdbc1.0.3/configure
-@@ -7465,8 +7465,7 @@ fi
+--- pkgs/tdbc1.0.4/configure.orig 2016-01-28 18:05:47.000000000 +0000
++++ pkgs/tdbc1.0.4/configure
+@@ -7518,8 +7518,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
-@@ -7486,8 +7485,6 @@ fi
+@@ -7539,8 +7538,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
-@@ -7509,7 +7506,7 @@ fi
+@@ -7562,7 +7559,7 @@ fi
fi
;;
@@ -32,7 +32,7 @@ Add support for DragonFly.
# This configuration from FreeBSD Ports.
SHLIB_CFLAGS="-fPIC"
SHLIB_LD="${CC} -shared"
-@@ -7531,10 +7528,6 @@ fi
+@@ -7584,10 +7581,6 @@ fi
case $system in
FreeBSD-3.*)
# Version numbers are dot-stripped by system policy.
@@ -43,7 +43,7 @@ Add support for DragonFly.
;;
esac
;;
-@@ -8145,7 +8138,7 @@ fi
+@@ -8198,7 +8191,7 @@ fi
BSD/OS*) ;;
CYGWIN_*|MINGW32_*) ;;
IRIX*) ;;
diff --git a/lang/tcl/patches/patch-pkgs_tdbcmysql1.0.3_configure b/lang/tcl/patches/patch-pkgs_tdbcmysql1.0.4_configure
index ae8095507c0..581be9cb701 100644
--- a/lang/tcl/patches/patch-pkgs_tdbcmysql1.0.3_configure
+++ b/lang/tcl/patches/patch-pkgs_tdbcmysql1.0.4_configure
@@ -1,10 +1,10 @@
-$NetBSD: patch-pkgs_tdbcmysql1.0.3_configure,v 1.2 2015/06/29 09:49:51 joerg Exp $
+$NetBSD: patch-pkgs_tdbcmysql1.0.4_configure,v 1.1 2016/03/06 11:47:49 adam Exp $
Add support for DragonFly.
---- pkgs/tdbcmysql1.0.3/configure.orig 2015-03-06 18:34:04.000000000 +0000
-+++ pkgs/tdbcmysql1.0.3/configure
-@@ -7814,8 +7814,7 @@ fi
+--- pkgs/tdbcmysql1.0.4/configure.orig 2016-01-28 18:06:23.000000000 +0000
++++ pkgs/tdbcmysql1.0.4/configure
+@@ -7864,8 +7864,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
-@@ -7835,8 +7834,6 @@ fi
+@@ -7885,8 +7884,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
-@@ -7858,7 +7855,7 @@ fi
+@@ -7908,7 +7905,7 @@ fi
fi
;;
@@ -32,7 +32,7 @@ Add support for DragonFly.
# This configuration from FreeBSD Ports.
SHLIB_CFLAGS="-fPIC"
SHLIB_LD="${CC} -shared"
-@@ -7880,10 +7877,6 @@ fi
+@@ -7930,10 +7927,6 @@ fi
case $system in
FreeBSD-3.*)
# Version numbers are dot-stripped by system policy.
@@ -43,7 +43,7 @@ Add support for DragonFly.
;;
esac
;;
-@@ -8494,7 +8487,7 @@ fi
+@@ -8544,7 +8537,7 @@ fi
BSD/OS*) ;;
CYGWIN_*|MINGW32_*) ;;
IRIX*) ;;
diff --git a/lang/tcl/patches/patch-pkgs_sqlite3.8.8.3_configure b/lang/tcl/patches/patch-pkgs_tdbcodbc1.0.4_configure
index be4be4e91aa..68382d44fb6 100644
--- a/lang/tcl/patches/patch-pkgs_sqlite3.8.8.3_configure
+++ b/lang/tcl/patches/patch-pkgs_tdbcodbc1.0.4_configure
@@ -1,10 +1,10 @@
-$NetBSD: patch-pkgs_sqlite3.8.8.3_configure,v 1.2 2015/06/29 09:49:51 joerg Exp $
+$NetBSD: patch-pkgs_tdbcodbc1.0.4_configure,v 1.1 2016/03/06 11:47:49 adam Exp $
Add support for DragonFly.
---- pkgs/sqlite3.8.8.3/configure.orig 2015-03-06 18:27:28.000000000 +0000
-+++ pkgs/sqlite3.8.8.3/configure
-@@ -7274,8 +7274,7 @@ fi
+--- pkgs/tdbcodbc1.0.4/configure.orig 2016-01-28 18:06:52.000000000 +0000
++++ pkgs/tdbcodbc1.0.4/configure
+@@ -7864,8 +7864,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
-@@ -7295,8 +7294,6 @@ fi
+@@ -7885,8 +7884,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
-@@ -7318,7 +7315,7 @@ fi
+@@ -7908,7 +7905,7 @@ fi
fi
;;
@@ -32,7 +32,7 @@ Add support for DragonFly.
# This configuration from FreeBSD Ports.
SHLIB_CFLAGS="-fPIC"
SHLIB_LD="${CC} -shared"
-@@ -7340,10 +7337,6 @@ fi
+@@ -7930,10 +7927,6 @@ fi
case $system in
FreeBSD-3.*)
# Version numbers are dot-stripped by system policy.
@@ -43,7 +43,7 @@ Add support for DragonFly.
;;
esac
;;
-@@ -7954,7 +7947,7 @@ fi
+@@ -8544,7 +8537,7 @@ fi
BSD/OS*) ;;
CYGWIN_*|MINGW32_*) ;;
IRIX*) ;;
diff --git a/lang/tcl/patches/patch-pkgs_tdbcpostgres1.0.3_configure b/lang/tcl/patches/patch-pkgs_tdbcpostgres1.0.4_configure
index 37b7bed6be9..cc7c20b8bc0 100644
--- a/lang/tcl/patches/patch-pkgs_tdbcpostgres1.0.3_configure
+++ b/lang/tcl/patches/patch-pkgs_tdbcpostgres1.0.4_configure
@@ -1,10 +1,10 @@
-$NetBSD: patch-pkgs_tdbcpostgres1.0.3_configure,v 1.2 2015/06/29 09:49:51 joerg Exp $
+$NetBSD: patch-pkgs_tdbcpostgres1.0.4_configure,v 1.1 2016/03/06 11:47:49 adam Exp $
Add support for DragonFly.
---- pkgs/tdbcpostgres1.0.3/configure.orig 2015-03-06 18:36:37.000000000 +0000
-+++ pkgs/tdbcpostgres1.0.3/configure
-@@ -7808,8 +7808,7 @@ fi
+--- pkgs/tdbcpostgres1.0.4/configure.orig 2016-01-28 18:07:18.000000000 +0000
++++ pkgs/tdbcpostgres1.0.4/configure
+@@ -7864,8 +7864,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
-@@ -7829,8 +7828,6 @@ fi
+@@ -7885,8 +7884,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
-@@ -7852,7 +7849,7 @@ fi
+@@ -7908,7 +7905,7 @@ fi
fi
;;
@@ -32,7 +32,7 @@ Add support for DragonFly.
# This configuration from FreeBSD Ports.
SHLIB_CFLAGS="-fPIC"
SHLIB_LD="${CC} -shared"
-@@ -7874,10 +7871,6 @@ fi
+@@ -7930,10 +7927,6 @@ fi
case $system in
FreeBSD-3.*)
# Version numbers are dot-stripped by system policy.
@@ -43,7 +43,7 @@ Add support for DragonFly.
;;
esac
;;
-@@ -8488,7 +8481,7 @@ fi
+@@ -8544,7 +8537,7 @@ fi
BSD/OS*) ;;
CYGWIN_*|MINGW32_*) ;;
IRIX*) ;;
diff --git a/lang/tcl/patches/patch-pkgs_thread2.7.2_configure b/lang/tcl/patches/patch-pkgs_thread2.7.3_configure
index 75e519aa108..36e25265d01 100644
--- a/lang/tcl/patches/patch-pkgs_thread2.7.2_configure
+++ b/lang/tcl/patches/patch-pkgs_thread2.7.3_configure
@@ -1,20 +1,19 @@
-$NetBSD: patch-pkgs_thread2.7.2_configure,v 1.2 2015/06/29 09:49:51 joerg Exp $
+$NetBSD: patch-pkgs_thread2.7.3_configure,v 1.1 2016/03/06 11:47:49 adam Exp $
Add support for DragonFly.
---- pkgs/thread2.7.2/configure.orig 2015-03-06 18:38:33.000000000 +0000
-+++ pkgs/thread2.7.2/configure
-@@ -9312,8 +9312,7 @@ fi
- fi
+--- pkgs/thread2.7.3/configure.orig 2016-01-28 17:45:52.000000000 +0000
++++ pkgs/thread2.7.3/configure
+@@ -9315,7 +9315,7 @@ 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
-@@ -9334,8 +9333,6 @@ fi
+@@ -9336,8 +9336,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
-@@ -9359,7 +9356,7 @@ fi
+@@ -9361,7 +9359,7 @@ fi
fi
;;
@@ -32,7 +31,7 @@ Add support for DragonFly.
# This configuration from FreeBSD Ports.
SHLIB_CFLAGS="-fPIC"
SHLIB_LD="${CC} -shared"
-@@ -9383,10 +9380,6 @@ fi
+@@ -9385,10 +9383,6 @@ fi
case $system in
FreeBSD-3.*)
# Version numbers are dot-stripped by system policy.
@@ -43,7 +42,7 @@ Add support for DragonFly.
;;
esac
;;
-@@ -10237,7 +10230,7 @@ fi
+@@ -10239,7 +10233,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 85586018cf2..bd6c8c8bad2 100644
--- a/lang/tcl/patches/patch-unix_Makefile.in
+++ b/lang/tcl/patches/patch-unix_Makefile.in
@@ -1,4 +1,4 @@
-$NetBSD: patch-unix_Makefile.in,v 1.9 2015/03/16 13:30:02 jperkin Exp $
+$NetBSD: patch-unix_Makefile.in,v 1.10 2016/03/06 11:47:49 adam Exp $
Honour LDFLAGS.
@@ -97,8 +97,8 @@ Honour LDFLAGS.
echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \
@@ -846,6 +862,8 @@ install-libraries: libraries
done;
- @echo "Installing package http 2.8.8 as a Tcl Module";
- @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.6/http-2.8.8.tm;
+ @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;
+ @$(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/";
@@ -106,17 +106,17 @@ Honour LDFLAGS.
do \
@@ -853,13 +871,21 @@ install-libraries: libraries
done;
- @echo "Installing package msgcat 1.5.2 as a Tcl Module";
- @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/msgcat-1.5.2.tm;
-+ @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/msgcat1.5/msgcat.tcl;
-+ @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/pkgIndex.tcl "$(SCRIPT_INSTALL_DIR)"/msgcat1.5/pkgIndex.tcl;
+ @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 platform 1.0.13 as a Tcl Module";
- @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform-1.0.13.tm;
+ @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;
+ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/platform1.0/platform.tcl;
+ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/pkgIndex.tcl "$(SCRIPT_INSTALL_DIR)"/platform1.0/pkgIndex.tcl;
@echo "Installing package platform::shell 1.1.4 as a Tcl Module";
diff --git a/lang/tcl/patches/patch-unix_configure b/lang/tcl/patches/patch-unix_configure
index 103609f4cb9..5c9c79a5ee6 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.8 2015/06/29 09:49:51 joerg Exp $
+$NetBSD: patch-unix_configure,v 1.9 2016/03/06 11:47:49 adam Exp $
---- unix/configure.orig 2015-03-11 13:59:56.000000000 +0000
+--- unix/configure.orig 2016-03-01 01:59:35.000000000 +0000
+++ unix/configure
-@@ -6989,12 +6989,12 @@ fi
+@@ -6837,12 +6837,12 @@ fi
LD_SEARCH_FLAGS=""
;;
BSD/OS-4.*)
@@ -17,7 +17,7 @@ $NetBSD: patch-unix_configure,v 1.8 2015/06/29 09:49:51 joerg Exp $
CC_SEARCH_FLAGS=""
LD_SEARCH_FLAGS=""
;;
-@@ -7665,7 +7665,7 @@ fi
+@@ -7513,7 +7513,7 @@ fi
CC_SEARCH_FLAGS=""
LD_SEARCH_FLAGS=""
;;
@@ -26,7 +26,7 @@ $NetBSD: patch-unix_configure,v 1.8 2015/06/29 09:49:51 joerg Exp $
arch=`arch -s`
case "$arch" in
vax)
-@@ -7695,7 +7695,7 @@ fi
+@@ -7543,7 +7543,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.8 2015/06/29 09:49:51 joerg Exp $
;;
esac
case "$arch" in
-@@ -7729,7 +7729,7 @@ fi
+@@ -7577,7 +7577,7 @@ fi
SHLIB_SUFFIX=".so"
DL_OBJS="tclLoadDl.o"
DL_LIBS=""
@@ -44,7 +44,7 @@ $NetBSD: patch-unix_configure,v 1.8 2015/06/29 09:49:51 joerg Exp $
if test $doRpath = yes; then
CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
-@@ -7746,7 +7746,7 @@ fi
+@@ -7594,7 +7594,7 @@ fi
fi
;;
@@ -53,7 +53,7 @@ $NetBSD: patch-unix_configure,v 1.8 2015/06/29 09:49:51 joerg Exp $
# This configuration from FreeBSD Ports.
SHLIB_CFLAGS="-fPIC"
SHLIB_LD="${CC} -shared"
-@@ -7780,7 +7780,6 @@ fi
+@@ -7628,7 +7628,6 @@ fi
esac
;;
Darwin-*)
@@ -61,7 +61,7 @@ $NetBSD: patch-unix_configure,v 1.8 2015/06/29 09:49:51 joerg Exp $
SHLIB_CFLAGS="-fno-common"
# To avoid discrepancies between what headers configure sees during
# preprocessing tests and compiling tests, move any -isysroot and
-@@ -8954,7 +8953,7 @@ fi
+@@ -8802,7 +8801,7 @@ fi
BSD/OS*) ;;
CYGWIN_*|MINGW32_*) ;;
IRIX*) ;;
@@ -70,7 +70,7 @@ $NetBSD: patch-unix_configure,v 1.8 2015/06/29 09:49:51 joerg Exp $
Darwin-*) ;;
SCO_SV-3.2*) ;;
*) SHLIB_CFLAGS="-fPIC" ;;
-@@ -8996,7 +8995,11 @@ fi
+@@ -8844,7 +8843,11 @@ fi
else
@@ -83,16 +83,16 @@ $NetBSD: patch-unix_configure,v 1.8 2015/06/29 09:49:51 joerg Exp $
fi
-@@ -9030,7 +9033,7 @@ fi
- else
-
- MAKE_STUB_LIB='${STLIB_LD} $@ ${STUB_LIB_OBJS} ; ${RANLIB} $@'
-- INSTALL_STUB_LIB='$(INSTALL_LIBRARY) $(STUB_LIB_FILE) "$(LIB_INSTALL_DIR)/$(STUB_LIB_FILE)" ; (cd "$(LIB_INSTALL_DIR)" ; $(RANLIB) $(STUB_LIB_FILE))'
-+ INSTALL_STUB_LIB='$(INSTALL_DATA) $(STUB_LIB_FILE) "$(LIB_INSTALL_DIR)/$(STUB_LIB_FILE)" ; (cd "$(LIB_INSTALL_DIR)" ; $(RANLIB) $(STUB_LIB_FILE))'
+@@ -8879,7 +8882,7 @@ else
fi
-@@ -19064,9 +19067,9 @@ fi
+- INSTALL_STUB_LIB='$(INSTALL_LIBRARY) $(STUB_LIB_FILE) "$(LIB_INSTALL_DIR)/$(STUB_LIB_FILE)"'
++ INSTALL_STUB_LIB='$(INSTALL_DATA) $(STUB_LIB_FILE) "$(LIB_INSTALL_DIR)/$(STUB_LIB_FILE)"'
+
+ # 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
+@@ -18910,9 +18913,9 @@ fi
# building libtcl as a shared library instead of a static library.
#--------------------------------------------------------------------
@@ -105,7 +105,7 @@ $NetBSD: patch-unix_configure,v 1.8 2015/06/29 09:49:51 joerg 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.
-@@ -19179,13 +19182,10 @@ else
+@@ -19025,13 +19028,10 @@ else
eval libdir="$libdir"
# default install directory for bundled packages
PACKAGE_DIR="$libdir"
@@ -122,7 +122,7 @@ $NetBSD: patch-unix_configure,v 1.8 2015/06/29 09:49:51 joerg Exp $
fi
VERSION='${VERSION}'
eval "CFG_TCL_SHARED_LIB_SUFFIX=${TCL_SHARED_LIB_SUFFIX}"
-@@ -19204,12 +19204,11 @@ if test "$FRAMEWORK_BUILD" = "1" ; then
+@@ -19050,12 +19050,11 @@ if test "$FRAMEWORK_BUILD" = "1" ; then
TCL_PACKAGE_PATH="~/Library/Tcl /Library/Tcl /System/Library/Tcl ~/Library/Frameworks /Library/Frameworks /System/Library/Frameworks"
test -z "$TCL_MODULE_PATH" && \
TCL_MODULE_PATH="~/Library/Tcl /Library/Tcl /System/Library/Tcl"
@@ -137,7 +137,7 @@ $NetBSD: patch-unix_configure,v 1.8 2015/06/29 09:49:51 joerg Exp $
#--------------------------------------------------------------------
# The statements below define various symbols relating to Tcl
# stub support.
-@@ -19222,12 +19221,7 @@ eval "TCL_STUB_LIB_FILE=libtclstub${TCL_
+@@ -19068,12 +19067,7 @@ eval "TCL_STUB_LIB_FILE=libtclstub${TCL_
eval "TCL_STUB_LIB_FILE=\"${TCL_STUB_LIB_FILE}\""
eval "TCL_STUB_LIB_DIR=${libdir}"
@@ -151,7 +151,7 @@ $NetBSD: patch-unix_configure,v 1.8 2015/06/29 09:49:51 joerg 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}"
-@@ -19381,34 +19375,15 @@ fi
+@@ -19227,34 +19221,15 @@ fi
# Transform confdefs.h into DEFS.
# Protect against shell expansion while executing Makefile rules.
# Protect against Makefile macro expansion.
@@ -195,7 +195,7 @@ $NetBSD: patch-unix_configure,v 1.8 2015/06/29 09:49:51 joerg Exp $
-@@ -20036,6 +20013,7 @@ s,@EXTRA_BUILD_HTML@,$EXTRA_BUILD_HTML,;
+@@ -19882,6 +19857,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
diff --git a/lang/tcl/patches/patch-unix_tclUnixPort.h b/lang/tcl/patches/patch-unix_tclUnixPort.h
index 18ffb11ca3c..7eda90a809d 100644
--- a/lang/tcl/patches/patch-unix_tclUnixPort.h
+++ b/lang/tcl/patches/patch-unix_tclUnixPort.h
@@ -1,17 +1,8 @@
-$NetBSD: patch-unix_tclUnixPort.h,v 1.3 2014/01/11 14:41:05 adam Exp $
+$NetBSD: patch-unix_tclUnixPort.h,v 1.4 2016/03/06 11:47:49 adam Exp $
---- unix/tclUnixPort.h.orig 2013-05-31 19:30:55.000000000 +0000
+--- unix/tclUnixPort.h.orig 2016-02-25 20:12:38.000000000 +0000
+++ unix/tclUnixPort.h
-@@ -141,19 +141,11 @@ typedef off_t Tcl_SeekOffset;
- #if HAVE_INTTYPES_H
- # include <inttypes.h>
- #endif
--#ifdef NO_LIMITS_H
--# include "../compat/limits.h"
--#else
--# include <limits.h>
--#endif
-+#include <limits.h>
+@@ -145,11 +145,7 @@ typedef off_t Tcl_SeekOffset;
#if HAVE_STDINT_H
# include <stdint.h>
#endif