[pkgsrc/trunk]: pkgsrc/devel/ncursesw Provide value for BUILDLINK_LDADD.ncurs...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5e3ced558ed9
branches:  trunk
changeset: 539175:5e3ced558ed9
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Fri Feb 29 19:23:07 2008 +0000

description:
Provide value for BUILDLINK_LDADD.ncursesw that can be used by packages
that need to know how to link against ncursesw.

diffstat:

 devel/ncursesw/buildlink3.mk |   5 ++++-
 devel/ncursesw/builtin.mk    |  18 +++++++++++++-----
 2 files changed, 17 insertions(+), 6 deletions(-)

diffs (65 lines):

diff -r 79e61f1a04c0 -r 5e3ced558ed9 devel/ncursesw/buildlink3.mk
--- a/devel/ncursesw/buildlink3.mk      Fri Feb 29 16:58:14 2008 +0000
+++ b/devel/ncursesw/buildlink3.mk      Fri Feb 29 19:23:07 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2008/02/20 17:17:46 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2008/02/29 19:23:07 jlam Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 NCURSESW_BUILDLINK3_MK:=${NCURSESW_BUILDLINK3_MK}+
@@ -15,6 +15,9 @@
 BUILDLINK_API_DEPENDS.ncursesw+=       ncursesw>=5.5
 BUILDLINK_ABI_DEPENDS.ncursesw+=       ncursesw>=5.5
 BUILDLINK_PKGSRCDIR.ncursesw?=         ../../devel/ncursesw
+
+BUILDLINK_LIBNAME.ncursesw=    ncursesw
+BUILDLINK_LDADD.ncursesw=      ${BUILDLINK_LIBNAME.ncursesw:S/^/-l/:S/^-l$//}
 .endif # NCURSESW_BUILDLINK3_MK
 
 .include "../../devel/ncurses/buildlink3.mk"
diff -r 79e61f1a04c0 -r 5e3ced558ed9 devel/ncursesw/builtin.mk
--- a/devel/ncursesw/builtin.mk Fri Feb 29 16:58:14 2008 +0000
+++ b/devel/ncursesw/builtin.mk Fri Feb 29 19:23:07 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.6 2008/02/22 13:48:21 tron Exp $
+# $NetBSD: builtin.mk,v 1.7 2008/02/29 19:23:07 jlam Exp $
 
 BUILTIN_PKG:=  ncursesw
 
@@ -7,7 +7,7 @@
 #
 # XXX Need to deal with Solaris <curses.h>
 #
-BUILTIN_FIND_LIBS:=                    ncursesw
+BUILTIN_FIND_LIBS:=                    ncursesw curses
 BUILTIN_FIND_FILES_VAR:=               H_NB_CURSESW H_NCURSESW
 BUILTIN_FIND_FILES.H_NB_CURSESW=       /usr/include/curses.h
 BUILTIN_FIND_GREP.H_NB_CURSESW=                \#ifdef[        ]*HAVE_WCHAR
@@ -94,6 +94,15 @@
 USE_BUILTIN.ncursesw=  no
 .endif
 
+# Define BUILTIN_LIBNAME.ncursesw to be the base name of the built-in
+# ncursesw library.
+#
+.if !empty(BUILTIN_LIB_FOUND.ncursesw:M[yY][eE][sS])
+BUILTIN_LIBNAME.ncursesw=      ncursesw
+.elif !empty(BUILTIN_LIB_FOUND.curses:M[yY][eE][sS])
+BUILTIN_LIBNAME.ncursesw=      curses
+.endif
+
 ###
 ### The section below only applies if we are not including this file
 ### solely to determine whether a built-in implementation exists.
@@ -102,9 +111,8 @@
 .if !empty(CHECK_BUILTIN.ncursesw:M[nN][oO])
 
 .  if !empty(USE_BUILTIN.ncursesw:M[yY][eE][sS])
-.    if !empty(BUILTIN_LIB_FOUND.ncursesw:M[nN][oO])
-BUILDLINK_TRANSFORM+=          l:ncursesw:curses
-.    endif
+BUILDLINK_LIBNAME.ncursesw=    ${BUILTIN_LIBNAME.ncursesw}
+BUILDLINK_TRANSFORM+=          l:ncursesw:${BUILTIN_LIBNAME.ncursesw}
 .    if empty(H_NB_CURSESW:M__nonexistent__) && \
        empty(H_NB_CURSESW:M${LOCALBASE}/*)
 BUILDLINK_CPPFLAGS.ncursesw+=  -DHAVE_WCHAR=1