pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Changes 8.4.11:
details: https://anonhg.NetBSD.org/pkgsrc/rev/ec2d1342d660
branches: trunk
changeset: 497018:ec2d1342d660
user: adam <adam%pkgsrc.org@localhost>
date: Tue Jul 19 11:11:58 2005 +0000
description:
Changes 8.4.11:
* Bug fixes
diffstat:
lang/tcl/Makefile.version | 4 +-
lang/tcl/PLIST | 3 +-
lang/tcl/distinfo | 18 +++++++-------
lang/tcl/patches/patch-aa | 26 ++++++++++----------
lang/tcl/patches/patch-ab | 53 +++++++++++++++++++++--------------------
lang/tcl/patches/patch-ac | 10 +++---
lang/tcl/patches/patch-ae | 39 +++++++++++++++--------------
lang/tcl/patches/patch-af | 28 ++++++++++----------
x11/tk/Makefile | 6 ++--
x11/tk/PLIST | 3 +-
x11/tk/distinfo | 16 ++++++------
x11/tk/patches/patch-aa | 48 ++++++++++++++++++------------------
x11/tk/patches/patch-ab | 60 +++++++++++++++++++++++-----------------------
x11/tk/patches/patch-ac | 26 ++++++++++----------
x11/tk/patches/patch-ad | 44 +++++++++++++++++-----------------
15 files changed, 194 insertions(+), 190 deletions(-)
diffs (truncated from 915 to 300 lines):
diff -r 1a565aae3473 -r ec2d1342d660 lang/tcl/Makefile.version
--- a/lang/tcl/Makefile.version Tue Jul 19 10:47:45 2005 +0000
+++ b/lang/tcl/Makefile.version Tue Jul 19 11:11:58 2005 +0000
@@ -1,3 +1,3 @@
-# $NetBSD: Makefile.version,v 1.1 2005/01/13 14:37:43 minskim Exp $
+# $NetBSD: Makefile.version,v 1.2 2005/07/19 11:11:58 adam Exp $
-TCL_VERSION=8.4.9
+TCL_VERSION=8.4.11
diff -r 1a565aae3473 -r ec2d1342d660 lang/tcl/PLIST
--- a/lang/tcl/PLIST Tue Jul 19 10:47:45 2005 +0000
+++ b/lang/tcl/PLIST Tue Jul 19 11:11:58 2005 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2004/11/26 10:30:01 adam Exp $
+@comment $NetBSD: PLIST,v 1.10 2005/07/19 11:11:58 adam Exp $
bin/tclsh
bin/tclsh8.4
include/tcl.h
@@ -165,6 +165,7 @@
man/man3/Tcl_ChannelOutputProc.3
man/man3/Tcl_ChannelSeekProc.3
man/man3/Tcl_ChannelSetOptionProc.3
+man/man3/Tcl_ChannelThreadActionProc.3
man/man3/Tcl_ChannelVersion.3
man/man3/Tcl_ChannelWatchProc.3
man/man3/Tcl_ChannelWideSeekProc.3
diff -r 1a565aae3473 -r ec2d1342d660 lang/tcl/distinfo
--- a/lang/tcl/distinfo Tue Jul 19 10:47:45 2005 +0000
+++ b/lang/tcl/distinfo Tue Jul 19 11:11:58 2005 +0000
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.31 2005/02/24 09:03:12 agc Exp $
+$NetBSD: distinfo,v 1.32 2005/07/19 11:11:58 adam Exp $
-SHA1 (tcl8.4.9-src.tar.gz) = 77370577ded22315fb8f60e20500920352412e58
-RMD160 (tcl8.4.9-src.tar.gz) = 0d02e3224fcc6d2dd41f2edfb89a824e5437fca8
-Size (tcl8.4.9-src.tar.gz) = 3496364 bytes
-SHA1 (patch-aa) = 342a2daf740d342aec26ce837a0f423afc5a4ab2
-SHA1 (patch-ab) = 248f281b084af50aa980521b3ff3d72a40e97efd
-SHA1 (patch-ac) = ca2409270eee18ca2c8ddf9a002d9fff95053e4d
-SHA1 (patch-ae) = f086af46134e7698e71a9cf1b5668f32ae722d46
-SHA1 (patch-af) = b149cb12b04d2b379dfe6acbc6438c294224f65b
+SHA1 (tcl8.4.11-src.tar.gz) = 4580adcbdcb7d09fd9a8ae8fbe61c592a56bfa9e
+RMD160 (tcl8.4.11-src.tar.gz) = 933dda739859af170c31cef855409f861ed597cb
+Size (tcl8.4.11-src.tar.gz) = 3474428 bytes
+SHA1 (patch-aa) = c41a554996965c9ceaf639ce54841c8861ac8ba2
+SHA1 (patch-ab) = 7107fca2f0269ce90ea076c6be6dd45ccda3bc0b
+SHA1 (patch-ac) = bc746ec3c8fc50c56d4827540d6a8b2fffda78ad
+SHA1 (patch-ae) = d5b7c01873c9d092bcdea5ea37b407bbd865f22d
+SHA1 (patch-af) = 427a6baa9494f1eeb9148584436af3a8162fbbf5
SHA1 (patch-ag) = 0a11bfc878d43b15f6444923fac18b4876b62398
SHA1 (patch-ah) = 0aaa349fcf9ce736e1f7d3dad377ee355f549ecb
diff -r 1a565aae3473 -r ec2d1342d660 lang/tcl/patches/patch-aa
--- a/lang/tcl/patches/patch-aa Tue Jul 19 10:47:45 2005 +0000
+++ b/lang/tcl/patches/patch-aa Tue Jul 19 11:11:58 2005 +0000
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.14 2005/02/21 23:58:35 adam Exp $
+$NetBSD: patch-aa,v 1.15 2005/07/19 11:11:58 adam Exp $
---- Makefile.in.orig 2004-11-19 18:49:51.000000000 +0000
+--- Makefile.in.orig 2005-06-29 16:40:32.000000000 +0000
+++ Makefile.in
-@@ -172,8 +172,8 @@ SHELL = /bin/sh
+@@ -184,8 +184,8 @@ SHELL = /bin/sh
INSTALL_STRIP_PROGRAM = -s
- INSTALL_STRIP_LIBRARY = -S -S
+ INSTALL_STRIP_LIBRARY = -S -S
-INSTALL = @srcdir@/install-sh -c
-INSTALL_PROGRAM = ${INSTALL}
@@ -13,16 +13,16 @@
INSTALL_LIBRARY = ${INSTALL}
INSTALL_DATA = ${INSTALL} -m 644
-@@ -191,7 +191,7 @@ TCL_EXE = tclsh
+@@ -203,7 +203,7 @@ TCL_EXE = tclsh
# these definitions by hand.
STLIB_LD = @STLIB_LD@
-SHLIB_LD = @SHLIB_LD@
+SHLIB_LD = ${LIBTOOL} --mode=link @CC@ -rpath ${PREFIX}/lib
SHLIB_CFLAGS = @SHLIB_CFLAGS@
- SHLIB_LD_FLAGS = @SHLIB_LD_FLAGS@
SHLIB_LD_LIBS = @SHLIB_LD_LIBS@
-@@ -217,6 +217,7 @@ BUILD_DLTEST = @BUILD_DLTEST@
+ TCL_SHLIB_LD_EXTRAS = @TCL_SHLIB_LD_EXTRAS@
+@@ -228,6 +228,7 @@ BUILD_DLTEST = @BUILD_DLTEST@
#BUILD_DLTEST =
TCL_LIB_FILE = @TCL_LIB_FILE@
@@ -30,7 +30,7 @@
#TCL_LIB_FILE = libtcl.a
# Generic lib name used in rules that apply to tcl and tk
-@@ -254,8 +255,9 @@ DLTEST_DIR = @TCL_SRC_DIR@/unix/dltest
+@@ -265,8 +266,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
-@@ -447,7 +449,7 @@ SRCS = $(GENERIC_SRCS) $(UNIX_SRCS) $(ST
+@@ -461,7 +463,7 @@ SRCS = $(GENERIC_SRCS) $(UNIX_SRCS) $(NO
all: binaries libraries doc
@@ -50,7 +50,7 @@
libraries:
-@@ -455,7 +457,7 @@ doc:
+@@ -469,7 +471,7 @@ doc:
# The following target is configured by autoconf to generate either
# a shared library or non-shared library for Tcl.
@@ -59,7 +59,7 @@
rm -f $@
@MAKE_LIB@
-@@ -475,8 +477,8 @@ tclLibObjs:
+@@ -489,8 +491,8 @@ tclLibObjs:
objs: ${OBJS}
@@ -70,7 +70,7 @@
${CC_SEARCH_FLAGS} -o tclsh
# Resetting the LIB_RUNTIME_DIR below is required so that
-@@ -484,11 +486,11 @@ tclsh: ${TCLSH_OBJS} ${TCL_LIB_FILE}
+@@ -498,11 +500,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.
@@ -84,7 +84,7 @@
${CC_SEARCH_FLAGS} -o tcltest
# Note, in the target below TCL_LIBRARY needs to be set or else
-@@ -1040,7 +1042,7 @@ tclMacOSXBundle.o: $(MAC_OSX_DIR)/tclMac
+@@ -1085,7 +1087,7 @@ tclMacOSXNotify.o: $(MAC_OSX_DIR)/tclMac
xttest: ${XTTEST_OBJS} ${GENERIC_OBJS} ${UNIX_OBJS} ${COMPAT_OBJS} \
@DL_OBJS@ ${BUILD_DLTEST}
diff -r 1a565aae3473 -r ec2d1342d660 lang/tcl/patches/patch-ab
--- a/lang/tcl/patches/patch-ab Tue Jul 19 10:47:45 2005 +0000
+++ b/lang/tcl/patches/patch-ab Tue Jul 19 11:11:58 2005 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.29 2005/01/24 22:10:44 tv Exp $
+$NetBSD: patch-ab,v 1.30 2005/07/19 11:11:58 adam Exp $
---- configure.orig 2004-12-06 19:23:45.000000000 -0500
+--- configure.orig 2005-06-29 16:40:33.000000000 +0000
+++ configure
-@@ -2192,12 +2192,13 @@ fi
+@@ -2191,12 +2191,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
-@@ -2639,6 +2640,21 @@ fi
+@@ -2606,6 +2607,21 @@ fi
LD_LIBRARY_PATH_VAR="SHLIB_PATH"
fi
;;
@@ -39,7 +39,7 @@
IRIX-4.*)
SHLIB_CFLAGS="-G 0"
SHLIB_SUFFIX=".a"
-@@ -2867,6 +2883,9 @@ fi
+@@ -2834,6 +2850,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
-@@ -2899,13 +2918,11 @@ if eval "test \"`echo '$ac_cv_header_'$a
+@@ -2866,13 +2885,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:2911: checking for ELF" >&5
+ echo "configure:2878: checking for ELF" >&5
cat > conftest.$ac_ext <<EOF
-@@ -2920,11 +2937,20 @@ EOF
+@@ -2887,11 +2904,20 @@ EOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
egrep "yes" >/dev/null 2>&1; then
rm -rf conftest*
@@ -86,7 +86,7 @@
SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0'
fi
-@@ -3540,16 +3566,16 @@ fi
+@@ -3820,16 +3846,16 @@ fi
fi
if test "$SHARED_LIB_SUFFIX" = "" ; then
@@ -100,28 +100,28 @@
if test "${SHARED_BUILD}" = "1" && test "${SHLIB_SUFFIX}" != "" ; then
LIB_SUFFIX=${SHARED_LIB_SUFFIX}
-- MAKE_LIB='${SHLIB_LD} -o $@ ${SHLIB_LD_FLAGS} ${OBJS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS}'
+- MAKE_LIB='${SHLIB_LD} -o $@ ${OBJS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS}'
- INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) $(LIB_INSTALL_DIR)/$(LIB_FILE)'
-+ MAKE_LIB='${SHLIB_LD} -o $@ ${SHLIB_LD_FLAGS} ${OBJS:.o=.lo} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS} -version-info 1:0'
++ MAKE_LIB='${SHLIB_LD} -o $@ ${OBJS:.o=.lo} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS} -version-info 1:0'
+ INSTALL_LIB='$(INSTALL_LIBRARY) $(TCL_LA_FILE) $(LIB_INSTALL_DIR)/$(LIB_FILE)'
else
LIB_SUFFIX=${UNSHARED_LIB_SUFFIX}
-@@ -7430,7 +7456,7 @@ elif test "$SHARED_BUILD" = "0" || test
- TCL_LIB_FLAG="-ltcl`echo ${TCL_VERSION} | tr -d .`\${TCL_DBGX}"
- fi
- TCL_BUILD_LIB_SPEC="-L`pwd` ${TCL_LIB_FLAG}"
-- TCL_LIB_SPEC="-L${libdir} ${TCL_LIB_FLAG}"
-+ TCL_LIB_SPEC="${TCL_LIB_SPEC_RPATH} -L${libdir} ${TCL_LIB_FLAG}"
- else
- TCL_BUILD_EXP_FILE="lib.exp"
- eval "TCL_EXP_FILE=libtcl${TCL_EXPORT_FILE_SUFFIX}"
-@@ -7460,13 +7486,19 @@ VERSION=${TCL_VERSION}
+@@ -7756,7 +7782,7 @@ else
+ TCL_LIB_FLAG="-ltcl`echo ${TCL_VERSION} | tr -d .`\${TCL_DBGX}"
+ fi
+ TCL_BUILD_LIB_SPEC="-L`pwd` ${TCL_LIB_FLAG}"
+- TCL_LIB_SPEC="-L${libdir} ${TCL_LIB_FLAG}"
++ TCL_LIB_SPEC="${TCL_LIB_SPEC_RPATH} -L${libdir} ${TCL_LIB_FLAG}"
+ else
+ TCL_BUILD_EXP_FILE="lib.exp"
+ eval "TCL_EXP_FILE=libtcl${TCL_EXPORT_FILE_SUFFIX}"
+@@ -7787,13 +7813,21 @@ VERSION=${TCL_VERSION}
#--------------------------------------------------------------------
if test "$FRAMEWORK_BUILD" = "1" ; then
-- TCL_PACKAGE_PATH="${libdir}/Resources/Scripts"
-+ TCL_PACKAGE_PATH_ADD="${libdir}/Resources/Scripts"
+- 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"
elif test "$prefix" != "$exec_prefix"; then
- TCL_PACKAGE_PATH="${libdir} ${prefix}/lib"
+ TCL_PACKAGE_PATH_ADD="${libdir}/tcl ${prefix}/lib"
@@ -129,14 +129,15 @@
- TCL_PACKAGE_PATH="${prefix}/lib"
+ TCL_PACKAGE_PATH_ADD="${prefix}/lib/tcl"
fi
--
+
+for dir in ${TCL_PACKAGE_PATH_ADD}; do
+ if test -z "${TCL_PACKAGE_PATH}"; then
-+ TCL_PACKAGE_PATH="$dir"
++ TCL_PACKAGE_PATH="$dir"
+ else
-+ TCL_PACKAGE_PATH="${TCL_PACKAGE_PATH} $dir"
++ TCL_PACKAGE_PATH="${TCL_PACKAGE_PATH} $dir"
+ fi
+done
++
#--------------------------------------------------------------------
# The statements below define various symbols relating to Tcl
# stub support.
diff -r 1a565aae3473 -r ec2d1342d660 lang/tcl/patches/patch-ac
--- a/lang/tcl/patches/patch-ac Tue Jul 19 10:47:45 2005 +0000
+++ b/lang/tcl/patches/patch-ac Tue Jul 19 11:11:58 2005 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.5 2004/10/01 13:35:37 adam Exp $
+$NetBSD: patch-ac,v 1.6 2005/07/19 11:11:58 adam Exp $
---- tclUnixInit.c.orig 2004-03-29 18:49:36.000000000 +0000
+--- tclUnixInit.c.orig 2005-05-24 04:20:12.000000000 +0000
+++ tclUnixInit.c
@@ -28,6 +28,11 @@
# include <dlfcn.h>
@@ -14,7 +14,7 @@
/*
* The Init script (common to Windows and Unix platforms) is
-@@ -733,6 +738,11 @@ TclpSetVariables(interp)
+@@ -740,6 +745,11 @@ TclpSetVariables(interp)
int unameOK;
CONST char *user;
Tcl_DString ds;
@@ -24,9 +24,9 @@
+ size_t len = sizeof(machine_arch);
+#endif
- #ifdef HAVE_CFBUNDLE
+ #ifdef HAVE_COREFOUNDATION
char tclLibPath[MAXPATHLEN + 1];
-@@ -835,8 +845,16 @@ TclpSetVariables(interp)
+@@ -842,8 +852,16 @@ TclpSetVariables(interp)
Tcl_SetVar2(interp, "tcl_platform", "osVersion", name.release,
TCL_GLOBAL_ONLY|TCL_APPEND_VALUE);
Home |
Main Index |
Thread Index |
Old Index