Revision: 139681 https://trac.macports.org/changeset/139681 Author: devans@macports.org Date: 2015-08-24 12:23:25 -0700 (Mon, 24 Aug 2015) Log Message: ----------- GNOME-3/unstable: evince, add +quartz variant, update dependencies, configuration, +nautilus conflicts with +quartz, increment revision. Modified Paths: -------------- users/devans/GNOME-3/unstable/dports/gnome/evince/Portfile Property Changed: ---------------- users/devans/GNOME-3/unstable/dports/gnome/evince/ Property changes on: users/devans/GNOME-3/unstable/dports/gnome/evince ___________________________________________________________________ Modified: svn:mergeinfo - /trunk/dports/gnome/evince:108265-127228 /users/devans/GNOME-3/stable/dports/gnome/evince:132144-136490 /users/devans/GNOME-3/unstable/dports/gnome/evince:114069-118152,121463-125801 + /trunk/dports/gnome/evince:108265-139080 /users/devans/GNOME-3/stable/dports/gnome/evince:132144-139680 /users/devans/GNOME-3/unstable/dports/gnome/evince:114069-118152,121463-125801 Modified: users/devans/GNOME-3/unstable/dports/gnome/evince/Portfile =================================================================== --- users/devans/GNOME-3/unstable/dports/gnome/evince/Portfile 2015-08-24 19:13:11 UTC (rev 139680) +++ users/devans/GNOME-3/unstable/dports/gnome/evince/Portfile 2015-08-24 19:23:25 UTC (rev 139681) @@ -2,10 +2,12 @@ # $Id$ PortSystem 1.0 +PortGroup active_variants 1.1 PortGroup gobject_introspection 1.0 name evince version 3.17.4 +revision 1 license GPL-2+ set branch [join [lrange [split ${version} .] 0 1] .] description Evince is a document viewer for multiple document formats like pdf, and many others. @@ -36,8 +38,6 @@ port:gdk-pixbuf2 \ port:gtk3 \ port:libxml2 \ - port:xorg-libsm \ - port:xorg-libice \ port:libsecret \ port:gsettings-desktop-schemas \ port:poppler \ @@ -46,9 +46,6 @@ port:texlive-bin \ port:t1lib -depends_run port:gnome-settings-daemon \ - port:yelp - gobject_introspection yes patchfiles patch-browser-plugin-Makefile.am.diff @@ -67,6 +64,7 @@ --disable-xps \ --disable-multimedia \ --disable-nautilus \ + --disable-gnome-desktop \ --enable-compile-warnings=minimum \ --enable-debug \ --enable-ps \ @@ -78,11 +76,28 @@ # 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 @@ -94,7 +109,7 @@ port:gstreamer1-gst-plugins-base } -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 }