- Upgrade to 5.9.10

  Changelog at http://sourceforge.net/p/plplot/news/2013/10/plplot-release-5910/

- Pet portlint

- Use staging.

12 files changed, 30 insertions, 456 deletions

diff --git a/math/plplot/files/patch-bindings__tk-x-plat__plolotter.c b/math/plplot/files/patch-bindings__tk-x-plat__plolotter.c
index d1f6c28d495c..89323144928a 100644
--- a/math/plplot/files/patch-bindings__tk-x-plat__plolotter.c
+++ b/math/plplot/files/patch-bindings__tk-x-plat__plolotter.c
@@ -1,15 +1,6 @@
---- bindings/tk-x-plat/plplotter.c.orig
-+++ bindings/tk-x-plat/plplotter.c
-@@ -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 @@
+--- bindings/tk-x-plat/plplotter.c.orig	2012-08-14 00:14:23.000000000 +0200
++++ bindings/tk-x-plat/plplotter.c	2013-10-01 22:42:16.000000000 +0200
+@@ -2024,7 +2024,7 @@
  //
  // Results:
  //      The return value is a standard Tcl result.  If TCL_ERROR is
@@ -18,85 +9,3 @@
  //
  // 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;
- }
- 
diff --git a/math/plplot/files/patch-bindings__tk__plframe.c b/math/plplot/files/patch-bindings__tk__plframe.c
index a92a268d6e23..3b668d512ab3 100644
--- a/math/plplot/files/patch-bindings__tk__plframe.c
+++ b/math/plplot/files/patch-bindings__tk__plframe.c
@@ -1,24 +1,6 @@
---- bindings/tk/plframe.c.orig
-+++ bindings/tk/plframe.c
-@@ -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 @@
+--- bindings/tk/plframe.c.orig	2012-08-14 00:14:23.000000000 +0200
++++ bindings/tk/plframe.c	2013-10-01 22:47:19.000000000 +0200
+@@ -2218,7 +2218,7 @@
  //
  // Results:
  //	The return value is a standard Tcl result.  If TCL_ERROR is
@@ -27,76 +9,3 @@
  //
  // 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) );
- }
- 
- //--------------------------------------------------------------------------
diff --git a/math/plplot/files/patch-bindings__tk__plserver.c b/math/plplot/files/patch-bindings__tk__plserver.c
index 17b940fed902..1822c2943dc9 100644
--- a/math/plplot/files/patch-bindings__tk__plserver.c
+++ b/math/plplot/files/patch-bindings__tk__plserver.c
@@ -1,19 +1,5 @@
---- bindings/tk/plserver.c.orig
-+++ bindings/tk/plserver.c
-@@ -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 );
-     }
- 
+--- bindings/tk/plserver.c.orig	2013-04-26 12:02:06.000000000 +0200
++++ bindings/tk/plserver.c	2013-10-01 22:49:59.000000000 +0200
 @@ -158,7 +158,7 @@
  //
  // Results:
@@ -23,14 +9,3 @@
  //
  // 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
- 
diff --git a/math/plplot/files/patch-bindings__tk__tkMain.c b/math/plplot/files/patch-bindings__tk__tkMain.c
index bc097f4c9a26..971d4f41d97a 100644
--- a/math/plplot/files/patch-bindings__tk__tkMain.c
+++ b/math/plplot/files/patch-bindings__tk__tkMain.c
@@ -1,5 +1,5 @@
---- bindings/tk/tkMain.c.orig
-+++ bindings/tk/tkMain.c
+--- 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 @@
  
  // From tclIntDecls.h
@@ -18,89 +18,3 @@
  //
  // 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 +169,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 +191,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 +320,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 +332,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 +382,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 +392,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 +431,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 +524,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 +588,7 @@
-         {
-             Tcl_AddErrorInfo( interp,
-                 "\n    (script that generates prompt)" );
--            fprintf( stderr, "%s\n", interp->result );
-+            fprintf( stderr, "%s\n", Tcl_GetStringResult(interp) );
-             goto defaultPrompt;
-         }
-     }
diff --git a/math/plplot/files/patch-bindings__tk__tkshell.c b/math/plplot/files/patch-bindings__tk__tkshell.c
deleted file mode 100644
index 94bf522f214a..000000000000
--- a/math/plplot/files/patch-bindings__tk__tkshell.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- bindings/tk/tkshell.c.orig
-+++ bindings/tk/tkshell.c
-@@ -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 )
diff --git a/math/plplot/files/patch-cmake_modules_pkg-config.cmake b/math/plplot/files/patch-cmake_modules_pkg-config.cmake
index 77b9fd5f4b68..8c810e94c462 100644
--- a/math/plplot/files/patch-cmake_modules_pkg-config.cmake
+++ b/math/plplot/files/patch-cmake_modules_pkg-config.cmake
@@ -1,9 +1,9 @@
---- ./cmake/modules/pkg-config.cmake.orig	2009-09-06 21:04:43.000000000 +0200
-+++ ./cmake/modules/pkg-config.cmake	2009-12-26 23:55:00.000000000 +0100
-@@ -48,7 +48,7 @@
+--- 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 @@
+ 
  if(PKG_CONFIG_EXECUTABLE)
    message(STATUS "Looking for pkg-config - found")
-   set(pkg_config_true "")
 -  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})
diff --git a/math/plplot/files/patch-doc__docbook__src__plplotdoc.texi b/math/plplot/files/patch-doc__docbook__src__plplotdoc.texi
deleted file mode 100644
index 15d6f7ed200e..000000000000
--- a/math/plplot/files/patch-doc__docbook__src__plplotdoc.texi
+++ /dev/null
@@ -1,20 +0,0 @@
---- doc/docbook/src/plplotdoc.texi.orig
-+++ doc/docbook/src/plplotdoc.texi
-@@ -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;
- 	@}
-       
diff --git a/math/plplot/files/patch-drivers__tk.c b/math/plplot/files/patch-drivers__tk.c
deleted file mode 100644
index 91c99facaf33..000000000000
--- a/math/plplot/files/patch-drivers__tk.c
+++ /dev/null
@@ -1,65 +0,0 @@
---- drivers/tk.c.orig
-+++ drivers/tk.c
-@@ -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, "" );
-     }
- }
diff --git a/math/plplot/files/patch-examples__tk__xtk02.c b/math/plplot/files/patch-examples__tk__xtk02.c
index dd17bd5c7f0e..a645e472b0ef 100644
--- a/math/plplot/files/patch-examples__tk__xtk02.c
+++ b/math/plplot/files/patch-examples__tk__xtk02.c
@@ -1,15 +1,6 @@
---- examples/tk/xtk02.c.orig
-+++ examples/tk/xtk02.c
-@@ -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 @@
+--- examples/tk/xtk02.c.orig	2011-11-30 23:04:42.000000000 +0100
++++ examples/tk/xtk02.c	2013-10-01 23:06:58.000000000 +0200
+@@ -85,7 +85,7 @@
  //
  // Results:
  //	Returns a standard Tcl completion code, and leaves an error
diff --git a/math/plplot/files/patch-examples__tk__xtk04.c b/math/plplot/files/patch-examples__tk__xtk04.c
index ee64d8c82a90..9664d1eb2454 100644
--- a/math/plplot/files/patch-examples__tk__xtk04.c
+++ b/math/plplot/files/patch-examples__tk__xtk04.c
@@ -1,24 +1,6 @@
---- examples/tk/xtk04.c.orig
-+++ examples/tk/xtk04.c
-@@ -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 @@
+--- examples/tk/xtk04.c.orig	2011-11-30 23:04:42.000000000 +0100
++++ examples/tk/xtk04.c	2013-10-01 23:08:24.000000000 +0200
+@@ -87,7 +87,7 @@
  //
  // Results:
  //	Returns a standard Tcl completion code, and leaves an error
@@ -27,12 +9,3 @@
  //
  // 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;
-     }
- 
diff --git a/math/plplot/files/patch-plplot_test__CMakeLists.txt b/math/plplot/files/patch-plplot_test__CMakeLists.txt
index cd1b1a0454a7..20f9802423e0 100644
--- a/math/plplot/files/patch-plplot_test__CMakeLists.txt
+++ b/math/plplot/files/patch-plplot_test__CMakeLists.txt
@@ -1,13 +1,15 @@
---- plplot_test/CMakeLists.txt.orig
-+++ plplot_test/CMakeLists.txt
-@@ -387,12 +387,6 @@
-       )
+--- plplot_test/CMakeLists.txt.orig	2013-07-09 21:27:35.000000000 +0200
++++ plplot_test/CMakeLists.txt	2013-10-01 23:12:09.000000000 +0200
+@@ -452,14 +452,6 @@
+     list(APPEND test_output_files_LIST ${output_list})
    endif(PLD_pdfqt)
  
 -  if(PLD_pdf)
 -    add_test(examples_pdf
 -      ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=pdf"
 -      )
+-    list_example_files(. pdf c output_list)
+-    list(APPEND test_output_files_LIST ${output_list})
 -  endif(PLD_pdf)
 -
    if(CMP_EXECUTABLE OR DIFF_EXECUTABLE AND TAIL_EXECUTABLE)
diff --git a/math/plplot/files/patch-scripts__CMakeLists.txt b/math/plplot/files/patch-scripts__CMakeLists.txt
index 309ba97912d5..ae54f7657cf2 100644
--- a/math/plplot/files/patch-scripts__CMakeLists.txt
+++ b/math/plplot/files/patch-scripts__CMakeLists.txt
@@ -1,14 +1,11 @@
---- scripts/CMakeLists.txt.orig
-+++ scripts/CMakeLists.txt
-@@ -28,9 +28,9 @@
+--- scripts/CMakeLists.txt.orig	2012-01-04 16:45:07.000000000 +0100
++++ scripts/CMakeLists.txt	2013-10-01 23:16:18.000000000 +0200
+@@ -28,7 +28,7 @@
      )
    endif(PLD_plmeta)
    if(PLD_pstex)
 -    set(scripts_SCRIPTS ${scripts_SCRIPTS} pstex2eps)
 +    set(scripts_SCRIPTS "${scripts_SCRIPTS}" pstex2eps)
    endif(PLD_pstex)
--  if (NOT ${scripts_SCRIPTS} STREQUAL "")
-+  if (NOT "${scripts_SCRIPTS}" STREQUAL "")
+   if (NOT "${scripts_SCRIPTS}" STREQUAL "")
      install(PROGRAMS ${scripts_SCRIPTS} DESTINATION ${BIN_DIR})
-   endif (NOT ${scripts_SCRIPTS} STREQUAL "")
- endif(HAVE_BASH)