From lth@dask.thegler.dk  Thu Jun 17 14:25:45 2004
Return-Path: <lth@dask.thegler.dk>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id ECBF616A4D0
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 17 Jun 2004 14:25:43 +0000 (GMT)
Received: from cicero0.cybercity.dk (cicero0.cybercity.dk [212.242.40.52])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 1780743D54
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 17 Jun 2004 14:25:42 +0000 (GMT)
	(envelope-from lth@dask.thegler.dk)
Received: from dask.thegler.dk (port156.ds1-bav.adsl.cybercity.dk [217.157.188.161])
	by cicero0.cybercity.dk (Postfix) with ESMTP
	id 3B4FA29445; Thu, 17 Jun 2004 16:24:49 +0200 (CEST)
Received: by dask.thegler.dk (Postfix, from userid 1001)
	id CC9503EEA; Thu, 17 Jun 2004 16:24:48 +0200 (CEST)
Message-Id: <20040617142448.CC9503EEA@dask.thegler.dk>
Date: Thu, 17 Jun 2004 16:24:48 +0200 (CEST)
From: Lars Thegler <lth@FreeBSD.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc: andrew@ugh.net.au
Subject: [PATCH] textproc/p5-XML-Simple: update to 2.12
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         68046
>Category:       ports
>Synopsis:       [PATCH] textproc/p5-XML-Simple: update to 2.12
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    lth
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jun 17 14:30:22 GMT 2004
>Closed-Date:    Thu Jul 01 20:00:53 GMT 2004
>Last-Modified:  Thu Jul 01 20:00:53 GMT 2004
>Originator:     Lars Thegler
>Release:        FreeBSD 4.10-BETA i386
>Organization:
>Environment:
System: FreeBSD dask.thegler.dk 4.10-BETA FreeBSD 4.10-BETA #3: Mon Apr 12 17:02:50 CEST 2004
>Description:
- Update to 2.12

Port maintainer (andrew@ugh.net.au) is cc'd.

Generated with FreeBSD Port Tools 0.50
>How-To-Repeat:
>Fix:

--- p5-XML-Simple-2.12.patch begins here ---
diff -ruN --exclude=CVS /usr/home/lth/cvs/ports/textproc/p5-XML-Simple.old/Makefile /usr/home/lth/cvs/ports/textproc/p5-XML-Simple/Makefile
--- /usr/home/lth/cvs/ports/textproc/p5-XML-Simple.old/Makefile	Mon Jan  5 09:00:10 2004
+++ /usr/home/lth/cvs/ports/textproc/p5-XML-Simple/Makefile	Thu Jun 17 15:31:29 2004
@@ -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 @@
 
 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>
diff -ruN --exclude=CVS /usr/home/lth/cvs/ports/textproc/p5-XML-Simple.old/distinfo /usr/home/lth/cvs/ports/textproc/p5-XML-Simple/distinfo
--- /usr/home/lth/cvs/ports/textproc/p5-XML-Simple.old/distinfo	Fri Mar 19 02:51:14 2004
+++ /usr/home/lth/cvs/ports/textproc/p5-XML-Simple/distinfo	Tue Jun 15 12:03:39 2004
@@ -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
diff -ruN --exclude=CVS /usr/home/lth/cvs/ports/textproc/p5-XML-Simple.old/files/5.005_03-lib::XML::Simple.pm /usr/home/lth/cvs/ports/textproc/p5-XML-Simple/files/5.005_03-lib::XML::Simple.pm
--- /usr/home/lth/cvs/ports/textproc/p5-XML-Simple.old/files/5.005_03-lib::XML::Simple.pm	Thu Jan  1 01:00:00 1970
+++ /usr/home/lth/cvs/ports/textproc/p5-XML-Simple/files/5.005_03-lib::XML::Simple.pm	Thu Jun 17 15:43:12 2004
@@ -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}));
--- p5-XML-Simple-2.12.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->lth 
Responsible-Changed-By: lth 
Responsible-Changed-When: Fri Jun 18 07:03:43 GMT 2004 
Responsible-Changed-Why:  
I'll handle this. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=68046 
State-Changed-From-To: open->closed 
State-Changed-By: lth 
State-Changed-When: Thu Jul 1 19:59:40 GMT 2004 
State-Changed-Why:  
Committed after maintainer timeout. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=68046 
>Unformatted:
