Index: Mk/bsd.apache.mk
===================================================================
RCS file: /home/ncvs/ports/Mk/bsd.apache.mk,v
retrieving revision 1.16
diff -u -r1.16 bsd.apache.mk
--- Mk/bsd.apache.mk	22 Jul 2007 12:43:00 -0000	1.16
+++ Mk/bsd.apache.mk	24 Jul 2007 11:34:36 -0000
@@ -20,7 +20,7 @@
 # is defined, APACHE_PORT will be set to www/apache20
 #
 
-#.if !defined(_POSTMKINCLUDED) && !defined(Apache_Pre_Include)
+.if !defined(Apache_Pre_Include) || defined(PORT_IS_MODULE)
 
 Apache_Pre_Include=		bsd.apache.mk
 
@@ -126,6 +126,15 @@
 
 .if defined(WITH_MODULES)
 _APACHE_MODULES+=	${WITH_MODULES}
+.elif defined(OPTIONS)
+.for module in ${AVAILABLE_MODULES}
+.if defined(WITH_${module:U})
+_APACHE_MODULES+=	${module}
+.endif
+.if defined(WITHOUT_${module:U})
+WITHOUT_MODULES+=	 ${module}
+.endif
+.endfor
 .else
 .for category in ${ALL_MODULES_CATEGORIES}
 .if defined (WITHOUT_${category}_MODULES) || defined (WITH_CUSTOM_${category})
@@ -353,8 +362,8 @@
 
 .endif
 
-#.endif #!defined(_POSTMKINCLUDED) && !defined(Apache_Pre_Include)
-#.if defined(_POSTMKINCLUDED) && !defined(Apache_Post_Include)
+.endif #!defined(Apache_Pre_Include)
+.if defined(_POSTMKINCLUDED) && !defined(Apache_Post_Include)
 Apache_Post_Include=                    bsd.apache.mk
 
 .if defined(AP_PORT_IS_SERVER)
@@ -396,6 +405,20 @@
 	done
 .endif
 
+.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 \
+		echo  `echo $${module} | ${TR} '[:lower:]' '[:upper:]'` \"mod_$${module}\" ON \\; \
+	else \
+		echo  `echo $${module} | ${TR} '[:lower:]' '[:upper:]'` \"mod_$${module}\" OFF \\ ;\
+	fi;\
+	done; \
+	echo; 
+.endif
+
 .elif defined(AP_PORT_IS_MODULE)
 
 .if defined(AP_FAST_BUILD)
@@ -425,4 +448,4 @@
 .endif
 .endif
 .endif
-#.endif          # defined(_POSTMKINCLUDED) && !defined(Apache_Post_Include)
+.endif          # defined(_POSTMKINCLUDED) && !defined(Apache_Post_Include)
Index: www/apache22/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/apache22/Makefile,v
retrieving revision 1.205
diff -u -r1.205 Makefile
--- www/apache22/Makefile	22 Jul 2007 11:03:36 -0000	1.205
+++ www/apache22/Makefile	24 Jul 2007 11:34:51 -0000
@@ -54,6 +54,7 @@
 SUB_LIST+=		RC_SUBR_SUFFIX=${RC_SUBR_SUFFIX}
 LIBTOOLFILES=		configure
 
+
 .if !defined(WITH_APR_FROM_PORTS)
 USE_LDCONFIG=	yes
 .endif
@@ -129,6 +130,7 @@
 			--with-ldap-include="${LOCALBASE}/include"
 .endif
 
+.include "${APACHEDIR}/Makefile.options"
 .include "${APACHEDIR}/Makefile.doc"
 .include "${APACHEDIR}/Makefile.modules"
 .include <bsd.port.pre.mk>
Index: www/apache22/Makefile.options
===================================================================
RCS file: www/apache22/Makefile.options
diff -N www/apache22/Makefile.options
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ www/apache22/Makefile.options	24 Jul 2007 12:20:00 -0000
@@ -0,0 +1,76 @@
+echo OPTIONS= \\;
+OPTIONS= \
+AUTH_BASIC "mod_auth_basic" ON \
+AUTH_DIGEST "mod_auth_digest" ON \
+AUTHN_FILE "mod_authn_file" ON \
+AUTHN_DBD "mod_authn_dbd" OFF \
+AUTHN_DBM "mod_authn_dbm" ON \
+AUTHN_ANON "mod_authn_anon" ON \
+AUTHN_DEFAULT "mod_authn_default" ON \
+AUTHN_ALIAS "mod_authn_alias" ON \
+AUTHZ_HOST "mod_authz_host" ON \
+AUTHZ_GROUPFILE "mod_authz_groupfile" ON \
+AUTHZ_USER "mod_authz_user" ON \
+AUTHZ_DBM "mod_authz_dbm" ON \
+AUTHZ_OWNER "mod_authz_owner" ON \
+AUTHZ_DEFAULT "mod_authz_default" ON \
+CACHE "mod_cache" ON \
+DISK_CACHE "mod_disk_cache" ON \
+FILE_CACHE "mod_file_cache" ON \
+MEM_CACHE "mod_mem_cache" OFF \
+DAV "mod_dav" ON \
+DAV_FS "mod_dav_fs" ON \
+BUCKETEER "mod_bucketeer" OFF \
+CASE_FILTER "mod_case_filter" OFF \
+CASE_FILTER_IN "mod_case_filter_in" OFF \
+EXT_FILTER "mod_ext_filter" OFF \
+CHARSET_LITE "mod_charset_lite" ON \
+LOG_FORENSIC "mod_log_forensic" OFF \
+OPTIONAL_HOOK_EXPORT "mod_optional_hook_export" OFF \
+OPTIONAL_HOOK_IMPORT "mod_optional_hook_import" OFF \
+OPTIONAL_FN_IMPORT "mod_optional_fn_import" OFF \
+OPTIONAL_FN_EXPORT "mod_optional_fn_export" OFF \
+LDAP "mod_ldap" OFF \
+AUTHNZ_LDAP "mod_authnz_ldap" OFF \
+ACTIONS "mod_actions" ON \
+ALIAS "mod_alias" ON \
+ASIS "mod_asis" ON \
+AUTOINDEX "mod_autoindex" ON \
+CERN_META "mod_cern_meta" ON \
+CGI "mod_cgi" ON \
+CHARSET_LITE "mod_charset_lite" ON \
+DBD "mod_dbd" OFF \
+DEFLATE "mod_deflate" ON \
+DIR "mod_dir" ON \
+DUMPIO "mod_dumpio" ON \
+ENV "mod_env" ON \
+EXPIRES "mod_expires" ON \
+HEADERS "mod_headers" ON \
+IMAGEMAP "mod_imagemap" ON \
+INCLUDE "mod_include" ON \
+INFO "mod_info" ON \
+LOG_CONFIG "mod_log_config" ON \
+LOGIO "mod_logio" ON \
+MIME "mod_mime" ON \
+MIME_MAGIC "mod_mime_magic" ON \
+NEGOTIATION "mod_negotiation" ON \
+REWRITE "mod_rewrite" ON \
+SETENVIF "mod_setenvif" ON \
+SPELING "mod_speling" ON \
+STATUS "mod_status" ON \
+UNIQUE_ID "mod_unique_id" ON \
+USERDIR "mod_userdir" ON \
+USERTRACK "mod_usertrack" ON \
+VHOST_ALIAS "mod_vhost_alias" ON \
+FILTER "mod_filter" ON \
+VERSION "mod_version" ON \
+PROXY "mod_proxy" OFF \
+PROXY_CONNECT "mod_proxy_connect" OFF \
+PROXY_FTP "mod_proxy_ftp" OFF \
+PROXY_HTTP "mod_proxy_http" OFF \
+PROXY_AJP "mod_proxy_ajp" OFF \
+PROXY_BALANCER "mod_proxy_balancer" OFF \
+SSL "mod_ssl" ON \
+SUEXEC "mod_suexec" OFF \
+CGID "mod_cgid" OFF \
+