diff options
-rw-r--r-- | lang/tcl84/Makefile | 182 | ||||
-rw-r--r-- | lang/tcl84/distinfo | 2 | ||||
-rw-r--r-- | lang/tcl84/files/patch-aa | 44 | ||||
-rw-r--r-- | lang/tcl84/files/patch-configure | 17 | ||||
-rw-r--r-- | lang/tcl84/files/patch-tcl.m4 | 22 | ||||
-rw-r--r-- | lang/tcl84/files/patch-tclUnixPipe.c | 15 | ||||
-rw-r--r-- | lang/tcl84/pkg-plist | 21 | ||||
-rw-r--r-- | x11-toolkits/tk84/Makefile | 73 | ||||
-rw-r--r-- | x11-toolkits/tk84/distinfo | 2 | ||||
-rw-r--r-- | x11-toolkits/tk84/files/patch-aa | 46 | ||||
-rw-r--r-- | x11-toolkits/tk84/files/patch-ab | 50 | ||||
-rw-r--r-- | x11-toolkits/tk84/pkg-plist | 2 |
12 files changed, 304 insertions, 172 deletions
diff --git a/lang/tcl84/Makefile b/lang/tcl84/Makefile index 6d97c53ba62e..1ee5b8c53f87 100644 --- a/lang/tcl84/Makefile +++ b/lang/tcl84/Makefile @@ -6,28 +6,27 @@ # PORTNAME= tcl -PORTVERSION= 8.3.4 -PORTREVISION= 3 -CATEGORIES= lang tcl83 +PORTVERSION= 8.4a3 +CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= tcl DISTNAME= ${PORTNAME}${PORTVERSION} MAINTAINER= dinoex@FreeBSD.org -LATEST_LINK= tcl83 +NO_LATEST_LINK= yes PATCH_DIST_ARGS= -d ${WRKDIR}/${DISTNAME} -E ${PATCH_DIST_STRIP} WRKSRC= ${WRKDIR}/${DISTNAME}/unix INSTALLS_SHLIB= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-shared CONFIGURE_ENV= PORTSDIR=${PORTSDIR} -MAKE_ENV= SHORT_TCL_VER=83 +MAKE_ENV= SHORT_TCL_VER=84 PKGINSTALL= ${PKGDIR}/pkg-install.tclsh PKGDEINSTALL= ${PKGDIR}/pkg-deinstall.tclsh -TCL_VER= 8.3 +TCL_VER= 8.4 -PLIST_SUB= TCL_VER=${TCL_VER} SHORT_TCL_VER=83 +PLIST_SUB= TCL_VER=${TCL_VER} SHORT_TCL_VER=84 MAN1= tclsh.1 @@ -37,15 +36,16 @@ MAN3= Access.3 AddErrInfo.3 Alloc.3 AllowExc.3 AppInit.3 AssocData.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 DumpActiveMemory.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 Init.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 SourceRCFile.3 SplitList.3 SplitPath.3 \ - StaticPkg.3 StrMatch.3 StringObj.3 TCL_MEM_DEBUG.3 Tcl_Main.3 \ - Thread.3 ToUpper.3 TraceVar.3 Translate.3 UpVar.3 Utf.3 WrongNumArgs.3 + Encoding.3 Eval.3 Environment.3 Exit.3 ExprLong.3 ExprLongObj.3 \ + FileSystem.3 FindExec.3 GetCwd.3 GetHostName.3 GetIndex.3 GetInt.3 \ + GetOpnFl.3 GetStdChan.3 GetVersion.3 Hash.3 Init.3 InitStubs.3 \ + IntObj.3 Interp.3 LinkVar.3 ListObj.3 Notifier.3 Macintosh.3 Object.3 \ + ObjectType.3 OpenFileChnl.3 OpenTcp.3 Panic.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 Signal.3 Sleep.3 \ + SourceRCFile.3 SplitList.3 SplitPath.3 StaticPkg.3 StrMatch.3 \ + StringObj.3 SubstObj.3 TCL_MEM_DEBUG.3 Tcl_Main.3 Thread.3 ToUpper.3 \ + TraceVar.3 Translate.3 UniCharIsAlpha.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 \ @@ -53,25 +53,29 @@ MANN= Tcl.n after.n append.n array.n bgerror.n binary.n break.n case.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 memory.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 + llength.n load.n lrange.n lreplace.n lsearch.n lsort.n memory.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_SetObjErrorCode.3 \ AddErrInfo.3 Tcl_SetErrorCode.3 \ AddErrInfo.3 Tcl_SetErrorCodeVA.3 \ AddErrInfo.3 Tcl_PosixError.3 \ + AddErrInfo.3 Tcl_LogCommandInfo.3 \ Alloc.3 Tcl_Alloc.3 \ Alloc.3 Tcl_Free.3 \ Alloc.3 Tcl_Realloc.3 \ + Alloc.3 Tcl_AttemptAlloc.3 \ + Alloc.3 Tcl_AttemptRealloc.3 \ AllowExc.3 Tcl_AllowExceptions.3 \ AppInit.3 Tcl_AppInit.3 \ AssocData.3 Tcl_GetAssocData.3 \ @@ -95,6 +99,7 @@ MLINKS= Access.3 Tcl_Access.3 \ CallDel.3 Tcl_DontCallWhenDeleted.3 \ ChnlStack.3 Tcl_StackChannel.3 \ ChnlStack.3 Tcl_UnstackChannel.3 \ + ChnlStack.3 Tcl_GetStackedChannel.3 \ CmdCmplt.3 Tcl_CommandComplete.3 \ Concat.3 Tcl_Concat.3 \ CrtChannel.3 Tcl_CreateChannel.3 \ @@ -107,6 +112,27 @@ MLINKS= Access.3 Tcl_Access.3 \ CrtChannel.3 Tcl_SetChannelBufferSize.3 \ CrtChannel.3 Tcl_NotifyChannel.3 \ CrtChannel.3 Tcl_BadChannelOption.3 \ + CrtChannel.3 Tcl_ChannelName.3 \ + CrtChannel.3 Tcl_ChannelVersion.3 \ + CrtChannel.3 Tcl_ChannelBlockModeProc.3 \ + CrtChannel.3 Tcl_ChannelCloseProc.3 \ + CrtChannel.3 Tcl_ChannelClose2Proc.3 \ + CrtChannel.3 Tcl_ChannelInputProc.3 \ + CrtChannel.3 Tcl_ChannelOutputProc.3 \ + CrtChannel.3 Tcl_ChannelSeekProc.3 \ + CrtChannel.3 Tcl_ChannelSetOptionProc.3 \ + CrtChannel.3 Tcl_ChannelGetOptionProc.3 \ + CrtChannel.3 Tcl_ChannelWatchProc.3 \ + CrtChannel.3 Tcl_ChannelGetHandleProc.3 \ + CrtChannel.3 Tcl_ChannelFlushProc.3 \ + CrtChannel.3 Tcl_ChannelHandlerProc.3 \ + CrtChannel.3 Tcl_IsChannelShared.3 \ + CrtChannel.3 Tcl_IsChannelRegistered.3 \ + CrtChannel.3 Tcl_CutChannel.3 \ + CrtChannel.3 Tcl_SpliceChannel.3 \ + CrtChannel.3 Tcl_IsChannelExisting.3 \ + CrtChannel.3 Tcl_ClearChannelHandlers.3 \ + CrtChannel.3 Tcl_GetChannelThread.3 \ CrtChnlHdlr.3 Tcl_CreateChannelHandler.3 \ CrtChnlHdlr.3 Tcl_DeleteChannelHandler.3 \ CrtCloseHdlr.3 Tcl_CreateCloseHandler.3 \ @@ -118,6 +144,8 @@ MLINKS= Access.3 Tcl_Access.3 \ CrtInterp.3 Tcl_DeleteInterp.3 \ CrtInterp.3 Tcl_InterpDeleted.3 \ CrtMathFnc.3 Tcl_CreateMathFunc.3 \ + CrtMathFnc.3 Tcl_GetMathFuncInfo.3 \ + CrtMathFnc.3 Tcl_ListMathFuncs.3 \ CrtObjCmd.3 Tcl_CreateObjCommand.3 \ CrtObjCmd.3 Tcl_DeleteCommand.3 \ CrtObjCmd.3 Tcl_DeleteCommandFromToken.3 \ @@ -153,6 +181,7 @@ MLINKS= Access.3 Tcl_Access.3 \ DString.3 Tcl_DStringGetResult.3 \ DetachPids.3 Tcl_DetachPids.3 \ DetachPids.3 Tcl_ReapDetachedProcs.3 \ + DetachPids.3 Tcl_WaitPid.3 \ DoOneEvent.3 Tcl_DoOneEvent.3 \ DoWhenIdle.3 Tcl_DoWhenIdle.3 \ DoWhenIdle.3 Tcl_CancelIdleCall.3 \ @@ -176,6 +205,7 @@ MLINKS= Access.3 Tcl_Access.3 \ Encoding.3 Tcl_CreateEncoding.3 \ Encoding.3 Tcl_GetDefaultEncodingDir.3 \ Encoding.3 Tcl_SetDefaultEncodingDir.3 \ + Environment.3 Tcl_PutEnv.3 \ Eval.3 Tcl_EvalObjEx.3 \ Eval.3 Tcl_EvalFile.3 \ Eval.3 Tcl_EvalObjv.3 \ @@ -187,9 +217,10 @@ MLINKS= Access.3 Tcl_Access.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_ExitThread.3 \ + Exit.3 Tcl_FinalizeThread.3 \ Exit.3 Tcl_CreateThreadExitHandler.3 \ Exit.3 Tcl_DeleteThreadExitHandler.3 \ ExprLong.3 Tcl_ExprLong.3 \ @@ -200,12 +231,49 @@ MLINKS= Access.3 Tcl_Access.3 \ ExprLongObj.3 Tcl_ExprDoubleObj.3 \ ExprLongObj.3 Tcl_ExprBooleanObj.3 \ ExprLongObj.3 Tcl_ExprObj.3 \ + FileSystem.3 Tcl_FSRegister.3 \ + FileSystem.3 Tcl_FSUnregister.3 \ + FileSystem.3 Tcl_FSData.3 \ + FileSystem.3 Tcl_FSCopyFile.3 \ + FileSystem.3 Tcl_FSCopyDirectory.3 \ + FileSystem.3 Tcl_FSCreateDirectory.3 \ + FileSystem.3 Tcl_FSDeleteFile.3 \ + FileSystem.3 Tcl_FSRemoveDirectory.3 \ + FileSystem.3 Tcl_FSRenameFile.3 \ + FileSystem.3 Tcl_FSListVolumes.3 \ + FileSystem.3 Tcl_FSEvalFile.3 \ + FileSystem.3 Tcl_FSLoadFile.3 \ + FileSystem.3 Tcl_FSMatchInDirectory.3 \ + FileSystem.3 Tcl_FSReadlink.3 \ + FileSystem.3 Tcl_FSLstat.3 \ + FileSystem.3 Tcl_FSUtime.3 \ + FileSystem.3 Tcl_FSFileAttrsGet.3 \ + FileSystem.3 Tcl_FSFileAttrsSet.3 \ + FileSystem.3 Tcl_FSFileAttrStrings.3 \ + FileSystem.3 Tcl_FSStat.3 \ + FileSystem.3 Tcl_FSAccess.3 \ + FileSystem.3 Tcl_FSOpenFileChannel.3 \ + FileSystem.3 Tcl_FSGetCwd.3 \ + FileSystem.3 Tcl_FSChdir.3 \ + FileSystem.3 Tcl_FSPathSeparator.3 \ + FileSystem.3 Tcl_FSJoinPath.3 \ + FileSystem.3 Tcl_FSSplitPath.3 \ + FileSystem.3 Tcl_FSEqualPaths.3 \ + FileSystem.3 Tcl_FSGetNormalizedPath.3 \ + FileSystem.3 Tcl_FSJoinToPath.3 \ + FileSystem.3 Tcl_FSConvertToPathType.3 \ + FileSystem.3 Tcl_FSGetInternalRep.3 \ + FileSystem.3 Tcl_FSGetTranslatedPath.3 \ + FileSystem.3 Tcl_FSNewNativePath.3 \ + FileSystem.3 Tcl_FSGetNativePath.3 \ + FileSystem.3 Tcl_FSFileSystemInfo.3 \ FindExec.3 Tcl_FindExecutable.3 \ FindExec.3 Tcl_GetNameOfExecutable.3 \ GetCwd.3 Tcl_GetCwd.3 \ GetCwd.3 Tcl_Chdir.3 \ GetHostName.3 Tcl_GetHostName.3 \ GetIndex.3 Tcl_GetIndexFromObj.3 \ + GetIndex.3 Tcl_GetIndexFromObjStruct.3 \ GetInt.3 Tcl_GetInt.3 \ GetInt.3 Tcl_GetDouble.3 \ GetInt.3 Tcl_GetBoolean.3 \ @@ -214,6 +282,8 @@ MLINKS= Access.3 Tcl_Access.3 \ GetStdChan.3 Tcl_SetStdChannel.3 \ GetVersion.3 Tcl_GetVersion.3 \ Hash.3 Tcl_InitHashTable.3 \ + Hash.3 Tcl_InitCustomHashTable.3 \ + Hash.3 Tcl_InitObjHashTable.3 \ Hash.3 Tcl_DeleteHashTable.3 \ Hash.3 Tcl_CreateHashEntry.3 \ Hash.3 Tcl_DeleteHashEntry.3 \ @@ -224,6 +294,7 @@ MLINKS= Access.3 Tcl_Access.3 \ Hash.3 Tcl_FirstHashEntry.3 \ Hash.3 Tcl_NextHashEntry.3 \ Hash.3 Tcl_HashStats.3 \ + Init.3 Tcl_Init.3 \ InitStubs.3 Tcl_InitStubs.3 \ IntObj.3 Tcl_NewIntObj.3 \ IntObj.3 Tcl_NewLongObj.3 \ @@ -243,6 +314,13 @@ MLINKS= Access.3 Tcl_Access.3 \ ListObj.3 Tcl_ListObjLength.3 \ ListObj.3 Tcl_ListObjIndex.3 \ ListObj.3 Tcl_ListObjReplace.3 \ + Macintosh.3 Tcl_MacSetEventProc.3 \ + Macintosh.3 Tcl_MacConvertTextResource.3 \ + Macintosh.3 Tcl_MacEvalResource.3 \ + Macintosh.3 Tcl_MacFindResource.3 \ + Macintosh.3 Tcl_GetOSTypeFromObj.3 \ + Macintosh.3 Tcl_SetOSTypeObj.3 \ + Macintosh.3 Tcl_NewOSTypeObj.3 \ Notifier.3 Tcl_CreateEventSource.3 \ Notifier.3 Tcl_DeleteEventSource.3 \ Notifier.3 Tcl_SetMaxBlockTime.3 \ @@ -265,6 +343,7 @@ MLINKS= Access.3 Tcl_Access.3 \ Object.3 Tcl_IncrRefCount.3 \ Object.3 Tcl_DecrRefCount.3 \ Object.3 Tcl_IsShared.3 \ + Object.3 Tcl_InvalidateStringRep.3 \ ObjectType.3 Tcl_RegisterObjType.3 \ ObjectType.3 Tcl_GetObjType.3 \ ObjectType.3 Tcl_AppendAllObjTypes.3 \ @@ -277,6 +356,8 @@ MLINKS= Access.3 Tcl_Access.3 \ OpenFileChnl.3 Tcl_GetChannelNamesEx.3 \ OpenFileChnl.3 Tcl_RegisterChannel.3 \ OpenFileChnl.3 Tcl_UnregisterChannel.3 \ + OpenFileChnl.3 Tcl_DetachChannel.3 \ + OpenFileChnl.3 Tcl_IsStandardChannel.3 \ OpenFileChnl.3 Tcl_Close.3 \ OpenFileChnl.3 Tcl_ReadChars.3 \ OpenFileChnl.3 Tcl_Read.3 \ @@ -293,14 +374,21 @@ MLINKS= Access.3 Tcl_Access.3 \ OpenFileChnl.3 Tcl_Eof.3 \ OpenFileChnl.3 Tcl_InputBlocked.3 \ OpenFileChnl.3 Tcl_InputBuffered.3 \ + OpenFileChnl.3 Tcl_Ungets.3 \ OpenTcp.3 Tcl_OpenTcpClient.3 \ OpenTcp.3 Tcl_MakeTcpClientChannel.3 \ OpenTcp.3 Tcl_OpenTcpServer.3 \ + Panic.3 Tcl_Panic.3 \ + Panic.3 Tcl_PanicVA.3 \ + Panic.3 Tcl_SetPanicProc.3 \ + Panic.3 panic.3 \ + Panic.3 panicVA.3 \ ParseCmd.3 Tcl_ParseCommand.3 \ ParseCmd.3 Tcl_ParseExpr.3 \ ParseCmd.3 Tcl_ParseBraces.3 \ ParseCmd.3 Tcl_ParseQuotedString.3 \ ParseCmd.3 Tcl_ParseVarName.3 \ + ParseCmd.3 Tcl_ParseVar.3 \ ParseCmd.3 Tcl_FreeParse.3 \ ParseCmd.3 Tcl_EvalTokens.3 \ PkgRequire.3 Tcl_PkgRequire.3 \ @@ -321,7 +409,8 @@ MLINKS= Access.3 Tcl_Access.3 \ RegExp.3 Tcl_RegExpRange.3 \ RegExp.3 Tcl_GetRegExpFromObj.3 \ RegExp.3 Tcl_RegExpMatchObj.3 \ - RegExp.3 Tcl_GetRegExpInfo.3 \ + RegExp.3 Tcl_RegExpExecObj.3 \ + RegExp.3 Tcl_RegExpGetInfo.3 \ SaveResult.3 Tcl_SaveResult.3 \ SaveResult.3 Tcl_RestoreResult.3 \ SaveResult.3 Tcl_DiscardResult.3 \ @@ -338,6 +427,7 @@ MLINKS= Access.3 Tcl_Access.3 \ SetResult.3 Tcl_AppendResultVA.3 \ SetResult.3 Tcl_AppendElement.3 \ SetResult.3 Tcl_ResetResult.3 \ + SetResult.3 Tcl_FreeResult.3 \ SetVar.3 Tcl_SetVar2Ex.3 \ SetVar.3 Tcl_SetVar.3 \ SetVar.3 Tcl_SetVar2.3 \ @@ -348,11 +438,16 @@ MLINKS= Access.3 Tcl_Access.3 \ SetVar.3 Tcl_ObjGetVar2.3 \ SetVar.3 Tcl_UnsetVar.3 \ SetVar.3 Tcl_UnsetVar2.3 \ + Signal.3 Tcl_SignalId.3 \ + Signal.3 Tcl_SignalMsg.3 \ Sleep.3 Tcl_Sleep.3 \ + SourceRCFile.3 Tcl_SourceRCFile.3 \ SplitList.3 Tcl_SplitList.3 \ SplitList.3 Tcl_Merge.3 \ SplitList.3 Tcl_ScanElement.3 \ SplitList.3 Tcl_ConvertElement.3 \ + SplitList.3 Tcl_ScanCountedElement.3 \ + SplitList.3 Tcl_ConvertCountedElement.3 \ SplitPath.3 Tcl_SplitPath.3 \ SplitPath.3 Tcl_JoinPath.3 \ SplitPath.3 Tcl_GetPathType.3 \ @@ -376,11 +471,18 @@ MLINKS= Access.3 Tcl_Access.3 \ StringObj.3 Tcl_AppendObjToObj.3 \ StringObj.3 Tcl_SetObjLength.3 \ StringObj.3 Tcl_ConcatObj.3 \ + StringObj.3 Tcl_AttemptSetObjLength.3 \ + SubstObj.3 Tcl_SubstObj.3 \ + Tcl_Main.3 Tcl_SetMainLoop.3 \ Thread.3 Tcl_ConditionNotify.3 \ Thread.3 Tcl_ConditionWait.3 \ + Thread.3 Tcl_ConditionFinalize.3 \ Thread.3 Tcl_GetThreadData.3 \ Thread.3 Tcl_MutexLock.3 \ Thread.3 Tcl_MutexUnlock.3 \ + Thread.3 Tcl_MutexFinalize.3 \ + Thread.3 Tcl_CreateThread.3 \ + Thread.3 Tcl_JoinThread.3 \ ToUpper.3 Tcl_UniCharToUpper.3 \ ToUpper.3 Tcl_UniCharToLower.3 \ ToUpper.3 Tcl_UniCharToTitle.3 \ @@ -394,9 +496,22 @@ MLINKS= Access.3 Tcl_Access.3 \ TraceVar.3 Tcl_VarTraceInfo.3 \ TraceVar.3 Tcl_VarTraceInfo2.3 \ Translate.3 Tcl_TranslateFileName.3 \ + UniCharIsAlpha.3 Tcl_UniCharIsAlnum.3 \ + UniCharIsAlpha.3 Tcl_UniCharIsAlpha.3 \ + UniCharIsAlpha.3 Tcl_UniCharIsControl.3 \ + UniCharIsAlpha.3 Tcl_UniCharIsDigit.3 \ + UniCharIsAlpha.3 Tcl_UniCharIsGraph.3 \ + UniCharIsAlpha.3 Tcl_UniCharIsLower.3 \ + UniCharIsAlpha.3 Tcl_UniCharIsPrint.3 \ + UniCharIsAlpha.3 Tcl_UniCharIsPunct.3 \ + UniCharIsAlpha.3 Tcl_UniCharIsSpace.3 \ + UniCharIsAlpha.3 Tcl_UniCharIsUpper.3 \ + UniCharIsAlpha.3 Tcl_UniCharIsWordChar.3 \ UpVar.3 Tcl_UpVar.3 \ UpVar.3 Tcl_UpVar2.3 \ Utf.3 Tcl_UniChar.3 \ + Utf.3 Tcl_UniCharCaseMatch.3 \ + Utf.3 Tcl_UniCharNcasecmp.3 \ Utf.3 Tcl_UniCharToUtf.3 \ Utf.3 Tcl_UtfToUniChar.3 \ Utf.3 Tcl_UniCharToUtfDString.3 \ @@ -414,10 +529,23 @@ MLINKS= Access.3 Tcl_Access.3 \ Utf.3 Tcl_UtfBackslash.3 \ WrongNumArgs.3 Tcl_WrongNumArgs.3 \ http.n Http.n \ + library.n auto_execok.n \ + library.n auto_import.n \ + library.n auto_load.n \ + library.n auto_mkindex.n \ + library.n auto_mkindex_old.n \ + library.n auto_qualify.n \ + library.n auto_reset.n \ + library.n tcl_findLibrary.n \ + library.n parray.n \ + library.n tcl_endOfWord.n \ + library.n tcl_startOfNextWord.n \ + library.n tcl_startOfPreviousWord.n \ + library.n tcl_wordBreakAfter.n \ + library.n tcl_wordBreakBefore.n \ packagens.n pkg::create.n \ pkgMkIndex.n pkg_mkIndex.n \ - safe.n Safe\Base.n \ - tcltest.n Tcltest.n + safe.n SafeBase.n .include <bsd.port.pre.mk> diff --git a/lang/tcl84/distinfo b/lang/tcl84/distinfo index f914cacee8b8..f8e0362295b8 100644 --- a/lang/tcl84/distinfo +++ b/lang/tcl84/distinfo @@ -1 +1 @@ -MD5 (tcl8.3.4.tar.gz) = 8777250e03d6be9be7551bfc6e99d252 +MD5 (tcl8.4a3.tar.gz) = ef95dad3f957a7216e09e5b7213a9d9b diff --git a/lang/tcl84/files/patch-aa b/lang/tcl84/files/patch-aa index 0ff89d9eade2..399f447379a9 100644 --- a/lang/tcl84/files/patch-aa +++ b/lang/tcl84/files/patch-aa @@ -1,5 +1,5 @@ ---- Makefile.in.orig Sat Oct 20 02:24:15 2001 -+++ Makefile.in Sat Oct 20 11:21:50 2001 +--- ../unix/Makefile.in.orig Tue Aug 7 05:06:23 2001 ++++ ../unix/Makefile.in Sat Nov 10 16:22:33 2001 @@ -53,7 +53,9 @@ SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TCL_LIBRARY) @@ -20,7 +20,7 @@ # Flags to pass to the linker LDFLAGS_DEBUG = @LDFLAGS_DEBUG@ -@@ -407,7 +409,8 @@ +@@ -404,7 +406,8 @@ all: binaries libraries doc @@ -30,14 +30,12 @@ libraries: -@@ -418,10 +421,16 @@ +@@ -415,8 +418,14 @@ ${TCL_LIB_FILE}: ${OBJS} ${STUB_LIB_FILE} rm -f ${TCL_LIB_FILE} @MAKE_LIB@ + @ln -sf $(TCL_LIB_FILE) ./libtcl${SHORT_TCL_VER}.so - if test "x@DL_OBJS@" = "xtclLoadAout.o"; then \ - $(RANLIB) ${TCL_LIB_FILE}; \ - fi + $(RANLIB) ${TCL_LIB_FILE} +libtcl${SHORT_TCL_VER}.a: ${OBJS} + rm -f libtcl${SHORT_TCL_VER}.a @@ -47,25 +45,23 @@ ${STUB_LIB_FILE}: ${STUB_LIB_OBJS} rm -f ${STUB_LIB_FILE} @MAKE_STUB_LIB@ -@@ -539,10 +548,16 @@ +@@ -542,6 +551,7 @@ fi @echo "Installing $(TCL_LIB_FILE) to $(LIB_INSTALL_DIR)/" - @$(INSTALL_LIBRARY) $(TCL_LIB_FILE) $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE) + @$(INSTALL_DATA) $(TCL_LIB_FILE) $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE) + @ln -sf $(TCL_LIB_FILE) $(LIB_INSTALL_DIR)/libtcl${SHORT_TCL_VER}.so - @if test "x@DL_OBJS@" = "xtclLoadAout.o"; then \ - (cd $(LIB_INSTALL_DIR); $(RANLIB) $(TCL_LIB_FILE)); \ - fi + @(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TCL_LIB_FILE)) @chmod 555 $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE) + @if test "$(TCL_BUILD_EXP_FILE)" != ""; then \ +@@ -549,10 +559,16 @@ + $(INSTALL_DATA) $(TCL_BUILD_EXP_FILE) \ + $(LIB_INSTALL_DIR)/$(TCL_EXP_FILE); \ + fi + @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) \ -@@ -550,8 +565,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)/" @@ -75,8 +71,8 @@ + @$(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_LIBRARY) $(STUB_LIB_FILE) \ -@@ -559,7 +575,8 @@ + $(INSTALL_DATA) $(STUB_LIB_FILE) \ +@@ -560,7 +576,8 @@ fi install-libraries: libraries @@ -86,7 +82,7 @@ do \ if [ ! -d $$i ] ; then \ echo "Making directory $$i"; \ -@@ -581,11 +598,16 @@ +@@ -582,12 +599,18 @@ chmod +x $(SRC_DIR)/install-sh; \ fi @echo "Installing header files"; @@ -104,9 +100,11 @@ + @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 \ -@@ -643,7 +665,6 @@ + $(INSTALL_DATA) $$i $(SCRIPT_INSTALL_DIR); \ +@@ -644,7 +667,6 @@ chmod 444 $(MAN1_INSTALL_DIR)/$$i; \ done; @echo "Cross-linking top-level (.1) docs"; @@ -114,7 +112,7 @@ @echo "Installing C API (.3) docs"; @cd $(TOP_DIR)/doc; for i in *.3; \ do \ -@@ -653,7 +674,6 @@ +@@ -654,7 +676,6 @@ chmod 444 $(MAN3_INSTALL_DIR)/$$i; \ done; @echo "Cross-linking C API (.3) docs"; @@ -122,7 +120,7 @@ @echo "Installing command (.n) docs"; @cd $(TOP_DIR)/doc; for i in *.n; \ do \ -@@ -663,7 +683,14 @@ +@@ -664,7 +685,14 @@ chmod 444 $(MANN_INSTALL_DIR)/$$i; \ done; @echo "Cross-linking command (.n) docs"; diff --git a/lang/tcl84/files/patch-configure b/lang/tcl84/files/patch-configure index 45a42b80823d..dc903e9b62e7 100644 --- a/lang/tcl84/files/patch-configure +++ b/lang/tcl84/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Sat Oct 20 02:24:15 2001 -+++ configure Sat Nov 10 20:17:05 2001 -@@ -4779,7 +4779,7 @@ +--- configure.orig Tue Aug 7 05:06:23 2001 ++++ configure Wed Nov 14 09:26:26 2001 +@@ -4769,7 +4769,7 @@ EXTRA_CFLAGS="" TCL_EXPORT_FILE_SUFFIX="" UNSHARED_LIB_SUFFIX="" @@ -9,7 +9,7 @@ ECHO_VERSION='`echo ${VERSION}`' TCL_LIB_VERSIONS_OK=ok CFLAGS_DEBUG=-g -@@ -5386,16 +5386,16 @@ +@@ -5300,13 +5300,16 @@ FreeBSD-*) # FreeBSD 3.* and greater have ELF. SHLIB_CFLAGS="-fPIC" @@ -22,10 +22,9 @@ - LDFLAGS="-export-dynamic" + LDFLAGS="" LD_SEARCH_FLAGS="" - # FreeBSD doesn't handle version numbers with dots. - UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' -- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so' ++ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' + SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}${DBGX}.so.1' - TCL_LIB_VERSIONS_OK=nodots ++ TCL_LIB_VERSIONS_OK=nodots ;; - Rhapsody-*|Darwin-*) + NEXTSTEP-*) + SHLIB_CFLAGS="" diff --git a/lang/tcl84/files/patch-tcl.m4 b/lang/tcl84/files/patch-tcl.m4 deleted file mode 100644 index 7341faab013e..000000000000 --- a/lang/tcl84/files/patch-tcl.m4 +++ /dev/null @@ -1,22 +0,0 @@ ---- tcl.m4.orig Sat Oct 20 02:24:15 2001 -+++ tcl.m4 Sat Nov 10 20:17:34 2001 -@@ -952,16 +952,16 @@ - FreeBSD-*) - # FreeBSD 3.* and greater have ELF. - SHLIB_CFLAGS="-fPIC" -- SHLIB_LD="ld -Bshareable -x" -+ SHLIB_LD="ld -shared -x -soname \$@" - SHLIB_LD_LIBS="" - SHLIB_SUFFIX=".so" - DL_OBJS="tclLoadDl.o" - DL_LIBS="" -- LDFLAGS="-export-dynamic" -+ LDFLAGS="" - LD_SEARCH_FLAGS="" - # FreeBSD doesn't handle version numbers with dots. - UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' -- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so' -+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1' - TCL_LIB_VERSIONS_OK=nodots - ;; - Rhapsody-*|Darwin-*) diff --git a/lang/tcl84/files/patch-tclUnixPipe.c b/lang/tcl84/files/patch-tclUnixPipe.c deleted file mode 100644 index 535259b7af2c..000000000000 --- a/lang/tcl84/files/patch-tclUnixPipe.c +++ /dev/null @@ -1,15 +0,0 @@ ---- tclUnixPipe.c.orig Wed Apr 4 00:54:39 2001 -+++ tclUnixPipe.c Thu May 10 22:00:30 2001 -@@ -195,10 +195,8 @@ - * We should also check against making more then TMP_MAX of these. - */ - -- if (tmpnam(fileName) == NULL) { /* INTL: Native. */ -- return NULL; -- } -- fd = open(fileName, O_RDWR|O_CREAT|O_EXCL, 0666); /* INTL: Native. */ -+ strlcpy(fileName, "/var/tmp/tcltmp.XXXXXX", L_tmpnam); -+ fd = mkstemp(fileName); /* INTL: Native. */ - if (fd == -1) { - return NULL; - } diff --git a/lang/tcl84/pkg-plist b/lang/tcl84/pkg-plist index 5b5811f50738..99e38b240b6c 100644 --- a/lang/tcl84/pkg-plist +++ b/lang/tcl84/pkg-plist @@ -56,7 +56,6 @@ 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/ebcdic.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 @@ -79,7 +78,6 @@ lib/tcl%%TCL_VER%%/encoding/iso8859-10.enc lib/tcl%%TCL_VER%%/encoding/iso8859-13.enc lib/tcl%%TCL_VER%%/encoding/iso8859-14.enc lib/tcl%%TCL_VER%%/encoding/iso8859-15.enc -lib/tcl%%TCL_VER%%/encoding/iso8859-16.enc lib/tcl%%TCL_VER%%/encoding/jis0201.enc lib/tcl%%TCL_VER%%/encoding/jis0208.enc lib/tcl%%TCL_VER%%/encoding/jis0212.enc @@ -100,17 +98,16 @@ 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%%/encoding/tis-620.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.4/http.tcl -lib/tcl%%TCL_VER%%/http2.4/pkgIndex.tcl +lib/tcl%%TCL_VER%%/http2.3/http.tcl +lib/tcl%%TCL_VER%%/http2.3/pkgIndex.tcl lib/tcl%%TCL_VER%%/init.tcl lib/tcl%%TCL_VER%%/ldAix lib/tcl%%TCL_VER%%/ldAout.tcl -lib/tcl%%TCL_VER%%/msgcat1.1/msgcat.tcl -lib/tcl%%TCL_VER%%/msgcat1.1/pkgIndex.tcl +lib/tcl%%TCL_VER%%/msgcat1.2/msgcat.tcl +lib/tcl%%TCL_VER%%/msgcat1.2/pkgIndex.tcl lib/tcl%%TCL_VER%%/opt0.4/optparse.tcl lib/tcl%%TCL_VER%%/opt0.4/pkgIndex.tcl lib/tcl%%TCL_VER%%/package.tcl @@ -119,13 +116,13 @@ 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%%/tcltest2.0/pkgIndex.tcl +lib/tcl%%TCL_VER%%/tcltest2.0/tcltest.tcl lib/tcl%%TCL_VER%%/word.tcl -@dirrm lib/tcl%%TCL_VER%%/tcltest1.0 +@dirrm lib/tcl%%TCL_VER%%/tcltest2.0 @dirrm lib/tcl%%TCL_VER%%/opt0.4 -@dirrm lib/tcl%%TCL_VER%%/msgcat1.1 -@dirrm lib/tcl%%TCL_VER%%/http2.4 +@dirrm lib/tcl%%TCL_VER%%/msgcat1.2 +@dirrm lib/tcl%%TCL_VER%%/http2.3 @dirrm lib/tcl%%TCL_VER%%/http1.0 @dirrm lib/tcl%%TCL_VER%%/encoding @dirrm lib/tcl%%TCL_VER%% diff --git a/x11-toolkits/tk84/Makefile b/x11-toolkits/tk84/Makefile index a4d6deaead74..654fed703655 100644 --- a/x11-toolkits/tk84/Makefile +++ b/x11-toolkits/tk84/Makefile @@ -6,55 +6,58 @@ # PORTNAME= tk -PORTVERSION= 8.3.4 -PORTREVISION= 1 -CATEGORIES= x11-toolkits tk83 +PORTVERSION= 8.4a3 +CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= tcl DISTNAME= ${PORTNAME}${PORTVERSION} MAINTAINER= dinoex@FreeBSD.org -LIB_DEPENDS= tcl83.1:${PORTSDIR}/lang/tcl83 +LIB_DEPENDS= tcl84.1:${PORTSDIR}/lang/tcl84 -LATEST_LINK= tk83 +NO_LATEST_LINK= yes USE_XLIB= yes INSTALLS_SHLIB= yes WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERSION}/unix GNU_CONFIGURE= yes -CONFIGURE_ARGS= --enable-shared --with-tcl=${PREFIX}/lib/tcl8.3 -CONFIGURE_ENV= PORTSDIR=${PORTSDIR} TK_LIB_FILE=libtk83.so.1 -MAKE_ENV= SHORT_TK_VER=83 +CONFIGURE_ARGS= --enable-shared --with-tcl=${PREFIX}/lib/tcl8.4 +CONFIGURE_ENV= PORTSDIR=${PORTSDIR} TK_LIB_FILE=libtk84.so.1 +MAKE_ENV= SHORT_TK_VER=84 PKGINSTALL= ${PKGDIR}/pkg-install.wish PKGDEINSTALL= ${PKGDIR}/pkg-deinstall.wish +TK_VER= 8.4 -PLIST_SUB= TK_VER=8.3 SHORT_TK_VER=83 +PLIST_SUB= TK_VER=${TK_VER} SHORT_TK_VER=84 MANCOMPRESSED= no MAN1= wish.1 MAN3= 3DBorder.3 AddOption.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 GetHINSTANCE.3 GetHWND.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 \ - Grab.3 HWNDToWindow.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 + CoordToWin.3 CrtCmHdlr.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 GetHINSTANCE.3 GetHWND.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 Grab.3 HWNDToWindow.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 SetClassProcs.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 colors.n cursors.n destroy.n dialog.n entry.n\ - event.n focus.n focusNext.n font.n frame.n getOpenFile.n grab.n grid.n keysyms.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 \ + chooseColor.n chooseDirectory.n clipboard.n colors.n console.n \ + cursors.n destroy.n dialog.n entry.n event.n focus.n focusNext.n \ + font.n frame.n getOpenFile.n grab.n grid.n keysyms.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 spinbox.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 @@ -118,6 +121,8 @@ MLINKS= 3DBorder.3 Tk_Alloc3DBorderFromObj.3 \ ConfigWind.3 Tk_DefineCursor.3 \ ConfigWind.3 Tk_UndefineCursor.3 \ CoordToWin.3 Tk_CoordsToWindow.3 \ + CrtCmHdlr.3 Tk_CreateClientMessageHandler.3 \ + CrtCmHdlr.3 Tk_DeleteClientMessageHandler.3 \ CrtErrHdlr.3 Tk_CreateErrorHandler.3 \ CrtErrHdlr.3 Tk_DeleteErrorHandler.3 \ CrtGenHdlr.3 Tk_CreateGenericHandler.3 \ @@ -147,7 +152,7 @@ MLINKS= 3DBorder.3 Tk_Alloc3DBorderFromObj.3 \ FindPhoto.3 Tk_PhotoGetSize.3 \ FindPhoto.3 Tk_PhotoSetSize.3 \ FontId.3 Tk_FontId.3 \ - FontId.3 Tk_FontMetrics.3 \ + FontId.3 Tk_GetFontMetrics.3 \ FontId.3 Tk_PostscriptFontName.3 \ FreeXId.3 Tk_FreeXId.3 \ GeomReq.3 Tk_GeometryRequest.3 \ @@ -253,6 +258,7 @@ MLINKS= 3DBorder.3 Tk_Alloc3DBorderFromObj.3 \ SetAppName.3 Tk_SetAppName.3 \ SetClass.3 Tk_SetClass.3 \ SetClass.3 Tk_Class.3 \ + SetClassProcs.3 Tk_SetClassProcs.3 \ SetGrid.3 Tk_SetGrid.3 \ SetGrid.3 Tk_UnsetGrid.3 \ SetOptions.3 Tk_CreateOptionTable.3 \ @@ -264,6 +270,7 @@ MLINKS= 3DBorder.3 Tk_Alloc3DBorderFromObj.3 \ SetOptions.3 Tk_GetOptionValue.3 \ SetOptions.3 Tk_GetOptionInfo.3 \ SetOptions.3 Tk_FreeConfigOptions.3 \ + SetOptions.3 Tk_Offset.3 \ SetVisual.3 Tk_SetWindowVisual.3 \ StrictMotif.3 Tk_StrictMotif.3 \ TextLayout.3 Tk_ComputeTextLayout.3 \ @@ -276,6 +283,7 @@ MLINKS= 3DBorder.3 Tk_Alloc3DBorderFromObj.3 \ TextLayout.3 Tk_IntersectTextLayout.3 \ TextLayout.3 Tk_TextLayoutToPostscript.3 \ TkInitStubs.3 Tk_InitStubs.3 \ + Tk_Init.3 Tk_SafeInit.3 \ WindowId.3 Tk_WindowId.3 \ WindowId.3 Tk_Parent.3 \ WindowId.3 Tk_Display.3 \ @@ -306,17 +314,22 @@ MLINKS= 3DBorder.3 Tk_Alloc3DBorderFromObj.3 \ focusNext.n tk_focusFollowsMouse.n \ getOpenFile.n tk_getOpenFile.n \ getOpenFile.n tk_getSaveFile.n \ + menu.n tk_menuSetFocus.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 + popup.n tk_popup.n \ + text.n tk_textCopy.n \ + text.n tk_textCut.n \ + text.n tk_textPaste.n .include <bsd.port.pre.mk> post-install: + @${RMDIR} ${PREFIX}/lib/tk${TK_VER}/msgs .if exists(${PKGINSTALL}) ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} .endif diff --git a/x11-toolkits/tk84/distinfo b/x11-toolkits/tk84/distinfo index d54f9190c057..a9ca3eb6d84b 100644 --- a/x11-toolkits/tk84/distinfo +++ b/x11-toolkits/tk84/distinfo @@ -1 +1 @@ -MD5 (tk8.3.4.tar.gz) = 02311d8f90734c4f5eaa62e9b36fe535 +MD5 (tk8.4a3.tar.gz) = 6a87be59ec339619b037225f9371acbe diff --git a/x11-toolkits/tk84/files/patch-aa b/x11-toolkits/tk84/files/patch-aa index ee05cb4304c3..eae1bd508dae 100644 --- a/x11-toolkits/tk84/files/patch-aa +++ b/x11-toolkits/tk84/files/patch-aa @@ -1,10 +1,19 @@ ---- configure.orig Sat Oct 20 02:24:40 2001 -+++ configure Sat Nov 10 21:53:28 2001 -@@ -2351,21 +2351,22 @@ +--- configure.orig Tue Aug 7 05:12:23 2001 ++++ configure Tue Nov 13 08:20:01 2001 +@@ -1513,7 +1513,7 @@ + EXTRA_CFLAGS="" + TCL_EXPORT_FILE_SUFFIX="" + UNSHARED_LIB_SUFFIX="" +- TCL_TRIM_DOTS='`echo ${VERSION} | tr -d .`' ++ TCL_TRIM_DOTS=`echo ${VERSION} | tr -d .` + ECHO_VERSION='`echo ${VERSION}`' + TCL_LIB_VERSIONS_OK=ok + CFLAGS_DEBUG=-g +@@ -2039,18 +2039,23 @@ # FreeBSD doesn't handle version numbers with dots. UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' -+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1' ++ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0' TCL_LIB_VERSIONS_OK=nodots ;; FreeBSD-*) @@ -20,14 +29,14 @@ - LDFLAGS="-export-dynamic" + LDFLAGS="" LD_SEARCH_FLAGS="" - # FreeBSD doesn't handle version numbers with dots. - UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' -- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so' ++ # FreeBSD doesn't handle version numbers with dots. ++ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' + SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1' - TCL_LIB_VERSIONS_OK=nodots ++ TCL_LIB_VERSIONS_OK=nodots ;; - Rhapsody-*|Darwin-*) -@@ -2882,6 +2883,7 @@ + NEXTSTEP-*) + SHLIB_CFLAGS="" +@@ -2538,6 +2543,7 @@ echo "$ac_t""no" 1>&6 fi @@ -35,3 +44,20 @@ LIB_RUNTIME_DIR='${LIB_RUNTIME_DIR}' +@@ -4270,6 +4276,7 @@ + else + eval TK_LIB_FLAG="-ltk`echo ${VERSION} | tr -d .`\${TK_DBGX}" + fi ++ TK_LIB_FLAG="-ltk${TCL_TRIM_DOTS}\${TK_DBGX}" + TK_BUILD_LIB_SPEC="-L`pwd` ${TK_LIB_FLAG}" + TK_LIB_SPEC="-L${exec_prefix}/lib ${TK_LIB_FLAG}" + TK_BUILD_EXP_FILE="" +@@ -4301,7 +4308,7 @@ + if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then + eval TK_STUB_LIB_FLAG="-ltkstub${TK_VERSION}\${TK_DBGX}" + else +- eval TK_STUB_LIB_FLAG="-ltkstub`echo ${TK_VERSION} | tr -d .`\${TK_DBGX}" ++ eval TK_STUB_LIB_FLAG="-ltkstub${TCL_TRIM_DOTS}\${TK_DBGX}" + fi + + TK_BUILD_STUB_LIB_SPEC="-L`pwd` ${TK_STUB_LIB_FLAG}" diff --git a/x11-toolkits/tk84/files/patch-ab b/x11-toolkits/tk84/files/patch-ab index c4405ddb29cc..a17f49ae71a6 100644 --- a/x11-toolkits/tk84/files/patch-ab +++ b/x11-toolkits/tk84/files/patch-ab @@ -1,6 +1,6 @@ ---- Makefile.in.orig Fri Apr 6 04:03:05 2001 -+++ Makefile.in Fri Apr 13 21:59:30 2001 -@@ -57,7 +57,9 @@ +--- Makefile.in.orig Tue Aug 7 05:12:23 2001 ++++ Makefile.in Tue Nov 13 07:39:32 2001 +@@ -58,7 +58,9 @@ SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TK_LIBRARY) # Directory in which to install the include file tk.h: @@ -11,10 +11,16 @@ # Top-level directory for manual entries: MAN_INSTALL_DIR = $(INSTALL_ROOT)$(mandir) -@@ -103,1 +103,1 @@ --CFLAGS = @CFLAGS@ +@@ -101,7 +103,7 @@ + #CFLAGS = $(CFLAGS_DEBUG) + #CFLAGS = $(CFLAGS_OPTIMIZE) + #CFLAGS = $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE) +-CFLAGS = @CFLAGS@ @CFLAGS_DEFAULT@ +CFLAGS ?= @CFLAGS@ -@@ -197,7 +199,7 @@ + + # Flags to pass to the linker + LDFLAGS_DEBUG = @LDFLAGS_DEBUG@ +@@ -203,7 +205,7 @@ # Libraries to use when linking. This definition is determined by the # configure script. LIBS = @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc @@ -23,7 +29,7 @@ # The symbol below provides support for dynamic loading and shared # libraries. See configure.in for a description of what it means. -@@ -346,6 +348,8 @@ +@@ -354,6 +356,8 @@ default.h ks_names.h tkPatch.h tk.h tkButton.h tkCanvas.h tkInt.h \ tkPort.h tkScrollbar.h tkText.h @@ -32,7 +38,7 @@ DEMOPROGS = browse hello ixset rmt rolodex square tcolor timer widget all: binaries libraries doc -@@ -365,8 +369,14 @@ +@@ -373,8 +377,14 @@ ${TK_LIB_FILE}: ${OBJS} rm -f ${TK_LIB_FILE} @MAKE_LIB@ @@ -47,7 +53,7 @@ ${STUB_LIB_FILE}: ${STUB_LIB_OBJS} rm -f ${STUB_LIB_FILE} @MAKE_STUB_LIB@ -@@ -438,7 +448,7 @@ +@@ -474,7 +484,7 @@ # some ranlibs write to current directory, and this might not always be # possible (e.g. if installing as root). @@ -56,7 +62,7 @@ @for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \ do \ if [ ! -d $$i ] ; then \ -@@ -456,12 +466,18 @@ +@@ -492,12 +502,18 @@ fi @echo "Installing $(TK_LIB_FILE) to $(LIB_INSTALL_DIR)/" @$(INSTALL_DATA) $(TK_LIB_FILE) $(LIB_INSTALL_DIR)/$(TK_LIB_FILE) @@ -76,22 +82,23 @@ @if test "$(TK_BUILD_EXP_FILE)" != ""; then \ echo "Installing $(TK_EXP_FILE) to $(LIB_INSTALL_DIR)/"; \ $(INSTALL_DATA) $(TK_BUILD_EXP_FILE) \ -@@ -475,6 +491,7 @@ +@@ -511,6 +527,7 @@ install-libraries: @for i in $(INCLUDE_INSTALL_DIR) \ + $(GENERIC_INCLUDE_INSTALL_DIR) $(UNIX_INCLUDE_INSTALL_DIR) \ - $(SCRIPT_INSTALL_DIR) $(SCRIPT_INSTALL_DIR)/images; \ + $(SCRIPT_INSTALL_DIR) $(SCRIPT_INSTALL_DIR)/images \ + $(SCRIPT_INSTALL_DIR)/msgs; \ do \ - if [ ! -d $$i ] ; then \ -@@ -488,10 +505,18 @@ +@@ -525,10 +542,18 @@ chmod +x $(UNIX_DIR)/install-sh; \ fi @echo "Installing header files"; -- @for i in $(GENERIC_DIR)/tk.h $(GENERIC_DIR)/tkPlatDecls.h \ -- $(GENERIC_DIR)/tkDecls.h $(GENERIC_DIR)/tkIntXlibDecls.h ; \ +- @for i in $(GENERIC_DIR)/tk.h $(GENERIC_DIR)/tkDecls.h \ +- $(GENERIC_DIR)/tkPlatDecls.h ; \ + @for i in $(GENERIC_DIR)/*.h ; \ -+ do \ + do \ +- $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR); \ + $(INSTALL_DATA) $$i $(GENERIC_INCLUDE_INSTALL_DIR); \ + done; + @for i in $(UNIX_DIR)/*.h ; \ @@ -99,14 +106,13 @@ + $(INSTALL_DATA) $$i $(UNIX_INCLUDE_INSTALL_DIR); \ + done; + @for i in $(INSTALL_HDRS) ; \ - do \ -- $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR); \ ++ do \ + j=`basename $$i` ; \ + ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/$$j $(INCLUDE_INSTALL_DIR)/$$j ; \ done; @echo "Installing library files to $(SCRIPT_INSTALL_DIR)"; @for i in $(SRC_DIR)/library/*.tcl $(GENERIC_DIR)/prolog.ps \ -@@ -558,7 +583,6 @@ +@@ -602,7 +627,6 @@ chmod 444 $(MAN1_INSTALL_DIR)/$$i; \ done; @echo "Cross-linking top-level (.1) docs"; @@ -114,7 +120,7 @@ @echo "Installing C API (.3) docs"; @cd $(SRC_DIR)/doc; for i in *.3; \ do \ -@@ -568,7 +592,6 @@ +@@ -612,7 +636,6 @@ chmod 444 $(MAN3_INSTALL_DIR)/$$i; \ done; @echo "Cross-linking top-level (.3) docs"; @@ -122,7 +128,7 @@ @echo "Installing command (.n) docs"; @cd $(SRC_DIR)/doc; for i in *.n; \ do \ -@@ -578,7 +601,6 @@ +@@ -622,7 +645,6 @@ chmod 444 $(MANN_INSTALL_DIR)/$$i; \ done; @echo "Cross-linking command (.n) docs"; diff --git a/x11-toolkits/tk84/pkg-plist b/x11-toolkits/tk84/pkg-plist index 26b2783a4011..15dce59e771b 100644 --- a/x11-toolkits/tk84/pkg-plist +++ b/x11-toolkits/tk84/pkg-plist @@ -124,6 +124,7 @@ 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%%/spinbox.tcl lib/tk%%TK_VER%%/tclIndex lib/tk%%TK_VER%%/tearoff.tcl lib/tk%%TK_VER%%/text.tcl @@ -131,6 +132,7 @@ 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%%/unsupported.tcl lib/tk%%TK_VER%%/xmfbox.tcl @dirrm lib/tk%%TK_VER%%/demos/images @dirrm lib/tk%%TK_VER%%/demos |