diff options
-rw-r--r-- | lang/tcl/Makefile.version | 4 | ||||
-rw-r--r-- | lang/tcl/PLIST | 3 | ||||
-rw-r--r-- | lang/tcl/distinfo | 18 | ||||
-rw-r--r-- | lang/tcl/patches/patch-aa | 26 | ||||
-rw-r--r-- | lang/tcl/patches/patch-ab | 53 | ||||
-rw-r--r-- | lang/tcl/patches/patch-ac | 10 | ||||
-rw-r--r-- | lang/tcl/patches/patch-ae | 39 | ||||
-rw-r--r-- | lang/tcl/patches/patch-af | 28 | ||||
-rw-r--r-- | x11/tk/Makefile | 6 | ||||
-rw-r--r-- | x11/tk/PLIST | 3 | ||||
-rw-r--r-- | x11/tk/distinfo | 16 | ||||
-rw-r--r-- | x11/tk/patches/patch-aa | 48 | ||||
-rw-r--r-- | x11/tk/patches/patch-ab | 60 | ||||
-rw-r--r-- | x11/tk/patches/patch-ac | 26 | ||||
-rw-r--r-- | x11/tk/patches/patch-ad | 44 |
15 files changed, 194 insertions, 190 deletions
diff --git a/lang/tcl/Makefile.version b/lang/tcl/Makefile.version index 00191052f17..90e7e3efa24 100644 --- a/lang/tcl/Makefile.version +++ b/lang/tcl/Makefile.version @@ -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 --git a/lang/tcl/PLIST b/lang/tcl/PLIST index 1d3d11c464f..14fd73464f3 100644 --- a/lang/tcl/PLIST +++ b/lang/tcl/PLIST @@ -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_ChannelName.3 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 --git a/lang/tcl/distinfo b/lang/tcl/distinfo index 9ab1dc519a4..8c5dec05e4e 100644 --- a/lang/tcl/distinfo +++ b/lang/tcl/distinfo @@ -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 --git a/lang/tcl/patches/patch-aa b/lang/tcl/patches/patch-aa index 73cd053e4b3..35411b685f0 100644 --- a/lang/tcl/patches/patch-aa +++ b/lang/tcl/patches/patch-aa @@ -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 @@ $NetBSD: patch-aa,v 1.14 2005/02/21 23:58:35 adam Exp $ 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 @@ $NetBSD: patch-aa,v 1.14 2005/02/21 23:58:35 adam Exp $ #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 @@ $NetBSD: patch-aa,v 1.14 2005/02/21 23:58:35 adam Exp $ # 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 @@ $NetBSD: patch-aa,v 1.14 2005/02/21 23:58:35 adam Exp $ 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 @@ $NetBSD: patch-aa,v 1.14 2005/02/21 23:58:35 adam Exp $ rm -f $@ @MAKE_LIB@ -@@ -475,8 +477,8 @@ tclLibObjs: +@@ -489,8 +491,8 @@ tclLibObjs: objs: ${OBJS} @@ -70,7 +70,7 @@ $NetBSD: patch-aa,v 1.14 2005/02/21 23:58:35 adam Exp $ ${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 @@ $NetBSD: patch-aa,v 1.14 2005/02/21 23:58:35 adam Exp $ ${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 --git a/lang/tcl/patches/patch-ab b/lang/tcl/patches/patch-ab index cdf8e094199..cbede9f61f1 100644 --- a/lang/tcl/patches/patch-ab +++ b/lang/tcl/patches/patch-ab @@ -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 @@ $NetBSD: patch-ab,v 1.29 2005/01/24 22:10:44 tv Exp $ 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 @@ $NetBSD: patch-ab,v 1.29 2005/01/24 22:10:44 tv Exp $ 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 @@ $NetBSD: patch-ab,v 1.29 2005/01/24 22:10:44 tv 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 -@@ -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 @@ $NetBSD: patch-ab,v 1.29 2005/01/24 22:10:44 tv 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: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 @@ $NetBSD: patch-ab,v 1.29 2005/01/24 22:10:44 tv Exp $ 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 @@ $NetBSD: patch-ab,v 1.29 2005/01/24 22:10:44 tv Exp $ 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 @@ $NetBSD: patch-ab,v 1.29 2005/01/24 22:10:44 tv Exp $ - 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 --git a/lang/tcl/patches/patch-ac b/lang/tcl/patches/patch-ac index 3f5b155447f..2b4dce10fb0 100644 --- a/lang/tcl/patches/patch-ac +++ b/lang/tcl/patches/patch-ac @@ -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 @@ $NetBSD: patch-ac,v 1.5 2004/10/01 13:35:37 adam Exp $ /* * 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 @@ $NetBSD: patch-ac,v 1.5 2004/10/01 13:35:37 adam Exp $ + 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); } diff --git a/lang/tcl/patches/patch-ae b/lang/tcl/patches/patch-ae index 15648dc4dd0..793bc72e068 100644 --- a/lang/tcl/patches/patch-ae +++ b/lang/tcl/patches/patch-ae @@ -1,37 +1,38 @@ -$NetBSD: patch-ae,v 1.6 2004/11/26 10:30:01 adam Exp $ +$NetBSD: patch-ae,v 1.7 2005/07/19 11:11:58 adam Exp $ ---- configure.in.orig 2004-11-19 18:49:51.000000000 +0000 +--- configure.in.orig 2005-06-29 16:40:33.000000000 +0000 +++ configure.in -@@ -479,7 +479,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}" -@@ -509,13 +509,19 @@ VERSION=${TCL_VERSION} +@@ -520,7 +520,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}" +@@ -551,13 +551,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" ++ TCL_PACKAGE_PATH="${libdir}/tcl ${prefix}/lib" else - TCL_PACKAGE_PATH="${prefix}/lib" -+ TCL_PACKAGE_PATH_ADD="${prefix}/lib/tcl" ++ TCL_PACKAGE_PATH="${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 --git a/lang/tcl/patches/patch-af b/lang/tcl/patches/patch-af index 1c48b67273e..3332a14c301 100644 --- a/lang/tcl/patches/patch-af +++ b/lang/tcl/patches/patch-af @@ -1,8 +1,8 @@ -$NetBSD: patch-af,v 1.15 2005/01/24 22:10:44 tv Exp $ +$NetBSD: patch-af,v 1.16 2005/07/19 11:11:58 adam Exp $ ---- tcl.m4.orig 2004-12-06 19:23:45.000000000 -0500 +--- tcl.m4.orig 2005-06-29 16:40:33.000000000 +0000 +++ tcl.m4 -@@ -865,6 +865,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [ +@@ -866,6 +866,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.15 2005/01/24 22:10:44 tv Exp $ LDFLAGS_ORIG="$LDFLAGS" TCL_EXPORT_FILE_SUFFIX="" UNSHARED_LIB_SUFFIX="" -@@ -1118,6 +1119,21 @@ dnl AC_CHECK_TOOL(AR, ar) +@@ -1087,6 +1088,21 @@ dnl AC_CHECK_TOOL(AR, ar) LD_LIBRARY_PATH_VAR="SHLIB_PATH" fi ;; @@ -32,7 +32,7 @@ $NetBSD: patch-af,v 1.15 2005/01/24 22:10:44 tv Exp $ IRIX-4.*) SHLIB_CFLAGS="-G 0" SHLIB_SUFFIX=".a" -@@ -1139,6 +1155,9 @@ dnl AC_CHECK_TOOL(AR, ar) +@@ -1108,6 +1124,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.15 2005/01/24 22:10:44 tv Exp $ ;; IRIX-6.*) SHLIB_CFLAGS="" -@@ -1164,6 +1183,9 @@ dnl AC_CHECK_TOOL(AR, ar) +@@ -1133,6 +1152,9 @@ dnl AC_CHECK_TOOL(AR, ar) esac LDFLAGS="$LDFLAGS -n32" fi @@ -52,7 +52,7 @@ $NetBSD: patch-af,v 1.15 2005/01/24 22:10:44 tv Exp $ ;; IRIX64-6.*) SHLIB_CFLAGS="" -@@ -1187,6 +1209,9 @@ dnl AC_CHECK_TOOL(AR, ar) +@@ -1156,6 +1178,9 @@ dnl AC_CHECK_TOOL(AR, ar) LDFLAGS="$LDFLAGS -64" fi fi @@ -62,7 +62,7 @@ $NetBSD: patch-af,v 1.15 2005/01/24 22:10:44 tv Exp $ ;; Linux*) SHLIB_CFLAGS="-fPIC" -@@ -1232,6 +1257,9 @@ dnl AC_CHECK_TOOL(AR, ar) +@@ -1201,6 +1226,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.15 2005/01/24 22:10:44 tv Exp $ ;; GNU*) SHLIB_CFLAGS="-fPIC" -@@ -1279,28 +1307,36 @@ dnl AC_CHECK_TOOL(AR, ar) +@@ -1248,28 +1276,36 @@ dnl AC_CHECK_TOOL(AR, ar) LD_SEARCH_FLAGS="" ;; NetBSD-*|FreeBSD-[[1-2]].*) @@ -113,7 +113,7 @@ $NetBSD: patch-af,v 1.15 2005/01/24 22:10:44 tv Exp $ ], [ SHLIB_CFLAGS="" SHLIB_LD="echo tclLdAout $CC \{$SHLIB_CFLAGS\} | `pwd`/tclsh -r" -@@ -1609,6 +1645,9 @@ dnl AC_CHECK_TOOL(AR, ar) +@@ -1668,6 +1704,9 @@ dnl AC_CHECK_TOOL(AR, ar) CC_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}' LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}' fi @@ -123,18 +123,18 @@ $NetBSD: patch-af,v 1.15 2005/01/24 22:10:44 tv Exp $ ;; ULTRIX-4.*) SHLIB_CFLAGS="-G 0" -@@ -1788,8 +1827,8 @@ dnl AC_CHECK_TOOL(AR, ar) +@@ -1847,8 +1886,8 @@ dnl AC_CHECK_TOOL(AR, ar) 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 ${@:C/\.so.*/.la/} ${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 ${@:C/\.so.*/.la/} ${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) $(LIB_FILE:C/\.so.*/.la/) $(LIB_INSTALL_DIR)/$(LIB_FILE)' else LIB_SUFFIX=${UNSHARED_LIB_SUFFIX} -@@ -1819,10 +1858,10 @@ dnl esac +@@ -1878,10 +1917,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 28dd8f77ca4..562fb10af56 100644 --- a/x11/tk/Makefile +++ b/x11/tk/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.46 2005/06/01 18:03:31 jlam Exp $ +# $NetBSD: Makefile,v 1.47 2005/07/19 11:12:24 adam Exp $ -DISTNAME= tk8.4.9-src -PKGNAME= tk-8.4.9 +DISTNAME= tk8.4.11-src +PKGNAME= tk-8.4.11 CATEGORIES= x11 lang MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tcl/} diff --git a/x11/tk/PLIST b/x11/tk/PLIST index 2d8e8ab04aa..1e98b51f3c6 100644 --- a/x11/tk/PLIST +++ b/x11/tk/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.6 2004/11/26 10:31:08 adam Exp $ +@comment $NetBSD: PLIST,v 1.7 2005/07/19 11:12:25 adam Exp $ bin/wish bin/wish8.4 include/tk.h @@ -131,6 +131,7 @@ lib/tk8.4/msgs/en.msg lib/tk8.4/msgs/en_gb.msg lib/tk8.4/msgs/eo.msg lib/tk8.4/msgs/es.msg +lib/tk8.4/msgs/es_ES.msg lib/tk8.4/msgs/fr.msg lib/tk8.4/msgs/it.msg lib/tk8.4/msgs/nl.msg diff --git a/x11/tk/distinfo b/x11/tk/distinfo index 39affe4899c..8c6753c9004 100644 --- a/x11/tk/distinfo +++ b/x11/tk/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.21 2005/02/23 17:36:20 wiz Exp $ +$NetBSD: distinfo,v 1.22 2005/07/19 11:12:25 adam Exp $ -SHA1 (tk8.4.9-src.tar.gz) = 3d677d4327f035ddd43992c134f47b6f927cb14a -RMD160 (tk8.4.9-src.tar.gz) = a9a2609d65094b2b6c5dabc702a6471f8d5eaa63 -Size (tk8.4.9-src.tar.gz) = 3266500 bytes -SHA1 (patch-aa) = b1589a581bfdcee033306307c0d2b3488d978f63 -SHA1 (patch-ab) = c204afea18379273e97a14708d92635a0b7c3220 -SHA1 (patch-ac) = d0373617f76f6e62ecf80d7290fb4ae8388521bf -SHA1 (patch-ad) = 24a677844b702f82b57af88ecc6659c858f87130 +SHA1 (tk8.4.11-src.tar.gz) = c05dec9163e6f75787aa2825122d424fc1a1edb6 +RMD160 (tk8.4.11-src.tar.gz) = 71b42c0f0ae5067c23d61a2d852a53fb3c546e2f +Size (tk8.4.11-src.tar.gz) = 3236334 bytes +SHA1 (patch-aa) = 5ddd25d23d4749acd251f7e06dde18bdf207da8f +SHA1 (patch-ab) = 3f085c38c5169a81930571436a8ac1848435205f +SHA1 (patch-ac) = 5dc59a8e26c114a847c511defc7a3d7cc77655e8 +SHA1 (patch-ad) = 51ba301ed6786791f0ef9ece73c4496231f1c031 diff --git a/x11/tk/patches/patch-aa b/x11/tk/patches/patch-aa index 40f5461656c..f644a03c1c5 100644 --- a/x11/tk/patches/patch-aa +++ b/x11/tk/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.14 2005/02/22 10:22:05 adam Exp $ +$NetBSD: patch-aa,v 1.15 2005/07/19 11:12:25 adam Exp $ ---- Makefile.in.orig 2004-11-19 18:50:17.000000000 +0000 +--- Makefile.in.orig 2005-06-29 16:43:10.000000000 +0000 +++ Makefile.in -@@ -80,7 +80,7 @@ MANN_INSTALL_DIR = $(MAN_INSTALL_DIR)/ma +@@ -93,7 +93,7 @@ HTML_INSTALL_DIR = $(INSTALL_ROOT)$(HTML # The directory containing the Tcl sources and headers appropriate # for this version of Tk ("srcdir" will be replaced or has already # been replaced by the configure script): @@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.14 2005/02/22 10:22:05 adam Exp $ # The directory containing the Tcl library archive file appropriate # for this version of Tk: -@@ -176,8 +176,8 @@ SHELL = /bin/sh +@@ -194,8 +194,8 @@ SHELL = /bin/sh INSTALL_STRIP_PROGRAM = -s INSTALL_STRIP_LIBRARY = -S -S @@ -22,7 +22,7 @@ $NetBSD: patch-aa,v 1.14 2005/02/22 10:22:05 adam Exp $ INSTALL_LIBRARY = ${INSTALL} INSTALL_DATA = ${INSTALL} -m 644 -@@ -208,6 +208,7 @@ TK_STUB_LIB_FLAG = @TK_STUB_LIB_FLAG@ +@@ -225,6 +225,7 @@ TK_STUB_LIB_FLAG = @TK_STUB_LIB_FLAG@ #TK_STUB_LIB_FLAG = -ltkstub TK_LIB_FILE = @TK_LIB_FILE@ @@ -30,18 +30,18 @@ $NetBSD: patch-aa,v 1.14 2005/02/22 10:22:05 adam Exp $ #TK_LIB_FILE = libtk.a # Generic lib name used in rules that apply to tcl and tk -@@ -234,7 +235,7 @@ WISH_LIBS = $(TCL_LIB_SPEC) @LIBS@ $(X11 - # The values of the symbolis normally set by the configure script. +@@ -254,7 +255,7 @@ WISH_LIBS = $(TCL_LIB_SPEC) @LIBS@ $(X11 + # these definitions by hand. STLIB_LD = @STLIB_LD@ -SHLIB_LD = @SHLIB_LD@ +SHLIB_LD = ${LIBTOOL} --mode=link @CC@ -rpath ${PREFIX}/lib - SHLIB_LD_FLAGS = @SHLIB_LD_FLAGS@ SHLIB_LD_LIBS = @SHLIB_LD_LIBS@ TK_SHLIB_LD_EXTRAS = @TK_SHLIB_LD_EXTRAS@ -@@ -274,7 +275,8 @@ TOOL_DIR = @TCL_SRC_DIR@/tools + +@@ -301,7 +302,8 @@ XLIB_DIR = $(TOP_DIR)/xlib # should be compressed and linked with softlinks - MAN_FLAGS = @MAN_FLAGS@ + MAN_FLAGS = @MAN_FLAGS@ -CC = @CC@ +CC = ${LIBTOOL} --mode=compile @CC@ @@ -49,7 +49,7 @@ $NetBSD: patch-aa,v 1.14 2005/02/22 10:22:05 adam Exp $ CC_SWITCHES_NO_STUBS = ${CFLAGS} ${CFLAGS_WARNING} ${SHLIB_CFLAGS} \ -I${UNIX_DIR} -I${GENERIC_DIR} \ -@@ -390,7 +392,7 @@ DEMOPROGS = browse hello ixset rmt rolod +@@ -471,7 +473,7 @@ DEMOPROGS = browse hello ixset rmt rolod all: binaries libraries doc @@ -58,36 +58,36 @@ $NetBSD: patch-aa,v 1.14 2005/02/22 10:22:05 adam Exp $ libraries: -@@ -402,7 +404,7 @@ doc: $(SRC_DIR)/doc/man.macros +@@ -483,7 +485,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. --${LIB_FILE}: ${OBJS} -+${TK_LA_FILE}: ${OBJS} +-${LIB_FILE}: ${OBJS} ${STUB_LIB_FILE} @LIB_RSRC_FILE@ ++${TK_LA_FILE}: ${OBJS} ${STUB_LIB_FILE} @LIB_RSRC_FILE@ rm -f $@ @MAKE_LIB@ -@@ -421,8 +423,8 @@ tkLibObjs: +@@ -512,8 +514,8 @@ tkLibObjs: objs: ${OBJS} --wish: $(WISH_OBJS) $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) +-wish: $(WISH_OBJS) $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) @APP_RSRC_FILE@ - $(CC) $(LDFLAGS) $(WISH_OBJS) \ -+wish: $(WISH_OBJS) $(TK_LA_FILE) $(TK_STUB_LIB_FILE) ++wish: $(WISH_OBJS) $(TK_LA_FILE) $(TK_STUB_LIB_FILE) @APP_RSRC_FILE@ + $(LD) $(LDFLAGS) $(WISH_OBJS) \ @TK_BUILD_LIB_SPEC@ \ $(WISH_LIBS) $(CC_SEARCH_FLAGS) -o wish -@@ -436,7 +438,7 @@ tktest: $(TKTEST_OBJS) $(TK_LIB_FILE) +@@ -527,7 +529,7 @@ tktest: $(TKTEST_OBJS) $(TK_LIB_FILE) $(MAKE) tktest-real LIB_RUNTIME_DIR=`pwd`:$(TCL_BIN_DIR) tktest-real: -- ${CC} $(LDFLAGS) $(TKTEST_OBJS) \ -+ ${LD} $(LDFLAGS) $(TKTEST_OBJS) \ - @TK_BUILD_LIB_SPEC@ \ +- ${CC} $(LDFLAGS) $(TKTEST_OBJS) @TK_BUILD_LIB_SPEC@ \ ++ ${LD} $(LDFLAGS) $(TKTEST_OBJS) @TK_BUILD_LIB_SPEC@ \ $(WISH_LIBS) $(CC_SEARCH_FLAGS) -o tktest -@@ -445,7 +447,7 @@ tktest-real: + # FIXME: This xttest rule seems to be broken in a number of ways. +@@ -535,7 +537,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.14 2005/02/22 10:22:05 adam Exp $ @TK_BUILD_LIB_SPEC@ \ $(WISH_LIBS) $(LD_SEARCH_FLAGS) -lXt -o xttest -@@ -513,7 +515,7 @@ install-strip: +@@ -605,7 +607,7 @@ install-strip: # some ranlibs write to current directory, and this might not always be # possible (e.g. if installing as root). @@ -104,4 +104,4 @@ $NetBSD: patch-aa,v 1.14 2005/02/22 10:22:05 adam Exp $ +install-binaries: $(TK_LA_FILE) $(TK_STUB_LIB_FILE) $(TK_BUILD_EXP_FILE) wish @for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) $(PKG_INSTALL_DIR); \ do \ - if [ ! -d $$i ] ; then \ + if [ ! -d $$i ] ; then \ diff --git a/x11/tk/patches/patch-ab b/x11/tk/patches/patch-ab index cae94b77b96..0ff43af2dba 100644 --- a/x11/tk/patches/patch-ab +++ b/x11/tk/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.18 2004/11/26 10:31:09 adam Exp $ +$NetBSD: patch-ab,v 1.19 2005/07/19 11:12:25 adam Exp $ ---- configure.orig 2004-11-19 18:50:17.000000000 +0000 +--- configure.orig 2005-06-29 16:43:10.000000000 +0000 +++ configure -@@ -1815,12 +1815,13 @@ fi +@@ -1910,12 +1910,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.18 2004/11/26 10:31:09 adam Exp $ CFLAGS_DEBUG=-g CFLAGS_OPTIMIZE=-O if test "$GCC" = "yes" ; then -@@ -2522,7 +2523,6 @@ if eval "test \"`echo '$ac_cv_header_'$a +@@ -2585,7 +2586,6 @@ if eval "test \"`echo '$ac_cv_header_'$a # NetBSD/SPARC needs -fPIC, -fpic will not do. SHLIB_CFLAGS="-fPIC" @@ -25,7 +25,7 @@ $NetBSD: patch-ab,v 1.18 2004/11/26 10:31:09 adam Exp $ SHLIB_LD_LIBS="" SHLIB_SUFFIX=".so" DL_OBJS="tclLoadDl.o" -@@ -2543,13 +2543,23 @@ EOF +@@ -2606,13 +2606,23 @@ EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "yes" >/dev/null 2>&1; then rm -rf conftest* @@ -51,7 +51,7 @@ $NetBSD: patch-ab,v 1.18 2004/11/26 10:31:09 adam Exp $ fi rm -f conftest* -@@ -3163,16 +3173,16 @@ fi +@@ -3539,16 +3549,16 @@ fi fi if test "$SHARED_LIB_SUFFIX" = "" ; then @@ -65,14 +65,14 @@ $NetBSD: patch-ab,v 1.18 2004/11/26 10:31:09 adam Exp $ 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) $(TK_LA_FILE) $(LIB_INSTALL_DIR)/$(LIB_FILE)' else LIB_SUFFIX=${UNSHARED_LIB_SUFFIX} -@@ -4526,7 +4536,11 @@ echo "configure:4524: checking for X11 l +@@ -5091,7 +5101,11 @@ echo "configure:5089: 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 @@ -85,7 +85,7 @@ $NetBSD: patch-ab,v 1.18 2004/11/26 10:31:09 adam Exp $ x_libraries="$i" break fi -@@ -4535,7 +4549,11 @@ echo "configure:4524: checking for X11 l +@@ -5100,7 +5114,11 @@ echo "configure:5089: checking for X11 l if test "$x_libraries" = ""; then XLIBSW=-lX11 else @@ -98,7 +98,7 @@ $NetBSD: patch-ab,v 1.18 2004/11/26 10:31:09 adam Exp $ fi fi if test "$XLIBSW" = nope ; then -@@ -4605,6 +4623,10 @@ if test "x${x_libraries}" != "x"; then +@@ -5172,6 +5190,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'` @@ -109,23 +109,23 @@ $NetBSD: patch-ab,v 1.18 2004/11/26 10:31:09 adam Exp $ fi # The statement below is very tricky! It actually *evaluates* the -@@ -5156,11 +5178,18 @@ eval "TK_LIB_FILE=${TK_LIB_FILE}" - if test "$SHARED_BUILD" = 0 -o $TCL_NEEDS_EXP_FILE = 0; then - if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then - eval TK_LIB_FLAG="-ltk${VERSION}\${TK_DBGX}" -+ eval TK_BUILD_LIB_SPEC="libtk${VERSION}\${TK_DBGX}.la" +@@ -5823,11 +5845,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}" ++ eval TK_BUILD_LIB_SPEC="libtk${VERSION}\${TK_DBGX}.la" + else + eval TK_LIB_FLAG="-ltk`echo ${VERSION} | tr -d .`\${TK_DBGX}" ++ eval TK_BUILD_LIB_SPEC="libtk`echo ${VERSION} | tr -d .`\${TK_DBGX}.la" + fi +- TK_BUILD_LIB_SPEC="-L`pwd` ${TK_LIB_FLAG}" + TK_LIB_SPEC="-L${libdir} ${TK_LIB_FLAG}" ++ if test "${RPATH_FLAG}" != ""; then ++ TK_LIB_SPEC_RPATH="${RPATH_FLAG}${exec_prefix}/lib" ++ else ++ TK_LIB_SPEC_RPATH="" ++ fi ++ TK_LIB_SPEC="-L${exec_prefix}/lib ${TK_LIB_SPEC_RPATH} ${TK_LIB_FLAG}" else - eval TK_LIB_FLAG="-ltk`echo ${VERSION} | tr -d .`\${TK_DBGX}" -+ eval TK_BUILD_LIB_SPEC="libtk`echo ${VERSION} | tr -d .`\${TK_DBGX}.la" - fi -- TK_BUILD_LIB_SPEC="-L`pwd` ${TK_LIB_FLAG}" - TK_LIB_SPEC="-L${libdir} ${TK_LIB_FLAG}" -+ if test "${RPATH_FLAG}" != ""; then -+ TK_LIB_SPEC_RPATH="${RPATH_FLAG}${exec_prefix}/lib" -+ else -+ TK_LIB_SPEC_RPATH="" -+ fi -+ TK_LIB_SPEC="-L${exec_prefix}/lib ${TK_LIB_SPEC_RPATH} ${TK_LIB_FLAG}" - TK_BUILD_EXP_FILE="" - TK_EXP_FILE="" - else + TK_BUILD_EXP_FILE="lib.exp" + eval "TK_EXP_FILE=libtk${TCL_EXPORT_FILE_SUFFIX}" diff --git a/x11/tk/patches/patch-ac b/x11/tk/patches/patch-ac index 85438bc8bad..ce1bc86c42b 100644 --- a/x11/tk/patches/patch-ac +++ b/x11/tk/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.10 2004/11/26 10:31:09 adam Exp $ +$NetBSD: patch-ac,v 1.11 2005/07/19 11:12:25 adam Exp $ ---- tcl.m4.orig 2004-11-19 18:50:17.000000000 +0000 +--- tcl.m4.orig 2005-06-29 16:43:10.000000000 +0000 +++ tcl.m4 -@@ -826,6 +826,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [ +@@ -866,6 +866,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.10 2004/11/26 10:31:09 adam Exp $ LDFLAGS_ORIG="$LDFLAGS" TCL_EXPORT_FILE_SUFFIX="" UNSHARED_LIB_SUFFIX="" -@@ -1100,6 +1101,9 @@ dnl AC_CHECK_TOOL(AR, ar) +@@ -1108,6 +1109,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.10 2004/11/26 10:31:09 adam Exp $ ;; IRIX-6.*) SHLIB_CFLAGS="" -@@ -1125,6 +1129,9 @@ dnl AC_CHECK_TOOL(AR, ar) +@@ -1133,6 +1137,9 @@ dnl AC_CHECK_TOOL(AR, ar) esac LDFLAGS="$LDFLAGS -n32" fi @@ -30,7 +30,7 @@ $NetBSD: patch-ac,v 1.10 2004/11/26 10:31:09 adam Exp $ ;; IRIX64-6.*) SHLIB_CFLAGS="" -@@ -1148,6 +1155,9 @@ dnl AC_CHECK_TOOL(AR, ar) +@@ -1156,6 +1163,9 @@ dnl AC_CHECK_TOOL(AR, ar) LDFLAGS="$LDFLAGS -64" fi fi @@ -40,7 +40,7 @@ $NetBSD: patch-ac,v 1.10 2004/11/26 10:31:09 adam Exp $ ;; Linux*) SHLIB_CFLAGS="-fPIC" -@@ -1193,6 +1203,9 @@ dnl AC_CHECK_TOOL(AR, ar) +@@ -1201,6 +1211,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.10 2004/11/26 10:31:09 adam Exp $ ;; GNU*) SHLIB_CFLAGS="-fPIC" -@@ -1240,28 +1253,36 @@ dnl AC_CHECK_TOOL(AR, ar) +@@ -1248,28 +1261,36 @@ dnl AC_CHECK_TOOL(AR, ar) LD_SEARCH_FLAGS="" ;; NetBSD-*|FreeBSD-[[1-2]].*) @@ -91,7 +91,7 @@ $NetBSD: patch-ac,v 1.10 2004/11/26 10:31:09 adam Exp $ ], [ SHLIB_CFLAGS="" SHLIB_LD="echo tclLdAout $CC \{$SHLIB_CFLAGS\} | `pwd`/tclsh -r" -@@ -1570,6 +1591,9 @@ dnl AC_CHECK_TOOL(AR, ar) +@@ -1668,6 +1689,9 @@ dnl AC_CHECK_TOOL(AR, ar) CC_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}' LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}' fi @@ -101,18 +101,18 @@ $NetBSD: patch-ac,v 1.10 2004/11/26 10:31:09 adam Exp $ ;; ULTRIX-4.*) SHLIB_CFLAGS="-G 0" -@@ -1749,8 +1773,8 @@ dnl AC_CHECK_TOOL(AR, ar) +@@ -1847,8 +1871,8 @@ dnl AC_CHECK_TOOL(AR, ar) 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 ${@:C/\.so.*/.la/} ${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 ${@:C/\.so.*/.la/} ${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) $(LIB_FILE:C/\.so.*/.la/) $(LIB_INSTALL_DIR)/$(LIB_FILE)' else LIB_SUFFIX=${UNSHARED_LIB_SUFFIX} -@@ -1780,10 +1804,10 @@ dnl esac +@@ -1878,10 +1902,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 2d93244fbd6..dae84f0465a 100644 --- a/x11/tk/patches/patch-ad +++ b/x11/tk/patches/patch-ad @@ -1,8 +1,8 @@ -$NetBSD: patch-ad,v 1.5 2004/10/01 13:35:53 adam Exp $ +$NetBSD: patch-ad,v 1.6 2005/07/19 11:12:25 adam Exp $ ---- configure.in.orig 2004-07-29 21:57:48.000000000 +0000 +--- configure.in.orig 2005-06-29 16:43:10.000000000 +0000 +++ configure.in -@@ -249,6 +249,10 @@ if test "x${x_libraries}" != "x"; then +@@ -283,6 +283,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,23 +13,23 @@ $NetBSD: patch-ad,v 1.5 2004/10/01 13:35:53 adam Exp $ fi # The statement below is very tricky! It actually *evaluates* the -@@ -361,11 +365,18 @@ eval "TK_LIB_FILE=${TK_LIB_FILE}" - if test "$SHARED_BUILD" = 0 -o $TCL_NEEDS_EXP_FILE = 0; then - if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then - eval TK_LIB_FLAG="-ltk${VERSION}\${TK_DBGX}" -+ eval TK_BUILD_LIB_SPEC="libtk${VERSION}\${TK_DBGX}.la" +@@ -466,11 +470,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}" ++ eval TK_BUILD_LIB_SPEC="libtk${VERSION}\${TK_DBGX}.la" + else + eval TK_LIB_FLAG="-ltk`echo ${VERSION} | tr -d .`\${TK_DBGX}" ++ eval TK_BUILD_LIB_SPEC="libtk`echo ${VERSION} | tr -d .`\${TK_DBGX}.la" + fi +- TK_BUILD_LIB_SPEC="-L`pwd` ${TK_LIB_FLAG}" + TK_LIB_SPEC="-L${libdir} ${TK_LIB_FLAG}" ++ if test "${RPATH_FLAG}" != ""; then ++ TK_LIB_SPEC_RPATH="${RPATH_FLAG}${exec_prefix}/lib" ++ else ++ TK_LIB_SPEC_RPATH="" ++ fi ++ TK_LIB_SPEC="-L${exec_prefix}/lib ${TK_LIB_SPEC_RPATH} ${TK_LIB_FLAG}" else - eval TK_LIB_FLAG="-ltk`echo ${VERSION} | tr -d .`\${TK_DBGX}" -+ eval TK_BUILD_LIB_SPEC="libtk`echo ${VERSION} | tr -d .`\${TK_DBGX}.la" - fi -- TK_BUILD_LIB_SPEC="-L`pwd` ${TK_LIB_FLAG}" - TK_LIB_SPEC="-L${libdir} ${TK_LIB_FLAG}" -+ if test "${RPATH_FLAG}" != ""; then -+ TK_LIB_SPEC_RPATH="${RPATH_FLAG}${exec_prefix}/lib" -+ else -+ TK_LIB_SPEC_RPATH="" -+ fi -+ TK_LIB_SPEC="-L${exec_prefix}/lib ${TK_LIB_SPEC_RPATH} ${TK_LIB_FLAG}" - TK_BUILD_EXP_FILE="" - TK_EXP_FILE="" - else + TK_BUILD_EXP_FILE="lib.exp" + eval "TK_EXP_FILE=libtk${TCL_EXPORT_FILE_SUFFIX}" |