3 files changed, 32 insertions, 50 deletions

diff --git a/textproc/p5-XML-DT/Makefile b/textproc/p5-XML-DT/Makefile
index 8a432bb446f2..e4a03d04f685 100644
--- a/textproc/p5-XML-DT/Makefile
+++ b/textproc/p5-XML-DT/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	XML-DT
-PORTVERSION=	0.26
+PORTVERSION=	0.42
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	XML
@@ -15,8 +15,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Perl module for down translation of XML to strings
 
-BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/XML/LibXML.pm:${PORTSDIR}/textproc/p5-XML-LibXML
-BUILD_DEPENDS+=	${SITE_PERL}/LWP/Simple.pm:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/XML/LibXML.pm:${PORTSDIR}/textproc/p5-XML-LibXML \
+		${SITE_PERL}/LWP/Simple.pm:${PORTSDIR}/www/p5-libwww \
+		${SITE_PERL}/XML/DTDParser.pm:${PORTSDIR}/textproc/p5-XML-DTDParser
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
@@ -24,4 +25,10 @@ PERL_CONFIGURE=	yes
 MAN1=		mkdtskel.1 mkdtdskel.1
 MAN3=		XML::DT.3
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 500600
+IGNORE=		requires perl 5.6.0 or later. Install lang/perl5.8 and try again
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/textproc/p5-XML-DT/distinfo b/textproc/p5-XML-DT/distinfo
index 4410c7ddcc98..4f7a9d03e589 100644
--- a/textproc/p5-XML-DT/distinfo
+++ b/textproc/p5-XML-DT/distinfo
@@ -1 +1,2 @@
-MD5 (XML-DT-0.26.tar.gz) = ae8ffae8346514ea1e65029ea2c3bea0
+MD5 (XML-DT-0.42.tar.gz) = 38dbb6f92b64fb8c3f38c6f562dfd8b4
+SIZE (XML-DT-0.42.tar.gz) = 29695
diff --git a/textproc/p5-XML-DT/files/patch-Makefile.PL b/textproc/p5-XML-DT/files/patch-Makefile.PL
index 2c7eba6671cd..a1289a3b270d 100644
--- a/textproc/p5-XML-DT/files/patch-Makefile.PL
+++ b/textproc/p5-XML-DT/files/patch-Makefile.PL
@@ -1,47 +1,21 @@
---- Makefile.PL.orig	Sun Oct 12 22:45:13 2003
-+++ Makefile.PL	Mon Oct 13 20:53:10 2003
-@@ -9,26 +9,26 @@
- 		'LWP::Simple' => '1.35',
+--- Makefile.PL.orig	Mon Nov 29 21:27:09 2004
++++ Makefile.PL	Thu Oct 20 11:21:23 2005
+@@ -18,12 +18,14 @@ $xmllibxml_version = 1.54;
+ 		'XML::DTDParser' => '2.00',
  	       );
  
--print "\n";
--print " NOTE: Next versions will, possibly, deprecate XML::Parser backend.\n";
--print "       At the moment, XML::LibXML is quicker than XML::Parser and\n";
--print "       supports HTML parsing\n\n";
--
--print "I need a XML Back-end (XML::Parser >= $xmlparser_version or XML::LibXML >= $xmllibxml_version\n";
--do {
--  print "Sorry, I didn't understand the answer.\n" if ($answer);
--  print "Should I use 'XML::Parser' or 'XML::LibXML'? [XML::LibXML] ";
--  $XML = undef;
--  $answer = <STDIN>;
--  print "\n";
--  if ($answer =~ m/^XML::Parser$/i) {
--    $XML = 'XML::Parser';
--    %req_modules = (%req_modules, $XML => $xmlparser_version);
--  } elsif ($answer =~ m/^\s*$/ || $answer =~ m/^XML::LibXML$/i) {
-+#print "\n";
-+#print " NOTE: Next versions will, possibly, deprecate XML::Parser backend.\n";
-+#print "       At the moment, XML::LibXML is quicker than XML::Parser and\n";
-+#print "       supports HTML parsing\n\n";
-+#
-+#print "I need a XML Back-end (XML::Parser >= $xmlparser_version or XML::LibXML >= $xmllibxml_version\n";
-+#do {
-+#  print "Sorry, I didn't understand the answer.\n" if ($answer);
-+#  print "Should I use 'XML::Parser' or 'XML::LibXML'? [XML::LibXML] ";
-+#  $XML = undef;
-+#  $answer = <STDIN>;
-+#  print "\n";
-+#  if ($answer =~ m/^XML::Parser$/i) {
-+#    $XML = 'XML::Parser';
-+#    %req_modules = (%req_modules, $XML => $xmlparser_version);
-+#  } elsif ($answer =~ m/^\s*$/ || $answer =~ m/^XML::LibXML$/i) {
-     $XML = 'XML::LibXML';
-     %req_modules = (%req_modules, $XML => $xmllibxml_version);
--  }
--} until defined $XML;
-+#  }
-+#} until defined $XML;
- 
- my $pattern = uc($XML);
- 
++$PARSER = "XML::LibXML";  # no user interaction, sir!
++
+ if ($PARSER) {
+-  $PARSER=~m!PARSER=!;
+-  $XML = uc($');
+-  unless ($XML eq "XML::PARSER" || $XML eq "XML::LIBXML") {
++#  $PARSER=~m!PARSER=!;
++  $XML = $PARSER;
++  unless ($XML eq "XML::PARSER" || $XML eq "XML::LibXML") {
+     print STDERR "Unknown parser. Using default: XML::LibXML\n";
+-    $XML = "XML::LIBXML";
++    $XML = "XML::LibXML";
+   }
+ } else {
+   print "\n";