aboutsummaryrefslogtreecommitdiff
path: root/lib/ncurses
diff options
context:
space:
mode:
authorXin LI <delphij@FreeBSD.org>2014-03-02 08:58:21 +0000
committerXin LI <delphij@FreeBSD.org>2014-03-02 08:58:21 +0000
commit73f0a83d68863a383fd8953972cd36eb6420ec7d (patch)
treea2372d7ccc967890376ec8bcddc202aba009ba79 /lib/ncurses
parent0d2041a08b86b4c2ce3b6cafb157a32abf660764 (diff)
parentcea297eb34d2361e79529034397465068ae34ecd (diff)
downloadsrc-73f0a83d68863a383fd8953972cd36eb6420ec7d.tar.gz
src-73f0a83d68863a383fd8953972cd36eb6420ec7d.zip
MFV r262639: ncurses 5.9 20140222 snapshot.
Requested by: bapt
Notes
Notes: svn path=/head/; revision=262685
Diffstat (limited to 'lib/ncurses')
-rw-r--r--lib/ncurses/ncurses/Makefile6
-rw-r--r--lib/ncurses/ncurses/ncurses_cfg.h24
2 files changed, 20 insertions, 10 deletions
diff --git a/lib/ncurses/ncurses/Makefile b/lib/ncurses/ncurses/Makefile
index 3b52b6ac67a9..b3242f0b6a8a 100644
--- a/lib/ncurses/ncurses/Makefile
+++ b/lib/ncurses/ncurses/Makefile
@@ -161,7 +161,6 @@ SRCS+= \
lib_wattron.c \
lib_winch.c \
lib_window.c \
- memmove.c \
nc_panel.c \
resizeterm.c \
safe_sprintf.c \
@@ -211,9 +210,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
@@ -397,6 +396,8 @@ make_hash: make_hash.c hashsize.h ncurses_def.h ${HEADERS}
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}%" \
@@ -446,6 +447,7 @@ curses.head: curses.h.in
-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" \
diff --git a/lib/ncurses/ncurses/ncurses_cfg.h b/lib/ncurses/ncurses/ncurses_cfg.h
index c6533b2bba53..9ca3a9725ff6 100644
--- a/lib/ncurses/ncurses/ncurses_cfg.h
+++ b/lib/ncurses/ncurses/ncurses_cfg.h
@@ -50,7 +50,6 @@
#define NC_CONFIG_H
#define SYSTEM_NAME "FreeBSD"
-#define CC_HAS_PROTOS 1
#if 0
#include <stdlib.h>
#endif
@@ -58,7 +57,6 @@
#define MIXEDCASE_FILENAMES 1
#define USE_SYSMOUSE 1
#define HAVE_BIG_CORE 1
-#define USE_TERMCAP 1
#define TERMPATH "/etc/termcap:/usr/share/misc/termcap"
#define USE_GETCAP 1
#define HAVE_REMOVE 1
@@ -69,12 +67,15 @@
#define BSD_TPUTS 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
@@ -95,12 +96,11 @@
#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_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 GCC_NORETURN __attribute__((noreturn))
-#define NDEBUG 1
#define HAVE_NC_ALLOC_H 1
#define HAVE_GETTIMEOFDAY 1
#define STDC_HEADERS 1
@@ -122,6 +122,9 @@
#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
@@ -132,10 +135,12 @@
#define HAVE_GETTTYNAM 1
#define HAVE_ISSETUGID 1
#define HAVE_POLL 1
+#define HAVE_PUTENV 1
#define HAVE_REMOVE 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
@@ -145,6 +150,7 @@
#define HAVE_TIMES 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
@@ -152,7 +158,6 @@
#define HAVE_TCGETATTR 1
#define HAVE_VSSCANF 1
#define HAVE_MKSTEMP 1
-#define RETSIGTYPE void
#define HAVE_SIZECHANGE 1
#define HAVE_WORKING_POLL 1
#define HAVE_VA_COPY 1
@@ -164,10 +169,10 @@
#define HAVE_WORKING_FORK 1
#define USE_OPENPTY_HEADER <libutil.h>
#define USE_XTERM_PTY 1
-#define HAVE_IOSTREAM 1
#define HAVE_TYPEINFO 1
+#define HAVE_IOSTREAM 1
#define IOSTREAM_NAMESPACE 1
-#define ETIP_NEEDS_MATH_H 1
+#define CPP_HAS_STATIC_CAST 1
#define HAVE_SLK_COLOR 1
#define HAVE_PANEL_H 1
#define HAVE_LIBPANEL 1
@@ -176,7 +181,8 @@
#define HAVE_FORM_H 1
#define HAVE_LIBFORM 1
#define NCURSES_PATHSEP ':'
-#define NCURSES_VERSION_STRING "5.9.20110404"
+#define NCURSES_VERSION_STRING "5.9.20140222"
+#define NCURSES_OSPEED_COMPAT 1
/*
* Begin FreeBSD-specific changes
@@ -184,6 +190,7 @@
/* 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
@@ -197,6 +204,7 @@
#define HAVE_WCSTOMBS 1
#define HAVE_MBSTOWCS 1
#define NEED_WCHAR_H 1
+#define SIZEOF_WCHAR_T 4
#endif
/*
* End FreeBSD-specific changes