summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--devel/ncursesw/builtin.mk12
1 files changed, 5 insertions, 7 deletions
diff --git a/devel/ncursesw/builtin.mk b/devel/ncursesw/builtin.mk
index b9ac497287d..8b561bf7ca6 100644
--- a/devel/ncursesw/builtin.mk
+++ b/devel/ncursesw/builtin.mk
@@ -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 @@ USE_BUILTIN.ncursesw= yes
.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 @@ BUILDLINK_CPPFLAGS.ncursesw+= -DHAVE_WCHAR=1
. 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