Import ncurses-5.0-release to update the 5.0-prerelease that we had.

3 files changed, 14 insertions, 4 deletions

diff --git a/contrib/ncurses/include/MKterm.h.awk.in b/contrib/ncurses/include/MKterm.h.awk.in
index 8e913a7..6f66b21 100644
--- a/contrib/ncurses/include/MKterm.h.awk.in
+++ b/contrib/ncurses/include/MKterm.h.awk.in
@@ -5,7 +5,7 @@ BEGIN		{
 		    print  " *                                                                          *"
 		    print  " * Permission is hereby granted, free of charge, to any person obtaining a  *"
 		    print  " * copy of this software and associated documentation files (the            *"
-		    print  " * "Software"), to deal in the Software without restriction, including      *"
+		    print  " * \"Software\"), to deal in the Software without restriction, including      *"
 		    print  " * without limitation the rights to use, copy, modify, merge, publish,      *"
 		    print  " * distribute, distribute with modifications, sublicense, and/or sell       *"
 		    print  " * copies of the Software, and to permit persons to whom the Software is    *"
@@ -14,7 +14,7 @@ BEGIN		{
 		    print  " * The above copyright notice and this permission notice shall be included  *"
 		    print  " * in all copies or substantial portions of the Software.                   *"
 		    print  " *                                                                          *"
-		    print  " * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *"
+		    print  " * THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *"
 		    print  " * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *"
 		    print  " * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *"
 		    print  " * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *"
@@ -33,7 +33,7 @@ BEGIN		{
 		    print  "/*    and: Eric S. Raymond <esr@snark.thyrsus.com>                          */"
 		    print  "/****************************************************************************/"
 		    print  ""
-		    print  "/* $Id: MKterm.h.awk.in,v 1.35 1999/02/24 01:04:55 tom Exp $ */"
+		    print  "/* $Id: MKterm.h.awk.in,v 1.36 1999/09/01 22:36:52 Peter.Wemm Exp $ */"
 		    print  ""
 		    print  "/*"
 		    print  "**	term.h -- Definition of struct term"
diff --git a/contrib/ncurses/include/curses.h.in b/contrib/ncurses/include/curses.h.in
index 1ed87e5..4f300b0 100644
--- a/contrib/ncurses/include/curses.h.in
+++ b/contrib/ncurses/include/curses.h.in
@@ -31,7 +31,7 @@
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
  ****************************************************************************/
 
-/* $Id: curses.h.in,v 1.84 1999/07/24 20:15:42 tom Exp $ */
+/* $Id: curses.h.in,v 1.85 1999/10/23 12:33:54 tom Exp $ */
 
 #ifndef __NCURSES_H
 #define __NCURSES_H
@@ -312,6 +312,7 @@ extern int	TABSIZE;
 extern int ESCDELAY;	/* ESC expire time in milliseconds */
 
 extern char *keybound (int, int);
+extern const char *curses_version (void);
 extern int define_key (char *, int);
 extern int keyok (int, bool);
 extern int resizeterm (int, int);
diff --git a/contrib/ncurses/include/tic.h b/contrib/ncurses/include/tic.h
index 58bc27f..0a85054 100644
--- a/contrib/ncurses/include/tic.h
+++ b/contrib/ncurses/include/tic.h
@@ -157,8 +157,17 @@ struct tinfo_fkeys {
 	chtype code;
 	};
 
+#ifdef	BROKEN_LINKER
+
+#define	_nc_tinfo_fkeys	_nc_tinfo_fkeysf()
+extern struct tinfo_fkeys *_nc_tinfo_fkeysf(void);
+
+#else
+
 extern struct tinfo_fkeys _nc_tinfo_fkeys[];
 
+#endif
+
 	/*
 	 * The file comp_captab.c contains an array of these structures, one
 	 * per possible capability.  These are indexed by a hash table array of