- Update to 2.0.53

- Download bz2'd tarball [1]
- Add print-closest-mirrors target.
  It allows you to find the 6 (3 http/3 ftp) closest mirror,
  base on http://www.apache.org/dyn/closer.cgi/httpd/
  make print-closest-mirrors >> /etc/make.conf automatically add
  the six closest mirror to the head of ${MASTER_SITE_APACHE_HTTPD}.

Requested by:	delphij

9 files changed, 61 insertions, 317 deletions

diff --git a/www/apache2/Makefile b/www/apache2/Makefile
index 5c2185379271..b76c53bbbb43 100644
--- a/www/apache2/Makefile
+++ b/www/apache2/Makefile
@@ -8,15 +8,14 @@
 #
 
 PORTNAME=	apache
-PORTVERSION=	2.0.52
-PORTREVISION=	4
+PORTVERSION=	2.0.53
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_APACHE_HTTPD} \
 		${MASTER_SITE_LOCAL:S/%SUBDIR%/clement/}:powerlogo
 DISTNAME=	httpd-${PORTVERSION}
-DISTFILES=	${DISTNAME}.tar.gz powerlogo.gif:powerlogo
+DISTFILES=	${DISTNAME}.tar.bz2 powerlogo.gif:powerlogo
 DIST_SUBDIR=	apache2
-EXTRACT_ONLY=	${DISTNAME}.tar.gz
+EXTRACT_ONLY=	${DISTNAME}.tar.bz2
 
 MAINTAINER?=	clement@FreeBSD.org
 COMMENT?=	Version 2 of Apache web server with ${WITH_MPM:L} MPM.
@@ -53,6 +52,7 @@ USE_REINPLACE=		yes
 LIBTOOLFILES=		configure
 INSTALLS_SHLIB=		yes
 LDCONFIG_DIRS=		${PREFIX}/lib/apache2
+USE_BZIP2=		yes
 
 CONFIGURE_ARGS=	--prefix=${PREFIX_RELDEST} \
 		--enable-layout=FreeBSD \
@@ -180,6 +180,21 @@ pre-everything::
 	@${ECHO_MSG}	"  To see all modules in different categories, type make show-categories"
 	@${ECHO_MSG}    "  You can check your modules configuration by using make show-modules"
 	@${ECHO_MSG}	""
+	@${ECHO_MSG}    "To save apache.org bandwidth, please use the closest"
+	@${ECHO_MSG}    "mirror. Hit Ctrl+C now and do a "make print-closest-mirrors."
+	@${ECHO_MSG}	"To automatically update /etc/make.conf do:"
+	@${ECHO_MSG}	"make print-closest-mirrors >> /etc/make.conf"
+	@${ECHO_MSG}	""
+
+print-closest-mirrors:
+	@${ECHO_MSG} -n "Fetching list of nearest mirror: " >&2
+	@MIRRORS=`${FETCH_CMD} -T 30 -qo - http://www.apache.org/dyn/closer.cgi/httpd/ 2> /dev/null\
+	| ${GREP} /httpd/ | ${SED} 's/.*href="\(.*\)"><str.*/\1/g' | \
+	${HEAD} -7 | ${TAIL} -6` ; \
+	${ECHO_MSG} done >&2; if [ "x$$MIRRORS" != "x" ]; then \
+	${ECHO_MSG} -n "MASTER_SITE_APACHE_HTTPD?= ";\
+	${ECHO_MSG} $$MIRRORS; else \
+	${ECHO_MSG} "No mirrors found!">&2 ; fi
 
 post-extract:
 	@${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/powerlogo.gif ${WRKSRC}/docs/icons/freebsd.gif
diff --git a/www/apache2/Makefile.doc b/www/apache2/Makefile.doc
index 8c70ffd2e929..44b33f0c3aac 100644
--- a/www/apache2/Makefile.doc
+++ b/www/apache2/Makefile.doc
@@ -36,7 +36,8 @@
 ##      WITH_DBM:                 Choose your DBM: bdb (Berkeley DB), gdbm or
 ##                                ndbm (default)
 ##          WITH_BERKELEYDB:      Choose your BerkeleyDB version: db2, db3,
-##                                db4, db41, db42 or FreeBSD (1.85)(default)
+##                                db4, db41, db42, db43 or FreeBSD (1.85)
+##                                (default)
 ##      WITH_STATIC_SUPPORT:      Build statically linked support binaries
 ##      WITH_STATIC_APACHE:       Build a static version of httpd (implies 
 ##                                WITH_STATIC_MODULES)
diff --git a/www/apache2/distinfo b/www/apache2/distinfo
index 49c64872840c..54fcea96b8b1 100644
--- a/www/apache2/distinfo
+++ b/www/apache2/distinfo
@@ -1,4 +1,4 @@
-MD5 (apache2/httpd-2.0.52.tar.gz) = eba528fa8613dc5bfb0615a69c11f053
-SIZE (apache2/httpd-2.0.52.tar.gz) = 6918995
+MD5 (apache2/httpd-2.0.53.tar.bz2) = 94f3a793fb1665365724943206cce23f
+SIZE (apache2/httpd-2.0.53.tar.bz2) = 5079345
 MD5 (apache2/powerlogo.gif) = 0f106073b3c7844cf22d4df126b27c62
 SIZE (apache2/powerlogo.gif) = 5279
diff --git a/www/apache2/files/patch-Makefile.in b/www/apache2/files/patch-Makefile.in
index 41ed1ba3ff41..89048db49d3b 100644
--- a/www/apache2/files/patch-Makefile.in
+++ b/www/apache2/files/patch-Makefile.in
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Thu Aug 26 15:01:18 2004
-+++ Makefile.in	Fri Dec 17 17:00:02 2004
+--- Makefile.in.orig	Wed Nov 24 20:31:09 2004
++++ Makefile.in	Sat Feb  5 12:04:56 2005
 @@ -31,15 +31,21 @@
  	if [ ! -d $(DESTDIR)$(sysconfdir) ]; then \
  	    $(MKINSTALLDIRS) $(DESTDIR)$(sysconfdir) ; \
@@ -60,7 +60,7 @@
  
  install-build:
  	@echo Installing build system files 
-@@ -108,45 +111,41 @@
+@@ -108,44 +111,40 @@
  	doxygen $(top_srcdir)/docs/doxygen.conf
  
  install-htdocs:
@@ -70,16 +70,17 @@
 -	    echo Installing HTML documents ; \
 -	    $(MKINSTALLDIRS) $(DESTDIR)$(htdocsdir) ; \
 -	    test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(DESTDIR)$(htdocsdir)) ; \
--	    cd $(DESTDIR)$(htdocsdir) && find . -name "CVS" -type d -print | xargs rm -rf 2>/dev/null || true; \
+-	    cd $(DESTDIR)$(htdocsdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \
 -	fi
+-
 +.if !defined(NO_WWWDATA)
 +	@echo Installing HTML documents
 +	@test -d $(DESTDIR)$(htdocsdir)-dist || $(MKINSTALLDIRS) $(DESTDIR)$(htdocsdir)-dist
 +	@test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(DESTDIR)$(htdocsdir)-dist)
 +	@test -e $(DESTDIR)$(htdocsdir) || ln -sf $(DESTDIR)$(htdocsdir)-dist $(DESTDIR)$(htdocsdir)
-+	-@test "x$(htdocsdir)" != "x" && cd $(DESTDIR)$(htdocsdir)-dist && find . -name "CVS" -print | xargs rm -rf
++	-@test "x$(htdocsdir)" != "x" && cd $(DESTDIR)$(htdocsdir)-dist && find -name "CVS" -print | xargs rm -rf
 +.endif
- 
++  
  install-error:
 -	-@if [ -d $(DESTDIR)$(errordir) ]; then \
 -           echo "[PRESERVING EXISTING ERROR SUBDIR: $(DESTDIR)$(errordir)]"; \
@@ -87,8 +88,9 @@
 -	    echo Installing error documents ; \
 -	    $(MKINSTALLDIRS) $(DESTDIR)$(errordir) ; \
 -	    cd $(top_srcdir)/docs/error && cp -rp * $(DESTDIR)$(errordir) ; \
--	    test "x$(errordir)" != "x" && cd $(DESTDIR)$(errordir) && find . -name "CVS" -type d -print | xargs rm -rf 2>/dev/null || true; \
+-	    test "x$(errordir)" != "x" && cd $(DESTDIR)$(errordir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \
 -	fi
+-
 +.if !defined(NO_ERROR)
 +	@echo Installing error documents
 +	@test -d $(DESTDIR)$(errordir)-dist || $(MKINSTALLDIRS) $(DESTDIR)$(errordir)-dist
@@ -96,7 +98,7 @@
 +	-@test "x$(errordir)" != "x" && cd $(DESTDIR)$(errordir)-dist && find . -name "CVS" -print | xargs rm -rf 
 +	@test -e $(DESTDIR)$(errordir) || ln -sf $(DESTDIR)$(errordir)-dist $(DESTDIR)$(errordir)
 +.endif
- 
++  
  install-icons:
 -	-@if [ -d $(DESTDIR)$(iconsdir) ]; then \
 -           echo "[PRESERVING EXISTING ICONS SUBDIR: $(DESTDIR)$(iconsdir)]"; \
@@ -104,8 +106,9 @@
 -	    echo Installing icons ; \
 -	    $(MKINSTALLDIRS) $(DESTDIR)$(iconsdir) ; \
 -	    cd $(top_srcdir)/docs/icons && cp -rp * $(DESTDIR)$(iconsdir) ; \
--	    test "x$(iconsdir)" != "x" && cd $(DESTDIR)$(iconsdir) && find . -name "CVS" -type d -print | xargs rm -rf 2>/dev/null || true; \
+-	    test "x$(iconsdir)" != "x" && cd $(DESTDIR)$(iconsdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \
 -	fi
+-
 +.if !defined(NO_ICONS)
 +	@echo Installing icons
 +	@test -d $(DESTDIR)$(iconsdir)-dist || $(MKINSTALLDIRS) $(DESTDIR)$(iconsdir)-dist
@@ -113,7 +116,7 @@
 +	-@test "x$(iconsdir)" != "x" && cd $(DESTDIR)$(iconsdir)-dist && find . -name "CVS" -print | xargs rm -rf 
 +	@test -e $(DESTDIR)$(iconsdir) || ln -sf $(DESTDIR)$(iconsdir)-dist $(DESTDIR)$(iconsdir)
 +.endif 
- 
++  
  install-cgi:
 -	-@if [ -d $(DESTDIR)$(cgidir) ];then \
 -	    echo "[PRESERVING EXISTING CGI SUBDIR: $(DESTDIR)$(cgidir)]"; \
@@ -121,9 +124,8 @@
 -	   echo Installing CGIs ; \
 -	   $(MKINSTALLDIRS) $(DESTDIR)$(cgidir) ; \
 -	   cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(DESTDIR)$(cgidir) ; \
--	   test "x$(cgidir)" != "x" && cd $(DESTDIR)$(cgidir) && find . -name "CVS" -type d -print | xargs rm -rf 2>/dev/null || true; \
+-	   test "x$(cgidir)" != "x" && cd $(DESTDIR)$(cgidir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \
 -	fi
--
 +.if !defined(NO_CGI)
 +	@echo Installing CGIs
 +	@test -d $(DESTDIR)$(cgidir)-dist || $(MKINSTALLDIRS) $(DESTDIR)$(cgidir)-dist
@@ -131,21 +133,17 @@
 +	-@test "x$(cgidir)" != "x" && cd $(DESTDIR)$(cgidir)-dist && find . -name "CVS" -print | xargs rm -rf 
 +	@test -e $(DESTDIR)$(cgidir) || ln -sf $(DESTDIR)$(cgidir)-dist $(DESTDIR)$(cgidir)
 +.endif
-+ 
+ 
  install-other:
  	@test -d $(DESTDIR)$(logfiledir) || $(MKINSTALLDIRS) $(DESTDIR)$(logfiledir)
- 	@test -d $(DESTDIR)$(runtimedir) || $(MKINSTALLDIRS) $(DESTDIR)$(runtimedir)
-@@ -188,11 +187,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
--	@test -d $(DESTDIR)$(manualdir)   || $(MKINSTALLDIRS) $(DESTDIR)$(manualdir)
+@@ -191,8 +190,11 @@
+ 	@test -d $(DESTDIR)$(manualdir)   || $(MKINSTALLDIRS) $(DESTDIR)$(manualdir)
  	@cp -p $(top_srcdir)/docs/man/*.1 $(DESTDIR)$(mandir)/man1
  	@cp -p $(top_srcdir)/docs/man/*.8 $(DESTDIR)$(mandir)/man8
 +.if !defined(NOPORTDOCS)
-+	@test -d $(DESTDIR)$(manualdir)   || $(MKINSTALLDIRS) $(DESTDIR)$(manualdir)
++	 @test -d $(DESTDIR)$(manualdir)   || $(MKINSTALLDIRS) $(DESTDIR)$(manualdir)
  	@(cd $(top_srcdir)/docs/manual && cp -rp * $(DESTDIR)$(manualdir))
- 	@(cd $(DESTDIR)$(manualdir) && find . -name "CVS" -type d -print | xargs rm -rf 2>/dev/null ) || true
+ 	@(cd $(DESTDIR)$(manualdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null ) || true
 +.endif
  
  install-suexec:
diff --git a/www/apache2/files/patch-modules:experimental:util_ldap_cache_mgr.c b/www/apache2/files/patch-modules:experimental:util_ldap_cache_mgr.c
deleted file mode 100644
index ca5352107d51..000000000000
--- a/www/apache2/files/patch-modules:experimental:util_ldap_cache_mgr.c
+++ /dev/null
@@ -1,48 +0,0 @@
---- modules/experimental/util_ldap_cache_mgr.c       Thu Sep 23 18:55:37 2004
-+++ modules/experimental/util_ldap_cache_mgr.c    Wed Nov  3 06:17:59 2004
-@@ -173,7 +173,7 @@
- void util_ald_cache_purge(util_ald_cache_t *cache)
- {
-     unsigned long i;
--    util_cache_node_t *p, *q;
-+    util_cache_node_t *p, *q, **pp;
-     apr_time_t t;
-
-     if (!cache)
-@@ -184,7 +184,8 @@
-     cache->numpurges++;
-
-     for (i=0; i < cache->size; ++i) {
--        p = cache->nodes[i];
-+        pp = cache->nodes + i;
-+        p = *pp;
-         while (p != NULL) {
-             if (p->add_time < cache->marktime) {
-                 q = p->next;
-@@ -192,11 +193,12 @@
-                 util_ald_free(cache, p);
-                 cache->numentries--;
-                 cache->npurged++;
--                p = q;
-+                p = *pp = q;
-             }
-             else {
--                p = p->next;
--            }
-+
-+                 pp = &(p->next);
-+                 p = *pp;            }
-         }
-     }
-
-@@ -686,7 +688,9 @@
-                 default:
-                     break;
-             }
--
-+         }
-+         else {
-+             buf = "";
-         }
-     }
-     else {
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 0f2823e10232..000000000000
--- a/www/apache2/files/patch-modules:ssl:ssl_engine_io.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- modules/ssl/ssl_engine_io.c.orig	Fri Dec 17 23:14:23 2004
-+++ modules/ssl/ssl_engine_io.c	Fri Dec 17 23:15:04 2004
-@@ -153,7 +153,7 @@
- 
-     outctx->rc = ap_pass_brigade(outctx->filter_ctx->pOutputFilter->next,
-                                  outctx->bb);
--    return (outctx->rc == APR_SUCCESS) ? 1 : -1;
-+    return (outctx->rc == APR_SUCCESS && !outctx->c->aborted) ? 1 : -1;
- }
- 
- static int bio_filter_create(BIO *bio)
diff --git a/www/apache2/files/patch-secfix-CAN-2004-0885 b/www/apache2/files/patch-secfix-CAN-2004-0885
deleted file mode 100644
index f19a7e55c165..000000000000
--- a/www/apache2/files/patch-secfix-CAN-2004-0885
+++ /dev/null
@@ -1,56 +0,0 @@
-Index: ssl_engine_init.c
-===================================================================
-RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_engine_init.c,v
-retrieving revision 1.128
-retrieving revision 1.129
-diff -d -w -u -r1.128 -r1.129
---- modules/ssl/ssl_engine_init.c	3 Jun 2004 13:03:08 -0000	1.128
-+++ modules/ssl/ssl_engine_init.c	8 Oct 2004 11:59:32 -0000	1.129
-@@ -443,6 +443,14 @@
-      * Configure additional context ingredients
-      */
-     SSL_CTX_set_options(ctx, SSL_OP_SINGLE_DH_USE);
-+
-+#ifdef SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION
-+    /* 
-+     * Disallow a session from being resumed during a renegotiation,
-+     * so that an acceptable cipher suite can be negotiated.
-+     */
-+    SSL_CTX_set_options(ctx, SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION);
-+#endif
- }
- 
- static void ssl_init_ctx_session_cache(server_rec *s,
-Index: ssl_engine_kernel.c
-===================================================================
-RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_engine_kernel.c,v
-retrieving revision 1.110
-retrieving revision 1.111
-diff -d -w -u -r1.110 -r1.111
---- modules/ssl/ssl_engine_kernel.c	18 Aug 2004 11:05:22 -0000	1.110
-+++ modules/ssl/ssl_engine_kernel.c	8 Oct 2004 11:59:33 -0000	1.111
-@@ -733,6 +733,21 @@
-                 X509_free(peercert);
-             }
-         }
-+        
-+        /*
-+         * Also check that SSLCipherSuite has been enforced as expected.
-+         */
-+        if (cipher_list) {
-+            cipher = SSL_get_current_cipher(ssl);
-+            if (sk_SSL_CIPHER_find(cipher_list, cipher) < 0) {
-+                ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
-+                             "SSL cipher suite not renegotiated: "
-+                             "access to %s denied using cipher %s",
-+                              r->filename,
-+                              SSL_CIPHER_get_name(cipher));
-+                return HTTP_FORBIDDEN;
-+            }
-+        }
-     }
- 
-     /*
-
-
-
diff --git a/www/apache2/files/patch-secfix-CAN-2004-0942 b/www/apache2/files/patch-secfix-CAN-2004-0942
deleted file mode 100644
index 2f67f7c4013d..000000000000
--- a/www/apache2/files/patch-secfix-CAN-2004-0942
+++ /dev/null
@@ -1,104 +0,0 @@
-===================================================================
-RCS file: /home/cvspublic/httpd-2.0/server/protocol.c,v
-retrieving revision 1.121.2.21
-retrieving revision 1.121.2.22
-diff -u -r1.121.2.21 -r1.121.2.22
---- server/protocol.c	2004/09/23 18:18:36	1.121.2.21
-+++ server/protocol.c	2004/11/10 11:32:40	1.121.2.22
-@@ -305,35 +305,13 @@
-         }
-     }
- 
--    /* We now go backwards over any CR (if present) or white spaces.
--     *
--     * Trim any extra trailing spaces or tabs except for the first
--     * space or tab at the beginning of a blank string.  This makes
--     * it much easier to check field values for exact matches, and
--     * saves memory as well.  Terminate string at end of line.
--     */
--    pos = last_char;
--    if (pos > *s && *(pos - 1) == APR_ASCII_CR) {
--        --pos;
--    }
--
--    /* Trim any extra trailing spaces or tabs except for the first
--     * space or tab at the beginning of a blank string.  This makes
--     * it much easier to check field values for exact matches, and
--     * saves memory as well.
--     */
--    while (pos > ((*s) + 1)
--           && (*(pos - 1) == APR_ASCII_BLANK || *(pos - 1) == APR_ASCII_TAB)) {
--        --pos;
-+    /* Now NUL-terminate the string at the end of the line; 
-+     * if the last-but-one character is a CR, terminate there */
-+    if (last_char > *s && last_char[-1] == APR_ASCII_CR) {
-+        last_char--;
-     }
--
--    /* Since we want to remove the LF from the line, we'll go ahead
--     * and set this last character to be the term NULL and reset
--     * bytes_handled accordingly.
--     */
--    *pos = '\0';
--    last_char = pos;
--    bytes_handled = pos - *s;
-+    *last_char = '\0';
-+    bytes_handled = last_char - *s;
- 
-     /* If we're folding, we have more work to do.
-      *
-@@ -750,7 +728,7 @@
-                 last_len += len;
-                 folded = 1;
-             }
--            else {
-+            else /* not a continuation line */ {
- 
-                 if (r->server->limit_req_fields
-                     && (++fields_read > r->server->limit_req_fields)) {
-@@ -773,29 +751,26 @@
-                                                "</pre>\n", NULL));
-                     return;
-                 }
-+                
-+                tmp_field = value - 1; /* last character of field-name */
-+
-+                *value++ = '\0'; /* NUL-terminate at colon */
- 
--                *value = '\0';
--                tmp_field = value;  /* used to trim the whitespace between key
--                                     * token and separator
--                                     */
--                ++value;
-                 while (*value == ' ' || *value == '\t') {
-                     ++value;            /* Skip to start of value   */
-                 }
- 
--                /* This check is to avoid any invalid memory reference while
--                 * traversing backwards in the key. To avoid a case where
--                 * the header starts with ':' (or with just some white
--                 * space and the ':') followed by the value
--                 */
--                if (tmp_field > last_field) {
--                    --tmp_field;
--                    while ((tmp_field > last_field) &&
--                           (*tmp_field == ' ' || *tmp_field == '\t')) {
--                        --tmp_field;   /* Removing LWS between key and ':' */
--                    }
--                    ++tmp_field;
--                    *tmp_field = '\0';
-+                /* Strip LWS after field-name: */
-+                while (tmp_field > last_field 
-+                       && (*tmp_field == ' ' || *tmp_field == '\t')) {
-+                    *tmp_field-- = '\0';
-+                }
-+                
-+                /* Strip LWS after field-value: */
-+                tmp_field = last_field + last_len - 1;
-+                while (tmp_field > value
-+                       && (*tmp_field == ' ' || *tmp_field == '\t')) {
-+                    *tmp_field-- = '\0';
-                 }
- 
-                 apr_table_addn(r->headers_in, last_field, value);
-
diff --git a/www/apache2/files/patch-srclib:apr-util:build:dbm.m4 b/www/apache2/files/patch-srclib:apr-util:build:dbm.m4
index 3571ab7b0bb6..cca94b8fdd76 100644
--- a/www/apache2/files/patch-srclib:apr-util:build:dbm.m4
+++ b/www/apache2/files/patch-srclib:apr-util:build:dbm.m4
@@ -1,5 +1,5 @@
---- srclib/apr-util/build/dbm.m4.orig	Sat Mar 13 05:36:23 2004
-+++ srclib/apr-util/build/dbm.m4	Mon Jan 17 18:45:29 2005
+--- srclib/apr-util/build/dbm.m4.orig	Sun Jan 16 18:27:07 2005
++++ srclib/apr-util/build/dbm.m4	Sat Feb  5 12:14:28 2005
 @@ -298,8 +298,8 @@
    fi
    APU_CHECK_BERKELEY_DB(1, -1, -1,
@@ -42,7 +42,7 @@
    )
    if test "$apu_have_db" = "1"; then
      apu_db_version=4
-@@ -403,8 +403,28 @@
+@@ -403,13 +403,14 @@
    fi
    APU_CHECK_BERKELEY_DB("4", "2", "-1",
      "$places",
@@ -50,82 +50,31 @@
 -    "db-4.2 db4 db"
 +    "db42/db.h",
 +    "db-4.2"
-+  )
-+  if test "$apu_have_db" = "1"; then
-+    apu_db_version=4
-+  fi
-+])
-+
-+dnl
-+dnl APU_CHECK_DB43: is DB4.3 present?
-+dnl
-+dnl if present: sets apu_db_header, apu_db_lib, and apu_db_version
-+dnl
-+AC_DEFUN(APU_CHECK_DB43, [
-+  places=$1
-+  if test -z "$places"; then
-+    places="std /usr/local/BerkeleyDB.4.3 /boot/home/config"
-+  fi
-+  APU_CHECK_BERKELEY_DB("4", "3", "-1",
-+    "$places",
-+    "db43/db.h",
-+    "db-4.3"
    )
    if test "$apu_have_db" = "1"; then
      apu_db_version=4
-@@ -465,6 +485,12 @@
-       AC_MSG_ERROR(Berkeley db4 not found)
-     fi
-     ;;
-+  db43)
-+    APU_CHECK_DB43("$check_places")
-+    if test "$apu_db_version" != "4"; then
-+      AC_MSG_ERROR(Berkeley db4 not found)
-+    fi
-+    ;;
-   default)
-     APU_CHECK_DB_ALL("$check_places")
-     ;;
-@@ -472,11 +498,12 @@
+   fi
  ])
- 
++
  dnl
--dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 4.2 to 1.
-+dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 4.3 to 1.
+ dnl APU_CHECK_DB43: is DB4.3 present?
  dnl
- AC_DEFUN(APU_CHECK_DB_ALL, [
-   all_places=$1
-- 
-+ APU_CHECK_DB43("$all_places")
-+  if test "$apu_db_version" != "4"; then
-   APU_CHECK_DB42("$all_places")
-   if test "$apu_db_version" != "4"; then
-     APU_CHECK_DB41("$all_places")
-@@ -496,6 +523,7 @@
+@@ -422,8 +423,8 @@
+   fi
+   APU_CHECK_BERKELEY_DB("4", "3", "-1",
+     "$places",
+-    "db43/db.h db4/db.h db.h",
+-    "db-4.3 db43 db4 db"
++    "db43/db.h",
++    "db-4.3"
+   )
+   if test "$apu_have_db" = "1"; then
+     apu_db_version=4
+@@ -524,6 +525,7 @@
        fi
      fi
    fi
-+ fi
++
    AC_MSG_CHECKING(for Berkeley DB)
    if test "$apu_have_db" = "1"; then
      AC_MSG_RESULT(found db$apu_db_version)
-@@ -528,7 +556,7 @@
-   ], [
-     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, db41, db42])
-+        One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42,db43])
-     fi
-     requested="$withval"
-   ], [
-@@ -703,6 +731,10 @@
-       apu_default_dbm=db4
-       ;;
-     db42)
-+      apu_use_db=1
-+      apu_default_dbm=db4
-+      ;;
-+    db43)
-       apu_use_db=1
-       apu_default_dbm=db4
-       ;;