diff options
| author | jlam <jlam@pkgsrc.org> | 2008-02-26 17:21:13 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2008-02-26 17:21:13 +0000 |
| commit | 3723aceeb590aea68dc0564d00fd1940fb7166eb (patch) | |
| tree | d0772fa99484dc5d3310a5fccacdd60498370f41 | |
| parent | fb4567998b86e7406b44382d8d1c60c95d128686 (diff) | |
| download | pkgsrc-3723aceeb590aea68dc0564d00fd1940fb7166eb.tar.gz | |
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.
| -rw-r--r-- | devel/ncurses/buildlink3.mk | 8 | ||||
| -rw-r--r-- | devel/ncurses/builtin.mk | 3 |
2 files changed, 4 insertions, 7 deletions
diff --git a/devel/ncurses/buildlink3.mk b/devel/ncurses/buildlink3.mk index b1a4814550b..0dce2a298a3 100644 --- a/devel/ncurses/buildlink3.mk +++ b/devel/ncurses/buildlink3.mk @@ -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_ABI_DEPENDS.ncurses+= ncurses>=5.4nb1 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 --git a/devel/ncurses/builtin.mk b/devel/ncurses/builtin.mk index c2d2ec5826b..e7e6dce54d7 100644 --- a/devel/ncurses/builtin.mk +++ b/devel/ncurses/builtin.mk @@ -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_TRANSFORM+= l:ncurses:curses 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 |