gnucash: update to 3.0.

The GnuCash development team proudly announces GnuCash 3.0, the
first release in our new 3.x stable series.

New Features for Users:

    The headline item for this release is that GnuCash now uses
    the Gtk+-3.0 Toolkit and the WebKit2Gtk API. This change was
    forced on us by some major Linux distributions dropping support
    for the WebKit1 API. Unfortunately the Webkit project doesn't
    support Microsoft Windows so that platform will continue to
    use the WebKit1 API, though with Gtk3. We've selected Gtk+-3.14.0
    as the minimum version because it fully supports CSS theming.

    New editors to remove outdated or incorrect match data from
    the import maps, a new user interfacs for managing files
    associated with transactions, an improved facility for removing
    old prices from the price database, and a way to remove deleted
    files from the history list in the file menu.

    New Reports: A Reconciliation Report based on the Transaction
    Report,a Income GST Report, and a Cashflow Barchart report.

    A new CSV importer largely rewritten in C++, adding new features
    including the ability to re-import CSV files exported from
    GnuCash, along with a separate CSV price importer.

    A new preference panel for the Alphavantage API key so that
    Finance::Quote users need not edit /etc/gnucash/environment.
    We've removed all references to the various Yahoo! quote sources
    and made Alphavantage the default.

    Data file directories are now located appropriately to the operating system's conventions by default:
        Windows: CSIDL_APPDATA/Gnucash
        MacOS: $HOME/Application Support/Gnucash
        Linux: $XDG_CONFIG_HOME/gnucash (or the default $HOME/.config/gnucash)
    It's still possible to overried with the environment variable GNC_DOC_PATH, which replaces GNC_DOT_DIR in earlier versions of GnuCash.

    Accounts in the Bayes import map are now linked by GUID instead
    of names so that the matcher won't have to be retrained if you
    rename an account. The Bayesian import maps are also stored in
    a flatter structure to allow faster access, especially in SQL.
    These changes mean that if you have Bayesian mapping data, once
    converted your database will be loadable only by GnuCash 2.6.20
    and later.

    MySQL and SQLite3 date storage has changed a bit. Once converted,
    MySQL and SQLite3 database will be loadable only by GnuCash
    2.6.19 and later.

    Numerics are rewritten to allow for more significant digits.
    The old 6-digit-maximum fraction is now 9-digits, and prices
    may have up to 18 digit precision.

    Chart Reports appearance is improved, including more modern
    chart colours as suggested by http://clrs.cc/.

    Transaction Report improvements, including regular expression
    filtering and many more options and features including a
    "Subtotal Summary Grid" The subtotal summary-grid will tabulate
    subtotals - prime-sortkey vertically, sec-sortkey horizontally.
    For example, with prime-sortkey = accounts, sec-sortkey = date,
    sec-subtotal = monthly will produce a monthly time series table.

    The About dialog box layout is improved and now includes the
    detected Finance::Quote version.

    GnuCash will always build the locale-specific tax modules. This
    was optional when building with autotools and never enabled
    when building with cmake. Note that the only supported tax
    locales are en_US and de_DE.

    On Macs the Reconcile Window's menu moved to the menubar.

    GnuCash no longer supports Guile-1.8 and now does support Guile-2.2

7 files changed, 378 insertions, 468 deletions

diff --git a/finance/gnucash/DESCR b/finance/gnucash/DESCR
index f94860835eb..dca7a47eca5 100644
--- a/finance/gnucash/DESCR
+++ b/finance/gnucash/DESCR
@@ -11,14 +11,11 @@ to ensure balanced books.  Features include:
   - OFX and Quicken File Import and HBCI Support
   - Reconcile window with running reconciled and cleared balances
   - Stock/Mutual Fund Portfolios
-  - Get Stock & Mutual Fund quotes from various web sites, update
-    portfolio automatically (more funds being added regularly).
+  - Get Stock & Mutual Fund quotes from various web sites
   - Reports
-  - Multiple Currencies & Currency Trading
-  - New Multi-Currency Transaction Handling
+  - Multiple Currencies & Currency Trading, Multi-Currency Handling
   - Chart of Accounts
   - Split Transactions
   - Double Entry
-  - Income/Expense Account Types (Categories)
   - General Ledger
   - International date handling, many different translations.
diff --git a/finance/gnucash/Makefile b/finance/gnucash/Makefile
index d799e0df812..751bcb74195 100644
--- a/finance/gnucash/Makefile
+++ b/finance/gnucash/Makefile
@@ -1,68 +1,83 @@
-# $NetBSD: Makefile,v 1.253 2018/03/12 11:16:28 wiz Exp $
+# $NetBSD: Makefile,v 1.254 2018/04/09 08:47:35 wiz Exp $
 
-DISTNAME=		gnucash-2.6.19
-PKGREVISION=		1
+DISTNAME=		gnucash-3.0
 CATEGORIES=		finance
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=gnucash/}
 EXTRACT_SUFX=		.tar.bz2
+# take copy mirrored on ftp.NetBSD.org for devel/googletest
+# for better DISTNAME
+# depending on googletest package is not sufficient since not all
+# files that are used are installed
+DISTFILES=		${DISTNAME}${EXTRACT_SUFX} googletest-1.8.0.tar.gz
 
 MAINTAINER=		wiz@NetBSD.org
 HOMEPAGE=		http://www.gnucash.org/
 COMMENT=		Personal or business finance management program
 LICENSE=		gnu-gpl-v3
 
-DEPENDS+=		guile-slib>=3.2.1:../../devel/guile-slib
+DEPENDS+=		guile22-slib>=3.2.1:../../devel/guile22-slib
 DEPENDS+=		p5-Finance-Quote-[0-9]*:../../finance/p5-Finance-Quote
 DEPENDS+=		p5-Date-Manip-[0-9]*:../../devel/p5-Date-Manip
-DEPENDS+=		${PYPKGPREFIX}-gtk2-[0-9]*:../../x11/py-gtk2
-# /usr/pkg/share/gnucash/python/pycons/console.py imports readline
-DEPENDS+=		${PYPKGPREFIX}-readline-[0-9]*:../../devel/py-readline
 DEPENDS+=		dconf-[0-9]*:../../devel/dconf
+# instead of USE_TOOLS+=msgfmt, since we need a newer version
+TOOL_DEPENDS+=		gettext-tools>=0.19.6:../../devel/gettext-tools
 
-WRKSRC=			${WRKDIR}/${DISTNAME:S/-1//}
-
+USE_LANGUAGES=		c c++
+USE_CMAKE=		yes
 USE_LIBTOOL=		yes
-USE_PKGLOCALEDIR=	yes
-USE_TOOLS+=		gmake intltool makeinfo msgfmt perl:run pkg-config
-GNU_CONFIGURE=		yes
-INFO_FILES=		YES
+INFO_FILES=		yes
+USE_TOOLS+=		perl:run pkg-config
+# remove when using ninja
+USE_TOOLS+=		gmake
+
+LDFLAGS+=		${COMPILER_RPATH_FLAG}${PREFIX}/lib/gnucash
+CXXFLAGS+=		-Wno-deprecated-declarations
 
-CONFIGURE_ARGS+=	--with-html-engine=webkit
-CONFIGURE_ARGS+=	--enable-python
-CONFIGURE_ARGS+=	--with-xdg-data-dirs=${PREFIX}/share
-#CONFIGURE_ARGS+=	GUILE=${PREFIX}/${GUILE20_SUBDIR}/bin/guile
+MAKE_ENV+=		GUILE_AUTO_COMPILE=0
+CMAKE_ARGS+=		-DGMOCK_ROOT=${WRKDIR}/googletest-release-1.8.0/googlemock
+CMAKE_ARGS+=		-DGTEST_ROOT=${WRKDIR}/googletest-release-1.8.0/googletest
+CMAKE_ARGS+=		-DWITH_AQBANKING=OFF
+CMAKE_ARGS+=		-DPERL_EXECUTABLE=${PERL5}
+CMAKE_ARGS+=		-DCOMPILE_GSCHEMAS=OFF
+#CMAKE_ARGS+=		-GNinja
+#BUILD_DEPENDS+=	ninja-build-[0-9]*:../../devel/ninja-build
 
-REPLACE_PERL+=		src/quotes/gnc-fq-dump
-REPLACE_PERL+=		src/backend/xml/test/grab-types.pl
-REPLACE_PERL+=		src/quotes/Quote_example.pl
-REPLACE_PERL+=		src/gnc-test-env.pl
+#do-build:
+#	cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ninja
+#do-install:
+#	cd ${WRKSRC}; ${SETENV} ${INSTALL_ENV} ninja install
 
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # not yet ported as of 2.6.1
-REPLACE_PYTHON+=	src/python/pycons/*.py src/python/pycons/pycons
-PY_PATCHPLIST=		yes
+REPLACE_PERL+=		common/gnc-test-env.pl
+REPLACE_PERL+=		libgnucash/backend/xml/test/grab-types.pl
+REPLACE_PERL+=		libgnucash/quotes/gnc-fq-dump
+REPLACE_PERL+=		util/elegant-sort.pl
+
+PLIST_SRC=		PLIST
 
 PKG_SYSCONFSUBDIR=	gnucash
-CONF_FILES+=		${PREFIX}/share/examples/gnucash/gnucash/config ${PKG_SYSCONFDIR}/config
-CONF_FILES+=		${PREFIX}/share/examples/gnucash/gnucash/environment ${PKG_SYSCONFDIR}/environment
-INSTALL_MAKE_FLAGS+=	sysconfdir=${PREFIX}/share/examples/gnucash
+CONF_FILES+=		${PREFIX}/share/examples/gnucash/environment ${PKG_SYSCONFDIR}/environment
+INSTALLATION_DIRS=	share/examples/gnucash
+
+post-install:
+	${MV} ${DESTDIR}${PREFIX}/etc/gnucash/environment ${DESTDIR}${PREFIX}/share/examples/gnucash/environment
 
 .include "options.mk"
 
-BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.28.0
+BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.40.0
 .include "../../devel/glib2/schemas.mk"
 .include "../../devel/glib2/buildlink3.mk"
+BUILDLINK_API_DEPENDS.boost-headers+=   boost-headers>=1.64.0nb3
+.include "../../devel/boost-headers/buildlink3.mk"
+.include "../../devel/boost-libs/buildlink3.mk"
+.include "../../devel/swig2/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/gdk-pixbuf2/buildlink3.mk"
-.include "../../graphics/libgnomecanvas/buildlink3.mk"
-.include "../../lang/guile20/buildlink3.mk"
-.include "../../lang/python/application.mk"
-.include "../../lang/python/extension.mk"
-.include "../../misc/goffice0.8/buildlink3.mk"
-BUILDLINK_API_DEPENDS.gnome-keyring+=	gnome-keyring>=0.6
-.include "../../security/gnome-keyring/buildlink3.mk"
+.include "../../lang/guile22/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../textproc/icu/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
-.include "../../www/webkit24-gtk/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
+.include "../../www/webkit-gtk/buildlink3.mk"
+.include "../../x11/gtk3/buildlink3.mk"
+.include "../../x11/gtkmm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/finance/gnucash/PLIST b/finance/gnucash/PLIST
index da34d79c6ab..9bfaee24628 100644
--- a/finance/gnucash/PLIST
+++ b/finance/gnucash/PLIST
@@ -1,11 +1,9 @@
-@comment $NetBSD: PLIST,v 1.65 2017/12/18 20:55:27 wiz Exp $
+@comment $NetBSD: PLIST,v 1.66 2018/04/09 08:47:35 wiz Exp $
 bin/gnc-fq-check
 bin/gnc-fq-dump
 bin/gnc-fq-helper
 bin/gnc-fq-update
 bin/gnucash
-bin/gnucash-env
-bin/gnucash-make-guids
 bin/gnucash-valgrind
 include/gnucash/Account.h
 include/gnucash/FreqSpec.h
@@ -62,6 +60,7 @@ include/gnucash/gnc-account-sel.h
 include/gnucash/gnc-accounting-period.h
 include/gnucash/gnc-addr-quickfill.h
 include/gnucash/gnc-amount-edit.h
+include/gnucash/gnc-aqbanking-templates.h
 include/gnucash/gnc-basic-gobject.h
 include/gnucash/gnc-budget.h
 include/gnucash/gnc-cell-renderer-date.h
@@ -75,8 +74,8 @@ 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-datetime.hpp
 include/gnucash/gnc-dense-cal-model.h
 include/gnucash/gnc-dense-cal-store.h
 include/gnucash/gnc-dense-cal.h
@@ -86,6 +85,7 @@ 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-features.h
 include/gnucash/gnc-file.h
 include/gnucash/gnc-frequency.h
 include/gnucash/gnc-general-search.h
@@ -103,6 +103,7 @@ 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-webkit2.h
 include/gnucash/gnc-html.h
 include/gnucash/gnc-icons.h
 include/gnucash/gnc-keyring.h
@@ -111,6 +112,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-numeric.hpp
 include/gnucash/gnc-period-select.h
 include/gnucash/gnc-plugin-file-history.h
 include/gnucash/gnc-plugin-manager.h
@@ -121,6 +123,8 @@ include/gnucash/gnc-plugin.h
 include/gnucash/gnc-prefs-utils.h
 include/gnucash/gnc-pricedb.h
 include/gnucash/gnc-query-view.h
+include/gnucash/gnc-rational-rounding.hpp
+include/gnucash/gnc-rational.hpp
 include/gnucash/gnc-recurrence.h
 include/gnucash/gnc-report.h
 include/gnucash/gnc-session.h
@@ -129,6 +133,7 @@ include/gnucash/gnc-state.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-timezone.hpp
 include/gnucash/gnc-tree-control-split-reg.h
 include/gnucash/gnc-tree-model-account-types.h
 include/gnucash/gnc-tree-model-account.h
@@ -149,6 +154,7 @@ include/gnucash/gnc-tree-view.h
 include/gnucash/gnc-ui-balances.h
 include/gnucash/gnc-ui-util.h
 include/gnucash/gnc-ui.h
+include/gnucash/gnc-uri-utils.h
 include/gnucash/gnc-window.h
 include/gnucash/gncAddress.h
 include/gnucash/gncAddressP.h
@@ -177,23 +183,22 @@ include/gnucash/gncVendor.h
 include/gnucash/gncVendorP.h
 include/gnucash/gtable.h
 include/gnucash/guid.h
+include/gnucash/guid.hpp
 include/gnucash/guile-util.h
-include/gnucash/import-match-map.h
 include/gnucash/import-parse.h
+include/gnucash/kvp-frame.hpp
 include/gnucash/kvp-scm.h
-include/gnucash/kvp-util-p.h
-include/gnucash/kvp-util.h
-include/gnucash/kvp_frame.h
+include/gnucash/kvp-value.hpp
 include/gnucash/misc-gnome-utils.h
 include/gnucash/numcell.h
 include/gnucash/option-util.h
 include/gnucash/policy.h
 include/gnucash/pricecell.h
 include/gnucash/print-session.h
+include/gnucash/qof-backend.hpp
 include/gnucash/qof-gobject.h
 include/gnucash/qof-string-cache.h
 include/gnucash/qof.h
-include/gnucash/qofbackend-p.h
 include/gnucash/qofbackend.h
 include/gnucash/qofbook.h
 include/gnucash/qofbookslots.h
@@ -208,8 +213,8 @@ include/gnucash/qoflog.h
 include/gnucash/qofobject.h
 include/gnucash/qofquery.h
 include/gnucash/qofquerycore.h
-include/gnucash/qofreference.h
 include/gnucash/qofsession.h
+include/gnucash/qofsession.hpp
 include/gnucash/qofutil.h
 include/gnucash/quickfillcell.h
 include/gnucash/recncell.h
@@ -221,190 +226,194 @@ include/gnucash/table-model.h
 include/gnucash/tree-view-utils.h
 include/gnucash/window-main-summarybar.h
 include/gnucash/window-report.h
-lib/gnucash/libgncmod-app-utils-python.la
-lib/gnucash/libgncmod-app-utils.la
-${PLIST.dbi}lib/gnucash/libgncmod-backend-dbi.la
-lib/gnucash/libgncmod-backend-xml.la
-lib/gnucash/libgncmod-bi_import.la
-lib/gnucash/libgncmod-business-gnome.la
-lib/gnucash/libgncmod-csv-export.la
-lib/gnucash/libgncmod-csv-import.la
-lib/gnucash/libgncmod-customer_import.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
-${PLIST.ofx}lib/gnucash/libgncmod-ofx.la
-lib/gnucash/libgncmod-python.la
-lib/gnucash/libgncmod-qif-import.la
-lib/gnucash/libgncmod-qif.la
-lib/gnucash/libgncmod-register-core.la
-lib/gnucash/libgncmod-register-gnome.la
-lib/gnucash/libgncmod-report-gnome.la
-lib/gnucash/libgncmod-report-system.la
-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/scm/ccache/2.0/build-config.go
-lib/gnucash/scm/ccache/2.0/business-options.go
-lib/gnucash/scm/ccache/2.0/business-prefs.go
-lib/gnucash/scm/ccache/2.0/c-interface.go
-lib/gnucash/scm/ccache/2.0/commodity-table.go
-lib/gnucash/scm/ccache/2.0/commodity-utilities.go
-lib/gnucash/scm/ccache/2.0/config-var.go
-lib/gnucash/scm/ccache/2.0/date-utilities.go
-lib/gnucash/scm/ccache/2.0/engine-interface.go
-lib/gnucash/scm/ccache/2.0/engine-utilities.go
-lib/gnucash/scm/ccache/2.0/fin.go
-lib/gnucash/scm/ccache/2.0/gnc-menu-extensions.go
-lib/gnucash/scm/ccache/2.0/gnc-numeric.go
-lib/gnucash/scm/ccache/2.0/gnucash/app-utils.go
-lib/gnucash/scm/ccache/2.0/gnucash/business-core.go
-lib/gnucash/scm/ccache/2.0/gnucash/business-gnome.go
-lib/gnucash/scm/ccache/2.0/gnucash/core-utils.go
-lib/gnucash/scm/ccache/2.0/gnucash/engine.go
-lib/gnucash/scm/ccache/2.0/gnucash/gettext.go
-lib/gnucash/scm/ccache/2.0/gnucash/gnc-module.go
-lib/gnucash/scm/ccache/2.0/gnucash/gnome-utils.go
-lib/gnucash/scm/ccache/2.0/gnucash/import-export/qif-import.go
-lib/gnucash/scm/ccache/2.0/gnucash/main.go
-lib/gnucash/scm/ccache/2.0/gnucash/price-quotes.go
-lib/gnucash/scm/ccache/2.0/gnucash/printf.go
-lib/gnucash/scm/ccache/2.0/gnucash/report/aging.go
-lib/gnucash/scm/ccache/2.0/gnucash/report/balsheet-eg.go
-lib/gnucash/scm/ccache/2.0/gnucash/report/business-reports.go
-lib/gnucash/scm/ccache/2.0/gnucash/report/customer-summary.go
-lib/gnucash/scm/ccache/2.0/gnucash/report/easy-invoice.go
-lib/gnucash/scm/ccache/2.0/gnucash/report/eguile-gnc.go
-lib/gnucash/scm/ccache/2.0/gnucash/report/eguile-html-utilities.go
-lib/gnucash/scm/ccache/2.0/gnucash/report/eguile-utilities.go
-lib/gnucash/scm/ccache/2.0/gnucash/report/fancy-invoice.go
-lib/gnucash/scm/ccache/2.0/gnucash/report/hello-world.go
-lib/gnucash/scm/ccache/2.0/gnucash/report/invoice.go
-lib/gnucash/scm/ccache/2.0/gnucash/report/job-report.go
-lib/gnucash/scm/ccache/2.0/gnucash/report/locale-specific/de_DE.go
-lib/gnucash/scm/ccache/2.0/gnucash/report/locale-specific/us.go
-lib/gnucash/scm/ccache/2.0/gnucash/report/owner-report.go
-lib/gnucash/scm/ccache/2.0/gnucash/report/payables.go
-lib/gnucash/scm/ccache/2.0/gnucash/report/receivables.go
-lib/gnucash/scm/ccache/2.0/gnucash/report/report-gnome.go
-lib/gnucash/scm/ccache/2.0/gnucash/report/report-system.go
-lib/gnucash/scm/ccache/2.0/gnucash/report/report-system/collectors.go
-lib/gnucash/scm/ccache/2.0/gnucash/report/report-system/list-extras.go
-lib/gnucash/scm/ccache/2.0/gnucash/report/report-system/report-collectors.go
-lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports.go
-lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/account-piecharts.go
-lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/account-summary.go
-lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/advanced-portfolio.go
-lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/average-balance.go
-lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/balance-sheet.go
-lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/budget-balance-sheet.go
-lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/budget-barchart.go
-lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/budget-flow.go
-lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/budget-income-statement.go
-lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/budget.go
-lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/cash-flow.go
-lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/category-barchart.go
-lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/daily-reports.go
-lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/equity-statement.go
-lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/general-journal.go
-lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/general-ledger.go
-lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/income-statement.go
-lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/net-barchart.go
-lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/net-linechart.go
-lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/portfolio.go
-lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/price-scatter.go
-lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/register.go
-lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/sx-summary.go
-lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/transaction.go
-lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/trial-balance.go
-lib/gnucash/scm/ccache/2.0/gnucash/report/stylesheet-easy.go
-lib/gnucash/scm/ccache/2.0/gnucash/report/stylesheet-fancy.go
-lib/gnucash/scm/ccache/2.0/gnucash/report/stylesheet-footer.go
-lib/gnucash/scm/ccache/2.0/gnucash/report/stylesheet-plain.go
-lib/gnucash/scm/ccache/2.0/gnucash/report/stylesheets.go
-lib/gnucash/scm/ccache/2.0/gnucash/report/taxinvoice.go
-lib/gnucash/scm/ccache/2.0/gnucash/report/taxtxf-de_DE.go
-lib/gnucash/scm/ccache/2.0/gnucash/report/taxtxf.go
-lib/gnucash/scm/ccache/2.0/gnucash/report/utility-reports.go
-lib/gnucash/scm/ccache/2.0/gnucash/report/view-column.go
-lib/gnucash/scm/ccache/2.0/gnucash/report/welcome-to-gnucash.go
-lib/gnucash/scm/ccache/2.0/gnucash/tax/de_DE.go
-lib/gnucash/scm/ccache/2.0/gnucash/tax/us.go
-lib/gnucash/scm/ccache/2.0/gnucash/unittest-support.go
-lib/gnucash/scm/ccache/2.0/gnumeric/gnumeric-utilities.go
-lib/gnucash/scm/ccache/2.0/gnumeric/table-utils.go
-lib/gnucash/scm/ccache/2.0/hooks.go
-lib/gnucash/scm/ccache/2.0/html-acct-table.go
-lib/gnucash/scm/ccache/2.0/html-barchart.go
-lib/gnucash/scm/ccache/2.0/html-document.go
-lib/gnucash/scm/ccache/2.0/html-fonts.go
-lib/gnucash/scm/ccache/2.0/html-jqplot.go
-lib/gnucash/scm/ccache/2.0/html-linechart.go
-lib/gnucash/scm/ccache/2.0/html-piechart.go
-lib/gnucash/scm/ccache/2.0/html-scatter.go
-lib/gnucash/scm/ccache/2.0/html-style-info.go
-lib/gnucash/scm/ccache/2.0/html-style-sheet.go
-lib/gnucash/scm/ccache/2.0/html-table.go
-lib/gnucash/scm/ccache/2.0/html-text.go
-lib/gnucash/scm/ccache/2.0/html-utilities.go
-lib/gnucash/scm/ccache/2.0/migrate-prefs.go
-lib/gnucash/scm/ccache/2.0/options-utilities.go
-lib/gnucash/scm/ccache/2.0/options.go
-lib/gnucash/scm/ccache/2.0/prefs.go
-lib/gnucash/scm/ccache/2.0/qif-import/qif-dialog-utils.go
-lib/gnucash/scm/ccache/2.0/qif-import/qif-file.go
-lib/gnucash/scm/ccache/2.0/qif-import/qif-guess-map.go
-lib/gnucash/scm/ccache/2.0/qif-import/qif-import.go
-lib/gnucash/scm/ccache/2.0/qif-import/qif-merge-groups.go
-lib/gnucash/scm/ccache/2.0/qif-import/qif-objects.go
-lib/gnucash/scm/ccache/2.0/qif-import/qif-parse.go
-lib/gnucash/scm/ccache/2.0/qif-import/qif-to-gnc.go
-lib/gnucash/scm/ccache/2.0/qif-import/qif-utils.go
-lib/gnucash/scm/ccache/2.0/report-utilities.go
-lib/gnucash/scm/ccache/2.0/report.go
-lib/gnucash/scm/ccache/2.0/simple-obj.go
-lib/gnucash/scm/ccache/2.0/string.go
-lib/gnucash/scm/ccache/2.0/substring-search.go
-lib/gnucash/scm/ccache/2.0/txf-de_DE.go
-lib/gnucash/scm/ccache/2.0/txf-help-de_DE.go
-lib/gnucash/scm/ccache/2.0/txf-help.go
-lib/gnucash/scm/ccache/2.0/txf.go
-lib/gnucash/scm/ccache/2.0/xml-generator.go
-lib/libgnc-backend-sql.la
-lib/libgnc-backend-xml-utils.la
-lib/libgnc-business-ledger.la
-lib/libgnc-core-utils-python.la
-lib/libgnc-core-utils.la
-lib/libgnc-gnome.la
-lib/libgnc-module.la
-lib/libgnc-qof.la
-${PYSITELIB}/gnucash/__init__.py
-${PYSITELIB}/gnucash/_gnucash_core_c.la
-${PYSITELIB}/gnucash/function_class.py
-${PYSITELIB}/gnucash/gnucash_business.py
-${PYSITELIB}/gnucash/gnucash_core.py
-${PYSITELIB}/gnucash/gnucash_core_c.py
-libexec/gnucash/overrides/gnucash-env
-libexec/gnucash/overrides/gnucash-make-guids
-libexec/gnucash/src/libqof/qof/test/kvp_frame.h
-libexec/gnucash/src/libqof/qof/test/qofbook.h
-libexec/gnucash/src/libqof/qof/test/qofinstance.h
-libexec/gnucash/src/libqof/qof/test/qofobject.h
-libexec/gnucash/src/libqof/qof/test/qofsession.h
-libexec/gnucash/src/libqof/qof/test/unittest-support.h
+lib/gnucash/libgncmod-app-utils.so
+lib/gnucash/libgncmod-backend-xml.so
+lib/gnucash/libgncmod-bi-import.so
+lib/gnucash/libgncmod-csv-export.so
+lib/gnucash/libgncmod-csv-import.so
+lib/gnucash/libgncmod-customer-import.so
+lib/gnucash/libgncmod-engine.so
+lib/gnucash/libgncmod-generic-import.so
+lib/gnucash/libgncmod-gnome-search.so
+lib/gnucash/libgncmod-gnome-utils.so
+lib/gnucash/libgncmod-html.so
+lib/gnucash/libgncmod-ledger-core.so
+lib/gnucash/libgncmod-locale-reports-us.so
+lib/gnucash/libgncmod-log-replay.so
+lib/gnucash/libgncmod-qif-import.so
+lib/gnucash/libgncmod-qif.so
+lib/gnucash/libgncmod-register-core.so
+lib/gnucash/libgncmod-register-gnome.so
+lib/gnucash/libgncmod-report-gnome.so
+lib/gnucash/libgncmod-report-system.so
+lib/gnucash/libgncmod-stylesheets.so
+lib/gnucash/libgncmod-tax-us.so
+lib/gnucash/scm/ccache/2.2/business-options.go
+lib/gnucash/scm/ccache/2.2/business-prefs.go
+lib/gnucash/scm/ccache/2.2/c-interface.go
+lib/gnucash/scm/ccache/2.2/commodity-table.go
+lib/gnucash/scm/ccache/2.2/commodity-utilities.go
+lib/gnucash/scm/ccache/2.2/config-var.go
+lib/gnucash/scm/ccache/2.2/date-utilities.go
+lib/gnucash/scm/ccache/2.2/engine-interface.go
+lib/gnucash/scm/ccache/2.2/engine-utilities.go
+lib/gnucash/scm/ccache/2.2/fin.go
+lib/gnucash/scm/ccache/2.2/gnc-menu-extensions.go
+lib/gnucash/scm/ccache/2.2/gnc-numeric.go
+lib/gnucash/scm/ccache/2.2/gnucash/app-utils.go
+lib/gnucash/scm/ccache/2.2/gnucash/baz.go
+lib/gnucash/scm/ccache/2.2/gnucash/business-core.go
+lib/gnucash/scm/ccache/2.2/gnucash/core-utils.go
+lib/gnucash/scm/ccache/2.2/gnucash/engine.go
+lib/gnucash/scm/ccache/2.2/gnucash/engine/test/test-extras.go
+lib/gnucash/scm/ccache/2.2/gnucash/foo.go
+lib/gnucash/scm/ccache/2.2/gnucash/gettext.go
+lib/gnucash/scm/ccache/2.2/gnucash/gnc-module.go
+lib/gnucash/scm/ccache/2.2/gnucash/gnc-modules/test/test-gnc-module-load-deps.go
+lib/gnucash/scm/ccache/2.2/gnucash/gnc-modules/test/test-gnc-module-load-scm.go
+lib/gnucash/scm/ccache/2.2/gnucash/gnc-modules/test/test-gnc-module-scm-dynload.go
+lib/gnucash/scm/ccache/2.2/gnucash/gnc-modules/test/test-gnc-module-scm-init.go
+lib/gnucash/scm/ccache/2.2/gnucash/gnc-modules/test/test-gnc-module-scm-module.go
+lib/gnucash/scm/ccache/2.2/gnucash/gnc-modules/test/test-gnc-module-scm-multi.go
+lib/gnucash/scm/ccache/2.2/gnucash/gnc-modules/test/test-gnc-module-swigged-c.go
+lib/gnucash/scm/ccache/2.2/gnucash/gnome-utils.go
+lib/gnucash/scm/ccache/2.2/gnucash/import-export/qif-import.go
+lib/gnucash/scm/ccache/2.2/gnucash/import-export/string.go
+lib/gnucash/scm/ccache/2.2/gnucash/price-quotes.go
+lib/gnucash/scm/ccache/2.2/gnucash/report/aging.go
+lib/gnucash/scm/ccache/2.2/gnucash/report/balsheet-eg.go
+lib/gnucash/scm/ccache/2.2/gnucash/report/business-reports.go
+lib/gnucash/scm/ccache/2.2/gnucash/report/customer-summary.go
+lib/gnucash/scm/ccache/2.2/gnucash/report/easy-invoice.go
+lib/gnucash/scm/ccache/2.2/gnucash/report/eguile-gnc.go
+lib/gnucash/scm/ccache/2.2/gnucash/report/eguile-html-utilities.go
+lib/gnucash/scm/ccache/2.2/gnucash/report/eguile-utilities.go
+lib/gnucash/scm/ccache/2.2/gnucash/report/fancy-invoice.go
+lib/gnucash/scm/ccache/2.2/gnucash/report/hello-world.go
+lib/gnucash/scm/ccache/2.2/gnucash/report/invoice.go
+lib/gnucash/scm/ccache/2.2/gnucash/report/job-report.go
+lib/gnucash/scm/ccache/2.2/gnucash/report/locale-specific/de_DE.go
+lib/gnucash/scm/ccache/2.2/gnucash/report/locale-specific/us.go
+lib/gnucash/scm/ccache/2.2/gnucash/report/owner-report.go
+lib/gnucash/scm/ccache/2.2/gnucash/report/payables.go
+lib/gnucash/scm/ccache/2.2/gnucash/report/receipt.go
+lib/gnucash/scm/ccache/2.2/gnucash/report/receivables.go
+lib/gnucash/scm/ccache/2.2/gnucash/report/report-gnome.go
+lib/gnucash/scm/ccache/2.2/gnucash/report/report-system.go
+lib/gnucash/scm/ccache/2.2/gnucash/report/report-system/collectors.go
+lib/gnucash/scm/ccache/2.2/gnucash/report/report-system/list-extras.go
+lib/gnucash/scm/ccache/2.2/gnucash/report/report-system/report-collectors.go
+lib/gnucash/scm/ccache/2.2/gnucash/report/report-system/test/test-collectors.go
+lib/gnucash/scm/ccache/2.2/gnucash/report/report-system/test/test-extras.go
+lib/gnucash/scm/ccache/2.2/gnucash/report/report-system/test/test-list-extras.go
+lib/gnucash/scm/ccache/2.2/gnucash/report/report-system/test/test-load-report-system-module.go
+lib/gnucash/scm/ccache/2.2/gnucash/report/report-system/test/test-report-utilities.go
+lib/gnucash/scm/ccache/2.2/gnucash/report/standard-reports.go
+lib/gnucash/scm/ccache/2.2/gnucash/report/standard-reports/account-piecharts.go
+lib/gnucash/scm/ccache/2.2/gnucash/report/standard-reports/account-summary.go
+lib/gnucash/scm/ccache/2.2/gnucash/report/standard-reports/advanced-portfolio.go
+lib/gnucash/scm/ccache/2.2/gnucash/report/standard-reports/average-balance.go
+lib/gnucash/scm/ccache/2.2/gnucash/report/standard-reports/balance-sheet.go
+lib/gnucash/scm/ccache/2.2/gnucash/report/standard-reports/budget-balance-sheet.go
+lib/gnucash/scm/ccache/2.2/gnucash/report/standard-reports/budget-barchart.go
+lib/gnucash/scm/ccache/2.2/gnucash/report/standard-reports/budget-flow.go
+lib/gnucash/scm/ccache/2.2/gnucash/report/standard-reports/budget-income-statement.go
+lib/gnucash/scm/ccache/2.2/gnucash/report/standard-reports/budget.go
+lib/gnucash/scm/ccache/2.2/gnucash/report/standard-reports/cash-flow.go
+lib/gnucash/scm/ccache/2.2/gnucash/report/standard-reports/cashflow-barchart.go
+lib/gnucash/scm/ccache/2.2/gnucash/report/standard-reports/category-barchart.go
+lib/gnucash/scm/ccache/2.2/gnucash/report/standard-reports/daily-reports.go
+lib/gnucash/scm/ccache/2.2/gnucash/report/standard-reports/equity-statement.go
+lib/gnucash/scm/ccache/2.2/gnucash/report/standard-reports/general-journal.go
+lib/gnucash/scm/ccache/2.2/gnucash/report/standard-reports/general-ledger.go
+lib/gnucash/scm/ccache/2.2/gnucash/report/standard-reports/income-gst-statement.go
+lib/gnucash/scm/ccache/2.2/gnucash/report/standard-reports/income-statement.go
+lib/gnucash/scm/ccache/2.2/gnucash/report/standard-reports/net-barchart.go
+lib/gnucash/scm/ccache/2.2/gnucash/report/standard-reports/net-linechart.go
+lib/gnucash/scm/ccache/2.2/gnucash/report/standard-reports/portfolio.go
+lib/gnucash/scm/ccache/2.2/gnucash/report/standard-reports/price-scatter.go
+lib/gnucash/scm/ccache/2.2/gnucash/report/standard-reports/register.go
+lib/gnucash/scm/ccache/2.2/gnucash/report/standard-reports/sx-summary.go
+lib/gnucash/scm/ccache/2.2/gnucash/report/standard-reports/test/test-cash-flow.go
+lib/gnucash/scm/ccache/2.2/gnucash/report/standard-reports/test/test-cashflow-barchart.go
+lib/gnucash/scm/ccache/2.2/gnucash/report/standard-reports/test/test-generic-category-report.go
+lib/gnucash/scm/ccache/2.2/gnucash/report/standard-reports/test/test-generic-net-barchart.go
+lib/gnucash/scm/ccache/2.2/gnucash/report/standard-reports/test/test-generic-net-linechart.go
+lib/gnucash/scm/ccache/2.2/gnucash/report/standard-reports/test/test-standard-category-report.go
+lib/gnucash/scm/ccache/2.2/gnucash/report/standard-reports/test/test-standard-net-barchart.go
+lib/gnucash/scm/ccache/2.2/gnucash/report/standard-reports/test/test-standard-net-linechart.go
+lib/gnucash/scm/ccache/2.2/gnucash/report/standard-reports/transaction.go
+lib/gnucash/scm/ccache/2.2/gnucash/report/standard-reports/trial-balance.go
+lib/gnucash/scm/ccache/2.2/gnucash/report/stylesheet-easy.go
+lib/gnucash/scm/ccache/2.2/gnucash/report/stylesheet-fancy.go
+lib/gnucash/scm/ccache/2.2/gnucash/report/stylesheet-footer.go
+lib/gnucash/scm/ccache/2.2/gnucash/report/stylesheet-head-or-tail.go
+lib/gnucash/scm/ccache/2.2/gnucash/report/stylesheet-plain.go
+lib/gnucash/scm/ccache/2.2/gnucash/report/stylesheets.go
+lib/gnucash/scm/ccache/2.2/gnucash/report/taxinvoice.go
+lib/gnucash/scm/ccache/2.2/gnucash/report/taxtxf-de_DE.go
+lib/gnucash/scm/ccache/2.2/gnucash/report/taxtxf.go
+lib/gnucash/scm/ccache/2.2/gnucash/report/test-load-report-stylesheets-module.go
+lib/gnucash/scm/ccache/2.2/gnucash/report/utility-reports.go
+lib/gnucash/scm/ccache/2.2/gnucash/report/view-column.go
+lib/gnucash/scm/ccache/2.2/gnucash/report/welcome-to-gnucash.go
+lib/gnucash/scm/ccache/2.2/gnucash/reports/test-load-app-utils-module.go
+lib/gnucash/scm/ccache/2.2/gnucash/reports/test-load-gnome-utils-module.go
+lib/gnucash/scm/ccache/2.2/gnucash/reports/test-load-report-gnome-module.go
+lib/gnucash/scm/ccache/2.2/gnucash/tax/de_DE.go
+lib/gnucash/scm/ccache/2.2/gnucash/tax/us.go
+lib/gnucash/scm/ccache/2.2/gnucash/unittest-support.go
+lib/gnucash/scm/ccache/2.2/gnucash/utilities.go
+lib/gnucash/scm/ccache/2.2/hooks.go
+lib/gnucash/scm/ccache/2.2/html-acct-table.go
+lib/gnucash/scm/ccache/2.2/html-barchart.go
+lib/gnucash/scm/ccache/2.2/html-document.go
+lib/gnucash/scm/ccache/2.2/html-fonts.go
+lib/gnucash/scm/ccache/2.2/html-jqplot.go
+lib/gnucash/scm/ccache/2.2/html-linechart.go
+lib/gnucash/scm/ccache/2.2/html-piechart.go
+lib/gnucash/scm/ccache/2.2/html-scatter.go
+lib/gnucash/scm/ccache/2.2/html-style-info.go
+lib/gnucash/scm/ccache/2.2/html-style-sheet.go
+lib/gnucash/scm/ccache/2.2/html-table.go
+lib/gnucash/scm/ccache/2.2/html-text.go
+lib/gnucash/scm/ccache/2.2/html-utilities.go
+lib/gnucash/scm/ccache/2.2/migrate-prefs.go
+lib/gnucash/scm/ccache/2.2/options-utilities.go
+lib/gnucash/scm/ccache/2.2/options.go
+lib/gnucash/scm/ccache/2.2/prefs.go
+lib/gnucash/scm/ccache/2.2/qif-import/qif-dialog-utils.go
+lib/gnucash/scm/ccache/2.2/qif-import/qif-file.go
+lib/gnucash/scm/ccache/2.2/qif-import/qif-guess-map.go
+lib/gnucash/scm/ccache/2.2/qif-import/qif-import.go
+lib/gnucash/scm/ccache/2.2/qif-import/qif-merge-groups.go
+lib/gnucash/scm/ccache/2.2/qif-import/qif-objects.go
+lib/gnucash/scm/ccache/2.2/qif-import/qif-parse.go
+lib/gnucash/scm/ccache/2.2/qif-import/qif-to-gnc.go
+lib/gnucash/scm/ccache/2.2/qif-import/qif-utils.go
+lib/gnucash/scm/ccache/2.2/report-utilities.go
+lib/gnucash/scm/ccache/2.2/report.go
+lib/gnucash/scm/ccache/2.2/simple-obj.go
+lib/gnucash/scm/ccache/2.2/test-account.go
+lib/gnucash/scm/ccache/2.2/test-c-interface.go
+lib/gnucash/scm/ccache/2.2/test-create-account.go
+lib/gnucash/scm/ccache/2.2/test-split.go
+lib/gnucash/scm/ccache/2.2/test-test-extras.go
+lib/gnucash/scm/ccache/2.2/txf-de_DE.go
+lib/gnucash/scm/ccache/2.2/txf-help-de_DE.go
+lib/gnucash/scm/ccache/2.2/txf-help.go
+lib/gnucash/scm/ccache/2.2/txf.go
+lib/libgnc-backend-sql.so
+lib/libgnc-backend-xml-utils.so
+lib/libgnc-core-utils.so
+lib/libgnc-gnome.so
+lib/libgnc-module.so
 man/man1/gnc-fq-dump.1
 man/man1/gnc-fq-helper.1
 man/man1/gnucash.1
 share/appdata/gnucash.appdata.xml
 share/applications/gnucash.desktop
 share/doc/gnucash/AUTHORS
-share/doc/gnucash/COPYING
 share/doc/gnucash/ChangeLog
 share/doc/gnucash/ChangeLog.1999
 share/doc/gnucash/ChangeLog.2000
@@ -424,9 +433,9 @@ share/doc/gnucash/ChangeLog.2013
 share/doc/gnucash/ChangeLog.2014
 share/doc/gnucash/ChangeLog.2015
 share/doc/gnucash/ChangeLog.2016
+share/doc/gnucash/ChangeLog.2017
 share/doc/gnucash/DOCUMENTERS
 share/doc/gnucash/HACKING
-share/doc/gnucash/INSTALL
 share/doc/gnucash/LICENSE
 share/doc/gnucash/Money95bank_fr.qif
 share/doc/gnucash/Money95invst_fr.qif
@@ -453,6 +462,7 @@ share/doc/gnucash/bogus.qif
 share/doc/gnucash/cbb-export.qif
 share/doc/gnucash/currency_tree_xml.gnucash
 share/doc/gnucash/every.qif
+share/doc/gnucash/gtk-3.0.css
 share/doc/gnucash/guile-hackers.txt
 share/doc/gnucash/invoice.csv
 share/doc/gnucash/ms-money.qif
@@ -461,8 +471,7 @@ share/doc/gnucash/quicktest.qif
 share/doc/gnucash/swipe.qif
 share/doc/gnucash/taxreport.gnucash
 share/doc/gnucash/web.qif
-share/examples/gnucash/gnucash/config
-share/examples/gnucash/gnucash/environment
+share/examples/gnucash/environment
 share/glib-2.0/schemas/org.gnucash.dialogs.business.gschema.xml
 share/glib-2.0/schemas/org.gnucash.dialogs.checkprinting.gschema.xml
 share/glib-2.0/schemas/org.gnucash.dialogs.commodities.gschema.xml
@@ -470,11 +479,11 @@ share/glib-2.0/schemas/org.gnucash.dialogs.export.csv.gschema.xml
 share/glib-2.0/schemas/org.gnucash.dialogs.gschema.xml
 share/glib-2.0/schemas/org.gnucash.dialogs.import.csv.gschema.xml
 share/glib-2.0/schemas/org.gnucash.dialogs.import.generic.gschema.xml
-${PLIST.ofx}share/glib-2.0/schemas/org.gnucash.dialogs.import.ofx.gschema.xml
 share/glib-2.0/schemas/org.gnucash.dialogs.import.qif.gschema.xml
 share/glib-2.0/schemas/org.gnucash.dialogs.reconcile.gschema.xml
 share/glib-2.0/schemas/org.gnucash.dialogs.sxs.gschema.xml
 share/glib-2.0/schemas/org.gnucash.dialogs.totd.gschema.xml
+share/glib-2.0/schemas/org.gnucash.general.finance-quote.gschema.xml
 share/glib-2.0/schemas/org.gnucash.gschema.xml
 share/glib-2.0/schemas/org.gnucash.history.gschema.xml
 share/glib-2.0/schemas/org.gnucash.warnings.gschema.xml
@@ -578,6 +587,7 @@ 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/en_IN/acctchrt_gstindia.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
@@ -801,9 +811,13 @@ share/gnucash/accounts/pt_PT/acctchrt_renter.gnucash-xea
 share/gnucash/accounts/pt_PT/acctchrt_retiremt.gnucash-xea
 share/gnucash/accounts/pt_PT/acctchrt_spouseinc.gnucash-xea
 share/gnucash/accounts/pt_PT/acctchrt_spouseretire.gnucash-xea
+share/gnucash/accounts/ru/acctchrt_auto.gnucash-xea
+share/gnucash/accounts/ru/acctchrt_autoloan.gnucash-xea
 share/gnucash/accounts/ru/acctchrt_common.gnucash-xea
 share/gnucash/accounts/ru/acctchrt_homeloan.gnucash-xea
 share/gnucash/accounts/ru/acctchrt_homeown.gnucash-xea
+share/gnucash/accounts/ru/acctchrt_kids.gnucash-xea
+share/gnucash/accounts/ru/acctchrt_otherloan.gnucash-xea
 share/gnucash/accounts/ru/acctchrt_renter.gnucash-xea
 share/gnucash/accounts/sk/acctchrt_brokerage.gnucash-xea
 share/gnucash/accounts/sk/acctchrt_carloan.gnucash-xea
@@ -861,10 +875,10 @@ share/gnucash/checks/quicken_3part.chk
 share/gnucash/checks/quicken_check_21.chk
 share/gnucash/checks/quicken_wallet.chk
 share/gnucash/checks/voucher.chk
-share/gnucash/gnome
 share/gnucash/gtkbuilder/assistant-acct-period.glade
 share/gnucash/gtkbuilder/assistant-csv-account-import.glade
 share/gnucash/gtkbuilder/assistant-csv-export.glade
+share/gnucash/gtkbuilder/assistant-csv-price-import.glade
 share/gnucash/gtkbuilder/assistant-csv-trans-import.glade
 share/gnucash/gtkbuilder/assistant-hierarchy.glade
 share/gnucash/gtkbuilder/assistant-loan.glade
@@ -888,6 +902,8 @@ share/gnucash/gtkbuilder/dialog-date-close.glade
 share/gnucash/gtkbuilder/dialog-employee.glade
 share/gnucash/gtkbuilder/dialog-file-access.glade
 share/gnucash/gtkbuilder/dialog-fincalc.glade
+share/gnucash/gtkbuilder/dialog-find-account.glade
+share/gnucash/gtkbuilder/dialog-imap-editor.glade
 share/gnucash/gtkbuilder/dialog-import.glade
 share/gnucash/gtkbuilder/dialog-invoice.glade
 share/gnucash/gtkbuilder/dialog-job.glade
@@ -909,6 +925,7 @@ share/gnucash/gtkbuilder/dialog-sx.glade
 share/gnucash/gtkbuilder/dialog-tax-info.glade
 share/gnucash/gtkbuilder/dialog-tax-table.glade
 share/gnucash/gtkbuilder/dialog-totd.glade
+share/gnucash/gtkbuilder/dialog-trans-assoc.glade
 share/gnucash/gtkbuilder/dialog-transfer.glade
 share/gnucash/gtkbuilder/dialog-userpass.glade
 share/gnucash/gtkbuilder/dialog-vendor.glade
@@ -921,6 +938,42 @@ share/gnucash/gtkbuilder/gnc-recurrence.glade
 share/gnucash/gtkbuilder/gnc-tree-view-owner.glade
 share/gnucash/gtkbuilder/window-autoclear.glade
 share/gnucash/gtkbuilder/window-reconcile.glade
+share/gnucash/icons/hicolor/16x16/actions/gnc-account-delete.png
+share/gnucash/icons/hicolor/16x16/actions/gnc-account-edit.png
+share/gnucash/icons/hicolor/16x16/actions/gnc-account-new.png
+share/gnucash/icons/hicolor/16x16/actions/gnc-account-open.png
+share/gnucash/icons/hicolor/16x16/actions/gnc-account-report.png
+share/gnucash/icons/hicolor/16x16/actions/gnc-account.png
+share/gnucash/icons/hicolor/16x16/actions/gnc-gnome-pdf.png
+share/gnucash/icons/hicolor/16x16/actions/gnc-invoice-duplicate.png
+share/gnucash/icons/hicolor/16x16/actions/gnc-invoice-edit.png
+share/gnucash/icons/hicolor/16x16/actions/gnc-invoice-new.png
+share/gnucash/icons/hicolor/16x16/actions/gnc-invoice-pay.png
+share/gnucash/icons/hicolor/16x16/actions/gnc-invoice-post.png
+share/gnucash/icons/hicolor/16x16/actions/gnc-invoice-unpost.png
+share/gnucash/icons/hicolor/16x16/actions/gnc-invoice.png
+share/gnucash/icons/hicolor/16x16/actions/gnc-jumpto.png
+share/gnucash/icons/hicolor/16x16/actions/gnc-split-trans.png
+share/gnucash/icons/hicolor/16x16/actions/gnc-sx-new.png
+share/gnucash/icons/hicolor/16x16/actions/gnc-transfer.png
+share/gnucash/icons/hicolor/24x24/actions/gnc-account-delete.png
+share/gnucash/icons/hicolor/24x24/actions/gnc-account-edit.png
+share/gnucash/icons/hicolor/24x24/actions/gnc-account-new.png
+share/gnucash/icons/hicolor/24x24/actions/gnc-account-open.png
+share/gnucash/icons/hicolor/24x24/actions/gnc-account-report.png
+share/gnucash/icons/hicolor/24x24/actions/gnc-account.png
+share/gnucash/icons/hicolor/24x24/actions/gnc-gnome-pdf.png
+share/gnucash/icons/hicolor/24x24/actions/gnc-invoice-duplicate.png
+share/gnucash/icons/hicolor/24x24/actions/gnc-invoice-edit.png
+share/gnucash/icons/hicolor/24x24/actions/gnc-invoice-new.png
+share/gnucash/icons/hicolor/24x24/actions/gnc-invoice-pay.png
+share/gnucash/icons/hicolor/24x24/actions/gnc-invoice-post.png
+share/gnucash/icons/hicolor/24x24/actions/gnc-invoice-unpost.png
+share/gnucash/icons/hicolor/24x24/actions/gnc-invoice.png
+share/gnucash/icons/hicolor/24x24/actions/gnc-jumpto.png
+share/gnucash/icons/hicolor/24x24/actions/gnc-split-trans.png
+share/gnucash/icons/hicolor/24x24/actions/gnc-sx-new.png
+share/gnucash/icons/hicolor/24x24/actions/gnc-transfer.png
 share/gnucash/jqplot/jqplot.BezierCurveRenderer.js
 share/gnucash/jqplot/jqplot.barRenderer.js
 share/gnucash/jqplot/jqplot.blockRenderer.js
@@ -951,63 +1004,9 @@ share/gnucash/jqplot/jquery.jqplot.js
 share/gnucash/jqplot/jquery.min.js
 share/gnucash/make-prefs-migration-script.xsl
 share/gnucash/migratable-prefs.xml
-share/gnucash/pixmaps/gnc-account-16.png
-share/gnucash/pixmaps/gnc-account-delete-16.png
-share/gnucash/pixmaps/gnc-account-delete.png
-share/gnucash/pixmaps/gnc-account-edit-16.png
-share/gnucash/pixmaps/gnc-account-edit.png
-share/gnucash/pixmaps/gnc-account-new-16.png
-share/gnucash/pixmaps/gnc-account-new.png
-share/gnucash/pixmaps/gnc-account-open-16.png
-share/gnucash/pixmaps/gnc-account-open.png
-share/gnucash/pixmaps/gnc-account-report-16.png
-share/gnucash/pixmaps/gnc-account-report.png
-share/gnucash/pixmaps/gnc-account.png
-share/gnucash/pixmaps/gnc-gnome-pdf-16.png
-share/gnucash/pixmaps/gnc-gnome-pdf-24.png
-share/gnucash/pixmaps/gnc-invoice-16.png
-share/gnucash/pixmaps/gnc-invoice-duplicate-16.png
-share/gnucash/pixmaps/gnc-invoice-duplicate.png
-share/gnucash/pixmaps/gnc-invoice-edit-16.png
-share/gnucash/pixmaps/gnc-invoice-edit.png
-share/gnucash/pixmaps/gnc-invoice-new-16.png
-share/gnucash/pixmaps/gnc-invoice-new.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
-share/gnucash/pixmaps/gnc-invoice-unpost.png
-share/gnucash/pixmaps/gnc-invoice.png
-share/gnucash/pixmaps/gnc-jumpto-16.png
-share/gnucash/pixmaps/gnc-jumpto.png
-share/gnucash/pixmaps/gnc-split-trans-16.png
-share/gnucash/pixmaps/gnc-split-trans.png
-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
-share/gnucash/pixmaps/stock_split_watermark.png
-share/gnucash/python/init.py
-share/gnucash/python/pycons/__init__.py
-share/gnucash/python/pycons/console.py
-share/gnucash/python/pycons/ishell.py
-share/gnucash/python/pycons/pycons
-share/gnucash/python/pycons/setup.py
-share/gnucash/python/pycons/shell.py
-share/gnucash/python/pycons/simple_plot.py
-share/gnucash/scm/build-config.scm
 share/gnucash/scm/business-options.scm
 share/gnucash/scm/business-prefs.scm
 share/gnucash/scm/c-interface.scm
@@ -1021,17 +1020,25 @@ share/gnucash/scm/fin.scm
 share/gnucash/scm/gnc-menu-extensions.scm
 share/gnucash/scm/gnc-numeric.scm
 share/gnucash/scm/gnucash/app-utils.scm
+share/gnucash/scm/gnucash/baz.scm
 share/gnucash/scm/gnucash/business-core.scm
-share/gnucash/scm/gnucash/business-gnome.scm
 share/gnucash/scm/gnucash/core-utils.scm
 share/gnucash/scm/gnucash/engine.scm
+share/gnucash/scm/gnucash/engine/test/test-extras.scm
+share/gnucash/scm/gnucash/foo.scm
 share/gnucash/scm/gnucash/gettext.scm
 share/gnucash/scm/gnucash/gnc-module.scm
+share/gnucash/scm/gnucash/gnc-modules/test/test-gnc-module-load-deps.scm
+share/gnucash/scm/gnucash/gnc-modules/test/test-gnc-module-load-scm.scm
+share/gnucash/scm/gnucash/gnc-modules/test/test-gnc-module-scm-dynload.scm
+share/gnucash/scm/gnucash/gnc-modules/test/test-gnc-module-scm-init.scm
+share/gnucash/scm/gnucash/gnc-modules/test/test-gnc-module-scm-module.scm
+share/gnucash/scm/gnucash/gnc-modules/test/test-gnc-module-scm-multi.scm
+share/gnucash/scm/gnucash/gnc-modules/test/test-gnc-module-swigged-c.scm
 share/gnucash/scm/gnucash/gnome-utils.scm
 share/gnucash/scm/gnucash/import-export/qif-import.scm
-share/gnucash/scm/gnucash/main.scm
+share/gnucash/scm/gnucash/import-export/string.scm
 share/gnucash/scm/gnucash/price-quotes.scm
-share/gnucash/scm/gnucash/printf.scm
 share/gnucash/scm/gnucash/report/aging.scm
 share/gnucash/scm/gnucash/report/balsheet-eg.css
 share/gnucash/scm/gnucash/report/balsheet-eg.eguile.scm
@@ -1050,12 +1057,20 @@ share/gnucash/scm/gnucash/report/locale-specific/de_DE.scm
 share/gnucash/scm/gnucash/report/locale-specific/us.scm
 share/gnucash/scm/gnucash/report/owner-report.scm
 share/gnucash/scm/gnucash/report/payables.scm
+share/gnucash/scm/gnucash/report/receipt.css
+share/gnucash/scm/gnucash/report/receipt.eguile.scm
+share/gnucash/scm/gnucash/report/receipt.scm
 share/gnucash/scm/gnucash/report/receivables.scm
 share/gnucash/scm/gnucash/report/report-gnome.scm
 share/gnucash/scm/gnucash/report/report-system.scm
 share/gnucash/scm/gnucash/report/report-system/collectors.scm
 share/gnucash/scm/gnucash/report/report-system/list-extras.scm
 share/gnucash/scm/gnucash/report/report-system/report-collectors.scm
+share/gnucash/scm/gnucash/report/report-system/test/test-collectors.scm
+share/gnucash/scm/gnucash/report/report-system/test/test-extras.scm
+share/gnucash/scm/gnucash/report/report-system/test/test-list-extras.scm
+share/gnucash/scm/gnucash/report/report-system/test/test-load-report-system-module.scm
+share/gnucash/scm/gnucash/report/report-system/test/test-report-utilities.scm
 share/gnucash/scm/gnucash/report/standard-reports.scm
 share/gnucash/scm/gnucash/report/standard-reports/account-piecharts.scm
 share/gnucash/scm/gnucash/report/standard-reports/account-summary.scm
@@ -1068,11 +1083,13 @@ share/gnucash/scm/gnucash/report/standard-reports/budget-flow.scm
 share/gnucash/scm/gnucash/report/standard-reports/budget-income-statement.scm
 share/gnucash/scm/gnucash/report/standard-reports/budget.scm
 share/gnucash/scm/gnucash/report/standard-reports/cash-flow.scm
+share/gnucash/scm/gnucash/report/standard-reports/cashflow-barchart.scm
 share/gnucash/scm/gnucash/report/standard-reports/category-barchart.scm
 share/gnucash/scm/gnucash/report/standard-reports/daily-reports.scm
 share/gnucash/scm/gnucash/report/standard-reports/equity-statement.scm
 share/gnucash/scm/gnucash/report/standard-reports/general-journal.scm
 share/gnucash/scm/gnucash/report/standard-reports/general-ledger.scm
+share/gnucash/scm/gnucash/report/standard-reports/income-gst-statement.scm
 share/gnucash/scm/gnucash/report/standard-reports/income-statement.scm
 share/gnucash/scm/gnucash/report/standard-reports/net-barchart.scm
 share/gnucash/scm/gnucash/report/standard-reports/net-linechart.scm
@@ -1080,11 +1097,20 @@ share/gnucash/scm/gnucash/report/standard-reports/portfolio.scm
 share/gnucash/scm/gnucash/report/standard-reports/price-scatter.scm
 share/gnucash/scm/gnucash/report/standard-reports/register.scm
 share/gnucash/scm/gnucash/report/standard-reports/sx-summary.scm
+share/gnucash/scm/gnucash/report/standard-reports/test/test-cash-flow.scm
+share/gnucash/scm/gnucash/report/standard-reports/test/test-cashflow-barchart.scm
+share/gnucash/scm/gnucash/report/standard-reports/test/test-generic-category-report.scm
+share/gnucash/scm/gnucash/report/standard-reports/test/test-generic-net-barchart.scm
+share/gnucash/scm/gnucash/report/standard-reports/test/test-generic-net-linechart.scm
+share/gnucash/scm/gnucash/report/standard-reports/test/test-standard-category-report.scm
+share/gnucash/scm/gnucash/report/standard-reports/test/test-standard-net-barchart.scm
+share/gnucash/scm/gnucash/report/standard-reports/test/test-standard-net-linechart.scm
 share/gnucash/scm/gnucash/report/standard-reports/transaction.scm
 share/gnucash/scm/gnucash/report/standard-reports/trial-balance.scm
 share/gnucash/scm/gnucash/report/stylesheet-easy.scm
 share/gnucash/scm/gnucash/report/stylesheet-fancy.scm
 share/gnucash/scm/gnucash/report/stylesheet-footer.scm
+share/gnucash/scm/gnucash/report/stylesheet-head-or-tail.scm
 share/gnucash/scm/gnucash/report/stylesheet-plain.scm
 share/gnucash/scm/gnucash/report/stylesheets.scm
 share/gnucash/scm/gnucash/report/taxinvoice.css
@@ -1092,14 +1118,17 @@ share/gnucash/scm/gnucash/report/taxinvoice.eguile.scm
 share/gnucash/scm/gnucash/report/taxinvoice.scm
 share/gnucash/scm/gnucash/report/taxtxf-de_DE.scm
 share/gnucash/scm/gnucash/report/taxtxf.scm
+share/gnucash/scm/gnucash/report/test-load-report-stylesheets-module.scm
 share/gnucash/scm/gnucash/report/utility-reports.scm
 share/gnucash/scm/gnucash/report/view-column.scm
 share/gnucash/scm/gnucash/report/welcome-to-gnucash.scm
+share/gnucash/scm/gnucash/reports/test-load-app-utils-module.scm
+share/gnucash/scm/gnucash/reports/test-load-gnome-utils-module.scm
+share/gnucash/scm/gnucash/reports/test-load-report-gnome-module.scm
 share/gnucash/scm/gnucash/tax/de_DE.scm
 share/gnucash/scm/gnucash/tax/us.scm
 share/gnucash/scm/gnucash/unittest-support.scm
-share/gnucash/scm/gnumeric/gnumeric-utilities.scm
-share/gnucash/scm/gnumeric/table-utils.scm
+share/gnucash/scm/gnucash/utilities.scm
 share/gnucash/scm/hooks.scm
 share/gnucash/scm/html-acct-table.scm
 share/gnucash/scm/html-barchart.scm
@@ -1130,13 +1159,15 @@ share/gnucash/scm/qif-import/qif-utils.scm
 share/gnucash/scm/report-utilities.scm
 share/gnucash/scm/report.scm
 share/gnucash/scm/simple-obj.scm
-share/gnucash/scm/string.scm
-share/gnucash/scm/substring-search.scm
+share/gnucash/scm/test-account.scm
+share/gnucash/scm/test-c-interface.scm
+share/gnucash/scm/test-create-account.scm
+share/gnucash/scm/test-split.scm
+share/gnucash/scm/test-test-extras.scm
 share/gnucash/scm/txf-de_DE.scm
 share/gnucash/scm/txf-help-de_DE.scm
 share/gnucash/scm/txf-help.scm
 share/gnucash/scm/txf.scm
-share/gnucash/scm/xml-generator.scm
 share/gnucash/tip_of_the_day.list
 share/gnucash/ui/gnc-main-window-ui.xml
 share/gnucash/ui/gnc-plugin-account-tree-ui.xml
@@ -1146,10 +1177,9 @@ share/gnucash/ui/gnc-plugin-budget-ui.xml
 share/gnucash/ui/gnc-plugin-business-ui.xml
 share/gnucash/ui/gnc-plugin-csv-export-ui.xml
 share/gnucash/ui/gnc-plugin-csv-import-ui.xml
-share/gnucash/ui/gnc-plugin-customer_import-ui.xml
+share/gnucash/ui/gnc-plugin-customer-import-ui.xml
 share/gnucash/ui/gnc-plugin-file-history-ui.xml
 share/gnucash/ui/gnc-plugin-log-replay-ui.xml
-${PLIST.ofx}share/gnucash/ui/gnc-plugin-ofx-ui.xml
 share/gnucash/ui/gnc-plugin-page-account-tree-ui.xml
 share/gnucash/ui/gnc-plugin-page-account-tree2-ui.xml
 share/gnucash/ui/gnc-plugin-page-budget-ui.xml
diff --git a/finance/gnucash/distinfo b/finance/gnucash/distinfo
index 15f27289116..f8bcc9694cc 100644
--- a/finance/gnucash/distinfo
+++ b/finance/gnucash/distinfo
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.84 2017/12/18 20:55:27 wiz Exp $
+$NetBSD: distinfo,v 1.85 2018/04/09 08:47:35 wiz Exp $
 
-SHA1 (gnucash-2.6.19.tar.bz2) = d2ae5c7855fac30d88fe889d47a441e8a887b19c
-RMD160 (gnucash-2.6.19.tar.bz2) = f7bc0779687b288b076dcc52cc7988e244c4dbd4
-SHA512 (gnucash-2.6.19.tar.bz2) = 0a979caf48ba96d6f37a929036e7172855cfb03af8832f479966bce72fad3400903925134d33aaa31eb6b36a2041f5e0d3f74b88e95b83c7d76e96b1503bec13
-Size (gnucash-2.6.19.tar.bz2) = 13612124 bytes
-SHA1 (patch-configure) = 9f11ae7a9d07f7fef3e05557a396ea8904be4854
-SHA1 (patch-src_bin_gnucash-bin.c) = 68edf468f278faf324bbf5c5725b4954d23d8c19
+SHA1 (gnucash-3.0.tar.bz2) = a575e853668b93b34dcd94f0ef0d1fee25b0165f
+RMD160 (gnucash-3.0.tar.bz2) = d25619d60034fa411cbc58b4ffe0ac1a807f5f12
+SHA512 (gnucash-3.0.tar.bz2) = 5ec13b8abe1520a7e614ceeca4c41d5dba3ebae4ec965918584963022ceb5cb3b85862289a85a72767db74a0c735214a78342a53c37e6da939ff850538174a87
+Size (gnucash-3.0.tar.bz2) = 13366724 bytes
+SHA1 (googletest-1.8.0.tar.gz) = e7e646a6204638fe8e87e165292b8dd9cd4c36ed
+RMD160 (googletest-1.8.0.tar.gz) = b0a9e48874df3291a261ed85a0c0a4d677b01dc1
+SHA512 (googletest-1.8.0.tar.gz) = 1dbece324473e53a83a60601b02c92c089f5d314761351974e097b2cf4d24af4296f9eb8653b6b03b1e363d9c5f793897acae1f0c7ac40149216035c4d395d9d
+Size (googletest-1.8.0.tar.gz) = 1281617 bytes
diff --git a/finance/gnucash/options.mk b/finance/gnucash/options.mk
index bef7b64d39e..f1cbee9a69b 100644
--- a/finance/gnucash/options.mk
+++ b/finance/gnucash/options.mk
@@ -1,24 +1,42 @@
-# $NetBSD: options.mk,v 1.3 2016/08/30 04:13:13 jnemeth Exp $
+# $NetBSD: options.mk,v 1.4 2018/04/09 08:47:35 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.gnucash
-PKG_SUPPORTED_OPTIONS=	libdbi libofx
-PKG_SUGGESTED_OPTIONS=	libdbi libofx
+PKG_SUPPORTED_OPTIONS=	libdbi libofx python
+PKG_SUGGESTED_OPTIONS=	libdbi libofx python
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=	dbi ofx
-
 .if !empty(PKG_OPTIONS:Mlibofx)
-PLIST.ofx=	yes
+CMAKE_ARGS+=	-DWITH_OFX=ON
+PLIST_SRC+=	PLIST.ofx
 .include "../../finance/libofx/buildlink3.mk"
 .else
-CONFIGURE_ARGS+=	--disable-ofx
+CMAKE_ARGS+=	-DWITH_OFX=OFF
 .endif
 
 .if !empty(PKG_OPTIONS:Mlibdbi)
-CONFIGURE_ARGS+=	--enable-dbi
-PLIST.dbi=	yes
+CMAKE_ARGS+=	-DWITH_SQL=ON
+PLIST_SRC+=	PLIST.dbi
+BUILD_DEPENDS+=	libdbi-driver-sqlite3-[0-9]*:../../databases/libdbi-driver-sqlite3
 .include "../../databases/libdbi/buildlink3.mk"
 .else
-CONFIGURE_ARGS+=	--disable-dbi
+CMAKE_ARGS+=	-DWITH_SQL=OFF
+.endif
+
+.if !empty(PKG_OPTIONS:Mpython)
+CMAKE_ARGS+=			-DWITH_PYTHON=ON
+PYTHON_VERSIONS_INCOMPATIBLE=	27
+REPLACE_PYTHON+=		bindings/python/example_scripts/*.py
+REPLACE_PYTHON+=		bindings/python/example_scripts/rest-api/*.py
+REPLACE_PYTHON+=		gnucash/python/pycons/*.py
+PY_PATCHPLIST=			yes
+PLIST_SRC+=			PLIST.python
+
+# /usr/pkg/share/gnucash/python/pycons/console.py imports readline
+DEPENDS+=		${PYPKGPREFIX}-readline-[0-9]*:../../devel/py-readline
+
+.include "../../lang/python/application.mk"
+.include "../../lang/python/extension.mk"
+.else
+CMAKE_ARGS+=			-DWITH_PYTHON=OFF
 .endif
diff --git a/finance/gnucash/patches/patch-configure b/finance/gnucash/patches/patch-configure
deleted file mode 100644
index 88431ec604c..00000000000
--- a/finance/gnucash/patches/patch-configure
+++ /dev/null
@@ -1,127 +0,0 @@
-$NetBSD: patch-configure,v 1.7 2016/08/30 04:13:14 jnemeth Exp $
-
-Don't bother testing for libdbd-*.  Leave the choice of which to
-install and when up to the package user.
-
---- configure.orig	2016-06-28 04:44:47.000000000 +0000
-+++ configure
-@@ -21697,119 +21697,6 @@ else
- 
- fi
- 
--    case $host_os in
--       win32*|mingw*)
--	 LDINC="#include <windows.h>"
--	 LDFUNCARGS=""
--	 LDEXT=dll
--	 ;;
--       *)
--	 LDINC="#include <dlfcn.h>"
--	 LDFUNCARGS=", RTLD_NOW"
--	 LDEXT=so
--	 export LIBS="$lt_cv_dlopen_libs $LIBS"
--	 ;;
--      esac
--    old_ld_library_path="$LD_LIBRARY_PATH"
--    export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$EXTRA_SEARCH_LIBS"
--    { $as_echo "$as_me:${as_lineno-$LINENO}: Search Path $LD_LIBRARY_PATH" >&5
--$as_echo "$as_me: Search Path $LD_LIBRARY_PATH" >&6;}
--    { $as_echo "$as_me:${as_lineno-$LINENO}: checking Looking for at least one supported DBD module" >&5
--$as_echo_n "checking Looking for at least one supported DBD module... " >&6; }
--    if test "$cross_compiling" = yes; then :
--  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error $? "cannot run test program while cross compiling
--See \`config.log' for more details" "$LINENO" 5; }
--else
--  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--$LDINC
--int
--main ()
--{
--if (!$lt_cv_dlopen("libdbdsqlite3.$LDEXT"$LDFUNCARGS)) return -1;
--
--  ;
--  return 0;
--}
--_ACEOF
--if ac_fn_c_try_run "$LINENO"; then :
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: SQLite3" >&5
--$as_echo "SQLite3" >&6; }
--else
--  if test "$cross_compiling" = yes; then :
--  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error $? "cannot run test program while cross compiling
--See \`config.log' for more details" "$LINENO" 5; }
--else
--  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--$LDINC
--int
--main ()
--{
--if (!$lt_cv_dlopen("libdbdmysql.$LDEXT"$LDFUNCARGS)) return -1;
--
--  ;
--  return 0;
--}
--_ACEOF
--if ac_fn_c_try_run "$LINENO"; then :
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: MySql" >&5
--$as_echo "MySql" >&6; }
--else
--  if test "$cross_compiling" = yes; then :
--  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error $? "cannot run test program while cross compiling
--See \`config.log' for more details" "$LINENO" 5; }
--else
--  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--$LDINC
--int
--main ()
--{
--if (!$lt_cv_dlopen("libdbdpgsql.$LDEXT"$LDFUNCARGS)) return -1;
--
--  ;
--  return 0;
--}
--_ACEOF
--if ac_fn_c_try_run "$LINENO"; then :
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: Postgresql" >&5
--$as_echo "Postgresql" >&6; }
--else
--  as_fn_error $? "
--Unable to find any of the supported dbd modules
--(libdbdsqlite3, libdbdmysql, or libdbdpgsql) needed to actually use the SQL
--backend.
--
--If you do have them installed the problem is either that dlopen cannot
--find them or that dlopen itself is not getting linked. Check config.log
--to find out which.  You can add the option --with-dbi-dbd-dir pointing to
--the directory in which they are located.
--
--If you do not actually want to build with libdi add --disable-dbi
--to the configure argument list and run it again.
--       " "$LINENO" 5
--fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
--  conftest.$ac_objext conftest.beam conftest.$ac_ext
--fi
--
--fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
--  conftest.$ac_objext conftest.beam conftest.$ac_ext
--fi
--
--fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
--  conftest.$ac_objext conftest.beam conftest.$ac_ext
--fi
--
- 
-     LIBDBI_LIBS=-ldbi
-     _COMPONENTS="$_COMPONENTS dbi"
diff --git a/finance/gnucash/patches/patch-src_bin_gnucash-bin.c b/finance/gnucash/patches/patch-src_bin_gnucash-bin.c
deleted file mode 100644
index 12492f7a2a3..00000000000
--- a/finance/gnucash/patches/patch-src_bin_gnucash-bin.c
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-src_bin_gnucash-bin.c,v 1.1 2014/04/21 21:40:01 wiz Exp $
-
-Allow starting gnucash in the background.
-python's readline module causes a SIGTTOU to be sent and if this
-is not handled (even by ignoring it), it stops the process.
-
---- src/bin/gnucash-bin.c.orig	2014-03-01 19:55:35.000000000 +0000
-+++ src/bin/gnucash-bin.c
-@@ -22,6 +22,7 @@
-  */
- #include "config.h"
- 
-+#include <signal.h>
- #include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
-@@ -566,6 +567,8 @@ inner_main (void *closure, int argc, cha
-     char* fn;
-     GError *error = NULL;
- 
-+    signal(SIGTTOU, SIG_IGN);
-+
-     scm_c_eval_string("(debug-set! stack 200000)");
- 
-     main_mod = scm_c_resolve_module("gnucash main");