Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/sci
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27862

Modified Files:
        hivision.info hivision.patch vtk.info 
Added Files:
        mayavi.info pyvtk-py23.info vtk-py23.info vtk-py23.patch 
Log Message:
New packages mayavi and vtk-py23 (=vtk-4.4). Moved vtk (=vtk-4.2) to new directory 
structure so versions 4.2 and 4.4 can coexist. Adapted hivision.

--- NEW FILE: mayavi.info ---
Package: mayavi
Version: 1.3
Revision: 2
Source: mirror:sourceforge:%n/MayaVi-%v.tar.gz
Source-MD5: 38ae9dbe09a6bdb35289d8d6d98c65ba
License: BSD
GCC: 3.3
Depends: python23, x11, x11-shlibs, tcltk, tcltk-shlibs, vtk-py23
BuildDepends: x11-dev
CompileScript: true 
InstallScript: <<
 %p/bin/python2.3 setup.py install --verbose --root=%d
 /usr/bin/install -d %i/share/doc/%n
 /bin/cp -R doc/* %i/share/doc/%n/
<<
Description: Free, easy to use scientific data visualizer 
DescDetail: << 
 MayaVi is a scientific visualization system written in Python.  
 It uses The Visualization Toolkit for the graphics.  It also provides
 modules which are a handy interface to the VTK internals in Python.
 It features an easy to use GUI, and lets you save the visualized
 scene to PostScript file, PPM/BMP/TIFF/JPEG/PNG image, Open Inventor,
 Geomview OOGL, VRML or RenderMan RIB files.
<<
DescPort: <<
 Uses X11 and the Fink packages tcltk, python23, vtk-py23.
<<
Maintainer: Martin Costabel <[EMAIL PROTECTED]>
Homepage: http://mayavi.sourceforge.net/

--- NEW FILE: pyvtk-py23.info ---
Package: pyvtk-py23
Version: 0.4.67
Revision: 1
Depends: python23
Suggests: vtk-py23
Source: http://cens.ioc.ee/projects/pyvtk/rel-0.x/PyVTK-%v.tar.gz
Source-MD5: 3e58e090fc2fad826e2bf628439fe601 
CompileScript: python2.3 setup.py build   
InstallScript: <<
 python2.3 setup.py install --prefix=%i
 mkdir -p %i/share/doc/%n
 cp -R examples %i/share/doc/%n
<<
License: LGPL
DocFiles: README.txt doc/index.html 
Description: Tools for manipulating Visualization Toolkit files in Python
DescDetail: <<
PyVTK provides the following tools for manipulating Visualization Toolkit (VTK) files 
in Python:
Create VTK file from Python objects. It fully supports VTK File Formats Standard 2.0. 
The features include:

- ascii and binary output, ascii input from VTK file
- DataSet formats: StructuredPoints, StructuredGrid, RectilinearGrid, PolyData, 
UnstructuredGrid
- Data formats: PointData, CellData
- DataSetAttr formats: Scalars, ColorScalars, LookupTable, Vectors, Normals, 
TextureCoordinates, Tensors, Field
<<
Maintainer: Martin Costabel <[EMAIL PROTECTED]>
Homepage: http://cens.ioc.ee/projects/pyvtk/

--- NEW FILE: vtk-py23.info ---
Package: vtk-py23
Version: 4.4.0
Revision: 3
Source: http://www.vtk.org/files/release/4.4/VTK-%v.tar.gz
Source-MD5: 8db586018e08a112973235a62103aa39
SourceDirectory: VTK
License: GPL
GCC: 3.3
Depends: x11, x11-shlibs, tcltk, tcltk-shlibs, expat-shlibs, libpng3-shlibs, 
libtiff-shlibs, libjpeg-shlibs, python23, python
BuildDepends: cmake (>= 1.8.2-1), x11-dev, tcltk-dev, expat, libpng3, libtiff, 
libjpeg, x11-dev
#Provides: vtk
Conflicts: vtk (<= 4.2.5-2)
Replaces: vtk (<=4.2.5-2)
Recommends: vtkdata
PatchScript: <<
 perl -pi.bak -e 's|/usr/local/lib|%p/lib/vtk|g' 
Wrapping/Python/vtk/tk/vtkLoadPythonTkWidgets.py
 perl -pi.bak -e 's|/usr/local|%p|g' Wrapping/Tcl/vtkbase/vtkbase.tcl
 perl -pi.bak -e 's|(\-no\-cpp\-precomp)|\-O3 \-mcpu=G3 \-mtune=G4 \-funroll\-loops 
\-Wno\-long\-double $1|g' CMakeLists.txt
<<
CompileScript: <<
#!/bin/sh
 %p/bin/cmake -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
       -DBUILD_SHARED_LIBS:BOOL=ON \
       -DCMAKE_SHARED_LINKER_FLAGS:STRING="-L%p/lib -install_name 
%p/lib/vtk/\`basename <TARGET>\`" \
       -DCMAKE_INSTALL_PREFIX:PATH=%p \
       -DVTK_USE_CARBON:BOOL=OFF \
       -DVTK_USE_COCOA:BOOL=OFF \
       -DVTK_USE_HYBRID:BOOL=ON \
       -DVTK_USE_X:BOOL=ON \
       -DCMAKE_X_LIBS:STRING="-lSM;-lICE;-lX11;-lXext" \
       -DVTK_WRAP_TCL:BOOL=ON \
       -DTCL_INCLUDE_PATH:PATH=%p/include \
       -DTCL_LIBRARY:FILEPATH=%p/lib/libtcl.dylib \
       -DTK_INCLUDE_PATH:PATH=%p/include \
       -DTK_INTERNAL_PATH:PATH=%p/include/vtk/tkInternals/tk84OSX \
       -DVTK_WRAP_JAVA:BOOL=OFF \
       -DVTK_WRAP_PYTHON:BOOL=ON \
       -DPYTHON_EXECUTABLE:FILEPATH=%p/bin/python2.3 \
       -DPYTHON_INCLUDE_PATH:PATH=%p/include/python2.3 \
       -DPYTHON_LIBRARY:FILEPATH=%p/lib/python2.3/config/libpython2.3.dylib \
       -DPYTHON_DEBUG_LIBRARY:FILEPATH=%p/lib/python2.3/config/libpython2.3.dylib \
       -DOPENGL_gl_LIBRARY:STRING="-lGL" \
       -DOPENGL_glu_LIBRARY:STRING="-lGLU" \
       -DOPENGL_xmesa_INCLUDE_DIR:PATH=/usr/X11R6/include \
       -DVTK_USE_SYSTEM_EXPAT:BOOL=ON \
       -DEXPAT_INCLUDE_DIR:PATH=%p/include \
       -DEXPAT_LIBRARY:FILEPATH=%p/lib/libexpat.dylib \
       -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=%p/share/VTKData \
       -DVTK_USE_PARALLEL:BOOL=ON \
       -DVTK_USE_PATENTED:BOOL=ON \
       -DVTK_USE_GL2PS:BOOL=OON \
       .
 make
<< 
InstallScript: <<
#!/bin/sh
 make install DESTDIR=%d
 pushd Wrapping/Python
 %p/bin/python2.3 setup.py install --root=%d
 if test -L %i/lib/python2.3/site-packages/vtk_python/libvtkCommonPython.so; then
    echo symlinks seem OK
 else
    echo creating forgotten symlinks
    for kit in Common Filtering Graphics Hybrid IO Imaging Parallel Patented 
Rendering; do
        ln -s %p/lib/vtk/libvtk${kit}Python.so 
%i/lib/python2.3/site-packages/vtk_python/
    done
 fi
 popd
 /usr/bin/install -d %i/share/doc/%n
 /bin/cp -R Examples %i/share/doc/%n/
 /usr/bin/install -d %i/etc/profile.d
 cat >%i/etc/profile.d/vtk.sh <<EOF
export TCLLIBPATH="%p/lib/vtk/tcl/ \$TCLLIBPATH"
EOF
 cat >%i/etc/profile.d/vtk.csh <<EOF
if ( ! \$?TCLLIBPATH ) then
   setenv TCLLIBPATH "%p/lib/vtk/tcl/"
else
   setenv TCLLIBPATH "%p/lib/vtk/tcl/ \$TCLLIBPATH"
endif
EOF
 chmod 755 %i/etc/profile.d/vtk.*
<<
DocFiles: Copyright.txt  
Description: The Visualization ToolKit
DescDetail: << 
The Visualization ToolKit (VTK) is an open source, freely available software
system for 3D computer graphics, image processing, and visualization used by
thousands of researchers and developers around the world. VTK consists of a
C++ class library, and several interpreted interface layers including
Tcl/Tk, Java, and Python. 

VTK supports a wide variety of visualization algorithms including scalar,
vector, tensor, texture, and volumetric methods; and advanced modeling
techniques such as implicit modelling, polygon reduction, mesh smoothing,
cutting, contouring, and Delaunay triangulation. In addition, dozens of
imaging algorithms have been directly integrated to allow the user to mix 2D
imaging / 3D graphics algorithms and data. The design and implementation of
the library has been strongly influenced by object-oriented principles. VTK
has been installed and tested on nearly every Unix-based platform, PCs
(Windows 98/ME/NT/2000/XP), and Mac OSX Jaguar or later.
<<
DescUsage: <<
 This version uses X11 and Fink's Tcl/Tk.
 Examples are provided in the share/doc/vtk-py/Examples folder.
 To run them, use "vtk Tutorial/Step1/Tcl/Cone.tcl", for example. 
 For some of them, you need the vtkdata package.
 For documentation see the vtk web site. 
<<
DescPort: <<
 Java wrapper disabled in this version. 
 
 Python wrapper should work in this version. It uses Fink's python23 package.
 Mayavi should work with this version, too.
 The dylibs are created with compat version 0.0.0, because I don't know
 how to teach the cmake build system about compatibility versions.
 It is bad enough already to get them a decent install_name.
 Since they have no version numbers, there is no shlibs splitoff yet.

 The vtk (>= 4.2.5-3) package installs now into /sw/{bin,include,lib}/vtk-4.2, so it
 should be able to coexist with this version.
<<
Maintainer: Martin Costabel <[EMAIL PROTECTED]>
Homepage: http://www.vtk.org/

--- NEW FILE: vtk-py23.patch ---
--- /sw/src/vtk-4.2.5-1/VTK/Common/CMakeLists.txt       Fri Dec 19 21:01:24 2003
+++ VTK/Common/CMakeLists.txt   Thu Jan  8 16:31:22 2004
@@ -1,4 +1,18 @@
-SET( Common_SRCS
+SET(KIT Common)
+SET(UKIT COMMON)
+SET(KIT_TCL_LIBS ${TCL_LIBRARY})
+SET(KIT_PYTHON_LIBS)
+SET(KIT_JAVA_LIBS)
+SET(KIT_LIBS)
+
+IF (APPLE)
+  SET(KIT_LIBS ${KIT_LIBS} "-framework AppKit")
+ENDIF (APPLE)
+IF (UNIX)
+  SET(KIT_LIBS ${KIT_LIBS} ${CMAKE_THREAD_LIBS} ${CMAKE_DL_LIBS} -lm)
+ENDIF (UNIX)
+
+SET( Kit_SRCS
 vtkAbstractMapper.cxx
 vtkAbstractTransform.cxx
 vtkActor2D.cxx
@@ -8,6 +22,7 @@
 vtkAssemblyPath.cxx
 vtkAssemblyPaths.cxx
 vtkBitArray.cxx
+vtkBox.cxx
 vtkByteSwap.cxx
 vtkCallbackCommand.cxx
 vtkCell.cxx
@@ -20,6 +35,10 @@
 vtkCollection.cxx
 vtkCollectionIterator.cxx
 vtkCommand.cxx
+vtkCompositeDataIterator.cxx
+vtkCompositeDataSet.cxx
+vtkCompositeDataVisitor.cxx
+vtkCompositeDataCommand.cxx
 vtkContourValues.cxx
 vtkConvexPointSet.cxx
 vtkCoordinate.cxx
@@ -43,6 +62,7 @@
 vtkEmptyCell.cxx
 vtkErrorCode.cxx
 vtkExplicitCell.cxx
+vtkExtentSplitter.cxx
 vtkExtentTranslator.cxx
 vtkFieldData.cxx
 vtkFileOutputWindow.cxx
@@ -53,6 +73,10 @@
 vtkGenericCell.cxx
 vtkHeap.cxx
 vtkHexahedron.cxx
+vtkHierarchicalBoxDataSet.cxx
+vtkHierarchicalBoxVisitor.cxx
+vtkHierarchicalDataSet.cxx
+vtkHierarchicalDataIterator.cxx
 vtkHomogeneousTransform.cxx
 vtkIdList.cxx
 vtkIdListCollection.cxx
@@ -81,6 +105,9 @@
 vtkMatrix4x4.cxx
 vtkMatrixToHomogeneousTransform.cxx
 vtkMatrixToLinearTransform.cxx
+vtkMultiBlockDataIterator.cxx
+vtkMultiBlockDataSet.cxx
+vtkMultiBlockDataVisitor.cxx
 vtkMultiPartExtentTranslator.cxx
 vtkMultiThreader.cxx
 vtkMutexLock.cxx
@@ -119,9 +146,11 @@
 vtkQuad.cxx
 vtkQuadraticEdge.cxx
 vtkQuadraticHexahedron.cxx
+vtkQuadraticPyramid.cxx
 vtkQuadraticQuad.cxx
 vtkQuadraticTetra.cxx
 vtkQuadraticTriangle.cxx
+vtkQuadraticWedge.cxx
 vtkQuadric.cxx
 vtkRectilinearGrid.cxx
 vtkReferenceCount.cxx
@@ -133,9 +162,11 @@
 vtkSmartPointerBase.cxx
 vtkSource.cxx
 vtkSphericalTransform.cxx
+vtkStdString.cxx
 vtkStructuredData.cxx
 vtkStructuredGrid.cxx
 vtkStructuredPoints.cxx
+vtkStructuredVisibilityConstraint.cxx
 vtkTableExtentTranslator.cxx
 vtkTensor.cxx
 vtkTetra.cxx
@@ -145,6 +176,7 @@
 vtkTransformCollection.cxx
 vtkTriangle.cxx
 vtkTriangleStrip.cxx
+vtkUniformGrid.cxx
 vtkUnsignedCharArray.cxx
 vtkUnsignedIntArray.cxx
 vtkUnsignedLongArray.cxx
@@ -162,19 +194,29 @@
 vtkXMLFileOutputWindow.cxx
 )
 
+IF (WIN32)
+  IF (NOT VTK_USE_X)
+    SET(Kit_SRCS ${Kit_SRCS} vtkWin32OutputWindow.cxx)
+  ENDIF (NOT VTK_USE_X)
+ENDIF (WIN32)
 
-# vtkObjectBase is marked ABSTRACT so that instantiators are happy.
 SET_SOURCE_FILES_PROPERTIES(
+# vtkObjectBase is marked ABSTRACT so that instantiators are happy.
 vtkAbstractMapper
 vtkAbstractTransform
 vtkCallbackCommand
 vtkCell
 vtkCell3D
 vtkCommand
+vtkCompositeDataIterator
+vtkCompositeDataSet
+vtkCompositeDataVisitor
+vtkCompositeDataCommand
 vtkDataArray
 vtkDataSet
 vtkExplicitCell
 vtkFunctionSet
+vtkHierarchicalDataSet
 vtkHomogeneousTransform
 vtkImplicitFunction
 vtkInitialValueProblemSolver
@@ -199,121 +241,167 @@
 ABSTRACT
 )
 
-IF (WIN32)
-  SET(Common_SRCS ${Common_SRCS} vtkWin32OutputWindow.cxx)
-ENDIF (WIN32)
-
 SET_SOURCE_FILES_PROPERTIES(
-  vtkCallbackCommand
-  vtkCommand
-  vtkDebugLeaksManager
-  vtkErrorCode
+  vtkCallbackCommand.cxx
+  vtkCommand.cxx
+  vtkDebugLeaksManager.cxx
+  vtkErrorCode.cxx
   vtkIdType.cxx
-  vtkImageIterator
-  vtkImageProgressIterator
-  vtkLargeInteger
+  vtkImageIterator.cxx
+  vtkImageProgressIterator.cxx
+  vtkIndent.cxx
+  vtkLargeInteger.cxx
   vtkOStrStreamWrapper.cxx
   vtkOStreamWrapper.cxx
-  vtkOldStyleCallbackCommand
+  vtkOldStyleCallbackCommand.cxx
   vtkSmartPointerBase.cxx
+  vtkStdString.cxx
+  vtkTimeStamp.cxx
   WRAP_EXCLUDE
 )
 
+SET(Kit_EXTRA_SRCS)
+SET(Kit_EXTRA_CMDS)
+SET(Kit_TCL_EXTRA_SRCS vtkTclUtil.cxx)
+SET(Kit_PYTHON_EXTRA_SRCS vtkPythonUtil.cxx)
+SET(Kit_JAVA_EXTRA_SRCS vtkJavaUtil.cxx)
+
+# -----------------------------------------------------------------
+# Start of common section
+
 # Setup vtkInstantiator registration for this library's classes.
-VTK_MAKE_INSTANTIATOR2(vtkCommonInstantiator CommonInstantiator_SRCS
-                       ${Common_SRCS}
-                       EXPORT_MACRO VTK_COMMON_EXPORT
+VTK_MAKE_INSTANTIATOR2(vtk${KIT}Instantiator KitInstantiator_SRCS
+                       ${Kit_SRCS}
+                       EXPORT_MACRO VTK_${UKIT}_EXPORT
                        HEADER_LOCATION ${VTK_BINARY_DIR})
 
-ADD_LIBRARY(vtkCommon ${Common_SRCS} ${CommonInstantiator_SRCS})
+ADD_LIBRARY(vtk${KIT} ${Kit_SRCS} ${Kit_EXTRA_SRCS} ${KitInstantiator_SRCS})
 
 IF(VTK_APPLE_SHARED_FLAGS_NEEDED)
-  SET_TARGET_PROPERTIES(vtkCommon PROPERTIES LINK_FLAGS "-init _oft_initCom")
+  SET_TARGET_PROPERTIES(vtk${KIT} PROPERTIES LINK_FLAGS "-init _oft_init${KIT}")
 ENDIF(VTK_APPLE_SHARED_FLAGS_NEEDED)
-IF (APPLE)
-  TARGET_LINK_LIBRARIES(vtkCommon "-framework AppKit")
-ENDIF (APPLE)
-
-IF (UNIX)
-  TARGET_LINK_LIBRARIES(vtkCommon ${CMAKE_THREAD_LIBS} ${CMAKE_DL_LIBS} -lm)
-ENDIF (UNIX)
 
 # Allow the user to customize their build with some local options
 #
-INCLUDE (${VTK_BINARY_DIR}/Common/LocalUserOptions.cmake OPTIONAL)
-INCLUDE (${VTK_SOURCE_DIR}/Common/LocalUserOptions.cmake OPTIONAL)
+SET(LOCALUSERMACRODEFINED 0)
+INCLUDE (${VTK_BINARY_DIR}/${KIT}/LocalUserOptions.cmake OPTIONAL)
+INCLUDE (${VTK_SOURCE_DIR}/${KIT}/LocalUserOptions.cmake OPTIONAL)
 
 # if we are wrapping into Tcl then add the library and extra
 # source files
 #
 IF (VTK_WRAP_TCL)
-  VTK_WRAP_TCL2(vtkCommonTCL CommonTCL_SRCS ${Common_SRCS})
-  ADD_LIBRARY(vtkCommonTCL ${CommonTCL_SRCS} vtkTclUtil.cxx)
-  TARGET_LINK_LIBRARIES (vtkCommonTCL ${TCL_LIBRARY} vtkCommon)
-  INSTALL_TARGETS(/lib/vtk vtkCommonTCL)
-  INSTALL_FILES(/include/vtk .h
-    vtkTclUtil
-  )
+  VTK_WRAP_TCL2(vtk${KIT}TCL SOURCES KitTCL_SRCS 
+                ${Kit_SRCS}
+                COMMANDS ${Kit_TCL_EXTRA_CMDS})
+  ADD_LIBRARY(vtk${KIT}TCL ${KitTCL_SRCS} ${Kit_TCL_EXTRA_SRCS})
+  TARGET_LINK_LIBRARIES (vtk${KIT}TCL vtk${KIT} ${KIT_TCL_LIBS})
+  INSTALL_TARGETS(/lib/vtk vtk${KIT}TCL)
 ENDIF (VTK_WRAP_TCL)
 
 # if we are wrapping into Python then add the library and extra
 # source files
 #
 IF (VTK_WRAP_PYTHON)
-  VTK_WRAP_PYTHON2(vtkCommonPython CommonPython_SRCS ${Common_SRCS})
-  ADD_LIBRARY(vtkCommonPython MODULE ${CommonPython_SRCS} vtkPythonUtil.cxx)
+  VTK_WRAP_PYTHON2(vtk${KIT}Python KitPython_SRCS ${Kit_SRCS})
+  IF (APPLE)
+    ADD_LIBRARY(vtk${KIT}PythonD ${KitPython_SRCS} ${Kit_PYTHON_EXTRA_SRCS})
+    ADD_LIBRARY(vtk${KIT}Python MODULE vtk${KIT}PythonInit.cxx)
+    TARGET_LINK_LIBRARIES(vtk${KIT}PythonD vtk${KIT} ${KIT_PYTHON_LIBS} 
${PYTHON_LIBRARY})
+    TARGET_LINK_LIBRARIES(vtk${KIT}Python vtk${KIT}PythonD)
+    INSTALL_TARGETS(/lib/vtk vtk${KIT}PythonD)
+  ELSE (APPLE)
+    ADD_LIBRARY(vtk${KIT}Python MODULE ${KitPython_SRCS} ${Kit_PYTHON_EXTRA_SRCS})
+    TARGET_LINK_LIBRARIES (vtk${KIT}Python vtk${KIT} ${KIT_PYTHON_LIBS})
+  ENDIF(APPLE)
   IF(WIN32)
-    TARGET_LINK_LIBRARIES (vtkCommonPython
+    TARGET_LINK_LIBRARIES (vtk${KIT}Python
                            debug ${PYTHON_DEBUG_LIBRARY}
                            optimized ${PYTHON_LIBRARY})
-  ELSE(WIN32)
-    TARGET_LINK_LIBRARIES (vtkCommonPython ${PYTHON_LIBRARY})
   ENDIF(WIN32)
-  TARGET_LINK_LIBRARIES(vtkCommonPython vtkCommon)
-
-  INSTALL_TARGETS(/lib/vtk vtkCommonPython)
-  INSTALL_FILES(/include/vtk .h
-    vtkPythonUtil
-  )
+  INSTALL_TARGETS(/lib/vtk vtk${KIT}Python)
 ENDIF (VTK_WRAP_PYTHON)
 
 # if we are wrapping into Java then add the library and extra
 # source files
 #
 IF (VTK_WRAP_JAVA)
-  VTK_WRAP_JAVA2(vtkCommonJava CommonJava_SRCS ${Common_SRCS})
-  ADD_LIBRARY(vtkCommonJava SHARED ${CommonJava_SRCS} vtkJavaUtil.cxx)
-  TARGET_LINK_LIBRARIES(vtkCommonJava vtkCommon)
-  INSTALL_TARGETS(/lib/vtk vtkCommonJava)
-  INSTALL_FILES(/include/vtk .h
-    vtkJavaUtil
-  )
+  VTK_WRAP_JAVA2(vtk${KIT}Java KitJava_SRCS ${Kit_SRCS})
+  ADD_LIBRARY(vtk${KIT}Java SHARED ${KitJava_SRCS} ${Kit_JAVA_EXTRA_SRCS})
+  TARGET_LINK_LIBRARIES(vtk${KIT}Java vtk${KIT} ${KIT_JAVA_LIBS})
+  INSTALL_TARGETS(/lib/vtk vtk${KIT}Java)
 ENDIF (VTK_WRAP_JAVA)
 
-INSTALL_TARGETS(/lib/vtk vtkCommon)
-INSTALL_FILES(/include/vtk .h ${Common_SRCS}
+TARGET_LINK_LIBRARIES(vtk${KIT} ${KIT_LIBS})
+
+INSTALL_TARGETS(/lib/vtk vtk${KIT})
+INSTALL_FILES(/include/vtk .h ${Kit_SRCS})
+
+VTK_EXPORT_KIT("${KIT}" "${UKIT}" "${Kit_SRCS}")
+
+# If the user defined a custom macro, execute it now and pass in all the srcs
+#
+IF(LOCALUSERMACRODEFINED)
+  LocalUserOptionsMacro( "${Kit_SRCS}"       "${Kit_EXTRA_SRCS}"
+                         "${KitTCL_SRCS}"    "${Kit_TCL_EXTRA_SRCS}"
+                         "${KitJava_SRCS}"   "${Kit_JAVA_EXTRA_SRCS}"
+                         "${KitPython_SRCS}" "${Kit_PYTHON_EXTRA_SRCS}")
+ENDIF(LOCALUSERMACRODEFINED)
+
+# End of common section
+# -----------------------------------------------------------------
+
+INSTALL_FILES(/include/vtk .h
   vtkCellType
+  vtkDataArrayTemplate
+  vtkIOStream
+  vtkIOStreamFwd
   vtkSetGet
+  vtkSmartPointer
   vtkSystemIncludes
   vtkWin32Header
-  vtkSmartPointer
-  vtkIOStream
-  vtkIOStreamFwd
+)
+
+IF(VTK_WRAP_TCL)
+  INSTALL_FILES(/include/vtk .h
+    vtkTcl
+    vtkTclUtil
+    vtkTk
+  )
+ENDIF(VTK_WRAP_TCL)
+IF(VTK_WRAP_PYTHON)
+  INSTALL_FILES(/include/vtk .h
+    vtkPythonUtil
+  )
+  IF (TK_LIBRARY)
+       IF(NOT VTK_USE_COCOA)
+      INSTALL_FILES(/include/vtk .h
+        vtkTcl
+        vtkTk
+       )
+    ENDIF(NOT VTK_USE_COCOA)
+  ENDIF (TK_LIBRARY)
+ENDIF(VTK_WRAP_PYTHON)
+IF(VTK_WRAP_JAVA)
+  INSTALL_FILES(/include/vtk .h
+    vtkJavaUtil
   )
+ENDIF(VTK_WRAP_JAVA)
 
 INSTALL_FILES(/include/vtk .txx
+  vtkDataArrayTemplate
   vtkImageIterator
   vtkImageProgressIterator
 )
 
 INSTALL_FILES(/lib/vtk/testing FILES
-              ${VTK_SOURCE_DIR}/Common/Testing/HeaderTesting.py
-              ${VTK_SOURCE_DIR}/Common/Testing/Tcl/FindString.tcl
-              ${VTK_SOURCE_DIR}/Common/Testing/Tcl/PrintSelfCheck.tcl
-              ${VTK_SOURCE_DIR}/Common/Testing/Tcl/rtImageTest.tcl)
+              ${VTK_SOURCE_DIR}/${KIT}/Testing/HeaderTesting.py
+              ${VTK_SOURCE_DIR}/${KIT}/Testing/Tcl/FindString.tcl
+              ${VTK_SOURCE_DIR}/${KIT}/Testing/Tcl/PrintSelfCheck.tcl
+              ${VTK_SOURCE_DIR}/${KIT}/Testing/Tcl/rtImageTest.tcl)
 INSTALL_FILES(/include/vtk FILES
-              ${VTK_SOURCE_DIR}/Common/Testing/Cxx/vtkRegressionTestImage.h)
+              ${VTK_SOURCE_DIR}/${KIT}/Testing/Cxx/vtkRegressionTestImage.h)
 IF(VTK_USE_PARALLEL)
   INSTALL_FILES(/lib/vtk/testing FILES
-                ${VTK_SOURCE_DIR}/Common/Testing/Tcl/prtImageTest.tcl)
+                ${VTK_SOURCE_DIR}/${KIT}/Testing/Tcl/prtImageTest.tcl)
 ENDIF(VTK_USE_PARALLEL)

Index: hivision.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/sci/hivision.info,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- hivision.info       26 Jan 2004 10:13:53 -0000      1.8
+++ hivision.info       25 Feb 2004 11:25:43 -0000      1.9
@@ -1,11 +1,11 @@
 Package: hivision
-Version: 2.0.1
+Version: 2.0.2
 Revision: 1
 Source: 
http://gaia.iwr.uni-heidelberg.de/~heuvelin/HiFlowProject/HiVision/Download/Repository/HiVision%v.tar.gz
-Source-MD5: 1adce6814f553c4e9009a0e830d02dc8
+Source-MD5: 4a7229386e071f65049003fba692f5f3
 License: GPL
 GCC: 3.3
-Depends: x11-shlibs, vtk, qt3-shlibs
+Depends: x11-shlibs, vtk (>= 4.2.5-3), qt3-shlibs
 BuildDepends: x11-dev, cmake, tcltk-dev, expat, libpng3, libtiff, libjpeg, qt3-dev
 #Patch: %n.patch
 PatchScript: <<
@@ -33,7 +33,8 @@
 The main features supported in release 2.0 are the following:
 
  2D/3D unstructured grids (quadrangles, hexahedra, triangles, tetrahedra)
- Scalar data: texture mapping, transparency, colorbar, cutplanes, isolines, 
isosurfaces
+ Scalar data: texture mapping, transparency, colorbar, cutplanes, 
+              isolines, isosurfaces
  Vector data: interactive creation, streamlines, pathlines
  Stereo rendering
  Animation (based on MPEG)
@@ -49,6 +50,9 @@
  get_mem_info and some other gcc-3.3-related problems are now corrected 
  in the upstream sources.
  The patch file contains only some config info.
+ This version depends on vtk-4.2 installed in /sw/lib/vtk-4.2 etc,
+ so it can coexist with vtk-4.4. It doesn't work directly with
+ vtk-4.4. 
 <<
 Maintainer: Martin Costabel <[EMAIL PROTECTED]>
 Homepage: http://www.hiflow.de/HiVision/

Index: hivision.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/sci/hivision.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- hivision.patch      11 Jan 2004 23:14:13 -0000      1.3
+++ hivision.patch      25 Feb 2004 11:25:43 -0000      1.4
@@ -1,10 +1,10 @@
---- HiVision2.0.1.ori/Makefile.inc     Fri Jan  9 20:15:15 2004
-+++ HiVision2.0.1/Makefile.inc Sun Jan 11 22:35:52 2004
+--- HiVision2.0.2/Makefile.inc Mon Feb  4 16:47:12 2002
++++ HiVision2.0.2_corr/Makefile.inc    Tue Feb 24 23:03:38 2004
 @@ -1,16 +1,16 @@
  
  PREFIX  :=  
  
--ROOTDIR := /home/heuvelin/local/src/HiVision2.0.1
+-ROOTDIR := /home/heuvelin/local/src/HiVision2.0.2
 +ROOTDIR := BUILDDIR
  
 -GL_INCS   := /home/heuvelin/local/lib/Mesa-5.1/include
@@ -18,8 +18,8 @@
  
 -VTK_INCS  := /home/heuvelin/local/lib/vtk-4.2/include/vtk
 -VTK_LIBS  := /home/heuvelin/local/lib/vtk-4.2/lib/vtk
-+VTK_INCS  := FINKDIR/include/vtk
-+VTK_LIBS  := FINKDIR/lib/vtk
++VTK_INCS  := FINKDIR/include/vtk-4.2
++VTK_LIBS  := FINKDIR/lib/vtk-4.2
  
  # GCC_VERSION := GCC_2
  GCC_VERSION := GCC_3
@@ -43,3 +43,12 @@
  
  
  ###########################################################################
+@@ -58,7 +58,7 @@
+ CXXFLAGS := $(CXXFLAGS) \
+           -pipe -w -O3 \
+           -funroll-loops -fexpensive-optimizations \
+-          -DDEBUG -g -D$(GCC_VERSION)
++          -D$(GCC_VERSION)
+ 
+ 
+ 

Index: vtk.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/sci/vtk.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- vtk.info    31 Dec 2003 16:54:35 -0000      1.3
+++ vtk.info    25 Feb 2004 11:25:43 -0000      1.4
@@ -1,6 +1,6 @@
 Package: vtk
 Version: 4.2.5
-Revision: 2
+Revision: 3
 Source: http://www.vtk.org/files/release/4.2/VTK-%v.tar.gz
 Source-MD5: 531b3eb03f5041e5d04fed6b0b9b4c87
 SourceDirectory: VTK
@@ -9,11 +9,13 @@
 Depends: cmake (>=1.8.2-2), x11, x11-shlibs, tcltk, tcltk-shlibs, expat-shlibs, 
libpng3-shlibs, libtiff-shlibs, libjpeg-shlibs
 BuildDepends: x11-dev, tcltk-dev, expat, libpng3, libtiff, libjpeg, x11-dev
 Recommends: vtkdata
+Conflicts: %n (<= %v-2)
+Replaces: %n (<= %v-2) 
 CompileScript: <<
 #!/bin/sh
  cmake -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
        -DBUILD_SHARED_LIBS:BOOL=ON \
-       -DCMAKE_SHARED_LINKER_FLAGS:STRING="-L%p/lib -install_name 
%p/lib/vtk/\`basename <TARGET>\`" \
+       -DCMAKE_SHARED_LINKER_FLAGS:STRING="-L%p/lib -install_name 
%p/lib/vtk-4.2/\`basename <TARGET>\`" \
        -DCMAKE_INSTALL_PREFIX:PATH=%p \
        -DVTK_USE_CARBON:BOOL=OFF \
        -DVTK_USE_COCOA:BOOL=ON \
@@ -21,8 +23,7 @@
        -DVTK_USE_X:BOOL=ON \
        -DVTK_WRAP_TCL:BOOL=ON \
        -DVTK_WRAP_JAVA:BOOL=OFF \
-       -DVTK_WRAP_PYTHON:BOOL=ON \
-       -DPYTHON_EXECUTABLE:FILEPATH=/usr/bin/python \
+       -DVTK_WRAP_PYTHON:BOOL=OFF \
        -DOPENGL_gl_LIBRARY:STRING="-lGL" \
        -DOPENGL_glu_LIBRARY:STRING="-lGLU" \
        -DVTK_USE_SYSTEM_EXPAT:BOOL=ON \
@@ -41,20 +42,24 @@
 InstallScript: <<
 #!/bin/sh
  make install DESTDIR=%d
+ mv %i/lib/vtk %i/lib/vtk-4.2
+ mv %i/include/vtk %i/include/vtk-4.2
+ /usr/bin/install -d %i/bin/vtk-4.2
+ mv %i/bin/* %i/bin/vtk-4.2/
  /usr/bin/install -d %i/share/doc/%n
  /bin/cp -R Examples %i/share/doc/%n/
  /usr/bin/install -d %i/etc/profile.d
- cat >%i/etc/profile.d/vtk.sh <<EOF
-export TCLLIBPATH="%p/lib/vtk/tcl/ \$TCLLIBPATH"
+ cat > %i/etc/profile.d/vtk-4.2.sh <<EOF
+export TCLLIBPATH="%p/lib/vtk-4.2/tcl/ \$TCLLIBPATH"
 EOF
- cat >%i/etc/profile.d/vtk.csh <<EOF
+ cat >%i/etc/profile.d/vtk-4.2.csh <<EOF
 if ( ! \$?TCLLIBPATH ) then
-   setenv TCLLIBPATH "%p/lib/vtk/tcl/"
+   setenv TCLLIBPATH "%p/lib/vtk-4.2/tcl/"
 else
-   setenv TCLLIBPATH "%p/lib/vtk/tcl/ \$TCLLIBPATH"
+   setenv TCLLIBPATH "%p/lib/vtk-4.2/tcl/ \$TCLLIBPATH"
 endif
 EOF
- chmod 755 %i/etc/profile.d/vtk.*
+ chmod 755 %i/etc/profile.d/vtk-4.2.*
 <<
 DocFiles: Copyright.txt  
 Description: The Visualization ToolKit
@@ -83,8 +88,11 @@
  For documentation see the vtk web site. 
 <<
 DescPort: <<
+ Installs into /sw/lib/vtk-4.2 and /sw/include/vtk-4.2, in order
+ to be compatible with vtk version 4.4 (package vtk-py23).
  Java wrapper disabled in this version. It may be added when 
  I had more time for testing.
+ Python wrapper disabled, too. It doesn't work.
  The dylibs are created with compat version 0.0.0, because I don't know
  how to teach the cmake build system about compatibility versions.
  It is bad enough already to get them a decent install_name.



-------------------------------------------------------
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps & Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click
_______________________________________________
Fink-commits mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to