From 4b94f821f2c862689fb4606ede02d728aa294958 Mon Sep 17 00:00:00 2001 From: jlam Date: Tue, 26 Feb 2008 17:21:13 +0000 Subject: Always make ncurses headers and libraries available as and -lcurses so that GNU configure scripts that check for those ahead of and -lncurses will still use ncurses instead of picking up a system curses. This was a regression introduced by my recent ncurses commits. --- devel/ncurses/buildlink3.mk | 8 +++----- devel/ncurses/builtin.mk | 3 +-- 2 files changed, 4 insertions(+), 7 deletions(-) (limited to 'devel') 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 and -lcurses. +# Many packages expect the ncurses headers and libraries to be usable as +# 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 -- cgit v1.2.3