[119749] trunk/dports/comms/gnokii/Portfile

[mojca at macports.org]

Revision: 119749
          https://trac.macports.org/changeset/119749
Author:   mojca at macports.org
Date:     2014-05-05 07:56:02 -0700 (Mon, 05 May 2014)
Log Message:
-----------
gnokii: replace no_x11 by x11 (#39383, maintainer timeout)

Modified Paths:
--------------
    trunk/dports/comms/gnokii/Portfile

Modified: trunk/dports/comms/gnokii/Portfile
===================================================================
--- trunk/dports/comms/gnokii/Portfile	2014-05-05 14:46:35 UTC (rev 119748)
+++ trunk/dports/comms/gnokii/Portfile	2014-05-05 14:56:02 UTC (rev 119749)
@@ -30,7 +30,7 @@
                     sha256  8f5a083b05c1a66a3402ca5cd80084e14c2c0632c991bb53b03c78e9adb02501
 
 depends_build       port:intltool
-depends_lib         port:gtk2 port:libical port:libusb-compat port:iso-codes port:readline
+depends_lib         port:libical port:libusb-compat port:iso-codes port:readline port:gettext
 
 post-patch {
     reinplace "s|/etc/gnokiirc|${prefix}/etc/gnokiirc|" ${worksrcpath}/common/cfgreader.c
@@ -43,7 +43,8 @@
                     --disable-smsd \
                     --with-libiconv-prefix=${prefix} \
                     --with-readline=${prefix} \
-                    --disable-bluetooth
+                    --disable-bluetooth \
+                    --without-x
 
 post-activate {
     if {![file exists ${prefix}/etc/gnokiirc]} {
@@ -51,11 +52,6 @@
     }
 }
 
-variant no_x11 {
-  depends_lib-delete    port:gtk2
-  configure.args-append --without-x
-}
-
 # bluetooth does not work anymore on recent versions of Mac OS X, see #34162
 variant bluetooth description {Enable support for bluetooth (broken on Mac OS X >=10.7)} {
     configure.args-replace --disable-bluetooth --enable-bluetooth
@@ -64,6 +60,19 @@
     }
 }
 
+# legacy variant - remove after May 2015
+variant no_x11 conflicts x11 description {legacy compatibility variant} {}
+variant x11 conflicts no_x11 {
+    depends_lib-append      port:gtk2
+    configure.args-delete   --without-x
+}
+
+if {[variant_isset no_x11]} {
+    default_variants -x11
+} else { 
+    default_variants +x11
+}
+
 platform macosx {
     configure.ldflags-append -framework CoreFoundation
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140505/5bad0fe9/attachment.html>