From 3ac91e86fba7d34199699a87e1ff109aacc8eec4 Mon Sep 17 00:00:00 2001
From: John Marino <draco@marino.st>
Date: Mon, 14 May 2012 09:38:53 +0200
Subject: [PATCH] ncurses: move USE_GETCAP, update README files

The ncurses headers were generated with additional configuration switches
documented on README.DRAGONFLY.  One outcome is the USE_GETCAP should
be in the configuration header rather than in the Makefile, so that
was updated.

New files were imported to support building the terminfo database, and
the path for that will be /usr/share/terminfo.  Accordingly, the man
page and configuration header have been updated.
---
 contrib/ncurses/README.DELETED       | 5 +----
 contrib/ncurses/README.DRAGONFLY     | 3 +++
 lib/libncurses/include/ncurses_cfg.h | 6 ++++--
 lib/libncurses/libncurses/Makefile   | 1 -
 lib/libncurses/man/terminfo.5        | 2 +-
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/contrib/ncurses/README.DELETED b/contrib/ncurses/README.DELETED
index d6b1f507ee..a2e326f48c 100644
--- a/contrib/ncurses/README.DELETED
+++ b/contrib/ncurses/README.DELETED
@@ -53,15 +53,12 @@ misc/cmpdef.cmd
 misc/csort
 misc/emx.src
 misc/gen-pkgconfig.in
-misc/gen_edit.sh
 misc/makedef.cmd
 misc/makellib
 misc/ncurses-config.in
 misc/ncurses.supp
-misc/run_tic.in
 misc/shlib
 misc/tdlint
-misc/terminfo.src
 mk-0th.awk
 mk-1st.awk
 mk-2nd.awk
@@ -89,5 +86,5 @@ panel/llib-lpanelt
 panel/llib-lpaneltw
 panel/llib-lpanelw
 panel/modules
-progs/
+progs/Makefile.in
 test/
diff --git a/contrib/ncurses/README.DRAGONFLY b/contrib/ncurses/README.DRAGONFLY
index 40776539df..1842a78e18 100644
--- a/contrib/ncurses/README.DRAGONFLY
+++ b/contrib/ncurses/README.DRAGONFLY
@@ -17,6 +17,9 @@ The .h files copied into base where created using configure opts:
 	--with-sysmouse
 	--enable-termcap
 	--enable-bsdpad
+	--enable-getcap
+	--with-default-terminfo-dir=/usr/share/terminfo
+	--with-terminfo-dirs=/usr/share/terminfo
 
 The following files have been modified:
 	ncurses/tinfo/comp_scan.c
diff --git a/lib/libncurses/include/ncurses_cfg.h b/lib/libncurses/include/ncurses_cfg.h
index a673c2e168..381e76718e 100644
--- a/lib/libncurses/include/ncurses_cfg.h
+++ b/lib/libncurses/include/ncurses_cfg.h
@@ -55,11 +55,12 @@
 #define MIXEDCASE_FILENAMES 1
 #define USE_SYSMOUSE 1
 #define USE_DATABASE 1
-#define TERMINFO_DIRS "/usr/local/share/terminfo"
-#define TERMINFO "/usr/local/share/terminfo"
+#define TERMINFO_DIRS "/usr/share/terminfo"
+#define TERMINFO "/usr/share/terminfo"
 #define HAVE_BIG_CORE 1
 #define USE_TERMCAP 1
 #define TERMPATH "/etc/termcap:/usr/share/misc/termcap"
+#define USE_GETCAP 1
 #define USE_HOME_TERMINFO 1
 #define USE_ROOT_ENVIRON 1
 #define HAVE_REMOVE 1
@@ -159,6 +160,7 @@
 #define HAVE_TCGETPGRP 1
 #define HAVE_TIMES 1
 #define HAVE_VSNPRINTF 1
+#define HAVE_BSD_CGETENT 1
 #define HAVE_ISASCII 1
 #define HAVE_NANOSLEEP 1
 #define HAVE_TERMIOS_H 1
diff --git a/lib/libncurses/libncurses/Makefile b/lib/libncurses/libncurses/Makefile
index 65d54de8a0..978f3ba0fa 100644
--- a/lib/libncurses/libncurses/Makefile
+++ b/lib/libncurses/libncurses/Makefile
@@ -11,7 +11,6 @@ NCURSESWCHARDIR=${NCURSESDIR}/ncurses/widechar
 	${.OBJDIR} ${.CURDIR}/../include ${NCURSESDIR}/include/
 
 CFLAGS+=	-DTRACE
-CFLAGS+=	-DUSE_GETCAP
 CFLAGS+=	-DDRAGONFLY_NATIVE
 
 ncurses_def.h:
diff --git a/lib/libncurses/man/terminfo.5 b/lib/libncurses/man/terminfo.5
index 9cbb1bd3df..2ac998ab78 100644
--- a/lib/libncurses/man/terminfo.5
+++ b/lib/libncurses/man/terminfo.5
@@ -35,7 +35,7 @@
 .\" $Id: terminfo.head,v 1.18 2010/07/31 16:08:48 tom Exp $
 .TH terminfo 5 "" "" "File Formats"
 .ds n 5
-.ds d /usr/local/share/terminfo
+.ds d /usr/share/terminfo
 .SH NAME
 terminfo \- terminal capability data base
 .SH SYNOPSIS
-- 
2.41.0