- Retire Tcl/Tk 8.2 now that the last consumer (deskutils/abacus) has gone

- Fix typo in previous commit in MOVED

Feature safe:	yes

10 files changed, 0 insertions, 1596 deletions

diff --git a/x11-toolkits/Makefile b/x11-toolkits/Makefile
index 0e6b502e6a1..bf387a794e8 100644
--- a/x11-toolkits/Makefile
+++ b/x11-toolkits/Makefile
@@ -254,7 +254,6 @@
     SUBDIR += tile
     SUBDIR += tix
     SUBDIR += tk-wrapper
-    SUBDIR += tk82
     SUBDIR += tk83
     SUBDIR += tk84
     SUBDIR += tk84-thread
diff --git a/x11-toolkits/tk82/Makefile b/x11-toolkits/tk82/Makefile
deleted file mode 100644
index 49310be289c..00000000000
--- a/x11-toolkits/tk82/Makefile
+++ /dev/null
@@ -1,331 +0,0 @@
-# Created by: jkh
-# $FreeBSD$
-
-PORTNAME=	tk
-PORTVERSION=	8.2.3
-PORTREVISION=	11
-CATEGORIES=	x11-toolkits tk
-MASTER_SITES=	${MASTER_SITE_TCLTK}
-MASTER_SITE_SUBDIR=	tcl8_2
-DISTNAME=	${PORTNAME}${PORTVERSION}
-
-MAINTAINER=	tcltk@FreeBSD.org
-COMMENT=	Graphical toolkit for TCL
-
-DEPRECATED=	no longer maintained upstream
-EXPIRATION_DATE=2012-12-01
-
-USE_TCL=	82
-USE_TCL_BUILD=	82
-
-PORTSCOUT=	limit:^8\.2\.
-
-LATEST_LINK=	tk82
-USE_XORG=	x11
-USE_LDCONFIG=	yes
-WRKSRC=		${WRKDIR}/${DISTNAME}/unix
-GNU_CONFIGURE=	yes
-TK_VER=		8.2
-SHORT_TK_VER=	82
-CONFIGURE_ARGS=	--enable-shared --with-tcl=${PREFIX}/lib/tcl${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}
-TCL82_PORT?=	lang/tcl82
-MANCOMPRESSED=	no
-
-OPTIONS_DEFINE=	TK82_MAN
-TK82_MAN_DESC=	Install tk 8.2 manpages
-
-.include <bsd.port.options.mk>
-
-.if !defined(NO_INSTALL_MANPAGES) && ${PORT_OPTIONS:MTK82_MAN}
-
-MAN1=	wish.1
-MAN3=	3DBorder.3 BindTable.3 CanvPsY.3 CanvTkwin.3 CanvTxtInfo.3 \
-	Clipboard.3 ClrSelect.3 ConfigWidg.3 ConfigWind.3 CoordToWin.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 GetFont.3 GetGC.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 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 \
-	SetClass.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 clipboard.n destroy.n dialog.n entry.n event.n \
-	focus.n focusNext.n font.n frame.n getOpenFile.n grab.n grid.n \
-	image.n label.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 palette.n photo.n place.n popup.n radiobutton.n \
-	raise.n scale.n scrollbar.n selection.n send.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 \
-	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 \
-	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 \
-	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_FontMetrics.3 \
-	FontId.3 Tk_PostscriptFontName.3 \
-	FreeXId.3 Tk_FreeXId.3 \
-	GeomReq.3 Tk_GeometryRequest.3 \
-	GeomReq.3 Tk_SetInternalBorder.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 \
-	GetBitmap.3 Tk_GetBitmapFromData.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 \
-	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 \
-	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 \
-	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 \
-	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 \
-	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_QueueWindowEvent.3 \
-	Restack.3 Tk_RestackWindow.3 \
-	RestrictEv.3 Tk_RestrictEvents.3 \
-	SetAppName.3 Tk_SetAppName.3 \
-	SetClass.3 Tk_SetClass.3 \
-	SetClass.3 Tk_Class.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 \
-	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_IsMapped.3 \
-	WindowId.3 Tk_IsTopLevel.3 \
-	WindowId.3 Tk_ReqWidth.3 \
-	WindowId.3 Tk_ReqHeight.3 \
-	WindowId.3 Tk_InternalBorderWidth.3 \
-	WindowId.3 Tk_Visual.3 \
-	WindowId.3 Tk_Depth.3 \
-	WindowId.3 Tk_Colormap.3 \
-	chooseColor.n tk_chooseColor.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 \
-	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
-
-.endif
-
-TKBASE?=	${PORTSDIR}/${PKGCATEGORY}/${LATEST_LINK}
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|X11/Intrinsic.h|X11/Xlib.h|g' ${WRKSRC}/configure
-
-post-configure:
-	${REINPLACE_CMD} \
-		-e 's|${WRKDIRPREFIX}${.CURDIR}|$${WRKDIRPREFIX}${TKBASE}|' \
-		${WRKSRC}/tkConfig.sh
-
-post-install:
-	${INSTALL_DATA} ${FILESDIR}/pkgIndex.tcl ${PREFIX}/lib/tk${TK_VER}/
-.if !defined(NO_INSTALL_MANPAGES) && ${PORT_OPTIONS:MTK82_MAN}
-	@cd ${WRKSRC} && ${MAKE} -f Makefile install-doc
-.endif
-
-test:
-	cd ${WRKSRC}; make test
-
-.include <bsd.port.mk>
diff --git a/x11-toolkits/tk82/distinfo b/x11-toolkits/tk82/distinfo
deleted file mode 100644
index 0d552c91750..00000000000
--- a/x11-toolkits/tk82/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (tk8.2.3.tar.gz) = 8aeae58efca312c47d8b01e6576fad7bb593b2e2cf94884dc934ff841fd10152
-SIZE (tk8.2.3.tar.gz) = 2336460
diff --git a/x11-toolkits/tk82/files/patch-aa b/x11-toolkits/tk82/files/patch-aa
deleted file mode 100644
index b77799c008e..00000000000
--- a/x11-toolkits/tk82/files/patch-aa
+++ /dev/null
@@ -1,47 +0,0 @@
---- configure.orig	1999-12-15 05:00:19.000000000 +0100
-+++ configure	2009-10-26 16:31:21.000000000 +0100
-@@ -1453,7 +1453,7 @@
- 	    # results, and the version is kept in special file).
- 	
- 	    if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
--		system=MP-RAS-`awk '{print }' /etc/.relid'`
-+		system=MP-RAS-`awk '{print }' '/etc/.relid'`
- 	    fi
- 	    if test "`uname -s`" = "AIX" ; then
- 		system=AIX-`uname -v`.`uname -r`
-@@ -1757,7 +1757,7 @@
- 	    LDFLAGS="-Wl,-Bexport"
- 	    LD_SEARCH_FLAGS=""
- 	    ;;
--	NetBSD-*|FreeBSD-[1-2].*|OpenBSD-*)
-+	NetBSD-*|FreeBSD-*|OpenBSD-*)
- 	    # Not available on all versions:  check for include file.
- 	    ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6
-@@ -1788,15 +1788,15 @@
- if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
-   
--		SHLIB_CFLAGS="-fpic"
--		SHLIB_LD="ld -Bshareable -x"
-+		SHLIB_CFLAGS="-fPIC"
- 		SHLIB_LD_LIBS=""
- 		SHLIB_SUFFIX=".so"
- 		DL_OBJS="tclLoadDl.o"
- 		DL_LIBS=""
- 		LDFLAGS=""
- 		LD_SEARCH_FLAGS=""
--		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0'
-+		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1'
-+		SHLIB_LD="ld -shared -x -soname \$@"
- 	    
- else
-   echo "$ac_t""no" 1>&6
-@@ -2267,6 +2267,7 @@
- 	echo "$ac_t""no" 1>&6
-     fi
- 
-+TCL_SRC_DIR=${prefix}/include/tcl${TCL_VERSION}
- 
- LIB_RUNTIME_DIR='${LIB_RUNTIME_DIR}'
- 
diff --git a/x11-toolkits/tk82/files/patch-ab b/x11-toolkits/tk82/files/patch-ab
deleted file mode 100644
index 6642a3048b4..00000000000
--- a/x11-toolkits/tk82/files/patch-ab
+++ /dev/null
@@ -1,145 +0,0 @@
---- Makefile.in.orig	Wed Dec 15 05:00:19 1999
-+++ Makefile.in	Mon Mar 12 17:42:52 2007
-@@ -56,7 +56,9 @@
- BIN_DIR =		$(exec_prefix)/bin
- 
- # Directory in which to install the include file tk.h:
--INCLUDE_INSTALL_DIR =	$(INSTALL_ROOT)$(prefix)/include
-+INCLUDE_INSTALL_DIR =	$(INSTALL_ROOT)$(prefix)/include/tk$(VERSION)
-+GENERIC_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/generic
-+UNIX_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/unix
- 
- # Top-level directory for manual entries:
- MAN_INSTALL_DIR =	$(INSTALL_ROOT)$(prefix)/man
-@@ -99,7 +101,7 @@
- #CFLAGS = 		$(CFLAGS_DEBUG)
- #CFLAGS = 		$(CFLAGS_OPTIMIZE)
- #CFLAGS = 		$(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE)
--CFLAGS = 		@CFLAGS@
-+CFLAGS ?= 		@CFLAGS@
- 
- # A "-I" switch that can be used when compiling to make all of the
- # X11 include files accessible (the configure script will try to
-@@ -153,7 +155,7 @@
- # "install" around;  better to use the install-sh script that comes
- # with the distribution, which is slower but guaranteed to work.
- 
--INSTALL = @srcdir@/install-sh -c
-+INSTALL = install -c
- INSTALL_PROGRAM =	${INSTALL}
- INSTALL_DATA =		${INSTALL} -m 644
- 
-@@ -190,7 +192,7 @@
- # Libraries to use when linking.  This definition is determined by the
- # configure script.
- LIBS = @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc
--WISH_LIBS = $(TCL_LIB_SPEC) @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc
-+WISH_LIBS = -L${PREFIX}/lib -ltcl82 @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc
- 
- # The symbol below provides support for dynamic loading and shared
- # libraries.  See configure.in for a description of what it means.
-@@ -361,8 +363,14 @@
- ${TK_LIB_FILE}: ${OBJS}
- 	rm -f ${TK_LIB_FILE}
- 	@MAKE_LIB@
-+	ln -sf @TK_LIB_FILE@ libtk82.so
- 	$(RANLIB) ${TK_LIB_FILE}
- 
-+libtk82.a: ${OBJS}
-+	rm -f libtk82.a
-+	ar cr libtk82.a ${OBJS}
-+	$(RANLIB) libtk82.a
-+
- ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
- 	rm -f ${STUB_LIB_FILE}
- 	@MAKE_STUB_LIB@
-@@ -419,13 +427,13 @@
- 	TK_LIBRARY=@TK_SRC_DIR@/library; export TK_LIBRARY; \
- 	./tktest
- 
--install: all install-binaries install-libraries install-demos install-doc
-+install: all install-binaries install-libraries install-demos
- 
- # Note: before running ranlib below, must cd to target directory because
- # 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) libtk82.a wish
- 	@for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \
- 	    do \
- 	    if [ ! -d $$i ] ; then \
-@@ -439,12 +447,18 @@
- 	chmod +x $(UNIX_DIR)/install-sh
- 	chmod +x $(UNIX_DIR)/mkLinks
- 	@$(INSTALL_DATA) $(TK_LIB_FILE) $(LIB_INSTALL_DIR)/$(TK_LIB_FILE)
-+	@ln -sf $(LIB_INSTALL_DIR)/$(TK_LIB_FILE) $(LIB_INSTALL_DIR)/libtk82.so
- 	@(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TK_LIB_FILE))
- 	@chmod 555 $(LIB_INSTALL_DIR)/$(TK_LIB_FILE)
-+	@echo "Installing libtk82.a"
-+	@$(INSTALL_DATA) libtk82.a $(LIB_INSTALL_DIR)/libtk82.a
-+	@(cd $(LIB_INSTALL_DIR); $(RANLIB) libtk82.a)
-+	@chmod 555 $(LIB_INSTALL_DIR)/libtk82.a
- 	@echo "Installing wish"
- 	@$(INSTALL_PROGRAM) wish $(BIN_INSTALL_DIR)/wish$(VERSION)
- 	@echo "Installing tkConfig.sh"
--	@$(INSTALL_DATA) tkConfig.sh $(LIB_INSTALL_DIR)/tkConfig.sh
-+	@mkdir -p $(LIB_INSTALL_DIR)/tk$(VERSION)
-+	@$(INSTALL_DATA) tkConfig.sh $(LIB_INSTALL_DIR)/tk$(VERSION)/tkConfig.sh
- 	@if test "$(TK_BUILD_EXP_FILE)" != ""; then \
- 	    echo "Installing $(TK_EXP_FILE)"; \
- 	    $(INSTALL_DATA) $(TK_BUILD_EXP_FILE) \
-@@ -458,6 +472,7 @@
- 
- install-libraries:
- 	@for i in $(INSTALL_ROOT)$(prefix)/lib $(INCLUDE_INSTALL_DIR) \
-+		$(GENERIC_INCLUDE_INSTALL_DIR) $(UNIX_INCLUDE_INSTALL_DIR) \
- 		$(SCRIPT_INSTALL_DIR) $(SCRIPT_INSTALL_DIR)/images; \
- 	    do \
- 	    if [ ! -d $$i ] ; then \
-@@ -468,11 +483,19 @@
- 		fi; \
- 	    done;
- 	chmod +x $(UNIX_DIR)/install-sh
--	@for i in $(GENERIC_DIR)/tk.h $(GENERIC_DIR)/tkDecls.h ; \
-+	@echo "Installing headers"
-+	@for i in $(GENERIC_DIR)/*.h ; \
- 	    do \
- 	    echo "Installing $$i"; \
--	    $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR); \
-+	    $(INSTALL_DATA) $$i $(GENERIC_INCLUDE_INSTALL_DIR); \
- 	    done;
-+	@for i in $(UNIX_DIR)/*.h ; \
-+	do \
-+	echo "Installing $$i"; \
-+	$(INSTALL_DATA) $$i $(UNIX_INCLUDE_INSTALL_DIR); \
-+	done ;
-+	@ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tk.h $(INCLUDE_INSTALL_DIR)/tk.h
-+	@ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tkDecls.h $(INCLUDE_INSTALL_DIR)/tkDecls.h
- 	for i in $(SRC_DIR)/library/*.tcl $(GENERIC_DIR)/prolog.ps \
- 	        $(SRC_DIR)/library/tclIndex $(UNIX_DIR)/tkAppInit.c; \
- 	    do \
-@@ -537,7 +560,6 @@
- 		    $$i > $(MAN1_INSTALL_DIR)/$$i; \
- 	    chmod 444 $(MAN1_INSTALL_DIR)/$$i; \
- 	    done;
--	$(UNIX_DIR)/mkLinks $(MAN1_INSTALL_DIR)
- 	@cd $(SRC_DIR)/doc; for i in *.3; \
- 	    do \
- 	    echo "Installing doc/$$i"; \
-@@ -546,7 +568,6 @@
- 		    $$i > $(MAN3_INSTALL_DIR)/$$i; \
- 	    chmod 444 $(MAN3_INSTALL_DIR)/$$i; \
- 	    done;
--	$(UNIX_DIR)/mkLinks $(MAN3_INSTALL_DIR)
- 	@cd $(SRC_DIR)/doc; for i in *.n; \
- 	    do \
- 	    echo "Installing doc/$$i"; \
-@@ -555,7 +576,6 @@
- 		    $$i > $(MANN_INSTALL_DIR)/$$i; \
- 	    chmod 444 $(MANN_INSTALL_DIR)/$$i; \
- 	    done;
--	$(UNIX_DIR)/mkLinks $(MANN_INSTALL_DIR)
- 
- Makefile: $(UNIX_DIR)/Makefile.in
- 	$(SHELL) config.status
diff --git a/x11-toolkits/tk82/files/patch-ac b/x11-toolkits/tk82/files/patch-ac
deleted file mode 100644
index 60bf7f48b02..00000000000
--- a/x11-toolkits/tk82/files/patch-ac
+++ /dev/null
@@ -1,911 +0,0 @@
-*** tkText.c	1999/04/14 18:05:40	1.1
---- ../generic/tkText.c	1999/04/14 18:06:15
-***************
-*** 853,858 ****
---- 853,859 ----
-  	    || (textPtr->selTagPtr->spacing2String != NULL)
-  	    || (textPtr->selTagPtr->spacing3String != NULL)
-  	    || (textPtr->selTagPtr->tabString != NULL)
-+ 	    || (textPtr->selTagPtr->elideString != NULL)
-  	    || (textPtr->selTagPtr->underlineString != NULL)
-  	    || (textPtr->selTagPtr->wrapMode != NULL)) {
-  	textPtr->selTagPtr->affectsDisplay = 1;
-***************
-*** 1402,1408 ****
-  		    }
-  		}
-  	    }
-! 	    if (segPtr->typePtr == &tkTextCharType) {
-  		memcpy((VOID *) buffer, (VOID *) (segPtr->body.chars
-  			+ offsetInSeg), (size_t) chunkSize);
-  		buffer += chunkSize;
---- 1403,1409 ----
-  		    }
-  		}
-  	    }
-! 	    if (segPtr->typePtr == &tkTextCharType && !TkTextIsElided(textPtr, &textPtr->selIndex)) {
-  		memcpy((VOID *) buffer, (VOID *) (segPtr->body.chars
-  			+ offsetInSeg), (size_t) chunkSize);
-  		buffer += chunkSize;
-***************
-*** 1543,1549 ****
-      int argc;			/* Number of arguments. */
-      char **argv;		/* Argument strings. */
-  {
-!     int backwards, exact, c, i, argsLeft, noCase, leftToScan;
-      size_t length;
-      int numLines, startingLine, startingByte, lineNum, firstByte, lastByte;
-      int code, matchLength, matchByte, passes, stopLine, searchWholeText;
---- 1544,1550 ----
-      int argc;			/* Number of arguments. */
-      char **argv;		/* Argument strings. */
-  {
-!     int backwards, exact, searchElide, c, i, argsLeft, noCase, leftToScan;
-      size_t length;
-      int numLines, startingLine, startingByte, lineNum, firstByte, lastByte;
-      int code, matchLength, matchByte, passes, stopLine, searchWholeText;
-***************
-*** 1554,1559 ****
---- 1555,1561 ----
-      Tcl_DString line, patDString;
-      TkTextSegment *segPtr;
-      TkTextLine *linePtr;
-+     TkTextIndex curIndex;
-      Tcl_RegExp regexp = NULL;		/* Initialization needed only to
-  					 * prevent compiler warning. */
-  
-***************
-*** 1562,1567 ****
---- 1564,1571 ----
-       */
-  
-      exact = 1;
-+     searchElide = 0;
-+     curIndex.tree = textPtr->tree;
-      backwards = 0;
-      noCase = 0;
-      varName = NULL;
-***************
-*** 1575,1581 ****
-  	    badSwitch:
-  	    Tcl_AppendResult(interp, "bad switch \"", arg,
-  		    "\": must be -forward, -backward, -exact, -regexp, ",
-! 		    "-nocase, -count, or --", (char *) NULL);
-  	    return TCL_ERROR;
-  	}
-  	c = arg[1];
---- 1579,1585 ----
-  	    badSwitch:
-  	    Tcl_AppendResult(interp, "bad switch \"", arg,
-  		    "\": must be -forward, -backward, -exact, -regexp, ",
-! 		    "-nocase, -count, -elide, or --", (char *) NULL);
-  	    return TCL_ERROR;
-  	}
-  	c = arg[1];
-***************
-*** 1597,1602 ****
---- 1601,1608 ----
-  	    noCase = 1;
-  	} else if ((c == 'r') && (strncmp(argv[i], "-regexp", length) == 0)) {
-  	    exact = 0;
-+ 	} else if ((c == 'e') && (strncmp(argv[i], "-elide", length) == 0)) {
-+ 	    searchElide = 1;
-  	} else if ((c == '-') && (strncmp(argv[i], "--", length) == 0)) {
-  	    i++;
-  	    break;
-***************
-*** 1688,1696 ****
-  	 */
-  
-  	linePtr = TkBTreeFindLine(textPtr->tree, lineNum);
-  	for (segPtr = linePtr->segPtr; segPtr != NULL;
-! 		segPtr = segPtr->nextPtr) {
-! 	    if (segPtr->typePtr != &tkTextCharType) {
-  		continue;
-  	    }
-  	    Tcl_DStringAppend(&line, segPtr->body.chars, segPtr->size);
---- 1694,1703 ----
-  	 */
-  
-  	linePtr = TkBTreeFindLine(textPtr->tree, lineNum);
-+ 	curIndex.linePtr = linePtr; curIndex.byteIndex = 0;
-  	for (segPtr = linePtr->segPtr; segPtr != NULL;
-! 		curIndex.byteIndex += segPtr->size, segPtr = segPtr->nextPtr) {
-! 	    if (segPtr->typePtr != &tkTextCharType || (!searchElide && TkTextIsElided(textPtr, &curIndex))) {
-  		continue;
-  	    }
-  	    Tcl_DStringAppend(&line, segPtr->body.chars, segPtr->size);
-*** tkText.h	1999/04/14 18:05:40	1.1
---- ../generic/tkText.h	1999/04/14 18:06:15
-***************
-*** 370,375 ****
---- 370,379 ----
-  				 * Must be tkTextCharUid, tkTextNoneUid,
-  				 * tkTextWordUid, or NULL to use wrapMode
-  				 * for whole widget. */
-+     char *elideString;	/* -elide option string (malloc-ed).
-+ 				 * NULL means option not specified. */
-+     int elide;		/* Non-zero means text is elided.
-+ 				 * Only valid if elideString is non-NULL. */
-      int affectsDisplay;		/* Non-zero means that this tag affects the
-  				 * way information is displayed on the screen
-  				 * (so need to redisplay if tag changes). */
-***************
-*** 810,815 ****
---- 814,821 ----
-  			    ClientData clientData));
-  extern TkTextIndex *	TkTextMakeCharIndex _ANSI_ARGS_((TkTextBTree tree,
-  			    int lineIndex, int charIndex,
-+ 			    TkTextIndex *indexPtr));
-+ extern int		TkTextIsElided _ANSI_ARGS_((TkText *textPtr,
-  			    TkTextIndex *indexPtr));
-  extern TkTextIndex *	TkTextMakeByteIndex _ANSI_ARGS_((TkTextBTree tree,
-  			    int lineIndex, int byteIndex,
-*** tkTextBTree.c	1999/04/14 18:05:40	1.1
---- ../generic/tkTextBTree.c	1999/04/14 18:06:15
-***************
-*** 2427,2432 ****
---- 2427,2558 ----
-      }
-      return tagInfo.tagPtrs;
-  }
-+ 
-+ 
-+ /*
-+    special case to just return information about elided attribute
-+    specialized from TkBTreeGetTags(indexPtr, numTagsPtr) and GetStyle(textPtr, indexPtr)
-+    just need to keep track of invisibility settings for each priority, pick highest one active at end
-+ */
-+ int
-+ TkTextIsElided(textPtr, indexPtr)
-+     TkText *textPtr;		/* Overall information about text widget. */
-+     TkTextIndex *indexPtr;	/* The character in the text for which
-+ 				 * display information is wanted. */
-+ {
-+ #define LOTSA_TAGS 1000
-+ 	int elide = 0;		/* if nobody says otherwise, it's visible */
-+ 
-+ 	int deftagCnts[LOTSA_TAGS];
-+ 	int *tagCnts = deftagCnts;
-+ 	TkTextTag *deftagPtrs[LOTSA_TAGS];
-+ 	TkTextTag **tagPtrs = deftagPtrs;
-+ 	int numTags = textPtr->numTags;
-+     register Node *nodePtr;
-+     register TkTextLine *siblingLinePtr;
-+     register TkTextSegment *segPtr;
-+     register TkTextTag *tagPtr;
-+     register int i, index;
-+ 
-+ 	/* almost always avoid malloc, so stay out of system calls */
-+ 	if (LOTSA_TAGS < numTags) {
-+ 	    tagCnts = (int *)ckalloc((unsigned)sizeof(int) * numTags);
-+ 	    tagPtrs = (TkTextTag **)ckalloc((unsigned)sizeof(TkTextTag *) * numTags);
-+ 	}
-+  
-+ 	for (i=0; i<numTags; i++) tagCnts[i]=0;
-+ 
-+ 
-+     /*
-+      * Record tag toggles within the line of indexPtr but preceding
-+      * indexPtr.
-+      */
-+ 
-+     for (index = 0, segPtr = indexPtr->linePtr->segPtr;
-+ 	    (index + segPtr->size) <= indexPtr->byteIndex;
-+ 	    index += segPtr->size, segPtr = segPtr->nextPtr) {
-+ 	if ((segPtr->typePtr == &tkTextToggleOnType)
-+ 	    || (segPtr->typePtr == &tkTextToggleOffType)) {
-+ 	    tagPtr = segPtr->body.toggle.tagPtr;
-+ 	    if (tagPtr->elideString != NULL) {
-+ 		   tagPtrs[tagPtr->priority] = tagPtr;
-+ 		   tagCnts[tagPtr->priority]++;
-+ 	    }
-+ 	}
-+     }
-+ 
-+     /*
-+      * Record toggles for tags in lines that are predecessors of
-+      * indexPtr->linePtr but under the same level-0 node.
-+      */
-+ 
-+     for (siblingLinePtr = indexPtr->linePtr->parentPtr->children.linePtr;
-+ 	    siblingLinePtr != indexPtr->linePtr;
-+ 	    siblingLinePtr = siblingLinePtr->nextPtr) {
-+ 	for (segPtr = siblingLinePtr->segPtr; segPtr != NULL;
-+ 		segPtr = segPtr->nextPtr) {
-+ 	    if ((segPtr->typePtr == &tkTextToggleOnType)
-+ 		   || (segPtr->typePtr == &tkTextToggleOffType)) {
-+ 		   tagPtr = segPtr->body.toggle.tagPtr;
-+ 		   if (tagPtr->elideString != NULL) {
-+ 			  tagPtrs[tagPtr->priority] = tagPtr;
-+ 			  tagCnts[tagPtr->priority]++;
-+ 		   }
-+ 	    }
-+ 	}
-+     }
-+ 
-+     /*
-+      * For each node in the ancestry of this line, record tag toggles
-+      * for all siblings that precede that node.
-+      */
-+ 
-+     for (nodePtr = indexPtr->linePtr->parentPtr; nodePtr->parentPtr != NULL;
-+ 	    nodePtr = nodePtr->parentPtr) {
-+ 	register Node *siblingPtr;
-+ 	register Summary *summaryPtr;
-+ 
-+ 	for (siblingPtr = nodePtr->parentPtr->children.nodePtr; 
-+ 		siblingPtr != nodePtr; siblingPtr = siblingPtr->nextPtr) {
-+ 	    for (summaryPtr = siblingPtr->summaryPtr; summaryPtr != NULL;
-+ 		    summaryPtr = summaryPtr->nextPtr) {
-+ 		if (summaryPtr->toggleCount & 1) {
-+ 		    tagPtr = summaryPtr->tagPtr;
-+ 		    if (tagPtr->elideString != NULL) {
-+ 			   tagPtrs[tagPtr->priority] = tagPtr;
-+ 			   tagCnts[tagPtr->priority] += summaryPtr->toggleCount;
-+ 		    }
-+ 		}
-+ 	    }
-+ 	}
-+     }
-+ 
-+ 
-+     /*
-+      * Now traverse from highest priority to lowest, 
-+      * take elided value from first odd count (= on)
-+      */
-+ 
-+     for (i = numTags-1; i >=0; i--) {
-+ 	   if (tagCnts[i] & 1) {
-+ #ifndef ALWAYS_SHOW_SELECTION
-+ 		  /* who would make the selection elided? */
-+ 		  if ((tagPtr == textPtr->selTagPtr) && !(textPtr->flags & GOT_FOCUS)) {
-+ 			 continue;
-+ 		  }
-+ #endif
-+ 		  elide = tagPtrs[i]->elide;
-+ 		  break;
-+ 	   }
-+     }
-+ 
-+     if (LOTSA_TAGS < numTags) {
-+ 	   ckfree((char *) tagCnts);
-+ 	   ckfree((char *) tagPtrs);
-+     }
-+ 
-+     return elide;
-+ }
-  
-  /*
-   *----------------------------------------------------------------------
-*** tkTextDisp.c	1999/04/14 18:05:40	1.1
---- ../generic/tkTextDisp.c	1999/04/14 18:12:34
-***************
-*** 59,64 ****
---- 59,65 ----
-  				 * be NULL). */
-      int underline;		/* Non-zero means draw underline underneath
-  				 * text. */
-+     int elide;		/* Non-zero means draw text */
-      Tk_Uid wrapMode;		/* How to handle wrap-around for this tag.
-  				 * One of char, none, or text. */
-  } StyleValues;
-***************
-*** 315,320 ****
---- 316,336 ----
-  			    int x));
-  static void		CharUndisplayProc _ANSI_ARGS_((TkText *textPtr,
-  			    TkTextDispChunk *chunkPtr));
-+ 
-+ /*
-+    Definitions of elided procs.
-+    Compiler can't inline these since we use pointers to these functions.
-+    ElideDisplayProc, ElideUndisplayProc special-cased for speed,
-+    as potentially many elided DLine chunks if large, tag toggle-filled
-+    elided region.
-+ */
-+ static void		ElideBboxProc _ANSI_ARGS_((TkTextDispChunk *chunkPtr,
-+ 			    int index, int y, int lineHeight, int baseline,
-+ 			    int *xPtr, int *yPtr, int *widthPtr,
-+ 			    int *heightPtr));
-+ static int		ElideMeasureProc _ANSI_ARGS_((TkTextDispChunk *chunkPtr,
-+ 			    int x));
-+ 
-  static void		DisplayDLine _ANSI_ARGS_((TkText *textPtr,
-  			    DLine *dlPtr, DLine *prevPtr, Pixmap pixmap));
-  static void		DisplayLineBackground _ANSI_ARGS_((TkText *textPtr,
-***************
-*** 483,489 ****
-  
-      int borderPrio, borderWidthPrio, reliefPrio, bgStipplePrio;
-      int fgPrio, fontPrio, fgStipplePrio;
-!     int underlinePrio, justifyPrio, offsetPrio;
-      int lMargin1Prio, lMargin2Prio, rMarginPrio;
-      int spacing1Prio, spacing2Prio, spacing3Prio;
-      int overstrikePrio, tabPrio, wrapPrio;
---- 499,505 ----
-  
-      int borderPrio, borderWidthPrio, reliefPrio, bgStipplePrio;
-      int fgPrio, fontPrio, fgStipplePrio;
-!     int underlinePrio, elidePrio, justifyPrio, offsetPrio;
-      int lMargin1Prio, lMargin2Prio, rMarginPrio;
-      int spacing1Prio, spacing2Prio, spacing3Prio;
-      int overstrikePrio, tabPrio, wrapPrio;
-***************
-*** 498,504 ****
-      tagPtrs = TkBTreeGetTags(indexPtr, &numTags);
-      borderPrio = borderWidthPrio = reliefPrio = bgStipplePrio = -1;
-      fgPrio = fontPrio = fgStipplePrio = -1;
-!     underlinePrio = justifyPrio = offsetPrio = -1;
-      lMargin1Prio = lMargin2Prio = rMarginPrio = -1;
-      spacing1Prio = spacing2Prio = spacing3Prio = -1;
-      overstrikePrio = tabPrio = wrapPrio = -1;
---- 514,520 ----
-      tagPtrs = TkBTreeGetTags(indexPtr, &numTags);
-      borderPrio = borderWidthPrio = reliefPrio = bgStipplePrio = -1;
-      fgPrio = fontPrio = fgStipplePrio = -1;
-!     underlinePrio = elidePrio = justifyPrio = offsetPrio = -1;
-      lMargin1Prio = lMargin2Prio = rMarginPrio = -1;
-      spacing1Prio = spacing2Prio = spacing3Prio = -1;
-      overstrikePrio = tabPrio = wrapPrio = -1;
-***************
-*** 616,621 ****
---- 632,642 ----
-  	    styleValues.underline = tagPtr->underline;
-  	    underlinePrio = tagPtr->priority;
-  	}
-+ 	if ((tagPtr->elideString != NULL)
-+ 		&& (tagPtr->priority > elidePrio)) {
-+ 	    styleValues.elide = tagPtr->elide;
-+ 	    elidePrio = tagPtr->priority;
-+ 	}
-  	if ((tagPtr->wrapMode != NULL)
-  		&& (tagPtr->priority > wrapPrio)) {
-  	    styleValues.wrapMode = tagPtr->wrapMode;
-***************
-*** 775,781 ****
-  					 * lines with numBytes > 0.  Used to
-  					 * drop 0-sized chunks from the end
-  					 * of the line. */
-!     int byteOffset, ascent, descent, code;
-      StyleValues *sValuePtr;
-  
-      /*
---- 796,802 ----
-  					 * lines with numBytes > 0.  Used to
-  					 * drop 0-sized chunks from the end
-  					 * of the line. */
-!     int byteOffset, ascent, descent, code, elide, elidesize;
-      StyleValues *sValuePtr;
-  
-      /*
-***************
-*** 793,798 ****
---- 814,847 ----
-      dlPtr->nextPtr = NULL;
-      dlPtr->flags = NEW_LAYOUT;
-  
-+ 
-+     /*
-+ 	* special case entirely elide line as there may be 1000s or more
-+ 	*/
-+ 	elide = TkTextIsElided(textPtr, indexPtr);		/* save a malloc */
-+ 	if (elide && indexPtr->byteIndex==0) {
-+ 		maxBytes = 0;
-+ 		for (segPtr = indexPtr->linePtr->segPtr; elide && segPtr!=NULL; segPtr = segPtr->nextPtr) {
-+ 			if ((elidesize = segPtr->size) > 0) {
-+ 				maxBytes += elidesize;
-+ 
-+ 			/* if have tag toggle, chance that invisibility state changed, so bail out */
-+ 			} else if (segPtr->typePtr == &tkTextToggleOffType || segPtr->typePtr == &tkTextToggleOnType) {
-+ 				if (segPtr->body.toggle.tagPtr->elideString!=NULL) {
-+ 					elide = (segPtr->typePtr == &tkTextToggleOffType) ^ (segPtr->body.toggle.tagPtr->elide==1);
-+ 				}
-+ 			}
-+ 		}
-+ 
-+ 		if (elide) {
-+ 		    dlPtr->byteCount = maxBytes;
-+ 		    dlPtr->spaceAbove = dlPtr->spaceBelow = dlPtr->length = 0;
-+ 		    return dlPtr;
-+ 		}
-+ 	}
-+ 
-+ 
-+ 
-      /*
-       * Each iteration of the loop below creates one TkTextDispChunk for
-       * the new display line.  The line will always have at least one
-***************
-*** 804,809 ****
---- 853,859 ----
-      lastChunkPtr = NULL;
-      chunkPtr = NULL;
-      noCharsYet = 1;
-+     elide = 0;
-      breakChunkPtr = NULL;
-      breakByteOffset = 0;
-      justify = TK_JUSTIFY_LEFT;
-***************
-*** 828,833 ****
---- 878,908 ----
-      }
-  
-      while (segPtr != NULL) {
-+ 
-+ 	/* every line still gets at least one chunk due to expectations in rest of code,
-+ 	   but able to skip elided portions of line quickly */
-+ 	/* if current chunk elided and last chunk was too, coalese */
-+ 	if (elide && lastChunkPtr!=NULL && lastChunkPtr->displayProc == NULL/*ElideDisplayProc*/) {
-+ 	    if ((elidesize = segPtr->size - byteOffset) > 0) {
-+ 		   curIndex.byteIndex += elidesize;
-+ 		   lastChunkPtr->numBytes += elidesize;
-+ 		   breakByteOffset = lastChunkPtr->breakIndex = lastChunkPtr->numBytes;
-+ 
-+ 	    /* if have tag toggle, chance that invisibility state changed */
-+ 	    } else if (segPtr->typePtr == &tkTextToggleOffType || segPtr->typePtr == &tkTextToggleOnType) {
-+ 		   if (segPtr->body.toggle.tagPtr->elideString!=NULL) {
-+ 			  elide = (segPtr->typePtr == &tkTextToggleOffType) ^ (segPtr->body.toggle.tagPtr->elide==1);
-+ 		   }
-+ 	    }
-+ 
-+ 	    byteOffset = 0;
-+ 	    segPtr = segPtr->nextPtr;
-+ 	    if (segPtr == NULL && chunkPtr != NULL) ckfree((char *) chunkPtr);
-+ 
-+ 	    continue;
-+ 	}
-+ 
-+ 
-  	if (segPtr->typePtr->layoutProc == NULL) {
-  	    segPtr = segPtr->nextPtr;
-  	    byteOffset = 0;
-***************
-*** 838,843 ****
---- 913,919 ----
-  	    chunkPtr->nextPtr = NULL;
-  	}
-  	chunkPtr->stylePtr = GetStyle(textPtr, &curIndex);
-+ 	elide = chunkPtr->stylePtr->sValuePtr->elide;
-  
-  	/*
-  	 * Save style information such as justification and indentation,
-***************
-*** 871,877 ****
-  
-  	gotTab = 0;
-  	maxBytes = segPtr->size - byteOffset;
-! 	if (justify == TK_JUSTIFY_LEFT) {
-  	    if (segPtr->typePtr == &tkTextCharType) {
-  		char *p;
-  
---- 947,953 ----
-  
-  	gotTab = 0;
-  	maxBytes = segPtr->size - byteOffset;
-! 	if (!elide && justify == TK_JUSTIFY_LEFT) {
-  	    if (segPtr->typePtr == &tkTextCharType) {
-  		char *p;
-  
-***************
-*** 884,891 ****
-  		}
-  	    }
-  	}
-- 
-  	chunkPtr->x = x;
-  	code = (*segPtr->typePtr->layoutProc)(textPtr, &curIndex, segPtr,
-  		byteOffset, maxX-tabSize, maxBytes, noCharsYet, wrapMode,
-  		chunkPtr);
---- 960,980 ----
-  		}
-  	    }
-  	}
-  	chunkPtr->x = x;
-+ 	if (elide && maxBytes) {
-+ 	    /* don't free style here, as other code expects to be able to do that */
-+ 	    /*breakByteOffset =*/ chunkPtr->breakIndex = chunkPtr->numBytes = maxBytes;
-+ 	    chunkPtr->width = 0;
-+ 	    chunkPtr->minAscent = chunkPtr->minDescent = chunkPtr->minHeight = 0;
-+ 
-+ 	    /* would just like to point to canonical empty chunk */
-+ 	    chunkPtr->displayProc = (Tk_ChunkDisplayProc *) NULL;
-+ 	    chunkPtr->undisplayProc = (Tk_ChunkUndisplayProc *) NULL;
-+ 	    chunkPtr->measureProc = ElideMeasureProc;
-+ 	    chunkPtr->bboxProc = ElideBboxProc;
-+ 
-+ 	    code = 1;
-+ 	} else
-  	code = (*segPtr->typePtr->layoutProc)(textPtr, &curIndex, segPtr,
-  		byteOffset, maxX-tabSize, maxBytes, noCharsYet, wrapMode,
-  		chunkPtr);
-***************
-*** 957,962 ****
---- 1046,1052 ----
-  	    byteOffset = 0;
-  	    segPtr = segPtr->nextPtr;
-  	}
-+ 
-  	chunkPtr = NULL;
-      }
-      if (noCharsYet) {
-***************
-*** 1005,1010 ****
---- 1095,1101 ----
-  	wholeLine = 0;
-      }
-  
-+ 
-      /*
-       * Make tab adjustments for the last tab stop, if there is one.
-       */
-***************
-*** 1328,1333 ****
---- 1419,1425 ----
-  	    index.linePtr = TkBTreeFindLine(textPtr->tree, lineNum);
-  	    index.byteIndex = 0;
-  	    lowestPtr = NULL;
-+ 
-  	    do {
-  		dlPtr = LayoutDLine(textPtr, &index);
-  		dlPtr->nextPtr = lowestPtr;
-***************
-*** 1561,1566 ****
---- 1653,1660 ----
-      Display *display;
-      int height, x;
-  
-+     if (dlPtr->chunkPtr == NULL) return;
-+ 
-      /*
-       * First, clear the area of the line to the background color for the
-       * text widget.
-***************
-*** 1627,1638 ****
---- 1721,1736 ----
-  	     * something is off to the right).
-  	     */
-  
-+ 	    if (chunkPtr->displayProc != NULL)
-  	    (*chunkPtr->displayProc)(chunkPtr, -chunkPtr->width,
-  		    dlPtr->spaceAbove,
-  		    dlPtr->height - dlPtr->spaceAbove - dlPtr->spaceBelow,
-  		    dlPtr->baseline - dlPtr->spaceAbove, display, pixmap,
-  		    dlPtr->y + dlPtr->spaceAbove);
-  	} else {
-+ 	    /* don't call if elide.  This tax ok since not very many visible DLine's in
-+ 		  an area, but potentially many elide ones */
-+ 	    if (chunkPtr->displayProc != NULL)
-  	    (*chunkPtr->displayProc)(chunkPtr, x, dlPtr->spaceAbove,
-  		    dlPtr->height - dlPtr->spaceAbove - dlPtr->spaceBelow,
-  		    dlPtr->baseline - dlPtr->spaceAbove, display, pixmap,
-***************
-*** 1721,1726 ****
---- 1819,1825 ----
-      StyleValues *sValuePtr;
-      Display *display;
-  
-+ 
-      /*
-       * Pass 1: scan through dlPtr from left to right.  For each range of
-       * chunks with the same style, draw the main background for the style
-***************
-*** 1794,1800 ****
-  	rightX = maxX;
-      }
-      chunkPtr2 = NULL;
-!     if (prevPtr != NULL) {
-  	/*
-  	 * Find the chunk in the previous line that covers leftX.
-  	 */
---- 1893,1899 ----
-  	rightX = maxX;
-      }
-      chunkPtr2 = NULL;
-!     if (prevPtr != NULL && prevPtr->chunkPtr != NULL) {
-  	/*
-  	 * Find the chunk in the previous line that covers leftX.
-  	 */
-***************
-*** 1915,1921 ****
-  	rightX = maxX;
-      }
-      chunkPtr2 = NULL;
-!     if (dlPtr->nextPtr != NULL) {
-  	/*
-  	 * Find the chunk in the previous line that covers leftX.
-  	 */
---- 2014,2021 ----
-  	rightX = maxX;
-      }
-      chunkPtr2 = NULL;
-! /*    for (dlPtr2 = dlPtr; dlPtr2->nextPtr != NULL && dlPtr2->nextPtr->chunkPtr == NULL; dlPtr2 = dlPtr2->nextPtr) {}*/
-!     if (dlPtr->nextPtr != NULL && dlPtr->nextPtr->chunkPtr != NULL) {
-  	/*
-  	 * Find the chunk in the previous line that covers leftX.
-  	 */
-***************
-*** 2306,2311 ****
---- 2406,2412 ----
-  	for (prevPtr = NULL, dlPtr = textPtr->dInfoPtr->dLinePtr;
-  		(dlPtr != NULL) && (dlPtr->y < dInfoPtr->maxY);
-  		prevPtr = dlPtr, dlPtr = dlPtr->nextPtr) {
-+ 	    if (dlPtr->chunkPtr == NULL) continue;
-  	    if (dlPtr->oldY != dlPtr->y) {
-  		if (tkTextDebug) {
-  		    char string[TK_POS_CHARS];
-***************
-*** 2322,2327 ****
---- 2423,2429 ----
-  		dlPtr->oldY = dlPtr->y;
-  		dlPtr->flags &= ~NEW_LAYOUT;
-  	    }
-+ 	    /*prevPtr = dlPtr;*/
-  	}
-  	Tk_FreePixmap(Tk_Display(textPtr->tkwin), pixmap);
-      }
-***************
-*** 3213,3218 ****
---- 3315,3321 ----
-       * the character within the chunk.
-       */
-  
-+      if (chunkPtr!=NULL) {	/* chunkPtr==NULL iff trying to see in elided region */
-      (*chunkPtr->bboxProc)(chunkPtr, byteCount, dlPtr->y + dlPtr->spaceAbove,
-  	    dlPtr->height - dlPtr->spaceAbove - dlPtr->spaceBelow,
-  	    dlPtr->baseline - dlPtr->spaceAbove, &x, &y, &width,
-***************
-*** 3238,3244 ****
-  	} else {
-  	    return TCL_OK;
-  	}
-!     }
-      dInfoPtr->flags |= DINFO_OUT_OF_DATE;
-      if (!(dInfoPtr->flags & REDRAW_PENDING)) {
-  	dInfoPtr->flags |= REDRAW_PENDING;
---- 3341,3347 ----
-  	} else {
-  	    return TCL_OK;
-  	}
-!     }}
-      dInfoPtr->flags |= DINFO_OUT_OF_DATE;
-      if (!(dInfoPtr->flags & REDRAW_PENDING)) {
-  	dInfoPtr->flags |= REDRAW_PENDING;
-***************
-*** 3376,3381 ****
---- 3479,3485 ----
-  		dlPtr = LayoutDLine(textPtr, &index);
-  		dlPtr->nextPtr = lowestPtr;
-  		lowestPtr = dlPtr;
-+  		if (dlPtr->length == 0 && dlPtr->height == 0) { offset--; break; }	/* elide */
-  		TkTextIndexForwBytes(&index, dlPtr->byteCount, &index);
-  		bytesToCount -= dlPtr->byteCount;
-  	    } while ((bytesToCount > 0)
-***************
-*** 3388,3394 ****
-  		    break;
-  		}
-  	    }
-!     
-  	    /*
-  	     * Discard the display lines, then either return or prepare
-  	     * for the next display line to lay out.
---- 3492,3498 ----
-  		    break;
-  		}
-  	    }
-! 
-  	    /*
-  	     * Discard the display lines, then either return or prepare
-  	     * for the next display line to lay out.
-***************
-*** 3417,3422 ****
---- 3521,3527 ----
-  		TkBTreeNumLines(textPtr->tree));
-  	for (i = 0; i < offset; i++) {
-  	    dlPtr = LayoutDLine(textPtr, &textPtr->topIndex);
-+  	    if (dlPtr->length == 0 && dlPtr->height == 0) offset++;
-  	    dlPtr->nextPtr = NULL;
-  	    TkTextIndexForwBytes(&textPtr->topIndex, dlPtr->byteCount, &new);
-  	    FreeDLines(textPtr, dlPtr, (DLine *) NULL, 0);
-***************
-*** 3959,3965 ****
-  				 * index of the character nearest to (x,y). */
-  {
-      TextDInfo *dInfoPtr = textPtr->dInfoPtr;
-!     register DLine *dlPtr;
-      register TkTextDispChunk *chunkPtr;
-  
-      /*
---- 4064,4070 ----
-  				 * index of the character nearest to (x,y). */
-  {
-      TextDInfo *dInfoPtr = textPtr->dInfoPtr;
-!     register DLine *dlPtr, *validdlPtr;
-      register TkTextDispChunk *chunkPtr;
-  
-      /*
-***************
-*** 3992,3999 ****
-       * Find the display line containing the desired y-coordinate.
-       */
-  
-!     for (dlPtr = dInfoPtr->dLinePtr; y >= (dlPtr->y + dlPtr->height);
-  	    dlPtr = dlPtr->nextPtr) {
-  	if (dlPtr->nextPtr == NULL) {
-  	    /*
-  	     * Y-coordinate is off the bottom of the displayed text.
---- 4097,4105 ----
-       * Find the display line containing the desired y-coordinate.
-       */
-  
-!     for (dlPtr = validdlPtr = dInfoPtr->dLinePtr; y >= (dlPtr->y + dlPtr->height);
-  	    dlPtr = dlPtr->nextPtr) {
-+ 	if (dlPtr->chunkPtr !=NULL) validdlPtr = dlPtr;
-  	if (dlPtr->nextPtr == NULL) {
-  	    /*
-  	     * Y-coordinate is off the bottom of the displayed text.
-***************
-*** 4004,4009 ****
---- 4110,4117 ----
-  	    break;
-  	}
-      }
-+     if (dlPtr->chunkPtr == NULL) dlPtr = validdlPtr;
-+ 
-  
-      /*
-       * Scan through the line's chunks to find the one that contains
-***************
-*** 4177,4182 ****
---- 4285,4291 ----
-  {
-      TextDInfo *dInfoPtr = textPtr->dInfoPtr;
-      DLine *dlPtr;
-+     int dlx;
-  
-      /*
-       * Make sure that all of the screen layout information is up to date.
-***************
-*** 4195,4202 ****
-  	return -1;
-      }
-  
-!     *xPtr = dInfoPtr->x - dInfoPtr->curPixelOffset + dlPtr->chunkPtr->x;
-!     *widthPtr = dlPtr->length - dlPtr->chunkPtr->x;
-      *yPtr = dlPtr->y;
-      if ((dlPtr->y + dlPtr->height) > dInfoPtr->maxY) {
-  	*heightPtr = dInfoPtr->maxY - dlPtr->y;
---- 4304,4312 ----
-  	return -1;
-      }
-  
-!     dlx = (dlPtr->chunkPtr != NULL? dlPtr->chunkPtr->x: 0);
-!     *xPtr = dInfoPtr->x - dInfoPtr->curPixelOffset + dlx;
-!     *widthPtr = dlPtr->length - dlx;
-      *yPtr = dlPtr->y;
-      if ((dlPtr->y + dlPtr->height) > dInfoPtr->maxY) {
-  	*heightPtr = dInfoPtr->maxY - dlPtr->y;
-***************
-*** 4207,4212 ****
---- 4317,4357 ----
-      return 0;
-  }
-  
-+ static void
-+ ElideBboxProc(chunkPtr, index, y, lineHeight, baseline, xPtr, yPtr,
-+ 	widthPtr, heightPtr)
-+     TkTextDispChunk *chunkPtr;		/* Chunk containing desired char. */
-+     int index;				/* Index of desired character within
-+ 					 * the chunk. */
-+     int y;				/* Topmost pixel in area allocated
-+ 					 * for this line. */
-+     int lineHeight;			/* Height of line, in pixels. */
-+     int baseline;			/* Location of line's baseline, in
-+ 					 * pixels measured down from y. */
-+     int *xPtr, *yPtr;			/* Gets filled in with coords of
-+ 					 * character's upper-left pixel. 
-+ 					 * X-coord is in same coordinate
-+ 					 * system as chunkPtr->x. */
-+     int *widthPtr;			/* Gets filled in with width of
-+ 					 * character, in pixels. */
-+     int *heightPtr;			/* Gets filled in with height of
-+ 					 * character, in pixels. */
-+ {
-+     *xPtr = chunkPtr->x;
-+     *yPtr = y;
-+     *widthPtr = *heightPtr = 0;
-+ }
-+ 
-+ 
-+ static int
-+ ElideMeasureProc(chunkPtr, x)
-+     TkTextDispChunk *chunkPtr;		/* Chunk containing desired coord. */
-+     int x;				/* X-coordinate, in same coordinate
-+ 					 * system as chunkPtr->x. */
-+ {
-+     return 0 /*chunkPtr->numBytes - 1*/;
-+ }
-+ 
-  /*
-   *--------------------------------------------------------------
-   *
-***************
-*** 4434,4440 ****
-       * Draw the text, underline, and overstrike for this chunk.
-       */
-  
-!     if (ciPtr->numBytes > offsetBytes) {
-  	int numBytes = ciPtr->numBytes - offsetBytes;
-  	char *string = ciPtr->chars + offsetBytes;
-  
---- 4579,4585 ----
-       * Draw the text, underline, and overstrike for this chunk.
-       */
-  
-!     if (!sValuePtr->elide && ciPtr->numBytes > offsetBytes) {
-  	int numBytes = ciPtr->numBytes - offsetBytes;
-  	char *string = ciPtr->chars + offsetBytes;
-  
-*** tkTextTag.c	1999/04/14 18:05:40	1.1
---- ../generic/tkTextTag.c	1999/04/14 18:06:20
-***************
-*** 63,68 ****
---- 63,71 ----
-      {TK_CONFIG_STRING, "-underline", (char *) NULL, (char *) NULL,
-  	(char *) NULL, Tk_Offset(TkTextTag, underlineString),
-  	TK_CONFIG_NULL_OK},
-+     {TK_CONFIG_STRING, "-elide", (char *) NULL, (char *) NULL,
-+ 	(char *) NULL, Tk_Offset(TkTextTag, elideString),
-+ 	TK_CONFIG_NULL_OK},
-      {TK_CONFIG_UID, "-wrap", (char *) NULL, (char *) NULL,
-  	(char *) NULL, Tk_Offset(TkTextTag, wrapMode),
-  	TK_CONFIG_NULL_OK},
-***************
-*** 391,396 ****
---- 394,405 ----
-  		    return TCL_ERROR;
-  		}
-  	    }
-+ 	    if (tagPtr->elideString != NULL) {
-+ 		if (Tcl_GetBoolean(interp, tagPtr->elideString,
-+ 			&tagPtr->elide) != TCL_OK) {
-+ 		    return TCL_ERROR;
-+ 		}
-+ 	    }
-  	    if ((tagPtr->wrapMode != NULL)
-  		    && (tagPtr->wrapMode != Tk_GetUid("char"))
-  		    && (tagPtr->wrapMode != Tk_GetUid("none"))
-***************
-*** 432,437 ****
---- 441,447 ----
-  		    || (tagPtr->spacing3String != NULL)
-  		    || (tagPtr->tabString != NULL)
-  		    || (tagPtr->underlineString != NULL)
-+ 		    || (tagPtr->elideString != NULL)
-  		    || (tagPtr->wrapMode != NULL)) {
-  		tagPtr->affectsDisplay = 1;
-  	    }
-***************
-*** 824,829 ****
---- 834,841 ----
-      tagPtr->tabArrayPtr = NULL;
-      tagPtr->underlineString = NULL;
-      tagPtr->underline = 0;
-+     tagPtr->elideString = NULL;
-+     tagPtr->elide = 0;
-      tagPtr->wrapMode = NULL;
-      tagPtr->affectsDisplay = 0;
-      textPtr->numTags++;
-***************
-*** 947,952 ****
---- 959,967 ----
-      }
-      if (tagPtr->underlineString != NULL) {
-  	ckfree(tagPtr->underlineString);
-+     }
-+     if (tagPtr->elideString != NULL) {
-+ 	ckfree(tagPtr->elideString);
-      }
-      ckfree((char *) tagPtr);
-  }
diff --git a/x11-toolkits/tk82/files/patch-tkImgGIF.c b/x11-toolkits/tk82/files/patch-tkImgGIF.c
deleted file mode 100644
index 6538db70895..00000000000
--- a/x11-toolkits/tk82/files/patch-tkImgGIF.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../generic/tkImgGIF.c.orig	1999-07-01 02:39:44.000000000 +0200
-+++ ../generic/tkImgGIF.c	2011-09-03 18:20:45.000000000 +0200
-@@ -666,7 +666,7 @@
- 			ypos += 2; break;
- 		}
- 		
--		while (ypos >= height) {
-+		while (ypos >= rows) {
- 		    ++pass;
- 		    switch (pass) {
- 			case 1:
diff --git a/x11-toolkits/tk82/files/pkgIndex.tcl b/x11-toolkits/tk82/files/pkgIndex.tcl
deleted file mode 100644
index f37573a2a59..00000000000
--- a/x11-toolkits/tk82/files/pkgIndex.tcl
+++ /dev/null
@@ -1,3 +0,0 @@
-# Tcl package index file, version 1.0
-
-package ifneeded Tk 8.2 [list load "[file join [file dirname $dir] libtk82.so.1]" Tk]
diff --git a/x11-toolkits/tk82/pkg-descr b/x11-toolkits/tk82/pkg-descr
deleted file mode 100644
index 9e5df039634..00000000000
--- a/x11-toolkits/tk82/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-This is Tk version 8.2, a GUI toolkit for Tcl.
-
-The best way to get started with Tcl is to read ``Tcl and the Tk
-Toolkit'' by John K. Ousterhout, Addison-Wesley, ISBN 0-201-63337-X.
-
-WWW: http://www.tcl.tk/
diff --git a/x11-toolkits/tk82/pkg-plist b/x11-toolkits/tk82/pkg-plist
deleted file mode 100644
index dedc6631c71..00000000000
--- a/x11-toolkits/tk82/pkg-plist
+++ /dev/null
@@ -1,139 +0,0 @@
-bin/wish%%TK_VER%%
-include/tk%%TK_VER%%/generic/default.h
-include/tk%%TK_VER%%/generic/ks_names.h
-include/tk%%TK_VER%%/generic/tk.h
-include/tk%%TK_VER%%/generic/tk3d.h
-include/tk%%TK_VER%%/generic/tkButton.h
-include/tk%%TK_VER%%/generic/tkCanvas.h
-include/tk%%TK_VER%%/generic/tkColor.h
-include/tk%%TK_VER%%/generic/tkDecls.h
-include/tk%%TK_VER%%/generic/tkFileFilter.h
-include/tk%%TK_VER%%/generic/tkFont.h
-include/tk%%TK_VER%%/generic/tkInitScript.h
-include/tk%%TK_VER%%/generic/tkInt.h
-include/tk%%TK_VER%%/generic/tkIntDecls.h
-include/tk%%TK_VER%%/generic/tkIntPlatDecls.h
-include/tk%%TK_VER%%/generic/tkIntXlibDecls.h
-include/tk%%TK_VER%%/generic/tkMenu.h
-include/tk%%TK_VER%%/generic/tkMenubutton.h
-include/tk%%TK_VER%%/generic/tkPlatDecls.h
-include/tk%%TK_VER%%/generic/tkPort.h
-include/tk%%TK_VER%%/generic/tkScale.h
-include/tk%%TK_VER%%/generic/tkScrollbar.h
-include/tk%%TK_VER%%/generic/tkSelect.h
-include/tk%%TK_VER%%/generic/tkText.h
-include/tk%%TK_VER%%/tk.h
-include/tk%%TK_VER%%/tkDecls.h
-include/tk%%TK_VER%%/unix/tkUnixDefault.h
-include/tk%%TK_VER%%/unix/tkUnixInt.h
-include/tk%%TK_VER%%/unix/tkUnixPort.h
-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%%/bgerror.tcl
-lib/tk%%TK_VER%%/button.tcl
-lib/tk%%TK_VER%%/clrpick.tcl
-lib/tk%%TK_VER%%/comdlg.tcl
-lib/tk%%TK_VER%%/console.tcl
-lib/tk%%TK_VER%%/demos/README
-lib/tk%%TK_VER%%/demos/arrow.tcl
-lib/tk%%TK_VER%%/demos/bind.tcl
-lib/tk%%TK_VER%%/demos/bitmap.tcl
-lib/tk%%TK_VER%%/demos/browse
-lib/tk%%TK_VER%%/demos/button.tcl
-lib/tk%%TK_VER%%/demos/check.tcl
-lib/tk%%TK_VER%%/demos/clrpick.tcl
-lib/tk%%TK_VER%%/demos/colors.tcl
-lib/tk%%TK_VER%%/demos/cscroll.tcl
-lib/tk%%TK_VER%%/demos/ctext.tcl
-lib/tk%%TK_VER%%/demos/dialog1.tcl
-lib/tk%%TK_VER%%/demos/dialog2.tcl
-lib/tk%%TK_VER%%/demos/entry1.tcl
-lib/tk%%TK_VER%%/demos/entry2.tcl
-lib/tk%%TK_VER%%/demos/filebox.tcl
-lib/tk%%TK_VER%%/demos/floor.tcl
-lib/tk%%TK_VER%%/demos/form.tcl
-lib/tk%%TK_VER%%/demos/hello
-lib/tk%%TK_VER%%/demos/hscale.tcl
-lib/tk%%TK_VER%%/demos/icon.tcl
-lib/tk%%TK_VER%%/demos/image1.tcl
-lib/tk%%TK_VER%%/demos/image2.tcl
-lib/tk%%TK_VER%%/demos/images/earth.gif
-lib/tk%%TK_VER%%/demos/images/earthris.gif
-lib/tk%%TK_VER%%/demos/images/face.bmp
-lib/tk%%TK_VER%%/demos/images/flagdown.bmp
-lib/tk%%TK_VER%%/demos/images/flagup.bmp
-lib/tk%%TK_VER%%/demos/images/gray25.bmp
-lib/tk%%TK_VER%%/demos/images/letters.bmp
-lib/tk%%TK_VER%%/demos/images/noletter.bmp
-lib/tk%%TK_VER%%/demos/images/pattern.bmp
-lib/tk%%TK_VER%%/demos/images/tcllogo.gif
-lib/tk%%TK_VER%%/demos/images/teapot.ppm
-lib/tk%%TK_VER%%/demos/items.tcl
-lib/tk%%TK_VER%%/demos/ixset
-lib/tk%%TK_VER%%/demos/label.tcl
-lib/tk%%TK_VER%%/demos/license.terms
-lib/tk%%TK_VER%%/demos/menu.tcl
-lib/tk%%TK_VER%%/demos/menubu.tcl
-lib/tk%%TK_VER%%/demos/msgbox.tcl
-lib/tk%%TK_VER%%/demos/plot.tcl
-lib/tk%%TK_VER%%/demos/puzzle.tcl
-lib/tk%%TK_VER%%/demos/radio.tcl
-lib/tk%%TK_VER%%/demos/rmt
-lib/tk%%TK_VER%%/demos/rolodex
-lib/tk%%TK_VER%%/demos/ruler.tcl
-lib/tk%%TK_VER%%/demos/sayings.tcl
-lib/tk%%TK_VER%%/demos/search.tcl
-lib/tk%%TK_VER%%/demos/square
-lib/tk%%TK_VER%%/demos/states.tcl
-lib/tk%%TK_VER%%/demos/style.tcl
-lib/tk%%TK_VER%%/demos/tclIndex
-lib/tk%%TK_VER%%/demos/tcolor
-lib/tk%%TK_VER%%/demos/text.tcl
-lib/tk%%TK_VER%%/demos/timer
-lib/tk%%TK_VER%%/demos/twind.tcl
-lib/tk%%TK_VER%%/demos/vscale.tcl
-lib/tk%%TK_VER%%/demos/widget
-lib/tk%%TK_VER%%/dialog.tcl
-lib/tk%%TK_VER%%/entry.tcl
-lib/tk%%TK_VER%%/focus.tcl
-lib/tk%%TK_VER%%/images/README
-lib/tk%%TK_VER%%/images/logo.eps
-lib/tk%%TK_VER%%/images/logo100.gif
-lib/tk%%TK_VER%%/images/logo64.gif
-lib/tk%%TK_VER%%/images/logoLarge.gif
-lib/tk%%TK_VER%%/images/logoMed.gif
-lib/tk%%TK_VER%%/images/pwrdLogo.eps
-lib/tk%%TK_VER%%/images/pwrdLogo100.gif
-lib/tk%%TK_VER%%/images/pwrdLogo150.gif
-lib/tk%%TK_VER%%/images/pwrdLogo175.gif
-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%%/msgbox.tcl
-lib/tk%%TK_VER%%/obsolete.tcl
-lib/tk%%TK_VER%%/optMenu.tcl
-lib/tk%%TK_VER%%/palette.tcl
-lib/tk%%TK_VER%%/pkgIndex.tcl
-lib/tk%%TK_VER%%/prolog.ps
-lib/tk%%TK_VER%%/safetk.tcl
-lib/tk%%TK_VER%%/scale.tcl
-lib/tk%%TK_VER%%/scrlbar.tcl
-lib/tk%%TK_VER%%/tclIndex
-lib/tk%%TK_VER%%/tearoff.tcl
-lib/tk%%TK_VER%%/text.tcl
-lib/tk%%TK_VER%%/tk.tcl
-lib/tk%%TK_VER%%/tkAppInit.c
-lib/tk%%TK_VER%%/tkConfig.sh
-lib/tk%%TK_VER%%/tkfbox.tcl
-lib/tk%%TK_VER%%/xmfbox.tcl
-@dirrm lib/tk%%TK_VER%%/demos/images
-@dirrm lib/tk%%TK_VER%%/demos
-@dirrm lib/tk%%TK_VER%%/images
-@dirrm lib/tk%%TK_VER%%
-@dirrm include/tk%%TK_VER%%/unix
-@dirrm include/tk%%TK_VER%%/generic
-@dirrm include/tk%%TK_VER%%