From 759c4f8b141ff0913381f70e8bcdd805268f7100 Mon Sep 17 00:00:00 2001
From: Kris Kennaway <kris@FreeBSD.org>
Date: Thu, 6 Jun 2002 20:58:52 +0000
Subject: Allow packages to be installed in the build chroot; this is needed
 for 5.x package builds since the pnohang script is written in perl, which was
 removed from the base OS.

---
 Tools/portbuild/scripts/portbuild | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'Tools')

diff --git a/Tools/portbuild/scripts/portbuild b/Tools/portbuild/scripts/portbuild
index 1950732cfe73..e379b368617e 100755
--- a/Tools/portbuild/scripts/portbuild
+++ b/Tools/portbuild/scripts/portbuild
@@ -102,7 +102,7 @@ ulimit -f 524288
 ulimit -t 3600
 
 # directories to clean
-cleandirs="/usr/local /usr/X11R6 /compat"
+cleandirs="/usr/local /usr/X11R6 /compat /var/db/pkg"
 
 # 15 minutes
 export FTP_TIMEOUT=900
@@ -208,6 +208,14 @@ if [ ${arch} = "i386" ]; then
 	chroot ${chroot} /sbin/ldconfig -aout -R
 fi
 
+# Install packages
+for i in ${chroot}/packages/*.tgz; do
+	chroot ${chroot} pkg_add /packages/`basename $i`
+done
+
+# Don't record packages which will interfere with building versions of the
+# packages we just installed.
+rm -rf ${chroot}/var/db/pkg/*
 
 while [ $# -gt 0 ]; do
   if [ -f ${packages}/All/$1 ]; then
-- 
cgit v1.2.3