Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/languages
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv26205
Modified Files:
tcltk-10.9.patch
Log Message:
update to 8.6.1 for revised expect
Index: tcltk-10.9.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.7/stable/main/finkinfo/languages/tcltk-10.9.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- tcltk-10.9.patch 15 Jul 2013 17:34:34 -0000 1.1
+++ tcltk-10.9.patch 27 Sep 2013 20:06:21 -0000 1.2
@@ -1,7 +1,7 @@
-diff -Nurd -x'*~' tcltk-8.6.0.orig/tcl8.6.0/generic/tclInt.h
tcltk-8.6.0/tcl8.6.0/generic/tclInt.h
---- tcltk-8.6.0.orig/tcl8.6.0/generic/tclInt.h 2012-11-05 10:11:15.000000000
-0500
-+++ tcltk-8.6.0/tcl8.6.0/generic/tclInt.h 2013-07-13 21:25:02.000000000
-0400
-@@ -3232,7 +3232,7 @@
+diff -Nurd -x'*~' tcltk-8.6.1.orig/tcl8.6.1/generic/tclInt.h
tcltk-8.6.1/tcl8.6.1/generic/tclInt.h
+--- tcltk-8.6.1.orig/tcl8.6.1/generic/tclInt.h 2013-09-19 15:04:14.000000000
-0400
++++ tcltk-8.6.1/tcl8.6.1/generic/tclInt.h 2013-09-27 14:55:41.000000000
-0400
+@@ -3160,7 +3160,7 @@
MODULE_SCOPE int TclClockOldscanObjCmd(
ClientData clientData, Tcl_Interp *interp,
int objc, Tcl_Obj *const objv[]);
@@ -10,7 +10,7 @@
Tcl_Interp *interp, int objc,
Tcl_Obj *const objv[]);
MODULE_SCOPE int Tcl_ConcatObjCmd(ClientData clientData,
-@@ -3415,7 +3415,7 @@
+@@ -3343,7 +3343,7 @@
MODULE_SCOPE int Tcl_RepresentationCmd(ClientData clientData,
Tcl_Interp *interp, int objc,
Tcl_Obj *const objv[]);
@@ -19,22 +19,22 @@
Tcl_Interp *interp, int objc,
Tcl_Obj *const objv[]);
MODULE_SCOPE int Tcl_ScanObjCmd(ClientData clientData,
-diff -Nurd -x'*~' tcltk-8.6.0.orig/tcl8.6.0/generic/tclPort.h
tcltk-8.6.0/tcl8.6.0/generic/tclPort.h
---- tcltk-8.6.0.orig/tcl8.6.0/generic/tclPort.h 2012-06-26
09:59:02.000000000 -0400
-+++ tcltk-8.6.0/tcl8.6.0/generic/tclPort.h 2013-07-13 21:27:39.000000000
-0400
-@@ -22,7 +22,7 @@
- #endif
- #include "tcl.h"
- #if !defined(_WIN32)
+diff -Nurd -x'*~' tcltk-8.6.1.orig/tcl8.6.1/generic/tclPort.h
tcltk-8.6.1/tcl8.6.1/generic/tclPort.h
+--- tcltk-8.6.1.orig/tcl8.6.1/generic/tclPort.h 2013-09-19
15:04:14.000000000 -0400
++++ tcltk-8.6.1/tcl8.6.1/generic/tclPort.h 2013-09-27 14:56:28.000000000
-0400
+@@ -20,7 +20,7 @@
+ #if defined(_WIN32)
+ # include "tclWinPort.h"
+ #else
-# include "tclUnixPort.h"
+# include "../unix/tclUnixPort.h"
#endif
+ #include "tcl.h"
- #if !defined(LLONG_MIN)
-diff -Nurd -x'*~' tcltk-8.6.0.orig/tcl8.6.0/unix/configure
tcltk-8.6.0/tcl8.6.0/unix/configure
---- tcltk-8.6.0.orig/tcl8.6.0/unix/configure 2012-12-20 10:02:15.000000000
-0500
-+++ tcltk-8.6.0/tcl8.6.0/unix/configure 2013-07-13 21:25:02.000000000
-0400
-@@ -19458,7 +19458,7 @@
+diff -Nurd -x'*~' tcltk-8.6.1.orig/tcl8.6.1/unix/configure
tcltk-8.6.1/tcl8.6.1/unix/configure
+--- tcltk-8.6.1.orig/tcl8.6.1/unix/configure 2013-09-19 16:17:13.000000000
-0400
++++ tcltk-8.6.1/tcl8.6.1/unix/configure 2013-09-27 14:55:41.000000000
-0400
+@@ -19240,7 +19240,7 @@
else
TCL_LIB_FLAG="-ltcl`echo ${TCL_VERSION} | tr -d .`"
fi
@@ -43,7 +43,7 @@
TCL_LIB_SPEC="-L${libdir} ${TCL_LIB_FLAG}"
fi
VERSION='${VERSION}'
-@@ -19502,7 +19502,7 @@
+@@ -19284,7 +19284,7 @@
TCL_STUB_LIB_FLAG="-ltclstub`echo ${TCL_VERSION} | tr -d .`"
fi
@@ -52,7 +52,7 @@
TCL_STUB_LIB_SPEC="-L${TCL_STUB_LIB_DIR} ${TCL_STUB_LIB_FLAG}"
TCL_BUILD_STUB_LIB_PATH="`pwd`/${TCL_STUB_LIB_FILE}"
TCL_STUB_LIB_PATH="${TCL_STUB_LIB_DIR}/${TCL_STUB_LIB_FILE}"
-@@ -19686,7 +19686,7 @@
+@@ -19468,7 +19468,7 @@
@@ -61,9 +61,9 @@
: ${CONFIG_STATUS=./config.status}
ac_clean_files_save=$ac_clean_files
-diff -Nurd -x'*~' tcltk-8.6.0.orig/tk8.6.0/unix/Makefile.in
tcltk-8.6.0/tk8.6.0/unix/Makefile.in
---- tcltk-8.6.0.orig/tk8.6.0/unix/Makefile.in 2013-07-14 08:11:56.000000000
-0400
-+++ tcltk-8.6.0/tk8.6.0/unix/Makefile.in 2013-07-14 08:45:52.000000000
-0400
+diff -Nurd -x'*~' tcltk-8.6.1.orig/tk8.6.1/unix/Makefile.in
tcltk-8.6.1/tk8.6.1/unix/Makefile.in
+--- tcltk-8.6.1.orig/tk8.6.1/unix/Makefile.in 2013-09-17 08:25:13.000000000
-0400
++++ tcltk-8.6.1/tk8.6.1/unix/Makefile.in 2013-09-27 14:55:41.000000000
-0400
@@ -148,7 +148,7 @@
# X11 include files accessible (the configure script will try to
# set this value, and will cause it to be an empty string if the
@@ -118,7 +118,7 @@
WISH_OBJS = tkAppInit.o
-@@ -1200,7 +1200,7 @@
+@@ -1201,7 +1201,7 @@
# NB: tkUnixRFont.o uses nondefault CFLAGS
tkUnixRFont.o: $(UNIX_DIR)/tkUnixRFont.c
@@ -127,10 +127,10 @@
tkUnixInit.o: $(UNIX_DIR)/tkUnixInit.c tkConfig.sh
$(CC) -c $(CC_SWITCHES) -DTK_LIBRARY=\"${TK_LIBRARY}\" \
-diff -Nurd -x'*~' tcltk-8.6.0.orig/tk8.6.0/unix/configure
tcltk-8.6.0/tk8.6.0/unix/configure
---- tcltk-8.6.0.orig/tk8.6.0/unix/configure 2012-12-19 10:39:12.000000000
-0500
-+++ tcltk-8.6.0/tk8.6.0/unix/configure 2013-07-13 21:25:02.000000000 -0400
-@@ -10839,19 +10839,14 @@
+diff -Nurd -x'*~' tcltk-8.6.1.orig/tk8.6.1/unix/configure
tcltk-8.6.1/tk8.6.1/unix/configure
+--- tcltk-8.6.1.orig/tk8.6.1/unix/configure 2013-09-17 08:25:13.000000000
-0400
++++ tcltk-8.6.1/tk8.6.1/unix/configure 2013-09-27 14:59:48.000000000 -0400
+@@ -10361,19 +10361,14 @@
echo "$as_me:$LINENO: result: $enable_xft" >&5
echo "${ECHO_T}$enable_xft" >&6
else
@@ -151,7 +151,7 @@
tk_oldLibs=$LIBS
LIBS="$tk_oldLIBS $XFT_LIBS $XLIBSW"
echo "$as_me:$LINENO: checking for X11/Xft/Xft.h" >&5
-@@ -10916,7 +10911,7 @@
+@@ -10438,7 +10433,7 @@
fi
if test "$found_xft" = "yes" ; then
tk_oldCFlags=$CFLAGS
@@ -160,16 +160,16 @@
tk_oldLibs=$LIBS
LIBS="$tk_oldLIBS $XFT_LIBS $XLIBSW"
-@@ -11248,7 +11243,7 @@
- else
- TK_LIB_FLAG="-ltk`echo ${TK_VERSION} | tr -d .`"
+@@ -11338,7 +11333,7 @@
+ else
+ TK_LIB_FLAG="-ltk`echo ${TK_VERSION} | tr -d .`"
+ fi
+- TK_BUILD_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TK_LIB_FLAG}"
++ TK_BUILD_LIB_SPEC="`pwd`/${TK_LIB_FILE}"
fi
-- TK_BUILD_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TK_LIB_FLAG}"
-+ TK_BUILD_LIB_SPEC="`pwd`/${TK_LIB_FILE}"
- if test "${ac_cv_cygwin}" = "yes" -a "$SHARED_BUILD" = "1"; then
- WISH_BUILD_LIB_SPEC="-L\$(TOP_DIR)/win
-ltk${TK_MAJOR_VERSION}${TK_MINOR_VERSION} \${TCL_LIB_SPEC}"
- else
-@@ -11290,7 +11285,7 @@
+ TK_LIB_SPEC="-L${libdir} ${TK_LIB_FLAG}"
+ fi
+@@ -11358,7 +11353,7 @@
TK_STUB_LIB_FLAG="-ltkstub`echo ${TK_VERSION} | tr -d .`"
fi
@@ -178,7 +178,7 @@
TK_STUB_LIB_SPEC="-L${TK_STUB_LIB_DIR} ${TK_STUB_LIB_FLAG}"
TK_BUILD_STUB_LIB_PATH="`pwd`/${TK_STUB_LIB_FILE}"
TK_STUB_LIB_PATH="${TK_STUB_LIB_DIR}/${TK_STUB_LIB_FILE}"
-@@ -11483,7 +11478,7 @@
+@@ -11547,7 +11542,7 @@
LTLIBOBJS=$ac_ltlibobjs
@@ -187,9 +187,9 @@
: ${CONFIG_STATUS=./config.status}
ac_clean_files_save=$ac_clean_files
-diff -Nurd -x'*~' tcltk-8.6.0.orig/tk8.6.0/unix/tkConfig.sh.in
tcltk-8.6.0/tk8.6.0/unix/tkConfig.sh.in
---- tcltk-8.6.0.orig/tk8.6.0/unix/tkConfig.sh.in 2012-12-19
10:39:12.000000000 -0500
-+++ tcltk-8.6.0/tk8.6.0/unix/tkConfig.sh.in 2013-07-13 21:25:02.000000000
-0400
+diff -Nurd -x'*~' tcltk-8.6.1.orig/tk8.6.1/unix/tkConfig.sh.in
tcltk-8.6.1/tk8.6.1/unix/tkConfig.sh.in
+--- tcltk-8.6.1.orig/tk8.6.1/unix/tkConfig.sh.in 2013-09-17
08:25:13.000000000 -0400
++++ tcltk-8.6.1/tk8.6.1/unix/tkConfig.sh.in 2013-09-27 14:55:41.000000000
-0400
@@ -32,7 +32,7 @@
TK_LIB_FILE='@TK_LIB_FILE@'
------------------------------------------------------------------------------
October Webinars: Code for Performance
Free Intel webinars can help you accelerate application performance.
Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from
the latest Intel processors and coprocessors. See abstracts and register >
http://pubads.g.doubleclick.net/gampad/clk?id=60133471&iu=/4140/ostg.clktrk
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
