mod_fastcgi / apache 2.2 not working

[Dominic Mitchell]

Has naybody managed to get Apache 2.2 and mod_fastcgi to work together
yet?  I've got a patch which lets me build the thing, but it still
fails when I try to start up apache:

    httpd: Syntax error on line 79 of /usr/local/etc/apache22/httpd.conf: \
    Cannot load /usr/local/libexec/apache22/mod_fastcgi.so into server: \
    /usr/local/libexec/apache22/mod_fastcgi.so: Undefined symbol "ap_table_get"

This is the patch so far.  It's very ugly and doesn't take into account 
any other versions...  Does anybody have any ideas on how to get this to
work?

Thanks,
-Dom

P.S.  I tried building mod_fcgid as well, but that failed too.  So I went
back to mod_fastcgi.

    arch/unix//fcgid_proc_unix.c: In function `proc_print_exit_info':
    arch/unix//fcgid_proc_unix.c:770: error: `AP_SIG_GRACEFUL' undeclared (first use in this function)

========================================================================

diff -burN /usr/ports/www/mod_fastcgi/Makefile mod_fastcgi/Makefile
--- /usr/ports/www/mod_fastcgi/Makefile	Sun Oct  2 09:07:32 2005
+++ mod_fastcgi/Makefile	Tue Dec 20 14:44:33 2005
@@ -25,9 +25,9 @@
 WITH_APACHE2=	YES
 MAKEFILE=	Makefile.AP2
 USE_REINPLACE=	YES
-MAKE_ARGS=	INCLUDES=-I${PREFIX}/include/apache2
-INSTALL_TARGET=	install-modules
-PLIST_SUB=	APACHE=2
+MAKE_ARGS=	INCLUDES="-I${PREFIX}/include/apache22 -I${PREFIX}/include/apr-1"
+INSTALL_TARGET=	install-modules-yes
+PLIST_SUB=	APACHE=22
 .else
 PLIST_SUB=	APACHE=
 .endif
@@ -38,7 +38,10 @@
 
 do-patch:
 .if defined(WITH_APACHE2)
-	@${REINPLACE_CMD} -e "s|/usr/local/apache2|${PREFIX}/share/apache2|g" ${WRKSRC}/${MAKEFILE}
+	@${REINPLACE_CMD} -e "s|/usr/local/apache2|${PREFIX}/share/apache22|g" ${WRKSRC}/${MAKEFILE}
+	@${REINPLACE_CMD} -e "s|ap_null_cleanup|apr_pool_cleanup_null|g" ${WRKSRC}/mod_fastcgi.c
+	@${REINPLACE_CMD} -e "s|ap_table_do|apr_table_do|g" ${WRKSRC}/mod_fastcgi.c
+	@${REINPLACE_CMD} -e "s|ap_table_get|apr_table_get|g" ${WRKSRC}/mod_fastcgi.c
 .else
 	cd ${WRKSRC} ; ${MV} Makefile.tmpl Makefile ;