ncurses 4.1 + changes to work with our terminfo libs (instead of

the ncurses ones).  Changes are #ifdef EXTERN_TERMINFO.
Post 4.1 patches will be applied in a separate commit.

1 files changed, 20 insertions, 15 deletions

diff --git a/lib/libcurses/Makefile b/lib/libcurses/Makefile
index 4fa8bbb35f9..c213254d71b 100644
--- a/lib/libcurses/Makefile
+++ b/lib/libcurses/Makefile
@@ -1,17 +1,19 @@
-#	$OpenBSD: Makefile,v 1.14 1997/04/27 20:56:09 millert Exp $
+#	$OpenBSD: Makefile,v 1.15 1997/11/26 04:01:04 millert Exp $
 
 LIB=    curses
-SRCS=	hardscroll.c lib_acs.c lib_delch.c lib_insstr.c lib_options.c \
-	lib_set_term.c lib_addch.c lib_delwin.c lib_instr.c lib_overlay.c \
-	lib_slk.c lib_addstr.c lib_doupdate.c lib_isendwin.c lib_pad.c \
-	lib_touch.c lib_beep.c lib_endwin.c lib_kernel.c lib_printw.c \
-	lib_tstp.c lib_bkgd.c lib_erase.c lib_longname.c lib_raw.c \
-	lib_twait.c lib_box.c lib_getch.c lib_mouse.c lib_refresh.c \
-	lib_unctrl.c lib_clear.c lib_getstr.c lib_move.c lib_resize.c \
-	lib_vidattr.c lib_clrbot.c lib_inchstr.c lib_mvcur.c lib_scanw.c \
-	lib_window.c lib_clreol.c lib_initscr.c lib_mvwin.c lib_screen.c \
-	lib_color.c lib_insch.c lib_newterm.c lib_scroll.c lib_data.c \
-	lib_insdel.c lib_keyname.c lib_newwin.c lib_scrreg.c lib_gen.c
+SRCS=	hardscroll.c hashmap.c lib_acs.c lib_addch.c lib_addstr.c \
+	lib_baudrate.c lib_beep.c lib_bkgd.c lib_box.c lib_clear.c \
+	lib_clrbot.c lib_clreol.c lib_color.c lib_data.c lib_delch.c \
+	lib_delwin.c lib_dft_fgbg.c lib_doupdate.c lib_endwin.c lib_erase.c \
+	lib_getch.c lib_getstr.c lib_inchstr.c lib_initscr.c lib_insch.c \
+	lib_insdel.c lib_insstr.c lib_instr.c lib_isendwin.c lib_kernel.c \
+	lib_longname.c lib_mouse.c lib_move.c lib_mvcur.c lib_mvwin.c \
+	lib_newterm.c lib_newwin.c lib_options.c lib_overlay.c lib_pad.c \
+	lib_print.c lib_printw.c lib_raw.c lib_refresh.c lib_scanw.c \
+	lib_screen.c lib_scroll.c lib_scrreg.c lib_set_term.c lib_slk.c \
+	lib_touch.c lib_tstp.c lib_twait.c lib_vidattr.c lib_window.c \
+	resizeterm.c unctrl.c wresize.c
+SRCS+=	expanded.c lib_gen.c lib_keyname.c
 CFLAGS+= -I. -I${.CURDIR} -DTERMIOS -DEXTERN_TERMINFO
 LDADD+=  -ltermlib
 MAN=	curs_addch.3 curs_addchstr.3 curs_addstr.3 curs_attr.3 curs_beep.3 \
@@ -19,11 +21,11 @@ MAN=	curs_addch.3 curs_addchstr.3 curs_addstr.3 curs_attr.3 curs_beep.3 \
 	curs_deleteln.3 curs_getch.3 curs_getstr.3 curs_getyx.3 curs_inch.3 \
 	curs_inchstr.3 curs_initscr.3 curs_inopts.3 curs_insch.3 curs_insstr.3 \
 	curs_instr.3 curs_kernel.3 curs_mouse.3 curs_move.3 curs_outopts.3 \
-	curs_overlay.3 curs_pad.3 curs_printw.3 curs_refresh.3 curs_resize.3 \
+	curs_overlay.3 curs_pad.3 curs_print.3 curs_printw.3 curs_refresh.3 \
 	curs_scanw.3 curs_scr_dmp.3 curs_scroll.3 curs_slk.3 curs_termattrs.3 \
-	curs_touch.3 curs_util.3 curs_window.3 curses.3
+	curs_touch.3 curs_util.3 curs_window.3 curses.3 wresize.3
 MLINKS+=curses.3 ncurses.3
-CLEANFILES+= lib_gen.c lib_keyname.c keys.tries
+CLEANFILES+= lib_gen.c lib_keyname.c keys.tries expanded.c
 
 beforedepend: keys.tries
 
@@ -45,6 +47,9 @@ lib_keyname.c: ${.CURDIR}/keys.list ${.CURDIR}/MKkeyname.awk
 lib_gen.c: ${.CURDIR}/curses.h ${.CURDIR}/MKlib_gen.sh
 	sh ${.CURDIR}/MKlib_gen.sh "${CPP}" "awk" < ${.CURDIR}/curses.h > lib_gen.c
 
+expanded.c: ${.CURDIR}/curses.h ${.CURDIR}/MKexpanded.sh
+	sh ${.CURDIR}/MKexpanded.sh "${CPP}" ${CPPFLAGS}
+
 .include <bsd.lib.mk>
 
 lib_options.o lib_options.so lib_options.po lib_options.ln: keys.tries