- Update to 4.3.0

  Rework this port and split it into logically independent parts
  Give maintainership to submitter

PR:		ports/57858
Submitted by:	Mykola Khotyaintsev <ko@irfu.se>

8 files changed, 273 insertions, 223 deletions

diff --git a/math/vtk/Makefile b/math/vtk/Makefile
index d40cfdab3c4f..612883a63d37 100644
--- a/math/vtk/Makefile
+++ b/math/vtk/Makefile
@@ -1,54 +1,230 @@
 # New ports collection makefile for:    vtk
-# Date created:         24 Nov 1997
-# Whom:                 Thomas Gellekum <tg@FreeBSD.org>
+# Date created:         10 Oct 2003
+# Whom:                 Mykola Khotyaintsev <ko@irfu.se>
 #
 # $FreeBSD$
 #
+# By default
+#
+# There are some options to tune VTK towards your specific needs.
+# You can activate a feature by typing something like
+# "make -DKNOB" or "make KNOB=yes" instead of just "make"
+#
+# WITH_TESTING		build the testing binaries (only for vtk and vtk-java port)
+#
 
 PORTNAME=	vtk
-PORTVERSION=	3.2
-PORTREVISION=	1
-CATEGORIES=	math
-MASTER_SITES=	ftp://public.kitware.com/pub/vtk/vtk${PORTVERSION}/
-DISTNAME=	vtk32-src-unix
-EXTRACT_SUFX=	.tgz
+PORTVERSION=	4.3.0
+CATEGORIES=	math graphics
+MASTER_SITES=	http://ovt.irfu.se/vtk/files/
+DISTFILES?=	VTK-${PORTVERSION}-cvs${CVSDATE}.tar.gz
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	The Visualization Toolkit
-
-LIB_DEPENDS=	tk83.1:${PORTSDIR}/x11-toolkits/tk83
+MAINTAINER=	ko@irfu.se
+COMMENT?=	The Visualization Toolkit shared libs
 
 USE_REINPLACE=	yes
-USE_MESA=	yes
-WRKSRC=		${WRKDIR}/vtk${PORTVERSION}
+
+LIBVER=		1
+CVSDATE=	20031006
+VTKSRCDIR=	${WRKDIR}/VTK
+TESTINGDIR=	${EXAMPLESDIR}/Testing
+VTKDATAROOT=	${EXAMPLESDIR}/VTKData
+DOCSDIR=	${PREFIX}/share/doc/${PKGNAME}
+PLIST=		${.CURDIR}/pkg-plist
+FILESDIR=	${.CURDIR}/files
+RESTRICTED=	yes
+
+VTK_KITS=	Common Filtering Graphics Hybrid IO Imaging Rendering Parallel Patented
+
+PLIST_SUB+=	LIBVER=${LIBVER} PKGNAME=${PKGNAME}
+
+.if defined(WRAP) || !defined(PKGNAMESUFFIX) || ${PKGNAMESUFFIX}=="-headers"
+
+WRKSRC=		${WRKDIR}/${PORTNAME}${PKGNAMESUFFIX}-build
+
+BUILD_DEPENDS+=	${CMAKE}:${PORTSDIR}/devel/cmake
+
+LIB_DEPENDS+=	expat.4:${PORTSDIR}/textproc/expat2 \
+		jpeg.9:${PORTSDIR}/graphics/jpeg \
+		png.5:${PORTSDIR}/graphics/png \
+		tiff.4:${PORTSDIR}/graphics/tiff
+
+.if defined(WITH_TESTING) && (!defined(PKGNAMESUFFIX) || ${PKGNAMESUFFIX}=="-java")
+RUN_DEPENDS=	${VTKDATAROOT}/VTKData.readme:${PORTSDIR}/math/vtk-data
+BUILD_DEPENDS=	${VTKDATAROOT}/VTKData.readme:${PORTSDIR}/math/vtk-data
+.endif
+
+ONLY_FOR_ARCHS=	i386 # was not tested on other ARCHS
+USE_GMAKE=	yes
+USE_GL=		yes
 INSTALLS_SHLIB=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-mesa --with-shared --with-tcl --with-bsdmake
-CONFIGURE_ARGS+=	--with-contrib --with-tkwidget
 
-# Support for Python is compiled in by default.
-.if !defined(WITHOUT_PYTHON)
-CONFIGURE_ARGS+=	--with-python
-USE_PYTHON=	yes
+# if optimization flag -O2 or -O3 is present - use g++33
+# There is a problems compiling Imaging/vtkImageEuclideanDistance.o by gcc 3.2.2
+# with -02 -march=pentium3
+.if defined(CXXFLAGS)
+TTT=	"${CXXFLAGS}"	# this quotes are VERY important!
+OPTFLAGPRESENT=	${TTT:C/^.*-O[23].*$/yes/}
+.if ${OPTFLAGPRESENT} == "yes"
+USE_GCC=	3.3
+.endif
+.endif
+
+CMAKE?=		${LOCALBASE}/bin/cmake
+CXXFLAGS+=	-Wno-deprecated
+CMAKE_DEFS+=	-DCMAKE_INSTALL_PREFIX:PATH=${PREFIX} \
+		-DBUILD_SHARED_LIBS:BOOL=ON \
+		-DCMAKE_BUILD_TYPE:STRING=Release \
+		-DCMAKE_SHARED_LINKER_FLAGS:STRING="${LINKERFLAGS}" \
+		-DCMAKE_EXE_LINKER_FLAGS:STRING="${LINKERFLAGS}" \
+		-DCMAKE_THREAD_LIBS:STRING="${PTHREAD_LIBS}"\
+		-DCMAKE_USE_PTHREADS:BOOL=ON \
+		-DCMAKE_C_COMPILER:STRING='${CC}' \
+		-DCMAKE_CXX_COMPILER:STRING=${CXX} \
+		-DCMAKE_C_FLAGS:STRING="${CFLAGS} ${PTHREAD_CFLAGS}" \
+		-DCMAKE_CXX_FLAGS:STRING="${CXXFLAGS} ${PTHREAD_CFLAGS}" \
+		-DVTK_USE_RENDERING:BOOL=ON \
+		-DVTK_USE_HYBRID:BOOL=ON \
+		-DVTK_USE_PARALLEL:BOOL=ON \
+		-DVTK_USE_PATENTED:BOOL=ON \
+		-DVTK_USE_SYSTEM_EXPAT:BOOL=ON \
+		-DVTK_USE_SYSTEM_JPEG:BOOL=ON \
+		-DVTK_USE_SYSTEM_PNG:BOOL=ON \
+		-DVTK_USE_SYSTEM_TIFF:BOOL=ON \
+		-DVTK_USE_SYSTEM_ZLIB:BOOL=ON \
+		-DVTK_DATA_ROOT:PATH=${VTKDATAROOT}
+
+.if defined(WITH_TESTING)
+CMAKE_DEFS+=	-DBUILD_TESTING:BOOL=ON
+PLIST_SUB+=	TESTING_ONLY=""
+.else
+CMAKE_DEFS+=	-DBUILD_TESTING:BOOL=OFF
+PLIST_SUB+=	TESTING_ONLY="@comment "
+.endif
+
+################################# vtk port start #############################################
+
+.ifndef(PKGNAMESUFFIX)
+
+EXTRA_LIBS=	DICOMParser freetype ftgl
+
+.if defined(WITH_TESTING)
+BINARIES=	${VTK_KITS:C/Parallel//:C/Patented//:S/$/CxxTests/}
+BINARIES+=	TestCxxFeatures TestInstantiator TimeRenderer TimeRenderer2 ParallelIsoTest
+BINARIES+=	SocketClient SocketServer GenericCommunicator ThreadedCommunicator TestPStream
 .endif
 
-.if defined(WITH_PATENTED)
-CONFIGURE_ARGS+=	--with-patented
-PLIST=		${PKGDIR}/pkg-plist.with_patented
+.ifndef(WITH_TESTING)
+pre-everything::
+	@${ECHO_MSG} "---------------------- N   O   T   E ------------------------"
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "If you want to build C++ Testing binaries press Ctrl-C now"
+	@${ECHO_MSG} "and execute \"make WITH_TESTING=yes\""
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "-------------------------------------------------------------"
 .endif
 
-post-patch:
-	@${REINPLACE_CMD} -e "s|%%PYTHON_INCLUDEDIR%%|${PYTHON_INCLUDEDIR}|g; \
-		s|%%PTHREAD_CFLAGS%%|${PTHREAD_CFLAGS}|g; \
-		s|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g" \
-		${WRKSRC}/user.make
-	@${FIND} ${WRKSRC} -name "*.cxx" | ${XARGS} ${REINPLACE_CMD} -e \
-		's|malloc.h|stdlib.h|'
+do-patch: patch-common
+
+do-install: install-cnotice install-binaries install-libs
 
-post-install:
-.if !defined(WITHOUT_PYTHON)
-	${PYTHON_CMD}  -c "import compileall; compileall.compile_dir( '${PREFIX}/lib/vtk/python' );"
-	${PYTHON_CMD} -Oc "import compileall; compileall.compile_dir( '${PREFIX}/lib/vtk/python' );"
 .endif
 
+################################# vtk port end #############################################
+
+pre-configure:
+	${MKDIR} ${WRKSRC}
+
+do-configure:
+	cd ${WRKSRC} && ${CMAKE} ${VTKSRCDIR} ${CMAKE_DEFS}
+
+patch-common:
+	@${FIND} ${VTKSRCDIR} -name "*.cxx" | ${XARGS} ${REINPLACE_CMD} -e \
+		's|malloc.h|stdlib.h|g'
+	@${REINPLACE_CMD} -E 's|lib/vtk\)|lib\)|g' \
+		${VTKSRCDIR}/vtkGenerateVTKConfig.cmake
+.if defined(WRAP)
+# No need to build many libs, such as: vtkCommon,... Better link to those ones installed by vtk port.
+# Patch (MAIN_KIT_LIB = [Common_LIB Filtering_LIB ...]:
+# ${VTKSRCDIR}/CMakeLists.txt :
+#       -SUBDIRS(Wrapping Utilities)
+#       +SUBDIRS(Wrapping)
+#
+# ${VTKSRCDIR}/[Common Filtering IO ...]/CMakeLists.txt :
+#       -ADD_LIBRARY(vtk${KIT} ...
+#       +FIND_LIBRARY(MAIN_KIT_LIB NAMES vtk${KIT} PATHS ${PREFIX}/lib)
+#
+#       -TARGET_LINK_LIBRARIES(vtk${KIT}Python vtk${KIT} ...
+#       +TARGET_LINK_LIBRARIES(vtk${KIT}Python ${MAIN_KIT_LIB} ...
+#
+#	Sometimes 	TARGET_LINK_LIBRARIES(vtk${KIT}Python vtk${KIT} can be separated to two lines:
+#			TARGET_LINK_LIBRARIES(vtk${KIT}Python
+#						vtk${KIT}
+#	-^[spaces or tabs]vtk${KIT}[spaces or tabs]$
+#	+[space]${MAIN_KIT_LIB}
+#
+#       -TARGET_LINK_LIBRARIES(vtk${KIT} ${KIT_LIBS})
+#
+# ${VTKSRCDIR}/[Common Filtering IO ...]/Tests/CMakeLists.txt :
+#       -SUBDIRS(Cxx)
+#
+	@${REINPLACE_CMD} -E 's|SUBDIRS\(Wrapping Utilities\)|SUBDIRS\(Wrapping\)|g' \
+		${VTKSRCDIR}/CMakeLists.txt
+
+	@for dir in ${VTK_KITS} ; do \
+		${ECHO_MSG} "Patching ${WRKDIR}/${VTKSRCDIR}/$$dir/CMakeLists.txt ..." ; \
+		${REINPLACE_CMD} -E 's|ADD_LIBRARY *\(vtk\$$\{KIT\} .*$$|FIND_LIBRARY\('$$dir'_LIB NAMES vtk\$$\{KIT\} PATHS ${PREFIX}/lib\)|g ; s|TARGET_LINK_LIBRARIES *\(vtk\$$\{KIT\}${WRAP} vtk\$$\{KIT\}|TARGET_LINK_LIBRARIES\(vtk\$$\{KIT\}${WRAP} \$$\{'$$dir'_LIB\}|g ; s|^[ \t]*vtk\$$\{KIT\}[ \t]*$$| \$$\{'$$dir'_LIB\}|g ; s|TARGET_LINK_LIBRARIES *\(vtk\$$\{KIT\} .*$$||g' \
+			${VTKSRCDIR}/$$dir/CMakeLists.txt ; \
+	done
+
+.if defined(WITH_TESTING)
+	@for dir in ${VTK_KITS} ; do \
+		${ECHO_MSG} "Patching ${VTKSRCDIR}/$$dir/Testing/CMakeLists.txt ..." ; \
+		${REINPLACE_CMD} -E 's|SUBDIRS *\(Cxx\).*$$||g' \
+			${VTKSRCDIR}/$$dir/Testing/CMakeLists.txt ; \
+	done
+.endif
+.endif	#end of patch-common
+
+install-binaries:
+.if defined(BINARIES)
+	@${ECHO_MSG} "Installing binaries to ${PREFIX}/bin :"
+.for i in ${BINARIES}
+	@${ECHO_MSG} "Installing ${i} ..."
+	@${INSTALL_PROGRAM} ${WRKSRC}/bin/${i} ${PREFIX}/bin
+.endfor
+.endif
+
+install-libs:
+	@${ECHO_MSG} "Installing shared libraries to ${PREFIX}/lib ..."
+.for i in ${VTK_KITS:S/$/${WRAP}/} ${EXTRA_LIBS}
+	@${ECHO_MSG} "Installing libvtk${i}.so ..."
+	@${INSTALL_PROGRAM} ${WRKSRC}/bin/libvtk${i}.so \
+			${PREFIX}/lib/libvtk${i}.so.${LIBVER}
+	@${LN} -sf ${PREFIX}/lib/libvtk${i}.so.${LIBVER} \
+			${PREFIX}/lib/libvtk${i}.so
+.endfor
+
+.endif
+
+install-cnotice:
+	@${ECHO_MSG} "Installing copyright notice to ${DOCSDIR} ..."
+	@${MKDIR} ${DOCSDIR}
+	@${INSTALL_DATA} ${VTKSRCDIR}/README.html ${DOCSDIR}
+	@${INSTALL_DATA} ${VTKSRCDIR}/vtkLogo.jpg ${DOCSDIR}
+	@${ECHO_MSG} -e "A list of the patented classes.\n\n" > ${WRKDIR}/README.patented-classes
+	@cd ${VTKSRCDIR} ; ${LS} Patented/*.h >> ${WRKDIR}/README.patented-classes
+	@${INSTALL_DATA} ${WRKDIR}/README.patented-classes ${DOCSDIR}
+
+print-pkg-message:
+	@if ${TEST} -f ${PKGMESSAGE} ; then \
+	${ECHO_MSG} -e "-- V T K - N O T E ----------------------------------------------------\n\n" ; \
+	${CAT} ${PKGMESSAGE} | ${SED} -e 's|%%PREFIX%%|${PREFIX}|' ; \
+	${ECHO_MSG} -e "\n\n-----------------------------------------------------------------------" ; \
+	fi
+
+post-install: print-pkg-message
+
+.ifndef(PKGNAMESUFFIX)
 .include <bsd.port.mk>
+.endif
diff --git a/math/vtk/distinfo b/math/vtk/distinfo
index 090dff6a41fc..270eafdd5ab7 100644
--- a/math/vtk/distinfo
+++ b/math/vtk/distinfo
@@ -1 +1 @@
-MD5 (vtk32-src-unix.tgz) = 11dc58c1c75a5be1d9c622386e87eb73
+MD5 (VTK-4.3.0-cvs20031006.tar.gz) = 6c574972eb41c9d287fb540811d85e3a
diff --git a/math/vtk/files/patch-aa b/math/vtk/files/patch-aa
deleted file mode 100644
index 0e95173ce8e1..000000000000
--- a/math/vtk/files/patch-aa
+++ /dev/null
@@ -1,35 +0,0 @@
---- user.make.orig	Wed Jul 12 14:22:11 2000
-+++ user.make	Wed Mar 14 16:07:25 2001
-@@ -2,22 +2,23 @@
- # by configure in system.make.  At a minimum you should set
- # the following Tcl/Tk values if you are planning to use Tcl/Tk
- 
--TCL_INCLUDE=-I/home/ausable/software/src/tcl7.6/tcl7.6/generic
--TCL_LIB=/common/software/tcl7.6/sun4/5.4/lib/libtcl7.6.a
-+TCL_INCLUDE=-I${PREFIX}/include/tcl8.3/generic
-+TCL_LIB=-L${PREFIX}/lib -ltcl83
- 
--TK_INCLUDE=-I/home/ausable/software/src/tcl7.6/tk4.2/generic
--TK_LIB=/common/software/tk4.2/sun4/5.4/lib/libtk4.2.a
-+TK_INCLUDE=-I${PREFIX}/include/tk8.3/generic
-+TK_LIB=-L${PREFIX}/lib -ltk83
- 
--MESA_INCLUDE=-I/home/martink/storage/Mesa-1.2.6/include
--MESA_LIB=/home/martink/storage/Mesa-1.2.6/lib-sun4-solaris/libMesaGL.a
-+MESA_INCLUDE=-I${X11BASE}/include
-+MESA_LIB=-L${X11BASE} -lGL -lOSMesa
- 
- # for python you must set this 
--PYTHON_INCLUDES=-I/home/schroede/montnaro/Python-1.4/Include
-+PYTHON_INCLUDES=-I%%PYTHON_INCLUDEDIR%%
- 
- # Add additional CFLAGS and CXXFLAGS for compilation
- # uncomment the following two lines to set your own flags
--#USER_CFLAGS =  
--#USER_CXXFLAGS = 
-+USER_CFLAGS =  -O2 -D__NO_MATH_INLINES %%PTHREAD_CFLAGS%%
-+USER_CXXFLAGS = -O2 -D__NO_MATH_INLINES %%PTHREAD_CFLAGS%%
-+X_EXTRA_LIBS = -lstdc++ -lgcc %%PTHREAD_LIBS%%
- 
- # if you want to try the java support you'll need to set the following
- # variables to match your environment and uncomment them
diff --git a/math/vtk/files/patch-ab b/math/vtk/files/patch-ab
deleted file mode 100644
index a9a85e49c762..000000000000
--- a/math/vtk/files/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
---- configure.orig	Tue Dec  5 19:32:37 2000
-+++ configure	Wed Mar 14 16:09:46 2001
-@@ -2973,10 +2973,10 @@
- 	# Not available on all versions:  check for include file.
- 	if test -f /usr/include/dlfcn.h; then
- 	    SHLIB_CFLAGS="-fpic"
--	    SHLIB_LD_LIBS=""
-+	    SHLIB_LD_LIBS="${LIBS}"
- 	    SHLIB_SUFFIX=".so"
- 	    DL_LIBS=""
--	    VTK_SHLIB_LINK_FLAGS="-shared"
-+	    VTK_SHLIB_BUILD_FLAGS="-shared"
- 	else
- 	    SHLIB_CFLAGS=""
- 	    SHLIB_LD_LIBS=""
diff --git a/math/vtk/pkg-descr b/math/vtk/pkg-descr
index 1d395486cd3d..0d62b9340521 100644
--- a/math/vtk/pkg-descr
+++ b/math/vtk/pkg-descr
@@ -1,15 +1,15 @@
-The ideal way to learn about the software is from the book it is designed to
-support.  You should be able to get the book from any local bookstore or from
-our web page. The web page also contains some html reference pages for the
-objects in VTK as well as a FAQ.
+	VTK - the Visualization Toolkit is an object oriented, high
+level library that allows one to easily write programs in C++, Tcl,
+Python and Java that do 3D visualization. 
 
-  The VTK User's Guide
-  by Will Schroeder, Ken Martin
-  Kitware (see VTK web page)
+        VTK enables users to concentrate on their work by providing a
+large number of excellent and feature packed high level functions that
+do visualization.  The library needs OpenGL to render the graphics and
+for FreeBSD machines Mesa is necessary. 
 
-  The Visualization Toolkit, An Object-Oriented Approach to 3D Graphics
-  by Will Schroeder, Ken Martin and Bill Lorensen.
-  Prentice Hall, ISBN 013199837-4
+The terms/copyright can be read in the docs dir/README.html. The patented 
+classes (few in number) are not to be used in commercial application 
+without a license from the patent/copyright holder (listed in the class
+header). Patented classes are listed in README.patented-classes.
 
-For more information and a FAQ see our web page at
-WWW: http://www.kitware.com/vtk.html
+WWW: http://www.vtk.org
diff --git a/math/vtk/pkg-message b/math/vtk/pkg-message
new file mode 100644
index 000000000000..d87a38d092e1
--- /dev/null
+++ b/math/vtk/pkg-message
@@ -0,0 +1,4 @@
+The terms/copyright can be read in the docs dir/README.html. The patented
+classes (few in number) are not to be used in commercial application
+without a license from the patent/copyright holder (listed in the class
+header). Patented classes are listed in README.patented-classes.
diff --git a/math/vtk/pkg-plist b/math/vtk/pkg-plist
index 2790983a58bb..f2d76b7fe19d 100644
--- a/math/vtk/pkg-plist
+++ b/math/vtk/pkg-plist
@@ -1,61 +1,45 @@
-bin/vtk
-lib/libVTKCommon.so
-lib/libVTKCommonPython.so
-lib/libVTKCommonTcl.so
-lib/libVTKContrib.so
-lib/libVTKContribPython.so
-lib/libVTKContribTcl.so
-lib/libVTKGraphics.so
-lib/libVTKGraphicsPython.so
-lib/libVTKGraphicsTcl.so
-lib/libVTKImaging.so
-lib/libVTKImagingPython.so
-lib/libVTKImagingTcl.so
-lib/vtk/python/VTK.py
-lib/vtk/python/VTK.pyc
-lib/vtk/python/VTK.pyo
-lib/vtk/python/libVTKCommonPython.py
-lib/vtk/python/libVTKCommonPython.pyc
-lib/vtk/python/libVTKCommonPython.pyo
-lib/vtk/python/libVTKContribPython.py
-lib/vtk/python/libVTKContribPython.pyc
-lib/vtk/python/libVTKContribPython.pyo
-lib/vtk/python/libVTKGraphicsPython.py
-lib/vtk/python/libVTKGraphicsPython.pyc
-lib/vtk/python/libVTKGraphicsPython.pyo
-lib/vtk/python/libVTKImagingPython.py
-lib/vtk/python/libVTKImagingPython.pyc
-lib/vtk/python/libVTKImagingPython.pyo
-lib/vtk/python/libVTKLocalPython.py
-lib/vtk/python/libVTKLocalPython.pyc
-lib/vtk/python/libVTKLocalPython.pyo
-lib/vtk/python/libVTKPatentedPython.py
-lib/vtk/python/libVTKPatentedPython.pyc
-lib/vtk/python/libVTKPatentedPython.pyo
-lib/vtk/python/vtkConstants.py
-lib/vtk/python/vtkConstants.pyc
-lib/vtk/python/vtkConstants.pyo
-lib/vtk/python/vtkImageExportToArray.py
-lib/vtk/python/vtkImageExportToArray.pyc
-lib/vtk/python/vtkImageExportToArray.pyo
-lib/vtk/python/vtkImageImportFromArray.py
-lib/vtk/python/vtkImageImportFromArray.pyc
-lib/vtk/python/vtkImageImportFromArray.pyo
-lib/vtk/python/vtkImageViewerWidget.py
-lib/vtk/python/vtkImageViewerWidget.pyc
-lib/vtk/python/vtkImageViewerWidget.pyo
-lib/vtk/python/vtkImageWindowWidget.py
-lib/vtk/python/vtkImageWindowWidget.pyc
-lib/vtk/python/vtkImageWindowWidget.pyo
-lib/vtk/python/vtkRenderWidget.py
-lib/vtk/python/vtkRenderWidget.pyc
-lib/vtk/python/vtkRenderWidget.pyo
-lib/vtk/python/vtkTkImageViewerWidget
-lib/vtk/python/vtkTkImageWindowWidget
-lib/vtk/python/vtkTkRenderWidget
-lib/vtk/python/vtkpython.so
-lib/vtkTkImageViewerWidget
-lib/vtkTkImageWindowWidget
-lib/vtkTkRenderWidget
-@dirrm lib/vtk/python
-@dirrm lib/vtk
+lib/libvtkCommon.so
+lib/libvtkCommon.so.%%LIBVER%%
+lib/libvtkDICOMParser.so
+lib/libvtkDICOMParser.so.%%LIBVER%%
+lib/libvtkFiltering.so
+lib/libvtkFiltering.so.%%LIBVER%%
+lib/libvtkGraphics.so
+lib/libvtkGraphics.so.%%LIBVER%%
+lib/libvtkHybrid.so
+lib/libvtkHybrid.so.%%LIBVER%%
+lib/libvtkIO.so
+lib/libvtkIO.so.%%LIBVER%%
+lib/libvtkImaging.so
+lib/libvtkImaging.so.%%LIBVER%%
+lib/libvtkParallel.so
+lib/libvtkParallel.so.%%LIBVER%%
+lib/libvtkPatented.so
+lib/libvtkPatented.so.%%LIBVER%%
+lib/libvtkRendering.so
+lib/libvtkRendering.so.%%LIBVER%%
+lib/libvtkfreetype.so
+lib/libvtkfreetype.so.%%LIBVER%%
+lib/libvtkftgl.so
+lib/libvtkftgl.so.%%LIBVER%%
+%%TESTING_ONLY%%bin/CommonCxxTests
+%%TESTING_ONLY%%bin/FilteringCxxTests
+%%TESTING_ONLY%%bin/GenericCommunicator
+%%TESTING_ONLY%%bin/GraphicsCxxTests
+%%TESTING_ONLY%%bin/HybridCxxTests
+%%TESTING_ONLY%%bin/IOCxxTests
+%%TESTING_ONLY%%bin/ImagingCxxTests
+%%TESTING_ONLY%%bin/ParallelIsoTest
+%%TESTING_ONLY%%bin/RenderingCxxTests
+%%TESTING_ONLY%%bin/SocketClient
+%%TESTING_ONLY%%bin/SocketServer
+%%TESTING_ONLY%%bin/TestCxxFeatures
+%%TESTING_ONLY%%bin/TestInstantiator
+%%TESTING_ONLY%%bin/TestPStream
+%%TESTING_ONLY%%bin/ThreadedCommunicator
+%%TESTING_ONLY%%bin/TimeRenderer
+%%TESTING_ONLY%%bin/TimeRenderer2
+%%DOCSDIR%%/README.html
+%%DOCSDIR%%/README.patented-classes
+%%DOCSDIR%%/vtkLogo.jpg
+@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
diff --git a/math/vtk/pkg-plist.with_patented b/math/vtk/pkg-plist.with_patented
deleted file mode 100644
index e3418ddc4039..000000000000
--- a/math/vtk/pkg-plist.with_patented
+++ /dev/null
@@ -1,64 +0,0 @@
-bin/vtk
-lib/libVTKCommon.so
-lib/libVTKCommonPython.so
-lib/libVTKCommonTcl.so
-lib/libVTKContrib.so
-lib/libVTKContribPython.so
-lib/libVTKContribTcl.so
-lib/libVTKGraphics.so
-lib/libVTKGraphicsPython.so
-lib/libVTKGraphicsTcl.so
-lib/libVTKImaging.so
-lib/libVTKImagingPython.so
-lib/libVTKImagingTcl.so
-lib/libVTKPatented.so
-lib/libVTKPatentedPython.so
-lib/libVTKPatentedTcl.so
-lib/vtk/python/VTK.py
-lib/vtk/python/VTK.pyc
-lib/vtk/python/VTK.pyo
-lib/vtk/python/libVTKCommonPython.py
-lib/vtk/python/libVTKCommonPython.pyc
-lib/vtk/python/libVTKCommonPython.pyo
-lib/vtk/python/libVTKContribPython.py
-lib/vtk/python/libVTKContribPython.pyc
-lib/vtk/python/libVTKContribPython.pyo
-lib/vtk/python/libVTKGraphicsPython.py
-lib/vtk/python/libVTKGraphicsPython.pyc
-lib/vtk/python/libVTKGraphicsPython.pyo
-lib/vtk/python/libVTKImagingPython.py
-lib/vtk/python/libVTKImagingPython.pyc
-lib/vtk/python/libVTKImagingPython.pyo
-lib/vtk/python/libVTKLocalPython.py
-lib/vtk/python/libVTKLocalPython.pyc
-lib/vtk/python/libVTKLocalPython.pyo
-lib/vtk/python/libVTKPatentedPython.py
-lib/vtk/python/libVTKPatentedPython.pyc
-lib/vtk/python/libVTKPatentedPython.pyo
-lib/vtk/python/vtkConstants.py
-lib/vtk/python/vtkConstants.pyc
-lib/vtk/python/vtkConstants.pyo
-lib/vtk/python/vtkImageExportToArray.py
-lib/vtk/python/vtkImageExportToArray.pyc
-lib/vtk/python/vtkImageExportToArray.pyo
-lib/vtk/python/vtkImageImportFromArray.py
-lib/vtk/python/vtkImageImportFromArray.pyc
-lib/vtk/python/vtkImageImportFromArray.pyo
-lib/vtk/python/vtkImageViewerWidget.py
-lib/vtk/python/vtkImageViewerWidget.pyc
-lib/vtk/python/vtkImageViewerWidget.pyo
-lib/vtk/python/vtkImageWindowWidget.py
-lib/vtk/python/vtkImageWindowWidget.pyc
-lib/vtk/python/vtkImageWindowWidget.pyo
-lib/vtk/python/vtkRenderWidget.py
-lib/vtk/python/vtkRenderWidget.pyc
-lib/vtk/python/vtkRenderWidget.pyo
-lib/vtk/python/vtkTkImageViewerWidget                
-lib/vtk/python/vtkTkImageWindowWidget                
-lib/vtk/python/vtkTkRenderWidget                     
-lib/vtk/python/vtkpython.so                          
-lib/vtkTkImageViewerWidget
-lib/vtkTkImageWindowWidget
-lib/vtkTkRenderWidget
-@dirrm lib/vtk/python
-@dirrm lib/vtk