diff options
42 files changed, 446 insertions, 3314 deletions
@@ -4053,3 +4053,10 @@ japanese/vflib||2013-02-06|Has expired: No more public distfiles graphics/py-visual||2013-02-06|Has expired: Depends on the expired x11-toolkits/gtkglarea math/gnuplot+||2013-02-06|Upstream says: This package is obsolete. The author does not recommend to use it science/vis5d+||2013-02-06|No new release since 2001, depends on expired x11-toolkits/gtkglarea +lang/tcl-modules|||2013-02-06|Modules are now part of the base Tcl distributions +lang/tcl84-thread||2013-02-06|Threads are now enabled by default +lang/tcl85-thread||2013-02-06|Threads are now enabled by default +lang/tcl86-thread||2013-02-06|Threads are now enabled by default +x11-toolkits/tk84-thread||2013-02-06|Threads are now enabled by default +x11-toolkits/tk85-thread||2013-02-06|Threads are now enabled by default +x11-toolkits/tk86-thread||2013-02-06|Threads are now enabled by default diff --git a/Mk/bsd.tcl.mk b/Mk/bsd.tcl.mk index 8d046c5995b8..caec666ad0ba 100644 --- a/Mk/bsd.tcl.mk +++ b/Mk/bsd.tcl.mk @@ -38,13 +38,6 @@ Tcl_Include_MAINTAINER= mm@FreeBSD.org # NOTE: INVALID_TCL_VER takes precedence # <UNIQUENAME>_WITH_TCL_VER - User defined port specific variable to set Tcl version ## -# USE_TCL_THREADS - If defined, Tcl a threaded version of tcl is required. -# NOTE: support for threaded builds starts with version 84 -# USE_TCL_NO_THREADS - If defined, port may not use a threaded Tcl, even if requested via -# USE_TCL_THREADS or WITH_TCL_THREADS -# WITH_TCL_THREADS - User defined variable to use Tcl with threads -# <UNIQUENAME>_WITH_TCL_THREADS - User defined port specific variable to require Tcl with threads -## # TCL_VER - Detected by bsd.tcl.mk. Contains the version number of Tcl to be used. # ## @@ -79,14 +72,6 @@ Tcl_Include_MAINTAINER= mm@FreeBSD.org # <UNIQUENAME>_WITH_TK_VER - User defined port specific variable to set Tk version # NOTE: overrides <UNIQUENAME>_WITH_TCL_VER. ## -# USE_TK_THREADS - Tk has to obey tcl in threads. A threaded Tk requires -# a threaded Tcl and a non-threaded Tcl requires a non-threaded Tk. -# This variable defines USE_TCL_THREADS -# USE_TK_NO_THREADS - If defined, port may not use a threaded Tk, even if requested via -# USE_TK_THREADS or WITH_TK_THREADS. Defines USE_TCL_NO_THREADS -# WITH_TK_THREADS - User defined variable to use Tk with threads -# <UNIQUENAME>_WITH_TK_THREADS - User defined port specific variable to require Tk with threads -### # TCL_LIBDIR - Path where tcl libraries can be found # # TCL_INCLUDEDIR - Path where tcl C headers can be found @@ -142,24 +127,6 @@ _TK_BUILD_DEPENDS= yes . endif .endif -# Set WITH_TCL_THREADS or WITH_TK_THREADS if port-specific define -. if defined(${UNIQUENAME:U:S,-,_,}_WITH_TCL_THREADS) -WITH_TCL_THREADS= yes -. endif -. if defined(${UNIQUENAME:U:S,-,_,}_WITH_TK_THREADS) -WITH_TK_THREADS= yes -.endif - -# If a threaded Tcl or Tk is requested we require a threaded Tcl -. if !defined(USE_TK_NO_THREADS) && !defined(USE_TCL_NO_THREADS) -. if defined(USE_TCL_THREADS) || defined(USE_TK_THREADS) -USE_TCL_THREADS= yes -. endif -. if defined(WITH_TK_THREADS) -WITH_TCL_THREADS= ${WITH_TK_THREADS} -. endif -. endif - # Override the global WITH_TCL_VER or WITH_TK_VER with the # port specific <UNIQUENAME>_WITH_TCL_VER or <UNIQUENAME>_WITH_TK_VER . if defined(${UNIQUENAME:U:S,-,_,}_WITH_TCL_VER) @@ -192,9 +159,7 @@ INVALID_TCL_VER:= ${INVALID_TK_VER} _TCL_DEFAULT_VERSION= 85 _TCL_VERSIONS= 86 85 84 83 -_TCL_THREADS_VERSIONS= 86 85 84 _TCL_RANGE_VERSIONS= 86+ 85+ 84+ 83+ -_TCL_THREADS_RANGE_VERSIONS= 86+ 85+ 84+ # For specifying [85, 84, ..]+ _TCL_83P= 83 84 85 86 @@ -207,47 +172,6 @@ _TCL_86P= 86 USE_TCL= ${_TCL_DEFAULT_VERSION} . endif -# Support for obsolete 84-thread and 85-thread definitions -. if ${USE_TCL} == "84-thread" || ${USE_TCL} == "85-thread" -USE_TCL:= ${USE_TCL:S/-thread//} -USE_TCL_THREADS= yes -. endif - -# Ignore WITH_TCL_THREADS if USE_TCL is -# not in _TCL_THREADS_VERSIONS or _TCL_RANGE_VERSIONS -. if defined(WITH_TCL_THREADS) -. for ver in ${_TCL_THREADS_VERSIONS} ${_TCL_RANGE_VERSIONS} -. if ${USE_TCL} == "${ver}" -USE_TCL_THREADS= yes -. endif -. endfor -. endif - -# Check if a build with threads is required -. if !defined(USE_TCL_NO_THREADS) && !defined(USE_TK_NO_THREADS) && !defined(BUILDING_TCL_THREADS) && !defined(BUILDING_TK_THREADS) -. if defined(USE_TCL_THREADS) -_TCL_THREADS_PORT= -thread -_TCL_THREADS_SUFFIX= -threads - -# Threaded Tcl/Tk accepts only ranges starting with 84+ -# reset the range to 84+ if the value is lower -. for ver in ${_TCL_RANGE_VERSIONS} -. if ${USE_TCL} == "${ver}" -_TCL_T_BAD_RANGE= yes -. for tver in ${_TCL_THREADS_RANGE_VERSIONS} -. if ${USE_TCL} == "${tver}" -_TCL_T_BAD_RANGE= no -. endif -. endfor -. endif -. endfor -. if defined(_TCL_T_BAD_RANGE) && ${_TCL_T_BAD_RANGE} == "yes" -USE_TCL= 84+ -. endif - -. endif -. endif - _TCL_VER= no # Check if we have user-defined WITH_TCL_VER and if it matches @@ -343,38 +267,26 @@ _FOUND= yes . endif . endfor -. if ${_FOUND} == "yes" && defined(USE_TCL_THREADS) -_FOUND= no -_THREADED_NOT_FOUND= yes -. for ver in ${_TCL_THREADS_VERSIONS} -. if ${USE_TCL} == "${ver}" && ${_FOUND} == "no" -_FOUND= yes -. endif -. endfor -. endif - . if ${_FOUND} == "yes" TCL_INCLUDEDIR= ${LOCALBASE}/include/tcl${TCL_VER} -TCL_LIBDIR= ${LOCALBASE}/lib/tcl${TCL_VER}${_TCL_THREADS_SUFFIX} -TCLSH= ${LOCALBASE}/bin/tclsh${TCL_VER}${_TCL_THREADS_SUFFIX} +TCL_LIBDIR= ${LOCALBASE}/lib/tcl${TCL_VER} +TCLSH= ${LOCALBASE}/bin/tclsh${TCL_VER} # Add dependencies . if !defined(_TK_ONLY) . if !defined(_TCL_RUN_DEPENDS) && !defined(_TCL_BUILD_DEPENDS) -LIB_DEPENDS+= tcl${USE_TCL}${_TCL_THREADS_SUFFIX}:${PORTSDIR}/lang/tcl${USE_TCL}${_TCL_THREADS_PORT} +LIB_DEPENDS+= tcl${USE_TCL}:${PORTSDIR}/lang/tcl${USE_TCL} . else . if defined(_TCL_BUILD_DEPENDS) -BUILD_DEPENDS+= tclsh${TCL_VER}${_TCL_THREADS_SUFFIX}:${PORTSDIR}/lang/tcl${USE_TCL}${_TCL_THREADS_PORT} +BUILD_DEPENDS+= tclsh${TCL_VER}:${PORTSDIR}/lang/tcl${USE_TCL} . endif . if defined(_TCL_RUN_DEPENDS) -RUN_DEPENDS+= tclsh${TCL_VER}${_TCL_THREADS_SUFFIX}:${PORTSDIR}/lang/tcl${USE_TCL}${_TCL_THREADS_PORT} +RUN_DEPENDS+= tclsh${TCL_VER}:${PORTSDIR}/lang/tcl${USE_TCL} . endif . endif . endif -. elif defined(_THREADED_NOT_FOUND) && !defined(IGNORE) -IGNORE= the defined version of Tcl/Tk does not support threads: ${USE_TCL} . elif !defined(IGNORE) IGNORE= unknown Tcl/Tk version specified: ${USE_TCL} . endif @@ -389,19 +301,19 @@ USE_TK:= ${USE_TCL} TK_VER:= ${USE_TCL:S/8/8./} . if !defined(_TK_RUN_DEPENDS) && !defined(_TK_BUILD_DEPENDS) -LIB_DEPENDS+= tk${USE_TK}${_TCL_THREADS_SUFFIX}:${PORTSDIR}/x11-toolkits/tk${USE_TK}${_TCL_THREADS_PORT} +LIB_DEPENDS+= tk${USE_TK}:${PORTSDIR}/x11-toolkits/tk${USE_TK} . else . if defined(_TK_BUILD_DEPENDS) -BUILD_DEPENDS+= wish${TK_VER}${_TCL_THREADS_SUFFIX}:${PORTSDIR}/x11-toolkits/tk${USE_TK}${_TCL_THREADS_PORT} +BUILD_DEPENDS+= wish${TK_VER}:${PORTSDIR}/x11-toolkits/tk${USE_TK} . endif . if defined(_TK_RUN_DEPENDS) -RUN_DEPENDS+= wish${TK_VER}${_TCL_THREADS_SUFFIX}:${PORTSDIR}/x11-toolkits/tk${USE_TK}${_TCL_THREADS_PORT} +RUN_DEPENDS+= wish${TK_VER}:${PORTSDIR}/x11-toolkits/tk${USE_TK} . endif . endif TK_INCLUDEDIR= ${LOCALBASE}/include/tk${TK_VER} -TK_LIBDIR= ${LOCALBASE}/lib/tk${TK_VER}${_TCL_THREADS_SUFFIX} -WISH= ${LOCALBASE}/bin/wish${TK_VER}${_TCL_THREADS_SUFFIX} +TK_LIBDIR= ${LOCALBASE}/lib/tk${TK_VER} +WISH= ${LOCALBASE}/bin/wish${TK_VER} . endif # defined(USE_TK) . endif # defined(USE_TCL) @@ -5,6 +5,32 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20130206: + AFFECTS: users of Tcl/Tk + AUTHOR: gahr@FreeBSD.org + + The following ports have been removed, as threads and modules are + now included in the main ports: + + - lang/tcl84-thread + - lang/tcl85-thread + - lang/tcl86-thread + - lang/tcl-modules + - x11-toolkits/tk84-thread + - x11-toolkits/tk85-thread + - x11-toolkits/tk86-thread + + Please rebuild all ports that depends on them: + + If you use portmaster: + portmaster -w -r <port> + + If you use portupgrade: + portupgrade -fr <origin/port> + + If you use pkgng with binary packages: + pkg install -fR <origin/port> + 20130205: AFFECTS: users of lang/ghc and */hs-* AUTHOR: haskell@FreeBSD.org diff --git a/lang/Makefile b/lang/Makefile index 8dac5ccf88cb..c32c5629c493 100644 --- a/lang/Makefile +++ b/lang/Makefile @@ -340,15 +340,11 @@ SUBDIR += t3x SUBDIR += tcc SUBDIR += tcl-manual - SUBDIR += tcl-modules SUBDIR += tcl-wrapper SUBDIR += tcl83 SUBDIR += tcl84 - SUBDIR += tcl84-thread SUBDIR += tcl85 - SUBDIR += tcl85-thread SUBDIR += tcl86 - SUBDIR += tcl86-thread SUBDIR += tclX SUBDIR += tcltutor SUBDIR += tinypy diff --git a/lang/tcl-modules/Makefile b/lang/tcl-modules/Makefile deleted file mode 100644 index 3456f8937481..000000000000 --- a/lang/tcl-modules/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -# Created by: Martin Matuska <mm@FreeBSD.org> -# $FreeBSD$ - -PORTNAME= tcl-modules -PORTREVISION= - -MAINTAINER= tcltk@FreeBSD.org -COMMENT= Tcl common modules - -BUILDING_TCL_TM= yes - -MASTERDIR= ${.CURDIR}/../tcl85 - -.include "${MASTERDIR}/Makefile" diff --git a/lang/tcl84-thread/Makefile b/lang/tcl84-thread/Makefile deleted file mode 100644 index 19bafc8daac6..000000000000 --- a/lang/tcl84-thread/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -# Created by: Pav Lucistnik <pav@FreeBSD.org> -# $FreeBSD$ - -PORTNAME= tcl - -MAINTAINER= tcltk@FreeBSD.org -COMMENT= Tool command language (threads support) - -BUILDING_TCL_THREADS= yes - -MASTERDIR= ${.CURDIR}/../tcl84 - -.include "${MASTERDIR}/Makefile" diff --git a/lang/tcl84/Makefile b/lang/tcl84/Makefile index 9af6705a3bf4..e855b7dc1323 100644 --- a/lang/tcl84/Makefile +++ b/lang/tcl84/Makefile @@ -7,7 +7,6 @@ PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= lang tcl MASTER_SITES= SF/tcl/Tcl/${PORTVERSION} -PKGNAMESUFFIX?= ${THREADS_SUFFIX}${PKGNAMESUFFIX2} DISTNAME= ${PORTNAME}${PORTVERSION}-src MAINTAINER= tcltk@FreeBSD.org @@ -15,665 +14,53 @@ COMMENT?= Tool Command Language LICENSE= BSD -LATEST_LINK?= tcl84 -PATCH_DIST_ARGS= -d ${WRKDIR}/${DISTNAME} -E ${PATCH_DIST_STRIP} +OPTIONS_DEFINE= TCLMAN THREADS +OPTIONS_DEFAULT=THREADS +TCLMAN_DESC= Install Tcl function manpages + WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERSION}/unix -ALL_TARGET= all # test + +ALL_TARGET= all +INSTALL_TARGET= install install-libraries + USE_LDCONFIG= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --enable-shared --includedir=${PREFIX}/include/tcl${TCL_VER} +CONFIGURE_ARGS= --enable-shared \ + --enable-man-suffix=.${MAN_SUFFIX} \ + --includedir=${PREFIX}/include/tcl${TCL_VER} CONFIGURE_ENV= PORTSDIR=${PORTSDIR} + TCL_VER= 8.4 SHORT_TCL_VER= ${TCL_VER:S/8./8/} -MAKE_ENV= SHORT_TCL_VER="${SHORT_TCL_VER}" LANG=C LC_ALL=C # LANG=C is required for some of UTF-using tests -NOPRECIOUSMAKEVARS= Too many _MLINKS for README.html -PLIST_SUB= TCL_VER="${TCL_VER}" SHORT_TCL_VER="${SHORT_TCL_VER}" -EXTRACT_AFTER_ARGS=|${TAR} -xpf - --exclude compat/ +LATEST_LINK= ${PORTNAME}${SHORT_TCL_VER} +MAN_SUFFIX= ${LATEST_LINK} -.if !defined(BUILDING_TCL_THREADS) -OPTIONS_DEFINE= TCL84_MAN -TCL84_MAN_DESC= Install tcl 8.4 function manpages -.else -USE_TCL= ${SHORT_TCL_VER} -PLIST= ${PKGDIR}/pkg-plist.threads -THREADS_SUFFIX= -threads -LATEST_LINK= tcl84${THREADS_SUFFIX} -.endif +MAKE_ENV= SHORT_TCL_VER="${SHORT_TCL_VER}" \ + MAN_SUFFIX=.${MAN_SUFFIX} \ + LANG=C LC_ALL=C # LANG=C is required for some of UTF-using tests -.include <bsd.port.pre.mk> +PLIST_SUB= TCL_VER=${TCL_VER} \ + SHORT_TCL_VER=${SHORT_TCL_VER} -DATADIR= ${PREFIX}/share/${PORTNAME}${TCL_VER} +.include <bsd.port.options.mk> -.if !defined(NO_INSTALL_MANPAGES) -MAN1= tclsh${TCL_VER}${THREADS_SUFFIX}.1 +.if ${PORT_OPTIONS:MTCLMAN} +INSTALL_TARGET+=install-doc +.include "${.CURDIR}/Makefile.man" .endif -.if defined(BUILDING_TCL_THREADS) +.if ${PORT_OPTIONS:MTHREADS} CONFIGURE_ARGS+= --enable-threads -CONFIGURE_ENV+= PTHREAD_LIBS="${PTHREAD_LIBS}" PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" .else CONFIGURE_ARGS+= --disable-threads - -.if !defined(NO_INSTALL_MANPAGES) && ${PORT_OPTIONS:MTCL84_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 DoOneEvent.3 DoWhenIdle.3 DoubleObj.3 DumpActiveMemory.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 \ - GetTime.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 \ - 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 array.n bgerror.n binary.n break.n case.n \ - catch.n cd.n clock.n close.n concat.n continue.n dde.n encoding.n \ - eof.n error.n eval.n exec.n exit.n expr.n fblocked.n fconfigure.n \ - fcopy.n file.n fileevent.n filename.n flush.n for.n foreach.n \ - format.n gets.n glob.n global.n history.n http.n if.n incr.n info.n \ - interp.n join.n lappend.n library.n lindex.n linsert.n list.n \ - llength.n load.n lrange.n lreplace.n lsearch.n lset.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" $3,$4,"\\"}' 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 \ - 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_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_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_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 \ - CrtChannel.3 Tcl_ChannelBuffered.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_GetCommandInfoFromToken.3 \ - CrtObjCmd.3 Tcl_SetCommandInfo.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 \ - 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_ExternalToUtfDString.3 \ - Encoding.3 Tcl_ExternalToUtf.3 \ - Encoding.3 Tcl_UtfToExternalDString.3 \ - Encoding.3 Tcl_UtfToExternal.3 \ - Encoding.3 Tcl_WinTCharToUtf.3 \ - Encoding.3 Tcl_WinUtfToTChar.3 \ - Encoding.3 Tcl_GetEncodingName.3 \ - Encoding.3 Tcl_SetSystemEncoding.3 \ - Encoding.3 Tcl_GetEncodingNames.3 \ - Encoding.3 Tcl_CreateEncoding.3 \ - Encoding.3 Tcl_GetDefaultEncodingDir.3 \ - Encoding.3 Tcl_SetDefaultEncodingDir.3 \ - 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 \ - 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_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 \ - 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 \ - Interp.3 Tcl_Interp.3 \ - LinkVar.3 Tcl_LinkVar.3 \ - LinkVar.3 Tcl_UnlinkVar.3 \ - LinkVar.3 Tcl_UpdateLinkedVar.3 \ - ListObj.3 Tcl_ListObjAppendList.3 \ - ListObj.3 Tcl_ListObjAppendElement.3 \ - ListObj.3 Tcl_NewListObj.3 \ - ListObj.3 Tcl_SetListObj.3 \ - ListObj.3 Tcl_ListObjGetElements.3 \ - ListObj.3 Tcl_ListObjLength.3 \ - ListObj.3 Tcl_ListObjIndex.3 \ - ListObj.3 Tcl_ListObjReplace.3 \ - 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 \ - 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_WriteObj.3 \ - OpenFileChnl.3 Tcl_WriteChars.3 \ - OpenFileChnl.3 Tcl_Write.3 \ - OpenFileChnl.3 Tcl_Flush.3 \ - OpenFileChnl.3 Tcl_Seek.3 \ - OpenFileChnl.3 Tcl_Tell.3 \ - OpenFileChnl.3 Tcl_GetChannelOption.3 \ - OpenFileChnl.3 Tcl_SetChannelOption.3 \ - OpenFileChnl.3 Tcl_Eof.3 \ - OpenFileChnl.3 Tcl_InputBlocked.3 \ - OpenFileChnl.3 Tcl_InputBuffered.3 \ - OpenFileChnl.3 Tcl_OutputBuffered.3 \ - OpenFileChnl.3 Tcl_Ungets.3 \ - OpenFileChnl.3 Tcl_ReadRaw.3 \ - OpenFileChnl.3 Tcl_WriteRaw.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 \ - ParseCmd.3 Tcl_EvalTokensStandard.3 \ - PkgRequire.3 Tcl_PkgRequire.3 \ - PkgRequire.3 Tcl_PkgRequireEx.3 \ - PkgRequire.3 Tcl_PkgPresent.3 \ - PkgRequire.3 Tcl_PkgPresentEx.3 \ - PkgRequire.3 Tcl_PkgProvide.3 \ - PkgRequire.3 Tcl_PkgProvideEx.3 \ - Preserve.3 Tcl_Preserve.3 \ - Preserve.3 Tcl_Release.3 \ - Preserve.3 Tcl_EventuallyFree.3 \ - PrintDbl.3 Tcl_PrintDouble.3 \ - RecEvalObj.3 Tcl_RecordAndEvalObj.3 \ - RecordEval.3 Tcl_RecordAndEval.3 \ - RegExp.3 Tcl_RegExpMatch.3 \ - RegExp.3 Tcl_RegExpCompile.3 \ - RegExp.3 Tcl_RegExpExec.3 \ - RegExp.3 Tcl_RegExpRange.3 \ - RegExp.3 Tcl_GetRegExpFromObj.3 \ - RegExp.3 Tcl_RegExpMatchObj.3 \ - RegExp.3 Tcl_RegExpExecObj.3 \ - RegExp.3 Tcl_RegExpGetInfo.3 \ - SaveResult.3 Tcl_SaveResult.3 \ - SaveResult.3 Tcl_RestoreResult.3 \ - SaveResult.3 Tcl_DiscardResult.3 \ - SetErrno.3 Tcl_SetErrno.3 \ - SetErrno.3 Tcl_GetErrno.3 \ - SetErrno.3 Tcl_ErrnoId.3 \ - SetErrno.3 Tcl_ErrnoMsg.3 \ - SetRecLmt.3 Tcl_SetRecursionLimit.3 \ - SetResult.3 Tcl_SetObjResult.3 \ - SetResult.3 Tcl_GetObjResult.3 \ - SetResult.3 Tcl_SetResult.3 \ - SetResult.3 Tcl_GetStringResult.3 \ - SetResult.3 Tcl_AppendResult.3 \ - SetResult.3 Tcl_AppendResultVA.3 \ - SetResult.3 Tcl_AppendElement.3 \ - SetResult.3 Tcl_ResetResult.3 \ - 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_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 \ - 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_AppendStringsToObj.3 \ - StringObj.3 Tcl_AppendStringsToObjVA.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 \ - 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_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 \ - Utf.3 Tcl_UtfToUniCharDString.3 \ - Utf.3 Tcl_UniCharLen.3 \ - Utf.3 Tcl_UniCharNcmp.3 \ - Utf.3 Tcl_UtfCharComplete.3 \ - Utf.3 Tcl_NumUtfChars.3 \ - Utf.3 Tcl_UtfFindFirst.3 \ - Utf.3 Tcl_UtfFindLast.3 \ - Utf.3 Tcl_UtfNext.3 \ - Utf.3 Tcl_UtfPrev.3 \ - Utf.3 Tcl_UniCharAtIndex.3 \ - Utf.3 Tcl_UtfAtIndex.3 \ - Utf.3 Tcl_UtfBackslash.3 \ - WrongNumArgs.3 Tcl_WrongNumArgs.3 \ - 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 -.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|$$(BIN_INSTALL_DIR)/tclsh$$(VERSION)|$$(BIN_INSTALL_DIR)/tclsh$$(VERSION)${THREADS_SUFFIX}|g' \ - -e 's|$$(SCRIPT_INSTALL_DIR)/tclConfig.sh|$$(SCRIPT_INSTALL_DIR)/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: - ${MKDIR} ${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/../doc/man.macros ${DATADIR} -.if !defined(NO_INSTALL_MANPAGES) - ${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:MTCL84_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:MTCL84_MAN} - -.endif # !defined(NO_INSTALL_MANPAGES) regression-test: build cd ${WRKSRC} && LC_ALL=C ${MAKE} test -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/lang/tcl84/files/patch-aa b/lang/tcl84/files/patch-aa index fb257bf34bde..d99e17aaa63a 100644 --- a/lang/tcl84/files/patch-aa +++ b/lang/tcl84/files/patch-aa @@ -109,36 +109,3 @@ @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 @DTRACE_SRC@; \ -@@ -727,20 +753,20 @@ - else true; \ - fi; \ - done; -- @echo "Installing and cross-linking top-level (.1) docs"; -- @for i in $(TOP_DIR)/doc/*.1; do \ -- $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i $(MAN1_INSTALL_DIR); \ -- done - -- @echo "Installing and cross-linking C API (.3) docs"; -- @for i in $(TOP_DIR)/doc/*.3; do \ -- $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i $(MAN3_INSTALL_DIR); \ -- done -+ @echo "Installing C API (.3) docs"; -+ ${BSD_INSTALL_MAN} $(TOP_DIR)/doc/*.3 $(MAN3_INSTALL_DIR)/ - -- @echo "Installing and cross-linking command (.n) docs"; -- @for i in $(TOP_DIR)/doc/*.n; do \ -- $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i $(MANN_INSTALL_DIR); \ -- done -+ @echo "Installing command (.n) docs"; -+ ${BSD_INSTALL_MAN} $(TOP_DIR)/doc/*.n $(MANN_INSTALL_DIR)/ -+ @echo "**********" -+ @echo "IMPORTANT:" -+ @echo "**********" -+ @echo "tclConfig.sh in $(SCRIPT_INSTALL_DIR)/tclConfig.sh" -+ @echo "tcl.h in $(INCLUDE_INSTALL_DIR)/tcl.h" -+ @echo "tclDecls.h in $(INCLUDE_INSTALL_DIR)/tclDecls.h" -+ @echo "There are NOT default place, but good place to avoid" -+ @echo "conflicting with another version of Tcl/Tks." - - # Optional target to install private headers - install-private-headers: libraries diff --git a/lang/tcl84/pkg-plist b/lang/tcl84/pkg-plist index 611463646a25..2e5ef2bf4353 100644 --- a/lang/tcl84/pkg-plist +++ b/lang/tcl84/pkg-plist @@ -124,8 +124,6 @@ lib/tcl%%TCL_VER%%/tclIndex lib/tcl%%TCL_VER%%/tcltest2.2/pkgIndex.tcl lib/tcl%%TCL_VER%%/tcltest2.2/tcltest.tcl lib/tcl%%TCL_VER%%/word.tcl -%%DATADIR%%/man.macros -@dirrm %%DATADIR%% @dirrm lib/tcl%%TCL_VER%%/tcltest2.2 @dirrm lib/tcl%%TCL_VER%%/opt0.4 @dirrm lib/tcl%%TCL_VER%%/msgcat1.3 diff --git a/lang/tcl84/pkg-plist.threads b/lang/tcl84/pkg-plist.threads deleted file mode 100644 index 409c1f9139dd..000000000000 --- a/lang/tcl84/pkg-plist.threads +++ /dev/null @@ -1,8 +0,0 @@ -bin/tclsh%%TCL_VER%%-threads -lib/libtcl%%SHORT_TCL_VER%%-threads.a -lib/libtcl%%SHORT_TCL_VER%%-threads.so -lib/libtcl%%SHORT_TCL_VER%%-threads.so.1 -lib/libtclstub%%SHORT_TCL_VER%%-threads.a -lib/tcl%%TCL_VER%%/tclConfig-threads.sh -lib/tcl%%TCL_VER%%-threads/tclConfig.sh -@dirrm lib/tcl%%TCL_VER%%-threads diff --git a/lang/tcl85-thread/Makefile b/lang/tcl85-thread/Makefile deleted file mode 100644 index bb91faf1fd10..000000000000 --- a/lang/tcl85-thread/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -# Created by: Martin Matuska <mm@FreeBSD.org> -# $FreeBSD$ - -PORTNAME= tcl - -MAINTAINER= tcltk@FreeBSD.org -COMMENT= Tool command language (threads support) - -BUILDING_TCL_THREADS= yes - -MASTERDIR= ${.CURDIR}/../tcl85 - -.include "${MASTERDIR}/Makefile" diff --git a/lang/tcl85/Makefile b/lang/tcl85/Makefile index 637b853fa480..a5895e15b2ec 100644 --- a/lang/tcl85/Makefile +++ b/lang/tcl85/Makefile @@ -1,778 +1,85 @@ # Created by: Martin Matuska <mm@FreeBSD.org> # $FreeBSD$ -PORTNAME?= tcl +PORTNAME= tcl PORTVERSION= 8.5.13 CATEGORIES= lang MASTER_SITES= SF/tcl/Tcl/${PORTVERSION} -PKGNAMESUFFIX?= ${THREADS_SUFFIX}${PKGNAMESUFFIX2} DISTNAME= tcl${PORTVERSION}-src MAINTAINER= tcltk@FreeBSD.org -COMMENT?= Tool Command Language +COMMENT= Tool Command Language LICENSE= BSD -LATEST_LINK?= tcl85 -PATCH_DIST_ARGS= -d ${WRKDIR}/${DISTNAME} -E ${PATCH_DIST_STRIP} +OPTIONS_DEFINE= TCLMAN TZDATA MODULES THREADS +OPTIONS_DEFAULT=MODULES THREADS +TCLMAN_DESC= Install Tcl function manpages +TZDATA_DESC= Install Tcl timezone data +MODULES_DESC= Install Tcl common modules + WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//}/unix ALL_TARGET= all +INSTALL_TARGET= install install-libraries + USE_LDCONFIG= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --enable-shared --without-tzdata --includedir=${PREFIX}/include/tcl${TCL_VER} +CONFIGURE_ARGS= --enable-shared \ + --enable-man-suffix=.${MAN_SUFFIX} \ + --includedir=${PREFIX}/include/tcl${TCL_VER} CONFIGURE_ENV= PORTSDIR=${PORTSDIR} + TCL_VER= 8.5 SHORT_TCL_VER= ${TCL_VER:S/8./8/} -MAKE_ENV= SHORT_TCL_VER=${SHORT_TCL_VER} LANG=C LC_ALL=C # LANG=C is required for some of UTF-using tests -NOPRECIOUSMAKEVARS= Too many _MLINKS for README.html -PLIST_SUB= TCL_VER=${TCL_VER} SHORT_TCL_VER=${SHORT_TCL_VER} -EXTRACT_AFTER_ARGS=|${TAR} -xpf - --exclude compat/ +LATEST_LINK= ${PORTNAME}${SHORT_TCL_VER} +MAN_SUFFIX= ${LATEST_LINK} -.if !defined(BUILDING_TCL_THREADS) && !defined(BUILDING_TCL_TM) -OPTIONS_DEFINE= TCL85_MAN TZDATA TCL_MODULES -OPTIONS_DEFAULT=TCL_MODULES -TCL85_MAN_DESC=Install tcl 8.5 function manpages -TZDATA_DESC=Install tcl timezone data -TCL_MODULES_DESC=Install tcl common modules -.elif defined(BUILDING_TCL_THREADS) -USE_TCL= ${SHORT_TCL_VER} -PLIST= ${PKGDIR}/pkg-plist.threads -THREADS_SUFFIX= -threads -LATEST_LINK= tcl85${THREADS_SUFFIX} -.elif defined(BUILDING_TCL_TM) -LATEST_LINK= tcl-modules -NO_BUILD= yes -INSTALL_TARGET= install-tm -PLIST= ${PKGDIR}/pkg-plist.tm -.endif +MAKE_ENV= SHORT_TCL_VER=${SHORT_TCL_VER} \ + MAN_SUFFIX=.${MAN_SUFFIX} \ + LANG=C LC_ALL=C # LANG=C is required for some of UTF-using tests -.include <bsd.port.pre.mk> +PLIST_SUB= TCL_VER=${TCL_VER} \ + SHORT_TCL_VER=${SHORT_TCL_VER} -.if !defined(BUILDING_TCL_TM) +.include <bsd.port.options.mk> -.if ${PORT_OPTIONS:MTCL_MODULES} -RUN_DEPENDS+= ${LOCALBASE}/lib/tcl8/8.5/tcltest-2.3.4.tm:${PORTSDIR}/lang/tcl-modules +.if ${PORT_OPTIONS:MTCLMAN} +INSTALL_TARGET+=install-doc +.include "${.CURDIR}/Makefile.man" .endif -DATADIR= ${PREFIX}/share/${PORTNAME}${TCL_VER} - -.if ${PORT_OPTIONS:MTZDATA} -PLIST_SUB+= TZDATA="" +.if ${PORT_OPTIONS:MTHREADS} +CONFIGURE_ARGS+= --enable-threads .else -PLIST_SUB+= TZDATA="@comment " +CONFIGURE_ARGS+= --disable-threads .endif -MAN1= tclsh${TCL_VER}${THREADS_SUFFIX}.1 - -.if defined(BUILDING_TCL_THREADS) -. if (${ARCH} == "ia64") -BROKEN= does not compile on ia64 -. endif -. if exists(${TCLSH}) -TCL_PATCHLEVEL!= ${ECHO_CMD} "puts \$$tcl_patchLevel" | ${TCLSH} -. if ${TCL_PATCHLEVEL} != ${PORTVERSION:S/.b./b/} -IGNORE= version mismatch - installing ${PORTVERSION:S/.b./b/} over installed ${TCL_PATCHLEVEL} -. endif +.if ${PORT_OPTIONS:MMODULES} +INSTALL_TARGET+=install-tm +PLIST_SUB+= MODULES="" +.else +PLIST_SUB+= MODULES="@comment " .endif -CONFIGURE_ARGS+= --enable-threads -CONFIGURE_ENV+= PTHREAD_LIBS="${PTHREAD_LIBS}" PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" - +.if ${PORT_OPTIONS:MTZDATA} +PLIST_SUB+= TZDATA="" +CONFIGURE_ARGS+=--with-tzdata +INSTALL_TARGET+=install-tzdata .else - -CONFIGURE_ARGS+= --disable-threads - -.if !defined(NO_INSTALL_MANPAGES) && defined(WITH_TCL85_MAN) - -MAN3= Access.3 AddErrInfo.3 Alloc.3 AllowExc.3 AppInit.3 AssocData.3 \ - Async.3 BackgdErr.3 Backslash.3 BoolObj.3 ByteArrObj.3 CallDel.3 \ - ChnlStack.3 CmdCmplt.3 Concat.3 CrtChannel.3 CrtChnlHdlr.3 \ - CrtCloseHdlr.3 CrtCommand.3 CrtFileHdlr.3 CrtInterp.3 CrtMathFnc.3 \ - CrtObjCmd.3 CrtSlave.3 CrtTimerHdlr.3 CrtTrace.3 DString.3 \ - DetachPids.3 DictObj.3 DoOneEvent.3 DoWhenIdle.3 DoubleObj.3 \ - DumpActiveMemory.3 Encoding.3 Ensemble.3 Eval.3 Environment.3 Exit.3 \ - ExprLong.3 ExprLongObj.3 FileSystem.3 FindExec.3 GetCwd.3 \ - GetHostName.3 GetIndex.3 GetInt.3 GetTime.3 GetOpnFl.3 GetStdChan.3 \ - GetVersion.3 Hash.3 Init.3 InitStubs.3 IntObj.3 Interp.3 Limit.3 \ - LinkVar.3 ListObj.3 Namespace.3 Notifier.3 Object.3 ObjectType.3 \ - OpenFileChnl.3 OpenTcp.3 Panic.3 ParseCmd.3 PkgRequire.3 Preserve.3 \ - PrintDbl.3 RecEvalObj.3 RecordEval.3 RegConfig.3 RegExp.3 SaveResult.3 \ - SetChanErr.3 SetErrno.3 SetRecLmt.3 SetResult.3 SetVar.3 Signal.3 \ - Sleep.3 SourceRCFile.3 SplitList.3 SplitPath.3 StdChannels.3 \ - StaticPkg.3 StrMatch.3 StringObj.3 SubstObj.3 TCL_MEM_DEBUG.3 \ - Tcl_Main.3 Thread.3 ToUpper.3 TraceCmd.3 TraceVar.3 Translate.3 \ - UniCharIsAlpha.3 UpVar.3 Utf.3 WrongNumArgs.3 - -MANN= Tcl.n after.n append.n apply.n array.n bgerror.n binary.n break.n \ - case.n catch.n cd.n chan.n clock.n close.n concat.n continue.n dde.n \ - dict.n encoding.n eof.n error.n eval.n exec.n exit.n expr.n fblocked.n \ - fconfigure.n fcopy.n file.n fileevent.n filename.n flush.n for.n \ - foreach.n format.n gets.n glob.n global.n history.n http.n if.n incr.n \ - info.n interp.n join.n lappend.n lassign.n library.n lindex.n \ - linsert.n list.n llength.n load.n lrange.n lrepeat.n lreplace.n \ - lreverse.n lsearch.n lset.n lsort.n mathfunc.n mathop.n memory.n \ - msgcat.n namespace.n open.n package.n packagens.n pid.n pkgMkIndex.n \ - platform.n platform_shell.n proc.n puts.n pwd.n re_syntax.n read.n \ - refchan.n regexp.n registry.n regsub.n rename.n \ - return.n safe.n scan.n seek.n set.n socket.n source.n split.n string.n \ - subst.n switch.n tcltest.n tclvars.n tell.n time.n tm.n trace.n \ - unknown.n unload.n unset.n update.n uplevel.n upvar.n variable.n vwait.n \ - while.n - -# MLINKS generated via awk '/ln/ {print "\t" $3,$4,"\\"}' unix/mkLinks -MLINKS= Access.3 Tcl_Access.3 \ - Access.3 Tcl_Stat.3 \ - AddErrInfo.3 Tcl_GetReturnOptions.3 \ - AddErrInfo.3 Tcl_SetReturnOptions.3 \ - AddErrInfo.3 Tcl_AddErrorInfo.3 \ - AddErrInfo.3 Tcl_AddObjErrorInfo.3 \ - AddErrInfo.3 Tcl_SetObjErrorCode.3 \ - AddErrInfo.3 Tcl_SetErrorCode.3 \ - AddErrInfo.3 Tcl_SetErrorCodeVA.3 \ - AddErrInfo.3 Tcl_PosixError.3 \ - AddErrInfo.3 Tcl_LogCommandInfo.3 \ - Alloc.3 Tcl_Alloc.3 \ - Alloc.3 Tcl_Free.3 \ - Alloc.3 Tcl_Realloc.3 \ - Alloc.3 Tcl_AttemptAlloc.3 \ - Alloc.3 Tcl_AttemptRealloc.3 \ - Alloc.3 ckalloc.3 \ - Alloc.3 ckfree.3 \ - Alloc.3 ckrealloc.3 \ - Alloc.3 attemptckalloc.3 \ - Alloc.3 attemptckrealloc.3 \ - AllowExc.3 Tcl_AllowExceptions.3 \ - AppInit.3 Tcl_AppInit.3 \ - AssocData.3 Tcl_GetAssocData.3 \ - AssocData.3 Tcl_SetAssocData.3 \ - AssocData.3 Tcl_DeleteAssocData.3 \ - Async.3 Tcl_AsyncCreate.3 \ - Async.3 Tcl_AsyncMark.3 \ - Async.3 Tcl_AsyncInvoke.3 \ - Async.3 Tcl_AsyncDelete.3 \ - Async.3 Tcl_AsyncReady.3 \ - BackgdErr.3 Tcl_BackgroundError.3 \ - Backslash.3 Tcl_Backslash.3 \ - BoolObj.3 Tcl_NewBooleanObj.3 \ - BoolObj.3 Tcl_SetBooleanObj.3 \ - BoolObj.3 Tcl_GetBooleanFromObj.3 \ - ByteArrObj.3 Tcl_NewByteArrayObj.3 \ - ByteArrObj.3 Tcl_SetByteArrayObj.3 \ - ByteArrObj.3 Tcl_GetByteArrayFromObj.3 \ - ByteArrObj.3 Tcl_SetByteArrayLength.3 \ - CallDel.3 Tcl_CallWhenDeleted.3 \ - CallDel.3 Tcl_DontCallWhenDeleted.3 \ - ChnlStack.3 Tcl_StackChannel.3 \ - ChnlStack.3 Tcl_UnstackChannel.3 \ - ChnlStack.3 Tcl_GetStackedChannel.3 \ - ChnlStack.3 Tcl_GetTopChannel.3 \ - CmdCmplt.3 Tcl_CommandComplete.3 \ - Concat.3 Tcl_Concat.3 \ - CrtChannel.3 Tcl_CreateChannel.3 \ - CrtChannel.3 Tcl_GetChannelInstanceData.3 \ - CrtChannel.3 Tcl_GetChannelType.3 \ - CrtChannel.3 Tcl_GetChannelName.3 \ - CrtChannel.3 Tcl_GetChannelHandle.3 \ - CrtChannel.3 Tcl_GetChannelThread.3 \ - CrtChannel.3 Tcl_GetChannelMode.3 \ - CrtChannel.3 Tcl_GetChannelBufferSize.3 \ - CrtChannel.3 Tcl_SetChannelBufferSize.3 \ - CrtChannel.3 Tcl_NotifyChannel.3 \ - CrtChannel.3 Tcl_BadChannelOption.3 \ - CrtChannel.3 Tcl_IsChannelShared.3 \ - CrtChannel.3 Tcl_IsChannelRegistered.3 \ - CrtChannel.3 Tcl_IsChannelExisting.3 \ - CrtChannel.3 Tcl_CutChannel.3 \ - CrtChannel.3 Tcl_SpliceChannel.3 \ - CrtChannel.3 Tcl_ClearChannelHandlers.3 \ - CrtChannel.3 Tcl_ChannelBuffered.3 \ - CrtChannel.3 Tcl_ChannelName.3 \ - CrtChannel.3 Tcl_ChannelVersion.3 \ - CrtChannel.3 Tcl_ChannelBlockModeProc.3 \ - CrtChannel.3 Tcl_ChannelCloseProc.3 \ - CrtChannel.3 Tcl_ChannelClose2Proc.3 \ - CrtChannel.3 Tcl_ChannelInputProc.3 \ - CrtChannel.3 Tcl_ChannelOutputProc.3 \ - CrtChannel.3 Tcl_ChannelSeekProc.3 \ - CrtChannel.3 Tcl_ChannelWideSeekProc.3 \ - CrtChannel.3 Tcl_ChannelThreadActionProc.3 \ - CrtChannel.3 Tcl_ChannelTruncateProc.3 \ - CrtChannel.3 Tcl_ChannelSetOptionProc.3 \ - CrtChannel.3 Tcl_ChannelGetOptionProc.3 \ - CrtChannel.3 Tcl_ChannelWatchProc.3 \ - CrtChannel.3 Tcl_ChannelGetHandleProc.3 \ - CrtChannel.3 Tcl_ChannelFlushProc.3 \ - CrtChannel.3 Tcl_ChannelHandlerProc.3 \ - CrtChnlHdlr.3 Tcl_CreateChannelHandler.3 \ - CrtChnlHdlr.3 Tcl_DeleteChannelHandler.3 \ - CrtCloseHdlr.3 Tcl_CreateCloseHandler.3 \ - CrtCloseHdlr.3 Tcl_DeleteCloseHandler.3 \ - CrtCommand.3 Tcl_CreateCommand.3 \ - CrtFileHdlr.3 Tcl_CreateFileHandler.3 \ - CrtFileHdlr.3 Tcl_DeleteFileHandler.3 \ - CrtInterp.3 Tcl_CreateInterp.3 \ - CrtInterp.3 Tcl_DeleteInterp.3 \ - CrtInterp.3 Tcl_InterpDeleted.3 \ - CrtMathFnc.3 Tcl_CreateMathFunc.3 \ - CrtMathFnc.3 Tcl_GetMathFuncInfo.3 \ - CrtMathFnc.3 Tcl_ListMathFuncs.3 \ - CrtObjCmd.3 Tcl_CreateObjCommand.3 \ - CrtObjCmd.3 Tcl_DeleteCommand.3 \ - CrtObjCmd.3 Tcl_DeleteCommandFromToken.3 \ - CrtObjCmd.3 Tcl_GetCommandInfo.3 \ - CrtObjCmd.3 Tcl_SetCommandInfo.3 \ - CrtObjCmd.3 Tcl_GetCommandInfoFromToken.3 \ - CrtObjCmd.3 Tcl_SetCommandInfoFromToken.3 \ - CrtObjCmd.3 Tcl_GetCommandName.3 \ - CrtObjCmd.3 Tcl_GetCommandFullName.3 \ - CrtObjCmd.3 Tcl_GetCommandFromObj.3 \ - CrtSlave.3 Tcl_IsSafe.3 \ - CrtSlave.3 Tcl_MakeSafe.3 \ - CrtSlave.3 Tcl_CreateSlave.3 \ - CrtSlave.3 Tcl_GetSlave.3 \ - CrtSlave.3 Tcl_GetMaster.3 \ - CrtSlave.3 Tcl_GetInterpPath.3 \ - CrtSlave.3 Tcl_CreateAlias.3 \ - CrtSlave.3 Tcl_CreateAliasObj.3 \ - CrtSlave.3 Tcl_GetAlias.3 \ - CrtSlave.3 Tcl_GetAliasObj.3 \ - CrtSlave.3 Tcl_ExposeCommand.3 \ - CrtSlave.3 Tcl_HideCommand.3 \ - CrtTimerHdlr.3 Tcl_CreateTimerHandler.3 \ - CrtTimerHdlr.3 Tcl_DeleteTimerHandler.3 \ - CrtTrace.3 Tcl_CreateTrace.3 \ - CrtTrace.3 Tcl_CreateObjTrace.3 \ - CrtTrace.3 Tcl_DeleteTrace.3 \ - DString.3 Tcl_DStringInit.3 \ - DString.3 Tcl_DStringAppend.3 \ - DString.3 Tcl_DStringAppendElement.3 \ - DString.3 Tcl_DStringStartSublist.3 \ - DString.3 Tcl_DStringEndSublist.3 \ - DString.3 Tcl_DStringLength.3 \ - DString.3 Tcl_DStringValue.3 \ - DString.3 Tcl_DStringSetLength.3 \ - DString.3 Tcl_DStringTrunc.3 \ - DString.3 Tcl_DStringFree.3 \ - DString.3 Tcl_DStringResult.3 \ - DString.3 Tcl_DStringGetResult.3 \ - DetachPids.3 Tcl_DetachPids.3 \ - DetachPids.3 Tcl_ReapDetachedProcs.3 \ - DetachPids.3 Tcl_WaitPid.3 \ - DictObj.3 Tcl_NewDictObj.3 \ - DictObj.3 Tcl_DictObjGet.3 \ - DictObj.3 Tcl_DictObjPut.3 \ - DictObj.3 Tcl_DictObjRemove.3 \ - DictObj.3 Tcl_DictObjSize.3 \ - DictObj.3 Tcl_DictObjFirst.3 \ - DictObj.3 Tcl_DictObjNext.3 \ - DictObj.3 Tcl_DictObjDone.3 \ - DictObj.3 Tcl_DictObjPutKeyList.3 \ - DictObj.3 Tcl_DictObjRemoveKeyList.3 \ - DoOneEvent.3 Tcl_DoOneEvent.3 \ - DoWhenIdle.3 Tcl_DoWhenIdle.3 \ - DoWhenIdle.3 Tcl_CancelIdleCall.3 \ - DoubleObj.3 Tcl_NewDoubleObj.3 \ - DoubleObj.3 Tcl_SetDoubleObj.3 \ - DoubleObj.3 Tcl_GetDoubleFromObj.3 \ - DumpActiveMemory.3 Tcl_DumpActiveMemory.3 \ - DumpActiveMemory.3 Tcl_InitMemory.3 \ - DumpActiveMemory.3 Tcl_ValidateAllMemory.3 \ - Encoding.3 Tcl_GetEncoding.3 \ - Encoding.3 Tcl_FreeEncoding.3 \ - Encoding.3 Tcl_GetEncodingFromObj.3 \ - Encoding.3 Tcl_ExternalToUtfDString.3 \ - Encoding.3 Tcl_UtfToExternalDString.3 \ - Encoding.3 Tcl_ExternalToUtf.3 \ - Encoding.3 Tcl_UtfToExternal.3 \ - Encoding.3 Tcl_WinTCharToUtf.3 \ - Encoding.3 Tcl_WinUtfToTChar.3 \ - Encoding.3 Tcl_GetEncodingName.3 \ - Encoding.3 Tcl_SetSystemEncoding.3 \ - Encoding.3 Tcl_GetEncodingNameFromEnvironment.3 \ - Encoding.3 Tcl_GetEncodingNames.3 \ - Encoding.3 Tcl_CreateEncoding.3 \ - Encoding.3 Tcl_GetEncodingSearchPath.3 \ - Encoding.3 Tcl_SetEncodingSearchPath.3 \ - Encoding.3 Tcl_GetDefaultEncodingDir.3 \ - Encoding.3 Tcl_SetDefaultEncodingDir.3 \ - Ensemble.3 Tcl_CreateEnsemble.3 \ - Ensemble.3 Tcl_FindEnsemble.3 \ - Ensemble.3 Tcl_IsEnsemble.3 \ - Ensemble.3 Tcl_GetEnsembleFlags.3 \ - Ensemble.3 Tcl_SetEnsembleFlags.3 \ - Ensemble.3 Tcl_GetEnsembleMappingDict.3 \ - Ensemble.3 Tcl_SetEnsembleMappingDict.3 \ - Ensemble.3 Tcl_GetEnsembleSubcommandList.3 \ - Ensemble.3 Tcl_SetEnsembleSubcommandList.3 \ - Ensemble.3 Tcl_GetEnsembleUnknownHandler.3 \ - Ensemble.3 Tcl_SetEnsembleUnknownHandler.3 \ - Ensemble.3 Tcl_GetEnsembleNamespace.3 \ - Environment.3 Tcl_PutEnv.3 \ - Eval.3 Tcl_EvalObjEx.3 \ - Eval.3 Tcl_EvalFile.3 \ - Eval.3 Tcl_EvalObjv.3 \ - Eval.3 Tcl_Eval.3 \ - Eval.3 Tcl_EvalEx.3 \ - Eval.3 Tcl_GlobalEval.3 \ - Eval.3 Tcl_GlobalEvalObj.3 \ - Eval.3 Tcl_VarEval.3 \ - Eval.3 Tcl_VarEvalVA.3 \ - Exit.3 Tcl_Exit.3 \ - Exit.3 Tcl_Finalize.3 \ - Exit.3 Tcl_CreateExitHandler.3 \ - Exit.3 Tcl_DeleteExitHandler.3 \ - Exit.3 Tcl_ExitThread.3 \ - Exit.3 Tcl_FinalizeThread.3 \ - Exit.3 Tcl_CreateThreadExitHandler.3 \ - Exit.3 Tcl_DeleteThreadExitHandler.3 \ - Exit.3 Tcl_SetExitProc.3 \ - ExprLong.3 Tcl_ExprLong.3 \ - ExprLong.3 Tcl_ExprDouble.3 \ - ExprLong.3 Tcl_ExprBoolean.3 \ - ExprLong.3 Tcl_ExprString.3 \ - ExprLongObj.3 Tcl_ExprLongObj.3 \ - ExprLongObj.3 Tcl_ExprDoubleObj.3 \ - ExprLongObj.3 Tcl_ExprBooleanObj.3 \ - ExprLongObj.3 Tcl_ExprObj.3 \ - FileSystem.3 Tcl_FSRegister.3 \ - FileSystem.3 Tcl_FSUnregister.3 \ - FileSystem.3 Tcl_FSData.3 \ - FileSystem.3 Tcl_FSMountsChanged.3 \ - FileSystem.3 Tcl_FSGetFileSystemForPath.3 \ - FileSystem.3 Tcl_FSGetPathType.3 \ - FileSystem.3 Tcl_FSCopyFile.3 \ - FileSystem.3 Tcl_FSCopyDirectory.3 \ - FileSystem.3 Tcl_FSCreateDirectory.3 \ - FileSystem.3 Tcl_FSDeleteFile.3 \ - FileSystem.3 Tcl_FSRemoveDirectory.3 \ - FileSystem.3 Tcl_FSRenameFile.3 \ - FileSystem.3 Tcl_FSListVolumes.3 \ - FileSystem.3 Tcl_FSEvalFileEx.3 \ - FileSystem.3 Tcl_FSEvalFile.3 \ - FileSystem.3 Tcl_FSLoadFile.3 \ - FileSystem.3 Tcl_FSMatchInDirectory.3 \ - FileSystem.3 Tcl_FSLink.3 \ - FileSystem.3 Tcl_FSLstat.3 \ - FileSystem.3 Tcl_FSUtime.3 \ - FileSystem.3 Tcl_FSFileAttrsGet.3 \ - FileSystem.3 Tcl_FSFileAttrsSet.3 \ - FileSystem.3 Tcl_FSFileAttrStrings.3 \ - FileSystem.3 Tcl_FSStat.3 \ - FileSystem.3 Tcl_FSAccess.3 \ - FileSystem.3 Tcl_FSOpenFileChannel.3 \ - FileSystem.3 Tcl_FSGetCwd.3 \ - FileSystem.3 Tcl_FSChdir.3 \ - FileSystem.3 Tcl_FSPathSeparator.3 \ - FileSystem.3 Tcl_FSJoinPath.3 \ - FileSystem.3 Tcl_FSSplitPath.3 \ - FileSystem.3 Tcl_FSEqualPaths.3 \ - FileSystem.3 Tcl_FSGetNormalizedPath.3 \ - FileSystem.3 Tcl_FSJoinToPath.3 \ - FileSystem.3 Tcl_FSConvertToPathType.3 \ - FileSystem.3 Tcl_FSGetInternalRep.3 \ - FileSystem.3 Tcl_FSGetTranslatedPath.3 \ - FileSystem.3 Tcl_FSGetTranslatedStringPath.3 \ - FileSystem.3 Tcl_FSNewNativePath.3 \ - FileSystem.3 Tcl_FSGetNativePath.3 \ - FileSystem.3 Tcl_FSFileSystemInfo.3 \ - FileSystem.3 Tcl_AllocStatBuf.3 \ - FindExec.3 Tcl_FindExecutable.3 \ - FindExec.3 Tcl_GetNameOfExecutable.3 \ - GetCwd.3 Tcl_GetCwd.3 \ - GetCwd.3 Tcl_Chdir.3 \ - GetHostName.3 Tcl_GetHostName.3 \ - GetIndex.3 Tcl_GetIndexFromObj.3 \ - GetIndex.3 Tcl_GetIndexFromObjStruct.3 \ - GetInt.3 Tcl_GetInt.3 \ - GetInt.3 Tcl_GetDouble.3 \ - GetInt.3 Tcl_GetBoolean.3 \ - GetOpnFl.3 Tcl_GetOpenFile.3 \ - GetStdChan.3 Tcl_GetStdChannel.3 \ - GetStdChan.3 Tcl_SetStdChannel.3 \ - GetTime.3 Tcl_GetTime.3 \ - GetTime.3 Tcl_SetTimeProc.3 \ - GetTime.3 Tcl_QueryTimeProc.3 \ - GetVersion.3 Tcl_GetVersion.3 \ - Hash.3 Tcl_InitHashTable.3 \ - Hash.3 Tcl_InitCustomHashTable.3 \ - Hash.3 Tcl_InitObjHashTable.3 \ - Hash.3 Tcl_DeleteHashTable.3 \ - Hash.3 Tcl_CreateHashEntry.3 \ - Hash.3 Tcl_DeleteHashEntry.3 \ - Hash.3 Tcl_FindHashEntry.3 \ - Hash.3 Tcl_GetHashValue.3 \ - Hash.3 Tcl_SetHashValue.3 \ - Hash.3 Tcl_GetHashKey.3 \ - Hash.3 Tcl_FirstHashEntry.3 \ - Hash.3 Tcl_NextHashEntry.3 \ - Hash.3 Tcl_HashStats.3 \ - Init.3 Tcl_Init.3 \ - InitStubs.3 Tcl_InitStubs.3 \ - IntObj.3 Tcl_NewIntObj.3 \ - IntObj.3 Tcl_NewLongObj.3 \ - IntObj.3 Tcl_NewWideIntObj.3 \ - IntObj.3 Tcl_SetIntObj.3 \ - IntObj.3 Tcl_SetLongObj.3 \ - IntObj.3 Tcl_SetWideIntObj.3 \ - IntObj.3 Tcl_GetIntFromObj.3 \ - IntObj.3 Tcl_GetLongFromObj.3 \ - IntObj.3 Tcl_GetWideIntFromObj.3 \ - IntObj.3 Tcl_NewBignumObj.3 \ - IntObj.3 Tcl_SetBignumObj.3 \ - IntObj.3 Tcl_GetBignumFromObj.3 \ - IntObj.3 Tcl_GetBignumAndClearObj.3 \ - Interp.3 Tcl_Interp.3 \ - Limit.3 Tcl_LimitCheck.3 \ - Limit.3 Tcl_LimitReady.3 \ - Limit.3 Tcl_LimitExceeded.3 \ - Limit.3 Tcl_LimitTypeExceeded.3 \ - Limit.3 Tcl_LimitTypeEnabled.3 \ - Limit.3 Tcl_LimitTypeSet.3 \ - Limit.3 Tcl_LimitTypeReset.3 \ - Limit.3 Tcl_LimitGetCommands.3 \ - Limit.3 Tcl_LimitSetCommands.3 \ - Limit.3 Tcl_LimitGetTime.3 \ - Limit.3 Tcl_LimitSetTime.3 \ - Limit.3 Tcl_LimitGetGranularity.3 \ - Limit.3 Tcl_LimitSetGranularity.3 \ - Limit.3 Tcl_LimitAddHandler.3 \ - Limit.3 Tcl_LimitRemoveHandler.3 \ - LinkVar.3 Tcl_LinkVar.3 \ - LinkVar.3 Tcl_UnlinkVar.3 \ - LinkVar.3 Tcl_UpdateLinkedVar.3 \ - ListObj.3 Tcl_ListObjAppendList.3 \ - ListObj.3 Tcl_ListObjAppendElement.3 \ - ListObj.3 Tcl_NewListObj.3 \ - ListObj.3 Tcl_SetListObj.3 \ - ListObj.3 Tcl_ListObjGetElements.3 \ - ListObj.3 Tcl_ListObjLength.3 \ - ListObj.3 Tcl_ListObjIndex.3 \ - ListObj.3 Tcl_ListObjReplace.3 \ - Namespace.3 Tcl_CreateNamespace.3 \ - Namespace.3 Tcl_DeleteNamespace.3 \ - Namespace.3 Tcl_AppendExportList.3 \ - Namespace.3 Tcl_Export.3 \ - Namespace.3 Tcl_Import.3 \ - Namespace.3 Tcl_ForgetImport.3 \ - Namespace.3 Tcl_GetCurrentNamespace.3 \ - Namespace.3 Tcl_GetGlobalNamespace.3 \ - Namespace.3 Tcl_FindNamespace.3 \ - Namespace.3 Tcl_FindCommand.3 \ - Namespace.3 Tcl_GetNamespaceUnknownHandler.3 \ - Namespace.3 Tcl_SetNamespaceUnknownHandler.3 \ - Notifier.3 Tcl_CreateEventSource.3 \ - Notifier.3 Tcl_DeleteEventSource.3 \ - Notifier.3 Tcl_SetMaxBlockTime.3 \ - Notifier.3 Tcl_QueueEvent.3 \ - Notifier.3 Tcl_ThreadQueueEvent.3 \ - Notifier.3 Tcl_ThreadAlert.3 \ - Notifier.3 Tcl_GetCurrentThread.3 \ - Notifier.3 Tcl_DeleteEvents.3 \ - Notifier.3 Tcl_InitNotifier.3 \ - Notifier.3 Tcl_FinalizeNotifier.3 \ - Notifier.3 Tcl_WaitForEvent.3 \ - Notifier.3 Tcl_AlertNotifier.3 \ - Notifier.3 Tcl_SetTimer.3 \ - Notifier.3 Tcl_ServiceAll.3 \ - Notifier.3 Tcl_ServiceEvent.3 \ - Notifier.3 Tcl_GetServiceMode.3 \ - Notifier.3 Tcl_SetServiceMode.3 \ - Object.3 Tcl_NewObj.3 \ - Object.3 Tcl_DuplicateObj.3 \ - Object.3 Tcl_IncrRefCount.3 \ - Object.3 Tcl_DecrRefCount.3 \ - Object.3 Tcl_IsShared.3 \ - Object.3 Tcl_InvalidateStringRep.3 \ - ObjectType.3 Tcl_RegisterObjType.3 \ - ObjectType.3 Tcl_GetObjType.3 \ - ObjectType.3 Tcl_AppendAllObjTypes.3 \ - ObjectType.3 Tcl_ConvertToType.3 \ - OpenFileChnl.3 Tcl_OpenFileChannel.3 \ - OpenFileChnl.3 Tcl_OpenCommandChannel.3 \ - OpenFileChnl.3 Tcl_MakeFileChannel.3 \ - OpenFileChnl.3 Tcl_GetChannel.3 \ - OpenFileChnl.3 Tcl_GetChannelNames.3 \ - OpenFileChnl.3 Tcl_GetChannelNamesEx.3 \ - OpenFileChnl.3 Tcl_RegisterChannel.3 \ - OpenFileChnl.3 Tcl_UnregisterChannel.3 \ - OpenFileChnl.3 Tcl_DetachChannel.3 \ - OpenFileChnl.3 Tcl_IsStandardChannel.3 \ - OpenFileChnl.3 Tcl_Close.3 \ - OpenFileChnl.3 Tcl_ReadChars.3 \ - OpenFileChnl.3 Tcl_Read.3 \ - OpenFileChnl.3 Tcl_GetsObj.3 \ - OpenFileChnl.3 Tcl_Gets.3 \ - OpenFileChnl.3 Tcl_Ungets.3 \ - OpenFileChnl.3 Tcl_WriteObj.3 \ - OpenFileChnl.3 Tcl_WriteChars.3 \ - OpenFileChnl.3 Tcl_Write.3 \ - OpenFileChnl.3 Tcl_ReadRaw.3 \ - OpenFileChnl.3 Tcl_WriteRaw.3 \ - OpenFileChnl.3 Tcl_Eof.3 \ - OpenFileChnl.3 Tcl_Flush.3 \ - OpenFileChnl.3 Tcl_InputBlocked.3 \ - OpenFileChnl.3 Tcl_InputBuffered.3 \ - OpenFileChnl.3 Tcl_OutputBuffered.3 \ - OpenFileChnl.3 Tcl_Seek.3 \ - OpenFileChnl.3 Tcl_Tell.3 \ - OpenFileChnl.3 Tcl_TruncateChannel.3 \ - OpenFileChnl.3 Tcl_GetChannelOption.3 \ - OpenFileChnl.3 Tcl_SetChannelOption.3 \ - OpenTcp.3 Tcl_OpenTcpClient.3 \ - OpenTcp.3 Tcl_MakeTcpClientChannel.3 \ - OpenTcp.3 Tcl_OpenTcpServer.3 \ - Panic.3 Tcl_Panic.3 \ - Panic.3 Tcl_PanicVA.3 \ - Panic.3 Tcl_SetPanicProc.3 \ - ParseCmd.3 Tcl_ParseCommand.3 \ - ParseCmd.3 Tcl_ParseExpr.3 \ - ParseCmd.3 Tcl_ParseBraces.3 \ - ParseCmd.3 Tcl_ParseQuotedString.3 \ - ParseCmd.3 Tcl_ParseVarName.3 \ - ParseCmd.3 Tcl_ParseVar.3 \ - ParseCmd.3 Tcl_FreeParse.3 \ - ParseCmd.3 Tcl_EvalTokens.3 \ - ParseCmd.3 Tcl_EvalTokensStandard.3 \ - PkgRequire.3 Tcl_PkgRequire.3 \ - PkgRequire.3 Tcl_PkgRequireEx.3 \ - PkgRequire.3 Tcl_PkgRequireProc.3 \ - PkgRequire.3 Tcl_PkgPresent.3 \ - PkgRequire.3 Tcl_PkgPresentEx.3 \ - PkgRequire.3 Tcl_PkgProvide.3 \ - PkgRequire.3 Tcl_PkgProvideEx.3 \ - Preserve.3 Tcl_Preserve.3 \ - Preserve.3 Tcl_Release.3 \ - Preserve.3 Tcl_EventuallyFree.3 \ - PrintDbl.3 Tcl_PrintDouble.3 \ - RecEvalObj.3 Tcl_RecordAndEvalObj.3 \ - RecordEval.3 Tcl_RecordAndEval.3 \ - RegConfig.3 Tcl_RegisterConfig.3 \ - RegExp.3 Tcl_RegExpMatchObj.3 \ - RegExp.3 Tcl_RegExpMatch.3 \ - RegExp.3 Tcl_RegExpCompile.3 \ - RegExp.3 Tcl_RegExpExec.3 \ - RegExp.3 Tcl_RegExpRange.3 \ - RegExp.3 Tcl_GetRegExpFromObj.3 \ - RegExp.3 Tcl_RegExpExecObj.3 \ - RegExp.3 Tcl_RegExpGetInfo.3 \ - SaveResult.3 Tcl_SaveInterpState.3 \ - SaveResult.3 Tcl_RestoreInterpState.3 \ - SaveResult.3 Tcl_DiscardInterpState.3 \ - SaveResult.3 Tcl_SaveResult.3 \ - SaveResult.3 Tcl_RestoreResult.3 \ - SaveResult.3 Tcl_DiscardResult.3 \ - SetChanErr.3 Tcl_SetChannelError.3 \ - SetChanErr.3 Tcl_SetChannelErrorInterp.3 \ - SetChanErr.3 Tcl_GetChannelError.3 \ - SetChanErr.3 Tcl_GetChannelErrorInterp.3 \ - SetErrno.3 Tcl_SetErrno.3 \ - SetErrno.3 Tcl_GetErrno.3 \ - SetErrno.3 Tcl_ErrnoId.3 \ - SetErrno.3 Tcl_ErrnoMsg.3 \ - SetRecLmt.3 Tcl_SetRecursionLimit.3 \ - SetResult.3 Tcl_SetObjResult.3 \ - SetResult.3 Tcl_GetObjResult.3 \ - SetResult.3 Tcl_SetResult.3 \ - SetResult.3 Tcl_GetStringResult.3 \ - SetResult.3 Tcl_AppendResult.3 \ - SetResult.3 Tcl_AppendResultVA.3 \ - SetResult.3 Tcl_AppendElement.3 \ - SetResult.3 Tcl_ResetResult.3 \ - SetResult.3 Tcl_FreeResult.3 \ - SetVar.3 Tcl_SetVar2Ex.3 \ - SetVar.3 Tcl_SetVar.3 \ - SetVar.3 Tcl_SetVar2.3 \ - SetVar.3 Tcl_ObjSetVar2.3 \ - SetVar.3 Tcl_GetVar2Ex.3 \ - SetVar.3 Tcl_GetVar.3 \ - SetVar.3 Tcl_GetVar2.3 \ - SetVar.3 Tcl_ObjGetVar2.3 \ - SetVar.3 Tcl_UnsetVar.3 \ - SetVar.3 Tcl_UnsetVar2.3 \ - Signal.3 Tcl_SignalId.3 \ - Signal.3 Tcl_SignalMsg.3 \ - Sleep.3 Tcl_Sleep.3 \ - SourceRCFile.3 Tcl_SourceRCFile.3 \ - SplitList.3 Tcl_SplitList.3 \ - SplitList.3 Tcl_Merge.3 \ - SplitList.3 Tcl_ScanElement.3 \ - SplitList.3 Tcl_ScanCountedElement.3 \ - SplitList.3 Tcl_ConvertElement.3 \ - SplitList.3 Tcl_ConvertCountedElement.3 \ - SplitPath.3 Tcl_SplitPath.3 \ - SplitPath.3 Tcl_JoinPath.3 \ - SplitPath.3 Tcl_GetPathType.3 \ - StaticPkg.3 Tcl_StaticPackage.3 \ - StdChannels.3 Tcl_StandardChannels.3 \ - StrMatch.3 Tcl_StringMatch.3 \ - StrMatch.3 Tcl_StringCaseMatch.3 \ - StringObj.3 Tcl_NewStringObj.3 \ - StringObj.3 Tcl_NewUnicodeObj.3 \ - StringObj.3 Tcl_SetStringObj.3 \ - StringObj.3 Tcl_SetUnicodeObj.3 \ - StringObj.3 Tcl_GetStringFromObj.3 \ - StringObj.3 Tcl_GetString.3 \ - StringObj.3 Tcl_GetUnicodeFromObj.3 \ - StringObj.3 Tcl_GetUnicode.3 \ - StringObj.3 Tcl_GetUniChar.3 \ - StringObj.3 Tcl_GetCharLength.3 \ - StringObj.3 Tcl_GetRange.3 \ - StringObj.3 Tcl_AppendToObj.3 \ - StringObj.3 Tcl_AppendUnicodeToObj.3 \ - StringObj.3 Tcl_AppendObjToObj.3 \ - StringObj.3 Tcl_AppendStringsToObj.3 \ - StringObj.3 Tcl_AppendStringsToObjVA.3 \ - StringObj.3 Tcl_SetObjLength.3 \ - StringObj.3 Tcl_AttemptSetObjLength.3 \ - StringObj.3 Tcl_ConcatObj.3 \ - SubstObj.3 Tcl_SubstObj.3 \ - Tcl_Main.3 Tcl_SetMainLoop.3 \ - Thread.3 Tcl_ConditionNotify.3 \ - Thread.3 Tcl_ConditionWait.3 \ - Thread.3 Tcl_ConditionFinalize.3 \ - Thread.3 Tcl_GetThreadData.3 \ - Thread.3 Tcl_MutexLock.3 \ - Thread.3 Tcl_MutexUnlock.3 \ - Thread.3 Tcl_MutexFinalize.3 \ - Thread.3 Tcl_CreateThread.3 \ - Thread.3 Tcl_JoinThread.3 \ - ToUpper.3 Tcl_UniCharToUpper.3 \ - ToUpper.3 Tcl_UniCharToLower.3 \ - ToUpper.3 Tcl_UniCharToTitle.3 \ - ToUpper.3 Tcl_UtfToUpper.3 \ - ToUpper.3 Tcl_UtfToLower.3 \ - ToUpper.3 Tcl_UtfToTitle.3 \ - TraceCmd.3 Tcl_CommandTraceInfo.3 \ - TraceCmd.3 Tcl_TraceCommand.3 \ - TraceCmd.3 Tcl_UntraceCommand.3 \ - TraceVar.3 Tcl_TraceVar.3 \ - TraceVar.3 Tcl_TraceVar2.3 \ - TraceVar.3 Tcl_UntraceVar.3 \ - TraceVar.3 Tcl_UntraceVar2.3 \ - TraceVar.3 Tcl_VarTraceInfo.3 \ - TraceVar.3 Tcl_VarTraceInfo2.3 \ - Translate.3 Tcl_TranslateFileName.3 \ - UniCharIsAlpha.3 Tcl_UniCharIsAlnum.3 \ - UniCharIsAlpha.3 Tcl_UniCharIsAlpha.3 \ - UniCharIsAlpha.3 Tcl_UniCharIsControl.3 \ - UniCharIsAlpha.3 Tcl_UniCharIsDigit.3 \ - UniCharIsAlpha.3 Tcl_UniCharIsGraph.3 \ - UniCharIsAlpha.3 Tcl_UniCharIsLower.3 \ - UniCharIsAlpha.3 Tcl_UniCharIsPrint.3 \ - UniCharIsAlpha.3 Tcl_UniCharIsPunct.3 \ - UniCharIsAlpha.3 Tcl_UniCharIsSpace.3 \ - UniCharIsAlpha.3 Tcl_UniCharIsUpper.3 \ - UniCharIsAlpha.3 Tcl_UniCharIsWordChar.3 \ - UpVar.3 Tcl_UpVar.3 \ - UpVar.3 Tcl_UpVar2.3 \ - Utf.3 Tcl_UniCharToUtf.3 \ - Utf.3 Tcl_UtfToUniChar.3 \ - Utf.3 Tcl_UniCharToUtfDString.3 \ - Utf.3 Tcl_UtfToUniCharDString.3 \ - Utf.3 Tcl_UniCharLen.3 \ - Utf.3 Tcl_UniCharNcmp.3 \ - Utf.3 Tcl_UniCharNcasecmp.3 \ - Utf.3 Tcl_UniCharCaseMatch.3 \ - Utf.3 Tcl_UtfNcmp.3 \ - Utf.3 Tcl_UtfNcasecmp.3 \ - Utf.3 Tcl_UtfCharComplete.3 \ - Utf.3 Tcl_NumUtfChars.3 \ - Utf.3 Tcl_UtfFindFirst.3 \ - Utf.3 Tcl_UtfFindLast.3 \ - Utf.3 Tcl_UtfNext.3 \ - Utf.3 Tcl_UtfPrev.3 \ - Utf.3 Tcl_UniCharAtIndex.3 \ - Utf.3 Tcl_UtfAtIndex.3 \ - Utf.3 Tcl_UtfBackslash.3 \ - WrongNumArgs.3 Tcl_WrongNumArgs.3 \ - library.n auto_execok.n \ - library.n auto_import.n \ - library.n auto_load.n \ - library.n auto_mkindex.n \ - library.n auto_mkindex_old.n \ - library.n auto_qualify.n \ - library.n auto_reset.n \ - library.n tcl_findLibrary.n \ - library.n parray.n \ - library.n tcl_endOfWord.n \ - library.n tcl_startOfNextWord.n \ - library.n tcl_startOfPreviousWord.n \ - library.n tcl_wordBreakAfter.n \ - library.n tcl_wordBreakBefore.n \ - packagens.n pkg::create.n \ - pkgMkIndex.n pkg_mkIndex.n \ - safe.n SafeBase.n +PLIST_SUB+= TZDATA="@comment " +CONFIGURE_ARGS+=--without-tzdata .endif -.endif # defined(BUILDING_TCL_THREADS) - -TCLBASE?= ${PORTSDIR}/${PKGCATEGORY}/${LATEST_LINK} -post-patch: - @${REINPLACE_CMD} -e 's|tclsh |tclsh${TCL_VER}${THREADS_SUFFIX} |g' -e 's|Tclsh |Tclsh${TCL_VER}${THREADS_SUFFIX} |g' \ - -e 's|tclsh\\fR|tclsh${TCL_VER}${THREADS_SUFFIX}\\fR|g' -e 's|Tclsh\\fR|Tclsh${TCL_VER}${THREADS_SUFFIX}\\fR|g' \ - -e 's|^.so man.macros|.so ${DATADIR}/man.macros|' \ - ${WRKSRC}/../doc/tclsh.1 - @${FIND} ${WRKDIR} -name \*.orig -delete -.if defined(BUILDING_TCL_THREADS) - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \ - -e 's|$${TCL_TRIM_DOTS}|$${TCL_TRIM_DOTS}${THREADS_SUFFIX}|g' \ - -e 's|-ltcl$${TCL_VERSION}|-ltcl$${TCL_VERSION}${THREADS_SUFFIX}|g' \ - -e 's/-ltcl`echo $${TCL_VERSION} | tr -d .`/-ltcl`echo $${TCL_VERSION} | tr -d .`${THREADS_SUFFIX}/g' \ - -e 's|-ltclstub$${TCL_VERSION}|-ltclstub$${TCL_VERSION}${THREADS_SUFFIX}|g' \ - -e 's/-ltclstub`echo $${TCL_VERSION} | tr -d .`/-ltclstub`echo $${TCL_VERSION} | tr -d .`${THREADS_SUFFIX}/g' \ - ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's|libtcl$${SHORT_TCL_VER}|libtcl$${SHORT_TCL_VER}${THREADS_SUFFIX}|g' \ - -e 's|/tclsh$$(VERSION)|/tclsh$$(VERSION)${THREADS_SUFFIX}|g' \ - -e 's|/tclConfig.sh|/tclConfig${THREADS_SUFFIX}.sh|g' \ - ${WRKSRC}/Makefile.in +.if (${ARCH} == "ia64") +BROKEN= does not compile on ia64 .endif -# Where the below command fails, there is no need for concern: -BLACKHOLE!= ${SYSCTL} -n net.inet.tcp.blackhole || ${TRUE} - post-configure: ${REINPLACE_CMD} \ - -e 's|${WRKDIRPREFIX}${.CURDIR}|${WRKDIRPREFIX}${TCLBASE}|' \ - ${WRKSRC}/tclConfig.sh - ${REINPLACE_CMD} \ -e 's,-DNO_MEMMOVE=1,,' -e 's,-DNO_STRING_H=1,,' \ -e 's,^COMPAT_OBJS.*,,' ${WRKSRC}/Makefile -.if ${BLACKHOLE} != '' && ${BLACKHOLE} != 0 - # ==================================================== - # net.inet.tcp.blackhole is non-zero. Some http-tests - # will appear to hang and then fail. Do not be alarmed. - # The socket.test would hang, so it is disabled: - ${MV} ${WRKSRC:H}/tests/socket.test ${WRKSRC:H}/tests/socket.test.dis; - # ==================================================== -.endif - -.if defined(BUILDING_TCL_THREADS) -do-install: - @cd ${WRKSRC} && ${MAKE_ENV} ${MAKE} -f Makefile install-binaries - @${MKDIR} ${PREFIX}/lib/tcl${TCL_VER}${THREADS_SUFFIX} - @${LN} -s ${PREFIX}/lib/tcl${TCL_VER}/tclConfig${THREADS_SUFFIX}.sh ${PREFIX}/lib/tcl${TCL_VER}${THREADS_SUFFIX}/tclConfig.sh -.endif - -post-install: -.if ${PORT_OPTIONS:MTZDATA} - @cd ${WRKSRC} && ${MAKE} -f Makefile install-tzdata ${MAKE_ENV} -.endif - ${MKDIR} ${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/../doc/man.macros ${DATADIR} - ${MKDIR} ${MANPREFIX}/man/man1 - ${INSTALL_MAN} ${WRKSRC}/../doc/tclsh.1 ${MANPREFIX}/man/man1/tclsh${TCL_VER}${THREADS_SUFFIX}.1 -.if !defined(BUILDING_TCL_THREADS) && ${PORT_OPTIONS:MTCL85_MAN} -. for mp in ${MAN3} ${MANN} - @${REINPLACE_CMD} -e 's|^.so man.macros|.so ${DATADIR}/man.macros|' \ - ${WRKSRC}/../doc/${mp} -. endfor - @cd ${WRKSRC} && ${MAKE} -f Makefile install-doc ${MAKE_ENV} - -.endif # !defined(BUILDING_TCL_THREADS) && ${PORT_OPTIONS:MTCL85_MAN} regression-test: build cd ${WRKSRC} && LC_ALL=C ${MAKE} test -.endif # !defined(BUILDING_TCL_TM) - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/lang/tcl85/files/patch-unix-Makefile.in b/lang/tcl85/files/patch-unix-Makefile.in index 94b288bc29f8..fd8f3e9959d1 100644 --- a/lang/tcl85/files/patch-unix-Makefile.in +++ b/lang/tcl85/files/patch-unix-Makefile.in @@ -1,5 +1,5 @@ ---- Makefile.in.bak 2012-11-20 23:39:58.000000000 -0600 -+++ Makefile.in 2012-11-20 23:47:34.000000000 -0600 +--- Makefile.in.orig 2012-11-09 16:14:39.000000000 +0100 ++++ Makefile.in 2013-01-10 15:47:17.000000000 +0100 @@ -54,6 +54,8 @@ # Directory in which to install the include file tcl.h: @@ -104,7 +104,7 @@ @echo "Installing library files to $(SCRIPT_INSTALL_DIR)/"; @for i in $(TOP_DIR)/library/*.tcl $(TOP_DIR)/library/tclIndex \ $(UNIX_DIR)/tclAppInit.c @LDAIX_SRC@ @DTRACE_SRC@; \ -@@ -766,23 +788,11 @@ +@@ -766,32 +788,31 @@ do \ $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/http1.0; \ done; @@ -128,67 +128,32 @@ @echo "Installing encoding files to $(SCRIPT_INSTALL_DIR)/encoding/"; @for i in $(TOP_DIR)/library/encoding/*.enc ; do \ $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/encoding; \ -@@ -792,6 +802,27 @@ - echo "if {![interp issafe]} { ::tcl::tm::roots {$(TCL_MODULE_PATH)} }" >> \ - "$(SCRIPT_INSTALL_DIR)"/tm.tcl; \ - fi + done; +- @if [ -n "$(TCL_MODULE_PATH)" -a -f $(TOP_DIR)/library/tm.tcl ]; then \ +- echo "Customizing tcl module path"; \ +- echo "if {![interp issafe]} { ::tcl::tm::roots {$(TCL_MODULE_PATH)} }" >> \ +- "$(SCRIPT_INSTALL_DIR)"/tm.tcl; \ +- fi ++ echo "Customizing tcl module path"; \ ++ echo "if {![interp issafe]} { ::tcl::tm::path add {$(SCRIPT_INSTALL_DIR)} }" >> \ ++ "$(SCRIPT_INSTALL_DIR)"/tm.tcl; ++ +install-tm: -+ @for i in tcl8 tcl8/8.4 tcl8/8.4/platform tcl8/8.5; \ -+ do \ -+ if [ ! -d "$(LIB_INSTALL_DIR)"/$$i ] ; then \ -+ echo "Making directory $(LIB_INSTALL_DIR)/$$i"; \ -+ mkdir -p "$(LIB_INSTALL_DIR)"/$$i; \ -+ chmod 755 "$(LIB_INSTALL_DIR)"/$$i; \ -+ else true; \ -+ fi; \ -+ done; + @echo "Installing package http 2.7.10 as a Tcl Module"; -+ @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(LIB_INSTALL_DIR)"/tcl8/8.4/http-2.7.10.tm; ++ @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/http-2.7.10.tm; + @echo "Installing package msgcat 1.5.0 as a Tcl Module"; -+ @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(LIB_INSTALL_DIR)"/tcl8/8.5/msgcat-1.5.0.tm; ++ @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/msgcat-1.5.0.tm; + @echo "Installing package tcltest 2.3.4 as a Tcl Module"; -+ @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(LIB_INSTALL_DIR)"/tcl8/8.5/tcltest-2.3.4.tm; -+ ++ @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/tcltest-2.3.4.tm; + @echo "Installing package platform 1.0.10 as a Tcl Module"; -+ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(LIB_INSTALL_DIR)"/tcl8/8.4/platform-1.0.10.tm; ++ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/platform-1.0.10.tm; + @echo "Installing package platform::shell 1.1.4 as a Tcl Module"; -+ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl "$(LIB_INSTALL_DIR)"/tcl8/8.4/platform/shell-1.1.4.tm; ++ @$(INSTALL_DATA_DIR) "$(LIB_INSTALL_DIR)"/platform; ++ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl "$(SCRIPT_INSTALL_DIR)"/platform/shell-1.1.4.tm; install-tzdata: ${TCL_EXE} @echo "Installing time zone files to $(SCRIPT_INSTALL_DIR)/tzdata/" -@@ -823,18 +854,23 @@ - else true; \ - fi; \ - done; -- @echo "Installing and cross-linking top-level (.1) docs to $(MAN1_INSTALL_DIR)/"; -- @for i in $(TOP_DIR)/doc/*.1; do \ -- $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MAN1_INSTALL_DIR)"; \ -- done - @echo "Installing and cross-linking C API (.3) docs to $(MAN3_INSTALL_DIR)/"; - @for i in $(TOP_DIR)/doc/*.3; do \ -- $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MAN3_INSTALL_DIR)"; \ -- done -+ $(BSD_INSTALL_MAN) $$i "$(MAN3_INSTALL_DIR)"; \ -+ done; - @echo "Installing and cross-linking command (.n) docs to $(MANN_INSTALL_DIR)/"; - @for i in $(TOP_DIR)/doc/*.n; do \ -- $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MANN_INSTALL_DIR)"; \ -- done -+ $(BSD_INSTALL_MAN) $$i "$(MANN_INSTALL_DIR)"; \ -+ done; -+ @echo "**********" -+ @echo "IMPORTANT:" -+ @echo "**********" -+ @echo "tclConfig.sh in $(SCRIPT_INSTALL_DIR)/tclConfig.sh" -+ @echo "tcl.h in $(INCLUDE_INSTALL_DIR)/tcl.h" -+ @echo "tclDecls.h in $(INCLUDE_INSTALL_DIR)/tclDecls.h" -+ @echo "There are NOT default place, but good place to avoid" -+ @echo "conflicting with another version of Tcl/Tks." -+ - - # Optional target to install private headers - install-private-headers: libraries -@@ -1537,7 +1573,7 @@ +@@ -1537,7 +1558,7 @@ match=1; \ fi; \ done; \ @@ -197,7 +162,7 @@ done # -@@ -1554,7 +1590,7 @@ +@@ -1554,7 +1575,7 @@ match=1; \ fi; \ done; \ diff --git a/lang/tcl85/pkg-plist b/lang/tcl85/pkg-plist index 45dcc77e5b20..a7a23ff9e3da 100644 --- a/lang/tcl85/pkg-plist +++ b/lang/tcl85/pkg-plist @@ -111,7 +111,6 @@ lib/tcl%%TCL_VER%%/history.tcl lib/tcl%%TCL_VER%%/http1.0/http.tcl lib/tcl%%TCL_VER%%/http1.0/pkgIndex.tcl lib/tcl%%TCL_VER%%/init.tcl -lib/tcl%%TCL_VER%%/tm.tcl lib/tcl%%TCL_VER%%/msgs/af.msg lib/tcl%%TCL_VER%%/msgs/af_za.msg lib/tcl%%TCL_VER%%/msgs/ar.msg @@ -247,6 +246,8 @@ lib/tcl%%TCL_VER%%/safe.tcl lib/tcl%%TCL_VER%%/tclAppInit.c lib/tcl%%TCL_VER%%/tclConfig.sh lib/tcl%%TCL_VER%%/tclIndex +lib/tcl%%TCL_VER%%/tm.tcl +lib/tcl%%TCL_VER%%/word.tcl %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/CST6CDT %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/CET %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/PST8PDT @@ -835,9 +836,6 @@ lib/tcl%%TCL_VER%%/tclIndex %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/US/Pacific %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/US/Pacific-New %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/US/Samoa -lib/tcl%%TCL_VER%%/word.tcl -%%DATADIR%%/man.macros -@dirrm %%DATADIR%% %%TZDATA%%@dirrm lib/tcl%%TCL_VER%%/tzdata/US %%TZDATA%%@dirrm lib/tcl%%TCL_VER%%/tzdata/SystemV %%TZDATA%%@dirrm lib/tcl%%TCL_VER%%/tzdata/Pacific @@ -860,6 +858,12 @@ lib/tcl%%TCL_VER%%/word.tcl %%TZDATA%%@dirrm lib/tcl%%TCL_VER%%/tzdata/America %%TZDATA%%@dirrm lib/tcl%%TCL_VER%%/tzdata/Africa %%TZDATA%%@dirrm lib/tcl%%TCL_VER%%/tzdata +%%MODULES%%lib/tcl%%TCL_VER%%/http-2.7.10.tm +%%MODULES%%lib/tcl%%TCL_VER%%/platform/shell-1.1.4.tm +%%MODULES%%lib/tcl%%TCL_VER%%/platform-1.0.10.tm +%%MODULES%%lib/tcl%%TCL_VER%%/msgcat-1.5.0.tm +%%MODULES%%lib/tcl%%TCL_VER%%/tcltest-2.3.4.tm +@dirrm lib/tcl%%TCL_VER%%/platform @dirrm lib/tcl%%TCL_VER%%/opt0.4 @dirrm lib/tcl%%TCL_VER%%/msgs @dirrm lib/tcl%%TCL_VER%%/http1.0 diff --git a/lang/tcl85/pkg-plist.threads b/lang/tcl85/pkg-plist.threads deleted file mode 100644 index 409c1f9139dd..000000000000 --- a/lang/tcl85/pkg-plist.threads +++ /dev/null @@ -1,8 +0,0 @@ -bin/tclsh%%TCL_VER%%-threads -lib/libtcl%%SHORT_TCL_VER%%-threads.a -lib/libtcl%%SHORT_TCL_VER%%-threads.so -lib/libtcl%%SHORT_TCL_VER%%-threads.so.1 -lib/libtclstub%%SHORT_TCL_VER%%-threads.a -lib/tcl%%TCL_VER%%/tclConfig-threads.sh -lib/tcl%%TCL_VER%%-threads/tclConfig.sh -@dirrm lib/tcl%%TCL_VER%%-threads diff --git a/lang/tcl85/pkg-plist.tm b/lang/tcl85/pkg-plist.tm deleted file mode 100644 index fd35f7d580a9..000000000000 --- a/lang/tcl85/pkg-plist.tm +++ /dev/null @@ -1,9 +0,0 @@ -lib/tcl8/8.4/http-2.7.10.tm -lib/tcl8/8.4/platform/shell-1.1.4.tm -lib/tcl8/8.4/platform-1.0.10.tm -lib/tcl8/8.5/msgcat-1.5.0.tm -lib/tcl8/8.5/tcltest-2.3.4.tm -@dirrmtry lib/tcl8/8.4/platform -@dirrmtry lib/tcl8/8.4 -@dirrmtry lib/tcl8/8.5 -@dirrmtry lib/tcl8 diff --git a/lang/tcl86-thread/Makefile b/lang/tcl86-thread/Makefile deleted file mode 100644 index b17dedde673d..000000000000 --- a/lang/tcl86-thread/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -# New ports collection makefile for: tcl85-thread -# Date created: 17 January 2007 -# Whom: Martin Matuska <mm@FreeBSD.org> -# -# $FreeBSD$ -# - -PORTNAME= tcl - -MAINTAINER= tcltk@FreeBSD.org -COMMENT= Tool command language (threads support) - -BUILDING_TCL_THREADS= yes - -MASTERDIR= ${.CURDIR}/../tcl86 - -.include "${MASTERDIR}/Makefile" diff --git a/lang/tcl86/distinfo b/lang/tcl86/distinfo index 1728d1a7b043..33c69d46dfd3 100644 --- a/lang/tcl86/distinfo +++ b/lang/tcl86/distinfo @@ -1,2 +1,2 @@ -SHA256 (tcl8.6b3-src.tar.gz) = a96323570d986ef02fff611cd2c401c6888b0534a17ca68dd3b5c69ee0f29b38 -SIZE (tcl8.6b3-src.tar.gz) = 8078739 +SHA256 (tcl8.6.0-src.tar.gz) = 354422b9c4791685499123b2dfe01faa98b555c08906c010cb4449ddc75dcade +SIZE (tcl8.6.0-src.tar.gz) = 8636908 diff --git a/lang/tcl86/files/patch-unix-Makefile.in b/lang/tcl86/files/patch-unix-Makefile.in index 694159f900d0..ca29256a492b 100644 --- a/lang/tcl86/files/patch-unix-Makefile.in +++ b/lang/tcl86/files/patch-unix-Makefile.in @@ -1,5 +1,5 @@ ---- Makefile.in.orig 2012-09-17 15:07:09.000000000 +0200 -+++ Makefile.in 2012-09-17 17:29:57.000000000 +0200 +--- Makefile.in.orig 2012-12-20 16:02:15.000000000 +0100 ++++ Makefile.in 2013-01-09 16:51:17.000000000 +0100 @@ -54,6 +54,8 @@ # Directory in which to install the include file tcl.h: @@ -9,7 +9,7 @@ # Path to the private tcl header dir: PRIVATE_INCLUDE_DIR = @PRIVATE_INCLUDE_DIR@ -@@ -80,7 +82,7 @@ +@@ -80,10 +82,10 @@ HTML_INSTALL_DIR = $(INSTALL_ROOT)$(HTML_DIR) # Directory in which to install the configuration file tclConfig.sh @@ -17,16 +17,11 @@ +CONFIG_INSTALL_DIR = $(SCRIPT_INSTALL_DIR) # Directory in which to install bundled packages: - PACKAGE_DIR = @PACKAGE_DIR@ -@@ -103,7 +105,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@ +-PACKAGE_DIR = @PACKAGE_DIR@ ++PACKAGE_DIR = $(SCRIPT_INSTALL_DIR) + + # Package search path. + TCL_PACKAGE_PATH = @TCL_PACKAGE_PATH@ @@ -601,9 +603,9 @@ # Start of rules #-------------------------------------------------------------------------- @@ -39,52 +34,52 @@ libraries: -@@ -614,11 +616,19 @@ +@@ -614,10 +616,15 @@ ${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 -+ + @if test "x$(DLL_INSTALL_DIR)" = "x$(BIN_INSTALL_DIR)"; then\ + cp ${ZLIB_DIR}/win32/zlib1.dll .;\ + 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 - @if test "x$(DLL_INSTALL_DIR)" = "x$(BIN_INSTALL_DIR)"; then\ - cp ${ZLIB_DIR}/win32/zlib1.dll .;\ - fi -- ${STUB_LIB_FILE}: ${STUB_LIB_OBJS} rm -f $@ - @MAKE_STUB_LIB@ -@@ -759,8 +769,8 @@ +@@ -758,13 +765,13 @@ + # Installation rules #-------------------------------------------------------------------------- - INSTALL_BASE_TARGETS = install-binaries install-libraries install-msgs $(INSTALL_TZDATA) --INSTALL_DOC_TARGETS = install-doc --INSTALL_PACKAGE_TARGETS = install-packages -+INSTALL_DOC_TARGETS = -+INSTALL_PACKAGE_TARGETS = +-INSTALL_BASE_TARGETS = install-binaries install-libraries install-msgs $(INSTALL_TZDATA) ++INSTALL_BASE_TARGETS = install-binaries install-msgs $(INSTALL_TZDATA) + INSTALL_DOC_TARGETS = install-doc + INSTALL_PACKAGE_TARGETS = install-packages INSTALL_DEV_TARGETS = install-headers INSTALL_EXTRA_TARGETS = @EXTRA_INSTALL@ - INSTALL_TARGETS = $(INSTALL_BASE_TARGETS) $(INSTALL_DOC_TARGETS) $(INSTALL_DEV_TARGETS) \ -@@ -795,6 +805,12 @@ +-INSTALL_TARGETS = $(INSTALL_BASE_TARGETS) $(INSTALL_DOC_TARGETS) $(INSTALL_DEV_TARGETS) \ +- $(INSTALL_PACKAGE_TARGETS) $(INSTALL_EXTRA_TARGETS) ++INSTALL_TARGETS = $(INSTALL_BASE_TARGETS) $(INSTALL_DEV_TARGETS) \ ++ $(INSTALL_EXTRA_TARGETS) + + install: $(INSTALL_TARGETS) + +@@ -795,6 +802,11 @@ @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 ++ @ln -sf $(LIB_FILE) "$(DLL_INSTALL_DIR)"/libtcl${SHORT_TCL_VER}.so ++ @echo "Installing libtcl${SHORT_TCL_VER}.a to $(DLL_INSTALL_DIR)" ++ @$(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)${EXE_SUFFIX}" @$(INSTALL_PROGRAM) ${TCL_EXE} "$(BIN_INSTALL_DIR)/tclsh$(VERSION)${EXE_SUFFIX}" @echo "Installing tclConfig.sh to $(CONFIG_INSTALL_DIR)/" -@@ -807,9 +823,9 @@ +@@ -807,12 +819,12 @@ @INSTALL_STUB_LIB@ ; \ fi @EXTRA_INSTALL_BINARIES@ @@ -96,85 +91,116 @@ + @$(INSTALL_DATA) tcl.pc $(prefix)/libdata/pkgconfig/tcl.pc install-libraries: libraries - @for i in "$(SCRIPT_INSTALL_DIR)"; \ -@@ -820,7 +836,7 @@ +- @for i in "$(SCRIPT_INSTALL_DIR)"; \ ++ @for i in "$(SCRIPT_INSTALL_DIR)" "$(SCRIPT_INSTALL_DIR)"/encoding; \ + do \ + if [ ! -d "$$i" ] ; then \ + echo "Making directory $$i"; \ +@@ -820,7 +832,19 @@ else true; \ fi; \ done; - @for i in opt0.4 http1.0 encoding ../tcl8 ../tcl8/8.4 ../tcl8/8.4/platform ../tcl8/8.5 ../tcl8/8.6; \ -+ @for i in opt0.4 http1.0 encoding ; \ ++ @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@; \ ++ do \ ++ $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"; \ ++ done; ++ @echo "Installing encoding files to $(SCRIPT_INSTALL_DIR)/encoding/"; ++ @for i in $(TOP_DIR)/library/encoding/*.enc ; do \ ++ $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/encoding; \ ++ done; ++ ++install-modules: libraries ++ @for i in opt0.4 http1.0 platform; \ do \ if [ ! -d "$(SCRIPT_INSTALL_DIR)"/$$i ] ; then \ echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \ -@@ -848,13 +864,13 @@ +@@ -828,47 +852,33 @@ + else true; \ + fi; \ + done; +- @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@; \ +- do \ +- $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"; \ +- done; + @echo "Installing package http1.0 files to $(SCRIPT_INSTALL_DIR)/http1.0/"; + @for i in $(TOP_DIR)/library/http1.0/*.tcl ; \ + do \ + $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/http1.0; \ + done; + @echo "Installing package http 2.8.5 as a Tcl Module"; +- @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.6/http-2.8.5.tm; ++ @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/http-2.8.5.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.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 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/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/msgcat-1.5.0.tm; ++ @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/msgcat-1.5.0.tm; + @echo "Installing package tcltest 2.3.5 as a Tcl Module"; +- @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/tcltest-2.3.5.tm; +- ++ @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/tcltest-2.3.5.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/platform.tcl "$(SCRIPT_INSTALL_DIR)"/platform-1.0.10.tm; + @echo "Installing package platform::shell 1.1.4 as a Tcl Module"; - @$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform/shell-1.1.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 encoding files to $(SCRIPT_INSTALL_DIR)/encoding/"; - @for i in $(TOP_DIR)/library/encoding/*.enc ; do \ -@@ -894,23 +910,23 @@ - else true; \ - fi; \ - done; -- @echo "Installing and cross-linking top-level (.1) docs to $(MAN1_INSTALL_DIR)/"; -- @for i in $(TOP_DIR)/doc/*.1; do \ -- $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MAN1_INSTALL_DIR)"; \ -- done -+# @echo "Installing and cross-linking top-level (.1) docs to $(MAN1_INSTALL_DIR)/"; -+# @for i in $(TOP_DIR)/doc/*.1; do \ -+# $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MAN1_INSTALL_DIR)"; \ -+# done - - @echo "Installing and cross-linking C API (.3) docs to $(MAN3_INSTALL_DIR)/"; - @for i in $(TOP_DIR)/doc/*.3; do \ -- $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MAN3_INSTALL_DIR)"; \ -+ ${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}"; \ ++ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl "$(SCRIPT_INSTALL_DIR)"/platform/shell-1.1.4.tm; ++ @echo "Customizing tcl module path"; \ ++ echo "if {![interp issafe]} { ::tcl::tm::path add {$(SCRIPT_INSTALL_DIR)} }" >> \ ++ "$(SCRIPT_INSTALL_DIR)"/tm.tcl; \ + +- @echo "Installing encoding files to $(SCRIPT_INSTALL_DIR)/encoding/"; +- @for i in $(TOP_DIR)/library/encoding/*.enc ; do \ +- $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/encoding; \ +- done; +- @if [ -n "$(TCL_MODULE_PATH)" -a -f $(TOP_DIR)/library/tm.tcl ]; then \ +- echo "Customizing tcl module path"; \ +- echo "if {![interp issafe]} { ::tcl::tm::roots {$(TCL_MODULE_PATH)} }" >> \ +- "$(SCRIPT_INSTALL_DIR)"/tm.tcl; \ +- fi +- +-install-tzdata: ${NATIVE_TCLSH} ++install-tzdata: + @echo "Installing time zone files to $(SCRIPT_INSTALL_DIR)/tzdata/" +- @${NATIVE_TCLSH} $(TOOL_DIR)/installData.tcl \ ++ ./tclsh $(TOOL_DIR)/installData.tcl \ + $(TOP_DIR)/library/tzdata "$(SCRIPT_INSTALL_DIR)"/tzdata + + install-msgs: +@@ -910,7 +920,7 @@ done install-headers: - @for i in "$(INCLUDE_INSTALL_DIR)"; \ -+ @for i in "$(GENERIC_INCLUDE_INSTALL_DIR)" "$(UNIX_INCLUDE_INSTALL_DIR)"; \ ++ @for i in "$(INCLUDE_INSTALL_DIR)" "$(GENERIC_INCLUDE_INSTALL_DIR)" "$(UNIX_INCLUDE_INSTALL_DIR)"; \ do \ if [ ! -d "$$i" ] ; then \ echo "Making directory $$i"; \ -@@ -918,15 +934,21 @@ - else true; \ +@@ -919,14 +929,21 @@ fi; \ done; -- @echo "Installing header files to $(INCLUDE_INSTALL_DIR)/"; + @echo "Installing header files to $(INCLUDE_INSTALL_DIR)/"; - @for i in $(GENERIC_DIR)/tcl.h $(GENERIC_DIR)/tclDecls.h \ - $(GENERIC_DIR)/tclOO.h $(GENERIC_DIR)/tclOODecls.h \ - $(GENERIC_DIR)/tclPlatDecls.h \ - $(GENERIC_DIR)/tclTomMath.h \ - $(GENERIC_DIR)/tclTomMathDecls.h ; \ -+ @for i in $(GENERIC_DIR)/*.h ; \ ++ @for i in $(GENERIC_DIR)/*.h; \ + do \ -+ $(INSTALL_DATA) $$i "$(GENERIC_INCLUDE_INSTALL_DIR)"; \ ++ $(INSTALL_DATA) $$i "$(GENERIC_INCLUDE_INSTALL_DIR)/"; \ + done; -+ @for i in $(UNIX_DIR)/*.h ; \ ++ @for i in $(UNIX_DIR)/*.h; \ do \ - $(INSTALL_DATA) $$i "$(INCLUDE_INSTALL_DIR)"; \ -+ $(INSTALL_DATA) $$i "$(UNIX_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 diff --git a/lang/tcl86/files/patch-unix-configure b/lang/tcl86/files/patch-unix-configure index 9dd8532a451b..a64e49d75001 100644 --- a/lang/tcl86/files/patch-unix-configure +++ b/lang/tcl86/files/patch-unix-configure @@ -1,45 +1,6 @@ ---- configure.orig 2007-12-19 22:50:13.000000000 +0100 -+++ configure 2007-12-26 11:49:03.000000000 +0100 -@@ -6633,7 +6633,7 @@ - LDFLAGS_ARCH="" - 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 -@@ -7624,7 +7624,7 @@ - SHLIB_SUFFIX=".so" - DL_OBJS="tclLoadDl.o" - DL_LIBS="" -- LDFLAGS="$LDFLAGS -export-dynamic" -+ LDFLAGS="" - if test $doRpath = yes; then - - CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' -@@ -7635,16 +7635,16 @@ - - # The -pthread needs to go in the CFLAGS, not LIBS - LIBS=`echo $LIBS | sed s/-pthread//` -- CFLAGS="$CFLAGS -pthread" -- LDFLAGS="$LDFLAGS -pthread" -+ CFLAGS="$CFLAGS $PTHREAD_CFLAGS" -+ LDFLAGS="$LDFLAGS $PTHREAD_LIBS" - - fi - - case $system in -- FreeBSD-3.*) -+ FreeBSD-*) - # FreeBSD-3 doesn't handle version numbers with dots. - UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a' -- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so' -+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1' - TCL_LIB_VERSIONS_OK=nodots - ;; - esac -@@ -7831,7 +7831,7 @@ +--- configure.orig 2012-12-21 14:28:04.000000000 +0100 ++++ configure 2012-12-21 14:28:22.000000000 +0100 +@@ -7913,7 +7913,7 @@ # This configuration from FreeBSD Ports. SHLIB_CFLAGS="-fPIC" SHLIB_LD="${CC} -shared" diff --git a/lang/tcl86/pkg-plist b/lang/tcl86/pkg-plist index 9f8f5ede3fea..4e5880af3a86 100644 --- a/lang/tcl86/pkg-plist +++ b/lang/tcl86/pkg-plist @@ -1,4 +1,8 @@ bin/tclsh%%TCL_VER%% +lib/libtcl%%SHORT_TCL_VER%%.a +lib/libtcl%%SHORT_TCL_VER%%.so +lib/libtcl%%SHORT_TCL_VER%%.so.1 +lib/libtclstub%%SHORT_TCL_VER%%.a include/tcl%%TCL_VER%%/generic/regcustom.h include/tcl%%TCL_VER%%/generic/regerrs.h include/tcl%%TCL_VER%%/generic/regex.h @@ -20,9 +24,11 @@ include/tcl%%TCL_VER%%/generic/tclPlatDecls.h include/tcl%%TCL_VER%%/generic/tclPort.h include/tcl%%TCL_VER%%/generic/tclRegexp.h include/tcl%%TCL_VER%%/generic/tclTomMath.h -include/tcl%%TCL_VER%%/generic/tclTomMathDecls.h include/tcl%%TCL_VER%%/generic/tclTomMathInt.h +include/tcl%%TCL_VER%%/generic/tclTomMathDecls.h include/tcl%%TCL_VER%%/generic/tommath.h +include/tcl%%TCL_VER%%/unix/tclUnixPort.h +include/tcl%%TCL_VER%%/unix/tclUnixThrd.h include/tcl%%TCL_VER%%/tcl.h include/tcl%%TCL_VER%%/tclDecls.h include/tcl%%TCL_VER%%/tclPlatDecls.h @@ -30,12 +36,15 @@ include/tcl%%TCL_VER%%/tclOO.h include/tcl%%TCL_VER%%/tclOODecls.h include/tcl%%TCL_VER%%/tclTomMath.h include/tcl%%TCL_VER%%/tclTomMathDecls.h -include/tcl%%TCL_VER%%/unix/tclUnixPort.h -include/tcl%%TCL_VER%%/unix/tclUnixThrd.h -lib/libtcl%%SHORT_TCL_VER%%.a -lib/libtcl%%SHORT_TCL_VER%%.so -lib/libtcl%%SHORT_TCL_VER%%.so.1 -lib/libtclstub%%SHORT_TCL_VER%%.a +%%MODULES%%lib/tcl%%TCL_VER%%/http-2.8.5.tm +%%MODULES%%lib/tcl%%TCL_VER%%/http1.0/http.tcl +%%MODULES%%lib/tcl%%TCL_VER%%/http1.0/pkgIndex.tcl +%%MODULES%%lib/tcl%%TCL_VER%%/msgcat-1.5.0.tm +%%MODULES%%lib/tcl%%TCL_VER%%/opt0.4/optparse.tcl +%%MODULES%%lib/tcl%%TCL_VER%%/opt0.4/pkgIndex.tcl +%%MODULES%%lib/tcl%%TCL_VER%%/platform-1.0.10.tm +%%MODULES%%lib/tcl%%TCL_VER%%/platform/shell-1.1.4.tm +%%MODULES%%lib/tcl%%TCL_VER%%/tcltest-2.3.5.tm lib/tcl%%TCL_VER%%/auto.tcl lib/tcl%%TCL_VER%%/clock.tcl lib/tcl%%TCL_VER%%/encoding/ascii.enc @@ -117,10 +126,7 @@ 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%%/init.tcl -lib/tcl%%TCL_VER%%/tm.tcl lib/tcl%%TCL_VER%%/msgs/af.msg lib/tcl%%TCL_VER%%/msgs/af_za.msg lib/tcl%%TCL_VER%%/msgs/ar.msg @@ -248,8 +254,6 @@ lib/tcl%%TCL_VER%%/msgs/zh_cn.msg lib/tcl%%TCL_VER%%/msgs/zh_hk.msg lib/tcl%%TCL_VER%%/msgs/zh_sg.msg lib/tcl%%TCL_VER%%/msgs/zh_tw.msg -lib/tcl%%TCL_VER%%/opt0.4/optparse.tcl -lib/tcl%%TCL_VER%%/opt0.4/pkgIndex.tcl lib/tcl%%TCL_VER%%/package.tcl lib/tcl%%TCL_VER%%/parray.tcl lib/tcl%%TCL_VER%%/safe.tcl @@ -257,8 +261,8 @@ lib/tcl%%TCL_VER%%/tclAppInit.c lib/tcl%%TCL_VER%%/tclConfig.sh lib/tcl%%TCL_VER%%/tclIndex lib/tcl%%TCL_VER%%/tclooConfig.sh -lib/tcl8/8.6/http-2.8.4.tm -lib/tcl8/8.5/msgcat-1.5.0.tm +lib/tcl%%TCL_VER%%/tm.tcl +lib/tcl%%TCL_VER%%/word.tcl %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/CST6CDT %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/CET %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/PST8PDT @@ -847,8 +851,6 @@ lib/tcl8/8.5/msgcat-1.5.0.tm %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/US/Pacific %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/US/Pacific-New %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/US/Samoa -lib/tcl%%TCL_VER%%/word.tcl -@dirrm %%DATADIR%% %%TZDATA%%@dirrm lib/tcl%%TCL_VER%%/tzdata/US %%TZDATA%%@dirrm lib/tcl%%TCL_VER%%/tzdata/SystemV %%TZDATA%%@dirrm lib/tcl%%TCL_VER%%/tzdata/Pacific @@ -872,16 +874,12 @@ lib/tcl%%TCL_VER%%/word.tcl %%TZDATA%%@dirrm lib/tcl%%TCL_VER%%/tzdata/Africa %%TZDATA%%@dirrm lib/tcl%%TCL_VER%%/tzdata libdata/pkgconfig/tcl.pc -@dirrm lib/tcl%%TCL_VER%%/opt0.4 -@dirrm lib/tcl%%TCL_VER%%/msgs -@dirrm lib/tcl%%TCL_VER%%/http1.0 +%%MODULES%%@dirrm lib/tcl%%TCL_VER%%/platform +%%MODULES%%@dirrm lib/tcl%%TCL_VER%%/opt0.4 +%%MODULES%%@dirrm lib/tcl%%TCL_VER%%/http1.0 @dirrm lib/tcl%%TCL_VER%%/encoding -@dirrmtry lib/tcl%%TCL_VER%% +@dirrm lib/tcl%%TCL_VER%%/msgs +@dirrm lib/tcl%%TCL_VER%% @dirrm include/tcl%%TCL_VER%%/unix @dirrm include/tcl%%TCL_VER%%/generic @dirrm include/tcl%%TCL_VER%% -@dirrmtry lib/tcl8/%%TCL_VER%% -@dirrmtry lib/tcl8/8.5 -@dirrmtry lib/tcl8/8.4/platform -@dirrmtry lib/tcl8/8.4 -@dirrmtry lib/tcl8 diff --git a/lang/tcl86/pkg-plist.threads b/lang/tcl86/pkg-plist.threads deleted file mode 100644 index 00eb16f31b99..000000000000 --- a/lang/tcl86/pkg-plist.threads +++ /dev/null @@ -1,10 +0,0 @@ -bin/tclsh%%TCL_VER%%-threads -lib/libtcl%%SHORT_TCL_VER%%-threads.a -lib/libtcl%%SHORT_TCL_VER%%-threads.so -lib/libtcl%%SHORT_TCL_VER%%-threads.so.1 -lib/libtclstub%%SHORT_TCL_VER%%-threads.a -lib/tcl%%TCL_VER%%/tclConfig-threads.sh -lib/tcl%%TCL_VER%%/tclooConfig-threads.sh -lib/tcl%%TCL_VER%%-threads/tclConfig.sh -lib/tcl%%TCL_VER%%-threads/tclooConfig.sh -@dirrm lib/tcl%%TCL_VER%%-threads diff --git a/x11-toolkits/Makefile b/x11-toolkits/Makefile index 0d392e692163..75d42fc7b98d 100644 --- a/x11-toolkits/Makefile +++ b/x11-toolkits/Makefile @@ -253,11 +253,8 @@ SUBDIR += tk-wrapper SUBDIR += tk83 SUBDIR += tk84 - SUBDIR += tk84-thread SUBDIR += tk85 - SUBDIR += tk85-thread SUBDIR += tk86 - SUBDIR += tk86-thread SUBDIR += tkdnd SUBDIR += tkshape SUBDIR += tktable diff --git a/x11-toolkits/tk84-thread/Makefile b/x11-toolkits/tk84-thread/Makefile deleted file mode 100644 index 9082f3f1ee3b..000000000000 --- a/x11-toolkits/tk84-thread/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -# New ports collection makefile for: tk84-thread -# Date created: 09 March 2007 -# Whom: Martin Matuska <mm@FreeBSD.org> -# -# $FreeBSD$ -# - -PORTNAME= tk - -MAINTAINER= tcltk@FreeBSD.org -COMMENT= Graphical toolkit for Tcl (threads support) - -BUILDING_TK_THREADS= yes - -MASTERDIR= ${.CURDIR}/../tk84 - -.include "${MASTERDIR}/Makefile" diff --git a/x11-toolkits/tk84/Makefile b/x11-toolkits/tk84/Makefile index 28f585ebef6f..4daeafe03087 100644 --- a/x11-toolkits/tk84/Makefile +++ b/x11-toolkits/tk84/Makefile @@ -6,436 +6,77 @@ PORTREVISION= 2 PORTEPOCH= 2 CATEGORIES= x11-toolkits tk MASTER_SITES= SF/tcl/Tcl/${PORTVERSION} -PKGNAMESUFFIX?= ${THREADS_SUFFIX} DISTNAME= ${PORTNAME}${PORTVERSION}-src MAINTAINER= tcltk@FreeBSD.org -COMMENT?= Graphical toolkit for Tcl +COMMENT= Graphical toolkit for Tcl LICENSE= BSD LICENSE_FILE= ${WRKSRC}/../license.terms -LATEST_LINK?= tk84 -USE_XORG= x11 -USE_LDCONFIG= yes +OPTIONS_DEFINE= TKMAN THREADS +OPTIONS_DEFAULT=THREADS +TKMAN_DESC= Install Tk function manpages + WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERSION}/unix + +ALL_TARGET= all +INSTALL_TARGET= install + +USE_LDCONFIG= yes +USE_TCL= ${SHORT_TK_VER} +USE_XORG= x11 +CFLAGS+= -I${TCL_INCLUDEDIR}/generic GNU_CONFIGURE= yes -TK_VER= 8.4 -SHORT_TK_VER= 84 -CONFIGURE_ARGS= --enable-shared --with-tcl=${LOCALBASE}/lib/tcl${TK_VER} \ +CONFIGURE_ARGS= --enable-shared \ + --enable-man-suffix=.${MAN_SUFFIX} \ + --with-tcl=${TCL_LIBDIR} \ --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 -OPTIONS_DEFINE= TK84_DOC -TK84_DOC_DESC= Install tk 8.4 function manpages +CFLAGS+= -I${TCL_INCLUDEDIR} -.if !defined(BUILDING_TK_THREADS) -USE_TCL= 84 -.else -OPTIONS_EXCLUDE= TK84_DOC -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 +TK_VER= ${PORTVERSION:R} +SHORT_TK_VER= ${TK_VER:S/.//} +LATEST_LINK= ${PORTNAME}${SHORT_TK_VER} +MAN_SUFFIX= ${LATEST_LINK} -SUB_LIST+= THREADS_SUFFIX="${THREADS_SUFFIX}" +MAKE_ENV= SHORT_TK_VER=${SHORT_TK_VER} + +PLIST_SUB= TK_VER=${TK_VER} \ + SHORT_TK_VER=${SHORT_TK_VER} -.include <bsd.port.pre.mk> +SUB_FILES= pkgIndex.tcl -DATADIR= ${PREFIX}/share/${PORTNAME}${TCL_VER} +.include <bsd.port.options.mk> -.if !defined(NO_INSTALL_MANPAGES) -MAN1= wish${TCL_VER}${THREADS_SUFFIX}.1 +.if ${PORT_OPTIONS:MTKMAN} && !defined(NO_INSTALL_MANPAGES) +INSTALL_TARGET+=install-doc +.include "${.CURDIR}/Makefile.man" .endif -.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= tk84${THREADS_SUFFIX} -SUB_LIST+= TK_PROVIDE="; package provide Tk-threads ${TK_VER}" +.if ${PORT_OPTIONS:MTHREADS} +CONFIGURE_ARGS+= --enable-threads .else -CONFIGURE_ARGS+= --disable-threads --with-tcl=${LOCALBASE}/lib/tcl${TK_VER} -CONFIGURE_ENV+= ac_cv_path_tclsh="${TCLSH}" - -SUB_LIST+= TK_PROVIDE="" - - -.if !defined(NO_INSTALL_MANPAGES) && ${PORT_OPTIONS:MTK84_DOC} - -MAN3= 3DBorder.3 AddOption.3 BindTable.3 CanvPsY.3 CanvTkwin.3 \ - CanvTxtInfo.3 Clipboard.3 ClrSelect.3 ConfigWidg.3 ConfigWind.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 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 - -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 - -# 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_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_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_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_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 \ - 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 \ - 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 - +CONFIGURE_ARGS+= --disable-threads .endif -.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: @(cd ${WRKSRC}/..; ${PATCH} -p0 < ${PATCHDIR}/extra-lastevent-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|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$${VERSION}|-ltk$${VERSION}${THREADS_SUFFIX}|g' \ - -e 's/-ltk`echo $${VERSION} | tr -d .`/-ltk`echo $${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|$$(BIN_INSTALL_DIR)/wish$$(VERSION)|$$(BIN_INSTALL_DIR)/wish$$(VERSION)${THREADS_SUFFIX}|g' \ - -e 's|tk$$(VERSION)/tkConfig.sh|tk$$(VERSION)/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}|' \ + ${REINPLACE_CMD} -e 's|${WRKDIRPREFIX}${.CURDIR}|$${WRKDIRPREFIX}${TKBASE}|' \ ${WRKSRC}/tkConfig.sh -.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} -sf ${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} -.if !defined(NO_INSTALL_MANPAGES) - ${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:MTK84_DOC} -.for mp in ${MAN3} ${MANN} - @${REINPLACE_CMD} -e 's|^.so man.macros|.so ${DATADIR}/man.macros|' \ - ${WRKSRC}/../doc/${mp} -.endfor - @cd ${WRKSRC} && ${MAKE} install-doc ${MAKE_ENV} -.endif # !defined(BUILDING_TK_THREADS) && ${PORT_OPTIONS:MTK84_DOC} - -.endif # !defined(NO_INSTALL_MANPAGES) + ${INSTALL_DATA} ${WRKDIR}/pkgIndex.tcl ${PREFIX}/lib/tk${TK_VER}/ 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 <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11-toolkits/tk84/files/patch-ab b/x11-toolkits/tk84/files/patch-ab index 811954ede3dd..2f2adc900526 100644 --- a/x11-toolkits/tk84/files/patch-ab +++ b/x11-toolkits/tk84/files/patch-ab @@ -1,5 +1,5 @@ --- Makefile.in.orig 2008-04-17 17:14:08.000000000 +0200 -+++ Makefile.in 2009-02-26 12:06:12.362017966 +0100 ++++ Makefile.in 2013-01-11 14:38:01.000000000 +0100 @@ -64,6 +64,8 @@ # Directory in which to install the include file tk.h: @@ -131,28 +131,11 @@ @list='$(@TK_WINDOWINGSYSTEM@_XLIB_HDRS)'; for i in $$list ; \ do \ $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR)/X11; \ -@@ -749,20 +769,10 @@ - else true; \ +@@ -750,6 +770,7 @@ fi; \ done; -- @echo "Installing and cross-linking top-level (.1) docs"; -- @for i in $(TOP_DIR)/doc/*.1; do \ -- $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i $(MAN1_INSTALL_DIR); \ -- done -- -- @echo "Installing and cross-linking C API (.3) docs"; -- @for i in $(TOP_DIR)/doc/*.3; do \ -- $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i $(MAN3_INSTALL_DIR); \ -- done -- -- @echo "Installing and cross-linking command (.n) docs"; -- @for i in $(TOP_DIR)/doc/*.n; do \ -- $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i $(MANN_INSTALL_DIR); \ -- done -+ @echo "Installing C API (.3) docs"; -+ ${BSD_INSTALL_MAN} $(TOP_DIR)/doc/*.3 $(MAN3_INSTALL_DIR) -+ @echo "Installing command (.n) docs"; -+ ${BSD_INSTALL_MAN} $(TOP_DIR)/doc/*.n $(MANN_INSTALL_DIR) - - # Optional target to install private headers - install-private-headers: libraries + @echo "Installing and cross-linking top-level (.1) docs"; ++ @mv $(TOP_DIR)/doc/wish.1 $(TOP_DIR)/doc/wish${TCL_VER}.1 + @for i in $(TOP_DIR)/doc/*.1; do \ + $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i $(MAN1_INSTALL_DIR); \ + done diff --git a/x11-toolkits/tk84/files/pkgIndex.tcl.in b/x11-toolkits/tk84/files/pkgIndex.tcl.in index 903d6a2f0e68..aa7f7941f507 100644 --- a/x11-toolkits/tk84/files/pkgIndex.tcl.in +++ b/x11-toolkits/tk84/files/pkgIndex.tcl.in @@ -1,3 +1,3 @@ # Tcl package index file, version 1.0 -package ifneeded Tk%%THREADS_SUFFIX%% 8.4 "[list load "[file join [file dirname $dir] libtk84%%THREADS_SUFFIX%%.so.1]" Tk]%%TK_PROVIDE%%" +package ifneeded Tk 8.4 "[list load "[file join [file dirname $dir] libtk84.so.1]" Tk]" diff --git a/x11-toolkits/tk84/pkg-plist b/x11-toolkits/tk84/pkg-plist index 09c11b9a4bab..e2ddf4b94dba 100644 --- a/x11-toolkits/tk84/pkg-plist +++ b/x11-toolkits/tk84/pkg-plist @@ -159,8 +159,6 @@ lib/tk%%TK_VER%%/tkConfig.sh lib/tk%%TK_VER%%/tkfbox.tcl lib/tk%%TK_VER%%/unsupported.tcl lib/tk%%TK_VER%%/xmfbox.tcl -%%DATADIR%%/man.macros -@dirrm %%DATADIR%% @dirrm lib/tk%%TK_VER%%/demos/images @dirrm lib/tk%%TK_VER%%/demos @dirrm lib/tk%%TK_VER%%/images diff --git a/x11-toolkits/tk84/pkg-plist.threads b/x11-toolkits/tk84/pkg-plist.threads deleted file mode 100644 index e8dcd7da52be..000000000000 --- a/x11-toolkits/tk84/pkg-plist.threads +++ /dev/null @@ -1,9 +0,0 @@ -bin/wish%%TK_VER%%-threads -lib/libtk%%SHORT_TK_VER%%-threads.a -lib/libtk%%SHORT_TK_VER%%-threads.so -lib/libtk%%SHORT_TK_VER%%-threads.so.1 -lib/libtkstub%%SHORT_TK_VER%%-threads.a -lib/tk%%TK_VER%%/tkConfig-threads.sh -lib/tk%%TK_VER%%-threads/tkConfig.sh -lib/tk%%TK_VER%%-threads/pkgIndex.tcl -@dirrm lib/tk%%TK_VER%%-threads diff --git a/x11-toolkits/tk85-thread/Makefile b/x11-toolkits/tk85-thread/Makefile deleted file mode 100644 index d0f6ce8128cf..000000000000 --- a/x11-toolkits/tk85-thread/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -# New ports collection makefile for: tk85-thread -# Date created: 09 March 2007 -# Whom: Martin Matuska <mm@FreeBSD.org> -# -# $FreeBSD$ -# - -PORTNAME= tk - -MAINTAINER= tcltk@FreeBSD.org -COMMENT= Graphical toolkit for Tcl (threads support) - -BUILDING_TK_THREADS= yes - -MASTERDIR= ${.CURDIR}/../tk85 - -.include "${MASTERDIR}/Makefile" diff --git a/x11-toolkits/tk85/Makefile b/x11-toolkits/tk85/Makefile index 9256058bac62..055c58d6effb 100644 --- a/x11-toolkits/tk85/Makefile +++ b/x11-toolkits/tk85/Makefile @@ -5,24 +5,32 @@ PORTNAME= tk PORTVERSION= 8.5.13 CATEGORIES= x11-toolkits MASTER_SITES= SF/tcl/Tcl/${PORTVERSION} -PKGNAMESUFFIX?= ${THREADS_SUFFIX} DISTNAME= ${PORTNAME}${PORTVERSION}-src MAINTAINER= tcltk@FreeBSD.org -COMMENT?= Graphical toolkit for Tcl +COMMENT= Graphical toolkit for Tcl LICENSE= BSD + LICENSE_TERMS= ${WRKSRC}/../license.terms -LATEST_LINK?= tk85 +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 +CONFIGURE_ARGS= --enable-shared --with-tcl=${TCL_LIBDIR} \ + --includedir=${PREFIX}/include/tk${TK_VER} \ + --enable-man-suffix=.${MAN_SUFFIX} +CONFIGURE_ENV= PORTSDIR=${PORTSDIR} TK_LIB_FILE=libtk${SHORT_TK_VER}.so.1 \ + ac_cv_path_tclsh="${LOCALBASE}/bin/tclsh${TK_VER}" +LATEST_LINK= ${PORTNAME}${SHORT_TK_VER} +MAN_SUFFIX= ${LATEST_LINK} + +INSTALL_TARGET= install + 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 @@ -32,24 +40,15 @@ 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 +OPTIONS_DEFINE= TK85_MAN XFT DEMOS THREADS +OPTIONS_DEFAULT= XFT THREADS TK85_MAN_DESC= Install tk 8.5 function manpages 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}" +SUB_LIST+= TCLPATCHLEVEL="${PORTVERSION}" .include <bsd.port.pre.mk> @@ -57,24 +56,18 @@ DATADIR= ${PREFIX}/share/${PORTNAME}${TCL_VER} .if ${PORT_OPTIONS:MXFT} CONFIGURE_ARGS+= --enable-xft -LIB_DEPENDS+= Xft.2:${PORTSDIR}/x11-fonts/libXft +LIB_DEPENDS+= Xft:${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}" +.if ${PORT_OPTIONS:MTHREADS} +CONFIGURE_ARGS+= --enable-threads .else -CONFIGURE_ARGS+= --disable-threads --with-tcl=${LOCALBASE}/lib/tcl${TK_VER} \ - ac_cv_path_tclsh="${TCLSH}" +CONFIGURE_ARGS+= --disable-threads +.endif -SUB_LIST+= TK_PROVIDE="" +MAN1= wish${TCL_VER}.1 .if ${PORT_OPTIONS:MDEMOS} INSTALL_TARGET+= install install-demos @@ -84,352 +77,15 @@ 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) +INSTALL_TARGET+=install-doc +.include "${.CURDIR}/Makefile.man" +.endif 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; 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} \ @@ -437,27 +93,8 @@ post-configure: ${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} + ${INSTALL_DATA} ${WRKDIR}/pkgIndex.tcl ${PREFIX}/lib/tk${TK_VER}/ regression-test: build cd ${WRKSRC}; ${MAKE} test diff --git a/x11-toolkits/tk85/files/patch-unix::Makefile.in b/x11-toolkits/tk85/files/patch-unix::Makefile.in index 41cd98ac8de0..c86ea6cc69ad 100644 --- a/x11-toolkits/tk85/files/patch-unix::Makefile.in +++ b/x11-toolkits/tk85/files/patch-unix::Makefile.in @@ -1,5 +1,5 @@ ---- Makefile.in.orig 2012-11-28 16:54:06.000000000 +0100 -+++ Makefile.in 2012-11-28 16:54:06.000000000 +0100 +--- Makefile.in.orig 2012-11-09 16:15:03.000000000 +0100 ++++ Makefile.in 2013-01-28 09:24:31.000000000 +0100 @@ -64,6 +64,8 @@ # Directory in which to install the include file tk.h: @@ -19,7 +19,7 @@ # 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 ++TCL_PLATFORM_DIR = %%LOCALBASE%%/include/tcl@TCL_VERSION@/unix # The directory containing the Tcl library archive file appropriate # for this version of Tk: @@ -104,24 +104,7 @@ @if test "$(STUB_LIB_FILE)" != "" ; then \ echo "Installing $(STUB_LIB_FILE) to $(LIB_INSTALL_DIR)/"; \ @INSTALL_STUB_LIB@ ; \ -@@ -812,22 +826,19 @@ - fi; \ - done; - @echo "Installing and cross-linking top-level (.1) docs to $(MAN1_INSTALL_DIR)/"; -- @for i in $(TOP_DIR)/doc/*.1; do \ -- $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MAN1_INSTALL_DIR)"; \ -- done - @echo "Installing and cross-linking C API (.3) docs to $(MAN3_INSTALL_DIR)/"; - @for i in $(TOP_DIR)/doc/*.3; do \ -- $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MAN3_INSTALL_DIR)"; \ -+ $(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 - +@@ -827,7 +841,7 @@ install-headers: @if test "$(@TK_WINDOWINGSYSTEM@_XLIB_HDRS)" != ""; then \ XLIB_INCLUDE_INSTALL_DIR="$(INCLUDE_INSTALL_DIR)"/X11; fi; \ @@ -130,7 +113,7 @@ do \ if [ -n "$$i" -a ! -d "$$i" ] ; then \ echo "Making directory $$i"; \ -@@ -836,9 +847,12 @@ +@@ -836,9 +851,12 @@ fi; \ done; @echo "Installing header files to $(INCLUDE_INSTALL_DIR)/"; diff --git a/x11-toolkits/tk85/files/pkgIndex.tcl.in b/x11-toolkits/tk85/files/pkgIndex.tcl.in index 4c66beca7d5b..9c4dad6fd3a1 100644 --- a/x11-toolkits/tk85/files/pkgIndex.tcl.in +++ b/x11-toolkits/tk85/files/pkgIndex.tcl.in @@ -1,3 +1,3 @@ # Tcl package index file, version 1.0 -package ifneeded Tk%%THREADS_SUFFIX%% %%TCLPATCHLEVEL%% "[list load "[file join [file dirname $dir] libtk85%%THREADS_SUFFIX%%.so.1]" Tk]%%TK_PROVIDE%%" +package ifneeded Tk %%TCLPATCHLEVEL%% "[list load "[file join [file dirname $dir] libtk85.so.1]" Tk]" diff --git a/x11-toolkits/tk85/pkg-plist b/x11-toolkits/tk85/pkg-plist index 850981bce889..1562d7da1867 100644 --- a/x11-toolkits/tk85/pkg-plist +++ b/x11-toolkits/tk85/pkg-plist @@ -201,8 +201,6 @@ lib/tk%%TK_VER%%/ttk/winTheme.tcl lib/tk%%TK_VER%%/ttk/xpTheme.tcl lib/tk%%TK_VER%%/unsupported.tcl lib/tk%%TK_VER%%/xmfbox.tcl -%%DATADIR%%/man.macros -@dirrm %%DATADIR%% @dirrm lib/tk%%TK_VER%%/ttk %%DEMOS%%@dirrm lib/tk%%TK_VER%%/demos/images %%DEMOS%%@dirrm lib/tk%%TK_VER%%/demos diff --git a/x11-toolkits/tk85/pkg-plist.threads b/x11-toolkits/tk85/pkg-plist.threads deleted file mode 100644 index e8dcd7da52be..000000000000 --- a/x11-toolkits/tk85/pkg-plist.threads +++ /dev/null @@ -1,9 +0,0 @@ -bin/wish%%TK_VER%%-threads -lib/libtk%%SHORT_TK_VER%%-threads.a -lib/libtk%%SHORT_TK_VER%%-threads.so -lib/libtk%%SHORT_TK_VER%%-threads.so.1 -lib/libtkstub%%SHORT_TK_VER%%-threads.a -lib/tk%%TK_VER%%/tkConfig-threads.sh -lib/tk%%TK_VER%%-threads/tkConfig.sh -lib/tk%%TK_VER%%-threads/pkgIndex.tcl -@dirrm lib/tk%%TK_VER%%-threads diff --git a/x11-toolkits/tk86-thread/Makefile b/x11-toolkits/tk86-thread/Makefile deleted file mode 100644 index 220bfce36fe5..000000000000 --- a/x11-toolkits/tk86-thread/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -# New ports collection makefile for: tk85-thread -# Date created: 09 March 2007 -# Whom: Martin Matuska <mm@FreeBSD.org> -# -# $FreeBSD$ -# - -PORTNAME= tk - -MAINTAINER= tcltk@FreeBSD.org -COMMENT= Graphical toolkit for Tcl (threads support) - -BUILDING_TK_THREADS= yes - -MASTERDIR= ${.CURDIR}/../tk86 - -.include "${MASTERDIR}/Makefile" diff --git a/x11-toolkits/tk86/Makefile b/x11-toolkits/tk86/Makefile index a317f170beb3..aa8dbb5009b5 100644 --- a/x11-toolkits/tk86/Makefile +++ b/x11-toolkits/tk86/Makefile @@ -2,79 +2,61 @@ # $FreeBSD$ PORTNAME= tk -PORTVERSION= 8.6.b.2 +PORTVERSION= 8.6.0 CATEGORIES= x11-toolkits -MASTER_SITES= SF/tcl/Tcl/8.6b2 -PKGNAMESUFFIX?= ${THREADS_SUFFIX} -DISTNAME= ${PORTNAME}${PORTVERSION:S/.b.2/b2/}-src +MASTER_SITES= SF/tcl/Tcl/${PORTVERSION} \ + ${MASTER_SITE_TCLTK} +MASTER_SITE_SUBDIR=tcl8_6 +DISTNAME= ${PORTNAME}${PORTVERSION}-src MAINTAINER= tcltk@FreeBSD.org -COMMENT?= Graphical toolkit for Tcl +COMMENT= Graphical toolkit for Tcl LICENSE= BSD LICENSE_FILE= ${WRKSRC}/../license.terms -LATEST_LINK?= tk86 -USE_GCC= any -USE_XORG= x11 +OPTIONS_DEFINE= TKMAN DEMOS XFT THREADS +OPTIONS_DEFAULT=XFT THREADS +TKMAN_DESC= Install Tk function manpages +DEMOS_DESC= Install demos + +WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERSION}/unix + +ALL_TARGET= all +INSTALL_TARGET= install + USE_LDCONFIG= yes -WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//}/unix +USE_TCL= ${SHORT_TK_VER} +USE_XORG= x11 GNU_CONFIGURE= yes -TK_VER= 8.6 -SHORT_TK_VER= 86 -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 +CONFIGURE_ARGS= --enable-shared \ + --enable-man-suffix=.${MAN_SUFFIX} \ + --with-tcl=${TCL_LIBDIR} \ + --includedir=${PREFIX}/include/tk${TK_VER} -.if !defined(BUILDING_TK_THREADS) -USE_TCL= ${SHORT_TK_VER} +CONFIGURE_ENV= PORTSDIR=${PORTSDIR} -OPTIONS_DEFINE= DEMOS TK86_MAN XFT -OPTIONS_DEFAULT=XFT -TK86_MAN_DESC= Install tk 8.6 function manpages -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 +CFLAGS+= -I${TCL_INCLUDEDIR} -SUB_LIST+= THREADS_SUFFIX="${THREADS_SUFFIX}" \ - TCLPATCHLEVEL="8.6b1" +TK_VER= ${PORTVERSION:R} +SHORT_TK_VER= ${TK_VER:S/.//} +LATEST_LINK= ${PORTNAME}${SHORT_TK_VER} +MAN_SUFFIX= ${LATEST_LINK} -.include <bsd.port.options.mk> +MAKE_ENV= SHORT_TK_VER=${SHORT_TK_VER} + +PLIST_SUB= TK_VER=${TK_VER} \ + SHORT_TK_VER=${SHORT_TK_VER} -DATADIR= ${PREFIX}/share/${PORTNAME}${TCL_VER} +.include <bsd.port.options.mk> .if ${PORT_OPTIONS:MXFT} -CONFIGURE_ARGS+= --enable-xft -LIB_DEPENDS+= Xft.2:${PORTSDIR}/x11-fonts/libXft +CONFIGURE_ARGS+=--enable-xft +LIB_DEPENDS+= Xft:${PORTSDIR}/x11-fonts/libXft .else -CONFIGURE_ARGS+= --disable-xft +CONFIGURE_ARGS+=--disable-xft .endif -.if !defined(NO_INSTALL_MANPAGES) -MAN1= wish${TCL_VER}${THREADS_SUFFIX}.1 -.endif - -.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= tk86${THREADS_SUFFIX} -SUB_LIST+= TK_PROVIDE="; package provide Tk-threads ${TK_VER}b1" -.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="" @@ -82,386 +64,17 @@ PLIST_SUB+= DEMOS="" PLIST_SUB+= DEMOS="@comment " .endif -.if !defined(NO_INSTALL_MANPAGES) && ${PORT_OPTIONS:MTK86_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 busy.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 fontchooser.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 tk_mac.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_scrollbar.n ttk_separator.n \ - ttk_scale.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 #!defined(NO_INSTALL_MANPAGES) && !${PORT_OPTIONS:MTK86_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|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 +.if ${PORT_OPTIONS:MTKMAN} && !defined(NO_INSTALL_MANPAGES) +INSTALL_TARGET+=install-doc +.include "${.CURDIR}/Makefile.man" .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 +.if ${PORT_OPTIONS:MTHREADS} +CONFIGURE_ARGS+=--enable-threads +.else +CONFIGURE_ARGS+=--disable-threads .endif -post-install: - ${INSTALL_DATA} ${WRKDIR}/pkgIndex.tcl ${PREFIX}/lib/tk${TK_VER}${THREADS_SUFFIX}/ - ${MKDIR} ${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/../doc/man.macros ${DATADIR} -.if !defined(NO_INSTALL_MANPAGES) - ${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:MTK86_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:MTK86_MAN} - -.endif # !defined(NO_INSTALL_MANPAGES) - regression-test: build cd ${WRKSRC}; ${MAKE} test ${ECHO_CMD} "package require Tk" | tclsh${TK_VER} diff --git a/x11-toolkits/tk86/distinfo b/x11-toolkits/tk86/distinfo index 185c1404b6a2..bf0aa7dfea79 100644 --- a/x11-toolkits/tk86/distinfo +++ b/x11-toolkits/tk86/distinfo @@ -1,2 +1,2 @@ -SHA256 (tk8.6b2-src.tar.gz) = 81252186d04d44cff41e24384d6fd77e0034f116660f84cb5c2a8b3bd4b373ad -SIZE (tk8.6b2-src.tar.gz) = 4611544 +SHA256 (tk8.6.0-src.tar.gz) = 5c708b2b6f658916df59190b27750fa1ea2bc10992108e10f961c0700f058de6 +SIZE (tk8.6.0-src.tar.gz) = 4239836 diff --git a/x11-toolkits/tk86/files/patch-unix::Makefile.in b/x11-toolkits/tk86/files/patch-unix::Makefile.in index b5aba21666b7..8ede57d11f94 100644 --- a/x11-toolkits/tk86/files/patch-unix::Makefile.in +++ b/x11-toolkits/tk86/files/patch-unix::Makefile.in @@ -1,94 +1,56 @@ ---- Makefile.in.orig 2011-08-05 21:18:31.000000000 +0200 -+++ Makefile.in 2011-08-09 16:45:37.835415114 +0200 -@@ -63,6 +63,8 @@ +--- Makefile.in.orig 2012-12-19 16:39:12.000000000 +0100 ++++ Makefile.in 2013-01-09 10:39:59.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 ++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@ -@@ -91,7 +93,7 @@ +@@ -92,7 +94,7 @@ HTML_INSTALL_DIR = $(INSTALL_ROOT)$(HTML_DIR) # Directory in which to install the configuration file tkConfig.sh: -CONFIG_INSTALL_DIR = $(INSTALL_ROOT)$(libdir) -+CONFIG_INSTALL_DIR = "@DLL_INSTALL_DIR@"/tk$(VERSION) ++CONFIG_INSTALL_DIR = $(SCRIPT_INSTALL_DIR) # Directory in which to install the demo files: DEMO_INSTALL_DIR = $(INSTALL_ROOT)$(TK_LIBRARY)/demos -@@ -99,7 +101,7 @@ - # 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 - - # The directory containing the platform specific Tcl sources and headers - # appropriate for this version of Tk: -@@ -113,7 +115,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@ - - # Subdirectory of $(libdir) containing the pkgIndex.tcl file for loadable Tk - TK_PKG_DIR = @TK_PKG_DIR@ -@@ -136,7 +138,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 @@ - 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 -@@ -559,6 +561,8 @@ - $(GENERIC_DIR)/tkIntPlatDecls.h $(GENERIC_DIR)/tkPort.h \ - $(TTK_HDRS) $(@TK_WINDOWINGSYSTEM@_PRIVATE_HDRS) +@@ -556,6 +558,8 @@ + PUBLIC_HDRS = $(GENERIC_DIR)/tk.h $(GENERIC_DIR)/tkDecls.h \ + $(GENERIC_DIR)/tkPlatDecls.h $(@TK_WINDOWINGSYSTEM@_HDRS) +INSTALL_HDRS = tk.h tkDecls.h tkInt.h tkIntXlibDecls.h + - DEMOPROGS = browse hello ixset rmt rolodex tcolor timer widget - - SHELL_ENV = \ -@@ -583,6 +587,12 @@ + # The private headers we want installed for install-private-headers + PRIVATE_HDRS = $(GENERIC_DIR)/tkInt.h $(GENERIC_DIR)/tkIntDecls.h \ + $(GENERIC_DIR)/tkIntPlatDecls.h $(GENERIC_DIR)/tkPort.h \ +@@ -585,6 +589,12 @@ ${LIB_FILE}: ${OBJS} ${STUB_LIB_FILE} @LIB_RSRC_FILE@ rm -f $@ @MAKE_LIB@ -+ ln -sf @TK_LIB_FILE@ libtk${SHORT_TK_VER}.so ++ @ln -sf ${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} ++ ar rc libtk${SHORT_TK_VER}.a ${OBJS} + $(RANLIB) libtk${SHORT_TK_VER}.a ${STUB_LIB_FILE}: ${STUB_LIB_OBJS} rm -f $@ -@@ -690,9 +700,9 @@ - $(SHELL_ENV) valgrind $(VALGRINDARGS) ./tktest${EXE_SUFFIX} $(SCRIPT) - - INSTALL_BASE_TARGETS = install-binaries install-libraries --INSTALL_DOC_TARGETS = install-doc -+INSTALL_DOC_TARGETS = +@@ -700,8 +710,7 @@ INSTALL_DEV_TARGETS = install-headers --INSTALL_DEMO_TARGETS = install-demos -+INSTALL_DEMO_TARGETS = + 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) -@@ -708,7 +718,7 @@ +-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: $(INSTALL_TARGETS) + +@@ -714,7 +723,7 @@ # some ranlibs write to current directory, and this might not always be # possible (e.g. if installing as root). @@ -97,18 +59,18 @@ @for i in "$(LIB_INSTALL_DIR)" "$(BIN_INSTALL_DIR)" \ "$(PKG_INSTALL_DIR)" "$(CONFIG_INSTALL_DIR)" ; \ do \ -@@ -731,6 +741,10 @@ - @echo "Installing $(LIB_FILE) to @DLL_INSTALL_DIR@/" +@@ -745,6 +754,10 @@ + @echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/" @@INSTALL_LIB@ - @chmod 555 "@DLL_INSTALL_DIR@"/$(LIB_FILE) + @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 - @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)/" -@@ -740,9 +754,9 @@ ++ @chmod 555 "@DLL_INSTALL_DIR@"/libtk${SHORT_TK_VER}.a + @if test -f "tk${MAJOR_VERSION}${MINOR_VERSION}.dll"; then \ + $(INSTALL_LIBRARY) "tk${MAJOR_VERSION}${MINOR_VERSION}.dll" "$(DLL_INSTALL_DIR)";\ + chmod 555 "$(DLL_INSTALL_DIR)/tk${MAJOR_VERSION}${MINOR_VERSION}.dll";\ +@@ -758,9 +771,9 @@ @INSTALL_STUB_LIB@ ; \ fi @EXTRA_INSTALL_BINARIES@ @@ -120,26 +82,8 @@ + @$(INSTALL_DATA) tk.pc $(prefix)/libdata/pkgconfig/tk.pc install-libraries: libraries - @for i in "$(SCRIPT_INSTALL_DIR)" "$(SCRIPT_INSTALL_DIR)"/images \ -@@ -820,23 +834,20 @@ - else true; \ - fi; \ - done; -- @echo "Installing and cross-linking top-level (.1) docs to $(MAN1_INSTALL_DIR)/"; -- @for i in $(TOP_DIR)/doc/*.1; do \ -- $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MAN1_INSTALL_DIR)"; \ -- done - @echo "Installing and cross-linking C API (.3) docs to $(MAN3_INSTALL_DIR)/"; - @for i in $(TOP_DIR)/doc/*.3; do \ -- $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MAN3_INSTALL_DIR)"; \ -+ ${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 - + @for i in "$(SCRIPT_INSTALL_DIR)" "$(SCRIPT_INSTALL_DIR)/images" \ +@@ -858,7 +871,8 @@ install-headers: @if test "$(@TK_WINDOWINGSYSTEM@_XLIB_HDRS)" != ""; then \ XLIB_INCLUDE_INSTALL_DIR="$(INCLUDE_INSTALL_DIR)"/X11; fi; \ @@ -149,16 +93,13 @@ do \ if [ -n "$$i" -a ! -d "$$i" ] ; then \ echo "Making directory $$i"; \ -@@ -844,10 +855,14 @@ - else true; \ +@@ -867,9 +881,12 @@ fi; \ done; -- @echo "Installing header files to $(INCLUDE_INSTALL_DIR)/"; + @echo "Installing header files to $(INCLUDE_INSTALL_DIR)/"; - @for i in $(PUBLIC_HDRS); \ -+ @echo "Installing header files to $(GENERIC_INCLUDE_INSTALL_DIR)/"; -+ ${BSD_INSTALL_DATA} $(GENERIC_DIR)/*.h "$(GENERIC_INCLUDE_INSTALL_DIR)"/ -+ @echo "Installing header files to $(UNIX_INCLUDE_INSTALL_DIR)/"; -+ ${BSD_INSTALL_DATA} $(UNIX_DIR)/*.h "$(UNIX_INCLUDE_INSTALL_DIR)"/ ++ @${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)"; \ diff --git a/x11-toolkits/tk86/files/patch-unix::configure b/x11-toolkits/tk86/files/patch-unix::configure deleted file mode 100644 index fe54d378c066..000000000000 --- a/x11-toolkits/tk86/files/patch-unix::configure +++ /dev/null @@ -1,40 +0,0 @@ ---- configure.orig 2007-12-17 18:57:25.000000000 +0100 -+++ configure 2007-12-29 14:17:55.000000000 +0100 -@@ -3536,6 +3536,7 @@ - # Threads support - this auto-enables if Tcl was compiled threaded - #------------------------------------------------------------------------ - -+TCL_SRC_DIR=${prefix}/include/tcl${TCLVERSION} - - # Check whether --enable-threads or --disable-threads was given. - if test "${enable_threads+set}" = set; then -@@ -5828,7 +5829,7 @@ - SHLIB_SUFFIX=".so" - DL_OBJS="tclLoadDl.o" - DL_LIBS="" -- LDFLAGS="$LDFLAGS -export-dynamic" -+ LDFLAGS="" - if test $doRpath = yes; then - - CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' -@@ -5839,16 +5840,16 @@ - - # The -pthread needs to go in the CFLAGS, not LIBS - LIBS=`echo $LIBS | sed s/-pthread//` -- CFLAGS="$CFLAGS -pthread" -- LDFLAGS="$LDFLAGS -pthread" -+ CFLAGS="$CFLAGS $PTHREAD_CFLAGS" -+ LDFLAGS="$LDFLAGS $PTHREAD_LIBS" - - fi - - case $system in -- FreeBSD-3.*) -+ FreeBSD-*) - # FreeBSD-3 doesn't handle version numbers with dots. - UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a' -- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so' -+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1' - TCL_LIB_VERSIONS_OK=nodots - ;; - esac diff --git a/x11-toolkits/tk86/pkg-plist b/x11-toolkits/tk86/pkg-plist index 7d9d510a0d0e..47f078ab07b5 100644 --- a/x11-toolkits/tk86/pkg-plist +++ b/x11-toolkits/tk86/pkg-plist @@ -36,6 +36,7 @@ lib/libtk%%SHORT_TK_VER%%.a lib/libtk%%SHORT_TK_VER%%.so lib/libtk%%SHORT_TK_VER%%.so.1 lib/libtkstub%%SHORT_TK_VER%%.a +lib/tk%%TK_VER%%/pkgIndex.tcl lib/tk%%TK_VER%%/bgerror.tcl lib/tk%%TK_VER%%/button.tcl lib/tk%%TK_VER%%/choosedir.tcl @@ -106,7 +107,6 @@ lib/tk%%TK_VER%%/console.tcl %%DEMOS%%lib/tk%%TK_VER%%/demos/sayings.tcl %%DEMOS%%lib/tk%%TK_VER%%/demos/search.tcl %%DEMOS%%lib/tk%%TK_VER%%/demos/spin.tcl -%%DEMOS%%lib/tk%%TK_VER%%/demos/square %%DEMOS%%lib/tk%%TK_VER%%/demos/states.tcl %%DEMOS%%lib/tk%%TK_VER%%/demos/style.tcl %%DEMOS%%lib/tk%%TK_VER%%/demos/tclIndex @@ -148,8 +148,8 @@ lib/tk%%TK_VER%%/images/pwrdLogo200.gif lib/tk%%TK_VER%%/images/pwrdLogo75.gif lib/tk%%TK_VER%%/images/tai-ku.gif lib/tk%%TK_VER%%/listbox.tcl -lib/tk%%TK_VER%%/menu.tcl lib/tk%%TK_VER%%/megawidget.tcl +lib/tk%%TK_VER%%/menu.tcl lib/tk%%TK_VER%%/mkpsenc.tcl lib/tk%%TK_VER%%/msgbox.tcl lib/tk%%TK_VER%%/msgs/cs.msg @@ -172,7 +172,6 @@ lib/tk%%TK_VER%%/obsolete.tcl lib/tk%%TK_VER%%/optMenu.tcl lib/tk%%TK_VER%%/palette.tcl lib/tk%%TK_VER%%/panedwindow.tcl -lib/tk%%TK_VER%%/pkgIndex.tcl lib/tk%%TK_VER%%/safetk.tcl lib/tk%%TK_VER%%/scale.tcl lib/tk%%TK_VER%%/scrlbar.tcl @@ -211,13 +210,11 @@ lib/tk%%TK_VER%%/ttk/xpTheme.tcl lib/tk%%TK_VER%%/unsupported.tcl lib/tk%%TK_VER%%/xmfbox.tcl libdata/pkgconfig/tk.pc -%%DATADIR%%/man.macros -@dirrm %%DATADIR%% -@dirrm lib/tk%%TK_VER%%/ttk %%DEMOS%%@dirrm lib/tk%%TK_VER%%/demos/images %%DEMOS%%@dirrm lib/tk%%TK_VER%%/demos -@dirrm lib/tk%%TK_VER%%/images +@dirrm lib/tk%%TK_VER%%/ttk @dirrm lib/tk%%TK_VER%%/msgs +@dirrm lib/tk%%TK_VER%%/images @dirrm lib/tk%%TK_VER%% @dirrm include/tk%%TK_VER%%/unix @dirrm include/tk%%TK_VER%%/generic diff --git a/x11-toolkits/tk86/pkg-plist.threads b/x11-toolkits/tk86/pkg-plist.threads deleted file mode 100644 index e8dcd7da52be..000000000000 --- a/x11-toolkits/tk86/pkg-plist.threads +++ /dev/null @@ -1,9 +0,0 @@ -bin/wish%%TK_VER%%-threads -lib/libtk%%SHORT_TK_VER%%-threads.a -lib/libtk%%SHORT_TK_VER%%-threads.so -lib/libtk%%SHORT_TK_VER%%-threads.so.1 -lib/libtkstub%%SHORT_TK_VER%%-threads.a -lib/tk%%TK_VER%%/tkConfig-threads.sh -lib/tk%%TK_VER%%-threads/tkConfig.sh -lib/tk%%TK_VER%%-threads/pkgIndex.tcl -@dirrm lib/tk%%TK_VER%%-threads |