From 27522a4422d2dda1d8156af26e17065ac3b5156c Mon Sep 17 00:00:00 2001
From: obache <obache>
Date: Fri, 16 Jan 2009 12:31:51 +0000
Subject: Fixes configure option for bdb, now accept DB4. Bump PKGREVISION
 again. XXX: configure said, "Use of db1 is not officially supported." XXX: so
 not add db1 to BDB_ACCEPTED.

---
 editors/nvi/Makefile | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'editors')

diff --git a/editors/nvi/Makefile b/editors/nvi/Makefile
index cbac5a01db5..f5276e78234 100644
--- a/editors/nvi/Makefile
+++ b/editors/nvi/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.34 2008/12/31 20:48:37 epg Exp $
+# $NetBSD: Makefile,v 1.35 2009/01/16 12:31:51 obache Exp $
 #
 
 DISTNAME=	nvi-1.81.6
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	editors
 MASTER_SITES=	${HOMEPAGE}
 EXTRACT_SUFX=	.tar.bz2
@@ -21,7 +21,6 @@ USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 
 CONFIGURE_SCRIPT=	../dist/configure
-CONFIGURE_ARGS+=	--with-db3=${BUILDLINK_PREFIX.db3}
 CONFIGURE_ARGS+=	--program-transform-name='s,^,n,'
 CONFIGURE_ENV+=		vi_cv_path_shell=${TOOLS_SH:Q}
 
@@ -40,10 +39,11 @@ LDFLAGS+=		-flat_namespace
 INSTALL_UNSTRIPPED=	yes
 .endif
 
-# We need exactly the db3 API.
-# TODO: Actually nvi supports db4, but its configure script is broken.
-# Perhaps some brave soul can fix it...
-BUILDLINK_TRANSFORM+=	l:db:db3
-.include "../../databases/db3/buildlink3.mk"
-
+# Use of db1 is not officially supported.
+BDB_ACCEPTED=		db3 db4
+.include "../../mk/bdb.buildlink3.mk"
+.if ${BDB_TYPE} == "db1" || ${BDB_TYPE} == "db2"
+CONFIGURE_ARGS+=	--with-db_type=db1
+.endif
+CONFIGURE_ARGS+=	--with-db-prefix=${BDBBASE}
 .include "../../mk/bsd.pkg.mk"
-- 
cgit v1.2.3