Update to 2.2.0, based on gnucash-current package.

 2.2.0 - 14 July 2007
  	 o Welcome to the GnuCash 2.2.0 Release.
	 o With this new release series, GnuCash is available on Microsoft
	 Windows for the first time, and it also runs on GNU/Linux, *BSD,
	 Solaris and Mac OSX.
	 o This release has only a few user-visible new features, except for
	 the completed port to the Microsoft Windows operating system. In
	 summary, the following features are new, compared to the older 2.0.x
	 series:
	 o Port to Microsoft Windows completed. Note that Windows 2000, XP, or
	 Vista is required; GnuCash does not run on Windows 98 or 95.
	 o Data file notice: In version 2.1.2 the format for scheduled
	 transactions in the data file was changed. Files using the old format
	 will be read without problems by this new version, but the new
	 version of GnuCash only writes the new format. The new file format
	 cannot be loaded by older versions of GnuCash. (If you try, the file
	 will fail to be loaded with an error message.) As a result, if you
	 begin using the new Gnucash, and you have data files with scheduled
	 transactions, then these files will not be readable by older
	 versions. If you have to make a new data file readable by older
	 versions of GnuCash, this can be achived by deleting all records of
	 scheduled transactions in the scheduled transaction editor.
	 o SWIG is now used instead of g-wrap for providing language bindings.
	 o The Scheduled Transaction list view is now improved and summarized
	 more compactly. The Since-Last-Run dialog has been simplified.
	 o Check printing has been improved, with new formats and simpler
	 format descriptions.
	 o Automatic saving of the data file was added.
	 o Bugfixes and improvements since the last version 2.1.5 include:
	 o Updated translations.
	 o Improved handling of Online Banking wizard on Windows.

8 files changed, 119 insertions, 113 deletions

diff --git a/finance/gnucash/Makefile b/finance/gnucash/Makefile
index 9fcb3cadefe..7f90c64ee39 100644
--- a/finance/gnucash/Makefile
+++ b/finance/gnucash/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.115 2007/06/05 05:37:14 wiz Exp $
+# $NetBSD: Makefile,v 1.116 2007/07/19 19:35:03 wiz Exp $
 #
 
-DISTNAME=		gnucash-2.0.5
-PKGREVISION=		5
+DISTNAME=		gnucash-2.2.0
 CATEGORIES=		finance
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=gnucash/}
 
@@ -10,8 +9,8 @@ MAINTAINER=		wiz@NetBSD.org
 HOMEPAGE=		http://www.gnucash.org/
 COMMENT=		Personal or business finance management program
 
-DEPENDS+=		guile-slib-[0-9]*:../../devel/guile-slib
-DEPENDS+=		guile-www-[0-9]*:../../devel/guile-www
+DEPENDS+=		guile-slib>=3.1.1:../../devel/guile-slib
+#DEPENDS+=		guile-www-[0-9]*:../../devel/guile-www
 
 USE_DIRS+=		xdg-1.1
 USE_LIBTOOL=		yes
@@ -23,11 +22,6 @@ INFO_FILES=		YES
 REPLACE_PERL+=		src/quotes/gnc-fq-dump
 REPLACE_PERL+=		src/optional/xsl/vcard-gnccustomer.pl
 
-PKGCONFIG_OVERRIDE+=	lib/goffice-0.0.4/libgoffice-1.pc.in
-PKGCONFIG_OVERRIDE+=	lib/libgsf-1.12.3/libgsf-1.pc.in
-PKGCONFIG_OVERRIDE+=	lib/libgsf-1.12.3/libgsf-gnome-1.pc.in
-PKGCONFIG_OVERRIDE+=	lib/libgsf-1.12.3/libgsf-win32-1.pc.in
-
 CONFIGURE_ENV+=		GCONF_SCHEMA_FILE_DIR="${PREFIX}/share/gconf/schemas/"
 MAKE_ENV+=		GCONF_SCHEMA_FILE_DIR="${PREFIX}/share/gconf/schemas/"
 
@@ -49,7 +43,8 @@ GCONF2_SCHEMAS+=	apps_gnucash_dialog_business_common.schemas
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../devel/GConf2/schemas.mk"
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/g-wrap196/buildlink3.mk"
+#BUILDLINK_API_DEPENDS.swig+=	swig>=1.3.28
+#.include "../../devel/swig/buildlink3.mk"
 .include "../../devel/libgsf/buildlink3.mk"
 .include "../../devel/libglade2/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
@@ -60,11 +55,13 @@ BUILDLINK_API_DEPENDS.pango+=	pango>=1.8.0
 .include "../../finance/libofx/buildlink3.mk"
 .include "../../lang/guile/buildlink3.mk"
 .include "../../lang/perl5/buildlink3.mk"
-.include "../../misc/goffice0.2/buildlink3.mk"
+.include "../../misc/goffice/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 "../../textproc/libxml2/buildlink3.mk"
-BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.6.0
-.include "../../www/gtkhtml38/buildlink3.mk"
+BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.6.3
+.include "../../www/gtkhtml314/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/finance/gnucash/PLIST b/finance/gnucash/PLIST
index b46407bd4e1..33021549f51 100644
--- a/finance/gnucash/PLIST
+++ b/finance/gnucash/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.25 2007/02/19 20:31:11 wiz Exp $
+@comment $NetBSD: PLIST,v 1.26 2007/07/19 19:35:03 wiz Exp $
 bin/gnc-fq-check
 bin/gnc-fq-dump
 bin/gnc-fq-helper
@@ -6,7 +6,6 @@ bin/gnc-fq-update
 bin/gnc-test-env
 bin/gnucash
 bin/gnucash-bin
-bin/gnucash-config
 bin/gnucash-env
 bin/gnucash-make-guids
 bin/gnucash-valgrind
@@ -15,7 +14,6 @@ etc/gnucash/config
 include/gnucash/Account.h
 include/gnucash/FreqSpec.h
 include/gnucash/GNCId.h
-include/gnucash/Group.h
 include/gnucash/Period.h
 include/gnucash/Query.h
 include/gnucash/QueryCore.h
@@ -34,6 +32,7 @@ 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
@@ -77,7 +76,10 @@ include/gnucash/gnc-currency-edit.h
 include/gnucash/gnc-date-delta.h
 include/gnucash/gnc-date-edit.h
 include/gnucash/gnc-date-format.h
+include/gnucash/gnc-date-p.h
 include/gnucash/gnc-date.h
+include/gnucash/gnc-dense-cal-model.h
+include/gnucash/gnc-dense-cal-store.h
 include/gnucash/gnc-dense-cal.h
 include/gnucash/gnc-dialog.h
 include/gnucash/gnc-druid-cb.h
@@ -102,12 +104,12 @@ include/gnucash/gnc-general-select.h
 include/gnucash/gnc-gettext-util.h
 include/gnucash/gnc-gnome-utils.h
 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-graph-gog.h
 include/gnucash/gnc-html-history.h
 include/gnucash/gnc-html.h
-include/gnucash/gnc-http.h
 include/gnucash/gnc-icons.h
 include/gnucash/gnc-import-desc-format.h
 include/gnucash/gnc-import-format-cb.h
@@ -116,6 +118,7 @@ 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
@@ -130,6 +133,9 @@ include/gnucash/gnc-report.h
 include/gnucash/gnc-session-scm.h
 include/gnucash/gnc-session.h
 include/gnucash/gnc-splash.h
+include/gnucash/gnc-sx-instance-dense-cal-adapter.h
+include/gnucash/gnc-sx-instance-model.h
+include/gnucash/gnc-sx-list-tree-model-adapter.h
 include/gnucash/gnc-tree-model-account-types.h
 include/gnucash/gnc-tree-model-account.h
 include/gnucash/gnc-tree-model-budget.h
@@ -139,6 +145,7 @@ include/gnucash/gnc-tree-model.h
 include/gnucash/gnc-tree-view-account.h
 include/gnucash/gnc-tree-view-commodity.h
 include/gnucash/gnc-tree-view-price.h
+include/gnucash/gnc-tree-view-sx-list.h
 include/gnucash/gnc-tree-view.h
 include/gnucash/gnc-ui-common.h
 include/gnucash/gnc-ui-util.h
@@ -159,6 +166,7 @@ include/gnucash/option-util.h
 include/gnucash/policy.h
 include/gnucash/pricecell.h
 include/gnucash/print-session.h
+include/gnucash/qof-gobject.h
 include/gnucash/qof.h
 include/gnucash/qofbackend-p.h
 include/gnucash/qofbackend.h
@@ -191,8 +199,8 @@ include/gnucash/table-model.h
 include/gnucash/window-main-summarybar.h
 include/gnucash/window-report.h
 info/gnucash-design.info
-lib/gnucash/libgnc-business-ledger.la
 lib/gnucash/libgncmod-app-utils.la
+lib/gnucash/libgncmod-backend-file.la
 lib/gnucash/libgncmod-business-backend-file.la
 lib/gnucash/libgncmod-business-core.la
 lib/gnucash/libgncmod-business-gnome.la
@@ -206,7 +214,6 @@ lib/gnucash/libgncmod-gnome-utils.la
 lib/gnucash/libgncmod-ledger-core.la
 lib/gnucash/libgncmod-locale-reports-us.la
 lib/gnucash/libgncmod-log-replay.la
-lib/gnucash/libgncmod-network-utils.la
 lib/gnucash/libgncmod-ofx.la
 lib/gnucash/libgncmod-qif-import.la
 lib/gnucash/libgncmod-qif.la
@@ -218,32 +225,18 @@ 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/libgw-app-utils.la
-lib/gnucash/libgw-business-core.la
-lib/gnucash/libgw-business-gnome.la
-lib/gnucash/libgw-dialog-tax-table.la
-lib/gnucash/libgw-engine.la
-lib/gnucash/libgw-gnc-module.la
-lib/gnucash/libgw-gnome-utils.la
-lib/gnucash/libgw-kvp.la
-lib/gnucash/libgw-register-core.la
-lib/gnucash/libgw-report-gnome.la
-lib/gnucash/libgw-report-system.la
-lib/libcore-utils.la
+lib/gnucash/libgncqof-backend-qsf.la
 lib/libgnc-backend-file-utils.la
-lib/libgnc-backend-file.la
-lib/libgncgnome.la
-lib/libgncmodule.la
-lib/libgncqof-backend-qsf.la
-lib/libgncqof.la
-lib/libgw-core-utils.la
-lib/libgw-gnc.la
+lib/libgnc-business-ledger.la
+lib/libgnc-core-utils.la
+lib/libgnc-gnome.la
+lib/libgnc-module.la
+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/aclocal/gnucash.m4
 share/applications/gnucash.desktop
 share/gconf/schemas/apps_gnucash_dialog_business_common.schemas
 share/gconf/schemas/apps_gnucash_dialog_commodities.schemas
@@ -308,6 +301,23 @@ share/gnucash/accounts/de_DE/acctchrt_studium.gnucash-xea
 share/gnucash/accounts/el_GR/acctchrt_brokerage.gnucash-xea
 share/gnucash/accounts/el_GR/acctchrt_carloan.gnucash-xea
 share/gnucash/accounts/el_GR/acctchrt_common.gnucash-xea
+share/gnucash/accounts/en_GB/acctchrt_brokerage.gnucash-xea
+share/gnucash/accounts/en_GB/acctchrt_business.gnucash-xea
+share/gnucash/accounts/en_GB/acctchrt_carloan.gnucash-xea
+share/gnucash/accounts/en_GB/acctchrt_cdmoneymkt.gnucash-xea
+share/gnucash/accounts/en_GB/acctchrt_checkbook.gnucash-xea
+share/gnucash/accounts/en_GB/acctchrt_childcare.gnucash-xea
+share/gnucash/accounts/en_GB/acctchrt_common.gnucash-xea
+share/gnucash/accounts/en_GB/acctchrt_eduloan.gnucash-xea
+share/gnucash/accounts/en_GB/acctchrt_fixedassets.gnucash-xea
+share/gnucash/accounts/en_GB/acctchrt_homeloan.gnucash-xea
+share/gnucash/accounts/en_GB/acctchrt_homeown.gnucash-xea
+share/gnucash/accounts/en_GB/acctchrt_otherloan.gnucash-xea
+share/gnucash/accounts/en_GB/acctchrt_renter.gnucash-xea
+share/gnucash/accounts/en_GB/acctchrt_retiremt.gnucash-xea
+share/gnucash/accounts/en_GB/acctchrt_spouseinc.gnucash-xea
+share/gnucash/accounts/en_GB/acctchrt_spouseretire.gnucash-xea
+share/gnucash/accounts/en_GB/uk-vat.gnucash-xea
 share/gnucash/accounts/es_ES/acctchrt_brokerage.gnucash-xea
 share/gnucash/accounts/es_ES/acctchrt_carloan.gnucash-xea
 share/gnucash/accounts/es_ES/acctchrt_cdmoneymkt.gnucash-xea
@@ -467,22 +477,29 @@ share/gnucash/accounts/tr_TR/acctchrt_checkbook.gnucash-xea
 share/gnucash/accounts/tr_TR/acctchrt_common.gnucash-xea
 share/gnucash/accounts/tr_TR/acctchrt_fixedassets.gnucash-xea
 share/gnucash/accounts/tr_TR/acctchrt_homeloan.gnucash-xea
+share/gnucash/checks/deluxe.chk
+share/gnucash/checks/quicken.chk
+share/gnucash/checks/quicken_wallet.chk
 share/gnucash/doc/AUTHORS
 share/gnucash/doc/COPYING
 share/gnucash/doc/ChangeLog
 share/gnucash/doc/ChangeLog.2003
 share/gnucash/doc/ChangeLog.2004
 share/gnucash/doc/ChangeLog.2005
+share/gnucash/doc/ChangeLog.2006
 share/gnucash/doc/DOCUMENTERS
 share/gnucash/doc/HACKING
 share/gnucash/doc/INSTALL
 share/gnucash/doc/LICENSE
 share/gnucash/doc/NEWS
 share/gnucash/doc/README
+share/gnucash/doc/README-de.win32-bin.txt
+share/gnucash/doc/README-fr.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
 share/gnucash/doc/examples/Money95mfunds_fr.qif
@@ -558,36 +575,11 @@ share/gnucash/glade/transfer.glade
 share/gnucash/glade/userpass.glade
 share/gnucash/glade/vendor.glade
 share/gnucash/gnome
-share/gnucash/guile-modules/g-wrapped/gw-app-utils-spec.scm
-share/gnucash/guile-modules/g-wrapped/gw-app-utils.scm
-share/gnucash/guile-modules/g-wrapped/gw-business-core-spec.scm
-share/gnucash/guile-modules/g-wrapped/gw-business-core.scm
-share/gnucash/guile-modules/g-wrapped/gw-business-gnome-spec.scm
-share/gnucash/guile-modules/g-wrapped/gw-business-gnome.scm
-share/gnucash/guile-modules/g-wrapped/gw-core-utils-spec.scm
-share/gnucash/guile-modules/g-wrapped/gw-core-utils.scm
-share/gnucash/guile-modules/g-wrapped/gw-dialog-tax-table-spec.scm
-share/gnucash/guile-modules/g-wrapped/gw-dialog-tax-table.scm
-share/gnucash/guile-modules/g-wrapped/gw-engine-spec.scm
-share/gnucash/guile-modules/g-wrapped/gw-engine.scm
-share/gnucash/guile-modules/g-wrapped/gw-gnc-module-spec.scm
-share/gnucash/guile-modules/g-wrapped/gw-gnc-module.scm
-share/gnucash/guile-modules/g-wrapped/gw-gnc-spec.scm
-share/gnucash/guile-modules/g-wrapped/gw-gnc.scm
-share/gnucash/guile-modules/g-wrapped/gw-gnome-utils-spec.scm
-share/gnucash/guile-modules/g-wrapped/gw-gnome-utils.scm
-share/gnucash/guile-modules/g-wrapped/gw-kvp-spec.scm
-share/gnucash/guile-modules/g-wrapped/gw-kvp.scm
-share/gnucash/guile-modules/g-wrapped/gw-register-core-spec.scm
-share/gnucash/guile-modules/g-wrapped/gw-register-core.scm
-share/gnucash/guile-modules/g-wrapped/gw-report-gnome-spec.scm
-share/gnucash/guile-modules/g-wrapped/gw-report-gnome.scm
-share/gnucash/guile-modules/g-wrapped/gw-report-system-spec.scm
-share/gnucash/guile-modules/g-wrapped/gw-report-system.scm
 share/gnucash/guile-modules/gnucash/app-utils.scm
 share/gnucash/guile-modules/gnucash/business-core.scm
 share/gnucash/guile-modules/gnucash/business-gnome.scm
 share/gnucash/guile-modules/gnucash/business-utils.scm
+share/gnucash/guile-modules/gnucash/core-utils.scm
 share/gnucash/guile-modules/gnucash/dialog-tax-table.scm
 share/gnucash/guile-modules/gnucash/engine.scm
 share/gnucash/guile-modules/gnucash/gnc-module.scm
@@ -595,8 +587,6 @@ 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/printing/number-to-words.scm
-share/gnucash/guile-modules/gnucash/process.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
@@ -641,7 +631,10 @@ share/gnucash/guile-modules/gnucash/report/view-column.scm
 share/gnucash/guile-modules/gnucash/report/welcome-to-gnucash.scm
 share/gnucash/guile-modules/gnucash/tax/de_DE.scm
 share/gnucash/guile-modules/gnucash/tax/us.scm
-share/gnucash/pixmaps/appicon.png
+share/gnucash/guile-modules/www/cgi.scm
+share/gnucash/guile-modules/www/http.scm
+share/gnucash/guile-modules/www/main.scm
+share/gnucash/guile-modules/www/url.scm
 share/gnucash/pixmaps/gnc-account-16.png
 share/gnucash/pixmaps/gnc-account-delete-16.png
 share/gnucash/pixmaps/gnc-account-delete.png
@@ -668,7 +661,11 @@ 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.png
+share/gnucash/pixmaps/gnucash-icon-16x16.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.ico
 share/gnucash/pixmaps/gnucash_splash.png
 share/gnucash/pixmaps/stock_split_title.png
 share/gnucash/pixmaps/stock_split_watermark.png
@@ -700,12 +697,10 @@ share/gnucash/scm/html-style-sheet.scm
 share/gnucash/scm/html-table.scm
 share/gnucash/scm/html-text.scm
 share/gnucash/scm/html-utilities.scm
-share/gnucash/scm/kvp-option-registry.scm
 share/gnucash/scm/main-window.scm
 share/gnucash/scm/options-utilities.scm
 share/gnucash/scm/options.scm
 share/gnucash/scm/prefs.scm
-share/gnucash/scm/printing/print-check.scm
 share/gnucash/scm/qif-import/qif-dialog-utils.scm
 share/gnucash/scm/qif-import/qif-file.scm
 share/gnucash/scm/qif-import/qif-guess-map.scm
@@ -738,6 +733,7 @@ share/gnucash/ui/gnc-plugin-page-budget-ui.xml
 share/gnucash/ui/gnc-plugin-page-invoice-ui.xml
 share/gnucash/ui/gnc-plugin-page-register-ui.xml
 share/gnucash/ui/gnc-plugin-page-report-ui.xml
+share/gnucash/ui/gnc-plugin-page-sx-list-ui.xml
 share/gnucash/ui/gnc-plugin-page-sxregister-ui.xml
 share/gnucash/ui/gnc-plugin-qif-import-ui.xml
 share/gnucash/ui/gnc-plugin-register-ui.xml
@@ -779,7 +775,9 @@ share/locale/tr/LC_MESSAGES/gnucash.mo
 share/locale/uk/LC_MESSAGES/gnucash.mo
 share/locale/zh_CN/LC_MESSAGES/gnucash.mo
 share/locale/zh_TW/LC_MESSAGES/gnucash.mo
-share/pixmaps/gnucash-icon.png
+share/pixmaps/gnucash-icon-16x16.png
+share/pixmaps/gnucash-icon-32x32.png
+share/pixmaps/gnucash-icon-48x48.png
 share/xml/gnucash/xsl/README
 share/xml/gnucash/xsl/date-time.xsl
 share/xml/gnucash/xsl/gnucash-gnccustomer-vcard2.xsl
@@ -794,23 +792,22 @@ share/xml/gnucash/xsl/vcard-gnccustomer.pl
 @dirrm share/gnucash/xml
 @dirrm share/gnucash/ui
 @dirrm share/gnucash/scm/qif-import
-@dirrm share/gnucash/scm/printing
 @dirrm share/gnucash/scm/gnumeric
 @dirrm share/gnucash/scm
 @dirrm share/gnucash/pixmaps
+@dirrm share/gnucash/guile-modules/www
 @exec ${MKDIR} %D/share/gnucash/guile-modules/srfi
 @dirrm share/gnucash/guile-modules/srfi
 @dirrm share/gnucash/guile-modules/gnucash/tax
 @dirrm share/gnucash/guile-modules/gnucash/report/locale-specific
 @dirrm share/gnucash/guile-modules/gnucash/report
-@dirrm share/gnucash/guile-modules/gnucash/printing
 @dirrm share/gnucash/guile-modules/gnucash/import-export
 @dirrm share/gnucash/guile-modules/gnucash
-@dirrm share/gnucash/guile-modules/g-wrapped
 @dirrm share/gnucash/guile-modules
 @dirrm share/gnucash/glade
 @dirrm share/gnucash/doc/examples
 @dirrm share/gnucash/doc
+@dirrm share/gnucash/checks
 @dirrm share/gnucash/accounts/tr_TR
 @dirrm share/gnucash/accounts/sk
 @dirrm share/gnucash/accounts/pt_PT
@@ -822,6 +819,7 @@ share/xml/gnucash/xsl/vcard-gnccustomer.pl
 @dirrm share/gnucash/accounts/fr_CH
 @dirrm share/gnucash/accounts/fr_CA
 @dirrm share/gnucash/accounts/es_ES
+@dirrm share/gnucash/accounts/en_GB
 @dirrm share/gnucash/accounts/el_GR
 @dirrm share/gnucash/accounts/de_DE
 @dirrm share/gnucash/accounts/de_CH
diff --git a/finance/gnucash/buildlink3.mk b/finance/gnucash/buildlink3.mk
index 28b74d0443f..90fe93a1c8c 100644
--- a/finance/gnucash/buildlink3.mk
+++ b/finance/gnucash/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2007/06/05 05:37:14 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2007/07/19 19:35:04 wiz Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GNUCASH_BUILDLINK3_MK:=	${GNUCASH_BUILDLINK3_MK}+
@@ -12,9 +12,9 @@ BUILDLINK_PACKAGES+=	gnucash
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gnucash
 
 .if ${GNUCASH_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.gnucash+=	gnucash>=2.0.0
-BUILDLINK_ABI_DEPENDS.gnucash?=	gnucash>=2.0.5nb5
-BUILDLINK_PKGSRCDIR.gnucash?=	../../finance/gnucash
+BUILDLINK_API_DEPENDS.gnucash+=	gnucash>=2.1.0
+BUILDLINK_ABI_DEPENDS.gnucash?=	gnucash>=2.1.3
+BUILDLINK_PKGSRCDIR.gnucash?=	../../finance/gnucash-current
 .endif	# GNUCASH_BUILDLINK3_MK
 
 #.include "../../archivers/bzip2/buildlink3.mk"
diff --git a/finance/gnucash/distinfo b/finance/gnucash/distinfo
index a1dbe7ba9fa..4c1eeee39a0 100644
--- a/finance/gnucash/distinfo
+++ b/finance/gnucash/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.35 2007/02/19 20:31:11 wiz Exp $
+$NetBSD: distinfo,v 1.36 2007/07/19 19:35:04 wiz Exp $
 
-SHA1 (gnucash-2.0.5.tar.gz) = d292c4f2a8e0362086b87c745f6f21ccc77481d3
-RMD160 (gnucash-2.0.5.tar.gz) = cbfd0eef7d768202c6775e9bad1c6635c8721e3a
-Size (gnucash-2.0.5.tar.gz) = 10404303 bytes
-SHA1 (patch-aa) = db08a08fe8181822c1038d0adb3174dc2ebbcc12
-SHA1 (patch-ab) = 01547c8c1a41ee39773a4ba960ec27be5ab2e0a2
-SHA1 (patch-ac) = b832801e5980f7ad4aeb9eb82c422c6b658d660e
-SHA1 (patch-ad) = 0d9894d7652abbdb177f3e2f71f604a5fed0ebeb
+SHA1 (gnucash-2.2.0.tar.gz) = 5857b863a6f9b40c8280442ee69ca14a69289a3f
+RMD160 (gnucash-2.2.0.tar.gz) = a41c040a4e6311105edcc051db5a11bc67093098
+Size (gnucash-2.2.0.tar.gz) = 9865294 bytes
+SHA1 (patch-aa) = 239371b133b7a585e4a18bbe1efa7e6656d63c9c
+SHA1 (patch-ab) = c9ea305299bf84c61898a57677e1e43d6c31be27
+SHA1 (patch-ac) = ea892a086f86b2f9f2b48ec5d02e1c2c1b8db336
+SHA1 (patch-ad) = 831d66cc09164809a1623d067eed6c498994b76e
diff --git a/finance/gnucash/patches/patch-aa b/finance/gnucash/patches/patch-aa
index 30a87f412b3..a9fd98eb212 100644
--- a/finance/gnucash/patches/patch-aa
+++ b/finance/gnucash/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.4 2006/07/11 12:58:08 wiz Exp $
+$NetBSD: patch-aa,v 1.5 2007/07/19 19:35:04 wiz Exp $
 
---- src/core-utils/gnc-gkeyfile-utils.c.orig	2006-02-23 18:16:56.000000000 +0000
+--- src/core-utils/gnc-gkeyfile-utils.c.orig	2007-04-28 23:16:20.000000000 +0000
 +++ src/core-utils/gnc-gkeyfile-utils.c
-@@ -85,7 +85,6 @@ gnc_key_file_save_to_file (const gchar *
+@@ -303,7 +303,6 @@ gnc_key_file_save_to_file (const gchar *
  {
    gchar *contents;
    gint fd;
diff --git a/finance/gnucash/patches/patch-ab b/finance/gnucash/patches/patch-ab
index 08a55e18366..73b1db67fa3 100644
--- a/finance/gnucash/patches/patch-ab
+++ b/finance/gnucash/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1 2006/07/11 12:58:29 wiz Exp $
+$NetBSD: patch-ab,v 1.2 2007/07/19 19:35:04 wiz Exp $
 
---- src/app-utils/gnc-ui-util.c.orig	2006-05-15 01:07:33.000000000 +0000
+--- src/app-utils/gnc-ui-util.c.orig	2007-06-02 17:56:55.000000000 +0000
 +++ src/app-utils/gnc-ui-util.c
-@@ -100,6 +100,14 @@ gnc_configure_account_separator (void)
+@@ -103,6 +103,14 @@ gnc_configure_account_separator (void)
      free(string);
  }
  
@@ -17,7 +17,7 @@ $NetBSD: patch-ab,v 1.1 2006/07/11 12:58:29 wiz Exp $
  
  static void
  gnc_configure_reverse_balance (void)
-@@ -763,15 +771,15 @@ gnc_localeconv (void)
+@@ -780,16 +788,16 @@ gnc_localeconv (void)
  
    lc = *localeconv();
  
@@ -30,19 +30,21 @@ $NetBSD: patch-ab,v 1.1 2006/07/11 12:58:29 wiz Exp $
 -  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_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.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);
-@@ -1275,13 +1283,13 @@ PrintAmountInternal(char *buf, gnc_numer
+@@ -1293,13 +1301,13 @@ PrintAmountInternal(char *buf, gnc_numer
  
      if (info->monetary)
      {
@@ -60,7 +62,7 @@ $NetBSD: patch-ab,v 1.1 2006/07/11 12:58:29 wiz Exp $
      }
  
      buf_ptr = buf;
-@@ -1349,7 +1357,7 @@ PrintAmountInternal(char *buf, gnc_numer
+@@ -1367,7 +1375,7 @@ PrintAmountInternal(char *buf, gnc_numer
    }
    else
    {
@@ -69,7 +71,16 @@ $NetBSD: patch-ab,v 1.1 2006/07/11 12:58:29 wiz Exp $
      guint8 num_decimal_places = 0;
      char *temp_ptr = temp_buf;
  
-@@ -1632,13 +1640,13 @@ xaccParseAmount (const char * in_str, gb
+@@ -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);
diff --git a/finance/gnucash/patches/patch-ac b/finance/gnucash/patches/patch-ac
index 42288941fbd..2f612f56d84 100644
--- a/finance/gnucash/patches/patch-ac
+++ b/finance/gnucash/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.3 2006/07/11 12:58:29 wiz Exp $
+$NetBSD: patch-ac,v 1.4 2007/07/19 19:35:04 wiz Exp $
 
---- src/app-utils/gnc-exp-parser.c.orig	2006-05-15 01:07:33.000000000 +0000
+--- 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
  
diff --git a/finance/gnucash/patches/patch-ad b/finance/gnucash/patches/patch-ad
index 59cc8aab802..87bc6d66a44 100644
--- a/finance/gnucash/patches/patch-ad
+++ b/finance/gnucash/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.8 2006/10/23 21:46:39 wiz Exp $
+$NetBSD: patch-ad,v 1.9 2007/07/19 19:35:04 wiz Exp $
 
---- src/gnome/druid-acct-period.c.orig	2006-10-08 17:15:14.000000000 +0000
+--- src/gnome/druid-acct-period.c.orig	2007-04-28 23:16:48.000000000 +0000
 +++ src/gnome/druid-acct-period.c
-@@ -334,7 +334,7 @@ ap_show_menu (GnomeDruidPage *druidpage,
+@@ -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); 
@@ -11,7 +11,7 @@ $NetBSD: patch-ad,v 1.8 2006/10/23 21:46:39 wiz Exp $
  
    prepare_remarks (info);
  }
-@@ -529,7 +529,7 @@ ap_druid_create (AcctPeriodInfo *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",