diff --git a/lang/tcl/Makefile b/lang/tcl/Makefile
index eb635b68a..4caef89f5 100644
--- a/lang/tcl/Makefile
+++ b/lang/tcl/Makefile
@@ -46,4 +46,5 @@ PLIST_SUBST+=		SONUM=${TCL_SONUM}
 PLIST_SUBST+=		BASEVER=${TCL_BASEVER}
 
 .include "../../devel/zlib/buildlink3.mk"
+.include "../../devel/pth/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/tcl/distinfo b/lang/tcl/distinfo
index fea3493d6..3a27ce44d 100644
--- a/lang/tcl/distinfo
+++ b/lang/tcl/distinfo
@@ -6,28 +6,29 @@ Size (tcl8.6.1-src.tar.gz) = 8755700 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_configure) = c53f4ddb8775f124999730e3b505eced87a06a95
 SHA1 (patch-pkgs_itcl4.0.0_tclconfig_tcl.m4) = e2dcd0e07be03cf6e39b68cb209263b297acd5d1
-SHA1 (patch-pkgs_sqlite3.8.0_configure) = 14b61ded1cd2bb41054b45da3044638bc44004f5
+SHA1 (patch-pkgs_sqlite3.8.0_configure) = 9a29d739ee41d5f641f9cafb2853c1ccf2cd5a78
 SHA1 (patch-pkgs_sqlite3.8.0_tclconfig_tcl.m4) = 6891b39dc05a037ba667c92fd2341b418030c0af
-SHA1 (patch-pkgs_tdbc1.0.0_configure) = 8964e3617b36435f3bf54bebddae1d34034045c8
+SHA1 (patch-pkgs_tdbc1.0.0_configure) = edae6c9097f144e9bde59a21780a76b3493227c0
 SHA1 (patch-pkgs_tdbc1.0.0_tclconfig_tcl.m4) = db4802f3db9b640a559d7e1c917969c0e2ecf069
-SHA1 (patch-pkgs_tdbcmysql1.0.0_configure) = 17bf2c0578b8b3316373dd8b1a0c9687033304f3
+SHA1 (patch-pkgs_tdbcmysql1.0.0_configure) = 223175da60e7d62b5206cdbafc4422e3d72eae0d
 SHA1 (patch-pkgs_tdbcmysql1.0.0_tclconfig_tcl.m4) = fbbf5b6c27e50251b56759ae9f0b0317f6e41a60
-SHA1 (patch-pkgs_tdbcodbc1.0.0_configure) = 0478fb9c6747a23df66c3c38f9f774606002187c
+SHA1 (patch-pkgs_tdbcodbc1.0.0_configure) = 0f17a929bd20f8d644b53c5ccaf0796ab0eefb93
 SHA1 (patch-pkgs_tdbcodbc1.0.0_tclconfig_tcl.m4) = 2d2418c8d7b77e84b77b4c8568f8bc3920d285fa
-SHA1 (patch-pkgs_tdbcpostgres1.0.0_configure) = 7c5809cc8111cc70ee3eb75b3f5961581f1c7929
+SHA1 (patch-pkgs_tdbcpostgres1.0.0_configure) = 64245d2eb3ce87e960749cfecd2285de0f44ba5f
 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_configure) = 341a256676382cca2d7b5fae0d81e4dfb5139069
 SHA1 (patch-pkgs_thread2.7.0_tclconfig_tcl.m4) = 63d76baa8f130166d502f9ed3955111ae2a5a622
 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_Makefile.in) = c14a126e7f49046fda69c0c4a5bfac3c3277a64b
+SHA1 (patch-unix_configure) = bbf6b65e6bb13414a8bdecf7d0d9f0e34985870e
+SHA1 (patch-unix_tcl.m4) = b410c47468a47f798e0837356b4c29bd97826f34
 SHA1 (patch-unix_tclConfig.sh.in) = 5a32d8e97240d14f3a03e205637fe3bf8307d868
 SHA1 (patch-unix_tclUnixCompat.c) = 7ffa40a1a56345f5b86cd896e8e3b0d5748d8c5e
 SHA1 (patch-unix_tclUnixFCmd.c) = e715d9419a36a8414355252bb3da0ef48b07fe4f
 SHA1 (patch-unix_tclUnixInit.c) = 0e372d1098522d3ea9be9c5d2bb378af53fa86f6
 SHA1 (patch-unix_tclUnixPort.h) = 6efe848c16c550f6adee4bec011891755bb23620
+SHA1 (patch-unix_tclUnixSock.c) = b650841f4c47caa6446b453ae9a639994e6b9736
diff --git a/lang/tcl/patches/patch-pkgs_itcl4.0.0_configure b/lang/tcl/patches/patch-pkgs_itcl4.0.0_configure
index fbc9ed299..d83928556 100644
--- a/lang/tcl/patches/patch-pkgs_itcl4.0.0_configure
+++ b/lang/tcl/patches/patch-pkgs_itcl4.0.0_configure
@@ -1,7 +1,5 @@
-$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
+--- pkgs/itcl4.0.0/configure.orig	Wed Nov  7 21:54:07 2012
++++ pkgs/itcl4.0.0/configure	Fri Apr 18 10:30:36 2014
 @@ -8745,7 +8745,6 @@ fi
  fi
  
@@ -10,7 +8,7 @@ $NetBSD: patch-pkgs_itcl4.0.0_configure,v 1.2 2014/02/05 12:50:51 obache Exp $
  		;;
  	    esac
  	    case "$arch" in
-@@ -8802,9 +8801,6 @@ fi
+@@ -8802,11 +8801,8 @@ fi
  
  fi
  
@@ -18,8 +16,11 @@ $NetBSD: patch-pkgs_itcl4.0.0_configure,v 1.2 2014/02/05 12:50:51 obache Exp $
 -	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
 -	    TCL_LIB_VERSIONS_OK=nodots
  	    ;;
- 	NetBSD-*|FreeBSD-[3-4].*)
+-	NetBSD-*|FreeBSD-[3-4].*)
++	Minix-*|NetBSD-*|FreeBSD-[3-4].*)
  	    # FreeBSD 3.* and greater have ELF.
+ 	    # NetBSD 2.* has ELF and can use 'cc -shared' to build shared libs
+ 	    SHLIB_CFLAGS="-fPIC"
 @@ -8837,17 +8833,17 @@ fi
  		;;
  	    esac
@@ -61,7 +62,16 @@ $NetBSD: patch-pkgs_itcl4.0.0_configure,v 1.2 2014/02/05 12:50:51 obache Exp $
  	    CYGWIN_*) ;;
  	    IRIX*) ;;
 -	    NetBSD-*|FreeBSD-*|OpenBSD-*) ;;
-+	    NetBSD-*|FreeBSD-*|OpenBSD-*|DragonFly-*) ;;
++	    Minix-*|NetBSD-*|FreeBSD-*|OpenBSD-*|DragonFly-*) ;;
  	    Darwin-*) ;;
  	    SCO_SV-3.2*) ;;
  	    windows) ;;
+@@ -11639,6 +11635,8 @@ do
+ _ACEOF
+ cat >>$CONFIG_STATUS <<\_ACEOF
+   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
++	: Avoid regenerating within pkgsrc
++	exit 0
+     ac_cs_recheck=: ;;
+   --version | --vers* | -V )
+     echo "$ac_cs_version"; exit 0 ;;
diff --git a/lang/tcl/patches/patch-pkgs_sqlite3.8.0_configure b/lang/tcl/patches/patch-pkgs_sqlite3.8.0_configure
index b26deff3c..b267e1eaa 100644
--- a/lang/tcl/patches/patch-pkgs_sqlite3.8.0_configure
+++ b/lang/tcl/patches/patch-pkgs_sqlite3.8.0_configure
@@ -1,7 +1,5 @@
-$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
+--- pkgs/sqlite3.8.0/configure.orig	Tue Aug 27 18:50:58 2013
++++ pkgs/sqlite3.8.0/configure	Fri Apr 18 10:59:17 2014
 @@ -6473,7 +6473,6 @@ fi
  		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
  fi
@@ -10,6 +8,15 @@ $NetBSD: patch-pkgs_sqlite3.8.0_configure,v 1.2 2014/02/05 12:50:51 obache Exp $
  	    { $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 :
+@@ -6518,7 +6517,7 @@ fi
+ 	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
+ 	    TCL_LIB_VERSIONS_OK=nodots
+ 	    ;;
+-	NetBSD-*|FreeBSD-[3-4].*)
++	Minix-*|NetBSD-*|FreeBSD-[3-4].*)
+ 	    # FreeBSD 3.* and greater have ELF.
+ 	    # NetBSD 2.* has ELF and can use 'cc -shared' to build shared libs
+ 	    SHLIB_CFLAGS="-fPIC"
 @@ -6547,17 +6546,17 @@ fi
  		;;
  	    esac
@@ -51,7 +58,16 @@ $NetBSD: patch-pkgs_sqlite3.8.0_configure,v 1.2 2014/02/05 12:50:51 obache Exp $
  	    CYGWIN_*) ;;
  	    IRIX*) ;;
 -	    NetBSD-*|FreeBSD-*|OpenBSD-*) ;;
-+	    NetBSD-*|FreeBSD-*|OpenBSD-*|DragonFly-*) ;;
++	    Minix-*|NetBSD-*|FreeBSD-*|OpenBSD-*|DragonFly-*) ;;
  	    Darwin-*) ;;
  	    SCO_SV-3.2*) ;;
  	    windows) ;;
+@@ -8465,6 +8464,8 @@ do
+   case $ac_option in
+   # Handling of the options.
+   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
++	: Avoid regenerating within pkgsrc
++	exit 0
+     ac_cs_recheck=: ;;
+   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
+     $as_echo "$ac_cs_version"; exit ;;
diff --git a/lang/tcl/patches/patch-pkgs_tdbc1.0.0_configure b/lang/tcl/patches/patch-pkgs_tdbc1.0.0_configure
index e1886d42a..d22891234 100644
--- a/lang/tcl/patches/patch-pkgs_tdbc1.0.0_configure
+++ b/lang/tcl/patches/patch-pkgs_tdbc1.0.0_configure
@@ -1,7 +1,5 @@
-$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
+--- pkgs/tdbc1.0.0/configure.orig	Fri Nov 23 21:46:02 2012
++++ pkgs/tdbc1.0.0/configure	Fri Apr 18 11:04:41 2014
 @@ -9405,7 +9405,6 @@ fi
  fi
  
@@ -10,7 +8,7 @@ $NetBSD: patch-pkgs_tdbc1.0.0_configure,v 1.2 2014/02/05 12:50:51 obache Exp $
  		;;
  	    esac
  	    case "$arch" in
-@@ -9462,9 +9461,6 @@ fi
+@@ -9462,11 +9461,8 @@ fi
  
  fi
  
@@ -18,8 +16,11 @@ $NetBSD: patch-pkgs_tdbc1.0.0_configure,v 1.2 2014/02/05 12:50:51 obache Exp $
 -	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
 -	    TCL_LIB_VERSIONS_OK=nodots
  	    ;;
- 	NetBSD-*|FreeBSD-[3-4].*)
+-	NetBSD-*|FreeBSD-[3-4].*)
++	Minix-*|NetBSD-*|FreeBSD-[3-4].*)
  	    # FreeBSD 3.* and greater have ELF.
+ 	    # NetBSD 2.* has ELF and can use 'cc -shared' to build shared libs
+ 	    SHLIB_CFLAGS="-fPIC"
 @@ -9497,17 +9493,17 @@ fi
  		;;
  	    esac
@@ -61,7 +62,16 @@ $NetBSD: patch-pkgs_tdbc1.0.0_configure,v 1.2 2014/02/05 12:50:51 obache Exp $
  	    CYGWIN_*) ;;
  	    IRIX*) ;;
 -	    NetBSD-*|FreeBSD-*|OpenBSD-*) ;;
-+	    NetBSD-*|FreeBSD-*|OpenBSD-*|DragonFly-*) ;;
++	    Minix-*|NetBSD-*|FreeBSD-*|OpenBSD-*|DragonFly-*) ;;
  	    Darwin-*) ;;
  	    SCO_SV-3.2*) ;;
  	    windows) ;;
+@@ -12223,6 +12219,8 @@ do
+ _ACEOF
+ cat >>$CONFIG_STATUS <<\_ACEOF
+   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
++	: Avoid regenerating within pkgsrc
++	exit 0
+     ac_cs_recheck=: ;;
+   --version | --vers* | -V )
+     echo "$ac_cs_version"; exit 0 ;;
diff --git a/lang/tcl/patches/patch-pkgs_tdbcmysql1.0.0_configure b/lang/tcl/patches/patch-pkgs_tdbcmysql1.0.0_configure
index 8f51f238e..b2bbcea47 100644
--- a/lang/tcl/patches/patch-pkgs_tdbcmysql1.0.0_configure
+++ b/lang/tcl/patches/patch-pkgs_tdbcmysql1.0.0_configure
@@ -1,7 +1,5 @@
-$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
+--- pkgs/tdbcmysql1.0.0/configure.orig	Mon Nov 26 14:24:47 2012
++++ pkgs/tdbcmysql1.0.0/configure	Fri Apr 18 11:05:53 2014
 @@ -7769,7 +7769,6 @@ fi
  		    CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
  fi
@@ -10,6 +8,15 @@ $NetBSD: patch-pkgs_tdbcmysql1.0.0_configure,v 1.3 2014/02/06 04:29:12 obache Ex
  		;;
  	    esac
  	    case "$arch" in
+@@ -7824,7 +7823,7 @@ fi
+ 	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
+ 	    TCL_LIB_VERSIONS_OK=nodots
+ 	    ;;
+-	NetBSD-*|FreeBSD-[3-4].*)
++	Minix-*|NetBSD-*|FreeBSD-[3-4].*)
+ 	    # FreeBSD 3.* and greater have ELF.
+ 	    # NetBSD 2.* has ELF and can use 'cc -shared' to build shared libs
+ 	    SHLIB_CFLAGS="-fPIC"
 @@ -7853,17 +7852,17 @@ fi
  		;;
  	    esac
@@ -51,7 +58,16 @@ $NetBSD: patch-pkgs_tdbcmysql1.0.0_configure,v 1.3 2014/02/06 04:29:12 obache Ex
  	    CYGWIN_*) ;;
  	    IRIX*) ;;
 -	    NetBSD-*|FreeBSD-*|OpenBSD-*) ;;
-+	    NetBSD-*|FreeBSD-*|OpenBSD-*|DragonFly-*) ;;
++	    Minix-*|NetBSD-*|FreeBSD-*|OpenBSD-*|DragonFly-*) ;;
  	    Darwin-*) ;;
  	    SCO_SV-3.2*) ;;
  	    windows) ;;
+@@ -9931,6 +9930,8 @@ do
+   case $ac_option in
+   # Handling of the options.
+   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
++	: Avoid regenerating within pkgsrc
++	exit 0
+     ac_cs_recheck=: ;;
+   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
+     $as_echo "$ac_cs_version"; exit ;;
diff --git a/lang/tcl/patches/patch-pkgs_tdbcodbc1.0.0_configure b/lang/tcl/patches/patch-pkgs_tdbcodbc1.0.0_configure
index bb237274a..0059e9bf5 100644
--- a/lang/tcl/patches/patch-pkgs_tdbcodbc1.0.0_configure
+++ b/lang/tcl/patches/patch-pkgs_tdbcodbc1.0.0_configure
@@ -1,7 +1,5 @@
-$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
+--- pkgs/tdbcodbc1.0.0/configure.orig	Wed Dec 12 21:22:22 2012
++++ pkgs/tdbcodbc1.0.0/configure	Fri Apr 18 11:07:04 2014
 @@ -7763,7 +7763,6 @@ fi
  		    CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
  fi
@@ -10,6 +8,15 @@ $NetBSD: patch-pkgs_tdbcodbc1.0.0_configure,v 1.2 2014/02/05 12:50:51 obache Exp
  		;;
  	    esac
  	    case "$arch" in
+@@ -7818,7 +7817,7 @@ fi
+ 	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
+ 	    TCL_LIB_VERSIONS_OK=nodots
+ 	    ;;
+-	NetBSD-*|FreeBSD-[3-4].*)
++	Minix-*|NetBSD-*|FreeBSD-[3-4].*)
+ 	    # FreeBSD 3.* and greater have ELF.
+ 	    # NetBSD 2.* has ELF and can use 'cc -shared' to build shared libs
+ 	    SHLIB_CFLAGS="-fPIC"
 @@ -7847,17 +7846,17 @@ fi
  		;;
  	    esac
@@ -51,7 +58,16 @@ $NetBSD: patch-pkgs_tdbcodbc1.0.0_configure,v 1.2 2014/02/05 12:50:51 obache Exp
  	    CYGWIN_*) ;;
  	    IRIX*) ;;
 -	    NetBSD-*|FreeBSD-*|OpenBSD-*) ;;
-+	    NetBSD-*|FreeBSD-*|OpenBSD-*|DragonFly-*) ;;
++	    Minix-*|NetBSD-*|FreeBSD-*|OpenBSD-*|DragonFly-*) ;;
  	    Darwin-*) ;;
  	    SCO_SV-3.2*) ;;
  	    windows) ;;
+@@ -9923,6 +9922,8 @@ do
+   case $ac_option in
+   # Handling of the options.
+   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
++	: Avoid regenerating within pkgsrc
++	exit 0
+     ac_cs_recheck=: ;;
+   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
+     $as_echo "$ac_cs_version"; exit ;;
diff --git a/lang/tcl/patches/patch-pkgs_tdbcpostgres1.0.0_configure b/lang/tcl/patches/patch-pkgs_tdbcpostgres1.0.0_configure
index d88a16b3b..08ad7cb04 100644
--- a/lang/tcl/patches/patch-pkgs_tdbcpostgres1.0.0_configure
+++ b/lang/tcl/patches/patch-pkgs_tdbcpostgres1.0.0_configure
@@ -1,7 +1,5 @@
-$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
+--- pkgs/tdbcpostgres1.0.0/configure.orig	Wed Dec 12 21:22:46 2012
++++ pkgs/tdbcpostgres1.0.0/configure	Fri Apr 18 11:08:32 2014
 @@ -7763,7 +7763,6 @@ fi
  		    CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
  fi
@@ -10,6 +8,15 @@ $NetBSD: patch-pkgs_tdbcpostgres1.0.0_configure,v 1.2 2014/02/05 12:50:51 obache
  		;;
  	    esac
  	    case "$arch" in
+@@ -7818,7 +7817,7 @@ fi
+ 	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
+ 	    TCL_LIB_VERSIONS_OK=nodots
+ 	    ;;
+-	NetBSD-*|FreeBSD-[3-4].*)
++	Minix-*|NetBSD-*|FreeBSD-[3-4].*)
+ 	    # FreeBSD 3.* and greater have ELF.
+ 	    # NetBSD 2.* has ELF and can use 'cc -shared' to build shared libs
+ 	    SHLIB_CFLAGS="-fPIC"
 @@ -7847,17 +7846,17 @@ fi
  		;;
  	    esac
@@ -51,7 +58,16 @@ $NetBSD: patch-pkgs_tdbcpostgres1.0.0_configure,v 1.2 2014/02/05 12:50:51 obache
  	    CYGWIN_*) ;;
  	    IRIX*) ;;
 -	    NetBSD-*|FreeBSD-*|OpenBSD-*) ;;
-+	    NetBSD-*|FreeBSD-*|OpenBSD-*|DragonFly-*) ;;
++	    Minix-*|NetBSD-*|FreeBSD-*|OpenBSD-*|DragonFly-*) ;;
  	    Darwin-*) ;;
  	    SCO_SV-3.2*) ;;
  	    windows) ;;
+@@ -10021,6 +10020,8 @@ do
+   case $ac_option in
+   # Handling of the options.
+   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
++	: Avoid regenerating within pkgsrc
++	exit 0
+     ac_cs_recheck=: ;;
+   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
+     $as_echo "$ac_cs_version"; exit ;;
diff --git a/lang/tcl/patches/patch-pkgs_thread2.7.0_configure b/lang/tcl/patches/patch-pkgs_thread2.7.0_configure
index 530d03bad..07cdfffd3 100644
--- a/lang/tcl/patches/patch-pkgs_thread2.7.0_configure
+++ b/lang/tcl/patches/patch-pkgs_thread2.7.0_configure
@@ -1,7 +1,5 @@
-$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
+--- pkgs/thread2.7.0/configure.orig	Wed Nov 14 17:20:24 2012
++++ pkgs/thread2.7.0/configure	Fri Apr 18 10:27:41 2014
 @@ -9295,7 +9295,6 @@ fi
  fi
  
@@ -10,6 +8,15 @@ $NetBSD: patch-pkgs_thread2.7.0_configure,v 1.2 2014/02/05 12:50:51 obache Exp $
  		;;
  	    esac
  	    case "$arch" in
+@@ -9356,7 +9355,7 @@ fi
+ 	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
+ 	    TCL_LIB_VERSIONS_OK=nodots
+ 	    ;;
+-	NetBSD-*|FreeBSD-[3-4].*)
++	Minix-*|NetBSD-*|FreeBSD-[3-4].*)
+ 	    # FreeBSD 3.* and greater have ELF.
+ 	    # NetBSD 2.* has ELF and can use 'cc -shared' to build shared libs
+ 	    SHLIB_CFLAGS="-fPIC"
 @@ -9387,17 +9386,17 @@ fi
  		;;
  	    esac
@@ -51,7 +58,16 @@ $NetBSD: patch-pkgs_thread2.7.0_configure,v 1.2 2014/02/05 12:50:51 obache Exp $
  	    CYGWIN_*) ;;
  	    IRIX*) ;;
 -	    NetBSD-*|FreeBSD-*|OpenBSD-*) ;;
-+	    NetBSD-*|FreeBSD-*|OpenBSD-*|DragonFly-*) ;;
++	    Minix-*|NetBSD-*|FreeBSD-*|OpenBSD-*|DragonFly-*) ;;
  	    Darwin-*) ;;
  	    SCO_SV-3.2*) ;;
  	    windows) ;;
+@@ -12010,6 +12009,8 @@ do
+ _ACEOF
+ cat >>$CONFIG_STATUS <<\_ACEOF
+   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
++	: Avoid regenerating within pkgsrc
++	exit 0
+     ac_cs_recheck=: ;;
+   --version | --vers* | -V )
+     echo "$ac_cs_version"; exit 0 ;;
diff --git a/lang/tcl/patches/patch-unix_Makefile.in b/lang/tcl/patches/patch-unix_Makefile.in
index 0969f5ca8..00eb3c9f1 100644
--- a/lang/tcl/patches/patch-unix_Makefile.in
+++ b/lang/tcl/patches/patch-unix_Makefile.in
@@ -1,7 +1,5 @@
-$NetBSD: patch-unix_Makefile.in,v 1.7 2014/01/11 14:41:05 adam Exp $
-
---- unix/Makefile.in.orig	2013-09-19 20:17:13.000000000 +0000
-+++ unix/Makefile.in
+--- unix/Makefile.in.orig	Thu Sep 19 20:17:13 2013
++++ unix/Makefile.in	Fri Apr 18 10:19:33 2014
 @@ -8,6 +8,7 @@ VERSION 		= @TCL_VERSION@
  MAJOR_VERSION		= @TCL_MAJOR_VERSION@
  MINOR_VERSION		= @TCL_MINOR_VERSION@
@@ -10,7 +8,7 @@ $NetBSD: patch-unix_Makefile.in,v 1.7 2014/01/11 14:41:05 adam Exp $
  
  #--------------------------------------------------------------------------
  # Things you can change to personalize the Makefile for your own site (you can
-@@ -54,6 +55,8 @@ SCRIPT_INSTALL_DIR	= $(INSTALL_ROOT)$(TC
+@@ -54,6 +55,8 @@ SCRIPT_INSTALL_DIR	= $(INSTALL_ROOT)$(TCL_LIBRARY)
  
  # Directory in which to install the include file tcl.h:
  INCLUDE_INSTALL_DIR	= $(INSTALL_ROOT)$(includedir)
@@ -19,7 +17,7 @@ $NetBSD: patch-unix_Makefile.in,v 1.7 2014/01/11 14:41:05 adam Exp $
  
  # Path to the private tcl header dir:
  PRIVATE_INCLUDE_DIR	= @PRIVATE_INCLUDE_DIR@
-@@ -103,7 +106,7 @@ CFLAGS_OPTIMIZE		= -DNDEBUG @CFLAGS_OPTI
+@@ -103,7 +106,7 @@ CFLAGS_OPTIMIZE		= -DNDEBUG @CFLAGS_OPTIMIZE@
  #CFLAGS			= $(CFLAGS_DEBUG)
  #CFLAGS			= $(CFLAGS_OPTIMIZE)
  #CFLAGS			= $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE)
@@ -36,7 +34,7 @@ $NetBSD: patch-unix_Makefile.in,v 1.7 2014/01/11 14:41:05 adam Exp $
  #TCL_LIB_FILE		= libtcl.a
  
  # Generic lib name used in rules that apply to tcl and tk
-@@ -613,7 +617,7 @@ SRCS = $(GENERIC_SRCS) $(TOMMATH_SRCS) $
+@@ -613,7 +617,7 @@ SRCS = $(GENERIC_SRCS) $(TOMMATH_SRCS) $(UNIX_SRCS) $(
  
  all: binaries libraries doc packages
  
@@ -124,7 +122,7 @@ $NetBSD: patch-unix_Makefile.in,v 1.7 2014/01/11 14:41:05 adam Exp $
  	    do \
  	    if [ ! -d "$$i" ] ; then \
  		echo "Making directory $$i"; \
-@@ -950,13 +976,17 @@ install-headers:
+@@ -950,14 +976,18 @@ install-headers:
  		fi; \
  	    done;
  	@echo "Installing header files to $(INCLUDE_INSTALL_DIR)/";
@@ -134,17 +132,27 @@ $NetBSD: patch-unix_Makefile.in,v 1.7 2014/01/11 14:41:05 adam Exp $
 -		$(GENERIC_DIR)/tclTomMath.h \
 -		$(GENERIC_DIR)/tclTomMathDecls.h ; \
 +	@for i in $(GENERIC_DIR)/*.h ; \
-+	    do \
+ 	    do \
+-	    $(INSTALL_DATA) $$i "$(INCLUDE_INSTALL_DIR)"; \
 +	    $(INSTALL_DATA) $$i "$(GENERIC_INCLUDE_INSTALL_DIR)"; \
-+	    done;
+ 	    done;
 +	@for i in $(UNIX_DIR)/*.h ; \
 +	    do \
 +	    $(INSTALL_DATA) $$i "$(UNIX_INCLUDE_INSTALL_DIR)"; \
 +	    done;
 +	@for i in tcl.h tclDecls.h tclOO.h tclOODecls.h tclPlatDecls.h; \
- 	    do \
--	    $(INSTALL_DATA) $$i "$(INCLUDE_INSTALL_DIR)"; \
++	    do \
 +	    cd "$(INCLUDE_INSTALL_DIR)" && ln -sf tcl/generic/$$i $$i; \
- 	    done;
++	    done;
  
  # Optional target to install private headers
+ install-private-headers:
+@@ -1726,7 +1756,7 @@ configure-packages:
+ 		  $$i/configure --with-tcl=../.. \
+ 		      --with-tclinclude=$(GENERIC_DIR) \
+ 		      $(PKG_CFG_ARGS) --libdir=$(PACKAGE_DIR) \
+-		      --enable-shared --enable-threads; ) || exit $$?; \
++		      --enable-shared; ) || exit $$?; \
+ 	      fi; \
+ 	    fi; \
+ 	  fi; \
diff --git a/lang/tcl/patches/patch-unix_configure b/lang/tcl/patches/patch-unix_configure
index a6df4b8f5..6a8e0b742 100644
--- a/lang/tcl/patches/patch-unix_configure
+++ b/lang/tcl/patches/patch-unix_configure
@@ -1,6 +1,6 @@
-$NetBSD: patch-unix_configure,v 1.6 2014/01/11 14:41:05 adam Exp $
+$NetBSD$
 
---- unix/configure.orig	2013-09-19 20:17:13.000000000 +0000
+--- unix/configure.orig	Thu Sep 19 20:17:13 2013
 +++ unix/configure
 @@ -7731,7 +7731,7 @@ fi
  	    CC_SEARCH_FLAGS=""
@@ -11,6 +11,15 @@ $NetBSD: patch-unix_configure,v 1.6 2014/01/11 14:41:05 adam Exp $
  	    arch=`arch -s`
  	    case "$arch" in
  	    vax)
+@@ -7781,7 +7781,7 @@ fi
+ 	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
+ 	    TCL_LIB_VERSIONS_OK=nodots
+ 	    ;;
+-	NetBSD-*)
++	Minix-*|NetBSD-*)
+ 	    # NetBSD has ELF and can use 'cc -shared' to build shared libs
+ 	    SHLIB_CFLAGS="-fPIC"
+ 	    SHLIB_LD='${CC} -shared ${SHLIB_CFLAGS}'
 @@ -7805,7 +7805,7 @@ fi
  fi
  
@@ -33,7 +42,7 @@ $NetBSD: patch-unix_configure,v 1.6 2014/01/11 14:41:05 adam Exp $
  	    CYGWIN_*|MINGW32_*) ;;
  	    IRIX*) ;;
 -	    NetBSD-*|FreeBSD-*|OpenBSD-*) ;;
-+	    NetBSD-*|FreeBSD-*|OpenBSD-*|DragonFly-*|MirBSD-*) ;;
++	    Minix-*|NetBSD-*|FreeBSD-*|OpenBSD-*|DragonFly-*|MirBSD-*) ;;
  	    Darwin-*) ;;
  	    SCO_SV-3.2*) ;;
  	    *) SHLIB_CFLAGS="-fPIC" ;;
@@ -104,7 +113,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_
+@@ -19278,12 +19277,7 @@ eval "TCL_STUB_LIB_FILE=libtclstub${TCL_UNSHARED_LIB_S
  eval "TCL_STUB_LIB_FILE=\"${TCL_STUB_LIB_FILE}\""
  eval "TCL_STUB_LIB_DIR=${libdir}"
  
@@ -162,7 +171,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,;
+@@ -20092,6 +20067,7 @@ s,@EXTRA_BUILD_HTML@,$EXTRA_BUILD_HTML,;t t
  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
index 2bc9d330e..976a675be 100644
--- a/lang/tcl/patches/patch-unix_tcl.m4
+++ b/lang/tcl/patches/patch-unix_tcl.m4
@@ -1,7 +1,16 @@
-$NetBSD: patch-unix_tcl.m4,v 1.1 2014/02/05 12:50:51 obache Exp $
+$NetBSD$
 
---- unix/tcl.m4.orig	2013-09-19 20:17:13.000000000 +0000
+--- unix/tcl.m4.orig	Thu Sep 19 20:17:13 2013
 +++ unix/tcl.m4
+@@ -1520,7 +1520,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
+ 	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
+ 	    TCL_LIB_VERSIONS_OK=nodots
+ 	    ;;
+-	NetBSD-*)
++	Minix-*|NetBSD-*)
+ 	    # NetBSD has ELF and can use 'cc -shared' to build shared libs
+ 	    SHLIB_CFLAGS="-fPIC"
+ 	    SHLIB_LD='${CC} -shared ${SHLIB_CFLAGS}'
 @@ -1538,7 +1538,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
  	    	LDFLAGS="$LDFLAGS -pthread"
  	    ])
@@ -11,3 +20,12 @@ $NetBSD: patch-unix_tcl.m4,v 1.1 2014/02/05 12:50:51 obache Exp $
  	    # This configuration from FreeBSD Ports.
  	    SHLIB_CFLAGS="-fPIC"
  	    SHLIB_LD="${CC} -shared"
+@@ -2031,7 +2031,7 @@ dnl # preprocessing tests use only CPPFLAGS.
+ 	    BSD/OS*) ;;
+ 	    CYGWIN_*|MINGW32_*) ;;
+ 	    IRIX*) ;;
+-	    NetBSD-*|FreeBSD-*|OpenBSD-*) ;;
++	    Minix-*|NetBSD-*|FreeBSD-*|OpenBSD-*) ;;
+ 	    Darwin-*) ;;
+ 	    SCO_SV-3.2*) ;;
+ 	    *) SHLIB_CFLAGS="-fPIC" ;;
diff --git a/lang/tcl/patches/patch-unix_tclUnixSock.c b/lang/tcl/patches/patch-unix_tclUnixSock.c
new file mode 100644
index 000000000..edb044830
--- /dev/null
+++ b/lang/tcl/patches/patch-unix_tclUnixSock.c
@@ -0,0 +1,18 @@
+--- unix/tclUnixSock.c.orig	Thu Sep 19 19:04:17 2013
++++ unix/tclUnixSock.c	Thu Apr 17 22:40:39 2014
+@@ -665,6 +665,7 @@ TcpHostPortList(
+         if (addr.sa4.sin_addr.s_addr == INADDR_ANY) {
+             flags |= NI_NUMERICHOST;
+         }
++#ifndef __minix
+ #ifndef NEED_FAKE_RFC2553
+     } else if (addr.sa.sa_family == AF_INET6) {
+         if ((IN6_ARE_ADDR_EQUAL(&addr.sa6.sin6_addr,
+@@ -677,6 +678,7 @@ TcpHostPortList(
+             flags |= NI_NUMERICHOST;
+         }
+ #endif /* NEED_FAKE_RFC2553 */
++#endif
+     }
+     /* Check if reverse DNS has been switched off globally */
+     if (interp != NULL && Tcl_GetVar(interp, SUPPRESS_RDNS_VAR, 0) != NULL) {