From e44b8b8044d5ff37f8135fd72871670e73f22ba7 Mon Sep 17 00:00:00 2001
From: minskim <minskim>
Date: Mon, 8 Mar 2004 19:55:35 +0000
Subject: Update tcl to 8.4.5.  Too many changes since 8.3.4.  Please see
 ChangeLog in the distfile.

---
 lang/tcl/Makefile         |  21 ++-
 lang/tcl/PLIST            | 344 ++++++++++++++++++++++++++++++----------------
 lang/tcl/buildlink2.mk    |  12 +-
 lang/tcl/buildlink3.mk    |   8 +-
 lang/tcl/distinfo         |  16 +--
 lang/tcl/patches/patch-aa |  63 ++++-----
 lang/tcl/patches/patch-ab | 144 ++++++-------------
 lang/tcl/patches/patch-ac |  16 +--
 lang/tcl/patches/patch-ae |  57 +++-----
 lang/tcl/patches/patch-af |  69 ++++++----
 10 files changed, 392 insertions(+), 358 deletions(-)

(limited to 'lang')

diff --git a/lang/tcl/Makefile b/lang/tcl/Makefile
index 30495421db6..f7d148d1208 100644
--- a/lang/tcl/Makefile
+++ b/lang/tcl/Makefile
@@ -1,23 +1,20 @@
-# $NetBSD: Makefile,v 1.25 2004/02/09 23:19:27 minskim Exp $
+# $NetBSD: Makefile,v 1.26 2004/03/08 19:55:35 minskim Exp $
 #
 
-DISTNAME=		tcl8.3.4
-PKGNAME=		tcl-8.3.4
+DISTNAME=		tcl8.4.5-src
+PKGNAME=		tcl-8.4.5
 CATEGORIES=		lang
-MASTER_SITES=		ftp://ftp.scriptics.com/pub/tcl/tcl8_3/ \
-			ftp://gd.tuwien.ac.at/languages/tcl/scriptics/tcl8_3/ \
-			ftp://ftp.funet.fi/pub/languages/tcl/tcl/tcl8_3/ \
-			ftp://ftp.mpi-sb.mpg.de/pub/tcl/mirror/ftp.scriptics.com/tcl8_3/
+MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=tcl/}
 
 MAINTAINER=		jwise@NetBSD.org
-HOMEPAGE=		http://www.tcltk.com/
+HOMEPAGE=		http://www.tcl.tk/
 COMMENT=		Ousterhout's Tool Command Language, a scripting language
 
 CONFLICTS+=		tclman80-[0-9]*
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-WRKSRC=			${WRKDIR}/${DISTNAME}/unix
+WRKSRC=			${WRKDIR}/${DISTNAME:C/-src//}/unix
 GNU_CONFIGURE=		yes
 MAKE_ENV+=		TOUCH="${TOUCH}"
 TEST_TARGET=		test
@@ -62,7 +59,7 @@ post-patch:
 	${MV} -f mkLinks mkLinks.tmp;					\
 	${GREP} -v "^exit 0" mkLinks.tmp > mkLinks;			\
 	${CAT} mkLinks.tmp						\
-		| ${AWK} '/^  *ln / { print $$2 }'			\
+		| ${AWK} '/^  *ln / { print $$3 }'			\
 		| ${SORT} -u						\
 		| ${GREP} -v ".*\.n"					\
 		| ${SED} -e "s,^,${RM} -f ,"				\
@@ -72,7 +69,7 @@ post-patch:
 
 pre-install:
 	cd ${WRKSRC}; for file in					\
-		tclUnixInit.o libtcl83.so tclsh;			\
+		tclUnixInit.o libtcl84.so tclsh;			\
 	do								\
 		${TOUCH} $${file};					\
 	done
@@ -80,7 +77,7 @@ pre-install:
 post-install:
 	cd ${WRKDIR} && ${PAX} -rwpm man ${PREFIX}
 	${RM} -rf ${WRKDIR}/man
-	cd ${PREFIX}/bin && ${LN} -s tclsh8.3 tclsh
+	cd ${PREFIX}/bin && ${LN} -s tclsh8.4 tclsh
 	${INSTALL_DATA_DIR} ${PREFIX}/include/tcl
 	${INSTALL_DATA_DIR} ${PREFIX}/include/tcl/unix
 	${INSTALL_DATA_DIR} ${PREFIX}/include/tcl/generic
diff --git a/lang/tcl/PLIST b/lang/tcl/PLIST
index b10b01c9636..e897fb82ce6 100644
--- a/lang/tcl/PLIST
+++ b/lang/tcl/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.3 2003/10/08 03:13:21 jschauma Exp $
+@comment $NetBSD: PLIST,v 1.4 2004/03/08 19:55:35 minskim Exp $
 bin/tclsh
-bin/tclsh8.3
+bin/tclsh8.4
 include/tcl.h
 include/tcl/generic/tcl.h
 include/tcl/generic/tclCompile.h
@@ -17,110 +17,111 @@ include/tcl/generic/tclRegexp.h
 include/tcl/unix/tclUnixPort.h
 include/tclDecls.h
 include/tclPlatDecls.h
-${SHLIB_CMT}lib/libtcl83.a
-lib/libtcl83.${SHLIB_SUFX}
-lib/libtcl83.so
-lib/libtcl83.so.1
-lib/libtcl83.so.1.0
-lib/libtclstub83.a
-lib/tcl8.3/auto.tcl
-lib/tcl8.3/encoding/ascii.enc
-lib/tcl8.3/encoding/big5.enc
-lib/tcl8.3/encoding/cp1250.enc
-lib/tcl8.3/encoding/cp1251.enc
-lib/tcl8.3/encoding/cp1252.enc
-lib/tcl8.3/encoding/cp1253.enc
-lib/tcl8.3/encoding/cp1254.enc
-lib/tcl8.3/encoding/cp1255.enc
-lib/tcl8.3/encoding/cp1256.enc
-lib/tcl8.3/encoding/cp1257.enc
-lib/tcl8.3/encoding/cp1258.enc
-lib/tcl8.3/encoding/cp437.enc
-lib/tcl8.3/encoding/cp737.enc
-lib/tcl8.3/encoding/cp775.enc
-lib/tcl8.3/encoding/cp850.enc
-lib/tcl8.3/encoding/cp852.enc
-lib/tcl8.3/encoding/cp855.enc
-lib/tcl8.3/encoding/cp857.enc
-lib/tcl8.3/encoding/cp860.enc
-lib/tcl8.3/encoding/cp861.enc
-lib/tcl8.3/encoding/cp862.enc
-lib/tcl8.3/encoding/cp863.enc
-lib/tcl8.3/encoding/cp864.enc
-lib/tcl8.3/encoding/cp865.enc
-lib/tcl8.3/encoding/cp866.enc
-lib/tcl8.3/encoding/cp869.enc
-lib/tcl8.3/encoding/cp874.enc
-lib/tcl8.3/encoding/cp932.enc
-lib/tcl8.3/encoding/cp936.enc
-lib/tcl8.3/encoding/cp949.enc
-lib/tcl8.3/encoding/cp950.enc
-lib/tcl8.3/encoding/dingbats.enc
-lib/tcl8.3/encoding/ebcdic.enc
-lib/tcl8.3/encoding/euc-cn.enc
-lib/tcl8.3/encoding/euc-jp.enc
-lib/tcl8.3/encoding/euc-kr.enc
-lib/tcl8.3/encoding/gb12345.enc
-lib/tcl8.3/encoding/gb1988.enc
-lib/tcl8.3/encoding/gb2312.enc
-lib/tcl8.3/encoding/iso2022-jp.enc
-lib/tcl8.3/encoding/iso2022-kr.enc
-lib/tcl8.3/encoding/iso2022.enc
-lib/tcl8.3/encoding/iso8859-1.enc
-lib/tcl8.3/encoding/iso8859-10.enc
-lib/tcl8.3/encoding/iso8859-13.enc
-lib/tcl8.3/encoding/iso8859-14.enc
-lib/tcl8.3/encoding/iso8859-15.enc
-lib/tcl8.3/encoding/iso8859-16.enc
-lib/tcl8.3/encoding/iso8859-2.enc
-lib/tcl8.3/encoding/iso8859-3.enc
-lib/tcl8.3/encoding/iso8859-4.enc
-lib/tcl8.3/encoding/iso8859-5.enc
-lib/tcl8.3/encoding/iso8859-6.enc
-lib/tcl8.3/encoding/iso8859-7.enc
-lib/tcl8.3/encoding/iso8859-8.enc
-lib/tcl8.3/encoding/iso8859-9.enc
-lib/tcl8.3/encoding/jis0201.enc
-lib/tcl8.3/encoding/jis0208.enc
-lib/tcl8.3/encoding/jis0212.enc
-lib/tcl8.3/encoding/koi8-r.enc
-lib/tcl8.3/encoding/koi8-u.enc
-lib/tcl8.3/encoding/ksc5601.enc
-lib/tcl8.3/encoding/macCentEuro.enc
-lib/tcl8.3/encoding/macCroatian.enc
-lib/tcl8.3/encoding/macCyrillic.enc
-lib/tcl8.3/encoding/macDingbats.enc
-lib/tcl8.3/encoding/macGreek.enc
-lib/tcl8.3/encoding/macIceland.enc
-lib/tcl8.3/encoding/macJapan.enc
-lib/tcl8.3/encoding/macRoman.enc
-lib/tcl8.3/encoding/macRomania.enc
-lib/tcl8.3/encoding/macThai.enc
-lib/tcl8.3/encoding/macTurkish.enc
-lib/tcl8.3/encoding/macUkraine.enc
-lib/tcl8.3/encoding/shiftjis.enc
-lib/tcl8.3/encoding/symbol.enc
-lib/tcl8.3/encoding/tis-620.enc
-lib/tcl8.3/history.tcl
-lib/tcl8.3/http1.0/http.tcl
-lib/tcl8.3/http1.0/pkgIndex.tcl
-lib/tcl8.3/http2.4/http.tcl
-lib/tcl8.3/http2.4/pkgIndex.tcl
-lib/tcl8.3/init.tcl
-lib/tcl8.3/ldAix
-lib/tcl8.3/ldAout.tcl
-lib/tcl8.3/msgcat1.1/msgcat.tcl
-lib/tcl8.3/msgcat1.1/pkgIndex.tcl
-lib/tcl8.3/opt0.4/optparse.tcl
-lib/tcl8.3/opt0.4/pkgIndex.tcl
-lib/tcl8.3/package.tcl
-lib/tcl8.3/parray.tcl
-lib/tcl8.3/safe.tcl
-lib/tcl8.3/tclAppInit.c
-lib/tcl8.3/tclIndex
-lib/tcl8.3/tcltest1.0/pkgIndex.tcl
-lib/tcl8.3/tcltest1.0/tcltest.tcl
-lib/tcl8.3/word.tcl
+${SHLIB_CMT}lib/libtcl84.a
+lib/libtcl84.${SHLIB_SUFX}
+lib/libtcl84.so
+lib/libtcl84.so.1
+lib/libtcl84.so.1.0
+lib/libtclstub84.a
+lib/tcl8.4/auto.tcl
+lib/tcl8.4/encoding/ascii.enc
+lib/tcl8.4/encoding/big5.enc
+lib/tcl8.4/encoding/cp1250.enc
+lib/tcl8.4/encoding/cp1251.enc
+lib/tcl8.4/encoding/cp1252.enc
+lib/tcl8.4/encoding/cp1253.enc
+lib/tcl8.4/encoding/cp1254.enc
+lib/tcl8.4/encoding/cp1255.enc
+lib/tcl8.4/encoding/cp1256.enc
+lib/tcl8.4/encoding/cp1257.enc
+lib/tcl8.4/encoding/cp1258.enc
+lib/tcl8.4/encoding/cp437.enc
+lib/tcl8.4/encoding/cp737.enc
+lib/tcl8.4/encoding/cp775.enc
+lib/tcl8.4/encoding/cp850.enc
+lib/tcl8.4/encoding/cp852.enc
+lib/tcl8.4/encoding/cp855.enc
+lib/tcl8.4/encoding/cp857.enc
+lib/tcl8.4/encoding/cp860.enc
+lib/tcl8.4/encoding/cp861.enc
+lib/tcl8.4/encoding/cp862.enc
+lib/tcl8.4/encoding/cp863.enc
+lib/tcl8.4/encoding/cp864.enc
+lib/tcl8.4/encoding/cp865.enc
+lib/tcl8.4/encoding/cp866.enc
+lib/tcl8.4/encoding/cp869.enc
+lib/tcl8.4/encoding/cp874.enc
+lib/tcl8.4/encoding/cp932.enc
+lib/tcl8.4/encoding/cp936.enc
+lib/tcl8.4/encoding/cp949.enc
+lib/tcl8.4/encoding/cp950.enc
+lib/tcl8.4/encoding/dingbats.enc
+lib/tcl8.4/encoding/ebcdic.enc
+lib/tcl8.4/encoding/euc-cn.enc
+lib/tcl8.4/encoding/euc-jp.enc
+lib/tcl8.4/encoding/euc-kr.enc
+lib/tcl8.4/encoding/gb12345.enc
+lib/tcl8.4/encoding/gb1988.enc
+lib/tcl8.4/encoding/gb2312-raw.enc
+lib/tcl8.4/encoding/gb2312.enc
+lib/tcl8.4/encoding/iso2022-jp.enc
+lib/tcl8.4/encoding/iso2022-kr.enc
+lib/tcl8.4/encoding/iso2022.enc
+lib/tcl8.4/encoding/iso8859-1.enc
+lib/tcl8.4/encoding/iso8859-10.enc
+lib/tcl8.4/encoding/iso8859-13.enc
+lib/tcl8.4/encoding/iso8859-14.enc
+lib/tcl8.4/encoding/iso8859-15.enc
+lib/tcl8.4/encoding/iso8859-16.enc
+lib/tcl8.4/encoding/iso8859-2.enc
+lib/tcl8.4/encoding/iso8859-3.enc
+lib/tcl8.4/encoding/iso8859-4.enc
+lib/tcl8.4/encoding/iso8859-5.enc
+lib/tcl8.4/encoding/iso8859-6.enc
+lib/tcl8.4/encoding/iso8859-7.enc
+lib/tcl8.4/encoding/iso8859-8.enc
+lib/tcl8.4/encoding/iso8859-9.enc
+lib/tcl8.4/encoding/jis0201.enc
+lib/tcl8.4/encoding/jis0208.enc
+lib/tcl8.4/encoding/jis0212.enc
+lib/tcl8.4/encoding/koi8-r.enc
+lib/tcl8.4/encoding/koi8-u.enc
+lib/tcl8.4/encoding/ksc5601.enc
+lib/tcl8.4/encoding/macCentEuro.enc
+lib/tcl8.4/encoding/macCroatian.enc
+lib/tcl8.4/encoding/macCyrillic.enc
+lib/tcl8.4/encoding/macDingbats.enc
+lib/tcl8.4/encoding/macGreek.enc
+lib/tcl8.4/encoding/macIceland.enc
+lib/tcl8.4/encoding/macJapan.enc
+lib/tcl8.4/encoding/macRoman.enc
+lib/tcl8.4/encoding/macRomania.enc
+lib/tcl8.4/encoding/macThai.enc
+lib/tcl8.4/encoding/macTurkish.enc
+lib/tcl8.4/encoding/macUkraine.enc
+lib/tcl8.4/encoding/shiftjis.enc
+lib/tcl8.4/encoding/symbol.enc
+lib/tcl8.4/encoding/tis-620.enc
+lib/tcl8.4/history.tcl
+lib/tcl8.4/http1.0/http.tcl
+lib/tcl8.4/http1.0/pkgIndex.tcl
+lib/tcl8.4/http2.4/http.tcl
+lib/tcl8.4/http2.4/pkgIndex.tcl
+lib/tcl8.4/init.tcl
+lib/tcl8.4/ldAix
+lib/tcl8.4/ldAout.tcl
+lib/tcl8.4/msgcat1.3/msgcat.tcl
+lib/tcl8.4/msgcat1.3/pkgIndex.tcl
+lib/tcl8.4/opt0.4/optparse.tcl
+lib/tcl8.4/opt0.4/pkgIndex.tcl
+lib/tcl8.4/package.tcl
+lib/tcl8.4/parray.tcl
+lib/tcl8.4/safe.tcl
+lib/tcl8.4/tclAppInit.c
+lib/tcl8.4/tclIndex
+lib/tcl8.4/tcltest2.2/pkgIndex.tcl
+lib/tcl8.4/tcltest2.2/tcltest.tcl
+lib/tcl8.4/word.tcl
 lib/tclConfig.sh
 man/man1/tclsh.1
 man/man3/TCL_MEM_DEBUG.3
@@ -129,6 +130,7 @@ man/man3/Tcl_AddErrorInfo.3
 man/man3/Tcl_AddObjErrorInfo.3
 man/man3/Tcl_AlertNotifier.3
 man/man3/Tcl_Alloc.3
+man/man3/Tcl_AllocStatBuf.3
 man/man3/Tcl_AllowExceptions.3
 man/man3/Tcl_AppInit.3
 man/man3/Tcl_AppendAllObjTypes.3
@@ -145,12 +147,16 @@ man/man3/Tcl_AsyncDelete.3
 man/man3/Tcl_AsyncInvoke.3
 man/man3/Tcl_AsyncMark.3
 man/man3/Tcl_AsyncReady.3
+man/man3/Tcl_AttemptAlloc.3
+man/man3/Tcl_AttemptRealloc.3
+man/man3/Tcl_AttemptSetObjLength.3
 man/man3/Tcl_BackgroundError.3
 man/man3/Tcl_Backslash.3
 man/man3/Tcl_BadChannelOption.3
 man/man3/Tcl_CallWhenDeleted.3
 man/man3/Tcl_CancelIdleCall.3
 man/man3/Tcl_ChannelBlockModeProc.3
+man/man3/Tcl_ChannelBuffered.3
 man/man3/Tcl_ChannelClose2Proc.3
 man/man3/Tcl_ChannelCloseProc.3
 man/man3/Tcl_ChannelFlushProc.3
@@ -164,9 +170,12 @@ man/man3/Tcl_ChannelSeekProc.3
 man/man3/Tcl_ChannelSetOptionProc.3
 man/man3/Tcl_ChannelVersion.3
 man/man3/Tcl_ChannelWatchProc.3
+man/man3/Tcl_ChannelWideSeekProc.3
 man/man3/Tcl_Chdir.3
+man/man3/Tcl_ClearChannelHandlers.3
 man/man3/Tcl_Close.3
 man/man3/Tcl_CommandComplete.3
+man/man3/Tcl_CommandTraceInfo.3
 man/man3/Tcl_Concat.3
 man/man3/Tcl_ConcatObj.3
 man/man3/Tcl_ConditionFinalize.3
@@ -189,11 +198,13 @@ man/man3/Tcl_CreateHashEntry.3
 man/man3/Tcl_CreateInterp.3
 man/man3/Tcl_CreateMathFunc.3
 man/man3/Tcl_CreateObjCommand.3
+man/man3/Tcl_CreateObjTrace.3
 man/man3/Tcl_CreateSlave.3
 man/man3/Tcl_CreateThread.3
 man/man3/Tcl_CreateThreadExitHandler.3
 man/man3/Tcl_CreateTimerHandler.3
 man/man3/Tcl_CreateTrace.3
+man/man3/Tcl_CutChannel.3
 man/man3/Tcl_DStringAppend.3
 man/man3/Tcl_DStringAppendElement.3
 man/man3/Tcl_DStringEndSublist.3
@@ -204,6 +215,7 @@ man/man3/Tcl_DStringLength.3
 man/man3/Tcl_DStringResult.3
 man/man3/Tcl_DStringSetLength.3
 man/man3/Tcl_DStringStartSublist.3
+man/man3/Tcl_DStringTrunc.3
 man/man3/Tcl_DStringValue.3
 man/man3/Tcl_DecrRefCount.3
 man/man3/Tcl_DeleteAssocData.3
@@ -221,6 +233,7 @@ man/man3/Tcl_DeleteInterp.3
 man/man3/Tcl_DeleteThreadExitHandler.3
 man/man3/Tcl_DeleteTimerHandler.3
 man/man3/Tcl_DeleteTrace.3
+man/man3/Tcl_DetachChannel.3
 man/man3/Tcl_DetachPids.3
 man/man3/Tcl_DiscardResult.3
 man/man3/Tcl_DoOneEvent.3
@@ -237,6 +250,7 @@ man/man3/Tcl_EvalFile.3
 man/man3/Tcl_EvalObjEx.3
 man/man3/Tcl_EvalObjv.3
 man/man3/Tcl_EvalTokens.3
+man/man3/Tcl_EvalTokensStandard.3
 man/man3/Tcl_EventuallyFree.3
 man/man3/Tcl_Exit.3
 man/man3/Tcl_ExitThread.3
@@ -251,6 +265,46 @@ man/man3/Tcl_ExprObj.3
 man/man3/Tcl_ExprString.3
 man/man3/Tcl_ExternalToUtf.3
 man/man3/Tcl_ExternalToUtfDString.3
+man/man3/Tcl_FSAccess.3
+man/man3/Tcl_FSChdir.3
+man/man3/Tcl_FSConvertToPathType.3
+man/man3/Tcl_FSCopyDirectory.3
+man/man3/Tcl_FSCopyFile.3
+man/man3/Tcl_FSCreateDirectory.3
+man/man3/Tcl_FSData.3
+man/man3/Tcl_FSDeleteFile.3
+man/man3/Tcl_FSEqualPaths.3
+man/man3/Tcl_FSEvalFile.3
+man/man3/Tcl_FSFileAttrStrings.3
+man/man3/Tcl_FSFileAttrsGet.3
+man/man3/Tcl_FSFileAttrsSet.3
+man/man3/Tcl_FSFileSystemInfo.3
+man/man3/Tcl_FSGetCwd.3
+man/man3/Tcl_FSGetFileSystemForPath.3
+man/man3/Tcl_FSGetInternalRep.3
+man/man3/Tcl_FSGetNativePath.3
+man/man3/Tcl_FSGetNormalizedPath.3
+man/man3/Tcl_FSGetPathType.3
+man/man3/Tcl_FSGetTranslatedPath.3
+man/man3/Tcl_FSGetTranslatedStringPath.3
+man/man3/Tcl_FSJoinPath.3
+man/man3/Tcl_FSJoinToPath.3
+man/man3/Tcl_FSLink.3
+man/man3/Tcl_FSListVolumes.3
+man/man3/Tcl_FSLoadFile.3
+man/man3/Tcl_FSLstat.3
+man/man3/Tcl_FSMatchInDirectory.3
+man/man3/Tcl_FSMountsChanged.3
+man/man3/Tcl_FSNewNativePath.3
+man/man3/Tcl_FSOpenFileChannel.3
+man/man3/Tcl_FSPathSeparator.3
+man/man3/Tcl_FSRegister.3
+man/man3/Tcl_FSRemoveDirectory.3
+man/man3/Tcl_FSRenameFile.3
+man/man3/Tcl_FSSplitPath.3
+man/man3/Tcl_FSStat.3
+man/man3/Tcl_FSUnregister.3
+man/man3/Tcl_FSUtime.3
 man/man3/Tcl_Finalize.3
 man/man3/Tcl_FinalizeNotifier.3
 man/man3/Tcl_FinalizeThread.3
@@ -277,9 +331,13 @@ man/man3/Tcl_GetChannelName.3
 man/man3/Tcl_GetChannelNames.3
 man/man3/Tcl_GetChannelNamesEx.3
 man/man3/Tcl_GetChannelOption.3
+man/man3/Tcl_GetChannelThread.3
 man/man3/Tcl_GetChannelType.3
 man/man3/Tcl_GetCharLength.3
+man/man3/Tcl_GetCommandFromObj.3
+man/man3/Tcl_GetCommandFullName.3
 man/man3/Tcl_GetCommandInfo.3
+man/man3/Tcl_GetCommandInfoFromToken.3
 man/man3/Tcl_GetCommandName.3
 man/man3/Tcl_GetCurrentThread.3
 man/man3/Tcl_GetCwd.3
@@ -300,7 +358,9 @@ man/man3/Tcl_GetIntFromObj.3
 man/man3/Tcl_GetInterpPath.3
 man/man3/Tcl_GetLongFromObj.3
 man/man3/Tcl_GetMaster.3
+man/man3/Tcl_GetMathFuncInfo.3
 man/man3/Tcl_GetNameOfExecutable.3
+man/man3/Tcl_GetOSTypeFromObj.3
 man/man3/Tcl_GetObjResult.3
 man/man3/Tcl_GetObjType.3
 man/man3/Tcl_GetOpenFile.3
@@ -315,12 +375,16 @@ man/man3/Tcl_GetString.3
 man/man3/Tcl_GetStringFromObj.3
 man/man3/Tcl_GetStringResult.3
 man/man3/Tcl_GetThreadData.3
+man/man3/Tcl_GetTime.3
+man/man3/Tcl_GetTopChannel.3
 man/man3/Tcl_GetUniChar.3
 man/man3/Tcl_GetUnicode.3
+man/man3/Tcl_GetUnicodeFromObj.3
 man/man3/Tcl_GetVar.3
 man/man3/Tcl_GetVar2.3
 man/man3/Tcl_GetVar2Ex.3
 man/man3/Tcl_GetVersion.3
+man/man3/Tcl_GetWideIntFromObj.3
 man/man3/Tcl_Gets.3
 man/man3/Tcl_GetsObj.3
 man/man3/Tcl_GlobalEval.3
@@ -329,19 +393,27 @@ man/man3/Tcl_HashStats.3
 man/man3/Tcl_HideCommand.3
 man/man3/Tcl_IncrRefCount.3
 man/man3/Tcl_Init.3
+man/man3/Tcl_InitCustomHashTable.3
 man/man3/Tcl_InitHashTable.3
 man/man3/Tcl_InitMemory.3
 man/man3/Tcl_InitNotifier.3
+man/man3/Tcl_InitObjHashTable.3
 man/man3/Tcl_InitStubs.3
 man/man3/Tcl_InputBlocked.3
 man/man3/Tcl_InputBuffered.3
 man/man3/Tcl_Interp.3
 man/man3/Tcl_InterpDeleted.3
 man/man3/Tcl_InvalidateStringRep.3
+man/man3/Tcl_IsChannelExisting.3
+man/man3/Tcl_IsChannelRegistered.3
+man/man3/Tcl_IsChannelShared.3
 man/man3/Tcl_IsSafe.3
 man/man3/Tcl_IsShared.3
+man/man3/Tcl_IsStandardChannel.3
 man/man3/Tcl_JoinPath.3
+man/man3/Tcl_JoinThread.3
 man/man3/Tcl_LinkVar.3
+man/man3/Tcl_ListMathFuncs.3
 man/man3/Tcl_ListObjAppendElement.3
 man/man3/Tcl_ListObjAppendList.3
 man/man3/Tcl_ListObjGetElements.3
@@ -349,6 +421,10 @@ man/man3/Tcl_ListObjIndex.3
 man/man3/Tcl_ListObjLength.3
 man/man3/Tcl_ListObjReplace.3
 man/man3/Tcl_LogCommandInfo.3
+man/man3/Tcl_MacConvertTextResource.3
+man/man3/Tcl_MacEvalResource.3
+man/man3/Tcl_MacFindResource.3
+man/man3/Tcl_MacSetEventProc.3
 man/man3/Tcl_MakeFileChannel.3
 man/man3/Tcl_MakeSafe.3
 man/man3/Tcl_MakeTcpClientChannel.3
@@ -362,9 +438,11 @@ man/man3/Tcl_NewDoubleObj.3
 man/man3/Tcl_NewIntObj.3
 man/man3/Tcl_NewListObj.3
 man/man3/Tcl_NewLongObj.3
+man/man3/Tcl_NewOSTypeObj.3
 man/man3/Tcl_NewObj.3
 man/man3/Tcl_NewStringObj.3
 man/man3/Tcl_NewUnicodeObj.3
+man/man3/Tcl_NewWideIntObj.3
 man/man3/Tcl_NextHashEntry.3
 man/man3/Tcl_NotifyChannel.3
 man/man3/Tcl_NumUtfChars.3
@@ -374,6 +452,9 @@ man/man3/Tcl_OpenCommandChannel.3
 man/man3/Tcl_OpenFileChannel.3
 man/man3/Tcl_OpenTcpClient.3
 man/man3/Tcl_OpenTcpServer.3
+man/man3/Tcl_OutputBuffered.3
+man/man3/Tcl_Panic.3
+man/man3/Tcl_PanicVA.3
 man/man3/Tcl_ParseBraces.3
 man/man3/Tcl_ParseCommand.3
 man/man3/Tcl_ParseExpr.3
@@ -389,9 +470,11 @@ man/man3/Tcl_PkgRequireEx.3
 man/man3/Tcl_PosixError.3
 man/man3/Tcl_Preserve.3
 man/man3/Tcl_PrintDouble.3
+man/man3/Tcl_PutEnv.3
 man/man3/Tcl_QueueEvent.3
 man/man3/Tcl_Read.3
 man/man3/Tcl_ReadChars.3
+man/man3/Tcl_ReadRaw.3
 man/man3/Tcl_Realloc.3
 man/man3/Tcl_ReapDetachedProcs.3
 man/man3/Tcl_RecordAndEval.3
@@ -421,6 +504,7 @@ man/man3/Tcl_SetByteArrayObj.3
 man/man3/Tcl_SetChannelBufferSize.3
 man/man3/Tcl_SetChannelOption.3
 man/man3/Tcl_SetCommandInfo.3
+man/man3/Tcl_SetCommandInfoFromToken.3
 man/man3/Tcl_SetDefaultEncodingDir.3
 man/man3/Tcl_SetDoubleObj.3
 man/man3/Tcl_SetErrno.3
@@ -432,9 +516,11 @@ man/man3/Tcl_SetListObj.3
 man/man3/Tcl_SetLongObj.3
 man/man3/Tcl_SetMainLoop.3
 man/man3/Tcl_SetMaxBlockTime.3
+man/man3/Tcl_SetOSTypeObj.3
 man/man3/Tcl_SetObjErrorCode.3
 man/man3/Tcl_SetObjLength.3
 man/man3/Tcl_SetObjResult.3
+man/man3/Tcl_SetPanicProc.3
 man/man3/Tcl_SetRecursionLimit.3
 man/man3/Tcl_SetResult.3
 man/man3/Tcl_SetServiceMode.3
@@ -446,25 +532,45 @@ man/man3/Tcl_SetUnicodeObj.3
 man/man3/Tcl_SetVar.3
 man/man3/Tcl_SetVar2.3
 man/man3/Tcl_SetVar2Ex.3
+man/man3/Tcl_SetWideIntObj.3
+man/man3/Tcl_SignalId.3
+man/man3/Tcl_SignalMsg.3
 man/man3/Tcl_Sleep.3
 man/man3/Tcl_SourceRCFile.3
+man/man3/Tcl_SpliceChannel.3
 man/man3/Tcl_SplitList.3
 man/man3/Tcl_SplitPath.3
 man/man3/Tcl_StackChannel.3
+man/man3/Tcl_StandardChannels.3
 man/man3/Tcl_Stat.3
 man/man3/Tcl_StaticPackage.3
 man/man3/Tcl_StringCaseMatch.3
 man/man3/Tcl_StringMatch.3
+man/man3/Tcl_SubstObj.3
 man/man3/Tcl_Tell.3
 man/man3/Tcl_ThreadAlert.3
 man/man3/Tcl_ThreadQueueEvent.3
+man/man3/Tcl_TraceCommand.3
 man/man3/Tcl_TraceVar.3
 man/man3/Tcl_TraceVar2.3
 man/man3/Tcl_TranslateFileName.3
 man/man3/Tcl_Ungets.3
 man/man3/Tcl_UniChar.3
 man/man3/Tcl_UniCharAtIndex.3
+man/man3/Tcl_UniCharCaseMatch.3
+man/man3/Tcl_UniCharIsAlnum.3
+man/man3/Tcl_UniCharIsAlpha.3
+man/man3/Tcl_UniCharIsControl.3
+man/man3/Tcl_UniCharIsDigit.3
+man/man3/Tcl_UniCharIsGraph.3
+man/man3/Tcl_UniCharIsLower.3
+man/man3/Tcl_UniCharIsPrint.3
+man/man3/Tcl_UniCharIsPunct.3
+man/man3/Tcl_UniCharIsSpace.3
+man/man3/Tcl_UniCharIsUpper.3
+man/man3/Tcl_UniCharIsWordChar.3
 man/man3/Tcl_UniCharLen.3
+man/man3/Tcl_UniCharNcasecmp.3
 man/man3/Tcl_UniCharNcmp.3
 man/man3/Tcl_UniCharToLower.3
 man/man3/Tcl_UniCharToTitle.3
@@ -476,6 +582,7 @@ man/man3/Tcl_UnregisterChannel.3
 man/man3/Tcl_UnsetVar.3
 man/man3/Tcl_UnsetVar2.3
 man/man3/Tcl_UnstackChannel.3
+man/man3/Tcl_UntraceCommand.3
 man/man3/Tcl_UntraceVar.3
 man/man3/Tcl_UntraceVar2.3
 man/man3/Tcl_UpVar.3
@@ -507,11 +614,17 @@ man/man3/Tcl_WinUtfToTChar.3
 man/man3/Tcl_Write.3
 man/man3/Tcl_WriteChars.3
 man/man3/Tcl_WriteObj.3
+man/man3/Tcl_WriteRaw.3
 man/man3/Tcl_WrongNumArgs.3
-man/mann/Http.n
+man/man3/attemptckalloc.3
+man/man3/attemptckrealloc.3
+man/man3/ckalloc.3
+man/man3/ckfree.3
+man/man3/ckrealloc.3
+man/man3/panic.3
+man/man3/panicVA.3
 man/mann/SafeBase.n
 man/mann/Tcl.n
-man/mann/Tcltest.n
 man/mann/after.n
 man/mann/append.n
 man/mann/array.n
@@ -570,6 +683,7 @@ man/mann/load.n
 man/mann/lrange.n
 man/mann/lreplace.n
 man/mann/lsearch.n
+man/mann/lset.n
 man/mann/lsort.n
 man/mann/memory.n
 man/mann/msgcat.n
@@ -622,13 +736,13 @@ man/mann/upvar.n
 man/mann/variable.n
 man/mann/vwait.n
 man/mann/while.n
-@dirrm lib/tcl8.3/tcltest1.0
-@dirrm lib/tcl8.3/opt0.4
-@dirrm lib/tcl8.3/msgcat1.1
-@dirrm lib/tcl8.3/http2.4
-@dirrm lib/tcl8.3/http1.0
-@dirrm lib/tcl8.3/encoding
-@dirrm lib/tcl8.3
+@dirrm lib/tcl8.4/tcltest2.2
+@dirrm lib/tcl8.4/opt0.4
+@dirrm lib/tcl8.4/msgcat1.3
+@dirrm lib/tcl8.4/http2.4
+@dirrm lib/tcl8.4/http1.0
+@dirrm lib/tcl8.4/encoding
+@dirrm lib/tcl8.4
 @dirrm include/tcl/unix
 @dirrm include/tcl/generic
 @dirrm include/tcl
diff --git a/lang/tcl/buildlink2.mk b/lang/tcl/buildlink2.mk
index 69f5f732f0c..6b3ce9a6173 100644
--- a/lang/tcl/buildlink2.mk
+++ b/lang/tcl/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.5 2003/07/09 14:04:06 agc Exp $
+# $NetBSD: buildlink2.mk,v 1.6 2004/03/08 19:55:35 minskim Exp $
 
 .if !defined(TCL_BUILDLINK2_MK)
 TCL_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		tcl
-BUILDLINK_DEPENDS.tcl?=		tcl>=8.3.4
+BUILDLINK_DEPENDS.tcl?=		tcl>=8.4.5
 BUILDLINK_PKGSRCDIR.tcl?=	../../lang/tcl
 
 EVAL_PREFIX+=		BUILDLINK_PREFIX.tcl=tcl
@@ -14,13 +14,13 @@ BUILDLINK_FILES.tcl+=	include/tcl.h
 BUILDLINK_FILES.tcl+=	include/tclDecls.h
 BUILDLINK_FILES.tcl+=	include/tclPlatDecls.h
 BUILDLINK_FILES.tcl+=	include/tcl/*/*.h
-BUILDLINK_FILES.tcl+=	lib/libtcl83.*
-BUILDLINK_FILES.tcl+=	lib/libtclstub83.*
+BUILDLINK_FILES.tcl+=	lib/libtcl84.*
+BUILDLINK_FILES.tcl+=	lib/libtclstub84.*
 
-# Make "-ltcl" resolve into "-ltcl83", so that we don't need to patch so
+# Make "-ltcl" resolve into "-ltcl84", so that we don't need to patch so
 # many Makefiles.
 #
-BUILDLINK_TRANSFORM+=	l:tcl:tcl83
+BUILDLINK_TRANSFORM+=	l:tcl:tcl84
 
 BUILDLINK_TARGETS+=	tcl-buildlink
 
diff --git a/lang/tcl/buildlink3.mk b/lang/tcl/buildlink3.mk
index b54abac7031..341ff7cee3b 100644
--- a/lang/tcl/buildlink3.mk
+++ b/lang/tcl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/03/05 19:25:37 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2004/03/08 19:55:35 minskim Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 TCL_BUILDLINK3_MK:=	${TCL_BUILDLINK3_MK}+
@@ -11,15 +11,15 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ntcl}
 BUILDLINK_PACKAGES+=	tcl
 
 .if !empty(TCL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.tcl+=		tcl>=8.3.4
+BUILDLINK_DEPENDS.tcl+=		tcl>=8.4.5
 BUILDLINK_PKGSRCDIR.tcl?=	../../lang/tcl
 
 BUILDLINK_FILES.tcl=	bin/tclsh*
 #
-# Make "-ltcl" resolve into "-ltcl83", so that we don't need to patch so
+# Make "-ltcl" resolve into "-ltcl84", so that we don't need to patch so
 # many Makefiles.
 #
-BUILDLINK_TRANSFORM+=	l:tcl:tcl83
+BUILDLINK_TRANSFORM+=	l:tcl:tcl84
 
 TCLCONFIG_SH?=		${BUILDLINK_PREFIX.tcl}/lib/tclConfig.sh
 
diff --git a/lang/tcl/distinfo b/lang/tcl/distinfo
index 1c2fce0910e..e4405a6095a 100644
--- a/lang/tcl/distinfo
+++ b/lang/tcl/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.18 2004/02/07 05:30:19 minskim Exp $
+$NetBSD: distinfo,v 1.19 2004/03/08 19:55:35 minskim Exp $
 
-SHA1 (tcl8.3.4.tar.gz) = b179f1f51b322b7045cf152b73df4f3d01da82ec
-Size (tcl8.3.4.tar.gz) = 2654756 bytes
-SHA1 (patch-aa) = 3e9fa9427f40a4c6b1f97bcda58fefe9d5cf20ce
-SHA1 (patch-ab) = 0e5a89fdf9623f78f4165c025412428aef5146df
-SHA1 (patch-ac) = d1e1b6ed334ff424140a678ed098504cc14614e8
-SHA1 (patch-ae) = 5eee14adec88cf0cac5715fe0cfe7420b9b83774
-SHA1 (patch-af) = 6d2b97ea8ad9de7e22ed6c2c81aa91aeadad3241
+SHA1 (tcl8.4.5-src.tar.gz) = 910cda4c04805ac3c4f0accc21660dc60879c847
+Size (tcl8.4.5-src.tar.gz) = 3444510 bytes
+SHA1 (patch-aa) = 7615c4debc2ff76278b071d649695e1da9e5decd
+SHA1 (patch-ab) = 5f4845238e58612d81dbedc72f368fb26a3d6181
+SHA1 (patch-ac) = cf99d88743f7badd338393063837a997cca1c573
+SHA1 (patch-ae) = 9a6f9b47c926f851a799ece713668f0955344ce3
+SHA1 (patch-af) = 3542f1d7d3020224fc407eac377450ad82015c08
diff --git a/lang/tcl/patches/patch-aa b/lang/tcl/patches/patch-aa
index 6ea7ae8e39f..3db196b92b4 100644
--- a/lang/tcl/patches/patch-aa
+++ b/lang/tcl/patches/patch-aa
@@ -1,17 +1,17 @@
-$NetBSD: patch-aa,v 1.8 2003/10/08 03:13:21 jschauma Exp $
+$NetBSD: patch-aa,v 1.9 2004/03/08 19:55:35 minskim Exp $
 
---- Makefile.in.orig	Fri Oct 19 20:24:15 2001
-+++ Makefile.in	Tue Oct  7 21:57:52 2003
-@@ -87,7 +87,7 @@
+--- Makefile.in.orig	2003-11-21 14:17:14.000000000 -0600
++++ Makefile.in
+@@ -90,7 +90,7 @@ CFLAGS_OPTIMIZE		= @CFLAGS_OPTIMIZE@
  #CFLAGS			= $(CFLAGS_DEBUG)
  #CFLAGS			= $(CFLAGS_OPTIMIZE)
  #CFLAGS			= $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE)
--CFLAGS			= @CFLAGS@ @CFLAGS_DEFAULT@
-+CFLAGS			+= @CFLAGS@ @CFLAGS_DEFAULT@
+-CFLAGS			= @CFLAGS@ @CFLAGS_DEFAULT@ -DTCL_DBGX=$(TCL_DBGX)
++CFLAGS			+= @CFLAGS@ @CFLAGS_DEFAULT@ -DTCL_DBGX=$(TCL_DBGX)
  
  # Flags to pass to the linker
  LDFLAGS_DEBUG		= @LDFLAGS_DEBUG@
-@@ -169,8 +169,8 @@
+@@ -172,8 +172,8 @@ SHELL			= /bin/sh
  INSTALL_STRIP_PROGRAM   = -s
  INSTALL_STRIP_LIBRARY  = -S -S
  
@@ -22,7 +22,7 @@ $NetBSD: patch-aa,v 1.8 2003/10/08 03:13:21 jschauma Exp $
  INSTALL_LIBRARY		= ${INSTALL}
  INSTALL_DATA		= ${INSTALL} -m 644
  
-@@ -187,8 +187,8 @@
+@@ -190,8 +190,8 @@ TCL_EXE			= tclsh
  # configure script.  You shouldn't normally need to modify any of
  # these definitions by hand.
  
@@ -31,56 +31,43 @@ $NetBSD: patch-aa,v 1.8 2003/10/08 03:13:21 jschauma Exp $
 +STLIB_LD		= ${LIBTOOL} --mode=link @CC@ -rpath ${PREFIX}/lib
 +SHLIB_LD		= ${LIBTOOL} --mode=link @CC@ -rpath ${PREFIX}/lib
  SHLIB_CFLAGS		= @SHLIB_CFLAGS@
- 
- SHLIB_SUFFIX		= @SHLIB_SUFFIX@
-@@ -235,8 +235,9 @@
+ SHLIB_LD_FLAGS		= @SHLIB_LD_FLAGS@
+ SHLIB_LD_LIBS		= @SHLIB_LD_LIBS@
+@@ -254,8 +254,9 @@ DLTEST_DIR		= @TCL_SRC_DIR@/unix/dltest
  # Must be absolute to so the corresponding tcltest's tcl_library is absolute.
  TCL_BUILDTIME_LIBRARY	= @TCL_SRC_DIR@/library
  
 -CC			= @CC@
  #CC			= purify -best-effort @CC@ -DPURIFY
-+CC                      = ${LIBTOOL} --mode=compile @CC@
-+LD                      = ${LIBTOOL} --mode=link @CC@ ${LDFLAGS}
- 
- #----------------------------------------------------------------
- # The information below should be usable as is.  The configure
-@@ -420,6 +421,7 @@
- 	@MAKE_LIB@
- 	if test "x@DL_OBJS@" = "xtclLoadAout.o"; then \
- 		$(RANLIB) ${TCL_LIB_FILE}; \
-+		$(TOUCH) ${TCL_LIB_FILE}; \
- 	fi
++CC			= ${LIBTOOL} --mode=compile @CC@
++LD			= ${LIBTOOL} --mode=link @CC@
  
- ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
-@@ -440,11 +442,11 @@
+ # Flags to be passed to mkLinks to control whether the manpages
+ # should be compressed and linked with softlinks
+@@ -474,7 +475,7 @@ objs: ${OBJS}
  
  
  tclsh: ${TCLSH_OBJS} ${TCL_LIB_FILE}
 -	${CC} ${LDFLAGS} ${TCLSH_OBJS} @TCL_BUILD_LIB_SPEC@ ${LIBS} \
 +	${LD} ${LDFLAGS} ${TCLSH_OBJS} @TCL_BUILD_LIB_SPEC@ ${LIBS} \
- 		@TCL_LD_SEARCH_FLAGS@ -o tclsh
+ 		${CC_SEARCH_FLAGS} -o tclsh
+ 
+ # Resetting the LIB_RUNTIME_DIR below is required so that
+@@ -486,7 +487,7 @@ tcltest: ${TCLTEST_OBJS} ${TCL_LIB_FILE}
+ 	$(MAKE) tcltest-real LIB_RUNTIME_DIR=`pwd`
  
- tcltest: ${TCLTEST_OBJS} ${TCL_LIB_FILE} ${BUILD_DLTEST}
+ tcltest-real:
 -	${CC} ${LDFLAGS} ${TCLTEST_OBJS} @TCL_BUILD_LIB_SPEC@ ${LIBS} \
 +	${LD} ${LDFLAGS} ${TCLTEST_OBJS} @TCL_BUILD_LIB_SPEC@ ${LIBS} \
- 		@TCL_LD_SEARCH_FLAGS@ -o tcltest
+ 		${CC_SEARCH_FLAGS} -o tcltest
  
  # Note, in the target below TCL_LIBRARY needs to be set or else
-@@ -538,7 +540,7 @@
- 	    chmod +x $(SRC_DIR)/install-sh; \
- 	    fi
- 	@echo "Installing $(TCL_LIB_FILE) to $(LIB_INSTALL_DIR)/"
--	@$(INSTALL_LIBRARY) $(TCL_LIB_FILE) $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE)
-+	@$(INSTALL_LIBRARY) $(TCL_LIB_FILE:C/\.so.*/.la/) $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE)
- 	@if test "x@DL_OBJS@" = "xtclLoadAout.o"; then \
- 	    (cd $(LIB_INSTALL_DIR); $(RANLIB) $(TCL_LIB_FILE)); \
- 	    fi
-@@ -989,7 +991,7 @@
+@@ -1054,7 +1055,7 @@ tclMacOSXBundle.o: $(MAC_OSX_DIR)/tclMac
  
  xttest:  ${XTTEST_OBJS} ${GENERIC_OBJS} ${UNIX_OBJS} ${COMPAT_OBJS} \
  	@DL_OBJS@ ${BUILD_DLTEST}
 -	${CC} ${XTTEST_OBJS} ${GENERIC_OBJS} ${UNIX_OBJS} ${COMPAT_OBJS} \
 +	${LD} ${XTTEST_OBJS} ${GENERIC_OBJS} ${UNIX_OBJS} ${COMPAT_OBJS} \
  		@DL_OBJS@ @TCL_BUILD_LIB_SPEC@ ${LIBS} \
- 		@TCL_LD_SEARCH_FLAGS@ -L/usr/openwin/lib -lXt -o xttest
+ 		${CC_SEARCH_FLAGS} -L/usr/openwin/lib -lXt -o xttest
  
diff --git a/lang/tcl/patches/patch-ab b/lang/tcl/patches/patch-ab
index d037a05115b..6a736e11796 100644
--- a/lang/tcl/patches/patch-ab
+++ b/lang/tcl/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.21 2004/02/07 05:30:19 minskim Exp $
+$NetBSD: patch-ab,v 1.22 2004/03/08 19:55:35 minskim Exp $
 
---- configure.orig	Fri Oct 19 19:24:15 2001
+--- configure.orig	2004-02-07 21:57:29.000000000 -0600
 +++ configure
-@@ -4776,6 +4776,7 @@ fi
+@@ -5558,6 +5558,7 @@ fi
      # Step 3: set configuration options based on system name and version.
  
      do64bit_ok=no
@@ -10,8 +10,8 @@ $NetBSD: patch-ab,v 1.21 2004/02/07 05:30:19 minskim Exp $
      EXTRA_CFLAGS=""
      TCL_EXPORT_FILE_SUFFIX=""
      UNSHARED_LIB_SUFFIX=""
-@@ -5114,6 +5115,9 @@ fi
- 	    LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
+@@ -5977,6 +5978,9 @@ fi
+ 	    LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
  	    EXTRA_CFLAGS=""
  	    LDFLAGS=""
 +	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
@@ -20,7 +20,7 @@ $NetBSD: patch-ab,v 1.21 2004/02/07 05:30:19 minskim Exp $
  	    ;;
  	IRIX-6.*|IRIX64-6.5*)
  	    SHLIB_CFLAGS=""
-@@ -5138,6 +5142,9 @@ fi
+@@ -6002,6 +6006,9 @@ fi
  		esac
  		LDFLAGS="-n32"
  	    fi
@@ -30,19 +30,19 @@ $NetBSD: patch-ab,v 1.21 2004/02/07 05:30:19 minskim Exp $
  	    ;;
  	IRIX64-6.*)
  	    SHLIB_CFLAGS=""
-@@ -5148,6 +5155,9 @@ fi
- 	    DL_LIBS=""
- 	    LDFLAGS=""
- 	    LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
+@@ -6026,6 +6033,9 @@ fi
+ 	            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"
-@@ -5221,6 +5231,9 @@ fi
-                 EXTRA_CFLAGS="${EXTRA_CFLAGS} -fno-inline"
-             fi
+@@ -6107,6 +6117,9 @@ fi
+ EOF
+ 
  
 +	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
 +	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
@@ -50,7 +50,7 @@ $NetBSD: patch-ab,v 1.21 2004/02/07 05:30:19 minskim Exp $
  	    ;;
  	GNU*)
  	    SHLIB_CFLAGS="-fPIC"
-@@ -5298,6 +5311,9 @@ fi
+@@ -6188,6 +6201,9 @@ fi
  	    LD_SEARCH_FLAGS=""
  	    ;;
  	NetBSD-*|FreeBSD-[1-2].*|OpenBSD-*)
@@ -60,7 +60,7 @@ $NetBSD: patch-ab,v 1.21 2004/02/07 05:30:19 minskim Exp $
  	    # 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
-@@ -5330,17 +5346,15 @@ if eval "test \"`echo '$ac_cv_header_'$a
+@@ -6220,18 +6236,16 @@ if eval "test \"`echo '$ac_cv_header_'$a
    
  		# NetBSD/SPARC needs -fPIC, -fpic will not do.
  		SHLIB_CFLAGS="-fPIC"
@@ -70,17 +70,18 @@ $NetBSD: patch-ab,v 1.21 2004/02/07 05:30:19 minskim Exp $
  		DL_OBJS="tclLoadDl.o"
  		DL_LIBS=""
  		LDFLAGS=""
--		LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
+ 		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
+-		LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
  		echo $ac_n "checking for ELF""... $ac_c" 1>&6
--echo "configure:5342: checking for ELF" >&5
-+echo "configure:5356: checking for ELF" >&5
+-echo "configure:6233: checking for ELF" >&5
++echo "configure:6247: checking for ELF" >&5
  		cat > conftest.$ac_ext <<EOF
--#line 5344 "configure"
-+#line 5358 "configure"
+-#line 6235 "configure"
++#line 6249 "configure"
  #include "confdefs.h"
  
  #ifdef __ELF__
-@@ -5351,11 +5365,20 @@ EOF
+@@ -6242,11 +6256,20 @@ EOF
  if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
    egrep "yes" >/dev/null 2>&1; then
    rm -rf conftest*
@@ -103,18 +104,8 @@ $NetBSD: patch-ab,v 1.21 2004/02/07 05:30:19 minskim Exp $
  		    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0'
  		
  fi
-@@ -5569,6 +5592,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*)
- 
-@@ -5616,6 +5642,9 @@ EOF
- 	    else
+@@ -6565,6 +6588,9 @@ EOF
+ 		CC_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}'
  		LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}'
  	    fi
 +	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
@@ -123,74 +114,27 @@ $NetBSD: patch-ab,v 1.21 2004/02/07 05:30:19 minskim Exp $
  	    ;;
  	ULTRIX-4.*)
  	    SHLIB_CFLAGS="-G 0"
-@@ -6103,7 +6132,7 @@ if test "${SHARED_BUILD}" = "1" -a "${SH
-     if test "x$DL_OBJS" = "xtclLoadAout.o"; then
- 	MAKE_LIB="\${STLIB_LD} \$@ \${OBJS}"
-     else
--	MAKE_LIB="\${SHLIB_LD} ${TCL_SHLIB_LD_EXTRAS} -o \$@ \${OBJS} ${SHLIB_LD_LIBS}"
-+	MAKE_LIB="\${SHLIB_LD} ${TCL_SHLIB_LD_EXTRAS} -o \${@:C/\.so.*/.la/} \${OBJS:.o=.lo} ${SHLIB_LD_LIBS} -version-info 1:0"
-     fi
- else
-     case $system in
-@@ -6141,7 +6170,7 @@ if test "$SHARED_BUILD" = "0" -o $TCL_NE
-         TCL_LIB_FLAG="-ltcl`echo ${TCL_VERSION} | tr -d .`\${TCL_DBGX}"
-     fi
-     TCL_BUILD_LIB_SPEC="-L`pwd` ${TCL_LIB_FLAG}"
--    TCL_LIB_SPEC="-L${exec_prefix}/lib ${TCL_LIB_FLAG}"
-+    TCL_LIB_SPEC="${TCL_LIB_SPEC_RPATH} -L${exec_prefix}/lib ${TCL_LIB_FLAG}"
- else
-     TCL_BUILD_EXP_FILE="lib.exp"
-     eval "TCL_EXP_FILE=libtcl${TCL_EXPORT_FILE_SUFFIX}"
-@@ -6171,10 +6200,17 @@ VERSION=${TCL_VERSION}
- #--------------------------------------------------------------------
- 
- if test "$prefix" != "$exec_prefix"; then
--    TCL_PACKAGE_PATH="${exec_prefix}/lib ${prefix}/lib"
-+    TCL_PACKAGE_PATH_ADD="${exec_prefix}/lib/tcl ${prefix}/lib"
- else
--    TCL_PACKAGE_PATH="${prefix}/lib"
-+    TCL_PACKAGE_PATH_ADD="${prefix}/lib/tcl"
- fi
-+for dir in ${TCL_PACKAGE_PATH_ADD}; do
-+    if test -z "${TCL_PACKAGE_PATH}"; then
-+	TCL_PACKAGE_PATH="$dir"
-+    else
-+	TCL_PACKAGE_PATH="${TCL_PACKAGE_PATH} $dir"
-+    fi
-+done
+@@ -6836,8 +6862,8 @@ fi
  
- #--------------------------------------------------------------------
- #       The statements below define various symbols relating to Tcl
-@@ -6186,7 +6222,7 @@ eval "TCL_STUB_LIB_FILE=libtclstub${TCL_
- # Replace DBGX with TCL_DBGX
- eval "TCL_STUB_LIB_FILE=\"${TCL_STUB_LIB_FILE}\""
- 
--MAKE_STUB_LIB="\${STLIB_LD} \$@ \${STUB_LIB_OBJS}"
-+MAKE_STUB_LIB="\${STLIB_LD} -o \$@ \${STUB_LIB_OBJS}"
- 
- if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
-     TCL_STUB_LIB_FLAG="-ltclstub${TCL_VERSION}\${TCL_DBGX}"
-@@ -6262,6 +6298,8 @@ TCL_SHARED_BUILD=${SHARED_BUILD}
+     if test "${SHARED_BUILD}" = "1" && test "${SHLIB_SUFFIX}" != "" ; then
+         LIB_SUFFIX=${SHARED_LIB_SUFFIX}
+-        MAKE_LIB='${SHLIB_LD} -o $@ ${SHLIB_LD_FLAGS} ${OBJS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS}'
+-        INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) $(LIB_INSTALL_DIR)/$(LIB_FILE)'
++        MAKE_LIB='${SHLIB_LD} -o ${@:C/\.so.*/.la/} ${SHLIB_LD_FLAGS} ${OBJS:.o=.lo} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS} -version-info 1:0'
++        INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE:C/\.so.*/.la/) $(LIB_INSTALL_DIR)/$(LIB_FILE)'
+     else
+         LIB_SUFFIX=${UNSHARED_LIB_SUFFIX}
  
+@@ -6854,10 +6880,10 @@ fi
  
+     # Stub lib does not depend on shared/static configuration
+     if test "$RANLIB" = "" ; then
+-        MAKE_STUB_LIB='${STLIB_LD} $@ ${STUB_LIB_OBJS}'
++        MAKE_STUB_LIB='${STLIB_LD} -o $@ ${STUB_LIB_OBJS}'
+         INSTALL_STUB_LIB='$(INSTALL_LIBRARY) $(STUB_LIB_FILE) $(LIB_INSTALL_DIR)/$(STUB_LIB_FILE)'
+     else
+-        MAKE_STUB_LIB='${STLIB_LD} $@ ${STUB_LIB_OBJS} ; ${RANLIB} $@'
++        MAKE_STUB_LIB='${STLIB_LD} -o $@ ${STUB_LIB_OBJS} ; ${RANLIB} $@'
+         INSTALL_STUB_LIB='$(INSTALL_LIBRARY) $(STUB_LIB_FILE) $(LIB_INSTALL_DIR)/$(STUB_LIB_FILE) ; (cd $(LIB_INSTALL_DIR) ; $(RANLIB) $(STUB_LIB_FILE))'
+     fi
  
-+
-+
- trap '' 1 2 15
- cat > confcache <<\EOF
- # This file is a shell script that caches the results of configure
-@@ -6437,12 +6475,12 @@ s%@TCL_DBGX@%$TCL_DBGX%g
- s%@CFG_TCL_SHARED_LIB_SUFFIX@%$CFG_TCL_SHARED_LIB_SUFFIX%g
- s%@CFG_TCL_UNSHARED_LIB_SUFFIX@%$CFG_TCL_UNSHARED_LIB_SUFFIX%g
- s%@CFG_TCL_EXPORT_FILE_SUFFIX@%$CFG_TCL_EXPORT_FILE_SUFFIX%g
-+s%@LDFLAGS_DEBUG@%$LDFLAGS_DEBUG%g
-+s%@LDFLAGS_OPTIMIZE@%$LDFLAGS_OPTIMIZE%g
- s%@CFLAGS_DEFAULT@%$CFLAGS_DEFAULT%g
- s%@EXTRA_CFLAGS@%$EXTRA_CFLAGS%g
- s%@DL_OBJS@%$DL_OBJS%g
- s%@LDFLAGS_DEFAULT@%$LDFLAGS_DEFAULT%g
--s%@LDFLAGS_DEBUG@%$LDFLAGS_DEBUG%g
--s%@LDFLAGS_OPTIMIZE@%$LDFLAGS_OPTIMIZE%g
- s%@STLIB_LD@%$STLIB_LD%g
- s%@SHLIB_LD@%$SHLIB_LD%g
- s%@SHLIB_LD_LIBS@%$SHLIB_LD_LIBS%g
diff --git a/lang/tcl/patches/patch-ac b/lang/tcl/patches/patch-ac
index 694343cae0e..1e36aa04390 100644
--- a/lang/tcl/patches/patch-ac
+++ b/lang/tcl/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.2 2001/12/23 17:02:31 bjoern Exp $
+$NetBSD: patch-ac,v 1.3 2004/03/08 19:55:35 minskim Exp $
 
---- tclUnixInit.c.orig	Fri Aug 24 19:13:22 2001
+--- tclUnixInit.c.orig	Mon Nov 10 07:41:58 2003
 +++ tclUnixInit.c
-@@ -22,6 +22,11 @@
+@@ -28,6 +28,11 @@
  #	include <dlfcn.h>
  #   endif
  #endif
@@ -14,9 +14,9 @@ $NetBSD: patch-ac,v 1.2 2001/12/23 17:02:31 bjoern Exp $
  
  /*
   * The Init script (common to Windows and Unix platforms) is
-@@ -550,6 +555,11 @@
+@@ -717,6 +722,11 @@ TclpSetVariables(interp)
      int unameOK;
-     char *user;
+     CONST char *user;
      Tcl_DString ds;
 +#if defined(__NetBSD__)
 +    char machine_arch[SYS_NMLN];
@@ -24,9 +24,9 @@ $NetBSD: patch-ac,v 1.2 2001/12/23 17:02:31 bjoern Exp $
 +    size_t len = sizeof(machine_arch);
 +#endif
  
-     Tcl_SetVar(interp, "tclDefaultLibrary", defaultLibraryDir, TCL_GLOBAL_ONLY);
-     Tcl_SetVar(interp, "tcl_pkgPath", pkgPath, TCL_GLOBAL_ONLY);
-@@ -585,8 +595,16 @@
+ #ifdef HAVE_CFBUNDLE
+     char tclLibPath[MAXPATHLEN + 1];
+@@ -819,8 +829,16 @@ TclpSetVariables(interp)
  	    Tcl_SetVar2(interp, "tcl_platform", "osVersion", name.release,
  		    TCL_GLOBAL_ONLY|TCL_APPEND_VALUE);
  	}
diff --git a/lang/tcl/patches/patch-ae b/lang/tcl/patches/patch-ae
index 64665e13b0c..ded40f77a3b 100644
--- a/lang/tcl/patches/patch-ae
+++ b/lang/tcl/patches/patch-ae
@@ -1,60 +1,37 @@
-$NetBSD: patch-ae,v 1.3 2004/01/05 11:22:13 jlam Exp $
+$NetBSD: patch-ae,v 1.4 2004/03/08 19:55:35 minskim Exp $
 
---- configure.in.orig	Fri Oct 19 17:24:15 2001
-+++ configure.in	Tue Nov 25 05:16:06 2003
-@@ -386,7 +386,7 @@
-     if test "x$DL_OBJS" = "xtclLoadAout.o"; then
- 	MAKE_LIB="\${STLIB_LD} \[$]@ \${OBJS}"
-     else
--	MAKE_LIB="\${SHLIB_LD} ${TCL_SHLIB_LD_EXTRAS} -o \[$]@ \${OBJS} ${SHLIB_LD_LIBS}"
-+	MAKE_LIB="\${SHLIB_LD} ${TCL_SHLIB_LD_EXTRAS} -o \${@:C/\.so.*/.la/} \${OBJS:.o=.lo} ${SHLIB_LD_LIBS} -version-info 1:0"
-     fi
- else
-     case $system in
-@@ -424,7 +424,7 @@
+--- configure.in.orig	2003-11-21 14:17:14.000000000 -0600
++++ configure.in
+@@ -479,7 +479,7 @@ elif test "$SHARED_BUILD" = "0" || test 
          TCL_LIB_FLAG="-ltcl`echo ${TCL_VERSION} | tr -d .`\${TCL_DBGX}"
      fi
      TCL_BUILD_LIB_SPEC="-L`pwd` ${TCL_LIB_FLAG}"
--    TCL_LIB_SPEC="-L${exec_prefix}/lib ${TCL_LIB_FLAG}"
-+    TCL_LIB_SPEC="${TCL_LIB_SPEC_RPATH} -L${exec_prefix}/lib ${TCL_LIB_FLAG}"
+-    TCL_LIB_SPEC="-L${libdir} ${TCL_LIB_FLAG}"
++    TCL_LIB_SPEC="${TCL_LIB_SPEC_RPATH} -L${libdir} ${TCL_LIB_FLAG}"
  else
      TCL_BUILD_EXP_FILE="lib.exp"
      eval "TCL_EXP_FILE=libtcl${TCL_EXPORT_FILE_SUFFIX}"
-@@ -454,10 +454,17 @@
+@@ -509,13 +509,19 @@ VERSION=${TCL_VERSION}
  #--------------------------------------------------------------------
  
- if test "$prefix" != "$exec_prefix"; then
--    TCL_PACKAGE_PATH="${exec_prefix}/lib ${prefix}/lib"
-+    TCL_PACKAGE_PATH_ADD="${exec_prefix}/lib/tcl ${prefix}/lib"
+ if test "$FRAMEWORK_BUILD" = "1" ; then
+-    TCL_PACKAGE_PATH="${libdir}/Resources/Scripts"
++    TCL_PACKAGE_PATH_ADD="${libdir}/Resources/Scripts"
+ elif test "$prefix" != "$exec_prefix"; then
+-    TCL_PACKAGE_PATH="${libdir} ${prefix}/lib"
++    TCL_PACKAGE_PATH_ADD="${libdir}/tcl ${prefix}/lib"
  else
 -    TCL_PACKAGE_PATH="${prefix}/lib"
 +    TCL_PACKAGE_PATH_ADD="${prefix}/lib/tcl"
  fi
+-
 +for dir in ${TCL_PACKAGE_PATH_ADD}; do
 +    if test -z "${TCL_PACKAGE_PATH}"; then
-+	TCL_PACKAGE_PATH="$dir"
++      TCL_PACKAGE_PATH="$dir"
 +    else
-+	TCL_PACKAGE_PATH="${TCL_PACKAGE_PATH} $dir"
++      TCL_PACKAGE_PATH="${TCL_PACKAGE_PATH} $dir"
 +    fi
 +done
- 
  #--------------------------------------------------------------------
  #       The statements below define various symbols relating to Tcl
-@@ -469,7 +476,7 @@
- # Replace DBGX with TCL_DBGX
- eval "TCL_STUB_LIB_FILE=\"${TCL_STUB_LIB_FILE}\""
- 
--MAKE_STUB_LIB="\${STLIB_LD} \[$]@ \${STUB_LIB_OBJS}"
-+MAKE_STUB_LIB="\${STLIB_LD} -o \[$]@ \${STUB_LIB_OBJS}"
- 
- if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
-     TCL_STUB_LIB_FLAG="-ltclstub${TCL_VERSION}\${TCL_DBGX}"
-@@ -511,6 +518,8 @@
- AC_SUBST(CFG_TCL_EXPORT_FILE_SUFFIX)
- 
- AC_SUBST(CFLAGS)
-+AC_SUBST(LDFLAGS_DEBUG)
-+AC_SUBST(LDFLAGS_OPTIMIZE)
- AC_SUBST(CFLAGS_DEFAULT)
- AC_SUBST(EXTRA_CFLAGS)
- AC_SUBST(DL_OBJS)
+ #       stub support.
diff --git a/lang/tcl/patches/patch-af b/lang/tcl/patches/patch-af
index 32fa842d3bc..bee8b668303 100644
--- a/lang/tcl/patches/patch-af
+++ b/lang/tcl/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.8 2004/02/07 05:30:19 minskim Exp $
+$NetBSD: patch-af,v 1.9 2004/03/08 19:55:35 minskim Exp $
 
---- tcl.m4.orig	Fri Oct 19 19:24:15 2001
+--- tcl.m4.orig	Fri Nov 21 14:17:14 2003
 +++ tcl.m4
-@@ -601,6 +601,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [
+@@ -795,6 +795,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [
      # Step 3: set configuration options based on system name and version.
  
      do64bit_ok=no
@@ -10,8 +10,8 @@ $NetBSD: patch-af,v 1.8 2004/02/07 05:30:19 minskim Exp $
      EXTRA_CFLAGS=""
      TCL_EXPORT_FILE_SUFFIX=""
      UNSHARED_LIB_SUFFIX=""
-@@ -790,6 +791,9 @@ dnl AC_CHECK_TOOL(AR, ar, :)
- 	    LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
+@@ -1059,6 +1060,9 @@ dnl AC_CHECK_TOOL(AR, ar)
+ 	    LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
  	    EXTRA_CFLAGS=""
  	    LDFLAGS=""
 +	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
@@ -20,7 +20,7 @@ $NetBSD: patch-af,v 1.8 2004/02/07 05:30:19 minskim Exp $
  	    ;;
  	IRIX-6.*|IRIX64-6.5*)
  	    SHLIB_CFLAGS=""
-@@ -814,6 +818,9 @@ dnl AC_CHECK_TOOL(AR, ar, :)
+@@ -1084,6 +1088,9 @@ dnl AC_CHECK_TOOL(AR, ar)
  		esac
  		LDFLAGS="-n32"
  	    fi
@@ -30,19 +30,19 @@ $NetBSD: patch-af,v 1.8 2004/02/07 05:30:19 minskim Exp $
  	    ;;
  	IRIX64-6.*)
  	    SHLIB_CFLAGS=""
-@@ -824,6 +831,9 @@ dnl AC_CHECK_TOOL(AR, ar, :)
- 	    DL_LIBS=""
- 	    LDFLAGS=""
- 	    LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
+@@ -1108,6 +1115,9 @@ dnl AC_CHECK_TOOL(AR, ar)
+ 	            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"
-@@ -865,6 +875,9 @@ dnl AC_CHECK_TOOL(AR, ar, :)
-                 EXTRA_CFLAGS="${EXTRA_CFLAGS} -fno-inline"
-             fi
+@@ -1154,6 +1164,9 @@ dnl AC_CHECK_TOOL(AR, ar)
+ 	    # XIM peeking works under XFree86.
+ 	    AC_DEFINE(PEEK_XCLOSEIM)
  
 +	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
 +	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
@@ -50,7 +50,7 @@ $NetBSD: patch-af,v 1.8 2004/02/07 05:30:19 minskim Exp $
  	    ;;
  	GNU*)
  	    SHLIB_CFLAGS="-fPIC"
-@@ -910,28 +923,36 @@ dnl AC_CHECK_TOOL(AR, ar, :)
+@@ -1203,29 +1216,37 @@ dnl AC_CHECK_TOOL(AR, ar)
  	    LD_SEARCH_FLAGS=""
  	    ;;
  	NetBSD-*|FreeBSD-[[1-2]].*|OpenBSD-*)
@@ -67,7 +67,8 @@ $NetBSD: patch-af,v 1.8 2004/02/07 05:30:19 minskim Exp $
  		DL_OBJS="tclLoadDl.o"
  		DL_LIBS=""
  		LDFLAGS=""
--		LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
+ 		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
+-		LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
  		AC_MSG_CHECKING(for ELF)
  		AC_EGREP_CPP(yes, [
  #ifdef __ELF__
@@ -92,18 +93,8 @@ $NetBSD: patch-af,v 1.8 2004/02/07 05:30:19 minskim Exp $
  	    ], [
  		SHLIB_CFLAGS=""
  		SHLIB_LD="echo tclLdAout $CC \{$SHLIB_CFLAGS\} | `pwd`/tclsh -r"
-@@ -1129,6 +1150,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*)
- 
-@@ -1173,6 +1197,9 @@ dnl AC_CHECK_TOOL(AR, ar, :)
- 	    else
+@@ -1519,6 +1540,9 @@ dnl AC_CHECK_TOOL(AR, ar)
+ 		CC_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}'
  		LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}'
  	    fi
 +	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
@@ -112,3 +103,27 @@ $NetBSD: patch-af,v 1.8 2004/02/07 05:30:19 minskim Exp $
  	    ;;
  	ULTRIX-4.*)
  	    SHLIB_CFLAGS="-G 0"
+@@ -1703,8 +1727,8 @@ dnl AC_CHECK_TOOL(AR, ar)
+ 
+     if test "${SHARED_BUILD}" = "1" && test "${SHLIB_SUFFIX}" != "" ; then
+         LIB_SUFFIX=${SHARED_LIB_SUFFIX}
+-        MAKE_LIB='${SHLIB_LD} -o [$]@ ${SHLIB_LD_FLAGS} ${OBJS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS}'
+-        INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) $(LIB_INSTALL_DIR)/$(LIB_FILE)'
++        MAKE_LIB='${SHLIB_LD} -o ${@:C/\.so.*/.la/} ${SHLIB_LD_FLAGS} ${OBJS:.o=.lo} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS} -version-info 1:0'
++        INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE:C/\.so.*/.la/) $(LIB_INSTALL_DIR)/$(LIB_FILE)'
+     else
+         LIB_SUFFIX=${UNSHARED_LIB_SUFFIX}
+ 
+@@ -1734,10 +1758,10 @@ dnl        esac
+ 
+     # Stub lib does not depend on shared/static configuration
+     if test "$RANLIB" = "" ; then
+-        MAKE_STUB_LIB='${STLIB_LD} [$]@ ${STUB_LIB_OBJS}'
++        MAKE_STUB_LIB='${STLIB_LD} -o [$]@ ${STUB_LIB_OBJS}'
+         INSTALL_STUB_LIB='$(INSTALL_LIBRARY) $(STUB_LIB_FILE) $(LIB_INSTALL_DIR)/$(STUB_LIB_FILE)'
+     else
+-        MAKE_STUB_LIB='${STLIB_LD} [$]@ ${STUB_LIB_OBJS} ; ${RANLIB} [$]@'
++        MAKE_STUB_LIB='${STLIB_LD} -o [$]@ ${STUB_LIB_OBJS} ; ${RANLIB} [$]@'
+         INSTALL_STUB_LIB='$(INSTALL_LIBRARY) $(STUB_LIB_FILE) $(LIB_INSTALL_DIR)/$(STUB_LIB_FILE) ; (cd $(LIB_INSTALL_DIR) ; $(RANLIB) $(STUB_LIB_FILE))'
+     fi
+ 
-- 
cgit v1.2.3