pkg/32685: ap-auth-mysql fails with apache2

[collver%peak.org@localhost]

>Number:         32685
>Category:       pkg
>Synopsis:       ap-auth-mysql fails with apache2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Wed Feb 01 00:10:00 +0000 2006
>Originator:     collver%peak.org@localhost
>Release:        NetBSD 3.0
>Organization:
>Environment:
System: NetBSD sanctum 3.0 NetBSD 3.0 (SANCTUM) #0: Sun Dec 25 11:35:26 PST 
2005 ben@sanctum:/home/ben/src/netbsd/3.0/src/sys/arch/i386/compile/SANCTUM i386
Architecture: i386
Machine: i386
>Description:
When building ap-auth-mysql with apache2, the build fails.

>How-To-Repeat:
Try building ap-auth-mysql with _PKG_APACHE=apache2 in /etc/mk.conf

You will get an error:
configure: error: Apache extension helper apxs not found!

This is because the configure script is trying to find apxs from apache13.

If you pass the configure script --disable-apache13 --enable-apache2, then
you avert this error only to find another:
mod_auth_mysql.c:51:20: ap_md5.h: No such file or directory

This is because the Makefile includes www/apache/module.mk, and it is
still trying to build an apache13 module.

If you remove the module.mk include, then the build succeeds with apache2.

>Fix:
--- Makefile.orig       2006-01-31 23:43:16.000000000 +0000
+++ Makefile    2006-01-31 23:59:10.000000000 +0000
@@ -21,6 +21,14 @@
                        -lmysqlclient                                   \
                        ${COMPILER_RPATH_FLAG}${PREFIX}/lib/mysql
 
+.include "../../mk/apache.mk"
+
+.if ${PKG_APACHE} == "apache13"
+CONFIGURE_ARGS+=       --enable-apache13 --disable-apache2
+.else
+CONFIGURE_ARGS+=       --disable-apache13 --enable-apache2
+.endif
+
 APACHE_MODULE=         YES
 APACHE_MODULE_NAME=    mod_auth_mysql.so
 
@@ -30,6 +38,4 @@
        ${INSTALL_DATA} ${WRKSRC}/USAGE ${PREFIX}/share/doc/mod_auth_mysql
 
 .include "../../mk/mysql.buildlink3.mk"
-.include "../../mk/apache.mk"
-.include "../../www/apache/module.mk"
 .include "../../mk/bsd.pkg.mk"