Wed Feb 27 06:15:04 2008 UTC ()
Set BUILDLINK_LDADD.curses in the CURSES_TYPE == "curses" case.


(jlam)
diff -r1.8 -r1.9 pkgsrc/mk/curses.buildlink3.mk
cvs diff -r1.8 -r1.9 pkgsrc/mk/curses.buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/mk/curses.buildlink3.mk 2008/02/27 04:47:02 1.8
+++ pkgsrc/mk/curses.buildlink3.mk 2008/02/27 06:15:04 1.9
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: curses.buildlink3.mk,v 1.8 2008/02/27 04:47:02 jlam Exp $ 1# $NetBSD: curses.buildlink3.mk,v 1.9 2008/02/27 06:15:04 jlam Exp $
2# 2#
3# This Makefile fragment is meant to be included by packages that require 3# This Makefile fragment is meant to be included by packages that require
4# any curses implementation instead of one particular one. The available 4# any curses implementation instead of one particular one. The available
5# curses implementations are "curses" if built-in, "ncurses", and 5# curses implementations are "curses" if built-in, "ncurses", and
6# "pdcurses". 6# "pdcurses".
7# 7#
8# If a package genuinely requires ncurses or pdcurses, then it should 8# If a package genuinely requires ncurses or pdcurses, then it should
9# directly include the appropriate buildlink3.mk instead of this file in 9# directly include the appropriate buildlink3.mk instead of this file in
10# the package Makefile. 10# the package Makefile.
11# 11#
12# === User-settable variables === 12# === User-settable variables ===
13# 13#
14# CURSES_DEFAULT 14# CURSES_DEFAULT
@@ -77,24 +77,26 @@ BUILD_DEFS_EFFECTS+= CURSES_TYPE @@ -77,24 +77,26 @@ BUILD_DEFS_EFFECTS+= CURSES_TYPE
77# <curses.h> and -lcurses. 77# <curses.h> and -lcurses.
78# 78#
79_PKG_USE_CURSES= yes 79_PKG_USE_CURSES= yes
80 80
81.endif # CURSES_BUILDLINK3_MK 81.endif # CURSES_BUILDLINK3_MK
82 82
83.if ${CURSES_TYPE} == "none" 83.if ${CURSES_TYPE} == "none"
84PKG_FAIL_REASON= \ 84PKG_FAIL_REASON= \
85 "${_CURSES_TYPE} is not an acceptable curses type for ${PKGNAME}." 85 "${_CURSES_TYPE} is not an acceptable curses type for ${PKGNAME}."
86.elif ${CURSES_TYPE} == "curses" 86.elif ${CURSES_TYPE} == "curses"
87BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ncurses} 87BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ncurses}
88BUILDLINK_PACKAGES+= curses 88BUILDLINK_PACKAGES+= curses
89BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}curses 89BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}curses
 90BUILDLINK_LIBNAME.curses?= ${BUILTIN_LIBNAME.curses}
 91BUILDLINK_LDADD.curses?= ${BUILDLINK_LIBNAME.curses:S/^/-l/}
90BUILDLINK_BUILTIN_MK.curses= ../../mk/curses.builtin.mk 92BUILDLINK_BUILTIN_MK.curses= ../../mk/curses.builtin.mk
91.elif ${CURSES_TYPE} == "ncurses" 93.elif ${CURSES_TYPE} == "ncurses"
92USE_NCURSES= yes 94USE_NCURSES= yes
93. include "../../devel/ncurses/buildlink3.mk" 95. include "../../devel/ncurses/buildlink3.mk"
94BUILDLINK_LIBNAME.curses?= ${BUILDLINK_LIBNAME.ncurses} 96BUILDLINK_LIBNAME.curses?= ${BUILDLINK_LIBNAME.ncurses}
95BUILDLINK_LDADD.curses?= ${BUILDLINK_LDADD.ncurses} 97BUILDLINK_LDADD.curses?= ${BUILDLINK_LDADD.ncurses}
96.elif ${CURSES_TYPE} == "pdcurses" 98.elif ${CURSES_TYPE} == "pdcurses"
97. include "../../devel/pdcurses/buildlink3.mk" 99. include "../../devel/pdcurses/buildlink3.mk"
98BUILDLINK_LIBNAME.curses?= ${BUILDLINK_LIBNAME.pdcurses} 100BUILDLINK_LIBNAME.curses?= ${BUILDLINK_LIBNAME.pdcurses}
99BUILDLINK_LDADD.curses?= ${BUILDLINK_LDADD.pdcurses} 101BUILDLINK_LDADD.curses?= ${BUILDLINK_LDADD.pdcurses}
100.endif 102.endif