Date: Mon, 11 Jan 2021 10:09:00 +0000 (UTC) From: Pietro Cerutti <gahr@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r561204 - in head: lang/tcl86 lang/tcl86/files x11-toolkits/tk86 x11-toolkits/tk86/files Message-ID: <202101111009.10BA90l1078379@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gahr Date: Mon Jan 11 10:09:00 2021 New Revision: 561204 URL: https://svnweb.freebsd.org/changeset/ports/561204 Log: lang/tcl86, x11-toolkits/tk86: update to 8.6.11 Announcement: https://sourceforge.net/p/tcl/mailman/message/37189924/ Modified: head/lang/tcl86/Makefile head/lang/tcl86/distinfo head/lang/tcl86/files/patch-unix-Makefile.in head/lang/tcl86/files/patch-unix-configure head/lang/tcl86/files/patch-unix-installManPage head/lang/tcl86/files/patch-unix-tclUnixInit.c head/lang/tcl86/pkg-plist head/x11-toolkits/tk86/Makefile head/x11-toolkits/tk86/distinfo head/x11-toolkits/tk86/files/patch-Makefile.in head/x11-toolkits/tk86/files/patch-configure head/x11-toolkits/tk86/files/patch-installManPage head/x11-toolkits/tk86/pkg-plist Modified: head/lang/tcl86/Makefile ============================================================================== --- head/lang/tcl86/Makefile Mon Jan 11 09:55:23 2021 (r561203) +++ head/lang/tcl86/Makefile Mon Jan 11 10:09:00 2021 (r561204) @@ -46,10 +46,10 @@ PATCH_WRKSRC= ${WRKDIR}/${PORTNAME}${TCL_VERSION} WRKSRC= ${PATCH_WRKSRC}/unix ALL_TARGET= all -INSTALL_TARGET= install-strip install-libraries install-modules +INSTALL_TARGET= install-strip install-libraries install-private-headers TEST_TARGET= test-tcl -TCL_VERSION= 8.6.10 +TCL_VERSION= 8.6.11 TCL_VER= ${TCL_VERSION:R} TCL_RC= SHORT_TCL_VER= ${TCL_VER:S/.//} Modified: head/lang/tcl86/distinfo ============================================================================== --- head/lang/tcl86/distinfo Mon Jan 11 09:55:23 2021 (r561203) +++ head/lang/tcl86/distinfo Mon Jan 11 10:09:00 2021 (r561204) @@ -1,3 +1,3 @@ -TIMESTAMP = 1574411125 -SHA256 (tcl8.6.10-src.tar.gz) = 5196dbf6638e3df8d5c87b5815c8c2b758496eb6f0e41446596c9a4e638d87ed -SIZE (tcl8.6.10-src.tar.gz) = 10144235 +TIMESTAMP = 1610351286 +SHA256 (tcl8.6.11-src.tar.gz) = 8c0486668586672c5693d7d95817cb05a18c5ecca2f40e2836b9578064088258 +SIZE (tcl8.6.11-src.tar.gz) = 10259009 Modified: head/lang/tcl86/files/patch-unix-Makefile.in ============================================================================== --- head/lang/tcl86/files/patch-unix-Makefile.in Mon Jan 11 09:55:23 2021 (r561203) +++ head/lang/tcl86/files/patch-unix-Makefile.in Mon Jan 11 10:09:00 2021 (r561204) @@ -1,6 +1,6 @@ ---- unix/Makefile.in.orig 2018-10-09 18:52:36 UTC +--- unix/Makefile.in.orig 2020-12-21 20:59:29 UTC +++ unix/Makefile.in -@@ -54,6 +54,8 @@ SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TC +@@ -58,6 +58,8 @@ MODULE_INSTALL_DIR = $(SCRIPT_INSTALL_DIR)/../tcl8 # Directory in which to install the include file tcl.h: INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir) @@ -9,7 +9,7 @@ # Path to the private tcl header dir: PRIVATE_INCLUDE_DIR = @PRIVATE_INCLUDE_DIR@ -@@ -80,10 +82,10 @@ HTML_DIR = @HTML_DIR@ +@@ -84,10 +86,10 @@ HTML_DIR = @HTML_DIR@ HTML_INSTALL_DIR = $(INSTALL_ROOT)$(HTML_DIR) # Directory in which to install the configuration file tclConfig.sh @@ -22,7 +22,7 @@ # Package search path. TCL_PACKAGE_PATH = @TCL_PACKAGE_PATH@ -@@ -614,9 +616,9 @@ SRCS = $(GENERIC_SRCS) $(TOMMATH_SRCS) $ +@@ -708,9 +710,9 @@ SRCS = $(GENERIC_SRCS) $(TOMMATH_SRCS) $(UNIX_SRCS) $( # Start of rules #-------------------------------------------------------------------------- @@ -34,20 +34,21 @@ libraries: -@@ -627,6 +629,12 @@ doc: +@@ -721,7 +723,13 @@ doc: ${LIB_FILE}: ${STUB_LIB_FILE} ${OBJS} rm -f $@ @MAKE_LIB@ + @ln -sf ${LIB_FILE} ./libtcl${SHORT_TCL_VER}.so -+ + +libtcl${SHORT_TCL_VER}.a: ${OBJS} + rm -f libtcl${SHORT_TCL_VER}.a + ar cr libtcl${SHORT_TCL_VER}.a ${OBJS} + ${RANLIB} libtcl${SHORT_TCL_VER}.a - ++ ${STUB_LIB_FILE}: ${STUB_LIB_OBJS} @if test "x${LIB_FILE}" = "xlibtcl${MAJOR_VERSION}.${MINOR_VERSION}.dll"; then \ -@@ -770,13 +778,13 @@ trace-test: ${TCLTEST_EXE} + (cd ${TOP_DIR}/win; ${MAKE} winextensions); \ +@@ -864,13 +872,13 @@ trace-test: ${TCLTEST_EXE} # Installation rules #-------------------------------------------------------------------------- @@ -64,7 +65,7 @@ install: $(INSTALL_TARGETS) -@@ -798,6 +806,11 @@ install-binaries: binaries +@@ -892,6 +900,11 @@ install-binaries: binaries @echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/" @@INSTALL_LIB@ @chmod 555 "$(DLL_INSTALL_DIR)/$(LIB_FILE)" @@ -76,118 +77,132 @@ @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)/" -@@ -810,12 +823,17 @@ install-binaries: binaries +@@ -904,35 +917,19 @@ install-binaries: binaries @INSTALL_STUB_LIB@ ; \ fi @EXTRA_INSTALL_BINARIES@ - @echo "Installing pkg-config file to $(LIB_INSTALL_DIR)/pkgconfig/" -- @$(INSTALL_DATA_DIR) $(LIB_INSTALL_DIR)/pkgconfig -- @$(INSTALL_DATA) tcl.pc $(LIB_INSTALL_DIR)/pkgconfig/tcl.pc +- @$(INSTALL_DATA_DIR) "$(LIB_INSTALL_DIR)/pkgconfig" +- @$(INSTALL_DATA) tcl.pc "$(LIB_INSTALL_DIR)/pkgconfig/tcl.pc" + @echo "Installing pkg-config file to $(prefix)/libdata/pkgconfig" + @$(INSTALL_DATA_DIR) $(INSTALL_ROOT)$(prefix)/libdata/pkgconfig + @$(INSTALL_DATA) tcl.pc $(INSTALL_ROOT)$(prefix)/libdata/pkgconfig/tcl86.pc -+ @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; install-libraries: libraries -- @for i in "$(SCRIPT_INSTALL_DIR)"; \ -+ @for i in "$(SCRIPT_INSTALL_DIR)" "$(SCRIPT_INSTALL_DIR)"/encoding; \ +- @for i in "$(SCRIPT_INSTALL_DIR)" "$(MODULE_INSTALL_DIR)"; \ ++ @for i in opt0.4 http1.0 platform encoding; \ do \ - if [ ! -d "$$i" ] ; then \ - echo "Making directory $$i"; \ -@@ -823,7 +841,13 @@ install-libraries: libraries +- if [ ! -d "$$i" ] ; then \ +- echo "Making directory $$i"; \ +- $(INSTALL_DATA_DIR) "$$i"; \ +- else true; \ +- fi; \ +- done; +- @for i in opt0.4 http1.0 encoding; \ +- do \ + if [ ! -d "$(SCRIPT_INSTALL_DIR)/$$i" ] ; then \ + echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \ + $(INSTALL_DATA_DIR) "$(SCRIPT_INSTALL_DIR)/$$i"; \ 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; \ -+ @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"; \ -@@ -843,31 +867,31 @@ install-libraries: libraries - $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/http1.0; \ +- @for i in 8.4 8.4/platform 8.5 8.6; \ +- do \ +- if [ ! -d "$(MODULE_INSTALL_DIR)/$$i" ] ; then \ +- echo "Making directory $(MODULE_INSTALL_DIR)/$$i"; \ +- $(INSTALL_DATA_DIR) "$(MODULE_INSTALL_DIR)/$$i"; \ +- 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@; \ +@@ -945,31 +942,29 @@ install-libraries: libraries + $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)/http1.0"; \ done; - @echo "Installing package http 2.9.1 as a Tcl Module"; -- @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.6/http-2.9.1.tm; -+ @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/http-2.9.1.tm; + @echo "Installing package http 2.9.5 as a Tcl Module"; +- @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(MODULE_INSTALL_DIR)/8.6/http-2.9.5.tm"; ++ @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)/http-2.9.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; \ + $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)/opt0.4"; \ done; @echo "Installing package msgcat 1.6.1 as a Tcl Module"; -- @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/msgcat-1.6.1.tm; -+ @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/msgcat-1.6.1.tm; - @echo "Installing package tcltest 2.5.1 as a Tcl Module"; -- @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/tcltest-2.5.1.tm; -+ @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/tcltest-2.5.1.tm; - - @echo "Installing package platform 1.0.14 as a Tcl Module"; -- @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform-1.0.14.tm; -+ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/platform-1.0.14.tm; +- @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(MODULE_INSTALL_DIR)/8.5/msgcat-1.6.1.tm"; ++ @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)/msgcat-1.6.1.tm"; + @echo "Installing package tcltest 2.5.3 as a Tcl Module"; +- @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(MODULE_INSTALL_DIR)/8.5/tcltest-2.5.3.tm"; +- ++ @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)/tcltest-2.5.3.tm"; + @echo "Installing package platform 1.0.15 as a Tcl Module"; +- @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(MODULE_INSTALL_DIR)/8.4/platform-1.0.15.tm"; ++ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)/platform-1.0.15.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; -+ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl "$(SCRIPT_INSTALL_DIR)"/platform/shell-1.1.4.tm; - - @echo "Installing encoding files to $(SCRIPT_INSTALL_DIR)/encoding/"; +- @$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl "$(MODULE_INSTALL_DIR)/8.4/platform/shell-1.1.4.tm"; +- +- @echo "Installing encoding files to $(SCRIPT_INSTALL_DIR)/encoding/"; ++ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl "$(SCRIPT_INSTALL_DIR)/platform/shell-1.1.4.tm"; ++ @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; \ +- $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)/encoding"; \ ++ $(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; \ +- "$(SCRIPT_INSTALL_DIR)/tm.tcl"; \ - fi -+ @echo "Customizing tcl module path"; \ ++ @echo "Customizing tcl module path"; + echo "if {![interp issafe]} { ::tcl::tm::roots {$(TCL_MODULE_PATH)} }" >> \ -+ "$(SCRIPT_INSTALL_DIR)"/tm.tcl; \ ++ "$(SCRIPT_INSTALL_DIR)"/tm.tcl; + echo "::tcl::tm::path add {$(TCL_LIBRARY)}" >> \ -+ "$(SCRIPT_INSTALL_DIR)"/tm.tcl; \ ++ "$(SCRIPT_INSTALL_DIR)"/tm.tcl; install-tzdata: @for i in tzdata; \ -@@ -942,7 +966,7 @@ install-doc: doc +@@ -1044,7 +1039,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)"; \ ++ @for i in "$(INCLUDE_INSTALL_DIR)" "$(GENERIC_INCLUDE_INSTALL_DIR)"; \ do \ if [ ! -d "$$i" ] ; then \ echo "Making directory $$i"; \ -@@ -951,14 +975,19 @@ install-headers: - fi; \ +@@ -1061,10 +1056,13 @@ install-headers: + do \ + $(INSTALL_DATA) $$i "$(INCLUDE_INSTALL_DIR)"; \ 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 ; \ -- do \ -- $(INSTALL_DATA) $$i "$(INCLUDE_INSTALL_DIR)"; \ + @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; -+ @ln -sf generic/tcl.h "$(INCLUDE_INSTALL_DIR)"/tcl.h -+ @ln -sf generic/tclDecls.h "$(INCLUDE_INSTALL_DIR)"/tclDecls.h -+ @ln -sf generic/tclPlatDecls.h "$(INCLUDE_INSTALL_DIR)"/tclPlatDecls.h -+ @ln -sf generic/tclOO.h "$(INCLUDE_INSTALL_DIR)"/tclOO.h -+ @ln -sf generic/tclOODecls.h "$(INCLUDE_INSTALL_DIR)"/tclOODecls.h -+ @ln -sf generic/tclTomMath.h "$(INCLUDE_INSTALL_DIR)"/tclTomMath.h -+ @ln -sf generic/tclTomMathDecls.h "$(INCLUDE_INSTALL_DIR)"/tclTomMathDecls.h # Optional target to install private headers install-private-headers: +- @for i in "$(PRIVATE_INCLUDE_INSTALL_DIR)"; \ ++ @for i in "$(GENERIC_INCLUDE_INSTALL_DIR)" "$(UNIX_INCLUDE_INSTALL_DIR)"; \ + do \ + if [ ! -d "$$i" ] ; then \ + echo "Making directory $$i"; \ +@@ -1072,13 +1070,16 @@ install-private-headers: + else true; \ + fi; \ + done; +- @echo "Installing private header files to $(PRIVATE_INCLUDE_INSTALL_DIR)/"; ++ @echo "Installing private header files to $(INCLUDE_INSTALL_DIR)/"; + @for i in $(GENERIC_DIR)/tclInt.h $(GENERIC_DIR)/tclIntDecls.h \ + $(GENERIC_DIR)/tclIntPlatDecls.h $(GENERIC_DIR)/tclPort.h \ +- $(GENERIC_DIR)/tclOOInt.h $(GENERIC_DIR)/tclOOIntDecls.h \ +- $(UNIX_DIR)/tclUnixPort.h; \ ++ $(GENERIC_DIR)/tclOOInt.h $(GENERIC_DIR)/tclOOIntDecls.h; \ + do \ +- $(INSTALL_DATA) $$i "$(PRIVATE_INCLUDE_INSTALL_DIR)"; \ ++ $(INSTALL_DATA) $$i "$(GENERIC_INCLUDE_INSTALL_DIR)"; \ ++ done; ++ @for i in $(UNIX_DIR)/tclUnixPort.h $(UNIX_DIR)/tclUnixThrd.h @DTRACE_HDR@; \ ++ do \ ++ $(INSTALL_DATA) $$i "$(UNIX_INCLUDE_INSTALL_DIR)"; \ + done; + @if test -f tclConfig.h; then\ + $(INSTALL_DATA) tclConfig.h "$(PRIVATE_INCLUDE_INSTALL_DIR)"; \ Modified: head/lang/tcl86/files/patch-unix-configure ============================================================================== --- head/lang/tcl86/files/patch-unix-configure Mon Jan 11 09:55:23 2021 (r561203) +++ head/lang/tcl86/files/patch-unix-configure Mon Jan 11 10:09:00 2021 (r561204) @@ -1,6 +1,6 @@ ---- unix/configure.orig 2018-10-09 18:52:36 UTC +--- unix/configure.orig 2020-12-11 19:22:34 UTC +++ unix/configure -@@ -7534,15 +7534,11 @@ fi +@@ -7528,15 +7528,11 @@ fi LDFLAGS="$LDFLAGS $PTHREAD_LIBS" fi Modified: head/lang/tcl86/files/patch-unix-installManPage ============================================================================== --- head/lang/tcl86/files/patch-unix-installManPage Mon Jan 11 09:55:23 2021 (r561203) +++ head/lang/tcl86/files/patch-unix-installManPage Mon Jan 11 10:09:00 2021 (r561204) @@ -1,11 +1,11 @@ ---- unix/installManPage.orig 2016-03-01 01:59:35 UTC +--- unix/installManPage.orig 2020-12-11 19:22:34 UTC +++ unix/installManPage -@@ -100,7 +100,7 @@ SrcDir=`dirname $ManPage` +@@ -108,7 +108,7 @@ done First="" for Target in $Names; do - Target=$Target.$Section$Suffix + Target=$Target$Suffix.$Section - rm -f $Dir/$Target $Dir/$Target.* + rm -f "$Dir/$Target" "$Dir/$Target.*" if test -z "$First" ; then First=$Target Modified: head/lang/tcl86/files/patch-unix-tclUnixInit.c ============================================================================== --- head/lang/tcl86/files/patch-unix-tclUnixInit.c Mon Jan 11 09:55:23 2021 (r561203) +++ head/lang/tcl86/files/patch-unix-tclUnixInit.c Mon Jan 11 10:09:00 2021 (r561204) @@ -1,6 +1,6 @@ ---- unix/tclUnixInit.c.orig 2018-10-05 17:38:41 UTC +--- unix/tclUnixInit.c.orig 2020-12-11 17:46:23 UTC +++ unix/tclUnixInit.c -@@ -391,14 +391,6 @@ TclpInitPlatform(void) +@@ -395,14 +395,6 @@ TclpInitPlatform(void) #endif /* SIGPIPE */ #if defined(__FreeBSD__) && defined(__GNUC__) Modified: head/lang/tcl86/pkg-plist ============================================================================== --- head/lang/tcl86/pkg-plist Mon Jan 11 09:55:23 2021 (r561203) +++ head/lang/tcl86/pkg-plist Mon Jan 11 10:09:00 2021 (r561204) @@ -39,15 +39,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 -lib/tcl%%TCL_VER%%/http-2.9.1.tm +lib/tcl%%TCL_VER%%/http-2.9.5.tm lib/tcl%%TCL_VER%%/http1.0/http.tcl lib/tcl%%TCL_VER%%/http1.0/pkgIndex.tcl lib/tcl%%TCL_VER%%/msgcat-1.6.1.tm lib/tcl%%TCL_VER%%/opt0.4/optparse.tcl lib/tcl%%TCL_VER%%/opt0.4/pkgIndex.tcl -lib/tcl%%TCL_VER%%/platform-1.0.14.tm +lib/tcl%%TCL_VER%%/platform-1.0.15.tm lib/tcl%%TCL_VER%%/platform/shell-1.1.4.tm -lib/tcl%%TCL_VER%%/tcltest-2.5.1.tm +lib/tcl%%TCL_VER%%/tcltest-2.5.3.tm lib/tcl%%TCL_VER%%/auto.tcl lib/tcl%%TCL_VER%%/clock.tcl lib/tcl%%TCL_VER%%/encoding/ascii.enc @@ -354,6 +354,7 @@ lib/tcl%%TCL_VER%%/word.tcl %%TCLMAN%%man/man3/Tcl_CreateAliasObj.tcl86.3.gz %%TCLMAN%%man/man3/Tcl_CreateChannel.tcl86.3.gz %%TCLMAN%%man/man3/Tcl_CreateChannelHandler.tcl86.3.gz +%%TCLMAN%%man/man3/Tcl_CreateChild.tcl86.3.gz %%TCLMAN%%man/man3/Tcl_CreateCloseHandler.tcl86.3.gz %%TCLMAN%%man/man3/Tcl_CreateCommand.tcl86.3.gz %%TCLMAN%%man/man3/Tcl_CreateEncoding.tcl86.3.gz @@ -528,6 +529,7 @@ lib/tcl%%TCL_VER%%/word.tcl %%TCLMAN%%man/man3/Tcl_GetChannelOption.tcl86.3.gz %%TCLMAN%%man/man3/Tcl_GetChannelThread.tcl86.3.gz %%TCLMAN%%man/man3/Tcl_GetChannelType.tcl86.3.gz +%%TCLMAN%%man/man3/Tcl_GetChild.tcl86.3.gz %%TCLMAN%%man/man3/Tcl_GetCharLength.tcl86.3.gz %%TCLMAN%%man/man3/Tcl_GetClassAsObject.tcl86.3.gz %%TCLMAN%%man/man3/Tcl_GetCommandFromObj.tcl86.3.gz @@ -584,6 +586,7 @@ lib/tcl%%TCL_VER%%/word.tcl %%TCLMAN%%man/man3/Tcl_GetObjResult.tcl86.3.gz %%TCLMAN%%man/man3/Tcl_GetObjType.tcl86.3.gz %%TCLMAN%%man/man3/Tcl_GetOpenFile.tcl86.3.gz +%%TCLMAN%%man/man3/Tcl_GetParent.tcl86.3.gz %%TCLMAN%%man/man3/Tcl_GetPathType.tcl86.3.gz %%TCLMAN%%man/man3/Tcl_GetRange.tcl86.3.gz %%TCLMAN%%man/man3/Tcl_GetRegExpFromObj.tcl86.3.gz @@ -1260,6 +1263,7 @@ lib/tcl%%TCL_VER%%/word.tcl %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/North_Dakota/Beulah %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/North_Dakota/Center %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/North_Dakota/New_Salem +%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Nuuk %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Ojinaga %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Panama %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Pangnirtung Modified: head/x11-toolkits/tk86/Makefile ============================================================================== --- head/x11-toolkits/tk86/Makefile Mon Jan 11 09:55:23 2021 (r561203) +++ head/x11-toolkits/tk86/Makefile Mon Jan 11 10:09:00 2021 (r561204) @@ -45,7 +45,7 @@ CONFIGURE_ENV= PORTSDIR=${PORTSDIR} CFLAGS+= -I${TCL_INCLUDEDIR} \ -I${LOCALBASE}/include -TK_VERSION= 8.6.10 +TK_VERSION= 8.6.11 TK_VER= ${TK_VERSION:R} TK_RC= # Nothing SHORT_TK_VER= ${TK_VER:S/.//} Modified: head/x11-toolkits/tk86/distinfo ============================================================================== --- head/x11-toolkits/tk86/distinfo Mon Jan 11 09:55:23 2021 (r561203) +++ head/x11-toolkits/tk86/distinfo Mon Jan 11 10:09:00 2021 (r561204) @@ -1,3 +1,3 @@ -TIMESTAMP = 1574416639 -SHA256 (tk8.6.10-src.tar.gz) = 63df418a859d0a463347f95ded5cd88a3dd3aaa1ceecaeee362194bc30f3e386 -SIZE (tk8.6.10-src.tar.gz) = 4444764 +TIMESTAMP = 1610356453 +SHA256 (tk8.6.11-src.tar.gz) = 5228a8187a7f70fa0791ef0f975270f068ba9557f57456f51eb02d9d4ea31282 +SIZE (tk8.6.11-src.tar.gz) = 4496914 Modified: head/x11-toolkits/tk86/files/patch-Makefile.in ============================================================================== --- head/x11-toolkits/tk86/files/patch-Makefile.in Mon Jan 11 09:55:23 2021 (r561203) +++ head/x11-toolkits/tk86/files/patch-Makefile.in Mon Jan 11 10:09:00 2021 (r561204) @@ -1,6 +1,6 @@ ---- Makefile.in.orig 2016-07-26 14:07:50 UTC +--- Makefile.in.orig 2020-12-31 01:55:50 UTC +++ Makefile.in -@@ -64,6 +64,8 @@ SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TK +@@ -65,6 +65,8 @@ SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TK_LIBRARY) # Directory in which to install the include file tk.h: INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir) @@ -9,7 +9,7 @@ # Path to the private tk header dir: PRIVATE_INCLUDE_DIR = @PRIVATE_INCLUDE_DIR@ -@@ -92,7 +94,7 @@ HTML_DIR = @HTML_DIR@ +@@ -93,7 +95,7 @@ HTML_DIR = @HTML_DIR@ HTML_INSTALL_DIR = $(INSTALL_ROOT)$(HTML_DIR) # Directory in which to install the configuration file tkConfig.sh: @@ -18,7 +18,7 @@ # Directory in which to install the demo files: DEMO_INSTALL_DIR = $(INSTALL_ROOT)$(TK_LIBRARY)/demos -@@ -555,6 +557,8 @@ TTK_HDRS = $(TTK_DIR)/ttkTheme.h $(TTK_D +@@ -561,6 +563,8 @@ TTK_HDRS = $(TTK_DIR)/ttkTheme.h $(TTK_DIR)/ttkDecls.h PUBLIC_HDRS = $(GENERIC_DIR)/tk.h $(GENERIC_DIR)/tkDecls.h \ $(GENERIC_DIR)/tkPlatDecls.h $(@TK_WINDOWINGSYSTEM@_HDRS) @@ -27,20 +27,21 @@ # 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 \ -@@ -584,6 +588,12 @@ doc: $(TOP_DIR)/doc/man.macros +@@ -590,7 +594,13 @@ doc: $(TOP_DIR)/doc/man.macros ${LIB_FILE}: ${STUB_LIB_FILE} @LIB_RSRC_FILE@ ${OBJS} rm -f $@ @MAKE_LIB@ + @ln -sf ${LIB_FILE} ./libtk${SHORT_TK_VER}.so -+ + +libtk${SHORT_TK_VER}.a: ${OBJS} + rm -f libtk${SHORT_TK_VER}.a + ar rc libtk${SHORT_TK_VER}.a ${OBJS} + $(RANLIB) libtk${SHORT_TK_VER}.a - ++ ${STUB_LIB_FILE}: ${STUB_LIB_OBJS} @if test "x${LIB_FILE}" = "xlibtk${MAJOR_VERSION}.${MINOR_VERSION}.dll"; then \ -@@ -699,8 +709,7 @@ INSTALL_DOC_TARGETS = install-doc + (cd ${TOP_DIR}/win; ${MAKE} tk${MAJOR_VERSION}${MINOR_VERSION}.dll); \ +@@ -705,8 +715,7 @@ INSTALL_DOC_TARGETS = install-doc INSTALL_DEV_TARGETS = install-headers INSTALL_DEMO_TARGETS = install-demos INSTALL_EXTRA_TARGETS = @EXTRA_INSTALL@ @@ -50,7 +51,7 @@ install: $(INSTALL_TARGETS) -@@ -709,7 +718,7 @@ install-strip: +@@ -715,7 +724,7 @@ install-strip: INSTALL_PROGRAM="$(INSTALL_PROGRAM) ${INSTALL_STRIP_PROGRAM}" \ INSTALL_LIBRARY="$(INSTALL_LIBRARY) ${INSTALL_STRIP_LIBRARY}" @@ -59,7 +60,7 @@ @for i in "$(LIB_INSTALL_DIR)" "$(BIN_INSTALL_DIR)" \ "$(PKG_INSTALL_DIR)" "$(CONFIG_INSTALL_DIR)" ; \ do \ -@@ -740,6 +749,10 @@ install-binaries: $(TK_STUB_LIB_FILE) $( +@@ -746,6 +755,10 @@ install-binaries: $(TK_STUB_LIB_FILE) $(TK_LIB_FILE) $ @echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/" @@INSTALL_LIB@ @chmod 555 "$(DLL_INSTALL_DIR)/$(LIB_FILE)" @@ -70,20 +71,20 @@ @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";\ -@@ -755,9 +768,9 @@ install-binaries: $(TK_STUB_LIB_FILE) $( +@@ -761,9 +774,9 @@ install-binaries: $(TK_STUB_LIB_FILE) $(TK_LIB_FILE) $ @INSTALL_STUB_LIB@ ; \ fi @EXTRA_INSTALL_BINARIES@ - @echo "Installing pkg-config file to $(LIB_INSTALL_DIR)/pkgconfig/" -- @$(INSTALL_DATA_DIR) $(LIB_INSTALL_DIR)/pkgconfig -- @$(INSTALL_DATA) tk.pc $(LIB_INSTALL_DIR)/pkgconfig/tk.pc +- @$(INSTALL_DATA_DIR) "$(LIB_INSTALL_DIR)/pkgconfig" +- @$(INSTALL_DATA) tk.pc "$(LIB_INSTALL_DIR)/pkgconfig/tk.pc" + @echo "Installing pkg-config file to $(INSTALL_ROOT)$(prefix)/libdata/pkgconfig/" + @$(INSTALL_DATA_DIR) $(INSTALL_ROOT)$(prefix)/libdata/pkgconfig + @$(INSTALL_DATA) tk.pc $(INSTALL_ROOT)$(prefix)/libdata/pkgconfig/tk86.pc install-libraries: libraries @for i in "$(SCRIPT_INSTALL_DIR)" "$(SCRIPT_INSTALL_DIR)/images" \ -@@ -855,7 +868,8 @@ install-doc: +@@ -861,7 +874,8 @@ install-doc: install-headers: @if test "$(@TK_WINDOWINGSYSTEM@_XLIB_HDRS)" != ""; then \ XLIB_INCLUDE_INSTALL_DIR="$(INCLUDE_INSTALL_DIR)"/X11; fi; \ @@ -93,7 +94,7 @@ do \ if [ -n "$$i" -a ! -d "$$i" ] ; then \ echo "Making directory $$i"; \ -@@ -864,9 +878,12 @@ install-headers: +@@ -870,9 +884,12 @@ install-headers: fi; \ done; @echo "Installing header files to $(INCLUDE_INSTALL_DIR)/"; Modified: head/x11-toolkits/tk86/files/patch-configure ============================================================================== --- head/x11-toolkits/tk86/files/patch-configure Mon Jan 11 09:55:23 2021 (r561203) +++ head/x11-toolkits/tk86/files/patch-configure Mon Jan 11 10:09:00 2021 (r561204) @@ -1,6 +1,6 @@ ---- configure.orig 2016-07-26 14:07:50 UTC +--- configure.orig 2020-12-31 01:55:50 UTC +++ configure -@@ -5456,15 +5456,11 @@ fi +@@ -5425,15 +5425,11 @@ fi LDFLAGS="$LDFLAGS $PTHREAD_LIBS" fi Modified: head/x11-toolkits/tk86/files/patch-installManPage ============================================================================== --- head/x11-toolkits/tk86/files/patch-installManPage Mon Jan 11 09:55:23 2021 (r561203) +++ head/x11-toolkits/tk86/files/patch-installManPage Mon Jan 11 10:09:00 2021 (r561204) @@ -1,11 +1,11 @@ ---- installManPage.orig 2016-07-26 14:07:50 UTC +--- installManPage.orig 2020-12-31 01:55:50 UTC +++ installManPage -@@ -100,7 +100,7 @@ SrcDir=`dirname $ManPage` +@@ -108,7 +108,7 @@ done First="" for Target in $Names; do - Target=$Target.$Section$Suffix + Target=$Target$Suffix.$Section - rm -f $Dir/$Target $Dir/$Target.* + rm -f "$Dir/$Target" "$Dir/$Target.*" if test -z "$First" ; then First=$Target Modified: head/x11-toolkits/tk86/pkg-plist ============================================================================== --- head/x11-toolkits/tk86/pkg-plist Mon Jan 11 09:55:23 2021 (r561203) +++ head/x11-toolkits/tk86/pkg-plist Mon Jan 11 10:09:00 2021 (r561204) @@ -341,6 +341,7 @@ lib/tk%%TK_VER%%/xmfbox.tcl %%TKMAN%%man/man3/Tk_GetHWND.tk86.3.gz %%TKMAN%%man/man3/Tk_GetImage.tk86.3.gz %%TKMAN%%man/man3/Tk_GetImageMasterData.tk86.3.gz +%%TKMAN%%man/man3/Tk_GetImageModelData.tk86.3.gz %%TKMAN%%man/man3/Tk_GetItemTypes.tk86.3.gz %%TKMAN%%man/man3/Tk_GetJoinStyle.tk86.3.gz %%TKMAN%%man/man3/Tk_GetJustify.tk86.3.gz
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202101111009.10BA90l1078379>