diff options
| author | Sam Lawrance <lawrance@FreeBSD.org> | 2005-04-23 14:12:36 +0000 |
|---|---|---|
| committer | Sam Lawrance <lawrance@FreeBSD.org> | 2005-04-23 14:12:36 +0000 |
| commit | 96b7b4c3a5872542df3e3f35b3a453c6acbbade0 (patch) | |
| tree | 2e4846a0c3c6b3f56ddedbe05c19851ce72e157b | |
| parent | a22f63ba68abf6248439980ceae5b861ae420f47 (diff) | |
| download | ports-96b7b4c3a5872542df3e3f35b3a453c6acbbade0.tar.gz ports-96b7b4c3a5872542df3e3f35b3a453c6acbbade0.zip | |
Notes
26 files changed, 268 insertions, 294 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 diff --git a/math/vtk-examples/Makefile b/math/vtk-examples/Makefile index 592e836e8d18..6492c95d01fb 100644 --- a/math/vtk-examples/Makefile +++ b/math/vtk-examples/Makefile @@ -13,7 +13,8 @@ RUN_DEPENDS= ${VTKDATAROOT}/VTKData.readme:${PORTSDIR}/math/vtk-data MASTERDIR= ${.CURDIR}/../vtk -PKGMESSAGE= ${.CURDIR}/pkg-message +SUB_FILES= pkg-message +PKGMESSAGE= ${WRKDIR}/pkg-message .include "${MASTERDIR}/Makefile" @@ -25,17 +26,19 @@ do-install: install-cnotice @${ECHO_MSG} "Installing Examples to ${EXAMPLESDIR} ..." @${MKDIR} ${EXAMPLESDIR} @${MKDIR} ${EXAMPLESDIR}/Examples - @${CP} -R ${VTKSRCDIR}/Examples/* ${EXAMPLESDIR}/Examples + @cd ${VTKSRCDIR} && \ + ${FIND} Examples -type d -exec ${MKDIR} ${EXAMPLESDIR}/{} \; && \ + ${FIND} Examples \! -type d -exec ${INSTALL_DATA} {} ${EXAMPLESDIR}/{} \; @${RM} ${EXAMPLESDIR}/Examples/CMakeList* @${ECHO_MSG} "Installing Testing to ${EXAMPLESDIR} ... " @${MKDIR} ${TESTINGDIR} .for i in ${VTK_KITS} - @${MKDIR} ${TESTINGDIR}/${i} - @${CP} -R ${VTKSRCDIR}/${i}/Testing/* ${TESTINGDIR}/${i} + @cd ${VTKSRCDIR}/${i}/Testing && \ + ${FIND} * -type d -exec ${MKDIR} ${TESTINGDIR}/${i}/{} \; && \ + ${FIND} * \! -type d -exec ${INSTALL_DATA} {} ${TESTINGDIR}/${i}/{} \; .endfor - @${CAT} ${PKGMESSAGE} | ${SED} -e 's|%%PREFIX%%|${PREFIX}|' > ${EXAMPLESDIR}/BUILD-HOWTO - @${CAT} ${PKGMESSAGE} | ${SED} -e 's|%%PREFIX%%|${PREFIX}|' > ${DOCSDIR}/README.examples + @${INSTALL_DATA} ${PKGMESSAGE} ${DOCSDIR}/README.examples .include <bsd.port.post.mk> diff --git a/math/vtk-examples/files/pkg-message.in b/math/vtk-examples/files/pkg-message.in new file mode 100644 index 000000000000..392fa3f971a6 --- /dev/null +++ b/math/vtk-examples/files/pkg-message.in @@ -0,0 +1,12 @@ +To build and run C++ examples/tests you need to install +vtk, vtk-headers, and cmake. + +To run Tcl, Python or Java examples/tests you need to install +vtk and vtk-tcl, vtk-python or vtk-java correspondingly. + +Remember to set your VTK_DATA_ROOT variable to: + + %%PREFIX%%/share/examples/vtk/VTKData + +before running examples/tests. + diff --git a/math/vtk-examples/pkg-message b/math/vtk-examples/pkg-message deleted file mode 100644 index 7358c60ffbbc..000000000000 --- a/math/vtk-examples/pkg-message +++ /dev/null @@ -1,7 +0,0 @@ -To build and run C++ examples/tests you need to instal vtk, vtk-headers, cmake. - -To run Tcl, Python or Java examples/tests you need to install vtk and vtk-tcl, -vtk-python or vtk-java correspondingly. - -Remember to set your VTK_DATA_ROOT variable to %%PREFIX%%/share/examples/vtk/VTKData -before running examples/tests. diff --git a/math/vtk-examples/pkg-plist b/math/vtk-examples/pkg-plist index 53c0e91e6f05..6206f8a88669 100644 --- a/math/vtk-examples/pkg-plist +++ b/math/vtk-examples/pkg-plist @@ -1,7 +1,10 @@ +%%DOCSDIR%%/README.examples %%DOCSDIR%%/README.html %%DOCSDIR%%/README.patented-classes %%DOCSDIR%%/vtkLogo.jpg -%%DOCSDIR%%/README.examples +%%EXAMPLESDIR%%/Examples/AMR/Cxx/CMakeLists.txt +%%EXAMPLESDIR%%/Examples/AMR/Cxx/HierarchicalBox.cxx +%%EXAMPLESDIR%%/Examples/AMR/Cxx/HierarchicalBoxPipeline.cxx %%EXAMPLESDIR%%/Examples/Annotation/Python/DispAllFonts.py %%EXAMPLESDIR%%/Examples/Annotation/Python/TestText.py %%EXAMPLESDIR%%/Examples/Annotation/Python/TestTextOldWay.py @@ -53,6 +56,10 @@ %%EXAMPLESDIR%%/Examples/Build/vtkMy/Unsorted/vtkBar2.cxx %%EXAMPLESDIR%%/Examples/Build/vtkMy/Unsorted/vtkBar2.h %%EXAMPLESDIR%%/Examples/Build/vtkMy/Unsorted/vtkmyUnsortedWin32Header.h +%%EXAMPLESDIR%%/Examples/Build/vtkMy/Utilities/CMakeLists.txt +%%EXAMPLESDIR%%/Examples/Build/vtkMy/Utilities/Doxygen/CMakeLists.txt +%%EXAMPLESDIR%%/Examples/Build/vtkMy/Utilities/Doxygen/doc_makeall.sh.in +%%EXAMPLESDIR%%/Examples/Build/vtkMy/Utilities/Doxygen/doxyfile.in %%EXAMPLESDIR%%/Examples/Build/vtkMy/Wrapping/Tcl/MakePackages.tcl %%EXAMPLESDIR%%/Examples/Build/vtkMy/Wrapping/Tcl/vtkmy/pkgIndex.tcl %%EXAMPLESDIR%%/Examples/Build/vtkMy/Wrapping/Tcl/vtkmy/vtkmy.tcl @@ -98,6 +105,7 @@ %%EXAMPLESDIR%%/Examples/GUI/Tcl/BoxWidget.tcl %%EXAMPLESDIR%%/Examples/GUI/Tcl/CustomInteraction.tcl %%EXAMPLESDIR%%/Examples/GUI/Tcl/ImagePlaneWidget.tcl +%%EXAMPLESDIR%%/Examples/GUI/Tcl/ImageTracerWidget.tcl %%EXAMPLESDIR%%/Examples/GUI/Tcl/ImplicitPlaneWidget.tcl %%EXAMPLESDIR%%/Examples/GUI/Tcl/Mace.tcl %%EXAMPLESDIR%%/Examples/GUI/Tcl/MaceTk.tcl @@ -234,6 +242,8 @@ %%EXAMPLESDIR%%/Examples/Modelling/Tcl/iceCream.tcl %%EXAMPLESDIR%%/Examples/Modelling/Tcl/procrustesAlignment.tcl %%EXAMPLESDIR%%/Examples/Modelling/Tcl/reconstructSurface.tcl +%%EXAMPLESDIR%%/Examples/MultiBlock/Cxx/CMakeLists.txt +%%EXAMPLESDIR%%/Examples/MultiBlock/Cxx/MultiBlock.cxx %%EXAMPLESDIR%%/Examples/ParallelProcessing/CMakeLists.txt %%EXAMPLESDIR%%/Examples/ParallelProcessing/Generic/CMakeLists.txt %%EXAMPLESDIR%%/Examples/ParallelProcessing/Generic/Cxx/CMakeLists.txt @@ -351,11 +361,11 @@ %%EXAMPLESDIR%%/Examples/VolumeRendering/Python/PseudoVolumeRendering.py %%EXAMPLESDIR%%/Examples/VolumeRendering/Python/SimpleRayCast.py %%EXAMPLESDIR%%/Examples/VolumeRendering/Python/SimpleTextureMap2D.py +%%EXAMPLESDIR%%/Examples/VolumeRendering/Tcl/IntermixedUnstructuredGrid.tcl %%EXAMPLESDIR%%/Examples/VolumeRendering/Tcl/PseudoVolumeRendering.tcl %%EXAMPLESDIR%%/Examples/VolumeRendering/Tcl/SimpleRayCast.tcl %%EXAMPLESDIR%%/Examples/VolumeRendering/Tcl/SimpleTextureMap2D.tcl %%EXAMPLESDIR%%/Examples/VolumeRendering/Tcl/volSimpleLOD.tcl -%%EXAMPLESDIR%%/BUILD-HOWTO %%EXAMPLESDIR%%/Testing/Common/CMakeLists.txt %%EXAMPLESDIR%%/Testing/Common/Cxx/CMakeLists.txt %%EXAMPLESDIR%%/Testing/Common/Cxx/ObjectFactory.cxx @@ -421,6 +431,9 @@ %%EXAMPLESDIR%%/Testing/Graphics/Cxx/Mace.cxx %%EXAMPLESDIR%%/Testing/Graphics/Cxx/PointLocator.cxx %%EXAMPLESDIR%%/Testing/Graphics/Cxx/RGrid.cxx +%%EXAMPLESDIR%%/Testing/Graphics/Cxx/TestHierarchicalBox.cxx +%%EXAMPLESDIR%%/Testing/Graphics/Cxx/TestHierarchicalBoxPipeline.cxx +%%EXAMPLESDIR%%/Testing/Graphics/Cxx/TestMultiBlock.cxx %%EXAMPLESDIR%%/Testing/Graphics/Cxx/expCos.cxx %%EXAMPLESDIR%%/Testing/Graphics/Cxx/volProt.cxx %%EXAMPLESDIR%%/Testing/Graphics/Python/CMakeLists.txt @@ -487,6 +500,7 @@ %%EXAMPLESDIR%%/Testing/Graphics/Tcl/TestCurvatures.tcl %%EXAMPLESDIR%%/Testing/Graphics/Tcl/TestGraphLayoutFilter.tcl %%EXAMPLESDIR%%/Testing/Graphics/Tcl/TestMultiBlockStreamer.tcl +%%EXAMPLESDIR%%/Testing/Graphics/Tcl/TestPlatonicSolids.tcl %%EXAMPLESDIR%%/Testing/Graphics/Tcl/TestQuadricClustering.tcl %%EXAMPLESDIR%%/Testing/Graphics/Tcl/TestRectilinearGridToTetrahedra.tcl %%EXAMPLESDIR%%/Testing/Graphics/Tcl/TestRibbonAndTube.tcl @@ -591,6 +605,7 @@ %%EXAMPLESDIR%%/Testing/Hybrid/Cxx/CMakeLists.txt %%EXAMPLESDIR%%/Testing/Hybrid/Cxx/ImagePlaneWidget.cxx %%EXAMPLESDIR%%/Testing/Hybrid/Cxx/PushTest.cxx +%%EXAMPLESDIR%%/Testing/Hybrid/Cxx/TestImageTracerWidget.cxx %%EXAMPLESDIR%%/Testing/Hybrid/Cxx/TestImplicitPlaneWidget.cxx %%EXAMPLESDIR%%/Testing/Hybrid/Cxx/TestLineWidget.cxx %%EXAMPLESDIR%%/Testing/Hybrid/Cxx/TestPlaneWidget.cxx @@ -649,10 +664,12 @@ %%EXAMPLESDIR%%/Testing/IO/Tcl/ParticleReader.tcl %%EXAMPLESDIR%%/Testing/IO/Tcl/Plot3DScalars.tcl %%EXAMPLESDIR%%/Testing/IO/Tcl/Plot3DVectors.tcl +%%EXAMPLESDIR%%/Testing/IO/Tcl/TestAVSucdReader.tcl %%EXAMPLESDIR%%/Testing/IO/Tcl/TestBMPReader.tcl %%EXAMPLESDIR%%/Testing/IO/Tcl/TestEmptyXML.tcl %%EXAMPLESDIR%%/Testing/IO/Tcl/TestImageWriters.tcl %%EXAMPLESDIR%%/Testing/IO/Tcl/TestJPEGReader.tcl +%%EXAMPLESDIR%%/Testing/IO/Tcl/TestMHD.tcl %%EXAMPLESDIR%%/Testing/IO/Tcl/TestPLYReadWrite.tcl %%EXAMPLESDIR%%/Testing/IO/Tcl/TestPolygonWriters.tcl %%EXAMPLESDIR%%/Testing/IO/Tcl/TestTIFFReader.tcl @@ -800,6 +817,7 @@ %%EXAMPLESDIR%%/Testing/Rendering/Tcl/ImageActor.tcl %%EXAMPLESDIR%%/Testing/Rendering/Tcl/MesaText.tcl %%EXAMPLESDIR%%/Testing/Rendering/Tcl/ScalarBar.tcl +%%EXAMPLESDIR%%/Testing/Rendering/Tcl/TestBunykRayCastFunction.tcl %%EXAMPLESDIR%%/Testing/Rendering/Tcl/TestFlyTo.tcl %%EXAMPLESDIR%%/Testing/Rendering/Tcl/TestFreetypeTextMapper.tcl %%EXAMPLESDIR%%/Testing/Rendering/Tcl/TestFreetypeTextMapperBigger.tcl @@ -812,6 +830,7 @@ %%EXAMPLESDIR%%/Testing/Rendering/Tcl/TestStyleBaseSpike.tcl %%EXAMPLESDIR%%/Testing/Rendering/Tcl/TestStyleJoystickActor.tcl %%EXAMPLESDIR%%/Testing/Rendering/Tcl/TestStyleJoystickCamera.tcl +%%EXAMPLESDIR%%/Testing/Rendering/Tcl/TestStyleRubberBandZoom.tcl %%EXAMPLESDIR%%/Testing/Rendering/Tcl/TestStyleTerrain.tcl %%EXAMPLESDIR%%/Testing/Rendering/Tcl/TestStyleTrackballActor.tcl %%EXAMPLESDIR%%/Testing/Rendering/Tcl/TestStyleTrackballCamera.tcl @@ -860,7 +879,6 @@ @dirrm %%EXAMPLESDIR%%/Testing/Common/Tcl @dirrm %%EXAMPLESDIR%%/Testing/Common/Python @dirrm %%EXAMPLESDIR%%/Testing/Common/Install -@unexec rmdir %D/%%EXAMPLESDIR%%/Testing/Common/Cxx/TestWrapping 2>/dev/null || true @dirrm %%EXAMPLESDIR%%/Testing/Common/Cxx @dirrm %%EXAMPLESDIR%%/Testing/Common @unexec rmdir %D/%%EXAMPLESDIR%%/Testing 2>/dev/null || true @@ -872,7 +890,6 @@ @dirrm %%EXAMPLESDIR%%/Examples/VisualizationAlgorithms @dirrm %%EXAMPLESDIR%%/Examples/Tutorial/Step6/Tcl @dirrm %%EXAMPLESDIR%%/Examples/Tutorial/Step6/Python -@unexec rmdir %D/%%EXAMPLESDIR%%/Examples/Tutorial/Step6/Java 2>/dev/null || true @dirrm %%EXAMPLESDIR%%/Examples/Tutorial/Step6/Cxx @dirrm %%EXAMPLESDIR%%/Examples/Tutorial/Step6 @dirrm %%EXAMPLESDIR%%/Examples/Tutorial/Step5/Tcl @@ -905,13 +922,14 @@ @dirrm %%EXAMPLESDIR%%/Examples/Rendering/Python @dirrm %%EXAMPLESDIR%%/Examples/Rendering/Cxx @dirrm %%EXAMPLESDIR%%/Examples/Rendering -@unexec rmdir %D/%%EXAMPLESDIR%%/Examples/ParallelProcessing/MultiThreaded 2>/dev/null || true @dirrm %%EXAMPLESDIR%%/Examples/ParallelProcessing/MPI/Tcl @dirrm %%EXAMPLESDIR%%/Examples/ParallelProcessing/MPI/Python @dirrm %%EXAMPLESDIR%%/Examples/ParallelProcessing/MPI @dirrm %%EXAMPLESDIR%%/Examples/ParallelProcessing/Generic/Cxx @dirrm %%EXAMPLESDIR%%/Examples/ParallelProcessing/Generic @dirrm %%EXAMPLESDIR%%/Examples/ParallelProcessing +@dirrm %%EXAMPLESDIR%%/Examples/MultiBlock/Cxx +@dirrm %%EXAMPLESDIR%%/Examples/MultiBlock @dirrm %%EXAMPLESDIR%%/Examples/Modelling/Tcl @dirrm %%EXAMPLESDIR%%/Examples/Modelling/Python @dirrm %%EXAMPLESDIR%%/Examples/Modelling/Cxx @@ -954,6 +972,8 @@ @dirrm %%EXAMPLESDIR%%/Examples/Build/vtkMy/Wrapping/Tcl/vtkmy @dirrm %%EXAMPLESDIR%%/Examples/Build/vtkMy/Wrapping/Tcl @dirrm %%EXAMPLESDIR%%/Examples/Build/vtkMy/Wrapping +@dirrm %%EXAMPLESDIR%%/Examples/Build/vtkMy/Utilities/Doxygen +@dirrm %%EXAMPLESDIR%%/Examples/Build/vtkMy/Utilities @dirrm %%EXAMPLESDIR%%/Examples/Build/vtkMy/Unsorted @dirrm %%EXAMPLESDIR%%/Examples/Build/vtkMy/Imaging @dirrm %%EXAMPLESDIR%%/Examples/Build/vtkMy/Examples/Tcl @@ -970,6 +990,8 @@ @dirrm %%EXAMPLESDIR%%/Examples/Annotation/Tcl @dirrm %%EXAMPLESDIR%%/Examples/Annotation/Python @dirrm %%EXAMPLESDIR%%/Examples/Annotation +@dirrm %%EXAMPLESDIR%%/Examples/AMR/Cxx +@dirrm %%EXAMPLESDIR%%/Examples/AMR @dirrm %%EXAMPLESDIR%%/Examples @unexec rmdir %D/%%EXAMPLESDIR%% 2>/dev/null || true @unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true diff --git a/math/vtk-headers/pkg-plist b/math/vtk-headers/pkg-plist index a3b44b953fec..1afb5f167153 100644 --- a/math/vtk-headers/pkg-plist +++ b/math/vtk-headers/pkg-plist @@ -1,6 +1,3 @@ -%%DOCSDIR%%/README.html -%%DOCSDIR%%/README.patented-classes -%%DOCSDIR%%/vtkLogo.jpg include/vtk/DICOMParser/DICOMAppHelper.h include/vtk/DICOMParser/DICOMCMakeConfig.h include/vtk/DICOMParser/DICOMCallback.h @@ -12,11 +9,14 @@ include/vtk/DICOMParser/DICOMTypes.h include/vtk/vtk3DS.h include/vtk/vtk3DSImporter.h include/vtk/vtk3DWidget.h +include/vtk/vtkAMRBox.h +include/vtk/vtkAVSucdReader.h include/vtk/vtkAbstractMapper.h include/vtk/vtkAbstractMapper3D.h include/vtk/vtkAbstractPicker.h include/vtk/vtkAbstractPropPicker.h include/vtk/vtkAbstractTransform.h +include/vtk/vtkAbstractVolumeMapper.h include/vtk/vtkActor.h include/vtk/vtkActor2D.h include/vtk/vtkActor2DCollection.h @@ -24,6 +24,8 @@ include/vtk/vtkActorCollection.h include/vtk/vtkAmoebaMinimizer.h include/vtk/vtkAppendFilter.h include/vtk/vtkAppendPolyData.h +include/vtk/vtkApplyFilterCommand.h +include/vtk/vtkApplyFilterCommandInternal.h include/vtk/vtkApproximatingSubdivisionFilter.h include/vtk/vtkArcPlotter.h include/vtk/vtkArrayCalculator.h @@ -91,7 +93,12 @@ include/vtk/vtkColorTransferFunction.h include/vtk/vtkCommand.h include/vtk/vtkCommonInstantiator.h include/vtk/vtkCommunicator.h +include/vtk/vtkCompositeDataCommand.h +include/vtk/vtkCompositeDataIterator.h +include/vtk/vtkCompositeDataSet.h +include/vtk/vtkCompositeDataVisitor.h include/vtk/vtkCompositeManager.h +include/vtk/vtkCompositeRenderManager.h include/vtk/vtkCompositer.h include/vtk/vtkCompressCompositer.h include/vtk/vtkCone.h @@ -122,6 +129,7 @@ include/vtk/vtkDataArray.h include/vtk/vtkDataArrayCollection.h include/vtk/vtkDataArrayCollectionIterator.h include/vtk/vtkDataArraySelection.h +include/vtk/vtkDataArrayTemplate.h include/vtk/vtkDataCompressor.h include/vtk/vtkDataObject.h include/vtk/vtkDataObjectCollection.h @@ -207,7 +215,6 @@ include/vtk/vtkFunctionParser.h include/vtk/vtkFunctionSet.h include/vtk/vtkGESignaReader.h include/vtk/vtkGL2PSExporter.h -include/vtk/vtkGLUTesselatorTriangleFilter.h include/vtk/vtkGaussianCubeReader.h include/vtk/vtkGaussianSplatter.h include/vtk/vtkGeneralTransform.h @@ -227,6 +234,20 @@ include/vtk/vtkGridTransform.h include/vtk/vtkHeap.h include/vtk/vtkHedgeHog.h include/vtk/vtkHexahedron.h +include/vtk/vtkHierarchicalBoxApplyFilterCommand.h +include/vtk/vtkHierarchicalBoxCellDataToPointData.h +include/vtk/vtkHierarchicalBoxContour.h +include/vtk/vtkHierarchicalBoxCutter.h +include/vtk/vtkHierarchicalBoxDataSet.h +include/vtk/vtkHierarchicalBoxDataSetInternal.h +include/vtk/vtkHierarchicalBoxOutlineFilter.h +include/vtk/vtkHierarchicalBoxSource.h +include/vtk/vtkHierarchicalBoxToHierarchicalBoxFilter.h +include/vtk/vtkHierarchicalBoxToPolyDataFilter.h +include/vtk/vtkHierarchicalBoxVisitor.h +include/vtk/vtkHierarchicalDataIterator.h +include/vtk/vtkHierarchicalDataSet.h +include/vtk/vtkHierarchicalDataSetInternal.h include/vtk/vtkHomogeneousTransform.h include/vtk/vtkHull.h include/vtk/vtkHybridInstantiator.h @@ -356,6 +377,7 @@ include/vtk/vtkImageToImageFilter.h include/vtk/vtkImageToImageStencil.h include/vtk/vtkImageToPolyDataFilter.h include/vtk/vtkImageToStructuredPoints.h +include/vtk/vtkImageTracerWidget.h include/vtk/vtkImageTranslateExtent.h include/vtk/vtkImageTwoInputFilter.h include/vtk/vtkImageVariance3D.h @@ -462,7 +484,6 @@ include/vtk/vtkMergeDataObjectFilter.h include/vtk/vtkMergeFields.h include/vtk/vtkMergeFilter.h include/vtk/vtkMergePoints.h -include/vtk/vtkMergePoints2D.h include/vtk/vtkMesaActor.h include/vtk/vtkMesaCamera.h include/vtk/vtkMesaFreeTypeTextMapper.h @@ -472,13 +493,21 @@ include/vtk/vtkMesaLight.h include/vtk/vtkMesaPolyDataMapper.h include/vtk/vtkMesaPolyDataMapper2D.h include/vtk/vtkMesaProperty.h +include/vtk/vtkMesaRayCastImageDisplayHelper.h include/vtk/vtkMesaRenderWindow.h include/vtk/vtkMesaRenderer.h include/vtk/vtkMesaTexture.h include/vtk/vtkMesaVolumeRayCastMapper.h include/vtk/vtkMesaVolumeTextureMapper2D.h include/vtk/vtkMeshQuality.h +include/vtk/vtkMetaImageReader.h +include/vtk/vtkMetaImageWriter.h include/vtk/vtkMoleculeReaderBase.h +include/vtk/vtkMultiBlockApplyFilterCommand.h +include/vtk/vtkMultiBlockDataIterator.h +include/vtk/vtkMultiBlockDataSet.h +include/vtk/vtkMultiBlockDataSetInternal.h +include/vtk/vtkMultiBlockDataVisitor.h include/vtk/vtkMultiPartExtentTranslator.h include/vtk/vtkMultiProcessController.h include/vtk/vtkMultiProcessLog.h @@ -506,6 +535,7 @@ include/vtk/vtkOpenGLLight.h include/vtk/vtkOpenGLPolyDataMapper.h include/vtk/vtkOpenGLPolyDataMapper2D.h include/vtk/vtkOpenGLProperty.h +include/vtk/vtkOpenGLRayCastImageDisplayHelper.h include/vtk/vtkOpenGLRenderWindow.h include/vtk/vtkOpenGLRenderer.h include/vtk/vtkOpenGLStateCache.h @@ -549,6 +579,7 @@ include/vtk/vtkPStreamTracer.h include/vtk/vtkParallelCoordinatesActor.h include/vtk/vtkParallelFactory.h include/vtk/vtkParallelInstantiator.h +include/vtk/vtkParallelRenderManager.h include/vtk/vtkParticleReader.h include/vtk/vtkPassThroughFilter.h include/vtk/vtkPatentedInstantiator.h @@ -567,11 +598,11 @@ include/vtk/vtkPlaneCollection.h include/vtk/vtkPlaneSource.h include/vtk/vtkPlaneWidget.h include/vtk/vtkPlanes.h +include/vtk/vtkPlatonicSolidSource.h include/vtk/vtkPointData.h include/vtk/vtkPointDataToCellData.h include/vtk/vtkPointLoad.h include/vtk/vtkPointLocator.h -include/vtk/vtkPointLocator2D.h include/vtk/vtkPointPicker.h include/vtk/vtkPointSet.h include/vtk/vtkPointSetSource.h @@ -634,6 +665,7 @@ include/vtk/vtkRIBExporter.h include/vtk/vtkRIBLight.h include/vtk/vtkRIBProperty.h include/vtk/vtkRTAnalyticSource.h +include/vtk/vtkRayCastImageDisplayHelper.h include/vtk/vtkRayCastStructures.h include/vtk/vtkRearrangeFields.h include/vtk/vtkRectilinearGrid.h @@ -703,6 +735,7 @@ include/vtk/vtkSpline.h include/vtk/vtkSplineFilter.h include/vtk/vtkSplineWidget.h include/vtk/vtkSplitField.h +include/vtk/vtkStdString.h include/vtk/vtkStreamLine.h include/vtk/vtkStreamPoints.h include/vtk/vtkStreamTracer.h @@ -726,6 +759,7 @@ include/vtk/vtkStructuredPointsToPolyDataFilter.h include/vtk/vtkStructuredPointsToStructuredPointsFilter.h include/vtk/vtkStructuredPointsToUnstructuredGridFilter.h include/vtk/vtkStructuredPointsWriter.h +include/vtk/vtkStructuredVisibilityConstraint.h include/vtk/vtkSubPixelPositionEdgels.h include/vtk/vtkSubdivideTetra.h include/vtk/vtkSuperquadric.h @@ -742,6 +776,7 @@ include/vtk/vtkTcl.h include/vtk/vtkTclUtil.h include/vtk/vtkTensor.h include/vtk/vtkTensorGlyph.h +include/vtk/vtkTesting.h include/vtk/vtkTetra.h include/vtk/vtkTextActor.h include/vtk/vtkTextMapper.h @@ -781,15 +816,20 @@ include/vtk/vtkTriangularTCoords.h include/vtk/vtkTriangularTexture.h include/vtk/vtkTubeFilter.h include/vtk/vtkUGFacetReader.h +include/vtk/vtkUniformGrid.h include/vtk/vtkUnsignedCharArray.h include/vtk/vtkUnsignedIntArray.h include/vtk/vtkUnsignedLongArray.h include/vtk/vtkUnsignedShortArray.h include/vtk/vtkUnstructuredGrid.h +include/vtk/vtkUnstructuredGridBunykRayCastFunction.h include/vtk/vtkUnstructuredGridReader.h include/vtk/vtkUnstructuredGridSource.h include/vtk/vtkUnstructuredGridToPolyDataFilter.h include/vtk/vtkUnstructuredGridToUnstructuredGridFilter.h +include/vtk/vtkUnstructuredGridVolumeMapper.h +include/vtk/vtkUnstructuredGridVolumeRayCastFunction.h +include/vtk/vtkUnstructuredGridVolumeRayCastMapper.h include/vtk/vtkUnstructuredGridWriter.h include/vtk/vtkVRML.h include/vtk/vtkVRMLExporter.h @@ -830,10 +870,8 @@ include/vtk/vtkWarpVector.h include/vtk/vtkWedge.h include/vtk/vtkWeightedTransformFilter.h include/vtk/vtkWin32Header.h -include/vtk/vtkWin32ImageMapper.h include/vtk/vtkWin32OpenGLRenderWindow.h include/vtk/vtkWin32OutputWindow.h -include/vtk/vtkWin32PolyDataMapper2D.h include/vtk/vtkWin32RenderWindowInteractor.h include/vtk/vtkWin32VideoSource.h include/vtk/vtkWinCE.h @@ -887,7 +925,6 @@ include/vtk/vtkXMLUtilities.h include/vtk/vtkXMLWriter.h include/vtk/vtkXMesaRenderWindow.h include/vtk/vtkXOpenGLRenderWindow.h -include/vtk/vtkXPolyDataMapper2D.h include/vtk/vtkXRenderWindowInteractor.h include/vtk/vtkXRenderWindowTclInteractor.h include/vtk/vtkXYPlotActor.h @@ -907,6 +944,19 @@ include/vtk/vtkstd/stack include/vtk/vtkstd/string include/vtk/vtkstd/utility include/vtk/vtkstd/vector +lib/vtk/CMake/libcmVTK_GENERATE_JAVA_DEPENDENCIES.so +lib/vtk/CMake/libcmVTK_MAKE_INSTANTIATOR2.so +lib/vtk/CMake/libcmVTK_WRAP_JAVA2.so +lib/vtk/CMake/libcmVTK_WRAP_PYTHON2.so +lib/vtk/CMake/libcmVTK_WRAP_TCL2.so +lib/vtk/CMake/vtkLoadCMakeExtensions.cmake +lib/vtk/UseVTK.cmake +lib/vtk/VTKBuildSettings.cmake +lib/vtk/VTKConfig.cmake +lib/vtk/VTKLibraryDepends.cmake +%%DOCSDIR%%/README.html +%%DOCSDIR%%/README.patented-classes +%%DOCSDIR%%/vtkLogo.jpg share/vtk/doxygen/authors.txt share/vtk/doxygen/doc_class2example.pl share/vtk/doxygen/doc_cleanhtml.pl @@ -927,18 +977,9 @@ share/vtk/doxygen/header.html share/vtk/doxygen/paper-clip.gif share/vtk/doxygen/pic.gif share/vtk/doxygen/vtk-logo.gif -lib/vtk/CMake/libcmVTK_GENERATE_JAVA_DEPENDENCIES.so -lib/vtk/CMake/libcmVTK_MAKE_INSTANTIATOR2.so -lib/vtk/CMake/libcmVTK_WRAP_JAVA2.so -lib/vtk/CMake/libcmVTK_WRAP_PYTHON2.so -lib/vtk/CMake/libcmVTK_WRAP_TCL2.so -lib/vtk/CMake/vtkLoadCMakeExtensions.cmake -lib/vtk/UseVTK.cmake -lib/vtk/VTKBuildSettings.cmake -lib/vtk/VTKConfig.cmake -lib/vtk/VTKLibraryDepends.cmake @dirrm share/vtk/doxygen @unexec rmdir %D/share/vtk 2>/dev/null || true +@dirrm %%DOCSDIR%% @dirrm lib/vtk/CMake @unexec rmdir %D/lib/vtk 2>/dev/null || true @dirrm include/vtk/vtkstd diff --git a/math/vtk-java/Makefile b/math/vtk-java/Makefile index de6aab78b87a..78d5545f3dfd 100644 --- a/math/vtk-java/Makefile +++ b/math/vtk-java/Makefile @@ -15,18 +15,21 @@ LIB_DEPENDS= vtkCommon.${LIBVER}:${PORTSDIR}/math/vtk MASTERDIR= ${.CURDIR}/../vtk WRAP= Java -BINARIES= VTKJavaExecutable vtkParseJava vtkWrapJava +BINARIES= vtkParseJava vtkWrapJava + +USE_JAVA= yes +JAVA_VERSION= 1.4+ +JAVA_OS= native +JAVA_BUILD= jdk +#USE_JIKES= no -USE_JAVA= 1.4 -NEED_JAVAC= yes -USE_JIKES= no JARFILE= vtk.jar # ${PORTNAME}.jar DESTJARFILE= vtk.jar # ${PORTNAME}.jar -CMAKE_DEFS= -DVTK_WRAP_JAVA:BOOL=ON \ +CMAKE_DEFS+= -DVTK_WRAP_JAVA:BOOL=ON \ -DJAVA_ARCHIVE:FILEPATH=${JAR} \ -DJAVA_AWT_INCLUDE_PATH:PATH=${JAVA_HOME}/include \ -DJAVA_AWT_LIBRARY:FILEPATH=${JAVA_HOME}/jre/lib/${ARCH}/libjawt.so \ - -DJAVA_COMPILE:FILEPATH=${JAVAC} \ + -DJAVA_COMPILE:FILEPATH="${JAVAC}" \ -DJAVA_INCLUDE_PATH:PATH=${JAVA_HOME}/include \ -DJAVA_INCLUDE_PATH2:PATH=${JAVA_HOME}/include/freebsd @@ -44,6 +47,20 @@ pre-everything:: post-patch: patch-common +post-build: + @${ECHO_MSG} "Building Java sources" + ${CP} ${VTKSRCDIR}/Wrapping/Java/vtk/vtkCanvas.java ${WRKSRC}/java/vtk + ${CP} ${VTKSRCDIR}/Wrapping/Java/vtk/vtkPanel.java ${WRKSRC}/java/vtk + (cd ${WRKSRC}/java;${JAVAC} vtk/*.java) + (cd ${WRKSRC}/java;${JAR} cvf ${WRKSRC}/bin/${JARFILE} vtk/*.class) +.if defined(WITH_TESTING) +.for i in AxesActor SimpleVTK TestVTKCanvas TestInternalFrames ImagePlaneWidget TestVTKCanvas + (cd ${VTKSRCDIR}/Wrapping/Java; \ + ${JAVAC} -classpath .:${WRKSRC}/bin/${JARFILE} \ + -d ${WRKSRC}/Wrapping/Java/ ${i}.java) +.endfor +.endif + do-install: install-cnotice install-binaries install-libs @${ECHO_MSG} "Installing ${DESTJARFILE} to ${JAVAJARDIR} ..." @${INSTALL_DATA} ${WRKSRC}/bin/${JARFILE} ${JAVAJARDIR}/${DESTJARFILE} @@ -53,11 +70,10 @@ do-install: install-cnotice install-binaries install-libs @${MKDIR} ${TESTINGDIR}/Java .if defined(WITH_TESTING) @${ECHO_MSG} "Installing Java tests to ${TESTINGDIR}/Java ..." -.for i in AxesActor SimpleVTK Regression TestVTKCanvas TestInternalFrames ImagePlaneWidget +.for i in AxesActor SimpleVTK TestVTKCanvas TestInternalFrames ImagePlaneWidget @${INSTALL_DATA} ${WRKSRC}/Wrapping/Java/${i}*.class ${TESTINGDIR}/Java @${INSTALL_DATA} ${VTKSRCDIR}/Wrapping/Java/${i}.java ${TESTINGDIR}/Java .endfor -.endif @${ECHO_MSG} "This directory contains VTK Java tests" > ${TESTINGDIR}/Java/README @${ECHO_MSG} "" >> ${TESTINGDIR}/Java/README @@ -65,5 +81,6 @@ do-install: install-cnotice install-binaries install-libs @${ECHO_MSG} "java -classpath .:${PREFIX}/share/java/classes/vtk.jar -Djava.library.path=${PREFIX}/lib SimpleVTK" >> ${TESTINGDIR}/Java/README @${ECHO_MSG} "" >> ${TESTINGDIR}/Java/README @${ECHO_MSG} "Be shure to use java 1.3 or greater." >> ${TESTINGDIR}/Java/README +.endif .include <bsd.port.post.mk> diff --git a/math/vtk-java/pkg-plist b/math/vtk-java/pkg-plist index 73968a6e4ade..082bb330c1b1 100644 --- a/math/vtk-java/pkg-plist +++ b/math/vtk-java/pkg-plist @@ -1,4 +1,3 @@ -bin/VTKJavaExecutable bin/vtkParseJava bin/vtkWrapJava lib/libvtkCommonJava.so @@ -29,8 +28,6 @@ share/java/classes/vtk.jar %%TESTING_ONLY%%share/examples/vtk/Testing/Java/ImagePlaneWidget$2.class %%TESTING_ONLY%%share/examples/vtk/Testing/Java/ImagePlaneWidget.class %%TESTING_ONLY%%share/examples/vtk/Testing/Java/ImagePlaneWidget.java -%%TESTING_ONLY%%share/examples/vtk/Testing/Java/Regression.class -%%TESTING_ONLY%%share/examples/vtk/Testing/Java/Regression.java %%TESTING_ONLY%%share/examples/vtk/Testing/Java/SimpleVTK$1.class %%TESTING_ONLY%%share/examples/vtk/Testing/Java/SimpleVTK.class %%TESTING_ONLY%%share/examples/vtk/Testing/Java/SimpleVTK.java @@ -50,5 +47,5 @@ share/java/classes/vtk.jar %%TESTING_ONLY%%share/examples/vtk/Testing/Java/README @unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true %%TESTING_ONLY%%@dirrm share/examples/vtk/Testing/Java -%%TESTING_ONLY%%@unexec rmdir %D/share/examples/vtk/testing 2>/dev/null || true +%%TESTING_ONLY%%@unexec rmdir %D/share/examples/vtk/Testing 2>/dev/null || true %%TESTING_ONLY%%@unexec rmdir %D/share/examples/vtk 2>/dev/null || true diff --git a/math/vtk-python/pkg-plist b/math/vtk-python/pkg-plist index 18f06fd0ab15..113efb6d526e 100644 --- a/math/vtk-python/pkg-plist +++ b/math/vtk-python/pkg-plist @@ -57,6 +57,12 @@ lib/vtk/python/vtk/gtk/GtkVTKRenderWindowInteractor.pyo lib/vtk/python/vtk/gtk/__init__.py lib/vtk/python/vtk/gtk/__init__.pyc lib/vtk/python/vtk/gtk/__init__.pyo +lib/vtk/python/vtk/gtk/GtkGLExtVTKRenderWindow.py +lib/vtk/python/vtk/gtk/GtkGLExtVTKRenderWindowInteractor.py +lib/vtk/python/vtk/gtk/GtkGLExtVTKRenderWindow.pyc +lib/vtk/python/vtk/gtk/GtkGLExtVTKRenderWindowInteractor.pyc +lib/vtk/python/vtk/gtk/GtkGLExtVTKRenderWindow.pyo +lib/vtk/python/vtk/gtk/GtkGLExtVTKRenderWindowInteractor.pyo lib/vtk/python/vtk/hybrid.py lib/vtk/python/vtk/hybrid.pyc lib/vtk/python/vtk/hybrid.pyo diff --git a/math/vtk/Makefile b/math/vtk/Makefile index fa2768748f59..122912f1cc0d 100644 --- a/math/vtk/Makefile +++ b/math/vtk/Makefile @@ -14,11 +14,10 @@ # PORTNAME= vtk -PORTVERSION= 4.3.0 -PORTREVISION= 3 +PORTVERSION= 4.4 CATEGORIES= math graphics MASTER_SITES= http://ovt.irfu.se/vtk/files/ -DISTFILES?= VTK-${PORTVERSION}-cvs${CVSDATE}.tar.gz +DISTFILES?= VTK-${PORTVERSION}-LatestRelease.tar.gz MAINTAINER= ko@irfu.se COMMENT?= The Visualization Toolkit shared libs @@ -26,14 +25,12 @@ COMMENT?= The Visualization Toolkit shared libs USE_REINPLACE= yes LIBVER= 1 -CVSDATE= 20031006 VTKSRCDIR= ${WRKDIR}/VTK TESTINGDIR= ${EXAMPLESDIR}/Testing VTKDATAROOT= ${EXAMPLESDIR}/VTKData -DOCSDIR= ${PREFIX}/share/doc/${PKGNAME} +DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX} PLIST= ${.CURDIR}/pkg-plist FILESDIR= ${.CURDIR}/files -RESTRICTED= yes VTK_KITS= Common Filtering Graphics Hybrid IO Imaging Rendering Parallel Patented @@ -58,33 +55,17 @@ 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 -# if optimization flag -O2 or -O3 is present - use g++33 -# There is a problem 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 - -.if ${OSVERSION} < 500016 -ADDITIONAL_EXE_LINKER_FLAGS= ${PTHREAD_LIBS} -.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} ${ADDITIONAL_EXE_LINKER_FLAGS}" \ + -DCMAKE_EXE_LINKER_FLAGS:STRING="${LINKERFLAGS} ${PTHREAD_LIBS}" \ -DCMAKE_THREAD_LIBS:STRING="${PTHREAD_LIBS}"\ -DCMAKE_USE_PTHREADS:BOOL=ON \ -DCMAKE_C_COMPILER:STRING='${CC}' \ diff --git a/math/vtk/distinfo b/math/vtk/distinfo index fb18f97f093d..e10d1193a779 100644 --- a/math/vtk/distinfo +++ b/math/vtk/distinfo @@ -1,2 +1,2 @@ -MD5 (VTK-4.3.0-cvs20031006.tar.gz) = 6c574972eb41c9d287fb540811d85e3a -SIZE (VTK-4.3.0-cvs20031006.tar.gz) = 6367112 +MD5 (VTK-4.4-LatestRelease.tar.gz) = 17a5006c4d7acca3e74d32e0e27f4739 +SIZE (VTK-4.4-LatestRelease.tar.gz) = 6323955 diff --git a/math/vtk/files/patch-IO-vtkBMPReader.cxx b/math/vtk/files/patch-IO-vtkBMPReader.cxx deleted file mode 100644 index f82deeb825e5..000000000000 --- a/math/vtk/files/patch-IO-vtkBMPReader.cxx +++ /dev/null @@ -1,16 +0,0 @@ -diff -u -r1.44 -r1.45 ---- IO/vtkBMPReader.cxx 2003/09/10 19:41:56 1.44 -+++ IO/vtkBMPReader.cxx 2003/10/19 14:38:03 1.45 -@@ -504,11 +504,11 @@ - outPtr0 += outIncr[0]; - } - // move to the next row in the file and data -- self->GetFile()->seekg(self->GetFile()->tellg() + streamSkip0, ios::beg); -+ self->GetFile()->seekg(static_cast<long>(self->GetFile()->tellg()) + streamSkip0, ios::beg); - outPtr1 += outIncr[1]; - } - // move to the next image in the file and data -- self->GetFile()->seekg(self->GetFile()->tellg() + streamSkip1, ios::beg); -+ self->GetFile()->seekg(static_cast<long>(self->GetFile()->tellg()) + streamSkip1, ios::beg); - outPtr2 += outIncr[2]; - } diff --git a/math/vtk/files/patch-IO-vtkImageReader.cxx b/math/vtk/files/patch-IO-vtkImageReader.cxx deleted file mode 100644 index 3e302e72af59..000000000000 --- a/math/vtk/files/patch-IO-vtkImageReader.cxx +++ /dev/null @@ -1,30 +0,0 @@ -diff -u -r1.109 -r1.110 ---- IO/vtkImageReader.cxx 2002/12/26 18:18:50 1.109 -+++ IO/vtkImageReader.cxx 2003/10/19 14:38:03 1.110 -@@ -166,7 +166,7 @@ - streamStart += this->GetHeaderSize(idx); - - // error checking -- this->File->seekg((long)streamStart, ios::beg); -+ this->File->seekg(static_cast<long>(streamStart), ios::beg); - if (this->File->fail()) - { - vtkErrorMacro(<< "File operation failed: " << streamStart << ", ext: " -@@ -366,7 +366,7 @@ - // if that happens, store the value in correction and apply later - if (filePos + streamSkip0 >= 0) - { -- self->GetFile()->seekg(self->GetFile()->tellg() + streamSkip0, ios::beg); -+ self->GetFile()->seekg(static_cast<long>(self->GetFile()->tellg()) + streamSkip0, ios::beg); - correction = 0; - } - else -@@ -376,7 +376,7 @@ - outPtr1 += outIncr[1]; - } - // move to the next image in the file and data -- self->GetFile()->seekg(self->GetFile()->tellg() + streamSkip1 + correction, -+ self->GetFile()->seekg(static_cast<long>(self->GetFile()->tellg()) + streamSkip1 + correction, - ios::beg); - outPtr2 += outIncr[2]; - } diff --git a/math/vtk43-headers/pkg-plist b/math/vtk43-headers/pkg-plist index a3b44b953fec..1afb5f167153 100644 --- a/math/vtk43-headers/pkg-plist +++ b/math/vtk43-headers/pkg-plist @@ -1,6 +1,3 @@ -%%DOCSDIR%%/README.html -%%DOCSDIR%%/README.patented-classes -%%DOCSDIR%%/vtkLogo.jpg include/vtk/DICOMParser/DICOMAppHelper.h include/vtk/DICOMParser/DICOMCMakeConfig.h include/vtk/DICOMParser/DICOMCallback.h @@ -12,11 +9,14 @@ include/vtk/DICOMParser/DICOMTypes.h include/vtk/vtk3DS.h include/vtk/vtk3DSImporter.h include/vtk/vtk3DWidget.h +include/vtk/vtkAMRBox.h +include/vtk/vtkAVSucdReader.h include/vtk/vtkAbstractMapper.h include/vtk/vtkAbstractMapper3D.h include/vtk/vtkAbstractPicker.h include/vtk/vtkAbstractPropPicker.h include/vtk/vtkAbstractTransform.h +include/vtk/vtkAbstractVolumeMapper.h include/vtk/vtkActor.h include/vtk/vtkActor2D.h include/vtk/vtkActor2DCollection.h @@ -24,6 +24,8 @@ include/vtk/vtkActorCollection.h include/vtk/vtkAmoebaMinimizer.h include/vtk/vtkAppendFilter.h include/vtk/vtkAppendPolyData.h +include/vtk/vtkApplyFilterCommand.h +include/vtk/vtkApplyFilterCommandInternal.h include/vtk/vtkApproximatingSubdivisionFilter.h include/vtk/vtkArcPlotter.h include/vtk/vtkArrayCalculator.h @@ -91,7 +93,12 @@ include/vtk/vtkColorTransferFunction.h include/vtk/vtkCommand.h include/vtk/vtkCommonInstantiator.h include/vtk/vtkCommunicator.h +include/vtk/vtkCompositeDataCommand.h +include/vtk/vtkCompositeDataIterator.h +include/vtk/vtkCompositeDataSet.h +include/vtk/vtkCompositeDataVisitor.h include/vtk/vtkCompositeManager.h +include/vtk/vtkCompositeRenderManager.h include/vtk/vtkCompositer.h include/vtk/vtkCompressCompositer.h include/vtk/vtkCone.h @@ -122,6 +129,7 @@ include/vtk/vtkDataArray.h include/vtk/vtkDataArrayCollection.h include/vtk/vtkDataArrayCollectionIterator.h include/vtk/vtkDataArraySelection.h +include/vtk/vtkDataArrayTemplate.h include/vtk/vtkDataCompressor.h include/vtk/vtkDataObject.h include/vtk/vtkDataObjectCollection.h @@ -207,7 +215,6 @@ include/vtk/vtkFunctionParser.h include/vtk/vtkFunctionSet.h include/vtk/vtkGESignaReader.h include/vtk/vtkGL2PSExporter.h -include/vtk/vtkGLUTesselatorTriangleFilter.h include/vtk/vtkGaussianCubeReader.h include/vtk/vtkGaussianSplatter.h include/vtk/vtkGeneralTransform.h @@ -227,6 +234,20 @@ include/vtk/vtkGridTransform.h include/vtk/vtkHeap.h include/vtk/vtkHedgeHog.h include/vtk/vtkHexahedron.h +include/vtk/vtkHierarchicalBoxApplyFilterCommand.h +include/vtk/vtkHierarchicalBoxCellDataToPointData.h +include/vtk/vtkHierarchicalBoxContour.h +include/vtk/vtkHierarchicalBoxCutter.h +include/vtk/vtkHierarchicalBoxDataSet.h +include/vtk/vtkHierarchicalBoxDataSetInternal.h +include/vtk/vtkHierarchicalBoxOutlineFilter.h +include/vtk/vtkHierarchicalBoxSource.h +include/vtk/vtkHierarchicalBoxToHierarchicalBoxFilter.h +include/vtk/vtkHierarchicalBoxToPolyDataFilter.h +include/vtk/vtkHierarchicalBoxVisitor.h +include/vtk/vtkHierarchicalDataIterator.h +include/vtk/vtkHierarchicalDataSet.h +include/vtk/vtkHierarchicalDataSetInternal.h include/vtk/vtkHomogeneousTransform.h include/vtk/vtkHull.h include/vtk/vtkHybridInstantiator.h @@ -356,6 +377,7 @@ include/vtk/vtkImageToImageFilter.h include/vtk/vtkImageToImageStencil.h include/vtk/vtkImageToPolyDataFilter.h include/vtk/vtkImageToStructuredPoints.h +include/vtk/vtkImageTracerWidget.h include/vtk/vtkImageTranslateExtent.h include/vtk/vtkImageTwoInputFilter.h include/vtk/vtkImageVariance3D.h @@ -462,7 +484,6 @@ include/vtk/vtkMergeDataObjectFilter.h include/vtk/vtkMergeFields.h include/vtk/vtkMergeFilter.h include/vtk/vtkMergePoints.h -include/vtk/vtkMergePoints2D.h include/vtk/vtkMesaActor.h include/vtk/vtkMesaCamera.h include/vtk/vtkMesaFreeTypeTextMapper.h @@ -472,13 +493,21 @@ include/vtk/vtkMesaLight.h include/vtk/vtkMesaPolyDataMapper.h include/vtk/vtkMesaPolyDataMapper2D.h include/vtk/vtkMesaProperty.h +include/vtk/vtkMesaRayCastImageDisplayHelper.h include/vtk/vtkMesaRenderWindow.h include/vtk/vtkMesaRenderer.h include/vtk/vtkMesaTexture.h include/vtk/vtkMesaVolumeRayCastMapper.h include/vtk/vtkMesaVolumeTextureMapper2D.h include/vtk/vtkMeshQuality.h +include/vtk/vtkMetaImageReader.h +include/vtk/vtkMetaImageWriter.h include/vtk/vtkMoleculeReaderBase.h +include/vtk/vtkMultiBlockApplyFilterCommand.h +include/vtk/vtkMultiBlockDataIterator.h +include/vtk/vtkMultiBlockDataSet.h +include/vtk/vtkMultiBlockDataSetInternal.h +include/vtk/vtkMultiBlockDataVisitor.h include/vtk/vtkMultiPartExtentTranslator.h include/vtk/vtkMultiProcessController.h include/vtk/vtkMultiProcessLog.h @@ -506,6 +535,7 @@ include/vtk/vtkOpenGLLight.h include/vtk/vtkOpenGLPolyDataMapper.h include/vtk/vtkOpenGLPolyDataMapper2D.h include/vtk/vtkOpenGLProperty.h +include/vtk/vtkOpenGLRayCastImageDisplayHelper.h include/vtk/vtkOpenGLRenderWindow.h include/vtk/vtkOpenGLRenderer.h include/vtk/vtkOpenGLStateCache.h @@ -549,6 +579,7 @@ include/vtk/vtkPStreamTracer.h include/vtk/vtkParallelCoordinatesActor.h include/vtk/vtkParallelFactory.h include/vtk/vtkParallelInstantiator.h +include/vtk/vtkParallelRenderManager.h include/vtk/vtkParticleReader.h include/vtk/vtkPassThroughFilter.h include/vtk/vtkPatentedInstantiator.h @@ -567,11 +598,11 @@ include/vtk/vtkPlaneCollection.h include/vtk/vtkPlaneSource.h include/vtk/vtkPlaneWidget.h include/vtk/vtkPlanes.h +include/vtk/vtkPlatonicSolidSource.h include/vtk/vtkPointData.h include/vtk/vtkPointDataToCellData.h include/vtk/vtkPointLoad.h include/vtk/vtkPointLocator.h -include/vtk/vtkPointLocator2D.h include/vtk/vtkPointPicker.h include/vtk/vtkPointSet.h include/vtk/vtkPointSetSource.h @@ -634,6 +665,7 @@ include/vtk/vtkRIBExporter.h include/vtk/vtkRIBLight.h include/vtk/vtkRIBProperty.h include/vtk/vtkRTAnalyticSource.h +include/vtk/vtkRayCastImageDisplayHelper.h include/vtk/vtkRayCastStructures.h include/vtk/vtkRearrangeFields.h include/vtk/vtkRectilinearGrid.h @@ -703,6 +735,7 @@ include/vtk/vtkSpline.h include/vtk/vtkSplineFilter.h include/vtk/vtkSplineWidget.h include/vtk/vtkSplitField.h +include/vtk/vtkStdString.h include/vtk/vtkStreamLine.h include/vtk/vtkStreamPoints.h include/vtk/vtkStreamTracer.h @@ -726,6 +759,7 @@ include/vtk/vtkStructuredPointsToPolyDataFilter.h include/vtk/vtkStructuredPointsToStructuredPointsFilter.h include/vtk/vtkStructuredPointsToUnstructuredGridFilter.h include/vtk/vtkStructuredPointsWriter.h +include/vtk/vtkStructuredVisibilityConstraint.h include/vtk/vtkSubPixelPositionEdgels.h include/vtk/vtkSubdivideTetra.h include/vtk/vtkSuperquadric.h @@ -742,6 +776,7 @@ include/vtk/vtkTcl.h include/vtk/vtkTclUtil.h include/vtk/vtkTensor.h include/vtk/vtkTensorGlyph.h +include/vtk/vtkTesting.h include/vtk/vtkTetra.h include/vtk/vtkTextActor.h include/vtk/vtkTextMapper.h @@ -781,15 +816,20 @@ include/vtk/vtkTriangularTCoords.h include/vtk/vtkTriangularTexture.h include/vtk/vtkTubeFilter.h include/vtk/vtkUGFacetReader.h +include/vtk/vtkUniformGrid.h include/vtk/vtkUnsignedCharArray.h include/vtk/vtkUnsignedIntArray.h include/vtk/vtkUnsignedLongArray.h include/vtk/vtkUnsignedShortArray.h include/vtk/vtkUnstructuredGrid.h +include/vtk/vtkUnstructuredGridBunykRayCastFunction.h include/vtk/vtkUnstructuredGridReader.h include/vtk/vtkUnstructuredGridSource.h include/vtk/vtkUnstructuredGridToPolyDataFilter.h include/vtk/vtkUnstructuredGridToUnstructuredGridFilter.h +include/vtk/vtkUnstructuredGridVolumeMapper.h +include/vtk/vtkUnstructuredGridVolumeRayCastFunction.h +include/vtk/vtkUnstructuredGridVolumeRayCastMapper.h include/vtk/vtkUnstructuredGridWriter.h include/vtk/vtkVRML.h include/vtk/vtkVRMLExporter.h @@ -830,10 +870,8 @@ include/vtk/vtkWarpVector.h include/vtk/vtkWedge.h include/vtk/vtkWeightedTransformFilter.h include/vtk/vtkWin32Header.h -include/vtk/vtkWin32ImageMapper.h include/vtk/vtkWin32OpenGLRenderWindow.h include/vtk/vtkWin32OutputWindow.h -include/vtk/vtkWin32PolyDataMapper2D.h include/vtk/vtkWin32RenderWindowInteractor.h include/vtk/vtkWin32VideoSource.h include/vtk/vtkWinCE.h @@ -887,7 +925,6 @@ include/vtk/vtkXMLUtilities.h include/vtk/vtkXMLWriter.h include/vtk/vtkXMesaRenderWindow.h include/vtk/vtkXOpenGLRenderWindow.h -include/vtk/vtkXPolyDataMapper2D.h include/vtk/vtkXRenderWindowInteractor.h include/vtk/vtkXRenderWindowTclInteractor.h include/vtk/vtkXYPlotActor.h @@ -907,6 +944,19 @@ include/vtk/vtkstd/stack include/vtk/vtkstd/string include/vtk/vtkstd/utility include/vtk/vtkstd/vector +lib/vtk/CMake/libcmVTK_GENERATE_JAVA_DEPENDENCIES.so +lib/vtk/CMake/libcmVTK_MAKE_INSTANTIATOR2.so +lib/vtk/CMake/libcmVTK_WRAP_JAVA2.so +lib/vtk/CMake/libcmVTK_WRAP_PYTHON2.so +lib/vtk/CMake/libcmVTK_WRAP_TCL2.so +lib/vtk/CMake/vtkLoadCMakeExtensions.cmake +lib/vtk/UseVTK.cmake +lib/vtk/VTKBuildSettings.cmake +lib/vtk/VTKConfig.cmake +lib/vtk/VTKLibraryDepends.cmake +%%DOCSDIR%%/README.html +%%DOCSDIR%%/README.patented-classes +%%DOCSDIR%%/vtkLogo.jpg share/vtk/doxygen/authors.txt share/vtk/doxygen/doc_class2example.pl share/vtk/doxygen/doc_cleanhtml.pl @@ -927,18 +977,9 @@ share/vtk/doxygen/header.html share/vtk/doxygen/paper-clip.gif share/vtk/doxygen/pic.gif share/vtk/doxygen/vtk-logo.gif -lib/vtk/CMake/libcmVTK_GENERATE_JAVA_DEPENDENCIES.so -lib/vtk/CMake/libcmVTK_MAKE_INSTANTIATOR2.so -lib/vtk/CMake/libcmVTK_WRAP_JAVA2.so -lib/vtk/CMake/libcmVTK_WRAP_PYTHON2.so -lib/vtk/CMake/libcmVTK_WRAP_TCL2.so -lib/vtk/CMake/vtkLoadCMakeExtensions.cmake -lib/vtk/UseVTK.cmake -lib/vtk/VTKBuildSettings.cmake -lib/vtk/VTKConfig.cmake -lib/vtk/VTKLibraryDepends.cmake @dirrm share/vtk/doxygen @unexec rmdir %D/share/vtk 2>/dev/null || true +@dirrm %%DOCSDIR%% @dirrm lib/vtk/CMake @unexec rmdir %D/lib/vtk 2>/dev/null || true @dirrm include/vtk/vtkstd diff --git a/math/vtk43/Makefile b/math/vtk43/Makefile index fa2768748f59..122912f1cc0d 100644 --- a/math/vtk43/Makefile +++ b/math/vtk43/Makefile @@ -14,11 +14,10 @@ # PORTNAME= vtk -PORTVERSION= 4.3.0 -PORTREVISION= 3 +PORTVERSION= 4.4 CATEGORIES= math graphics MASTER_SITES= http://ovt.irfu.se/vtk/files/ -DISTFILES?= VTK-${PORTVERSION}-cvs${CVSDATE}.tar.gz +DISTFILES?= VTK-${PORTVERSION}-LatestRelease.tar.gz MAINTAINER= ko@irfu.se COMMENT?= The Visualization Toolkit shared libs @@ -26,14 +25,12 @@ COMMENT?= The Visualization Toolkit shared libs USE_REINPLACE= yes LIBVER= 1 -CVSDATE= 20031006 VTKSRCDIR= ${WRKDIR}/VTK TESTINGDIR= ${EXAMPLESDIR}/Testing VTKDATAROOT= ${EXAMPLESDIR}/VTKData -DOCSDIR= ${PREFIX}/share/doc/${PKGNAME} +DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX} PLIST= ${.CURDIR}/pkg-plist FILESDIR= ${.CURDIR}/files -RESTRICTED= yes VTK_KITS= Common Filtering Graphics Hybrid IO Imaging Rendering Parallel Patented @@ -58,33 +55,17 @@ 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 -# if optimization flag -O2 or -O3 is present - use g++33 -# There is a problem 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 - -.if ${OSVERSION} < 500016 -ADDITIONAL_EXE_LINKER_FLAGS= ${PTHREAD_LIBS} -.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} ${ADDITIONAL_EXE_LINKER_FLAGS}" \ + -DCMAKE_EXE_LINKER_FLAGS:STRING="${LINKERFLAGS} ${PTHREAD_LIBS}" \ -DCMAKE_THREAD_LIBS:STRING="${PTHREAD_LIBS}"\ -DCMAKE_USE_PTHREADS:BOOL=ON \ -DCMAKE_C_COMPILER:STRING='${CC}' \ diff --git a/math/vtk43/distinfo b/math/vtk43/distinfo index fb18f97f093d..e10d1193a779 100644 --- a/math/vtk43/distinfo +++ b/math/vtk43/distinfo @@ -1,2 +1,2 @@ -MD5 (VTK-4.3.0-cvs20031006.tar.gz) = 6c574972eb41c9d287fb540811d85e3a -SIZE (VTK-4.3.0-cvs20031006.tar.gz) = 6367112 +MD5 (VTK-4.4-LatestRelease.tar.gz) = 17a5006c4d7acca3e74d32e0e27f4739 +SIZE (VTK-4.4-LatestRelease.tar.gz) = 6323955 diff --git a/math/vtk43/files/patch-IO-vtkBMPReader.cxx b/math/vtk43/files/patch-IO-vtkBMPReader.cxx deleted file mode 100644 index f82deeb825e5..000000000000 --- a/math/vtk43/files/patch-IO-vtkBMPReader.cxx +++ /dev/null @@ -1,16 +0,0 @@ -diff -u -r1.44 -r1.45 ---- IO/vtkBMPReader.cxx 2003/09/10 19:41:56 1.44 -+++ IO/vtkBMPReader.cxx 2003/10/19 14:38:03 1.45 -@@ -504,11 +504,11 @@ - outPtr0 += outIncr[0]; - } - // move to the next row in the file and data -- self->GetFile()->seekg(self->GetFile()->tellg() + streamSkip0, ios::beg); -+ self->GetFile()->seekg(static_cast<long>(self->GetFile()->tellg()) + streamSkip0, ios::beg); - outPtr1 += outIncr[1]; - } - // move to the next image in the file and data -- self->GetFile()->seekg(self->GetFile()->tellg() + streamSkip1, ios::beg); -+ self->GetFile()->seekg(static_cast<long>(self->GetFile()->tellg()) + streamSkip1, ios::beg); - outPtr2 += outIncr[2]; - } diff --git a/math/vtk43/files/patch-IO-vtkImageReader.cxx b/math/vtk43/files/patch-IO-vtkImageReader.cxx deleted file mode 100644 index 3e302e72af59..000000000000 --- a/math/vtk43/files/patch-IO-vtkImageReader.cxx +++ /dev/null @@ -1,30 +0,0 @@ -diff -u -r1.109 -r1.110 ---- IO/vtkImageReader.cxx 2002/12/26 18:18:50 1.109 -+++ IO/vtkImageReader.cxx 2003/10/19 14:38:03 1.110 -@@ -166,7 +166,7 @@ - streamStart += this->GetHeaderSize(idx); - - // error checking -- this->File->seekg((long)streamStart, ios::beg); -+ this->File->seekg(static_cast<long>(streamStart), ios::beg); - if (this->File->fail()) - { - vtkErrorMacro(<< "File operation failed: " << streamStart << ", ext: " -@@ -366,7 +366,7 @@ - // if that happens, store the value in correction and apply later - if (filePos + streamSkip0 >= 0) - { -- self->GetFile()->seekg(self->GetFile()->tellg() + streamSkip0, ios::beg); -+ self->GetFile()->seekg(static_cast<long>(self->GetFile()->tellg()) + streamSkip0, ios::beg); - correction = 0; - } - else -@@ -376,7 +376,7 @@ - outPtr1 += outIncr[1]; - } - // move to the next image in the file and data -- self->GetFile()->seekg(self->GetFile()->tellg() + streamSkip1 + correction, -+ self->GetFile()->seekg(static_cast<long>(self->GetFile()->tellg()) + streamSkip1 + correction, - ios::beg); - outPtr2 += outIncr[2]; - } diff --git a/math/vtk5/Makefile b/math/vtk5/Makefile index fa2768748f59..122912f1cc0d 100644 --- a/math/vtk5/Makefile +++ b/math/vtk5/Makefile @@ -14,11 +14,10 @@ # PORTNAME= vtk -PORTVERSION= 4.3.0 -PORTREVISION= 3 +PORTVERSION= 4.4 CATEGORIES= math graphics MASTER_SITES= http://ovt.irfu.se/vtk/files/ -DISTFILES?= VTK-${PORTVERSION}-cvs${CVSDATE}.tar.gz +DISTFILES?= VTK-${PORTVERSION}-LatestRelease.tar.gz MAINTAINER= ko@irfu.se COMMENT?= The Visualization Toolkit shared libs @@ -26,14 +25,12 @@ COMMENT?= The Visualization Toolkit shared libs USE_REINPLACE= yes LIBVER= 1 -CVSDATE= 20031006 VTKSRCDIR= ${WRKDIR}/VTK TESTINGDIR= ${EXAMPLESDIR}/Testing VTKDATAROOT= ${EXAMPLESDIR}/VTKData -DOCSDIR= ${PREFIX}/share/doc/${PKGNAME} +DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX} PLIST= ${.CURDIR}/pkg-plist FILESDIR= ${.CURDIR}/files -RESTRICTED= yes VTK_KITS= Common Filtering Graphics Hybrid IO Imaging Rendering Parallel Patented @@ -58,33 +55,17 @@ 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 -# if optimization flag -O2 or -O3 is present - use g++33 -# There is a problem 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 - -.if ${OSVERSION} < 500016 -ADDITIONAL_EXE_LINKER_FLAGS= ${PTHREAD_LIBS} -.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} ${ADDITIONAL_EXE_LINKER_FLAGS}" \ + -DCMAKE_EXE_LINKER_FLAGS:STRING="${LINKERFLAGS} ${PTHREAD_LIBS}" \ -DCMAKE_THREAD_LIBS:STRING="${PTHREAD_LIBS}"\ -DCMAKE_USE_PTHREADS:BOOL=ON \ -DCMAKE_C_COMPILER:STRING='${CC}' \ diff --git a/math/vtk5/distinfo b/math/vtk5/distinfo index fb18f97f093d..e10d1193a779 100644 --- a/math/vtk5/distinfo +++ b/math/vtk5/distinfo @@ -1,2 +1,2 @@ -MD5 (VTK-4.3.0-cvs20031006.tar.gz) = 6c574972eb41c9d287fb540811d85e3a -SIZE (VTK-4.3.0-cvs20031006.tar.gz) = 6367112 +MD5 (VTK-4.4-LatestRelease.tar.gz) = 17a5006c4d7acca3e74d32e0e27f4739 +SIZE (VTK-4.4-LatestRelease.tar.gz) = 6323955 diff --git a/math/vtk5/files/patch-IO-vtkBMPReader.cxx b/math/vtk5/files/patch-IO-vtkBMPReader.cxx deleted file mode 100644 index f82deeb825e5..000000000000 --- a/math/vtk5/files/patch-IO-vtkBMPReader.cxx +++ /dev/null @@ -1,16 +0,0 @@ -diff -u -r1.44 -r1.45 ---- IO/vtkBMPReader.cxx 2003/09/10 19:41:56 1.44 -+++ IO/vtkBMPReader.cxx 2003/10/19 14:38:03 1.45 -@@ -504,11 +504,11 @@ - outPtr0 += outIncr[0]; - } - // move to the next row in the file and data -- self->GetFile()->seekg(self->GetFile()->tellg() + streamSkip0, ios::beg); -+ self->GetFile()->seekg(static_cast<long>(self->GetFile()->tellg()) + streamSkip0, ios::beg); - outPtr1 += outIncr[1]; - } - // move to the next image in the file and data -- self->GetFile()->seekg(self->GetFile()->tellg() + streamSkip1, ios::beg); -+ self->GetFile()->seekg(static_cast<long>(self->GetFile()->tellg()) + streamSkip1, ios::beg); - outPtr2 += outIncr[2]; - } diff --git a/math/vtk5/files/patch-IO-vtkImageReader.cxx b/math/vtk5/files/patch-IO-vtkImageReader.cxx deleted file mode 100644 index 3e302e72af59..000000000000 --- a/math/vtk5/files/patch-IO-vtkImageReader.cxx +++ /dev/null @@ -1,30 +0,0 @@ -diff -u -r1.109 -r1.110 ---- IO/vtkImageReader.cxx 2002/12/26 18:18:50 1.109 -+++ IO/vtkImageReader.cxx 2003/10/19 14:38:03 1.110 -@@ -166,7 +166,7 @@ - streamStart += this->GetHeaderSize(idx); - - // error checking -- this->File->seekg((long)streamStart, ios::beg); -+ this->File->seekg(static_cast<long>(streamStart), ios::beg); - if (this->File->fail()) - { - vtkErrorMacro(<< "File operation failed: " << streamStart << ", ext: " -@@ -366,7 +366,7 @@ - // if that happens, store the value in correction and apply later - if (filePos + streamSkip0 >= 0) - { -- self->GetFile()->seekg(self->GetFile()->tellg() + streamSkip0, ios::beg); -+ self->GetFile()->seekg(static_cast<long>(self->GetFile()->tellg()) + streamSkip0, ios::beg); - correction = 0; - } - else -@@ -376,7 +376,7 @@ - outPtr1 += outIncr[1]; - } - // move to the next image in the file and data -- self->GetFile()->seekg(self->GetFile()->tellg() + streamSkip1 + correction, -+ self->GetFile()->seekg(static_cast<long>(self->GetFile()->tellg()) + streamSkip1 + correction, - ios::beg); - outPtr2 += outIncr[2]; - } |