From e9b169c41dbd555dd2a1641f73cc3ac82ab101d8 Mon Sep 17 00:00:00 2001 From: adam Date: Sat, 2 Nov 2013 20:22:02 +0000 Subject: Changes 8.5.15: Bug-fix release. --- lang/tcl/Makefile.version | 4 ++-- lang/tcl/distinfo | 12 +++++------ lang/tcl/patches/patch-unix_Makefile.in | 12 +++++------ lang/tcl/patches/patch-unix_configure | 36 ++++++++++++++++----------------- 4 files changed, 32 insertions(+), 32 deletions(-) (limited to 'lang/tcl') diff --git a/lang/tcl/Makefile.version b/lang/tcl/Makefile.version index 9c8fd1d9587..c8cec854329 100644 --- a/lang/tcl/Makefile.version +++ b/lang/tcl/Makefile.version @@ -1,5 +1,5 @@ -# $NetBSD: Makefile.version,v 1.11 2013/05/31 20:15:04 adam Exp $ +# $NetBSD: Makefile.version,v 1.12 2013/11/02 20:22:02 adam Exp $ TCL_SONUM= 85 TCL_BASEVER= 8.5 -TCL_VERSION= 8.5.14 +TCL_VERSION= 8.5.15 diff --git a/lang/tcl/distinfo b/lang/tcl/distinfo index 576dadf0ea7..64177ae46e4 100644 --- a/lang/tcl/distinfo +++ b/lang/tcl/distinfo @@ -1,15 +1,15 @@ -$NetBSD: distinfo,v 1.56 2013/05/31 20:15:04 adam Exp $ +$NetBSD: distinfo,v 1.57 2013/11/02 20:22:02 adam Exp $ -SHA1 (tcl8.5.14-src.tar.gz) = 9bc452eec453c2ed37625874b9011563db687b07 -RMD160 (tcl8.5.14-src.tar.gz) = 32ed2009f28c357af87cad7815c56488f5bd5222 -Size (tcl8.5.14-src.tar.gz) = 4528533 bytes +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 (patch-generic_tclInt.h) = 13289d8fcf5021898b06a9608bc05fc968a1ba5c SHA1 (patch-generic_tclPort.h) = 36ff05b22591d588952e55d0f13c2ef52e371d1e SHA1 (patch-generic_tclPosixStr.c) = 8c252a4f3d8898fb48544d15123d6a8ddc3172f0 SHA1 (patch-tests_load.test) = 438695ab76e01646e49aadc01c44344a5495eabb SHA1 (patch-tests_pkgMkIndex.test) = 70d1042c1f4743052c5fa191fa7c4732a08e28a2 -SHA1 (patch-unix_Makefile.in) = 5944654dcecf8bac76776d22a033e384a8f33cf8 -SHA1 (patch-unix_configure) = 2e37252168e24b133d7888d1e3f47b332e162977 +SHA1 (patch-unix_Makefile.in) = 60d9bb9a6e98458ff846212c4d5ffb1180882d33 +SHA1 (patch-unix_configure) = 9a5c477c26edf989991b2804d3e2d53b8f5e1c05 SHA1 (patch-unix_tclConfig.sh.in) = 5a32d8e97240d14f3a03e205637fe3bf8307d868 SHA1 (patch-unix_tclUnixCompat.c) = 7ffa40a1a56345f5b86cd896e8e3b0d5748d8c5e SHA1 (patch-unix_tclUnixFCmd.c) = a56a12b8a0068e914d10336076347ca2b0ba9ac7 diff --git a/lang/tcl/patches/patch-unix_Makefile.in b/lang/tcl/patches/patch-unix_Makefile.in index 198932c8fa9..156e249ca7f 100644 --- a/lang/tcl/patches/patch-unix_Makefile.in +++ b/lang/tcl/patches/patch-unix_Makefile.in @@ -118,8 +118,8 @@ @@ -767,21 +789,26 @@ $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/http1.0; \ done; - @echo "Installing package http 2.7.11 as a Tcl Module"; -- @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/http-2.7.11.tm; + @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; + @$(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/"; @@ -127,8 +127,8 @@ do \ $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/opt0.4; \ done; - @echo "Installing package msgcat 1.5.1 as a Tcl Module"; -- @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/msgcat-1.5.1.tm; + @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"; @@ -136,8 +136,8 @@ + @$(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.11 as a Tcl Module"; -- @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform-1.0.11.tm; + @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)"/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"; diff --git a/lang/tcl/patches/patch-unix_configure b/lang/tcl/patches/patch-unix_configure index 263d1b186b6..8067f17fbc2 100644 --- a/lang/tcl/patches/patch-unix_configure +++ b/lang/tcl/patches/patch-unix_configure @@ -1,17 +1,17 @@ -$NetBSD: patch-unix_configure,v 1.4 2013/05/31 20:15:04 adam Exp $ +$NetBSD: patch-unix_configure,v 1.5 2013/11/02 20:22:02 adam Exp $ ---- unix/configure.orig 2013-04-01 18:36:35.000000000 +0000 +--- unix/configure.orig 2013-09-13 16:07:56.000000000 +0000 +++ unix/configure -@@ -7616,7 +7616,7 @@ fi - UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a' - TCL_LIB_VERSIONS_OK=nodots +@@ -7560,7 +7560,7 @@ fi + CC_SEARCH_FLAGS="" + LD_SEARCH_FLAGS="" ;; - OpenBSD-*) + OpenBSD-*|MirBSD-*) arch=`arch -s` case "$arch" in - m88k|vax) -@@ -7734,11 +7734,10 @@ fi + vax) +@@ -7642,11 +7642,10 @@ fi ;; esac ;; @@ -20,11 +20,11 @@ $NetBSD: patch-unix_configure,v 1.4 2013/05/31 20:15:04 adam Exp $ # This configuration from FreeBSD Ports. SHLIB_CFLAGS="-fPIC" SHLIB_LD="${CC} -shared" -- TCL_SHLIB_LD_EXTRAS="-soname \$@" +- TCL_SHLIB_LD_EXTRAS="-Wl,-soname,\$@" SHLIB_SUFFIX=".so" DL_OBJS="tclLoadDl.o" DL_LIBS="" -@@ -7764,7 +7763,6 @@ fi +@@ -7672,7 +7671,6 @@ fi TCL_LIB_VERSIONS_OK=nodots ;; Darwin-*) @@ -32,7 +32,7 @@ $NetBSD: patch-unix_configure,v 1.4 2013/05/31 20:15:04 adam Exp $ SHLIB_CFLAGS="-fno-common" # To avoid discrepancies between what headers configure sees during # preprocessing tests and compiling tests, move any -isysroot and -@@ -8938,7 +8936,7 @@ fi +@@ -8846,7 +8844,7 @@ fi BSD/OS*) ;; CYGWIN_*|MINGW32_*) ;; IRIX*) ;; @@ -41,7 +41,7 @@ $NetBSD: patch-unix_configure,v 1.4 2013/05/31 20:15:04 adam Exp $ Darwin-*) ;; SCO_SV-3.2*) ;; *) SHLIB_CFLAGS="-fPIC" ;; -@@ -8969,7 +8967,11 @@ fi +@@ -8877,7 +8875,11 @@ fi else @@ -54,7 +54,7 @@ $NetBSD: patch-unix_configure,v 1.4 2013/05/31 20:15:04 adam Exp $ fi -@@ -9003,7 +9005,7 @@ fi +@@ -8911,7 +8913,7 @@ fi else MAKE_STUB_LIB='${STLIB_LD} $@ ${STUB_LIB_OBJS} ; ${RANLIB} $@' @@ -63,7 +63,7 @@ $NetBSD: patch-unix_configure,v 1.4 2013/05/31 20:15:04 adam Exp $ fi -@@ -18878,9 +18880,9 @@ fi +@@ -18684,9 +18686,9 @@ fi # building libtcl as a shared library instead of a static library. #-------------------------------------------------------------------- @@ -76,7 +76,7 @@ $NetBSD: patch-unix_configure,v 1.4 2013/05/31 20:15:04 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. -@@ -18985,13 +18987,10 @@ _ACEOF +@@ -18791,13 +18793,10 @@ _ACEOF else # libdir must be a fully qualified path and not ${exec_prefix}/lib eval libdir="$libdir" @@ -93,7 +93,7 @@ $NetBSD: patch-unix_configure,v 1.4 2013/05/31 20:15:04 adam Exp $ fi VERSION='${VERSION}' eval "CFG_TCL_SHARED_LIB_SUFFIX=${TCL_SHARED_LIB_SUFFIX}" -@@ -19010,12 +19009,11 @@ if test "$FRAMEWORK_BUILD" = "1" ; then +@@ -18816,12 +18815,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 +108,7 @@ $NetBSD: patch-unix_configure,v 1.4 2013/05/31 20:15:04 adam Exp $ #-------------------------------------------------------------------- # The statements below define various symbols relating to Tcl # stub support. -@@ -19028,12 +19026,7 @@ eval "TCL_STUB_LIB_FILE=libtclstub${TCL_ +@@ -18834,12 +18832,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 +122,7 @@ $NetBSD: patch-unix_configure,v 1.4 2013/05/31 20:15:04 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}" -@@ -19185,34 +19178,15 @@ fi +@@ -18991,34 +18984,15 @@ fi # Transform confdefs.h into DEFS. # Protect against shell expansion while executing Makefile rules. # Protect against Makefile macro expansion. @@ -166,7 +166,7 @@ $NetBSD: patch-unix_configure,v 1.4 2013/05/31 20:15:04 adam Exp $ -@@ -19833,6 +19807,7 @@ s,@EXTRA_BUILD_HTML@,$EXTRA_BUILD_HTML,; +@@ -19639,6 +19613,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 -- cgit v1.2.3