6 files changed, 71 insertions, 73 deletions

diff --git a/www/apache13-fp/Makefile b/www/apache13-fp/Makefile
index 22124de5a20b..6ff746f3edf3 100644
--- a/www/apache13-fp/Makefile
+++ b/www/apache13-fp/Makefile
@@ -7,7 +7,8 @@
 
 PORTNAME=	apache
 PKGNAMESUFFIX=	_fp
-PORTVERSION=	1.3.23
+PORTVERSION=	1.3.26
+PORTREVISION=	0
 CATEGORIES=	www
 MASTER_SITES=	http://www.apache.org/dist/httpd/ \
 		http://www.freebsd.org/gifs/ \
@@ -31,9 +32,6 @@ DISTFILES=	${APACHE} powerlogo.gif fplogo.gif
 
 MAINTAINER=	hetzels@westbend.net
 
-FORBIDDEN=	"Vulnerable to denial-of-service.  See" \
-		"http://httpd.apache.org/info/security_bulletin_20020617.txt"
-
 #PATCH_SITES=	http://www.apache.org/dist/patches/apply_to_${PORTVERSION}/
 #PATCHFILES=
 
@@ -71,7 +69,8 @@ CONFIGURE_ARGS=	 \
 		  --prefix=${PREFIX} \
 		  --server-gid=nogroup \
 		  --with-perl=${PERL} \
-		  --with-layout=${FILESDIR}/FreeBSD.layout:FreeBSD \
+		  --with-layout=FreeBSD \
+		  --manualdir=${DOCSDIR}/manual \
 		  --server-uid=${HTTPD_USER} \
 		  --server-gid=${HTTPD_GROUP} \
 		  --without-confadjust \
diff --git a/www/apache13-fp/distinfo b/www/apache13-fp/distinfo
index 69c72b70b4c7..e25f9aa3d181 100644
--- a/www/apache13-fp/distinfo
+++ b/www/apache13-fp/distinfo
@@ -1,3 +1,3 @@
-MD5 (apache_1.3.23.tar.gz) = 4499443fa1d604243467afe64522abac
+MD5 (apache_1.3.26.tar.gz) = 52e9b875597a208fca9d393e710087b6
 MD5 (powerlogo.gif) = 0f106073b3c7844cf22d4df126b27c62
 MD5 (fplogo.gif) = db0fd186b50fde14ff2ec638382a85e6
diff --git a/www/apache13-fp/files/FreeBSD.layout b/www/apache13-fp/files/FreeBSD.layout
deleted file mode 100644
index 29ec00a18559..000000000000
--- a/www/apache13-fp/files/FreeBSD.layout
+++ /dev/null
@@ -1,20 +0,0 @@
-#   FreeBSD layout...
-<Layout FreeBSD>
-    prefix:        /usr/local
-    exec_prefix:   $prefix
-    bindir:        $exec_prefix/bin
-    sbindir:       $exec_prefix/sbin
-    libexecdir:    $exec_prefix/libexec/apache
-    mandir:        $prefix/man
-    sysconfdir:    $prefix/etc/apache
-    datadir:       $prefix/www
-    iconsdir:      $datadir/icons
-    htdocsdir:     $datadir/data
-    manualdir:     $prefix/share/doc/apache/manual
-    cgidir:        $datadir/cgi-bin
-    includedir:    $prefix/include/apache
-    localstatedir: /var
-    runtimedir:    $localstatedir/run
-    logfiledir:    $localstatedir/log
-    proxycachedir: $datadir/proxy
-</Layout>
diff --git a/www/apache13-fp/files/patch-aa b/www/apache13-fp/files/patch-aa
index 2aadd37e4a21..efa5a46583b7 100644
--- a/www/apache13-fp/files/patch-aa
+++ b/www/apache13-fp/files/patch-aa
@@ -1,5 +1,5 @@
---- configure.orig	Thu Sep 27 13:12:03 2001
-+++ configure	Fri Jan 25 14:32:58 2002
+--- configure.orig	Tue May 21 07:24:59 2002
++++ configure	Tue Jun 18 23:39:04 2002
 @@ -1169,7 +1169,8 @@
      conf_port="80"
  fi
@@ -22,24 +22,20 @@
  fi
   
  ##
-@@ -1251,8 +1255,8 @@
+@@ -1251,7 +1255,7 @@
      echo "       DEFAULT_PIDLOG: ${runtimedir_relative}${thetarget}.pid"
      echo "   DEFAULT_SCOREBOARD: ${runtimedir_relative}${thetarget}.scoreboard"
      echo "     DEFAULT_LOCKFILE: ${runtimedir_relative}${thetarget}.lock"
--    echo "      DEFAULT_XFERLOG: ${logfiledir_relative}access_log"
 -    echo "     DEFAULT_ERRORLOG: ${logfiledir_relative}error_log"
-+    echo "      DEFAULT_XFERLOG: ${logfiledir_relative}httpd-access.log"
 +    echo "     DEFAULT_ERRORLOG: ${logfiledir_relative}httpd-error.log"
      echo "    TYPES_CONFIG_FILE: ${sysconfdir_relative}mime.types"
      echo "   SERVER_CONFIG_FILE: ${sysconfdir_relative}${thetarget}.conf"
      echo "   ACCESS_CONFIG_FILE: ${sysconfdir_relative}access.conf"
-@@ -1350,8 +1354,8 @@
+@@ -1349,7 +1353,7 @@
  echo "echo '-DDEFAULT_PIDLOG=\"${runtimedir_relative}${thetarget}.pid\"'" >>$src/apaci
  echo "echo '-DDEFAULT_SCOREBOARD=\"${runtimedir_relative}${thetarget}.scoreboard\"'" >>$src/apaci
  echo "echo '-DDEFAULT_LOCKFILE=\"${runtimedir_relative}${thetarget}.lock\"'" >>$src/apaci
--echo "echo '-DDEFAULT_XFERLOG=\"${logfiledir_relative}access_log\"'" >>$src/apaci
 -echo "echo '-DDEFAULT_ERRORLOG=\"${logfiledir_relative}error_log\"'" >>$src/apaci
-+echo "echo '-DDEFAULT_XFERLOG=\"${logfiledir_relative}httpd-access.log\"'" >>$src/apaci
 +echo "echo '-DDEFAULT_ERRORLOG=\"${logfiledir_relative}httpd-error.log\"'" >>$src/apaci
  echo "echo '-DTYPES_CONFIG_FILE=\"${sysconfdir_relative}mime.types\"'" >>$src/apaci
  echo "echo '-DSERVER_CONFIG_FILE=\"${sysconfdir_relative}${thetarget}.conf\"'" >>$src/apaci
diff --git a/www/apache13-fp/files/patch-ab b/www/apache13-fp/files/patch-ab
index a6aeed38f9fa..838a13835bc4 100644
--- a/www/apache13-fp/files/patch-ab
+++ b/www/apache13-fp/files/patch-ab
@@ -1,5 +1,5 @@
 --- Makefile.tmpl.orig	Wed Nov 28 09:02:12 2001
-+++ Makefile.tmpl	Fri Jan 25 14:48:40 2002
++++ Makefile.tmpl	Tue Feb 12 23:07:11 2002
 @@ -127,6 +127,7 @@
  runtimedir      = @runtimedir@
  logfiledir      = @logfiledir@
@@ -139,7 +139,7 @@
  			-e 's;conf/magic;$(sysconfdir)/magic;' \
  			-e 's;conf/mime\.types;$(sysconfdir)/mime.types;' \
  			-e 's;User nobody;User $(conf_user);' \
-@@ -539,23 +558,25 @@
+@@ -539,13 +558,14 @@
  			> $(TOP)/$(SRC)/.apaci.install.tmp && \
  		echo "$(INSTALL_DATA) $(TOP)/conf/$${conf}-dist[*] $(root)$(sysconfdir)/$${target_conf}.default"; \
  		$(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(sysconfdir)/$${target_conf}.default; \
@@ -160,20 +160,3 @@
  	-@for conf in mime.types magic; do \
  		echo "$(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}.default"; \
  		$(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}.default; \
--		if [ ! -f "$(root)$(sysconfdir)/$${conf}" ]; then \
--			echo "$(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}"; \
--			$(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}; \
--		else \
--			echo "[PRESERVING EXISTING CONFIG FILE: $(root)$(sysconfdir)/$${conf}]"; \
--		fi; \
- 	done
-+#		if [ ! -f "$(root)$(sysconfdir)/$${conf}" ]; then \
-+#			echo "$(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}"; \
-+#			$(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}; \
-+#		else \
-+#			echo "[PRESERVING EXISTING CONFIG FILE: $(root)$(sysconfdir)/$${conf}]"; \
-+#		fi; \
-+#	done
- 	@echo "<=== [config]"
- 
- 
diff --git a/www/apache13-fp/pkg-plist b/www/apache13-fp/pkg-plist
index 80222762c0ea..c2323199a6a2 100644
--- a/www/apache13-fp/pkg-plist
+++ b/www/apache13-fp/pkg-plist
@@ -117,7 +117,7 @@ share/doc/apache/index.html.he.iso8859-8
 share/doc/apache/index.html.it
 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.lb.utf8
 share/doc/apache/index.html.nl
 share/doc/apache/index.html.nn
 share/doc/apache/index.html.no
@@ -132,14 +132,16 @@ share/doc/apache/index.html.ru.ucs2
 share/doc/apache/index.html.ru.ucs4
 share/doc/apache/index.html.ru.utf8
 share/doc/apache/index.html.se
-share/doc/apache/index.html.zh.Big5
+share/doc/apache/index.html.zh
 share/doc/apache/manual/LICENSE
 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/bind.html.ja.jis
 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/cgi_path.html.ja.jis
 share/doc/apache/manual/configuring.html.en
 share/doc/apache/manual/configuring.html.fr
 share/doc/apache/manual/configuring.html.html
@@ -245,14 +247,21 @@ share/doc/apache/manual/mod/header.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-bytype.html.html
+share/doc/apache/manual/mod/index-bytype.html.ja.jis
 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_access.html.en
+share/doc/apache/manual/mod/mod_access.html.html
+share/doc/apache/manual/mod/mod_access.html.ja.jis
+share/doc/apache/manual/mod/mod_actions.html.en
+share/doc/apache/manual/mod/mod_actions.html.html
+share/doc/apache/manual/mod/mod_actions.html.ja.jis
 share/doc/apache/manual/mod/mod_alias.html
-share/doc/apache/manual/mod/mod_asis.html
+share/doc/apache/manual/mod/mod_asis.html.en
+share/doc/apache/manual/mod/mod_asis.html.html
+share/doc/apache/manual/mod/mod_asis.html.ja.jis
 share/doc/apache/manual/mod/mod_auth.html
 share/doc/apache/manual/mod/mod_auth_anon.html
 share/doc/apache/manual/mod/mod_auth_db.html
@@ -261,7 +270,9 @@ share/doc/apache/manual/mod/mod_auth_digest.html
 share/doc/apache/manual/mod/mod_autoindex.html
 share/doc/apache/manual/mod/mod_browser.html
 share/doc/apache/manual/mod/mod_cern_meta.html
-share/doc/apache/manual/mod/mod_cgi.html
+share/doc/apache/manual/mod/mod_cgi.html.en
+share/doc/apache/manual/mod/mod_cgi.html.html
+share/doc/apache/manual/mod/mod_cgi.html.ja.jis
 share/doc/apache/manual/mod/mod_cookies.html
 share/doc/apache/manual/mod/mod_digest.html
 share/doc/apache/manual/mod/mod_dir.html.en
@@ -276,7 +287,9 @@ share/doc/apache/manual/mod/mod_expires.html
 share/doc/apache/manual/mod/mod_headers.html
 share/doc/apache/manual/mod/mod_imap.html
 share/doc/apache/manual/mod/mod_include.html
-share/doc/apache/manual/mod/mod_info.html
+share/doc/apache/manual/mod/mod_info.html.en
+share/doc/apache/manual/mod/mod_info.html.html
+share/doc/apache/manual/mod/mod_info.html.ja.jis
 share/doc/apache/manual/mod/mod_isapi.html
 share/doc/apache/manual/mod/mod_log_agent.html
 share/doc/apache/manual/mod/mod_log_common.html
@@ -295,11 +308,19 @@ share/doc/apache/manual/mod/mod_rewrite.html
 share/doc/apache/manual/mod/mod_setenvif.html.en
 share/doc/apache/manual/mod/mod_setenvif.html.html
 share/doc/apache/manual/mod/mod_setenvif.html.ja.jis
-share/doc/apache/manual/mod/mod_so.html
-share/doc/apache/manual/mod/mod_speling.html
+share/doc/apache/manual/mod/mod_so.html.en
+share/doc/apache/manual/mod/mod_so.html.html
+share/doc/apache/manual/mod/mod_so.html.ja.jis
+share/doc/apache/manual/mod/mod_speling.html.en
+share/doc/apache/manual/mod/mod_speling.html.html
+share/doc/apache/manual/mod/mod_speling.html.ja.jis
 share/doc/apache/manual/mod/mod_status.html
-share/doc/apache/manual/mod/mod_unique_id.html
-share/doc/apache/manual/mod/mod_userdir.html
+share/doc/apache/manual/mod/mod_unique_id.html.en
+share/doc/apache/manual/mod/mod_unique_id.html.html
+share/doc/apache/manual/mod/mod_unique_id.html.ja.jis
+share/doc/apache/manual/mod/mod_userdir.html.en
+share/doc/apache/manual/mod/mod_userdir.html.html
+share/doc/apache/manual/mod/mod_userdir.html.ja.jis
 share/doc/apache/manual/mod/mod_usertrack.html
 share/doc/apache/manual/mod/mod_vhost_alias.html
 share/doc/apache/manual/mod/module-dict.html.en
@@ -315,26 +336,38 @@ share/doc/apache/manual/new_features_1_3.html.en
 share/doc/apache/manual/new_features_1_3.html.html
 share/doc/apache/manual/new_features_1_3.html.ja.jis
 share/doc/apache/manual/new_features_2_0.html
-share/doc/apache/manual/process-model.html
+share/doc/apache/manual/process-model.html.en
+share/doc/apache/manual/process-model.html.html
+share/doc/apache/manual/process-model.html.ja.jis
 share/doc/apache/manual/programs/ab.html
-share/doc/apache/manual/programs/apachectl.html
+share/doc/apache/manual/programs/apachectl.html.en
+share/doc/apache/manual/programs/apachectl.html.html
+share/doc/apache/manual/programs/apachectl.html.ja.jis
 share/doc/apache/manual/programs/apxs.html
 share/doc/apache/manual/programs/dbmmanage.html
 share/doc/apache/manual/programs/footer.html
 share/doc/apache/manual/programs/header.html
 share/doc/apache/manual/programs/htdigest.html
-share/doc/apache/manual/programs/htpasswd.html
-share/doc/apache/manual/programs/httpd.html
+share/doc/apache/manual/programs/htpasswd.html.en
+share/doc/apache/manual/programs/htpasswd.html.html
+share/doc/apache/manual/programs/htpasswd.html.ja.jis
+share/doc/apache/manual/programs/httpd.html.en
+share/doc/apache/manual/programs/httpd.html.html
+share/doc/apache/manual/programs/httpd.html.ja.jis
 share/doc/apache/manual/programs/index.html.en
 share/doc/apache/manual/programs/index.html.html
 share/doc/apache/manual/programs/index.html.ja.jis
 share/doc/apache/manual/programs/logresolve.html
 share/doc/apache/manual/programs/other.html
 share/doc/apache/manual/programs/rotatelogs.html
-share/doc/apache/manual/programs/suexec.html
+share/doc/apache/manual/programs/suexec.html.en
+share/doc/apache/manual/programs/suexec.html.html
+share/doc/apache/manual/programs/suexec.html.ja.jis
 share/doc/apache/manual/readme-tpf.html
 share/doc/apache/manual/search/manual-index.cgi
-share/doc/apache/manual/sections.html
+share/doc/apache/manual/sections.html.en
+share/doc/apache/manual/sections.html.html
+share/doc/apache/manual/sections.html.ja.jis
 share/doc/apache/manual/server-wide.html.en
 share/doc/apache/manual/server-wide.html.fr
 share/doc/apache/manual/server-wide.html.html
@@ -354,7 +387,9 @@ share/doc/apache/manual/urlmapping.html
 share/doc/apache/manual/vhosts/details.html
 share/doc/apache/manual/vhosts/details_1_2.html
 share/doc/apache/manual/vhosts/examples.html
-share/doc/apache/manual/vhosts/fd-limits.html
+share/doc/apache/manual/vhosts/fd-limits.html.en
+share/doc/apache/manual/vhosts/fd-limits.html.html
+share/doc/apache/manual/vhosts/fd-limits.html.ja.jis
 share/doc/apache/manual/vhosts/footer.html
 share/doc/apache/manual/vhosts/header.html
 share/doc/apache/manual/vhosts/host.html
@@ -368,11 +403,14 @@ 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_compiling.html.en
+share/doc/apache/manual/win_compiling.html.html
+share/doc/apache/manual/win_compiling.html.ja.jis
 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
+share/doc/apache/manual/windows.html.en
+share/doc/apache/manual/windows.html.ja.jis
 www/cgi-bin.default/printenv
 www/cgi-bin.default/test-cgi
 www/icons/README
@@ -418,6 +456,8 @@ www/icons/continued.gif
 www/icons/continued.png
 www/icons/dir.gif
 www/icons/dir.png
+www/icons/diskimg.gif
+www/icons/diskimg.png
 www/icons/down.gif
 www/icons/down.png
 www/icons/dvi.gif