- Update ncurses to 5.7-20081102 (5.7 release) and build glue

- This also removes $FreeBSD$ from two now unmodifed source files
  ncurses/tinfo/lib_raw.c and ncurses/tinfo/lib_baudrate.c

MFC after:	2 months (after 7.1 and 6.4 are released)

2 files changed, 8 insertions, 8 deletions

diff --git a/contrib/ncurses/menu/m_driver.c b/contrib/ncurses/menu/m_driver.c
index d29c602..d418e6a 100644
--- a/contrib/ncurses/menu/m_driver.c
+++ b/contrib/ncurses/menu/m_driver.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2004,2005 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2005,2008 Free Software Foundation, Inc.              *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
@@ -37,7 +37,7 @@
 
 #include "menu.priv.h"
 
-MODULE_ID("$Id: m_driver.c,v 1.25 2005/11/26 20:46:59 tom Exp $")
+MODULE_ID("$Id: m_driver.c,v 1.27 2008/08/03 22:08:22 tom Exp $")
 
 /* Macros */
 
@@ -74,7 +74,7 @@ Is_Sub_String(
     {
       while (*string && *part)
 	{
-	  if (toupper(*string++) != toupper(*part))
+	  if (toupper(UChar(*string++)) != toupper(UChar(*part)))
 	    break;
 	  part++;
 	}
@@ -303,7 +303,7 @@ menu_driver(MENU * menu, int c)
 	  else
 	    {
 	      my_top_row += rdiff;
-	      while (rdiff-- > 0 && item != (ITEM *) 0)
+	      while (rdiff-- > 0 && item != 0 && item->down != 0)
 		item = item->down;
 	    }
 	  break;
@@ -316,7 +316,7 @@ menu_driver(MENU * menu, int c)
 	  else
 	    {
 	      my_top_row -= rdiff;
-	      while (rdiff-- && item != (ITEM *) 0)
+	      while (rdiff-- > 0 && item != 0 && item->up != 0)
 		item = item->up;
 	    }
 	  break;
diff --git a/contrib/ncurses/menu/m_req_name.c b/contrib/ncurses/menu/m_req_name.c
index 01fe79e..6fd51b1 100644
--- a/contrib/ncurses/menu/m_req_name.c
+++ b/contrib/ncurses/menu/m_req_name.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2004,2005 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2005,2008 Free Software Foundation, Inc.              *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
@@ -37,7 +37,7 @@
 
 #include "menu.priv.h"
 
-MODULE_ID("$Id: m_req_name.c,v 1.19 2005/04/16 16:59:52 tom Exp $")
+MODULE_ID("$Id: m_req_name.c,v 1.20 2008/09/13 18:59:17 tom Exp $")
 
 static const char *request_names[MAX_MENU_COMMAND - MIN_MENU_COMMAND + 1] =
 {
@@ -109,7 +109,7 @@ menu_request_by_name(const char *str)
       strncpy(buf, str, sizeof(buf));
       while ((i < sizeof(buf)) && (buf[i] != '\0'))
 	{
-	  buf[i] = toupper(buf[i]);
+	  buf[i] = toupper(UChar(buf[i]));
 	  i++;
 	}