Revision
117545
Author
mojca@macports.org
Date
2014-03-03 06:03:59 -0800 (Mon, 03 Mar 2014)

Log Message

root: make cocoa also default on 10.7, fix a typo (maintainer, #42677)

Modified Paths

Diff

Modified: trunk/dports/science/root/Portfile (117544 => 117545)


--- trunk/dports/science/root/Portfile	2014-03-03 13:43:07 UTC (rev 117544)
+++ trunk/dports/science/root/Portfile	2014-03-03 14:03:59 UTC (rev 117545)
@@ -131,8 +131,9 @@
 
 default_variants    +ssl +xml +gsl +minuit2 +tmva +roofit +graphviz +opengl +soversion
 
-# Since ROOT 5.34.15 the cocoa backend is default on OSX 10.8 or newer, so do the same
-if {${os.major} > 11} {
+# Since ROOT 5.34.15 the cocoa backend is default on OSX 10.8 or newer
+# We also make it default on 10.7
+if {${os.major} > 10} {
     set default_gui_variant +cocoa
 } else {
     set default_gui_variant +x11
@@ -397,7 +398,7 @@
     patchfiles-append patch-builtin-afterimage-disabletiff.diff
 }
 
-variant x11 conflicts cocoa {Enables X11 graphical backend} {
+variant x11 conflicts cocoa description {Enables X11 graphical backend} {
     # Dependencies on X11 ports
     depends_lib-append port:xorg-libX11 port:mesa port:Xft2 port:xpm
     # Disable cocoa