ports/82457: [PATCH] www/p5-PLP with new mod_perl, relinquish MAINTAINERship

[Christopher Nehren]

>Number:         82457
>Category:       ports
>Synopsis:       [PATCH] www/p5-PLP with new mod_perl, relinquish MAINTAINERship
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jun 20 22:10:19 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Christopher Nehren
>Release:        FreeBSD 5.4-STABLE i386
>Organization:
Pigritia Solutions
>Environment:
System: FreeBSD prophecy.dyndns.org 5.4-STABLE FreeBSD 5.4-STABLE #0: Fri Jun 10 17:11:45 EDT 2005 root at prophecy.dyndns.org:/usr/obj/usr/src/sys/PROPHECY i386


	
>Description:
www/p5-PLP was recently broken by the new mod_perl 2.0 API changes. The attached
patch fixes things. However, I no longer use PLP, so reset MAINTAINER.
>How-To-Repeat:
Try to install www/p5-PLP with a new mod_perl 2.0.
>Fix:

diff -aru p5-PLP/Makefile /usr/ports/www/p5-PLP/Makefile
--- p5-PLP/Makefile	Tue May 17 13:18:22 2005
+++ /usr/ports/www/p5-PLP/Makefile	Mon Jun 20 17:51:29 2005
@@ -11,7 +11,7 @@
 MASTER_SITES=	http://plp.juerd.nl/files/
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	apeiron at comcast.net
+MAINTAINER=	ports at FreeBSD.org
 COMMENT=	A simple Perl embedder superficially resembling PHP
 
 PERL_CONFIGURE=	yes
@@ -23,8 +23,7 @@
 .if ${WITH_MOD_PERL} == 1
 RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl
 .elif ${WITH_MOD_PERL} == 2
-BROKEN=		Broken due the new mod_perl2 API
-RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Apache2/mod_perl.pm:${PORTSDIR}/www/mod_perl2
+RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/mod_perl2.pm:${PORTSDIR}/www/mod_perl2
 EXTRA_PATCHES=	${PATCHDIR}/extra-patch-mod_perl2.pm
 .else
 IGNORE=	WITH_MOD_PERL must be either '1' or '2', or undefined
Only in /usr/ports/www/p5-PLP: README.html
diff -aru p5-PLP/files/extra-patch-mod_perl2.pm /usr/ports/www/p5-PLP/files/extra-patch-mod_perl2.pm
--- p5-PLP/files/extra-patch-mod_perl2.pm	Fri Mar 11 17:23:27 2005
+++ /usr/ports/www/p5-PLP/files/extra-patch-mod_perl2.pm	Mon Jun 20 17:50:43 2005
@@ -1,12 +1,13 @@
 --- PLP.pm.orig	Fri Oct 18 15:47:07 2002
-+++ PLP.pm	Tue Jun  1 15:49:07 2004
-@@ -131,7 +131,12 @@
++++ /usr/local/lib/perl5/site_perl/5.8.6/PLP.pm	Mon Jun 20 17:49:49 2005
+@@ -131,7 +131,13 @@
  
  # This is the mod_perl handler.
  sub handler {
 -    require Apache::Constants;
 +    if($ENV{'mod_perl2_compat'} eq 'on') {
-+	    use Apache::Const -compile => qw(OK);
++	    require Apache2::Const;
++	    import Apache2::Const -compile => qw(OK);
 +    }
 +    else {
 +	require Apache::Constants;
@@ -14,7 +15,7 @@
      clean();
      if (my $ret = mod_perl_init($_[0])) {
  	return $ret;
-@@ -139,7 +144,12 @@
+@@ -139,7 +145,12 @@
      #S start($_[0]);
      start();
      no strict 'subs';
@@ -28,7 +29,7 @@
  }
  
  # mod_perl initializer: returns 0 on success, Apache error code on failure
-@@ -151,10 +161,20 @@
+@@ -151,10 +162,20 @@
      $ENV{PLP_FILENAME} = my $filename = $r->filename;
      
      unless (-f $filename) {
>Release-Note:
>Audit-Trail:
>Unformatted: