Retire tk83

12 files changed, 1 insertions, 1135 deletions

diff --git a/x11/Makefile b/x11/Makefile
index 3b7ca8c2a15..9834d43aea4 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.611 2010/02/10 17:32:21 joerg Exp $
+# $NetBSD: Makefile,v 1.612 2010/02/10 18:15:29 joerg Exp $
 #
 
 COMMENT=	Packages to support the X window system
@@ -339,7 +339,6 @@ SUBDIR+=	tint2
 SUBDIR+=	tk
 SUBDIR+=	tk-BWidget
 SUBDIR+=	tk-Tix
-SUBDIR+=	tk83
 SUBDIR+=	tkinfo
 SUBDIR+=	tkman
 SUBDIR+=	transset-df
diff --git a/x11/tk83/DESCR b/x11/tk83/DESCR
deleted file mode 100644
index 05b76dd7000..00000000000
--- a/x11/tk83/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-This package contains the binary release of Tk version 8.3.4, 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
-or ``Practical Programming in Tcl and Tk'' by Brent B. Welch,
-Prentice Hall PTR, ISBN 0-13-616830-X.
diff --git a/x11/tk83/Makefile b/x11/tk83/Makefile
deleted file mode 100644
index 82ae2472452..00000000000
--- a/x11/tk83/Makefile
+++ /dev/null
@@ -1,92 +0,0 @@
-# $NetBSD: Makefile,v 1.18 2009/12/17 18:23:49 abs Exp $
-
-DISTNAME=	tk8.3.4
-PKGNAME=	tk-8.3.4
-PKGREVISION=	4
-CATEGORIES=	x11
-MASTER_SITES=	ftp://ftp.informatik.uni-hamburg.de/pub/soft/lang/tcl/tcl8_3/
-
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.tcltk.com/
-COMMENT=	Graphical toolkit for TCL
-
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-PKG_DESTDIR_SUPPORT= 	user-destdir
-INSTALLATION_DIRS+=	include/tk/generic include/tk/unix
-
-GNU_CONFIGURE=		yes
-CONFIGURE_DIRS=		unix
-CONFIGURE_ARGS+=	--with-tcl=${BUILDLINK_PREFIX.tcl}/lib
-
-SUBST_CLASSES+=		tk834
-SUBST_STAGE.tk834=	post-build
-SUBST_FILES.tk834=	unix/tkConfig.sh
-SUBST_SED.tk834+=	-e "s|${WRKSRC}/unix|${PREFIX}/lib|"
-SUBST_SED.tk834+=	-e "s|${WRKSRC}|${PREFIX}/include/tk|"
-
-MAKE_ENV+=		TOUCH=${TOUCH:Q}
-
-USE_LIBTOOL=		yes
-TEST_TARGET=		test
-
-.include "../../mk/bsd.prefs.mk"
-
-.if defined(ABI) && ${ABI} == "64"
-CONFIGURE_ARGS+=	--enable-64bit
-.endif
-
-# Modify mkLinks script to remove the short-filename manpage if it was
-# linked to a longer filename.
-#
-post-patch:
-	cd ${WRKSRC}/unix;						\
-	${MV} -f mkLinks mkLinks.tmp;					\
-	${GREP} -v "^exit 0" mkLinks.tmp > mkLinks;			\
-	${CAT} mkLinks.tmp						\
-		| ${AWK} '/^  *ln / { print $$2 }'			\
-		| ${SORT} -u						\
-		| ${GREP} -v ".*\.n"					\
-		| ${SED} -e "s,^,${RM} -f ,"				\
-		>> mkLinks;						\
-	${RM} -f mkLinks.tmp;						\
-	${CHMOD} +x mkLinks;
-
-post-build:
-	cd ${WRKSRC}/unix; for file in					\
-		tkUnixInit.o libtk83.so wish;				\
-	do								\
-		${TOUCH} $${file};					\
-	done
-
-post-install:
-	cd ${DESTDIR}${PREFIX}/bin && ${LN} -s wish8.3 wish
-	${INSTALL_DATA} ${WRKSRC}/generic/default.h ${DESTDIR}${PREFIX}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/ks_names.h ${DESTDIR}${PREFIX}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/tk.h ${DESTDIR}${PREFIX}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/tk3d.h ${DESTDIR}${PREFIX}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/tkButton.h ${DESTDIR}${PREFIX}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/tkCanvas.h ${DESTDIR}${PREFIX}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/tkColor.h ${DESTDIR}${PREFIX}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/tkDecls.h ${DESTDIR}${PREFIX}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/tkFileFilter.h ${DESTDIR}${PREFIX}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/tkFont.h ${DESTDIR}${PREFIX}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/tkInitScript.h ${DESTDIR}${PREFIX}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/tkInt.h ${DESTDIR}${PREFIX}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/tkIntDecls.h ${DESTDIR}${PREFIX}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/tkIntPlatDecls.h ${DESTDIR}${PREFIX}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/tkIntXlibDecls.h ${DESTDIR}${PREFIX}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/tkMenu.h ${DESTDIR}${PREFIX}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/tkMenubutton.h ${DESTDIR}${PREFIX}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/tkPlatDecls.h ${DESTDIR}${PREFIX}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/tkPort.h ${DESTDIR}${PREFIX}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/tkScale.h ${DESTDIR}${PREFIX}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/tkScrollbar.h ${DESTDIR}${PREFIX}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/tkSelect.h ${DESTDIR}${PREFIX}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/tkText.h ${DESTDIR}${PREFIX}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/unix/tkUnixDefault.h ${DESTDIR}${PREFIX}/include/tk/unix
-	${INSTALL_DATA} ${WRKSRC}/unix/tkUnixInt.h ${DESTDIR}${PREFIX}/include/tk/unix
-	${INSTALL_DATA} ${WRKSRC}/unix/tkUnixPort.h ${DESTDIR}${PREFIX}/include/tk/unix
-
-.include "../../lang/tcl83/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/x11/tk83/PLIST b/x11/tk83/PLIST
deleted file mode 100644
index 90f171fc659..00000000000
--- a/x11/tk83/PLIST
+++ /dev/null
@@ -1,449 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:25:07 joerg Exp $
-bin/wish
-bin/wish8.3
-include/tk.h
-include/tk/generic/default.h
-include/tk/generic/ks_names.h
-include/tk/generic/tk.h
-include/tk/generic/tk3d.h
-include/tk/generic/tkButton.h
-include/tk/generic/tkCanvas.h
-include/tk/generic/tkColor.h
-include/tk/generic/tkDecls.h
-include/tk/generic/tkFileFilter.h
-include/tk/generic/tkFont.h
-include/tk/generic/tkInitScript.h
-include/tk/generic/tkInt.h
-include/tk/generic/tkIntDecls.h
-include/tk/generic/tkIntPlatDecls.h
-include/tk/generic/tkIntXlibDecls.h
-include/tk/generic/tkMenu.h
-include/tk/generic/tkMenubutton.h
-include/tk/generic/tkPlatDecls.h
-include/tk/generic/tkPort.h
-include/tk/generic/tkScale.h
-include/tk/generic/tkScrollbar.h
-include/tk/generic/tkSelect.h
-include/tk/generic/tkText.h
-include/tk/unix/tkUnixDefault.h
-include/tk/unix/tkUnixInt.h
-include/tk/unix/tkUnixPort.h
-include/tkDecls.h
-include/tkIntXlibDecls.h
-include/tkPlatDecls.h
-lib/libtk83.la
-lib/libtkstub83.a
-lib/tk8.3/bgerror.tcl
-lib/tk8.3/button.tcl
-lib/tk8.3/choosedir.tcl
-lib/tk8.3/clrpick.tcl
-lib/tk8.3/comdlg.tcl
-lib/tk8.3/console.tcl
-lib/tk8.3/demos/README
-lib/tk8.3/demos/arrow.tcl
-lib/tk8.3/demos/bind.tcl
-lib/tk8.3/demos/bitmap.tcl
-lib/tk8.3/demos/browse
-lib/tk8.3/demos/button.tcl
-lib/tk8.3/demos/check.tcl
-lib/tk8.3/demos/clrpick.tcl
-lib/tk8.3/demos/colors.tcl
-lib/tk8.3/demos/cscroll.tcl
-lib/tk8.3/demos/ctext.tcl
-lib/tk8.3/demos/dialog1.tcl
-lib/tk8.3/demos/dialog2.tcl
-lib/tk8.3/demos/entry1.tcl
-lib/tk8.3/demos/entry2.tcl
-lib/tk8.3/demos/filebox.tcl
-lib/tk8.3/demos/floor.tcl
-lib/tk8.3/demos/form.tcl
-lib/tk8.3/demos/hello
-lib/tk8.3/demos/hscale.tcl
-lib/tk8.3/demos/icon.tcl
-lib/tk8.3/demos/image1.tcl
-lib/tk8.3/demos/image2.tcl
-lib/tk8.3/demos/images/earth.gif
-lib/tk8.3/demos/images/earthris.gif
-lib/tk8.3/demos/images/face.bmp
-lib/tk8.3/demos/images/flagdown.bmp
-lib/tk8.3/demos/images/flagup.bmp
-lib/tk8.3/demos/images/gray25.bmp
-lib/tk8.3/demos/images/letters.bmp
-lib/tk8.3/demos/images/noletter.bmp
-lib/tk8.3/demos/images/pattern.bmp
-lib/tk8.3/demos/images/tcllogo.gif
-lib/tk8.3/demos/images/teapot.ppm
-lib/tk8.3/demos/items.tcl
-lib/tk8.3/demos/ixset
-lib/tk8.3/demos/label.tcl
-lib/tk8.3/demos/license.terms
-lib/tk8.3/demos/menu.tcl
-lib/tk8.3/demos/menubu.tcl
-lib/tk8.3/demos/msgbox.tcl
-lib/tk8.3/demos/plot.tcl
-lib/tk8.3/demos/puzzle.tcl
-lib/tk8.3/demos/radio.tcl
-lib/tk8.3/demos/rmt
-lib/tk8.3/demos/rolodex
-lib/tk8.3/demos/ruler.tcl
-lib/tk8.3/demos/sayings.tcl
-lib/tk8.3/demos/search.tcl
-lib/tk8.3/demos/square
-lib/tk8.3/demos/states.tcl
-lib/tk8.3/demos/style.tcl
-lib/tk8.3/demos/tclIndex
-lib/tk8.3/demos/tcolor
-lib/tk8.3/demos/text.tcl
-lib/tk8.3/demos/timer
-lib/tk8.3/demos/twind.tcl
-lib/tk8.3/demos/vscale.tcl
-lib/tk8.3/demos/widget
-lib/tk8.3/dialog.tcl
-lib/tk8.3/entry.tcl
-lib/tk8.3/focus.tcl
-lib/tk8.3/images/README
-lib/tk8.3/images/logo.eps
-lib/tk8.3/images/logo100.gif
-lib/tk8.3/images/logo64.gif
-lib/tk8.3/images/logoLarge.gif
-lib/tk8.3/images/logoMed.gif
-lib/tk8.3/images/pwrdLogo.eps
-lib/tk8.3/images/pwrdLogo100.gif
-lib/tk8.3/images/pwrdLogo150.gif
-lib/tk8.3/images/pwrdLogo175.gif
-lib/tk8.3/images/pwrdLogo200.gif
-lib/tk8.3/images/pwrdLogo75.gif
-lib/tk8.3/images/tai-ku.gif
-lib/tk8.3/listbox.tcl
-lib/tk8.3/menu.tcl
-lib/tk8.3/msgbox.tcl
-lib/tk8.3/obsolete.tcl
-lib/tk8.3/optMenu.tcl
-lib/tk8.3/palette.tcl
-lib/tk8.3/prolog.ps
-lib/tk8.3/safetk.tcl
-lib/tk8.3/scale.tcl
-lib/tk8.3/scrlbar.tcl
-lib/tk8.3/tclIndex
-lib/tk8.3/tearoff.tcl
-lib/tk8.3/text.tcl
-lib/tk8.3/tk.tcl
-lib/tk8.3/tkAppInit.c
-lib/tk8.3/tkfbox.tcl
-lib/tk8.3/xmfbox.tcl
-lib/tkConfig.sh
-man/man1/wish.1
-man/man3/Tk_3DBorderColor.3
-man/man3/Tk_3DBorderGC.3
-man/man3/Tk_3DHorizontalBevel.3
-man/man3/Tk_3DVerticalBevel.3
-man/man3/Tk_AddOption.3
-man/man3/Tk_Alloc3DBorderFromObj.3
-man/man3/Tk_AllocBitmapFromObj.3
-man/man3/Tk_AllocColorFromObj.3
-man/man3/Tk_AllocCursorFromObj.3
-man/man3/Tk_AllocFontFromObj.3
-man/man3/Tk_Attributes.3
-man/man3/Tk_BindEvent.3
-man/man3/Tk_CanvasDrawableCoords.3
-man/man3/Tk_CanvasEventuallyRedraw.3
-man/man3/Tk_CanvasGetCoord.3
-man/man3/Tk_CanvasPsBitmap.3
-man/man3/Tk_CanvasPsColor.3
-man/man3/Tk_CanvasPsFont.3
-man/man3/Tk_CanvasPsPath.3
-man/man3/Tk_CanvasPsStipple.3
-man/man3/Tk_CanvasPsY.3
-man/man3/Tk_CanvasSetStippleOrigin.3
-man/man3/Tk_CanvasTagsOption.3
-man/man3/Tk_CanvasTextInfo.3
-man/man3/Tk_CanvasTkwin.3
-man/man3/Tk_CanvasWindowCoords.3
-man/man3/Tk_ChangeWindowAttributes.3
-man/man3/Tk_Changes.3
-man/man3/Tk_CharBbox.3
-man/man3/Tk_Class.3
-man/man3/Tk_ClearSelection.3
-man/man3/Tk_ClipboardAppend.3
-man/man3/Tk_ClipboardClear.3
-man/man3/Tk_Colormap.3
-man/man3/Tk_ComputeTextLayout.3
-man/man3/Tk_ConfigureInfo.3
-man/man3/Tk_ConfigureValue.3
-man/man3/Tk_ConfigureWidget.3
-man/man3/Tk_ConfigureWindow.3
-man/man3/Tk_CoordsToWindow.3
-man/man3/Tk_CreateBinding.3
-man/man3/Tk_CreateBindingTable.3
-man/man3/Tk_CreateErrorHandler.3
-man/man3/Tk_CreateEventHandler.3
-man/man3/Tk_CreateGenericHandler.3
-man/man3/Tk_CreateImageType.3
-man/man3/Tk_CreateItemType.3
-man/man3/Tk_CreateOptionTable.3
-man/man3/Tk_CreatePhotoImageFormat.3
-man/man3/Tk_CreateSelHandler.3
-man/man3/Tk_CreateWindow.3
-man/man3/Tk_CreateWindowFromPath.3
-man/man3/Tk_DefineBitmap.3
-man/man3/Tk_DefineCursor.3
-man/man3/Tk_DeleteAllBindings.3
-man/man3/Tk_DeleteBinding.3
-man/man3/Tk_DeleteBindingTable.3
-man/man3/Tk_DeleteErrorHandler.3
-man/man3/Tk_DeleteEventHandler.3
-man/man3/Tk_DeleteGenericHandler.3
-man/man3/Tk_DeleteImage.3
-man/man3/Tk_DeleteOptionTable.3
-man/man3/Tk_DeleteSelHandler.3
-man/man3/Tk_Depth.3
-man/man3/Tk_DestroyWindow.3
-man/man3/Tk_Display.3
-man/man3/Tk_DisplayName.3
-man/man3/Tk_DistanceToTextLayout.3
-man/man3/Tk_Draw3DPolygon.3
-man/man3/Tk_Draw3DRectangle.3
-man/man3/Tk_DrawChars.3
-man/man3/Tk_DrawFocusHighlight.3
-man/man3/Tk_DrawTextLayout.3
-man/man3/Tk_Fill3DPolygon.3
-man/man3/Tk_Fill3DRectangle.3
-man/man3/Tk_FindPhoto.3
-man/man3/Tk_FontId.3
-man/man3/Tk_Free3DBorder.3
-man/man3/Tk_Free3DBorderFromObj.3
-man/man3/Tk_FreeBitmap.3
-man/man3/Tk_FreeBitmapFromObj.3
-man/man3/Tk_FreeColor.3
-man/man3/Tk_FreeColorFromObj.3
-man/man3/Tk_FreeColormap.3
-man/man3/Tk_FreeConfigOptions.3
-man/man3/Tk_FreeCursor.3
-man/man3/Tk_FreeCursorFromObj.3
-man/man3/Tk_FreeFont.3
-man/man3/Tk_FreeFontFromObj.3
-man/man3/Tk_FreeGC.3
-man/man3/Tk_FreeImage.3
-man/man3/Tk_FreeOptions.3
-man/man3/Tk_FreePixmap.3
-man/man3/Tk_FreeSavedOptions.3
-man/man3/Tk_FreeTextLayout.3
-man/man3/Tk_FreeXId.3
-man/man3/Tk_GeometryRequest.3
-man/man3/Tk_Get3DBorder.3
-man/man3/Tk_Get3DBorderFromObj.3
-man/man3/Tk_GetAllBindings.3
-man/man3/Tk_GetAnchor.3
-man/man3/Tk_GetAnchorFromObj.3
-man/man3/Tk_GetAtomName.3
-man/man3/Tk_GetBinding.3
-man/man3/Tk_GetBitmap.3
-man/man3/Tk_GetBitmapFromData.3
-man/man3/Tk_GetBitmapFromObj.3
-man/man3/Tk_GetCapStyle.3
-man/man3/Tk_GetColor.3
-man/man3/Tk_GetColorByValue.3
-man/man3/Tk_GetColorFromObj.3
-man/man3/Tk_GetColormap.3
-man/man3/Tk_GetCursor.3
-man/man3/Tk_GetCursorFromData.3
-man/man3/Tk_GetCursorFromObj.3
-man/man3/Tk_GetDash.3
-man/man3/Tk_GetFont.3
-man/man3/Tk_GetFontFromObj.3
-man/man3/Tk_GetFontMetrics.3
-man/man3/Tk_GetGC.3
-man/man3/Tk_GetHINSTANCE.3
-man/man3/Tk_GetHWND.3
-man/man3/Tk_GetImage.3
-man/man3/Tk_GetImageMasterData.3
-man/man3/Tk_GetItemTypes.3
-man/man3/Tk_GetJoinStyle.3
-man/man3/Tk_GetJustify.3
-man/man3/Tk_GetJustifyFromObj.3
-man/man3/Tk_GetMMFromObj.3
-man/man3/Tk_GetNumMainWindows.3
-man/man3/Tk_GetOption.3
-man/man3/Tk_GetOptionInfo.3
-man/man3/Tk_GetOptionValue.3
-man/man3/Tk_GetPixels.3
-man/man3/Tk_GetPixelsFromObj.3
-man/man3/Tk_GetPixmap.3
-man/man3/Tk_GetRelief.3
-man/man3/Tk_GetReliefFromObj.3
-man/man3/Tk_GetRootCoords.3
-man/man3/Tk_GetScreenMM.3
-man/man3/Tk_GetScrollInfo.3
-man/man3/Tk_GetScrollInfoObj.3
-man/man3/Tk_GetSelection.3
-man/man3/Tk_GetUid.3
-man/man3/Tk_GetVRootGeometry.3
-man/man3/Tk_GetVisual.3
-man/man3/Tk_Grab.3
-man/man3/Tk_HWNDToWindow.3
-man/man3/Tk_HandleEvent.3
-man/man3/Tk_Height.3
-man/man3/Tk_IdToWindow.3
-man/man3/Tk_ImageChanged.3
-man/man3/Tk_InitImageArgs.3
-man/man3/Tk_InitOptions.3
-man/man3/Tk_InitStubs.3
-man/man3/Tk_InternAtom.3
-man/man3/Tk_InternalBorderWidth.3
-man/man3/Tk_IntersectTextLayout.3
-man/man3/Tk_IsContainer.3
-man/man3/Tk_IsEmbedded.3
-man/man3/Tk_IsMapped.3
-man/man3/Tk_IsTopLevel.3
-man/man3/Tk_Main.3
-man/man3/Tk_MainLoop.3
-man/man3/Tk_MainWindow.3
-man/man3/Tk_MaintainGeometry.3
-man/man3/Tk_MakeWindowExist.3
-man/man3/Tk_ManageGeometry.3
-man/man3/Tk_MapWindow.3
-man/man3/Tk_MeasureChars.3
-man/man3/Tk_MoveResizeWindow.3
-man/man3/Tk_MoveToplevelWindow.3
-man/man3/Tk_MoveWindow.3
-man/man3/Tk_Name.3
-man/man3/Tk_NameOf3DBorder.3
-man/man3/Tk_NameOfAnchor.3
-man/man3/Tk_NameOfBitmap.3
-man/man3/Tk_NameOfCapStyle.3
-man/man3/Tk_NameOfColor.3
-man/man3/Tk_NameOfCursor.3
-man/man3/Tk_NameOfFont.3
-man/man3/Tk_NameOfImage.3
-man/man3/Tk_NameOfJoinStyle.3
-man/man3/Tk_NameOfJustify.3
-man/man3/Tk_NameOfRelief.3
-man/man3/Tk_NameToWindow.3
-man/man3/Tk_Offset.3
-man/man3/Tk_OwnSelection.3
-man/man3/Tk_Parent.3
-man/man3/Tk_ParseArgv.3
-man/man3/Tk_PathName.3
-man/man3/Tk_PhotoBlank.3
-man/man3/Tk_PhotoExpand.3
-man/man3/Tk_PhotoGetImage.3
-man/man3/Tk_PhotoGetSize.3
-man/man3/Tk_PhotoPutBlock.3
-man/man3/Tk_PhotoPutZoomedBlock.3
-man/man3/Tk_PhotoSetSize.3
-man/man3/Tk_PointToChar.3
-man/man3/Tk_PostscriptFontName.3
-man/man3/Tk_QueueWindowEvent.3
-man/man3/Tk_RedrawImage.3
-man/man3/Tk_ReqHeight.3
-man/man3/Tk_ReqWidth.3
-man/man3/Tk_ResizeWindow.3
-man/man3/Tk_RestackWindow.3
-man/man3/Tk_RestoreSavedOptions.3
-man/man3/Tk_RestrictEvents.3
-man/man3/Tk_SafeInit.3
-man/man3/Tk_Screen.3
-man/man3/Tk_ScreenNumber.3
-man/man3/Tk_SetAppName.3
-man/man3/Tk_SetBackgroundFromBorder.3
-man/man3/Tk_SetClass.3
-man/man3/Tk_SetGrid.3
-man/man3/Tk_SetInternalBorder.3
-man/man3/Tk_SetOptions.3
-man/man3/Tk_SetWindowBackground.3
-man/man3/Tk_SetWindowBackgroundPixmap.3
-man/man3/Tk_SetWindowBorder.3
-man/man3/Tk_SetWindowBorderPixmap.3
-man/man3/Tk_SetWindowBorderWidth.3
-man/man3/Tk_SetWindowColormap.3
-man/man3/Tk_SetWindowVisual.3
-man/man3/Tk_SizeOfBitmap.3
-man/man3/Tk_SizeOfImage.3
-man/man3/Tk_StrictMotif.3
-man/man3/Tk_TextLayoutToPostscript.3
-man/man3/Tk_TextWidth.3
-man/man3/Tk_Uid.3
-man/man3/Tk_UndefineCursor.3
-man/man3/Tk_UnderlineChars.3
-man/man3/Tk_UnderlineTextLayout.3
-man/man3/Tk_Ungrab.3
-man/man3/Tk_UnmaintainGeometry.3
-man/man3/Tk_UnmapWindow.3
-man/man3/Tk_UnsetGrid.3
-man/man3/Tk_Visual.3
-man/man3/Tk_Width.3
-man/man3/Tk_WindowId.3
-man/man3/Tk_X.3
-man/man3/Tk_Y.3
-man/mann/bell.n
-man/mann/bind.n
-man/mann/bindtags.n
-man/mann/bitmap.n
-man/mann/button.n
-man/mann/canvas.n
-man/mann/checkbutton.n
-man/mann/chooseColor.n
-man/mann/chooseDirectory.n
-man/mann/clipboard.n
-man/mann/colors.n
-man/mann/cursors.n
-man/mann/destroy.n
-man/mann/dialog.n
-man/mann/entry.n
-man/mann/event.n
-man/mann/focus.n
-man/mann/focusNext.n
-man/mann/font.n
-man/mann/frame.n
-man/mann/getOpenFile.n
-man/mann/grab.n
-man/mann/grid.n
-man/mann/image.n
-man/mann/keysyms.n
-man/mann/label.n
-man/mann/listbox.n
-man/mann/loadTk.n
-man/mann/lower.n
-man/mann/menu.n
-man/mann/menubar.n
-man/mann/menubutton.n
-man/mann/message.n
-man/mann/messageBox.n
-man/mann/option.n
-man/mann/optionMenu.n
-man/mann/options.n
-man/mann/pack-old.n
-man/mann/pack.n
-man/mann/palette.n
-man/mann/photo.n
-man/mann/place.n
-man/mann/popup.n
-man/mann/radiobutton.n
-man/mann/raise.n
-man/mann/scale.n
-man/mann/scrollbar.n
-man/mann/selection.n
-man/mann/send.n
-man/mann/text.n
-man/mann/tk.n
-man/mann/tk_bindForTraversal.n
-man/mann/tk_bisque.n
-man/mann/tk_chooseColor.n
-man/mann/tk_chooseDirectory.n
-man/mann/tk_dialog.n
-man/mann/tk_focusFollowsMouse.n
-man/mann/tk_focusNext.n
-man/mann/tk_focusPrev.n
-man/mann/tk_getOpenFile.n
-man/mann/tk_getSaveFile.n
-man/mann/tk_menuBar.n
-man/mann/tk_messageBox.n
-man/mann/tk_optionMenu.n
-man/mann/tk_popup.n
-man/mann/tk_setPalette.n
-man/mann/tkerror.n
-man/mann/tkvars.n
-man/mann/tkwait.n
-man/mann/toplevel.n
-man/mann/winfo.n
-man/mann/wm.n
diff --git a/x11/tk83/buildlink3.mk b/x11/tk83/buildlink3.mk
deleted file mode 100644
index e2511a7ed2d..00000000000
--- a/x11/tk83/buildlink3.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:25:51 joerg Exp $
-
-BUILDLINK_TREE+=	tk
-
-.if !defined(TK_BUILDLINK3_MK)
-TK_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.tk+=		tk-8.3.4*
-BUILDLINK_ABI_DEPENDS.tk?=	tk>=8.3.4nb2
-BUILDLINK_PKGSRCDIR.tk?=	../../x11/tk83
-
-BUILDLINK_FILES.tk=	bin/wish*
-#
-# Make "-ltk" resolve into "-ltk83", so that we don't need to patch so
-# many Makefiles.
-#
-BUILDLINK_TRANSFORM+=	l:tk:tk83
-
-TKCONFIG_SH?=	${BUILDLINK_PREFIX.tk}/lib/tkConfig.sh
-
-.include "../../lang/tcl83/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
-.endif # TK_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-tk
diff --git a/x11/tk83/distinfo b/x11/tk83/distinfo
deleted file mode 100644
index 67ca0a70ce5..00000000000
--- a/x11/tk83/distinfo
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: distinfo,v 1.10 2009/12/17 18:23:49 abs Exp $
-
-SHA1 (tk8.3.4.tar.gz) = d52bf5cedb73e9b817ba8d6a2b00701f4f82fad2
-RMD160 (tk8.3.4.tar.gz) = f154fd9b2eedcff732b9cdabee48bd9af1b3dd26
-Size (tk8.3.4.tar.gz) = 2589635 bytes
-SHA1 (patch-aa) = 5859c2d4e2cafe68d5a2f14aecae4b36cab3a747
-SHA1 (patch-ab) = 6cd2c9b7a800b6a5aeb2d8f71840e78fcbd4aaa4
-SHA1 (patch-ac) = b7e3a2fefafd00d3d00499117fe7dc42fb6ad429
-SHA1 (patch-ad) = 9afaa77065585ef6cb97864e1fbc470670773186
-SHA1 (patch-ae) = 9ab780fbfcc18606423abf4a1ae8816a39856dbf
-SHA1 (patch-af) = 63da236ce317e9860dc0dde6097bb94ecfdbd6a8
diff --git a/x11/tk83/patches/patch-aa b/x11/tk83/patches/patch-aa
deleted file mode 100644
index ad2b42c8be9..00000000000
--- a/x11/tk83/patches/patch-aa
+++ /dev/null
@@ -1,106 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2009/12/17 18:23:49 abs Exp $
-
---- unix/Makefile.in.orig	2001-10-20 00:24:40.000000000 +0000
-+++ unix/Makefile.in
-@@ -37,7 +37,7 @@ mandir			= @mandir@
- # to be different than those used for actually reference files at
- # run-time.  INSTALL_ROOT is prepended to $prefix and $exec_prefix
- # when installing files.
--INSTALL_ROOT		=
-+INSTALL_ROOT		= $(DESTDIR)
- 
- # Directory from which applications will reference the library of Tcl
- # scripts (note: you can set the TK_LIBRARY environment variable at
-@@ -76,7 +76,7 @@ MANN_INSTALL_DIR	= $(MAN_INSTALL_DIR)/ma
- # 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		= $(TCL_BIN_DIR)/../include/tcl/generic
- 
- # The directory containing the Tcl library archive file appropriate
- # for this version of Tk:
-@@ -100,7 +100,7 @@ CFLAGS_OPTIMIZE		= @CFLAGS_OPTIMIZE@
- #CFLAGS			= $(CFLAGS_DEBUG)
- #CFLAGS			= $(CFLAGS_OPTIMIZE)
- #CFLAGS			= $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE)
--CFLAGS			= @CFLAGS@ @CFLAGS_DEFAULT@
-+CFLAGS			+= @CFLAGS@ @CFLAGS_DEFAULT@
- 
- # Flags to pass to the linker
- LDFLAGS_DEBUG		= @LDFLAGS_DEBUG@
-@@ -159,8 +159,8 @@ SHELL			= /bin/sh
- # "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_PROGRAM		= ${INSTALL}
-+INSTALL			= ${LIBTOOL} --mode=install @srcdir@/install-sh -c
-+INSTALL_PROGRAM		= ${INSTALL} -s
- INSTALL_DATA		= ${INSTALL} -m 644
- 
- # The following specifies which Tcl executable to use for make targets
-@@ -209,7 +209,7 @@ WISH_LIBS = $(TCL_LIB_SPEC) @LIBS@ $(X11
- # The values of the symbolis normally set by the configure script.
- 
- STLIB_LD		= @STLIB_LD@
--SHLIB_LD		= @SHLIB_LD@
-+SHLIB_LD		= ${LIBTOOL} --mode=link @CC@ -rpath ${PREFIX}/lib
- SHLIB_LD_LIBS		= @SHLIB_LD_LIBS@
- 
- # Additional search flags needed to find the various shared libraries
-@@ -240,7 +240,8 @@ TOOL_DIR		= @TCL_SRC_DIR@/tools
- # either.
- #----------------------------------------------------------------
- 
--CC			= @CC@
-+CC			= ${LIBTOOL} --mode=compile @CC@
-+LD			= ${LIBTOOL} --mode=link @CC@ -Wl,-R${PREFIX}/lib -Wl,-R${X11BASE}/lib
- 
- CC_SWITCHES_NO_STUBS = ${CFLAGS} ${CFLAGS_WARNING} ${SHLIB_CFLAGS} \
- -I${UNIX_DIR} -I${GENERIC_DIR} \
-@@ -373,6 +374,7 @@ ${TK_LIB_FILE}: ${OBJS}
- 	rm -f ${TK_LIB_FILE}
- 	@MAKE_LIB@
- 	$(RANLIB) ${TK_LIB_FILE}
-+	${TOUCH} ${TK_LIB_FILE}
- 
- ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
- 	rm -f ${STUB_LIB_FILE}
-@@ -391,9 +393,9 @@ objs: ${OBJS}
- 
- 
- wish: $(WISH_OBJS) $(TK_LIB_FILE) $(TK_STUB_LIB_FILE)
--	$(CC) $(LDFLAGS) $(WISH_OBJS) \
-+	$(LD) $(LDFLAGS) $(WISH_OBJS) \
- 		@TK_BUILD_LIB_SPEC@ \
--		$(WISH_LIBS) $(TK_CC_SEARCH_FLAGS) -o wish
-+		$(WISH_LIBS) -o wish
- 
- # This rule is executed if the user tried to run tktest without first
- # building tcltest in the Tcl bin directory. Just do it for them.
-@@ -402,12 +404,12 @@ ${TCL_BIN_DIR}/tcltest:
- 	make tcltest
- 
- tktest: ${TCL_BIN_DIR}/tcltest $(TKTEST_OBJS) $(TK_LIB_FILE)
--	${CC} $(LDFLAGS) $(TKTEST_OBJS) \
-+	${LD} $(LDFLAGS) $(TKTEST_OBJS) \
- 		@TK_BUILD_LIB_SPEC@ \
--		$(WISH_LIBS) $(TK_CC_SEARCH_FLAGS) -o tktest
-+		$(WISH_LIBS) -o tktest
- 
- xttest: test.o tkTest.o tkSquare.o $(TK_LIB_FILE)
--	${CC} $(LDFLAGS) test.o tkTest.o tkSquare.o \
-+	${LD} $(LDFLAGS) test.o tkTest.o tkSquare.o \
- 		@TK_BUILD_LIB_SPEC@ \
- 		$(WISH_LIBS) $(TK_LD_SEARCH_FLAGS) -lXt -o xttest
- 
-@@ -462,7 +464,7 @@ install-binaries: $(TK_LIB_FILE) $(TK_ST
- 	    chmod +x $(UNIX_DIR)/mkLinks; \
- 	    fi
- 	@echo "Installing $(TK_LIB_FILE) to $(LIB_INSTALL_DIR)/"
--	@$(INSTALL_DATA) $(TK_LIB_FILE) $(LIB_INSTALL_DIR)/$(TK_LIB_FILE)
-+	@$(INSTALL_DATA) $(TK_LIB_FILE:C/\.so.*/.la/) $(LIB_INSTALL_DIR)/$(TK_LIB_FILE)
- 	@(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TK_LIB_FILE))
- 	@chmod 555 $(LIB_INSTALL_DIR)/$(TK_LIB_FILE)
- 	@echo "Installing wish as $(BIN_INSTALL_DIR)/wish$(VERSION)"
diff --git a/x11/tk83/patches/patch-ab b/x11/tk83/patches/patch-ab
deleted file mode 100644
index 373c3407800..00000000000
--- a/x11/tk83/patches/patch-ab
+++ /dev/null
@@ -1,217 +0,0 @@
-$NetBSD: patch-ab,v 1.6 2009/12/17 18:23:49 abs Exp $
-
---- unix/configure.orig	2001-10-20 00:24:40.000000000 +0000
-+++ unix/configure
-@@ -1688,7 +1688,7 @@ echo "configure:1679: checking system ve
- 	    # 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`
-@@ -1746,6 +1746,7 @@ fi
- 
-     do64bit_ok=no
-     fullSrcDir=`cd $srcdir; pwd`
-+    RPATH_FLAG=""
-     EXTRA_CFLAGS=""
-     TCL_EXPORT_FILE_SUFFIX=""
-     UNSHARED_LIB_SUFFIX=""
-@@ -2084,8 +2085,11 @@ fi
- 	    LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
- 	    EXTRA_CFLAGS=""
- 	    LDFLAGS=""
-+	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
-+	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
-+	    TCL_LIB_VERSIONS_OK=nodots
- 	    ;;
--	IRIX-6.*|IRIX64-6.5*)
-+	IRIX-6.*)
- 	    SHLIB_CFLAGS=""
- 	    SHLIB_LD="ld -n32 -shared -rdata_shared"
- 	    SHLIB_LD_LIBS='${LIBS}'
-@@ -2108,6 +2112,9 @@ fi
- 		esac
- 		LDFLAGS="-n32"
- 	    fi
-+	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
-+	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
-+	    TCL_LIB_VERSIONS_OK=nodots
- 	    ;;
- 	IRIX64-6.*)
- 	    SHLIB_CFLAGS=""
-@@ -2118,6 +2125,22 @@ fi
- 	    DL_LIBS=""
- 	    LDFLAGS=""
- 	    LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
-+
-+            # Check to enable 64-bit flags for compiler/linker
-+
-+	    if test "$do64bit" = "yes" ; then
-+                if test "$GCC" = "yes" ; then
-+                    echo "configure: warning: 64bit mode not supported by gcc" 1>&2
-+                else
-+                    do64bit_ok=yes
-+                    SHLIB_LD="ld -64 -shared -rdata_shared"
-+                    CFLAGS="$CFLAGS -64"
-+                    LDFLAGS="$LDFLAGS -64"
-+                fi
-+            fi
-+	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
-+	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
-+	    TCL_LIB_VERSIONS_OK=nodots
- 	    ;;
- 	Linux*)
- 	    SHLIB_CFLAGS="-fPIC"
-@@ -2136,6 +2159,9 @@ fi
- 		DL_LIBS="-ldl"
- 		LDFLAGS="-rdynamic"
- 		LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
-+	    	UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
-+	  	SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
-+	    	TCL_LIB_VERSIONS_OK=nodots
- 	    else
- 		ac_safe=`echo "dld.h" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for dld.h""... $ac_c" 1>&6
-@@ -2267,7 +2293,7 @@ fi
- 	    LDFLAGS="-Wl,-Bexport"
- 	    LD_SEARCH_FLAGS=""
- 	    ;;
--	NetBSD-*|FreeBSD-[1-2].*|OpenBSD-*)
-+	NetBSD-*|FreeBSD-[1-2].*|OpenBSD-*|DragonFly-*)
- 	    # 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
-@@ -2300,7 +2326,6 @@ if eval "test \"`echo '$ac_cv_header_'$a
-   
- 		# NetBSD/SPARC needs -fPIC, -fpic will not do.
- 		SHLIB_CFLAGS="-fPIC"
--		SHLIB_LD="ld -Bshareable -x"
- 		SHLIB_LD_LIBS=""
- 		SHLIB_SUFFIX=".so"
- 		DL_OBJS="tclLoadDl.o"
-@@ -2321,13 +2346,23 @@ EOF
- if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-   egrep "yes" >/dev/null 2>&1; then
-   rm -rf conftest*
-+  
-   echo "$ac_t""yes" 1>&6
-+		    SHLIB_LD='${TCL_CC} -shared -Wl,-x'
-+		    RPATH_FLAG='-Wl,-R'
-+		    LD_SEARCH_FLAGS='-Wl,-R${LIB_RUNTIME_DIR}'
- 		    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
-+		
- else
-   rm -rf conftest*
-+  
-   echo "$ac_t""no" 1>&6
-+		    SHLIB_LD="ld -Bshareable -x"
-+		    RPATH_FLAG='-R'
-+		    LD_SEARCH_FLAGS='-R${LIB_RUNTIME_DIR}'
- 		    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0'
- 		
-+		
- fi
- rm -f conftest*
- 
-@@ -2539,6 +2574,9 @@ EOF
- 	    DL_LIBS="-ldl"
- 	    LDFLAGS=""
- 	    LD_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}'
-+	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
-+	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
-+	    TCL_LIB_VERSIONS_OK=nodots
- 	    ;;
- 	SunOS-5*)
- 
-@@ -2586,6 +2624,9 @@ EOF
- 	    else
- 		LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}'
- 	    fi
-+	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
-+	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
-+	    TCL_LIB_VERSIONS_OK=nodots
- 	    ;;
- 	ULTRIX-4.*)
- 	    SHLIB_CFLAGS="-G 0"
-@@ -2828,7 +2869,7 @@ fi
- 		    ;;
- 		IRIX*)
- 		    ;;
--		NetBSD-*|FreeBSD-*|OpenBSD-*)
-+		NetBSD-*|FreeBSD-*|OpenBSD-*|DragonFly-*)
- 		    ;;
- 		Rhapsody-*|Darwin-*)
- 		    ;;
-@@ -3837,7 +3878,11 @@ echo "configure:3835: checking for X11 l
- 	for i in $dirs ; do
- 	    if test -r $i/libX11.a -o -r $i/libX11.so -o -r $i/libX11.sl; then
- 		echo "$ac_t""$i" 1>&6
-+		if test "${RPATH_FLAG}" != ""; then
-+		    XLIBSW="-L$i ${RPATH_FLAG}$i -lX11"
-+		else
- 		XLIBSW="-L$i -lX11"
-+		fi
- 		x_libraries="$i"
- 		break
- 	    fi
-@@ -3846,12 +3891,16 @@ echo "configure:3835: checking for X11 l
- 	if test "$x_libraries" = ""; then
- 	    XLIBSW=-lX11
- 	else
-+	    if test "${RPATH_FLAG}" != ""; then
-+		XLIBSW="-L$x_libraries ${RPATH_FLAG}$x_libraries -lX11"
-+	    else
- 	    XLIBSW="-L$x_libraries -lX11"
- 	fi
-     fi
-+    fi
-     if test "$XLIBSW" = nope ; then
- 	echo $ac_n "checking for XCreateWindow in -lXwindow""... $ac_c" 1>&6
--echo "configure:3855: checking for XCreateWindow in -lXwindow" >&5
-+echo "configure:3879: checking for XCreateWindow in -lXwindow" >&5
- ac_lib_var=`echo Xwindow'_'XCreateWindow | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -3916,6 +3965,10 @@ if test "x${x_libraries}" != "x"; then
- fi
- if test "${TCL_LD_SEARCH_FLAGS}" = '-L${LIB_RUNTIME_DIR}'; then
-     LIB_RUNTIME_DIR=`echo ${LIB_RUNTIME_DIR} |sed -e 's/:/ -L/g'`
-+elif test "${TCL_LD_SEARCH_FLAGS}" = '-R${LIB_RUNTIME_DIR}'; then
-+    LIB_RUNTIME_DIR=`echo ${LIB_RUNTIME_DIR} |sed -e 's/:/ -R/g'`
-+elif test "${TCL_LD_SEARCH_FLAGS}" = '-Wl,-R${LIB_RUNTIME_DIR}'; then
-+    LIB_RUNTIME_DIR=`echo ${LIB_RUNTIME_DIR} |sed -e 's/:/ -Wl,-R/g'`
- fi
- 
- # The statement below is very tricky!  It actually *evaluates* the
-@@ -4588,7 +4641,7 @@ TCL_STUB_LIB_SPEC='-L$(TCL_BIN_DIR) $(TC
- if test "${SHARED_BUILD}" = "1" -a "${SHLIB_SUFFIX}" != ""; then
-     TK_SHLIB_CFLAGS="${SHLIB_CFLAGS}"
-     TK_LIB_FILE=libtk${TK_SHARED_LIB_SUFFIX}
--    MAKE_LIB="\${SHLIB_LD} -o \$@ \${OBJS} \$(TK_LD_SEARCH_FLAGS) ${TCL_STUB_LIB_SPEC} \${SHLIB_LD_LIBS}"
-+    MAKE_LIB="\${SHLIB_LD} -o \${@:C/\.so.*/.la/} \${OBJS:.o=.lo} \$(TK_LD_SEARCH_FLAGS) ${TCL_STUB_LIB_SPEC} \${SHLIB_LD_LIBS} -version-info 1:0"
-     RANLIB=":"
- 
- #    TCL_STUB_FLAGS="-DUSE_TCL_STUBS"
-@@ -4611,11 +4664,17 @@ eval "TK_LIB_FILE=${TK_LIB_FILE}"
- if test "$SHARED_BUILD" = 0 -o $TCL_NEEDS_EXP_FILE = 0; then
-     if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
- 	eval TK_LIB_FLAG="-ltk${VERSION}\${TK_DBGX}"
-+	eval TK_BUILD_LIB_SPEC="libtk${VERSION}\${TK_DBGX}.la"
-     else
- 	eval TK_LIB_FLAG="-ltk`echo ${VERSION} | tr -d .`\${TK_DBGX}"
-+	eval TK_BUILD_LIB_SPEC="libtk`echo ${VERSION} | tr -d .`\${TK_DBGX}.la"
-+    fi
-+    if test "${RPATH_FLAG}" != ""; then
-+	TK_LIB_SPEC_RPATH="${RPATH_FLAG}${exec_prefix}/lib"
-+    else
-+	TK_LIB_SPEC_RPATH=""
-     fi
--    TK_BUILD_LIB_SPEC="-L`pwd` ${TK_LIB_FLAG}"
--    TK_LIB_SPEC="-L${exec_prefix}/lib ${TK_LIB_FLAG}"
-+    TK_LIB_SPEC="-L${exec_prefix}/lib ${TK_LIB_SPEC_RPATH} ${TK_LIB_FLAG}"
-     TK_BUILD_EXP_FILE=""
-     TK_EXP_FILE=""
- else
diff --git a/x11/tk83/patches/patch-ac b/x11/tk83/patches/patch-ac
deleted file mode 100644
index e124dbe8a69..00000000000
--- a/x11/tk83/patches/patch-ac
+++ /dev/null
@@ -1,143 +0,0 @@
-$NetBSD: patch-ac,v 1.4 2005/11/05 03:27:56 rillig Exp $
-
---- unix/tcl.m4.orig	2001-10-20 00:24:40.000000000 +0000
-+++ unix/tcl.m4
-@@ -602,6 +602,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [
- 
-     do64bit_ok=no
-     fullSrcDir=`cd $srcdir; pwd`
-+    RPATH_FLAG=""
-     EXTRA_CFLAGS=""
-     TCL_EXPORT_FILE_SUFFIX=""
-     UNSHARED_LIB_SUFFIX=""
-@@ -791,8 +792,11 @@ dnl AC_CHECK_TOOL(AR, ar, :)
- 	    LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
- 	    EXTRA_CFLAGS=""
- 	    LDFLAGS=""
-+            SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
-+            UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
-+            TCL_LIB_VERSIONS_OK=nodots            
- 	    ;;
--	IRIX-6.*|IRIX64-6.5*)
-+	IRIX-6.*)
- 	    SHLIB_CFLAGS=""
- 	    SHLIB_LD="ld -n32 -shared -rdata_shared"
- 	    SHLIB_LD_LIBS='${LIBS}'
-@@ -815,6 +819,9 @@ dnl AC_CHECK_TOOL(AR, ar, :)
- 		esac
- 		LDFLAGS="-n32"
- 	    fi
-+            SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
-+            UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
-+            TCL_LIB_VERSIONS_OK=nodots            
- 	    ;;
- 	IRIX64-6.*)
- 	    SHLIB_CFLAGS=""
-@@ -825,6 +832,15 @@ dnl AC_CHECK_TOOL(AR, ar, :)
- 	    DL_LIBS=""
- 	    LDFLAGS=""
- 	    LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
-+            SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
-+            UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
-+            TCL_LIB_VERSIONS_OK=nodots            
-+
-+	    # Check to enable 64-bit flags for compiler/linker
-+            if test "${ABI}" = "64" ; then                 
-+                SHLIB_LD="ld -64 -shared -rdata_shared"
-+                LDFLAGS="$LDFLAGS -64"                 
-+            fi   
- 	    ;;
- 	Linux*)
- 	    SHLIB_CFLAGS="-fPIC"
-@@ -915,7 +931,6 @@ dnl AC_CHECK_TOOL(AR, ar, :)
- 	    AC_CHECK_HEADER(dlfcn.h, [
- 		# NetBSD/SPARC needs -fPIC, -fpic will not do.
- 		SHLIB_CFLAGS="-fPIC"
--		SHLIB_LD="ld -Bshareable -x"
- 		SHLIB_LD_LIBS=""
- 		SHLIB_SUFFIX=".so"
- 		DL_OBJS="tclLoadDl.o"
-@@ -927,11 +942,19 @@ dnl AC_CHECK_TOOL(AR, ar, :)
- #ifdef __ELF__
- 	yes
- #endif
--		],
-+		], [
- 		    AC_MSG_RESULT(yes)
--		    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so',
-+		    SHLIB_LD='${TCL_CC} -shared -Wl,-x'
-+		    RPATH_FLAG='-Wl,-R'
-+		    LD_SEARCH_FLAGS='-Wl,-R${LIB_RUNTIME_DIR}'
-+		    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
-+		], [
- 		    AC_MSG_RESULT(no)
-+		    SHLIB_LD="ld -Bshareable -x"
-+		    RPATH_FLAG='-R'
-+		    LD_SEARCH_FLAGS='-R${LIB_RUNTIME_DIR}'
- 		    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0'
-+		]
- 		)
- 	    ], [
- 		SHLIB_CFLAGS=""
-@@ -950,7 +973,7 @@ dnl AC_CHECK_TOOL(AR, ar, :)
- 	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
- 	    TCL_LIB_VERSIONS_OK=nodots
- 	    ;;
--	FreeBSD-*)
-+	FreeBSD-*|DragonFly-*)
- 	    # FreeBSD 3.* and greater have ELF.
- 	    SHLIB_CFLAGS="-fPIC"
- 	    SHLIB_LD="ld -Bshareable -x"
-@@ -1130,6 +1153,9 @@ dnl AC_CHECK_TOOL(AR, ar, :)
- 	    DL_LIBS="-ldl"
- 	    LDFLAGS=""
- 	    LD_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}'
-+	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
-+	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
-+	    TCL_LIB_VERSIONS_OK=nodots
- 	    ;;
- 	SunOS-5*)
- 
-@@ -1174,6 +1200,9 @@ dnl AC_CHECK_TOOL(AR, ar, :)
- 	    else
- 		LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}'
- 	    fi
-+	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
-+	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
-+	    TCL_LIB_VERSIONS_OK=nodots
- 	    ;;
- 	ULTRIX-4.*)
- 	    SHLIB_CFLAGS="-G 0"
-@@ -1329,7 +1358,7 @@ dnl AC_CHECK_TOOL(AR, ar, :)
- 		    ;;
- 		IRIX*)
- 		    ;;
--		NetBSD-*|FreeBSD-*|OpenBSD-*)
-+		NetBSD-*|FreeBSD-*|OpenBSD-*|DragonFly-*)
- 		    ;;
- 		Rhapsody-*|Darwin-*)
- 		    ;;
-@@ -1652,7 +1681,11 @@ AC_DEFUN(SC_PATH_X, [
- 	for i in $dirs ; do
- 	    if test -r $i/libX11.a -o -r $i/libX11.so -o -r $i/libX11.sl; then
- 		AC_MSG_RESULT($i)
-+		if test "${RPATH_FLAG}" != ""; then
-+		    XLIBSW="-L$i ${RPATH_FLAG}$i -lX11"
-+		else
- 		XLIBSW="-L$i -lX11"
-+		fi
- 		x_libraries="$i"
- 		break
- 	    fi
-@@ -1661,7 +1694,11 @@ AC_DEFUN(SC_PATH_X, [
- 	if test "$x_libraries" = ""; then
- 	    XLIBSW=-lX11
- 	else
-+	    if test "${RPATH_FLAG}" != ""; then
-+		XLIBSW="-L$x_libraries ${RPATH_FLAG}$x_libraries -lX11"
-+	    else
- 	    XLIBSW="-L$x_libraries -lX11"
-+	    fi
- 	fi
-     fi
-     if test "$XLIBSW" = nope ; then
diff --git a/x11/tk83/patches/patch-ad b/x11/tk83/patches/patch-ad
deleted file mode 100644
index 13f1274ada9..00000000000
--- a/x11/tk83/patches/patch-ad
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2009/12/17 18:23:49 abs Exp $
-
---- unix/configure.in.orig	2001-10-20 00:24:40.000000000 +0000
-+++ unix/configure.in
-@@ -220,6 +220,10 @@ if test "x${x_libraries}" != "x"; then
- fi
- if test "${TCL_LD_SEARCH_FLAGS}" = '-L${LIB_RUNTIME_DIR}'; then
-     LIB_RUNTIME_DIR=`echo ${LIB_RUNTIME_DIR} |sed -e 's/:/ -L/g'`
-+elif test "${TCL_LD_SEARCH_FLAGS}" = '-R${LIB_RUNTIME_DIR}'; then
-+    LIB_RUNTIME_DIR=`echo ${LIB_RUNTIME_DIR} |sed -e 's/:/ -R/g'`
-+elif test "${TCL_LD_SEARCH_FLAGS}" = '-Wl,-R${LIB_RUNTIME_DIR}'; then
-+    LIB_RUNTIME_DIR=`echo ${LIB_RUNTIME_DIR} |sed -e 's/:/ -Wl,-R/g'`
- fi
- 
- # The statement below is very tricky!  It actually *evaluates* the
-@@ -349,7 +353,7 @@ TCL_STUB_LIB_SPEC='-L$(TCL_BIN_DIR) $(TC
- if test "${SHARED_BUILD}" = "1" -a "${SHLIB_SUFFIX}" != ""; then
-     TK_SHLIB_CFLAGS="${SHLIB_CFLAGS}"
-     TK_LIB_FILE=libtk${TK_SHARED_LIB_SUFFIX}
--    MAKE_LIB="\${SHLIB_LD} -o \[$]@ \${OBJS} \$(TK_LD_SEARCH_FLAGS) ${TCL_STUB_LIB_SPEC} \${SHLIB_LD_LIBS}"
-+    MAKE_LIB="\${SHLIB_LD} -o \${@:C/\.so.*/.la/} \${OBJS:.o=.lo} \$(TK_LD_SEARCH_FLAGS) ${TCL_STUB_LIB_SPEC} \${SHLIB_LD_LIBS} -version-info 1:0"
-     RANLIB=":"
- 
- #    TCL_STUB_FLAGS="-DUSE_TCL_STUBS"
-@@ -372,11 +376,17 @@ eval "TK_LIB_FILE=${TK_LIB_FILE}"
- if test "$SHARED_BUILD" = 0 -o $TCL_NEEDS_EXP_FILE = 0; then
-     if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
- 	eval TK_LIB_FLAG="-ltk${VERSION}\${TK_DBGX}"
-+	eval TK_BUILD_LIB_SPEC="libtk${VERSION}\${TK_DBGX}.la"
-     else
- 	eval TK_LIB_FLAG="-ltk`echo ${VERSION} | tr -d .`\${TK_DBGX}"
-+	eval TK_BUILD_LIB_SPEC="libtk`echo ${VERSION} | tr -d .`\${TK_DBGX}.la"
-     fi
--    TK_BUILD_LIB_SPEC="-L`pwd` ${TK_LIB_FLAG}"
--    TK_LIB_SPEC="-L${exec_prefix}/lib ${TK_LIB_FLAG}"
-+    if test "${RPATH_FLAG}" != ""; then
-+	TK_LIB_SPEC_RPATH="${RPATH_FLAG}${exec_prefix}/lib"
-+    else
-+	TK_LIB_SPEC_RPATH=""
-+    fi
-+    TK_LIB_SPEC="-L${exec_prefix}/lib ${TK_LIB_SPEC_RPATH} ${TK_LIB_FLAG}"
-     TK_BUILD_EXP_FILE=""
-     TK_EXP_FILE=""
- else
diff --git a/x11/tk83/patches/patch-ae b/x11/tk83/patches/patch-ae
deleted file mode 100644
index 07aba9c87a9..00000000000
--- a/x11/tk83/patches/patch-ae
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2005/11/05 03:27:56 rillig Exp $
-
---- unix/tkUnixPort.h.orig	2001-10-13 01:25:10.000000000 +0000
-+++ unix/tkUnixPort.h
-@@ -123,8 +123,10 @@
-  * Not all systems declare the errno variable in errno.h. so this
-  * file does it explicitly.
-  */
--
-+#include <errno.h>
-+#ifndef errno
- extern int errno;
-+#endif
- 
- /*
-  * Define "NBBY" (number of bits per byte) if it's not already defined.
diff --git a/x11/tk83/patches/patch-af b/x11/tk83/patches/patch-af
deleted file mode 100644
index 0ab989dafb9..00000000000
--- a/x11/tk83/patches/patch-af
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-af,v 1.2 2009/12/17 18:23:49 abs Exp $
-
-Tk uses X event numbers to index this array, as well as adding a few of its
-own, starting with "VirtualEvent" (Which is correctly set to LASTEvent,
-defined in include/X11/X.h).  In xproto-7.0.13, a new event "GenericEvent" was
-added - making the array broken for all of Tk's internal events.
-
-A cleaner fix, but a much bigger patch, is listed in the Tk bug tracker:
-
-http://sourceforge.net/tracker/index.php?func=detail&aid=2010422&group_id=12997&atid=112997
-
---- generic/tkBind.c.orig	2001-10-13 01:25:10.000000000 +0000
-+++ generic/tkBind.c
-@@ -575,6 +575,9 @@ static int flagArray[TK_LASTEVENT] = {
-    /* ColormapNotify */		COLORMAP,
-    /* ClientMessage */		0,
-    /* MappingNotify */		0,
-+#ifdef GenericEvent
-+   /* GenericEvent */		0, /* Introduced in xproto-7.0.13 */
-+#endif
-    /* VirtualEvent */		VIRTUAL,
-    /* Activate */		ACTIVATE,	    
-    /* Deactivate */		ACTIVATE,