tech-pkg archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[PATCH] nvi supports db4



Contrary to comments in the pkgsrc Makefile, nvi supports db4
just fine.  It does need a trivial patch for 4.4 though.

Any objection to this?  Seems safe enough even for the freeze.

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/editors/nvi/Makefile,v
retrieving revision 1.30
diff -a -u -r1.30 Makefile
--- Makefile    15 Apr 2008 13:46:01 -0000      1.30
+++ Makefile    21 Dec 2008 00:50:05 -0000
@@ -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"
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/editors/nvi/distinfo,v
retrieving revision 1.9
diff -a -u -r1.9 distinfo
--- distinfo    15 Apr 2008 11:58:12 -0000      1.9
+++ distinfo    21 Dec 2008 00:50:05 -0000
@@ -3,3 +3,4 @@
 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
Index: patches/patch-aa
===================================================================
RCS file: patches/patch-aa
diff -N patches/patch-aa
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-aa    21 Dec 2008 00:50:05 -0000
@@ -0,0 +1,19 @@
+$NetBSD$
+
+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


Home | Main Index | Thread Index | Old Index