pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc Changes 8.4.16:



details:   https://anonhg.NetBSD.org/pkgsrc/rev/4c739199cfae
branches:  trunk
changeset: 534169:4c739199cfae
user:      adam <adam%pkgsrc.org@localhost>
date:      Sat Oct 13 11:41:33 2007 +0000

description:
Changes 8.4.16:
* Bug fixes
* Improvements

diffstat:

 lang/tcl/Makefile.version |   4 ++--
 lang/tcl/distinfo         |  16 ++++++++--------
 lang/tcl/patches/patch-aa |  24 ++++++++++++------------
 lang/tcl/patches/patch-ab |  40 ++++++++++++++++++++++------------------
 lang/tcl/patches/patch-ae |  24 ++++++++++++++----------
 lang/tcl/patches/patch-af |  10 +++++-----
 x11/tk/Makefile.version   |   4 ++--
 x11/tk/distinfo           |  16 ++++++++--------
 x11/tk/patches/patch-aa   |  18 +++++++++---------
 x11/tk/patches/patch-ab   |  16 ++++++++--------
 x11/tk/patches/patch-ac   |  10 +++++-----
 x11/tk/patches/patch-ad   |   6 +++---
 12 files changed, 98 insertions(+), 90 deletions(-)

diffs (truncated from 546 to 300 lines):

diff -r 8ecbf10e9690 -r 4c739199cfae lang/tcl/Makefile.version
--- a/lang/tcl/Makefile.version Sat Oct 13 11:04:15 2007 +0000
+++ b/lang/tcl/Makefile.version Sat Oct 13 11:41:33 2007 +0000
@@ -1,3 +1,3 @@
-# $NetBSD: Makefile.version,v 1.6 2007/05/31 13:01:53 adam Exp $
+# $NetBSD: Makefile.version,v 1.7 2007/10/13 11:41:44 adam Exp $
 
-TCL_VERSION=8.4.15
+TCL_VERSION=8.4.16
diff -r 8ecbf10e9690 -r 4c739199cfae lang/tcl/distinfo
--- a/lang/tcl/distinfo Sat Oct 13 11:04:15 2007 +0000
+++ b/lang/tcl/distinfo Sat Oct 13 11:41:33 2007 +0000
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.40 2007/05/31 13:01:53 adam Exp $
+$NetBSD: distinfo,v 1.41 2007/10/13 11:41:44 adam Exp $
 
-SHA1 (tcl8.4.15-src.tar.gz) = fbfae3ca68633a10b3fe870018588ade0944caed
-RMD160 (tcl8.4.15-src.tar.gz) = b6b41cb5ae18744ba5aa7fdf3d64277d97d8546e
-Size (tcl8.4.15-src.tar.gz) = 3635163 bytes
-SHA1 (patch-aa) = 9d648f1df5209a346f9cf6dafa220875e32fcf90
-SHA1 (patch-ab) = 9b26c7eaead6343490d8dbabcd2ac1c42029e4c5
+SHA1 (tcl8.4.16-src.tar.gz) = 7edc6b8eb5f49980ba9b788e12c236501327c815
+RMD160 (tcl8.4.16-src.tar.gz) = 8432aff66525a3c3f9dadb2bd8e32c28c539d14d
+Size (tcl8.4.16-src.tar.gz) = 3641017 bytes
+SHA1 (patch-aa) = 7c04a2b24b1a6940b6dff03d9f1781e0326366b3
+SHA1 (patch-ab) = b18a9b49b54cad9512b9ab2d8f7937e4c7a4fbb4
 SHA1 (patch-ac) = 3139a65c6647d806fc69765bc62aa715b49f4d41
 SHA1 (patch-ad) = 05a945172651513e178c6f49672bb18d8c4ad3e7
-SHA1 (patch-ae) = 8b36b48dc316dd975484fda8763af16f4a95bf68
-SHA1 (patch-af) = 107848ba45196d6168abaab4f84cd5e0b087ddd5
+SHA1 (patch-ae) = 7694081556a6b004db47ae54775bea0f659b8805
+SHA1 (patch-af) = c31ef207e26c8445f2503817c6a8b49b7593ae8f
 SHA1 (patch-ag) = fe371866b438063515bad6d145287455c4636824
 SHA1 (patch-ah) = b6a68a26ed018f424e9e41bcf6f8da1517bd599a
 SHA1 (patch-ai) = b0f7818adedd53a123c6ab809bbec28924b3f07b
diff -r 8ecbf10e9690 -r 4c739199cfae lang/tcl/patches/patch-aa
--- a/lang/tcl/patches/patch-aa Sat Oct 13 11:04:15 2007 +0000
+++ b/lang/tcl/patches/patch-aa Sat Oct 13 11:41:33 2007 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.17 2006/11/02 17:41:23 adam Exp $
+$NetBSD: patch-aa,v 1.18 2007/10/13 11:41:44 adam Exp $
 
---- unix/Makefile.in.orig      2006-10-19 19:26:15.000000000 +0200
+--- unix/Makefile.in.orig      2007-09-21 19:07:02.000000000 +0200
 +++ unix/Makefile.in
 @@ -185,8 +185,8 @@ SHELL                      = /bin/sh
  INSTALL_STRIP_PROGRAM   = -s
@@ -30,7 +30,7 @@
  #TCL_LIB_FILE         = libtcl.a
  
  # Generic lib name used in rules that apply to tcl and tk
-@@ -266,8 +267,9 @@ DLTEST_DIR         = @TCL_SRC_DIR@/unix/dltest
+@@ -267,8 +268,9 @@ DLTEST_DIR         = @TCL_SRC_DIR@/unix/dltest
  # Must be absolute to so the corresponding tcltest's tcl_library is absolute.
  TCL_BUILDTIME_LIBRARY = @TCL_SRC_DIR@/library
  
@@ -41,7 +41,7 @@
  
  # Flags to be passed to installManPage to control whether the manpages
  # should be compressed and linked with softlinks
-@@ -463,7 +465,7 @@ SRCS = $(GENERIC_SRCS) $(UNIX_SRCS) $(NO
+@@ -469,7 +471,7 @@ SRCS = $(GENERIC_SRCS) $(UNIX_SRCS) $(NO
  
  all: binaries libraries doc
  
@@ -50,7 +50,7 @@
  
  libraries:
  
-@@ -471,7 +473,7 @@ doc:
+@@ -477,7 +479,7 @@ doc:
  
  # The following target is configured by autoconf to generate either
  # a shared library or non-shared library for Tcl.
@@ -59,18 +59,18 @@
        rm -f $@
        @MAKE_LIB@
  
-@@ -491,8 +493,8 @@ tclLibObjs:
+@@ -497,8 +499,8 @@ tclLibObjs:
  objs: ${OBJS}
  
  
 -tclsh: ${TCLSH_OBJS} ${TCL_LIB_FILE}
--      ${CC} ${CFLAGS} ${LDFLAGS} ${TCLSH_OBJS} @TCL_BUILD_LIB_SPEC@ ${LIBS} \
+-      ${CC} ${CFLAGS} ${LDFLAGS} ${TCLSH_OBJS} @TCL_BUILD_LIB_SPEC@ ${LIBS} @EXTRA_TCLSH_LIBS@ \
 +tclsh: ${TCLSH_OBJS} ${TCL_LA_FILE}
-+      ${LD} ${CFLAGS} ${LDFLAGS} ${TCLSH_OBJS} @TCL_BUILD_LIB_SPEC@ ${LIBS} \
++      ${LD} ${CFLAGS} ${LDFLAGS} ${TCLSH_OBJS} @TCL_BUILD_LIB_SPEC@ ${LIBS} @EXTRA_TCLSH_LIBS@ \
                ${CC_SEARCH_FLAGS} -o tclsh
  
  # Resetting the LIB_RUNTIME_DIR below is required so that
-@@ -500,11 +502,11 @@ tclsh: ${TCLSH_OBJS} ${TCL_LIB_FILE}
+@@ -506,11 +508,11 @@ tclsh: ${TCLSH_OBJS} ${TCL_LIB_FILE}
  # burned into its ld search path. This keeps tcltest from
  # picking up an already installed version of the Tcl library.
  
@@ -79,12 +79,12 @@
        $(MAKE) tcltest-real LIB_RUNTIME_DIR=`pwd`
  
  tcltest-real:
--      ${CC} ${CFLAGS} ${LDFLAGS} ${TCLTEST_OBJS} @TCL_BUILD_LIB_SPEC@ ${LIBS} \
-+      ${LD} ${CFLAGS} ${LDFLAGS} ${TCLTEST_OBJS} @TCL_BUILD_LIB_SPEC@ ${LIBS} \
+-      ${CC} ${CFLAGS} ${LDFLAGS} ${TCLTEST_OBJS} @TCL_BUILD_LIB_SPEC@ ${LIBS} @EXTRA_TCLSH_LIBS@ \
++      ${LD} ${CFLAGS} ${LDFLAGS} ${TCLTEST_OBJS} @TCL_BUILD_LIB_SPEC@ ${LIBS} @EXTRA_TCLSH_LIBS@ \
                ${CC_SEARCH_FLAGS} -o tcltest
  
  # Note, in the target below TCL_LIBRARY needs to be set or else
-@@ -1101,7 +1103,7 @@ tclMacOSXNotify.o: $(MAC_OSX_DIR)/tclMac
+@@ -1118,7 +1120,7 @@ $(DTRACE_OBJ): $(DTRACE_SRC) $(TCL_OBJS)
  
  xttest:  ${XTTEST_OBJS} ${GENERIC_OBJS} ${UNIX_OBJS} ${COMPAT_OBJS} \
        @DL_OBJS@ ${BUILD_DLTEST}
diff -r 8ecbf10e9690 -r 4c739199cfae lang/tcl/patches/patch-ab
--- a/lang/tcl/patches/patch-ab Sat Oct 13 11:04:15 2007 +0000
+++ b/lang/tcl/patches/patch-ab Sat Oct 13 11:41:33 2007 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.36 2007/05/31 13:01:53 adam Exp $
+$NetBSD: patch-ab,v 1.37 2007/10/13 11:41:44 adam Exp $
 
---- unix/configure.orig        2007-05-24 22:40:13.000000000 +0200
+--- unix/configure.orig        2007-09-21 19:07:02.000000000 +0200
 +++ unix/configure
-@@ -2565,12 +2565,13 @@ fi
+@@ -2567,12 +2567,13 @@ fi
      # Step 3: set configuration options based on system name and version.
  
      do64bit_ok=no
@@ -17,7 +17,7 @@
      CFLAGS_DEBUG=-g
      CFLAGS_OPTIMIZE=-O
      if test "$GCC" = "yes" ; then
-@@ -2989,6 +2990,21 @@ fi
+@@ -2991,6 +2992,21 @@ fi
                LD_LIBRARY_PATH_VAR="SHLIB_PATH"
            fi
            ;;
@@ -39,7 +39,7 @@
        IRIX-4.*)
            SHLIB_CFLAGS="-G 0"
            SHLIB_SUFFIX=".a"
-@@ -3265,6 +3281,9 @@ fi
+@@ -3267,6 +3283,9 @@ fi
            LD_SEARCH_FLAGS=""
            ;;
        NetBSD-*|FreeBSD-[1-2].*)
@@ -49,7 +49,7 @@
            # Not available on all versions:  check for include file.
            ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6
-@@ -3297,13 +3316,11 @@ if eval "test \"`echo '$ac_cv_header_'$a
+@@ -3299,13 +3318,11 @@ if eval "test \"`echo '$ac_cv_header_'$a
    
                # NetBSD/SPARC needs -fPIC, -fpic will not do.
                SHLIB_CFLAGS="-fPIC"
@@ -61,9 +61,9 @@
                CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
 -              LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
                echo $ac_n "checking for ELF""... $ac_c" 1>&6
- echo "configure:3309: checking for ELF" >&5
+ echo "configure:3311: checking for ELF" >&5
  if eval "test \"`echo '$''{'tcl_cv_ld_elf'+set}'`\" = set"; then
-@@ -3332,6 +3349,9 @@ rm -f conftest*
+@@ -3334,6 +3351,9 @@ rm -f conftest*
  fi
  
  echo "$ac_t""$tcl_cv_ld_elf" 1>&6
@@ -73,7 +73,7 @@
                if test $tcl_cv_ld_elf = yes; then
                    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
                else
-@@ -3429,7 +3449,7 @@ echo "$ac_t""$tcl_cv_ld_elf" 1>&6
+@@ -3431,7 +3451,7 @@ echo "$ac_t""$tcl_cv_ld_elf" 1>&6
            UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
            TCL_LIB_VERSIONS_OK=nodots
            ;;
@@ -82,7 +82,7 @@
            # FreeBSD 3.* and greater have ELF.
            SHLIB_CFLAGS="-fPIC"
            SHLIB_LD="ld -Bshareable -x"
-@@ -4279,16 +4299,16 @@ fi
+@@ -4291,16 +4311,16 @@ fi
      fi
  
      if test "$SHARED_LIB_SUFFIX" = "" ; then
@@ -103,7 +103,7 @@
      else
          LIB_SUFFIX=${UNSHARED_LIB_SUFFIX}
  
-@@ -9130,7 +9150,7 @@ else
+@@ -9247,7 +9267,7 @@ else
              TCL_LIB_FLAG="-ltcl`echo ${TCL_VERSION} | tr -d .`\${TCL_DBGX}"
          fi
          TCL_BUILD_LIB_SPEC="-L`pwd` ${TCL_LIB_FLAG}"
@@ -112,18 +112,20 @@
      else
          TCL_BUILD_EXP_FILE="lib.exp"
          eval "TCL_EXP_FILE=libtcl${TCL_EXPORT_FILE_SUFFIX}"
-@@ -9161,13 +9181,21 @@ VERSION=${TCL_VERSION}
+@@ -9278,14 +9298,24 @@ VERSION=${TCL_VERSION}
  #--------------------------------------------------------------------
  
  if test "$FRAMEWORK_BUILD" = "1" ; then
--    TCL_PACKAGE_PATH="~/Library/Tcl /Library/Tcl /Network/Library/Tcl /System/Library/Tcl ~/Library/Frameworks /Library/Frameworks /Network/Library/Frameworks /System/Library/Frameworks"
-+    TCL_PACKAGE_PATH_ADD="~/Library/Tcl /Library/Tcl /Network/Library/Tcl /System/Library/Tcl ~/Library/Frameworks /Library/Frameworks /Network/Library/Frameworks /System/Library/Frameworks"
+-    test -z "$TCL_PACKAGE_PATH" && \
+-        TCL_PACKAGE_PATH="~/Library/Tcl /Library/Tcl /Network/Library/Tcl /System/Library/Tcl ~/Library/Frameworks /Library/Frameworks /Network/Library/Frameworks /System/Library/Frameworks"
++    test -z "$TCL_PACKAGE_PATH_ADD" && \
++        TCL_PACKAGE_PATH_ADD="~/Library/Tcl /Library/Tcl /Network/Library/Tcl /System/Library/Tcl ~/Library/Frameworks /Library/Frameworks /Network/Library/Frameworks /System/Library/Frameworks"
  elif test "$prefix" != "$exec_prefix"; then
--    TCL_PACKAGE_PATH="${libdir} ${prefix}/lib"
-+    TCL_PACKAGE_PATH_ADD="${libdir} ${prefix}/lib"
+-    TCL_PACKAGE_PATH="${libdir} ${prefix}/lib ${TCL_PACKAGE_PATH}"
++    TCL_PACKAGE_PATH_ADD="${libdir} ${prefix}/lib ${TCL_PACKAGE_PATH}"
  else
--    TCL_PACKAGE_PATH="${prefix}/lib"
-+    TCL_PACKAGE_PATH_ADD="${prefix}/lib"
+-    TCL_PACKAGE_PATH="${prefix}/lib ${TCL_PACKAGE_PATH}"
++    TCL_PACKAGE_PATH_ADD="${prefix}/lib ${TCL_PACKAGE_PATH}"
  fi
  
 +for dir in ${TCL_PACKAGE_PATH_ADD}; do
@@ -134,6 +136,8 @@
 +    fi
 +done
 +
++
++
  #--------------------------------------------------------------------
  #       The statements below define various symbols relating to Tcl
  #       stub support.
diff -r 8ecbf10e9690 -r 4c739199cfae lang/tcl/patches/patch-ae
--- a/lang/tcl/patches/patch-ae Sat Oct 13 11:04:15 2007 +0000
+++ b/lang/tcl/patches/patch-ae Sat Oct 13 11:41:33 2007 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.10 2006/11/02 17:41:23 adam Exp $
+$NetBSD: patch-ae,v 1.11 2007/10/13 11:41:44 adam Exp $
 
---- unix/configure.in.orig     2006-10-19 19:26:15.000000000 +0200
+--- unix/configure.in.orig     2007-10-13 10:37:13.000000000 +0200
 +++ unix/configure.in
-@@ -607,7 +607,7 @@ else
+@@ -636,7 +636,7 @@ else
              TCL_LIB_FLAG="-ltcl`echo ${TCL_VERSION} | tr -d .`\${TCL_DBGX}"
          fi
          TCL_BUILD_LIB_SPEC="-L`pwd` ${TCL_LIB_FLAG}"
@@ -11,18 +11,20 @@
      else
          TCL_BUILD_EXP_FILE="lib.exp"
          eval "TCL_EXP_FILE=libtcl${TCL_EXPORT_FILE_SUFFIX}"
-@@ -638,13 +638,21 @@ VERSION=${TCL_VERSION}
+@@ -667,14 +667,24 @@ VERSION=${TCL_VERSION}
  #--------------------------------------------------------------------
  
  if test "$FRAMEWORK_BUILD" = "1" ; then
--    TCL_PACKAGE_PATH="~/Library/Tcl /Library/Tcl /Network/Library/Tcl /System/Library/Tcl ~/Library/Frameworks /Library/Frameworks /Network/Library/Frameworks /System/Library/Frameworks"
-+    TCL_PACKAGE_PATH_ADD="~/Library/Tcl /Library/Tcl /Network/Library/Tcl /System/Library/Tcl ~/Library/Frameworks /Library/Frameworks /Network/Library/Frameworks /System/Library/Frameworks"
+-    test -z "$TCL_PACKAGE_PATH" && \
+-        TCL_PACKAGE_PATH="~/Library/Tcl /Library/Tcl /Network/Library/Tcl /System/Library/Tcl ~/Library/Frameworks /Library/Frameworks /Network/Library/Frameworks /System/Library/Frameworks"
++    test -z "$TCL_PACKAGE_PATH_ADD" && \
++        TCL_PACKAGE_PATH_ADD="~/Library/Tcl /Library/Tcl /Network/Library/Tcl /System/Library/Tcl ~/Library/Frameworks /Library/Frameworks /Network/Library/Frameworks /System/Library/Frameworks"
  elif test "$prefix" != "$exec_prefix"; then
--    TCL_PACKAGE_PATH="${libdir} ${prefix}/lib"
-+    TCL_PACKAGE_PATH_ADD="${libdir} ${prefix}/lib"
+-    TCL_PACKAGE_PATH="${libdir} ${prefix}/lib ${TCL_PACKAGE_PATH}"
++    TCL_PACKAGE_PATH_ADD="${libdir} ${prefix}/lib ${TCL_PACKAGE_PATH}"
  else
--    TCL_PACKAGE_PATH="${prefix}/lib"
-+    TCL_PACKAGE_PATH_ADD="${prefix}/lib"
+-    TCL_PACKAGE_PATH="${prefix}/lib ${TCL_PACKAGE_PATH}"
++    TCL_PACKAGE_PATH_ADD="${prefix}/lib ${TCL_PACKAGE_PATH}"
  fi
  
 +for dir in ${TCL_PACKAGE_PATH_ADD}; do
@@ -33,6 +35,8 @@
 +    fi
 +done
 +
++
++
  #--------------------------------------------------------------------
  #       The statements below define various symbols relating to Tcl
  #       stub support.
diff -r 8ecbf10e9690 -r 4c739199cfae lang/tcl/patches/patch-af
--- a/lang/tcl/patches/patch-af Sat Oct 13 11:04:15 2007 +0000
+++ b/lang/tcl/patches/patch-af Sat Oct 13 11:41:33 2007 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-af,v 1.22 2007/05/31 13:01:53 adam Exp $
+$NetBSD: patch-af,v 1.23 2007/10/13 11:41:45 adam Exp $
 
---- unix/tcl.m4.orig   2007-05-24 22:40:13.000000000 +0200
+--- unix/tcl.m4.orig   2007-09-21 19:07:02.000000000 +0200
 +++ unix/tcl.m4
 @@ -1033,6 +1033,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
      # Step 3: set configuration options based on system name and version.
@@ -110,7 +110,7 @@
            # FreeBSD 3.* and greater have ELF.
            SHLIB_CFLAGS="-fPIC"
            SHLIB_LD="ld -Bshareable -x"
-@@ -1923,6 +1954,9 @@ dnl AC_CHECK_TOOL(AR, ar)



Home | Main Index | Thread Index | Old Index