summaryrefslogtreecommitdiff
path: root/devel/ncurses
diff options
context:
space:
mode:
authordholland <dholland@pkgsrc.org>2010-07-26 07:23:59 +0000
committerdholland <dholland@pkgsrc.org>2010-07-26 07:23:59 +0000
commit88c24c27029c407737e09342b82a6beb2e1e3708 (patch)
tree07177e187765cc4401681fdbc3004e20746daa3e /devel/ncurses
parentdc0fefc92e6f903d11a3d2267d68ec4e6d8743da (diff)
downloadpkgsrc-88c24c27029c407737e09342b82a6beb2e1e3708.tar.gz
Fix previous; I did test it, but it seems that under some
circumstances make doesn't like the conditional I wrote. (also, what the previous log message says about a bump is wrong; I bumped only ncursesw. but there shouldn't be any need to bump ncurses for this.)
Diffstat (limited to 'devel/ncurses')
-rw-r--r--devel/ncurses/builtin.mk7
1 files changed, 4 insertions, 3 deletions
diff --git a/devel/ncurses/builtin.mk b/devel/ncurses/builtin.mk
index a0f86ec6072..840fec96d67 100644
--- a/devel/ncurses/builtin.mk
+++ b/devel/ncurses/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.28 2010/07/26 06:49:30 dholland Exp $
+# $NetBSD: builtin.mk,v 1.29 2010/07/26 07:23:59 dholland Exp $
BUILTIN_PKG:= ncurses
@@ -97,10 +97,11 @@ MAKEVARS+= USE_BUILTIN.ncurses
# If USE_NCURSES is set to yes, the use of an ncurses implementation
# is forced.
-.if defined(USE_NCURSES) && !empty(USE_NCURSES:M[yY][eE][sS]) \
- && !empty(IS_BUILTIN.ncurses:M[nN][oO])
+.if defined(USE_NCURSES) && !empty(USE_NCURSES:M[yY][eE][sS])
+.if !empty(IS_BUILTIN.ncurses:M[nN][oO])
USE_BUILTIN.ncurses= no
.endif
+.endif
# If it is set to chgat, a curses implementation with chgat(3) support
# is considered good enough.
.if defined(USE_NCURSES) && empty(USE_NCURSES:M[yY][eE][sS])