Update p5-XML-LibXML and p5-XML-LibXSLT to matching version 1.31.

Using mismatched versions leads to odd breakage in dependent
software, notably PageKit.

5 files changed, 11 insertions, 33 deletions

diff --git a/textproc/p5-XML-LibXML/Makefile b/textproc/p5-XML-LibXML/Makefile
index 47b146d..52826cd 100644
--- a/textproc/p5-XML-LibXML/Makefile
+++ b/textproc/p5-XML-LibXML/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	XML-LibXML
-PORTVERSION=	0.97
+PORTVERSION=	1.31
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	XML
@@ -14,7 +14,9 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@protey.ru
 
+BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/XML/SAX.pm:${PORTSDIR}/textproc/p5-XML-SAX
 LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2
+RUN_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/XML/SAX.pm:${PORTSDIR}/textproc/p5-XML-SAX
 
 PERL_CONFIGURE=	yes
 CONFIGURE_ARGS=	INC='-I${LOCALBASE}/include -I${LOCALBASE}/include/libxml2'
diff --git a/textproc/p5-XML-LibXML/distinfo b/textproc/p5-XML-LibXML/distinfo
index 32d4779..8a62262 100644
--- a/textproc/p5-XML-LibXML/distinfo
+++ b/textproc/p5-XML-LibXML/distinfo
@@ -1 +1 @@
-MD5 (XML-LibXML-0.97.tar.gz) = 560057a998d2ba3bb8ba415ce0d1d609
+MD5 (XML-LibXML-1.31.tar.gz) = 680089366ccb5cc06372dee14042c5e2
diff --git a/textproc/p5-XML-LibXSLT/Makefile b/textproc/p5-XML-LibXSLT/Makefile
index ae92008..ba60e63 100644
--- a/textproc/p5-XML-LibXSLT/Makefile
+++ b/textproc/p5-XML-LibXSLT/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	XML-LibXSLT
-PORTVERSION=	1.05
+PORTVERSION=	1.31
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	XML
diff --git a/textproc/p5-XML-LibXSLT/distinfo b/textproc/p5-XML-LibXSLT/distinfo
index ce700c4..926b37c 100644
--- a/textproc/p5-XML-LibXSLT/distinfo
+++ b/textproc/p5-XML-LibXSLT/distinfo
@@ -1 +1 @@
-MD5 (XML-LibXSLT-1.05.tar.gz) = f43083ab4aef8b7785c4b586e77f9e4c
+MD5 (XML-LibXSLT-1.31.tar.gz) = 1ba7db153d521ac66fcfd8de529b92a3
diff --git a/textproc/p5-XML-LibXSLT/files/patch-Makefile.PL b/textproc/p5-XML-LibXSLT/files/patch-Makefile.PL
index 1dbd98b..1fce0ff 100644
--- a/textproc/p5-XML-LibXSLT/files/patch-Makefile.PL
+++ b/textproc/p5-XML-LibXSLT/files/patch-Makefile.PL
@@ -1,36 +1,12 @@
---- Makefile.PL.orig	Tue May 22 17:25:19 2001
-+++ Makefile.PL	Mon Aug  6 20:43:20 2001
-@@ -19,9 +19,6 @@
+--- Makefile.PL.orig	Wed Nov 14 14:11:45 2001
++++ Makefile.PL	Thu Dec  6 15:43:24 2001
+@@ -21,9 +21,6 @@
  # get libs and inc from gnome-config
  eval {
      print "running xslt-config... ";
 -    my $ver = backtick('xslt-config --version');
--    my ($major, $minor) = $ver =~ /(\d+)\.(\d+)/g;
--    die "VERSION" unless $minor >= 7;
+-    my ($major, $minor, $point) = $ver =~ /(\d+)\.(\d+)\.(\d+)/g;
+-    die "VERSION" unless $major > 1 || $minor > 0 || $point >= 6;
      $config{LIBS} ||= backtick('xslt-config --libs');
      $config{INC} ||= backtick('xslt-config --cflags');
      print "ok\n";
-@@ -102,8 +99,9 @@
-     }
-     open(OLDOUT, ">&STDOUT");
-     open(OLDERR, ">&STDERR");
--    open(STDOUT, ">" . File::Spec->devnull);
--    open(STDERR, ">" . File::Spec->devnull);
-+    my $devnull = eval { File::Spec->devnull} || "/dev/null";
-+    open(STDOUT, ">$devnull");
-+    open(STDERR, ">$devnull");
-     my $retval = system($command);
-     open(STDOUT, ">&OLDOUT");
-     open(STDERR, ">&OLDERR");
-@@ -126,8 +124,9 @@
-     }
-     open(OLDOUT, ">&STDOUT");
-     open(OLDERR, ">&STDERR");
--    open(STDOUT, ">" . File::Spec->devnull);
--    open(STDERR, ">" . File::Spec->devnull);
-+    my $devnull = eval { File::Spec->devnull} || "/dev/null";
-+    open(STDOUT, ">$devnull");
-+    open(STDERR, ">$devnull");
-     my $results = `$command`;
-     my $retval = $?;
-     open(STDOUT, ">&OLDOUT");