[pkgsrc/trunk]: pkgsrc/devel/ncursesw If we're using real ncursesw, then forc...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/00e02de3704c
branches:  trunk
changeset: 538943:00e02de3704c
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Thu Feb 21 17:14:17 2008 +0000

description:
If we're using real ncursesw, then force using a real ncurses.

diffstat:

 devel/ncursesw/builtin.mk |  12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)

diffs (35 lines):

diff -r 5ec5eeff3609 -r 00e02de3704c devel/ncursesw/builtin.mk
--- a/devel/ncursesw/builtin.mk Thu Feb 21 16:50:50 2008 +0000
+++ b/devel/ncursesw/builtin.mk Thu Feb 21 17:14:17 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.3 2008/02/20 22:29:48 jlam Exp $
+# $NetBSD: builtin.mk,v 1.4 2008/02/21 17:14:17 jlam Exp $
 
 BUILTIN_PKG:=  ncursesw
 
@@ -87,14 +87,11 @@
 .endif
 MAKEVARS+=     USE_BUILTIN.ncursesw
 
-# If USE_NCURSESW is defined, then force the use of an ncurses/ncursesw
-# implementation.
+# If USE_NCURSESW is defined, then only use the built-in "ncursesw"
+# if it's *actually* ncursesw.
 #
-.if defined(USE_NCURSESW)
-USE_NCURSES=           yes
-.  if !empty(IS_BUILTIN.ncursesw:M[nN][oO])
+.if defined(USE_NCURSESW) && !empty(IS_BUILTIN.ncursesw:M[nN][oO])
 USE_BUILTIN.ncursesw=  no
-.  endif
 .endif
 
 ###
@@ -120,6 +117,7 @@
 .  if !empty(USE_BUILTIN.ncursesw:M[nN][oO]) || \
       (!empty(USE_BUILTIN.ncursesw:M[yY][eE][sS]) && 
        !empty(IS_BUILTIN.ncursesw:M[yY][eE][sS]))
+USE_NCURSES=                   yes
 BUILDLINK_CPPFLAGS.ncursesw+=  -D_XOPEN_SOURCE_EXTENDED=1
 .  endif
 BUILDLINK_TARGETS+=            buildlink-ncursesw-curses-h