Update to 1.8.5:

 1.8.5  - 11 Dec 2004
 	 o general-customization.xsl patch from Johan Buret
	 o David Harrison's updates to ch_dep.xml
	 o Add outline for German translation of gnucash guide.
	 o chapter overhaul by pks
	 o update language support list

5 files changed, 42 insertions, 35 deletions

diff --git a/finance/gnucash-docs/Makefile b/finance/gnucash-docs/Makefile
index d7d9c682ac9..84e081613ee 100644
--- a/finance/gnucash-docs/Makefile
+++ b/finance/gnucash-docs/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2004/11/26 22:40:00 jdolecek Exp $
+# $NetBSD: Makefile,v 1.5 2005/02/09 20:22:08 wiz Exp $
 
-DISTNAME=		gnucash-docs-1.8.4
-PKGREVISION=		2
+DISTNAME=		gnucash-docs-1.8.5
 CATEGORIES=		finance
 MASTER_SITES=		http://www.gnucash.org/pub/gnucash/sources/stable/ \
 			${MASTER_SITE_SOURCEFORGE:=gnucash/}
@@ -10,6 +9,11 @@ MAINTAINER=		jdolecek@NetBSD.org
 HOMEPAGE=		http://www.gnucash.org/
 COMMENT=		Documentation for GnuCash - personal double-entry accounting program
 
+BUILD_DEPENDS=			docbook-xsl-[0-9]*:../../textproc/docbook-xsl
+
+BUILDLINK_DEPMETHOD.libxml2=	build
+BUILDLINK_DEPMETHOD.libxslt=	build
+
 USE_DIRS+=		gnome1-1.5
 USE_GNU_TOOLS+=		make
 USE_X11=		YES
@@ -20,12 +24,8 @@ USE_PKGLOCALEDIR=	YES
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--with-perl-includes=${PERL5_ARCHLIB}
 
-BUILD_DEPENDS=			docbook-xsl-[0-9]*:../../textproc/docbook-xsl
-
-BUILDLINK_DEPMETHOD.libxml2=	build
-BUILDLINK_DEPMETHOD.libxslt=	build
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
-.include "../../textproc/scrollkeeper/buildlink3.mk"
+.include "../../textproc/scrollkeeper/omf.mk"
 .include "../../mk/bdb.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/finance/gnucash-docs/PLIST b/finance/gnucash-docs/PLIST
index d9664a2b0f2..fa7bac640ab 100644
--- a/finance/gnucash-docs/PLIST
+++ b/finance/gnucash-docs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/10/23 10:40:35 jdolecek Exp $
+@comment $NetBSD: PLIST,v 1.2 2005/02/09 20:22:08 wiz Exp $
 share/gnome/help/gnucash/C/appendixa.xml
 share/gnome/help/gnucash/C/appendixb.xml
 share/gnome/help/gnucash/C/appendixc.xml
@@ -382,10 +382,22 @@ share/gnome/help/gnucash/C/txf-categories.xml
 share/gnome/help/gnucash/de_DE/chartofaccts.xml
 share/gnome/help/gnucash/de_DE/chtacctseg.xml
 share/gnome/help/gnucash/de_DE/fdl-appendix.xml
+share/gnome/help/gnucash/de_DE/figures/basics_accounts.png
 share/gnome/help/gnucash/de_DE/figures/home.png
 share/gnome/help/gnucash/de_DE/figures/left.png
 share/gnome/help/gnucash/de_DE/figures/right.png
 share/gnome/help/gnucash/de_DE/figures/up.png
+share/gnome/help/gnucash/de_DE/gnucash-guide.xml
+share/gnome/help/gnucash/de_DE/gnucash-guide/figures/basics_accounts.png
+share/gnome/help/gnucash/de_DE/gnucash-guide/index.html
+share/gnome/help/gnucash/de_DE/gnucash-guide/stylesheet/caution.png
+share/gnome/help/gnucash/de_DE/gnucash-guide/stylesheet/gnome-money.png
+share/gnome/help/gnucash/de_DE/gnucash-guide/stylesheet/gnucash-icon.png
+share/gnome/help/gnucash/de_DE/gnucash-guide/stylesheet/important.png
+share/gnome/help/gnucash/de_DE/gnucash-guide/stylesheet/note.png
+share/gnome/help/gnucash/de_DE/gnucash-guide/stylesheet/tip.png
+share/gnome/help/gnucash/de_DE/gnucash-guide/stylesheet/warning.png
+share/gnome/help/gnucash/de_DE/gnucash-guide/titlepage.html
 share/gnome/help/gnucash/de_DE/gnucash-help.xml
 share/gnome/help/gnucash/de_DE/gnucash-help/custom-gnucash.html
 share/gnome/help/gnucash/de_DE/gnucash-help/fdl-preamble.html
@@ -420,26 +432,26 @@ share/gnome/help/gnucash/de_DE/gnucash-help/usage.html
 share/gnome/help/gnucash/de_DE/legal.xml
 share/gnome/help/gnucash/de_DE/txf-categories.xml
 share/omf/gnucash-docs/gnucash-guide-C.omf
-@exec scrollkeeper-install -q %D/share/omf/gnucash-docs/gnucash-guide-C.omf 2>/dev/null || /usr/bin/true
+share/omf/gnucash-docs/gnucash-guide-de_DE.omf
 share/omf/gnucash-docs/gnucash-help-C.omf
-@exec scrollkeeper-install -q %D/share/omf/gnucash-docs/gnucash-help-C.omf 2>/dev/null || /usr/bin/true
 share/omf/gnucash-docs/gnucash-help-de_DE.omf
-@exec scrollkeeper-install -q %D/share/omf/gnucash-docs/gnucash-help-de_DE.omf 2>/dev/null || %/usr/bin/true
 @dirrm share/omf/gnucash-docs
+@comment in scrollkeeper: @dirrm share/omf
 @dirrm share/gnome/help/gnucash/de_DE/gnucash-help/stylesheet
 @dirrm share/gnome/help/gnucash/de_DE/gnucash-help/figures
 @dirrm share/gnome/help/gnucash/de_DE/gnucash-help
+@dirrm share/gnome/help/gnucash/de_DE/gnucash-guide/stylesheet
+@dirrm share/gnome/help/gnucash/de_DE/gnucash-guide/figures
+@dirrm share/gnome/help/gnucash/de_DE/gnucash-guide
 @dirrm share/gnome/help/gnucash/de_DE/figures
 @dirrm share/gnome/help/gnucash/de_DE
-@dirrm share/gnome/help/gnucash/C/gnucash-guide/stylesheet
-@dirrm share/gnome/help/gnucash/C/gnucash-guide/figures
-@dirrm share/gnome/help/gnucash/C/gnucash-guide
 @dirrm share/gnome/help/gnucash/C/gnucash-help/stylesheet
 @dirrm share/gnome/help/gnucash/C/gnucash-help/figures
 @dirrm share/gnome/help/gnucash/C/gnucash-help
+@dirrm share/gnome/help/gnucash/C/gnucash-guide/stylesheet
+@dirrm share/gnome/help/gnucash/C/gnucash-guide/figures
+@dirrm share/gnome/help/gnucash/C/gnucash-guide
 @dirrm share/gnome/help/gnucash/C/figures
 @dirrm share/gnome/help/gnucash/C
 @dirrm share/gnome/help/gnucash
-@unexec scrollkeeper-uninstall -q %D/share/omf/gnucash-docs/gnucash-guide-C.omf 2>/dev/null || %/usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/omf/gnucash-docs/gnucash-help-C.omf 2>/dev/null || %/usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/omf/gnucash-docs/gnucash-help-de_DE.omf 2>/dev/null || %%/usr/bin/true
+@comment in gnome1-dirs: @dirrm share/gnome/help
diff --git a/finance/gnucash-docs/distinfo b/finance/gnucash-docs/distinfo
index 0383e9d730b..0bce740d8e3 100644
--- a/finance/gnucash-docs/distinfo
+++ b/finance/gnucash-docs/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2004/11/06 21:46:00 jdolecek Exp $
+$NetBSD: distinfo,v 1.3 2005/02/09 20:22:08 wiz Exp $
 
-SHA1 (gnucash-docs-1.8.4.tar.gz) = 4b54f62ae91fb4a386bb8d59e9592928f3917beb
-Size (gnucash-docs-1.8.4.tar.gz) = 1658889 bytes
-SHA1 (patch-aa) = de6f82b8bc5d1ad0497f39cf9c2a964a831d4840
-SHA1 (patch-ab) = 6814addaf3ecd76f5c3061e830c995b336210e95
+SHA1 (gnucash-docs-1.8.5.tar.gz) = 34f4cb8a678e73104edfb856cffceb7631c1da0b
+Size (gnucash-docs-1.8.5.tar.gz) = 1680438 bytes
+SHA1 (patch-aa) = 8bd13e56d89d84706059b664dd6dd710f1542262
+SHA1 (patch-ab) = 0203b49cb8d5245973c553d0174a54a52672c2e0
diff --git a/finance/gnucash-docs/patches/patch-aa b/finance/gnucash-docs/patches/patch-aa
index e958ff0fce2..649e97f9bc6 100644
--- a/finance/gnucash-docs/patches/patch-aa
+++ b/finance/gnucash-docs/patches/patch-aa
@@ -1,13 +1,8 @@
-$NetBSD: patch-aa,v 1.1 2004/11/06 21:46:00 jdolecek Exp $
+$NetBSD: patch-aa,v 1.2 2005/02/09 20:22:08 wiz Exp $
 
---- xsl/general-customization.xsl.orig	Sat Oct 16 20:19:30 2004
-+++ xsl/general-customization.xsl	Sat Oct 16 20:19:53 2004
-@@ -13,11 +13,11 @@
- <!-- Including new title page stylesheets for customizing the placement 
- 	 of tags in the title page. -->
- <!-- This one is autogenerated from titlepage.xml -->
--<xsl:include href="titlepage.xsl"/>
-+<!--<xsl:include href="titlepage.xsl"/>-->
+--- xsl/general-customization.xsl.orig	2004-12-12 00:09:35.000000000 +0100
++++ xsl/general-customization.xsl
+@@ -17,7 +17,7 @@
  
  <!-- This one was edited by hand, to make titlepage a separate chunk
  	 for book and aricle -->
diff --git a/finance/gnucash-docs/patches/patch-ab b/finance/gnucash-docs/patches/patch-ab
index 1e01b28abec..651705e5a57 100644
--- a/finance/gnucash-docs/patches/patch-ab
+++ b/finance/gnucash-docs/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.1 2004/11/06 21:46:00 jdolecek Exp $
+$NetBSD: patch-ab,v 1.2 2005/02/09 20:22:08 wiz Exp $
 
---- xsl/titlepage2.xsl.orig	Sat Oct 16 20:19:35 2004
-+++ xsl/titlepage2.xsl	Sat Oct 16 20:20:35 2004
+--- xsl/titlepage2.xsl.orig	2002-12-10 01:13:59.000000000 +0100
++++ xsl/titlepage2.xsl
 @@ -4,6 +4,8 @@
  <!-- This is a customization layer, to change some of the things in
     auto-generated titlepage.xsl -->