Convert to use bdb.buildlink3.mk and fix sources so that we can use db4.

3 files changed, 27 insertions, 25 deletions

diff --git a/www/apache/Makefile b/www/apache/Makefile
index fb52dc459e0..848e573c5ac 100644
--- a/www/apache/Makefile
+++ b/www/apache/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.143 2004/04/25 06:21:11 snj Exp $
+# $NetBSD: Makefile,v 1.144 2004/04/26 20:06:58 jlam Exp $
 #
 # This pkg does not compile in mod_ssl, only the `mod_ssl EAPI' (a set of
 # code hooks that allow mod_ssl to be compiled separately later, if desired).
@@ -112,33 +112,17 @@ APACHE_CUSTOM_CFLAGS+=	-D_FILE_OFFSET_BITS=64
 .  if ${OBJECT_FMT} == "ELF"
 LINK_LIBGCC_LDFLAGS=	${LINK_ALL_LIBGCC_HACK}
 MAKE_ENV+=		LINK_LIBGCC_LDFLAGS="${LINK_LIBGCC_LDFLAGS}"
-# if we are using gcc3, we need to link against libgcc_s, too. This
+#
+# If we are using gcc3, we need to link against libgcc_s, too.  This
 # ensures modules can resolve symbols they require from gcc.
+#
 .    if !empty(CC_VERSION:Mgcc-3*)
-USE_GCC_SHLIB=		YES # defined
+USE_GCC_SHLIB=		YES
 LINK_LIBGCC_LDFLAGS+=	-lgcc_s
 .    endif
 .  endif
 .endif
 
-# Use operating system's db1 functions (where available)
-USE_DB185=		# defined
-
-.include "../../databases/db/buildlink3.mk"
-BUILDLINK_DEPENDS.db=	db>=2.7.7
-
-.if defined(BUILDLINK_PREFIX.db_DEFAULT)
-CONFIGURE_ENV+=		INCLUDES="${BUILDLINK_CPPFLAGS.db}"
-
-# on Solaris, we also need libdbm
-.  if ${OPSYS} == "SunOS"
-CONFIGURE_ENV+=		LIBS="-ldbm -ldb2"
-LDFLAGS+=		-Wl,${RPATH_FLAG}/usr/ucblib -L/usr/ucblib
-.  else
-CONFIGURE_ENV+=		LIBS="-ldb2"
-.  endif
-.endif
-
 BUILD_DEFS+=		APACHE_CUSTOM_CFLAGS
 BUILD_DEFS+=		APACHE_PERF_TUNING
 BUILD_DEFS+=		APACHE_SUEXEC
@@ -163,6 +147,10 @@ PKG_USERS=		${APACHE_USER}:${APACHE_GROUP}::Apache\\ user
 MAKE_ENV+=		CHMOD="${CHMOD}" CHOWN="${CHOWN}" XARGS="${XARGS}"
 MAKE_ENV+=		FIND="${FIND}" CHGRP="${CHGRP}"
 
+.include "../../devel/libmm/buildlink3.mk"
+.include "../../textproc/expat/buildlink3.mk"
+.include "../../mk/bdb.buildlink3.mk"
+
 post-extract:
 	@${CP} ${FILESDIR}/ap_include_extern.h ${WRKSRC}/src/include
 	@${CP} ${MODSSL_SRC}/pkg.addon/*.c ${WRKSRC}/src/modules/extra
@@ -210,7 +198,4 @@ post-install:
 	${CHMOD} ${NONBINMODE} ${PREFIX}/libexec/cgi-bin/printenv \
 	  ${PREFIX}/libexec/cgi-bin/test-cgi
 
-.include "../../devel/libmm/buildlink3.mk"
-.include "../../textproc/expat/buildlink3.mk"
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/apache/distinfo b/www/apache/distinfo
index 307a14afc34..46aeea0cfb0 100644
--- a/www/apache/distinfo
+++ b/www/apache/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.31 2004/04/07 22:35:01 tron Exp $
+$NetBSD: distinfo,v 1.32 2004/04/26 20:06:58 jlam Exp $
 
 SHA1 (apache_1.3.29.tar.gz) = 0fb055dfd8c86457996edb36f19fb66f09dccd6a
 Size (apache_1.3.29.tar.gz) = 2435809 bytes
@@ -23,3 +23,4 @@ SHA1 (patch-ao) = 5930f9ea0f5080b260a6e0c66a37c6d1ad0df4d4
 SHA1 (patch-ap) = 3dfa2396d481aca2b746d02cb2b161bd956825f8
 SHA1 (patch-aq) = 80032eadbbb546df8eac7fe08800a784c06a06f0
 SHA1 (patch-ar) = b422847735a9a4821cfa8ba8e2e7639ce1605b39
+SHA1 (patch-as) = b81faf1a0addede23a63c1334e47633d3dba38fa
diff --git a/www/apache/patches/patch-as b/www/apache/patches/patch-as
new file mode 100644
index 00000000000..00c39ba9059
--- /dev/null
+++ b/www/apache/patches/patch-as
@@ -0,0 +1,16 @@
+$NetBSD: patch-as,v 1.3 2004/04/26 20:06:58 jlam Exp $
+
+--- src/modules/standard/mod_auth_db.c.orig	Mon Feb  3 12:13:27 2003
++++ src/modules/standard/mod_auth_db.c
+@@ -170,7 +170,10 @@ static char *get_db_pw(request_rec *r, c
+     q.data = user;
+     q.size = strlen(q.data);
+ 
+-#if defined(DB3) || defined(DB4)
++#if defined(DB4)
++    if (   db_create(&f, NULL, 0) != 0 
++        || f->open(f, NULL, auth_dbpwfile, NULL, DB_HASH, DB_RDONLY, 0664) != 0) {
++#elif defined(DB3)
+     if (   db_create(&f, NULL, 0) != 0 
+         || f->open(f, auth_dbpwfile, NULL, DB_HASH, DB_RDONLY, 0664) != 0) {
+ #elif defined(DB2)