5 files changed, 50 insertions, 13 deletions

diff --git a/math/vtk-data/Makefile b/math/vtk-data/Makefile
index dd23ddf90af8..52b5c4dca4bb 100644
--- a/math/vtk-data/Makefile
+++ b/math/vtk-data/Makefile
@@ -6,17 +6,17 @@
 #
 
 PKGNAMESUFFIX=	-data
-DISTFILES=	VTKData-${PORTVERSION}-cvs${CVSDATE}.tar.gz
+DISTFILES=	VTKData-${PORTVERSION}.tar.gz
 
 COMMENT=	The Visualization Toolkit examples data
 
-BROKEN=		Unfetchable
-
 MASTERDIR=	${.CURDIR}/../vtk
 
 MD5_FILE=	${.CURDIR}/distinfo
-WRKSRC=		${WRKDIR}/VTKData
-PKGMESSAGE=	${.CURDIR}/pkg-message
+WRKSRC=		${WRKDIR}/VTKData-release-${PORTVERSION}
+SUB_FILES=	pkg-message
+PKGMESSAGE=	${WRKDIR}/pkg-message
+INSTFILES=	Baseline Data VTKData.readme
 
 do-configure:
 
@@ -28,7 +28,12 @@ do-install:
 	@${MKDIR} ${EXAMPLESDIR}
 	@${MKDIR} ${VTKDATAROOT}
 	@${ECHO_MSG} "Installing VTKData to ${EXAMPLESDIR} ..."
-	@${CP} -R ${WRKSRC}/* ${VTKDATAROOT}
+.for i in ${INSTFILES}
+	@cd ${WRKSRC} && \
+		${FIND} ${i} -type d -exec ${MKDIR} ${VTKDATAROOT}/{} \; && \
+		${FIND} ${i} \! -type d -exec ${INSTALL_DATA} {} ${VTKDATAROOT}/{} \;
+.endfor
+	@${RMDIR} ${VTKDATAROOT}/Baseline/Common # empty
 
 .include "${MASTERDIR}/Makefile"
 .include <bsd.port.post.mk>
diff --git a/math/vtk-data/distinfo b/math/vtk-data/distinfo
index 5aaa5d00fef3..52eb81dd1222 100644
--- a/math/vtk-data/distinfo
+++ b/math/vtk-data/distinfo
@@ -1,2 +1,2 @@
-MD5 (VTKData-4.3.0-cvs20031006.tar.gz) = 3a5d707815a14b483581d913b7a19da2
-SIZE (VTKData-4.3.0-cvs20031006.tar.gz) = 19733476
+MD5 (VTKData-4.4.tar.gz) = f54431edf9831ab4370dc289d970c6f5
+SIZE (VTKData-4.4.tar.gz) = 19998689
diff --git a/math/vtk-data/files/pkg-message.in b/math/vtk-data/files/pkg-message.in
new file mode 100644
index 000000000000..9e462af3daa7
--- /dev/null
+++ b/math/vtk-data/files/pkg-message.in
@@ -0,0 +1,6 @@
+Remember to set your VTK_DATA_ROOT environment variable to:
+
+	%%PREFIX%%/share/examples/vtk/VTKData
+
+before running tests or examples.
+
diff --git a/math/vtk-data/pkg-message b/math/vtk-data/pkg-message
deleted file mode 100644
index 5e0b431a409c..000000000000
--- a/math/vtk-data/pkg-message
+++ /dev/null
@@ -1,2 +0,0 @@
-Remember to set your VTK_DATA_ROOT variable to %%PREFIX%%/share/examples/vtk/VTKData
-before running tests or examples
diff --git a/math/vtk-data/pkg-plist b/math/vtk-data/pkg-plist
index 9bc39e694b15..9e0df9b861e0 100644
--- a/math/vtk-data/pkg-plist
+++ b/math/vtk-data/pkg-plist
@@ -75,8 +75,13 @@
 %%EXAMPLESDIR%%/VTKData/Baseline/Graphics/TestConvexPointSet.png
 %%EXAMPLESDIR%%/VTKData/Baseline/Graphics/TestCurvatures.png
 %%EXAMPLESDIR%%/VTKData/Baseline/Graphics/TestGraphLayoutFilter.png
+%%EXAMPLESDIR%%/VTKData/Baseline/Graphics/TestHierarchicalBox.png
+%%EXAMPLESDIR%%/VTKData/Baseline/Graphics/TestHierarchicalBoxPipeline.png
+%%EXAMPLESDIR%%/VTKData/Baseline/Graphics/TestMultiBlock.png
 %%EXAMPLESDIR%%/VTKData/Baseline/Graphics/TestMultiBlockStreamer.png
+%%EXAMPLESDIR%%/VTKData/Baseline/Graphics/TestPlatonicSolids.png
 %%EXAMPLESDIR%%/VTKData/Baseline/Graphics/TestQuadricClustering.png
+%%EXAMPLESDIR%%/VTKData/Baseline/Graphics/TestQuadricClustering_1.png
 %%EXAMPLESDIR%%/VTKData/Baseline/Graphics/TestRibbonAndTube.png
 %%EXAMPLESDIR%%/VTKData/Baseline/Graphics/TestRibbonAndTube_1.png
 %%EXAMPLESDIR%%/VTKData/Baseline/Graphics/TestRibbonAndTube_2.png
@@ -217,6 +222,7 @@
 %%EXAMPLESDIR%%/VTKData/Baseline/Hybrid/TestGridWarpNearest.png
 %%EXAMPLESDIR%%/VTKData/Baseline/Hybrid/TestICPTransform.png
 %%EXAMPLESDIR%%/VTKData/Baseline/Hybrid/TestImageStencilWithPolydata.png
+%%EXAMPLESDIR%%/VTKData/Baseline/Hybrid/TestImageTracerWidget.png
 %%EXAMPLESDIR%%/VTKData/Baseline/Hybrid/TestImplicitPlaneWidget.png
 %%EXAMPLESDIR%%/VTKData/Baseline/Hybrid/TestInteractorEventRecorder.png
 %%EXAMPLESDIR%%/VTKData/Baseline/Hybrid/TestInteractorEventRecorder_1.png
@@ -255,13 +261,12 @@
 %%EXAMPLESDIR%%/VTKData/Baseline/Hybrid/xyPlot.png
 %%EXAMPLESDIR%%/VTKData/Baseline/Hybrid/xyPlot2.png
 %%EXAMPLESDIR%%/VTKData/Baseline/Hybrid/xyPlot3.png
-%%EXAMPLESDIR%%/VTKData/Baseline/Hybrid/xyPlot3_1.png
 %%EXAMPLESDIR%%/VTKData/Baseline/Hybrid/xyPlot4.png
-%%EXAMPLESDIR%%/VTKData/Baseline/Hybrid/xyPlot_1.png
 %%EXAMPLESDIR%%/VTKData/Baseline/IO/ParticleReader.png
 %%EXAMPLESDIR%%/VTKData/Baseline/IO/Plot3DScalars.png
 %%EXAMPLESDIR%%/VTKData/Baseline/IO/Plot3DScalars_1.png
 %%EXAMPLESDIR%%/VTKData/Baseline/IO/Plot3DVectors.png
+%%EXAMPLESDIR%%/VTKData/Baseline/IO/TestAVSucdReader.png
 %%EXAMPLESDIR%%/VTKData/Baseline/IO/TestBMPReader.png
 %%EXAMPLESDIR%%/VTKData/Baseline/IO/TestImageWriters.png
 %%EXAMPLESDIR%%/VTKData/Baseline/IO/TestJPEGReader.png
@@ -398,6 +403,7 @@
 %%EXAMPLESDIR%%/VTKData/Baseline/Rendering/ImageActor.png
 %%EXAMPLESDIR%%/VTKData/Baseline/Rendering/MesaText.png
 %%EXAMPLESDIR%%/VTKData/Baseline/Rendering/ScalarBar.png
+%%EXAMPLESDIR%%/VTKData/Baseline/Rendering/TestBunykRayCastFunction.png
 %%EXAMPLESDIR%%/VTKData/Baseline/Rendering/TestFlyTo.png
 %%EXAMPLESDIR%%/VTKData/Baseline/Rendering/TestFreetypeTextMapper.png
 %%EXAMPLESDIR%%/VTKData/Baseline/Rendering/TestFreetypeTextMapperBigger.png
@@ -407,6 +413,7 @@
 %%EXAMPLESDIR%%/VTKData/Baseline/Rendering/TestParallelCoordinates.png
 %%EXAMPLESDIR%%/VTKData/Baseline/Rendering/TestStyleJoystickActor.png
 %%EXAMPLESDIR%%/VTKData/Baseline/Rendering/TestStyleJoystickCamera.png
+%%EXAMPLESDIR%%/VTKData/Baseline/Rendering/TestStyleRubberBandZoom.png
 %%EXAMPLESDIR%%/VTKData/Baseline/Rendering/TestStyleTerrain.png
 %%EXAMPLESDIR%%/VTKData/Baseline/Rendering/TestStyleTrackballActor.png
 %%EXAMPLESDIR%%/VTKData/Baseline/Rendering/TestStyleTrackballCamera.png
@@ -594,6 +601,24 @@
 %%EXAMPLESDIR%%/VTKData/Data/cactus.3337.pts
 %%EXAMPLESDIR%%/VTKData/Data/caffeine.pdb
 %%EXAMPLESDIR%%/VTKData/Data/camscene.png
+%%EXAMPLESDIR%%/VTKData/Data/cellsnd.ascii.inp
+%%EXAMPLESDIR%%/VTKData/Data/cellsnd.bin.inp
+%%EXAMPLESDIR%%/VTKData/Data/chombo3d/chombo3d_0.vti
+%%EXAMPLESDIR%%/VTKData/Data/chombo3d/chombo3d_1.vti
+%%EXAMPLESDIR%%/VTKData/Data/chombo3d/chombo3d_10.vti
+%%EXAMPLESDIR%%/VTKData/Data/chombo3d/chombo3d_11.vti
+%%EXAMPLESDIR%%/VTKData/Data/chombo3d/chombo3d_12.vti
+%%EXAMPLESDIR%%/VTKData/Data/chombo3d/chombo3d_13.vti
+%%EXAMPLESDIR%%/VTKData/Data/chombo3d/chombo3d_14.vti
+%%EXAMPLESDIR%%/VTKData/Data/chombo3d/chombo3d_15.vti
+%%EXAMPLESDIR%%/VTKData/Data/chombo3d/chombo3d_2.vti
+%%EXAMPLESDIR%%/VTKData/Data/chombo3d/chombo3d_3.vti
+%%EXAMPLESDIR%%/VTKData/Data/chombo3d/chombo3d_4.vti
+%%EXAMPLESDIR%%/VTKData/Data/chombo3d/chombo3d_5.vti
+%%EXAMPLESDIR%%/VTKData/Data/chombo3d/chombo3d_6.vti
+%%EXAMPLESDIR%%/VTKData/Data/chombo3d/chombo3d_7.vti
+%%EXAMPLESDIR%%/VTKData/Data/chombo3d/chombo3d_8.vti
+%%EXAMPLESDIR%%/VTKData/Data/chombo3d/chombo3d_9.vti
 %%EXAMPLESDIR%%/VTKData/Data/combq.bin
 %%EXAMPLESDIR%%/VTKData/Data/combxyz.bin
 %%EXAMPLESDIR%%/VTKData/Data/earth.ppm
@@ -705,6 +730,9 @@
 %%EXAMPLESDIR%%/VTKData/Data/masonry.bmp
 %%EXAMPLESDIR%%/VTKData/Data/matrix.vtk
 %%EXAMPLESDIR%%/VTKData/Data/motor.g
+%%EXAMPLESDIR%%/VTKData/Data/multicomb_0.vts
+%%EXAMPLESDIR%%/VTKData/Data/multicomb_1.vts
+%%EXAMPLESDIR%%/VTKData/Data/multicomb_2.vts
 %%EXAMPLESDIR%%/VTKData/Data/neghip.slc
 %%EXAMPLESDIR%%/VTKData/Data/nut.slc
 %%EXAMPLESDIR%%/VTKData/Data/office.binary.vtk
@@ -728,6 +756,7 @@
 %%EXAMPLESDIR%%/VTKData/VTKData.readme
 @dirrm %%EXAMPLESDIR%%/VTKData/Data/libtiff
 @dirrm %%EXAMPLESDIR%%/VTKData/Data/headsq
+@dirrm %%EXAMPLESDIR%%/VTKData/Data/chombo3d
 @dirrm %%EXAMPLESDIR%%/VTKData/Data/Viewpoint
 @dirrm %%EXAMPLESDIR%%/VTKData/Data/EnSight
 @dirrm %%EXAMPLESDIR%%/VTKData/Data
@@ -739,7 +768,6 @@
 @dirrm %%EXAMPLESDIR%%/VTKData/Baseline/Hybrid
 @dirrm %%EXAMPLESDIR%%/VTKData/Baseline/Graphics
 @dirrm %%EXAMPLESDIR%%/VTKData/Baseline/Filtering
-@unexec rmdir %D/%%EXAMPLESDIR%%/VTKData/Baseline/Common 2>/dev/null || true
 @dirrm %%EXAMPLESDIR%%/VTKData/Baseline
 @dirrm %%EXAMPLESDIR%%/VTKData
 @unexec rmdir %D/%%EXAMPLESDIR%% 2>/dev/null || true