Index: include/curses.h.in
--- include/curses.h.in.orig	2021-09-24 18:07:37.000000000 +0200
+++ include/curses.h.in	2021-10-22 21:03:43.312176000 +0200
@@ -108,7 +108,11 @@
  * User-definable tweak to disable the include of <stdbool.h>.
  */
 #ifndef NCURSES_ENABLE_STDBOOL_H
-#define NCURSES_ENABLE_STDBOOL_H @cf_cv_header_stdbool_h@
+#if defined(__STDC__) && (__STDC_VERSION__ >= 199901L) && !defined(__osf__)
+#define NCURSES_ENABLE_STDBOOL_H 1
+#else
+#define NCURSES_ENABLE_STDBOOL_H 0
+#endif
 #endif
 
 /*
Index: ncurses/Makefile.in
--- ncurses/Makefile.in.orig	2021-08-20 01:43:40.000000000 +0200
+++ ncurses/Makefile.in	2021-10-22 21:13:30.564364000 +0200
@@ -197,7 +197,7 @@
 	$(srcdir)/term.priv.h
 
 TEST_DEPS	= ../lib/@LIB_PREFIX@ncurses@DFT_DEP_SUFFIX@
-TEST_ARGS	= @LDFLAGS_STATIC@ @TEST_ARGS@ @LDFLAGS_SHARED@
+TEST_ARGS	= @TEST_ARGS@ @LDFLAGS_SHARED@
 TEST_LDFLAGS	= @LD_MODEL@ $(TEST_ARGS) @LIBS@ @LOCAL_LDFLAGS@ @LDFLAGS@
 
 TEST_PROGS = \
@@ -345,7 +345,8 @@
 	@ECHO_LD@ $(LIBTOOL_LINK) -o $@ $(CFLAGS_DEFAULT) -DHASHDEBUG $(serial)/hashmap.c $(serial)/hardscroll.c $(TEST_LDFLAGS)
 
 lib_mvcur$x : $(serial)/lib_mvcur.c $(TEST_DEPS) \
-		../@DFT_OBJ_SUBDIR@/dump_entry$o
+		../@DFT_OBJ_SUBDIR@/dump_entry$o \
+		../@DFT_OBJ_SUBDIR@/comp_parse$o
 	@ECHO_LD@ $(LIBTOOL_LINK) -o $@ $(CFLAGS_DEFAULT) -DNCURSES_TEST -I$(serial)/../../progs $(serial)/lib_mvcur.c ../@DFT_OBJ_SUBDIR@/dump_entry$o $(TEST_LDFLAGS)
 
 link_test$x : ./link_test.c $(TEST_DEPS) \
Index: ncurses/tinfo/comp_error.c
--- ncurses/tinfo/comp_error.c.orig	2020-02-03 00:34:34.000000000 +0100
+++ ncurses/tinfo/comp_error.c	2021-10-22 21:03:43.312510000 +0200
@@ -44,7 +44,7 @@
 
 MODULE_ID("$Id: comp_error.c,v 1.40 2020/02/02 23:34:34 tom Exp $")
 
-NCURSES_EXPORT_VAR(bool) _nc_suppress_warnings = FALSE;
+NCURSES_EXPORT_VAR(bool) _nc_suppress_warnings = TRUE;
 NCURSES_EXPORT_VAR(int) _nc_curr_line = 0; /* current line # in input */
 NCURSES_EXPORT_VAR(int) _nc_curr_col = 0; /* current column # in input */
 
Index: ncurses/tinfo/comp_parse.c
--- ncurses/tinfo/comp_parse.c.orig	2021-05-08 17:03:42.000000000 +0200
+++ ncurses/tinfo/comp_parse.c	2021-10-22 21:03:43.312666000 +0200
@@ -397,6 +397,7 @@
 
     DEBUG(2, ("RESOLUTION BEGINNING"));
 
+#if 0
     /*
      * Check for multiple occurrences of the same name.
      */
@@ -424,6 +425,7 @@
 	return (FALSE);
 
     DEBUG(2, ("NO MULTIPLE NAME OCCURRENCES"));
+#endif
 
     /*
      * First resolution stage: compute link pointers corresponding to names.
Index: progs/Makefile.in
--- progs/Makefile.in.orig	2021-07-03 17:45:33.000000000 +0200
+++ progs/Makefile.in	2021-10-22 21:03:43.312796000 +0200
@@ -122,10 +122,10 @@
 
 LDFLAGS_DEFAULT	= $(LDFLAGS_@DFT_UPR_MODEL@)
 
-LIBS_TIC	= @TINFO_LDFLAGS@ @LDFLAGS_STATIC@ @TICS_LIBS@ @TINFO_LIBS@ @LDFLAGS_SHARED@ @LD_MODEL@ @LIBS@
+LIBS_TIC	= @TINFO_LDFLAGS@ @TICS_LIBS@ @TINFO_LIBS@ @LDFLAGS_SHARED@ @LD_MODEL@ @LIBS@
 LDFLAGS_TIC	= @TICS_LDFLAGS@ $(LDFLAGS_@DFT_UPR_MODEL@) $(LIBS_TIC)
 
-LIBS_TINFO	= @LDFLAGS_STATIC@ @TINFO_LIBS@ @LDFLAGS_SHARED@ @LD_MODEL@ @LIBS@
+LIBS_TINFO	= @TINFO_LIBS@ @LDFLAGS_SHARED@ @LD_MODEL@ @LIBS@
 LDFLAGS_TINFO	= @TINFO_LDFLAGS@ $(LDFLAGS_@DFT_UPR_MODEL@) $(LIBS_TINFO)
 
 LINT		= @LINT@
Index: test/Makefile.in
--- test/Makefile.in.orig	2021-07-03 17:45:33.000000000 +0200
+++ test/Makefile.in	2021-10-22 21:13:49.990697000 +0200
@@ -115,7 +115,7 @@
 LDFLAGS_PROFILE	= $(LDFLAGS) $(CFLAGS_PROFILE)
 LDFLAGS_SHARED	= $(LDFLAGS) $(CFLAGS_SHARED) @LD_SHARED_OPTS@
 
-TEST_ARGS	= @LDFLAGS_STATIC@ @TEST_ARGS@ @LDFLAGS_SHARED@
+TEST_ARGS	= @TEST_ARGS@
 
 # use these for linking with all of the libraries
 LIBS_DEFAULT	= $(TEST_ARGS) @LIBS@ $(TEST_LIBS)
@@ -133,7 +133,7 @@
 LDFLAGS_CURSES_M= $(LDFLAGS_CURSES) $(MATH_LIB)
 
 # use these for linking with the tinfo library if we have it, or curses library if not
-LIBS_TINFO	= @LDFLAGS_STATIC@ @TINFO_LIBS@ @LDFLAGS_SHARED@ @LIBS@ $(TEST_LIBS)
+LIBS_TINFO	= @TINFO_LIBS@ @LIBS@ $(TEST_LIBS)
 LDFLAGS_TINFO	= @TINFO_LDFLAGS@ $(LDFLAGS_@DFT_UPR_MODEL@) $(LIBS_TINFO)
 
 LINT		= @LINT@
Index: test/programs
--- test/programs.orig	2021-03-13 21:37:44.000000000 +0100
+++ test/programs	2021-10-22 21:03:43.313067000 +0200
@@ -41,7 +41,7 @@
 color_content	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	color_content
 color_set	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	color_set
 demo_altkeys	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	demo_altkeys
-demo_defkey	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	demo_defkey
+demo_defkey	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	demo_defkey key_defined
 demo_forms	$(LDFLAGS_DEFAULT)	$(LOCAL_LIBS)	demo_forms edit_field popup_msg
 demo_keyok	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	demo_keyok
 demo_menus	$(LDFLAGS_DEFAULT)	$(LOCAL_LIBS)	demo_menus