Ticket #34472: Portfile-splash.diff

Portfile

@@ -4 +4 @@
 PortSystem          1.0
 
 name                splash
-version             1.15.0
+version             2.1.0
 categories          science graphics
 platforms           darwin
 maintainers         monash.edu:daniel.price
@@ -18 +18 @@
 
 worksrcdir          ${name}
 
-checksums           rmd160  430e64f7740dc04cc8bd898b3b0e4ddc87f277ab \
-                    sha256  f3e3331dbf544f35bfbe2dc2b4dd3da7963011f2b1bd2c7e5d1418244c32eb55
+checksums           rmd160   2a76792b19781a45fe72359f9d4a14a029540174 \
+                    sha256   28fb4b7319a3aec784b10aaaa7a64f32f936f4c1d1b85b32a98dcecab13d172f
 
-if { ![variant_isset gcc42] && ![variant_isset gcc43] && ![variant_isset gcc44] && ![variant_isset gcc46]} {
+if { ![variant_isset gcc44] && ![variant_isset gcc45] && ![variant_isset gcc46]} {
    default_variants      +gcc45
 }
-default_variants-append    +pgplot
+default_variants-append  +giza
 
 use_configure       no
 
@@ -34 +34 @@
 destroot.args       PREFIX=${prefix}
 use_parallel_build  no
 
-variant pgplot description {use PGPLOT as the backend graphics library} {
+variant giza description {use giza as the backend graphics library} conflicts pgplot {
+   depends_lib-append      port:cairo \
+                           port:xorg-libx11
+   build.args-append       X11DIR=${prefix} X11LIBS='-L${prefix}/lib -lX11'
+}
+
+variant pgplot description {use PGPLOT as the backend graphics library} conflicts giza {
    depends_lib-append      port:pgplot
    build.env-append        PGPLOT_DIR=${prefix}/lib \
                            PGPLOT_DEV=/xw
+   build.args-append       BACKEND=pgplot
 }
 
-variant gcc46 description {build with gfortran/gcc v4.6} conflicts gcc42 gcc43 gcc44 gcc45 {
+variant gcc46 description {build with gfortran/gcc v4.6} conflicts gcc44 gcc45 {
    depends_build-append    port:gcc46
-   build.args-append       F90C=gfortran-mp-4.6
+   build.args-append       F90C=gfortran-mp-4.6 FC=gfortran-mp-4.6
 }
 
-variant gcc45 description {build with gfortran/gcc v4.5} conflicts gcc42 gcc43 gcc44 gcc46 {
+variant gcc45 description {build with gfortran/gcc v4.5} conflicts gcc44 gcc46 {
    depends_build-append    port:gcc45
-   build.args-append       F90C=gfortran-mp-4.5
+   build.args-append       F90C=gfortran-mp-4.5 FC=gfortran-mp-4.5
 }
 
-variant gcc44 description {build with gfortran/gcc v4.4} conflicts gcc42 gcc43 gcc45 gcc46 {
+variant gcc44 description {build with gfortran/gcc v4.4} conflicts gcc45 gcc46 {
    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-append    port:gcc43
-   build.args-append       F90C=gfortran-mp-4.3
+   build.args-append       F90C=gfortran-mp-4.4 FC=gfortran-mp-4.4
 }
 
-variant gcc42 description {build with gfortran/gcc v4.2} conflicts gcc43 gcc44 gcc45 gcc46 {
-   depends_build-append    port:gcc42
-   build.args-append       F90C=gfortran-mp-4.2
+variant hdf5 description {compiles data reads that depend on HDF5} {
+   build.args-append       gadgethdf5 HDF5ROOT=${prefix}
+   depends_lib-append      port:hdf5
 }
 
-variant read_hdf5formats description {compiles data reads that depend on HDF5} conflicts read_extraformats1 {
-   build.args-append       flash HDF5ROOT=${prefix}
-   depends_lib-append      port:hdf5
+variant h5part description {compiles H5Part data read} {
+   build.args-append       h5part HDF5ROOT=${prefix} H5PART_DIR=${prefix} H5PART_LIBS="-L${prefix}/lib -lH5Part"
+   depends_lib-append      port:h5part
 }
 
-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_extraformats1 description {compiles additional data reads: foulkes, mbatesph, oilonwater, rsph, urban (f/b/o/r/usplash)} conflicts read_extraformats2 {
+   build.args-append       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-append       all bauswein ucla vanaverbeke
+   build.args-append       bauswein ucla vanaverbeke
 }