ports/91813: [patch] www/apache22 build fails when WITH_MPM option enabled

[Hirohisa Yamaguchi]

>Number:         91813
>Category:       ports
>Synopsis:       [patch] www/apache22 build fails when WITH_MPM option enabled
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jan 15 04:50:05 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Hirohisa Yamaguchi
>Release:        FreeBSD 7.0-CURRENT amd64
>Organization:
<organization of PR author (multiple lines)>
>Environment:
System: FreeBSD calliope.****.org 7.0-CURRENT FreeBSD 7.0-CURRENT #0: Mon Nov 7 17:32:33 JST 2005 root at calliope.****.org:/usr/obj/usr/src/sys/CALLIOPE64 amd64

>Description:
	When I tried to build apache-worker-2.2.0_5, I got:

# make WITH_MPM=worker
"/usr/ports/www/apache22/Makefile.modules", line 118: Malformed conditional (${WITH_PTHREAD_LIBS} != "c_r" && ${OSVERSION} > 500023)
"/usr/ports/www/apache22/Makefile.modules", line 121: Malformed conditional (${ARCH} == i386)
"/usr/ports/www/apache22/Makefile.modules", line 124: if-less else
"/usr/ports/www/apache22/Makefile.modules", line 126: if-less endif
"/usr/ports/www/apache22/Makefile.modules", line 127: if-less endif
make: fatal errors encountered -- cannot continue
	
>How-To-Repeat:
	# cd ports/www/apache22
	# make WITH_MPM=worker
			or perchild, threadpool, event, prefork
>Fix:

	my patch follows:

diff -pu portstmp/www/apache22/Makefile ports/www/apache22/Makefile
--- portstmp/www/apache22/Makefile	Sun Jan 15 01:03:42 2006
+++ ports/www/apache22/Makefile	Sun Jan 15 13:22:53 2006
@@ -128,7 +128,6 @@ CONFIGURE_ARGS+=	--with-ldap \
 .endif
 
 .include "${APACHEDIR}/Makefile.doc"
-.include "${APACHEDIR}/Makefile.modules"
 
 .include <bsd.port.pre.mk>
 
@@ -146,6 +145,8 @@ CONFIGURE_ENV+=	USE_BUNDLED_APR=YES
 
 WITH_PTHREAD_LIBS?=	${PTHREAD_LIBS:S/-l//:S/-//}
 WITH_PTHREAD_CFLAGS?=	${PTHREAD_CFLAGS}
+
+.include "${APACHEDIR}/Makefile.modules"
 
 CONFIGURE_ARGS+=	--with-mpm=${WITH_MPM:L} ${CONFIGURE_TARGET}
 
>Release-Note:
>Audit-Trail:
>Unformatted: