Changeset 79682

Timestamp:

06/23/11 07:51:45 (4 years ago)

Author:

eborisch@…

Message:

eigen3: Whitespace and re-ordering of portfile contents. No changes in behavior.

File:

• trunk/dports/math/eigen3/Portfile (modified) (3 diffs)

trunk/dports/math/eigen3/Portfile

@@ -30 +30 @@
 
 # Variants
-variant gcc44 description { Use MacPorts' gcc44 compilers } conflicts gcc45 {
+variant gcc44 description {Use MacPorts' gcc44 compilers} conflicts gcc45 {
   configure.compiler  macports-gcc-4.4
 }
 
-variant gcc45 description { Use MacPorts' gcc45 compilers } conflicts gcc44 {
+variant gcc45 description {Use MacPorts' gcc45 compilers} conflicts gcc44 {
   configure.compiler  macports-gcc-4.5
 }
 
-variant doc description { Place local documentation into <prefix>/share/doc/eigen3/html } requires cmake {
+variant doc description {Place local documentation into <prefix>/share/doc/eigen3/html} requires cmake {
   depends_build-append port:doxygen port:texlive-latex
   build.target-append doc
 }
 
-variant blas description { Build eigen-based blas (libeigen_blas*) } requires cmake {
+variant blas description {Build eigen-based blas (libeigen_blas*)} requires cmake {
   if {![variant_isset gcc44] && ![variant_isset gcc45]} {
     ui_error "eigen3: ##### +blas needs either +gcc44 or +gcc45 enabled #####"
@@ -49 +49 @@
   } else {
     build.target-append blas
+  }
+}
+
+variant cmake description {CMake-based install: Disabling removes CMake support} {
+  PortGroup           muniversal 1.0
+  # Not using cmake portgroup as it sets -DCMAKE_OSX_ARCHITECTURES
+  # in a way we don't seem to be able disable.
+  set cmake_share_module_dir ${prefix}/share/cmake/modules
+
+  depends_build-append port:cmake
+
+  configure.cmd       cmake
+
+  configure.pre_args  -DCMAKE_INSTALL_PREFIX=${prefix}
+
+  configure.args      -DCMAKE_VERBOSE_MAKEFILE=ON \
+                      -DCMAKE_COLOR_MAKEFILE=ON \
+                      -DCMAKE_BUILD_TYPE=Release \
+                      -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON \
+                      -DCMAKE_INSTALL_NAME_DIR=${prefix}/lib \
+                      -DCMAKE_SYSTEM_PREFIX_PATH=\"${prefix}\;/usr\" \
+                      -DCMAKE_MODULE_PATH=${cmake_share_module_dir} \
+                      -Wno-dev
+ 
+  # Out of source build
+  configure.args-append ../eigen_src
+
+  # Enable test cases if we've actually configured
+  test.run            yes
+  test.target         check
+  test.env-append     EIGEN_MAKE_ARGS=-j{build.jobs} \
+                      EIGEN_CTEST_ARGS=-j{build.jobs}
+
+  # Enable parallel builds
+  build.env-append    EIGEN_MAKE_ARGS=-j{build.jobs}
+}
+
+# Conditional phase modifications
+# Are we doing a header-only or cmake (for 'port test' or +doc/+blas) build?
+if {![variant_isset cmake]} {
+  # We can skip everything and just copy the headers -- fast!
+  use_configure       no
+  build {}
+  destroot {
+    set incldir ${destroot}${prefix}/include/${name}
+    xinstall -d ${incldir}
+    file copy ${workpath}/eigen_src/Eigen ${incldir}
+    file copy ${workpath}/eigen_src/unsupported ${incldir}
+  }
+
+  # Fail with message if user tries to test
+  test.run            yes
+  test {
+    ui_error "!!! TESTING IS UNSUPPORTED WITHOUT +cmake VARIANT !!!"
   }
 }
@@ -89 +143 @@
 }
 
-# Conditional phase modifications
-# Are we doing a header-only or cmake (for 'port test' or +doc/+blas) build?
-if {![variant_isset cmake]} {
-  # We can skip everything and just copy the headers -- fast!
-  use_configure       no
-  build {}
-  destroot {
-    set incldir ${destroot}${prefix}/include/${name}
-    xinstall -d ${incldir}
-    file copy ${workpath}/eigen_src/Eigen ${incldir}
-    file copy ${workpath}/eigen_src/unsupported ${incldir}
-  }
-
-  # Fail with message if user tries to test
-  test.run            yes
-  test {
-    ui_error "!!! TESTING IS UNSUPPORTED WITHOUT +cmake VARIANT !!!"
-  }
-}
-
-variant cmake description { CMake-based install: Disabling removes CMake support } {
-  PortGroup           muniversal 1.0
-  # Not using cmake portgroup as it sets -DCMAKE_OSX_ARCHITECTURES
-  # in a way we don't seem to be able disable.
-  set cmake_share_module_dir ${prefix}/share/cmake/modules
-
-  depends_build-append port:cmake
-
-  configure.cmd       cmake
-
-  configure.pre_args  -DCMAKE_INSTALL_PREFIX=${prefix}
-
-  configure.args      -DCMAKE_VERBOSE_MAKEFILE=ON \
-                      -DCMAKE_COLOR_MAKEFILE=ON \
-                      -DCMAKE_BUILD_TYPE=Release \
-                      -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON \
-                      -DCMAKE_INSTALL_NAME_DIR=${prefix}/lib \
-                      -DCMAKE_SYSTEM_PREFIX_PATH=\"${prefix}\;/usr\" \
-                      -DCMAKE_MODULE_PATH=${cmake_share_module_dir} \
-                      -Wno-dev
- 
-  # Out of source build
-  configure.args-append ../eigen_src
-
-  # Enable test cases if we've actually configured
-  test.run            yes
-  test.target         check
-  test.env-append     EIGEN_MAKE_ARGS=-j{build.jobs} \
-                      EIGEN_CTEST_ARGS=-j{build.jobs}
-
-  # Enable parallel builds
-  build.env-append    EIGEN_MAKE_ARGS=-j{build.jobs}
-}
-
 livecheck.type        regex
 livecheck.url         ${homepage}index.php?title=ChangeLog