[pkgsrc/trunk]: pkgsrc/devel/ncurses Deal with USE_NCURSES if the built-in nc...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c786ee848a5b
branches:  trunk
changeset: 468886:c786ee848a5b
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Tue Feb 17 16:02:52 2004 +0000

description:
Deal with USE_NCURSES if the built-in ncurses really is ncurses.

diffstat:

 devel/ncurses/buildlink3.mk |  9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diffs (38 lines):

diff -r 0f314891e242 -r c786ee848a5b devel/ncurses/buildlink3.mk
--- a/devel/ncurses/buildlink3.mk       Tue Feb 17 15:58:43 2004 +0000
+++ b/devel/ncurses/buildlink3.mk       Tue Feb 17 16:02:52 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.18 2004/02/12 02:35:06 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2004/02/17 16:02:52 jlam Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 NCURSES_BUILDLINK3_MK:=        ${NCURSES_BUILDLINK3_MK}+
@@ -27,7 +27,7 @@
 
 .if !defined(BUILDLINK_IS_BUILTIN.ncurses)
 BUILDLINK_IS_BUILTIN.ncurses=  NO
-.  if ${_BLNK_LIBNCURSES_FOUND} == "YES"
+.  if !empty(_BLNK_LIBNCURSES_FOUND:M[yY][eE][sS])
 BUILDLINK_IS_BUILTIN.ncurses=  YES
 .  elif exists(${_NCURSES_H})
 _IS_BUILTIN.ncurses!=          \
@@ -113,7 +113,10 @@
 .endif
 
 .if defined(USE_NCURSES)
+.  if !empty(BUILDLINK_IS_BUILTIN.ncurses:M[yY][eE][sS]) && \
+      !empty(_BLNK_LIBNCURSES_FOUND:M[yY][eE][sS])
 BUILDLINK_USE_BUILTIN.ncurses= NO
+.  endif
 .endif
 
 .if !empty(BUILDLINK_CHECK_BUILTIN.ncurses:M[yY][eE][sS])
@@ -128,7 +131,7 @@
 
 .if !empty(NCURSES_BUILDLINK3_MK:M+)
 .  if !empty(BUILDLINK_USE_BUILTIN.ncurses:M[yY][eE][sS])
-.    if ${_BLNK_LIBNCURSES_FOUND} == "NO"
+.    if !empty(_BLNK_LIBNCURSES_FOUND:M[nN][oO])
 BUILDLINK_TRANSFORM.ncurses+=  -e "s|/curses\.h|/ncurses.h|g"
 BUILDLINK_TRANSFORM+=          l:ncurses:curses
 .    endif