From a3d5ad466d45d284ca336ee01f49d08af443ef28 Mon Sep 17 00:00:00 2001 From: kevlo Date: Mon, 11 Jun 2012 01:46:34 +0000 Subject: Remove obsolete ports --- chinese/Makefile | 2 - chinese/tcl83/Makefile | 429 ------- chinese/tcl83/distinfo | 2 - chinese/tcl83/files/patch-aa | 157 --- chinese/tcl83/files/patch-ab | 2329 ------------------------------------- chinese/tcl83/files/patch-ac | 15 - chinese/tcl83/files/patch-ad | 47 - chinese/tcl83/files/patch-ae | 21 - chinese/tcl83/files/patch-af | 69 -- chinese/tcl83/pkg-deinstall.tclsh | 22 - chinese/tcl83/pkg-descr | 8 - chinese/tcl83/pkg-install.tclsh | 35 - chinese/tcl83/pkg-plist | 125 -- chinese/tk83/Makefile | 318 ----- chinese/tk83/distinfo | 2 - chinese/tk83/files/patch-aa | 1547 ------------------------ chinese/tk83/files/patch-ab | 174 --- chinese/tk83/files/patch-ac | 20 - chinese/tk83/files/patch-ad | 34 - chinese/tk83/files/patch-ae | 261 ----- chinese/tk83/files/patch-af | 91 -- chinese/tk83/files/patch-ag | 13 - chinese/tk83/files/patch-ah | 95 -- chinese/tk83/files/patch-ai | 14 - chinese/tk83/files/patch-aj | 26 - chinese/tk83/files/patch-ak | 47 - chinese/tk83/files/patch-al | 73 -- chinese/tk83/files/patch-am | 306 ----- chinese/tk83/files/patch-an | 16 - chinese/tk83/files/patch-ao | 16 - chinese/tk83/pkg-deinstall.wish | 22 - chinese/tk83/pkg-descr | 6 - chinese/tk83/pkg-install.wish | 32 - chinese/tk83/pkg-plist | 139 --- 34 files changed, 6513 deletions(-) delete mode 100644 chinese/tcl83/Makefile delete mode 100644 chinese/tcl83/distinfo delete mode 100644 chinese/tcl83/files/patch-aa delete mode 100644 chinese/tcl83/files/patch-ab delete mode 100644 chinese/tcl83/files/patch-ac delete mode 100644 chinese/tcl83/files/patch-ad delete mode 100644 chinese/tcl83/files/patch-ae delete mode 100644 chinese/tcl83/files/patch-af delete mode 100644 chinese/tcl83/pkg-deinstall.tclsh delete mode 100644 chinese/tcl83/pkg-descr delete mode 100644 chinese/tcl83/pkg-install.tclsh delete mode 100644 chinese/tcl83/pkg-plist delete mode 100644 chinese/tk83/Makefile delete mode 100644 chinese/tk83/distinfo delete mode 100644 chinese/tk83/files/patch-aa delete mode 100644 chinese/tk83/files/patch-ab delete mode 100644 chinese/tk83/files/patch-ac delete mode 100644 chinese/tk83/files/patch-ad delete mode 100644 chinese/tk83/files/patch-ae delete mode 100644 chinese/tk83/files/patch-af delete mode 100644 chinese/tk83/files/patch-ag delete mode 100644 chinese/tk83/files/patch-ah delete mode 100644 chinese/tk83/files/patch-ai delete mode 100644 chinese/tk83/files/patch-aj delete mode 100644 chinese/tk83/files/patch-ak delete mode 100644 chinese/tk83/files/patch-al delete mode 100644 chinese/tk83/files/patch-am delete mode 100644 chinese/tk83/files/patch-an delete mode 100644 chinese/tk83/files/patch-ao delete mode 100644 chinese/tk83/pkg-deinstall.wish delete mode 100644 chinese/tk83/pkg-descr delete mode 100644 chinese/tk83/pkg-install.wish delete mode 100644 chinese/tk83/pkg-plist (limited to 'chinese') diff --git a/chinese/Makefile b/chinese/Makefile index d545dd3838f3..59ee09ece37b 100644 --- a/chinese/Makefile +++ b/chinese/Makefile @@ -127,11 +127,9 @@ SUBDIR += stardict-dict-zh_CN SUBDIR += stardict-dict-zh_TW SUBDIR += sunpinyin - SUBDIR += tcl83 SUBDIR += telnet SUBDIR += tin SUBDIR += tintin++ - SUBDIR += tk83 SUBDIR += ttf2pt1 SUBDIR += ttfm SUBDIR += unrar diff --git a/chinese/tcl83/Makefile b/chinese/tcl83/Makefile deleted file mode 100644 index f40fe01866b7..000000000000 --- a/chinese/tcl83/Makefile +++ /dev/null @@ -1,429 +0,0 @@ -# New ports collection makefile for: tcl8.3 -# Date created: 21 February 2001 -# Whom: Kevin Lo -# -# $FreeBSD$ -# - -PORTNAME= tcl -PORTVERSION= 8.3.0 -CATEGORIES= chinese lang tcl -MASTER_SITES= ${MASTER_SITE_TCLTK} -MASTER_SITE_SUBDIR= tcl8_3 -DISTNAME= ${PORTNAME}${PORTVERSION} - -MAINTAINER= kevlo@FreeBSD.org -COMMENT= Tool Command Language which supports Chinese - -WRKSRC= ${WRKDIR}/${DISTNAME}/unix -GNU_CONFIGURE= yes -CONFIGURE_ENV= PORTSDIR=${PORTSDIR} -CONFIGURE_ARGS= --enable-shared --enable-i18nImprove -USE_LDCONFIG= yes -NOPRECIOUSMAKEVARS= yes # Otherwise 'make readmes' is broken -MAKE_ENV= SHORT_TCL_VER=83 -PKGINSTALL= ${PKGDIR}/INSTALL.tclsh - -PLIST_SUB= TCL_VER=8.3 SHORT_TCL_VER=83 - -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 GetHostName.3 \ - GetIndex.3 GetInt.3 GetOpnFl.3 GetStdChan.3 GetVersion.3 Hash.3 \ - InitStubs.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_Main.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 packagens.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_SetErrorCodeVA.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 \ - 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 \ - 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_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_WinTCharToUtf.3 \ - Encoding.3 Tcl_WinUtfToTChar.3 \ - Encoding.3 Tcl_GetEncodingName.3 \ - Encoding.3 Tcl_SetSystemEncoding.3 \ - Encoding.3 Tcl_GetEncodingNames.3 \ - Encoding.3 Tcl_CreateEncoding.3 \ - Encoding.3 Tcl_GetDefaultEncodingDir.3 \ - Encoding.3 Tcl_SetDefaultEncodingDir.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_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 \ - GetHostName.3 Tcl_GetHostName.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 \ - InitStubs.3 Tcl_InitStubs.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_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 \ - 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_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_PkgRequireEx.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 \ - 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_RegExpMatchObj.3 \ - RegExp.3 Tcl_GetRegExpInfo.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 \ - 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 \ - 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 \ - 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 \ - 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_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_AppendStringsToObj.3 \ - StringObj.3 Tcl_AppendStringsToObjVA.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_UniCharToUtfDString.3 \ - Utf.3 Tcl_UtfToUniCharDString.3 \ - Utf.3 Tcl_UniCharLen.3 \ - Utf.3 Tcl_UniCharNcmp.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 \ - packagens.n pkg::create.n \ - pkgMkIndex.n pkg_mkIndex.n \ - safe.n Safe\Base.n \ - tcltest.n Tcltest.n - -.include - -.if ${OSVERSION} >= 900000 -BROKEN= does not build -.endif - -post-install: -.if exists(${PKGINSTALL}) - ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} -.endif - -test: - cd ${WRKSRC} && ${MAKE} test - -.include diff --git a/chinese/tcl83/distinfo b/chinese/tcl83/distinfo deleted file mode 100644 index af35a323be57..000000000000 --- a/chinese/tcl83/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (tcl8.3.0.tar.gz) = cb6b23a1023d5b75f08694debf3b0498fa5966c36855394bf6aa9351e77d578a -SIZE (tcl8.3.0.tar.gz) = 2527285 diff --git a/chinese/tcl83/files/patch-aa b/chinese/tcl83/files/patch-aa deleted file mode 100644 index ac2d1a8f6ba5..000000000000 --- a/chinese/tcl83/files/patch-aa +++ /dev/null @@ -1,157 +0,0 @@ ---- Makefile.in.orig Thu Feb 10 11:09:57 2000 -+++ Makefile.in Wed Feb 21 21:08:13 2001 -@@ -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 = $(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 -@@ -77,12 +79,15 @@ - CFLAGS_DEBUG = @CFLAGS_DEBUG@ - CFLAGS_OPTIMIZE = @CFLAGS_OPTIMIZE@ - -+# I18n improvement flags -+I18N_FLAGS = @I18N_FLAGS@ -+ - # To change the compiler switches, for example to change from optimization to - # debugging symbols, change the following line: - #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 +161,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 - -@@ -200,7 +205,7 @@ - - COMPAT_OBJS = @LIBOBJS@ - --AC_FLAGS = @EXTRA_CFLAGS@ @DEFS@ -+AC_FLAGS = @EXTRA_CFLAGS@ @DEFS@ @CPPFLAGS@ @I18N_FLAGS@ - RANLIB = @RANLIB@ - SRC_DIR = @srcdir@ - TOP_DIR = @srcdir@/.. -@@ -383,7 +388,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) libtcl${SHORT_TCL_VER}.a tclsh - - libraries: - -@@ -396,6 +401,11 @@ - @MAKE_LIB@ - $(RANLIB) ${TCL_LIB_FILE} - -+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@ -@@ -506,8 +516,13 @@ - fi - @echo "Installing $(TCL_LIB_FILE) to $(LIB_INSTALL_DIR)/" - @$(INSTALL_DATA) $(TCL_LIB_FILE) $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE) -+ @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 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) to $(LIB_INSTALL_DIR)/"; \ - $(INSTALL_DATA) $(TCL_BUILD_EXP_FILE) \ -@@ -515,8 +530,9 @@ - fi - @echo "Installing tclsh as $(BIN_INSTALL_DIR)/tclsh$(VERSION)" - @$(INSTALL_PROGRAM) tclsh $(BIN_INSTALL_DIR)/tclsh$(VERSION) -- @echo "Installing tclConfig.sh to $(LIB_INSTALL_DIR)/" -- @$(INSTALL_DATA) tclConfig.sh $(LIB_INSTALL_DIR)/tclConfig.sh -+ @echo "Installing tclConfig.sh to $(SCRIPT_INSTALL_DIR)/" -+ @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) to $(LIB_INSTALL_DIR)/"; \ - $(INSTALL_DATA) $(STUB_LIB_FILE) \ -@@ -524,8 +540,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"; \ -@@ -547,10 +563,16 @@ - chmod +x $(SRC_DIR)/install-sh; \ - fi - @echo "Installing header files"; -- @for i in $(GENERIC_DIR)/tcl.h $(GENERIC_DIR)/tclDecls.h ; \ -+ @for i in $(GENERIC_DIR)/*.h ; \ -+ do \ -+ $(INSTALL_DATA) $$i $(GENERIC_INCLUDE_INSTALL_DIR); \ -+ done; -+ @for i in $(UNIX_DIR)/*.h ; \ - do \ -- $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR); \ -+ $(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 - @echo "Installing library files to $(SCRIPT_INSTALL_DIR)"; - @for i in $(TOP_DIR)/library/*.tcl $(TOP_DIR)/library/tclIndex $(UNIX_DIR)/tclAppInit.c $(UNIX_DIR)/ldAix; \ - do \ -@@ -591,7 +613,6 @@ - chmod 444 $(MAN1_INSTALL_DIR)/$$i; \ - done; - @echo "Cross-linking top-level (.1) docs"; -- @$(UNIX_DIR)/mkLinks $(MAN1_INSTALL_DIR) - @echo "Installing C API (.3) docs"; - @cd $(TOP_DIR)/doc; for i in *.3; \ - do \ -@@ -601,7 +622,6 @@ - chmod 444 $(MAN3_INSTALL_DIR)/$$i; \ - done; - @echo "Cross-linking C API (.3) docs"; -- @$(UNIX_DIR)/mkLinks $(MAN3_INSTALL_DIR) - @echo "Installing command (.n) docs"; - @cd $(TOP_DIR)/doc; for i in *.n; \ - do \ -@@ -611,7 +631,14 @@ - chmod 444 $(MANN_INSTALL_DIR)/$$i; \ - done; - @echo "Cross-linking command (.n) docs"; -- @$(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/chinese/tcl83/files/patch-ab b/chinese/tcl83/files/patch-ab deleted file mode 100644 index 0e1e6d5b8789..000000000000 --- a/chinese/tcl83/files/patch-ab +++ /dev/null @@ -1,2329 +0,0 @@ ---- configure.orig Thu Feb 10 11:09:57 2000 -+++ configure Wed Feb 21 21:11:52 2001 -@@ -16,6 +16,8 @@ - ac_help="$ac_help - --enable-threads build with threads" - ac_help="$ac_help -+ --enable-i18nImprove enable i18n improvement features [--enable-i18nImprove]" -+ac_help="$ac_help - --enable-64bit enable 64bit support" - ac_help="$ac_help - --disable-load disallow dynamic loading and "load" command" -@@ -560,7 +562,7 @@ - # Extract the first word of "ranlib", so it can be a program name with args. - set dummy ranlib; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:564: checking for $ac_word" >&5 -+echo "configure:566: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -601,7 +603,7 @@ - # Extract the first word of "gcc", so it can be a program name with args. - set dummy gcc; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:605: checking for $ac_word" >&5 -+echo "configure:607: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -631,7 +633,7 @@ - # Extract the first word of "cc", so it can be a program name with args. - set dummy cc; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:635: checking for $ac_word" >&5 -+echo "configure:637: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -682,7 +684,7 @@ - # Extract the first word of "cl", so it can be a program name with args. - set dummy cl; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:686: checking for $ac_word" >&5 -+echo "configure:688: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -714,7 +716,7 @@ - fi - - echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 --echo "configure:718: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 -+echo "configure:720: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 - - ac_ext=c - # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -@@ -725,12 +727,12 @@ - - cat > conftest.$ac_ext << EOF - --#line 729 "configure" -+#line 731 "configure" - #include "confdefs.h" - - main(){return(0);} - EOF --if { (eval echo configure:734: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - ac_cv_prog_cc_works=yes - # If we can't run a trivial program, we are probably using a cross compiler. - if (./conftest; exit) 2>/dev/null; then -@@ -756,12 +758,12 @@ - { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } - fi - echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 --echo "configure:760: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 -+echo "configure:762: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 - echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 - cross_compiling=$ac_cv_prog_cc_cross - - echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 --echo "configure:765: checking whether we are using GNU C" >&5 -+echo "configure:767: checking whether we are using GNU C" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -770,7 +772,7 @@ - yes; - #endif - EOF --if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:774: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then -+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:776: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then - ac_cv_prog_gcc=yes - else - ac_cv_prog_gcc=no -@@ -789,7 +791,7 @@ - ac_save_CFLAGS="$CFLAGS" - CFLAGS= - echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 --echo "configure:793: checking whether ${CC-cc} accepts -g" >&5 -+echo "configure:795: checking whether ${CC-cc} accepts -g" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -825,7 +827,7 @@ - fi - - echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 --echo "configure:829: checking how to run the C preprocessor" >&5 -+echo "configure:831: checking how to run the C preprocessor" >&5 - # On Suns, sometimes $CPP names a directory. - if test -n "$CPP" && test -d "$CPP"; then - CPP= -@@ -840,13 +842,13 @@ - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. - cat > conftest.$ac_ext < - Syntax Error - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:850: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:852: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - : -@@ -857,13 +859,13 @@ - rm -rf conftest* - CPP="${CC-cc} -E -traditional-cpp" - cat > conftest.$ac_ext < - Syntax Error - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:867: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:869: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - : -@@ -874,13 +876,13 @@ - rm -rf conftest* - CPP="${CC-cc} -nologo -E" - cat > conftest.$ac_ext < - Syntax Error - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:884: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:886: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - : -@@ -908,17 +910,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:912: checking for $ac_hdr" >&5 -+echo "configure:914: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:922: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:924: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -951,7 +953,7 @@ - - - echo $ac_n "checking for building with threads""... $ac_c" 1>&6 --echo "configure:955: checking for building with threads" >&5 -+echo "configure:957: checking for building with threads" >&5 - # Check whether --enable-threads or --disable-threads was given. - if test "${enable_threads+set}" = set; then - enableval="$enable_threads" -@@ -978,7 +980,7 @@ - - - echo $ac_n "checking for pthread_mutex_init in -lpthread""... $ac_c" 1>&6 --echo "configure:982: checking for pthread_mutex_init in -lpthread" >&5 -+echo "configure:984: checking for pthread_mutex_init in -lpthread" >&5 - ac_lib_var=`echo pthread'_'pthread_mutex_init | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -986,7 +988,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lpthread $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:1003: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -1023,7 +1025,7 @@ - THREADS_LIBS=" -lpthread" - else - echo $ac_n "checking for pthread_mutex_init in -lpthreads""... $ac_c" 1>&6 --echo "configure:1027: checking for pthread_mutex_init in -lpthreads" >&5 -+echo "configure:1029: checking for pthread_mutex_init in -lpthreads" >&5 - ac_lib_var=`echo pthreads'_'pthread_mutex_init | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -1031,7 +1033,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lpthreads $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:1048: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -1068,7 +1070,7 @@ - THREADS_LIBS=" -lpthreads" - else - echo $ac_n "checking for pthread_mutex_init in -lc""... $ac_c" 1>&6 --echo "configure:1072: checking for pthread_mutex_init in -lc" >&5 -+echo "configure:1074: checking for pthread_mutex_init in -lc" >&5 - ac_lib_var=`echo c'_'pthread_mutex_init | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -1076,7 +1078,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lc $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:1093: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -1120,6 +1122,40 @@ - fi - - -+#------------------------------------------------------------------------ -+# i18n improvement -+#------------------------------------------------------------------------ -+ -+ -+ echo $ac_n "checking if i18n improvement features are enabled""... $ac_c" 1>&6 -+echo "configure:1132: checking if i18n improvement features are enabled" >&5 -+ # Check whether --enable-i18nImprove or --disable-i18nImprove was given. -+if test "${enable_i18nImprove+set}" = set; then -+ enableval="$enable_i18nImprove" -+ tcl_ok=$enableval -+else -+ tcl_ok=yes -+fi -+ -+ -+ if test "${enable_i18nImprove+set}" = set; then -+ enableval="$enable_i18nImprove" -+ tcl_ok=$enableval -+ else -+ tcl_ok=yes -+ fi -+ -+ if test "$tcl_ok" = "yes" ; then -+ echo "$ac_t""enabled" 1>&6 -+ I18N_FLAGS='-DI18N_IMPROVE' -+ else -+ echo "$ac_t""disabled" 1>&6 -+ I18N_FLAGS='' -+ fi -+ -+ -+ -+ - #------------------------------------------------------------------------------ - # If we're using GCC, see if the compiler understands -pipe. If so, use it. - # It makes compiling go faster. (This is only a performance feature.) -@@ -1128,18 +1164,18 @@ - if test -z "$no_pipe"; then - if test -n "$GCC"; then - echo $ac_n "checking if the compiler understands -pipe""... $ac_c" 1>&6 --echo "configure:1132: checking if the compiler understands -pipe" >&5 -+echo "configure:1168: checking if the compiler understands -pipe" >&5 - OLDCC="$CC" - CC="$CC -pipe" - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:1179: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - echo "$ac_t""yes" 1>&6 - else -@@ -1162,12 +1198,12 @@ - for ac_func in getcwd - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:1166: checking for $ac_func" >&5 -+echo "configure:1202: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:1230: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -1224,12 +1260,12 @@ - for ac_func in opendir strstr - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:1228: checking for $ac_func" >&5 -+echo "configure:1264: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:1292: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -1282,12 +1318,12 @@ - for ac_func in strtol tmpnam waitpid - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:1286: checking for $ac_func" >&5 -+echo "configure:1322: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:1350: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -1337,12 +1373,12 @@ - - - echo $ac_n "checking for strerror""... $ac_c" 1>&6 --echo "configure:1341: checking for strerror" >&5 -+echo "configure:1377: checking for strerror" >&5 - if eval "test \"`echo '$''{'ac_cv_func_strerror'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:1405: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_strerror=yes" - else -@@ -1389,12 +1425,12 @@ - fi - - echo $ac_n "checking for getwd""... $ac_c" 1>&6 --echo "configure:1393: checking for getwd" >&5 -+echo "configure:1429: checking for getwd" >&5 - if eval "test \"`echo '$''{'ac_cv_func_getwd'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:1457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_getwd=yes" - else -@@ -1441,12 +1477,12 @@ - fi - - echo $ac_n "checking for wait3""... $ac_c" 1>&6 --echo "configure:1445: checking for wait3" >&5 -+echo "configure:1481: checking for wait3" >&5 - if eval "test \"`echo '$''{'ac_cv_func_wait3'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:1509: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_wait3=yes" - else -@@ -1493,12 +1529,12 @@ - fi - - echo $ac_n "checking for uname""... $ac_c" 1>&6 --echo "configure:1497: checking for uname" >&5 -+echo "configure:1533: checking for uname" >&5 - if eval "test \"`echo '$''{'ac_cv_func_uname'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:1561: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_uname=yes" - else -@@ -1545,12 +1581,12 @@ - fi - - echo $ac_n "checking for realpath""... $ac_c" 1>&6 --echo "configure:1549: checking for realpath" >&5 -+echo "configure:1585: checking for realpath" >&5 - if eval "test \"`echo '$''{'ac_cv_func_realpath'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:1613: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_realpath=yes" - else -@@ -1634,9 +1670,9 @@ - - - echo $ac_n "checking dirent.h""... $ac_c" 1>&6 --echo "configure:1638: checking dirent.h" >&5 -+echo "configure:1674: checking dirent.h" >&5 - cat > conftest.$ac_ext < - #include -@@ -1662,7 +1698,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:1666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:1702: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - tcl_ok=yes - else -@@ -1683,17 +1719,17 @@ - echo "$ac_t""$tcl_ok" 1>&6 - ac_safe=`echo "errno.h" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for errno.h""... $ac_c" 1>&6 --echo "configure:1687: checking for errno.h" >&5 -+echo "configure:1723: checking for errno.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:1697: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:1733: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -1720,17 +1756,17 @@ - - ac_safe=`echo "float.h" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for float.h""... $ac_c" 1>&6 --echo "configure:1724: checking for float.h" >&5 -+echo "configure:1760: checking for float.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:1734: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:1770: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -1757,17 +1793,17 @@ - - ac_safe=`echo "values.h" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for values.h""... $ac_c" 1>&6 --echo "configure:1761: checking for values.h" >&5 -+echo "configure:1797: checking for values.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:1771: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:1807: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -1794,17 +1830,17 @@ - - ac_safe=`echo "limits.h" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for limits.h""... $ac_c" 1>&6 --echo "configure:1798: checking for limits.h" >&5 -+echo "configure:1834: checking for limits.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:1808: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:1844: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -1831,17 +1867,17 @@ - - ac_safe=`echo "stdlib.h" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for stdlib.h""... $ac_c" 1>&6 --echo "configure:1835: checking for stdlib.h" >&5 -+echo "configure:1871: checking for stdlib.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:1845: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:1881: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -1864,7 +1900,7 @@ - fi - - cat > conftest.$ac_ext < - EOF -@@ -1878,7 +1914,7 @@ - rm -f conftest* - - cat > conftest.$ac_ext < - EOF -@@ -1892,7 +1928,7 @@ - rm -f conftest* - - cat > conftest.$ac_ext < - EOF -@@ -1913,17 +1949,17 @@ - fi - ac_safe=`echo "string.h" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for string.h""... $ac_c" 1>&6 --echo "configure:1917: checking for string.h" >&5 -+echo "configure:1953: checking for string.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:1927: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:1963: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -1946,7 +1982,7 @@ - fi - - cat > conftest.$ac_ext < - EOF -@@ -1960,7 +1996,7 @@ - rm -f conftest* - - cat > conftest.$ac_ext < - EOF -@@ -1986,17 +2022,17 @@ - - ac_safe=`echo "sys/wait.h" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for sys/wait.h""... $ac_c" 1>&6 --echo "configure:1990: checking for sys/wait.h" >&5 -+echo "configure:2026: checking for sys/wait.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:2000: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:2036: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -2023,17 +2059,17 @@ - - ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6 --echo "configure:2027: checking for dlfcn.h" >&5 -+echo "configure:2063: checking for dlfcn.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:2037: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:2073: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -2065,17 +2101,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:2069: checking for $ac_hdr" >&5 -+echo "configure:2105: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:2079: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:2115: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -2112,13 +2148,13 @@ - - - echo $ac_n "checking termios vs. termio vs. sgtty""... $ac_c" 1>&6 --echo "configure:2116: checking termios vs. termio vs. sgtty" >&5 -+echo "configure:2152: checking termios vs. termio vs. sgtty" >&5 - - if test "$cross_compiling" = yes; then - tk_ok=no - else - cat > conftest.$ac_ext < -@@ -2134,7 +2170,7 @@ - return 1; - } - EOF --if { (eval echo configure:2138: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:2174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - tk_ok=termios - else -@@ -2157,7 +2193,7 @@ - tk_ok=no - else - cat > conftest.$ac_ext < -@@ -2172,7 +2208,7 @@ - return 1; - } - EOF --if { (eval echo configure:2176: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:2212: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - tk_ok=termio - else -@@ -2195,7 +2231,7 @@ - tk_ok=none - else - cat > conftest.$ac_ext < -@@ -2211,7 +2247,7 @@ - return 1; - } - EOF --if { (eval echo configure:2215: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:2251: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - tk_ok=sgtty - else -@@ -2245,16 +2281,16 @@ - #-------------------------------------------------------------------- - - echo $ac_n "checking fd_set and sys/select""... $ac_c" 1>&6 --echo "configure:2249: checking fd_set and sys/select" >&5 -+echo "configure:2285: checking fd_set and sys/select" >&5 - cat > conftest.$ac_ext < - int main() { - fd_set readMask, writeMask; - ; return 0; } - EOF --if { (eval echo configure:2258: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:2294: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - tk_ok=yes - else -@@ -2266,7 +2302,7 @@ - rm -f conftest* - if test $tk_ok = no; then - cat > conftest.$ac_ext < - EOF -@@ -2297,12 +2333,12 @@ - #------------------------------------------------------------------------------ - - echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 --echo "configure:2301: checking whether struct tm is in sys/time.h or time.h" >&5 -+echo "configure:2337: checking whether struct tm is in sys/time.h or time.h" >&5 - if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - #include -@@ -2310,7 +2346,7 @@ - struct tm *tp; tp->tm_sec; - ; return 0; } - EOF --if { (eval echo configure:2314: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:2350: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_struct_tm=time.h - else -@@ -2335,17 +2371,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:2339: checking for $ac_hdr" >&5 -+echo "configure:2375: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:2349: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:2385: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -2372,12 +2408,12 @@ - done - - echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 --echo "configure:2376: checking whether time.h and sys/time.h may both be included" >&5 -+echo "configure:2412: checking whether time.h and sys/time.h may both be included" >&5 - if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - #include -@@ -2386,7 +2422,7 @@ - struct tm *tp; - ; return 0; } - EOF --if { (eval echo configure:2390: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:2426: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_header_time=yes - else -@@ -2407,12 +2443,12 @@ - fi - - echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6 --echo "configure:2411: checking for tm_zone in struct tm" >&5 -+echo "configure:2447: checking for tm_zone in struct tm" >&5 - if eval "test \"`echo '$''{'ac_cv_struct_tm_zone'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - #include <$ac_cv_struct_tm> -@@ -2420,7 +2456,7 @@ - struct tm tm; tm.tm_zone; - ; return 0; } - EOF --if { (eval echo configure:2424: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:2460: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_struct_tm_zone=yes - else -@@ -2440,12 +2476,12 @@ - - else - echo $ac_n "checking for tzname""... $ac_c" 1>&6 --echo "configure:2444: checking for tzname" >&5 -+echo "configure:2480: checking for tzname" >&5 - if eval "test \"`echo '$''{'ac_cv_var_tzname'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - #ifndef tzname /* For SGI. */ -@@ -2455,7 +2491,7 @@ - atoi(*tzname); - ; return 0; } - EOF --if { (eval echo configure:2459: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:2495: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_var_tzname=yes - else -@@ -2478,16 +2514,16 @@ - - - echo $ac_n "checking tm_tzadj in struct tm""... $ac_c" 1>&6 --echo "configure:2482: checking tm_tzadj in struct tm" >&5 -+echo "configure:2518: checking tm_tzadj in struct tm" >&5 - cat > conftest.$ac_ext < - int main() { - struct tm tm; tm.tm_tzadj; - ; return 0; } - EOF --if { (eval echo configure:2491: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:2527: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - cat >> confdefs.h <<\EOF - #define HAVE_TM_TZADJ 1 -@@ -2503,16 +2539,16 @@ - rm -f conftest* - - echo $ac_n "checking tm_gmtoff in struct tm""... $ac_c" 1>&6 --echo "configure:2507: checking tm_gmtoff in struct tm" >&5 -+echo "configure:2543: checking tm_gmtoff in struct tm" >&5 - cat > conftest.$ac_ext < - int main() { - struct tm tm; tm.tm_gmtoff; - ; return 0; } - EOF --if { (eval echo configure:2516: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:2552: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - cat >> confdefs.h <<\EOF - #define HAVE_TM_GMTOFF 1 -@@ -2533,9 +2569,9 @@ - # - have_timezone=no - echo $ac_n "checking long timezone variable""... $ac_c" 1>&6 --echo "configure:2537: checking long timezone variable" >&5 -+echo "configure:2573: checking long timezone variable" >&5 - cat > conftest.$ac_ext < - int main() { -@@ -2544,7 +2580,7 @@ - exit (0); - ; return 0; } - EOF --if { (eval echo configure:2548: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:2584: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - have_timezone=yes - cat >> confdefs.h <<\EOF -@@ -2565,9 +2601,9 @@ - # - if test "$have_timezone" = no; then - echo $ac_n "checking time_t timezone variable""... $ac_c" 1>&6 --echo "configure:2569: checking time_t timezone variable" >&5 -+echo "configure:2605: checking time_t timezone variable" >&5 - cat > conftest.$ac_ext < - int main() { -@@ -2576,7 +2612,7 @@ - exit (0); - ; return 0; } - EOF --if { (eval echo configure:2580: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:2616: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - cat >> confdefs.h <<\EOF - #define HAVE_TIMEZONE_VAR 1 -@@ -2601,7 +2637,7 @@ - - if test "`uname -s`" = "AIX" ; then - echo $ac_n "checking for gettimeofday in -lbsd""... $ac_c" 1>&6 --echo "configure:2605: checking for gettimeofday in -lbsd" >&5 -+echo "configure:2641: checking for gettimeofday in -lbsd" >&5 - ac_lib_var=`echo bsd'_'gettimeofday | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -2609,7 +2645,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lbsd $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:2660: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -2654,12 +2690,12 @@ - # in struct stat. But we might be able to use fstatfs instead. - #-------------------------------------------------------------------- - echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6 --echo "configure:2658: checking for st_blksize in struct stat" >&5 -+echo "configure:2694: checking for st_blksize in struct stat" >&5 - if eval "test \"`echo '$''{'ac_cv_struct_st_blksize'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - #include -@@ -2667,7 +2703,7 @@ - struct stat s; s.st_blksize; - ; return 0; } - EOF --if { (eval echo configure:2671: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:2707: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_struct_st_blksize=yes - else -@@ -2688,12 +2724,12 @@ - fi - - echo $ac_n "checking for fstatfs""... $ac_c" 1>&6 --echo "configure:2692: checking for fstatfs" >&5 -+echo "configure:2728: checking for fstatfs" >&5 - if eval "test \"`echo '$''{'ac_cv_func_fstatfs'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:2756: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_fstatfs=yes" - else -@@ -2745,7 +2781,7 @@ - # data, this checks it and add memcmp.o to LIBOBJS if needed - #-------------------------------------------------------------------- - echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 --echo "configure:2749: checking for 8-bit clean memcmp" >&5 -+echo "configure:2785: checking for 8-bit clean memcmp" >&5 - if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2753,7 +2789,7 @@ - ac_cv_func_memcmp_clean=no - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:2803: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - ac_cv_func_memcmp_clean=yes - else -@@ -2787,12 +2823,12 @@ - # {The replacement define is in compat/string.h} - #-------------------------------------------------------------------- - echo $ac_n "checking for memmove""... $ac_c" 1>&6 --echo "configure:2791: checking for memmove" >&5 -+echo "configure:2827: checking for memmove" >&5 - if eval "test \"`echo '$''{'ac_cv_func_memmove'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:2855: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_memmove=yes" - else -@@ -2848,12 +2884,12 @@ - #-------------------------------------------------------------------- - - echo $ac_n "checking proper strstr implementation""... $ac_c" 1>&6 --echo "configure:2852: checking proper strstr implementation" >&5 -+echo "configure:2888: checking proper strstr implementation" >&5 - if test "$cross_compiling" = yes; then - tcl_ok=no - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:2903: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - tcl_ok=yes - else -@@ -2889,12 +2925,12 @@ - #-------------------------------------------------------------------- - - echo $ac_n "checking for strtoul""... $ac_c" 1>&6 --echo "configure:2893: checking for strtoul" >&5 -+echo "configure:2929: checking for strtoul" >&5 - if eval "test \"`echo '$''{'ac_cv_func_strtoul'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:2957: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_strtoul=yes" - else -@@ -2941,7 +2977,7 @@ - tcl_ok=0 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:2997: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - : - else -@@ -2980,12 +3016,12 @@ - #-------------------------------------------------------------------- - - echo $ac_n "checking for strtod""... $ac_c" 1>&6 --echo "configure:2984: checking for strtod" >&5 -+echo "configure:3020: checking for strtod" >&5 - if eval "test \"`echo '$''{'ac_cv_func_strtod'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:3048: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_strtod=yes" - else -@@ -3032,7 +3068,7 @@ - tcl_ok=0 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:3088: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - : - else -@@ -3074,12 +3110,12 @@ - - - echo $ac_n "checking for strtod""... $ac_c" 1>&6 --echo "configure:3078: checking for strtod" >&5 -+echo "configure:3114: checking for strtod" >&5 - if eval "test \"`echo '$''{'ac_cv_func_strtod'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:3142: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_strtod=yes" - else -@@ -3124,12 +3160,12 @@ - - if test "$tcl_strtod" = 1; then - echo $ac_n "checking for Solaris2.4/Tru64 strtod bugs""... $ac_c" 1>&6 --echo "configure:3128: checking for Solaris2.4/Tru64 strtod bugs" >&5 -+echo "configure:3164: checking for Solaris2.4/Tru64 strtod bugs" >&5 - if test "$cross_compiling" = yes; then - tcl_ok=0 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:3189: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - tcl_ok=1 - else -@@ -3180,12 +3216,12 @@ - #-------------------------------------------------------------------- - - echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 --echo "configure:3184: checking for ANSI C header files" >&5 -+echo "configure:3220: checking for ANSI C header files" >&5 - if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - #include -@@ -3193,7 +3229,7 @@ - #include - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:3197: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:3233: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -3210,7 +3246,7 @@ - if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat > conftest.$ac_ext < - EOF -@@ -3228,7 +3264,7 @@ - if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat > conftest.$ac_ext < - EOF -@@ -3249,7 +3285,7 @@ - : - else - cat > conftest.$ac_ext < - #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -@@ -3260,7 +3296,7 @@ - exit (0); } - - EOF --if { (eval echo configure:3264: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:3300: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - : - else -@@ -3284,12 +3320,12 @@ - fi - - echo $ac_n "checking for mode_t""... $ac_c" 1>&6 --echo "configure:3288: checking for mode_t" >&5 -+echo "configure:3324: checking for mode_t" >&5 - if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - #if STDC_HEADERS -@@ -3317,12 +3353,12 @@ - fi - - echo $ac_n "checking for pid_t""... $ac_c" 1>&6 --echo "configure:3321: checking for pid_t" >&5 -+echo "configure:3357: checking for pid_t" >&5 - if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - #if STDC_HEADERS -@@ -3350,12 +3386,12 @@ - fi - - echo $ac_n "checking for size_t""... $ac_c" 1>&6 --echo "configure:3354: checking for size_t" >&5 -+echo "configure:3390: checking for size_t" >&5 - if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - #if STDC_HEADERS -@@ -3383,12 +3419,12 @@ - fi - - echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 --echo "configure:3387: checking for uid_t in sys/types.h" >&5 -+echo "configure:3423: checking for uid_t in sys/types.h" >&5 - if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - EOF -@@ -3425,12 +3461,12 @@ - #-------------------------------------------------------------------- - - echo $ac_n "checking for opendir""... $ac_c" 1>&6 --echo "configure:3429: checking for opendir" >&5 -+echo "configure:3465: checking for opendir" >&5 - if eval "test \"`echo '$''{'ac_cv_func_opendir'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:3493: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_opendir=yes" - else -@@ -3486,9 +3522,9 @@ - #-------------------------------------------------------------------- - - echo $ac_n "checking union wait""... $ac_c" 1>&6 --echo "configure:3490: checking union wait" >&5 -+echo "configure:3526: checking union wait" >&5 - cat > conftest.$ac_ext < - #include -@@ -3500,7 +3536,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:3504: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:3540: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - tcl_ok=yes - else -@@ -3524,9 +3560,9 @@ - #-------------------------------------------------------------------- - - echo $ac_n "checking matherr support""... $ac_c" 1>&6 --echo "configure:3528: checking matherr support" >&5 -+echo "configure:3564: checking matherr support" >&5 - cat > conftest.$ac_ext < - int main() { -@@ -3537,7 +3573,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:3541: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:3577: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - tcl_ok=yes - else -@@ -3562,12 +3598,12 @@ - #-------------------------------------------------------------------- - - echo $ac_n "checking for strncasecmp""... $ac_c" 1>&6 --echo "configure:3566: checking for strncasecmp" >&5 -+echo "configure:3602: checking for strncasecmp" >&5 - if eval "test \"`echo '$''{'ac_cv_func_strncasecmp'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:3630: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_strncasecmp=yes" - else -@@ -3612,7 +3648,7 @@ - - if test "$tcl_ok" = 0; then - echo $ac_n "checking for strncasecmp in -lsocket""... $ac_c" 1>&6 --echo "configure:3616: checking for strncasecmp in -lsocket" >&5 -+echo "configure:3652: checking for strncasecmp in -lsocket" >&5 - ac_lib_var=`echo socket'_'strncasecmp | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -3620,7 +3656,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lsocket $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:3671: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -3655,7 +3691,7 @@ - fi - if test "$tcl_ok" = 0; then - echo $ac_n "checking for strncasecmp in -linet""... $ac_c" 1>&6 --echo "configure:3659: checking for strncasecmp in -linet" >&5 -+echo "configure:3695: checking for strncasecmp in -linet" >&5 - ac_lib_var=`echo inet'_'strncasecmp | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -3663,7 +3699,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-linet $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:3714: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -3712,12 +3748,12 @@ - #-------------------------------------------------------------------- - - echo $ac_n "checking for BSDgettimeofday""... $ac_c" 1>&6 --echo "configure:3716: checking for BSDgettimeofday" >&5 -+echo "configure:3752: checking for BSDgettimeofday" >&5 - if eval "test \"`echo '$''{'ac_cv_func_BSDgettimeofday'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:3780: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_BSDgettimeofday=yes" - else -@@ -3761,12 +3797,12 @@ - else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for gettimeofday""... $ac_c" 1>&6 --echo "configure:3765: checking for gettimeofday" >&5 -+echo "configure:3801: checking for gettimeofday" >&5 - if eval "test \"`echo '$''{'ac_cv_func_gettimeofday'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:3829: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_gettimeofday=yes" - else -@@ -3815,9 +3851,9 @@ - fi - - echo $ac_n "checking for gettimeofday declaration""... $ac_c" 1>&6 --echo "configure:3819: checking for gettimeofday declaration" >&5 -+echo "configure:3855: checking for gettimeofday declaration" >&5 - cat > conftest.$ac_ext < - EOF -@@ -3853,14 +3889,14 @@ - #-------------------------------------------------------------------- - - echo $ac_n "checking whether char is unsigned""... $ac_c" 1>&6 --echo "configure:3857: checking whether char is unsigned" >&5 -+echo "configure:3893: checking whether char is unsigned" >&5 - if eval "test \"`echo '$''{'ac_cv_c_char_unsigned'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - if test "$GCC" = yes; then - # GCC predefines this symbol on systems where it applies. - cat > conftest.$ac_ext <&2; exit 1; } - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:3932: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - ac_cv_c_char_unsigned=yes - else -@@ -3916,9 +3952,9 @@ - fi - - echo $ac_n "checking signed char declarations""... $ac_c" 1>&6 --echo "configure:3920: checking signed char declarations" >&5 -+echo "configure:3956: checking signed char declarations" >&5 - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:3968: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - tcl_ok=yes - else -@@ -3989,12 +4025,12 @@ - #-------------------------------------------------------------------- - - echo $ac_n "checking for sin""... $ac_c" 1>&6 --echo "configure:3993: checking for sin" >&5 -+echo "configure:4029: checking for sin" >&5 - if eval "test \"`echo '$''{'ac_cv_func_sin'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4057: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_sin=yes" - else -@@ -4038,7 +4074,7 @@ - fi - - echo $ac_n "checking for main in -lieee""... $ac_c" 1>&6 --echo "configure:4042: checking for main in -lieee" >&5 -+echo "configure:4078: checking for main in -lieee" >&5 - ac_lib_var=`echo ieee'_'main | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -4046,14 +4082,14 @@ - ac_save_LIBS="$LIBS" - LIBS="-lieee $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4093: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -4085,7 +4121,7 @@ - libbsd=no - if test "`uname -s`" = "AIX" ; then - echo $ac_n "checking for gettimeofday in -lbsd""... $ac_c" 1>&6 --echo "configure:4089: checking for gettimeofday in -lbsd" >&5 -+echo "configure:4125: checking for gettimeofday in -lbsd" >&5 - ac_lib_var=`echo bsd'_'gettimeofday | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -4093,7 +4129,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lbsd $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -4136,7 +4172,7 @@ - #-------------------------------------------------------------------- - - echo $ac_n "checking for main in -linet""... $ac_c" 1>&6 --echo "configure:4140: checking for main in -linet" >&5 -+echo "configure:4176: checking for main in -linet" >&5 - ac_lib_var=`echo inet'_'main | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -4144,14 +4180,14 @@ - ac_save_LIBS="$LIBS" - LIBS="-linet $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4191: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -4173,17 +4209,17 @@ - - ac_safe=`echo "net/errno.h" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for net/errno.h""... $ac_c" 1>&6 --echo "configure:4177: checking for net/errno.h" >&5 -+echo "configure:4213: checking for net/errno.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:4187: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:4223: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -4228,12 +4264,12 @@ - - tcl_checkBoth=0 - echo $ac_n "checking for connect""... $ac_c" 1>&6 --echo "configure:4232: checking for connect" >&5 -+echo "configure:4268: checking for connect" >&5 - if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4296: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_connect=yes" - else -@@ -4278,12 +4314,12 @@ - - if test "$tcl_checkSocket" = 1; then - echo $ac_n "checking for setsockopt""... $ac_c" 1>&6 --echo "configure:4282: checking for setsockopt" >&5 -+echo "configure:4318: checking for setsockopt" >&5 - if eval "test \"`echo '$''{'ac_cv_func_setsockopt'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4346: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_setsockopt=yes" - else -@@ -4324,7 +4360,7 @@ - else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for setsockopt in -lsocket""... $ac_c" 1>&6 --echo "configure:4328: checking for setsockopt in -lsocket" >&5 -+echo "configure:4364: checking for setsockopt in -lsocket" >&5 - ac_lib_var=`echo socket'_'setsockopt | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -4332,7 +4368,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lsocket $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4383: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -4371,12 +4407,12 @@ - tk_oldLibs=$LIBS - LIBS="$LIBS -lsocket -lnsl" - echo $ac_n "checking for accept""... $ac_c" 1>&6 --echo "configure:4375: checking for accept" >&5 -+echo "configure:4411: checking for accept" >&5 - if eval "test \"`echo '$''{'ac_cv_func_accept'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4439: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_accept=yes" - else -@@ -4421,12 +4457,12 @@ - - fi - echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 --echo "configure:4425: checking for gethostbyname" >&5 -+echo "configure:4461: checking for gethostbyname" >&5 - if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4489: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_gethostbyname=yes" - else -@@ -4467,7 +4503,7 @@ - else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 --echo "configure:4471: checking for gethostbyname in -lnsl" >&5 -+echo "configure:4507: checking for gethostbyname in -lnsl" >&5 - ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -4475,7 +4511,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lnsl $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4526: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -4532,7 +4568,7 @@ - # Step 0: Enable 64 bit support? - - echo $ac_n "checking if 64bit support is enabled""... $ac_c" 1>&6 --echo "configure:4536: checking if 64bit support is enabled" >&5 -+echo "configure:4572: checking if 64bit support is enabled" >&5 - # Check whether --enable-64bit or --disable-64bit was given. - if test "${enable_64bit+set}" = set; then - enableval="$enable_64bit" -@@ -4555,7 +4591,7 @@ - # there are a few systems, like Next, where this doesn't work. - - echo $ac_n "checking system version (for dynamic loading)""... $ac_c" 1>&6 --echo "configure:4559: checking system version (for dynamic loading)" >&5 -+echo "configure:4595: checking system version (for dynamic loading)" >&5 - if test -f /usr/lib/NextStep/software_version; then - system=NEXTSTEP-`awk '/3/,/3/' /usr/lib/NextStep/software_version` - else -@@ -4578,7 +4614,7 @@ - fi - - echo $ac_n "checking if gcc is being used""... $ac_c" 1>&6 --echo "configure:4582: checking if gcc is being used" >&5 -+echo "configure:4618: checking if gcc is being used" >&5 - if test "$CC" = "gcc" -o `$CC -v 2>&1 | grep -c gcc` != "0" ; then - using_gcc="yes" - else -@@ -4591,7 +4627,7 @@ - # Linux can use either -ldl or -ldld for dynamic loading. - - echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 --echo "configure:4595: checking for dlopen in -ldl" >&5 -+echo "configure:4631: checking for dlopen in -ldl" >&5 - ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -4599,7 +4635,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-ldl $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4650: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -4726,7 +4762,7 @@ - HP-UX-*.08.*|HP-UX-*.09.*|HP-UX-*.10.*|HP-UX-*.11.*) - SHLIB_SUFFIX=".sl" - echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6 --echo "configure:4730: checking for shl_load in -ldld" >&5 -+echo "configure:4766: checking for shl_load in -ldld" >&5 - ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -4734,7 +4770,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-ldld $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -4841,17 +4877,17 @@ - else - ac_safe=`echo "dld.h" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for dld.h""... $ac_c" 1>&6 --echo "configure:4845: checking for dld.h" >&5 -+echo "configure:4881: checking for dld.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:4855: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:4891: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -4902,21 +4938,21 @@ - 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 --echo "configure:4910: checking for dlfcn.h" >&5 -+echo "configure:4946: checking for dlfcn.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:4920: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:4956: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -4943,9 +4979,9 @@ - LDFLAGS="" - LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' - echo $ac_n "checking for ELF""... $ac_c" 1>&6 --echo "configure:4947: checking for ELF" >&5 -+echo "configure:4983: checking for ELF" >&5 - cat > conftest.$ac_ext <&6 --echo "configure:5198: checking for ld accepts -Bexport flag" >&5 -+echo "configure:5234: checking for ld accepts -Bexport flag" >&5 - LDFLAGS="${LDFLAGS} -Wl,-Bexport" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5244: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - found=yes - else -@@ -5250,9 +5276,9 @@ - - if test "x$DL_OBJS" = "xtclLoadAout.o" ; then - echo $ac_n "checking sys/exec.h""... $ac_c" 1>&6 --echo "configure:5254: checking sys/exec.h" >&5 -+echo "configure:5290: checking sys/exec.h" >&5 - cat > conftest.$ac_ext < - int main() { -@@ -5270,7 +5296,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:5274: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:5310: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - tcl_ok=usable - else -@@ -5288,9 +5314,9 @@ - - else - echo $ac_n "checking a.out.h""... $ac_c" 1>&6 --echo "configure:5292: checking a.out.h" >&5 -+echo "configure:5328: checking a.out.h" >&5 - cat > conftest.$ac_ext < - int main() { -@@ -5308,7 +5334,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:5312: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:5348: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - tcl_ok=usable - else -@@ -5326,9 +5352,9 @@ - - else - echo $ac_n "checking sys/exec_aout.h""... $ac_c" 1>&6 --echo "configure:5330: checking sys/exec_aout.h" >&5 -+echo "configure:5366: checking sys/exec_aout.h" >&5 - cat > conftest.$ac_ext < - int main() { -@@ -5346,7 +5372,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:5350: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:5386: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - tcl_ok=usable - else -@@ -5441,7 +5467,7 @@ - - - echo $ac_n "checking for build with symbols""... $ac_c" 1>&6 --echo "configure:5445: checking for build with symbols" >&5 -+echo "configure:5481: checking for build with symbols" >&5 - # Check whether --enable-symbols or --disable-symbols was given. - if test "${enable_symbols+set}" = set; then - enableval="$enable_symbols" -@@ -5478,17 +5504,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:5482: checking for $ac_hdr" >&5 -+echo "configure:5518: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:5492: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:5528: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -5518,17 +5544,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:5522: checking for $ac_hdr" >&5 -+echo "configure:5558: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:5532: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:5568: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -5555,7 +5581,7 @@ - done - - echo $ac_n "checking FIONBIO vs. O_NONBLOCK for nonblocking I/O""... $ac_c" 1>&6 --echo "configure:5559: checking FIONBIO vs. O_NONBLOCK for nonblocking I/O" >&5 -+echo "configure:5595: checking FIONBIO vs. O_NONBLOCK for nonblocking I/O" >&5 - if test -f /usr/lib/NextStep/software_version; then - system=NEXTSTEP-`awk '/3/,/3/' /usr/lib/NextStep/software_version` - else -@@ -5617,7 +5643,7 @@ - - - echo $ac_n "checking how to build libraries""... $ac_c" 1>&6 --echo "configure:5621: checking how to build libraries" >&5 -+echo "configure:5657: checking how to build libraries" >&5 - # Check whether --enable-shared or --disable-shared was given. - if test "${enable_shared+set}" = set; then - enableval="$enable_shared" -@@ -5955,6 +5981,7 @@ - s%@RANLIB@%$RANLIB%g - s%@CC@%$CC%g - s%@CPP@%$CPP%g -+s%@I18N_FLAGS@%$I18N_FLAGS%g - s%@LIBOBJS@%$LIBOBJS%g - s%@TCL_LIBS@%$TCL_LIBS%g - s%@MATH_LIBS@%$MATH_LIBS%g diff --git a/chinese/tcl83/files/patch-ac b/chinese/tcl83/files/patch-ac deleted file mode 100644 index 50f02dadfe5c..000000000000 --- a/chinese/tcl83/files/patch-ac +++ /dev/null @@ -1,15 +0,0 @@ ---- configure.in.orig Thu Feb 10 11:09:57 2000 -+++ configure.in Wed Feb 21 20:48:23 2001 -@@ -37,6 +37,12 @@ - - SC_ENABLE_THREADS - -+#------------------------------------------------------------------------ -+# i18n improvement -+#------------------------------------------------------------------------ -+ -+SC_ENABLE_I18N_IMPROVE -+ - #------------------------------------------------------------------------------ - # If we're using GCC, see if the compiler understands -pipe. If so, use it. - # It makes compiling go faster. (This is only a performance feature.) diff --git a/chinese/tcl83/files/patch-ad b/chinese/tcl83/files/patch-ad deleted file mode 100644 index ad8916d20684..000000000000 --- a/chinese/tcl83/files/patch-ad +++ /dev/null @@ -1,47 +0,0 @@ ---- tcl.m4.orig Thu Feb 10 11:09:57 2000 -+++ tcl.m4 Wed Feb 21 20:48:23 2001 -@@ -1717,3 +1717,44 @@ - AC_SUBST(TCL_LIBS) - AC_SUBST(MATH_LIBS) - ]) -+ -+#------------------------------------------------------------------------ -+# SC_ENABLE_I18N_IMPROVE -+# -+# Decide use i18n improved features or not. -+# -+# Arguments: -+# none -+# -+# Results: -+# -+# Adds the following arguments to configure: -+# --enable-i18nImprove=yes|no -+# -+# Defines the following vars: -+# I18N_FLAGS value of '-DI18N_IMPROVE' or '' -+#------------------------------------------------------------------------ -+ -+AC_DEFUN(SC_ENABLE_I18N_IMPROVE, [ -+ AC_MSG_CHECKING([if i18n improvement features are enabled]) -+ AC_ARG_ENABLE(i18nImprove, -+ [ --enable-i18nImprove enable i18n improvement features [--enable-i18nImprove]], -+ [tcl_ok=$enableval], [tcl_ok=yes]) -+ -+ if test "${enable_i18nImprove+set}" = set; then -+ enableval="$enable_i18nImprove" -+ tcl_ok=$enableval -+ else -+ tcl_ok=yes -+ fi -+ -+ if test "$tcl_ok" = "yes" ; then -+ AC_MSG_RESULT([enabled]) -+ I18N_FLAGS='-DI18N_IMPROVE' -+ else -+ AC_MSG_RESULT([disabled]) -+ I18N_FLAGS='' -+ fi -+ -+ AC_SUBST(I18N_FLAGS) -+]) diff --git a/chinese/tcl83/files/patch-ae b/chinese/tcl83/files/patch-ae deleted file mode 100644 index 7b4792b2f257..000000000000 --- a/chinese/tcl83/files/patch-ae +++ /dev/null @@ -1,21 +0,0 @@ ---- tclConfig.sh.in.orig Thu Feb 10 11:09:57 2000 -+++ tclConfig.sh.in Wed Feb 21 20:48:23 2001 -@@ -21,7 +21,7 @@ - TCL_CC='@CC@' - - # -D flags for use with the C compiler. --TCL_DEFS='@DEFS@' -+TCL_DEFS='@DEFS@ @I18N_FLAGS@' - - # If TCL was built with debugging symbols, generated libraries contain - # this string at the end of the library name (before the extension). -@@ -30,6 +30,9 @@ - # Default flags used in an optimized and debuggable build, respectively. - TCL_CFLAGS_DEBUG='@CFLAGS_DEBUG@' - TCL_CFLAGS_OPTIMIZE='@CFLAGS_OPTIMIZE@' -+ -+# I18n improvement flags -+TCL_I18N_IMPROVE_FLAGS='@I18N_FLAGS@' - - # Default linker flags used in an optimized and debuggable build, respectively. - TCL_LDFLAGS_DEBUG='@LDFLAGS_DEBUG@' diff --git a/chinese/tcl83/files/patch-af b/chinese/tcl83/files/patch-af deleted file mode 100644 index f400a32d2aa7..000000000000 --- a/chinese/tcl83/files/patch-af +++ /dev/null @@ -1,69 +0,0 @@ ---- tclUnixInit.c.orig Wed Oct 13 00:32:49 1999 -+++ tclUnixInit.c Wed Feb 21 21:14:45 2001 -@@ -369,7 +369,9 @@ - int i; - Tcl_Obj *pathPtr; - char *langEnv; -+#ifndef I18N_IMPROVE - Tcl_DString ds; -+#endif /* !I18N_IMPROVE */ - - /* - * Determine the current encoding from the LC_* or LANG environment -@@ -432,6 +434,7 @@ - - Tcl_SetSystemEncoding(NULL, encoding); - -+#ifndef I18N_IMPROVE - /* - * Initialize the C library's locale subsystem. This is required - * for input methods to work properly on X11. Note that we need to -@@ -445,6 +448,48 @@ - setlocale(LC_ALL, ""); - setlocale(LC_ALL, Tcl_DStringValue(&ds)); - Tcl_DStringFree(&ds); -+#else -+ /* -+ * -+ * If setlocale(LC_ALL, "") are once called, NOT reset to "C" -+ * BECAUSE OF X11 uses locale sensitive libc routines such as: -+ * -+ * mblen() -+ * mbstowcs() -+ * wcstombs() -+ * -+ * Calling setlocale() with proper locale is of course needed, -+ * futhermore, keeping the proper locale setting is ALSO needed -+ * for proper XIM operation. If not, in the worst case, Tk dumps -+ * core. -+ * -+ * And here's another story: -+ * -+ * X11[56]'s internationalization depends on "locale model" -+ * supported by C language (runtime). But unfortunately, on some -+ * (many) systems, setlocale(3) supports only "C" locale. For such -+ * a system, X11 library has _Xsetlocale() (and some locale -+ * sensitive C runtime function like the mblen(), even If these -+ * function are not well-implemented, sigh). If on such a system, -+ * we should't call: -+ * -+ * setlocale(LC_ALL) -+ * or -+ * setlocale(LC_CTYPE) -+ * -+ * at here because Tcl won't be linked with X11 libraries and -+ * nobody want to use the Tcl library that needs X11 libraries at -+ * execution/linkage time. Instead, call setlocale() (expanded to -+ * _Xsetlocale() with C preprocessor macro in if -+ * X_LOCLAE C preprocessor macro is defined, normaly done in Imake -+ * environment) at the initializing of Tk. So, at here, I just -+ * call only setlocale(LC_NUMERIC) since X11's internationalize -+ * implementation only depends on LC_CTYPE categoly (of cource -+ * LC_ALL includes this), This must be harmless and might let the -+ * Tcl and the Tk with XIM be both happy :) -+ * -+ */ -+#endif /* !I18N_IMPROVE */ - - /* - * In case the initial locale is not "C", ensure that the numeric diff --git a/chinese/tcl83/pkg-deinstall.tclsh b/chinese/tcl83/pkg-deinstall.tclsh deleted file mode 100644 index 41d864a3c4bc..000000000000 --- a/chinese/tcl83/pkg-deinstall.tclsh +++ /dev/null @@ -1,22 +0,0 @@ -#! /bin/sh -# -# Remove the ${PREFIX}/bin/tclsh script that gets installed by INSTALL.tclsh -# if we are the last tclsh installation to be pkg_delete'd. -# -# $FreeBSD: /tmp/pcvs/ports/chinese/tcl83/Attic/pkg-deinstall.tclsh,v 1.1 2001-02-22 03:53:30 kevlo Exp $ -# - -# -# Explicitly listing /usr/X11R6/bin here is debatable. -# -BINDIR="${PKG_PREFIX}/bin /usr/X11R6/bin" -TCLSH=${PKG_PREFIX}/bin/tclsh - -tclshs=$(/bin/ls ${BINDIR} 2> /dev/null | \ - egrep '^(i?tclsh[0-9]+\.[0-9]+(\_r)?([a-z][a-z])?)|otclsh$') - -if [ "$tclshs" = "" -a -f ${TCLSH} ] && \ - (head -3 ${TCLSH} | grep awieYJFnsuILOnfsYEW) > /dev/null 2>&1 -then - rm -f ${PKG_PREFIX}/bin/tclsh -fi diff --git a/chinese/tcl83/pkg-descr b/chinese/tcl83/pkg-descr deleted file mode 100644 index 4995f2f4b8b5..000000000000 --- a/chinese/tcl83/pkg-descr +++ /dev/null @@ -1,8 +0,0 @@ -This is Tcl8.3, 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.tcl.tk/ diff --git a/chinese/tcl83/pkg-install.tclsh b/chinese/tcl83/pkg-install.tclsh deleted file mode 100644 index 6b051648ea47..000000000000 --- a/chinese/tcl83/pkg-install.tclsh +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh - -# The user may have a tclsh they want to preserve -ver=`grep -a awieYJFnsuILOnfsYEW ${PKG_PREFIX}/bin/tclsh 2> /dev/null \ - | sed -e 's/.*\*\*//'` -if [ ! -e ${PKG_PREFIX}/bin/tclsh ] || [ "$ver" != "" -a "$ver" -lt 002 ] -then - [ -f ${PKG_PREFIX}/bin/tclsh ] && chmod u+w ${PKG_PREFIX}/bin/tclsh - - mkdir -p ${PKG_PREFIX}/bin - cat > ${PKG_PREFIX}/bin/tclsh <<'EOF' -#!/bin/sh -# Installed by ports system. id: awieYJFnsuILOnfsYEW**002 -# -# $FreeBSD: /tmp/pcvs/ports/chinese/tcl83/Attic/pkg-install.tclsh,v 1.1 2001-02-22 03:53:30 kevlo Exp $ -# - -( -echo "In FreeBSD, tclsh is named with a version number. This is because" -echo "different versions of tclsh are not compatible with each other and" -echo "they can not all be called \"tclsh\"! You may need multiple versions" -echo "installed because a given port may depend on a specific version." -echo -echo "On your system, tclsh is installed under at least the following names:" -echo -for name in $(/bin/ls $(echo $PATH | sed 's/:/ /g') 2> /dev/null | egrep '^(i?tclsh[0-9]+\.[0-9]+(\_r)?([a-z][a-z])?)|otclsh$') -do - echo $name -done -[ "$name" = "" ] && echo "No tclsh installations found, sorry." -) 1>&2 -exit 1 -EOF - chmod 555 ${PKG_PREFIX}/bin/tclsh -fi diff --git a/chinese/tcl83/pkg-plist b/chinese/tcl83/pkg-plist deleted file mode 100644 index f6c1b83e2c86..000000000000 --- a/chinese/tcl83/pkg-plist +++ /dev/null @@ -1,125 +0,0 @@ -bin/tclsh%%TCL_VER%% -include/tcl%%TCL_VER%%/generic/regcustom.h -include/tcl%%TCL_VER%%/generic/regerrs.h -include/tcl%%TCL_VER%%/generic/regex.h -include/tcl%%TCL_VER%%/generic/regguts.h -include/tcl%%TCL_VER%%/generic/tcl.h -include/tcl%%TCL_VER%%/generic/tclCompile.h -include/tcl%%TCL_VER%%/generic/tclDecls.h -include/tcl%%TCL_VER%%/generic/tclInitScript.h -include/tcl%%TCL_VER%%/generic/tclInt.h -include/tcl%%TCL_VER%%/generic/tclIntDecls.h -include/tcl%%TCL_VER%%/generic/tclIntPlatDecls.h -include/tcl%%TCL_VER%%/generic/tclMath.h -include/tcl%%TCL_VER%%/generic/tclPlatDecls.h -include/tcl%%TCL_VER%%/generic/tclPort.h -include/tcl%%TCL_VER%%/generic/tclRegexp.h -include/tcl%%TCL_VER%%/tcl.h -include/tcl%%TCL_VER%%/tclDecls.h -include/tcl%%TCL_VER%%/unix/tclUnixPort.h -include/tcl%%TCL_VER%%/unix/tclUnixThrd.h -lib/libtcl%%SHORT_TCL_VER%%.a -lib/libtcl%%SHORT_TCL_VER%%.so -lib/libtcl%%SHORT_TCL_VER%%.so.1 -lib/libtclstub%%SHORT_TCL_VER%%.a -lib/tcl%%TCL_VER%%/auto.tcl -lib/tcl%%TCL_VER%%/encoding/ascii.enc -lib/tcl%%TCL_VER%%/encoding/big5.enc -lib/tcl%%TCL_VER%%/encoding/cp1250.enc -lib/tcl%%TCL_VER%%/encoding/cp1251.enc -lib/tcl%%TCL_VER%%/encoding/cp1252.enc -lib/tcl%%TCL_VER%%/encoding/cp1253.enc -lib/tcl%%TCL_VER%%/encoding/cp1254.enc -lib/tcl%%TCL_VER%%/encoding/cp1255.enc -lib/tcl%%TCL_VER%%/encoding/cp1256.enc -lib/tcl%%TCL_VER%%/encoding/cp1257.enc -lib/tcl%%TCL_VER%%/encoding/cp1258.enc -lib/tcl%%TCL_VER%%/encoding/cp437.enc -lib/tcl%%TCL_VER%%/encoding/cp737.enc -lib/tcl%%TCL_VER%%/encoding/cp775.enc -lib/tcl%%TCL_VER%%/encoding/cp850.enc -lib/tcl%%TCL_VER%%/encoding/cp852.enc -lib/tcl%%TCL_VER%%/encoding/cp855.enc -lib/tcl%%TCL_VER%%/encoding/cp857.enc -lib/tcl%%TCL_VER%%/encoding/cp860.enc -lib/tcl%%TCL_VER%%/encoding/cp861.enc -lib/tcl%%TCL_VER%%/encoding/cp862.enc -lib/tcl%%TCL_VER%%/encoding/cp863.enc -lib/tcl%%TCL_VER%%/encoding/cp864.enc -lib/tcl%%TCL_VER%%/encoding/cp865.enc -lib/tcl%%TCL_VER%%/encoding/cp866.enc -lib/tcl%%TCL_VER%%/encoding/cp869.enc -lib/tcl%%TCL_VER%%/encoding/cp874.enc -lib/tcl%%TCL_VER%%/encoding/cp932.enc -lib/tcl%%TCL_VER%%/encoding/cp936.enc -lib/tcl%%TCL_VER%%/encoding/cp949.enc -lib/tcl%%TCL_VER%%/encoding/cp950.enc -lib/tcl%%TCL_VER%%/encoding/dingbats.enc -lib/tcl%%TCL_VER%%/encoding/euc-cn.enc -lib/tcl%%TCL_VER%%/encoding/euc-jp.enc -lib/tcl%%TCL_VER%%/encoding/euc-kr.enc -lib/tcl%%TCL_VER%%/encoding/gb12345.enc -lib/tcl%%TCL_VER%%/encoding/gb1988.enc -lib/tcl%%TCL_VER%%/encoding/gb2312.enc -lib/tcl%%TCL_VER%%/encoding/iso2022-jp.enc -lib/tcl%%TCL_VER%%/encoding/iso2022-kr.enc -lib/tcl%%TCL_VER%%/encoding/iso2022.enc -lib/tcl%%TCL_VER%%/encoding/iso8859-1.enc -lib/tcl%%TCL_VER%%/encoding/iso8859-2.enc -lib/tcl%%TCL_VER%%/encoding/iso8859-3.enc -lib/tcl%%TCL_VER%%/encoding/iso8859-4.enc -lib/tcl%%TCL_VER%%/encoding/iso8859-5.enc -lib/tcl%%TCL_VER%%/encoding/iso8859-6.enc -lib/tcl%%TCL_VER%%/encoding/iso8859-7.enc -lib/tcl%%TCL_VER%%/encoding/iso8859-8.enc -lib/tcl%%TCL_VER%%/encoding/iso8859-9.enc -lib/tcl%%TCL_VER%%/encoding/jis0201.enc -lib/tcl%%TCL_VER%%/encoding/jis0208.enc -lib/tcl%%TCL_VER%%/encoding/jis0212.enc -lib/tcl%%TCL_VER%%/encoding/koi8-r.enc -lib/tcl%%TCL_VER%%/encoding/ksc5601.enc -lib/tcl%%TCL_VER%%/encoding/macCentEuro.enc -lib/tcl%%TCL_VER%%/encoding/macCroatian.enc -lib/tcl%%TCL_VER%%/encoding/macCyrillic.enc -lib/tcl%%TCL_VER%%/encoding/macDingbats.enc -lib/tcl%%TCL_VER%%/encoding/macGreek.enc -lib/tcl%%TCL_VER%%/encoding/macIceland.enc -lib/tcl%%TCL_VER%%/encoding/macJapan.enc -lib/tcl%%TCL_VER%%/encoding/macRoman.enc -lib/tcl%%TCL_VER%%/encoding/macRomania.enc -lib/tcl%%TCL_VER%%/encoding/macThai.enc -lib/tcl%%TCL_VER%%/encoding/macTurkish.enc -lib/tcl%%TCL_VER%%/encoding/macUkraine.enc -lib/tcl%%TCL_VER%%/encoding/shiftjis.enc -lib/tcl%%TCL_VER%%/encoding/symbol.enc -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%%/http2.1/http.tcl -lib/tcl%%TCL_VER%%/http2.1/pkgIndex.tcl -lib/tcl%%TCL_VER%%/init.tcl -lib/tcl%%TCL_VER%%/ldAix -lib/tcl%%TCL_VER%%/ldAout.tcl -lib/tcl%%TCL_VER%%/msgcat1.0/msgcat.tcl -lib/tcl%%TCL_VER%%/msgcat1.0/pkgIndex.tcl -lib/tcl%%TCL_VER%%/opt0.4/optparse.tcl -lib/tcl%%TCL_VER%%/opt0.4/pkgIndex.tcl -lib/tcl%%TCL_VER%%/package.tcl -lib/tcl%%TCL_VER%%/parray.tcl -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%%/tcltest1.0/pkgIndex.tcl -lib/tcl%%TCL_VER%%/tcltest1.0/tcltest.tcl -lib/tcl%%TCL_VER%%/word.tcl -@dirrm lib/tcl%%TCL_VER%%/tcltest1.0 -@dirrm lib/tcl%%TCL_VER%%/opt0.4 -@dirrm lib/tcl%%TCL_VER%%/msgcat1.0 -@dirrm lib/tcl%%TCL_VER%%/http2.1 -@dirrm lib/tcl%%TCL_VER%%/http1.0 -@dirrm lib/tcl%%TCL_VER%%/encoding -@dirrm lib/tcl%%TCL_VER%% -@dirrm include/tcl%%TCL_VER%%/unix -@dirrm include/tcl%%TCL_VER%%/generic -@dirrm include/tcl%%TCL_VER%% diff --git a/chinese/tk83/Makefile b/chinese/tk83/Makefile deleted file mode 100644 index 21aa907133f8..000000000000 --- a/chinese/tk83/Makefile +++ /dev/null @@ -1,318 +0,0 @@ -# New ports collection makefile for: tk -# Date created: 22 February 2001 -# Whom: Kevin Lo -# -# $FreeBSD$ -# - -PORTNAME= tk -PORTVERSION= 8.3.0 -PORTREVISION= 2 -CATEGORIES= chinese x11-toolkits tk -MASTER_SITES= ${MASTER_SITE_TCLTK} -MASTER_SITE_SUBDIR= tcl8_3 -DISTNAME= ${PORTNAME}${PORTVERSION} - -MAINTAINER= kevlo@FreeBSD.org -COMMENT= Graphical toolkit for TCL which supports Chinese - -LIB_DEPENDS= tcl83.1:${PORTSDIR}/chinese/tcl83 - -USE_XORG= xt -WRKSRC= ${WRKDIR}/${DISTNAME}/unix -GNU_CONFIGURE= yes -CONFIGURE_ENV= PORTSDIR=${PORTSDIR} TK_LIB_FILE=libtk83.so.1 -CONFIGURE_ARGS= --enable-shared --with-tcl=${PREFIX}/lib/tcl8.3 \ - --enable-i18nImprove -USE_LDCONFIG= yes -MAKE_ENV= SHORT_TK_VER=83 -PKGINSTALL= ${PKGDIR}/INSTALL.wish - -PLIST_SUB= TK_VER=8.3 SHORT_TK_VER=83 - -MANCOMPRESSED= no - -MAN1= wish.1 -MAN3= 3DBorder.3 BindTable.3 CanvPsY.3 CanvTkwin.3 CanvTxtInfo.3 \ - Clipboard.3 ClrSelect.3 ConfigWidg.3 ConfigWind.3 CoordToWin.3 \ - CrtErrHdlr.3 CrtGenHdlr.3 CrtImgType.3 CrtItemType.3 CrtPhImgFmt.3 \ - CrtSelHdlr.3 CrtWindow.3 DeleteImg.3 DrawFocHlt.3 EventHndlr.3 \ - FindPhoto.3 FontId.3 FreeXId.3 GeomReq.3 GetAnchor.3 GetBitmap.3 \ - GetCapStyl.3 GetClrmap.3 GetColor.3 GetCursor.3 GetDash.3 GetFont.3 \ - GetGC.3 GetImage.3 GetJoinStl.3 GetJustify.3 GetOption.3 GetPixels.3 \ - GetPixmap.3 GetRelief.3 GetRootCrd.3 GetScroll.3 GetSelect.3 GetUid.3 \ - GetVRoot.3 GetVisual.3 HandleEvent.3 IdToWindow.3 ImgChanged.3 \ - InternAtom.3 MainLoop.3 MainWin.3 MaintGeom.3 ManageGeom.3 \ - MapWindow.3 MeasureChar.3 MoveToplev.3 Name.3 NameOfImg.3 OwnSelect.3 \ - ParseArgv.3 QWinEvent.3 Restack.3 RestrictEv.3 SetAppName.3 \ - SetClass.3 SetGrid.3 SetOptions.3 SetVisual.3 StrictMotif.3 \ - TextLayout.3 Tk_Init.3 Tk_Main.3 TkInitStubs.3 WindowId.3 -MANN= bell.n bind.n bindtags.n bitmap.n button.n canvas.n checkbutton.n \ - chooseColor.n chooseDirectory.n clipboard.n destroy.n dialog.n entry.n\ - event.n focus.n focusNext.n font.n frame.n getOpenFile.n grab.n grid.n\ - image.n label.n listbox.n loadTk.n lower.n menu.n menubar.n \ - menubutton.n message.n messageBox.n option.n optionMenu.n options.n \ - pack-old.n pack.n palette.n photo.n place.n popup.n radiobutton.n \ - raise.n scale.n scrollbar.n selection.n send.n text.n tk.n tkerror.n \ - tkvars.n tkwait.n toplevel.n winfo.n wm.n - -# MLINKS generated via awk '/ln/ {print "\t" $2,$3,"\\"}' unix/mkLinks -MLINKS= 3DBorder.3 Tk_Alloc3DBorderFromObj.3 \ - 3DBorder.3 Tk_Get3DBorder.3 \ - 3DBorder.3 Tk_Get3DBorderFromObj.3 \ - 3DBorder.3 Tk_Draw3DRectangle.3 \ - 3DBorder.3 Tk_Fill3DRectangle.3 \ - 3DBorder.3 Tk_Draw3DPolygon.3 \ - 3DBorder.3 Tk_Fill3DPolygon.3 \ - 3DBorder.3 Tk_3DVerticalBevel.3 \ - 3DBorder.3 Tk_3DHorizontalBevel.3 \ - 3DBorder.3 Tk_SetBackgroundFromBorder.3 \ - 3DBorder.3 Tk_NameOf3DBorder.3 \ - 3DBorder.3 Tk_3DBorderColor.3 \ - 3DBorder.3 Tk_3DBorderGC.3 \ - 3DBorder.3 Tk_Free3DBorderFromObj.3 \ - 3DBorder.3 Tk_Free3DBorder.3 \ - BindTable.3 Tk_CreateBindingTable.3 \ - BindTable.3 Tk_DeleteBindingTable.3 \ - BindTable.3 Tk_CreateBinding.3 \ - BindTable.3 Tk_DeleteBinding.3 \ - BindTable.3 Tk_GetBinding.3 \ - BindTable.3 Tk_GetAllBindings.3 \ - BindTable.3 Tk_DeleteAllBindings.3 \ - BindTable.3 Tk_BindEvent.3 \ - CanvPsY.3 Tk_CanvasPsY.3 \ - CanvPsY.3 Tk_CanvasPsBitmap.3 \ - CanvPsY.3 Tk_CanvasPsColor.3 \ - CanvPsY.3 Tk_CanvasPsFont.3 \ - CanvPsY.3 Tk_CanvasPsPath.3 \ - CanvPsY.3 Tk_CanvasPsStipple.3 \ - CanvTkwin.3 Tk_CanvasTkwin.3 \ - CanvTkwin.3 Tk_CanvasGetCoord.3 \ - CanvTkwin.3 Tk_CanvasDrawableCoords.3 \ - CanvTkwin.3 Tk_CanvasSetStippleOrigin.3 \ - CanvTkwin.3 Tk_CanvasWindowCoords.3 \ - CanvTkwin.3 Tk_CanvasEventuallyRedraw.3 \ - CanvTkwin.3 Tk_CanvasTagsOption.3 \ - CanvTxtInfo.3 Tk_CanvasTextInfo.3 \ - Clipboard.3 Tk_ClipboardClear.3 \ - Clipboard.3 Tk_ClipboardAppend.3 \ - ClrSelect.3 Tk_ClearSelection.3 \ - ConfigWidg.3 Tk_ConfigureWidget.3 \ - ConfigWidg.3 Tk_Offset.3 \ - ConfigWidg.3 Tk_ConfigureInfo.3 \ - ConfigWidg.3 Tk_ConfigureValue.3 \ - ConfigWidg.3 Tk_FreeOptions.3 \ - ConfigWind.3 Tk_ConfigureWindow.3 \ - ConfigWind.3 Tk_MoveWindow.3 \ - ConfigWind.3 Tk_ResizeWindow.3 \ - ConfigWind.3 Tk_MoveResizeWindow.3 \ - ConfigWind.3 Tk_SetWindowBorderWidth.3 \ - ConfigWind.3 Tk_ChangeWindowAttributes.3 \ - ConfigWind.3 Tk_SetWindowBackground.3 \ - ConfigWind.3 Tk_SetWindowBackgroundPixmap.3 \ - ConfigWind.3 Tk_SetWindowBorder.3 \ - ConfigWind.3 Tk_SetWindowBorderPixmap.3 \ - ConfigWind.3 Tk_SetWindowColormap.3 \ - ConfigWind.3 Tk_DefineCursor.3 \ - ConfigWind.3 Tk_UndefineCursor.3 \ - CoordToWin.3 Tk_CoordsToWindow.3 \ - CrtErrHdlr.3 Tk_CreateErrorHandler.3 \ - CrtErrHdlr.3 Tk_DeleteErrorHandler.3 \ - CrtGenHdlr.3 Tk_CreateGenericHandler.3 \ - CrtGenHdlr.3 Tk_DeleteGenericHandler.3 \ - CrtImgType.3 Tk_CreateImageType.3 \ - CrtImgType.3 Tk_GetImageMasterData.3 \ - CrtImgType.3 Tk_InitImageArgs.3 \ - CrtItemType.3 Tk_CreateItemType.3 \ - CrtItemType.3 Tk_GetItemTypes.3 \ - CrtPhImgFmt.3 Tk_CreatePhotoImageFormat.3 \ - CrtSelHdlr.3 Tk_CreateSelHandler.3 \ - CrtSelHdlr.3 Tk_DeleteSelHandler.3 \ - CrtWindow.3 Tk_CreateWindow.3 \ - CrtWindow.3 Tk_CreateWindowFromPath.3 \ - CrtWindow.3 Tk_DestroyWindow.3 \ - CrtWindow.3 Tk_MakeWindowExist.3 \ - DeleteImg.3 Tk_DeleteImage.3 \ - DrawFocHlt.3 Tk_DrawFocusHighlight.3 \ - EventHndlr.3 Tk_CreateEventHandler.3 \ - EventHndlr.3 Tk_DeleteEventHandler.3 \ - FindPhoto.3 Tk_FindPhoto.3 \ - FindPhoto.3 Tk_PhotoPutBlock.3 \ - FindPhoto.3 Tk_PhotoPutZoomedBlock.3 \ - FindPhoto.3 Tk_PhotoGetImage.3 \ - FindPhoto.3 Tk_PhotoBlank.3 \ - FindPhoto.3 Tk_PhotoExpand.3 \ - FindPhoto.3 Tk_PhotoGetSize.3 \ - FindPhoto.3 Tk_PhotoSetSize.3 \ - FontId.3 Tk_FontId.3 \ - FontId.3 Tk_FontMetrics.3 \ - FontId.3 Tk_PostscriptFontName.3 \ - FreeXId.3 Tk_FreeXId.3 \ - GeomReq.3 Tk_GeometryRequest.3 \ - GeomReq.3 Tk_SetInternalBorder.3 \ - GetAnchor.3 Tk_GetAnchorFromObj.3 \ - GetAnchor.3 Tk_GetAnchor.3 \ - GetAnchor.3 Tk_NameOfAnchor.3 \ - GetBitmap.3 Tk_AllocBitmapFromObj.3 \ - GetBitmap.3 Tk_GetBitmap.3 \ - GetBitmap.3 Tk_GetBitmapFromObj.3 \ - GetBitmap.3 Tk_DefineBitmap.3 \ - GetBitmap.3 Tk_NameOfBitmap.3 \ - GetBitmap.3 Tk_SizeOfBitmap.3 \ - GetBitmap.3 Tk_FreeBitmapFromObj.3 \ - GetBitmap.3 Tk_FreeBitmap.3 \ - GetBitmap.3 Tk_GetBitmapFromData.3 \ - GetCapStyl.3 Tk_GetCapStyle.3 \ - GetCapStyl.3 Tk_NameOfCapStyle.3 \ - GetClrmap.3 Tk_GetColormap.3 \ - GetClrmap.3 Tk_FreeColormap.3 \ - GetColor.3 Tk_AllocColorFromObj.3 \ - GetColor.3 Tk_GetColor.3 \ - GetColor.3 Tk_GetColorFromObj.3 \ - GetColor.3 Tk_GetColorByValue.3 \ - GetColor.3 Tk_NameOfColor.3 \ - GetColor.3 Tk_FreeColorFromObj.3 \ - GetColor.3 Tk_FreeColor.3 \ - GetCursor.3 Tk_AllocCursorFromObj.3 \ - GetCursor.3 Tk_GetCursor.3 \ - GetCursor.3 Tk_GetCursorFromObj.3 \ - GetCursor.3 Tk_GetCursorFromData.3 \ - GetCursor.3 Tk_NameOfCursor.3 \ - GetCursor.3 Tk_FreeCursorFromObj.3 \ - GetCursor.3 Tk_FreeCursor.3 \ - GetDash.3 Tk_GetDash.3 \ - GetFont.3 Tk_AllocFontFromObj.3 \ - GetFont.3 Tk_GetFont.3 \ - GetFont.3 Tk_GetFontFromObj.3 \ - GetFont.3 Tk_NameOfFont.3 \ - GetFont.3 Tk_FreeFontFromObj.3 \ - GetFont.3 Tk_FreeFont.3 \ - GetGC.3 Tk_GetGC.3 \ - GetGC.3 Tk_FreeGC.3 \ - GetImage.3 Tk_GetImage.3 \ - GetImage.3 Tk_RedrawImage.3 \ - GetImage.3 Tk_SizeOfImage.3 \ - GetImage.3 Tk_FreeImage.3 \ - GetJoinStl.3 Tk_GetJoinStyle.3 \ - GetJoinStl.3 Tk_NameOfJoinStyle.3 \ - GetJustify.3 Tk_GetJustifyFromObj.3 \ - GetJustify.3 Tk_GetJustify.3 \ - GetJustify.3 Tk_NameOfJustify.3 \ - GetOption.3 Tk_GetOption.3 \ - GetPixels.3 Tk_GetPixelsFromObj.3 \ - GetPixels.3 Tk_GetPixels.3 \ - GetPixels.3 Tk_GetMMFromObj.3 \ - GetPixels.3 Tk_GetScreenMM.3 \ - GetPixmap.3 Tk_GetPixmap.3 \ - GetPixmap.3 Tk_FreePixmap.3 \ - GetRelief.3 Tk_GetReliefFromObj.3 \ - GetRelief.3 Tk_GetRelief.3 \ - GetRelief.3 Tk_NameOfRelief.3 \ - GetRootCrd.3 Tk_GetRootCoords.3 \ - GetScroll.3 Tk_GetScrollInfo.3 \ - GetSelect.3 Tk_GetSelection.3 \ - GetUid.3 Tk_GetUid.3 \ - GetUid.3 Tk_Uid.3 \ - GetVRoot.3 Tk_GetVRootGeometry.3 \ - GetVisual.3 Tk_GetVisual.3 \ - HandleEvent.3 Tk_HandleEvent.3 \ - IdToWindow.3 Tk_IdToWindow.3 \ - ImgChanged.3 Tk_ImageChanged.3 \ - InternAtom.3 Tk_InternAtom.3 \ - InternAtom.3 Tk_GetAtomName.3 \ - MainLoop.3 Tk_MainLoop.3 \ - MainWin.3 Tk_MainWindow.3 \ - MaintGeom.3 Tk_MaintainGeometry.3 \ - MaintGeom.3 Tk_UnmaintainGeometry.3 \ - ManageGeom.3 Tk_ManageGeometry.3 \ - MapWindow.3 Tk_MapWindow.3 \ - MapWindow.3 Tk_UnmapWindow.3 \ - MeasureChar.3 Tk_MeasureChars.3 \ - MeasureChar.3 Tk_TextWidth.3 \ - MeasureChar.3 Tk_DrawChars.3 \ - MeasureChar.3 Tk_UnderlineChars.3 \ - MoveToplev.3 Tk_MoveToplevelWindow.3 \ - Name.3 Tk_Name.3 \ - Name.3 Tk_PathName.3 \ - Name.3 Tk_NameToWindow.3 \ - NameOfImg.3 Tk_NameOfImage.3 \ - OwnSelect.3 Tk_OwnSelection.3 \ - ParseArgv.3 Tk_ParseArgv.3 \ - QWinEvent.3 Tk_QueueWindowEvent.3 \ - Restack.3 Tk_RestackWindow.3 \ - RestrictEv.3 Tk_RestrictEvents.3 \ - SetAppName.3 Tk_SetAppName.3 \ - SetClass.3 Tk_SetClass.3 \ - SetClass.3 Tk_Class.3 \ - SetGrid.3 Tk_SetGrid.3 \ - SetGrid.3 Tk_UnsetGrid.3 \ - SetOptions.3 Tk_CreateOptionTable.3 \ - SetOptions.3 Tk_DeleteOptionTable.3 \ - SetOptions.3 Tk_InitOptions.3 \ - SetOptions.3 Tk_SetOptions.3 \ - SetOptions.3 Tk_FreeSavedOptions.3 \ - SetOptions.3 Tk_RestoreSavedOptions.3 \ - SetOptions.3 Tk_GetOptionValue.3 \ - SetOptions.3 Tk_GetOptionInfo.3 \ - SetOptions.3 Tk_FreeConfigOptions.3 \ - SetVisual.3 Tk_SetWindowVisual.3 \ - StrictMotif.3 Tk_StrictMotif.3 \ - TextLayout.3 Tk_ComputeTextLayout.3 \ - TextLayout.3 Tk_FreeTextLayout.3 \ - TextLayout.3 Tk_DrawTextLayout.3 \ - TextLayout.3 Tk_UnderlineTextLayout.3 \ - TextLayout.3 Tk_PointToChar.3 \ - TextLayout.3 Tk_CharBbox.3 \ - TextLayout.3 Tk_DistanceToTextLayout.3 \ - TextLayout.3 Tk_IntersectTextLayout.3 \ - TextLayout.3 Tk_TextLayoutToPostscript.3 \ - TkInitStubs.3 Tk_InitStubs.3 \ - WindowId.3 Tk_WindowId.3 \ - WindowId.3 Tk_Parent.3 \ - WindowId.3 Tk_Display.3 \ - WindowId.3 Tk_DisplayName.3 \ - WindowId.3 Tk_ScreenNumber.3 \ - WindowId.3 Tk_Screen.3 \ - WindowId.3 Tk_X.3 \ - WindowId.3 Tk_Y.3 \ - WindowId.3 Tk_Width.3 \ - WindowId.3 Tk_Height.3 \ - WindowId.3 Tk_Changes.3 \ - WindowId.3 Tk_Attributes.3 \ - WindowId.3 Tk_IsContainer.3 \ - WindowId.3 Tk_IsEmbedded.3 \ - WindowId.3 Tk_IsMapped.3 \ - WindowId.3 Tk_IsTopLevel.3 \ - WindowId.3 Tk_ReqWidth.3 \ - WindowId.3 Tk_ReqHeight.3 \ - WindowId.3 Tk_InternalBorderWidth.3 \ - WindowId.3 Tk_Visual.3 \ - WindowId.3 Tk_Depth.3 \ - WindowId.3 Tk_Colormap.3 \ - chooseColor.n tk_chooseColor.n \ - chooseDirectory.n tk_chooseDirectory.n \ - dialog.n tk_dialog.n \ - focusNext.n tk_focusNext.n \ - focusNext.n tk_focusPrev.n \ - focusNext.n tk_focusFollowsMouse.n \ - getOpenFile.n tk_getOpenFile.n \ - getOpenFile.n tk_getSaveFile.n \ - menubar.n tk_menuBar.n \ - menubar.n tk_bindForTraversal.n \ - messageBox.n tk_messageBox.n \ - optionMenu.n tk_optionMenu.n \ - palette.n tk_setPalette.n \ - palette.n tk_bisque.n \ - popup.n tk_popup.n - -.include - -post-install: -.if exists(${PKGINSTALL}) - ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} -.endif - -test: - cd ${WRKSRC}; make test - -.include diff --git a/chinese/tk83/distinfo b/chinese/tk83/distinfo deleted file mode 100644 index 088a6f0684de..000000000000 --- a/chinese/tk83/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (tk8.3.0.tar.gz) = 6acc486b306fd9aeac0d5833900c5ac3cf0f9fff89b13ab7ca0c548dd10c54ed -SIZE (tk8.3.0.tar.gz) = 2473891 diff --git a/chinese/tk83/files/patch-aa b/chinese/tk83/files/patch-aa deleted file mode 100644 index 2a934f2b2697..000000000000 --- a/chinese/tk83/files/patch-aa +++ /dev/null @@ -1,1547 +0,0 @@ ---- configure.orig Thu Feb 10 20:11:02 2000 -+++ configure Mon Nov 15 10:15:21 2004 -@@ -18,6 +18,8 @@ - ac_help="$ac_help - --with-tcl directory containing tcl configuration (tclConfig.sh)" - ac_help="$ac_help -+ --enable-i18nImprove enable i18n improvement features [--enable-i18nImprove]" -+ac_help="$ac_help - --enable-64bit enable 64bit support" - ac_help="$ac_help - --disable-load disallow dynamic loading and "load" command" -@@ -556,7 +558,7 @@ - # Extract the first word of "ranlib", so it can be a program name with args. - set dummy ranlib; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:560: checking for $ac_word" >&5 -+echo "configure:562: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -597,7 +599,7 @@ - # Extract the first word of "gcc", so it can be a program name with args. - set dummy gcc; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:601: checking for $ac_word" >&5 -+echo "configure:603: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -627,7 +629,7 @@ - # Extract the first word of "cc", so it can be a program name with args. - set dummy cc; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:631: checking for $ac_word" >&5 -+echo "configure:633: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -678,7 +680,7 @@ - # Extract the first word of "cl", so it can be a program name with args. - set dummy cl; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:682: checking for $ac_word" >&5 -+echo "configure:684: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -710,7 +712,7 @@ - fi - - echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 --echo "configure:714: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 -+echo "configure:716: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 - - ac_ext=c - # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -@@ -721,12 +723,12 @@ - - cat > conftest.$ac_ext << EOF - --#line 725 "configure" -+#line 727 "configure" - #include "confdefs.h" - - main(){return(0);} - EOF --if { (eval echo configure:730: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:732: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - ac_cv_prog_cc_works=yes - # If we can't run a trivial program, we are probably using a cross compiler. - if (./conftest; exit) 2>/dev/null; then -@@ -752,12 +754,12 @@ - { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } - fi - echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 --echo "configure:756: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 -+echo "configure:758: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 - echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 - cross_compiling=$ac_cv_prog_cc_cross - - echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 --echo "configure:761: checking whether we are using GNU C" >&5 -+echo "configure:763: checking whether we are using GNU C" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -766,7 +768,7 @@ - yes; - #endif - EOF --if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:770: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then -+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:772: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then - ac_cv_prog_gcc=yes - else - ac_cv_prog_gcc=no -@@ -785,7 +787,7 @@ - ac_save_CFLAGS="$CFLAGS" - CFLAGS= - echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 --echo "configure:789: checking whether ${CC-cc} accepts -g" >&5 -+echo "configure:791: checking whether ${CC-cc} accepts -g" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -823,7 +825,7 @@ - # Extract the first word of "gcc", so it can be a program name with args. - set dummy gcc; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:827: checking for $ac_word" >&5 -+echo "configure:829: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -853,7 +855,7 @@ - # Extract the first word of "cc", so it can be a program name with args. - set dummy cc; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:857: checking for $ac_word" >&5 -+echo "configure:859: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -904,7 +906,7 @@ - # Extract the first word of "cl", so it can be a program name with args. - set dummy cl; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:908: checking for $ac_word" >&5 -+echo "configure:910: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -936,7 +938,7 @@ - fi - - echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 --echo "configure:940: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 -+echo "configure:942: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 - - ac_ext=c - # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -@@ -947,12 +949,12 @@ - - cat > conftest.$ac_ext << EOF - --#line 951 "configure" -+#line 953 "configure" - #include "confdefs.h" - - main(){return(0);} - EOF --if { (eval echo configure:956: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - ac_cv_prog_cc_works=yes - # If we can't run a trivial program, we are probably using a cross compiler. - if (./conftest; exit) 2>/dev/null; then -@@ -978,12 +980,12 @@ - { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } - fi - echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 --echo "configure:982: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 -+echo "configure:984: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 - echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 - cross_compiling=$ac_cv_prog_cc_cross - - echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 --echo "configure:987: checking whether we are using GNU C" >&5 -+echo "configure:989: checking whether we are using GNU C" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -992,7 +994,7 @@ - yes; - #endif - EOF --if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:996: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then -+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:998: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then - ac_cv_prog_gcc=yes - else - ac_cv_prog_gcc=no -@@ -1011,7 +1013,7 @@ - ac_save_CFLAGS="$CFLAGS" - CFLAGS= - echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 --echo "configure:1015: checking whether ${CC-cc} accepts -g" >&5 -+echo "configure:1017: checking whether ${CC-cc} accepts -g" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -1048,7 +1050,7 @@ - #------------------------------------------------------------------------ - - echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 --echo "configure:1052: checking how to run the C preprocessor" >&5 -+echo "configure:1054: checking how to run the C preprocessor" >&5 - # On Suns, sometimes $CPP names a directory. - if test -n "$CPP" && test -d "$CPP"; then - CPP= -@@ -1063,13 +1065,13 @@ - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. - cat > conftest.$ac_ext < - Syntax Error - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:1073: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:1075: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - : -@@ -1080,13 +1082,13 @@ - rm -rf conftest* - CPP="${CC-cc} -E -traditional-cpp" - cat > conftest.$ac_ext < - Syntax Error - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:1090: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:1092: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - : -@@ -1097,13 +1099,13 @@ - rm -rf conftest* - CPP="${CC-cc} -nologo -E" - cat > conftest.$ac_ext < - Syntax Error - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:1107: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:1109: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - : -@@ -1131,17 +1133,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:1135: checking for $ac_hdr" >&5 -+echo "configure:1137: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:1145: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:1147: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -1174,7 +1176,7 @@ - - - echo $ac_n "checking for building with threads""... $ac_c" 1>&6 --echo "configure:1178: checking for building with threads" >&5 -+echo "configure:1180: checking for building with threads" >&5 - # Check whether --enable-threads or --disable-threads was given. - if test "${enable_threads+set}" = set; then - enableval="$enable_threads" -@@ -1198,7 +1200,7 @@ - echo "configure: warning: "Tk on Unix is known to have problems with thread support. It is recommended that Tk be used with a non-thread enabled Tcl."" 1>&2 - - echo $ac_n "checking for pthread_mutex_init in -lpthread""... $ac_c" 1>&6 --echo "configure:1202: checking for pthread_mutex_init in -lpthread" >&5 -+echo "configure:1204: checking for pthread_mutex_init in -lpthread" >&5 - ac_lib_var=`echo pthread'_'pthread_mutex_init | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -1206,7 +1208,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lpthread $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:1223: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -1260,18 +1262,18 @@ - if test -z "$no_pipe"; then - if test -n "$GCC"; then - echo $ac_n "checking if the compiler understands -pipe""... $ac_c" 1>&6 --echo "configure:1264: checking if the compiler understands -pipe" >&5 -+echo "configure:1266: checking if the compiler understands -pipe" >&5 - OLDCC="$CC" - CC="$CC -pipe" - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:1277: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - echo "$ac_t""yes" 1>&6 - else -@@ -1306,7 +1308,7 @@ - fi - - echo $ac_n "checking for Tcl configuration""... $ac_c" 1>&6 --echo "configure:1310: checking for Tcl configuration" >&5 -+echo "configure:1312: checking for Tcl configuration" >&5 - if eval "test \"`echo '$''{'ac_cv_c_tclconfig'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -1376,7 +1378,7 @@ - - - echo $ac_n "checking for existence of $TCL_BIN_DIR/tclConfig.sh""... $ac_c" 1>&6 --echo "configure:1380: checking for existence of $TCL_BIN_DIR/tclConfig.sh" >&5 -+echo "configure:1382: checking for existence of $TCL_BIN_DIR/tclConfig.sh" >&5 - - if test -f "$TCL_BIN_DIR/tclConfig.sh" ; then - echo "$ac_t""loading" 1>&6 -@@ -1399,6 +1401,50 @@ - - - #-------------------------------------------------------------------- -+# i18n improvement (also check it is specified in Tcl) -+#-------------------------------------------------------------------- -+ -+ -+ echo $ac_n "checking if i18n improvement features are enabled""... $ac_c" 1>&6 -+echo "configure:1410: checking if i18n improvement features are enabled" >&5 -+ # Check whether --enable-i18nImprove or --disable-i18nImprove was given. -+if test "${enable_i18nImprove+set}" = set; then -+ enableval="$enable_i18nImprove" -+ tcl_ok=$enableval -+else -+ tcl_ok=yes -+fi -+ -+ -+ if test "${enable_i18nImprove+set}" = set; then -+ enableval="$enable_i18nImprove" -+ tcl_ok=$enableval -+ else -+ tcl_ok=yes -+ fi -+ -+ if test ! -z "${TCL_I18N_IMPROVE_FLAGS}" ; then -+ if test "$tcl_ok" = "yes" ; then -+ echo "$ac_t""enabled" 1>&6 -+ I18N_FLAGS='-DI18N_IMPROVE' -+ else -+ echo "$ac_t""disabled: warning: Tcl is configured as enabling these features." 1>&6 -+ I18N_FLAGS='' -+ fi -+ else -+ if test "$tcl_ok" = "yes" ; then -+ echo "$ac_t""Tcl is not configured as enabling these features. Re-configure the Tcl with --enable-i18nImprove." 1>&6 -+ exit 1 -+ else -+ echo "$ac_t""disabled" 1>&6 -+ I18N_FLAGS='' -+ fi -+ fi -+ -+ -+ -+ -+#-------------------------------------------------------------------- - # Recompute the necessary flags to run the compiler - #-------------------------------------------------------------------- - -@@ -1407,7 +1453,7 @@ - # Step 0: Enable 64 bit support? - - echo $ac_n "checking if 64bit support is enabled""... $ac_c" 1>&6 --echo "configure:1411: checking if 64bit support is enabled" >&5 -+echo "configure:1457: checking if 64bit support is enabled" >&5 - # Check whether --enable-64bit or --disable-64bit was given. - if test "${enable_64bit+set}" = set; then - enableval="$enable_64bit" -@@ -1430,7 +1476,7 @@ - # there are a few systems, like Next, where this doesn't work. - - echo $ac_n "checking system version (for dynamic loading)""... $ac_c" 1>&6 --echo "configure:1434: checking system version (for dynamic loading)" >&5 -+echo "configure:1480: checking system version (for dynamic loading)" >&5 - if test -f /usr/lib/NextStep/software_version; then - system=NEXTSTEP-`awk '/3/,/3/' /usr/lib/NextStep/software_version` - else -@@ -1462,7 +1508,7 @@ - # Linux can use either -ldl or -ldld for dynamic loading. - - echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 --echo "configure:1466: checking for dlopen in -ldl" >&5 -+echo "configure:1512: checking for dlopen in -ldl" >&5 - ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -1470,7 +1516,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-ldl $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:1531: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -1587,7 +1633,7 @@ - HP-UX-*.08.*|HP-UX-*.09.*|HP-UX-*.10.*|HP-UX-*.11.*) - SHLIB_SUFFIX=".sl" - echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6 --echo "configure:1591: checking for shl_load in -ldld" >&5 -+echo "configure:1637: checking for shl_load in -ldld" >&5 - ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -1595,7 +1641,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-ldld $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:1656: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -1702,17 +1748,17 @@ - else - ac_safe=`echo "dld.h" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for dld.h""... $ac_c" 1>&6 --echo "configure:1706: checking for dld.h" >&5 -+echo "configure:1752: checking for dld.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:1716: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:1762: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -1763,21 +1809,21 @@ - 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 --echo "configure:1771: checking for dlfcn.h" >&5 -+echo "configure:1817: checking for dlfcn.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:1781: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:1827: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -1804,9 +1850,9 @@ - LDFLAGS="" - LD_SEARCH_FLAGS="" - echo $ac_n "checking for ELF""... $ac_c" 1>&6 --echo "configure:1808: checking for ELF" >&5 -+echo "configure:1854: checking for ELF" >&5 - cat > conftest.$ac_ext <&6 --echo "configure:2041: checking for ld accepts -Bexport flag" >&5 -+echo "configure:2087: checking for ld accepts -Bexport flag" >&5 - LDFLAGS="${LDFLAGS} -Wl,-Bexport" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:2097: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - found=yes - else -@@ -2093,9 +2140,9 @@ - - if test "x$DL_OBJS" = "xtclLoadAout.o" ; then - echo $ac_n "checking sys/exec.h""... $ac_c" 1>&6 --echo "configure:2097: checking sys/exec.h" >&5 -+echo "configure:2143: checking sys/exec.h" >&5 - cat > conftest.$ac_ext < - int main() { -@@ -2113,7 +2160,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:2117: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:2163: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - tcl_ok=usable - else -@@ -2131,9 +2178,9 @@ - - else - echo $ac_n "checking a.out.h""... $ac_c" 1>&6 --echo "configure:2135: checking a.out.h" >&5 -+echo "configure:2181: checking a.out.h" >&5 - cat > conftest.$ac_ext < - int main() { -@@ -2151,7 +2198,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:2155: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:2201: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - tcl_ok=usable - else -@@ -2169,9 +2216,9 @@ - - else - echo $ac_n "checking sys/exec_aout.h""... $ac_c" 1>&6 --echo "configure:2173: checking sys/exec_aout.h" >&5 -+echo "configure:2219: checking sys/exec_aout.h" >&5 - cat > conftest.$ac_ext < - int main() { -@@ -2189,7 +2236,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:2193: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:2239: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - tcl_ok=usable - else -@@ -2282,7 +2329,7 @@ - - - echo $ac_n "checking for build with symbols""... $ac_c" 1>&6 --echo "configure:2286: checking for build with symbols" >&5 -+echo "configure:2332: checking for build with symbols" >&5 - # Check whether --enable-symbols or --disable-symbols was given. - if test "${enable_symbols+set}" = set; then - enableval="$enable_symbols" -@@ -2303,6 +2350,7 @@ - echo "$ac_t""no" 1>&6 - fi - -+TCL_SRC_DIR=${prefix}/include/tcl${TCL_VERSION} - - LIB_RUNTIME_DIR='${LIB_RUNTIME_DIR}' - -@@ -2326,12 +2374,12 @@ - #-------------------------------------------------------------------- - - echo $ac_n "checking for sin""... $ac_c" 1>&6 --echo "configure:2330: checking for sin" >&5 -+echo "configure:2376: checking for sin" >&5 - if eval "test \"`echo '$''{'ac_cv_func_sin'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:2404: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_sin=yes" - else -@@ -2375,7 +2423,7 @@ - fi - - echo $ac_n "checking for main in -lieee""... $ac_c" 1>&6 --echo "configure:2379: checking for main in -lieee" >&5 -+echo "configure:2425: checking for main in -lieee" >&5 - ac_lib_var=`echo ieee'_'main | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -2383,14 +2431,14 @@ - ac_save_LIBS="$LIBS" - LIBS="-lieee $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:2440: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -2421,7 +2469,7 @@ - libbsd=no - if test "`uname -s`" = "AIX" ; then - echo $ac_n "checking for gettimeofday in -lbsd""... $ac_c" 1>&6 --echo "configure:2425: checking for gettimeofday in -lbsd" >&5 -+echo "configure:2471: checking for gettimeofday in -lbsd" >&5 - ac_lib_var=`echo bsd'_'gettimeofday | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -2429,7 +2477,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lbsd $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:2490: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -2471,9 +2519,9 @@ - #-------------------------------------------------------------------- - - echo $ac_n "checking stdlib.h""... $ac_c" 1>&6 --echo "configure:2475: checking stdlib.h" >&5 -+echo "configure:2521: checking stdlib.h" >&5 - cat > conftest.$ac_ext < - EOF -@@ -2488,7 +2536,7 @@ - rm -f conftest* - - cat > conftest.$ac_ext < - EOF -@@ -2502,7 +2550,7 @@ - rm -f conftest* - - cat > conftest.$ac_ext < - EOF -@@ -2534,16 +2582,16 @@ - #-------------------------------------------------------------------- - - echo $ac_n "checking fd_set and sys/select""... $ac_c" 1>&6 --echo "configure:2538: checking fd_set and sys/select" >&5 -+echo "configure:2584: checking fd_set and sys/select" >&5 - cat > conftest.$ac_ext < - int main() { - fd_set readMask, writeMask; - ; return 0; } - EOF --if { (eval echo configure:2547: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:2593: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - tk_ok=yes - else -@@ -2555,7 +2603,7 @@ - rm -f conftest* - if test $tk_ok = no; then - cat > conftest.$ac_ext < - EOF -@@ -2587,12 +2635,12 @@ - #-------------------------------------------------------------------- - - echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 --echo "configure:2591: checking for ANSI C header files" >&5 -+echo "configure:2637: checking for ANSI C header files" >&5 - if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - #include -@@ -2600,7 +2648,7 @@ - #include - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:2604: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:2650: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -2617,7 +2665,7 @@ - if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat > conftest.$ac_ext < - EOF -@@ -2635,7 +2683,7 @@ - if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat > conftest.$ac_ext < - EOF -@@ -2656,7 +2704,7 @@ - : - else - cat > conftest.$ac_ext < - #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -@@ -2667,7 +2715,7 @@ - exit (0); } - - EOF --if { (eval echo configure:2671: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:2717: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - : - else -@@ -2691,12 +2739,12 @@ - fi - - echo $ac_n "checking for mode_t""... $ac_c" 1>&6 --echo "configure:2695: checking for mode_t" >&5 -+echo "configure:2741: checking for mode_t" >&5 - if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - #if STDC_HEADERS -@@ -2724,12 +2772,12 @@ - fi - - echo $ac_n "checking for pid_t""... $ac_c" 1>&6 --echo "configure:2728: checking for pid_t" >&5 -+echo "configure:2774: checking for pid_t" >&5 - if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - #if STDC_HEADERS -@@ -2757,12 +2805,12 @@ - fi - - echo $ac_n "checking for size_t""... $ac_c" 1>&6 --echo "configure:2761: checking for size_t" >&5 -+echo "configure:2807: checking for size_t" >&5 - if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - #if STDC_HEADERS -@@ -2790,12 +2838,12 @@ - fi - - echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 --echo "configure:2794: checking for uid_t in sys/types.h" >&5 -+echo "configure:2840: checking for uid_t in sys/types.h" >&5 - if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - EOF -@@ -2832,17 +2880,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:2836: checking for $ac_hdr" >&5 -+echo "configure:2882: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:2846: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:2892: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -2869,12 +2917,12 @@ - done - - echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 --echo "configure:2873: checking whether time.h and sys/time.h may both be included" >&5 -+echo "configure:2919: checking whether time.h and sys/time.h may both be included" >&5 - if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - #include -@@ -2883,7 +2931,7 @@ - struct tm *tp; - ; return 0; } - EOF --if { (eval echo configure:2887: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:2933: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_header_time=yes - else -@@ -2909,16 +2957,16 @@ - #------------------------------------------- - - echo $ac_n "checking pw_gecos in struct pwd""... $ac_c" 1>&6 --echo "configure:2913: checking pw_gecos in struct pwd" >&5 -+echo "configure:2959: checking pw_gecos in struct pwd" >&5 - cat > conftest.$ac_ext < - int main() { - struct passwd pwd; pwd.pw_gecos; - ; return 0; } - EOF --if { (eval echo configure:2922: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:2968: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - tk_ok=yes - else -@@ -2951,7 +2999,7 @@ - # Uses ac_ vars as temps to allow command line to override cache and checks. - # --without-x overrides everything else, but does not touch the cache. - echo $ac_n "checking for X""... $ac_c" 1>&6 --echo "configure:2955: checking for X" >&5 -+echo "configure:3001: checking for X" >&5 - - # Check whether --with-x or --without-x was given. - if test "${with_x+set}" = set; then -@@ -3013,12 +3061,12 @@ - - # First, try using that file with no special directory specified. - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:3022: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:3068: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -3087,14 +3135,14 @@ - ac_save_LIBS="$LIBS" - LIBS="-l$x_direct_test_library $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:3144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - LIBS="$ac_save_LIBS" - # We can link X programs with no special library path. -@@ -3184,12 +3232,12 @@ - if test "$no_x" = ""; then - if test "$x_includes" = ""; then - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:3193: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:3239: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - : -@@ -3209,15 +3257,15 @@ - fi - if test "$no_x" = "yes" -o "$not_really_there" = "yes"; then - echo $ac_n "checking for X11 header files""... $ac_c" 1>&6 --echo "configure:3213: checking for X11 header files" >&5 -+echo "configure:3259: checking for X11 header files" >&5 - XINCLUDES="# no special path needed" - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:3221: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:3267: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - : -@@ -3253,7 +3301,7 @@ - - if test "$no_x" = yes; then - echo $ac_n "checking for X11 libraries""... $ac_c" 1>&6 --echo "configure:3257: checking for X11 libraries" >&5 -+echo "configure:3303: checking for X11 libraries" >&5 - XLIBSW=nope - dirs="/usr/unsupported/lib /usr/local/lib /usr/X386/lib /usr/X11R6/lib /usr/X11R5/lib /usr/lib/X11R5 /usr/lib/X11R4 /usr/openwin/lib /usr/X11/lib /usr/sww/X11/lib" - for i in $dirs ; do -@@ -3273,7 +3321,7 @@ - fi - if test "$XLIBSW" = nope ; then - echo $ac_n "checking for XCreateWindow in -lXwindow""... $ac_c" 1>&6 --echo "configure:3277: checking for XCreateWindow in -lXwindow" >&5 -+echo "configure:3323: checking for XCreateWindow in -lXwindow" >&5 - ac_lib_var=`echo Xwindow'_'XCreateWindow | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -3281,7 +3329,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lXwindow $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:3342: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -3377,7 +3425,7 @@ - #-------------------------------------------------------------------- - - echo $ac_n "checking for main in -lXbsd""... $ac_c" 1>&6 --echo "configure:3381: checking for main in -lXbsd" >&5 -+echo "configure:3427: checking for main in -lXbsd" >&5 - ac_lib_var=`echo Xbsd'_'main | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -3385,14 +3433,14 @@ - ac_save_LIBS="$LIBS" - LIBS="-lXbsd $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:3442: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -3415,12 +3463,12 @@ - - tk_checkBoth=0 - echo $ac_n "checking for connect""... $ac_c" 1>&6 --echo "configure:3419: checking for connect" >&5 -+echo "configure:3465: checking for connect" >&5 - if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:3493: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_connect=yes" - else -@@ -3465,7 +3513,7 @@ - - if test "$tk_checkSocket" = 1; then - echo $ac_n "checking for main in -lsocket""... $ac_c" 1>&6 --echo "configure:3469: checking for main in -lsocket" >&5 -+echo "configure:3515: checking for main in -lsocket" >&5 - ac_lib_var=`echo socket'_'main | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -3473,14 +3521,14 @@ - ac_save_LIBS="$LIBS" - LIBS="-lsocket $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:3530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -3506,12 +3554,12 @@ - tk_oldLibs=$LIBS - LIBS="$LIBS -lsocket -lnsl" - echo $ac_n "checking for accept""... $ac_c" 1>&6 --echo "configure:3510: checking for accept" >&5 -+echo "configure:3556: checking for accept" >&5 - if eval "test \"`echo '$''{'ac_cv_func_accept'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:3584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_accept=yes" - else -@@ -3556,12 +3604,12 @@ - - fi - echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 --echo "configure:3560: checking for gethostbyname" >&5 -+echo "configure:3606: checking for gethostbyname" >&5 - if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:3634: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_gethostbyname=yes" - else -@@ -3602,7 +3650,7 @@ - else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for main in -lnsl""... $ac_c" 1>&6 --echo "configure:3606: checking for main in -lnsl" >&5 -+echo "configure:3652: checking for main in -lnsl" >&5 - ac_lib_var=`echo nsl'_'main | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -3610,14 +3658,14 @@ - ac_save_LIBS="$LIBS" - LIBS="-lnsl $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:3667: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -3657,13 +3705,13 @@ - - if test -d /usr/include/mit ; then - echo $ac_n "checking MIT X libraries""... $ac_c" 1>&6 --echo "configure:3661: checking MIT X libraries" >&5 -+echo "configure:3707: checking MIT X libraries" >&5 - tk_oldCFlags=$CFLAGS - CFLAGS="$CFLAGS -I/usr/include/mit" - tk_oldLibs=$LIBS - LIBS="$LIBS -lX11-mit" - cat > conftest.$ac_ext < -@@ -3674,7 +3722,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:3678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:3724: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - - echo "$ac_t""yes" 1>&6 -@@ -3701,12 +3749,12 @@ - - MATH_LIBS="" - echo $ac_n "checking for sin""... $ac_c" 1>&6 --echo "configure:3705: checking for sin" >&5 -+echo "configure:3751: checking for sin" >&5 - if eval "test \"`echo '$''{'ac_cv_func_sin'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:3779: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_sin=yes" - else -@@ -3750,7 +3798,7 @@ - fi - - echo $ac_n "checking for main in -lieee""... $ac_c" 1>&6 --echo "configure:3754: checking for main in -lieee" >&5 -+echo "configure:3800: checking for main in -lieee" >&5 - ac_lib_var=`echo ieee'_'main | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -3758,14 +3806,14 @@ - ac_save_LIBS="$LIBS" - LIBS="-lieee $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:3815: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -3792,14 +3840,14 @@ - #-------------------------------------------------------------------- - - echo $ac_n "checking whether char is unsigned""... $ac_c" 1>&6 --echo "configure:3796: checking whether char is unsigned" >&5 -+echo "configure:3842: checking whether char is unsigned" >&5 - if eval "test \"`echo '$''{'ac_cv_c_char_unsigned'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - if test "$GCC" = yes; then - # GCC predefines this symbol on systems where it applies. - cat > conftest.$ac_ext <&2; exit 1; } - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:3881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - ac_cv_c_char_unsigned=yes - else -@@ -3864,12 +3912,12 @@ - - - echo $ac_n "checking for strtod""... $ac_c" 1>&6 --echo "configure:3868: checking for strtod" >&5 -+echo "configure:3914: checking for strtod" >&5 - if eval "test \"`echo '$''{'ac_cv_func_strtod'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:3942: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_strtod=yes" - else -@@ -3914,12 +3962,12 @@ - - if test "$tk_strtod" = 1; then - echo $ac_n "checking for Solaris 2.4 strtod bug""... $ac_c" 1>&6 --echo "configure:3918: checking for Solaris 2.4 strtod bug" >&5 -+echo "configure:3964: checking for Solaris 2.4 strtod bug" >&5 - if test "$cross_compiling" = yes; then - tk_ok=0 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:3989: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - tk_ok=1 - else -@@ -3970,7 +4018,7 @@ - - - echo $ac_n "checking how to build libraries""... $ac_c" 1>&6 --echo "configure:3974: checking how to build libraries" >&5 -+echo "configure:4020: checking how to build libraries" >&5 - # Check whether --enable-shared or --disable-shared was given. - if test "${enable_shared+set}" = set; then - enableval="$enable_shared" -@@ -4049,6 +4097,143 @@ - TK_SHARED_BUILD=${SHARED_BUILD} - - #-------------------------------------------------------------------- -+# Checking X lib for i18n related things. -+#-------------------------------------------------------------------- -+ -+X11_IMAKE_FLAGS="" -+tk_oldCflags=$CFLAGS -+tk_oldLibs=$LIBS -+CFLAGS="$CFLAGS $XINCLUDES" -+LIBS="$XLIBSW $LIBS" -+ -+echo $ac_n "checking XRegisterIMInstantiateCallback""... $ac_c" 1>&6 -+echo "configure:4109: checking XRegisterIMInstantiateCallback" >&5 -+cat > conftest.$ac_ext < -+ -+int main() { -+ -+XRegisterIMInstantiateCallback(0, 0, 0, 0, 0, 0); -+ -+; return 0; } -+EOF -+if { (eval echo configure:4122: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ -+echo "$ac_t""yes" 1>&6 -+X11_IMAKE_FLAGS="-DHAVE_XIMREGINSTCB" -+ -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ -+echo "$ac_t""no" 1>&6 -+ -+fi -+rm -f conftest* -+ -+echo $ac_n "checking XIDProc""... $ac_c" 1>&6 -+echo "configure:4139: checking XIDProc" >&5 -+cat > conftest.$ac_ext < -+ -+int main() { -+ -+XIDProc *a; -+ -+; return 0; } -+EOF -+if { (eval echo configure:4152: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+ rm -rf conftest* -+ -+echo "$ac_t""yes" 1>&6 -+ -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ -+echo "$ac_t""no" 1>&6 -+X11_IMAKE_FLAGS="$X11_IMAKE_FLAGS -DNO_XIDPROC" -+ -+fi -+rm -f conftest* -+ -+HAVE_XMKMF="" -+# Extract the first word of "xmkmf", so it can be a program name with args. -+set dummy xmkmf; ac_word=$2 -+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -+echo "configure:4172: checking for $ac_word" >&5 -+if eval "test \"`echo '$''{'ac_cv_path_HAVE_XMKMF'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ case "$HAVE_XMKMF" in -+ /*) -+ ac_cv_path_HAVE_XMKMF="$HAVE_XMKMF" # Let the user override the test with a path. -+ ;; -+ ?:/*) -+ ac_cv_path_HAVE_XMKMF="$HAVE_XMKMF" # Let the user override the test with a dos path. -+ ;; -+ *) -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -+ ac_dummy="${PATH}:/usr/X11R6/bin:/usr/X11R5/bin:/usr/local/X11R6/bin:/usr/local/X11R5/bin:/usr/openwin/bin:/usr/X11/bin:/usr/X386/bin:/usr/sww/bin:/usr/unsupported/bin" -+ for ac_dir in $ac_dummy; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ ac_cv_path_HAVE_XMKMF="$ac_dir/$ac_word" -+ break -+ fi -+ done -+ IFS="$ac_save_ifs" -+ test -z "$ac_cv_path_HAVE_XMKMF" && ac_cv_path_HAVE_XMKMF="""" -+ ;; -+esac -+fi -+HAVE_XMKMF="$ac_cv_path_HAVE_XMKMF" -+if test -n "$HAVE_XMKMF"; then -+ echo "$ac_t""$HAVE_XMKMF" 1>&6 -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+if test "X$HAVE_XMKMF" != "X"; then -+ IMAKE_FLAGS="" -+ if test -d ImakeCheck; then -+ rm -rf ImakeCheck -+ fi -+ mkdir ImakeCheck -+ cat << EOF > ImakeCheck/Imakefile -+SRCS = dummy.c -+OBJS = dummy.o -+ -+ComplexProgramTarget(dummy) -+EOF -+ cat << EOF > ImakeCheck/dummy.c -+static int justAnInt = 0; -+EOF -+ (cd ./ImakeCheck; rm -f Makefile Makefile.*; eval $HAVE_XMKMF) > /dev/null 2>&1 -+ for i in `(cd ./ImakeCheck; make -n dummy.o)` -+ do -+ case $i in -D*) IMAKE_FLAGS="$IMAKE_FLAGS $i";; esac -+ done -+ if test "X$IMAKE_FLAGS" != "X"; then -+ echo "$ac_t""Add these flags for proper compile: $IMAKE_FLAGS" 1>&6 -+ X11_IMAKE_FLAGS="$X11_IMAKE_FLAGS $IMAKE_FLAGS" -+ fi -+ rm -rf ImakeCheck -+fi -+ -+CFLAGS=$tk_oldCflags -+LIBS=$tk_oldLibs -+ -+#-------------------------------------------------------------------- - # The statements below define various symbols relating to creating - # the stub'd version of the Tk library - # -@@ -4281,10 +4466,12 @@ - s%@TCL_BIN_DIR@%$TCL_BIN_DIR%g - s%@TCL_SRC_DIR@%$TCL_SRC_DIR%g - s%@TCL_LIB_FILE@%$TCL_LIB_FILE%g -+s%@I18N_FLAGS@%$I18N_FLAGS%g - s%@DL_LIBS@%$DL_LIBS%g - s%@CFLAGS_DEBUG@%$CFLAGS_DEBUG%g - s%@CFLAGS_OPTIMIZE@%$CFLAGS_OPTIMIZE%g - s%@CFLAGS_WARNING@%$CFLAGS_WARNING%g -+s%@HAVE_XMKMF@%$HAVE_XMKMF%g - s%@STUB_LIB_FILE@%$STUB_LIB_FILE%g - s%@TK_STUB_LIB_FILE@%$TK_STUB_LIB_FILE%g - s%@TK_STUB_LIB_FLAG@%$TK_STUB_LIB_FLAG%g -@@ -4327,6 +4514,7 @@ - s%@XINCLUDES@%$XINCLUDES%g - s%@XLIBSW@%$XLIBSW%g - s%@TK_SHARED_BUILD@%$TK_SHARED_BUILD%g -+s%@X11_IMAKE_FLAGS@%$X11_IMAKE_FLAGS%g - - CEOF - EOF diff --git a/chinese/tk83/files/patch-ab b/chinese/tk83/files/patch-ab deleted file mode 100644 index 5df3661fa2bc..000000000000 --- a/chinese/tk83/files/patch-ab +++ /dev/null @@ -1,174 +0,0 @@ ---- Makefile.in.orig Thu Feb 10 11:11:01 2000 -+++ Makefile.in Wed Feb 21 23:12:17 2001 -@@ -56,7 +56,9 @@ - BIN_DIR = $(exec_prefix)/bin - - # Directory in which to install the include file tk.h: --INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include -+INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include/tk$(VERSION) -+GENERIC_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/generic -+UNIX_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/unix - - # Top-level directory for manual entries: - MAN_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/man -@@ -94,6 +96,9 @@ - CFLAGS_DEBUG = @CFLAGS_DEBUG@ - CFLAGS_OPTIMIZE = @CFLAGS_OPTIMIZE@ - -+# I18n improvement flags -+I18N_FLAGS = @I18N_FLAGS@ -+ - # To change the compiler switches, for example to change from optimization to - # debugging symbols, change the following line: - #CFLAGS = $(CFLAGS_DEBUG) -@@ -153,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 - -@@ -190,7 +195,7 @@ - # Libraries to use when linking. This definition is determined by the - # configure script. - LIBS = @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc --WISH_LIBS = $(TCL_LIB_SPEC) @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc -+WISH_LIBS = -L${PREFIX}/lib -ltcl${SHORT_TK_VER} @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc - - # The symbol below provides support for dynamic loading and shared - # libraries. See configure.in for a description of what it means. -@@ -211,7 +216,8 @@ - # modify any of this stuff by hand. - #---------------------------------------------------------------- - --AC_FLAGS = @EXTRA_CFLAGS@ @DEFS@ -+AC_FLAGS = @EXTRA_CFLAGS@ @DEFS@ @CPPFLAGS@ \ -+ @X11_IMAKE_FLAGS@ @I18N_FLAGS@ - RANLIB = @RANLIB@ - SRC_DIR = @srcdir@/.. - TOP_DIR = @srcdir@/.. -@@ -268,7 +274,8 @@ - tkUnixCursor.o tkUnixDraw.o tkUnixEmbed.o tkUnixEvent.o \ - tkUnixFocus.o tkUnixFont.o tkUnixInit.o tkUnixKey.o tkUnixMenu.o \ - tkUnixMenubu.o tkUnixScale.o tkUnixScrlbr.o tkUnixSelect.o \ -- tkUnixSend.o tkUnixWm.o tkUnixXId.o tkStubInit.o tkStubLib.o -+ tkUnixSend.o tkUnixWm.o tkUnixXId.o tkStubInit.o tkStubLib.o \ -+ tkUnixIm.o - - STUB_LIB_OBJS = tkStubLib.o tkStubImg.o - -@@ -330,6 +337,7 @@ - $(UNIX_DIR)/tkUnixEmbed.c $(UNIX_DIR)/tkUnixEvent.c \ - $(UNIX_DIR)/tkUnixFocus.c \ - $(UNIX_DIR)/tkUnixFont.c $(UNIX_DIR)/tkUnixInit.c \ -+ $(UNIX_DIR)/tkUnixIm.c \ - $(UNIX_DIR)/tkUnixKey.c \ - $(UNIX_DIR)/tkUnixMenu.c $(UNIX_DIR)/tkUnixMenubu.c \ - $(UNIX_DIR)/tkUnixScale.c $(UNIX_DIR)/tkUnixScrlbr.c \ -@@ -361,8 +369,14 @@ - ${TK_LIB_FILE}: ${OBJS} - rm -f ${TK_LIB_FILE} - @MAKE_LIB@ -+ ln -sf @TK_LIB_FILE@ libtk${SHORT_TK_VER}.so - $(RANLIB) ${TK_LIB_FILE} - -+libtk${SHORT_TK_VER}.a: ${OBJS} -+ rm -f libtk${SHORT_TK_VER}.a -+ ar cr libtk${SHORT_TK_VER}.a ${OBJS} -+ $(RANLIB) libtk${SHORT_TK_VER}.a -+ - ${STUB_LIB_FILE}: ${STUB_LIB_OBJS} - rm -f ${STUB_LIB_FILE} - @MAKE_STUB_LIB@ -@@ -424,7 +438,7 @@ - # some ranlibs write to current directory, and this might not always be - # possible (e.g. if installing as root). - --install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $(TK_BUILD_EXP_FILE) wish -+install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $(TK_BUILD_EXP_FILE) libtk${SHORT_TK_VER}.a wish - @for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \ - do \ - if [ ! -d $$i ] ; then \ -@@ -442,12 +456,18 @@ - fi - @echo "Installing $(TK_LIB_FILE) to $(LIB_INSTALL_DIR)/" - @$(INSTALL_DATA) $(TK_LIB_FILE) $(LIB_INSTALL_DIR)/$(TK_LIB_FILE) -+ @ln -sf $(LIB_INSTALL_DIR)/$(TK_LIB_FILE) $(LIB_INSTALL_DIR)/libtk${SHORT_TK_VER}.so - @(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TK_LIB_FILE)) - @chmod 555 $(LIB_INSTALL_DIR)/$(TK_LIB_FILE) -+ @echo "Installing libtk${SHORT_TK_VER}.a" -+ @$(INSTALL_DATA) libtk${SHORT_TK_VER}.a $(LIB_INSTALL_DIR)/libtk${SHORT_TK_VER}.a -+ @(cd $(LIB_INSTALL_DIR); $(RANLIB) libtk${SHORT_TK_VER}.a) -+ @chmod 555 $(LIB_INSTALL_DIR)/libtk${SHORT_TK_VER}.a - @echo "Installing wish as $(BIN_INSTALL_DIR)/wish$(VERSION)" - @$(INSTALL_PROGRAM) wish $(BIN_INSTALL_DIR)/wish$(VERSION) - @echo "Installing tkConfig.sh to $(LIB_INSTALL_DIR)/" -- @$(INSTALL_DATA) tkConfig.sh $(LIB_INSTALL_DIR)/tkConfig.sh -+ @mkdir -p $(LIB_INSTALL_DIR)/tk$(VERSION) -+ @$(INSTALL_DATA) tkConfig.sh $(LIB_INSTALL_DIR)/tk$(VERSION)/tkConfig.sh - @if test "$(TK_BUILD_EXP_FILE)" != ""; then \ - echo "Installing $(TK_EXP_FILE) to $(LIB_INSTALL_DIR)/"; \ - $(INSTALL_DATA) $(TK_BUILD_EXP_FILE) \ -@@ -461,6 +481,7 @@ - - install-libraries: - @for i in $(INSTALL_ROOT)$(prefix)/lib $(INCLUDE_INSTALL_DIR) \ -+ $(GENERIC_INCLUDE_INSTALL_DIR) $(UNIX_INCLUDE_INSTALL_DIR) \ - $(SCRIPT_INSTALL_DIR) $(SCRIPT_INSTALL_DIR)/images; \ - do \ - if [ ! -d $$i ] ; then \ -@@ -474,10 +495,16 @@ - chmod +x $(UNIX_DIR)/install-sh; \ - fi - @echo "Installing header files"; -- @for i in $(GENERIC_DIR)/tk.h $(GENERIC_DIR)/tkDecls.h ; \ -+ @for i in $(GENERIC_DIR)/*.h ; \ - do \ -- $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR); \ -+ $(INSTALL_DATA) $$i $(GENERIC_INCLUDE_INSTALL_DIR); \ - done; -+ @for i in $(UNIX_DIR)/*.h ; \ -+ do \ -+ $(INSTALL_DATA) $$i $(UNIX_INCLUDE_INSTALL_DIR); \ -+ done; -+ @ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tk.h $(INCLUDE_INSTALL_DIR)/tk.h -+ @ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tkDecls.h $(INCLUDE_INSTALL_DIR)/tkDecls.h - @echo "Installing library files to $(SCRIPT_INSTALL_DIR)"; - @for i in $(SRC_DIR)/library/*.tcl $(GENERIC_DIR)/prolog.ps \ - $(SRC_DIR)/library/tclIndex $(UNIX_DIR)/tkAppInit.c; \ -@@ -543,7 +570,6 @@ - chmod 444 $(MAN1_INSTALL_DIR)/$$i; \ - done; - @echo "Cross-linking top-level (.1) docs"; -- @$(UNIX_DIR)/mkLinks $(MAN1_INSTALL_DIR) - @echo "Installing C API (.3) docs"; - @cd $(SRC_DIR)/doc; for i in *.3; \ - do \ -@@ -553,7 +579,6 @@ - chmod 444 $(MAN3_INSTALL_DIR)/$$i; \ - done; - @echo "Cross-linking top-level (.3) docs"; -- @$(UNIX_DIR)/mkLinks $(MAN3_INSTALL_DIR) - @echo "Installing command (.n) docs"; - @cd $(SRC_DIR)/doc; for i in *.n; \ - do \ -@@ -563,7 +588,6 @@ - chmod 444 $(MANN_INSTALL_DIR)/$$i; \ - done; - @echo "Cross-linking command (.n) docs"; -- @$(UNIX_DIR)/mkLinks $(MANN_INSTALL_DIR) - - Makefile: $(UNIX_DIR)/Makefile.in - $(SHELL) config.status -@@ -843,6 +867,9 @@ - - tkUnixFont.o: $(UNIX_DIR)/tkUnixFont.c - $(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tkUnixFont.c -+ -+tkUnixIm.o: $(UNIX_DIR)/tkUnixIm.c -+ $(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tkUnixIm.c - - tkUnixInit.o: $(UNIX_DIR)/tkUnixInit.c $(GENERIC_DIR)/tkInitScript.h tkConfig.sh - $(CC) -c $(CC_SWITCHES) -DTK_LIBRARY=\"${TK_LIBRARY}\" \ diff --git a/chinese/tk83/files/patch-ac b/chinese/tk83/files/patch-ac deleted file mode 100644 index 2e75edd6df77..000000000000 --- a/chinese/tk83/files/patch-ac +++ /dev/null @@ -1,20 +0,0 @@ ---- tkConfig.sh.in.orig Thu Feb 10 11:11:02 2000 -+++ tkConfig.sh.in Wed Feb 21 21:27:46 2001 -@@ -20,13 +20,16 @@ - TK_PATCH_LEVEL='@TK_PATCH_LEVEL@' - - # -D flags for use with the C compiler. --TK_DEFS='@DEFS@' -+TK_DEFS='@DEFS@ @X11_IMAKE_FLAGS@ @I18N_FLAGS@' - - # Flag, 1: we built a shared lib, 0 we didn't - TK_SHARED_BUILD=@TK_SHARED_BUILD@ - - # This indicates if Tk was build with debugging symbols - TK_DBGX=@TK_DBGX@ -+ -+# I18n improvement flags -+TK_I18N_IMPROVE_FLAGS='@I18N_FLAGS@' - - # The name of the Tk library (may be either a .a file or a shared library): - TK_LIB_FILE='@TK_LIB_FILE@' diff --git a/chinese/tk83/files/patch-ad b/chinese/tk83/files/patch-ad deleted file mode 100644 index 646c7b9685c0..000000000000 --- a/chinese/tk83/files/patch-ad +++ /dev/null @@ -1,34 +0,0 @@ ---- tkUnixEvent.c.orig Fri Apr 16 01:51:46 1999 -+++ tkUnixEvent.c Wed Feb 21 22:51:52 2001 -@@ -161,7 +161,12 @@ - (void) XSync(dispPtr->display, False); - (void) XCloseDisplay(dispPtr->display); - } -- -+#ifdef I18N_IMPROVE -+ if (displayPtr->imEncoding != NULL) { -+ Tcl_FreeEncoding(displayPtr->imEncoding); -+ } -+#endif /* I18N_IMPROVE */ -+ - ckfree((char *) dispPtr); - } - -@@ -246,6 +251,17 @@ - - while (numFound > 0) { - XNextEvent(display, &event); -+#ifdef I18N_IMPROVE -+ /* -+ * To avoid Tk freezing by IM server's protocol bugs, -+ * Re-check queued event after an event is filterd. -+ * -+ */ -+ if (XFilterEvent(&event, None) == True) { -+ numFound = XEventsQueued(display, QueuedAlready); -+ continue; -+ } -+#endif /* I18N_IMPROVE */ - Tk_QueueWindowEvent(&event, TCL_QUEUE_TAIL); - numFound--; - } diff --git a/chinese/tk83/files/patch-ae b/chinese/tk83/files/patch-ae deleted file mode 100644 index 0dd37176d73e..000000000000 --- a/chinese/tk83/files/patch-ae +++ /dev/null @@ -1,261 +0,0 @@ ---- tkUnixIm.c.orig Thu Feb 22 12:00:09 2001 -+++ tkUnixIm.c Thu Feb 22 12:01:30 2001 -@@ -0,0 +1,258 @@ -+/* -+ * tkUnixIm.c -- -+ * -+ * This file contains modules to implement the XIM protocol session. -+ * This is the shrinked version of tkXIM.c, worte for tk8.0jp. -+ * -+ * -+ * Copyright 1999, 2000 Software Research Associates, Inc. -+ * -+ * Permission to use, copy, modify, and distribute this software and its -+ * documentation for any purpose and without fee is hereby granted, provided -+ * that the above copyright notice appear in all copies and that both that -+ * copyright notice and this permission notice appear in supporting -+ * documentation, and that the name of Software Research Associates not be -+ * used in advertising or publicity pertaining to distribution of the -+ * software without specific, written prior permission. Software Research -+ * Associates makes no representations about the suitability of this software -+ * for any purpose. It is provided "as is" without express or implied -+ * warranty. -+ */ -+ -+#include "tkPort.h" -+#include "tkInt.h" -+ -+#ifdef TK_USE_INPUT_METHODS -+#ifdef I18N_IMPROVE -+ -+static void TkpIMGenericHandler _ANSI_ARGS_((ClientData clientData, XEvent *eventPtr)); -+static TkWindow * GetToplevel _ANSI_ARGS_((TkWindow *winPtr)); -+static void TkpCreateIMGenericHandler _ANSI_ARGS_((Tk_Window tkwin)); -+static void TkpDeleteIMGenericHandler _ANSI_ARGS_((Tk_Window tkwin)); -+ -+static TkWindow * -+GetToplevel(winPtr) -+ TkWindow *winPtr; -+{ -+ while (!(winPtr->flags & TK_TOP_LEVEL)) { -+ winPtr = winPtr->parentPtr; -+ if (winPtr == NULL) { -+ return NULL; -+ } -+ } -+ return winPtr; -+} -+ -+ -+static void -+TkpIMGenericHandler(clientData, eventPtr) -+ ClientData clientData; -+ XEvent *eventPtr; -+{ -+ Tk_Window tkwin = (Tk_Window)clientData; -+ TkWindow *winPtr = (TkWindow *)clientData; -+ -+ if (eventPtr->xany.window != Tk_WindowId(tkwin) || -+ winPtr->inputContext == NULL || -+ !(winPtr->flags & TK_CHECKED_IC)) { -+ /* -+ * Why ME ??? -+ */ -+ return; -+ } -+ -+ /* -+ * Well, should I care about Enter/Leave ? -+ */ -+ -+ switch (eventPtr->type) { -+ case KeyPress: -+ case FocusIn: { -+ Window root, child; -+ int rootX, rootY; -+ int wX, wY; -+ unsigned int mask; -+ -+ /* -+ * Care about case mouse pointer is not on winPtr->window. -+ * In such a case, IM server can't fetch any events from Tk. -+ */ -+ -+ if (XQueryPointer(winPtr->display, -+ RootWindow(winPtr->display, winPtr->screenNum), -+ &root, &child, &rootX, &rootY, &wX, &wY, &mask) == True) { -+ TkWindow *pWin = (TkWindow *)Tk_CoordsToWindow(rootX, rootY, -+ (Tk_Window)winPtr); -+ if (pWin != NULL && (pWin->window != winPtr->window)) { -+#if 0 -+ /* -+ * Code belows are what I REALLY want to do. But, -+ * in XIMPreeditPosition mode, IM server use the -+ * focus window as key event source window and as -+ * PreeditArea window by X11 specification. I want -+ * IM server to use this focus window ONLY as key -+ * event source. Means: -+ * -+ * o PreeditArea and PreeditPosition take place -+ * within client window (winPtr->window). -+ * o KeyPress event source is the window in which -+ * mouse pointer is (pWin->window). -+ */ -+ -+ if (XSetICValues(winPtr->inputContext, XNFocusWindow, -+ pWin->window, NULL) != NULL) { -+ fprintf(stderr, "debugIC: can't set IC focus to pointer window 0x%08x\n", -+ pWin->window); -+ } else { -+ fprintf(stderr, "debugIC: set IC focus to pointer window 0x%08x\n", -+ pWin->window); -+ } -+#endif -+ /* -+ * Check pWin and winPtr are in same toplevel. -+ * If they are NOT, don't change focus. -+ */ -+ TkWindow *pTop = GetToplevel(pWin); -+ TkWindow *wTop = GetToplevel(winPtr); -+ if (pTop == wTop) { -+ TkpChangeFocus(winPtr, 1); -+ } -+ } -+ } -+ /* -+ * Get current focused window. -+ */ -+ if (winPtr->dispPtr->lastFocusedIC != winPtr->inputContext) { -+ winPtr->dispPtr->lastFocusedIC = winPtr->inputContext; -+ XSetICFocus(winPtr->inputContext); -+ } -+ break; -+ } -+ -+ case FocusOut: { -+ winPtr->dispPtr->lastFocusedIC = None; -+ XUnsetICFocus(winPtr->inputContext); -+ break; -+ } -+ -+ case DestroyNotify: { -+ winPtr->dispPtr->lastFocusedIC = NULL; -+ XUnsetICFocus(winPtr->inputContext); -+ TkpDeleteIMGenericHandler(tkwin); -+ break; -+ } -+ } -+} -+ -+ -+static void -+TkpCreateIMGenericHandler(tkwin) -+ Tk_Window tkwin; -+{ -+ Tk_CreateEventHandler(tkwin, FocusChangeMask|StructureNotifyMask|KeyPressMask -+#if 0 -+ EnterWindowMask|LeaveWindowMask, -+#else -+ , -+#endif -+ (Tk_EventProc *)TkpIMGenericHandler, -+ (ClientData)tkwin); -+} -+ -+ -+static void -+TkpDeleteIMGenericHandler(tkwin) -+ Tk_Window tkwin; -+{ -+ Tk_DeleteEventHandler(tkwin, FocusChangeMask|StructureNotifyMask|KeyPressMask -+#if 0 -+ EnterWindowMask|LeaveWindowMask, -+#else -+ , -+#endif -+ (Tk_EventProc *)TkpIMGenericHandler, -+ (ClientData)tkwin); -+} -+ -+ -+XIC -+TkpCreateIC(winPtr) -+ TkWindow *winPtr; -+{ -+ if (winPtr->dispPtr->inputMethod != NULL && -+ !(winPtr->flags & TK_CHECKED_IC)) { -+ winPtr->inputContext = -+ XCreateIC(winPtr->dispPtr->inputMethod, -+ XNInputStyle, XIMPreeditNothing|XIMStatusNothing, -+ XNClientWindow, winPtr->window, -+ XNFocusWindow, winPtr->window, -+ NULL); -+ if (winPtr->inputContext != NULL) { -+ TkpCreateIMGenericHandler((Tk_Window)winPtr); -+ } -+ } -+ winPtr->flags |= TK_CHECKED_IC; -+ return winPtr->inputContext; -+} -+ -+ -+void -+TkpDestroyIC(winPtr, needDestroy) -+ TkWindow *winPtr; -+ int needDestroy; -+{ -+ TkpDeleteIMGenericHandler((Tk_Window)winPtr); -+ if (winPtr->inputContext == winPtr->dispPtr->lastFocusedIC) { -+ winPtr->dispPtr->lastFocusedIC = None; -+ } -+ if (needDestroy == 1 && -+ winPtr->inputContext != NULL) { -+ XDestroyIC(winPtr->inputContext); -+ } -+ winPtr->flags &= ~(TK_CHECKED_IC); -+ winPtr->inputContext = NULL; -+} -+ -+ -+int -+Tk_ImconfigureObjCmd(clientData, interp, objc, objv) -+ ClientData clientData; /* Main window associated with -+ * interpreter. */ -+ Tcl_Interp *interp; /* Current interpreter. */ -+ int objc; /* Number of arguments. */ -+ Tcl_Obj *CONST objv[]; /* Argument objects. */ -+{ -+ Tk_Window tkwin = (Tk_Window)clientData; -+ Tcl_Obj *resultPtr = Tcl_GetObjResult(interp); -+ -+ if (objc < 2) { -+ Tcl_WrongNumArgs(interp, 1, objv, "path ?option? ?arg? ..."); -+ return TCL_ERROR; -+ } -+ -+ tkwin = Tk_NameToWindow(interp, Tcl_GetStringFromObj(objv[1], NULL), tkwin); -+ if (tkwin == NULL) { -+ return TCL_ERROR; -+ } -+ -+ if (((TkWindow *)tkwin)->dispPtr->useInputMethods == 0) { -+ /* -+ * Destroy XIC and leave. -+ */ -+ TkpDestroyIC((TkWindow *)tkwin, 1); -+ return TCL_OK; -+ } -+ -+ if (((TkWindow *)tkwin)->dispPtr->inputMethod == NULL) { -+ Tcl_AppendStringsToObj(resultPtr, "No IM server is available.", NULL); -+ return TCL_ERROR; -+ } -+ -+ Tcl_AppendStringsToObj(resultPtr, -+ (TkpCreateIC((TkWindow *)tkwin) != NULL) ? "1" : "0", -+ NULL); -+ return TCL_OK; -+} -+ -+#endif /* I18N_IMPROVE */ -+#endif /* TK_USE_INPUT_METHODS */ diff --git a/chinese/tk83/files/patch-af b/chinese/tk83/files/patch-af deleted file mode 100644 index 8272362e08b8..000000000000 --- a/chinese/tk83/files/patch-af +++ /dev/null @@ -1,91 +0,0 @@ ---- tkUnixKey.c.orig Wed Feb 9 02:13:54 2000 -+++ tkUnixKey.c Wed Feb 21 21:27:46 2001 -@@ -50,6 +50,10 @@ - int len; - Tcl_DString buf; - Status status; -+#if defined(I18N_IMPROVE) && defined(TK_USE_INPUT_METHODS) -+ Bool validString = False; -+ Bool usePreviousComposed = False; -+#endif /* I18N_IMPROVE && TK_USE_INPUT_METHODS */ - - /* - * Overallocate the dstring to the maximum stack amount. -@@ -59,8 +63,18 @@ - Tcl_DStringSetLength(&buf, TCL_DSTRING_STATIC_SIZE-1); - - #ifdef TK_USE_INPUT_METHODS -+#ifdef I18N_IMPROVE -+ /* -+ * If there is a valid XIC, must fetch strings here since some -+ * garbages still remain. After the fetching, if -+ * dispPtr->useInputMethods == 0, just trash the strings. -+ * m-hirano -+ */ -+ if ((winPtr->inputContext != NULL) -+#else - if (winPtr->dispPtr->useInputMethods - && (winPtr->inputContext != NULL) -+#endif /* I18N_IMPROVE */ - && (eventPtr->type == KeyPress)) { - len = XmbLookupString(winPtr->inputContext, &eventPtr->xkey, - Tcl_DStringValue(&buf), Tcl_DStringLength(&buf), -@@ -75,12 +89,27 @@ - Tcl_DStringValue(&buf), len, (KeySym *) NULL, &status); - } - if ((status != XLookupChars) && (status != XLookupBoth)) { -+#ifdef I18N_IMPROVE -+ if (winPtr->dispPtr->isComposed == 1 && -+ Tcl_DStringLength(&(winPtr->composedDStr)) > 0 && -+ winPtr->dispPtr->useInputMethods == 1) { -+ usePreviousComposed = True; -+ } -+#endif /* I18N_IMPROVE */ - len = 0; - } -+#ifdef I18N_IMPROVE -+ if (winPtr->dispPtr->useInputMethods == 1) { -+ validString = True; -+ } -+#endif /* I18N_IMPROVE */ - } else { - len = XLookupString(&eventPtr->xkey, Tcl_DStringValue(&buf), - Tcl_DStringLength(&buf), (KeySym *) NULL, - (XComposeStatus *) NULL); -+#ifdef I18N_IMPROVE -+ validString = True; -+#endif /* I18N_IMPROVE */ - } - #else /* TK_USE_INPUT_METHODS */ - len = XLookupString(&eventPtr->xkey, Tcl_DStringValue(&buf), -@@ -89,7 +118,30 @@ - #endif /* TK_USE_INPUT_METHODS */ - Tcl_DStringSetLength(&buf, len); - -+#if defined(I18N_IMPROVE) && defined(TK_USE_INPUT_METHODS) -+ if (validString == True) { -+ if (usePreviousComposed == False) { -+ Tcl_ExternalToUtfDString(winPtr->dispPtr->imEncoding, -+ Tcl_DStringValue(&buf), len, dsPtr); -+ Tcl_DStringFree(&(winPtr->composedDStr)); -+ Tcl_DStringInit(&(winPtr->composedDStr)); -+ Tcl_DStringAppend(&(winPtr->composedDStr), -+ Tcl_DStringValue(dsPtr), -+ Tcl_DStringLength(dsPtr)); -+ } else { -+ Tcl_DStringFree(dsPtr); -+ Tcl_DStringInit(dsPtr); -+ Tcl_DStringAppend(dsPtr, -+ Tcl_DStringValue(&(winPtr->composedDStr)), -+ Tcl_DStringLength(&(winPtr->composedDStr))); -+ } -+ } else { -+ Tcl_DStringFree(dsPtr); -+ Tcl_DStringInit(dsPtr); -+ } -+#else - Tcl_ExternalToUtfDString(NULL, Tcl_DStringValue(&buf), len, dsPtr); -+#endif /* I18N_IMPROVE && TK_USE_INPUT_METHODS */ - Tcl_DStringFree(&buf); - - return Tcl_DStringValue(dsPtr); diff --git a/chinese/tk83/files/patch-ag b/chinese/tk83/files/patch-ag deleted file mode 100644 index 8920819aaa69..000000000000 --- a/chinese/tk83/files/patch-ag +++ /dev/null @@ -1,13 +0,0 @@ ---- tkUnixPort.h.orig Fri Apr 16 01:51:47 1999 -+++ tkUnixPort.h Wed Feb 21 21:27:46 2001 -@@ -82,6 +82,10 @@ - #include - #include - -+#ifdef I18N_IMPROVE -+#include -+#endif /* I18N_IMPROVE */ -+ - /* - * The following macro defines the type of the mask arguments to - * select: diff --git a/chinese/tk83/files/patch-ah b/chinese/tk83/files/patch-ah deleted file mode 100644 index 48ecb7b56b74..000000000000 --- a/chinese/tk83/files/patch-ah +++ /dev/null @@ -1,95 +0,0 @@ ---- configure.in.orig Thu Feb 10 20:11:02 2000 -+++ configure.in Mon Nov 15 10:10:10 2004 -@@ -60,6 +60,12 @@ - SC_LOAD_TCLCONFIG - - #-------------------------------------------------------------------- -+# i18n improvement (also check it is specified in Tcl) -+#-------------------------------------------------------------------- -+ -+SC_ENABLE_I18N_IMPROVE -+ -+#-------------------------------------------------------------------- - # Recompute the necessary flags to run the compiler - #-------------------------------------------------------------------- - -@@ -372,6 +378,72 @@ - TK_SHARED_BUILD=${SHARED_BUILD} - - #-------------------------------------------------------------------- -+# Checking X lib for i18n related things. -+#-------------------------------------------------------------------- -+ -+X11_IMAKE_FLAGS="" -+tk_oldCflags=$CFLAGS -+tk_oldLibs=$LIBS -+CFLAGS="$CFLAGS $XINCLUDES" -+LIBS="$XLIBSW $LIBS" -+ -+AC_MSG_CHECKING([XRegisterIMInstantiateCallback]) -+AC_TRY_LINK([ -+#include -+], [ -+XRegisterIMInstantiateCallback(0, 0, 0, 0, 0, 0); -+], [ -+AC_MSG_RESULT(yes) -+X11_IMAKE_FLAGS="-DHAVE_XIMREGINSTCB" -+], [ -+AC_MSG_RESULT(no) -+]) -+ -+AC_MSG_CHECKING([XIDProc]) -+AC_TRY_COMPILE([ -+#include -+], [ -+XIDProc *a; -+], [ -+AC_MSG_RESULT(yes) -+], [ -+AC_MSG_RESULT(no) -+X11_IMAKE_FLAGS="$X11_IMAKE_FLAGS -DNO_XIDPROC" -+]) -+ -+HAVE_XMKMF="" -+AC_PATH_PROG(HAVE_XMKMF, xmkmf, "", ${PATH}:/usr/X11R6/bin:/usr/X11R5/bin:/usr/local/X11R6/bin:/usr/local/X11R5/bin:/usr/openwin/bin:/usr/X11/bin:/usr/X386/bin:/usr/sww/bin:/usr/unsupported/bin) -+if test "X$HAVE_XMKMF" != "X"; then -+ IMAKE_FLAGS="" -+ if test -d ImakeCheck; then -+ rm -rf ImakeCheck -+ fi -+ mkdir ImakeCheck -+ cat << EOF > ImakeCheck/Imakefile -+SRCS = dummy.c -+OBJS = dummy.o -+ -+ComplexProgramTarget(dummy) -+EOF -+ cat << EOF > ImakeCheck/dummy.c -+static int justAnInt = 0; -+EOF -+ (cd ./ImakeCheck; rm -f Makefile Makefile.*; eval $HAVE_XMKMF) > /dev/null 2>&1 -+ for i in `(cd ./ImakeCheck; make -n dummy.o)` -+ do -+ case $i in -D*) IMAKE_FLAGS="$IMAKE_FLAGS $i";; esac -+ done -+ if test "X$IMAKE_FLAGS" != "X"; then -+ AC_MSG_RESULT(Add these flags for proper compile: $IMAKE_FLAGS) -+ X11_IMAKE_FLAGS="$X11_IMAKE_FLAGS $IMAKE_FLAGS" -+ fi -+ rm -rf ImakeCheck -+fi -+ -+CFLAGS=$tk_oldCflags -+LIBS=$tk_oldLibs -+ -+#-------------------------------------------------------------------- - # The statements below define various symbols relating to creating - # the stub'd version of the Tk library - # -@@ -453,5 +525,5 @@ - AC_SUBST(XINCLUDES) - AC_SUBST(XLIBSW) - AC_SUBST(TK_SHARED_BUILD) -- -+AC_SUBST(X11_IMAKE_FLAGS) - AC_OUTPUT(Makefile tkConfig.sh) diff --git a/chinese/tk83/files/patch-ai b/chinese/tk83/files/patch-ai deleted file mode 100644 index 183ef6e4f7c8..000000000000 --- a/chinese/tk83/files/patch-ai +++ /dev/null @@ -1,14 +0,0 @@ ---- ../generic/tk.h.orig Tue Feb 8 11:31:32 2000 -+++ ../generic/tk.h Wed Feb 21 21:27:44 2001 -@@ -688,6 +688,11 @@ - char *dummy17; - ClientData dummy18; - char *dummy19; -+#ifdef TK_USE_INPUT_METHODS -+#ifdef I18N_IMPROVE -+ Tcl_DString dummy20DStr; -+#endif /* I18N_IMPROVE */ -+#endif /* TK_USE_INPUT_METHODS */ - } Tk_FakeWin; - - /* diff --git a/chinese/tk83/files/patch-aj b/chinese/tk83/files/patch-aj deleted file mode 100644 index 2de556433809..000000000000 --- a/chinese/tk83/files/patch-aj +++ /dev/null @@ -1,26 +0,0 @@ ---- ../generic/tkBind.c.orig Wed Feb 9 02:13:50 2000 -+++ ../generic/tkBind.c Wed Feb 21 21:27:44 2001 -@@ -1443,6 +1443,11 @@ - */ - - if (winPtr->pathName == NULL) { -+#ifdef TK_USE_INPUT_METHODS -+#ifdef I18N_IMPROVE -+ winPtr->dispPtr->isComposed = 0; -+#endif /* I18N_IMPROVE */ -+#endif /* TK_USE_INPUT_METHODS */ - return; - } - -@@ -1678,6 +1683,11 @@ - Tcl_DStringAppend(&scripts, "", 1); - } - } -+#ifdef TK_USE_INPUT_METHODS -+#ifdef I18N_IMPROVE -+ winPtr->dispPtr->isComposed = 0; -+#endif /* I18N_IMPROVE */ -+#endif /* TK_USE_INPUT_METHODS */ - if (Tcl_DStringLength(&scripts) == 0) { - return; - } diff --git a/chinese/tk83/files/patch-ak b/chinese/tk83/files/patch-ak deleted file mode 100644 index 9049dcc37517..000000000000 --- a/chinese/tk83/files/patch-ak +++ /dev/null @@ -1,47 +0,0 @@ ---- ../generic/tkEvent.c.orig Thu Dec 16 21:57:36 1999 -+++ ../generic/tkEvent.c Wed Feb 21 23:18:43 2001 -@@ -663,6 +663,17 @@ - } - - #ifdef TK_USE_INPUT_METHODS -+#ifdef I18N_IMPROVE -+ /* -+ * No need to create an input context for each and every window. -+ * -+ * Futhermore, XFilterEvent() should be called just after the -+ * event is fetched, since some IM server have protocol bugs that -+ * causes Tk freezing, so events EXCEPT THE INPUT METHODS THINGS -+ * should only be queued into Tcl event queue. -+ * -+ */ -+#else - /* - * Pass the event to the input method(s), if there are any, and - * discard the event if the input method(s) insist. Create the -@@ -684,6 +695,7 @@ - goto done; - } - } -+#endif /* I18N_IMPROVE */ - #endif /* TK_USE_INPUT_METHODS */ - - /* -@@ -936,6 +948,18 @@ - break; - } - } -+ -+#if defined(TK_USE_INPUT_METHODS) && defined(I18N_IMPROVE) -+ if (eventPtr->type == KeyPress && eventPtr->xkey.keycode == 0) { -+ /* -+ * No doubt this is a composed message from IM server. -+ * Tk can handle KeyPress event with zero keycode value -+ * if state of the event is zero. -+ */ -+ eventPtr->xkey.state = 0; -+ dispPtr->isComposed = 1; -+ } -+#endif /* TK_USE_INPUT_METHODS && I18N_IMPROVE */ - - if ((dispPtr->delayedMotionPtr != NULL) && (position == TCL_QUEUE_TAIL)) { - if ((eventPtr->type == MotionNotify) && (eventPtr->xmotion.window diff --git a/chinese/tk83/files/patch-al b/chinese/tk83/files/patch-al deleted file mode 100644 index d7560ddafa09..000000000000 --- a/chinese/tk83/files/patch-al +++ /dev/null @@ -1,73 +0,0 @@ ---- ../generic/tkInt.h.orig Fri Jan 21 03:54:41 2000 -+++ ../generic/tkInt.h Wed Feb 21 21:27:44 2001 -@@ -499,6 +499,24 @@ - int warpX; - int warpY; - int useInputMethods; /* Whether to use input methods */ -+#ifdef TK_USE_INPUT_METHODS -+#ifdef I18N_IMPROVE -+ Tcl_Encoding imEncoding; /* Tcl encoding when the first Tcl -+ * interp was created. -+ * For encoding conversion from -+ * XmbLookupString() to UTF. -+ */ -+ XIC lastFocusedIC; /* The last focused input context on -+ * the display. -+ */ -+ int isComposed; /* 1 if the latest KeyPress event is a -+ * "Compose message" from IM server, -+ * otherwise 0. */ -+#ifdef XNDestroyCallback -+ XIMCallback destroyCallback; -+#endif /* XNDestroyCallback */ -+#endif /* I18N_IMPROVE */ -+#endif /* TK_USE_INPUT_METHODS */ - } TkDisplay; - - /* -@@ -790,6 +808,13 @@ - */ - - struct TkWindowPrivate *privatePtr; -+#ifdef TK_USE_INPUT_METHODS -+#ifdef I18N_IMPROVE -+ Tcl_DString composedDStr; /* To prepare successive "%A" in bind -+ * script, save a string from IM -+ * server. */ -+#endif /* I18N_IMPROVE */ -+#endif /* TK_USE_INPUT_METHODS */ - } TkWindow; - - /* -@@ -999,9 +1024,6 @@ - EXTERN int Tk_WmCmd _ANSI_ARGS_((ClientData clientData, - Tcl_Interp *interp, int argc, char **argv)); - --void TkConsolePrint _ANSI_ARGS_((Tcl_Interp *interp, -- int devId, char *buffer, long size)); -- - EXTERN void TkEventInit _ANSI_ARGS_((void)); - - EXTERN int TkCreateMenuCmd _ANSI_ARGS_((Tcl_Interp *interp)); -@@ -1080,6 +1102,21 @@ - */ - EXTERN int TkUnsupported1Cmd _ANSI_ARGS_((ClientData clientData, - Tcl_Interp *interp, int argc, char **argv)); -+ -+#if defined(TK_USE_INPUT_METHODS) && defined(I18N_IMPROVE) -+EXTERN XIC TkpCreateIC _ANSI_ARGS_((TkWindow *winPtr)); -+EXTERN void TkpDestroyIC _ANSI_ARGS_((TkWindow *winPtr, int needDestroy)); -+EXTERN int Tk_ImconfigureObjCmd _ANSI_ARGS_((ClientData clientData, -+ Tcl_Interp *interp, int objc, -+ Tcl_Obj *CONST objv[])); -+#endif /* TK_USE_INPUT_METHODS && I18N_IMPROVE */ -+ -+# undef TCL_STORAGE_CLASS -+# define TCL_STORAGE_CLASS -+ -+EXTERN int TkConsoleInit _ANSI_ARGS_((Tcl_Interp *interp)); -+EXTERN void TkConsolePrint _ANSI_ARGS_((Tcl_Interp *interp, -+ int devId, char *buffer, long size)); - - # undef TCL_STORAGE_CLASS - # define TCL_STORAGE_CLASS DLLIMPORT diff --git a/chinese/tk83/files/patch-am b/chinese/tk83/files/patch-am deleted file mode 100644 index 015b4280715c..000000000000 --- a/chinese/tk83/files/patch-am +++ /dev/null @@ -1,306 +0,0 @@ ---- ../generic/tkWindow.c.orig Thu Dec 16 21:57:36 1999 -+++ ../generic/tkWindow.c Wed Feb 21 23:20:48 2001 -@@ -155,6 +155,9 @@ - #ifdef MAC_TCL - {"unsupported1", TkUnsupported1Cmd, NULL, 1, 1}, - #endif -+#if defined(TK_USE_INPUT_METHODS) && defined(I18N_IMPROVE) -+ {"imconfigure", NULL, Tk_ImconfigureObjCmd, 1, 1}, -+#endif /* TK_USE_INPUT_METHODS && I18N_IMPROVE */ - {(char *) NULL, (int (*) _ANSI_ARGS_((ClientData, Tcl_Interp *, int, char **))) NULL, NULL, 0} - }; - -@@ -209,6 +212,15 @@ - char *name)); - static void OpenIM _ANSI_ARGS_((TkDisplay *dispPtr)); - static void UnlinkWindow _ANSI_ARGS_((TkWindow *winPtr)); -+#ifdef TK_USE_INPUT_METHODS -+#ifdef I18N_IMPROVE -+static int CanInitiateIm _ANSI_ARGS_((void)); -+static void IMInstantiateCallback _ANSI_ARGS_ ((Display *display, -+ XPointer clientData, XPointer callData)); -+static void IMDestroyCallback _ANSI_ARGS_ ((XIM im, XPointer clientData, -+ XPointer callData)); -+#endif /* I18N_IMPROVE */ -+#endif /* TK_USE_INPUT_METHODS */ - - /* - *---------------------------------------------------------------------- -@@ -631,6 +643,9 @@ - winPtr->handlerList = NULL; - #ifdef TK_USE_INPUT_METHODS - winPtr->inputContext = NULL; -+#ifdef I18N_IMPROVE -+ Tcl_DStringInit(&(winPtr->composedDStr)); -+#endif /* I18N_IMPROVE */ - #endif /* TK_USE_INPUT_METHODS */ - winPtr->tagPtr = NULL; - winPtr->numTags = 0; -@@ -1275,8 +1290,16 @@ - TkBindDeadWindow(winPtr); - #ifdef TK_USE_INPUT_METHODS - if (winPtr->inputContext != NULL) { -- XDestroyIC(winPtr->inputContext); -+#ifdef I18N_IMPROVE -+ TkpDestroyIC(winPtr, 1); -+#else -+ XDestroyIC(winPtr->inputContext); -+#endif /* I18N_IMPROVE */ - } -+#ifdef I18N_IMPROVE -+ Tcl_DStringFree(&(winPtr->composedDStr)); -+ Tcl_DStringInit(&(winPtr->composedDStr)); -+#endif /* I18N_IMPROVE */ - #endif /* TK_USE_INPUT_METHODS */ - if (winPtr->tagPtr != NULL) { - TkFreeBindingTags(winPtr); -@@ -2427,6 +2450,180 @@ - { - return ((TkWindow *) tkwin)->mainPtr->strictMotif; - } -+#ifdef TK_USE_INPUT_METHODS -+#ifdef I18N_IMPROVE -+ -+static int -+CanInitiateIm() -+{ -+ static int inited = 0; -+ static int ret = 0; -+ char *locale; -+ -+ /* -+ * Determine the current encoding from the LC_* or LANG environment -+ * variables. We previously used setlocale() to determine the locale, -+ * but this does not work on some systems (e.g. Linux/i386 RH 5.0). -+ */ -+ -+ locale = getenv("LC_ALL"); -+ -+ if (locale == NULL || locale[0] == '\0') { -+ locale = getenv("LC_CTYPE"); -+ } -+ if (locale == NULL || locale[0] == '\0') { -+ locale = getenv("LANG"); -+ } -+ if (locale == NULL || locale[0] == '\0') { -+ return False; -+ } -+ -+ if (inited == 0) { -+ char *curSpec = setlocale(LC_ALL, NULL); -+ -+ inited = 1; -+ -+ if (strcmp(locale, "C") == 0 || -+ strcmp(locale, "POSIX") == 0) { -+ goto Checked; -+ } -+ -+ /* -+ * setlocale(3)/_Xsetlocale() VERY HERE. This is what the X -+ * input method wants. -+ * Note that X11's i18n implementation should be ONLY governed -+ * by LC_CTYPE. This is clearly/explicitly specified in X11 -+ * documente Chapter 13. Thus, If there are some X11 -+ * implementation that need using LC_ALL to initialize i18n -+ * subsystem, I won't care about such a X library. -+ * But, we are still on edge of darkside. ctype(3) routines -+ * are governed by LC_CTYPE.... Need to create "Locale -+ * independent ctype libraries" for Tcl/Tk... -+ * -+ */ -+ -+ /* -+ * OK, First of all, setting WHOLE locale to "C". -+ */ -+ (void)setlocale(LC_ALL, "C"); -+ if (setlocale(LC_CTYPE, locale) == NULL) { -+ /* -+ * Reset to old locale. -+ */ -+ if (setlocale(LC_ALL, curSpec) == NULL) { -+ (void)setlocale(LC_ALL, "C"); -+ } -+ goto Checked; -+ } else { -+ /* -+ * For insurance, reset LC_NUMERIC to "C" for Tcl numeric parsing. -+ */ -+ (void)setlocale(LC_NUMERIC, "C"); -+ } -+ if (XSupportsLocale() != True) { -+ goto Checked; -+ } -+ -+ ret = True; -+ /* -+ * At last, Setting the locale modifiers. -+ */ -+ (void)XSetLocaleModifiers(""); -+ } -+ -+ Checked: -+ return ret; -+} -+ -+/* -+ *---------------------------------------------------------------------- -+ * -+ * IMInstantiateCallback -+ * -+ * Whenever IM server become available, this function will be called. -+ * -+ * Results: -+ * OpenIM() is called. -+ * -+ * Side effects: -+ * None. -+ * -+ *---------------------------------------------------------------------- -+ */ -+ -+void -+IMInstantiateCallback(display, clientData, callData) -+ Display *display; -+ XPointer clientData; -+ XPointer callData; -+{ -+ TkDisplay *dispPtr = (TkDisplay *)clientData; -+ -+ if (display == dispPtr->display && -+ dispPtr->inputMethod == NULL) { -+ OpenIM(dispPtr); -+ } -+} -+ -+/* -+ *---------------------------------------------------------------------- -+ * -+ * IMDestroyCallback -+ * -+ * Whenever IM server stops the service, this function will be called. -+ * -+ * Results: -+ * the XIM opened before is marked as unusable. -+ * -+ * Side effects: -+ * XIC using this XIM will be useless. -+ * -+ *---------------------------------------------------------------------- -+ */ -+void -+IMDestroyCallback(im, clientData, callData) -+ XIM im; -+ XPointer clientData; -+ XPointer callData; -+{ -+ TkDisplay *dispPtr = (TkDisplay *)clientData; -+ if (im == dispPtr->inputMethod) { -+ Tcl_HashTable winTable = dispPtr->winTable; -+ Tcl_HashEntry *entry = NULL; -+ Tcl_HashSearch search; -+ TkWindow *winPtr; -+ -+ /* -+ * We must not call XCloseIM() or XDestroyIC(). -+ * because the XIM and XIC are destroyed by Xlib -+ * automatically. -+ */ -+ for (entry = Tcl_FirstHashEntry(&winTable, &search); entry != NULL; -+ entry = Tcl_NextHashEntry(&search)) { -+ winPtr = (TkWindow *)Tcl_GetHashValue(entry); -+ if (winPtr->dispPtr->display == dispPtr->display && -+ winPtr->dispPtr->inputMethod == im && -+ winPtr->inputContext != NULL) { -+ TkpDestroyIC(winPtr, 0); -+ } -+ Tcl_DStringFree(&(winPtr->composedDStr)); -+ Tcl_DStringInit(&(winPtr->composedDStr)); -+ } -+ dispPtr->inputMethod = NULL; -+ dispPtr->lastFocusedIC = NULL; -+#ifdef HAVE_XIMREGINSTCB -+#ifdef NO_XIDPROC -+ XRegisterIMInstantiateCallback(dispPtr->display, NULL, NULL, NULL, -+ (XIMProc)IMInstantiateCallback, (XPointer *)dispPtr); -+#else -+ XRegisterIMInstantiateCallback(dispPtr->display, NULL, NULL, NULL, -+ (XIDProc)IMInstantiateCallback, (XPointer)dispPtr); -+#endif /* NO_XIDPROC */ -+#endif /* HAVE_XIMREGINSTCB */ -+ } -+} -+#endif /* I18N_IMPROVE */ -+#endif /* TK_USE_INPUT_METHODS */ - - /* - *-------------------------------------------------------------- -@@ -2457,8 +2654,35 @@ - unsigned short i; - XIMStyles *stylePtr; - -+#ifdef I18N_IMPROVE -+ int styleFound = 0; -+ -+ dispPtr->inputMethod = NULL; -+ dispPtr->imEncoding = NULL; -+ dispPtr->lastFocusedIC = NULL; -+ dispPtr->isComposed = 0; -+ -+ if (CanInitiateIm() == False) { -+ return; -+ } -+#endif /* I18N_IMPROVE */ - dispPtr->inputMethod = XOpenIM(dispPtr->display, NULL, NULL, NULL); - if (dispPtr->inputMethod == NULL) { -+#ifdef I18N_IMPROVE -+#ifdef HAVE_XIMREGINSTCB -+ /* -+ * Maybe no IM server is available right now. -+ * Try to register instantiate callback. -+ */ -+#ifdef NO_XIDPROC -+ XRegisterIMInstantiateCallback(dispPtr->display, NULL, NULL, NULL, -+ (XIMProc)IMInstantiateCallback, (XPointer *)dispPtr); -+#else -+ XRegisterIMInstantiateCallback(dispPtr->display, NULL, NULL, NULL, -+ (XIDProc)IMInstantiateCallback, (XPointer)dispPtr); -+#endif /* NO_XIDPROC */ -+#endif /* HAVE_XIMREGINSTCB */ -+#endif /* I18N_IMPROVE */ - return; - } - -@@ -2469,11 +2693,30 @@ - for (i = 0; i < stylePtr->count_styles; i++) { - if (stylePtr->supported_styles[i] - == (XIMPreeditNothing|XIMStatusNothing)) { -- XFree(stylePtr); -- return; -+#ifdef I18N_IMPROVE -+ styleFound = 1; -+#else -+ XFree(stylePtr); -+ return; -+#endif /* I18N_IMPROVE */ - } - } - XFree(stylePtr); -+#ifdef I18N_IMPROVE -+ if (styleFound == 1) { -+ /* -+ * Create a Tcl_Encoding for XmbLookupString() conversion. -+ */ -+ dispPtr->imEncoding = Tcl_GetEncoding(NULL, Tcl_GetEncodingName(NULL)); -+#ifdef XNDestroyCallback -+ dispPtr->destroyCallback.client_data = (XPointer)dispPtr; -+ dispPtr->destroyCallback.callback = (XIMProc)IMDestroyCallback; -+ (void)XSetIMValues(dispPtr->inputMethod, -+ XNDestroyCallback, &(dispPtr->destroyCallback), NULL); -+#endif /* XNDestroyCallback */ -+ return; -+ } -+#endif /* I18N_IMPROVE */ - - error: - diff --git a/chinese/tk83/files/patch-an b/chinese/tk83/files/patch-an deleted file mode 100644 index 47dcdff2bb00..000000000000 --- a/chinese/tk83/files/patch-an +++ /dev/null @@ -1,16 +0,0 @@ ---- ../library/entry.tcl.orig Thu Jan 6 02:22:24 2000 -+++ ../library/entry.tcl Wed Feb 21 21:27:44 2001 -@@ -214,6 +214,13 @@ - } - } - -+# input method configuration binding (unix only) -+if {![string compare $tcl_platform(platform) "unix"]} { -+ if {[string compare [info commands imconfigure] {}]} { -+ bind Entry {catch {imconfigure %W}} -+ } -+} -+ - # Additional emacs-like bindings: - - bind Entry { diff --git a/chinese/tk83/files/patch-ao b/chinese/tk83/files/patch-ao deleted file mode 100644 index 823a8c5bdb08..000000000000 --- a/chinese/tk83/files/patch-ao +++ /dev/null @@ -1,16 +0,0 @@ ---- ../library/text.tcl.orig Thu Feb 10 08:52:50 2000 -+++ ../library/text.tcl Wed Feb 21 21:27:44 2001 -@@ -378,6 +378,13 @@ - } - } - -+# UNIX only bindings: -+ -+if {[string equal $tcl_platform(platform) "unix"] && -+ [string compare [info commands imconfigure] {}]} { -+ bind Text {catch {imconfigure %W}} -+} -+ - # Macintosh only bindings: - - # if text black & highlight black -> text white, other text the same diff --git a/chinese/tk83/pkg-deinstall.wish b/chinese/tk83/pkg-deinstall.wish deleted file mode 100644 index 1998d0efb780..000000000000 --- a/chinese/tk83/pkg-deinstall.wish +++ /dev/null @@ -1,22 +0,0 @@ -#! /bin/sh -# -# Remove the ${PREFIX}/bin/wish script that gets installed by INSTALL.wish -# if we are the last wish installation to be pkg_delete'd. -# -# $FreeBSD: /tmp/pcvs/ports/chinese/tk83/Attic/pkg-deinstall.wish,v 1.1 2001-02-22 04:09:52 kevlo Exp $ -# - -# -# Explicitly listing /usr/X11R6/bin here is debatable. -# -BINDIR="${PKG_PREFIX}/bin /usr/X11R6/bin" -WISH=${PKG_PREFIX}/bin/wish - -wishes=$(/bin/ls ${BINDIR} 2> /dev/null | \ - egrep '^o?wish(step)?(x|([0-9]+\.[0-9]+))([a-z][a-z])?$') - -if [ "$wishes" = "" -a -f ${WISH} ] && \ - (head -3 ${WISH} | grep awieYJFnsuILOnfsYEW) > /dev/null 2>&1 -then - rm -f ${PKG_PREFIX}/bin/wish -fi diff --git a/chinese/tk83/pkg-descr b/chinese/tk83/pkg-descr deleted file mode 100644 index 4993abd0959f..000000000000 --- a/chinese/tk83/pkg-descr +++ /dev/null @@ -1,6 +0,0 @@ -This is Tk version 8.3, a GUI toolkit for Tcl. - -The best way to get started with Tcl is to read ``Tcl and the Tk -Toolkit'' by John K. Ousterhout, Addison-Wesley, ISBN 0-201-63337-X. - -WWW: http://www.tcl.tk/software/tcltk/8.3.html diff --git a/chinese/tk83/pkg-install.wish b/chinese/tk83/pkg-install.wish deleted file mode 100644 index d526f076a498..000000000000 --- a/chinese/tk83/pkg-install.wish +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh - -# The user may have a wish they want to preserve -ver=`grep -a awieYJFnsuILOnfsYEW ${PKG_PREFIX}/bin/wish 2> /dev/null \ - | sed -e 's/.*\*\*//'` -if [ ! -e ${PKG_PREFIX}/bin/wish ] || [ "$ver" != "" -a "$ver" -lt 001 ] -then - [ -f ${PKG_PREFIX}/bin/wish ] && chmod u+w ${PKG_PREFIX}/bin/wish - - mkdir -p ${PKG_PREFIX}/bin - cat > ${PKG_PREFIX}/bin/wish <<'EOF' -#!/bin/sh -# Installed by ports system. id: awieYJFnsuILOnfsYEW**001 - -( -echo "In FreeBSD, wish is named with a version number. This is because" -echo "different versions of wish are not compatible with each other and" -echo "they can not all be called \"wish\"! You may need multiple versions" -echo "installed because a given port may depend on a specific version." -echo -echo "On your system, wish is installed under at least the following names:" -echo -for name in $(/bin/ls $(echo $PATH | sed 's/:/ /g') 2> /dev/null | egrep '^wish(step)?(x|([0-9]+\.[0-9]+))([a-z][a-z])?$') -do - echo $name -done -[ "$name" = "" ] && echo "No wish installations found, sorry." -) 1>&2 -exit 1 -EOF - chmod a+rx ${PKG_PREFIX}/bin/wish -fi diff --git a/chinese/tk83/pkg-plist b/chinese/tk83/pkg-plist deleted file mode 100644 index 4c490db894b5..000000000000 --- a/chinese/tk83/pkg-plist +++ /dev/null @@ -1,139 +0,0 @@ -bin/wish%%TK_VER%% -include/tk%%TK_VER%%/generic/default.h -include/tk%%TK_VER%%/generic/ks_names.h -include/tk%%TK_VER%%/generic/tk.h -include/tk%%TK_VER%%/generic/tk3d.h -include/tk%%TK_VER%%/generic/tkButton.h -include/tk%%TK_VER%%/generic/tkCanvas.h -include/tk%%TK_VER%%/generic/tkColor.h -include/tk%%TK_VER%%/generic/tkDecls.h -include/tk%%TK_VER%%/generic/tkFileFilter.h -include/tk%%TK_VER%%/generic/tkFont.h -include/tk%%TK_VER%%/generic/tkInitScript.h -include/tk%%TK_VER%%/generic/tkInt.h -include/tk%%TK_VER%%/generic/tkIntDecls.h -include/tk%%TK_VER%%/generic/tkIntPlatDecls.h -include/tk%%TK_VER%%/generic/tkIntXlibDecls.h -include/tk%%TK_VER%%/generic/tkMenu.h -include/tk%%TK_VER%%/generic/tkMenubutton.h -include/tk%%TK_VER%%/generic/tkPlatDecls.h -include/tk%%TK_VER%%/generic/tkPort.h -include/tk%%TK_VER%%/generic/tkScale.h -include/tk%%TK_VER%%/generic/tkScrollbar.h -include/tk%%TK_VER%%/generic/tkSelect.h -include/tk%%TK_VER%%/generic/tkText.h -include/tk%%TK_VER%%/tk.h -include/tk%%TK_VER%%/tkDecls.h -include/tk%%TK_VER%%/unix/tkUnixDefault.h -include/tk%%TK_VER%%/unix/tkUnixInt.h -include/tk%%TK_VER%%/unix/tkUnixPort.h -lib/libtk%%SHORT_TK_VER%%.a -lib/libtk%%SHORT_TK_VER%%.so -lib/libtk%%SHORT_TK_VER%%.so.1 -lib/libtkstub%%SHORT_TK_VER%%.a -lib/tk%%TK_VER%%/bgerror.tcl -lib/tk%%TK_VER%%/button.tcl -lib/tk%%TK_VER%%/choosedir.tcl -lib/tk%%TK_VER%%/clrpick.tcl -lib/tk%%TK_VER%%/comdlg.tcl -lib/tk%%TK_VER%%/console.tcl -lib/tk%%TK_VER%%/demos/README -lib/tk%%TK_VER%%/demos/arrow.tcl -lib/tk%%TK_VER%%/demos/bind.tcl -lib/tk%%TK_VER%%/demos/bitmap.tcl -lib/tk%%TK_VER%%/demos/browse -lib/tk%%TK_VER%%/demos/button.tcl -lib/tk%%TK_VER%%/demos/check.tcl -lib/tk%%TK_VER%%/demos/clrpick.tcl -lib/tk%%TK_VER%%/demos/colors.tcl -lib/tk%%TK_VER%%/demos/cscroll.tcl -lib/tk%%TK_VER%%/demos/ctext.tcl -lib/tk%%TK_VER%%/demos/dialog1.tcl -lib/tk%%TK_VER%%/demos/dialog2.tcl -lib/tk%%TK_VER%%/demos/entry1.tcl -lib/tk%%TK_VER%%/demos/entry2.tcl -lib/tk%%TK_VER%%/demos/filebox.tcl -lib/tk%%TK_VER%%/demos/floor.tcl -lib/tk%%TK_VER%%/demos/form.tcl -lib/tk%%TK_VER%%/demos/hello -lib/tk%%TK_VER%%/demos/hscale.tcl -lib/tk%%TK_VER%%/demos/icon.tcl -lib/tk%%TK_VER%%/demos/image1.tcl -lib/tk%%TK_VER%%/demos/image2.tcl -lib/tk%%TK_VER%%/demos/images/earth.gif -lib/tk%%TK_VER%%/demos/images/earthris.gif -lib/tk%%TK_VER%%/demos/images/face.bmp -lib/tk%%TK_VER%%/demos/images/flagdown.bmp -lib/tk%%TK_VER%%/demos/images/flagup.bmp -lib/tk%%TK_VER%%/demos/images/gray25.bmp -lib/tk%%TK_VER%%/demos/images/letters.bmp -lib/tk%%TK_VER%%/demos/images/noletter.bmp -lib/tk%%TK_VER%%/demos/images/pattern.bmp -lib/tk%%TK_VER%%/demos/images/tcllogo.gif -lib/tk%%TK_VER%%/demos/images/teapot.ppm -lib/tk%%TK_VER%%/demos/items.tcl -lib/tk%%TK_VER%%/demos/ixset -lib/tk%%TK_VER%%/demos/label.tcl -lib/tk%%TK_VER%%/demos/license.terms -lib/tk%%TK_VER%%/demos/menu.tcl -lib/tk%%TK_VER%%/demos/menubu.tcl -lib/tk%%TK_VER%%/demos/msgbox.tcl -lib/tk%%TK_VER%%/demos/plot.tcl -lib/tk%%TK_VER%%/demos/puzzle.tcl -lib/tk%%TK_VER%%/demos/radio.tcl -lib/tk%%TK_VER%%/demos/rmt -lib/tk%%TK_VER%%/demos/rolodex -lib/tk%%TK_VER%%/demos/ruler.tcl -lib/tk%%TK_VER%%/demos/sayings.tcl -lib/tk%%TK_VER%%/demos/search.tcl -lib/tk%%TK_VER%%/demos/square -lib/tk%%TK_VER%%/demos/states.tcl -lib/tk%%TK_VER%%/demos/style.tcl -lib/tk%%TK_VER%%/demos/tclIndex -lib/tk%%TK_VER%%/demos/tcolor -lib/tk%%TK_VER%%/demos/text.tcl -lib/tk%%TK_VER%%/demos/timer -lib/tk%%TK_VER%%/demos/twind.tcl -lib/tk%%TK_VER%%/demos/vscale.tcl -lib/tk%%TK_VER%%/demos/widget -lib/tk%%TK_VER%%/dialog.tcl -lib/tk%%TK_VER%%/entry.tcl -lib/tk%%TK_VER%%/focus.tcl -lib/tk%%TK_VER%%/images/README -lib/tk%%TK_VER%%/images/logo.eps -lib/tk%%TK_VER%%/images/logo100.gif -lib/tk%%TK_VER%%/images/logo64.gif -lib/tk%%TK_VER%%/images/logoLarge.gif -lib/tk%%TK_VER%%/images/logoMed.gif -lib/tk%%TK_VER%%/images/pwrdLogo.eps -lib/tk%%TK_VER%%/images/pwrdLogo100.gif -lib/tk%%TK_VER%%/images/pwrdLogo150.gif -lib/tk%%TK_VER%%/images/pwrdLogo175.gif -lib/tk%%TK_VER%%/images/pwrdLogo200.gif -lib/tk%%TK_VER%%/images/pwrdLogo75.gif -lib/tk%%TK_VER%%/images/tai-ku.gif -lib/tk%%TK_VER%%/listbox.tcl -lib/tk%%TK_VER%%/menu.tcl -lib/tk%%TK_VER%%/msgbox.tcl -lib/tk%%TK_VER%%/obsolete.tcl -lib/tk%%TK_VER%%/optMenu.tcl -lib/tk%%TK_VER%%/palette.tcl -lib/tk%%TK_VER%%/prolog.ps -lib/tk%%TK_VER%%/safetk.tcl -lib/tk%%TK_VER%%/scale.tcl -lib/tk%%TK_VER%%/scrlbar.tcl -lib/tk%%TK_VER%%/tclIndex -lib/tk%%TK_VER%%/tearoff.tcl -lib/tk%%TK_VER%%/text.tcl -lib/tk%%TK_VER%%/tk.tcl -lib/tk%%TK_VER%%/tkAppInit.c -lib/tk%%TK_VER%%/tkConfig.sh -lib/tk%%TK_VER%%/tkfbox.tcl -lib/tk%%TK_VER%%/xmfbox.tcl -@dirrm lib/tk%%TK_VER%%/demos/images -@dirrm lib/tk%%TK_VER%%/demos -@dirrm lib/tk%%TK_VER%%/images -@dirrm lib/tk%%TK_VER%% -@dirrm include/tk%%TK_VER%%/unix -@dirrm include/tk%%TK_VER%%/generic -@dirrm include/tk%%TK_VER%% -- cgit