Fri Mar 20 20:10:15 2009 UTC ()
Restore duplication check for _BLNK_PACKAGES that got lost with earlier
versions and was not fatal.


(joerg)
diff -r1.205 -r1.206 pkgsrc/mk/buildlink3/bsd.buildlink3.mk
cvs diff -r1.205 -r1.206 pkgsrc/mk/buildlink3/bsd.buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/mk/buildlink3/bsd.buildlink3.mk 2009/03/20 19:25:01 1.205
+++ pkgsrc/mk/buildlink3/bsd.buildlink3.mk 2009/03/20 20:10:15 1.206
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: bsd.buildlink3.mk,v 1.205 2009/03/20 19:25:01 joerg Exp $ 1# $NetBSD: bsd.buildlink3.mk,v 1.206 2009/03/20 20:10:15 joerg Exp $
2# 2#
3# Copyright (c) 2004 The NetBSD Foundation, Inc. 3# Copyright (c) 2004 The NetBSD Foundation, Inc.
4# All rights reserved. 4# All rights reserved.
5# 5#
6# This code is derived from software contributed to The NetBSD Foundation 6# This code is derived from software contributed to The NetBSD Foundation
7# by Johnny C. Lam. 7# by Johnny C. Lam.
8# 8#
9# Redistribution and use in source and binary forms, with or without 9# Redistribution and use in source and binary forms, with or without
10# modification, are permitted provided that the following conditions 10# modification, are permitted provided that the following conditions
11# are met: 11# are met:
12# 1. Redistributions of source code must retain the above copyright 12# 1. Redistributions of source code must retain the above copyright
13# notice, this list of conditions and the following disclaimer. 13# notice, this list of conditions and the following disclaimer.
14# 2. Redistributions in binary form must reproduce the above copyright 14# 2. Redistributions in binary form must reproduce the above copyright
@@ -136,27 +136,27 @@ IGNORE_PKG.${_pkg_}= yes @@ -136,27 +136,27 @@ IGNORE_PKG.${_pkg_}= yes
136MAKEFLAGS+= IGNORE_PKG.${_pkg_}=${IGNORE_PKG.${_pkg_}} 136MAKEFLAGS+= IGNORE_PKG.${_pkg_}=${IGNORE_PKG.${_pkg_}}
137. endif 137. endif
138. endif 138. endif
139.endfor 139.endfor
140 140
141# _BLNK_PACKAGES contains all of the unique elements of BUILDLINK_TREE 141# _BLNK_PACKAGES contains all of the unique elements of BUILDLINK_TREE
142# that shouldn't be skipped. 142# that shouldn't be skipped.
143# 143#
144# This does not use _BUILDLINK_TREE as the order matters. x11-links is 144# This does not use _BUILDLINK_TREE as the order matters. x11-links is
145# sorted first to allow other packages to override the content. 145# sorted first to allow other packages to override the content.
146# 146#
147_BLNK_PACKAGES= # empty 147_BLNK_PACKAGES= # empty
148.for _pkg_ in ${BUILDLINK_TREE:N-*:Mx11-links} ${BUILDLINK_TREE:N-*:Nx11-links} 148.for _pkg_ in ${BUILDLINK_TREE:N-*:Mx11-links} ${BUILDLINK_TREE:N-*:Nx11-links}
149. if !defined(IGNORE_PKG.${_pkg_}) 149. if empty(_BLNK_PACKAGES:M${_pkg_}) && !defined(IGNORE_PKG.${_pkg_})
150_BLNK_PACKAGES+= ${_pkg_} 150_BLNK_PACKAGES+= ${_pkg_}
151. endif 151. endif
152.endfor 152.endfor
153 153
154_VARGROUPS+= bl3 154_VARGROUPS+= bl3
155.for v in BINDIR CFLAGS CPPFLAGS DEPENDS LDFLAGS LIBS 155.for v in BINDIR CFLAGS CPPFLAGS DEPENDS LDFLAGS LIBS
156_SYS_VARS.bl3+= BUILDLINK_${v} 156_SYS_VARS.bl3+= BUILDLINK_${v}
157.endfor 157.endfor
158.for p in ${_BUILDLINK_TREE} 158.for p in ${_BUILDLINK_TREE}
159. for v in AUTO_VARS BUILTIN_MK CONTENTS_FILTER CPPFLAGS DEPMETHOD FILES_CMD INCDIRS IS_DEPOT LDFLAGS LIBDIRS PKGNAME PREFIX RPATHDIRS 159. for v in AUTO_VARS BUILTIN_MK CONTENTS_FILTER CPPFLAGS DEPMETHOD FILES_CMD INCDIRS IS_DEPOT LDFLAGS LIBDIRS PKGNAME PREFIX RPATHDIRS
160_SYS_VARS.bl3+= BUILDLINK_${v}.${p} 160_SYS_VARS.bl3+= BUILDLINK_${v}.${p}
161. endfor 161. endfor
162. for v in IGNORE_PKG USE_BUILTIN 162. for v in IGNORE_PKG USE_BUILTIN