[pkgsrc/trunk]: pkgsrc/editors/nvi - nvi actually supports db4, so just inclu...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ac503559634e
branches:  trunk
changeset: 551991:ac503559634e
user:      epg <epg%pkgsrc.org@localhost>
date:      Sun Dec 21 23:02:24 2008 +0000

description:
- nvi actually supports db4, so just include bdb.buildlink3.mk
- Add minor patch for db 4.4 and up

diffstat:

 editors/nvi/Makefile         |   7 ++-----
 editors/nvi/distinfo         |   3 ++-
 editors/nvi/patches/patch-aa |  19 +++++++++++++++++++
 3 files changed, 23 insertions(+), 6 deletions(-)

diffs (53 lines):

diff -r bcf7eb76636f -r ac503559634e editors/nvi/Makefile
--- a/editors/nvi/Makefile      Sun Dec 21 21:26:39 2008 +0000
+++ b/editors/nvi/Makefile      Sun Dec 21 23:02:24 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2008/04/15 13:46:01 schmonz Exp $
+# $NetBSD: Makefile,v 1.31 2008/12/21 23:02:24 epg Exp $
 #
 
 DISTNAME=      nvi-1.81.6
@@ -40,8 +40,5 @@
 INSTALL_UNSTRIPPED=    yes
 .endif
 
-# We need exactly the db3 API.
-BUILDLINK_TRANSFORM+=  l:db:db3
-.include "../../databases/db3/buildlink3.mk"
-
+.include "../../mk/bdb.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r bcf7eb76636f -r ac503559634e editors/nvi/distinfo
--- a/editors/nvi/distinfo      Sun Dec 21 21:26:39 2008 +0000
+++ b/editors/nvi/distinfo      Sun Dec 21 23:02:24 2008 +0000
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.9 2008/04/15 11:58:12 wiz Exp $
+$NetBSD: distinfo,v 1.10 2008/12/21 23:02:24 epg Exp $
 
 SHA1 (nvi-1.81.6.tar.bz2) = d3445ed69166102735335a2ff60d092d9a9143c6
 RMD160 (nvi-1.81.6.tar.bz2) = 0db8568bea96392d9a027044177c60317c8ade36
 Size (nvi-1.81.6.tar.bz2) = 1758309 bytes
+SHA1 (patch-aa) = 3dcd5033fd0d50a17dd3963640ae8f2aea2c8884
diff -r bcf7eb76636f -r ac503559634e editors/nvi/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/editors/nvi/patches/patch-aa      Sun Dec 21 23:02:24 2008 +0000
@@ -0,0 +1,19 @@
+$NetBSD: patch-aa,v 1.3 2008/12/21 23:02:24 epg Exp $
+
+BDB 4.4 and up requires DB_CREATE or it will spew "DB_CREATE must be
+specified to create databases." when nvi edits a file.
+
+--- ../common/db.h.orig        2007-11-18 16:41:42.000000000 +0000
++++ ../common/db.h     2008-12-21 00:18:11.000000000 +0000
+@@ -16,7 +16,10 @@
+     (env)->remove(env, path, NULL, flags)
+ #endif
+ 
+-#if DB_VERSION_MAJOR >= 4 && DB_VERSION_MINOR >= 1
++#if DB_VERSION_MAJOR >= 4 && DB_VERSION_MINOR >= 4
++#define db_open(db,file,type,flags,mode)                              \
++    (db)->open(db, NULL, file, NULL, type, flags | DB_CREATE, mode)
++#elif DB_VERSION_MAJOR >= 4 && DB_VERSION_MINOR >= 1
+ #define db_open(db,file,type,flags,mode)                              \
+     (db)->open(db, NULL, file, NULL, type, flags, mode)
+ #else