CVS commit: pkgsrc/mk

["Roy Marples" <roy%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   roy
Date:           Thu Jan  5 21:19:24 UTC 2017

Modified Files:
        pkgsrc/mk: curses.buildlink3.mk curses.builtin.mk

Log Message:
Add a test for set_escdelay


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 pkgsrc/mk/curses.buildlink3.mk
cvs rdiff -u -r1.12 -r1.13 pkgsrc/mk/curses.builtin.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mk/curses.buildlink3.mk
diff -u pkgsrc/mk/curses.buildlink3.mk:1.24 pkgsrc/mk/curses.buildlink3.mk:1.25
--- pkgsrc/mk/curses.buildlink3.mk:1.24 Wed Jan  4 15:52:50 2017
+++ pkgsrc/mk/curses.buildlink3.mk      Thu Jan  5 21:19:24 2017
@@ -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
 

Index: pkgsrc/mk/curses.builtin.mk
diff -u pkgsrc/mk/curses.builtin.mk:1.12 pkgsrc/mk/curses.builtin.mk:1.13
--- pkgsrc/mk/curses.builtin.mk:1.12    Mon Jan  2 10:49:33 2017
+++ pkgsrc/mk/curses.builtin.mk Thu Jan  5 21:19:24 2017
@@ -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_HALFD
 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