diff options
| author | epg <epg@pkgsrc.org> | 2008-12-21 23:02:24 +0000 |
|---|---|---|
| committer | epg <epg@pkgsrc.org> | 2008-12-21 23:02:24 +0000 |
| commit | 6380b3347ac7239a375eb5b0ffcfec7898657c1b (patch) | |
| tree | 282b9e775092934eb30ccb371833dfc85e2c3039 | |
| parent | 038c1013c825a9439832055b0cb3872d42724ef9 (diff) | |
| download | pkgsrc-6380b3347ac7239a375eb5b0ffcfec7898657c1b.tar.gz | |
- nvi actually supports db4, so just include bdb.buildlink3.mk
- Add minor patch for db 4.4 and up
| -rw-r--r-- | editors/nvi/Makefile | 7 | ||||
| -rw-r--r-- | editors/nvi/distinfo | 3 | ||||
| -rw-r--r-- | editors/nvi/patches/patch-aa | 19 |
3 files changed, 23 insertions, 6 deletions
diff --git a/editors/nvi/Makefile b/editors/nvi/Makefile index 618ba98bcac..37c4b7646fc 100644 --- a/editors/nvi/Makefile +++ b/editors/nvi/Makefile @@ -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 @@ LDFLAGS+= -flat_namespace 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 --git a/editors/nvi/distinfo b/editors/nvi/distinfo index a3c60e1a869..5c97877f0eb 100644 --- a/editors/nvi/distinfo +++ b/editors/nvi/distinfo @@ -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 --git a/editors/nvi/patches/patch-aa b/editors/nvi/patches/patch-aa new file mode 100644 index 00000000000..508be3cbd70 --- /dev/null +++ b/editors/nvi/patches/patch-aa @@ -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 |