From 8d4dc2e04d8639249bc4dbebc99097325b8765a5 Mon Sep 17 00:00:00 2001
From: cjep <cjep@pkgsrc.org>
Date: Thu, 16 Sep 2004 09:55:42 +0000
Subject: Make and mount the local patches directory when relevant. Fixes
 PR#26951 from Masanori Mikawa.

---
 mk/bulk/mksandbox | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'mk')

diff --git a/mk/bulk/mksandbox b/mk/bulk/mksandbox
index ebdea7c53ce..88aabe71d6b 100755
--- a/mk/bulk/mksandbox
+++ b/mk/bulk/mksandbox
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $NetBSD: mksandbox,v 1.36 2004/09/02 07:04:54 grant Exp $
+# $NetBSD: mksandbox,v 1.37 2004/09/16 09:55:42 cjep Exp $
 #
 #
 # Copyright (c) 2002 Alistair G. Crooks.  All rights reserved.
@@ -169,6 +169,8 @@ localbase=`(cd $pkgsrc/pkgtools/pkglint; $bmakeprog show-var VARNAME=LOCALBASE)`
 pkg_dbdir=`(cd $pkgsrc/pkgtools/pkglint; $bmakeprog show-var VARNAME=PKG_DBDIR)`
 localpatches=`(cd $pkgsrc/pkgtools/pkglint; $bmakeprog show-var VARNAME=LOCALPATCHES)`
 
+test -d "$localpatches" || echo "WARNING: LOCALPATCHES directory does not exist - ignoring"
+
 $mkdirprog $sandbox
 cat > $sandbox_script <<EOS
 #! /bin/sh -
@@ -277,7 +279,13 @@ $mountprog $mountflags $packages $sandbox/$packages
 $mountprog $mountflags $distfiles $sandbox/$distfiles
 echo "$packages $packages rw \\" >> $sandbox_script
 echo "$distfiles $distfiles rw \\" >> $sandbox_script
-test -n "$localpatches" && echo "$localpatches $localpatches rw \\" >> $sandbox_script
+
+if [ -n "$localpatches" ] && [ -d "$localpatches" ]; then
+	echo "Mounting $localpatches from $sandbox"
+	$mkdirprog $sandbox/$localpatches
+	$mountprog $mountflags $localpatches $sandbox/$localpatches
+	echo "$localpatches $localpatches rw \\" >> $sandbox_script
+fi
 
 cat >> $sandbox_script <<EOS
 "
-- 
cgit v1.2.3