summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjklos <jklos@pkgsrc.org>2004-01-13 10:09:18 +0000
committerjklos <jklos@pkgsrc.org>2004-01-13 10:09:18 +0000
commit027455378aeb142963ae7ba77487a147bee00fa1 (patch)
treeceea936bb1b4044601d0e302cfcbdb51ecce9600
parent49262175f6a8c014bb180a15f79a7eaafbe7ae8b (diff)
downloadpkgsrc-027455378aeb142963ae7ba77487a147bee00fa1.tar.gz
db4, a new dependency for apr, is broken (at least on ppc). Revert back to
not needing db4 until it is fixed.
-rw-r--r--devel/apr/Makefile5
-rw-r--r--devel/apr/buildlink2.mk3
2 files changed, 3 insertions, 5 deletions
diff --git a/devel/apr/Makefile b/devel/apr/Makefile
index ac0e450b604..41910b5746c 100644
--- a/devel/apr/Makefile
+++ b/devel/apr/Makefile
@@ -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 @@ do-configure:
@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 @@ post-install:
.include "../../www/apache2/Makefile.common"
-.include "../../databases/db4/buildlink2.mk"
.include "../../textproc/expat/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/apr/buildlink2.mk b/devel/apr/buildlink2.mk
index bb6da6cfba2..ca1bf4fe1f6 100644
--- a/devel/apr/buildlink2.mk
+++ b/devel/apr/buildlink2.mk
@@ -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/aprutil.exp
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