Revision: 120699 https://trac.macports.org/changeset/120699 Author: devans@macports.org Date: 2014-06-05 14:35:26 -0700 (Thu, 05 Jun 2014) Log Message: ----------- gnucash: disable run dependency on yelp if +quartz is set, comment out obsolete gtkhtml variant, no longer supported in latest version. Modified Paths: -------------- trunk/dports/gnome/gnucash/Portfile Modified: trunk/dports/gnome/gnucash/Portfile =================================================================== --- trunk/dports/gnome/gnucash/Portfile 2014-06-05 21:14:58 UTC (rev 120698) +++ trunk/dports/gnome/gnucash/Portfile 2014-06-05 21:35:26 UTC (rev 120699) @@ -43,10 +43,19 @@ port:libgnomeui \ path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk \ port:goffice08 \ - port:p5.16-finance-quote + port:p5.16-finance-quote -depends_run port:yelp +# yelp currently requires X11 to build so disable dependency if building +# with +quartz +# +# TODO: add +x11 +quartz variants to distinguish one build from the other +# since they have different binary dependencies. Otherwise, rev-upgrade +# errors may occur +if {![variant_isset quartz]} { + depends_run port:yelp +} + # TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released platform darwin { set cxxstdlib {} @@ -68,7 +77,7 @@ } } -# aqbanking and libgtkhtml3 are not universal +# aqbanking is not universal universal_variant no configure.args --disable-glibtest \ @@ -79,12 +88,16 @@ --with-html-engine=webkit configure.perl ${prefix}/bin/perl5.16 -variant gtkhtml description {Use gtkhtml instead of webkit-gtk for html rendering} { - configure.args-delete --with-html-engine=webkit - depends_lib-delete path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk - depends_lib-append port:libgtkhtml3 -} +# this variant is obsolete as the current version of gnucash no longer +# supports libgtkhtml3, only webkit-gtk. It didn't work anyway due to the +# webkit-gtk dependency manipulations above. +# variant gtkhtml description {Use gtkhtml instead of webkit-gtk for html rendering} { +# configure.args-delete --with-html-engine=webkit +# depends_lib-delete path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk +# depends_lib-append port:libgtkhtml3 +# } + variant hbci description {AqBanking/HBCI support} { depends_lib-append port:aqbanking5-gtk configure.args-delete --disable-aqbanking @@ -99,8 +112,8 @@ variant dbi description {Adds dbi backend support} { depends_lib-append port:libdbi \ - port:libdbi-drivers - configure.args-delete --disable-dbi + port:libdbi-drivers + configure.args-delete --disable-dbi configure.args-append --enable-dbi notes-append "gnucash DBI backend support requires the libdbi-drivers port to be built with support for the desired databases. sqlite3 is available by default; for MySQL or PostgreSQL support, ensure that the corresponding variant is selected for libdbi-drivers." }