Revision: 148758 https://trac.macports.org/changeset/148758 Author: dports@macports.org Date: 2016-05-16 22:30:35 -0700 (Mon, 16 May 2016) Log Message: ----------- gnucash-devel: update to v2.6.12 [merge r148757 from gnucash] Revision Links: -------------- https://trac.macports.org/changeset/148757 Modified Paths: -------------- trunk/dports/gnome/gnucash-devel/Portfile 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,133443,135862,138425,141081,143967,144811 + /trunk/dports/gnome/gnucash:75076,76649,87597,88798,88800,89699,95009,95767,97916,98516,105077,133443,135862,138425,141081,143967,144811,148757 Modified: trunk/dports/gnome/gnucash-devel/Portfile =================================================================== --- trunk/dports/gnome/gnucash-devel/Portfile 2016-05-17 05:30:06 UTC (rev 148757) +++ trunk/dports/gnome/gnucash-devel/Portfile 2016-05-17 05:30:35 UTC (rev 148758) @@ -7,7 +7,7 @@ name gnucash-devel conflicts gnucash set my_name gnucash -version 2.6.11 +version 2.6.12 perl5.branches 5.22 categories gnome x11 license GPL-2+ @@ -34,8 +34,8 @@ distname ${my_name}-${version} use_bzip2 yes -checksums rmd160 b137950f9a0849db880b0a0544919212e1d0c6ec \ - sha256 516d97afa61971ca0a16f56319f3f7129db2da1a9d2c77ab7d8b4e6e9e018ac6 +checksums rmd160 092b0ca57ad273d8baeb7f277612189a474d7a29 \ + sha256 371fe9af3ec4b5d6839722b07c9064a51cfe247511edaa6286fc82710f700475 patchfiles patch-configure.ac.diff 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,133443,135862,138425,141081,143967,144811 + /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,135862,138425,141081,143967,144811,148757 Modified: trunk/dports/gnome/gnucash-devel/files/patch-configure.ac.diff =================================================================== --- trunk/dports/gnome/gnucash-devel/files/patch-configure.ac.diff 2016-05-17 05:30:06 UTC (rev 148757) +++ trunk/dports/gnome/gnucash-devel/files/patch-configure.ac.diff 2016-05-17 05:30:35 UTC (rev 148758) @@ -1,22 +1,18 @@ ---- configure.ac.orig 2015-03-30 12:21:17.000000000 -0700 -+++ configure.ac 2015-04-13 16:35:41.000000000 -0700 -@@ -457,11 +457,6 @@ - gnc_have_guile_2=no - gnc_have_guile_www=no - PKG_CHECK_MODULES(GUILE, -- [guile-2.0 >= 2.0.0], -- [gnc_have_guile_2=yes -- GUILE_EFFECTIVE_VERSION=2.0 -- AC_PATH_PROG([GUILD], guild)], -- [PKG_CHECK_MODULES(GUILE, - [guile-1.8 >= 1.8.5], - [GUILE_EFFECTIVE_VERSION=1.8], - [AC_MSG_ERROR([ -@@ -469,7 +464,6 @@ - correct version range. Perhaps you have not installed the guile - development packages? Gnucash requires at least version 1.8.5 to build. - ])]) --]) +--- configure.ac.orig 2016-05-16 21:59:52.000000000 -0700 ++++ configure.ac 2016-05-16 22:00:05.000000000 -0700 +@@ -357,7 +357,6 @@ + ;; + darwin*) + platform=darwin +- AC_DEFINE(PLATFORM_OSX,1,[Running on OSX, either X11 or Quartz]) + AC_MSG_RESULT($platform) + AC_MSG_CHECKING(For GDK-Quartz) + platform=osx +@@ -429,7 +428,6 @@ + AC_SUBST(REGEX_LIBS) - AM_CONDITIONAL(GNC_HAVE_GUILE_2, test "x${gnc_have_guile_2}" = xyes) - AC_SUBST(GUILE_EFFECTIVE_VERSION) + AM_CONDITIONAL(PLATFORM_LINUX, test "x$platform" = "xlinux/other") +-AM_CONDITIONAL(PLATFORM_OSX, test "x$platform" = "xdarwin") + AM_CONDITIONAL(PLATFORM_OSX_QUARTZ, test "x$platform" = "xdarwin/quartz") + AM_CONDITIONAL(PLATFORM_WIN32, test "x$platform" = "xwin32") + AM_CONDITIONAL(OS_WIN32, test "x$native_win32" = "xyes")