[pkgsrc/trunk]: pkgsrc/mk Allow preferring a pkgsrc "curses" implementation f...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/cd6f1923a772
branches:  trunk
changeset: 539072:cd6f1923a772
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Wed Feb 27 02:26:07 2008 +0000

description:
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:

 mk/curses.buildlink3.mk |  6 +++---
 mk/curses.builtin.mk    |  8 +-------
 2 files changed, 4 insertions(+), 10 deletions(-)

diffs (48 lines):

diff -r 2f78883a8ebd -r cd6f1923a772 mk/curses.buildlink3.mk
--- a/mk/curses.buildlink3.mk   Wed Feb 27 00:24:19 2008 +0000
+++ b/mk/curses.buildlink3.mk   Wed Feb 27 02:26:07 2008 +0000
@@ -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 @@
 .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 -r 2f78883a8ebd -r cd6f1923a772 mk/curses.builtin.mk
--- a/mk/curses.builtin.mk      Wed Feb 27 00:24:19 2008 +0000
+++ b/mk/curses.builtin.mk      Wed Feb 27 02:26:07 2008 +0000
@@ -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 @@
 ### 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