Update to 2.4.0:

The GnuCash development team proudly announces GnuCash 2.4.0, the
latest stable release of the GnuCash Free Accounting Software. With
this new release series, GnuCash can use an SQL database using
SQLite3, MySQL or PostgreSQL. It runs on GNU/Linux, *BSD, Solaris,
Microsoft Windows and Mac OSX.

WARNING: You should uninstall any earlier GnuCash version from your
system prior to installing 2.4.0.

Failing to do so may result in startup errors. In particular on
Windows this may cause "Parse error: entry point not found" errors.

Major changes in the 2.4.0 release include;

    * In addition to the XML backend, Gnucash can now use a SQLite3,
    MySQL or PostgreSQL database to store the data. This is a new
    implementation using libdbi. It supports all features including
    the business features. In order to build with this, add
    --enable-dbi to the configure command. In addition to the
    libdbi-dev package for your distribution, you will also need
    the appropriate DBD (libdbi driver) package for sqlite3, mysql
    or postgresql.

    (not enabled in pkgsrc due to lack of recent libdbi)

    * As a replacement for the current GtkHTML HTML engine used to
    display reports and graphs, Gnucash can use WebKit. WebKit is
    the engine used by Google Chrome on Windows and Safari on Apple.

    (enabled in pkgsrc)

8 files changed, 209 insertions, 267 deletions

diff --git a/finance/gnucash/Makefile b/finance/gnucash/Makefile
index 60d518f88ac..ca8fb596ae5 100644
--- a/finance/gnucash/Makefile
+++ b/finance/gnucash/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.147 2010/11/18 23:59:18 obache Exp $
+# $NetBSD: Makefile,v 1.148 2010/12/23 00:10:49 wiz Exp $
 #
 
-DISTNAME=		gnucash-2.2.9
-PKGREVISION=		12
+DISTNAME=		gnucash-2.4.0
 CATEGORIES=		finance
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=gnucash/}
 
@@ -24,6 +23,9 @@ USE_TOOLS+=		gmake intltool makeinfo msgfmt perl:run pkg-config
 GNU_CONFIGURE=		yes
 INFO_FILES=		YES
 
+CONFIGURE_ARGS+=	--with-html-engine=webkit
+CONFIGURE_ARGS+=	--disable-dbi
+
 REPLACE_PERL+=		src/quotes/gnc-fq-dump
 REPLACE_PERL+=		src/optional/xsl/vcard-gnccustomer.pl
 
@@ -48,30 +50,32 @@ GCONF_SCHEMAS+=	apps_gnucash_dialog_business_common.schemas
 post-install:
 	rm ${DESTDIR}${PREFIX}/bin/gnc-test-env
 
-.include "../../archivers/bzip2/buildlink3.mk"
+# re-add any that are necessary, will be removed completely
+# during one of the next updates
+#.include "../../archivers/bzip2/buildlink3.mk"
 .include "../../devel/GConf/schemas.mk"
 .include "../../devel/glib2/buildlink3.mk"
-#BUILDLINK_API_DEPENDS.swig+=	swig>=1.3.28
-#.include "../../devel/swig/buildlink3.mk"
-.include "../../devel/libgsf/buildlink3.mk"
-.include "../../devel/libglade/buildlink3.mk"
+##BUILDLINK_API_DEPENDS.swig+=	swig>=1.3.28
+##.include "../../devel/swig/buildlink3.mk"
+#.include "../../devel/libgsf/buildlink3.mk"
+#.include "../../devel/libglade/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
-BUILDLINK_API_DEPENDS.pango+=	pango>=1.8.0
-.include "../../devel/pango/buildlink3.mk"
-.include "../../devel/popt/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
+#BUILDLINK_API_DEPENDS.pango+=	pango>=1.8.0
+#.include "../../devel/pango/buildlink3.mk"
+#.include "../../devel/popt/buildlink3.mk"
+#.include "../../devel/zlib/buildlink3.mk"
 .include "../../finance/libofx/buildlink3.mk"
-.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+#.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../lang/guile/buildlink3.mk"
-.include "../../lang/perl5/buildlink3.mk"
-.include "../../misc/goffice0.6/buildlink3.mk"
-BUILDLINK_API_DEPENDS.libgnomeprint+=	libgnomeprint>=2.10.0
-.include "../../print/libgnomeprint/buildlink3.mk"
-BUILDLINK_API_DEPENDS.libgnomeprintui+=	libgnomeprintui>=2.10.0
-.include "../../print/libgnomeprintui/buildlink3.mk"
+#.include "../../lang/perl5/buildlink3.mk"
+.include "../../misc/goffice0.8/buildlink3.mk"
+#BUILDLINK_API_DEPENDS.libgnomeprint+=	libgnomeprint>=2.10.0
+#.include "../../print/libgnomeprint/buildlink3.mk"
+#BUILDLINK_API_DEPENDS.libgnomeprintui+=	libgnomeprintui>=2.10.0
+#.include "../../print/libgnomeprintui/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
-BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.6.3
-.include "../../www/gtkhtml314/buildlink3.mk"
+#BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.6.3
+.include "../../www/webkit-gtk/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/finance/gnucash/PLIST b/finance/gnucash/PLIST
index afb67f37111..49673525d30 100644
--- a/finance/gnucash/PLIST
+++ b/finance/gnucash/PLIST
@@ -1,23 +1,20 @@
-@comment $NetBSD: PLIST,v 1.38 2010/11/07 23:27:53 wiz Exp $
+@comment $NetBSD: PLIST,v 1.39 2010/12/23 00:10:50 wiz Exp $
 bin/gnc-fq-check
 bin/gnc-fq-dump
 bin/gnc-fq-helper
 bin/gnc-fq-update
 bin/gnucash
-bin/gnucash-bin
 bin/gnucash-env
 bin/gnucash-make-guids
 bin/gnucash-valgrind
 bin/update-gnucash-gconf
 etc/gnucash/config
+etc/gnucash/environment
 include/gnucash/Account.h
 include/gnucash/FreqSpec.h
 include/gnucash/GNCId.h
 include/gnucash/Period.h
 include/gnucash/Query.h
-include/gnucash/QueryCore.h
-include/gnucash/QueryNew.h
-include/gnucash/QueryObject.h
 include/gnucash/QuickFill.h
 include/gnucash/Recurrence.h
 include/gnucash/SX-book.h
@@ -31,7 +28,6 @@ include/gnucash/TransLog.h
 include/gnucash/Transaction.h
 include/gnucash/account-quickfill.h
 include/gnucash/basiccell.h
-include/gnucash/binreloc.h
 include/gnucash/cap-gains.h
 include/gnucash/cashobjects.h
 include/gnucash/cell-factory.h
@@ -39,11 +35,13 @@ include/gnucash/cellblock.h
 include/gnucash/checkboxcell.h
 include/gnucash/combocell.h
 include/gnucash/datecell.h
-include/gnucash/deprecated.h
 include/gnucash/dialog-account.h
 include/gnucash/dialog-book-close.h
 include/gnucash/dialog-column-view.h
 include/gnucash/dialog-commodity.h
+include/gnucash/dialog-custom-report.h
+include/gnucash/dialog-file-access.h
+include/gnucash/dialog-object-references.h
 include/gnucash/dialog-options.h
 include/gnucash/dialog-preferences.h
 include/gnucash/dialog-query-list.h
@@ -67,7 +65,6 @@ include/gnucash/gnc-accounting-period.h
 include/gnucash/gnc-amount-edit.h
 include/gnucash/gnc-associate-account.h
 include/gnucash/gnc-basic-gobject.h
-include/gnucash/gnc-book.h
 include/gnucash/gnc-budget.h
 include/gnucash/gnc-commodity-edit.h
 include/gnucash/gnc-commodity.h
@@ -93,11 +90,11 @@ include/gnucash/gnc-druid-provider.h
 include/gnucash/gnc-druid.h
 include/gnucash/gnc-embedded-window.h
 include/gnucash/gnc-engine.h
+include/gnucash/gnc-entry-quickfill.h
 include/gnucash/gnc-euro.h
 include/gnucash/gnc-event.h
 include/gnucash/gnc-exp-parser.h
 include/gnucash/gnc-file.h
-include/gnucash/gnc-filepath-utils.h
 include/gnucash/gnc-frequency.h
 include/gnucash/gnc-general-search.h
 include/gnucash/gnc-general-select.h
@@ -107,18 +104,28 @@ include/gnucash/gnc-gui-query.h
 include/gnucash/gnc-help-utils.h
 include/gnucash/gnc-helpers.h
 include/gnucash/gnc-hooks.h
+include/gnucash/gnc-html-extras.h
+include/gnucash/gnc-html-factory.h
+include/gnucash/gnc-html-graph-gog-extras.h
+include/gnucash/gnc-html-graph-gog-gtkhtml.h
+include/gnucash/gnc-html-graph-gog-webkit.h
 include/gnucash/gnc-html-graph-gog.h
+include/gnucash/gnc-html-gtkhtml-p.h
+include/gnucash/gnc-html-gtkhtml.h
 include/gnucash/gnc-html-history.h
+include/gnucash/gnc-html-p.h
+include/gnucash/gnc-html-webkit-p.h
+include/gnucash/gnc-html-webkit.h
 include/gnucash/gnc-html.h
 include/gnucash/gnc-icons.h
 include/gnucash/gnc-import-desc-format.h
 include/gnucash/gnc-import-format-cb.h
+include/gnucash/gnc-keyring.h
 include/gnucash/gnc-main-window.h
 include/gnucash/gnc-menu-extensions.h
 include/gnucash/gnc-module-api.h
 include/gnucash/gnc-module.h
 include/gnucash/gnc-numeric.h
-include/gnucash/gnc-path.h
 include/gnucash/gnc-period-select.h
 include/gnucash/gnc-plugin-file-history.h
 include/gnucash/gnc-plugin-manager.h
@@ -150,7 +157,31 @@ include/gnucash/gnc-tree-view.h
 include/gnucash/gnc-ui-common.h
 include/gnucash/gnc-ui-util.h
 include/gnucash/gnc-window.h
-include/gnucash/gncObject.h
+include/gnucash/gncAddress.h
+include/gnucash/gncAddressP.h
+include/gnucash/gncBillTerm.h
+include/gnucash/gncBillTermP.h
+include/gnucash/gncBusGuile.h
+include/gnucash/gncBusiness.h
+include/gnucash/gncCustomer.h
+include/gnucash/gncCustomerP.h
+include/gnucash/gncEmployee.h
+include/gnucash/gncEmployeeP.h
+include/gnucash/gncEntry.h
+include/gnucash/gncEntryP.h
+include/gnucash/gncIDSearch.h
+include/gnucash/gncInvoice.h
+include/gnucash/gncInvoiceP.h
+include/gnucash/gncJob.h
+include/gnucash/gncJobP.h
+include/gnucash/gncOrder.h
+include/gnucash/gncOrderP.h
+include/gnucash/gncOwner.h
+include/gnucash/gncOwnerP.h
+include/gnucash/gncTaxTable.h
+include/gnucash/gncTaxTableP.h
+include/gnucash/gncVendor.h
+include/gnucash/gncVendorP.h
 include/gnucash/gtable.h
 include/gnucash/guid.h
 include/gnucash/guile-util.h
@@ -172,6 +203,7 @@ include/gnucash/qofbackend-p.h
 include/gnucash/qofbackend.h
 include/gnucash/qofbook.h
 include/gnucash/qofbookmerge.h
+include/gnucash/qofbookslots.h
 include/gnucash/qofchoice.h
 include/gnucash/qofclass.h
 include/gnucash/qofevent.h
@@ -180,7 +212,6 @@ include/gnucash/qofid-p.h
 include/gnucash/qofid.h
 include/gnucash/qofinstance-p.h
 include/gnucash/qofinstance.h
-include/gnucash/qofla-dir.h
 include/gnucash/qoflog.h
 include/gnucash/qofobject.h
 include/gnucash/qofquery.h
@@ -200,17 +231,18 @@ include/gnucash/window-main-summarybar.h
 include/gnucash/window-report.h
 info/gnucash-design.info
 lib/gnucash/libgncmod-app-utils.la
-lib/gnucash/libgncmod-backend-file.la
-lib/gnucash/libgncmod-business-backend-file.la
+lib/gnucash/libgncmod-backend-xml.la
 lib/gnucash/libgncmod-business-core.la
 lib/gnucash/libgncmod-business-gnome.la
 lib/gnucash/libgncmod-business-utils.la
 lib/gnucash/libgncmod-calculation.la
+lib/gnucash/libgncmod-csv.la
 lib/gnucash/libgncmod-dialog-tax-table.la
 lib/gnucash/libgncmod-engine.la
 lib/gnucash/libgncmod-generic-import.la
 lib/gnucash/libgncmod-gnome-search.la
 lib/gnucash/libgncmod-gnome-utils.la
+lib/gnucash/libgncmod-html.la
 lib/gnucash/libgncmod-ledger-core.la
 lib/gnucash/libgncmod-locale-reports-us.la
 lib/gnucash/libgncmod-log-replay.la
@@ -225,8 +257,8 @@ lib/gnucash/libgncmod-standard-reports.la
 lib/gnucash/libgncmod-stylesheets.la
 lib/gnucash/libgncmod-tax-us.la
 lib/gnucash/libgncmod-utility-reports.la
-lib/gnucash/libgncqof-backend-qsf.la
-lib/libgnc-backend-file-utils.la
+lib/libgnc-backend-sql.la
+lib/libgnc-backend-xml-utils.la
 lib/libgnc-business-ledger.la
 lib/libgnc-core-utils.la
 lib/libgnc-gnome.la
@@ -235,7 +267,6 @@ lib/libgnc-qof.la
 libexec/gnucash/overrides/gnucash-env
 libexec/gnucash/overrides/gnucash-make-guids
 libexec/gnucash/overrides/guile
-man/man1/gnc-prices.1
 man/man1/gnucash.1
 share/applications/gnucash.desktop
 share/gconf/schemas/apps_gnucash_dialog_business_common.schemas
@@ -269,6 +300,21 @@ share/gnucash/accounts/C/acctchrt_renter.gnucash-xea
 share/gnucash/accounts/C/acctchrt_retiremt.gnucash-xea
 share/gnucash/accounts/C/acctchrt_spouseinc.gnucash-xea
 share/gnucash/accounts/C/acctchrt_spouseretire.gnucash-xea
+share/gnucash/accounts/cs/acctchrt_brokerage.gnucash-xea
+share/gnucash/accounts/cs/acctchrt_carloan.gnucash-xea
+share/gnucash/accounts/cs/acctchrt_cdmoneymkt.gnucash-xea
+share/gnucash/accounts/cs/acctchrt_childcare.gnucash-xea
+share/gnucash/accounts/cs/acctchrt_common.gnucash-xea
+share/gnucash/accounts/cs/acctchrt_currency.gnucash-xea
+share/gnucash/accounts/cs/acctchrt_eduloan.gnucash-xea
+share/gnucash/accounts/cs/acctchrt_fixedassets.gnucash-xea
+share/gnucash/accounts/cs/acctchrt_homeloan.gnucash-xea
+share/gnucash/accounts/cs/acctchrt_homeown.gnucash-xea
+share/gnucash/accounts/cs/acctchrt_otherloan.gnucash-xea
+share/gnucash/accounts/cs/acctchrt_renter.gnucash-xea
+share/gnucash/accounts/cs/acctchrt_retiremt.gnucash-xea
+share/gnucash/accounts/cs/acctchrt_spouseinc.gnucash-xea
+share/gnucash/accounts/cs/acctchrt_spouseretire.gnucash-xea
 share/gnucash/accounts/da/acctchrt_car.gnucash-xea
 share/gnucash/accounts/da/acctchrt_common.gnucash-xea
 share/gnucash/accounts/da/acctchrt_homeloan.gnucash-xea
@@ -416,7 +462,6 @@ share/gnucash/accounts/hu_HU/acctchrt_retiremt.gnucash-xea
 share/gnucash/accounts/hu_HU/acctchrt_spouseinc.gnucash-xea
 share/gnucash/accounts/hu_HU/acctchrt_spouseretire.gnucash-xea
 share/gnucash/accounts/it/acctchrt_brokerage.gnucash-xea
-share/gnucash/accounts/it/acctchrt_business.gnucash-xea
 share/gnucash/accounts/it/acctchrt_carloan.gnucash-xea
 share/gnucash/accounts/it/acctchrt_checkbook.gnucash-xea
 share/gnucash/accounts/it/acctchrt_childcare.gnucash-xea
@@ -438,6 +483,7 @@ share/gnucash/accounts/ja/acctchrt_childcare.gnucash-xea
 share/gnucash/accounts/ja/acctchrt_common.gnucash-xea
 share/gnucash/accounts/ja/acctchrt_eduloan.gnucash-xea
 share/gnucash/accounts/ja/acctchrt_fixedassets.gnucash-xea
+share/gnucash/accounts/ja/acctchrt_full.gnucash-xea
 share/gnucash/accounts/ja/acctchrt_homeloan.gnucash-xea
 share/gnucash/accounts/ja/acctchrt_homeown.gnucash-xea
 share/gnucash/accounts/ja/acctchrt_otherloan.gnucash-xea
@@ -445,6 +491,38 @@ share/gnucash/accounts/ja/acctchrt_renter.gnucash-xea
 share/gnucash/accounts/ja/acctchrt_retiremt.gnucash-xea
 share/gnucash/accounts/ja/acctchrt_spouseinc.gnucash-xea
 share/gnucash/accounts/ja/acctchrt_spouseretire.gnucash-xea
+share/gnucash/accounts/ko/acctchrt_brokerage.gnucash-xea
+share/gnucash/accounts/ko/acctchrt_business.gnucash-xea
+share/gnucash/accounts/ko/acctchrt_carloan.gnucash-xea
+share/gnucash/accounts/ko/acctchrt_cdmoneymkt.gnucash-xea
+share/gnucash/accounts/ko/acctchrt_checkbook.gnucash-xea
+share/gnucash/accounts/ko/acctchrt_childcare.gnucash-xea
+share/gnucash/accounts/ko/acctchrt_common.gnucash-xea
+share/gnucash/accounts/ko/acctchrt_eduloan.gnucash-xea
+share/gnucash/accounts/ko/acctchrt_fixedassets.gnucash-xea
+share/gnucash/accounts/ko/acctchrt_homeloan.gnucash-xea
+share/gnucash/accounts/ko/acctchrt_homeown.gnucash-xea
+share/gnucash/accounts/ko/acctchrt_otherloan.gnucash-xea
+share/gnucash/accounts/ko/acctchrt_renter.gnucash-xea
+share/gnucash/accounts/ko/acctchrt_retiremt.gnucash-xea
+share/gnucash/accounts/ko/acctchrt_spouseinc.gnucash-xea
+share/gnucash/accounts/ko/acctchrt_spouseretire.gnucash-xea
+share/gnucash/accounts/lv/acctchrt_brokerage.gnucash-xea
+share/gnucash/accounts/lv/acctchrt_business.gnucash-xea
+share/gnucash/accounts/lv/acctchrt_carloan.gnucash-xea
+share/gnucash/accounts/lv/acctchrt_cdmoneymkt.gnucash-xea
+share/gnucash/accounts/lv/acctchrt_checkbook.gnucash-xea
+share/gnucash/accounts/lv/acctchrt_childcare.gnucash-xea
+share/gnucash/accounts/lv/acctchrt_common.gnucash-xea
+share/gnucash/accounts/lv/acctchrt_eduloan.gnucash-xea
+share/gnucash/accounts/lv/acctchrt_fixedassets.gnucash-xea
+share/gnucash/accounts/lv/acctchrt_homeloan.gnucash-xea
+share/gnucash/accounts/lv/acctchrt_homeown.gnucash-xea
+share/gnucash/accounts/lv/acctchrt_otherloan.gnucash-xea
+share/gnucash/accounts/lv/acctchrt_renter.gnucash-xea
+share/gnucash/accounts/lv/acctchrt_retiremt.gnucash-xea
+share/gnucash/accounts/lv/acctchrt_spouseinc.gnucash-xea
+share/gnucash/accounts/lv/acctchrt_spouseretire.gnucash-xea
 share/gnucash/accounts/nb/acctchrt_brokerage.gnucash-xea
 share/gnucash/accounts/nb/acctchrt_business.gnucash-xea
 share/gnucash/accounts/nb/acctchrt_carloan.gnucash-xea
@@ -462,7 +540,24 @@ share/gnucash/accounts/nb/acctchrt_renter.gnucash-xea
 share/gnucash/accounts/nb/acctchrt_retiremt.gnucash-xea
 share/gnucash/accounts/nb/acctchrt_spouseinc.gnucash-xea
 share/gnucash/accounts/nb/acctchrt_spouseretire.gnucash-xea
+share/gnucash/accounts/nl/acctchrt_checkbook.gnucash-xea
 share/gnucash/accounts/nl/acctchrt_full.gnucash-xea
+share/gnucash/accounts/pl/acctchrt_brokerage.gnucash-xea
+share/gnucash/accounts/pl/acctchrt_business.gnucash-xea
+share/gnucash/accounts/pl/acctchrt_carloan.gnucash-xea
+share/gnucash/accounts/pl/acctchrt_cdmoneymkt.gnucash-xea
+share/gnucash/accounts/pl/acctchrt_checkbook.gnucash-xea
+share/gnucash/accounts/pl/acctchrt_childcare.gnucash-xea
+share/gnucash/accounts/pl/acctchrt_common.gnucash-xea
+share/gnucash/accounts/pl/acctchrt_eduloan.gnucash-xea
+share/gnucash/accounts/pl/acctchrt_fixedassets.gnucash-xea
+share/gnucash/accounts/pl/acctchrt_homeloan.gnucash-xea
+share/gnucash/accounts/pl/acctchrt_homeown.gnucash-xea
+share/gnucash/accounts/pl/acctchrt_otherloan.gnucash-xea
+share/gnucash/accounts/pl/acctchrt_renter.gnucash-xea
+share/gnucash/accounts/pl/acctchrt_retiremt.gnucash-xea
+share/gnucash/accounts/pl/acctchrt_spouseinc.gnucash-xea
+share/gnucash/accounts/pl/acctchrt_spouseretire.gnucash-xea
 share/gnucash/accounts/pt_BR/acctchrt_brokerage.gnucash-xea
 share/gnucash/accounts/pt_BR/acctchrt_carloan.gnucash-xea
 share/gnucash/accounts/pt_BR/acctchrt_cdmoneymkt.gnucash-xea
@@ -539,6 +634,7 @@ share/gnucash/checks/deluxe.chk
 share/gnucash/checks/liberty.chk
 share/gnucash/checks/quicken.chk
 share/gnucash/checks/quicken_wallet.chk
+share/gnucash/checks/voucher.chk
 share/gnucash/doc/AUTHORS
 share/gnucash/doc/COPYING
 share/gnucash/doc/ChangeLog
@@ -547,6 +643,8 @@ share/gnucash/doc/ChangeLog.2004
 share/gnucash/doc/ChangeLog.2005
 share/gnucash/doc/ChangeLog.2006
 share/gnucash/doc/ChangeLog.2007
+share/gnucash/doc/ChangeLog.2008
+share/gnucash/doc/ChangeLog.2009
 share/gnucash/doc/DOCUMENTERS
 share/gnucash/doc/HACKING
 share/gnucash/doc/INSTALL
@@ -556,10 +654,12 @@ share/gnucash/doc/README
 share/gnucash/doc/README-de.win32-bin.txt
 share/gnucash/doc/README-fr.win32-bin.txt
 share/gnucash/doc/README-it.win32-bin.txt
+share/gnucash/doc/README-lv.win32-bin.txt
+share/gnucash/doc/README-nl.win32-bin.txt
+share/gnucash/doc/README-zh_CN.win32-bin.txt
 share/gnucash/doc/README.dependencies
 share/gnucash/doc/README.francais
 share/gnucash/doc/README.german
-share/gnucash/doc/README.patches
 share/gnucash/doc/README.win32-bin.txt
 share/gnucash/doc/examples/Money95bank_fr.qif
 share/gnucash/doc/examples/Money95invst_fr.qif
@@ -570,36 +670,30 @@ share/gnucash/doc/examples/abc-all.qif
 share/gnucash/doc/examples/abc.qif
 share/gnucash/doc/examples/bogus.qif
 share/gnucash/doc/examples/cbb-export.qif
-share/gnucash/doc/examples/currency.xac
-share/gnucash/doc/examples/currency_tree_xml.xac
+share/gnucash/doc/examples/currency_tree_xml.gnucash
 share/gnucash/doc/examples/every.qif
 share/gnucash/doc/examples/ms-money.qif
 share/gnucash/doc/examples/quicktest.qif
-share/gnucash/doc/examples/splitdemo.xac
 share/gnucash/doc/examples/swipe.qif
-share/gnucash/doc/examples/taxreport.xac
-share/gnucash/doc/examples/test.xac
-share/gnucash/doc/examples/test2.xac
-share/gnucash/doc/examples/test3.xac
-share/gnucash/doc/examples/test4.xac
-share/gnucash/doc/examples/trading.xac
-share/gnucash/doc/examples/trading2.xac
+share/gnucash/doc/examples/taxreport.gnucash
 share/gnucash/doc/examples/web.qif
-share/gnucash/doc/examples/xfer.xac
 share/gnucash/doc/guile-hackers.txt
 share/gnucash/doc/projects.html
 share/gnucash/glade/account.glade
 share/gnucash/glade/acctperiod.glade
+share/gnucash/glade/autoclear.glade
 share/gnucash/glade/billterms.glade
 share/gnucash/glade/budget.glade
 share/gnucash/glade/businessprefs.glade
-share/gnucash/glade/chart-export.glade
 share/gnucash/glade/choose-owner.glade
 share/gnucash/glade/commodities.glade
 share/gnucash/glade/commodity.glade
+share/gnucash/glade/custom-report-dialog.glade
 share/gnucash/glade/customer.glade
 share/gnucash/glade/date-close.glade
 share/gnucash/glade/dialog-book-close.glade
+share/gnucash/glade/dialog-file-access.glade
+share/gnucash/glade/dialog-object-references.glade
 share/gnucash/glade/dialog-query-list.glade
 share/gnucash/glade/dialog-reset-warnings.glade
 share/gnucash/glade/druid-gconf-setup.glade
@@ -609,13 +703,13 @@ share/gnucash/glade/employee.glade
 share/gnucash/glade/exchange-dialog.glade
 share/gnucash/glade/fincalc.glade
 share/gnucash/glade/generic-import.glade
+share/gnucash/glade/gnc-csv-preview-dialog.glade
 share/gnucash/glade/gnc-date-format.glade
 share/gnucash/glade/gnc-gui-query.glade
 share/gnucash/glade/import-provider-format.glade
 share/gnucash/glade/invoice.glade
 share/gnucash/glade/job.glade
 share/gnucash/glade/lots.glade
-share/gnucash/glade/merge.glade
 share/gnucash/glade/newuser.glade
 share/gnucash/glade/order.glade
 share/gnucash/glade/payment.glade
@@ -649,45 +743,61 @@ share/gnucash/guile-modules/gnucash/gnome-utils.scm
 share/gnucash/guile-modules/gnucash/import-export/qif-import.scm
 share/gnucash/guile-modules/gnucash/main.scm
 share/gnucash/guile-modules/gnucash/price-quotes.scm
-share/gnucash/guile-modules/gnucash/report/account-piecharts.scm
-share/gnucash/guile-modules/gnucash/report/account-summary.scm
-share/gnucash/guile-modules/gnucash/report/advanced-portfolio.scm
+share/gnucash/guile-modules/gnucash/printf.scm
 share/gnucash/guile-modules/gnucash/report/aging.scm
-share/gnucash/guile-modules/gnucash/report/average-balance.scm
-share/gnucash/guile-modules/gnucash/report/balance-sheet.scm
-share/gnucash/guile-modules/gnucash/report/budget.scm
+share/gnucash/guile-modules/gnucash/report/balsheet-eg.css
+share/gnucash/guile-modules/gnucash/report/balsheet-eg.eguile.scm
 share/gnucash/guile-modules/gnucash/report/business-reports.scm
-share/gnucash/guile-modules/gnucash/report/cash-flow.scm
-share/gnucash/guile-modules/gnucash/report/category-barchart.scm
-share/gnucash/guile-modules/gnucash/report/daily-reports.scm
 share/gnucash/guile-modules/gnucash/report/easy-invoice.scm
-share/gnucash/guile-modules/gnucash/report/equity-statement.scm
+share/gnucash/guile-modules/gnucash/report/eguile-gnc.scm
+share/gnucash/guile-modules/gnucash/report/eguile-html-utilities.scm
+share/gnucash/guile-modules/gnucash/report/eguile-utilities.scm
 share/gnucash/guile-modules/gnucash/report/fancy-invoice.scm
-share/gnucash/guile-modules/gnucash/report/general-journal.scm
-share/gnucash/guile-modules/gnucash/report/general-ledger.scm
 share/gnucash/guile-modules/gnucash/report/hello-world.scm
-share/gnucash/guile-modules/gnucash/report/income-statement.scm
 share/gnucash/guile-modules/gnucash/report/invoice.scm
+share/gnucash/guile-modules/gnucash/report/job-report.scm
 share/gnucash/guile-modules/gnucash/report/locale-specific/de_DE.scm
 share/gnucash/guile-modules/gnucash/report/locale-specific/us.scm
-share/gnucash/guile-modules/gnucash/report/net-barchart.scm
 share/gnucash/guile-modules/gnucash/report/owner-report.scm
 share/gnucash/guile-modules/gnucash/report/payables.scm
-share/gnucash/guile-modules/gnucash/report/portfolio.scm
-share/gnucash/guile-modules/gnucash/report/price-scatter.scm
 share/gnucash/guile-modules/gnucash/report/receivables.scm
-share/gnucash/guile-modules/gnucash/report/register.scm
 share/gnucash/guile-modules/gnucash/report/report-gnome.scm
 share/gnucash/guile-modules/gnucash/report/report-system.scm
 share/gnucash/guile-modules/gnucash/report/standard-reports.scm
+share/gnucash/guile-modules/gnucash/report/standard-reports/account-piecharts.scm
+share/gnucash/guile-modules/gnucash/report/standard-reports/account-summary.scm
+share/gnucash/guile-modules/gnucash/report/standard-reports/advanced-portfolio.scm
+share/gnucash/guile-modules/gnucash/report/standard-reports/average-balance.scm
+share/gnucash/guile-modules/gnucash/report/standard-reports/balance-sheet.scm
+share/gnucash/guile-modules/gnucash/report/standard-reports/balsheet-eg.scm
+share/gnucash/guile-modules/gnucash/report/standard-reports/budget-balance-sheet.scm
+share/gnucash/guile-modules/gnucash/report/standard-reports/budget-barchart.scm
+share/gnucash/guile-modules/gnucash/report/standard-reports/budget-flow.scm
+share/gnucash/guile-modules/gnucash/report/standard-reports/budget-income-statement.scm
+share/gnucash/guile-modules/gnucash/report/standard-reports/budget.scm
+share/gnucash/guile-modules/gnucash/report/standard-reports/cash-flow.scm
+share/gnucash/guile-modules/gnucash/report/standard-reports/category-barchart.scm
+share/gnucash/guile-modules/gnucash/report/standard-reports/daily-reports.scm
+share/gnucash/guile-modules/gnucash/report/standard-reports/equity-statement.scm
+share/gnucash/guile-modules/gnucash/report/standard-reports/general-journal.scm
+share/gnucash/guile-modules/gnucash/report/standard-reports/general-ledger.scm
+share/gnucash/guile-modules/gnucash/report/standard-reports/income-statement.scm
+share/gnucash/guile-modules/gnucash/report/standard-reports/net-barchart.scm
+share/gnucash/guile-modules/gnucash/report/standard-reports/portfolio.scm
+share/gnucash/guile-modules/gnucash/report/standard-reports/price-scatter.scm
+share/gnucash/guile-modules/gnucash/report/standard-reports/register.scm
+share/gnucash/guile-modules/gnucash/report/standard-reports/transaction.scm
+share/gnucash/guile-modules/gnucash/report/standard-reports/trial-balance.scm
 share/gnucash/guile-modules/gnucash/report/stylesheet-easy.scm
 share/gnucash/guile-modules/gnucash/report/stylesheet-fancy.scm
+share/gnucash/guile-modules/gnucash/report/stylesheet-footer.scm
 share/gnucash/guile-modules/gnucash/report/stylesheet-plain.scm
 share/gnucash/guile-modules/gnucash/report/stylesheets.scm
+share/gnucash/guile-modules/gnucash/report/taxinvoice.css
+share/gnucash/guile-modules/gnucash/report/taxinvoice.eguile.scm
+share/gnucash/guile-modules/gnucash/report/taxinvoice.scm
 share/gnucash/guile-modules/gnucash/report/taxtxf-de_DE.scm
 share/gnucash/guile-modules/gnucash/report/taxtxf.scm
-share/gnucash/guile-modules/gnucash/report/transaction.scm
-share/gnucash/guile-modules/gnucash/report/trial-balance.scm
 share/gnucash/guile-modules/gnucash/report/utility-reports.scm
 share/gnucash/guile-modules/gnucash/report/view-column.scm
 share/gnucash/guile-modules/gnucash/report/welcome-to-gnucash.scm
@@ -706,6 +816,8 @@ share/gnucash/pixmaps/gnc-account.png
 share/gnucash/pixmaps/gnc-invoice-16.png
 share/gnucash/pixmaps/gnc-invoice-edit-16.png
 share/gnucash/pixmaps/gnc-invoice-edit.png
+share/gnucash/pixmaps/gnc-invoice-pay-16.png
+share/gnucash/pixmaps/gnc-invoice-pay.png
 share/gnucash/pixmaps/gnc-invoice-post-16.png
 share/gnucash/pixmaps/gnc-invoice-post.png
 share/gnucash/pixmaps/gnc-invoice-unpost-16.png
@@ -719,10 +831,14 @@ share/gnucash/pixmaps/gnc-sx-new-16.png
 share/gnucash/pixmaps/gnc-sx-new.png
 share/gnucash/pixmaps/gnc-transfer-16.png
 share/gnucash/pixmaps/gnc-transfer.png
+share/gnucash/pixmaps/gnucash-icon-128x128.png
 share/gnucash/pixmaps/gnucash-icon-16x16.png
+share/gnucash/pixmaps/gnucash-icon-256x256.png
 share/gnucash/pixmaps/gnucash-icon-32x32.png
 share/gnucash/pixmaps/gnucash-icon-48x48.bmp
 share/gnucash/pixmaps/gnucash-icon-48x48.png
+share/gnucash/pixmaps/gnucash-icon-64x64.png
+share/gnucash/pixmaps/gnucash-icon-96x96.png
 share/gnucash/pixmaps/gnucash-icon.ico
 share/gnucash/pixmaps/gnucash_splash.png
 share/gnucash/pixmaps/stock_split_title.png
@@ -748,6 +864,8 @@ share/gnucash/scm/hooks.scm
 share/gnucash/scm/html-acct-table.scm
 share/gnucash/scm/html-barchart.scm
 share/gnucash/scm/html-document.scm
+share/gnucash/scm/html-fonts.scm
+share/gnucash/scm/html-linechart.scm
 share/gnucash/scm/html-piechart.scm
 share/gnucash/scm/html-scatter.scm
 share/gnucash/scm/html-style-info.scm
@@ -784,6 +902,7 @@ share/gnucash/ui/gnc-plugin-account-tree-ui.xml
 share/gnucash/ui/gnc-plugin-basic-commands-ui.xml
 share/gnucash/ui/gnc-plugin-budget-ui.xml
 share/gnucash/ui/gnc-plugin-business-ui.xml
+share/gnucash/ui/gnc-plugin-csv-ui.xml
 share/gnucash/ui/gnc-plugin-file-history-ui.xml
 share/gnucash/ui/gnc-plugin-log-replay-ui.xml
 share/gnucash/ui/gnc-plugin-ofx-ui.xml
@@ -801,32 +920,37 @@ share/gnucash/ui/gnc-reconcile-window-ui.xml
 share/gnucash/ui/gnc-sxed-to-create-window-ui.xml
 share/gnucash/ui/gnc-sxed-window-ui-full.xml
 share/gnucash/ui/gnc-sxed-window-ui.xml
-share/gnucash/xml/qsf/pilot-qsf-GnuCashInvoice.xml
-share/gnucash/xml/qsf/pilot-qsf-gncCustomer.xml
-share/gnucash/xml/qsf/qsf-map.xsd.xml
-share/gnucash/xml/qsf/qsf-object.xsd.xml
+share/gnucash/ui/osx_accel_map
+share/icons/hicolor/128x128/apps/gnucash-icon.png
 share/icons/hicolor/16x16/apps/gnucash-icon.png
 share/icons/hicolor/22x22/apps/gnucash-icon.png
 share/icons/hicolor/24x24/apps/gnucash-icon.png
+share/icons/hicolor/256x256/apps/gnucash-icon.png
 share/icons/hicolor/32x32/apps/gnucash-icon.png
 share/icons/hicolor/48x48/apps/gnucash-icon.png
+share/icons/hicolor/64x64/apps/gnucash-icon.png
+share/icons/hicolor/96x96/apps/gnucash-icon.png
 share/icons/hicolor/scalable/apps/gnucash-icon.svg
+share/locale/bg/LC_MESSAGES/gnucash.mo
 share/locale/ca/LC_MESSAGES/gnucash.mo
 share/locale/cs/LC_MESSAGES/gnucash.mo
 share/locale/da/LC_MESSAGES/gnucash.mo
 share/locale/de/LC_MESSAGES/gnucash.mo
-share/locale/de_CH/LC_MESSAGES/gnucash.mo
 share/locale/el/LC_MESSAGES/gnucash.mo
 share/locale/en_GB/LC_MESSAGES/gnucash.mo
 share/locale/es/LC_MESSAGES/gnucash.mo
 share/locale/es_NI/LC_MESSAGES/gnucash.mo
 share/locale/eu/LC_MESSAGES/gnucash.mo
+share/locale/fa/LC_MESSAGES/gnucash.mo
 share/locale/fi/LC_MESSAGES/gnucash.mo
 share/locale/fr/LC_MESSAGES/gnucash.mo
 share/locale/he/LC_MESSAGES/gnucash.mo
 share/locale/hu/LC_MESSAGES/gnucash.mo
 share/locale/it/LC_MESSAGES/gnucash.mo
 share/locale/ja/LC_MESSAGES/gnucash.mo
+share/locale/ko/LC_MESSAGES/gnucash.mo
+share/locale/lt/LC_MESSAGES/gnucash.mo
+share/locale/lv/LC_MESSAGES/gnucash.mo
 share/locale/nb/LC_MESSAGES/gnucash.mo
 share/locale/ne/LC_MESSAGES/gnucash.mo
 share/locale/nl/LC_MESSAGES/gnucash.mo
@@ -844,10 +968,3 @@ share/locale/uk/LC_MESSAGES/gnucash.mo
 share/locale/vi/LC_MESSAGES/gnucash.mo
 share/locale/zh_CN/LC_MESSAGES/gnucash.mo
 share/locale/zh_TW/LC_MESSAGES/gnucash.mo
-share/xml/gnucash/xsl/README
-share/xml/gnucash/xsl/date-time.xsl
-share/xml/gnucash/xsl/gnucash-gnccustomer-vcard2.xsl
-share/xml/gnucash/xsl/gnucash-std.xsl
-share/xml/gnucash/xsl/string.xsl
-share/xml/gnucash/xsl/vcard-gnccustomer.pl
-@pkgdir share/gnucash/guile-modules/srfi
diff --git a/finance/gnucash/distinfo b/finance/gnucash/distinfo
index 617bb30f4c9..03091bd9947 100644
--- a/finance/gnucash/distinfo
+++ b/finance/gnucash/distinfo
@@ -1,10 +1,5 @@
-$NetBSD: distinfo,v 1.46 2010/11/07 23:23:55 wiz Exp $
+$NetBSD: distinfo,v 1.47 2010/12/23 00:10:50 wiz Exp $
 
-SHA1 (gnucash-2.2.9.tar.gz) = 8f63c67fcceaae93ceb8827143cc6a470e3a096a
-RMD160 (gnucash-2.2.9.tar.gz) = 9721cca008a7a9b1d7771e1ca8547c3d52088db1
-Size (gnucash-2.2.9.tar.gz) = 10495492 bytes
-SHA1 (patch-aa) = c9aa4a7e25036cbff56f7202e9c5d7cb2df60c9e
-SHA1 (patch-ab) = e575a7b2a293a1ec295af0d90ff19fdd20c950c1
-SHA1 (patch-ac) = 49fbbc52f84db8d6690349c1b1dd7125f1be764a
-SHA1 (patch-ad) = 831d66cc09164809a1623d067eed6c498994b76e
-SHA1 (patch-ae) = 259e6e5d69b9dc33d62c86d076ee2d440d79640b
+SHA1 (gnucash-2.4.0.tar.gz) = 9b54d3976d87b447ce19501548092e935ff25023
+RMD160 (gnucash-2.4.0.tar.gz) = a1491a1962c6f4680e907b7cf84d882f27b9dc59
+Size (gnucash-2.4.0.tar.gz) = 13008358 bytes
diff --git a/finance/gnucash/patches/patch-aa b/finance/gnucash/patches/patch-aa
deleted file mode 100644
index 7b96e4a8a38..00000000000
--- a/finance/gnucash/patches/patch-aa
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-aa,v 1.6 2010/11/07 23:23:56 wiz Exp $
-
-errno isn't always an int. Let header file define it.
-
---- src/core-utils/gnc-gkeyfile-utils.c.orig	2007-04-28 23:16:20.000000000 +0000
-+++ src/core-utils/gnc-gkeyfile-utils.c
-@@ -303,7 +303,6 @@ gnc_key_file_save_to_file (const gchar *
- {
-   gchar *contents;
-   gint fd;
--  extern int errno;
-   gint length;
-   ssize_t written;
-   gboolean success = TRUE;
diff --git a/finance/gnucash/patches/patch-ab b/finance/gnucash/patches/patch-ab
deleted file mode 100644
index fd7fd725195..00000000000
--- a/finance/gnucash/patches/patch-ab
+++ /dev/null
@@ -1,100 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2010/11/07 23:23:56 wiz Exp $
-
-Some help for DragonFly.
-
---- src/app-utils/gnc-ui-util.c.orig	2007-06-02 17:56:55.000000000 +0000
-+++ src/app-utils/gnc-ui-util.c
-@@ -103,6 +103,14 @@ gnc_configure_account_separator (void)
-     free(string);
- }
- 
-+#if defined(__DragonFly__)
-+#define LC_CAST	(char **)
-+#define LC_CAST2 (char *)
-+#else
-+#define LC_CAST
-+#define LC_CAST2
-+#endif
-+
- 
- static void
- gnc_configure_reverse_balance (void)
-@@ -780,16 +788,16 @@ gnc_localeconv (void)
- 
-   lc = *localeconv();
- 
--  gnc_lconv_set_utf8(&lc.decimal_point, ".");
--  gnc_lconv_set_utf8(&lc.thousands_sep, ",");
--  gnc_lconv_set_utf8(&lc.grouping, "\003");
--  gnc_lconv_set_utf8(&lc.int_curr_symbol, "USD ");
--  gnc_lconv_set_utf8(&lc.currency_symbol, "$");
--  gnc_lconv_set_utf8(&lc.mon_decimal_point, ".");
--  gnc_lconv_set_utf8(&lc.mon_thousands_sep, ",");
--  gnc_lconv_set_utf8(&lc.mon_grouping, "\003");
--  gnc_lconv_set_utf8(&lc.negative_sign, "-");
--  gnc_lconv_set_utf8(&lc.positive_sign, "");
-+  gnc_lconv_set_utf8(LC_CAST &lc.decimal_point, ".");
-+  gnc_lconv_set_utf8(LC_CAST &lc.thousands_sep, ",");
-+  gnc_lconv_set_utf8(LC_CAST &lc.grouping, "\003");
-+  gnc_lconv_set_utf8(LC_CAST &lc.int_curr_symbol, "USD ");
-+  gnc_lconv_set_utf8(LC_CAST &lc.currency_symbol, "$");
-+  gnc_lconv_set_utf8(LC_CAST &lc.mon_decimal_point, ".");
-+  gnc_lconv_set_utf8(LC_CAST &lc.mon_thousands_sep, ",");
-+  gnc_lconv_set_utf8(LC_CAST &lc.mon_grouping, "\003");
-+  gnc_lconv_set_utf8(LC_CAST &lc.negative_sign, "-");
-+  gnc_lconv_set_utf8(LC_CAST &lc.positive_sign, "");
- 
-   gnc_lconv_set_char(&lc.frac_digits, 2);
-   gnc_lconv_set_char(&lc.int_frac_digits, 2);
-@@ -1293,13 +1301,13 @@ PrintAmountInternal(char *buf, gnc_numer
- 
-     if (info->monetary)
-     {
--      separator = lc->mon_thousands_sep;
--      group = lc->mon_grouping;
-+      separator = LC_CAST2 lc->mon_thousands_sep;
-+      group = LC_CAST2 lc->mon_grouping;
-     }
-     else
-     {
--      separator = lc->thousands_sep;
--      group = lc->grouping;
-+      separator = LC_CAST2 lc->thousands_sep;
-+      group = LC_CAST2 lc->grouping;
-     }
- 
-     buf_ptr = buf;
-@@ -1367,7 +1375,7 @@ PrintAmountInternal(char *buf, gnc_numer
-   }
-   else
-   {
--    char *decimal_point;
-+    const char *decimal_point;
-     guint8 num_decimal_places = 0;
-     char *temp_ptr = temp_buf;
- 
-@@ -1687,7 +1695,7 @@ number_to_words(gdouble val, gint64 deno
-   if (val < 0) val = -val;
-   if (denom < 0) denom = -denom;
- 
--  int_part = trunc(val);
-+  int_part = floor(val);
-   frac_part = round((val - int_part) * denom);
- 
-   int_string = integer_to_words(int_part);
-@@ -1803,13 +1811,13 @@ xaccParseAmount (const char * in_str, gb
-   {
-     group_separator = g_utf8_get_char(lc->mon_thousands_sep);
-     decimal_point = g_utf8_get_char(lc->mon_decimal_point);
--    group = lc->mon_grouping;
-+    group = LC_CAST2 lc->mon_grouping;
-   }
-   else
-   {
-     group_separator = g_utf8_get_char(lc->thousands_sep);
-     decimal_point = g_utf8_get_char(lc->decimal_point);
--    group = lc->grouping;
-+    group = LC_CAST2 lc->grouping;
-   }
- 
-   return xaccParseAmountExtended(in_str, monetary, negative_sign, decimal_point,
diff --git a/finance/gnucash/patches/patch-ac b/finance/gnucash/patches/patch-ac
deleted file mode 100644
index 64f4da0b0fc..00000000000
--- a/finance/gnucash/patches/patch-ac
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ac,v 1.5 2010/11/07 23:23:56 wiz Exp $
-
-Some help for DragonFly.
-
---- src/app-utils/gnc-exp-parser.c.orig	2007-04-28 23:16:37.000000000 +0000
-+++ src/app-utils/gnc-exp-parser.c
-@@ -546,9 +546,15 @@ gnc_exp_parser_parse_separate_vars (cons
- 
-   lc = gnc_localeconv ();
- 
-+#if defined(__DragonFly__)
-+  pe = init_parser (vars, (char *)lc->mon_decimal_point, (char *)lc->mon_thousands_sep,
-+                    trans_numeric, numeric_ops, negate_numeric, g_free,
-+                    func_op);
-+#else
-   pe = init_parser (vars, lc->mon_decimal_point, lc->mon_thousands_sep,
-                     trans_numeric, numeric_ops, negate_numeric, g_free,
-                     func_op);
-+#endif
- 
-   error_loc = parse_string (&result, expression, pe);
- 
diff --git a/finance/gnucash/patches/patch-ad b/finance/gnucash/patches/patch-ad
deleted file mode 100644
index 87bc6d66a44..00000000000
--- a/finance/gnucash/patches/patch-ad
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ad,v 1.9 2007/07/19 19:35:04 wiz Exp $
-
---- src/gnome/druid-acct-period.c.orig	2007-04-28 23:16:48.000000000 +0000
-+++ src/gnome/druid-acct-period.c
-@@ -337,7 +337,7 @@ ap_show_menu (GnomeDruidPage *druidpage,
-    * we may have closed books since last time. */
-   info->earliest = get_earliest_in_book (gnc_get_current_book());
-   info->earliest_str = qof_print_date(info->earliest); 
--  PINFO ("date of earliest is %ld %s", info->earliest, ctime (&info->earliest));
-+  PINFO ("date of earliest is %ld %s", (long)info->earliest, ctime (&info->earliest));
- 
-   prepare_remarks (info);
- }
-@@ -534,7 +534,7 @@ ap_druid_create (AcctPeriodInfo *info)
-   info->earliest = get_earliest_in_book (gnc_get_current_book());
-   info->earliest_str = qof_print_date(info->earliest); 
-   PINFO ("date of earliest transaction is %ld %s", 
--                  info->earliest, ctime (&info->earliest));
-+                  (long)info->earliest, ctime (&info->earliest));
- 
-   g_date_clear (&info->closing_date, 1);
-   g_date_set_time_t (&info->closing_date, info->earliest);
diff --git a/finance/gnucash/patches/patch-ae b/finance/gnucash/patches/patch-ae
deleted file mode 100644
index 95b59fb0601..00000000000
--- a/finance/gnucash/patches/patch-ae
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ae,v 1.5 2010/08/14 19:12:58 wiz Exp $
-
-Fix build on MacOS X 10.6 from upstream:
-http://lists.gnucash.org/pipermail/gnucash-changes/2009-September/007462.html
-
---- configure.orig	2009-02-23 20:25:34.000000000 +0000
-+++ configure
-@@ -26722,7 +26722,7 @@ LIBS="$oLIBS"
- { $as_echo "$as_me:$LINENO: checking for darwin" >&5
- $as_echo_n "checking for darwin... " >&6; }
- case $host_os in
--	rhapsody* | darwin1*)
-+	rhapsody* | darwin[1567].*)
- 		{ $as_echo "$as_me:$LINENO: result: yes, but too old" >&5
- $as_echo "yes, but too old" >&6; }
- 		{ { $as_echo "$as_me:$LINENO: error: This platform is not supported, please