From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Jun 22 08:10:23 2005 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 287E616A41C for ; Wed, 22 Jun 2005 08:10:23 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0713A43D49 for ; Wed, 22 Jun 2005 08:10:23 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j5M8AM79023546 for ; Wed, 22 Jun 2005 08:10:22 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j5M8AMGA023545; Wed, 22 Jun 2005 08:10:22 GMT (envelope-from gnats) Date: Wed, 22 Jun 2005 08:10:22 GMT Message-Id: <200506220810.j5M8AMGA023545@freefall.freebsd.org> To: freebsd-ports-bugs@FreeBSD.org From: Christopher Nehren Cc: Subject: Re: ports/82457: [PATCH] www/p5-PLP with new mod_perl, relinquish MAINTAINERship X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Christopher Nehren List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Jun 2005 08:10:23 -0000 The following reply was made to PR ports/82457; it has been noted by GNATS. From: Christopher Nehren To: bug-followup@FreeBSD.org Cc: Subject: Re: ports/82457: [PATCH] www/p5-PLP with new mod_perl, relinquish MAINTAINERship Date: Wed, 22 Jun 2005 04:09:42 -0400 --H1spWtNR+x+ondvy Content-Type: multipart/mixed; boundary="y0ulUmNC+osPPQO6" Content-Disposition: inline --y0ulUmNC+osPPQO6 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Bleh. That patch is wrong. The one attached hereto does work. --=20 I abhor a system designed for the "user", if that word is a coded pejorative meaning "stupid and unsophisticated". -- Ken Thompson If you ask the wrong people questions, you get "Joel on Software". Unix is user friendly. However, it isn't idiot friendly. --y0ulUmNC+osPPQO6 Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="p5-PLP.diff" Content-Transfer-Encoding: quoted-printable --- Makefile.orig Wed Jun 22 04:08:05 2005 +++ Makefile Wed Jun 22 04:08:32 2005 @@ -7,11 +7,12 @@ =20 PORTNAME=3D PLP PORTVERSION=3D 3.18 +PORTREVISION=3D 1 CATEGORIES=3D www perl5 MASTER_SITES=3D http://plp.juerd.nl/files/ PKGNAMEPREFIX=3D p5- =20 -MAINTAINER=3D apeiron@comcast.net +MAINTAINER=3D ports@FreeBSD.org COMMENT=3D A simple Perl embedder superficially resembling PHP =20 PERL_CONFIGURE=3D yes @@ -23,8 +24,7 @@ .if ${WITH_MOD_PERL} =3D=3D 1 RUN_DEPENDS+=3D ${SITE_PERL}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_= perl .elif ${WITH_MOD_PERL} =3D=3D 2 -BROKEN=3D Broken due the new mod_perl2 API -RUN_DEPENDS+=3D ${SITE_PERL}/${PERL_ARCH}/Apache2/mod_perl.pm:${PORTSDIR}/= www/mod_perl2 +RUN_DEPENDS+=3D ${SITE_PERL}/${PERL_ARCH}/mod_perl2.pm:${PORTSDIR}/www/mod= _perl2 EXTRA_PATCHES=3D ${PATCHDIR}/extra-patch-mod_perl2.pm .else IGNORE=3D WITH_MOD_PERL must be either '1' or '2', or undefined --- files/extra-patch-mod_perl2.pm.orig Wed Jun 22 04:03:06 2005 +++ files/extra-patch-mod_perl2.pm Wed Jun 22 04:03:16 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 @@ +--- PLP.pm.orig Wed Jun 22 04:02:50 2005 ++++ PLP.pm Wed Jun 22 04:02:52 2005 +@@ -131,7 +131,13 @@ =20 # This is the mod_perl handler. sub handler { - require Apache::Constants; + if($ENV{'mod_perl2_compat'} eq 'on') { -+ use Apache::Const -compile =3D> qw(OK); ++ require Apache2::Const; ++ import Apache2::Const -compile =3D> qw(OK); + } + else { + require Apache::Constants; @@ -14,13 +15,13 @@ clean(); if (my $ret =3D 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 @@ } =20 # mod_perl initializer: returns 0 on success, Apache error code on failure -@@ -151,10 +161,20 @@ +@@ -151,10 +162,20 @@ $ENV{PLP_FILENAME} =3D my $filename =3D $r->filename; =20 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(); --y0ulUmNC+osPPQO6-- --H1spWtNR+x+ondvy Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (FreeBSD) iD8DBQFCuRzGk/lo7zvzJioRAoWDAKC012ZqcL8P3guugqDHItYqgJk3gACfaY6e UKdagaZJLIzhPae3xS+a7Ls= =KHln -----END PGP SIGNATURE----- --H1spWtNR+x+ondvy--