[pkgsrc/trunk]: pkgsrc Manipulate the buildlink depth so that libiconv and Xf...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/92a18708a93f
branches:  trunk
changeset: 471064:92a18708a93f
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Tue Mar 16 17:40:54 2004 +0000

description:
Manipulate the buildlink depth so that libiconv and Xfixes aren't added
to BUILDLINK_DEPENDS unless their respective buildlink3.mk files are
included by the top-level Makefile.

diffstat:

 devel/gettext-lib/builtin.mk |  4 +++-
 x11/xcursor/builtin.mk       |  4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diffs (38 lines):

diff -r 1d35ef7764e2 -r 92a18708a93f devel/gettext-lib/builtin.mk
--- a/devel/gettext-lib/builtin.mk      Tue Mar 16 16:52:58 2004 +0000
+++ b/devel/gettext-lib/builtin.mk      Tue Mar 16 17:40:54 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.1 2004/03/10 17:57:14 jlam Exp $
+# $NetBSD: builtin.mk,v 1.2 2004/03/16 17:40:54 jlam Exp $
 
 .if !defined(_BLNK_LIBINTL_FOUND)
 _BLNK_LIBINTL_FOUND!=  \
@@ -106,7 +106,9 @@
 .  if ${_GETTEXT_NEEDS_ICONV} == "yes"
 .    for _mkfile_ in buildlink3.mk builtin.mk
 .      if exists(../../converters/libiconv/${_mkfile_})
+BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 .        include "../../converters/libiconv/${_mkfile_}"
+BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH:S/+$//}
 .      endif
 .    endfor
 BUILDLINK_DEPENDS.gettext+=    ${_GETTEXT_ICONV_DEPENDS}
diff -r 1d35ef7764e2 -r 92a18708a93f x11/xcursor/builtin.mk
--- a/x11/xcursor/builtin.mk    Tue Mar 16 16:52:58 2004 +0000
+++ b/x11/xcursor/builtin.mk    Tue Mar 16 17:40:54 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.1 2004/03/10 17:57:15 jlam Exp $
+# $NetBSD: builtin.mk,v 1.2 2004/03/16 17:40:54 jlam Exp $
 
 _X11_XCURSOR_XCURSOR_H=        ${X11BASE}/include/X11/Xcursor/Xcursor.h
 
@@ -56,7 +56,9 @@
 BUILDLINK_DEPENDS.Xrender+=    Xrender>=0.8
 .  for _mkfile_ in buildlink3.mk builtin.mk
 .    if exists(../../x11/Xfixes/${_mkfile_})
+BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 .      include "../../x11/Xfixes/${_mkfile_}"
+BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH:S/+$//}
 .    endif
 .  endfor
 .endif