head 1.20; access; symbols pkgsrc-2013Q2:1.20.0.4 pkgsrc-2013Q2-base:1.20 pkgsrc-2012Q4:1.20.0.2 pkgsrc-2012Q4-base:1.20 pkgsrc-2012Q2:1.19.0.34 pkgsrc-2012Q2-base:1.19 pkgsrc-2012Q1:1.19.0.32 pkgsrc-2012Q1-base:1.19 pkgsrc-2011Q4:1.19.0.30 pkgsrc-2011Q4-base:1.19 pkgsrc-2011Q3:1.19.0.28 pkgsrc-2011Q3-base:1.19 pkgsrc-2011Q2:1.19.0.26 pkgsrc-2011Q2-base:1.19 pkgsrc-2011Q1:1.19.0.24 pkgsrc-2011Q1-base:1.19 pkgsrc-2010Q4:1.19.0.22 pkgsrc-2010Q4-base:1.19 pkgsrc-2010Q3:1.19.0.20 pkgsrc-2010Q3-base:1.19 pkgsrc-2010Q2:1.19.0.18 pkgsrc-2010Q2-base:1.19 pkgsrc-2010Q1:1.19.0.16 pkgsrc-2010Q1-base:1.19 pkgsrc-2009Q4:1.19.0.14 pkgsrc-2009Q4-base:1.19 pkgsrc-2009Q3:1.19.0.12 pkgsrc-2009Q3-base:1.19 pkgsrc-2009Q2:1.19.0.10 pkgsrc-2009Q2-base:1.19 pkgsrc-2009Q1:1.19.0.8 pkgsrc-2009Q1-base:1.19 pkgsrc-2008Q4:1.19.0.6 pkgsrc-2008Q4-base:1.19 pkgsrc-2008Q3:1.19.0.4 pkgsrc-2008Q3-base:1.19 cube-native-xorg:1.19.0.2 cube-native-xorg-base:1.19 pkgsrc-2008Q2:1.18.0.8 pkgsrc-2008Q2-base:1.18 cwrapper:1.18.0.6 pkgsrc-2008Q1:1.18.0.4 pkgsrc-2008Q1-base:1.18 pkgsrc-2007Q4:1.18.0.2 pkgsrc-2007Q4-base:1.18 pkgsrc-2007Q3:1.17.0.4 pkgsrc-2007Q3-base:1.17 pkgsrc-2007Q2:1.17.0.2 pkgsrc-2007Q2-base:1.17 pkgsrc-2007Q1:1.16.0.4 pkgsrc-2007Q1-base:1.16 pkgsrc-2006Q4:1.16.0.2 pkgsrc-2006Q4-base:1.16 pkgsrc-2006Q3:1.15.0.4 pkgsrc-2006Q3-base:1.15 pkgsrc-2006Q2:1.15.0.2 pkgsrc-2006Q2-base:1.15 pkgsrc-2006Q1:1.14.0.2 pkgsrc-2006Q1-base:1.14 pkgsrc-2005Q4:1.12.0.2 pkgsrc-2005Q4-base:1.12 pkgsrc-2005Q3:1.11.0.2 pkgsrc-2005Q3-base:1.11 pkgsrc-2005Q2:1.10.0.6 pkgsrc-2005Q2-base:1.10 pkgsrc-2005Q1:1.10.0.4 pkgsrc-2005Q1-base:1.10 pkgsrc-2004Q4:1.10.0.2 pkgsrc-2004Q4-base:1.10 pkgsrc-2004Q3:1.8.0.6 pkgsrc-2004Q3-base:1.8 pkgsrc-2004Q2:1.8.0.4 pkgsrc-2004Q2-base:1.8 pkgsrc-2004Q1:1.8.0.2 pkgsrc-2004Q1-base:1.8 pkgsrc-2003Q4:1.4.0.10 pkgsrc-2003Q4-base:1.4 netbsd-1-6-1:1.4.0.6 netbsd-1-6-1-base:1.4 netbsd-1-6:1.4.0.8 netbsd-1-6-RELEASE-base:1.4 pkgviews:1.4.0.4 pkgviews-base:1.4 buildlink2:1.4.0.2 buildlink2-base:1.4 netbsd-1-5-PATCH003:1.4; locks; strict; comment @# @; 1.20 date 2012.08.21.21.32.34; author marino; state dead; branches; next 1.19; 1.19 date 2008.07.20.23.35.20; author dbj; state Exp; branches; next 1.18; 1.18 date 2007.10.13.11.41.34; author adam; state Exp; branches; next 1.17; 1.17 date 2007.05.31.13.02.06; author adam; state Exp; branches; next 1.16; 1.16 date 2006.11.02.17.42.03; author adam; state Exp; branches; next 1.15; 1.15 date 2006.04.27.08.18.09; author adam; state Exp; branches; next 1.14; 1.14 date 2006.02.23.23.31.52; author minskim; state Exp; branches; next 1.13; 1.13 date 2006.01.16.14.48.35; author adam; state Exp; branches; next 1.12; 1.12 date 2005.11.03.23.09.24; author rillig; state Exp; branches; next 1.11; 1.11 date 2005.07.19.11.12.25; author adam; state Exp; branches; next 1.10; 1.10 date 2004.11.26.10.31.09; author adam; state Exp; branches; next 1.9; 1.9 date 2004.10.01.13.35.53; author adam; state Exp; branches; next 1.8; 1.8 date 2004.03.25.22.49.15; author jlam; state Exp; branches; next 1.7; 1.7 date 2004.03.11.01.27.05; author minskim; state Exp; branches; next 1.6; 1.6 date 2004.03.08.22.14.19; author minskim; state Exp; branches; next 1.5; 1.5 date 2004.03.08.20.29.43; author minskim; state Exp; branches; next 1.4; 1.4 date 2001.12.23.17.11.30; author bjoern; state Exp; branches; next 1.3; 1.3 date 2001.10.23.09.55.47; author jlam; state Exp; branches; next 1.2; 1.2 date 2001.07.29.07.54.57; author tron; state Exp; branches; next 1.1; 1.1 date 2001.05.24.02.58.30; author jlam; state Exp; branches; next ; desc @@ 1.20 log @x11/tk: Upgrade from version 8.4.18 to 8.5.12 Highlights of Tk 8.5 * New modern theming engine: New and complementary widgets that make use of platform-specific theming on Mac OS X and Windows to better fit in with those environments, and feature an improved look and feel under X11. * New widgets: Part of the themed widget set, Tk now has core notebook, combobox, treeview and progressbar widgets. * text widget: Smooth scrolling, widget peering, and improved procedures for counting and replacing text. * Font rendering: Now uses anti-aliased text under X11, and a more modern text engine (ATSUI) on Mac OS X. * Additional improvements: Window transparency, new fullscreen option for windows, enhancements to specific widgets and window layout, and more. There is of course much, much more. See [8.5 Changes](http://wiki.tcl.tk/10630) on the wiki for a complete list of new features. @ text @$NetBSD: patch-ac,v 1.19 2008/07/20 23:35:20 dbj Exp $ --- unix/tcl.m4.orig 2007-09-21 10:04:18.000000000 -0700 +++ unix/tcl.m4 2008-04-16 15:30:21.000000000 -0700 @@@@ -1033,6 +1033,7 @@@@ AC_DEFUN([SC_CONFIG_CFLAGS], [ # Step 3: set configuration options based on system name and version. do64bit_ok=no + TCL_LIB_SPEC_RPATH="" LDFLAGS_ORIG="$LDFLAGS" TCL_EXPORT_FILE_SUFFIX="" UNSHARED_LIB_SUFFIX="" @@@@ -1284,6 +1285,9 @@@@ dnl AC_CHECK_TOOL(AR, ar) DL_LIBS="" CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}' + UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' + SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so' + TCL_LIB_VERSIONS_OK=nodots ;; IRIX-6.*) SHLIB_CFLAGS="" @@@@ -1309,6 +1313,9 @@@@ dnl AC_CHECK_TOOL(AR, ar) esac LDFLAGS="$LDFLAGS -n32" fi + UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' + SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so' + TCL_LIB_VERSIONS_OK=nodots ;; IRIX64-6.*) SHLIB_CFLAGS="" @@@@ -1332,6 +1339,9 @@@@ dnl AC_CHECK_TOOL(AR, ar) LDFLAGS="$LDFLAGS -64" fi fi + UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' + SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so' + TCL_LIB_VERSIONS_OK=nodots ;; Linux*) SHLIB_CFLAGS="-fPIC" @@@@ -1388,6 +1398,9 @@@@ dnl AC_CHECK_TOOL(AR, ar) # XIM peeking works under XFree86. AC_DEFINE(PEEK_XCLOSEIM) + UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' + SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so' + TCL_LIB_VERSIONS_OK=nodots ;; GNU*) SHLIB_CFLAGS="-fPIC" @@@@ -1447,23 +1460,27 @@@@ dnl AC_CHECK_TOOL(AR, ar) LD_SEARCH_FLAGS="" ;; NetBSD-*|FreeBSD-[[1-2]].*) + if test "X${COMPILER_OPTIMIZATION_BUG}" = "XYES"; then + CFLAGS_OPTIMIZE=-O0 + fi # Not available on all versions: check for include file. AC_CHECK_HEADER(dlfcn.h, [ # NetBSD/SPARC needs -fPIC, -fpic will not do. SHLIB_CFLAGS="-fPIC" - SHLIB_LD="ld -Bshareable -x" 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_CACHE_CHECK([for ELF], tcl_cv_ld_elf, [ AC_EGREP_CPP(yes, [ #ifdef __ELF__ yes #endif ], 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 @@@@ -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 + SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so' + UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' + TCL_LIB_VERSIONS_OK=nodots ;; ULTRIX-4.*) SHLIB_CFLAGS="-G 0" @@@@ -2117,8 +2137,8 @@@@ dnl # preprocessing tests use only CPPFL if test "${SHARED_BUILD}" = "1" && test "${SHLIB_SUFFIX}" != "" ; then LIB_SUFFIX=${SHARED_LIB_SUFFIX} - 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/} ${OBJS:.o=.lo} ${LDFLAGS} ${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} @@@@ -2148,10 +2168,10 @@@@ dnl esac # Stub lib does not depend on shared/static configuration if test "$RANLIB" = "" ; then - MAKE_STUB_LIB='${STLIB_LD} [$]@@ ${STUB_LIB_OBJS}' + MAKE_STUB_LIB='${STLIB_LD} -o [$]@@ ${STUB_LIB_OBJS}' INSTALL_STUB_LIB='$(INSTALL_LIBRARY) $(STUB_LIB_FILE) $(LIB_INSTALL_DIR)/$(STUB_LIB_FILE)' else - MAKE_STUB_LIB='${STLIB_LD} [$]@@ ${STUB_LIB_OBJS} ; ${RANLIB} [$]@@' + MAKE_STUB_LIB='${STLIB_LD} -o [$]@@ ${STUB_LIB_OBJS} ; ${RANLIB} [$]@@' INSTALL_STUB_LIB='$(INSTALL_LIBRARY) $(STUB_LIB_FILE) $(LIB_INSTALL_DIR)/$(STUB_LIB_FILE) ; (cd $(LIB_INSTALL_DIR) ; $(RANLIB) $(STUB_LIB_FILE))' fi @ 1.19 log @include LDFLAGS when creating shared library. This fixes build problems on darwin @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.18 2007/10/13 11:41:34 adam Exp $ @ 1.18 log @Changes 8.4.16: * Bug fixes * Improvements @ text @d1 1 a1 1 $NetBSD$ d3 2 a4 2 --- unix/tcl.m4.orig 2007-09-21 19:04:18.000000000 +0200 +++ unix/tcl.m4 d99 1 a99 1 + 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' @ 1.17 log @Changes 8.4.15: * Minor bugfixes @ text @d3 1 a3 1 --- unix/tcl.m4.orig 2007-05-25 18:09:54.000000000 +0200 d83 1 a83 1 @@@@ -1923,6 +1940,9 @@@@ dnl AC_CHECK_TOOL(AR, ar) d93 1 a93 1 @@@@ -2107,8 +2127,8 @@@@ dnl # preprocessing tests use only CPPFL d104 1 a104 1 @@@@ -2138,10 +2158,10 @@@@ dnl esac @ 1.16 log @Changes 8.4.14: * Tk_PhotoPutBlock performance restored (JPEG image loading). * [namespace inscope] change reverted; harmed Itcl. * Made [expr {srand(.)}] accept wide integer argument. * Made [lappend $invalidList] raise an error. * Improved [text] delete performance. * Support for the WM_UNICHAR window message on Windows * Stopped excess variable writes by [scale]. * Tcl_Main no longer blocks main loop start for one interactive command. * [console] made thread safe. * Thread-enabled configuration uses MT-safe system calls. * Many Aqua/Tk bug fixes and improvements, see changes file. * Made unthreaded notifier naked-fork-safe on Darwin. * Support for weak linking on Mac OS X. * msgcat support for CFLocale on Darwin (msgcat 1.3.4) * Fixed crashes due to alignment issues in encoding translation routines. * Fixed crash with [listbox -listvariable] on namespace variable. * Fixed crash when Tcl_DeleteTrace changes proc on the active stack. * Fixed crash when normalizing filesystem pathnames. * Fixed crash due to invalid font name from XServer. * Several 64-bit bugs fixed and platform support enhanced. @ text @d3 1 a3 1 --- unix/tcl.m4.orig 2006-10-19 19:27:34.000000000 +0200 d13 1 a13 1 @@@@ -1280,6 +1281,9 @@@@ dnl AC_CHECK_TOOL(AR, ar) d23 1 a23 1 @@@@ -1305,6 +1309,9 @@@@ dnl AC_CHECK_TOOL(AR, ar) d33 1 a33 1 @@@@ -1328,6 +1335,9 @@@@ dnl AC_CHECK_TOOL(AR, ar) d43 1 a43 1 @@@@ -1373,6 +1383,9 @@@@ dnl AC_CHECK_TOOL(AR, ar) d53 1 a53 1 @@@@ -1432,23 +1445,27 @@@@ dnl AC_CHECK_TOOL(AR, ar) d83 1 a83 1 @@@@ -1881,6 +1898,9 @@@@ dnl AC_CHECK_TOOL(AR, ar) d93 1 a93 1 @@@@ -2059,8 +2079,8 @@@@ dnl AC_CHECK_TOOL(AR, ar) d104 1 a104 1 @@@@ -2090,10 +2110,10 @@@@ dnl esac @ 1.15 log @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. @ text @d3 1 a3 1 --- unix/tcl.m4.orig 2006-04-19 14:29:38.000000000 +0200 d5 1 a5 1 @@@@ -1032,6 +1032,7 @@@@ AC_DEFUN([SC_CONFIG_CFLAGS], [ d13 1 a13 1 @@@@ -1279,6 +1280,9 @@@@ dnl AC_CHECK_TOOL(AR, ar) d23 1 a23 1 @@@@ -1304,6 +1308,9 @@@@ dnl AC_CHECK_TOOL(AR, ar) d33 1 a33 1 @@@@ -1327,6 +1334,9 @@@@ dnl AC_CHECK_TOOL(AR, ar) d43 1 a43 1 @@@@ -1372,6 +1382,9 @@@@ dnl AC_CHECK_TOOL(AR, ar) d53 1 a53 1 @@@@ -1431,23 +1444,27 @@@@ dnl AC_CHECK_TOOL(AR, ar) d83 1 a83 1 @@@@ -1867,6 +1884,9 @@@@ dnl AC_CHECK_TOOL(AR, ar) d93 1 a93 1 @@@@ -2045,8 +2065,8 @@@@ dnl AC_CHECK_TOOL(AR, ar) d104 1 a104 1 @@@@ -2076,10 +2096,10 @@@@ dnl esac @ 1.14 log @Add link options to have a correct dependency_libs line in .la files on NetBSD. This fixes PR pkg/32915. Bump PKGREVISION. @ text @d3 1 a3 1 --- unix/tcl.m4.orig 2005-12-06 02:42:37.000000000 +0000 d5 1 a5 1 @@@@ -900,6 +900,7 @@@@ AC_DEFUN(SC_CONFIG_CFLAGS, [ d13 1 a13 1 @@@@ -1147,6 +1148,9 @@@@ dnl AC_CHECK_TOOL(AR, ar) d23 1 a23 1 @@@@ -1172,6 +1176,9 @@@@ dnl AC_CHECK_TOOL(AR, ar) d33 1 a33 1 @@@@ -1195,6 +1202,9 @@@@ dnl AC_CHECK_TOOL(AR, ar) d43 1 a43 1 @@@@ -1240,6 +1250,9 @@@@ dnl AC_CHECK_TOOL(AR, ar) d53 1 a53 1 @@@@ -1299,28 +1312,36 @@@@ dnl AC_CHECK_TOOL(AR, ar) d65 1 a65 2 - SHLIB_LD_LIBS="" + SHLIB_LD_LIBS='${LIBS}' d71 2 a72 2 AC_MSG_CHECKING(for ELF) AC_EGREP_CPP(yes, [ d76 8 a83 19 - ], + ], [ 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) d93 1 a93 1 @@@@ -1915,8 +1939,8 @@@@ dnl AC_CHECK_TOOL(AR, ar) d104 1 a104 1 @@@@ -1946,10 +1970,10 @@@@ dnl esac @ 1.13 log @Changes 8.4.12: * Repeated [namespace import] of same command now permitted. * ${prefix}/share added to ::tcl_pkgPath on some systems. * [exec]'s >> redirection has improved append behavior. * [info globals] returned only existing variables. * Recognize some Solaris variations of the cp1251 encoding. * Addressed [file mkdir] race condition. * Support opening >2GB files on RHEL 3. * Corrections to $argv formatting when [encoding system] is multibyte. * http 2.5.2: Update URL encoding rules to RFC 3986. * Fixed issue in recursive file delete with NFS lock files. * Stopped crash after use of Tcl_TraceCommand(). * Win NT/XP: support unicode console. * Improved support for Tclkit to set [encoding system]. * Added Korean timezone abbreviations. * Windows: exit codes can now exceed -128..127 range. * [load] support on LynxOS. * Packages with incorrect index scripts now cause a warning to be logged. *** POTENTIAL INCOMPATIBILITY *** * [lsearch -regexp] now accepts backrefs in the RE. * [selection get] made compatible with OpenOffice.org. * Dialog support for widget names containing spaces. * Improved Tk window manager event interaction on OS X Aqua. @ text @d3 1 a3 1 --- unix/tcl.m4.orig 2005-12-06 03:42:37.000000000 +0100 d65 2 a66 1 SHLIB_LD_LIBS="" @ 1.12 log @Fixed wrong use of WRKSRC. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.11 2005/07/19 11:12:25 adam Exp $ d3 1 a3 1 --- unix/tcl.m4.orig 2005-06-29 16:43:10.000000000 +0000 d5 1 a5 1 @@@@ -866,6 +866,7 @@@@ AC_DEFUN(SC_CONFIG_CFLAGS, [ d13 1 a13 1 @@@@ -1108,6 +1109,9 @@@@ dnl AC_CHECK_TOOL(AR, ar) d23 1 a23 1 @@@@ -1133,6 +1137,9 @@@@ dnl AC_CHECK_TOOL(AR, ar) d33 1 a33 1 @@@@ -1156,6 +1163,9 @@@@ dnl AC_CHECK_TOOL(AR, ar) d43 1 a43 1 @@@@ -1201,6 +1211,9 @@@@ dnl AC_CHECK_TOOL(AR, ar) d53 1 a53 1 @@@@ -1248,28 +1261,36 @@@@ dnl AC_CHECK_TOOL(AR, ar) d94 1 a94 1 @@@@ -1668,6 +1689,9 @@@@ dnl AC_CHECK_TOOL(AR, ar) d104 1 a104 1 @@@@ -1847,8 +1871,8 @@@@ dnl AC_CHECK_TOOL(AR, ar) d115 1 a115 1 @@@@ -1878,10 +1902,10 @@@@ dnl esac @ 1.11 log @Changes 8.4.11: * Bug fixes @ text @d1 1 a1 1 $NetBSD$ d3 2 a4 2 --- tcl.m4.orig 2005-06-29 16:43:10.000000000 +0000 +++ tcl.m4 @ 1.10 log @Changes 8.4.8: * Fixed possible deadlock in Tcl_Finalize * Fixed thread IDs on 64-bit systems * Fixed [scan %ld] handling LP64 systems * Fixed [string map $samevar $samevar] crash * Fixed broken [namespace forget] logic * Fixed [namespace import] cycle prevention * Improved control over int <-> wideInt conversion * Fixed buffer overflow when there is a syntax error in [subst] * Fixed [file executable] result for case insensitivity on Windows * Fixed [expr {NaN == NaN}] result * Make [tcl_findLibrary] search $::auto_path as well * Fixed crash in [fconfigure -ttycontrol] in threaded build * [TIP 222] implementation of [wm attributes -alpha] on Windows * [TIP 159] implementation of [wm iconphoto] * Make Tk [load]-able on OS X/Aqua * Handle color/screen resolution changes on Windows * Fixed [wm resizable] for Solaris/CDE * Handle Windows native dialog double clicks that fall through * Fixed [place forget] memory leak * Recompute menu geometry on named font size change * Fixed X/IME IC focus after creation * Improved multiple display Tk dialog window placement * Fixed compound buttons for OS X/Aqua * Documentation improvements and test suite expansion @ text @d3 1 a3 1 --- tcl.m4.orig 2004-11-19 18:50:17.000000000 +0000 d5 1 a5 1 @@@@ -826,6 +826,7 @@@@ AC_DEFUN(SC_CONFIG_CFLAGS, [ d13 1 a13 1 @@@@ -1100,6 +1101,9 @@@@ dnl AC_CHECK_TOOL(AR, ar) d23 1 a23 1 @@@@ -1125,6 +1129,9 @@@@ dnl AC_CHECK_TOOL(AR, ar) d33 1 a33 1 @@@@ -1148,6 +1155,9 @@@@ dnl AC_CHECK_TOOL(AR, ar) d43 1 a43 1 @@@@ -1193,6 +1203,9 @@@@ dnl AC_CHECK_TOOL(AR, ar) d53 1 a53 1 @@@@ -1240,28 +1253,36 @@@@ dnl AC_CHECK_TOOL(AR, ar) d94 1 a94 1 @@@@ -1570,6 +1591,9 @@@@ dnl AC_CHECK_TOOL(AR, ar) d104 1 a104 1 @@@@ -1749,8 +1773,8 @@@@ dnl AC_CHECK_TOOL(AR, ar) d108 1 a108 1 - MAKE_LIB='${SHLIB_LD} -o [$]@@ ${SHLIB_LD_FLAGS} ${OBJS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS}' d110 1 a110 1 + 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' d115 1 a115 1 @@@@ -1780,10 +1804,10 @@@@ dnl esac @ 1.9 log @Changes 8.4.7: * Fixed [glob -path] bug when in the root directory * Fixed unicode-char path installation on Windows NT-based platforms * Properly subsitute more values in Windows tclConfig.sh * Improved stack overflow prevention on Windows * Fixed mem leak in [fconfigure $serial -xchar] * Fixed crash with [cd] with a volumerelative $HOME * Fixed clock %G %V formats for ISO8601 week numbers * Fixed support for non-WIDE_INT aware math functions * Added [http::config -urlencoding] option * Fixed utf-8 encoding of \u0000 on system I/O * Prevented dde hangs with non-responsive apps * Added round() wide integer support * Cleaner exit and correction of mem leaks when using the threaded memory allocator and reinitializing * Improved build configuration on 64-bit systems * Added read support of PPM/PGM with the -data option * Correct issue with displaying maximize window button on KDE-3.2.1 * Fix drawing of unicode chars in menu titles on Windows * Correctly post Tk clipboard data to the Windows clipboard on exit * Fix the panedwindow -opaqueresize option to work as per the docs * Reduce Tk tk_messageBox default font size to 14-point * Prevent possible segfault in -maxundo * Fix XIM initialization on Solaris * Complete the implementation of the CG version of the X drawing emulation layer on Mac OS X * Fix several Mac OS X usability issues @ text @d3 1 a3 1 --- tcl.m4.orig 2004-07-29 21:57:48.000000000 +0000 d5 1 a5 1 @@@@ -802,6 +802,7 @@@@ AC_DEFUN(SC_CONFIG_CFLAGS, [ d13 1 a13 1 @@@@ -1076,6 +1077,9 @@@@ dnl AC_CHECK_TOOL(AR, ar) d23 1 a23 1 @@@@ -1101,6 +1105,9 @@@@ dnl AC_CHECK_TOOL(AR, ar) d33 1 a33 1 @@@@ -1124,6 +1131,9 @@@@ dnl AC_CHECK_TOOL(AR, ar) d43 1 a43 1 @@@@ -1169,6 +1179,9 @@@@ dnl AC_CHECK_TOOL(AR, ar) d53 1 a53 1 @@@@ -1216,28 +1229,36 @@@@ dnl AC_CHECK_TOOL(AR, ar) d94 1 a94 1 @@@@ -1546,6 +1567,9 @@@@ dnl AC_CHECK_TOOL(AR, ar) d104 1 a104 1 @@@@ -1725,8 +1749,8 @@@@ dnl AC_CHECK_TOOL(AR, ar) d115 1 a115 1 @@@@ -1756,10 +1780,10 @@@@ dnl esac @ 1.8 log @Fix tcl/tk configure script stupidity: it overwrote the value of LDFLAGS that accumulates within itself with a do-nothing version because it tried to re-use LDFLAGS for another purpose. This broke all library checks after the "checking for ELF" step. Fix this by (duh) not re-using LDFLAGS but by using a different variable. Bump the PKGREVISIONs of lang/tcl and x11/tk. This fixes building the threaded versions of tcl and tk. @ text @d3 1 a3 1 --- tcl.m4.orig Mon Mar 1 19:04:48 2004 d5 1 a5 10 @@@@ -651,7 +651,7 @@@@ AC_DEFUN(SC_CONFIG_MANPAGES, [ # loading for Tcl on this system. # DL_LIBS - Library file(s) to include in tclsh and other base # applications in order for the "load" command to work. -# LDFLAGS - Flags to pass to the compiler when linking object +# LD_FLAGS - Flags to pass to the compiler when linking object # files into an executable application binary such # as tclsh. # LD_SEARCH_FLAGS-Flags to pass to ld, such as "-R /usr/local/tcl/lib", @@@@ -796,6 +796,7 @@@@ AC_DEFUN(SC_CONFIG_CFLAGS, [ d9 2 a10 2 + RPATH_FLAG="" EXTRA_CFLAGS="" d13 1 a13 97 @@@@ -839,7 +840,7 @@@@ dnl AC_CHECK_TOOL(AR, ar) SHLIB_SUFFIX=".so" DL_OBJS="tclLoadDl.o" - LDFLAGS="" + LD_FLAGS="" LD_LIBRARY_PATH_VAR="LIBPATH" @@@@ -850,7 +851,7 @@@@ dnl AC_CHECK_TOOL(AR, ar) else do64bit_ok=yes EXTRA_CFLAGS="-q64" - LDFLAGS="-q64" + LD_FLAGS="-q64" RANLIB="${RANLIB} -X64" AR="${AR} -X64" SHLIB_LD_FLAGS="-b64" @@@@ -891,7 +892,7 @@@@ dnl AC_CHECK_TOOL(AR, ar) SHLIB_SUFFIX=".so" DL_OBJS="tclLoadDl.o" DL_LIBS="-ldl" - LDFLAGS="" + LD_FLAGS="" CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}' LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} LD_LIBRARY_PATH_VAR="LIBPATH" @@@@ -911,7 +912,7 @@@@ dnl AC_CHECK_TOOL(AR, ar) else do64bit_ok=yes EXTRA_CFLAGS="-q64" - LDFLAGS="-q64" + LD_FLAGS="-q64" RANLIB="${RANLIB} -X64" AR="${AR} -X64" SHLIB_LD_FLAGS="-b64" @@@@ -944,7 +945,7 @@@@ dnl AC_CHECK_TOOL(AR, ar) SHLIB_SUFFIX=".so" DL_OBJS="tclLoadDl.o" DL_LIBS="-ldl" - LDFLAGS="" + LD_FLAGS="" CC_SEARCH_FLAGS="" LD_SEARCH_FLAGS="" ;; @@@@ -955,7 +956,7 @@@@ dnl AC_CHECK_TOOL(AR, ar) SHLIB_SUFFIX=".so" DL_OBJS="tclLoadDl.o" DL_LIBS="-ldl" - LDFLAGS="-export-dynamic" + LD_FLAGS="-export-dynamic" CC_SEARCH_FLAGS="" LD_SEARCH_FLAGS="" ;; @@@@ -966,7 +967,7 @@@@ dnl AC_CHECK_TOOL(AR, ar) SHLIB_SUFFIX=".so" DL_OBJS="tclLoadDl.o" DL_LIBS="-ldl" - LDFLAGS="" + LD_FLAGS="" CC_SEARCH_FLAGS="" LD_SEARCH_FLAGS="" ;; @@@@ -984,7 +985,7 @@@@ dnl AC_CHECK_TOOL(AR, ar) SHLIB_LD_LIBS='${LIBS}' DL_OBJS="tclLoadShl.o" DL_LIBS="-ldld" - LDFLAGS="-Wl,-E" + LD_FLAGS="-Wl,-E" CC_SEARCH_FLAGS='-Wl,+s,+b,${LIB_RUNTIME_DIR}:.' LD_SEARCH_FLAGS='+s +b ${LIB_RUNTIME_DIR}:.' LD_LIBRARY_PATH_VAR="SHLIB_PATH" @@@@ -1020,10 +1021,10 @@@@ dnl AC_CHECK_TOOL(AR, ar) do64bit_ok=yes if test "`uname -m`" = "ia64" ; then EXTRA_CFLAGS="+DD64" - LDFLAGS="+DD64 $LDFLAGS" + LD_FLAGS="+DD64 $LD_FLAGS" else EXTRA_CFLAGS="+DA2.0W" - LDFLAGS="+DA2.0W $LDFLAGS" + LD_FLAGS="+DA2.0W $LD_FLAGS" fi fi fi @@@@ -1037,7 +1038,7 @@@@ dnl AC_CHECK_TOOL(AR, ar) SHLIB_LD_LIBS="" DL_OBJS="tclLoadShl.o" DL_LIBS="-ldld" - LDFLAGS="-Wl,-E" + LD_FLAGS="-Wl,-E" CC_SEARCH_FLAGS='-Wl,+s,+b,${LIB_RUNTIME_DIR}:.' LD_SEARCH_FLAGS='+s +b ${LIB_RUNTIME_DIR}:.' LD_LIBRARY_PATH_VAR="SHLIB_PATH" @@@@ -1050,7 +1051,7 @@@@ dnl AC_CHECK_TOOL(AR, ar) SHLIB_LD_LIBS='${LIBS}' DL_OBJS="tclLoadAout.o" a14 6 - LDFLAGS="-Wl,-D,08000000" + LD_FLAGS="-Wl,-D,08000000" CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}' LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} SHARED_LIB_SUFFIX='${VERSION}\$\{DBGX\}.a' @@@@ -1065,7 +1066,10 @@@@ dnl AC_CHECK_TOOL(AR, ar) a16 3 EXTRA_CFLAGS="" - LDFLAGS="" + LD_FLAGS="" d23 1 a23 12 @@@@ -1078,7 +1082,7 @@@@ dnl AC_CHECK_TOOL(AR, ar) LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}' if test "$GCC" = "yes" ; then EXTRA_CFLAGS="-mabi=n32" - LDFLAGS="-mabi=n32" + LD_FLAGS="-mabi=n32" else case $system in IRIX-6.3) @@@@ -1089,8 +1093,11 @@@@ dnl AC_CHECK_TOOL(AR, ar) EXTRA_CFLAGS="-n32" ;; d25 1 a25 2 - LDFLAGS="-n32" + LD_FLAGS="-n32" d33 2 a34 15 @@@@ -1099,7 +1106,7 @@@@ dnl AC_CHECK_TOOL(AR, ar) SHLIB_SUFFIX=".so" DL_OBJS="tclLoadDl.o" DL_LIBS="" - LDFLAGS="" + LD_FLAGS="" CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}' @@@@ -1112,9 +1119,12 @@@@ dnl AC_CHECK_TOOL(AR, ar) do64bit_ok=yes SHLIB_LD="ld -64 -shared -rdata_shared" EXTRA_CFLAGS="-64" - LDFLAGS="-64" + LD_FLAGS="-64" d43 1 a43 19 @@@@ -1131,7 +1141,7 @@@@ dnl AC_CHECK_TOOL(AR, ar) SHLIB_LD="${CC} -shared" DL_OBJS="tclLoadDl.o" DL_LIBS="-ldl" - LDFLAGS="-rdynamic" + LD_FLAGS="-rdynamic" CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} else @@@@ -1139,7 +1149,7 @@@@ dnl AC_CHECK_TOOL(AR, ar) SHLIB_LD="ld -shared" DL_OBJS="tclLoadDld.o" DL_LIBS="-ldld" - LDFLAGS="" + LD_FLAGS="" CC_SEARCH_FLAGS="" LD_SEARCH_FLAGS=""]) fi @@@@ -1161,6 +1171,9 @@@@ dnl AC_CHECK_TOOL(AR, ar) d53 1 a53 25 @@@@ -1171,7 +1184,7 @@@@ dnl AC_CHECK_TOOL(AR, ar) SHLIB_LD="${CC} -shared" DL_OBJS="" DL_LIBS="-ldl" - LDFLAGS="-rdynamic" + LD_FLAGS="-rdynamic" CC_SEARCH_FLAGS="" LD_SEARCH_FLAGS="" else @@@@ -1179,7 +1192,7 @@@@ dnl AC_CHECK_TOOL(AR, ar) SHLIB_LD="ld -shared" DL_OBJS="" DL_LIBS="-ldld" - LDFLAGS="" + LD_FLAGS="" CC_SEARCH_FLAGS="" LD_SEARCH_FLAGS=""]) fi @@@@ -1194,7 +1207,7 @@@@ dnl AC_CHECK_TOOL(AR, ar) SHLIB_SUFFIX=".so" DL_OBJS="tclLoadDl.o" DL_LIBS="-ldl" - LDFLAGS="" + LD_FLAGS="" CC_SEARCH_FLAGS="" d56 5 a60 10 @@@@ -1205,7 +1218,7 @@@@ dnl AC_CHECK_TOOL(AR, ar) SHLIB_SUFFIX=".so" DL_OBJS="tclLoadDl.o" DL_LIBS="-ldl" - LDFLAGS="-Wl,-Bexport" + LD_FLAGS="-Wl,-Bexport" CC_SEARCH_FLAGS="" LD_SEARCH_FLAGS="" ;; @@@@ -1214,12 +1227,11 @@@@ dnl AC_CHECK_TOOL(AR, ar) a68 2 - LDFLAGS="" + LD_FLAGS="" d70 1 a70 1 LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}' d72 1 a72 1 @@@@ -1227,11 +1239,19 @@@@ dnl AC_CHECK_TOOL(AR, ar) d79 1 a79 1 - SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so', a80 1 + RPATH_FLAG='-Wl,-R' d82 1 a82 1 + SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so' a85 1 + RPATH_FLAG='-R' d87 1 d89 2 a90 2 + ] ) d93 2 a94 161 @@@@ -1240,7 +1260,7 @@@@ dnl AC_CHECK_TOOL(AR, ar) SHLIB_SUFFIX=".a" DL_OBJS="tclLoadAout.o" DL_LIBS="" - LDFLAGS="" + LD_FLAGS="" CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}' LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' @@@@ -1259,14 +1279,14 @@@@ dnl AC_CHECK_TOOL(AR, ar) SHLIB_SUFFIX=".so" DL_OBJS="tclLoadDl.o" DL_LIBS="" - LDFLAGS="-export-dynamic" + LD_FLAGS="-export-dynamic" CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}' if test "${TCL_THREADS}" = "1" ; then # The -pthread needs to go in the CFLAGS, not LIBS LIBS=`echo $LIBS | sed s/-pthread//` EXTRA_CFLAGS="-pthread" - LDFLAGS="$LDFLAGS -pthread" + LD_FLAGS="$LD_FLAGS -pthread" fi case $system in FreeBSD-3.*) @@@@ -1287,7 +1307,7 @@@@ dnl AC_CHECK_TOOL(AR, ar) DL_OBJS="tclLoadDyld.o" PLAT_OBJS="tclMacOSXBundle.o" DL_LIBS="" - LDFLAGS="-prebind" + LD_FLAGS="-prebind" CC_SEARCH_FLAGS="" LD_SEARCH_FLAGS="" CFLAGS_OPTIMIZE="-Os" @@@@ -1304,7 +1324,7 @@@@ dnl AC_CHECK_TOOL(AR, ar) SHLIB_SUFFIX=".so" DL_OBJS="tclLoadNext.o" DL_LIBS="" - LDFLAGS="" + LD_FLAGS="" CC_SEARCH_FLAGS="" LD_SEARCH_FLAGS="" ;; @@@@ -1321,7 +1341,7 @@@@ dnl AC_CHECK_TOOL(AR, ar) SHLIB_SUFFIX=".so" DL_OBJS="tclLoadOSF.o" DL_LIBS="" - LDFLAGS="" + LD_FLAGS="" CC_SEARCH_FLAGS="" LD_SEARCH_FLAGS="" ;; @@@@ -1337,7 +1357,7 @@@@ dnl AC_CHECK_TOOL(AR, ar) SHLIB_SUFFIX=".so" DL_OBJS="tclLoadDl.o" DL_LIBS="" - LDFLAGS="" + LD_FLAGS="" CC_SEARCH_FLAGS="" LD_SEARCH_FLAGS="" ;; @@@@ -1353,7 +1373,7 @@@@ dnl AC_CHECK_TOOL(AR, ar) SHLIB_SUFFIX=".so" DL_OBJS="tclLoadDl.o" DL_LIBS="" - LDFLAGS="" + LD_FLAGS="" CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}' if test "$GCC" = "yes" ; then @@@@ -1370,7 +1390,7 @@@@ dnl AC_CHECK_TOOL(AR, ar) LIBS="$LIBS -lpthread -lmach -lexc" else EXTRA_CFLAGS="${EXTRA_CFLAGS} -pthread" - LDFLAGS="-pthread" + LD_FLAGS="-pthread" fi fi @@@@ -1385,7 +1405,7 @@@@ dnl AC_CHECK_TOOL(AR, ar) DL_OBJS="tclLoadDl.o" # dlopen is in -lc on QNX DL_LIBS="" - LDFLAGS="" + LD_FLAGS="" CC_SEARCH_FLAGS="" LD_SEARCH_FLAGS="" ;; @@@@ -1396,7 +1416,7 @@@@ dnl AC_CHECK_TOOL(AR, ar) SHLIB_SUFFIX=".a" DL_OBJS="tclLoadAout.o" DL_LIBS="" - LDFLAGS="-Wl,-D,08000000" + LD_FLAGS="-Wl,-D,08000000" CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}' LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} ;; @@@@ -1406,10 +1426,10 @@@@ dnl AC_CHECK_TOOL(AR, ar) # below. if test "$GCC" = "yes" ; then SHLIB_CFLAGS="-fPIC -melf" - LDFLAGS="-melf -Wl,-Bexport" + LD_FLAGS="-melf -Wl,-Bexport" else SHLIB_CFLAGS="-Kpic -belf" - LDFLAGS="-belf -Wl,-Bexport" + LD_FLAGS="-belf -Wl,-Bexport" fi SHLIB_LD="ld -G" SHLIB_LD_LIBS="" @@@@ -1426,7 +1446,7 @@@@ dnl AC_CHECK_TOOL(AR, ar) SHLIB_SUFFIX=".so" DL_OBJS="tclLoadDl.o" DL_LIBS="-ldl" - LDFLAGS="" + LD_FLAGS="" CC_SEARCH_FLAGS="" LD_SEARCH_FLAGS="" ;; @@@@ -1437,7 +1457,7 @@@@ dnl AC_CHECK_TOOL(AR, ar) SHLIB_SUFFIX=".so" DL_OBJS="tclLoadDl.o" DL_LIBS="-ldl" - LDFLAGS="" + LD_FLAGS="" CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}' LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} @@@@ -1467,7 +1487,7 @@@@ dnl AC_CHECK_TOOL(AR, ar) SHLIB_SUFFIX=".so" DL_OBJS="tclLoadDl.o" DL_LIBS="-ldl" - LDFLAGS="" + LD_FLAGS="" if test "$GCC" = "yes" ; then SHLIB_LD="$CC -shared" CC_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}' @@@@ -1487,7 +1507,7 @@@@ dnl AC_CHECK_TOOL(AR, ar) AC_DEFINE(_POSIX_PTHREAD_SEMANTICS) SHLIB_CFLAGS="-KPIC" - LDFLAGS="" + LD_FLAGS="" # Check to enable 64-bit flags for compiler/linker if test "$do64bit" = "yes" ; then @@@@ -1499,10 +1519,10 @@@@ dnl AC_CHECK_TOOL(AR, ar) do64bit_ok=yes if test "$do64bitVIS" = "yes" ; then EXTRA_CFLAGS="-xarch=v9a" - LDFLAGS="-xarch=v9a" + LD_FLAGS="-xarch=v9a" else EXTRA_CFLAGS="-xarch=v9" - LDFLAGS="-xarch=v9" + LD_FLAGS="-xarch=v9" fi fi else @@@@ -1526,6 +1546,9 @@@@ dnl AC_CHECK_TOOL(AR, ar) d104 1 a104 31 @@@@ -1534,7 +1557,7 @@@@ dnl AC_CHECK_TOOL(AR, ar) SHLIB_LD_LIBS='${LIBS}' DL_OBJS="tclLoadAout.o" DL_LIBS="" - LDFLAGS="-Wl,-D,08000000" + LD_FLAGS="-Wl,-D,08000000" CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}' LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} if test "$GCC" != "yes" ; then @@@@ -1557,9 +1580,9 @@@@ dnl AC_CHECK_TOOL(AR, ar) LDFLAGS=$hold_ldflags AC_MSG_RESULT($found) if test $found = yes; then - LDFLAGS="-Wl,-Bexport" + LD_FLAGS="-Wl,-Bexport" else - LDFLAGS="" + LD_FLAGS="" fi CC_SEARCH_FLAGS="" LD_SEARCH_FLAGS="" @@@@ -1665,7 +1688,7 @@@@ dnl AC_CHECK_TOOL(AR, ar) SHLIB_SUFFIX="" DL_OBJS="tclLoadNone.o" DL_LIBS="" - LDFLAGS="" + LD_FLAGS="" CC_SEARCH_FLAGS="" LD_SEARCH_FLAGS="" BUILD_DLTEST="" @@@@ -1710,8 +1733,8 @@@@ dnl AC_CHECK_TOOL(AR, ar) d115 1 a115 5 @@@@ -1764,6 +1787,7 @@@@ dnl esac AC_SUBST(LDFLAGS_OPTIMIZE) AC_SUBST(CC_SEARCH_FLAGS) AC_SUBST(LD_SEARCH_FLAGS) + AC_SUBST(LD_FLAGS) d117 9 a125 26 AC_SUBST(STLIB_LD) AC_SUBST(SHLIB_LD) @@@@ -2056,7 +2080,11 @@@@ AC_DEFUN(SC_PATH_X, [ for i in $dirs ; do if test -r $i/libX11.a -o -r $i/libX11.so -o -r $i/libX11.sl; then AC_MSG_RESULT($i) - XLIBSW="-L$i -lX11" + if test "${RPATH_FLAG}" != ""; then + XLIBSW="-L$i ${RPATH_FLAG}$i -lX11" + else + XLIBSW="-L$i -lX11" + fi x_libraries="$i" break fi @@@@ -2065,7 +2093,11 @@@@ AC_DEFUN(SC_PATH_X, [ if test "$x_libraries" = ""; then XLIBSW=-lX11 else - XLIBSW="-L$x_libraries -lX11" + if test "${RPATH_FLAG}" != ""; then + XLIBSW="-L$x_libraries ${RPATH_FLAG}$x_libraries -lX11" + else + XLIBSW="-L$x_libraries -lX11" + fi fi d127 1 a127 1 if test "$XLIBSW" = nope ; then @ 1.7 log @Keep library names on IRIX and Linux to be same as on other platforms. @ text @d3 1 a3 1 --- tcl.m4.orig 2004-03-01 18:04:48.000000000 -0600 d5 9 d22 105 a126 1 @@@@ -1066,6 +1067,9 @@@@ dnl AC_CHECK_TOOL(AR, ar) d129 2 a130 1 LDFLAGS="" d137 12 a148 1 @@@@ -1091,6 +1095,9 @@@@ dnl AC_CHECK_TOOL(AR, ar) d150 2 a151 1 LDFLAGS="-n32" d159 15 a173 2 @@@@ -1115,6 +1122,9 @@@@ dnl AC_CHECK_TOOL(AR, ar) LDFLAGS="-64" d182 18 d210 37 a246 1 @@@@ -1214,7 +1227,6 @@@@ dnl AC_CHECK_TOOL(AR, ar) d254 6 d282 160 d452 30 d493 9 a501 1 @@@@ -2056,7 +2079,11 @@@@ AC_DEFUN(SC_PATH_X, [ d514 1 a514 1 @@@@ -2065,7 +2092,11 @@@@ AC_DEFUN(SC_PATH_X, [ @ 1.6 log @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 @ text @d13 41 a53 1 @@@@ -1214,7 +1215,6 @@@@ dnl AC_CHECK_TOOL(AR, ar) d61 1 a61 1 @@@@ -1227,11 +1227,19 @@@@ dnl AC_CHECK_TOOL(AR, ar) d83 1 a83 1 @@@@ -1526,6 +1534,9 @@@@ dnl AC_CHECK_TOOL(AR, ar) d93 1 a93 1 @@@@ -1710,8 +1721,8 @@@@ dnl AC_CHECK_TOOL(AR, ar) d104 1 a104 1 @@@@ -2056,7 +2067,11 @@@@ AC_DEFUN(SC_PATH_X, [ d117 1 a117 1 @@@@ -2065,7 +2080,11 @@@@ AC_DEFUN(SC_PATH_X, [ @ 1.5 log @Update tk to 8.4.5. Too many changes since 8.3.4. Please see ChangeLog in the distfile. @ text @d3 1 a3 1 --- tcl.m4.orig 2003-11-21 14:17:23.000000000 -0600 d5 1 a5 1 @@@@ -795,6 +795,7 @@@@ AC_DEFUN(SC_CONFIG_CFLAGS, [ d13 1 a13 1 @@@@ -1207,7 +1220,6 @@@@ dnl AC_CHECK_TOOL(AR, ar) d21 1 a21 1 @@@@ -1220,11 +1232,19 @@@@ dnl AC_CHECK_TOOL(AR, ar) d43 1 a43 1 @@@@ -1519,6 +1539,9 @@@@ dnl AC_CHECK_TOOL(AR, ar) d53 1 a53 1 @@@@ -1703,8 +1726,8 @@@@ dnl AC_CHECK_TOOL(AR, ar) d64 1 a64 1 @@@@ -2049,7 +2072,11 @@@@ AC_DEFUN(SC_PATH_X, [ d77 1 a77 1 @@@@ -2058,7 +2085,11 @@@@ AC_DEFUN(SC_PATH_X, [ @ 1.4 log @Update to version 8.3.4 Taken from "changes" from the distribution (minus changes not relevant for NetBSD): 2001-04-04 (doc fixes) numerous doc corrections and clarifications. Update of READMEs. 2001-04-04 (bug fix) corrected reseting of service mode to only occur when it was set (hedin, hobbs) 2001-04-02 (bug fix) Checked for menu deletion before calling associated menu entry command. Fixed listbox, canvas and entry destruction to be more aware of current widget activity. (hobbs) 2001-03-30 (bug fix) handled the error case where a valid-looking but invalid identifier could be passed in certain event generate options causing a crash (hobbs) 2001-03-29 (bug fix) corrected handling of drag-selection (dejong) 2000-10-27 (feature enhancement) made [tk useinputmethods 1] the default for Tk (hobbs) 2000-09-29 (bug fix) corrected BadMatch errors when using Tk on multiple screens (hipp) 2000-08-18 (feature enhancement) Removed redundant call to DitherInstance (melski) 2001-08-24 (bug fix) correct several possible free memory reads and array bounds read errors reported by purify. (hobbs) 2001-08-27 (new feature) added call to Tcl_SetMainLoop which enables Tk to be loaded interactively into tclsh and have the event loop kick in correctly. (hobbs) 2001-08-28 (bug fix) fixed tk_chooseDirectory crash on Win95. (baker) 2001-08-28 (bug fix) removed 2 second 'raise' delay seen by some Unix window managers. (hobbs, baker) 2001-09-14 (bug fix) fixed memory leaks that occured if errors were thrown while initializing the channel for an image. (darley) 2001-10-04 (new feature) added enhanced bgerror dialog from Hipp. (hobbs) 2001-10-17 (bug fix) fixed file filtering in the motif file dialog (nelson) @ text @d3 1 a3 1 --- tcl.m4.orig Sat Oct 20 02:24:40 2001 d5 2 a6 1 @@@@ -602,6 +602,7 @@@@ a8 1 fullSrcDir=`cd $srcdir; pwd` d13 1 a13 1 @@@@ -915,7 +916,6 @@@@ d21 1 a21 1 @@@@ -927,11 +927,19 @@@@ d43 2 a44 12 @@@@ -1130,6 +1138,9 @@@@ DL_LIBS="-ldl" LDFLAGS="" LD_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}' + SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so' + UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' + TCL_LIB_VERSIONS_OK=nodots ;; SunOS-5*) @@@@ -1174,6 +1185,9 @@@@ else d53 12 a64 1 @@@@ -1652,7 +1666,11 @@@@ d77 1 a77 1 @@@@ -1661,7 +1679,11 @@@@ @ 1.3 log @Use -Wl,-R instead of -Wl,-rpath as the former is more consistent with the rest of pkgsrc. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.2 2001/07/29 07:54:57 tron Exp $ d3 3 a5 3 --- aclocal.m4.orig Tue Aug 8 21:19:32 2000 +++ aclocal.m4 Sun Jul 29 09:43:02 2001 @@@@ -580,6 +580,7 @@@@ d13 1 a13 1 @@@@ -769,7 +770,6 @@@@ d21 1 a21 1 @@@@ -781,11 +781,19 @@@@ d43 1 a43 1 @@@@ -933,6 +941,9 @@@@ d52 2 a53 2 SHLIB_CFLAGS="-KPIC" @@@@ -972,6 +983,9 @@@@ d63 1 a63 1 @@@@ -1383,7 +1397,11 @@@@ d76 1 a76 1 @@@@ -1392,7 +1410,11 @@@@ @ 1.2 log @Use the library naming scheme under Solaris as under NetBSD. While it's not really necessary to strip dots from library names under Solaris it makes the packages more compatible which should ease maintenance. @ text @d1 1 a1 1 $NetBSD$ d30 2 a31 2 + RPATH_FLAG='-Wl,-rpath,' + LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' @ 1.1 log @Fix the installed tkConfig.sh so it's possible to use its values to generate a shared library that depends on libtk83.so. Patch the configure script to set TK_LIB_SPEC to include -Wl,-rpath,... or -R... depending on whether we are ELF or a.out. Bump version number to 8.3.2nb1. @ text @d3 2 a4 2 --- aclocal.m4.orig Tue Aug 8 15:19:32 2000 +++ aclocal.m4 d43 21 a63 1 @@@@ -1383,7 +1391,11 @@@@ d76 1 a76 1 @@@@ -1392,7 +1404,11 @@@@ @