diff options
author | adam <adam> | 2006-04-27 08:17:09 +0000 |
---|---|---|
committer | adam <adam> | 2006-04-27 08:17:09 +0000 |
commit | 43cabe5bebc57746a673c6236db361e9b1843fea (patch) | |
tree | ba19dc7995eaf70596f5665f25ccb697b8a80883 | |
parent | c7e427ea92319eae94d93505cb1de3c2f8c12606 (diff) | |
download | pkgsrc-43cabe5bebc57746a673c6236db361e9b1843fea.tar.gz |
Changes 8.4.13:
* Win NT/XP: unicode console support taken back out.
* ${prefix}/share addition to ::tcl_pkgPath undone.
* Warning message for packages with incorrect index scripts silenced.
* Correct syntax error in configure script (bash 3.1 exposes it).
* Tk incompatibilities with SCIM resolved.
* Improved [file writable] support of Windows conventions.
* Tcl_GetIndexFromObj() support for exact matching of empty key.
* Tk Portuguese localization support (pt.msg).
* Tk more robust when X server does not recognize color name "Black".
* Tk_PhotoPutBlock() performance improvement.
* [lsearch -start $pastEnd] no longer finds match at end of list.
* Correct [expr abs($LONG_MIN)] result.
* Correct [string range] failures on some strings containing \x00.
* TCL_EVAL_GLOBAL and [uplevel 0] agreement when traces or [unknown] active.
* Corrections to context of auto-loading the target of an interp alias.
* Corrected some interference between enter and enterstep traces.
* Correct [$img configure -data] failure to change X display.
* Tk_GetBitmapFromData() thread safety.
* Crashes in [grid] for some invalid index arguments.
* Crash when all content of a [text] is elided.
* Crash in [$text edit undo/redo].
* Crash in animated GIF display with variable frame size.
* Crash related to pipe usage in thread-enabled Tcl on Windows.
* Crash when [$text dump -command] changes contents while dumping.
* Crash reading utf-8 when multibyte char spans multiple buffers at EOF.
* Several finalization crashes corrected.
-rw-r--r-- | lang/tcl/Makefile | 3 | ||||
-rw-r--r-- | lang/tcl/Makefile.version | 4 | ||||
-rw-r--r-- | lang/tcl/buildlink3.mk | 6 | ||||
-rw-r--r-- | lang/tcl/distinfo | 16 | ||||
-rw-r--r-- | lang/tcl/patches/patch-ab | 68 | ||||
-rw-r--r-- | lang/tcl/patches/patch-ac | 22 | ||||
-rw-r--r-- | lang/tcl/patches/patch-ae | 18 | ||||
-rw-r--r-- | lang/tcl/patches/patch-af | 57 | ||||
-rw-r--r-- | x11/tk/Makefile | 3 | ||||
-rw-r--r-- | x11/tk/Makefile.version | 4 | ||||
-rw-r--r-- | x11/tk/PLIST | 3 | ||||
-rw-r--r-- | x11/tk/buildlink3.mk | 6 | ||||
-rw-r--r-- | x11/tk/distinfo | 15 | ||||
-rw-r--r-- | x11/tk/patches/patch-ab | 58 | ||||
-rw-r--r-- | x11/tk/patches/patch-ac | 54 | ||||
-rw-r--r-- | x11/tk/patches/patch-ad | 8 | ||||
-rw-r--r-- | x11/tk/patches/patch-ae | 18 |
17 files changed, 143 insertions, 220 deletions
diff --git a/lang/tcl/Makefile b/lang/tcl/Makefile index 2b1ec865c21..d823e5650e2 100644 --- a/lang/tcl/Makefile +++ b/lang/tcl/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.58 2006/02/23 23:30:57 minskim Exp $ +# $NetBSD: Makefile,v 1.59 2006/04/27 08:17:09 adam Exp $ DISTNAME= tcl${TCL_VERSION}-src PKGNAME= tcl-${TCL_VERSION} -PKGREVISION= 1 CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tcl/} diff --git a/lang/tcl/Makefile.version b/lang/tcl/Makefile.version index 9ad9cf8ca06..b9b48c8a902 100644 --- a/lang/tcl/Makefile.version +++ b/lang/tcl/Makefile.version @@ -1,3 +1,3 @@ -# $NetBSD: Makefile.version,v 1.3 2006/01/16 14:47:35 adam Exp $ +# $NetBSD: Makefile.version,v 1.4 2006/04/27 08:17:09 adam Exp $ -TCL_VERSION=8.4.12 +TCL_VERSION=8.4.13 diff --git a/lang/tcl/buildlink3.mk b/lang/tcl/buildlink3.mk index cfaae78da85..9ac70310f4e 100644 --- a/lang/tcl/buildlink3.mk +++ b/lang/tcl/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.16 2006/04/06 06:22:15 reed Exp $ +# $NetBSD: buildlink3.mk,v 1.17 2006/04/27 08:17:09 adam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ TCL_BUILDLINK3_MK:= ${TCL_BUILDLINK3_MK}+ @@ -11,11 +11,11 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ntcl} BUILDLINK_PACKAGES+= tcl .if !empty(TCL_BUILDLINK3_MK:M+) -BUILDLINK_API_DEPENDS.tcl+= tcl>=8.4.6nb1 +BUILDLINK_API_DEPENDS.tcl+= tcl>=8.4.6nb1 BUILDLINK_ABI_DEPENDS.tcl+= tcl>=8.4.7nb1 BUILDLINK_PKGSRCDIR.tcl?= ../../lang/tcl -BUILDLINK_FILES.tcl= bin/tclsh* +BUILDLINK_FILES.tcl+= bin/tclsh* # # Make "-ltcl" and "-ltcl8.4" resolve into "-ltcl84", so that we don't # need to patch so many Makefiles. diff --git a/lang/tcl/distinfo b/lang/tcl/distinfo index 6cbd70d0c00..a1aa135cb7b 100644 --- a/lang/tcl/distinfo +++ b/lang/tcl/distinfo @@ -1,14 +1,14 @@ -$NetBSD: distinfo,v 1.37 2006/02/23 23:30:57 minskim Exp $ +$NetBSD: distinfo,v 1.38 2006/04/27 08:17:09 adam Exp $ -SHA1 (tcl8.4.12-src.tar.gz) = 8f9808da2df0aeb2319ab10a4fc49295789fc43d -RMD160 (tcl8.4.12-src.tar.gz) = 5a667face8be2cebced5238c481e96499a93237b -Size (tcl8.4.12-src.tar.gz) = 3500222 bytes +SHA1 (tcl8.4.13-src.tar.gz) = 4af6bec9a941d7d798df4287eebece7ded67489c +RMD160 (tcl8.4.13-src.tar.gz) = 4e0aa4e67f0a910d3323d8288b707ae9a59408a3 +Size (tcl8.4.13-src.tar.gz) = 3513852 bytes SHA1 (patch-aa) = ab9ac8cabb91735d9203dcb107ef86a46127bf06 -SHA1 (patch-ab) = 8f9ac2c89bae1e68c6e477f056255f0c5fe70c78 -SHA1 (patch-ac) = 2040e904292a22a4142f35bf8d8f01f1c96a2195 +SHA1 (patch-ab) = 33638ef0fa55596573b96229e8c7d618af483b71 +SHA1 (patch-ac) = 447f3bb65a0c6499f0b85ed56c33f6e3c0e96ac3 SHA1 (patch-ad) = 05a945172651513e178c6f49672bb18d8c4ad3e7 -SHA1 (patch-ae) = 68af5d4b11b66a0db41578956575559421833a26 -SHA1 (patch-af) = 8c02ac21049fc84998ce79b0ce3e03bd62facc14 +SHA1 (patch-ae) = c54a46c241285a29882b6de3162fc391046468f9 +SHA1 (patch-af) = d99786af8ea0d6f471804e4fc864581a397728f6 SHA1 (patch-ag) = fe371866b438063515bad6d145287455c4636824 SHA1 (patch-ah) = 51abadf5fb5aed1d4bf0a162ed5f392bc9c3bc22 SHA1 (patch-ai) = b0f7818adedd53a123c6ab809bbec28924b3f07b diff --git a/lang/tcl/patches/patch-ab b/lang/tcl/patches/patch-ab index 7cc95b038f9..587dc54a0e7 100644 --- a/lang/tcl/patches/patch-ab +++ b/lang/tcl/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.33 2006/02/23 23:30:57 minskim Exp $ +$NetBSD: patch-ab,v 1.34 2006/04/27 08:17:09 adam Exp $ ---- unix/configure.orig 2005-12-06 16:03:33.000000000 +0000 +--- unix/configure.orig 2006-04-20 16:42:21.000000000 +0200 +++ unix/configure -@@ -2542,12 +2542,13 @@ fi +@@ -2557,12 +2557,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.33 2006/02/23 23:30:57 minskim Exp $ CFLAGS_DEBUG=-g CFLAGS_OPTIMIZE=-O if test "$GCC" = "yes" ; then -@@ -2962,6 +2963,21 @@ fi +@@ -2977,6 +2978,21 @@ fi LD_LIBRARY_PATH_VAR="SHLIB_PATH" fi ;; @@ -39,7 +39,7 @@ $NetBSD: patch-ab,v 1.33 2006/02/23 23:30:57 minskim Exp $ IRIX-4.*) SHLIB_CFLAGS="-G 0" SHLIB_SUFFIX=".a" -@@ -3202,6 +3218,9 @@ fi +@@ -3217,6 +3233,9 @@ fi LD_SEARCH_FLAGS="" ;; NetBSD-*|FreeBSD-[1-2].*) @@ -49,45 +49,31 @@ $NetBSD: patch-ab,v 1.33 2006/02/23 23:30:57 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 -@@ -3234,13 +3253,11 @@ if eval "test \"`echo '$ac_cv_header_'$a +@@ -3249,13 +3268,11 @@ if eval "test \"`echo '$ac_cv_header_'$a # NetBSD/SPARC needs -fPIC, -fpic will not do. SHLIB_CFLAGS="-fPIC" - SHLIB_LD="ld -Bshareable -x" -- SHLIB_LD_LIBS="" -+ SHLIB_LD_LIBS='${LIBS}' + SHLIB_LD_LIBS='${LIBS}' SHLIB_SUFFIX=".so" DL_OBJS="tclLoadDl.o" DL_LIBS="" 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:3246: checking for ELF" >&5 - cat > conftest.$ac_ext <<EOF -@@ -3255,11 +3272,20 @@ EOF - if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "yes" >/dev/null 2>&1; then - rm -rf conftest* -- echo "$ac_t""yes" 1>&6 -+ -+ echo "$ac_t""yes" 1>&6 -+ SHLIB_LD='${TCL_CC} -shared -Wl,-x' -+ LD_SEARCH_FLAGS='-Wl,-R${LIB_RUNTIME_DIR}' -+ TCL_LIB_SPEC_RPATH="-Wl,-R${exec_prefix}/lib" - SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so' -+ - else - rm -rf conftest* -- echo "$ac_t""no" 1>&6 -+ -+ echo "$ac_t""no" 1>&6 -+ SHLIB_LD="ld -Bshareable -x" -+ LD_SEARCH_FLAGS='-R${LIB_RUNTIME_DIR}' -+ TCL_LIB_SPEC_RPATH="-R${exec_prefix}/lib" - SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0' - + echo "configure:3261: checking for ELF" >&5 + if eval "test \"`echo '$''{'tcl_cv_ld_elf'+set}'`\" = set"; then +@@ -3284,6 +3301,9 @@ rm -f conftest* fi -@@ -3348,7 +3374,7 @@ rm -f conftest* + + echo "$ac_t""$tcl_cv_ld_elf" 1>&6 ++ SHLIB_LD='${TCL_CC} -shared -Wl,-x' ++ LD_SEARCH_FLAGS='-Wl,-R${LIB_RUNTIME_DIR}' ++ TCL_LIB_SPEC_RPATH="-Wl,-R${exec_prefix}/lib" + if test $tcl_cv_ld_elf = yes; then + SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so' + else +@@ -3381,7 +3401,7 @@ echo "$ac_t""$tcl_cv_ld_elf" 1>&6 UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' TCL_LIB_VERSIONS_OK=nodots ;; @@ -96,7 +82,7 @@ $NetBSD: patch-ab,v 1.33 2006/02/23 23:30:57 minskim Exp $ # FreeBSD 3.* and greater have ELF. SHLIB_CFLAGS="-fPIC" SHLIB_LD="ld -Bshareable -x" -@@ -4301,16 +4327,16 @@ fi +@@ -4358,16 +4378,16 @@ fi fi if test "$SHARED_LIB_SUFFIX" = "" ; then @@ -117,7 +103,7 @@ $NetBSD: patch-ab,v 1.33 2006/02/23 23:30:57 minskim Exp $ else LIB_SUFFIX=${UNSHARED_LIB_SUFFIX} -@@ -7785,7 +7811,7 @@ else +@@ -7886,7 +7906,7 @@ else TCL_LIB_FLAG="-ltcl`echo ${TCL_VERSION} | tr -d .`\${TCL_DBGX}" fi TCL_BUILD_LIB_SPEC="-L`pwd` ${TCL_LIB_FLAG}" @@ -126,7 +112,7 @@ $NetBSD: patch-ab,v 1.33 2006/02/23 23:30:57 minskim Exp $ else TCL_BUILD_EXP_FILE="lib.exp" eval "TCL_EXP_FILE=libtcl${TCL_EXPORT_FILE_SUFFIX}" -@@ -7816,13 +7842,21 @@ VERSION=${TCL_VERSION} +@@ -7917,13 +7937,21 @@ VERSION=${TCL_VERSION} #-------------------------------------------------------------------- if test "$FRAMEWORK_BUILD" = "1" ; then @@ -134,10 +120,10 @@ $NetBSD: patch-ab,v 1.33 2006/02/23 23:30:57 minskim Exp $ + 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" ++ TCL_PACKAGE_PATH_ADD="${libdir} ${prefix}/lib" else - TCL_PACKAGE_PATH="${prefix}/lib" -+ TCL_PACKAGE_PATH_ADD="${prefix}/lib/tcl" ++ TCL_PACKAGE_PATH_ADD="${prefix}/lib" fi +for dir in ${TCL_PACKAGE_PATH_ADD}; do @@ -148,6 +134,6 @@ $NetBSD: patch-ab,v 1.33 2006/02/23 23:30:57 minskim Exp $ + fi +done + - # If a system share directory like /usr/local/share already exists, then add - # it to the package search path. - + #-------------------------------------------------------------------- + # 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 4797dfc2ae9..49dcd36dcef 100644 --- a/lang/tcl/patches/patch-ac +++ b/lang/tcl/patches/patch-ac @@ -1,13 +1,13 @@ -$NetBSD: patch-ac,v 1.8 2006/01/16 14:47:35 adam Exp $ +$NetBSD: patch-ac,v 1.9 2006/04/27 08:17:09 adam Exp $ ---- unix/tclUnixInit.c.orig 2005-11-03 17:16:29.000000000 +0100 +--- unix/tclUnixInit.c.orig 2006-01-26 00:06:16.000000000 +0100 +++ unix/tclUnixInit.c @@ -19,7 +19,7 @@ #ifdef HAVE_LANGINFO #include <langinfo.h> #endif --#if defined(__FreeBSD__) -+#if defined(__FreeBSD__) || defined(__DragonFly__) +-#if defined(__FreeBSD__) && defined(__GNUC__) ++#if (defined(__FreeBSD__) || defined(__DragonFly__)) && defined(__GNUC__) # include <floatingpoint.h> #endif #if defined(__bsdi__) @@ -27,12 +27,12 @@ $NetBSD: patch-ac,v 1.8 2006/01/16 14:47:35 adam Exp $ (void) signal(SIGPIPE, SIG_IGN); #endif /* SIGPIPE */ --#ifdef __FreeBSD__ -+#if defined(__FreeBSD__) || defined(__DragonFly__) - fpsetround(FP_RN); - fpsetmask(0L); - #endif -@@ -742,6 +747,11 @@ TclpSetVariables(interp) +-#if defined(__FreeBSD__) && defined(__GNUC__) ++#if (defined(__FreeBSD__) || defined(__DragonFly__)) && defined(__GNUC__) + /* + * Adjust the rounding mode to be more conventional. Note that FreeBSD + * only provides the __fpsetreg() used by the following two for the GNU +@@ -749,6 +754,11 @@ TclpSetVariables(interp) int unameOK; CONST char *user; Tcl_DString ds; @@ -44,7 +44,7 @@ $NetBSD: patch-ac,v 1.8 2006/01/16 14:47:35 adam Exp $ #ifdef HAVE_COREFOUNDATION char tclLibPath[MAXPATHLEN + 1]; -@@ -844,8 +854,16 @@ TclpSetVariables(interp) +@@ -851,8 +861,16 @@ TclpSetVariables(interp) Tcl_SetVar2(interp, "tcl_platform", "osVersion", name.release, TCL_GLOBAL_ONLY|TCL_APPEND_VALUE); } diff --git a/lang/tcl/patches/patch-ae b/lang/tcl/patches/patch-ae index 5e6f715807b..d3df4172452 100644 --- a/lang/tcl/patches/patch-ae +++ b/lang/tcl/patches/patch-ae @@ -1,8 +1,8 @@ -$NetBSD: patch-ae,v 1.8 2006/01/16 14:47:35 adam Exp $ +$NetBSD: patch-ae,v 1.9 2006/04/27 08:17:09 adam Exp $ ---- unix/configure.in.orig 2005-12-06 17:03:33.000000000 +0100 +--- unix/configure.in.orig 2006-04-20 16:42:21.000000000 +0200 +++ unix/configure.in -@@ -539,7 +539,7 @@ else +@@ -533,7 +533,7 @@ else TCL_LIB_FLAG="-ltcl`echo ${TCL_VERSION} | tr -d .`\${TCL_DBGX}" fi TCL_BUILD_LIB_SPEC="-L`pwd` ${TCL_LIB_FLAG}" @@ -11,7 +11,7 @@ $NetBSD: patch-ae,v 1.8 2006/01/16 14:47:35 adam Exp $ else TCL_BUILD_EXP_FILE="lib.exp" eval "TCL_EXP_FILE=libtcl${TCL_EXPORT_FILE_SUFFIX}" -@@ -570,13 +570,21 @@ VERSION=${TCL_VERSION} +@@ -564,13 +564,21 @@ VERSION=${TCL_VERSION} #-------------------------------------------------------------------- if test "$FRAMEWORK_BUILD" = "1" ; then @@ -19,10 +19,10 @@ $NetBSD: patch-ae,v 1.8 2006/01/16 14:47:35 adam Exp $ + 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" ++ TCL_PACKAGE_PATH_ADD="${libdir} ${prefix}/lib" else - TCL_PACKAGE_PATH="${prefix}/lib" -+ TCL_PACKAGE_PATH_ADD="${prefix}/lib/tcl" ++ TCL_PACKAGE_PATH_ADD="${prefix}/lib" fi +for dir in ${TCL_PACKAGE_PATH_ADD}; do @@ -33,6 +33,6 @@ $NetBSD: patch-ae,v 1.8 2006/01/16 14:47:35 adam Exp $ + fi +done + - # If a system share directory like /usr/local/share already exists, then add - # it to the package search path. - + #-------------------------------------------------------------------- + # 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 c10db69daff..545eabe0a97 100644 --- a/lang/tcl/patches/patch-af +++ b/lang/tcl/patches/patch-af @@ -1,8 +1,8 @@ -$NetBSD: patch-af,v 1.19 2006/02/23 23:30:57 minskim Exp $ +$NetBSD: patch-af,v 1.20 2006/04/27 08:17:09 adam Exp $ ---- unix/tcl.m4.orig 2005-12-06 16:03:34.000000000 +0000 +--- unix/tcl.m4.orig 2006-04-20 16:42:21.000000000 +0200 +++ unix/tcl.m4 -@@ -900,6 +900,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [ +@@ -1032,6 +1032,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.19 2006/02/23 23:30:57 minskim Exp $ LDFLAGS_ORIG="$LDFLAGS" TCL_EXPORT_FILE_SUFFIX="" UNSHARED_LIB_SUFFIX="" -@@ -1126,6 +1127,21 @@ dnl AC_CHECK_TOOL(AR, ar) +@@ -1258,6 +1259,21 @@ dnl AC_CHECK_TOOL(AR, ar) LD_LIBRARY_PATH_VAR="SHLIB_PATH" fi ;; @@ -32,7 +32,7 @@ $NetBSD: patch-af,v 1.19 2006/02/23 23:30:57 minskim Exp $ IRIX-4.*) SHLIB_CFLAGS="-G 0" SHLIB_SUFFIX=".a" -@@ -1147,6 +1163,9 @@ dnl AC_CHECK_TOOL(AR, ar) +@@ -1279,6 +1295,9 @@ dnl AC_CHECK_TOOL(AR, ar) DL_LIBS="" CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}' @@ -42,7 +42,7 @@ $NetBSD: patch-af,v 1.19 2006/02/23 23:30:57 minskim Exp $ ;; IRIX-6.*) SHLIB_CFLAGS="" -@@ -1172,6 +1191,9 @@ dnl AC_CHECK_TOOL(AR, ar) +@@ -1304,6 +1323,9 @@ dnl AC_CHECK_TOOL(AR, ar) esac LDFLAGS="$LDFLAGS -n32" fi @@ -52,7 +52,7 @@ $NetBSD: patch-af,v 1.19 2006/02/23 23:30:57 minskim Exp $ ;; IRIX64-6.*) SHLIB_CFLAGS="" -@@ -1195,6 +1217,9 @@ dnl AC_CHECK_TOOL(AR, ar) +@@ -1327,6 +1349,9 @@ dnl AC_CHECK_TOOL(AR, ar) LDFLAGS="$LDFLAGS -64" fi fi @@ -62,7 +62,7 @@ $NetBSD: patch-af,v 1.19 2006/02/23 23:30:57 minskim Exp $ ;; Linux*) SHLIB_CFLAGS="-fPIC" -@@ -1240,6 +1265,9 @@ dnl AC_CHECK_TOOL(AR, ar) +@@ -1372,6 +1397,9 @@ dnl AC_CHECK_TOOL(AR, ar) # XIM peeking works under XFree86. AC_DEFINE(PEEK_XCLOSEIM) @@ -72,7 +72,7 @@ $NetBSD: patch-af,v 1.19 2006/02/23 23:30:57 minskim Exp $ ;; GNU*) SHLIB_CFLAGS="-fPIC" -@@ -1299,28 +1327,36 @@ dnl AC_CHECK_TOOL(AR, ar) +@@ -1431,23 +1459,26 @@ dnl AC_CHECK_TOOL(AR, ar) LD_SEARCH_FLAGS="" ;; NetBSD-*|FreeBSD-[[1-2]].*) @@ -84,37 +84,24 @@ $NetBSD: patch-af,v 1.19 2006/02/23 23:30:57 minskim Exp $ # NetBSD/SPARC needs -fPIC, -fpic will not do. SHLIB_CFLAGS="-fPIC" - SHLIB_LD="ld -Bshareable -x" -- SHLIB_LD_LIBS="" -+ SHLIB_LD_LIBS='${LIBS}' + SHLIB_LD_LIBS='${LIBS}' SHLIB_SUFFIX=".so" DL_OBJS="tclLoadDl.o" DL_LIBS="" CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' - LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}' - AC_MSG_CHECKING(for ELF) - AC_EGREP_CPP(yes, [ + AC_CACHE_CHECK([for ELF], tcl_cv_ld_elf, [ + AC_EGREP_CPP(yes, [ #ifdef __ELF__ yes #endif -- ], -+ ], [ - AC_MSG_RESULT(yes) - SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so', -+ SHLIB_LD='${TCL_CC} -shared -Wl,-x' -+ LD_SEARCH_FLAGS='-Wl,-R${LIB_RUNTIME_DIR}' -+ TCL_LIB_SPEC_RPATH="-Wl,-R${exec_prefix}/lib" -+ ], [ - AC_MSG_RESULT(no) -+ SHLIB_LD="ld -Bshareable -x" -+ LD_SEARCH_FLAGS='-R${LIB_RUNTIME_DIR}' -+ TCL_LIB_SPEC_RPATH="-R${exec_prefix}/lib" - SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0' -- ) -+ ]) - ], [ - SHLIB_CFLAGS="" - SHLIB_LD="echo tclLdAout $CC \{$SHLIB_CFLAGS\} | `pwd`/tclsh -r" -@@ -1386,7 +1422,7 @@ dnl AC_CHECK_TOOL(AR, ar) + ], tcl_cv_ld_elf=yes, tcl_cv_ld_elf=no)]) ++ SHLIB_LD='${TCL_CC} -shared -Wl,-x' ++ LD_SEARCH_FLAGS='-Wl,-R${LIB_RUNTIME_DIR}' + if test $tcl_cv_ld_elf = yes; then + SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so' + else +@@ -1518,7 +1549,7 @@ dnl AC_CHECK_TOOL(AR, ar) UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' TCL_LIB_VERSIONS_OK=nodots ;; @@ -123,7 +110,7 @@ $NetBSD: patch-af,v 1.19 2006/02/23 23:30:57 minskim Exp $ # FreeBSD 3.* and greater have ELF. SHLIB_CFLAGS="-fPIC" SHLIB_LD="ld -Bshareable -x" -@@ -1736,6 +1772,9 @@ dnl AC_CHECK_TOOL(AR, ar) +@@ -1867,6 +1898,9 @@ dnl AC_CHECK_TOOL(AR, ar) CC_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}' LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}' fi @@ -133,7 +120,7 @@ $NetBSD: patch-af,v 1.19 2006/02/23 23:30:57 minskim Exp $ ;; ULTRIX-4.*) SHLIB_CFLAGS="-G 0" -@@ -1915,8 +1954,8 @@ dnl AC_CHECK_TOOL(AR, ar) +@@ -2045,8 +2079,8 @@ dnl AC_CHECK_TOOL(AR, ar) if test "${SHARED_BUILD}" = "1" && test "${SHLIB_SUFFIX}" != "" ; then LIB_SUFFIX=${SHARED_LIB_SUFFIX} @@ -144,7 +131,7 @@ $NetBSD: patch-af,v 1.19 2006/02/23 23:30:57 minskim Exp $ else LIB_SUFFIX=${UNSHARED_LIB_SUFFIX} -@@ -1946,10 +1985,10 @@ dnl esac +@@ -2076,10 +2110,10 @@ dnl esac # Stub lib does not depend on shared/static configuration if test "$RANLIB" = "" ; then diff --git a/x11/tk/Makefile b/x11/tk/Makefile index cfe58ff0313..d70dee857e7 100644 --- a/x11/tk/Makefile +++ b/x11/tk/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.55 2006/02/23 23:31:51 minskim Exp $ +# $NetBSD: Makefile,v 1.56 2006/04/27 08:18:09 adam Exp $ DISTNAME= tk${TK_VERSION}-src PKGNAME= tk-${TK_VERSION} -PKGREVISION= 2 CATEGORIES= x11 lang MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tcl/} diff --git a/x11/tk/Makefile.version b/x11/tk/Makefile.version index e58e64d12f6..bd5f7aa6613 100644 --- a/x11/tk/Makefile.version +++ b/x11/tk/Makefile.version @@ -1,3 +1,3 @@ -# $NetBSD: Makefile.version,v 1.3 2006/01/16 14:48:34 adam Exp $ +# $NetBSD: Makefile.version,v 1.4 2006/04/27 08:18:09 adam Exp $ -TK_VERSION= 8.4.12 +TK_VERSION= 8.4.13 diff --git a/x11/tk/PLIST b/x11/tk/PLIST index 1e98b51f3c6..1442645881f 100644 --- a/x11/tk/PLIST +++ b/x11/tk/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.7 2005/07/19 11:12:25 adam Exp $ +@comment $NetBSD: PLIST,v 1.8 2006/04/27 08:18:09 adam Exp $ bin/wish bin/wish8.4 include/tk.h @@ -136,6 +136,7 @@ lib/tk8.4/msgs/fr.msg lib/tk8.4/msgs/it.msg lib/tk8.4/msgs/nl.msg lib/tk8.4/msgs/pl.msg +lib/tk8.4/msgs/pt.msg lib/tk8.4/msgs/ru.msg lib/tk8.4/obsolete.tcl lib/tk8.4/optMenu.tcl diff --git a/x11/tk/buildlink3.mk b/x11/tk/buildlink3.mk index adbc3c6d40e..3c3b258bc2f 100644 --- a/x11/tk/buildlink3.mk +++ b/x11/tk/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.17 2006/04/06 06:23:03 reed Exp $ +# $NetBSD: buildlink3.mk,v 1.18 2006/04/27 08:18:09 adam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ TK_BUILDLINK3_MK:= ${TK_BUILDLINK3_MK}+ @@ -11,11 +11,11 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ntk} BUILDLINK_PACKAGES+= tk .if !empty(TK_BUILDLINK3_MK:M+) -BUILDLINK_API_DEPENDS.tk+= tk>=8.4.6nb1 +BUILDLINK_API_DEPENDS.tk+= tk>=8.4.6nb1 BUILDLINK_ABI_DEPENDS.tk+= tk>=8.4.12nb1 BUILDLINK_PKGSRCDIR.tk?= ../../x11/tk -BUILDLINK_FILES.tk= bin/wish* +BUILDLINK_FILES.tk+= bin/wish* # # Make "-ltk" and "-ltk8.4" resolve into "-ltk84", so that we don't # need to patch so many Makefiles. diff --git a/x11/tk/distinfo b/x11/tk/distinfo index e982ffbf8df..b0cf69347c4 100644 --- a/x11/tk/distinfo +++ b/x11/tk/distinfo @@ -1,10 +1,9 @@ -$NetBSD: distinfo,v 1.27 2006/02/23 23:31:51 minskim Exp $ +$NetBSD: distinfo,v 1.28 2006/04/27 08:18:09 adam Exp $ -SHA1 (tk8.4.12-src.tar.gz) = 05e8a82fc4ab9f825b8e7b8cbc917ea9ba31ed5d -RMD160 (tk8.4.12-src.tar.gz) = b50e4da0bc3914e6339fc537761d550ddcf22330 -Size (tk8.4.12-src.tar.gz) = 3245547 bytes +SHA1 (tk8.4.13-src.tar.gz) = 64d8b3e9e4a9d6408892cb5cb287b5502e56e381 +RMD160 (tk8.4.13-src.tar.gz) = a64f3672dd64024df8eb4fc8d54de23a4a764199 +Size (tk8.4.13-src.tar.gz) = 3253070 bytes SHA1 (patch-aa) = cdb66101f4b87cb2c967f2777f8e7af9c82079cd -SHA1 (patch-ab) = 96207d41dc0825eafc8fc70a501621e49f960f66 -SHA1 (patch-ac) = 48aec4bbe8e3d5d670f5951055f7fb2d112bac36 -SHA1 (patch-ad) = f6ea4c2fde0a916f252c30bbc2117a4af8a9f442 -SHA1 (patch-ae) = 2815cb827ee15cbdd979d4866b8a3bcdf453cc54 +SHA1 (patch-ab) = 161b15fc8743ca638befe0854b5866e0b4e3dfd0 +SHA1 (patch-ac) = 5a51c371dc819908eb20dae9ececd2bee3ed52ec +SHA1 (patch-ad) = 811bd167aed3bab7e97aa2efcf7e3f24483230a0 diff --git a/x11/tk/patches/patch-ab b/x11/tk/patches/patch-ab index e9288086509..dfa1fa8f654 100644 --- a/x11/tk/patches/patch-ab +++ b/x11/tk/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.24 2006/02/23 23:31:52 minskim Exp $ +$NetBSD: patch-ab,v 1.25 2006/04/27 08:18:09 adam Exp $ ---- unix/configure.orig 2005-12-06 02:42:37.000000000 +0000 +--- unix/configure.orig 2006-04-19 14:29:37.000000000 +0200 +++ unix/configure -@@ -2007,12 +2007,13 @@ fi +@@ -2054,12 +2054,13 @@ fi # Step 3: set configuration options based on system name and version. do64bit_ok=no @@ -17,43 +17,25 @@ $NetBSD: patch-ab,v 1.24 2006/02/23 23:31:52 minskim Exp $ CFLAGS_DEBUG=-g CFLAGS_OPTIMIZE=-O if test "$GCC" = "yes" ; then -@@ -2699,8 +2700,7 @@ if eval "test \"`echo '$ac_cv_header_'$a +@@ -2746,7 +2747,6 @@ if eval "test \"`echo '$ac_cv_header_'$a # NetBSD/SPARC needs -fPIC, -fpic will not do. SHLIB_CFLAGS="-fPIC" - SHLIB_LD="ld -Bshareable -x" -- SHLIB_LD_LIBS="" -+ SHLIB_LD_LIBS='${LIBS}' + SHLIB_LD_LIBS='${LIBS}' SHLIB_SUFFIX=".so" DL_OBJS="tclLoadDl.o" - DL_LIBS="" -@@ -2720,13 +2720,23 @@ EOF - if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "yes" >/dev/null 2>&1; then - rm -rf conftest* -- echo "$ac_t""yes" 1>&6 -+ -+ echo "$ac_t""yes" 1>&6 -+ SHLIB_LD='${TCL_CC} -shared -Wl,-x' -+ RPATH_FLAG='-Wl,-R' -+ LD_SEARCH_FLAGS='-Wl,-R${LIB_RUNTIME_DIR}' - SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so' -+ - else - rm -rf conftest* -- echo "$ac_t""no" 1>&6 -+ -+ echo "$ac_t""no" 1>&6 -+ SHLIB_LD="ld -Bshareable -x" -+ RPATH_FLAG='-R' -+ LD_SEARCH_FLAGS='-R${LIB_RUNTIME_DIR}' - SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0' - -+ +@@ -2781,6 +2781,9 @@ rm -f conftest* fi - rm -f conftest* -@@ -2813,12 +2823,13 @@ rm -f conftest* + echo "$ac_t""$tcl_cv_ld_elf" 1>&6 ++ SHLIB_LD='${TCL_CC} -shared -Wl,-x' ++ RPATH_FLAG='-Wl,-R' ++ LD_SEARCH_FLAGS='-Wl,-R${LIB_RUNTIME_DIR}' + if test $tcl_cv_ld_elf = yes; then + SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so' + else +@@ -2878,12 +2881,13 @@ echo "$ac_t""$tcl_cv_ld_elf" 1>&6 UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' TCL_LIB_VERSIONS_OK=nodots ;; @@ -68,7 +50,7 @@ $NetBSD: patch-ab,v 1.24 2006/02/23 23:31:52 minskim Exp $ DL_OBJS="tclLoadDl.o" DL_LIBS="" LDFLAGS="$LDFLAGS -export-dynamic" -@@ -3748,7 +3759,7 @@ fi +@@ -3837,7 +3841,7 @@ fi ;; IRIX*) ;; @@ -77,7 +59,7 @@ $NetBSD: patch-ab,v 1.24 2006/02/23 23:31:52 minskim Exp $ ;; Darwin-*) ;; -@@ -3766,16 +3777,16 @@ fi +@@ -3855,16 +3859,16 @@ fi fi if test "$SHARED_LIB_SUFFIX" = "" ; then @@ -98,7 +80,7 @@ $NetBSD: patch-ab,v 1.24 2006/02/23 23:31:52 minskim Exp $ else LIB_SUFFIX=${UNSHARED_LIB_SUFFIX} -@@ -5313,7 +5324,11 @@ echo "configure:5311: checking for X11 l +@@ -5405,7 +5409,11 @@ echo "configure:5403: 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 @@ -111,7 +93,7 @@ $NetBSD: patch-ab,v 1.24 2006/02/23 23:31:52 minskim Exp $ x_libraries="$i" break fi -@@ -5322,7 +5337,11 @@ echo "configure:5311: checking for X11 l +@@ -5414,7 +5422,11 @@ echo "configure:5403: checking for X11 l if test "$x_libraries" = ""; then XLIBSW=-lX11 else @@ -124,7 +106,7 @@ $NetBSD: patch-ab,v 1.24 2006/02/23 23:31:52 minskim Exp $ fi fi if test "$XLIBSW" = nope ; then -@@ -5394,6 +5413,10 @@ if test "x${x_libraries}" != "x"; then +@@ -5486,6 +5498,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'` @@ -135,7 +117,7 @@ $NetBSD: patch-ab,v 1.24 2006/02/23 23:31:52 minskim Exp $ fi # The statement below is very tricky! It actually *evaluates* the -@@ -5927,11 +5950,18 @@ else +@@ -6019,11 +6035,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 fd91bb1f618..e92b1d6a00f 100644 --- a/x11/tk/patches/patch-ac +++ b/x11/tk/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.14 2006/02/23 23:31:52 minskim Exp $ +$NetBSD: patch-ac,v 1.15 2006/04/27 08:18:09 adam Exp $ ---- unix/tcl.m4.orig 2005-12-06 02:42:37.000000000 +0000 +--- unix/tcl.m4.orig 2006-04-19 14:29:38.000000000 +0200 +++ unix/tcl.m4 -@@ -900,6 +900,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [ +@@ -1032,6 +1032,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-ac,v 1.14 2006/02/23 23:31:52 minskim Exp $ LDFLAGS_ORIG="$LDFLAGS" TCL_EXPORT_FILE_SUFFIX="" UNSHARED_LIB_SUFFIX="" -@@ -1147,6 +1148,9 @@ dnl AC_CHECK_TOOL(AR, ar) +@@ -1279,6 +1280,9 @@ dnl AC_CHECK_TOOL(AR, ar) DL_LIBS="" CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}' @@ -20,7 +20,7 @@ $NetBSD: patch-ac,v 1.14 2006/02/23 23:31:52 minskim Exp $ ;; IRIX-6.*) SHLIB_CFLAGS="" -@@ -1172,6 +1176,9 @@ dnl AC_CHECK_TOOL(AR, ar) +@@ -1304,6 +1308,9 @@ dnl AC_CHECK_TOOL(AR, ar) esac LDFLAGS="$LDFLAGS -n32" fi @@ -30,7 +30,7 @@ $NetBSD: patch-ac,v 1.14 2006/02/23 23:31:52 minskim Exp $ ;; IRIX64-6.*) SHLIB_CFLAGS="" -@@ -1195,6 +1202,9 @@ dnl AC_CHECK_TOOL(AR, ar) +@@ -1327,6 +1334,9 @@ dnl AC_CHECK_TOOL(AR, ar) LDFLAGS="$LDFLAGS -64" fi fi @@ -40,7 +40,7 @@ $NetBSD: patch-ac,v 1.14 2006/02/23 23:31:52 minskim Exp $ ;; Linux*) SHLIB_CFLAGS="-fPIC" -@@ -1240,6 +1250,9 @@ dnl AC_CHECK_TOOL(AR, ar) +@@ -1372,6 +1382,9 @@ dnl AC_CHECK_TOOL(AR, ar) # XIM peeking works under XFree86. AC_DEFINE(PEEK_XCLOSEIM) @@ -50,7 +50,7 @@ $NetBSD: patch-ac,v 1.14 2006/02/23 23:31:52 minskim Exp $ ;; GNU*) SHLIB_CFLAGS="-fPIC" -@@ -1299,28 +1312,36 @@ dnl AC_CHECK_TOOL(AR, ar) +@@ -1431,23 +1444,27 @@ dnl AC_CHECK_TOOL(AR, ar) LD_SEARCH_FLAGS="" ;; NetBSD-*|FreeBSD-[[1-2]].*) @@ -62,37 +62,25 @@ $NetBSD: patch-ac,v 1.14 2006/02/23 23:31:52 minskim Exp $ # NetBSD/SPARC needs -fPIC, -fpic will not do. SHLIB_CFLAGS="-fPIC" - SHLIB_LD="ld -Bshareable -x" -- SHLIB_LD_LIBS="" -+ SHLIB_LD_LIBS='${LIBS}' + SHLIB_LD_LIBS='${LIBS}' SHLIB_SUFFIX=".so" DL_OBJS="tclLoadDl.o" DL_LIBS="" CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' - LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}' - AC_MSG_CHECKING(for ELF) - AC_EGREP_CPP(yes, [ + AC_CACHE_CHECK([for ELF], tcl_cv_ld_elf, [ + AC_EGREP_CPP(yes, [ #ifdef __ELF__ yes #endif -- ], -+ ], [ - AC_MSG_RESULT(yes) - SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so', -+ SHLIB_LD='${TCL_CC} -shared -Wl,-x' -+ LD_SEARCH_FLAGS='-Wl,-R${LIB_RUNTIME_DIR}' -+ TCL_LIB_SPEC_RPATH="-Wl,-R${exec_prefix}/lib" -+ ], [ - AC_MSG_RESULT(no) -+ SHLIB_LD="ld -Bshareable -x" -+ LD_SEARCH_FLAGS='-R${LIB_RUNTIME_DIR}' -+ TCL_LIB_SPEC_RPATH="-R${exec_prefix}/lib" - SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0' -- ) -+ ]) - ], [ - SHLIB_CFLAGS="" - SHLIB_LD="echo tclLdAout $CC \{$SHLIB_CFLAGS\} | `pwd`/tclsh -r" -@@ -1736,6 +1757,9 @@ dnl AC_CHECK_TOOL(AR, ar) + ], tcl_cv_ld_elf=yes, tcl_cv_ld_elf=no)]) ++ SHLIB_LD='${TCL_CC} -shared -Wl,-x' ++ LD_SEARCH_FLAGS='-Wl,-R${LIB_RUNTIME_DIR}' ++ TCL_LIB_SPEC_RPATH="-Wl,-R${exec_prefix}/lib" + if test $tcl_cv_ld_elf = yes; then + SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so' + else +@@ -1867,6 +1884,9 @@ dnl AC_CHECK_TOOL(AR, ar) CC_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}' LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}' fi @@ -102,7 +90,7 @@ $NetBSD: patch-ac,v 1.14 2006/02/23 23:31:52 minskim Exp $ ;; ULTRIX-4.*) SHLIB_CFLAGS="-G 0" -@@ -1915,8 +1939,8 @@ dnl AC_CHECK_TOOL(AR, ar) +@@ -2045,8 +2065,8 @@ dnl AC_CHECK_TOOL(AR, ar) if test "${SHARED_BUILD}" = "1" && test "${SHLIB_SUFFIX}" != "" ; then LIB_SUFFIX=${SHARED_LIB_SUFFIX} @@ -113,7 +101,7 @@ $NetBSD: patch-ac,v 1.14 2006/02/23 23:31:52 minskim Exp $ else LIB_SUFFIX=${UNSHARED_LIB_SUFFIX} -@@ -1946,10 +1970,10 @@ dnl esac +@@ -2076,10 +2096,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 8f26a624919..b56ac2b5b64 100644 --- a/x11/tk/patches/patch-ad +++ b/x11/tk/patches/patch-ad @@ -1,8 +1,8 @@ -$NetBSD: patch-ad,v 1.8 2006/01/16 14:48:35 adam Exp $ +$NetBSD: patch-ad,v 1.9 2006/04/27 08:18:09 adam Exp $ ---- unix/configure.in.orig 2005-12-06 03:42:37.000000000 +0100 +--- unix/configure.in.orig 2006-04-19 14:29:37.000000000 +0200 +++ unix/configure.in -@@ -301,6 +301,10 @@ if test "x${x_libraries}" != "x"; then +@@ -296,6 +296,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'` @@ -13,7 +13,7 @@ $NetBSD: patch-ad,v 1.8 2006/01/16 14:48:35 adam Exp $ fi # The statement below is very tricky! It actually *evaluates* the -@@ -475,11 +479,18 @@ else +@@ -470,11 +474,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-ae b/x11/tk/patches/patch-ae deleted file mode 100644 index 6cb13675d7e..00000000000 --- a/x11/tk/patches/patch-ae +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-ae,v 1.2 2005/11/03 23:09:24 rillig Exp $ - ---- unix/tkUnixPort.h.orig 2005-07-30 21:02:48.000000000 +0000 -+++ unix/tkUnixPort.h -@@ -119,12 +119,7 @@ - #endif - #define MASK_SIZE howmany(FD_SETSIZE, NFDBITS) - --/* -- * Not all systems declare the errno variable in errno.h. so this -- * file does it explicitly. -- */ -- --extern int errno; -+#include <errno.h> - - /* - * Define "NBBY" (number of bits per byte) if it's not already defined. |