14 files changed, 186 insertions, 502 deletions

diff --git a/www/apache2/Makefile b/www/apache2/Makefile
index ae8b91613caf..272770570d8b 100644
--- a/www/apache2/Makefile
+++ b/www/apache2/Makefile
@@ -8,8 +8,7 @@
 #
 
 PORTNAME=	apache
-PORTVERSION=	2.0.48
-PORTREVISION=	5
+PORTVERSION=	2.0.49
 CATEGORIES=	www ipv6
 MASTER_SITES=	${MASTER_SITE_APACHE_HTTPD} \
 		http://sheepkiller.nerim.net/ports/${PORTNAME}/:powerlogo
@@ -35,23 +34,23 @@ CONFLICTS=	apache+mod_ssl-1.* apache+mod_ssl+ipv6-1.* apache+mod_ssl+modsnmp-1.*
 # patch files
 PATCH_SITES+=		${MASTER_SITE_LOCAL:S/$/:clement/}
 PATCH_SITE_SUBDIR=	clement/:clement
-PATCHFILES+=		httpd-2.0.48-buildconf.patch:clement
+PATCHFILES+=		httpd-${PORTVERSION}-buildconf.patch:clement
 PATCH_DIST_STRIP+=	-p1:clement
-.if defined (WITH_LDAPFIX)
-PATCHFILES+=		httpd-2.0.48-ldap-fix.patch:clement
-.endif
 .if defined (WITH_WINDOWSUPDATEFIX)
-PATCHFILES+=		httpd-2.0.48-windowsupdate.patch:clement
+PATCHFILES+=		httpd-${PORTVERSION}-windowsupdate.patch:clement
 .endif
 
 SCRIPTS_ENV+=		LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \
-			LIBTOOL_VERSION=${LIBTOOL_VERSION}
+			LIBTOOL_VERSION=${LIBTOOL_VERSION} AUTOCONF=${AUTOCONF} \
+			LIBTOOL_M4=${LOCALBASE}/share/aclocal/libtool${LIBTOOL_VERSION}.m4 \
+			AUTOHEADER=${AUTOHEADER}
+
+USE_AUTOCONF_VER=	253
+USE_LIBTOOL_VER=	13
+USE_PERL5=		yes
+USE_REINPLACE=		yes
+LIBTOOLFILES=		configure
 
-USE_AUTOCONF_VER=253
-USE_LIBTOOL_VER=13
-USE_PERL5=	yes
-USE_REINPLACE=	yes
-LIBTOOLFILES=	configure
 CONFIGURE_ARGS=	--prefix=${PREFIX_RELDEST} \
 		--enable-layout=FreeBSD \
 		--with-perl=${PERL5} \
@@ -135,7 +134,7 @@ show-options:
 	@${SED} -ne 's/^##//p' ${APACHEDIR}/Makefile.doc
 
 show-modules:
-	@for module in $(AVAILABLE_MODULES) ; do \
+	@for module in ${AVAILABLE_MODULES} ; do \
 	${ECHO_MSG} -n "$${module}: ";\
 	if ${ECHO_CMD} ${APACHE_MODULES} | ${GREP} -wq $${module} 2> /dev/null ; then \
 			${ECHO_CMD} -n "enabled "; \
@@ -173,7 +172,7 @@ post-patch:
 	@${RM} -f ${WRKSRC}/docs/manual/index.html.ko.euc-kr
 
 pre-install:
-	PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
+	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
 post-install:
 	@if [ ! -f ${PREFIX}/etc/rc.d/apache2.sh ]; then \
diff --git a/www/apache2/Makefile.modules b/www/apache2/Makefile.modules
index cf8694e3f6a9..851ad1e77648 100644
--- a/www/apache2/Makefile.modules
+++ b/www/apache2/Makefile.modules
@@ -92,6 +92,7 @@ CONFIGURE_ARGS+=	--with-dbm=sdbm
 # How does it works ?
 # << TO BE WRITTEN >>
 # All supported modules
+
 AUTH_MODULES=		access auth auth_anon auth_dbm auth_digest
 DAV_MODULES=		dav dav_fs
 EXPERIMENTAL_MODULES=	bucketeer case_filter case_filter_in ext_filter charset_lite \
@@ -99,14 +100,14 @@ EXPERIMENTAL_MODULES=	bucketeer case_filter case_filter_in ext_filter charset_li
 			optional_fn_import optional_fn_export
 LDAP_MODULES=		ldap auth_ldap
 MISC_MODULES=		actions alias asis autoindex cache cern_meta \
-			cgi cgid charset_lite deflate dir disk_cache env expires \
+			cgi charset_lite deflate dir disk_cache env expires \
 			file_cache headers imap include info log_config logio mime \
 			mime_magic negotiation rewrite setenvif speling status \
 			unique_id userdir usertrack vhost_alias
 PROXY_MODULES=		proxy proxy_connect proxy_ftp proxy_http
 SSL_MODULE=		ssl
 SUEXEC_MODULES=		suexec
-THREADS_MODULES=	cache file_cache disk_cache mem_cache
+THREADS_MODULES=	cgid cache file_cache disk_cache mem_cache
 
 # Work in progress
 SLAVE_PORT_MODULES?=	# If you are porting a slave port for apache2 please define SLAVE_PORT_MODULES
@@ -177,7 +178,7 @@ CONFIGURE_ENV+=		ac_cv_pthreads_lib=${WITH_PTHREAD_LIBS} \
 			ac_cv_pthreads_cflags=${WITH_PTHREAD_CFLAGS}
 .   endif
 .   if !defined(WITH_CUSTOM_THREADS)
-_APACHE_MODULES+=	${THREAD_MODULES}
+_APACHE_MODULES+=	${THREADS_MODULES}
 .   else
 _APACHE_MODULES+=	${WITH_CUSTOM_THREADS}
 .   endif
diff --git a/www/apache2/distinfo b/www/apache2/distinfo
index dbf3b71a341f..08e3ca39e997 100644
--- a/www/apache2/distinfo
+++ b/www/apache2/distinfo
@@ -1,10 +1,8 @@
-MD5 (apache2/httpd-2.0.48.tar.gz) = 466c63bb71b710d20a5c353df8c1a19c
-SIZE (apache2/httpd-2.0.48.tar.gz) = 6258490
+MD5 (apache2/httpd-2.0.49.tar.gz) = 275d3d37eed1b070f333d3618f7d1954
+SIZE (apache2/httpd-2.0.49.tar.gz) = 5919279
 MD5 (apache2/powerlogo.gif) = 0f106073b3c7844cf22d4df126b27c62
 SIZE (apache2/powerlogo.gif) = 5279
-MD5 (apache2/httpd-2.0.48-buildconf.patch) = 6c87bda01550a99402c3ea0bd333c5e0
-SIZE (apache2/httpd-2.0.48-buildconf.patch) = 2407
-MD5 (apache2/httpd-2.0.48-ldap-fix.patch) = cfb30edd10c43e51953aecc0da40b104
-SIZE (apache2/httpd-2.0.48-ldap-fix.patch) = 35209
-MD5 (apache2/httpd-2.0.48-windowsupdate.patch) = a96fe94b28094483a112705d0428e6f5
-SIZE (apache2/httpd-2.0.48-windowsupdate.patch) = 464
+MD5 (apache2/httpd-2.0.49-buildconf.patch) = cb42cea62242388b648ff66be21f220a
+SIZE (apache2/httpd-2.0.49-buildconf.patch) = 2476
+MD5 (apache2/httpd-2.0.49-windowsupdate.patch) = a96fe94b28094483a112705d0428e6f5
+SIZE (apache2/httpd-2.0.49-windowsupdate.patch) = 464
diff --git a/www/apache2/files/patch-modules:ssl:ssl_engine_io.c b/www/apache2/files/patch-modules:ssl:ssl_engine_io.c
deleted file mode 100644
index e359ec540ccb..000000000000
--- a/www/apache2/files/patch-modules:ssl:ssl_engine_io.c
+++ /dev/null
@@ -1,31 +0,0 @@
-===================================================================
-RCS file: /home/cvspublic/httpd-2.0/modules/ssl/ssl_engine_io.c,v
-retrieving revision 1.100.2.11
-retrieving revision 1.100.2.12
-diff -u -r1.100.2.11 -r1.100.2.12
---- modules/ssl/ssl_engine_io.c	2004/02/09 20:53:20	1.100.2.11
-+++ modules/ssl/ssl_engine_io.c	2004/03/07 22:03:16	1.100.2.12
-@@ -821,9 +821,11 @@
-                                sizeof(HTTP_ON_HTTPS_PORT) - 1, \
-                                alloc)
- 
--static void ssl_io_filter_disable(ap_filter_t *f)
-+static void ssl_io_filter_disable(SSLConnRec *sslconn, ap_filter_t *f)
- {
-     bio_filter_in_ctx_t *inctx = f->ctx;
-+    SSL_free(inctx->ssl);
-+    sslconn->ssl = NULL;
-     inctx->ssl = NULL;
-     inctx->filter_ctx->pssl = NULL;
- }
-@@ -845,7 +847,7 @@
-             ssl_log_ssl_error(APLOG_MARK, APLOG_INFO, f->c->base_server);
- 
-             sslconn->non_ssl_request = 1;
--            ssl_io_filter_disable(f);
-+            ssl_io_filter_disable(sslconn, f);
- 
-             /* fake the request line */
-             bucket = HTTP_ON_HTTPS_PORT_BUCKET(f->c->bucket_alloc);
-
-
diff --git a/www/apache2/files/patch-srclib:apr-util:build:dbm.4 b/www/apache2/files/patch-srclib:apr-util:build:dbm.4
deleted file mode 100644
index 72acc608912c..000000000000
--- a/www/apache2/files/patch-srclib:apr-util:build:dbm.4
+++ /dev/null
@@ -1,192 +0,0 @@
---- srclib/apr-util/build/dbm.m4.orig	Sun Aug 31 15:27:23 2003
-+++ srclib/apr-util/build/dbm.m4	Thu Jan  8 17:11:11 2004
-@@ -48,6 +48,7 @@
- 
-   # Save the original values of the flags we tweak.
-   apu_check_lib_save_libs="$LIBS"
-+  apu_check_lib_save_ldflags="$LDFLAGS"
-   apu_check_lib_save_cppflags="$CPPFLAGS"
- 
-   # The variable `found' is the prefix under which we've found
-@@ -69,15 +70,21 @@
-         description="$header and $lib"
-       ;;
-       * )
--        LDFLAGS="$LDFLAGS -L$bdb_place/lib"
--        CPPFLAGS="$CPPFLAGS -I$bdb_place/include"
-+        if test -d $bdb_place; then
-+          LDFLAGS="$LDFLAGS -L$bdb_place/lib"
-+          CPPFLAGS="$CPPFLAGS -I$bdb_place/include"
-+        else
-+          AC_MSG_CHECKING([for Berkeley DB $bdb_version in $bdb_place])
-+          AC_MSG_RESULT([directory not found])
-+          continue
-+        fi
-         description="$bdb_place"
-       ;;
-     esac
- 
-     # Since there is no AC_MSG_NOTICE in autoconf 2.13, we use this
-     # trick to display a message instead.
--    AC_MSG_CHECKING([checking for Berkeley DB $bdb_version in $description])
-+    AC_MSG_CHECKING([for Berkeley DB $bdb_version in $description])
-     AC_MSG_RESULT()
- 
-     for bdb_libname in $bdb_default_search_lib_names; do
-@@ -99,7 +106,7 @@
-                      | sed -e 's/[^a-zA-Z0-9_]/_/g'`"
-             changequote([,])
- 
--            AC_MSG_CHECKING([for $bdb_libname])
-+            AC_MSG_CHECKING([for -l$bdb_libname])
-             dnl We can't use AC_CACHE_CHECK here, because that won't print out
-             dnl the value of the computed cache variable properly.
-             AC_CACHE_VAL($cache_id,
-@@ -291,8 +298,8 @@
-   fi
-   APU_CHECK_BERKELEY_DB(1, -1, -1,
-     "$places",
--    "db_185.h",
--    "db"
-+    "db.h",
-+    "c"
-   )
-   if test "$apu_have_db" = "1"; then
-     apu_db_version=185
-@@ -350,12 +357,12 @@
- AC_DEFUN(APU_CHECK_DB4, [
-   places=$1
-   if test -z "$places"; then
--    places="std /usr/local /usr/local/BerkeleyDB.4.0"
-+    places="std /usr/local /usr/local/BerkeleyDB.4.0 /boot/home/config"
-   fi
-   APU_CHECK_BERKELEY_DB("4", "0", "-1",
-     "$places",
--    "db4/db.h db.h",
--    "db-4.0 db4 db"
-+    "db4/db.h",
-+    "db4"
-   )
-   if test "$apu_have_db" = "1"; then
-     apu_db_version=4
-@@ -371,12 +378,33 @@
- AC_DEFUN(APU_CHECK_DB41, [
-   places=$1
-   if test -z "$places"; then
--    places="std /usr/local/BerkeleyDB.4.1"
-+    places="std /usr/local/BerkeleyDB.4.1 /boot/home/config"
-   fi
-   APU_CHECK_BERKELEY_DB("4", "1", "-1",
-     "$places",
--    "db4/db.h db.h",
--    "db-4.1 db4 db"
-+    "db41/db.h",
-+    "db41"
-+  )
-+  if test "$apu_have_db" = "1"; then
-+    apu_db_version=4
-+  fi
-+])
-+
-+
-+dnl
-+dnl APU_CHECK_DB42: is DB4.2 present?
-+dnl
-+dnl if present: sets apu_db_header, apu_db_lib, and apu_db_version
-+dnl
-+AC_DEFUN(APU_CHECK_DB42, [
-+  places=$1
-+  if test -z "$places"; then
-+    places="${LOCALBASE}/include:${LOCALBASE}/lib/db42 /usr/local/BerkeleyDB.4.2 /boot/home/config"
-+  fi
-+  APU_CHECK_BERKELEY_DB("4", "2", "-1",
-+    "$places",
-+    "db42/db.h",
-+    "db-4.2 db-4.2.2"
-   )
-   if test "$apu_have_db" = "1"; then
-     apu_db_version=4
-@@ -431,6 +459,12 @@
-       AC_MSG_ERROR(Berkeley db4 not found)
-     fi
-     ;;
-+  db42)
-+    APU_CHECK_DB42("$check_places")
-+    if test "$apu_db_version" != "4"; then
-+      AC_MSG_ERROR(Berkeley db4 not found)
-+    fi
-+    ;;
-   default)
-     APU_CHECK_DB_ALL("$check_places")
-     ;;
-@@ -438,22 +472,25 @@
- ])
- 
- dnl
--dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 4.1 to 1.
-+dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 4.2 to 1.
- dnl
- AC_DEFUN(APU_CHECK_DB_ALL, [
-   all_places=$1
--  
--  APU_CHECK_DB41("$all_places")
-+ 
-+  APU_CHECK_DB42("$all_places")
-   if test "$apu_db_version" != "4"; then
--    APU_CHECK_DB4("$all_places")
-+    APU_CHECK_DB41("$all_places")
-     if test "$apu_db_version" != "4"; then
--      APU_CHECK_DB3("$all_places")
--      if test "$apu_db_version" != "3"; then
--        APU_CHECK_DB2("$all_places")
--        if test "$apu_db_version" != "2"; then
--          APU_CHECK_DB1("$all_places")
--          if test "$apu_db_version" != "1"; then
--            APU_CHECK_DB185("$all_places")
-+      APU_CHECK_DB4("$all_places")
-+      if test "$apu_db_version" != "4"; then
-+        APU_CHECK_DB3("$all_places")
-+        if test "$apu_db_version" != "3"; then
-+          APU_CHECK_DB2("$all_places")
-+          if test "$apu_db_version" != "2"; then
-+            APU_CHECK_DB1("$all_places")
-+            if test "$apu_db_version" != "1"; then
-+              APU_CHECK_DB185("$all_places")
-+            fi
-           fi
-         fi
-       fi
-@@ -487,11 +524,11 @@
- 
-   AC_ARG_WITH(dbm, [
-     --with-dbm=DBM          choose the DBM type to use.
--      DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4}
-+      DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db41,db42}
-   ], [
-     if test "$withval" = "yes"; then
-       AC_MSG_ERROR([--with-dbm needs to specify a DBM type to use.
--        One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4])
-+        One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42])
-     fi
-     requested="$withval"
-   ], [
-@@ -665,6 +702,10 @@
-       apu_use_db=1
-       apu_default_dbm=db4
-       ;;
-+    db42)
-+      apu_use_db=1
-+      apu_default_dbm=db4
-+      ;;
-     default)
-       dnl ### use more sophisticated DBMs for the default?
-       apu_default_dbm="sdbm (default)"
-@@ -672,7 +713,7 @@
-       ;;
-     *)
-       AC_MSG_ERROR([--with-dbm=$look_for is an unknown DBM type.
--        Use one of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4])
-+        Use one of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42])
-       ;;
-   esac
- 
diff --git a/www/apache2/files/patch-srclib:apr-utils:build:dbm.m4 b/www/apache2/files/patch-srclib:apr-utils:build:dbm.m4
new file mode 100644
index 000000000000..e13c41e28eeb
--- /dev/null
+++ b/www/apache2/files/patch-srclib:apr-utils:build:dbm.m4
@@ -0,0 +1,55 @@
+--- srclib/apr-util/build/dbm.m4.orig	Sat Mar 20 06:52:01 2004
++++ srclib/apr-util/build/dbm.m4	Sat Mar 20 06:54:51 2004
+@@ -298,8 +298,8 @@
+   fi
+   APU_CHECK_BERKELEY_DB(1, -1, -1,
+     "$places",
+-    "db_185.h",
+-    "db"
++    "db.h",
++    "c"
+   )
+   if test "$apu_have_db" = "1"; then
+     apu_db_version=185
+@@ -341,7 +341,7 @@
+   APU_CHECK_BERKELEY_DB(3, -1, -1,
+     "$places",
+     "db3/db.h db.h",
+-    "db3 db"
++    "db3"
+   )
+   if test "$apu_have_db" = "1"; then
+     apu_db_version=3
+@@ -361,8 +361,8 @@
+   fi
+   APU_CHECK_BERKELEY_DB("4", "0", "-1",
+     "$places",
+-    "db4/db.h db.h",
+-    "db-4.0 db4 db"
++    "db4/db.h",
++    "db4"
+   )
+   if test "$apu_have_db" = "1"; then
+     apu_db_version=4
+@@ -382,8 +382,8 @@
+   fi
+   APU_CHECK_BERKELEY_DB("4", "1", "-1",
+     "$places",
+-    "db41/db.h db4/db.h db.h",
+-    "db-4.1 db4 db"
++    "db41/db.h",
++    "db41"
+   )
+   if test "$apu_have_db" = "1"; then
+     apu_db_version=4
+@@ -403,8 +403,8 @@
+   fi
+   APU_CHECK_BERKELEY_DB("4", "2", "-1",
+     "$places",
+-    "db42/db.h db4/db.h db.h",
+-    "db-4.2 db4 db"
++    "db42/db.h",
++    "db-4.2"
+   )
+   if test "$apu_have_db" = "1"; then
+     apu_db_version=4
diff --git a/www/apache2/pkg-plist b/www/apache2/pkg-plist
index acada35ba310..939f89328206 100644
--- a/www/apache2/pkg-plist
+++ b/www/apache2/pkg-plist
@@ -104,6 +104,7 @@ include/apache2/mod_include.h
 include/apache2/mod_log_config.h
 include/apache2/mod_proxy.h
 include/apache2/mod_ssl.h
+include/apache2/mod_status.h
 include/apache2/mpm.h
 include/apache2/mpm_common.h
 include/apache2/mpm_default.h
@@ -502,9 +503,11 @@ share/apache2/build/special.mk
 %%PORTDOCS%%%%DOCSDIR%%/mod/allmodules.xml.ko
 %%PORTDOCS%%%%DOCSDIR%%/mod/allmodules.xml.ru
 %%PORTDOCS%%%%DOCSDIR%%/mod/beos.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/beos.html.de
 %%PORTDOCS%%%%DOCSDIR%%/mod/beos.html.en
 %%PORTDOCS%%%%DOCSDIR%%/mod/beos.html.ko.euc-kr
 %%PORTDOCS%%%%DOCSDIR%%/mod/beos.xml
+%%PORTDOCS%%%%DOCSDIR%%/mod/beos.xml.de
 %%PORTDOCS%%%%DOCSDIR%%/mod/beos.xml.ko
 %%PORTDOCS%%%%DOCSDIR%%/mod/beos.xml.meta
 %%PORTDOCS%%%%DOCSDIR%%/mod/core.html
@@ -544,9 +547,11 @@ share/apache2/build/special.mk
 %%PORTDOCS%%%%DOCSDIR%%/mod/index.xml.ko
 %%PORTDOCS%%%%DOCSDIR%%/mod/index.xml.meta
 %%PORTDOCS%%%%DOCSDIR%%/mod/leader.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/leader.html.de
 %%PORTDOCS%%%%DOCSDIR%%/mod/leader.html.en
 %%PORTDOCS%%%%DOCSDIR%%/mod/leader.html.ko.euc-kr
 %%PORTDOCS%%%%DOCSDIR%%/mod/leader.xml
+%%PORTDOCS%%%%DOCSDIR%%/mod/leader.xml.de
 %%PORTDOCS%%%%DOCSDIR%%/mod/leader.xml.ko
 %%PORTDOCS%%%%DOCSDIR%%/mod/leader.xml.meta
 %%PORTDOCS%%%%DOCSDIR%%/mod/mod_access.html
@@ -964,6 +969,10 @@ share/apache2/build/special.mk
 %%PORTDOCS%%%%DOCSDIR%%/programs/apxs.html.en
 %%PORTDOCS%%%%DOCSDIR%%/programs/apxs.xml
 %%PORTDOCS%%%%DOCSDIR%%/programs/apxs.xml.meta
+%%PORTDOCS%%%%DOCSDIR%%/programs/configure.html
+%%PORTDOCS%%%%DOCSDIR%%/programs/configure.html.en
+%%PORTDOCS%%%%DOCSDIR%%/programs/configure.xml
+%%PORTDOCS%%%%DOCSDIR%%/programs/configure.xml.meta
 %%PORTDOCS%%%%DOCSDIR%%/programs/dbmmanage.html
 %%PORTDOCS%%%%DOCSDIR%%/programs/dbmmanage.html.en
 %%PORTDOCS%%%%DOCSDIR%%/programs/dbmmanage.xml
@@ -1002,7 +1011,6 @@ share/apache2/build/special.mk
 %%PORTDOCS%%%%DOCSDIR%%/programs/suexec.html.en
 %%PORTDOCS%%%%DOCSDIR%%/programs/suexec.xml
 %%PORTDOCS%%%%DOCSDIR%%/programs/suexec.xml.meta
-%%PORTDOCS%%%%DOCSDIR%%/search/manual-index.cgi
 %%PORTDOCS%%%%DOCSDIR%%/sections.html
 %%PORTDOCS%%%%DOCSDIR%%/sections.html.en
 %%PORTDOCS%%%%DOCSDIR%%/sections.html.ja.jis
@@ -1066,6 +1074,7 @@ share/apache2/build/special.mk
 %%PORTDOCS%%%%DOCSDIR%%/stopping.xml.ko
 %%PORTDOCS%%%%DOCSDIR%%/stopping.xml.meta
 %%PORTDOCS%%%%DOCSDIR%%/stopping.xml.ru
+%%PORTDOCS%%%%DOCSDIR%%/style/build.properties
 %%PORTDOCS%%%%DOCSDIR%%/style/chm/chm.de.xsl
 %%PORTDOCS%%%%DOCSDIR%%/style/chm/chm.en.xsl
 %%PORTDOCS%%%%DOCSDIR%%/style/chm/chm.ja.xsl
@@ -1145,6 +1154,10 @@ share/apache2/build/special.mk
 %%PORTDOCS%%%%DOCSDIR%%/style/xsl/util/ul-end.xml
 %%PORTDOCS%%%%DOCSDIR%%/style/xsl/util/ul-start.xml
 %%PORTDOCS%%%%DOCSDIR%%/style/zip/zip.en.xsl
+%%PORTDOCS%%%%DOCSDIR%%/style/zip/zip.de.xsl
+%%PORTDOCS%%%%DOCSDIR%%/style/zip/zip.ja.xsl
+%%PORTDOCS%%%%DOCSDIR%%/style/zip/zip.ko.xsl
+%%PORTDOCS%%%%DOCSDIR%%/style/zip/zip.ru.xsl
 %%PORTDOCS%%%%DOCSDIR%%/suexec.html
 %%PORTDOCS%%%%DOCSDIR%%/suexec.html.en
 %%PORTDOCS%%%%DOCSDIR%%/suexec.html.ja.jis
@@ -1539,7 +1552,6 @@ share/apache2/build/special.mk
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/style/chm
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/style
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/ssl
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/search
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/programs
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/platform
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/mod
diff --git a/www/apache20/Makefile b/www/apache20/Makefile
index ae8b91613caf..272770570d8b 100644
--- a/www/apache20/Makefile
+++ b/www/apache20/Makefile
@@ -8,8 +8,7 @@
 #
 
 PORTNAME=	apache
-PORTVERSION=	2.0.48
-PORTREVISION=	5
+PORTVERSION=	2.0.49
 CATEGORIES=	www ipv6
 MASTER_SITES=	${MASTER_SITE_APACHE_HTTPD} \
 		http://sheepkiller.nerim.net/ports/${PORTNAME}/:powerlogo
@@ -35,23 +34,23 @@ CONFLICTS=	apache+mod_ssl-1.* apache+mod_ssl+ipv6-1.* apache+mod_ssl+modsnmp-1.*
 # patch files
 PATCH_SITES+=		${MASTER_SITE_LOCAL:S/$/:clement/}
 PATCH_SITE_SUBDIR=	clement/:clement
-PATCHFILES+=		httpd-2.0.48-buildconf.patch:clement
+PATCHFILES+=		httpd-${PORTVERSION}-buildconf.patch:clement
 PATCH_DIST_STRIP+=	-p1:clement
-.if defined (WITH_LDAPFIX)
-PATCHFILES+=		httpd-2.0.48-ldap-fix.patch:clement
-.endif
 .if defined (WITH_WINDOWSUPDATEFIX)
-PATCHFILES+=		httpd-2.0.48-windowsupdate.patch:clement
+PATCHFILES+=		httpd-${PORTVERSION}-windowsupdate.patch:clement
 .endif
 
 SCRIPTS_ENV+=		LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \
-			LIBTOOL_VERSION=${LIBTOOL_VERSION}
+			LIBTOOL_VERSION=${LIBTOOL_VERSION} AUTOCONF=${AUTOCONF} \
+			LIBTOOL_M4=${LOCALBASE}/share/aclocal/libtool${LIBTOOL_VERSION}.m4 \
+			AUTOHEADER=${AUTOHEADER}
+
+USE_AUTOCONF_VER=	253
+USE_LIBTOOL_VER=	13
+USE_PERL5=		yes
+USE_REINPLACE=		yes
+LIBTOOLFILES=		configure
 
-USE_AUTOCONF_VER=253
-USE_LIBTOOL_VER=13
-USE_PERL5=	yes
-USE_REINPLACE=	yes
-LIBTOOLFILES=	configure
 CONFIGURE_ARGS=	--prefix=${PREFIX_RELDEST} \
 		--enable-layout=FreeBSD \
 		--with-perl=${PERL5} \
@@ -135,7 +134,7 @@ show-options:
 	@${SED} -ne 's/^##//p' ${APACHEDIR}/Makefile.doc
 
 show-modules:
-	@for module in $(AVAILABLE_MODULES) ; do \
+	@for module in ${AVAILABLE_MODULES} ; do \
 	${ECHO_MSG} -n "$${module}: ";\
 	if ${ECHO_CMD} ${APACHE_MODULES} | ${GREP} -wq $${module} 2> /dev/null ; then \
 			${ECHO_CMD} -n "enabled "; \
@@ -173,7 +172,7 @@ post-patch:
 	@${RM} -f ${WRKSRC}/docs/manual/index.html.ko.euc-kr
 
 pre-install:
-	PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
+	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
 post-install:
 	@if [ ! -f ${PREFIX}/etc/rc.d/apache2.sh ]; then \
diff --git a/www/apache20/Makefile.modules b/www/apache20/Makefile.modules
index cf8694e3f6a9..851ad1e77648 100644
--- a/www/apache20/Makefile.modules
+++ b/www/apache20/Makefile.modules
@@ -92,6 +92,7 @@ CONFIGURE_ARGS+=	--with-dbm=sdbm
 # How does it works ?
 # << TO BE WRITTEN >>
 # All supported modules
+
 AUTH_MODULES=		access auth auth_anon auth_dbm auth_digest
 DAV_MODULES=		dav dav_fs
 EXPERIMENTAL_MODULES=	bucketeer case_filter case_filter_in ext_filter charset_lite \
@@ -99,14 +100,14 @@ EXPERIMENTAL_MODULES=	bucketeer case_filter case_filter_in ext_filter charset_li
 			optional_fn_import optional_fn_export
 LDAP_MODULES=		ldap auth_ldap
 MISC_MODULES=		actions alias asis autoindex cache cern_meta \
-			cgi cgid charset_lite deflate dir disk_cache env expires \
+			cgi charset_lite deflate dir disk_cache env expires \
 			file_cache headers imap include info log_config logio mime \
 			mime_magic negotiation rewrite setenvif speling status \
 			unique_id userdir usertrack vhost_alias
 PROXY_MODULES=		proxy proxy_connect proxy_ftp proxy_http
 SSL_MODULE=		ssl
 SUEXEC_MODULES=		suexec
-THREADS_MODULES=	cache file_cache disk_cache mem_cache
+THREADS_MODULES=	cgid cache file_cache disk_cache mem_cache
 
 # Work in progress
 SLAVE_PORT_MODULES?=	# If you are porting a slave port for apache2 please define SLAVE_PORT_MODULES
@@ -177,7 +178,7 @@ CONFIGURE_ENV+=		ac_cv_pthreads_lib=${WITH_PTHREAD_LIBS} \
 			ac_cv_pthreads_cflags=${WITH_PTHREAD_CFLAGS}
 .   endif
 .   if !defined(WITH_CUSTOM_THREADS)
-_APACHE_MODULES+=	${THREAD_MODULES}
+_APACHE_MODULES+=	${THREADS_MODULES}
 .   else
 _APACHE_MODULES+=	${WITH_CUSTOM_THREADS}
 .   endif
diff --git a/www/apache20/distinfo b/www/apache20/distinfo
index dbf3b71a341f..08e3ca39e997 100644
--- a/www/apache20/distinfo
+++ b/www/apache20/distinfo
@@ -1,10 +1,8 @@
-MD5 (apache2/httpd-2.0.48.tar.gz) = 466c63bb71b710d20a5c353df8c1a19c
-SIZE (apache2/httpd-2.0.48.tar.gz) = 6258490
+MD5 (apache2/httpd-2.0.49.tar.gz) = 275d3d37eed1b070f333d3618f7d1954
+SIZE (apache2/httpd-2.0.49.tar.gz) = 5919279
 MD5 (apache2/powerlogo.gif) = 0f106073b3c7844cf22d4df126b27c62
 SIZE (apache2/powerlogo.gif) = 5279
-MD5 (apache2/httpd-2.0.48-buildconf.patch) = 6c87bda01550a99402c3ea0bd333c5e0
-SIZE (apache2/httpd-2.0.48-buildconf.patch) = 2407
-MD5 (apache2/httpd-2.0.48-ldap-fix.patch) = cfb30edd10c43e51953aecc0da40b104
-SIZE (apache2/httpd-2.0.48-ldap-fix.patch) = 35209
-MD5 (apache2/httpd-2.0.48-windowsupdate.patch) = a96fe94b28094483a112705d0428e6f5
-SIZE (apache2/httpd-2.0.48-windowsupdate.patch) = 464
+MD5 (apache2/httpd-2.0.49-buildconf.patch) = cb42cea62242388b648ff66be21f220a
+SIZE (apache2/httpd-2.0.49-buildconf.patch) = 2476
+MD5 (apache2/httpd-2.0.49-windowsupdate.patch) = a96fe94b28094483a112705d0428e6f5
+SIZE (apache2/httpd-2.0.49-windowsupdate.patch) = 464
diff --git a/www/apache20/files/patch-modules:ssl:ssl_engine_io.c b/www/apache20/files/patch-modules:ssl:ssl_engine_io.c
deleted file mode 100644
index e359ec540ccb..000000000000
--- a/www/apache20/files/patch-modules:ssl:ssl_engine_io.c
+++ /dev/null
@@ -1,31 +0,0 @@
-===================================================================
-RCS file: /home/cvspublic/httpd-2.0/modules/ssl/ssl_engine_io.c,v
-retrieving revision 1.100.2.11
-retrieving revision 1.100.2.12
-diff -u -r1.100.2.11 -r1.100.2.12
---- modules/ssl/ssl_engine_io.c	2004/02/09 20:53:20	1.100.2.11
-+++ modules/ssl/ssl_engine_io.c	2004/03/07 22:03:16	1.100.2.12
-@@ -821,9 +821,11 @@
-                                sizeof(HTTP_ON_HTTPS_PORT) - 1, \
-                                alloc)
- 
--static void ssl_io_filter_disable(ap_filter_t *f)
-+static void ssl_io_filter_disable(SSLConnRec *sslconn, ap_filter_t *f)
- {
-     bio_filter_in_ctx_t *inctx = f->ctx;
-+    SSL_free(inctx->ssl);
-+    sslconn->ssl = NULL;
-     inctx->ssl = NULL;
-     inctx->filter_ctx->pssl = NULL;
- }
-@@ -845,7 +847,7 @@
-             ssl_log_ssl_error(APLOG_MARK, APLOG_INFO, f->c->base_server);
- 
-             sslconn->non_ssl_request = 1;
--            ssl_io_filter_disable(f);
-+            ssl_io_filter_disable(sslconn, f);
- 
-             /* fake the request line */
-             bucket = HTTP_ON_HTTPS_PORT_BUCKET(f->c->bucket_alloc);
-
-
diff --git a/www/apache20/files/patch-srclib:apr-util:build:dbm.4 b/www/apache20/files/patch-srclib:apr-util:build:dbm.4
deleted file mode 100644
index 72acc608912c..000000000000
--- a/www/apache20/files/patch-srclib:apr-util:build:dbm.4
+++ /dev/null
@@ -1,192 +0,0 @@
---- srclib/apr-util/build/dbm.m4.orig	Sun Aug 31 15:27:23 2003
-+++ srclib/apr-util/build/dbm.m4	Thu Jan  8 17:11:11 2004
-@@ -48,6 +48,7 @@
- 
-   # Save the original values of the flags we tweak.
-   apu_check_lib_save_libs="$LIBS"
-+  apu_check_lib_save_ldflags="$LDFLAGS"
-   apu_check_lib_save_cppflags="$CPPFLAGS"
- 
-   # The variable `found' is the prefix under which we've found
-@@ -69,15 +70,21 @@
-         description="$header and $lib"
-       ;;
-       * )
--        LDFLAGS="$LDFLAGS -L$bdb_place/lib"
--        CPPFLAGS="$CPPFLAGS -I$bdb_place/include"
-+        if test -d $bdb_place; then
-+          LDFLAGS="$LDFLAGS -L$bdb_place/lib"
-+          CPPFLAGS="$CPPFLAGS -I$bdb_place/include"
-+        else
-+          AC_MSG_CHECKING([for Berkeley DB $bdb_version in $bdb_place])
-+          AC_MSG_RESULT([directory not found])
-+          continue
-+        fi
-         description="$bdb_place"
-       ;;
-     esac
- 
-     # Since there is no AC_MSG_NOTICE in autoconf 2.13, we use this
-     # trick to display a message instead.
--    AC_MSG_CHECKING([checking for Berkeley DB $bdb_version in $description])
-+    AC_MSG_CHECKING([for Berkeley DB $bdb_version in $description])
-     AC_MSG_RESULT()
- 
-     for bdb_libname in $bdb_default_search_lib_names; do
-@@ -99,7 +106,7 @@
-                      | sed -e 's/[^a-zA-Z0-9_]/_/g'`"
-             changequote([,])
- 
--            AC_MSG_CHECKING([for $bdb_libname])
-+            AC_MSG_CHECKING([for -l$bdb_libname])
-             dnl We can't use AC_CACHE_CHECK here, because that won't print out
-             dnl the value of the computed cache variable properly.
-             AC_CACHE_VAL($cache_id,
-@@ -291,8 +298,8 @@
-   fi
-   APU_CHECK_BERKELEY_DB(1, -1, -1,
-     "$places",
--    "db_185.h",
--    "db"
-+    "db.h",
-+    "c"
-   )
-   if test "$apu_have_db" = "1"; then
-     apu_db_version=185
-@@ -350,12 +357,12 @@
- AC_DEFUN(APU_CHECK_DB4, [
-   places=$1
-   if test -z "$places"; then
--    places="std /usr/local /usr/local/BerkeleyDB.4.0"
-+    places="std /usr/local /usr/local/BerkeleyDB.4.0 /boot/home/config"
-   fi
-   APU_CHECK_BERKELEY_DB("4", "0", "-1",
-     "$places",
--    "db4/db.h db.h",
--    "db-4.0 db4 db"
-+    "db4/db.h",
-+    "db4"
-   )
-   if test "$apu_have_db" = "1"; then
-     apu_db_version=4
-@@ -371,12 +378,33 @@
- AC_DEFUN(APU_CHECK_DB41, [
-   places=$1
-   if test -z "$places"; then
--    places="std /usr/local/BerkeleyDB.4.1"
-+    places="std /usr/local/BerkeleyDB.4.1 /boot/home/config"
-   fi
-   APU_CHECK_BERKELEY_DB("4", "1", "-1",
-     "$places",
--    "db4/db.h db.h",
--    "db-4.1 db4 db"
-+    "db41/db.h",
-+    "db41"
-+  )
-+  if test "$apu_have_db" = "1"; then
-+    apu_db_version=4
-+  fi
-+])
-+
-+
-+dnl
-+dnl APU_CHECK_DB42: is DB4.2 present?
-+dnl
-+dnl if present: sets apu_db_header, apu_db_lib, and apu_db_version
-+dnl
-+AC_DEFUN(APU_CHECK_DB42, [
-+  places=$1
-+  if test -z "$places"; then
-+    places="${LOCALBASE}/include:${LOCALBASE}/lib/db42 /usr/local/BerkeleyDB.4.2 /boot/home/config"
-+  fi
-+  APU_CHECK_BERKELEY_DB("4", "2", "-1",
-+    "$places",
-+    "db42/db.h",
-+    "db-4.2 db-4.2.2"
-   )
-   if test "$apu_have_db" = "1"; then
-     apu_db_version=4
-@@ -431,6 +459,12 @@
-       AC_MSG_ERROR(Berkeley db4 not found)
-     fi
-     ;;
-+  db42)
-+    APU_CHECK_DB42("$check_places")
-+    if test "$apu_db_version" != "4"; then
-+      AC_MSG_ERROR(Berkeley db4 not found)
-+    fi
-+    ;;
-   default)
-     APU_CHECK_DB_ALL("$check_places")
-     ;;
-@@ -438,22 +472,25 @@
- ])
- 
- dnl
--dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 4.1 to 1.
-+dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 4.2 to 1.
- dnl
- AC_DEFUN(APU_CHECK_DB_ALL, [
-   all_places=$1
--  
--  APU_CHECK_DB41("$all_places")
-+ 
-+  APU_CHECK_DB42("$all_places")
-   if test "$apu_db_version" != "4"; then
--    APU_CHECK_DB4("$all_places")
-+    APU_CHECK_DB41("$all_places")
-     if test "$apu_db_version" != "4"; then
--      APU_CHECK_DB3("$all_places")
--      if test "$apu_db_version" != "3"; then
--        APU_CHECK_DB2("$all_places")
--        if test "$apu_db_version" != "2"; then
--          APU_CHECK_DB1("$all_places")
--          if test "$apu_db_version" != "1"; then
--            APU_CHECK_DB185("$all_places")
-+      APU_CHECK_DB4("$all_places")
-+      if test "$apu_db_version" != "4"; then
-+        APU_CHECK_DB3("$all_places")
-+        if test "$apu_db_version" != "3"; then
-+          APU_CHECK_DB2("$all_places")
-+          if test "$apu_db_version" != "2"; then
-+            APU_CHECK_DB1("$all_places")
-+            if test "$apu_db_version" != "1"; then
-+              APU_CHECK_DB185("$all_places")
-+            fi
-           fi
-         fi
-       fi
-@@ -487,11 +524,11 @@
- 
-   AC_ARG_WITH(dbm, [
-     --with-dbm=DBM          choose the DBM type to use.
--      DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4}
-+      DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db41,db42}
-   ], [
-     if test "$withval" = "yes"; then
-       AC_MSG_ERROR([--with-dbm needs to specify a DBM type to use.
--        One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4])
-+        One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42])
-     fi
-     requested="$withval"
-   ], [
-@@ -665,6 +702,10 @@
-       apu_use_db=1
-       apu_default_dbm=db4
-       ;;
-+    db42)
-+      apu_use_db=1
-+      apu_default_dbm=db4
-+      ;;
-     default)
-       dnl ### use more sophisticated DBMs for the default?
-       apu_default_dbm="sdbm (default)"
-@@ -672,7 +713,7 @@
-       ;;
-     *)
-       AC_MSG_ERROR([--with-dbm=$look_for is an unknown DBM type.
--        Use one of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4])
-+        Use one of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42])
-       ;;
-   esac
- 
diff --git a/www/apache20/files/patch-srclib:apr-utils:build:dbm.m4 b/www/apache20/files/patch-srclib:apr-utils:build:dbm.m4
new file mode 100644
index 000000000000..e13c41e28eeb
--- /dev/null
+++ b/www/apache20/files/patch-srclib:apr-utils:build:dbm.m4
@@ -0,0 +1,55 @@
+--- srclib/apr-util/build/dbm.m4.orig	Sat Mar 20 06:52:01 2004
++++ srclib/apr-util/build/dbm.m4	Sat Mar 20 06:54:51 2004
+@@ -298,8 +298,8 @@
+   fi
+   APU_CHECK_BERKELEY_DB(1, -1, -1,
+     "$places",
+-    "db_185.h",
+-    "db"
++    "db.h",
++    "c"
+   )
+   if test "$apu_have_db" = "1"; then
+     apu_db_version=185
+@@ -341,7 +341,7 @@
+   APU_CHECK_BERKELEY_DB(3, -1, -1,
+     "$places",
+     "db3/db.h db.h",
+-    "db3 db"
++    "db3"
+   )
+   if test "$apu_have_db" = "1"; then
+     apu_db_version=3
+@@ -361,8 +361,8 @@
+   fi
+   APU_CHECK_BERKELEY_DB("4", "0", "-1",
+     "$places",
+-    "db4/db.h db.h",
+-    "db-4.0 db4 db"
++    "db4/db.h",
++    "db4"
+   )
+   if test "$apu_have_db" = "1"; then
+     apu_db_version=4
+@@ -382,8 +382,8 @@
+   fi
+   APU_CHECK_BERKELEY_DB("4", "1", "-1",
+     "$places",
+-    "db41/db.h db4/db.h db.h",
+-    "db-4.1 db4 db"
++    "db41/db.h",
++    "db41"
+   )
+   if test "$apu_have_db" = "1"; then
+     apu_db_version=4
+@@ -403,8 +403,8 @@
+   fi
+   APU_CHECK_BERKELEY_DB("4", "2", "-1",
+     "$places",
+-    "db42/db.h db4/db.h db.h",
+-    "db-4.2 db4 db"
++    "db42/db.h",
++    "db-4.2"
+   )
+   if test "$apu_have_db" = "1"; then
+     apu_db_version=4
diff --git a/www/apache20/pkg-plist b/www/apache20/pkg-plist
index acada35ba310..939f89328206 100644
--- a/www/apache20/pkg-plist
+++ b/www/apache20/pkg-plist
@@ -104,6 +104,7 @@ include/apache2/mod_include.h
 include/apache2/mod_log_config.h
 include/apache2/mod_proxy.h
 include/apache2/mod_ssl.h
+include/apache2/mod_status.h
 include/apache2/mpm.h
 include/apache2/mpm_common.h
 include/apache2/mpm_default.h
@@ -502,9 +503,11 @@ share/apache2/build/special.mk
 %%PORTDOCS%%%%DOCSDIR%%/mod/allmodules.xml.ko
 %%PORTDOCS%%%%DOCSDIR%%/mod/allmodules.xml.ru
 %%PORTDOCS%%%%DOCSDIR%%/mod/beos.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/beos.html.de
 %%PORTDOCS%%%%DOCSDIR%%/mod/beos.html.en
 %%PORTDOCS%%%%DOCSDIR%%/mod/beos.html.ko.euc-kr
 %%PORTDOCS%%%%DOCSDIR%%/mod/beos.xml
+%%PORTDOCS%%%%DOCSDIR%%/mod/beos.xml.de
 %%PORTDOCS%%%%DOCSDIR%%/mod/beos.xml.ko
 %%PORTDOCS%%%%DOCSDIR%%/mod/beos.xml.meta
 %%PORTDOCS%%%%DOCSDIR%%/mod/core.html
@@ -544,9 +547,11 @@ share/apache2/build/special.mk
 %%PORTDOCS%%%%DOCSDIR%%/mod/index.xml.ko
 %%PORTDOCS%%%%DOCSDIR%%/mod/index.xml.meta
 %%PORTDOCS%%%%DOCSDIR%%/mod/leader.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/leader.html.de
 %%PORTDOCS%%%%DOCSDIR%%/mod/leader.html.en
 %%PORTDOCS%%%%DOCSDIR%%/mod/leader.html.ko.euc-kr
 %%PORTDOCS%%%%DOCSDIR%%/mod/leader.xml
+%%PORTDOCS%%%%DOCSDIR%%/mod/leader.xml.de
 %%PORTDOCS%%%%DOCSDIR%%/mod/leader.xml.ko
 %%PORTDOCS%%%%DOCSDIR%%/mod/leader.xml.meta
 %%PORTDOCS%%%%DOCSDIR%%/mod/mod_access.html
@@ -964,6 +969,10 @@ share/apache2/build/special.mk
 %%PORTDOCS%%%%DOCSDIR%%/programs/apxs.html.en
 %%PORTDOCS%%%%DOCSDIR%%/programs/apxs.xml
 %%PORTDOCS%%%%DOCSDIR%%/programs/apxs.xml.meta
+%%PORTDOCS%%%%DOCSDIR%%/programs/configure.html
+%%PORTDOCS%%%%DOCSDIR%%/programs/configure.html.en
+%%PORTDOCS%%%%DOCSDIR%%/programs/configure.xml
+%%PORTDOCS%%%%DOCSDIR%%/programs/configure.xml.meta
 %%PORTDOCS%%%%DOCSDIR%%/programs/dbmmanage.html
 %%PORTDOCS%%%%DOCSDIR%%/programs/dbmmanage.html.en
 %%PORTDOCS%%%%DOCSDIR%%/programs/dbmmanage.xml
@@ -1002,7 +1011,6 @@ share/apache2/build/special.mk
 %%PORTDOCS%%%%DOCSDIR%%/programs/suexec.html.en
 %%PORTDOCS%%%%DOCSDIR%%/programs/suexec.xml
 %%PORTDOCS%%%%DOCSDIR%%/programs/suexec.xml.meta
-%%PORTDOCS%%%%DOCSDIR%%/search/manual-index.cgi
 %%PORTDOCS%%%%DOCSDIR%%/sections.html
 %%PORTDOCS%%%%DOCSDIR%%/sections.html.en
 %%PORTDOCS%%%%DOCSDIR%%/sections.html.ja.jis
@@ -1066,6 +1074,7 @@ share/apache2/build/special.mk
 %%PORTDOCS%%%%DOCSDIR%%/stopping.xml.ko
 %%PORTDOCS%%%%DOCSDIR%%/stopping.xml.meta
 %%PORTDOCS%%%%DOCSDIR%%/stopping.xml.ru
+%%PORTDOCS%%%%DOCSDIR%%/style/build.properties
 %%PORTDOCS%%%%DOCSDIR%%/style/chm/chm.de.xsl
 %%PORTDOCS%%%%DOCSDIR%%/style/chm/chm.en.xsl
 %%PORTDOCS%%%%DOCSDIR%%/style/chm/chm.ja.xsl
@@ -1145,6 +1154,10 @@ share/apache2/build/special.mk
 %%PORTDOCS%%%%DOCSDIR%%/style/xsl/util/ul-end.xml
 %%PORTDOCS%%%%DOCSDIR%%/style/xsl/util/ul-start.xml
 %%PORTDOCS%%%%DOCSDIR%%/style/zip/zip.en.xsl
+%%PORTDOCS%%%%DOCSDIR%%/style/zip/zip.de.xsl
+%%PORTDOCS%%%%DOCSDIR%%/style/zip/zip.ja.xsl
+%%PORTDOCS%%%%DOCSDIR%%/style/zip/zip.ko.xsl
+%%PORTDOCS%%%%DOCSDIR%%/style/zip/zip.ru.xsl
 %%PORTDOCS%%%%DOCSDIR%%/suexec.html
 %%PORTDOCS%%%%DOCSDIR%%/suexec.html.en
 %%PORTDOCS%%%%DOCSDIR%%/suexec.html.ja.jis
@@ -1539,7 +1552,6 @@ share/apache2/build/special.mk
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/style/chm
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/style
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/ssl
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/search
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/programs
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/platform
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/mod