--- src/stat.c.orig	Sun Dec  1 10:48:21 2002
+++ src/stat.c	Sun Jan 12 11:30:01 2003
@@ -43,6 +43,12 @@
 # endif
 #endif
 
+/* FreeBSD 5.0 need this for struct statfs */
+#if HAVE_SYS_MOUNT_H
+# include <sys/param.h>
+# include <sys/mount.h>
+#endif
+
 #include "system.h"
 
 #include "closeout.h"
--- src/test.c.orig	Wed Sep 25 10:22:37 2002
+++ src/test.c	Sun Jan 12 11:49:50 2003
@@ -151,7 +151,7 @@
    and don't make the mistake of telling root that any file is executable.
    But this loses when the containing filesystem is mounted e.g. read-only.  */
 static int
-eaccess (char *path, int mode)
+myeaccess (char *path, int mode)
 {
   struct stat st;
   static uid_t euid = -1;
@@ -645,17 +645,17 @@
 
     case 'r':			/* file is readable? */
       unary_advance ();
-      value = -1 != eaccess (argv[pos - 1], R_OK);
+      value = -1 != myeaccess (argv[pos - 1], R_OK);
       return (TRUE == value);
 
     case 'w':			/* File is writable? */
       unary_advance ();
-      value = -1 != eaccess (argv[pos - 1], W_OK);
+      value = -1 != myeaccess (argv[pos - 1], W_OK);
       return (TRUE == value);
 
     case 'x':			/* File is executable? */
       unary_advance ();
-      value = -1 != eaccess (argv[pos - 1], X_OK);
+      value = -1 != myeaccess (argv[pos - 1], X_OK);
       return (TRUE == value);
 
     case 'O':			/* File is owned by you? */