Changeset 82451

Timestamp:

08/13/11 17:25:02 (4 years ago)

Author:

macsforever2000@…

Message:

splash: Fix for default variants. (#30392)

File:

• trunk/dports/science/splash/Portfile (modified) (2 diffs)

trunk/dports/science/splash/Portfile

@@ -22 +22 @@
                     sha256  91d3594ecad7537d72e8f16fe25fac6afbe093bb43ec9c82f4fd566e6096088e
 
-depends_build       
-
-default_variants    +gcc44 +pgplot
+if { ![variant_isset gcc42] && ![variant_isset gcc43] && ![variant_isset gcc44] && ![variant_isset gcc45] && ![variant_isset gcc46]} {
+   default_variants      +gcc44
+}
+default_variants    +pgplot
 
 use_configure       no
 
-build.cmd           make SYSTEM=gfortran
+build.cmd           make
+build.args          SYSTEM=gfortran
 
 destroot.args       PREFIX=${prefix}
@@ -34 +36 @@
 
 variant pgplot description {use PGPLOT as the backend graphics library} {
-   depends_lib      port:pgplot
-   build.env        PGPLOT_DIR=${prefix}/lib \
-                    PGPLOT_DEV=/xw
+   depends_lib-append      port:pgplot
+   build.env-append        PGPLOT_DIR=${prefix}/lib \
+                           PGPLOT_DEV=/xw
 }
 
 variant gcc46 description {build with gfortran/gcc v4.6} conflicts gcc42 gcc43 gcc44 gcc45 {
-   depends_build    port:gcc46
-   build.cmd        make SYSTEM=gfortran F90C=gfortran-mp-4.6
+   depends_build-append    port:gcc46
+   build.args-append       F90C=gfortran-mp-4.6
 }
 
 variant gcc45 description {build with gfortran/gcc v4.5} conflicts gcc42 gcc43 gcc44 gcc46 {
-   depends_build    port:gcc45
-   build.cmd        make SYSTEM=gfortran F90C=gfortran-mp-4.5
+   depends_build-append    port:gcc45
+   build.args-append       F90C=gfortran-mp-4.5
 }
 
 variant gcc44 description {build with gfortran/gcc v4.4} conflicts gcc42 gcc43 gcc45 gcc46 {
-   depends_build    port:gcc44
-   build.cmd        make SYSTEM=gfortran F90C=gfortran-mp-4.4
+   depends_build-append    port:gcc44
+   build.args-append       F90C=gfortran-mp-4.4
 }
 
 variant gcc43 description {build with gfortran/gcc v4.3} conflicts gcc42 gcc44 gcc45 gcc46 {
-   depends_build    port:gcc43
-   build.cmd        make SYSTEM=gfortran F90C=gfortran-mp-4.3
+   depends_build-append    port:gcc43
+   build.args-append       F90C=gfortran-mp-4.3
 }
 
 variant gcc42 description {build with gfortran/gcc v4.2} conflicts gcc43 gcc44 gcc45 gcc46 {
-   depends_build    port:gcc42
-   build.cmd        make SYSTEM=gfortran F90C=gfortran-mp-4.2
+   depends_build-append    port:gcc42
+   build.args-append       F90C=gfortran-mp-4.2
 }
 
 variant read_hdf5formats description {compiles data reads that depend on HDF5} conflicts read_extraformats1 {
-   build.args       flash HDF5ROOT=${prefix}
-   depends_lib      port:hdf5
+   build.args-append       flash HDF5ROOT=${prefix}
+   depends_lib-append      port:hdf5
 }
 
-variant read_extraformats1 description {compiles additional data reads: foulkes, mbatesph, oilonwater, rsph, urban (f/b/o/r/usplash)} conflicts read_extraformats2 {
-   build.args       all foulkes mbatesph oilonwater rsph urban
+variant read_extraformats1 description {compiles additional data reads: foulkes, mbatesph, oilonwater, rsph, urban (f/b/o/r/usplash)} conflicts read_hdf5formats read_extraformats2 {
+   build.args-append       all foulkes mbatesph oilonwater rsph urban
 }
 
 variant read_extraformats2 description {compiles additional data reads: Bauswein, UCLA, vanaverbeke data read (bsplash, usplash, vsplash)} conflicts read_extraformats1 {
-   build.args       all bauswein ucla vanaverbeke
+   build.args-append       all bauswein ucla vanaverbeke
 }