[108345] trunk/dports/science

[mojca at macports.org]

Revision: 108345
          https://trac.macports.org/changeset/108345
Author:   mojca at macports.org
Date:     2013-07-20 05:07:24 -0700 (Sat, 20 Jul 2013)
Log Message:
-----------
gromacs(-double): add +x11 variant (see #39383)

Modified Paths:
--------------
    trunk/dports/science/gromacs/Portfile
    trunk/dports/science/gromacs-double/Portfile

Modified: trunk/dports/science/gromacs/Portfile
===================================================================
--- trunk/dports/science/gromacs/Portfile	2013-07-20 11:27:41 UTC (rev 108344)
+++ trunk/dports/science/gromacs/Portfile	2013-07-20 12:07:24 UTC (rev 108345)
@@ -33,16 +33,27 @@
 
 depends_build       port:pkgconfig
 
-depends_lib         port:fftw-3-single port:libxml2 port:openmotif
+depends_lib         port:fftw-3-single \
+                    port:libxml2
 
-configure.args      --bindir=${prefix}/lib/${name}/bin --enable-shared --with-x
+configure.args      --bindir=${prefix}/lib/${name}/bin \
+                    --enable-shared \
+                    --without-x
 
-variant no_x11 description {disable the openmotif interface} {
-    depends_lib-delete      port:openmotif
-    configure.args-delete   --with-x
-    configure.args-append   --without-x
+variant x11 conflicts no_x11 description {enable the openmotif interface} {
+    depends_lib-append      port:openmotif
+    configure.args-delete   --without-x
+    configure.args-append   --with-x
 }
 
+# remove this in August 2014
+variant no_x11 conflicts x11 description {legacy compatibility variant} {}
+if {[variant_isset no_x11]} {
+    default_variants        -x11
+} else {
+    default_variants        +x11
+}
+
 variant gsl description {enable extra analyses via the GNU scientific library} {
     depends_lib-append      port:gsl
     configure.args-append   --with-gsl
@@ -54,7 +65,7 @@
 }
 
 if { ![variant_isset gcc43] && ![variant_isset gcc44] && ![variant_isset gcc45] && ![variant_isset gcc46] } {
-    default_variants     +gcc47
+    default_variants    +gcc47
 }
 
 variant gcc43 conflicts gcc44 gcc45 gcc46 gcc47 description {build with macports-gcc-4.3} {

Modified: trunk/dports/science/gromacs-double/Portfile
===================================================================
--- trunk/dports/science/gromacs-double/Portfile	2013-07-20 11:27:41 UTC (rev 108344)
+++ trunk/dports/science/gromacs-double/Portfile	2013-07-20 12:07:24 UTC (rev 108345)
@@ -31,18 +31,31 @@
 checksums           rmd160  a3d40c3ac6ec9ee3e4607bd35afca1dd4715154e \
                     sha256  e0605e4810b0d552a8761fef5540c545beeaf85893f4a6e21df9905a33f871ba
 
-depends_build   port:pkgconfig
+depends_build       port:pkgconfig
 
-depends_lib     port:fftw-3        port:libxml2 port:openmotif port:gromacs
+depends_lib         port:fftw-3 \
+                    port:libxml2 \
+                    port:gromacs
 
-configure.args  --bindir=${prefix}/lib/${name}/bin --enable-shared --with-x --enable-double
+configure.args      --bindir=${prefix}/lib/${name}/bin \
+                    --enable-shared \
+                    --without-x \
+                    --enable-double
 
-variant no_x11 description {disable the openmotif interface} {
-    depends_lib-delete      port:openmotif
-    configure.args-delete   --with-x
-    configure.args-append   --without-x
+variant x11 conflicts no_x11 description {enable the openmotif interface} {
+    depends_lib-append      port:openmotif
+    configure.args-delete   --without-x
+    configure.args-append   --with-x
 }
 
+# remove this in August 2014
+variant no_x11 conflicts x11 description {legacy compatibility variant} {}
+if {[variant_isset no_x11]} {
+    default_variants        -x11
+} else {
+    default_variants        +x11
+}
+
 variant gsl description {enable extra analyses via the GNU scientific library} {
     depends_lib-append      port:gsl
     configure.args-append   --with-gsl
@@ -54,7 +67,7 @@
 }
 
 if { ![variant_isset gcc43] && ![variant_isset gcc44] && ![variant_isset gcc45] && ![variant_isset gcc46] } {
-    default_variants     +gcc47
+    default_variants    +gcc47
 }
 
 variant gcc43 conflicts gcc44 gcc45 gcc46 gcc47 description {build with macports-gcc-4.3} {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130720/6b8b3d73/attachment-0001.html>