[pkgsrc/trunk]: pkgsrc/mk Protect against possibly empty BUILDLINK_LIBNAME.* ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/43c84f1ea96e
branches:  trunk
changeset: 539074:43c84f1ea96e
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Wed Feb 27 06:10:25 2008 +0000

description:
Protect against possibly empty BUILDLINK_LIBNAME.* variables when
defining BUILDLINK_LDADD.* by using a substitution instead of directly
prepending "-l".

diffstat:

 devel/ncurses/buildlink3.mk  |  4 ++--
 devel/pdcurses/buildlink3.mk |  4 ++--
 mk/termlib.buildlink3.mk     |  4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diffs (54 lines):

diff -r 37b1a6ba7de9 -r 43c84f1ea96e devel/ncurses/buildlink3.mk
--- a/devel/ncurses/buildlink3.mk       Wed Feb 27 04:47:02 2008 +0000
+++ b/devel/ncurses/buildlink3.mk       Wed Feb 27 06:10:25 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.30 2008/02/27 04:47:02 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.31 2008/02/27 06:10:25 jlam Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 NCURSES_BUILDLINK3_MK:=        ${NCURSES_BUILDLINK3_MK}+
@@ -16,7 +16,7 @@
 BUILDLINK_ABI_DEPENDS.ncurses+=        ncurses>=5.4nb1
 BUILDLINK_PKGSRCDIR.ncurses?=  ../../devel/ncurses
 BUILDLINK_LIBNAME.ncurses=     ncurses
-BUILDLINK_LDADD.ncurses?=      -l${BUILDLINK_LIBNAME.ncurses}
+BUILDLINK_LDADD.ncurses?=      ${BUILDLINK_LIBNAME.ncurses:S/^/-l/}
 
 # Many packages expect the ncurses headers and libraries to be usable as
 # <curses.h> and -lcurses.
diff -r 37b1a6ba7de9 -r 43c84f1ea96e devel/pdcurses/buildlink3.mk
--- a/devel/pdcurses/buildlink3.mk      Wed Feb 27 04:47:02 2008 +0000
+++ b/devel/pdcurses/buildlink3.mk      Wed Feb 27 06:10:25 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2008/02/27 04:47:02 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2008/02/27 06:10:25 jlam Exp $
 
 BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH}+
 PDCURSES_BUILDLINK3_MK:=       ${PDCURSES_BUILDLINK3_MK}+
@@ -15,7 +15,7 @@
 BUILDLINK_API_DEPENDS.pdcurses+=       pdcurses>=3.3
 BUILDLINK_PKGSRCDIR.pdcurses?=         ../../devel/pdcurses
 BUILDLINK_LIBNAME.pdcurses=            XCurses
-BUILDLINK_LDADD.pdcurses?=             -l${BUILDLINK_LIBNAME.pdcurses}
+BUILDLINK_LDADD.pdcurses?=             ${BUILDLINK_LIBNAME.pdcurses:S/^/-l/}
 
 # _PKG_USE_CURSES is defined by curses.buildlink3.mk to indicate that
 # the headers and libraries should be usable as <curses.h> and -lcurses.
diff -r 37b1a6ba7de9 -r 43c84f1ea96e mk/termlib.buildlink3.mk
--- a/mk/termlib.buildlink3.mk  Wed Feb 27 04:47:02 2008 +0000
+++ b/mk/termlib.buildlink3.mk  Wed Feb 27 06:10:25 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: termlib.buildlink3.mk,v 1.1 2008/02/27 04:47:02 jlam Exp $
+# $NetBSD: termlib.buildlink3.mk,v 1.2 2008/02/27 06:10:25 jlam Exp $
 #
 # This Makefile fragment is meant to be included by packages that require
 # a basic termlib implementation.
@@ -39,7 +39,7 @@
 BUILDLINK_PACKAGES+=           termlib
 BUILDLINK_ORDER:=              ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}termlib
 BUILDLINK_LIBNAME.termlib?=    termcap
-BUILDLINK_LDADD.termlib?=      -l${BUILDLINK_LIBNAME.termlib}
+BUILDLINK_LDADD.termlib?=      ${BUILDLINK_LIBNAME.termlib:S/^/-l/}
 BUILDLINK_BUILTIN_MK.termlib=  ../../mk/termlib.builtin.mk
 .elif ${TERMLIB_TYPE} == "curses"
 .  include "../../mk/curses.buildlink3.mk"