13 files changed, 192 insertions, 235 deletions

diff --git a/www/apache22/Makefile b/www/apache22/Makefile
index 017bdd0d7f84..6fed2a67364f 100644
--- a/www/apache22/Makefile
+++ b/www/apache22/Makefile
@@ -8,11 +8,13 @@
 #
 
 PORTNAME=	apache
-PORTVERSION=	2.1.4
+PORTVERSION=	2.1.8
 CATEGORIES=	www
-MASTER_SITES=	${MASTER_SITE_LOCAL:S/%SUBDIR%/clement/}
-DISTNAME=	httpd-${PORTVERSION}-alpha
-DISTFILES=	${DISTNAME}.tar.bz2 powerlogo.gif
+MASTER_SITES=	${MASTER_SITE_APACHE_HTTPD} \
+		${MASTER_SITE_LOCAL:S/%SUBDIR%/clement/}:powerlogo
+DISTNAME=	httpd-${PORTVERSION}-beta
+DISTFILES=	${DISTNAME}.tar.bz2 \
+		powerlogo.gif:powerlogo
 DIST_SUBDIR=	apache21
 EXTRACT_ONLY=	${DISTNAME}.tar.bz2
 
@@ -86,7 +88,7 @@ CONFIGURE_ARGS+=	--enable-v4-mapped
 .endif
 
 #backward compatibility
-.if defined(WITHOUT_SSL) 
+.if defined(WITHOUT_SSL)
 WITHOUT_SSL_MODULES=	YES
 .endif
 
@@ -208,10 +210,11 @@ pre-configure:
 
 post-configure:
 	@FTPUSERS=`${EGREP} -v '^#' /etc/ftpusers| ${TR} -s "\n" " "` ;\
-	${REINPLACE_CMD} -e "s,%%FTPUSERS%%,$$FTPUSERS, ; \
-			s,%%WWWOWN%%,${WWWOWN}, ; \
+	${REINPLACE_CMD} -e "s,%%FTPUSERS%%,$$FTPUSERS," \
+			${WRKSRC}/docs/conf/extra/httpd-userdir.conf
+	${REINPLACE_CMD} -e "s,%%WWWOWN%%,${WWWOWN}, ; \
 			s,%%WWWGRP%%,${WWWGRP}, " \
-			${WRKSRC}/docs/conf/httpd-std.conf
+			${WRKSRC}/docs/conf/httpd.conf
 
 pre-install:
 	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
diff --git a/www/apache22/Makefile.doc b/www/apache22/Makefile.doc
index 3a1ff57a7477..d5f6cafdd033 100644
--- a/www/apache22/Makefile.doc
+++ b/www/apache22/Makefile.doc
@@ -99,7 +99,7 @@ MAKE_ENV+=	EXAMPLESDIR=${EXAMPLESDIR}
 MAKE_ENV+=	NOPORTDOCS=yes
 .endif
 
-MAN1=		dbmmanage.1 htdigest.1 htpasswd.1
+MAN1=		dbmmanage.1 htdigest.1 htpasswd.1 htdbm.1
 MAN8=		ab.8 apachectl.8 apxs.8 httpd.8 logresolve.8 rotatelogs.8 suexec.8 htcacheclean.8
 
 .if defined(WITHOUT_WWW)
diff --git a/www/apache22/Makefile.modules b/www/apache22/Makefile.modules
index de24daec224d..b049df94d0fb 100644
--- a/www/apache22/Makefile.modules
+++ b/www/apache22/Makefile.modules
@@ -124,7 +124,7 @@ EXPERIMENTAL_MODULES=	bucketeer case_filter case_filter_in ext_filter charset_li
 LDAP_MODULES=		ldap authnz_ldap
 MISC_MODULES=		actions alias asis autoindex cache cern_meta \
 			cgi charset_lite deflate dir disk_cache env expires \
-			file_cache headers imap include info log_config logio mime \
+			file_cache headers imagemap 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 proxy_ajp proxy_balancer
diff --git a/www/apache22/distinfo b/www/apache22/distinfo
index 74c09a96909a..09b674cdace1 100644
--- a/www/apache22/distinfo
+++ b/www/apache22/distinfo
@@ -1,4 +1,4 @@
-MD5 (apache21/httpd-2.1.4-alpha.tar.bz2) = 009cc52797749da0a58201c7fa2060d2
-SIZE (apache21/httpd-2.1.4-alpha.tar.bz2) = 5602782
+MD5 (apache21/httpd-2.1.8-beta.tar.bz2) = 0844a1fffcd6f60ba9d42a502cfa941e
+SIZE (apache21/httpd-2.1.8-beta.tar.bz2) = 4856548
 MD5 (apache21/powerlogo.gif) = 0f106073b3c7844cf22d4df126b27c62
 SIZE (apache21/powerlogo.gif) = 5279
diff --git a/www/apache22/files/patch-Makefile.in b/www/apache22/files/patch-Makefile.in
index 382e3f0cbc5f..9ca0cfb52183 100644
--- a/www/apache22/files/patch-Makefile.in
+++ b/www/apache22/files/patch-Makefile.in
@@ -1,69 +1,37 @@
---- Makefile.in.orig	Thu Dec  2 08:34:20 2004
-+++ Makefile.in	Sat Dec 18 11:51:59 2004
-@@ -31,15 +31,22 @@
- 	if [ ! -d $(DESTDIR)$(sysconfdir) ]; then \
- 	    $(MKINSTALLDIRS) $(DESTDIR)$(sysconfdir) ; \
- 	fi ; \
-+	if [ ! -d $(DESTDIR)$(EXAMPLESDIR) ]; then \
-+		$(MKINSTALLDIRS) $(DESTDIR)$(EXAMPLESDIR) ; \
-+	fi ; \
- 	cd $(top_srcdir)/docs/conf; \
+--- Makefile.in.orig	Sun Sep 25 23:07:27 2005
++++ Makefile.in	Sun Oct 30 19:31:59 2005
+@@ -31,9 +31,11 @@
+ install-conf:
+ 	@echo Installing configuration files
+ 	@$(MKINSTALLDIRS) $(DESTDIR)$(sysconfdir) $(DESTDIR)$(sysconfdir)/extra
+-	@$(MKINSTALLDIRS) $(DESTDIR)$(sysconfdir)/original/extra
++	@$(MKINSTALLDIRS) $(DESTDIR)$(EXAMPLESDIR) $(DESTDIR)$(EXAMPLESDIR)/extra
++
+ 	@cd $(top_srcdir)/docs/conf; \
  	for i in mime.types magic; do \
++	    $(INSTALL_DATA) $$i $(DESTDIR)$(EXAMPLESDIR); \
  	    if test ! -f $(DESTDIR)$(sysconfdir)/$$i; then \
  	        $(INSTALL_DATA) $$i $(DESTDIR)$(sysconfdir); \
  	    fi; \
-+	    cp -f $$i $$i-dist; \
-+	    $(INSTALL_DATA) $$i-dist $(DESTDIR)$(EXAMPLESDIR); \
- 	done; \
- 	for j in $(top_srcdir)/docs/conf $(top_builddir)/docs/conf ; do \
- 	    cd $$j ; \
-+            [ -f `echo "$$i"|sed 's,\.in$$,_nonex,g'` ] || continue; \
- 	    for i in *-std*.conf; do \
-+		[ -f `echo "$$i"|sed 's,\.in$$,_nonex,g'` ] || continue; \
- 	    	( \
- 	    		n_lm=`awk 'BEGIN {n=0} /@@LoadModule@@/ {n+=1} END {print n}' < $$i`; \
- 	    		if test $$n_lm -eq 0 -o "x$(DSO_MODULES)" = "x"; then \
-@@ -57,6 +64,9 @@
- 	    				if test "x$$j" = "xssl"; then \
- 	    					echo "<IfDefine SSL>"; \
- 	    				fi; \
-+					if [ `echo "$$j" | egrep 'cgid|cache|dav|digest|proxy'` ]; then \
-+					        echo -n "#"; \
-+					fi; \
- 	    				if test $$j != "^EOL^"; then \
- 	    					echo "LoadModule $${j}_module $(rel_libexecdir)/mod_$${j}.so"; \
- 	    				fi; \
-@@ -70,23 +80,18 @@
+@@ -66,14 +68,14 @@
  	    				-e 's#@@Port@@#$(PORT)#g' \
  	    				< $$i; \
  	    		fi \
--	    	) > $(DESTDIR)$(sysconfdir)/$$i; \
--	    	chmod 0644 $(DESTDIR)$(sysconfdir)/$$i; \
--	    	file=`echo $$i|sed s/-std//`; \
+-	    	) > $(DESTDIR)$(sysconfdir)/original/$$i; \
+-	    	chmod 0644 $(DESTDIR)$(sysconfdir)/original/$$i; \
 +	    	) > $(DESTDIR)$(EXAMPLESDIR)/$$i; \
 +	    	chmod 0644 $(DESTDIR)$(EXAMPLESDIR)/$$i; \
-+	    	chmod 0644 $(DESTDIR)$(EXAMPLESDIR)/$$i; \
-+		file=`echo $$i|sed s/-std//`; \
- 	    	if [ "$$file" = "httpd.conf" ]; then \
- 	    		file=`echo $$file|sed s/.*.conf/$(PROGRAM_NAME).conf/`; \
+ 	    	file=$$i; \
+ 	    	if [ "$$i" = "httpd.conf" ]; then \
+ 	    		file=`echo $$i|sed s/.*.conf/$(PROGRAM_NAME).conf/`; \
  	    	fi; \
- 	    	if test "$$file" != "$$i" && test ! -f $(DESTDIR)$(sysconfdir)/$$file; then \
--	    		$(INSTALL_DATA) $(DESTDIR)$(sysconfdir)/$$i $(DESTDIR)$(sysconfdir)/$$file; \
+ 	    	if test ! -f $(DESTDIR)$(sysconfdir)/$$file; then \
+-	    		$(INSTALL_DATA) $(DESTDIR)$(sysconfdir)/original/$$i $(DESTDIR)$(sysconfdir)/$$file; \
 +	    		$(INSTALL_DATA) $(DESTDIR)$(EXAMPLESDIR)/$$i $(DESTDIR)$(sysconfdir)/$$file; \
  	    	fi; \
+ 	    	fi; \
  	    done ; \
--	done ; \
--	if test -f "$(builddir)/envvars-std"; then \
--	    cp -p envvars-std $(DESTDIR)$(sbindir); \
--	    if test ! -f $(DESTDIR)$(sbindir)/envvars; then \
--	        cp -p envvars-std $(DESTDIR)$(sbindir)/envvars ; \
--	    fi ; \
--	fi
-+	done ;
- 
- install-build:
- 	@echo Installing build system files 
-@@ -108,44 +113,40 @@
+@@ -117,44 +119,40 @@
  	doxygen $(top_srcdir)/docs/doxygen.conf
  
  install-htdocs:
@@ -136,7 +104,7 @@
  
  install-other:
  	@test -d $(DESTDIR)$(logfiledir) || $(MKINSTALLDIRS) $(DESTDIR)$(logfiledir)
-@@ -189,11 +190,13 @@
+@@ -198,11 +196,13 @@
  	@test -d $(DESTDIR)$(mandir)      || $(MKINSTALLDIRS) $(DESTDIR)$(mandir)
  	@test -d $(DESTDIR)$(mandir)/man1 || $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man1
  	@test -d $(DESTDIR)$(mandir)/man8 || $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man8
diff --git a/www/apache22/files/patch-docs:conf:httpd-std.conf.in b/www/apache22/files/patch-docs:conf:httpd-std.conf.in
deleted file mode 100644
index 1147ce18c192..000000000000
--- a/www/apache22/files/patch-docs:conf:httpd-std.conf.in
+++ /dev/null
@@ -1,94 +0,0 @@
---- docs/conf/httpd-std.conf.in.orig	Tue Feb  8 23:31:56 2005
-+++ docs/conf/httpd-std.conf.in	Wed Feb 23 11:06:23 2005
-@@ -68,7 +68,7 @@
- #
- #<IfModule !mpm_netware_module>
- #<IfModule !mpm_perchild_module>
--#ScoreBoardFile @rel_logfiledir@/apache_runtime_status
-+#ScoreBoardFile @rel_runtimedir@/apache_runtime_status
- #</IfModule>
- #</IfModule>
- 
-@@ -264,8 +264,8 @@
- #  when the value of (unsigned)Group is above 60000; 
- #  don't use Group #-1 on these systems!
- #
--User nobody
--Group #-1
-+User %%WWWOWN%%
-+Group %%WWWGRP%%
- </IfModule>
- </IfModule>
- 
-@@ -315,7 +315,6 @@
- # features.  
- #
- <Directory />
--    Options FollowSymLinks
-     AllowOverride None
-     Order deny,allow
-     Deny from all
-@@ -369,6 +368,23 @@
- #
- <IfModule userdir_module>
-     UserDir public_html
-+    UserDir disabled %%FTPUSERS%%
-+#
-+# Control access to UserDir directories.  The following is an example
-+# for a site where these directories are restricted to read-only.
-+#
-+   <Directory /home/*/public_html>
-+     AllowOverride FileInfo AuthConfig Limit Indexes
-+     Options MultiViews Indexes SymLinksIfOwnerMatch IncludesNoExec
-+     <Limit GET POST OPTIONS PROPFIND>
-+        Order allow,deny
-+        Allow from all
-+     </Limit>
-+     <LimitExcept GET POST OPTIONS PROPFIND>
-+        Order deny,allow
-+        Deny from all
-+     </LimitExcept>
-+   </Directory>
- </IfModule>
- 
- #
-@@ -481,7 +497,7 @@
- # logged here.  If you *do* define an error logfile for a <VirtualHost>
- # container, that host's errors will be logged there and not here.
- #
--ErrorLog @rel_logfiledir@/error_log
-+ErrorLog @rel_logfiledir@/httpd-error.log
- 
- #
- # LogLevel: Control the number of messages logged to the error_log.
-@@ -510,20 +526,20 @@
-     # define per-<VirtualHost> access logfiles, transactions will be
-     # logged therein and *not* in this file.
-     #
--    CustomLog @rel_logfiledir@/access_log common
-+    #CustomLog @rel_logfiledir@/httpd-access.log common
- 
-     #
-     # If you would like to have agent and referer logfiles, uncomment the
-     # following directives.
-     #
--    #CustomLog @rel_logfiledir@/referer_log referer
--    #CustomLog @rel_logfiledir@/agent_log agent
-+    #CustomLog @rel_logfiledir@/httpd-referer.log referer
-+    #CustomLog @rel_logfiledir@/httpd-agent.log agent
- 
-     #
-     # If you prefer a single logfile with access, agent, and referer information
-     # (Combined Logfile Format) you can use the following directive.
-     #
--    #CustomLog @rel_logfiledir@/access_log combined
-+    CustomLog @rel_logfiledir@/httpd-access.log combined
- </IfModule>
- 
- #
-@@ -1071,3 +1087,5 @@
- #    ErrorLog @rel_logfiledir@/dummy-host.example.com-error_log
- #    CustomLog @rel_logfiledir@/dummy-host.example.com-access_log common
- #</VirtualHost>
-+
-+Include @rel_sysconfdir@/Includes/*.conf
diff --git a/www/apache22/files/patch-docs:conf:ssl-std.conf.in b/www/apache22/files/patch-docs_conf_extra_httpd-ssl.conf.in
index cf0bbeab218d..15ca7ef1e237 100644
--- a/www/apache22/files/patch-docs:conf:ssl-std.conf.in
+++ b/www/apache22/files/patch-docs_conf_extra_httpd-ssl.conf.in
@@ -1,8 +1,6 @@
-$FreeBSD$
-
---- docs/conf/ssl-std.conf.in.orig	Mon Oct 13 16:14:10 2003
-+++ docs/conf/ssl-std.conf.in	Mon Oct 13 16:15:17 2003
-@@ -88,8 +88,8 @@
+--- docs/conf/extra/httpd-ssl.conf.in.orig	Sun Oct 30 19:40:45 2005
++++ docs/conf/extra/httpd-ssl.conf.in	Sun Oct 30 19:41:50 2005
+@@ -77,8 +77,8 @@
  DocumentRoot "@exp_htdocsdir@"
  ServerName www.example.com:443
  ServerAdmin you@example.com
@@ -13,7 +11,7 @@ $FreeBSD$
  
  #   SSL Engine Switch:
  #   Enable/Disable SSL for this virtual host.
-@@ -240,7 +240,7 @@
+@@ -225,7 +225,7 @@
  #   Per-Server Logging:
  #   The home of a custom SSL log file. Use this when you want a
  #   compact non-error SSL logfile on a virtual host basis.
diff --git a/www/apache22/files/patch-docs_conf_extra_httpd-userdir.conf.in b/www/apache22/files/patch-docs_conf_extra_httpd-userdir.conf.in
new file mode 100644
index 000000000000..902ef9584641
--- /dev/null
+++ b/www/apache22/files/patch-docs_conf_extra_httpd-userdir.conf.in
@@ -0,0 +1,16 @@
+--- docs/conf/extra/httpd-userdir.conf.in.orig	Sun Oct 30 19:37:37 2005
++++ docs/conf/extra/httpd-userdir.conf.in	Sun Oct 30 19:38:27 2005
+@@ -8,7 +8,7 @@
+ # the default access control for these directories, as in the example below.
+ #
+ UserDir public_html
+-
++UserDir disabled %%FTPUSERS%%
+ #
+ # Control access to UserDir directories.  The following is an example
+ # for a site where these directories are restricted to read-only.
+@@ -25,4 +25,3 @@
+         Deny from all
+     </LimitExcept>
+ </Directory>
+-
diff --git a/www/apache22/files/patch-docs_conf_httpd.conf.in b/www/apache22/files/patch-docs_conf_httpd.conf.in
new file mode 100644
index 000000000000..728ed64ecc5f
--- /dev/null
+++ b/www/apache22/files/patch-docs_conf_httpd.conf.in
@@ -0,0 +1,52 @@
+--- docs/conf/httpd.conf.in.orig	Sun Oct 30 19:33:41 2005
++++ docs/conf/httpd.conf.in	Sun Oct 30 19:37:09 2005
+@@ -63,8 +63,8 @@
+ # It is usually good practice to create a dedicated user and group for
+ # running httpd, as with most system services.
+ #
+-User daemon
+-Group daemon
++User %%WWWOWN%%
++Group %%WWWGRP%%
+ </IfModule>
+ </IfModule>
+ 
+@@ -112,7 +112,6 @@
+ # features.  
+ #
+ <Directory />
+-    Options FollowSymLinks
+     AllowOverride None
+     Order deny,allow
+     Deny from all
+@@ -182,7 +181,7 @@
+ # logged here.  If you *do* define an error logfile for a <VirtualHost>
+ # container, that host's errors will be logged there and not here.
+ #
+-ErrorLog @rel_logfiledir@/error_log
++ErrorLog @rel_logfiledir@/httpd-error.log
+ 
+ #
+ # LogLevel: Control the number of messages logged to the error_log.
+@@ -211,13 +210,13 @@
+     # define per-<VirtualHost> access logfiles, transactions will be
+     # logged therein and *not* in this file.
+     #
+-    CustomLog @rel_logfiledir@/access_log common
++    #CustomLog @rel_logfiledir@/httpd-access.log common
+ 
+     #
+     # If you prefer a logfile with access, agent, and referer information
+     # (Combined Logfile Format) you can use the following directive.
+     #
+-    #CustomLog @rel_logfiledir@/access_log combined
++    CustomLog @rel_logfiledir@/httpd-access.log combined
+ </IfModule>
+ 
+ <IfModule alias_module>
+@@ -412,3 +411,5 @@
+ SSLRandomSeed startup builtin
+ SSLRandomSeed connect builtin
+ </IfModule>
++
++Include @rel_sysconfdir@/Includes/*.conf
diff --git a/www/apache22/files/patch-srclib:apr-util:build:dbm.m4 b/www/apache22/files/patch-srclib:apr-util:build:dbm.m4
index 70fe1ef96154..ed8ec4ef2e83 100644
--- a/www/apache22/files/patch-srclib:apr-util:build:dbm.m4
+++ b/www/apache22/files/patch-srclib:apr-util:build:dbm.m4
@@ -1,6 +1,6 @@
---- srclib/apr-util/build/dbm.m4.orig	Wed Nov 17 02:12:20 2004
-+++ srclib/apr-util/build/dbm.m4	Mon Jan 17 21:22:47 2005
-@@ -298,8 +298,8 @@
+--- srclib/apr-util/build/dbm.m4.orig	Thu Feb 24 10:23:34 2005
++++ srclib/apr-util/build/dbm.m4	Sun Oct 30 19:44:43 2005
+@@ -314,8 +314,8 @@
    fi
    APU_CHECK_BERKELEY_DB(1, -1, -1,
      "$places",
@@ -11,7 +11,7 @@
    )
    if test "$apu_have_db" = "1"; then
      apu_db_version=185
-@@ -341,7 +341,7 @@
+@@ -357,7 +357,7 @@
    APU_CHECK_BERKELEY_DB(3, -1, -1,
      "$places",
      "db3/db.h db.h",
@@ -20,7 +20,7 @@
    )
    if test "$apu_have_db" = "1"; then
      apu_db_version=3
-@@ -361,8 +361,8 @@
+@@ -377,8 +377,8 @@
    fi
    APU_CHECK_BERKELEY_DB("4", "0", "-1",
      "$places",
@@ -31,7 +31,7 @@
    )
    if test "$apu_have_db" = "1"; then
      apu_db_version=4
-@@ -382,8 +382,8 @@
+@@ -398,8 +398,8 @@
    fi
    APU_CHECK_BERKELEY_DB("4", "1", "-1",
      "$places",
@@ -42,7 +42,7 @@
    )
    if test "$apu_have_db" = "1"; then
      apu_db_version=4
-@@ -403,8 +403,8 @@
+@@ -419,8 +419,8 @@
    fi
    APU_CHECK_BERKELEY_DB("4", "2", "-1",
      "$places",
@@ -53,12 +53,12 @@
    )
    if test "$apu_have_db" = "1"; then
      apu_db_version=4
-@@ -422,8 +422,8 @@
+@@ -438,8 +438,8 @@
    fi
    APU_CHECK_BERKELEY_DB("4", "3", "-1",
      "$places",
 -    "db43/db.h db4/db.h db.h",
--    "db-4.3 db43 db4 db"
+-    "db-4.3 db4-4.3 db43 db4 db"
 +    "db43/db.h",
 +    "db-4.3"
    )
diff --git a/www/apache22/files/patch-srclib:apr-util:xml:expat:buildconf.sh b/www/apache22/files/patch-srclib:apr-util:xml:expat:buildconf.sh
index c4922c1573b9..070c76fa8a7c 100644
--- a/www/apache22/files/patch-srclib:apr-util:xml:expat:buildconf.sh
+++ b/www/apache22/files/patch-srclib:apr-util:xml:expat:buildconf.sh
@@ -1,20 +1,29 @@
---- srclib/apr-util/xml/expat/buildconf.sh.orig	Wed Nov 17 02:12:20 2004
-+++ srclib/apr-util/xml/expat/buildconf.sh	Sat Dec 11 17:04:11 2004
-@@ -3,7 +3,7 @@
+--- srclib/apr/buildconf.orig	Tue Jun 14 14:11:15 2005
++++ srclib/apr/buildconf	Sun Oct 30 19:47:52 2005
+@@ -23,7 +23,7 @@
  #
- # Find libtoolize
- #
--libtoolize=`conftools/PrintPath glibtoolize libtoolize libtoolize15 libtoolize14`
-+libtoolize=${LIBTOOLIZE}
+ build/buildcheck.sh || exit 1
+ 
+-libtoolize=`build/PrintPath glibtoolize libtoolize15 libtoolize14 libtoolize`
++libtoolize="${LIBTOOLIZE}"
  if [ "x$libtoolize" = "x" ]; then
      echo "libtoolize not found in path"
      exit 1
-@@ -33,7 +33,7 @@
-   ltfile=libtool.m4
- else
-   ltpath=`dirname $libtoolize`
--  ltfile=${LIBTOOL_M4-`cd $ltpath/../share/aclocal ; pwd`/libtool.m4}
-+  ltfile=${LIBTOOL_M4-`cd $ltpath/../../share/aclocal ; pwd`/libtool${LIBTOOL_VERSION}.m4}
+@@ -52,7 +52,7 @@
+    # Expecting the code above to be very portable, but just in case...
+    if [ -z "$ltfile" -o ! -f "$ltfile" ]; then
+      ltpath=`dirname $libtoolize`
+-     ltfile=`cd $ltpath/../share/aclocal ; pwd`/libtool.m4
++     ltfile=${LIBTOOL_M4-`cd $ltpath/../../share/aclocal ; pwd`/${LIBTOOL_VERSION}.m4}
+    fi
+ fi
+   
+@@ -61,7 +61,7 @@
+     exit 1
  fi
- echo "Incorporating $ltfile into aclocal.m4 ..."
- echo "dnl THIS FILE IS AUTOMATICALLY GENERATED BY buildconf.sh" > aclocal.m4
+ 
+-echo "buildconf: Using libtool.m4 at ${ltfile}."
++echo "buildconf: Using libtool${LIBTOOL_VERSION}.m4 at ${ltfile}."
+ 
+ cat $ltfile | sed -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' > build/libtool.m4
+ 
diff --git a/www/apache22/files/patch-srclib:apr:buildconf b/www/apache22/files/patch-srclib:apr:buildconf
deleted file mode 100644
index d3483efcc7eb..000000000000
--- a/www/apache22/files/patch-srclib:apr:buildconf
+++ /dev/null
@@ -1,29 +0,0 @@
---- srclib/apr/buildconf.orig	Thu Jul  1 23:21:59 2004
-+++ srclib/apr/buildconf	Sat Dec 11 17:11:22 2004
-@@ -22,7 +22,7 @@
- #
- build/buildcheck.sh || exit 1
- 
--libtoolize=`build/PrintPath glibtoolize libtoolize libtoolize15 libtoolize14`
-+libtoolize=${LIBTOOLIZE}
- if [ "x$libtoolize" = "x" ]; then
-     echo "libtoolize not found in path"
-     exit 1
-@@ -46,7 +46,7 @@
-    ltfile=`pwd`/libtool.m4
- else
-    ltpath=`dirname $libtoolize`
--   ltfile=${LIBTOOL_M4-`cd $ltpath/../share/aclocal ; pwd`/libtool.m4}
-+   ltfile=${LIBTOOL_M4-`cd $ltpath/../../share/aclocal ; pwd`/${LIBTOOL_VERSION}.m4}
- fi
-   
- if [ ! -f $ltfile ]; then
-@@ -54,7 +54,7 @@
-     exit 1
- fi
- 
--echo "buildconf: Using libtool.m4 at ${ltfile}."
-+echo "buildconf: Using libtool${LIBTOOL_VERSION}.m4 at ${ltfile}."
- 
- cat $ltfile | sed -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' > build/libtool.m4
- 
diff --git a/www/apache22/pkg-plist b/www/apache22/pkg-plist
index e5d89542721e..f36389cee890 100644
--- a/www/apache22/pkg-plist
+++ b/www/apache22/pkg-plist
@@ -1,17 +1,47 @@
 @comment $FreeBSD$
 @exec mkdir -p %D/etc/apache21 2> /dev/null
-@unexec if cmp -s %D/etc/apache21/httpd.conf %D/%%EXAMPLESDIR%%/httpd-std.conf; then rm -f %D/etc/apache21/httpd.conf; fi
-%%EXAMPLESDIR%%/httpd-std.conf
-@exec [ -f %D/etc/apache21/httpd.conf ] || cp %D/%%EXAMPLESDIR%%/httpd-std.conf %D/etc/apache21/httpd.conf
-@unexec if cmp -s %D/etc/apache21/magic %D/%%EXAMPLESDIR%%/magic-dist; then rm -f %D/etc/apache21/magic; fi
-%%EXAMPLESDIR%%/magic-dist
-@exec [ -f %D/etc/apache21/magic ] || cp %D/%%EXAMPLESDIR%%/magic-dist %D/etc/apache21/magic
-@unexec if cmp -s %D/etc/apache21/mime.types %D/%%EXAMPLESDIR%%/mime.types-dist; then rm -f %D/etc/apache21/mime.types; fi
-%%EXAMPLESDIR%%/mime.types-dist
-@exec [ -f %D/etc/apache21/mime.types ] || cp %D/%%EXAMPLESDIR%%/mime.types-dist %D/etc/apache21/mime.types
-@unexec if cmp -s %D/etc/apache21/ssl.conf %D/%%EXAMPLESDIR%%/ssl-std.conf; then rm -f %D/etc/apache21/ssl.conf; fi
-%%EXAMPLESDIR%%/ssl-std.conf
-@exec [ -f %D/etc/apache21/ssl.conf ] || cp %D/%%EXAMPLESDIR%%/ssl-std.conf %D/etc/apache21/ssl.conf
+@unexec if cmp -s %D/etc/apache21/httpd.conf %D/%%EXAMPLESDIR%%/httpd.conf; then rm -f %D/etc/apache21/httpd.conf; fi
+%%EXAMPLESDIR%%/httpd.conf
+@exec [ -f %D/etc/apache21/httpd.conf ] || cp %D/%%EXAMPLESDIR%%/httpd.conf %D/etc/apache21/httpd.conf
+@unexec if cmp -s %D/etc/apache21/magic %D/%%EXAMPLESDIR%%/magic; then rm -f %D/etc/apache21/magic; fi
+%%EXAMPLESDIR%%/magic
+@exec [ -f %D/etc/apache21/magic ] || cp %D/%%EXAMPLESDIR%%/magic %D/etc/apache21/magic
+@unexec if cmp -s %D/etc/apache21/mime.types %D/%%EXAMPLESDIR%%/mime.types-; then rm -f %D/etc/apache21/mime.types; fi
+%%EXAMPLESDIR%%/mime.types
+@exec [ -f %D/etc/apache21/mime.types ] || cp %D/%%EXAMPLESDIR%%/mime.types- %D/etc/apache21/mime.types
+@unexec if cmp -s %D/etc/apache21/extra/httpd-autoindex.conf %D/%%EXAMPLESDIR%%/extra/httpd-autoindex.conf; then rm -f %D/etc/apache21/extra/httpd-autoindex.conf; fi
+%%EXAMPLESDIR%%/extra/httpd-autoindex.conf
+@exec [ -f %D/etc/apache21/extra/httpd-autoindex.conf ] || cp %D/%%EXAMPLESDIR%%/extra/httpd-autoindex.conf %D/etc/apache21/extra/httpd-autoindex.conf
+@unexec if cmp -s %D/etc/apache21/extra/httpd-dav.conf %D/%%EXAMPLESDIR%%/extra/httpd-dav.conf; then rm -f %D/etc/apache21/extra/httpd-dav.conf; fi
+%%EXAMPLESDIR%%/extra/httpd-dav.conf
+@exec [ -f %D/etc/apache21/extra/httpd-dav.conf ] || cp %D/%%EXAMPLESDIR%%/extra/httpd-dav.conf %D/etc/apache21/extra/httpd-dav.conf
+@unexec if cmp -s %D/etc/apache21/extra/httpd-default.conf %D/%%EXAMPLESDIR%%/extra/httpd-default.conf; then rm -f %D/etc/apache21/extra/httpd-default.conf; fi
+%%EXAMPLESDIR%%/extra/httpd-default.conf
+@exec [ -f %D/etc/apache21/extra/httpd-default.conf ] || cp %D/%%EXAMPLESDIR%%/extra/httpd-default.conf %D/etc/apache21/extra/httpd-default.conf
+@unexec if cmp -s %D/etc/apache21/extra/httpd-info.conf %D/%%EXAMPLESDIR%%/extra/httpd-info.conf; then rm -f %D/etc/apache21/extra/httpd-info.conf; fi
+%%EXAMPLESDIR%%/extra/httpd-info.conf
+@exec [ -f %D/etc/apache21/extra/httpd-info.conf ] || cp %D/%%EXAMPLESDIR%%/extra/httpd-info.conf %D/etc/apache21/extra/httpd-info.conf
+@unexec if cmp -s %D/etc/apache21/extra/httpd-languages.conf %D/%%EXAMPLESDIR%%/extra/httpd-languages.conf; then rm -f %D/etc/apache21/extra/httpd-languages.conf; fi
+%%EXAMPLESDIR%%/extra/httpd-languages.conf
+@exec [ -f %D/etc/apache21/extra/httpd-languages.conf ] || cp %D/%%EXAMPLESDIR%%/extra/httpd-languages.conf %D/etc/apache21/extra/httpd-languages.conf
+@unexec if cmp -s %D/etc/apache21/extra/httpd-manual.conf %D/%%EXAMPLESDIR%%/extra/httpd-manual.conf; then rm -f %D/etc/apache21/extra/httpd-manual.conf; fi
+%%EXAMPLESDIR%%/extra/httpd-manual.conf
+@exec [ -f %D/etc/apache21/extra/httpd-manual.conf ] || cp %D/%%EXAMPLESDIR%%/extra/httpd-manual.conf %D/etc/apache21/extra/httpd-manual.conf
+@unexec if cmp -s %D/etc/apache21/extra/httpd-mpm.conf %D/%%EXAMPLESDIR%%/extra/httpd-mpm.conf; then rm -f %D/etc/apache21/extra/httpd-mpm.conf; fi
+%%EXAMPLESDIR%%/extra/httpd-mpm.conf
+@exec [ -f %D/etc/apache21/extra/httpd-mpm.conf ] || cp %D/%%EXAMPLESDIR%%/extra/httpd-mpm.conf %D/etc/apache21/extra/httpd-mpm.conf
+@unexec if cmp -s %D/etc/apache21/extra/httpd-multilang-errordoc.conf %D/%%EXAMPLESDIR%%/extra/httpd-multilang-errordoc.conf; then rm -f %D/etc/apache21/extra/httpd-multilang-errordoc.conf; fi
+%%EXAMPLESDIR%%/extra/httpd-multilang-errordoc.conf
+@exec [ -f %D/etc/apache21/extra/httpd-multilang-errordoc.conf ] || cp %D/%%EXAMPLESDIR%%/extra/httpd-multilang-errordoc.conf %D/etc/apache21/extra/httpd-multilang-errordoc.conf
+@unexec if cmp -s %D/etc/apache21/extra/httpd-ssl.conf %D/%%EXAMPLESDIR%%/extra/httpd-ssl.conf; then rm -f %D/etc/apache21/extra/httpd-ssl.conf; fi
+%%EXAMPLESDIR%%/extra/httpd-ssl.conf
+@exec [ -f %D/etc/apache21/extra/httpd-ssl.conf ] || cp %D/%%EXAMPLESDIR%%/extra/httpd-ssl.conf %D/etc/apache21/extra/httpd-ssl.conf
+@unexec if cmp -s %D/etc/apache21/extra/httpd-userdir.conf %D/%%EXAMPLESDIR%%/extra/httpd-userdir.conf; then rm -f %D/etc/apache21/extra/httpd-userdir.conf; fi
+%%EXAMPLESDIR%%/extra/httpd-userdir.conf
+@exec [ -f %D/etc/apache21/extra/httpd-userdir.conf ] || cp %D/%%EXAMPLESDIR%%/extra/httpd-userdir.conf %D/etc/apache21/extra/httpd-userdir.conf
+@unexec if cmp -s %D/etc/apache21/extra/httpd-vhosts.conf %D/%%EXAMPLESDIR%%/extra/httpd-vhosts.conf; then rm -f %D/etc/apache21/extra/httpd-vhosts.conf; fi
+%%EXAMPLESDIR%%/extra/httpd-vhosts.conf
+@exec [ -f %D/etc/apache21/extra/httpd-vhosts.conf ] || cp %D/%%EXAMPLESDIR%%/extra/httpd-vhosts.conf %D/etc/apache21/extra/httpd-vhosts.conf
 etc/rc.d/apache21.sh
 include/apache21/ap_compat.h
 include/apache21/ap_config.h
@@ -31,6 +61,7 @@ include/apache21/ap_release.h
 %%APR_PORTS%%include/apr-1/apr_base64.h
 %%APR_PORTS%%include/apr-1/apr_buckets.h
 %%APR_PORTS%%include/apr-1/apr_date.h
+%%APR_PORTS%%include/apr-1/apr_dbd.h
 %%APR_PORTS%%include/apr-1/apr_dbm.h
 %%APR_PORTS%%include/apr-1/apr_dso.h
 %%APR_PORTS%%include/apr-1/apr_env.h
@@ -131,10 +162,10 @@ include/apache21/util_xml.h
 %%APR_PORTS%%lib/aprutil.exp
 %%APR_PORTS%%lib/libapr-1.a
 %%APR_PORTS%%lib/libapr-1.so
-%%APR_PORTS%%lib/libapr-1.so.1
+%%APR_PORTS%%lib/libapr-1.so.2
 %%APR_PORTS%%lib/libaprutil-1.a
 %%APR_PORTS%%lib/libaprutil-1.so
-%%APR_PORTS%%lib/libaprutil-1.so.1
+%%APR_PORTS%%lib/libaprutil-1.so.2
 libexec/apache21/httpd.exp
 %%MOD_ACTIONS%%libexec/apache21/mod_actions.so
 %%MOD_ALIAS%%libexec/apache21/mod_alias.so
@@ -171,7 +202,7 @@ libexec/apache21/httpd.exp
 %%MOD_EXT_FILTER%%libexec/apache21/mod_ext_filter.so
 %%MOD_FILE_CACHE%%libexec/apache21/mod_file_cache.so
 %%MOD_HEADERS%%libexec/apache21/mod_headers.so
-%%MOD_IMAP%%libexec/apache21/mod_imap.so
+%%MOD_IMAGEMAP%%libexec/apache21/mod_imagemap.so
 %%MOD_INCLUDE%%libexec/apache21/mod_include.so
 %%MOD_INFO%%libexec/apache21/mod_info.so
 %%MOD_LDAP%%libexec/apache21/mod_ldap.so
@@ -213,6 +244,7 @@ sbin/htdbm
 sbin/htdigest
 sbin/htpasswd
 sbin/httpd
+sbin/httxt2dbm
 sbin/logresolve
 sbin/rotatelogs
 %%MOD_SUEXEC%%sbin/suexec
@@ -226,6 +258,7 @@ share/apache21/build/config.nice
 share/apache21/build/instdso.sh
 share/apache21/build/library.mk
 share/apache21/build/ltlib.mk
+share/apache21/build/mkdir.sh
 share/apache21/build/program.mk
 share/apache21/build/rules.mk
 share/apache21/build/special.mk
@@ -250,7 +283,6 @@ share/apache21/build/special.mk
 %%ERROR%%www/error-dist/HTTP_INTERNAL_SERVER_ERROR.html.var
 %%ERROR%%www/error-dist/HTTP_LENGTH_REQUIRED.html.var
 %%ERROR%%www/error-dist/HTTP_METHOD_NOT_ALLOWED.html.var
-%%ERROR%%www/error-dist/HTTP_NOT_ACCEPTABLE.html.var
 %%ERROR%%www/error-dist/HTTP_NOT_FOUND.html.var
 %%ERROR%%www/error-dist/HTTP_NOT_IMPLEMENTED.html.var
 %%ERROR%%www/error-dist/HTTP_PRECONDITION_FAILED.html.var
@@ -496,6 +528,7 @@ share/apache21/build/special.mk
 %%ERROR%%@dirrm www/error-dist
 %%WWWDATA%%@dirrm www/data-dist
 %%CGI%%@dirrm www/cgi-bin-dist
+@dirrm %%EXAMPLESDIR%%/extra
 @dirrm %%EXAMPLESDIR%%
 @dirrm share/apache21/build
 @dirrm share/apache21
@@ -508,4 +541,5 @@ share/apache21/build/special.mk
 @unexec rmdir %D/etc/apache21/Includes 2> /dev/null || true
 @unexec rm -f %D/etc/apache21/httpd.conf.bak 2> /dev/null || true
 @unexec rmdir %D/etc/apache21/envvars.d 2> /dev/null || true
+@unexec rmdir %D/etc/apache21/extra 2> /dev/null || true
 @unexec rmdir %D/etc/apache21 2> /dev/null || echo "===> If you plan to do not reinstall apache21, you can safely remove %D/etc/apache21."