Revision: 139069 https://trac.macports.org/changeset/139069 Author: devans@macports.org Date: 2015-07-30 18:49:40 -0700 (Thu, 30 Jul 2015) Log Message: ----------- gnumeric: update to version 1.12.23, add +quartz variant and a run time dependency on gnome-themes-standard, drop notes concerning supplementary ports and just depend on gnome-settings-daemon and yelp at run time if +quartz is not set. Modified Paths: -------------- trunk/dports/gnome/gnumeric/Portfile Property Changed: ---------------- trunk/dports/gnome/gnumeric/ Property changes on: trunk/dports/gnome/gnumeric ___________________________________________________________________ Modified: svn:mergeinfo - /users/devans/GNOME-3/stable/dports/gnome/gnumeric:126043-138706 + /users/devans/GNOME-3/stable/dports/gnome/gnumeric:126043-139066 Modified: trunk/dports/gnome/gnumeric/Portfile =================================================================== --- trunk/dports/gnome/gnumeric/Portfile 2015-07-31 01:48:29 UTC (rev 139068) +++ trunk/dports/gnome/gnumeric/Portfile 2015-07-31 01:49:40 UTC (rev 139069) @@ -2,12 +2,11 @@ # $Id$ PortSystem 1.0 -PortGroup active_variants 1.0 +PortGroup active_variants 1.1 PortGroup gobject_introspection 1.0 name gnumeric -version 1.12.22 -revision 2 +version 1.12.23 set branch [join [lrange [split ${version} .] 0 1] .] license GPL-2+ @@ -27,8 +26,8 @@ master_sites gnome:sources/${name}/${branch}/ use_xz yes -checksums rmd160 ad8e2fd15c287a6fb153187d3d2012c1f8d88d45 \ - sha256 3908cfd6520b599eefefe222aadeaa5126394b54d9a9a7f5e0f938eb674dcf47 +checksums rmd160 e58b0bd7b41d187684eabc1a360ea892f18293eb \ + sha256 00474cbf1e70f62062974d0beb5f65ebc45d1047bc8fd0a1133e3d9725e19551 # set pbranch to desired perl version # currently 5.22 (#48365) @@ -43,18 +42,18 @@ port:libtool # update-desktop-database is provided by desktop-file-utils +# rarian is needed for scrollkeeper-update. depends_lib port:desktop-file-utils \ + port:rarian \ port:gtk3 \ port:goffice \ port:psiconv \ port:pxlib \ port:perl${pbranch} -# rarian is needed for scrollkeeper-update. +depends_run port:gnome-themes-standard -depends_run port:rarian - gobject_introspection yes patchfiles patch-configure.ac.diff @@ -74,6 +73,18 @@ --without-gda \ --without-python +variant quartz {} + +if {[variant_isset quartz]} { + require_active_variants gtk3 quartz + require_active_variants goffice quartz +} else { + require_active_variants gtk3 x11 + require_active_variants goffice "" quartz + depends_run-append port:gnome-settings-daemon \ + port:yelp +} + variant database description {builds with support for GDA database} { depends_lib-append port:libgda5 configure.args-replace --without-gda --with-gda @@ -98,10 +109,3 @@ } livecheck.type gnome - -# yelp is currently not available in a +quartz environment due to dependency issues, -# see #39898 #40282 #40116 -notes \ -"Recommended supplementary ports: - gnome-themes-standard provides the default Gnome Adwaita theme - yelp provides a help browser for Gnome apps"