aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lib/libncurses/Makefile12
-rw-r--r--lib/libncurses/ncurses_cfg.h28
-rw-r--r--lib/ncurses/ncurses/Makefile12
-rw-r--r--lib/ncurses/ncurses/ncurses_cfg.h28
4 files changed, 60 insertions, 20 deletions
diff --git a/lib/libncurses/Makefile b/lib/libncurses/Makefile
index 76c83ee46976..f13f9178bca7 100644
--- a/lib/libncurses/Makefile
+++ b/lib/libncurses/Makefile
@@ -51,6 +51,7 @@ GENHDR= \
curses.h \
hashsize.h \
init_keytry.h \
+ ncurses_def.h \
nomacros.h \
parametrized.h \
term.h \
@@ -164,6 +165,7 @@ SRCS= ${GENHDR} ${GENSRC} \
lib_slktouch.c \
lib_termcap.c \
lib_termname.c \
+ lib_tgoto.c \
lib_ti.c \
lib_touch.c \
lib_tparm.c \
@@ -193,6 +195,7 @@ SRCS= ${GENHDR} ${GENSRC} \
safe_sprintf.c \
setbuf.c \
sigaction.c \
+ strings.c \
trace_buf.c \
trace_tries.c \
trace_xnames.c \
@@ -297,6 +300,10 @@ fallback.c: MKfallback.sh
sh ${NCURSES}/ncurses/tinfo/MKfallback.sh > fallback.c
# Generated headers
+ncurses_def.h: MKncurses_def.sh ncurses_defs
+ AWK=${AWK} sh ${NCURSES}/include/MKncurses_def.sh \
+ ${NCURSES}/include/ncurses_defs > ncurses_def.h
+
nomacros.h: MKlib_gen.sh curses.h
sh ${NCURSES}/ncurses/base/MKlib_gen.sh "${CC} -E ${INCS}" \
"${AWK}" < curses.h | fgrep undef > $@
@@ -319,7 +326,7 @@ term.h: MKterm.h.awk edit_cfg.sh Caps
# Build tools
build-tools: make_hash make_keys
-make_keys: make_keys.c names.c curses.h
+make_keys: make_keys.c names.c curses.h ncurses_def.h
${CC} -o $@ ${CFLAGS} ${NCURSES}/ncurses/tinfo/make_keys.c
make_hash: comp_hash.c hashsize.h curses.h
@@ -379,7 +386,8 @@ MAN3x= curs_addch.3x curs_addchstr.3x curs_addstr.3x curs_attr.3x \
curs_overlay.3x curs_pad.3x curs_print.3x curs_printw.3x \
curs_refresh.3x curs_scanw.3x curs_scr_dump.3x curs_scroll.3x \
curs_slk.3x curs_termattrs.3x curs_termcap.3x curs_terminfo.3x \
- curs_touch.3x curs_util.3x curs_window.3x define_key.3x \
+ curs_touch.3x curs_trace.3x curs_util.3x curs_window.3x \
+ default_colors.3x define_key.3x \
dft_fgbg.3x keybound.3x keyok.3x ncurses.3x resizeterm.3x wresize.3x
MAN5= term.5 terminfo.5
MAN7= term.7
diff --git a/lib/libncurses/ncurses_cfg.h b/lib/libncurses/ncurses_cfg.h
index f91e1803d9b9..e43be459c533 100644
--- a/lib/libncurses/ncurses_cfg.h
+++ b/lib/libncurses/ncurses_cfg.h
@@ -31,13 +31,17 @@
* Author: Thomas E. Dickey <dickey@clark.net> 1997 *
****************************************************************************/
/*
- * $Id: ncurses_cfg.hin,v 1.2 1998/02/11 12:13:46 tom Exp $
+ * $Id: ncurses_cfg.hin,v 1.3 2000/09/02 17:13:32 tom Exp $
*
* This is a template-file used to generate the "ncurses_cfg.h" file.
*
- * Rather than list every definition, the configuration script substitutes
- * the definitions that it finds using 'sed'. You need a patch (971222)
- * to autoconf 2.12 to do this.
+ * Rather than list every definition, the configuration script substitutes the
+ * definitions that it finds using 'sed'. You need a patch (original date
+ * 971222) to autoconf 2.12 or 2.13 to do this.
+ *
+ * See:
+ * http://dickey.his.com/autoconf/
+ * ftp://dickey.his.com/autoconf/
*/
/* $FreeBSD$ */
@@ -48,23 +52,25 @@
#define BSD_TPUTS 1
#define CC_HAS_INLINE_FUNCS 1
#define CC_HAS_PROTOS 1
-#define CPP_HAS_PARAM_INIT 1
-#define ETIP_NEEDS_MATH_H 1
#define GCC_NORETURN __dead2
#define GCC_PRINTF 1
#define GCC_SCANF 1
#define GCC_UNUSED __unused
#define HAVE_BIG_CORE 1
#define HAVE_BSD_CGETENT 1
+#define HAVE_CURSES_VERSION 1
#define HAVE_DIRENT_H 1
#define HAVE_ERRNO 1
#define HAVE_FCNTL_H 1
#define HAVE_FORM_H 1
#define HAVE_GETCWD 1
+#define HAVE_GETEGID 1
+#define HAVE_GETEUID 1
#define HAVE_GETTIMEOFDAY 1
#define HAVE_GETTTYNAM 1
#define HAVE_HAS_KEY 1
#define HAVE_ISASCII 1
+#define HAVE_ISSETUGID 1
#define HAVE_LIBFORM 1
#define HAVE_LIBMENU 1
#define HAVE_LIBPANEL 1
@@ -106,27 +112,33 @@
#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_UNLINK 1
#define HAVE_USE_DEFAULT_COLORS 1
#define HAVE_VSNPRINTF 1
#define HAVE_VSSCANF 1
-#define NCURSES_EXT_FUNCS 1
#define HAVE_WORKING_POLL 1
#define HAVE_WRESIZE 1
+#define MIXEDCASE_FILENAMES 1
+#define NCURSES_EXT_FUNCS 1
#define NCURSES_NO_PADDING 1
#define NDEBUG 1
#define RETSIGTYPE void
#define STDC_HEADERS 1
#define SYSTEM_NAME "FreeBSD"
+#define TERMINFO "/usr/share/misc/terminfo"
#define TERMINFO_DIRS "/usr/share/misc/terminfo"
#define TYPEOF_CHTYPE long
+#define USE_ASSUMED_COLOR 1
+#define USE_COLORFGBG 1
#define USE_DATABASE 1
#define USE_GETCAP 1
#define USE_HASHMAP 1
#define USE_SIGWINCH 1
+#include <ncurses_def.h>
+
/* The C compiler may not treat these properly but C++ has to */
#ifdef __cplusplus
#undef const
diff --git a/lib/ncurses/ncurses/Makefile b/lib/ncurses/ncurses/Makefile
index 76c83ee46976..f13f9178bca7 100644
--- a/lib/ncurses/ncurses/Makefile
+++ b/lib/ncurses/ncurses/Makefile
@@ -51,6 +51,7 @@ GENHDR= \
curses.h \
hashsize.h \
init_keytry.h \
+ ncurses_def.h \
nomacros.h \
parametrized.h \
term.h \
@@ -164,6 +165,7 @@ SRCS= ${GENHDR} ${GENSRC} \
lib_slktouch.c \
lib_termcap.c \
lib_termname.c \
+ lib_tgoto.c \
lib_ti.c \
lib_touch.c \
lib_tparm.c \
@@ -193,6 +195,7 @@ SRCS= ${GENHDR} ${GENSRC} \
safe_sprintf.c \
setbuf.c \
sigaction.c \
+ strings.c \
trace_buf.c \
trace_tries.c \
trace_xnames.c \
@@ -297,6 +300,10 @@ fallback.c: MKfallback.sh
sh ${NCURSES}/ncurses/tinfo/MKfallback.sh > fallback.c
# Generated headers
+ncurses_def.h: MKncurses_def.sh ncurses_defs
+ AWK=${AWK} sh ${NCURSES}/include/MKncurses_def.sh \
+ ${NCURSES}/include/ncurses_defs > ncurses_def.h
+
nomacros.h: MKlib_gen.sh curses.h
sh ${NCURSES}/ncurses/base/MKlib_gen.sh "${CC} -E ${INCS}" \
"${AWK}" < curses.h | fgrep undef > $@
@@ -319,7 +326,7 @@ term.h: MKterm.h.awk edit_cfg.sh Caps
# Build tools
build-tools: make_hash make_keys
-make_keys: make_keys.c names.c curses.h
+make_keys: make_keys.c names.c curses.h ncurses_def.h
${CC} -o $@ ${CFLAGS} ${NCURSES}/ncurses/tinfo/make_keys.c
make_hash: comp_hash.c hashsize.h curses.h
@@ -379,7 +386,8 @@ MAN3x= curs_addch.3x curs_addchstr.3x curs_addstr.3x curs_attr.3x \
curs_overlay.3x curs_pad.3x curs_print.3x curs_printw.3x \
curs_refresh.3x curs_scanw.3x curs_scr_dump.3x curs_scroll.3x \
curs_slk.3x curs_termattrs.3x curs_termcap.3x curs_terminfo.3x \
- curs_touch.3x curs_util.3x curs_window.3x define_key.3x \
+ curs_touch.3x curs_trace.3x curs_util.3x curs_window.3x \
+ default_colors.3x define_key.3x \
dft_fgbg.3x keybound.3x keyok.3x ncurses.3x resizeterm.3x wresize.3x
MAN5= term.5 terminfo.5
MAN7= term.7
diff --git a/lib/ncurses/ncurses/ncurses_cfg.h b/lib/ncurses/ncurses/ncurses_cfg.h
index f91e1803d9b9..e43be459c533 100644
--- a/lib/ncurses/ncurses/ncurses_cfg.h
+++ b/lib/ncurses/ncurses/ncurses_cfg.h
@@ -31,13 +31,17 @@
* Author: Thomas E. Dickey <dickey@clark.net> 1997 *
****************************************************************************/
/*
- * $Id: ncurses_cfg.hin,v 1.2 1998/02/11 12:13:46 tom Exp $
+ * $Id: ncurses_cfg.hin,v 1.3 2000/09/02 17:13:32 tom Exp $
*
* This is a template-file used to generate the "ncurses_cfg.h" file.
*
- * Rather than list every definition, the configuration script substitutes
- * the definitions that it finds using 'sed'. You need a patch (971222)
- * to autoconf 2.12 to do this.
+ * Rather than list every definition, the configuration script substitutes the
+ * definitions that it finds using 'sed'. You need a patch (original date
+ * 971222) to autoconf 2.12 or 2.13 to do this.
+ *
+ * See:
+ * http://dickey.his.com/autoconf/
+ * ftp://dickey.his.com/autoconf/
*/
/* $FreeBSD$ */
@@ -48,23 +52,25 @@
#define BSD_TPUTS 1
#define CC_HAS_INLINE_FUNCS 1
#define CC_HAS_PROTOS 1
-#define CPP_HAS_PARAM_INIT 1
-#define ETIP_NEEDS_MATH_H 1
#define GCC_NORETURN __dead2
#define GCC_PRINTF 1
#define GCC_SCANF 1
#define GCC_UNUSED __unused
#define HAVE_BIG_CORE 1
#define HAVE_BSD_CGETENT 1
+#define HAVE_CURSES_VERSION 1
#define HAVE_DIRENT_H 1
#define HAVE_ERRNO 1
#define HAVE_FCNTL_H 1
#define HAVE_FORM_H 1
#define HAVE_GETCWD 1
+#define HAVE_GETEGID 1
+#define HAVE_GETEUID 1
#define HAVE_GETTIMEOFDAY 1
#define HAVE_GETTTYNAM 1
#define HAVE_HAS_KEY 1
#define HAVE_ISASCII 1
+#define HAVE_ISSETUGID 1
#define HAVE_LIBFORM 1
#define HAVE_LIBMENU 1
#define HAVE_LIBPANEL 1
@@ -106,27 +112,33 @@
#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_UNLINK 1
#define HAVE_USE_DEFAULT_COLORS 1
#define HAVE_VSNPRINTF 1
#define HAVE_VSSCANF 1
-#define NCURSES_EXT_FUNCS 1
#define HAVE_WORKING_POLL 1
#define HAVE_WRESIZE 1
+#define MIXEDCASE_FILENAMES 1
+#define NCURSES_EXT_FUNCS 1
#define NCURSES_NO_PADDING 1
#define NDEBUG 1
#define RETSIGTYPE void
#define STDC_HEADERS 1
#define SYSTEM_NAME "FreeBSD"
+#define TERMINFO "/usr/share/misc/terminfo"
#define TERMINFO_DIRS "/usr/share/misc/terminfo"
#define TYPEOF_CHTYPE long
+#define USE_ASSUMED_COLOR 1
+#define USE_COLORFGBG 1
#define USE_DATABASE 1
#define USE_GETCAP 1
#define USE_HASHMAP 1
#define USE_SIGWINCH 1
+#include <ncurses_def.h>
+
/* The C compiler may not treat these properly but C++ has to */
#ifdef __cplusplus
#undef const
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-26 14:36:38 +0000