Merge head

6 files changed, 272 insertions, 104 deletions

diff --git a/lib/ncurses/Makefile b/lib/ncurses/Makefile
index 05cd7a2..b363f64 100644
--- a/lib/ncurses/Makefile
+++ b/lib/ncurses/Makefile
@@ -1,6 +1,11 @@
 # $FreeBSD$
 
-SUBDIR=	ncurses form menu panel \
-	ncursesw formw menuw panelw
+.include <bsd.own.mk>
+
+SUBDIR=	ncurses form menu panel
+
+.if ${MK_NCURSESW} != "no"
+SUBDIR+=	ncursesw formw menuw panelw
+.endif
 
 .include <bsd.subdir.mk>
diff --git a/lib/ncurses/form/Makefile b/lib/ncurses/form/Makefile
index aa12242..dd903b0 100644
--- a/lib/ncurses/form/Makefile
+++ b/lib/ncurses/form/Makefile
@@ -84,6 +84,7 @@ MAN=	\
 	form_post.3 \
 	form_requestname.3 \
 	form_userptr.3 \
+	form_variables.3 \
 	form_win.3
 
 CLEANFILES+=	${MAN:M*.3}
@@ -157,7 +158,7 @@ MLINKS=	form_cursor.3 pos_form_cursor.3 \
 	form_win.3 set_form_sub.3 \
 	form_win.3 set_form_win.3
 .else
-NO_MAN=
+MAN=
 .endif
 
 .include <bsd.lib.mk>
diff --git a/lib/ncurses/menu/Makefile b/lib/ncurses/menu/Makefile
index 46bc023..3aac081 100644
--- a/lib/ncurses/menu/Makefile
+++ b/lib/ncurses/menu/Makefile
@@ -130,7 +130,7 @@ MLINKS=	menu_attributes.3 menu_back.3 \
 	mitem_value.3 set_item_value.3 \
 	mitem_visible.3 item_visible.3
 .else
-NO_MAN=
+MAN=
 .endif
 
 .include <bsd.lib.mk>
diff --git a/lib/ncurses/ncurses/Makefile b/lib/ncurses/ncurses/Makefile
index eb5e762..9cf3cc8 100644
--- a/lib/ncurses/ncurses/Makefile
+++ b/lib/ncurses/ncurses/Makefile
@@ -3,7 +3,8 @@
 SHLIBDIR?=	/lib
 
 .if !defined(ENABLE_WIDEC)
-NO_MAN=
+# Override any MAN= setting below..
+MK_MAN=no
 .endif
 
 .include <bsd.own.mk>
@@ -161,7 +162,6 @@ SRCS+=	\
 	lib_wattron.c \
 	lib_winch.c \
 	lib_window.c \
-	memmove.c \
 	nc_panel.c \
 	resizeterm.c \
 	safe_sprintf.c \
@@ -211,9 +211,9 @@ SRCS+=	\
 	lib_tputs.c \
 	lib_ttyflags.c \
 	name_match.c \
+	obsolete.c \
 	parse_entry.c \
 	read_entry.c \
-	setbuf.c \
 	strings.c \
 	trim_sgr0.c \
 	write_entry.c
@@ -391,14 +391,16 @@ build-tools: make_hash make_keys
 make_keys: make_keys.c names.c ncurses_def.h ${HEADERS}
 	${CC} -o $@ ${CFLAGS} ${NCURSES_DIR}/ncurses/tinfo/make_keys.c
 
-make_hash: comp_hash.c hashsize.h ncurses_def.h ${HEADERS}
+make_hash: make_hash.c hashsize.h ncurses_def.h ${HEADERS}
 	${CC} -o $@ ${CFLAGS} -DMAIN_PROGRAM \
-		${NCURSES_DIR}/ncurses/tinfo/comp_hash.c
+		${NCURSES_DIR}/ncurses/tinfo/make_hash.c
 
 # ./configure generated
 MKterm.h.awk: MKterm.h.awk.in
 	sed <${NCURSES_DIR}/include/MKterm.h.awk.in >$@ \
 	    -e "/@BROKEN_LINKER@/s%%${BROKEN_LINKER}%" \
+	    -e "s%@NCURSES_USE_DATABASE@%0%g" \
+	    -e "s%@NCURSES_USE_TERMCAP@%1%g" \
 	    -e "/@NCURSES_MAJOR@/s%%${NCURSES_MAJOR}%" \
 	    -e "/@NCURSES_MINOR@/s%%${NCURSES_MINOR}%" \
 	    -e "/@NCURSES_CONST@/s%%${NCURSES_CONST}%" \
@@ -417,6 +419,10 @@ termcap.h: termcap.h.in
 	    -e "/@NCURSES_CONST@/s%%${NCURSES_CONST}%" \
 	    -e "/@NCURSES_OSPEED@/s%%${NCURSES_OSPEED}%"
 
+ncurses_dll.h: ncurses_dll.h.in
+	sed <${NCURSES_DIR}/include/ncurses_dll.h.in >$@ \
+	    -e "s%@NCURSES_WRAP_PREFIX@%_nc_%g"
+
 curses.head: curses.h.in
 	sed <${NCURSES_DIR}/include/curses.h.in >$@ \
 	    -e "/@BROKEN_LINKER@/s%%${BROKEN_LINKER}%" \
@@ -441,6 +447,10 @@ curses.head: curses.h.in
 	    -e "/@NCURSES_WINT_T@/s%%${NCURSES_WINT_T}%" \
 	    -e "/@NEED_WCHAR_H@/s%%${NEED_WCHAR_H}%" \
 	    -e "/@USE_CXX_BOOL@/s%%${USE_CXX_BOOL}%" \
+	    -e "s%@NCURSES_SP_FUNCS@%0%g" \
+	    -e "s%@NCURSES_INTEROP_FUNCS@%0%g" \
+	    -e "s%@NCURSES_CCHARW_MAX@%5%g" \
+	    -e "s%@NCURSES_TPARM_ARG@%long%g" \
 	    -e "s%@cf_cv_1UL@%${ONEUL}%g" \
 	    -e "s%@cf_cv_builtin_bool@%${BUILTIN_BOOL}%g" \
 	    -e "s%@cf_cv_enable_lp64@%${ENABLE_LP64}%g" \
@@ -455,6 +465,7 @@ curses.head: curses.h.in
 
 unctrl.h: unctrl.h.in
 	sed <${NCURSES_DIR}/include/$@.in >$@ \
+	    -e "s%@NCURSES_SP_FUNCS@%0%g" \
 	    -e "/@NCURSES_MAJOR@/s%%${NCURSES_MAJOR}%" \
 	    -e "/@NCURSES_MINOR@/s%%${NCURSES_MINOR}%"
 
@@ -508,6 +519,7 @@ MAN=	\
 	curs_scr_dump.3 \
 	curs_scroll.3 \
 	curs_slk.3 \
+	curs_sp_funcs.3 \
 	curs_termattrs.3 \
 	curs_termcap.3 \
 	curs_terminfo.3 \
@@ -515,6 +527,7 @@ MAN=	\
 	curs_touch.3 \
 	curs_trace.3 \
 	curs_util.3 \
+	curs_variables.3 \
 	curs_window.3 \
 	default_colors.3 \
 	define_key.3 \
@@ -524,6 +537,7 @@ MAN=	\
 	legacy_coding.3 \
 	ncurses.3 \
 	resizeterm.3 \
+	term_variables.3 \
 	wresize.3
 
 MAN+=	\
@@ -538,12 +552,12 @@ MAN+=	\
 	curs_ins_wstr.3 \
 	curs_printw.3 \
 	curs_scanw.3
-.endif
-
-CLEANFILES+=	${MAN:M*.3}
 
 MAN+=	term.5 terminfo.5
 MAN+=	term.7
+.endif
+
+CLEANFILES+=	${MAN:M*.3}
 
 MLINKS=	ncurses.3 curses.3 \
 	curs_addch.3 addch.3 \
@@ -823,6 +837,123 @@ MLINKS=	ncurses.3 curses.3 \
 	curs_slk.3 slk_restore.3 \
 	curs_slk.3 slk_set.3 \
 	curs_slk.3 slk_touch.3 \
+	curs_sp_funcs.3 sp_funcs.3 \
+	curs_sp_funcs.3 assume_default_colors_sp.3 \
+	curs_sp_funcs.3 baudrate_sp.3 \
+	curs_sp_funcs.3 beep_sp.3 \
+	curs_sp_funcs.3 can_change_color_sp.3 \
+	curs_sp_funcs.3 cbreak_sp.3 \
+	curs_sp_funcs.3 ceiling_panel.3 \
+	curs_sp_funcs.3 color_content_sp.3 \
+	curs_sp_funcs.3 curs_set_sp.3 \
+	curs_sp_funcs.3 def_prog_mode_sp.3 \
+	curs_sp_funcs.3 def_shell_mode_sp.3 \
+	curs_sp_funcs.3 define_key_sp.3 \
+	curs_sp_funcs.3 del_curterm_sp.3 \
+	curs_sp_funcs.3 delay_output_sp.3 \
+	curs_sp_funcs.3 doupdate_sp.3 \
+	curs_sp_funcs.3 echo_sp.3 \
+	curs_sp_funcs.3 endwin_sp.3 \
+	curs_sp_funcs.3 erasechar_sp.3 \
+	curs_sp_funcs.3 filter_sp.3 \
+	curs_sp_funcs.3 flash_sp.3 \
+	curs_sp_funcs.3 flushinp_sp.3 \
+	curs_sp_funcs.3 get_escdelay_sp.3 \
+	curs_sp_funcs.3 getmouse_sp.3 \
+	curs_sp_funcs.3 getwin_sp.3 \
+	curs_sp_funcs.3 ground_panel.3 \
+	curs_sp_funcs.3 halfdelay_sp.3 \
+	curs_sp_funcs.3 has_colors_sp.3 \
+	curs_sp_funcs.3 has_ic_sp.3 \
+	curs_sp_funcs.3 has_il_sp.3 \
+	curs_sp_funcs.3 has_key_sp.3 \
+	curs_sp_funcs.3 has_mouse_sp.3 \
+	curs_sp_funcs.3 init_color_sp.3 \
+	curs_sp_funcs.3 init_pair_sp.3 \
+	curs_sp_funcs.3 intrflush_sp.3 \
+	curs_sp_funcs.3 is_term_resized_sp.3 \
+	curs_sp_funcs.3 isendwin_sp.3 \
+	curs_sp_funcs.3 key_defined_sp.3 \
+	curs_sp_funcs.3 keybound_sp.3 \
+	curs_sp_funcs.3 keyname_sp.3 \
+	curs_sp_funcs.3 keyok_sp.3 \
+	curs_sp_funcs.3 killchar_sp.3 \
+	curs_sp_funcs.3 mcprint_sp.3 \
+	curs_sp_funcs.3 mouseinterval_sp.3 \
+	curs_sp_funcs.3 mousemask_sp.3 \
+	curs_sp_funcs.3 mvcur_sp.3 \
+	curs_sp_funcs.3 napms_sp.3 \
+	curs_sp_funcs.3 new_form_sp.3 \
+	curs_sp_funcs.3 new_menu_sp.3 \
+	curs_sp_funcs.3 new_prescr.3 \
+	curs_sp_funcs.3 newpad_sp.3 \
+	curs_sp_funcs.3 newterm_sp.3 \
+	curs_sp_funcs.3 newwin_sp.3 \
+	curs_sp_funcs.3 nl_sp.3 \
+	curs_sp_funcs.3 nocbreak_sp.3 \
+	curs_sp_funcs.3 noecho_sp.3 \
+	curs_sp_funcs.3 nofilter_sp.3 \
+	curs_sp_funcs.3 nonl_sp.3 \
+	curs_sp_funcs.3 noqiflush_sp.3 \
+	curs_sp_funcs.3 noraw_sp.3 \
+	curs_sp_funcs.3 pair_content_sp.3 \
+	curs_sp_funcs.3 putp_sp.3 \
+	curs_sp_funcs.3 qiflush_sp.3 \
+	curs_sp_funcs.3 raw_sp.3 \
+	curs_sp_funcs.3 reset_prog_mode_sp.3 \
+	curs_sp_funcs.3 reset_shell_mode_sp.3 \
+	curs_sp_funcs.3 resetty_sp.3 \
+	curs_sp_funcs.3 resize_term_sp.3 \
+	curs_sp_funcs.3 resizeterm_sp.3 \
+	curs_sp_funcs.3 restartterm_sp.3 \
+	curs_sp_funcs.3 ripoffline_sp.3 \
+	curs_sp_funcs.3 savetty_sp.3 \
+	curs_sp_funcs.3 scr_init_sp.3 \
+	curs_sp_funcs.3 scr_restore_sp.3 \
+	curs_sp_funcs.3 scr_set_sp.3 \
+	curs_sp_funcs.3 set_curterm_sp.3 \
+	curs_sp_funcs.3 set_escdelay_sp.3 \
+	curs_sp_funcs.3 set_tabsize_sp.3 \
+	curs_sp_funcs.3 slk_attr_set_sp.3 \
+	curs_sp_funcs.3 slk_attr_sp.3 \
+	curs_sp_funcs.3 slk_attroff_sp.3 \
+	curs_sp_funcs.3 slk_attron_sp.3 \
+	curs_sp_funcs.3 slk_attrset_sp.3 \
+	curs_sp_funcs.3 slk_clear_sp.3 \
+	curs_sp_funcs.3 slk_color_sp.3 \
+	curs_sp_funcs.3 slk_init_sp.3 \
+	curs_sp_funcs.3 slk_label_sp.3 \
+	curs_sp_funcs.3 slk_noutrefresh_sp.3 \
+	curs_sp_funcs.3 slk_refresh_sp.3 \
+	curs_sp_funcs.3 slk_restore_sp.3 \
+	curs_sp_funcs.3 slk_set_sp.3 \
+	curs_sp_funcs.3 slk_touch_sp.3 \
+	curs_sp_funcs.3 start_color_sp.3 \
+	curs_sp_funcs.3 term_attrs_sp.3 \
+	curs_sp_funcs.3 termattrs_sp.3 \
+	curs_sp_funcs.3 termname_sp.3 \
+	curs_sp_funcs.3 tgetent_sp.3 \
+	curs_sp_funcs.3 tgetflag_sp.3 \
+	curs_sp_funcs.3 tgetnum_sp.3 \
+	curs_sp_funcs.3 tgetstr_sp.3 \
+	curs_sp_funcs.3 tigetflag_sp.3 \
+	curs_sp_funcs.3 tigetnum_sp.3 \
+	curs_sp_funcs.3 tigetstr_sp.3 \
+	curs_sp_funcs.3 tputs_sp.3 \
+	curs_sp_funcs.3 typeahead_sp.3 \
+	curs_sp_funcs.3 unctrl_sp.3 \
+	curs_sp_funcs.3 unget_wch_sp.3 \
+	curs_sp_funcs.3 ungetch_sp.3 \
+	curs_sp_funcs.3 ungetmouse_sp.3 \
+	curs_sp_funcs.3 update_panels_sp.3 \
+	curs_sp_funcs.3 use_default_colors_sp.3 \
+	curs_sp_funcs.3 use_env_sp.3 \
+	curs_sp_funcs.3 use_legacy_coding_sp.3 \
+	curs_sp_funcs.3 vid_attr_sp.3 \
+	curs_sp_funcs.3 vid_puts_sp.3 \
+	curs_sp_funcs.3 vidattr_sp.3 \
+	curs_sp_funcs.3 vidputs_sp.3 \
+	curs_sp_funcs.3 wunctrl_sp.3 \
 	curs_termattrs.3 baudrate.3 \
 	curs_termattrs.3 erasechar.3 \
 	curs_termattrs.3 erasewchar.3 \
diff --git a/lib/ncurses/ncurses/ncurses_cfg.h b/lib/ncurses/ncurses/ncurses_cfg.h
index 42570c9..9ca3a97 100644
--- a/lib/ncurses/ncurses/ncurses_cfg.h
+++ b/lib/ncurses/ncurses/ncurses_cfg.h
@@ -49,135 +49,166 @@
 #ifndef NC_CONFIG_H
 #define NC_CONFIG_H
 
-#ifdef __cplusplus
+#define SYSTEM_NAME "FreeBSD"
+#if 0
 #include <stdlib.h>
 #endif
+#define HAVE_LONG_FILE_NAMES 1
+#define MIXEDCASE_FILENAMES 1
+#define USE_SYSMOUSE 1
+#define HAVE_BIG_CORE 1
+#define TERMPATH "/etc/termcap:/usr/share/misc/termcap"
+#define USE_GETCAP 1
+#define HAVE_REMOVE 1
+#define HAVE_UNLINK 1
+#define HAVE_LINK 1
+#define HAVE_SYMLINK 1
+#define USE_LINKS 1
 #define BSD_TPUTS 1
-#define CC_HAS_PROTOS 1
-#define CPP_HAS_STATIC_CAST 1
-#define ETIP_NEEDS_MATH_H 1
-#define GCC_NORETURN __attribute__((noreturn))
-#define GCC_PRINTF 1
+#define HAVE_LANGINFO_CODESET 1
+#define HAVE_FSEEKO 1
+#define HAVE_ASSUME_DEFAULT_COLORS 1
+#define HAVE_CURSES_VERSION 1
+#define HAVE_HAS_KEY 1
+#define HAVE_RESIZETERM 1
+#define HAVE_RESIZE_TERM 1
+#define HAVE_TERM_ENTRY_H 1
+#define HAVE_USE_DEFAULT_COLORS 1
+#define HAVE_USE_SCREEN 1
+#define HAVE_USE_WINDOW 1
+#define HAVE_WRESIZE 1
+#define NCURSES_EXT_FUNCS 1
+#define NCURSES_NO_PADDING 1
+#define STDC_HEADERS 1
+#define HAVE_SYS_TYPES_H 1
+#define HAVE_SYS_STAT_H 1
+#define HAVE_STDLIB_H 1
+#define HAVE_STRING_H 1
+#define HAVE_MEMORY_H 1
+#define HAVE_STRINGS_H 1
+#define HAVE_INTTYPES_H 1
+#define HAVE_STDINT_H 1
+#define HAVE_UNISTD_H 1
+#define SIZEOF_SIGNED_CHAR 1
+#define USE_SIGWINCH 1
+#define USE_ASSUMED_COLOR 1
+#define USE_HASHMAP 1
+#define USE_COLORFGBG 1
+#define NCURSES_WRAP_PREFIX "_nc_"
 #define GCC_SCANF 1
+#define GCC_SCANFLIKE(fmt,var) __attribute__((format(scanf,fmt,var)))
+#define GCC_PRINTF 1
+#define GCC_PRINTFLIKE(fmt,var) __attribute__((format(printf,fmt,var)))
 #define GCC_UNUSED __attribute__((unused))
-#define HAVE_BIG_CORE 1
-#define HAVE_BSD_CGETENT 1
-#define HAVE_CURSES_VERSION 1
+#define GCC_NORETURN __attribute__((noreturn))
+#define HAVE_NC_ALLOC_H 1
+#define HAVE_GETTIMEOFDAY 1
+#define STDC_HEADERS 1
 #define HAVE_DIRENT_H 1
-#define HAVE_ERRNO 1
+#define TIME_WITH_SYS_TIME 1
+#define HAVE_REGEX_H_FUNCS 1
 #define HAVE_FCNTL_H 1
-#define HAVE_FORM_H 1
-#define HAVE_FSEEKO 1
+#define HAVE_GETOPT_H 1
+#define HAVE_LIMITS_H 1
+#define HAVE_LOCALE_H 1
+#define HAVE_MATH_H 1
+#define HAVE_POLL_H 1
+#define HAVE_SYS_IOCTL_H 1
+#define HAVE_SYS_PARAM_H 1
+#define HAVE_SYS_POLL_H 1
+#define HAVE_SYS_SELECT_H 1
+#define HAVE_SYS_TIME_H 1
+#define HAVE_SYS_TIMES_H 1
+#define HAVE_TTYENT_H 1
+#define HAVE_UNISTD_H 1
+#define HAVE_WCTYPE_H 1
+#define HAVE_UNISTD_H 1
+#define HAVE_GETOPT_H 1
+#define HAVE_GETOPT_HEADER 1
+#define HAVE_SYS_TIME_SELECT 1
+#define SIG_ATOMIC_T volatile sig_atomic_t
+#define TYPEOF_CHTYPE int
+#define HAVE_ERRNO 1
 #define HAVE_GETCWD 1
 #define HAVE_GETEGID 1
 #define HAVE_GETEUID 1
-#define HAVE_GETOPT_H 1
-#define HAVE_GETTIMEOFDAY 1
 #define HAVE_GETTTYNAM 1
-#define HAVE_HAS_KEY 1
-#define HAVE_INTTYPES_H 1
-#define HAVE_IOSTREAM 1
-#define HAVE_ISASCII 1
 #define HAVE_ISSETUGID 1
-#define HAVE_LANGINFO_CODESET 1
-#define HAVE_LIBFORM 1
-#define HAVE_LIBMENU 1
-#define HAVE_LIBPANEL 1
-#define HAVE_LIMITS_H 1
-#define HAVE_LINK 1
-#define HAVE_LOCALE_H 1
-#define HAVE_LONG_FILE_NAMES 1
-#define HAVE_MEMORY_H 1
-#define HAVE_MENU_H 1
-#define HAVE_MKSTEMP 1
-#define HAVE_NANOSLEEP 1
-#define HAVE_NC_ALLOC_H 1
-#define HAVE_PANEL_H 1
 #define HAVE_POLL 1
-#define HAVE_POLL_H 1
-#define HAVE_REGEX_H_FUNCS 1
+#define HAVE_PUTENV 1
 #define HAVE_REMOVE 1
-#define HAVE_REMOVE 1
-#define HAVE_RESIZETERM 1
-#define HAVE_RESIZE_TERM 1
 #define HAVE_SELECT 1
 #define HAVE_SETBUF 1
 #define HAVE_SETBUFFER 1
+#define HAVE_SETENV 1
 #define HAVE_SETVBUF 1
 #define HAVE_SIGACTION 1
 #define HAVE_SIGVEC 1
-#define HAVE_SIZECHANGE 1
-#define HAVE_SLK_COLOR 1
-#define HAVE_STDINT_H 1
-#define HAVE_STDLIB_H 1
 #define HAVE_STRDUP 1
-#define HAVE_STRINGS_H 1
-#define HAVE_STRING_H 1
 #define HAVE_STRSTR 1
-#define HAVE_SYMLINK 1
-#define HAVE_SYS_IOCTL_H 1
-#define HAVE_SYS_PARAM_H 1
-#define HAVE_SYS_POLL_H 1
-#define HAVE_SYS_SELECT_H 1
-#define HAVE_SYS_STAT_H 1
-#define HAVE_SYS_TIMES_H 1
-#define HAVE_SYS_TIME_H 1
-#define HAVE_SYS_TIME_SELECT 1
-#define HAVE_SYS_TYPES_H 1
-#define HAVE_TCGETATTR 1
 #define HAVE_TCGETPGRP 1
-#define HAVE_TERMIOS_H 1
 #define HAVE_TIMES 1
-#define HAVE_TTYENT_H 1
-#define HAVE_TYPEINFO 1
-#define HAVE_UNISTD_H 1
-#define HAVE_UNISTD_H 1
-#define HAVE_UNISTD_H 1
-#define HAVE_UNLINK 1
-#define HAVE_USE_DEFAULT_COLORS 1
 #define HAVE_VSNPRINTF 1
+#define HAVE_BSD_CGETENT 1
+#define CGETENT_CONST const
+#define HAVE_ISASCII 1
+#define HAVE_NANOSLEEP 1
+#define HAVE_TERMIOS_H 1
+#define HAVE_UNISTD_H 1
+#define HAVE_TCGETATTR 1
 #define HAVE_VSSCANF 1
-#define HAVE_WCTYPE_H 1
-#define HAVE_WRESIZE 1
+#define HAVE_MKSTEMP 1
+#define HAVE_SIZECHANGE 1
+#define HAVE_WORKING_POLL 1
+#define HAVE_VA_COPY 1
+#define HAVE___VA_COPY 1
+#define HAVE_UNISTD_H 1
+#define HAVE_FORK 1
+#define HAVE_VFORK 1
+#define HAVE_WORKING_VFORK 1
+#define HAVE_WORKING_FORK 1
+#define USE_OPENPTY_HEADER <libutil.h>
+#define USE_XTERM_PTY 1
+#define HAVE_TYPEINFO 1
+#define HAVE_IOSTREAM 1
 #define IOSTREAM_NAMESPACE 1
-#define MIXEDCASE_FILENAMES 1
-#define NCURSES_EXT_FUNCS 1
-#define NCURSES_NO_PADDING 1
+#define CPP_HAS_STATIC_CAST 1
+#define HAVE_SLK_COLOR 1
+#define HAVE_PANEL_H 1
+#define HAVE_LIBPANEL 1
+#define HAVE_MENU_H 1
+#define HAVE_LIBMENU 1
+#define HAVE_FORM_H 1
+#define HAVE_LIBFORM 1
 #define NCURSES_PATHSEP ':'
-#define NCURSES_VERSION_STRING "5.7.20081102"
-#define NDEBUG 1
-#define RETSIGTYPE void
-#define SIG_ATOMIC_T volatile sig_atomic_t
-#define SIZEOF_SIGNED_CHAR 1
-#define STDC_HEADERS 1
-#define SYSTEM_NAME "FreeBSD"
-#define TERMPATH "/etc/termcap:/usr/share/misc/termcap"
-#define TIME_WITH_SYS_TIME 1
-#define TYPEOF_CHTYPE int
-#define USE_ASSUMED_COLOR 1
-#define USE_COLORFGBG 1
-#define USE_GETCAP 1
-#define USE_HASHMAP 1
-#define USE_LINKS 1
-#define USE_SIGWINCH 1
-#define USE_SYSMOUSE 1
-#define USE_TERMCAP 1
+#define NCURSES_VERSION_STRING "5.9.20140222"
+#define NCURSES_OSPEED_COMPAT 1
+
+/*
+ * Begin FreeBSD-specific changes
+ */
+/* Support ENABLE_WIDEC */
 #ifdef ENABLE_WIDEC
 #define USE_WIDEC_SUPPORT 1
+#define NCURSES_WIDECHAR 1
+#define HAVE_PUTWC 1
 #define HAVE_BTOWC 1
+#define HAVE_WCTOB 1
+#define HAVE_MBTOWC 1
+#define HAVE_WCTOMB 1
 #define HAVE_MBLEN 1
 #define HAVE_MBRLEN 1
 #define HAVE_MBRTOWC 1
-#define HAVE_MBSRTOWCS 1
-#define HAVE_MBSTOWCS 1
-#define HAVE_MBTOWC 1
-#define HAVE_PUTWC 1
 #define HAVE_WCSRTOMBS 1
+#define HAVE_MBSRTOWCS 1
 #define HAVE_WCSTOMBS 1
-#define HAVE_WCTOB 1
-#define HAVE_WCTOMB 1
+#define HAVE_MBSTOWCS 1
 #define NEED_WCHAR_H 1
+#define SIZEOF_WCHAR_T 4
 #endif
+/*
+ * End FreeBSD-specific changes
+ */
 
 #include <ncurses_def.h>
 
diff --git a/lib/ncurses/panel/Makefile b/lib/ncurses/panel/Makefile
index 8e99767..7929aed 100644
--- a/lib/ncurses/panel/Makefile
+++ b/lib/ncurses/panel/Makefile
@@ -58,7 +58,7 @@ MLINKS=	panel.3 bottom_panel.3 \
 	panel.3 top_panel.3 \
 	panel.3 update_panels.3
 .else
-NO_MAN=
+MAN=
 .endif
 	
 .include <bsd.lib.mk>