- Upgrade to 5.9.10

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

- Pet portlint

- Use staging.

15 files changed, 78 insertions, 496 deletions

diff --git a/math/plplot/Makefile b/math/plplot/Makefile
index 8e6f103459bb..a7b1397dd206 100644
--- a/math/plplot/Makefile
+++ b/math/plplot/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	plplot
-PORTVERSION=	5.9.9
-PORTREVISION=	2
+PORTVERSION=	5.9.10
 CATEGORIES=	math science
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20Source
 
@@ -14,9 +13,9 @@ LICENSE=	LGPL21 # (or later)
 
 BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash \
 		${FREEFONT_DIR}/FreeMono.ttf:${PORTSDIR}/x11-fonts/freefont-ttf
-LIB_DEPENDS=	LASi:${PORTSDIR}/devel/lasi \
-		qhull:${PORTSDIR}/math/qhull5 \
-		freetype:${PORTSDIR}/print/freetype2
+LIB_DEPENDS=	libLASi.so:${PORTSDIR}/devel/lasi \
+		libqhull.so:${PORTSDIR}/math/qhull5 \
+		libfreetype.so:${PORTSDIR}/print/freetype2
 RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash \
 		${FREEFONT_DIR}/FreeMono.ttf:${PORTSDIR}/x11-fonts/freefont-ttf
 
@@ -32,20 +31,18 @@ CMAKE_ARGS=	-DENABLE_java:BOOL=OFF -DENABLE_octave:BOOL=OFF \
 		-DENABLE_d:BOOL=OFF -DENABLE_ocaml:BOOL=OFF \
 		-DENABLE_pyqt4:BOOL=OFF \
 		-DPL_FREETYPE_FONT_PATH:PATH="${FREEFONT_DIR}" \
-		-DPLD_plmeta:BOOL=ON
+		-DPLD_plmeta:BOOL=OFF
 USE_AUTOTOOLS=	libltdl
 USE_LDCONFIG=	yes
 
-MAN1=		plm2gif.1 plpr.1 pltek.1 plrender.1
-
 FREEFONT_DIR=	${LOCALBASE}/lib/X11/fonts/freefont-ttf
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MFORTRAN}
 USE_FORTRAN=	yes
 CONFIGURE_ENV+=	CMAKE_Fortran_COMPILER="${FC}"
+CMAKE_ARGS+=	-DENABLE_f95:BOOL=ON -DENABLE_f77:BOOL=ON
 PLIST_SUB+=	FORTRAN=""
 .else
 CMAKE_ARGS+=	-DENABLE_f95:BOOL=OFF -DENABLE_f77:BOOL=OFF
@@ -53,10 +50,10 @@ PLIST_SUB+=	FORTRAN="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MGD}
-LIB_DEPENDS+=	gd:${PORTSDIR}/graphics/gd
+LIB_DEPENDS+=	libgd.so:${PORTSDIR}/graphics/gd
 CMAKE_ARGS+=	-DPLD_png:BOOL=ON
 PLIST_SUB+=	GD=""
-.else 
+.else
 PLIST_SUB+=	GD="@comment "
 .endif
 
@@ -65,7 +62,7 @@ USE_LUA=	yes
 CMAKE_ARGS+=	-DLUA_EXECUTABLE:FILEPATH="${LUA_CMD}"
 PLIST_SUB+=	LUA="" LUA_MODLIBDIR="${LUA_MODLIBDIR:S,${LUA_PREFIX}/,,}"
 .else
-CMAKE_ARGS+=	-DENABLE_lua:BOOL=OFF 
+CMAKE_ARGS+=	-DENABLE_lua:BOOL=OFF
 PLIST_SUB+=	LUA="@comment "
 .endif
 
@@ -85,8 +82,8 @@ PLIST_SUB+=	PYTHON="@comment "
 .if empty(PORT_OPTIONS:MX11)
 IGNORE=		TCLTK needs X11 support
 .endif
-LIB_DEPENDS+=	itk:${PORTSDIR}/x11-toolkits/itk
-USE_TK=		yes
+LIB_DEPENDS+=	libitk.so:${PORTSDIR}/x11-toolkits/itk
+USES+=		tk
 CMAKE_ARGS+=	-DTCL_TCLSH:FILEPATH="${TCLSH}" \
 		-DTCL_INCLUDE_PATH:PATH="${TCL_INCLUDEDIR}" \
 		-DITCL_INCLUDE_PATH:PATH="${LOCALBASE}/include/itcl3.4" \
@@ -94,7 +91,6 @@ CMAKE_ARGS+=	-DTCL_TCLSH:FILEPATH="${TCLSH}" \
 		-DTK_INCLUDE_PATH:PATH="${TK_INCLUDEDIR}" \
 		-DITK_INCLUDE_PATH:PATH="${LOCALBASE}/include/itk3.3" \
 		-DITK_LIBRARY:FILEPATH="${LOCALBASE}/lib/libitk.so"
-MAN1+=		plserver.1 pltcl.1
 PLIST_SUB+=	TCLTK=""
 .else
 CMAKE_ARGS+=	-DENABLE_tcl:BOOL=OFF
@@ -115,7 +111,7 @@ PLIST_SUB+=	QT4="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MWXGTK}
-LIB_DEPENDS+=	agg:${PORTSDIR}/graphics/agg
+LIB_DEPENDS+=	libagg.so:${PORTSDIR}/graphics/agg
 USE_WX=		2.6+
 CMAKE_ARGS+=	-DPLD_wxpng:BOOL=ON \
 		-DwxWidgets_CONFIG_EXECUTABLE:FILEPATH="${WX_CONFIG}"
@@ -133,11 +129,11 @@ CMAKE_ARGS+=	-DPLD_xcairo:BOOL=OFF -DPLD_xwin:BOOL=OFF
 PLIST_SUB+=	X11="@comment "
 .endif
 
-post-patch:
-	@${REINPLACE_CMD} -e \
+pre-configure:
+	${REINPLACE_CMD} -e \
 		's|dl dlopen|c dlopen|' \
 		${WRKSRC}/cmake/modules/FindLTDL.cmake
-	@${GREP} -lR "/usr/local" ${WRKSRC}/cmake/modules | ${XARGS} \
+	${GREP} -lR "/usr/local" ${WRKSRC}/cmake/modules | ${XARGS} \
 		${REINPLACE_CMD} -e \
 		's|/usr/local|${LOCALBASE}|g'
 
diff --git a/math/plplot/distinfo b/math/plplot/distinfo
index 4c955a75b859..a43d1f57b07f 100644
--- a/math/plplot/distinfo
+++ b/math/plplot/distinfo
@@ -1,2 +1,2 @@
-SHA256 (plplot-5.9.9.tar.gz) = 747e5a043681f3e20df30d159f6e8517cb1e25e502322adcd80e8ca53ec2c90d
-SIZE (plplot-5.9.9.tar.gz) = 13778554
+SHA256 (plplot-5.9.10.tar.gz) = 6be3e20d6992cb2afd132a00cbc812aa5db170abe5855c44eb01481ac4b0b723
+SIZE (plplot-5.9.10.tar.gz) = 15215720
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)
diff --git a/math/plplot/pkg-plist b/math/plplot/pkg-plist
index 9c26d927677e..f55bdcb70066 100644
--- a/math/plplot/pkg-plist
+++ b/math/plplot/pkg-plist
@@ -1,6 +1,3 @@
-bin/plm2gif
-bin/plpr
-bin/plrender
 %%TCLTK%%bin/plserver
 %%TCLTK%%bin/pltcl
 bin/pltek
@@ -28,6 +25,7 @@ include/plplot/qsastimedll.h
 %%WXGTK%%include/plplot/wxPLplotwindow.h
 %%TCLTK%%include/plplot/tclMatrix.h
 %%FORTRAN%%lib/fortran/include/plplot/plplot_parameters.h
+%%FORTRAN%%lib/fortran/modules/plplot/plf95demolib.mod
 %%FORTRAN%%lib/fortran/modules/plplot/plplot.mod
 %%FORTRAN%%lib/fortran/modules/plplot/plplot_flt.mod
 %%FORTRAN%%lib/fortran/modules/plplot/plplotp.mod
@@ -37,12 +35,13 @@ lib/libcsirocsa.so.0.0.1
 lib/libcsironn.so
 lib/libcsironn.so.0
 lib/libcsironn.so.0.0.1
+%%FORTRAN%%lib/libplf95demolibd.a
 lib/libplplotcxxd.so
-lib/libplplotcxxd.so.10
-lib/libplplotcxxd.so.10.0.0
+lib/libplplotcxxd.so.11
+lib/libplplotcxxd.so.11.0.0
 lib/libplplotd.so
-lib/libplplotd.so.11
-lib/libplplotd.so.11.0.0
+lib/libplplotd.so.12
+lib/libplplotd.so.12.0.0
 %%FORTRAN%%lib/libplplotf77cd.so
 %%FORTRAN%%lib/libplplotf77cd.so.9
 %%FORTRAN%%lib/libplplotf77cd.so.9.1.1
@@ -50,17 +49,17 @@ lib/libplplotd.so.11.0.0
 %%FORTRAN%%lib/libplplotf77d.so.9
 %%FORTRAN%%lib/libplplotf77d.so.9.1.1
 %%FORTRAN%%lib/libplplotf95cd.so
-%%FORTRAN%%lib/libplplotf95cd.so.9
-%%FORTRAN%%lib/libplplotf95cd.so.9.1.1
+%%FORTRAN%%lib/libplplotf95cd.so.10
+%%FORTRAN%%lib/libplplotf95cd.so.10.0.0
 %%FORTRAN%%lib/libplplotf95d.so
-%%FORTRAN%%lib/libplplotf95d.so.9
-%%FORTRAN%%lib/libplplotf95d.so.9.1.1
+%%FORTRAN%%lib/libplplotf95d.so.10
+%%FORTRAN%%lib/libplplotf95d.so.10.0.0
 %%QT4%%lib/libplplotqtd.so
-%%QT4%%lib/libplplotqtd.so.0
-%%QT4%%lib/libplplotqtd.so.0.0.1
+%%QT4%%lib/libplplotqtd.so.1
+%%QT4%%lib/libplplotqtd.so.1.0.0
 %%TCLTK%%lib/libplplottcltkd.so
-%%TCLTK%%lib/libplplottcltkd.so.9
-%%TCLTK%%lib/libplplottcltkd.so.9.2.0
+%%TCLTK%%lib/libplplottcltkd.so.10
+%%TCLTK%%lib/libplplottcltkd.so.10.0.0
 %%WXGTK%%lib/libplplotwxwidgetsd.so
 %%WXGTK%%lib/libplplotwxwidgetsd.so.0
 %%WXGTK%%lib/libplplotwxwidgetsd.so.0.0.0
@@ -79,8 +78,6 @@ lib/plplot/driversd/mem.driver_info
 lib/plplot/driversd/mem.so
 lib/plplot/driversd/null.driver_info
 lib/plplot/driversd/null.so
-lib/plplot/driversd/plmeta.driver_info
-lib/plplot/driversd/plmeta.so
 lib/plplot/driversd/ps.driver_info
 lib/plplot/driversd/ps.so
 lib/plplot/driversd/psttf.driver_info
@@ -112,6 +109,9 @@ libdata/pkgconfig/plplotd-c++.pc
 %%TCLTK%%libdata/pkgconfig/plplotd-tcl.pc
 %%WXGTK%%libdata/pkgconfig/plplotd-wxwidgets.pc
 libdata/pkgconfig/plplotd.pc
+%%TCLTK%%man/man1/plserver.1.gz
+%%TCLTK%%man/man1/pltcl.1.gz
+man/man1/pltek.1.gz
 %%DOCSDIR%%/ABOUT
 %%DOCSDIR%%/AUTHORS
 %%DOCSDIR%%/COPYING.LIB
@@ -152,6 +152,7 @@ libdata/pkgconfig/plplotd.pc
 %%QT4%%%%DATADIR%%/examples/c++/qt_PlotWindow.h
 %%QT4%%%%DATADIR%%/examples/c++/qt_example.cpp
 %%WXGTK%%%%DATADIR%%/examples/c++/wxPLplotDemo.cpp
+%%DATADIR%%/examples/c++/x00.cc
 %%DATADIR%%/examples/c++/x01.cc
 %%DATADIR%%/examples/c++/x01cc.cc
 %%DATADIR%%/examples/c++/x02.cc
@@ -193,6 +194,7 @@ libdata/pkgconfig/plplotd.pc
 %%DATADIR%%/examples/c/plcdemos.h
 %%DATADIR%%/examples/c/test_plend.c
 %%DATADIR%%/examples/c/tutor.c
+%%DATADIR%%/examples/c/x00c.c
 %%DATADIR%%/examples/c/x01c.c
 %%DATADIR%%/examples/c/x02c.c
 %%DATADIR%%/examples/c/x03c.c
@@ -227,12 +229,12 @@ libdata/pkgconfig/plplotd.pc
 %%DATADIR%%/examples/c/x32c.c
 %%DATADIR%%/examples/c/x33c.c
 %%DATADIR%%/examples/c/x34c.c
-%%DATADIR%%/examples/cmake/modules/FindPkgConfig.cmake
 %%DATADIR%%/examples/cmake/modules/export_plplot-%%CMAKE_BUILD_TYPE%%.cmake
 %%DATADIR%%/examples/cmake/modules/export_plplot.cmake
+%%DATADIR%%/examples/cmake/modules/language_support.cmake
 %%DATADIR%%/examples/cmake/modules/pkg-config.cmake
 %%DATADIR%%/examples/cmake/modules/plplot_configure.cmake
-%%DATADIR%%/examples/cmake/modules/language_support.cmake
+%%DATADIR%%/examples/cmake/modules/plplot_functions.cmake
 %%FORTRAN%%%%DATADIR%%/examples/f77/CMakeLists.txt
 %%FORTRAN%%%%DATADIR%%/examples/f77/Makefile
 %%FORTRAN%%%%DATADIR%%/examples/f77/plf77demos.inc
@@ -272,6 +274,7 @@ libdata/pkgconfig/plplotd.pc
 %%FORTRAN%%%%DATADIR%%/examples/f95/CMakeLists.txt
 %%FORTRAN%%%%DATADIR%%/examples/f95/Makefile
 %%FORTRAN%%%%DATADIR%%/examples/f95/plf95demos.inc
+%%FORTRAN%%%%DATADIR%%/examples/f95/x00f.f90
 %%FORTRAN%%%%DATADIR%%/examples/f95/x01f.f90
 %%FORTRAN%%%%DATADIR%%/examples/f95/x02f.f90
 %%FORTRAN%%%%DATADIR%%/examples/f95/x03f.f90
@@ -308,6 +311,7 @@ libdata/pkgconfig/plplotd.pc
 %%DATADIR%%/examples/lena.pgm
 %%LUA%%%%DATADIR%%/examples/lua/CMakeLists.txt
 %%LUA%%%%DATADIR%%/examples/lua/plplot_examples.lua
+%%LUA%%%%DATADIR%%/examples/lua/x00.lua
 %%LUA%%%%DATADIR%%/examples/lua/x01.lua
 %%LUA%%%%DATADIR%%/examples/lua/x02.lua
 %%LUA%%%%DATADIR%%/examples/lua/x03.lua
@@ -356,6 +360,7 @@ libdata/pkgconfig/plplotd.pc
 %%PYTHON%%%%DATADIR%%/examples/python/test_fill.py
 %%PYTHON%%%%DATADIR%%/examples/python/test_gradient.py
 %%PYTHON%%%%DATADIR%%/examples/python/test_hebrew_diacritic.py
+%%PYTHON%%%%DATADIR%%/examples/python/test_linebreak.py
 %%PYTHON%%%%DATADIR%%/examples/python/test_plplot_encodings.py
 %%PYTHON%%%%DATADIR%%/examples/python/test_plsmem.py
 %%PYTHON%%%%DATADIR%%/examples/python/test_style.py
@@ -363,6 +368,7 @@ libdata/pkgconfig/plplotd.pc
 %%PYTHON%%%%DATADIR%%/examples/python/test_symbol_clip.py
 %%PYTHON%%%%DATADIR%%/examples/python/test_type1.py
 %%PYTHON%%%%DATADIR%%/examples/python/testh.py
+%%PYTHON%%%%DATADIR%%/examples/python/x00
 %%PYTHON%%%%DATADIR%%/examples/python/x01
 %%TCLTK%%%%PYTHON%%%%DATADIR%%/examples/python/x01.py
 %%PYTHON%%%%DATADIR%%/examples/python/x02
@@ -414,6 +420,7 @@ libdata/pkgconfig/plplotd.pc
 %%PYTHON%%%%DATADIR%%/examples/python/x30
 %%PYTHON%%%%DATADIR%%/examples/python/x31
 %%PYTHON%%%%DATADIR%%/examples/python/x33
+%%PYTHON%%%%DATADIR%%/examples/python/xw00.py
 %%PYTHON%%%%DATADIR%%/examples/python/xw01.py
 %%PYTHON%%%%DATADIR%%/examples/python/xw02.py
 %%PYTHON%%%%DATADIR%%/examples/python/xw03.py
@@ -448,6 +455,7 @@ libdata/pkgconfig/plplotd.pc
 %%PYTHON%%%%DATADIR%%/examples/python/xw33.py
 %%TCLTK%%%%DATADIR%%/examples/tcl/CMakeLists.txt
 %%TCLTK%%%%DATADIR%%/examples/tcl/README.tcldemos
+%%TCLTK%%%%DATADIR%%/examples/tcl/mktclIndex
 %%TCLTK%%%%DATADIR%%/examples/tcl/plgrid.tcl
 %%TCLTK%%%%DATADIR%%/examples/tcl/plot.dat
 %%TCLTK%%%%DATADIR%%/examples/tcl/plot.tcl
@@ -456,6 +464,8 @@ libdata/pkgconfig/plplotd.pc
 %%TCLTK%%%%DATADIR%%/examples/tcl/stats.log
 %%TCLTK%%%%DATADIR%%/examples/tcl/tclIndex
 %%TCLTK%%%%DATADIR%%/examples/tcl/tcldemos.tcl
+%%TCLTK%%%%DATADIR%%/examples/tcl/x00
+%%TCLTK%%%%DATADIR%%/examples/tcl/x00.tcl
 %%TCLTK%%%%DATADIR%%/examples/tcl/x01
 %%TCLTK%%%%DATADIR%%/examples/tcl/x01.tcl
 %%TCLTK%%%%DATADIR%%/examples/tcl/x02
@@ -549,6 +559,7 @@ libdata/pkgconfig/plplotd.pc
 %%TCLTK%%%%DATADIR%%/examples/tk/tk04
 %%TCLTK%%%%DATADIR%%/examples/tk/tk04.in
 %%TCLTK%%%%DATADIR%%/examples/tk/tkdemos.tcl
+%%TCLTK%%%%DATADIR%%/examples/tk/x00.tcl
 %%TCLTK%%%%DATADIR%%/examples/tk/x01.tcl
 %%TCLTK%%%%DATADIR%%/examples/tk/x02.tcl
 %%TCLTK%%%%DATADIR%%/examples/tk/x03.tcl
@@ -580,6 +591,7 @@ libdata/pkgconfig/plplotd.pc
 %%TCLTK%%%%DATADIR%%/examples/tk/x29.tcl
 %%TCLTK%%%%DATADIR%%/examples/tk/x30.tcl
 %%TCLTK%%%%DATADIR%%/examples/tk/x31.tcl
+%%TCLTK%%%%DATADIR%%/examples/tk/x33.tcl
 %%TCLTK%%%%DATADIR%%/examples/tk/xtk01.c
 %%TCLTK%%%%DATADIR%%/examples/tk/xtk02.c
 %%TCLTK%%%%DATADIR%%/examples/tk/xtk04.c