1 files changed, 105 insertions, 64 deletions
diff --git a/www/apache13-modssl/pkg-plist b/www/apache13-modssl/pkg-plist
index fcd914c2ca22..54fa6041869b 100644
--- a/www/apache13-modssl/pkg-plist
+++ b/www/apache13-modssl/pkg-plist
@@ -2,20 +2,20 @@ bin/checkgid
 bin/dbmmanage
 bin/htdigest
 bin/htpasswd
-@unexec if cmp -s %D/etc/apache/access.conf %D/etc/apache/access.conf.default; then rm -f %D/etc/apache/access.conf; fi
-etc/apache/access.conf.default
+@unexec if cmp -s %D/etc/apache/access.conf %D/etc/apache/access.conf-dist; then rm -f %D/etc/apache/access.conf; fi
+etc/apache/access.conf-dist
 @exec [ ! -f %B/access.conf ] && cp %B/%f %B/access.conf
-@unexec if cmp -s %D/etc/apache/httpd.conf %D/etc/apache/httpd.conf.default; then rm -f %D/etc/apache/httpd.conf; fi
-etc/apache/httpd.conf.default
+@unexec if cmp -s %D/etc/apache/httpd.conf %D/etc/apache/httpd.conf-dist; then rm -f %D/etc/apache/httpd.conf; fi
+etc/apache/httpd.conf-dist
 @exec [ ! -f %B/httpd.conf ] && cp %B/%f %B/httpd.conf
-@unexec if cmp -s %D/etc/apache/magic %D/etc/apache/magic.default; then rm -f %D/etc/apache/magic; fi
-etc/apache/magic.default
+@unexec if cmp -s %D/etc/apache/magic %D/etc/apache/magic-dist; then rm -f %D/etc/apache/magic; fi
+etc/apache/magic-dist
 @exec [ ! -f %B/magic ] && cp %B/%f %B/magic
-@unexec if cmp -s %D/etc/apache/mime.types %D/etc/apache/mime.types.default; then rm -f %D/etc/apache/mime.types; fi
-etc/apache/mime.types.default
+@unexec if cmp -s %D/etc/apache/mime.types %D/etc/apache/mime.types-dist; then rm -f %D/etc/apache/mime.types; fi
+etc/apache/mime.types-dist
 @exec [ ! -f %B/mime.types ] && cp %B/%f %B/mime.types
-@unexec if cmp -s %D/etc/apache/srm.conf %D/etc/apache/srm.conf.default; then rm -f %D/etc/apache/srm.conf; fi
-etc/apache/srm.conf.default
+@unexec if cmp -s %D/etc/apache/srm.conf %D/etc/apache/srm.conf-dist; then rm -f %D/etc/apache/srm.conf; fi
+etc/apache/srm.conf-dist
 @exec [ ! -f %B/srm.conf ] && cp %B/%f %B/srm.conf
 etc/apache/ssl.crl/Makefile
 etc/apache/ssl.crl/README.CRL
@@ -38,7 +38,8 @@ etc/apache/ssl.key/snakeoil-rsa.key
 etc/apache/ssl.prm/README.PRM
 etc/apache/ssl.prm/snakeoil-ca-dsa.prm
 etc/apache/ssl.prm/snakeoil-dsa.prm
-etc/rc.d/apache.sh
+@unexec if cmp -s %D/etc/rc.d/apache.sh %D/etc/rc.d/apache.sh-dist; then rm -f %D/etc/rc.d/apache.sh; fi
+etc/rc.d/apache.sh-dist
 include/apache/ap.h
 include/apache/ap_alloc.h
 include/apache/ap_compat.h
@@ -128,44 +129,47 @@ sbin/apxs
 sbin/httpd
 sbin/logresolve
 sbin/rotatelogs
-www/data.default/apache_pb.gif
+%%SUB_SUEXEC%%sbin/suexec
+www/data-dist/apache_pb.gif
 @exec [ -d %D/www/data/ ] || ln -fs %B %D/www/data
-www/data.default/index.html.ca
-www/data.default/index.html.cz
-www/data.default/index.html.de
-www/data.default/index.html.dk
-www/data.default/index.html.ee
-www/data.default/index.html.el
-www/data.default/index.html.en
-www/data.default/index.html.es
-www/data.default/index.html.fr
-www/data.default/index.html.he.iso8859-8
-www/data.default/index.html.it
-www/data.default/index.html.ja.jis
-www/data.default/index.html.kr.iso-kr
-www/data.default/index.html.lu
-www/data.default/index.html.nl
-www/data.default/index.html.nn
-www/data.default/index.html.no
-www/data.default/index.html.po.iso-pl
-www/data.default/index.html.pt
-www/data.default/index.html.pt-br
-www/data.default/index.html.ru.cp-1251
-www/data.default/index.html.ru.cp866
-www/data.default/index.html.ru.iso-ru
-www/data.default/index.html.ru.koi8-r
-www/data.default/index.html.ru.ucs2
-www/data.default/index.html.ru.ucs4
-www/data.default/index.html.ru.utf8
-www/data.default/index.html.se
-www/data.default/index.html.zh.Big5
+www/data-dist/index.html.ca
+www/data-dist/index.html.cz
+www/data-dist/index.html.de
+www/data-dist/index.html.dk
+www/data-dist/index.html.ee
+www/data-dist/index.html.el
+www/data-dist/index.html.en
+www/data-dist/index.html.es
+www/data-dist/index.html.fr
+www/data-dist/index.html.he.iso8859-8
+www/data-dist/index.html.it
+www/data-dist/index.html.ja.jis
+www/data-dist/index.html.kr.iso-kr
+www/data-dist/index.html.lb.utf8
+www/data-dist/index.html.nl
+www/data-dist/index.html.nn
+www/data-dist/index.html.no
+www/data-dist/index.html.po.iso-pl
+www/data-dist/index.html.pt
+www/data-dist/index.html.pt-br
+www/data-dist/index.html.ru.cp-1251
+www/data-dist/index.html.ru.cp866
+www/data-dist/index.html.ru.iso-ru
+www/data-dist/index.html.ru.koi8-r
+www/data-dist/index.html.ru.ucs2
+www/data-dist/index.html.ru.ucs4
+www/data-dist/index.html.ru.utf8
+www/data-dist/index.html.se
+www/data-dist/index.html.zh
 share/doc/apache/LICENSE
 share/doc/apache/bind.html.en
 share/doc/apache/bind.html.fr
 share/doc/apache/bind.html.html
+share/doc/apache/bind.html.ja.jis
 share/doc/apache/cgi_path.html.en
 share/doc/apache/cgi_path.html.fr
 share/doc/apache/cgi_path.html.html
+share/doc/apache/cgi_path.html.ja.jis
 share/doc/apache/configuring.html.fr
 share/doc/apache/configuring.html.en
 share/doc/apache/configuring.html.ja.jis
@@ -258,15 +262,21 @@ share/doc/apache/mod/header.html
 share/doc/apache/mod/index-bytype.html.en
 share/doc/apache/mod/index-bytype.html.fr
 share/doc/apache/mod/index-bytype.html.html
+share/doc/apache/mod/index-bytype.html.ja.jis
 share/doc/apache/mod/index.html.en
 share/doc/apache/mod/index.html.fr
 share/doc/apache/mod/index.html.html
 share/doc/apache/mod/index.html.ja.jis
-share/doc/apache/mod/mod_access.html
+share/doc/apache/mod/mod_access.html.en
+share/doc/apache/mod/mod_access.html.html
 share/doc/apache/mod/mod_access.html.ja.jis
-share/doc/apache/mod/mod_actions.html
+share/doc/apache/mod/mod_actions.html.en
+share/doc/apache/mod/mod_actions.html.html
+share/doc/apache/mod/mod_actions.html.ja.jis
 share/doc/apache/mod/mod_alias.html
-share/doc/apache/mod/mod_asis.html
+share/doc/apache/mod/mod_asis.html.en
+share/doc/apache/mod/mod_asis.html.html
+share/doc/apache/mod/mod_asis.html.ja.jis
 share/doc/apache/mod/mod_auth.html
 share/doc/apache/mod/mod_auth_anon.html
 share/doc/apache/mod/mod_auth_db.html
@@ -275,7 +285,9 @@ share/doc/apache/mod/mod_auth_digest.html
 share/doc/apache/mod/mod_autoindex.html
 share/doc/apache/mod/mod_browser.html
 share/doc/apache/mod/mod_cern_meta.html
-share/doc/apache/mod/mod_cgi.html
+share/doc/apache/mod/mod_cgi.html.en
+share/doc/apache/mod/mod_cgi.html.html
+share/doc/apache/mod/mod_cgi.html.ja.jis
 share/doc/apache/mod/mod_cookies.html
 share/doc/apache/mod/mod_define.html
 share/doc/apache/mod/mod_digest.html
@@ -291,7 +303,9 @@ share/doc/apache/mod/mod_expires.html
 share/doc/apache/mod/mod_headers.html
 share/doc/apache/mod/mod_imap.html
 share/doc/apache/mod/mod_include.html
-share/doc/apache/mod/mod_info.html
+share/doc/apache/mod/mod_info.html.en
+share/doc/apache/mod/mod_info.html.html
+share/doc/apache/mod/mod_info.html.ja.jis
 share/doc/apache/mod/mod_isapi.html
 share/doc/apache/mod/mod_log_agent.html
 share/doc/apache/mod/mod_log_common.html
@@ -309,8 +323,12 @@ share/doc/apache/mod/mod_rewrite.html
 share/doc/apache/mod/mod_setenvif.html.en
 share/doc/apache/mod/mod_setenvif.html.html
 share/doc/apache/mod/mod_setenvif.html.ja.jis
-share/doc/apache/mod/mod_so.html
-share/doc/apache/mod/mod_speling.html
+share/doc/apache/mod/mod_so.html.en
+share/doc/apache/mod/mod_so.html.html
+share/doc/apache/mod/mod_so.html.ja.jis
+share/doc/apache/mod/mod_speling.html.en
+share/doc/apache/mod/mod_speling.html.html
+share/doc/apache/mod/mod_speling.html.ja.jis
 share/doc/apache/mod/mod_ssl/index.html
 share/doc/apache/mod/mod_ssl/ssl_compat.gfont000.gif
 share/doc/apache/mod/mod_ssl/ssl_compat.html
@@ -366,8 +384,12 @@ share/doc/apache/mod/mod_ssl/ssl_template.title-ref.gif
 share/doc/apache/mod/mod_ssl/ssl_template.title-toc.gif
 share/doc/apache/mod/mod_ssl/ssl_template.title-tutor.gif
 share/doc/apache/mod/mod_status.html
-share/doc/apache/mod/mod_unique_id.html
-share/doc/apache/mod/mod_userdir.html
+share/doc/apache/mod/mod_unique_id.html.en
+share/doc/apache/mod/mod_unique_id.html.html
+share/doc/apache/mod/mod_unique_id.html.ja.jis
+share/doc/apache/mod/mod_userdir.html.en
+share/doc/apache/mod/mod_userdir.html.html
+share/doc/apache/mod/mod_userdir.html.ja.jis
 share/doc/apache/mod/mod_usertrack.html
 share/doc/apache/mod/mod_vhost_alias.html
 share/doc/apache/mod/module-dict.html.en
@@ -381,28 +403,40 @@ share/doc/apache/new_features_1_2.html
 share/doc/apache/new_features_1_3.html.en
 share/doc/apache/new_features_1_3.html.ja.jis
 share/doc/apache/new_features_2_0.html
-share/doc/apache/process-model.html
+share/doc/apache/process-model.html.en
+share/doc/apache/process-model.html.html
+share/doc/apache/process-model.html.ja.jis
 share/doc/apache/programs/ab.html
-share/doc/apache/programs/apachectl.html
+share/doc/apache/programs/apachectl.html.en
+share/doc/apache/programs/apachectl.html.html
+share/doc/apache/programs/apachectl.html.ja.jis
 share/doc/apache/programs/apxs.html
 share/doc/apache/programs/dbmmanage.html
 share/doc/apache/programs/footer.html
 share/doc/apache/programs/header.html
 share/doc/apache/programs/htdigest.html
-share/doc/apache/programs/htpasswd.html
-share/doc/apache/programs/httpd.html
+share/doc/apache/programs/htpasswd.html.en
+share/doc/apache/programs/htpasswd.html.html
+share/doc/apache/programs/htpasswd.html.ja.jis
+share/doc/apache/programs/httpd.html.en
+share/doc/apache/programs/httpd.html.html
+share/doc/apache/programs/httpd.html.ja.jis
 share/doc/apache/programs/index.html.en
 share/doc/apache/programs/index.html.html
 share/doc/apache/programs/index.html.ja.jis
 share/doc/apache/programs/logresolve.html
 share/doc/apache/programs/other.html
 share/doc/apache/programs/rotatelogs.html
-share/doc/apache/programs/suexec.html
+share/doc/apache/programs/suexec.html.en
+share/doc/apache/programs/suexec.html.html
+share/doc/apache/programs/suexec.html.ja.jis
 share/doc/apache/readme-tpf.html
 share/doc/apache/search/manual-index.cgi
 share/doc/apache/server-wide.html.en
 share/doc/apache/server-wide.html.ja.jis
-share/doc/apache/sections.html
+share/doc/apache/sections.html.en
+share/doc/apache/sections.html.html
+share/doc/apache/sections.html.ja.jis
 share/doc/apache/sitemap.html
 share/doc/apache/sourcereorg.html
 share/doc/apache/stopping.html.en
@@ -417,7 +451,9 @@ share/doc/apache/upgrading_to_1_3.html
 share/doc/apache/vhosts/details.html
 share/doc/apache/vhosts/details_1_2.html
 share/doc/apache/vhosts/examples.html
-share/doc/apache/vhosts/fd-limits.html
+share/doc/apache/vhosts/fd-limits.html.en
+share/doc/apache/vhosts/fd-limits.html.html
+share/doc/apache/vhosts/fd-limits.html.ja.jis
 share/doc/apache/vhosts/footer.html
 share/doc/apache/vhosts/header.html
 share/doc/apache/vhosts/host.html
@@ -430,11 +466,14 @@ share/doc/apache/vhosts/name-based.html.html
 share/doc/apache/vhosts/name-based.html.ja.jis
 share/doc/apache/vhosts/vhosts-in-depth.html
 share/doc/apache/vhosts/virtual-host.html
-share/doc/apache/win_compiling.html
+share/doc/apache/win_compiling.html.en
+share/doc/apache/win_compiling.html.html
+share/doc/apache/win_compiling.html.ja.jis
 share/doc/apache/win_service.html.en
 share/doc/apache/win_service.html.html
 share/doc/apache/win_service.html.ja.jis
-share/doc/apache/windows.html
+share/doc/apache/windows.html.en
+share/doc/apache/windows.html.ja.jis
 share/doc/apache/mod/directive-dict.html.html
 share/doc/apache/mod/mod_negotiation.html.html
 share/doc/apache/mod/module-dict.html.html
@@ -456,9 +495,9 @@ share/doc/apache/howto/ssi.html.html
 share/doc/apache/howto/ssi.html.ja.jis
 share/doc/apache/urlmapping.html
 share/doc/apache/vhosts/index.html.html
-www/cgi-bin.default/printenv
+www/cgi-bin-dist/printenv
 @exec [ -d %D/www/cgi-bin/ ] || ln -fs %B %D/www/cgi-bin
-www/cgi-bin.default/test-cgi
+www/cgi-bin-dist/test-cgi
 www/icons/README
 www/icons/a.gif
 www/icons/alert.black.gif
@@ -481,6 +520,8 @@ www/icons/comp.gray.gif
 www/icons/compressed.gif
 www/icons/continued.gif
 www/icons/dir.gif
+www/icons/diskimg.gif
+www/icons/diskimg.png
 www/icons/down.gif
 www/icons/dvi.gif
 www/icons/f.gif
@@ -698,9 +739,9 @@ www/icons/world2.png
 @dirrm share/doc/apache/howto
 @dirrm share/doc/apache/programs
 @dirrm share/doc/apache
-@dirrm www/data.default
-@dirrm www/cgi-bin.default
+@unexec rmdir %D/www/data-dist 2>/dev/null || true
+@unexec rmdir %D/www/cgi-bin-dist 2>/dev/null || true
 @dirrm www/icons/small
 @dirrm www/icons
 @dirrm www/proxy
-@dirrm www
+@unexec rmdir %D/www 2>/dev/null || true