summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lang/tcl/Makefile.version4
-rw-r--r--lang/tcl/distinfo16
-rw-r--r--lang/tcl/patches/patch-aa24
-rw-r--r--lang/tcl/patches/patch-ab40
-rw-r--r--lang/tcl/patches/patch-ae24
-rw-r--r--lang/tcl/patches/patch-af10
-rw-r--r--x11/tk/Makefile.version4
-rw-r--r--x11/tk/distinfo16
-rw-r--r--x11/tk/patches/patch-aa18
-rw-r--r--x11/tk/patches/patch-ab16
-rw-r--r--x11/tk/patches/patch-ac10
-rw-r--r--x11/tk/patches/patch-ad6
12 files changed, 98 insertions, 90 deletions
diff --git a/lang/tcl/Makefile.version b/lang/tcl/Makefile.version
index 82d002455d9..d2550f8358e 100644
--- a/lang/tcl/Makefile.version
+++ b/lang/tcl/Makefile.version
@@ -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 --git a/lang/tcl/distinfo b/lang/tcl/distinfo
index d2a24c7ac62..2bfaf15e073 100644
--- a/lang/tcl/distinfo
+++ b/lang/tcl/distinfo
@@ -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 --git a/lang/tcl/patches/patch-aa b/lang/tcl/patches/patch-aa
index 02792c4ae18..d4458f75334 100644
--- a/lang/tcl/patches/patch-aa
+++ b/lang/tcl/patches/patch-aa
@@ -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 @@ $NetBSD: patch-aa,v 1.17 2006/11/02 17:41:23 adam Exp $
#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 @@ $NetBSD: patch-aa,v 1.17 2006/11/02 17:41:23 adam Exp $
# 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 @@ $NetBSD: patch-aa,v 1.17 2006/11/02 17:41:23 adam Exp $
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 @@ $NetBSD: patch-aa,v 1.17 2006/11/02 17:41:23 adam Exp $
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 @@ $NetBSD: patch-aa,v 1.17 2006/11/02 17:41:23 adam Exp $
$(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 --git a/lang/tcl/patches/patch-ab b/lang/tcl/patches/patch-ab
index f63505ea217..e4a704a7866 100644
--- a/lang/tcl/patches/patch-ab
+++ b/lang/tcl/patches/patch-ab
@@ -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 @@ $NetBSD: patch-ab,v 1.36 2007/05/31 13:01:53 adam Exp $
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 @@ $NetBSD: patch-ab,v 1.36 2007/05/31 13:01:53 adam Exp $
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 @@ $NetBSD: patch-ab,v 1.36 2007/05/31 13:01:53 adam Exp $
# 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 @@ $NetBSD: patch-ab,v 1.36 2007/05/31 13:01:53 adam Exp $
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 @@ $NetBSD: patch-ab,v 1.36 2007/05/31 13:01:53 adam Exp $
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 @@ $NetBSD: patch-ab,v 1.36 2007/05/31 13:01:53 adam Exp $
# 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 @@ $NetBSD: patch-ab,v 1.36 2007/05/31 13:01:53 adam Exp $
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 @@ $NetBSD: patch-ab,v 1.36 2007/05/31 13:01:53 adam Exp $
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 @@ $NetBSD: patch-ab,v 1.36 2007/05/31 13:01:53 adam Exp $
+ fi
+done
+
++
++
#--------------------------------------------------------------------
# The statements below define various symbols relating to Tcl
# stub support.
diff --git a/lang/tcl/patches/patch-ae b/lang/tcl/patches/patch-ae
index 6de91551bfd..7f10d290592 100644
--- a/lang/tcl/patches/patch-ae
+++ b/lang/tcl/patches/patch-ae
@@ -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 @@ $NetBSD: patch-ae,v 1.10 2006/11/02 17:41:23 adam Exp $
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 @@ $NetBSD: patch-ae,v 1.10 2006/11/02 17:41:23 adam Exp $
+ fi
+done
+
++
++
#--------------------------------------------------------------------
# The statements below define various symbols relating to Tcl
# stub support.
diff --git a/lang/tcl/patches/patch-af b/lang/tcl/patches/patch-af
index af6e3c24fd8..a0ea23f402a 100644
--- a/lang/tcl/patches/patch-af
+++ b/lang/tcl/patches/patch-af
@@ -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 @@ $NetBSD: patch-af,v 1.22 2007/05/31 13:01:53 adam Exp $
# FreeBSD 3.* and greater have ELF.
SHLIB_CFLAGS="-fPIC"
SHLIB_LD="ld -Bshareable -x"
-@@ -1923,6 +1954,9 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1933,6 +1964,9 @@ dnl AC_CHECK_TOOL(AR, ar)
CC_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}'
LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}'
fi
@@ -120,7 +120,7 @@ $NetBSD: patch-af,v 1.22 2007/05/31 13:01:53 adam Exp $
;;
ULTRIX-4.*)
SHLIB_CFLAGS="-G 0"
-@@ -2107,8 +2141,8 @@ dnl # preprocessing tests use only CPPFL
+@@ -2117,8 +2151,8 @@ dnl # preprocessing tests use only CPPFL
if test "${SHARED_BUILD}" = "1" && test "${SHLIB_SUFFIX}" != "" ; then
LIB_SUFFIX=${SHARED_LIB_SUFFIX}
@@ -131,7 +131,7 @@ $NetBSD: patch-af,v 1.22 2007/05/31 13:01:53 adam Exp $
else
LIB_SUFFIX=${UNSHARED_LIB_SUFFIX}
-@@ -2138,10 +2172,10 @@ dnl esac
+@@ -2148,10 +2182,10 @@ dnl esac
# Stub lib does not depend on shared/static configuration
if test "$RANLIB" = "" ; then
diff --git a/x11/tk/Makefile.version b/x11/tk/Makefile.version
index f1b41092b97..c81c71bea08 100644
--- a/x11/tk/Makefile.version
+++ b/x11/tk/Makefile.version
@@ -1,3 +1,3 @@
-# $NetBSD: Makefile.version,v 1.6 2007/05/31 13:02:06 adam Exp $
+# $NetBSD: Makefile.version,v 1.7 2007/10/13 11:41:33 adam Exp $
-TK_VERSION= 8.4.15
+TK_VERSION= 8.4.16
diff --git a/x11/tk/distinfo b/x11/tk/distinfo
index 826d3bd8f56..961e779ae3f 100644
--- a/x11/tk/distinfo
+++ b/x11/tk/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.30 2007/05/31 13:02:06 adam Exp $
+$NetBSD: distinfo,v 1.31 2007/10/13 11:41:33 adam Exp $
-SHA1 (tk8.4.15-src.tar.gz) = 832b39fc3e64dcbbfff4fc192e33d3fc8ef76c43
-RMD160 (tk8.4.15-src.tar.gz) = 8facb8033ce811097a3568373581687a749dda2d
-Size (tk8.4.15-src.tar.gz) = 3340313 bytes
-SHA1 (patch-aa) = 8425d47efc6feab4a19a79b7d857b9da8042aedf
-SHA1 (patch-ab) = 81f203519a75dd270d9eaf9d9551cde3c6c52beb
-SHA1 (patch-ac) = 90cb841327d21d606bcebd9d13061115ec791581
-SHA1 (patch-ad) = 408cb4e1f6dbcc00d66e4a817c65d4ed0f0230a7
+SHA1 (tk8.4.16-src.tar.gz) = 464bd7e1411e247e365e4ff585900333b3f91f56
+RMD160 (tk8.4.16-src.tar.gz) = 8545933c172ffcd7024db91f7292190776d3a873
+Size (tk8.4.16-src.tar.gz) = 3344618 bytes
+SHA1 (patch-aa) = b729957a24ce2fb6f972bbb19af27bd7d41f1846
+SHA1 (patch-ab) = 09c385b45dc7c6845086ece752b9cfdee7611e06
+SHA1 (patch-ac) = 17a266317ca7c7951794efaf5aafc60dc54ffd6e
+SHA1 (patch-ad) = 14ad16e840a825e987721f23c6308c4a011dbe01
diff --git a/x11/tk/patches/patch-aa b/x11/tk/patches/patch-aa
index 36f927a8a87..626f015c1e3 100644
--- a/x11/tk/patches/patch-aa
+++ b/x11/tk/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.18 2006/11/02 17:42:03 adam Exp $
+$NetBSD: patch-aa,v 1.19 2007/10/13 11:41:33 adam Exp $
---- unix/Makefile.in.orig 2006-10-19 19:27:34.000000000 +0200
+--- unix/Makefile.in.orig 2007-09-21 19:04:18.000000000 +0200
+++ unix/Makefile.in
@@ -94,7 +94,7 @@ HTML_INSTALL_DIR = $(INSTALL_ROOT)$(HTML
# The directory containing the Tcl sources and headers appropriate
@@ -48,8 +48,8 @@ $NetBSD: patch-aa,v 1.18 2006/11/02 17:42:03 adam Exp $
+LD = ${LIBTOOL} --mode=link @CC@ -Wl,-R${PREFIX}/lib -Wl,-R${X11BASE}/lib
CC_SWITCHES_NO_STUBS = ${CFLAGS} ${CFLAGS_WARNING} ${SHLIB_CFLAGS} \
- -I${UNIX_DIR} -I${GENERIC_DIR} \
-@@ -481,7 +483,7 @@ DEMOPROGS = browse hello ixset rmt rolod
+ -I${UNIX_DIR} -I${GENERIC_DIR} -I${BMAP_DIR} -I${TCL_GENERIC_DIR} \
+@@ -482,7 +484,7 @@ DEMOPROGS = browse hello ixset rmt rolod
all: binaries libraries doc
@@ -58,7 +58,7 @@ $NetBSD: patch-aa,v 1.18 2006/11/02 17:42:03 adam Exp $
libraries:
-@@ -493,7 +495,7 @@ doc: $(TOP_DIR)/doc/man.macros
+@@ -494,7 +496,7 @@ doc: $(TOP_DIR)/doc/man.macros
# The following target is configured by autoconf to generate either
# a shared library or non-shared library for Tk.
@@ -67,7 +67,7 @@ $NetBSD: patch-aa,v 1.18 2006/11/02 17:42:03 adam Exp $
rm -f $@
@MAKE_LIB@
-@@ -522,8 +524,8 @@ tkLibObjs:
+@@ -523,8 +525,8 @@ tkLibObjs:
objs: ${OBJS}
@@ -78,7 +78,7 @@ $NetBSD: patch-aa,v 1.18 2006/11/02 17:42:03 adam Exp $
$(WISH_LIBS) $(CC_SEARCH_FLAGS) -o wish
# Resetting the LIB_RUNTIME_DIR below is required so that
-@@ -536,7 +538,7 @@ tktest: $(TKTEST_OBJS) $(TK_LIB_FILE)
+@@ -537,7 +539,7 @@ tktest: $(TKTEST_OBJS) $(TK_LIB_FILE)
$(MAKE) tktest-real LIB_RUNTIME_DIR=`pwd`:$(TCL_BIN_DIR)
tktest-real:
@@ -87,7 +87,7 @@ $NetBSD: patch-aa,v 1.18 2006/11/02 17:42:03 adam Exp $
$(WISH_LIBS) $(CC_SEARCH_FLAGS) -o tktest
# FIXME: This xttest rule seems to be broken in a number of ways.
-@@ -544,7 +546,7 @@ tktest-real:
+@@ -545,7 +547,7 @@ tktest-real:
# lib location logic from tktest, and it is not clear where this
# test.o object file comes from.
xttest: test.o tkTest.o tkSquare.o $(TK_LIB_FILE)
@@ -96,7 +96,7 @@ $NetBSD: patch-aa,v 1.18 2006/11/02 17:42:03 adam Exp $
@TK_BUILD_LIB_SPEC@ \
$(WISH_LIBS) $(LD_SEARCH_FLAGS) -lXt -o xttest
-@@ -614,7 +616,7 @@ install-strip:
+@@ -615,7 +617,7 @@ install-strip:
# some ranlibs write to current directory, and this might not always be
# possible (e.g. if installing as root).
diff --git a/x11/tk/patches/patch-ab b/x11/tk/patches/patch-ab
index e0fe3a974c7..1c0632e670a 100644
--- a/x11/tk/patches/patch-ab
+++ b/x11/tk/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.27 2007/05/31 13:02:06 adam Exp $
+$NetBSD: patch-ab,v 1.28 2007/10/13 11:41:33 adam Exp $
---- unix/configure.orig 2007-05-25 18:09:53.000000000 +0200
+--- unix/configure.orig 2007-09-21 19:04:18.000000000 +0200
+++ unix/configure
@@ -2062,12 +2062,13 @@ fi
# Step 3: set configuration options based on system name and version.
@@ -50,7 +50,7 @@ $NetBSD: patch-ab,v 1.27 2007/05/31 13:02:06 adam Exp $
DL_OBJS="tclLoadDl.o"
DL_LIBS=""
LDFLAGS="$LDFLAGS -export-dynamic"
-@@ -3758,7 +3762,7 @@ fi
+@@ -3768,7 +3772,7 @@ fi
;;
IRIX*)
;;
@@ -59,7 +59,7 @@ $NetBSD: patch-ab,v 1.27 2007/05/31 13:02:06 adam Exp $
;;
Darwin-*)
;;
-@@ -3776,16 +3780,16 @@ fi
+@@ -3786,16 +3790,16 @@ fi
fi
if test "$SHARED_LIB_SUFFIX" = "" ; then
@@ -80,7 +80,7 @@ $NetBSD: patch-ab,v 1.27 2007/05/31 13:02:06 adam Exp $
else
LIB_SUFFIX=${UNSHARED_LIB_SUFFIX}
-@@ -5336,7 +5340,11 @@ echo "configure:5334: checking for X11 l
+@@ -5346,7 +5350,11 @@ echo "configure:5344: checking for X11 l
for i in $dirs ; do
if test -r $i/libX11.a -o -r $i/libX11.so -o -r $i/libX11.sl; then
echo "$ac_t""$i" 1>&6
@@ -93,7 +93,7 @@ $NetBSD: patch-ab,v 1.27 2007/05/31 13:02:06 adam Exp $
x_libraries="$i"
break
fi
-@@ -5345,7 +5353,11 @@ echo "configure:5334: checking for X11 l
+@@ -5355,7 +5363,11 @@ echo "configure:5344: checking for X11 l
if test "$x_libraries" = ""; then
XLIBSW=-lX11
else
@@ -106,7 +106,7 @@ $NetBSD: patch-ab,v 1.27 2007/05/31 13:02:06 adam Exp $
fi
fi
if test "$XLIBSW" = nope ; then
-@@ -5417,6 +5429,10 @@ if test "x${x_libraries}" != "x"; then
+@@ -5427,6 +5439,10 @@ if test "x${x_libraries}" != "x"; then
fi
if test "${TCL_LD_SEARCH_FLAGS}" = '-L${LIB_RUNTIME_DIR}'; then
LIB_RUNTIME_DIR=`echo ${LIB_RUNTIME_DIR} |sed -e 's/:/ -L/g'`
@@ -117,7 +117,7 @@ $NetBSD: patch-ab,v 1.27 2007/05/31 13:02:06 adam Exp $
fi
# The statement below is very tricky! It actually *evaluates* the
-@@ -5951,11 +5967,18 @@ else
+@@ -5965,11 +5981,18 @@ else
if test "$SHARED_BUILD" = "0" || test "$TCL_NEEDS_EXP_FILE" = "0"; then
if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
eval TK_LIB_FLAG="-ltk${VERSION}\${TK_DBGX}"
diff --git a/x11/tk/patches/patch-ac b/x11/tk/patches/patch-ac
index ee7bd33afb2..8fbaf7b73d7 100644
--- a/x11/tk/patches/patch-ac
+++ b/x11/tk/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.17 2007/05/31 13:02:06 adam Exp $
+$NetBSD: patch-ac,v 1.18 2007/10/13 11:41:34 adam Exp $
---- unix/tcl.m4.orig 2007-05-25 18:09:54.000000000 +0200
+--- unix/tcl.m4.orig 2007-09-21 19:04:18.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.
@@ -80,7 +80,7 @@ $NetBSD: patch-ac,v 1.17 2007/05/31 13:02:06 adam Exp $
if test $tcl_cv_ld_elf = yes; then
SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
else
-@@ -1923,6 +1940,9 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1933,6 +1950,9 @@ dnl AC_CHECK_TOOL(AR, ar)
CC_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}'
LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}'
fi
@@ -90,7 +90,7 @@ $NetBSD: patch-ac,v 1.17 2007/05/31 13:02:06 adam Exp $
;;
ULTRIX-4.*)
SHLIB_CFLAGS="-G 0"
-@@ -2107,8 +2127,8 @@ dnl # preprocessing tests use only CPPFL
+@@ -2117,8 +2137,8 @@ dnl # preprocessing tests use only CPPFL
if test "${SHARED_BUILD}" = "1" && test "${SHLIB_SUFFIX}" != "" ; then
LIB_SUFFIX=${SHARED_LIB_SUFFIX}
@@ -101,7 +101,7 @@ $NetBSD: patch-ac,v 1.17 2007/05/31 13:02:06 adam Exp $
else
LIB_SUFFIX=${UNSHARED_LIB_SUFFIX}
-@@ -2138,10 +2158,10 @@ dnl esac
+@@ -2148,10 +2168,10 @@ dnl esac
# Stub lib does not depend on shared/static configuration
if test "$RANLIB" = "" ; then
diff --git a/x11/tk/patches/patch-ad b/x11/tk/patches/patch-ad
index e3afe578ccc..82576e22f50 100644
--- a/x11/tk/patches/patch-ad
+++ b/x11/tk/patches/patch-ad
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.11 2007/05/31 13:02:06 adam Exp $
+$NetBSD: patch-ad,v 1.12 2007/10/13 11:41:34 adam Exp $
---- unix/configure.in.orig 2007-05-25 18:09:53.000000000 +0200
+--- unix/configure.in.orig 2007-09-21 19:04:18.000000000 +0200
+++ unix/configure.in
@@ -301,6 +301,10 @@ if test "x${x_libraries}" != "x"; then
fi
@@ -13,7 +13,7 @@ $NetBSD: patch-ad,v 1.11 2007/05/31 13:02:06 adam Exp $
fi
# The statement below is very tricky! It actually *evaluates* the
-@@ -476,11 +480,18 @@ else
+@@ -480,11 +484,18 @@ else
if test "$SHARED_BUILD" = "0" || test "$TCL_NEEDS_EXP_FILE" = "0"; then
if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
eval TK_LIB_FLAG="-ltk${VERSION}\${TK_DBGX}"
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-29 07:40:38 +0000