[pkgsrc/trunk]: pkgsrc/devel/apr Link to db4.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3e54b0925a63
branches:  trunk
changeset: 464011:3e54b0925a63
user:      epg <epg%pkgsrc.org@localhost>
date:      Wed Dec 03 14:57:05 2003 +0000

description:
Link to db4.

diffstat:

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

diffs (51 lines):

diff -r 590e956c3d8d -r 3e54b0925a63 devel/apr/Makefile
--- a/devel/apr/Makefile        Wed Dec 03 13:30:15 2003 +0000
+++ b/devel/apr/Makefile        Wed Dec 03 14:57:05 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2003/11/28 10:01:10 junyoung Exp $
+# $NetBSD: Makefile,v 1.8 2003/12/03 14:57:05 epg Exp $
 
 PKGNAME=       apr-${APR_VERSION}.${APACHE_VERSION}
 CATEGORIES=    devel
@@ -17,7 +17,7 @@
 WRKSRC=                        ${WRKDIR}/${DISTNAME}/srclib
 BUILD_DIRS=            ${WRKSRC}/apr ${WRKSRC}/apr-util
 
-CONFIGURE_ENV+=                CFLAGS="${CFLAGS}"
+CONFIGURE_ENV+=                CFLAGS="${CFLAGS}" LIBS="${LDFLAGS}"
 
 pre-configure:
 .for f in apr/config.layout apr-util/config.layout
@@ -34,7 +34,7 @@
        @cd ${WRKSRC}/apr-util && ${SETENV} ${CONFIGURE_ENV} ./configure \
                --prefix=${PREFIX} \
                --with-apr=${WRKSRC}/apr \
-               --with-dbm=sdbm \
+               --with-berkeley-db=${BUILDLINK_PREFIX.db4}/include:${LOCALBASE} \
                --with-expat=${BUILDLINK_PREFIX.expat}
 
 post-install:
@@ -43,5 +43,6 @@
 
 .include "../../www/apache2/Makefile.common"
 
+.include "../../databases/db4/buildlink2.mk"
 .include "../../textproc/expat/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 590e956c3d8d -r 3e54b0925a63 devel/apr/buildlink2.mk
--- a/devel/apr/buildlink2.mk   Wed Dec 03 13:30:15 2003 +0000
+++ b/devel/apr/buildlink2.mk   Wed Dec 03 14:57:05 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.3 2003/07/09 08:09:04 itojun Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2003/12/03 14:57:05 epg Exp $
 #
 
 .if !defined(APR_BUILDLINK2_MK)
@@ -19,6 +19,7 @@
 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