ports/131649: port patch fix - www/mod_lisp2 - fix for apache22

[Erik Greenwald]

>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 <stdlib.h>
  #include <string.h>
  
@@ -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: