[119699] trunk/dports/net/pidgin/Portfile

[devans at macports.org]

Revision: 119699
          https://trac.macports.org/changeset/119699
Author:   devans at macports.org
Date:     2014-05-03 16:47:40 -0700 (Sat, 03 May 2014)
Log Message:
-----------
pidgin: add +x11 default variant, dummy +no_x11 remains for legacy compatibility (#39383).

Modified Paths:
--------------
    trunk/dports/net/pidgin/Portfile

Modified: trunk/dports/net/pidgin/Portfile
===================================================================
--- trunk/dports/net/pidgin/Portfile	2014-05-03 22:51:13 UTC (rev 119698)
+++ trunk/dports/net/pidgin/Portfile	2014-05-03 23:47:40 UTC (rev 119699)
@@ -5,7 +5,7 @@
 
 name                pidgin
 version             2.10.7
-revision            4
+revision            5
 categories          net
 platforms           darwin
 license             GPL-2+
@@ -68,16 +68,17 @@
                     --with-nspr-libs=${prefix}/lib/nspr \
                     --with-nss-includes=${prefix}/include/nss \
                     --with-nss-libs=${prefix}/lib/nss \
-                    --disable-dependency-tracking
+                    --disable-dependency-tracking \
+                    --without-x
 
 # --disable-dependency-tracking was added because a +universal perl will result in
 # PERL_CFLAGS containing multiple -arch arguments... this is the easiest workaround
+
 configure.ldflags-append    -bind_at_load
 configure.cppflags-append   -no-cpp-precomp
 
 variant finch_only requires finch description {Build without pidgin} {
-    configure.args-append   --disable-gtkui \
-                            --without-x
+    configure.args-append   --disable-gtkui
 }
 
 variant finch description {Build with finch} {
@@ -93,18 +94,34 @@
     }
 }
 
-post-activate {
-    system "dbus-uuidgen --ensure"
-    system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
-    system "export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` && \
-        gconftool-2 --makefile-install-rule ${prefix}/etc/gconf/schemas/*.schemas"
+variant x11 conflicts no_x11 quartz {
+    depends_lib-append      port:xorg-libX11 \
+                            port:xorg-libXext \
+                            port:xorg-libXScrnSaver \
+                            port:xorg-libice \
+                            port:xorg-libsm
+
+    configure.args-delete   --without-x \
+                            --disable-screensaver \
+                            --disable-sm
+
+    configure.args-append   --with-x \
+                            --x-includes=${prefix}/include \
+                            --x-libraries=${prefix}/lib \
+                            --enable-screensaver \
+                            --enable-sm
 }
 
-variant no_x11 {
-    configure.args-append   --without-x
+# Legacy no_x11 variant to be removed after May 2015.
+variant no_x11 conflicts x11 description {Legacy compatibility variant} {}
+
+if {[variant_isset no_x11]} {
+    default_variants -x11
+} else {
+    default_variants +x11
 }
 
-variant quartz requires no_x11 {
+variant quartz conflicts x11 {
     configure.args-append   --disable-gestures
 
     depends_build-append    port:intltool
@@ -119,6 +136,13 @@
     configure.args-delete   --disable-gtkspell
 }
 
+post-activate {
+    system "dbus-uuidgen --ensure"
+    system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
+    system "export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` && \
+        gconftool-2 --makefile-install-rule ${prefix}/etc/gconf/schemas/*.schemas"
+}
+
 livecheck.type      regex
 livecheck.url       http://sourceforge.net/projects/pidgin/files/Pidgin/
 livecheck.regex     "\/Pidgin\/(\\d+(?:\\.\\d+)*)\/"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140503/7701ae65/attachment.html>