4 files changed, 5 insertions, 78 deletions

diff --git a/textproc/p5-XML-Simple/Makefile b/textproc/p5-XML-Simple/Makefile
index 1fd5613a9d0b..df91469ed48a 100644
--- a/textproc/p5-XML-Simple/Makefile
+++ b/textproc/p5-XML-Simple/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	XML-Simple
-PORTVERSION=	2.16
-PORTREVISION=	1
+PORTVERSION=	2.17
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	XML
@@ -24,15 +23,4 @@ PERL_CONFIGURE=	YES
 
 MAN3=		XML::Simple.3 XML::Simple::FAQ.3
 
-.include <bsd.port.pre.mk>
-.if ${PERL_LEVEL} <= 500503
-EXTRA_PATCHES=	${PATCHDIR}/5.005_03-lib::XML::Simple.pm ${PATCHDIR}/5.005_03-Makefile.PL
-
-post-patch:
-	@${FIND} ${WRKSRC} -name '*.orig' -delete
-
-post-configure:
-	${PERL} -pi -e 's/(\(POD2MAN_EXE\))/$$1 --lax/' ${WRKSRC}/Makefile
-
-.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/textproc/p5-XML-Simple/distinfo b/textproc/p5-XML-Simple/distinfo
index bfddd47b9a3a..2e10983a0a95 100644
--- a/textproc/p5-XML-Simple/distinfo
+++ b/textproc/p5-XML-Simple/distinfo
@@ -1,3 +1,3 @@
-MD5 (XML-Simple-2.16.tar.gz) = 80c0980ff63d77b871de41acc7175df7
-SHA256 (XML-Simple-2.16.tar.gz) = 52b39c4acf6c53d69661eb12e30dd7e45751dd78a52e5ad2bc677945689a332c
-SIZE (XML-Simple-2.16.tar.gz) = 69084
+MD5 (XML-Simple-2.17.tar.gz) = f6522514032092dd0341aa26a408ad4d
+SHA256 (XML-Simple-2.17.tar.gz) = b89438cdb4fc528b05c4ab539717e5276bb19491063663b7c77a55762a5ee48e
+SIZE (XML-Simple-2.17.tar.gz) = 70624
diff --git a/textproc/p5-XML-Simple/files/5.005_03-Makefile.PL b/textproc/p5-XML-Simple/files/5.005_03-Makefile.PL
deleted file mode 100644
index 60656c518692..000000000000
--- a/textproc/p5-XML-Simple/files/5.005_03-Makefile.PL
+++ /dev/null
@@ -1,20 +0,0 @@
---- Makefile.PL~	Wed Nov 17 09:43:52 2004
-+++ Makefile.PL	Fri Dec  3 18:27:40 2004
-@@ -2,17 +2,6 @@
- 
- use ExtUtils::MakeMaker;
- 
--BEGIN {
--  if($] < 5.006) {
--    warn
--      qq(This version of XML::Simple requires Perl version 5.6 or better.\n) .
--      qq(You might prefer to install an older version of XML::Simple\n\n) .
--      qq(  perl -MCPAN -e "install 'G/GR/GRANTM/XML-Simple-1.08.tar.gz'"\n\n);
--  }
--}
--
--require 5.006;
--
- my $make_params = {
-     'NAME'          => 'XML::Simple',
-     'VERSION_FROM'  => 'lib/XML/Simple.pm',
diff --git a/textproc/p5-XML-Simple/files/5.005_03-lib::XML::Simple.pm b/textproc/p5-XML-Simple/files/5.005_03-lib::XML::Simple.pm
deleted file mode 100644
index a1ef3ce58a01..000000000000
--- a/textproc/p5-XML-Simple/files/5.005_03-lib::XML::Simple.pm
+++ /dev/null
@@ -1,41 +0,0 @@
---- lib/XML/Simple.pm.orig	Mon Apr  5 09:12:47 2004
-+++ lib/XML/Simple.pm	Thu Jun 17 13:41:37 2004
-@@ -331,7 +331,7 @@
-   if($filename) {
-     # $tree = $xp->parsefile($filename);  # Changed due to prob w/mod_perl
-     local(*XML_FILE);
--    open(XML_FILE, '<', $filename) || croak qq($filename - $!);
-+    open(XML_FILE, '<'. $filename) || croak qq($filename - $!);
-     $tree = $xp->parse(*XML_FILE);
-     close(XML_FILE);
-   }
-@@ -541,9 +541,9 @@
-     }
-     else {
-       local(*OUT);
--      open(OUT, '>', "$self->{opt}->{outputfile}") ||
-+      open(OUT, '>'. "$self->{opt}->{outputfile}") ||
-         croak "open($self->{opt}->{outputfile}): $!";
--      binmode(OUT, ':utf8') if($] >= 5.008);
-+#      binmode(OUT, ':utf8') if($] >= 5.008);
-       print OUT $xml || croak "print: $!";
-       close(OUT);
-     }
-@@ -1535,7 +1535,7 @@
- sub numeric_escape {
-   my($self, $data, $level) = @_;
- 
--  use utf8; # required for 5.6
-+#  use utf8; # required for 5.6
- 
-   if($self->{opt}->{numericescape} eq '2') {
-     $data =~ s/([^\x00-\x7F])/'&#' . ord($1) . ';'/gse;
-@@ -1569,7 +1569,7 @@
-   my @keys = $self->{opt}->{nosort} ? keys %$hashref : sort keys %$hashref;
-   foreach $key (@keys) {
-     $value = $hashref->{$key};
--    return($hashref) unless(UNIVERSAL::isa($value, 'HASH'));
-+    return($hashref) unless(UNIVERSAL::isa($value||'', 'HASH'));
- 
-     if(ref($self->{opt}->{keyattr}) eq 'HASH') {
-       return($hashref) unless(defined($self->{opt}->{keyattr}->{$parent}));