pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/devel/ncurses Don't setup bogus remapping of the "ncur...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/b4d26a3dff15
branches:  trunk
changeset: 539166:b4d26a3dff15
user:      tron <tron%pkgsrc.org@localhost>
date:      Fri Feb 29 15:28:12 2008 +0000

description:
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:

 devel/ncurses/builtin.mk |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (28 lines):

diff -r 650e1e2076bc -r b4d26a3dff15 devel/ncurses/builtin.mk
--- a/devel/ncurses/builtin.mk  Fri Feb 29 13:31:20 2008 +0000
+++ b/devel/ncurses/builtin.mk  Fri Feb 29 15:28:12 2008 +0000
@@ -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 @@
 #
 .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 @@
 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



Home | Main Index | Thread Index | Old Index