summaryrefslogtreecommitdiff
path: root/devel/ncurses
diff options
context:
space:
mode:
authorjlam <jlam>2004-02-17 16:02:52 +0000
committerjlam <jlam>2004-02-17 16:02:52 +0000
commite14779c0cf5983b05b6ffff959752903621d7b2f (patch)
treee7f7c5abe0865d109cb07b747c98ba961c5220ad /devel/ncurses
parent81eaf058533e8d43eca9d8bcbaccfb060623e9e8 (diff)
downloadpkgsrc-e14779c0cf5983b05b6ffff959752903621d7b2f.tar.gz
Deal with USE_NCURSES if the built-in ncurses really is ncurses.
Diffstat (limited to 'devel/ncurses')
-rw-r--r--devel/ncurses/buildlink3.mk9
1 files changed, 6 insertions, 3 deletions
diff --git a/devel/ncurses/buildlink3.mk b/devel/ncurses/buildlink3.mk
index e3a8854f906..f34004151d5 100644
--- a/devel/ncurses/buildlink3.mk
+++ b/devel/ncurses/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.18 2004/02/12 02:35:06 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2004/02/17 16:02:52 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
NCURSES_BUILDLINK3_MK:= ${NCURSES_BUILDLINK3_MK}+
@@ -27,7 +27,7 @@ _NCURSES_H= /usr/include/curses.h
.if !defined(BUILDLINK_IS_BUILTIN.ncurses)
BUILDLINK_IS_BUILTIN.ncurses= NO
-. if ${_BLNK_LIBNCURSES_FOUND} == "YES"
+. if !empty(_BLNK_LIBNCURSES_FOUND:M[yY][eE][sS])
BUILDLINK_IS_BUILTIN.ncurses= YES
. elif exists(${_NCURSES_H})
_IS_BUILTIN.ncurses!= \
@@ -113,7 +113,10 @@ BUILDLINK_USE_BUILTIN.ncurses= NO
.endif
.if defined(USE_NCURSES)
+. if !empty(BUILDLINK_IS_BUILTIN.ncurses:M[yY][eE][sS]) && \
+ !empty(_BLNK_LIBNCURSES_FOUND:M[yY][eE][sS])
BUILDLINK_USE_BUILTIN.ncurses= NO
+. endif
.endif
.if !empty(BUILDLINK_CHECK_BUILTIN.ncurses:M[yY][eE][sS])
@@ -128,7 +131,7 @@ BUILDLINK_DEPENDS+= ncurses
.if !empty(NCURSES_BUILDLINK3_MK:M+)
. if !empty(BUILDLINK_USE_BUILTIN.ncurses:M[yY][eE][sS])
-. if ${_BLNK_LIBNCURSES_FOUND} == "NO"
+. if !empty(_BLNK_LIBNCURSES_FOUND:M[nN][oO])
BUILDLINK_TRANSFORM.ncurses+= -e "s|/curses\.h|/ncurses.h|g"
BUILDLINK_TRANSFORM+= l:ncurses:curses
. endif