Update to 3.16:

Changes in 3.16

      added the xml_split/xml_merge tools

      fixed PI handler behaviour when used in twig_roots
      mode

      fix a bug  that prevented the DTD to be output
      when update_DTD mode is on, no DTD is present but
      entities have been created

      added level(<n>) trigger for handlers

      fixed bug that prevented the output_filter to be
      called when printing an element. Spotted thanks to
      Louis Strous.

      fixed bug in the nsgmls pretty printer that output
      invalid XML (an extra \n was added in the end tag)
      found by Lee Goddard

      fixed test 284 in test_additional to make it pass
      in RedHat's version of perl 5.8.0, thanks to
      rdhayes for debugging and fixing that test.

      first shot at getting Pis and comments back in the
      proper place, even in 'keep' mode. At the moment
      using set_pcdata  (or set_cdata) removes all
      embedded comments/pis

      fixed a bug with pi's in keep mode (pi's would not
      be copied if they were within an element) found by
      Pascal Sternis

      added a fix to get rid of spurious warnings, sent
      by Anthony Persaud

      added the remove_cdata option to the XML::Twig new
      method, that will output CDATA sections as regular
      (escaped) PCDATA

      added the index option to the XML::Twig new method,
      and the associated XML::Twig index method, which
      generates a list of element matching a condition
      during parsing

      added the XML::Twig::Elt first_descendant method

      fixed a bug with the keep_encoding option where
      attributes were not parsed when the element name was
      followed by more than one space (spotted by Gerald
      Sedrati-Dinet),
      see https://rt.cpan.org/Ticket/Display.html?id=8137

      fixed a bug where whitespace at the begining of an
      element could be dropped (if followed by an element
      before any other character). Now whitespace is
      dropped only if it includes a \n

      added feature: when load_DTD is used, default
      attributes are now filled

      fixed bug on xmlns in path expression trigger
      (would not replace prefixes in path expressions),
      spotted by amonroy on perlmonks, see
      http://perlmonks.org/index.pl?node_id=386764

      optimized XML::Twig text, thanks to Nick Lassonde
      for the patch

      fixed bug that generated an empty line before some
      comments (pointed out by Tanya Huang)

      fixed tests to check XML::Filter::BufferText version
      (1.00 has a bug in the CDATA handling that makes XML::Twig
      tests fail).

      Added new options --nowrap and --exclude (-v) to xml_grep

      fixed warning in tests under 5.8.0 (spotted by Ed Avis)

      skipped HTML::Entities tests in 5.8.0 (make test for this
      module seem to fail on my system, it might be the same
      elsewhere)

      Fixed bug RT #6067 (problems with non-standard versions of
      Scalar::Utils which do not include weaken)
      Fixed bug RT #6092 (error when using safe output filter)
      Fixed bug when using map_xmlns, tags in default namespace
      were not output

Changes in 3.15

      Fixes that allow the tests to pass on more systems (thanks to Ed
      Avis for his testing)

      Added normalize_space option for simplify (suggestion of Lambert Lum)

      Removed usage of $&

      Expanded the doc for paste, as it was a bit short (suggestion of
      Richard Jolly)

Changes in 3.14

      Namespace processing has been enhanced and should work fine now,
      as long as twig_roots is not used.

      Potentially uncompatible change: the behaviour of simplify has
      been changed to mimic as exactly as possible XML::Simple's XMLin

      Completed the pod to cover the entire API

      Tests now pass with perl 5.005_04-RC1 (fail with 5.005 reported
      by David Claughton), added more tests and a config summary at the
      end of the tests

      Added methods on the class attribute, convenient for dealing with
      XHTML or preparing display with CSS:
      class set_class add_to_class att_to_class add_att_to_class
      move_att_to_class tag_to_class add_tag_to_class set_tag_class in_class
      navigation functions can use '.<class>' expressions

      fixed (yet another!) bug in the way DTDs were output
      fixed bug for pi => 'drop' option

      changed the names of lots on internal (undocumented) methods, prefixed
      them with _

4 files changed, 16 insertions, 16 deletions

diff --git a/textproc/p5-XML-Twig/Makefile b/textproc/p5-XML-Twig/Makefile
index 97905e96684..faa900b3736 100644
--- a/textproc/p5-XML-Twig/Makefile
+++ b/textproc/p5-XML-Twig/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.4 2004/12/20 11:31:11 grant Exp $
+# $NetBSD: Makefile,v 1.5 2005/02/19 19:32:21 wiz Exp $
 #
 
-DISTNAME=	XML-Twig-3.13
+DISTNAME=	XML-Twig-3.16
 PKGNAME=	p5-${DISTNAME}
 SVR4_PKGNAME=	p5xtw
-PKGREVISION=	1
 CATEGORIES=	textproc perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=XML/}
+MASTER_SITES=	http://www.xmltwig.com/xmltwig/ \
+		${MASTER_SITE_PERL_CPAN:=XML/}
 
 MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.xmltwig.com/
diff --git a/textproc/p5-XML-Twig/distinfo b/textproc/p5-XML-Twig/distinfo
index ba32dc71728..eaec47698e8 100644
--- a/textproc/p5-XML-Twig/distinfo
+++ b/textproc/p5-XML-Twig/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2004/04/23 20:38:44 minskim Exp $
+$NetBSD: distinfo,v 1.4 2005/02/19 19:32:21 wiz Exp $
 
-SHA1 (XML-Twig-3.13.tar.gz) = 1d3d01de03820c0f72f1a77d8430852682819eac
-Size (XML-Twig-3.13.tar.gz) = 222081 bytes
-SHA1 (patch-aa) = e464572c1b8d5c70908e755635d15556211c3333
-SHA1 (patch-ab) = 44fed1d983383395a06e1ba6fb2dba7fb17dbb2f
+SHA1 (XML-Twig-3.16.tar.gz) = 2dab0ba8dd58aa210757af1fae93707e9cf656c4
+Size (XML-Twig-3.16.tar.gz) = 258854 bytes
+SHA1 (patch-aa) = 6abdbfdaf5c22020b34006cf13a097ad891ca782
+SHA1 (patch-ab) = 1f7703b0cb1218b01f5187d86c98c6266f66d8ef
diff --git a/textproc/p5-XML-Twig/patches/patch-aa b/textproc/p5-XML-Twig/patches/patch-aa
index 97222e36479..20dae2df9c6 100644
--- a/textproc/p5-XML-Twig/patches/patch-aa
+++ b/textproc/p5-XML-Twig/patches/patch-aa
@@ -1,11 +1,11 @@
-$NetBSD: patch-aa,v 1.2 2004/02/21 01:44:00 gson Exp $
+$NetBSD: patch-aa,v 1.3 2005/02/19 19:32:21 wiz Exp $
 
---- Makefile.PL.orig	2004-01-08 08:38:34.000000000 -0800
+--- Makefile.PL.orig	2005-02-10 13:27:15.000000000 +0100
 +++ Makefile.PL
-@@ -8,13 +8,9 @@
- for (split "\n", <<'QUERIES') {
- xml_pp|y|XML pretty printer
+@@ -10,13 +10,9 @@ xml_pp|y|XML pretty printer
  xml_grep|y|XML grep - grep XML files using XML::Twig's subset of XPath
+ xml_split|y|split big XML files
+ xml_merge|y|merge back files created by xml_split
 -xml_spellcheck|y|spellcheck XML files skipping tags
  QUERIES
      my ($program, $default, $description) = split /\|/, $_;
diff --git a/textproc/p5-XML-Twig/patches/patch-ab b/textproc/p5-XML-Twig/patches/patch-ab
index 51883593d11..4552934c61c 100644
--- a/textproc/p5-XML-Twig/patches/patch-ab
+++ b/textproc/p5-XML-Twig/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.2 2004/04/23 20:38:44 minskim Exp $
+$NetBSD: patch-ab,v 1.3 2005/02/19 19:32:21 wiz Exp $
 
---- check_optional_modules.orig	2003-09-24 08:35:07.000000000 -0500
+--- check_optional_modules.orig	2005-01-27 16:56:10.000000000 +0100
 +++ check_optional_modules
 @@ -17,17 +17,17 @@ if( $] >=  5.0060)
        { warn "weaken is available\n"; }