diff options
| author | dholland <dholland> | 2010-07-26 06:49:30 +0000 |
|---|---|---|
| committer | dholland <dholland> | 2010-07-26 06:49:30 +0000 |
| commit | c53b3f88020fd9770547d4b1a6b08425961d1b44 (patch) | |
| tree | 527ac019ab27855c3271dfe7003dbc2eac5f41d7 /devel/ncurses | |
| parent | 48c80b871335005b435d7a6462c046bba7dd5438 (diff) | |
| download | pkgsrc-c53b3f88020fd9770547d4b1a6b08425961d1b44.tar.gz | |
The change in -r1.27 of this file failed to restore the old logic
completely; rectify that. Now setting USE_NCURSES=yes won't install
pkgsrc ncurses on e.g. Linux where it's really built in.
Not sure if a version bump is wanted, but since I just did one we'll
ride that.
Diffstat (limited to 'devel/ncurses')
| -rw-r--r-- | devel/ncurses/builtin.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/devel/ncurses/builtin.mk b/devel/ncurses/builtin.mk index 4aa9a765462..a0f86ec6072 100644 --- a/devel/ncurses/builtin.mk +++ b/devel/ncurses/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.27 2010/02/24 12:08:07 drochner Exp $ +# $NetBSD: builtin.mk,v 1.28 2010/07/26 06:49:30 dholland Exp $ BUILTIN_PKG:= ncurses @@ -97,7 +97,8 @@ 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]) +.if defined(USE_NCURSES) && !empty(USE_NCURSES:M[yY][eE][sS]) \ + && !empty(IS_BUILTIN.ncurses:M[nN][oO]) USE_BUILTIN.ncurses= no .endif # If it is set to chgat, a curses implementation with chgat(3) support |