Fixed conflicting macro in installed headers, bug #503076

(Portage version: 2.2.8-prefix/cvs/Linux x86_64, signed Manifest commit with key 0x13CB1360)

8 files changed, 117 insertions, 880 deletions

diff --git a/sci-libs/plplot/files/plplot-5.10.0-have-config-h.patch b/sci-libs/plplot/files/plplot-5.10.0-have-config-h.patch
new file mode 100644
index 000000000000..8c02df13941f
--- /dev/null
+++ b/sci-libs/plplot/files/plplot-5.10.0-have-config-h.patch
@@ -0,0 +1,117 @@
+Apply upstream patch http://sourceforge.net/p/plplot/bugs/146/
+to fix conflicting macros in installed header files.
+
+diff -Nur plplot-5.10.0.orig/CMakeLists.txt plplot-5.10.0/CMakeLists.txt
+--- plplot-5.10.0.orig/CMakeLists.txt	2014-04-07 09:51:53.732857993 -0700
++++ plplot-5.10.0/CMakeLists.txt	2014-04-07 09:54:03.739699328 -0700
+@@ -125,7 +125,7 @@
+   ${CMAKE_CURRENT_BINARY_DIR}/plplot_config.h
+   )
+ # Allow access to the generated plplot_config.h for this build.
+-add_definitions("-DHAVE_CONFIG_H")
++add_definitions("-DPLPLOT_HAVE_CONFIG_H")
+ # Install top-level files
+ 
+ # Enable testing framework for examples
+diff -Nur plplot-5.10.0.orig/bindings/ocaml/CMakeLists.txt plplot-5.10.0/bindings/ocaml/CMakeLists.txt
+--- plplot-5.10.0.orig/bindings/ocaml/CMakeLists.txt	2014-04-07 09:51:53.629857267 -0700
++++ plplot-5.10.0/bindings/ocaml/CMakeLists.txt	2014-04-07 09:54:03.934700592 -0700
+@@ -99,7 +99,7 @@
+     ${CMAKE_CURRENT_BINARY_DIR}/dllplplot_stubs.so
+     ${CMAKE_CURRENT_BINARY_DIR}/libplplot_stubs.a
+     COMMAND ${OCAMLC} -ccopt -I${CAMLIDL_LIB_DIR} -c ${CMAKE_CURRENT_BINARY_DIR}/plplot_core_stubs.c
+-    COMMAND ${OCAMLC} -ccopt -I${CMAKE_SOURCE_DIR}/include -ccopt -I${CMAKE_BINARY_DIR}/include -ccopt -I${CMAKE_SOURCE_DIR}/lib/qsastime -ccopt -I${CMAKE_BINARY_DIR} -ccopt -I${CAMLIDL_LIB_DIR} -ccopt -DHAVE_CONFIG_H -c ${CMAKE_CURRENT_SOURCE_DIR}/plplot_impl.c
++    COMMAND ${OCAMLC} -ccopt -I${CMAKE_SOURCE_DIR}/include -ccopt -I${CMAKE_BINARY_DIR}/include -ccopt -I${CMAKE_SOURCE_DIR}/lib/qsastime -ccopt -I${CMAKE_BINARY_DIR} -ccopt -I${CAMLIDL_LIB_DIR} -ccopt -DPLPLOT_HAVE_CONFIG_H -c ${CMAKE_CURRENT_SOURCE_DIR}/plplot_impl.c
+     COMMAND ${OCAMLMKLIB} -o plplot_stubs -L${CAMLIDL_LIB_DIR} -lcamlidl -L${CMAKE_BINARY_DIR}/src -lplplot${LIB_TAG} ${CMAKE_CURRENT_BINARY_DIR}/plplot_core_stubs.o ${CMAKE_CURRENT_BINARY_DIR}/plplot_impl.o ${ocaml_STATIC_FLAGS}
+     DEPENDS
+     ${CMAKE_CURRENT_BINARY_DIR}/plplot_core_stubs.c
+diff -Nur plplot-5.10.0.orig/bindings/ocaml/plcairo/CMakeLists.txt plplot-5.10.0/bindings/ocaml/plcairo/CMakeLists.txt
+--- plplot-5.10.0.orig/bindings/ocaml/plcairo/CMakeLists.txt	2014-04-07 09:51:53.629857267 -0700
++++ plplot-5.10.0/bindings/ocaml/plcairo/CMakeLists.txt	2014-04-07 09:54:03.934700592 -0700
+@@ -36,7 +36,7 @@
+     ${CMAKE_CURRENT_BINARY_DIR}/plcairo_impl.o
+     ${CMAKE_CURRENT_BINARY_DIR}/dllplcairo_stubs.so
+     ${CMAKE_CURRENT_BINARY_DIR}/libplcairo_stubs.a
+-    COMMAND ${OCAMLC} -ccopt "${CAIRO_COMPILE_FLAGS}" -cclib "${CAIRO_LINK_FLAGS}" -ccopt -I${CMAKE_SOURCE_DIR}/include -ccopt -I${CMAKE_BINARY_DIR}/include -ccopt -I${CMAKE_SOURCE_DIR}/lib/qsastime  -ccopt -I${CMAKE_BINARY_DIR} -ccopt -DHAVE_CONFIG_H -c ${CMAKE_CURRENT_SOURCE_DIR}/plcairo_impl.c
++    COMMAND ${OCAMLC} -ccopt "${CAIRO_COMPILE_FLAGS}" -cclib "${CAIRO_LINK_FLAGS}" -ccopt -I${CMAKE_SOURCE_DIR}/include -ccopt -I${CMAKE_BINARY_DIR}/include -ccopt -I${CMAKE_SOURCE_DIR}/lib/qsastime  -ccopt -I${CMAKE_BINARY_DIR} -ccopt -DPLPLOT_HAVE_CONFIG_H -c ${CMAKE_CURRENT_SOURCE_DIR}/plcairo_impl.c
+     COMMAND ${OCAMLMKLIB} -o plcairo_stubs ${CAIRO_LINK_FLAGS_LIST} -L${CMAKE_BINARY_DIR}/src -lplplot${LIB_TAG} ${CMAKE_CURRENT_BINARY_DIR}/plcairo_impl.o
+     DEPENDS
+     ${CMAKE_CURRENT_SOURCE_DIR}/plcairo_impl.c
+diff -Nur plplot-5.10.0.orig/doc/doxygen/html/plConfig_8h_source.html plplot-5.10.0/doc/doxygen/html/plConfig_8h_source.html
+--- plplot-5.10.0.orig/doc/doxygen/html/plConfig_8h_source.html	2014-04-07 09:51:53.712857853 -0700
++++ plplot-5.10.0/doc/doxygen/html/plConfig_8h_source.html	2014-04-07 09:54:03.935700600 -0700
+@@ -136,7 +136,7 @@
+ <div class="line"><a name="l00030"></a><span class="lineno">   30</span>&#160;<span class="comment">// any user applications).  Therefore, the configured plConfig.h</span></div>
+ <div class="line"><a name="l00031"></a><span class="lineno">   31</span>&#160;<span class="comment">// should be installed.  In contrast, plplot_config.h.in (note,</span></div>
+ <div class="line"><a name="l00032"></a><span class="lineno">   32</span>&#160;<span class="comment">// plConfig.h #includes plplot_config.h for the core build because</span></div>
+-<div class="line"><a name="l00033"></a><span class="lineno">   33</span>&#160;<span class="comment">// HAVE_CONFIG_H is #defined in that case) contains configured macros</span></div>
++<div class="line"><a name="l00033"></a><span class="lineno">   33</span>&#160;<span class="comment">// PLPLOT_HAVE_CONFIG_H is #defined in that case) contains configured macros</span></div>
+ <div class="line"><a name="l00034"></a><span class="lineno">   34</span>&#160;<span class="comment">// that are only required for the core build.  Therefore, in contrast</span></div>
+ <div class="line"><a name="l00035"></a><span class="lineno">   35</span>&#160;<span class="comment">// to plConfig.h, plplot_config.h should not be installed.</span></div>
+ <div class="line"><a name="l00036"></a><span class="lineno">   36</span>&#160;<span class="comment">//</span></div>
+@@ -150,7 +150,7 @@
+ <div class="line"><a name="l00044"></a><span class="lineno">   44</span>&#160;<span class="preprocessor">#ifndef __PLCONFIG_H__</span></div>
+ <div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;<span class="preprocessor"></span><span class="preprocessor">#define __PLCONFIG_H__</span></div>
+ <div class="line"><a name="l00046"></a><span class="lineno">   46</span>&#160;<span class="preprocessor"></span></div>
+-<div class="line"><a name="l00047"></a><span class="lineno">   47</span>&#160;<span class="preprocessor">#ifdef HAVE_CONFIG_H</span></div>
++<div class="line"><a name="l00047"></a><span class="lineno">   47</span>&#160;<span class="preprocessor">#ifdef PLPLOT_HAVE_CONFIG_H</span></div>
+ <div class="line"><a name="l00048"></a><span class="lineno">   48</span>&#160;<span class="preprocessor"></span><span class="preprocessor">#  include &lt;<a class="code" href="plplot__config_8h.html">plplot_config.h</a>&gt;</span></div>
+ <div class="line"><a name="l00049"></a><span class="lineno">   49</span>&#160;<span class="preprocessor">#endif</span></div>
+ <div class="line"><a name="l00050"></a><span class="lineno">   50</span>&#160;<span class="preprocessor"></span></div>
+diff -Nur plplot-5.10.0.orig/doc/doxygen/html/plplot__config_8h_source.html plplot-5.10.0/doc/doxygen/html/plplot__config_8h_source.html
+--- plplot-5.10.0.orig/doc/doxygen/html/plplot__config_8h_source.html	2014-04-07 09:51:53.708857825 -0700
++++ plplot-5.10.0/doc/doxygen/html/plplot__config_8h_source.html	2014-04-07 09:54:03.935700600 -0700
+@@ -109,7 +109,7 @@
+ <div class="line"><a name="l00003"></a><span class="lineno">    3</span>&#160;<span class="comment">// examples (and presumably any user applications).  Therefore, the</span></div>
+ <div class="line"><a name="l00004"></a><span class="lineno">    4</span>&#160;<span class="comment">// configured plplot_config.h should not be installed.  In contrast,</span></div>
+ <div class="line"><a name="l00005"></a><span class="lineno">    5</span>&#160;<span class="comment">// include/plConfig.h.in (note, the configured plConfig.h result</span></div>
+-<div class="line"><a name="l00006"></a><span class="lineno">    6</span>&#160;<span class="comment">// #includes plplot_config.h for the core build because HAVE_CONFIG_H</span></div>
++<div class="line"><a name="l00006"></a><span class="lineno">    6</span>&#160;<span class="comment">// #includes plplot_config.h for the core build because PLPLOT_HAVE_CONFIG_H</span></div>
+ <div class="line"><a name="l00007"></a><span class="lineno">    7</span>&#160;<span class="comment">// is #defined in that case) contains configured macros that are</span></div>
+ <div class="line"><a name="l00008"></a><span class="lineno">    8</span>&#160;<span class="comment">// required for the core build, installed examples build, and build of</span></div>
+ <div class="line"><a name="l00009"></a><span class="lineno">    9</span>&#160;<span class="comment">// user applications.  Therefore, in contrast to plplot_config.h,</span></div>
+diff -Nur plplot-5.10.0.orig/examples/CMakeLists.txt plplot-5.10.0/examples/CMakeLists.txt
+--- plplot-5.10.0.orig/examples/CMakeLists.txt	2014-04-07 09:51:53.610857133 -0700
++++ plplot-5.10.0/examples/CMakeLists.txt	2014-04-07 09:54:03.938700634 -0700
+@@ -414,7 +414,7 @@
+ endif(CORE_BUILD)
+ 
+ if(CORE_BUILD AND BUILD_TEST)
+-  remove_definitions("-DHAVE_CONFIG_H")
++  remove_definitions("-DPLPLOT_HAVE_CONFIG_H")
+ endif(CORE_BUILD AND BUILD_TEST)
+ 
+ # Decide on device to be used for generic interactive tests.
+diff -Nur plplot-5.10.0.orig/include/plConfig.h.in plplot-5.10.0/include/plConfig.h.in
+--- plplot-5.10.0.orig/include/plConfig.h.in	2014-04-07 09:51:53.616857175 -0700
++++ plplot-5.10.0/include/plConfig.h.in	2014-04-07 09:54:03.938700634 -0700
+@@ -30,7 +30,7 @@
+ // any user applications).  Therefore, the configured plConfig.h
+ // should be installed.  In contrast, plplot_config.h.in (note,
+ // plConfig.h #includes plplot_config.h for the core build because
+-// HAVE_CONFIG_H is #defined in that case) contains configured macros
++// PLPLOT_HAVE_CONFIG_H is #defined in that case) contains configured macros
+ // that are only required for the core build.  Therefore, in contrast
+ // to plConfig.h, plplot_config.h should not be installed.
+ //
+@@ -44,7 +44,7 @@
+ #ifndef __PLCONFIG_H__
+ #define __PLCONFIG_H__
+ 
+-#ifdef HAVE_CONFIG_H
++#ifdef PLPLOT_HAVE_CONFIG_H
+ #  include <plplot_config.h>
+ #endif
+ 
+diff -Nur plplot-5.10.0.orig/plplot_config.h.in plplot-5.10.0/plplot_config.h.in
+--- plplot-5.10.0.orig/plplot_config.h.in	2014-04-07 09:51:53.732857993 -0700
++++ plplot-5.10.0/plplot_config.h.in	2014-04-07 09:54:03.938700634 -0700
+@@ -3,7 +3,7 @@
+ // examples (and presumably any user applications).  Therefore, the
+ // configured plplot_config.h should not be installed.  In contrast,
+ // include/plConfig.h.in (note, the configured plConfig.h result
+-// #includes plplot_config.h for the core build because HAVE_CONFIG_H
++// #includes plplot_config.h for the core build because PLPLOT_HAVE_CONFIG_H
+ // is #defined in that case) contains configured macros that are
+ // required for the core build, installed examples build, and build of
+ // user applications.  Therefore, in contrast to plplot_config.h,
diff --git a/sci-libs/plplot/files/plplot-5.9.10-haru.patch b/sci-libs/plplot/files/plplot-5.9.10-haru.patch
deleted file mode 100644
index 9f43875f6aeb..000000000000
--- a/sci-libs/plplot/files/plplot-5.9.10-haru.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-get hpdf header in /usr/include - applied upstream in trunk
-bicatali nov 2013
-
---- cmake/modules/Findhpdf.cmake.orig	2013-11-05 14:44:16.088810181 -0800
-+++ cmake/modules/Findhpdf.cmake	2013-11-05 14:44:23.264854503 -0800
-@@ -8,7 +8,12 @@
- #  hpdf_LIBRARY_DIRS, the directory where libhpdf (either shared or static)
- #  is found.
- 
--find_path(hpdf_INCLUDE_DIR hpdf/hpdf.h /usr/local/include /usr/include)
-+# Give preference to header found in hpdf subdirectory (which is the
-+# result of a build and install of upstream libharu), then if not
-+# found look for the case of no such subdirectory (which is how the
-+# Debian system version of libharu headers is installed).
-+find_path(hpdf_INCLUDE_DIR hpdf.h PATHS /usr/local/include /usr/include PATH_SUFFIXES hpdf)
-+find_path(hpdf_INCLUDE_DIR hpdf.h PATHS /usr/local/include /usr/include)
- 
- if(hpdf_INCLUDE_DIR)
-   find_library(hpdf_LIBRARY
---- drivers/pdf.c.orig	2013-11-05 14:55:58.928226651 -0800
-+++ drivers/pdf.c	2013-11-05 14:56:10.534299828 -0800
-@@ -38,7 +38,7 @@
- #include <math.h>
- #include <setjmp.h>
- 
--#include "hpdf/hpdf.h"
-+#include "hpdf.h"
- 
- // PLplot header files
- #define DEBUG
diff --git a/sci-libs/plplot/files/plplot-5.9.10-itcltk.patch b/sci-libs/plplot/files/plplot-5.9.10-itcltk.patch
deleted file mode 100644
index bc1d0f1ed04e..000000000000
--- a/sci-libs/plplot/files/plplot-5.9.10-itcltk.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- bindings/tk/tkMain.c.orig
-+++ bindings/tk/tkMain.c
-@@ -85,11 +85,6 @@
- 
- // From tclIntDecls.h
- 
--#ifndef Tcl_Import_TCL_DECLARED
--EXTERN int Tcl_Import _ANSI_ARGS_( ( Tcl_Interp * interp,
--                                     Tcl_Namespace * nsPtr, char * pattern,
--                                     int allowOverwrite ) );
--#endif
- 
- #ifndef Tcl_GetGlobalNamespace_TCL_DECLARE
- EXTERN Tcl_Namespace * Tcl_GetGlobalNamespace _ANSI_ARGS_( (
---- cmake/modules/tcl-related.cmake.orig	2013-10-31 08:57:07.044160099 -0700
-+++ cmake/modules/tcl-related.cmake	2013-10-31 08:57:37.854350228 -0700
-@@ -94,7 +94,7 @@
-           message(STATUS "Looking for itcl.h - found")
-           message(STATUS "Looking for itcl library")
- 	get_filename_component(TCL_LIBRARY_PATH ${TCL_LIBRARY} PATH)
--          set(itcl_library_versions 3.4 3.3 3.2 3.1 3.0 2.1 2.0)
-+          set(itcl_library_versions 4.0.0 3.4 3.3 3.2 3.1 3.0 2.1 2.0)
-           foreach(version ${itcl_library_versions})
-             find_library(ITCL_LIBRARY itcl${version} PATHS ${TCL_LIBRARY_PATH}
-               PATH_SUFFIXES itcl${version})
-@@ -153,7 +153,7 @@
-       if(ITK_INCLUDE_PATH)
-         message(STATUS "Looking for itk.h - found")
-         message(STATUS "Looking for itk library")
--        set(itk_library_versions 3.4 3.3 3.2 3.1 3.0 2.1 2.0)
-+        set(itk_library_versions 4.0.0 3.4 3.3 3.2 3.1 3.0 2.1 2.0)
-         foreach(version ${itk_library_versions})
-           find_library(ITK_LIBRARY itk${version}
-             PATH_SUFFIXES itk${version})
diff --git a/sci-libs/plplot/files/plplot-5.9.10-tcl86.patch b/sci-libs/plplot/files/plplot-5.9.10-tcl86.patch
deleted file mode 100644
index dfa606c1cdbc..000000000000
--- a/sci-libs/plplot/files/plplot-5.9.10-tcl86.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-Upgrade to tcl-8.6 - not applied upstream
-bicatali nov 2013  
-
---- drivers/ntk.c.orig	2013-11-05 14:30:01.105432771 -0800
-+++ drivers/ntk.c	2013-11-05 14:29:42.632317282 -0800
-@@ -115,7 +115,7 @@
-         //
-         sprintf( scmd, "send %s {%s}", rem_interp, cmd ); // mess! make it more efficient
-         if ( Tcl_Eval( interp, scmd ) != TCL_OK )
--            fprintf( stderr, "%s\n", interp->result );
-+            fprintf( stderr, "%s\n", Tcl_GetStringResult(interp) );
-     }
- }
- 
-@@ -264,7 +264,7 @@
-         sprintf( cmd, "send %s \"set client [tk appname]; wm deiconify .\"", rem_interp );
-         if ( Tcl_Eval( interp, cmd ) != TCL_OK )
-         {
--            fprintf( stderr, "%s\n", interp->result );
-+            fprintf( stderr, "%s\n", Tcl_GetStringResult(interp) );
-             plexit( "No such tk server." );
-         }
-     }
-@@ -301,7 +301,7 @@
-     // Set up device parameters
- 
-     Tcl_Eval( interp, "tk scaling" ); // pixels per mm
--    ppm = (PLFLT) atof( interp->result ) / ( 25.4 / 72. );
-+    ppm = (PLFLT) atof( Tcl_GetStringResult(interp) ) / ( 25.4 / 72. );
-     plP_setpxl( ppm, ppm );
-     plP_setphy( xmin, xmax * scale, ymin, ymax * scale );
- }
-@@ -371,11 +371,11 @@
-         {
-             tk_cmd( "update" );
-             tk_cmd( "info exists keypress" );
--            sscanf( interp->result, "%d", &st );
-+            sscanf( Tcl_GetStringResult(interp), "%d", &st );
-         }
- 
-         tk_cmd( "set keypress" );
--        sscanf( interp->result, "%d", &key );
-+        sscanf( Tcl_GetStringResult(interp), "%d", &key );
- //fprintf(stderr,"\n%d\n", key);fflush(stderr);
-         tk_cmd( "unset keypress" );
-         st = 0;
-@@ -433,7 +433,7 @@
-         {
-             tk_cmd( "update" );
-             tk_cmd( "winfo exists $plf.f2.c$ccanv" );
--            sscanf( interp->result, "%d", &st );
-+            sscanf( Tcl_GetStringResult(interp), "%d", &st );
-         }
-         st = 0;
-         // this give a "Segmentation fault", even after checking for the canvas!
-@@ -450,16 +450,16 @@
-     {
-         tk_cmd( "update" );
-         tk_cmd( "info exists xloc" );
--        sscanf( interp->result, "%d", &st );
-+        sscanf( Tcl_GetStringResult(interp), "%d", &st );
-     }
-     tk_cmd( "set xloc" );
--    sscanf( interp->result, "%d", &gin.pX );
-+    sscanf( Tcl_GetStringResult(interp), "%d", &gin.pX );
-     tk_cmd( "set yloc" );
--    sscanf( interp->result, "%d", &gin.pY );
-+    sscanf( Tcl_GetStringResult(interp), "%d", &gin.pY );
-     tk_cmd( "set bloc" );
--    sscanf( interp->result, "%d", &gin.button );
-+    sscanf( Tcl_GetStringResult(interp), "%d", &gin.button );
-     tk_cmd( "set sloc" );
--    sscanf( interp->result, "%d", &gin.state );
-+    sscanf( Tcl_GetStringResult(interp), "%d", &gin.state );
- 
-     gin.dX = (PLFLT) gin.pX / xmax;
-     gin.dY = 1. - (PLFLT) gin.pY / ymax;
diff --git a/sci-libs/plplot/files/plplot-5.9.10-tcltk.patch b/sci-libs/plplot/files/plplot-5.9.10-tcltk.patch
deleted file mode 100644
index 01b664b351cd..000000000000
--- a/sci-libs/plplot/files/plplot-5.9.10-tcltk.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-Allow itcl and itk 4.0.0, applied upstream in trunk
-bicatali nov 2013
-
---- cmake/modules/tcl-related.cmake.orig	2013-11-05 11:31:42.436587456 -0800
-+++ cmake/modules/tcl-related.cmake	2013-11-05 11:31:54.411661141 -0800
-@@ -85,16 +85,16 @@
- 	OUTPUT_VARIABLE AVAILABLE_ITCL)
-       if(AVAILABLE_ITCL)
-         execute_process(
--	COMMAND ${TCL_TCLSH} GetITCL_Version.tcl
--	WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/cmake/modules
--	OUTPUT_VARIABLE itcl_library_versions)
-+	  COMMAND ${TCL_TCLSH} GetITCL_Version.tcl
-+	  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/cmake/modules
-+	  OUTPUT_VARIABLE itcl_library_versions)
-         message(STATUS "Looking for itcl.h")
-         find_path(ITCL_INCLUDE_PATH itcl.h ${TCL_INCLUDE_PATH})
-         if(ITCL_INCLUDE_PATH)
-           message(STATUS "Looking for itcl.h - found")
-           message(STATUS "Looking for itcl library")
--	get_filename_component(TCL_LIBRARY_PATH ${TCL_LIBRARY} PATH)
--          set(itcl_library_versions 3.4 3.3 3.2 3.1 3.0 2.1 2.0)
-+          get_filename_component(TCL_LIBRARY_PATH ${TCL_LIBRARY} PATH)
-+          set(itcl_library_versions 4.0.0 3.4 3.3 3.2 3.1 3.0 2.1 2.0)
-           foreach(version ${itcl_library_versions})
-             find_library(ITCL_LIBRARY itcl${version} PATHS ${TCL_LIBRARY_PATH}
-               PATH_SUFFIXES itcl${version})
-@@ -132,13 +132,21 @@
-     else(ENABLE_itcl)
-       set(MKTCLINDEX_ARGS "-tcl")
-     endif(ENABLE_itcl)
-+
-     if(ENABLE_tk AND NOT X11_FOUND)
-       message(STATUS "WARNING: X11 not found, disabling Tk interface code")
-       set(ENABLE_tk OFF CACHE BOOL "Enable Tk interface code" FORCE)
-     endif(ENABLE_tk AND NOT X11_FOUND)
-     if(ENABLE_tk)
-+      get_filename_component(TK_LIBRARY_PATH ${TK_LIBRARY} PATH)
-+      if(NOT ${TK_LIBRARY_PATH} STREQUAL ${TCL_LIBRARY_PATH})
-+	message(STATUS "TCL_LIBRARY_PATH = ${TCL_LIBRARY_PATH}")
-+	message(STATUS "TK_LIBRARY_PATH = ${TK_LIBRARY_PATH}")
-+	message(STATUS "WARNING: the Tcl and Tk library locations are inconsistent so those libraries are likely not compatible")
-+      endif(NOT ${TK_LIBRARY_PATH} STREQUAL ${TCL_LIBRARY_PATH})
-+    endif(ENABLE_tk)
-+    if(ENABLE_tk)
-       set(TK_INCLUDE_PATH ${TK_INCLUDE_PATH} ${X11_INCLUDE_DIR})
--      set(TK_LIBRARY ${TK_LIBRARY})
-       message(STATUS "TK_INCLUDE_PATH = ${TK_INCLUDE_PATH}")
-       message(STATUS "TK_LIBRARY = ${TK_LIBRARY}")
-     else(ENABLE_tk)
-@@ -153,9 +161,9 @@
-       if(ITK_INCLUDE_PATH)
-         message(STATUS "Looking for itk.h - found")
-         message(STATUS "Looking for itk library")
--        set(itk_library_versions 3.4 3.3 3.2 3.1 3.0 2.1 2.0)
-+        set(itk_library_versions 4.0.0 3.4 3.3 3.2 3.1 3.0 2.1 2.0)
-         foreach(version ${itk_library_versions})
--          find_library(ITK_LIBRARY itk${version}
-+          find_library(ITK_LIBRARY itk${version} PATHS ${TCL_LIBRARY_PATH}
-             PATH_SUFFIXES itk${version})
-         endforeach(version ${itk_library_versions})
-         if(ITK_LIBRARY)
---- bindings/tk/tkMain.c.orig	2013-11-05 11:34:29.219602234 -0800
-+++ bindings/tk/tkMain.c	2013-11-05 11:34:48.394718925 -0800
-@@ -85,7 +85,8 @@
- 
- // From tclIntDecls.h
- 
--#ifndef Tcl_Import_TCL_DECLARED
-+//#ifndef Tcl_Import_TCL_DECLARED
-+#if 0
- EXTERN int Tcl_Import _ANSI_ARGS_( ( Tcl_Interp * interp,
-                                      Tcl_Namespace * nsPtr, char * pattern,
-                                      int allowOverwrite ) );
diff --git a/sci-libs/plplot/files/plplot-5.9.9-CMakeLists.txt.patch b/sci-libs/plplot/files/plplot-5.9.9-CMakeLists.txt.patch
deleted file mode 100644
index 6bec2e54cc77..000000000000
--- a/sci-libs/plplot/files/plplot-5.9.9-CMakeLists.txt.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- trunk/scripts/CMakeLists.txt	2011/10/31 15:33:42	12018
-+++ trunk/scripts/CMakeLists.txt	2012/01/04 15:45:07	12116
-@@ -30,9 +30,9 @@
-   if(PLD_pstex)
-     set(scripts_SCRIPTS ${scripts_SCRIPTS} pstex2eps)
-   endif(PLD_pstex)
--  if (NOT ${scripts_SCRIPTS} STREQUAL "")
-+  if (NOT "${scripts_SCRIPTS}" STREQUAL "")
-     install(PROGRAMS ${scripts_SCRIPTS} DESTINATION ${BIN_DIR})
--  endif (NOT ${scripts_SCRIPTS} STREQUAL "")
-+  endif (NOT "${scripts_SCRIPTS}" STREQUAL "")
- endif(HAVE_BASH)
- 
- if(ENABLE_tcl OR ENABLE_tk)
diff --git a/sci-libs/plplot/files/plplot-5.9.9-no-pdftest.patch b/sci-libs/plplot/files/plplot-5.9.9-no-pdftest.patch
deleted file mode 100644
index 7e7e8263bad6..000000000000
--- a/sci-libs/plplot/files/plplot-5.9.9-no-pdftest.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- plplot_test/CMakeLists.txt.orig	2011-11-20 16:10:04.000000000 +0000
-+++ plplot_test/CMakeLists.txt	2011-11-20 16:10:24.000000000 +0000
-@@ -387,12 +387,6 @@
-       )
-   endif(PLD_pdfqt)
- 
--  if(PLD_pdf)
--    add_test(examples_pdf
--      ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=pdf"
--      )
--  endif(PLD_pdf)
--
-   if(CMP_EXECUTABLE OR DIFF_EXECUTABLE AND TAIL_EXECUTABLE)
-     configure_file(
-       test_diff.sh.in
diff --git a/sci-libs/plplot/files/plplot-5.9.9-tk86.patch b/sci-libs/plplot/files/plplot-5.9.9-tk86.patch
deleted file mode 100644
index 5d792070b4b2..000000000000
--- a/sci-libs/plplot/files/plplot-5.9.9-tk86.patch
+++ /dev/null
@@ -1,636 +0,0 @@
---- bindings/tk-x-plat/plplotter.c.ORIG	2011-10-13 02:43:01.000000000 +0200
-+++ bindings/tk-x-plat/plplotter.c	2013-01-12 16:42:48.930183645 +0100
-@@ -463,7 +463,7 @@
-     PlPlotterFirstInit( (ClientData) plPlotterPtr );
-     Tk_GeometryRequest( plPlotterPtr->tkwin, 200, 200 );
- 
--    interp->result = Tk_PathName( plPlotterPtr->tkwin );
-+    Tcl_SetResult(interp,(char*)Tk_PathName(plPlotterPtr->tkwin) ,TCL_VOLATILE);
- 
-     return TCL_OK;
- }
-@@ -2018,7 +2018,7 @@
- //
- // Results:
- //      The return value is a standard Tcl result.  If TCL_ERROR is
--//      returned, then interp->result contains an error message.
-+//      returned, then Tcl_GetStringResult(interp) contains an error message.
- //
- // Side effects:
- //      Configuration information, such as text string, colors, font, etc.
-@@ -2469,7 +2469,7 @@
-         plr->at_bop = 0;
-         if ( Tcl_Eval( interp, plPlotterPtr->bopCmd ) != TCL_OK )
-             fprintf( stderr, "Command \"%s\" failed:\n\t %s\n",
--                plPlotterPtr->bopCmd, interp->result );
-+                plPlotterPtr->bopCmd, Tcl_GetStringResult(interp) );
-     }
- 
- // Signal eop if necessary
-@@ -2479,7 +2479,7 @@
-         plr->at_eop = 0;
-         if ( Tcl_Eval( interp, plPlotterPtr->eopCmd ) != TCL_OK )
-             fprintf( stderr, "Command \"%s\" failed:\n\t %s\n",
--                plPlotterPtr->eopCmd, interp->result );
-+                plPlotterPtr->eopCmd, Tcl_GetStringResult(interp) );
-     }
- 
-     return result;
-@@ -2491,7 +2491,7 @@
-     {
-         if ( Tcl_Eval( interp, plPlotterPtr->eopCmd ) != TCL_OK )
-             fprintf( stderr, "Command \"%s\" failed:\n\t %s\n",
--                plPlotterPtr->eopCmd, interp->result );
-+                plPlotterPtr->eopCmd, Tcl_GetStringResult(interp) );
-     }
- }
- 
-@@ -2501,7 +2501,7 @@
-     {
-         if ( Tcl_Eval( interp, plPlotterPtr->bopCmd ) != TCL_OK )
-             fprintf( stderr, "Command \"%s\" failed:\n\t %s\n",
--                plPlotterPtr->bopCmd, interp->result );
-+                plPlotterPtr->bopCmd, Tcl_GetStringResult(interp ) );
-     }
- }
- 
-@@ -2536,7 +2536,7 @@
-         {
-         #endif
-             Tcl_AppendResult( interp, "Packet receive failed:\n\t %s\n",
--                interp->result, (char *) NULL );
-+                Tcl_GetStringResult(interp), (char *) NULL );
-             return TCL_ERROR;
-         }
- 
-@@ -3082,7 +3082,7 @@
- 
-     if ( argc == 0 )
-     {
--        interp->result = "report what?";
-+        Tcl_SetResult(interp,(char*)"report what?",TCL_VOLATILE);
-         return TCL_ERROR;
-     }
- 
-@@ -3093,7 +3093,7 @@
- 
-         if ( argc != 3 )
-         {
--            interp->result = "Wrong # of args: report wc x y";
-+            Tcl_SetResult(interp,(char*)"Wrong # of args: report wc x y",TCL_VOLATILE);
-             return TCL_ERROR;
-         }
- 
-@@ -3107,15 +3107,15 @@
- 
-         if ( plTranslateCursor( gin ) )
-         {
--            sprintf( interp->result, "%f %f", gin->wX, gin->wY );
-+            sprintf( Tcl_GetStringResult(interp), "%f %f", gin->wX, gin->wY );
-             return TCL_OK;
-         }
- 
--        interp->result = "Cannot locate";
-+        Tcl_SetResult(interp,(char*)"Cannot locate",TCL_VOLATILE);
-         return TCL_OK;
-     }
- 
--    interp->result = "nonsensical request.";
-+    Tcl_SetResult(interp,(char*)"nonsensical request.",TCL_VOLATILE);
-     return TCL_ERROR;
- }
- 
---- bindings/tk/tkshell.c.ORIG	2011-10-13 02:43:01.000000000 +0200
-+++ bindings/tk/tkshell.c	2013-01-12 16:46:41.288192370 +0100
-@@ -115,7 +115,7 @@
-         if ( Tcl_ExprBoolean( interp, argv[1], &result ) )
-         {
-             fprintf( stderr, "wait_until command \"%s\" failed:\n\t %s\n",
--                argv[1], interp->result );
-+                argv[1], Tcl_GetStringResult(interp) );
-             break;
-         }
-         if ( result )
---- bindings/tk/plserver.c.ORIG	2011-10-13 02:43:01.000000000 +0200
-+++ bindings/tk/plserver.c	2013-01-12 16:48:21.973196151 +0100
-@@ -126,11 +126,11 @@
-     if ( Tk_ParseArgv( interp, (Tk_Window) NULL, &argc, argv,
-              argTable, TK_ARGV_NO_DEFAULTS ) != TCL_OK )
-     {
--        fprintf( stderr, "\n(plserver) %s\n\n", interp->result );
-+        fprintf( stderr, "\n(plserver) %s\n\n", Tcl_GetStringResult(interp) );
-         fprintf( stderr, "\
- The client_<xxx> and -child options should not be used except via the\n\
- PLplot/Tk driver.\n\n(wish) " );
--        if ( strncmp( interp->result, helpmsg, strlen( helpmsg ) ) )
-+        if ( strncmp( Tcl_GetStringResult(interp), helpmsg, strlen( helpmsg ) ) )
-             exit( 1 );
-     }
- 
-@@ -158,7 +158,7 @@
- //
- // Results:
- //	Returns a standard Tcl completion code, and leaves an error
--//	message in interp->result if an error occurs.
-+//	message in Tcl_GetStringResult(interp) if an error occurs.
- //
- // Side effects:
- //	Depends on the startup script.
-@@ -257,8 +257,8 @@
- 
- // Print error message if one given
- 
--    if ( interp->result != NULL && interp->result[0] != '\0' )
--        fprintf( stderr, "%s\n", interp->result );
-+    if ( Tcl_GetStringResult(interp) != NULL && Tcl_GetStringResult(interp)[0] != '\0' )
-+        fprintf( stderr, "%s\n", Tcl_GetStringResult(interp) );
- 
- // Best to check the syntax before proceeding
- 
---- bindings/tk/tkMain.c.ORIG	2011-10-13 02:43:01.000000000 +0200
-+++ bindings/tk/tkMain.c	2013-01-13 08:19:02.722238116 +0100
-@@ -85,17 +85,6 @@
- 
- // From tclIntDecls.h
- 
--#ifndef Tcl_Import_TCL_DECLARED
--EXTERN int Tcl_Import _ANSI_ARGS_( ( Tcl_Interp * interp,
--                                     Tcl_Namespace * nsPtr, char * pattern,
--                                     int allowOverwrite ) );
--#endif
--
--#ifndef Tcl_GetGlobalNamespace_TCL_DECLARE
--EXTERN Tcl_Namespace * Tcl_GetGlobalNamespace _ANSI_ARGS_( (
--                                                               Tcl_Interp * interp ) );
--#endif
--
- //
- // Declarations for various library procedures and variables (don't want
- // to include tkInt.h or tkConfig.h here, because people might copy this
-@@ -180,7 +180,7 @@
- pltkMain( int argc, const char **argv, char *RcFileName,
-           int ( *AppInit )( Tcl_Interp *interp ) )
- {
--    char       *args, *msg;
-+    char       *args; const char *msg;
-     const char *p;
-     char       buf[20];
-     int        code;
-@@ -202,7 +202,7 @@
-     if ( Tk_ParseArgv( interp, (Tk_Window) NULL, &argc, argv, argTable, 0 )
-          != TCL_OK )
-     {
--        fprintf( stderr, "%s\n", interp->result );
-+        fprintf( stderr, "%s\n", Tcl_GetStringResult(interp) );
-         exit( 1 );
-     }
-     if ( name == NULL )
-@@ -331,7 +331,7 @@
- 
-     if ( ( *AppInit )( interp ) != TCL_OK )
-     {
--        fprintf( stderr, "(*AppInit) failed: %s\n", interp->result );
-+        fprintf( stderr, "(*AppInit) failed: %s\n", Tcl_GetStringResult(interp) );
-     }
- 
-     //
-@@ -343,7 +343,7 @@
-         code = Tcl_VarEval( interp, "wm geometry . ", geometry, (char *) NULL );
-         if ( code != TCL_OK )
-         {
--            fprintf( stderr, "%s\n", interp->result );
-+            fprintf( stderr, "%s\n", Tcl_GetStringResult(interp) );
-         }
-     }
- 
-@@ -393,7 +393,7 @@
-             fullName = Tcl_TildeSubst( interp, RcFileName, &buffer );
-             if ( fullName == NULL )
-             {
--                fprintf( stderr, "%s\n", interp->result );
-+                fprintf( stderr, "%s\n", Tcl_GetStringResult(interp) );
-             }
-             else
-             {
-@@ -403,7 +403,7 @@
-                     code = Tcl_EvalFile( interp, fullName );
-                     if ( code != TCL_OK )
-                     {
--                        fprintf( stderr, "%s\n", interp->result );
-+                        fprintf( stderr, "%s\n", Tcl_GetStringResult(interp) );
-                     }
-                     fclose( f );
-                 }
-@@ -442,7 +442,7 @@
-     msg = (char *) Tcl_GetVar( interp, "errorInfo", TCL_GLOBAL_ONLY );
-     if ( msg == NULL )
-     {
--        msg = interp->result;
-+        msg = Tcl_GetStringResult(interp);
-     }
-     fprintf( stderr, "%s\n", msg );
-     Tcl_Eval( interp, errorExitCmd );
-@@ -535,11 +535,11 @@
-     Tk_CreateFileHandler( 0, TK_READABLE, StdinProc, (ClientData) 0 );
- #endif
-     Tcl_DStringFree( &command );
--    if ( *interp->result != 0 )
-+    if ( Tcl_GetStringResult(interp) )
-     {
-         if ( ( code != TCL_OK ) || ( tty ) )
-         {
--            printf( "%s\n", interp->result );
-+            printf( "%s\n", Tcl_GetStringResult(interp) );
-         }
-     }
- 
-@@ -599,7 +599,7 @@
-         {
-             Tcl_AddErrorInfo( interp,
-                 "\n    (script that generates prompt)" );
--            fprintf( stderr, "%s\n", interp->result );
-+            fprintf( stderr, "%s\n", Tcl_GetStringResult(interp) );
-             goto defaultPrompt;
-         }
-     }
---- bindings/tk/plframe.c.ORIG	2011-10-13 02:43:01.000000000 +0200
-+++ bindings/tk/plframe.c	2013-01-13 08:22:04.594239896 +0100
-@@ -484,7 +484,7 @@
-         Tk_DestroyWindow( plFramePtr->tkwin );
-         return TCL_ERROR;
-     }
--    interp->result = Tk_PathName( plFramePtr->tkwin );
-+    Tcl_SetResult(interp,(char*)Tk_PathName( plFramePtr->tkwin) ,TCL_VOLATILE);
- 
-     return TCL_OK;
- }
-@@ -616,7 +616,7 @@
-             {
-                 bcb.cmd = PLESC_DOUBLEBUFFERING_QUERY;
-                 pl_cmd( PLESC_DOUBLEBUFFERING, &bcb );
--                sprintf( interp->result, "%d", bcb.result );
-+                sprintf( Tcl_GetStringResult(interp), "%d", bcb.result );
-             }
-         }
- 
-@@ -2215,7 +2215,7 @@
- //
- // Results:
- //	The return value is a standard Tcl result.  If TCL_ERROR is
--//	returned, then interp->result contains an error message.
-+//	returned, then Tcl_GetStringResult(interp) contains an error message.
- //
- // Side effects:
- //	Configuration information, such as text string, colors, font, etc.
-@@ -2675,7 +2675,7 @@
-         plr->at_bop = 0;
-         if ( Tcl_Eval( interp, plFramePtr->bopCmd ) != TCL_OK )
-             fprintf( stderr, "Command \"%s\" failed:\n\t %s\n",
--                plFramePtr->bopCmd, interp->result );
-+                plFramePtr->bopCmd, Tcl_GetStringResult(interp) );
-     }
- 
- // Signal eop if necessary
-@@ -2685,7 +2685,7 @@
-         plr->at_eop = 0;
-         if ( Tcl_Eval( interp, plFramePtr->eopCmd ) != TCL_OK )
-             fprintf( stderr, "Command \"%s\" failed:\n\t %s\n",
--                plFramePtr->eopCmd, interp->result );
-+                plFramePtr->eopCmd, Tcl_GetStringResult(interp) );
-     }
- 
-     return result;
-@@ -3275,7 +3275,7 @@
- 
-     if ( argc == 0 )
-     {
--        interp->result = "report what?";
-+        Tcl_SetResult(interp,(char*)"report what?",TCL_VOLATILE);
-         return TCL_ERROR;
-     }
- 
-@@ -3286,7 +3286,7 @@
- 
-         if ( argc != 3 )
-         {
--            interp->result = "Wrong # of args: report wc x y";
-+            Tcl_SetResult(interp,(char*)"Wrong # of args: report wc x y",TCL_VOLATILE);
-             return TCL_ERROR;
-         }
- 
-@@ -3300,15 +3300,15 @@
- 
-         if ( plTranslateCursor( gin ) )
-         {
--            sprintf( interp->result, "%f %f", gin->wX, gin->wY );
-+            sprintf( Tcl_GetStringResult(interp), "%f %f", gin->wX, gin->wY );
-             return TCL_OK;
-         }
- 
--        interp->result = "Cannot locate";
-+        Tcl_SetResult(interp,(char*)"Cannot locate",TCL_VOLATILE);
-         return TCL_OK;
-     }
- 
--    interp->result = "nonsensical request.";
-+    Tcl_SetResult(interp,(char*)"nonsensical request.",TCL_VOLATILE);
-     return TCL_ERROR;
- }
- 
-@@ -3324,7 +3324,7 @@
- 
-     if ( Tcl_Eval( plFramePtr->interp, plFramePtr->bopCmd ) != TCL_OK )
-         fprintf( stderr, "Command \"%s\" failed:\n\t %s\n",
--            plFramePtr->bopCmd, plFramePtr->interp->result );
-+            plFramePtr->bopCmd, Tcl_GetStringResult(plFramePtr->interp) );
- }
- 
- //--------------------------------------------------------------------------
-@@ -3339,7 +3339,7 @@
- 
-     if ( Tcl_Eval( plFramePtr->interp, plFramePtr->eopCmd ) != TCL_OK )
-         fprintf( stderr, "Command \"%s\" failed:\n\t %s\n",
--            plFramePtr->eopCmd, plFramePtr->interp->result );
-+            plFramePtr->eopCmd, Tcl_GetStringResult(plFramePtr->interp) );
- }
- 
- //--------------------------------------------------------------------------
---- utils/pltcl.c.ORIG	2011-10-13 02:43:01.000000000 +0200
-+++ utils/pltcl.c	2013-01-13 08:22:33.877240182 +0100
-@@ -119,7 +119,7 @@
- //
- // Results:
- //	Returns a standard Tcl completion code, and leaves an error
--//	message in interp->result if an error occurs.
-+//	message in Tcl_GetStringResult(interp) if an error occurs.
- //
- // Side effects:
- //	Depends on the startup script.
---- doc/docbook/src/plplotdoc.info-1.ORIG	2011-10-13 02:43:01.000000000 +0200
-+++ doc/docbook/src/plplotdoc.info-1	2013-01-13 08:23:13.171240567 +0100
-@@ -6435,7 +6435,7 @@
-      	if (pm->fdata[i] > max)
-      	max = pm->fdata[i];
- 
--     	sprintf( interp->result, "%f", max );
-+     	sprintf( Tcl_GetStringResult(interp), "%f", max );
-      	return TCL_OK;
-      	}
- 
-@@ -6448,7 +6448,7 @@
-      	if (pm->fdata[i] < min)
-      	min = pm->fdata[i];
- 
--     	sprintf( interp->result, "%f", min );
-+     	sprintf( Tcl_GetStringResult(interp), "%f", min );
-      	return TCL_OK;
-      	}
- 
---- doc/docbook/src/plplotdoc.texi.ORIG	2011-10-13 02:43:01.000000000 +0200
-+++ doc/docbook/src/plplotdoc.texi	2013-01-13 08:23:38.331240813 +0100
-@@ -6722,7 +6722,7 @@
- 	if (pm->fdata[i] > max)
- 	max = pm->fdata[i];
- 
--	sprintf( interp->result, "%f", max );
-+	sprintf( Tcl_GetStringResult(interp), "%f", max );
- 	return TCL_OK;
- 	@}
- 
-@@ -6735,7 +6735,7 @@
- 	if (pm->fdata[i] < min)
- 	min = pm->fdata[i];
- 
--	sprintf( interp->result, "%f", min );
-+	sprintf( Tcl_GetStringResult(interp), "%f", min );
- 	return TCL_OK;
- 	@}
-       
---- doc/docbook/src/tcl.xml.ORIG	2011-10-13 02:43:01.000000000 +0200
-+++ doc/docbook/src/tcl.xml	2013-01-13 08:24:03.573241060 +0100
-@@ -576,7 +576,7 @@
- 	if (pm->fdata[i] > max)
- 	max = pm->fdata[i];
- 
--	sprintf( interp->result, "%f", max );
-+	sprintf( Tcl_GetStringResult(interp), "%f", max );
- 	return TCL_OK;
- 	}
- 
-@@ -589,7 +589,7 @@
- 	if (pm->fdata[i] &lt; min)
- 	min = pm->fdata[i];
- 
--	sprintf( interp->result, "%f", min );
-+	sprintf( Tcl_GetStringResult(interp), "%f", min );
- 	return TCL_OK;
- 	}
-       </programlisting>
---- drivers/ntk.c.ORIG	2011-10-13 02:43:01.000000000 +0200
-+++ drivers/ntk.c	2013-01-13 08:24:39.460241411 +0100
-@@ -115,7 +115,7 @@
-         //
-         sprintf( scmd, "send %s {%s}", rem_interp, cmd ); // mess! make it more efficient
-         if ( Tcl_Eval( interp, scmd ) != TCL_OK )
--            fprintf( stderr, "%s\n", interp->result );
-+            fprintf( stderr, "%s\n", Tcl_GetStringResult(interp) );
-     }
- }
- 
-@@ -264,7 +264,7 @@
-         sprintf( cmd, "send %s \"set client [tk appname]; wm deiconify .\"", rem_interp );
-         if ( Tcl_Eval( interp, cmd ) != TCL_OK )
-         {
--            fprintf( stderr, "%s\n", interp->result );
-+            fprintf( stderr, "%s\n", Tcl_GetStringResult(interp) );
-             plexit( "No such tk server." );
-         }
-     }
-@@ -301,7 +301,7 @@
-     // Set up device parameters
- 
-     Tcl_Eval( interp, "tk scaling" ); // pixels per mm
--    ppm = (PLFLT) atof( interp->result ) / ( 25.4 / 72. );
-+    ppm = (PLFLT) atof( Tcl_GetStringResult(interp) ) / ( 25.4 / 72. );
-     plP_setpxl( ppm, ppm );
-     plP_setphy( xmin, xmax * scale, ymin, ymax * scale );
- }
-@@ -371,11 +371,11 @@
-         {
-             tk_cmd( "update" );
-             tk_cmd( "info exists keypress" );
--            sscanf( interp->result, "%d", &st );
-+            sscanf( Tcl_GetStringResult(interp), "%d", &st );
-         }
- 
-         tk_cmd( "set keypress" );
--        sscanf( interp->result, "%d", &key );
-+        sscanf( Tcl_GetStringResult(interp), "%d", &key );
- //fprintf(stderr,"\n%d\n", key);fflush(stderr);
-         tk_cmd( "unset keypress" );
-         st = 0;
-@@ -433,7 +433,7 @@
-         {
-             tk_cmd( "update" );
-             tk_cmd( "winfo exists $plf.f2.c$ccanv" );
--            sscanf( interp->result, "%d", &st );
-+            sscanf( Tcl_GetStringResult(interp), "%d", &st );
-         }
-         st = 0;
-         // this give a "Segmentation fault", even after checking for the canvas!
-@@ -450,16 +450,16 @@
-     {
-         tk_cmd( "update" );
-         tk_cmd( "info exists xloc" );
--        sscanf( interp->result, "%d", &st );
-+        sscanf( Tcl_GetStringResult(interp), "%d", &st );
-     }
-     tk_cmd( "set xloc" );
--    sscanf( interp->result, "%d", &gin.pX );
-+    sscanf( Tcl_GetStringResult(interp), "%d", &gin.pX );
-     tk_cmd( "set yloc" );
--    sscanf( interp->result, "%d", &gin.pY );
-+    sscanf( Tcl_GetStringResult(interp), "%d", &gin.pY );
-     tk_cmd( "set bloc" );
--    sscanf( interp->result, "%d", &gin.button );
-+    sscanf( Tcl_GetStringResult(interp), "%d", &gin.button );
-     tk_cmd( "set sloc" );
--    sscanf( interp->result, "%d", &gin.state );
-+    sscanf( Tcl_GetStringResult(interp), "%d", &gin.state );
- 
-     gin.dX = (PLFLT) gin.pX / xmax;
-     gin.dY = 1. - (PLFLT) gin.pY / ymax;
---- drivers/tk.c.ORIG	2011-10-13 02:43:01.000000000 +0200
-+++ drivers/tk.c	2013-01-13 08:25:10.959241719 +0100
-@@ -764,7 +764,7 @@
- 
-     if ( Tcl_Init( dev->interp ) != TCL_OK )
-     {
--        fprintf( stderr, "%s\n", dev->interp->result );
-+        fprintf( stderr, "%s\n", Tcl_GetStringResult(dev->interp) );
-         abort_session( pls, "Unable to initialize Tcl" );
-     }
- 
-@@ -1568,7 +1568,7 @@
-                  0, 1, ( ClientData ) & iodev->file ) != TCL_OK )
-         {
-             fprintf( stderr, "Cannot get file info:\n\t %s\n",
--                dev->interp->result );
-+                Tcl_GetStringResult(dev->interp) );
-             abort_session( pls, "" );
-         }
-         iodev->fd = fileno( iodev->file );
-@@ -1673,7 +1673,7 @@
-         if ( pl_PacketSend( dev->interp, dev->iodev, pls->pdfs ) )
-         {
-             fprintf( stderr, "Packet send failed:\n\t %s\n",
--                dev->interp->result );
-+                Tcl_GetStringResult(dev->interp) );
-             abort_session( pls, "" );
-         }
-         pdfs->bp = 0;
-@@ -2131,7 +2131,7 @@
- 
-     if ( Tk_Init( interp ) )
-     {
--        fprintf( stderr, "tk_init:%s\n", interp->result );
-+        fprintf( stderr, "tk_init:%s\n", Tcl_GetStringResult(interp) );
-         return 1;
-     }
- 
-@@ -2165,7 +2165,7 @@
-         if ( Tcl_ExprBoolean( dev->interp, dev->cmdbuf, &result ) )
-         {
-             fprintf( stderr, "tk_wait command \"%s\" failed:\n\t %s\n",
--                cmd, dev->interp->result );
-+                cmd, Tcl_GetStringResult(dev->interp) );
-             break;
-         }
-         if ( result )
-@@ -2225,7 +2225,7 @@
-     if ( result != TCL_OK )
-     {
-         fprintf( stderr, "Server command \"%s\" failed:\n\t %s\n",
--            cmd, dev->interp->result );
-+            cmd, Tcl_GetStringResult(dev->interp) );
-         abort_session( pls, "" );
-     }
- }
-@@ -2247,7 +2247,7 @@
-     if ( Tcl_VarEval( dev->interp, cmd, (char **) NULL ) != TCL_OK )
-     {
-         fprintf( stderr, "TCL command \"%s\" failed:\n\t %s\n",
--            cmd, dev->interp->result );
-+            cmd, Tcl_GetStringResult(dev->interp) );
-         abort_session( pls, "" );
-     }
- }
---- examples/tk/xtk01.c.ORIG	2011-10-13 02:43:01.000000000 +0200
-+++ examples/tk/xtk01.c	2013-01-13 08:25:33.757241943 +0100
-@@ -53,7 +53,7 @@
- //
- // Results:
- //	Returns a standard Tcl completion code, and leaves an error
--//	message in interp->result if an error occurs.
-+//	message in Tcl_GetStringResult(interp) if an error occurs.
- //
- // Side effects:
- //	Depends on the startup script.
---- examples/tk/xtk02.c.ORIG	2011-10-13 02:43:01.000000000 +0200
-+++ examples/tk/xtk02.c	2013-01-13 08:26:06.804242266 +0100
-@@ -49,7 +49,7 @@
-         pm->fdata[i] = y;
-     }
- 
--    interp->result = "Things are cool in gumbyville.";
-+    Tcl_SetResult(interp,(char*)"Things are cool in gumbyville.",TCL_VOLATILE);
-     return TCL_OK;
- }
- 
-@@ -82,7 +82,7 @@
- //
- // Results:
- //	Returns a standard Tcl completion code, and leaves an error
--//	message in interp->result if an error occurs.
-+//	message in Tcl_GetStringResult(interp) if an error occurs.
- //
- // Side effects:
- //	Depends on the startup script.
---- examples/tk/xtk04.c.ORIG	2011-10-13 02:43:01.000000000 +0200
-+++ examples/tk/xtk04.c	2013-01-13 08:26:38.853242580 +0100
-@@ -35,7 +35,7 @@
-         if ( pm->fdata[i] > max )
-             max = pm->fdata[i];
- 
--    sprintf( interp->result, "%f", max );
-+    sprintf( Tcl_GetStringResult(interp), "%f", max );
-     return TCL_OK;
- }
- 
-@@ -48,7 +48,7 @@
-         if ( pm->fdata[i] < min )
-             min = pm->fdata[i];
- 
--    sprintf( interp->result, "%f", min );
-+    sprintf( Tcl_GetStringResult(interp), "%f", min );
-     return TCL_OK;
- }
- 
-@@ -80,7 +80,7 @@
- //
- // Results:
- //	Returns a standard Tcl completion code, and leaves an error
--//	message in interp->result if an error occurs.
-+//	message in Tcl_GetStringResult(interp) if an error occurs.
- //
- // Side effects:
- //	Depends on the startup script.
-@@ -158,7 +158,7 @@
- 
-     if ( pm->dim != 2 )
-     {
--        interp->result = "must use 2-d matrix.";
-+        Tcl_SetResult(interp,(char*)"must use 2-d matrix.",TCL_VOLATILE);
-         return TCL_ERROR;
-     }
-