===================================================================
RCS file: /cvs/openbsd/fill_chroot/fill_chroot,v
retrieving revision 1.18
retrieving revision 1.20
diff -u -r1.18 -r1.20
--- openbsd/fill_chroot/fill_chroot	2011/08/09 01:13:54	1.18
+++ openbsd/fill_chroot/fill_chroot	2012/06/10 04:29:42	1.20
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $AFresh1: fill_chroot,v 1.16 2010/01/11 21:16:33 andrew Exp $
+# $AFresh1: fill_chroot,v 1.18 2011/08/09 00:13:54 andrew Exp $
 
 CHROOT=${CHROOT:=/home/andrew/www}
 CHROOT=`echo $CHROOT | sed -e 's,/*$,,'`
@@ -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}
@@ -79,19 +79,26 @@
 	_find="${_find} -o -name speedy*"
 fi
 
-if [ -e ${CHROOT}/usr/bin/cvs ]; then
+if [ -e ${CHROOT}/cgi-bin/cvsweb ]; then
+	echo Installing cvsweb depends
+	for _f in \
+		/usr/bin/{co,cvs,diff,perl,rcsdiff,rlog,uname} \
+	; do 
+		echo pax -r -w -L -p e $_f ${CHROOT}
+		pax -r -w -L -p e $_f ${CHROOT}
+	done
+
+elif [ -e ${CHROOT}/usr/bin/cvs ]; then
 	_f=/usr/bin/cvs
 	echo Installing cvs
 	echo pax -r -w -L -p e $_f ${CHROOT}
 	pax -r -w -L -p e $_f ${CHROOT}
-
-	_find="${_find} -o -name cvs"
 fi
 
 _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