From fa1c9ab96fb3cb34f52a7efc6dbd733eda41bfc5 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Wed, 6 Jul 2011 08:42:02 +0200
Subject: [PATCH] xbps-src: make -D install work with bootstrap subpkgs.

---
 xbps-src/libexec/xbps-src-doinst-helper.sh.in | 5 +++--
 xbps-src/shutils/pkgtarget_funcs.sh.in        | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/xbps-src/libexec/xbps-src-doinst-helper.sh.in b/xbps-src/libexec/xbps-src-doinst-helper.sh.in
index d51ffc31d89..e29f65d971b 100644
--- a/xbps-src/libexec/xbps-src-doinst-helper.sh.in
+++ b/xbps-src/libexec/xbps-src-doinst-helper.sh.in
@@ -129,8 +129,9 @@ install_src_phase()
 			spkgrev="${subpkg}-${version}"
 		fi
 		check_installed_pkg ${spkgrev}
-		[ $? -eq 0 ] && continue
-
+		if [ $? -eq 0 -a -z "$BOOTSTRAP_PKG_REBUILD" ]; then
+			continue
+		fi
 		msg_normal "'${sourcepkg}-$lver': preparing subpackage '${subpkg}'...\n"
 		if [ ! -f $XBPS_SRCPKGDIR/${sourcepkg}/${subpkg}.template ]; then
 			msg_error "Cannot find '${subpkg}' subpkg build template!\n"
diff --git a/xbps-src/shutils/pkgtarget_funcs.sh.in b/xbps-src/shutils/pkgtarget_funcs.sh.in
index abe4bc1d7c5..ec86b2a4713 100644
--- a/xbps-src/shutils/pkgtarget_funcs.sh.in
+++ b/xbps-src/shutils/pkgtarget_funcs.sh.in
@@ -108,6 +108,7 @@ install_pkg()
 	# Install pkg into destdir.
 	env xbps_machine=${xbps_machine} MASTERDIR=${_MASTERDIR}	\
 		wrksrc=${wrksrc}					\
+		BOOTSTRAP_PKG_REBUILD=$BOOTSTRAP_PKG_REBUILD		\
 		${fakeroot_cmd} ${fakeroot_cmd_args}			\
 		@@XBPS_INSTALL_LIBEXECDIR@@/xbps-src-doinst-helper	\
 		${curpkgn} || return $?