Changes 8.6.2:

This is a bug-fix release.

40 files changed, 545 insertions, 969 deletions

diff --git a/lang/tcl/Makefile b/lang/tcl/Makefile
index eb635b68ad6..b7e9c16b615 100644
--- a/lang/tcl/Makefile
+++ b/lang/tcl/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.77 2014/03/13 11:08:51 jperkin Exp $
+# $NetBSD: Makefile,v 1.78 2014/10/31 21:11:18 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 5d53a10a9c2..9a09e400214 100644
--- a/lang/tcl/Makefile.version
+++ b/lang/tcl/Makefile.version
@@ -1,5 +1,9 @@
-# $NetBSD: Makefile.version,v 1.13 2014/01/11 14:41:05 adam Exp $
+# $NetBSD: Makefile.version,v 1.14 2014/10/31 21:11:18 adam Exp $
+# used by cad/xcircuit/Makefile
+# used by devel/tcl-tclcl/Makefile
+# used by lang/tcl/Makefile
+# used by lang/tcl-otcl/Makefile
 
 TCL_SONUM=	86
 TCL_BASEVER=	8.6
-TCL_VERSION=	8.6.1
+TCL_VERSION=	8.6.2
diff --git a/lang/tcl/PLIST b/lang/tcl/PLIST
index e0f278de1ff..e6debd88562 100644
--- a/lang/tcl/PLIST
+++ b/lang/tcl/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2014/01/11 14:41:05 adam Exp $
+@comment $NetBSD: PLIST,v 1.16 2014/10/31 21:11:18 adam Exp $
 bin/tclsh
 bin/tclsh${BASEVER}
 include/fakemysql.h
@@ -35,6 +35,7 @@ include/tcl/generic/tclParse.h
 include/tcl/generic/tclPlatDecls.h
 include/tcl/generic/tclPort.h
 include/tcl/generic/tclRegexp.h
+include/tcl/generic/tclStringTrim.h
 include/tcl/generic/tclTomMath.h
 include/tcl/generic/tclTomMathDecls.h
 include/tcl/generic/tclTomMathInt.h
@@ -49,20 +50,20 @@ include/tclThread.h
 include/tdbc.h
 include/tdbcDecls.h
 include/tdbcInt.h
-lib/itcl4.0.0/itcl.tcl
-lib/itcl4.0.0/itclConfig.sh
-lib/itcl4.0.0/itclHullCmds.tcl
-lib/itcl4.0.0/itclWidget.tcl
-lib/itcl4.0.0/libitcl4.0.0.so
-lib/itcl4.0.0/libitclstub4.0.0.a
-lib/itcl4.0.0/pkgIndex.tcl
+lib/itcl4.0.1/itcl.tcl
+lib/itcl4.0.1/itclConfig.sh
+lib/itcl4.0.1/itclHullCmds.tcl
+lib/itcl4.0.1/itclWidget.tcl
+lib/itcl4.0.1/libitcl4.0.1.so
+lib/itcl4.0.1/libitclstub4.0.1.a
+lib/itcl4.0.1/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.0/libsqlite3.8.0.so
-lib/sqlite3.8.0/pkgIndex.tcl
+lib/sqlite3.8.6/libsqlite3.8.6.so
+lib/sqlite3.8.6/pkgIndex.tcl
 lib/tcl${BASEVER}/auto.tcl
 lib/tcl${BASEVER}/clock.tcl
 lib/tcl${BASEVER}/encoding/ascii.enc
@@ -293,31 +294,31 @@ 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.12.tm
+lib/tcl8/8.4/platform-1.0.13.tm
 lib/tcl8/8.4/platform/shell-1.1.4.tm
 lib/tcl8/8.5/msgcat-1.5.2.tm
-lib/tcl8/8.5/tcltest-2.3.6.tm
-lib/tcl8/8.6/http-2.8.7.tm
-lib/tcl8/8.6/tdbc/sqlite3-1.0.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.1.tm
 lib/tclConfig.sh
 lib/tclooConfig.sh
-lib/tdbc1.0.0/libtdbc1.0.0.so
-lib/tdbc1.0.0/libtdbcstub1.0.0.a
-lib/tdbc1.0.0/pkgIndex.tcl
-lib/tdbc1.0.0/tdbc.tcl
-lib/tdbc1.0.0/tdbcConfig.sh
-lib/tdbcmysql1.0.0/libtdbcmysql1.0.0.so
-lib/tdbcmysql1.0.0/pkgIndex.tcl
-lib/tdbcmysql1.0.0/tdbcmysql.tcl
-lib/tdbcodbc1.0.0/libtdbcodbc1.0.0.so
-lib/tdbcodbc1.0.0/pkgIndex.tcl
-lib/tdbcodbc1.0.0/tdbcodbc.tcl
-lib/tdbcpostgres1.0.0/libtdbcpostgres1.0.0.so
-lib/tdbcpostgres1.0.0/pkgIndex.tcl
-lib/tdbcpostgres1.0.0/tdbcpostgres.tcl
-lib/thread2.7.0/libthread2.7.0.so
-lib/thread2.7.0/pkgIndex.tcl
-lib/thread2.7.0/ttrace.tcl
+lib/tdbc1.0.1/libtdbc1.0.1.so
+lib/tdbc1.0.1/libtdbcstub1.0.1.a
+lib/tdbc1.0.1/pkgIndex.tcl
+lib/tdbc1.0.1/tdbc.tcl
+lib/tdbc1.0.1/tdbcConfig.sh
+lib/tdbcmysql1.0.1/libtdbcmysql1.0.1.so
+lib/tdbcmysql1.0.1/pkgIndex.tcl
+lib/tdbcmysql1.0.1/tdbcmysql.tcl
+lib/tdbcodbc1.0.1/libtdbcodbc1.0.1.so
+lib/tdbcodbc1.0.1/pkgIndex.tcl
+lib/tdbcodbc1.0.1/tdbcodbc.tcl
+lib/tdbcpostgres1.0.1/libtdbcpostgres1.0.1.so
+lib/tdbcpostgres1.0.1/pkgIndex.tcl
+lib/tdbcpostgres1.0.1/tdbcpostgres.tcl
+lib/thread2.7.1/libthread2.7.1.so
+lib/thread2.7.1/pkgIndex.tcl
+lib/thread2.7.1/ttrace.tcl
 man/man1/tclsh.1
 man/man3/TCL_MEM_DEBUG.3
 man/man3/Tcl_Access.3
@@ -746,6 +747,7 @@ man/man3/Tcl_NewWideIntObj.3
 man/man3/Tcl_NextHashEntry.3
 man/man3/Tcl_NotifyChannel.3
 man/man3/Tcl_NumUtfChars.3
+man/man3/Tcl_OOInitStubs.3
 man/man3/Tcl_ObjGetVar2.3
 man/man3/Tcl_ObjPrintf.3
 man/man3/Tcl_ObjSetVar2.3
@@ -1119,7 +1121,7 @@ man/mann/tcl_rcFileName.n
 man/mann/tcl_startOfNextWord.n
 man/mann/tcl_startOfPreviousWord.n
 man/mann/tcl_traceCompile.n
-man/mann/tcl_traceEval.n
+man/mann/tcl_traceExec.n
 man/mann/tcl_version.n
 man/mann/tcl_wordBreakAfter.n
 man/mann/tcl_wordBreakBefore.n
diff --git a/lang/tcl/distinfo b/lang/tcl/distinfo
index fea3493d6cb..f9c17128fc4 100644
--- a/lang/tcl/distinfo
+++ b/lang/tcl/distinfo
@@ -1,33 +1,24 @@
-$NetBSD: distinfo,v 1.61 2014/02/06 04:29:12 obache Exp $
+$NetBSD: distinfo,v 1.62 2014/10/31 21:11:18 adam Exp $
 
-SHA1 (tcl8.6.1-src.tar.gz) = 5c83d44152cc0496cc0847a2495f659502a30e40
-RMD160 (tcl8.6.1-src.tar.gz) = fbb181d26bb28fe9413bc2e07f333571b8e7e190
-Size (tcl8.6.1-src.tar.gz) = 8755700 bytes
+SHA1 (tcl8.6.2-src.tar.gz) = f01ee98da154f83ce4b1c2db752decf734384954
+RMD160 (tcl8.6.2-src.tar.gz) = 574bffdf3e390cf6460ab4a9d4b59db0e58f2998
+Size (tcl8.6.2-src.tar.gz) = 8857161 bytes
 SHA1 (patch-generic_tclInt.h) = 13289d8fcf5021898b06a9608bc05fc968a1ba5c
 SHA1 (patch-generic_tclPort.h) = 36ff05b22591d588952e55d0f13c2ef52e371d1e
 SHA1 (patch-generic_tclPosixStr.c) = 68da211865282fe7124cad71381658f8dfb986d6
-SHA1 (patch-pkgs_itcl4.0.0_configure) = e331abeffbb7e1077ed84d846e08b7054f79346d
-SHA1 (patch-pkgs_itcl4.0.0_tclconfig_tcl.m4) = e2dcd0e07be03cf6e39b68cb209263b297acd5d1
-SHA1 (patch-pkgs_sqlite3.8.0_configure) = 14b61ded1cd2bb41054b45da3044638bc44004f5
-SHA1 (patch-pkgs_sqlite3.8.0_tclconfig_tcl.m4) = 6891b39dc05a037ba667c92fd2341b418030c0af
-SHA1 (patch-pkgs_tdbc1.0.0_configure) = 8964e3617b36435f3bf54bebddae1d34034045c8
-SHA1 (patch-pkgs_tdbc1.0.0_tclconfig_tcl.m4) = db4802f3db9b640a559d7e1c917969c0e2ecf069
-SHA1 (patch-pkgs_tdbcmysql1.0.0_configure) = 17bf2c0578b8b3316373dd8b1a0c9687033304f3
-SHA1 (patch-pkgs_tdbcmysql1.0.0_tclconfig_tcl.m4) = fbbf5b6c27e50251b56759ae9f0b0317f6e41a60
-SHA1 (patch-pkgs_tdbcodbc1.0.0_configure) = 0478fb9c6747a23df66c3c38f9f774606002187c
-SHA1 (patch-pkgs_tdbcodbc1.0.0_tclconfig_tcl.m4) = 2d2418c8d7b77e84b77b4c8568f8bc3920d285fa
-SHA1 (patch-pkgs_tdbcpostgres1.0.0_configure) = 7c5809cc8111cc70ee3eb75b3f5961581f1c7929
-SHA1 (patch-pkgs_tdbcpostgres1.0.0_tclconfig_tcl.m4) = 8791e43c7106affe02dd8f18e31064c7553f71ee
-SHA1 (patch-pkgs_tdbcsqlite3-1.0.0_tclconfig_tcl.m4) = 59b6fea342e041b159f1cc12ebd25e0df630eccf
-SHA1 (patch-pkgs_thread2.7.0_configure) = 39351e73d82415ead09ed56c7a2586db09ec8fb6
-SHA1 (patch-pkgs_thread2.7.0_tclconfig_tcl.m4) = 63d76baa8f130166d502f9ed3955111ae2a5a622
+SHA1 (patch-pkgs_itcl4.0.1_configure) = 64802cb0c09a2405ec2d3e4d73188d10e478efc2
+SHA1 (patch-pkgs_sqlite3.8.6_configure) = 61a826a32c033cd5879da69e90d5dad4de061f58
+SHA1 (patch-pkgs_tdbc1.0.1_configure) = 65189aa432013c02ed42833ec43985a55b7c8a20
+SHA1 (patch-pkgs_tdbcmysql1.0.1_configure) = acbb6dfbf4e35a2cf7eb16d0d5b415bb0f34431d
+SHA1 (patch-pkgs_tdbcodbc1.0.1_configure) = 4e124750268a72770274452d5c1d01e2701794f3
+SHA1 (patch-pkgs_tdbcpostgres1.0.1_configure) = ad5faf45d755670761ea8f4888c761a166a2938f
+SHA1 (patch-pkgs_thread2.7.1_configure) = f722be8d70eb16c34acd9685d5b594665d811b76
 SHA1 (patch-tests_load.test) = 438695ab76e01646e49aadc01c44344a5495eabb
 SHA1 (patch-tests_pkgMkIndex.test) = 70d1042c1f4743052c5fa191fa7c4732a08e28a2
-SHA1 (patch-unix_Makefile.in) = 1dee005fc4678a83259ba6dbec74d1c5753199b7
-SHA1 (patch-unix_configure) = 873e678a1b2a6fd517414811ea37c26390ec0048
-SHA1 (patch-unix_tcl.m4) = 28b93769dbdb6710897e31634e278ece75cb682a
-SHA1 (patch-unix_tclConfig.sh.in) = 5a32d8e97240d14f3a03e205637fe3bf8307d868
+SHA1 (patch-unix_Makefile.in) = bac1e1140becda4cd032506ca8aaf699a9380faa
+SHA1 (patch-unix_configure) = abe7ec2bccea451d69d2df2587d3189971f17d9a
+SHA1 (patch-unix_tclConfig.sh.in) = 341ac4f1bbfb29551dea87ade98b3b7b59652a31
 SHA1 (patch-unix_tclUnixCompat.c) = 7ffa40a1a56345f5b86cd896e8e3b0d5748d8c5e
 SHA1 (patch-unix_tclUnixFCmd.c) = e715d9419a36a8414355252bb3da0ef48b07fe4f
-SHA1 (patch-unix_tclUnixInit.c) = 0e372d1098522d3ea9be9c5d2bb378af53fa86f6
+SHA1 (patch-unix_tclUnixInit.c) = 50eafafdd10e35266f9fe5b73a80e7b50f393f88
 SHA1 (patch-unix_tclUnixPort.h) = 6efe848c16c550f6adee4bec011891755bb23620
diff --git a/lang/tcl/patches/patch-pkgs_itcl4.0.0_configure b/lang/tcl/patches/patch-pkgs_itcl4.0.0_configure
deleted file mode 100644
index fbc9ed299b1..00000000000
--- a/lang/tcl/patches/patch-pkgs_itcl4.0.0_configure
+++ /dev/null
@@ -1,67 +0,0 @@
-$NetBSD: patch-pkgs_itcl4.0.0_configure,v 1.2 2014/02/05 12:50:51 obache Exp $
-
---- pkgs/itcl4.0.0/configure.orig	2012-11-07 21:54:07.000000000 +0000
-+++ pkgs/itcl4.0.0/configure
-@@ -8745,7 +8745,6 @@ fi
- fi
- 
- 		LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
--		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.${SHLIB_VERSION}'
- 		;;
- 	    esac
- 	    case "$arch" in
-@@ -8802,9 +8801,6 @@ fi
- 
- fi
- 
--	    # OpenBSD doesn't do version numbers with dots.
--	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
--	    TCL_LIB_VERSIONS_OK=nodots
- 	    ;;
- 	NetBSD-*|FreeBSD-[3-4].*)
- 	    # FreeBSD 3.* and greater have ELF.
-@@ -8837,17 +8833,17 @@ fi
- 		;;
- 	    esac
- 	    ;;
--	FreeBSD-*)
-+	FreeBSD-*|DragonFly-*)
- 	    # This configuration from FreeBSD Ports.
- 	    SHLIB_CFLAGS="-fPIC"
- 	    SHLIB_LD="${CC} -shared"
--	    TCL_SHLIB_LD_EXTRAS="-soname \$@"
-+	    TCL_SHLIB_LD_EXTRAS="-Wl,-soname \$@"
- 	    SHLIB_SUFFIX=".so"
- 	    LDFLAGS=""
- 	    if test $doRpath = yes; then
- 
- 		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
--		LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
-+		LD_SEARCH_FLAGS='-Wl,-rpath ${LIB_RUNTIME_DIR}'
- fi
- 
- 	    if test "${TCL_THREADS}" = "1"; then
-@@ -8859,10 +8855,10 @@ fi
- fi
- 
- 	    # Version numbers are dot-stripped by system policy.
--	    TCL_TRIM_DOTS=`echo ${VERSION} | tr -d .`
--	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
--	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'
--	    TCL_LIB_VERSIONS_OK=nodots
-+#	    TCL_TRIM_DOTS=`echo ${VERSION} | tr -d .`
-+#	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
-+#	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'
-+#	    TCL_LIB_VERSIONS_OK=nodots
- 	    ;;
- 	Darwin-*)
- 	    CFLAGS_OPTIMIZE="-Os"
-@@ -9637,7 +9633,7 @@ fi
- 	    BSD/OS*) ;;
- 	    CYGWIN_*) ;;
- 	    IRIX*) ;;
--	    NetBSD-*|FreeBSD-*|OpenBSD-*) ;;
-+	    NetBSD-*|FreeBSD-*|OpenBSD-*|DragonFly-*) ;;
- 	    Darwin-*) ;;
- 	    SCO_SV-3.2*) ;;
- 	    windows) ;;
diff --git a/lang/tcl/patches/patch-pkgs_itcl4.0.0_tclconfig_tcl.m4 b/lang/tcl/patches/patch-pkgs_itcl4.0.0_tclconfig_tcl.m4
deleted file mode 100644
index f43be53b007..00000000000
--- a/lang/tcl/patches/patch-pkgs_itcl4.0.0_tclconfig_tcl.m4
+++ /dev/null
@@ -1,47 +0,0 @@
-$NetBSD: patch-pkgs_itcl4.0.0_tclconfig_tcl.m4,v 1.1 2014/02/05 12:50:51 obache Exp $
-
---- pkgs/itcl4.0.0/tclconfig/tcl.m4.orig	2013-09-19 20:17:09.000000000 +0000
-+++ pkgs/itcl4.0.0/tclconfig/tcl.m4
-@@ -1659,26 +1659,26 @@ AC_DEFUN([TEA_CONFIG_CFLAGS], [
- 		;;
- 	    esac
- 	    ;;
--	FreeBSD-*)
-+	FreeBSD-*|DragonFly-*)
- 	    # This configuration from FreeBSD Ports.
- 	    SHLIB_CFLAGS="-fPIC"
- 	    SHLIB_LD="${CC} -shared"
--	    TCL_SHLIB_LD_EXTRAS="-soname \$[@]"
-+	    TCL_SHLIB_LD_EXTRAS="-Wl,-soname \$[@]"
- 	    SHLIB_SUFFIX=".so"
- 	    LDFLAGS=""
- 	    AS_IF([test $doRpath = yes], [
- 		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
--		LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'])
-+		LD_SEARCH_FLAGS='-Wl,-rpath ${LIB_RUNTIME_DIR}'])
- 	    AS_IF([test "${TCL_THREADS}" = "1"], [
- 		# The -pthread needs to go in the LDFLAGS, not LIBS
- 		LIBS=`echo $LIBS | sed s/-pthread//`
- 		CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
- 		LDFLAGS="$LDFLAGS $PTHREAD_LIBS"])
- 	    # Version numbers are dot-stripped by system policy.
--	    TCL_TRIM_DOTS=`echo ${VERSION} | tr -d .`
--	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
--	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'
--	    TCL_LIB_VERSIONS_OK=nodots
-+#	    TCL_TRIM_DOTS=`echo ${VERSION} | tr -d .`
-+#	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
-+#	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'
-+#	    TCL_LIB_VERSIONS_OK=nodots
- 	    ;;
- 	Darwin-*)
- 	    CFLAGS_OPTIMIZE="-Os"
-@@ -1999,7 +1999,7 @@ dnl # preprocessing tests use only CPPFL
- 	    BSD/OS*) ;;
- 	    CYGWIN_*) ;;
- 	    IRIX*) ;;
--	    NetBSD-*|FreeBSD-*|OpenBSD-*) ;;
-+	    NetBSD-*|FreeBSD-*|OpenBSD-*|DragonFly-*) ;;
- 	    Darwin-*) ;;
- 	    SCO_SV-3.2*) ;;
- 	    windows) ;;
diff --git a/lang/tcl/patches/patch-pkgs_itcl4.0.1_configure b/lang/tcl/patches/patch-pkgs_itcl4.0.1_configure
new file mode 100644
index 00000000000..80534e52538
--- /dev/null
+++ b/lang/tcl/patches/patch-pkgs_itcl4.0.1_configure
@@ -0,0 +1,52 @@
+$NetBSD: patch-pkgs_itcl4.0.1_configure,v 1.1 2014/10/31 21:11:18 adam Exp $
+
+Add support for DragonFly.
+
+--- pkgs/itcl4.0.1/configure.orig	2014-08-14 17:05:04.000000000 +0000
++++ pkgs/itcl4.0.1/configure
+@@ -7304,7 +7304,6 @@ 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"
+ 		;;
+ 	    esac
+@@ -7325,8 +7324,6 @@ fi
+ 
+ fi
+ 	    # OpenBSD doesn't do version numbers with dots.
+-	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
+-	    TCL_LIB_VERSIONS_OK=nodots
+ 	    ;;
+ 	NetBSD-*)
+ 	    # NetBSD has ELF and can use 'cc -shared' to build shared libs
+@@ -7348,7 +7345,7 @@ fi
+ 
+ fi
+ 	    ;;
+-	FreeBSD-*)
++	FreeBSD-*|DragonFly-*)
+ 	    # This configuration from FreeBSD Ports.
+ 	    SHLIB_CFLAGS="-fPIC"
+ 	    SHLIB_LD="${CC} -shared"
+@@ -7371,10 +7368,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
+ 	    ;;
+@@ -7985,7 +7978,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.8.0_configure b/lang/tcl/patches/patch-pkgs_sqlite3.8.0_configure
deleted file mode 100644
index b26deff3ca0..00000000000
--- a/lang/tcl/patches/patch-pkgs_sqlite3.8.0_configure
+++ /dev/null
@@ -1,57 +0,0 @@
-$NetBSD: patch-pkgs_sqlite3.8.0_configure,v 1.2 2014/02/05 12:50:51 obache Exp $
-
---- pkgs/sqlite3.8.0/configure.orig	2013-08-27 18:50:58.000000000 +0000
-+++ pkgs/sqlite3.8.0/configure
-@@ -6473,7 +6473,6 @@ 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}'
- 	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ELF" >&5
- $as_echo_n "checking for ELF... " >&6; }
- if ${tcl_cv_ld_elf+:} false; then :
-@@ -6547,17 +6546,17 @@ fi
- 		;;
- 	    esac
- 	    ;;
--	FreeBSD-*)
-+	FreeBSD-*|DragonFly-*)
- 	    # This configuration from FreeBSD Ports.
- 	    SHLIB_CFLAGS="-fPIC"
- 	    SHLIB_LD="${CC} -shared"
--	    TCL_SHLIB_LD_EXTRAS="-soname \$@"
-+	    TCL_SHLIB_LD_EXTRAS="-Wl,-soname \$@"
- 	    SHLIB_SUFFIX=".so"
- 	    LDFLAGS=""
- 	    if test $doRpath = yes; then :
- 
- 		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
--		LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
-+		LD_SEARCH_FLAGS='-Wl,-rpath ${LIB_RUNTIME_DIR}'
- fi
- 	    if test "${TCL_THREADS}" = "1"; then :
- 
-@@ -6567,10 +6566,10 @@ fi
- 		LDFLAGS="$LDFLAGS $PTHREAD_LIBS"
- fi
- 	    # Version numbers are dot-stripped by system policy.
--	    TCL_TRIM_DOTS=`echo ${VERSION} | tr -d .`
--	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
--	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'
--	    TCL_LIB_VERSIONS_OK=nodots
-+#	    TCL_TRIM_DOTS=`echo ${VERSION} | tr -d .`
-+#	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
-+#	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'
-+#	    TCL_LIB_VERSIONS_OK=nodots
- 	    ;;
- 	Darwin-*)
- 	    CFLAGS_OPTIMIZE="-Os"
-@@ -7134,7 +7133,7 @@ fi
- 	    BSD/OS*) ;;
- 	    CYGWIN_*) ;;
- 	    IRIX*) ;;
--	    NetBSD-*|FreeBSD-*|OpenBSD-*) ;;
-+	    NetBSD-*|FreeBSD-*|OpenBSD-*|DragonFly-*) ;;
- 	    Darwin-*) ;;
- 	    SCO_SV-3.2*) ;;
- 	    windows) ;;
diff --git a/lang/tcl/patches/patch-pkgs_sqlite3.8.0_tclconfig_tcl.m4 b/lang/tcl/patches/patch-pkgs_sqlite3.8.0_tclconfig_tcl.m4
deleted file mode 100644
index f5507bbd41d..00000000000
--- a/lang/tcl/patches/patch-pkgs_sqlite3.8.0_tclconfig_tcl.m4
+++ /dev/null
@@ -1,47 +0,0 @@
-$NetBSD: patch-pkgs_sqlite3.8.0_tclconfig_tcl.m4,v 1.1 2014/02/05 12:50:51 obache Exp $
-
---- pkgs/sqlite3.8.0/tclconfig/tcl.m4.orig	2013-09-19 20:17:11.000000000 +0000
-+++ pkgs/sqlite3.8.0/tclconfig/tcl.m4
-@@ -1627,26 +1627,26 @@ dnl AC_CHECK_TOOL(AR, ar)
- 		;;
- 	    esac
- 	    ;;
--	FreeBSD-*)
-+	FreeBSD-*|DragonFly-*)
- 	    # This configuration from FreeBSD Ports.
- 	    SHLIB_CFLAGS="-fPIC"
- 	    SHLIB_LD="${CC} -shared"
--	    TCL_SHLIB_LD_EXTRAS="-soname \$[@]"
-+	    TCL_SHLIB_LD_EXTRAS="-Wl,-soname \$[@]"
- 	    SHLIB_SUFFIX=".so"
- 	    LDFLAGS=""
- 	    AS_IF([test $doRpath = yes], [
- 		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
--		LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'])
-+		LD_SEARCH_FLAGS='-Wl,-rpath ${LIB_RUNTIME_DIR}'])
- 	    AS_IF([test "${TCL_THREADS}" = "1"], [
- 		# The -pthread needs to go in the LDFLAGS, not LIBS
- 		LIBS=`echo $LIBS | sed s/-pthread//`
- 		CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
- 		LDFLAGS="$LDFLAGS $PTHREAD_LIBS"])
- 	    # Version numbers are dot-stripped by system policy.
--	    TCL_TRIM_DOTS=`echo ${VERSION} | tr -d .`
--	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
--	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'
--	    TCL_LIB_VERSIONS_OK=nodots
-+#	    TCL_TRIM_DOTS=`echo ${VERSION} | tr -d .`
-+#	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
-+#	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'
-+#	    TCL_LIB_VERSIONS_OK=nodots
- 	    ;;
- 	Darwin-*)
- 	    CFLAGS_OPTIMIZE="-Os"
-@@ -1967,7 +1967,7 @@ dnl # preprocessing tests use only CPPFL
- 	    BSD/OS*) ;;
- 	    CYGWIN_*) ;;
- 	    IRIX*) ;;
--	    NetBSD-*|FreeBSD-*|OpenBSD-*) ;;
-+	    NetBSD-*|FreeBSD-*|OpenBSD-*|DragonFly-*) ;;
- 	    Darwin-*) ;;
- 	    SCO_SV-3.2*) ;;
- 	    windows) ;;
diff --git a/lang/tcl/patches/patch-pkgs_sqlite3.8.6_configure b/lang/tcl/patches/patch-pkgs_sqlite3.8.6_configure
new file mode 100644
index 00000000000..3ac4721d6ef
--- /dev/null
+++ b/lang/tcl/patches/patch-pkgs_sqlite3.8.6_configure
@@ -0,0 +1,52 @@
+$NetBSD: patch-pkgs_sqlite3.8.6_configure,v 1.1 2014/10/31 21:11:18 adam Exp $
+
+Add support for DragonFly.
+
+--- pkgs/sqlite3.8.6/configure.orig	2014-08-15 14:09:19.000000000 +0000
++++ pkgs/sqlite3.8.6/configure
+@@ -7241,7 +7241,6 @@ 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"
+ 		;;
+ 	    esac
+@@ -7262,8 +7261,6 @@ fi
+ 
+ fi
+ 	    # OpenBSD doesn't do version numbers with dots.
+-	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
+-	    TCL_LIB_VERSIONS_OK=nodots
+ 	    ;;
+ 	NetBSD-*)
+ 	    # NetBSD has ELF and can use 'cc -shared' to build shared libs
+@@ -7285,7 +7282,7 @@ fi
+ 
+ fi
+ 	    ;;
+-	FreeBSD-*)
++	FreeBSD-*|DragonFly-*)
+ 	    # This configuration from FreeBSD Ports.
+ 	    SHLIB_CFLAGS="-fPIC"
+ 	    SHLIB_LD="${CC} -shared"
+@@ -7305,10 +7302,6 @@ fi
+ 		LDFLAGS="$LDFLAGS $PTHREAD_LIBS"
+ fi
+ 	    # 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
+ 	    ;;
+ 	Darwin-*)
+ 	    CFLAGS_OPTIMIZE="-Os"
+@@ -7917,7 +7910,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.0_configure b/lang/tcl/patches/patch-pkgs_tdbc1.0.0_configure
deleted file mode 100644
index e1886d42a65..00000000000
--- a/lang/tcl/patches/patch-pkgs_tdbc1.0.0_configure
+++ /dev/null
@@ -1,67 +0,0 @@
-$NetBSD: patch-pkgs_tdbc1.0.0_configure,v 1.2 2014/02/05 12:50:51 obache Exp $
-
---- pkgs/tdbc1.0.0/configure.orig	2012-11-23 21:46:02.000000000 +0000
-+++ pkgs/tdbc1.0.0/configure
-@@ -9405,7 +9405,6 @@ fi
- fi
- 
- 		LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
--		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.${SHLIB_VERSION}'
- 		;;
- 	    esac
- 	    case "$arch" in
-@@ -9462,9 +9461,6 @@ fi
- 
- fi
- 
--	    # OpenBSD doesn't do version numbers with dots.
--	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
--	    TCL_LIB_VERSIONS_OK=nodots
- 	    ;;
- 	NetBSD-*|FreeBSD-[3-4].*)
- 	    # FreeBSD 3.* and greater have ELF.
-@@ -9497,17 +9493,17 @@ fi
- 		;;
- 	    esac
- 	    ;;
--	FreeBSD-*)
-+	FreeBSD-*|DragonFly-*)
- 	    # This configuration from FreeBSD Ports.
- 	    SHLIB_CFLAGS="-fPIC"
- 	    SHLIB_LD="${CC} -shared"
--	    TCL_SHLIB_LD_EXTRAS="-soname \$@"
-+	    TCL_SHLIB_LD_EXTRAS="-Wl,-soname \$@"
- 	    SHLIB_SUFFIX=".so"
- 	    LDFLAGS=""
- 	    if test $doRpath = yes; then
- 
- 		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
--		LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
-+		LD_SEARCH_FLAGS='-Wl,-rpath ${LIB_RUNTIME_DIR}'
- fi
- 
- 	    if test "${TCL_THREADS}" = "1"; then
-@@ -9519,10 +9515,10 @@ fi
- fi
- 
- 	    # Version numbers are dot-stripped by system policy.
--	    TCL_TRIM_DOTS=`echo ${VERSION} | tr -d .`
--	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
--	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'
--	    TCL_LIB_VERSIONS_OK=nodots
-+#	    TCL_TRIM_DOTS=`echo ${VERSION} | tr -d .`
-+#	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
-+#	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'
-+#	    TCL_LIB_VERSIONS_OK=nodots
- 	    ;;
- 	Darwin-*)
- 	    CFLAGS_OPTIMIZE="-Os"
-@@ -10297,7 +10293,7 @@ fi
- 	    BSD/OS*) ;;
- 	    CYGWIN_*) ;;
- 	    IRIX*) ;;
--	    NetBSD-*|FreeBSD-*|OpenBSD-*) ;;
-+	    NetBSD-*|FreeBSD-*|OpenBSD-*|DragonFly-*) ;;
- 	    Darwin-*) ;;
- 	    SCO_SV-3.2*) ;;
- 	    windows) ;;
diff --git a/lang/tcl/patches/patch-pkgs_tdbc1.0.0_tclconfig_tcl.m4 b/lang/tcl/patches/patch-pkgs_tdbc1.0.0_tclconfig_tcl.m4
deleted file mode 100644
index b6b9a1768c6..00000000000
--- a/lang/tcl/patches/patch-pkgs_tdbc1.0.0_tclconfig_tcl.m4
+++ /dev/null
@@ -1,47 +0,0 @@
-$NetBSD: patch-pkgs_tdbc1.0.0_tclconfig_tcl.m4,v 1.1 2014/02/05 12:50:51 obache Exp $
-
---- pkgs/tdbc1.0.0/tclconfig/tcl.m4.orig	2012-11-23 21:47:37.000000000 +0000
-+++ pkgs/tdbc1.0.0/tclconfig/tcl.m4
-@@ -1659,26 +1659,26 @@ AC_DEFUN([TEA_CONFIG_CFLAGS], [
- 		;;
- 	    esac
- 	    ;;
--	FreeBSD-*)
-+	FreeBSD-*|DragonFly-*)
- 	    # This configuration from FreeBSD Ports.
- 	    SHLIB_CFLAGS="-fPIC"
- 	    SHLIB_LD="${CC} -shared"
--	    TCL_SHLIB_LD_EXTRAS="-soname \$[@]"
-+	    TCL_SHLIB_LD_EXTRAS="-Wl,-soname \$[@]"
- 	    SHLIB_SUFFIX=".so"
- 	    LDFLAGS=""
- 	    AS_IF([test $doRpath = yes], [
- 		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
--		LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'])
-+		LD_SEARCH_FLAGS='-Wl,-rpath ${LIB_RUNTIME_DIR}'])
- 	    AS_IF([test "${TCL_THREADS}" = "1"], [
- 		# The -pthread needs to go in the LDFLAGS, not LIBS
- 		LIBS=`echo $LIBS | sed s/-pthread//`
- 		CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
- 		LDFLAGS="$LDFLAGS $PTHREAD_LIBS"])
- 	    # Version numbers are dot-stripped by system policy.
--	    TCL_TRIM_DOTS=`echo ${VERSION} | tr -d .`
--	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
--	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'
--	    TCL_LIB_VERSIONS_OK=nodots
-+#	    TCL_TRIM_DOTS=`echo ${VERSION} | tr -d .`
-+#	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
-+#	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'
-+#	    TCL_LIB_VERSIONS_OK=nodots
- 	    ;;
- 	Darwin-*)
- 	    CFLAGS_OPTIMIZE="-Os"
-@@ -1999,7 +1999,7 @@ dnl # preprocessing tests use only CPPFL
- 	    BSD/OS*) ;;
- 	    CYGWIN_*) ;;
- 	    IRIX*) ;;
--	    NetBSD-*|FreeBSD-*|OpenBSD-*) ;;
-+	    NetBSD-*|FreeBSD-*|OpenBSD-*|DragonFly-*) ;;
- 	    Darwin-*) ;;
- 	    SCO_SV-3.2*) ;;
- 	    windows) ;;
diff --git a/lang/tcl/patches/patch-pkgs_tdbc1.0.1_configure b/lang/tcl/patches/patch-pkgs_tdbc1.0.1_configure
new file mode 100644
index 00000000000..326a92dd155
--- /dev/null
+++ b/lang/tcl/patches/patch-pkgs_tdbc1.0.1_configure
@@ -0,0 +1,52 @@
+$NetBSD: patch-pkgs_tdbc1.0.1_configure,v 1.1 2014/10/31 21:11:18 adam Exp $
+
+Add support for DragonFly.
+
+--- pkgs/tdbc1.0.1/configure.orig	2014-08-14 17:26:06.000000000 +0000
++++ pkgs/tdbc1.0.1/configure
+@@ -9409,7 +9409,6 @@ fi
+ fi
+ 
+ 		LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
+-		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.${SHLIB_VERSION}'
+ 		LDFLAGS="-Wl,-export-dynamic"
+ 		;;
+ 	    esac
+@@ -9431,8 +9430,6 @@ fi
+ fi
+ 
+ 	    # OpenBSD doesn't do version numbers with dots.
+-	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
+-	    TCL_LIB_VERSIONS_OK=nodots
+ 	    ;;
+ 	NetBSD-*)
+ 	    # NetBSD has ELF and can use 'cc -shared' to build shared libs
+@@ -9456,7 +9453,7 @@ fi
+ fi
+ 
+ 	    ;;
+-	FreeBSD-*)
++	FreeBSD-*|DragonFly-*)
+ 	    # This configuration from FreeBSD Ports.
+ 	    SHLIB_CFLAGS="-fPIC"
+ 	    SHLIB_LD="${CC} -shared"
+@@ -9481,10 +9478,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
+ 	    ;;
+@@ -10335,7 +10328,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.0_configure b/lang/tcl/patches/patch-pkgs_tdbcmysql1.0.0_configure
deleted file mode 100644
index 8f51f238e47..00000000000
--- a/lang/tcl/patches/patch-pkgs_tdbcmysql1.0.0_configure
+++ /dev/null
@@ -1,57 +0,0 @@
-$NetBSD: patch-pkgs_tdbcmysql1.0.0_configure,v 1.3 2014/02/06 04:29:12 obache Exp $
-
---- pkgs/tdbcmysql1.0.0/configure.orig	2012-11-26 14:24:47.000000000 +0000
-+++ pkgs/tdbcmysql1.0.0/configure
-@@ -7769,7 +7769,6 @@ 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}'
- 		;;
- 	    esac
- 	    case "$arch" in
-@@ -7853,17 +7852,17 @@ fi
- 		;;
- 	    esac
- 	    ;;
--	FreeBSD-*)
-+	FreeBSD-*|DragonFly-*)
- 	    # This configuration from FreeBSD Ports.
- 	    SHLIB_CFLAGS="-fPIC"
- 	    SHLIB_LD="${CC} -shared"
--	    TCL_SHLIB_LD_EXTRAS="-soname \$@"
-+	    TCL_SHLIB_LD_EXTRAS="-Wl,-soname \$@"
- 	    SHLIB_SUFFIX=".so"
- 	    LDFLAGS=""
- 	    if test $doRpath = yes; then :
- 
- 		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
--		LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
-+		LD_SEARCH_FLAGS='-Wl,-rpath ${LIB_RUNTIME_DIR}'
- fi
- 	    if test "${TCL_THREADS}" = "1"; then :
- 
-@@ -7873,10 +7872,10 @@ fi
- 		LDFLAGS="$LDFLAGS $PTHREAD_LIBS"
- fi
- 	    # Version numbers are dot-stripped by system policy.
--	    TCL_TRIM_DOTS=`echo ${VERSION} | tr -d .`
--	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
--	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'
--	    TCL_LIB_VERSIONS_OK=nodots
-+#	    TCL_TRIM_DOTS=`echo ${VERSION} | tr -d .`
-+#	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
-+#	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'
-+#	    TCL_LIB_VERSIONS_OK=nodots
- 	    ;;
- 	Darwin-*)
- 	    CFLAGS_OPTIMIZE="-Os"
-@@ -8440,7 +8439,7 @@ fi
- 	    BSD/OS*) ;;
- 	    CYGWIN_*) ;;
- 	    IRIX*) ;;
--	    NetBSD-*|FreeBSD-*|OpenBSD-*) ;;
-+	    NetBSD-*|FreeBSD-*|OpenBSD-*|DragonFly-*) ;;
- 	    Darwin-*) ;;
- 	    SCO_SV-3.2*) ;;
- 	    windows) ;;
diff --git a/lang/tcl/patches/patch-pkgs_tdbcmysql1.0.0_tclconfig_tcl.m4 b/lang/tcl/patches/patch-pkgs_tdbcmysql1.0.0_tclconfig_tcl.m4
deleted file mode 100644
index 75da709f781..00000000000
--- a/lang/tcl/patches/patch-pkgs_tdbcmysql1.0.0_tclconfig_tcl.m4
+++ /dev/null
@@ -1,47 +0,0 @@
-$NetBSD: patch-pkgs_tdbcmysql1.0.0_tclconfig_tcl.m4,v 1.1 2014/02/05 12:50:51 obache Exp $
-
---- pkgs/tdbcmysql1.0.0/tclconfig/tcl.m4.orig	2013-09-19 20:17:12.000000000 +0000
-+++ pkgs/tdbcmysql1.0.0/tclconfig/tcl.m4
-@@ -1659,26 +1659,26 @@ AC_DEFUN([TEA_CONFIG_CFLAGS], [
- 		;;
- 	    esac
- 	    ;;
--	FreeBSD-*)
-+	FreeBSD-*|DragonFly-*)
- 	    # This configuration from FreeBSD Ports.
- 	    SHLIB_CFLAGS="-fPIC"
- 	    SHLIB_LD="${CC} -shared"
--	    TCL_SHLIB_LD_EXTRAS="-soname \$[@]"
-+	    TCL_SHLIB_LD_EXTRAS="-Wl,-soname \$[@]"
- 	    SHLIB_SUFFIX=".so"
- 	    LDFLAGS=""
- 	    AS_IF([test $doRpath = yes], [
- 		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
--		LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'])
-+		LD_SEARCH_FLAGS='-Wl,-rpath ${LIB_RUNTIME_DIR}'])
- 	    AS_IF([test "${TCL_THREADS}" = "1"], [
- 		# The -pthread needs to go in the LDFLAGS, not LIBS
- 		LIBS=`echo $LIBS | sed s/-pthread//`
- 		CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
- 		LDFLAGS="$LDFLAGS $PTHREAD_LIBS"])
- 	    # Version numbers are dot-stripped by system policy.
--	    TCL_TRIM_DOTS=`echo ${VERSION} | tr -d .`
--	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
--	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'
--	    TCL_LIB_VERSIONS_OK=nodots
-+#	    TCL_TRIM_DOTS=`echo ${VERSION} | tr -d .`
-+#	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
-+#	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'
-+#	    TCL_LIB_VERSIONS_OK=nodots
- 	    ;;
- 	Darwin-*)
- 	    CFLAGS_OPTIMIZE="-Os"
-@@ -1999,7 +1999,7 @@ dnl # preprocessing tests use only CPPFL
- 	    BSD/OS*) ;;
- 	    CYGWIN_*) ;;
- 	    IRIX*) ;;
--	    NetBSD-*|FreeBSD-*|OpenBSD-*) ;;
-+	    NetBSD-*|FreeBSD-*|OpenBSD-*|DragonFly-*) ;;
- 	    Darwin-*) ;;
- 	    SCO_SV-3.2*) ;;
- 	    windows) ;;
diff --git a/lang/tcl/patches/patch-pkgs_tdbcmysql1.0.1_configure b/lang/tcl/patches/patch-pkgs_tdbcmysql1.0.1_configure
new file mode 100644
index 00000000000..ff94841f7bd
--- /dev/null
+++ b/lang/tcl/patches/patch-pkgs_tdbcmysql1.0.1_configure
@@ -0,0 +1,52 @@
+$NetBSD: patch-pkgs_tdbcmysql1.0.1_configure,v 1.1 2014/10/31 21:11:18 adam Exp $
+
+Add support for DragonFly.
+
+--- pkgs/tdbcmysql1.0.1/configure.orig	2014-08-14 17:46:47.000000000 +0000
++++ pkgs/tdbcmysql1.0.1/configure
+@@ -7776,7 +7776,6 @@ 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"
+ 		;;
+ 	    esac
+@@ -7797,8 +7796,6 @@ fi
+ 
+ fi
+ 	    # OpenBSD doesn't do version numbers with dots.
+-	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
+-	    TCL_LIB_VERSIONS_OK=nodots
+ 	    ;;
+ 	NetBSD-*)
+ 	    # NetBSD has ELF and can use 'cc -shared' to build shared libs
+@@ -7820,7 +7817,7 @@ fi
+ 
+ fi
+ 	    ;;
+-	FreeBSD-*)
++	FreeBSD-*|DragonFly-*)
+ 	    # This configuration from FreeBSD Ports.
+ 	    SHLIB_CFLAGS="-fPIC"
+ 	    SHLIB_LD="${CC} -shared"
+@@ -7843,10 +7840,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
+ 	    ;;
+@@ -8457,7 +8450,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_tdbcodbc1.0.0_configure b/lang/tcl/patches/patch-pkgs_tdbcodbc1.0.0_configure
deleted file mode 100644
index bb237274a03..00000000000
--- a/lang/tcl/patches/patch-pkgs_tdbcodbc1.0.0_configure
+++ /dev/null
@@ -1,57 +0,0 @@
-$NetBSD: patch-pkgs_tdbcodbc1.0.0_configure,v 1.2 2014/02/05 12:50:51 obache Exp $
-
---- pkgs/tdbcodbc1.0.0/configure.orig	2012-12-12 21:22:22.000000000 +0000
-+++ pkgs/tdbcodbc1.0.0/configure
-@@ -7763,7 +7763,6 @@ 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}'
- 		;;
- 	    esac
- 	    case "$arch" in
-@@ -7847,17 +7846,17 @@ fi
- 		;;
- 	    esac
- 	    ;;
--	FreeBSD-*)
-+	FreeBSD-*|DragonFly-*)
- 	    # This configuration from FreeBSD Ports.
- 	    SHLIB_CFLAGS="-fPIC"
- 	    SHLIB_LD="${CC} -shared"
--	    TCL_SHLIB_LD_EXTRAS="-soname \$@"
-+	    TCL_SHLIB_LD_EXTRAS="-Wl,-soname \$@"
- 	    SHLIB_SUFFIX=".so"
- 	    LDFLAGS=""
- 	    if test $doRpath = yes; then :
- 
- 		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
--		LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
-+		LD_SEARCH_FLAGS='-Wl,-rpath ${LIB_RUNTIME_DIR}'
- fi
- 	    if test "${TCL_THREADS}" = "1"; then :
- 
-@@ -7867,10 +7866,10 @@ fi
- 		LDFLAGS="$LDFLAGS $PTHREAD_LIBS"
- fi
- 	    # Version numbers are dot-stripped by system policy.
--	    TCL_TRIM_DOTS=`echo ${VERSION} | tr -d .`
--	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
--	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'
--	    TCL_LIB_VERSIONS_OK=nodots
-+#	    TCL_TRIM_DOTS=`echo ${VERSION} | tr -d .`
-+#	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
-+#	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'
-+#	    TCL_LIB_VERSIONS_OK=nodots
- 	    ;;
- 	Darwin-*)
- 	    CFLAGS_OPTIMIZE="-Os"
-@@ -8434,7 +8433,7 @@ fi
- 	    BSD/OS*) ;;
- 	    CYGWIN_*) ;;
- 	    IRIX*) ;;
--	    NetBSD-*|FreeBSD-*|OpenBSD-*) ;;
-+	    NetBSD-*|FreeBSD-*|OpenBSD-*|DragonFly-*) ;;
- 	    Darwin-*) ;;
- 	    SCO_SV-3.2*) ;;
- 	    windows) ;;
diff --git a/lang/tcl/patches/patch-pkgs_tdbcodbc1.0.0_tclconfig_tcl.m4 b/lang/tcl/patches/patch-pkgs_tdbcodbc1.0.0_tclconfig_tcl.m4
deleted file mode 100644
index 37f48dc4c7b..00000000000
--- a/lang/tcl/patches/patch-pkgs_tdbcodbc1.0.0_tclconfig_tcl.m4
+++ /dev/null
@@ -1,47 +0,0 @@
-$NetBSD: patch-pkgs_tdbcodbc1.0.0_tclconfig_tcl.m4,v 1.1 2014/02/05 12:50:51 obache Exp $
-
---- pkgs/tdbcodbc1.0.0/tclconfig/tcl.m4.orig	2013-09-19 20:17:12.000000000 +0000
-+++ pkgs/tdbcodbc1.0.0/tclconfig/tcl.m4
-@@ -1659,26 +1659,26 @@ AC_DEFUN([TEA_CONFIG_CFLAGS], [
- 		;;
- 	    esac
- 	    ;;
--	FreeBSD-*)
-+	FreeBSD-*|DragonFly-*)
- 	    # This configuration from FreeBSD Ports.
- 	    SHLIB_CFLAGS="-fPIC"
- 	    SHLIB_LD="${CC} -shared"
--	    TCL_SHLIB_LD_EXTRAS="-soname \$[@]"
-+	    TCL_SHLIB_LD_EXTRAS="-Wl,-soname \$[@]"
- 	    SHLIB_SUFFIX=".so"
- 	    LDFLAGS=""
- 	    AS_IF([test $doRpath = yes], [
- 		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
--		LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'])
-+		LD_SEARCH_FLAGS='-Wl,-rpath ${LIB_RUNTIME_DIR}'])
- 	    AS_IF([test "${TCL_THREADS}" = "1"], [
- 		# The -pthread needs to go in the LDFLAGS, not LIBS
- 		LIBS=`echo $LIBS | sed s/-pthread//`
- 		CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
- 		LDFLAGS="$LDFLAGS $PTHREAD_LIBS"])
- 	    # Version numbers are dot-stripped by system policy.
--	    TCL_TRIM_DOTS=`echo ${VERSION} | tr -d .`
--	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
--	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'
--	    TCL_LIB_VERSIONS_OK=nodots
-+#	    TCL_TRIM_DOTS=`echo ${VERSION} | tr -d .`
-+#	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
-+#	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'
-+#	    TCL_LIB_VERSIONS_OK=nodots
- 	    ;;
- 	Darwin-*)
- 	    CFLAGS_OPTIMIZE="-Os"
-@@ -1999,7 +1999,7 @@ dnl # preprocessing tests use only CPPFL
- 	    BSD/OS*) ;;
- 	    CYGWIN_*) ;;
- 	    IRIX*) ;;
--	    NetBSD-*|FreeBSD-*|OpenBSD-*) ;;
-+	    NetBSD-*|FreeBSD-*|OpenBSD-*|DragonFly-*) ;;
- 	    Darwin-*) ;;
- 	    SCO_SV-3.2*) ;;
- 	    windows) ;;
diff --git a/lang/tcl/patches/patch-pkgs_tdbcodbc1.0.1_configure b/lang/tcl/patches/patch-pkgs_tdbcodbc1.0.1_configure
new file mode 100644
index 00000000000..07f5f955b3a
--- /dev/null
+++ b/lang/tcl/patches/patch-pkgs_tdbcodbc1.0.1_configure
@@ -0,0 +1,52 @@
+$NetBSD: patch-pkgs_tdbcodbc1.0.1_configure,v 1.1 2014/10/31 21:11:18 adam Exp $
+
+Add support for DragonFly.
+
+--- pkgs/tdbcodbc1.0.1/configure.orig	2014-08-14 17:52:58.000000000 +0000
++++ pkgs/tdbcodbc1.0.1/configure
+@@ -7770,7 +7770,6 @@ 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"
+ 		;;
+ 	    esac
+@@ -7791,8 +7790,6 @@ fi
+ 
+ fi
+ 	    # OpenBSD doesn't do version numbers with dots.
+-	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
+-	    TCL_LIB_VERSIONS_OK=nodots
+ 	    ;;
+ 	NetBSD-*)
+ 	    # NetBSD has ELF and can use 'cc -shared' to build shared libs
+@@ -7814,7 +7811,7 @@ fi
+ 
+ fi
+ 	    ;;
+-	FreeBSD-*)
++	FreeBSD-*|DragonFly-*)
+ 	    # This configuration from FreeBSD Ports.
+ 	    SHLIB_CFLAGS="-fPIC"
+ 	    SHLIB_LD="${CC} -shared"
+@@ -7837,10 +7834,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
+ 	    ;;
+@@ -8451,7 +8444,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_tdbcpostgres1.0.0_configure b/lang/tcl/patches/patch-pkgs_tdbcpostgres1.0.0_configure
deleted file mode 100644
index d88a16b3b0e..00000000000
--- a/lang/tcl/patches/patch-pkgs_tdbcpostgres1.0.0_configure
+++ /dev/null
@@ -1,57 +0,0 @@
-$NetBSD: patch-pkgs_tdbcpostgres1.0.0_configure,v 1.2 2014/02/05 12:50:51 obache Exp $
-
---- pkgs/tdbcpostgres1.0.0/configure.orig	2012-12-12 21:22:46.000000000 +0000
-+++ pkgs/tdbcpostgres1.0.0/configure
-@@ -7763,7 +7763,6 @@ 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}'
- 		;;
- 	    esac
- 	    case "$arch" in
-@@ -7847,17 +7846,17 @@ fi
- 		;;
- 	    esac
- 	    ;;
--	FreeBSD-*)
-+	FreeBSD-*|DragonFly-*)
- 	    # This configuration from FreeBSD Ports.
- 	    SHLIB_CFLAGS="-fPIC"
- 	    SHLIB_LD="${CC} -shared"
--	    TCL_SHLIB_LD_EXTRAS="-soname \$@"
-+	    TCL_SHLIB_LD_EXTRAS="-Wl,-soname \$@"
- 	    SHLIB_SUFFIX=".so"
- 	    LDFLAGS=""
- 	    if test $doRpath = yes; then :
- 
- 		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
--		LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
-+		LD_SEARCH_FLAGS='-Wl,-rpath ${LIB_RUNTIME_DIR}'
- fi
- 	    if test "${TCL_THREADS}" = "1"; then :
- 
-@@ -7867,10 +7866,10 @@ fi
- 		LDFLAGS="$LDFLAGS $PTHREAD_LIBS"
- fi
- 	    # Version numbers are dot-stripped by system policy.
--	    TCL_TRIM_DOTS=`echo ${VERSION} | tr -d .`
--	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
--	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'
--	    TCL_LIB_VERSIONS_OK=nodots
-+#	    TCL_TRIM_DOTS=`echo ${VERSION} | tr -d .`
-+#	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
-+#	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'
-+#	    TCL_LIB_VERSIONS_OK=nodots
- 	    ;;
- 	Darwin-*)
- 	    CFLAGS_OPTIMIZE="-Os"
-@@ -8434,7 +8433,7 @@ fi
- 	    BSD/OS*) ;;
- 	    CYGWIN_*) ;;
- 	    IRIX*) ;;
--	    NetBSD-*|FreeBSD-*|OpenBSD-*) ;;
-+	    NetBSD-*|FreeBSD-*|OpenBSD-*|DragonFly-*) ;;
- 	    Darwin-*) ;;
- 	    SCO_SV-3.2*) ;;
- 	    windows) ;;
diff --git a/lang/tcl/patches/patch-pkgs_tdbcpostgres1.0.0_tclconfig_tcl.m4 b/lang/tcl/patches/patch-pkgs_tdbcpostgres1.0.0_tclconfig_tcl.m4
deleted file mode 100644
index 9d1725d445f..00000000000
--- a/lang/tcl/patches/patch-pkgs_tdbcpostgres1.0.0_tclconfig_tcl.m4
+++ /dev/null
@@ -1,47 +0,0 @@
-$NetBSD: patch-pkgs_tdbcpostgres1.0.0_tclconfig_tcl.m4,v 1.1 2014/02/05 12:50:51 obache Exp $
-
---- pkgs/tdbcpostgres1.0.0/tclconfig/tcl.m4.orig	2013-09-19 20:17:13.000000000 +0000
-+++ pkgs/tdbcpostgres1.0.0/tclconfig/tcl.m4
-@@ -1659,26 +1659,26 @@ AC_DEFUN([TEA_CONFIG_CFLAGS], [
- 		;;
- 	    esac
- 	    ;;
--	FreeBSD-*)
-+	FreeBSD-*|DragonFly-*)
- 	    # This configuration from FreeBSD Ports.
- 	    SHLIB_CFLAGS="-fPIC"
- 	    SHLIB_LD="${CC} -shared"
--	    TCL_SHLIB_LD_EXTRAS="-soname \$[@]"
-+	    TCL_SHLIB_LD_EXTRAS="-Wl,-soname \$[@]"
- 	    SHLIB_SUFFIX=".so"
- 	    LDFLAGS=""
- 	    AS_IF([test $doRpath = yes], [
- 		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
--		LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'])
-+		LD_SEARCH_FLAGS='-Wl,-rpath ${LIB_RUNTIME_DIR}'])
- 	    AS_IF([test "${TCL_THREADS}" = "1"], [
- 		# The -pthread needs to go in the LDFLAGS, not LIBS
- 		LIBS=`echo $LIBS | sed s/-pthread//`
- 		CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
- 		LDFLAGS="$LDFLAGS $PTHREAD_LIBS"])
- 	    # Version numbers are dot-stripped by system policy.
--	    TCL_TRIM_DOTS=`echo ${VERSION} | tr -d .`
--	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
--	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'
--	    TCL_LIB_VERSIONS_OK=nodots
-+#	    TCL_TRIM_DOTS=`echo ${VERSION} | tr -d .`
-+#	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
-+#	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'
-+#	    TCL_LIB_VERSIONS_OK=nodots
- 	    ;;
- 	Darwin-*)
- 	    CFLAGS_OPTIMIZE="-Os"
-@@ -1999,7 +1999,7 @@ dnl # preprocessing tests use only CPPFL
- 	    BSD/OS*) ;;
- 	    CYGWIN_*) ;;
- 	    IRIX*) ;;
--	    NetBSD-*|FreeBSD-*|OpenBSD-*) ;;
-+	    NetBSD-*|FreeBSD-*|OpenBSD-*|DragonFly-*) ;;
- 	    Darwin-*) ;;
- 	    SCO_SV-3.2*) ;;
- 	    windows) ;;
diff --git a/lang/tcl/patches/patch-pkgs_tdbcpostgres1.0.1_configure b/lang/tcl/patches/patch-pkgs_tdbcpostgres1.0.1_configure
new file mode 100644
index 00000000000..66d42bacc28
--- /dev/null
+++ b/lang/tcl/patches/patch-pkgs_tdbcpostgres1.0.1_configure
@@ -0,0 +1,52 @@
+$NetBSD: patch-pkgs_tdbcpostgres1.0.1_configure,v 1.1 2014/10/31 21:11:18 adam Exp $
+
+Add support for DragonFly.
+
+--- pkgs/tdbcpostgres1.0.1/configure.orig	2014-08-14 17:59:04.000000000 +0000
++++ pkgs/tdbcpostgres1.0.1/configure
+@@ -7770,7 +7770,6 @@ 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"
+ 		;;
+ 	    esac
+@@ -7791,8 +7790,6 @@ fi
+ 
+ fi
+ 	    # OpenBSD doesn't do version numbers with dots.
+-	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
+-	    TCL_LIB_VERSIONS_OK=nodots
+ 	    ;;
+ 	NetBSD-*)
+ 	    # NetBSD has ELF and can use 'cc -shared' to build shared libs
+@@ -7814,7 +7811,7 @@ fi
+ 
+ fi
+ 	    ;;
+-	FreeBSD-*)
++	FreeBSD-*|DragonFly-*)
+ 	    # This configuration from FreeBSD Ports.
+ 	    SHLIB_CFLAGS="-fPIC"
+ 	    SHLIB_LD="${CC} -shared"
+@@ -7837,10 +7834,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
+ 	    ;;
+@@ -8451,7 +8444,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_tdbcsqlite3-1.0.0_tclconfig_tcl.m4 b/lang/tcl/patches/patch-pkgs_tdbcsqlite3-1.0.0_tclconfig_tcl.m4
deleted file mode 100644
index a96a36bb2fb..00000000000
--- a/lang/tcl/patches/patch-pkgs_tdbcsqlite3-1.0.0_tclconfig_tcl.m4
+++ /dev/null
@@ -1,47 +0,0 @@
-$NetBSD: patch-pkgs_tdbcsqlite3-1.0.0_tclconfig_tcl.m4,v 1.1 2014/02/05 12:50:51 obache Exp $
-
---- pkgs/tdbcsqlite3-1.0.0/tclconfig/tcl.m4.orig	2013-09-19 20:17:13.000000000 +0000
-+++ pkgs/tdbcsqlite3-1.0.0/tclconfig/tcl.m4
-@@ -1659,26 +1659,26 @@ AC_DEFUN([TEA_CONFIG_CFLAGS], [
- 		;;
- 	    esac
- 	    ;;
--	FreeBSD-*)
-+	FreeBSD-*|DragonFly-*)
- 	    # This configuration from FreeBSD Ports.
- 	    SHLIB_CFLAGS="-fPIC"
- 	    SHLIB_LD="${CC} -shared"
--	    TCL_SHLIB_LD_EXTRAS="-soname \$[@]"
-+	    TCL_SHLIB_LD_EXTRAS="-Wl,-soname \$[@]"
- 	    SHLIB_SUFFIX=".so"
- 	    LDFLAGS=""
- 	    AS_IF([test $doRpath = yes], [
- 		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
--		LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'])
-+		LD_SEARCH_FLAGS='-Wl,-rpath ${LIB_RUNTIME_DIR}'])
- 	    AS_IF([test "${TCL_THREADS}" = "1"], [
- 		# The -pthread needs to go in the LDFLAGS, not LIBS
- 		LIBS=`echo $LIBS | sed s/-pthread//`
- 		CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
- 		LDFLAGS="$LDFLAGS $PTHREAD_LIBS"])
- 	    # Version numbers are dot-stripped by system policy.
--	    TCL_TRIM_DOTS=`echo ${VERSION} | tr -d .`
--	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
--	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'
--	    TCL_LIB_VERSIONS_OK=nodots
-+#	    TCL_TRIM_DOTS=`echo ${VERSION} | tr -d .`
-+#	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
-+#	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'
-+#	    TCL_LIB_VERSIONS_OK=nodots
- 	    ;;
- 	Darwin-*)
- 	    CFLAGS_OPTIMIZE="-Os"
-@@ -1999,7 +1999,7 @@ dnl # preprocessing tests use only CPPFL
- 	    BSD/OS*) ;;
- 	    CYGWIN_*) ;;
- 	    IRIX*) ;;
--	    NetBSD-*|FreeBSD-*|OpenBSD-*) ;;
-+	    NetBSD-*|FreeBSD-*|OpenBSD-*|DragonFly-*) ;;
- 	    Darwin-*) ;;
- 	    SCO_SV-3.2*) ;;
- 	    windows) ;;
diff --git a/lang/tcl/patches/patch-pkgs_thread2.7.0_configure b/lang/tcl/patches/patch-pkgs_thread2.7.0_configure
deleted file mode 100644
index 530d03bad2f..00000000000
--- a/lang/tcl/patches/patch-pkgs_thread2.7.0_configure
+++ /dev/null
@@ -1,57 +0,0 @@
-$NetBSD: patch-pkgs_thread2.7.0_configure,v 1.2 2014/02/05 12:50:51 obache Exp $
-
---- pkgs/thread2.7.0/configure.orig	2012-11-14 17:20:24.000000000 +0000
-+++ pkgs/thread2.7.0/configure
-@@ -9295,7 +9295,6 @@ fi
- fi
- 
- 		LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
--		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.${SHLIB_VERSION}'
- 		;;
- 	    esac
- 	    case "$arch" in
-@@ -9387,17 +9386,17 @@ fi
- 		;;
- 	    esac
- 	    ;;
--	FreeBSD-*)
-+	FreeBSD-*|DragonFly-*)
- 	    # This configuration from FreeBSD Ports.
- 	    SHLIB_CFLAGS="-fPIC"
- 	    SHLIB_LD="${CC} -shared"
--	    TCL_SHLIB_LD_EXTRAS="-soname \$@"
-+	    TCL_SHLIB_LD_EXTRAS="-Wl,-soname \$@"
- 	    SHLIB_SUFFIX=".so"
- 	    LDFLAGS=""
- 	    if test $doRpath = yes; then
- 
- 		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
--		LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
-+		LD_SEARCH_FLAGS='-Wl,-rpath ${LIB_RUNTIME_DIR}'
- fi
- 
- 	    if test "${TCL_THREADS}" = "1"; then
-@@ -9409,10 +9408,10 @@ fi
- fi
- 
- 	    # Version numbers are dot-stripped by system policy.
--	    TCL_TRIM_DOTS=`echo ${VERSION} | tr -d .`
--	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
--	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'
--	    TCL_LIB_VERSIONS_OK=nodots
-+#	    TCL_TRIM_DOTS=`echo ${VERSION} | tr -d .`
-+#	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
-+#	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'
-+#	    TCL_LIB_VERSIONS_OK=nodots
- 	    ;;
- 	Darwin-*)
- 	    CFLAGS_OPTIMIZE="-Os"
-@@ -10187,7 +10186,7 @@ fi
- 	    BSD/OS*) ;;
- 	    CYGWIN_*) ;;
- 	    IRIX*) ;;
--	    NetBSD-*|FreeBSD-*|OpenBSD-*) ;;
-+	    NetBSD-*|FreeBSD-*|OpenBSD-*|DragonFly-*) ;;
- 	    Darwin-*) ;;
- 	    SCO_SV-3.2*) ;;
- 	    windows) ;;
diff --git a/lang/tcl/patches/patch-pkgs_thread2.7.0_tclconfig_tcl.m4 b/lang/tcl/patches/patch-pkgs_thread2.7.0_tclconfig_tcl.m4
deleted file mode 100644
index 02f879edb0e..00000000000
--- a/lang/tcl/patches/patch-pkgs_thread2.7.0_tclconfig_tcl.m4
+++ /dev/null
@@ -1,47 +0,0 @@
-$NetBSD: patch-pkgs_thread2.7.0_tclconfig_tcl.m4,v 1.1 2014/02/05 12:50:51 obache Exp $
-
---- pkgs/thread2.7.0/tclconfig/tcl.m4.orig	2013-09-19 20:17:13.000000000 +0000
-+++ pkgs/thread2.7.0/tclconfig/tcl.m4
-@@ -1659,26 +1659,26 @@ AC_DEFUN([TEA_CONFIG_CFLAGS], [
- 		;;
- 	    esac
- 	    ;;
--	FreeBSD-*)
-+	FreeBSD-*|DragonFly-*)
- 	    # This configuration from FreeBSD Ports.
- 	    SHLIB_CFLAGS="-fPIC"
- 	    SHLIB_LD="${CC} -shared"
--	    TCL_SHLIB_LD_EXTRAS="-soname \$[@]"
-+	    TCL_SHLIB_LD_EXTRAS="-Wl,-soname \$[@]"
- 	    SHLIB_SUFFIX=".so"
- 	    LDFLAGS=""
- 	    AS_IF([test $doRpath = yes], [
- 		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
--		LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'])
-+		LD_SEARCH_FLAGS='-Wl,-rpath ${LIB_RUNTIME_DIR}'])
- 	    AS_IF([test "${TCL_THREADS}" = "1"], [
- 		# The -pthread needs to go in the LDFLAGS, not LIBS
- 		LIBS=`echo $LIBS | sed s/-pthread//`
- 		CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
- 		LDFLAGS="$LDFLAGS $PTHREAD_LIBS"])
- 	    # Version numbers are dot-stripped by system policy.
--	    TCL_TRIM_DOTS=`echo ${VERSION} | tr -d .`
--	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
--	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'
--	    TCL_LIB_VERSIONS_OK=nodots
-+#	    TCL_TRIM_DOTS=`echo ${VERSION} | tr -d .`
-+#	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
-+#	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'
-+#	    TCL_LIB_VERSIONS_OK=nodots
- 	    ;;
- 	Darwin-*)
- 	    CFLAGS_OPTIMIZE="-Os"
-@@ -1999,7 +1999,7 @@ dnl # preprocessing tests use only CPPFL
- 	    BSD/OS*) ;;
- 	    CYGWIN_*) ;;
- 	    IRIX*) ;;
--	    NetBSD-*|FreeBSD-*|OpenBSD-*) ;;
-+	    NetBSD-*|FreeBSD-*|OpenBSD-*|DragonFly-*) ;;
- 	    Darwin-*) ;;
- 	    SCO_SV-3.2*) ;;
- 	    windows) ;;
diff --git a/lang/tcl/patches/patch-pkgs_thread2.7.1_configure b/lang/tcl/patches/patch-pkgs_thread2.7.1_configure
new file mode 100644
index 00000000000..f73ad0202bc
--- /dev/null
+++ b/lang/tcl/patches/patch-pkgs_thread2.7.1_configure
@@ -0,0 +1,52 @@
+$NetBSD: patch-pkgs_thread2.7.1_configure,v 1.1 2014/10/31 21:11:18 adam Exp $
+
+Add support for DragonFly.
+
+--- pkgs/thread2.7.1/configure.orig	2014-08-14 17:08:39.000000000 +0000
++++ pkgs/thread2.7.1/configure
+@@ -9299,7 +9299,6 @@ fi
+ fi
+ 
+ 		LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
+-		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.${SHLIB_VERSION}'
+ 		LDFLAGS="-Wl,-export-dynamic"
+ 		;;
+ 	    esac
+@@ -9321,8 +9320,6 @@ fi
+ fi
+ 
+ 	    # OpenBSD doesn't do version numbers with dots.
+-	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
+-	    TCL_LIB_VERSIONS_OK=nodots
+ 	    ;;
+ 	NetBSD-*)
+ 	    # NetBSD has ELF and can use 'cc -shared' to build shared libs
+@@ -9346,7 +9343,7 @@ fi
+ fi
+ 
+ 	    ;;
+-	FreeBSD-*)
++	FreeBSD-*|DragonFly-*)
+ 	    # This configuration from FreeBSD Ports.
+ 	    SHLIB_CFLAGS="-fPIC"
+ 	    SHLIB_LD="${CC} -shared"
+@@ -9371,10 +9368,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
+ 	    ;;
+@@ -10225,7 +10218,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-unix_Makefile.in b/lang/tcl/patches/patch-unix_Makefile.in
index 0969f5ca8ab..c4435dee4c4 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.7 2014/01/11 14:41:05 adam Exp $
+$NetBSD: patch-unix_Makefile.in,v 1.8 2014/10/31 21:11:18 adam Exp $
 
 --- unix/Makefile.in.orig	2013-09-19 20:17:13.000000000 +0000
 +++ unix/Makefile.in
@@ -40,8 +40,8 @@ $NetBSD: patch-unix_Makefile.in,v 1.7 2014/01/11 14:41:05 adam Exp $
  
  all: binaries libraries doc packages
  
--binaries: ${LIB_FILE} $(STUB_LIB_FILE) ${TCL_EXE}
-+binaries: ${LIB_FILE} $(STUB_LIB_FILE) ${TCL_EXE} ${TCL_LIB_A_FILE}
+-binaries: ${LIB_FILE} ${TCL_EXE}
++binaries: ${LIB_FILE} ${TCL_EXE} ${TCL_LIB_A_FILE}
  
  libraries:
  
@@ -86,8 +86,8 @@ $NetBSD: patch-unix_Makefile.in,v 1.7 2014/01/11 14:41:05 adam Exp $
  		echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \
 @@ -843,6 +859,8 @@ install-libraries: libraries
  	    done;
- 	@echo "Installing package http 2.8.7 as a Tcl Module";
- 	@$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.6/http-2.8.7.tm;
+ 	@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;
 +	@$(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/";
@@ -99,13 +99,13 @@ $NetBSD: patch-unix_Makefile.in,v 1.7 2014/01/11 14:41:05 adam Exp $
  	@$(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 tcltest 2.3.6 as a Tcl Module";
- 	@$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/tcltest-2.3.6.tm;
+ 	@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.12 as a Tcl Module";
- 	@$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform-1.0.12.tm;
+ 	@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;
 +	@$(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 a6df4b8f5f8..7a9bfe9546c 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.6 2014/01/11 14:41:05 adam Exp $
+$NetBSD: patch-unix_configure,v 1.7 2014/10/31 21:11:18 adam Exp $
 
---- unix/configure.orig	2013-09-19 20:17:13.000000000 +0000
+--- unix/configure.orig	2014-08-26 15:23:08.000000000 +0000
 +++ unix/configure
-@@ -7731,7 +7731,7 @@ fi
+@@ -7666,7 +7666,7 @@ fi
  	    CC_SEARCH_FLAGS=""
  	    LD_SEARCH_FLAGS=""
  	    ;;
@@ -11,7 +11,7 @@ $NetBSD: patch-unix_configure,v 1.6 2014/01/11 14:41:05 adam Exp $
  	    arch=`arch -s`
  	    case "$arch" in
  	    vax)
-@@ -7805,7 +7805,7 @@ fi
+@@ -7740,7 +7740,7 @@ fi
  fi
  
  	    ;;
@@ -20,15 +20,15 @@ $NetBSD: patch-unix_configure,v 1.6 2014/01/11 14:41:05 adam Exp $
  	    # This configuration from FreeBSD Ports.
  	    SHLIB_CFLAGS="-fPIC"
  	    SHLIB_LD="${CC} -shared"
-@@ -7835,7 +7835,6 @@ fi
- 	    TCL_LIB_VERSIONS_OK=nodots
+@@ -7775,7 +7775,6 @@ fi
+ 	    esac
  	    ;;
  	Darwin-*)
 -	    CFLAGS_OPTIMIZE="-Os"
  	    SHLIB_CFLAGS="-fno-common"
  	    # To avoid discrepancies between what headers configure sees during
  	    # preprocessing tests and compiling tests, move any -isysroot and
-@@ -9010,7 +9009,7 @@ fi
+@@ -8949,7 +8948,7 @@ fi
  	    BSD/OS*) ;;
  	    CYGWIN_*|MINGW32_*) ;;
  	    IRIX*) ;;
@@ -37,7 +37,7 @@ $NetBSD: patch-unix_configure,v 1.6 2014/01/11 14:41:05 adam Exp $
  	    Darwin-*) ;;
  	    SCO_SV-3.2*) ;;
  	    *) SHLIB_CFLAGS="-fPIC" ;;
-@@ -9052,7 +9051,11 @@ fi
+@@ -8991,7 +8990,11 @@ fi
  
  else
  
@@ -50,7 +50,7 @@ $NetBSD: patch-unix_configure,v 1.6 2014/01/11 14:41:05 adam Exp $
  
  fi
  
-@@ -9086,7 +9089,7 @@ fi
+@@ -9025,7 +9028,7 @@ fi
  else
  
          MAKE_STUB_LIB='${STLIB_LD} $@ ${STUB_LIB_OBJS} ; ${RANLIB} $@'
@@ -59,7 +59,7 @@ $NetBSD: patch-unix_configure,v 1.6 2014/01/11 14:41:05 adam Exp $
  
  fi
  
-@@ -19120,9 +19123,9 @@ fi
+@@ -19059,9 +19062,9 @@ fi
  #	building libtcl as a shared library instead of a static library.
  #--------------------------------------------------------------------
  
@@ -72,7 +72,7 @@ $NetBSD: patch-unix_configure,v 1.6 2014/01/11 14:41:05 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.
-@@ -19235,13 +19238,10 @@ else
+@@ -19174,13 +19177,10 @@ else
      eval libdir="$libdir"
      # default install directory for bundled packages
      PACKAGE_DIR="$libdir"
@@ -89,7 +89,7 @@ $NetBSD: patch-unix_configure,v 1.6 2014/01/11 14:41:05 adam Exp $
  fi
  VERSION='${VERSION}'
  eval "CFG_TCL_SHARED_LIB_SUFFIX=${TCL_SHARED_LIB_SUFFIX}"
-@@ -19260,12 +19260,11 @@ if test "$FRAMEWORK_BUILD" = "1" ; then
+@@ -19199,12 +19199,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"
@@ -104,7 +104,7 @@ $NetBSD: patch-unix_configure,v 1.6 2014/01/11 14:41:05 adam Exp $
  #--------------------------------------------------------------------
  #       The statements below define various symbols relating to Tcl
  #       stub support.
-@@ -19278,12 +19277,7 @@ eval "TCL_STUB_LIB_FILE=libtclstub${TCL_
+@@ -19217,12 +19216,7 @@ eval "TCL_STUB_LIB_FILE=libtclstub${TCL_
  eval "TCL_STUB_LIB_FILE=\"${TCL_STUB_LIB_FILE}\""
  eval "TCL_STUB_LIB_DIR=${libdir}"
  
@@ -118,7 +118,7 @@ $NetBSD: patch-unix_configure,v 1.6 2014/01/11 14:41:05 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}"
-@@ -19437,34 +19431,15 @@ fi
+@@ -19376,34 +19370,15 @@ fi
  # Transform confdefs.h into DEFS.
  # Protect against shell expansion while executing Makefile rules.
  # Protect against Makefile macro expansion.
@@ -162,7 +162,7 @@ $NetBSD: patch-unix_configure,v 1.6 2014/01/11 14:41:05 adam Exp $
  
  
  
-@@ -20092,6 +20067,7 @@ s,@EXTRA_BUILD_HTML@,$EXTRA_BUILD_HTML,;
+@@ -20031,6 +20006,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_tcl.m4 b/lang/tcl/patches/patch-unix_tcl.m4
deleted file mode 100644
index 2bc9d330eff..00000000000
--- a/lang/tcl/patches/patch-unix_tcl.m4
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-unix_tcl.m4,v 1.1 2014/02/05 12:50:51 obache Exp $
-
---- unix/tcl.m4.orig	2013-09-19 20:17:13.000000000 +0000
-+++ unix/tcl.m4
-@@ -1538,7 +1538,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
- 	    	LDFLAGS="$LDFLAGS -pthread"
- 	    ])
- 	    ;;
--	FreeBSD-*)
-+	FreeBSD-*|DragonFly-*)
- 	    # This configuration from FreeBSD Ports.
- 	    SHLIB_CFLAGS="-fPIC"
- 	    SHLIB_LD="${CC} -shared"
diff --git a/lang/tcl/patches/patch-unix_tclConfig.sh.in b/lang/tcl/patches/patch-unix_tclConfig.sh.in
index 07d35099379..e9e8effc7d2 100644
--- a/lang/tcl/patches/patch-unix_tclConfig.sh.in
+++ b/lang/tcl/patches/patch-unix_tclConfig.sh.in
@@ -1,6 +1,6 @@
-$NetBSD: patch-unix_tclConfig.sh.in,v 1.1 2012/08/21 21:31:47 marino Exp $
+$NetBSD: patch-unix_tclConfig.sh.in,v 1.2 2014/10/31 21:11:18 adam Exp $
 
---- unix/tclConfig.sh.in.orig	2012-07-25 16:45:05.000000000 +0000
+--- unix/tclConfig.sh.in.orig	2014-08-26 15:23:08.000000000 +0000
 +++ unix/tclConfig.sh.in
 @@ -9,6 +9,8 @@
  #
@@ -13,7 +13,7 @@ $NetBSD: patch-unix_tclConfig.sh.in,v 1.1 2012/08/21 21:31:47 marino Exp $
  TCL_MAJOR_VERSION='@TCL_MAJOR_VERSION@'
 @@ -167,3 +169,9 @@ TCL_STUB_LIB_PATH='@TCL_STUB_LIB_PATH@'
  
- # Flag, 1: we built Tcl with threads enables, 0 we didn't
+ # Flag, 1: we built Tcl with threads enabled, 0 we didn't
  TCL_THREADS=@TCL_THREADS@
 +
 +else
diff --git a/lang/tcl/patches/patch-unix_tclUnixInit.c b/lang/tcl/patches/patch-unix_tclUnixInit.c
index ef55f6f572c..37f5bc9b2b4 100644
--- a/lang/tcl/patches/patch-unix_tclUnixInit.c
+++ b/lang/tcl/patches/patch-unix_tclUnixInit.c
@@ -1,8 +1,8 @@
-$NetBSD: patch-unix_tclUnixInit.c,v 1.3 2014/01/11 14:41:05 adam Exp $
+$NetBSD: patch-unix_tclUnixInit.c,v 1.4 2014/10/31 21:11:18 adam Exp $
 
 Carried over from TCL 8.4
 
---- unix/tclUnixInit.c.orig	2013-09-19 19:04:17.000000000 +0000
+--- unix/tclUnixInit.c.orig	2014-07-28 14:43:56.000000000 +0000
 +++ unix/tclUnixInit.c
 @@ -22,7 +22,7 @@
  #    endif
@@ -25,8 +25,8 @@ Carried over from TCL 8.4
 +
  
  #ifdef __CYGWIN__
- DLLIMPORT extern __stdcall unsigned char GetVersionExA(void *);
-@@ -387,7 +393,7 @@ TclpInitPlatform(void)
+ DLLIMPORT extern __stdcall unsigned char GetVersionExW(void *);
+@@ -390,7 +396,7 @@ TclpInitPlatform(void)
      (void) signal(SIGPIPE, SIG_IGN);
  #endif /* SIGPIPE */
  
@@ -35,7 +35,7 @@ Carried over from TCL 8.4
      /*
       * Adjust the rounding mode to be more conventional. Note that FreeBSD
       * only provides the __fpsetreg() used by the following two for the GNU
-@@ -754,6 +760,11 @@ TclpSetVariables(
+@@ -758,6 +764,11 @@ TclpSetVariables(
  #endif
      int unameOK;
      Tcl_DString ds;
@@ -47,7 +47,7 @@ Carried over from TCL 8.4
  
  #ifdef HAVE_COREFOUNDATION
      char tclLibPath[MAXPATHLEN + 1];
-@@ -922,8 +933,15 @@ TclpSetVariables(
+@@ -938,8 +949,15 @@ TclpSetVariables(
  
  #endif /* DJGPP */
  	}
diff --git a/x11/tk/Makefile b/x11/tk/Makefile
index 126c9a86cb7..b48583d887d 100644
--- a/x11/tk/Makefile
+++ b/x11/tk/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.81 2014/10/09 14:07:15 wiz Exp $
+# $NetBSD: Makefile,v 1.82 2014/10/31 21:11:18 adam Exp $
 
 DISTNAME=	tk${TK_VERSION}-src
 PKGNAME=	tk-${TK_VERSION}
-PKGREVISION=	2
 CATEGORIES=	x11 lang
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=tcl/}
 
@@ -46,7 +45,5 @@ PLIST_SUBST+=		SONUM=${TK_SONUM}
 PLIST_SUBST+=		BASEVER=${TK_BASEVER}
 
 .include "../../lang/tcl/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/libXext/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/tk/Makefile.version b/x11/tk/Makefile.version
index 4be6e42766d..ef512faaccd 100644
--- a/x11/tk/Makefile.version
+++ b/x11/tk/Makefile.version
@@ -1,5 +1,10 @@
-# $NetBSD: Makefile.version,v 1.13 2014/01/11 14:41:05 adam Exp $
+# $NetBSD: Makefile.version,v 1.14 2014/10/31 21:11:18 adam Exp $
+# used by cad/xcircuit/Makefile
+# used by devel/tcl-tclcl/Makefile
+# used by lang/tcl/Makefile
+# used by lang/tcl-otcl/Makefile
+# used by x11/tk/Makefile
 
 TK_SONUM=	86
 TK_BASEVER=	8.6
-TK_VERSION=	8.6.1
+TK_VERSION=	8.6.2
diff --git a/x11/tk/PLIST b/x11/tk/PLIST
index f5070d80e36..04bf0f88679 100644
--- a/x11/tk/PLIST
+++ b/x11/tk/PLIST
@@ -1,6 +1,15 @@
-@comment $NetBSD: PLIST,v 1.13 2014/01/11 14:41:05 adam Exp $
+@comment $NetBSD: PLIST,v 1.14 2014/10/31 21:11:18 adam Exp $
 bin/wish
 bin/wish${BASEVER}
+${PLIST.aqua}include/X11/X.h
+${PLIST.aqua}include/X11/Xatom.h
+${PLIST.aqua}include/X11/Xfuncproto.h
+${PLIST.aqua}include/X11/Xlib.h
+${PLIST.aqua}include/X11/Xutil.h
+${PLIST.aqua}include/X11/cursorfont.h
+${PLIST.aqua}include/X11/keysym.h
+${PLIST.aqua}include/X11/keysymdef.h
+${PLIST.aqua}include/X11/xbytes.h
 include/tk.h
 include/tk/generic/default.h
 include/tk/generic/ks_names.h
@@ -37,6 +46,8 @@ include/tkIntDecls.h
 include/tkIntPlatDecls.h
 include/tkIntXlibDecls.h
 include/tkPlatDecls.h
+${PLIST.aqua}lib/Tk.icns
+${PLIST.aqua}lib/Tk.tiff
 lib/libtk${SONUM}.a
 lib/libtk${SONUM}.so
 lib/libtk${SONUM}.so.1.0
diff --git a/x11/tk/distinfo b/x11/tk/distinfo
index 8c85078ed13..5e4743096b0 100644
--- a/x11/tk/distinfo
+++ b/x11/tk/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.42 2014/01/11 14:41:05 adam Exp $
+$NetBSD: distinfo,v 1.43 2014/10/31 21:11:18 adam Exp $
 
-SHA1 (tk8.6.1-src.tar.gz) = ecfcc20833c04d6890b14a7920a04d16f2123a51
-RMD160 (tk8.6.1-src.tar.gz) = 9176fd2c5e7d36c84141333939e85614d3ba2e11
-Size (tk8.6.1-src.tar.gz) = 4244010 bytes
-SHA1 (patch-macosx_tkMacOSXDraw.c) = 3b45060592b5805b57dcd55234dcd9eaca22c3e0
-SHA1 (patch-unix_Makefile.in) = d4309930f0c62f4712098586d1b763ffea8abbc5
-SHA1 (patch-unix_configure) = 1cc4f07dba9ab1052aa0604fb5e45892de86888e
+SHA1 (tk8.6.2-src.tar.gz) = 138920fb55933a715f0b0ace576120734f771b80
+RMD160 (tk8.6.2-src.tar.gz) = c9d4f9eee66249e3a140b7af586f0d14a1e4d2dd
+Size (tk8.6.2-src.tar.gz) = 4246617 bytes
+SHA1 (patch-macosx_tkMacOSXInit.c) = 255322526a96a9e6cc25e91db9b1754ee6fedbb4
+SHA1 (patch-unix_Makefile.in) = 553800ef42c328618980962c6b78d478ab4d2e2b
+SHA1 (patch-unix_configure) = 97139ed28a2cb8528da5c53cfcbc8f8fb43670f6
diff --git a/x11/tk/options.mk b/x11/tk/options.mk
index f9d011319b0..8a9b97c213f 100644
--- a/x11/tk/options.mk
+++ b/x11/tk/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2013/05/31 20:15:32 adam Exp $
+# $NetBSD: options.mk,v 1.4 2014/10/31 21:11:18 adam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.tk
 PKG_SUPPORTED_OPTIONS=	threads debug xft2
@@ -6,12 +6,26 @@ PKG_SUGGESTED_OPTIONS=	threads
 
 .include "../../mk/bsd.prefs.mk"
 
+PLIST_VARS+=	aqua
+
 .if ${OPSYS} != "Darwin"
 PKG_SUGGESTED_OPTIONS+=	xft2
+.else
+PKG_SUPPORTED_OPTIONS+=	aqua
 .endif
 
 .include "../../mk/bsd.options.mk"
 
+# IMPORTANT: This option should be enabled on a system without X11.
+# Otherwise some X11 headers are installed and will break X11 compatibility.
+.if !empty(PKG_OPTIONS:Maqua)
+CONFIGURE_ARGS+=	--enable-aqua
+PLIST.aqua=		yes
+.else
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
+.endif
+
 .if !empty(PKG_OPTIONS:Mdebug)
 CONFIGURE_ARGS+=	--enable-symbols
 .endif
diff --git a/x11/tk/patches/patch-macosx_tkMacOSXDraw.c b/x11/tk/patches/patch-macosx_tkMacOSXDraw.c
deleted file mode 100644
index e36d6b41b79..00000000000
--- a/x11/tk/patches/patch-macosx_tkMacOSXDraw.c
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-macosx_tkMacOSXDraw.c,v 1.3 2014/01/11 14:41:06 adam Exp $
-
-Fix OS X screen refresh problem.
-
---- macosx/tkMacOSXDraw.c.orig	2014-01-11 12:56:24.000000000 +0000
-+++ macosx/tkMacOSXDraw.c
-@@ -1690,6 +1690,7 @@ TkMacOSXRestoreDrawingContext(
- {
-     if (dcPtr->context) {
- 	CGContextSynchronize(dcPtr->context);
-+	[[dcPtr->view window] setViewsNeedDisplay:YES];
- 	[[dcPtr->view window] enableFlushWindow];
- 	if (dcPtr->focusLocked) {
- 	    [dcPtr->view unlockFocus];
diff --git a/x11/tk/patches/patch-macosx_tkMacOSXInit.c b/x11/tk/patches/patch-macosx_tkMacOSXInit.c
new file mode 100644
index 00000000000..ab0822b81ee
--- /dev/null
+++ b/x11/tk/patches/patch-macosx_tkMacOSXInit.c
@@ -0,0 +1,20 @@
+$NetBSD: patch-macosx_tkMacOSXInit.c,v 1.1 2014/10/31 21:11:18 adam Exp $
+
+Fix for Mac crash on Yosemite because of changes in version checking,
+see Tk Source Code Check-in [e49c25c711].
+
+--- macosx/tkMacOSXInit.c.orig	2014-10-31 20:34:20.000000000 +0000
++++ macosx/tkMacOSXInit.c
+@@ -236,7 +236,11 @@ TkpInit(
+ 	if (!uname(&name)) {
+ 	    tkMacOSXMacOSXVersion = (strtod(name.release, NULL) + 96) * 10;
+ 	}
+-	if (tkMacOSXMacOSXVersion &&
++	/*Check for new versioning scheme on Yosemite (10.10) and later.*/
++	if (MAC_OS_X_VERSION_MIN_REQUIRED > 100000) {
++		tkMacOSXMacOSXVersion = MAC_OS_X_VERSION_MIN_REQUIRED/100;
++	}
++	if (tkMacOSXMacOSXVersion && MAC_OS_X_VERSION_MIN_REQUIRED < 100000 &&
+ 		tkMacOSXMacOSXVersion/10 < MAC_OS_X_VERSION_MIN_REQUIRED/10) {
+ 	    Tcl_Panic("Mac OS X 10.%d or later required !",
+ 		    (MAC_OS_X_VERSION_MIN_REQUIRED/10)-100);
diff --git a/x11/tk/patches/patch-unix_Makefile.in b/x11/tk/patches/patch-unix_Makefile.in
index 65ff27afcb5..26ad28015ea 100644
--- a/x11/tk/patches/patch-unix_Makefile.in
+++ b/x11/tk/patches/patch-unix_Makefile.in
@@ -1,6 +1,6 @@
-$NetBSD: patch-unix_Makefile.in,v 1.5 2014/01/11 14:41:06 adam Exp $
+$NetBSD: patch-unix_Makefile.in,v 1.6 2014/10/31 21:11:18 adam Exp $
 
---- unix/Makefile.in.orig	2013-09-17 12:25:13.000000000 +0000
+--- unix/Makefile.in.orig	2014-08-27 16:23:13.000000000 +0000
 +++ unix/Makefile.in
 @@ -14,6 +14,7 @@ MAJOR_VERSION		= @TK_MAJOR_VERSION@
  MINOR_VERSION		= @TK_MINOR_VERSION@
@@ -54,7 +54,7 @@ $NetBSD: patch-unix_Makefile.in,v 1.5 2014/01/11 14:41:06 adam Exp $
  # Additional search flags needed to find the various shared libraries
  # at run-time.  The first symbol is for use when creating a binary
  # with cc, and the second is for use when running ld directly.
-@@ -562,6 +568,9 @@ PRIVATE_HDRS = $(GENERIC_DIR)/tkInt.h $(
+@@ -562,6 +567,9 @@ PRIVATE_HDRS = $(GENERIC_DIR)/tkInt.h $(
  
  DEMOPROGS = browse hello ixset rmt rolodex square tcolor timer widget
  
@@ -64,7 +64,7 @@ $NetBSD: patch-unix_Makefile.in,v 1.5 2014/01/11 14:41:06 adam Exp $
  SHELL_ENV = \
  	@LD_LIBRARY_PATH_VAR@="`pwd`:${TCL_BIN_DIR}:$${@LD_LIBRARY_PATH_VAR@}"; \
  	export @LD_LIBRARY_PATH_VAR@; \
-@@ -585,6 +594,11 @@ ${LIB_FILE}: ${OBJS} ${STUB_LIB_FILE} @L
+@@ -585,6 +593,11 @@ ${LIB_FILE}: ${STUB_LIB_FILE} @LIB_RSRC_
  	rm -f $@
  	@MAKE_LIB@
  
@@ -74,18 +74,18 @@ $NetBSD: patch-unix_Makefile.in,v 1.5 2014/01/11 14:41:06 adam Exp $
 +	$(RANLIB) $@
 +
  ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
- 	rm -f $@
- 	@MAKE_STUB_LIB@
-@@ -713,7 +727,7 @@ install-strip:
+ 	@if test "x${LIB_FILE}" = "xlibtk${MAJOR_VERSION}.${MINOR_VERSION}.dll"; then \
+ 	    (cd ${TOP_DIR}/win; ${MAKE} tk${MAJOR_VERSION}${MINOR_VERSION}.dll); \
+@@ -713,7 +726,7 @@ install-strip:
  # some ranlibs write to current directory, and this might not always be
  # possible (e.g. if installing as root).
  
--install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) ${WISH_EXE}
-+install-binaries: $(TK_LIB_FILE) $(TK_LIB_A_FILE) $(TK_STUB_LIB_FILE) ${WISH_EXE} ${TK_LIB_A_FILE}
+-install-binaries: $(TK_STUB_LIB_FILE) $(TK_LIB_FILE) ${WISH_EXE}
++install-binaries: $(TK_STUB_LIB_FILE) $(TK_LIB_FILE) $(TK_LIB_A_FILE) ${WISH_EXE} ${TK_LIB_A_FILE}
  	@for i in "$(LIB_INSTALL_DIR)" "$(BIN_INSTALL_DIR)" \
  	    "$(PKG_INSTALL_DIR)" "$(CONFIG_INSTALL_DIR)" ; \
  	    do \
-@@ -743,7 +757,13 @@ install-binaries: $(TK_LIB_FILE) $(TK_ST
+@@ -743,7 +756,13 @@ install-binaries: $(TK_STUB_LIB_FILE) $(
  	    fi
  	@echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/"
  	@@INSTALL_LIB@
@@ -100,7 +100,7 @@ $NetBSD: patch-unix_Makefile.in,v 1.5 2014/01/11 14:41:06 adam Exp $
  	@if test -f "tk${MAJOR_VERSION}${MINOR_VERSION}.dll"; then \
  	    $(INSTALL_LIBRARY) "tk${MAJOR_VERSION}${MINOR_VERSION}.dll" "$(DLL_INSTALL_DIR)";\
  	    chmod 555 "$(DLL_INSTALL_DIR)/tk${MAJOR_VERSION}${MINOR_VERSION}.dll";\
-@@ -752,6 +772,7 @@ install-binaries: $(TK_LIB_FILE) $(TK_ST
+@@ -752,6 +771,7 @@ install-binaries: $(TK_STUB_LIB_FILE) $(
  	fi
  	@echo "Installing ${WISH_EXE} as $(BIN_INSTALL_DIR)/wish$(VERSION)${EXE_SUFFIX}"
  	@$(INSTALL_PROGRAM) ${WISH_EXE} "$(BIN_INSTALL_DIR)/wish$(VERSION)${EXE_SUFFIX}"
@@ -108,7 +108,7 @@ $NetBSD: patch-unix_Makefile.in,v 1.5 2014/01/11 14:41:06 adam Exp $
  	@echo "Installing tkConfig.sh to $(CONFIG_INSTALL_DIR)/"
  	@$(INSTALL_DATA) tkConfig.sh "$(CONFIG_INSTALL_DIR)/tkConfig.sh"
  	@if test "$(STUB_LIB_FILE)" != "" ; then \
-@@ -859,7 +880,7 @@ install-doc:
+@@ -859,7 +879,7 @@ install-doc:
  install-headers:
  	@if test "$(@TK_WINDOWINGSYSTEM@_XLIB_HDRS)" != ""; then \
  	    XLIB_INCLUDE_INSTALL_DIR="$(INCLUDE_INSTALL_DIR)"/X11; fi; \
@@ -117,7 +117,7 @@ $NetBSD: patch-unix_Makefile.in,v 1.5 2014/01/11 14:41:06 adam Exp $
  	    do \
  	    if [ -n "$$i" -a ! -d "$$i" ] ; then \
  		echo "Making directory $$i"; \
-@@ -868,9 +889,12 @@ install-headers:
+@@ -868,9 +888,12 @@ install-headers:
  		fi; \
  	    done;
  	@echo "Installing header files to $(INCLUDE_INSTALL_DIR)/";
diff --git a/x11/tk/patches/patch-unix_configure b/x11/tk/patches/patch-unix_configure
index ce7cea0bf75..a3b3a786026 100644
--- a/x11/tk/patches/patch-unix_configure
+++ b/x11/tk/patches/patch-unix_configure
@@ -1,8 +1,8 @@
-$NetBSD: patch-unix_configure,v 1.8 2014/01/11 14:41:06 adam Exp $
+$NetBSD: patch-unix_configure,v 1.9 2014/10/31 21:11:18 adam Exp $
 
---- unix/configure.orig	2013-09-17 12:25:13.000000000 +0000
+--- unix/configure.orig	2014-08-27 16:23:13.000000000 +0000
 +++ unix/configure
-@@ -4617,10 +4617,10 @@ fi
+@@ -4543,10 +4543,10 @@ fi
      # LDFLAGS_ARCH so they eventually end up in LDFLAGS even if [load]
      # is disabled by the user. [Bug 1016796]
      LDFLAGS_ARCH=""
@@ -15,7 +15,7 @@ $NetBSD: patch-unix_configure,v 1.8 2014/01/11 14:41:06 adam Exp $
      CFLAGS_DEBUG=-g
      if test "$GCC" = yes; then
  
-@@ -5576,7 +5576,7 @@ fi
+@@ -5508,7 +5508,7 @@ fi
  	    CC_SEARCH_FLAGS=""
  	    LD_SEARCH_FLAGS=""
  	    ;;
@@ -24,7 +24,7 @@ $NetBSD: patch-unix_configure,v 1.8 2014/01/11 14:41:06 adam Exp $
  	    arch=`arch -s`
  	    case "$arch" in
  	    vax)
-@@ -5598,7 +5598,7 @@ fi
+@@ -5530,7 +5530,7 @@ fi
  fi
  
  		LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
@@ -33,7 +33,7 @@ $NetBSD: patch-unix_configure,v 1.8 2014/01/11 14:41:06 adam Exp $
  		LDFLAGS="-Wl,-export-dynamic"
  		;;
  	    esac
-@@ -5633,7 +5633,7 @@ fi
+@@ -5565,7 +5565,7 @@ fi
  	    SHLIB_SUFFIX=".so"
  	    DL_OBJS="tclLoadDl.o"
  	    DL_LIBS=""
@@ -42,7 +42,7 @@ $NetBSD: patch-unix_configure,v 1.8 2014/01/11 14:41:06 adam Exp $
  	    if test $doRpath = yes; then
  
  		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
-@@ -5650,7 +5650,7 @@ fi
+@@ -5582,7 +5582,7 @@ fi
  fi
  
  	    ;;
@@ -51,16 +51,7 @@ $NetBSD: patch-unix_configure,v 1.8 2014/01/11 14:41:06 adam Exp $
  	    # This configuration from FreeBSD Ports.
  	    SHLIB_CFLAGS="-fPIC"
  	    SHLIB_LD="${CC} -shared"
-@@ -5676,7 +5676,7 @@ fi
- 	    # Version numbers are dot-stripped by system policy.
- 	    TCL_TRIM_DOTS=`echo ${VERSION} | tr -d .`
- 	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
--	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'
-+	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so'
- 	    TCL_LIB_VERSIONS_OK=nodots
- 	    ;;
- 	Darwin-*)
-@@ -6855,7 +6855,7 @@ fi
+@@ -6791,7 +6791,7 @@ fi
  	    BSD/OS*) ;;
  	    CYGWIN_*|MINGW32_*) ;;
  	    IRIX*) ;;
@@ -69,7 +60,7 @@ $NetBSD: patch-unix_configure,v 1.8 2014/01/11 14:41:06 adam Exp $
  	    Darwin-*) ;;
  	    SCO_SV-3.2*) ;;
  	    *) SHLIB_CFLAGS="-fPIC" ;;
-@@ -6876,12 +6876,12 @@ fi
+@@ -6812,12 +6812,12 @@ fi
  
      if test "$SHARED_LIB_SUFFIX" = ""; then
  
@@ -84,7 +75,7 @@ $NetBSD: patch-unix_configure,v 1.8 2014/01/11 14:41:06 adam Exp $
  fi
  
      DLL_INSTALL_DIR="\$(LIB_INSTALL_DIR)"
-@@ -6897,7 +6897,11 @@ fi
+@@ -6833,7 +6833,11 @@ fi
  
  else
  
@@ -97,7 +88,7 @@ $NetBSD: patch-unix_configure,v 1.8 2014/01/11 14:41:06 adam Exp $
  
  fi
  
-@@ -6931,7 +6935,7 @@ fi
+@@ -6867,7 +6871,7 @@ fi
  else
  
          MAKE_STUB_LIB='${STLIB_LD} $@ ${STUB_LIB_OBJS} ; ${RANLIB} $@'
@@ -106,7 +97,7 @@ $NetBSD: patch-unix_configure,v 1.8 2014/01/11 14:41:06 adam Exp $
  
  fi
  
-@@ -10066,7 +10070,7 @@ echo $ECHO_N "checking for X11 libraries
+@@ -10002,7 +10006,7 @@ echo $ECHO_N "checking for X11 libraries
  	    if test -r $i/libX11.a -o -r $i/libX11.so -o -r $i/libX11.sl -o -r $i/libX11.dylib; then
  		echo "$as_me:$LINENO: result: $i" >&5
  echo "${ECHO_T}$i" >&6
@@ -115,7 +106,7 @@ $NetBSD: patch-unix_configure,v 1.8 2014/01/11 14:41:06 adam Exp $
  		x_libraries="$i"
  		break
  	    fi
-@@ -10075,7 +10079,7 @@ echo "${ECHO_T}$i" >&6
+@@ -10011,7 +10015,7 @@ echo "${ECHO_T}$i" >&6
  	if test "$x_libraries" = ""; then
  	    XLIBSW=-lX11
  	else
@@ -124,7 +115,7 @@ $NetBSD: patch-unix_configure,v 1.8 2014/01/11 14:41:06 adam Exp $
  	fi
      fi
      if test "$XLIBSW" = nope ; then
-@@ -10171,11 +10175,6 @@ fi
+@@ -10107,11 +10111,6 @@ fi
  #	   be replaced by spaces.
  #--------------------------------------------------------------------
  
@@ -136,7 +127,7 @@ $NetBSD: patch-unix_configure,v 1.8 2014/01/11 14:41:06 adam Exp $
  if test "${TCL_LD_SEARCH_FLAGS}" = '-L${LIB_RUNTIME_DIR}'; then
      LIB_RUNTIME_DIR=`echo ${LIB_RUNTIME_DIR} |sed -e 's/:/ -L/g'`
  fi
-@@ -11333,14 +11332,10 @@ else
+@@ -11347,14 +11346,10 @@ else
  	TK_LIB_FLAG="-ltk`echo ${TK_VERSION} | tr -d .`"
  	TK_BUILD_LIB_SPEC="-L\$(TOP_DIR)/win ${TK_LIB_FLAG}"
      else
@@ -152,7 +143,7 @@ $NetBSD: patch-unix_configure,v 1.8 2014/01/11 14:41:06 adam Exp $
  fi
  
  #--------------------------------------------------------------------
-@@ -11352,11 +11347,7 @@ fi
+@@ -11366,11 +11361,7 @@ fi
  eval "TK_STUB_LIB_FILE=libtkstub${TK_UNSHARED_LIB_SUFFIX}"
  eval "TK_STUB_LIB_DIR=${libdir}"
  
@@ -165,7 +156,7 @@ $NetBSD: patch-unix_configure,v 1.8 2014/01/11 14:41:06 adam Exp $
  
  TK_BUILD_STUB_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TK_STUB_LIB_FLAG}"
  TK_STUB_LIB_SPEC="-L${TK_STUB_LIB_DIR} ${TK_STUB_LIB_FLAG}"
-@@ -12177,6 +12168,7 @@ s,@APP_RSRC_FILE@,$APP_RSRC_FILE,;t t
+@@ -12191,6 +12182,7 @@ s,@APP_RSRC_FILE@,$APP_RSRC_FILE,;t t
  s,@REZ@,$REZ,;t t
  s,@REZ_FLAGS@,$REZ_FLAGS,;t t
  s,@LTLIBOBJS@,$LTLIBOBJS,;t t