[pkgsrc/trunk]: pkgsrc/editors/nvi Fixes configure option for bdb, now accept...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/af0fc0b39fa7
branches:  trunk
changeset: 553149:af0fc0b39fa7
user:      obache <obache%pkgsrc.org@localhost>
date:      Fri Jan 16 12:31:51 2009 +0000

description:
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.

diffstat:

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

diffs (40 lines):

diff -r b71b0a37388b -r af0fc0b39fa7 editors/nvi/Makefile
--- a/editors/nvi/Makefile      Fri Jan 16 11:46:27 2009 +0000
+++ b/editors/nvi/Makefile      Fri Jan 16 12:31:51 2009 +0000
@@ -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 @@
 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 @@
 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"