1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-02-03 11:12:13 +00:00

Update to 2.12

PR:		68046
Approved by:	maintainer timeout, erwin (implicit)
This commit is contained in:
Lars Thegler 2004-07-01 19:59:02 +00:00
parent 6de9071e46
commit 6305b97f40
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=112689
3 changed files with 53 additions and 4 deletions

View File

@ -6,7 +6,7 @@
#
PORTNAME= XML-Simple
PORTVERSION= 2.09
PORTVERSION= 2.12
CATEGORIES= textproc perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= XML
@ -22,4 +22,12 @@ PERL_CONFIGURE= YES
MAN3= XML::Simple.3 XML::Simple::FAQ.3
.include <bsd.port.mk>
.include <bsd.port.pre.mk>
.if ${PERL_LEVEL} <= 500503
EXTRA_PATCHES= ${PATCHDIR}/5.005_03-lib::XML::Simple.pm
post-configure:
${PERL} -pi -e 's/(\(POD2MAN_EXE\))/$$1 --lax/' ${WRKSRC}/Makefile
.endif
.include <bsd.port.post.mk>

View File

@ -1,2 +1,2 @@
MD5 (XML-Simple-2.09.tar.gz) = 7138184cbfe3c1d26c98ff55690a679d
SIZE (XML-Simple-2.09.tar.gz) = 59459
MD5 (XML-Simple-2.12.tar.gz) = 001884c8f2f9ccbee61e5e72547309ad
SIZE (XML-Simple-2.12.tar.gz) = 65543

View File

@ -0,0 +1,41 @@
--- 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}));