Update to 8.6b2

12 files changed, 286 insertions, 309 deletions

diff --git a/lang/tcl86/Makefile b/lang/tcl86/Makefile
index a2718cb1533..2d6fac73b44 100644
--- a/lang/tcl86/Makefile
+++ b/lang/tcl86/Makefile
@@ -6,12 +6,11 @@
 #
 
 PORTNAME=	tcl
-PORTVERSION=	8.6.b.1
-PORTREVISION=	4
+PORTVERSION=	8.6.b.2
 CATEGORIES=	lang
-MASTER_SITES=	SF/tcl/Tcl/8.6b1
+MASTER_SITES=	SF/tcl/Tcl/8.6b2
 PKGNAMESUFFIX?=		${THREADS_SUFFIX}${PKGNAMESUFFIX2}
-DISTNAME=	${PORTNAME}${PORTVERSION:S/.b.1/b1/}-src
+DISTNAME=	${PORTNAME}${PORTVERSION:S/.b.2/b2/}-src
 
 MAINTAINER=	mm@FreeBSD.org
 COMMENT?=	Tool Command Language
@@ -81,44 +80,45 @@ CONFIGURE_ENV+=		PTHREAD_LIBS="${PTHREAD_LIBS}" PTHREAD_CFLAGS="${PTHREAD_CFLAGS
 
 CONFIGURE_ARGS+=	--disable-threads
 
-.if !defined(NO_INSTALL_MANPAGES) && defined(WITH_TCL84_DOC)
+.if !defined(NO_INSTALL_MANPAGES) && defined(WITH_TCL86_MAN)
 
 MAN3=	Access.3 AddErrInfo.3 Alloc.3 AllowExc.3 AppInit.3 AssocData.3 \
 	Async.3 BackgdErr.3 Backslash.3 BoolObj.3 ByteArrObj.3 CallDel.3 \
-	ChnlStack.3 Class.3 CmdCmplt.3 Concat.3 CrtChannel.3 CrtChnlHdlr.3 \
-	CrtCloseHdlr.3 	CrtCommand.3 CrtFileHdlr.3 CrtInterp.3 CrtMathFnc.3 \
-	CrtObjCmd.3 CrtSlave.3 CrtTimerHdlr.3 CrtTrace.3 DString.3 \
-	DetachPids.3 DictObj.3 DoOneEvent.3 DoWhenIdle.3 DoubleObj.3 \
-	DumpActiveMemory.3 Encoding.3 Ensemble.3 Eval.3 Environment.3 Exit.3 \
-	ExprLong.3 ExprLongObj.3 FileSystem.3 FindExec.3 GetCwd.3 \
-	GetHostName.3 GetIndex.3 GetInt.3 GetTime.3 GetOpnFl.3 GetStdChan.3 \
-	GetVersion.3 Hash.3 Init.3 InitStubs.3 IntObj.3 Interp.3 Limit.3 \
-	LinkVar.3 ListObj.3 Method.3 Namespace.3 Notifier.3 NRE.3 Object.3 \
-	ObjectType.3 OpenFileChnl.3 OpenTcp.3 Panic.3 ParseArgs.3 ParseCmd.3 \
-	PkgRequire.3 Preserve.3 PrintDbl.3 RecEvalObj.3 RecordEval.3 \
-	RegConfig.3 RegExp.3 SaveResult.3 SetChanErr.3 SetErrno.3 SetRecLmt.3 \
-	SetResult.3 SetVar.3 Signal.3 Sleep.3 SourceRCFile.3 SplitList.3 \
-	SplitPath.3 StdChannels.3 StaticPkg.3 StrMatch.3 StringObj.3 \
-	SubstObj.3 TCL_MEM_DEBUG.3 Tcl_Main.3 TclZlib.3 Thread.3 ToUpper.3 \
-	TraceCmd.3 TraceVar.3 Translate.3 UniCharIsAlpha.3 UpVar.3 Utf.3 \
-	WrongNumArgs.3
+	Cancel.3 ChnlStack.3 Class.3 CmdCmplt.3 Concat.3 CrtChannel.3 \
+	CrtChnlHdlr.3 CrtCloseHdlr.3 CrtCommand.3 CrtFileHdlr.3 CrtInterp.3 \
+	CrtMathFnc.3 CrtObjCmd.3 CrtSlave.3 CrtTimerHdlr.3 CrtTrace.3 \
+	DString.3 DetachPids.3 DictObj.3 DoOneEvent.3 DoWhenIdle.3 \
+	DoubleObj.3 DumpActiveMemory.3 Encoding.3 Ensemble.3 Eval.3 \
+	Environment.3 Exit.3 ExprLong.3 ExprLongObj.3 FileSystem.3 \
+	FindExec.3 GetCwd.3 GetHostName.3 GetIndex.3 GetInt.3 GetTime.3 \
+	GetOpnFl.3 GetStdChan.3 GetVersion.3 Hash.3 Init.3 InitStubs.3 \
+	IntObj.3 Interp.3 Limit.3 LinkVar.3 ListObj.3 Load.3 Method.3 \
+	Namespace.3 Notifier.3 NRE.3 Object.3 ObjectType.3 OpenFileChnl.3 \
+	OpenTcp.3 Panic.3 ParseArgs.3 ParseCmd.3 PkgRequire.3 Preserve.3 \
+	PrintDbl.3 RecEvalObj.3 RecordEval.3 RegConfig.3 RegExp.3 \
+	SaveResult.3 SetChanErr.3 SetErrno.3 SetRecLmt.3 SetResult.3 \
+	SetVar.3 Signal.3 Sleep.3 SourceRCFile.3 SplitList.3 SplitPath.3 \
+	StdChannels.3 StaticPkg.3 StrMatch.3 StringObj.3 SubstObj.3 \
+	TCL_MEM_DEBUG.3 Tcl_Main.3 TclZlib.3 Thread.3 ToUpper.3 TraceCmd.3 \
+	TraceVar.3 Translate.3 UniCharIsAlpha.3 UpVar.3 Utf.3 WrongNumArgs.3
 
 MANN=	Tcl.n after.n append.n apply.n array.n bgerror.n binary.n break.n \
-	case.n catch.n cd.n chan.n class.n clock.n close.n concat.n continue.n \
-	copy.n dde.n define.n dict.n encoding.n eof.n error.n eval.n exec.n \
-	exit.n expr.n fblocked.n fconfigure.n fcopy.n file.n fileevent.n \
-	filename.n flush.n for.n foreach.n format.n gets.n glob.n global.n \
-	history.n http.n if.n incr.n info.n interp.n join.n lappend.n \
-	lassign.n library.n lindex.n linsert.n list.n llength.n load.n \
-	lrange.n lrepeat.n lreplace.n lreverse.n lsearch.n lset.n lsort.n \
-	mathfunc.n mathop.n memory.n msgcat.n my.n namespace.n next.n object.n \
-	open.n package.n packagens.n pid.n pkgMkIndex.n platform.n \
-	platform_shell.n prefix.n proc.n puts.n pwd.n re_syntax.n read.n \
-	refchan.n regexp.n registry.n regsub.n rename.n return.n safe.n scan.n \
-	seek.n self.n set.n socket.n source.n split.n string.n subst.n \
-	switch.n tcltest.n tclvars.n tell.n throw.n time.n tm.n trace.n \
-	transchan.n try.n unknown.n unload.n unset.n update.n uplevel.n \
-	upvar.n variable.n vwait.n while.n zlib.n
+	case.n catch.n cd.n chan.n class.n clock.n close.n concat.n \
+	continue.n copy.n coroutine.n dde.n define.n dict.n encoding.n eof.n \
+	error.n eval.n exec.n exit.n expr.n fblocked.n fconfigure.n fcopy.n \
+	file.n fileevent.n filename.n flush.n for.n foreach.n format.n \
+	gets.n glob.n global.n history.n http.n if.n incr.n info.n interp.n \
+	join.n lappend.n lassign.n library.n lindex.n linsert.n list.n \
+	llength.n load.n lrange.n lrepeat.n lreplace.n lreverse.n lsearch.n \
+	lset.n lsort.n mathfunc.n mathop.n memory.n msgcat.n my.n \
+	namespace.n next.n object.n open.n package.n packagens.n pid.n \
+	pkgMkIndex.n platform.n platform_shell.n prefix.n proc.n puts.n \
+	pwd.n re_syntax.n read.n refchan.n regexp.n registry.n regsub.n \
+	rename.n return.n safe.n scan.n seek.n self.n set.n socket.n \
+	source.n split.n string.n subst.n switch.n tailcall.n tcltest.n \
+	tclvars.n tell.n throw.n time.n tm.n trace.n transchan.n try.n \
+	unknown.n unload.n unset.n update.n uplevel.n upvar.n variable.n \
+	vwait.n while.n zlib.n
 
 # MLINKS generated via  awk '/ln/ {print "\t" $3,$4,"\\"}' unix/mkLinks
 MLINKS=	Access.3 Tcl_Access.3 \
@@ -724,6 +724,7 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|libtcl$${SHORT_TCL_VER}|libtcl$${SHORT_TCL_VER}${THREADS_SUFFIX}|g' \
 		-e 's|/tclsh$$(VERSION)|/tclsh$$(VERSION)${THREADS_SUFFIX}|g' \
 		-e 's|/tclConfig.sh|/tclConfig${THREADS_SUFFIX}.sh|g' \
+		-e 's|"/tclooConfig.sh|"/tclooConfig${THREADS_SUFFIX}.sh|g' \
 		${WRKSRC}/Makefile.in
 .endif
 
@@ -751,6 +752,7 @@ do-install:
 	@cd ${WRKSRC} && ${MAKE_ENV} ${MAKE} -f Makefile install-binaries
 	@${MKDIR} ${PREFIX}/lib/tcl${TCL_VER}${THREADS_SUFFIX}
 	@${LN} -s ${PREFIX}/lib/tcl${TCL_VER}/tclConfig${THREADS_SUFFIX}.sh ${PREFIX}/lib/tcl${TCL_VER}${THREADS_SUFFIX}/tclConfig.sh
+	@${LN} -s ${PREFIX}/lib/tcl${TCL_VER}/tclooConfig${THREADS_SUFFIX}.sh ${PREFIX}/lib/tcl${TCL_VER}${THREADS_SUFFIX}/tclooConfig.sh
 .endif
 
 post-install:
diff --git a/lang/tcl86/distinfo b/lang/tcl86/distinfo
index dfe6e5a1fa9..934eab97dc7 100644
--- a/lang/tcl86/distinfo
+++ b/lang/tcl86/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tcl8.6b1-src.tar.gz) = 1e944aa7e3b9134bedc9cf7ccf26396d70643fe427ec6870424f395f70046abe
-SIZE (tcl8.6b1-src.tar.gz) = 5295473
+SHA256 (tcl8.6b2-src.tar.gz) = b0f5ca125fbbcde7cfe076d3b1bdd729113cbf7ad50e8fb1a9a20cf551904a1b
+SIZE (tcl8.6b2-src.tar.gz) = 6455956
diff --git a/lang/tcl86/files/patch-generic-tclPort.h b/lang/tcl86/files/patch-generic-tclPort.h
index 5b8d1d292e5..d5825f4e37a 100644
--- a/lang/tcl86/files/patch-generic-tclPort.h
+++ b/lang/tcl86/files/patch-generic-tclPort.h
@@ -1,11 +1,11 @@
---- ../generic/tclPort.h.orig	Tue Jan 30 11:39:50 2007
-+++ ../generic/tclPort.h	Tue Jan 30 11:41:05 2007
-@@ -24,7 +24,7 @@
- #if defined(__WIN32__)
- #   include "../win/tclWinPort.h"
- #else
+--- ../generic/tclPort.h.orig	2011-04-26 17:14:03.000000000 +0200
++++ ../generic/tclPort.h	2011-08-09 14:25:40.620587462 +0200
+@@ -22,7 +22,7 @@
+ #endif
+ #include "tcl.h"
+ #if !defined(_WIN32)
 -#   include "tclUnixPort.h"
 +#   include "../unix/tclUnixPort.h"
  #endif
  
- #if !defined(LLONG_MIN)
+ #if defined(__CYGWIN__)
diff --git a/lang/tcl86/files/patch-generic-tclPosixStr.c b/lang/tcl86/files/patch-generic-tclPosixStr.c
deleted file mode 100644
index f178ef6c38f..00000000000
--- a/lang/tcl86/files/patch-generic-tclPosixStr.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- ../generic/tclPosixStr.c.orig	Wed Jan 17 13:12:17 2007
-+++ ../generic/tclPosixStr.c	Wed Jan 17 13:03:19 2007
-@@ -1039,6 +1039,9 @@
- #ifdef SIGXFSZ
-     case SIGXFSZ: return "SIGXFSZ";
- #endif
-+#ifdef SIGINFO
-+    case SIGINFO: return "SIGINFO";
-+#endif
-     }
-     return "unknown signal";
- }
-@@ -1169,6 +1172,9 @@
- #endif
- #ifdef SIGXFSZ
-     case SIGXFSZ: return "exceeded file size limit";
-+#endif
-+#ifdef SIGINFO
-+    case SIGINFO: return "information/status request";
- #endif
-     }
-     return "unknown signal";
diff --git a/lang/tcl86/files/patch-unix-Makefile.in b/lang/tcl86/files/patch-unix-Makefile.in
index 65870c5d062..7d0835ffa18 100644
--- a/lang/tcl86/files/patch-unix-Makefile.in
+++ b/lang/tcl86/files/patch-unix-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig	2008-12-22 18:45:06.000000000 +0100
-+++ Makefile.in	2009-03-03 08:21:36.097445036 +0100
-@@ -55,6 +55,8 @@
+--- Makefile.in.orig	2011-08-05 20:57:53.000000000 +0200
++++ Makefile.in	2011-08-09 16:54:17.758348126 +0200
+@@ -53,6 +53,8 @@
  
  # Directory in which to install the include file tcl.h:
  INCLUDE_INSTALL_DIR	= $(INSTALL_ROOT)$(includedir)
@@ -9,7 +9,16 @@
  
  # Path to the private tcl header dir:
  PRIVATE_INCLUDE_DIR	= @PRIVATE_INCLUDE_DIR@
-@@ -101,7 +103,7 @@
+@@ -79,7 +81,7 @@
+ HTML_INSTALL_DIR	= $(INSTALL_ROOT)$(HTML_DIR)
+ 
+ # Directory in which to install the configuration file tclConfig.sh
+-CONFIG_INSTALL_DIR	= $(INSTALL_ROOT)$(libdir)
++CONFIG_INSTALL_DIR	= $(SCRIPT_INSTALL_DIR)
+ 
+ # Directory in which to install bundled packages:
+ PACKAGE_DIR             = @PACKAGE_DIR@
+@@ -102,7 +104,7 @@
  #CFLAGS			= $(CFLAGS_DEBUG)
  #CFLAGS			= $(CFLAGS_OPTIMIZE)
  #CFLAGS			= $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE)
@@ -18,20 +27,19 @@
  
  # Flags to pass to the linker
  LDFLAGS_DEBUG		= @LDFLAGS_DEBUG@
-@@ -579,9 +581,10 @@
- SRCS = $(GENERIC_SRCS) $(TOMMATH_SRCS) $(UNIX_SRCS) $(NOTIFY_SRCS) \
- 	$(OO_SRCS) $(STUB_SRCS) @PLAT_SRCS@ @ZLIB_SRCS@
+@@ -600,9 +602,9 @@
+ # Start of rules
+ #--------------------------------------------------------------------------
  
 -all: binaries libraries doc packages
 +all: binaries libraries doc
  
--binaries: ${LIB_FILE} $(STUB_LIB_FILE) $(TCL_BUILD_EXP_FILE) tclsh
-+binaries: ${LIB_FILE} $(STUB_LIB_FILE) $(TCL_BUILD_EXP_FILE) \
-+	libtcl${SHORT_TCL_VER}.a tclsh
+-binaries: ${LIB_FILE} $(STUB_LIB_FILE) ${TCL_EXE}
++binaries: ${LIB_FILE} $(STUB_LIB_FILE) libtcl${SHORT_TCL_VER}.a ${TCL_EXE}
  
  libraries:
  
-@@ -592,6 +595,15 @@
+@@ -613,6 +615,15 @@
  ${LIB_FILE}: ${OBJS} ${STUB_LIB_FILE}
  	rm -f $@
  	@MAKE_LIB@
@@ -47,52 +55,44 @@
  
  ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
  	rm -f $@
-@@ -726,7 +738,7 @@
- dltest.marker: ${STUB_LIB_FILE}
- 	cd dltest ; $(MAKE)
- 
--INSTALL_TARGETS = install-binaries install-libraries install-doc install-packages @EXTRA_INSTALL@
-+INSTALL_TARGETS = install-binaries install-libraries @EXTRA_INSTALL@
- 
- install: $(INSTALL_TARGETS)
- 
-@@ -755,6 +767,13 @@
- 	@echo "Installing $(LIB_FILE) to $(LIB_INSTALL_DIR)/"
+@@ -754,8 +765,8 @@
+ #--------------------------------------------------------------------------
+ 
+ INSTALL_BASE_TARGETS = install-binaries install-libraries install-msgs $(INSTALL_TZDATA)
+-INSTALL_DOC_TARGETS = install-doc
+-INSTALL_PACKAGE_TARGETS = install-packages
++INSTALL_DOC_TARGETS =
++INSTALL_PACKAGE_TARGETS =
+ INSTALL_DEV_TARGETS = install-headers
+ INSTALL_EXTRA_TARGETS = @EXTRA_INSTALL@
+ INSTALL_TARGETS = $(INSTALL_BASE_TARGETS) $(INSTALL_DOC_TARGETS) $(INSTALL_DEV_TARGETS) \
+@@ -785,6 +796,12 @@
+ 	@echo "Installing $(LIB_FILE) to @DLL_INSTALL_DIR@/"
  	@@INSTALL_LIB@
- 	@chmod 555 "$(LIB_INSTALL_DIR)"/$(LIB_FILE)
-+	@ln -sf $(LIB_FILE) "$(LIB_INSTALL_DIR)"/libtcl${SHORT_TCL_VER}.so
+ 	@chmod 555 "@DLL_INSTALL_DIR@"/$(LIB_FILE)
++	@ln -sf $(LIB_FILE) "@DLL_INSTALL_DIR@"/libtcl${SHORT_TCL_VER}.so
 +	@echo "Installing libtcl${SHORT_TCL_VER}.a"
 +	@$(INSTALL_DATA) libtcl${SHORT_TCL_VER}.a \
-+		"$(LIB_INSTALL_DIR)"/libtcl${SHORT_TCL_VER}.a
-+	@(cd "$(LIB_INSTALL_DIR)"; $(RANLIB) libtcl${SHORT_TCL_VER}.a)
-+	@chmod 555 "$(LIB_INSTALL_DIR)"/libtcl${SHORT_TCL_VER}.a
-+
- 	@if test "$(TCL_BUILD_EXP_FILE)" != ""; then \
- 	    echo "Installing $(TCL_EXP_FILE) to $(LIB_INSTALL_DIR)/"; \
- 	    $(INSTALL_DATA) $(TCL_BUILD_EXP_FILE) \
-@@ -762,8 +781,9 @@
- 	    fi
- 	@echo "Installing tclsh as $(BIN_INSTALL_DIR)/tclsh$(VERSION)"
- 	@$(INSTALL_PROGRAM) tclsh "$(BIN_INSTALL_DIR)"/tclsh$(VERSION)
--	@echo "Installing tclConfig.sh to $(LIB_INSTALL_DIR)/"
--	@$(INSTALL_DATA) tclConfig.sh "$(LIB_INSTALL_DIR)"/tclConfig.sh
-+	@echo "Installing tclConfig.sh to $(SCRIPT_INSTALL_DIR)/"
-+	@mkdir -p "$(SCRIPT_INSTALL_DIR)"
-+	@$(INSTALL_DATA) tclConfig.sh "$(SCRIPT_INSTALL_DIR)"/tclConfig.sh
- 	@if test "$(STUB_LIB_FILE)" != "" ; then \
- 	    echo "Installing $(STUB_LIB_FILE) to $(LIB_INSTALL_DIR)/"; \
++		"@DLL_INSTALL_DIR@"/libtcl${SHORT_TCL_VER}.a
++	@(cd "@DLL_INSTALL_DIR@"; $(RANLIB) libtcl${SHORT_TCL_VER}.a)
++	@chmod 555 "@DLL_INSTALL_DIR@"/libtcl${SHORT_TCL_VER}.a
+ 	@echo "Installing ${TCL_EXE} as $(BIN_INSTALL_DIR)/tclsh$(VERSION)${EXE_SUFFIX}"
+ 	@$(INSTALL_PROGRAM) ${TCL_EXE} "$(BIN_INSTALL_DIR)"/tclsh$(VERSION)${EXE_SUFFIX}
+ 	@echo "Installing tclConfig.sh to $(CONFIG_INSTALL_DIR)/"
+@@ -797,9 +814,9 @@
  	    @INSTALL_STUB_LIB@ ; \
-@@ -771,7 +791,8 @@
+ 	fi
  	@EXTRA_INSTALL_BINARIES@
- 
- install-libraries: libraries $(INSTALL_TZDATA) install-msgs
--	@for i in "$(INCLUDE_INSTALL_DIR)" "$(SCRIPT_INSTALL_DIR)"; \
-+	@for i in "$(GENERIC_INCLUDE_INSTALL_DIR)" \
-+		"$(UNIX_INCLUDE_INSTALL_DIR)" "$(SCRIPT_INSTALL_DIR)"; \
- 	    do \
- 	    if [ ! -d "$$i" ] ; then \
- 		echo "Making directory $$i"; \
-@@ -780,7 +801,7 @@
+-	@echo "Installing pkg-config file to $(LIB_INSTALL_DIR)/pkgconfig/"
+-	@$(INSTALL_DATA_DIR) $(LIB_INSTALL_DIR)/pkgconfig
+-	@$(INSTALL_DATA) tcl.pc $(LIB_INSTALL_DIR)/pkgconfig/tcl.pc
++	@echo "Installing pkg-config file to $(prefix)/libdata/pkgconfig/"
++	@$(INSTALL_DATA_DIR) $(prefix)/libdata/pkgconfig
++	@$(INSTALL_DATA) tcl.pc $(prefix)/libdata/pkgconfig/tcl.pc
+ 
+ install-libraries: libraries
+ 	@for i in "$(SCRIPT_INSTALL_DIR)"; \
+@@ -810,7 +827,7 @@
  		else true; \
  		fi; \
  	    done;
@@ -101,114 +101,83 @@
  	    do \
  	    if [ ! -d "$(SCRIPT_INSTALL_DIR)"/$$i ] ; then \
  		echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \
-@@ -793,14 +814,21 @@
- 	    chmod +x $(UNIX_DIR)/install-sh; \
- 	    fi
- 	@echo "Installing header files";
--	@for i in $(GENERIC_DIR)/tcl.h $(GENERIC_DIR)/tclDecls.h \
--		$(GENERIC_DIR)/tclOO.h $(GENERIC_DIR)/tclOODecls.h \
--		$(GENERIC_DIR)/tclPlatDecls.h \
--		$(GENERIC_DIR)/tclTomMath.h \
--		$(GENERIC_DIR)/tclTomMathDecls.h ; \
-+	@for i in $(GENERIC_DIR)/*.h ; \
- 	    do \
--	    $(INSTALL_DATA) $$i "$(INCLUDE_INSTALL_DIR)"; \
-+	    $(INSTALL_DATA) $$i "$(GENERIC_INCLUDE_INSTALL_DIR)"; \
- 	    done;
-+	@for i in $(UNIX_DIR)/*.h ; \
-+	    do \
-+	    $(INSTALL_DATA) $$i "$(UNIX_INCLUDE_INSTALL_DIR)"; \
-+	    done;
-+	@ln -sf "$(GENERIC_INCLUDE_INSTALL_DIR)"/tcl.h "$(INCLUDE_INSTALL_DIR)"/tcl.h
-+	@ln -sf "$(GENERIC_INCLUDE_INSTALL_DIR)"/tclDecls.h "$(INCLUDE_INSTALL_DIR)"/tclDecls.h
-+	@ln -sf "$(GENERIC_INCLUDE_INSTALL_DIR)"/tclPlatDecls.h "$(INCLUDE_INSTALL_DIR)"/tclPlatDecls.h
-+	@ln -sf "$(GENERIC_INCLUDE_INSTALL_DIR)"/tclOO.h "$(INCLUDE_INSTALL_DIR)"/tclOO.h
-+	@ln -sf "$(GENERIC_INCLUDE_INSTALL_DIR)"/tclOODecls.h "$(INCLUDE_INSTALL_DIR)"/tclOODecls.h
-+	@ln -sf "$(GENERIC_INCLUDE_INSTALL_DIR)"/tclTomMath.h "$(INCLUDE_INSTALL_DIR)"/tclTomMath.h
-+	@ln -sf "$(GENERIC_INCLUDE_INSTALL_DIR)"/tclTomMathDecls.h "$(INCLUDE_INSTALL_DIR)"/tclTomMathDecls.h
- 	@echo "Installing library files to $(SCRIPT_INSTALL_DIR)";
- 	@for i in $(TOP_DIR)/library/*.tcl $(TOP_DIR)/library/tclIndex \
- 		$(UNIX_DIR)/tclAppInit.c $(UNIX_DIR)/ldAix @DTRACE_SRC@; \
-@@ -812,22 +840,11 @@
+@@ -829,22 +846,11 @@
  	    do \
  	    $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/http1.0; \
  	    done;
--	@echo "Installing package http 2.7.2 as a Tcl Module";
--	@$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/http-2.7.2.tm;
- 	@echo "Installing library opt0.4 directory";
+-	@echo "Installing package http 2.8.2 as a Tcl Module";
+-	@$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.6/http-2.8.2.tm;
+ 	@echo "Installing package opt0.4 files to $(SCRIPT_INSTALL_DIR)/opt0.4/";
  	@for i in $(TOP_DIR)/library/opt/*.tcl ; \
  	    do \
  	    $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/opt0.4; \
  	    done;
--	@echo "Installing package msgcat 1.4.2 as a Tcl Module";
--	@$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/msgcat-1.4.2.tm;
--	@echo "Installing package tcltest 2.3.0 as a Tcl Module";
--	@$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/tcltest-2.3.0.tm;
+-	@echo "Installing package msgcat 1.4.4 as a Tcl Module";
+-	@$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/msgcat-1.4.4.tm;
+-	@echo "Installing package tcltest 2.3.3 as a Tcl Module";
+-	@$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/tcltest-2.3.3.tm;
 -
--	@echo "Installing package platform 1.0.3 as a Tcl Module";
--	@$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform-1.0.3.tm;
+-	@echo "Installing package platform 1.0.10 as a Tcl Module";
+-	@$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform-1.0.10.tm;
 -	@echo "Installing package platform::shell 1.1.4 as a Tcl Module";
 -	@$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform/shell-1.1.4.tm;
  
- 	@echo "Installing library encoding directory";
+ 	@echo "Installing library encoding files to $(SCRIPT_INSTALL_DIR)/encoding/";
  	@for i in $(TOP_DIR)/library/encoding/*.enc ; do \
-@@ -839,6 +856,28 @@
- 	        "$(SCRIPT_INSTALL_DIR)"/tm.tcl; \
- 	fi
- 
-+install-tm:
-+	@for i in tcl8 tcl8/8.3 tcl8/8.4  tcl8/8.4/platform tcl8/8.5 tcl8/8.6; \; \
-+	    do \
-+	    if [ ! -d "$(LIB_INSTALL_DIR)"/$$i ] ; then \
-+		echo "Making directory $(LIB_INSTALL_DIR)/$$i"; \
-+		mkdir -p "$(LIB_INSTALL_DIR)"/$$i; \
-+		chmod 755 "$(LIB_INSTALL_DIR)"/$$i; \
-+		else true; \
-+		fi; \
-+	    done;
-+	@echo "Installing package http 2.7.2 as a Tcl Module";
-+	@$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(LIB_INSTALL_DIR)"/tcl8/8.4/http-2.7.2.tm;
-+	@echo "Installing package msgcat 1.4.2 as a Tcl Module";
-+	@$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(LIB_INSTALL_DIR)"/tcl8/8.5/msgcat-1.4.2.tm;
-+	@echo "Installing package tcltest 2.3.0 as a Tcl Module";
-+	@$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(LIB_INSTALL_DIR)"/tcl8/8.5/tcltest-2.3.0.tm;
-+
-+	@echo "Installing package platform 1.0.3 as a Tcl Module";
-+	@$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(LIB_INSTALL_DIR)"/tcl8/8.4/platform-1.0.3.tm;
-+	@echo "Installing package platform::shell 1.1.4 as a Tcl Module";
-+	@$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl "$(LIB_INSTALL_DIR)"/tcl8/8.4/platform/shell-1.1.4.tm;
-+
- install-tzdata: tclsh
- 	@echo "Installing time zone data"
- 	@@LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \
-@@ -868,18 +907,27 @@
+@@ -884,23 +890,18 @@
+ 		else true; \
+ 		fi; \
  	    done;
- 	@echo "Installing and cross-linking top-level (.1) docs";
- 	@for i in $(TOP_DIR)/doc/*.1; do \
--	    $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MAN1_INSTALL_DIR)"; \
-+	    ${BSD_INSTALL_MAN} $$i "$(MAN1_INSTALL_DIR)"; \
- 	done
- 
+-	@echo "Installing and cross-linking top-level (.1) docs";
+-	@for i in $(TOP_DIR)/doc/*.1; do \
+-	    $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MAN1_INSTALL_DIR)"; \
+-	done
+-
  	@echo "Installing and cross-linking C API (.3) docs";
  	@for i in $(TOP_DIR)/doc/*.3; do \
--	    $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MAN3_INSTALL_DIR)"; \
+-	    $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MAN3_INSTALL_DIR)"; \
 +	    ${BSD_INSTALL_MAN} $$i "$(MAN3_INSTALL_DIR)"; \
  	done
  
  	@echo "Installing and cross-linking command (.n) docs";
  	@for i in $(TOP_DIR)/doc/*.n; do \
--	    $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MANN_INSTALL_DIR)"; \
+-	    $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MANN_INSTALL_DIR)"; \
 +	    ${BSD_INSTALL_MAN} $$i "$(MANN_INSTALL_DIR)"; \
  	done
-+	    
-+	@echo "**********"
-+	@echo "IMPORTANT:"
-+	@echo "**********"
-+	@echo "tclConfig.sh in $(SCRIPT_INSTALL_DIR)/tclConfig.sh"
-+	@echo "tcl.h        in $(INCLUDE_INSTALL_DIR)/tcl.h"
-+	@echo "tclDecls.h   in $(INCLUDE_INSTALL_DIR)/tclDecls.h"
-+	@echo "There are NOT default place, but good place to avoid"
-+	@echo "conflicting with another version of Tcl/Tks."
+ 
+ install-headers:
+-	@for i in "$(INCLUDE_INSTALL_DIR)"; \
++	@for i in "$(GENERIC_INCLUDE_INSTALL_DIR)" "$(UNIX_INCLUDE_INSTALL_DIR)"; \
+ 	    do \
+ 	    if [ ! -d "$$i" ] ; then \
+ 		echo "Making directory $$i"; \
+@@ -908,15 +909,22 @@
+ 		else true; \
+ 		fi; \
+ 	    done;
+-	@echo "Installing header files to $(INCLUDE_INSTALL_DIR)/";
+-	@for i in $(GENERIC_DIR)/tcl.h $(GENERIC_DIR)/tclDecls.h \
+-		$(GENERIC_DIR)/tclOO.h $(GENERIC_DIR)/tclOODecls.h \
+-		$(GENERIC_DIR)/tclPlatDecls.h \
+-		$(GENERIC_DIR)/tclTomMath.h \
+-		$(GENERIC_DIR)/tclTomMathDecls.h ; \
++	@echo "Installing header files to $(GENERIC_INCLUDE_INSTALL_DIR)/";
++	@for i in $(GENERIC_DIR)/*.h ; \
++	    do \
++	    $(INSTALL_DATA) $$i "$(GENERIC_INCLUDE_INSTALL_DIR)"; \
++	    done;
++	@for i in $(UNIX_DIR)/*.h ; \
+ 	    do \
+-	    $(INSTALL_DATA) $$i "$(INCLUDE_INSTALL_DIR)"; \
++	    $(INSTALL_DATA) $$i "$(UNIX_INCLUDE_INSTALL_DIR)"; \
+ 	    done;
++	@ln -sf "$(GENERIC_INCLUDE_INSTALL_DIR)"/tcl.h "$(INCLUDE_INSTALL_DIR)"/tcl.h
++	@ln -sf "$(GENERIC_INCLUDE_INSTALL_DIR)"/tclDecls.h "$(INCLUDE_INSTALL_DIR)"/tclDecls.h
++	@ln -sf "$(GENERIC_INCLUDE_INSTALL_DIR)"/tclPlatDecls.h "$(INCLUDE_INSTALL_DIR)"/tclPlatDecls.h
++	@ln -sf "$(GENERIC_INCLUDE_INSTALL_DIR)"/tclOO.h "$(INCLUDE_INSTALL_DIR)"/tclOO.h
++	@ln -sf "$(GENERIC_INCLUDE_INSTALL_DIR)"/tclOODecls.h "$(INCLUDE_INSTALL_DIR)"/tclOODecls.h
++	@ln -sf "$(GENERIC_INCLUDE_INSTALL_DIR)"/tclTomMath.h "$(INCLUDE_INSTALL_DIR)"/tclTomMath.h
++	@ln -sf "$(GENERIC_INCLUDE_INSTALL_DIR)"/tclTomMathDecls.h "$(INCLUDE_INSTALL_DIR)"/tclTomMathDecls.h
  
  # Optional target to install private headers
- install-private-headers: libraries
+ install-private-headers:
diff --git a/lang/tcl86/files/patch-unix-tclUnixPort.h b/lang/tcl86/files/patch-unix-tclUnixPort.h
deleted file mode 100644
index 7a4f70a917d..00000000000
--- a/lang/tcl86/files/patch-unix-tclUnixPort.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- tclUnixPort.h.orig	Wed Jan 17 13:14:18 2007
-+++ tclUnixPort.h	Wed Jan 17 13:08:39 2007
-@@ -628,6 +628,9 @@
- EXTERN struct tm *     	TclpLocaltime(CONST time_t *);
- EXTERN struct tm *     	TclpGmtime(CONST time_t *);
- EXTERN char *          	TclpInetNtoa(struct in_addr);
-+#ifdef inet_ntoa
-+#	undef inet_ntoa
-+#endif
- /* #define localtime(x)	TclpLocaltime(x)
-  * #define gmtime(x)	TclpGmtime(x)    */
- #   undef inet_ntoa
diff --git a/lang/tcl86/pkg-plist b/lang/tcl86/pkg-plist
index d377087398b..2970dcf50ec 100644
--- a/lang/tcl86/pkg-plist
+++ b/lang/tcl86/pkg-plist
@@ -20,6 +20,7 @@ include/tcl%%TCL_VER%%/generic/tclPort.h
 include/tcl%%TCL_VER%%/generic/tclRegexp.h
 include/tcl%%TCL_VER%%/generic/tclTomMath.h
 include/tcl%%TCL_VER%%/generic/tclTomMathDecls.h
+include/tcl%%TCL_VER%%/generic/tclTomMathInt.h
 include/tcl%%TCL_VER%%/generic/tommath.h
 include/tcl%%TCL_VER%%/tcl.h
 include/tcl%%TCL_VER%%/tclDecls.h
@@ -118,7 +119,6 @@ lib/tcl%%TCL_VER%%/history.tcl
 lib/tcl%%TCL_VER%%/http1.0/http.tcl
 lib/tcl%%TCL_VER%%/http1.0/pkgIndex.tcl
 lib/tcl%%TCL_VER%%/init.tcl
-lib/tcl%%TCL_VER%%/ldAix
 lib/tcl%%TCL_VER%%/tm.tcl
 lib/tcl%%TCL_VER%%/msgs/af.msg
 lib/tcl%%TCL_VER%%/msgs/af_za.msg
@@ -255,6 +255,7 @@ lib/tcl%%TCL_VER%%/safe.tcl
 lib/tcl%%TCL_VER%%/tclAppInit.c
 lib/tcl%%TCL_VER%%/tclConfig.sh
 lib/tcl%%TCL_VER%%/tclIndex
+lib/tcl%%TCL_VER%%/tclooConfig.sh
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/CST6CDT
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/CET
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/PST8PDT
@@ -375,6 +376,7 @@ lib/tcl%%TCL_VER%%/tclIndex
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Atikokan
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Atka
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Bahia
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Bahia_Banderas
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Barbados
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Belem
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Belize
@@ -429,18 +431,22 @@ lib/tcl%%TCL_VER%%/tclIndex
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Jujuy
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Juneau
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Knox_IN
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Kralendijk
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/La_Paz
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Los_Angeles
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Louisville
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Lower_Princes
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Maceio
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Managua
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Manaus
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Marigot
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Martinique
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Matamoros
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Mazatlan
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Mendoza
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Menominee
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Merida
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Metlakatla
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Mexico_City
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Miquelon
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Moncton
@@ -453,6 +459,7 @@ lib/tcl%%TCL_VER%%/tclIndex
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Nipigon
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Nome
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Noronha
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Ojinaga
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Panama
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Pangnirtung
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Paramaribo
@@ -469,12 +476,14 @@ lib/tcl%%TCL_VER%%/tclIndex
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Resolute
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Rio_Branco
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Rosario
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Santa_Isabel
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Santarem
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Santiago
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Santo_Domingo
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Sao_Paulo
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Scoresbysund
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Shiprock
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Sitka
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/St_Barthelemy
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/St_Johns
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/St_Kitts
@@ -504,12 +513,14 @@ lib/tcl%%TCL_VER%%/tclIndex
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Indiana/Winamac
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Kentucky/Louisville
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Kentucky/Monticello
-%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/North_Dakota/New_Salem
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/North_Dakota/Beulah
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/North_Dakota/Center
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/North_Dakota/New_Salem
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Antarctica/Casey
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Antarctica/Davis
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Antarctica/Mawson
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Antarctica/DumontDUrville
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Antarctica/Macquarie
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Antarctica/McMurdo
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Antarctica/Palmer
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Antarctica/Rothera
@@ -557,6 +568,7 @@ lib/tcl%%TCL_VER%%/tclIndex
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Kamchatka
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Karachi
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Kashgar
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Kathmandu
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Katmandu
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Kolkata
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Krasnoyarsk
@@ -570,6 +582,7 @@ lib/tcl%%TCL_VER%%/tclIndex
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Manila
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Muscat
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Nicosia
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Novokuznetsk
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Novosibirsk
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Omsk
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Oral
@@ -763,6 +776,7 @@ lib/tcl%%TCL_VER%%/tclIndex
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Pacific/Auckland
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Pacific/Apia
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Pacific/Chatham
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Pacific/Chuuk
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Pacific/Easter
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Pacific/Efate
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Pacific/Enderbury
@@ -789,6 +803,7 @@ lib/tcl%%TCL_VER%%/tclIndex
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Pacific/Palau
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Pacific/Yap
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Pacific/Pitcairn
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Pacific/Pohnpei
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Pacific/Ponape
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Pacific/Port_Moresby
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Pacific/Rarotonga
@@ -851,6 +866,7 @@ lib/tcl%%TCL_VER%%/word.tcl
 %%TZDATA%%@dirrm lib/tcl%%TCL_VER%%/tzdata/America
 %%TZDATA%%@dirrm lib/tcl%%TCL_VER%%/tzdata/Africa
 %%TZDATA%%@dirrm lib/tcl%%TCL_VER%%/tzdata
+libdata/pkgconfig/tcl.pc
 @dirrm lib/tcl%%TCL_VER%%/opt0.4
 @dirrm lib/tcl%%TCL_VER%%/msgs
 @dirrm lib/tcl%%TCL_VER%%/http1.0
diff --git a/lang/tcl86/pkg-plist.threads b/lang/tcl86/pkg-plist.threads
index 409c1f9139d..00eb16f31b9 100644
--- a/lang/tcl86/pkg-plist.threads
+++ b/lang/tcl86/pkg-plist.threads
@@ -4,5 +4,7 @@ lib/libtcl%%SHORT_TCL_VER%%-threads.so
 lib/libtcl%%SHORT_TCL_VER%%-threads.so.1
 lib/libtclstub%%SHORT_TCL_VER%%-threads.a
 lib/tcl%%TCL_VER%%/tclConfig-threads.sh
+lib/tcl%%TCL_VER%%/tclooConfig-threads.sh
 lib/tcl%%TCL_VER%%-threads/tclConfig.sh
+lib/tcl%%TCL_VER%%-threads/tclooConfig.sh
 @dirrm lib/tcl%%TCL_VER%%-threads
diff --git a/x11-toolkits/tk86/Makefile b/x11-toolkits/tk86/Makefile
index ab024e38728..44e660fd743 100644
--- a/x11-toolkits/tk86/Makefile
+++ b/x11-toolkits/tk86/Makefile
@@ -6,12 +6,11 @@
 #
 
 PORTNAME=	tk
-PORTVERSION=	8.6.b.1
-PORTREVISION=	2
+PORTVERSION=	8.6.b.2
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	SF/tcl/Tcl/8.6b1
+MASTER_SITES=	SF/tcl/Tcl/8.6b2
 PKGNAMESUFFIX?=	${THREADS_SUFFIX}
-DISTNAME=	${PORTNAME}${PORTVERSION:S/.b.1/b1/}-src
+DISTNAME=	${PORTNAME}${PORTVERSION:S/.b.2/b2/}-src
 
 MAINTAINER=	mm@FreeBSD.org
 COMMENT?=	Graphical toolkit for Tcl
@@ -113,10 +112,11 @@ MANN=	bell.n bind.n bindtags.n bitmap.n button.n busy.n canvas.n \
 	menu.n menubar.n menubutton.n message.n messageBox.n option.n \
 	optionMenu.n options.n pack-old.n pack.n panedwindow.n palette.n \
 	photo.n place.n popup.n radiobutton.n raise.n scale.n scrollbar.n \
-	selection.n send.n spinbox.n text.n tk.n tkerror.n tkvars.n tkwait.n \
-	toplevel.n winfo.n wm.n ttk_button.n ttk_checkbutton.n ttk_combobox.n \
-	ttk_entry.n ttk_frame.n ttk_image.n ttk_intro.n ttk_label.n \
-	ttk_labelframe.n ttk_menubutton.n ttk_notebook.n ttk_panedwindow.n \
+	selection.n send.n spinbox.n text.n tk.n tk_mac.n tkerror.n \
+	tkvars.n tkwait.n toplevel.n winfo.n wm.n ttk_button.n \
+	ttk_checkbutton.n ttk_combobox.n ttk_entry.n ttk_frame.n \
+	ttk_image.n ttk_intro.n ttk_label.n ttk_labelframe.n \
+	ttk_menubutton.n ttk_notebook.n ttk_panedwindow.n \
 	ttk_progressbar.n ttk_radiobutton.n ttk_scrollbar.n ttk_separator.n \
 	ttk_scale.n ttk_sizegrip.n ttk_spinbox.n ttk_style.n ttk_treeview.n \
 	ttk_vsapi.n ttk_widget.n
diff --git a/x11-toolkits/tk86/distinfo b/x11-toolkits/tk86/distinfo
index 15f581ffafe..185c1404b6a 100644
--- a/x11-toolkits/tk86/distinfo
+++ b/x11-toolkits/tk86/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tk8.6b1-src.tar.gz) = 78a06dfd954dee6f9cb739c3cd7deb9adeea567db6ef2aa902b10cc89896ef07
-SIZE (tk8.6b1-src.tar.gz) = 3876137
+SHA256 (tk8.6b2-src.tar.gz) = 81252186d04d44cff41e24384d6fd77e0034f116660f84cb5c2a8b3bd4b373ad
+SIZE (tk8.6b2-src.tar.gz) = 4611544
diff --git a/x11-toolkits/tk86/files/patch-unix::Makefile.in b/x11-toolkits/tk86/files/patch-unix::Makefile.in
index 26155a62cd0..b5aba21666b 100644
--- a/x11-toolkits/tk86/files/patch-unix::Makefile.in
+++ b/x11-toolkits/tk86/files/patch-unix::Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig	2008-12-21 17:34:25.000000000 +0100
-+++ Makefile.in	2009-02-26 12:21:11.480095049 +0100
-@@ -65,6 +65,8 @@
+--- Makefile.in.orig	2011-08-05 21:18:31.000000000 +0200
++++ Makefile.in	2011-08-09 16:45:37.835415114 +0200
+@@ -63,6 +63,8 @@
  
  # Directory in which to install the include file tk.h:
  INCLUDE_INSTALL_DIR	= $(INSTALL_ROOT)$(includedir)
@@ -9,7 +9,16 @@
  
  # Path to the private tk header dir:
  PRIVATE_INCLUDE_DIR	= @PRIVATE_INCLUDE_DIR@
-@@ -95,7 +97,7 @@
+@@ -91,7 +93,7 @@
+ HTML_INSTALL_DIR	= $(INSTALL_ROOT)$(HTML_DIR)
+ 
+ # Directory in which to install the configuration file tkConfig.sh:
+-CONFIG_INSTALL_DIR	= $(INSTALL_ROOT)$(libdir)
++CONFIG_INSTALL_DIR	= "@DLL_INSTALL_DIR@"/tk$(VERSION)
+ 
+ # Directory in which to install the demo files:
+ DEMO_INSTALL_DIR	= $(INSTALL_ROOT)$(TK_LIBRARY)/demos
+@@ -99,7 +101,7 @@
  # The directory containing the Tcl sources and headers appropriate
  # for this version of Tk ("srcdir" will be replaced or has already
  # been replaced by the configure script):
@@ -18,7 +27,7 @@
  
  # The directory containing the platform specific Tcl sources and headers
  # appropriate for this version of Tk:
-@@ -109,7 +111,7 @@
+@@ -113,7 +115,7 @@
  TCL_LIB_FLAG		= @TCL_LIB_FLAG@
  
  # Flag, 1: we're building a shared lib, 0 we're not
@@ -27,7 +36,7 @@
  
  # Subdirectory of $(libdir) containing the pkgIndex.tcl file for loadable Tk
  TK_PKG_DIR		= @TK_PKG_DIR@
-@@ -132,7 +134,7 @@
+@@ -136,7 +138,7 @@
  #CFLAGS			= $(CFLAGS_DEBUG)
  #CFLAGS			= $(CFLAGS_OPTIMIZE)
  #CFLAGS			= $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE)
@@ -36,7 +45,7 @@
  
  # Flags to pass to the linker
  LDFLAGS_DEBUG		= @LDFLAGS_DEBUG@
-@@ -267,7 +269,7 @@
+@@ -272,7 +274,7 @@
  STLIB_LD		= @STLIB_LD@
  SHLIB_LD		= @SHLIB_LD@
  SHLIB_LD_LIBS		= @SHLIB_LD_LIBS@
@@ -45,16 +54,16 @@
  
  # Additional search flags needed to find the various shared libraries
  # at run-time.  The first symbol is for use when creating a binary
-@@ -554,6 +556,8 @@
+@@ -559,6 +561,8 @@
  	$(GENERIC_DIR)/tkIntPlatDecls.h $(GENERIC_DIR)/tkPort.h \
  	$(TTK_HDRS) $(@TK_WINDOWINGSYSTEM@_PRIVATE_HDRS)
  
 +INSTALL_HDRS = tk.h tkDecls.h tkInt.h tkIntXlibDecls.h
 +
- DEMOPROGS = browse hello ixset rmt rolodex square tcolor timer widget
+ DEMOPROGS = browse hello ixset rmt rolodex tcolor timer widget
  
  SHELL_ENV = \
-@@ -579,6 +583,12 @@
+@@ -583,6 +587,12 @@
  ${LIB_FILE}: ${OBJS} ${STUB_LIB_FILE} @LIB_RSRC_FILE@
  	rm -f $@
  	@MAKE_LIB@
@@ -67,88 +76,94 @@
  
  ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
  	rm -f $@
-@@ -678,7 +688,7 @@
- 	gdb ./wish --command=gdb.run
- 	rm gdb.run
- 
--INSTALL_TARGETS = install-binaries install-libraries install-demos install-doc @EXTRA_INSTALL@
-+INSTALL_TARGETS = install-binaries install-libraries @EXTRA_INSTALL@
- 
- install: $(INSTALL_TARGETS)
- 
-@@ -691,7 +701,8 @@
+@@ -690,9 +700,9 @@
+ 	$(SHELL_ENV) valgrind $(VALGRINDARGS) ./tktest${EXE_SUFFIX} $(SCRIPT)
+ 
+ INSTALL_BASE_TARGETS = install-binaries install-libraries
+-INSTALL_DOC_TARGETS = install-doc
++INSTALL_DOC_TARGETS =
+ INSTALL_DEV_TARGETS = install-headers
+-INSTALL_DEMO_TARGETS = install-demos
++INSTALL_DEMO_TARGETS =
+ INSTALL_EXTRA_TARGETS = @EXTRA_INSTALL@
+ INSTALL_TARGETS = $(INSTALL_BASE_TARGETS) $(INSTALL_DOC_TARGETS) $(INSTALL_DEV_TARGETS) \
+ 		$(INSTALL_DEMO_TARGETS) $(INSTALL_EXTRA_TARGETS)
+@@ -708,7 +718,7 @@
  # 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) $(TK_BUILD_EXP_FILE) wish
-+install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $(TK_BUILD_EXP_FILE) \
-+	libtk${SHORT_TK_VER}.a wish
- 	@for i in "$(LIB_INSTALL_DIR)" "$(BIN_INSTALL_DIR)" "$(PKG_INSTALL_DIR)"; \
+-install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) ${WISH_EXE}
++install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) libtk${SHORT_TK_VER}.a ${WISH_EXE}
+ 	@for i in "$(LIB_INSTALL_DIR)" "$(BIN_INSTALL_DIR)" \
+ 	    "$(PKG_INSTALL_DIR)" "$(CONFIG_INSTALL_DIR)" ; \
  	    do \
- 	    if [ ! -d "$$i" ] ; then \
-@@ -723,10 +734,15 @@
- 	    $(INSTALL_DATA) $(TK_BUILD_EXP_FILE) \
- 			"$(LIB_INSTALL_DIR)"/$(TK_EXP_FILE); \
- 	    fi
-+	@ln -sf $(LIB_INSTALL_DIR)/$(TK_LIB_FILE) $(LIB_INSTALL_DIR)/libtk${SHORT_TK_VER}.so
+@@ -731,6 +741,10 @@
+ 	@echo "Installing $(LIB_FILE) to @DLL_INSTALL_DIR@/"
+ 	@@INSTALL_LIB@
+ 	@chmod 555 "@DLL_INSTALL_DIR@"/$(LIB_FILE)
++	@ln -sf "@DLL_INSTALL_DIR@"/$(TK_LIB_FILE) "@DLL_INSTALL_DIR@"/libtk${SHORT_TK_VER}.so
 +	@echo "Installing libtk${SHORT_TK_VER}.a"
-+	@$(INSTALL_DATA) libtk${SHORT_TK_VER}.a $(LIB_INSTALL_DIR)/libtk${SHORT_TK_VER}.a
-+	@chmod 555 $(LIB_INSTALL_DIR)/libtk${SHORT_TK_VER}.a
- 	@echo "Installing wish as $(BIN_INSTALL_DIR)/wish$(VERSION)"
- 	@$(INSTALL_PROGRAM) wish "$(BIN_INSTALL_DIR)"/wish$(VERSION)
--	@echo "Installing tkConfig.sh to $(LIB_INSTALL_DIR)/"
--	@$(INSTALL_DATA) tkConfig.sh "$(LIB_INSTALL_DIR)"/tkConfig.sh
-+	@echo "Installing tkConfig.sh to $(LIB_INSTALL_DIR)/tk$(VERSION)"
-+	@mkdir -p "$(LIB_INSTALL_DIR)"/tk$(VERSION)
-+	@$(INSTALL_DATA) tkConfig.sh "$(LIB_INSTALL_DIR)"/tk$(VERSION)/tkConfig.sh
- 	@if test "$(STUB_LIB_FILE)" != "" ; then \
- 	    echo "Installing $(STUB_LIB_FILE) to $(LIB_INSTALL_DIR)/"; \
++	@$(INSTALL_DATA) libtk${SHORT_TK_VER}.a "@DLL_INSTALL_DIR@"/libtk${SHORT_TK_VER}.a
++	@chmod 555 "@DLL_INSTALL_DIR@"/libtk${SHORT_TK_VER}.a	
+ 	@echo "Installing ${WISH_EXE} as $(BIN_INSTALL_DIR)/wish$(VERSION)${EXE_SUFFIX}"
+ 	@$(INSTALL_PROGRAM) ${WISH_EXE} "$(BIN_INSTALL_DIR)"/wish$(VERSION)${EXE_SUFFIX}
+ 	@echo "Installing tkConfig.sh to $(CONFIG_INSTALL_DIR)/"
+@@ -740,9 +754,9 @@
  	    @INSTALL_STUB_LIB@ ; \
-@@ -737,6 +753,7 @@
- 	@if test "$(@TK_WINDOWINGSYSTEM@_XLIB_HDRS)" != ""; then \
- 	    XLIB_INCLUDE_INSTALL_DIR="$(INCLUDE_INSTALL_DIR)"/X11; fi; \
- 	for i in "$(INCLUDE_INSTALL_DIR)" "$${XLIB_INCLUDE_INSTALL_DIR}" \
-+		"$(GENERIC_INCLUDE_INSTALL_DIR)" "$(UNIX_INCLUDE_INSTALL_DIR)" \
- 		"$(SCRIPT_INSTALL_DIR)" "$(SCRIPT_INSTALL_DIR)"/images \
- 		"$(SCRIPT_INSTALL_DIR)"/msgs "$(SCRIPT_INSTALL_DIR)"/ttk; \
- 	    do \
-@@ -751,10 +768,14 @@
- 	    chmod +x $(SRC_DIR)/install-sh; \
- 	    fi
- 	@echo "Installing header files";
--	@for i in $(PUBLIC_HDRS); \
-+	${BSD_INSTALL_DATA} $(GENERIC_DIR)/*.h "$(GENERIC_INCLUDE_INSTALL_DIR)"/
-+	${BSD_INSTALL_DATA} $(UNIX_DIR)/*.h "$(UNIX_INCLUDE_INSTALL_DIR)"/
-+	@for i in $(INSTALL_HDRS) ; \
- 	    do \
--	    $(INSTALL_DATA) $$i "$(INCLUDE_INSTALL_DIR)"; \
--	    done;
-+	    j=`basename $$i` ; \
-+	    ln -sf "$(GENERIC_INCLUDE_INSTALL_DIR)"/$$j "$(INCLUDE_INSTALL_DIR)"/$$j ; \
-+	done
-+	
- 	@list='$(@TK_WINDOWINGSYSTEM@_XLIB_HDRS)'; for i in $$list ; \
- 	    do \
- 	    $(INSTALL_DATA) $$i "$(INCLUDE_INSTALL_DIR)"/X11; \
-@@ -832,19 +853,15 @@
+ 	fi
+ 	@EXTRA_INSTALL_BINARIES@
+-	@echo "Installing pkg-config file to $(LIB_INSTALL_DIR)/pkgconfig/"
+-	@$(INSTALL_DATA_DIR) $(LIB_INSTALL_DIR)/pkgconfig
+-	@$(INSTALL_DATA) tk.pc $(LIB_INSTALL_DIR)/pkgconfig/tk.pc
++	@echo "Installing pkg-config file to $(prefix)/libdata/pkgconfig/"
++	@$(INSTALL_DATA_DIR) $(prefix)/libdata/pkgconfig
++	@$(INSTALL_DATA) tk.pc $(prefix)/libdata/pkgconfig/tk.pc
+ 
+ install-libraries: libraries
+ 	@for i in "$(SCRIPT_INSTALL_DIR)" "$(SCRIPT_INSTALL_DIR)"/images \
+@@ -820,23 +834,20 @@
  		else true; \
  		fi; \
  	    done;
--	@echo "Installing and cross-linking top-level (.1) docs";
+-	@echo "Installing and cross-linking top-level (.1) docs to $(MAN1_INSTALL_DIR)/";
 -	@for i in $(TOP_DIR)/doc/*.1; do \
--	    $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MAN1_INSTALL_DIR)"; \
+-	    $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MAN1_INSTALL_DIR)"; \
 -	done
- 
- 	@echo "Installing and cross-linking C API (.3) docs";
+ 	@echo "Installing and cross-linking C API (.3) docs to $(MAN3_INSTALL_DIR)/";
  	@for i in $(TOP_DIR)/doc/*.3; do \
--	    $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MAN3_INSTALL_DIR)"; \
+-	    $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MAN3_INSTALL_DIR)"; \
 +	    ${BSD_INSTALL_MAN} $$i "$(MAN3_INSTALL_DIR)"; \
  	done
- 
- 	@echo "Installing and cross-linking command (.n) docs";
+ 	@echo "Installing and cross-linking command (.n) docs to $(MANN_INSTALL_DIR)/";
  	@for i in $(TOP_DIR)/doc/*.n; do \
--	    $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MANN_INSTALL_DIR)"; \
+-	    $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MANN_INSTALL_DIR)"; \
 +	    ${BSD_INSTALL_MAN} $$i "$(MANN_INSTALL_DIR)"; \
  	done
  
- # Optional target to install private headers
+ install-headers:
+ 	@if test "$(@TK_WINDOWINGSYSTEM@_XLIB_HDRS)" != ""; then \
+ 	    XLIB_INCLUDE_INSTALL_DIR="$(INCLUDE_INSTALL_DIR)"/X11; fi; \
+-	for i in "$(INCLUDE_INSTALL_DIR)" "$${XLIB_INCLUDE_INSTALL_DIR}"; \
++	for i in "$(INCLUDE_INSTALL_DIR)" "$${XLIB_INCLUDE_INSTALL_DIR}" \
++		"$(GENERIC_INCLUDE_INSTALL_DIR)" "$(UNIX_INCLUDE_INSTALL_DIR)"; \
+ 	    do \
+ 	    if [ -n "$$i" -a ! -d "$$i" ] ; then \
+ 		echo "Making directory $$i"; \
+@@ -844,10 +855,14 @@
+ 		else true; \
+ 		fi; \
+ 	    done;
+-	@echo "Installing header files to $(INCLUDE_INSTALL_DIR)/";
+-	@for i in $(PUBLIC_HDRS); \
++	@echo "Installing header files to $(GENERIC_INCLUDE_INSTALL_DIR)/";
++	${BSD_INSTALL_DATA} $(GENERIC_DIR)/*.h "$(GENERIC_INCLUDE_INSTALL_DIR)"/
++	@echo "Installing header files to $(UNIX_INCLUDE_INSTALL_DIR)/";
++	${BSD_INSTALL_DATA} $(UNIX_DIR)/*.h "$(UNIX_INCLUDE_INSTALL_DIR)"/
++	@for i in $(INSTALL_HDRS); \
+ 	    do \
+-	    $(INSTALL_DATA) $$i "$(INCLUDE_INSTALL_DIR)"; \
++	    j=`basename $$i` ; \
++	    ln -sf "$(GENERIC_INCLUDE_INSTALL_DIR)"/$$j "$(INCLUDE_INSTALL_DIR)"/$$j ; \
+ 	    done;
+ 	@list='$(@TK_WINDOWINGSYSTEM@_XLIB_HDRS)'; for i in $$list ; \
+ 	    do \
diff --git a/x11-toolkits/tk86/pkg-plist b/x11-toolkits/tk86/pkg-plist
index 64b58b4782f..7d9d510a0d0 100644
--- a/x11-toolkits/tk86/pkg-plist
+++ b/x11-toolkits/tk86/pkg-plist
@@ -74,12 +74,12 @@ lib/tk%%TK_VER%%/console.tcl
 %%DEMOS%%lib/tk%%TK_VER%%/demos/image2.tcl
 %%DEMOS%%lib/tk%%TK_VER%%/demos/images/earth.gif
 %%DEMOS%%lib/tk%%TK_VER%%/demos/images/earthris.gif
-%%DEMOS%%lib/tk%%TK_VER%%/demos/images/face.xbm
 %%DEMOS%%lib/tk%%TK_VER%%/demos/images/flagdown.xbm
 %%DEMOS%%lib/tk%%TK_VER%%/demos/images/flagup.xbm
 %%DEMOS%%lib/tk%%TK_VER%%/demos/images/gray25.xbm
 %%DEMOS%%lib/tk%%TK_VER%%/demos/images/letters.xbm
 %%DEMOS%%lib/tk%%TK_VER%%/demos/images/noletter.xbm
+%%DEMOS%%lib/tk%%TK_VER%%/demos/images/ouster.png
 %%DEMOS%%lib/tk%%TK_VER%%/demos/images/pattern.xbm
 %%DEMOS%%lib/tk%%TK_VER%%/demos/images/tcllogo.gif
 %%DEMOS%%lib/tk%%TK_VER%%/demos/images/teapot.ppm
@@ -121,6 +121,7 @@ lib/tk%%TK_VER%%/console.tcl
 %%DEMOS%%lib/tk%%TK_VER%%/demos/ttknote.tcl
 %%DEMOS%%lib/tk%%TK_VER%%/demos/ttkpane.tcl
 %%DEMOS%%lib/tk%%TK_VER%%/demos/ttkprogress.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/ttkscale.tcl
 %%DEMOS%%lib/tk%%TK_VER%%/demos/twind.tcl
 %%DEMOS%%lib/tk%%TK_VER%%/demos/unicodeout.tcl
 %%DEMOS%%lib/tk%%TK_VER%%/demos/vscale.tcl
@@ -129,7 +130,11 @@ lib/tk%%TK_VER%%/dialog.tcl
 lib/tk%%TK_VER%%/entry.tcl
 lib/tk%%TK_VER%%/focus.tcl
 lib/tk%%TK_VER%%/fontchooser.tcl
+lib/tk%%TK_VER%%/iconlist.tcl
+lib/tk%%TK_VER%%/icons.tcl
 lib/tk%%TK_VER%%/images/README
+lib/tk%%TK_VER%%/images/lamp.png
+lib/tk%%TK_VER%%/images/lamp.svg
 lib/tk%%TK_VER%%/images/logo.eps
 lib/tk%%TK_VER%%/images/logo100.gif
 lib/tk%%TK_VER%%/images/logo64.gif
@@ -144,6 +149,7 @@ lib/tk%%TK_VER%%/images/pwrdLogo75.gif
 lib/tk%%TK_VER%%/images/tai-ku.gif
 lib/tk%%TK_VER%%/listbox.tcl
 lib/tk%%TK_VER%%/menu.tcl
+lib/tk%%TK_VER%%/megawidget.tcl
 lib/tk%%TK_VER%%/mkpsenc.tcl
 lib/tk%%TK_VER%%/msgbox.tcl
 lib/tk%%TK_VER%%/msgs/cs.msg
@@ -204,6 +210,7 @@ lib/tk%%TK_VER%%/ttk/winTheme.tcl
 lib/tk%%TK_VER%%/ttk/xpTheme.tcl
 lib/tk%%TK_VER%%/unsupported.tcl
 lib/tk%%TK_VER%%/xmfbox.tcl
+libdata/pkgconfig/tk.pc
 %%DATADIR%%/man.macros
 @dirrm %%DATADIR%%
 @dirrm lib/tk%%TK_VER%%/ttk