pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc Changes 8.5.15:



details:   https://anonhg.NetBSD.org/pkgsrc/rev/9f21e6b2d4d5
branches:  trunk
changeset: 626151:9f21e6b2d4d5
user:      adam <adam%pkgsrc.org@localhost>
date:      Sat Nov 02 20:22:02 2013 +0000

description:
Changes 8.5.15:
Bug-fix release.

diffstat:

 lang/tcl/Makefile.version                       |   4 +-
 lang/tcl/distinfo                               |  12 +-
 lang/tcl/patches/patch-unix_Makefile.in         |  12 +-
 lang/tcl/patches/patch-unix_configure           |  36 +++++-----
 x11/tk/Makefile                                 |   4 +-
 x11/tk/Makefile.version                         |   4 +-
 x11/tk/distinfo                                 |  14 +--
 x11/tk/patches/patch-macosx_tkMacOSXClipboard.c |  15 ----
 x11/tk/patches/patch-macosx_tkMacOSXDraw.c      |  15 ----
 x11/tk/patches/patch-unix_Makefile.in           |  11 +-
 x11/tk/patches/patch-unix_configure             |  80 ++++++++++--------------
 11 files changed, 81 insertions(+), 126 deletions(-)

diffs (truncated from 522 to 300 lines):

diff -r 9c7df80dbac8 -r 9f21e6b2d4d5 lang/tcl/Makefile.version
--- a/lang/tcl/Makefile.version Sat Nov 02 20:20:07 2013 +0000
+++ b/lang/tcl/Makefile.version Sat Nov 02 20:22:02 2013 +0000
@@ -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 -r 9c7df80dbac8 -r 9f21e6b2d4d5 lang/tcl/distinfo
--- a/lang/tcl/distinfo Sat Nov 02 20:20:07 2013 +0000
+++ b/lang/tcl/distinfo Sat Nov 02 20:22:02 2013 +0000
@@ -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 -r 9c7df80dbac8 -r 9f21e6b2d4d5 lang/tcl/patches/patch-unix_Makefile.in
--- a/lang/tcl/patches/patch-unix_Makefile.in   Sat Nov 02 20:20:07 2013 +0000
+++ b/lang/tcl/patches/patch-unix_Makefile.in   Sat Nov 02 20:22:02 2013 +0000
@@ -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 -r 9c7df80dbac8 -r 9f21e6b2d4d5 lang/tcl/patches/patch-unix_configure
--- a/lang/tcl/patches/patch-unix_configure     Sat Nov 02 20:20:07 2013 +0000
+++ b/lang/tcl/patches/patch-unix_configure     Sat Nov 02 20:22:02 2013 +0000
@@ -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 @@
            # 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 @@
            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 @@
            Darwin-*) ;;
            SCO_SV-3.2*) ;;
            *) SHLIB_CFLAGS="-fPIC" ;;
-@@ -8969,7 +8967,11 @@ fi
+@@ -8877,7 +8875,11 @@ fi
  
  else
  
@@ -54,7 +54,7 @@
  
  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 @@
  
  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 @@
  
  # 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 @@
  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 @@
  #--------------------------------------------------------------------
  #       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 @@
  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 @@
  
  
  
-@@ -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
diff -r 9c7df80dbac8 -r 9f21e6b2d4d5 x11/tk/Makefile
--- a/x11/tk/Makefile   Sat Nov 02 20:20:07 2013 +0000
+++ b/x11/tk/Makefile   Sat Nov 02 20:22:02 2013 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.75 2013/10/25 10:21:57 jperkin Exp $
+# $NetBSD: Makefile,v 1.76 2013/11/02 20:22:02 adam Exp $
 
 DISTNAME=      tk${TK_VERSION}-src
 PKGNAME=       tk-${TK_VERSION}
-PKGREVISION=   4
 CATEGORIES=    x11 lang
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=tcl/}
 
@@ -45,6 +44,7 @@
 
 .include "../../mk/bsd.prefs.mk"
 
+PLIST_SRC=             PLIST
 .if ${OPSYS} == "Darwin" && ${X11_TYPE} == "native"
 CONFIGURE_ARGS+=       --enable-aqua
 PLIST_SRC+=            PLIST.aqua
diff -r 9c7df80dbac8 -r 9f21e6b2d4d5 x11/tk/Makefile.version
--- a/x11/tk/Makefile.version   Sat Nov 02 20:20:07 2013 +0000
+++ b/x11/tk/Makefile.version   Sat Nov 02 20:22:02 2013 +0000
@@ -1,5 +1,5 @@
-# $NetBSD: Makefile.version,v 1.11 2013/05/31 20:15:32 adam Exp $
+# $NetBSD: Makefile.version,v 1.12 2013/11/02 20:22:02 adam Exp $
 
 TK_SONUM=      85
 TK_BASEVER=    8.5
-TK_VERSION=    8.5.14
+TK_VERSION=    8.5.15
diff -r 9c7df80dbac8 -r 9f21e6b2d4d5 x11/tk/distinfo
--- a/x11/tk/distinfo   Sat Nov 02 20:20:07 2013 +0000
+++ b/x11/tk/distinfo   Sat Nov 02 20:22:02 2013 +0000
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.40 2013/05/31 20:15:32 adam Exp $
+$NetBSD: distinfo,v 1.41 2013/11/02 20:22:02 adam Exp $
 
-SHA1 (tk8.5.14-src.tar.gz) = 4d0f8775746f0c780172e1e4f1fb7d78363a4b28
-RMD160 (tk8.5.14-src.tar.gz) = 8c10ae4ff0f01c1ee955b0d9664917fc06f2e192
-Size (tk8.5.14-src.tar.gz) = 4093990 bytes
-SHA1 (patch-macosx_tkMacOSXClipboard.c) = ac5a5de7c0e4259a347fcb7449d304e6edb91343
-SHA1 (patch-macosx_tkMacOSXDraw.c) = b241b7d70436340a5b55b7568da994465f45d2f8
-SHA1 (patch-unix_Makefile.in) = 6acc76bce0ecf813abf0905da19ae0d669a2e7db
-SHA1 (patch-unix_configure) = 4e7fe48d2aba0a645bb5947e920d9615c4339b9c
+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
diff -r 9c7df80dbac8 -r 9f21e6b2d4d5 x11/tk/patches/patch-macosx_tkMacOSXClipboard.c
--- a/x11/tk/patches/patch-macosx_tkMacOSXClipboard.c   Sat Nov 02 20:20:07 2013 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-macosx_tkMacOSXClipboard.c,v 1.1 2012/11/24 21:38:50 adam Exp $
-
-Void function should not return any values.
-
---- macosx/tkMacOSXClipboard.c.orig    2012-11-24 20:54:23.000000000 +0000
-+++ macosx/tkMacOSXClipboard.c
-@@ -194,7 +194,7 @@ TkMacOSXSelDeadWindow(
-     if (winPtr && winPtr == (TkWindow *)clipboardOwner) {
-       clipboardOwner = NULL;
-     }
--    return Success;
-+    return;
- }
- 
- /*
diff -r 9c7df80dbac8 -r 9f21e6b2d4d5 x11/tk/patches/patch-macosx_tkMacOSXDraw.c
--- a/x11/tk/patches/patch-macosx_tkMacOSXDraw.c        Sat Nov 02 20:20:07 2013 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-macosx_tkMacOSXDraw.c,v 1.1 2012/11/24 21:38:50 adam Exp $
-
-Void function should not return any values.
-
---- macosx/tkMacOSXDraw.c.orig 2012-11-24 20:55:20.000000000 +0000
-+++ macosx/tkMacOSXDraw.c
-@@ -744,7 +744,7 @@ DrawCGImage(
-     } else {
-       TkMacOSXDbgMsg("Drawing of empty CGImage requested");
-     }
--    return Success;
-+    return;
- }
- 
- /*
diff -r 9c7df80dbac8 -r 9f21e6b2d4d5 x11/tk/patches/patch-unix_Makefile.in
--- a/x11/tk/patches/patch-unix_Makefile.in     Sat Nov 02 20:20:07 2013 +0000
+++ b/x11/tk/patches/patch-unix_Makefile.in     Sat Nov 02 20:22:02 2013 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-unix_Makefile.in,v 1.3 2013/05/31 20:15:32 adam Exp $
+$NetBSD: patch-unix_Makefile.in,v 1.4 2013/11/02 20:22:02 adam Exp $
 
---- unix/Makefile.in.orig      2013-04-01 18:36:49.000000000 +0000
+--- unix/Makefile.in.orig      2013-09-16 16:45:24.000000000 +0000
 +++ unix/Makefile.in
 @@ -13,6 +13,7 @@ MAJOR_VERSION                = @TK_MAJOR_VERSION@
  MINOR_VERSION         = @TK_MINOR_VERSION@
@@ -85,7 +85,7 @@
        @for i in "$(LIB_INSTALL_DIR)" "$(BIN_INSTALL_DIR)" \
            "$(PKG_INSTALL_DIR)" "$(CONFIG_INSTALL_DIR)" ; \
            do \



Home | Main Index | Thread Index | Old Index