===================================================================
RCS file: /cvs/openbsd/fill_chroot/fill_chroot,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- openbsd/fill_chroot/fill_chroot	2008/09/03 22:37:21	1.8
+++ openbsd/fill_chroot/fill_chroot	2008/09/13 00:07:59	1.9
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $RedRiver: fill_chroot,v 1.7 2008/08/29 20:05:38 andrew Exp $
+# $RedRiver: fill_chroot,v 1.8 2008/09/03 21:37:21 andrew Exp $
 
 CHROOT=${CHROOT:=/home/andrew/www}
 export CHROOT
@@ -7,13 +7,18 @@
 perl_to_chroot
 mkdir -p ${CHROOT}/usr/local/lib
 
-if [ -e ${CHROOT}/bin/mini_sendmail ]; then
-	mkdir -p ${CHROOT}/usr/sbin
-	cd ${CHROOT}/usr/sbin
-	ln -sf ../../bin/mini_sendmail sendmail
+if [ -e /usr/local/sbin/femail ]; then 
+	mkdir -p ${CHROOT}/sbin
+	cp /usr/local/sbin/femail ${CHROOT}/sbin/
+fi
+
+if [ -e ${CHROOT}/sbin/femail ]; then
+	mkdir -p ${CHROOT}/usr/sbin/
+	cd ${CHROOT}/usr/sbin/
+	ln -sf ../../sbin/femail sendmail
 	cd ${OLDPWD}
 else
-	echo mini_sendmail not installed!  Please install it and link it to 
+	echo femail not installed!  Please install it and link it to 
 	echo "    ${CHROOT}/usr/sbin/sendmail"
 fi
 
@@ -24,7 +29,7 @@
 	cp /usr/local/bin/aspell ${CHROOT}/usr/local/bin/aspell
 	cp -r /usr/local/lib/aspell ${CHROOT}/usr/local/lib/
 	cp -r /usr/local/share/aspell ${CHROOT}/usr/local/share/
-	_find="${_find} -or -name aspell"
+	_find="${_find} -or ( -name aspell -a -type f )"
 fi
 
 find ${CHROOT}/usr -name *.so.* -or -name *.so ${_find} | xargs find_depends | \