summaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
authortron <tron@pkgsrc.org>2008-02-29 15:28:12 +0000
committertron <tron@pkgsrc.org>2008-02-29 15:28:12 +0000
commit63a24d2dda84a81d55658b934280e339991b5ecf (patch)
tree52c3061a6a34012456310cfc291e6c1eacbcbace /devel
parentc9a6f53472ba4323068cb58010c42ee4f4c34f7e (diff)
downloadpkgsrc-63a24d2dda84a81d55658b934280e339991b5ecf.tar.gz
Don't setup bogus remapping of the "ncurses" library if we don't need
to change the name. This fixes the build on platforms which provide "libncurses" (e.g. Mac OS X).
Diffstat (limited to 'devel')
-rw-r--r--devel/ncurses/builtin.mk6
1 files changed, 4 insertions, 2 deletions
diff --git a/devel/ncurses/builtin.mk b/devel/ncurses/builtin.mk
index ec54325f293..6c0939b3896 100644
--- a/devel/ncurses/builtin.mk
+++ b/devel/ncurses/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.19 2008/02/27 15:26:34 jlam Exp $
+# $NetBSD: builtin.mk,v 1.20 2008/02/29 15:28:12 tron Exp $
BUILTIN_PKG:= ncurses
@@ -105,7 +105,7 @@ USE_BUILTIN.ncurses= no
#
.if !empty(BUILTIN_LIB_FOUND.ncurses:M[nN][oO]) && \
!empty(BUILTIN_LIB_FOUND.curses:M[yY][eE][sS])
-BUILTIN_LIBNAME.ncurses= curses
+#BUILTIN_LIBNAME.ncurses= curses
.endif
#
# On Interix, there is a libncurses.a and a libcurses.so but strangely,
@@ -124,7 +124,9 @@ BUILTIN_LIBNAME.ncurses= curses
CHECK_BUILTIN.ncurses?= no
.if !empty(CHECK_BUILTIN.ncurses:M[nN][oO])
+. if !empty(${BUILDLINK_LIBNAME.ncurses})
BUILDLINK_TRANSFORM+= l:ncurses:${BUILDLINK_LIBNAME.ncurses}
+. endif
. if !empty(USE_BUILTIN.ncurses:M[yY][eE][sS])
BUILDLINK_LIBNAME.ncurses= ${BUILTIN_LIBNAME.ncurses}
BUILDLINK_TARGETS+= buildlink-curses-ncurses-h