From b696076e52986209c4335b4b8ee5ca2b912554c3 Mon Sep 17 00:00:00 2001
From: zrj <zrj@dragonflybsd.org>
Date: Wed, 15 Nov 2017 21:33:49 +0200
Subject: [PATCH] Revert "Hack-fix buildworld after the ncurses upgrade."

This reverts commit 6d3bd8e3942560036cf2aec0d98a65819c5f3b4c.
---
 contrib/ncurses/progs/dump_entry.c | 2 --
 contrib/ncurses/progs/tic.c        | 4 ----
 lib/libncurses/include/unctrl.h    | 2 +-
 usr.bin/tic/Makefile               | 1 -
 4 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/contrib/ncurses/progs/dump_entry.c b/contrib/ncurses/progs/dump_entry.c
index fa3f4c3fad..f3317498fe 100644
--- a/contrib/ncurses/progs/dump_entry.c
+++ b/contrib/ncurses/progs/dump_entry.c
@@ -1165,7 +1165,6 @@ dump_entry(TERMTYPE *tterm,
     const char *legend;
     bool infodump;
 
-#ifndef BOOTSTRAPPING
     if (quickdump) {
 	char bigbuf[65536];
 	unsigned n;
@@ -1207,7 +1206,6 @@ 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 03f1460aaf..1347889941 100644
--- a/contrib/ncurses/progs/tic.c
+++ b/contrib/ncurses/progs/tic.c
@@ -717,9 +717,7 @@ 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
@@ -758,9 +756,7 @@ 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 d40538aef0..e7767d4bb6 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);
 
-#ifndef BOOTSTRAPPING
+#if 1
 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 5da1a3dac8..48106883c1 100644
--- a/usr.bin/tic/Makefile
+++ b/usr.bin/tic/Makefile
@@ -19,7 +19,6 @@ 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
-- 
2.41.0