- Upgrade math/plplot to 5.11.0

  Announcement at
  <https://sourceforge.net/p/plplot/plplot/ci/plplot-5.11.0/tree/README.release>

- Take maintainership

- Chase dependencies.

PR:		ports/199539
Submitted by:	Ben Woods <woodsb02 (at) gmail.com>
Approved by:	marino (for plplot-ada), /me (for gnudatalanguage)

22 files changed, 188 insertions, 401 deletions

diff --git a/math/plplot/Makefile b/math/plplot/Makefile
index 7096cd1fdd3d..8287f827c494 100644
--- a/math/plplot/Makefile
+++ b/math/plplot/Makefile
@@ -2,12 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	plplot
-PORTVERSION=	5.10.0
-PORTREVISION=	3
+PORTVERSION=	5.11.0
 CATEGORIES=	math science
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20Source
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	woodsb02@gmail.com
 COMMENT=	Scientific plotting package
 
 LICENSE=	LGPL21 # (or later)
@@ -21,16 +20,16 @@ LIB_DEPENDS=	libLASi.so:${PORTSDIR}/devel/lasi \
 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 DOCS
-OPTIONS_DEFAULT=THREADS X11
-
 USE_GNOME=	pango
 USE_PERL5=	build
 USE_GHOSTSCRIPT=yes
 USES=		cmake gmake perl5 pkgconfig
-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 \
+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=OFF
@@ -39,96 +38,65 @@ USE_LDCONFIG=	yes
 
 FREEFONT_DIR=	${LOCALBASE}/share/fonts/freefont-ttf
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MFORTRAN}
-USES+=		fortran
-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
-PLIST_SUB+=	FORTRAN="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MGD}
-LIB_DEPENDS+=	libgd.so:${PORTSDIR}/graphics/gd
-CMAKE_ARGS+=	-DPLD_png:BOOL=ON
-PLIST_SUB+=	GD=""
-.else
-PLIST_SUB+=	GD="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MLUA}
-USES+=		lua:51
-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}
-USES+=		python
-PLIST_SUB+=	PYTHON=""
-CONFIGURE_ENV+=	PYTHON_VERSION="${PYTHON_VERSION}"
-.else
-CMAKE_ARGS+=	-DENABLE_python:BOOL=OFF
-PLIST_SUB+=	PYTHON="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MTCLTK}
-.if empty(PORT_OPTIONS:MX11)
-IGNORE=		TCLTK needs X11 support
-.endif
-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" \
-		-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"
-PLIST_SUB+=	TCLTK=""
-.else
-CMAKE_ARGS+=	-DENABLE_tcl:BOOL=OFF
-PLIST_SUB+=	TCLTK="@comment "
-.endif
-
-.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+=	QT4="@comment "
-.endif
+OPTIONS_DEFINE=	FORTRAN GD LUA PYTHON QT4 TCLTK THREADS WXGTK X11 DOCS
+OPTIONS_DEFAULT=THREADS X11
+OPTIONS_SUB=	yes
+
+FORTRAN_USES=		fortran
+FORTRAN_CONFIGURE_ENV=	CMAKE_Fortran_COMPILER="${FC}"
+FORTRAN_CMAKE_ON=	-DENABLE_f95:BOOL=ON
+FORTRAN_CMAKE_OFF=	-DENABLE_f95:BOOL=OFF
+
+GD_LIB_DEPENDS=		libgd.so:${PORTSDIR}/graphics/gd
+GD_CMAKE_ON=		-DPLD_png:BOOL=ON
+
+LUA_USES=		lua:51
+LUA_CMAKE_ON=		-DLUA_EXECUTABLE:FILEPATH="${LUA_CMD}"
+LUA_CMAKE_OFF=		-DENABLE_lua:BOOL=OFF
+
+PYTHON_USES=		python
+PYTHON_BUILD_DEPENDS=	swig:${PORTSDIR}/devel/swig13 \
+			${PYNUMPY}
+PYTHON_RUN_DEPENDS=	${PYNUMPY}
+PYTHON_CONFIGURE_ENV=	PYTHON_VERSION="${PYTHON_VERSION}"
+PYTHON_CMAKE_OFF=	-DENABLE_python:BOOL=OFF
+
+TCLTK_LIB_DEPENDS=	libitk.so:${PORTSDIR}/x11-toolkits/itk
+TCLTK_RUN_DEPENDS=	iwidgets>0:${PORTSDIR}/x11-toolkits/iwidgets
+TCLTK_USES=		tk
+ITCL_VER=		3.4
+ITK_VER=		3.3
+IWIDGETS_VER=		4.0.1
+TCLTK_CMAKE_ON=		-DPLPLOT_TK_VERSION="${TK_VER}" \
+			-DPLPLOT_ITCL_VERSION="${ITCL_VER}" \
+			-DPLPLOT_ITK_VERSION="${ITK_VER}" \
+			-DIWIDGETS_VERSIONS_LIST:STRING="${IWIDGETS_VER};${ITK_VER};${ITCL_VER}" \
+			-DTCL_TCLSH:FILEPATH="${TCLSH}" \
+			-DTCL_INCLUDE_PATH:PATH="${TCL_INCLUDEDIR}" \
+			-DITCL_INCLUDE_PATH:PATH="${LOCALBASE}/include/itcl${ITCL_VER}" \
+			-DITCL_LIBRARY:FILEPATH="${LOCALBASE}/lib/libitcl.so" \
+			-DTK_INCLUDE_PATH:PATH="${TK_INCLUDEDIR}" \
+			-DITK_INCLUDE_PATH:PATH="${LOCALBASE}/include/itk${ITK_VER}" \
+			-DITK_LIBRARY:FILEPATH="${LOCALBASE}/lib/libitk.so"
+TCLTK_CMAKE_OFF=	-DENABLE_tcl:BOOL=OFF
+
+THREADS_CMAKE_OFF=	-DTHREADS_HAVE_PTHREAD_ARG:BOOL=OFF
+
+QT4_USE=		QT4=corelib,gui,svg,xml,moc_build,qmake_build,rcc_build,uic_build
+QT4_CMAKE_OFF=		-DENABLE_qt:BOOL=OFF -DDEFAULT_NO_QT_DEVICES:BOOL=ON
+
+WXGTK_LIB_DEPENDS=	libagg.so:${PORTSDIR}/graphics/agg
+WXGTK_USE=		WX=2.6+
+WXGTK_CMAKE_ON=		-DwxWidgets_CONFIG_EXECUTABLE:FILEPATH="${WX_CONFIG}"
+WXGTK_CMAKE_OFF=	-DENABLE_wxwidgets:BOOL=OFF
+
+X11_USE=		XORG=ice,sm,x11,xext
+X11_CMAKE_OFF=		-DPLD_xcairo:BOOL=OFF -DPLD_xwin:BOOL=OFF
 
-.if ${PORT_OPTIONS:MWXGTK}
-LIB_DEPENDS+=	libagg.so:${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
+.include <bsd.port.options.mk>
 
-.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 "
+.if ${PORT_OPTIONS:MTCLTK} && empty(PORT_OPTIONS:MX11)
+IGNORE=		option TCLTK needs X11 support
 .endif
 
 pre-configure:
@@ -136,7 +104,6 @@ pre-configure:
 		'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'
+		${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g'
 
 .include <bsd.port.mk>
diff --git a/math/plplot/distinfo b/math/plplot/distinfo
index e9d889d3378d..a36eb54844a5 100644
--- a/math/plplot/distinfo
+++ b/math/plplot/distinfo
@@ -1,2 +1,2 @@
-SHA256 (plplot-5.10.0.tar.gz) = d4e930b8b9d43cd1663408986218d61f166de7cbc9ef5bed111b0bdea934f9d5
-SIZE (plplot-5.10.0.tar.gz) = 14766687
+SHA256 (plplot-5.11.0.tar.gz) = bfa8434e6e1e7139a5651203ec1256c8581e2fac3122f907f7d8d25ed3bd5f7e
+SIZE (plplot-5.11.0.tar.gz) = 15892751
diff --git a/math/plplot/files/patch-bindings__tk-x-plat__plolotter.c b/math/plplot/files/patch-bindings__tk-x-plat__plolotter.c
deleted file mode 100644
index 89323144928a..000000000000
--- a/math/plplot/files/patch-bindings__tk-x-plat__plolotter.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
--//      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.
diff --git a/math/plplot/files/patch-bindings__tk__plframe.c b/math/plplot/files/patch-bindings__tk__plframe.c
deleted file mode 100644
index 3b668d512ab3..000000000000
--- a/math/plplot/files/patch-bindings__tk__plframe.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
--//	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.
diff --git a/math/plplot/files/patch-bindings__tk__plserver.c b/math/plplot/files/patch-bindings__tk__plserver.c
deleted file mode 100644
index 1822c2943dc9..000000000000
--- a/math/plplot/files/patch-bindings__tk__plserver.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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:
- //	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-bindings__tk__tkMain.c b/math/plplot/files/patch-bindings__tk__tkMain.c
index 41fd34f6ece2..fdcbc798ec23 100644
--- a/math/plplot/files/patch-bindings__tk__tkMain.c
+++ b/math/plplot/files/patch-bindings__tk__tkMain.c
@@ -1,6 +1,6 @@
---- bindings/tk/tkMain.c.orig	2013-12-18 20:25:14.000000000 -0500
+--- bindings/tk/tkMain.c.orig	2015-04-12 10:08:04 UTC
 +++ bindings/tk/tkMain.c
-@@ -92,10 +92,6 @@ EXTERN int Tcl_Import _ANSI_ARGS_( ( Tcl
+@@ -90,10 +90,6 @@ EXTERN int Tcl_Import _ANSI_ARGS_( ( Tcl
                                       int allowOverwrite ) );
  #endif
  
diff --git a/math/plplot/files/patch-cmake_modules_FindVGA.cmake b/math/plplot/files/patch-cmake_modules_FindVGA.cmake
index 6299240cc2a5..b2f3e84b8694 100644
--- a/math/plplot/files/patch-cmake_modules_FindVGA.cmake
+++ b/math/plplot/files/patch-cmake_modules_FindVGA.cmake
@@ -1,5 +1,5 @@
---- cmake/modules/FindVGA.cmake.orig	2009-09-06 21:04:43.000000000 +0200
-+++ cmake/modules/FindVGA.cmake	2009-12-25 20:27:51.000000000 +0100
+--- cmake/modules/FindVGA.cmake.orig	2015-04-12 10:08:04 UTC
++++ cmake/modules/FindVGA.cmake
 @@ -6,7 +6,6 @@
  #  VGA_LIBRARIES, the libraries to link against to use the vga library
  #  VGA_LIBRARY_DIRS, the directory where the vga library is found.
@@ -8,7 +8,7 @@
  find_path(VGA_INCLUDE_DIR vga.h /usr/local/include /usr/include)
  
  if(VGA_INCLUDE_DIR)
-@@ -33,4 +32,3 @@
+@@ -33,4 +32,3 @@ else(VGA_FOUND)
      message(FATAL_ERROR "FindVGA: Could not find vga.h and/or the vga library")
    endif(VGA_FIND_REQUIRED)
  endif(VGA_FOUND)
diff --git a/math/plplot/files/patch-cmake_modules_csiro.cmake b/math/plplot/files/patch-cmake_modules_csiro.cmake
index ab1d76d810a6..c9ca2793f084 100644
--- a/math/plplot/files/patch-cmake_modules_csiro.cmake
+++ b/math/plplot/files/patch-cmake_modules_csiro.cmake
@@ -1,6 +1,6 @@
---- cmake/modules/csiro.cmake.orig	2009-09-06 21:04:43.000000000 +0200
-+++ cmake/modules/csiro.cmake	2009-12-30 21:10:58.000000000 +0100
-@@ -36,6 +36,10 @@
+--- cmake/modules/csiro.cmake.orig	2015-04-12 10:08:04 UTC
++++ cmake/modules/csiro.cmake
+@@ -36,6 +36,10 @@ if(PL_HAVE_QHULL OR WITH_CSA)
        else(CMAKE_C_COMPILER MATCHES "gcc")
          set(NAN_CFLAGS "${NAN_CFLAGS} -ieee")
        endif(CMAKE_C_COMPILER MATCHES "gcc")
diff --git a/math/plplot/files/patch-cmake_modules_instdirs.cmake b/math/plplot/files/patch-cmake_modules_instdirs.cmake
index 389c9836f889..9887aebee869 100644
--- a/math/plplot/files/patch-cmake_modules_instdirs.cmake
+++ b/math/plplot/files/patch-cmake_modules_instdirs.cmake
@@ -1,4 +1,4 @@
---- cmake/modules/instdirs.cmake.orig	2013-11-11 19:54:54.000000000 -0500
+--- cmake/modules/instdirs.cmake.orig	2015-04-12 10:08:04 UTC
 +++ cmake/modules/instdirs.cmake
 @@ -61,13 +61,13 @@ CACHE PATH "install location for C heade
  
@@ -35,11 +35,11 @@
  # Ada source files (*.adb, *.ads) (following recommendations in
  # http://www.ada-france.org/debian/debian-ada-policy.html
 @@ -101,7 +101,7 @@ set(ADA_INCLUDE_DIR ${CMAKE_INSTALL_DATA
- set(ADA_LIB_DIR ${CMAKE_INSTALL_LIBDIR}/ada/adalib/plplotada${LIB_TAG})
+ set(ADA_LIB_DIR ${CMAKE_INSTALL_LIBDIR}/ada/adalib/plplotada)
  
  # Drivers.
--set(DRV_DIR ${CMAKE_INSTALL_LIBDIR}/${PACKAGE}${PLPLOT_VERSION}/drivers${LIB_TAG})
-+set(DRV_DIR ${CMAKE_INSTALL_LIBDIR}/${PACKAGE}/drivers${LIB_TAG})
+-set(DRV_DIR ${CMAKE_INSTALL_LIBDIR}/${PACKAGE}${PLPLOT_VERSION}/drivers)
++set(DRV_DIR ${CMAKE_INSTALL_LIBDIR}/${PACKAGE}/drivers)
  
  # Documentation.
  set(DOC_DIR ${CMAKE_INSTALL_DATADIR}/doc/${PACKAGE})
diff --git a/math/plplot/files/patch-cmake_modules_linuxvga.cmake b/math/plplot/files/patch-cmake_modules_linuxvga.cmake
index 7b4144171a59..cf0835cd456d 100644
--- a/math/plplot/files/patch-cmake_modules_linuxvga.cmake
+++ b/math/plplot/files/patch-cmake_modules_linuxvga.cmake
@@ -1,5 +1,5 @@
---- ./cmake/modules/linuxvga.cmake.orig	2009-09-06 21:04:43.000000000 +0200
-+++ ./cmake/modules/linuxvga.cmake	2009-12-26 23:58:37.000000000 +0100
+--- cmake/modules/linuxvga.cmake.orig	2015-04-12 10:08:04 UTC
++++ cmake/modules/linuxvga.cmake
 @@ -35,7 +35,6 @@
  # set the environment variable CMAKE_LIBRARY_PATH.
  # See cmake documentation for further details.
@@ -8,7 +8,7 @@
    if(PLD_linuxvga)
      find_package(VGA)
      if(VGA_FOUND)
-@@ -50,6 +49,3 @@
+@@ -50,6 +49,3 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
        set(PLD_linuxvga OFF CACHE BOOL "Enable linuxvga device" FORCE)    
      endif(VGA_FOUND)
    endif(PLD_linuxvga)
diff --git a/math/plplot/files/patch-cmake_modules_pkg-config.cmake b/math/plplot/files/patch-cmake_modules_pkg-config.cmake
index fda575952580..da792e85d1f7 100644
--- a/math/plplot/files/patch-cmake_modules_pkg-config.cmake
+++ b/math/plplot/files/patch-cmake_modules_pkg-config.cmake
@@ -1,43 +1,5 @@
-Includes the following upstream commit to make the port work with CMake 3.1.0:
-
-commit 772223c638ecf5dc740c9f3dd7a6883c6d2c83d2
-Author: Alan W. Irwin <airwin@users.sourceforge.net>
-Date:   Sun Dec 7 09:06:08 2014 -0800
-
-    Adjust for internal CMake-3.1 pkg-config change.
-
-    There is a report from Greg Jung <gvjung@gmail.com> that the
-    internal CMake command
-
-    _pkg_check_modules_internal(0 0 ${_prefix} "${_package}")
-
-    must be changed to
-
-    _pkg_check_modules_internal(0 0 0 0 ${_prefix} "${_package}")
-
-    for CMake-3.1 in order to build the cairo device properly.  Accordingly, I have made that adjustment.
-
-    Tested by Alan W. Irwin <airwin@users> on Linux using CMake-3.0.2
-    by building the cairo device.
-
-    N.B. currently untested for CMake-3.1.
-
-    ToDo:
-
-    Extensive tests on CMake-3.1 (once that version is closer to release)
-    still need to be done since the change in the pkg-config support by
-    CMake may need other adjustments as well.
-
---- cmake/modules/pkg-config.cmake.orig	2014-02-06 00:06:07.000000000 -0500
+--- cmake/modules/pkg-config.cmake.orig	2015-04-12 10:08:04 UTC
 +++ cmake/modules/pkg-config.cmake
-@@ -1,6 +1,6 @@
- # cmake/modules/pkg-config.cmake
- #
--# Copyright (C) 2006  Alan W. Irwin
-+# Copyright (C) 2006-2015 Alan W. Irwin
- #
- # This file is part of PLplot.
- #
 @@ -39,7 +39,7 @@ include(FindPkgConfig)
  
  if(PKG_CONFIG_EXECUTABLE)
@@ -47,17 +9,3 @@ Date:   Sun Dec 7 09:06:08 2014 -0800
    set(env_PKG_CONFIG_PATH $ENV{PKG_CONFIG_PATH})
  
    # Will likely need WIN32 and CYGWIN stanzas as well
-@@ -94,7 +94,12 @@ macro(pkg_check_pkgconfig _package _include_DIR _link_DIR _link_FLAGS _cflags _v
-     set(_xprefix ${_prefix})
-   endif(FORCE_EXTERNAL_STATIC)
-   
--  _pkg_check_modules_internal(0 0 ${_prefix} "${_package}")
-+  if(CMAKE_VERSION VERSION_LESS "3.1")
-+    _pkg_check_modules_internal(0 0 ${_prefix} "${_package}")
-+  else(CMAKE_VERSION VERSION_LESS "3.1")
-+    _pkg_check_modules_internal(0 0 0 0 ${_prefix} "${_package}")
-+  endif(CMAKE_VERSION VERSION_LESS "3.1")
-+    
-   if(${_prefix}_FOUND)
-     cmake_link_flags(${_link_FLAGS} "${${_xprefix}_LDFLAGS}")
-     # If libraries cannot be not found, then that is equivalent to whole
diff --git a/math/plplot/files/patch-doc__docbook__src__tcl.xml b/math/plplot/files/patch-doc__docbook__src__tcl.xml
index c3f332b423b7..de06f7a87e2d 100644
--- a/math/plplot/files/patch-doc__docbook__src__tcl.xml
+++ b/math/plplot/files/patch-doc__docbook__src__tcl.xml
@@ -1,6 +1,6 @@
---- doc/docbook/src/tcl.xml.orig
+--- doc/docbook/src/tcl.xml.orig	2015-04-12 10:08:04 UTC
 +++ doc/docbook/src/tcl.xml
-@@ -576,7 +576,7 @@
+@@ -576,7 +576,7 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SU
  	if (pm->fdata[i] > max)
  	max = pm->fdata[i];
  
@@ -9,7 +9,7 @@
  	return TCL_OK;
  	}
  
-@@ -589,7 +589,7 @@
+@@ -589,7 +589,7 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SU
  	if (pm->fdata[i] &lt; min)
  	min = pm->fdata[i];
  
diff --git a/math/plplot/files/patch-examples__python__CMakeLists.txt b/math/plplot/files/patch-examples__python__CMakeLists.txt
index 521744516269..188b64b29d05 100644
--- a/math/plplot/files/patch-examples__python__CMakeLists.txt
+++ b/math/plplot/files/patch-examples__python__CMakeLists.txt
@@ -1,6 +1,6 @@
---- examples/python/CMakeLists.txt.orig
+--- examples/python/CMakeLists.txt.orig	2015-04-12 10:08:04 UTC
 +++ examples/python/CMakeLists.txt
-@@ -241,7 +241,7 @@
+@@ -245,7 +245,7 @@ if(CORE_BUILD)
      @ONLY
      )
  
diff --git a/math/plplot/files/patch-examples__tk__xtk01.c b/math/plplot/files/patch-examples__tk__xtk01.c
deleted file mode 100644
index e68c359c70a0..000000000000
--- a/math/plplot/files/patch-examples__tk__xtk01.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index a645e472b0ef..000000000000
--- a/math/plplot/files/patch-examples__tk__xtk02.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
--//	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
deleted file mode 100644
index 9664d1eb2454..000000000000
--- a/math/plplot/files/patch-examples__tk__xtk04.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
--//	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-include_plConfig.h b/math/plplot/files/patch-include_plConfig.h
deleted file mode 100644
index 8b6a45fd788b..000000000000
--- a/math/plplot/files/patch-include_plConfig.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- include/plConfig.h.in.orig	2013-12-29 21:11:07.000000000 +0100
-+++ include/plConfig.h.in	2014-03-06 15:35:44.000000000 +0100
-@@ -44,7 +44,8 @@
- #ifndef __PLCONFIG_H__
- #define __PLCONFIG_H__
- 
--#ifdef HAVE_CONFIG_H
-+// plplot_config.h won't be installed: don't let it be used by consumers
-+#if defined(HAVE_CONFIG_H) && defined(_IS_BUILDING_PLPLOT_PORT_)
- #  include <plplot_config.h>
- #endif
- 
diff --git a/math/plplot/files/patch-include_plConfig.h.in b/math/plplot/files/patch-include_plConfig.h.in
new file mode 100644
index 000000000000..48a203f8be17
--- /dev/null
+++ b/math/plplot/files/patch-include_plConfig.h.in
@@ -0,0 +1,12 @@
+--- include/plConfig.h.in.orig	2015-04-12 10:08:04 UTC
++++ include/plConfig.h.in
+@@ -43,7 +43,8 @@
+ #ifndef __PLCONFIG_H__
+ #define __PLCONFIG_H__
+ 
+-#ifdef PLPLOT_HAVE_CONFIG_H
++// plplot_config.h won't be installed: don't let it be used by consumers
++#if defined(PLPLOT_HAVE_CONFIG_H) && defined(_IS_BUILDING_PLPLOT_PORT_)
+ #  include <plplot_config.h>
+ #endif
+ 
diff --git a/math/plplot/files/patch-plplot_test__CMakeLists.txt b/math/plplot/files/patch-plplot_test__CMakeLists.txt
deleted file mode 100644
index 20f9802423e0..000000000000
--- a/math/plplot/files/patch-plplot_test__CMakeLists.txt
+++ /dev/null
@@ -1,17 +0,0 @@
---- 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)
-     configure_file(
-       test_diff.sh.in
diff --git a/math/plplot/files/patch-scripts__CMakeLists.txt b/math/plplot/files/patch-scripts__CMakeLists.txt
index ae54f7657cf2..5ada9cffaf29 100644
--- a/math/plplot/files/patch-scripts__CMakeLists.txt
+++ b/math/plplot/files/patch-scripts__CMakeLists.txt
@@ -1,6 +1,6 @@
---- 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 @@
+--- scripts/CMakeLists.txt.orig	2015-04-12 10:08:04 UTC
++++ scripts/CMakeLists.txt
+@@ -28,7 +28,7 @@ if(HAVE_BASH)
      )
    endif(PLD_plmeta)
    if(PLD_pstex)
diff --git a/math/plplot/files/patch-util__plrender.c b/math/plplot/files/patch-util__plrender.c
deleted file mode 100644
index 0d47db22bf27..000000000000
--- a/math/plplot/files/patch-util__plrender.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- utils/plrender.c.orig
-+++ utils/plrender.c
-@@ -834,7 +834,7 @@
-     if ( code ) { fprintf( stderr,          \
-                       "Unable to read in %s at line %d, bytecount %d\n\
- Bytes requested: %d\n", __FILE__, __LINE__, \
--                      (int) pdfs->bp, (int) 2 * n ); return -1; }
-+                      (int) pdfs->bp, (int) 2 * n ); return; }
- 
- static void
- get_ncoords( PLFLT *x, PLFLT *y, PLINT n )
-@@ -869,7 +869,7 @@
-         free( ys );
-     }
- 
--    return 0;
-+    return;
- }
- 
- //--------------------------------------------------------------------------
diff --git a/math/plplot/pkg-plist b/math/plplot/pkg-plist
index 4ac50f70b7e4..fff794d3dfbc 100644
--- a/math/plplot/pkg-plist
+++ b/math/plplot/pkg-plist
@@ -1,6 +1,7 @@
 %%TCLTK%%bin/plserver
 %%TCLTK%%bin/pltcl
 bin/pltek
+%%WXGTK%%bin/wxPLViewer
 include/plplot/disptab.h
 include/plplot/drivers.h
 include/plplot/gcw.h
@@ -21,13 +22,18 @@ include/plplot/plxwd.h
 include/plplot/qsastime.h
 include/plplot/qsastimedll.h
 %%QT4%%include/plplot/qt.h
+%%TCLTK%%include/plplot/tclMatrix.h
 %%WXGTK%%include/plplot/wxPLplotstream.h
 %%WXGTK%%include/plplot/wxPLplotwindow.h
-%%TCLTK%%include/plplot/tclMatrix.h
-%%FORTRAN%%lib/fortran/include/plplot/plplot_parameters.h
+lib/cmake/plplot/export_plplot-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/plplot/export_plplot.cmake
+lib/cmake/plplot/plplotConfig.cmake
 %%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/plplot_graphics.mod
+%%FORTRAN%%lib/fortran/modules/plplot/plplot_str.mod
+%%FORTRAN%%lib/fortran/modules/plplot/plplot_strutils.mod
+%%FORTRAN%%lib/fortran/modules/plplot/plplot_types.mod
 %%FORTRAN%%lib/fortran/modules/plplot/plplotp.mod
 lib/libcsirocsa.so
 lib/libcsirocsa.so.0
@@ -35,80 +41,79 @@ 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.11
-lib/libplplotcxxd.so.11.0.0
-lib/libplplotd.so
-lib/libplplotd.so.12
-lib/libplplotd.so.12.0.1
-%%FORTRAN%%lib/libplplotf77cd.so
-%%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.10
-%%FORTRAN%%lib/libplplotf95cd.so.10.0.0
-%%FORTRAN%%lib/libplplotf95d.so
-%%FORTRAN%%lib/libplplotf95d.so.10
-%%FORTRAN%%lib/libplplotf95d.so.10.0.0
-%%QT4%%lib/libplplotqtd.so
-%%QT4%%lib/libplplotqtd.so.1
-%%QT4%%lib/libplplotqtd.so.1.0.0
-%%TCLTK%%lib/libplplottcltkd.so
-%%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
+%%FORTRAN%%lib/libplf95demolib.a
+lib/libplplot.so
+lib/libplplot.so.13
+lib/libplplot.so.13.0.1
+lib/libplplotcxx.so
+lib/libplplotcxx.so.12
+lib/libplplotcxx.so.12.0.0
+%%FORTRAN%%lib/libplplotf95.so
+%%FORTRAN%%lib/libplplotf95.so.12
+%%FORTRAN%%lib/libplplotf95.so.12.0.0
+%%FORTRAN%%lib/libplplotf95c.so
+%%FORTRAN%%lib/libplplotf95c.so.12
+%%FORTRAN%%lib/libplplotf95c.so.12.0.0
+%%QT4%%lib/libplplotqt.so
+%%QT4%%lib/libplplotqt.so.2
+%%QT4%%lib/libplplotqt.so.2.0.0
+%%TCLTK%%lib/libplplottcltk.so
+%%TCLTK%%lib/libplplottcltk.so.12
+%%TCLTK%%lib/libplplottcltk.so.12.1.0
+%%TCLTK%%lib/libplplottcltk_Main.so
+%%TCLTK%%lib/libplplottcltk_Main.so.1
+%%TCLTK%%lib/libplplottcltk_Main.so.1.0.0
+%%WXGTK%%lib/libplplotwxwidgets.so
+%%WXGTK%%lib/libplplotwxwidgets.so.1
+%%WXGTK%%lib/libplplotwxwidgets.so.1.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
+%%TCLTK%%lib/libtclmatrix.so
+%%TCLTK%%lib/libtclmatrix.so.10
+%%TCLTK%%lib/libtclmatrix.so.10.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/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
+lib/plplot/drivers/cairo.driver_info
+lib/plplot/drivers/cairo.so
+%%GD%%lib/plplot/drivers/gd.driver_info
+%%GD%%lib/plplot/drivers/gd.so
+lib/plplot/drivers/mem.driver_info
+lib/plplot/drivers/mem.so
+%%TCLTK%%lib/plplot/drivers/ntk.driver_info
+%%TCLTK%%lib/plplot/drivers/ntk.so
+lib/plplot/drivers/null.driver_info
+lib/plplot/drivers/null.so
+lib/plplot/drivers/ps.driver_info
+lib/plplot/drivers/ps.so
+lib/plplot/drivers/psttf.driver_info
+lib/plplot/drivers/psttf.so
+%%QT4%%lib/plplot/drivers/qt.driver_info
+%%QT4%%lib/plplot/drivers/qt.so
+lib/plplot/drivers/svg.driver_info
+lib/plplot/drivers/svg.so
+%%TCLTK%%lib/plplot/drivers/tk.driver_info
+%%TCLTK%%lib/plplot/drivers/tk.so
+%%TCLTK%%lib/plplot/drivers/tkwin.driver_info
+%%TCLTK%%lib/plplot/drivers/tkwin.so
+%%WXGTK%%lib/plplot/drivers/wxwidgets.driver_info
+%%WXGTK%%lib/plplot/drivers/wxwidgets.so
+lib/plplot/drivers/xfig.driver_info
+lib/plplot/drivers/xfig.so
+%%X11%%lib/plplot/drivers/xwin.driver_info
+%%X11%%lib/plplot/drivers/xwin.so
 %%TCLTK%%%%PYTHON%%%%PYTHON_SITELIBDIR%%/Plframe.py
 %%TCLTK%%%%PYTHON%%%%PYTHON_SITELIBDIR%%/TclSup.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/_plplotcmodule.so
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/plplot.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/plplot_widgetmodule.so
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/plplotc.py
-libdata/pkgconfig/plplotd-c++.pc
-%%FORTRAN%%libdata/pkgconfig/plplotd-f77.pc
-%%FORTRAN%%libdata/pkgconfig/plplotd-f95.pc
-%%QT4%%libdata/pkgconfig/plplotd-qt.pc
-%%TCLTK%%libdata/pkgconfig/plplotd-tcl.pc
-%%WXGTK%%libdata/pkgconfig/plplotd-wxwidgets.pc
-libdata/pkgconfig/plplotd.pc
+libdata/pkgconfig/plplot-c++.pc
+%%FORTRAN%%libdata/pkgconfig/plplot-f95.pc
+%%QT4%%libdata/pkgconfig/plplot-qt.pc
+%%TCLTK%%libdata/pkgconfig/plplot-tcl.pc
+%%TCLTK%%libdata/pkgconfig/plplot-tcl_Main.pc
+%%WXGTK%%libdata/pkgconfig/plplot-wxwidgets.pc
+libdata/pkgconfig/plplot.pc
 %%TCLTK%%man/man1/plserver.1.gz
 %%TCLTK%%man/man1/pltcl.1.gz
 man/man1/pltek.1.gz
@@ -192,6 +197,7 @@ man/man1/pltek.1.gz
 %%DATADIR%%/examples/c/ext-cairo-test.c
 %%X11%%%%DATADIR%%/examples/c/extXdrawable_demo.c
 %%DATADIR%%/examples/c/plcdemos.h
+%%DATADIR%%/examples/c/test_plbuf.c
 %%DATADIR%%/examples/c/test_plend.c
 %%DATADIR%%/examples/c/tutor.c
 %%DATADIR%%/examples/c/x00c.c
@@ -229,48 +235,11 @@ man/man1/pltek.1.gz
 %%DATADIR%%/examples/c/x32c.c
 %%DATADIR%%/examples/c/x33c.c
 %%DATADIR%%/examples/c/x34c.c
-%%DATADIR%%/examples/cmake/modules/export_plplot-%%CMAKE_BUILD_TYPE%%.cmake
-%%DATADIR%%/examples/cmake/modules/export_plplot.cmake
 %%DATADIR%%/examples/cmake/modules/language_support.cmake
+%%QT4%%%%DATADIR%%/examples/cmake/modules/ndp_UseQt4.cmake
 %%DATADIR%%/examples/cmake/modules/pkg-config.cmake
 %%DATADIR%%/examples/cmake/modules/plplot_configure.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
-%%FORTRAN%%%%DATADIR%%/examples/f77/x01f.f
-%%FORTRAN%%%%DATADIR%%/examples/f77/x02f.f
-%%FORTRAN%%%%DATADIR%%/examples/f77/x03f.f
-%%FORTRAN%%%%DATADIR%%/examples/f77/x04f.f
-%%FORTRAN%%%%DATADIR%%/examples/f77/x05f.f
-%%FORTRAN%%%%DATADIR%%/examples/f77/x06f.f
-%%FORTRAN%%%%DATADIR%%/examples/f77/x07f.f
-%%FORTRAN%%%%DATADIR%%/examples/f77/x08f.f
-%%FORTRAN%%%%DATADIR%%/examples/f77/x09f.f
-%%FORTRAN%%%%DATADIR%%/examples/f77/x10f.f
-%%FORTRAN%%%%DATADIR%%/examples/f77/x11f.f
-%%FORTRAN%%%%DATADIR%%/examples/f77/x12f.f
-%%FORTRAN%%%%DATADIR%%/examples/f77/x13f.f
-%%FORTRAN%%%%DATADIR%%/examples/f77/x14f.f
-%%FORTRAN%%%%DATADIR%%/examples/f77/x15f.f
-%%FORTRAN%%%%DATADIR%%/examples/f77/x16af.f
-%%FORTRAN%%%%DATADIR%%/examples/f77/x16f.f
-%%FORTRAN%%%%DATADIR%%/examples/f77/x17f.f
-%%FORTRAN%%%%DATADIR%%/examples/f77/x18f.f
-%%FORTRAN%%%%DATADIR%%/examples/f77/x19f.f
-%%FORTRAN%%%%DATADIR%%/examples/f77/x20f.f
-%%FORTRAN%%%%DATADIR%%/examples/f77/x21f.f
-%%FORTRAN%%%%DATADIR%%/examples/f77/x22f.f
-%%FORTRAN%%%%DATADIR%%/examples/f77/x23f.f
-%%FORTRAN%%%%DATADIR%%/examples/f77/x24f.f
-%%FORTRAN%%%%DATADIR%%/examples/f77/x25f.f
-%%FORTRAN%%%%DATADIR%%/examples/f77/x26f.f
-%%FORTRAN%%%%DATADIR%%/examples/f77/x27f.f
-%%FORTRAN%%%%DATADIR%%/examples/f77/x28f.f
-%%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
@@ -459,11 +428,12 @@ man/man1/pltek.1.gz
 %%TCLTK%%%%DATADIR%%/examples/tcl/plgrid.tcl
 %%TCLTK%%%%DATADIR%%/examples/tcl/plot.dat
 %%TCLTK%%%%DATADIR%%/examples/tcl/plot.tcl
+%%TCLTK%%%%DATADIR%%/examples/tcl/pltcl_standard_examples.in
 %%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
+%%TCLTK%%%%DATADIR%%/examples/tcl/tclsh_standard_examples.in
 %%TCLTK%%%%DATADIR%%/examples/tcl/x00
 %%TCLTK%%%%DATADIR%%/examples/tcl/x00.tcl
 %%TCLTK%%%%DATADIR%%/examples/tcl/x01
@@ -534,7 +504,6 @@ man/man1/pltek.1.gz
 %%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
@@ -545,10 +514,12 @@ man/man1/pltek.1.gz
 %%TCLTK%%%%DATADIR%%/examples/tk/plgrid
 %%TCLTK%%%%DATADIR%%/examples/tk/plgrid.in
 %%TCLTK%%%%DATADIR%%/examples/tk/plgrid.tcl
+%%TCLTK%%%%DATADIR%%/examples/tk/plserver_runAllDemos
+%%TCLTK%%%%DATADIR%%/examples/tk/plserver_runAllDemos.in
+%%TCLTK%%%%DATADIR%%/examples/tk/plserver_standard_examples
+%%TCLTK%%%%DATADIR%%/examples/tk/plserver_standard_examples.in
 %%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
@@ -559,6 +530,10 @@ man/man1/pltek.1.gz
 %%TCLTK%%%%DATADIR%%/examples/tk/tk04
 %%TCLTK%%%%DATADIR%%/examples/tk/tk04.in
 %%TCLTK%%%%DATADIR%%/examples/tk/tkdemos.tcl
+%%TCLTK%%%%DATADIR%%/examples/tk/wish_runAllDemos
+%%TCLTK%%%%DATADIR%%/examples/tk/wish_runAllDemos.in
+%%TCLTK%%%%DATADIR%%/examples/tk/wish_standard_examples
+%%TCLTK%%%%DATADIR%%/examples/tk/wish_standard_examples.in
 %%TCLTK%%%%DATADIR%%/examples/tk/x00.tcl
 %%TCLTK%%%%DATADIR%%/examples/tk/x01.tcl
 %%TCLTK%%%%DATADIR%%/examples/tk/x02.tcl