3 files changed, 24 insertions, 0 deletions
diff --git a/contrib/ncurses/ncurses/tinfo/comp_scan.c b/contrib/ncurses/ncurses/tinfo/comp_scan.c
index a6ad55f..6465ed7 100644
--- a/contrib/ncurses/ncurses/tinfo/comp_scan.c
+++ b/contrib/ncurses/ncurses/tinfo/comp_scan.c
@@ -31,6 +31,8 @@
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
  ****************************************************************************/
 
+/* $FreeBSD$ */
+
 /*
  *	comp_scan.c --- Lexical scanner for terminfo compiler.
  *
@@ -290,8 +292,10 @@ _nc_get_token(bool silent)
 	    if (!silent && desc) {
 		if (*desc == '\0')
 		    _nc_warning("empty longname field");
+#ifndef FREEBSD_NATIVE
 		else if (strchr(desc, ' ') == (char *) NULL)
 		    _nc_warning("older tic versions may treat the description field as an alias");
+#endif
 	    }
 	    if (!desc)
 		desc = buffer + strlen(buffer);
diff --git a/contrib/ncurses/ncurses/tinfo/lib_raw.c b/contrib/ncurses/ncurses/tinfo/lib_raw.c
index 0a65b8f..17474e1 100644
--- a/contrib/ncurses/ncurses/tinfo/lib_raw.c
+++ b/contrib/ncurses/ncurses/tinfo/lib_raw.c
@@ -31,6 +31,8 @@
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
  ****************************************************************************/
 
+/* $FreeBSD$ */
+
 /*
  *	raw.c
  *
diff --git a/contrib/ncurses/ncurses/tinfo/lib_termcap.c b/contrib/ncurses/ncurses/tinfo/lib_termcap.c
index c88887b..be91e06 100644
--- a/contrib/ncurses/ncurses/tinfo/lib_termcap.c
+++ b/contrib/ncurses/ncurses/tinfo/lib_termcap.c
@@ -31,6 +31,8 @@
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
  ****************************************************************************/
 
+/* $FreeBSD$ */
+
 #include <curses.priv.h>
 
 #include <termcap.h>
@@ -51,6 +53,12 @@ UP = 0;
 NCURSES_EXPORT_VAR(char *)
 BC = 0;
 
+#ifdef FREEBSD_NATIVE
+#undef	GCC_UNUSED
+#define	GCC_UNUSED
+extern char _nc_termcap[];	/* buffer to copy out */
+#endif
+
 /***************************************************************************
  *
  * tgetent(bufp, term)
@@ -99,6 +107,16 @@ tgetent
 #endif*/
 
     }
+
+#ifdef FREEBSD_NATIVE
+    /*
+     * This is a REALLY UGLY hack. Basically, if we originate with
+     * a termcap source, try and copy it out.
+     */
+    if (bufp && _nc_termcap[0])
+	strncpy(bufp, _nc_termcap, 1024);
+#endif
+
     returnCode(errcode);
 }