[Lunar-commits] <moonbase> vtk: Adjusting BUILD to use default_cmake_build and removing the $MAJOR from DETAILS.

[Dennis `stumbles` Veatch]

commit 7edd5e46b0b80cb83519511fda20aa61ffe38230
Author: Dennis `stumbles` Veatch <stumbles at lunar-linux.org>
Date:   Wed Aug 24 06:24:35 2011 -0400

    vtk: Adjusting BUILD to use default_cmake_build and removing the $MAJOR from DETAILS.
---
 science/vtk/BUILD   |   17 ++++-------------
 science/vtk/DETAILS |    5 ++---
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/science/vtk/BUILD b/science/vtk/BUILD
index d4b88a5..b2f12ef 100644
--- a/science/vtk/BUILD
+++ b/science/vtk/BUILD
@@ -1,15 +1,10 @@
 (
 
-  OOSB_DIR="$SOURCE_DIRECTORY/$MODULE-build" &&
-
-  mkdir $OOSB_DIR &&
-  cd $OOSB_DIR    &&
-
 # Fix some version numbers so it will find ours.
   BOOST_VER="`lvu version boost`" &&
   PYTHON_VER="`lvu version Python|cut -c 1-3`" &&
-  sedit "s:2.6:$PYTHON_VER:" ../CMake/FindPythonLibs.cmake &&
-  sedit "s:1.36.1:$BOOST_VER:" ../CMake/CMake2.4/FindBoost.cmake &&
+  sedit "s:2.6:$PYTHON_VER:" CMake/FindPythonLibs.cmake &&
+  sedit "s:1.36.1:$BOOST_VER:" CMake/CMake2.4/FindBoost.cmake &&
 
 # This is a similar issue as found in the graphviz BUILD; so lunar fix 
 # does not complain over the inability to find some shared ojbects.
@@ -25,12 +20,8 @@
      OPTS="-DCMAKE_CXX_FLAGS=-D__STDC_CONSTANT_MACROS"
   fi &&
 
-  cmake $SOURCE_DIRECTORY/ -DCMAKE_INSTALL_PREFIX=$MODULE_PREFIX   \
-                           -DBUILD_TYPE=RELEASE                    \
-                           -DBUILD_SHARED_LIBS=ON                  \
-                           -DBUILD_EXAMPLES=OFF                    \
-                           $OPTS                                  &&
+  OPTS="-DBUILD_SHARED_LIBS=ON -DBUILD_EXAMPLES=OFF" &&
 
-  default_make
+  default_cmake_build
 
 ) > $C_FIFO 2>&1
diff --git a/science/vtk/DETAILS b/science/vtk/DETAILS
index 61475a0..fa95242 100644
--- a/science/vtk/DETAILS
+++ b/science/vtk/DETAILS
@@ -1,8 +1,7 @@
           MODULE=vtk
-           MAJOR=5.6
-         VERSION=${MAJOR}.1
+         VERSION=5.6.1
           SOURCE=$MODULE-$VERSION.tar.gz
-      SOURCE_URL=http://www.vtk.org/files/release/${MAJOR}/
+      SOURCE_URL=http://www.vtk.org/files/release/${VERSION%.*}/
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/VTK
       SOURCE_VFY=sha1:6d4d0de3b468828f21f70c5af5e37f9412ee59c5
         WEB_SITE=http://www.vtk.org/