From 6c85f407d1372e986e6cfce0f8be018d75218119 Mon Sep 17 00:00:00 2001 From: espie Date: Tue, 16 Nov 2010 09:39:45 +0000 Subject: [PATCH] missed _print-plist-with-extra-depends, noticed by jasper@ --- infrastructure/mk/bsd.port.mk | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/infrastructure/mk/bsd.port.mk b/infrastructure/mk/bsd.port.mk index dd78dae4b01..53396751768 100644 --- a/infrastructure/mk/bsd.port.mk +++ b/infrastructure/mk/bsd.port.mk @@ -1,6 +1,6 @@ #-*- mode: Makefile; tab-width: 4; -*- # ex:ts=4 sw=4 filetype=make: -# $OpenBSD: bsd.port.mk,v 1.1059 2010/11/16 09:16:26 espie Exp $ +# $OpenBSD: bsd.port.mk,v 1.1060 2010/11/16 09:39:45 espie Exp $ # $FreeBSD: bsd.port.mk,v 1.264 1996/12/25 02:27:44 imp Exp $ # $NetBSD: bsd.port.mk,v 1.62 1998/04/09 12:47:02 hubertf Exp $ # @@ -2028,7 +2028,7 @@ ${WRKINST}/.saved_libs: ${_FAKE_COOKIE} port-lib-depends-check: ${WRKINST}/.saved_libs . for _S in ${MULTI_PACKAGES} - -@SUBPACKAGE=${_S} ${MAKE} _print-plist-with-extra-depends | \ + @-SUBPACKAGE=${_S} ${MAKE} _print-plist-with-extra-depends | \ ${_CHECK_LIB_DEPENDS} -s ${WRKINST}/.saved_libs . endfor @@ -2616,16 +2616,9 @@ _print-plist-with-extra-depends: .if ${NO_SHARED_LIBS:L} != "yes" . for _i in ${LIB_DEPENDS${SUBPACKAGE}} @echo '${_i}'|{ \ - IFS=:; read dep pkg subdir target; \ - ${_flavor_fragment}; \ - if default=`eval $$toset ${MAKE} _print-packagename`; then \ - case "X$$pkg" in X) pkg=`echo "$$default" |${_version2default}`;; \ - esac; \ - echo "@depend $$subdir:$$pkg:$$default"; \ - else \ - echo 1>&2 "Problem with dependency ${_i}"; \ - exit 1; \ - fi; \ + ${_parse_spec}; \ + ${_complete_pkgspec}; \ + echo "@depend $$subdir:$$pkg:$$default"; \ } . endfor .endif