[139734] trunk/dports/gnome/evince

[devans at macports.org]

Revision: 139734
          https://trac.macports.org/changeset/139734
Author:   devans at macports.org
Date:     2015-08-25 11:28:06 -0700 (Tue, 25 Aug 2015)
Log Message:
-----------
evince: add +quartz variant, update dependencies, configuration, +nautilus conflicts with +quartz, increment revision.

Modified Paths:
--------------
    trunk/dports/gnome/evince/Portfile

Property Changed:
----------------
    trunk/dports/gnome/evince/


Property changes on: trunk/dports/gnome/evince
___________________________________________________________________
Modified: svn:mergeinfo
   - /users/devans/GNOME-3/stable/dports/gnome/evince:108269-136803
/users/devans/GNOME-3/unstable/dports/gnome/evince:114069-118152,121463-125801,132273-134523
   + /users/devans/GNOME-3/stable/dports/gnome/evince:108269-139733
/users/devans/GNOME-3/unstable/dports/gnome/evince:114069-118152,121463-125801,132273-134523

Modified: trunk/dports/gnome/evince/Portfile
===================================================================
--- trunk/dports/gnome/evince/Portfile	2015-08-25 18:10:28 UTC (rev 139733)
+++ trunk/dports/gnome/evince/Portfile	2015-08-25 18:28:06 UTC (rev 139734)
@@ -2,11 +2,12 @@
 # $Id$
 
 PortSystem          1.0
+PortGroup           active_variants 1.1
 PortGroup           gobject_introspection 1.0
 
 name                evince
 version             3.16.1
-revision            1
+revision            2
 license             GPL-2+
 set branch          [join [lrange [split ${version} .] 0 1] .]
 description         Evince is a document viewer capable of displaying \
@@ -39,8 +40,6 @@
                     port:gdk-pixbuf2 \
                     port:gtk3 \
                     port:libxml2 \
-                    port:xorg-libsm \
-                    port:xorg-libice \
                     port:libsecret \
                     port:gsettings-desktop-schemas \
                     port:poppler \
@@ -49,9 +48,6 @@
                     port:texlive-bin \
                     port:t1lib
 
-depends_run         port:gnome-settings-daemon \
-                    port:yelp
-
 gobject_introspection yes
 
 patchfiles          patch-browser-plugin-Makefile.am.diff
@@ -69,6 +65,7 @@
                     --disable-djvu \
                     --disable-xps \
                     --disable-nautilus \
+                    --disable-gnome-desktop \
                     --enable-compile-warnings=minimum \
                     --enable-debug \
                     --enable-ps \
@@ -80,17 +77,34 @@
 
 # browser plugin requires -std=c++11 -stdlib=libc++
 # disable plugin if libc++ is not configured
+# browser plugin uses gtk_plug_new which is only available with gtk3 +x11
+# disable plugin if variant +quartz is set
 
-if {${configure.cxx_stdlib} ne "libc++"} {
+if {${configure.cxx_stdlib} ne "libc++" || [variant_isset quartz]} {
     configure.args-append   --disable-browser-plugin
 }
 
+variant quartz {}
+
+if {[variant_isset quartz]} {
+    require_active_variants gtk3 quartz
+} else {
+    require_active_variants gtk3 x11
+    depends_run-append      port:gnome-settings-daemon \
+                            port:yelp
+
+# enable gnome-desktop thumbnail cache
+
+    depends_lib-append      port:gnome-desktop
+    configure.args-replace  --disable-gnome-desktop --enable-gnome-desktop
+}
+
 variant djvu description {Support for djvu documents using djvulibre} {
     configure.args-replace --disable-djvu --enable-djvu
     depends_lib-append port:djvulibre
 }
 
-variant nautilus description {Build optional nautilus extensions} {
+variant nautilus conflicts quartz description {Build optional nautilus extensions} {
     configure.args-replace  --disable-nautilus --enable-nautilus
     depends_lib-append      port:nautilus
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150825/5b360d58/attachment.html>