From 385a7e2f993cb4ee869d13809b9e2709ce273dab Mon Sep 17 00:00:00 2001 From: adam Date: Fri, 31 May 2013 20:15:04 +0000 Subject: Changes 8.5.14: Bug-fix release. --- lang/tcl/Makefile.version | 4 ++-- lang/tcl/distinfo | 16 ++++++++-------- lang/tcl/patches/patch-generic_tclPort.h | 14 +++++++------- lang/tcl/patches/patch-unix_Makefile.in | 16 ++++++++-------- lang/tcl/patches/patch-unix_configure | 28 ++++++++++++++-------------- lang/tcl/patches/patch-unix_tclUnixPort.h | 25 ++++--------------------- 6 files changed, 43 insertions(+), 60 deletions(-) (limited to 'lang') diff --git a/lang/tcl/Makefile.version b/lang/tcl/Makefile.version index a0f35517654..9c8fd1d9587 100644 --- a/lang/tcl/Makefile.version +++ b/lang/tcl/Makefile.version @@ -1,5 +1,5 @@ -# $NetBSD: Makefile.version,v 1.10 2012/11/24 21:38:49 adam Exp $ +# $NetBSD: Makefile.version,v 1.11 2013/05/31 20:15:04 adam Exp $ TCL_SONUM= 85 TCL_BASEVER= 8.5 -TCL_VERSION= 8.5.13 +TCL_VERSION= 8.5.14 diff --git a/lang/tcl/distinfo b/lang/tcl/distinfo index c21ea8de5dc..576dadf0ea7 100644 --- a/lang/tcl/distinfo +++ b/lang/tcl/distinfo @@ -1,17 +1,17 @@ -$NetBSD: distinfo,v 1.55 2013/04/08 14:19:38 kivinen Exp $ +$NetBSD: distinfo,v 1.56 2013/05/31 20:15:04 adam Exp $ -SHA1 (tcl8.5.13-src.tar.gz) = 65b677dc699426233b926edfa9e304d456da7cad -RMD160 (tcl8.5.13-src.tar.gz) = 20cfb8adebd77a6d037f67a9af7e88d80032b3c2 -Size (tcl8.5.13-src.tar.gz) = 4513204 bytes +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 (patch-generic_tclInt.h) = 13289d8fcf5021898b06a9608bc05fc968a1ba5c -SHA1 (patch-generic_tclPort.h) = cd44f24c79048a70e2c4929aa1499ee336602ba5 +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) = c87f98382790ff40aa54aabb99361f6c469dc050 -SHA1 (patch-unix_configure) = 2e1e6d2020e68b91b94c0b05cb1d349126989adc +SHA1 (patch-unix_Makefile.in) = 5944654dcecf8bac76776d22a033e384a8f33cf8 +SHA1 (patch-unix_configure) = 2e37252168e24b133d7888d1e3f47b332e162977 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) = 2965dd6ef6560e0a6385c6cb286754f63c98c827 +SHA1 (patch-unix_tclUnixPort.h) = c4f1c26228b36563c44e5c27824955882c3a675f diff --git a/lang/tcl/patches/patch-generic_tclPort.h b/lang/tcl/patches/patch-generic_tclPort.h index 2a8d3b6ac72..6247896a0ac 100644 --- a/lang/tcl/patches/patch-generic_tclPort.h +++ b/lang/tcl/patches/patch-generic_tclPort.h @@ -1,13 +1,13 @@ -$NetBSD: patch-generic_tclPort.h,v 1.1 2012/08/21 21:31:47 marino Exp $ +$NetBSD: patch-generic_tclPort.h,v 1.2 2013/05/31 20:15:04 adam Exp $ ---- generic/tclPort.h.orig 2012-07-16 11:57:05.000000000 +0000 +--- generic/tclPort.h.orig 2013-03-21 12:57:40.000000000 +0000 +++ generic/tclPort.h -@@ -22,7 +22,7 @@ - #endif - #include "tcl.h" - #if !defined(_WIN32) +@@ -20,7 +20,7 @@ + #if defined(_WIN32) + # include "tclWinPort.h" + #else -# include "tclUnixPort.h" +# include "../unix/tclUnixPort.h" #endif + #include "tcl.h" - #if !defined(LLONG_MIN) diff --git a/lang/tcl/patches/patch-unix_Makefile.in b/lang/tcl/patches/patch-unix_Makefile.in index 55f986664e5..198932c8fa9 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.10 as a Tcl Module"; -- @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/http-2.7.10.tm; + @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; + @$(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,17 +127,17 @@ do \ $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/opt0.4; \ done; - @echo "Installing package msgcat 1.5.0 as a Tcl Module"; -- @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/msgcat-1.5.0.tm; + @echo "Installing package 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; + @$(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.4 as a Tcl Module"; -- @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/tcltest-2.3.4.tm; + @echo "Installing package tcltest 2.3.5 as a Tcl Module"; +- @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/tcltest-2.3.5.tm; + @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/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.10 as a Tcl Module"; -- @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform-1.0.10.tm; + @echo "Installing package platform 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; + @$(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 d925b598a3c..263d1b186b6 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.3 2012/08/23 16:14:43 adam Exp $ +$NetBSD: patch-unix_configure,v 1.4 2013/05/31 20:15:04 adam Exp $ ---- unix/configure.orig 2012-07-25 16:45:05.000000000 +0000 +--- unix/configure.orig 2013-04-01 18:36:35.000000000 +0000 +++ unix/configure -@@ -7631,7 +7631,7 @@ fi +@@ -7616,7 +7616,7 @@ fi UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a' TCL_LIB_VERSIONS_OK=nodots ;; @@ -11,7 +11,7 @@ $NetBSD: patch-unix_configure,v 1.3 2012/08/23 16:14:43 adam Exp $ arch=`arch -s` case "$arch" in m88k|vax) -@@ -7749,11 +7749,10 @@ fi +@@ -7734,11 +7734,10 @@ fi ;; esac ;; @@ -24,7 +24,7 @@ $NetBSD: patch-unix_configure,v 1.3 2012/08/23 16:14:43 adam Exp $ SHLIB_SUFFIX=".so" DL_OBJS="tclLoadDl.o" DL_LIBS="" -@@ -7779,7 +7778,6 @@ fi +@@ -7764,7 +7763,6 @@ fi TCL_LIB_VERSIONS_OK=nodots ;; Darwin-*) @@ -32,7 +32,7 @@ $NetBSD: patch-unix_configure,v 1.3 2012/08/23 16:14:43 adam Exp $ SHLIB_CFLAGS="-fno-common" # To avoid discrepancies between what headers configure sees during # preprocessing tests and compiling tests, move any -isysroot and -@@ -8953,7 +8951,7 @@ fi +@@ -8938,7 +8936,7 @@ fi BSD/OS*) ;; CYGWIN_*|MINGW32_*) ;; IRIX*) ;; @@ -41,7 +41,7 @@ $NetBSD: patch-unix_configure,v 1.3 2012/08/23 16:14:43 adam Exp $ Darwin-*) ;; SCO_SV-3.2*) ;; *) SHLIB_CFLAGS="-fPIC" ;; -@@ -8984,7 +8982,11 @@ fi +@@ -8969,7 +8967,11 @@ fi else @@ -54,7 +54,7 @@ $NetBSD: patch-unix_configure,v 1.3 2012/08/23 16:14:43 adam Exp $ fi -@@ -9018,7 +9020,7 @@ fi +@@ -9003,7 +9005,7 @@ fi else MAKE_STUB_LIB='${STLIB_LD} $@ ${STUB_LIB_OBJS} ; ${RANLIB} $@' @@ -63,7 +63,7 @@ $NetBSD: patch-unix_configure,v 1.3 2012/08/23 16:14:43 adam Exp $ fi -@@ -18893,9 +18895,9 @@ fi +@@ -18878,9 +18880,9 @@ fi # building libtcl as a shared library instead of a static library. #-------------------------------------------------------------------- @@ -76,7 +76,7 @@ $NetBSD: patch-unix_configure,v 1.3 2012/08/23 16:14:43 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. -@@ -19000,13 +19002,10 @@ _ACEOF +@@ -18985,13 +18987,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.3 2012/08/23 16:14:43 adam Exp $ fi VERSION='${VERSION}' eval "CFG_TCL_SHARED_LIB_SUFFIX=${TCL_SHARED_LIB_SUFFIX}" -@@ -19025,12 +19024,11 @@ if test "$FRAMEWORK_BUILD" = "1" ; then +@@ -19010,12 +19009,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.3 2012/08/23 16:14:43 adam Exp $ #-------------------------------------------------------------------- # The statements below define various symbols relating to Tcl # stub support. -@@ -19043,12 +19041,7 @@ eval "TCL_STUB_LIB_FILE=libtclstub${TCL_ +@@ -19028,12 +19026,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.3 2012/08/23 16:14:43 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}" -@@ -19200,34 +19193,15 @@ fi +@@ -19185,34 +19178,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.3 2012/08/23 16:14:43 adam Exp $ -@@ -19848,6 +19822,7 @@ s,@EXTRA_BUILD_HTML@,$EXTRA_BUILD_HTML,; +@@ -19833,6 +19807,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_tclUnixPort.h b/lang/tcl/patches/patch-unix_tclUnixPort.h index db939689f6f..36d6ace7284 100644 --- a/lang/tcl/patches/patch-unix_tclUnixPort.h +++ b/lang/tcl/patches/patch-unix_tclUnixPort.h @@ -1,25 +1,8 @@ -$NetBSD: patch-unix_tclUnixPort.h,v 1.1 2012/08/21 21:31:47 marino Exp $ +$NetBSD: patch-unix_tclUnixPort.h,v 1.2 2013/05/31 20:15:04 adam Exp $ ---- unix/tclUnixPort.h.orig 2012-07-16 11:57:06.000000000 +0000 +--- unix/tclUnixPort.h.orig 2013-05-31 19:30:55.000000000 +0000 +++ unix/tclUnixPort.h -@@ -45,15 +45,7 @@ - # include - #endif - #include --#ifdef USE_DIRENT2_H --# include "../compat/dirent2.h" --#else --#ifdef NO_DIRENT_H --# include "../compat/dirent.h" --#else --# include --#endif --#endif -+#include - - /* - *--------------------------------------------------------------------------- -@@ -135,19 +127,11 @@ typedef off_t Tcl_SeekOffset; +@@ -121,19 +121,11 @@ typedef off_t Tcl_SeekOffset; #if HAVE_INTTYPES_H # include #endif @@ -39,5 +22,5 @@ $NetBSD: patch-unix_tclUnixPort.h,v 1.1 2012/08/21 21:31:47 marino Exp $ -#endif +#include - MODULE_SCOPE int TclUnixSetBlockingMode(int fd, int mode); + extern int TclUnixSetBlockingMode(int fd, int mode); -- cgit v1.2.3