socsvn commit: r224181 - soc2011/zy/nvi-iconv/head/usr.bin/vi

[zy at FreeBSD.org]

Author: zy
Date: Wed Jul 13 13:32:28 2011
New Revision: 224181
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=224181

Log:
  Make nvi2 compilable from usr.bin/vi

Modified:
  soc2011/zy/nvi-iconv/head/usr.bin/vi/Makefile
  soc2011/zy/nvi-iconv/head/usr.bin/vi/config.h

Modified: soc2011/zy/nvi-iconv/head/usr.bin/vi/Makefile
==============================================================================
--- soc2011/zy/nvi-iconv/head/usr.bin/vi/Makefile	Wed Jul 13 13:24:40 2011	(r224180)
+++ soc2011/zy/nvi-iconv/head/usr.bin/vi/Makefile	Wed Jul 13 13:32:28 2011	(r224181)
@@ -2,9 +2,10 @@
 # $FreeBSD$
 #
 
-SRCDIR=		${.CURDIR}/../../contrib/nvi
+SRCDIR=		${.CURDIR}/../../contrib/nvi2
 
 CFLAGS+=	-DGTAGS
+#CFLAGS+=	-DUSE_WIDECHAR -DUSE_ICONV
 
 #if using ncurses:
 CFLAGS+=	-DSYSV_CURSES
@@ -21,7 +22,7 @@
 LINKS+= ${BINDIR}/${VI} ${BINDIR}/vi ${BINDIR}/${EX} ${BINDIR}/ex
 LINKS+= ${BINDIR}/${VI} ${BINDIR}/view
 
-MAN=	${SRCDIR}/docs/USD.doc/vi.man/vi.1
+MAN=	${SRCDIR}/../nvi/docs/USD.doc/vi.man/vi.1
 MLINKS+=vi.1 ex.1 vi.1 view.1
 MLINKS+=vi.1 nex.1 vi.1 nview.1 vi.1 nvi.1
 
@@ -51,8 +52,8 @@
 SRCS+=	cl_bsd.c cl_funcs.c cl_main.c cl_read.c cl_screen.c cl_term.c
 
 # General sources.
-SRCS+=	cut.c delete.c exf.c key.c line.c log.c main.c mark.c msg.c options.c \
-	options_f.c put.c screen.c search.c seq.c recover.c util.c
+SRCS+=	cut.c conv.c delete.c exf.c key.c line.c log.c main.c mark.c msg.c \
+	options.c options_f.c put.c screen.c search.c seq.c recover.c util.c
 
 # Ex source.
 SRCS+=	ex.c ex_abbrev.c ex_append.c ex_args.c ex_argv.c ex_at.c ex_bang.c \
@@ -75,7 +76,7 @@
 # Vi screen source.
 SRCS+=	vs_line.c vs_msg.c vs_refresh.c vs_relative.c vs_smap.c vs_split.c
 
-FILES=	${CATALOGS:S;^;${SRCDIR}/catalog/;}
+FILES=	${CATALOGS:S;^;${SRCDIR}/../nvi/catalog/;}
 FILESDIR= /usr/share/vi/catalog
 SYMLINKS=
 .for l in ${NLLINKS}

Modified: soc2011/zy/nvi-iconv/head/usr.bin/vi/config.h
==============================================================================
--- soc2011/zy/nvi-iconv/head/usr.bin/vi/config.h	Wed Jul 13 13:24:40 2011	(r224180)
+++ soc2011/zy/nvi-iconv/head/usr.bin/vi/config.h	Wed Jul 13 13:32:28 2011	(r224181)
@@ -58,6 +58,7 @@
 
 /* Define if you have the curses(3) addnstr function. */
 #define HAVE_CURSES_ADDNSTR 1
+#define HAVE_CURSES_WADDNSTR 1
 
 /* Define if you have the curses(3) beep function. */
 #ifdef SYSV_CURSES
@@ -188,8 +189,5 @@
 /* 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