From 343aff0c834b4c2a467e2f30d327b144dd13d279 Mon Sep 17 00:00:00 2001
From: espie <espie@openbsd.org>
Date: Sat, 16 Jun 2007 09:57:03 +0000
Subject: [PATCH] tweak FETCH_PACKAGES: do not fetch all multi-packages to
 satisfy a dependency, but only the ones actually required. If we end up
 needing to rebuild them from source, then change back to
 _internal-package-only, so that we benefit from the whole build and get all
 packages again.

---
 infrastructure/mk/bsd.port.mk | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/infrastructure/mk/bsd.port.mk b/infrastructure/mk/bsd.port.mk
index d19e91a72aa..d4d7bf1834d 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.903 2007/06/04 12:15:09 espie Exp $
+#	$OpenBSD: bsd.port.mk,v 1.904 2007/06/16 09:57:03 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 $
 #
@@ -1377,7 +1377,7 @@ ${_PACKAGE_COOKIE${_S}}:
 	@f=${_CACHE_REPO}/${_PKGFILE${_S}}; \
 	cd ${.CURDIR} && ${MAKE} $$f && \
 		{ ln $$f $@ 2>/dev/null || cp -p $$f $@ ; } || \
-		cd ${.CURDIR} && ${MAKE} _TRIED_FETCHING_${_PACKAGE_COOKIE${_S}}=Yes $@
+		cd ${.CURDIR} && ${MAKE} _TRIED_FETCHING_${_PACKAGE_COOKIE${_S}}=Yes _internal-package-only
 .  else
 	@cd ${.CURDIR} && exec ${MAKE} ${_PACKAGE_COOKIE_DEPS}
 .    if target(pre-package)
@@ -1412,7 +1412,11 @@ ${_PACKAGE_COOKIE${_S}}:
 # The real install
 
 ${_INSTALL_COOKIE${_S}}:
+.  if ${FETCH_PACKAGES:L} == "yes"
+	@cd ${.CURDIR} && exec ${MAKE} subpackage
+.  else
 	@cd ${.CURDIR} && exec ${MAKE} package
+.  endif
 	@cd ${.CURDIR} && SUBPACKAGE=${_S} DEPENDS_TARGET=install \
 		exec ${MAKE} _internal-run-depends _internal-runlib-depends \
 		_internal-runwantlib-depends