summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lang/tcl/Makefile8
-rw-r--r--lang/tcl/Makefile.version8
-rw-r--r--lang/tcl/PLIST219
-rw-r--r--lang/tcl/buildlink3.mk10
-rw-r--r--lang/tcl/distinfo20
-rw-r--r--lang/tcl/patches/patch-generic_tclPosixStr.c20
-rw-r--r--lang/tcl/patches/patch-unix_Makefile.in127
-rw-r--r--lang/tcl/patches/patch-unix_configure40
-rw-r--r--lang/tcl/patches/patch-unix_tclUnixFCmd.c4
-rw-r--r--lang/tcl/patches/patch-unix_tclUnixInit.c10
-rw-r--r--lang/tcl/patches/patch-unix_tclUnixPort.h4
-rw-r--r--x11/tk/Makefile6
-rw-r--r--x11/tk/Makefile.version8
-rw-r--r--x11/tk/PLIST69
-rw-r--r--x11/tk/buildlink3.mk10
-rw-r--r--x11/tk/distinfo13
-rw-r--r--x11/tk/patches/patch-macosx_tkMacOSXDraw.c14
-rw-r--r--x11/tk/patches/patch-unix_Makefile.in30
-rw-r--r--x11/tk/patches/patch-unix_configure59
19 files changed, 458 insertions, 221 deletions
diff --git a/lang/tcl/Makefile b/lang/tcl/Makefile
index b28408b3e22..7959b7a7af1 100644
--- a/lang/tcl/Makefile
+++ b/lang/tcl/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.71 2012/11/24 21:38:49 adam Exp $
+# $NetBSD: Makefile,v 1.72 2014/01/11 14:41:05 adam Exp $
DISTNAME= tcl${TCL_VERSION}-src
PKGNAME= tcl-${TCL_VERSION}
+PKGREVISION= 1
CATEGORIES= lang
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tcl/}
@@ -15,12 +16,13 @@ LICENSE= 2-clause-bsd
WRKSRC= ${WRKDIR}/tcl${TCL_VERSION}
GNU_CONFIGURE= yes
+CONFIGURE_ARGS+= --prefix=${PREFIX}
CONFIGURE_DIRS= unix
BUILD_DIRS= ${CONFIGURE_DIRS}
-
-CONFIGURE_ARGS+= --prefix=${PREFIX}
INSTALL_TARGET= install
+CHECK_PORTABILITY_SKIP= win/configure
+
# The test target gives better results when not run as root.
TEST_TARGET= test
diff --git a/lang/tcl/Makefile.version b/lang/tcl/Makefile.version
index c8cec854329..5d53a10a9c2 100644
--- a/lang/tcl/Makefile.version
+++ b/lang/tcl/Makefile.version
@@ -1,5 +1,5 @@
-# $NetBSD: Makefile.version,v 1.12 2013/11/02 20:22:02 adam Exp $
+# $NetBSD: Makefile.version,v 1.13 2014/01/11 14:41:05 adam Exp $
-TCL_SONUM= 85
-TCL_BASEVER= 8.5
-TCL_VERSION= 8.5.15
+TCL_SONUM= 86
+TCL_BASEVER= 8.6
+TCL_VERSION= 8.6.1
diff --git a/lang/tcl/PLIST b/lang/tcl/PLIST
index b944c0c952d..e0f278de1ff 100644
--- a/lang/tcl/PLIST
+++ b/lang/tcl/PLIST
@@ -1,6 +1,19 @@
-@comment $NetBSD: PLIST,v 1.14 2013/04/08 14:19:38 kivinen Exp $
+@comment $NetBSD: PLIST,v 1.15 2014/01/11 14:41:05 adam Exp $
bin/tclsh
bin/tclsh${BASEVER}
+include/fakemysql.h
+include/fakepq.h
+include/fakesql.h
+include/itcl.h
+include/itcl2TclOO.h
+include/itclDecls.h
+include/itclInt.h
+include/itclIntDecls.h
+include/itclMigrate2TclCore.h
+include/itclTclIntStubsFcn.h
+include/mysqlStubs.h
+include/odbcStubs.h
+include/pqStubs.h
include/tcl.h
include/tcl/generic/regcustom.h
include/tcl/generic/regerrs.h
@@ -14,6 +27,11 @@ include/tcl/generic/tclIO.h
include/tcl/generic/tclInt.h
include/tcl/generic/tclIntDecls.h
include/tcl/generic/tclIntPlatDecls.h
+include/tcl/generic/tclOO.h
+include/tcl/generic/tclOODecls.h
+include/tcl/generic/tclOOInt.h
+include/tcl/generic/tclOOIntDecls.h
+include/tcl/generic/tclParse.h
include/tcl/generic/tclPlatDecls.h
include/tcl/generic/tclPort.h
include/tcl/generic/tclRegexp.h
@@ -24,11 +42,27 @@ include/tcl/generic/tommath.h
include/tcl/unix/tclUnixPort.h
include/tcl/unix/tclUnixThrd.h
include/tclDecls.h
+include/tclOO.h
+include/tclOODecls.h
include/tclPlatDecls.h
+include/tclThread.h
+include/tdbc.h
+include/tdbcDecls.h
+include/tdbcInt.h
+lib/itcl4.0.0/itcl.tcl
+lib/itcl4.0.0/itclConfig.sh
+lib/itcl4.0.0/itclHullCmds.tcl
+lib/itcl4.0.0/itclWidget.tcl
+lib/itcl4.0.0/libitcl4.0.0.so
+lib/itcl4.0.0/libitclstub4.0.0.a
+lib/itcl4.0.0/pkgIndex.tcl
lib/libtcl${SONUM}.a
lib/libtcl${SONUM}.so
lib/libtcl${SONUM}.so.1.0
lib/libtclstub${SONUM}.a
+lib/pkgconfig/tcl.pc
+lib/sqlite3.8.0/libsqlite3.8.0.so
+lib/sqlite3.8.0/pkgIndex.tcl
lib/tcl${BASEVER}/auto.tcl
lib/tcl${BASEVER}/clock.tcl
lib/tcl${BASEVER}/encoding/ascii.enc
@@ -115,8 +149,8 @@ lib/tcl${BASEVER}/http/pkgIndex.tcl
lib/tcl${BASEVER}/http1.0/http.tcl
lib/tcl${BASEVER}/http1.0/pkgIndex.tcl
lib/tcl${BASEVER}/init.tcl
-lib/tcl${BASEVER}/msgcat1.4/msgcat.tcl
-lib/tcl${BASEVER}/msgcat1.4/pkgIndex.tcl
+lib/tcl${BASEVER}/msgcat1.5/msgcat.tcl
+lib/tcl${BASEVER}/msgcat1.5/pkgIndex.tcl
lib/tcl${BASEVER}/msgs/af.msg
lib/tcl${BASEVER}/msgs/af_za.msg
lib/tcl${BASEVER}/msgs/ar.msg
@@ -259,7 +293,31 @@ lib/tcl${BASEVER}/tcltest2.3/tcltest.tcl
lib/tcl${BASEVER}/tcltest2.3/pkgIndex.tcl
lib/tcl${BASEVER}/tm.tcl
lib/tcl${BASEVER}/word.tcl
+lib/tcl8/8.4/platform-1.0.12.tm
+lib/tcl8/8.4/platform/shell-1.1.4.tm
+lib/tcl8/8.5/msgcat-1.5.2.tm
+lib/tcl8/8.5/tcltest-2.3.6.tm
+lib/tcl8/8.6/http-2.8.7.tm
+lib/tcl8/8.6/tdbc/sqlite3-1.0.0.tm
lib/tclConfig.sh
+lib/tclooConfig.sh
+lib/tdbc1.0.0/libtdbc1.0.0.so
+lib/tdbc1.0.0/libtdbcstub1.0.0.a
+lib/tdbc1.0.0/pkgIndex.tcl
+lib/tdbc1.0.0/tdbc.tcl
+lib/tdbc1.0.0/tdbcConfig.sh
+lib/tdbcmysql1.0.0/libtdbcmysql1.0.0.so
+lib/tdbcmysql1.0.0/pkgIndex.tcl
+lib/tdbcmysql1.0.0/tdbcmysql.tcl
+lib/tdbcodbc1.0.0/libtdbcodbc1.0.0.so
+lib/tdbcodbc1.0.0/pkgIndex.tcl
+lib/tdbcodbc1.0.0/tdbcodbc.tcl
+lib/tdbcpostgres1.0.0/libtdbcpostgres1.0.0.so
+lib/tdbcpostgres1.0.0/pkgIndex.tcl
+lib/tdbcpostgres1.0.0/tdbcpostgres.tcl
+lib/thread2.7.0/libthread2.7.0.so
+lib/thread2.7.0/pkgIndex.tcl
+lib/thread2.7.0/ttrace.tcl
man/man1/tclsh.1
man/man3/TCL_MEM_DEBUG.3
man/man3/Tcl_Access.3
@@ -293,10 +351,13 @@ man/man3/Tcl_AttemptAlloc.3
man/man3/Tcl_AttemptRealloc.3
man/man3/Tcl_AttemptSetObjLength.3
man/man3/Tcl_BackgroundError.3
+man/man3/Tcl_BackgroundException.3
man/man3/Tcl_Backslash.3
man/man3/Tcl_BadChannelOption.3
man/man3/Tcl_CallWhenDeleted.3
+man/man3/Tcl_CancelEval.3
man/man3/Tcl_CancelIdleCall.3
+man/man3/Tcl_Canceled.3
man/man3/Tcl_ChannelBlockModeProc.3
man/man3/Tcl_ChannelBuffered.3
man/man3/Tcl_ChannelClose2Proc.3
@@ -316,6 +377,10 @@ man/man3/Tcl_ChannelVersion.3
man/man3/Tcl_ChannelWatchProc.3
man/man3/Tcl_ChannelWideSeekProc.3
man/man3/Tcl_Chdir.3
+man/man3/Tcl_ClassGetMetadata.3
+man/man3/Tcl_ClassSetConstructor.3
+man/man3/Tcl_ClassSetDestructor.3
+man/man3/Tcl_ClassSetMetadata.3
man/man3/Tcl_ClearChannelHandlers.3
man/man3/Tcl_Close.3
man/man3/Tcl_CommandComplete.3
@@ -328,6 +393,7 @@ man/man3/Tcl_ConditionWait.3
man/man3/Tcl_ConvertCountedElement.3
man/man3/Tcl_ConvertElement.3
man/man3/Tcl_ConvertToType.3
+man/man3/Tcl_CopyObjectInstance.3
man/man3/Tcl_CreateAlias.3
man/man3/Tcl_CreateAliasObj.3
man/man3/Tcl_CreateChannel.3
@@ -462,6 +528,7 @@ man/man3/Tcl_FSRemoveDirectory.3
man/man3/Tcl_FSRenameFile.3
man/man3/Tcl_FSSplitPath.3
man/man3/Tcl_FSStat.3
+man/man3/Tcl_FSUnloadFile.3
man/man3/Tcl_FSUnregister.3
man/man3/Tcl_FSUtime.3
man/man3/Tcl_Finalize.3
@@ -472,6 +539,7 @@ man/man3/Tcl_FindEnsemble.3
man/man3/Tcl_FindExecutable.3
man/man3/Tcl_FindHashEntry.3
man/man3/Tcl_FindNamespace.3
+man/man3/Tcl_FindSymbol.3
man/man3/Tcl_FirstHashEntry.3
man/man3/Tcl_Flush.3
man/man3/Tcl_ForgetImport.3
@@ -480,13 +548,17 @@ man/man3/Tcl_Free.3
man/man3/Tcl_FreeEncoding.3
man/man3/Tcl_FreeParse.3
man/man3/Tcl_FreeResult.3
+man/man3/Tcl_GetAccessTimeFromStat.3
man/man3/Tcl_GetAlias.3
man/man3/Tcl_GetAliasObj.3
man/man3/Tcl_GetAssocData.3
man/man3/Tcl_GetBignumFromObj.3
+man/man3/Tcl_GetBlockSizeFromStat.3
+man/man3/Tcl_GetBlocksFromStat.3
man/man3/Tcl_GetBoolean.3
man/man3/Tcl_GetBooleanFromObj.3
man/man3/Tcl_GetByteArrayFromObj.3
+man/man3/Tcl_GetChangeTimeFromStat.3
man/man3/Tcl_GetChannel.3
man/man3/Tcl_GetChannelBufferSize.3
man/man3/Tcl_GetChannelError.3
@@ -501,6 +573,7 @@ man/man3/Tcl_GetChannelOption.3
man/man3/Tcl_GetChannelThread.3
man/man3/Tcl_GetChannelType.3
man/man3/Tcl_GetCharLength.3
+man/man3/Tcl_GetClassAsObject.3
man/man3/Tcl_GetCommandFromObj.3
man/man3/Tcl_GetCommandFullName.3
man/man3/Tcl_GetCommandInfo.3
@@ -510,6 +583,7 @@ man/man3/Tcl_GetCurrentNamespace.3
man/man3/Tcl_GetCurrentThread.3
man/man3/Tcl_GetCwd.3
man/man3/Tcl_GetDefaultEncodingDir.3
+man/man3/Tcl_GetDeviceTypeFromStat.3
man/man3/Tcl_GetDouble.3
man/man3/Tcl_GetDoubleFromObj.3
man/man3/Tcl_GetEncoding.3
@@ -521,10 +595,15 @@ man/man3/Tcl_GetEncodingSearchPath.3
man/man3/Tcl_GetEnsembleFlags.3
man/man3/Tcl_GetEnsembleMappingDict.3
man/man3/Tcl_GetEnsembleNamespace.3
+man/man3/Tcl_GetEnsembleParameterList.3
man/man3/Tcl_GetEnsembleSubcommandList.3
man/man3/Tcl_GetEnsembleUnknownHandler.3
man/man3/Tcl_GetErrno.3
+man/man3/Tcl_GetErrorLine.3
+man/man3/Tcl_GetFSDeviceFromStat.3
+man/man3/Tcl_GetFSInodeFromStat.3
man/man3/Tcl_GetGlobalNamespace.3
+man/man3/Tcl_GetGroupIdFromStat.3
man/man3/Tcl_GetHashKey.3
man/man3/Tcl_GetHashValue.3
man/man3/Tcl_GetHostName.3
@@ -533,21 +612,31 @@ man/man3/Tcl_GetIndexFromObjStruct.3
man/man3/Tcl_GetInt.3
man/man3/Tcl_GetIntFromObj.3
man/man3/Tcl_GetInterpPath.3
+man/man3/Tcl_GetLinkCountFromStat.3
man/man3/Tcl_GetLongFromObj.3
man/man3/Tcl_GetMaster.3
man/man3/Tcl_GetMathFuncInfo.3
+man/man3/Tcl_GetModeFromStat.3
+man/man3/Tcl_GetModificationTimeFromStat.3
man/man3/Tcl_GetNameOfExecutable.3
man/man3/Tcl_GetNamespaceUnknownHandler.3
man/man3/Tcl_GetObjResult.3
man/man3/Tcl_GetObjType.3
+man/man3/Tcl_GetObjectAsClass.3
+man/man3/Tcl_GetObjectCommand.3
+man/man3/Tcl_GetObjectFromObj.3
+man/man3/Tcl_GetObjectName.3
+man/man3/Tcl_GetObjectNamespace.3
man/man3/Tcl_GetOpenFile.3
man/man3/Tcl_GetPathType.3
man/man3/Tcl_GetRange.3
man/man3/Tcl_GetRegExpFromObj.3
man/man3/Tcl_GetReturnOptions.3
man/man3/Tcl_GetServiceMode.3
+man/man3/Tcl_GetSizeFromStat.3
man/man3/Tcl_GetSlave.3
man/man3/Tcl_GetStackedChannel.3
+man/man3/Tcl_GetStartupScript.3
man/man3/Tcl_GetStdChannel.3
man/man3/Tcl_GetString.3
man/man3/Tcl_GetStringFromObj.3
@@ -558,6 +647,7 @@ man/man3/Tcl_GetTopChannel.3
man/man3/Tcl_GetUniChar.3
man/man3/Tcl_GetUnicode.3
man/man3/Tcl_GetUnicodeFromObj.3
+man/man3/Tcl_GetUserIdFromStat.3
man/man3/Tcl_GetVar.3
man/man3/Tcl_GetVar2.3
man/man3/Tcl_GetVar2Ex.3
@@ -581,6 +671,7 @@ man/man3/Tcl_InitStubs.3
man/man3/Tcl_InputBlocked.3
man/man3/Tcl_InputBuffered.3
man/man3/Tcl_Interp.3
+man/man3/Tcl_InterpActive.3
man/man3/Tcl_InterpDeleted.3
man/man3/Tcl_InvalidateStringRep.3
man/man3/Tcl_IsChannelExisting.3
@@ -615,24 +706,40 @@ man/man3/Tcl_ListObjGetElements.3
man/man3/Tcl_ListObjIndex.3
man/man3/Tcl_ListObjLength.3
man/man3/Tcl_ListObjReplace.3
+man/man3/Tcl_LoadFile.3
man/man3/Tcl_LogCommandInfo.3
man/man3/Tcl_Main.3
man/man3/Tcl_MakeFileChannel.3
man/man3/Tcl_MakeSafe.3
man/man3/Tcl_MakeTcpClientChannel.3
man/man3/Tcl_Merge.3
+man/man3/Tcl_MethodDeclarerClass.3
+man/man3/Tcl_MethodDeclarerObject.3
+man/man3/Tcl_MethodIsPublic.3
+man/man3/Tcl_MethodIsType.3
+man/man3/Tcl_MethodName.3
man/man3/Tcl_MutexFinalize.3
man/man3/Tcl_MutexLock.3
man/man3/Tcl_MutexUnlock.3
+man/man3/Tcl_NRAddCallback.3
+man/man3/Tcl_NRCallObjProc.3
+man/man3/Tcl_NRCmdSwap.3
+man/man3/Tcl_NRCreateCommand.3
+man/man3/Tcl_NREvalObj.3
+man/man3/Tcl_NREvalObjv.3
+man/man3/Tcl_NRExprObj.3
man/man3/Tcl_NewBignumObj.3
man/man3/Tcl_NewBooleanObj.3
man/man3/Tcl_NewByteArrayObj.3
man/man3/Tcl_NewDictObj.3
man/man3/Tcl_NewDoubleObj.3
+man/man3/Tcl_NewInstanceMethod.3
man/man3/Tcl_NewIntObj.3
man/man3/Tcl_NewListObj.3
man/man3/Tcl_NewLongObj.3
+man/man3/Tcl_NewMethod.3
man/man3/Tcl_NewObj.3
+man/man3/Tcl_NewObjectInstance.3
man/man3/Tcl_NewStringObj.3
man/man3/Tcl_NewUnicodeObj.3
man/man3/Tcl_NewWideIntObj.3
@@ -642,6 +749,16 @@ man/man3/Tcl_NumUtfChars.3
man/man3/Tcl_ObjGetVar2.3
man/man3/Tcl_ObjPrintf.3
man/man3/Tcl_ObjSetVar2.3
+man/man3/Tcl_ObjectContextInvokeNext.3
+man/man3/Tcl_ObjectContextIsFiltering.3
+man/man3/Tcl_ObjectContextMethod.3
+man/man3/Tcl_ObjectContextObject.3
+man/man3/Tcl_ObjectContextSkippedArgs.3
+man/man3/Tcl_ObjectDeleted.3
+man/man3/Tcl_ObjectGetMetadata.3
+man/man3/Tcl_ObjectGetMethodNameMapper.3
+man/man3/Tcl_ObjectSetMetadata.3
+man/man3/Tcl_ObjectSetMethodNameMapper.3
man/man3/Tcl_OpenCommandChannel.3
man/man3/Tcl_OpenFileChannel.3
man/man3/Tcl_OpenTcpClient.3
@@ -649,6 +766,7 @@ man/man3/Tcl_OpenTcpServer.3
man/man3/Tcl_OutputBuffered.3
man/man3/Tcl_Panic.3
man/man3/Tcl_PanicVA.3
+man/man3/Tcl_ParseArgsObjv.3
man/man3/Tcl_ParseBraces.3
man/man3/Tcl_ParseCommand.3
man/man3/Tcl_ParseExpr.3
@@ -696,6 +814,7 @@ man/man3/Tcl_ScanElement.3
man/man3/Tcl_Seek.3
man/man3/Tcl_ServiceAll.3
man/man3/Tcl_ServiceEvent.3
+man/man3/Tcl_ServiceModeHook.3
man/man3/Tcl_SetAssocData.3
man/man3/Tcl_SetBignumObj.3
man/man3/Tcl_SetBooleanObj.3
@@ -712,11 +831,13 @@ man/man3/Tcl_SetDoubleObj.3
man/man3/Tcl_SetEncodingSearchPath.3
man/man3/Tcl_SetEnsembleFlags.3
man/man3/Tcl_SetEnsembleMappingDict.3
+man/man3/Tcl_SetEnsembleParameterList.3
man/man3/Tcl_SetEnsembleSubcommandList.3
man/man3/Tcl_SetEnsembleUnknownHandler.3
man/man3/Tcl_SetErrno.3
man/man3/Tcl_SetErrorCode.3
man/man3/Tcl_SetErrorCodeVA.3
+man/man3/Tcl_SetErrorLine.3
man/man3/Tcl_SetExitProc.3
man/man3/Tcl_SetHashValue.3
man/man3/Tcl_SetIntObj.3
@@ -725,6 +846,7 @@ man/man3/Tcl_SetLongObj.3
man/man3/Tcl_SetMainLoop.3
man/man3/Tcl_SetMaxBlockTime.3
man/man3/Tcl_SetNamespaceUnknownHandler.3
+man/man3/Tcl_SetNotifier.3
man/man3/Tcl_SetObjErrorCode.3
man/man3/Tcl_SetObjLength.3
man/man3/Tcl_SetObjResult.3
@@ -733,6 +855,7 @@ man/man3/Tcl_SetRecursionLimit.3
man/man3/Tcl_SetResult.3
man/man3/Tcl_SetReturnOptions.3
man/man3/Tcl_SetServiceMode.3
+man/man3/Tcl_SetStartupScript.3
man/man3/Tcl_SetStdChannel.3
man/man3/Tcl_SetStringObj.3
man/man3/Tcl_SetSystemEncoding.3
@@ -764,6 +887,7 @@ man/man3/Tcl_ThreadQueueEvent.3
man/man3/Tcl_TraceCommand.3
man/man3/Tcl_TraceVar.3
man/man3/Tcl_TraceVar2.3
+man/man3/Tcl_TransferResult.3
man/man3/Tcl_TranslateFileName.3
man/man3/Tcl_TruncateChannel.3
man/man3/Tcl_Ungets.3
@@ -828,40 +952,64 @@ man/man3/Tcl_WriteChars.3
man/man3/Tcl_WriteObj.3
man/man3/Tcl_WriteRaw.3
man/man3/Tcl_WrongNumArgs.3
+man/man3/Tcl_ZlibAdler32.3
+man/man3/Tcl_ZlibCRC32.3
+man/man3/Tcl_ZlibDeflate.3
+man/man3/Tcl_ZlibInflate.3
+man/man3/Tcl_ZlibStreamChecksum.3
+man/man3/Tcl_ZlibStreamClose.3
+man/man3/Tcl_ZlibStreamEof.3
+man/man3/Tcl_ZlibStreamGet.3
+man/man3/Tcl_ZlibStreamGetCommandName.3
+man/man3/Tcl_ZlibStreamInit.3
+man/man3/Tcl_ZlibStreamPut.3
+man/man3/Tdbc_Init.3
man/man3/attemptckalloc.3
man/man3/attemptckrealloc.3
man/man3/ckalloc.3
man/man3/ckfree.3
man/man3/ckrealloc.3
-man/mann/SafeBase.n
man/mann/Tcl.n
man/mann/after.n
man/mann/append.n
man/mann/apply.n
+man/mann/argc.n
+man/mann/argv.n
+man/mann/argv0.n
man/mann/array.n
man/mann/auto_execok.n
man/mann/auto_import.n
man/mann/auto_load.n
man/mann/auto_mkindex.n
-man/mann/auto_mkindex_old.n
+man/mann/auto_path.n
man/mann/auto_qualify.n
man/mann/auto_reset.n
man/mann/bgerror.n
man/mann/binary.n
+man/mann/body.n
man/mann/break.n
man/mann/case.n
man/mann/catch.n
man/mann/cd.n
man/mann/chan.n
+man/mann/class.n
man/mann/clock.n
man/mann/close.n
+man/mann/code.n
man/mann/concat.n
+man/mann/configbody.n
man/mann/continue.n
+man/mann/coroutine.n
man/mann/dde.n
+man/mann/delete.n
man/mann/dict.n
man/mann/encoding.n
+man/mann/ensemble.n
+man/mann/env.n
man/mann/eof.n
man/mann/error.n
+man/mann/errorCode.n
+man/mann/errorInfo.n
man/mann/eval.n
man/mann/exec.n
man/mann/exit.n
@@ -872,6 +1020,7 @@ man/mann/fcopy.n
man/mann/file.n
man/mann/fileevent.n
man/mann/filename.n
+man/mann/find.n
man/mann/flush.n
man/mann/for.n
man/mann/foreach.n
@@ -885,6 +1034,14 @@ man/mann/if.n
man/mann/incr.n
man/mann/info.n
man/mann/interp.n
+man/mann/is.n
+man/mann/itcl.n
+man/mann/itclcomponent.n
+man/mann/itcldelegate.n
+man/mann/itclextendedclass.n
+man/mann/itcloption.n
+man/mann/itclvars.n
+man/mann/itclwidget.n
man/mann/join.n
man/mann/lappend.n
man/mann/lassign.n
@@ -892,7 +1049,9 @@ man/mann/lindex.n
man/mann/linsert.n
man/mann/list.n
man/mann/llength.n
+man/mann/lmap.n
man/mann/load.n
+man/mann/local.n
man/mann/lrange.n
man/mann/lrepeat.n
man/mann/lreplace.n
@@ -904,15 +1063,23 @@ man/mann/mathfunc.n
man/mann/mathop.n
man/mann/memory.n
man/mann/msgcat.n
+man/mann/my.n
man/mann/namespace.n
+man/mann/next.n
+man/mann/nextto.n
+man/mann/oo_class.n
+man/mann/oo_copy.n
+man/mann/oo_define.n
+man/mann/oo_objdefine.n
+man/mann/oo_object.n
man/mann/open.n
man/mann/package.n
man/mann/parray.n
man/mann/pid.n
-man/mann/pkg::create.n
+man/mann/pkg_create.n
man/mann/pkg_mkIndex.n
man/mann/platform.n
-man/mann/platform::shell.n
+man/mann/platform_shell.n
man/mann/proc.n
man/mann/puts.n
man/mann/pwd.n
@@ -924,27 +1091,60 @@ man/mann/registry.n
man/mann/regsub.n
man/mann/rename.n
man/mann/return.n
+man/mann/safe.n
man/mann/scan.n
+man/mann/scope.n
man/mann/seek.n
+man/mann/self.n
man/mann/set.n
man/mann/socket.n
man/mann/source.n
man/mann/split.n
+man/mann/sqlite3.n
man/mann/string.n
man/mann/subst.n
man/mann/switch.n
+man/mann/tailcall.n
man/mann/tcl_endOfWord.n
man/mann/tcl_findLibrary.n
+man/mann/tcl_interactive.n
+man/mann/tcl_library.n
+man/mann/tcl_nonwordchars.n
+man/mann/tcl_patchLevel.n
+man/mann/tcl_pkgPath.n
+man/mann/tcl_platform.n
+man/mann/tcl_precision.n
+man/mann/tcl_prefix.n
+man/mann/tcl_rcFileName.n
man/mann/tcl_startOfNextWord.n
man/mann/tcl_startOfPreviousWord.n
+man/mann/tcl_traceCompile.n
+man/mann/tcl_traceEval.n
+man/mann/tcl_version.n
man/mann/tcl_wordBreakAfter.n
man/mann/tcl_wordBreakBefore.n
+man/mann/tcl_wordchars.n
man/mann/tcltest.n
-man/mann/tclvars.n
+man/mann/tdbc.n
+man/mann/tdbc_connection.n
+man/mann/tdbc_mapSqlState.n
+man/mann/tdbc_mysql.n
+man/mann/tdbc_odbc.n
+man/mann/tdbc_resultset.n
+man/mann/tdbc_sqlite3.n
+man/mann/tdbc_statement.n
+man/mann/tdbc_tokenize.n
man/mann/tell.n
+man/mann/thread.n
+man/mann/throw.n
man/mann/time.n
man/mann/tm.n
+man/mann/tpool.n
man/mann/trace.n
+man/mann/transchan.n
+man/mann/try.n
+man/mann/tsv.n
+man/mann/ttrace.n
man/mann/unknown.n
man/mann/unload.n
man/mann/unset.n
@@ -954,3 +1154,6 @@ man/mann/upvar.n
man/mann/variable.n
man/mann/vwait.n
man/mann/while.n
+man/mann/yield.n
+man/mann/yieldto.n
+man/mann/zlib.n
diff --git a/lang/tcl/buildlink3.mk b/lang/tcl/buildlink3.mk
index c6bb9f8986e..a7f5bfc9b51 100644
--- a/lang/tcl/buildlink3.mk
+++ b/lang/tcl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.24 2012/08/21 21:31:47 marino Exp $
+# $NetBSD: buildlink3.mk,v 1.25 2014/01/11 14:41:05 adam Exp $
BUILDLINK_TREE+= tcl
@@ -6,16 +6,16 @@ BUILDLINK_TREE+= tcl
TCL_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.tcl+= tcl>=8.5.7
-BUILDLINK_ABI_DEPENDS.tcl+= tcl>=8.5.7
+BUILDLINK_ABI_DEPENDS.tcl+= tcl>=8.6.1nb1
BUILDLINK_PKGSRCDIR.tcl?= ../../lang/tcl
BUILDLINK_FILES.tcl+= bin/tclsh*
#
-# Make "-ltcl" and "-ltcl8.5" resolve into "-ltcl85", so that we don't
+# Make "-ltcl" and "-ltcl8.6" resolve into "-ltcl86", so that we don't
# need to patch so many Makefiles.
#
-BUILDLINK_TRANSFORM+= l:tcl:tcl85
-BUILDLINK_TRANSFORM+= l:tcl8.5:tcl85
+BUILDLINK_TRANSFORM+= l:tcl:tcl86
+BUILDLINK_TRANSFORM+= l:tcl8.6:tcl86
TCLCONFIG_SH?= ${BUILDLINK_PREFIX.tcl}/lib/tclConfig.sh
diff --git a/lang/tcl/distinfo b/lang/tcl/distinfo
index 64177ae46e4..054756d98f7 100644
--- a/lang/tcl/distinfo
+++ b/lang/tcl/distinfo
@@ -1,17 +1,17 @@
-$NetBSD: distinfo,v 1.57 2013/11/02 20:22:02 adam Exp $
+$NetBSD: distinfo,v 1.58 2014/01/11 14:41:05 adam Exp $
-SHA1 (tcl8.5.15-src.tar.gz) = ff20698d7f77617ea179ec225300f4ea4a905299
-RMD160 (tcl8.5.15-src.tar.gz) = 17f570c0f44da5cb49b4b7c56273544bad7b5a76
-Size (tcl8.5.15-src.tar.gz) = 4536117 bytes
+SHA1 (tcl8.6.1-src.tar.gz) = 5c83d44152cc0496cc0847a2495f659502a30e40
+RMD160 (tcl8.6.1-src.tar.gz) = fbb181d26bb28fe9413bc2e07f333571b8e7e190
+Size (tcl8.6.1-src.tar.gz) = 8755700 bytes
SHA1 (patch-generic_tclInt.h) = 13289d8fcf5021898b06a9608bc05fc968a1ba5c
SHA1 (patch-generic_tclPort.h) = 36ff05b22591d588952e55d0f13c2ef52e371d1e
-SHA1 (patch-generic_tclPosixStr.c) = 8c252a4f3d8898fb48544d15123d6a8ddc3172f0
+SHA1 (patch-generic_tclPosixStr.c) = 68da211865282fe7124cad71381658f8dfb986d6
SHA1 (patch-tests_load.test) = 438695ab76e01646e49aadc01c44344a5495eabb
SHA1 (patch-tests_pkgMkIndex.test) = 70d1042c1f4743052c5fa191fa7c4732a08e28a2
-SHA1 (patch-unix_Makefile.in) = 60d9bb9a6e98458ff846212c4d5ffb1180882d33
-SHA1 (patch-unix_configure) = 9a5c477c26edf989991b2804d3e2d53b8f5e1c05
+SHA1 (patch-unix_Makefile.in) = 1dee005fc4678a83259ba6dbec74d1c5753199b7
+SHA1 (patch-unix_configure) = 873e678a1b2a6fd517414811ea37c26390ec0048
SHA1 (patch-unix_tclConfig.sh.in) = 5a32d8e97240d14f3a03e205637fe3bf8307d868
SHA1 (patch-unix_tclUnixCompat.c) = 7ffa40a1a56345f5b86cd896e8e3b0d5748d8c5e
-SHA1 (patch-unix_tclUnixFCmd.c) = a56a12b8a0068e914d10336076347ca2b0ba9ac7
-SHA1 (patch-unix_tclUnixInit.c) = 4cbddb3e1a9ed4bbbf2d8de0df1a9032fc5b2629
-SHA1 (patch-unix_tclUnixPort.h) = c4f1c26228b36563c44e5c27824955882c3a675f
+SHA1 (patch-unix_tclUnixFCmd.c) = e715d9419a36a8414355252bb3da0ef48b07fe4f
+SHA1 (patch-unix_tclUnixInit.c) = 0e372d1098522d3ea9be9c5d2bb378af53fa86f6
+SHA1 (patch-unix_tclUnixPort.h) = 6efe848c16c550f6adee4bec011891755bb23620
diff --git a/lang/tcl/patches/patch-generic_tclPosixStr.c b/lang/tcl/patches/patch-generic_tclPosixStr.c
index 81785ed0737..fc4a4397545 100644
--- a/lang/tcl/patches/patch-generic_tclPosixStr.c
+++ b/lang/tcl/patches/patch-generic_tclPosixStr.c
@@ -1,24 +1,24 @@
-$NetBSD: patch-generic_tclPosixStr.c,v 1.2 2012/08/21 21:31:47 marino Exp $
+$NetBSD: patch-generic_tclPosixStr.c,v 1.3 2014/01/11 14:41:05 adam Exp $
Carried over from TCL 8.4
---- generic/tclPosixStr.c.orig 2012-07-16 11:57:05.000000000 +0000
+--- generic/tclPosixStr.c.orig 2013-09-19 19:04:14.000000000 +0000
+++ generic/tclPosixStr.c
-@@ -335,7 +335,7 @@ Tcl_ErrnoId(void)
- #if defined(EOPNOTSUPP) && (!defined(ENOTSUP) || (ENOTSUP != EOPNOTSUPP))
- case EOPNOTSUPP: return "EOPNOTSUPP";
+@@ -344,7 +344,7 @@ Tcl_ErrnoId(void)
+ #ifdef EOTHER
+ case EOTHER: return "EOTHER";
#endif
-#if defined(EOVERFLOW) && (!defined(EFBIG) || (EOVERFLOW != EFBIG)) && (!defined(EINVAL) || (EOVERFLOW != EINVAL))
+#if defined(EOVERFLOW) && (!defined(EFBIG) || (EOVERFLOW != EFBIG)) && (!defined(EINVAL) || (EOVERFLOW != EINVAL)) && (!defined(ERANGE) || (EOVERFLOW != ERANGE))
case EOVERFLOW: return "EOVERFLOW";
#endif
- #ifdef EPERM
-@@ -783,7 +783,7 @@ Tcl_ErrnoMsg(
- #if defined(EOPNOTSUPP) && (!defined(ENOTSUP) || (ENOTSUP != EOPNOTSUPP))
- case EOPNOTSUPP: return "operation not supported on socket";
+ #ifdef EOWNERDEAD
+@@ -804,7 +804,7 @@ Tcl_ErrnoMsg(
+ #ifdef EOTHER
+ case EOTHER: return "other error";
#endif
-#if defined(EOVERFLOW) && (!defined(EFBIG) || (EOVERFLOW != EFBIG)) && (!defined(EINVAL) || (EOVERFLOW != EINVAL))
+#if defined(EOVERFLOW) && (!defined(EFBIG) || (EOVERFLOW != EFBIG)) && (!defined(EINVAL) || (EOVERFLOW != EINVAL)) && (!defined(ERANGE) || (EOVERFLOW != ERANGE))
case EOVERFLOW: return "file too big";
#endif
- #ifdef EPERM
+ #ifdef EOWNERDEAD
diff --git a/lang/tcl/patches/patch-unix_Makefile.in b/lang/tcl/patches/patch-unix_Makefile.in
index 156e249ca7f..0969f5ca8ab 100644
--- a/lang/tcl/patches/patch-unix_Makefile.in
+++ b/lang/tcl/patches/patch-unix_Makefile.in
@@ -1,6 +1,8 @@
---- unix/Makefile.in.orig 2012-11-09 17:14:39.000000000 +0200
-+++ unix/Makefile.in 2013-04-08 17:05:01.000000000 +0300
-@@ -8,6 +8,7 @@
+$NetBSD: patch-unix_Makefile.in,v 1.7 2014/01/11 14:41:05 adam Exp $
+
+--- unix/Makefile.in.orig 2013-09-19 20:17:13.000000000 +0000
++++ unix/Makefile.in
+@@ -8,6 +8,7 @@ VERSION = @TCL_VERSION@
MAJOR_VERSION = @TCL_MAJOR_VERSION@
MINOR_VERSION = @TCL_MINOR_VERSION@
PATCH_LEVEL = @TCL_PATCH_LEVEL@
@@ -8,7 +10,7 @@
#--------------------------------------------------------------------------
# Things you can change to personalize the Makefile for your own site (you can
-@@ -54,6 +55,8 @@
+@@ -54,6 +55,8 @@ SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TC
# Directory in which to install the include file tcl.h:
INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir)
@@ -17,7 +19,7 @@
# Path to the private tcl header dir:
PRIVATE_INCLUDE_DIR = @PRIVATE_INCLUDE_DIR@
-@@ -100,7 +103,7 @@
+@@ -103,7 +106,7 @@ CFLAGS_OPTIMIZE = -DNDEBUG @CFLAGS_OPTI
#CFLAGS = $(CFLAGS_DEBUG)
#CFLAGS = $(CFLAGS_OPTIMIZE)
#CFLAGS = $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE)
@@ -26,7 +28,7 @@
# Flags to pass to the linker
LDFLAGS_DEBUG = @LDFLAGS_DEBUG@
-@@ -194,6 +197,7 @@
+@@ -200,6 +203,7 @@ BUILD_DLTEST = @BUILD_DLTEST@
#BUILD_DLTEST =
TCL_LIB_FILE = @TCL_LIB_FILE@
@@ -34,16 +36,16 @@
#TCL_LIB_FILE = libtcl.a
# Generic lib name used in rules that apply to tcl and tk
-@@ -542,7 +546,7 @@
+@@ -613,7 +617,7 @@ SRCS = $(GENERIC_SRCS) $(TOMMATH_SRCS) $
- all: binaries libraries doc
+ all: binaries libraries doc packages
-binaries: ${LIB_FILE} $(STUB_LIB_FILE) ${TCL_EXE}
+binaries: ${LIB_FILE} $(STUB_LIB_FILE) ${TCL_EXE} ${TCL_LIB_A_FILE}
libraries:
-@@ -558,6 +562,11 @@
+@@ -630,6 +634,11 @@ ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
rm -f $@
@MAKE_STUB_LIB@
@@ -55,11 +57,11 @@
# Make target which outputs the list of the .o contained in the Tcl lib useful
# to build a single big shared library containing Tcl and other extensions.
# Used for the Tcl Plugin. -- dl
-@@ -719,9 +728,16 @@
+@@ -796,9 +805,16 @@ install-binaries: binaries
done;
@echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/"
@@INSTALL_LIB@
-- @chmod 555 "$(DLL_INSTALL_DIR)"/$(LIB_FILE)
+- @chmod 555 "$(DLL_INSTALL_DIR)/$(LIB_FILE)"
+ @cd "$(DLL_INSTALL_DIR)" && if test "$(SHLIB_SUFFIX)" = ".dylib"; then \
+ ln -sf libtcl$(MAJOR_VERSION)$(MINOR_VERSION).$(SHLIB_VERSION)$(SHLIB_SUFFIX) $(LIB_FILE) ; \
+ else \
@@ -67,83 +69,82 @@
+ fi
+ @echo "Installing ${TCL_LIB_A_FILE} to $(DLL_INSTALL_DIR)/"
+ @$(INSTALL_DATA) ${TCL_LIB_A_FILE} $(DLL_INSTALL_DIR)/${TCL_LIB_A_FILE}
- @echo "Installing ${TCL_EXE} as $(BIN_INSTALL_DIR)/tclsh$(VERSION)@EXEEXT@"
- @$(INSTALL_PROGRAM) ${TCL_EXE} "$(BIN_INSTALL_DIR)"/tclsh$(VERSION)@EXEEXT@
-+ @cd "$(BIN_INSTALL_DIR)" && ln -sf tclsh$(VERSION)@EXEEXT@ tclsh
+ @echo "Installing ${TCL_EXE} as $(BIN_INSTALL_DIR)/tclsh$(VERSION)${EXE_SUFFIX}"
+ @$(INSTALL_PROGRAM) ${TCL_EXE} "$(BIN_INSTALL_DIR)/tclsh$(VERSION)${EXE_SUFFIX}"
++ @cd "$(BIN_INSTALL_DIR)" && ln -sf tclsh$(VERSION)${EXE_SUFFIX} tclsh
@echo "Installing tclConfig.sh to $(CONFIG_INSTALL_DIR)/"
- @$(INSTALL_DATA) tclConfig.sh "$(CONFIG_INSTALL_DIR)"/tclConfig.sh
- @if test "$(STUB_LIB_FILE)" != "" ; then \
-@@ -731,7 +747,8 @@
- @EXTRA_INSTALL_BINARIES@
-
- install-libraries: libraries $(INSTALL_TZDATA) install-msgs
-- @for i in "$(INCLUDE_INSTALL_DIR)" "$(SCRIPT_INSTALL_DIR)"; \
-+ @for i in "$(INCLUDE_INSTALL_DIR)" "$(SCRIPT_INSTALL_DIR)" \
-+ "$(GENERIC_INCLUDE_INSTALL_DIR)" "$(UNIX_INCLUDE_INSTALL_DIR)"; \
- do \
- if [ ! -d "$$i" ] ; then \
- echo "Making directory $$i"; \
-@@ -739,7 +756,7 @@
+ @$(INSTALL_DATA) tclConfig.sh "$(CONFIG_INSTALL_DIR)/tclConfig.sh"
+ @echo "Installing tclooConfig.sh to $(CONFIG_INSTALL_DIR)/"
+@@ -822,7 +838,7 @@ install-libraries: libraries
else true; \
fi; \
done;
-- @for i in opt0.4 http1.0 encoding ../tcl8 ../tcl8/8.4 ../tcl8/8.4/platform ../tcl8/8.5; \
+- @for i in opt0.4 http1.0 encoding ../tcl8 ../tcl8/8.4 ../tcl8/8.4/platform ../tcl8/8.5 ../tcl8/8.6; \
+ @for i in opt0.4 http1.0 encoding; \
do \
if [ ! -d "$(SCRIPT_INSTALL_DIR)"/$$i ] ; then \
echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \
-@@ -748,12 +765,17 @@
- fi; \
- done;
- @echo "Installing header files to $(INCLUDE_INSTALL_DIR)/";
-- @for i in $(GENERIC_DIR)/tcl.h $(GENERIC_DIR)/tclDecls.h \
-- $(GENERIC_DIR)/tclPlatDecls.h \
-- $(GENERIC_DIR)/tclTomMath.h \
-- $(GENERIC_DIR)/tclTomMathDecls.h ; \
-+ @for i in $(GENERIC_DIR)/*.h ; \
-+ do \
-+ $(INSTALL_DATA) $$i "$(GENERIC_INCLUDE_INSTALL_DIR)"; \
-+ done;
-+ @for i in $(UNIX_DIR)/*.h ; \
-+ do \
-+ $(INSTALL_DATA) $$i "$(UNIX_INCLUDE_INSTALL_DIR)"; \
-+ done;
-+ @for i in tcl.h tclDecls.h tclPlatDecls.h ; \
- do \
-- $(INSTALL_DATA) $$i "$(INCLUDE_INSTALL_DIR)"; \
-+ cd "$(INCLUDE_INSTALL_DIR)" && ln -sf tcl/generic/$$i $$i; \
- done;
- @echo "Installing library files to $(SCRIPT_INSTALL_DIR)/";
- @for i in $(TOP_DIR)/library/*.tcl $(TOP_DIR)/library/tclIndex \
-@@ -767,21 +789,26 @@
- $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/http1.0; \
+@@ -843,6 +859,8 @@ install-libraries: libraries
done;
- @echo "Installing package http 2.7.12 as a Tcl Module";
-- @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/http-2.7.12.tm;
+ @echo "Installing package http 2.8.7 as a Tcl Module";
+ @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.6/http-2.8.7.tm;
+ @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/http/http.tcl;
+ @$(INSTALL_DATA) $(TOP_DIR)/library/http/pkgIndex.tcl "$(SCRIPT_INSTALL_DIR)"/http/pkgIndex.tcl;
@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; \
+@@ -850,13 +868,21 @@ install-libraries: libraries
done;
@echo "Installing package msgcat 1.5.2 as a Tcl Module";
-- @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/msgcat-1.5.2.tm;
-+ @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/msgcat1.4/msgcat.tcl;
-+ @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/pkgIndex.tcl "$(SCRIPT_INSTALL_DIR)"/msgcat1.4/pkgIndex.tcl;
- @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/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/msgcat-1.5.2.tm;
++ @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/msgcat1.5/msgcat.tcl;
++ @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/pkgIndex.tcl "$(SCRIPT_INSTALL_DIR)"/msgcat1.5/pkgIndex.tcl;
+ @echo "Installing package tcltest 2.3.6 as a Tcl Module";
+ @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/tcltest-2.3.6.tm;
+ @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/tcltest2.3/tcltest.tcl;
+ @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/pkgIndex.tcl "$(SCRIPT_INSTALL_DIR)"/tcltest2.3/pkgIndex.tcl;
@echo "Installing package platform 1.0.12 as a Tcl Module";
-- @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform-1.0.12.tm;
+ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform-1.0.12.tm;
+ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/platform1.0/platform.tcl;
+ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/pkgIndex.tcl "$(SCRIPT_INSTALL_DIR)"/platform1.0/pkgIndex.tcl;
@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;
+ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform/shell-1.1.4.tm;
+ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl "$(SCRIPT_INSTALL_DIR)"/shell1.1/shell.tcl
+ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/pkgIndex.tcl "$(SCRIPT_INSTALL_DIR)"/shell1.1/pkgIndex.tcl
@echo "Installing encoding files to $(SCRIPT_INSTALL_DIR)/encoding/";
@for i in $(TOP_DIR)/library/encoding/*.enc ; do \
+@@ -941,7 +967,7 @@ install-doc: doc
+ done
+
+ install-headers:
+- @for i in "$(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"; \
+@@ -950,13 +976,17 @@ install-headers:
+ fi; \
+ done;
+ @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 ; \
++ do \
++ $(INSTALL_DATA) $$i "$(GENERIC_INCLUDE_INSTALL_DIR)"; \
++ done;
++ @for i in $(UNIX_DIR)/*.h ; \
++ do \
++ $(INSTALL_DATA) $$i "$(UNIX_INCLUDE_INSTALL_DIR)"; \
++ done;
++ @for i in tcl.h tclDecls.h tclOO.h tclOODecls.h tclPlatDecls.h; \
+ do \
+- $(INSTALL_DATA) $$i "$(INCLUDE_INSTALL_DIR)"; \
++ cd "$(INCLUDE_INSTALL_DIR)" && ln -sf tcl/generic/$$i $$i; \
+ done;
+
+ # Optional target to install private headers
diff --git a/lang/tcl/patches/patch-unix_configure b/lang/tcl/patches/patch-unix_configure
index 8067f17fbc2..a6df4b8f5f8 100644
--- a/lang/tcl/patches/patch-unix_configure
+++ b/lang/tcl/patches/patch-unix_configure
@@ -1,8 +1,8 @@
-$NetBSD: patch-unix_configure,v 1.5 2013/11/02 20:22:02 adam Exp $
+$NetBSD: patch-unix_configure,v 1.6 2014/01/11 14:41:05 adam Exp $
---- unix/configure.orig 2013-09-13 16:07:56.000000000 +0000
+--- unix/configure.orig 2013-09-19 20:17:13.000000000 +0000
+++ unix/configure
-@@ -7560,7 +7560,7 @@ fi
+@@ -7731,7 +7731,7 @@ fi
CC_SEARCH_FLAGS=""
LD_SEARCH_FLAGS=""
;;
@@ -11,20 +11,16 @@ $NetBSD: patch-unix_configure,v 1.5 2013/11/02 20:22:02 adam Exp $
arch=`arch -s`
case "$arch" in
vax)
-@@ -7642,11 +7642,10 @@ fi
- ;;
- esac
+@@ -7805,7 +7805,7 @@ fi
+ fi
+
;;
- FreeBSD-*)
+ FreeBSD-*|DragonFly-*)
# This configuration from FreeBSD Ports.
SHLIB_CFLAGS="-fPIC"
SHLIB_LD="${CC} -shared"
-- TCL_SHLIB_LD_EXTRAS="-Wl,-soname,\$@"
- SHLIB_SUFFIX=".so"
- DL_OBJS="tclLoadDl.o"
- DL_LIBS=""
-@@ -7672,7 +7671,6 @@ fi
+@@ -7835,7 +7835,6 @@ fi
TCL_LIB_VERSIONS_OK=nodots
;;
Darwin-*)
@@ -32,7 +28,7 @@ $NetBSD: patch-unix_configure,v 1.5 2013/11/02 20:22:02 adam Exp $
SHLIB_CFLAGS="-fno-common"
# To avoid discrepancies between what headers configure sees during
# preprocessing tests and compiling tests, move any -isysroot and
-@@ -8846,7 +8844,7 @@ fi
+@@ -9010,7 +9009,7 @@ fi
BSD/OS*) ;;
CYGWIN_*|MINGW32_*) ;;
IRIX*) ;;
@@ -41,7 +37,7 @@ $NetBSD: patch-unix_configure,v 1.5 2013/11/02 20:22:02 adam Exp $
Darwin-*) ;;
SCO_SV-3.2*) ;;
*) SHLIB_CFLAGS="-fPIC" ;;
-@@ -8877,7 +8875,11 @@ fi
+@@ -9052,7 +9051,11 @@ fi
else
@@ -54,7 +50,7 @@ $NetBSD: patch-unix_configure,v 1.5 2013/11/02 20:22:02 adam Exp $
fi
-@@ -8911,7 +8913,7 @@ fi
+@@ -9086,7 +9089,7 @@ fi
else
MAKE_STUB_LIB='${STLIB_LD} $@ ${STUB_LIB_OBJS} ; ${RANLIB} $@'
@@ -63,7 +59,7 @@ $NetBSD: patch-unix_configure,v 1.5 2013/11/02 20:22:02 adam Exp $
fi
-@@ -18684,9 +18686,9 @@ fi
+@@ -19120,9 +19123,9 @@ fi
# building libtcl as a shared library instead of a static library.
#--------------------------------------------------------------------
@@ -76,10 +72,10 @@ $NetBSD: patch-unix_configure,v 1.5 2013/11/02 20:22:02 adam Exp $
# tclConfig.sh needs a version of the _LIB_SUFFIX that has been eval'ed
# since on some platforms TCL_LIB_FILE contains shell escapes.
-@@ -18791,13 +18793,10 @@ _ACEOF
- else
- # libdir must be a fully qualified path and not ${exec_prefix}/lib
+@@ -19235,13 +19238,10 @@ else
eval libdir="$libdir"
+ # default install directory for bundled packages
+ PACKAGE_DIR="$libdir"
- if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
- TCL_LIB_FLAG="-ltcl${TCL_VERSION}"
- else
@@ -93,7 +89,7 @@ $NetBSD: patch-unix_configure,v 1.5 2013/11/02 20:22:02 adam Exp $
fi
VERSION='${VERSION}'
eval "CFG_TCL_SHARED_LIB_SUFFIX=${TCL_SHARED_LIB_SUFFIX}"
-@@ -18816,12 +18815,11 @@ if test "$FRAMEWORK_BUILD" = "1" ; then
+@@ -19260,12 +19260,11 @@ if test "$FRAMEWORK_BUILD" = "1" ; then
TCL_PACKAGE_PATH="~/Library/Tcl /Library/Tcl /System/Library/Tcl ~/Library/Frameworks /Library/Frameworks /System/Library/Frameworks"
test -z "$TCL_MODULE_PATH" && \
TCL_MODULE_PATH="~/Library/Tcl /Library/Tcl /System/Library/Tcl"
@@ -108,7 +104,7 @@ $NetBSD: patch-unix_configure,v 1.5 2013/11/02 20:22:02 adam Exp $
#--------------------------------------------------------------------
# The statements below define various symbols relating to Tcl
# stub support.
-@@ -18834,12 +18832,7 @@ eval "TCL_STUB_LIB_FILE=libtclstub${TCL_
+@@ -19278,12 +19277,7 @@ eval "TCL_STUB_LIB_FILE=libtclstub${TCL_
eval "TCL_STUB_LIB_FILE=\"${TCL_STUB_LIB_FILE}\""
eval "TCL_STUB_LIB_DIR=${libdir}"
@@ -122,7 +118,7 @@ $NetBSD: patch-unix_configure,v 1.5 2013/11/02 20:22:02 adam Exp $
TCL_BUILD_STUB_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TCL_STUB_LIB_FLAG}"
TCL_STUB_LIB_SPEC="-L${TCL_STUB_LIB_DIR} ${TCL_STUB_LIB_FLAG}"
TCL_BUILD_STUB_LIB_PATH="`pwd`/${TCL_STUB_LIB_FILE}"
-@@ -18991,34 +18984,15 @@ fi
+@@ -19437,34 +19431,15 @@ fi
# Transform confdefs.h into DEFS.
# Protect against shell expansion while executing Makefile rules.
# Protect against Makefile macro expansion.
@@ -166,7 +162,7 @@ $NetBSD: patch-unix_configure,v 1.5 2013/11/02 20:22:02 adam Exp $
-@@ -19639,6 +19613,7 @@ s,@EXTRA_BUILD_HTML@,$EXTRA_BUILD_HTML,;
+@@ -20092,6 +20067,7 @@ s,@EXTRA_BUILD_HTML@,$EXTRA_BUILD_HTML,;
s,@EXTRA_TCLSH_LIBS@,$EXTRA_TCLSH_LIBS,;t t
s,@DLTEST_LD@,$DLTEST_LD,;t t
s,@DLTEST_SUFFIX@,$DLTEST_SUFFIX,;t t
diff --git a/lang/tcl/patches/patch-unix_tclUnixFCmd.c b/lang/tcl/patches/patch-unix_tclUnixFCmd.c
index 294b7ced8ed..59023bf7d73 100644
--- a/lang/tcl/patches/patch-unix_tclUnixFCmd.c
+++ b/lang/tcl/patches/patch-unix_tclUnixFCmd.c
@@ -1,10 +1,10 @@
-$NetBSD: patch-unix_tclUnixFCmd.c,v 1.1 2012/08/21 21:31:47 marino Exp $
+$NetBSD: patch-unix_tclUnixFCmd.c,v 1.2 2014/01/11 14:41:05 adam Exp $
Carried over from TCL 8.4
--- unix/tclUnixFCmd.c.orig 2012-07-16 11:57:06.000000000 +0000
+++ unix/tclUnixFCmd.c
-@@ -660,6 +660,14 @@ TclpDeleteFile(
+@@ -676,6 +676,14 @@ TclpDeleteFile(
*---------------------------------------------------------------------------
*/
diff --git a/lang/tcl/patches/patch-unix_tclUnixInit.c b/lang/tcl/patches/patch-unix_tclUnixInit.c
index ef90e0be0e8..ef55f6f572c 100644
--- a/lang/tcl/patches/patch-unix_tclUnixInit.c
+++ b/lang/tcl/patches/patch-unix_tclUnixInit.c
@@ -1,8 +1,8 @@
-$NetBSD: patch-unix_tclUnixInit.c,v 1.2 2012/11/07 14:30:48 he Exp $
+$NetBSD: patch-unix_tclUnixInit.c,v 1.3 2014/01/11 14:41:05 adam Exp $
Carried over from TCL 8.4
---- unix/tclUnixInit.c.orig 2012-07-16 11:57:06.000000000 +0000
+--- unix/tclUnixInit.c.orig 2013-09-19 19:04:17.000000000 +0000
+++ unix/tclUnixInit.c
@@ -22,7 +22,7 @@
# endif
@@ -26,7 +26,7 @@ Carried over from TCL 8.4
#ifdef __CYGWIN__
DLLIMPORT extern __stdcall unsigned char GetVersionExA(void *);
-@@ -448,7 +454,7 @@ TclpInitPlatform(void)
+@@ -387,7 +393,7 @@ TclpInitPlatform(void)
(void) signal(SIGPIPE, SIG_IGN);
#endif /* SIGPIPE */
@@ -35,7 +35,7 @@ Carried over from TCL 8.4
/*
* Adjust the rounding mode to be more conventional. Note that FreeBSD
* only provides the __fpsetreg() used by the following two for the GNU
-@@ -818,6 +824,11 @@ TclpSetVariables(
+@@ -754,6 +760,11 @@ TclpSetVariables(
#endif
int unameOK;
Tcl_DString ds;
@@ -47,7 +47,7 @@ Carried over from TCL 8.4
#ifdef HAVE_COREFOUNDATION
char tclLibPath[MAXPATHLEN + 1];
-@@ -986,8 +997,15 @@ TclpSetVariables(
+@@ -922,8 +933,15 @@ TclpSetVariables(
#endif /* DJGPP */
}
diff --git a/lang/tcl/patches/patch-unix_tclUnixPort.h b/lang/tcl/patches/patch-unix_tclUnixPort.h
index 36d6ace7284..18ffb11ca3c 100644
--- a/lang/tcl/patches/patch-unix_tclUnixPort.h
+++ b/lang/tcl/patches/patch-unix_tclUnixPort.h
@@ -1,8 +1,8 @@
-$NetBSD: patch-unix_tclUnixPort.h,v 1.2 2013/05/31 20:15:04 adam Exp $
+$NetBSD: patch-unix_tclUnixPort.h,v 1.3 2014/01/11 14:41:05 adam Exp $
--- unix/tclUnixPort.h.orig 2013-05-31 19:30:55.000000000 +0000
+++ unix/tclUnixPort.h
-@@ -121,19 +121,11 @@ typedef off_t Tcl_SeekOffset;
+@@ -141,19 +141,11 @@ typedef off_t Tcl_SeekOffset;
#if HAVE_INTTYPES_H
# include <inttypes.h>
#endif
diff --git a/x11/tk/Makefile b/x11/tk/Makefile
index cba2da0f955..e225a0cf7b8 100644
--- a/x11/tk/Makefile
+++ b/x11/tk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.76 2013/11/02 20:22:02 adam Exp $
+# $NetBSD: Makefile,v 1.77 2014/01/11 14:41:05 adam Exp $
DISTNAME= tk${TK_VERSION}-src
PKGNAME= tk-${TK_VERSION}
@@ -20,8 +20,6 @@ GNU_CONFIGURE= yes
CONFIGURE_DIRS= unix
BUILD_DIRS= ${CONFIGURE_DIRS}
CONFIGURE_ARGS+= --with-tcl=${BUILDLINK_PREFIX.tcl}/lib
-CONFIGURE_ARGS+= --x-includes=${X11BASE}/include
-CONFIGURE_ARGS+= --x-libraries=${X11BASE}/lib${LIBABISUFFIX:Q}
CONFIGURE_ENV+= LIB_RUNTIME_DIR=${PREFIX}/lib
PTHREAD_OPTS+= require
@@ -49,6 +47,8 @@ PLIST_SRC= PLIST
CONFIGURE_ARGS+= --enable-aqua
PLIST_SRC+= PLIST.aqua
.else
+CONFIGURE_ARGS+= --x-includes=${X11BASE}/include
+CONFIGURE_ARGS+= --x-libraries=${X11BASE}/lib${LIBABISUFFIX:Q}
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libXext/buildlink3.mk"
.endif
diff --git a/x11/tk/Makefile.version b/x11/tk/Makefile.version
index f9f4dbeba35..4be6e42766d 100644
--- a/x11/tk/Makefile.version
+++ b/x11/tk/Makefile.version
@@ -1,5 +1,5 @@
-# $NetBSD: Makefile.version,v 1.12 2013/11/02 20:22:02 adam Exp $
+# $NetBSD: Makefile.version,v 1.13 2014/01/11 14:41:05 adam Exp $
-TK_SONUM= 85
-TK_BASEVER= 8.5
-TK_VERSION= 8.5.15
+TK_SONUM= 86
+TK_BASEVER= 8.6
+TK_VERSION= 8.6.1
diff --git a/x11/tk/PLIST b/x11/tk/PLIST
index a58f380e737..f5070d80e36 100644
--- a/x11/tk/PLIST
+++ b/x11/tk/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2012/08/21 21:32:34 marino Exp $
+@comment $NetBSD: PLIST,v 1.13 2014/01/11 14:41:05 adam Exp $
bin/wish
bin/wish${BASEVER}
include/tk.h
@@ -6,6 +6,7 @@ include/tk/generic/default.h
include/tk/generic/ks_names.h
include/tk/generic/tk.h
include/tk/generic/tk3d.h
+include/tk/generic/tkBusy.h
include/tk/generic/tkButton.h
include/tk/generic/tkCanvas.h
include/tk/generic/tkColor.h
@@ -13,6 +14,7 @@ include/tk/generic/tkDecls.h
include/tk/generic/tkEntry.h
include/tk/generic/tkFileFilter.h
include/tk/generic/tkFont.h
+include/tk/generic/tkImgPhoto.h
include/tk/generic/tkInt.h
include/tk/generic/tkIntDecls.h
include/tk/generic/tkIntPlatDecls.h
@@ -39,6 +41,7 @@ lib/libtk${SONUM}.a
lib/libtk${SONUM}.so
lib/libtk${SONUM}.so.1.0
lib/libtkstub${SONUM}.a
+lib/pkgconfig/tk.pc
lib/tk${BASEVER}/bgerror.tcl
lib/tk${BASEVER}/button.tcl
lib/tk${BASEVER}/choosedir.tcl
@@ -67,6 +70,7 @@ lib/tk${BASEVER}/demos/entry2.tcl
lib/tk${BASEVER}/demos/entry3.tcl
lib/tk${BASEVER}/demos/filebox.tcl
lib/tk${BASEVER}/demos/floor.tcl
+lib/tk${BASEVER}/demos/fontchoose.tcl
lib/tk${BASEVER}/demos/form.tcl
lib/tk${BASEVER}/demos/goldberg.tcl
lib/tk${BASEVER}/demos/hello
@@ -76,12 +80,12 @@ lib/tk${BASEVER}/demos/image1.tcl
lib/tk${BASEVER}/demos/image2.tcl
lib/tk${BASEVER}/demos/images/earth.gif
lib/tk${BASEVER}/demos/images/earthris.gif
-lib/tk${BASEVER}/demos/images/face.xbm
lib/tk${BASEVER}/demos/images/flagdown.xbm
lib/tk${BASEVER}/demos/images/flagup.xbm
lib/tk${BASEVER}/demos/images/gray25.xbm
lib/tk${BASEVER}/demos/images/letters.xbm
lib/tk${BASEVER}/demos/images/noletter.xbm
+lib/tk${BASEVER}/demos/images/ouster.png
lib/tk${BASEVER}/demos/images/pattern.xbm
lib/tk${BASEVER}/demos/images/tcllogo.gif
lib/tk${BASEVER}/demos/images/teapot.ppm
@@ -130,7 +134,12 @@ lib/tk${BASEVER}/demos/widget
lib/tk${BASEVER}/dialog.tcl
lib/tk${BASEVER}/entry.tcl
lib/tk${BASEVER}/focus.tcl
+lib/tk${BASEVER}/fontchooser.tcl
+lib/tk${BASEVER}/iconlist.tcl
+lib/tk${BASEVER}/icons.tcl
lib/tk${BASEVER}/images/README
+lib/tk${BASEVER}/images/lamp.png
+lib/tk${BASEVER}/images/lamp.svg
lib/tk${BASEVER}/images/logo.eps
lib/tk${BASEVER}/images/logo100.gif
lib/tk${BASEVER}/images/logo64.gif
@@ -144,6 +153,7 @@ lib/tk${BASEVER}/images/pwrdLogo200.gif
lib/tk${BASEVER}/images/pwrdLogo75.gif
lib/tk${BASEVER}/images/tai-ku.gif
lib/tk${BASEVER}/listbox.tcl
+lib/tk${BASEVER}/megawidget.tcl
lib/tk${BASEVER}/menu.tcl
lib/tk${BASEVER}/mkpsenc.tcl
lib/tk${BASEVER}/msgbox.tcl
@@ -488,6 +498,7 @@ man/mann/bell.n
man/mann/bind.n
man/mann/bindtags.n
man/mann/bitmap.n
+man/mann/busy.n
man/mann/button.n
man/mann/canvas.n
man/mann/checkbutton.n
@@ -500,7 +511,9 @@ man/mann/entry.n
man/mann/event.n
man/mann/focus.n
man/mann/font.n
+man/mann/fontchooser.n
man/mann/frame.n
+man/mann/geometry.n
man/mann/grab.n
man/mann/grid.n
man/mann/image.n
@@ -508,20 +521,20 @@ man/mann/keysyms.n
man/mann/label.n
man/mann/labelframe.n
man/mann/listbox.n
-man/mann/loadTk.n
man/mann/lower.n
man/mann/menu.n
man/mann/menubutton.n
man/mann/message.n
man/mann/option.n
man/mann/options.n
-man/mann/pack-old.n
man/mann/pack.n
+man/mann/pack_old.n
man/mann/panedwindow.n
man/mann/photo.n
man/mann/place.n
man/mann/radiobutton.n
man/mann/raise.n
+man/mann/safe_loadTk.n
man/mann/scale.n
man/mann/scrollbar.n
man/mann/selection.n
@@ -539,41 +552,45 @@ man/mann/tk_focusNext.n
man/mann/tk_focusPrev.n
man/mann/tk_getOpenFile.n
man/mann/tk_getSaveFile.n
+man/mann/tk_library.n
+man/mann/tk_mac.n
man/mann/tk_menuBar.n
man/mann/tk_menuSetFocus.n
man/mann/tk_messageBox.n
man/mann/tk_optionMenu.n
+man/mann/tk_patchLevel.n
man/mann/tk_popup.n
man/mann/tk_setPalette.n
+man/mann/tk_strictMotif.n
man/mann/tk_textCopy.n
man/mann/tk_textCut.n
man/mann/tk_textPaste.n
+man/mann/tk_version.n
man/mann/tkerror.n
-man/mann/tkvars.n
man/mann/tkwait.n
man/mann/toplevel.n
-man/mann/ttk::button.n
-man/mann/ttk::checkbutton.n
-man/mann/ttk::combobox.n
-man/mann/ttk::entry.n
-man/mann/ttk::frame.n
-man/mann/ttk::intro.n
-man/mann/ttk::label.n
-man/mann/ttk::labelframe.n
-man/mann/ttk::menubutton.n
-man/mann/ttk::notebook.n
-man/mann/ttk::panedwindow.n
-man/mann/ttk::progressbar.n
-man/mann/ttk::radiobutton.n
-man/mann/ttk::scale.n
-man/mann/ttk::scrollbar.n
-man/mann/ttk::separator.n
-man/mann/ttk::sizegrip.n
-man/mann/ttk::spinbox.n
-man/mann/ttk::style.n
-man/mann/ttk::treeview.n
-man/mann/ttk::widget.n
+man/mann/ttk_button.n
+man/mann/ttk_checkbutton.n
+man/mann/ttk_combobox.n
+man/mann/ttk_entry.n
+man/mann/ttk_frame.n
man/mann/ttk_image.n
+man/mann/ttk_intro.n
+man/mann/ttk_label.n
+man/mann/ttk_labelframe.n
+man/mann/ttk_menubutton.n
+man/mann/ttk_notebook.n
+man/mann/ttk_panedwindow.n
+man/mann/ttk_progressbar.n
+man/mann/ttk_radiobutton.n
+man/mann/ttk_scale.n
+man/mann/ttk_scrollbar.n
+man/mann/ttk_separator.n
+man/mann/ttk_sizegrip.n
+man/mann/ttk_spinbox.n
+man/mann/ttk_style.n
+man/mann/ttk_treeview.n
man/mann/ttk_vsapi.n
+man/mann/ttk_widget.n
man/mann/winfo.n
man/mann/wm.n
diff --git a/x11/tk/buildlink3.mk b/x11/tk/buildlink3.mk
index 9fadc431d04..4636860c5f1 100644
--- a/x11/tk/buildlink3.mk
+++ b/x11/tk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.33 2013/06/06 12:53:41 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.34 2014/01/11 14:41:05 adam Exp $
BUILDLINK_TREE+= tk
@@ -6,16 +6,16 @@ BUILDLINK_TREE+= tk
TK_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.tk+= tk>=8.5.7
-BUILDLINK_ABI_DEPENDS.tk+= tk>=8.5.14nb3
+BUILDLINK_ABI_DEPENDS.tk+= tk>=8.6.1
BUILDLINK_PKGSRCDIR.tk?= ../../x11/tk
BUILDLINK_FILES.tk+= bin/wish*
#
-# Make "-ltk" and "-ltk8.5" resolve into "-ltk85", so that we don't
+# Make "-ltk" and "-ltk8.6" resolve into "-ltk86", so that we don't
# need to patch so many Makefiles.
#
-BUILDLINK_TRANSFORM+= l:tk:tk85
-BUILDLINK_TRANSFORM+= l:tk8.5:tk85
+BUILDLINK_TRANSFORM+= l:tk:tk86
+BUILDLINK_TRANSFORM+= l:tk8.6:tk86
TKCONFIG_SH?= ${BUILDLINK_PREFIX.tk}/lib/tkConfig.sh
diff --git a/x11/tk/distinfo b/x11/tk/distinfo
index e230dafb1cf..8c85078ed13 100644
--- a/x11/tk/distinfo
+++ b/x11/tk/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.41 2013/11/02 20:22:02 adam Exp $
+$NetBSD: distinfo,v 1.42 2014/01/11 14:41:05 adam Exp $
-SHA1 (tk8.5.15-src.tar.gz) = 11c9e4d94719184a62b6beb19d37e3391b376619
-RMD160 (tk8.5.15-src.tar.gz) = 6f642a13389d02a0a0179a8e156376e31304466d
-Size (tk8.5.15-src.tar.gz) = 4086650 bytes
-SHA1 (patch-unix_Makefile.in) = b428cd131efd9ece3bf6a4a17c829f383f79b835
-SHA1 (patch-unix_configure) = 0bfbb99b11fb8634c5cccb739854775a088dc600
+SHA1 (tk8.6.1-src.tar.gz) = ecfcc20833c04d6890b14a7920a04d16f2123a51
+RMD160 (tk8.6.1-src.tar.gz) = 9176fd2c5e7d36c84141333939e85614d3ba2e11
+Size (tk8.6.1-src.tar.gz) = 4244010 bytes
+SHA1 (patch-macosx_tkMacOSXDraw.c) = 3b45060592b5805b57dcd55234dcd9eaca22c3e0
+SHA1 (patch-unix_Makefile.in) = d4309930f0c62f4712098586d1b763ffea8abbc5
+SHA1 (patch-unix_configure) = 1cc4f07dba9ab1052aa0604fb5e45892de86888e
diff --git a/x11/tk/patches/patch-macosx_tkMacOSXDraw.c b/x11/tk/patches/patch-macosx_tkMacOSXDraw.c
new file mode 100644
index 00000000000..e36d6b41b79
--- /dev/null
+++ b/x11/tk/patches/patch-macosx_tkMacOSXDraw.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-macosx_tkMacOSXDraw.c,v 1.3 2014/01/11 14:41:06 adam Exp $
+
+Fix OS X screen refresh problem.
+
+--- macosx/tkMacOSXDraw.c.orig 2014-01-11 12:56:24.000000000 +0000
++++ macosx/tkMacOSXDraw.c
+@@ -1690,6 +1690,7 @@ TkMacOSXRestoreDrawingContext(
+ {
+ if (dcPtr->context) {
+ CGContextSynchronize(dcPtr->context);
++ [[dcPtr->view window] setViewsNeedDisplay:YES];
+ [[dcPtr->view window] enableFlushWindow];
+ if (dcPtr->focusLocked) {
+ [dcPtr->view unlockFocus];
diff --git a/x11/tk/patches/patch-unix_Makefile.in b/x11/tk/patches/patch-unix_Makefile.in
index d0c12596504..65ff27afcb5 100644
--- a/x11/tk/patches/patch-unix_Makefile.in
+++ b/x11/tk/patches/patch-unix_Makefile.in
@@ -1,8 +1,8 @@
-$NetBSD: patch-unix_Makefile.in,v 1.4 2013/11/02 20:22:02 adam Exp $
+$NetBSD: patch-unix_Makefile.in,v 1.5 2014/01/11 14:41:06 adam Exp $
---- unix/Makefile.in.orig 2013-09-16 16:45:24.000000000 +0000
+--- unix/Makefile.in.orig 2013-09-17 12:25:13.000000000 +0000
+++ unix/Makefile.in
-@@ -13,6 +13,7 @@ MAJOR_VERSION = @TK_MAJOR_VERSION@
+@@ -14,6 +14,7 @@ MAJOR_VERSION = @TK_MAJOR_VERSION@
MINOR_VERSION = @TK_MINOR_VERSION@
PATCH_LEVEL = @TK_PATCH_LEVEL@
LOCALES = @LOCALES@
@@ -10,7 +10,7 @@ $NetBSD: patch-unix_Makefile.in,v 1.4 2013/11/02 20:22:02 adam Exp $
#----------------------------------------------------------------
# Things you can change to personalize the Makefile for your own
-@@ -63,6 +64,8 @@ SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TK
+@@ -64,6 +65,8 @@ SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TK
# Directory in which to install the include file tk.h:
INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir)
@@ -19,7 +19,7 @@ $NetBSD: patch-unix_Makefile.in,v 1.4 2013/11/02 20:22:02 adam Exp $
# Path to the private tk header dir:
PRIVATE_INCLUDE_DIR = @PRIVATE_INCLUDE_DIR@
-@@ -99,7 +102,7 @@ DEMO_INSTALL_DIR = $(INSTALL_ROOT)$(TK_L
+@@ -100,7 +103,7 @@ DEMO_INSTALL_DIR = $(INSTALL_ROOT)$(TK_L
# 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):
@@ -28,7 +28,7 @@ $NetBSD: patch-unix_Makefile.in,v 1.4 2013/11/02 20:22:02 adam Exp $
# The directory containing the platform specific Tcl sources and headers
# appropriate for this version of Tk:
-@@ -136,7 +139,7 @@ CFLAGS_OPTIMIZE = @CFLAGS_OPTIMIZE@
+@@ -137,7 +140,7 @@ CFLAGS_OPTIMIZE = @CFLAGS_OPTIMIZE@
#CFLAGS = $(CFLAGS_DEBUG)
#CFLAGS = $(CFLAGS_OPTIMIZE)
#CFLAGS = $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE)
@@ -37,7 +37,7 @@ $NetBSD: patch-unix_Makefile.in,v 1.4 2013/11/02 20:22:02 adam Exp $
# Flags to pass to the linker
LDFLAGS_DEBUG = @LDFLAGS_DEBUG@
-@@ -244,6 +247,7 @@ TK_STUB_LIB_FLAG = @TK_STUB_LIB_FLAG@
+@@ -245,6 +248,7 @@ TK_STUB_LIB_FLAG = @TK_STUB_LIB_FLAG@
#TK_STUB_LIB_FLAG = -ltkstub
TK_LIB_FILE = @TK_LIB_FILE@
@@ -45,7 +45,7 @@ $NetBSD: patch-unix_Makefile.in,v 1.4 2013/11/02 20:22:02 adam Exp $
#TK_LIB_FILE = libtk.a
# Generic lib name used in rules that apply to tcl and tk
-@@ -275,6 +279,8 @@ SHLIB_LD = @SHLIB_LD@
+@@ -276,6 +280,8 @@ SHLIB_LD = @SHLIB_LD@
SHLIB_LD_LIBS = @SHLIB_LD_LIBS@
TK_SHLIB_LD_EXTRAS = @TK_SHLIB_LD_EXTRAS@
@@ -54,7 +54,7 @@ $NetBSD: patch-unix_Makefile.in,v 1.4 2013/11/02 20:22:02 adam Exp $
# Additional search flags needed to find the various shared libraries
# at run-time. The first symbol is for use when creating a binary
# with cc, and the second is for use when running ld directly.
-@@ -545,6 +551,9 @@ PRIVATE_HDRS = $(GENERIC_DIR)/tkInt.h $(
+@@ -562,6 +568,9 @@ PRIVATE_HDRS = $(GENERIC_DIR)/tkInt.h $(
DEMOPROGS = browse hello ixset rmt rolodex square tcolor timer widget
@@ -64,7 +64,7 @@ $NetBSD: patch-unix_Makefile.in,v 1.4 2013/11/02 20:22:02 adam Exp $
SHELL_ENV = \
@LD_LIBRARY_PATH_VAR@="`pwd`:${TCL_BIN_DIR}:$${@LD_LIBRARY_PATH_VAR@}"; \
export @LD_LIBRARY_PATH_VAR@; \
-@@ -568,6 +577,11 @@ ${LIB_FILE}: ${OBJS} ${STUB_LIB_FILE} @L
+@@ -585,6 +594,11 @@ ${LIB_FILE}: ${OBJS} ${STUB_LIB_FILE} @L
rm -f $@
@MAKE_LIB@
@@ -76,7 +76,7 @@ $NetBSD: patch-unix_Makefile.in,v 1.4 2013/11/02 20:22:02 adam Exp $
${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
rm -f $@
@MAKE_STUB_LIB@
-@@ -685,7 +699,7 @@ install-strip:
+@@ -713,7 +727,7 @@ install-strip:
# some ranlibs write to current directory, and this might not always be
# possible (e.g. if installing as root).
@@ -85,7 +85,7 @@ $NetBSD: patch-unix_Makefile.in,v 1.4 2013/11/02 20:22:02 adam Exp $
@for i in "$(LIB_INSTALL_DIR)" "$(BIN_INSTALL_DIR)" \
"$(PKG_INSTALL_DIR)" "$(CONFIG_INSTALL_DIR)" ; \
do \
-@@ -715,7 +729,13 @@ install-binaries: $(TK_LIB_FILE) $(TK_ST
+@@ -743,7 +757,13 @@ install-binaries: $(TK_LIB_FILE) $(TK_ST
fi
@echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/"
@@INSTALL_LIB@
@@ -100,7 +100,7 @@ $NetBSD: patch-unix_Makefile.in,v 1.4 2013/11/02 20:22:02 adam Exp $
@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";\
-@@ -724,6 +744,7 @@ install-binaries: $(TK_LIB_FILE) $(TK_ST
+@@ -752,6 +772,7 @@ install-binaries: $(TK_LIB_FILE) $(TK_ST
fi
@echo "Installing ${WISH_EXE} as $(BIN_INSTALL_DIR)/wish$(VERSION)${EXE_SUFFIX}"
@$(INSTALL_PROGRAM) ${WISH_EXE} "$(BIN_INSTALL_DIR)/wish$(VERSION)${EXE_SUFFIX}"
@@ -108,7 +108,7 @@ $NetBSD: patch-unix_Makefile.in,v 1.4 2013/11/02 20:22:02 adam Exp $
@echo "Installing tkConfig.sh to $(CONFIG_INSTALL_DIR)/"
@$(INSTALL_DATA) tkConfig.sh "$(CONFIG_INSTALL_DIR)/tkConfig.sh"
@if test "$(STUB_LIB_FILE)" != "" ; then \
-@@ -828,7 +849,7 @@ install-doc:
+@@ -859,7 +880,7 @@ install-doc:
install-headers:
@if test "$(@TK_WINDOWINGSYSTEM@_XLIB_HDRS)" != ""; then \
XLIB_INCLUDE_INSTALL_DIR="$(INCLUDE_INSTALL_DIR)"/X11; fi; \
@@ -117,7 +117,7 @@ $NetBSD: patch-unix_Makefile.in,v 1.4 2013/11/02 20:22:02 adam Exp $
do \
if [ -n "$$i" -a ! -d "$$i" ] ; then \
echo "Making directory $$i"; \
-@@ -837,9 +858,12 @@ install-headers:
+@@ -868,9 +889,12 @@ install-headers:
fi; \
done;
@echo "Installing header files to $(INCLUDE_INSTALL_DIR)/";
diff --git a/x11/tk/patches/patch-unix_configure b/x11/tk/patches/patch-unix_configure
index ac943b955f1..ce7cea0bf75 100644
--- a/x11/tk/patches/patch-unix_configure
+++ b/x11/tk/patches/patch-unix_configure
@@ -1,21 +1,21 @@
-$NetBSD: patch-unix_configure,v 1.7 2013/11/02 20:22:02 adam Exp $
+$NetBSD: patch-unix_configure,v 1.8 2014/01/11 14:41:06 adam Exp $
---- unix/configure.orig 2013-09-16 16:45:24.000000000 +0000
+--- unix/configure.orig 2013-09-17 12:25:13.000000000 +0000
+++ unix/configure
-@@ -4844,10 +4844,10 @@ fi
+@@ -4617,10 +4617,10 @@ fi
# LDFLAGS_ARCH so they eventually end up in LDFLAGS even if [load]
# is disabled by the user. [Bug 1016796]
LDFLAGS_ARCH=""
- UNSHARED_LIB_SUFFIX=""
++ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
TCL_TRIM_DOTS='`echo ${VERSION} | tr -d .`'
ECHO_VERSION='`echo ${VERSION}`'
- TCL_LIB_VERSIONS_OK=ok
+ TCL_LIB_VERSIONS_OK=nodots
-+ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
CFLAGS_DEBUG=-g
- CFLAGS_OPTIMIZE=-O
if test "$GCC" = yes; then
-@@ -5766,7 +5766,7 @@ fi
+
+@@ -5576,7 +5576,7 @@ fi
CC_SEARCH_FLAGS=""
LD_SEARCH_FLAGS=""
;;
@@ -24,7 +24,7 @@ $NetBSD: patch-unix_configure,v 1.7 2013/11/02 20:22:02 adam Exp $
arch=`arch -s`
case "$arch" in
vax)
-@@ -5788,7 +5788,7 @@ fi
+@@ -5598,7 +5598,7 @@ fi
fi
LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
@@ -33,7 +33,7 @@ $NetBSD: patch-unix_configure,v 1.7 2013/11/02 20:22:02 adam Exp $
LDFLAGS="-Wl,-export-dynamic"
;;
esac
-@@ -5823,7 +5823,7 @@ fi
+@@ -5633,7 +5633,7 @@ fi
SHLIB_SUFFIX=".so"
DL_OBJS="tclLoadDl.o"
DL_LIBS=""
@@ -42,25 +42,16 @@ $NetBSD: patch-unix_configure,v 1.7 2013/11/02 20:22:02 adam Exp $
if test $doRpath = yes; then
CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
-@@ -5839,16 +5839,11 @@ fi
-
+@@ -5650,7 +5650,7 @@ fi
fi
-- case $system in
-- FreeBSD-3.*)
-- # FreeBSD-3 doesn't handle version numbers with dots.
- UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so'
- TCL_LIB_VERSIONS_OK=nodots
-- ;;
-- esac
;;
- FreeBSD-*)
+ FreeBSD-*|DragonFly-*)
# This configuration from FreeBSD Ports.
SHLIB_CFLAGS="-fPIC"
SHLIB_LD="${CC} -shared"
-@@ -5874,7 +5869,7 @@ fi
+@@ -5676,7 +5676,7 @@ fi
# Version numbers are dot-stripped by system policy.
TCL_TRIM_DOTS=`echo ${VERSION} | tr -d .`
UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
@@ -69,7 +60,7 @@ $NetBSD: patch-unix_configure,v 1.7 2013/11/02 20:22:02 adam Exp $
TCL_LIB_VERSIONS_OK=nodots
;;
Darwin-*)
-@@ -7052,7 +7047,7 @@ fi
+@@ -6855,7 +6855,7 @@ fi
BSD/OS*) ;;
CYGWIN_*|MINGW32_*) ;;
IRIX*) ;;
@@ -78,7 +69,7 @@ $NetBSD: patch-unix_configure,v 1.7 2013/11/02 20:22:02 adam Exp $
Darwin-*) ;;
SCO_SV-3.2*) ;;
*) SHLIB_CFLAGS="-fPIC" ;;
-@@ -7062,12 +7057,12 @@ fi
+@@ -6876,12 +6876,12 @@ fi
if test "$SHARED_LIB_SUFFIX" = ""; then
@@ -93,7 +84,7 @@ $NetBSD: patch-unix_configure,v 1.7 2013/11/02 20:22:02 adam Exp $
fi
DLL_INSTALL_DIR="\$(LIB_INSTALL_DIR)"
-@@ -7083,7 +7078,11 @@ fi
+@@ -6897,7 +6897,11 @@ fi
else
@@ -106,7 +97,7 @@ $NetBSD: patch-unix_configure,v 1.7 2013/11/02 20:22:02 adam Exp $
fi
-@@ -7117,7 +7116,7 @@ fi
+@@ -6931,7 +6935,7 @@ fi
else
MAKE_STUB_LIB='${STLIB_LD} $@ ${STUB_LIB_OBJS} ; ${RANLIB} $@'
@@ -115,7 +106,7 @@ $NetBSD: patch-unix_configure,v 1.7 2013/11/02 20:22:02 adam Exp $
fi
-@@ -10252,7 +10251,7 @@ echo $ECHO_N "checking for X11 libraries
+@@ -10066,7 +10070,7 @@ echo $ECHO_N "checking for X11 libraries
if test -r $i/libX11.a -o -r $i/libX11.so -o -r $i/libX11.sl -o -r $i/libX11.dylib; then
echo "$as_me:$LINENO: result: $i" >&5
echo "${ECHO_T}$i" >&6
@@ -124,7 +115,7 @@ $NetBSD: patch-unix_configure,v 1.7 2013/11/02 20:22:02 adam Exp $
x_libraries="$i"
break
fi
-@@ -10261,7 +10260,7 @@ echo "${ECHO_T}$i" >&6
+@@ -10075,7 +10079,7 @@ echo "${ECHO_T}$i" >&6
if test "$x_libraries" = ""; then
XLIBSW=-lX11
else
@@ -133,7 +124,19 @@ $NetBSD: patch-unix_configure,v 1.7 2013/11/02 20:22:02 adam Exp $
fi
fi
if test "$XLIBSW" = nope ; then
-@@ -11446,14 +11445,10 @@ else
+@@ -10171,11 +10175,6 @@ fi
+ # be replaced by spaces.
+ #--------------------------------------------------------------------
+
+-if test "x${x_libraries}" != "x"; then
+- if test "x${x_libraries}" != "xNONE"; then
+- LIB_RUNTIME_DIR="${LIB_RUNTIME_DIR}:${x_libraries}"
+- fi
+-fi
+ if test "${TCL_LD_SEARCH_FLAGS}" = '-L${LIB_RUNTIME_DIR}'; then
+ LIB_RUNTIME_DIR=`echo ${LIB_RUNTIME_DIR} |sed -e 's/:/ -L/g'`
+ fi
+@@ -11333,14 +11332,10 @@ else
TK_LIB_FLAG="-ltk`echo ${TK_VERSION} | tr -d .`"
TK_BUILD_LIB_SPEC="-L\$(TOP_DIR)/win ${TK_LIB_FLAG}"
else
@@ -149,7 +152,7 @@ $NetBSD: patch-unix_configure,v 1.7 2013/11/02 20:22:02 adam Exp $
fi
#--------------------------------------------------------------------
-@@ -11465,11 +11460,7 @@ fi
+@@ -11352,11 +11347,7 @@ fi
eval "TK_STUB_LIB_FILE=libtkstub${TK_UNSHARED_LIB_SUFFIX}"
eval "TK_STUB_LIB_DIR=${libdir}"
@@ -162,7 +165,7 @@ $NetBSD: patch-unix_configure,v 1.7 2013/11/02 20:22:02 adam Exp $
TK_BUILD_STUB_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TK_STUB_LIB_FLAG}"
TK_STUB_LIB_SPEC="-L${TK_STUB_LIB_DIR} ${TK_STUB_LIB_FLAG}"
-@@ -12290,6 +12281,7 @@ s,@APP_RSRC_FILE@,$APP_RSRC_FILE,;t t
+@@ -12177,6 +12168,7 @@ s,@APP_RSRC_FILE@,$APP_RSRC_FILE,;t t
s,@REZ@,$REZ,;t t
s,@REZ_FLAGS@,$REZ_FLAGS,;t t
s,@LTLIBOBJS@,$LTLIBOBJS,;t t
generated by cgit v1.2.3 (git 2.39.1) at 2024-10-30 00:59:30 +0000