5 files changed, 23 insertions, 115 deletions

diff --git a/math/plplot/files/patch-bindings__tk__tkMain.c b/math/plplot/files/patch-bindings__tk__tkMain.c
index 971d4f41d97a..41fd34f6ece2 100644
--- a/math/plplot/files/patch-bindings__tk__tkMain.c
+++ b/math/plplot/files/patch-bindings__tk__tkMain.c
@@ -1,20 +1,13 @@
---- bindings/tk/tkMain.c.orig	2013-01-30 00:36:01.000000000 +0100
-+++ bindings/tk/tkMain.c	2013-10-01 22:51:31.000000000 +0200
-@@ -85,17 +85,6 @@
+--- bindings/tk/tkMain.c.orig	2013-12-18 20:25:14.000000000 -0500
++++ bindings/tk/tkMain.c
+@@ -92,10 +92,6 @@ EXTERN int Tcl_Import _ANSI_ARGS_( ( Tcl
+                                      int allowOverwrite ) );
+ #endif
  
- // 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
diff --git a/math/plplot/files/patch-cmake_modules_instdirs.cmake b/math/plplot/files/patch-cmake_modules_instdirs.cmake
index a9b98637ae64..389c9836f889 100644
--- a/math/plplot/files/patch-cmake_modules_instdirs.cmake
+++ b/math/plplot/files/patch-cmake_modules_instdirs.cmake
@@ -1,6 +1,6 @@
---- ./cmake/modules/instdirs.cmake.orig	2009-09-06 21:04:43.000000000 +0200
-+++ ./cmake/modules/instdirs.cmake	2009-12-26 22:13:15.000000000 +0100
-@@ -61,13 +61,13 @@
+--- cmake/modules/instdirs.cmake.orig	2013-11-11 19:54:54.000000000 -0500
++++ cmake/modules/instdirs.cmake
+@@ -61,13 +61,13 @@ CACHE PATH "install location for C heade
  
  set(
  CMAKE_INSTALL_INFODIR
@@ -16,29 +16,29 @@
  CACHE PATH "install location for man documentation"
  )
  
-@@ -75,7 +75,7 @@
+@@ -75,7 +75,7 @@ CACHE PATH "install location for man doc
  # cached values above.
  
  # Data.
--set(DATA_DIR ${CMAKE_INSTALL_DATADIR}/${PACKAGE}${VERSION})
+-set(DATA_DIR ${CMAKE_INSTALL_DATADIR}/${PACKAGE}${PLPLOT_VERSION})
 +set(DATA_DIR ${CMAKE_INSTALL_DATADIR}/${PACKAGE})
  
  # Libraries.
  set(LIB_DIR ${CMAKE_INSTALL_LIBDIR})
-@@ -90,7 +90,7 @@
+@@ -90,7 +90,7 @@ set(BIN_DIR ${CMAKE_INSTALL_BINDIR})
  set(SHLIB_DIR ${CMAKE_INSTALL_LIBDIR})
  
  # Tcl files.
--set(TCL_DIR ${CMAKE_INSTALL_DATADIR}/${PACKAGE}${VERSION}/tcl)
+-set(TCL_DIR ${CMAKE_INSTALL_DATADIR}/${PACKAGE}${PLPLOT_VERSION}/tcl)
 +set(TCL_DIR ${CMAKE_INSTALL_DATADIR}/${PACKAGE}/tcl)
  
  # Ada source files (*.adb, *.ads) (following recommendations in
  # http://www.ada-france.org/debian/debian-ada-policy.html
-@@ -101,7 +101,7 @@
+@@ -101,7 +101,7 @@ set(ADA_INCLUDE_DIR ${CMAKE_INSTALL_DATA
  set(ADA_LIB_DIR ${CMAKE_INSTALL_LIBDIR}/ada/adalib/plplotada${LIB_TAG})
  
  # Drivers.
--set(DRV_DIR ${CMAKE_INSTALL_LIBDIR}/${PACKAGE}${VERSION}/drivers${LIB_TAG})
+-set(DRV_DIR ${CMAKE_INSTALL_LIBDIR}/${PACKAGE}${PLPLOT_VERSION}/drivers${LIB_TAG})
 +set(DRV_DIR ${CMAKE_INSTALL_LIBDIR}/${PACKAGE}/drivers${LIB_TAG})
  
  # Documentation.
diff --git a/math/plplot/files/patch-cmake_modules_pkg-config.cmake b/math/plplot/files/patch-cmake_modules_pkg-config.cmake
index 8c810e94c462..a99f5140a1b8 100644
--- a/math/plplot/files/patch-cmake_modules_pkg-config.cmake
+++ b/math/plplot/files/patch-cmake_modules_pkg-config.cmake
@@ -1,11 +1,11 @@
---- cmake/modules/pkg-config.cmake.orig	2012-01-05 14:59:36.000000000 +0100
-+++ cmake/modules/pkg-config.cmake	2013-10-01 23:01:57.000000000 +0200
-@@ -39,7 +39,7 @@
+--- cmake/modules/pkg-config.cmake.orig	2014-02-06 00:06:07.000000000 -0500
++++ cmake/modules/pkg-config.cmake
+@@ -39,7 +39,7 @@ include(FindPkgConfig)
  
  if(PKG_CONFIG_EXECUTABLE)
    message(STATUS "Looking for pkg-config - found")
--  set(PKG_CONFIG_DIR ${LIB_DIR}/pkgconfig)
-+  set(PKG_CONFIG_DIR ${LIB_DIR}data/pkgconfig)
-   set(PKG_CONFIG_ENV PKG_CONFIG_PATH=${PKG_CONFIG_DIR})
- else(PKG_CONFIG_EXECUTABLE)
-   message(STATUS "Looking for pkg-config - not found")
+-  set(PKG_CONFIG_DIR "${LIB_DIR}/pkgconfig")
++  set(PKG_CONFIG_DIR "${LIB_DIR}data/pkgconfig")
+   set(env_PKG_CONFIG_PATH $ENV{PKG_CONFIG_PATH})
+ 
+   # Will likely need WIN32 and CYGWIN stanzas as well
diff --git a/math/plplot/files/patch-drivers__ntk.c b/math/plplot/files/patch-drivers__ntk.c
deleted file mode 100644
index ff18c65e6e51..000000000000
--- a/math/plplot/files/patch-drivers__ntk.c
+++ /dev/null
@@ -1,74 +0,0 @@
---- drivers/ntk.c.orig
-+++ drivers/ntk.c
-@@ -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/math/plplot/files/patch-util__pltcl.c b/math/plplot/files/patch-util__pltcl.c
deleted file mode 100644
index 6842580295c6..000000000000
--- a/math/plplot/files/patch-util__pltcl.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- utils/pltcl.c.orig
-+++ utils/pltcl.c
-@@ -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.