Index: Mk/bsd.apache.mk
===================================================================
--- Mk/bsd.apache.mk	(revision 301868)
+++ Mk/bsd.apache.mk	(working copy)
@@ -115,12 +115,17 @@
 
 # ===============================================================
 .if defined(AP_PORT_IS_SERVER)
-# For slave ports:
-.if defined(SLAVE_DESIGNED_FOR) && ${PORTVERSION} != ${SLAVE_DESIGNED_FOR}
-IGNORE=	Sorry, ${SLAVENAME} and ${PORTNAME} versions are out of sync ${PORTVERSION} != ${SLAVE_DESIGNED_FOR}
-.endif
 
-# used by www/cakeph* ports
+# TODO remove this check XXX
+# === SLAVE_DESIGNED_FOR is nowhere used!
+# found only one a removed reference in apache22-peruser-mpm
+#  http://svnweb.freebsd.org/ports?view=revision&revision=253708
+## For slave ports:
+#.if defined(SLAVE_DESIGNED_FOR) && ${PORTVERSION} != ${SLAVE_DESIGNED_FOR}
+#IGNORE=	Sorry, ${SLAVENAME} and ${PORTNAME} versions are out of sync ${PORTVERSION} != ${SLAVE_DESIGNED_FOR}
+#.endif
+
+# used by www/cakephp* ports
 .if defined(SLAVE_PORT_MODULES)
 DEFAULT_MODULES_CATEGORIES+=	SLAVE_PORT
 ALL_MODULES_CATEGORIES+=		SLAVE_PORT
@@ -168,15 +173,30 @@
 			--disable-proxy-scgi --disable-reqtimeout
 .endif
 
-.if defined(OPTIONS) && !(make(make-options-list))
+# ============= rewrite for options NG ===============
+
+
+# ==================================================
+#.if defined(OPTIONS) && !(make(make-options-list))
+.if !(make(make-options-list))
+# honor make.conf
+.if defined(WITHOUT_MODULES)
+.for module in ${WITHOUT_MODULES}
+AVAILABLE_MODULES:= ${AVAILABLE_MODULES:N${module}}
+.endfor
+.endif
+
 .for module in ${AVAILABLE_MODULES}
-.	if defined(WITH_${module:U})
+.	if ${PORT_OPTIONS:M${module:U}}
 _APACHE_MODULES+=	${module}
+.	else
+WITHOUT_MODULES+=	${module}
 .	endif
-.	if defined(WITHOUT_${module:U})
-WITHOUT_MODULES+=	 ${module}
-.	endif
 .endfor
+
+#.warning _APACHE_MODULES ${_APACHE_MODULES}
+#.warning WITHOUT_MODULES ${WITHOUT_MODULES}
+
 .elif defined(WITH_MODULES)
 _APACHE_MODULES+=	${WITH_MODULES}
 .else
@@ -192,11 +212,17 @@
 _APACHE_MODULES+=	${${category}_MODULES}
 .	endif
 .endfor
-.if defined(WITH_EXTRA_MODULES)
-_APACHE_MODULES+=	${WITH_EXTRA_MODULES}
-.endif
-.endif
 
+# TODO remove this check XXX
+# WITH_EXTRA_MODULES last and removed reference in apache22/Makefile.modules
+# http://www.freebsd.org/cgi/cvsweb.cgi/ports/www/apache22/Makefile.modules.diff?r1=text&tr1=1.1&r2=text&tr2=1.3
+#.if defined(WITH_EXTRA_MODULES)
+#_APACHE_MODULES+=	${WITH_EXTRA_MODULES}
+#.endif
+
+.endif # OPTIONS !make-options-list
+# ==================================================
+
 .if !defined(WITH_STATIC_APACHE)
 .	if ${USE_APACHE:Mcommon2*} != ""
 # FYI
@@ -210,7 +236,7 @@
 WITH_ALL_STATIC_MODULES=	YES
 .endif
 
-.if defined(WITH_SUEXEC) || defined(WITH_SUEXEC_MODULES)
+.if ${PORT_OPTIONS:MSUEXEC} || defined(WITH_SUEXEC_MODULES)
 .	if ${USE_APACHE:Mcommon2*} != ""
 _APACHE_MODULES+=		${SUEXEC_MODULES}
 SUEXEC_CONFARGS=	with-suexec
@@ -241,27 +267,21 @@
 .endif
 
 .if !defined(WITHOUT_MODULES)
-APACHE_MODULES=		${_APACHE_MODULES}
+APACHE_MODULES:=	${_APACHE_MODULES:O:u}
 .else
-APACHE_MODULES!=	\
-			for module in ${_APACHE_MODULES}; do \
-				${ECHO_CMD} ${WITHOUT_MODULES} | ${GREP} -wq $${module} 2> /dev/null || \
-				${ECHO_CMD} $${module}; \
-			done
+.  for module in ${WITHOUT_MODULES}
+APACHE_MODULES=		${_APACHE_MODULES:N${module}}
+.  endfor
 .endif
 
 .if defined(WITH_STATIC_MODULES)
-STATIC_MODULE_CONFARG=	--enable-$${module}
-DSO_MODULE_CONFARG=		--enable-$${module}=shared
-_CONFIGURE_ARGS!=	\
-			for module in ${APACHE_MODULES} ; do \
-				${ECHO_CMD} ${WITH_STATIC_MODULES} | \
-					${GREP} -wq $${module} 2> /dev/null ; \
-				if [ "$${?}" = "0" ] ; then \
-						${ECHO_CMD} "${STATIC_MODULE_CONFARG}"; \
-					else \
-						${ECHO_CMD} "${DSO_MODULE_CONFARG}"; \
-					fi; done
+.  for module in ${APACHE_MODULES}
+.    if ${WITH_STATIC_MODULES:M${module}}
+_CONFIGURE_ARGS+=	--enable-${module}
+.    else	
+_CONFIGURE_ARGS+=	--enable-${module}=shared
+.    endif
+.  endfor
 CONFIGURE_ARGS+=	${_CONFIGURE_ARGS}
 .elif defined(WITH_STATIC_APACHE) || defined(WITH_ALL_STATIC_MODULES)
 WITH_STATIC_MODULES=	${APACHE_MODULES}
@@ -271,11 +291,11 @@
 .endif
 
 .if defined(WITH_STATIC_MODULES)
-_SHARED_MODULES!=	\
-			for module in ${APACHE_MODULES} ; do \
-				${ECHO_CMD} ${WITH_STATIC_MODULES} | ${GREP} -wq $${module} 2> /dev/null || \
-				${ECHO_CMD} $${module}; \
-			done
+.  for module in ${APACHE_MODULES}
+.    if ${WITH_STATIC_MODULES:M${module}}
+_SHARED_MODULES+=	${module}
+.    endif
+.  endfor
 SHARED_MODULES=		${_SHARED_MODULES}
 .elif !defined(WITH_ALL_STATIC_MODULES)
 SHARED_MODULES=		${APACHE_MODULES}
@@ -301,6 +321,7 @@
 
 .if exists(${HTTPD})
 _APACHE_VERSION!=	${HTTPD} -V | ${SED} -ne 's/^Server version: Apache\/\([0-9]\)\.\([0-9]*\).*/\1\2/p'
+# XXX from mod_perl-2.0.6/Changes
 # Apache 2.4 and onwards doesn't require linking the MPM module
 # directly in the httpd binary anymore. APXS lost the MPM_NAME query,
 # so we can't assume a given MPM anymore.