===================================================================
RCS file: /cvs/openbsd/fill_chroot/fill_chroot,v
retrieving revision 1.11
retrieving revision 1.14
diff -u -r1.11 -r1.14
--- openbsd/fill_chroot/fill_chroot	2008/09/16 23:28:04	1.11
+++ openbsd/fill_chroot/fill_chroot	2008/10/21 20:10:35	1.14
@@ -1,10 +1,10 @@
 #!/bin/sh
-# $RedRiver: fill_chroot,v 1.10 2008/09/16 22:13:21 andrew Exp $
+# $RedRiver: fill_chroot,v 1.13 2008/09/17 20:08:17 andrew Exp $
 
 CHROOT=${CHROOT:=/home/andrew/www}
 export CHROOT
 
-_find="-name '*.so.*' -o -name '*.so' -o ( -name perl -a -type f )"
+_find="-name *.so.* -o -name *.so -o ( -name perl -a -type f )"
 
 install -d -m 1750 -o www -g bin ${CHROOT}/tmp
 for d in ${CHROOT}/{bin,sbin,usr,var,dev}/ \
@@ -15,20 +15,16 @@
 	install -d -m 0555 -o root -g wheel $d
 done
 
-echo Installing ld.so
-echo pax -r -w -L -p e /usr/libexec/ld.so ${CHROOT}
-pax -r -w -L -p e /usr/libexec/ld.so ${CHROOT}
-
 echo Making devices
 cd ${CHROOT}/dev
 /dev/MAKEDEV std
 cd ${OLDPWD}
 
-echo Installing perl
+echo Installing perl into ${CHROOT}
 perl_to_chroot
 
 if [ -e /usr/local/sbin/femail ]; then 
-	echo Installing femail
+	echo Installing femail into ${CHROOT}
 	echo pax -r -w -L -p e /usr/local/sbin/femail ${CHROOT}
 	pax -r -w -L -p e /usr/local/sbin/femail ${CHROOT}
 else
@@ -44,7 +40,7 @@
 fi
 
 if [ -e /usr/local/bin/aspell ]; then
-	echo Installing aspell
+	echo Installing aspell into ${CHROOT}
 	for d in \
 		/usr/local/bin/aspell \
 		/usr/local/lib/aspell \
@@ -57,14 +53,17 @@
 	_find="${_find} -o ( -name aspell -a -type f )"
 fi
 
-echo Installing dependencies
-for d in `find ${CHROOT}/usr ${_find} | \
+echo Installing dependencies into ${CHROOT}
+find ${CHROOT}/usr  ${_find} | 
      xargs find_depends | \
-     sort -u `; do
-
-    echo pax -r -w -L -p e $d ${CHROOT}
-    pax -r -w -L -p e $d ${CHROOT}
-done
+     sort -u | \
+{
+    local _d
+    while read _d; do
+        echo pax -r -w -L -p e ${_d##${CHROOT}} ${CHROOT}
+        pax -r -w -L -p e ${_d##${CHROOT}} ${CHROOT}
+    done
+}
 
 echo Fixing ldconfig \(/var/run/ld.so.hints\)
 fix_ldconfig