[pkgsrc/trunk]: pkgsrc/mk Teach termlib files about another possible native t...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/10b6ab43d8d3
branches:  trunk
changeset: 539103:10b6ab43d8d3
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Wed Feb 27 17:36:34 2008 +0000

description:
Teach termlib files about another possible native terminal library, tinfo.

diffstat:

 mk/termlib.buildlink3.mk |  7 ++++---
 mk/termlib.builtin.mk    |  7 +++++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diffs (55 lines):

diff -r e51f23dd84d5 -r 10b6ab43d8d3 mk/termlib.buildlink3.mk
--- a/mk/termlib.buildlink3.mk  Wed Feb 27 17:05:55 2008 +0000
+++ b/mk/termlib.buildlink3.mk  Wed Feb 27 17:36:34 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: termlib.buildlink3.mk,v 1.2 2008/02/27 06:10:25 jlam Exp $
+# $NetBSD: termlib.buildlink3.mk,v 1.3 2008/02/27 17:36:34 jlam Exp $
 #
 # This Makefile fragment is meant to be included by packages that require
 # a basic termlib implementation.
@@ -34,11 +34,12 @@
 
 .if ${TERMLIB_TYPE} == "none"
 PKG_FAIL_REASON=       "No usable terminal library found on the system."
-.elif (${TERMLIB_TYPE} == "termcap")
+.elif (${TERMLIB_TYPE} == "termcap") || \
+      (${TERMLIB_TYPE} == "tinfo")
 BUILDLINK_PACKAGES:=           ${BUILDLINK_PACKAGES:Ntermlib}
 BUILDLINK_PACKAGES+=           termlib
 BUILDLINK_ORDER:=              ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}termlib
-BUILDLINK_LIBNAME.termlib?=    termcap
+BUILDLINK_LIBNAME.termlib?=    ${BUILTIN_LIBNAME.termlib}
 BUILDLINK_LDADD.termlib?=      ${BUILDLINK_LIBNAME.termlib:S/^/-l/}
 BUILDLINK_BUILTIN_MK.termlib=  ../../mk/termlib.builtin.mk
 .elif ${TERMLIB_TYPE} == "curses"
diff -r e51f23dd84d5 -r 10b6ab43d8d3 mk/termlib.builtin.mk
--- a/mk/termlib.builtin.mk     Wed Feb 27 17:05:55 2008 +0000
+++ b/mk/termlib.builtin.mk     Wed Feb 27 17:36:34 2008 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: termlib.builtin.mk,v 1.2 2008/02/27 15:26:34 jlam Exp $
+# $NetBSD: termlib.builtin.mk,v 1.3 2008/02/27 17:36:34 jlam Exp $
 
 BUILTIN_PKG:=  termlib
 
-BUILTIN_FIND_LIBS:=    termcap curses
+BUILTIN_FIND_LIBS:=    termcap tinfo curses
 
 .include "buildlink3/bsd.builtin.mk"
 
@@ -13,6 +13,7 @@
 .if !defined(IS_BUILTIN.termlib)
 IS_BUILTIN.termlib=    no
 .  if !empty(BUILTIN_LIB_FOUND.termcap:M[yY][eE][sS]) || \
+      !empty(BUILTIN_LIB_FOUND.tinfo:M[yY][eE][sS]) || \
       !empty(BUILTIN_LIB_FOUND.curses:M[yY][eE][sS])
 IS_BUILTIN.termlib=    yes
 .  endif
@@ -37,6 +38,8 @@
 #
 .if !empty(BUILTIN_LIB_FOUND.termcap:M[yY][eE][sS])
 BUILTIN_LIBNAME.termlib=       termcap
+.elif !empty(BUILTIN_LIB_FOUND.tinfo:M[yY][eE][sS])
+BUILTIN_LIBNAME.termlib=       tinfo
 .elif !empty(BUILTIN_LIB_FOUND.curses:M[yY][eE][sS])
 BUILTIN_LIBNAME.termlib=       curses
 .endif