Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/languages In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv26788
Modified Files: tcltk.patch Log Message: bump to 8.4.20, drop deprecated patch section and add missing InfoTest Index: tcltk.patch =================================================================== RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/languages/tcltk.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- tcltk.patch 18 Mar 2009 13:48:24 -0000 1.3 +++ tcltk.patch 10 Oct 2013 16:14:48 -0000 1.4 @@ -1,7 +1,7 @@ -diff -Nurd -x'*~' tcltk-8.4.19.orig/tcl8.4.19/unix/configure tcltk-8.4.19/tcl8.4.19/unix/configure ---- tcltk-8.4.19.orig/tcl8.4.19/unix/configure 2008-04-17 16:29:49.000000000 -0400 -+++ tcltk-8.4.19/tcl8.4.19/unix/configure 2008-07-28 18:15:21.000000000 -0400 -@@ -9246,7 +9246,7 @@ +diff -Nurd -x'*~' tcltk-8.4.20.orig/tcl8.4.20/unix/configure tcltk-8.4.20/tcl8.4.20/unix/configure +--- tcltk-8.4.20.orig/tcl8.4.20/unix/configure 2013-06-03 13:29:06.000000000 -0400 ++++ tcltk-8.4.20/tcl8.4.20/unix/configure 2013-10-07 14:06:43.000000000 -0400 +@@ -9281,7 +9281,7 @@ else TCL_LIB_FLAG="-ltcl`echo ${TCL_VERSION} | tr -d .`\${TCL_DBGX}" fi @@ -10,7 +10,7 @@ TCL_LIB_SPEC="-L${libdir} ${TCL_LIB_FLAG}" else TCL_BUILD_EXP_FILE="lib.exp" -@@ -9303,7 +9303,7 @@ +@@ -9338,7 +9338,7 @@ TCL_STUB_LIB_FLAG="-ltclstub`echo ${TCL_VERSION} | tr -d .`\${TCL_DBGX}" fi @@ -19,7 +19,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}" -@@ -9372,7 +9372,7 @@ +@@ -9408,7 +9408,7 @@ @@ -28,28 +28,28 @@ tcl_config_files="${tcl_config_files} Makefile dltest/Makefile tclConfig.sh" -diff -Nurd -x'*~' tcltk-8.4.19.orig/tk8.4.19/unix/configure tcltk-8.4.19/tk8.4.19/unix/configure ---- tcltk-8.4.19.orig/tk8.4.19/unix/configure 2008-04-17 11:14:08.000000000 -0400 -+++ tcltk-8.4.19/tk8.4.19/unix/configure 2008-07-28 18:15:21.000000000 -0400 -@@ -6012,7 +6012,7 @@ - else - eval TK_LIB_FLAG="-ltk`echo ${VERSION} | tr -d .`\${TK_DBGX}" - fi -- TK_BUILD_LIB_SPEC="-L`pwd` ${TK_LIB_FLAG}" -+ TK_BUILD_LIB_SPEC="`pwd`/${TK_LIB_FILE}" - TK_LIB_SPEC="-L${libdir} ${TK_LIB_FLAG}" - else - TK_BUILD_EXP_FILE="lib.exp" -@@ -6058,7 +6058,7 @@ +diff -Nurd -x'*~' tcltk-8.4.20.orig/tk8.4.20/unix/configure tcltk-8.4.20/tk8.4.20/unix/configure +--- tcltk-8.4.20.orig/tk8.4.20/unix/configure 2013-06-03 13:29:08.000000000 -0400 ++++ tcltk-8.4.20/tk8.4.20/unix/configure 2013-10-07 14:12:10.000000000 -0400 +@@ -6055,7 +6055,7 @@ + else + eval TK_LIB_FLAG="-ltk`echo ${VERSION} | tr -d .`\${TK_DBGX}" + 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\${MAJOR_VERSION}\${MINOR_VERSION} \${TCL_LIB_SPEC}" + else +@@ -6109,7 +6109,7 @@ eval TK_STUB_LIB_FLAG="-ltkstub`echo ${TK_VERSION} | tr -d .`\${TK_DBGX}" fi --TK_BUILD_STUB_LIB_SPEC="-L`pwd` ${TK_STUB_LIB_FLAG}" +-TK_BUILD_STUB_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TK_STUB_LIB_FLAG}" +TK_BUILD_STUB_LIB_SPEC="`pwd`/${TK_STUB_LIB_FILE}" 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}" -@@ -6126,7 +6126,7 @@ +@@ -6178,7 +6178,7 @@ @@ -58,31 +58,3 @@ tk_config_files="${tk_config_files} Makefile tkConfig.sh" -diff -Nurd -x'*~' tcltk-8.4.19.orig/tk8.4.19/generic/tk.h tcltk-8.4.19/tk8.4.19/generic/tk.h ---- tcltk-8.4.19.orig/tk8.4.19/generic/tk.h 2008-04-07 15:17:54.000000000 -0400 -+++ tcltk-8.4.19/tk8.4.19/generic/tk.h 2008-07-28 18:15:21.000000000 -0400 -@@ -635,17 +635,18 @@ - * - *--------------------------------------------------------------------------- - */ --#define VirtualEvent (LASTEvent) --#define ActivateNotify (LASTEvent + 1) --#define DeactivateNotify (LASTEvent + 2) --#define MouseWheelEvent (LASTEvent + 3) --#define TK_LASTEVENT (LASTEvent + 4) -+ -+#define VirtualEvent 35 -+#define ActivateNotify (VirtualEvent + 1) -+#define DeactivateNotify (VirtualEvent + 2) -+#define MouseWheelEvent (VirtualEvent + 3) -+#define TK_LASTEVENT (VirtualEvent + 4) - - #define MouseWheelMask (1L << 28) - - #define ActivateMask (1L << 29) - #define VirtualEventMask (1L << 30) --#define TK_LASTEVENT (LASTEvent + 4) -+ - - - /* ------------------------------------------------------------------------------ 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=60134071&iu=/4140/ostg.clktrk _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs