summaryrefslogtreecommitdiff
path: root/finance/gnucash
diff options
context:
space:
mode:
Diffstat (limited to 'finance/gnucash')
-rw-r--r--finance/gnucash/Makefile28
-rw-r--r--finance/gnucash/PLIST388
-rw-r--r--finance/gnucash/distinfo9
-rw-r--r--finance/gnucash/patches/patch-configure34
4 files changed, 238 insertions, 221 deletions
diff --git a/finance/gnucash/Makefile b/finance/gnucash/Makefile
index f4209655a36..66acb424ec0 100644
--- a/finance/gnucash/Makefile
+++ b/finance/gnucash/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.191 2014/01/01 11:52:15 wiz Exp $
+# $NetBSD: Makefile,v 1.192 2014/01/02 01:25:49 ryoon Exp $
-DISTNAME= gnucash-2.4.13
-PKGREVISION= 6
+DISTNAME= gnucash-2.6.0
CATEGORIES= finance
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gnucash/}
EXTRACT_SUFX= .tar.bz2
@@ -24,7 +23,8 @@ INFO_FILES= YES
CONFIGURE_ARGS+= --with-html-engine=webkit
CONFIGURE_ARGS+= --disable-dbi
-CONFIGURE_ARGS+= --enable-python-bindings
+CONFIGURE_ARGS+= --enable-python
+CONFIGURE_ARGS+= --with-xdg-data-dirs=${PREFIX}/share
REPLACE_PERL+= src/quotes/gnc-fq-dump
REPLACE_PERL+= packaging/win32/exetype.pl
@@ -33,30 +33,12 @@ REPLACE_PERL+= src/quotes/Quote_example.pl
PY_PATCHPLIST= yes
-CONFIGURE_ENV+= GCONF_SCHEMA_FILE_DIR="${PREFIX}/share/gconf/schemas/"
-MAKE_ENV+= GCONF_SCHEMA_FILE_DIR="${PREFIX}/share/gconf/schemas/"
-
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
-GCONF_SCHEMAS+= apps_gnucash_history.schemas
-GCONF_SCHEMAS+= apps_gnucash_dialog_commodities.schemas
-GCONF_SCHEMAS+= apps_gnucash_dialog_common.schemas
-GCONF_SCHEMAS+= apps_gnucash_dialog_print_checks.schemas
-GCONF_SCHEMAS+= apps_gnucash_dialog_prices.schemas
-GCONF_SCHEMAS+= apps_gnucash_warnings.schemas
-GCONF_SCHEMAS+= apps_gnucash_dialog_reconcile.schemas
-GCONF_SCHEMAS+= apps_gnucash_dialog_totd.schemas
-GCONF_SCHEMAS+= apps_gnucash_general.schemas
-GCONF_SCHEMAS+= apps_gnucash_window_pages_account_tree.schemas
-GCONF_SCHEMAS+= apps_gnucash_window_pages_register.schemas
-GCONF_SCHEMAS+= apps_gnucash_import_generic_matcher.schemas
-#GCONF_SCHEMAS+= apps_gnucash_dialog_hbci.schemas
-GCONF_SCHEMAS+= apps_gnucash_dialog_business_common.schemas
-
-.include "../../devel/GConf/schemas.mk"
+.include "../../devel/glib2/schemas.mk"
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../finance/libofx/buildlink3.mk"
diff --git a/finance/gnucash/PLIST b/finance/gnucash/PLIST
index 4c8163457a2..69da7d601b2 100644
--- a/finance/gnucash/PLIST
+++ b/finance/gnucash/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.48 2013/07/08 09:18:51 wiz Exp $
+@comment $NetBSD: PLIST,v 1.49 2014/01/02 01:25:49 ryoon Exp $
bin/gnc-fq-check
bin/gnc-fq-dump
bin/gnc-fq-helper
@@ -7,11 +7,9 @@ bin/gnucash
bin/gnucash-env
bin/gnucash-make-guids
bin/gnucash-valgrind
-bin/update-gnucash-gconf
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
@@ -25,7 +23,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
@@ -36,23 +37,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
@@ -63,9 +63,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
@@ -78,49 +81,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
@@ -134,27 +119,35 @@ 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-balances.h
include/gnucash/gnc-ui-util.h
include/gnucash/gnc-ui.h
include/gnucash/gnc-window.h
@@ -204,12 +197,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
@@ -220,7 +211,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
@@ -229,17 +219,17 @@ 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
+lib/gnucash/libgncmod-app-utils-python.la
lib/gnucash/libgncmod-app-utils.la
lib/gnucash/libgncmod-backend-xml.la
lib/gnucash/libgncmod-bi_import.la
-lib/gnucash/libgncmod-business-core.la
lib/gnucash/libgncmod-business-gnome.la
-lib/gnucash/libgncmod-business-utils.la
-lib/gnucash/libgncmod-calculation.la
-lib/gnucash/libgncmod-csv.la
-lib/gnucash/libgncmod-dialog-tax-table.la
+lib/gnucash/libgncmod-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
@@ -249,6 +239,7 @@ lib/gnucash/libgncmod-ledger-core.la
lib/gnucash/libgncmod-locale-reports-us.la
lib/gnucash/libgncmod-log-replay.la
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
@@ -262,6 +253,7 @@ lib/gnucash/libgncmod-utility-reports.la
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
@@ -275,25 +267,85 @@ ${PYSITELIB}/gnucash/gnucash_core_c.py
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
+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.2003
+share/doc/gnucash/ChangeLog.2004
+share/doc/gnucash/ChangeLog.2005
+share/doc/gnucash/ChangeLog.2006
+share/doc/gnucash/ChangeLog.2007
+share/doc/gnucash/ChangeLog.2008
+share/doc/gnucash/ChangeLog.2009
+share/doc/gnucash/ChangeLog.2010
+share/doc/gnucash/ChangeLog.2011
+share/doc/gnucash/ChangeLog.2012
+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
+share/doc/gnucash/Money95mfunds_fr.qif
+share/doc/gnucash/Money95stocks_fr.qif
+share/doc/gnucash/NEWS
+share/doc/gnucash/README
+share/doc/gnucash/README-de.win32-bin.txt
+share/doc/gnucash/README-fr.win32-bin.txt
+share/doc/gnucash/README-it.win32-bin.txt
+share/doc/gnucash/README-lv.win32-bin.txt
+share/doc/gnucash/README-nl.win32-bin.txt
+share/doc/gnucash/README-zh_CN.win32-bin.txt
+share/doc/gnucash/README-zh_TW.win32-bin.txt
+share/doc/gnucash/README.dependencies
+share/doc/gnucash/README.francais
+share/doc/gnucash/README.german
+share/doc/gnucash/README.win32-bin.txt
+share/doc/gnucash/README_invoice
+share/doc/gnucash/abc-all.qif
+share/doc/gnucash/abc.qif
+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/guile-hackers.txt
+share/doc/gnucash/invoice.csv
+share/doc/gnucash/ms-money.qif
+share/doc/gnucash/projects.html
+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/gconf/schemas/apps_gnucash_dialog_business_common.schemas
-share/gconf/schemas/apps_gnucash_dialog_commodities.schemas
-share/gconf/schemas/apps_gnucash_dialog_common.schemas
-share/gconf/schemas/apps_gnucash_dialog_prices.schemas
-share/gconf/schemas/apps_gnucash_dialog_print_checks.schemas
-share/gconf/schemas/apps_gnucash_dialog_reconcile.schemas
-share/gconf/schemas/apps_gnucash_dialog_scheduled_transctions.schemas
-share/gconf/schemas/apps_gnucash_dialog_totd.schemas
-share/gconf/schemas/apps_gnucash_general.schemas
-share/gconf/schemas/apps_gnucash_history.schemas
-share/gconf/schemas/apps_gnucash_import_generic_matcher.schemas
-share/gconf/schemas/apps_gnucash_import_qif.schemas
-share/gconf/schemas/apps_gnucash_warnings.schemas
-share/gconf/schemas/apps_gnucash_window_pages_account_tree.schemas
-share/gconf/schemas/apps_gnucash_window_pages_register.schemas
+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
+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
+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.gschema.xml
+share/glib-2.0/schemas/org.gnucash.history.gschema.xml
+share/glib-2.0/schemas/org.gnucash.warnings.gschema.xml
+share/glib-2.0/schemas/org.gnucash.window.pages.account.tree.gschema.xml
+share/glib-2.0/schemas/org.gnucash.window.pages.gschema.xml
share/gnucash/accounts/C/acctchrt_brokerage.gnucash-xea
share/gnucash/accounts/C/acctchrt_business.gnucash-xea
share/gnucash/accounts/C/acctchrt_carloan.gnucash-xea
@@ -645,114 +697,74 @@ share/gnucash/accounts/zh_CN/acctchrt_spouseretire.gnucash-xea
share/gnucash/checks/deluxe.chk
share/gnucash/checks/liberty.chk
share/gnucash/checks/quicken.chk
+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/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
-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/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-trans-import.glade
+share/gnucash/gtkbuilder/assistant-hierarchy.glade
+share/gnucash/gtkbuilder/assistant-loan.glade
+share/gnucash/gtkbuilder/assistant-qif-import.glade
+share/gnucash/gtkbuilder/assistant-stock-split.glade
+share/gnucash/gtkbuilder/assistant-xml-encoding.glade
+share/gnucash/gtkbuilder/business-options-gnome.glade
+share/gnucash/gtkbuilder/business-prefs.glade
+share/gnucash/gtkbuilder/dialog-account-picker.glade
+share/gnucash/gtkbuilder/dialog-account.glade
+share/gnucash/gtkbuilder/dialog-bi-import-gui.glade
+share/gnucash/gtkbuilder/dialog-billterms.glade
+share/gnucash/gtkbuilder/dialog-book-close.glade
+share/gnucash/gtkbuilder/dialog-choose-owner.glade
+share/gnucash/gtkbuilder/dialog-commodities.glade
+share/gnucash/gtkbuilder/dialog-commodity.glade
+share/gnucash/gtkbuilder/dialog-custom-report.glade
+share/gnucash/gtkbuilder/dialog-customer-import-gui.glade
+share/gnucash/gtkbuilder/dialog-customer.glade
+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-import.glade
+share/gnucash/gtkbuilder/dialog-invoice.glade
+share/gnucash/gtkbuilder/dialog-job.glade
+share/gnucash/gtkbuilder/dialog-lot-viewer.glade
+share/gnucash/gtkbuilder/dialog-new-user.glade
+share/gnucash/gtkbuilder/dialog-object-references.glade
+share/gnucash/gtkbuilder/dialog-options.glade
+share/gnucash/gtkbuilder/dialog-order.glade
+share/gnucash/gtkbuilder/dialog-payment.glade
+share/gnucash/gtkbuilder/dialog-preferences.glade
+share/gnucash/gtkbuilder/dialog-price.glade
+share/gnucash/gtkbuilder/dialog-print-check.glade
+share/gnucash/gtkbuilder/dialog-progress.glade
+share/gnucash/gtkbuilder/dialog-query-view.glade
+share/gnucash/gtkbuilder/dialog-report.glade
+share/gnucash/gtkbuilder/dialog-reset-warnings.glade
+share/gnucash/gtkbuilder/dialog-search.glade
+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-transfer.glade
+share/gnucash/gtkbuilder/dialog-userpass.glade
+share/gnucash/gtkbuilder/dialog-vendor.glade
+share/gnucash/gtkbuilder/gnc-date-format.glade
+share/gnucash/gtkbuilder/gnc-frequency.glade
+share/gnucash/gtkbuilder/gnc-plugin-page-budget.glade
+share/gnucash/gtkbuilder/gnc-plugin-page-register.glade
+share/gnucash/gtkbuilder/gnc-plugin-page-register2.glade
+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/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
@@ -781,6 +793,9 @@ 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/report-system/collectors.scm
+share/gnucash/guile-modules/gnucash/report/report-system/list-extras.scm
+share/gnucash/guile-modules/gnucash/report/report-system/report-collectors.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
@@ -822,6 +837,41 @@ 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/gnucash/unittest-support.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/jqplot/jqplot.BezierCurveRenderer.js
+share/gnucash/jqplot/jqplot.barRenderer.js
+share/gnucash/jqplot/jqplot.blockRenderer.js
+share/gnucash/jqplot/jqplot.bubbleRenderer.js
+share/gnucash/jqplot/jqplot.canvasAxisLabelRenderer.js
+share/gnucash/jqplot/jqplot.canvasAxisTickRenderer.js
+share/gnucash/jqplot/jqplot.canvasTextRenderer.js
+share/gnucash/jqplot/jqplot.categoryAxisRenderer.js
+share/gnucash/jqplot/jqplot.ciParser.js
+share/gnucash/jqplot/jqplot.cursor.js
+share/gnucash/jqplot/jqplot.dateAxisRenderer.js
+share/gnucash/jqplot/jqplot.donutRenderer.js
+share/gnucash/jqplot/jqplot.dragable.js
+share/gnucash/jqplot/jqplot.enhancedLegendRenderer.js
+share/gnucash/jqplot/jqplot.funnelRenderer.js
+share/gnucash/jqplot/jqplot.highlighter.js
+share/gnucash/jqplot/jqplot.json2.js
+share/gnucash/jqplot/jqplot.logAxisRenderer.js
+share/gnucash/jqplot/jqplot.mekkoAxisRenderer.js
+share/gnucash/jqplot/jqplot.mekkoRenderer.js
+share/gnucash/jqplot/jqplot.meterGaugeRenderer.js
+share/gnucash/jqplot/jqplot.ohlcRenderer.js
+share/gnucash/jqplot/jqplot.pieRenderer.js
+share/gnucash/jqplot/jqplot.pointLabels.js
+share/gnucash/jqplot/jqplot.trendline.js
+share/gnucash/jqplot/jquery.jqplot.css
+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
@@ -832,6 +882,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
+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
@@ -866,16 +918,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
+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
-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
@@ -888,6 +946,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
+share/gnucash/scm/html-jqplot.scm
share/gnucash/scm/html-linechart.scm
share/gnucash/scm/html-piechart.scm
share/gnucash/scm/html-scatter.scm
@@ -896,7 +955,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
+share/gnucash/scm/migrate-prefs.scm
share/gnucash/scm/options-utilities.scm
share/gnucash/scm/options.scm
share/gnucash/scm/prefs.scm
@@ -923,27 +982,37 @@ share/gnucash/tip_of_the_day.list
share/gnucash/ui/gnc-main-window-ui.xml
share/gnucash/ui/gnc-plugin-account-tree-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-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-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-file-history-ui.xml
share/gnucash/ui/gnc-plugin-log-replay-ui.xml
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
share/gnucash/ui/gnc-plugin-page-invoice-ui.xml
+share/gnucash/ui/gnc-plugin-page-owner-tree-ui.xml
share/gnucash/ui/gnc-plugin-page-register-ui.xml
+share/gnucash/ui/gnc-plugin-page-register2-ui.xml
share/gnucash/ui/gnc-plugin-page-report-ui.xml
share/gnucash/ui/gnc-plugin-page-sx-list-ui.xml
+share/gnucash/ui/gnc-plugin-page-sx-list2-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
+share/gnucash/ui/gnc-plugin-register2-ui.xml
+share/gnucash/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
+share/gnucash/ui/gnc-windows-menu-ui-quartz.xml
+share/gnucash/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
@@ -955,6 +1024,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
diff --git a/finance/gnucash/distinfo b/finance/gnucash/distinfo
index 3c6b04e4dd6..e4d9d717ae9 100644
--- a/finance/gnucash/distinfo
+++ b/finance/gnucash/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.59 2013/07/29 18:16:53 wiz Exp $
+$NetBSD: distinfo,v 1.60 2014/01/02 01:25:49 ryoon Exp $
-SHA1 (gnucash-2.4.13.tar.bz2) = cd28d4e7d84d71ade56173734d634ccadc59ed81
-RMD160 (gnucash-2.4.13.tar.bz2) = 5d6c9dc836ccdf7b4613523004bb5a297eb70f97
-Size (gnucash-2.4.13.tar.bz2) = 9400405 bytes
-SHA1 (patch-configure) = a7fb5175e4f79a30da8b7e64d6f1a3ecd458fad8
+SHA1 (gnucash-2.6.0.tar.bz2) = 9715468bbe9e4cef6559bfa9825d51ac10d6ff84
+RMD160 (gnucash-2.6.0.tar.bz2) = 157279328ed614fa9ee020348525c3b210881007
+Size (gnucash-2.6.0.tar.bz2) = 10691364 bytes
SHA1 (patch-src_scm_price-quotes.scm) = 59273628b7271ed639a97636b76958baa45ef104
diff --git a/finance/gnucash/patches/patch-configure b/finance/gnucash/patches/patch-configure
deleted file mode 100644
index 122c5f70f71..00000000000
--- a/finance/gnucash/patches/patch-configure
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-configure,v 1.3 2013/07/29 10:38:54 wiz Exp $
-
-Test guile-www by using its http module, the main module is
-removed since 2.37.
-
-Fix unportable test(1) construct.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=686830
-
---- configure.orig 2013-04-20 21:07:33.000000000 +0000
-+++ configure
-@@ -21347,10 +21347,10 @@ fi
-
-
-
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if (www main) is available" >&5
--$as_echo_n "checking if (www main) is available... " >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if (www http) is available" >&5
-+$as_echo_n "checking if (www http) is available... " >&6; }
-
-- $GUILE -c "(use-modules (www main)) (exit ((lambda () 0)))" > /dev/null 2>&1
-+ $GUILE -c "(use-modules (www http)) (exit ((lambda () 0)))" > /dev/null 2>&1
- gnc_have_guile_www=$?
-
- if test "$gnc_have_guile_www" = "0" ; then gnc_have_guile_www=yes ; else gnc_have_guile_www=no ; fi
-@@ -21807,7 +21807,7 @@ else
- CUSTOM_GNC_DBD_DIR_FALSE=
- fi
-
-- if test "x$ac_cv_header_dbi_dbi_h" == xyes; then
-+ if test "x$ac_cv_header_dbi_dbi_h" = xyes; then
- WITH_DBI_TRUE=
- WITH_DBI_FALSE='#'
- else