2 files changed, 36 insertions, 0 deletions

diff --git a/editors/nvi-devel/files/patch-configure-incl b/editors/nvi-devel/files/patch-configure-incl
new file mode 100644
index 000000000000..475f48c03463
--- /dev/null
+++ b/editors/nvi-devel/files/patch-configure-incl
@@ -0,0 +1,17 @@
+# The db3 port installs its include files into ${PREFIX}/include/db3,
+# but the distfile assumes they're in ${PREFIX}/include.  This seems
+# to be a FreeBSDism, so this patch has not, and probably should not,
+# be submitted to the maintainer.
+
+diff -ru nvi-1.81.4.orig/dist/configure nvi-1.81.4/dist/configure
+--- nvi-1.81.4.orig/dist/configure	Mon Jun 18 14:24:37 2001
++++ nvi-1.81.4/dist/configure	Fri Jul  6 03:27:53 2001
+@@ -6980,7 +6980,7 @@
+ saveLDFLAGS="$LDFLAGS"
+ if test "x$with_db3" != "x"; then
+ 	LDFLAGS="-L$with_db3/lib $LDFLAGS"
+-	CFLAGS="-I$with_db3/include $CFLAGS"
++	CFLAGS="-I$with_db3/include -I$with_db3/include/db3 $CFLAGS"
+ fi;
+ 
+ echo $ac_n "checking for db_create in -ldb""... $ac_c" 1>&6
diff --git a/editors/nvi-devel/files/patch-lr-num b/editors/nvi-devel/files/patch-lr-num
new file mode 100644
index 000000000000..acad5ed93860
--- /dev/null
+++ b/editors/nvi-devel/files/patch-lr-num
@@ -0,0 +1,19 @@
+# This fixes an infinite loop in the case of:
+#
+#	:set leftright
+#	:set number
+#
+# See PR 28687.  Patch has been submitted to maintainer.
+
+diff -ru nvi-1.81.4.orig/vi/vs_refresh.c nvi-1.81.4/vi/vs_refresh.c
+--- nvi-1.81.4.orig/vi/vs_refresh.c	Wed Jul 19 10:05:20 2000
++++ nvi-1.81.4/vi/vs_refresh.c	Sat Jul  7 16:11:51 2001
+@@ -573,7 +573,7 @@
+ 		 * for the number option offset.
+ 		 */
+ 		cnt = vs_columns(sp, NULL, LNO, &CNO, NULL);
+-		if (O_ISSET(sp, O_NUMBER))
++		if (O_ISSET(sp, O_NUMBER) && cnt >= O_NUMBER_LENGTH)
+ 			cnt -= O_NUMBER_LENGTH;
+ 
+ 		/* Adjust the window towards the beginning of the line. */