Fix "DB_CREATE must be specified to create databases." message with recent db, and make translations work

Package-Manager: portage-2.2_rc19/cvs/Linux 2.6.28-gentoo x86_64

8 files changed, 29 insertions, 633 deletions

diff --git a/app-editors/nvi/files/nvi-1.81.5-build.patch b/app-editors/nvi/files/nvi-1.81.5-build.patch
deleted file mode 100644
index 76a4fc1053a6..000000000000
--- a/app-editors/nvi/files/nvi-1.81.5-build.patch
+++ /dev/null
@@ -1,126 +0,0 @@
---- nvi-1.81.5/dist/Makefile.am
-+++ nvi-1.81.5/dist/Makefile.am
-@@ -270,33 +270,16 @@
- install-exec-local:
- 	cd $(DESTDIR)$(bindir) && $(rm) -f `echo ex | sed '$(transform)'`
- 	cd $(DESTDIR)$(bindir) && $(rm) -f `echo view | sed '$(transform)'`
--	cd $(DESTDIR)$(bindir) && $(ln) \
-+	cd $(DESTDIR)$(bindir) && $(ln) -s \
- 		`echo vi | sed '$(transform)'` `echo ex | sed '$(transform)'`
--	cd $(DESTDIR)$(bindir) && $(ln) \
-+	cd $(DESTDIR)$(bindir) && $(ln) -s \
- 		`echo vi | sed '$(transform)'` `echo view | sed '$(transform)'`
- 
- install-data-local: install_common
- 	@[ -d $(DESTDIR)$(mandir) ] || \
- 	    ($(mkdir) $(DESTDIR)$(mandir) && \
- 	     $(chmod) $(dmode) $(DESTDIR)$(mandir))
--	@[ -d $(DESTDIR)$(mandir)/cat1 ] || \
--	    ($(mkdir) $(DESTDIR)$(mandir)/cat1 && \
--	     $(chmod) $(dmode) $(DESTDIR)$(mandir)/cat1)
- 	@echo "Installing man pages: $(DESTDIR)$(mandir) ..."
--	@cd $(DESTDIR)$(mandir)/cat1 && \
--	    $(rm) -f `echo vi.0 | sed '$(transform)'`
--	@$(cp) $(visrcdir)/docs/vi.man/vi.0 \
--	    $(DESTDIR)$(mandir)/cat1/`echo vi.0 | sed '$(transform)'`
--	@cd $(DESTDIR)$(mandir)/cat1 && \
--	    $(chmod) $(fmode) `echo vi.0 | sed '$(transform)'`
--	@cd $(DESTDIR)$(mandir)/cat1 && \
--	    $(rm) -f `echo ex.0 | sed '$(transform)'`
--	@cd $(DESTDIR)$(mandir)/cat1 && \
--	    $(rm) -f `echo view.0 | sed '$(transform)'`
--	@cd $(DESTDIR)$(mandir)/cat1 && $(ln) \
--	    `echo vi.0 | sed '$(transform)'` `echo ex.0 | sed '$(transform)'`
--	@cd $(DESTDIR)$(mandir)/cat1 && $(ln) \
--	    `echo vi.0 | sed '$(transform)'` `echo view.0 | sed '$(transform)'`
- 	@[ -d $(DESTDIR)$(mandir)/man1 ] || \
- 	    ($(mkdir) $(DESTDIR)$(mandir)/man1 && \
- 	     $(chmod) $(dmode) $(DESTDIR)$(mandir)/man1)
-@@ -310,9 +293,9 @@
- 	    $(rm) -f `echo ex.1 | sed '$(transform)'`
- 	@cd $(DESTDIR)$(mandir)/man1 && \
- 	    $(rm) -f `echo view.1 | sed '$(transform)'`
--	@cd $(DESTDIR)$(mandir)/man1 && $(ln) \
-+	@cd $(DESTDIR)$(mandir)/man1 && $(ln) -s \
- 	    `echo vi.1 | sed '$(transform)'` `echo ex.1 | sed '$(transform)'`
--	@cd $(DESTDIR)$(mandir)/man1 && $(ln) \
-+	@cd $(DESTDIR)$(mandir)/man1 && $(ln) -s \
- 	    `echo vi.1 | sed '$(transform)'` `echo view.1 | sed '$(transform)'`
- 
- cat=	dutch english french german ru_SU.KOI8-R spanish swedish
-@@ -363,12 +346,6 @@
- 	$(rm) -rf $(DESTDIR)$(datadir)/vi
- 	cd $(DESTDIR)$(bindir) && $(rm) -f `echo ex | sed '$(transform)'`
- 	cd $(DESTDIR)$(bindir) && $(rm) -f `echo view | sed '$(transform)'`
--	cd $(DESTDIR)$(mandir)/cat1 && \
--	    $(rm) -f `echo ex.0 | sed '$(transform)'`
--	cd $(DESTDIR)$(mandir)/cat1 && \
--	    $(rm) -f `echo vi.0 | sed '$(transform)'`
--	cd $(DESTDIR)$(mandir)/cat1 && \
--	    $(rm) -f `echo view.0 | sed '$(transform)'`
- 	cd $(DESTDIR)$(mandir)/man1 && \
- 	    $(rm) -f `echo ex.1 | sed '$(transform)'`
- 	cd $(DESTDIR)$(mandir)/man1 && \
---- nvi-1.81.5/dist/Makefile.in
-+++ nvi-1.81.5/dist/Makefile.in
-@@ -2556,33 +2556,16 @@
- install-exec-local:
- 	cd $(DESTDIR)$(bindir) && $(rm) -f `echo ex | sed '$(transform)'`
- 	cd $(DESTDIR)$(bindir) && $(rm) -f `echo view | sed '$(transform)'`
--	cd $(DESTDIR)$(bindir) && $(ln) \
-+	cd $(DESTDIR)$(bindir) && $(ln) -s \
- 		`echo vi | sed '$(transform)'` `echo ex | sed '$(transform)'`
--	cd $(DESTDIR)$(bindir) && $(ln) \
-+	cd $(DESTDIR)$(bindir) && $(ln) -s \
- 		`echo vi | sed '$(transform)'` `echo view | sed '$(transform)'`
- 
- install-data-local: install_common
- 	@[ -d $(DESTDIR)$(mandir) ] || \
- 	    ($(mkdir) $(DESTDIR)$(mandir) && \
- 	     $(chmod) $(dmode) $(DESTDIR)$(mandir))
--	@[ -d $(DESTDIR)$(mandir)/cat1 ] || \
--	    ($(mkdir) $(DESTDIR)$(mandir)/cat1 && \
--	     $(chmod) $(dmode) $(DESTDIR)$(mandir)/cat1)
- 	@echo "Installing man pages: $(DESTDIR)$(mandir) ..."
--	@cd $(DESTDIR)$(mandir)/cat1 && \
--	    $(rm) -f `echo vi.0 | sed '$(transform)'`
--	@$(cp) $(visrcdir)/docs/vi.man/vi.0 \
--	    $(DESTDIR)$(mandir)/cat1/`echo vi.0 | sed '$(transform)'`
--	@cd $(DESTDIR)$(mandir)/cat1 && \
--	    $(chmod) $(fmode) `echo vi.0 | sed '$(transform)'`
--	@cd $(DESTDIR)$(mandir)/cat1 && \
--	    $(rm) -f `echo ex.0 | sed '$(transform)'`
--	@cd $(DESTDIR)$(mandir)/cat1 && \
--	    $(rm) -f `echo view.0 | sed '$(transform)'`
--	@cd $(DESTDIR)$(mandir)/cat1 && $(ln) \
--	    `echo vi.0 | sed '$(transform)'` `echo ex.0 | sed '$(transform)'`
--	@cd $(DESTDIR)$(mandir)/cat1 && $(ln) \
--	    `echo vi.0 | sed '$(transform)'` `echo view.0 | sed '$(transform)'`
- 	@[ -d $(DESTDIR)$(mandir)/man1 ] || \
- 	    ($(mkdir) $(DESTDIR)$(mandir)/man1 && \
- 	     $(chmod) $(dmode) $(DESTDIR)$(mandir)/man1)
-@@ -2596,9 +2579,9 @@
- 	    $(rm) -f `echo ex.1 | sed '$(transform)'`
- 	@cd $(DESTDIR)$(mandir)/man1 && \
- 	    $(rm) -f `echo view.1 | sed '$(transform)'`
--	@cd $(DESTDIR)$(mandir)/man1 && $(ln) \
-+	@cd $(DESTDIR)$(mandir)/man1 && $(ln) -s \
- 	    `echo vi.1 | sed '$(transform)'` `echo ex.1 | sed '$(transform)'`
--	@cd $(DESTDIR)$(mandir)/man1 && $(ln) \
-+	@cd $(DESTDIR)$(mandir)/man1 && $(ln) -s \
- 	    `echo vi.1 | sed '$(transform)'` `echo view.1 | sed '$(transform)'`
- install_common:
- 	@[ -f $(chmod) ] || (echo 'chmod not found.'; exit 1)
-@@ -2647,12 +2630,6 @@
- 	$(rm) -rf $(DESTDIR)$(datadir)/vi
- 	cd $(DESTDIR)$(bindir) && $(rm) -f `echo ex | sed '$(transform)'`
- 	cd $(DESTDIR)$(bindir) && $(rm) -f `echo view | sed '$(transform)'`
--	cd $(DESTDIR)$(mandir)/cat1 && \
--	    $(rm) -f `echo ex.0 | sed '$(transform)'`
--	cd $(DESTDIR)$(mandir)/cat1 && \
--	    $(rm) -f `echo vi.0 | sed '$(transform)'`
--	cd $(DESTDIR)$(mandir)/cat1 && \
--	    $(rm) -f `echo view.0 | sed '$(transform)'`
- 	cd $(DESTDIR)$(mandir)/man1 && \
- 	    $(rm) -f `echo ex.1 | sed '$(transform)'`
- 	cd $(DESTDIR)$(mandir)/man1 && \
diff --git a/app-editors/nvi/files/nvi-1.81.5-db4.patch b/app-editors/nvi/files/nvi-1.81.5-db4.patch
deleted file mode 100644
index 18e25d59abd2..000000000000
--- a/app-editors/nvi/files/nvi-1.81.5-db4.patch
+++ /dev/null
@@ -1,190 +0,0 @@
---- nvi-1.81.5/dist/configure.in
-+++ nvi-1.81.5/dist/configure.in
-@@ -922,11 +922,14 @@
- 	CFLAGS="-I$with_db3/include $CFLAGS"
- fi;
- 
-+saveLIBS="$LIBS"
-+LIBS="$LIBS -ldb"
--AC_CHECK_LIB(db, db_create,
-+AC_TRY_LINK([#include <db.h>], [db_create(0, 0, 0)],
- 	[vi_cv_dbfatal="no"], [vi_cv_dbfatal="yes"])
- if test "$vi_cv_dbfatal" = "yes"; then
--	AC_MSG_ERROR([Need DB 3.])
-+	AC_MSG_ERROR([Need DB 4.])
- fi
-+LIBS="$saveLIBS"
- 
- LDFLAGS="$saveLDFLAGS"
- 
---- nvi-1.81.5/dist/configure
-+++ nvi-1.81.5/dist/configure
-@@ -10679,56 +10679,36 @@
- 	CFLAGS="-I$with_db3/include $CFLAGS"
- fi;
- 
--echo $ac_n "checking for db_create in -ldb""... $ac_c" 1>&6
--echo "configure:10684: checking for db_create in -ldb" >&5
--ac_lib_var=`echo db'_'db_create | sed 'y%./+-%__p_%'`
--if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
--else
--  ac_save_LIBS="$LIBS"
--LIBS="-ldb  $LIBS"
-+saveLIBS="$LIBS"
-+LIBS="$LIBS -ldb"
- cat > conftest.$ac_ext <<EOF
--#line 10692 "configure"
-+#line 10686 "configure"
- #include "confdefs.h"
--/* Override any gcc2 internal prototype to avoid an error.  */
--/* We use char because int might match the return type of a gcc2
--    builtin and then its argument prototype would still apply.  */
--char db_create();
--
-+#include <db.h>
- int main() {
--db_create()
-+db_create(0, 0, 0)
- ; return 0; }
- EOF
--if { (eval echo configure:10703: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:10693: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
--  eval "ac_cv_lib_$ac_lib_var=yes"
-+  vi_cv_dbfatal="no"
- else
-   echo "configure: failed program was:" >&5
-   cat conftest.$ac_ext >&5
-   rm -rf conftest*
--  eval "ac_cv_lib_$ac_lib_var=no"
-+  vi_cv_dbfatal="yes"
- fi
- rm -f conftest*
--LIBS="$ac_save_LIBS"
--
--fi
--if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
--  vi_cv_dbfatal="no"
--else
--  echo "$ac_t""no" 1>&6
--vi_cv_dbfatal="yes"
--fi
--
- if test "$vi_cv_dbfatal" = "yes"; then
--	{ echo "configure: error: Need DB 3." 1>&2; exit 1; }
-+	{ echo "configure: error: Need DB 4." 1>&2; exit 1; }
- fi
-+LIBS="$saveLIBS"
- 
- LDFLAGS="$saveLDFLAGS"
- 
- 
- echo $ac_n "checking if --enable-dynamic-loading option specified""... $ac_c" 1>&6
--echo "configure:10732: checking if --enable-dynamic-loading option specified" >&5
-+echo "configure:10712: checking if --enable-dynamic-loading option specified" >&5
- # Check whether --enable-dynamic-loading or --disable-dynamic-loading was given.
- if test "${enable_dynamic_loading+set}" = set; then
-   enableval="$enable_dynamic_loading"
-@@ -10740,7 +10720,7 @@
- echo "$ac_t""$vi_cv_dl" 1>&6
- if test "$vi_cv_dl" = yes; then
- 	echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
--echo "configure:10744: checking for dlopen in -ldl" >&5
-+echo "configure:10724: checking for dlopen in -ldl" >&5
- ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -10748,7 +10728,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-ldl  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 10752 "configure"
-+#line 10732 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -10759,7 +10739,7 @@
- dlopen()
- ; return 0; }
- EOF
--if { (eval echo configure:10763: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:10743: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -10789,7 +10769,7 @@
- 	# Extract the first word of "libdb-3.so", so it can be a program name with args.
- set dummy libdb-3.so; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:10793: checking for $ac_word" >&5
-+echo "configure:10773: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_path_vi_cv_path_db3'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -10843,7 +10823,7 @@
- 
- 
- echo $ac_n "checking if --disable-re option specified""... $ac_c" 1>&6
--echo "configure:10847: checking if --disable-re option specified" >&5
-+echo "configure:10827: checking if --disable-re option specified" >&5
- # Check whether --enable-re or --disable-re was given.
- if test "${enable_re+set}" = set; then
-   enableval="$enable_re"
---- nvi-1.81.5/common/db.c
-+++ nvi-1.81.5/common/db.c
-@@ -175,7 +175,7 @@
- 	data.ulen = ep->c_blen;
- 	data.flags = DB_DBT_USERMEM;
- 	switch (ep->db->get(ep->db, NULL, &key, &data, 0)) {
--	case ENOMEM:
-+	case DB_BUFFER_SMALL:
- 		nlen = data.size;
- 		goto retry;
-         default:
---- nvi-1.81.5/common/db.h
-+++ nvi-1.81.5/common/db.h
-@@ -1,5 +1,9 @@
- #include <db.h>
- 
-+#ifndef DB_BUFFER_SMALL
-+#define DB_BUFFER_SMALL ENOMEM
-+#endif
-+
- #ifdef USE_DYNAMIC_LOADING
- #define db_create   	nvi_db_create
- #define db_env_create   nvi_db_env_create
---- nvi-1.81.5/common/exf.c
-+++ nvi-1.81.5/common/exf.c
-@@ -282,7 +282,7 @@
- #define NOMMAPIFFCNTL 0
- #endif
- 
--	if ((sp->db_error = ep->db->open(ep->db, ep->rcv_path, NULL, DB_RECNO, 
-+	if ((sp->db_error = ep->db->open(ep->db, NULL, ep->rcv_path, NULL, DB_RECNO, 
- 	    ((rcv_name == 0) ? DB_TRUNCATE : 0) | VI_DB_THREAD | NOMMAPIFFCNTL,
- 	    S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)) != 0) {
- 		msgq_str(sp,
---- nvi-1.81.5/common/log.c
-+++ nvi-1.81.5/common/log.c
-@@ -108,7 +108,7 @@
- 	ep->l_high = ep->l_cur = 1;
- 
- 	if (db_create(&ep->log, sp->gp->env, 0) != 0 ||
--	    ep->log->open(ep->log, NULL, NULL, DB_RECNO, 
-+	    ep->log->open(ep->log, NULL, NULL, NULL, DB_RECNO, 
- 			  DB_CREATE | VI_DB_THREAD, S_IRUSR | S_IWUSR) != 0) {
- 		msgq(sp, M_SYSERR, "009|Log file");
- 		F_SET(ep, F_NOLOG);
---- nvi-1.81.5/common/msg.c
-+++ nvi-1.81.5/common/msg.c
-@@ -721,7 +721,7 @@
- 		p = file;
- 	if ((sp->db_error = db_create(&db, sp->gp->env, 0)) != 0 ||
- 	    (sp->db_error = db->set_re_source(db, p)) != 0 ||
--	    (sp->db_error = db->open(db, NULL, NULL, DB_RECNO, 0, 0)) != 0) {
-+	    (sp->db_error = db->open(db, NULL, NULL, NULL, DB_RECNO, 0, 0)) != 0) {
- 		if (first) {
- 			first = 0;
- 			return (1);
diff --git a/app-editors/nvi/files/nvi-1.81.5-gcc4.patch b/app-editors/nvi/files/nvi-1.81.5-gcc4.patch
deleted file mode 100644
index 2e7d0f85a06e..000000000000
--- a/app-editors/nvi/files/nvi-1.81.5-gcc4.patch
+++ /dev/null
@@ -1,172 +0,0 @@
---- nvi-1.81.5/cl/cl_funcs.c
-+++ nvi-1.81.5/cl/cl_funcs.c
-@@ -381,7 +381,7 @@
- 
- 	    if (CLSP(discardp)) {
- 		    delwin(CLSP(discardp));
--		    CLSP(discardp) = NULL;
-+		    discardp->cl_private = NULL;
- 	    }
- 	}
- 
-@@ -395,7 +395,7 @@
- 
- 		if (CLSP(tsp))
- 			delwin(CLSP(tsp));
--		CLSP(tsp) = subwin(stdscr, tsp->rows, tsp->cols,
-+		tsp->cl_private = subwin(stdscr, tsp->rows, tsp->cols,
- 					   tsp->roff, tsp->coff);
- 	}
- 
-@@ -716,9 +716,9 @@
- 	if (CLSP(origp))
- 		delwin(CLSP(origp));
- 
--	CLSP(origp) = subwin(stdscr, origp->rows, origp->cols,
-+	origp->cl_private = subwin(stdscr, origp->rows, origp->cols,
- 				     origp->roff, origp->coff);
--	CLSP(newp) = subwin(stdscr, newp->rows, newp->cols,
-+	newp->cl_private = subwin(stdscr, newp->rows, newp->cols,
- 				     newp->roff, newp->coff);
- 
- 	/* origp is the original screen, giving up space to newp. */
---- nvi-1.81.5/cl/cl_screen.c
-+++ nvi-1.81.5/cl/cl_screen.c
-@@ -56,7 +56,7 @@
- 	if (F_ISSET(gp, G_SRESTART)) {
- 		if (CLSP(sp)) {
- 		    delwin(CLSP(sp));
--		    CLSP(sp) = NULL;
-+		    sp->cl_private = NULL;
- 		}
- 		if (cl_quit(gp))
- 			return (1);
---- nvi-1.81.5/common/db.c
-+++ nvi-1.81.5/common/db.c
-@@ -94,6 +94,7 @@
- 	CHAR_T *wp;
- 	size_t wlen;
- 	size_t nlen;
-+	char *c_lp;
- 
- 	/*
- 	 * The underlying recno stuff handles zero by returning NULL, but
-@@ -164,7 +165,9 @@
- 	nlen = 1024;
- retry:
- 	/* data.size contains length in bytes */
--	BINC_GOTO(sp, (char *)ep->c_lp, ep->c_blen, nlen);
-+	c_lp = (char *) ep->c_lp;
-+	BINC_GOTO(sp, c_lp, ep->c_blen, nlen);
-+	ep->c_lp = (CHAR_T *) c_lp;
- 
- 	/* Get the line from the underlying database. */
- 	memset(&key, 0, sizeof(key));
---- nvi-1.81.5/common/key.c
-+++ nvi-1.81.5/common/key.c
-@@ -829,11 +829,14 @@
- {
- 	WIN *wp;
- 	size_t new_nelem, olen;
-+	char *i_event;
- 
- 	wp = sp->wp;
- 	new_nelem = wp->i_nelem + add;
- 	olen = wp->i_nelem * sizeof(wp->i_event[0]);
--	BINC_RET(sp, (char *)wp->i_event, olen, new_nelem * sizeof(wp->i_event[0]));
-+	i_event = (char *) wp->i_event;
-+	BINC_RET(sp, i_event, olen, new_nelem * sizeof(wp->i_event[0]));
-+	wp->i_event = (EVENT *) i_event;
- 	wp->i_nelem = olen / sizeof(wp->i_event[0]);
- 	return (0);
- }
---- nvi-1.81.5/common/mem.h
-+++ nvi-1.81.5/common/mem.h
-@@ -25,9 +25,10 @@
- 		lp = L__bincp;						\
- 	}								\
- }
--#define	BINC_GOTOW(sp, lp, llen, nlen) {					\
--	CHAR_T *L__bp = lp;						\
--	BINC_GOTO(sp, (char *)lp, llen, (nlen) * sizeof(CHAR_T))    	\
-+#define	BINC_GOTOW(sp, lp, llen, nlen) {				\
-+	char *L__bp = (char *) lp;					\
-+	BINC_GOTO(sp, L__bp, llen, (nlen) * sizeof(CHAR_T))		\
-+	lp = (CHAR_T *) L__bp;						\
- }
- #define	BINC_RET(sp, lp, llen, nlen) {					\
- 	char *L__p = lp;						\
-@@ -43,8 +44,9 @@
- 	}								\
- }
- #define	BINC_RETW(sp, lp, llen, nlen) {					\
--	CHAR_T *L__bp = lp;						\
--	BINC_RET(sp, (char *)lp, llen, (nlen) * sizeof(CHAR_T))	    	\
-+	char *L__bp = (char *) lp;					\
-+	BINC_RET(sp, L__bp, llen, (nlen) * sizeof(CHAR_T)) 	   	\
-+	lp = (CHAR_T *) L__bp;						\
- }
- 
- /*
-@@ -66,8 +68,9 @@
- 	}								\
- }
- #define	GET_SPACE_GOTOW(sp, bp, blen, nlen) {				\
--	CHAR_T *L__bp = bp;						\
--	GET_SPACE_GOTO(sp, (char *)bp, blen, (nlen) * sizeof(CHAR_T))	\
-+	char *L__bp = (char *) bp;					\
-+	GET_SPACE_GOTO(sp, L__bp, blen, (nlen) * sizeof(CHAR_T))	\
-+	bp = (CHAR_T *) L__bp;						\
- }
- #define	GET_SPACE_RET(sp, bp, blen, nlen) {				\
- 	WIN *L__wp = (sp) == NULL ? NULL : (sp)->wp;			\
-@@ -83,8 +86,9 @@
- 	}								\
- }
- #define	GET_SPACE_RETW(sp, bp, blen, nlen) {				\
--	CHAR_T *L__bp = bp;						\
--	GET_SPACE_RET(sp, (char *)bp, blen, (nlen) * sizeof(CHAR_T))	\
-+	char *L__bp = (char *) bp;					\
-+	GET_SPACE_RET(sp, L__bp, blen, (nlen) * sizeof(CHAR_T))		\
-+	bp = (CHAR_T *) L__bp;						\
- }
- 
- /*
-@@ -103,8 +107,9 @@
- 		BINC_GOTO(sp, bp, blen, nlen);				\
- }
- #define	ADD_SPACE_GOTOW(sp, bp, blen, nlen) {				\
--	CHAR_T *L__bp = bp;						\
--	ADD_SPACE_GOTO(sp, (char *)bp, blen, (nlen) * sizeof(CHAR_T))	\
-+	char *L__bp = (char *) bp;					\
-+	ADD_SPACE_GOTO(sp, L__bp, blen, (nlen) * sizeof(CHAR_T))	\
-+	bp = (CHAR_T *) L__bp;						\
- }
- #define	ADD_SPACE_RET(sp, bp, blen, nlen) {				\
- 	WIN *L__wp = (sp) == NULL ? NULL : (sp)->wp;			\
-@@ -118,8 +123,9 @@
- 		BINC_RET(sp, bp, blen, nlen);				\
- }
- #define	ADD_SPACE_RETW(sp, bp, blen, nlen) {				\
--	CHAR_T *L__bp = bp;						\
--	ADD_SPACE_RET(sp, (char *)bp, blen, (nlen) * sizeof(CHAR_T))	\
-+	char *L__bp = (char *) bp;					\
-+	ADD_SPACE_RET(sp, L__bp, blen, (nlen) * sizeof(CHAR_T))		\
-+	bp = (CHAR_T *) L__bp;						\
- }
- 
- /* Free a GET_SPACE returned buffer. */
---- nvi-1.81.5/vi/v_txt.c
-+++ nvi-1.81.5/vi/v_txt.c
-@@ -589,8 +589,10 @@
- 
- 	/* Check to see if the character fits into the replay buffers. */
- 	if (LF_ISSET(TXT_RECORD)) {
--		BINC_GOTO(sp, (char *)vip->rep,
-+		char *rep = (char *) vip->rep;
-+		BINC_GOTO(sp, rep,
- 		    vip->rep_len, (rcol + 1) * sizeof(EVENT));
-+		vip->rep = (EVENT *) rep;
- 		vip->rep[rcol++] = *evp;
- 	}
- 
diff --git a/app-editors/nvi/files/nvi-1.81.5-header.patch b/app-editors/nvi/files/nvi-1.81.5-header.patch
deleted file mode 100644
index d80a9f613ccf..000000000000
--- a/app-editors/nvi/files/nvi-1.81.5-header.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- nvi-1.81.5/vi/v_at.c
-+++ nvi-1.81.5/vi/v_at.c
-@@ -21,6 +21,7 @@
- #include <ctype.h>
- #include <limits.h>
- #include <stdio.h>
-+#include <string.h>
- 
- #include "../common/common.h"
- #include "vi.h"
diff --git a/app-editors/nvi/files/nvi-1.81.5-tcsetattr.patch b/app-editors/nvi/files/nvi-1.81.5-tcsetattr.patch
deleted file mode 100644
index b22dfa0f4f6f..000000000000
--- a/app-editors/nvi/files/nvi-1.81.5-tcsetattr.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- cl/cl_screen.c.orig	2001-06-25 10:19:06.000000000 -0500
-+++ cl/cl_screen.c	2003-07-02 18:28:29.000000000 -0500
-@@ -369,6 +369,8 @@
- 
- fast:	/* Set the terminal modes. */
- 	if (tcsetattr(STDIN_FILENO, TCSASOFT | TCSADRAIN, &clp->vi_enter)) {
-+		if (EINTR == errno)
-+			goto fast;
- 		msgq(sp, M_SYSERR, "tcsetattr");
- err:		(void)cl_vi_end(sp->gp);
- 		return (1);
-@@ -485,6 +487,8 @@
- #endif
- 
- fast:	if (tcsetattr(STDIN_FILENO, TCSADRAIN | TCSASOFT, &clp->ex_enter)) {
-+		if (EINTR == errno)
-+			goto fast;
- 		msgq(sp, M_SYSERR, "tcsetattr");
- 		return (1);
- 	}
diff --git a/app-editors/nvi/files/nvi-1.81.5-wide-2.patch b/app-editors/nvi/files/nvi-1.81.5-wide-2.patch
deleted file mode 100644
index 7b63b46c4c3c..000000000000
--- a/app-editors/nvi/files/nvi-1.81.5-wide-2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Correctly check option strings, bug #171069
-
---- nvi-1.81.5/common/options.c
-+++ nvi-1.81.5/common/options.c
-@@ -1055,7 +1055,7 @@
- 			continue;
- 		if (op->name[0] > name[0])
- 			break;
--		if (!memcmp(op->name, name, len)) {
-+		if (!memcmp(op->name, name, len * sizeof(CHAR_T))) {
- 			if (found != NULL)
- 				return (NULL);
- 			found = op;
diff --git a/app-editors/nvi/files/nvi-1.81.5-wide.patch b/app-editors/nvi/files/nvi-1.81.5-wide.patch
deleted file mode 100644
index ebf3305fcbca..000000000000
--- a/app-editors/nvi/files/nvi-1.81.5-wide.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-Make sure nvi handles multibyte characters properly in more cases than
-before. Submitted by Karl Hakimian, http://bugs.gentoo.org/150169
-
---- nvi-1.81.5/common/multibyte.h
-+++ nvi-1.81.5/common/multibyte.h
-@@ -19,7 +19,12 @@
- #define STRCMP		wcscmp
- #define STRPBRK		wcspbrk
- #define TOUPPER		towupper
-+#define TOLOWER		towlower
-+#define ISUPPER		iswupper
-+#define ISLOWER		iswlower
- #define STRSET		wmemset
-+#define GETC		getwc
-+#define VI_EOF		WEOF
- 
- #define L(ch)		L ## ch
- 
-@@ -38,7 +43,12 @@
- #define STRCMP		strcmp
- #define STRPBRK		strpbrk
- #define TOUPPER		toupper
-+#define TOLOWER		tolower
-+#define ISUPPER		isupper
-+#define ISLOWER		islower
- #define STRSET		memset
-+#define GETC		getc
-+#define VI_EOF		EOF
- 
- #define L(ch)		ch
- 
---- nvi-1.81.5/ex/ex_subst.c
-+++ nvi-1.81.5/ex/ex_subst.c
-@@ -909,7 +909,7 @@
- 	}
- 	if (LF_ISSET(SEARCH_ICL)) {
- iclower:	for (p = ptrn, len = plen; len > 0; ++p, --len)
--			if (isupper(*p))
-+			if (ISUPPER(*p))
- 				break;
- 		if (len == 0)
- 			reflags |= REG_ICASE;
-@@ -1363,15 +1363,15 @@
- 			conv = C_NOTSET;				\
- 			/* FALLTHROUGH */				\
- 		case C_LOWER:						\
--			if (isupper(__ch))				\
-+			if (ISUPPER(__ch))				\
--				__ch = tolower(__ch);			\
-+				__ch = TOLOWER(__ch);			\
- 			break;						\
- 		case C_ONEUPPER:					\
- 			conv = C_NOTSET;				\
- 			/* FALLTHROUGH */				\
- 		case C_UPPER:						\
--			if (islower(__ch))				\
-+			if (ISLOWER(__ch))				\
--				__ch = toupper(__ch);			\
-+				__ch = TOUPPER(__ch);			\
- 			break;						\
- 		default:						\
- 			abort();					\
---- nvi-1.81.5/ex/ex_util.c
-+++ nvi-1.81.5/ex/ex_util.c
-@@ -67,7 +67,7 @@
- 			BINC_RETW(sp, exp->ibp, exp->ibp_len, off + 1);
- 			p = exp->ibp + off;
- 		}
--		if ((ch = getc(fp)) == EOF && !feof(fp)) {
-+		if ((ch = GETC(fp)) == VI_EOF && !feof(fp)) {
- 			if (errno == EINTR) {
- 				errno = 0;
- 				clearerr(fp);
-@@ -75,8 +75,8 @@
- 			}
- 			return (1);
- 		}
--		if (ch == EOF || ch == '\n') {
-+		if (ch == VI_EOF || ch == '\n') {
--			if (ch == EOF && !off)
-+			if (ch == VI_EOF && !off)
- 				return (1);
- 			*lenp = off;
- 			return (0);
---- nvi-1.81.5/vi/v_ulcase.c
-+++ nvi-1.81.5/vi/v_ulcase.c
-@@ -154,11 +154,11 @@
- 	change = rval = 0;
- 	for (p = bp + scno, t = bp + ecno + 1; p < t; ++p) {
- 		ch = *(u_char *)p;
--		if (islower(ch)) {
-+		if (ISLOWER(*p)) {
--			*p = toupper(ch);
-+			*p = TOUPPER(*p);
- 			change = 1;
--		} else if (isupper(ch)) {
-+		} else if (ISUPPER(*p)) {
--			*p = tolower(ch);
-+			*p = TOLOWER(*p);
- 			change = 1;
- 		}
- 	}
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..d247c02b9915
--- /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
++++ ../common/db.h
+@@ -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
+--- ../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) {