[pkgsrc/trunk]: pkgsrc/devel/ncurses Always make ncurses headers and librarie...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/225ac7180844
branches:  trunk
changeset: 539067:225ac7180844
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Tue Feb 26 17:21:13 2008 +0000

description:
Always make ncurses headers and libraries available as <curses.h> and
-lcurses so that GNU configure scripts that check for those ahead of
<ncurses.h> and -lncurses will still use ncurses instead of picking up
a system curses.

This was a regression introduced by my recent ncurses commits.

diffstat:

 devel/ncurses/buildlink3.mk |  8 +++-----
 devel/ncurses/builtin.mk    |  3 +--
 2 files changed, 4 insertions(+), 7 deletions(-)

diffs (42 lines):

diff -r c21e7651ebba -r 225ac7180844 devel/ncurses/buildlink3.mk
--- a/devel/ncurses/buildlink3.mk       Tue Feb 26 17:16:24 2008 +0000
+++ b/devel/ncurses/buildlink3.mk       Tue Feb 26 17:21:13 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.28 2008/02/25 04:19:34 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.29 2008/02/26 17:21:13 jlam Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 NCURSES_BUILDLINK3_MK:=        ${NCURSES_BUILDLINK3_MK}+
@@ -17,13 +17,11 @@
 BUILDLINK_PKGSRCDIR.ncurses?=  ../../devel/ncurses
 BUILDLINK_LDADD.ncurses?=      -lncurses
 
-# _PKG_USE_CURSES is defined by curses.buildlink3.mk to indicate that
-# the headers and libraries should be usable as <curses.h> and -lcurses.
+# Many packages expect the ncurses headers and libraries to be usable as
+# <curses.h> and -lcurses.
 #
-.  if defined(_PKG_USE_CURSES)
 BUILDLINK_TARGETS+=    buildlink-ncurses-curses-h
 BUILDLINK_TRANSFORM+=  l:curses:ncurses
-.  endif
 
 .PHONY: buildlink-ncurses-curses-h
 buildlink-ncurses-curses-h:
diff -r c21e7651ebba -r 225ac7180844 devel/ncurses/builtin.mk
--- a/devel/ncurses/builtin.mk  Tue Feb 26 17:16:24 2008 +0000
+++ b/devel/ncurses/builtin.mk  Tue Feb 26 17:21:13 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.15 2008/02/26 17:02:30 jlam Exp $
+# $NetBSD: builtin.mk,v 1.16 2008/02/26 17:21:13 jlam Exp $
 
 BUILTIN_PKG:=  ncurses
 
@@ -127,7 +127,6 @@
 BUILDLINK_TARGETS+=            buildlink-curses-ncurses-h
 BUILDLINK_TARGETS+=            buildlink-ncurses-extra-includes
 .  endif
-BUILDLINK_TARGETS+=            buildlink-ncurses-curses-h
 
 # A full ncurses implementation provides more headers than some curses
 # implementations.  Touch empty replacements for those headers so that