--- amq/amq.c.orig	Fri Jan 12 23:52:00 2001
+++ amq/amq.c	Thu Jul  5 10:09:10 2001
@@ -251,7 +251,9 @@
 	       mi->mi_up > 0 ? "up" :
 	       mi->mi_up < 0 ? "starting" : "down");
 	if (mi->mi_error > 0) {
+#if !defined(__FreeBSD__)
 	  extern int sys_nerr;
+#endif
 	  if (mi->mi_error < sys_nerr)
 #ifdef HAVE_STRERROR
 	    printf(" (%s)", strerror(mi->mi_error));
--- hlfsd/hlfsd.h.orig	Fri Jan 12 23:52:03 2001
+++ hlfsd/hlfsd.h	Thu Jul  5 10:09:37 2001
@@ -147,7 +147,9 @@
 extern int cache_interval;
 extern int noverify;
 extern int serverpid;
+#if !defined(__FreeBSD__)
 extern int sys_nerr;
+#endif
 extern int untab_index(char *username);
 extern am_nfs_fh *root_fhp;
 extern am_nfs_fh root;
--- include/am_defs.h.orig	Tue Feb 12 03:44:22 2002
+++ include/am_defs.h	Thu Sep 12 08:48:47 2002
@@ -276,7 +276,7 @@
 /*
  * Actions to take if <malloc.h> exists.
  */
-#ifdef HAVE_MALLOC_H
+#if defined(HAVE_MALLOC_H) && !defined(__FreeBSD__)
 # include <malloc.h>
 #endif /* HAVE_MALLOC_H */
 
--- hlfsd/stubs.c.orig	Tue Feb 12 01:15:17 2002
+++ hlfsd/stubs.c	Thu Sep 12 09:51:03 2002
@@ -133,7 +133,7 @@
     res.ns_u.ns_attr_u = rootfattr;
   } else if (eq_fh(argp, &slink)) {
 
-#ifndef MNT2_NFS_OPT_SYMTTL
+#if !defined(MNT2_NFS_OPT_SYMTTL) && !defined(__FreeBSD__) /* FIXME */
     /*
      * This code is needed to defeat Solaris 2.4's (and newer) symlink
      * values cache.  It forces the last-modified time of the symlink to be
@@ -232,7 +232,7 @@
     }
 
     if (STREQ(argp->da_name, slinkname)) {
-#ifndef MNT2_NFS_OPT_SYMTTL
+#if !defined(MNT2_NFS_OPT_SYMTTL) && !defined(__FreeBSD__) /* FIXME */
       /*
        * This code is needed to defeat Solaris 2.4's (and newer) symlink
        * values cache.  It forces the last-modified time of the symlink to be