Reimport tk-8.3.4 into x11/tk83 before updating Tk to 8.4.5, because

many packages still need 8.3.  OK'ed by the maintainer (jwise@).

10 files changed, 1980 insertions, 0 deletions

diff --git a/x11/tk83/DESCR b/x11/tk83/DESCR
new file mode 100644
index 00000000000..05b76dd7000
--- /dev/null
+++ b/x11/tk83/DESCR
@@ -0,0 +1,7 @@
+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
new file mode 100644
index 00000000000..f87346ed8f2
--- /dev/null
+++ b/x11/tk83/Makefile
@@ -0,0 +1,89 @@
+# $NetBSD: Makefile,v 1.1.1.1 2004/03/08 20:07:38 minskim Exp $
+
+DISTNAME=	tk8.3.4
+PKGNAME=	tk-8.3.4
+CATEGORIES=	x11
+MASTER_SITES=	ftp://ftp.scriptics.com/pub/tcl/tcl8_3/ \
+		ftp://ftp.informatik.uni-hamburg.de/pub/soft/lang/tcl/tcl8_3/
+
+MAINTAINER=	jwise@NetBSD.org
+HOMEPAGE=	http://www.tcltk.com/
+COMMENT=	Graphical toolkit for TCL
+
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
+WRKSRC=			${WRKDIR}/${DISTNAME}/unix
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--with-tcl=${BUILDLINK_PREFIX.tcl}/lib
+MAKE_ENV+=		TOUCH="${TOUCH}"
+
+USE_X11=		yes
+USE_LIBTOOL=		yes
+USE_BUILDLINK3=		yes
+TEST_TARGET=		test
+
+# Initially install the man pages into ${WRKDIR}/man, as we need a staged
+# install to avoid overwriting existing manpages in ${PREFIX}/man.
+#
+CONFIGURE_ARGS+=	--mandir=${WRKDIR}/man
+
+# Modify mkLinks script to remove the short-filename manpage if it was
+# linked to a longer filename.
+#
+post-patch:
+	@cd ${WRKSRC};							\
+	${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;
+
+pre-install:
+	cd ${WRKSRC}; for file in					\
+		tkUnixInit.o libtk83.so wish;				\
+	do								\
+		${TOUCH} $${file};					\
+	done
+
+post-install:
+	cd ${WRKDIR} && ${PAX} -rwpm man ${PREFIX}
+	${RM} -rf ${WRKDIR}/man
+	${RM} -f ${PREFIX}/bin/wish
+	cd ${PREFIX}/bin && ${LN} -s wish8.3 wish
+	${INSTALL_DATA_DIR} ${PREFIX}/include/tk
+	${INSTALL_DATA_DIR} ${PREFIX}/include/tk/generic
+	${INSTALL_DATA_DIR} ${PREFIX}/include/tk/unix
+	${INSTALL_DATA} ${WRKSRC}/../generic/default.h ${PREFIX}/include/tk/generic
+	${INSTALL_DATA} ${WRKSRC}/../generic/ks_names.h ${PREFIX}/include/tk/generic
+	${INSTALL_DATA} ${WRKSRC}/../generic/tk.h ${PREFIX}/include/tk/generic
+	${INSTALL_DATA} ${WRKSRC}/../generic/tk3d.h ${PREFIX}/include/tk/generic
+	${INSTALL_DATA} ${WRKSRC}/../generic/tkButton.h ${PREFIX}/include/tk/generic
+	${INSTALL_DATA} ${WRKSRC}/../generic/tkCanvas.h ${PREFIX}/include/tk/generic
+	${INSTALL_DATA} ${WRKSRC}/../generic/tkColor.h ${PREFIX}/include/tk/generic
+	${INSTALL_DATA} ${WRKSRC}/../generic/tkDecls.h ${PREFIX}/include/tk/generic
+	${INSTALL_DATA} ${WRKSRC}/../generic/tkFileFilter.h ${PREFIX}/include/tk/generic
+	${INSTALL_DATA} ${WRKSRC}/../generic/tkFont.h ${PREFIX}/include/tk/generic
+	${INSTALL_DATA} ${WRKSRC}/../generic/tkInitScript.h ${PREFIX}/include/tk/generic
+	${INSTALL_DATA} ${WRKSRC}/../generic/tkInt.h ${PREFIX}/include/tk/generic
+	${INSTALL_DATA} ${WRKSRC}/../generic/tkIntDecls.h ${PREFIX}/include/tk/generic
+	${INSTALL_DATA} ${WRKSRC}/../generic/tkIntPlatDecls.h ${PREFIX}/include/tk/generic
+	${INSTALL_DATA} ${WRKSRC}/../generic/tkIntXlibDecls.h ${PREFIX}/include/tk/generic
+	${INSTALL_DATA} ${WRKSRC}/../generic/tkMenu.h ${PREFIX}/include/tk/generic
+	${INSTALL_DATA} ${WRKSRC}/../generic/tkMenubutton.h ${PREFIX}/include/tk/generic
+	${INSTALL_DATA} ${WRKSRC}/../generic/tkPlatDecls.h ${PREFIX}/include/tk/generic
+	${INSTALL_DATA} ${WRKSRC}/../generic/tkPort.h ${PREFIX}/include/tk/generic
+	${INSTALL_DATA} ${WRKSRC}/../generic/tkScale.h ${PREFIX}/include/tk/generic
+	${INSTALL_DATA} ${WRKSRC}/../generic/tkScrollbar.h ${PREFIX}/include/tk/generic
+	${INSTALL_DATA} ${WRKSRC}/../generic/tkSelect.h ${PREFIX}/include/tk/generic
+	${INSTALL_DATA} ${WRKSRC}/../generic/tkText.h ${PREFIX}/include/tk/generic
+	${INSTALL_DATA} ${WRKSRC}/../unix/tkUnixDefault.h ${PREFIX}/include/tk/unix
+	${INSTALL_DATA} ${WRKSRC}/../unix/tkUnixInt.h ${PREFIX}/include/tk/unix
+	${INSTALL_DATA} ${WRKSRC}/../unix/tkUnixPort.h ${PREFIX}/include/tk/unix
+
+.include "../../lang/tcl83/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/tk83/PLIST b/x11/tk83/PLIST
new file mode 100644
index 00000000000..4dc3b587687
--- /dev/null
+++ b/x11/tk83/PLIST
@@ -0,0 +1,460 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2004/03/08 20:07:40 minskim 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.a
+lib/libtk83.la
+lib/libtk83.so
+lib/libtk83.so.1
+lib/libtk83.so.1.0
+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
+@dirrm lib/tk8.3/images
+@dirrm lib/tk8.3/demos/images
+@dirrm lib/tk8.3/demos
+@dirrm lib/tk8.3
+@dirrm include/tk/unix
+@dirrm include/tk/generic
+@dirrm include/tk
diff --git a/x11/tk83/buildlink2.mk b/x11/tk83/buildlink2.mk
new file mode 100644
index 00000000000..c1f51145460
--- /dev/null
+++ b/x11/tk83/buildlink2.mk
@@ -0,0 +1,36 @@
+# $NetBSD: buildlink2.mk,v 1.1.1.1 2004/03/08 20:07:40 minskim Exp $
+
+.if !defined(TK_BUILDLINK2_MK)
+TK_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		tk
+BUILDLINK_DEPENDS.tk?=		tk>=8.3.4
+BUILDLINK_PKGSRCDIR.tk?=	../../x11/tk83
+
+EVAL_PREFIX+=			BUILDLINK_PREFIX.tk=tk
+BUILDLINK_PREFIX.tk_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.tk=		bin/wish*
+BUILDLINK_FILES.tk+=		include/tk.h
+BUILDLINK_FILES.tk+=		include/tkDecls.h
+BUILDLINK_FILES.tk+=		include/tkPlatDecls.h
+BUILDLINK_FILES.tk+=		include/tkIntXlibDecls.h
+BUILDLINK_FILES.tk+=		include/tk/*/*.h
+BUILDLINK_FILES.tk+=		lib/libtk83.*
+BUILDLINK_FILES.tk+=		lib/libtkstub83.*
+
+USE_X11=	YES
+
+.include "../../lang/tcl83/buildlink2.mk"
+
+# Make "-ltk" resolve into "-ltk83", so that we don't need to patch so
+# many Makefiles.
+#
+BUILDLINK_TRANSFORM+=		l:tk:tk83
+
+BUILDLINK_TARGETS+=	tk-buildlink
+
+tk-buildlink: _BUILDLINK_USE
+
+TKCONFIG_SH?=			${BUILDLINK_PREFIX.tk}/lib/tkConfig.sh
+
+.endif	# TK_BUILDLINK2_MK
diff --git a/x11/tk83/buildlink3.mk b/x11/tk83/buildlink3.mk
new file mode 100644
index 00000000000..1f9cc4014b4
--- /dev/null
+++ b/x11/tk83/buildlink3.mk
@@ -0,0 +1,31 @@
+# $NetBSD: buildlink3.mk,v 1.1.1.1 2004/03/08 20:07:40 minskim Exp $
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+TK_BUILDLINK3_MK:=	${TK_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	tk
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ntk}
+BUILDLINK_PACKAGES+=	tk
+
+.if !empty(TK_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.tk+=		tk>=8.3.4
+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
+
+USE_X11=	yes
+TKCONFIG_SH?=	${BUILDLINK_PREFIX.tk}/lib/tkConfig.sh
+
+.include "../../lang/tcl83/buildlink3.mk"
+
+.endif	# TK_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/tk83/distinfo b/x11/tk83/distinfo
new file mode 100644
index 00000000000..a0beeb88efc
--- /dev/null
+++ b/x11/tk83/distinfo
@@ -0,0 +1,8 @@
+$NetBSD: distinfo,v 1.1.1.1 2004/03/08 20:07:38 minskim Exp $
+
+SHA1 (tk8.3.4.tar.gz) = d52bf5cedb73e9b817ba8d6a2b00701f4f82fad2
+Size (tk8.3.4.tar.gz) = 2589635 bytes
+SHA1 (patch-aa) = 213c82956f692cc493215e222c08da76cf18841e
+SHA1 (patch-ab) = b99c7a48dc525a45305ad6265735de56df4b5d9c
+SHA1 (patch-ac) = 172762efa65eb05345d70cf38893bc96b56a2481
+SHA1 (patch-ad) = 1815fc19986674cb2ea03a8d60cd1514ff47fba9
diff --git a/x11/tk83/patches/patch-aa b/x11/tk83/patches/patch-aa
new file mode 100644
index 00000000000..8cc5cb1879b
--- /dev/null
+++ b/x11/tk83/patches/patch-aa
@@ -0,0 +1,93 @@
+$NetBSD: patch-aa,v 1.1.1.1 2004/03/08 20:07:40 minskim Exp $
+
+--- Makefile.in.orig	Sat Oct 20 02:24:40 2001
++++ Makefile.in
+@@ -76,7 +76,7 @@
+ # The directory containing the Tcl sources and headers appropriate
+ # for this version of Tk ("srcdir" will be replaced or has already
+ # been replaced by the configure script):
+-TCL_GENERIC_DIR		= @TCL_SRC_DIR@/generic
++TCL_GENERIC_DIR		= $(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			= $(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 @@
+ # "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 @@
+ # 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 @@
+ # 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 @@
+ 	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,7 +393,7 @@
+ 
+ 
+ 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
+ 
+@@ -402,12 +404,12 @@
+ 	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
+ 
+ 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 @@
+ 	    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
new file mode 100644
index 00000000000..e9d4d1c7b3e
--- /dev/null
+++ b/x11/tk83/patches/patch-ab
@@ -0,0 +1,1124 @@
+$NetBSD: patch-ab,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
+
+--- configure.orig	Fri Oct 19 20:24:40 2001
++++ configure	Sun Mar 16 13:25:15 2003
+@@ -1746,6 +1746,7 @@
+ 
+     do64bit_ok=no
+     fullSrcDir=`cd $srcdir; pwd`
++    RPATH_FLAG=""
+     EXTRA_CFLAGS=""
+     TCL_EXPORT_FILE_SUFFIX=""
+     UNSHARED_LIB_SUFFIX=""
+@@ -1765,7 +1766,7 @@
+     # Extract the first word of "ar", so it can be a program name with args.
+ set dummy ar; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1769: checking for $ac_word" >&5
++echo "configure:1770: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1870,7 +1871,7 @@
+ 	    # known GMT value.
+ 
+ 	    echo $ac_n "checking for gettimeofday in -lbsd""... $ac_c" 1>&6
+-echo "configure:1874: checking for gettimeofday in -lbsd" >&5
++echo "configure:1875: checking for gettimeofday in -lbsd" >&5
+ ac_lib_var=`echo bsd'_'gettimeofday | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -1878,7 +1879,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lbsd  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 1882 "configure"
++#line 1883 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -1889,7 +1890,7 @@
+ gettimeofday()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1893: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:1894: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -1951,7 +1952,7 @@
+ 	HP-UX-*.11.*)
+ 	    SHLIB_SUFFIX=".sl"
+ 	    echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
+-echo "configure:1955: checking for shl_load in -ldld" >&5
++echo "configure:1956: checking for shl_load in -ldld" >&5
+ ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -1959,7 +1960,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-ldld  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 1963 "configure"
++#line 1964 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -1970,7 +1971,7 @@
+ shl_load()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1974: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:1975: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -2013,7 +2014,7 @@
+ 	HP-UX-*.08.*|HP-UX-*.09.*|HP-UX-*.10.*)
+ 	    SHLIB_SUFFIX=".sl"
+ 	    echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
+-echo "configure:2017: checking for shl_load in -ldld" >&5
++echo "configure:2018: checking for shl_load in -ldld" >&5
+ ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -2021,7 +2022,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-ldld  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 2025 "configure"
++#line 2026 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -2032,7 +2033,7 @@
+ shl_load()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2036: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2037: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -2136,20 +2137,23 @@
+ 		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
+-echo "configure:2143: checking for dld.h" >&5
++echo "configure:2144: checking for dld.h" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2148 "configure"
++#line 2149 "configure"
+ #include "confdefs.h"
+ #include <dld.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:2153: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2154: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+@@ -2206,17 +2210,17 @@
+ 	    else
+ 		ac_safe=`echo "dld.h" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for dld.h""... $ac_c" 1>&6
+-echo "configure:2210: checking for dld.h" >&5
++echo "configure:2211: checking for dld.h" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2215 "configure"
++#line 2216 "configure"
+ #include "confdefs.h"
+ #include <dld.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:2220: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2221: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+@@ -2271,17 +2275,17 @@
+ 	    # 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
+-echo "configure:2275: checking for dlfcn.h" >&5
++echo "configure:2276: checking for dlfcn.h" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2280 "configure"
++#line 2281 "configure"
+ #include "confdefs.h"
+ #include <dlfcn.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:2285: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2286: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+@@ -2300,7 +2304,6 @@
+   
+ 		# 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 +2324,23 @@
+ 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 +2552,9 @@
+ 	    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 +2602,9 @@
+ 	    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"
+@@ -2611,17 +2630,17 @@
+ 	    # that don't grok the -Bexport option.  Test that it does.
+ 	    hold_ldflags=$LDFLAGS
+ 	    echo $ac_n "checking for ld accepts -Bexport flag""... $ac_c" 1>&6
+-echo "configure:2615: checking for ld accepts -Bexport flag" >&5
++echo "configure:2631: checking for ld accepts -Bexport flag" >&5
+ 	    LDFLAGS="${LDFLAGS} -Wl,-Bexport"
+ 	    cat > conftest.$ac_ext <<EOF
+-#line 2618 "configure"
++#line 2634 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ int i;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2625: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2641: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   found=yes
+ else
+@@ -2667,9 +2686,9 @@
+ 
+     if test "x$DL_OBJS" = "xtclLoadAout.o" ; then
+ 	echo $ac_n "checking sys/exec.h""... $ac_c" 1>&6
+-echo "configure:2671: checking sys/exec.h" >&5
++echo "configure:2687: checking sys/exec.h" >&5
+ 	cat > conftest.$ac_ext <<EOF
+-#line 2673 "configure"
++#line 2689 "configure"
+ #include "confdefs.h"
+ #include <sys/exec.h>
+ int main() {
+@@ -2687,7 +2706,7 @@
+     
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2691: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:2707: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   tcl_ok=usable
+ else
+@@ -2705,9 +2724,9 @@
+ 
+ 	else
+ 	    echo $ac_n "checking a.out.h""... $ac_c" 1>&6
+-echo "configure:2709: checking a.out.h" >&5
++echo "configure:2725: checking a.out.h" >&5
+ 	    cat > conftest.$ac_ext <<EOF
+-#line 2711 "configure"
++#line 2727 "configure"
+ #include "confdefs.h"
+ #include <a.out.h>
+ int main() {
+@@ -2725,7 +2744,7 @@
+ 	    
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2729: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:2745: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   tcl_ok=usable
+ else
+@@ -2743,9 +2762,9 @@
+ 
+ 	    else
+ 		echo $ac_n "checking sys/exec_aout.h""... $ac_c" 1>&6
+-echo "configure:2747: checking sys/exec_aout.h" >&5
++echo "configure:2763: checking sys/exec_aout.h" >&5
+ 		cat > conftest.$ac_ext <<EOF
+-#line 2749 "configure"
++#line 2765 "configure"
+ #include "confdefs.h"
+ #include <sys/exec_aout.h>
+ int main() {
+@@ -2763,7 +2782,7 @@
+ 		
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2767: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:2783: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   tcl_ok=usable
+ else
+@@ -2860,7 +2879,7 @@
+ 
+ 
+     echo $ac_n "checking for build with symbols""... $ac_c" 1>&6
+-echo "configure:2864: checking for build with symbols" >&5
++echo "configure:2880: checking for build with symbols" >&5
+     # Check whether --enable-symbols or --disable-symbols was given.
+ if test "${enable_symbols+set}" = set; then
+   enableval="$enable_symbols"
+@@ -2904,12 +2923,12 @@
+ #--------------------------------------------------------------------
+ 
+ echo $ac_n "checking for sin""... $ac_c" 1>&6
+-echo "configure:2908: checking for sin" >&5
++echo "configure:2924: checking for sin" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_sin'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2913 "configure"
++#line 2929 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char sin(); below.  */
+@@ -2932,7 +2951,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2936: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2952: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_sin=yes"
+ else
+@@ -2953,7 +2972,7 @@
+ fi
+ 
+ echo $ac_n "checking for main in -lieee""... $ac_c" 1>&6
+-echo "configure:2957: checking for main in -lieee" >&5
++echo "configure:2973: checking for main in -lieee" >&5
+ ac_lib_var=`echo ieee'_'main | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -2961,14 +2980,14 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lieee  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 2965 "configure"
++#line 2981 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ main()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2972: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2988: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -2999,7 +3018,7 @@
+ libbsd=no
+ if test "`uname -s`" = "AIX" ; then
+     echo $ac_n "checking for gettimeofday in -lbsd""... $ac_c" 1>&6
+-echo "configure:3003: checking for gettimeofday in -lbsd" >&5
++echo "configure:3019: checking for gettimeofday in -lbsd" >&5
+ ac_lib_var=`echo bsd'_'gettimeofday | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -3007,7 +3026,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lbsd  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 3011 "configure"
++#line 3027 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -3018,7 +3037,7 @@
+ gettimeofday()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3022: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3038: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -3049,9 +3068,9 @@
+ #--------------------------------------------------------------------
+ 
+ echo $ac_n "checking stdlib.h""... $ac_c" 1>&6
+-echo "configure:3053: checking stdlib.h" >&5
++echo "configure:3069: checking stdlib.h" >&5
+ cat > conftest.$ac_ext <<EOF
+-#line 3055 "configure"
++#line 3071 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ EOF
+@@ -3066,7 +3085,7 @@
+ rm -f conftest*
+ 
+ cat > conftest.$ac_ext <<EOF
+-#line 3070 "configure"
++#line 3086 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ EOF
+@@ -3080,7 +3099,7 @@
+ rm -f conftest*
+ 
+ cat > conftest.$ac_ext <<EOF
+-#line 3084 "configure"
++#line 3100 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ EOF
+@@ -3112,16 +3131,16 @@
+ #--------------------------------------------------------------------
+ 
+ echo $ac_n "checking fd_set and sys/select""... $ac_c" 1>&6
+-echo "configure:3116: checking fd_set and sys/select" >&5
++echo "configure:3132: checking fd_set and sys/select" >&5
+ cat > conftest.$ac_ext <<EOF
+-#line 3118 "configure"
++#line 3134 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int main() {
+ fd_set readMask, writeMask;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3125: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:3141: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   tk_ok=yes
+ else
+@@ -3133,7 +3152,7 @@
+ rm -f conftest*
+ if test $tk_ok = no; then
+     cat > conftest.$ac_ext <<EOF
+-#line 3137 "configure"
++#line 3153 "configure"
+ #include "confdefs.h"
+ #include <sys/select.h>
+ EOF
+@@ -3165,12 +3184,12 @@
+ #--------------------------------------------------------------------
+ 
+ echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
+-echo "configure:3169: checking for ANSI C header files" >&5
++echo "configure:3185: checking for ANSI C header files" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3174 "configure"
++#line 3190 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ #include <stdarg.h>
+@@ -3178,7 +3197,7 @@
+ #include <float.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:3182: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:3198: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+@@ -3195,7 +3214,7 @@
+ if test $ac_cv_header_stdc = yes; then
+   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+ cat > conftest.$ac_ext <<EOF
+-#line 3199 "configure"
++#line 3215 "configure"
+ #include "confdefs.h"
+ #include <string.h>
+ EOF
+@@ -3213,7 +3232,7 @@
+ if test $ac_cv_header_stdc = yes; then
+   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+ cat > conftest.$ac_ext <<EOF
+-#line 3217 "configure"
++#line 3233 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ EOF
+@@ -3234,7 +3253,7 @@
+   :
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3238 "configure"
++#line 3254 "configure"
+ #include "confdefs.h"
+ #include <ctype.h>
+ #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+@@ -3245,7 +3264,7 @@
+ exit (0); }
+ 
+ EOF
+-if { (eval echo configure:3249: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:3265: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   :
+ else
+@@ -3269,12 +3288,12 @@
+ fi
+ 
+ echo $ac_n "checking for mode_t""... $ac_c" 1>&6
+-echo "configure:3273: checking for mode_t" >&5
++echo "configure:3289: checking for mode_t" >&5
+ if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3278 "configure"
++#line 3294 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -3302,12 +3321,12 @@
+ fi
+ 
+ echo $ac_n "checking for pid_t""... $ac_c" 1>&6
+-echo "configure:3306: checking for pid_t" >&5
++echo "configure:3322: checking for pid_t" >&5
+ if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3311 "configure"
++#line 3327 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -3335,12 +3354,12 @@
+ fi
+ 
+ echo $ac_n "checking for size_t""... $ac_c" 1>&6
+-echo "configure:3339: checking for size_t" >&5
++echo "configure:3355: checking for size_t" >&5
+ if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3344 "configure"
++#line 3360 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -3368,12 +3387,12 @@
+ fi
+ 
+ echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
+-echo "configure:3372: checking for uid_t in sys/types.h" >&5
++echo "configure:3388: checking for uid_t in sys/types.h" >&5
+ if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3377 "configure"
++#line 3393 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ EOF
+@@ -3410,17 +3429,17 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:3414: checking for $ac_hdr" >&5
++echo "configure:3430: checking for $ac_hdr" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3419 "configure"
++#line 3435 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:3424: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:3440: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+@@ -3447,12 +3466,12 @@
+ done
+ 
+ echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
+-echo "configure:3451: checking whether time.h and sys/time.h may both be included" >&5
++echo "configure:3467: checking whether time.h and sys/time.h may both be included" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3456 "configure"
++#line 3472 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/time.h>
+@@ -3461,7 +3480,7 @@
+ struct tm *tp;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3465: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:3481: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_header_time=yes
+ else
+@@ -3487,16 +3506,16 @@
+ #-------------------------------------------
+ 
+ echo $ac_n "checking pw_gecos in struct pwd""... $ac_c" 1>&6
+-echo "configure:3491: checking pw_gecos in struct pwd" >&5
++echo "configure:3507: checking pw_gecos in struct pwd" >&5
+ cat > conftest.$ac_ext <<EOF
+-#line 3493 "configure"
++#line 3509 "configure"
+ #include "confdefs.h"
+ #include <pwd.h>
+ int main() {
+ struct passwd pwd; pwd.pw_gecos;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3500: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:3516: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   tk_ok=yes
+ else
+@@ -3529,7 +3548,7 @@
+ # Uses ac_ vars as temps to allow command line to override cache and checks.
+ # --without-x overrides everything else, but does not touch the cache.
+ echo $ac_n "checking for X""... $ac_c" 1>&6
+-echo "configure:3533: checking for X" >&5
++echo "configure:3549: checking for X" >&5
+ 
+ # Check whether --with-x or --without-x was given.
+ if test "${with_x+set}" = set; then
+@@ -3591,12 +3610,12 @@
+ 
+   # First, try using that file with no special directory specified.
+ cat > conftest.$ac_ext <<EOF
+-#line 3595 "configure"
++#line 3611 "configure"
+ #include "confdefs.h"
+ #include <$x_direct_test_include>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:3600: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:3616: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+@@ -3665,14 +3684,14 @@
+   ac_save_LIBS="$LIBS"
+   LIBS="-l$x_direct_test_library $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 3669 "configure"
++#line 3685 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ ${x_direct_test_function}()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3676: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3692: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   LIBS="$ac_save_LIBS"
+ # We can link X programs with no special library path.
+@@ -3762,12 +3781,12 @@
+     if test "$no_x" = ""; then
+ 	if test "$x_includes" = ""; then
+ 	    cat > conftest.$ac_ext <<EOF
+-#line 3766 "configure"
++#line 3782 "configure"
+ #include "confdefs.h"
+ #include <X11/XIntrinsic.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:3771: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:3787: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   :
+@@ -3787,15 +3806,15 @@
+     fi
+     if test "$no_x" = "yes" -o "$not_really_there" = "yes"; then
+ 	echo $ac_n "checking for X11 header files""... $ac_c" 1>&6
+-echo "configure:3791: checking for X11 header files" >&5
++echo "configure:3807: checking for X11 header files" >&5
+ 	XINCLUDES="# no special path needed"
+ 	cat > conftest.$ac_ext <<EOF
+-#line 3794 "configure"
++#line 3810 "configure"
+ #include "confdefs.h"
+ #include <X11/Intrinsic.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:3799: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:3815: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   :
+@@ -3831,13 +3850,17 @@
+ 
+     if test "$no_x" = yes; then
+ 	echo $ac_n "checking for X11 libraries""... $ac_c" 1>&6
+-echo "configure:3835: checking for X11 libraries" >&5
++echo "configure:3851: checking for X11 libraries" >&5
+ 	XLIBSW=nope
+ 	dirs="/usr/unsupported/lib /usr/local/lib /usr/X386/lib /usr/X11R6/lib /usr/X11R5/lib /usr/lib/X11R5 /usr/lib/X11R4 /usr/openwin/lib /usr/X11/lib /usr/sww/X11/lib"
+ 	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 +3869,16 @@
+ 	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
+@@ -3859,7 +3886,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lXwindow  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 3863 "configure"
++#line 3887 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -3870,7 +3897,7 @@
+ XCreateWindow()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3874: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3898: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -3916,6 +3943,10 @@
+ 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
+@@ -3955,7 +3986,7 @@
+ #--------------------------------------------------------------------
+ 
+ echo $ac_n "checking for main in -lXbsd""... $ac_c" 1>&6
+-echo "configure:3959: checking for main in -lXbsd" >&5
++echo "configure:3987: checking for main in -lXbsd" >&5
+ ac_lib_var=`echo Xbsd'_'main | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -3963,14 +3994,14 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lXbsd  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 3967 "configure"
++#line 3995 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ main()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3974: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4002: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -3993,12 +4024,12 @@
+ 
+ tk_checkBoth=0
+ echo $ac_n "checking for connect""... $ac_c" 1>&6
+-echo "configure:3997: checking for connect" >&5
++echo "configure:4025: checking for connect" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4002 "configure"
++#line 4030 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char connect(); below.  */
+@@ -4021,7 +4052,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4025: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4053: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_connect=yes"
+ else
+@@ -4043,7 +4074,7 @@
+ 
+ if test "$tk_checkSocket" = 1; then
+     echo $ac_n "checking for main in -lsocket""... $ac_c" 1>&6
+-echo "configure:4047: checking for main in -lsocket" >&5
++echo "configure:4075: checking for main in -lsocket" >&5
+ ac_lib_var=`echo socket'_'main | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -4051,14 +4082,14 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lsocket  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 4055 "configure"
++#line 4083 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ main()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4062: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4090: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -4084,12 +4115,12 @@
+     tk_oldLibs=$LIBS
+     LIBS="$LIBS -lsocket -lnsl"
+     echo $ac_n "checking for accept""... $ac_c" 1>&6
+-echo "configure:4088: checking for accept" >&5
++echo "configure:4116: checking for accept" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_accept'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4093 "configure"
++#line 4121 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char accept(); below.  */
+@@ -4112,7 +4143,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4116: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_accept=yes"
+ else
+@@ -4134,12 +4165,12 @@
+ 
+ fi
+ echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
+-echo "configure:4138: checking for gethostbyname" >&5
++echo "configure:4166: checking for gethostbyname" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4143 "configure"
++#line 4171 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char gethostbyname(); below.  */
+@@ -4162,7 +4193,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4166: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_gethostbyname=yes"
+ else
+@@ -4180,7 +4211,7 @@
+ else
+   echo "$ac_t""no" 1>&6
+ echo $ac_n "checking for main in -lnsl""... $ac_c" 1>&6
+-echo "configure:4184: checking for main in -lnsl" >&5
++echo "configure:4212: checking for main in -lnsl" >&5
+ ac_lib_var=`echo nsl'_'main | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -4188,14 +4219,14 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lnsl  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 4192 "configure"
++#line 4220 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ main()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4199: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4227: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -4235,13 +4266,13 @@
+ 
+ if test -d /usr/include/mit ; then
+     echo $ac_n "checking MIT X libraries""... $ac_c" 1>&6
+-echo "configure:4239: checking MIT X libraries" >&5
++echo "configure:4267: checking MIT X libraries" >&5
+     tk_oldCFlags=$CFLAGS
+     CFLAGS="$CFLAGS -I/usr/include/mit"
+     tk_oldLibs=$LIBS
+     LIBS="$LIBS -lX11-mit"
+     cat > conftest.$ac_ext <<EOF
+-#line 4245 "configure"
++#line 4273 "configure"
+ #include "confdefs.h"
+ 
+ 	#include <X11/Xlib.h>
+@@ -4252,7 +4283,7 @@
+     
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4256: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4284: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   
+ 	echo "$ac_t""yes" 1>&6
+@@ -4279,12 +4310,12 @@
+ 
+ MATH_LIBS=""
+ echo $ac_n "checking for sin""... $ac_c" 1>&6
+-echo "configure:4283: checking for sin" >&5
++echo "configure:4311: checking for sin" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_sin'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4288 "configure"
++#line 4316 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char sin(); below.  */
+@@ -4307,7 +4338,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4311: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4339: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_sin=yes"
+ else
+@@ -4328,7 +4359,7 @@
+ fi
+ 
+ echo $ac_n "checking for main in -lieee""... $ac_c" 1>&6
+-echo "configure:4332: checking for main in -lieee" >&5
++echo "configure:4360: checking for main in -lieee" >&5
+ ac_lib_var=`echo ieee'_'main | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -4336,14 +4367,14 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lieee  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 4340 "configure"
++#line 4368 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ main()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4347: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4375: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -4370,14 +4401,14 @@
+ #--------------------------------------------------------------------
+ 
+ echo $ac_n "checking whether char is unsigned""... $ac_c" 1>&6
+-echo "configure:4374: checking whether char is unsigned" >&5
++echo "configure:4402: checking whether char is unsigned" >&5
+ if eval "test \"`echo '$''{'ac_cv_c_char_unsigned'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   if test "$GCC" = yes; then
+   # GCC predefines this symbol on systems where it applies.
+ cat > conftest.$ac_ext <<EOF
+-#line 4381 "configure"
++#line 4409 "configure"
+ #include "confdefs.h"
+ #ifdef __CHAR_UNSIGNED__
+   yes
+@@ -4399,7 +4430,7 @@
+     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4403 "configure"
++#line 4431 "configure"
+ #include "confdefs.h"
+ /* volatile prevents gcc2 from optimizing the test away on sparcs.  */
+ #if !defined(__STDC__) || __STDC__ != 1
+@@ -4409,7 +4440,7 @@
+   volatile char c = 255; exit(c < 0);
+ }
+ EOF
+-if { (eval echo configure:4413: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:4441: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   ac_cv_c_char_unsigned=yes
+ else
+@@ -4442,12 +4473,12 @@
+ 
+ 
+     echo $ac_n "checking for strtod""... $ac_c" 1>&6
+-echo "configure:4446: checking for strtod" >&5
++echo "configure:4474: checking for strtod" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_strtod'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4451 "configure"
++#line 4479 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char strtod(); below.  */
+@@ -4470,7 +4501,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4474: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4502: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_strtod=yes"
+ else
+@@ -4492,12 +4523,12 @@
+ 
+     if test "$tcl_strtod" = 1; then
+ 	echo $ac_n "checking for Solaris2.4/Tru64 strtod bugs""... $ac_c" 1>&6
+-echo "configure:4496: checking for Solaris2.4/Tru64 strtod bugs" >&5
++echo "configure:4524: checking for Solaris2.4/Tru64 strtod bugs" >&5
+ 	if test "$cross_compiling" = yes; then
+   tcl_ok=0
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4501 "configure"
++#line 4529 "configure"
+ #include "confdefs.h"
+ 
+ 	    extern double strtod();
+@@ -4517,7 +4548,7 @@
+ 		exit(0);
+ 	    }
+ EOF
+-if { (eval echo configure:4521: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:4549: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   tcl_ok=1
+ else
+@@ -4549,7 +4580,7 @@
+ 
+ 
+     echo $ac_n "checking how to build libraries""... $ac_c" 1>&6
+-echo "configure:4553: checking how to build libraries" >&5
++echo "configure:4581: checking how to build libraries" >&5
+     # Check whether --enable-shared or --disable-shared was given.
+ if test "${enable_shared+set}" = set; then
+   enableval="$enable_shared"
+@@ -4588,7 +4619,7 @@
+ 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 +4642,17 @@
+ 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
new file mode 100644
index 00000000000..2cfe85253f8
--- /dev/null
+++ b/x11/tk83/patches/patch-ac
@@ -0,0 +1,88 @@
+$NetBSD: patch-ac,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
+
+--- tcl.m4.orig	Sat Oct 20 02:24:40 2001
++++ tcl.m4
+@@ -602,6 +602,7 @@
+ 
+     do64bit_ok=no
+     fullSrcDir=`cd $srcdir; pwd`
++    RPATH_FLAG=""
+     EXTRA_CFLAGS=""
+     TCL_EXPORT_FILE_SUFFIX=""
+     UNSHARED_LIB_SUFFIX=""
+@@ -915,7 +916,6 @@
+ 	    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 +927,19 @@
+ #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=""
+@@ -1130,6 +1138,9 @@
+ 	    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 +1185,9 @@
+ 	    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"
+@@ -1652,7 +1666,11 @@
+ 	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)
+-		XLIBSW="-L$i -lX11"
++		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 +1679,11 @@
+ 	if test "$x_libraries" = ""; then
+ 	    XLIBSW=-lX11
+ 	else
+-	    XLIBSW="-L$x_libraries -lX11"
++	    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
new file mode 100644
index 00000000000..e32c838d8a4
--- /dev/null
+++ b/x11/tk83/patches/patch-ad
@@ -0,0 +1,44 @@
+$NetBSD: patch-ad,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
+
+--- configure.in.orig	Sat Oct 20 02:24:40 2001
++++ configure.in
+@@ -220,6 +220,10 @@
+ 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 @@
+ 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 @@
+ 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