- rewrite bsd.apache.mk (prepare for options NG support)

   keep full backward support until apache20 is removed from the tree
   comment code to remove with MFC TODO:

- adjust apache20 and apache22 ports
   changes are transparent for users (no PORTREVISION bump)

 Users who are using special build instructions in make.conf, such as
  - WITH_STATIC_MODULES= alias dir log_config mime rewrite setenvif vhost_alias

 should convert the values to UPPERCASE
  - WITH_STATIC_MODULES= ALIAS DIR LOG_CONFIG MIME REWRITE SETENVIF VHOST_ALIAS

 At the moment code to support old lowercase style is in place, but
 target to remove in favor for options NG.

with hat apache@

7 files changed, 153 insertions, 157 deletions

diff --git a/Mk/bsd.apache.mk b/Mk/bsd.apache.mk
index 3c62a49349d4..36ede056a62d 100644
--- a/Mk/bsd.apache.mk
+++ b/Mk/bsd.apache.mk
@@ -92,9 +92,9 @@ _ERROR_MSG=	: Error from bsd.apache.mk.
 #  two versions or in combination with range!
 .if defined(USE_APACHE) && !empty(USE_APACHE)
 .	if ${USE_APACHE:Mcommon*} != ""
-AP_PORT_IS_SERVER=	YES
+AP_PORT_IS_SERVER=	yes
 .	elif ${USE_APACHE:C/\-//:S/^20//:S/^22//:C/\+$//} == ""
-AP_PORT_IS_MODULE=	YES
+AP_PORT_IS_MODULE=	yes
 .		if ${USE_APACHE:C/\-//:S/^20//:S/^22//} == "+"
 AP_PLUS=	yes
 .		endif
@@ -115,12 +115,16 @@ IGNORE=	${_ERROR_MSG} Illegal use of USE_APACHE ( no version specified )
 
 # ===============================================================
 .if defined(AP_PORT_IS_SERVER)
+# MFC TODO: remove this check
+# used only in apache22-peruser-mpm, remved in rev. 253708
+#  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/cakeph* ports
+# MFC TODO: remove this check
+# used only by www/cakephp* ports
 .if defined(SLAVE_PORT_MODULES)
 DEFAULT_MODULES_CATEGORIES+=	SLAVE_PORT
 ALL_MODULES_CATEGORIES+=		SLAVE_PORT
@@ -129,71 +133,75 @@ ALL_MODULES_CATEGORIES+=		SLAVE_PORT
 # Module selection
 .for category in ${DEFAULT_MODULES_CATEGORIES}
 DEFAULT_MODULES+=			${${category}_MODULES}
-WITH_${category}_MODULES= 	YES
+WITH_${category}_MODULES= 	yes
 .endfor
 
 .for category in ${ALL_MODULES_CATEGORIES}
 AVAILABLE_MODULES+=			${${category}_MODULES}
 .endfor
 
+# == start convert param to UPPERCASE
+# detect lowercase params in make.conf, users should them to UPPERCASE
+# In near future we will throw an IGNORE message
+#_ERROR_DLCM=	... detected (make.conf), please convert apache releated params to UPPERCASE
+.if defined(WITH_MODULES) && ${WITH_MODULES:M[a-z]*}
+#IGNNORE=	lowercase WITH_MODULES=  ${_ERROR_DLCM}
+WITH_MODULES:=${WITH_MODULES:U}
+.endif
+.if defined(WITHOUT_MODULES) && ${WITHOUT_MODULES:M[a-z]*}
+#IGNORE=		lowercase WITHOUT_MODULES= ${_ERROR_DLCM}
+WITHOUT_MODULES:=${WITHOUT_MODULES:U}
+.endif
+.if defined(WITH_STATIC_MODULES) && ${WITH_STATIC_MODULES:M[a-z]*}
+#IGNORE=		lowercase WITH_STATIC_MODULES= ${_ERROR_DLCM}
+WITH_STATIC_MODULES:=${WITH_STATIC_MODULES:U}
+.endif
+# == end convert param to UPPERCASE
+
 # Setting "@comment " as default.
-.for module in ${AVAILABLE_MODULES}
-${module}_PLIST_SUB=		"@comment "
+.for module in ${AVAILABLE_MODULES:O}
+${module}_PLIST_SUB=	"@comment "
+_DISABLE_MODULES+=		--disable-${module:L}
 .endfor
 
 # Configure
 # dirty hacks to make sure all modules are disabled before we select them
-.if ${USE_APACHE} == common20
-CONFIGURE_ARGS+=	--disable-access --disable-auth \
-			--disable-charset-lite --disable-include \
-			--disable-log-config --disable-env --disable-setenvif \
-			--disable-mime --disable-status --disable-autoindex \
-			--disable-asis --disable-cgid --disable-cgi \
-			--disable-negotiation --disable-dir --disable-imap \
-			--disable-actions --disable-userdir --disable-alias
-.elif ${USE_APACHE} == common22
-CONFIGURE_ARGS+=	--disable-authn-file --disable-authn-default \
-			--disable-authz-host --disable-authz-groupfile \
-			--disable-authz-user --disable-authz-default \
-			--disable-auth-basic --disable-charset-lite \
-			--disable-include --disable-log-config --disable-env \
-			--disable-setenvif --disable-mime --disable-status \
-			--disable-autoindex --disable-asis --disable-cgid \
-			--disable-cgi --disable-negotiation --disable-dir \
-			--disable-imagemap --disable-actions --disable-userdir \
-			--disable-alias --disable-filter --disable-substitute \
-			--disable-proxy --disable-proxy-connect \
-			--disable-proxy-ftp --disable-proxy-http \
-			--disable-proxy-ajp --disable-proxy-balancer \
-			--disable-proxy-scgi --disable-reqtimeout
-.endif
-
-.if defined(OPTIONS) && !(make(make-options-list))
+.if ${USE_APACHE:Mcommon2*}
+CONFIGURE_ARGS+= 		${_DISABLE_MODULES:O:u}
+.endif
+
+.if ( defined(OPTIONS) || defined(OPTIONS_DEFINE) ) && !(make(make-options-list))
 .for module in ${AVAILABLE_MODULES}
-.	if defined(WITH_${module:U})
+.	if defined(WITH_${module})
 _APACHE_MODULES+=	${module}
 .	endif
-.	if defined(WITHOUT_${module:U})
+.	if defined(WITHOUT_${module})
 WITHOUT_MODULES+=	 ${module}
 .	endif
 .endfor
+
+# MFC TODO: remove together with apache20
 .elif defined(WITH_MODULES)
 _APACHE_MODULES+=	${WITH_MODULES}
 .else
+# MFC TODO: remove together with apache20
 .for category in ${ALL_MODULES_CATEGORIES}
 .	if defined (WITHOUT_${category}_MODULES) || defined (WITH_CUSTOM_${category})
 .		if defined(WITH_${category}_MODULES})
 .			undef WITH_${category}_MODULES
 .		endif
 .		if defined (WITH_CUSTOM_${category})
-_APACHE_MODULES+=	${WITH_CUSTOM_${category}}
+_APACHE_MODULES+=	${WITH_CUSTOM_${category}:U}
 .		endif
 .	elif defined(WITH_${category}_MODULES)
-_APACHE_MODULES+=	${${category}_MODULES}
+_APACHE_MODULES+=	${${category}_MODULES:U}
 .	endif
 .endfor
+# MFC TODO: remove this check
+# last usage of WITH_EXTRA_MODULES 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}
+_APACHE_MODULES+=	${WITH_EXTRA_MODULES:U}
 .endif
 .endif
 
@@ -207,7 +215,7 @@ CONFIGURE_ARGS+=	--enable-so
 .	if ${USE_APACHE:Mcommon2*} != ""
 CONFIGURE_ARGS+=	--disable-so
 .	endif
-WITH_ALL_STATIC_MODULES=	YES
+WITH_ALL_STATIC_MODULES=	yes
 .endif
 
 .if defined(WITH_SUEXEC) || defined(WITH_SUEXEC_MODULES)
@@ -243,39 +251,36 @@ CONFIGURE_ARGS+=		--${SUEXEC_CONFARGS}-umask=${SUEXEC_UMASK}
 .if !defined(WITHOUT_MODULES)
 APACHE_MODULES=		${_APACHE_MODULES}
 .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 ${_APACHE_MODULES:O:u}
+.	if !${WITHOUT_MODULES:M${module}}
+APACHE_MODULES+=	${module}
+.	endif
+.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
-CONFIGURE_ARGS+=	${_CONFIGURE_ARGS}
+.  for module in ${APACHE_MODULES}
+.    if ${WITH_STATIC_MODULES:M${module}}
+_CONFIGURE_ARGS+=	--enable-${module:L}
+.    else
+_CONFIGURE_ARGS+=	--enable-${module:L}=shared
+.    endif
+.  endfor
+CONFIGURE_ARGS+=	${_CONFIGURE_ARGS:O}
 .elif defined(WITH_STATIC_APACHE) || defined(WITH_ALL_STATIC_MODULES)
 WITH_STATIC_MODULES=	${APACHE_MODULES}
-CONFIGURE_ARGS+=	--enable-modules="${APACHE_MODULES}"
+CONFIGURE_ARGS+=	--enable-modules="${APACHE_MODULES:O:L}"
 .else
-CONFIGURE_ARGS+=	--enable-mods-shared="${APACHE_MODULES}"
+CONFIGURE_ARGS+=	--enable-mods-shared="${APACHE_MODULES:O:L}"
 .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}
@@ -285,8 +290,8 @@ SHARED_MODULES=		${APACHE_MODULES}
 ${module}_PLIST_SUB=	""
 .endfor
 
-.for module in ${AVAILABLE_MODULES}
-PLIST_SUB+=	MOD_${module:U}=${${module}_PLIST_SUB}
+.for module in ${AVAILABLE_MODULES:O:u}
+PLIST_SUB+=	MOD_${module}=${${module}_PLIST_SUB}
 .endfor
 #### End of AP_PORT_IS_SERVER ####
 
@@ -301,6 +306,7 @@ SRC_FILE?=	${MODULENAME}.c
 
 .if exists(${HTTPD})
 _APACHE_VERSION!=	${HTTPD} -V | ${SED} -ne 's/^Server version: Apache\/\([0-9]\)\.\([0-9]*\).*/\1\2/p'
+# XXX see 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.
@@ -457,36 +463,32 @@ show-categories:
 
 .if !target(show-modules)
 show-modules:
-	@for module in ${AVAILABLE_MODULES} ; do \
-	${ECHO_MSG} -n "$${module}: "; \
-	if ${ECHO_CMD} ${APACHE_MODULES} | ${GREP} -wq $${module} 2> /dev/null ; \
-	then \
-		${ECHO_CMD} -n "enabled "; \
-			if ${ECHO_CMD} ${WITH_STATIC_MODULES} | ${GREP} -wq $${module} 2> /dev/null ; then \
-				${ECHO_CMD} "(static)" ; \
-			else \
-				${ECHO_CMD} "(shared)" ;\
-			fi;\
-	else \
-		${ECHO_CMD} disabled ;\
-	fi;\
-	done
+.for module in ${AVAILABLE_MODULES}
+	@${PRINTF} "%-20s : " ${module}
+.	if ${APACHE_MODULES:M${module}}
+		@${ECHO} -n "enabled "
+.		if !empty(WITH_STATIC_MODULES) && ${WITH_STATIC_MODULES:M${module}}
+				@${ECHO_CMD} " (static)"
+.		else
+				@${ECHO_CMD} "(shared)"
+.		endif
+.	else
+		@${ECHO_CMD} disabled
+.	endif
+.endfor
 .endif
 
+# MFC TODO: remove this target it's useless with options NG
 .if !target(make-options-list)
 make-options-list:
 	@${ECHO_CMD} OPTIONS+= \\;
-	@for module in ${AVAILABLE_MODULES} ; do \
-	if ${ECHO_CMD} ${APACHE_MODULES} | ${GREP} -wq $${module} 2> /dev/null ; \
-	then \
-		${PRINTF} "\t `${ECHO_CMD} $${module} | ${TR} '[:lower:]' '[:upper:]'` \"Enable mod_$${module}\" ON \\"; \
-		${ECHO_CMD}; \
-	else \
-		${PRINTF} "\t `${ECHO_CMD} $${module} | ${TR} '[:lower:]' '[:upper:]'` \"Enable mod_$${module}\" OFF \\";\
-		${ECHO_CMD}; \
-	fi;\
-	done; \
-	${ECHO_CMD};
+.for module in ${AVAILABLE_MODULES}
+.	if ${APACHE_MODULES:M${module}}
+		@${ECHO} -e "\t ${module} \"mod_${module:L}\" on \\"
+.	else
+		@${ECHO} -e "\t ${module} \"mod_${module:L}\" off \\"
+.	endif
+.endfor
 .endif
 
 .elif defined(AP_PORT_IS_MODULE)
diff --git a/www/apache20/Makefile b/www/apache20/Makefile
index 35621fc528e7..7b99379b9406 100644
--- a/www/apache20/Makefile
+++ b/www/apache20/Makefile
@@ -186,7 +186,7 @@ pre-everything::
 	@${ECHO_MSG}    "  You can check your modules configuration by using make show-modules"
 	@${ECHO_MSG}	""
 	@${ECHO_MSG}    "To save apache.org bandwidth, please use the closest"
-	@${ECHO_MSG}    "mirror. Hit Ctrl+C now and do a "make print-closest-mirrors."
+	@${ECHO_MSG}    "mirror. Hit Ctrl+C now and do a \"make print-closest-mirrors\"."
 	@${ECHO_MSG}	"To automatically update /etc/make.conf do:"
 	@${ECHO_MSG}	"make print-closest-mirrors >> /etc/make.conf"
 	@${ECHO_MSG}	""
diff --git a/www/apache20/Makefile.doc b/www/apache20/Makefile.doc
index b01c7250cb82..622f94389e7d 100644
--- a/www/apache20/Makefile.doc
+++ b/www/apache20/Makefile.doc
@@ -79,10 +79,10 @@
 ##      show-categories:          prints list of modules sorted by category
 ##
 ## Examples:
-##      make WITH_STATIC_MODULES="ssl rewrite include" WITH_EXPERIMENTAL_MODULES=yes \
-##           WITH_CUSTOM_AUTH="auth auth_dbm"
-##      make WITHOUT_MODULES="access speling status" WITH_PROXY_MODULES=yes
-##      make WITH_MODULES="include rewrite auth"
+##      make WITH_STATIC_MODULES="SSL REWRITE INCLUDE" WITH_EXPERIMENTAL_MODULES=yes \
+##           WITH_CUSTOM_AUTH="AUTH AUTH_DBM"
+##      make WITHOUT_MODULES="ACCESS SPELING STATUS" WITH_PROXY_MODULES=yes
+##      make WITH_MODULES="INCLUDE REWRITE AUTH"
 ##
 ##      Note: If you define your custom options in /etc/make.conf, don't forget
 ##            to do not use quotes.
diff --git a/www/apache20/Makefile.modules b/www/apache20/Makefile.modules
index c83d8a6804b5..009a0d3ba607 100644
--- a/www/apache20/Makefile.modules
+++ b/www/apache20/Makefile.modules
@@ -42,7 +42,7 @@ PKGNAMESUFFIX=		-${WITH_MPM:L}
 .if ${WITH_MPM:L} == "worker" || ${WITH_MPM:L} == "perchild" || ${WITH_MPM:L} == "threadpool"
 WITH_THREADS=		yes
 WITH_THREADS_MODULES=	yes
-WITHOUT_MODULES+=	cgi
+WITHOUT_MODULES+=	CGI
 .endif
 
 # xDBM section
@@ -55,9 +55,9 @@ WITH_DBM=	bdb
 
 .if defined(WITH_BERKELEYDB) && !defined(WITH_BDB_VER)
 .   if ${WITH_BERKELEYDB} == "FreeBSD"
-WITH_BDB_BASE=YES
+WITH_BDB_BASE=	yes
 .   else
-WITH_BDB_VER=${WITH_BERKELEYDB:S/db//}
+WITH_BDB_VER=	${WITH_BERKELEYDB:S/db//}
 .   endif
 .endif
 
@@ -92,23 +92,23 @@ WITH_SSL_MODULES=	yes
 CONFIGURE_ARGS+=	--with-ssl=${OPENSSLBASE}
 .endif
 
-AUTH_MODULES=		access auth auth_anon auth_dbm auth_digest
-DAV_MODULES=		dav dav_fs
-EXPERIMENTAL_MODULES=	bucketeer case_filter case_filter_in ext_filter charset_lite \
-			optional_hook_export optional_hook_import \
-			optional_fn_import optional_fn_export \
-			cache file_cache disk_cache mem_cache \
-			dumpio
-LDAP_MODULES=		ldap auth_ldap
-MISC_MODULES=		actions alias asis autoindex cache cern_meta \
-			cgi charset_lite deflate dir disk_cache env expires \
-			file_cache headers imap include info log_config logio mime \
-			mime_magic negotiation rewrite setenvif speling status \
-			unique_id userdir usertrack vhost_alias
-PROXY_MODULES=		proxy proxy_connect proxy_ftp proxy_http
-SSL_MODULES=		ssl
-SUEXEC_MODULES=		suexec
-THREADS_MODULES=	cgid
+AUTH_MODULES=		ACCESS AUTH AUTH_ANON AUTH_DBM AUTH_DIGEST
+DAV_MODULES=		DAV DAV_FS
+EXPERIMENTAL_MODULES=	BUCKETEER CASE_FILTER CASE_FILTER_IN EXT_FILTER CHARSET_LITE \
+			OPTIONAL_HOOK_EXPORT OPTIONAL_HOOK_IMPORT \
+			OPTIONAL_FN_IMPORT OPTIONAL_FN_EXPORT \
+			CACHE FILE_CACHE DISK_CACHE MEM_CACHE \
+			DUMPIO
+LDAP_MODULES=		LDAP AUTH_LDAP
+MISC_MODULES=		ACTIONS ALIAS ASIS AUTOINDEX CACHE CERN_META \
+			CGI CHARSET_LITE DEFLATE DIR DISK_CACHE ENV EXPIRES \
+			FILE_CACHE HEADERS IMAP INCLUDE INFO LOG_CONFIG LOGIO MIME \
+			MIME_MAGIC NEGOTIATION REWRITE SETENVIF SPELING STATUS \
+			UNIQUE_ID USERDIR USERTRACK VHOST_ALIAS
+PROXY_MODULES=		PROXY PROXY_CONNECT PROXY_FTP PROXY_HTTP
+SSL_MODULES=		SSL
+SUEXEC_MODULES=		SUEXEC
+THREADS_MODULES=	CGID
 
 DEFAULT_MODULES_CATEGORIES= \
 			AUTH DAV MISC
diff --git a/www/apache22/Makefile b/www/apache22/Makefile
index 8e4b6e7c8e4b..625ec8a88088 100644
--- a/www/apache22/Makefile
+++ b/www/apache22/Makefile
@@ -95,7 +95,7 @@ CONFIGURE_ARGS+=	--enable-static-support
 DEBUG_FLAGS?=	-O0 -g -ggdb3
 CFLAGS=		${DEBUG_FLAGS}
 CONFIGURE_ARGS+=	--enable-maintainer-mode
-WITH_EXCEPTION_HOOK=	YES
+WITH_EXCEPTION_HOOK=	yes
 .endif
 
 .if defined(WITH_EXCEPTION_HOOK)
@@ -155,17 +155,9 @@ CONFIGURE_ARGS+=	--with-mpm=${WITH_MPM:L}
 
 pre-everything::
 	@${ECHO_MSG}	""
-	@${ECHO_MSG}	" To enable a module category: WITH_<CATEGORY>_MODULES"
-	@${ECHO_MSG}	" To disable a module category: WITHOUT_<CATEGORY>_MODULES"
-	@${ECHO_MSG}	""
-	@${ECHO_MSG}	" Per default categories are:"
-	@${ECHO_MSG}	"  ${DEFAULT_MODULES_CATEGORIES}"
-	@${ECHO_MSG}	" Categories available:"
-	@${ECHO_MSG}	"  ${ALL_MODULES_CATEGORIES}"
-	@${ECHO_MSG}	""
+	@${ECHO_MSG}    "  You can check your modules configuration by using make show-modules"
 	@${ECHO_MSG}	"  To see all available knobs, type make show-options"
 	@${ECHO_MSG}	"  To see all modules in different categories, type make show-categories"
-	@${ECHO_MSG}    "  You can check your modules configuration by using make show-modules"
 	@${ECHO_MSG}	""
 
 show-options:
diff --git a/www/apache22/Makefile.doc b/www/apache22/Makefile.doc
index 7e3c9c083325..5ac1d8abdcd0 100644
--- a/www/apache22/Makefile.doc
+++ b/www/apache22/Makefile.doc
@@ -86,10 +86,10 @@
 ##      show-categories:          prints list of modules sorted by category
 ##
 ## Examples (*):
-##      make WITH_STATIC_MODULES="ssl rewrite include" WITH_EXPERIMENTAL_MODULES=yes \
-##           WITH_CUSTOM_AUTH="auth auth_dbm"
-##      make WITHOUT_MODULES="access speling status" WITH_PROXY_MODULES=yes
-##      make WITH_MODULES="include rewrite auth"
+##      make WITH_STATIC_MODULES="SSL REWRITE INCLUDE" WITH_EXPERIMENTAL_MODULES=yes \
+##           WITH_CUSTOM_AUTH="AUTH AUTH_DBM"
+##      make WITHOUT_MODULES="ACCESS SPELING STATUS" WITH_PROXY_MODULES=yes
+##      make WITH_MODULES="INCLUDE REWRITE AUTH"
 ##      Note: If you define your custom options in /etc/make.conf, don't forget
 ##            to do not use quotes.
 ##
diff --git a/www/apache22/Makefile.modules b/www/apache22/Makefile.modules
index 183cca09a320..41794a5408a0 100644
--- a/www/apache22/Makefile.modules
+++ b/www/apache22/Makefile.modules
@@ -15,26 +15,26 @@
 .if !defined(Module_inc)
 Module_inc=		done
 
-AUTH_MODULES=		auth_basic auth_digest
-AUTHN_MODULES=		authn_file authn_dbd authn_dbm authn_anon authn_default \
-			authn_alias
-AUTHZ_MODULES=		authz_host authz_groupfile authz_user authz_dbm \
-			authz_owner authz_default
-CACHE_MODULES=		cache disk_cache file_cache mem_cache
-DAV_MODULES=		dav dav_fs
-EXPERIMENTAL_MODULES=	bucketeer case_filter case_filter_in ext_filter \
-			log_forensic optional_hook_export optional_hook_import \
-			optional_fn_import optional_fn_export 
-LDAP_MODULES=		ldap authnz_ldap
-MISC_MODULES+=		actions alias asis autoindex cern_meta \
-			cgi charset_lite dbd deflate dir dumpio env expires \
-			headers imagemap include info log_config logio mime \
-			mime_magic negotiation rewrite setenvif speling status substitute \
-			unique_id userdir usertrack vhost_alias filter version reqtimeout
-PROXY_MODULES=		proxy proxy_connect proxy_ftp proxy_http proxy_ajp proxy_balancer proxy_scgi
-SSL_MODULES=		ssl
-SUEXEC_MODULES=		suexec
-THREADS_MODULES=	cgid
+AUTH_MODULES=		AUTH_BASIC AUTH_DIGEST
+AUTHN_MODULES=		AUTHN_FILE AUTHN_DBD AUTHN_DBM AUTHN_ANON AUTHN_DEFAULT \
+			AUTHN_ALIAS
+AUTHZ_MODULES=		AUTHZ_HOST AUTHZ_GROUPFILE AUTHZ_USER AUTHZ_DBM \
+			AUTHZ_OWNER AUTHZ_DEFAULT
+CACHE_MODULES=		CACHE DISK_CACHE FILE_CACHE MEM_CACHE
+DAV_MODULES=		DAV DAV_FS
+EXPERIMENTAL_MODULES=	BUCKETEER CASE_FILTER CASE_FILTER_IN EXT_FILTER \
+			LOG_FORENSIC OPTIONAL_HOOK_EXPORT OPTIONAL_HOOK_IMPORT \
+			OPTIONAL_FN_IMPORT OPTIONAL_FN_EXPORT 
+LDAP_MODULES=		LDAP AUTHNZ_LDAP
+MISC_MODULES+=		ACTIONS ALIAS ASIS AUTOINDEX CERN_META \
+			CGI CHARSET_LITE DBD DEFLATE DIR DUMPIO ENV EXPIRES \
+			HEADERS IMAGEMAP INCLUDE INFO LOG_CONFIG LOGIO MIME \
+			MIME_MAGIC NEGOTIATION REWRITE SETENVIF SPELING STATUS SUBSTITUTE \
+			UNIQUE_ID USERDIR USERTRACK VHOST_ALIAS FILTER VERSION REQTIMEOUT
+PROXY_MODULES=		PROXY PROXY_CONNECT PROXY_FTP PROXY_HTTP PROXY_AJP PROXY_BALANCER PROXY_SCGI
+SSL_MODULES=		SSL
+SUEXEC_MODULES=		SUEXEC
+THREADS_MODULES=	CGID
 
 DEFAULT_MODULES_CATEGORIES= \
 			AUTH AUTHN AUTHZ DAV CACHE MISC
@@ -79,11 +79,13 @@ LATEST_LINK=		apache22-${WITH_MPM:L}-mpm
 .if ${WITH_MPM:L} == "worker" || ${WITH_MPM:L} == "event"
 WITH_THREADS=		yes
 WITH_THREADS_MODULES=	yes
-WITHOUT_MODULES+=	cgi
+WITHOUT_MODULES+=	CGI
 .endif
 
 # xDBM section
 #
+# XXX WITH_BERKELEYDB is deprecated
+# this section need rewrite
 .if !defined(WITH_DBM)
 .   if defined(WITH_BDB) || defined(WITH_BDB_BASE) || defined(WITH_BERKELEYDB)
 WITH_DBM=	bdb
@@ -95,9 +97,9 @@ PLIST_SUB+=	BDB="@comment "
 
 .if defined(WITH_BERKELEYDB) && !defined(WITH_BDB_VER)
 .   if ${WITH_BERKELEYDB} == "FreeBSD"
-WITH_BDB_BASE=YES
+WITH_BDB_BASE=	yes
 .   else
-WITH_BDB_VER=${WITH_BERKELEYDB:S/db//}
+WITH_BDB_VER=	${WITH_BERKELEYDB:S/db//}
 .   endif
 .endif
 
@@ -124,16 +126,16 @@ CONFIGURE_ARGS+=	--with-dbm=sdbm
 .endif
 
 .if defined(WITH_MYSQL)
-USE_MYSQL=	YES
-WITH_THREADS=	YES
+USE_MYSQL=	yes
+WITH_THREADS=	yes
 .endif
 
 .if defined(WITH_PGSQL)
-USE_PGSQL=	YES
+USE_PGSQL=	yes
 .endif
 
 .if defined(WITH_SQLITE)
-USE_SQLITE=	YES
+USE_SQLITE=	yes
 .endif
 
 .if !defined(WITHOUT_SSL)
@@ -142,7 +144,7 @@ CONFIGURE_ARGS+=	--with-ssl=${OPENSSLBASE}
 .endif
 
 .if !defined(WITH_THREADS)
-WITHOUT_MODULES+=	mem_cache
+WITHOUT_MODULES+=	MEM_CACHE
 .   if !defined(WITHOUT_APACHE_OPTIONS) && defined(WITH_MEM_CACHE)
 IGNORE+=	mod_mem_cache requires WITH_THREADS
 .   endif
@@ -152,7 +154,7 @@ LDFLAGS+=	${PTHREAD_LIBS}
 .endif
 
 .if !defined(WITH_MYSQL) && !defined(WITH_PGSQL) && !defined(WITH_SQLITE)
-WITHOUT_MODULES+=	authn_dbd dbd
+WITHOUT_MODULES+=	AUTHN_DBD DBD
 .   if !defined(WITHOUT_APACHE_OPTIONS) && (defined(WITH_DBD) || defined(WITH_AUTHN_DBD))
 IGNORE+=	You need to enable at least one DBD backend
 .   endif