===================================================================
RCS file: /cvs/openbsd/fill_chroot/fill_chroot,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- openbsd/fill_chroot/fill_chroot	2011/08/16 02:10:46	1.19
+++ openbsd/fill_chroot/fill_chroot	2012/06/10 04:29:42	1.20
@@ -7,7 +7,8 @@
 
 _find="-type f -a ("
 _find="${_find} -name *.so.* -o -name *.so"
-_find="${_find} -o -path '*/usr/bin' -o -path '*/usr/sbin'"
+_find="${_find} -o -path */usr/bin/* -o -path */usr/sbin/*"
+_find="${_find} -o -path */usr/local/bin/* -o -path */usr/local/sbin/*"
 
 echo Installing Directory Structure
 install -d -m 1750 -o www -g bin ${CHROOT}/tmp
@@ -34,7 +35,6 @@
   pax -r -w -L -p e $_f ${CHROOT}
 
 done
-_find="${_find} -o -name perl"
 
 if [ -e /usr/local/sbin/femail ]; then 
 	echo Installing femail into ${CHROOT}
@@ -97,8 +97,8 @@
 
 _find="${_find} )"
 echo Installing dependencies into ${CHROOT}
-find ${CHROOT}/usr  ${_find} | 
-     xargs find_depends | \
+find ${CHROOT}/usr  ${_find} -print0 | 
+     xargs -0 find_depends | \
      sort -u | \
 {
     local _f