From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Feb 13 16:20:03 2009 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3D20E1065674 for ; Fri, 13 Feb 2009 16:20:03 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 1B3A48FC1B for ; Fri, 13 Feb 2009 16:20:03 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n1DGK2K0022052 for ; Fri, 13 Feb 2009 16:20:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n1DGK2TW022043; Fri, 13 Feb 2009 16:20:02 GMT (envelope-from gnats) Resent-Date: Fri, 13 Feb 2009 16:20:02 GMT Resent-Message-Id: <200902131620.n1DGK2TW022043@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, Erik Greenwald Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 33B8A1065670 for ; Fri, 13 Feb 2009 16:16:01 +0000 (UTC) (envelope-from erik@sinistar.bluecows.com) Received: from sinistar.bluecows.com (sinistar.bluecows.com [205.167.142.250]) by mx1.freebsd.org (Postfix) with ESMTP id 16A0F8FC0A for ; Fri, 13 Feb 2009 16:16:01 +0000 (UTC) (envelope-from erik@sinistar.bluecows.com) Received: by sinistar.bluecows.com (Postfix, from userid 1015) id AF492434001; Fri, 13 Feb 2009 09:45:55 -0600 (CST) Message-Id: <20090213154555.AF492434001@sinistar.bluecows.com> Date: Fri, 13 Feb 2009 09:45:55 -0600 (CST) From: Erik Greenwald To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: erik@bz.bzflag.bz, marc.battyani@fractalconcept.com Subject: ports/131649: port patch fix - www/mod_lisp2 - fix for apache22 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Erik Greenwald List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Feb 2009 16:20:03 -0000 >Number: 131649 >Category: ports >Synopsis: port patch fix - www/mod_lisp2 - fix for apache22 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Feb 13 16:20:01 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Erik Greenwald >Release: FreeBSD 7.1-PRERELEASE i386 >Organization: >Environment: >Description: Apache 2.2 now sets the APR version as 1.3.0. mod_lisp2 looks for an APR version of 1.2.2-1.2.inf. This patch allows it to correctly see the bump in the minor, allowing mod_lisp2 to compile against apache22. >How-To-Repeat: cd /usr/ports/www/apache22 && make instll && cd ../mod_lisp2 && make >Fix: --- www_mod_lisp2.patch begins here --- Index: www/mod_lisp2/files/patch-mod_lisp2.c =================================================================== RCS file: /home/ncvs/ports/www/mod_lisp2/files/patch-mod_lisp2.c,v retrieving revision 1.1 diff -u -r1.1 patch-mod_lisp2.c --- www/mod_lisp2/files/patch-mod_lisp2.c 21 Jun 2008 12:36:42 -0000 1.1 +++ www/mod_lisp2/files/patch-mod_lisp2.c 13 Feb 2009 15:33:27 -0000 @@ -1,6 +1,6 @@ ---- mod_lisp2.c.orig 2008-06-17 17:51:40.000000000 +0200 -+++ mod_lisp2.c 2008-06-17 17:53:20.000000000 +0200 -@@ -153,7 +153,7 @@ +--- mod_lisp2.c.orig 2007-07-17 09:11:05.000000000 -0400 ++++ mod_lisp2.c 2009-02-13 10:30:48.000000000 -0500 +@@ -153,11 +153,11 @@ #include #include @@ -9,6 +9,11 @@ /* Work out the version of the apache portable runtime (APR) we're * compiling against... with version 1.2.2 some of the interfaces * changed a bit. */ +-#if (APR_MAJOR_VERSION==1 && APR_MINOR_VERSION==2 && APR_PATCH_VERSION>=2) ++#if (APR_MAJOR_VERSION==1 && ((APR_MINOR_VERSION==2 && APR_PATCH_VERSION>=2) || APR_MINOR_VERSION>=3)) + #define HAVE_APR_1_2_2 1 + #endif + @@ -576,7 +576,7 @@ lisp_handler (request_rec * r) { --- www_mod_lisp2.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: