Andreas Wacknitz
2021-11-08 5992e8b68b217d5d52370e3686c2a54547ef764e
tcl: update to 8.6.12

4 files modified
88 ■■■■ changed files
components/tcl/tcl/Makefile 4 ●●●● patch | view | raw | blame | history
components/tcl/tcl/manifests/sample-manifest.p5m 7 ●●●● patch | view | raw | blame | history
components/tcl/tcl/patches/2.makefile.patch 37 ●●●● patch | view | raw | blame | history
components/tcl/tcl/tcl.p5m 40 ●●●●● patch | view | raw | blame | history
components/tcl/tcl/Makefile
@@ -28,12 +28,12 @@
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME=         tcl
COMPONENT_VERSION=      8.6.11
COMPONENT_VERSION=      8.6.12
COMPONENT_MINOR_VERSION= $(shell echo $(COMPONENT_VERSION) | $(GSED) -e 's/\([0-9]\+\)\.\([0-9]\+\)\.[0-9]\+/\1.\2/')
COMPONENT_PROJECT_URL=    https://prdownloads.sourceforge.net/tcl/
COMPONENT_SRC=          $(COMPONENT_NAME)$(COMPONENT_VERSION)
COMPONENT_ARCHIVE=      $(COMPONENT_NAME)-core$(COMPONENT_VERSION)-src.tar.gz
COMPONENT_ARCHIVE_HASH= sha256:cfb49aab82bd179651e23eeeb69606f51b0ddc575ca55c3d35e2457469024cfa
COMPONENT_ARCHIVE_HASH= sha256:186748f1131cef3d637421a18d70892f808e526a29c694bebfeb1c540f98727c
COMPONENT_ARCHIVE_URL=  $(COMPONENT_PROJECT_URL)$(COMPONENT_ARCHIVE)
COMPONENT_LICENSE=    BSD-like
COMPONENT_LICENSE_FILE=    license.terms
components/tcl/tcl/manifests/sample-manifest.p5m
@@ -43,6 +43,7 @@
file path=usr/lib/tcl8.6/clock.tcl
file path=usr/lib/tcl8.6/encoding/ascii.enc
file path=usr/lib/tcl8.6/encoding/big5.enc
file path=usr/lib/tcl8.6/encoding/cns11643.enc
file path=usr/lib/tcl8.6/encoding/cp1250.enc
file path=usr/lib/tcl8.6/encoding/cp1251.enc
file path=usr/lib/tcl8.6/encoding/cp1252.enc
@@ -86,6 +87,7 @@
file path=usr/lib/tcl8.6/encoding/iso2022.enc
file path=usr/lib/tcl8.6/encoding/iso8859-1.enc
file path=usr/lib/tcl8.6/encoding/iso8859-10.enc
file path=usr/lib/tcl8.6/encoding/iso8859-11.enc
file path=usr/lib/tcl8.6/encoding/iso8859-13.enc
file path=usr/lib/tcl8.6/encoding/iso8859-14.enc
file path=usr/lib/tcl8.6/encoding/iso8859-15.enc
@@ -259,7 +261,7 @@
file path=usr/lib/tcl8.6/tclIndex
file path=usr/lib/tcl8.6/tm.tcl
file path=usr/lib/tcl8.6/word.tcl
file path=usr/lib/tcl8/8.4/platform-1.0.15.tm
file path=usr/lib/tcl8/8.4/platform-1.0.18.tm
file path=usr/lib/tcl8/8.4/platform/shell-1.1.4.tm
file path=usr/lib/tcl8/8.5/msgcat-1.6.1.tm
file path=usr/lib/tcl8/8.5/tcltest-2.5.3.tm
@@ -886,6 +888,7 @@
link path=usr/share/man/man3tcl/Tcl_GetMaster.3tcl target=Tcl_IsSafe.3tcl
link path=usr/share/man/man3tcl/Tcl_GetMathFuncInfo.3tcl \
    target=Tcl_CreateMathFunc.3tcl
link path=usr/share/man/man3tcl/Tcl_GetMemoryInfo.3tcl target=Tcl_Alloc.3tcl
link path=usr/share/man/man3tcl/Tcl_GetModeFromStat.3tcl \
    target=Tcl_FSRegister.3tcl
link path=usr/share/man/man3tcl/Tcl_GetModificationTimeFromStat.3tcl \
@@ -1033,6 +1036,8 @@
link path=usr/share/man/man3tcl/Tcl_LogCommandInfo.3tcl \
    target=Tcl_GetReturnOptions.3tcl
file path=usr/share/man/man3tcl/Tcl_Main.3tcl
link path=usr/share/man/man3tcl/Tcl_MainEx.3tcl target=Tcl_Main.3tcl
link path=usr/share/man/man3tcl/Tcl_MainExW.3tcl target=Tcl_Main.3tcl
link path=usr/share/man/man3tcl/Tcl_MakeFileChannel.3tcl \
    target=Tcl_OpenFileChannel.3tcl
link path=usr/share/man/man3tcl/Tcl_MakeSafe.3tcl target=Tcl_IsSafe.3tcl
components/tcl/tcl/patches/2.makefile.patch
@@ -2,10 +2,9 @@
man3 and mann).
This patch will not be sent upstream.
--- tcl8.6.6/unix/Makefile.in.orig    2017-06-06 13:42:31.781379906 +0000
+++ tcl8.6.6/unix/Makefile.in    2017-06-06 13:46:50.442386833 +0000
@@ -68,10 +68,10 @@
--- tcl8.6.12/unix/Makefile.in.orig    2021-10-29 19:08:08.000000000 +0000
+++ tcl8.6.12/unix/Makefile.in    2021-11-07 21:42:26.308067807 +0000
@@ -72,10 +72,10 @@
 MAN1_INSTALL_DIR    = $(MAN_INSTALL_DIR)/man1
 
 # Directory in which to install manual entries for Tcl's C library procedures:
@@ -18,7 +17,7 @@
 
 # Path to the html documentation dir:
 HTML_DIR        = @HTML_DIR@
@@ -277,7 +277,7 @@
@@ -280,7 +280,7 @@
 
 APP_CC_SWITCHES = $(CC_SWITCHES) @EXTRA_APP_CC_SWITCHES@
 
@@ -26,31 +25,31 @@
+LIBS        = @TCL_LIBS@ -lc
 
 DEPEND_SWITCHES    = ${CFLAGS} -I${UNIX_DIR} -I${GENERIC_DIR} \
 ${AC_FLAGS} ${PROTO_FLAGS} ${EXTRA_CFLAGS} @EXTRA_CC_SWITCHES@
@@ -916,7 +916,7 @@
     done;
     ${AC_FLAGS} ${EXTRA_CFLAGS} @EXTRA_CC_SWITCHES@
@@ -1019,7 +1019,7 @@
     done
 
 install-doc: doc
-    @for i in "$(MAN_INSTALL_DIR)" "$(MAN1_INSTALL_DIR)" "$(MAN3_INSTALL_DIR)" "$(MANN_INSTALL_DIR)" ; \
+    @for i in "$(MAN_INSTALL_DIR)" "$(MAN1_INSTALL_DIR)" "$(MAN3TCL_INSTALL_DIR)" "$(MAN1T_INSTALL_DIR)" ; \
         do \
-    @for i in "$(MAN_INSTALL_DIR)" "$(MAN1_INSTALL_DIR)" "$(MAN3_INSTALL_DIR)" "$(MANN_INSTALL_DIR)"; do \
+    @for i in "$(MAN_INSTALL_DIR)" "$(MAN1_INSTALL_DIR)" "$(MAN3TCL_INSTALL_DIR)" "$(MAN1T_INSTALL_DIR)"; do \
         if [ ! -d "$$i" ] ; then \
         echo "Making directory $$i"; \
@@ -929,14 +929,14 @@
         $(INSTALL_DATA_DIR) "$$i"; \
@@ -1029,13 +1029,13 @@
     @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)/";
-    @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)"; \
+    @echo "Installing and cross-linking C API (.3tcl) docs to $(MAN3TCL_INSTALL_DIR)/";
+    @for i in $(TOP_DIR)/doc/*.3tcl; do \
+        $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MAN3TCL_INSTALL_DIR)"; \
     done
-    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)"; \
+    @echo "Installing and cross-linking C API (.3tcl) docs to $(MAN3TCL_INSTALL_DIR)/"
+    @for i in $(TOP_DIR)/doc/*.3tcl; do \
+        $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MAN3TCL_INSTALL_DIR)"; \
+    done
+    @echo "Installing and cross-linking command (.1t) docs to $(MAN1T_INSTALL_DIR)/";
+    @for i in $(TOP_DIR)/doc/*.1t; do \
+        $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MAN1T_INSTALL_DIR)"; \
components/tcl/tcl/tcl.p5m
@@ -1,23 +1,14 @@
#
# CDDL HEADER START
# This file and its contents are supplied under the terms of the
# Common Development and Distribution License ("CDDL"), version 1.0.
# You may only use this file in accordance with the terms of version
# 1.0 of the CDDL.
#
# The contents of this file are subject to the terms of the
# Common Development and Distribution License (the "License").
# You may not use this file except in compliance with the License.
# A full copy of the text of the CDDL should have accompanied this
# source.  A copy of the CDDL is also available via the Internet at
# http://www.illumos.org/license/CDDL.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
# See the License for the specific language governing permissions
# and limitations under the License.
#
# When distributing Covered Code, include this CDDL HEADER in each
# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
# If applicable, add the following below this CDDL HEADER, with the
# fields enclosed by brackets "[]" replaced with your own identifying
# information: Portions Copyright [yyyy] [name of copyright owner]
#
# CDDL HEADER END
#
# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2020, Michal Nowak
#
@@ -39,13 +30,14 @@
file files/libtcl.3 path=usr/share/man/man3/libtcl.3
link path=usr/bin/$(MACH32)/tclsh target=tclsh$(COMPONENT_MINOR_VERSION)
file path=usr/bin/$(MACH32)/tclsh$(COMPONENT_MINOR_VERSION)
link path=usr/bin/$(MACH64)/tclsh target=tclsh$(COMPONENT_MINOR_VERSION)
file path=usr/bin/$(MACH64)/tclsh$(COMPONENT_MINOR_VERSION)
link path=usr/bin/$(MACH32)/tclsh target=tclsh$(COMPONENT_MINOR_VERSION)
link path=usr/bin/$(MACH64)/tclsh target=tclsh$(COMPONENT_MINOR_VERSION)
link path=usr/bin/tclsh target=tclsh$(COMPONENT_MINOR_VERSION)
link path=usr/bin/tclsh$(COMPONENT_MINOR_VERSION) \
    target=$(MACH64)/tclsh$(COMPONENT_MINOR_VERSION)
file path=usr/include/tcl.h
file path=usr/include/tclDecls.h
file path=usr/include/tclOO.h
@@ -54,20 +46,18 @@
file path=usr/include/tclTomMath.h
file path=usr/include/tclTomMathDecls.h
file path=usr/lib/$(MACH64)/libtcl$(COMPONENT_MINOR_VERSION).so
link path=usr/lib/$(MACH64)/libtcl8.5.so \
    target=libtcl$(COMPONENT_MINOR_VERSION).so
file path=usr/lib/$(MACH64)/libtclstub$(COMPONENT_MINOR_VERSION).a
file path=usr/lib/$(MACH64)/pkgconfig/tcl.pc
file path=usr/lib/$(MACH64)/tclConfig.sh mode=0555
file path=usr/lib/$(MACH64)/tclooConfig.sh mode=0555
file path=usr/lib/libtcl$(COMPONENT_MINOR_VERSION).so
link path=usr/lib/libtcl8.5.so target=libtcl$(COMPONENT_MINOR_VERSION).so
file path=usr/lib/libtclstub$(COMPONENT_MINOR_VERSION).a
file path=usr/lib/pkgconfig/tcl.pc
file path=usr/lib/tcl$(COMPONENT_MINOR_VERSION)/auto.tcl
file path=usr/lib/tcl$(COMPONENT_MINOR_VERSION)/clock.tcl
file path=usr/lib/tcl$(COMPONENT_MINOR_VERSION)/encoding/ascii.enc
file path=usr/lib/tcl$(COMPONENT_MINOR_VERSION)/encoding/big5.enc
file path=usr/lib/tcl$(COMPONENT_MINOR_VERSION)/encoding/cns11643.enc
file path=usr/lib/tcl$(COMPONENT_MINOR_VERSION)/encoding/cp1250.enc
file path=usr/lib/tcl$(COMPONENT_MINOR_VERSION)/encoding/cp1251.enc
file path=usr/lib/tcl$(COMPONENT_MINOR_VERSION)/encoding/cp1252.enc
@@ -111,6 +101,7 @@
file path=usr/lib/tcl$(COMPONENT_MINOR_VERSION)/encoding/iso2022.enc
file path=usr/lib/tcl$(COMPONENT_MINOR_VERSION)/encoding/iso8859-1.enc
file path=usr/lib/tcl$(COMPONENT_MINOR_VERSION)/encoding/iso8859-10.enc
file path=usr/lib/tcl$(COMPONENT_MINOR_VERSION)/encoding/iso8859-11.enc
file path=usr/lib/tcl$(COMPONENT_MINOR_VERSION)/encoding/iso8859-13.enc
file path=usr/lib/tcl$(COMPONENT_MINOR_VERSION)/encoding/iso8859-14.enc
file path=usr/lib/tcl$(COMPONENT_MINOR_VERSION)/encoding/iso8859-15.enc
@@ -284,7 +275,7 @@
file path=usr/lib/tcl$(COMPONENT_MINOR_VERSION)/tclIndex
file path=usr/lib/tcl$(COMPONENT_MINOR_VERSION)/tm.tcl
file path=usr/lib/tcl$(COMPONENT_MINOR_VERSION)/word.tcl
file path=usr/lib/tcl8/8.4/platform-1.0.15.tm
file path=usr/lib/tcl8/8.4/platform-1.0.18.tm
file path=usr/lib/tcl8/8.4/platform/shell-1.1.4.tm
file path=usr/lib/tcl8/8.5/msgcat-1.6.1.tm
file path=usr/lib/tcl8/8.5/tcltest-2.5.3.tm
@@ -911,6 +902,7 @@
link path=usr/share/man/man3tcl/Tcl_GetMaster.3tcl target=Tcl_IsSafe.3tcl
link path=usr/share/man/man3tcl/Tcl_GetMathFuncInfo.3tcl \
    target=Tcl_CreateMathFunc.3tcl
link path=usr/share/man/man3tcl/Tcl_GetMemoryInfo.3tcl target=Tcl_Alloc.3tcl
link path=usr/share/man/man3tcl/Tcl_GetModeFromStat.3tcl \
    target=Tcl_FSRegister.3tcl
link path=usr/share/man/man3tcl/Tcl_GetModificationTimeFromStat.3tcl \
@@ -1058,6 +1050,8 @@
link path=usr/share/man/man3tcl/Tcl_LogCommandInfo.3tcl \
    target=Tcl_GetReturnOptions.3tcl
file path=usr/share/man/man3tcl/Tcl_Main.3tcl
link path=usr/share/man/man3tcl/Tcl_MainEx.3tcl target=Tcl_Main.3tcl
link path=usr/share/man/man3tcl/Tcl_MainExW.3tcl target=Tcl_Main.3tcl
link path=usr/share/man/man3tcl/Tcl_MakeFileChannel.3tcl \
    target=Tcl_OpenFileChannel.3tcl
link path=usr/share/man/man3tcl/Tcl_MakeSafe.3tcl target=Tcl_IsSafe.3tcl