5 files changed, 71 insertions, 231 deletions

diff --git a/math/plplot/Makefile b/math/plplot/Makefile
index 87c90647a0bc..8ac80c334f5f 100644
--- a/math/plplot/Makefile
+++ b/math/plplot/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	plplot
-PORTVERSION=	5.11.1
-PORTREVISION=	6
+PORTVERSION=	5.12.0
 CATEGORIES=	math science
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20Source
 
@@ -15,14 +14,15 @@ LICENSE=	LGPL21+
 BUILD_DEPENDS=	bash:shells/bash \
 		${FREEFONT_DIR}/FreeMono.ttf:x11-fonts/freefont-ttf
 LIB_DEPENDS=	libLASi.so:devel/lasi \
-		libltdl.so:devel/libltdl \
-		libfreetype.so:print/freetype2
+		libfontconfig.so:x11-fonts/fontconfig \
+		libfreetype.so:print/freetype2 \
+		libltdl.so:devel/libltdl
 RUN_DEPENDS=	bash:shells/bash \
 		${FREEFONT_DIR}/FreeMono.ttf:x11-fonts/freefont-ttf
 
-USE_GNOME=	pango
+USE_GNOME=	cairo pango
 USE_PERL5=	build
-USES=		cmake ghostscript localbase perl5 pathfix pkgconfig
+USES=		cmake:outsource gettext-runtime ghostscript localbase perl5 pathfix pkgconfig
 CMAKE_ARGS=	-DENABLE_java:BOOL=OFF \
 		-DENABLE_octave:BOOL=OFF \
 		-DENABLE_pdl:BOOL=OFF \
@@ -38,47 +38,49 @@ USE_LDCONFIG=	yes
 
 FREEFONT_DIR=	${LOCALBASE}/share/fonts/freefont-ttf
 
-OPTIONS_DEFINE=	FORTRAN GD LUA PYTHON QT4 TCLTK THREADS WXGTK X11 DOCS
-OPTIONS_RADIO=	QHULL
+OPTIONS_DEFINE=		DOCS FORTRAN GD LUA PYTHON QT4 TCLTK THREADS WXGTK X11
+OPTIONS_RADIO=		QHULL
 OPTIONS_RADIO_QHULL=	QHULL2015 QHULL2003
 OPTIONS_DEFAULT=	QHULL2015 THREADS X11
-OPTIONS_SUB=	yes
+OPTIONS_SUB=		yes
 
 FORTRAN_USES=		fortran
+FORTRAN_CMAKE_BOOL=	ENABLE_f95
 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:graphics/gd
-GD_CMAKE_ON=		-DPLD_png:BOOL=ON
+GD_LIB_DEPENDS=		libgd.so:graphics/gd \
+			libpng16.so:graphics/png
+GD_USES=		jpeg
+GD_CMAKE_BOOL=		PLD_png
 
 LUA_USES=		lua:51
+LUA_CMAKE_BOOL=		ENABLE_lua
 LUA_CMAKE_ON=		-DLUA_EXECUTABLE:FILEPATH="${LUA_CMD}"
-LUA_CMAKE_OFF=		-DENABLE_lua:BOOL=OFF
 
 PYTHON_USES=		python
 PYTHON_BUILD_DEPENDS=	swig:devel/swig13 \
 			${PYNUMPY}
 PYTHON_RUN_DEPENDS=	${PYNUMPY}
+PYTHON_CMAKE_BOOL=	ENABLE_python
 PYTHON_CONFIGURE_ENV=	PYTHON_VERSION="${PYTHON_VERSION}"
-PYTHON_CMAKE_OFF=	-DENABLE_python:BOOL=OFF
 
 QHULL2003_DESC=		Legacy Qhull support
 QHULL2015_DESC=		Latest Qhull support
 QHULL2015_LIB_DEPENDS=	libqhull.so.7:math/qhull
 QHULL2003_LIB_DEPENDS=	libqhull.so.5:math/qhull5
-QHULL2015_CMAKE_ON=	-DQHULL_INCLUDE_DIRS="${LOCALBASE}/include/libqhull"
-QHULL2015_2FIX=		lib/nn/delaunay.c src/plgridd.c
+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
-ITCL_VER=		3.4
+TCLTK_CMAKE_BOOL=	ENABLE_tcl
+TCLTK_IMPLIES=		X11
+ITCL_VER=		3.4.1
 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}" \
+TCLTK_CMAKE_ON=		-DPLPLOT_TK_VERSION:STRING="${TK_VER}" \
+			-DPLPLOT_ITCL_VERSION:STRING="${ITCL_VER}" \
+			-DPLPLOT_ITK_VERSION:STRING="${ITK_VER}" \
 			-DIWIDGETS_VERSIONS_LIST:STRING="${IWIDGETS_VER};${ITK_VER};${ITCL_VER}" \
 			-DTCL_TCLSH:FILEPATH="${TCLSH}" \
 			-DTCL_INCLUDE_PATH:PATH="${TCL_INCLUDEDIR}" \
@@ -87,38 +89,30 @@ TCLTK_CMAKE_ON=		-DPLPLOT_TK_VERSION="${TK_VER}" \
 			-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
+THREADS_CMAKE_BOOL=	THREADS_HAVE_PTHREAD_ARG
 
 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
+QT4_CMAKE_BOOL=		ENABLE_qt
+QT4_CMAKE_BOOL_OFF=	DEFAULT_NO_QT_DEVICES
 
 WXGTK_LIB_DEPENDS=	libagg.so:graphics/agg
-WXGTK_USE=		WX=2.6+
+WXGTK_USE=		WX=3.0+
+WXGTK_CMAKE_BOOL=	ENABLE_wxwidgets
 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
+X11_CMAKE_BOOL=		PLD_xcairo PLD_xwin
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MTCLTK} && empty(PORT_OPTIONS:MX11)
-IGNORE=		option TCLTK needs X11 support
-.endif
-
-pre-configure:
+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'
-.if ${PORT_OPTIONS:MQHULL2015}
-. for src in ${QHULL2015_2FIX}
+post-patch-QHULL2015:
 	${REINPLACE_CMD} -e 's|qhull/qhull_a|libqhull/qhull_a|'	\
-		${WRKSRC}/${src}
-. endfor
-.endif
+		${WRKSRC}/lib/nn/delaunay.c \
+		${WRKSRC}/src/plgridd.c
 
 .include <bsd.port.mk>
diff --git a/math/plplot/distinfo b/math/plplot/distinfo
index 16a2713c9cc2..be5f892832fd 100644
--- a/math/plplot/distinfo
+++ b/math/plplot/distinfo
@@ -1,2 +1,3 @@
-SHA256 (plplot-5.11.1.tar.gz) = 289dff828c440121e57b70538b3f0fb4056dc47159bc1819ea444321f2ff1c4c
-SIZE (plplot-5.11.1.tar.gz) = 15445404
+TIMESTAMP = 1486185399
+SHA256 (plplot-5.12.0.tar.gz) = 8dc5da5ef80e4e19993d4c3ef2a84a24cc0e44a5dade83201fca7160a6d352ce
+SIZE (plplot-5.12.0.tar.gz) = 16253895
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 0eab651034f2..000000000000
--- a/math/plplot/files/patch-cmake_modules_pkg-config.cmake
+++ /dev/null
@@ -1,18 +0,0 @@
-Adjust parameters passed to _pkg_check_modules_internal().
-Required for building with CMake 3.6.0.
-
-Submitted upstream: https://sourceforge.net/p/plplot/patches/33/
---- cmake/modules/pkg-config.cmake.orig	2016-07-16 10:36:31 UTC
-+++ cmake/modules/pkg-config.cmake
-@@ -120,8 +120,10 @@ macro(pkg_check_pkgconfig _package _incl
-   
-   if(CMAKE_VERSION VERSION_LESS "3.1")
-     _pkg_check_modules_internal(0 0 ${_prefix} "${_package}")
--  else(CMAKE_VERSION VERSION_LESS "3.1")
-+  elseif(CMAKE_VERSION VERSION_LESS "3.6")
-     _pkg_check_modules_internal(0 0 0 0 ${_prefix} "${_package}")
-+  else(CMAKE_VERSION VERSION_LESS "3.1")
-+    _pkg_check_modules_internal(0 0 0 0 0 ${_prefix} "${_package}")
-   endif(CMAKE_VERSION VERSION_LESS "3.1")
-     
-   if(${_prefix}_FOUND)
diff --git a/math/plplot/files/patch-git_db396b b/math/plplot/files/patch-git_db396b
deleted file mode 100644
index 231130d68bdd..000000000000
--- a/math/plplot/files/patch-git_db396b
+++ /dev/null
@@ -1,119 +0,0 @@
-From db396b9fbdc9cd54fb8545ea655185ca73a2a07e Mon Sep 17 00:00:00 2001
-From: "Alan W. Irwin" <airwin@users.sourceforge.net>
-Date: Sat, 19 Nov 2016 16:04:28 -0800
-Subject: [PATCH] Build system: Fix if argument dereferencing issue that occurs
- for CMake-3.7.0
-
-My thanks to Tom Schoonjans for reporting this issue.
-
-CMake-3.1 and beyond implements policy CMP0054.  The OLD behaviour of
-this policy (which we are forced to adopt because we currently support
-CMake-3.0.2, ugh) is that quoted strings in if arguments are
-dereferenced if there is a variable of the same name that has been
-defined.
-
-For example in the following if statement
-
-if(BINDING STREQUAL "c")
-
-CMake looks for a variable called c that has been defined and uses the
-value of that variable (which is really a nasty bug in the older
-versions of CMake such as 3.0.2 since it is a huge surprise that that
-dereferencing occurs instead of just using the string as is for the
-comparison).  But we are stuck with that bug (because we support 3.0.2
-which implies the OLD behaviour of CMP0054).
-
-However, modern versions of CMake such as 3.1.x through 3.7.0 do warn
-when this bug shows up. We got no such warning up to 3.6.x, but
-evidentally for CMake-3.7.0, the c variable has been set somewhere in
-the official CMake code (e.g., in the find modules) so for that versin
-we got warnings for the above if statement each time our build system
-code executes the function (pkg_config_file) that contains the above
-statement, and the result was the above if statement failed when
-BINDING derefenced to c, and the pkg-config files that are configured
-by that function were screwed up as a result as noticed by Tom
-Schoonjans.
-
-I have worked around the problem by replacing the above logic with
-
-if("X${BINDING}X" STREQUAL "XcX")
-
-on the assumption that no CMake variable in our own build system logic
-and also the CMake code provided by CMake itself is going to have the name
-XcX, but I have also commented the result with "CMP0054" so it will
-be easy to find and remove this commit once we no longer have to
-support CMake-3.0.2 so that we can use the rational CMP0054 NEW behaviour
-which is that quoted strings such as "c" are not dereferenced in "if"
-statements!
-
-Meanwhile, we rely on sharp-eyed users like Tom to tell us whenever
-there is a message concerning CMP0054 for any CMake version of 3.1 or
-higher since that is a signal that in virtually every case our CMake
-logic will go wrong (as in this 4.7.0 case) do to this OLD CMP0054
-behaviour.
-
-Tested by: Alan W. Irwin <airwin@users.sourceforge.net> on Linux
-(Debian Jessie) by comparing pkg-config files we configure in
-pkgcfg/*.pc with equivalent good *.pc results that were derived with a
-previous version of CMake that did not define the "c" variable that
-triggered this bug.  In all cases for CMake-3.7.0, the file names and
-contents of those files are now identical to the good past results.
-Also, because of this fix all CMP0054 warnings now no longer occur
-with cmake-3.7.0.
----
- cmake/modules/pkg-config.cmake | 21 +++++++++++++--------
- 1 file changed, 13 insertions(+), 8 deletions(-)
-
-diff --git a/cmake/modules/pkg-config.cmake b/cmake/modules/pkg-config.cmake
-index 6674efa..05a4a53 100644
---- cmake/modules/pkg-config.cmake
-+++ cmake/modules/pkg-config.cmake
-@@ -1,6 +1,6 @@
- # cmake/modules/pkg-config.cmake
- #
--# Copyright (C) 2006-2015 Alan W. Irwin
-+# Copyright (C) 2006-2016 Alan W. Irwin
- #
- # This file is part of PLplot.
- #
-@@ -415,25 +415,30 @@ function(pkg_config_file BINDING PC_SHORT_NAME PC_LONG_NAME PC_LIBRARY_NAME PC_C
-       message(FATAL_ERROR "pkg_config_file called with wrong number of arguments")
-     endif(ARGC EQUAL 7)
- 
--    if(BINDING STREQUAL "c")
-+    # N.B. all the tests on "X${BINDING}X" below rather than BINDING
-+    # are to beat a potential dereferencing problem for strings in if statements.
-+    # This problem only occurs with old CMake versions that don't
-+    # have CMP0054 set to NEW.
-+    
-+    if("X${BINDING}X" STREQUAL "XcX")
-       set(PC_FILE_SUFFIX "")
-       set(PC_REQUIRES "")
--    elseif(BINDING STREQUAL "wxwidgets")
-+    elseif("X${BINDING}X" STREQUAL "XwxwidgetsX")
-       set(PC_FILE_SUFFIX "-${BINDING}")
-       set(PC_REQUIRES "plplot-c++")
--    else(BINDING STREQUAL "c")
-+    else("X${BINDING}X" STREQUAL "XcX")
-       set(PC_FILE_SUFFIX "-${BINDING}")
-       set(PC_REQUIRES "plplot")
--    endif(BINDING STREQUAL "c")
-+    endif("X${BINDING}X" STREQUAL "XcX")
- 
-     if(NON_TRANSITIVE)
--      if(BINDING STREQUAL "ocaml")
-+      if("X${BINDING}X" STREQUAL "XocamlX")
- 	# Don't know how to do non-transitive linking for
-         # Ocaml binding of PLplot.
- 	set(PC_REQUIRES_TAG "Requires")
--      else(BINDING STREQUAL "ocaml")
-+      else("X${BINDING}X" STREQUAL "XocamlX")
- 	set(PC_REQUIRES_TAG "Requires.private")
--      endif(BINDING STREQUAL "ocaml")
-+      endif("X${BINDING}X" STREQUAL "XocamlX")
-     else(NON_TRANSITIVE)
-       set(PC_REQUIRES_TAG "Requires")
-     endif(NON_TRANSITIVE)
--- 
-2.10.1
-
diff --git a/math/plplot/pkg-plist b/math/plplot/pkg-plist
index 42ad497b75d1..b09baff7ac9d 100644
--- a/math/plplot/pkg-plist
+++ b/math/plplot/pkg-plist
@@ -21,6 +21,7 @@ include/plplot/qsastime.h
 include/plplot/qsastimedll.h
 %%QT4%%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
@@ -28,48 +29,46 @@ 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_double.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_private_exposed.mod
+%%FORTRAN%%lib/fortran/modules/plplot/plplot_private_utilities.mod
+%%FORTRAN%%lib/fortran/modules/plplot/plplot_single.mod
 %%FORTRAN%%lib/fortran/modules/plplot/plplot_types.mod
-%%FORTRAN%%lib/fortran/modules/plplot/plplotp.mod
 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.1
+lib/libcsironn.so.0.0.2
 %%FORTRAN%%lib/libplf95demolib.a
 lib/libplplot.so
-lib/libplplot.so.13
-lib/libplplot.so.13.1.2
+lib/libplplot.so.14
+lib/libplplot.so.14.0.0
 lib/libplplotcxx.so
-lib/libplplotcxx.so.12
-lib/libplplotcxx.so.12.0.0
+lib/libplplotcxx.so.13
+lib/libplplotcxx.so.13.0.0
 %%FORTRAN%%lib/libplplotf95.so
-%%FORTRAN%%lib/libplplotf95.so.12
-%%FORTRAN%%lib/libplplotf95.so.12.1.0
-%%FORTRAN%%lib/libplplotf95c.so
-%%FORTRAN%%lib/libplplotf95c.so.12
-%%FORTRAN%%lib/libplplotf95c.so.12.0.0
+%%FORTRAN%%lib/libplplotf95.so.13
+%%FORTRAN%%lib/libplplotf95.so.13.0.0
 %%QT4%%lib/libplplotqt.so
 %%QT4%%lib/libplplotqt.so.2
-%%QT4%%lib/libplplotqt.so.2.0.1
+%%QT4%%lib/libplplotqt.so.2.0.2
 %%TCLTK%%lib/libplplottcltk.so
-%%TCLTK%%lib/libplplottcltk.so.12
-%%TCLTK%%lib/libplplottcltk.so.12.1.1
+%%TCLTK%%lib/libplplottcltk.so.13
+%%TCLTK%%lib/libplplottcltk.so.13.0.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.1.0
+%%WXGTK%%lib/libplplotwxwidgets.so.1.2.0
 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.2.0
+%%TCLTK%%lib/libtclmatrix.so.10.3.0
 libdata/pkgconfig/plplot-c++.pc
 %%FORTRAN%%libdata/pkgconfig/plplot-f95.pc
 %%QT4%%libdata/pkgconfig/plplot-qt.pc
@@ -240,6 +239,7 @@ man/man1/pltek.1.gz
 %%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
@@ -275,7 +275,8 @@ man/man1/pltek.1.gz
 %%FORTRAN%%%%DATADIR%%/examples/f95/x30f.f90
 %%FORTRAN%%%%DATADIR%%/examples/f95/x31f.f90
 %%FORTRAN%%%%DATADIR%%/examples/f95/x33f.f90
-%%DATADIR%%/examples/lena.pgm
+%%DATADIR%%/examples/Chloe.pgm
+%%DATADIR%%/examples/README.Chloe
 %%LUA%%%%DATADIR%%/examples/lua/CMakeLists.txt
 %%LUA%%%%DATADIR%%/examples/lua/plplot_examples.lua
 %%LUA%%%%DATADIR%%/examples/lua/x00.lua
@@ -318,10 +319,10 @@ man/man1/pltek.1.gz
 %%PYTHON%%%%DATADIR%%/examples/python/README.pythondemos
 %%PYTHON%%%%DATADIR%%/examples/python/README.rendering_tests
 %%PYTHON%%%%DATADIR%%/examples/python/plplot_logo.py
-%%PYTHON%%%%DATADIR%%/examples/python/plplot_py_demos.py
 %%PYTHON%%%%DATADIR%%/examples/python/plplot_python_start.py
 %%PYTHON%%%%DATADIR%%/examples/python/pythondemos.py
 %%TCLTK%%%%PYTHON%%%%DATADIR%%/examples/python/pytkdemo
+%%PYTHON%%%%DATADIR%%/examples/python/restore.py
 %%PYTHON%%%%DATADIR%%/examples/python/test_axis_precision.py
 %%PYTHON%%%%DATADIR%%/examples/python/test_circle.py
 %%PYTHON%%%%DATADIR%%/examples/python/test_fill.py
@@ -336,6 +337,7 @@ man/man1/pltek.1.gz
 %%PYTHON%%%%DATADIR%%/examples/python/test_type1.py
 %%PYTHON%%%%DATADIR%%/examples/python/testh.py
 %%PYTHON%%%%DATADIR%%/examples/python/x00
+%%TCLTK%%%%PYTHON%%%%DATADIR%%/examples/python/x00.py
 %%PYTHON%%%%DATADIR%%/examples/python/x01
 %%TCLTK%%%%PYTHON%%%%DATADIR%%/examples/python/x01.py
 %%PYTHON%%%%DATADIR%%/examples/python/x02
@@ -375,51 +377,31 @@ man/man1/pltek.1.gz
 %%PYTHON%%%%DATADIR%%/examples/python/x19
 %%TCLTK%%%%PYTHON%%%%DATADIR%%/examples/python/x19.py
 %%PYTHON%%%%DATADIR%%/examples/python/x20
+%%TCLTK%%%%PYTHON%%%%DATADIR%%/examples/python/x20.py
 %%PYTHON%%%%DATADIR%%/examples/python/x21
+%%TCLTK%%%%PYTHON%%%%DATADIR%%/examples/python/x21.py
 %%PYTHON%%%%DATADIR%%/examples/python/x22
+%%TCLTK%%%%PYTHON%%%%DATADIR%%/examples/python/x22.py
 %%PYTHON%%%%DATADIR%%/examples/python/x23
+%%TCLTK%%%%PYTHON%%%%DATADIR%%/examples/python/x23.py
 %%PYTHON%%%%DATADIR%%/examples/python/x24
+%%TCLTK%%%%PYTHON%%%%DATADIR%%/examples/python/x24.py
 %%PYTHON%%%%DATADIR%%/examples/python/x25
+%%TCLTK%%%%PYTHON%%%%DATADIR%%/examples/python/x25.py
 %%PYTHON%%%%DATADIR%%/examples/python/x26
+%%TCLTK%%%%PYTHON%%%%DATADIR%%/examples/python/x26.py
 %%PYTHON%%%%DATADIR%%/examples/python/x27
+%%TCLTK%%%%PYTHON%%%%DATADIR%%/examples/python/x27.py
 %%PYTHON%%%%DATADIR%%/examples/python/x28
+%%TCLTK%%%%PYTHON%%%%DATADIR%%/examples/python/x28.py
 %%PYTHON%%%%DATADIR%%/examples/python/x29
+%%TCLTK%%%%PYTHON%%%%DATADIR%%/examples/python/x29.py
 %%PYTHON%%%%DATADIR%%/examples/python/x30
+%%TCLTK%%%%PYTHON%%%%DATADIR%%/examples/python/x30.py
 %%PYTHON%%%%DATADIR%%/examples/python/x31
+%%TCLTK%%%%PYTHON%%%%DATADIR%%/examples/python/x31.py
 %%PYTHON%%%%DATADIR%%/examples/python/x33
-%%PYTHON%%%%DATADIR%%/examples/python/xw00.py
-%%PYTHON%%%%DATADIR%%/examples/python/xw01.py
-%%PYTHON%%%%DATADIR%%/examples/python/xw02.py
-%%PYTHON%%%%DATADIR%%/examples/python/xw03.py
-%%PYTHON%%%%DATADIR%%/examples/python/xw04.py
-%%PYTHON%%%%DATADIR%%/examples/python/xw05.py
-%%PYTHON%%%%DATADIR%%/examples/python/xw06.py
-%%PYTHON%%%%DATADIR%%/examples/python/xw07.py
-%%PYTHON%%%%DATADIR%%/examples/python/xw08.py
-%%PYTHON%%%%DATADIR%%/examples/python/xw09.py
-%%PYTHON%%%%DATADIR%%/examples/python/xw10.py
-%%PYTHON%%%%DATADIR%%/examples/python/xw11.py
-%%PYTHON%%%%DATADIR%%/examples/python/xw12.py
-%%PYTHON%%%%DATADIR%%/examples/python/xw13.py
-%%PYTHON%%%%DATADIR%%/examples/python/xw14.py
-%%PYTHON%%%%DATADIR%%/examples/python/xw15.py
-%%PYTHON%%%%DATADIR%%/examples/python/xw16.py
-%%PYTHON%%%%DATADIR%%/examples/python/xw17.py
-%%PYTHON%%%%DATADIR%%/examples/python/xw18.py
-%%PYTHON%%%%DATADIR%%/examples/python/xw19.py
-%%PYTHON%%%%DATADIR%%/examples/python/xw20.py
-%%PYTHON%%%%DATADIR%%/examples/python/xw21.py
-%%PYTHON%%%%DATADIR%%/examples/python/xw22.py
-%%PYTHON%%%%DATADIR%%/examples/python/xw23.py
-%%PYTHON%%%%DATADIR%%/examples/python/xw24.py
-%%PYTHON%%%%DATADIR%%/examples/python/xw25.py
-%%PYTHON%%%%DATADIR%%/examples/python/xw26.py
-%%PYTHON%%%%DATADIR%%/examples/python/xw27.py
-%%PYTHON%%%%DATADIR%%/examples/python/xw28.py
-%%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%%%%PYTHON%%%%DATADIR%%/examples/python/x33.py
 %%TCLTK%%%%DATADIR%%/examples/tcl/CMakeLists.txt
 %%TCLTK%%%%DATADIR%%/examples/tcl/README.tcldemos
 %%TCLTK%%%%DATADIR%%/examples/tcl/mktclIndex