update to 1.2.0

changes:
-minor feature additions
-bugfixes
also patch some portability problems to make the selftest succeed

4 files changed, 41 insertions, 6 deletions

diff --git a/textproc/xmlstarlet/Makefile b/textproc/xmlstarlet/Makefile
index 3d83ad75f93..b4ddc03d76d 100644
--- a/textproc/xmlstarlet/Makefile
+++ b/textproc/xmlstarlet/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2011/05/05 19:36:09 drochner Exp $
+# $NetBSD: Makefile,v 1.12 2011/06/06 12:32:01 drochner Exp $
 #
 
-DISTNAME=		xmlstarlet-1.1.0
+DISTNAME=		xmlstarlet-1.2.0
 CATEGORIES=		textproc
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=xmlstar/}
 
diff --git a/textproc/xmlstarlet/distinfo b/textproc/xmlstarlet/distinfo
index 847046b0bb4..8f15d14130b 100644
--- a/textproc/xmlstarlet/distinfo
+++ b/textproc/xmlstarlet/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.5 2011/05/05 19:36:09 drochner Exp $
+$NetBSD: distinfo,v 1.6 2011/06/06 12:32:01 drochner Exp $
 
-SHA1 (xmlstarlet-1.1.0.tar.gz) = d8b5976687681bf0fe80ddc01627939424485f6d
-RMD160 (xmlstarlet-1.1.0.tar.gz) = c3710b2c311cac6a1a340778cb36690c528fd0bf
-Size (xmlstarlet-1.1.0.tar.gz) = 382008 bytes
+SHA1 (xmlstarlet-1.2.0.tar.gz) = 6016d4b2dee8805044c3522c65f7cf3449825cf5
+RMD160 (xmlstarlet-1.2.0.tar.gz) = 1b371ed1fdf8a42c9fc1d9a02116c9fa69bbceb2
+Size (xmlstarlet-1.2.0.tar.gz) = 382893 bytes
+SHA1 (patch-aa) = b79deefa45fe986bbbf1c25d6c1158ff7fed0a37
+SHA1 (patch-ab) = ad371ef7c360c3c4d758e6e5c5d879e60f4433ad
diff --git a/textproc/xmlstarlet/patches/patch-aa b/textproc/xmlstarlet/patches/patch-aa
new file mode 100644
index 00000000000..8b14ce142ed
--- /dev/null
+++ b/textproc/xmlstarlet/patches/patch-aa
@@ -0,0 +1,15 @@
+$NetBSD: patch-aa,v 1.5 2011/06/06 12:32:02 drochner Exp $
+
+make BRE portable: '+' is not allowed
+
+--- examples/bigxml.orig	2011-05-26 00:42:39.000000000 +0000
++++ examples/bigxml
+@@ -1,7 +1,7 @@
+ #!/bin/sh
+ # check error messages on lines past 2^16
+ 
+-SEDLINUM_PROG='s/^\([^:]\+:[0-9]\{4\}\)[0-9]\.[0-9]\+:.*$/\1x/p'
++SEDLINUM_PROG='s/^\([^:][^:]*:[0-9]\{4\}\)[0-9]\.[0-9][0-9]*:.*$/\1x/p'
+ 
+ xmldoc()
+ {
diff --git a/textproc/xmlstarlet/patches/patch-ab b/textproc/xmlstarlet/patches/patch-ab
new file mode 100644
index 00000000000..3ccd02be733
--- /dev/null
+++ b/textproc/xmlstarlet/patches/patch-ab
@@ -0,0 +1,18 @@
+$NetBSD: patch-ab,v 1.1 2011/06/06 12:32:02 drochner Exp $
+
+kill illegal substitution (bashism)
+
+--- examples/xmlstarlet.orig	2011-05-23 20:45:02.000000000 +0000
++++ examples/xmlstarlet
+@@ -2,11 +2,5 @@
+ exepath=`dirname $0`
+ xml="${abs_builddir-$exepath/..}"/xml
+ 
+-if [ x"$OSTYPE" = xmsys ] ; then
+-    # MSYS does unix -> windows path conversion, eg: /x -> C:\Mingw\msys\1.0\x
+-    # so we double all leading /'s to avoid this
+-    exec "$xml" "${@/#\////}"
+-fi
+-
+ exec "$xml" "$@"
+