From leeym@utopia.leeym.com  Thu Jul 28 16:14:05 2005
Return-Path: <leeym@utopia.leeym.com>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 0808F16A420
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 28 Jul 2005 16:14:05 +0000 (GMT)
	(envelope-from leeym@utopia.leeym.com)
Received: from msr30.hinet.net (msr30.hinet.net [168.95.4.130])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 6247C43D4C
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 28 Jul 2005 16:14:04 +0000 (GMT)
	(envelope-from leeym@utopia.leeym.com)
Received: from utopia.leeym.com (utopia.leeym.com [211.21.137.52])
	by msr30.hinet.net (8.9.3/8.9.3) with ESMTP id AAA18375;
	Fri, 29 Jul 2005 00:13:46 +0800 (CST)
Received: from localhost (localhost [127.0.0.1])
	by utopia.leeym.com (Postfix) with ESMTP id B12A5B29CE4;
	Fri, 29 Jul 2005 00:13:44 +0800 (CST)
Received: from utopia.leeym.com ([127.0.0.1])
 by localhost (utopia.leeym.com [127.0.0.1]) (amavisd-new, port 10024)
 with ESMTP id 90825-03; Fri, 29 Jul 2005 00:13:38 +0800 (CST)
Received: by utopia.leeym.com (Postfix, from userid 1000)
	id D5292B29CE2; Fri, 29 Jul 2005 00:13:38 +0800 (CST)
Message-Id: <20050728161338.D5292B29CE2@utopia.leeym.com>
Date: Fri, 29 Jul 2005 00:13:38 +0800 (CST)
From: Yen-Ming Lee <leeym@freebsd.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc: nistor@snickers.org
Subject: [PATCH] www/p5-Apache-ParseFormData: update for mod_perl2
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         84233
>Category:       ports
>Synopsis:       [PATCH] www/p5-Apache-ParseFormData: update for mod_perl2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    leeym
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jul 28 16:20:21 GMT 2005
>Closed-Date:    Wed Aug 31 17:53:19 GMT 2005
>Last-Modified:  Wed Aug 31 17:53:19 GMT 2005
>Originator:     Yen-Ming Lee
>Release:        FreeBSD 5.4-STABLE i386
>Organization:
FreeBSD Taiwan
>Environment:
System: FreeBSD utopia.leeym.com 5.4-STABLE FreeBSD 5.4-STABLE #0: Sun Jul 17 07:50:25 CST 2005
>Description:
- update for mod_perl2 and unbreak this port

Added file(s):
- files/patch-ParseFormData.pm

Port maintainer (nistor@snickers.org) is cc'd.

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

--- p5-Apache-ParseFormData-0.09.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/www/p5-Apache-ParseFormData/Makefile,v
retrieving revision 1.3
diff -u -u -r1.3 Makefile
--- Makefile	23 Jul 2005 02:53:40 -0000	1.3
+++ Makefile	28 Jul 2005 16:12:29 -0000
@@ -15,22 +15,21 @@
 MAINTAINER=	nistor@snickers.org
 COMMENT=	Module allows you to easily decode/parse form and query data
 
-BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Apache2/mod_perl.pm:${PORTSDIR}/www/mod_perl2
+BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/mod_perl2.pm:${PORTSDIR}/www/mod_perl2
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
 
-BROKEN=		Broken due the new mod_perl2 API
-DEPRECATED=	${BROKEN}
-EXPIRATION_DATE=2005-09-22
-
 MAN3=		Apache::ParseFormData.3
 
+post-patch:
+	@${FIND} ${WRKSRC} -name "*.orig" -delete
+
 .include <bsd.port.pre.mk>
 
 # mod_perl 2 requires it
 .if ${PERL_LEVEL} < 500800
-IGNORE=         requires perl 5.8.x or later. Install lang/perl5.8 then try again
+IGNORE=		requires perl 5.8.x or later. Install lang/perl5.8 then try again
 .endif
 
 .include <bsd.port.post.mk>
Index: files/patch-ParseFormData.pm
===================================================================
RCS file: files/patch-ParseFormData.pm
diff -N files/patch-ParseFormData.pm
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-ParseFormData.pm	28 Jul 2005 16:12:29 -0000
@@ -0,0 +1,58 @@
+--- ParseFormData.pm.orig	Fri Jul 29 00:00:48 2005
++++ ParseFormData.pm	Fri Jul 29 00:01:41 2005
+@@ -11,9 +11,9 @@
+ package Apache::ParseFormData;
+ 
+ use strict;
+-use Apache::Log;
+-use Apache::Const -compile => qw(OK M_POST M_GET FORBIDDEN HTTP_REQUEST_ENTITY_TOO_LARGE);
+-use Apache::RequestIO ();
++use Apache2::Log;
++use Apache2::Const -compile => qw(OK M_POST M_GET FORBIDDEN HTTP_REQUEST_ENTITY_TOO_LARGE);
++use Apache2::RequestIO ();
+ use APR::Table;
+ use IO::File;
+ use POSIX qw(tmpnam);
+@@ -44,12 +44,12 @@
+ 	if(my $data = $self->headers_in->get('cookie')) {
+ 		&_parse_query($self, $data, " *; *");
+ 	}
+-	if($self->method_number == Apache::M_POST) {
++	if($self->method_number == Apache2::Const::M_POST) {
+ 		$self->pnotes('apr_req_result' => &parse_content($self, \%args));
+-	} elsif($self->method_number == Apache::M_GET) {
++	} elsif($self->method_number == Apache2::Const::M_GET) {
+ 		my $data = $self->args();
+ 		&_parse_query($self, $data) if($data);
+-		$self->pnotes('apr_req_result' => Apache::OK);
++		$self->pnotes('apr_req_result' => Apache2::Const::OK);
+ 	}
+ 	return($self);
+ }
+@@ -139,7 +139,7 @@
+ 		my $error_str = "[Apache::ParseFormData] file upload forbidden";
+ 		$r->notes->set("error-notes" => $error_str);
+ 		$r->log_error($error_str);
+-		return(Apache::FORBIDDEN);
++		return(Apache2::Const::FORBIDDEN);
+ 	}
+ 	my $rm = $r->remaining;
+ 	if($args->{'post_max'} && ($rm > $args->{'post_max'})) {
+@@ -147,7 +147,7 @@
+ 		my $error_str = "[Apache::ParseFormData] entity too large ($rm, max=$pm)";
+ 		$r->notes->set("error-notes" => $error_str);
+ 		$r->log_error($error_str);
+-		return(Apache::HTTP_REQUEST_ENTITY_TOO_LARGE);
++		return(Apache2::Const::HTTP_REQUEST_ENTITY_TOO_LARGE);
+ 	}
+ 	if($ct =~ /^multipart\/form-data; boundary=(.+)$/) {
+ 		my $boundary = $1;
+@@ -196,7 +196,7 @@
+ 		$r->get_client_block($buf, $len);
+ 		&_parse_query($r, $buf) if($buf);
+ 	}
+-	return(Apache::OK);
++	return(Apache2::Const::OK);
+ }
+ 
+ sub extract_headers {
--- p5-Apache-ParseFormData-0.09.patch ends here ---

>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: leeym 
State-Changed-When: Thu Jul 28 17:26:21 GMT 2005 
State-Changed-Why:  
The maintainer is noticed. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=84233 
Responsible-Changed-From-To: freebsd-ports-bugs->leeym 
Responsible-Changed-By: leeym 
Responsible-Changed-When: Thu Jul 28 17:26:25 GMT 2005 
Responsible-Changed-Why:  
I will take care of this PR. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=84233 
State-Changed-From-To: feedback->closed 
State-Changed-By: leeym 
State-Changed-When: Wed Aug 31 17:53:17 GMT 2005 
State-Changed-Why:  
Committed, thanks. 

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