- Update lang/tcl86 and x11-toolkits/tk86 to 8.6.0

  Release notes: http://www.tcl.tk/software/tcltk/8.6.html

- Get rid of -thread slaves ports: threads are now enabled by
  default and can be OPTIONally disabled. This applies to:
  * lang/tcl84
  * lang/tcl85
  * lang/tcl86
  * x11-toolkits/tk84
  * x11-toolkits/tk85
  * x11-toolkits/tk86

- Get rid of tcl-modules slave port: modules are now installed by default and
  can be OPTIONally disabled. This applies to:
  * lang/tcl85
  * lang/tcl86

- Fix conflicts between man pages of different Tcl/Tk versions, by adding a
  suffix (tcl84, tcl85, tcl86, tk84, tk85, and tk86).

Reviewed by:	bf, crees
Approved by:	bapt (portmgr, after partial exp-run)

20 files changed, 165 insertions, 1495 deletions

diff --git a/x11-toolkits/Makefile b/x11-toolkits/Makefile
index 0d392e69216..75d42fc7b98 100644
--- a/x11-toolkits/Makefile
+++ b/x11-toolkits/Makefile
@@ -253,11 +253,8 @@
     SUBDIR += tk-wrapper
     SUBDIR += tk83
     SUBDIR += tk84
-    SUBDIR += tk84-thread
     SUBDIR += tk85
-    SUBDIR += tk85-thread
     SUBDIR += tk86
-    SUBDIR += tk86-thread
     SUBDIR += tkdnd
     SUBDIR += tkshape
     SUBDIR += tktable
diff --git a/x11-toolkits/tk84-thread/Makefile b/x11-toolkits/tk84-thread/Makefile
deleted file mode 100644
index 9082f3f1ee3..00000000000
--- a/x11-toolkits/tk84-thread/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# New ports collection makefile for:	tk84-thread
-# Date created:				09 March 2007
-# Whom:					Martin Matuska <mm@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	tk
-
-MAINTAINER=	tcltk@FreeBSD.org
-COMMENT=	Graphical toolkit for Tcl (threads support)
-
-BUILDING_TK_THREADS=	yes
-
-MASTERDIR=	${.CURDIR}/../tk84
-
-.include "${MASTERDIR}/Makefile"
diff --git a/x11-toolkits/tk84/Makefile b/x11-toolkits/tk84/Makefile
index 28f585ebef6..4daeafe0308 100644
--- a/x11-toolkits/tk84/Makefile
+++ b/x11-toolkits/tk84/Makefile
@@ -6,436 +6,77 @@ PORTREVISION=	2
 PORTEPOCH=	2
 CATEGORIES=	x11-toolkits tk
 MASTER_SITES=	SF/tcl/Tcl/${PORTVERSION}
-PKGNAMESUFFIX?=	${THREADS_SUFFIX}
 DISTNAME=	${PORTNAME}${PORTVERSION}-src
 
 MAINTAINER=	tcltk@FreeBSD.org
-COMMENT?=	Graphical toolkit for Tcl
+COMMENT=	Graphical toolkit for Tcl
 
 LICENSE=	BSD
 LICENSE_FILE=	${WRKSRC}/../license.terms
 
-LATEST_LINK?=	tk84
-USE_XORG=	x11
-USE_LDCONFIG=	yes
+OPTIONS_DEFINE=	TKMAN THREADS
+OPTIONS_DEFAULT=THREADS
+TKMAN_DESC=	Install Tk function manpages
+
 WRKSRC=		${WRKDIR}/${PORTNAME}${PORTVERSION}/unix
+
+ALL_TARGET=	all
+INSTALL_TARGET=	install
+
+USE_LDCONFIG=	yes
+USE_TCL=	${SHORT_TK_VER}
+USE_XORG=	x11
+CFLAGS+=	-I${TCL_INCLUDEDIR}/generic
 GNU_CONFIGURE=	yes
-TK_VER=		8.4
-SHORT_TK_VER=	84
-CONFIGURE_ARGS=	--enable-shared --with-tcl=${LOCALBASE}/lib/tcl${TK_VER} \
+CONFIGURE_ARGS=	--enable-shared \
+		--enable-man-suffix=.${MAN_SUFFIX} \
+		--with-tcl=${TCL_LIBDIR} \
 		--includedir=${PREFIX}/include/tk${TK_VER}
+
 CONFIGURE_ENV=	PORTSDIR=${PORTSDIR} TK_LIB_FILE=libtk${SHORT_TK_VER}.so.1
-MAKE_ENV=	SHORT_TK_VER=${SHORT_TK_VER}
-PLIST_SUB=	TK_VER=${TK_VER} SHORT_TK_VER=${SHORT_TK_VER}
-NOPRECIOUSMAKEVARS=	yes # Otherwise 'make readmes' is broken
-MANCOMPRESSED=	no
-DATADIR=	${PREFIX}/share/${PORTNAME}${TK_VER}
-SUB_FILES=	pkgIndex.tcl
 
-OPTIONS_DEFINE=	TK84_DOC
-TK84_DOC_DESC=	Install tk 8.4 function manpages
+CFLAGS+=	-I${TCL_INCLUDEDIR}
 
-.if !defined(BUILDING_TK_THREADS)
-USE_TCL=	84
-.else
-OPTIONS_EXCLUDE=	TK84_DOC
-USE_TK=		${SHORT_TK_VER}
-PLIST=		${PKGDIR}/pkg-plist.threads
-THREADS_SUFFIX=	-threads
-LIB_DEPENDS=	tcl${SHORT_TK_VER}${THREADS_SUFFIX}:${PORTSDIR}/lang/tcl${SHORT_TK_VER}-thread
-.endif
+TK_VER=		${PORTVERSION:R}
+SHORT_TK_VER=	${TK_VER:S/.//}
+LATEST_LINK=	${PORTNAME}${SHORT_TK_VER}
+MAN_SUFFIX=	${LATEST_LINK}
 
-SUB_LIST+=	THREADS_SUFFIX="${THREADS_SUFFIX}"
+MAKE_ENV=	SHORT_TK_VER=${SHORT_TK_VER}
+
+PLIST_SUB=	TK_VER=${TK_VER} \
+		SHORT_TK_VER=${SHORT_TK_VER}
 
-.include <bsd.port.pre.mk>
+SUB_FILES=	pkgIndex.tcl
 
-DATADIR=	${PREFIX}/share/${PORTNAME}${TCL_VER}
+.include <bsd.port.options.mk>
 
-.if !defined(NO_INSTALL_MANPAGES)
-MAN1=	wish${TCL_VER}${THREADS_SUFFIX}.1
+.if ${PORT_OPTIONS:MTKMAN} && !defined(NO_INSTALL_MANPAGES)
+INSTALL_TARGET+=install-doc
+.include "${.CURDIR}/Makefile.man"
 .endif
 
-.if defined(BUILDING_TK_THREADS)
-CONFIGURE_ARGS+=	--enable-threads --with-tcl=${LOCALBASE}/lib/tcl${TK_VER}${THREADS_SUFFIX}
-CONFIGURE_ENV+=		PTHREAD_LIBS="${PTHREAD_LIBS}" PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
-			ac_cv_path_tclsh="${LOCALBASE}/bin/tclsh${TK_VER}${THREADS_SUFFIX}"
-LATEST_LINK=		tk84${THREADS_SUFFIX}
-SUB_LIST+=		TK_PROVIDE="; package provide Tk-threads ${TK_VER}"
+.if ${PORT_OPTIONS:MTHREADS}
+CONFIGURE_ARGS+=	--enable-threads
 .else
-CONFIGURE_ARGS+=	--disable-threads --with-tcl=${LOCALBASE}/lib/tcl${TK_VER}
-CONFIGURE_ENV+=		ac_cv_path_tclsh="${TCLSH}"
-
-SUB_LIST+=		TK_PROVIDE=""
-
-
-.if !defined(NO_INSTALL_MANPAGES) && ${PORT_OPTIONS:MTK84_DOC}
-
-MAN3=	3DBorder.3 AddOption.3 BindTable.3 CanvPsY.3 CanvTkwin.3 \
-	CanvTxtInfo.3 Clipboard.3 ClrSelect.3 ConfigWidg.3 ConfigWind.3 \
-	CoordToWin.3 CrtCmHdlr.3 CrtErrHdlr.3 CrtGenHdlr.3 CrtImgType.3 \
-	CrtItemType.3 CrtPhImgFmt.3 CrtSelHdlr.3 CrtWindow.3 DeleteImg.3 \
-	DrawFocHlt.3 EventHndlr.3 FindPhoto.3 FontId.3 FreeXId.3 GeomReq.3 \
-	GetAnchor.3 GetBitmap.3 GetCapStyl.3 GetClrmap.3 GetColor.3 \
-	GetCursor.3 GetDash.3 GetFont.3 GetGC.3 GetHINSTANCE.3 GetHWND.3 \
-	GetImage.3 GetJoinStl.3 GetJustify.3 GetOption.3 GetPixels.3 \
-	GetPixmap.3 GetRelief.3 GetRootCrd.3 GetScroll.3 GetSelect.3 GetUid.3 \
-	GetVRoot.3 GetVisual.3 Grab.3 HWNDToWindow.3 HandleEvent.3 \
-	IdToWindow.3 ImgChanged.3 InternAtom.3 MainLoop.3 MainWin.3 \
-	MaintGeom.3 ManageGeom.3 MapWindow.3 MeasureChar.3 MoveToplev.3 \
-	Name.3 NameOfImg.3 OwnSelect.3 ParseArgv.3 QWinEvent.3 Restack.3 \
-	RestrictEv.3 SetAppName.3 SetCaret.3 SetClass.3 SetClassProcs.3 \
-	SetGrid.3 SetOptions.3 SetVisual.3 StrictMotif.3 TextLayout.3 \
-	Tk_Init.3 Tk_Main.3 TkInitStubs.3 WindowId.3
-
-MANN=	bell.n bind.n bindtags.n bitmap.n button.n canvas.n checkbutton.n \
-	chooseColor.n chooseDirectory.n clipboard.n colors.n console.n \
-	cursors.n destroy.n dialog.n entry.n event.n focus.n focusNext.n \
-	font.n frame.n getOpenFile.n grab.n grid.n keysyms.n image.n label.n \
-	labelframe.n listbox.n loadTk.n lower.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
-
-# MLINKS generated via  awk '/ln/ {print "\t" $2,$3,"\\"}' unix/mkLinks
-MLINKS=	3DBorder.3 Tk_Alloc3DBorderFromObj.3 \
-	3DBorder.3 Tk_Get3DBorder.3 \
-	3DBorder.3 Tk_Get3DBorderFromObj.3 \
-	3DBorder.3 Tk_Draw3DRectangle.3 \
-	3DBorder.3 Tk_Fill3DRectangle.3 \
-	3DBorder.3 Tk_Draw3DPolygon.3 \
-	3DBorder.3 Tk_Fill3DPolygon.3 \
-	3DBorder.3 Tk_3DVerticalBevel.3 \
-	3DBorder.3 Tk_3DHorizontalBevel.3 \
-	3DBorder.3 Tk_SetBackgroundFromBorder.3 \
-	3DBorder.3 Tk_NameOf3DBorder.3 \
-	3DBorder.3 Tk_3DBorderColor.3 \
-	3DBorder.3 Tk_3DBorderGC.3 \
-	3DBorder.3 Tk_Free3DBorderFromObj.3 \
-	3DBorder.3 Tk_Free3DBorder.3 \
-	AddOption.3 Tk_AddOption.3 \
-	BindTable.3 Tk_CreateBindingTable.3 \
-	BindTable.3 Tk_DeleteBindingTable.3 \
-	BindTable.3 Tk_CreateBinding.3 \
-	BindTable.3 Tk_DeleteBinding.3 \
-	BindTable.3 Tk_GetBinding.3 \
-	BindTable.3 Tk_GetAllBindings.3 \
-	BindTable.3 Tk_DeleteAllBindings.3 \
-	BindTable.3 Tk_BindEvent.3 \
-	CanvPsY.3 Tk_CanvasPsY.3 \
-	CanvPsY.3 Tk_CanvasPsBitmap.3 \
-	CanvPsY.3 Tk_CanvasPsColor.3 \
-	CanvPsY.3 Tk_CanvasPsFont.3 \
-	CanvPsY.3 Tk_CanvasPsPath.3 \
-	CanvPsY.3 Tk_CanvasPsStipple.3 \
-	CanvTkwin.3 Tk_CanvasTkwin.3 \
-	CanvTkwin.3 Tk_CanvasGetCoord.3 \
-	CanvTkwin.3 Tk_CanvasDrawableCoords.3 \
-	CanvTkwin.3 Tk_CanvasSetStippleOrigin.3 \
-	CanvTkwin.3 Tk_CanvasWindowCoords.3 \
-	CanvTkwin.3 Tk_CanvasEventuallyRedraw.3 \
-	CanvTkwin.3 Tk_CanvasTagsOption.3 \
-	CanvTxtInfo.3 Tk_CanvasTextInfo.3 \
-	Clipboard.3 Tk_ClipboardClear.3 \
-	Clipboard.3 Tk_ClipboardAppend.3 \
-	ClrSelect.3 Tk_ClearSelection.3 \
-	ConfigWidg.3 Tk_ConfigureWidget.3 \
-	ConfigWidg.3 Tk_ConfigureInfo.3 \
-	ConfigWidg.3 Tk_ConfigureValue.3 \
-	ConfigWidg.3 Tk_FreeOptions.3 \
-	ConfigWind.3 Tk_ConfigureWindow.3 \
-	ConfigWind.3 Tk_MoveWindow.3 \
-	ConfigWind.3 Tk_ResizeWindow.3 \
-	ConfigWind.3 Tk_MoveResizeWindow.3 \
-	ConfigWind.3 Tk_SetWindowBorderWidth.3 \
-	ConfigWind.3 Tk_ChangeWindowAttributes.3 \
-	ConfigWind.3 Tk_SetWindowBackground.3 \
-	ConfigWind.3 Tk_SetWindowBackgroundPixmap.3 \
-	ConfigWind.3 Tk_SetWindowBorder.3 \
-	ConfigWind.3 Tk_SetWindowBorderPixmap.3 \
-	ConfigWind.3 Tk_SetWindowColormap.3 \
-	ConfigWind.3 Tk_DefineCursor.3 \
-	ConfigWind.3 Tk_UndefineCursor.3 \
-	CoordToWin.3 Tk_CoordsToWindow.3 \
-	CrtCmHdlr.3 Tk_CreateClientMessageHandler.3 \
-	CrtCmHdlr.3 Tk_DeleteClientMessageHandler.3 \
-	CrtErrHdlr.3 Tk_CreateErrorHandler.3 \
-	CrtErrHdlr.3 Tk_DeleteErrorHandler.3 \
-	CrtGenHdlr.3 Tk_CreateGenericHandler.3 \
-	CrtGenHdlr.3 Tk_DeleteGenericHandler.3 \
-	CrtImgType.3 Tk_CreateImageType.3 \
-	CrtImgType.3 Tk_GetImageMasterData.3 \
-	CrtImgType.3 Tk_InitImageArgs.3 \
-	CrtItemType.3 Tk_CreateItemType.3 \
-	CrtItemType.3 Tk_GetItemTypes.3 \
-	CrtPhImgFmt.3 Tk_CreatePhotoImageFormat.3 \
-	CrtSelHdlr.3 Tk_CreateSelHandler.3 \
-	CrtSelHdlr.3 Tk_DeleteSelHandler.3 \
-	CrtWindow.3 Tk_CreateWindow.3 \
-	CrtWindow.3 Tk_CreateWindowFromPath.3 \
-	CrtWindow.3 Tk_DestroyWindow.3 \
-	CrtWindow.3 Tk_MakeWindowExist.3 \
-	DeleteImg.3 Tk_DeleteImage.3 \
-	DrawFocHlt.3 Tk_DrawFocusHighlight.3 \
-	EventHndlr.3 Tk_CreateEventHandler.3 \
-	EventHndlr.3 Tk_DeleteEventHandler.3 \
-	FindPhoto.3 Tk_FindPhoto.3 \
-	FindPhoto.3 Tk_PhotoPutBlock.3 \
-	FindPhoto.3 Tk_PhotoPutZoomedBlock.3 \
-	FindPhoto.3 Tk_PhotoGetImage.3 \
-	FindPhoto.3 Tk_PhotoBlank.3 \
-	FindPhoto.3 Tk_PhotoExpand.3 \
-	FindPhoto.3 Tk_PhotoGetSize.3 \
-	FindPhoto.3 Tk_PhotoSetSize.3 \
-	FontId.3 Tk_FontId.3 \
-	FontId.3 Tk_GetFontMetrics.3 \
-	FontId.3 Tk_PostscriptFontName.3 \
-	FreeXId.3 Tk_FreeXId.3 \
-	GeomReq.3 Tk_GeometryRequest.3 \
-	GeomReq.3 Tk_SetMinimumRequestSize.3 \
-	GeomReq.3 Tk_SetInternalBorder.3 \
-	GeomReq.3 Tk_SetInternalBorderEx.3 \
-	GetAnchor.3 Tk_GetAnchorFromObj.3 \
-	GetAnchor.3 Tk_GetAnchor.3 \
-	GetAnchor.3 Tk_NameOfAnchor.3 \
-	GetBitmap.3 Tk_AllocBitmapFromObj.3 \
-	GetBitmap.3 Tk_GetBitmap.3 \
-	GetBitmap.3 Tk_GetBitmapFromObj.3 \
-	GetBitmap.3 Tk_DefineBitmap.3 \
-	GetBitmap.3 Tk_NameOfBitmap.3 \
-	GetBitmap.3 Tk_SizeOfBitmap.3 \
-	GetBitmap.3 Tk_FreeBitmapFromObj.3 \
-	GetBitmap.3 Tk_FreeBitmap.3 \
-	GetCapStyl.3 Tk_GetCapStyle.3 \
-	GetCapStyl.3 Tk_NameOfCapStyle.3 \
-	GetClrmap.3 Tk_GetColormap.3 \
-	GetClrmap.3 Tk_FreeColormap.3 \
-	GetColor.3 Tk_AllocColorFromObj.3 \
-	GetColor.3 Tk_GetColor.3 \
-	GetColor.3 Tk_GetColorFromObj.3 \
-	GetColor.3 Tk_GetColorByValue.3 \
-	GetColor.3 Tk_NameOfColor.3 \
-	GetColor.3 Tk_FreeColorFromObj.3 \
-	GetColor.3 Tk_FreeColor.3 \
-	GetCursor.3 Tk_AllocCursorFromObj.3 \
-	GetCursor.3 Tk_GetCursor.3 \
-	GetCursor.3 Tk_GetCursorFromObj.3 \
-	GetCursor.3 Tk_GetCursorFromData.3 \
-	GetCursor.3 Tk_NameOfCursor.3 \
-	GetCursor.3 Tk_FreeCursorFromObj.3 \
-	GetCursor.3 Tk_FreeCursor.3 \
-	GetDash.3 Tk_GetDash.3 \
-	GetFont.3 Tk_AllocFontFromObj.3 \
-	GetFont.3 Tk_GetFont.3 \
-	GetFont.3 Tk_GetFontFromObj.3 \
-	GetFont.3 Tk_NameOfFont.3 \
-	GetFont.3 Tk_FreeFontFromObj.3 \
-	GetFont.3 Tk_FreeFont.3 \
-	GetGC.3 Tk_GetGC.3 \
-	GetGC.3 Tk_FreeGC.3 \
-	GetHINSTANCE.3 Tk_GetHINSTANCE.3 \
-	GetHWND.3 Tk_GetHWND.3 \
-	GetImage.3 Tk_GetImage.3 \
-	GetImage.3 Tk_RedrawImage.3 \
-	GetImage.3 Tk_SizeOfImage.3 \
-	GetImage.3 Tk_FreeImage.3 \
-	GetJoinStl.3 Tk_GetJoinStyle.3 \
-	GetJoinStl.3 Tk_NameOfJoinStyle.3 \
-	GetJustify.3 Tk_GetJustifyFromObj.3 \
-	GetJustify.3 Tk_GetJustify.3 \
-	GetJustify.3 Tk_NameOfJustify.3 \
-	GetOption.3 Tk_GetOption.3 \
-	GetPixels.3 Tk_GetPixelsFromObj.3 \
-	GetPixels.3 Tk_GetPixels.3 \
-	GetPixels.3 Tk_GetMMFromObj.3 \
-	GetPixels.3 Tk_GetScreenMM.3 \
-	GetPixmap.3 Tk_GetPixmap.3 \
-	GetPixmap.3 Tk_FreePixmap.3 \
-	GetRelief.3 Tk_GetReliefFromObj.3 \
-	GetRelief.3 Tk_GetRelief.3 \
-	GetRelief.3 Tk_NameOfRelief.3 \
-	GetRootCrd.3 Tk_GetRootCoords.3 \
-	GetScroll.3 Tk_GetScrollInfo.3 \
-	GetScroll.3 Tk_GetScrollInfoObj.3 \
-	GetSelect.3 Tk_GetSelection.3 \
-	GetUid.3 Tk_GetUid.3 \
-	GetUid.3 Tk_Uid.3 \
-	GetVRoot.3 Tk_GetVRootGeometry.3 \
-	GetVisual.3 Tk_GetVisual.3 \
-	Grab.3 Tk_Grab.3 \
-	Grab.3 Tk_Ungrab.3 \
-	HWNDToWindow.3 Tk_HWNDToWindow.3 \
-	HandleEvent.3 Tk_HandleEvent.3 \
-	IdToWindow.3 Tk_IdToWindow.3 \
-	ImgChanged.3 Tk_ImageChanged.3 \
-	InternAtom.3 Tk_InternAtom.3 \
-	InternAtom.3 Tk_GetAtomName.3 \
-	MainLoop.3 Tk_MainLoop.3 \
-	MainWin.3 Tk_MainWindow.3 \
-	MainWin.3 Tk_GetNumMainWindows.3 \
-	MaintGeom.3 Tk_MaintainGeometry.3 \
-	MaintGeom.3 Tk_UnmaintainGeometry.3 \
-	ManageGeom.3 Tk_ManageGeometry.3 \
-	MapWindow.3 Tk_MapWindow.3 \
-	MapWindow.3 Tk_UnmapWindow.3 \
-	MeasureChar.3 Tk_MeasureChars.3 \
-	MeasureChar.3 Tk_TextWidth.3 \
-	MeasureChar.3 Tk_DrawChars.3 \
-	MeasureChar.3 Tk_UnderlineChars.3 \
-	MoveToplev.3 Tk_MoveToplevelWindow.3 \
-	Name.3 Tk_Name.3 \
-	Name.3 Tk_PathName.3 \
-	Name.3 Tk_NameToWindow.3 \
-	NameOfImg.3 Tk_NameOfImage.3 \
-	OwnSelect.3 Tk_OwnSelection.3 \
-	ParseArgv.3 Tk_ParseArgv.3 \
-	QWinEvent.3 Tk_CollapseMotionEvents.3 \
-	QWinEvent.3 Tk_QueueWindowEvent.3 \
-	Restack.3 Tk_RestackWindow.3 \
-	RestrictEv.3 Tk_RestrictEvents.3 \
-	SetAppName.3 Tk_SetAppName.3 \
-	SetCaret.3 Tk_SetCaretPos.3 \
-	SetClass.3 Tk_SetClass.3 \
-	SetClass.3 Tk_Class.3 \
-	SetClassProcs.3 Tk_SetClassProcs.3 \
-	SetGrid.3 Tk_SetGrid.3 \
-	SetGrid.3 Tk_UnsetGrid.3 \
-	SetOptions.3 Tk_CreateOptionTable.3 \
-	SetOptions.3 Tk_DeleteOptionTable.3 \
-	SetOptions.3 Tk_InitOptions.3 \
-	SetOptions.3 Tk_SetOptions.3 \
-	SetOptions.3 Tk_FreeSavedOptions.3 \
-	SetOptions.3 Tk_RestoreSavedOptions.3 \
-	SetOptions.3 Tk_GetOptionValue.3 \
-	SetOptions.3 Tk_GetOptionInfo.3 \
-	SetOptions.3 Tk_FreeConfigOptions.3 \
-	SetOptions.3 Tk_Offset.3 \
-	SetVisual.3 Tk_SetWindowVisual.3 \
-	StrictMotif.3 Tk_StrictMotif.3 \
-	TextLayout.3 Tk_ComputeTextLayout.3 \
-	TextLayout.3 Tk_FreeTextLayout.3 \
-	TextLayout.3 Tk_DrawTextLayout.3 \
-	TextLayout.3 Tk_UnderlineTextLayout.3 \
-	TextLayout.3 Tk_PointToChar.3 \
-	TextLayout.3 Tk_CharBbox.3 \
-	TextLayout.3 Tk_DistanceToTextLayout.3 \
-	TextLayout.3 Tk_IntersectTextLayout.3 \
-	TextLayout.3 Tk_TextLayoutToPostscript.3 \
-	TkInitStubs.3 Tk_InitStubs.3 \
-	Tk_Init.3 Tk_SafeInit.3 \
-	WindowId.3 Tk_WindowId.3 \
-	WindowId.3 Tk_Parent.3 \
-	WindowId.3 Tk_Display.3 \
-	WindowId.3 Tk_DisplayName.3 \
-	WindowId.3 Tk_ScreenNumber.3 \
-	WindowId.3 Tk_Screen.3 \
-	WindowId.3 Tk_X.3 \
-	WindowId.3 Tk_Y.3 \
-	WindowId.3 Tk_Width.3 \
-	WindowId.3 Tk_Height.3 \
-	WindowId.3 Tk_Changes.3 \
-	WindowId.3 Tk_Attributes.3 \
-	WindowId.3 Tk_IsContainer.3 \
-	WindowId.3 Tk_IsEmbedded.3 \
-	WindowId.3 Tk_IsMapped.3 \
-	WindowId.3 Tk_IsTopLevel.3 \
-	WindowId.3 Tk_ReqWidth.3 \
-	WindowId.3 Tk_ReqHeight.3 \
-	WindowId.3 Tk_MinReqWidth.3 \
-	WindowId.3 Tk_MinReqHeight.3 \
-	WindowId.3 Tk_InternalBorderLeft.3 \
-	WindowId.3 Tk_InternalBorderRight.3 \
-	WindowId.3 Tk_InternalBorderTop.3 \
-	WindowId.3 Tk_InternalBorderBottom.3 \
-	WindowId.3 Tk_Visual.3 \
-	WindowId.3 Tk_Depth.3 \
-	WindowId.3 Tk_Colormap.3 \
-	chooseColor.n tk_chooseColor.n \
-	chooseDirectory.n tk_chooseDirectory.n \
-	dialog.n tk_dialog.n \
-	focusNext.n tk_focusNext.n \
-	focusNext.n tk_focusPrev.n \
-	focusNext.n tk_focusFollowsMouse.n \
-	getOpenFile.n tk_getOpenFile.n \
-	getOpenFile.n tk_getSaveFile.n \
-	menu.n tk_menuSetFocus.n \
-	menubar.n tk_menuBar.n \
-	menubar.n tk_bindForTraversal.n \
-	messageBox.n tk_messageBox.n \
-	optionMenu.n tk_optionMenu.n \
-	palette.n tk_setPalette.n \
-	palette.n tk_bisque.n \
-	popup.n tk_popup.n \
-	text.n tk_textCopy.n \
-	text.n tk_textCut.n \
-	text.n tk_textPaste.n
-
+CONFIGURE_ARGS+=	--disable-threads
 .endif
 
-.endif  # defined(BUILDING_TK_THREADS)
-
-TKBASE?=	${PORTSDIR}/${PKGCATEGORY}/${LATEST_LINK}
-
-pre-everything::
-	@if ${TEST} -e "${NONEXISTENT}"; then ${ECHO_MSG} "=== Aborted, please remove ${NONEXISTENT}"; exit 1; fi
-
 post-patch:
 	@(cd ${WRKSRC}/..; ${PATCH} -p0 < ${PATCHDIR}/extra-lastevent-patch)
 	@${REINPLACE_CMD} -e 's|X11/Intrinsic.h|X11/Xlib.h|g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|@TK_SHARED_BUILD@|#@TK_SHARED_BUILD@|g' ${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e 's|wish |wish${TCL_VER}${THREADS_SUFFIX} |g' -e 's|Wish |Wish${TCL_VER}${THREADS_SUFFIX} |g' \
-		-e 's|wish\\fR|wish${TCL_VER}${THREADS_SUFFIX}\\fR|g' -e 's|Wish\\fR|Wish${TCL_VER}${THREADS_SUFFIX}\\fR|g' \
-		-e 's|^.so man.macros|.so ${DATADIR}/man.macros|' \
-		${WRKSRC}/../doc/wish.1
-.if defined(BUILDING_TK_THREADS)
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \
-		-e 's|$${TCL_TRIM_DOTS}|$${TCL_TRIM_DOTS}${THREADS_SUFFIX}|g' \
-		-e 's|-ltk$${VERSION}|-ltk$${VERSION}${THREADS_SUFFIX}|g' \
-		-e 's/-ltk`echo $${VERSION} | tr -d .`/-ltk`echo $${VERSION} | tr -d .`${THREADS_SUFFIX}/g' \
-		-e 's|-ltkstub$${TK_VERSION}|-ltkstub$${TK_VERSION}${THREADS_SUFFIX}|g' \
-		-e 's/-ltkstub`echo $${TK_VERSION} | tr -d .`/-ltkstub`echo $${TK_VERSION} | tr -d .`${THREADS_SUFFIX}/g' \
-		${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|libtk$${SHORT_TK_VER}|libtk$${SHORT_TK_VER}${THREADS_SUFFIX}|g' \
-		-e 's|$$(BIN_INSTALL_DIR)/wish$$(VERSION)|$$(BIN_INSTALL_DIR)/wish$$(VERSION)${THREADS_SUFFIX}|g' \
-		-e 's|tk$$(VERSION)/tkConfig.sh|tk$$(VERSION)/tkConfig${THREADS_SUFFIX}.sh|g' \
-		-e 's|$$(LIB_INSTALL_DIR)$$(TK_PKG_DIR)|${WRKDIR}|g' \
-		-e 's|$$(MINOR_VERSION)$$(TCLPATCHL)|$$(MINOR_VERSION)$$(TCLPATCHL)${THREADS_SUFFIX}|g' \
-		${WRKSRC}/Makefile.in
-.endif
 
 post-configure:
-	${REINPLACE_CMD} \
-		-e 's|${WRKDIRPREFIX}${.CURDIR}|$${WRKDIRPREFIX}${TKBASE}|' \
+	${REINPLACE_CMD} -e 's|${WRKDIRPREFIX}${.CURDIR}|$${WRKDIRPREFIX}${TKBASE}|' \
 		${WRKSRC}/tkConfig.sh
 
-.if defined(BUILDING_TK_THREADS)
-do-install:
-	@cd ${WRKSRC} && ${MAKE_ENV} ${MAKE} -f Makefile install-binaries
-	@${MKDIR} ${PREFIX}/lib/tk${TK_VER}${THREADS_SUFFIX}
-	@${LN} -sf ${PREFIX}/lib/tk${TK_VER}/tkConfig${THREADS_SUFFIX}.sh \
-		${PREFIX}/lib/tk${TK_VER}${THREADS_SUFFIX}/tkConfig.sh
-.endif
-
 post-install:
-	${INSTALL_DATA} ${WRKDIR}/pkgIndex.tcl ${PREFIX}/lib/tk${TK_VER}${THREADS_SUFFIX}/
-	${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/../doc/man.macros ${DATADIR}
-.if !defined(NO_INSTALL_MANPAGES)
-	${MKDIR} ${MANPREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/../doc/wish.1 ${MANPREFIX}/man/man1/wish${TCL_VER}${THREADS_SUFFIX}.1
-.if !defined(BUILDING_TK_THREADS) && ${PORT_OPTIONS:MTK84_DOC}
-.for mp in ${MAN3} ${MANN}
-	@${REINPLACE_CMD} -e 's|^.so man.macros|.so ${DATADIR}/man.macros|'	\
-		${WRKSRC}/../doc/${mp}
-.endfor
-	@cd ${WRKSRC} && ${MAKE} install-doc ${MAKE_ENV}
-.endif # !defined(BUILDING_TK_THREADS) && ${PORT_OPTIONS:MTK84_DOC}
-
-.endif # !defined(NO_INSTALL_MANPAGES)
+	${INSTALL_DATA} ${WRKDIR}/pkgIndex.tcl ${PREFIX}/lib/tk${TK_VER}/
 
 regression-test:	build
 	cd ${WRKSRC}; ${MAKE} test
 	${ECHO_CMD} "package require Tk" | tclsh${TK_VER}
 	${ECHO_CMD} "load libtk${SHORT_TK_VER}.so" | tclsh${TK_VER}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-toolkits/tk84/files/patch-ab b/x11-toolkits/tk84/files/patch-ab
index 811954ede3d..2f2adc90052 100644
--- a/x11-toolkits/tk84/files/patch-ab
+++ b/x11-toolkits/tk84/files/patch-ab
@@ -1,5 +1,5 @@
 --- Makefile.in.orig	2008-04-17 17:14:08.000000000 +0200
-+++ Makefile.in	2009-02-26 12:06:12.362017966 +0100
++++ Makefile.in	2013-01-11 14:38:01.000000000 +0100
 @@ -64,6 +64,8 @@
  
  # Directory in which to install the include file tk.h:
@@ -131,28 +131,11 @@
  	@list='$(@TK_WINDOWINGSYSTEM@_XLIB_HDRS)'; for i in $$list ; \
  	    do \
  	    $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR)/X11; \
-@@ -749,20 +769,10 @@
- 		else true; \
+@@ -750,6 +770,7 @@
  		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); \
--	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); \
--	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); \
--	done
-+	@echo "Installing C API (.3) docs";
-+	${BSD_INSTALL_MAN} $(TOP_DIR)/doc/*.3 $(MAN3_INSTALL_DIR)
-+	@echo "Installing command (.n) docs";
-+	${BSD_INSTALL_MAN} $(TOP_DIR)/doc/*.n $(MANN_INSTALL_DIR)
- 
- # Optional target to install private headers
- install-private-headers: libraries
+ 	@echo "Installing and cross-linking top-level (.1) docs";
++	@mv $(TOP_DIR)/doc/wish.1 $(TOP_DIR)/doc/wish${TCL_VER}.1
+ 	@for i in $(TOP_DIR)/doc/*.1; do \
+ 	    $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i $(MAN1_INSTALL_DIR); \
+ 	done
diff --git a/x11-toolkits/tk84/files/pkgIndex.tcl.in b/x11-toolkits/tk84/files/pkgIndex.tcl.in
index 903d6a2f0e6..aa7f7941f50 100644
--- a/x11-toolkits/tk84/files/pkgIndex.tcl.in
+++ b/x11-toolkits/tk84/files/pkgIndex.tcl.in
@@ -1,3 +1,3 @@
 # Tcl package index file, version 1.0
 
-package ifneeded Tk%%THREADS_SUFFIX%% 8.4 "[list load "[file join [file dirname $dir] libtk84%%THREADS_SUFFIX%%.so.1]" Tk]%%TK_PROVIDE%%"
+package ifneeded Tk 8.4 "[list load "[file join [file dirname $dir] libtk84.so.1]" Tk]"
diff --git a/x11-toolkits/tk84/pkg-plist b/x11-toolkits/tk84/pkg-plist
index 09c11b9a4ba..e2ddf4b94db 100644
--- a/x11-toolkits/tk84/pkg-plist
+++ b/x11-toolkits/tk84/pkg-plist
@@ -159,8 +159,6 @@ lib/tk%%TK_VER%%/tkConfig.sh
 lib/tk%%TK_VER%%/tkfbox.tcl
 lib/tk%%TK_VER%%/unsupported.tcl
 lib/tk%%TK_VER%%/xmfbox.tcl
-%%DATADIR%%/man.macros
-@dirrm %%DATADIR%%
 @dirrm lib/tk%%TK_VER%%/demos/images
 @dirrm lib/tk%%TK_VER%%/demos
 @dirrm lib/tk%%TK_VER%%/images
diff --git a/x11-toolkits/tk84/pkg-plist.threads b/x11-toolkits/tk84/pkg-plist.threads
deleted file mode 100644
index e8dcd7da52b..00000000000
--- a/x11-toolkits/tk84/pkg-plist.threads
+++ /dev/null
@@ -1,9 +0,0 @@
-bin/wish%%TK_VER%%-threads
-lib/libtk%%SHORT_TK_VER%%-threads.a
-lib/libtk%%SHORT_TK_VER%%-threads.so
-lib/libtk%%SHORT_TK_VER%%-threads.so.1
-lib/libtkstub%%SHORT_TK_VER%%-threads.a
-lib/tk%%TK_VER%%/tkConfig-threads.sh
-lib/tk%%TK_VER%%-threads/tkConfig.sh
-lib/tk%%TK_VER%%-threads/pkgIndex.tcl
-@dirrm lib/tk%%TK_VER%%-threads
diff --git a/x11-toolkits/tk85-thread/Makefile b/x11-toolkits/tk85-thread/Makefile
deleted file mode 100644
index d0f6ce8128c..00000000000
--- a/x11-toolkits/tk85-thread/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# New ports collection makefile for:	tk85-thread
-# Date created:				09 March 2007
-# Whom:					Martin Matuska <mm@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	tk
-
-MAINTAINER=	tcltk@FreeBSD.org
-COMMENT=	Graphical toolkit for Tcl (threads support)
-
-BUILDING_TK_THREADS=	yes
-
-MASTERDIR=	${.CURDIR}/../tk85
-
-.include "${MASTERDIR}/Makefile"
diff --git a/x11-toolkits/tk85/Makefile b/x11-toolkits/tk85/Makefile
index 9256058bac6..055c58d6eff 100644
--- a/x11-toolkits/tk85/Makefile
+++ b/x11-toolkits/tk85/Makefile
@@ -5,24 +5,32 @@ PORTNAME=	tk
 PORTVERSION=	8.5.13
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	SF/tcl/Tcl/${PORTVERSION}
-PKGNAMESUFFIX?=	${THREADS_SUFFIX}
 DISTNAME=	${PORTNAME}${PORTVERSION}-src
 
 MAINTAINER=	tcltk@FreeBSD.org
-COMMENT?=	Graphical toolkit for Tcl
+COMMENT=	Graphical toolkit for Tcl
 
 LICENSE=	BSD
+
 LICENSE_TERMS=	${WRKSRC}/../license.terms
 
-LATEST_LINK?=	tk85
+LATEST_LINK=	tk85
 USE_XORG=	x11
 USE_LDCONFIG=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//}/unix
 GNU_CONFIGURE=	yes
 TK_VER=		8.5
 SHORT_TK_VER=	85
-CONFIGURE_ARGS=	--enable-shared --includedir=${PREFIX}/include/tk${TK_VER}
-CONFIGURE_ENV=	PORTSDIR=${PORTSDIR} TK_LIB_FILE=libtk${SHORT_TK_VER}.so.1
+CONFIGURE_ARGS=	--enable-shared --with-tcl=${TCL_LIBDIR} \
+		--includedir=${PREFIX}/include/tk${TK_VER} \
+		--enable-man-suffix=.${MAN_SUFFIX}
+CONFIGURE_ENV=	PORTSDIR=${PORTSDIR} TK_LIB_FILE=libtk${SHORT_TK_VER}.so.1 \
+		ac_cv_path_tclsh="${LOCALBASE}/bin/tclsh${TK_VER}"
+LATEST_LINK=	${PORTNAME}${SHORT_TK_VER}
+MAN_SUFFIX=	${LATEST_LINK}
+
+INSTALL_TARGET=	install
+
 MAKE_ENV=	SHORT_TK_VER=${SHORT_TK_VER}
 PLIST_SUB=	TK_VER=${TK_VER} SHORT_TK_VER=${SHORT_TK_VER}
 NOPRECIOUSMAKEVARS=	yes # Otherwise 'make readmes' is broken
@@ -32,24 +40,15 @@ SUB_FILES=	pkgIndex.tcl
 
 MAKE_JOBS_SAFE=	yes
 
-.if !defined(BUILDING_TK_THREADS)
 USE_TCL=	${SHORT_TK_VER}
 
-OPTIONS_DEFINE=	TK85_MAN XFT DEMOS
-OPTIONS_DEFAULT=	XFT
+OPTIONS_DEFINE=	TK85_MAN XFT DEMOS THREADS
+OPTIONS_DEFAULT=	XFT THREADS
 TK85_MAN_DESC=	Install tk 8.5 function manpages
 XFT_DESC=	Use Xft fonts
 DEMOS_DESC=	Install demos
 
-.else
-USE_TK=		${SHORT_TK_VER}
-PLIST=		${PKGDIR}/pkg-plist.threads
-THREADS_SUFFIX=	-threads
-LIB_DEPENDS=	tcl${SHORT_TK_VER}${THREADS_SUFFIX}:${PORTSDIR}/lang/tcl${SHORT_TK_VER}-thread
-.endif
-
-SUB_LIST+=	THREADS_SUFFIX="${THREADS_SUFFIX}" \
-		TCLPATCHLEVEL="${PORTVERSION}"
+SUB_LIST+=	TCLPATCHLEVEL="${PORTVERSION}"
 
 .include <bsd.port.pre.mk>
 
@@ -57,24 +56,18 @@ DATADIR=	${PREFIX}/share/${PORTNAME}${TCL_VER}
 
 .if ${PORT_OPTIONS:MXFT}
 CONFIGURE_ARGS+=	--enable-xft
-LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/libXft
+LIB_DEPENDS+=	Xft:${PORTSDIR}/x11-fonts/libXft
 .else
 CONFIGURE_ARGS+=	--disable-xft
 .endif
 
-MAN1=	wish${TCL_VER}${THREADS_SUFFIX}.1
-
-.if defined(BUILDING_TK_THREADS)
-CONFIGURE_ARGS+=	--enable-threads --with-tcl=${LOCALBASE}/lib/tcl${TK_VER}${THREADS_SUFFIX}
-CONFIGURE_ENV+=		PTHREAD_LIBS="${PTHREAD_LIBS}" PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
-			ac_cv_path_tclsh="${LOCALBASE}/bin/tclsh${TK_VER}${THREADS_SUFFIX}"
-LATEST_LINK=		tk85${THREADS_SUFFIX}
-SUB_LIST+=		TK_PROVIDE="; package provide Tk-threads ${TK_VER}"
+.if ${PORT_OPTIONS:MTHREADS}
+CONFIGURE_ARGS+=	--enable-threads
 .else
-CONFIGURE_ARGS+=	--disable-threads --with-tcl=${LOCALBASE}/lib/tcl${TK_VER} \
-			ac_cv_path_tclsh="${TCLSH}"
+CONFIGURE_ARGS+=	--disable-threads
+.endif
 
-SUB_LIST+=		TK_PROVIDE=""
+MAN1=	wish${TCL_VER}.1
 
 .if ${PORT_OPTIONS:MDEMOS}
 INSTALL_TARGET+=	install install-demos
@@ -84,352 +77,15 @@ PLIST_SUB+=	DEMOS="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MTK85_MAN}
-
-MAN3=	3DBorder.3 AddOption.3 BindTable.3 CanvPsY.3 CanvTkwin.3 \
-	CanvTxtInfo.3 Clipboard.3 ClrSelect.3 ConfigWidg.3 ConfigWind.3 \
-	CoordToWin.3 CrtConsoleChan.3 CrtCmHdlr.3 CrtErrHdlr.3 \
-	CrtGenHdlr.3 CrtImgType.3 \
-	CrtItemType.3 CrtPhImgFmt.3 CrtSelHdlr.3 CrtWindow.3 DeleteImg.3 \
-	DrawFocHlt.3 EventHndlr.3 FindPhoto.3 FontId.3 FreeXId.3 GeomReq.3 \
-	GetAnchor.3 GetBitmap.3 GetCapStyl.3 GetClrmap.3 GetColor.3 \
-	GetCursor.3 GetDash.3 GetFont.3 GetGC.3 GetHINSTANCE.3 GetHWND.3 \
-	GetImage.3 GetJoinStl.3 GetJustify.3 GetOption.3 GetPixels.3 \
-	GetPixmap.3 GetRelief.3 GetRootCrd.3 GetScroll.3 GetSelect.3 GetUid.3 \
-	GetVRoot.3 GetVisual.3 Grab.3 HWNDToWindow.3 HandleEvent.3 \
-	IdToWindow.3 ImgChanged.3 Inactive.3 InternAtom.3 MainLoop.3 MainWin.3 \
-	MaintGeom.3 ManageGeom.3 MapWindow.3 MeasureChar.3 MoveToplev.3 \
-	Name.3 NameOfImg.3 OwnSelect.3 ParseArgv.3 QWinEvent.3 Restack.3 \
-	RestrictEv.3 SetAppName.3 SetCaret.3 SetClass.3 SetClassProcs.3 \
-	SetGrid.3 SetOptions.3 SetVisual.3 StrictMotif.3 TextLayout.3 \
-	Tk_Init.3 Tk_Main.3 TkInitStubs.3 WindowId.3 ttk_Geometry.3 \
-	ttk_Theme.3
-
-MANN=	bell.n bind.n bindtags.n bitmap.n button.n canvas.n checkbutton.n \
-	chooseColor.n chooseDirectory.n clipboard.n colors.n console.n \
-	cursors.n destroy.n dialog.n entry.n event.n focus.n focusNext.n \
-	font.n frame.n getOpenFile.n grab.n grid.n keysyms.n image.n label.n \
-	labelframe.n listbox.n loadTk.n lower.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 ttk_progressbar.n ttk_radiobutton.n \
-	ttk_scale.n ttk_scrollbar.n ttk_separator.n ttk_sizegrip.n \
-	ttk_spinbox.n ttk_style.n ttk_treeview.n ttk_vsapi.n ttk_widget.n
-
-# MLINKS generated via  awk '/ln/ {print "\t" $2,$3,"\\"}' unix/mkLinks
-MLINKS=	3DBorder.3 Tk_Alloc3DBorderFromObj.3 \
-	3DBorder.3 Tk_Get3DBorder.3 \
-	3DBorder.3 Tk_Get3DBorderFromObj.3 \
-	3DBorder.3 Tk_Draw3DRectangle.3 \
-	3DBorder.3 Tk_Fill3DRectangle.3 \
-	3DBorder.3 Tk_Draw3DPolygon.3 \
-	3DBorder.3 Tk_Fill3DPolygon.3 \
-	3DBorder.3 Tk_3DVerticalBevel.3 \
-	3DBorder.3 Tk_3DHorizontalBevel.3 \
-	3DBorder.3 Tk_SetBackgroundFromBorder.3 \
-	3DBorder.3 Tk_NameOf3DBorder.3 \
-	3DBorder.3 Tk_3DBorderColor.3 \
-	3DBorder.3 Tk_3DBorderGC.3 \
-	3DBorder.3 Tk_Free3DBorderFromObj.3 \
-	3DBorder.3 Tk_Free3DBorder.3 \
-	AddOption.3 Tk_AddOption.3 \
-	BindTable.3 Tk_CreateBindingTable.3 \
-	BindTable.3 Tk_DeleteBindingTable.3 \
-	BindTable.3 Tk_CreateBinding.3 \
-	BindTable.3 Tk_DeleteBinding.3 \
-	BindTable.3 Tk_GetBinding.3 \
-	BindTable.3 Tk_GetAllBindings.3 \
-	BindTable.3 Tk_DeleteAllBindings.3 \
-	BindTable.3 Tk_BindEvent.3 \
-	CanvPsY.3 Tk_CanvasPsY.3 \
-	CanvPsY.3 Tk_CanvasPsBitmap.3 \
-	CanvPsY.3 Tk_CanvasPsColor.3 \
-	CanvPsY.3 Tk_CanvasPsFont.3 \
-	CanvPsY.3 Tk_CanvasPsPath.3 \
-	CanvPsY.3 Tk_CanvasPsStipple.3 \
-	CanvTkwin.3 Tk_CanvasTkwin.3 \
-	CanvTkwin.3 Tk_CanvasGetCoord.3 \
-	CanvTkwin.3 Tk_CanvasDrawableCoords.3 \
-	CanvTkwin.3 Tk_CanvasSetStippleOrigin.3 \
-	CanvTkwin.3 Tk_CanvasWindowCoords.3 \
-	CanvTkwin.3 Tk_CanvasEventuallyRedraw.3 \
-	CanvTkwin.3 Tk_CanvasTagsOption.3 \
-	CanvTxtInfo.3 Tk_CanvasGetTextInfo.3 \
-	CanvTxtInfo.3 Tk_CanvasTextInfo.3 \
-	Clipboard.3 Tk_ClipboardClear.3 \
-	Clipboard.3 Tk_ClipboardAppend.3 \
-	ClrSelect.3 Tk_ClearSelection.3 \
-	ConfigWidg.3 Tk_ConfigureWidget.3 \
-	ConfigWidg.3 Tk_ConfigureInfo.3 \
-	ConfigWidg.3 Tk_ConfigureValue.3 \
-	ConfigWidg.3 Tk_FreeOptions.3 \
-	ConfigWind.3 Tk_ConfigureWindow.3 \
-	ConfigWind.3 Tk_MoveWindow.3 \
-	ConfigWind.3 Tk_ResizeWindow.3 \
-	ConfigWind.3 Tk_MoveResizeWindow.3 \
-	ConfigWind.3 Tk_SetWindowBorderWidth.3 \
-	ConfigWind.3 Tk_ChangeWindowAttributes.3 \
-	ConfigWind.3 Tk_SetWindowBackground.3 \
-	ConfigWind.3 Tk_SetWindowBackgroundPixmap.3 \
-	ConfigWind.3 Tk_SetWindowBorder.3 \
-	ConfigWind.3 Tk_SetWindowBorderPixmap.3 \
-	ConfigWind.3 Tk_SetWindowColormap.3 \
-	ConfigWind.3 Tk_DefineCursor.3 \
-	ConfigWind.3 Tk_UndefineCursor.3 \
-	CoordToWin.3 Tk_CoordsToWindow.3 \
-	CrtCmHdlr.3 Tk_CreateClientMessageHandler.3 \
-	CrtCmHdlr.3 Tk_DeleteClientMessageHandler.3 \
-	CrtErrHdlr.3 Tk_CreateErrorHandler.3 \
-	CrtErrHdlr.3 Tk_DeleteErrorHandler.3 \
-	CrtGenHdlr.3 Tk_CreateGenericHandler.3 \
-	CrtGenHdlr.3 Tk_DeleteGenericHandler.3 \
-	CrtImgType.3 Tk_CreateImageType.3 \
-	CrtImgType.3 Tk_GetImageMasterData.3 \
-	CrtImgType.3 Tk_InitImageArgs.3 \
-	CrtItemType.3 Tk_CreateItemType.3 \
-	CrtItemType.3 Tk_GetItemTypes.3 \
-	CrtPhImgFmt.3 Tk_CreatePhotoImageFormat.3 \
-	CrtSelHdlr.3 Tk_CreateSelHandler.3 \
-	CrtSelHdlr.3 Tk_DeleteSelHandler.3 \
-	CrtWindow.3 Tk_CreateWindow.3 \
-	CrtWindow.3 Tk_CreateAnonymousWindow.3 \
-	CrtWindow.3 Tk_CreateWindowFromPath.3 \
-	CrtWindow.3 Tk_DestroyWindow.3 \
-	CrtWindow.3 Tk_MakeWindowExist.3 \
-	DeleteImg.3 Tk_DeleteImage.3 \
-	DrawFocHlt.3 Tk_DrawFocusHighlight.3 \
-	EventHndlr.3 Tk_CreateEventHandler.3 \
-	EventHndlr.3 Tk_DeleteEventHandler.3 \
-	FindPhoto.3 Tk_FindPhoto.3 \
-	FindPhoto.3 Tk_PhotoPutBlock.3 \
-	FindPhoto.3 Tk_PhotoPutZoomedBlock.3 \
-	FindPhoto.3 Tk_PhotoGetImage.3 \
-	FindPhoto.3 Tk_PhotoBlank.3 \
-	FindPhoto.3 Tk_PhotoExpand.3 \
-	FindPhoto.3 Tk_PhotoGetSize.3 \
-	FindPhoto.3 Tk_PhotoSetSize.3 \
-	FontId.3 Tk_FontId.3 \
-	FontId.3 Tk_GetFontMetrics.3 \
-	FontId.3 Tk_PostscriptFontName.3 \
-	FreeXId.3 Tk_FreeXId.3 \
-	GeomReq.3 Tk_GeometryRequest.3 \
-	GeomReq.3 Tk_SetMinimumRequestSize.3 \
-	GeomReq.3 Tk_SetInternalBorder.3 \
-	GeomReq.3 Tk_SetInternalBorderEx.3 \
-	GetAnchor.3 Tk_GetAnchorFromObj.3 \
-	GetAnchor.3 Tk_GetAnchor.3 \
-	GetAnchor.3 Tk_NameOfAnchor.3 \
-	GetBitmap.3 Tk_AllocBitmapFromObj.3 \
-	GetBitmap.3 Tk_GetBitmap.3 \
-	GetBitmap.3 Tk_GetBitmapFromObj.3 \
-	GetBitmap.3 Tk_DefineBitmap.3 \
-	GetBitmap.3 Tk_NameOfBitmap.3 \
-	GetBitmap.3 Tk_SizeOfBitmap.3 \
-	GetBitmap.3 Tk_FreeBitmapFromObj.3 \
-	GetBitmap.3 Tk_FreeBitmap.3 \
-	GetCapStyl.3 Tk_GetCapStyle.3 \
-	GetCapStyl.3 Tk_NameOfCapStyle.3 \
-	GetClrmap.3 Tk_GetColormap.3 \
-	GetClrmap.3 Tk_FreeColormap.3 \
-	GetColor.3 Tk_AllocColorFromObj.3 \
-	GetColor.3 Tk_GetColor.3 \
-	GetColor.3 Tk_GetColorFromObj.3 \
-	GetColor.3 Tk_GetColorByValue.3 \
-	GetColor.3 Tk_NameOfColor.3 \
-	GetColor.3 Tk_GCForColor.3 \
-	GetColor.3 Tk_FreeColorFromObj.3 \
-	GetColor.3 Tk_FreeColor.3 \
-	GetCursor.3 Tk_AllocCursorFromObj.3 \
-	GetCursor.3 Tk_GetCursor.3 \
-	GetCursor.3 Tk_GetCursorFromObj.3 \
-	GetCursor.3 Tk_GetCursorFromData.3 \
-	GetCursor.3 Tk_NameOfCursor.3 \
-	GetCursor.3 Tk_FreeCursorFromObj.3 \
-	GetCursor.3 Tk_FreeCursor.3 \
-	GetDash.3 Tk_GetDash.3 \
-	GetFont.3 Tk_AllocFontFromObj.3 \
-	GetFont.3 Tk_GetFont.3 \
-	GetFont.3 Tk_GetFontFromObj.3 \
-	GetFont.3 Tk_NameOfFont.3 \
-	GetFont.3 Tk_FreeFontFromObj.3 \
-	GetFont.3 Tk_FreeFont.3 \
-	GetGC.3 Tk_GetGC.3 \
-	GetGC.3 Tk_FreeGC.3 \
-	GetHINSTANCE.3 Tk_GetHINSTANCE.3 \
-	GetHWND.3 Tk_AttachHWND.3 \
-	GetHWND.3 Tk_GetHWND.3 \
-	GetImage.3 Tk_GetImage.3 \
-	GetImage.3 Tk_RedrawImage.3 \
-	GetImage.3 Tk_SizeOfImage.3 \
-	GetImage.3 Tk_FreeImage.3 \
-	GetJoinStl.3 Tk_GetJoinStyle.3 \
-	GetJoinStl.3 Tk_NameOfJoinStyle.3 \
-	GetJustify.3 Tk_GetJustifyFromObj.3 \
-	GetJustify.3 Tk_GetJustify.3 \
-	GetJustify.3 Tk_NameOfJustify.3 \
-	GetOption.3 Tk_GetOption.3 \
-	GetPixels.3 Tk_GetPixelsFromObj.3 \
-	GetPixels.3 Tk_GetPixels.3 \
-	GetPixels.3 Tk_GetMMFromObj.3 \
-	GetPixels.3 Tk_GetScreenMM.3 \
-	GetPixmap.3 Tk_GetPixmap.3 \
-	GetPixmap.3 Tk_FreePixmap.3 \
-	GetRelief.3 Tk_GetReliefFromObj.3 \
-	GetRelief.3 Tk_GetRelief.3 \
-	GetRelief.3 Tk_NameOfRelief.3 \
-	GetRootCrd.3 Tk_GetRootCoords.3 \
-	GetScroll.3 Tk_GetScrollInfo.3 \
-	GetScroll.3 Tk_GetScrollInfoObj.3 \
-	GetSelect.3 Tk_GetSelection.3 \
-	GetUid.3 Tk_GetUid.3 \
-	GetUid.3 Tk_Uid.3 \
-	GetVRoot.3 Tk_GetVRootGeometry.3 \
-	GetVisual.3 Tk_GetVisual.3 \
-	Grab.3 Tk_Grab.3 \
-	Grab.3 Tk_Ungrab.3 \
-	HWNDToWindow.3 Tk_HWNDToWindow.3 \
-	HandleEvent.3 Tk_HandleEvent.3 \
-	IdToWindow.3 Tk_IdToWindow.3 \
-	ImgChanged.3 Tk_ImageChanged.3 \
-	Inactive.3 Tk_GetUserInactiveTime.3 \
-	Inactive.3 Tk_ResetUserInactiveTime.3 \
-	InternAtom.3 Tk_InternAtom.3 \
-	InternAtom.3 Tk_GetAtomName.3 \
-	MainLoop.3 Tk_MainLoop.3 \
-	MainWin.3 Tk_MainWindow.3 \
-	MainWin.3 Tk_GetNumMainWindows.3 \
-	MaintGeom.3 Tk_MaintainGeometry.3 \
-	MaintGeom.3 Tk_UnmaintainGeometry.3 \
-	ManageGeom.3 Tk_ManageGeometry.3 \
-	MapWindow.3 Tk_MapWindow.3 \
-	MapWindow.3 Tk_UnmapWindow.3 \
-	MeasureChar.3 Tk_MeasureChars.3 \
-	MeasureChar.3 Tk_TextWidth.3 \
-	MeasureChar.3 Tk_DrawChars.3 \
-	MeasureChar.3 Tk_UnderlineChars.3 \
-	MoveToplev.3 Tk_MoveToplevelWindow.3 \
-	Name.3 Tk_Name.3 \
-	Name.3 Tk_PathName.3 \
-	Name.3 Tk_NameToWindow.3 \
-	NameOfImg.3 Tk_NameOfImage.3 \
-	OwnSelect.3 Tk_OwnSelection.3 \
-	ParseArgv.3 Tk_ParseArgv.3 \
-	QWinEvent.3 Tk_CollapseMotionEvents.3 \
-	QWinEvent.3 Tk_QueueWindowEvent.3 \
-	Restack.3 Tk_RestackWindow.3 \
-	RestrictEv.3 Tk_RestrictEvents.3 \
-	SetAppName.3 Tk_SetAppName.3 \
-	SetCaret.3 Tk_SetCaretPos.3 \
-	SetClass.3 Tk_SetClass.3 \
-	SetClass.3 Tk_Class.3 \
-	SetClassProcs.3 Tk_SetClassProcs.3 \
-	SetGrid.3 Tk_SetGrid.3 \
-	SetGrid.3 Tk_UnsetGrid.3 \
-	SetOptions.3 Tk_CreateOptionTable.3 \
-	SetOptions.3 Tk_DeleteOptionTable.3 \
-	SetOptions.3 Tk_InitOptions.3 \
-	SetOptions.3 Tk_SetOptions.3 \
-	SetOptions.3 Tk_FreeSavedOptions.3 \
-	SetOptions.3 Tk_RestoreSavedOptions.3 \
-	SetOptions.3 Tk_GetOptionValue.3 \
-	SetOptions.3 Tk_GetOptionInfo.3 \
-	SetOptions.3 Tk_FreeConfigOptions.3 \
-	SetOptions.3 Tk_Offset.3 \
-	SetVisual.3 Tk_SetWindowVisual.3 \
-	StrictMotif.3 Tk_StrictMotif.3 \
-	TextLayout.3 Tk_ComputeTextLayout.3 \
-	TextLayout.3 Tk_FreeTextLayout.3 \
-	TextLayout.3 Tk_DrawTextLayout.3 \
-	TextLayout.3 Tk_UnderlineTextLayout.3 \
-	TextLayout.3 Tk_PointToChar.3 \
-	TextLayout.3 Tk_CharBbox.3 \
-	TextLayout.3 Tk_DistanceToTextLayout.3 \
-	TextLayout.3 Tk_IntersectTextLayout.3 \
-	TextLayout.3 Tk_TextLayoutToPostscript.3 \
-	TkInitStubs.3 Tk_InitStubs.3 \
-	Tk_Init.3 Tk_SafeInit.3 \
-	WindowId.3 Tk_WindowId.3 \
-	WindowId.3 Tk_Parent.3 \
-	WindowId.3 Tk_Display.3 \
-	WindowId.3 Tk_DisplayName.3 \
-	WindowId.3 Tk_ScreenNumber.3 \
-	WindowId.3 Tk_Screen.3 \
-	WindowId.3 Tk_X.3 \
-	WindowId.3 Tk_Y.3 \
-	WindowId.3 Tk_Width.3 \
-	WindowId.3 Tk_Height.3 \
-	WindowId.3 Tk_Changes.3 \
-	WindowId.3 Tk_Attributes.3 \
-	WindowId.3 Tk_IsContainer.3 \
-	WindowId.3 Tk_IsEmbedded.3 \
-	WindowId.3 Tk_IsMapped.3 \
-	WindowId.3 Tk_IsTopLevel.3 \
-	WindowId.3 Tk_ReqWidth.3 \
-	WindowId.3 Tk_ReqHeight.3 \
-	WindowId.3 Tk_MinReqWidth.3 \
-	WindowId.3 Tk_MinReqHeight.3 \
-	WindowId.3 Tk_InternalBorderLeft.3 \
-	WindowId.3 Tk_InternalBorderRight.3 \
-	WindowId.3 Tk_InternalBorderTop.3 \
-	WindowId.3 Tk_InternalBorderBottom.3 \
-	WindowId.3 Tk_Visual.3 \
-	WindowId.3 Tk_Depth.3 \
-	WindowId.3 Tk_Colormap.3 \
-	WindowId.3 Tk_Interp.3 \
-	chooseColor.n tk_chooseColor.n \
-	chooseDirectory.n tk_chooseDirectory.n \
-	dialog.n tk_dialog.n \
-	focusNext.n tk_focusNext.n \
-	focusNext.n tk_focusPrev.n \
-	focusNext.n tk_focusFollowsMouse.n \
-	getOpenFile.n tk_getOpenFile.n \
-	getOpenFile.n tk_getSaveFile.n \
-	menu.n tk_menuSetFocus.n \
-	menubar.n tk_menuBar.n \
-	menubar.n tk_bindForTraversal.n \
-	messageBox.n tk_messageBox.n \
-	optionMenu.n tk_optionMenu.n \
-	palette.n tk_setPalette.n \
-	palette.n tk_bisque.n \
-	popup.n tk_popup.n \
-	text.n tk_textCopy.n \
-	text.n tk_textCut.n \
-	text.n tk_textPaste.n
-
-.endif	# ${PORT_OPTIONS:MTK85_MAN}
-
-.endif	# defined(BUILDING_TK_THREADS)
+INSTALL_TARGET+=install-doc
+.include "${.CURDIR}/Makefile.man"
+.endif
 
 TKBASE?=	${PORTSDIR}/${PKGCATEGORY}/${LATEST_LINK}
 
-pre-everything::
-	@if ${TEST} -e "${NONEXISTENT}"; then ${ECHO_MSG} "=== Aborted, please remove ${NONEXISTENT}"; exit 1; fi
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|X11/Intrinsic.h|X11/Xlib.h|g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|@TK_SHARED_BUILD@|#@TK_SHARED_BUILD@|g; s|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e 's|wish |wish${TCL_VER}${THREADS_SUFFIX} |g' -e 's|Wish |Wish${TCL_VER}${THREADS_SUFFIX} |g' \
-		-e 's|wish\\fR|wish${TCL_VER}${THREADS_SUFFIX}\\fR|g' -e 's|Wish\\fR|Wish${TCL_VER}${THREADS_SUFFIX}\\fR|g' \
-		-e 's|^.so man.macros|.so ${DATADIR}/man.macros|' \
-		${WRKSRC}/../doc/wish.1
-.if defined(BUILDING_TK_THREADS)
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \
-		-e 's|$${TCL_TRIM_DOTS}|$${TCL_TRIM_DOTS}${THREADS_SUFFIX}|g' \
-		-e 's|-ltk$${TK_VERSION}|-ltk$${TK_VERSION}${THREADS_SUFFIX}|g' \
-		-e 's/-ltk`echo $${TK_VERSION} | tr -d .`/-ltk`echo $${TK_VERSION} | tr -d .`${THREADS_SUFFIX}/g' \
-		-e 's|-ltkstub$${TK_VERSION}|-ltkstub$${TK_VERSION}${THREADS_SUFFIX}|g' \
-		-e 's/-ltkstub`echo $${TK_VERSION} | tr -d .`/-ltkstub`echo $${TK_VERSION} | tr -d .`${THREADS_SUFFIX}/g' \
-		${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|libtk$${SHORT_TK_VER}|libtk$${SHORT_TK_VER}${THREADS_SUFFIX}|g' \
-		-e 's|/wish$$(VERSION)|/wish$$(VERSION)${THREADS_SUFFIX}|g' \
-		-e 's|/tkConfig.sh|/tkConfig${THREADS_SUFFIX}.sh|g' \
-		-e 's|$$(LIB_INSTALL_DIR)$$(TK_PKG_DIR)|${WRKDIR}|g' \
-		-e 's|$$(MINOR_VERSION)$$(TCLPATCHL)|$$(MINOR_VERSION)$$(TCLPATCHL)${THREADS_SUFFIX}|g' \
-		${WRKSRC}/Makefile.in
-.endif
 
 post-configure:
 	${REINPLACE_CMD} \
@@ -437,27 +93,8 @@ post-configure:
 		${WRKSRC}/tkConfig.sh
 	${REINPLACE_CMD} -e 's|-Wl,--rpath -Wl,/usr/local/lib||g' ${WRKSRC}/Makefile
 
-.if defined(BUILDING_TK_THREADS)
-do-install:
-	@cd ${WRKSRC} && ${MAKE_ENV} ${MAKE} -f Makefile install-binaries
-	@${MKDIR} ${PREFIX}/lib/tk${TK_VER}${THREADS_SUFFIX}
-	@${LN} -s ${PREFIX}/lib/tk${TK_VER}/tkConfig${THREADS_SUFFIX}.sh \
-		${PREFIX}/lib/tk${TK_VER}${THREADS_SUFFIX}/tkConfig.sh
-.endif
-
 post-install:
-	${INSTALL_DATA} ${WRKDIR}/pkgIndex.tcl ${PREFIX}/lib/tk${TK_VER}${THREADS_SUFFIX}/
-	${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/../doc/man.macros ${DATADIR}
-	${MKDIR} ${MANPREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/../doc/wish.1 ${MANPREFIX}/man/man1/wish${TCL_VER}${THREADS_SUFFIX}.1
-.if !defined(BUILDING_TK_THREADS) && ${PORT_OPTIONS:MTK85_MAN}
-. for mp in ${MAN3} ${MANN}
-	@${REINPLACE_CMD} -e 's|^.so man.macros|.so ${DATADIR}/man.macros|'	\
-		${WRKSRC}/../doc/${mp}
-. endfor
-	@cd ${WRKSRC} && ${MAKE} -f Makefile install-doc ${MAKE_ENV}
-.endif # !defined(BUILDING_TK_THREADS) && ${PORT_OPTIONS:MTK85_MAN}
+	${INSTALL_DATA} ${WRKDIR}/pkgIndex.tcl ${PREFIX}/lib/tk${TK_VER}/
 
 regression-test:	build
 	cd ${WRKSRC}; ${MAKE} test
diff --git a/x11-toolkits/tk85/files/patch-unix::Makefile.in b/x11-toolkits/tk85/files/patch-unix::Makefile.in
index 41cd98ac8de..c86ea6cc69a 100644
--- a/x11-toolkits/tk85/files/patch-unix::Makefile.in
+++ b/x11-toolkits/tk85/files/patch-unix::Makefile.in
@@ -1,5 +1,5 @@
---- Makefile.in.orig	2012-11-28 16:54:06.000000000 +0100
-+++ Makefile.in	2012-11-28 16:54:06.000000000 +0100
+--- Makefile.in.orig	2012-11-09 16:15:03.000000000 +0100
++++ Makefile.in	2013-01-28 09:24:31.000000000 +0100
 @@ -64,6 +64,8 @@
  
  # Directory in which to install the include file tk.h:
@@ -19,7 +19,7 @@
  # The directory containing the platform specific Tcl sources and headers
  # appropriate for this version of Tk:
 -TCL_PLATFORM_DIR	= @TCL_SRC_DIR@/unix
-+TCL_PLATFORM_DIR	= %%LOCALBASE%%/inclue/tcl@TCL_VERSION@/unix
++TCL_PLATFORM_DIR	= %%LOCALBASE%%/include/tcl@TCL_VERSION@/unix
  
  # The directory containing the Tcl library archive file appropriate
  # for this version of Tk:
@@ -104,24 +104,7 @@
  	@if test "$(STUB_LIB_FILE)" != "" ; then \
  	    echo "Installing $(STUB_LIB_FILE) to $(LIB_INSTALL_DIR)/"; \
  	    @INSTALL_STUB_LIB@ ; \
-@@ -812,22 +826,19 @@
- 		fi; \
- 	    done;
- 	@echo "Installing and cross-linking top-level (.1) docs to $(MAN1_INSTALL_DIR)/";
--	@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 to $(MAN3_INSTALL_DIR)/";
- 	@for i in $(TOP_DIR)/doc/*.3; do \
--	    $(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 to $(MANN_INSTALL_DIR)/";
- 	@for i in $(TOP_DIR)/doc/*.n; do \
--	    $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MANN_INSTALL_DIR)"; \
-+	    $(BSD_INSTALL_MAN) $$i "$(MANN_INSTALL_DIR)"; \
- 	done
- 
+@@ -827,7 +841,7 @@
  install-headers:
  	@if test "$(@TK_WINDOWINGSYSTEM@_XLIB_HDRS)" != ""; then \
  	    XLIB_INCLUDE_INSTALL_DIR="$(INCLUDE_INSTALL_DIR)"/X11; fi; \
@@ -130,7 +113,7 @@
  	    do \
  	    if [ -n "$$i" -a ! -d "$$i" ] ; then \
  		echo "Making directory $$i"; \
-@@ -836,9 +847,12 @@
+@@ -836,9 +851,12 @@
  		fi; \
  	    done;
  	@echo "Installing header files to $(INCLUDE_INSTALL_DIR)/";
diff --git a/x11-toolkits/tk85/files/pkgIndex.tcl.in b/x11-toolkits/tk85/files/pkgIndex.tcl.in
index 4c66beca7d5..9c4dad6fd3a 100644
--- a/x11-toolkits/tk85/files/pkgIndex.tcl.in
+++ b/x11-toolkits/tk85/files/pkgIndex.tcl.in
@@ -1,3 +1,3 @@
 # Tcl package index file, version 1.0
 
-package ifneeded Tk%%THREADS_SUFFIX%% %%TCLPATCHLEVEL%% "[list load "[file join [file dirname $dir] libtk85%%THREADS_SUFFIX%%.so.1]" Tk]%%TK_PROVIDE%%"
+package ifneeded Tk %%TCLPATCHLEVEL%% "[list load "[file join [file dirname $dir] libtk85.so.1]" Tk]"
diff --git a/x11-toolkits/tk85/pkg-plist b/x11-toolkits/tk85/pkg-plist
index 850981bce88..1562d7da186 100644
--- a/x11-toolkits/tk85/pkg-plist
+++ b/x11-toolkits/tk85/pkg-plist
@@ -201,8 +201,6 @@ 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
-%%DATADIR%%/man.macros
-@dirrm %%DATADIR%%
 @dirrm lib/tk%%TK_VER%%/ttk
 %%DEMOS%%@dirrm lib/tk%%TK_VER%%/demos/images
 %%DEMOS%%@dirrm lib/tk%%TK_VER%%/demos
diff --git a/x11-toolkits/tk85/pkg-plist.threads b/x11-toolkits/tk85/pkg-plist.threads
deleted file mode 100644
index e8dcd7da52b..00000000000
--- a/x11-toolkits/tk85/pkg-plist.threads
+++ /dev/null
@@ -1,9 +0,0 @@
-bin/wish%%TK_VER%%-threads
-lib/libtk%%SHORT_TK_VER%%-threads.a
-lib/libtk%%SHORT_TK_VER%%-threads.so
-lib/libtk%%SHORT_TK_VER%%-threads.so.1
-lib/libtkstub%%SHORT_TK_VER%%-threads.a
-lib/tk%%TK_VER%%/tkConfig-threads.sh
-lib/tk%%TK_VER%%-threads/tkConfig.sh
-lib/tk%%TK_VER%%-threads/pkgIndex.tcl
-@dirrm lib/tk%%TK_VER%%-threads
diff --git a/x11-toolkits/tk86-thread/Makefile b/x11-toolkits/tk86-thread/Makefile
deleted file mode 100644
index 220bfce36fe..00000000000
--- a/x11-toolkits/tk86-thread/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# New ports collection makefile for:	tk85-thread
-# Date created:				09 March 2007
-# Whom:					Martin Matuska <mm@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	tk
-
-MAINTAINER=	tcltk@FreeBSD.org
-COMMENT=	Graphical toolkit for Tcl (threads support)
-
-BUILDING_TK_THREADS=	yes
-
-MASTERDIR=	${.CURDIR}/../tk86
-
-.include "${MASTERDIR}/Makefile"
diff --git a/x11-toolkits/tk86/Makefile b/x11-toolkits/tk86/Makefile
index a317f170beb..aa8dbb5009b 100644
--- a/x11-toolkits/tk86/Makefile
+++ b/x11-toolkits/tk86/Makefile
@@ -2,79 +2,61 @@
 # $FreeBSD$
 
 PORTNAME=	tk
-PORTVERSION=	8.6.b.2
+PORTVERSION=	8.6.0
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	SF/tcl/Tcl/8.6b2
-PKGNAMESUFFIX?=	${THREADS_SUFFIX}
-DISTNAME=	${PORTNAME}${PORTVERSION:S/.b.2/b2/}-src
+MASTER_SITES=	SF/tcl/Tcl/${PORTVERSION} \
+		${MASTER_SITE_TCLTK}
+MASTER_SITE_SUBDIR=tcl8_6
+DISTNAME=	${PORTNAME}${PORTVERSION}-src
 
 MAINTAINER=	tcltk@FreeBSD.org
-COMMENT?=	Graphical toolkit for Tcl
+COMMENT=	Graphical toolkit for Tcl
 
 LICENSE=	BSD
 LICENSE_FILE=	${WRKSRC}/../license.terms
 
-LATEST_LINK?=	tk86
-USE_GCC=	any
-USE_XORG=	x11
+OPTIONS_DEFINE=	TKMAN DEMOS XFT THREADS
+OPTIONS_DEFAULT=XFT THREADS
+TKMAN_DESC=	Install Tk function manpages
+DEMOS_DESC=	Install demos
+
+WRKSRC=		${WRKDIR}/${PORTNAME}${PORTVERSION}/unix
+
+ALL_TARGET=	all
+INSTALL_TARGET=	install
+
 USE_LDCONFIG=	yes
-WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//}/unix
+USE_TCL=	${SHORT_TK_VER}
+USE_XORG=	x11
 GNU_CONFIGURE=	yes
-TK_VER=		8.6
-SHORT_TK_VER=	86
-CONFIGURE_ARGS=	--enable-shared --includedir=${PREFIX}/include/tk${TK_VER}
-CONFIGURE_ENV=	PORTSDIR=${PORTSDIR} TK_LIB_FILE=libtk${SHORT_TK_VER}.so.1
-MAKE_ENV=	SHORT_TK_VER=${SHORT_TK_VER}
-PLIST_SUB=	TK_VER=${TK_VER} SHORT_TK_VER=${SHORT_TK_VER}
-NOPRECIOUSMAKEVARS=	yes # Otherwise 'make readmes' is broken
-MANCOMPRESSED=	no
-DATADIR=	${PREFIX}/share/${PORTNAME}${TK_VER}
-SUB_FILES=	pkgIndex.tcl
+CONFIGURE_ARGS=	--enable-shared \
+		--enable-man-suffix=.${MAN_SUFFIX} \
+		--with-tcl=${TCL_LIBDIR} \
+		--includedir=${PREFIX}/include/tk${TK_VER}
 
-.if !defined(BUILDING_TK_THREADS)
-USE_TCL=	${SHORT_TK_VER}
+CONFIGURE_ENV=	PORTSDIR=${PORTSDIR}
 
-OPTIONS_DEFINE=	DEMOS TK86_MAN XFT
-OPTIONS_DEFAULT=XFT
-TK86_MAN_DESC=	Install tk 8.6 function manpages
-DEMOS_DESC=	Install demos
-.else
-USE_TK=		${SHORT_TK_VER}
-PLIST=		${PKGDIR}/pkg-plist.threads
-THREADS_SUFFIX=	-threads
-LIB_DEPENDS=	tcl${SHORT_TK_VER}${THREADS_SUFFIX}:${PORTSDIR}/lang/tcl${SHORT_TK_VER}-thread
-.endif
+CFLAGS+=	-I${TCL_INCLUDEDIR}
 
-SUB_LIST+=	THREADS_SUFFIX="${THREADS_SUFFIX}" \
-		TCLPATCHLEVEL="8.6b1"
+TK_VER=		${PORTVERSION:R}
+SHORT_TK_VER=	${TK_VER:S/.//}
+LATEST_LINK=	${PORTNAME}${SHORT_TK_VER}
+MAN_SUFFIX=	${LATEST_LINK}
 
-.include <bsd.port.options.mk>
+MAKE_ENV=	SHORT_TK_VER=${SHORT_TK_VER}
+
+PLIST_SUB=	TK_VER=${TK_VER} \
+		SHORT_TK_VER=${SHORT_TK_VER}
 
-DATADIR=	${PREFIX}/share/${PORTNAME}${TCL_VER}
+.include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MXFT}
-CONFIGURE_ARGS+=	--enable-xft
-LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/libXft
+CONFIGURE_ARGS+=--enable-xft
+LIB_DEPENDS+=	Xft:${PORTSDIR}/x11-fonts/libXft
 .else
-CONFIGURE_ARGS+=	--disable-xft
+CONFIGURE_ARGS+=--disable-xft
 .endif
 
-.if !defined(NO_INSTALL_MANPAGES)
-MAN1=	wish${TCL_VER}${THREADS_SUFFIX}.1
-.endif
-
-.if defined(BUILDING_TK_THREADS)
-CONFIGURE_ARGS+=	--enable-threads --with-tcl=${LOCALBASE}/lib/tcl${TK_VER}${THREADS_SUFFIX}
-CONFIGURE_ENV+=		PTHREAD_LIBS="${PTHREAD_LIBS}" PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
-			ac_cv_path_tclsh="${LOCALBASE}/bin/tclsh${TK_VER}${THREADS_SUFFIX}"
-LATEST_LINK=		tk86${THREADS_SUFFIX}
-SUB_LIST+=		TK_PROVIDE="; package provide Tk-threads ${TK_VER}b1"
-.else
-CONFIGURE_ARGS+=	--disable-threads --with-tcl=${LOCALBASE}/lib/tcl${TK_VER} \
-			ac_cv_path_tclsh="${TCLSH}"
-
-SUB_LIST+=		TK_PROVIDE=""
-
 .if ${PORT_OPTIONS:MDEMOS}
 INSTALL_TARGET+=	install install-demos
 PLIST_SUB+=	DEMOS=""
@@ -82,386 +64,17 @@ PLIST_SUB+=	DEMOS=""
 PLIST_SUB+=	DEMOS="@comment "
 .endif
 
-.if !defined(NO_INSTALL_MANPAGES) && ${PORT_OPTIONS:MTK86_MAN}
-
-MAN3=	3DBorder.3 AddOption.3 BindTable.3 CanvPsY.3 CanvTkwin.3 \
-	CanvTxtInfo.3 Clipboard.3 ClrSelect.3 ConfigWidg.3 ConfigWind.3 \
-	CoordToWin.3 CrtConsoleChan.3 CrtCmHdlr.3 CrtErrHdlr.3 CrtGenHdlr.3 \
-	CrtImgType.3 CrtItemType.3 CrtPhImgFmt.3 CrtSelHdlr.3 CrtWindow.3 \
-	DeleteImg.3 DrawFocHlt.3 EventHndlr.3 FindPhoto.3 FontId.3 FreeXId.3 \
-	GeomReq.3 GetAnchor.3 GetBitmap.3 GetCapStyl.3 GetClrmap.3 GetColor.3 \
-	GetCursor.3 GetDash.3 GetFont.3 GetGC.3 GetHINSTANCE.3 GetHWND.3 \
-	GetImage.3 GetJoinStl.3 GetJustify.3 GetOption.3 GetPixels.3 \
-	GetPixmap.3 GetRelief.3 GetRootCrd.3 GetScroll.3 GetSelect.3 GetUid.3 \
-	GetVRoot.3 GetVisual.3 Grab.3 HWNDToWindow.3 HandleEvent.3 \
-	IdToWindow.3 ImgChanged.3 Inactive.3 InternAtom.3 MainLoop.3 MainWin.3 \
-	MaintGeom.3 ManageGeom.3 MapWindow.3 MeasureChar.3 MoveToplev.3 \
-	Name.3 NameOfImg.3 OwnSelect.3 ParseArgv.3 QWinEvent.3 Restack.3 \
-	RestrictEv.3 SetAppName.3 SetCaret.3 SetClass.3 SetClassProcs.3 \
-	SetGrid.3 SetOptions.3 SetVisual.3 StrictMotif.3 TextLayout.3 \
-	Tk_Init.3 Tk_Main.3 TkInitStubs.3 WindowId.3 ttk_Geometry.3 \
-	ttk_Theme.3
-
-MANN=	bell.n bind.n bindtags.n bitmap.n button.n busy.n canvas.n \
-	checkbutton.n chooseColor.n chooseDirectory.n clipboard.n colors.n \
-	console.n cursors.n destroy.n dialog.n entry.n event.n focus.n \
-	focusNext.n font.n fontchooser.n frame.n getOpenFile.n grab.n grid.n \
-	keysyms.n image.n label.n labelframe.n listbox.n loadTk.n lower.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 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
-
-# MLINKS generated via  awk '/ln/ {print "\t" $2,$3,"\\"}' unix/mkLinks
-MLINKS=	3DBorder.3 Tk_Alloc3DBorderFromObj.3 \
-	3DBorder.3 Tk_Get3DBorder.3 \
-	3DBorder.3 Tk_Get3DBorderFromObj.3 \
-	3DBorder.3 Tk_Draw3DRectangle.3 \
-	3DBorder.3 Tk_Fill3DRectangle.3 \
-	3DBorder.3 Tk_Draw3DPolygon.3 \
-	3DBorder.3 Tk_Fill3DPolygon.3 \
-	3DBorder.3 Tk_3DVerticalBevel.3 \
-	3DBorder.3 Tk_3DHorizontalBevel.3 \
-	3DBorder.3 Tk_SetBackgroundFromBorder.3 \
-	3DBorder.3 Tk_NameOf3DBorder.3 \
-	3DBorder.3 Tk_3DBorderColor.3 \
-	3DBorder.3 Tk_3DBorderGC.3 \
-	3DBorder.3 Tk_Free3DBorderFromObj.3 \
-	3DBorder.3 Tk_Free3DBorder.3 \
-	AddOption.3 Tk_AddOption.3 \
-	BindTable.3 Tk_CreateBindingTable.3 \
-	BindTable.3 Tk_DeleteBindingTable.3 \
-	BindTable.3 Tk_CreateBinding.3 \
-	BindTable.3 Tk_DeleteBinding.3 \
-	BindTable.3 Tk_GetBinding.3 \
-	BindTable.3 Tk_GetAllBindings.3 \
-	BindTable.3 Tk_DeleteAllBindings.3 \
-	BindTable.3 Tk_BindEvent.3 \
-	CanvPsY.3 Tk_CanvasPsY.3 \
-	CanvPsY.3 Tk_CanvasPsBitmap.3 \
-	CanvPsY.3 Tk_CanvasPsColor.3 \
-	CanvPsY.3 Tk_CanvasPsFont.3 \
-	CanvPsY.3 Tk_CanvasPsPath.3 \
-	CanvPsY.3 Tk_CanvasPsStipple.3 \
-	CanvTkwin.3 Tk_CanvasTkwin.3 \
-	CanvTkwin.3 Tk_CanvasGetCoord.3 \
-	CanvTkwin.3 Tk_CanvasDrawableCoords.3 \
-	CanvTkwin.3 Tk_CanvasSetStippleOrigin.3 \
-	CanvTkwin.3 Tk_CanvasWindowCoords.3 \
-	CanvTkwin.3 Tk_CanvasEventuallyRedraw.3 \
-	CanvTkwin.3 Tk_CanvasTagsOption.3 \
-	CanvTxtInfo.3 Tk_CanvasGetTextInfo.3 \
-	CanvTxtInfo.3 Tk_CanvasTextInfo.3 \
-	Clipboard.3 Tk_ClipboardClear.3 \
-	Clipboard.3 Tk_ClipboardAppend.3 \
-	ClrSelect.3 Tk_ClearSelection.3 \
-	ConfigWidg.3 Tk_ConfigureWidget.3 \
-	ConfigWidg.3 Tk_ConfigureInfo.3 \
-	ConfigWidg.3 Tk_ConfigureValue.3 \
-	ConfigWidg.3 Tk_FreeOptions.3 \
-	ConfigWind.3 Tk_ConfigureWindow.3 \
-	ConfigWind.3 Tk_MoveWindow.3 \
-	ConfigWind.3 Tk_ResizeWindow.3 \
-	ConfigWind.3 Tk_MoveResizeWindow.3 \
-	ConfigWind.3 Tk_SetWindowBorderWidth.3 \
-	ConfigWind.3 Tk_ChangeWindowAttributes.3 \
-	ConfigWind.3 Tk_SetWindowBackground.3 \
-	ConfigWind.3 Tk_SetWindowBackgroundPixmap.3 \
-	ConfigWind.3 Tk_SetWindowBorder.3 \
-	ConfigWind.3 Tk_SetWindowBorderPixmap.3 \
-	ConfigWind.3 Tk_SetWindowColormap.3 \
-	ConfigWind.3 Tk_DefineCursor.3 \
-	ConfigWind.3 Tk_UndefineCursor.3 \
-	CoordToWin.3 Tk_CoordsToWindow.3 \
-	CrtCmHdlr.3 Tk_CreateClientMessageHandler.3 \
-	CrtCmHdlr.3 Tk_DeleteClientMessageHandler.3 \
-	CrtErrHdlr.3 Tk_CreateErrorHandler.3 \
-	CrtErrHdlr.3 Tk_DeleteErrorHandler.3 \
-	CrtGenHdlr.3 Tk_CreateGenericHandler.3 \
-	CrtGenHdlr.3 Tk_DeleteGenericHandler.3 \
-	CrtImgType.3 Tk_CreateImageType.3 \
-	CrtImgType.3 Tk_GetImageMasterData.3 \
-	CrtImgType.3 Tk_InitImageArgs.3 \
-	CrtItemType.3 Tk_CreateItemType.3 \
-	CrtItemType.3 Tk_GetItemTypes.3 \
-	CrtPhImgFmt.3 Tk_CreatePhotoImageFormat.3 \
-	CrtSelHdlr.3 Tk_CreateSelHandler.3 \
-	CrtSelHdlr.3 Tk_DeleteSelHandler.3 \
-	CrtWindow.3 Tk_CreateWindow.3 \
-	CrtWindow.3 Tk_CreateAnonymousWindow.3 \
-	CrtWindow.3 Tk_CreateWindowFromPath.3 \
-	CrtWindow.3 Tk_DestroyWindow.3 \
-	CrtWindow.3 Tk_MakeWindowExist.3 \
-	DeleteImg.3 Tk_DeleteImage.3 \
-	DrawFocHlt.3 Tk_DrawFocusHighlight.3 \
-	EventHndlr.3 Tk_CreateEventHandler.3 \
-	EventHndlr.3 Tk_DeleteEventHandler.3 \
-	FindPhoto.3 Tk_FindPhoto.3 \
-	FindPhoto.3 Tk_PhotoPutBlock.3 \
-	FindPhoto.3 Tk_PhotoPutZoomedBlock.3 \
-	FindPhoto.3 Tk_PhotoGetImage.3 \
-	FindPhoto.3 Tk_PhotoBlank.3 \
-	FindPhoto.3 Tk_PhotoExpand.3 \
-	FindPhoto.3 Tk_PhotoGetSize.3 \
-	FindPhoto.3 Tk_PhotoSetSize.3 \
-	FontId.3 Tk_FontId.3 \
-	FontId.3 Tk_GetFontMetrics.3 \
-	FontId.3 Tk_PostscriptFontName.3 \
-	FreeXId.3 Tk_FreeXId.3 \
-	GeomReq.3 Tk_GeometryRequest.3 \
-	GeomReq.3 Tk_SetMinimumRequestSize.3 \
-	GeomReq.3 Tk_SetInternalBorder.3 \
-	GeomReq.3 Tk_SetInternalBorderEx.3 \
-	GetAnchor.3 Tk_GetAnchorFromObj.3 \
-	GetAnchor.3 Tk_GetAnchor.3 \
-	GetAnchor.3 Tk_NameOfAnchor.3 \
-	GetBitmap.3 Tk_AllocBitmapFromObj.3 \
-	GetBitmap.3 Tk_GetBitmap.3 \
-	GetBitmap.3 Tk_GetBitmapFromObj.3 \
-	GetBitmap.3 Tk_DefineBitmap.3 \
-	GetBitmap.3 Tk_NameOfBitmap.3 \
-	GetBitmap.3 Tk_SizeOfBitmap.3 \
-	GetBitmap.3 Tk_FreeBitmapFromObj.3 \
-	GetBitmap.3 Tk_FreeBitmap.3 \
-	GetCapStyl.3 Tk_GetCapStyle.3 \
-	GetCapStyl.3 Tk_NameOfCapStyle.3 \
-	GetClrmap.3 Tk_GetColormap.3 \
-	GetClrmap.3 Tk_FreeColormap.3 \
-	GetColor.3 Tk_AllocColorFromObj.3 \
-	GetColor.3 Tk_GetColor.3 \
-	GetColor.3 Tk_GetColorFromObj.3 \
-	GetColor.3 Tk_GetColorByValue.3 \
-	GetColor.3 Tk_NameOfColor.3 \
-	GetColor.3 Tk_GCForColor.3 \
-	GetColor.3 Tk_FreeColorFromObj.3 \
-	GetColor.3 Tk_FreeColor.3 \
-	GetCursor.3 Tk_AllocCursorFromObj.3 \
-	GetCursor.3 Tk_GetCursor.3 \
-	GetCursor.3 Tk_GetCursorFromObj.3 \
-	GetCursor.3 Tk_GetCursorFromData.3 \
-	GetCursor.3 Tk_NameOfCursor.3 \
-	GetCursor.3 Tk_FreeCursorFromObj.3 \
-	GetCursor.3 Tk_FreeCursor.3 \
-	GetDash.3 Tk_GetDash.3 \
-	GetFont.3 Tk_AllocFontFromObj.3 \
-	GetFont.3 Tk_GetFont.3 \
-	GetFont.3 Tk_GetFontFromObj.3 \
-	GetFont.3 Tk_NameOfFont.3 \
-	GetFont.3 Tk_FreeFontFromObj.3 \
-	GetFont.3 Tk_FreeFont.3 \
-	GetGC.3 Tk_GetGC.3 \
-	GetGC.3 Tk_FreeGC.3 \
-	GetHINSTANCE.3 Tk_GetHINSTANCE.3 \
-	GetHWND.3 Tk_AttachHWND.3 \
-	GetHWND.3 Tk_GetHWND.3 \
-	GetImage.3 Tk_GetImage.3 \
-	GetImage.3 Tk_RedrawImage.3 \
-	GetImage.3 Tk_SizeOfImage.3 \
-	GetImage.3 Tk_FreeImage.3 \
-	GetJoinStl.3 Tk_GetJoinStyle.3 \
-	GetJoinStl.3 Tk_NameOfJoinStyle.3 \
-	GetJustify.3 Tk_GetJustifyFromObj.3 \
-	GetJustify.3 Tk_GetJustify.3 \
-	GetJustify.3 Tk_NameOfJustify.3 \
-	GetOption.3 Tk_GetOption.3 \
-	GetPixels.3 Tk_GetPixelsFromObj.3 \
-	GetPixels.3 Tk_GetPixels.3 \
-	GetPixels.3 Tk_GetMMFromObj.3 \
-	GetPixels.3 Tk_GetScreenMM.3 \
-	GetPixmap.3 Tk_GetPixmap.3 \
-	GetPixmap.3 Tk_FreePixmap.3 \
-	GetRelief.3 Tk_GetReliefFromObj.3 \
-	GetRelief.3 Tk_GetRelief.3 \
-	GetRelief.3 Tk_NameOfRelief.3 \
-	GetRootCrd.3 Tk_GetRootCoords.3 \
-	GetScroll.3 Tk_GetScrollInfo.3 \
-	GetScroll.3 Tk_GetScrollInfoObj.3 \
-	GetSelect.3 Tk_GetSelection.3 \
-	GetUid.3 Tk_GetUid.3 \
-	GetUid.3 Tk_Uid.3 \
-	GetVRoot.3 Tk_GetVRootGeometry.3 \
-	GetVisual.3 Tk_GetVisual.3 \
-	Grab.3 Tk_Grab.3 \
-	Grab.3 Tk_Ungrab.3 \
-	HWNDToWindow.3 Tk_HWNDToWindow.3 \
-	HandleEvent.3 Tk_HandleEvent.3 \
-	IdToWindow.3 Tk_IdToWindow.3 \
-	ImgChanged.3 Tk_ImageChanged.3 \
-	Inactive.3 Tk_GetUserInactiveTime.3 \
-	Inactive.3 Tk_ResetUserInactiveTime.3 \
-	InternAtom.3 Tk_InternAtom.3 \
-	InternAtom.3 Tk_GetAtomName.3 \
-	MainLoop.3 Tk_MainLoop.3 \
-	MainWin.3 Tk_MainWindow.3 \
-	MainWin.3 Tk_GetNumMainWindows.3 \
-	MaintGeom.3 Tk_MaintainGeometry.3 \
-	MaintGeom.3 Tk_UnmaintainGeometry.3 \
-	ManageGeom.3 Tk_ManageGeometry.3 \
-	MapWindow.3 Tk_MapWindow.3 \
-	MapWindow.3 Tk_UnmapWindow.3 \
-	MeasureChar.3 Tk_MeasureChars.3 \
-	MeasureChar.3 Tk_TextWidth.3 \
-	MeasureChar.3 Tk_DrawChars.3 \
-	MeasureChar.3 Tk_UnderlineChars.3 \
-	MoveToplev.3 Tk_MoveToplevelWindow.3 \
-	Name.3 Tk_Name.3 \
-	Name.3 Tk_PathName.3 \
-	Name.3 Tk_NameToWindow.3 \
-	NameOfImg.3 Tk_NameOfImage.3 \
-	OwnSelect.3 Tk_OwnSelection.3 \
-	ParseArgv.3 Tk_ParseArgv.3 \
-	QWinEvent.3 Tk_CollapseMotionEvents.3 \
-	QWinEvent.3 Tk_QueueWindowEvent.3 \
-	Restack.3 Tk_RestackWindow.3 \
-	RestrictEv.3 Tk_RestrictEvents.3 \
-	SetAppName.3 Tk_SetAppName.3 \
-	SetCaret.3 Tk_SetCaretPos.3 \
-	SetClass.3 Tk_SetClass.3 \
-	SetClass.3 Tk_Class.3 \
-	SetClassProcs.3 Tk_SetClassProcs.3 \
-	SetGrid.3 Tk_SetGrid.3 \
-	SetGrid.3 Tk_UnsetGrid.3 \
-	SetOptions.3 Tk_CreateOptionTable.3 \
-	SetOptions.3 Tk_DeleteOptionTable.3 \
-	SetOptions.3 Tk_InitOptions.3 \
-	SetOptions.3 Tk_SetOptions.3 \
-	SetOptions.3 Tk_FreeSavedOptions.3 \
-	SetOptions.3 Tk_RestoreSavedOptions.3 \
-	SetOptions.3 Tk_GetOptionValue.3 \
-	SetOptions.3 Tk_GetOptionInfo.3 \
-	SetOptions.3 Tk_FreeConfigOptions.3 \
-	SetOptions.3 Tk_Offset.3 \
-	SetVisual.3 Tk_SetWindowVisual.3 \
-	StrictMotif.3 Tk_StrictMotif.3 \
-	TextLayout.3 Tk_ComputeTextLayout.3 \
-	TextLayout.3 Tk_FreeTextLayout.3 \
-	TextLayout.3 Tk_DrawTextLayout.3 \
-	TextLayout.3 Tk_UnderlineTextLayout.3 \
-	TextLayout.3 Tk_PointToChar.3 \
-	TextLayout.3 Tk_CharBbox.3 \
-	TextLayout.3 Tk_DistanceToTextLayout.3 \
-	TextLayout.3 Tk_IntersectTextLayout.3 \
-	TextLayout.3 Tk_TextLayoutToPostscript.3 \
-	TkInitStubs.3 Tk_InitStubs.3 \
-	Tk_Init.3 Tk_SafeInit.3 \
-	WindowId.3 Tk_WindowId.3 \
-	WindowId.3 Tk_Parent.3 \
-	WindowId.3 Tk_Display.3 \
-	WindowId.3 Tk_DisplayName.3 \
-	WindowId.3 Tk_ScreenNumber.3 \
-	WindowId.3 Tk_Screen.3 \
-	WindowId.3 Tk_X.3 \
-	WindowId.3 Tk_Y.3 \
-	WindowId.3 Tk_Width.3 \
-	WindowId.3 Tk_Height.3 \
-	WindowId.3 Tk_Changes.3 \
-	WindowId.3 Tk_Attributes.3 \
-	WindowId.3 Tk_IsContainer.3 \
-	WindowId.3 Tk_IsEmbedded.3 \
-	WindowId.3 Tk_IsMapped.3 \
-	WindowId.3 Tk_IsTopLevel.3 \
-	WindowId.3 Tk_ReqWidth.3 \
-	WindowId.3 Tk_ReqHeight.3 \
-	WindowId.3 Tk_MinReqWidth.3 \
-	WindowId.3 Tk_MinReqHeight.3 \
-	WindowId.3 Tk_InternalBorderLeft.3 \
-	WindowId.3 Tk_InternalBorderRight.3 \
-	WindowId.3 Tk_InternalBorderTop.3 \
-	WindowId.3 Tk_InternalBorderBottom.3 \
-	WindowId.3 Tk_Visual.3 \
-	WindowId.3 Tk_Depth.3 \
-	WindowId.3 Tk_Colormap.3 \
-	WindowId.3 Tk_Interp.3 \
-	chooseColor.n tk_chooseColor.n \
-	chooseDirectory.n tk_chooseDirectory.n \
-	dialog.n tk_dialog.n \
-	focusNext.n tk_focusNext.n \
-	focusNext.n tk_focusPrev.n \
-	focusNext.n tk_focusFollowsMouse.n \
-	getOpenFile.n tk_getOpenFile.n \
-	getOpenFile.n tk_getSaveFile.n \
-	menu.n tk_menuSetFocus.n \
-	menubar.n tk_menuBar.n \
-	menubar.n tk_bindForTraversal.n \
-	messageBox.n tk_messageBox.n \
-	optionMenu.n tk_optionMenu.n \
-	palette.n tk_setPalette.n \
-	palette.n tk_bisque.n \
-	popup.n tk_popup.n \
-	text.n tk_textCopy.n \
-	text.n tk_textCut.n \
-	text.n tk_textPaste.n
-
-.endif	#!defined(NO_INSTALL_MANPAGES) && !${PORT_OPTIONS:MTK86_MAN}
-
-.endif	# defined(BUILDING_TK_THREADS)
-
-TKBASE?=	${PORTSDIR}/${PKGCATEGORY}/${LATEST_LINK}
-
-pre-everything::
-	@if ${TEST} -e "${NONEXISTENT}"; then ${ECHO_MSG} "=== Aborted, please remove ${NONEXISTENT}"; exit 1; fi
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|X11/Intrinsic.h|X11/Xlib.h|g' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|@TK_SHARED_BUILD@|#@TK_SHARED_BUILD@|g' ${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e 's|wish |wish${TCL_VER}${THREADS_SUFFIX} |g' -e 's|Wish |Wish${TCL_VER}${THREADS_SUFFIX} |g' \
-		-e 's|wish\\fR|wish${TCL_VER}${THREADS_SUFFIX}\\fR|g' -e 's|Wish\\fR|Wish${TCL_VER}${THREADS_SUFFIX}\\fR|g' \
-		-e 's|^.so man.macros|.so ${DATADIR}/man.macros|' \
-		${WRKSRC}/../doc/wish.1
-.if defined(BUILDING_TK_THREADS)
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \
-		-e 's|$${TCL_TRIM_DOTS}|$${TCL_TRIM_DOTS}${THREADS_SUFFIX}|g' \
-		-e 's|-ltk$${TK_VERSION}|-ltk$${TK_VERSION}${THREADS_SUFFIX}|g' \
-		-e 's/-ltk`echo $${TK_VERSION} | tr -d .`/-ltk`echo $${TK_VERSION} | tr -d .`${THREADS_SUFFIX}/g' \
-		-e 's|-ltkstub$${TK_VERSION}|-ltkstub$${TK_VERSION}${THREADS_SUFFIX}|g' \
-		-e 's/-ltkstub`echo $${TK_VERSION} | tr -d .`/-ltkstub`echo $${TK_VERSION} | tr -d .`${THREADS_SUFFIX}/g' \
-		${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|libtk$${SHORT_TK_VER}|libtk$${SHORT_TK_VER}${THREADS_SUFFIX}|g' \
-		-e 's|/wish$$(VERSION)|/wish$$(VERSION)${THREADS_SUFFIX}|g' \
-		-e 's|/tkConfig.sh|/tkConfig${THREADS_SUFFIX}.sh|g' \
-		-e 's|$$(LIB_INSTALL_DIR)$$(TK_PKG_DIR)|${WRKDIR}|g' \
-		-e 's|$$(MINOR_VERSION)$$(TCLPATCHL)|$$(MINOR_VERSION)$$(TCLPATCHL)${THREADS_SUFFIX}|g' \
-		${WRKSRC}/Makefile.in
+.if ${PORT_OPTIONS:MTKMAN} && !defined(NO_INSTALL_MANPAGES)
+INSTALL_TARGET+=install-doc
+.include "${.CURDIR}/Makefile.man"
 .endif
 
-post-configure:
-#	${REINPLACE_CMD} \
-#		-e 's|${WRKDIRPREFIX}${.CURDIR}|$${WRKDIRPREFIX}${TKBASE}|' \
-#		${WRKSRC}/tkConfig.sh
-	${REINPLACE_CMD} -e 's|-Wl,--rpath -Wl,/usr/local/lib||g' ${WRKSRC}/Makefile
-
-.if defined(BUILDING_TK_THREADS)
-do-install:
-	@cd ${WRKSRC} && ${MAKE_ENV} ${MAKE} -f Makefile install-binaries
-	@${MKDIR} ${PREFIX}/lib/tk${TK_VER}${THREADS_SUFFIX}
-	@${LN} -s ${PREFIX}/lib/tk${TK_VER}/tkConfig${THREADS_SUFFIX}.sh \
-		${PREFIX}/lib/tk${TK_VER}${THREADS_SUFFIX}/tkConfig.sh
+.if ${PORT_OPTIONS:MTHREADS}
+CONFIGURE_ARGS+=--enable-threads
+.else
+CONFIGURE_ARGS+=--disable-threads
 .endif
 
-post-install:
-	${INSTALL_DATA} ${WRKDIR}/pkgIndex.tcl ${PREFIX}/lib/tk${TK_VER}${THREADS_SUFFIX}/
-	${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/../doc/man.macros ${DATADIR}
-.if !defined(NO_INSTALL_MANPAGES)
-	${MKDIR} ${MANPREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/../doc/wish.1 ${MANPREFIX}/man/man1/wish${TCL_VER}${THREADS_SUFFIX}.1
-.if !defined(BUILDING_TK_THREADS) && ${PORT_OPTIONS:MTK86_MAN}
-. for mp in ${MAN3} ${MANN}
-	@${REINPLACE_CMD} -e 's|^.so man.macros|.so ${DATADIR}/man.macros|'	\
-		${WRKSRC}/../doc/${mp}
-. endfor
-	@cd ${WRKSRC} && ${MAKE} -f Makefile install-doc ${MAKE_ENV}
-.endif # !defined(BUILDING_TK_THREADS) && ${PORT_OPTIONS:MTK86_MAN}
-
-.endif # !defined(NO_INSTALL_MANPAGES)
-
 regression-test:	build
 	cd ${WRKSRC}; ${MAKE} test
 	${ECHO_CMD} "package require Tk" | tclsh${TK_VER}
diff --git a/x11-toolkits/tk86/distinfo b/x11-toolkits/tk86/distinfo
index 185c1404b6a..bf0aa7dfea7 100644
--- a/x11-toolkits/tk86/distinfo
+++ b/x11-toolkits/tk86/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tk8.6b2-src.tar.gz) = 81252186d04d44cff41e24384d6fd77e0034f116660f84cb5c2a8b3bd4b373ad
-SIZE (tk8.6b2-src.tar.gz) = 4611544
+SHA256 (tk8.6.0-src.tar.gz) = 5c708b2b6f658916df59190b27750fa1ea2bc10992108e10f961c0700f058de6
+SIZE (tk8.6.0-src.tar.gz) = 4239836
diff --git a/x11-toolkits/tk86/files/patch-unix::Makefile.in b/x11-toolkits/tk86/files/patch-unix::Makefile.in
index b5aba21666b..8ede57d11f9 100644
--- a/x11-toolkits/tk86/files/patch-unix::Makefile.in
+++ b/x11-toolkits/tk86/files/patch-unix::Makefile.in
@@ -1,94 +1,56 @@
---- 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 @@
+--- Makefile.in.orig	2012-12-19 16:39:12.000000000 +0100
++++ Makefile.in	2013-01-09 10:39:59.000000000 +0100
+@@ -64,6 +64,8 @@
  
  # Directory in which to install the include file tk.h:
  INCLUDE_INSTALL_DIR	= $(INSTALL_ROOT)$(includedir)
-+GENERIC_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/generic
-+UNIX_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/unix
++GENERIC_INCLUDE_INSTALL_DIR=	$(INCLUDE_INSTALL_DIR)/generic
++UNIX_INCLUDE_INSTALL_DIR=	$(INCLUDE_INSTALL_DIR)/unix
  
  # Path to the private tk header dir:
  PRIVATE_INCLUDE_DIR	= @PRIVATE_INCLUDE_DIR@
-@@ -91,7 +93,7 @@
+@@ -92,7 +94,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)
++CONFIG_INSTALL_DIR	= $(SCRIPT_INSTALL_DIR)
  
  # 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):
--TCL_GENERIC_DIR		= @TCL_SRC_DIR@/generic
-+TCL_GENERIC_DIR		= @prefix@/include/tcl@TCL_VERSION@/generic
- 
- # The directory containing the platform specific Tcl sources and headers
- # appropriate for this version of Tk:
-@@ -113,7 +115,7 @@
- TCL_LIB_FLAG		= @TCL_LIB_FLAG@
- 
- # Flag, 1: we're building a shared lib, 0 we're not
--TK_SHARED_BUILD		= @TK_SHARED_BUILD@
-+TK_SHARED_BUILD		= ###@TK_SHARED_BUILD@
- 
- # Subdirectory of $(libdir) containing the pkgIndex.tcl file for loadable Tk
- TK_PKG_DIR		= @TK_PKG_DIR@
-@@ -136,7 +138,7 @@
- #CFLAGS			= $(CFLAGS_DEBUG)
- #CFLAGS			= $(CFLAGS_OPTIMIZE)
- #CFLAGS			= $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE)
--CFLAGS			= @CFLAGS_DEFAULT@ @CFLAGS@
-+CFLAGS			+= @CFLAGS_DEFAULT@ @CFLAGS@
- 
- # Flags to pass to the linker
- LDFLAGS_DEBUG		= @LDFLAGS_DEBUG@
-@@ -272,7 +274,7 @@
- STLIB_LD		= @STLIB_LD@
- SHLIB_LD		= @SHLIB_LD@
- SHLIB_LD_LIBS		= @SHLIB_LD_LIBS@
--TK_SHLIB_LD_EXTRAS	= @TK_SHLIB_LD_EXTRAS@
-+TK_SHLIB_LD_EXTRAS	= @TCL_SHLIB_LD_EXTRAS@
- 
- # Additional search flags needed to find the various shared libraries
- # at run-time.  The first symbol is for use when creating a binary
-@@ -559,6 +561,8 @@
- 	$(GENERIC_DIR)/tkIntPlatDecls.h $(GENERIC_DIR)/tkPort.h \
- 	$(TTK_HDRS) $(@TK_WINDOWINGSYSTEM@_PRIVATE_HDRS)
+@@ -556,6 +558,8 @@
+ PUBLIC_HDRS = $(GENERIC_DIR)/tk.h $(GENERIC_DIR)/tkDecls.h \
+ 	$(GENERIC_DIR)/tkPlatDecls.h $(@TK_WINDOWINGSYSTEM@_HDRS)
  
 +INSTALL_HDRS = tk.h tkDecls.h tkInt.h tkIntXlibDecls.h
 +
- DEMOPROGS = browse hello ixset rmt rolodex tcolor timer widget
- 
- SHELL_ENV = \
-@@ -583,6 +587,12 @@
+ # The private headers we want installed for install-private-headers
+ PRIVATE_HDRS = $(GENERIC_DIR)/tkInt.h $(GENERIC_DIR)/tkIntDecls.h \
+ 	$(GENERIC_DIR)/tkIntPlatDecls.h $(GENERIC_DIR)/tkPort.h \
+@@ -585,6 +589,12 @@
  ${LIB_FILE}: ${OBJS} ${STUB_LIB_FILE} @LIB_RSRC_FILE@
  	rm -f $@
  	@MAKE_LIB@
-+	ln -sf @TK_LIB_FILE@ libtk${SHORT_TK_VER}.so
++	@ln -sf ${LIB_FILE} ./libtk${SHORT_TK_VER}.so
 +
 +libtk${SHORT_TK_VER}.a: ${OBJS}
 +	rm -f libtk${SHORT_TK_VER}.a
-+	ar cr libtk${SHORT_TK_VER}.a ${OBJS}
++	ar rc libtk${SHORT_TK_VER}.a ${OBJS}
 +	$(RANLIB) libtk${SHORT_TK_VER}.a
  
  ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
  	rm -f $@
-@@ -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 =
+@@ -700,8 +710,7 @@
  INSTALL_DEV_TARGETS = install-headers
--INSTALL_DEMO_TARGETS = install-demos
-+INSTALL_DEMO_TARGETS =
+ INSTALL_DEMO_TARGETS = install-demos
  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 @@
+-INSTALL_TARGETS = $(INSTALL_BASE_TARGETS) $(INSTALL_DOC_TARGETS) $(INSTALL_DEV_TARGETS) \
+-		$(INSTALL_DEMO_TARGETS) $(INSTALL_EXTRA_TARGETS)
++INSTALL_TARGETS = $(INSTALL_BASE_TARGETS) $(INSTALL_DEV_TARGETS) $(INSTALL_EXTRA_TARGETS)
+ 
+ install: $(INSTALL_TARGETS)
+ 
+@@ -714,7 +723,7 @@
  # some ranlibs write to current directory, and this might not always be
  # possible (e.g. if installing as root).
  
@@ -97,18 +59,18 @@
  	@for i in "$(LIB_INSTALL_DIR)" "$(BIN_INSTALL_DIR)" \
  	    "$(PKG_INSTALL_DIR)" "$(CONFIG_INSTALL_DIR)" ; \
  	    do \
-@@ -731,6 +741,10 @@
- 	@echo "Installing $(LIB_FILE) to @DLL_INSTALL_DIR@/"
+@@ -745,6 +754,10 @@
+ 	@echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/"
  	@@INSTALL_LIB@
- 	@chmod 555 "@DLL_INSTALL_DIR@"/$(LIB_FILE)
+ 	@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 "@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 @@
++	@chmod 555 "@DLL_INSTALL_DIR@"/libtk${SHORT_TK_VER}.a
+ 	@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";\
+@@ -758,9 +771,9 @@
  	    @INSTALL_STUB_LIB@ ; \
  	fi
  	@EXTRA_INSTALL_BINARIES@
@@ -120,26 +82,8 @@
 +	@$(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 to $(MAN1_INSTALL_DIR)/";
--	@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 to $(MAN3_INSTALL_DIR)/";
- 	@for i in $(TOP_DIR)/doc/*.3; do \
--	    $(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 to $(MANN_INSTALL_DIR)/";
- 	@for i in $(TOP_DIR)/doc/*.n; do \
--	    $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MANN_INSTALL_DIR)"; \
-+	    ${BSD_INSTALL_MAN} $$i "$(MANN_INSTALL_DIR)"; \
- 	done
- 
+ 	@for i in "$(SCRIPT_INSTALL_DIR)" "$(SCRIPT_INSTALL_DIR)/images" \
+@@ -858,7 +871,8 @@
  install-headers:
  	@if test "$(@TK_WINDOWINGSYSTEM@_XLIB_HDRS)" != ""; then \
  	    XLIB_INCLUDE_INSTALL_DIR="$(INCLUDE_INSTALL_DIR)"/X11; fi; \
@@ -149,16 +93,13 @@
  	    do \
  	    if [ -n "$$i" -a ! -d "$$i" ] ; then \
  		echo "Making directory $$i"; \
-@@ -844,10 +855,14 @@
- 		else true; \
+@@ -867,9 +881,12 @@
  		fi; \
  	    done;
--	@echo "Installing header files to $(INCLUDE_INSTALL_DIR)/";
+ 	@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)"/
++	@${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)"; \
diff --git a/x11-toolkits/tk86/files/patch-unix::configure b/x11-toolkits/tk86/files/patch-unix::configure
deleted file mode 100644
index fe54d378c06..00000000000
--- a/x11-toolkits/tk86/files/patch-unix::configure
+++ /dev/null
@@ -1,40 +0,0 @@
---- configure.orig	2007-12-17 18:57:25.000000000 +0100
-+++ configure	2007-12-29 14:17:55.000000000 +0100
-@@ -3536,6 +3536,7 @@
- # Threads support - this auto-enables if Tcl was compiled threaded
- #------------------------------------------------------------------------
- 
-+TCL_SRC_DIR=${prefix}/include/tcl${TCLVERSION}
- 
-     # Check whether --enable-threads or --disable-threads was given.
- if test "${enable_threads+set}" = set; then
-@@ -5828,7 +5829,7 @@
- 	    SHLIB_SUFFIX=".so"
- 	    DL_OBJS="tclLoadDl.o"
- 	    DL_LIBS=""
--	    LDFLAGS="$LDFLAGS -export-dynamic"
-+	    LDFLAGS=""
- 	    if test $doRpath = yes; then
- 
- 		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
-@@ -5839,16 +5840,16 @@
- 
- 		# The -pthread needs to go in the CFLAGS, not LIBS
- 		LIBS=`echo $LIBS | sed s/-pthread//`
--		CFLAGS="$CFLAGS -pthread"
--	    	LDFLAGS="$LDFLAGS -pthread"
-+		CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-+	    	LDFLAGS="$LDFLAGS $PTHREAD_LIBS"
- 
- fi
- 
- 	    case $system in
--	    FreeBSD-3.*)
-+	    FreeBSD-*)
- 	    	# FreeBSD-3 doesn't handle version numbers with dots.
- 	    	UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
--	    	SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so'
-+	    	SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1'
- 	    	TCL_LIB_VERSIONS_OK=nodots
- 		;;
- 	    esac
diff --git a/x11-toolkits/tk86/pkg-plist b/x11-toolkits/tk86/pkg-plist
index 7d9d510a0d0..47f078ab07b 100644
--- a/x11-toolkits/tk86/pkg-plist
+++ b/x11-toolkits/tk86/pkg-plist
@@ -36,6 +36,7 @@ lib/libtk%%SHORT_TK_VER%%.a
 lib/libtk%%SHORT_TK_VER%%.so
 lib/libtk%%SHORT_TK_VER%%.so.1
 lib/libtkstub%%SHORT_TK_VER%%.a
+lib/tk%%TK_VER%%/pkgIndex.tcl
 lib/tk%%TK_VER%%/bgerror.tcl
 lib/tk%%TK_VER%%/button.tcl
 lib/tk%%TK_VER%%/choosedir.tcl
@@ -106,7 +107,6 @@ lib/tk%%TK_VER%%/console.tcl
 %%DEMOS%%lib/tk%%TK_VER%%/demos/sayings.tcl
 %%DEMOS%%lib/tk%%TK_VER%%/demos/search.tcl
 %%DEMOS%%lib/tk%%TK_VER%%/demos/spin.tcl
-%%DEMOS%%lib/tk%%TK_VER%%/demos/square
 %%DEMOS%%lib/tk%%TK_VER%%/demos/states.tcl
 %%DEMOS%%lib/tk%%TK_VER%%/demos/style.tcl
 %%DEMOS%%lib/tk%%TK_VER%%/demos/tclIndex
@@ -148,8 +148,8 @@ lib/tk%%TK_VER%%/images/pwrdLogo200.gif
 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%%/menu.tcl
 lib/tk%%TK_VER%%/mkpsenc.tcl
 lib/tk%%TK_VER%%/msgbox.tcl
 lib/tk%%TK_VER%%/msgs/cs.msg
@@ -172,7 +172,6 @@ lib/tk%%TK_VER%%/obsolete.tcl
 lib/tk%%TK_VER%%/optMenu.tcl
 lib/tk%%TK_VER%%/palette.tcl
 lib/tk%%TK_VER%%/panedwindow.tcl
-lib/tk%%TK_VER%%/pkgIndex.tcl
 lib/tk%%TK_VER%%/safetk.tcl
 lib/tk%%TK_VER%%/scale.tcl
 lib/tk%%TK_VER%%/scrlbar.tcl
@@ -211,13 +210,11 @@ 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
 %%DEMOS%%@dirrm lib/tk%%TK_VER%%/demos/images
 %%DEMOS%%@dirrm lib/tk%%TK_VER%%/demos
-@dirrm lib/tk%%TK_VER%%/images
+@dirrm lib/tk%%TK_VER%%/ttk
 @dirrm lib/tk%%TK_VER%%/msgs
+@dirrm lib/tk%%TK_VER%%/images
 @dirrm lib/tk%%TK_VER%%
 @dirrm include/tk%%TK_VER%%/unix
 @dirrm include/tk%%TK_VER%%/generic
diff --git a/x11-toolkits/tk86/pkg-plist.threads b/x11-toolkits/tk86/pkg-plist.threads
deleted file mode 100644
index e8dcd7da52b..00000000000
--- a/x11-toolkits/tk86/pkg-plist.threads
+++ /dev/null
@@ -1,9 +0,0 @@
-bin/wish%%TK_VER%%-threads
-lib/libtk%%SHORT_TK_VER%%-threads.a
-lib/libtk%%SHORT_TK_VER%%-threads.so
-lib/libtk%%SHORT_TK_VER%%-threads.so.1
-lib/libtkstub%%SHORT_TK_VER%%-threads.a
-lib/tk%%TK_VER%%/tkConfig-threads.sh
-lib/tk%%TK_VER%%-threads/tkConfig.sh
-lib/tk%%TK_VER%%-threads/pkgIndex.tcl
-@dirrm lib/tk%%TK_VER%%-threads