4 files changed, 64 insertions, 22 deletions
diff --git a/textproc/gnome-doc-utils/Makefile b/textproc/gnome-doc-utils/Makefile
index c74b17ece05..28f60f23f29 100644
--- a/textproc/gnome-doc-utils/Makefile
+++ b/textproc/gnome-doc-utils/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.22 2006/09/15 15:05:52 jmmv Exp $
+# $NetBSD: Makefile,v 1.23 2007/03/20 21:02:40 wiz Exp $
 #
 
-DISTNAME=	gnome-doc-utils-0.8.0
+DISTNAME=	gnome-doc-utils-0.10.1
 CATEGORIES=	textproc gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-doc-utils/0.8/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-doc-utils/0.10/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -15,6 +15,7 @@ DEPENDS+=	${PYPKGPREFIX}-libxslt>=1.1.12:../../textproc/py-libxslt
 
 USE_TOOLS+=		intltool pkg-config
 GNU_CONFIGURE=		YES
+TEST_TARGET=		check
 USE_PKGLOCALEDIR=	YES
 
 CONFIGURE_ARGS+=	PYTHON=${PYTHONBIN:Q}
diff --git a/textproc/gnome-doc-utils/PLIST b/textproc/gnome-doc-utils/PLIST
index 566a597e6f5..8833d0dbd34 100644
--- a/textproc/gnome-doc-utils/PLIST
+++ b/textproc/gnome-doc-utils/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.6 2006/09/15 15:05:52 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.7 2007/03/20 21:02:40 wiz Exp $
 bin/gnome-doc-prepare
+bin/gnome-doc-tool
 bin/xml2po
 lib/pkgconfig/gnome-doc-utils.pc
 lib/pkgconfig/xml2po.pc
@@ -41,11 +42,11 @@ share/xml/gnome/xslt/docbook/html/db2html.xsl
 share/xml/gnome/xslt/docbook/omf/db2omf.xsl
 share/xml/gnome/xslt/docbook/utils/chunks.xsl
 share/xml/gnome/xslt/docbook/utils/credits.xsl
+share/xml/gnome/xslt/docbook/utils/figures.xsl
 share/xml/gnome/xslt/docbook/utils/ids.xsl
 share/xml/gnome/xslt/gettext/gettext.xsl
 share/xml/gnome/xslt/gettext/l10n-numbers.xsl
 share/xml/gnome/xslt/gettext/l10n.xml
-share/xml/gnome/xslt/xsldoc/xsldoc.xsl
 share/xml2po/docbook.py
 share/xml2po/docbook.pyc
 share/xml2po/empty.py
@@ -54,8 +55,9 @@ share/xml2po/gs.py
 share/xml2po/gs.pyc
 share/xml2po/ubuntu.py
 share/xml2po/ubuntu.pyc
+share/xml2po/xhtml.py
+share/xml2po/xhtml.pyc
 @dirrm share/xml2po
-@dirrm share/xml/gnome/xslt/xsldoc
 @dirrm share/xml/gnome/xslt/gettext
 @dirrm share/xml/gnome/xslt/docbook/utils
 @dirrm share/xml/gnome/xslt/docbook/omf
diff --git a/textproc/gnome-doc-utils/distinfo b/textproc/gnome-doc-utils/distinfo
index 2a0a2b8682d..460ef18ee82 100644
--- a/textproc/gnome-doc-utils/distinfo
+++ b/textproc/gnome-doc-utils/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.9 2006/10/16 00:37:56 wiz Exp $
+$NetBSD: distinfo,v 1.10 2007/03/20 21:02:40 wiz Exp $
 
-SHA1 (gnome-doc-utils-0.8.0.tar.bz2) = d134ae18e4fd3a4de3aa6879a67fb93e23e860db
-RMD160 (gnome-doc-utils-0.8.0.tar.bz2) = f09b22cfefaba8e38072f829b3f8b064fceb5657
-Size (gnome-doc-utils-0.8.0.tar.bz2) = 412273 bytes
-SHA1 (patch-aa) = 18162b7257845f243bce698d945985c08bdd0a5e
+SHA1 (gnome-doc-utils-0.10.1.tar.bz2) = b47219d7aebe997986fdad690c3feca3d01573ea
+RMD160 (gnome-doc-utils-0.10.1.tar.bz2) = 2e8bec46c3b11be6c66d2d541e1dcc8055dfd4d4
+Size (gnome-doc-utils-0.10.1.tar.bz2) = 427716 bytes
+SHA1 (patch-aa) = 09e37aa94a5e3c263063c9d811e1b7e972f1981a
diff --git a/textproc/gnome-doc-utils/patches/patch-aa b/textproc/gnome-doc-utils/patches/patch-aa
index 1fe3bce08c0..4045d9b9d59 100644
--- a/textproc/gnome-doc-utils/patches/patch-aa
+++ b/textproc/gnome-doc-utils/patches/patch-aa
@@ -1,13 +1,52 @@
-$NetBSD: patch-aa,v 1.1 2006/10/16 00:37:56 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2007/03/20 21:02:41 wiz Exp $
 
---- gnome-doc-prepare.in.orig	2005-09-13 13:40:59.000000000 +0000
-+++ gnome-doc-prepare.in
-@@ -139,7 +139,7 @@ EOF
-     ;;
+--- tools/gnome-doc-tool.in.orig	2007-03-12 20:54:42.000000000 +0000
++++ tools/gnome-doc-tool.in
+@@ -77,7 +77,7 @@ Miscellaneous:
+ EOF
+ }
+ function echo_verbose {
+-    if [ "x$doc_verbose" == "x1" ]; then echo $1; fi
++    if [ "x$doc_verbose" = "x1" ]; then echo $1; fi
+ }
+ function mkdir_p {
+     dir='';
+@@ -155,31 +155,31 @@ function DO_html {
+     if [ ! -f "$doc_input" ]; then error "$doc_input: No such file"; fi
+     doc_indir=$( (cd $(dirname $doc_input) && pwd) )
+     doc_infile=$(basename $doc_input)
+-    if [ "x${doc_infile: -4}" == "x.xml" ]; then
++    if [ "x${doc_infile: -4}" = "x.xml" ]; then
+ 	doc_inbase=${doc_infile:0:$((${#doc_infile}-4))}
+     else
+ 	doc_inbase="$doc_infile"
+     fi
  
-   *)
--    if [ "x$docname" == "xyes" ]
-+    if [ "x$docname" = "xyes" ]
-     then
-       newdocument="$arg" 
-       docname=no
+-    if [ "x$doc_output" == "x" ]; then
++    if [ "x$doc_output" = "x" ]; then
+ 	doc_outdir=`pwd`
+-	if [ "x$doc_extension" == "x" ]; then doc_extension='.xhtml'; fi
++	if [ "x$doc_extension" = "x" ]; then doc_extension='.xhtml'; fi
+ 	doc_outfile="${doc_inbase}${doc_extension}"
+-    elif [ -d "$doc_output" -o "${doc_output: -1}" == "/" ]; then
++    elif [ -d "$doc_output" -o "${doc_output: -1}" = "/" ]; then
+ 	mkdir_p "$doc_output"
+ 	doc_outdir=`(cd "$doc_output" && pwd)`
+-	if [ "x$doc_extension" == "x" ]; then doc_extension='.xhtml'; fi
++	if [ "x$doc_extension" = "x" ]; then doc_extension='.xhtml'; fi
+ 	doc_outfile="${doc_inbase}${doc_extension}"
+     else
+ 	dir=`dirname "$doc_output"`
+ 	mkdir_p "$dir"
+ 	doc_outdir=`(cd "$dir" && pwd)`
+ 	doc_outfile=`basename "$doc_output"`
+-	if [ "x$doc_extension" == "x" ]; then
++	if [ "x$doc_extension" = "x" ]; then
+ 	    doc_extension=`echo "$doc_outfile" | grep -o '\..*'`
+ 	fi;
+     fi;
+-    if [ "x${doc_outfile: -${#doc_extension}}" == "x${doc_extension}" ]; then
++    if [ "x${doc_outfile: -${#doc_extension}}" = "x${doc_extension}" ]; then
+ 	doc_outbase="${doc_outfile:0:$((${#doc_outfile}-${#doc_extension}))}"
+     else
+ 	doc_outbase="${doc_outfile}"