summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorroy <roy>2017-01-05 21:19:24 +0000
committerroy <roy>2017-01-05 21:19:24 +0000
commitc561905b69edc990d0195ad7c3c508b2e4bc9b0f (patch)
tree32f282f0ec009183426502aff7451540f8ec689d /mk
parent5d354424525d39dcd20a1c136396b858b087ded9 (diff)
downloadpkgsrc-c561905b69edc990d0195ad7c3c508b2e4bc9b0f.tar.gz
Add a test for set_escdelay
Diffstat (limited to 'mk')
-rw-r--r--mk/curses.buildlink3.mk4
-rw-r--r--mk/curses.builtin.mk24
2 files changed, 19 insertions, 9 deletions
diff --git a/mk/curses.buildlink3.mk b/mk/curses.buildlink3.mk
index 09c594f5b7c..c62d2ece666 100644
--- a/mk/curses.buildlink3.mk
+++ b/mk/curses.buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: curses.buildlink3.mk,v 1.24 2017/01/04 15:52:50 roy Exp $
+# $NetBSD: curses.buildlink3.mk,v 1.25 2017/01/05 21:19:24 roy Exp $
#
# This Makefile fragment is meant to be included by packages that require
# any curses implementation instead of one particular one. The available
@@ -112,7 +112,7 @@ USE_NCURSES= yes
. include "../../devel/pdcurses/buildlink3.mk"
. endif
. for _var_ in PKGNAME PREFIX INCDIRS LIBDIRS LIBNAME LDADD
-BUILDLINK_${_var_}.curses?= ${BUILDLINK_${_var_}.${CURSES_TYPE}}
+BUILDLINK_${_var_}.curses= ${BUILDLINK_${_var_}.${CURSES_TYPE}}
. endfor
.endif
diff --git a/mk/curses.builtin.mk b/mk/curses.builtin.mk
index f4ff2650b72..8fceec1a1dc 100644
--- a/mk/curses.builtin.mk
+++ b/mk/curses.builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: curses.builtin.mk,v 1.12 2017/01/02 10:49:33 roy Exp $
+# $NetBSD: curses.builtin.mk,v 1.13 2017/01/05 21:19:24 roy Exp $
BUILTIN_PKG:= curses
@@ -14,13 +14,17 @@ BUILTIN_FIND_FILES_VAR+= H_CURSES_HALFDELAY
BUILTIN_FIND_FILES.H_CURSES_HALFDELAY= ${H_CURSES}
BUILTIN_FIND_GREP.H_CURSES_HALFDELAY= halfdelay
+BUILTIN_FIND_FILES_VAR+= H_CURSES_PUTWIN
+BUILTIN_FIND_FILES.H_CURSES_PUTWIN= ${H_CURSES}
+BUILTIN_FIND_GREP.H_CURSES_PUTWIN= putwin
+
BUILTIN_FIND_FILES_VAR+= H_CURSES_RESIZETERM
BUILTIN_FIND_FILES.H_CURSES_RESIZETERM= ${H_CURSES}
BUILTIN_FIND_GREP.H_CURSES_RESIZETERM= resizeterm
-BUILTIN_FIND_FILES_VAR+= H_CURSES_PUTWIN
-BUILTIN_FIND_FILES.H_CURSES_PUTWIN= ${H_CURSES}
-BUILTIN_FIND_GREP.H_CURSES_PUTWIN= putwin
+BUILTIN_FIND_FILES_VAR+= H_CURSES_SET_ESCDELAY
+BUILTIN_FIND_FILES.H_CURSES_SET_ESCDELAY= ${H_CURSES}
+BUILTIN_FIND_GREP.H_CURSES_SET_ESCDELAY= set_escdelay
BUILTIN_FIND_FILES_VAR+= H_CURSES_WA_NORMAL
BUILTIN_FIND_FILES.H_CURSES_WA_NORMAL= ${H_CURSES}
@@ -95,23 +99,29 @@ USE_BUILTIN.curses= no
USE_BUILTIN.curses= no
. endif
. endif
-## same for putwin(3)
+# same for putwin(3)
. if !empty(USE_CURSES:Mputwin) && !empty(H_CURSES_PUTWIN:M__nonexistent__)
USE_BUILTIN.curses= no
. endif
+# same for set_escdelay(3)
+. if !empty(USE_CURSES:Mset_escdelay)
+. if !empty(H_CURSES_SET_ESCDELAY:M__nonexistent__)
+USE_BUILTIN.curses= no
+. endif
+. endif
# same for resizeterm(3)
. if !empty(USE_CURSES:Mresizeterm)
. if !empty(H_CURSES_RESIZETERM:M__nonexistent__)
USE_BUILTIN.curses= no
. endif
. endif
-## same for WA_NORMAL
+# same for WA_NORMAL
. if !empty(USE_CURSES:MWA_NORMAL)
. if !empty(H_CURSES_WA_NORMAL:M__nonexistent__)
USE_BUILTIN.curses= no
. endif
. endif
-## same for wgetnstr(3)
+# same for wgetnstr(3)
. if !empty(USE_CURSES:Mwgetnstr) && !empty(H_CURSES_WGETNSTR:M__nonexistent__)
USE_BUILTIN.curses= no
. endif