Update to 2.0.32

PR:		36040
Submitted by:	maintainer

1 files changed, 84 insertions, 111 deletions

diff --git a/www/apache20/pkg-plist b/www/apache20/pkg-plist
index 79c01fa6e28e..abe0f5cfe599 100644
--- a/www/apache20/pkg-plist
+++ b/www/apache20/pkg-plist
@@ -1,12 +1,20 @@
-etc/apache/highperformance-std.conf
-etc/apache/highperformance.conf
-etc/apache/httpd-std.conf
-etc/apache/httpd.conf
-etc/apache/magic
-etc/apache/mime.types
-etc/apache/ssl-std.conf
-etc/apache/ssl.conf
-@dirrm etc/apache
+bin/apr-config
+bin/apu-config
+@unexec if cmp -s %D/etc/apache2/highperformance.conf %D/etc/apache2/highperformance-std.conf; then rm -f %D/etc/apache2/highperformance.conf; fi
+etc/apache2/highperformance-std.conf
+@exec [ -f %B/highperformance.conf ] || cp %B/%f %B/highperformance.conf
+@unexec if cmp -s %D/etc/apache2/httpd.conf %D/etc/apache2/httpd-std.conf; then rm -f %D/etc/apache2/httpd.conf; fi
+etc/apache2/httpd-std.conf
+@exec [ -f %B/httpd.conf ] || cp %B/%f %B/httpd.conf
+@unexec if cmp -s %D/etc/apache2/magic %D/etc/apache2/magic.default; then rm -f %D/etc/apache2/magic; fi
+etc/apache2/magic.default
+@exec [ -f %B/magic ] || cp %B/%f %B/magic
+@unexec if cmp -s %D/etc/apache2/mime.types %D/etc/apache2/mime.types.default; then rm -f %D/etc/apache2/mime.types; fi
+etc/apache2/mime.types.default
+@exec [ -f %B/mime.types ] || cp %B/%f %B/mime.types
+@unexec if cmp -s %D/etc/apache2/ssl.conf %D/etc/apache2/ssl-std.conf; then rm -f %D/etc/apache2/ssl.conf; fi
+etc/apache2/ssl-std.conf
+@exec [ -f %B/ssl.conf ] || cp %B/%f %B/ssl.conf
 etc/rc.d/apache.sh
 include/apache/ap_compat.h
 include/apache/ap_config.h
@@ -16,6 +24,7 @@ include/apache/ap_mmn.h
 include/apache/ap_mpm.h
 include/apache/ap_release.h
 include/apache/apr.h
+include/apache/apr_anylock.h
 include/apache/apr_base64.h
 include/apache/apr_buckets.h
 include/apache/apr_compat.h
@@ -44,9 +53,10 @@ include/apache/apr_pools.h
 include/apache/apr_portable.h
 include/apache/apr_proc_mutex.h
 include/apache/apr_ring.h
+include/apache/apr_rmm.h
 include/apache/apr_sdbm.h
 include/apache/apr_sha1.h
-include/apache/apr_shmem.h
+include/apache/apr_shm.h
 include/apache/apr_signal.h
 include/apache/apr_strings.h
 include/apache/apr_tables.h
@@ -58,12 +68,12 @@ include/apache/apr_time.h
 include/apache/apr_uri.h
 include/apache/apr_user.h
 include/apache/apr_uuid.h
+include/apache/apr_version.h
 include/apache/apr_want.h
 include/apache/apr_xlate.h
 include/apache/apr_xml.h
 include/apache/apu.h
 include/apache/apu_compat.h
-include/apache/config.h
 include/apache/expat.h
 include/apache/http_config.h
 include/apache/http_connection.h
@@ -74,7 +84,6 @@ include/apache/http_protocol.h
 include/apache/http_request.h
 include/apache/http_vhost.h
 include/apache/httpd.h
-include/apache/internal.h
 include/apache/mod_cgi.h
 include/apache/mod_core.h
 include/apache/mod_dav.h
@@ -103,119 +112,88 @@ include/apache/util_md5.h
 include/apache/util_script.h
 include/apache/util_time.h
 include/apache/util_xml.h
-@dirrm include/apache
-lib/APRVARS
-lib/libapr.a
-lib/libapr.la
-lib/libapr.so.0
-lib/libaprutil.a
-lib/libaprutil.la
-lib/libaprutil.so.0
-lib/libexpat.a
-lib/libexpat.la
-lib/libexpat.so.1
-@exec ln -fs libapr.so.0 %D/lib/libapr.so
-@exec ln -fs libaprutil.so.0 %D/lib/libaprutil.so
-@exec ln -fs libexpat.so.1 %D/lib/libexpat.so
-@unexec rm -f %D/lib/libapr.so
-@unexec rm -f %D/lib/libaprutil.so
-@unexec rm -f %D/lib/libexpat.so
+lib/apache/APRVARS
+lib/apache/apr.exp
+lib/apache/aprutil.exp
+lib/apache/libapr.a
+lib/apache/libapr.la
+lib/apache/libapr.so.0
+@unexec rm -f %D/lib/apache/libapr.so
+@exec ln -fs libapr.so.0 %D/lib/apache/libapr.so
+lib/apache/libaprutil.a
+lib/apache/libaprutil.la
+lib/apache/libaprutil.so.0
+@unexec rm -f %D/lib/apache/libaprutil.so
+@exec ln -fs libaprutil.so.0 %D/lib/apache/libaprutil.so
+lib/apache/libexpat.a
+lib/apache/libexpat.la
+lib/apache/libexpat.so.1
+@unexec rm -f %D/lib/apache/libexpat.so
+@exec ln -fs libexpat.so.1 %D/lib/apache/libexpat.so
 libexec/apache/httpd.exp
-libexec/apache/mod_access.la
 libexec/apache/mod_access.so
-libexec/apache/mod_actions.la
 libexec/apache/mod_actions.so
-libexec/apache/mod_alias.la
 libexec/apache/mod_alias.so
-libexec/apache/mod_asis.la
 libexec/apache/mod_asis.so
-libexec/apache/mod_auth.la
 libexec/apache/mod_auth.so
-libexec/apache/mod_auth_anon.la
 libexec/apache/mod_auth_anon.so
-libexec/apache/mod_auth_db.la
-libexec/apache/mod_auth_db.so
-libexec/apache/mod_auth_dbm.la
 libexec/apache/mod_auth_dbm.so
-libexec/apache/mod_auth_digest.la
 libexec/apache/mod_auth_digest.so
-libexec/apache/mod_autoindex.la
 libexec/apache/mod_autoindex.so
-%%CACHEOPT%%libexec/apache/mod_cache.la
-%%CACHEOPT%%libexec/apache/mod_cache.so
-libexec/apache/mod_cern_meta.la
+libexec/apache/mod_cache.so
 libexec/apache/mod_cern_meta.so
-libexec/apache/mod_cgi.la
 libexec/apache/mod_cgi.so
-libexec/apache/mod_cgid.la
 libexec/apache/mod_cgid.so
-libexec/apache/mod_dav.la
 libexec/apache/mod_dav.so
-libexec/apache/mod_dav_fs.la
 libexec/apache/mod_dav_fs.so
-libexec/apache/mod_dir.la
 libexec/apache/mod_dir.so
-libexec/apache/mod_env.la
+libexec/apache/mod_disk_cache.so
 libexec/apache/mod_env.so
-libexec/apache/mod_expires.la
 libexec/apache/mod_expires.so
-%%CACHEOPT%%libexec/apache/mod_file_cache.la
-%%CACHEOPT%%libexec/apache/mod_file_cache.so
-libexec/apache/mod_headers.la
+libexec/apache/mod_file_cache.so
 libexec/apache/mod_headers.so
-libexec/apache/mod_imap.la
 libexec/apache/mod_imap.so
-libexec/apache/mod_include.la
 libexec/apache/mod_include.so
-libexec/apache/mod_info.la
 libexec/apache/mod_info.so
-libexec/apache/mod_log_config.la
 libexec/apache/mod_log_config.so
-%%CACHEOPT%%libexec/apache/mod_mem_cache.la
-%%CACHEOPT%%libexec/apache/mod_mem_cache.so
-libexec/apache/mod_mime.la
+%%THREADONLY%%libexec/apache/mod_mem_cache.so
 libexec/apache/mod_mime.so
-libexec/apache/mod_mime_magic.la
 libexec/apache/mod_mime_magic.so
-libexec/apache/mod_negotiation.la
 libexec/apache/mod_negotiation.so
-%%PROXYOPT%%libexec/apache/mod_proxy.la
-%%PROXYOPT%%libexec/apache/mod_proxy.so
-%%PROXYOPT%%libexec/apache/mod_proxy_connect.la
-%%PROXYOPT%%libexec/apache/mod_proxy_connect.so
-%%PROXYOPT%%libexec/apache/mod_proxy_ftp.la
-%%PROXYOPT%%libexec/apache/mod_proxy_ftp.so
-%%PROXYOPT%%libexec/apache/mod_proxy_http.la
-%%PROXYOPT%%libexec/apache/mod_proxy_http.so
-libexec/apache/mod_rewrite.la
+libexec/apache/mod_proxy.so
+libexec/apache/mod_proxy_connect.so
+libexec/apache/mod_proxy_ftp.so
+libexec/apache/mod_proxy_http.so
 libexec/apache/mod_rewrite.so
-libexec/apache/mod_setenvif.la
 libexec/apache/mod_setenvif.so
-libexec/apache/mod_speling.la
 libexec/apache/mod_speling.so
-%%SSLOPT%%libexec/apache/mod_ssl.la
 %%SSLOPT%%libexec/apache/mod_ssl.so
-libexec/apache/mod_status.la
 libexec/apache/mod_status.so
-libexec/apache/mod_unique_id.la
 libexec/apache/mod_unique_id.so
-libexec/apache/mod_userdir.la
 libexec/apache/mod_userdir.so
-libexec/apache/mod_usertrack.la
 libexec/apache/mod_usertrack.so
-libexec/apache/mod_vhost_alias.la
 libexec/apache/mod_vhost_alias.so
-@dirrm libexec/apache
 sbin/ab
 sbin/apachectl
 sbin/apxs
 sbin/checkgid
 sbin/dbmmanage
+sbin/envvars
+sbin/envvars-std
+sbin/htdbm
 sbin/htdigest
 sbin/htpasswd
 sbin/httpd
 sbin/logresolve
 sbin/rotatelogs
+share/apache/config_vars.mk
+share/apache/instdso.sh
+share/apache/library.mk
+share/apache/libtool
+share/apache/ltlib.mk
+share/apache/program.mk
+share/apache/rules.mk
+share/apache/special.mk
 %%PORTDOCS%%share/doc/apache/LICENSE
 %%PORTDOCS%%share/doc/apache/bind.html
 %%PORTDOCS%%share/doc/apache/cgi_path.html
@@ -237,10 +215,7 @@ sbin/rotatelogs
 %%PORTDOCS%%share/doc/apache/dso.html
 %%PORTDOCS%%share/doc/apache/ebcdic.html
 %%PORTDOCS%%share/doc/apache/env.html
-%%PORTDOCS%%share/doc/apache/faq/footer.html
-%%PORTDOCS%%share/doc/apache/faq/header.html
 %%PORTDOCS%%share/doc/apache/faq/index.html
-%%PORTDOCS%%share/doc/apache/faq/support.html
 %%PORTDOCS%%share/doc/apache/filter.html
 %%PORTDOCS%%share/doc/apache/footer.html
 %%PORTDOCS%%share/doc/apache/handler.html.en
@@ -302,7 +277,6 @@ sbin/rotatelogs
 %%PORTDOCS%%share/doc/apache/mod/mod_asis.html
 %%PORTDOCS%%share/doc/apache/mod/mod_auth.html
 %%PORTDOCS%%share/doc/apache/mod/mod_auth_anon.html
-%%PORTDOCS%%share/doc/apache/mod/mod_auth_db.html
 %%PORTDOCS%%share/doc/apache/mod/mod_auth_dbm.html
 %%PORTDOCS%%share/doc/apache/mod/mod_auth_digest.html
 %%PORTDOCS%%share/doc/apache/mod/mod_auth_ldap.html
@@ -343,15 +317,18 @@ sbin/rotatelogs
 %%PORTDOCS%%share/doc/apache/mod/mod_vhost_alias.html
 %%PORTDOCS%%share/doc/apache/mod/module-dict.html
 %%PORTDOCS%%share/doc/apache/mod/mpm_common.html
+%%PORTDOCS%%share/doc/apache/mod/mpm_netware.html
 %%PORTDOCS%%share/doc/apache/mod/mpm_winnt.html
 %%PORTDOCS%%share/doc/apache/mod/perchild.html
 %%PORTDOCS%%share/doc/apache/mod/prefork.html
-%%PORTDOCS%%share/doc/apache/mod/threaded.html
+%%PORTDOCS%%share/doc/apache/mod/worker.html
 %%PORTDOCS%%share/doc/apache/mpm.html
+%%PORTDOCS%%share/doc/apache/new_features_2_0.html.de
 %%PORTDOCS%%share/doc/apache/new_features_2_0.html.en
 %%PORTDOCS%%share/doc/apache/new_features_2_0.html.fr
 %%PORTDOCS%%share/doc/apache/platform/footer.html
 %%PORTDOCS%%share/doc/apache/platform/header.html
+%%PORTDOCS%%share/doc/apache/platform/netware.html
 %%PORTDOCS%%share/doc/apache/platform/perf-hp.html
 %%PORTDOCS%%share/doc/apache/platform/win_compiling.html
 %%PORTDOCS%%share/doc/apache/platform/win_service.html
@@ -374,6 +351,7 @@ sbin/rotatelogs
 %%PORTDOCS%%share/doc/apache/sections.html
 %%PORTDOCS%%share/doc/apache/server-wide.html.en
 %%PORTDOCS%%share/doc/apache/server-wide.html.ja.jis
+%%PORTDOCS%%share/doc/apache/sitemap.html
 %%PORTDOCS%%share/doc/apache/ssl/Makefile
 %%PORTDOCS%%share/doc/apache/ssl/footer.html
 %%PORTDOCS%%share/doc/apache/ssl/header.html
@@ -447,41 +425,18 @@ sbin/rotatelogs
 %%PORTDOCS%%share/doc/apache/vhosts/ip-based.html
 %%PORTDOCS%%share/doc/apache/vhosts/mass.html
 %%PORTDOCS%%share/doc/apache/vhosts/name-based.html
-%%PORTDOCS%%@dirrm share/doc/apache/vhosts
-%%PORTDOCS%%@dirrm share/doc/apache/ssl
-%%PORTDOCS%%@dirrm share/doc/apache/search
-%%PORTDOCS%%@dirrm share/doc/apache/programs
-%%PORTDOCS%%@dirrm share/doc/apache/platform
-%%PORTDOCS%%@dirrm share/doc/apache/mod
-%%PORTDOCS%%@dirrm share/doc/apache/misc
-%%PORTDOCS%%@dirrm share/doc/apache/images
-%%PORTDOCS%%@dirrm share/doc/apache/howto
-%%PORTDOCS%%@dirrm share/doc/apache/faq
-%%PORTDOCS%%@dirrm share/doc/apache/developer
-%%PORTDOCS%%@dirrm share/doc/apache
-share/mk/apache/config_vars.mk
-share/mk/apache/library.mk
-share/mk/apache/libtool
-share/mk/apache/ltlib.mk
-share/mk/apache/program.mk
-share/mk/apache/rules.mk
-share/mk/apache/special.mk
-@dirrm share/mk/apache
-@dirrm share/mk
 @exec mkdir -p %D/www
-@exec [ ! -d %D/www/cgi-bin ] && ln -fs %D/www/cgi-bin.default %D/www/cgi-bin
 @unexec if [ -L %D/www/cgi-bin ]; then rm -f %D/www/cgi-bin; fi
+@exec [ ! -d %D/www/cgi-bin ] && ln -fs %D/www/cgi-bin.default %D/www/cgi-bin
 www/cgi-bin.default/printenv
 www/cgi-bin.default/test-cgi
-www/cgi-bin.default/test-cgi.bat
-@exec [ ! -d %D/www/data ] && ln -fs %D/www/data.default %D/www/data
 @unexec if [ -L %D/www/data ]; then rm -f %D/www/data; fi
+@exec [ ! -d %D/www/data ] && ln -fs %D/www/data.default %D/www/data
 www/data.default/apache_pb.gif
 www/data.default/apache_pb.png
 www/data.default/apache_pb2.gif
 www/data.default/apache_pb2.png
 www/data.default/apache_pb2_ani.gif
-www/data.default/error.README
 www/data.default/index.html.ca
 www/data.default/index.html.cz.iso8859-2
 www/data.default/index.html.de
@@ -514,7 +469,6 @@ www/data.default/index.html.se
 www/data.default/index.html.tw
 www/data.default/index.html.tw.Big5
 www/data.default/index.html.var
-@unexec if [ -L %D/www/data ]; then rm -f %D/www/data; fi
 www/error/HTTP_BAD_GATEWAY.html.var
 www/error/HTTP_BAD_REQUEST.html.var
 www/error/HTTP_FORBIDDEN.html.var
@@ -533,6 +487,7 @@ www/error/HTTP_SERVICE_UNAVAILABLE.html.var
 www/error/HTTP_UNAUTHORIZED.html.var
 www/error/HTTP_UNSUPPORTED_MEDIA_TYPE.html.var
 www/error/HTTP_VARIANT_ALSO_VARIES.html.var
+www/error/README
 www/error/contact.html.var
 www/error/include/bottom.html
 www/error/include/spacer.html
@@ -597,6 +552,7 @@ www/icons/folder.sec.gif
 www/icons/folder.sec.png
 www/icons/forward.gif
 www/icons/forward.png
+www/icons/freebsd.gif
 www/icons/generic.gif
 www/icons/generic.png
 www/icons/generic.red.gif
@@ -763,3 +719,20 @@ www/icons/world2.png
 @dirrm www/data.default
 @dirrm www/cgi-bin.default
 @dirrm www
+%%PORTDOCS%%@dirrm share/doc/apache/vhosts
+%%PORTDOCS%%@dirrm share/doc/apache/ssl
+%%PORTDOCS%%@dirrm share/doc/apache/search
+%%PORTDOCS%%@dirrm share/doc/apache/programs
+%%PORTDOCS%%@dirrm share/doc/apache/platform
+%%PORTDOCS%%@dirrm share/doc/apache/mod
+%%PORTDOCS%%@dirrm share/doc/apache/misc
+%%PORTDOCS%%@dirrm share/doc/apache/images
+%%PORTDOCS%%@dirrm share/doc/apache/howto
+%%PORTDOCS%%@dirrm share/doc/apache/faq
+%%PORTDOCS%%@dirrm share/doc/apache/developer
+%%PORTDOCS%%@dirrm share/doc/apache
+@dirrm share/apache
+@dirrm libexec/apache
+@dirrm lib/apache
+@dirrm include/apache
+@dirrm etc/apache2