2 files changed, 141 insertions, 1 deletions

diff --git a/www/apache22/Makefile b/www/apache22/Makefile
index fe89e4f85754..c5abe12621e7 100644
--- a/www/apache22/Makefile
+++ b/www/apache22/Makefile
@@ -9,7 +9,7 @@
 
 PORTNAME=	apache
 PORTVERSION=	2.2.0
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_APACHE_HTTPD} \
 		http://apache.webthing.com/database/:aprmysql
diff --git a/www/apache22/pkg-plist b/www/apache22/pkg-plist
index f6e4d0787cac..76ec3fb87cb3 100644
--- a/www/apache22/pkg-plist
+++ b/www/apache22/pkg-plist
@@ -165,80 +165,220 @@ include/apache22/util_xml.h
 %%APR_PORTS%%lib/apr.exp
 %%APR_PORTS%%lib/aprutil.exp
 %%APR_PORTS%%lib/libapr-1.a
+%%APR_PORTS%%lib/libapr-1.la
 %%APR_PORTS%%lib/libapr-1.so
 %%APR_PORTS%%lib/libapr-1.so.2
 %%APR_PORTS%%lib/libaprutil-1.a
+%%APR_PORTS%%lib/libaprutil-1.la
 %%APR_PORTS%%lib/libaprutil-1.so
 %%APR_PORTS%%lib/libaprutil-1.so.2
 libexec/apache22/httpd.exp
+%%MOD_ACTIONS%%libexec/apache22/mod_actions.a
+%%MOD_ACTIONS%%libexec/apache22/mod_actions.la
 %%MOD_ACTIONS%%libexec/apache22/mod_actions.so
+%%MOD_ALIAS%%libexec/apache22/mod_alias.a
+%%MOD_ALIAS%%libexec/apache22/mod_alias.la
 %%MOD_ALIAS%%libexec/apache22/mod_alias.so
+%%MOD_ASIS%%libexec/apache22/mod_asis.a
+%%MOD_ASIS%%libexec/apache22/mod_asis.la
 %%MOD_ASIS%%libexec/apache22/mod_asis.so
+%%MOD_AUTH_BASIC%%libexec/apache22/mod_auth_basic.a
+%%MOD_AUTH_BASIC%%libexec/apache22/mod_auth_basic.la
 %%MOD_AUTH_BASIC%%libexec/apache22/mod_auth_basic.so
+%%MOD_AUTH_DIGEST%%libexec/apache22/mod_auth_digest.a
+%%MOD_AUTH_DIGEST%%libexec/apache22/mod_auth_digest.la
 %%MOD_AUTH_DIGEST%%libexec/apache22/mod_auth_digest.so
+%%MOD_AUTHN_ANON%%libexec/apache22/mod_authn_anon.a
+%%MOD_AUTHN_ANON%%libexec/apache22/mod_authn_anon.la
 %%MOD_AUTHN_ANON%%libexec/apache22/mod_authn_anon.so
+%%MOD_AUTHN_DBD%%libexec/apache22/mod_authn_dbd.a
+%%MOD_AUTHN_DBD%%libexec/apache22/mod_authn_dbd.la
 %%MOD_AUTHN_DBD%%libexec/apache22/mod_authn_dbd.so
+%%MOD_AUTHN_DBM%%libexec/apache22/mod_authn_dbm.a
+%%MOD_AUTHN_DBM%%libexec/apache22/mod_authn_dbm.la
 %%MOD_AUTHN_DBM%%libexec/apache22/mod_authn_dbm.so
+%%MOD_AUTHN_DEFAULT%%libexec/apache22/mod_authn_default.a
+%%MOD_AUTHN_DEFAULT%%libexec/apache22/mod_authn_default.la
 %%MOD_AUTHN_DEFAULT%%libexec/apache22/mod_authn_default.so
+%%MOD_AUTHN_FILE%%libexec/apache22/mod_authn_file.a
+%%MOD_AUTHN_FILE%%libexec/apache22/mod_authn_file.la
 %%MOD_AUTHN_FILE%%libexec/apache22/mod_authn_file.so
+%%MOD_AUTHNZ_LDAP%%libexec/apache22/mod_authnz_ldap.a
+%%MOD_AUTHNZ_LDAP%%libexec/apache22/mod_authnz_ldap.la
 %%MOD_AUTHNZ_LDAP%%libexec/apache22/mod_authnz_ldap.so
+%%MOD_AUTHZ_DBM%%libexec/apache22/mod_authz_dbm.a
+%%MOD_AUTHZ_DBM%%libexec/apache22/mod_authz_dbm.la
 %%MOD_AUTHZ_DBM%%libexec/apache22/mod_authz_dbm.so
+%%MOD_AUTHZ_DEFAULT%%libexec/apache22/mod_authz_default.a
+%%MOD_AUTHZ_DEFAULT%%libexec/apache22/mod_authz_default.la
 %%MOD_AUTHZ_DEFAULT%%libexec/apache22/mod_authz_default.so
+%%MOD_AUTHZ_GROUPFILE%%libexec/apache22/mod_authz_groupfile.a
+%%MOD_AUTHZ_GROUPFILE%%libexec/apache22/mod_authz_groupfile.la
 %%MOD_AUTHZ_GROUPFILE%%libexec/apache22/mod_authz_groupfile.so
+%%MOD_AUTHZ_HOST%%libexec/apache22/mod_authz_host.a
+%%MOD_AUTHZ_HOST%%libexec/apache22/mod_authz_host.la
 %%MOD_AUTHZ_HOST%%libexec/apache22/mod_authz_host.so
+%%MOD_AUTHZ_OWNER%%libexec/apache22/mod_authz_owner.a
+%%MOD_AUTHZ_OWNER%%libexec/apache22/mod_authz_owner.la
 %%MOD_AUTHZ_OWNER%%libexec/apache22/mod_authz_owner.so
+%%MOD_AUTHZ_USER%%libexec/apache22/mod_authz_user.a
+%%MOD_AUTHZ_USER%%libexec/apache22/mod_authz_user.la
 %%MOD_AUTHZ_USER%%libexec/apache22/mod_authz_user.so
+%%MOD_AUTOINDEX%%libexec/apache22/mod_autoindex.a
+%%MOD_AUTOINDEX%%libexec/apache22/mod_autoindex.la
 %%MOD_AUTOINDEX%%libexec/apache22/mod_autoindex.so
+%%MOD_BUCKETEER%%libexec/apache22/mod_bucketeer.a
+%%MOD_BUCKETEER%%libexec/apache22/mod_bucketeer.la
 %%MOD_BUCKETEER%%libexec/apache22/mod_bucketeer.so
+%%MOD_CACHE%%libexec/apache22/mod_cache.a
+%%MOD_CACHE%%libexec/apache22/mod_cache.la
 %%MOD_CACHE%%libexec/apache22/mod_cache.so
+%%MOD_CASE_FILTER%%libexec/apache22/mod_case_filter.a
+%%MOD_CASE_FILTER%%libexec/apache22/mod_case_filter.la
 %%MOD_CASE_FILTER%%libexec/apache22/mod_case_filter.so
+%%MOD_CASE_FILTER_IN%%libexec/apache22/mod_case_filter_in.a
+%%MOD_CASE_FILTER_IN%%libexec/apache22/mod_case_filter_in.la
 %%MOD_CASE_FILTER_IN%%libexec/apache22/mod_case_filter_in.so
+%%MOD_CERN_META%%libexec/apache22/mod_cern_meta.a
+%%MOD_CERN_META%%libexec/apache22/mod_cern_meta.la
 %%MOD_CERN_META%%libexec/apache22/mod_cern_meta.so
+%%MOD_CGI%%libexec/apache22/mod_cgi.a
+%%MOD_CGI%%libexec/apache22/mod_cgi.la
 %%MOD_CGI%%libexec/apache22/mod_cgi.so
+%%MOD_CGID%%libexec/apache22/mod_cgid.a
+%%MOD_CGID%%libexec/apache22/mod_cgid.la
 %%MOD_CGID%%libexec/apache22/mod_cgid.so
+%%MOD_CHARSET_LITE%%libexec/apache22/mod_charset_lite.a
+%%MOD_CHARSET_LITE%%libexec/apache22/mod_charset_lite.la
 %%MOD_CHARSET_LITE%%libexec/apache22/mod_charset_lite.so
+%%MOD_DAV%%libexec/apache22/mod_dav.a
+%%MOD_DAV%%libexec/apache22/mod_dav.la
 %%MOD_DAV%%libexec/apache22/mod_dav.so
+%%MOD_DAV_FS%%libexec/apache22/mod_dav_fs.a
+%%MOD_DAV_FS%%libexec/apache22/mod_dav_fs.la
 %%MOD_DAV_FS%%libexec/apache22/mod_dav_fs.so
+%%MOD_DBD%%libexec/apache22/mod_dbd.a
+%%MOD_DBD%%libexec/apache22/mod_dbd.la
 %%MOD_DBD%%libexec/apache22/mod_dbd.so
+%%MOD_DEFLATE%%libexec/apache22/mod_deflate.a
+%%MOD_DEFLATE%%libexec/apache22/mod_deflate.la
 %%MOD_DEFLATE%%libexec/apache22/mod_deflate.so
+%%MOD_DIR%%libexec/apache22/mod_dir.a
+%%MOD_DIR%%libexec/apache22/mod_dir.la
 %%MOD_DIR%%libexec/apache22/mod_dir.so
+%%MOD_DISK_CACHE%%libexec/apache22/mod_disk_cache.a
+%%MOD_DISK_CACHE%%libexec/apache22/mod_disk_cache.la
 %%MOD_DISK_CACHE%%libexec/apache22/mod_disk_cache.so
+%%MOD_ENV%%libexec/apache22/mod_env.a
+%%MOD_ENV%%libexec/apache22/mod_env.la
 %%MOD_ENV%%libexec/apache22/mod_env.so
+%%MOD_EXPIRES%%libexec/apache22/mod_expires.a
+%%MOD_EXPIRES%%libexec/apache22/mod_expires.la
 %%MOD_EXPIRES%%libexec/apache22/mod_expires.so
+%%MOD_EXT_FILTER%%libexec/apache22/mod_ext_filter.a
+%%MOD_EXT_FILTER%%libexec/apache22/mod_ext_filter.la
 %%MOD_EXT_FILTER%%libexec/apache22/mod_ext_filter.so
+%%MOD_FILE_CACHE%%libexec/apache22/mod_file_cache.a
+%%MOD_FILE_CACHE%%libexec/apache22/mod_file_cache.la
 %%MOD_FILE_CACHE%%libexec/apache22/mod_file_cache.so
+%%MOD_FILTER%%libexec/apache22/mod_filter.a
+%%MOD_FILTER%%libexec/apache22/mod_filter.la
 %%MOD_FILTER%%libexec/apache22/mod_filter.so
+%%MOD_HEADERS%%libexec/apache22/mod_headers.a
+%%MOD_HEADERS%%libexec/apache22/mod_headers.la
 %%MOD_HEADERS%%libexec/apache22/mod_headers.so
+%%MOD_IMAGEMAP%%libexec/apache22/mod_imagemap.a
+%%MOD_IMAGEMAP%%libexec/apache22/mod_imagemap.la
 %%MOD_IMAGEMAP%%libexec/apache22/mod_imagemap.so
+%%MOD_INCLUDE%%libexec/apache22/mod_include.a
+%%MOD_INCLUDE%%libexec/apache22/mod_include.la
 %%MOD_INCLUDE%%libexec/apache22/mod_include.so
+%%MOD_INFO%%libexec/apache22/mod_info.a
+%%MOD_INFO%%libexec/apache22/mod_info.la
 %%MOD_INFO%%libexec/apache22/mod_info.so
+%%MOD_LDAP%%libexec/apache22/mod_ldap.a
+%%MOD_LDAP%%libexec/apache22/mod_ldap.la
 %%MOD_LDAP%%libexec/apache22/mod_ldap.so
+%%MOD_LOG_CONFIG%%libexec/apache22/mod_log_config.a
+%%MOD_LOG_CONFIG%%libexec/apache22/mod_log_config.la
 %%MOD_LOG_CONFIG%%libexec/apache22/mod_log_config.so
+%%MOD_LOG_FORENSIC%%libexec/apache22/mod_log_forensic.a
+%%MOD_LOG_FORENSIC%%libexec/apache22/mod_log_forensic.la
 %%MOD_LOG_FORENSIC%%libexec/apache22/mod_log_forensic.so
+%%MOD_LOGIO%%libexec/apache22/mod_logio.a
+%%MOD_LOGIO%%libexec/apache22/mod_logio.la
 %%MOD_LOGIO%%libexec/apache22/mod_logio.so
+%%MOD_MEM_CACHE%%libexec/apache22/mod_mem_cache.a
+%%MOD_MEM_CACHE%%libexec/apache22/mod_mem_cache.la
 %%MOD_MEM_CACHE%%libexec/apache22/mod_mem_cache.so
+%%MOD_MIME%%libexec/apache22/mod_mime.a
+%%MOD_MIME%%libexec/apache22/mod_mime.la
 %%MOD_MIME%%libexec/apache22/mod_mime.so
+%%MOD_MIME_MAGIC%%libexec/apache22/mod_mime_magic.a
+%%MOD_MIME_MAGIC%%libexec/apache22/mod_mime_magic.la
 %%MOD_MIME_MAGIC%%libexec/apache22/mod_mime_magic.so
+%%MOD_NEGOTIATION%%libexec/apache22/mod_negotiation.a
+%%MOD_NEGOTIATION%%libexec/apache22/mod_negotiation.la
 %%MOD_NEGOTIATION%%libexec/apache22/mod_negotiation.so
+%%MOD_OPTIONAL_HOOK_EXPORT%%libexec/apache22/mod_optional_hook_export.a
+%%MOD_OPTIONAL_HOOK_EXPORT%%libexec/apache22/mod_optional_hook_export.la
 %%MOD_OPTIONAL_HOOK_EXPORT%%libexec/apache22/mod_optional_hook_export.so
+%%MOD_OPTIONAL_HOOK_IMPORT%%libexec/apache22/mod_optional_hook_import.a
+%%MOD_OPTIONAL_HOOK_IMPORT%%libexec/apache22/mod_optional_hook_import.la
 %%MOD_OPTIONAL_HOOK_IMPORT%%libexec/apache22/mod_optional_hook_import.so
+%%MOD_OPTIONAL_FN_IMPORT%%libexec/apache22/mod_optional_fn_import.a
+%%MOD_OPTIONAL_FN_IMPORT%%libexec/apache22/mod_optional_fn_import.la
 %%MOD_OPTIONAL_FN_IMPORT%%libexec/apache22/mod_optional_fn_import.so
+%%MOD_OPTIONAL_FN_EXPORT%%libexec/apache22/mod_optional_fn_export.a
+%%MOD_OPTIONAL_FN_EXPORT%%libexec/apache22/mod_optional_fn_export.la
 %%MOD_OPTIONAL_FN_EXPORT%%libexec/apache22/mod_optional_fn_export.so
+%%MOD_PROXY%%libexec/apache22/mod_proxy.a
+%%MOD_PROXY%%libexec/apache22/mod_proxy.la
 %%MOD_PROXY%%libexec/apache22/mod_proxy.so
+%%MOD_PROXY_AJP%%libexec/apache22/mod_proxy_ajp.a
+%%MOD_PROXY_AJP%%libexec/apache22/mod_proxy_ajp.la
 %%MOD_PROXY_AJP%%libexec/apache22/mod_proxy_ajp.so
+%%MOD_PROXY_BALANCER%%libexec/apache22/mod_proxy_balancer.a
+%%MOD_PROXY_BALANCER%%libexec/apache22/mod_proxy_balancer.la
 %%MOD_PROXY_BALANCER%%libexec/apache22/mod_proxy_balancer.so
+%%MOD_PROXY_CONNECT%%libexec/apache22/mod_proxy_connect.a
+%%MOD_PROXY_CONNECT%%libexec/apache22/mod_proxy_connect.la
 %%MOD_PROXY_CONNECT%%libexec/apache22/mod_proxy_connect.so
+%%MOD_PROXY_FTP%%libexec/apache22/mod_proxy_ftp.a
+%%MOD_PROXY_FTP%%libexec/apache22/mod_proxy_ftp.la
 %%MOD_PROXY_FTP%%libexec/apache22/mod_proxy_ftp.so
+%%MOD_PROXY_HTTP%%libexec/apache22/mod_proxy_http.a
+%%MOD_PROXY_HTTP%%libexec/apache22/mod_proxy_http.la
 %%MOD_PROXY_HTTP%%libexec/apache22/mod_proxy_http.so
+%%MOD_REWRITE%%libexec/apache22/mod_rewrite.a
+%%MOD_REWRITE%%libexec/apache22/mod_rewrite.la
 %%MOD_REWRITE%%libexec/apache22/mod_rewrite.so
+%%MOD_SETENVIF%%libexec/apache22/mod_setenvif.a
+%%MOD_SETENVIF%%libexec/apache22/mod_setenvif.la
 %%MOD_SETENVIF%%libexec/apache22/mod_setenvif.so
+%%MOD_SPELING%%libexec/apache22/mod_speling.a
+%%MOD_SPELING%%libexec/apache22/mod_speling.la
 %%MOD_SPELING%%libexec/apache22/mod_speling.so
+%%MOD_SSL%%libexec/apache22/mod_ssl.a
+%%MOD_SSL%%libexec/apache22/mod_ssl.la
 %%MOD_SSL%%libexec/apache22/mod_ssl.so
+%%MOD_STATUS%%libexec/apache22/mod_status.a
+%%MOD_STATUS%%libexec/apache22/mod_status.la
 %%MOD_STATUS%%libexec/apache22/mod_status.so
+%%MOD_SUEXEC%%libexec/apache22/mod_suexec.a
+%%MOD_SUEXEC%%libexec/apache22/mod_suexec.la
 %%MOD_SUEXEC%%libexec/apache22/mod_suexec.so
+%%MOD_UNIQUE_ID%%libexec/apache22/mod_unique_id.a
+%%MOD_UNIQUE_ID%%libexec/apache22/mod_unique_id.la
 %%MOD_UNIQUE_ID%%libexec/apache22/mod_unique_id.so
+%%MOD_USERDIR%%libexec/apache22/mod_userdir.a
+%%MOD_USERDIR%%libexec/apache22/mod_userdir.la
 %%MOD_USERDIR%%libexec/apache22/mod_userdir.so
+%%MOD_USERTRACK%%libexec/apache22/mod_usertrack.a
+%%MOD_USERTRACK%%libexec/apache22/mod_usertrack.la
 %%MOD_USERTRACK%%libexec/apache22/mod_usertrack.so
+%%MOD_VHOST_ALIAS%%libexec/apache22/mod_vhost_alias.a
+%%MOD_VHOST_ALIAS%%libexec/apache22/mod_vhost_alias.la
 %%MOD_VHOST_ALIAS%%libexec/apache22/mod_vhost_alias.so
 sbin/ab
 sbin/apachectl