8 files changed, 15 insertions, 39 deletions
diff --git a/usr.bin/vi/build/Makefile b/usr.bin/vi/build/Makefile
index febec358cd1..e2a77b578dd 100644
--- a/usr.bin/vi/build/Makefile
+++ b/usr.bin/vi/build/Makefile
@@ -1,13 +1,13 @@
-#	$OpenBSD: Makefile,v 1.10 1997/09/24 21:31:56 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.11 1998/07/24 00:07:34 millert Exp $
 #	@(#)Makefile.in	8.75 (Berkeley) 10/23/96
 
 CFLAGS+=-I${.CURDIR} -I${.CURDIR}/../include
-LDADD+=-lcurses -ltermlib
-DPADD+= ${LIBCURSES} ${LIBTERMLIB}
+LDADD+=-lcurses
+DPADD+= ${LIBCURSES}
 
-#CFLAGS+=-I${.CURDIR} -I${.CURDIR}/../include -DUSE_OCURSES
-#LDADD+= -locurses -ltermcap
-#DPADD+= ${LIBOCURSES} ${LIBTERM}
+#CFLAGS+=-I${.CURDIR} -I${.CURDIR}/../include -D_USE_OLD_CURSES_
+#LDADD+= -locurses
+#DPADD+= ${LIBOLDCURSES}
 PROG=	vi
 
 SRCS=	cl_bsd.c cl_funcs.c cl_main.c cl_read.c cl_screen.c cl_term.c \
diff --git a/usr.bin/vi/build/config.h b/usr.bin/vi/build/config.h
index 51fbe30c783..82aab2abab1 100644
--- a/usr.bin/vi/build/config.h
+++ b/usr.bin/vi/build/config.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: config.h,v 1.6 1997/09/23 07:12:42 downsj Exp $	*/
+/*	$OpenBSD: config.h,v 1.7 1998/07/24 00:07:35 millert Exp $	*/
 /* config.h.  Generated automatically by configure.  */
 /* config.h.in.  Generated automatically from configure.in by autoheader.  */
 
@@ -52,7 +52,7 @@
 /* #undef HAVE_BROKEN_VDISABLE */
 
 /* Define if you have a BSD version of curses. */
-#ifdef USE_OCURSES
+#ifdef _USE_OLD_CURSES_
 #define HAVE_BSD_CURSES 1
 #endif
 
@@ -60,12 +60,12 @@
 #define HAVE_CURSES_ADDNSTR 1
 
 /* Define if you have the curses(3) beep function. */
-#ifndef USE_OCURSES
+#ifndef _USE_OLD_CURSES_
 #define HAVE_CURSES_BEEP 1
 #endif
 
 /* Define if you have the curses(3) flash function. */
-#ifndef USE_OCURSES
+#ifndef _USE_OLD_CURSES_
 #define HAVE_CURSES_FLASH 1
 #endif
 
@@ -73,22 +73,22 @@
 #define HAVE_CURSES_IDLOK 1
 
 /* Define if you have the curses(3) keypad function. */
-#ifndef USE_OCURSES
+#ifndef _USE_OLD_CURSES_
 #define HAVE_CURSES_KEYPAD 1
 #endif
 
 /* Define if you have the curses(3) newterm function. */
-#ifndef USE_OCURSES
+#ifndef _USE_OLD_CURSES_
 #define HAVE_CURSES_NEWTERM 1
 #endif
 
 /* Define if you have the curses(3) setupterm function. */
-#ifndef USE_OCURSES
+#ifndef _USE_OLD_CURSES_
 #define HAVE_CURSES_SETUPTERM 1
 #endif
 
 /* Define if you have the curses(3) tigetstr/tigetnum functions. */
-#ifndef USE_OCURSES
+#ifndef _USE_OLD_CURSES_
 #define HAVE_CURSES_TIGETSTR 1
 #endif
 
diff --git a/usr.bin/vi/cl/cl_bsd.c b/usr.bin/vi/cl/cl_bsd.c
index b1d454556ee..4a06a54af2f 100644
--- a/usr.bin/vi/cl/cl_bsd.c
+++ b/usr.bin/vi/cl/cl_bsd.c
@@ -17,11 +17,7 @@ static const char sccsid[] = "@(#)cl_bsd.c	8.29 (Berkeley) 7/1/96";
 
 #include <bitstring.h>
 #include <ctype.h>
-#ifdef USE_OCURSES
-#include <ocurses.h>
-#else
 #include <curses.h>
-#endif
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/usr.bin/vi/cl/cl_funcs.c b/usr.bin/vi/cl/cl_funcs.c
index 1f27417a624..40315ee85e8 100644
--- a/usr.bin/vi/cl/cl_funcs.c
+++ b/usr.bin/vi/cl/cl_funcs.c
@@ -19,11 +19,7 @@ static const char sccsid[] = "@(#)cl_funcs.c	10.50 (Berkeley) 9/24/96";
 
 #include <bitstring.h>
 #include <ctype.h>
-#ifdef USE_OCURSES
-#include <ocurses.h>
-#else
 #include <curses.h>
-#endif
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/usr.bin/vi/cl/cl_main.c b/usr.bin/vi/cl/cl_main.c
index a5f0668b7c8..43381d1fb7f 100644
--- a/usr.bin/vi/cl/cl_main.c
+++ b/usr.bin/vi/cl/cl_main.c
@@ -19,11 +19,7 @@ static const char sccsid[] = "@(#)cl_main.c	10.36 (Berkeley) 10/14/96";
 #include <bitstring.h>
 #include <errno.h>
 #include <fcntl.h>
-#ifdef USE_OCURSES
-#include <ocurses.h>
-#else
 #include <curses.h>
-#endif
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/usr.bin/vi/cl/cl_read.c b/usr.bin/vi/cl/cl_read.c
index cdae2a09951..d71e03f8c5e 100644
--- a/usr.bin/vi/cl/cl_read.c
+++ b/usr.bin/vi/cl/cl_read.c
@@ -23,11 +23,7 @@ static const char sccsid[] = "@(#)cl_read.c	10.15 (Berkeley) 9/24/96";
 #include <bitstring.h>
 #include <errno.h>
 #include <fcntl.h>
-#ifdef USE_OCURSES
-#include <ocurses.h>
-#else
 #include <curses.h>
-#endif
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/usr.bin/vi/cl/cl_screen.c b/usr.bin/vi/cl/cl_screen.c
index 4788be6d042..23e74be812c 100644
--- a/usr.bin/vi/cl/cl_screen.c
+++ b/usr.bin/vi/cl/cl_screen.c
@@ -18,11 +18,7 @@ static const char sccsid[] = "@(#)cl_screen.c	10.49 (Berkeley) 9/24/96";
 
 #include <bitstring.h>
 #include <errno.h>
-#ifdef USE_OCURSES
-#include <ocurses.h>
-#else
 #include <curses.h>
-#endif
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/usr.bin/vi/cl/cl_term.c b/usr.bin/vi/cl/cl_term.c
index a86b9924b00..7d7661f870f 100644
--- a/usr.bin/vi/cl/cl_term.c
+++ b/usr.bin/vi/cl/cl_term.c
@@ -21,11 +21,7 @@ static const char sccsid[] = "@(#)cl_term.c	10.22 (Berkeley) 9/15/96";
 #include <bitstring.h>
 #include <errno.h>
 #include <limits.h>
-#ifdef USE_OCURSES
-#include <ocurses.h>
-#else
 #include <curses.h>
-#endif
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -451,7 +447,7 @@ noterm:	if (row == 0)
 	return (0);
 }
 
-#ifdef USE_OCURSES
+#ifdef _USE_OLD_CURSES_
 /*
  * cl_putchar --
  *	Function version of putchar, for tputs.