- Simplify options with the removal of the last APR only related parameter [1]

- disallow IPv6 sockets to handle IPv4 requests per default. [2]

- move extra-patch-server__config.c
    -> patch-server__config.c
    https://issues.apache.org/bugzilla/show_bug.cgi?id=53823

- bump PORTREVISION

[1] Credits to Hajimu UMEMOTO (ume@) for finding the last APR related parameter
[2] http://httpd.apache.org/docs/2.2/bind.html

with hat apache@

1 files changed, 6 insertions, 9 deletions

diff --git a/www/apache22/Makefile.modules b/www/apache22/Makefile.modules
index c642233ff195..bf372b93f3a8 100644
--- a/www/apache22/Makefile.modules
+++ b/www/apache22/Makefile.modules
@@ -82,7 +82,9 @@ LATEST_LINK=		apache22-${WITH_MPM}-mpm
 .if ${WITH_MPM} == "worker" || ${WITH_MPM} == "event"
 PORT_OPTIONS+=		CGID
 .if ${PORT_OPTIONS:MCGI}
-IGNORE=	does not build with CGI. Please de-select CGI and select CGID instead
+IGNORE= When using a multi-threaded MPM, the module CGID should be used in place CGI. \
+	Please de-select CGI and select CGID instead. \
+	See http://httpd.apache.org/docs/2.2/mod/mod_cgi.html
 .endif
 .if exists(${APR_CONFIG}) && !defined(APR_HAS_THREADS)
 IGNORE=	requires APR threads. Please rebuild APR with THREAD support
@@ -143,16 +145,11 @@ IGNORE=	MEM_CACHE requires APR threads. Please rebuild APR with THREAD support
 .  endif
 .endif
 
-.if empty(PORT_OPTIONS:MIPV6)
-CONFIGURE_ARGS+=	--disable-ipv6
+# http://httpd.apache.org/docs/2.2/bind.html
+.if ${PORT_OPTIONS:MIPV4_MAPPED}
+CONFIGURE_ARGS+=	--enable-v4-mapped
 .else
-CATEGORIES+=		ipv6
-EXTRA_PATCHES+=		${PATCHDIR}/extra-patch-server__config.c
-.  if ${PORT_OPTIONS:MIPV6_V6ONLY}
 CONFIGURE_ARGS+=	--disable-v4-mapped
-.  else
-CONFIGURE_ARGS+=	--enable-v4-mapped
-.  endif
 .endif
 
 CONFIGURE_ARGS+=	--with-mpm=${WITH_MPM}