Upgrade to Apache 1.3.22, and

* fix libdescrypt detection: libdescrypt is only needed for
  OSVERSION < 430001 or OSVERSION > 499999 and OSVERSION < 500014,
  due to libdescrypt has been combined into the libcrypt library
  on recent FreeBSD versions.

* default to using the FreeBSD Frontpage Extentions on i386.
  There maybe problems with fpsrvadm.exe when it creates passwords
  on a system that by default uses MD5 passwords.  May need to set
  roots passwd_format to des and change the password, before
  installing (login.conf). BSDi FrontPage Extentions can be used
  by defining WANT_BSDI_EXT.

* Added dependacy on misc/compat3x for the FreeBSD FP Exts.

* Moved execfilename to the end of the request_rec structure
  in httpd.h, so that it would stop breaking binary compatiblity
  with other pre-compiled Apache modules.  This should allow
  compiled modules build for www/apache13 to also work on
  www/apache13-fp without needing to recompile them.

* Removed the Virtual host on port 8080 from httpd.conf, due to
  the manual directory is now exported using an Alias, which
  assigns it to a location on the main document root.

* Moved the Frontpage documents from manual/mod/mod_frontpage to
  manual/frontpage. (Avoids patching manual/mod/index.html*)

PR: ports/31361
Submitted by: Scot W. Hetzel <hetzels@westbend.net> (MAINTAINER)

1 files changed, 153 insertions, 19 deletions

diff --git a/www/apache13-fp/pkg-plist b/www/apache13-fp/pkg-plist
index 9844fea..53b1984 100644
--- a/www/apache13-fp/pkg-plist
+++ b/www/apache13-fp/pkg-plist
@@ -96,14 +96,13 @@ sbin/suexec
 share/doc/apache/apache_pb.gif
 @exec if [ ! -h %B/images ]; then (cd %B ; ln -s manual/images images); fi
 @unexec if [ -h %B/images ]; then rm -f %B/images; fi
-share/doc/apache/README.rus
 share/doc/apache/index.html.ca
 share/doc/apache/index.html.cz
 share/doc/apache/index.html.de
 share/doc/apache/index.html.dk
 share/doc/apache/index.html.ee
 share/doc/apache/index.html.el
-share/doc/apache/index.html.en-dist
+share/doc/apache/index.html.en
 share/doc/apache/index.html.es
 share/doc/apache/index.html.fr
 share/doc/apache/index.html.he.iso8859-8
@@ -112,6 +111,7 @@ share/doc/apache/index.html.ja.jis
 share/doc/apache/index.html.kr.iso-kr
 share/doc/apache/index.html.lu
 share/doc/apache/index.html.nl
+share/doc/apache/index.html.nn
 share/doc/apache/index.html.no
 share/doc/apache/index.html.po.iso-pl
 share/doc/apache/index.html.pt
@@ -127,21 +127,34 @@ share/doc/apache/index.html.se
 share/doc/apache/index.html.zh.Big5
 @unexec rm -rf %B/index.html.en
 share/doc/apache/manual/LICENSE
-share/doc/apache/manual/bind.html
-share/doc/apache/manual/cgi_path.html
+share/doc/apache/manual/bind.html.en
+share/doc/apache/manual/bind.html.fr
+share/doc/apache/manual/bind.html.html
+share/doc/apache/manual/cgi_path.html.en
+share/doc/apache/manual/cgi_path.html.fr
+share/doc/apache/manual/cgi_path.html.html
 share/doc/apache/manual/configuring.html.en
 share/doc/apache/manual/configuring.html.fr
 share/doc/apache/manual/configuring.html.html
 share/doc/apache/manual/configuring.html.ja.jis
 share/doc/apache/manual/content-negotiation.html
 share/doc/apache/manual/custom-error.html.en
+share/doc/apache/manual/custom-error.html.fr
 share/doc/apache/manual/custom-error.html.html
 share/doc/apache/manual/custom-error.html.ja.jis
-share/doc/apache/manual/dns-caveats.html
+share/doc/apache/manual/cygwin.html
+share/doc/apache/manual/dns-caveats.html.en
+share/doc/apache/manual/dns-caveats.html.fr
+share/doc/apache/manual/dns-caveats.html.html
 share/doc/apache/manual/dso.html
 share/doc/apache/manual/ebcdic.html
-share/doc/apache/manual/env.html
+share/doc/apache/manual/env.html.en
+share/doc/apache/manual/env.html.html
+share/doc/apache/manual/env.html.ja.jis
 share/doc/apache/manual/footer.html
+share/doc/apache/manual/frontpage/index.html        
+@exec if [ -h %B/serk ] ; then rm -f %B/serk ; fi ; ln -fs %D/frontpage/%%FP_REV%%/serk %B/serk
+@unexec rm -f %B/serk
 share/doc/apache/manual/handler.html.en
 share/doc/apache/manual/handler.html.html
 share/doc/apache/manual/handler.html.ja.jis
@@ -177,11 +190,14 @@ share/doc/apache/manual/install.html.es
 share/doc/apache/manual/install.html.fr
 share/doc/apache/manual/install.html.html
 share/doc/apache/manual/install.html.ja.jis
-share/doc/apache/manual/invoking.html
+share/doc/apache/manual/invoking.html.en
 share/doc/apache/manual/invoking.html.fr
 share/doc/apache/manual/invoking.html.html
-share/doc/apache/manual/keepalive.html
+share/doc/apache/manual/keepalive.html.en
+share/doc/apache/manual/keepalive.html.html
+share/doc/apache/manual/keepalive.html.ja.jis
 share/doc/apache/manual/location.html
+share/doc/apache/manual/logs.html
 share/doc/apache/manual/man-template.html
 share/doc/apache/manual/misc/API.html
 share/doc/apache/manual/misc/FAQ.html
@@ -207,17 +223,27 @@ share/doc/apache/manual/misc/security_tips.html
 share/doc/apache/manual/misc/tutorials.html
 share/doc/apache/manual/misc/vif-info.html
 share/doc/apache/manual/misc/windoz_keepalive.html
-share/doc/apache/manual/mod/core.html
+share/doc/apache/manual/mod/core.html.en
+share/doc/apache/manual/mod/core.html.fr
+share/doc/apache/manual/mod/core.html.html
 share/doc/apache/manual/mod/directive-dict.html.en
+share/doc/apache/manual/mod/directive-dict.html.fr
 share/doc/apache/manual/mod/directive-dict.html.html
 share/doc/apache/manual/mod/directive-dict.html.ja.jis
-share/doc/apache/manual/mod/directives.html
+share/doc/apache/manual/mod/directives.html.de
+share/doc/apache/manual/mod/directives.html.html
+share/doc/apache/manual/mod/directives.html.en
+share/doc/apache/manual/mod/directives.html.fr
+share/doc/apache/manual/mod/directives.html.ja.jis
 share/doc/apache/manual/mod/footer.html
 share/doc/apache/manual/mod/header.html
-share/doc/apache/manual/mod/index-bytype.html
+share/doc/apache/manual/mod/index-bytype.html.en
 share/doc/apache/manual/mod/index-bytype.html.fr
-share/doc/apache/manual/mod/index.html
+share/doc/apache/manual/mod/index-bytype.html.html
+share/doc/apache/manual/mod/index.html.en
 share/doc/apache/manual/mod/index.html.fr
+share/doc/apache/manual/mod/index.html.html
+share/doc/apache/manual/mod/index.html.ja.jis
 share/doc/apache/manual/mod/mod_access.html
 share/doc/apache/manual/mod/mod_actions.html
 share/doc/apache/manual/mod/mod_alias.html
@@ -240,9 +266,6 @@ share/doc/apache/manual/mod/mod_env.html.html
 share/doc/apache/manual/mod/mod_env.html.ja.jis
 share/doc/apache/manual/mod/mod_example.html
 share/doc/apache/manual/mod/mod_expires.html
-share/doc/apache/manual/mod/mod_frontpage/index.html
-@exec if [ -h %B/serk ] ; then rm -f %B/serk ; fi ; ln -fs %D/frontpage/%%FP_REV%%/serk %B/serk
-@unexec rm -f %B/serk
 share/doc/apache/manual/mod/mod_headers.html
 share/doc/apache/manual/mod/mod_imap.html
 share/doc/apache/manual/mod/mod_include.html
@@ -310,7 +333,7 @@ share/doc/apache/manual/server-wide.html.fr
 share/doc/apache/manual/server-wide.html.html
 share/doc/apache/manual/server-wide.html.ja.jis
 share/doc/apache/manual/sourcereorg.html
-share/doc/apache/manual/stopping.html
+share/doc/apache/manual/stopping.html.en
 share/doc/apache/manual/stopping.html.fr
 share/doc/apache/manual/stopping.html.html
 share/doc/apache/manual/suexec.html.en
@@ -332,132 +355,243 @@ share/doc/apache/manual/vhosts/index.html.html
 share/doc/apache/manual/vhosts/index.html.ja.jis
 share/doc/apache/manual/vhosts/ip-based.html
 share/doc/apache/manual/vhosts/mass.html
-share/doc/apache/manual/vhosts/name-based.html
+share/doc/apache/manual/vhosts/name-based.html.en
+share/doc/apache/manual/vhosts/name-based.html.html
+share/doc/apache/manual/vhosts/name-based.html.ja.jis
 share/doc/apache/manual/vhosts/vhosts-in-depth.html
 share/doc/apache/manual/vhosts/virtual-host.html
 share/doc/apache/manual/win_compiling.html
-share/doc/apache/manual/win_service.html
+share/doc/apache/manual/win_service.html.en
+share/doc/apache/manual/win_service.html.html
+share/doc/apache/manual/win_service.html.ja.jis
 share/doc/apache/manual/windows.html
 www/cgi-bin.default/printenv
 www/cgi-bin.default/test-cgi
 www/icons/README
 www/icons/a.gif
+www/icons/a.png
 www/icons/alert.black.gif
+www/icons/alert.black.png
 www/icons/alert.red.gif
+www/icons/alert.red.png
 www/icons/apache_pb.gif
+www/icons/apache_pb.png
 www/icons/back.gif
+www/icons/back.png
 www/icons/ball.gray.gif
+www/icons/ball.gray.png
 www/icons/ball.red.gif
+www/icons/ball.red.png
 www/icons/binary.gif
+www/icons/binary.png
 www/icons/binhex.gif
+www/icons/binhex.png
 www/icons/blank.gif
+www/icons/blank.png
 www/icons/bomb.gif
+www/icons/bomb.png
 www/icons/box1.gif
+www/icons/box1.png
 www/icons/box2.gif
+www/icons/box2.png
 www/icons/broken.gif
+www/icons/broken.png
 www/icons/burst.gif
+www/icons/burst.png
 www/icons/c.gif
+www/icons/c.png
 www/icons/comp.blue.gif
+www/icons/comp.blue.png
 www/icons/comp.gray.gif
+www/icons/comp.gray.png
 www/icons/compressed.gif
+www/icons/compressed.png
 www/icons/continued.gif
+www/icons/continued.png
 www/icons/dir.gif
+www/icons/dir.png
 www/icons/down.gif
+www/icons/down.png
 www/icons/dvi.gif
+www/icons/dvi.png
 www/icons/f.gif
+www/icons/f.png
 www/icons/folder.gif
+www/icons/folder.png
 www/icons/folder.open.gif
+www/icons/folder.open.png
 www/icons/folder.sec.gif
+www/icons/folder.sec.png
 www/icons/forward.gif
+www/icons/forward.png
 www/icons/generic.gif
+www/icons/generic.png
 www/icons/generic.red.gif
+www/icons/generic.red.png
 www/icons/generic.sec.gif
+www/icons/generic.sec.png
 www/icons/hand.right.gif
+www/icons/hand.right.png
 www/icons/hand.up.gif
+www/icons/hand.up.png
 www/icons/icon.sheet.gif
+www/icons/icon.sheet.png
 www/icons/image1.gif
+www/icons/image1.png
 www/icons/image2.gif
+www/icons/image2.png
 www/icons/image3.gif
+www/icons/image3.png
 www/icons/index.gif
+www/icons/index.png
 www/icons/layout.gif
+www/icons/layout.png
 www/icons/left.gif
+www/icons/left.png
 www/icons/link.gif
+www/icons/link.png
 www/icons/movie.gif
+www/icons/movie.png
 www/icons/p.gif
+www/icons/p.png
 www/icons/patch.gif
+www/icons/patch.png
 www/icons/pdf.gif
+www/icons/pdf.png
 www/icons/pie0.gif
+www/icons/pie0.png
 www/icons/pie1.gif
+www/icons/pie1.png
 www/icons/pie2.gif
+www/icons/pie2.png
 www/icons/pie3.gif
+www/icons/pie3.png
 www/icons/pie4.gif
+www/icons/pie4.png
 www/icons/pie5.gif
+www/icons/pie5.png
 www/icons/pie6.gif
+www/icons/pie6.png
 www/icons/pie7.gif
+www/icons/pie7.png
 www/icons/pie8.gif
+www/icons/pie8.png
 www/icons/portal.gif
+www/icons/portal.png
 www/icons/ps.gif
+www/icons/ps.png
 www/icons/quill.gif
+www/icons/quill.png
 www/icons/right.gif
+www/icons/right.png
 www/icons/screw1.gif
+www/icons/screw1.png
 www/icons/screw2.gif
+www/icons/screw2.png
 www/icons/script.gif
+www/icons/script.png
 www/icons/small/README.txt
 www/icons/small/back.gif
+www/icons/small/back.png
 www/icons/small/binary.gif
+www/icons/small/binary.png
 www/icons/small/binhex.gif
+www/icons/small/binhex.png
 www/icons/small/blank.gif
+www/icons/small/blank.png
 www/icons/small/broken.gif
+www/icons/small/broken.png
 www/icons/small/burst.gif
+www/icons/small/burst.png
 www/icons/small/comp1.gif
+www/icons/small/comp1.png
 www/icons/small/comp2.gif
+www/icons/small/comp2.png
 www/icons/small/compressed.gif
+www/icons/small/compressed.png
 www/icons/small/continued.gif
+www/icons/small/continued.png
 www/icons/small/dir.gif
+www/icons/small/dir.png
 www/icons/small/dir2.gif
+www/icons/small/dir2.png
 www/icons/small/doc.gif
+www/icons/small/doc.png
 www/icons/small/forward.gif
+www/icons/small/forward.png
 www/icons/small/generic.gif
+www/icons/small/generic.png
 www/icons/small/generic2.gif
+www/icons/small/generic2.png
 www/icons/small/generic3.gif
+www/icons/small/generic3.png
 www/icons/small/image.gif
+www/icons/small/image.png
 www/icons/small/image2.gif
+www/icons/small/image2.png
 www/icons/small/index.gif
+www/icons/small/index.png
 www/icons/small/key.gif
+www/icons/small/key.png
 www/icons/small/movie.gif
+www/icons/small/movie.png
 www/icons/small/patch.gif
+www/icons/small/patch.png
 www/icons/small/ps.gif
+www/icons/small/ps.png
 www/icons/small/rainbow.gif
+www/icons/small/rainbow.png
 www/icons/small/sound.gif
+www/icons/small/sound.png
 www/icons/small/sound2.gif
+www/icons/small/sound2.png
 www/icons/small/tar.gif
+www/icons/small/tar.png
 www/icons/small/text.gif
+www/icons/small/text.png
 www/icons/small/transfer.gif
+www/icons/small/transfer.png
 www/icons/small/unknown.gif
+www/icons/small/unknown.png
 www/icons/small/uu.gif
+www/icons/small/uu.png
 www/icons/sound1.gif
+www/icons/sound1.png
 www/icons/sound2.gif
+www/icons/sound2.png
 www/icons/sphere1.gif
+www/icons/sphere1.png
 www/icons/sphere2.gif
+www/icons/sphere2.png
 www/icons/tar.gif
+www/icons/tar.png
 www/icons/tex.gif
+www/icons/tex.png
 www/icons/text.gif
+www/icons/text.png
 www/icons/transfer.gif
+www/icons/transfer.png
 www/icons/unknown.gif
+www/icons/unknown.png
 www/icons/up.gif
+www/icons/up.png
 www/icons/uu.gif
+www/icons/uu.png
 www/icons/uuencoded.gif
+www/icons/uuencoded.png
 www/icons/world1.gif
+www/icons/world1.png
 www/icons/world2.gif
+www/icons/world2.png
 @exec mkdir -p %D/www/proxy
 @dirrm etc/apache
 @dirrm include/apache/xml
 @dirrm include/apache
 @dirrm libexec/apache
+@dirrm share/doc/apache/manual/frontpage
 @dirrm share/doc/apache/manual/howto
 @dirrm share/doc/apache/manual/images
 @dirrm share/doc/apache/manual/misc
-@dirrm share/doc/apache/manual/mod/mod_frontpage
 @dirrm share/doc/apache/manual/mod
 @dirrm share/doc/apache/manual/programs
 @dirrm share/doc/apache/manual/search