[pkgsrc/trunk]: pkgsrc/devel/ncurses + Always ensure that BUILTIN_LIBNAME.ncu...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/53a9a7a2f86f
branches:  trunk
changeset: 539168:53a9a7a2f86f
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Fri Feb 29 16:14:09 2008 +0000

description:
+ Always ensure that BUILTIN_LIBNAME.ncurses is defined (this should have
  been the case before, but wasn't due to a missing default vaule.

+ Move the BUILDLINK_TRANSFORM remapping of -lncurses into the section
  which only applies if we're using the built-in ncurses, and map it to
  -l${BUILTIN_LIBNAME.ncurses}.

This should fix the issue reported for Mac OS X where "-lncurses" was
being mapped to nothing by the wrapper scripts.

diffstat:

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

diffs (28 lines):

diff -r 2493e8c6cba6 -r 53a9a7a2f86f devel/ncurses/builtin.mk
--- a/devel/ncurses/builtin.mk  Fri Feb 29 16:04:55 2008 +0000
+++ b/devel/ncurses/builtin.mk  Fri Feb 29 16:14:09 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.21 2008/02/29 16:04:55 tron Exp $
+# $NetBSD: builtin.mk,v 1.22 2008/02/29 16:14:09 jlam Exp $
 
 BUILTIN_PKG:=  ncurses
 
@@ -103,6 +103,7 @@
 # Define BUILTIN_LIBNAME.ncurses to be the base name of the built-in
 # ncurses library.
 #
+BUILTIN_LIBNAME.ncurses=       ncurses
 .if !empty(BUILTIN_LIB_FOUND.ncurses:M[nN][oO]) && \
     !empty(BUILTIN_LIB_FOUND.curses:M[yY][eE][sS])
 BUILTIN_LIBNAME.ncurses=       curses
@@ -124,9 +125,9 @@
 CHECK_BUILTIN.ncurses?=        no
 .if !empty(CHECK_BUILTIN.ncurses:M[nN][oO])
 
-BUILDLINK_TRANSFORM+=          l:ncurses:${BUILDLINK_LIBNAME.ncurses}
 .  if !empty(USE_BUILTIN.ncurses:M[yY][eE][sS])
 BUILDLINK_LIBNAME.ncurses=     ${BUILTIN_LIBNAME.ncurses}
+BUILDLINK_TRANSFORM+=          l:ncurses:${BUILTIN_LIBNAME.ncurses}
 BUILDLINK_TARGETS+=            buildlink-curses-ncurses-h
 BUILDLINK_TARGETS+=            buildlink-ncurses-extra-includes
 .  endif