diff options
Diffstat (limited to 'app-editors/nvi/files/nvi-1.81.6-db44.patch')
| -rw-r--r-- | app-editors/nvi/files/nvi-1.81.6-db44.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/app-editors/nvi/files/nvi-1.81.6-db44.patch b/app-editors/nvi/files/nvi-1.81.6-db44.patch new file mode 100644 index 000000000000..f081a2d28bea --- /dev/null +++ b/app-editors/nvi/files/nvi-1.81.6-db44.patch @@ -0,0 +1,29 @@ + + First part is from http://cvsweb.se.netbsd.org/cgi-bin/bsdweb.cgi/pkgsrc/editors/nvi/patches/patch-aa?rev=1.3;content-type=text/plain + +--- common/db.h 2012-08-27 06:55:01.000000000 -0400 ++++ common/db.h 2012-08-27 07:17:48.000000000 -0400 +@@ -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) || DB_VERSION_MAJOR > 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 +--- common/msg.c ++++ common/msg.c +@@ -724,7 +724,8 @@ + p = buf; + } else + p = file; +- if ((sp->db_error = db_create(&db, 0, 0)) != 0 || ++ if (access(p, R_OK) != 0 || ++ (sp->db_error = db_create(&db, 0, 0)) != 0 || + (sp->db_error = db->set_re_source(db, p)) != 0 || + (sp->db_error = db_open(db, NULL, DB_RECNO, 0, 0)) != 0) { + if (first) { |