[135862] trunk/dports/gnome/gnucash

[dports at macports.org]

Revision: 135862
          https://trac.macports.org/changeset/135862
Author:   dports at macports.org
Date:     2015-05-05 14:54:40 -0700 (Tue, 05 May 2015)
Log Message:
-----------
gnucash: update to v2.6.6; remove long-obsolete (and commented out)
gtkhtml variant

Modified Paths:
--------------
    trunk/dports/gnome/gnucash/Portfile
    trunk/dports/gnome/gnucash/files/patch-configure.ac.diff

Modified: trunk/dports/gnome/gnucash/Portfile
===================================================================
--- trunk/dports/gnome/gnucash/Portfile	2015-05-05 18:55:45 UTC (rev 135861)
+++ trunk/dports/gnome/gnucash/Portfile	2015-05-05 21:54:40 UTC (rev 135862)
@@ -4,8 +4,7 @@
 PortSystem        1.0
 
 name              gnucash
-version           2.6.5
-revision          1
+version           2.6.6
 conflicts         gnucash-devel
 categories        gnome x11
 license           GPL-2+
@@ -28,8 +27,8 @@
 
 use_bzip2         yes
 
-checksums         rmd160  187632d0622519d468c1d40a8e64601df397c686 \
-                  sha256  b1b1a943a322e7bf7afb0c2202f491560d4734a2036438bf9820378c34203d65
+checksums         rmd160  6032708fd7f0ac493bb8fae4a55460df047d1dfc \
+                  sha256  2337c791511ec35ca1ab207bac5f80dd5764df6029adf46a15154df370c97180
 
 patchfiles        patch-configure.ac.diff
 
@@ -44,6 +43,7 @@
     fs-traverse f ${worksrcpath} {
         if [regexp {\.[ch]$} ${f}] {
             reinplace -locale C "s|<libguile\\.h>|<libguile18.h>|g" ${f}
+            reinplace -locale C "s|<libguile/|<libguile18/|g" ${f}
         }
     }
 }
@@ -101,16 +101,6 @@
     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
-# 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  path:lib/libaqbanking.dylib:aqbanking5-gtk
     configure.args-delete   --disable-aqbanking

Modified: trunk/dports/gnome/gnucash/files/patch-configure.ac.diff
===================================================================
--- trunk/dports/gnome/gnucash/files/patch-configure.ac.diff	2015-05-05 18:55:45 UTC (rev 135861)
+++ trunk/dports/gnome/gnucash/files/patch-configure.ac.diff	2015-05-05 21:54:40 UTC (rev 135862)
@@ -1,25 +1,22 @@
---- 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,
+--- 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],
--                  [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
+-		  [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.
    ])])
 -])
  
- AM_CONDITIONAL(GNC_HAVE_GUILE_2, test "${gnc_have_guile_2}" = yes)
+ AM_CONDITIONAL(GNC_HAVE_GUILE_2, test "x${gnc_have_guile_2}" = xyes)
  AC_SUBST(GUILE_EFFECTIVE_VERSION)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150505/6e4fc26d/attachment.html>