Index: Portfile
===================================================================
--- Portfile	(revision 42914)
+++ Portfile	(working copy)
@@ -34,29 +34,34 @@
                                 --enable-disassembler \
                                 --enable-preemption \
                                 --with-system-libffi --with-system-libsigsegv
+                                --disable-gtk \
+                                --without-tk \
+                                --without-tcl \
+                                --with-x
                                 # --enable-jit
 
 test.run                yes
 test.target             check
 
-default_variants +gtk +tcltk
+if {![variant_isset no_x11]} {
+    default_variants +gtk +tcltk
+}
 
-variant gtk {
+variant gtk conflicts no_x11 {
         depends_lib-append port:gtk2
+        configure.args-delete --disable-gtk
         configure.args-append --enable-gtk
 }
 
-variant tcltk {
+variant tcltk conflicts no_x11 {
         depends_lib-append port:tcl port:tk
+        configure.args-delete --without-tk --without-tcl
         configure.args-append --with-tk --with-tcl
 }
 
-variant nox conflicts gtk conflicts tk {
-        configure.args-append \
-                --without-x \
-                --disable-gtk \
-                --without-tk \
-                --without-tcl
+variant no_x11 conflicts gtk tcltk {
+        configure.args-delete --with-x
+        configure.args-append --without-x
 }
 
 platform darwin 6 {