wip vi

5 files changed, 8 insertions, 6 deletions

diff --git a/src/vi/ex-070224/Makefile b/src/vi/ex-070224/Makefile
index 7fa7e5a..be2666a 100644
--- a/src/vi/ex-070224/Makefile
+++ b/src/vi/ex-070224/Makefile
@@ -130,7 +130,7 @@ INSTALL=/usr/bin/install
 #
 # If your system expands tabs to 4 spaces you should -DTABS=4 below
 #
-FEATURES	= -DLISPCODE -DCHDIR -DFASTTAG -DUCVISUAL -DBIT8
+FEATURES	= -DBIT8 -DMB -DLISPCODE -DCHDIR -DTABS=4 -DFASTTAG -DUCVISUAL
 
 #
 # This disables the LC_CTYPE locale settings and assumes all characters
@@ -190,7 +190,7 @@ OSTYPE	= -DVMUNIX
 # raises this limit to around 1 GB, but ex will consume much more of core
 # and temp file space then.
 #
-#LARGEF	= -DLARGEF
+LARGEF	= -DLARGEF
 
 # 
 # The next setting is a crucial one since it determines the way ex
@@ -211,7 +211,7 @@ OSTYPE	= -DVMUNIX
 # provide a good termcap file, or when setting the TERMCAP environment
 # variable is deemed sufficient, is the included 2.11BSD termcap library.
 #
-TERMLIB	= termlib
+TERMLIB	= ncurses
 
 #
 # Since ex uses sbrk() internally, a conflict with the libc's version of
diff --git a/src/vi/ex-070224/ex.h b/src/vi/ex-070224/ex.h
index b908bb8..c818157 100644
--- a/src/vi/ex-070224/ex.h
+++ b/src/vi/ex-070224/ex.h
@@ -207,6 +207,8 @@ typedef	int	bbloc;
 typedef	short	bbloc;
 #endif
 
+typedef char bool;
+
 /*
  * The editor does not normally use the standard i/o library.  Because
  * we expect the editor to be a heavily used program and because it
diff --git a/src/vi/ex-070224/ex_re.c b/src/vi/ex-070224/ex_re.c
index fb00c38..653a8bf 100644
--- a/src/vi/ex-070224/ex_re.c
+++ b/src/vi/ex-070224/ex_re.c
@@ -84,7 +84,7 @@ static char sccsid[] = "@(#)ex_re.c	1.60 (gritter) 8/6/05";
 
 #ifdef	UXRE
 
-#include <regex.h>
+#include "regex.h"
 
 char	*braslist[NBRA];
 char	*braelist[NBRA];
diff --git a/src/vi/ex-070224/libuxre/re.h b/src/vi/ex-070224/libuxre/re.h
index 2738a05..64df2d0 100644
--- a/src/vi/ex-070224/libuxre/re.h
+++ b/src/vi/ex-070224/libuxre/re.h
@@ -35,7 +35,7 @@
 /*	#define __fnm_collate	lc_collate	*/	/* <fnmatch.h> */
 
 #include <limits.h>
-#include <regex.h>
+#include "regex.h"
 /*	#include <fnmatch.h>	*/
 #include <colldata.h>
 
diff --git a/src/vi/setup.sh b/src/vi/setup.sh
index 34f7058..0a0ed5b 100755
--- a/src/vi/setup.sh
+++ b/src/vi/setup.sh
@@ -6,6 +6,6 @@ cd ex-070224
 sed -i -e "s,^PREFIX[ \t]*=.*,PREFIX=${HOME}/.local," Makefile
 sed -i -e "s,^INSTALL[ \t]*=.*,INSTALL=$(which install)," Makefile
 sed -i -e "s,^PRESERVEDIR[ \t]*=.*,PRESERVEDIR=/tmp/ex-preserve/," Makefile
-make TERMLIB=ncurses LDFLAGS=-ltinfo
+make TERMLIB=ncurses LDFLAGS+=-ltinfo
 make install