math/plplot: Update to 5.15.0

Changes this release:
  https://sourceforge.net/p/plplot/news/2019/06/plplot-5150-has-been-released/
  https://sourceforge.net/p/plplot/news/2018/12/plplot-5140-has-been-released/
  https://sourceforge.net/p/plplot/news/2017/08/plplot-5130-has-been-released/

PR:		236577
Submitted by:	yuri (partially)

8 files changed, 245 insertions, 219 deletions

diff --git a/math/plplot/Makefile b/math/plplot/Makefile
index f519da7ba5a9..9b9c7b2b601c 100644
--- a/math/plplot/Makefile
+++ b/math/plplot/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	plplot
-PORTVERSION=	5.12.0
-PORTREVISION=	8
+DISTVERSION=	5.15.0
 CATEGORIES=	math science
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20Source
 
@@ -22,9 +21,23 @@ RUN_DEPENDS=	bash:shells/bash \
 		${FREEFONT_DIR}/FreeMono.ttf:x11-fonts/freefont-ttf
 
 USES=		compiler:c11 cmake gettext-runtime ghostscript gnome \
-		localbase perl5 pathfix pkgconfig
+		localbase perl5 pathfix pkgconfig shebangfix
 USE_GNOME=	cairo pango
 USE_PERL5=	build
+
+SHEBANG_FILES=	${WRKSRC}/examples/python/* \
+		${WRKSRC}/examples/tcl/* \
+		${WRKSRC}/examples/tk/*
+SHEBANG_LANG=	sh xtk01 xtk02 xtk04
+sh_OLD_CMD=	@SH_EXECUTABLE@
+sh_CMD=		/bin/sh
+xtk01_OLD_CMD=	@xtk01_LOCATION@
+xtk01_CMD=	${DATADIR}/examples/tk/xtk01
+xtk02_OLD_CMD=	@xtk02_LOCATION@
+xtk02_CMD=	${DATADIR}/examples/tk/xtk02
+xtk04_OLD_CMD=	@xtk04_LOCATION@
+xtk04_CMD=	${DATADIR}/examples/tk/xtk04
+
 CMAKE_ARGS=	-DENABLE_java:BOOL=OFF \
 		-DENABLE_octave:BOOL=OFF \
 		-DENABLE_pdl:BOOL=OFF \
@@ -37,11 +50,14 @@ CMAKE_ARGS=	-DENABLE_java:BOOL=OFF \
 		-DPLD_plmeta:BOOL=OFF
 CFLAGS+=	-D_IS_BUILDING_PLPLOT_PORT_
 USE_LDCONFIG=	yes
-CMAKE_OFF=		DEFAULT_NO_QT_DEVICES
+CMAKE_OFF=	DEFAULT_NO_QT_DEVICES
+LDFLAGS+=	-pthread
+DATADIR=	${PREFIX}/share/${PORTNAME}${PORTVERSION}
+PLIST_SUB=	PLPLOT_VERSION=${PORTVERSION}
 
 FREEFONT_DIR=	${LOCALBASE}/share/fonts/freefont-ttf
 
-OPTIONS_DEFINE=		DOCS FORTRAN GD LUA PYTHON TCLTK THREADS WXGTK X11
+OPTIONS_DEFINE=		DOCS FORTRAN GD LUA PYTHON QT5 TCLTK THREADS WXGTK X11
 OPTIONS_RADIO=		QHULL
 OPTIONS_RADIO_QHULL=	QHULL2015 QHULL2003
 OPTIONS_DEFAULT=	QHULL2015 THREADS X11
@@ -56,7 +72,7 @@ GD_LIB_DEPENDS=		libgd.so:graphics/gd \
 GD_USES=		jpeg
 GD_CMAKE_BOOL=		PLD_png
 
-LUA_USES=		lua:51
+LUA_USES=		lua
 LUA_CMAKE_BOOL=		ENABLE_lua
 LUA_CMAKE_ON=		-DLUA_EXECUTABLE:FILEPATH="${LUA_CMD}"
 
@@ -67,7 +83,6 @@ PYTHON_BINARY_ALIAS=	swig=swig3.0
 PYTHON_RUN_DEPENDS=	${PYNUMPY}
 PYTHON_CMAKE_BOOL=	ENABLE_python
 PYTHON_CONFIGURE_ENV=	PYTHON_VERSION="${PYTHON_VERSION}"
-PYTHON_BROKEN=		Does not package
 
 QHULL2003_DESC=		Legacy Qhull support
 QHULL2015_DESC=		Latest Qhull support
@@ -78,7 +93,7 @@ QHULL2015_CMAKE_ON=	-DQHULL_INCLUDE_DIRS:PATH="${LOCALBASE}/include/libqhull"
 TCLTK_LIB_DEPENDS=	libitk.so:x11-toolkits/itk
 TCLTK_RUN_DEPENDS=	iwidgets>0:x11-toolkits/iwidgets
 TCLTK_USES=		tk
-TCLTK_CMAKE_BOOL=	ENABLE_tcl
+TCLTK_CMAKE_BOOL=	ENABLE_itcl ENABLE_itk ENABLE_tcl ENABLE_tk
 TCLTK_IMPLIES=		X11
 ITCL_VER=		3.4.1
 ITK_VER=		3.3
@@ -97,12 +112,16 @@ TCLTK_CMAKE_ON=		-DPLPLOT_TK_VERSION:STRING="${TK_VER}" \
 
 THREADS_CMAKE_BOOL=	THREADS_HAVE_PTHREAD_ARG
 
+QT5_USES=		qt:5
+QT5_USE=		QT=core,gui,printsupport,svg,xml,widgets,buildtools_build,qmake_build
+QT5_CMAKE_BOOL=		ENABLE_qt
 
 WXGTK_LIB_DEPENDS=	libagg.so:graphics/agg
 WXGTK_USE=		WX=3.0+
 WXGTK_CMAKE_BOOL=	ENABLE_wxwidgets
 WXGTK_CMAKE_ON=		-DwxWidgets_CONFIG_EXECUTABLE:FILEPATH="${WX_CONFIG}"
 
+X11_USES=		xorg
 X11_USE=		XORG=ice,sm,x11,xext
 X11_CMAKE_BOOL=		PLD_xcairo PLD_xwin
 
diff --git a/math/plplot/distinfo b/math/plplot/distinfo
index be5f892832fd..659302e9584b 100644
--- a/math/plplot/distinfo
+++ b/math/plplot/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1486185399
-SHA256 (plplot-5.12.0.tar.gz) = 8dc5da5ef80e4e19993d4c3ef2a84a24cc0e44a5dade83201fca7160a6d352ce
-SIZE (plplot-5.12.0.tar.gz) = 16253895
+TIMESTAMP = 1561165480
+SHA256 (plplot-5.15.0.tar.gz) = b92de4d8f626a9b20c84fc94f4f6a9976edd76e33fb1eae44f6804bdcc628c7b
+SIZE (plplot-5.15.0.tar.gz) = 15380293
diff --git a/math/plplot/files/patch-bindings__tk__tkMain.c b/math/plplot/files/patch-bindings__tk__tkMain.c
deleted file mode 100644
index fdcbc798ec23..000000000000
--- a/math/plplot/files/patch-bindings__tk__tkMain.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- bindings/tk/tkMain.c.orig	2015-04-12 10:08:04 UTC
-+++ bindings/tk/tkMain.c
-@@ -90,10 +90,6 @@ EXTERN int Tcl_Import _ANSI_ARGS_( ( Tcl
-                                      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
diff --git a/math/plplot/files/patch-cmake_modules_FindVGA.cmake b/math/plplot/files/patch-cmake_modules_FindVGA.cmake
deleted file mode 100644
index b2f3e84b8694..000000000000
--- a/math/plplot/files/patch-cmake_modules_FindVGA.cmake
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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.
- 
--if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
- find_path(VGA_INCLUDE_DIR vga.h /usr/local/include /usr/include)
- 
- if(VGA_INCLUDE_DIR)
-@@ -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)
--endif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
diff --git a/math/plplot/files/patch-cmake_modules_csiro.cmake b/math/plplot/files/patch-cmake_modules_csiro.cmake
deleted file mode 100644
index c9ca2793f084..000000000000
--- a/math/plplot/files/patch-cmake_modules_csiro.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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")
-+    else(CMAKE_SYSTEM_PROCESSOR MATCHES "alpha.*")
-+      if(CMAKE_SYSTEM_PROCESSOR MATCHES "amd64")
-+        set(NAN_CFLAGS "${NAN_CFLAGS} -mieee-fp")
-+      endif(CMAKE_SYSTEM_PROCESSOR MATCHES "amd64")
-     endif(CMAKE_SYSTEM_PROCESSOR MATCHES "alpha.*")
-   endif(CMAKE_SYSTEM_PROCESSOR MATCHES "i[0-9]86")
-   if(NOT DEFINED NaNAwareCCompiler)
diff --git a/math/plplot/files/patch-cmake_modules_instdirs.cmake b/math/plplot/files/patch-cmake_modules_instdirs.cmake
deleted file mode 100644
index 9887aebee869..000000000000
--- a/math/plplot/files/patch-cmake_modules_instdirs.cmake
+++ /dev/null
@@ -1,45 +0,0 @@
---- 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
- 
- set(
- CMAKE_INSTALL_INFODIR
--${CMAKE_INSTALL_DATADIR}/info
-+${CMAKE_INSTALL_PREFIX}/info
- CACHE PATH "install location for info documentation"
- )
- 
- set(
- CMAKE_INSTALL_MANDIR
--${CMAKE_INSTALL_DATADIR}/man
-+${CMAKE_INSTALL_PREFIX}/man
- CACHE PATH "install location for man documentation"
- )
- 
-@@ -75,7 +75,7 @@ CACHE PATH "install location for man doc
- # cached values above.
- 
- # Data.
--set(DATA_DIR ${CMAKE_INSTALL_DATADIR}/${PACKAGE}${PLPLOT_VERSION})
-+set(DATA_DIR ${CMAKE_INSTALL_DATADIR}/${PACKAGE})
- 
- # Libraries.
- set(LIB_DIR ${CMAKE_INSTALL_LIBDIR})
-@@ -90,7 +90,7 @@ set(BIN_DIR ${CMAKE_INSTALL_BINDIR})
- set(SHLIB_DIR ${CMAKE_INSTALL_LIBDIR})
- 
- # Tcl files.
--set(TCL_DIR ${CMAKE_INSTALL_DATADIR}/${PACKAGE}${PLPLOT_VERSION}/tcl)
-+set(TCL_DIR ${CMAKE_INSTALL_DATADIR}/${PACKAGE}/tcl)
- 
- # Ada source files (*.adb, *.ads) (following recommendations in
- # http://www.ada-france.org/debian/debian-ada-policy.html
-@@ -101,7 +101,7 @@ set(ADA_INCLUDE_DIR ${CMAKE_INSTALL_DATA
- set(ADA_LIB_DIR ${CMAKE_INSTALL_LIBDIR}/ada/adalib/plplotada)
- 
- # Drivers.
--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_pkg-config.cmake b/math/plplot/files/patch-cmake_modules_pkg-config.cmake
deleted file mode 100644
index f8c26a8037db..000000000000
--- a/math/plplot/files/patch-cmake_modules_pkg-config.cmake
+++ /dev/null
@@ -1,19 +0,0 @@
-The *internal* _pkg_check_modules_internal macro of cmake gained another 
-parameter in cmake-3.13.
-
-https://gitlab.kitware.com/cmake/cmake/commit/7aa26cf0e9319be3f7785763eb3699823453eb60
-
---- cmake/modules/pkg-config.cmake.orig	2018-11-25 12:01:15 UTC
-+++ cmake/modules/pkg-config.cmake
-@@ -122,8 +122,10 @@ macro(pkg_check_pkgconfig _package _include_DIR _link_
-     _pkg_check_modules_internal(0 0 ${_prefix} "${_package}")
-   elseif(CMAKE_VERSION VERSION_LESS "3.6")
-     _pkg_check_modules_internal(0 0 0 0 ${_prefix} "${_package}")
--  else(CMAKE_VERSION VERSION_LESS "3.1")
-+  elseif(CMAKE_VERSION VERSION_LESS "3.13")
-     _pkg_check_modules_internal(0 0 0 0 0 ${_prefix} "${_package}")
-+  else(CMAKE_VERSION VERSION_LESS "3.1")
-+    _pkg_check_modules_internal(0 0 0 0 0 0 ${_prefix} "${_package}")
-   endif(CMAKE_VERSION VERSION_LESS "3.1")
- 
-   if(${_prefix}_FOUND)
diff --git a/math/plplot/pkg-plist b/math/plplot/pkg-plist
index bc9e9337310d..d8ed7c53a924 100644
--- a/math/plplot/pkg-plist
+++ b/math/plplot/pkg-plist
@@ -2,8 +2,12 @@
 %%TCLTK%%bin/pltcl
 bin/pltek
 %%WXGTK%%bin/wxPLViewer
+include/plplot/csa.h
+include/plplot/csadll.h
 include/plplot/disptab.h
 include/plplot/drivers.h
+%%QHULL2015%%include/plplot/nn.h
+%%QHULL2015%%include/plplot/nndll.h
 include/plplot/pdf.h
 include/plplot/plConfig.h
 include/plplot/plDevs.h
@@ -19,14 +23,80 @@ include/plplot/plstrm.h
 include/plplot/plxwd.h
 include/plplot/qsastime.h
 include/plplot/qsastimedll.h
+%%QT5%%include/plplot/qt.h
 %%TCLTK%%include/plplot/tclMatrix.h
 %%WXGTK%%include/plplot/wxPLplot_nanosec.h
 %%WXGTK%%include/plplot/wxPLplotstream.h
 %%WXGTK%%include/plplot/wxPLplotwindow.h
-lib/cmake/plplot/export_plplot-%%CMAKE_BUILD_TYPE%%.cmake
+%%TCLTK%%lib/cmake/plplot/export_Pltk_init-release.cmake
+%%TCLTK%%lib/cmake/plplot/export_Pltk_init.cmake
+lib/cmake/plplot/export_cairo-release.cmake
+lib/cmake/plplot/export_cairo.cmake
+lib/cmake/plplot/export_csirocsa-release.cmake
+lib/cmake/plplot/export_csirocsa.cmake
+%%QHULL2015%%lib/cmake/plplot/export_csironn-release.cmake
+%%QHULL2015%%lib/cmake/plplot/export_csironn.cmake
+%%GD%%lib/cmake/plplot/export_gd-release.cmake
+%%GD%%lib/cmake/plplot/export_gd.cmake
+lib/cmake/plplot/export_mem-release.cmake
+lib/cmake/plplot/export_mem.cmake
+%%TCLTK%%lib/cmake/plplot/export_ntk-release.cmake
+%%TCLTK%%lib/cmake/plplot/export_ntk.cmake
+lib/cmake/plplot/export_null-release.cmake
+lib/cmake/plplot/export_null.cmake
+%%FORTRAN%%lib/cmake/plplot/export_plfortrandemolib-release.cmake
+%%FORTRAN%%lib/cmake/plplot/export_plfortrandemolib.cmake
+lib/cmake/plplot/export_plplot-release.cmake
 lib/cmake/plplot/export_plplot.cmake
+%%TCLTK%%lib/cmake/plplot/export_plplotc-release.cmake
+%%TCLTK%%lib/cmake/plplot/export_plplotc.cmake
+lib/cmake/plplot/export_plplotcxx-release.cmake
+lib/cmake/plplot/export_plplotcxx.cmake
+%%TCLTK%%lib/cmake/plplot/export_plserver-release.cmake
+%%TCLTK%%lib/cmake/plplot/export_plserver.cmake
+%%FORTRAN%%lib/cmake/plplot/export_plplotfortran-release.cmake
+%%FORTRAN%%lib/cmake/plplot/export_plplotfortran.cmake
+%%LUA%%lib/cmake/plplot/export_plplotluac-release.cmake
+%%LUA%%lib/cmake/plplot/export_plplotluac.cmake
+%%QT5%%lib/cmake/plplot/export_plplotqt-release.cmake
+%%QT5%%lib/cmake/plplot/export_plplotqt.cmake
+%%TCLTK%%lib/cmake/plplot/export_plplottcltk-release.cmake
+%%TCLTK%%lib/cmake/plplot/export_plplottcltk.cmake
+%%TCLTK%%lib/cmake/plplot/export_plplottcltk_Main-release.cmake
+%%TCLTK%%lib/cmake/plplot/export_plplottcltk_Main.cmake
+%%WXGTK%%lib/cmake/plplot/export_plplotwxwidgets-release.cmake
+%%WXGTK%%lib/cmake/plplot/export_plplotwxwidgets.cmake
+%%TCLTK%%lib/cmake/plplot/export_pltcl-release.cmake
+%%TCLTK%%lib/cmake/plplot/export_pltcl.cmake
+lib/cmake/plplot/export_pltek-release.cmake
+lib/cmake/plplot/export_pltek.cmake
+lib/cmake/plplot/export_ps-release.cmake
+lib/cmake/plplot/export_ps.cmake
+lib/cmake/plplot/export_psttf-release.cmake
+lib/cmake/plplot/export_psttf.cmake
+lib/cmake/plplot/export_qsastime-release.cmake
+lib/cmake/plplot/export_qsastime.cmake
+%%QT5%%lib/cmake/plplot/export_qt-release.cmake
+%%QT5%%lib/cmake/plplot/export_qt.cmake
+lib/cmake/plplot/export_svg-release.cmake
+lib/cmake/plplot/export_svg.cmake
+%%TCLTK%%lib/cmake/plplot/export_tclmatrix-release.cmake
+%%TCLTK%%lib/cmake/plplot/export_tclmatrix.cmake
+%%TCLTK%%lib/cmake/plplot/export_tk-release.cmake
+%%TCLTK%%lib/cmake/plplot/export_tk.cmake
+%%TCLTK%%lib/cmake/plplot/export_tkwin-release.cmake
+%%TCLTK%%lib/cmake/plplot/export_tkwin.cmake
+%%WXGTK%%lib/cmake/plplot/export_wxPLViewer-release.cmake
+%%WXGTK%%lib/cmake/plplot/export_wxPLViewer.cmake
+%%WXGTK%%lib/cmake/plplot/export_wxwidgets-release.cmake
+%%WXGTK%%lib/cmake/plplot/export_wxwidgets.cmake
+lib/cmake/plplot/export_xfig-release.cmake
+lib/cmake/plplot/export_xfig.cmake
+%%X11%%lib/cmake/plplot/export_xwin-release.cmake
+%%X11%%lib/cmake/plplot/export_xwin.cmake
 lib/cmake/plplot/plplotConfig.cmake
-%%FORTRAN%%lib/fortran/modules/plplot/plf95demolib.mod
+lib/cmake/plplot/plplot_exports.cmake
+%%FORTRAN%%lib/fortran/modules/plplot/plfortrandemolib.mod
 %%FORTRAN%%lib/fortran/modules/plplot/plplot.mod
 %%FORTRAN%%lib/fortran/modules/plplot/plplot_double.mod
 %%FORTRAN%%lib/fortran/modules/plplot/plplot_graphics.mod
@@ -37,76 +107,80 @@ lib/cmake/plplot/plplotConfig.cmake
 lib/libcsirocsa.so
 lib/libcsirocsa.so.0
 lib/libcsirocsa.so.0.0.1
-lib/libcsironn.so
-lib/libcsironn.so.0
-lib/libcsironn.so.0.0.2
-%%FORTRAN%%lib/libplf95demolib.a
+%%QHULL2015%%lib/libcsironn.so
+%%QHULL2015%%lib/libcsironn.so.0
+%%QHULL2015%%lib/libcsironn.so.0.0.2
+%%FORTRAN%%lib/libplfortrandemolib.a
 lib/libplplot.so
-lib/libplplot.so.14
-lib/libplplot.so.14.0.0
+lib/libplplot.so.17
+lib/libplplot.so.17.0.0
 lib/libplplotcxx.so
-lib/libplplotcxx.so.13
-lib/libplplotcxx.so.13.0.0
-%%FORTRAN%%lib/libplplotf95.so
-%%FORTRAN%%lib/libplplotf95.so.13
-%%FORTRAN%%lib/libplplotf95.so.13.0.0
+lib/libplplotcxx.so.15
+lib/libplplotcxx.so.15.0.0
+%%FORTRAN%%lib/libplplotfortran.so
+%%FORTRAN%%lib/libplplotfortran.so.0
+%%FORTRAN%%lib/libplplotfortran.so.0.2.0
+%%QT5%%lib/libplplotqt.so
+%%QT5%%lib/libplplotqt.so.2
+%%QT5%%lib/libplplotqt.so.2.0.3
 %%TCLTK%%lib/libplplottcltk.so
-%%TCLTK%%lib/libplplottcltk.so.13
-%%TCLTK%%lib/libplplottcltk.so.13.0.0
+%%TCLTK%%lib/libplplottcltk.so.14
+%%TCLTK%%lib/libplplottcltk.so.14.1.0
 %%TCLTK%%lib/libplplottcltk_Main.so
 %%TCLTK%%lib/libplplottcltk_Main.so.1
-%%TCLTK%%lib/libplplottcltk_Main.so.1.0.0
+%%TCLTK%%lib/libplplottcltk_Main.so.1.0.1
 %%WXGTK%%lib/libplplotwxwidgets.so
 %%WXGTK%%lib/libplplotwxwidgets.so.1
-%%WXGTK%%lib/libplplotwxwidgets.so.1.2.0
+%%WXGTK%%lib/libplplotwxwidgets.so.1.2.2
 lib/libqsastime.so
 lib/libqsastime.so.0
 lib/libqsastime.so.0.0.1
 %%TCLTK%%lib/libtclmatrix.so
 %%TCLTK%%lib/libtclmatrix.so.10
 %%TCLTK%%lib/libtclmatrix.so.10.3.0
+%%LUA%%lib/lua/plplot/plplotluac.so
+lib/plplot%%PLPLOT_VERSION%%/drivers/cairo.driver_info
+lib/plplot%%PLPLOT_VERSION%%/drivers/cairo.so
+%%GD%%lib/plplot%%PLPLOT_VERSION%%/drivers/gd.driver_info
+%%GD%%lib/plplot%%PLPLOT_VERSION%%/drivers/gd.so
+lib/plplot%%PLPLOT_VERSION%%/drivers/mem.driver_info
+lib/plplot%%PLPLOT_VERSION%%/drivers/mem.so
+%%TCLTK%%lib/plplot%%PLPLOT_VERSION%%/drivers/ntk.driver_info
+%%TCLTK%%lib/plplot%%PLPLOT_VERSION%%/drivers/ntk.so
+lib/plplot%%PLPLOT_VERSION%%/drivers/null.driver_info
+lib/plplot%%PLPLOT_VERSION%%/drivers/null.so
+lib/plplot%%PLPLOT_VERSION%%/drivers/ps.driver_info
+lib/plplot%%PLPLOT_VERSION%%/drivers/ps.so
+lib/plplot%%PLPLOT_VERSION%%/drivers/psttf.driver_info
+lib/plplot%%PLPLOT_VERSION%%/drivers/psttf.so
+%%QT5%%lib/plplot%%PLPLOT_VERSION%%/drivers/qt.driver_info
+%%QT5%%lib/plplot%%PLPLOT_VERSION%%/drivers/qt.so
+lib/plplot%%PLPLOT_VERSION%%/drivers/svg.driver_info
+lib/plplot%%PLPLOT_VERSION%%/drivers/svg.so
+%%TCLTK%%lib/plplot%%PLPLOT_VERSION%%/drivers/tk.driver_info
+%%TCLTK%%lib/plplot%%PLPLOT_VERSION%%/drivers/tk.so
+%%TCLTK%%lib/plplot%%PLPLOT_VERSION%%/drivers/tkwin.driver_info
+%%TCLTK%%lib/plplot%%PLPLOT_VERSION%%/drivers/tkwin.so
+%%WXGTK%%lib/plplot%%PLPLOT_VERSION%%/drivers/wxwidgets.driver_info
+%%WXGTK%%lib/plplot%%PLPLOT_VERSION%%/drivers/wxwidgets.so
+lib/plplot%%PLPLOT_VERSION%%/drivers/xfig.driver_info
+lib/plplot%%PLPLOT_VERSION%%/drivers/xfig.so
+%%X11%%lib/plplot%%PLPLOT_VERSION%%/drivers/xwin.driver_info
+%%X11%%lib/plplot%%PLPLOT_VERSION%%/drivers/xwin.so
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/Plframe.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/Pltk_init.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/TclSup.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/_Pltk_init.so
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/_plplotc.so
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/plplot.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/plplotc.py
 libdata/pkgconfig/plplot-c++.pc
-%%FORTRAN%%libdata/pkgconfig/plplot-f95.pc
+%%FORTRAN%%libdata/pkgconfig/plplot-fortran.pc
+%%QT5%%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
-%%LUA%%%%LUA_MODLIBDIR%%/plplot/plplotluac.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
-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
-%%TCLTK%%man/man1/plserver.1.gz
-%%TCLTK%%man/man1/pltcl.1.gz
-man/man1/pltek.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/ABOUT
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING.LIB
@@ -116,16 +190,16 @@ man/man1/pltek.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/PROBLEMS
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/README.1st.csa
-%%PORTDOCS%%%%DOCSDIR%%/README.1st.nn
 %%PORTDOCS%%%%DOCSDIR%%/README.csa
+%%PORTDOCS%%%%DOCSDIR%%/README.cumulated_release
 %%PORTDOCS%%%%DOCSDIR%%/README.drivers
-%%PORTDOCS%%%%DOCSDIR%%/README.nn
+%%QHULL2015%%%%PORTDOCS%%%%DOCSDIR%%/README.nn
 %%PORTDOCS%%%%DOCSDIR%%/README.pkg-config
 %%PORTDOCS%%%%DOCSDIR%%/README.release
-%%PORTDOCS%%%%DOCSDIR%%/README.testing
 %%PORTDOCS%%%%DOCSDIR%%/README.wxwidgets
-%%DATADIR%%/cglobe.map
+%%TCLTK%%share/man/man1/plserver.1
+%%TCLTK%%share/man/man1/pltcl.1
+%%TCLTK%%share/man/man1/pltek.1
 %%DATADIR%%/cmap0_alternate.pal
 %%DATADIR%%/cmap0_black_on_white.pal
 %%DATADIR%%/cmap0_default.pal
@@ -138,10 +212,16 @@ man/man1/pltek.1.gz
 %%DATADIR%%/cmap1_lowfreq.pal
 %%DATADIR%%/cmap1_radar.pal
 %%DATADIR%%/examples/CMakeLists.txt
+%%DATADIR%%/examples/Chloe.pgm
 %%DATADIR%%/examples/Makefile
+%%DATADIR%%/examples/README.Chloe
 %%DATADIR%%/examples/c++/CMakeLists.txt
 %%DATADIR%%/examples/c++/Makefile
+%%QT5%%%%DATADIR%%/examples/c++/README.qt_example
 %%DATADIR%%/examples/c++/plc++demos.h
+%%QT5%%%%DATADIR%%/examples/c++/qt_PlotWindow.cpp
+%%QT5%%%%DATADIR%%/examples/c++/qt_PlotWindow.h
+%%QT5%%%%DATADIR%%/examples/c++/qt_example.cpp
 %%WXGTK%%%%DATADIR%%/examples/c++/wxPLplotDemo.cpp
 %%DATADIR%%/examples/c++/x00.cc
 %%DATADIR%%/examples/c++/x01.cc
@@ -222,49 +302,48 @@ man/man1/pltek.1.gz
 %%DATADIR%%/examples/c/x33c.c
 %%DATADIR%%/examples/c/x34c.c
 %%DATADIR%%/examples/cmake/modules/language_support.cmake
+%%QT5%%%%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/f95/CMakeLists.txt
-%%FORTRAN%%%%DATADIR%%/examples/f95/Makefile
-%%FORTRAN%%%%DATADIR%%/examples/f95/README_precision
-%%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
-%%FORTRAN%%%%DATADIR%%/examples/f95/x04f.f90
-%%FORTRAN%%%%DATADIR%%/examples/f95/x05f.f90
-%%FORTRAN%%%%DATADIR%%/examples/f95/x06f.f90
-%%FORTRAN%%%%DATADIR%%/examples/f95/x07f.f90
-%%FORTRAN%%%%DATADIR%%/examples/f95/x08f.f90
-%%FORTRAN%%%%DATADIR%%/examples/f95/x09f.f90
-%%FORTRAN%%%%DATADIR%%/examples/f95/x10f.f90
-%%FORTRAN%%%%DATADIR%%/examples/f95/x11f.f90
-%%FORTRAN%%%%DATADIR%%/examples/f95/x12f.f90
-%%FORTRAN%%%%DATADIR%%/examples/f95/x13f.f90
-%%FORTRAN%%%%DATADIR%%/examples/f95/x14f.f90
-%%FORTRAN%%%%DATADIR%%/examples/f95/x15f.f90
-%%FORTRAN%%%%DATADIR%%/examples/f95/x16af.f90
-%%FORTRAN%%%%DATADIR%%/examples/f95/x16f.f90
-%%FORTRAN%%%%DATADIR%%/examples/f95/x17f.f90
-%%FORTRAN%%%%DATADIR%%/examples/f95/x18f.f90
-%%FORTRAN%%%%DATADIR%%/examples/f95/x19f.f90
-%%FORTRAN%%%%DATADIR%%/examples/f95/x20f.f90
-%%FORTRAN%%%%DATADIR%%/examples/f95/x21f.f90
-%%FORTRAN%%%%DATADIR%%/examples/f95/x22f.f90
-%%FORTRAN%%%%DATADIR%%/examples/f95/x23f.f90
-%%FORTRAN%%%%DATADIR%%/examples/f95/x24f.f90
-%%FORTRAN%%%%DATADIR%%/examples/f95/x25f.f90
-%%FORTRAN%%%%DATADIR%%/examples/f95/x26f.f90
-%%FORTRAN%%%%DATADIR%%/examples/f95/x27f.f90
-%%FORTRAN%%%%DATADIR%%/examples/f95/x28f.f90
-%%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/Chloe.pgm
-%%DATADIR%%/examples/README.Chloe
+%%FORTRAN%%%%DATADIR%%/examples/fortran/CMakeLists.txt
+%%FORTRAN%%%%DATADIR%%/examples/fortran/Makefile
+%%FORTRAN%%%%DATADIR%%/examples/fortran/README_precision
+%%FORTRAN%%%%DATADIR%%/examples/fortran/plfortrandemos.inc
+%%FORTRAN%%%%DATADIR%%/examples/fortran/x00f.f90
+%%FORTRAN%%%%DATADIR%%/examples/fortran/x01f.f90
+%%FORTRAN%%%%DATADIR%%/examples/fortran/x02f.f90
+%%FORTRAN%%%%DATADIR%%/examples/fortran/x03f.f90
+%%FORTRAN%%%%DATADIR%%/examples/fortran/x04f.f90
+%%FORTRAN%%%%DATADIR%%/examples/fortran/x05f.f90
+%%FORTRAN%%%%DATADIR%%/examples/fortran/x06f.f90
+%%FORTRAN%%%%DATADIR%%/examples/fortran/x07f.f90
+%%FORTRAN%%%%DATADIR%%/examples/fortran/x08f.f90
+%%FORTRAN%%%%DATADIR%%/examples/fortran/x09f.f90
+%%FORTRAN%%%%DATADIR%%/examples/fortran/x10f.f90
+%%FORTRAN%%%%DATADIR%%/examples/fortran/x11f.f90
+%%FORTRAN%%%%DATADIR%%/examples/fortran/x12f.f90
+%%FORTRAN%%%%DATADIR%%/examples/fortran/x13f.f90
+%%FORTRAN%%%%DATADIR%%/examples/fortran/x14f.f90
+%%FORTRAN%%%%DATADIR%%/examples/fortran/x15f.f90
+%%FORTRAN%%%%DATADIR%%/examples/fortran/x16af.f90
+%%FORTRAN%%%%DATADIR%%/examples/fortran/x16f.f90
+%%FORTRAN%%%%DATADIR%%/examples/fortran/x17f.f90
+%%FORTRAN%%%%DATADIR%%/examples/fortran/x18f.f90
+%%FORTRAN%%%%DATADIR%%/examples/fortran/x19f.f90
+%%FORTRAN%%%%DATADIR%%/examples/fortran/x20f.f90
+%%FORTRAN%%%%DATADIR%%/examples/fortran/x21f.f90
+%%FORTRAN%%%%DATADIR%%/examples/fortran/x22f.f90
+%%FORTRAN%%%%DATADIR%%/examples/fortran/x23f.f90
+%%FORTRAN%%%%DATADIR%%/examples/fortran/x24f.f90
+%%FORTRAN%%%%DATADIR%%/examples/fortran/x25f.f90
+%%FORTRAN%%%%DATADIR%%/examples/fortran/x26f.f90
+%%FORTRAN%%%%DATADIR%%/examples/fortran/x27f.f90
+%%FORTRAN%%%%DATADIR%%/examples/fortran/x28f.f90
+%%FORTRAN%%%%DATADIR%%/examples/fortran/x29f.f90
+%%FORTRAN%%%%DATADIR%%/examples/fortran/x30f.f90
+%%FORTRAN%%%%DATADIR%%/examples/fortran/x31f.f90
+%%FORTRAN%%%%DATADIR%%/examples/fortran/x33f.f90
 %%LUA%%%%DATADIR%%/examples/lua/CMakeLists.txt
 %%LUA%%%%DATADIR%%/examples/lua/plplot_examples.lua
 %%LUA%%%%DATADIR%%/examples/lua/x00.lua
@@ -302,6 +381,7 @@ man/man1/pltek.1.gz
 %%LUA%%%%DATADIR%%/examples/lua/x33.lua
 %%DATADIR%%/examples/plplot-test-interactive.sh
 %%DATADIR%%/examples/plplot-test.sh
+%%DATADIR%%/examples/plplot_test/CMakeLists.txt
 %%PYTHON%%%%DATADIR%%/examples/python/CMakeLists.txt
 %%PYTHON%%%%DATADIR%%/examples/python/README.logo
 %%PYTHON%%%%DATADIR%%/examples/python/README.pythondemos
@@ -396,83 +476,118 @@ 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
 %%TCLTK%%%%DATADIR%%/examples/tcl/pltcl_standard_examples.in
 %%TCLTK%%%%DATADIR%%/examples/tcl/r.dat
 %%TCLTK%%%%DATADIR%%/examples/tcl/stats.log
 %%TCLTK%%%%DATADIR%%/examples/tcl/tclIndex
 %%TCLTK%%%%DATADIR%%/examples/tcl/tcldemos.tcl
+%%TCLTK%%%%DATADIR%%/examples/tcl/tclsh_standard_examples
 %%TCLTK%%%%DATADIR%%/examples/tcl/tclsh_standard_examples.in
 %%TCLTK%%%%DATADIR%%/examples/tcl/x00
+%%TCLTK%%%%DATADIR%%/examples/tcl/x00.in
 %%TCLTK%%%%DATADIR%%/examples/tcl/x00.tcl
 %%TCLTK%%%%DATADIR%%/examples/tcl/x01
+%%TCLTK%%%%DATADIR%%/examples/tcl/x01.in
 %%TCLTK%%%%DATADIR%%/examples/tcl/x01.tcl
 %%TCLTK%%%%DATADIR%%/examples/tcl/x02
+%%TCLTK%%%%DATADIR%%/examples/tcl/x02.in
 %%TCLTK%%%%DATADIR%%/examples/tcl/x02.tcl
 %%TCLTK%%%%DATADIR%%/examples/tcl/x03
+%%TCLTK%%%%DATADIR%%/examples/tcl/x03.in
 %%TCLTK%%%%DATADIR%%/examples/tcl/x03.tcl
 %%TCLTK%%%%DATADIR%%/examples/tcl/x04
+%%TCLTK%%%%DATADIR%%/examples/tcl/x04.in
 %%TCLTK%%%%DATADIR%%/examples/tcl/x04.tcl
 %%TCLTK%%%%DATADIR%%/examples/tcl/x05
+%%TCLTK%%%%DATADIR%%/examples/tcl/x05.in
 %%TCLTK%%%%DATADIR%%/examples/tcl/x05.tcl
 %%TCLTK%%%%DATADIR%%/examples/tcl/x06
+%%TCLTK%%%%DATADIR%%/examples/tcl/x06.in
 %%TCLTK%%%%DATADIR%%/examples/tcl/x06.tcl
 %%TCLTK%%%%DATADIR%%/examples/tcl/x07
+%%TCLTK%%%%DATADIR%%/examples/tcl/x07.in
 %%TCLTK%%%%DATADIR%%/examples/tcl/x07.tcl
 %%TCLTK%%%%DATADIR%%/examples/tcl/x08
+%%TCLTK%%%%DATADIR%%/examples/tcl/x08.in
 %%TCLTK%%%%DATADIR%%/examples/tcl/x08.tcl
 %%TCLTK%%%%DATADIR%%/examples/tcl/x09
+%%TCLTK%%%%DATADIR%%/examples/tcl/x09.in
 %%TCLTK%%%%DATADIR%%/examples/tcl/x09.tcl
 %%TCLTK%%%%DATADIR%%/examples/tcl/x10
+%%TCLTK%%%%DATADIR%%/examples/tcl/x10.in
 %%TCLTK%%%%DATADIR%%/examples/tcl/x10.tcl
 %%TCLTK%%%%DATADIR%%/examples/tcl/x11
+%%TCLTK%%%%DATADIR%%/examples/tcl/x11.in
 %%TCLTK%%%%DATADIR%%/examples/tcl/x11.tcl
 %%TCLTK%%%%DATADIR%%/examples/tcl/x12
+%%TCLTK%%%%DATADIR%%/examples/tcl/x12.in
 %%TCLTK%%%%DATADIR%%/examples/tcl/x12.tcl
 %%TCLTK%%%%DATADIR%%/examples/tcl/x13
+%%TCLTK%%%%DATADIR%%/examples/tcl/x13.in
 %%TCLTK%%%%DATADIR%%/examples/tcl/x13.tcl
 %%TCLTK%%%%DATADIR%%/examples/tcl/x14
+%%TCLTK%%%%DATADIR%%/examples/tcl/x14.in
 %%TCLTK%%%%DATADIR%%/examples/tcl/x14.tcl
 %%TCLTK%%%%DATADIR%%/examples/tcl/x15
+%%TCLTK%%%%DATADIR%%/examples/tcl/x15.in
 %%TCLTK%%%%DATADIR%%/examples/tcl/x15.tcl
 %%TCLTK%%%%DATADIR%%/examples/tcl/x16
+%%TCLTK%%%%DATADIR%%/examples/tcl/x16.in
 %%TCLTK%%%%DATADIR%%/examples/tcl/x16.tcl
 %%TCLTK%%%%DATADIR%%/examples/tcl/x17
+%%TCLTK%%%%DATADIR%%/examples/tcl/x17.in
 %%TCLTK%%%%DATADIR%%/examples/tcl/x17.tcl
 %%TCLTK%%%%DATADIR%%/examples/tcl/x18
+%%TCLTK%%%%DATADIR%%/examples/tcl/x18.in
 %%TCLTK%%%%DATADIR%%/examples/tcl/x18.tcl
 %%TCLTK%%%%DATADIR%%/examples/tcl/x19
+%%TCLTK%%%%DATADIR%%/examples/tcl/x19.in
 %%TCLTK%%%%DATADIR%%/examples/tcl/x19.tcl
 %%TCLTK%%%%DATADIR%%/examples/tcl/x20
+%%TCLTK%%%%DATADIR%%/examples/tcl/x20.in
 %%TCLTK%%%%DATADIR%%/examples/tcl/x20.tcl
 %%TCLTK%%%%DATADIR%%/examples/tcl/x21
+%%TCLTK%%%%DATADIR%%/examples/tcl/x21.in
 %%TCLTK%%%%DATADIR%%/examples/tcl/x21.tcl
 %%TCLTK%%%%DATADIR%%/examples/tcl/x22
+%%TCLTK%%%%DATADIR%%/examples/tcl/x22.in
 %%TCLTK%%%%DATADIR%%/examples/tcl/x22.tcl
 %%TCLTK%%%%DATADIR%%/examples/tcl/x23
+%%TCLTK%%%%DATADIR%%/examples/tcl/x23.in
 %%TCLTK%%%%DATADIR%%/examples/tcl/x23.tcl
 %%TCLTK%%%%DATADIR%%/examples/tcl/x24
+%%TCLTK%%%%DATADIR%%/examples/tcl/x24.in
 %%TCLTK%%%%DATADIR%%/examples/tcl/x24.tcl
 %%TCLTK%%%%DATADIR%%/examples/tcl/x25
+%%TCLTK%%%%DATADIR%%/examples/tcl/x25.in
 %%TCLTK%%%%DATADIR%%/examples/tcl/x25.tcl
 %%TCLTK%%%%DATADIR%%/examples/tcl/x26
+%%TCLTK%%%%DATADIR%%/examples/tcl/x26.in
 %%TCLTK%%%%DATADIR%%/examples/tcl/x26.tcl
 %%TCLTK%%%%DATADIR%%/examples/tcl/x27
+%%TCLTK%%%%DATADIR%%/examples/tcl/x27.in
 %%TCLTK%%%%DATADIR%%/examples/tcl/x27.tcl
 %%TCLTK%%%%DATADIR%%/examples/tcl/x28
+%%TCLTK%%%%DATADIR%%/examples/tcl/x28.in
 %%TCLTK%%%%DATADIR%%/examples/tcl/x28.tcl
 %%TCLTK%%%%DATADIR%%/examples/tcl/x29
+%%TCLTK%%%%DATADIR%%/examples/tcl/x29.in
 %%TCLTK%%%%DATADIR%%/examples/tcl/x29.tcl
 %%TCLTK%%%%DATADIR%%/examples/tcl/x30
+%%TCLTK%%%%DATADIR%%/examples/tcl/x30.in
 %%TCLTK%%%%DATADIR%%/examples/tcl/x30.tcl
 %%TCLTK%%%%DATADIR%%/examples/tcl/x31
+%%TCLTK%%%%DATADIR%%/examples/tcl/x31.in
 %%TCLTK%%%%DATADIR%%/examples/tcl/x31.tcl
 %%TCLTK%%%%DATADIR%%/examples/tcl/x33
+%%TCLTK%%%%DATADIR%%/examples/tcl/x33.in
 %%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_f95.sh
+%%FORTRAN%%%%DATADIR%%/examples/test_fortran.sh
 %%LUA%%%%DATADIR%%/examples/test_lua.sh
 %%PYTHON%%%%DATADIR%%/examples/test_python.sh
 %%TCLTK%%%%DATADIR%%/examples/test_tcl.sh
@@ -538,7 +653,6 @@ man/man1/pltek.1.gz
 %%TCLTK%%%%DATADIR%%/examples/tk/xtk01.c
 %%TCLTK%%%%DATADIR%%/examples/tk/xtk02.c
 %%TCLTK%%%%DATADIR%%/examples/tk/xtk04.c
-%%DATADIR%%/globe.map
 %%TCLTK%%%%DATADIR%%/pkgIndex.tcl
 %%DATADIR%%/plstnd5.fnt
 %%DATADIR%%/plxtnd5.fnt
@@ -565,5 +679,3 @@ man/man1/pltek.1.gz
 %%TCLTK%%%%DATADIR%%/tcl/pltools.tcl
 %%TCLTK%%%%DATADIR%%/tcl/plwidget.tcl
 %%TCLTK%%%%DATADIR%%/tcl/tclIndex
-%%DATADIR%%/usa.map
-%%DATADIR%%/usaglobe.map