Index: head/www/p5-PLP/Makefile
===================================================================
--- head/www/p5-PLP/Makefile	(revision 137907)
+++ head/www/p5-PLP/Makefile	(revision 137908)
@@ -1,61 +1,61 @@
 # New ports collection makefile for:	PLP
 # Date created:				Sun May 23 13:27:20 EDT 2004
 # Whom:					Christopher Nehren <apeiron@comcast.net>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	PLP
 PORTVERSION=	3.18
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	http://plp.juerd.nl/files/
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	apeiron@comcast.net
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A simple Perl embedder superficially resembling PHP
 
 PERL_CONFIGURE=	yes
 
 MAN3=		PLP.3 PLP::FAQ.3 PLP::Fields.3 PLP::Functions.3 PLP::HowTo.3 \
 		PLP::Tie::Delay.3 PLP::Tie::Headers.3 PLP::Tie::Print.3
 
 .if defined(WITH_MOD_PERL)
 .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
 .endif
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 500600
 IGNORE=	"Perl 5.6 or newer required. Install lang/perl5.[6,8] and try again"
 .endif
 
 pre-fetch:
 	@${ECHO_CMD}
 .if defined(WITH_MOD_PERL)
 .if ${WITH_MOD_PERL} == 1
 	@${ECHO_CMD} "Enabling mod_perl 1.x support."
 .elif ${WITH_MOD_PERL} == 2
 	@${ECHO_CMD} "Be aware that the patch to make PLP function with mod_perl 2 is"
 	@${ECHO_CMD} "both unofficial and unsupported. It requires mod_perl 2's mod_perl 1"
 	@${ECHO_CMD} "compatibility interface. In using mod_perl 2 you are assumed to know"
 	@${ECHO_CMD} "what you are doing."
 .endif
 .else
 	@${ECHO_CMD} "This port supports either mod_perl 1 or mod_perl 2 (with an"
 	@${ECHO_CMD} "experimental patch and mod_perl 2's compat interface)."
 	@${ECHO_CMD} "mod_perl is not required for PLP to function, but you"
 	@${ECHO_CMD} "can expect a 50-200% speed increase with mod_perl support."
 	@${ECHO_CMD}
 	@${ECHO_CMD} "  WITH_MOD_PERL=1  Enables mod_perl 1.x support"
-	@${ECHO_CMD} "  WITH_MOD_PERL=2 Enables unofficial, experimental mod_perl 2.x support"
+	@${ECHO_CMD} "  WITH_MOD_PERL=2  Enables unofficial, experimental mod_perl 2.x support"
 .endif
 	@${ECHO_CMD}
 .include <bsd.port.post.mk>

Property changes on: head/www/p5-PLP/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.4
\ No newline at end of property
+1.5
\ No newline at end of property
Index: head/www/p5-PLP/files/extra-patch-mod_perl2.pm
===================================================================
--- head/www/p5-PLP/files/extra-patch-mod_perl2.pm	(revision 137907)
+++ head/www/p5-PLP/files/extra-patch-mod_perl2.pm	(revision 137908)
@@ -1,53 +1,54 @@
---- PLP.pm.orig	Fri Oct 18 15:47:07 2002
-+++ PLP.pm	Tue Jun  1 15:49:07 2004
-@@ -131,7 +131,12 @@
+--- PLP.pm.orig	Wed Jun 22 04:02:50 2005
++++ PLP.pm	Wed Jun 22 04:02:52 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;
 +    }
      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';
 -    return Apache::Constants::OK();
 +    if($ENV{'mod_perl2_compat'} eq 'on') {
-+	    return Apache::Const::OK;
++	    return Apache2::Const::OK;
 +    }
 +    else {
 +	return Apache::Constants::OK();
 +    }
  }
  
  # 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) {
 -	return Apache::Constants::NOT_FOUND();
 +	if($ENV{'mod_perl2_compat'} eq 'on') {
-+		return Apache::Const::NOT_FOUND();
++		return Apache2::Const::NOT_FOUND;
 +	}
 +	else {
 +		return Apache::Constants::NOT_FOUND();
 +	}
      }
      unless (-r _) {
 -	return Apache::Constants::FORBIDDEN();
 +	if($ENV{'mod_perl2_compat'} eq 'on') {
-+		return Apache::Const::FORBIDDEN();
++		return Apache2::Const::FORBIDDEN;
 +	}
 +	else {
 +		return Apache::Constants::FORBIDDEN();
 +	}
      }
      
      $ENV{PLP_NAME} = $r->uri;

Property changes on: head/www/p5-PLP/files/extra-patch-mod_perl2.pm
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1
\ No newline at end of property
+1.2
\ No newline at end of property