diff options
| author | dholland <dholland> | 2010-11-22 05:54:17 +0000 |
|---|---|---|
| committer | dholland <dholland> | 2010-11-22 05:54:17 +0000 |
| commit | 5296f87a61936b882016f9768f16c254c03a1d81 (patch) | |
| tree | 7134b63ba2f837753c49b97de129d0b57f61d140 /textproc/xmlto | |
| parent | 32ff7258aeea3798102badc331a2c4a72f3ac1f6 (diff) | |
| download | pkgsrc-5296f87a61936b882016f9768f16c254c03a1d81.tar.gz | |
Fix obviously wrong code handling XSLTPARAMS with the --stringparam option.
PR 44126 from Goetz Isenmann. PKGREVISION++.
While here, add comment to patch-ab.
Diffstat (limited to 'textproc/xmlto')
| -rw-r--r-- | textproc/xmlto/Makefile | 4 | ||||
| -rw-r--r-- | textproc/xmlto/distinfo | 4 | ||||
| -rw-r--r-- | textproc/xmlto/patches/patch-ab | 17 |
3 files changed, 20 insertions, 5 deletions
diff --git a/textproc/xmlto/Makefile b/textproc/xmlto/Makefile index acab31e2819..3f5bb6313a2 100644 --- a/textproc/xmlto/Makefile +++ b/textproc/xmlto/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.16 2008/11/18 15:20:54 wiz Exp $ +# $NetBSD: Makefile,v 1.17 2010/11/22 05:54:17 dholland Exp $ # DISTNAME= xmlto-0.0.21 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= textproc MASTER_SITES= # ftp(1) doesn't speak https: https://fedorahosted.org/xmlto/browser EXTRACT_SUFX= .tar.bz2 diff --git a/textproc/xmlto/distinfo b/textproc/xmlto/distinfo index 7851a0c9699..7f444089cc0 100644 --- a/textproc/xmlto/distinfo +++ b/textproc/xmlto/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.5 2008/11/10 23:01:38 wiz Exp $ +$NetBSD: distinfo,v 1.6 2010/11/22 05:54:17 dholland Exp $ 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 +SHA1 (patch-ab) = 174184839d52fb170f3b5adf01c9867588cf5be6 diff --git a/textproc/xmlto/patches/patch-ab b/textproc/xmlto/patches/patch-ab index cac301d52cd..7347a23750d 100644 --- a/textproc/xmlto/patches/patch-ab +++ b/textproc/xmlto/patches/patch-ab @@ -1,4 +1,8 @@ -$NetBSD: patch-ab,v 1.2 2008/11/10 23:01:38 wiz Exp $ +$NetBSD: patch-ab,v 1.3 2010/11/22 05:54:17 dholland Exp $ + +- don't hardwire paths +- fix obvious bug handling XSLTPARAMS (PR 44126), already fixed upstream +- xmllint needs --nonet --- xmlto.in.orig 2008-05-30 13:41:31.000000000 +0000 +++ xmlto.in @@ -29,6 +33,17 @@ $NetBSD: patch-ab,v 1.2 2008/11/10 23:01:38 wiz Exp $ then charmap=$(locale charmap 2>/dev/null) +@@ -273,8 +273,8 @@ while [ "$#" -gt "0" ]; do + ;; + --stringparam) + MYPARAM="$2" +- XSLTPARAMS="XSLTPARAMS --stringparam ${MYPARAM%=*}" +- XSLTPARAMS="XSLTPARAMS $MYPARAM#*=}" ++ XSLTPARAMS="$XSLTPARAMS --stringparam ${MYPARAM%=*}" ++ XSLTPARAMS="$XSLTPARAMS $MYPARAM#*=}" + shift 2 + ;; + --noclean) @@ -427,8 +427,8 @@ if [ "$SKIP_VALIDATION" -eq 0 ] && [ "$S then VALIDATION="${XSLT_PROCESSED_DIR}/validation-errors" |