diff options
| author | sem <sem@FreeBSD.org> | 2005-06-23 17:01:47 +0800 |
|---|---|---|
| committer | sem <sem@FreeBSD.org> | 2005-06-23 17:01:47 +0800 |
| commit | bbed579fff6d9686da354cf4156751d2ea3f6add (patch) | |
| tree | 9b58eeb1519dfb17778b98a36f15c4775335974a /www | |
| parent | 7f37322046808df06e188d2d65235ba32bc9cb66 (diff) | |
| download | freebsd-ports-graphics-bbed579fff6d9686da354cf4156751d2ea3f6add.tar.gz freebsd-ports-graphics-bbed579fff6d9686da354cf4156751d2ea3f6add.tar.zst freebsd-ports-graphics-bbed579fff6d9686da354cf4156751d2ea3f6add.zip | |
- Reviving with mod_perl2 new API
- Drop maintainership
PR: ports/82457
Submitted by: maintainer
Diffstat (limited to 'www')
| -rw-r--r-- | www/p5-PLP/Makefile | 8 | ||||
| -rw-r--r-- | www/p5-PLP/files/extra-patch-mod_perl2.pm | 19 |
2 files changed, 14 insertions, 13 deletions
diff --git a/www/p5-PLP/Makefile b/www/p5-PLP/Makefile index 154dcc56ec4..4fe4c832953 100644 --- a/www/p5-PLP/Makefile +++ b/www/p5-PLP/Makefile @@ -7,11 +7,12 @@ 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 @@ -23,8 +24,7 @@ MAN3= PLP.3 PLP::FAQ.3 PLP::Fields.3 PLP::Functions.3 PLP::HowTo.3 \ .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 @@ -55,7 +55,7 @@ pre-fetch: @${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> diff --git a/www/p5-PLP/files/extra-patch-mod_perl2.pm b/www/p5-PLP/files/extra-patch-mod_perl2.pm index 3258fa4eca4..79904663b9a 100644 --- a/www/p5-PLP/files/extra-patch-mod_perl2.pm +++ b/www/p5-PLP/files/extra-patch-mod_perl2.pm @@ -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 @@ +--- 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; @@ -14,13 +15,13 @@ 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(); @@ -28,13 +29,13 @@ } # 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(); @@ -43,7 +44,7 @@ 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(); |