Update to 0.0.21:

0.0.21 (stable)
  added experimental support for dblatex(needs installed
  dblatex package)
  fixed issue with cp -a option on non-gnu systems
  non-mandatory support for libpaper

0.0.20 (stable)
  added experimental fop support(needs installed fop package)
  possibility to read a stylesheet from STDIN
  some small fixes/changes in docbook formats and xmlto script

0.0.19 (stable)
	added supported for basename with spaces, stringparam
  option for passing argument to stylesheet, bash no
  longer hardcoded, added option for not cleaning temp
  files for diagnostics.

5 files changed, 79 insertions, 42 deletions

diff --git a/textproc/xmlto/Makefile b/textproc/xmlto/Makefile
index 808e004c139..51d42954bde 100644
--- a/textproc/xmlto/Makefile
+++ b/textproc/xmlto/Makefile
@@ -1,14 +1,13 @@
-# $NetBSD: Makefile,v 1.13 2008/01/15 00:02:13 heinz Exp $
+# $NetBSD: Makefile,v 1.14 2008/11/10 23:01:38 wiz Exp $
 #
 
-DISTNAME=		xmlto-0.0.18
-PKGREVISION=		4
+DISTNAME=		xmlto-0.0.21
 CATEGORIES=		textproc
-MASTER_SITES=		http://cyberelk.net/tim/data/xmlto/stable/
+MASTER_SITES=		# ftp(1) doesn't speak https: https://fedorahosted.org/xmlto/browser
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://cyberelk.net/tim/software/xmlto/
+HOMEPAGE=		https://fedorahosted.org/xmlto/
 COMMENT=		Tool to help transform XML documents into other formats
 
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/textproc/xmlto/PLIST b/textproc/xmlto/PLIST
index 59ebd2e7231..48890d77409 100644
--- a/textproc/xmlto/PLIST
+++ b/textproc/xmlto/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/12/26 15:57:18 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2008/11/10 23:01:38 wiz Exp $
 bin/xmlif
 bin/xmlto
 man/man1/xmlif.1
 man/man1/xmlto.1
+share/xmlto/format/docbook/awt
 share/xmlto/format/docbook/dvi
 share/xmlto/format/docbook/fo
 share/xmlto/format/docbook/html
@@ -10,14 +11,22 @@ share/xmlto/format/docbook/html-nochunks
 share/xmlto/format/docbook/htmlhelp
 share/xmlto/format/docbook/javahelp
 share/xmlto/format/docbook/man
+share/xmlto/format/docbook/mif
+share/xmlto/format/docbook/pcl
 share/xmlto/format/docbook/pdf
 share/xmlto/format/docbook/ps
+share/xmlto/format/docbook/svg
 share/xmlto/format/docbook/txt
 share/xmlto/format/docbook/xhtml
 share/xmlto/format/docbook/xhtml-nochunks
+share/xmlto/format/fo/awt
 share/xmlto/format/fo/dvi
+share/xmlto/format/fo/mif
+share/xmlto/format/fo/pcl
 share/xmlto/format/fo/pdf
 share/xmlto/format/fo/ps
+share/xmlto/format/fo/svg
+share/xmlto/format/fo/txt
 share/xmlto/xmlto.mak
 @dirrm share/xmlto/format/fo
 @dirrm share/xmlto/format/docbook
diff --git a/textproc/xmlto/distinfo b/textproc/xmlto/distinfo
index 31badf12985..7851a0c9699 100644
--- a/textproc/xmlto/distinfo
+++ b/textproc/xmlto/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2006/07/22 13:11:28 rillig Exp $
+$NetBSD: distinfo,v 1.5 2008/11/10 23:01:38 wiz Exp $
 
-SHA1 (xmlto-0.0.18.tar.bz2) = abee8925a80bfefcdf1543956a804b1facff7bec
-RMD160 (xmlto-0.0.18.tar.bz2) = 4b7232ad673c6b3a0ad015d0061cf5b77165478c
-Size (xmlto-0.0.18.tar.bz2) = 91275 bytes
-SHA1 (patch-aa) = b404a269dea9aeae23ade6a3e7a7476a94b840b2
-SHA1 (patch-ab) = b7f09d5add1a2423690d7f5aa501ad0f1d215592
+SHA1 (xmlto-0.0.21.tar.bz2) = 691202620b337d9c35c95c81306ea629248a8850
+RMD160 (xmlto-0.0.21.tar.bz2) = 21d4f82c1e9dcb8617132f097921db722bc901c6
+Size (xmlto-0.0.21.tar.bz2) = 99554 bytes
+SHA1 (patch-aa) = 24c15146e9d4a2147b24ab192c5af68af0cabd21
+SHA1 (patch-ab) = ad056853e64c810e392347a5d939b0629cff53bd
diff --git a/textproc/xmlto/patches/patch-aa b/textproc/xmlto/patches/patch-aa
index 4813752528c..f516c670bf6 100644
--- a/textproc/xmlto/patches/patch-aa
+++ b/textproc/xmlto/patches/patch-aa
@@ -1,28 +1,30 @@
-$NetBSD: patch-aa,v 1.1 2006/02/26 12:50:03 rillig Exp $
+$NetBSD: patch-aa,v 1.2 2008/11/10 23:01:38 wiz Exp $
 
 This patch makes "xmlto txt" usable on pkgsrc systems, which usually do
 not have these binaries in /usr/bin.
 
---- format/docbook/txt.orig	2003-11-30 17:56:45.000000000 +0100
-+++ format/docbook/txt	2006-02-26 13:40:54.000000000 +0100
-@@ -1,14 +1,14 @@
--if [ -x /usr/bin/w3m ]
-+if (type w3m 1>/dev/null 2>&1)
- then
--  CONVERT=/usr/bin/w3m
-+  CONVERT=w3m
-   ARGS="-T text/html -dump"
--elif [ -x /usr/bin/lynx ]
-+elif (type lynx 1>/dev/null 2>&1)
- then
--  CONVERT=/usr/bin/lynx
-+  CONVERT=lynx
-   ARGS="-force_html -dump -nolist -width=72"
--elif [ -x /usr/bin/links ]
-+elif (type links 1>/dev/null 2>&1)
- then
--  CONVERT=/usr/bin/links
-+  CONVERT=links
-   ARGS="-dump"
- else
-   echo >&2 "No way to convert HTML to text found."
+--- format/docbook/txt.orig	2008-05-24 17:43:05.000000000 +0000
++++ format/docbook/txt
+@@ -1,16 +1,16 @@
+ case "$USE_BACKEND" in
+ DEFAULT|DBLATEX)
+-	if [ -x /usr/bin/w3m ]
++	if (type w3m 1>/dev/null 2>&1)
+ 	then
+-	  CONVERT=/usr/bin/w3m
++	  CONVERT=w3m
+ 	  ARGS="-T text/html -dump"
+-	elif [ -x /usr/bin/lynx ]
++	elif (type lynx 1>/dev/null 2>&1)
+ 	then
+-	  CONVERT=/usr/bin/lynx
++	  CONVERT=lynx
+ 	  ARGS="-force_html -dump -nolist -width=72"
+-	elif [ -x /usr/bin/links ]
++	elif (type links 1>/dev/null 2>&1)
+ 	then
+-	  CONVERT=/usr/bin/links
++	  CONVERT=links
+ 	  ARGS="-dump"
+ 	else
+ 	  echo >&2 "No way to convert HTML to text found."
diff --git a/textproc/xmlto/patches/patch-ab b/textproc/xmlto/patches/patch-ab
index 23665489a01..cac301d52cd 100644
--- a/textproc/xmlto/patches/patch-ab
+++ b/textproc/xmlto/patches/patch-ab
@@ -1,14 +1,41 @@
-$NetBSD: patch-ab,v 1.1 2006/07/22 13:11:28 rillig Exp $
+$NetBSD: patch-ab,v 1.2 2008/11/10 23:01:38 wiz Exp $
 
---- xmlto.in.orig	2004-01-02 13:03:24.000000000 +0100
-+++ xmlto.in	2006-07-22 15:06:09.000000000 +0200
-@@ -321,8 +321,8 @@ if [ "$SKIP_VALIDATION" -eq 0 ] && [ "$S
+--- xmlto.in.orig	2008-05-30 13:41:31.000000000 +0000
++++ xmlto.in
+@@ -97,7 +97,7 @@ XSLTOPTS=
+ SEARCHPATH=
+ 
+ # Try to setup papersize using libpaper first ...
+-if [ -x /usr/bin/paperconf ]
++if (type paperconf 1>/dev/null 2>&1)
+ then
+   papername=`paperconf -n`
+   paperheight=`paperconf -mh | sed 's/ //g'`
+@@ -128,7 +128,7 @@ EOF
+   fi
+ 
+ # ... or use magic paper size, based on LC_PAPER
+-elif [ -x /usr/bin/locale ]
++elif (type locale 1>/dev/null 2>&1)
+ then
+   # For paper sizes we know about, specify them.
+   h=$(locale LC_PAPER 2>/dev/null | head -n 1)
+@@ -151,7 +151,7 @@ EOF
+ fi
+ 
+ # Magic encoding, based on locale
+-if [ -x /usr/bin/locale ]
++if (type locale 1>/dev/null 2>&1)
+ then
+   charmap=$(locale charmap 2>/dev/null)
+ 
+@@ -427,8 +427,8 @@ if [ "$SKIP_VALIDATION" -eq 0 ] && [ "$S
  then
    VALIDATION="${XSLT_PROCESSED_DIR}/validation-errors"
    [ "$VERBOSE" -ge 1 ] && \
--    echo >&2 "xmllint >/dev/null --xinclude --postvalid $INPUT_FILE"
+-    echo >&2 "xmllint >/dev/null --xinclude --postvalid \"$INPUT_FILE\""
 -  xmllint >/dev/null --xinclude --postvalid "$INPUT_FILE" 2>"${VALIDATION}"
-+    echo >&2 "xmllint >/dev/null --nonet --xinclude --postvalid $INPUT_FILE"
++    echo >&2 "xmllint >/dev/null --nonet --xinclude --postvalid \"$INPUT_FILE\""
 +  xmllint >/dev/null --nonet --xinclude --postvalid "$INPUT_FILE" 2>"${VALIDATION}"
    xmllint_status=$?
    if [ $xmllint_status -ne 0 ]