===================================================================
RCS file: /cvs/openbsd/fill_chroot/fill_chroot,v
retrieving revision 1.19
retrieving revision 1.21
diff -u -r1.19 -r1.21
--- openbsd/fill_chroot/fill_chroot	2011/08/16 02:10:46	1.19
+++ openbsd/fill_chroot/fill_chroot	2019/11/04 01:13:18	1.21
@@ -1,13 +1,15 @@
 #!/bin/sh
-# $AFresh1: fill_chroot,v 1.18 2011/08/09 00:13:54 andrew Exp $
+# $AFresh1: fill_chroot,v 1.20 2012/06/10 03:29:42 andrew Exp $
 
 CHROOT=${CHROOT:=/home/andrew/www}
 CHROOT=`echo $CHROOT | sed -e 's,/*$,,'`
 export CHROOT
+BINDIR=$( dirname $( readlink -f $0 ) )
 
 _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 +36,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 +98,8 @@
 
 _find="${_find} )"
 echo Installing dependencies into ${CHROOT}
-find ${CHROOT}/usr  ${_find} | 
-     xargs find_depends | \
+find ${CHROOT}/usr  ${_find} -print0 | 
+     xargs -0 "${BINDIR}"/find_depends | \
      sort -u | \
 {
     local _f
@@ -109,4 +110,4 @@
 }
 
 echo Fixing ldconfig \(/var/run/ld.so.hints\)
-fix_ldconfig
+"${BINDIR}"/fix_ldconfig