- Update lang/tcl86 and x11-toolkits/tk86 to 8.6.0

  Release notes: http://www.tcl.tk/software/tcltk/8.6.html

- Get rid of -thread slaves ports: threads are now enabled by
  default and can be OPTIONally disabled. This applies to:
  * lang/tcl84
  * lang/tcl85
  * lang/tcl86
  * x11-toolkits/tk84
  * x11-toolkits/tk85
  * x11-toolkits/tk86

- Get rid of tcl-modules slave port: modules are now installed by default and
  can be OPTIONally disabled. This applies to:
  * lang/tcl85
  * lang/tcl86

- Fix conflicts between man pages of different Tcl/Tk versions, by adding a
  suffix (tcl84, tcl85, tcl86, tk84, tk85, and tk86).

Reviewed by:	bf, crees
Approved by:	bapt (portmgr, after partial exp-run)

5 files changed, 71 insertions, 812 deletions

diff --git a/lang/tcl85/Makefile b/lang/tcl85/Makefile
index 637b853fa480..a5895e15b2ec 100644
--- a/lang/tcl85/Makefile
+++ b/lang/tcl85/Makefile
@@ -1,778 +1,85 @@
 # Created by: Martin Matuska <mm@FreeBSD.org>
 # $FreeBSD$
 
-PORTNAME?=	tcl
+PORTNAME=	tcl
 PORTVERSION=	8.5.13
 CATEGORIES=	lang
 MASTER_SITES=	SF/tcl/Tcl/${PORTVERSION}
-PKGNAMESUFFIX?=		${THREADS_SUFFIX}${PKGNAMESUFFIX2}
 DISTNAME=	tcl${PORTVERSION}-src
 
 MAINTAINER=	tcltk@FreeBSD.org
-COMMENT?=	Tool Command Language
+COMMENT=	Tool Command Language
 
 LICENSE=	BSD
 
-LATEST_LINK?=	tcl85
-PATCH_DIST_ARGS=	-d ${WRKDIR}/${DISTNAME} -E ${PATCH_DIST_STRIP}
+OPTIONS_DEFINE=	TCLMAN TZDATA MODULES THREADS
+OPTIONS_DEFAULT=MODULES THREADS
+TCLMAN_DESC=	Install Tcl function manpages
+TZDATA_DESC=	Install Tcl timezone data
+MODULES_DESC=	Install Tcl common modules
+
 WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//}/unix
 ALL_TARGET=	all
+INSTALL_TARGET=	install install-libraries
+
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-shared --without-tzdata --includedir=${PREFIX}/include/tcl${TCL_VER}
+CONFIGURE_ARGS=	--enable-shared \
+		--enable-man-suffix=.${MAN_SUFFIX} \
+		--includedir=${PREFIX}/include/tcl${TCL_VER}
 CONFIGURE_ENV=	PORTSDIR=${PORTSDIR}
+
 TCL_VER=	8.5
 SHORT_TCL_VER=	${TCL_VER:S/8./8/}
-MAKE_ENV=	SHORT_TCL_VER=${SHORT_TCL_VER} LANG=C LC_ALL=C	# LANG=C is required for some of UTF-using tests
-NOPRECIOUSMAKEVARS=	Too many _MLINKS for README.html
-PLIST_SUB=	TCL_VER=${TCL_VER} SHORT_TCL_VER=${SHORT_TCL_VER}
-EXTRACT_AFTER_ARGS=|${TAR} -xpf - --exclude compat/
+LATEST_LINK=	${PORTNAME}${SHORT_TCL_VER}
+MAN_SUFFIX=	${LATEST_LINK}
 
-.if !defined(BUILDING_TCL_THREADS) && !defined(BUILDING_TCL_TM)
-OPTIONS_DEFINE=	TCL85_MAN TZDATA TCL_MODULES
-OPTIONS_DEFAULT=TCL_MODULES
-TCL85_MAN_DESC=Install tcl 8.5 function manpages
-TZDATA_DESC=Install tcl timezone data
-TCL_MODULES_DESC=Install tcl common modules
-.elif defined(BUILDING_TCL_THREADS)
-USE_TCL=	${SHORT_TCL_VER}
-PLIST=		${PKGDIR}/pkg-plist.threads
-THREADS_SUFFIX=		-threads
-LATEST_LINK=	tcl85${THREADS_SUFFIX}
-.elif defined(BUILDING_TCL_TM)
-LATEST_LINK=	tcl-modules
-NO_BUILD=	yes
-INSTALL_TARGET=	install-tm
-PLIST=		${PKGDIR}/pkg-plist.tm
-.endif
+MAKE_ENV=	SHORT_TCL_VER=${SHORT_TCL_VER} \
+		MAN_SUFFIX=.${MAN_SUFFIX} \
+		LANG=C LC_ALL=C	# LANG=C is required for some of UTF-using tests
 
-.include <bsd.port.pre.mk>
+PLIST_SUB=	TCL_VER=${TCL_VER} \
+		SHORT_TCL_VER=${SHORT_TCL_VER}
 
-.if !defined(BUILDING_TCL_TM)
+.include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MTCL_MODULES}
-RUN_DEPENDS+=	${LOCALBASE}/lib/tcl8/8.5/tcltest-2.3.4.tm:${PORTSDIR}/lang/tcl-modules
+.if ${PORT_OPTIONS:MTCLMAN}
+INSTALL_TARGET+=install-doc
+.include "${.CURDIR}/Makefile.man"
 .endif
 
-DATADIR=	${PREFIX}/share/${PORTNAME}${TCL_VER}
-
-.if ${PORT_OPTIONS:MTZDATA}
-PLIST_SUB+=		TZDATA=""
+.if ${PORT_OPTIONS:MTHREADS}
+CONFIGURE_ARGS+=	--enable-threads
 .else
-PLIST_SUB+=		TZDATA="@comment "
+CONFIGURE_ARGS+=	--disable-threads
 .endif
 
-MAN1=	tclsh${TCL_VER}${THREADS_SUFFIX}.1
-
-.if defined(BUILDING_TCL_THREADS)
-. if (${ARCH} == "ia64")
-BROKEN=	does not compile on ia64
-. endif
-. if exists(${TCLSH})
-TCL_PATCHLEVEL!=	${ECHO_CMD} "puts \$$tcl_patchLevel" | ${TCLSH}
-.  if ${TCL_PATCHLEVEL} != ${PORTVERSION:S/.b./b/}
-IGNORE=	version mismatch - installing ${PORTVERSION:S/.b./b/} over installed ${TCL_PATCHLEVEL}
-.  endif
+.if ${PORT_OPTIONS:MMODULES}
+INSTALL_TARGET+=install-tm
+PLIST_SUB+=	MODULES=""
+.else
+PLIST_SUB+=	MODULES="@comment "
 .endif
 
-CONFIGURE_ARGS+=	--enable-threads
-CONFIGURE_ENV+=		PTHREAD_LIBS="${PTHREAD_LIBS}" PTHREAD_CFLAGS="${PTHREAD_CFLAGS}"
-
+.if ${PORT_OPTIONS:MTZDATA}
+PLIST_SUB+=		TZDATA=""
+CONFIGURE_ARGS+=--with-tzdata
+INSTALL_TARGET+=install-tzdata
 .else
-
-CONFIGURE_ARGS+=	--disable-threads
-
-.if !defined(NO_INSTALL_MANPAGES) && defined(WITH_TCL85_MAN)
-
-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 DictObj.3 DoOneEvent.3 DoWhenIdle.3 DoubleObj.3 \
-	DumpActiveMemory.3 Encoding.3 Ensemble.3 Eval.3 Environment.3 Exit.3 \
-	ExprLong.3 ExprLongObj.3 FileSystem.3 FindExec.3 GetCwd.3 \
-	GetHostName.3 GetIndex.3 GetInt.3 GetTime.3 GetOpnFl.3 GetStdChan.3 \
-	GetVersion.3 Hash.3 Init.3 InitStubs.3 IntObj.3 Interp.3 Limit.3 \
-	LinkVar.3 ListObj.3 Namespace.3 Notifier.3 Object.3 ObjectType.3 \
-	OpenFileChnl.3 OpenTcp.3 Panic.3 ParseCmd.3 PkgRequire.3 Preserve.3 \
-	PrintDbl.3 RecEvalObj.3 RecordEval.3 RegConfig.3 RegExp.3 SaveResult.3 \
-	SetChanErr.3 SetErrno.3 SetRecLmt.3 SetResult.3 SetVar.3 Signal.3 \
-	Sleep.3 SourceRCFile.3 SplitList.3 SplitPath.3 StdChannels.3 \
-	StaticPkg.3 StrMatch.3 StringObj.3 SubstObj.3 TCL_MEM_DEBUG.3 \
-	Tcl_Main.3 Thread.3 ToUpper.3 TraceCmd.3 TraceVar.3 Translate.3 \
-	UniCharIsAlpha.3 UpVar.3 Utf.3 WrongNumArgs.3
-
-MANN=	Tcl.n after.n append.n apply.n array.n bgerror.n binary.n break.n \
-	case.n catch.n cd.n chan.n clock.n close.n concat.n continue.n dde.n \
-	dict.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 lassign.n library.n lindex.n \
-	linsert.n list.n llength.n load.n lrange.n lrepeat.n lreplace.n \
-	lreverse.n lsearch.n lset.n lsort.n mathfunc.n mathop.n memory.n \
-	msgcat.n namespace.n open.n package.n packagens.n pid.n pkgMkIndex.n \
-	platform.n platform_shell.n proc.n puts.n pwd.n re_syntax.n read.n \
-	refchan.n regexp.n registry.n regsub.n rename.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 tm.n trace.n \
-	unknown.n unload.n unset.n update.n uplevel.n upvar.n variable.n vwait.n \
-	while.n
-
-# MLINKS generated via  awk '/ln/ {print "\t" $3,$4,"\\"}' unix/mkLinks
-MLINKS=	Access.3 Tcl_Access.3 \
-	Access.3 Tcl_Stat.3 \
-	AddErrInfo.3 Tcl_GetReturnOptions.3 \
-	AddErrInfo.3 Tcl_SetReturnOptions.3 \
-	AddErrInfo.3 Tcl_AddErrorInfo.3 \
-	AddErrInfo.3 Tcl_AddObjErrorInfo.3 \
-	AddErrInfo.3 Tcl_SetObjErrorCode.3 \
-	AddErrInfo.3 Tcl_SetErrorCode.3 \
-	AddErrInfo.3 Tcl_SetErrorCodeVA.3 \
-	AddErrInfo.3 Tcl_PosixError.3 \
-	AddErrInfo.3 Tcl_LogCommandInfo.3 \
-	Alloc.3 Tcl_Alloc.3 \
-	Alloc.3 Tcl_Free.3 \
-	Alloc.3 Tcl_Realloc.3 \
-	Alloc.3 Tcl_AttemptAlloc.3 \
-	Alloc.3 Tcl_AttemptRealloc.3 \
-	Alloc.3 ckalloc.3 \
-	Alloc.3 ckfree.3 \
-	Alloc.3 ckrealloc.3 \
-	Alloc.3 attemptckalloc.3 \
-	Alloc.3 attemptckrealloc.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 \
-	Async.3 Tcl_AsyncReady.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 \
-	ChnlStack.3 Tcl_StackChannel.3 \
-	ChnlStack.3 Tcl_UnstackChannel.3 \
-	ChnlStack.3 Tcl_GetStackedChannel.3 \
-	ChnlStack.3 Tcl_GetTopChannel.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_GetChannelThread.3 \
-	CrtChannel.3 Tcl_GetChannelMode.3 \
-	CrtChannel.3 Tcl_GetChannelBufferSize.3 \
-	CrtChannel.3 Tcl_SetChannelBufferSize.3 \
-	CrtChannel.3 Tcl_NotifyChannel.3 \
-	CrtChannel.3 Tcl_BadChannelOption.3 \
-	CrtChannel.3 Tcl_IsChannelShared.3 \
-	CrtChannel.3 Tcl_IsChannelRegistered.3 \
-	CrtChannel.3 Tcl_IsChannelExisting.3 \
-	CrtChannel.3 Tcl_CutChannel.3 \
-	CrtChannel.3 Tcl_SpliceChannel.3 \
-	CrtChannel.3 Tcl_ClearChannelHandlers.3 \
-	CrtChannel.3 Tcl_ChannelBuffered.3 \
-	CrtChannel.3 Tcl_ChannelName.3 \
-	CrtChannel.3 Tcl_ChannelVersion.3 \
-	CrtChannel.3 Tcl_ChannelBlockModeProc.3 \
-	CrtChannel.3 Tcl_ChannelCloseProc.3 \
-	CrtChannel.3 Tcl_ChannelClose2Proc.3 \
-	CrtChannel.3 Tcl_ChannelInputProc.3 \
-	CrtChannel.3 Tcl_ChannelOutputProc.3 \
-	CrtChannel.3 Tcl_ChannelSeekProc.3 \
-	CrtChannel.3 Tcl_ChannelWideSeekProc.3 \
-	CrtChannel.3 Tcl_ChannelThreadActionProc.3 \
-	CrtChannel.3 Tcl_ChannelTruncateProc.3 \
-	CrtChannel.3 Tcl_ChannelSetOptionProc.3 \
-	CrtChannel.3 Tcl_ChannelGetOptionProc.3 \
-	CrtChannel.3 Tcl_ChannelWatchProc.3 \
-	CrtChannel.3 Tcl_ChannelGetHandleProc.3 \
-	CrtChannel.3 Tcl_ChannelFlushProc.3 \
-	CrtChannel.3 Tcl_ChannelHandlerProc.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 \
-	CrtMathFnc.3 Tcl_GetMathFuncInfo.3 \
-	CrtMathFnc.3 Tcl_ListMathFuncs.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_GetCommandInfoFromToken.3 \
-	CrtObjCmd.3 Tcl_SetCommandInfoFromToken.3 \
-	CrtObjCmd.3 Tcl_GetCommandName.3 \
-	CrtObjCmd.3 Tcl_GetCommandFullName.3 \
-	CrtObjCmd.3 Tcl_GetCommandFromObj.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_CreateObjTrace.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_DStringTrunc.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 \
-	DetachPids.3 Tcl_WaitPid.3 \
-	DictObj.3 Tcl_NewDictObj.3 \
-	DictObj.3 Tcl_DictObjGet.3 \
-	DictObj.3 Tcl_DictObjPut.3 \
-	DictObj.3 Tcl_DictObjRemove.3 \
-	DictObj.3 Tcl_DictObjSize.3 \
-	DictObj.3 Tcl_DictObjFirst.3 \
-	DictObj.3 Tcl_DictObjNext.3 \
-	DictObj.3 Tcl_DictObjDone.3 \
-	DictObj.3 Tcl_DictObjPutKeyList.3 \
-	DictObj.3 Tcl_DictObjRemoveKeyList.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 \
-	DumpActiveMemory.3 Tcl_DumpActiveMemory.3 \
-	DumpActiveMemory.3 Tcl_InitMemory.3 \
-	DumpActiveMemory.3 Tcl_ValidateAllMemory.3 \
-	Encoding.3 Tcl_GetEncoding.3 \
-	Encoding.3 Tcl_FreeEncoding.3 \
-	Encoding.3 Tcl_GetEncodingFromObj.3 \
-	Encoding.3 Tcl_ExternalToUtfDString.3 \
-	Encoding.3 Tcl_UtfToExternalDString.3 \
-	Encoding.3 Tcl_ExternalToUtf.3 \
-	Encoding.3 Tcl_UtfToExternal.3 \
-	Encoding.3 Tcl_WinTCharToUtf.3 \
-	Encoding.3 Tcl_WinUtfToTChar.3 \
-	Encoding.3 Tcl_GetEncodingName.3 \
-	Encoding.3 Tcl_SetSystemEncoding.3 \
-	Encoding.3 Tcl_GetEncodingNameFromEnvironment.3 \
-	Encoding.3 Tcl_GetEncodingNames.3 \
-	Encoding.3 Tcl_CreateEncoding.3 \
-	Encoding.3 Tcl_GetEncodingSearchPath.3 \
-	Encoding.3 Tcl_SetEncodingSearchPath.3 \
-	Encoding.3 Tcl_GetDefaultEncodingDir.3 \
-	Encoding.3 Tcl_SetDefaultEncodingDir.3 \
-	Ensemble.3 Tcl_CreateEnsemble.3 \
-	Ensemble.3 Tcl_FindEnsemble.3 \
-	Ensemble.3 Tcl_IsEnsemble.3 \
-	Ensemble.3 Tcl_GetEnsembleFlags.3 \
-	Ensemble.3 Tcl_SetEnsembleFlags.3 \
-	Ensemble.3 Tcl_GetEnsembleMappingDict.3 \
-	Ensemble.3 Tcl_SetEnsembleMappingDict.3 \
-	Ensemble.3 Tcl_GetEnsembleSubcommandList.3 \
-	Ensemble.3 Tcl_SetEnsembleSubcommandList.3 \
-	Ensemble.3 Tcl_GetEnsembleUnknownHandler.3 \
-	Ensemble.3 Tcl_SetEnsembleUnknownHandler.3 \
-	Ensemble.3 Tcl_GetEnsembleNamespace.3 \
-	Environment.3 Tcl_PutEnv.3 \
-	Eval.3 Tcl_EvalObjEx.3 \
-	Eval.3 Tcl_EvalFile.3 \
-	Eval.3 Tcl_EvalObjv.3 \
-	Eval.3 Tcl_Eval.3 \
-	Eval.3 Tcl_EvalEx.3 \
-	Eval.3 Tcl_GlobalEval.3 \
-	Eval.3 Tcl_GlobalEvalObj.3 \
-	Eval.3 Tcl_VarEval.3 \
-	Eval.3 Tcl_VarEvalVA.3 \
-	Exit.3 Tcl_Exit.3 \
-	Exit.3 Tcl_Finalize.3 \
-	Exit.3 Tcl_CreateExitHandler.3 \
-	Exit.3 Tcl_DeleteExitHandler.3 \
-	Exit.3 Tcl_ExitThread.3 \
-	Exit.3 Tcl_FinalizeThread.3 \
-	Exit.3 Tcl_CreateThreadExitHandler.3 \
-	Exit.3 Tcl_DeleteThreadExitHandler.3 \
-	Exit.3 Tcl_SetExitProc.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 \
-	FileSystem.3 Tcl_FSRegister.3 \
-	FileSystem.3 Tcl_FSUnregister.3 \
-	FileSystem.3 Tcl_FSData.3 \
-	FileSystem.3 Tcl_FSMountsChanged.3 \
-	FileSystem.3 Tcl_FSGetFileSystemForPath.3 \
-	FileSystem.3 Tcl_FSGetPathType.3 \
-	FileSystem.3 Tcl_FSCopyFile.3 \
-	FileSystem.3 Tcl_FSCopyDirectory.3 \
-	FileSystem.3 Tcl_FSCreateDirectory.3 \
-	FileSystem.3 Tcl_FSDeleteFile.3 \
-	FileSystem.3 Tcl_FSRemoveDirectory.3 \
-	FileSystem.3 Tcl_FSRenameFile.3 \
-	FileSystem.3 Tcl_FSListVolumes.3 \
-	FileSystem.3 Tcl_FSEvalFileEx.3 \
-	FileSystem.3 Tcl_FSEvalFile.3 \
-	FileSystem.3 Tcl_FSLoadFile.3 \
-	FileSystem.3 Tcl_FSMatchInDirectory.3 \
-	FileSystem.3 Tcl_FSLink.3 \
-	FileSystem.3 Tcl_FSLstat.3 \
-	FileSystem.3 Tcl_FSUtime.3 \
-	FileSystem.3 Tcl_FSFileAttrsGet.3 \
-	FileSystem.3 Tcl_FSFileAttrsSet.3 \
-	FileSystem.3 Tcl_FSFileAttrStrings.3 \
-	FileSystem.3 Tcl_FSStat.3 \
-	FileSystem.3 Tcl_FSAccess.3 \
-	FileSystem.3 Tcl_FSOpenFileChannel.3 \
-	FileSystem.3 Tcl_FSGetCwd.3 \
-	FileSystem.3 Tcl_FSChdir.3 \
-	FileSystem.3 Tcl_FSPathSeparator.3 \
-	FileSystem.3 Tcl_FSJoinPath.3 \
-	FileSystem.3 Tcl_FSSplitPath.3 \
-	FileSystem.3 Tcl_FSEqualPaths.3 \
-	FileSystem.3 Tcl_FSGetNormalizedPath.3 \
-	FileSystem.3 Tcl_FSJoinToPath.3 \
-	FileSystem.3 Tcl_FSConvertToPathType.3 \
-	FileSystem.3 Tcl_FSGetInternalRep.3 \
-	FileSystem.3 Tcl_FSGetTranslatedPath.3 \
-	FileSystem.3 Tcl_FSGetTranslatedStringPath.3 \
-	FileSystem.3 Tcl_FSNewNativePath.3 \
-	FileSystem.3 Tcl_FSGetNativePath.3 \
-	FileSystem.3 Tcl_FSFileSystemInfo.3 \
-	FileSystem.3 Tcl_AllocStatBuf.3 \
-	FindExec.3 Tcl_FindExecutable.3 \
-	FindExec.3 Tcl_GetNameOfExecutable.3 \
-	GetCwd.3 Tcl_GetCwd.3 \
-	GetCwd.3 Tcl_Chdir.3 \
-	GetHostName.3 Tcl_GetHostName.3 \
-	GetIndex.3 Tcl_GetIndexFromObj.3 \
-	GetIndex.3 Tcl_GetIndexFromObjStruct.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 \
-	GetTime.3 Tcl_GetTime.3 \
-	GetTime.3 Tcl_SetTimeProc.3 \
-	GetTime.3 Tcl_QueryTimeProc.3 \
-	GetVersion.3 Tcl_GetVersion.3 \
-	Hash.3 Tcl_InitHashTable.3 \
-	Hash.3 Tcl_InitCustomHashTable.3 \
-	Hash.3 Tcl_InitObjHashTable.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 \
-	Init.3 Tcl_Init.3 \
-	InitStubs.3 Tcl_InitStubs.3 \
-	IntObj.3 Tcl_NewIntObj.3 \
-	IntObj.3 Tcl_NewLongObj.3 \
-	IntObj.3 Tcl_NewWideIntObj.3 \
-	IntObj.3 Tcl_SetIntObj.3 \
-	IntObj.3 Tcl_SetLongObj.3 \
-	IntObj.3 Tcl_SetWideIntObj.3 \
-	IntObj.3 Tcl_GetIntFromObj.3 \
-	IntObj.3 Tcl_GetLongFromObj.3 \
-	IntObj.3 Tcl_GetWideIntFromObj.3 \
-	IntObj.3 Tcl_NewBignumObj.3 \
-	IntObj.3 Tcl_SetBignumObj.3 \
-	IntObj.3 Tcl_GetBignumFromObj.3 \
-	IntObj.3 Tcl_GetBignumAndClearObj.3 \
-	Interp.3 Tcl_Interp.3 \
-	Limit.3 Tcl_LimitCheck.3 \
-	Limit.3 Tcl_LimitReady.3 \
-	Limit.3 Tcl_LimitExceeded.3 \
-	Limit.3 Tcl_LimitTypeExceeded.3 \
-	Limit.3 Tcl_LimitTypeEnabled.3 \
-	Limit.3 Tcl_LimitTypeSet.3 \
-	Limit.3 Tcl_LimitTypeReset.3 \
-	Limit.3 Tcl_LimitGetCommands.3 \
-	Limit.3 Tcl_LimitSetCommands.3 \
-	Limit.3 Tcl_LimitGetTime.3 \
-	Limit.3 Tcl_LimitSetTime.3 \
-	Limit.3 Tcl_LimitGetGranularity.3 \
-	Limit.3 Tcl_LimitSetGranularity.3 \
-	Limit.3 Tcl_LimitAddHandler.3 \
-	Limit.3 Tcl_LimitRemoveHandler.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 \
-	Namespace.3 Tcl_CreateNamespace.3 \
-	Namespace.3 Tcl_DeleteNamespace.3 \
-	Namespace.3 Tcl_AppendExportList.3 \
-	Namespace.3 Tcl_Export.3 \
-	Namespace.3 Tcl_Import.3 \
-	Namespace.3 Tcl_ForgetImport.3 \
-	Namespace.3 Tcl_GetCurrentNamespace.3 \
-	Namespace.3 Tcl_GetGlobalNamespace.3 \
-	Namespace.3 Tcl_FindNamespace.3 \
-	Namespace.3 Tcl_FindCommand.3 \
-	Namespace.3 Tcl_GetNamespaceUnknownHandler.3 \
-	Namespace.3 Tcl_SetNamespaceUnknownHandler.3 \
-	Notifier.3 Tcl_CreateEventSource.3 \
-	Notifier.3 Tcl_DeleteEventSource.3 \
-	Notifier.3 Tcl_SetMaxBlockTime.3 \
-	Notifier.3 Tcl_QueueEvent.3 \
-	Notifier.3 Tcl_ThreadQueueEvent.3 \
-	Notifier.3 Tcl_ThreadAlert.3 \
-	Notifier.3 Tcl_GetCurrentThread.3 \
-	Notifier.3 Tcl_DeleteEvents.3 \
-	Notifier.3 Tcl_InitNotifier.3 \
-	Notifier.3 Tcl_FinalizeNotifier.3 \
-	Notifier.3 Tcl_WaitForEvent.3 \
-	Notifier.3 Tcl_AlertNotifier.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 \
-	Object.3 Tcl_InvalidateStringRep.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_GetChannelNames.3 \
-	OpenFileChnl.3 Tcl_GetChannelNamesEx.3 \
-	OpenFileChnl.3 Tcl_RegisterChannel.3 \
-	OpenFileChnl.3 Tcl_UnregisterChannel.3 \
-	OpenFileChnl.3 Tcl_DetachChannel.3 \
-	OpenFileChnl.3 Tcl_IsStandardChannel.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_Ungets.3 \
-	OpenFileChnl.3 Tcl_WriteObj.3 \
-	OpenFileChnl.3 Tcl_WriteChars.3 \
-	OpenFileChnl.3 Tcl_Write.3 \
-	OpenFileChnl.3 Tcl_ReadRaw.3 \
-	OpenFileChnl.3 Tcl_WriteRaw.3 \
-	OpenFileChnl.3 Tcl_Eof.3 \
-	OpenFileChnl.3 Tcl_Flush.3 \
-	OpenFileChnl.3 Tcl_InputBlocked.3 \
-	OpenFileChnl.3 Tcl_InputBuffered.3 \
-	OpenFileChnl.3 Tcl_OutputBuffered.3 \
-	OpenFileChnl.3 Tcl_Seek.3 \
-	OpenFileChnl.3 Tcl_Tell.3 \
-	OpenFileChnl.3 Tcl_TruncateChannel.3 \
-	OpenFileChnl.3 Tcl_GetChannelOption.3 \
-	OpenFileChnl.3 Tcl_SetChannelOption.3 \
-	OpenTcp.3 Tcl_OpenTcpClient.3 \
-	OpenTcp.3 Tcl_MakeTcpClientChannel.3 \
-	OpenTcp.3 Tcl_OpenTcpServer.3 \
-	Panic.3 Tcl_Panic.3 \
-	Panic.3 Tcl_PanicVA.3 \
-	Panic.3 Tcl_SetPanicProc.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_ParseVar.3 \
-	ParseCmd.3 Tcl_FreeParse.3 \
-	ParseCmd.3 Tcl_EvalTokens.3 \
-	ParseCmd.3 Tcl_EvalTokensStandard.3 \
-	PkgRequire.3 Tcl_PkgRequire.3 \
-	PkgRequire.3 Tcl_PkgRequireEx.3 \
-	PkgRequire.3 Tcl_PkgRequireProc.3 \
-	PkgRequire.3 Tcl_PkgPresent.3 \
-	PkgRequire.3 Tcl_PkgPresentEx.3 \
-	PkgRequire.3 Tcl_PkgProvide.3 \
-	PkgRequire.3 Tcl_PkgProvideEx.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 \
-	RegConfig.3 Tcl_RegisterConfig.3 \
-	RegExp.3 Tcl_RegExpMatchObj.3 \
-	RegExp.3 Tcl_RegExpMatch.3 \
-	RegExp.3 Tcl_RegExpCompile.3 \
-	RegExp.3 Tcl_RegExpExec.3 \
-	RegExp.3 Tcl_RegExpRange.3 \
-	RegExp.3 Tcl_GetRegExpFromObj.3 \
-	RegExp.3 Tcl_RegExpExecObj.3 \
-	RegExp.3 Tcl_RegExpGetInfo.3 \
-	SaveResult.3 Tcl_SaveInterpState.3 \
-	SaveResult.3 Tcl_RestoreInterpState.3 \
-	SaveResult.3 Tcl_DiscardInterpState.3 \
-	SaveResult.3 Tcl_SaveResult.3 \
-	SaveResult.3 Tcl_RestoreResult.3 \
-	SaveResult.3 Tcl_DiscardResult.3 \
-	SetChanErr.3 Tcl_SetChannelError.3 \
-	SetChanErr.3 Tcl_SetChannelErrorInterp.3 \
-	SetChanErr.3 Tcl_GetChannelError.3 \
-	SetChanErr.3 Tcl_GetChannelErrorInterp.3 \
-	SetErrno.3 Tcl_SetErrno.3 \
-	SetErrno.3 Tcl_GetErrno.3 \
-	SetErrno.3 Tcl_ErrnoId.3 \
-	SetErrno.3 Tcl_ErrnoMsg.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_AppendResultVA.3 \
-	SetResult.3 Tcl_AppendElement.3 \
-	SetResult.3 Tcl_ResetResult.3 \
-	SetResult.3 Tcl_FreeResult.3 \
-	SetVar.3 Tcl_SetVar2Ex.3 \
-	SetVar.3 Tcl_SetVar.3 \
-	SetVar.3 Tcl_SetVar2.3 \
-	SetVar.3 Tcl_ObjSetVar2.3 \
-	SetVar.3 Tcl_GetVar2Ex.3 \
-	SetVar.3 Tcl_GetVar.3 \
-	SetVar.3 Tcl_GetVar2.3 \
-	SetVar.3 Tcl_ObjGetVar2.3 \
-	SetVar.3 Tcl_UnsetVar.3 \
-	SetVar.3 Tcl_UnsetVar2.3 \
-	Signal.3 Tcl_SignalId.3 \
-	Signal.3 Tcl_SignalMsg.3 \
-	Sleep.3 Tcl_Sleep.3 \
-	SourceRCFile.3 Tcl_SourceRCFile.3 \
-	SplitList.3 Tcl_SplitList.3 \
-	SplitList.3 Tcl_Merge.3 \
-	SplitList.3 Tcl_ScanElement.3 \
-	SplitList.3 Tcl_ScanCountedElement.3 \
-	SplitList.3 Tcl_ConvertElement.3 \
-	SplitList.3 Tcl_ConvertCountedElement.3 \
-	SplitPath.3 Tcl_SplitPath.3 \
-	SplitPath.3 Tcl_JoinPath.3 \
-	SplitPath.3 Tcl_GetPathType.3 \
-	StaticPkg.3 Tcl_StaticPackage.3 \
-	StdChannels.3 Tcl_StandardChannels.3 \
-	StrMatch.3 Tcl_StringMatch.3 \
-	StrMatch.3 Tcl_StringCaseMatch.3 \
-	StringObj.3 Tcl_NewStringObj.3 \
-	StringObj.3 Tcl_NewUnicodeObj.3 \
-	StringObj.3 Tcl_SetStringObj.3 \
-	StringObj.3 Tcl_SetUnicodeObj.3 \
-	StringObj.3 Tcl_GetStringFromObj.3 \
-	StringObj.3 Tcl_GetString.3 \
-	StringObj.3 Tcl_GetUnicodeFromObj.3 \
-	StringObj.3 Tcl_GetUnicode.3 \
-	StringObj.3 Tcl_GetUniChar.3 \
-	StringObj.3 Tcl_GetCharLength.3 \
-	StringObj.3 Tcl_GetRange.3 \
-	StringObj.3 Tcl_AppendToObj.3 \
-	StringObj.3 Tcl_AppendUnicodeToObj.3 \
-	StringObj.3 Tcl_AppendObjToObj.3 \
-	StringObj.3 Tcl_AppendStringsToObj.3 \
-	StringObj.3 Tcl_AppendStringsToObjVA.3 \
-	StringObj.3 Tcl_SetObjLength.3 \
-	StringObj.3 Tcl_AttemptSetObjLength.3 \
-	StringObj.3 Tcl_ConcatObj.3 \
-	SubstObj.3 Tcl_SubstObj.3 \
-	Tcl_Main.3 Tcl_SetMainLoop.3 \
-	Thread.3 Tcl_ConditionNotify.3 \
-	Thread.3 Tcl_ConditionWait.3 \
-	Thread.3 Tcl_ConditionFinalize.3 \
-	Thread.3 Tcl_GetThreadData.3 \
-	Thread.3 Tcl_MutexLock.3 \
-	Thread.3 Tcl_MutexUnlock.3 \
-	Thread.3 Tcl_MutexFinalize.3 \
-	Thread.3 Tcl_CreateThread.3 \
-	Thread.3 Tcl_JoinThread.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 \
-	TraceCmd.3 Tcl_CommandTraceInfo.3 \
-	TraceCmd.3 Tcl_TraceCommand.3 \
-	TraceCmd.3 Tcl_UntraceCommand.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 \
-	UniCharIsAlpha.3 Tcl_UniCharIsAlnum.3 \
-	UniCharIsAlpha.3 Tcl_UniCharIsAlpha.3 \
-	UniCharIsAlpha.3 Tcl_UniCharIsControl.3 \
-	UniCharIsAlpha.3 Tcl_UniCharIsDigit.3 \
-	UniCharIsAlpha.3 Tcl_UniCharIsGraph.3 \
-	UniCharIsAlpha.3 Tcl_UniCharIsLower.3 \
-	UniCharIsAlpha.3 Tcl_UniCharIsPrint.3 \
-	UniCharIsAlpha.3 Tcl_UniCharIsPunct.3 \
-	UniCharIsAlpha.3 Tcl_UniCharIsSpace.3 \
-	UniCharIsAlpha.3 Tcl_UniCharIsUpper.3 \
-	UniCharIsAlpha.3 Tcl_UniCharIsWordChar.3 \
-	UpVar.3 Tcl_UpVar.3 \
-	UpVar.3 Tcl_UpVar2.3 \
-	Utf.3 Tcl_UniCharToUtf.3 \
-	Utf.3 Tcl_UtfToUniChar.3 \
-	Utf.3 Tcl_UniCharToUtfDString.3 \
-	Utf.3 Tcl_UtfToUniCharDString.3 \
-	Utf.3 Tcl_UniCharLen.3 \
-	Utf.3 Tcl_UniCharNcmp.3 \
-	Utf.3 Tcl_UniCharNcasecmp.3 \
-	Utf.3 Tcl_UniCharCaseMatch.3 \
-	Utf.3 Tcl_UtfNcmp.3 \
-	Utf.3 Tcl_UtfNcasecmp.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 \
-	library.n auto_execok.n \
-	library.n auto_import.n \
-	library.n auto_load.n \
-	library.n auto_mkindex.n \
-	library.n auto_mkindex_old.n \
-	library.n auto_qualify.n \
-	library.n auto_reset.n \
-	library.n tcl_findLibrary.n \
-	library.n parray.n \
-	library.n tcl_endOfWord.n \
-	library.n tcl_startOfNextWord.n \
-	library.n tcl_startOfPreviousWord.n \
-	library.n tcl_wordBreakAfter.n \
-	library.n tcl_wordBreakBefore.n \
-	packagens.n pkg::create.n \
-	pkgMkIndex.n pkg_mkIndex.n \
-	safe.n SafeBase.n
+PLIST_SUB+=		TZDATA="@comment "
+CONFIGURE_ARGS+=--without-tzdata
 .endif
-.endif # defined(BUILDING_TCL_THREADS)
-
-TCLBASE?=	${PORTSDIR}/${PKGCATEGORY}/${LATEST_LINK}
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|tclsh |tclsh${TCL_VER}${THREADS_SUFFIX} |g' -e 's|Tclsh |Tclsh${TCL_VER}${THREADS_SUFFIX} |g' \
-		-e 's|tclsh\\fR|tclsh${TCL_VER}${THREADS_SUFFIX}\\fR|g' -e 's|Tclsh\\fR|Tclsh${TCL_VER}${THREADS_SUFFIX}\\fR|g' \
-		-e 's|^.so man.macros|.so ${DATADIR}/man.macros|' \
-		${WRKSRC}/../doc/tclsh.1
-	@${FIND} ${WRKDIR} -name \*.orig -delete
-.if defined(BUILDING_TCL_THREADS)
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \
-		-e 's|$${TCL_TRIM_DOTS}|$${TCL_TRIM_DOTS}${THREADS_SUFFIX}|g' \
-		-e 's|-ltcl$${TCL_VERSION}|-ltcl$${TCL_VERSION}${THREADS_SUFFIX}|g' \
-		-e 's/-ltcl`echo $${TCL_VERSION} | tr -d .`/-ltcl`echo $${TCL_VERSION} | tr -d .`${THREADS_SUFFIX}/g' \
-		-e 's|-ltclstub$${TCL_VERSION}|-ltclstub$${TCL_VERSION}${THREADS_SUFFIX}|g' \
-		-e 's/-ltclstub`echo $${TCL_VERSION} | tr -d .`/-ltclstub`echo $${TCL_VERSION} | tr -d .`${THREADS_SUFFIX}/g' \
-		${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|libtcl$${SHORT_TCL_VER}|libtcl$${SHORT_TCL_VER}${THREADS_SUFFIX}|g' \
-		-e 's|/tclsh$$(VERSION)|/tclsh$$(VERSION)${THREADS_SUFFIX}|g' \
-		-e 's|/tclConfig.sh|/tclConfig${THREADS_SUFFIX}.sh|g' \
-		${WRKSRC}/Makefile.in
+.if (${ARCH} == "ia64")
+BROKEN= does not compile on ia64
 .endif
 
-# Where the below command fails, there is no need for concern:
-BLACKHOLE!=	${SYSCTL} -n net.inet.tcp.blackhole || ${TRUE}
-
 post-configure:
 	${REINPLACE_CMD} \
-		-e 's|${WRKDIRPREFIX}${.CURDIR}|${WRKDIRPREFIX}${TCLBASE}|' \
-		${WRKSRC}/tclConfig.sh
-	${REINPLACE_CMD} \
 		-e 's,-DNO_MEMMOVE=1,,' -e 's,-DNO_STRING_H=1,,' \
 		-e 's,^COMPAT_OBJS.*,,' ${WRKSRC}/Makefile
-.if ${BLACKHOLE} != '' && ${BLACKHOLE} != 0
-	# ====================================================
-	# net.inet.tcp.blackhole is non-zero. Some http-tests
-	# will appear to hang and then fail. Do not be alarmed.
-	# The socket.test would hang, so it is disabled:
-	${MV} ${WRKSRC:H}/tests/socket.test ${WRKSRC:H}/tests/socket.test.dis;
-	# ====================================================
-.endif
-
-.if defined(BUILDING_TCL_THREADS)
-do-install:
-	@cd ${WRKSRC} && ${MAKE_ENV} ${MAKE} -f Makefile install-binaries
-	@${MKDIR} ${PREFIX}/lib/tcl${TCL_VER}${THREADS_SUFFIX}
-	@${LN} -s ${PREFIX}/lib/tcl${TCL_VER}/tclConfig${THREADS_SUFFIX}.sh ${PREFIX}/lib/tcl${TCL_VER}${THREADS_SUFFIX}/tclConfig.sh
-.endif
-
-post-install:
-.if ${PORT_OPTIONS:MTZDATA}
-	@cd ${WRKSRC} && ${MAKE} -f Makefile install-tzdata ${MAKE_ENV}
-.endif
-	${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/../doc/man.macros ${DATADIR}
-	${MKDIR} ${MANPREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/../doc/tclsh.1 ${MANPREFIX}/man/man1/tclsh${TCL_VER}${THREADS_SUFFIX}.1
-.if !defined(BUILDING_TCL_THREADS) && ${PORT_OPTIONS:MTCL85_MAN}
-. for mp in ${MAN3} ${MANN}
-	@${REINPLACE_CMD} -e 's|^.so man.macros|.so ${DATADIR}/man.macros|'	\
-		${WRKSRC}/../doc/${mp}
-. endfor
-	@cd ${WRKSRC} && ${MAKE} -f Makefile install-doc ${MAKE_ENV}
-
-.endif # !defined(BUILDING_TCL_THREADS) && ${PORT_OPTIONS:MTCL85_MAN}
 
 regression-test:	build
 	cd ${WRKSRC} && LC_ALL=C ${MAKE} test
 
-.endif # !defined(BUILDING_TCL_TM)
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/lang/tcl85/files/patch-unix-Makefile.in b/lang/tcl85/files/patch-unix-Makefile.in
index 94b288bc29f8..fd8f3e9959d1 100644
--- a/lang/tcl85/files/patch-unix-Makefile.in
+++ b/lang/tcl85/files/patch-unix-Makefile.in
@@ -1,5 +1,5 @@
---- Makefile.in.bak	2012-11-20 23:39:58.000000000 -0600
-+++ Makefile.in	2012-11-20 23:47:34.000000000 -0600
+--- Makefile.in.orig	2012-11-09 16:14:39.000000000 +0100
++++ Makefile.in	2013-01-10 15:47:17.000000000 +0100
 @@ -54,6 +54,8 @@
  
  # Directory in which to install the include file tcl.h:
@@ -104,7 +104,7 @@
  	@echo "Installing library files to $(SCRIPT_INSTALL_DIR)/";
  	@for i in $(TOP_DIR)/library/*.tcl $(TOP_DIR)/library/tclIndex \
  		$(UNIX_DIR)/tclAppInit.c @LDAIX_SRC@ @DTRACE_SRC@; \
-@@ -766,23 +788,11 @@
+@@ -766,32 +788,31 @@
  	    do \
  	    $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/http1.0; \
  	    done;
@@ -128,67 +128,32 @@
  	@echo "Installing encoding files to $(SCRIPT_INSTALL_DIR)/encoding/";
  	@for i in $(TOP_DIR)/library/encoding/*.enc ; do \
  		$(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/encoding; \
-@@ -792,6 +802,27 @@
- 	    echo "if {![interp issafe]} { ::tcl::tm::roots {$(TCL_MODULE_PATH)} }" >> \
- 	        "$(SCRIPT_INSTALL_DIR)"/tm.tcl; \
- 	fi
+ 	done;
+-	@if [ -n "$(TCL_MODULE_PATH)" -a -f $(TOP_DIR)/library/tm.tcl ]; then \
+-	    echo "Customizing tcl module path"; \
+-	    echo "if {![interp issafe]} { ::tcl::tm::roots {$(TCL_MODULE_PATH)} }" >> \
+-	        "$(SCRIPT_INSTALL_DIR)"/tm.tcl; \
+-	fi
++	echo "Customizing tcl module path"; \
++	echo "if {![interp issafe]} { ::tcl::tm::path add {$(SCRIPT_INSTALL_DIR)} }" >> \
++	    "$(SCRIPT_INSTALL_DIR)"/tm.tcl;
++
 +install-tm:
-+	@for i in tcl8 tcl8/8.4 tcl8/8.4/platform tcl8/8.5; \
-+	    do \
-+	if [ ! -d "$(LIB_INSTALL_DIR)"/$$i ] ; then \
-+		echo "Making directory $(LIB_INSTALL_DIR)/$$i"; \
-+		mkdir -p "$(LIB_INSTALL_DIR)"/$$i; \
-+		chmod 755 "$(LIB_INSTALL_DIR)"/$$i; \
-+		else true; \
-+		fi; \
-+	done;
 +	@echo "Installing package http 2.7.10 as a Tcl Module";
-+	@$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(LIB_INSTALL_DIR)"/tcl8/8.4/http-2.7.10.tm;
++	@$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/http-2.7.10.tm;
 +	@echo "Installing package msgcat 1.5.0 as a Tcl Module";
-+	@$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(LIB_INSTALL_DIR)"/tcl8/8.5/msgcat-1.5.0.tm;
++	@$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/msgcat-1.5.0.tm;
 +	@echo "Installing package tcltest 2.3.4 as a Tcl Module";
-+	@$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(LIB_INSTALL_DIR)"/tcl8/8.5/tcltest-2.3.4.tm;
-+
++	@$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/tcltest-2.3.4.tm;
 +	@echo "Installing package platform 1.0.10 as a Tcl Module";
-+	@$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(LIB_INSTALL_DIR)"/tcl8/8.4/platform-1.0.10.tm;
++	@$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/platform-1.0.10.tm;
 +	@echo "Installing package platform::shell 1.1.4 as a Tcl Module";
-+	@$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl "$(LIB_INSTALL_DIR)"/tcl8/8.4/platform/shell-1.1.4.tm;
++	@$(INSTALL_DATA_DIR) "$(LIB_INSTALL_DIR)"/platform;
++	@$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl "$(SCRIPT_INSTALL_DIR)"/platform/shell-1.1.4.tm;
  
  install-tzdata: ${TCL_EXE}
  	@echo "Installing time zone files to $(SCRIPT_INSTALL_DIR)/tzdata/"
-@@ -823,18 +854,23 @@
- 		else true; \
- 		fi; \
- 	    done;
--	@echo "Installing and cross-linking top-level (.1) docs to $(MAN1_INSTALL_DIR)/";
--	@for i in $(TOP_DIR)/doc/*.1; do \
--	    $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MAN1_INSTALL_DIR)"; \
--	done
- 	@echo "Installing and cross-linking C API (.3) docs to $(MAN3_INSTALL_DIR)/";
- 	@for i in $(TOP_DIR)/doc/*.3; do \
--	    $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MAN3_INSTALL_DIR)"; \
--	done
-+	$(BSD_INSTALL_MAN) $$i "$(MAN3_INSTALL_DIR)"; \
-+	done;
- 	@echo "Installing and cross-linking command (.n) docs to $(MANN_INSTALL_DIR)/";
- 	@for i in $(TOP_DIR)/doc/*.n; do \
--	    $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MANN_INSTALL_DIR)"; \
--	done
-+	$(BSD_INSTALL_MAN) $$i "$(MANN_INSTALL_DIR)"; \
-+	done;
-+	@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."
-+
- 
- # Optional target to install private headers
- install-private-headers: libraries
-@@ -1537,7 +1573,7 @@
+@@ -1537,7 +1558,7 @@
  			match=1; \
  		    fi; \
  		done; \
@@ -197,7 +162,7 @@
  	done
  
  #
-@@ -1554,7 +1590,7 @@
+@@ -1554,7 +1575,7 @@
  			match=1; \
  		    fi; \
  		done; \
diff --git a/lang/tcl85/pkg-plist b/lang/tcl85/pkg-plist
index 45dcc77e5b20..a7a23ff9e3da 100644
--- a/lang/tcl85/pkg-plist
+++ b/lang/tcl85/pkg-plist
@@ -111,7 +111,6 @@ lib/tcl%%TCL_VER%%/history.tcl
 lib/tcl%%TCL_VER%%/http1.0/http.tcl
 lib/tcl%%TCL_VER%%/http1.0/pkgIndex.tcl
 lib/tcl%%TCL_VER%%/init.tcl
-lib/tcl%%TCL_VER%%/tm.tcl
 lib/tcl%%TCL_VER%%/msgs/af.msg
 lib/tcl%%TCL_VER%%/msgs/af_za.msg
 lib/tcl%%TCL_VER%%/msgs/ar.msg
@@ -247,6 +246,8 @@ lib/tcl%%TCL_VER%%/safe.tcl
 lib/tcl%%TCL_VER%%/tclAppInit.c
 lib/tcl%%TCL_VER%%/tclConfig.sh
 lib/tcl%%TCL_VER%%/tclIndex
+lib/tcl%%TCL_VER%%/tm.tcl
+lib/tcl%%TCL_VER%%/word.tcl
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/CST6CDT
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/CET
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/PST8PDT
@@ -835,9 +836,6 @@ lib/tcl%%TCL_VER%%/tclIndex
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/US/Pacific
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/US/Pacific-New
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/US/Samoa
-lib/tcl%%TCL_VER%%/word.tcl
-%%DATADIR%%/man.macros
-@dirrm %%DATADIR%%
 %%TZDATA%%@dirrm lib/tcl%%TCL_VER%%/tzdata/US
 %%TZDATA%%@dirrm lib/tcl%%TCL_VER%%/tzdata/SystemV
 %%TZDATA%%@dirrm lib/tcl%%TCL_VER%%/tzdata/Pacific
@@ -860,6 +858,12 @@ lib/tcl%%TCL_VER%%/word.tcl
 %%TZDATA%%@dirrm lib/tcl%%TCL_VER%%/tzdata/America
 %%TZDATA%%@dirrm lib/tcl%%TCL_VER%%/tzdata/Africa
 %%TZDATA%%@dirrm lib/tcl%%TCL_VER%%/tzdata
+%%MODULES%%lib/tcl%%TCL_VER%%/http-2.7.10.tm
+%%MODULES%%lib/tcl%%TCL_VER%%/platform/shell-1.1.4.tm
+%%MODULES%%lib/tcl%%TCL_VER%%/platform-1.0.10.tm
+%%MODULES%%lib/tcl%%TCL_VER%%/msgcat-1.5.0.tm
+%%MODULES%%lib/tcl%%TCL_VER%%/tcltest-2.3.4.tm
+@dirrm lib/tcl%%TCL_VER%%/platform
 @dirrm lib/tcl%%TCL_VER%%/opt0.4
 @dirrm lib/tcl%%TCL_VER%%/msgs
 @dirrm lib/tcl%%TCL_VER%%/http1.0
diff --git a/lang/tcl85/pkg-plist.threads b/lang/tcl85/pkg-plist.threads
deleted file mode 100644
index 409c1f9139dd..000000000000
--- a/lang/tcl85/pkg-plist.threads
+++ /dev/null
@@ -1,8 +0,0 @@
-bin/tclsh%%TCL_VER%%-threads
-lib/libtcl%%SHORT_TCL_VER%%-threads.a
-lib/libtcl%%SHORT_TCL_VER%%-threads.so
-lib/libtcl%%SHORT_TCL_VER%%-threads.so.1
-lib/libtclstub%%SHORT_TCL_VER%%-threads.a
-lib/tcl%%TCL_VER%%/tclConfig-threads.sh
-lib/tcl%%TCL_VER%%-threads/tclConfig.sh
-@dirrm lib/tcl%%TCL_VER%%-threads
diff --git a/lang/tcl85/pkg-plist.tm b/lang/tcl85/pkg-plist.tm
deleted file mode 100644
index fd35f7d580a9..000000000000
--- a/lang/tcl85/pkg-plist.tm
+++ /dev/null
@@ -1,9 +0,0 @@
-lib/tcl8/8.4/http-2.7.10.tm
-lib/tcl8/8.4/platform/shell-1.1.4.tm
-lib/tcl8/8.4/platform-1.0.10.tm
-lib/tcl8/8.5/msgcat-1.5.0.tm
-lib/tcl8/8.5/tcltest-2.3.4.tm
-@dirrmtry lib/tcl8/8.4/platform
-@dirrmtry lib/tcl8/8.4
-@dirrmtry lib/tcl8/8.5
-@dirrmtry lib/tcl8