[pkgsrc/trunk]: pkgsrc/devel/apr db4, a new dependency for apr, is broken (at...

[jklos <jklos%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3e71a382f647
branches:  trunk
changeset: 466216:3e71a382f647
user:      jklos <jklos%pkgsrc.org@localhost>
date:      Tue Jan 13 10:09:18 2004 +0000

description:
db4, a new dependency for apr, is broken (at least on ppc). Revert back to
not needing db4 until it is fixed.

diffstat:

 devel/apr/Makefile      |  5 ++---
 devel/apr/buildlink2.mk |  3 +--
 2 files changed, 3 insertions(+), 5 deletions(-)

diffs (42 lines):

diff -r 546e8b14642f -r 3e71a382f647 devel/apr/Makefile
--- a/devel/apr/Makefile        Tue Jan 13 09:53:35 2004 +0000
+++ b/devel/apr/Makefile        Tue Jan 13 10:09:18 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2003/12/03 15:30:26 epg Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/13 10:09:18 jklos Exp $
 
 PKGNAME=       apr-${APR_VERSION}.${APACHE_VERSION}
 PKGREVISION=   1
@@ -35,7 +35,7 @@
        @cd ${WRKSRC}/apr-util && ${SETENV} ${CONFIGURE_ENV} ./configure \
                --prefix=${PREFIX} \
                --with-apr=${WRKSRC}/apr \
-               --with-berkeley-db=${BUILDLINK_PREFIX.db4}/include:${LOCALBASE} \
+               --with-dbm=sdbm \
                --with-expat=${BUILDLINK_PREFIX.expat}
 
 post-install:
@@ -44,6 +44,5 @@
 
 .include "../../www/apache2/Makefile.common"
 
-.include "../../databases/db4/buildlink2.mk"
 .include "../../textproc/expat/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 546e8b14642f -r 3e71a382f647 devel/apr/buildlink2.mk
--- a/devel/apr/buildlink2.mk   Tue Jan 13 09:53:35 2004 +0000
+++ b/devel/apr/buildlink2.mk   Tue Jan 13 10:09:18 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.5 2003/12/03 15:30:26 epg Exp $
+# $NetBSD: buildlink2.mk,v 1.6 2004/01/13 10:09:32 jklos Exp $
 #
 
 .if !defined(APR_BUILDLINK2_MK)
@@ -19,7 +19,6 @@
 BUILDLINK_FILES.apr+=  lib/libapr-0.*
 BUILDLINK_FILES.apr+=  lib/libaprutil-0.*
 
-.include "../../databases/db4/buildlink2.mk"
 .include "../../textproc/expat/buildlink2.mk"
 
 BUILDLINK_TARGETS+=    apr-buildlink