From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Jun 25 05:50:16 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 20A7416A41C for ; Sat, 25 Jun 2005 05:50:16 +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 EC8C343D1D for ; Sat, 25 Jun 2005 05:50:15 +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 j5P5oFji047095 for ; Sat, 25 Jun 2005 05:50:15 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j5P5oFkJ047094; Sat, 25 Jun 2005 05:50:15 GMT (envelope-from gnats) Resent-Date: Sat, 25 Jun 2005 05:50:15 GMT Resent-Message-Id: <200506250550.j5P5oFkJ047094@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Christopher Nehren Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7FD0A16A41C for ; Sat, 25 Jun 2005 05:42:41 +0000 (GMT) (envelope-from apeiron@coitusmentis.info) Received: from coitusmentis.info (pcp01649268pcs.levtwn01.pa.comcast.net [68.32.0.126]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2F12B43D48 for ; Sat, 25 Jun 2005 05:42:41 +0000 (GMT) (envelope-from apeiron@coitusmentis.info) Received: by prophecy.velum (Postfix, from userid 1000) id 7C1131CC3D; Sat, 25 Jun 2005 01:42:40 -0400 (EDT) Message-Id: <20050625054240.7C1131CC3D@prophecy.velum> Date: Sat, 25 Jun 2005 01:42:40 -0400 (EDT) From: Christopher Nehren To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/82631: [PATCH] Unbreak www/p5-Kwiki-ModPerl with www/mod_perl2, take 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: Sat, 25 Jun 2005 05:50:16 -0000 >Number: 82631 >Category: ports >Synopsis: [PATCH] Unbreak www/p5-Kwiki-ModPerl with www/mod_perl2, take MAINTAINERship >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sat Jun 25 05:50:15 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@prophecy.dyndns.org:/usr/obj/usr/src/sys/PROPHECY i386 >Description: www/p5-Kwiki-ModPerl was marked BROKEN because of the change in the mod_perl 2.0 API. Unbreak by updating to 0.08 and replacing an outdated REINPLACE_CMD. This requires pulling in www/p5-CGI.pm because the CGI.pm which is in perl 5.8.6 isn't capable of dealing with the recent mod_perl 2.0 API, and Kwiki::ModPerl uses CGI.pm for part of its work in the mod_perl environment. Also, while I'm here, take maintainership, and update the pkg-message to give correct and more generally useful information in the WITH_APACHE2 case. >How-To-Repeat: Try to install the port with a recent mod_perl2 installation. >Fix: --- Makefile.orig Sat Jun 25 01:23:36 2005 +++ Makefile Sat Jun 25 01:22:18 2005 @@ -6,13 +6,13 @@ # PORTNAME= Kwiki-ModPerl -PORTVERSION= 0.06 +PORTVERSION= 0.08 CATEGORIES= www perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN} MASTER_SITE_SUBDIR= Kwiki PKGNAMEPREFIX= p5- -MAINTAINER= ports@FreeBSD.org +MAINTAINER= apeiron+ports@coitusmentis.info COMMENT= Enable Kwiki to work under mod_perl BUILD_DEPENDS= ${SITE_PERL}/Kwiki.pm:${PORTSDIR}/www/p5-Kwiki @@ -21,10 +21,12 @@ PERL_CONFIGURE= yes .if defined(WITH_APACHE2) -BROKEN= Broken due the new mod_perl2 API -BUILD_DEPENDS+= ${LOCALBASE}/libexec/apache2/mod_perl.so:${PORTSDIR}/www/mod_perl2 +# Newer versions of mod_perl 2 require a newer version of CGI.pm than is shipped +# with Perl 5.8.6. +BUILD_DEPENDS+= ${LOCALBASE}/libexec/apache2/mod_perl.so:${PORTSDIR}/www/mod_perl2 \ + ${SITE_PERL}/CGI.pm:${PORTSDIR}/www/p5-CGI.pm pre-patch: - @${REINPLACE_CMD} -e 's|mod_perl|Apache2::mod_perl|g' ${WRKSRC}/Makefile.PL + @${REINPLACE_CMD} -e 's|mod_perl|mod_perl2|g' ${WRKSRC}/Makefile.PL .else BUILD_DEPENDS+= ${LOCALBASE}/libexec/apache/libperl.so:${PORTSDIR}/www/mod_perl .endif --- distinfo.orig Sat Jun 25 01:22:25 2005 +++ distinfo Sat Jun 25 01:22:31 2005 @@ -1,2 +1,2 @@ -MD5 (Kwiki-ModPerl-0.06.tar.gz) = b27b50056ba8b2557ce808ec84ebe222 -SIZE (Kwiki-ModPerl-0.06.tar.gz) = 9726 +MD5 (Kwiki-ModPerl-0.08.tar.gz) = 370edecf467f239c030dd6a3860eb6f7 +SIZE (Kwiki-ModPerl-0.08.tar.gz) = 9927 --- pkg-message.orig Sat Jun 25 01:03:54 2005 +++ pkg-message Sat Jun 25 01:13:00 2005 @@ -1,23 +1,37 @@ /* ================================================================= */ Note: Kwiki-ModPerl plugin installed! Now you should modify - your Apache configuration: + your Apache configuration: - - SetHandler perl-script - PerlSetVar KwikiBaseDir /path/to/webroot/kwiki - PerlHandler +Kwiki::ModPerl - + + SetHandler perl-script + PerlSetVar KwikiBaseDir /path/to/webroot/kwiki + PerlHandler +Kwiki::ModPerl + - If you have a custom lib directory for your Kwiki: + If you have a custom lib directory for your Kwiki: - - use lib '/path/to/webroot/kwiki/lib'; - + + use lib '/path/to/webroot/kwiki/lib'; + - If you're using mod_perl2, please add the following line - into your httpd.conf: + If you're using mod_perl2, please ensure that the following + modules are referenced by either your httpd.conf or a file + referenced by a PerlRequire directive: - PerlModule Apache2 + Apache2::URI + Apache2::SubRequest + Apache2::ServerUtil + Apache2::Response + Apache2::RequestUtil + Apache2::RequestIO + Apache2::Request + Apache2::Log + Apache2::Access + Apache2::Const + APR::Table + + Most mod_perl 2 applications require these modules at a minimum, so you + may have them listed already. /* ================================================================= */ >Release-Note: >Audit-Trail: >Unformatted: