19 files changed, 872 insertions, 144 deletions

diff --git a/math/plplot/Makefile b/math/plplot/Makefile
index 8bdb0aee0d73..8f6fd85f0c29 100644
--- a/math/plplot/Makefile
+++ b/math/plplot/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    plplot
-# Date created:         03 Oct 1997
-# Whom:                 Thomas Gellekum <tg@FreeBSD.org>
-#
+# Created by: Thomas Gellekum <tg@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	plplot
 PORTVERSION=	5.9.9
@@ -12,62 +8,72 @@ CATEGORIES=	math science
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20Source
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A scientific plotting package
+COMMENT=	Scientific plotting package
 
-BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash	\
-		${LOCALBASE}/lib/X11/fonts/freefont-ttf/FreeMono.ttf:${PORTSDIR}/x11-fonts/freefont-ttf
-LIB_DEPENDS=	unicode.0:${PORTSDIR}/devel/libunicode \
-		freetype.9:${PORTSDIR}/print/freetype2 \
-		gd.4:${PORTSDIR}/graphics/gd \
-		qhull.5:${PORTSDIR}/math/qhull5
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash	\
-		${LOCALBASE}/lib/X11/fonts/freefont-ttf/FreeMono.ttf:${PORTSDIR}/x11-fonts/freefont-ttf
+LICENSE=	LGPL21 # (or later)
 
-BROKEN=		does not configure
+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
+RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash \
+		${FREEFONT_DIR}/FreeMono.ttf:${PORTSDIR}/x11-fonts/freefont-ttf
+
+OPTIONS_DEFINE=	FORTRAN GD LUA PYTHON QT4 TCLTK THREADS WXGTK X11
+OPTIONS_DEFAULT=	THREADS X11
 
-USE_AUTOTOOLS=	libltdl
-USE_CMAKE=	yes
-USE_PERL5_BUILD=yes
 USE_GNOME=	pango
+USE_PERL5_BUILD=yes
 USE_GHOSTSCRIPT=yes
-CONFIGURE_ENV+=	WITH_FREETYPE=ON
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-CMAKE_ARGS+=	-DENABLE_java:BOOL=OFF -DENABLE_octave:BOOL=OFF	\
-		-DENABLE_ada:BOOL=OFF -DENABLE_d:BOOL=OFF	\
-		-DPLD_plmeta=ON
-
+USE_CMAKE=	yes
+CMAKE_ARGS=	-DENABLE_java:BOOL=OFF -DENABLE_octave:BOOL=OFF \
+		-DENABLE_pdl:BOOL=OFF -DENABLE_ada: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
+USE_GMAKE=	yes
+USE_AUTOTOOLS=	libltdl
 USE_LDCONFIG=	yes
+MAKE_JOBS_SAFE=	yes
 
 MAN1=		plm2gif.1 plpr.1 pltek.1 plrender.1
 
-.if !defined(WITHOUT_PTHREAD)
-CMAKE_ARGS+=	-DTHREADS_HAVE_PTHREAD_ARG:BOOL=OFF
-.endif
+FREEFONT_DIR=	${LOCALBASE}/lib/X11/fonts/freefont-ttf
 
-.if defined(WITHOUT_X11)
-PKGNAMESUFFIX=	-nox11
-PLIST_SUB+=	X11="@comment "
-.else
-USE_XORG=	x11
-LIB_DEPENDS+=	LASi.1:${PORTSDIR}/devel/lasi
-PLIST_SUB+=	X11=""
-.endif
+.include <bsd.port.options.mk>
 
-.if defined(WITH_FORTRAN)
-PKGNAMESUFFIX=	-fortran
+.if ${PORT_OPTIONS:MFORTRAN}
 USE_FORTRAN=	yes
-CONFIGURE_ENV+=	CMAKE_Fortran_COMPILER=${FC}
+CONFIGURE_ENV+=	CMAKE_Fortran_COMPILER="${FC}"
 PLIST_SUB+=	FORTRAN=""
 .else
 CMAKE_ARGS+=	-DENABLE_f95:BOOL=OFF -DENABLE_f77:BOOL=OFF
 PLIST_SUB+=	FORTRAN="@comment "
 .endif
 
-.if defined(WITH_PYTHON)
-BUILD_DEPENDS+=	swig:${PORTSDIR}/devel/swig13	\
-		f2py:${PORTSDIR}/math/py-numpy
-RUN_DEPENDS+=	f2py:${PORTSDIR}/math/py-numpy
+.if ${PORT_OPTIONS:MGD}
+LIB_DEPENDS+=	gd:${PORTSDIR}/graphics/gd
+CMAKE_ARGS+=	-DPLD_png:BOOL=ON
+PLIST_SUB+=	GD=""
+.else 
+PLIST_SUB+=	GD="@comment "
+.endif
+
+.if ${PORT_OPTIONS:MLUA}
+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 
+PLIST_SUB+=	LUA="@comment "
+.endif
+
+.if ${PORT_OPTIONS:MPYTHON}
+BUILD_DEPENDS+=	swig:${PORTSDIR}/devel/swig13 \
+		${PYNUMPY}
+RUN_DEPENDS+=	${PYNUMPY}
 USE_PYTHON=	yes
 PLIST_SUB+=	PYTHON=""
 CONFIGURE_ENV+=	PYTHON_VERSION="${PYTHON_VERSION}"
@@ -76,67 +82,64 @@ CMAKE_ARGS+=	-DENABLE_python:BOOL=OFF
 PLIST_SUB+=	PYTHON="@comment "
 .endif
 
-.if defined(WITH_TCLTK)
-.undef WITHOUT_X11
-PKGNAMESUFFIX=	-tcltk
-LIB_DEPENDS+=	itk.3:${PORTSDIR}/x11-toolkits/itk
-USE_TK=		84
-ITCL_VER=	3.3
-CONFIGURE_ENV+=	ENABLE_tcl=TRUE ENABLE_tk=TRUE		\
-		ENABLE_itcl=TRUE ENABLE_itk=TRUE
+.if ${PORT_OPTIONS:MTCLTK}
+.if empty(PORT_OPTIONS:MX11)
+IGNORE=		TCLTK needs X11 support
+.endif
+LIB_DEPENDS+=	itk:${PORTSDIR}/x11-toolkits/itk
+USE_TK=		yes
+CMAKE_ARGS+=	-DTCL_TCLSH:FILEPATH="${TCLSH}" \
+		-DTCL_INCLUDE_PATH:PATH="${TCL_INCLUDEDIR}" \
+		-DITCL_INCLUDE_PATH:PATH="${LOCALBASE}/include/itcl3.4" \
+		-DITCL_LIBRARY:FILEPATH="${LOCALBASE}/lib/libitcl.so" \
+		-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_tk:BOOL=OFF
+CMAKE_ARGS+=	-DENABLE_tcl:BOOL=OFF
 PLIST_SUB+=	TCLTK="@comment "
 .endif
 
-.if defined(WITH_QT)
-.undef WITHOUT_X11
-PKGNAMESUFFIX=	-qt
-USE_QT4=	assistant assistantclient clucene corelib dbus	\
-		designer doc gui help help-tools linguist moc	\
-		network opengl phonon qmake qt3support qtestlib	\
-		rcc script scripttools sql svg uic uic3 webkit	\
-		xml xmlpatterns
-PLIST_SUB+=	QT=""
+.if empty(PORT_OPTIONS:MTHREADS)
+CMAKE_ARGS+=	-DTHREADS_HAVE_PTHREAD_ARG:BOOL=OFF
+.endif
+
+.if ${PORT_OPTIONS:MQT4}
+USE_QT4=	corelib gui svg xml \
+		moc_build qmake_build rcc_build uic_build
+PLIST_SUB+=	QT4=""
 .else
 CMAKE_ARGS+=	-DENABLE_qt:BOOL=OFF -DDEFAULT_NO_QT_DEVICES:BOOL=ON
-PLIST_SUB+=	QT="@comment "
+PLIST_SUB+=	QT4="@comment "
 .endif
 
-.include <bsd.port.pre.mk>
-
-pre-everything::
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "PLplot has the following tunable options:"
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "	WITHOUT_PTHREAD=yes	Turns off pthread support"
-	@${ECHO_MSG} "	WITHOUT_X11=yes		Turns off X11 support"
-	@${ECHO_MSG} "	WITH_FORTRAN=yes	Turns on Fortran support"
-	@${ECHO_MSG} "	WITH_PYTHON=yes		Turns on Python support"
-	@${ECHO_MSG} "	WITH_QT=yes		Turns on Qt4 support"
-	@${ECHO_MSG} "	WITH_TCLTK=yes		Turns on Tcl/Tk support"
-	@${ECHO_MSG} ""
-
-pre-configure:
-	${REINPLACE_CMD} -e 's|/usr/share/fonts/truetype/freefont|${LOCALBASE}/lib/X11/fonts/freefont-ttf|'\
-		${WRKSRC}/cmake/modules/freetype.cmake
-.if defined(WITHOUT_X11)
-	${REINPLACE_CMD} -e 's|^find_package(X11)|SET(X11_FOUND "FALSE")|' \
-		${WRKSRC}/cmake/modules/plplot.cmake
+.if ${PORT_OPTIONS:MWXGTK}
+LIB_DEPENDS+=	agg:${PORTSDIR}/graphics/agg
+USE_WX=		2.6+
+CMAKE_ARGS+=	-DPLD_wxpng:BOOL=ON \
+		-DwxWidgets_CONFIG_EXECUTABLE:FILEPATH="${WX_CONFIG}"
+PLIST_SUB+=	WXGTK=""
+.else
+CMAKE_ARGS+=	-DENABLE_wxwidgets:BOOL=OFF
+PLIST_SUB+=	WXGTK="@comment "
 .endif
-.if defined(WITH_TCLTK)
-	${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|; \
-		s|/usr/include|${LOCALBASE}/include|'		\
-		${WRKSRC}/cmake/modules/FindTCL.cmake
-	${REINPLACE_CMD} -e 's|%%ITCL_VER%%|${ITCL_VER}|'	\
-		${WRKSRC}/cmake/modules/tcl-related.cmake
-# To be removed when x11-toolkits/itk will be compatible with tk-8.5
-. for fc in TCL Tclsh
-	${REINPLACE_CMD} -e 's|8.5||g;s|85||g'	\
-		${WRKSRC}/cmake/modules/Find${fc}.cmake
-. endfor
+
+.if ${PORT_OPTIONS:MX11}
+USE_XORG=	ice sm x11 xext
+PLIST_SUB+=	X11=""
+.else
+CMAKE_ARGS+=	-DPLD_xcairo:BOOL=OFF -DPLD_xwin:BOOL=OFF
+PLIST_SUB+=	X11="@comment "
 .endif
 
-.include <bsd.port.post.mk>
+post-patch:
+	@${REINPLACE_CMD} -e \
+		's|dl dlopen|c dlopen|' \
+		${WRKSRC}/cmake/modules/FindLTDL.cmake
+	@${GREP} -lR "/usr/local" ${WRKSRC}/cmake/modules | ${XARGS} \
+		${REINPLACE_CMD} -e \
+		's|/usr/local|${LOCALBASE}|g'
+
+.include <bsd.port.mk>
diff --git a/math/plplot/files/patch-bindings__tk-x-plat__plolotter.c b/math/plplot/files/patch-bindings__tk-x-plat__plolotter.c
new file mode 100644
index 000000000000..d1f6c28d495c
--- /dev/null
+++ b/math/plplot/files/patch-bindings__tk-x-plat__plolotter.c
@@ -0,0 +1,102 @@
+--- 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 @@
+ //
+ // 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;
+ }
+ 
diff --git a/math/plplot/files/patch-bindings__tk__plframe.c b/math/plplot/files/patch-bindings__tk__plframe.c
new file mode 100644
index 000000000000..a92a268d6e23
--- /dev/null
+++ b/math/plplot/files/patch-bindings__tk__plframe.c
@@ -0,0 +1,102 @@
+--- 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 @@
+ //
+ // 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) );
+ }
+ 
+ //--------------------------------------------------------------------------
diff --git a/math/plplot/files/patch-bindings__tk__plserver.c b/math/plplot/files/patch-bindings__tk__plserver.c
new file mode 100644
index 000000000000..17b940fed902
--- /dev/null
+++ b/math/plplot/files/patch-bindings__tk__plserver.c
@@ -0,0 +1,36 @@
+--- 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 );
+     }
+ 
+@@ -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
+ 
diff --git a/math/plplot/files/patch-bindings__tk__tkMain.c b/math/plplot/files/patch-bindings__tk__tkMain.c
new file mode 100644
index 000000000000..bc097f4c9a26
--- /dev/null
+++ b/math/plplot/files/patch-bindings__tk__tkMain.c
@@ -0,0 +1,106 @@
+--- bindings/tk/tkMain.c.orig
++++ bindings/tk/tkMain.c
+@@ -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 +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
new file mode 100644
index 000000000000..94bf522f214a
--- /dev/null
+++ b/math/plplot/files/patch-bindings__tk__tkshell.c
@@ -0,0 +1,11 @@
+--- 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_tcl-related.cmake b/math/plplot/files/patch-cmake_modules_tcl-related.cmake
deleted file mode 100644
index 52a0b4d3c390..000000000000
--- a/math/plplot/files/patch-cmake_modules_tcl-related.cmake
+++ /dev/null
@@ -1,32 +0,0 @@
---- cmake/modules/tcl-related.cmake.orig	2009-09-06 21:04:43.000000000 +0200
-+++ cmake/modules/tcl-related.cmake	2009-12-25 17:44:43.000000000 +0100
-@@ -98,11 +98,13 @@
- 	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})
-+        find_path(ITCL_INCLUDE_PATH itcl.h ${TCL_INCLUDE_PATH}/../itcl%%ITCL_VER%%)
-         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)
-+          find_library(ITCL_LIBRARY itcl PATHS ${TCL_LIBRARY_PATH}
-+              PATH_SUFFIXES itcl)
-           set(itcl_library_versions 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}
-@@ -158,11 +160,12 @@
-     endif(ENABLE_tk)
-     if(ENABLE_itk)
-       message(STATUS "Looking for itk.h")
--      find_path(ITK_INCLUDE_PATH itk.h ${TK_INCLUDE_PATH})
-+      find_path(ITK_INCLUDE_PATH itk.h ${TCL_INCLUDE_PATH}/../itk%%ITCL_VER%%)
-       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)
-+        find_library(ITK_LIBRARY itk PATH_SUFFIXES itk)
-+        set(itk_library_versions "" 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/math/plplot/files/patch-doc__docbook__src__plplotdoc.texi b/math/plplot/files/patch-doc__docbook__src__plplotdoc.texi
new file mode 100644
index 000000000000..15d6f7ed200e
--- /dev/null
+++ b/math/plplot/files/patch-doc__docbook__src__plplotdoc.texi
@@ -0,0 +1,20 @@
+--- 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-doc__docbook__src__tcl.xml b/math/plplot/files/patch-doc__docbook__src__tcl.xml
new file mode 100644
index 000000000000..c3f332b423b7
--- /dev/null
+++ b/math/plplot/files/patch-doc__docbook__src__tcl.xml
@@ -0,0 +1,20 @@
+--- doc/docbook/src/tcl.xml.orig
++++ doc/docbook/src/tcl.xml
+@@ -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>
diff --git a/math/plplot/files/patch-drivers__ntk.c b/math/plplot/files/patch-drivers__ntk.c
new file mode 100644
index 000000000000..ff18c65e6e51
--- /dev/null
+++ b/math/plplot/files/patch-drivers__ntk.c
@@ -0,0 +1,74 @@
+--- 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-drivers__tk.c b/math/plplot/files/patch-drivers__tk.c
new file mode 100644
index 000000000000..91c99facaf33
--- /dev/null
+++ b/math/plplot/files/patch-drivers__tk.c
@@ -0,0 +1,65 @@
+--- 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__python__CMakeLists.txt b/math/plplot/files/patch-examples__python__CMakeLists.txt
new file mode 100644
index 000000000000..521744516269
--- /dev/null
+++ b/math/plplot/files/patch-examples__python__CMakeLists.txt
@@ -0,0 +1,11 @@
+--- examples/python/CMakeLists.txt.orig
++++ examples/python/CMakeLists.txt
+@@ -241,7 +241,7 @@
+     @ONLY
+     )
+ 
+-  set(python_location1 ${PYTHON_INSTDIR})
++  set(python_location1)
+   set(python_location2)
+   set(python_location3)
+   set(python_location4)
diff --git a/math/plplot/files/patch-examples__tk__xtk01.c b/math/plplot/files/patch-examples__tk__xtk01.c
new file mode 100644
index 000000000000..e68c359c70a0
--- /dev/null
+++ b/math/plplot/files/patch-examples__tk__xtk01.c
@@ -0,0 +1,11 @@
+--- examples/tk/xtk01.c.orig
++++ examples/tk/xtk01.c
+@@ -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.
diff --git a/math/plplot/files/patch-examples__tk__xtk02.c b/math/plplot/files/patch-examples__tk__xtk02.c
new file mode 100644
index 000000000000..dd17bd5c7f0e
--- /dev/null
+++ b/math/plplot/files/patch-examples__tk__xtk02.c
@@ -0,0 +1,20 @@
+--- 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 @@
+ //
+ // 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.
diff --git a/math/plplot/files/patch-examples__tk__xtk04.c b/math/plplot/files/patch-examples__tk__xtk04.c
new file mode 100644
index 000000000000..ee64d8c82a90
--- /dev/null
+++ b/math/plplot/files/patch-examples__tk__xtk04.c
@@ -0,0 +1,38 @@
+--- 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 @@
+ //
+ // 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;
+     }
+ 
diff --git a/math/plplot/files/patch-plplot_test__CMakeLists.txt b/math/plplot/files/patch-plplot_test__CMakeLists.txt
new file mode 100644
index 000000000000..cd1b1a0454a7
--- /dev/null
+++ b/math/plplot/files/patch-plplot_test__CMakeLists.txt
@@ -0,0 +1,15 @@
+--- plplot_test/CMakeLists.txt.orig
++++ plplot_test/CMakeLists.txt
+@@ -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/math/plplot/files/patch-scripts__CMakeLists.txt b/math/plplot/files/patch-scripts__CMakeLists.txt
new file mode 100644
index 000000000000..309ba97912d5
--- /dev/null
+++ b/math/plplot/files/patch-scripts__CMakeLists.txt
@@ -0,0 +1,14 @@
+--- scripts/CMakeLists.txt.orig
++++ scripts/CMakeLists.txt
+@@ -28,9 +28,9 @@
+     )
+   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 "")
+     install(PROGRAMS ${scripts_SCRIPTS} DESTINATION ${BIN_DIR})
+   endif (NOT ${scripts_SCRIPTS} STREQUAL "")
+ endif(HAVE_BASH)
diff --git a/math/plplot/files/patch-util__pltcl.c b/math/plplot/files/patch-util__pltcl.c
new file mode 100644
index 000000000000..6842580295c6
--- /dev/null
+++ b/math/plplot/files/patch-util__pltcl.c
@@ -0,0 +1,11 @@
+--- 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.
diff --git a/math/plplot/pkg-plist b/math/plplot/pkg-plist
index f01f57878864..28a7c137d51e 100644
--- a/math/plplot/pkg-plist
+++ b/math/plplot/pkg-plist
@@ -1,7 +1,9 @@
+bin/plm2gif
+bin/plpr
+bin/plrender
 %%TCLTK%%bin/plserver
 %%TCLTK%%bin/pltcl
 bin/pltek
-bin/plrender
 include/plplot/disptab.h
 include/plplot/drivers.h
 include/plplot/gcw.h
@@ -21,7 +23,9 @@ include/plplot/plstrm.h
 include/plplot/plxwd.h
 include/plplot/qsastime.h
 include/plplot/qsastimedll.h
-%%QT%%include/plplot/qt.h
+%%QT4%%include/plplot/qt.h
+%%WXGTK%%include/plplot/wxPLplotstream.h
+%%WXGTK%%include/plplot/wxPLplotwindow.h
 %%TCLTK%%include/plplot/tclMatrix.h
 %%FORTRAN%%lib/fortran/modules/plplot/plplot.mod
 %%FORTRAN%%lib/fortran/modules/plplot/plplot_flt.mod
@@ -42,22 +46,58 @@ lib/libplplotd.so.11.0.0
 %%FORTRAN%%lib/libplplotf77cd.so.9
 %%FORTRAN%%lib/libplplotf77cd.so.9.1.1
 %%FORTRAN%%lib/libplplotf77d.so
+%%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/libplplotf95d.so
-%%QT%%lib/libplplotqtd.so
-%%QT%%lib/libplplotqtd.so.0
-%%QT%%lib/libplplotqtd.so.0.0.1
+%%FORTRAN%%lib/libplplotf95d.so.9
+%%FORTRAN%%lib/libplplotf95d.so.9.1.1
+%%QT4%%lib/libplplotqtd.so
+%%QT4%%lib/libplplotqtd.so.0
+%%QT4%%lib/libplplotqtd.so.0.0.1
 %%TCLTK%%lib/libplplottcltkd.so
 %%TCLTK%%lib/libplplottcltkd.so.9
 %%TCLTK%%lib/libplplottcltkd.so.9.2.0
+%%WXGTK%%lib/libplplotwxwidgetsd.so
+%%WXGTK%%lib/libplplotwxwidgetsd.so.0
+%%WXGTK%%lib/libplplotwxwidgetsd.so.0.0.0
 lib/libqsastime.so
 lib/libqsastime.so.0
 lib/libqsastime.so.0.0.1
 %%TCLTK%%lib/libtclmatrixd.so
 %%TCLTK%%lib/libtclmatrixd.so.9
 %%TCLTK%%lib/libtclmatrixd.so.9.2.0
+%%LUA%%%%LUA_MODLIBDIR%%/plplot/plplotluac.so
+lib/plplot/driversd/cairo.driver_info
+lib/plplot/driversd/cairo.so
+%%GD%%lib/plplot/driversd/gd.driver_info
+%%GD%%lib/plplot/driversd/gd.so
+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
+lib/plplot/driversd/psttf.so
+%%QT4%%lib/plplot/driversd/qt.driver_info
+%%QT4%%lib/plplot/driversd/qt.so
+lib/plplot/driversd/svg.driver_info
+lib/plplot/driversd/svg.so
+%%TCLTK%%lib/plplot/driversd/tk.driver_info
+%%TCLTK%%lib/plplot/driversd/tk.so
+%%TCLTK%%lib/plplot/driversd/tkwin.driver_info
+%%TCLTK%%lib/plplot/driversd/tkwin.so
+%%WXGTK%%lib/plplot/driversd/wxwidgets.driver_info
+%%WXGTK%%lib/plplot/driversd/wxwidgets.so
+lib/plplot/driversd/xfig.driver_info
+lib/plplot/driversd/xfig.so
+%%X11%%lib/plplot/driversd/xwin.driver_info
+%%X11%%lib/plplot/driversd/xwin.so
 %%TCLTK%%%%PYTHON%%%%PYTHON_SITELIBDIR%%/Plframe.py
 %%TCLTK%%%%PYTHON%%%%PYTHON_SITELIBDIR%%/TclSup.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/_plplotcmodule.so
@@ -67,8 +107,9 @@ lib/libqsastime.so.0.0.1
 libdata/pkgconfig/plplotd-c++.pc
 %%FORTRAN%%libdata/pkgconfig/plplotd-f77.pc
 %%FORTRAN%%libdata/pkgconfig/plplotd-f95.pc
-%%QT%%libdata/pkgconfig/plplotd-qt.pc
+%%QT4%%libdata/pkgconfig/plplotd-qt.pc
 %%TCLTK%%libdata/pkgconfig/plplotd-tcl.pc
+%%WXGTK%%libdata/pkgconfig/plplotd-wxwidgets.pc
 libdata/pkgconfig/plplotd.pc
 %%DOCSDIR%%/ABOUT
 %%DOCSDIR%%/AUTHORS
@@ -97,18 +138,19 @@ libdata/pkgconfig/plplotd.pc
 %%DATADIR%%/cmap1_blue_yellow.pal
 %%DATADIR%%/cmap1_default.pal
 %%DATADIR%%/cmap1_gray.pal
-%%DATADIR%%/cmap1_radar.pal
 %%DATADIR%%/cmap1_highfreq.pal
 %%DATADIR%%/cmap1_lowfreq.pal
+%%DATADIR%%/cmap1_radar.pal
 %%DATADIR%%/examples/CMakeLists.txt
 %%DATADIR%%/examples/Makefile
 %%DATADIR%%/examples/c++/CMakeLists.txt
 %%DATADIR%%/examples/c++/Makefile
-%%QT%%%%DATADIR%%/examples/c++/README.qt_example
+%%QT4%%%%DATADIR%%/examples/c++/README.qt_example
 %%DATADIR%%/examples/c++/plc++demos.h
-%%QT%%%%DATADIR%%/examples/c++/qt_PlotWindow.cpp
-%%QT%%%%DATADIR%%/examples/c++/qt_PlotWindow.h
-%%QT%%%%DATADIR%%/examples/c++/qt_example.cpp
+%%QT4%%%%DATADIR%%/examples/c++/qt_PlotWindow.cpp
+%%QT4%%%%DATADIR%%/examples/c++/qt_PlotWindow.h
+%%QT4%%%%DATADIR%%/examples/c++/qt_example.cpp
+%%WXGTK%%%%DATADIR%%/examples/c++/wxPLplotDemo.cpp
 %%DATADIR%%/examples/c++/x01.cc
 %%DATADIR%%/examples/c++/x01cc.cc
 %%DATADIR%%/examples/c++/x02.cc
@@ -184,12 +226,7 @@ libdata/pkgconfig/plplotd.pc
 %%DATADIR%%/examples/c/x32c.c
 %%DATADIR%%/examples/c/x33c.c
 %%DATADIR%%/examples/c/x34c.c
-%%FORTRAN%%%%DATADIR%%/examples/cmake/modules/CMakeFortranInformation.cmake
 %%DATADIR%%/examples/cmake/modules/FindPkgConfig.cmake
-%%FORTRAN%%%%DATADIR%%/examples/cmake/modules/Platform/Cygwin-GNU-Fortran.cmake
-%%FORTRAN%%%%DATADIR%%/examples/cmake/modules/Platform/Windows-GNU-Fortran.cmake
-%%FORTRAN%%%%DATADIR%%/examples/cmake/modules/Platform/Windows-df.cmake
-%%FORTRAN%%%%DATADIR%%/examples/cmake/modules/Platform/Windows-f90.cmake
 %%DATADIR%%/examples/cmake/modules/export_plplot-%%CMAKE_BUILD_TYPE%%.cmake
 %%DATADIR%%/examples/cmake/modules/export_plplot.cmake
 %%DATADIR%%/examples/cmake/modules/pkg-config.cmake
@@ -230,6 +267,7 @@ libdata/pkgconfig/plplotd.pc
 %%FORTRAN%%%%DATADIR%%/examples/f77/x29f.f
 %%FORTRAN%%%%DATADIR%%/examples/f77/x30f.f
 %%FORTRAN%%%%DATADIR%%/examples/f77/x31f.f
+%%FORTRAN%%%%DATADIR%%/examples/f77/x33f.f
 %%FORTRAN%%%%DATADIR%%/examples/f95/CMakeLists.txt
 %%FORTRAN%%%%DATADIR%%/examples/f95/Makefile
 %%FORTRAN%%%%DATADIR%%/examples/f95/plf95demos.inc
@@ -265,9 +303,45 @@ libdata/pkgconfig/plplotd.pc
 %%FORTRAN%%%%DATADIR%%/examples/f95/x29f.f90
 %%FORTRAN%%%%DATADIR%%/examples/f95/x30f.f90
 %%FORTRAN%%%%DATADIR%%/examples/f95/x31f.f90
+%%FORTRAN%%%%DATADIR%%/examples/f95/x33f.f90
 %%DATADIR%%/examples/lena.pgm
+%%LUA%%%%DATADIR%%/examples/lua/CMakeLists.txt
+%%LUA%%%%DATADIR%%/examples/lua/plplot_examples.lua
+%%LUA%%%%DATADIR%%/examples/lua/x01.lua
+%%LUA%%%%DATADIR%%/examples/lua/x02.lua
+%%LUA%%%%DATADIR%%/examples/lua/x03.lua
+%%LUA%%%%DATADIR%%/examples/lua/x04.lua
+%%LUA%%%%DATADIR%%/examples/lua/x05.lua
+%%LUA%%%%DATADIR%%/examples/lua/x06.lua
+%%LUA%%%%DATADIR%%/examples/lua/x07.lua
+%%LUA%%%%DATADIR%%/examples/lua/x08.lua
+%%LUA%%%%DATADIR%%/examples/lua/x09.lua
+%%LUA%%%%DATADIR%%/examples/lua/x10.lua
+%%LUA%%%%DATADIR%%/examples/lua/x11.lua
+%%LUA%%%%DATADIR%%/examples/lua/x12.lua
+%%LUA%%%%DATADIR%%/examples/lua/x13.lua
+%%LUA%%%%DATADIR%%/examples/lua/x14.lua
+%%LUA%%%%DATADIR%%/examples/lua/x15.lua
+%%LUA%%%%DATADIR%%/examples/lua/x16.lua
+%%LUA%%%%DATADIR%%/examples/lua/x17.lua
+%%LUA%%%%DATADIR%%/examples/lua/x18.lua
+%%LUA%%%%DATADIR%%/examples/lua/x19.lua
+%%LUA%%%%DATADIR%%/examples/lua/x20.lua
+%%LUA%%%%DATADIR%%/examples/lua/x21.lua
+%%LUA%%%%DATADIR%%/examples/lua/x22.lua
+%%LUA%%%%DATADIR%%/examples/lua/x23.lua
+%%LUA%%%%DATADIR%%/examples/lua/x24.lua
+%%LUA%%%%DATADIR%%/examples/lua/x25.lua
+%%LUA%%%%DATADIR%%/examples/lua/x26.lua
+%%LUA%%%%DATADIR%%/examples/lua/x27.lua
+%%LUA%%%%DATADIR%%/examples/lua/x28.lua
+%%LUA%%%%DATADIR%%/examples/lua/x29.lua
+%%LUA%%%%DATADIR%%/examples/lua/x30.lua
+%%LUA%%%%DATADIR%%/examples/lua/x31.lua
+%%LUA%%%%DATADIR%%/examples/lua/x33.lua
 %%DATADIR%%/examples/plplot-test-interactive.sh
 %%DATADIR%%/examples/plplot-test.sh
+%%PYTHON%%%%DATADIR%%/examples/python/CMakeLists.txt
 %%PYTHON%%%%DATADIR%%/examples/python/README.logo
 %%PYTHON%%%%DATADIR%%/examples/python/README.pythondemos
 %%PYTHON%%%%DATADIR%%/examples/python/README.rendering_tests
@@ -276,9 +350,17 @@ libdata/pkgconfig/plplotd.pc
 %%PYTHON%%%%DATADIR%%/examples/python/plplot_python_start.py
 %%PYTHON%%%%DATADIR%%/examples/python/pythondemos.py
 %%TCLTK%%%%PYTHON%%%%DATADIR%%/examples/python/pytkdemo
-%%PYTHON%%%%DATADIR%%/examples/python/svg_760x120_gradient.patch
+%%PYTHON%%%%DATADIR%%/examples/python/test_axis_precision.py
 %%PYTHON%%%%DATADIR%%/examples/python/test_circle.py
+%%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_plplot_encodings.py
+%%PYTHON%%%%DATADIR%%/examples/python/test_plsmem.py
+%%PYTHON%%%%DATADIR%%/examples/python/test_style.py
 %%PYTHON%%%%DATADIR%%/examples/python/test_superscript_subscript.py
+%%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/x01
 %%TCLTK%%%%PYTHON%%%%DATADIR%%/examples/python/x01.py
@@ -330,6 +412,7 @@ libdata/pkgconfig/plplotd.pc
 %%PYTHON%%%%DATADIR%%/examples/python/x29
 %%PYTHON%%%%DATADIR%%/examples/python/x30
 %%PYTHON%%%%DATADIR%%/examples/python/x31
+%%PYTHON%%%%DATADIR%%/examples/python/x33
 %%PYTHON%%%%DATADIR%%/examples/python/xw01.py
 %%PYTHON%%%%DATADIR%%/examples/python/xw02.py
 %%PYTHON%%%%DATADIR%%/examples/python/xw03.py
@@ -361,11 +444,14 @@ libdata/pkgconfig/plplotd.pc
 %%PYTHON%%%%DATADIR%%/examples/python/xw29.py
 %%PYTHON%%%%DATADIR%%/examples/python/xw30.py
 %%PYTHON%%%%DATADIR%%/examples/python/xw31.py
+%%PYTHON%%%%DATADIR%%/examples/python/xw33.py
+%%TCLTK%%%%DATADIR%%/examples/tcl/CMakeLists.txt
 %%TCLTK%%%%DATADIR%%/examples/tcl/README.tcldemos
 %%TCLTK%%%%DATADIR%%/examples/tcl/plgrid.tcl
 %%TCLTK%%%%DATADIR%%/examples/tcl/plot.dat
 %%TCLTK%%%%DATADIR%%/examples/tcl/plot.tcl
 %%TCLTK%%%%DATADIR%%/examples/tcl/r.dat
+%%TCLTK%%%%DATADIR%%/examples/tcl/standard_examples.in
 %%TCLTK%%%%DATADIR%%/examples/tcl/stats.log
 %%TCLTK%%%%DATADIR%%/examples/tcl/tclIndex
 %%TCLTK%%%%DATADIR%%/examples/tcl/tcldemos.tcl
@@ -431,25 +517,36 @@ libdata/pkgconfig/plplotd.pc
 %%TCLTK%%%%DATADIR%%/examples/tcl/x30.tcl
 %%TCLTK%%%%DATADIR%%/examples/tcl/x31
 %%TCLTK%%%%DATADIR%%/examples/tcl/x31.tcl
+%%TCLTK%%%%DATADIR%%/examples/tcl/x33
+%%TCLTK%%%%DATADIR%%/examples/tcl/x33.tcl
 %%DATADIR%%/examples/test_c.sh
 %%DATADIR%%/examples/test_c_interactive.sh
 %%DATADIR%%/examples/test_cxx.sh
 %%DATADIR%%/examples/test_diff.sh
 %%FORTRAN%%%%DATADIR%%/examples/test_f77.sh
 %%FORTRAN%%%%DATADIR%%/examples/test_f95.sh
+%%LUA%%%%DATADIR%%/examples/test_lua.sh
 %%PYTHON%%%%DATADIR%%/examples/test_python.sh
 %%TCLTK%%%%DATADIR%%/examples/test_tcl.sh
 %%TCLTK%%%%DATADIR%%/examples/tk/CMakeLists.txt
 %%TCLTK%%%%DATADIR%%/examples/tk/Makefile
 %%TCLTK%%%%DATADIR%%/examples/tk/README.tkdemos
+%%TCLTK%%%%DATADIR%%/examples/tk/plgrid
+%%TCLTK%%%%DATADIR%%/examples/tk/plgrid.in
 %%TCLTK%%%%DATADIR%%/examples/tk/plgrid.tcl
 %%TCLTK%%%%DATADIR%%/examples/tk/runAllDemos.tcl
 %%TCLTK%%%%DATADIR%%/examples/tk/runExtendedDemos.tcl
+%%TCLTK%%%%DATADIR%%/examples/tk/standard_examples
+%%TCLTK%%%%DATADIR%%/examples/tk/standard_examples.in
 %%TCLTK%%%%DATADIR%%/examples/tk/tclIndex
 %%TCLTK%%%%DATADIR%%/examples/tk/tk01
+%%TCLTK%%%%DATADIR%%/examples/tk/tk01.in
 %%TCLTK%%%%DATADIR%%/examples/tk/tk02
+%%TCLTK%%%%DATADIR%%/examples/tk/tk02.in
 %%TCLTK%%%%DATADIR%%/examples/tk/tk03
+%%TCLTK%%%%DATADIR%%/examples/tk/tk03.in
 %%TCLTK%%%%DATADIR%%/examples/tk/tk04
+%%TCLTK%%%%DATADIR%%/examples/tk/tk04.in
 %%TCLTK%%%%DATADIR%%/examples/tk/tkdemos.tcl
 %%TCLTK%%%%DATADIR%%/examples/tk/x01.tcl
 %%TCLTK%%%%DATADIR%%/examples/tk/x02.tcl
@@ -481,6 +578,7 @@ libdata/pkgconfig/plplotd.pc
 %%TCLTK%%%%DATADIR%%/examples/tk/x28.tcl
 %%TCLTK%%%%DATADIR%%/examples/tk/x29.tcl
 %%TCLTK%%%%DATADIR%%/examples/tk/x30.tcl
+%%TCLTK%%%%DATADIR%%/examples/tk/x31.tcl
 %%TCLTK%%%%DATADIR%%/examples/tk/xtk01.c
 %%TCLTK%%%%DATADIR%%/examples/tk/xtk02.c
 %%TCLTK%%%%DATADIR%%/examples/tk/xtk04.c
@@ -517,9 +615,9 @@ libdata/pkgconfig/plplotd.pc
 %%TCLTK%%@dirrm %%DATADIR%%/examples/tk
 %%TCLTK%%@dirrm %%DATADIR%%/examples/tcl
 %%PYTHON%%@dirrm %%DATADIR%%/examples/python
+%%LUA%%@dirrm %%DATADIR%%/examples/lua
 %%FORTRAN%%@dirrm %%DATADIR%%/examples/f95
 %%FORTRAN%%@dirrm %%DATADIR%%/examples/f77
-%%FORTRAN%%@dirrm %%DATADIR%%/examples/cmake/modules/Platform
 @dirrm %%DATADIR%%/examples/cmake/modules
 @dirrm %%DATADIR%%/examples/cmake
 @dirrm %%DATADIR%%/examples/c++
@@ -527,4 +625,7 @@ libdata/pkgconfig/plplotd.pc
 @dirrm %%DATADIR%%/examples
 @dirrm %%DATADIR%%
 @dirrm %%DOCSDIR%%
+@dirrm lib/plplot/driversd
+@dirrm lib/plplot
+%%LUA%%@dirrm %%LUA_MODLIBDIR%%/plplot
 @dirrm include/plplot