Index: head/lang/tcl85/Makefile =================================================================== --- head/lang/tcl85/Makefile (revision 308125) +++ head/lang/tcl85/Makefile (revision 308126) @@ -1,779 +1,778 @@ # Created by: Martin Matuska # $FreeBSD$ PORTNAME?= tcl -PORTVERSION= 8.5.12 -PORTREVISION= 2 +PORTVERSION= 8.5.13 CATEGORIES= lang MASTER_SITES= SF/tcl/Tcl/${PORTVERSION} PKGNAMESUFFIX?= ${THREADS_SUFFIX}${PKGNAMESUFFIX2} DISTNAME= tcl${PORTVERSION}-src MAINTAINER= tcltk@FreeBSD.org COMMENT?= Tool Command Language LICENSE= BSD LATEST_LINK?= tcl85 PATCH_DIST_ARGS= -d ${WRKDIR}/${DISTNAME} -E ${PATCH_DIST_STRIP} WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//}/unix ALL_TARGET= all USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-shared --without-tzdata --includedir=${PREFIX}/include/tcl${TCL_VER} CONFIGURE_ENV= PORTSDIR=${PORTSDIR} TCL_VER= 8.5 SHORT_TCL_VER= ${TCL_VER:S/8./8/} MAKE_ENV= SHORT_TCL_VER=${SHORT_TCL_VER} LANG=C LC_ALL=C # LANG=C is required for some of UTF-using tests NOPRECIOUSMAKEVARS= Too many _MLINKS for README.html PLIST_SUB= TCL_VER=${TCL_VER} SHORT_TCL_VER=${SHORT_TCL_VER} EXTRACT_AFTER_ARGS=|${TAR} -xpf - --exclude compat/ .if !defined(BUILDING_TCL_THREADS) && !defined(BUILDING_TCL_TM) OPTIONS_DEFINE= TCL85_MAN TZDATA TCL_MODULES -OPTIONS_DEFAULT= TCL_MODULES +OPTIONS_DEFAULT=TCL_MODULES TCL85_MAN_DESC=Install tcl 8.5 function manpages TZDATA_DESC=Install tcl timezone data TCL_MODULES_DESC=Install tcl common modules .elif defined(BUILDING_TCL_THREADS) USE_TCL= ${SHORT_TCL_VER} PLIST= ${PKGDIR}/pkg-plist.threads THREADS_SUFFIX= -threads LATEST_LINK= tcl85${THREADS_SUFFIX} .elif defined(BUILDING_TCL_TM) LATEST_LINK= tcl-modules NO_BUILD= yes INSTALL_TARGET= install-tm PLIST= ${PKGDIR}/pkg-plist.tm .endif .include .if !defined(BUILDING_TCL_TM) .if ${PORT_OPTIONS:MTCL_MODULES} RUN_DEPENDS+= ${LOCALBASE}/lib/tcl8/8.5/tcltest-2.3.4.tm:${PORTSDIR}/lang/tcl-modules .endif DATADIR= ${PREFIX}/share/${PORTNAME}${TCL_VER} .if ${PORT_OPTIONS:MTZDATA} PLIST_SUB+= TZDATA="" .else PLIST_SUB+= TZDATA="@comment " .endif MAN1= tclsh${TCL_VER}${THREADS_SUFFIX}.1 .if defined(BUILDING_TCL_THREADS) . if (${ARCH} == "ia64") BROKEN= does not compile on ia64 . endif . if exists(${TCLSH}) TCL_PATCHLEVEL!= ${ECHO_CMD} "puts \$$tcl_patchLevel" | ${TCLSH} . if ${TCL_PATCHLEVEL} != ${PORTVERSION:S/.b./b/} IGNORE= version mismatch - installing ${PORTVERSION:S/.b./b/} over installed ${TCL_PATCHLEVEL} . endif .endif CONFIGURE_ARGS+= --enable-threads CONFIGURE_ENV+= PTHREAD_LIBS="${PTHREAD_LIBS}" PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" .else CONFIGURE_ARGS+= --disable-threads .if !defined(NO_INSTALL_MANPAGES) && defined(WITH_TCL85_MAN) MAN3= Access.3 AddErrInfo.3 Alloc.3 AllowExc.3 AppInit.3 AssocData.3 \ Async.3 BackgdErr.3 Backslash.3 BoolObj.3 ByteArrObj.3 CallDel.3 \ ChnlStack.3 CmdCmplt.3 Concat.3 CrtChannel.3 CrtChnlHdlr.3 \ CrtCloseHdlr.3 CrtCommand.3 CrtFileHdlr.3 CrtInterp.3 CrtMathFnc.3 \ CrtObjCmd.3 CrtSlave.3 CrtTimerHdlr.3 CrtTrace.3 DString.3 \ DetachPids.3 DictObj.3 DoOneEvent.3 DoWhenIdle.3 DoubleObj.3 \ DumpActiveMemory.3 Encoding.3 Ensemble.3 Eval.3 Environment.3 Exit.3 \ ExprLong.3 ExprLongObj.3 FileSystem.3 FindExec.3 GetCwd.3 \ GetHostName.3 GetIndex.3 GetInt.3 GetTime.3 GetOpnFl.3 GetStdChan.3 \ GetVersion.3 Hash.3 Init.3 InitStubs.3 IntObj.3 Interp.3 Limit.3 \ LinkVar.3 ListObj.3 Namespace.3 Notifier.3 Object.3 ObjectType.3 \ OpenFileChnl.3 OpenTcp.3 Panic.3 ParseCmd.3 PkgRequire.3 Preserve.3 \ PrintDbl.3 RecEvalObj.3 RecordEval.3 RegConfig.3 RegExp.3 SaveResult.3 \ SetChanErr.3 SetErrno.3 SetRecLmt.3 SetResult.3 SetVar.3 Signal.3 \ Sleep.3 SourceRCFile.3 SplitList.3 SplitPath.3 StdChannels.3 \ StaticPkg.3 StrMatch.3 StringObj.3 SubstObj.3 TCL_MEM_DEBUG.3 \ Tcl_Main.3 Thread.3 ToUpper.3 TraceCmd.3 TraceVar.3 Translate.3 \ UniCharIsAlpha.3 UpVar.3 Utf.3 WrongNumArgs.3 MANN= Tcl.n after.n append.n apply.n array.n bgerror.n binary.n break.n \ case.n catch.n cd.n chan.n clock.n close.n concat.n continue.n dde.n \ dict.n encoding.n eof.n error.n eval.n exec.n exit.n expr.n fblocked.n \ fconfigure.n fcopy.n file.n fileevent.n filename.n flush.n for.n \ foreach.n format.n gets.n glob.n global.n history.n http.n if.n incr.n \ info.n interp.n join.n lappend.n lassign.n library.n lindex.n \ linsert.n list.n llength.n load.n lrange.n lrepeat.n lreplace.n \ lreverse.n lsearch.n lset.n lsort.n mathfunc.n mathop.n memory.n \ msgcat.n namespace.n open.n package.n packagens.n pid.n pkgMkIndex.n \ platform.n platform_shell.n proc.n puts.n pwd.n re_syntax.n read.n \ refchan.n regexp.n registry.n regsub.n rename.n \ return.n safe.n scan.n seek.n set.n socket.n source.n split.n string.n \ subst.n switch.n tcltest.n tclvars.n tell.n time.n tm.n trace.n \ unknown.n unload.n unset.n update.n uplevel.n upvar.n variable.n vwait.n \ while.n # MLINKS generated via awk '/ln/ {print "\t" $3,$4,"\\"}' unix/mkLinks MLINKS= Access.3 Tcl_Access.3 \ Access.3 Tcl_Stat.3 \ AddErrInfo.3 Tcl_GetReturnOptions.3 \ AddErrInfo.3 Tcl_SetReturnOptions.3 \ AddErrInfo.3 Tcl_AddErrorInfo.3 \ AddErrInfo.3 Tcl_AddObjErrorInfo.3 \ AddErrInfo.3 Tcl_SetObjErrorCode.3 \ AddErrInfo.3 Tcl_SetErrorCode.3 \ AddErrInfo.3 Tcl_SetErrorCodeVA.3 \ AddErrInfo.3 Tcl_PosixError.3 \ AddErrInfo.3 Tcl_LogCommandInfo.3 \ Alloc.3 Tcl_Alloc.3 \ Alloc.3 Tcl_Free.3 \ Alloc.3 Tcl_Realloc.3 \ Alloc.3 Tcl_AttemptAlloc.3 \ Alloc.3 Tcl_AttemptRealloc.3 \ Alloc.3 ckalloc.3 \ Alloc.3 ckfree.3 \ Alloc.3 ckrealloc.3 \ Alloc.3 attemptckalloc.3 \ Alloc.3 attemptckrealloc.3 \ AllowExc.3 Tcl_AllowExceptions.3 \ AppInit.3 Tcl_AppInit.3 \ AssocData.3 Tcl_GetAssocData.3 \ AssocData.3 Tcl_SetAssocData.3 \ AssocData.3 Tcl_DeleteAssocData.3 \ Async.3 Tcl_AsyncCreate.3 \ Async.3 Tcl_AsyncMark.3 \ Async.3 Tcl_AsyncInvoke.3 \ Async.3 Tcl_AsyncDelete.3 \ Async.3 Tcl_AsyncReady.3 \ BackgdErr.3 Tcl_BackgroundError.3 \ Backslash.3 Tcl_Backslash.3 \ BoolObj.3 Tcl_NewBooleanObj.3 \ BoolObj.3 Tcl_SetBooleanObj.3 \ BoolObj.3 Tcl_GetBooleanFromObj.3 \ ByteArrObj.3 Tcl_NewByteArrayObj.3 \ ByteArrObj.3 Tcl_SetByteArrayObj.3 \ ByteArrObj.3 Tcl_GetByteArrayFromObj.3 \ ByteArrObj.3 Tcl_SetByteArrayLength.3 \ CallDel.3 Tcl_CallWhenDeleted.3 \ CallDel.3 Tcl_DontCallWhenDeleted.3 \ ChnlStack.3 Tcl_StackChannel.3 \ ChnlStack.3 Tcl_UnstackChannel.3 \ ChnlStack.3 Tcl_GetStackedChannel.3 \ ChnlStack.3 Tcl_GetTopChannel.3 \ CmdCmplt.3 Tcl_CommandComplete.3 \ Concat.3 Tcl_Concat.3 \ CrtChannel.3 Tcl_CreateChannel.3 \ CrtChannel.3 Tcl_GetChannelInstanceData.3 \ CrtChannel.3 Tcl_GetChannelType.3 \ CrtChannel.3 Tcl_GetChannelName.3 \ CrtChannel.3 Tcl_GetChannelHandle.3 \ CrtChannel.3 Tcl_GetChannelThread.3 \ CrtChannel.3 Tcl_GetChannelMode.3 \ CrtChannel.3 Tcl_GetChannelBufferSize.3 \ CrtChannel.3 Tcl_SetChannelBufferSize.3 \ CrtChannel.3 Tcl_NotifyChannel.3 \ CrtChannel.3 Tcl_BadChannelOption.3 \ CrtChannel.3 Tcl_IsChannelShared.3 \ CrtChannel.3 Tcl_IsChannelRegistered.3 \ CrtChannel.3 Tcl_IsChannelExisting.3 \ CrtChannel.3 Tcl_CutChannel.3 \ CrtChannel.3 Tcl_SpliceChannel.3 \ CrtChannel.3 Tcl_ClearChannelHandlers.3 \ CrtChannel.3 Tcl_ChannelBuffered.3 \ CrtChannel.3 Tcl_ChannelName.3 \ CrtChannel.3 Tcl_ChannelVersion.3 \ CrtChannel.3 Tcl_ChannelBlockModeProc.3 \ CrtChannel.3 Tcl_ChannelCloseProc.3 \ CrtChannel.3 Tcl_ChannelClose2Proc.3 \ CrtChannel.3 Tcl_ChannelInputProc.3 \ CrtChannel.3 Tcl_ChannelOutputProc.3 \ CrtChannel.3 Tcl_ChannelSeekProc.3 \ CrtChannel.3 Tcl_ChannelWideSeekProc.3 \ CrtChannel.3 Tcl_ChannelThreadActionProc.3 \ CrtChannel.3 Tcl_ChannelTruncateProc.3 \ CrtChannel.3 Tcl_ChannelSetOptionProc.3 \ CrtChannel.3 Tcl_ChannelGetOptionProc.3 \ CrtChannel.3 Tcl_ChannelWatchProc.3 \ CrtChannel.3 Tcl_ChannelGetHandleProc.3 \ CrtChannel.3 Tcl_ChannelFlushProc.3 \ CrtChannel.3 Tcl_ChannelHandlerProc.3 \ CrtChnlHdlr.3 Tcl_CreateChannelHandler.3 \ CrtChnlHdlr.3 Tcl_DeleteChannelHandler.3 \ CrtCloseHdlr.3 Tcl_CreateCloseHandler.3 \ CrtCloseHdlr.3 Tcl_DeleteCloseHandler.3 \ CrtCommand.3 Tcl_CreateCommand.3 \ CrtFileHdlr.3 Tcl_CreateFileHandler.3 \ CrtFileHdlr.3 Tcl_DeleteFileHandler.3 \ CrtInterp.3 Tcl_CreateInterp.3 \ CrtInterp.3 Tcl_DeleteInterp.3 \ CrtInterp.3 Tcl_InterpDeleted.3 \ CrtMathFnc.3 Tcl_CreateMathFunc.3 \ CrtMathFnc.3 Tcl_GetMathFuncInfo.3 \ CrtMathFnc.3 Tcl_ListMathFuncs.3 \ CrtObjCmd.3 Tcl_CreateObjCommand.3 \ CrtObjCmd.3 Tcl_DeleteCommand.3 \ CrtObjCmd.3 Tcl_DeleteCommandFromToken.3 \ CrtObjCmd.3 Tcl_GetCommandInfo.3 \ CrtObjCmd.3 Tcl_SetCommandInfo.3 \ CrtObjCmd.3 Tcl_GetCommandInfoFromToken.3 \ CrtObjCmd.3 Tcl_SetCommandInfoFromToken.3 \ CrtObjCmd.3 Tcl_GetCommandName.3 \ CrtObjCmd.3 Tcl_GetCommandFullName.3 \ CrtObjCmd.3 Tcl_GetCommandFromObj.3 \ CrtSlave.3 Tcl_IsSafe.3 \ CrtSlave.3 Tcl_MakeSafe.3 \ CrtSlave.3 Tcl_CreateSlave.3 \ CrtSlave.3 Tcl_GetSlave.3 \ CrtSlave.3 Tcl_GetMaster.3 \ CrtSlave.3 Tcl_GetInterpPath.3 \ CrtSlave.3 Tcl_CreateAlias.3 \ CrtSlave.3 Tcl_CreateAliasObj.3 \ CrtSlave.3 Tcl_GetAlias.3 \ CrtSlave.3 Tcl_GetAliasObj.3 \ CrtSlave.3 Tcl_ExposeCommand.3 \ CrtSlave.3 Tcl_HideCommand.3 \ CrtTimerHdlr.3 Tcl_CreateTimerHandler.3 \ CrtTimerHdlr.3 Tcl_DeleteTimerHandler.3 \ CrtTrace.3 Tcl_CreateTrace.3 \ CrtTrace.3 Tcl_CreateObjTrace.3 \ CrtTrace.3 Tcl_DeleteTrace.3 \ DString.3 Tcl_DStringInit.3 \ DString.3 Tcl_DStringAppend.3 \ DString.3 Tcl_DStringAppendElement.3 \ DString.3 Tcl_DStringStartSublist.3 \ DString.3 Tcl_DStringEndSublist.3 \ DString.3 Tcl_DStringLength.3 \ DString.3 Tcl_DStringValue.3 \ DString.3 Tcl_DStringSetLength.3 \ DString.3 Tcl_DStringTrunc.3 \ DString.3 Tcl_DStringFree.3 \ DString.3 Tcl_DStringResult.3 \ DString.3 Tcl_DStringGetResult.3 \ DetachPids.3 Tcl_DetachPids.3 \ DetachPids.3 Tcl_ReapDetachedProcs.3 \ DetachPids.3 Tcl_WaitPid.3 \ DictObj.3 Tcl_NewDictObj.3 \ DictObj.3 Tcl_DictObjGet.3 \ DictObj.3 Tcl_DictObjPut.3 \ DictObj.3 Tcl_DictObjRemove.3 \ DictObj.3 Tcl_DictObjSize.3 \ DictObj.3 Tcl_DictObjFirst.3 \ DictObj.3 Tcl_DictObjNext.3 \ DictObj.3 Tcl_DictObjDone.3 \ DictObj.3 Tcl_DictObjPutKeyList.3 \ DictObj.3 Tcl_DictObjRemoveKeyList.3 \ DoOneEvent.3 Tcl_DoOneEvent.3 \ DoWhenIdle.3 Tcl_DoWhenIdle.3 \ DoWhenIdle.3 Tcl_CancelIdleCall.3 \ DoubleObj.3 Tcl_NewDoubleObj.3 \ DoubleObj.3 Tcl_SetDoubleObj.3 \ DoubleObj.3 Tcl_GetDoubleFromObj.3 \ DumpActiveMemory.3 Tcl_DumpActiveMemory.3 \ DumpActiveMemory.3 Tcl_InitMemory.3 \ DumpActiveMemory.3 Tcl_ValidateAllMemory.3 \ Encoding.3 Tcl_GetEncoding.3 \ Encoding.3 Tcl_FreeEncoding.3 \ Encoding.3 Tcl_GetEncodingFromObj.3 \ Encoding.3 Tcl_ExternalToUtfDString.3 \ Encoding.3 Tcl_UtfToExternalDString.3 \ Encoding.3 Tcl_ExternalToUtf.3 \ Encoding.3 Tcl_UtfToExternal.3 \ Encoding.3 Tcl_WinTCharToUtf.3 \ Encoding.3 Tcl_WinUtfToTChar.3 \ Encoding.3 Tcl_GetEncodingName.3 \ Encoding.3 Tcl_SetSystemEncoding.3 \ Encoding.3 Tcl_GetEncodingNameFromEnvironment.3 \ Encoding.3 Tcl_GetEncodingNames.3 \ Encoding.3 Tcl_CreateEncoding.3 \ Encoding.3 Tcl_GetEncodingSearchPath.3 \ Encoding.3 Tcl_SetEncodingSearchPath.3 \ Encoding.3 Tcl_GetDefaultEncodingDir.3 \ Encoding.3 Tcl_SetDefaultEncodingDir.3 \ Ensemble.3 Tcl_CreateEnsemble.3 \ Ensemble.3 Tcl_FindEnsemble.3 \ Ensemble.3 Tcl_IsEnsemble.3 \ Ensemble.3 Tcl_GetEnsembleFlags.3 \ Ensemble.3 Tcl_SetEnsembleFlags.3 \ Ensemble.3 Tcl_GetEnsembleMappingDict.3 \ Ensemble.3 Tcl_SetEnsembleMappingDict.3 \ Ensemble.3 Tcl_GetEnsembleSubcommandList.3 \ Ensemble.3 Tcl_SetEnsembleSubcommandList.3 \ Ensemble.3 Tcl_GetEnsembleUnknownHandler.3 \ Ensemble.3 Tcl_SetEnsembleUnknownHandler.3 \ Ensemble.3 Tcl_GetEnsembleNamespace.3 \ Environment.3 Tcl_PutEnv.3 \ Eval.3 Tcl_EvalObjEx.3 \ Eval.3 Tcl_EvalFile.3 \ Eval.3 Tcl_EvalObjv.3 \ Eval.3 Tcl_Eval.3 \ Eval.3 Tcl_EvalEx.3 \ Eval.3 Tcl_GlobalEval.3 \ Eval.3 Tcl_GlobalEvalObj.3 \ Eval.3 Tcl_VarEval.3 \ Eval.3 Tcl_VarEvalVA.3 \ Exit.3 Tcl_Exit.3 \ Exit.3 Tcl_Finalize.3 \ Exit.3 Tcl_CreateExitHandler.3 \ Exit.3 Tcl_DeleteExitHandler.3 \ Exit.3 Tcl_ExitThread.3 \ Exit.3 Tcl_FinalizeThread.3 \ Exit.3 Tcl_CreateThreadExitHandler.3 \ Exit.3 Tcl_DeleteThreadExitHandler.3 \ Exit.3 Tcl_SetExitProc.3 \ ExprLong.3 Tcl_ExprLong.3 \ ExprLong.3 Tcl_ExprDouble.3 \ ExprLong.3 Tcl_ExprBoolean.3 \ ExprLong.3 Tcl_ExprString.3 \ ExprLongObj.3 Tcl_ExprLongObj.3 \ ExprLongObj.3 Tcl_ExprDoubleObj.3 \ ExprLongObj.3 Tcl_ExprBooleanObj.3 \ ExprLongObj.3 Tcl_ExprObj.3 \ FileSystem.3 Tcl_FSRegister.3 \ FileSystem.3 Tcl_FSUnregister.3 \ FileSystem.3 Tcl_FSData.3 \ FileSystem.3 Tcl_FSMountsChanged.3 \ FileSystem.3 Tcl_FSGetFileSystemForPath.3 \ FileSystem.3 Tcl_FSGetPathType.3 \ FileSystem.3 Tcl_FSCopyFile.3 \ FileSystem.3 Tcl_FSCopyDirectory.3 \ FileSystem.3 Tcl_FSCreateDirectory.3 \ FileSystem.3 Tcl_FSDeleteFile.3 \ FileSystem.3 Tcl_FSRemoveDirectory.3 \ FileSystem.3 Tcl_FSRenameFile.3 \ FileSystem.3 Tcl_FSListVolumes.3 \ FileSystem.3 Tcl_FSEvalFileEx.3 \ FileSystem.3 Tcl_FSEvalFile.3 \ FileSystem.3 Tcl_FSLoadFile.3 \ FileSystem.3 Tcl_FSMatchInDirectory.3 \ FileSystem.3 Tcl_FSLink.3 \ FileSystem.3 Tcl_FSLstat.3 \ FileSystem.3 Tcl_FSUtime.3 \ FileSystem.3 Tcl_FSFileAttrsGet.3 \ FileSystem.3 Tcl_FSFileAttrsSet.3 \ FileSystem.3 Tcl_FSFileAttrStrings.3 \ FileSystem.3 Tcl_FSStat.3 \ FileSystem.3 Tcl_FSAccess.3 \ FileSystem.3 Tcl_FSOpenFileChannel.3 \ FileSystem.3 Tcl_FSGetCwd.3 \ FileSystem.3 Tcl_FSChdir.3 \ FileSystem.3 Tcl_FSPathSeparator.3 \ FileSystem.3 Tcl_FSJoinPath.3 \ FileSystem.3 Tcl_FSSplitPath.3 \ FileSystem.3 Tcl_FSEqualPaths.3 \ FileSystem.3 Tcl_FSGetNormalizedPath.3 \ FileSystem.3 Tcl_FSJoinToPath.3 \ FileSystem.3 Tcl_FSConvertToPathType.3 \ FileSystem.3 Tcl_FSGetInternalRep.3 \ FileSystem.3 Tcl_FSGetTranslatedPath.3 \ FileSystem.3 Tcl_FSGetTranslatedStringPath.3 \ FileSystem.3 Tcl_FSNewNativePath.3 \ FileSystem.3 Tcl_FSGetNativePath.3 \ FileSystem.3 Tcl_FSFileSystemInfo.3 \ FileSystem.3 Tcl_AllocStatBuf.3 \ FindExec.3 Tcl_FindExecutable.3 \ FindExec.3 Tcl_GetNameOfExecutable.3 \ GetCwd.3 Tcl_GetCwd.3 \ GetCwd.3 Tcl_Chdir.3 \ GetHostName.3 Tcl_GetHostName.3 \ GetIndex.3 Tcl_GetIndexFromObj.3 \ GetIndex.3 Tcl_GetIndexFromObjStruct.3 \ GetInt.3 Tcl_GetInt.3 \ GetInt.3 Tcl_GetDouble.3 \ GetInt.3 Tcl_GetBoolean.3 \ GetOpnFl.3 Tcl_GetOpenFile.3 \ GetStdChan.3 Tcl_GetStdChannel.3 \ GetStdChan.3 Tcl_SetStdChannel.3 \ GetTime.3 Tcl_GetTime.3 \ GetTime.3 Tcl_SetTimeProc.3 \ GetTime.3 Tcl_QueryTimeProc.3 \ GetVersion.3 Tcl_GetVersion.3 \ Hash.3 Tcl_InitHashTable.3 \ Hash.3 Tcl_InitCustomHashTable.3 \ Hash.3 Tcl_InitObjHashTable.3 \ Hash.3 Tcl_DeleteHashTable.3 \ Hash.3 Tcl_CreateHashEntry.3 \ Hash.3 Tcl_DeleteHashEntry.3 \ Hash.3 Tcl_FindHashEntry.3 \ Hash.3 Tcl_GetHashValue.3 \ Hash.3 Tcl_SetHashValue.3 \ Hash.3 Tcl_GetHashKey.3 \ Hash.3 Tcl_FirstHashEntry.3 \ Hash.3 Tcl_NextHashEntry.3 \ Hash.3 Tcl_HashStats.3 \ Init.3 Tcl_Init.3 \ InitStubs.3 Tcl_InitStubs.3 \ IntObj.3 Tcl_NewIntObj.3 \ IntObj.3 Tcl_NewLongObj.3 \ IntObj.3 Tcl_NewWideIntObj.3 \ IntObj.3 Tcl_SetIntObj.3 \ IntObj.3 Tcl_SetLongObj.3 \ IntObj.3 Tcl_SetWideIntObj.3 \ IntObj.3 Tcl_GetIntFromObj.3 \ IntObj.3 Tcl_GetLongFromObj.3 \ IntObj.3 Tcl_GetWideIntFromObj.3 \ IntObj.3 Tcl_NewBignumObj.3 \ IntObj.3 Tcl_SetBignumObj.3 \ IntObj.3 Tcl_GetBignumFromObj.3 \ IntObj.3 Tcl_GetBignumAndClearObj.3 \ Interp.3 Tcl_Interp.3 \ Limit.3 Tcl_LimitCheck.3 \ Limit.3 Tcl_LimitReady.3 \ Limit.3 Tcl_LimitExceeded.3 \ Limit.3 Tcl_LimitTypeExceeded.3 \ Limit.3 Tcl_LimitTypeEnabled.3 \ Limit.3 Tcl_LimitTypeSet.3 \ Limit.3 Tcl_LimitTypeReset.3 \ Limit.3 Tcl_LimitGetCommands.3 \ Limit.3 Tcl_LimitSetCommands.3 \ Limit.3 Tcl_LimitGetTime.3 \ Limit.3 Tcl_LimitSetTime.3 \ Limit.3 Tcl_LimitGetGranularity.3 \ Limit.3 Tcl_LimitSetGranularity.3 \ Limit.3 Tcl_LimitAddHandler.3 \ Limit.3 Tcl_LimitRemoveHandler.3 \ LinkVar.3 Tcl_LinkVar.3 \ LinkVar.3 Tcl_UnlinkVar.3 \ LinkVar.3 Tcl_UpdateLinkedVar.3 \ ListObj.3 Tcl_ListObjAppendList.3 \ ListObj.3 Tcl_ListObjAppendElement.3 \ ListObj.3 Tcl_NewListObj.3 \ ListObj.3 Tcl_SetListObj.3 \ ListObj.3 Tcl_ListObjGetElements.3 \ ListObj.3 Tcl_ListObjLength.3 \ ListObj.3 Tcl_ListObjIndex.3 \ ListObj.3 Tcl_ListObjReplace.3 \ Namespace.3 Tcl_CreateNamespace.3 \ Namespace.3 Tcl_DeleteNamespace.3 \ Namespace.3 Tcl_AppendExportList.3 \ Namespace.3 Tcl_Export.3 \ Namespace.3 Tcl_Import.3 \ Namespace.3 Tcl_ForgetImport.3 \ Namespace.3 Tcl_GetCurrentNamespace.3 \ Namespace.3 Tcl_GetGlobalNamespace.3 \ Namespace.3 Tcl_FindNamespace.3 \ Namespace.3 Tcl_FindCommand.3 \ Namespace.3 Tcl_GetNamespaceUnknownHandler.3 \ Namespace.3 Tcl_SetNamespaceUnknownHandler.3 \ Notifier.3 Tcl_CreateEventSource.3 \ Notifier.3 Tcl_DeleteEventSource.3 \ Notifier.3 Tcl_SetMaxBlockTime.3 \ Notifier.3 Tcl_QueueEvent.3 \ Notifier.3 Tcl_ThreadQueueEvent.3 \ Notifier.3 Tcl_ThreadAlert.3 \ Notifier.3 Tcl_GetCurrentThread.3 \ Notifier.3 Tcl_DeleteEvents.3 \ Notifier.3 Tcl_InitNotifier.3 \ Notifier.3 Tcl_FinalizeNotifier.3 \ Notifier.3 Tcl_WaitForEvent.3 \ Notifier.3 Tcl_AlertNotifier.3 \ Notifier.3 Tcl_SetTimer.3 \ Notifier.3 Tcl_ServiceAll.3 \ Notifier.3 Tcl_ServiceEvent.3 \ Notifier.3 Tcl_GetServiceMode.3 \ Notifier.3 Tcl_SetServiceMode.3 \ Object.3 Tcl_NewObj.3 \ Object.3 Tcl_DuplicateObj.3 \ Object.3 Tcl_IncrRefCount.3 \ Object.3 Tcl_DecrRefCount.3 \ Object.3 Tcl_IsShared.3 \ Object.3 Tcl_InvalidateStringRep.3 \ ObjectType.3 Tcl_RegisterObjType.3 \ ObjectType.3 Tcl_GetObjType.3 \ ObjectType.3 Tcl_AppendAllObjTypes.3 \ ObjectType.3 Tcl_ConvertToType.3 \ OpenFileChnl.3 Tcl_OpenFileChannel.3 \ OpenFileChnl.3 Tcl_OpenCommandChannel.3 \ OpenFileChnl.3 Tcl_MakeFileChannel.3 \ OpenFileChnl.3 Tcl_GetChannel.3 \ OpenFileChnl.3 Tcl_GetChannelNames.3 \ OpenFileChnl.3 Tcl_GetChannelNamesEx.3 \ OpenFileChnl.3 Tcl_RegisterChannel.3 \ OpenFileChnl.3 Tcl_UnregisterChannel.3 \ OpenFileChnl.3 Tcl_DetachChannel.3 \ OpenFileChnl.3 Tcl_IsStandardChannel.3 \ OpenFileChnl.3 Tcl_Close.3 \ OpenFileChnl.3 Tcl_ReadChars.3 \ OpenFileChnl.3 Tcl_Read.3 \ OpenFileChnl.3 Tcl_GetsObj.3 \ OpenFileChnl.3 Tcl_Gets.3 \ OpenFileChnl.3 Tcl_Ungets.3 \ OpenFileChnl.3 Tcl_WriteObj.3 \ OpenFileChnl.3 Tcl_WriteChars.3 \ OpenFileChnl.3 Tcl_Write.3 \ OpenFileChnl.3 Tcl_ReadRaw.3 \ OpenFileChnl.3 Tcl_WriteRaw.3 \ OpenFileChnl.3 Tcl_Eof.3 \ OpenFileChnl.3 Tcl_Flush.3 \ OpenFileChnl.3 Tcl_InputBlocked.3 \ OpenFileChnl.3 Tcl_InputBuffered.3 \ OpenFileChnl.3 Tcl_OutputBuffered.3 \ OpenFileChnl.3 Tcl_Seek.3 \ OpenFileChnl.3 Tcl_Tell.3 \ OpenFileChnl.3 Tcl_TruncateChannel.3 \ OpenFileChnl.3 Tcl_GetChannelOption.3 \ OpenFileChnl.3 Tcl_SetChannelOption.3 \ OpenTcp.3 Tcl_OpenTcpClient.3 \ OpenTcp.3 Tcl_MakeTcpClientChannel.3 \ OpenTcp.3 Tcl_OpenTcpServer.3 \ Panic.3 Tcl_Panic.3 \ Panic.3 Tcl_PanicVA.3 \ Panic.3 Tcl_SetPanicProc.3 \ ParseCmd.3 Tcl_ParseCommand.3 \ ParseCmd.3 Tcl_ParseExpr.3 \ ParseCmd.3 Tcl_ParseBraces.3 \ ParseCmd.3 Tcl_ParseQuotedString.3 \ ParseCmd.3 Tcl_ParseVarName.3 \ ParseCmd.3 Tcl_ParseVar.3 \ ParseCmd.3 Tcl_FreeParse.3 \ ParseCmd.3 Tcl_EvalTokens.3 \ ParseCmd.3 Tcl_EvalTokensStandard.3 \ PkgRequire.3 Tcl_PkgRequire.3 \ PkgRequire.3 Tcl_PkgRequireEx.3 \ PkgRequire.3 Tcl_PkgRequireProc.3 \ PkgRequire.3 Tcl_PkgPresent.3 \ PkgRequire.3 Tcl_PkgPresentEx.3 \ PkgRequire.3 Tcl_PkgProvide.3 \ PkgRequire.3 Tcl_PkgProvideEx.3 \ Preserve.3 Tcl_Preserve.3 \ Preserve.3 Tcl_Release.3 \ Preserve.3 Tcl_EventuallyFree.3 \ PrintDbl.3 Tcl_PrintDouble.3 \ RecEvalObj.3 Tcl_RecordAndEvalObj.3 \ RecordEval.3 Tcl_RecordAndEval.3 \ RegConfig.3 Tcl_RegisterConfig.3 \ RegExp.3 Tcl_RegExpMatchObj.3 \ RegExp.3 Tcl_RegExpMatch.3 \ RegExp.3 Tcl_RegExpCompile.3 \ RegExp.3 Tcl_RegExpExec.3 \ RegExp.3 Tcl_RegExpRange.3 \ RegExp.3 Tcl_GetRegExpFromObj.3 \ RegExp.3 Tcl_RegExpExecObj.3 \ RegExp.3 Tcl_RegExpGetInfo.3 \ SaveResult.3 Tcl_SaveInterpState.3 \ SaveResult.3 Tcl_RestoreInterpState.3 \ SaveResult.3 Tcl_DiscardInterpState.3 \ SaveResult.3 Tcl_SaveResult.3 \ SaveResult.3 Tcl_RestoreResult.3 \ SaveResult.3 Tcl_DiscardResult.3 \ SetChanErr.3 Tcl_SetChannelError.3 \ SetChanErr.3 Tcl_SetChannelErrorInterp.3 \ SetChanErr.3 Tcl_GetChannelError.3 \ SetChanErr.3 Tcl_GetChannelErrorInterp.3 \ SetErrno.3 Tcl_SetErrno.3 \ SetErrno.3 Tcl_GetErrno.3 \ SetErrno.3 Tcl_ErrnoId.3 \ SetErrno.3 Tcl_ErrnoMsg.3 \ SetRecLmt.3 Tcl_SetRecursionLimit.3 \ SetResult.3 Tcl_SetObjResult.3 \ SetResult.3 Tcl_GetObjResult.3 \ SetResult.3 Tcl_SetResult.3 \ SetResult.3 Tcl_GetStringResult.3 \ SetResult.3 Tcl_AppendResult.3 \ SetResult.3 Tcl_AppendResultVA.3 \ SetResult.3 Tcl_AppendElement.3 \ SetResult.3 Tcl_ResetResult.3 \ SetResult.3 Tcl_FreeResult.3 \ SetVar.3 Tcl_SetVar2Ex.3 \ SetVar.3 Tcl_SetVar.3 \ SetVar.3 Tcl_SetVar2.3 \ SetVar.3 Tcl_ObjSetVar2.3 \ SetVar.3 Tcl_GetVar2Ex.3 \ SetVar.3 Tcl_GetVar.3 \ SetVar.3 Tcl_GetVar2.3 \ SetVar.3 Tcl_ObjGetVar2.3 \ SetVar.3 Tcl_UnsetVar.3 \ SetVar.3 Tcl_UnsetVar2.3 \ Signal.3 Tcl_SignalId.3 \ Signal.3 Tcl_SignalMsg.3 \ Sleep.3 Tcl_Sleep.3 \ SourceRCFile.3 Tcl_SourceRCFile.3 \ SplitList.3 Tcl_SplitList.3 \ SplitList.3 Tcl_Merge.3 \ SplitList.3 Tcl_ScanElement.3 \ SplitList.3 Tcl_ScanCountedElement.3 \ SplitList.3 Tcl_ConvertElement.3 \ SplitList.3 Tcl_ConvertCountedElement.3 \ SplitPath.3 Tcl_SplitPath.3 \ SplitPath.3 Tcl_JoinPath.3 \ SplitPath.3 Tcl_GetPathType.3 \ StaticPkg.3 Tcl_StaticPackage.3 \ StdChannels.3 Tcl_StandardChannels.3 \ StrMatch.3 Tcl_StringMatch.3 \ StrMatch.3 Tcl_StringCaseMatch.3 \ StringObj.3 Tcl_NewStringObj.3 \ StringObj.3 Tcl_NewUnicodeObj.3 \ StringObj.3 Tcl_SetStringObj.3 \ StringObj.3 Tcl_SetUnicodeObj.3 \ StringObj.3 Tcl_GetStringFromObj.3 \ StringObj.3 Tcl_GetString.3 \ StringObj.3 Tcl_GetUnicodeFromObj.3 \ StringObj.3 Tcl_GetUnicode.3 \ StringObj.3 Tcl_GetUniChar.3 \ StringObj.3 Tcl_GetCharLength.3 \ StringObj.3 Tcl_GetRange.3 \ StringObj.3 Tcl_AppendToObj.3 \ StringObj.3 Tcl_AppendUnicodeToObj.3 \ StringObj.3 Tcl_AppendObjToObj.3 \ StringObj.3 Tcl_AppendStringsToObj.3 \ StringObj.3 Tcl_AppendStringsToObjVA.3 \ StringObj.3 Tcl_SetObjLength.3 \ StringObj.3 Tcl_AttemptSetObjLength.3 \ StringObj.3 Tcl_ConcatObj.3 \ SubstObj.3 Tcl_SubstObj.3 \ Tcl_Main.3 Tcl_SetMainLoop.3 \ Thread.3 Tcl_ConditionNotify.3 \ Thread.3 Tcl_ConditionWait.3 \ Thread.3 Tcl_ConditionFinalize.3 \ Thread.3 Tcl_GetThreadData.3 \ Thread.3 Tcl_MutexLock.3 \ Thread.3 Tcl_MutexUnlock.3 \ Thread.3 Tcl_MutexFinalize.3 \ Thread.3 Tcl_CreateThread.3 \ Thread.3 Tcl_JoinThread.3 \ ToUpper.3 Tcl_UniCharToUpper.3 \ ToUpper.3 Tcl_UniCharToLower.3 \ ToUpper.3 Tcl_UniCharToTitle.3 \ ToUpper.3 Tcl_UtfToUpper.3 \ ToUpper.3 Tcl_UtfToLower.3 \ ToUpper.3 Tcl_UtfToTitle.3 \ TraceCmd.3 Tcl_CommandTraceInfo.3 \ TraceCmd.3 Tcl_TraceCommand.3 \ TraceCmd.3 Tcl_UntraceCommand.3 \ TraceVar.3 Tcl_TraceVar.3 \ TraceVar.3 Tcl_TraceVar2.3 \ TraceVar.3 Tcl_UntraceVar.3 \ TraceVar.3 Tcl_UntraceVar2.3 \ TraceVar.3 Tcl_VarTraceInfo.3 \ TraceVar.3 Tcl_VarTraceInfo2.3 \ Translate.3 Tcl_TranslateFileName.3 \ UniCharIsAlpha.3 Tcl_UniCharIsAlnum.3 \ UniCharIsAlpha.3 Tcl_UniCharIsAlpha.3 \ UniCharIsAlpha.3 Tcl_UniCharIsControl.3 \ UniCharIsAlpha.3 Tcl_UniCharIsDigit.3 \ UniCharIsAlpha.3 Tcl_UniCharIsGraph.3 \ UniCharIsAlpha.3 Tcl_UniCharIsLower.3 \ UniCharIsAlpha.3 Tcl_UniCharIsPrint.3 \ UniCharIsAlpha.3 Tcl_UniCharIsPunct.3 \ UniCharIsAlpha.3 Tcl_UniCharIsSpace.3 \ UniCharIsAlpha.3 Tcl_UniCharIsUpper.3 \ UniCharIsAlpha.3 Tcl_UniCharIsWordChar.3 \ UpVar.3 Tcl_UpVar.3 \ UpVar.3 Tcl_UpVar2.3 \ Utf.3 Tcl_UniCharToUtf.3 \ Utf.3 Tcl_UtfToUniChar.3 \ Utf.3 Tcl_UniCharToUtfDString.3 \ Utf.3 Tcl_UtfToUniCharDString.3 \ Utf.3 Tcl_UniCharLen.3 \ Utf.3 Tcl_UniCharNcmp.3 \ Utf.3 Tcl_UniCharNcasecmp.3 \ Utf.3 Tcl_UniCharCaseMatch.3 \ Utf.3 Tcl_UtfNcmp.3 \ Utf.3 Tcl_UtfNcasecmp.3 \ Utf.3 Tcl_UtfCharComplete.3 \ Utf.3 Tcl_NumUtfChars.3 \ Utf.3 Tcl_UtfFindFirst.3 \ Utf.3 Tcl_UtfFindLast.3 \ Utf.3 Tcl_UtfNext.3 \ Utf.3 Tcl_UtfPrev.3 \ Utf.3 Tcl_UniCharAtIndex.3 \ Utf.3 Tcl_UtfAtIndex.3 \ Utf.3 Tcl_UtfBackslash.3 \ WrongNumArgs.3 Tcl_WrongNumArgs.3 \ library.n auto_execok.n \ library.n auto_import.n \ library.n auto_load.n \ library.n auto_mkindex.n \ library.n auto_mkindex_old.n \ library.n auto_qualify.n \ library.n auto_reset.n \ library.n tcl_findLibrary.n \ library.n parray.n \ library.n tcl_endOfWord.n \ library.n tcl_startOfNextWord.n \ library.n tcl_startOfPreviousWord.n \ library.n tcl_wordBreakAfter.n \ library.n tcl_wordBreakBefore.n \ packagens.n pkg::create.n \ pkgMkIndex.n pkg_mkIndex.n \ safe.n SafeBase.n .endif .endif # defined(BUILDING_TCL_THREADS) TCLBASE?= ${PORTSDIR}/${PKGCATEGORY}/${LATEST_LINK} post-patch: @${REINPLACE_CMD} -e 's|tclsh |tclsh${TCL_VER}${THREADS_SUFFIX} |g' -e 's|Tclsh |Tclsh${TCL_VER}${THREADS_SUFFIX} |g' \ -e 's|tclsh\\fR|tclsh${TCL_VER}${THREADS_SUFFIX}\\fR|g' -e 's|Tclsh\\fR|Tclsh${TCL_VER}${THREADS_SUFFIX}\\fR|g' \ -e 's|^.so man.macros|.so ${DATADIR}/man.macros|' \ ${WRKSRC}/../doc/tclsh.1 @${FIND} ${WRKDIR} -name \*.orig -delete .if defined(BUILDING_TCL_THREADS) @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \ -e 's|$${TCL_TRIM_DOTS}|$${TCL_TRIM_DOTS}${THREADS_SUFFIX}|g' \ -e 's|-ltcl$${TCL_VERSION}|-ltcl$${TCL_VERSION}${THREADS_SUFFIX}|g' \ -e 's/-ltcl`echo $${TCL_VERSION} | tr -d .`/-ltcl`echo $${TCL_VERSION} | tr -d .`${THREADS_SUFFIX}/g' \ -e 's|-ltclstub$${TCL_VERSION}|-ltclstub$${TCL_VERSION}${THREADS_SUFFIX}|g' \ -e 's/-ltclstub`echo $${TCL_VERSION} | tr -d .`/-ltclstub`echo $${TCL_VERSION} | tr -d .`${THREADS_SUFFIX}/g' \ ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|libtcl$${SHORT_TCL_VER}|libtcl$${SHORT_TCL_VER}${THREADS_SUFFIX}|g' \ -e 's|/tclsh$$(VERSION)|/tclsh$$(VERSION)${THREADS_SUFFIX}|g' \ -e 's|/tclConfig.sh|/tclConfig${THREADS_SUFFIX}.sh|g' \ ${WRKSRC}/Makefile.in .endif # Where the below command fails, there is no need for concern: BLACKHOLE!= ${SYSCTL} -n net.inet.tcp.blackhole || ${TRUE} post-configure: ${REINPLACE_CMD} \ -e 's|${WRKDIRPREFIX}${.CURDIR}|${WRKDIRPREFIX}${TCLBASE}|' \ ${WRKSRC}/tclConfig.sh ${REINPLACE_CMD} \ -e 's,-DNO_MEMMOVE=1,,' -e 's,-DNO_STRING_H=1,,' \ -e 's,^COMPAT_OBJS.*,,' ${WRKSRC}/Makefile .if ${BLACKHOLE} != '' && ${BLACKHOLE} != 0 # ==================================================== # net.inet.tcp.blackhole is non-zero. Some http-tests # will appear to hang and then fail. Do not be alarmed. # The socket.test would hang, so it is disabled: ${MV} ${WRKSRC:H}/tests/socket.test ${WRKSRC:H}/tests/socket.test.dis; # ==================================================== .endif .if defined(BUILDING_TCL_THREADS) do-install: @cd ${WRKSRC} && ${MAKE_ENV} ${MAKE} -f Makefile install-binaries @${MKDIR} ${PREFIX}/lib/tcl${TCL_VER}${THREADS_SUFFIX} @${LN} -s ${PREFIX}/lib/tcl${TCL_VER}/tclConfig${THREADS_SUFFIX}.sh ${PREFIX}/lib/tcl${TCL_VER}${THREADS_SUFFIX}/tclConfig.sh .endif post-install: .if ${PORT_OPTIONS:MTZDATA} @cd ${WRKSRC} && ${MAKE} -f Makefile install-tzdata ${MAKE_ENV} .endif ${MKDIR} ${DATADIR} ${INSTALL_DATA} ${WRKSRC}/../doc/man.macros ${DATADIR} ${MKDIR} ${MANPREFIX}/man/man1 ${INSTALL_MAN} ${WRKSRC}/../doc/tclsh.1 ${MANPREFIX}/man/man1/tclsh${TCL_VER}${THREADS_SUFFIX}.1 .if !defined(BUILDING_TCL_THREADS) && ${PORT_OPTIONS:MTCL85_MAN} . for mp in ${MAN3} ${MANN} @${REINPLACE_CMD} -e 's|^.so man.macros|.so ${DATADIR}/man.macros|' \ ${WRKSRC}/../doc/${mp} . endfor @cd ${WRKSRC} && ${MAKE} -f Makefile install-doc ${MAKE_ENV} .endif # !defined(BUILDING_TCL_THREADS) && ${PORT_OPTIONS:MTCL85_MAN} regression-test: build cd ${WRKSRC} && LC_ALL=C ${MAKE} test .endif # !defined(BUILDING_TCL_TM) .include Index: head/lang/tcl85/distinfo =================================================================== --- head/lang/tcl85/distinfo (revision 308125) +++ head/lang/tcl85/distinfo (revision 308126) @@ -1,2 +1,2 @@ -SHA256 (tcl8.5.12-src.tar.gz) = 20ba7a10a30571983afd3599f19b441adb5222b21f1d2b27d0fba3ed8d4707c2 -SIZE (tcl8.5.12-src.tar.gz) = 4501505 +SHA256 (tcl8.5.13-src.tar.gz) = 9b868dd563e65671a26fcf518b6b86c1bb1b6756f48fdc90f04301d4f3a6596a +SIZE (tcl8.5.13-src.tar.gz) = 4513204 Property changes on: head/lang/tcl85/distinfo ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/lang/tcl85/files/patch-uk-locale =================================================================== --- head/lang/tcl85/files/patch-uk-locale (revision 308125) +++ head/lang/tcl85/files/patch-uk-locale (nonexistent) @@ -1,15 +0,0 @@ -Fix the misspelled name of "March" in Ukrainian. - -Submitted upstream as: - -https://sourceforge.net/tracker/?func=detail&aid=3561330&group_id=10894&atid=310894 - ---- ../library/msgs/uk.msg 2011-04-26 11:14:03.000000000 -0400 -+++ ../library/msgs/uk.msg 2012-08-24 12:52:15.000000000 -0400 -@@ -34,5 +34,5 @@ - "\u0441\u0456\u0447\u043d\u044f"\ - "\u043b\u044e\u0442\u043e\u0433\u043e"\ -- "\u0431\u0435\u0440\u0435\u0436\u043d\u044f"\ -+ "\u0431\u0435\u0440\u0435\u0437\u043d\u044f"\ - "\u043a\u0432\u0456\u0442\u043d\u044f"\ - "\u0442\u0440\u0430\u0432\u043d\u044f"\ Property changes on: head/lang/tcl85/files/patch-uk-locale ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -1 \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/lang/tcl85/files/patch-unix-Makefile.in =================================================================== --- head/lang/tcl85/files/patch-unix-Makefile.in (revision 308125) +++ head/lang/tcl85/files/patch-unix-Makefile.in (revision 308126) @@ -1,202 +1,208 @@ ---- Makefile.in.orig 2012-07-25 18:45:05.000000000 +0200 -+++ Makefile.in 2012-08-02 15:10:04.590514599 +0200 +--- Makefile.in.bak 2012-11-20 23:39:58.000000000 -0600 ++++ Makefile.in 2012-11-20 23:47:34.000000000 -0600 @@ -54,6 +54,8 @@ # Directory in which to install the include file tcl.h: INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir) +GENERIC_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/generic +UNIX_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/unix # Path to the private tcl header dir: PRIVATE_INCLUDE_DIR = @PRIVATE_INCLUDE_DIR@ -@@ -100,7 +102,7 @@ - #CFLAGS = $(CFLAGS_DEBUG) - #CFLAGS = $(CFLAGS_OPTIMIZE) - #CFLAGS = $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE) --CFLAGS = @CFLAGS_DEFAULT@ @CFLAGS@ -+CFLAGS += @CFLAGS_DEFAULT@ @CFLAGS@ +@@ -542,7 +544,7 @@ - # Flags to pass to the linker - LDFLAGS_DEBUG = @LDFLAGS_DEBUG@ -@@ -541,7 +543,7 @@ - all: binaries libraries doc -binaries: ${LIB_FILE} $(STUB_LIB_FILE) ${TCL_EXE} +binaries: ${LIB_FILE} $(STUB_LIB_FILE) ${TCL_EXE} libtcl${SHORT_TCL_VER}.a libraries: -@@ -552,6 +554,15 @@ +@@ -553,6 +555,14 @@ ${LIB_FILE}: ${OBJS} ${STUB_LIB_FILE} rm -f $@ @MAKE_LIB@ + @ln -sf $(LIB_FILE) ./libtcl${SHORT_TCL_VER}.so + if test "x@DL_OBJS@" = "xtclLoadAout.o"; then \ + $(RANLIB) ${LIB_FILE}; \ -+ fi -+ ++ fi; +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 $@ -@@ -693,7 +704,7 @@ +@@ -694,7 +704,7 @@ dltest.marker: ${STUB_LIB_FILE} cd dltest ; $(MAKE) -INSTALL_TARGETS = install-binaries install-libraries install-doc @EXTRA_INSTALL@ +INSTALL_TARGETS = install-binaries install-libraries @EXTRA_INSTALL@ install: $(INSTALL_TARGETS) -@@ -723,10 +734,18 @@ +@@ -720,10 +730,17 @@ @echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/" @@INSTALL_LIB@ @chmod 555 "$(DLL_INSTALL_DIR)"/$(LIB_FILE) + @ln -sf $(LIB_FILE) "$(DLL_INSTALL_DIR)"/libtcl${SHORT_TCL_VER}.so + @echo "Installing libtcl${SHORT_TCL_VER}.a" + @$(INSTALL_DATA) libtcl${SHORT_TCL_VER}.a \ + "$(DLL_INSTALL_DIR)"/libtcl${SHORT_TCL_VER}.a + @(cd "$(DLL_INSTALL_DIR)"; $(RANLIB) libtcl${SHORT_TCL_VER}.a) + @chmod 555 "$(DLL_INSTALL_DIR)"/libtcl${SHORT_TCL_VER}.a -+ @echo "Installing ${TCL_EXE} as $(BIN_INSTALL_DIR)/tclsh$(VERSION)@EXEEXT@" - @$(INSTALL_PROGRAM) ${TCL_EXE} "$(BIN_INSTALL_DIR)"/tclsh$(VERSION)@EXEEXT@ -- @echo "Installing tclConfig.sh to $(CONFIG_INSTALL_DIR)/" -- @$(INSTALL_DATA) tclConfig.sh "$(CONFIG_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 + @$(INSTALL_PROGRAM) ${TCL_EXE} "$(BIN_INSTALL_DIR)"/tclsh$(VERSION)@EXEEXT@ +- @echo "Installing tclConfig.sh to $(CONFIG_INSTALL_DIR)/" +- @$(INSTALL_DATA) tclConfig.sh "$(CONFIG_INSTALL_DIR)"/tclConfig.sh @if test "$(STUB_LIB_FILE)" != "" ; then \ echo "Installing $(STUB_LIB_FILE) to $(LIB_INSTALL_DIR)/"; \ @INSTALL_STUB_LIB@ ; \ -@@ -734,7 +753,8 @@ +@@ -731,7 +748,8 @@ @EXTRA_INSTALL_BINARIES@ install-libraries: libraries $(INSTALL_TZDATA) install-msgs - @for i in "$(INCLUDE_INSTALL_DIR)" "$(SCRIPT_INSTALL_DIR)"; \ + @for i in "$(GENERIC_INCLUDE_INSTALL_DIR)" \ + "$(UNIX_INCLUDE_INSTALL_DIR)" "$(SCRIPT_INSTALL_DIR)"; \ do \ if [ ! -d "$$i" ] ; then \ echo "Making directory $$i"; \ -@@ -743,7 +763,7 @@ +@@ -739,7 +757,7 @@ else true; \ fi; \ done; - @for i in opt0.4 http1.0 encoding ../tcl8 ../tcl8/8.4 ../tcl8/8.4/platform ../tcl8/8.5; \ + @for i in opt0.4 http1.0 encoding; \ do \ if [ ! -d "$(SCRIPT_INSTALL_DIR)"/$$i ] ; then \ echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \ -@@ -756,13 +776,17 @@ - chmod +x $(SRC_DIR)/../unix/install-sh; \ - fi - @echo "Installing header files"; +@@ -748,13 +766,17 @@ + fi; \ + done; + @echo "Installing header files to $(INCLUDE_INSTALL_DIR)/"; - @for i in $(GENERIC_DIR)/tcl.h $(GENERIC_DIR)/tclDecls.h \ - $(GENERIC_DIR)/tclPlatDecls.h \ - $(GENERIC_DIR)/tclTomMath.h \ - $(GENERIC_DIR)/tclTomMathDecls.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 + @ln -sf "$(GENERIC_INCLUDE_INSTALL_DIR)"/tclPlatDecls.h "$(INCLUDE_INSTALL_DIR)"/tclPlatDecls.h - @echo "Installing library files to $(SCRIPT_INSTALL_DIR)"; + @echo "Installing library files to $(SCRIPT_INSTALL_DIR)/"; @for i in $(TOP_DIR)/library/*.tcl $(TOP_DIR)/library/tclIndex \ $(UNIX_DIR)/tclAppInit.c @LDAIX_SRC@ @DTRACE_SRC@; \ -@@ -774,22 +798,11 @@ +@@ -766,23 +788,11 @@ do \ $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/http1.0; \ done; -- @echo "Installing package http 2.7.9 as a Tcl Module"; -- @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/http-2.7.9.tm; - @echo "Installing library opt0.4 directory"; +- @echo "Installing package http 2.7.10 as a Tcl Module"; +- @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/http-2.7.10.tm; + @echo "Installing package opt0.4 files to $(SCRIPT_INSTALL_DIR)/opt0.4/"; @for i in $(TOP_DIR)/library/opt/*.tcl ; \ do \ $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/opt0.4; \ done; -- @echo "Installing package msgcat 1.4.5 as a Tcl Module"; -- @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/msgcat-1.4.5.tm; +- @echo "Installing package msgcat 1.5.0 as a Tcl Module"; +- @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/msgcat-1.5.0.tm; - @echo "Installing package tcltest 2.3.4 as a Tcl Module"; - @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/tcltest-2.3.4.tm; - - @echo "Installing package platform 1.0.10 as a Tcl Module"; - @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform-1.0.10.tm; - @echo "Installing package platform::shell 1.1.4 as a Tcl Module"; - @$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform/shell-1.1.4.tm; - - @echo "Installing library encoding directory"; +- + @echo "Installing encoding files to $(SCRIPT_INSTALL_DIR)/encoding/"; @for i in $(TOP_DIR)/library/encoding/*.enc ; do \ -@@ -801,6 +814,28 @@ + $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/encoding; \ +@@ -792,6 +802,27 @@ + echo "if {![interp issafe]} { ::tcl::tm::roots {$(TCL_MODULE_PATH)} }" >> \ "$(SCRIPT_INSTALL_DIR)"/tm.tcl; \ fi - +install-tm: + @for i in tcl8 tcl8/8.4 tcl8/8.4/platform tcl8/8.5; \ + do \ -+ if [ ! -d "$(LIB_INSTALL_DIR)"/$$i ] ; then \ ++ if [ ! -d "$(LIB_INSTALL_DIR)"/$$i ] ; then \ + echo "Making directory $(LIB_INSTALL_DIR)/$$i"; \ + mkdir -p "$(LIB_INSTALL_DIR)"/$$i; \ + chmod 755 "$(LIB_INSTALL_DIR)"/$$i; \ + else true; \ + fi; \ -+ done; -+ @echo "Installing package http 2.7.9 as a Tcl Module"; -+ @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(LIB_INSTALL_DIR)"/tcl8/8.4/http-2.7.9.tm; -+ @echo "Installing package msgcat 1.4.5 as a Tcl Module"; -+ @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(LIB_INSTALL_DIR)"/tcl8/8.5/msgcat-1.4.5.tm; ++ done; ++ @echo "Installing package http 2.7.10 as a Tcl Module"; ++ @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(LIB_INSTALL_DIR)"/tcl8/8.4/http-2.7.10.tm; ++ @echo "Installing package msgcat 1.5.0 as a Tcl Module"; ++ @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(LIB_INSTALL_DIR)"/tcl8/8.5/msgcat-1.5.0.tm; + @echo "Installing package tcltest 2.3.4 as a Tcl Module"; + @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(LIB_INSTALL_DIR)"/tcl8/8.5/tcltest-2.3.4.tm; + + @echo "Installing package platform 1.0.10 as a Tcl Module"; + @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(LIB_INSTALL_DIR)"/tcl8/8.4/platform-1.0.10.tm; + @echo "Installing package platform::shell 1.1.4 as a Tcl Module"; + @$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl "$(LIB_INSTALL_DIR)"/tcl8/8.4/platform/shell-1.1.4.tm; -+ + install-tzdata: ${TCL_EXE} - @echo "Installing time zone data" - @@LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ -@@ -825,21 +860,26 @@ + @echo "Installing time zone files to $(SCRIPT_INSTALL_DIR)/tzdata/" +@@ -823,18 +854,23 @@ else true; \ fi; \ done; -- @echo "Installing and cross-linking top-level (.1) docs"; +- @echo "Installing and cross-linking top-level (.1) docs to $(MAN1_INSTALL_DIR)/"; - @for i in $(TOP_DIR)/doc/*.1; do \ - $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MAN1_INSTALL_DIR)"; \ - done - - @echo "Installing and cross-linking C API (.3) docs"; + @echo "Installing and cross-linking C API (.3) docs to $(MAN3_INSTALL_DIR)/"; @for i in $(TOP_DIR)/doc/*.3; do \ - $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MAN3_INSTALL_DIR)"; \ -+ $(BSD_INSTALL_MAN) $$i "$(MAN3_INSTALL_DIR)"; \ - done - - @echo "Installing and cross-linking command (.n) docs"; +- done ++ $(BSD_INSTALL_MAN) $$i "$(MAN3_INSTALL_DIR)"; \ ++ done; + @echo "Installing and cross-linking command (.n) docs to $(MANN_INSTALL_DIR)/"; @for i in $(TOP_DIR)/doc/*.n; do \ - $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MANN_INSTALL_DIR)"; \ -+ $(BSD_INSTALL_MAN) $$i "$(MANN_INSTALL_DIR)"; \ - done - +- done ++ $(BSD_INSTALL_MAN) $$i "$(MANN_INSTALL_DIR)"; \ ++ done; + @echo "**********" + @echo "IMPORTANT:" + @echo "**********" + @echo "tclConfig.sh in $(SCRIPT_INSTALL_DIR)/tclConfig.sh" + @echo "tcl.h in $(INCLUDE_INSTALL_DIR)/tcl.h" + @echo "tclDecls.h in $(INCLUDE_INSTALL_DIR)/tclDecls.h" + @echo "There are NOT default place, but good place to avoid" + @echo "conflicting with another version of Tcl/Tks." + + # Optional target to install private headers install-private-headers: libraries - @for i in "$(PRIVATE_INCLUDE_INSTALL_DIR)"; \ +@@ -1537,7 +1573,7 @@ + match=1; \ + fi; \ + done; \ +- if [ $$match -eq 0 ]; then echo $$i; fi \ ++ if [ $$match -eq 0 ]; then echo $$i; fi; \ + done + + # +@@ -1554,7 +1590,7 @@ + match=1; \ + fi; \ + done; \ +- if [ $$match -eq 0 ]; then echo $$i; fi \ ++ if [ $$match -eq 0 ]; then echo $$i; fi; \ + done + + # Property changes on: head/lang/tcl85/files/patch-unix-Makefile.in ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/lang/tcl85/pkg-plist.tm =================================================================== --- head/lang/tcl85/pkg-plist.tm (revision 308125) +++ head/lang/tcl85/pkg-plist.tm (revision 308126) @@ -1,9 +1,9 @@ -lib/tcl8/8.4/http-2.7.9.tm +lib/tcl8/8.4/http-2.7.10.tm lib/tcl8/8.4/platform/shell-1.1.4.tm lib/tcl8/8.4/platform-1.0.10.tm -lib/tcl8/8.5/msgcat-1.4.5.tm +lib/tcl8/8.5/msgcat-1.5.0.tm lib/tcl8/8.5/tcltest-2.3.4.tm @dirrmtry lib/tcl8/8.4/platform @dirrmtry lib/tcl8/8.4 @dirrmtry lib/tcl8/8.5 @dirrmtry lib/tcl8 Property changes on: head/lang/tcl85/pkg-plist.tm ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/x11-toolkits/tk85/Makefile =================================================================== --- head/x11-toolkits/tk85/Makefile (revision 308125) +++ head/x11-toolkits/tk85/Makefile (revision 308126) @@ -1,471 +1,471 @@ # New ports collection makefile for: tk # Date created: 17 January 2007 # Whom: Martin Matuska # # $FreeBSD$ # PORTNAME= tk -PORTVERSION= 8.5.12 +PORTVERSION= 8.5.13 CATEGORIES= x11-toolkits MASTER_SITES= SF/tcl/Tcl/${PORTVERSION} PKGNAMESUFFIX?= ${THREADS_SUFFIX} DISTNAME= ${PORTNAME}${PORTVERSION}-src MAINTAINER= jnagyjr1978@gmail.com COMMENT?= Graphical toolkit for Tcl LICENSE= BSD LICENSE_TERMS= ${WRKSRC}/../license.terms LATEST_LINK?= tk85 USE_XORG= x11 USE_LDCONFIG= yes WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//}/unix GNU_CONFIGURE= yes TK_VER= 8.5 SHORT_TK_VER= 85 CONFIGURE_ARGS= --enable-shared --includedir=${PREFIX}/include/tk${TK_VER} CONFIGURE_ENV= PORTSDIR=${PORTSDIR} TK_LIB_FILE=libtk${SHORT_TK_VER}.so.1 MAKE_ENV= SHORT_TK_VER=${SHORT_TK_VER} PLIST_SUB= TK_VER=${TK_VER} SHORT_TK_VER=${SHORT_TK_VER} NOPRECIOUSMAKEVARS= yes # Otherwise 'make readmes' is broken MANCOMPRESSED= no DATADIR= ${PREFIX}/share/${PORTNAME}${TK_VER} SUB_FILES= pkgIndex.tcl MAKE_JOBS_SAFE= yes .if !defined(BUILDING_TK_THREADS) USE_TCL= ${SHORT_TK_VER} OPTIONS_DEFINE= TK85_MAN XFT DEMOS OPTIONS_DEFAULT= XFT TK85_MAN_DESC= Install tk 8.5 function manpages -XFT_DESC= Use Xft fonts +XFT_DESC= Use Xft fonts DEMOS_DESC= Install demos .else USE_TK= ${SHORT_TK_VER} PLIST= ${PKGDIR}/pkg-plist.threads THREADS_SUFFIX= -threads LIB_DEPENDS= tcl${SHORT_TK_VER}${THREADS_SUFFIX}:${PORTSDIR}/lang/tcl${SHORT_TK_VER}-thread .endif SUB_LIST+= THREADS_SUFFIX="${THREADS_SUFFIX}" \ TCLPATCHLEVEL="${PORTVERSION}" .include DATADIR= ${PREFIX}/share/${PORTNAME}${TCL_VER} .if ${PORT_OPTIONS:MXFT} CONFIGURE_ARGS+= --enable-xft LIB_DEPENDS+= Xft.2:${PORTSDIR}/x11-fonts/libXft .else CONFIGURE_ARGS+= --disable-xft .endif MAN1= wish${TCL_VER}${THREADS_SUFFIX}.1 .if defined(BUILDING_TK_THREADS) CONFIGURE_ARGS+= --enable-threads --with-tcl=${LOCALBASE}/lib/tcl${TK_VER}${THREADS_SUFFIX} CONFIGURE_ENV+= PTHREAD_LIBS="${PTHREAD_LIBS}" PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ ac_cv_path_tclsh="${LOCALBASE}/bin/tclsh${TK_VER}${THREADS_SUFFIX}" LATEST_LINK= tk85${THREADS_SUFFIX} SUB_LIST+= TK_PROVIDE="; package provide Tk-threads ${TK_VER}" .else CONFIGURE_ARGS+= --disable-threads --with-tcl=${LOCALBASE}/lib/tcl${TK_VER} \ ac_cv_path_tclsh="${TCLSH}" SUB_LIST+= TK_PROVIDE="" .if ${PORT_OPTIONS:MDEMOS} INSTALL_TARGET+= install install-demos PLIST_SUB+= DEMOS="" .else PLIST_SUB+= DEMOS="@comment " .endif .if ${PORT_OPTIONS:MTK85_MAN} MAN3= 3DBorder.3 AddOption.3 BindTable.3 CanvPsY.3 CanvTkwin.3 \ CanvTxtInfo.3 Clipboard.3 ClrSelect.3 ConfigWidg.3 ConfigWind.3 \ CoordToWin.3 CrtConsoleChan.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 Inactive.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 SetCaret.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 ttk_Geometry.3 \ ttk_Theme.3 MANN= bell.n bind.n bindtags.n bitmap.n button.n canvas.n checkbutton.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 \ labelframe.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 panedwindow.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 \ ttk_button.n ttk_checkbutton.n ttk_combobox.n ttk_entry.n ttk_frame.n \ ttk_image.n ttk_intro.n ttk_label.n ttk_labelframe.n ttk_menubutton.n \ ttk_notebook.n ttk_panedwindow.n ttk_progressbar.n ttk_radiobutton.n \ ttk_scale.n ttk_scrollbar.n ttk_separator.n ttk_sizegrip.n \ ttk_spinbox.n ttk_style.n ttk_treeview.n ttk_vsapi.n ttk_widget.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 \ AddOption.3 Tk_AddOption.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_CanvasGetTextInfo.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_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 \ 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 \ 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_CreateAnonymousWindow.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_GetFontMetrics.3 \ FontId.3 Tk_PostscriptFontName.3 \ FreeXId.3 Tk_FreeXId.3 \ GeomReq.3 Tk_GeometryRequest.3 \ GeomReq.3 Tk_SetMinimumRequestSize.3 \ GeomReq.3 Tk_SetInternalBorder.3 \ GeomReq.3 Tk_SetInternalBorderEx.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 \ 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_GCForColor.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 \ GetHINSTANCE.3 Tk_GetHINSTANCE.3 \ GetHWND.3 Tk_AttachHWND.3 \ GetHWND.3 Tk_GetHWND.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 \ GetScroll.3 Tk_GetScrollInfoObj.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 \ Grab.3 Tk_Grab.3 \ Grab.3 Tk_Ungrab.3 \ HWNDToWindow.3 Tk_HWNDToWindow.3 \ HandleEvent.3 Tk_HandleEvent.3 \ IdToWindow.3 Tk_IdToWindow.3 \ ImgChanged.3 Tk_ImageChanged.3 \ Inactive.3 Tk_GetUserInactiveTime.3 \ Inactive.3 Tk_ResetUserInactiveTime.3 \ InternAtom.3 Tk_InternAtom.3 \ InternAtom.3 Tk_GetAtomName.3 \ MainLoop.3 Tk_MainLoop.3 \ MainWin.3 Tk_MainWindow.3 \ MainWin.3 Tk_GetNumMainWindows.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_CollapseMotionEvents.3 \ QWinEvent.3 Tk_QueueWindowEvent.3 \ Restack.3 Tk_RestackWindow.3 \ RestrictEv.3 Tk_RestrictEvents.3 \ SetAppName.3 Tk_SetAppName.3 \ SetCaret.3 Tk_SetCaretPos.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 \ 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 \ SetOptions.3 Tk_Offset.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 \ Tk_Init.3 Tk_SafeInit.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_MinReqWidth.3 \ WindowId.3 Tk_MinReqHeight.3 \ WindowId.3 Tk_InternalBorderLeft.3 \ WindowId.3 Tk_InternalBorderRight.3 \ WindowId.3 Tk_InternalBorderTop.3 \ WindowId.3 Tk_InternalBorderBottom.3 \ WindowId.3 Tk_Visual.3 \ WindowId.3 Tk_Depth.3 \ WindowId.3 Tk_Colormap.3 \ WindowId.3 Tk_Interp.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 \ 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 \ text.n tk_textCopy.n \ text.n tk_textCut.n \ text.n tk_textPaste.n .endif # ${PORT_OPTIONS:MTK85_MAN} .endif # defined(BUILDING_TK_THREADS) TKBASE?= ${PORTSDIR}/${PKGCATEGORY}/${LATEST_LINK} pre-everything:: @if ${TEST} -e "${NONEXISTENT}"; then ${ECHO_MSG} "=== Aborted, please remove ${NONEXISTENT}"; exit 1; fi post-patch: @${REINPLACE_CMD} -e 's|X11/Intrinsic.h|X11/Xlib.h|g' ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's|@TK_SHARED_BUILD@|#@TK_SHARED_BUILD@|g' ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} -e 's|@TK_SHARED_BUILD@|#@TK_SHARED_BUILD@|g; s|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e 's|wish |wish${TCL_VER}${THREADS_SUFFIX} |g' -e 's|Wish |Wish${TCL_VER}${THREADS_SUFFIX} |g' \ -e 's|wish\\fR|wish${TCL_VER}${THREADS_SUFFIX}\\fR|g' -e 's|Wish\\fR|Wish${TCL_VER}${THREADS_SUFFIX}\\fR|g' \ -e 's|^.so man.macros|.so ${DATADIR}/man.macros|' \ ${WRKSRC}/../doc/wish.1 .if defined(BUILDING_TK_THREADS) @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \ -e 's|$${TCL_TRIM_DOTS}|$${TCL_TRIM_DOTS}${THREADS_SUFFIX}|g' \ -e 's|-ltk$${TK_VERSION}|-ltk$${TK_VERSION}${THREADS_SUFFIX}|g' \ -e 's/-ltk`echo $${TK_VERSION} | tr -d .`/-ltk`echo $${TK_VERSION} | tr -d .`${THREADS_SUFFIX}/g' \ -e 's|-ltkstub$${TK_VERSION}|-ltkstub$${TK_VERSION}${THREADS_SUFFIX}|g' \ -e 's/-ltkstub`echo $${TK_VERSION} | tr -d .`/-ltkstub`echo $${TK_VERSION} | tr -d .`${THREADS_SUFFIX}/g' \ ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|libtk$${SHORT_TK_VER}|libtk$${SHORT_TK_VER}${THREADS_SUFFIX}|g' \ -e 's|/wish$$(VERSION)|/wish$$(VERSION)${THREADS_SUFFIX}|g' \ -e 's|/tkConfig.sh|/tkConfig${THREADS_SUFFIX}.sh|g' \ -e 's|$$(LIB_INSTALL_DIR)$$(TK_PKG_DIR)|${WRKDIR}|g' \ -e 's|$$(MINOR_VERSION)$$(TCLPATCHL)|$$(MINOR_VERSION)$$(TCLPATCHL)${THREADS_SUFFIX}|g' \ ${WRKSRC}/Makefile.in .endif post-configure: ${REINPLACE_CMD} \ -e 's|${WRKDIRPREFIX}${.CURDIR}|$${WRKDIRPREFIX}${TKBASE}|' \ ${WRKSRC}/tkConfig.sh ${REINPLACE_CMD} -e 's|-Wl,--rpath -Wl,/usr/local/lib||g' ${WRKSRC}/Makefile .if defined(BUILDING_TK_THREADS) do-install: @cd ${WRKSRC} && ${MAKE_ENV} ${MAKE} -f Makefile install-binaries @${MKDIR} ${PREFIX}/lib/tk${TK_VER}${THREADS_SUFFIX} @${LN} -s ${PREFIX}/lib/tk${TK_VER}/tkConfig${THREADS_SUFFIX}.sh \ ${PREFIX}/lib/tk${TK_VER}${THREADS_SUFFIX}/tkConfig.sh .endif post-install: ${INSTALL_DATA} ${WRKDIR}/pkgIndex.tcl ${PREFIX}/lib/tk${TK_VER}${THREADS_SUFFIX}/ ${MKDIR} ${DATADIR} ${INSTALL_DATA} ${WRKSRC}/../doc/man.macros ${DATADIR} ${MKDIR} ${MANPREFIX}/man/man1 ${INSTALL_MAN} ${WRKSRC}/../doc/wish.1 ${MANPREFIX}/man/man1/wish${TCL_VER}${THREADS_SUFFIX}.1 .if !defined(BUILDING_TK_THREADS) && ${PORT_OPTIONS:MTK85_MAN} . for mp in ${MAN3} ${MANN} @${REINPLACE_CMD} -e 's|^.so man.macros|.so ${DATADIR}/man.macros|' \ ${WRKSRC}/../doc/${mp} . endfor @cd ${WRKSRC} && ${MAKE} -f Makefile install-doc ${MAKE_ENV} .endif # !defined(BUILDING_TK_THREADS) && ${PORT_OPTIONS:MTK85_MAN} regression-test: build cd ${WRKSRC}; ${MAKE} test ${ECHO_CMD} "package require Tk" | tclsh${TK_VER} ${ECHO_CMD} "load libtk${SHORT_TK_VER}.so" | tclsh${TK_VER} .include Property changes on: head/x11-toolkits/tk85/Makefile ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/x11-toolkits/tk85/distinfo =================================================================== --- head/x11-toolkits/tk85/distinfo (revision 308125) +++ head/x11-toolkits/tk85/distinfo (revision 308126) @@ -1,2 +1,2 @@ -SHA256 (tk8.5.12-src.tar.gz) = c453d820925bf526bbe8a0d1c17ab3168b076fcb9844bea797ad75e3b9ad9291 -SIZE (tk8.5.12-src.tar.gz) = 3826062 +SHA256 (tk8.5.13-src.tar.gz) = 9e83ba2704ad73a65986eb7cdc51e432a5db6eca8d8691e33caceef40ed0c563 +SIZE (tk8.5.13-src.tar.gz) = 4086092 Property changes on: head/x11-toolkits/tk85/distinfo ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/x11-toolkits/tk85/files/patch-unix::Makefile.in =================================================================== --- head/x11-toolkits/tk85/files/patch-unix::Makefile.in (revision 308125) +++ head/x11-toolkits/tk85/files/patch-unix::Makefile.in (revision 308126) @@ -1,157 +1,147 @@ ---- Makefile.in.orig 2012-07-25 18:45:53.000000000 +0200 -+++ Makefile.in 2012-08-02 15:34:29.280510279 +0200 +--- Makefile.in.orig 2012-11-28 16:54:06.000000000 +0100 ++++ Makefile.in 2012-11-28 16:54:06.000000000 +0100 @@ -64,6 +64,8 @@ # Directory in which to install the include file tk.h: INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir) +GENERIC_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/generic +UNIX_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/unix # Path to the private tk header dir: PRIVATE_INCLUDE_DIR = @PRIVATE_INCLUDE_DIR@ -@@ -100,7 +102,7 @@ +@@ -100,11 +102,11 @@ # The directory containing the Tcl sources and headers appropriate # for this version of Tk ("srcdir" will be replaced or has already # been replaced by the configure script): -TCL_GENERIC_DIR = @TCL_SRC_DIR@/generic -+TCL_GENERIC_DIR = @prefix@/include/tcl@TCL_VERSION@/generic ++TCL_GENERIC_DIR = %%LOCALBASE%%/include/tcl@TCL_VERSION@/generic # The directory containing the platform specific Tcl sources and headers # appropriate for this version of Tk: +-TCL_PLATFORM_DIR = @TCL_SRC_DIR@/unix ++TCL_PLATFORM_DIR = %%LOCALBASE%%/inclue/tcl@TCL_VERSION@/unix + + # The directory containing the Tcl library archive file appropriate + # for this version of Tk: @@ -114,7 +116,7 @@ TCL_LIB_FLAG = @TCL_LIB_FLAG@ # Flag, 1: we're building a shared lib, 0 we're not -TK_SHARED_BUILD = @TK_SHARED_BUILD@ -+TK_SHARED_BUILD = ###@TK_SHARED_BUILD@ ++TK_SHARED_BUILD = ####@TK_SHARED_BUILD@ # Subdirectory of $(libdir) containing the pkgIndex.tcl file for loadable Tk TK_PKG_DIR = @TK_PKG_DIR@ -@@ -137,7 +139,7 @@ - #CFLAGS = $(CFLAGS_DEBUG) - #CFLAGS = $(CFLAGS_OPTIMIZE) - #CFLAGS = $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE) --CFLAGS = @CFLAGS_DEFAULT@ @CFLAGS@ -+CFLAGS += @CFLAGS_DEFAULT@ @CFLAGS@ - - # Flags to pass to the linker - LDFLAGS_DEBUG = @LDFLAGS_DEBUG@ -@@ -272,7 +274,7 @@ +@@ -274,7 +276,7 @@ STLIB_LD = @STLIB_LD@ SHLIB_LD = @SHLIB_LD@ SHLIB_LD_LIBS = @SHLIB_LD_LIBS@ -TK_SHLIB_LD_EXTRAS = @TK_SHLIB_LD_EXTRAS@ +TK_SHLIB_LD_EXTRAS = @TCL_SHLIB_LD_EXTRAS@ # Additional search flags needed to find the various shared libraries # at run-time. The first symbol is for use when creating a binary -@@ -557,6 +559,8 @@ +@@ -546,6 +548,8 @@ DEMOPROGS = browse hello ixset rmt rolodex square tcolor timer widget +INSTALL_HDRS = tk.h tkDecls.h tkInt.h tkIntDecls.h tkIntXlibDecls.h + SHELL_ENV = \ @LD_LIBRARY_PATH_VAR@="`pwd`:${TCL_BIN_DIR}:$${@LD_LIBRARY_PATH_VAR@}"; \ export @LD_LIBRARY_PATH_VAR@; \ -@@ -580,6 +584,12 @@ +@@ -568,6 +572,12 @@ ${LIB_FILE}: ${OBJS} ${STUB_LIB_FILE} @LIB_RSRC_FILE@ rm -f $@ @MAKE_LIB@ + ln -sf @TK_LIB_FILE@ libtk${SHORT_TK_VER}.so + +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 $@ -@@ -690,7 +700,7 @@ - valgrindshell: $(TKTEST_EXE) - $(SHELL_ENV) valgrind $(VALGRINDARGS) ./$(TKTEST_EXE) $(SCRIPT) +@@ -672,8 +682,7 @@ + INSTALL_DEV_TARGETS = install-headers + INSTALL_DEMO_TARGETS = install-demos + INSTALL_EXTRA_TARGETS = @EXTRA_INSTALL@ +-INSTALL_TARGETS = $(INSTALL_BASE_TARGETS) $(INSTALL_DOC_TARGETS) $(INSTALL_DEV_TARGETS) \ +- $(INSTALL_DEMO_TARGETS) $(INSTALL_EXTRA_TARGETS) ++INSTALL_TARGETS = $(INSTALL_BASE_TARGETS) $(INSTALL_DEV_TARGETS) $(INSTALL_EXTRA_TARGETS) --INSTALL_TARGETS = install-binaries install-libraries install-demos install-doc @EXTRA_INSTALL@ -+INSTALL_TARGETS = install-binaries install-libraries @EXTRA_INSTALL@ - install: $(INSTALL_TARGETS) -@@ -703,7 +713,7 @@ +@@ -686,7 +695,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) ${WISH_EXE} +install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) ${WISH_EXE} libtk${SHORT_TK_VER}.a @for i in "$(LIB_INSTALL_DIR)" "$(BIN_INSTALL_DIR)" \ "$(PKG_INSTALL_DIR)" "$(CONFIG_INSTALL_DIR)" ; \ do \ -@@ -738,14 +748,19 @@ +@@ -717,14 +726,19 @@ @echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/" @@INSTALL_LIB@ @chmod 555 "$(DLL_INSTALL_DIR)/$(LIB_FILE)" + @ln -sf $(DLL_INSTALL_DIR)/$(TK_LIB_FILE) $(DLL_INSTALL_DIR)/libtk${SHORT_TK_VER}.so + @echo "Installing libtk${SHORT_TK_VER}.a" + @$(INSTALL_DATA) libtk${SHORT_TK_VER}.a $(DLL_INSTALL_DIR)/libtk${SHORT_TK_VER}.a -+ @chmod 555 $(DLL_INSTALL_DIR)/libtk${SHORT_TK_VER}.a ++ @chmod 555 $(DLL_INSTALL_DIR)/libtk${SHORT_TK_VER}.a @if test -f "tk${MAJOR_VERSION}${MINOR_VERSION}.dll"; then \ - $(INSTALL_LIBRARY) "${TOP_DIR}/win/tk${MAJOR_VERSION}${MINOR_VERSION}.dll" "$(DLL_INSTALL_DIR)";\ + $(INSTALL_LIBRARY) "tk${MAJOR_VERSION}${MINOR_VERSION}.dll" "$(DLL_INSTALL_DIR)";\ chmod 555 "$(DLL_INSTALL_DIR)/tk${MAJOR_VERSION}${MINOR_VERSION}.dll";\ fi - @echo "Installing ${WISH_EXE} as $(BIN_INSTALL_DIR)/wish$(VERSION)@EXEEXT@" - @$(INSTALL_PROGRAM) ${WISH_EXE} "$(BIN_INSTALL_DIR)/wish$(VERSION)@EXEEXT@" + @echo "Installing ${WISH_EXE} as $(BIN_INSTALL_DIR)/wish$(VERSION)${EXE_SUFFIX}" + @$(INSTALL_PROGRAM) ${WISH_EXE} "$(BIN_INSTALL_DIR)/wish$(VERSION)${EXE_SUFFIX}" - @echo "Installing tkConfig.sh to $(CONFIG_INSTALL_DIR)/" - @$(INSTALL_DATA) tkConfig.sh "$(CONFIG_INSTALL_DIR)/tkConfig.sh" + @echo "Installing tkConfig.sh to $(CONFIG_INSTALL_DIR)/tk$(VERSION)" -+ @mkdir -p "$(CONFIG_INSTALL_DIR)"/tk$(VERSION) -+ @$(INSTALL_DATA) tkConfig.sh "$(LIB_INSTALL_DIR)"/tk$(VERSION)/tkConfig.sh ++ @mkdir -p "${CONFIG_INSTALL_DIR}"/tk$(VERSION) ++ @$(INSTALL_DATA) tkConfig.sh "$(CONFIG_INSTALL_DIR)/tk$(VERSION)/tkConfig.sh" @if test "$(STUB_LIB_FILE)" != "" ; then \ echo "Installing $(STUB_LIB_FILE) to $(LIB_INSTALL_DIR)/"; \ @INSTALL_STUB_LIB@ ; \ -@@ -756,6 +771,7 @@ - @if test "$(@TK_WINDOWINGSYSTEM@_XLIB_HDRS)" != ""; then \ - XLIB_INCLUDE_INSTALL_DIR="$(INCLUDE_INSTALL_DIR)/X11"; fi; \ - for i in "$(INCLUDE_INSTALL_DIR)" "$${XLIB_INCLUDE_INSTALL_DIR}" \ -+ "$(GENERIC_INCLUDE_INSTALL_DIR)" "$(UNIX_INCLUDE_INSTALL_DIR)" \ - "$(SCRIPT_INSTALL_DIR)" "$(SCRIPT_INSTALL_DIR)/images" \ - "$(SCRIPT_INSTALL_DIR)/msgs" "$(SCRIPT_INSTALL_DIR)/ttk"; \ - do \ -@@ -770,10 +786,14 @@ - chmod +x $(SRC_DIR)/install-sh; \ - fi - @echo "Installing header files"; -- @for i in $(PUBLIC_HDRS); \ -+ ${BSD_INSTALL_DATA} $(GENERIC_DIR)/*.h "$(GENERIC_INCLUDE_INSTALL_DIR)"/ -+ ${BSD_INSTALL_DATA} $(UNIX_DIR)/*.h "$(UNIX_INCLUDE_INSTALL_DIR)"/ -+ @for i in $(INSTALL_HDRS) ; \ - do \ -- $(INSTALL_DATA) $$i "$(INCLUDE_INSTALL_DIR)"; \ -- done; -+ j=`basename $$i` ; \ -+ ln -sf "$(GENERIC_INCLUDE_INSTALL_DIR)"/$$j "$(INCLUDE_INSTALL_DIR)"/$$j ; \ -+ done -+ - @list='$(@TK_WINDOWINGSYSTEM@_XLIB_HDRS)'; for i in $$list ; \ - do \ - $(INSTALL_DATA) $$i "$(INCLUDE_INSTALL_DIR)/X11"; \ -@@ -850,19 +870,15 @@ - else true; \ +@@ -812,22 +826,19 @@ fi; \ done; -- @echo "Installing and cross-linking top-level (.1) docs"; + @echo "Installing and cross-linking top-level (.1) docs to $(MAN1_INSTALL_DIR)/"; - @for i in $(TOP_DIR)/doc/*.1; do \ - $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MAN1_INSTALL_DIR)"; \ - done - - @echo "Installing and cross-linking C API (.3) docs"; + @echo "Installing and cross-linking C API (.3) docs to $(MAN3_INSTALL_DIR)/"; @for i in $(TOP_DIR)/doc/*.3; do \ - $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MAN3_INSTALL_DIR)"; \ + $(BSD_INSTALL_MAN) $$i "$(MAN3_INSTALL_DIR)"; \ done - - @echo "Installing and cross-linking command (.n) docs"; + @echo "Installing and cross-linking command (.n) docs to $(MANN_INSTALL_DIR)/"; @for i in $(TOP_DIR)/doc/*.n; do \ - $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MANN_INSTALL_DIR)"; \ + $(BSD_INSTALL_MAN) $$i "$(MANN_INSTALL_DIR)"; \ done - # Optional target to install private headers + install-headers: + @if test "$(@TK_WINDOWINGSYSTEM@_XLIB_HDRS)" != ""; then \ + XLIB_INCLUDE_INSTALL_DIR="$(INCLUDE_INSTALL_DIR)"/X11; fi; \ +- for i in "$(INCLUDE_INSTALL_DIR)" "$${XLIB_INCLUDE_INSTALL_DIR}"; \ ++ for i in "$(INCLUDE_INSTALL_DIR)" "$${XLIB_INCLUDE_INSTALL_DIR}" "$(GENERIC_INCLUDE_INSTALL_DIR)" "$(UNIX_INCLUDE_INSTALL_DIR)"; \ + do \ + if [ -n "$$i" -a ! -d "$$i" ] ; then \ + echo "Making directory $$i"; \ +@@ -836,9 +847,12 @@ + fi; \ + done; + @echo "Installing header files to $(INCLUDE_INSTALL_DIR)/"; +- @for i in $(PUBLIC_HDRS); \ ++ ${BSD_INSTALL_DATA} $(GENERIC_DIR)/*.h "$(GENERIC_INCLUDE_INSTALL_DIR)"/ ++ ${BSD_INSTALL_DATA} $(UNIX_DIR)/*.h "$(UNIX_INCLUDE_INSTALL_DIR)"/ ++ @for i in $(INSTALL_HDRS); \ + do \ +- $(INSTALL_DATA) $$i "$(INCLUDE_INSTALL_DIR)"; \ ++ j=`basename $$i`; \ ++ ln -sf "$(GENERIC_INCLUDE_INSTALL_DIR)"/$$j "$(INCLUDE_INSTALL_DIR)"/$$j ; \ + done; + @list='$(@TK_WINDOWINGSYSTEM@_XLIB_HDRS)'; for i in $$list ; \ + do \ Property changes on: head/x11-toolkits/tk85/files/patch-unix::Makefile.in ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property