[64055] trunk/dports/editors/vim/Portfile

[raimue at macports.org]

Revision: 64055
          http://trac.macports.org/changeset/64055
Author:   raimue at macports.org
Date:     2010-02-20 15:22:10 -0800 (Sat, 20 Feb 2010)
Log Message:
-----------
editors/vim:
+x11 variant should not conflict with X11 GUI variants.
Discussion: http://lists.macosforge.org/pipermail/macports-dev/2010-February/011317.html

Modified Paths:
--------------
    trunk/dports/editors/vim/Portfile

Modified: trunk/dports/editors/vim/Portfile
===================================================================
--- trunk/dports/editors/vim/Portfile	2010-02-20 23:11:02 UTC (rev 64054)
+++ trunk/dports/editors/vim/Portfile	2010-02-20 23:22:10 UTC (rev 64055)
@@ -6,7 +6,7 @@
 set vim_version     7.2
 set vim_patchlevel  350
 version             ${vim_version}.${vim_patchlevel}
-revision            2
+revision            3
 categories          editors
 maintainers         raimue
 description         Vi \"workalike\" with many additional features
@@ -83,25 +83,25 @@
     depends_lib-append      port:xorg-libXt
 }
 
-variant athena description {Build GUI version using Athena widgets} conflicts gtk1 gtk2 motif x11 {
-    configure.args-delete   --enable-gui=no --without-x
-    configure.args-append   --enable-gui=athena --with-x --disable-darwin
-    depends_lib-append      port:xorg-libXaw port:xorg-libXt
+variant athena description {Build GUI version using Athena widgets} requires x11 conflicts gtk1 gtk2 motif {
+    configure.args-delete   --enable-gui=no
+    configure.args-append   --enable-gui=athena --disable-darwin
+    depends_lib-append      port:xorg-libXaw
 }
-variant gtk1 description {Build GUI version using GTK 1.x widgets} conflicts athena gtk2 motif x11 {
-    configure.args-delete   --enable-gui=no --without-x
-    configure.args-append   --enable-gui=gtk --with-x --disable-darwin
-    depends_lib-append      port:gtk1 port:xorg-libXt
+variant gtk1 description {Build GUI version using GTK 1.x widgets} requires x11 conflicts athena gtk2 motif {
+    configure.args-delete   --enable-gui=no
+    configure.args-append   --enable-gui=gtk --disable-darwin
+    depends_lib-append      port:gtk1
 }
-variant gtk2 description {Build GUI version using GTK 2.x widgets} conflicts athena gtk1 motif x11 {
-    configure.args-delete   --enable-gui=no --without-x
-    configure.args-append   --enable-gui=gtk2 --with-x --disable-darwin
-    depends_lib-append      port:gtk2 port:xorg-libXt
+variant gtk2 description {Build GUI version using GTK 2.x widgets} requires x11 conflicts athena gtk1 motif {
+    configure.args-delete   --enable-gui=no
+    configure.args-append   --enable-gui=gtk2 --disable-darwin
+    depends_lib-append      port:gtk2
 }
-variant motif description {Build GUI version with Motif widgets} conflicts athena gtk1 gtk2 x11 {
-    configure.args-delete   --enable-gui=no --without-x
-    configure.args-append   --enable-gui=motif --with-x --disable-darwin
-    depends_lib-append      lib:libXm:openmotif port:xorg-libXt
+variant motif description {Build GUI version with Motif widgets} requires x11 conflicts athena gtk1 gtk2 {
+    configure.args-delete   --enable-gui=no
+    configure.args-append   --enable-gui=motif --disable-darwin
+    depends_lib-append      lib:libXm:openmotif
 }
 
 variant tiny description {Build tiny feature set} {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100220/99358321/attachment-0001.html>