diff options
author | minskim <minskim> | 2004-03-08 22:14:18 +0000 |
---|---|---|
committer | minskim <minskim> | 2004-03-08 22:14:18 +0000 |
commit | 7c4d1df7d6b471001e98e86ae1aa7cda19c66b3e (patch) | |
tree | a5674c1fdb2d564132061d04f09c10b65b0640e3 /lang/tcl | |
parent | fb9a4bb2642bd719c3fe4d46a49fcf76e096290d (diff) | |
download | pkgsrc-7c4d1df7d6b471001e98e86ae1aa7cda19c66b3e.tar.gz |
Update Tcl/Tk to 8.4.6.
* Tcl_Obj sharing fixed in [binary scan]
* Updated errno usage for recent glibc
* Fixed [file normalize ~unknownuser] error
* Fixed two memory leaks in VFS code
* Fixed possible infinite loop in TclFinalizeFilesystem
* Updated HP-UX 11 build libraries setup
* Unix std channels forced to exist at startup
* Stopped broken [exec] quoting of '{'
* Fixed memory leak with very long host names
* Corrected level interpretation of Tcl_CreateTrace
* Allow 64-bit configure on IRIX64-6.5*
* Several OS X/Aqua native integration improvements (scrollbar,
event generate, unicode clipboard, tk_messageBox, mousewheel event,
alpha blending for partially transparent images)
* Recognized native hand2/fleur cursors on Windows
* Post menubuttons so they stay on screen better
* Fixed crash during intra-image copy/resize
* New msg catalogs for Esperanto and Polish
* Corrections bold/italic font handling (width calculations) on Windows
* Fixed shrinking grid geometry calculations
Diffstat (limited to 'lang/tcl')
-rw-r--r-- | lang/tcl/Makefile | 6 | ||||
-rw-r--r-- | lang/tcl/distinfo | 12 | ||||
-rw-r--r-- | lang/tcl/patches/patch-ab | 69 | ||||
-rw-r--r-- | lang/tcl/patches/patch-ac | 8 | ||||
-rw-r--r-- | lang/tcl/patches/patch-af | 24 |
5 files changed, 76 insertions, 43 deletions
diff --git a/lang/tcl/Makefile b/lang/tcl/Makefile index f7d148d1208..7b0e1586488 100644 --- a/lang/tcl/Makefile +++ b/lang/tcl/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.26 2004/03/08 19:55:35 minskim Exp $ +# $NetBSD: Makefile,v 1.27 2004/03/08 22:14:18 minskim Exp $ # -DISTNAME= tcl8.4.5-src -PKGNAME= tcl-8.4.5 +DISTNAME= tcl8.4.6-src +PKGNAME= tcl-8.4.6 CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tcl/} diff --git a/lang/tcl/distinfo b/lang/tcl/distinfo index e4405a6095a..a075faa871c 100644 --- a/lang/tcl/distinfo +++ b/lang/tcl/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.19 2004/03/08 19:55:35 minskim Exp $ +$NetBSD: distinfo,v 1.20 2004/03/08 22:14:19 minskim Exp $ -SHA1 (tcl8.4.5-src.tar.gz) = 910cda4c04805ac3c4f0accc21660dc60879c847 -Size (tcl8.4.5-src.tar.gz) = 3444510 bytes +SHA1 (tcl8.4.6-src.tar.gz) = d21495ca04419fc3b1594b96b19116040c33a3f0 +Size (tcl8.4.6-src.tar.gz) = 3448711 bytes SHA1 (patch-aa) = 7615c4debc2ff76278b071d649695e1da9e5decd -SHA1 (patch-ab) = 5f4845238e58612d81dbedc72f368fb26a3d6181 -SHA1 (patch-ac) = cf99d88743f7badd338393063837a997cca1c573 +SHA1 (patch-ab) = dc45c2d9195aec8047ca132adab94e25c777931c +SHA1 (patch-ac) = efc40f45f73cec2770231ff515314fc41bbd166e SHA1 (patch-ae) = 9a6f9b47c926f851a799ece713668f0955344ce3 -SHA1 (patch-af) = 3542f1d7d3020224fc407eac377450ad82015c08 +SHA1 (patch-af) = b19b6df12335c89d7786c91a36460249a44c7fcf diff --git a/lang/tcl/patches/patch-ab b/lang/tcl/patches/patch-ab index 6a736e11796..9cf7af11e08 100644 --- a/lang/tcl/patches/patch-ab +++ b/lang/tcl/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.22 2004/03/08 19:55:35 minskim Exp $ +$NetBSD: patch-ab,v 1.23 2004/03/08 22:14:19 minskim Exp $ ---- configure.orig 2004-02-07 21:57:29.000000000 -0600 +--- configure.orig 2004-03-01 17:58:59.000000000 -0600 +++ configure -@@ -5558,6 +5558,7 @@ fi +@@ -5613,6 +5613,7 @@ fi # Step 3: set configuration options based on system name and version. do64bit_ok=no @@ -10,7 +10,7 @@ $NetBSD: patch-ab,v 1.22 2004/03/08 19:55:35 minskim Exp $ EXTRA_CFLAGS="" TCL_EXPORT_FILE_SUFFIX="" UNSHARED_LIB_SUFFIX="" -@@ -5977,6 +5978,9 @@ fi +@@ -6038,6 +6039,9 @@ fi LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}' EXTRA_CFLAGS="" LDFLAGS="" @@ -18,9 +18,9 @@ $NetBSD: patch-ab,v 1.22 2004/03/08 19:55:35 minskim Exp $ + SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so' + TCL_LIB_VERSIONS_OK=nodots ;; - IRIX-6.*|IRIX64-6.5*) + IRIX-6.*) SHLIB_CFLAGS="" -@@ -6002,6 +6006,9 @@ fi +@@ -6063,6 +6067,9 @@ fi esac LDFLAGS="-n32" fi @@ -30,7 +30,7 @@ $NetBSD: patch-ab,v 1.22 2004/03/08 19:55:35 minskim Exp $ ;; IRIX64-6.*) SHLIB_CFLAGS="" -@@ -6026,6 +6033,9 @@ fi +@@ -6087,6 +6094,9 @@ fi LDFLAGS="-64" fi fi @@ -40,7 +40,7 @@ $NetBSD: patch-ab,v 1.22 2004/03/08 19:55:35 minskim Exp $ ;; Linux*) SHLIB_CFLAGS="-fPIC" -@@ -6107,6 +6117,9 @@ fi +@@ -6168,6 +6178,9 @@ fi EOF @@ -50,7 +50,7 @@ $NetBSD: patch-ab,v 1.22 2004/03/08 19:55:35 minskim Exp $ ;; GNU*) SHLIB_CFLAGS="-fPIC" -@@ -6188,6 +6201,9 @@ fi +@@ -6249,6 +6262,9 @@ fi LD_SEARCH_FLAGS="" ;; NetBSD-*|FreeBSD-[1-2].*|OpenBSD-*) @@ -60,7 +60,7 @@ $NetBSD: patch-ab,v 1.22 2004/03/08 19:55:35 minskim 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 -@@ -6220,18 +6236,16 @@ if eval "test \"`echo '$ac_cv_header_'$a +@@ -6281,18 +6297,16 @@ if eval "test \"`echo '$ac_cv_header_'$a # NetBSD/SPARC needs -fPIC, -fpic will not do. SHLIB_CFLAGS="-fPIC" @@ -73,15 +73,15 @@ $NetBSD: patch-ab,v 1.22 2004/03/08 19:55:35 minskim 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:6233: checking for ELF" >&5 -+echo "configure:6247: checking for ELF" >&5 +-echo "configure:6294: checking for ELF" >&5 ++echo "configure:6308: checking for ELF" >&5 cat > conftest.$ac_ext <<EOF --#line 6235 "configure" -+#line 6249 "configure" +-#line 6296 "configure" ++#line 6310 "configure" #include "confdefs.h" #ifdef __ELF__ -@@ -6242,11 +6256,20 @@ EOF +@@ -6303,11 +6317,20 @@ EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "yes" >/dev/null 2>&1; then rm -rf conftest* @@ -104,7 +104,7 @@ $NetBSD: patch-ab,v 1.22 2004/03/08 19:55:35 minskim Exp $ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0' fi -@@ -6565,6 +6588,9 @@ EOF +@@ -6626,6 +6649,9 @@ EOF CC_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}' LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}' fi @@ -114,7 +114,7 @@ $NetBSD: patch-ab,v 1.22 2004/03/08 19:55:35 minskim Exp $ ;; ULTRIX-4.*) SHLIB_CFLAGS="-G 0" -@@ -6836,8 +6862,8 @@ fi +@@ -6897,8 +6923,8 @@ fi if test "${SHARED_BUILD}" = "1" && test "${SHLIB_SUFFIX}" != "" ; then LIB_SUFFIX=${SHARED_LIB_SUFFIX} @@ -125,7 +125,7 @@ $NetBSD: patch-ab,v 1.22 2004/03/08 19:55:35 minskim Exp $ else LIB_SUFFIX=${UNSHARED_LIB_SUFFIX} -@@ -6854,10 +6880,10 @@ fi +@@ -6915,10 +6941,10 @@ fi # Stub lib does not depend on shared/static configuration if test "$RANLIB" = "" ; then @@ -138,3 +138,36 @@ $NetBSD: patch-ab,v 1.22 2004/03/08 19:55:35 minskim Exp $ INSTALL_STUB_LIB='$(INSTALL_LIBRARY) $(STUB_LIB_FILE) $(LIB_INSTALL_DIR)/$(STUB_LIB_FILE) ; (cd $(LIB_INSTALL_DIR) ; $(RANLIB) $(STUB_LIB_FILE))' fi +@@ -7217,7 +7243,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}" +@@ -7247,13 +7273,19 @@ VERSION=${TCL_VERSION} + #-------------------------------------------------------------------- + + if test "$FRAMEWORK_BUILD" = "1" ; then +- TCL_PACKAGE_PATH="${libdir}/Resources/Scripts" ++ TCL_PACKAGE_PATH_ADD="${libdir}/Resources/Scripts" + elif test "$prefix" != "$exec_prefix"; then +- TCL_PACKAGE_PATH="${libdir} ${prefix}/lib" ++ TCL_PACKAGE_PATH_ADD="${libdir}/tcl ${prefix}/lib" + else +- 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" ++ else ++ TCL_PACKAGE_PATH="${TCL_PACKAGE_PATH} $dir" ++ fi ++done + #-------------------------------------------------------------------- + # The statements below define various symbols relating to Tcl + # stub support. diff --git a/lang/tcl/patches/patch-ac b/lang/tcl/patches/patch-ac index 1e36aa04390..b5553ef4886 100644 --- a/lang/tcl/patches/patch-ac +++ b/lang/tcl/patches/patch-ac @@ -1,6 +1,6 @@ -$NetBSD: patch-ac,v 1.3 2004/03/08 19:55:35 minskim Exp $ +$NetBSD: patch-ac,v 1.4 2004/03/08 22:14:19 minskim Exp $ ---- tclUnixInit.c.orig Mon Nov 10 07:41:58 2003 +--- tclUnixInit.c.orig 2004-02-17 17:46:54.000000000 -0600 +++ tclUnixInit.c @@ -28,6 +28,11 @@ # include <dlfcn.h> @@ -14,7 +14,7 @@ $NetBSD: patch-ac,v 1.3 2004/03/08 19:55:35 minskim Exp $ /* * The Init script (common to Windows and Unix platforms) is -@@ -717,6 +722,11 @@ TclpSetVariables(interp) +@@ -730,6 +735,11 @@ TclpSetVariables(interp) int unameOK; CONST char *user; Tcl_DString ds; @@ -26,7 +26,7 @@ $NetBSD: patch-ac,v 1.3 2004/03/08 19:55:35 minskim Exp $ #ifdef HAVE_CFBUNDLE char tclLibPath[MAXPATHLEN + 1]; -@@ -819,8 +829,16 @@ TclpSetVariables(interp) +@@ -832,8 +842,16 @@ TclpSetVariables(interp) Tcl_SetVar2(interp, "tcl_platform", "osVersion", name.release, TCL_GLOBAL_ONLY|TCL_APPEND_VALUE); } diff --git a/lang/tcl/patches/patch-af b/lang/tcl/patches/patch-af index bee8b668303..cf6038f0b3a 100644 --- a/lang/tcl/patches/patch-af +++ b/lang/tcl/patches/patch-af @@ -1,8 +1,8 @@ -$NetBSD: patch-af,v 1.9 2004/03/08 19:55:35 minskim Exp $ +$NetBSD: patch-af,v 1.10 2004/03/08 22:14:19 minskim Exp $ ---- tcl.m4.orig Fri Nov 21 14:17:14 2003 +--- tcl.m4.orig 2004-03-01 17:58:59.000000000 -0600 +++ tcl.m4 -@@ -795,6 +795,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [ +@@ -796,6 +796,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [ # Step 3: set configuration options based on system name and version. do64bit_ok=no @@ -10,7 +10,7 @@ $NetBSD: patch-af,v 1.9 2004/03/08 19:55:35 minskim Exp $ EXTRA_CFLAGS="" TCL_EXPORT_FILE_SUFFIX="" UNSHARED_LIB_SUFFIX="" -@@ -1059,6 +1060,9 @@ dnl AC_CHECK_TOOL(AR, ar) +@@ -1066,6 +1067,9 @@ dnl AC_CHECK_TOOL(AR, ar) LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}' EXTRA_CFLAGS="" LDFLAGS="" @@ -18,9 +18,9 @@ $NetBSD: patch-af,v 1.9 2004/03/08 19:55:35 minskim Exp $ + SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so' + TCL_LIB_VERSIONS_OK=nodots ;; - IRIX-6.*|IRIX64-6.5*) + IRIX-6.*) SHLIB_CFLAGS="" -@@ -1084,6 +1088,9 @@ dnl AC_CHECK_TOOL(AR, ar) +@@ -1091,6 +1095,9 @@ dnl AC_CHECK_TOOL(AR, ar) esac LDFLAGS="-n32" fi @@ -30,7 +30,7 @@ $NetBSD: patch-af,v 1.9 2004/03/08 19:55:35 minskim Exp $ ;; IRIX64-6.*) SHLIB_CFLAGS="" -@@ -1108,6 +1115,9 @@ dnl AC_CHECK_TOOL(AR, ar) +@@ -1115,6 +1122,9 @@ dnl AC_CHECK_TOOL(AR, ar) LDFLAGS="-64" fi fi @@ -40,7 +40,7 @@ $NetBSD: patch-af,v 1.9 2004/03/08 19:55:35 minskim Exp $ ;; Linux*) SHLIB_CFLAGS="-fPIC" -@@ -1154,6 +1164,9 @@ dnl AC_CHECK_TOOL(AR, ar) +@@ -1161,6 +1171,9 @@ dnl AC_CHECK_TOOL(AR, ar) # XIM peeking works under XFree86. AC_DEFINE(PEEK_XCLOSEIM) @@ -50,7 +50,7 @@ $NetBSD: patch-af,v 1.9 2004/03/08 19:55:35 minskim Exp $ ;; GNU*) SHLIB_CFLAGS="-fPIC" -@@ -1203,29 +1216,37 @@ dnl AC_CHECK_TOOL(AR, ar) +@@ -1210,29 +1223,37 @@ dnl AC_CHECK_TOOL(AR, ar) LD_SEARCH_FLAGS="" ;; NetBSD-*|FreeBSD-[[1-2]].*|OpenBSD-*) @@ -93,7 +93,7 @@ $NetBSD: patch-af,v 1.9 2004/03/08 19:55:35 minskim Exp $ ], [ SHLIB_CFLAGS="" SHLIB_LD="echo tclLdAout $CC \{$SHLIB_CFLAGS\} | `pwd`/tclsh -r" -@@ -1519,6 +1540,9 @@ dnl AC_CHECK_TOOL(AR, ar) +@@ -1526,6 +1547,9 @@ dnl AC_CHECK_TOOL(AR, ar) CC_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}' LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}' fi @@ -103,7 +103,7 @@ $NetBSD: patch-af,v 1.9 2004/03/08 19:55:35 minskim Exp $ ;; ULTRIX-4.*) SHLIB_CFLAGS="-G 0" -@@ -1703,8 +1727,8 @@ dnl AC_CHECK_TOOL(AR, ar) +@@ -1710,8 +1734,8 @@ dnl AC_CHECK_TOOL(AR, ar) if test "${SHARED_BUILD}" = "1" && test "${SHLIB_SUFFIX}" != "" ; then LIB_SUFFIX=${SHARED_LIB_SUFFIX} @@ -114,7 +114,7 @@ $NetBSD: patch-af,v 1.9 2004/03/08 19:55:35 minskim Exp $ else LIB_SUFFIX=${UNSHARED_LIB_SUFFIX} -@@ -1734,10 +1758,10 @@ dnl esac +@@ -1741,10 +1765,10 @@ dnl esac # Stub lib does not depend on shared/static configuration if test "$RANLIB" = "" ; then |