diff options
| author | jlam <jlam> | 2008-02-27 02:26:07 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2008-02-27 02:26:07 +0000 |
| commit | 629e62ebf363096b64cdf2c6b74facaf257ba795 (patch) | |
| tree | 9ea778ebc241111de2f42a426883f5b2e49a1915 /mk | |
| parent | ca53324b02026dce562038bfbe598af9732d4d94 (diff) | |
| download | pkgsrc-629e62ebf363096b64cdf2c6b74facaf257ba795.tar.gz | |
Allow preferring a pkgsrc "curses" implementation for all packages
that include curses.buildlink3.mk. Generally, the rule is not to set
CURSES_DEFAULT unless it's to set it to "ncurses" or "pdcurses".
# Example mk.conf settings and their results.
# Use the system curses.
PREFER_NATIVE= yes # default value
CURSES_DEFAULT= curses # default value
# Use system "ncurses" if it's available, otherwise use devel/ncurses
# from pkgsrc.
#
PREFER_NATIVE= yes # default value
CURSES_DEFAULT= ncurses
# Use devel/ncurses from pkgsrc.
PREFER_PKGSRC= yes
# Use devel/pdcurses from pkgsrc.
PREFER_PKGSRC= yes
CURSES_DEFAULT= pdcurses
# This causes a package build failure because there is no pkgsrc
# curses.
#
PREFER_PKGSRC= yes
CURSES_DEFAULT= curses
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/curses.buildlink3.mk | 6 | ||||
| -rw-r--r-- | mk/curses.builtin.mk | 8 |
2 files changed, 4 insertions, 10 deletions
diff --git a/mk/curses.buildlink3.mk b/mk/curses.buildlink3.mk index f733445e46a..673dc05305a 100644 --- a/mk/curses.buildlink3.mk +++ b/mk/curses.buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: curses.buildlink3.mk,v 1.6 2008/02/25 04:19:34 jlam Exp $ +# $NetBSD: curses.buildlink3.mk,v 1.7 2008/02/27 02:26:07 jlam Exp $ # # This Makefile fragment is meant to be included by packages that require # any curses implementation instead of one particular one. The available @@ -49,14 +49,14 @@ CHECK_BUILTIN.curses:= no .if ${OPSYS} == "Interix" CURSES_DEFAULT?= ncurses .endif -.if defined(IS_BUILTIN.curses) && !empty(IS_BUILTIN.curses:M[yY][eE][sS]) +.if defined(USE_BUILTIN.curses) && !empty(USE_BUILTIN.curses:M[yY][eE][sS]) CURSES_DEFAULT?= curses .else CURSES_DEFAULT?= ncurses .endif _CURSES_ACCEPTED= # empty -.if defined(IS_BUILTIN.curses) && !empty(IS_BUILTIN.curses:M[yY][eE][sS]) +.if defined(USE_BUILTIN.curses) && !empty(USE_BUILTIN.curses:M[yY][eE][sS]) _CURSES_ACCEPTED+= curses # system curses exists .endif _CURSES_ACCEPTED+= ncurses # pkgsrc ncurses diff --git a/mk/curses.builtin.mk b/mk/curses.builtin.mk index 4b4fc2ff9c1..8e4a67a94db 100644 --- a/mk/curses.builtin.mk +++ b/mk/curses.builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: curses.builtin.mk,v 1.1 2008/02/25 04:19:34 jlam Exp $ +# $NetBSD: curses.builtin.mk,v 1.2 2008/02/27 02:26:07 jlam Exp $ BUILTIN_PKG:= curses @@ -25,12 +25,6 @@ MAKEVARS+= IS_BUILTIN.curses ### exists, and set USE_BUILTIN.<pkg> appropriate ("yes" or "no"). ### .if !defined(USE_BUILTIN.curses) -# -# There will probably never be a devel/curses package because ncurses is -# the recommended curses on many platforms, so we should always prefer the -# native curses package. -# -PREFER.curses= native . if ${PREFER.curses} == "pkgsrc" USE_BUILTIN.curses= no . else |