diff --git a/lang/tcl82/Makefile b/lang/tcl82/Makefile
index af1da5d25ae0..5d9a4d0fde85 100644
--- a/lang/tcl82/Makefile
+++ b/lang/tcl82/Makefile
@@ -1,380 +1,381 @@
-# New ports collection makefile for:	tcl8.2.2
-# Version required:	8.2.2
+# New ports collection makefile for:	tcl8.2.3
+# Version required:	8.2.3
 # Date created:		19 August 1997
 # Whom:			jkh
 #
 # $FreeBSD$
 #
 
-DISTNAME=	tcl8.2.2
-PKGNAME=	tcl-8.2.2
+DISTNAME=	tcl8.2.3
+PKGNAME=	tcl-8.2.3
 CATEGORIES=	lang tcl82
 MASTER_SITES=	ftp://ftp.scriptics.com/pub/tcl/tcl8_2/
 
 MAINTAINER=	jseger@FreeBSD.org
 
 Y2K=            http://www.scriptics.com/Y2K.html
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/unix
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared
 CONFIGURE_ENV=  PORTSDIR=${PORTSDIR}
+MAKE_ENV=	SHORT_TCL_VER=82
 PKGINSTALL=     ${PKGDIR}/INSTALL.tclsh
 
 PLIST_SUB=	TCL_VER=8.2 SHORT_TCL_VER=82
 
 MAN1=	tclsh.1
 
 MAN3=	Access.3 AddErrInfo.3 Alloc.3 AllowExc.3 AppInit.3 AssocData.3 \
 	Async.3 BackgdErr.3 Backslash.3 BoolObj.3 ByteArrObj.3 CallDel.3 \
 	ChnlStack.3 CmdCmplt.3 Concat.3 CrtChannel.3 CrtChnlHdlr.3 \
 	CrtCloseHdlr.3 	CrtCommand.3 CrtFileHdlr.3 CrtInterp.3 CrtMathFnc.3 \
 	CrtObjCmd.3 CrtSlave.3 CrtTimerHdlr.3 CrtTrace.3 DString.3 \
 	DetachPids.3 DoOneEvent.3 DoWhenIdle.3 DoubleObj.3 Encoding.3 Eval.3 \
 	Exit.3 ExprLong.3 ExprLongObj.3 FindExec.3 GetCwd.3 GetIndex.3 \
 	GetInt.3 GetOpnFl.3 GetStdChan.3 GetVersion.3 Hash.3 IntObj.3 \
 	Interp.3 LinkVar.3 ListObj.3 Notifier.3 Object.3 ObjectType.3 \
 	OpenFileChnl.3 OpenTcp.3 ParseCmd.3 PkgRequire.3 Preserve.3 \
 	PrintDbl.3 RecEvalObj.3 RecordEval.3 RegExp.3 SaveResult.3 SetErrno.3 \
 	SetRecLmt.3 SetResult.3 SetVar.3 Sleep.3 SplitList.3 SplitPath.3 \
 	StaticPkg.3 StrMatch.3 StringObj.3 Tcl_InitStubs.3 Tcl_Main.3 \
 	TclInitStubs.3 Thread.3 ToUpper.3 TraceVar.3 Translate.3 UpVar.3 \
 	Utf.3 WrongNumArgs.3
 
 MANN=	Tcl.n after.n append.n array.n bgerror.n binary.n break.n case.n \
 	catch.n cd.n clock.n close.n concat.n continue.n dde.n encoding.n \
 	eof.n error.n eval.n exec.n exit.n expr.n fblocked.n fconfigure.n \
 	fcopy.n file.n fileevent.n filename.n flush.n for.n foreach.n \
 	format.n gets.n glob.n global.n history.n http.n if.n incr.n info.n \
 	interp.n join.n lappend.n library.n lindex.n linsert.n list.n \
 	llength.n load.n lrange.n lreplace.n lsearch.n lsort.n msgcat.n \
 	namespace.n open.n package.n pid.n pkgMkIndex.n proc.n puts.n pwd.n \
 	re_syntax.n read.n regexp.n registry.n regsub.n rename.n resource.n \
 	return.n safe.n scan.n seek.n set.n socket.n source.n split.n \
 	string.n subst.n switch.n tcltest.n tclvars.n tell.n time.n trace.n \
 	unknown.n unset.n update.n uplevel.n upvar.n variable.n vwait.n while.n
 
 # MLINKS generated via  awk '/ln/ {print "\t" $2,$3,"\\"}' unix/mkLinks
 MLINKS=	Access.3 Tcl_Access.3 \
 	Access.3 Tcl_Stat.3 \
 	AddErrInfo.3 Tcl_AddObjErrorInfo.3 \
 	AddErrInfo.3 Tcl_AddErrorInfo.3 \
 	AddErrInfo.3 Tcl_SetErrorCode.3 \
 	AddErrInfo.3 Tcl_PosixError.3 \
 	Alloc.3 Tcl_Alloc.3 \
 	Alloc.3 Tcl_Free.3 \
 	Alloc.3 Tcl_Realloc.3 \
 	AllowExc.3 Tcl_AllowExceptions.3 \
 	AppInit.3 Tcl_AppInit.3 \
 	AssocData.3 Tcl_GetAssocData.3 \
 	AssocData.3 Tcl_SetAssocData.3 \
 	AssocData.3 Tcl_DeleteAssocData.3 \
 	Async.3 Tcl_AsyncCreate.3 \
 	Async.3 Tcl_AsyncMark.3 \
 	Async.3 Tcl_AsyncInvoke.3 \
 	Async.3 Tcl_AsyncDelete.3 \
 	BackgdErr.3 Tcl_BackgroundError.3 \
 	Backslash.3 Tcl_Backslash.3 \
 	BoolObj.3 Tcl_NewBooleanObj.3 \
 	BoolObj.3 Tcl_SetBooleanObj.3 \
 	BoolObj.3 Tcl_GetBooleanFromObj.3 \
 	ByteArrObj.3 Tcl_NewByteArrayObj.3 \
 	ByteArrObj.3 Tcl_SetByteArrayObj.3 \
 	ByteArrObj.3 Tcl_GetByteArrayFromObj.3 \
 	ByteArrObj.3 Tcl_SetByteArrayLength.3 \
 	CallDel.3 Tcl_CallWhenDeleted.3 \
 	CallDel.3 Tcl_DontCallWhenDeleted.3 \
 	CmdCmplt.3 Tcl_CommandComplete.3 \
 	Concat.3 Tcl_Concat.3 \
 	CrtChannel.3 Tcl_CreateChannel.3 \
 	CrtChannel.3 Tcl_GetChannelInstanceData.3 \
 	CrtChannel.3 Tcl_GetChannelType.3 \
 	CrtChannel.3 Tcl_GetChannelName.3 \
 	CrtChannel.3 Tcl_GetChannelHandle.3 \
 	CrtChannel.3 Tcl_GetChannelMode.3 \
 	CrtChannel.3 Tcl_GetChannelBufferSize.3 \
 	CrtChannel.3 Tcl_SetDefaultTranslation.3 \
 	CrtChannel.3 Tcl_SetChannelBufferSize.3 \
 	CrtChannel.3 Tcl_NotifyChannel.3 \
 	CrtChannel.3 Tcl_BadChannelOption.3 \
 	CrtChnlHdlr.3 Tcl_CreateChannelHandler.3 \
 	CrtChnlHdlr.3 Tcl_DeleteChannelHandler.3 \
 	CrtCloseHdlr.3 Tcl_CreateCloseHandler.3 \
 	CrtCloseHdlr.3 Tcl_DeleteCloseHandler.3 \
 	CrtCommand.3 Tcl_CreateCommand.3 \
 	CrtFileHdlr.3 Tcl_CreateFileHandler.3 \
 	CrtFileHdlr.3 Tcl_DeleteFileHandler.3 \
 	CrtInterp.3 Tcl_CreateInterp.3 \
 	CrtInterp.3 Tcl_DeleteInterp.3 \
 	CrtInterp.3 Tcl_InterpDeleted.3 \
 	CrtMathFnc.3 Tcl_CreateMathFunc.3 \
 	CrtObjCmd.3 Tcl_CreateObjCommand.3 \
 	CrtObjCmd.3 Tcl_DeleteCommand.3 \
 	CrtObjCmd.3 Tcl_DeleteCommandFromToken.3 \
 	CrtObjCmd.3 Tcl_GetCommandInfo.3 \
 	CrtObjCmd.3 Tcl_SetCommandInfo.3 \
 	CrtObjCmd.3 Tcl_GetCommandName.3 \
 	CrtSlave.3 Tcl_IsSafe.3 \
 	CrtSlave.3 Tcl_MakeSafe.3 \
 	CrtSlave.3 Tcl_CreateSlave.3 \
 	CrtSlave.3 Tcl_GetSlave.3 \
 	CrtSlave.3 Tcl_GetMaster.3 \
 	CrtSlave.3 Tcl_GetInterpPath.3 \
 	CrtSlave.3 Tcl_CreateAlias.3 \
 	CrtSlave.3 Tcl_CreateAliasObj.3 \
 	CrtSlave.3 Tcl_GetAlias.3 \
 	CrtSlave.3 Tcl_GetAliasObj.3 \
 	CrtSlave.3 Tcl_ExposeCommand.3 \
 	CrtSlave.3 Tcl_HideCommand.3 \
 	CrtTimerHdlr.3 Tcl_CreateTimerHandler.3 \
 	CrtTimerHdlr.3 Tcl_DeleteTimerHandler.3 \
 	CrtTrace.3 Tcl_CreateTrace.3 \
 	CrtTrace.3 Tcl_DeleteTrace.3 \
 	DString.3 Tcl_DStringInit.3 \
 	DString.3 Tcl_DStringAppend.3 \
 	DString.3 Tcl_DStringAppendElement.3 \
 	DString.3 Tcl_DStringStartSublist.3 \
 	DString.3 Tcl_DStringEndSublist.3 \
 	DString.3 Tcl_DStringLength.3 \
 	DString.3 Tcl_DStringValue.3 \
 	DString.3 Tcl_DStringSetLength.3 \
 	DString.3 Tcl_DStringFree.3 \
 	DString.3 Tcl_DStringResult.3 \
 	DString.3 Tcl_DStringGetResult.3 \
 	DetachPids.3 Tcl_DetachPids.3 \
 	DetachPids.3 Tcl_ReapDetachedProcs.3 \
 	DoOneEvent.3 Tcl_DoOneEvent.3 \
 	DoWhenIdle.3 Tcl_DoWhenIdle.3 \
 	DoWhenIdle.3 Tcl_CancelIdleCall.3 \
 	DoubleObj.3 Tcl_NewDoubleObj.3 \
 	DoubleObj.3 Tcl_SetDoubleObj.3 \
 	DoubleObj.3 Tcl_GetDoubleFromObj.3 \
 	Encoding.3 Tcl_GetEncoding.3 \
 	Encoding.3 Tcl_FreeEncoding.3 \
 	Encoding.3 Tcl_ExternalToUtfDString.3 \
 	Encoding.3 Tcl_ExternalToUtf.3 \
 	Encoding.3 Tcl_UtfToExternalDString.3 \
 	Encoding.3 Tcl_UtfToExternal.3 \
 	Encoding.3 Tcl_GetEncodingName.3 \
 	Encoding.3 Tcl_SetSystemEncoding.3 \
 	Encoding.3 Tcl_GetEncodingNames.3 \
 	Encoding.3 Tcl_CreateEncoding.3 \
 	Eval.3 Tcl_EvalObj.3 \
 	Eval.3 Tcl_EvalFile.3 \
 	Eval.3 Tcl_EvalObjv.3 \
 	Eval.3 Tcl_Eval.3 \
 	Eval.3 Tcl_Eval2.3 \
 	Eval.3 Tcl_GlobalEval.3 \
 	Eval.3 Tcl_VarEval.3 \
 	Exit.3 Tcl_Exit.3 \
 	Exit.3 Tcl_Finalize.3 \
 	Exit.3 Tcl_FinalizeThread.3 \
 	Exit.3 Tcl_CreateExitHandler.3 \
 	Exit.3 Tcl_DeleteExitHandler.3 \
 	Exit.3 Tcl_CreateThreadExitHandler.3 \
 	Exit.3 Tcl_DeleteThreadExitHandler.3 \
 	ExprLong.3 Tcl_ExprLong.3 \
 	ExprLong.3 Tcl_ExprDouble.3 \
 	ExprLong.3 Tcl_ExprBoolean.3 \
 	ExprLong.3 Tcl_ExprString.3 \
 	ExprLongObj.3 Tcl_ExprLongObj.3 \
 	ExprLongObj.3 Tcl_ExprDoubleObj.3 \
 	ExprLongObj.3 Tcl_ExprBooleanObj.3 \
 	ExprLongObj.3 Tcl_ExprObj.3 \
 	FindExec.3 Tcl_FindExecutable.3 \
 	FindExec.3 Tcl_GetNameOfExecutable.3 \
 	GetCwd.3 Tcl_GetCwd.3 \
 	GetCwd.3 Tcl_Chdir.3 \
 	GetIndex.3 Tcl_GetIndexFromObj.3 \
 	GetInt.3 Tcl_GetInt.3 \
 	GetInt.3 Tcl_GetDouble.3 \
 	GetInt.3 Tcl_GetBoolean.3 \
 	GetOpnFl.3 Tcl_GetOpenFile.3 \
 	GetStdChan.3 Tcl_GetStdChannel.3 \
 	GetStdChan.3 Tcl_SetStdChannel.3 \
 	GetVersion.3 Tcl_GetVersion.3 \
 	Hash.3 Tcl_InitHashTable.3 \
 	Hash.3 Tcl_DeleteHashTable.3 \
 	Hash.3 Tcl_CreateHashEntry.3 \
 	Hash.3 Tcl_DeleteHashEntry.3 \
 	Hash.3 Tcl_FindHashEntry.3 \
 	Hash.3 Tcl_GetHashValue.3 \
 	Hash.3 Tcl_SetHashValue.3 \
 	Hash.3 Tcl_GetHashKey.3 \
 	Hash.3 Tcl_FirstHashEntry.3 \
 	Hash.3 Tcl_NextHashEntry.3 \
 	Hash.3 Tcl_HashStats.3 \
 	IntObj.3 Tcl_NewIntObj.3 \
 	IntObj.3 Tcl_NewLongObj.3 \
 	IntObj.3 Tcl_SetIntObj.3 \
 	IntObj.3 Tcl_SetLongObj.3 \
 	IntObj.3 Tcl_GetIntFromObj.3 \
 	IntObj.3 Tcl_GetLongFromObj.3 \
 	Interp.3 Tcl_Interp.3 \
 	LinkVar.3 Tcl_LinkVar.3 \
 	LinkVar.3 Tcl_UnlinkVar.3 \
 	LinkVar.3 Tcl_UpdateLinkedVar.3 \
 	ListObj.3 Tcl_ListObjAppendList.3 \
 	ListObj.3 Tcl_ListObjAppendElement.3 \
 	ListObj.3 Tcl_NewListObj.3 \
 	ListObj.3 Tcl_SetListObj.3 \
 	ListObj.3 Tcl_ListObjGetElements.3 \
 	ListObj.3 Tcl_ListObjLength.3 \
 	ListObj.3 Tcl_ListObjIndex.3 \
 	ListObj.3 Tcl_ListObjReplace.3 \
 	Notifier.3 Tcl_CreateEventSource.3 \
 	Notifier.3 Tcl_DeleteEventSource.3 \
 	Notifier.3 Tcl_SetMaxBlockTime.3 \
 	Notifier.3 Tcl_QueueEvent.3 \
 	Notifier.3 Tcl_DeleteEvents.3 \
 	Notifier.3 Tcl_WaitForEvent.3 \
 	Notifier.3 Tcl_SetTimer.3 \
 	Notifier.3 Tcl_ServiceAll.3 \
 	Notifier.3 Tcl_ServiceEvent.3 \
 	Notifier.3 Tcl_GetServiceMode.3 \
 	Notifier.3 Tcl_SetServiceMode.3 \
 	Object.3 Tcl_NewObj.3 \
 	Object.3 Tcl_DuplicateObj.3 \
 	Object.3 Tcl_IncrRefCount.3 \
 	Object.3 Tcl_DecrRefCount.3 \
 	Object.3 Tcl_IsShared.3 \
 	ObjectType.3 Tcl_RegisterObjType.3 \
 	ObjectType.3 Tcl_GetObjType.3 \
 	ObjectType.3 Tcl_AppendAllObjTypes.3 \
 	ObjectType.3 Tcl_ConvertToType.3 \
 	OpenFileChnl.3 Tcl_OpenFileChannel.3 \
 	OpenFileChnl.3 Tcl_OpenCommandChannel.3 \
 	OpenFileChnl.3 Tcl_MakeFileChannel.3 \
 	OpenFileChnl.3 Tcl_GetChannel.3 \
 	OpenFileChnl.3 Tcl_RegisterChannel.3 \
 	OpenFileChnl.3 Tcl_UnregisterChannel.3 \
 	OpenFileChnl.3 Tcl_Close.3 \
 	OpenFileChnl.3 Tcl_ReadChars.3 \
 	OpenFileChnl.3 Tcl_Read.3 \
 	OpenFileChnl.3 Tcl_GetsObj.3 \
 	OpenFileChnl.3 Tcl_Gets.3 \
 	OpenFileChnl.3 Tcl_WriteObj.3 \
 	OpenFileChnl.3 Tcl_WriteChars.3 \
 	OpenFileChnl.3 Tcl_Write.3 \
 	OpenFileChnl.3 Tcl_Flush.3 \
 	OpenFileChnl.3 Tcl_Seek.3 \
 	OpenFileChnl.3 Tcl_Tell.3 \
 	OpenFileChnl.3 Tcl_GetChannelOption.3 \
 	OpenFileChnl.3 Tcl_SetChannelOption.3 \
 	OpenFileChnl.3 Tcl_Eof.3 \
 	OpenFileChnl.3 Tcl_InputBlocked.3 \
 	OpenFileChnl.3 Tcl_InputBuffered.3 \
 	OpenTcp.3 Tcl_OpenTcpClient.3 \
 	OpenTcp.3 Tcl_MakeTcpClientChannel.3 \
 	OpenTcp.3 Tcl_OpenTcpServer.3 \
 	ParseCmd.3 Tcl_ParseCommand.3 \
 	ParseCmd.3 Tcl_ParseExpr.3 \
 	ParseCmd.3 Tcl_ParseBraces.3 \
 	ParseCmd.3 Tcl_ParseQuotedString.3 \
 	ParseCmd.3 Tcl_ParseVarName.3 \
 	ParseCmd.3 Tcl_FreeParse.3 \
 	ParseCmd.3 Tcl_EvalTokens.3 \
 	PkgRequire.3 Tcl_PkgRequire.3 \
 	PkgRequire.3 Tcl_PkgProvide.3 \
 	Preserve.3 Tcl_Preserve.3 \
 	Preserve.3 Tcl_Release.3 \
 	Preserve.3 Tcl_EventuallyFree.3 \
 	PrintDbl.3 Tcl_PrintDouble.3 \
 	RecEvalObj.3 Tcl_RecordAndEvalObj.3 \
 	RecordEval.3 Tcl_RecordAndEval.3 \
 	RegExp.3 Tcl_RegExpMatch.3 \
 	RegExp.3 Tcl_RegExpCompile.3 \
 	RegExp.3 Tcl_RegExpExec.3 \
 	RegExp.3 Tcl_RegExpRange.3 \
 	SaveResult.3 Tcl_SaveResult.3 \
 	SaveResult.3 Tcl_RestoreResult.3 \
 	SaveResult.3 Tcl_DiscardResult.3 \
 	SetErrno.3 Tcl_SetErrno.3 \
 	SetErrno.3 Tcl_GetErrno.3 \
 	SetRecLmt.3 Tcl_SetRecursionLimit.3 \
 	SetResult.3 Tcl_SetObjResult.3 \
 	SetResult.3 Tcl_GetObjResult.3 \
 	SetResult.3 Tcl_SetResult.3 \
 	SetResult.3 Tcl_GetStringResult.3 \
 	SetResult.3 Tcl_AppendResult.3 \
 	SetResult.3 Tcl_AppendElement.3 \
 	SetResult.3 Tcl_ResetResult.3 \
 	SetVar.3 Tcl_SetObjVar2.3 \
 	SetVar.3 Tcl_SetVar.3 \
 	SetVar.3 Tcl_SetVar2.3 \
 	SetVar.3 Tcl_GetObjVar2.3 \
 	SetVar.3 Tcl_GetVar.3 \
 	SetVar.3 Tcl_GetVar2.3 \
 	SetVar.3 Tcl_UnsetVar.3 \
 	SetVar.3 Tcl_UnsetVar2.3 \
 	Sleep.3 Tcl_Sleep.3 \
 	SplitList.3 Tcl_SplitList.3 \
 	SplitList.3 Tcl_Merge.3 \
 	SplitList.3 Tcl_ScanElement.3 \
 	SplitList.3 Tcl_ConvertElement.3 \
 	SplitPath.3 Tcl_SplitPath.3 \
 	SplitPath.3 Tcl_JoinPath.3 \
 	SplitPath.3 Tcl_GetPathType.3 \
 	StaticPkg.3 Tcl_StaticPackage.3 \
 	StrMatch.3 Tcl_StringMatch.3 \
 	StringObj.3 Tcl_NewStringObj.3 \
 	StringObj.3 Tcl_SetStringObj.3 \
 	StringObj.3 Tcl_GetStringFromObj.3 \
 	StringObj.3 Tcl_GetString.3 \
 	StringObj.3 Tcl_AppendToObj.3 \
 	StringObj.3 Tcl_AppendStringsToObj.3 \
 	StringObj.3 Tcl_AppendObjToObj.3 \
 	StringObj.3 Tcl_SetObjLength.3 \
 	StringObj.3 Tcl_ConcatObj.3 \
 	Thread.3 Tcl_ConditionNotify.3 \
 	Thread.3 Tcl_ConditionWait.3 \
 	Thread.3 Tcl_GetThreadData.3 \
 	Thread.3 Tcl_MutexLock.3 \
 	Thread.3 Tcl_MutexUnlock.3 \
 	ToUpper.3 Tcl_UniCharToUpper.3 \
 	ToUpper.3 Tcl_UniCharToLower.3 \
 	ToUpper.3 Tcl_UniCharToTitle.3 \
 	ToUpper.3 Tcl_UtfToUpper.3 \
 	ToUpper.3 Tcl_UtfToLower.3 \
 	ToUpper.3 Tcl_UtfToTitle.3 \
 	TraceVar.3 Tcl_TraceVar.3 \
 	TraceVar.3 Tcl_TraceVar2.3 \
 	TraceVar.3 Tcl_UntraceVar.3 \
 	TraceVar.3 Tcl_UntraceVar2.3 \
 	TraceVar.3 Tcl_VarTraceInfo.3 \
 	TraceVar.3 Tcl_VarTraceInfo2.3 \
 	Translate.3 Tcl_TranslateFileName.3 \
 	UpVar.3 Tcl_UpVar.3 \
 	UpVar.3 Tcl_UpVar2.3 \
 	Utf.3 Tcl_UniChar.3 \
 	Utf.3 Tcl_UniCharToUtf.3 \
 	Utf.3 Tcl_UtfToUniChar.3 \
 	Utf.3 Tcl_UtfCharComplete.3 \
 	Utf.3 Tcl_NumUtfChars.3 \
 	Utf.3 Tcl_UtfFindFirst.3 \
 	Utf.3 Tcl_UtfFindLast.3 \
 	Utf.3 Tcl_UtfNext.3 \
 	Utf.3 Tcl_UtfPrev.3 \
 	Utf.3 Tcl_UniCharAtIndex.3 \
 	Utf.3 Tcl_UtfAtIndex.3 \
 	Utf.3 Tcl_UtfBackslash.3 \
 	WrongNumArgs.3 Tcl_WrongNumArgs.3 \
 	http.n Http.n \
 	pkgMkIndex.n pkg_mkIndex.n \
 	safe.n Safe\Base.n
 
 .include <bsd.port.pre.mk>
 
 post-extract:
 	${MV} ${WRKDIR}/${DISTNAME}/doc/InitStubs.3 \
 	      ${WRKDIR}/${DISTNAME}/doc/Tcl_InitStubs.3
 post-install:
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 .if exists(${PKGINSTALL})
 	${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL}
 .endif
 
 test:
 	cd ${WRKSRC} && ${MAKE} test
 
 .include <bsd.port.post.mk>
diff --git a/lang/tcl82/distinfo b/lang/tcl82/distinfo
index 0becb14a2b05..014a57b04b7a 100644
--- a/lang/tcl82/distinfo
+++ b/lang/tcl82/distinfo
@@ -1 +1 @@
-MD5 (tcl8.2.2.tar.gz) = 4b16a1d5f91ae5744d17385a7bf13820
+MD5 (tcl8.2.3.tar.gz) = 8d06f4837e8e93edbe78f5ceaaa16ab4
diff --git a/lang/tcl82/files/patch-aa b/lang/tcl82/files/patch-aa
index 347b053cfc41..07db0c35ca9e 100644
--- a/lang/tcl82/files/patch-aa
+++ b/lang/tcl82/files/patch-aa
@@ -1,153 +1,153 @@
 --- Makefile.in.orig	Wed Nov  3 21:37:24 1999
 +++ Makefile.in	Sun Nov 21 15:31:00 1999
 @@ -48,7 +48,9 @@
  SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TCL_LIBRARY)
  
  # Directory in which to install the include file tcl.h:
 -INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include
 +INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include/tcl$(VERSION)
-+GENERIC_INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(PREFIX)/include/tcl$(VERSION)/generic
-+UNIX_INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(PREFIX)/include/tcl$(VERSION)/unix
++GENERIC_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/generic
++UNIX_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/unix
  
  # Top-level directory in which to install manual entries:
  MAN_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/man
 @@ -82,7 +84,7 @@
  #CFLAGS = 		$(CFLAGS_DEBUG)
  #CFLAGS = 		$(CFLAGS_OPTIMIZE)
  #CFLAGS = 		$(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE)
 -CFLAGS = 		@CFLAGS@
 +CFLAGS? = 		@CFLAGS@
  
  # To disable ANSI-C procedure prototypes reverse the comment characters
  # on the following lines:
 @@ -156,7 +158,7 @@
  # "install" around;  better to use the install-sh script that comes
  # with the distribution, which is slower but guaranteed to work.
  
 -INSTALL =		@srcdir@/install-sh -c
 +INSTALL =		install -c
  INSTALL_PROGRAM =	${INSTALL}
  INSTALL_DATA =		${INSTALL} -m 644
  
 @@ -383,7 +385,7 @@
  
  all: binaries libraries doc
  
 -binaries: ${TCL_LIB_FILE} $(TCL_STUB_LIB_FILE) $(TCL_BUILD_EXP_FILE) tclsh
-+binaries: ${TCL_LIB_FILE} $(TCL_STUB_LIB_FILE) $(TCL_BUILD_EXP_FILE) libtcl82.a tclsh
++binaries: ${TCL_LIB_FILE} $(TCL_STUB_LIB_FILE) $(TCL_BUILD_EXP_FILE) libtcl${SHORT_TCL_VER}.a tclsh
  
  libraries:
  
 @@ -394,8 +396,14 @@
  ${TCL_LIB_FILE}: ${OBJS} ${STUB_LIB_FILE}
  	rm -f ${TCL_LIB_FILE}
  	@MAKE_LIB@
-+	ln -sf ${TCL_LIB_FILE} libtcl82.so
++	ln -sf ${TCL_LIB_FILE} libtcl${SHORT_TCL_VER}.so
  	$(RANLIB) ${TCL_LIB_FILE}
  
-+libtcl82.a: ${OBJS}
-+	rm -f libtcl82.a
-+	ar cr libtcl82.a ${OBJS}
-+	$(RANLIB) libtcl82.a
++libtcl${SHORT_TCL_VER}.a: ${OBJS}
++	rm -f libtcl${SHORT_TCL_VER}.a
++	ar cr libtcl${SHORT_TCL_VER}.a ${OBJS}
++	$(RANLIB) libtcl${SHORT_TCL_VER}.a
 +
  ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
  	rm -f ${STUB_LIB_FILE}
  	@MAKE_STUB_LIB@
 @@ -504,8 +512,13 @@
  	@echo "Installing $(TCL_LIB_FILE)"
  	chmod +x $(SRC_DIR)/install-sh
  	@$(INSTALL_DATA) $(TCL_LIB_FILE) $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE)
-+	@ln -sf $(TCL_LIB_FILE) $(LIB_INSTALL_DIR)/libtcl82.so
++	@ln -sf $(TCL_LIB_FILE) $(LIB_INSTALL_DIR)/libtcl${SHORT_TCL_VER}.so
  	@(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TCL_LIB_FILE))
  	@chmod 555 $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE)
-+	@echo "Installing libtcl82.a"
-+	@$(INSTALL_DATA) libtcl82.a $(LIB_INSTALL_DIR)/libtcl82.a
-+	@(cd $(LIB_INSTALL_DIR); $(RANLIB) libtcl82.a)
-+	@chmod 555 $(LIB_INSTALL_DIR)/libtcl82.a
++	@echo "Installing libtcl${SHORT_TCL_VER}.a"
++	@$(INSTALL_DATA) libtcl${SHORT_TCL_VER}.a $(LIB_INSTALL_DIR)/libtcl${SHORT_TCL_VER}.a
++	@(cd $(LIB_INSTALL_DIR); $(RANLIB) libtcl${SHORT_TCL_VER}.a)
++	@chmod 555 $(LIB_INSTALL_DIR)/libtcl${SHORT_TCL_VER}.a
  	@if test "$(TCL_BUILD_EXP_FILE)" != ""; then \
  	    echo "Installing $(TCL_EXP_FILE)"; \
  	    $(INSTALL_DATA) $(TCL_BUILD_EXP_FILE) \
 @@ -514,7 +527,8 @@
  	@echo "Installing tclsh"
  	@$(INSTALL_PROGRAM) tclsh $(BIN_INSTALL_DIR)/tclsh$(VERSION)
  	@echo "Installing tclConfig.sh"
 -	@$(INSTALL_DATA) tclConfig.sh $(LIB_INSTALL_DIR)/tclConfig.sh
 +	@mkdir -p $(SCRIPT_INSTALL_DIR)
 +	@$(INSTALL_DATA) tclConfig.sh $(SCRIPT_INSTALL_DIR)/tclConfig.sh
  	@if test "$(TCL_STUB_LIB_FILE)" != "" ; then \
  	    echo "Installing $(TCL_STUB_LIB_FILE)"; \
  	    $(INSTALL_DATA) $(STUB_LIB_FILE) \
 @@ -522,8 +536,8 @@
  	    fi
  
  install-libraries: libraries
 -	@for i in $(INSTALL_ROOT)$(prefix)/lib $(INCLUDE_INSTALL_DIR) \
 -		$(SCRIPT_INSTALL_DIR); \
 +	@for i in $(INSTALL_ROOT)$(prefix)/lib $(GENERIC_INCLUDE_INSTALL_DIR) \
 +		$(UNIX_INCLUDE_INSTALL_DIR) $(SCRIPT_INSTALL_DIR); \
  	    do \
  	    if [ ! -d $$i ] ; then \
  		echo "Making directory $$i"; \
 @@ -542,11 +556,20 @@
  		fi; \
  	    done;
  	chmod +x $(SRC_DIR)/install-sh
 -	@for i in $(GENERIC_DIR)/tcl.h $(GENERIC_DIR)/tclDecls.h ; \
 +	@echo "Installing libraries, tcl.h and other headers"
 +	@for i in $(GENERIC_DIR)/*.h ; \
  	    do \
  	    echo "Installing $$i"; \
 -	    $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR); \
 +	    $(INSTALL_DATA) $$i $(GENERIC_INCLUDE_INSTALL_DIR); \
  	    done;
 +	@for i in $(UNIX_DIR)/*.h ; \
 +	    do \
 +	    echo "Installing $$i"; \
 +	    $(INSTALL_DATA) $$i $(UNIX_INCLUDE_INSTALL_DIR); \
 +	    done;
 +	@ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tcl.h $(INCLUDE_INSTALL_DIR)/tcl.h
 +	@ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tclDecls.h $(INCLUDE_INSTALL_DIR)/tclDecls.h
 +
  	@for i in $(TOP_DIR)/library/*.tcl $(TOP_DIR)/library/tclIndex $(UNIX_DIR)/tclAppInit.c $(UNIX_DIR)/ldAix; \
  	    do \
  	    echo "Installing $$i"; \
 @@ -579,21 +602,19 @@
  	@cd $(TOP_DIR)/doc; for i in *.1; \
  	    do \
  	    echo "Installing doc/$$i"; \
 -	    rm -f $(MAN1_INSTALL_DIR)/$$i; \
 +	    rm -f $(MAN1_INSTALL_DIR)/$$i ; \
  	    sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \
  		    $$i > $(MAN1_INSTALL_DIR)/$$i; \
  	    chmod 444 $(MAN1_INSTALL_DIR)/$$i; \
  	    done;
 -	$(UNIX_DIR)/mkLinks $(MAN1_INSTALL_DIR)
  	@cd $(TOP_DIR)/doc; for i in *.3; \
  	    do \
  	    echo "Installing doc/$$i"; \
 -	    rm -f $(MAN3_INSTALL_DIR)/$$i; \
 +	    rm -f $(MAN3_INSTALL_DIR)/$$i ; \
  	    sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \
  		    $$i > $(MAN3_INSTALL_DIR)/$$i; \
  	    chmod 444 $(MAN3_INSTALL_DIR)/$$i; \
  	    done;
 -	$(UNIX_DIR)/mkLinks $(MAN3_INSTALL_DIR)
  	@cd $(TOP_DIR)/doc; for i in *.n; \
  	    do \
  	    echo "Installing doc/$$i"; \
 @@ -602,7 +623,14 @@
  		    $$i > $(MANN_INSTALL_DIR)/$$i; \
  	    chmod 444 $(MANN_INSTALL_DIR)/$$i; \
  	    done;
 -	$(UNIX_DIR)/mkLinks $(MANN_INSTALL_DIR)
 +	@echo "**********"
 +	@echo "IMPORTANT:"
 +	@echo "**********"
 +	@echo "tclConfig.sh in $(SCRIPT_INSTALL_DIR)/tclConfig.sh"
 +	@echo "tcl.h        in $(INCLUDE_INSTALL_DIR)/tcl.h"
 +	@echo "tclDecls.h   in $(INCLUDE_INSTALL_DIR)/tclDecls.h"
 +	@echo "There are NOT default place, but good place to avoid"
 +	@echo "conflicting with another version of Tcl/Tks."
  
  Makefile: $(UNIX_DIR)/Makefile.in
  	$(SHELL) config.status
diff --git a/lang/tcl82/files/patch-ab b/lang/tcl82/files/patch-ab
index 6cda56a21351..85ee6265de11 100644
--- a/lang/tcl82/files/patch-ab
+++ b/lang/tcl82/files/patch-ab
@@ -1,98 +1,97 @@
---- configure.orig	Wed Nov  3 21:37:24 1999
-+++ configure	Sun Nov 21 15:34:05 1999
+--- configure.orig	Tue Dec 14 22:59:18 1999
++++ configure	Wed Jan  5 00:56:06 2000
 @@ -4648,7 +4648,7 @@
      EXTRA_CFLAGS=""
      TCL_EXPORT_FILE_SUFFIX=""
      UNSHARED_LIB_SUFFIX=""
 -    TCL_TRIM_DOTS='`echo ${VERSION} | tr -d .`'
-+    TCL_TRIM_DOTS=82
++    TCL_TRIM_DOTS=`echo ${VERSION} | tr -d .`
      ECHO_VERSION='`echo ${VERSION}`'
      TCL_LIB_VERSIONS_OK=ok
      CFLAGS_DEBUG=-g
 @@ -4892,7 +4892,7 @@
  	    LDFLAGS="-Wl,-Bexport"
  	    LD_SEARCH_FLAGS=""
  	    ;;
 -	NetBSD-*|FreeBSD-[1-2].*|OpenBSD-*)
 +	NetBSD-*|FreeBSD-*|OpenBSD-*)
  	    # Not available on all versions:  check for include file.
  	    ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6
-@@ -4922,16 +4922,21 @@
+@@ -4922,16 +4922,20 @@
  fi
  if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
    echo "$ac_t""yes" 1>&6
 -  
  		SHLIB_CFLAGS="-fpic"
 -		SHLIB_LD="ld -Bshareable -x"
  		SHLIB_LD_LIBS=""
  		SHLIB_SUFFIX=".so"
  		DL_OBJS="tclLoadDl.o"
  		DL_LIBS=""
  		LDFLAGS=""
  		LD_SEARCH_FLAGS=""
 -		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0'
 +	if eval "test \"`echo ${PORTOBJFORMAT}`\" = elf" ; then
-+		echo "SHARED_LIB_SUFFIX JSEGER"
 +		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1'
 +		SHLIB_LD="ld -shared -x -soname \$@"
 +	else
 +		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1.0'
 +		SHLIB_LD="ld -Bshareable -x"
 +	fi
  	    
  else
    echo "$ac_t""no" 1>&6
-@@ -4954,17 +4959,6 @@
+@@ -4954,17 +4958,6 @@
  	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
  	    TCL_LIB_VERSIONS_OK=nodots
  	    ;;
 -	FreeBSD-*)
 -	    # FreeBSD 3.* and greater have ELF.
 -	    SHLIB_CFLAGS="-fpic"
 -	    SHLIB_LD="ld -Bshareable -x"
 -	    SHLIB_LD_LIBS=""
 -	    SHLIB_SUFFIX=".so"
 -	    DL_OBJS="tclLoadDl.o"
 -	    DL_LIBS=""
 -	    LDFLAGS=""
 -	    LD_SEARCH_FLAGS=""
 -	    ;;
  	NEXTSTEP-*)
  	    SHLIB_CFLAGS=""
  	    SHLIB_LD="cc -nostdlib -r"
-@@ -5371,7 +5365,7 @@
+@@ -5371,7 +5364,7 @@
  	SHARED_LIB_SUFFIX='${VERSION}\$\{DBGX\}${SHLIB_SUFFIX}'
      fi
      if test "$UNSHARED_LIB_SUFFIX" = "" ; then
 -	UNSHARED_LIB_SUFFIX='${VERSION}\$\{DBGX\}.a'
 +	UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
      fi
  
      
-@@ -5628,11 +5622,7 @@
+@@ -5628,11 +5621,7 @@
  # up the Tcl library.
  
  if test "$SHARED_BUILD" = "0" -o $TCL_NEEDS_EXP_FILE = 0; then
 -    if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
 -        TCL_LIB_FLAG="-ltcl${TCL_VERSION}\${TCL_DBGX}"
 -    else
 -        TCL_LIB_FLAG="-ltcl`echo ${TCL_VERSION} | tr -d .`\${TCL_DBGX}"
 -    fi
 +    TCL_LIB_FLAG="-ltcl${TCL_TRIM_DOTS}\${TCL_DBGX}"
      TCL_BUILD_LIB_SPEC="-L`pwd` ${TCL_LIB_FLAG}"
      TCL_LIB_SPEC="-L${exec_prefix}/lib ${TCL_LIB_FLAG}"
  else
-@@ -5678,11 +5668,7 @@
+@@ -5678,11 +5667,7 @@
  
  TCL_STUB_LIB_FILE=${STUB_LIB_FILE}
  
 -if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
 -    TCL_STUB_LIB_FLAG="-ltclstub${TCL_VERSION}\${TCL_DBGX}"
 -else
 -    TCL_STUB_LIB_FLAG="-ltclstub`echo ${TCL_VERSION} | tr -d .`\${TCL_DBGX}"
 -fi
 +TCL_STUB_LIB_FLAG="-ltclstub${TCL_TRIM_DOTS}\${TCL_DBGX}"
  
  TCL_BUILD_STUB_LIB_SPEC="-L`pwd` ${TCL_STUB_LIB_FLAG}"
  TCL_STUB_LIB_SPEC="-L${exec_prefix}/lib ${TCL_STUB_LIB_FLAG}"
diff --git a/lang/tcl82/pkg-descr b/lang/tcl82/pkg-descr
index 58797d179672..f120ad346ae5 100644
--- a/lang/tcl82/pkg-descr
+++ b/lang/tcl82/pkg-descr
@@ -1,8 +1,8 @@
-This is Tcl8.1, an embeddable tool command language.
+This is Tcl8.2, an embeddable tool command language.
 
 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.
 
 A full set of manual pages is also provided with this package.
 
 WWW: http://www.scriptics.com
diff --git a/lang/tcl83/Makefile b/lang/tcl83/Makefile
index af1da5d25ae0..5d9a4d0fde85 100644
--- a/lang/tcl83/Makefile
+++ b/lang/tcl83/Makefile
@@ -1,380 +1,381 @@
-# New ports collection makefile for:	tcl8.2.2
-# Version required:	8.2.2
+# New ports collection makefile for:	tcl8.2.3
+# Version required:	8.2.3
 # Date created:		19 August 1997
 # Whom:			jkh
 #
 # $FreeBSD$
 #
 
-DISTNAME=	tcl8.2.2
-PKGNAME=	tcl-8.2.2
+DISTNAME=	tcl8.2.3
+PKGNAME=	tcl-8.2.3
 CATEGORIES=	lang tcl82
 MASTER_SITES=	ftp://ftp.scriptics.com/pub/tcl/tcl8_2/
 
 MAINTAINER=	jseger@FreeBSD.org
 
 Y2K=            http://www.scriptics.com/Y2K.html
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/unix
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared
 CONFIGURE_ENV=  PORTSDIR=${PORTSDIR}
+MAKE_ENV=	SHORT_TCL_VER=82
 PKGINSTALL=     ${PKGDIR}/INSTALL.tclsh
 
 PLIST_SUB=	TCL_VER=8.2 SHORT_TCL_VER=82
 
 MAN1=	tclsh.1
 
 MAN3=	Access.3 AddErrInfo.3 Alloc.3 AllowExc.3 AppInit.3 AssocData.3 \
 	Async.3 BackgdErr.3 Backslash.3 BoolObj.3 ByteArrObj.3 CallDel.3 \
 	ChnlStack.3 CmdCmplt.3 Concat.3 CrtChannel.3 CrtChnlHdlr.3 \
 	CrtCloseHdlr.3 	CrtCommand.3 CrtFileHdlr.3 CrtInterp.3 CrtMathFnc.3 \
 	CrtObjCmd.3 CrtSlave.3 CrtTimerHdlr.3 CrtTrace.3 DString.3 \
 	DetachPids.3 DoOneEvent.3 DoWhenIdle.3 DoubleObj.3 Encoding.3 Eval.3 \
 	Exit.3 ExprLong.3 ExprLongObj.3 FindExec.3 GetCwd.3 GetIndex.3 \
 	GetInt.3 GetOpnFl.3 GetStdChan.3 GetVersion.3 Hash.3 IntObj.3 \
 	Interp.3 LinkVar.3 ListObj.3 Notifier.3 Object.3 ObjectType.3 \
 	OpenFileChnl.3 OpenTcp.3 ParseCmd.3 PkgRequire.3 Preserve.3 \
 	PrintDbl.3 RecEvalObj.3 RecordEval.3 RegExp.3 SaveResult.3 SetErrno.3 \
 	SetRecLmt.3 SetResult.3 SetVar.3 Sleep.3 SplitList.3 SplitPath.3 \
 	StaticPkg.3 StrMatch.3 StringObj.3 Tcl_InitStubs.3 Tcl_Main.3 \
 	TclInitStubs.3 Thread.3 ToUpper.3 TraceVar.3 Translate.3 UpVar.3 \
 	Utf.3 WrongNumArgs.3
 
 MANN=	Tcl.n after.n append.n array.n bgerror.n binary.n break.n case.n \
 	catch.n cd.n clock.n close.n concat.n continue.n dde.n encoding.n \
 	eof.n error.n eval.n exec.n exit.n expr.n fblocked.n fconfigure.n \
 	fcopy.n file.n fileevent.n filename.n flush.n for.n foreach.n \
 	format.n gets.n glob.n global.n history.n http.n if.n incr.n info.n \
 	interp.n join.n lappend.n library.n lindex.n linsert.n list.n \
 	llength.n load.n lrange.n lreplace.n lsearch.n lsort.n msgcat.n \
 	namespace.n open.n package.n pid.n pkgMkIndex.n proc.n puts.n pwd.n \
 	re_syntax.n read.n regexp.n registry.n regsub.n rename.n resource.n \
 	return.n safe.n scan.n seek.n set.n socket.n source.n split.n \
 	string.n subst.n switch.n tcltest.n tclvars.n tell.n time.n trace.n \
 	unknown.n unset.n update.n uplevel.n upvar.n variable.n vwait.n while.n
 
 # MLINKS generated via  awk '/ln/ {print "\t" $2,$3,"\\"}' unix/mkLinks
 MLINKS=	Access.3 Tcl_Access.3 \
 	Access.3 Tcl_Stat.3 \
 	AddErrInfo.3 Tcl_AddObjErrorInfo.3 \
 	AddErrInfo.3 Tcl_AddErrorInfo.3 \
 	AddErrInfo.3 Tcl_SetErrorCode.3 \
 	AddErrInfo.3 Tcl_PosixError.3 \
 	Alloc.3 Tcl_Alloc.3 \
 	Alloc.3 Tcl_Free.3 \
 	Alloc.3 Tcl_Realloc.3 \
 	AllowExc.3 Tcl_AllowExceptions.3 \
 	AppInit.3 Tcl_AppInit.3 \
 	AssocData.3 Tcl_GetAssocData.3 \
 	AssocData.3 Tcl_SetAssocData.3 \
 	AssocData.3 Tcl_DeleteAssocData.3 \
 	Async.3 Tcl_AsyncCreate.3 \
 	Async.3 Tcl_AsyncMark.3 \
 	Async.3 Tcl_AsyncInvoke.3 \
 	Async.3 Tcl_AsyncDelete.3 \
 	BackgdErr.3 Tcl_BackgroundError.3 \
 	Backslash.3 Tcl_Backslash.3 \
 	BoolObj.3 Tcl_NewBooleanObj.3 \
 	BoolObj.3 Tcl_SetBooleanObj.3 \
 	BoolObj.3 Tcl_GetBooleanFromObj.3 \
 	ByteArrObj.3 Tcl_NewByteArrayObj.3 \
 	ByteArrObj.3 Tcl_SetByteArrayObj.3 \
 	ByteArrObj.3 Tcl_GetByteArrayFromObj.3 \
 	ByteArrObj.3 Tcl_SetByteArrayLength.3 \
 	CallDel.3 Tcl_CallWhenDeleted.3 \
 	CallDel.3 Tcl_DontCallWhenDeleted.3 \
 	CmdCmplt.3 Tcl_CommandComplete.3 \
 	Concat.3 Tcl_Concat.3 \
 	CrtChannel.3 Tcl_CreateChannel.3 \
 	CrtChannel.3 Tcl_GetChannelInstanceData.3 \
 	CrtChannel.3 Tcl_GetChannelType.3 \
 	CrtChannel.3 Tcl_GetChannelName.3 \
 	CrtChannel.3 Tcl_GetChannelHandle.3 \
 	CrtChannel.3 Tcl_GetChannelMode.3 \
 	CrtChannel.3 Tcl_GetChannelBufferSize.3 \
 	CrtChannel.3 Tcl_SetDefaultTranslation.3 \
 	CrtChannel.3 Tcl_SetChannelBufferSize.3 \
 	CrtChannel.3 Tcl_NotifyChannel.3 \
 	CrtChannel.3 Tcl_BadChannelOption.3 \
 	CrtChnlHdlr.3 Tcl_CreateChannelHandler.3 \
 	CrtChnlHdlr.3 Tcl_DeleteChannelHandler.3 \
 	CrtCloseHdlr.3 Tcl_CreateCloseHandler.3 \
 	CrtCloseHdlr.3 Tcl_DeleteCloseHandler.3 \
 	CrtCommand.3 Tcl_CreateCommand.3 \
 	CrtFileHdlr.3 Tcl_CreateFileHandler.3 \
 	CrtFileHdlr.3 Tcl_DeleteFileHandler.3 \
 	CrtInterp.3 Tcl_CreateInterp.3 \
 	CrtInterp.3 Tcl_DeleteInterp.3 \
 	CrtInterp.3 Tcl_InterpDeleted.3 \
 	CrtMathFnc.3 Tcl_CreateMathFunc.3 \
 	CrtObjCmd.3 Tcl_CreateObjCommand.3 \
 	CrtObjCmd.3 Tcl_DeleteCommand.3 \
 	CrtObjCmd.3 Tcl_DeleteCommandFromToken.3 \
 	CrtObjCmd.3 Tcl_GetCommandInfo.3 \
 	CrtObjCmd.3 Tcl_SetCommandInfo.3 \
 	CrtObjCmd.3 Tcl_GetCommandName.3 \
 	CrtSlave.3 Tcl_IsSafe.3 \
 	CrtSlave.3 Tcl_MakeSafe.3 \
 	CrtSlave.3 Tcl_CreateSlave.3 \
 	CrtSlave.3 Tcl_GetSlave.3 \
 	CrtSlave.3 Tcl_GetMaster.3 \
 	CrtSlave.3 Tcl_GetInterpPath.3 \
 	CrtSlave.3 Tcl_CreateAlias.3 \
 	CrtSlave.3 Tcl_CreateAliasObj.3 \
 	CrtSlave.3 Tcl_GetAlias.3 \
 	CrtSlave.3 Tcl_GetAliasObj.3 \
 	CrtSlave.3 Tcl_ExposeCommand.3 \
 	CrtSlave.3 Tcl_HideCommand.3 \
 	CrtTimerHdlr.3 Tcl_CreateTimerHandler.3 \
 	CrtTimerHdlr.3 Tcl_DeleteTimerHandler.3 \
 	CrtTrace.3 Tcl_CreateTrace.3 \
 	CrtTrace.3 Tcl_DeleteTrace.3 \
 	DString.3 Tcl_DStringInit.3 \
 	DString.3 Tcl_DStringAppend.3 \
 	DString.3 Tcl_DStringAppendElement.3 \
 	DString.3 Tcl_DStringStartSublist.3 \
 	DString.3 Tcl_DStringEndSublist.3 \
 	DString.3 Tcl_DStringLength.3 \
 	DString.3 Tcl_DStringValue.3 \
 	DString.3 Tcl_DStringSetLength.3 \
 	DString.3 Tcl_DStringFree.3 \
 	DString.3 Tcl_DStringResult.3 \
 	DString.3 Tcl_DStringGetResult.3 \
 	DetachPids.3 Tcl_DetachPids.3 \
 	DetachPids.3 Tcl_ReapDetachedProcs.3 \
 	DoOneEvent.3 Tcl_DoOneEvent.3 \
 	DoWhenIdle.3 Tcl_DoWhenIdle.3 \
 	DoWhenIdle.3 Tcl_CancelIdleCall.3 \
 	DoubleObj.3 Tcl_NewDoubleObj.3 \
 	DoubleObj.3 Tcl_SetDoubleObj.3 \
 	DoubleObj.3 Tcl_GetDoubleFromObj.3 \
 	Encoding.3 Tcl_GetEncoding.3 \
 	Encoding.3 Tcl_FreeEncoding.3 \
 	Encoding.3 Tcl_ExternalToUtfDString.3 \
 	Encoding.3 Tcl_ExternalToUtf.3 \
 	Encoding.3 Tcl_UtfToExternalDString.3 \
 	Encoding.3 Tcl_UtfToExternal.3 \
 	Encoding.3 Tcl_GetEncodingName.3 \
 	Encoding.3 Tcl_SetSystemEncoding.3 \
 	Encoding.3 Tcl_GetEncodingNames.3 \
 	Encoding.3 Tcl_CreateEncoding.3 \
 	Eval.3 Tcl_EvalObj.3 \
 	Eval.3 Tcl_EvalFile.3 \
 	Eval.3 Tcl_EvalObjv.3 \
 	Eval.3 Tcl_Eval.3 \
 	Eval.3 Tcl_Eval2.3 \
 	Eval.3 Tcl_GlobalEval.3 \
 	Eval.3 Tcl_VarEval.3 \
 	Exit.3 Tcl_Exit.3 \
 	Exit.3 Tcl_Finalize.3 \
 	Exit.3 Tcl_FinalizeThread.3 \
 	Exit.3 Tcl_CreateExitHandler.3 \
 	Exit.3 Tcl_DeleteExitHandler.3 \
 	Exit.3 Tcl_CreateThreadExitHandler.3 \
 	Exit.3 Tcl_DeleteThreadExitHandler.3 \
 	ExprLong.3 Tcl_ExprLong.3 \
 	ExprLong.3 Tcl_ExprDouble.3 \
 	ExprLong.3 Tcl_ExprBoolean.3 \
 	ExprLong.3 Tcl_ExprString.3 \
 	ExprLongObj.3 Tcl_ExprLongObj.3 \
 	ExprLongObj.3 Tcl_ExprDoubleObj.3 \
 	ExprLongObj.3 Tcl_ExprBooleanObj.3 \
 	ExprLongObj.3 Tcl_ExprObj.3 \
 	FindExec.3 Tcl_FindExecutable.3 \
 	FindExec.3 Tcl_GetNameOfExecutable.3 \
 	GetCwd.3 Tcl_GetCwd.3 \
 	GetCwd.3 Tcl_Chdir.3 \
 	GetIndex.3 Tcl_GetIndexFromObj.3 \
 	GetInt.3 Tcl_GetInt.3 \
 	GetInt.3 Tcl_GetDouble.3 \
 	GetInt.3 Tcl_GetBoolean.3 \
 	GetOpnFl.3 Tcl_GetOpenFile.3 \
 	GetStdChan.3 Tcl_GetStdChannel.3 \
 	GetStdChan.3 Tcl_SetStdChannel.3 \
 	GetVersion.3 Tcl_GetVersion.3 \
 	Hash.3 Tcl_InitHashTable.3 \
 	Hash.3 Tcl_DeleteHashTable.3 \
 	Hash.3 Tcl_CreateHashEntry.3 \
 	Hash.3 Tcl_DeleteHashEntry.3 \
 	Hash.3 Tcl_FindHashEntry.3 \
 	Hash.3 Tcl_GetHashValue.3 \
 	Hash.3 Tcl_SetHashValue.3 \
 	Hash.3 Tcl_GetHashKey.3 \
 	Hash.3 Tcl_FirstHashEntry.3 \
 	Hash.3 Tcl_NextHashEntry.3 \
 	Hash.3 Tcl_HashStats.3 \
 	IntObj.3 Tcl_NewIntObj.3 \
 	IntObj.3 Tcl_NewLongObj.3 \
 	IntObj.3 Tcl_SetIntObj.3 \
 	IntObj.3 Tcl_SetLongObj.3 \
 	IntObj.3 Tcl_GetIntFromObj.3 \
 	IntObj.3 Tcl_GetLongFromObj.3 \
 	Interp.3 Tcl_Interp.3 \
 	LinkVar.3 Tcl_LinkVar.3 \
 	LinkVar.3 Tcl_UnlinkVar.3 \
 	LinkVar.3 Tcl_UpdateLinkedVar.3 \
 	ListObj.3 Tcl_ListObjAppendList.3 \
 	ListObj.3 Tcl_ListObjAppendElement.3 \
 	ListObj.3 Tcl_NewListObj.3 \
 	ListObj.3 Tcl_SetListObj.3 \
 	ListObj.3 Tcl_ListObjGetElements.3 \
 	ListObj.3 Tcl_ListObjLength.3 \
 	ListObj.3 Tcl_ListObjIndex.3 \
 	ListObj.3 Tcl_ListObjReplace.3 \
 	Notifier.3 Tcl_CreateEventSource.3 \
 	Notifier.3 Tcl_DeleteEventSource.3 \
 	Notifier.3 Tcl_SetMaxBlockTime.3 \
 	Notifier.3 Tcl_QueueEvent.3 \
 	Notifier.3 Tcl_DeleteEvents.3 \
 	Notifier.3 Tcl_WaitForEvent.3 \
 	Notifier.3 Tcl_SetTimer.3 \
 	Notifier.3 Tcl_ServiceAll.3 \
 	Notifier.3 Tcl_ServiceEvent.3 \
 	Notifier.3 Tcl_GetServiceMode.3 \
 	Notifier.3 Tcl_SetServiceMode.3 \
 	Object.3 Tcl_NewObj.3 \
 	Object.3 Tcl_DuplicateObj.3 \
 	Object.3 Tcl_IncrRefCount.3 \
 	Object.3 Tcl_DecrRefCount.3 \
 	Object.3 Tcl_IsShared.3 \
 	ObjectType.3 Tcl_RegisterObjType.3 \
 	ObjectType.3 Tcl_GetObjType.3 \
 	ObjectType.3 Tcl_AppendAllObjTypes.3 \
 	ObjectType.3 Tcl_ConvertToType.3 \
 	OpenFileChnl.3 Tcl_OpenFileChannel.3 \
 	OpenFileChnl.3 Tcl_OpenCommandChannel.3 \
 	OpenFileChnl.3 Tcl_MakeFileChannel.3 \
 	OpenFileChnl.3 Tcl_GetChannel.3 \
 	OpenFileChnl.3 Tcl_RegisterChannel.3 \
 	OpenFileChnl.3 Tcl_UnregisterChannel.3 \
 	OpenFileChnl.3 Tcl_Close.3 \
 	OpenFileChnl.3 Tcl_ReadChars.3 \
 	OpenFileChnl.3 Tcl_Read.3 \
 	OpenFileChnl.3 Tcl_GetsObj.3 \
 	OpenFileChnl.3 Tcl_Gets.3 \
 	OpenFileChnl.3 Tcl_WriteObj.3 \
 	OpenFileChnl.3 Tcl_WriteChars.3 \
 	OpenFileChnl.3 Tcl_Write.3 \
 	OpenFileChnl.3 Tcl_Flush.3 \
 	OpenFileChnl.3 Tcl_Seek.3 \
 	OpenFileChnl.3 Tcl_Tell.3 \
 	OpenFileChnl.3 Tcl_GetChannelOption.3 \
 	OpenFileChnl.3 Tcl_SetChannelOption.3 \
 	OpenFileChnl.3 Tcl_Eof.3 \
 	OpenFileChnl.3 Tcl_InputBlocked.3 \
 	OpenFileChnl.3 Tcl_InputBuffered.3 \
 	OpenTcp.3 Tcl_OpenTcpClient.3 \
 	OpenTcp.3 Tcl_MakeTcpClientChannel.3 \
 	OpenTcp.3 Tcl_OpenTcpServer.3 \
 	ParseCmd.3 Tcl_ParseCommand.3 \
 	ParseCmd.3 Tcl_ParseExpr.3 \
 	ParseCmd.3 Tcl_ParseBraces.3 \
 	ParseCmd.3 Tcl_ParseQuotedString.3 \
 	ParseCmd.3 Tcl_ParseVarName.3 \
 	ParseCmd.3 Tcl_FreeParse.3 \
 	ParseCmd.3 Tcl_EvalTokens.3 \
 	PkgRequire.3 Tcl_PkgRequire.3 \
 	PkgRequire.3 Tcl_PkgProvide.3 \
 	Preserve.3 Tcl_Preserve.3 \
 	Preserve.3 Tcl_Release.3 \
 	Preserve.3 Tcl_EventuallyFree.3 \
 	PrintDbl.3 Tcl_PrintDouble.3 \
 	RecEvalObj.3 Tcl_RecordAndEvalObj.3 \
 	RecordEval.3 Tcl_RecordAndEval.3 \
 	RegExp.3 Tcl_RegExpMatch.3 \
 	RegExp.3 Tcl_RegExpCompile.3 \
 	RegExp.3 Tcl_RegExpExec.3 \
 	RegExp.3 Tcl_RegExpRange.3 \
 	SaveResult.3 Tcl_SaveResult.3 \
 	SaveResult.3 Tcl_RestoreResult.3 \
 	SaveResult.3 Tcl_DiscardResult.3 \
 	SetErrno.3 Tcl_SetErrno.3 \
 	SetErrno.3 Tcl_GetErrno.3 \
 	SetRecLmt.3 Tcl_SetRecursionLimit.3 \
 	SetResult.3 Tcl_SetObjResult.3 \
 	SetResult.3 Tcl_GetObjResult.3 \
 	SetResult.3 Tcl_SetResult.3 \
 	SetResult.3 Tcl_GetStringResult.3 \
 	SetResult.3 Tcl_AppendResult.3 \
 	SetResult.3 Tcl_AppendElement.3 \
 	SetResult.3 Tcl_ResetResult.3 \
 	SetVar.3 Tcl_SetObjVar2.3 \
 	SetVar.3 Tcl_SetVar.3 \
 	SetVar.3 Tcl_SetVar2.3 \
 	SetVar.3 Tcl_GetObjVar2.3 \
 	SetVar.3 Tcl_GetVar.3 \
 	SetVar.3 Tcl_GetVar2.3 \
 	SetVar.3 Tcl_UnsetVar.3 \
 	SetVar.3 Tcl_UnsetVar2.3 \
 	Sleep.3 Tcl_Sleep.3 \
 	SplitList.3 Tcl_SplitList.3 \
 	SplitList.3 Tcl_Merge.3 \
 	SplitList.3 Tcl_ScanElement.3 \
 	SplitList.3 Tcl_ConvertElement.3 \
 	SplitPath.3 Tcl_SplitPath.3 \
 	SplitPath.3 Tcl_JoinPath.3 \
 	SplitPath.3 Tcl_GetPathType.3 \
 	StaticPkg.3 Tcl_StaticPackage.3 \
 	StrMatch.3 Tcl_StringMatch.3 \
 	StringObj.3 Tcl_NewStringObj.3 \
 	StringObj.3 Tcl_SetStringObj.3 \
 	StringObj.3 Tcl_GetStringFromObj.3 \
 	StringObj.3 Tcl_GetString.3 \
 	StringObj.3 Tcl_AppendToObj.3 \
 	StringObj.3 Tcl_AppendStringsToObj.3 \
 	StringObj.3 Tcl_AppendObjToObj.3 \
 	StringObj.3 Tcl_SetObjLength.3 \
 	StringObj.3 Tcl_ConcatObj.3 \
 	Thread.3 Tcl_ConditionNotify.3 \
 	Thread.3 Tcl_ConditionWait.3 \
 	Thread.3 Tcl_GetThreadData.3 \
 	Thread.3 Tcl_MutexLock.3 \
 	Thread.3 Tcl_MutexUnlock.3 \
 	ToUpper.3 Tcl_UniCharToUpper.3 \
 	ToUpper.3 Tcl_UniCharToLower.3 \
 	ToUpper.3 Tcl_UniCharToTitle.3 \
 	ToUpper.3 Tcl_UtfToUpper.3 \
 	ToUpper.3 Tcl_UtfToLower.3 \
 	ToUpper.3 Tcl_UtfToTitle.3 \
 	TraceVar.3 Tcl_TraceVar.3 \
 	TraceVar.3 Tcl_TraceVar2.3 \
 	TraceVar.3 Tcl_UntraceVar.3 \
 	TraceVar.3 Tcl_UntraceVar2.3 \
 	TraceVar.3 Tcl_VarTraceInfo.3 \
 	TraceVar.3 Tcl_VarTraceInfo2.3 \
 	Translate.3 Tcl_TranslateFileName.3 \
 	UpVar.3 Tcl_UpVar.3 \
 	UpVar.3 Tcl_UpVar2.3 \
 	Utf.3 Tcl_UniChar.3 \
 	Utf.3 Tcl_UniCharToUtf.3 \
 	Utf.3 Tcl_UtfToUniChar.3 \
 	Utf.3 Tcl_UtfCharComplete.3 \
 	Utf.3 Tcl_NumUtfChars.3 \
 	Utf.3 Tcl_UtfFindFirst.3 \
 	Utf.3 Tcl_UtfFindLast.3 \
 	Utf.3 Tcl_UtfNext.3 \
 	Utf.3 Tcl_UtfPrev.3 \
 	Utf.3 Tcl_UniCharAtIndex.3 \
 	Utf.3 Tcl_UtfAtIndex.3 \
 	Utf.3 Tcl_UtfBackslash.3 \
 	WrongNumArgs.3 Tcl_WrongNumArgs.3 \
 	http.n Http.n \
 	pkgMkIndex.n pkg_mkIndex.n \
 	safe.n Safe\Base.n
 
 .include <bsd.port.pre.mk>
 
 post-extract:
 	${MV} ${WRKDIR}/${DISTNAME}/doc/InitStubs.3 \
 	      ${WRKDIR}/${DISTNAME}/doc/Tcl_InitStubs.3
 post-install:
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 .if exists(${PKGINSTALL})
 	${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL}
 .endif
 
 test:
 	cd ${WRKSRC} && ${MAKE} test
 
 .include <bsd.port.post.mk>
diff --git a/lang/tcl83/distinfo b/lang/tcl83/distinfo
index 0becb14a2b05..014a57b04b7a 100644
--- a/lang/tcl83/distinfo
+++ b/lang/tcl83/distinfo
@@ -1 +1 @@
-MD5 (tcl8.2.2.tar.gz) = 4b16a1d5f91ae5744d17385a7bf13820
+MD5 (tcl8.2.3.tar.gz) = 8d06f4837e8e93edbe78f5ceaaa16ab4
diff --git a/lang/tcl83/files/patch-aa b/lang/tcl83/files/patch-aa
index 347b053cfc41..07db0c35ca9e 100644
--- a/lang/tcl83/files/patch-aa
+++ b/lang/tcl83/files/patch-aa
@@ -1,153 +1,153 @@
 --- Makefile.in.orig	Wed Nov  3 21:37:24 1999
 +++ Makefile.in	Sun Nov 21 15:31:00 1999
 @@ -48,7 +48,9 @@
  SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TCL_LIBRARY)
  
  # Directory in which to install the include file tcl.h:
 -INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include
 +INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include/tcl$(VERSION)
-+GENERIC_INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(PREFIX)/include/tcl$(VERSION)/generic
-+UNIX_INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(PREFIX)/include/tcl$(VERSION)/unix
++GENERIC_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/generic
++UNIX_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/unix
  
  # Top-level directory in which to install manual entries:
  MAN_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/man
 @@ -82,7 +84,7 @@
  #CFLAGS = 		$(CFLAGS_DEBUG)
  #CFLAGS = 		$(CFLAGS_OPTIMIZE)
  #CFLAGS = 		$(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE)
 -CFLAGS = 		@CFLAGS@
 +CFLAGS? = 		@CFLAGS@
  
  # To disable ANSI-C procedure prototypes reverse the comment characters
  # on the following lines:
 @@ -156,7 +158,7 @@
  # "install" around;  better to use the install-sh script that comes
  # with the distribution, which is slower but guaranteed to work.
  
 -INSTALL =		@srcdir@/install-sh -c
 +INSTALL =		install -c
  INSTALL_PROGRAM =	${INSTALL}
  INSTALL_DATA =		${INSTALL} -m 644
  
 @@ -383,7 +385,7 @@
  
  all: binaries libraries doc
  
 -binaries: ${TCL_LIB_FILE} $(TCL_STUB_LIB_FILE) $(TCL_BUILD_EXP_FILE) tclsh
-+binaries: ${TCL_LIB_FILE} $(TCL_STUB_LIB_FILE) $(TCL_BUILD_EXP_FILE) libtcl82.a tclsh
++binaries: ${TCL_LIB_FILE} $(TCL_STUB_LIB_FILE) $(TCL_BUILD_EXP_FILE) libtcl${SHORT_TCL_VER}.a tclsh
  
  libraries:
  
 @@ -394,8 +396,14 @@
  ${TCL_LIB_FILE}: ${OBJS} ${STUB_LIB_FILE}
  	rm -f ${TCL_LIB_FILE}
  	@MAKE_LIB@
-+	ln -sf ${TCL_LIB_FILE} libtcl82.so
++	ln -sf ${TCL_LIB_FILE} libtcl${SHORT_TCL_VER}.so
  	$(RANLIB) ${TCL_LIB_FILE}
  
-+libtcl82.a: ${OBJS}
-+	rm -f libtcl82.a
-+	ar cr libtcl82.a ${OBJS}
-+	$(RANLIB) libtcl82.a
++libtcl${SHORT_TCL_VER}.a: ${OBJS}
++	rm -f libtcl${SHORT_TCL_VER}.a
++	ar cr libtcl${SHORT_TCL_VER}.a ${OBJS}
++	$(RANLIB) libtcl${SHORT_TCL_VER}.a
 +
  ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
  	rm -f ${STUB_LIB_FILE}
  	@MAKE_STUB_LIB@
 @@ -504,8 +512,13 @@
  	@echo "Installing $(TCL_LIB_FILE)"
  	chmod +x $(SRC_DIR)/install-sh
  	@$(INSTALL_DATA) $(TCL_LIB_FILE) $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE)
-+	@ln -sf $(TCL_LIB_FILE) $(LIB_INSTALL_DIR)/libtcl82.so
++	@ln -sf $(TCL_LIB_FILE) $(LIB_INSTALL_DIR)/libtcl${SHORT_TCL_VER}.so
  	@(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TCL_LIB_FILE))
  	@chmod 555 $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE)
-+	@echo "Installing libtcl82.a"
-+	@$(INSTALL_DATA) libtcl82.a $(LIB_INSTALL_DIR)/libtcl82.a
-+	@(cd $(LIB_INSTALL_DIR); $(RANLIB) libtcl82.a)
-+	@chmod 555 $(LIB_INSTALL_DIR)/libtcl82.a
++	@echo "Installing libtcl${SHORT_TCL_VER}.a"
++	@$(INSTALL_DATA) libtcl${SHORT_TCL_VER}.a $(LIB_INSTALL_DIR)/libtcl${SHORT_TCL_VER}.a
++	@(cd $(LIB_INSTALL_DIR); $(RANLIB) libtcl${SHORT_TCL_VER}.a)
++	@chmod 555 $(LIB_INSTALL_DIR)/libtcl${SHORT_TCL_VER}.a
  	@if test "$(TCL_BUILD_EXP_FILE)" != ""; then \
  	    echo "Installing $(TCL_EXP_FILE)"; \
  	    $(INSTALL_DATA) $(TCL_BUILD_EXP_FILE) \
 @@ -514,7 +527,8 @@
  	@echo "Installing tclsh"
  	@$(INSTALL_PROGRAM) tclsh $(BIN_INSTALL_DIR)/tclsh$(VERSION)
  	@echo "Installing tclConfig.sh"
 -	@$(INSTALL_DATA) tclConfig.sh $(LIB_INSTALL_DIR)/tclConfig.sh
 +	@mkdir -p $(SCRIPT_INSTALL_DIR)
 +	@$(INSTALL_DATA) tclConfig.sh $(SCRIPT_INSTALL_DIR)/tclConfig.sh
  	@if test "$(TCL_STUB_LIB_FILE)" != "" ; then \
  	    echo "Installing $(TCL_STUB_LIB_FILE)"; \
  	    $(INSTALL_DATA) $(STUB_LIB_FILE) \
 @@ -522,8 +536,8 @@
  	    fi
  
  install-libraries: libraries
 -	@for i in $(INSTALL_ROOT)$(prefix)/lib $(INCLUDE_INSTALL_DIR) \
 -		$(SCRIPT_INSTALL_DIR); \
 +	@for i in $(INSTALL_ROOT)$(prefix)/lib $(GENERIC_INCLUDE_INSTALL_DIR) \
 +		$(UNIX_INCLUDE_INSTALL_DIR) $(SCRIPT_INSTALL_DIR); \
  	    do \
  	    if [ ! -d $$i ] ; then \
  		echo "Making directory $$i"; \
 @@ -542,11 +556,20 @@
  		fi; \
  	    done;
  	chmod +x $(SRC_DIR)/install-sh
 -	@for i in $(GENERIC_DIR)/tcl.h $(GENERIC_DIR)/tclDecls.h ; \
 +	@echo "Installing libraries, tcl.h and other headers"
 +	@for i in $(GENERIC_DIR)/*.h ; \
  	    do \
  	    echo "Installing $$i"; \
 -	    $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR); \
 +	    $(INSTALL_DATA) $$i $(GENERIC_INCLUDE_INSTALL_DIR); \
  	    done;
 +	@for i in $(UNIX_DIR)/*.h ; \
 +	    do \
 +	    echo "Installing $$i"; \
 +	    $(INSTALL_DATA) $$i $(UNIX_INCLUDE_INSTALL_DIR); \
 +	    done;
 +	@ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tcl.h $(INCLUDE_INSTALL_DIR)/tcl.h
 +	@ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tclDecls.h $(INCLUDE_INSTALL_DIR)/tclDecls.h
 +
  	@for i in $(TOP_DIR)/library/*.tcl $(TOP_DIR)/library/tclIndex $(UNIX_DIR)/tclAppInit.c $(UNIX_DIR)/ldAix; \
  	    do \
  	    echo "Installing $$i"; \
 @@ -579,21 +602,19 @@
  	@cd $(TOP_DIR)/doc; for i in *.1; \
  	    do \
  	    echo "Installing doc/$$i"; \
 -	    rm -f $(MAN1_INSTALL_DIR)/$$i; \
 +	    rm -f $(MAN1_INSTALL_DIR)/$$i ; \
  	    sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \
  		    $$i > $(MAN1_INSTALL_DIR)/$$i; \
  	    chmod 444 $(MAN1_INSTALL_DIR)/$$i; \
  	    done;
 -	$(UNIX_DIR)/mkLinks $(MAN1_INSTALL_DIR)
  	@cd $(TOP_DIR)/doc; for i in *.3; \
  	    do \
  	    echo "Installing doc/$$i"; \
 -	    rm -f $(MAN3_INSTALL_DIR)/$$i; \
 +	    rm -f $(MAN3_INSTALL_DIR)/$$i ; \
  	    sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \
  		    $$i > $(MAN3_INSTALL_DIR)/$$i; \
  	    chmod 444 $(MAN3_INSTALL_DIR)/$$i; \
  	    done;
 -	$(UNIX_DIR)/mkLinks $(MAN3_INSTALL_DIR)
  	@cd $(TOP_DIR)/doc; for i in *.n; \
  	    do \
  	    echo "Installing doc/$$i"; \
 @@ -602,7 +623,14 @@
  		    $$i > $(MANN_INSTALL_DIR)/$$i; \
  	    chmod 444 $(MANN_INSTALL_DIR)/$$i; \
  	    done;
 -	$(UNIX_DIR)/mkLinks $(MANN_INSTALL_DIR)
 +	@echo "**********"
 +	@echo "IMPORTANT:"
 +	@echo "**********"
 +	@echo "tclConfig.sh in $(SCRIPT_INSTALL_DIR)/tclConfig.sh"
 +	@echo "tcl.h        in $(INCLUDE_INSTALL_DIR)/tcl.h"
 +	@echo "tclDecls.h   in $(INCLUDE_INSTALL_DIR)/tclDecls.h"
 +	@echo "There are NOT default place, but good place to avoid"
 +	@echo "conflicting with another version of Tcl/Tks."
  
  Makefile: $(UNIX_DIR)/Makefile.in
  	$(SHELL) config.status
diff --git a/lang/tcl83/files/patch-ab b/lang/tcl83/files/patch-ab
index 6cda56a21351..85ee6265de11 100644
--- a/lang/tcl83/files/patch-ab
+++ b/lang/tcl83/files/patch-ab
@@ -1,98 +1,97 @@
---- configure.orig	Wed Nov  3 21:37:24 1999
-+++ configure	Sun Nov 21 15:34:05 1999
+--- configure.orig	Tue Dec 14 22:59:18 1999
++++ configure	Wed Jan  5 00:56:06 2000
 @@ -4648,7 +4648,7 @@
      EXTRA_CFLAGS=""
      TCL_EXPORT_FILE_SUFFIX=""
      UNSHARED_LIB_SUFFIX=""
 -    TCL_TRIM_DOTS='`echo ${VERSION} | tr -d .`'
-+    TCL_TRIM_DOTS=82
++    TCL_TRIM_DOTS=`echo ${VERSION} | tr -d .`
      ECHO_VERSION='`echo ${VERSION}`'
      TCL_LIB_VERSIONS_OK=ok
      CFLAGS_DEBUG=-g
 @@ -4892,7 +4892,7 @@
  	    LDFLAGS="-Wl,-Bexport"
  	    LD_SEARCH_FLAGS=""
  	    ;;
 -	NetBSD-*|FreeBSD-[1-2].*|OpenBSD-*)
 +	NetBSD-*|FreeBSD-*|OpenBSD-*)
  	    # Not available on all versions:  check for include file.
  	    ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6
-@@ -4922,16 +4922,21 @@
+@@ -4922,16 +4922,20 @@
  fi
  if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
    echo "$ac_t""yes" 1>&6
 -  
  		SHLIB_CFLAGS="-fpic"
 -		SHLIB_LD="ld -Bshareable -x"
  		SHLIB_LD_LIBS=""
  		SHLIB_SUFFIX=".so"
  		DL_OBJS="tclLoadDl.o"
  		DL_LIBS=""
  		LDFLAGS=""
  		LD_SEARCH_FLAGS=""
 -		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0'
 +	if eval "test \"`echo ${PORTOBJFORMAT}`\" = elf" ; then
-+		echo "SHARED_LIB_SUFFIX JSEGER"
 +		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1'
 +		SHLIB_LD="ld -shared -x -soname \$@"
 +	else
 +		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1.0'
 +		SHLIB_LD="ld -Bshareable -x"
 +	fi
  	    
  else
    echo "$ac_t""no" 1>&6
-@@ -4954,17 +4959,6 @@
+@@ -4954,17 +4958,6 @@
  	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
  	    TCL_LIB_VERSIONS_OK=nodots
  	    ;;
 -	FreeBSD-*)
 -	    # FreeBSD 3.* and greater have ELF.
 -	    SHLIB_CFLAGS="-fpic"
 -	    SHLIB_LD="ld -Bshareable -x"
 -	    SHLIB_LD_LIBS=""
 -	    SHLIB_SUFFIX=".so"
 -	    DL_OBJS="tclLoadDl.o"
 -	    DL_LIBS=""
 -	    LDFLAGS=""
 -	    LD_SEARCH_FLAGS=""
 -	    ;;
  	NEXTSTEP-*)
  	    SHLIB_CFLAGS=""
  	    SHLIB_LD="cc -nostdlib -r"
-@@ -5371,7 +5365,7 @@
+@@ -5371,7 +5364,7 @@
  	SHARED_LIB_SUFFIX='${VERSION}\$\{DBGX\}${SHLIB_SUFFIX}'
      fi
      if test "$UNSHARED_LIB_SUFFIX" = "" ; then
 -	UNSHARED_LIB_SUFFIX='${VERSION}\$\{DBGX\}.a'
 +	UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
      fi
  
      
-@@ -5628,11 +5622,7 @@
+@@ -5628,11 +5621,7 @@
  # up the Tcl library.
  
  if test "$SHARED_BUILD" = "0" -o $TCL_NEEDS_EXP_FILE = 0; then
 -    if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
 -        TCL_LIB_FLAG="-ltcl${TCL_VERSION}\${TCL_DBGX}"
 -    else
 -        TCL_LIB_FLAG="-ltcl`echo ${TCL_VERSION} | tr -d .`\${TCL_DBGX}"
 -    fi
 +    TCL_LIB_FLAG="-ltcl${TCL_TRIM_DOTS}\${TCL_DBGX}"
      TCL_BUILD_LIB_SPEC="-L`pwd` ${TCL_LIB_FLAG}"
      TCL_LIB_SPEC="-L${exec_prefix}/lib ${TCL_LIB_FLAG}"
  else
-@@ -5678,11 +5668,7 @@
+@@ -5678,11 +5667,7 @@
  
  TCL_STUB_LIB_FILE=${STUB_LIB_FILE}
  
 -if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
 -    TCL_STUB_LIB_FLAG="-ltclstub${TCL_VERSION}\${TCL_DBGX}"
 -else
 -    TCL_STUB_LIB_FLAG="-ltclstub`echo ${TCL_VERSION} | tr -d .`\${TCL_DBGX}"
 -fi
 +TCL_STUB_LIB_FLAG="-ltclstub${TCL_TRIM_DOTS}\${TCL_DBGX}"
  
  TCL_BUILD_STUB_LIB_SPEC="-L`pwd` ${TCL_STUB_LIB_FLAG}"
  TCL_STUB_LIB_SPEC="-L${exec_prefix}/lib ${TCL_STUB_LIB_FLAG}"
diff --git a/lang/tcl83/pkg-descr b/lang/tcl83/pkg-descr
index 58797d179672..f120ad346ae5 100644
--- a/lang/tcl83/pkg-descr
+++ b/lang/tcl83/pkg-descr
@@ -1,8 +1,8 @@
-This is Tcl8.1, an embeddable tool command language.
+This is Tcl8.2, an embeddable tool command language.
 
 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.
 
 A full set of manual pages is also provided with this package.
 
 WWW: http://www.scriptics.com
diff --git a/lang/tcl84/Makefile b/lang/tcl84/Makefile
index af1da5d25ae0..5d9a4d0fde85 100644
--- a/lang/tcl84/Makefile
+++ b/lang/tcl84/Makefile
@@ -1,380 +1,381 @@
-# New ports collection makefile for:	tcl8.2.2
-# Version required:	8.2.2
+# New ports collection makefile for:	tcl8.2.3
+# Version required:	8.2.3
 # Date created:		19 August 1997
 # Whom:			jkh
 #
 # $FreeBSD$
 #
 
-DISTNAME=	tcl8.2.2
-PKGNAME=	tcl-8.2.2
+DISTNAME=	tcl8.2.3
+PKGNAME=	tcl-8.2.3
 CATEGORIES=	lang tcl82
 MASTER_SITES=	ftp://ftp.scriptics.com/pub/tcl/tcl8_2/
 
 MAINTAINER=	jseger@FreeBSD.org
 
 Y2K=            http://www.scriptics.com/Y2K.html
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/unix
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared
 CONFIGURE_ENV=  PORTSDIR=${PORTSDIR}
+MAKE_ENV=	SHORT_TCL_VER=82
 PKGINSTALL=     ${PKGDIR}/INSTALL.tclsh
 
 PLIST_SUB=	TCL_VER=8.2 SHORT_TCL_VER=82
 
 MAN1=	tclsh.1
 
 MAN3=	Access.3 AddErrInfo.3 Alloc.3 AllowExc.3 AppInit.3 AssocData.3 \
 	Async.3 BackgdErr.3 Backslash.3 BoolObj.3 ByteArrObj.3 CallDel.3 \
 	ChnlStack.3 CmdCmplt.3 Concat.3 CrtChannel.3 CrtChnlHdlr.3 \
 	CrtCloseHdlr.3 	CrtCommand.3 CrtFileHdlr.3 CrtInterp.3 CrtMathFnc.3 \
 	CrtObjCmd.3 CrtSlave.3 CrtTimerHdlr.3 CrtTrace.3 DString.3 \
 	DetachPids.3 DoOneEvent.3 DoWhenIdle.3 DoubleObj.3 Encoding.3 Eval.3 \
 	Exit.3 ExprLong.3 ExprLongObj.3 FindExec.3 GetCwd.3 GetIndex.3 \
 	GetInt.3 GetOpnFl.3 GetStdChan.3 GetVersion.3 Hash.3 IntObj.3 \
 	Interp.3 LinkVar.3 ListObj.3 Notifier.3 Object.3 ObjectType.3 \
 	OpenFileChnl.3 OpenTcp.3 ParseCmd.3 PkgRequire.3 Preserve.3 \
 	PrintDbl.3 RecEvalObj.3 RecordEval.3 RegExp.3 SaveResult.3 SetErrno.3 \
 	SetRecLmt.3 SetResult.3 SetVar.3 Sleep.3 SplitList.3 SplitPath.3 \
 	StaticPkg.3 StrMatch.3 StringObj.3 Tcl_InitStubs.3 Tcl_Main.3 \
 	TclInitStubs.3 Thread.3 ToUpper.3 TraceVar.3 Translate.3 UpVar.3 \
 	Utf.3 WrongNumArgs.3
 
 MANN=	Tcl.n after.n append.n array.n bgerror.n binary.n break.n case.n \
 	catch.n cd.n clock.n close.n concat.n continue.n dde.n encoding.n \
 	eof.n error.n eval.n exec.n exit.n expr.n fblocked.n fconfigure.n \
 	fcopy.n file.n fileevent.n filename.n flush.n for.n foreach.n \
 	format.n gets.n glob.n global.n history.n http.n if.n incr.n info.n \
 	interp.n join.n lappend.n library.n lindex.n linsert.n list.n \
 	llength.n load.n lrange.n lreplace.n lsearch.n lsort.n msgcat.n \
 	namespace.n open.n package.n pid.n pkgMkIndex.n proc.n puts.n pwd.n \
 	re_syntax.n read.n regexp.n registry.n regsub.n rename.n resource.n \
 	return.n safe.n scan.n seek.n set.n socket.n source.n split.n \
 	string.n subst.n switch.n tcltest.n tclvars.n tell.n time.n trace.n \
 	unknown.n unset.n update.n uplevel.n upvar.n variable.n vwait.n while.n
 
 # MLINKS generated via  awk '/ln/ {print "\t" $2,$3,"\\"}' unix/mkLinks
 MLINKS=	Access.3 Tcl_Access.3 \
 	Access.3 Tcl_Stat.3 \
 	AddErrInfo.3 Tcl_AddObjErrorInfo.3 \
 	AddErrInfo.3 Tcl_AddErrorInfo.3 \
 	AddErrInfo.3 Tcl_SetErrorCode.3 \
 	AddErrInfo.3 Tcl_PosixError.3 \
 	Alloc.3 Tcl_Alloc.3 \
 	Alloc.3 Tcl_Free.3 \
 	Alloc.3 Tcl_Realloc.3 \
 	AllowExc.3 Tcl_AllowExceptions.3 \
 	AppInit.3 Tcl_AppInit.3 \
 	AssocData.3 Tcl_GetAssocData.3 \
 	AssocData.3 Tcl_SetAssocData.3 \
 	AssocData.3 Tcl_DeleteAssocData.3 \
 	Async.3 Tcl_AsyncCreate.3 \
 	Async.3 Tcl_AsyncMark.3 \
 	Async.3 Tcl_AsyncInvoke.3 \
 	Async.3 Tcl_AsyncDelete.3 \
 	BackgdErr.3 Tcl_BackgroundError.3 \
 	Backslash.3 Tcl_Backslash.3 \
 	BoolObj.3 Tcl_NewBooleanObj.3 \
 	BoolObj.3 Tcl_SetBooleanObj.3 \
 	BoolObj.3 Tcl_GetBooleanFromObj.3 \
 	ByteArrObj.3 Tcl_NewByteArrayObj.3 \
 	ByteArrObj.3 Tcl_SetByteArrayObj.3 \
 	ByteArrObj.3 Tcl_GetByteArrayFromObj.3 \
 	ByteArrObj.3 Tcl_SetByteArrayLength.3 \
 	CallDel.3 Tcl_CallWhenDeleted.3 \
 	CallDel.3 Tcl_DontCallWhenDeleted.3 \
 	CmdCmplt.3 Tcl_CommandComplete.3 \
 	Concat.3 Tcl_Concat.3 \
 	CrtChannel.3 Tcl_CreateChannel.3 \
 	CrtChannel.3 Tcl_GetChannelInstanceData.3 \
 	CrtChannel.3 Tcl_GetChannelType.3 \
 	CrtChannel.3 Tcl_GetChannelName.3 \
 	CrtChannel.3 Tcl_GetChannelHandle.3 \
 	CrtChannel.3 Tcl_GetChannelMode.3 \
 	CrtChannel.3 Tcl_GetChannelBufferSize.3 \
 	CrtChannel.3 Tcl_SetDefaultTranslation.3 \
 	CrtChannel.3 Tcl_SetChannelBufferSize.3 \
 	CrtChannel.3 Tcl_NotifyChannel.3 \
 	CrtChannel.3 Tcl_BadChannelOption.3 \
 	CrtChnlHdlr.3 Tcl_CreateChannelHandler.3 \
 	CrtChnlHdlr.3 Tcl_DeleteChannelHandler.3 \
 	CrtCloseHdlr.3 Tcl_CreateCloseHandler.3 \
 	CrtCloseHdlr.3 Tcl_DeleteCloseHandler.3 \
 	CrtCommand.3 Tcl_CreateCommand.3 \
 	CrtFileHdlr.3 Tcl_CreateFileHandler.3 \
 	CrtFileHdlr.3 Tcl_DeleteFileHandler.3 \
 	CrtInterp.3 Tcl_CreateInterp.3 \
 	CrtInterp.3 Tcl_DeleteInterp.3 \
 	CrtInterp.3 Tcl_InterpDeleted.3 \
 	CrtMathFnc.3 Tcl_CreateMathFunc.3 \
 	CrtObjCmd.3 Tcl_CreateObjCommand.3 \
 	CrtObjCmd.3 Tcl_DeleteCommand.3 \
 	CrtObjCmd.3 Tcl_DeleteCommandFromToken.3 \
 	CrtObjCmd.3 Tcl_GetCommandInfo.3 \
 	CrtObjCmd.3 Tcl_SetCommandInfo.3 \
 	CrtObjCmd.3 Tcl_GetCommandName.3 \
 	CrtSlave.3 Tcl_IsSafe.3 \
 	CrtSlave.3 Tcl_MakeSafe.3 \
 	CrtSlave.3 Tcl_CreateSlave.3 \
 	CrtSlave.3 Tcl_GetSlave.3 \
 	CrtSlave.3 Tcl_GetMaster.3 \
 	CrtSlave.3 Tcl_GetInterpPath.3 \
 	CrtSlave.3 Tcl_CreateAlias.3 \
 	CrtSlave.3 Tcl_CreateAliasObj.3 \
 	CrtSlave.3 Tcl_GetAlias.3 \
 	CrtSlave.3 Tcl_GetAliasObj.3 \
 	CrtSlave.3 Tcl_ExposeCommand.3 \
 	CrtSlave.3 Tcl_HideCommand.3 \
 	CrtTimerHdlr.3 Tcl_CreateTimerHandler.3 \
 	CrtTimerHdlr.3 Tcl_DeleteTimerHandler.3 \
 	CrtTrace.3 Tcl_CreateTrace.3 \
 	CrtTrace.3 Tcl_DeleteTrace.3 \
 	DString.3 Tcl_DStringInit.3 \
 	DString.3 Tcl_DStringAppend.3 \
 	DString.3 Tcl_DStringAppendElement.3 \
 	DString.3 Tcl_DStringStartSublist.3 \
 	DString.3 Tcl_DStringEndSublist.3 \
 	DString.3 Tcl_DStringLength.3 \
 	DString.3 Tcl_DStringValue.3 \
 	DString.3 Tcl_DStringSetLength.3 \
 	DString.3 Tcl_DStringFree.3 \
 	DString.3 Tcl_DStringResult.3 \
 	DString.3 Tcl_DStringGetResult.3 \
 	DetachPids.3 Tcl_DetachPids.3 \
 	DetachPids.3 Tcl_ReapDetachedProcs.3 \
 	DoOneEvent.3 Tcl_DoOneEvent.3 \
 	DoWhenIdle.3 Tcl_DoWhenIdle.3 \
 	DoWhenIdle.3 Tcl_CancelIdleCall.3 \
 	DoubleObj.3 Tcl_NewDoubleObj.3 \
 	DoubleObj.3 Tcl_SetDoubleObj.3 \
 	DoubleObj.3 Tcl_GetDoubleFromObj.3 \
 	Encoding.3 Tcl_GetEncoding.3 \
 	Encoding.3 Tcl_FreeEncoding.3 \
 	Encoding.3 Tcl_ExternalToUtfDString.3 \
 	Encoding.3 Tcl_ExternalToUtf.3 \
 	Encoding.3 Tcl_UtfToExternalDString.3 \
 	Encoding.3 Tcl_UtfToExternal.3 \
 	Encoding.3 Tcl_GetEncodingName.3 \
 	Encoding.3 Tcl_SetSystemEncoding.3 \
 	Encoding.3 Tcl_GetEncodingNames.3 \
 	Encoding.3 Tcl_CreateEncoding.3 \
 	Eval.3 Tcl_EvalObj.3 \
 	Eval.3 Tcl_EvalFile.3 \
 	Eval.3 Tcl_EvalObjv.3 \
 	Eval.3 Tcl_Eval.3 \
 	Eval.3 Tcl_Eval2.3 \
 	Eval.3 Tcl_GlobalEval.3 \
 	Eval.3 Tcl_VarEval.3 \
 	Exit.3 Tcl_Exit.3 \
 	Exit.3 Tcl_Finalize.3 \
 	Exit.3 Tcl_FinalizeThread.3 \
 	Exit.3 Tcl_CreateExitHandler.3 \
 	Exit.3 Tcl_DeleteExitHandler.3 \
 	Exit.3 Tcl_CreateThreadExitHandler.3 \
 	Exit.3 Tcl_DeleteThreadExitHandler.3 \
 	ExprLong.3 Tcl_ExprLong.3 \
 	ExprLong.3 Tcl_ExprDouble.3 \
 	ExprLong.3 Tcl_ExprBoolean.3 \
 	ExprLong.3 Tcl_ExprString.3 \
 	ExprLongObj.3 Tcl_ExprLongObj.3 \
 	ExprLongObj.3 Tcl_ExprDoubleObj.3 \
 	ExprLongObj.3 Tcl_ExprBooleanObj.3 \
 	ExprLongObj.3 Tcl_ExprObj.3 \
 	FindExec.3 Tcl_FindExecutable.3 \
 	FindExec.3 Tcl_GetNameOfExecutable.3 \
 	GetCwd.3 Tcl_GetCwd.3 \
 	GetCwd.3 Tcl_Chdir.3 \
 	GetIndex.3 Tcl_GetIndexFromObj.3 \
 	GetInt.3 Tcl_GetInt.3 \
 	GetInt.3 Tcl_GetDouble.3 \
 	GetInt.3 Tcl_GetBoolean.3 \
 	GetOpnFl.3 Tcl_GetOpenFile.3 \
 	GetStdChan.3 Tcl_GetStdChannel.3 \
 	GetStdChan.3 Tcl_SetStdChannel.3 \
 	GetVersion.3 Tcl_GetVersion.3 \
 	Hash.3 Tcl_InitHashTable.3 \
 	Hash.3 Tcl_DeleteHashTable.3 \
 	Hash.3 Tcl_CreateHashEntry.3 \
 	Hash.3 Tcl_DeleteHashEntry.3 \
 	Hash.3 Tcl_FindHashEntry.3 \
 	Hash.3 Tcl_GetHashValue.3 \
 	Hash.3 Tcl_SetHashValue.3 \
 	Hash.3 Tcl_GetHashKey.3 \
 	Hash.3 Tcl_FirstHashEntry.3 \
 	Hash.3 Tcl_NextHashEntry.3 \
 	Hash.3 Tcl_HashStats.3 \
 	IntObj.3 Tcl_NewIntObj.3 \
 	IntObj.3 Tcl_NewLongObj.3 \
 	IntObj.3 Tcl_SetIntObj.3 \
 	IntObj.3 Tcl_SetLongObj.3 \
 	IntObj.3 Tcl_GetIntFromObj.3 \
 	IntObj.3 Tcl_GetLongFromObj.3 \
 	Interp.3 Tcl_Interp.3 \
 	LinkVar.3 Tcl_LinkVar.3 \
 	LinkVar.3 Tcl_UnlinkVar.3 \
 	LinkVar.3 Tcl_UpdateLinkedVar.3 \
 	ListObj.3 Tcl_ListObjAppendList.3 \
 	ListObj.3 Tcl_ListObjAppendElement.3 \
 	ListObj.3 Tcl_NewListObj.3 \
 	ListObj.3 Tcl_SetListObj.3 \
 	ListObj.3 Tcl_ListObjGetElements.3 \
 	ListObj.3 Tcl_ListObjLength.3 \
 	ListObj.3 Tcl_ListObjIndex.3 \
 	ListObj.3 Tcl_ListObjReplace.3 \
 	Notifier.3 Tcl_CreateEventSource.3 \
 	Notifier.3 Tcl_DeleteEventSource.3 \
 	Notifier.3 Tcl_SetMaxBlockTime.3 \
 	Notifier.3 Tcl_QueueEvent.3 \
 	Notifier.3 Tcl_DeleteEvents.3 \
 	Notifier.3 Tcl_WaitForEvent.3 \
 	Notifier.3 Tcl_SetTimer.3 \
 	Notifier.3 Tcl_ServiceAll.3 \
 	Notifier.3 Tcl_ServiceEvent.3 \
 	Notifier.3 Tcl_GetServiceMode.3 \
 	Notifier.3 Tcl_SetServiceMode.3 \
 	Object.3 Tcl_NewObj.3 \
 	Object.3 Tcl_DuplicateObj.3 \
 	Object.3 Tcl_IncrRefCount.3 \
 	Object.3 Tcl_DecrRefCount.3 \
 	Object.3 Tcl_IsShared.3 \
 	ObjectType.3 Tcl_RegisterObjType.3 \
 	ObjectType.3 Tcl_GetObjType.3 \
 	ObjectType.3 Tcl_AppendAllObjTypes.3 \
 	ObjectType.3 Tcl_ConvertToType.3 \
 	OpenFileChnl.3 Tcl_OpenFileChannel.3 \
 	OpenFileChnl.3 Tcl_OpenCommandChannel.3 \
 	OpenFileChnl.3 Tcl_MakeFileChannel.3 \
 	OpenFileChnl.3 Tcl_GetChannel.3 \
 	OpenFileChnl.3 Tcl_RegisterChannel.3 \
 	OpenFileChnl.3 Tcl_UnregisterChannel.3 \
 	OpenFileChnl.3 Tcl_Close.3 \
 	OpenFileChnl.3 Tcl_ReadChars.3 \
 	OpenFileChnl.3 Tcl_Read.3 \
 	OpenFileChnl.3 Tcl_GetsObj.3 \
 	OpenFileChnl.3 Tcl_Gets.3 \
 	OpenFileChnl.3 Tcl_WriteObj.3 \
 	OpenFileChnl.3 Tcl_WriteChars.3 \
 	OpenFileChnl.3 Tcl_Write.3 \
 	OpenFileChnl.3 Tcl_Flush.3 \
 	OpenFileChnl.3 Tcl_Seek.3 \
 	OpenFileChnl.3 Tcl_Tell.3 \
 	OpenFileChnl.3 Tcl_GetChannelOption.3 \
 	OpenFileChnl.3 Tcl_SetChannelOption.3 \
 	OpenFileChnl.3 Tcl_Eof.3 \
 	OpenFileChnl.3 Tcl_InputBlocked.3 \
 	OpenFileChnl.3 Tcl_InputBuffered.3 \
 	OpenTcp.3 Tcl_OpenTcpClient.3 \
 	OpenTcp.3 Tcl_MakeTcpClientChannel.3 \
 	OpenTcp.3 Tcl_OpenTcpServer.3 \
 	ParseCmd.3 Tcl_ParseCommand.3 \
 	ParseCmd.3 Tcl_ParseExpr.3 \
 	ParseCmd.3 Tcl_ParseBraces.3 \
 	ParseCmd.3 Tcl_ParseQuotedString.3 \
 	ParseCmd.3 Tcl_ParseVarName.3 \
 	ParseCmd.3 Tcl_FreeParse.3 \
 	ParseCmd.3 Tcl_EvalTokens.3 \
 	PkgRequire.3 Tcl_PkgRequire.3 \
 	PkgRequire.3 Tcl_PkgProvide.3 \
 	Preserve.3 Tcl_Preserve.3 \
 	Preserve.3 Tcl_Release.3 \
 	Preserve.3 Tcl_EventuallyFree.3 \
 	PrintDbl.3 Tcl_PrintDouble.3 \
 	RecEvalObj.3 Tcl_RecordAndEvalObj.3 \
 	RecordEval.3 Tcl_RecordAndEval.3 \
 	RegExp.3 Tcl_RegExpMatch.3 \
 	RegExp.3 Tcl_RegExpCompile.3 \
 	RegExp.3 Tcl_RegExpExec.3 \
 	RegExp.3 Tcl_RegExpRange.3 \
 	SaveResult.3 Tcl_SaveResult.3 \
 	SaveResult.3 Tcl_RestoreResult.3 \
 	SaveResult.3 Tcl_DiscardResult.3 \
 	SetErrno.3 Tcl_SetErrno.3 \
 	SetErrno.3 Tcl_GetErrno.3 \
 	SetRecLmt.3 Tcl_SetRecursionLimit.3 \
 	SetResult.3 Tcl_SetObjResult.3 \
 	SetResult.3 Tcl_GetObjResult.3 \
 	SetResult.3 Tcl_SetResult.3 \
 	SetResult.3 Tcl_GetStringResult.3 \
 	SetResult.3 Tcl_AppendResult.3 \
 	SetResult.3 Tcl_AppendElement.3 \
 	SetResult.3 Tcl_ResetResult.3 \
 	SetVar.3 Tcl_SetObjVar2.3 \
 	SetVar.3 Tcl_SetVar.3 \
 	SetVar.3 Tcl_SetVar2.3 \
 	SetVar.3 Tcl_GetObjVar2.3 \
 	SetVar.3 Tcl_GetVar.3 \
 	SetVar.3 Tcl_GetVar2.3 \
 	SetVar.3 Tcl_UnsetVar.3 \
 	SetVar.3 Tcl_UnsetVar2.3 \
 	Sleep.3 Tcl_Sleep.3 \
 	SplitList.3 Tcl_SplitList.3 \
 	SplitList.3 Tcl_Merge.3 \
 	SplitList.3 Tcl_ScanElement.3 \
 	SplitList.3 Tcl_ConvertElement.3 \
 	SplitPath.3 Tcl_SplitPath.3 \
 	SplitPath.3 Tcl_JoinPath.3 \
 	SplitPath.3 Tcl_GetPathType.3 \
 	StaticPkg.3 Tcl_StaticPackage.3 \
 	StrMatch.3 Tcl_StringMatch.3 \
 	StringObj.3 Tcl_NewStringObj.3 \
 	StringObj.3 Tcl_SetStringObj.3 \
 	StringObj.3 Tcl_GetStringFromObj.3 \
 	StringObj.3 Tcl_GetString.3 \
 	StringObj.3 Tcl_AppendToObj.3 \
 	StringObj.3 Tcl_AppendStringsToObj.3 \
 	StringObj.3 Tcl_AppendObjToObj.3 \
 	StringObj.3 Tcl_SetObjLength.3 \
 	StringObj.3 Tcl_ConcatObj.3 \
 	Thread.3 Tcl_ConditionNotify.3 \
 	Thread.3 Tcl_ConditionWait.3 \
 	Thread.3 Tcl_GetThreadData.3 \
 	Thread.3 Tcl_MutexLock.3 \
 	Thread.3 Tcl_MutexUnlock.3 \
 	ToUpper.3 Tcl_UniCharToUpper.3 \
 	ToUpper.3 Tcl_UniCharToLower.3 \
 	ToUpper.3 Tcl_UniCharToTitle.3 \
 	ToUpper.3 Tcl_UtfToUpper.3 \
 	ToUpper.3 Tcl_UtfToLower.3 \
 	ToUpper.3 Tcl_UtfToTitle.3 \
 	TraceVar.3 Tcl_TraceVar.3 \
 	TraceVar.3 Tcl_TraceVar2.3 \
 	TraceVar.3 Tcl_UntraceVar.3 \
 	TraceVar.3 Tcl_UntraceVar2.3 \
 	TraceVar.3 Tcl_VarTraceInfo.3 \
 	TraceVar.3 Tcl_VarTraceInfo2.3 \
 	Translate.3 Tcl_TranslateFileName.3 \
 	UpVar.3 Tcl_UpVar.3 \
 	UpVar.3 Tcl_UpVar2.3 \
 	Utf.3 Tcl_UniChar.3 \
 	Utf.3 Tcl_UniCharToUtf.3 \
 	Utf.3 Tcl_UtfToUniChar.3 \
 	Utf.3 Tcl_UtfCharComplete.3 \
 	Utf.3 Tcl_NumUtfChars.3 \
 	Utf.3 Tcl_UtfFindFirst.3 \
 	Utf.3 Tcl_UtfFindLast.3 \
 	Utf.3 Tcl_UtfNext.3 \
 	Utf.3 Tcl_UtfPrev.3 \
 	Utf.3 Tcl_UniCharAtIndex.3 \
 	Utf.3 Tcl_UtfAtIndex.3 \
 	Utf.3 Tcl_UtfBackslash.3 \
 	WrongNumArgs.3 Tcl_WrongNumArgs.3 \
 	http.n Http.n \
 	pkgMkIndex.n pkg_mkIndex.n \
 	safe.n Safe\Base.n
 
 .include <bsd.port.pre.mk>
 
 post-extract:
 	${MV} ${WRKDIR}/${DISTNAME}/doc/InitStubs.3 \
 	      ${WRKDIR}/${DISTNAME}/doc/Tcl_InitStubs.3
 post-install:
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 .if exists(${PKGINSTALL})
 	${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL}
 .endif
 
 test:
 	cd ${WRKSRC} && ${MAKE} test
 
 .include <bsd.port.post.mk>
diff --git a/lang/tcl84/distinfo b/lang/tcl84/distinfo
index 0becb14a2b05..014a57b04b7a 100644
--- a/lang/tcl84/distinfo
+++ b/lang/tcl84/distinfo
@@ -1 +1 @@
-MD5 (tcl8.2.2.tar.gz) = 4b16a1d5f91ae5744d17385a7bf13820
+MD5 (tcl8.2.3.tar.gz) = 8d06f4837e8e93edbe78f5ceaaa16ab4
diff --git a/lang/tcl84/files/patch-aa b/lang/tcl84/files/patch-aa
index 347b053cfc41..07db0c35ca9e 100644
--- a/lang/tcl84/files/patch-aa
+++ b/lang/tcl84/files/patch-aa
@@ -1,153 +1,153 @@
 --- Makefile.in.orig	Wed Nov  3 21:37:24 1999
 +++ Makefile.in	Sun Nov 21 15:31:00 1999
 @@ -48,7 +48,9 @@
  SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TCL_LIBRARY)
  
  # Directory in which to install the include file tcl.h:
 -INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include
 +INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include/tcl$(VERSION)
-+GENERIC_INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(PREFIX)/include/tcl$(VERSION)/generic
-+UNIX_INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(PREFIX)/include/tcl$(VERSION)/unix
++GENERIC_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/generic
++UNIX_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/unix
  
  # Top-level directory in which to install manual entries:
  MAN_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/man
 @@ -82,7 +84,7 @@
  #CFLAGS = 		$(CFLAGS_DEBUG)
  #CFLAGS = 		$(CFLAGS_OPTIMIZE)
  #CFLAGS = 		$(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE)
 -CFLAGS = 		@CFLAGS@
 +CFLAGS? = 		@CFLAGS@
  
  # To disable ANSI-C procedure prototypes reverse the comment characters
  # on the following lines:
 @@ -156,7 +158,7 @@
  # "install" around;  better to use the install-sh script that comes
  # with the distribution, which is slower but guaranteed to work.
  
 -INSTALL =		@srcdir@/install-sh -c
 +INSTALL =		install -c
  INSTALL_PROGRAM =	${INSTALL}
  INSTALL_DATA =		${INSTALL} -m 644
  
 @@ -383,7 +385,7 @@
  
  all: binaries libraries doc
  
 -binaries: ${TCL_LIB_FILE} $(TCL_STUB_LIB_FILE) $(TCL_BUILD_EXP_FILE) tclsh
-+binaries: ${TCL_LIB_FILE} $(TCL_STUB_LIB_FILE) $(TCL_BUILD_EXP_FILE) libtcl82.a tclsh
++binaries: ${TCL_LIB_FILE} $(TCL_STUB_LIB_FILE) $(TCL_BUILD_EXP_FILE) libtcl${SHORT_TCL_VER}.a tclsh
  
  libraries:
  
 @@ -394,8 +396,14 @@
  ${TCL_LIB_FILE}: ${OBJS} ${STUB_LIB_FILE}
  	rm -f ${TCL_LIB_FILE}
  	@MAKE_LIB@
-+	ln -sf ${TCL_LIB_FILE} libtcl82.so
++	ln -sf ${TCL_LIB_FILE} libtcl${SHORT_TCL_VER}.so
  	$(RANLIB) ${TCL_LIB_FILE}
  
-+libtcl82.a: ${OBJS}
-+	rm -f libtcl82.a
-+	ar cr libtcl82.a ${OBJS}
-+	$(RANLIB) libtcl82.a
++libtcl${SHORT_TCL_VER}.a: ${OBJS}
++	rm -f libtcl${SHORT_TCL_VER}.a
++	ar cr libtcl${SHORT_TCL_VER}.a ${OBJS}
++	$(RANLIB) libtcl${SHORT_TCL_VER}.a
 +
  ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
  	rm -f ${STUB_LIB_FILE}
  	@MAKE_STUB_LIB@
 @@ -504,8 +512,13 @@
  	@echo "Installing $(TCL_LIB_FILE)"
  	chmod +x $(SRC_DIR)/install-sh
  	@$(INSTALL_DATA) $(TCL_LIB_FILE) $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE)
-+	@ln -sf $(TCL_LIB_FILE) $(LIB_INSTALL_DIR)/libtcl82.so
++	@ln -sf $(TCL_LIB_FILE) $(LIB_INSTALL_DIR)/libtcl${SHORT_TCL_VER}.so
  	@(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TCL_LIB_FILE))
  	@chmod 555 $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE)
-+	@echo "Installing libtcl82.a"
-+	@$(INSTALL_DATA) libtcl82.a $(LIB_INSTALL_DIR)/libtcl82.a
-+	@(cd $(LIB_INSTALL_DIR); $(RANLIB) libtcl82.a)
-+	@chmod 555 $(LIB_INSTALL_DIR)/libtcl82.a
++	@echo "Installing libtcl${SHORT_TCL_VER}.a"
++	@$(INSTALL_DATA) libtcl${SHORT_TCL_VER}.a $(LIB_INSTALL_DIR)/libtcl${SHORT_TCL_VER}.a
++	@(cd $(LIB_INSTALL_DIR); $(RANLIB) libtcl${SHORT_TCL_VER}.a)
++	@chmod 555 $(LIB_INSTALL_DIR)/libtcl${SHORT_TCL_VER}.a
  	@if test "$(TCL_BUILD_EXP_FILE)" != ""; then \
  	    echo "Installing $(TCL_EXP_FILE)"; \
  	    $(INSTALL_DATA) $(TCL_BUILD_EXP_FILE) \
 @@ -514,7 +527,8 @@
  	@echo "Installing tclsh"
  	@$(INSTALL_PROGRAM) tclsh $(BIN_INSTALL_DIR)/tclsh$(VERSION)
  	@echo "Installing tclConfig.sh"
 -	@$(INSTALL_DATA) tclConfig.sh $(LIB_INSTALL_DIR)/tclConfig.sh
 +	@mkdir -p $(SCRIPT_INSTALL_DIR)
 +	@$(INSTALL_DATA) tclConfig.sh $(SCRIPT_INSTALL_DIR)/tclConfig.sh
  	@if test "$(TCL_STUB_LIB_FILE)" != "" ; then \
  	    echo "Installing $(TCL_STUB_LIB_FILE)"; \
  	    $(INSTALL_DATA) $(STUB_LIB_FILE) \
 @@ -522,8 +536,8 @@
  	    fi
  
  install-libraries: libraries
 -	@for i in $(INSTALL_ROOT)$(prefix)/lib $(INCLUDE_INSTALL_DIR) \
 -		$(SCRIPT_INSTALL_DIR); \
 +	@for i in $(INSTALL_ROOT)$(prefix)/lib $(GENERIC_INCLUDE_INSTALL_DIR) \
 +		$(UNIX_INCLUDE_INSTALL_DIR) $(SCRIPT_INSTALL_DIR); \
  	    do \
  	    if [ ! -d $$i ] ; then \
  		echo "Making directory $$i"; \
 @@ -542,11 +556,20 @@
  		fi; \
  	    done;
  	chmod +x $(SRC_DIR)/install-sh
 -	@for i in $(GENERIC_DIR)/tcl.h $(GENERIC_DIR)/tclDecls.h ; \
 +	@echo "Installing libraries, tcl.h and other headers"
 +	@for i in $(GENERIC_DIR)/*.h ; \
  	    do \
  	    echo "Installing $$i"; \
 -	    $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR); \
 +	    $(INSTALL_DATA) $$i $(GENERIC_INCLUDE_INSTALL_DIR); \
  	    done;
 +	@for i in $(UNIX_DIR)/*.h ; \
 +	    do \
 +	    echo "Installing $$i"; \
 +	    $(INSTALL_DATA) $$i $(UNIX_INCLUDE_INSTALL_DIR); \
 +	    done;
 +	@ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tcl.h $(INCLUDE_INSTALL_DIR)/tcl.h
 +	@ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tclDecls.h $(INCLUDE_INSTALL_DIR)/tclDecls.h
 +
  	@for i in $(TOP_DIR)/library/*.tcl $(TOP_DIR)/library/tclIndex $(UNIX_DIR)/tclAppInit.c $(UNIX_DIR)/ldAix; \
  	    do \
  	    echo "Installing $$i"; \
 @@ -579,21 +602,19 @@
  	@cd $(TOP_DIR)/doc; for i in *.1; \
  	    do \
  	    echo "Installing doc/$$i"; \
 -	    rm -f $(MAN1_INSTALL_DIR)/$$i; \
 +	    rm -f $(MAN1_INSTALL_DIR)/$$i ; \
  	    sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \
  		    $$i > $(MAN1_INSTALL_DIR)/$$i; \
  	    chmod 444 $(MAN1_INSTALL_DIR)/$$i; \
  	    done;
 -	$(UNIX_DIR)/mkLinks $(MAN1_INSTALL_DIR)
  	@cd $(TOP_DIR)/doc; for i in *.3; \
  	    do \
  	    echo "Installing doc/$$i"; \
 -	    rm -f $(MAN3_INSTALL_DIR)/$$i; \
 +	    rm -f $(MAN3_INSTALL_DIR)/$$i ; \
  	    sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \
  		    $$i > $(MAN3_INSTALL_DIR)/$$i; \
  	    chmod 444 $(MAN3_INSTALL_DIR)/$$i; \
  	    done;
 -	$(UNIX_DIR)/mkLinks $(MAN3_INSTALL_DIR)
  	@cd $(TOP_DIR)/doc; for i in *.n; \
  	    do \
  	    echo "Installing doc/$$i"; \
 @@ -602,7 +623,14 @@
  		    $$i > $(MANN_INSTALL_DIR)/$$i; \
  	    chmod 444 $(MANN_INSTALL_DIR)/$$i; \
  	    done;
 -	$(UNIX_DIR)/mkLinks $(MANN_INSTALL_DIR)
 +	@echo "**********"
 +	@echo "IMPORTANT:"
 +	@echo "**********"
 +	@echo "tclConfig.sh in $(SCRIPT_INSTALL_DIR)/tclConfig.sh"
 +	@echo "tcl.h        in $(INCLUDE_INSTALL_DIR)/tcl.h"
 +	@echo "tclDecls.h   in $(INCLUDE_INSTALL_DIR)/tclDecls.h"
 +	@echo "There are NOT default place, but good place to avoid"
 +	@echo "conflicting with another version of Tcl/Tks."
  
  Makefile: $(UNIX_DIR)/Makefile.in
  	$(SHELL) config.status
diff --git a/lang/tcl84/files/patch-ab b/lang/tcl84/files/patch-ab
index 6cda56a21351..85ee6265de11 100644
--- a/lang/tcl84/files/patch-ab
+++ b/lang/tcl84/files/patch-ab
@@ -1,98 +1,97 @@
---- configure.orig	Wed Nov  3 21:37:24 1999
-+++ configure	Sun Nov 21 15:34:05 1999
+--- configure.orig	Tue Dec 14 22:59:18 1999
++++ configure	Wed Jan  5 00:56:06 2000
 @@ -4648,7 +4648,7 @@
      EXTRA_CFLAGS=""
      TCL_EXPORT_FILE_SUFFIX=""
      UNSHARED_LIB_SUFFIX=""
 -    TCL_TRIM_DOTS='`echo ${VERSION} | tr -d .`'
-+    TCL_TRIM_DOTS=82
++    TCL_TRIM_DOTS=`echo ${VERSION} | tr -d .`
      ECHO_VERSION='`echo ${VERSION}`'
      TCL_LIB_VERSIONS_OK=ok
      CFLAGS_DEBUG=-g
 @@ -4892,7 +4892,7 @@
  	    LDFLAGS="-Wl,-Bexport"
  	    LD_SEARCH_FLAGS=""
  	    ;;
 -	NetBSD-*|FreeBSD-[1-2].*|OpenBSD-*)
 +	NetBSD-*|FreeBSD-*|OpenBSD-*)
  	    # Not available on all versions:  check for include file.
  	    ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6
-@@ -4922,16 +4922,21 @@
+@@ -4922,16 +4922,20 @@
  fi
  if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
    echo "$ac_t""yes" 1>&6
 -  
  		SHLIB_CFLAGS="-fpic"
 -		SHLIB_LD="ld -Bshareable -x"
  		SHLIB_LD_LIBS=""
  		SHLIB_SUFFIX=".so"
  		DL_OBJS="tclLoadDl.o"
  		DL_LIBS=""
  		LDFLAGS=""
  		LD_SEARCH_FLAGS=""
 -		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0'
 +	if eval "test \"`echo ${PORTOBJFORMAT}`\" = elf" ; then
-+		echo "SHARED_LIB_SUFFIX JSEGER"
 +		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1'
 +		SHLIB_LD="ld -shared -x -soname \$@"
 +	else
 +		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1.0'
 +		SHLIB_LD="ld -Bshareable -x"
 +	fi
  	    
  else
    echo "$ac_t""no" 1>&6
-@@ -4954,17 +4959,6 @@
+@@ -4954,17 +4958,6 @@
  	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
  	    TCL_LIB_VERSIONS_OK=nodots
  	    ;;
 -	FreeBSD-*)
 -	    # FreeBSD 3.* and greater have ELF.
 -	    SHLIB_CFLAGS="-fpic"
 -	    SHLIB_LD="ld -Bshareable -x"
 -	    SHLIB_LD_LIBS=""
 -	    SHLIB_SUFFIX=".so"
 -	    DL_OBJS="tclLoadDl.o"
 -	    DL_LIBS=""
 -	    LDFLAGS=""
 -	    LD_SEARCH_FLAGS=""
 -	    ;;
  	NEXTSTEP-*)
  	    SHLIB_CFLAGS=""
  	    SHLIB_LD="cc -nostdlib -r"
-@@ -5371,7 +5365,7 @@
+@@ -5371,7 +5364,7 @@
  	SHARED_LIB_SUFFIX='${VERSION}\$\{DBGX\}${SHLIB_SUFFIX}'
      fi
      if test "$UNSHARED_LIB_SUFFIX" = "" ; then
 -	UNSHARED_LIB_SUFFIX='${VERSION}\$\{DBGX\}.a'
 +	UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
      fi
  
      
-@@ -5628,11 +5622,7 @@
+@@ -5628,11 +5621,7 @@
  # up the Tcl library.
  
  if test "$SHARED_BUILD" = "0" -o $TCL_NEEDS_EXP_FILE = 0; then
 -    if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
 -        TCL_LIB_FLAG="-ltcl${TCL_VERSION}\${TCL_DBGX}"
 -    else
 -        TCL_LIB_FLAG="-ltcl`echo ${TCL_VERSION} | tr -d .`\${TCL_DBGX}"
 -    fi
 +    TCL_LIB_FLAG="-ltcl${TCL_TRIM_DOTS}\${TCL_DBGX}"
      TCL_BUILD_LIB_SPEC="-L`pwd` ${TCL_LIB_FLAG}"
      TCL_LIB_SPEC="-L${exec_prefix}/lib ${TCL_LIB_FLAG}"
  else
-@@ -5678,11 +5668,7 @@
+@@ -5678,11 +5667,7 @@
  
  TCL_STUB_LIB_FILE=${STUB_LIB_FILE}
  
 -if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
 -    TCL_STUB_LIB_FLAG="-ltclstub${TCL_VERSION}\${TCL_DBGX}"
 -else
 -    TCL_STUB_LIB_FLAG="-ltclstub`echo ${TCL_VERSION} | tr -d .`\${TCL_DBGX}"
 -fi
 +TCL_STUB_LIB_FLAG="-ltclstub${TCL_TRIM_DOTS}\${TCL_DBGX}"
  
  TCL_BUILD_STUB_LIB_SPEC="-L`pwd` ${TCL_STUB_LIB_FLAG}"
  TCL_STUB_LIB_SPEC="-L${exec_prefix}/lib ${TCL_STUB_LIB_FLAG}"
diff --git a/lang/tcl84/pkg-descr b/lang/tcl84/pkg-descr
index 58797d179672..f120ad346ae5 100644
--- a/lang/tcl84/pkg-descr
+++ b/lang/tcl84/pkg-descr
@@ -1,8 +1,8 @@
-This is Tcl8.1, an embeddable tool command language.
+This is Tcl8.2, an embeddable tool command language.
 
 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.
 
 A full set of manual pages is also provided with this package.
 
 WWW: http://www.scriptics.com