Update to 1.8.10.

Changes:
1.8.10 - 11 Dec 2004
 o Don't use C++/C99 declarations.  Declare variables at the top of
 the function.
 o Updated British English, Czech, Italian, Russian, German,
 Brazilian Portugese, Dutch, French, Spanish, translations.
 o Fabien COELHO's zero-balance patch to remove accounts of zero
 balance from the report.
 o Fix a broken recursion problem.  Don't call show-acct? from
 use-acct? so we don't recurse ad flictum.  This recursive call isn't
 necessary, just have use-acct? recurse unto itself.
 o look in ${srcdir} for build-config.scm.in
 o Work around problems with libltdl3.
 o don't automatically try to (require 'format), so gnucash will build
 on an slib-3 system.
 o Added quote sources for Indian Mutual Funds.
 o Skip the case when a token is the empty string. This caused many
 warnings about a NULL kvp_frame lookup.
 o Luigi Ballabio's automake patch to gnucash.m4
 o guile-1.6 complains about string->symbol when passed a symbol.
 o applied Vasil's patch to improve the transaction report for HTML
 export purposes.
 o Backport of CVS-head changes to improve register open performance
 when working with large account trees (>500 accounts).  The new code
 caches the quickfill tree so that it is shared by all register
 windows.
 o create gnc:current-saved-reports, as the file to store saved
 reports from cstim.  Autoload the saved-reports file at startup
 (after config.user/config.auto is loaded).
 o Added gnc:report-generate-saved-forms that will generate the scheme
 code necessary to create a new report from the saved options of an
 old report.
 o Added example Menu item "File -> Save all reports" that will call
 the new report saving function for all reports. This would need more
 work so that not all reports are saved but only the currently
 selected one -- any volunteer may feel free to add that.
 o Fix saving of report: It now appends to
 ~/.gnucash/saved-reports-1.8 Statusbar tip is now more verbose.
 o Add toolbar element for saving the current report.
 o Add function for saving one particular report to the
 ~/.gnucash/saved-reports-1.8 file. Add extra menu only for customized
 reports.
 o Remove the previous function for saving all reports since it is no
 longer necessary.
 o Apply David Reiser's patch for Quicken(tm) cheques with stub.
 o Apply David Grant's patch to add TD Efunds.
 o make the desktop file HIG compliant.
 o change the gtkhtml order to search for >= 1.1 before < 1.1, in
 order to try to fix #84707 on systems with multiple versions of
 gtkhtml.
 o Perry Smith's Null Account Patch.  Make sure the security is a real
 string before appending an account separator, so we don't try to
 create a "null" account.
 o Add option to include zero-amount splits in computations.
 o fix xaccAccountGetBalanceAsOfDate() to properly compute the balance
 at the end of the split list.
 o Major change for HBCI, back-ported from HEAD. The HBCI online
 banking is no longer based on the openhbci library but instead on the
 aqbanking library http://sf.net/projects/aqbanking which is Martin
 Preuss' successor of openhbci. This means that now aqbanking-0.9.5 is
 required instead of any openhbci package.
 o Fixes for x86_64
 o Update for new LibOfx, this among other things, gives gnucash
 Microsoft OFC support.
 o Duplicate match tweaks in import code
 o Andreas Rottmann's patch to support g-wrap 1.9.
 o provide a default account name so we don't crash when someone
 imports a broken QIF that has a !Account without an account name.
 o Daniel Lindenaar's patch to implement a check-box in the Invoice
 Post Dialog (with a default in the File Preferences) to choose to
 accumulate splits when posting an invoice, or post a 1:1 mapping.
 o Phil Longstaff's patch to prevent duplicate pricedb entries.
 o Heath Martin's x86_64 patch
 o Mark search criteria for translation -- somehow this had been
 missed all the time.
 o Change currency mnemonic for "New Israeli Shekel" from "ILS" to
 "NIS".
 o Identified and fixed several places with untranslated strings.
 o Add configure check for libofx version 0.7.0 and respective error
 message. Update docs.
 o Improve importer performance by matching imported transactions only
 against transactions in the proper time interval.
 o send an event when a payment is processed so the invoice gets
 updated as "paid" in the search window.
 o Make sure we set the proper search-type when we create the query,
 otherwise the search will fail later.

Package changes:
. install documentation in share/doc instead of share/doc/html
. cleanup of the Makefile

7 files changed, 110 insertions, 131 deletions

diff --git a/finance/gnucash/Makefile b/finance/gnucash/Makefile
index fea223d1bf0..f0d3d94693d 100644
--- a/finance/gnucash/Makefile
+++ b/finance/gnucash/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.76 2004/12/04 16:24:17 wiz Exp $
+# $NetBSD: Makefile,v 1.77 2004/12/26 21:34:46 wiz Exp $
 
-DISTNAME=		gnucash-1.8.9
-PKGREVISION=		5
+DISTNAME=		gnucash-1.8.10
 CATEGORIES=		finance
 MASTER_SITES=		ftp://ftp.gnucash.org/pub/gnucash/sources/stable/ \
 			${MASTER_SITE_SOURCEFORGE:=gnucash/}
@@ -26,49 +25,23 @@ GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--without-included-gettext
 CONFIGURE_ARGS+=	--with-perl-includes=${PERL5_ARCHLIB}
 CONFIGURE_ARGS+=	--with-libiconv-prefix=${BUILDLINK_PREFIX.iconv}
-CONFIGURE_ENV+=		PKG_CONFIG_PATH="${PREFIX}/lib/pkgconfig:${X11BASE}/lib/pkgconfig"
 
 # code is using char/unsigned char inconsistently
 BUILDLINK_TRANSFORM+=  rm:-Werror
 
 AM_MAKEFLAGS=		LIBTOOL='${LIBTOOL} ${LIBTOOL_FLAGS}'
-MAKE_ENV+=		AM_MAKEFLAGS="${AM_MAKEFLAGS}"
+MAKE_ENV+=		AM_MAKEFLAGS=${AM_MAKEFLAGS:Q}
 
 INFO_FILES=		gnucash-design.info
 
-# 1.8.9 includes empty info file, so we must rebuild it
-USE_MAKEINFO=		yes
-
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "NetBSD"
-post-wrapper:
-	if [ ! -f /usr/include/wctype.h ]; then				\
-		${TOUCH} ${BUILDLINK_DIR}/include/wctype.h;		\
-	fi
-.endif
-
-post-extract:
-	cd ${WRKSRC}/src/doc/design/ && \
-		${MAKEINFO} ${INFO_FILES:S/.info/.texinfo/}
-
-GNUCASH_GUILE_MAKEFILE_IN_FILES= \
-	src/app-file/Makefile.in src/app-utils/Makefile.in \
-	src/business/business-core/Makefile.in \
-	src/business/business-gnome/Makefile.in \
-	src/business/dialog-tax-table/Makefile.in \
-	src/core-utils/Makefile.in \
-	src/engine/Makefile.in \
-	src/gnc-module/Makefile.in \
-	src/gnc-module/test/mod-bar/Makefile.in \
-	src/gnc-module/test/mod-baz/Makefile.in \
-	src/gnc-module/test/mod-foo/Makefile.in \
-	src/gnome-search/Makefile.in \
-	src/gnome-utils/Makefile.in \
-	src/gnome/Makefile.in \
-	src/import-export/binary-import/Makefile.in \
-	src/register/register-core/Makefile.in \
-	src/report/report-gnome/Makefile.in
+#.if ${OPSYS} == "NetBSD"
+#post-wrapper:
+#	if [ ! -f /usr/include/wctype.h ]; then				\
+#		${TOUCH} ${BUILDLINK_DIR}/include/wctype.h;		\
+#	fi
+#.endif
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/gal/buildlink3.mk"
diff --git a/finance/gnucash/PLIST b/finance/gnucash/PLIST
index d0786d858e0..8a0876d38e3 100644
--- a/finance/gnucash/PLIST
+++ b/finance/gnucash/PLIST
@@ -1,29 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2004/12/04 16:24:17 wiz Exp $
-${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/gnucash.mo
-${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/gnucash.mo
-${PKGLOCALEDIR}/locale/da/LC_MESSAGES/gnucash.mo
-${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gnucash.mo
-${PKGLOCALEDIR}/locale/el/LC_MESSAGES/gnucash.mo
-${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/gnucash.mo
-${PKGLOCALEDIR}/locale/es/LC_MESSAGES/gnucash.mo
-${PKGLOCALEDIR}/locale/es_NI/LC_MESSAGES/gnucash.mo
-${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gnucash.mo
-${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/gnucash.mo
-${PKGLOCALEDIR}/locale/it/LC_MESSAGES/gnucash.mo
-${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/gnucash.mo
-${PKGLOCALEDIR}/locale/nb/LC_MESSAGES/gnucash.mo
-${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gnucash.mo
-${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/gnucash.mo
-${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/gnucash.mo
-${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/gnucash.mo
-${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/gnucash.mo
-${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/gnucash.mo
-${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/gnucash.mo
-${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gnucash.mo
-${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/gnucash.mo
-${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/gnucash.mo
-${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/gnucash.mo
-${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gnucash.mo
+@comment $NetBSD: PLIST,v 1.17 2004/12/26 21:34:47 wiz Exp $
 bin/dump-finance-quote
 bin/gnc-prices
 bin/gnc-test-env
@@ -49,6 +24,7 @@ include/gnucash/SchedXaction.h
 include/gnucash/Scrub.h
 include/gnucash/TransLog.h
 include/gnucash/Transaction.h
+include/gnucash/account-quickfill.h
 include/gnucash/basiccell.h
 include/gnucash/cell-factory.h
 include/gnucash/cellblock.h
@@ -199,48 +175,50 @@ libexec/gnucash/overrides/guile
 man/man1/gnc-prices.1
 man/man1/gnucash.1
 share/aclocal/gnucash.m4
-share/doc/html/gnucash/Account_8h.html
-share/doc/html/gnucash/SchedXaction_8h.html
-share/doc/html/gnucash/Transaction_8h.html
-share/doc/html/gnucash/TransLog_8h.html
-share/doc/html/gnucash/annotated.html
-share/doc/html/gnucash/classes.html
-share/doc/html/gnucash/date_8h.html
-share/doc/html/gnucash/doxygen.css
-share/doc/html/gnucash/doxygen.gif
-share/doc/html/gnucash/files.html
-share/doc/html/gnucash/functions.html
-share/doc/html/gnucash/globals.html
-share/doc/html/gnucash/gnc-hbci-trans-templ_8h.html
-share/doc/html/gnucash/gnc-log-replay_8h.html
-share/doc/html/gnucash/gnc-ofx-import_8h.html
-share/doc/html/gnucash/gnc-pricedb_8h.html
-share/doc/html/gnucash/gnc-ui-util_8h.html
-share/doc/html/gnucash/group__Date.html
-share/doc/html/gnucash/group__Engine.html
-share/doc/html/gnucash/group__Import__Export.html
-share/doc/html/gnucash/group__UI.html
-share/doc/html/gnucash/import-account-matcher_8h.html
-share/doc/html/gnucash/import-backend_8h.html
-share/doc/html/gnucash/import-commodity-matcher_8h.html
-share/doc/html/gnucash/import-main-matcher_8h.html
-share/doc/html/gnucash/import-match-map_8h.html
-share/doc/html/gnucash/import-match-picker_8h.html
-share/doc/html/gnucash/import-settings_8h.html
-share/doc/html/gnucash/import-utilities_8h.html
-share/doc/html/gnucash/index.html
-share/doc/html/gnucash/modules.html
-share/doc/html/gnucash/structGNCDateEdit.html
-share/doc/html/gnucash/struct__FormulaCell.html
-share/doc/html/gnucash/struct__GNCFrequency.html
-share/doc/html/gnucash/struct__temporalStateData.html
-share/doc/html/gnucash/structaccount__group__s.html
-share/doc/html/gnucash/structaccount__s.html
-share/doc/html/gnucash/structgnc__template__xaction__data.html
-share/doc/html/gnucash/structgncp__SchedXaction.html
-share/doc/html/gnucash/structgncp__freq__spec.html
-share/doc/html/gnucash/structsplit__s.html
-share/doc/html/gnucash/structtimespec64.html
+share/doc/gnucash/Account_8h.html
+share/doc/gnucash/SchedXaction_8h.html
+share/doc/gnucash/TransLog_8h.html
+share/doc/gnucash/Transaction_8h.html
+share/doc/gnucash/annotated.html
+share/doc/gnucash/classes.html
+share/doc/gnucash/combocell_8h.html
+share/doc/gnucash/date_8h.html
+share/doc/gnucash/doxygen.css
+share/doc/gnucash/doxygen.gif
+share/doc/gnucash/files.html
+share/doc/gnucash/functions.html
+share/doc/gnucash/globals.html
+share/doc/gnucash/gnc-hbci-trans-templ_8h.html
+share/doc/gnucash/gnc-log-replay_8h.html
+share/doc/gnucash/gnc-ofx-import_8h.html
+share/doc/gnucash/gnc-pricedb_8h.html
+share/doc/gnucash/gnc-ui-util_8h.html
+share/doc/gnucash/group__Account__Quickfill.html
+share/doc/gnucash/group__Date.html
+share/doc/gnucash/group__Engine.html
+share/doc/gnucash/group__Import__Export.html
+share/doc/gnucash/group__UI.html
+share/doc/gnucash/import-account-matcher_8h.html
+share/doc/gnucash/import-backend_8h.html
+share/doc/gnucash/import-commodity-matcher_8h.html
+share/doc/gnucash/import-main-matcher_8h.html
+share/doc/gnucash/import-match-map_8h.html
+share/doc/gnucash/import-match-picker_8h.html
+share/doc/gnucash/import-settings_8h.html
+share/doc/gnucash/import-utilities_8h.html
+share/doc/gnucash/index.html
+share/doc/gnucash/modules.html
+share/doc/gnucash/structGNCDateEdit.html
+share/doc/gnucash/struct__FormulaCell.html
+share/doc/gnucash/struct__GNCFrequency.html
+share/doc/gnucash/struct__temporalStateData.html
+share/doc/gnucash/structaccount__group__s.html
+share/doc/gnucash/structaccount__s.html
+share/doc/gnucash/structgnc__template__xaction__data.html
+share/doc/gnucash/structgncp__SchedXaction.html
+share/doc/gnucash/structgncp__freq__spec.html
+share/doc/gnucash/structsplit__s.html
+share/doc/gnucash/structtimespec64.html
 share/examples/gnucash/Money95bank_fr.qif
 share/examples/gnucash/Money95invst_fr.qif
 share/examples/gnucash/Money95mfunds_fr.qif
@@ -323,6 +301,7 @@ share/gnucash/accounts/es_ES/acctchrt_retiremt.gnucash-xea
 share/gnucash/accounts/es_ES/acctchrt_spouseinc.gnucash-xea
 share/gnucash/accounts/es_ES/acctchrt_spouseretire.gnucash-xea
 share/gnucash/accounts/fr_FR/acctchrt_brokerage.gnucash-xea
+share/gnucash/accounts/fr_FR/acctchrt_business.gnucash-xea
 share/gnucash/accounts/fr_FR/acctchrt_carloan.gnucash-xea
 share/gnucash/accounts/fr_FR/acctchrt_cdmoneymkt.gnucash-xea
 share/gnucash/accounts/fr_FR/acctchrt_childcare.gnucash-xea
@@ -606,6 +585,31 @@ share/gnucash/scm/tip-of-the-day.scm
 share/gnucash/scm/txf-help.scm
 share/gnucash/scm/txf.scm
 share/gnucash/scm/xml-generator.scm
+${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/gnucash.mo
+${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/gnucash.mo
+${PKGLOCALEDIR}/locale/da/LC_MESSAGES/gnucash.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gnucash.mo
+${PKGLOCALEDIR}/locale/el/LC_MESSAGES/gnucash.mo
+${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/gnucash.mo
+${PKGLOCALEDIR}/locale/es/LC_MESSAGES/gnucash.mo
+${PKGLOCALEDIR}/locale/es_NI/LC_MESSAGES/gnucash.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gnucash.mo
+${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/gnucash.mo
+${PKGLOCALEDIR}/locale/it/LC_MESSAGES/gnucash.mo
+${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/gnucash.mo
+${PKGLOCALEDIR}/locale/nb/LC_MESSAGES/gnucash.mo
+${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gnucash.mo
+${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/gnucash.mo
+${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/gnucash.mo
+${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/gnucash.mo
+${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/gnucash.mo
+${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/gnucash.mo
+${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gnucash.mo
+${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/gnucash.mo
+${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/gnucash.mo
+${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/gnucash.mo
+${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/gnucash.mo
+${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gnucash.mo
 share/mime-info/gnucash.keys
 share/mime-info/gnucash.mime
 share/pixmaps/gnucash/gnucash-icon.png
@@ -621,6 +625,7 @@ share/pixmaps/gnucash/stock_split_watermark.png
 @dirrm share/gnucash/scm/generic-import
 @dirrm share/gnucash/scm
 @dirrm share/gnucash/guile-modules/www
+@exec ${MKDIR} %D/share/gnucash/guile-modules/srfi
 @dirrm share/gnucash/guile-modules/srfi
 @dirrm share/gnucash/guile-modules/gnucash/tax
 @dirrm share/gnucash/guile-modules/gnucash/report/locale-specific
@@ -647,7 +652,7 @@ share/pixmaps/gnucash/stock_split_watermark.png
 @dirrm share/gnucash/accounts/C
 @dirrm share/gnucash/accounts
 @dirrm share/gnucash
-@dirrm share/doc/html/gnucash
+@dirrm share/doc/gnucash
 @dirrm share/examples/gnucash
 @dirrm libexec/gnucash/overrides
 @dirrm libexec/gnucash
diff --git a/finance/gnucash/distinfo b/finance/gnucash/distinfo
index f8928712ad9..f995ea7d160 100644
--- a/finance/gnucash/distinfo
+++ b/finance/gnucash/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.22 2004/12/04 16:24:17 wiz Exp $
+$NetBSD: distinfo,v 1.23 2004/12/26 21:34:47 wiz Exp $
 
-SHA1 (gnucash-1.8.9.tar.gz) = d6006916319e31d715963d07f483024cef7a6b86
-Size (gnucash-1.8.9.tar.gz) = 7786000 bytes
+SHA1 (gnucash-1.8.10.tar.gz) = ac93b4a0b82a9548f350a780e7f166aa9c2442f5
+Size (gnucash-1.8.10.tar.gz) = 7790243 bytes
 SHA1 (patch-aa) = ad7ed5fdb10f28094e9121092da85095ba592fd1
-SHA1 (patch-ba) = db2d448e35086a758256ceb0c33599a7bca61c1d
-SHA1 (patch-be) = 761cdeed7e055e29edb4483534abb31e83f7222e
-SHA1 (patch-bf) = f51620ab3f2009a735c2977eac72da1cbe6a862f
-SHA1 (patch-bg) = 6e3adbf15d71f1bec0d3344788db05c3fe11b860
+SHA1 (patch-ba) = b3012a1319f99f607558c7064b54f9c1b643217d
+SHA1 (patch-be) = aa8dd654d61f352fbfc1d86b518e13ef3e39c436
+SHA1 (patch-bf) = 799caa1e13d2215474add8003fb368c4fce99cb8
+SHA1 (patch-bg) = bbee2bdbee96b8cf72eb7c61c2531a8113bad3fc
diff --git a/finance/gnucash/patches/patch-ba b/finance/gnucash/patches/patch-ba
index 47ae8583afc..f9478bd0074 100644
--- a/finance/gnucash/patches/patch-ba
+++ b/finance/gnucash/patches/patch-ba
@@ -1,7 +1,8 @@
-$NetBSD: patch-ba,v 1.4 2003/12/30 16:46:04 cjep Exp $
---- Makefile.in.orig	2003-11-18 01:16:03.000000000 -0500
-+++ Makefile.in	2003-12-11 16:18:36.000000000 -0500
-@@ -227,7 +227,7 @@
+$NetBSD: patch-ba,v 1.5 2004/12/26 21:34:47 wiz Exp $
+
+--- Makefile.in.orig	2004-12-13 01:40:40.000000000 +0100
++++ Makefile.in
+@@ -230,7 +230,7 @@ enable_dot = @enable_dot@
  enable_html_docs = @enable_html_docs@
  enable_latex_docs = @enable_latex_docs@
  
diff --git a/finance/gnucash/patches/patch-be b/finance/gnucash/patches/patch-be
index dc6f99632e7..321f75964fd 100644
--- a/finance/gnucash/patches/patch-be
+++ b/finance/gnucash/patches/patch-be
@@ -1,8 +1,8 @@
-$NetBSD: patch-be,v 1.1 2003/02/27 04:08:25 jschauma Exp $
+$NetBSD: patch-be,v 1.2 2004/12/26 21:34:47 wiz Exp $
 
---- src/doc/Makefile.in.orig	Mon Feb 10 02:47:37 2003
-+++ src/doc/Makefile.in	Wed Feb 26 15:34:46 2003
-@@ -258,7 +258,7 @@
+--- src/doc/Makefile.in.orig	2004-12-13 01:40:58.000000000 +0100
++++ src/doc/Makefile.in
+@@ -262,7 +262,7 @@ EXTRA_DIST = \
    user-prefs-howto.txt
  
  
@@ -11,16 +11,16 @@ $NetBSD: patch-be,v 1.1 2003/02/27 04:08:25 jschauma Exp $
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = ../../config.h
  CONFIG_CLEAN_FILES = 
-@@ -489,10 +489,10 @@
+@@ -493,10 +493,10 @@ maintainer-clean-local:
  	rm -f refman.pdf
  
  install-data-hook:
 -	$(mkinstalldirs) $(DESTDIR)$(docdir)/html
-+	$(mkinstalldirs) $(DESTDIR)$(docdir)/html/gnucash
++	$(mkinstalldirs) $(DESTDIR)$(docdir)/gnucash
  	mkdir -p html #Workaround to allow libofx-cvs user to install without doc.
  #	cp -rp $(srcdir)/html ${docdir}
 -	cp -rp html $(DESTDIR)$(docdir)/html
-+	cp -p html/* $(DESTDIR)$(docdir)/html/gnucash
++	cp -p html/* $(DESTDIR)$(docdir)/gnucash
  
  uninstall-hook:
  	rm -rf ${docdir}/html
diff --git a/finance/gnucash/patches/patch-bf b/finance/gnucash/patches/patch-bf
index e792cd4ea3b..e7da2728e5e 100644
--- a/finance/gnucash/patches/patch-bf
+++ b/finance/gnucash/patches/patch-bf
@@ -1,8 +1,8 @@
-$NetBSD: patch-bf,v 1.3 2003/07/13 22:32:12 mjl Exp $
+$NetBSD: patch-bf,v 1.4 2004/12/26 21:34:47 wiz Exp $
 
---- src/quotes/Makefile.in.orig	2003-05-26 06:16:03.000000000 +0200
-+++ src/quotes/Makefile.in	2003-07-13 23:17:08.000000000 +0200
-@@ -231,7 +231,7 @@
+--- src/quotes/Makefile.in.orig	2004-12-13 01:42:43.000000000 +0100
++++ src/quotes/Makefile.in
+@@ -234,7 +234,7 @@ enable_latex_docs = @enable_latex_docs@
  
  gncsharedir = ${GNC_SHAREDIR}
  
diff --git a/finance/gnucash/patches/patch-bg b/finance/gnucash/patches/patch-bg
index 3a6cc57f7f4..4136ce0c5af 100644
--- a/finance/gnucash/patches/patch-bg
+++ b/finance/gnucash/patches/patch-bg
@@ -1,8 +1,8 @@
-$NetBSD: patch-bg,v 1.1 2003/02/27 04:08:25 jschauma Exp $
+$NetBSD: patch-bg,v 1.2 2004/12/26 21:34:47 wiz Exp $
 
---- doc/examples/Makefile.in.orig	Tue Feb 25 22:00:08 2003
-+++ doc/examples/Makefile.in	Tue Feb 25 22:02:40 2003
-@@ -228,7 +228,7 @@
+--- doc/examples/Makefile.in.orig	2004-12-13 01:40:48.000000000 +0100
++++ doc/examples/Makefile.in
+@@ -232,7 +232,7 @@ enable_dot = @enable_dot@
  enable_html_docs = @enable_html_docs@
  enable_latex_docs = @enable_latex_docs@