Revision: 133443 https://trac.macports.org/changeset/133443 Author: dports@macports.org Date: 2015-03-01 15:41:00 -0800 (Sun, 01 Mar 2015) Log Message: ----------- gnucash: force configure to use guile18 (#46270) Modified Paths: -------------- trunk/dports/gnome/gnucash/Portfile Added Paths: ----------- trunk/dports/gnome/gnucash/files/patch-configure.ac.diff Modified: trunk/dports/gnome/gnucash/Portfile =================================================================== --- trunk/dports/gnome/gnucash/Portfile 2015-03-01 23:34:02 UTC (rev 133442) +++ trunk/dports/gnome/gnucash/Portfile 2015-03-01 23:41:00 UTC (rev 133443) @@ -5,6 +5,7 @@ name gnucash version 2.6.5 +revision 1 conflicts gnucash-devel categories gnome x11 license GPL-2+ @@ -30,6 +31,8 @@ checksums rmd160 187632d0622519d468c1d40a8e64601df397c686 \ sha256 b1b1a943a322e7bf7afb0c2202f491560d4734a2036438bf9820378c34203d65 +patchfiles patch-configure.ac.diff + post-patch { # gnc-fq-dump needs to be patched to use MacPorts perl. # (autoconf takes care of the other perl scripts.) @@ -76,6 +79,8 @@ # aqbanking is not universal universal_variant no +use_autoreconf yes + configure.args --disable-glibtest \ --disable-dependency-tracking \ --disable-aqbanking \ @@ -83,6 +88,10 @@ --disable-dbi \ --with-html-engine=webkit configure.perl ${prefix}/bin/perl5.16 +configure.env \ + GUILE=${prefix}/bin/guile18 \ + GUILE_CONFIG=${prefix}/bin/guile18-config \ + GUILE_TOOLS=${prefix}/bin/guile18-tools # 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 Added: trunk/dports/gnome/gnucash/files/patch-configure.ac.diff =================================================================== --- trunk/dports/gnome/gnucash/files/patch-configure.ac.diff (rev 0) +++ trunk/dports/gnome/gnucash/files/patch-configure.ac.diff 2015-03-01 23:41:00 UTC (rev 133443) @@ -0,0 +1,25 @@ +--- configure.ac 2014-12-15 17:56:52.000000000 -0500 ++++ configure.ac 2015-03-01 17:30:54.000000000 -0500 +@@ -467,21 +467,11 @@ + [ GUILE1_PROGS ], + [ GUILE_PROGS ])]) + ], [ +- PKG_CHECK_MODULES(GUILE, +- [guile-2.0 >= 2.0.0], +- [m4_ifdef([GUILE_PROGS], +- [ GUILE_PROGS +- gnc_have_guile_2=yes ], +- [ AC_MSG_ERROR([ guile 2 is found on your system, but appears +- to export different autoconf macros than what we expected. Please report this as a bug +- in GnuCash, so we can fix this for your platform.]) ]) +- ], +- [AC_MSG_ERROR([ ++ AC_MSG_ERROR([ + guile does not appear to be installed correctly, or is not in the + correct version range. Perhaps you have not installed the guile + development packages? Gnucash requires at least version 1.8.5 to build. + ])]) +-]) + + AM_CONDITIONAL(GNC_HAVE_GUILE_2, test "${gnc_have_guile_2}" = yes) + AC_SUBST(GUILE_EFFECTIVE_VERSION)