Revision: 117542 https://trac.macports.org/changeset/117542 Author: mojca@macports.org Date: 2014-03-03 03:49:39 -0800 (Mon, 03 Mar 2014) Log Message: ----------- root: upgrade to 5.34.17, create x11 variant (maintainer, #42677) Modified Paths: -------------- trunk/dports/science/root/Portfile Modified: trunk/dports/science/root/Portfile =================================================================== --- trunk/dports/science/root/Portfile 2014-03-03 11:05:03 UTC (rev 117541) +++ trunk/dports/science/root/Portfile 2014-03-03 11:49:39 UTC (rev 117542) @@ -4,7 +4,7 @@ PortSystem 1.0 name root -version 5.34.15 +version 5.34.17 categories science maintainers gmail.com:mattiafrancescomoro hep.phy.cam.ac.uk:jonesc @@ -19,23 +19,19 @@ master_sites http://root.cern.ch/download/ \ ftp://root.cern.ch/root/ -checksums rmd160 bac74c87947028353399450da53cd83556d598b4 \ - sha256 d1dcddd17084de4001847841835cf56dcd5affcfa28d46d2516928efd97b71ae +checksums rmd160 0770aeb370699162c0f02c561060ee5388dd5ddb \ + sha256 8e7e13d41e13b6837a3bc784f86e491bed2ee37c157a3be8c74ead9b33c2be8a worksrcdir root depends_lib port:xz \ port:pcre \ - port:Xft2 \ - port:xorg-libX11 \ - port:mesa \ port:zlib \ port:jpeg \ port:libpng \ port:giflib \ port:tiff \ port:gmp \ - port:xpm \ port:expat # port:freetype @@ -98,7 +94,6 @@ --disable-gviz \ --disable-soversion \ --disable-c++11 \ - --disable-cocoa \ --disable-xrootd \ --enable-builtin-ftgl \ --enable-mathmore \ @@ -138,7 +133,9 @@ # Since ROOT 5.34.15 the cocoa backend is default on OSX 10.8 or newer, so do the same if {${os.major} > 11} { - default_variants-append +cocoa + set default_gui_variant +cocoa +} else { + set default_gui_variant +x11 } post-destroot { @@ -388,7 +385,7 @@ depends_lib-append port:pythia } -variant cocoa description {Enables native OSX graphical backend instead of X11} { +variant cocoa conflicts x11 description {Enables native OSX graphical backend} { # Force a compatible clang compiler PortGroup compiler_blacklist_versions 1.0 compiler.blacklist-append {clang < 425} *gcc* macports-clang-3.3 macports-clang-2.9 macports-clang-3.0 @@ -400,6 +397,18 @@ patchfiles-append patch-builtin-afterimage-disabletiff.diff } +variant x11 conflicts cocoa {Enables X11 graphical backend} { + # Dependencies on X11 ports + depends_lib-append port:xorg-libX11 port:mesa port:Xft2 port:xpm + # Disable cocoa + configure.args-append --disable-cocoa +} + +# If neither graphical variant is set, use default +if { ![variant_isset cocoa] && ![variant_isset x11] } { + default_variants-append ${default_gui_variant} +} + variant clang31 conflicts clang32 clang33 description {Compile using MacPorts clang 3.1} { configure.compiler macports-clang-3.1 }