bring vi/ex up to 1.71

5 files changed, 86 insertions, 32 deletions

diff --git a/usr.bin/vi/build/Makefile b/usr.bin/vi/build/Makefile
index 2253b637980..8e9a75a3b3a 100644
--- a/usr.bin/vi/build/Makefile
+++ b/usr.bin/vi/build/Makefile
@@ -1,6 +1,6 @@
-#	$NetBSD: Makefile,v 1.2 1996/05/20 05:01:36 mrg Exp $
+#	$OpenBSD: Makefile,v 1.4 1996/07/24 16:15:02 mickey Exp $
 #
-# from: @(#)Makefile.in	8.56 (Berkeley) 5/18/96
+# From	@(#)Makefile.in	8.63 (Berkeley) 6/19/96
 
 CFLAGS+=-I${.CURDIR} -I${.CURDIR}/../include
 
diff --git a/usr.bin/vi/build/README b/usr.bin/vi/build/README
index b6e59e0c82d..2d0447faea2 100644
--- a/usr.bin/vi/build/README
+++ b/usr.bin/vi/build/README
@@ -1,4 +1,4 @@
-#	@(#)README	8.20 (Berkeley) 5/12/96
+#	@(#)README	8.24 (Berkeley) 6/20/96
 
 Nvi uses the GNU autoconf program for configuration and compilation.  You
 should enter:
@@ -8,25 +8,20 @@ should enter:
 
 and nvi will configure the system and build one or two binaries:  nvi and
 tknvi.  You can use any path to the configure script, e.g., to build for
-an x86 architecture, you might do:
+an x86 architecture, I suggest that you do:
 
 	mkdir build.x86
 	cd build.x86
 	../build/configure
 	make
 
-If you're only building nvi for a single architecture, you can just use
-the path ./configure, and build it in this directory.
-
 There are options that you can specify to the configure command.  See
 the next section for a description of these options.
 
 If you want to rebuild or reconfigure nvi, for example, because you change
-your mind as to the curses library that you want to use, enter:
-
-	make distclean
-
-and then reconfigure using "configure" and whatever options you choose.
+your mind as to the curses library that you want to use, create a new
+directory and reconfigure it using "configure" and whatever options you
+choose, don't try to selectively edit the files.
 
 By default, nvi is installed as "vi", with hard links to "ex" and "view".
 To install them using different names, use the configure program options.
@@ -36,6 +31,10 @@ For example, to install them as "nvi", "nex" and "nview", use:
 
 See the section below on installation for details.
 
+Note, if you're building nvi on a LynxOS system, you should read the
+README.LynxOS file in this directory for additional build instructions
+that are specific to that operating system.
+
 If you have trouble with this procedure, send email to the addresses
 listed in ../README.  In that email, please provide a complete script
 of the output for all of the above commands that you entered.
@@ -134,13 +133,21 @@ enable-tknvi:
 	see the next section of this README file for more information.
 
 =-=-=-=-=-=-=
-ADDING OR CHANGING COMPILE OR LOAD LINE FLAGS
+ADDING OR CHANGING COMPILERS, OR COMPILE OR LOAD LINE FLAGS
 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
+If you want to use a specific compiler, specify the CC environment
+variable before running configure.  For example:
+
+	env CC=gcc configure
+
+Using anything other than the native compiler will almost certainly
+mean that you'll want to check the compile and load line flags, too.
+
 If you want to specify additional load line flags, specify the ADDLDFLAGS
 environment variable before running configure.  For example:
 
-	env ADDLDFLAGS="-Q" ./configure
+	env ADDLDFLAGS="-Q" configure
 
 would specify the -Q flag in the load line when the nvi programs are
 loaded.
@@ -149,7 +156,7 @@ If you don't want configure to use the default load line flags for the
 system, specify the LDFLAGS environment variable before running configure.
 For example:
 
-	env LDFLAGS="-32" ./configure
+	env LDFLAGS="-32" configure
 
 will cause configure to set the load line flags to "-32", and not set
 them based on the current system.
@@ -157,7 +164,7 @@ them based on the current system.
 If you want to specify additional compile line flags, specify the
 ADDCPPFLAGS environment variable before running configure.  For example:
 
-	env ADDCPPFLAGS="-I../foo" ./configure
+	env ADDCPPFLAGS="-I../foo" configure
 
 would cause the compiler to be passed the -I../foo flag when compiling
 test programs during configuration as well as when building nvi object
@@ -167,7 +174,7 @@ If you don't want configure to use the default compile line flags for the
 system, specify the CPPFLAGS environment variable before running configure.
 For example:
 
-	env CPPFLAGS="-I.." ./configure
+	env CPPFLAGS="-I.." configure
 
 will cause configure to use "-I.." as the compile line flags instead of
 the default values.
@@ -183,7 +190,7 @@ they can be found.
 If you want to specify additional library paths, set the ADDLIBS environment
 variable before running configure.  For example:
 
-	env ADDLIBS="-L/a/b -L/e/f -ldb" ./configure
+	env ADDLIBS="-L/a/b -L/e/f -ldb" configure
 
 would specify two additional directories to search for libraries, /a/b
 and /e/f, and one additional library to load, "db".
@@ -191,7 +198,7 @@ and /e/f, and one additional library to load, "db".
 If you want to specify additional include paths, specify the ADDCPPFLAGS
 environment variable before running configure.  For example:
 
-	env ADDCPPFLAGS="-I/usr/local/include" LIBS="-ldb" ./configure
+	env ADDCPPFLAGS="-I/usr/local/include" LIBS="-ldb" configure
 
 would search /usr/local/include for include files, as well as load the db
 library as described above.
@@ -201,7 +208,7 @@ and you've built it in a directory named ncurses which is at the same
 level in the filesystem hierarchy as nvi.  You would enter something like:
 
 	env ADDCPPFLAGS="-I../../ncurses/include" \
-	    ADDLIBS="-L../../ncurses/libraries" ./configure
+	    ADDLIBS="-L../../ncurses/libraries" configure
 
 to cause nvi to look for the curses include files and the curses library
 in the ncurses environment.
@@ -248,12 +255,12 @@ Notes:
 	variables in your shell before running configure.  For example,
 	in sh or ksh, you could do:
 
-		ADDLIBS="-L/a/b -L/e/f -ldb" ./configure
+		ADDLIBS="-L/a/b -L/e/f -ldb" configure
 
 	and in csh or tcsh, you could do:
 
 		setenv ADDLIBS "-L/a/b -L/e/f -ldb"
-		./configure
+		configure
 
 	See your shell manual page for further information.
 
diff --git a/usr.bin/vi/build/config.h b/usr.bin/vi/build/config.h
index 3ca1a5a70dc..37b919a2af0 100644
--- a/usr.bin/vi/build/config.h
+++ b/usr.bin/vi/build/config.h
@@ -4,11 +4,8 @@
 /* Define to empty if the keyword does not work.  */
 /* #undef const */
 
-/* Define if you don't have vprintf but do have _doprnt.  */
-/* #undef HAVE_DOPRNT */
-
 /* Define if you have a working `mmap' system call.  */
-/* #define HAVE_MMAP 1 */
+#define HAVE_MMAP 1
 
 /* Define if your struct stat has st_blksize.  */
 #define HAVE_ST_BLKSIZE 1
@@ -16,9 +13,6 @@
 /* Define if you have <vfork.h>.  */
 /* #undef HAVE_VFORK_H */
 
-/* Define if you have the vprintf function.  */
-#define HAVE_VPRINTF 1
-
 /* Define to `int' if <sys/types.h> doesn't define.  */
 /* #undef mode_t */
 
@@ -42,7 +36,7 @@
 
 /* Define if your processor stores words with the most significant
    byte first (like Motorola and SPARC, unlike Intel and VAX).  */
-#define WORDS_BIGENDIAN 1
+/* #undef WORDS_BIGENDIAN */
 
 /* Define to `int' if <sys/types.h> doesn't define.  */
 /* #undef ssize_t */
@@ -119,20 +113,68 @@
 /* Define if your sprintf returns a pointer, not a length. */
 /* #undef SPRINTF_RET_CHARPNT */
 
+/* Define if you have the bsearch function.  */
+#define HAVE_BSEARCH 1
+
+/* Define if you have the gethostname function.  */
+#define HAVE_GETHOSTNAME 1
+
+/* Define if you have the getopt function.  */
+#define HAVE_GETOPT 1
+
 /* Define if you have the getpagesize function.  */
 #define HAVE_GETPAGESIZE 1
 
+/* Define if you have the memchr function.  */
+#define HAVE_MEMCHR 1
+
+/* Define if you have the memcpy function.  */
+#define HAVE_MEMCPY 1
+
+/* Define if you have the memmove function.  */
+#define HAVE_MEMMOVE 1
+
+/* Define if you have the memset function.  */
+#define HAVE_MEMSET 1
+
+/* Define if you have the mkstemp function.  */
+#define HAVE_MKSTEMP 1
+
+/* Define if you have the mmap function.  */
+#define HAVE_MMAP 1
+
 /* Define if you have the select function.  */
 #define HAVE_SELECT 1
 
 /* Define if you have the setenv function.  */
 #define HAVE_SETENV 1
 
+/* Define if you have the snprintf function.  */
+#define HAVE_SNPRINTF 1
+
+/* Define if you have the strdup function.  */
+#define HAVE_STRDUP 1
+
+/* Define if you have the strerror function.  */
+#define HAVE_STRERROR 1
+
+/* Define if you have the strpbrk function.  */
+#define HAVE_STRPBRK 1
+
 /* Define if you have the strsep function.  */
 #define HAVE_STRSEP 1
 
+/* Define if you have the strtol function.  */
+#define HAVE_STRTOL 1
+
+/* Define if you have the strtoul function.  */
+#define HAVE_STRTOUL 1
+
 /* Define if you have the unsetenv function.  */
 #define HAVE_UNSETENV 1
 
 /* Define if you have the valloc function.  */
 #define HAVE_VALLOC 1
+
+/* Define if you have the vsnprintf function.  */
+#define HAVE_VSNPRINTF 1
diff --git a/usr.bin/vi/build/pathnames.h b/usr.bin/vi/build/pathnames.h
index f2d5ec309bc..5a4f5a93856 100644
--- a/usr.bin/vi/build/pathnames.h
+++ b/usr.bin/vi/build/pathnames.h
@@ -1,4 +1,4 @@
-/* @(#)pathnames.h.in	8.3 (Berkeley) 4/22/96 */
+/* @(#)pathnames.h.in	8.4 (Berkeley) 6/26/96 */
 
 #ifndef	_PATH_BSHELL
 #define	_PATH_BSHELL	"/bin/sh"
diff --git a/usr.bin/vi/build/port.h b/usr.bin/vi/build/port.h
index ed7116f8543..21f16c93902 100644
--- a/usr.bin/vi/build/port.h
+++ b/usr.bin/vi/build/port.h
@@ -1,4 +1,4 @@
-/* @(#)port.h.in	8.12 (Berkeley) 5/16/96 */
+/* @(#)port.h.in	8.13 (Berkeley) 6/12/96 */
 
 /*
  * Declare the basic types, if they aren't already declared.  Named and
@@ -13,6 +13,11 @@
 
 #endif
 
+
+
+
+
+
 /*
  * XXX
  * Handle function prototypes.  This steps on name space that vi doesn't