Revision: 133444 https://trac.macports.org/changeset/133444 Author: dports@macports.org Date: 2015-03-01 15:44:10 -0800 (Sun, 01 Mar 2015) Log Message: ----------- gnucash-devel: force configure to use guile18 (#46270) [merge r133443 from gnucash port] Revision Links: -------------- https://trac.macports.org/changeset/133443 Modified Paths: -------------- trunk/dports/gnome/gnucash-devel/Portfile Added Paths: ----------- trunk/dports/gnome/gnucash-devel/files/patch-configure.ac.diff Property Changed: ---------------- trunk/dports/gnome/gnucash-devel/ trunk/dports/gnome/gnucash-devel/Portfile Property changes on: trunk/dports/gnome/gnucash-devel ___________________________________________________________________ Modified: svn:mergeinfo - /trunk/dports/gnome/gnucash:75076,76649,87597,88798,88800,89699,95009,95767,97916,98516,105077 + /trunk/dports/gnome/gnucash:75076,76649,87597,88798,88800,89699,95009,95767,97916,98516,105077,133443 Modified: trunk/dports/gnome/gnucash-devel/Portfile =================================================================== --- trunk/dports/gnome/gnucash-devel/Portfile 2015-03-01 23:41:00 UTC (rev 133443) +++ trunk/dports/gnome/gnucash-devel/Portfile 2015-03-01 23:44:10 UTC (rev 133444) @@ -7,6 +7,7 @@ conflicts gnucash set my_name gnucash version 2.6.5 +revision 1 categories gnome x11 license GPL-2+ maintainers dports openmaintainer @@ -35,6 +36,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.) @@ -81,6 +84,8 @@ # aqbanking is not universal universal_variant no +use_autoreconf yes + configure.args --disable-glibtest \ --disable-dependency-tracking \ --disable-aqbanking \ @@ -88,6 +93,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 Property changes on: trunk/dports/gnome/gnucash-devel/Portfile ___________________________________________________________________ Modified: svn:mergeinfo - /trunk/dports/gnome/gnucash/Portfile:75076,76649,77149,77299,77346,78188,79161,80328,80330,84977,86481,87597,88798,88800,89699,94888,94890,94892,95009,95767,97916,98516,105077,116990,118521,118834-118835,120699,120704,121044,129619,129799 + /trunk/dports/gnome/gnucash/Portfile:75076,76649,77149,77299,77346,78188,79161,80328,80330,84977,86481,87597,88798,88800,89699,94888,94890,94892,95009,95767,97916,98516,105077,116990,118521,118834-118835,120699,120704,121044,129619,129799,133443 Copied: trunk/dports/gnome/gnucash-devel/files/patch-configure.ac.diff (from rev 133443, trunk/dports/gnome/gnucash/files/patch-configure.ac.diff) =================================================================== --- trunk/dports/gnome/gnucash-devel/files/patch-configure.ac.diff (rev 0) +++ trunk/dports/gnome/gnucash-devel/files/patch-configure.ac.diff 2015-03-01 23:44:10 UTC (rev 133444) @@ -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)