Fix ap2-fastcgi build against apr-1.* (needed for apache22).

3 files changed, 56 insertions, 5 deletions

diff --git a/www/ap-fastcgi/distinfo b/www/ap-fastcgi/distinfo
index f668d00d5d3..fc429cc5cb9 100644
--- a/www/ap-fastcgi/distinfo
+++ b/www/ap-fastcgi/distinfo
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.4 2005/02/24 14:08:27 wiz Exp $
+$NetBSD: distinfo,v 1.5 2006/12/18 12:39:45 abs Exp $
 
 SHA1 (mod_fastcgi-2.4.2.tar.gz) = a56be62a3f08262ae187989f5dacb3464a030e2e
 RMD160 (mod_fastcgi-2.4.2.tar.gz) = 83c01567bb9a6d39345573137408615260972e1e
 Size (mod_fastcgi-2.4.2.tar.gz) = 98295 bytes
-SHA1 (patch-aa) = a0f9456c2a0fe2791125f376a998940f4e4655a6
+SHA1 (patch-aa) = ce5cb8956728c5295b2de849e9f5b9e0abfec613
 SHA1 (patch-ab) = 257d7e2b65fedd630e85acfb77bb9b6ddd21c6bf
 SHA1 (patch-ac) = 2cc983a1f3d63a650fb648e60b3529c677857695
 SHA1 (patch-ad) = c020c369f3075c28d30087e1b72ae6b0a3105373
 SHA1 (patch-ae) = b934b3bc5b40dd62d70a06458849ca1049a3c9ae
+SHA1 (patch-af) = 4b35e483fe867959c29a6dbda05845f00670f91a
diff --git a/www/ap-fastcgi/patches/patch-aa b/www/ap-fastcgi/patches/patch-aa
index b1b9ef83203..ff80cb8a8f5 100644
--- a/www/ap-fastcgi/patches/patch-aa
+++ b/www/ap-fastcgi/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.1 2004/10/28 21:01:50 cube Exp $
+$NetBSD: patch-aa,v 1.2 2006/12/18 12:39:45 abs Exp $
 
---- fcgi.h.orig	2003-02-04 00:07:37.000000000 +0100
+--- fcgi.h.orig	2003-02-03 23:07:37.000000000 +0000
 +++ fcgi.h
 @@ -19,15 +19,15 @@
  #endif
@@ -47,7 +47,44 @@ $NetBSD: patch-aa,v 1.1 2004/10/28 21:01:50 cube Exp $
  typedef void apcb_t;
  #define APCB_OK 
  
-@@ -95,7 +95,7 @@ typedef void apcb_t;
+@@ -88,6 +88,36 @@ typedef void apcb_t;
+ #endif
+ 
+ #endif /* !APACHE2 */
++ 
++/* starting with apache 2.2 the backward-compatibility defines for
++ * 1.3 APIs are not available anymore. Define them ourselves here.
++ */
++#ifndef ap_copy_table
++
++#define ap_copy_table apr_table_copy
++#define ap_cpystrn apr_cpystrn
++#define ap_destroy_pool apr_pool_destroy
++#define ap_isspace apr_isspace
++#define ap_make_array apr_array_make
++#define ap_make_table apr_table_make
++#define ap_null_cleanup apr_pool_cleanup_null 
++#define ap_palloc apr_palloc
++#define ap_pcalloc apr_pcalloc
++#define ap_psprintf apr_psprintf
++#define ap_pstrcat apr_pstrcat
++#define ap_pstrdup apr_pstrdup
++#define ap_pstrndup apr_pstrndup
++#define ap_push_array apr_array_push
++#define ap_register_cleanup apr_pool_cleanup_register
++#define ap_snprintf apr_snprintf
++#define ap_table_add apr_table_add
++#define ap_table_do apr_table_do
++#define ap_table_get apr_table_get
++#define ap_table_set apr_table_set
++#define ap_table_setn apr_table_setn
++#define ap_table_unset apr_table_unset
++
++#endif /* defined(ap_copy_table) */
+ 
+ #ifndef NO_WRITEV 
+ #include <sys/uio.h>
+@@ -95,7 +125,7 @@ typedef void apcb_t;
  
  #ifdef WIN32
  #ifndef APACHE2
diff --git a/www/ap-fastcgi/patches/patch-af b/www/ap-fastcgi/patches/patch-af
new file mode 100644
index 00000000000..a0f8e3ceddb
--- /dev/null
+++ b/www/ap-fastcgi/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1 2006/12/18 12:39:45 abs Exp $
+
+--- Makefile.AP2.orig	2002-07-29 02:36:34.000000000 +0100
++++ Makefile.AP2
+@@ -20,8 +20,6 @@ APACHECTL = apachectl
+ 
+ all: local-shared-build
+ 
+-install: install-modules
+-
+ clean:
+ 	-rm -f *.o *.lo *.slo *.la 
+