[36530] trunk/dports/science/hdf5/Portfile

[jochen at macports.org]

Revision: 36530
          http://trac.macosforge.org/projects/macports/changeset/36530
Author:   jochen at macports.org
Date:     2008-05-05 02:38:16 -0700 (Mon, 05 May 2008)

Log Message:
-----------
clean up variants

Modified Paths:
--------------
    trunk/dports/science/hdf5/Portfile

Modified: trunk/dports/science/hdf5/Portfile
===================================================================
--- trunk/dports/science/hdf5/Portfile	2008-05-05 08:01:26 UTC (rev 36529)
+++ trunk/dports/science/hdf5/Portfile	2008-05-05 09:38:16 UTC (rev 36530)
@@ -7,7 +7,7 @@
 # We should provide a hdf5-devel port for 1.8 at this time, I guess.
 name                hdf5
 version             1.6.7
-revision            4
+revision            5
 categories          science
 maintainers         openmaintainer jochen
 
@@ -34,44 +34,54 @@
 test.run            yes
 test.target         check
 
+
+variant fortran description {Include the Fortran interface} {
+    if { [variant_isset gcc43] || [variant_isset gcc42] || [variant_isset g95] } {
+        configure.args-delete   --disable-fortran
+        configure.args-append   --enable-fortran
+    } else {
+        error "You must specify a compiler variant in order to build the Fortran interface"
+    }
+}
+
 variant szip description {Enable szip compression support} {
     configure.args-delete       --with-szlib=no
     configure.args-append       --with-szlib=yes
     depends_lib-append          port:szip
 }
 
-variant optimized conflicts g95 gcc42 description {Optimize for host machine using GCC 4.3 for compilation of HDF-5} {
+variant gcc42 conflicts g95 gcc43 description {Compile using GCC 4.2} {
+    depends_lib-append          port:gcc42
+    configure.compiler          macports-gcc-4.2
+}
+
+variant gcc43 conflicts g95 gcc42 description {Compile using GCC 4.3} {
     depends_lib-append          port:gcc43
     configure.compiler          macports-gcc-4.3
-    configure.cflags-delete     -O2
-    configure.cxxflags-delete   -O2
-    configure.cflags-append     -ftree-vectorize -march=native -O3
-    configure.cxxflags-append   -ftree-vectorize -march=native -O3
+}
+
+variant g95 conflicts gcc42 gcc43 description {Use g95 Fortran compiler} {
+    depends_lib-append          port:g95
+    default_variants-append     fortran
+    patchfiles-append           patch-powerpc-apple.diff
+    configure.fc                ${prefix}/bin/g95
+    configure.fflags            -fno-second-underscore
+}
+
+variant optimized description {Higher compiler optimization for host machine (esp. for gcc43)} {
     if { [variant_isset gcc43] } {
+        configure.cflags-delete     -O2
+        configure.cxxflags-delete   -O2
         configure.fflags-delete     -O2
+        configure.cflags-append     -ftree-vectorize -march=native -O3
+        configure.cxxflags-append   -ftree-vectorize -march=native -O3
         configure.fflags-append     -ftree-vectorize -march=native -O3
     } else {
+        configure.cflags-delete     -O2
+        configure.cxxflags-delete   -O2
         configure.fflags-delete     -O2
+        configure.cflags-append     -ftree-vectorize -O3
+        configure.cxxflags-append   -ftree-vectorize -O3
         configure.fflags-append     -ftree-vectorize -O3
     }
 }
-
-variant g95 conflicts gcc42 gcc43 description {compile the Fortran interface using G95} {
-    patchfiles-append patch-powerpc-apple.diff
-    depends_lib-append          port:g95
-    configure.args-append       --enable-fortran
-    configure.fc                ${prefix}/bin/g95
-    configure.fflags            -fno-second-underscore
-}
-
-variant gcc42 conflicts g95 gcc43 description {compile the Fortran interface using GCC 4.2} {
-    depends_lib-append          port:gcc42
-    configure.args-append       --enable-fortran
-    configure.fc                ${prefix}/bin/gfortran-mp-4.2
-}
-
-variant gcc43 conflicts g95 gcc42 description {compile the Fortran interface using GCC 4.3} {
-    depends_lib-append          port:gcc43
-    configure.args-append       --enable-fortran
-    configure.fc                ${prefix}/bin/gfortran-mp-4.3
-}

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080505/6d84128f/attachment.html