Update to 2.6.0.

Remove obsolete pkg-message since we now depend on dbi-drivers too.

4 files changed, 350 insertions, 274 deletions

diff --git a/finance/gnucash/Makefile b/finance/gnucash/Makefile
index 28fa5fed40ad..ef3612477c4f 100644
--- a/finance/gnucash/Makefile
+++ b/finance/gnucash/Makefile
@@ -2,19 +2,20 @@
 #   $MCom: ports/finance/gnucash/Makefile,v 1.26 2008/12/31 03:25:18 mezz Exp $
 
 PORTNAME=	gnucash
-PORTVERSION=	2.4.13
-PORTREVISION=	1
+PORTVERSION=	2.6.0
 CATEGORIES=	finance gnome
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}%20%28stable%29/${PORTVERSION}
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Quicken-like money and finance manager
 
-LICENSE=	GPLv3
+LICENSE=	GPLv2 GPLv3
+LICENSE_COMB=	dual
 
 BUILD_DEPENDS=	guile>=1.8.6:${PORTSDIR}/lang/guile \
     		${LOCALBASE}/share/guile/1.8/slibcat:${PORTSDIR}/lang/slib-guile
 LIB_DEPENDS=	libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring \
+		libwebkitgtk-1.0.so:${PORTSDIR}/www/webkit-gtk2 \
 		libgoffice-0.8.so:${PORTSDIR}/devel/goffice
 RUN_DEPENDS=	guile>=1.8.6:${PORTSDIR}/lang/guile \
 		${LOCALBASE}/share/guile/1.8/slibcat:${PORTSDIR}/lang/slib-guile \
@@ -22,13 +23,13 @@ RUN_DEPENDS=	guile>=1.8.6:${PORTSDIR}/lang/guile \
 		p5-Date-Manip>=0:${PORTSDIR}/devel/p5-Date-Manip \
 		p5-Finance-Quote>=0:${PORTSDIR}/finance/p5-Finance-Quote
 
-OPTIONS_DEFINE=	AQBANKING OFX DATABASE LOCALE_TAX WEBKIT PYTHON
+OPTIONS_DEFINE=	AQBANKING OFX DATABASE LOCALE_TAX PYTHON GTKMM
 
 AQBANKING_DESC=	AqBanking support (HBCI/OpenHBCI)
 OFX_DESC=	OFX support
 DATABASE_DESC=	Enable SQL database backends
 LOCALE_TAX_DESC=	Enable localized tax categories
-WEBKIT_DESC=	Use webkit instead of gtkhtml for the HTML engine
+GTKMM_DESC=	Enable GTKMM based UI
 
 OPTIONS_SUB=		yes
 AQBANKING_CONFIGURE_ENABLE=aqbanking
@@ -38,48 +39,55 @@ AQBANKING_LIB_DEPENDS=	libgwengui-gtk2.so:${PORTSDIR}/devel/gwenhywfar-gtk2 \
 OFX_CONFIGURE_ENABLE=	ofx
 OFX_LIB_DEPENDS=	libofx.so:${PORTSDIR}/finance/libofx
 DATABASE_CONFIGURE_ENABLE=dbi
+DATABASE_BUILD_DEPENDS=	libdbi-drivers>=0:${PORTSDIR}/databases/libdbi-drivers
 DATABASE_LIB_DEPENDS=	libdbi.so:${PORTSDIR}/databases/libdbi
+DATABASE_RUN_DEPENDS=	libdbi-drivers>=0:${PORTSDIR}/databases/libdbi-drivers
+DATABASE_CONFIGURE_ON=	--with-dbi-dbd-dir=${LOCALBASE}/lib/dbd
 LOCALE_TAX_CONFIGURE_ON=--enable-locale-specific-tax
-WEBKIT_CONFIGURE_ON=	--with-html-engine=webkit
-WEBKIT_LIB_DEPENDS=	libwebkitgtk-1.0.so:${PORTSDIR}/www/webkit-gtk2
-PYTHON_CONFIGURE_ON=	--enable-python-bindings
+PYTHON_CONFIGURE_ON=	--enable-python
 PYTHON_USE=		PYTHON=yes
+GTKMM_USE=		GNOME=gtkmm24
+GTKMM_CONFIGURE_ON=	--enable-gtkmm
+GTKMM_CONFIGURE_OFF=	--disable-gtkmm
 
+USE_XORG=	x11
 USE_BZIP2=	yes
-USES=		gettext gmake pkgconfig perl5
+USES=		desktop-file-utils gettext gmake perl5 pkgconfig shebangfix
 INSTALLS_ICONS=	yes
-USE_GNOME=	gnomeprefix libglade2 libgnomeui
+USE_GNOME+=	gtk20 libgnomecanvas libxml2 libxslt:build
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--disable-error-on-warning \
 		--disable-doxygen
+SHEBANG_FILES=	src/quotes/gnc-fq-dump
 
-GCONF_SCHEMAS=	apps_gnucash_dialog_business_common.schemas \
-		apps_gnucash_dialog_commodities.schemas \
-		apps_gnucash_dialog_common.schemas \
-		apps_gnucash_dialog_prices.schemas \
-		apps_gnucash_dialog_print_checks.schemas \
-		apps_gnucash_dialog_reconcile.schemas \
-		apps_gnucash_dialog_scheduled_transctions.schemas \
-		apps_gnucash_dialog_totd.schemas \
-		apps_gnucash_general.schemas \
-		apps_gnucash_history.schemas \
-		apps_gnucash_import_generic_matcher.schemas \
-		apps_gnucash_import_qif.schemas \
-		apps_gnucash_warnings.schemas \
-		apps_gnucash_window_pages_account_tree.schemas \
-		apps_gnucash_window_pages_register.schemas
+GLIB_SCHEMAS=	org.gnucash.dialogs.business.gschema.xml \
+		org.gnucash.dialogs.checkprinting.gschema.xml \
+		org.gnucash.dialogs.commodities.gschema.xml \
+		org.gnucash.dialogs.export.csv.gschema.xml \
+		org.gnucash.dialogs.gschema.xml \
+		org.gnucash.dialogs.import.csv.gschema.xml \
+		org.gnucash.dialogs.import.generic.gschema.xml \
+		org.gnucash.dialogs.import.qif.gschema.xml \
+		org.gnucash.dialogs.reconcile.gschema.xml \
+		org.gnucash.dialogs.sxs.gschema.xml \
+		org.gnucash.dialogs.totd.gschema.xml \
+		org.gnucash.gschema.xml \
+		org.gnucash.history.gschema.xml \
+		org.gnucash.warnings.gschema.xml \
+		org.gnucash.window.pages.account.tree.gschema.xml \
+		org.gnucash.window.pages.gschema.xml
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MAQBANKING}
-GCONF_SCHEMAS+=	apps_gnucash_dialog_hbci.schemas
+GLIB_SCHEMAS+=	org.gnucash.dialogs.import.hbci.gschema.xml
 .endif
 
-.if ! ${PORT_OPTIONS:MWEBKIT}
-USE_GNOME+=	gtkhtml3
+.if ${PORT_OPTIONS:MOFX}
+GLIB_SCHEMAS+=	org.gnucash.dialogs.import.ofx.gschema.xml
 .endif
 
 post-install:
@@ -88,6 +96,9 @@ post-install:
 		${STAGEDIR}${PYTHON_SITELIBDIR:S|${LOCALBASE}|${PREFIX}|}/${PORTNAME}
 	@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
 		${STAGEDIR}${PYTHON_SITELIBDIR:S|${LOCALBASE}|${PREFIX}|}/${PORTNAME}
+	@${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/gnucash/_gnucash_core_c.so
 .endif
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib*so*
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/gnucash/lib*.so
 
 .include <bsd.port.mk>
diff --git a/finance/gnucash/distinfo b/finance/gnucash/distinfo
index 65da3243eb33..f3e97853f400 100644
--- a/finance/gnucash/distinfo
+++ b/finance/gnucash/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnucash-2.4.13.tar.bz2) = f6025200eab90c098026310dc332272d922ce2d3a34fe926cc0c863c14009548
-SIZE (gnucash-2.4.13.tar.bz2) = 9400405
+SHA256 (gnucash-2.6.0.tar.bz2) = a875abf0ee3e7380fc41bd5bf2795787e4a8946ec579147b16acac665b9affbf
+SIZE (gnucash-2.6.0.tar.bz2) = 10691364
diff --git a/finance/gnucash/pkg-message b/finance/gnucash/pkg-message
deleted file mode 100644
index f6278f171295..000000000000
--- a/finance/gnucash/pkg-message
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-
-If you have enabled the DATABASE option and want to use any of the supported
-database backends, you also need to install:
-
-databases/libdbi-drivers
-
-And select the database type(s) you want to use.
-
-MySQL, PostgreSQL, and SQLite3 are supported in GnuCash.
-
-###############################################################################
diff --git a/finance/gnucash/pkg-plist b/finance/gnucash/pkg-plist
index feee6fefc48b..bda0083b89d1 100644
--- a/finance/gnucash/pkg-plist
+++ b/finance/gnucash/pkg-plist
@@ -6,13 +6,11 @@ bin/gnucash
 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/QuickFill.h
 include/gnucash/Recurrence.h
@@ -26,7 +24,10 @@ include/gnucash/Split.h
 include/gnucash/TransLog.h
 include/gnucash/Transaction.h
 include/gnucash/account-quickfill.h
+include/gnucash/assistant-utils.h
+include/gnucash/assistant-xml-encoding.h
 include/gnucash/basiccell.h
+include/gnucash/business-helpers.h
 include/gnucash/business-options.h
 include/gnucash/cap-gains.h
 include/gnucash/cashobjects.h
@@ -37,23 +38,22 @@ include/gnucash/combocell.h
 include/gnucash/datecell.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-dup-trans.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
+include/gnucash/dialog-query-view.h
+include/gnucash/dialog-report-column-view.h
+include/gnucash/dialog-report-style-sheet.h
 include/gnucash/dialog-reset-warnings.h
 include/gnucash/dialog-search.h
-include/gnucash/dialog-style-sheet.h
 include/gnucash/dialog-totd.h
 include/gnucash/dialog-transfer.h
 include/gnucash/dialog-utils.h
-include/gnucash/druid-gconf-setup.h
-include/gnucash/druid-gnc-xml-import.h
-include/gnucash/druid-utils.h
+include/gnucash/engine-helpers-guile.h
 include/gnucash/engine-helpers.h
 include/gnucash/file-utils.h
 include/gnucash/formulacell.h
@@ -64,9 +64,12 @@ 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-associate-account.h
 include/gnucash/gnc-basic-gobject.h
 include/gnucash/gnc-budget.h
+include/gnucash/gnc-cell-renderer-date.h
+include/gnucash/gnc-cell-renderer-popup-entry.h
+include/gnucash/gnc-cell-renderer-popup.h
+include/gnucash/gnc-combott.h
 include/gnucash/gnc-commodity-edit.h
 include/gnucash/gnc-commodity.h
 include/gnucash/gnc-component-manager.h
@@ -79,49 +82,31 @@ 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
-include/gnucash/gnc-druid-gnome-ui.h
-include/gnucash/gnc-druid-provider-desc-edge.h
-include/gnucash/gnc-druid-provider-desc-file.h
-include/gnucash/gnc-druid-provider-desc-multifile.h
-include/gnucash/gnc-druid-provider-desc.h
-include/gnucash/gnc-druid-provider-file-cb.h
-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-features.h
 include/gnucash/gnc-file.h
 include/gnucash/gnc-frequency.h
 include/gnucash/gnc-general-search.h
 include/gnucash/gnc-general-select.h
 include/gnucash/gnc-gettext-util.h
 include/gnucash/gnc-gnome-utils.h
+include/gnucash/gnc-gsettings.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-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
@@ -135,29 +120,37 @@ include/gnucash/gnc-plugin-menu-additions.h
 include/gnucash/gnc-plugin-page-report.h
 include/gnucash/gnc-plugin-page.h
 include/gnucash/gnc-plugin.h
+include/gnucash/gnc-prefs-utils.h
 include/gnucash/gnc-pricedb.h
-include/gnucash/gnc-query-list.h
+include/gnucash/gnc-query-view.h
 include/gnucash/gnc-recurrence.h
 include/gnucash/gnc-report.h
-include/gnucash/gnc-session-scm.h
 include/gnucash/gnc-session.h
 include/gnucash/gnc-splash.h
+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-tree-control-split-reg.h
 include/gnucash/gnc-tree-model-account-types.h
 include/gnucash/gnc-tree-model-account.h
 include/gnucash/gnc-tree-model-budget.h
 include/gnucash/gnc-tree-model-commodity.h
+include/gnucash/gnc-tree-model-owner.h
 include/gnucash/gnc-tree-model-price.h
+include/gnucash/gnc-tree-model-split-reg.h
 include/gnucash/gnc-tree-model.h
+include/gnucash/gnc-tree-util-split-reg.h
 include/gnucash/gnc-tree-view-account.h
 include/gnucash/gnc-tree-view-commodity.h
+include/gnucash/gnc-tree-view-owner.h
 include/gnucash/gnc-tree-view-price.h
+include/gnucash/gnc-tree-view-split-reg.h
 include/gnucash/gnc-tree-view-sx-list.h
 include/gnucash/gnc-tree-view.h
-include/gnucash/gnc-ui.h
+include/gnucash/gnc-ui-balances.h
 include/gnucash/gnc-ui-util.h
+include/gnucash/gnc-ui.h
 include/gnucash/gnc-window.h
 include/gnucash/gncAddress.h
 include/gnucash/gncAddressP.h
@@ -205,12 +198,10 @@ include/gnucash/qof.h
 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
-include/gnucash/qofgobj.h
 include/gnucash/qofid-p.h
 include/gnucash/qofid.h
 include/gnucash/qofinstance-p.h
@@ -221,7 +212,6 @@ include/gnucash/qofquery.h
 include/gnucash/qofquerycore.h
 include/gnucash/qofreference.h
 include/gnucash/qofsession.h
-include/gnucash/qofsql.h
 include/gnucash/qofutil.h
 include/gnucash/quickfillcell.h
 include/gnucash/recncell.h
@@ -230,8 +220,12 @@ include/gnucash/table-allgui.h
 include/gnucash/table-control.h
 include/gnucash/table-layout.h
 include/gnucash/table-model.h
+include/gnucash/tree-view-utils.h
 include/gnucash/window-main-summarybar.h
 include/gnucash/window-report.h
+%%PYTHON%%lib/gnucash/libgncmod-app-utils-python.la
+%%PYTHON%%lib/gnucash/libgncmod-app-utils-python.so
+%%PYTHON%%lib/gnucash/libgncmod-app-utils-python.so.0
 lib/gnucash/libgncmod-app-utils.la
 lib/gnucash/libgncmod-app-utils.so
 %%AQBANKING%%lib/gnucash/libgncmod-aqbanking.la
@@ -242,18 +236,14 @@ lib/gnucash/libgncmod-backend-xml.la
 lib/gnucash/libgncmod-backend-xml.so
 lib/gnucash/libgncmod-bi_import.la
 lib/gnucash/libgncmod-bi_import.so
-lib/gnucash/libgncmod-business-core.la
-lib/gnucash/libgncmod-business-core.so
 lib/gnucash/libgncmod-business-gnome.la
 lib/gnucash/libgncmod-business-gnome.so
-lib/gnucash/libgncmod-business-utils.la
-lib/gnucash/libgncmod-business-utils.so
-lib/gnucash/libgncmod-calculation.la
-lib/gnucash/libgncmod-calculation.so
-lib/gnucash/libgncmod-csv.la
-lib/gnucash/libgncmod-csv.so
-lib/gnucash/libgncmod-dialog-tax-table.la
-lib/gnucash/libgncmod-dialog-tax-table.so
+lib/gnucash/libgncmod-csv-export.la
+lib/gnucash/libgncmod-csv-export.so
+lib/gnucash/libgncmod-csv-import.la
+lib/gnucash/libgncmod-csv-import.so
+lib/gnucash/libgncmod-customer_import.la
+lib/gnucash/libgncmod-customer_import.so
 lib/gnucash/libgncmod-engine.la
 lib/gnucash/libgncmod-engine.so
 lib/gnucash/libgncmod-generic-import.la
@@ -262,6 +252,8 @@ lib/gnucash/libgncmod-gnome-search.la
 lib/gnucash/libgncmod-gnome-search.so
 lib/gnucash/libgncmod-gnome-utils.la
 lib/gnucash/libgncmod-gnome-utils.so
+%%GTKMM%%lib/gnucash/libgncmod-gtkmm.la
+%%GTKMM%%lib/gnucash/libgncmod-gtkmm.so
 lib/gnucash/libgncmod-html.la
 lib/gnucash/libgncmod-html.so
 lib/gnucash/libgncmod-ledger-core.la
@@ -272,6 +264,8 @@ lib/gnucash/libgncmod-log-replay.la
 lib/gnucash/libgncmod-log-replay.so
 %%OFX%%lib/gnucash/libgncmod-ofx.la
 %%OFX%%lib/gnucash/libgncmod-ofx.so
+%%PYTHON%%lib/gnucash/libgncmod-python.la
+%%PYTHON%%lib/gnucash/libgncmod-python.so
 lib/gnucash/libgncmod-qif-import.la
 lib/gnucash/libgncmod-qif-import.so
 lib/gnucash/libgncmod-qif.la
@@ -302,6 +296,9 @@ lib/libgnc-backend-xml-utils.so.0
 lib/libgnc-business-ledger.la
 lib/libgnc-business-ledger.so
 lib/libgnc-business-ledger.so.0
+%%PYTHON%%lib/libgnc-core-utils-python.la
+%%PYTHON%%lib/libgnc-core-utils-python.so
+%%PYTHON%%lib/libgnc-core-utils-python.so.0
 lib/libgnc-core-utils.la
 lib/libgnc-core-utils.so
 lib/libgnc-core-utils.so.0
@@ -334,8 +331,66 @@ lib/libgnc-qof.so.1
 libexec/gnucash/overrides/gnucash-env
 libexec/gnucash/overrides/gnucash-make-guids
 libexec/gnucash/overrides/guile
+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
+man/man1/gnc-fq-dump.1.gz
+man/man1/gnc-fq-helper.1.gz
 man/man1/gnucash.1.gz
+share/appdata/gnucash.appdata.xml
 share/applications/gnucash.desktop
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.2003
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.2004
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.2005
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.2006
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.2007
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.2008
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.2009
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.2010
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.2011
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.2012
+%%PORTDOCS%%%%DOCSDIR%%/DOCUMENTERS
+%%PORTDOCS%%%%DOCSDIR%%/HACKING
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE
+%%PORTDOCS%%%%DOCSDIR%%/Money95bank_fr.qif
+%%PORTDOCS%%%%DOCSDIR%%/Money95invst_fr.qif
+%%PORTDOCS%%%%DOCSDIR%%/Money95mfunds_fr.qif
+%%PORTDOCS%%%%DOCSDIR%%/Money95stocks_fr.qif
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README-de.win32-bin.txt
+%%PORTDOCS%%%%DOCSDIR%%/README-fr.win32-bin.txt
+%%PORTDOCS%%%%DOCSDIR%%/README-it.win32-bin.txt
+%%PORTDOCS%%%%DOCSDIR%%/README-lv.win32-bin.txt
+%%PORTDOCS%%%%DOCSDIR%%/README-nl.win32-bin.txt
+%%PORTDOCS%%%%DOCSDIR%%/README-zh_CN.win32-bin.txt
+%%PORTDOCS%%%%DOCSDIR%%/README-zh_TW.win32-bin.txt
+%%PORTDOCS%%%%DOCSDIR%%/README.dependencies
+%%PORTDOCS%%%%DOCSDIR%%/README.francais
+%%PORTDOCS%%%%DOCSDIR%%/README.german
+%%PORTDOCS%%%%DOCSDIR%%/README.win32-bin.txt
+%%PORTDOCS%%%%DOCSDIR%%/README_invoice
+%%PORTDOCS%%%%DOCSDIR%%/abc-all.qif
+%%PORTDOCS%%%%DOCSDIR%%/abc.qif
+%%PORTDOCS%%%%DOCSDIR%%/bogus.qif
+%%PORTDOCS%%%%DOCSDIR%%/cbb-export.qif
+%%PORTDOCS%%%%DOCSDIR%%/currency_tree_xml.gnucash
+%%PORTDOCS%%%%DOCSDIR%%/every.qif
+%%PORTDOCS%%%%DOCSDIR%%/guile-hackers.txt
+%%PORTDOCS%%%%DOCSDIR%%/invoice.csv
+%%PORTDOCS%%%%DOCSDIR%%/ms-money.qif
+%%PORTDOCS%%%%DOCSDIR%%/projects.html
+%%PORTDOCS%%%%DOCSDIR%%/quicktest.qif
+%%PORTDOCS%%%%DOCSDIR%%/swipe.qif
+%%PORTDOCS%%%%DOCSDIR%%/taxreport.gnucash
+%%PORTDOCS%%%%DOCSDIR%%/web.qif
 share/gnucash/accounts/C/acctchrt_brokerage.gnucash-xea
 share/gnucash/accounts/C/acctchrt_business.gnucash-xea
 share/gnucash/accounts/C/acctchrt_carloan.gnucash-xea
@@ -687,189 +742,184 @@ share/gnucash/accounts/zh_CN/acctchrt_spouseretire.gnucash-xea
 share/gnucash/checks/deluxe.chk
 share/gnucash/checks/liberty.chk
 share/gnucash/checks/quicken.chk
+%%DATADIR%%/checks/quicken_3part.chk
 share/gnucash/checks/quicken_check_21.chk
 share/gnucash/checks/quicken_wallet.chk
 share/gnucash/checks/voucher.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/ChangeLog.2007
-share/gnucash/doc/ChangeLog.2008
-share/gnucash/doc/ChangeLog.2009
-share/gnucash/doc/ChangeLog.2010
-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-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-zh_TW.win32-bin.txt
-share/gnucash/doc/README.dependencies
-share/gnucash/doc/README.francais
-share/gnucash/doc/README.german
-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
-share/gnucash/doc/examples/Money95stocks_fr.qif
-share/gnucash/doc/examples/README
-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_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/swipe.qif
-share/gnucash/doc/examples/taxreport.gnucash
-share/gnucash/doc/examples/web.qif
-share/gnucash/doc/guile-hackers.txt
-share/gnucash/doc/projects.html
-share/gnucash/glade/account.glade
-share/gnucash/glade/acctperiod.glade
-%%AQBANKING%%share/gnucash/glade/aqbanking.glade
-share/gnucash/glade/autoclear.glade
-share/gnucash/glade/bi_import.glade
-share/gnucash/glade/billterms.glade
-share/gnucash/glade/budget.glade
-share/gnucash/glade/businessprefs.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
-share/gnucash/glade/druid-gnc-xml-import.glade
-share/gnucash/glade/druid-provider-multifile.glade
-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/newuser.glade
-share/gnucash/glade/order.glade
-share/gnucash/glade/payment.glade
-share/gnucash/glade/preferences.glade
-share/gnucash/glade/price.glade
-share/gnucash/glade/print.glade
-share/gnucash/glade/progress.glade
-share/gnucash/glade/qif.glade
-share/gnucash/glade/reconcile.glade
-share/gnucash/glade/register.glade
-share/gnucash/glade/report.glade
-share/gnucash/glade/sched-xact.glade
-share/gnucash/glade/search.glade
-share/gnucash/glade/stocks.glade
-share/gnucash/glade/tax-tables.glade
-share/gnucash/glade/tax.glade
-share/gnucash/glade/totd.glade
-share/gnucash/glade/transfer.glade
-share/gnucash/glade/userpass.glade
-share/gnucash/glade/vendor.glade
-share/gnucash/gnome
-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
-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/printf.scm
-share/gnucash/guile-modules/gnucash/report/aging.scm
-share/gnucash/guile-modules/gnucash/report/balsheet-eg.css
-share/gnucash/guile-modules/gnucash/report/balsheet-eg.scm
-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/customer-summary.scm
-share/gnucash/guile-modules/gnucash/report/easy-invoice.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/hello-world.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/owner-report.scm
-share/gnucash/guile-modules/gnucash/report/payables.scm
-share/gnucash/guile-modules/gnucash/report/receivables.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/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/net-linechart.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/sx-summary.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/utility-reports.scm
-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/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
+%%DATADIR%%/gnome
+%%AQBANKING%%%%DATADIR%%/gtkbuilder/assistant-ab-initial.glade
+%%DATADIR%%/gtkbuilder/assistant-acct-period.glade
+%%DATADIR%%/gtkbuilder/assistant-csv-account-import.glade
+%%DATADIR%%/gtkbuilder/assistant-csv-export.glade
+%%DATADIR%%/gtkbuilder/assistant-csv-trans-import.glade
+%%DATADIR%%/gtkbuilder/assistant-hierarchy.glade
+%%DATADIR%%/gtkbuilder/assistant-loan.glade
+%%DATADIR%%/gtkbuilder/assistant-qif-import.glade
+%%DATADIR%%/gtkbuilder/assistant-stock-split.glade
+%%DATADIR%%/gtkbuilder/assistant-xml-encoding.glade
+%%DATADIR%%/gtkbuilder/business-options-gnome.glade
+%%DATADIR%%/gtkbuilder/business-prefs.glade
+%%AQBANKING%%%%DATADIR%%/gtkbuilder/dialog-ab.glade
+%%DATADIR%%/gtkbuilder/dialog-account-picker.glade
+%%DATADIR%%/gtkbuilder/dialog-account.glade
+%%DATADIR%%/gtkbuilder/dialog-bi-import-gui.glade
+%%DATADIR%%/gtkbuilder/dialog-billterms.glade
+%%DATADIR%%/gtkbuilder/dialog-book-close.glade
+%%DATADIR%%/gtkbuilder/dialog-choose-owner.glade
+%%DATADIR%%/gtkbuilder/dialog-commodities.glade
+%%DATADIR%%/gtkbuilder/dialog-commodity.glade
+%%DATADIR%%/gtkbuilder/dialog-custom-report.glade
+%%DATADIR%%/gtkbuilder/dialog-customer-import-gui.glade
+%%DATADIR%%/gtkbuilder/dialog-customer.glade
+%%DATADIR%%/gtkbuilder/dialog-date-close.glade
+%%DATADIR%%/gtkbuilder/dialog-employee.glade
+%%DATADIR%%/gtkbuilder/dialog-file-access.glade
+%%DATADIR%%/gtkbuilder/dialog-fincalc.glade
+%%DATADIR%%/gtkbuilder/dialog-import.glade
+%%DATADIR%%/gtkbuilder/dialog-invoice.glade
+%%DATADIR%%/gtkbuilder/dialog-job.glade
+%%DATADIR%%/gtkbuilder/dialog-lot-viewer.glade
+%%DATADIR%%/gtkbuilder/dialog-new-user.glade
+%%DATADIR%%/gtkbuilder/dialog-object-references.glade
+%%DATADIR%%/gtkbuilder/dialog-options.glade
+%%DATADIR%%/gtkbuilder/dialog-order.glade
+%%DATADIR%%/gtkbuilder/dialog-payment.glade
+%%DATADIR%%/gtkbuilder/dialog-preferences.glade
+%%DATADIR%%/gtkbuilder/dialog-price.glade
+%%DATADIR%%/gtkbuilder/dialog-print-check.glade
+%%DATADIR%%/gtkbuilder/dialog-progress.glade
+%%DATADIR%%/gtkbuilder/dialog-query-view.glade
+%%DATADIR%%/gtkbuilder/dialog-report.glade
+%%DATADIR%%/gtkbuilder/dialog-reset-warnings.glade
+%%DATADIR%%/gtkbuilder/dialog-search.glade
+%%DATADIR%%/gtkbuilder/dialog-sx.glade
+%%DATADIR%%/gtkbuilder/dialog-tax-info.glade
+%%DATADIR%%/gtkbuilder/dialog-tax-table.glade
+%%DATADIR%%/gtkbuilder/dialog-totd.glade
+%%DATADIR%%/gtkbuilder/dialog-transfer.glade
+%%DATADIR%%/gtkbuilder/dialog-userpass.glade
+%%DATADIR%%/gtkbuilder/dialog-vendor.glade
+%%DATADIR%%/gtkbuilder/gnc-date-format.glade
+%%DATADIR%%/gtkbuilder/gnc-frequency.glade
+%%DATADIR%%/gtkbuilder/gnc-plugin-page-budget.glade
+%%DATADIR%%/gtkbuilder/gnc-plugin-page-register.glade
+%%DATADIR%%/gtkbuilder/gnc-plugin-page-register2.glade
+%%DATADIR%%/gtkbuilder/gnc-recurrence.glade
+%%DATADIR%%/gtkbuilder/gnc-tree-view-owner.glade
+%%DATADIR%%/gtkbuilder/window-autoclear.glade
+%%DATADIR%%/gtkbuilder/window-reconcile.glade
+%%DATADIR%%/guile-modules/gnucash/app-utils.scm
+%%DATADIR%%/guile-modules/gnucash/business-core.scm
+%%DATADIR%%/guile-modules/gnucash/business-gnome.scm
+%%DATADIR%%/guile-modules/gnucash/core-utils.scm
+%%DATADIR%%/guile-modules/gnucash/engine.scm
+%%DATADIR%%/guile-modules/gnucash/gnc-module.scm
+%%DATADIR%%/guile-modules/gnucash/gnome-utils.scm
+%%DATADIR%%/guile-modules/gnucash/import-export/qif-import.scm
+%%DATADIR%%/guile-modules/gnucash/main.scm
+%%DATADIR%%/guile-modules/gnucash/price-quotes.scm
+%%DATADIR%%/guile-modules/gnucash/printf.scm
+%%DATADIR%%/guile-modules/gnucash/report/aging.scm
+%%DATADIR%%/guile-modules/gnucash/report/balsheet-eg.css
+%%DATADIR%%/guile-modules/gnucash/report/balsheet-eg.eguile.scm
+%%DATADIR%%/guile-modules/gnucash/report/balsheet-eg.scm
+%%DATADIR%%/guile-modules/gnucash/report/business-reports.scm
+%%DATADIR%%/guile-modules/gnucash/report/customer-summary.scm
+%%DATADIR%%/guile-modules/gnucash/report/easy-invoice.scm
+%%DATADIR%%/guile-modules/gnucash/report/eguile-gnc.scm
+%%DATADIR%%/guile-modules/gnucash/report/eguile-html-utilities.scm
+%%DATADIR%%/guile-modules/gnucash/report/eguile-utilities.scm
+%%DATADIR%%/guile-modules/gnucash/report/fancy-invoice.scm
+%%DATADIR%%/guile-modules/gnucash/report/hello-world.scm
+%%DATADIR%%/guile-modules/gnucash/report/invoice.scm
+%%DATADIR%%/guile-modules/gnucash/report/job-report.scm
+%%DATADIR%%/guile-modules/gnucash/report/locale-specific/de_DE.scm
+%%DATADIR%%/guile-modules/gnucash/report/locale-specific/us.scm
+%%DATADIR%%/guile-modules/gnucash/report/owner-report.scm
+%%DATADIR%%/guile-modules/gnucash/report/payables.scm
+%%DATADIR%%/guile-modules/gnucash/report/receivables.scm
+%%DATADIR%%/guile-modules/gnucash/report/report-gnome.scm
+%%DATADIR%%/guile-modules/gnucash/report/report-system.scm
+%%DATADIR%%/guile-modules/gnucash/report/report-system/collectors.scm
+%%DATADIR%%/guile-modules/gnucash/report/report-system/list-extras.scm
+%%DATADIR%%/guile-modules/gnucash/report/report-system/report-collectors.scm
+%%DATADIR%%/guile-modules/gnucash/report/standard-reports.scm
+%%DATADIR%%/guile-modules/gnucash/report/standard-reports/account-piecharts.scm
+%%DATADIR%%/guile-modules/gnucash/report/standard-reports/account-summary.scm
+%%DATADIR%%/guile-modules/gnucash/report/standard-reports/advanced-portfolio.scm
+%%DATADIR%%/guile-modules/gnucash/report/standard-reports/average-balance.scm
+%%DATADIR%%/guile-modules/gnucash/report/standard-reports/balance-sheet.scm
+%%DATADIR%%/guile-modules/gnucash/report/standard-reports/budget-balance-sheet.scm
+%%DATADIR%%/guile-modules/gnucash/report/standard-reports/budget-barchart.scm
+%%DATADIR%%/guile-modules/gnucash/report/standard-reports/budget-flow.scm
+%%DATADIR%%/guile-modules/gnucash/report/standard-reports/budget-income-statement.scm
+%%DATADIR%%/guile-modules/gnucash/report/standard-reports/budget.scm
+%%DATADIR%%/guile-modules/gnucash/report/standard-reports/cash-flow.scm
+%%DATADIR%%/guile-modules/gnucash/report/standard-reports/category-barchart.scm
+%%DATADIR%%/guile-modules/gnucash/report/standard-reports/daily-reports.scm
+%%DATADIR%%/guile-modules/gnucash/report/standard-reports/equity-statement.scm
+%%DATADIR%%/guile-modules/gnucash/report/standard-reports/general-journal.scm
+%%DATADIR%%/guile-modules/gnucash/report/standard-reports/general-ledger.scm
+%%DATADIR%%/guile-modules/gnucash/report/standard-reports/income-statement.scm
+%%DATADIR%%/guile-modules/gnucash/report/standard-reports/net-barchart.scm
+%%DATADIR%%/guile-modules/gnucash/report/standard-reports/net-linechart.scm
+%%DATADIR%%/guile-modules/gnucash/report/standard-reports/portfolio.scm
+%%DATADIR%%/guile-modules/gnucash/report/standard-reports/price-scatter.scm
+%%DATADIR%%/guile-modules/gnucash/report/standard-reports/register.scm
+%%DATADIR%%/guile-modules/gnucash/report/standard-reports/sx-summary.scm
+%%DATADIR%%/guile-modules/gnucash/report/standard-reports/transaction.scm
+%%DATADIR%%/guile-modules/gnucash/report/standard-reports/trial-balance.scm
+%%DATADIR%%/guile-modules/gnucash/report/stylesheet-easy.scm
+%%DATADIR%%/guile-modules/gnucash/report/stylesheet-fancy.scm
+%%DATADIR%%/guile-modules/gnucash/report/stylesheet-footer.scm
+%%DATADIR%%/guile-modules/gnucash/report/stylesheet-plain.scm
+%%DATADIR%%/guile-modules/gnucash/report/stylesheets.scm
+%%DATADIR%%/guile-modules/gnucash/report/taxinvoice.css
+%%DATADIR%%/guile-modules/gnucash/report/taxinvoice.eguile.scm
+%%DATADIR%%/guile-modules/gnucash/report/taxinvoice.scm
+%%DATADIR%%/guile-modules/gnucash/report/taxtxf-de_DE.scm
+%%DATADIR%%/guile-modules/gnucash/report/taxtxf.scm
+%%DATADIR%%/guile-modules/gnucash/report/utility-reports.scm
+%%DATADIR%%/guile-modules/gnucash/report/view-column.scm
+%%DATADIR%%/guile-modules/gnucash/report/welcome-to-gnucash.scm
+%%DATADIR%%/guile-modules/gnucash/tax/de_DE.scm
+%%DATADIR%%/guile-modules/gnucash/tax/us.scm
+%%DATADIR%%/guile-modules/gnucash/unittest-support.scm
+%%DATADIR%%/guile-modules/www/cgi.scm
+%%DATADIR%%/guile-modules/www/http.scm
+%%DATADIR%%/guile-modules/www/main.scm
+%%DATADIR%%/guile-modules/www/url.scm
+%%DATADIR%%/jqplot/jqplot.BezierCurveRenderer.js
+%%DATADIR%%/jqplot/jqplot.barRenderer.js
+%%DATADIR%%/jqplot/jqplot.blockRenderer.js
+%%DATADIR%%/jqplot/jqplot.bubbleRenderer.js
+%%DATADIR%%/jqplot/jqplot.canvasAxisLabelRenderer.js
+%%DATADIR%%/jqplot/jqplot.canvasAxisTickRenderer.js
+%%DATADIR%%/jqplot/jqplot.canvasTextRenderer.js
+%%DATADIR%%/jqplot/jqplot.categoryAxisRenderer.js
+%%DATADIR%%/jqplot/jqplot.ciParser.js
+%%DATADIR%%/jqplot/jqplot.cursor.js
+%%DATADIR%%/jqplot/jqplot.dateAxisRenderer.js
+%%DATADIR%%/jqplot/jqplot.donutRenderer.js
+%%DATADIR%%/jqplot/jqplot.dragable.js
+%%DATADIR%%/jqplot/jqplot.enhancedLegendRenderer.js
+%%DATADIR%%/jqplot/jqplot.funnelRenderer.js
+%%DATADIR%%/jqplot/jqplot.highlighter.js
+%%DATADIR%%/jqplot/jqplot.json2.js
+%%DATADIR%%/jqplot/jqplot.logAxisRenderer.js
+%%DATADIR%%/jqplot/jqplot.mekkoAxisRenderer.js
+%%DATADIR%%/jqplot/jqplot.mekkoRenderer.js
+%%DATADIR%%/jqplot/jqplot.meterGaugeRenderer.js
+%%DATADIR%%/jqplot/jqplot.ohlcRenderer.js
+%%DATADIR%%/jqplot/jqplot.pieRenderer.js
+%%DATADIR%%/jqplot/jqplot.pointLabels.js
+%%DATADIR%%/jqplot/jqplot.trendline.js
+%%DATADIR%%/jqplot/jquery.jqplot.css
+%%DATADIR%%/jqplot/jquery.jqplot.js
+%%DATADIR%%/jqplot/jquery.min.js
+%%DATADIR%%/make-prefs-migration-script.xsl
+%%DATADIR%%/migratable-prefs.xml
+%%DATADIR%%/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
@@ -879,6 +929,8 @@ 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.png
+%%DATADIR%%/pixmaps/gnc-gnome-pdf-16.png
+%%DATADIR%%/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
@@ -913,16 +965,22 @@ 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
+%%PYTHON%%%%DATADIR%%/python/init.py
+%%PYTHON%%%%DATADIR%%/python/pycons/__init__.py
+%%PYTHON%%%%DATADIR%%/python/pycons/console.py
+%%PYTHON%%%%DATADIR%%/python/pycons/ishell.py
+%%PYTHON%%%%DATADIR%%/python/pycons/pycons
+%%PYTHON%%%%DATADIR%%/python/pycons/setup.py
+%%PYTHON%%%%DATADIR%%/python/pycons/shell.py
+%%PYTHON%%%%DATADIR%%/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
-share/gnucash/scm/command-line.scm
 share/gnucash/scm/commodity-table.scm
 share/gnucash/scm/commodity-utilities.scm
 share/gnucash/scm/config-var.scm
 share/gnucash/scm/date-utilities.scm
-share/gnucash/scm/doc.scm
 share/gnucash/scm/engine-interface.scm
 share/gnucash/scm/engine-utilities.scm
 share/gnucash/scm/fin.scm
@@ -935,6 +993,7 @@ 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
+%%DATADIR%%/scm/html-jqplot.scm
 share/gnucash/scm/html-linechart.scm
 share/gnucash/scm/html-piechart.scm
 share/gnucash/scm/html-scatter.scm
@@ -943,7 +1002,7 @@ 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/main-window.scm
+%%DATADIR%%/scm/migrate-prefs.scm
 share/gnucash/scm/options-utilities.scm
 share/gnucash/scm/options.scm
 share/gnucash/scm/prefs.scm
@@ -968,16 +1027,23 @@ 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
+%%DATADIR%%/ui/gnc-plugin-bi-import-ui.xml
+%%DATADIR%%/ui/gnc-plugin-csv-export-ui.xml
+%%DATADIR%%/ui/gnc-plugin-csv-import-ui.xml
+%%DATADIR%%/ui/gnc-plugin-customer_import-ui.xml
 share/gnucash/ui/gnc-plugin-account-tree-ui.xml
 %%AQBANKING%%share/gnucash/ui/gnc-plugin-aqbanking-ui.xml
 share/gnucash/ui/gnc-plugin-basic-commands-ui.xml
-share/gnucash/ui/gnc-plugin-bi_import-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
+%%GTKMM%%%%DATADIR%%/ui/gnc-plugin-gtkmm-ui.xml
 share/gnucash/ui/gnc-plugin-log-replay-ui.xml
 %%OFX%%share/gnucash/ui/gnc-plugin-ofx-ui.xml
+%%DATADIR%%/ui/gnc-plugin-page-account-tree2-ui.xml
+%%DATADIR%%/ui/gnc-plugin-page-owner-tree-ui.xml
+%%DATADIR%%/ui/gnc-plugin-page-register2-ui.xml
+%%DATADIR%%/ui/gnc-plugin-page-sx-list2-ui.xml
 share/gnucash/ui/gnc-plugin-page-account-tree-ui.xml
 share/gnucash/ui/gnc-plugin-page-budget-ui.xml
 share/gnucash/ui/gnc-plugin-page-invoice-ui.xml
@@ -987,11 +1053,15 @@ 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
+%%DATADIR%%/ui/gnc-plugin-register2-ui.xml
+%%DATADIR%%/ui/gnc-plugin-register22-ui.xml
 share/gnucash/ui/gnc-plugin-stylesheets-ui.xml
 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
+%%DATADIR%%/ui/gnc-windows-menu-ui-quartz.xml
+%%DATADIR%%/ui/gnc-windows-menu-ui.xml
 share/gnucash/ui/osx_accel_map
 share/icons/hicolor/128x128/apps/gnucash-icon.png
 share/icons/hicolor/16x16/apps/gnucash-icon.png
@@ -1003,6 +1073,7 @@ 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/ar/LC_MESSAGES/gnucash.mo
 share/locale/bg/LC_MESSAGES/gnucash.mo
 share/locale/ca/LC_MESSAGES/gnucash.mo
 share/locale/cs/LC_MESSAGES/gnucash.mo
@@ -1044,22 +1115,22 @@ share/locale/zh_TW/LC_MESSAGES/gnucash.mo
 @dirrmtry share/locale/rw
 @dirrmtry share/locale/es_NI/LC_MESSAGES
 @dirrmtry share/locale/es_NI
+@dirrm %%DATADIR%%/gtkbuilder
 @dirrm share/gnucash/ui
 @dirrm share/gnucash/scm/qif-import
 @dirrm share/gnucash/scm/gnumeric
 @dirrm share/gnucash/scm
 @dirrm share/gnucash/pixmaps
+@dirrm %%DATADIR%%/jqplot
 @dirrm share/gnucash/guile-modules/www
 @dirrm share/gnucash/guile-modules/gnucash/tax
 @dirrm share/gnucash/guile-modules/gnucash/report/standard-reports
+@dirrm %%DATADIR%%/guile-modules/gnucash/report/report-system
 @dirrm share/gnucash/guile-modules/gnucash/report/locale-specific
 @dirrm share/gnucash/guile-modules/gnucash/report
 @dirrm share/gnucash/guile-modules/gnucash/import-export
 @dirrm share/gnucash/guile-modules/gnucash
 @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/zh_CN
 @dirrm share/gnucash/accounts/tr_TR
@@ -1092,6 +1163,12 @@ share/locale/zh_TW/LC_MESSAGES/gnucash.mo
 @dirrm share/gnucash/accounts/C
 @dirrm share/gnucash/accounts
 @dirrm share/gnucash
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
+@dirrm share/appdata
+@dirrm libexec/gnucash/src/libqof/qof/test
+@dirrm libexec/gnucash/src/libqof/qof
+@dirrm libexec/gnucash/src/libqof
+@dirrm libexec/gnucash/src
 @dirrm libexec/gnucash/overrides
 @dirrm libexec/gnucash
 %%PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/gnucash