From: Sascha Wildner <saw@online.de>
Date: Sun, 13 Mar 2016 11:54:44 +0000 (+0100)
Subject: Hack-fix buildworld after the ncurses upgrade.
X-Git-Tag: v4.6.0rc~713
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/6d3bd8e3942560036cf2aec0d98a65819c5f3b4c

Hack-fix buildworld after the ncurses upgrade.

This seems to be enough to keep it going and buildworld's tic
usage doesn't use any of these features.
---

diff --git a/contrib/ncurses/progs/dump_entry.c b/contrib/ncurses/progs/dump_entry.c
index 7be9b9127b..731134767a 100644
--- a/contrib/ncurses/progs/dump_entry.c
+++ b/contrib/ncurses/progs/dump_entry.c
@@ -1163,6 +1163,7 @@ dump_entry(TERMTYPE *tterm,
     const char *legend;
     bool infodump;
 
+#ifndef BOOTSTRAPPING
     if (quickdump) {
 	char bigbuf[65536];
 	unsigned n;
@@ -1204,6 +1205,7 @@ dump_entry(TERMTYPE *tterm,
 	}
 	return;
     }
+#endif
 
     if (outform == F_TERMCAP || outform == F_TCONVERR) {
 	critlen = MAX_TERMCAP_LENGTH;
diff --git a/contrib/ncurses/progs/tic.c b/contrib/ncurses/progs/tic.c
index 1347889941..03f1460aaf 100644
--- a/contrib/ncurses/progs/tic.c
+++ b/contrib/ncurses/progs/tic.c
@@ -717,7 +717,9 @@ main(int argc, char *argv[])
 #if NCURSES_XNAMES
     use_extended_names(FALSE);
 #endif
+#ifndef BOOTSTRAPPING
     _nc_strict_bsd = 0;
+#endif
 
     /*
      * Processing arguments is a little complicated, since someone made a
@@ -756,7 +758,9 @@ main(int argc, char *argv[])
 	}
 	switch (this_opt) {
 	case 'K':
+#ifndef BOOTSTRAPPING
 	    _nc_strict_bsd = 1;
+#endif
 	    /* the initial version of -K in 20110730 fell-thru here, but the
 	     * same flag is useful when reading sources -TD
 	     */
diff --git a/lib/libncurses/include/unctrl.h b/lib/libncurses/include/unctrl.h
index e7767d4bb6..d40538aef0 100644
--- a/lib/libncurses/include/unctrl.h
+++ b/lib/libncurses/include/unctrl.h
@@ -56,7 +56,7 @@ extern "C" {
 #undef unctrl
 NCURSES_EXPORT(NCURSES_CONST char *) unctrl (chtype);
 
-#if 1
+#ifndef BOOTSTRAPPING
 NCURSES_EXPORT(NCURSES_CONST char *) NCURSES_SP_NAME(unctrl) (SCREEN*, chtype);
 #endif
 
diff --git a/usr.bin/tic/Makefile b/usr.bin/tic/Makefile
index 239acf813b..e91bdb0f83 100644
--- a/usr.bin/tic/Makefile
+++ b/usr.bin/tic/Makefile
@@ -19,6 +19,7 @@ CFLAGS+=	-I${.OBJDIR}
 # Ideally this should be -lprivate_ncursesw
 # Wide version can be used when DragonFly 3.3 branch is created
 .if defined(BOOTSTRAPPING)
+CFLAGS+=	-DBOOTSTRAPPING
 .  if exists (/usr/lib/libncurses.a)
 DPADD=		/usr/lib/libncurses.a
 LDADD=		-lncurses