From 42f8d093407fc7d0679777d3c513217d4f2f158c Mon Sep 17 00:00:00 2001 From: rillig Date: Sun, 14 Aug 2005 19:52:26 +0000 Subject: Reverted the change from revision 1.1710, which sorted all DEPENDS and BUILD_DEPENDS alphabetically. Some packages depend on the first-come-first-serve order. --- mk/bsd.pkg.mk | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 34d49fa765c..bac790f4541 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1713 2005/08/14 17:26:13 kristerw Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1714 2005/08/14 19:52:26 rillig Exp $ # # This file is in the public domain. # @@ -3603,13 +3603,12 @@ pre-install-depends: FATAL_OBJECT_FMT_SKEW?= yes WARN_NO_OBJECT_FMT?= yes -_DEPENDS_AND_BUILD_DEPENDS= ${DEPENDS} ${BUILD_DEPENDS} install-depends: pre-install-depends . if !empty(DEPENDS) || !empty(BUILD_DEPENDS) . if defined(NO_DEPENDS) @${DO_NADA} . else # !DEPENDS -. for dep in ${_DEPENDS_AND_BUILD_DEPENDS:O} +. for dep in ${DEPENDS} ${BUILD_DEPENDS} ${_PKG_SILENT}${_PKG_DEBUG} \ pkg="${dep:C/:.*//}"; \ dir="${dep:C/[^:]*://:C/:.*$//}"; \ -- cgit v1.2.3