--- Configure.orig	2016-01-05 19:31:36.000000000 +0100
+++ Configure	2016-10-04 03:14:21.280463000 +0200
@@ -165,6 +165,10 @@
 LSOF_FBSD_ZFS_CFGF=""
 LSOF_FBSD_ZFS_MKF="Makefile.zfs"
 LSOF_FBSD_ZFS_SYS=""
+LSOF_BSDSUX_ZFS=0
+LSOF_BSDSUX_ZFS_CFGF=""
+LSOF_BSDSUX_ZFS_MKF="Makefile.zfs"
+LSOF_BSDSUX_ZFS_SYS=""
 LSOF_HOST=""
 if test "X$LSOF_INCLUDE" = "X"	# {
 then
@@ -2314,6 +2318,603 @@
     LSOF_DIALECT_DIR=freebsd
     ;;
 
+# Configure for BSDSUniX.
+
+  bsdsunix)
+    LSOF_BSDSUX_ZFS=0
+    if test "X$LSOF_CC" = "X"   # {
+    then
+      LSOF_CC=cc
+      LSOF_CCV=`$LSOF_CC -v 2>&1 | sed -n 's/.*version \(.*\)/\1/p'`
+    fi  # }
+    if test "X$LSOF_VSTR" = "X" # {
+    then
+      LSOF_VSTR=`uname -r`
+    fi  # }
+    if test "X$LSOF_VERS" = "X" # {
+    then
+
+    # If the BSDSUniX version isn't pre-defined, determine it.
+
+      case $LSOF_VSTR in        # {
+      1.*)
+        LSOF_TSTBIGF=" "
+        LSOF_VERS=1000
+        ;;
+      *)
+        echo Unknown BSDSUniX release: `uname -r`
+        rm -f $LSOF_HLP
+        exit 1
+        ;;
+      esac      # }
+    fi  # }
+
+    # Clear LSOF_UNSUP message for supported versions of BSDSUniX.
+
+    case $LSOF_VERS in  # {
+    1000)
+      LSOF_UNSUP=""
+      ;;
+    esac        # }
+
+    # Get system CFLAGS, if possible.
+
+    LSOF_TMP1=`echo "all:\n.include <bsd.prog.mk>" | $LSOF_MAKE -f- -VCFLAGS`
+    LSOF_TMP=1
+    while test $LSOF_TMP -eq 1  # {
+    do
+      echo $LSOF_TMP1 | grep -q -e '-O'
+      if test $? -eq 0  # {
+      then
+        if test "X$LSOF_DEBUG" = "X"
+          then  # {
+            LSOF_DEBUG=`echo $LSOF_TMP1 | sed 's/.*\(-O[^ $]*\).*/\1/'`
+         fi     # }
+        LSOF_TMP1=`echo $LSOF_TMP1 | sed 's/\(.*\)-O[^ $]*\(.*\)/\1 \2/' | sed 's/^  *//g' | sed 's/  */ /g' | sed 's/  *$//'`
+      else
+        LSOF_TMP=0
+      fi        # }
+      LSOF_BSDSUX_ZFS_CFGF="$LSOF_CFGF $LSOF_TMP1"
+    done        # }
+    LSOF_CFGF="$LSOF_CFGF $LSOF_TMP1"
+    echo $LSOF_CFGF | grep -q NEEDS_BOOL_TYPEDEF
+    if test $? -ne 0
+    then        # {
+      LSOF_CFGF="$LSOF_CFGF -DNEEDS_BOOL_TYPEDEF"
+      LSOF_BSDSUX_ZFS_CFGF="$LSOF_BSDSUX_ZFS_CFGF -DNEEDS_BOOL_TYPEDEF"
+    fi  # }
+
+    # Determine path to BSDSUniX sources.
+
+    LSOF_DINC_ADD=0
+    if test "X$BSDSUNIX_SYS" = "X"       # {
+    then
+      if test -d /usr/src/sys   # {
+      then
+        BSDSUNIX_SYS=/usr/src/sys
+      else
+        if test -d /sys # {
+        then
+          BSDSUNIX_SYS="/sys"
+        else
+          echo "!!!WARNING!!!  No kernel sources in /usr/src/sys or /sys"
+        fi      # }
+      fi        # }
+    fi  # }
+
+    # Test for thread (task) support.
+
+    if test -r ${LSOF_INCLUDE}/sys/user.h       # {
+    then
+      grep -q ki_numthreads ${LSOF_INCLUDE}/sys/user.h
+      if test $? -eq 0  # {
+      then
+        LSOF_CFGF="$LSOF_CFGF -DHASTASKS"
+      fi        # }
+    else
+      echo "FATAL: can't find sys/user.h"
+      rm -f $LSOF_HLP
+      exit 1
+    fi  # }
+
+    # Test pause() status in system.h.
+
+    if test -r ${BSDSUNIX_SYS}/sys/systm.h       # {
+    then
+      grep -q pause_sbt ${BSDSUNIX_SYS}/sys/systm.h
+      if test $? -eq 0  # {
+      then
+        LSOF_CFGF="$LSOF_CFGF -DHAS_PAUSE_SBT"
+      fi        # }
+    fi  # }
+
+    # Do BSDSUniX version-specific stuff.
+
+    case $LSOF_VERS in  # {
+    *)
+      if test -r ${LSOF_INCLUDE}/nfs/rpcv2.h    # {
+      then
+        LSOF_CFGF="$LSOF_CFGF -DHASRPCV2H"
+      fi        # }
+      if test -r ${LSOF_INCLUDE}/sys/namei.h    # {
+      then
+        grep -q "^struct[       ]*namecache[    ]*{" ${LSOF_INCLUDE}/sys/namei.h
+        if test $? -eq 0        # {
+        then
+          LSOF_CFGF="$LSOF_CFGF -DHASNAMECACHE"
+        fi      # }
+      fi        # }
+      if test -r ${LSOF_INCLUDE}/ufs/ufs/inode.h        # {
+      then
+        grep -q i_effnlink ${LSOF_INCLUDE}/ufs/ufs/inode.h
+        if test $? -eq 0        # {
+        then
+          LSOF_CFGF="$LSOF_CFGF -DHASEFFNLINK=i_effnlink"
+        fi      # }
+      fi        # }
+      if test -r ${LSOF_INCLUDE}/sys/file.h     # {
+      then
+        grep -q f_vnode ${LSOF_INCLUDE}/sys/file.h
+        if test $? -eq 0        # {
+        then
+          LSOF_CFGF="$LSOF_CFGF -DHASF_VNODE"
+        fi      # }
+      fi        # }
+      LSOF_CFGL="$LSOF_CFGL -lkvm"
+      if test -r ${LSOF_INCLUDE}/sys/vnode.h  # {
+      then
+        grep VT_FDESC ${LSOF_INCLUDE}/sys/vnode.h > /dev/null 2>&1
+        if test $? -eq 0      # {
+        then
+          if test ! -r ${LSOF_INCLUDE}/fs/devfs/devfs.h       # {
+          then
+            if test -r ${BSDSUNIX_SYS}/fs/devfs/devfs.h        # {
+            then
+              LSOF_DINC_ADD=1
+            else
+              echo "!!!FATAL: lsof cannot locate the devfs.h header file"
+              echo "          in ${LSOF_INCLUDE}/fs/devfs/devfs.h or"
+              echo "          ${BSDSUNIX_SYS}/fs/devfs/devfs.h.  Consult"
+              echo "          00FAQ for an explanation."
+              rm -f $LSOF_HLP
+              exit 1
+            fi        # }
+          fi  # }
+        fi    # }
+      fi      # }
+      if test -r ${BSDSUNIX_SYS}/sys/filedesc.h        # {
+      then
+        grep -q filedescent ${BSDSUNIX_SYS}/sys/filedesc.h
+        if test $? -eq 0      # {
+        then
+          LSOF_CFGF="$LSOF_CFGF -DHAS_FILEDESCENT"
+        fi    # }
+      fi      # }
+      if test -r ${BSDSUNIX_SYS}/fs/tmpfs/tmpfs.h      # {
+      then
+          LSOF_CFGF="$LSOF_CFGF -DHAS_TMPFS"
+      fi      #}
+
+      if test -r ${LSOF_INCLUDE}/wctype.h     # {
+      then
+        LSOF_CFGF="$LSOF_CFGF -DHASWCTYPE_H"
+      fi      # }
+      # Determine the status of the cpumask_t typedef.
+
+      rm -f ${LSOF_TMPC}.*
+      cat > ${LSOF_TMPC}.c << .LSOF_END_HERE_DOC3
+#undef _KERNEL
+#include <sys/types.h>
+main() {
+cpumask_t c;
+}
+.LSOF_END_HERE_DOC3
+      $LSOF_CC ${LSOF_TMPC}.c -o ${LSOF_TMPC}.x > /dev/null 2>&1
+      LSOF_TMP1=$?
+      rm -f ${LSOF_TMPC}.*
+      if test $LSOF_TMP1 -ne 0      # {
+      then
+
+        # The cpumask_t typedef is unknown when _KERNEL is not defined.
+
+        if test -r ${LSOF_INCLUDE}/sys/types.h \
+                -a -r ${LSOF_INCLUDE}/machine/_types.h      # {
+        then
+          grep -q cpumask_t ${LSOF_INCLUDE}/sys/types.h
+          if test $? -eq 0  # {
+          then
+            grep -q __cpumask_t ${LSOF_INCLUDE}/machine/_types.h
+            if test $? -eq 0        # {
+            then
+              LSOF_CFGF="$LSOF_CFGF -DHASCPUMASK_T"
+            else
+              $LSOF_CC -E ${LSOF_INCLUDE}/machine/_types.h 2>/dev/null | grep -q __cpumask_t
+              if test $? -eq 0  # {
+              then
+                LSOF_CFGF="$LSOF_CFGF -DHASCPUMASK_T"
+              fi    # }
+            fi      # }
+          fi        # }
+        fi  # }
+      fi    # }
+      if test -r ${LSOF_INCLUDE}/sys/socketvar.h    # {
+      then
+        grep -q SBS_CANT ${LSOF_INCLUDE}/sys/socketvar.h
+        if test $? -eq 0    # {
+        then
+            LSOF_CFGF="$LSOF_CFGF -DHASSBSTATE"
+        fi  # }
+      fi    # }
+      if test -r ${LSOF_INCLUDE}/sys/vnode.h        # {
+      then
+        grep -q "defined(_KVM_VNODE)" ${LSOF_INCLUDE}/sys/vnode.h
+        if test $? -eq 0    # {
+        then
+            LSOF_CFGF="$LSOF_CFGF -DHAS_KVM_VNODE"
+        fi  #}
+      fi    # }
+      if test -r ${LSOF_INCLUDE}/ufs/ufs/inode.h    # {
+      then
+        grep -q i_din2 ${LSOF_INCLUDE}/ufs/ufs/inode.h
+        if test $? -eq 0    # {
+        then
+          LSOF_CFGF="$LSOF_CFGF -DHAS_UFS1_2"
+        fi  # }
+      fi    # }
+      if test -r ${LSOF_INCLUDE}/sys/conf.h # {
+      then
+        grep -q vm_memattr_t ${LSOF_INCLUDE}/sys/conf.h
+        if test $? -eq 0    #{
+        then
+          LSOF_CFGF="$LSOF_CFGF -DHAS_VM_MEMATTR_T"
+        fi  # }
+        grep -q "^#define   minor(" ${LSOF_INCLUDE}/sys/conf.h
+        if test $? -eq 0    # {
+        then
+          LSOF_CFGF="$LSOF_CFGF -DHAS_CONF_MINOR"
+          rm -f fbsd_minor.h
+          if test -r ${LSOF_INCLUDE}/sys/types.h    # {
+          then
+            LSOF_TMP1=`grep "^#define[      ]minor(" ${LSOF_INCLUDE}/sys/types.h`
+            if test "X$LSOF_TMP1" != "X"    # {
+            then
+              echo "Creating fbsd_minor.h"
+              cat > fbsd_minor.h << BSDSUX_MINOR1
+/*
+ * fbsd_minor.h -- created by lsof Configure script on
+BSDSUX_MINOR1
+              echo $EO " * $EC" >> ./fbsd_minor.h
+              date >> ./fbsd_minor.h
+              cat >> ./fbsd_minor.h << BSDSUX_MINOR2
+ */
+
+#if     !defined(BSDSUX_MINOR_H)
+#define BSDSUX_MINOR_H
+
+BSDSUX_MINOR2
+              echo $EO "${LSOF_TMP1}${EC}" >> fbsd_minor.h
+              cat >> ./fbsd_minor.h << BSDSUX_MINOR3
+
+#endif  /* defined(BSDSUX_MINOR_H) */
+BSDSUX_MINOR3
+            fi      # }
+          fi        # }
+        else
+          if test -r ${BSDSUNIX_SYS}/fs/devfs/devfs_int.h    # {
+          then
+            grep -q cdev2priv ${BSDSUNIX_SYS}/fs/devfs/devfs_int.h
+            if test $? -eq 0        # {
+            then
+              LSOF_CFGF="$LSOF_CFGF -DHAS_CDEV2PRIV"
+            fi      # }
+          fi        # }
+        fi  # }
+        grep -q "si_udev;" ${LSOF_INCLUDE}/sys/conf.h
+        if test $? -ne 0    # {
+        then
+          LSOF_CFGF="$LSOF_CFGF -DHAS_NO_SI_UDEV"
+        fi  # }
+        grep -q si_priv ${LSOF_INCLUDE}/sys/conf.h
+        if test $? -eq 0    # {
+        then
+          LSOF_CFGF="$LSOF_CFGF -DHAS_SI_PRIV"
+        fi  # }
+      fi    # }
+      if test -r ${LSOF_INCLUDE}/sys/sx.h   # {
+      then
+        LSOF_CFGF="$LSOF_CFGF -DHAS_SYS_SX_H"
+      fi    # }
+
+      # Do FUSE file system test,
+
+      if test -r ${BSDSUNIX_SYS}/fs/fuse/fuse_node.h # {
+      then
+        LSOF_CFGF="$LSOF_CFGF -DHASFUSEFS"
+      fi    # }
+      # Do ZFS test.  Try for the newer OpenSolaris files first -- i.e.,
+      # the ones in ${BSDSUNIX_SYS}/cddl/contrib/opensolaris.  If that fails,
+      # try for the older ones in ${BSDSUNIX}/contrib/opensolaris.
+
+      LSOF_BSDSUX_ZFS_SYS=${BSDSUNIX_SYS}/cddl
+      if test ! -r ${LSOF_BSDSUX_ZFS_SYS}/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h       # {
+      then
+        LSOF_BSDSUX_ZFS_SYS=${BSDSUNIX_SYS}
+        if test ! -r ${LSOF_BSDSUX_ZFS_SYS}/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h     # {
+        then
+          LSOF_BSDSUX_ZFS_SYS=""
+        fi  # }
+      fi    # }
+      if test "X$LSOF_BSDSUX_ZFS_SYS" != "X"  # {
+      then
+        LSOF_CFGF="$LSOF_CFGF -DHAS_ZFS"
+        LSOF_BSDSUX_ZFS=1
+        LSOF_BSDSUX_ZFS_CFGF="$LSOF_BSDSUX_ZFS_CFGF -DBSDSUNIXV=$LSOF_VERS"
+        LSOF_BSDSUX_ZFS_CFGF="$LSOF_BSDSUX_ZFS_CFGF -DHAS_ZFS"
+        grep -q z_phys ${LSOF_BSDSUX_ZFS_SYS}/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h
+        if test $? -eq 0    # {
+        then
+          LSOF_BSDSUX_ZFS_CFGF="$LSOF_BSDSUX_ZFS_CFGF -DHAS_Z_PHYS"
+        fi  # }
+        if test -r ${LSOF_BSDSUX_ZFS_SYS}/compat/opensolaris/sys/sdt.h  #{
+        then
+          grep -q opt_kdtrace.h ${LSOF_BSDSUX_ZFS_SYS}/compat/opensolaris/sys/sdt.h
+          if test $? -eq 0  # {
+          then
+            rm -f opt_kdtrace.h
+            touch opt_kdtrace.h
+          fi        # }
+        fi  # }
+        if test -r ${LSOF_BSDSUX_ZFS_SYS}/compat/opensolaris/sys/kcondvar.h #{
+        then
+            grep -q cv_timedwait_sbt ${LSOF_BSDSUX_ZFS_SYS}/compat/opensolaris/sys/kcondvar.h
+            if test $? -eq 0        # {
+            then
+              LSOF_BSDSUX_ZFS_CFGF="$LSOF_BSDSUX_ZFS_CFGF -DHAS_CV_TIMEDWAIT_SBT"
+            fi      # }
+        fi  #}
+        if test -r /usr/include/sys/random.h        # {
+        then
+          grep -q opt_random.h /usr/include/sys/random.h
+          if test $? -eq 0  # {
+          then
+            rm -f opt_random.h
+            touch opt_random.h
+          fi        # }
+        fi  # }
+      fi    # }
+      if test -r ${LSOF_INCLUDE}/sys/vnode.h        # {
+      then
+
+      # See if the vnode contains the byte level lock pointer.
+
+        grep -q v_lockf ${LSOF_INCLUDE}/sys/vnode.h
+        if test $? -eq 0    # {
+        then
+          LSOF_CFGF="$LSOF_CFGF -DHAS_V_LOCKF"
+          if test $LSOF_BSDSUX_ZFS -eq 1      # {
+          then
+            LSOF_BSDSUX_ZFS_CFGF="$LSOF_BSDSUX_ZFS_CFGF -DHAS_V_LOCKF"
+          fi        # }
+        fi  # }
+      fi    # }
+      if test -r ${LSOF_INCLUDE}/sys/lockf.h        # {
+      then
+
+      # Determine the type of locking structure to which the inode or
+      # vnode points.
+
+        grep -q "^struct lockf_entry" ${LSOF_INCLUDE}/sys/lockf.h
+        if test $? -eq 0    # {
+        then
+
+        # Build the ./lockf_owner.h header file.
+
+          LSOF_TMP1=""
+          LSOF_TMP2=0
+          echo "Creating ./lockf_owner.h from ${BSDSUNIX_SYS}/kern/kern_lockf.c"
+          rm -f ./lockf_owner.h
+          if test -r ${BSDSUNIX_SYS}/kern/kern_lockf.c       # {
+          then
+            LSOF_TMP1=`grep -n "^struct lock_owner" ${BSDSUNIX_SYS}/kern/kern_lockf.c | sed 's/\([0-9]*\):.*$/\1/'`
+            if test "X$LSOF_TMP1" != "X"    # {
+            then
+              LSOF_TMP2=0
+              for i in `grep -n "};" ${BSDSUNIX_SYS}/kern/kern_lockf.c | sed 's/\([0-9]*\):.*$/\1/'` # {
+              do
+                if test $LSOF_TMP2 -eq 0 -a $i -gt $LSOF_TMP1       # {
+                then
+                  LSOF_TMP2=$i
+                fi  # }
+              done  # }
+              if test $LSOF_TMP2 -eq 0      # {
+              then
+                LSOF_TMP1=""
+              else
+                cat > ./lockf_owner.h << LOCKF_OWNER1
+/*
+ * lockf_owner.h -- created by lsof Configure script on
+LOCKF_OWNER1
+                echo $EO " * $EC" >> ./lockf_owner.h
+                date >> ./lockf_owner.h
+                cat >> ./lockf_owner.h << LOCKF_OWNER2
+ */
+
+#if     !defined(LOCKF_OWNER_H)
+#define LOCKF_OWNER_H
+
+LOCKF_OWNER2
+                ed -s ${BSDSUNIX_SYS}/kern/kern_lockf.c >> ./lockf_owner.h << LOCKF_OWNER3
+${LSOF_TMP1},${LSOF_TMP2}p
+LOCKF_OWNER3
+                if test $? -ne 0    # {
+                then
+                  LSOF_TMP1=""
+                else
+                  cat >> ./lockf_owner.h << LOCKF_OWNER4
+
+#endif  /* defined(LOCKF_OWNER_H) */
+LOCKF_OWNER4
+                fi  # }
+              fi    # }
+            fi      # }
+          else
+            echo "FATAL ERROR: can't read ${BSDSUNIX_SYS}/kern/kern_lockf.c"
+          fi        # }
+          if test "X$LSOF_TMP1" != "X" -a "X$LSOF_TMP2" != "X0" # {
+          then
+            echo "./lockf_owner.h creation succeeded."
+            LSOF_CFGF="$LSOF_CFGF -DHAS_LOCKF_ENTRY"
+          else
+            echo "FATAL ERROR: ./lockf_owner.h creation failed (see 00FAQ)"
+            rm -f $LSOF_HLP
+            exit 1
+          fi        # }
+        fi  # }
+
+      # Test for in6p_.port in inpcb structure.
+
+        if test -r ${LSOF_INCLUDE}/netinet/in_pcb.h # {
+        then
+          grep -q 'in6p_.port' ${LSOF_INCLUDE}/netinet/in_pcb.h
+          if test $? -ne 0  # {
+          then
+            LSOF_CFGF="$LSOF_CFGF -DHAS_NO_6PORT"
+          fi        # }
+        fi  # }
+
+      # Test for in6p_ppcb in inpcb structure.
+
+        if test -r ${LSOF_INCLUDE}/netinet/in_pcb.h # {
+        then
+          grep -q 'in6p_ppcb' ${LSOF_INCLUDE}/netinet/in_pcb.h
+          if test $? -ne 0  # {
+          then
+            LSOF_CFGF="$LSOF_CFGF -DHAS_NO_6PPCB"
+          fi        # }
+        fi  # }
+        if test -r ${LSOF_INCLUDE}/sys/conf.h       # {
+        then
+          grep -q 'doadump(boolean_t)' ${LSOF_INCLUDE}/sys/conf.h
+          if test $? -eq 0  # {
+          then
+            LSOF_CFGF="$LSOF_CFGF -DNEEDS_BOOLEAN_T"
+          fi        # }
+        fi  # }
+        if test -r ${LSOF_INCLUDE}/sys/sockbuf.h    # {
+        then
+          grep -q 'u_int    sb_ccc;' ${LSOF_INCLUDE}/sys/sockbuf.h
+          if test $? -eq 0  # {
+          then
+            LSOF_CFGF="$LSOF_CFGF -DHAS_SB_CCC"
+          fi        # }
+        fi  # }
+        if test -r ${LSOF_INCLUDE}/sys/filedesc.h   # {
+        then
+          grep -q '^struct fdescenttbl {' ${LSOF_INCLUDE}/sys/filedesc.h
+          if test $? -eq 0  # {
+          then
+            LSOF_CFGF="$LSOF_CFGF -DHAS_FDESCENTTBL"
+          fi        # }
+        fi  # }
+      fi    # }
+      ;;
+    esac        # }
+    LSOF_CFGF="$LSOF_CFGF -DBSDSUNIXV=$LSOF_VERS"
+    if test -r ${BSDSUNIX_SYS}/miscfs/fdesc/fdesc.h      # {
+    then
+      LSOF_TMP1=${BSDSUNIX_SYS}/miscfs/fdesc/fdesc.h
+    else
+      LSOF_TMP1=${LSOF_INCLUDE}/fs/fdescfs/fdesc.h
+    fi  # }
+    if test "X$LSOF_TMP1" != "X"        # {
+    then
+      grep -q Fctty $LSOF_TMP1
+      if test $? -eq 0  # {
+      then
+        LSOF_CFGF="$LSOF_CFGF -DHASFDESCFS=1"
+      else
+        LSOF_CFGF="$LSOF_CFGF -DHASFDESCFS=2"
+      fi        # }
+      grep -q fd_link $LSOF_TMP1
+      if test $? -eq 0  # {
+      then
+        LSOF_CFGF="$LSOF_CFGF -DHASFDLINK"
+      fi        # }
+      LSOF_DINC_ADD=1
+    fi  # }
+    LSOF_TMP1="fs"
+    if test -d ${BSDSUNIX_SYS}/${LSOF_TMP1}/pseudofs   # {
+    then
+      LSOF_CFGF="$LSOF_CFGF -DHASPSEUDOFS"
+      LSOF_DINC_ADD=1
+    fi        # }
+    if test -r ${LSOF_INCLUDE}/${LSOF_TMP1}/nullfs/null.h       # {
+    then
+      LSOF_CFGF="$LSOF_CFGF -DHASNULLFS"
+    else
+      if test -r ${BSDSUNIX_SYS}/${LSOF_TMP1}/nullfs/null.h      # {
+      then
+        LSOF_CFGF="$LSOF_CFGF -DHASNULLFS"
+        LSOF_DINC_ADD=1
+      fi        # }
+    fi  # }
+    if test -r ${BSDSUNIX_SYS}/isofs/cd9660/cd9660_node.h        # {
+    then
+      rm -f cd9660_node.h
+      grep -q "^#ifdef [_]*KERNEL" ${BSDSUNIX_SYS}/isofs/cd9660/cd9660_node.h
+      if test $? -eq 0  # {
+      then
+        ln -s ${BSDSUNIX_SYS}/isofs/cd9660/cd9660_node.h cd9660_node.h
+      else
+        sed -e '/^ \* Prototypes for ISOFS vnode operations/,$c\
+        \ The ISOFS prototypes were removed by Configure. */' \
+        < ${BSDSUNIX_SYS}/isofs/cd9660/cd9660_node.h > cd9660_node.h
+        echo "" >> cd9660_node.h
+      fi        # }
+      LSOF_CFGF="$LSOF_CFGF -DHAS9660FS"
+      grep -q "i_dev;" cd9660_node.h
+      if test $? -ne 0        # {
+      then
+        LSOF_CFGF="$LSOF_CFGF -DHAS_NO_ISO_DEV"
+      fi      # }
+    fi  # }
+    if test -r ${LSOF_INCLUDE}/sys/namei.h
+    then
+      grep -q nc_vpid ${LSOF_INCLUDE}/sys/namei.h
+      if test $? -eq 0  # {
+      then
+        LSOF_CFGF="$LSOF_CFGF -DHASNCVPID"
+      fi        # }
+    fi  # }
+    if test $LSOF_DINC_ADD -eq 1        # {
+    then
+      if test "X$LSOF_DINC" = "X"       # {
+      then
+        LSOF_DINC="-I${BSDSUNIX_SYS}"
+      else
+        LSOF_DINC="$LSOF_DINC -I${LSOF_INCLUDE} -I${BSDSUNIX_SYS}"
+      fi        # }
+    fi  # }
+    if test -r ${LSOF_INCLUDE}/netinet/in.h     # {
+    then
+      grep IPV6_INRIA_VERSION ${LSOF_INCLUDE}/netinet/in.h > /dev/null
+      if test $? -eq 0  # {
+      then
+        LSOF_CFGF="$LSOF_CFGF -DHASIPv6 -DHASINRIAIPv6"
+      fi        # }
+    fi  # }
+    echo $CFGF | grep HASIPv6 > /dev/null
+    if test $? -ne 0 -a -r ${LSOF_INCLUDE}/netinet6/in6.h       # {
+    then
+      LSOF_CFGF="$LSOF_CFGF -DHASIPv6"
+    fi  # }
+    if test -r ${LSOF_INCLUDE}/utmpx.h # {
+    then
+      LSOF_CFGF="$LSOF_CFGF -DHASUTMPX"
+    fi  # }
+    LSOF_DIALECT_DIR=bsdsunix
+    ;;
+
 # Configure for HP-UX and HP-UX gcc.
 
   hpux|hpuxgcc)
@@ -5415,6 +6016,18 @@
   exit 1
 fi	# }
 
+# If this is FreeBSD, make sure $LSOF_BSDSUX_ZFS_MKF exists.
+
+if test $LSOF_BSDSUX_ZFS -eq 1	# {
+then
+  if test ! ./dialects/$LSOF_DIALECT_DIR/$LSOF_BSDSUX_ZFS_MKF	# {
+  then
+    echo "Can't configure for $LSOF_TGT -- ./dialects/$LSOF_DIALECT_DIR/$LSOF_BSDSUX_ZFS_MKF doesn't exist."
+    rm -f $LSOF_HLP
+    exit 1
+  fi	# }
+fi	# }}
+
 # If this is FreeBSD, make sure $LSOF_FBSD_ZFS_MKF exists.
 
 if test $LSOF_FBSD_ZFS -eq 1	# {
@@ -5618,6 +6231,34 @@
   echo $LSOF_MKFC created.
 fi	# }
 
+# If this is BSDSUniX, create $LSOF_BSDSUX_ZFS_MKF.
+
+if test $LSOF_BSDSUX_ZFS -eq 1	# {
+then
+  rm -f $LSOF_BSDSUX_ZFS_MKF
+  echo "# $LSOF_TGT ZFS Makefile for lsof revision $LSOF_VN" > $LSOF_BSDSUX_ZFS_MKF
+  echo "" >> $LSOF_BSDSUX_ZFS_MKF
+  echo "CC=		$LSOF_CC" >> $LSOF_BSDSUX_ZFS_MKF
+  echo "" >> $LSOF_BSDSUX_ZFS_MKF
+  echo "CFLAGS=	$LSOF_BSDSUX_ZFS_CFGF" >> $LSOF_BSDSUX_ZFS_MKF
+  echo "" >> $LSOF_BSDSUX_ZFS_MKF
+  if test "X$LSOF_DEBUG" = "X"	# {
+  then
+    LSOF_DEBUG="-O"
+  else
+    if test "X$LSOF_DEBUG" = "XNo-O"	# {
+    then
+      LSOF_DEBUG=""
+    fi	# }
+  fi	# }
+  echo "DEBUG=	$LSOF_DEBUG" >> $LSOF_BSDSUX_ZFS_MKF
+  echo "" >> $LSOF_BSDSUX_ZFS_MKF
+  echo "OPENSOLARIS=	$LSOF_BSDSUX_ZFS_SYS" >> $LSOF_BSDSUX_ZFS_MKF
+  echo "" >> $LSOF_BSDSUX_ZFS_MKF
+  cat ./dialects/$LSOF_DIALECT_DIR/$LSOF_BSDSUX_ZFS_MKF >> $LSOF_BSDSUX_ZFS_MKF
+  echo $LSOF_BSDSUX_ZFS_MKF created.
+fi	# }
+
 # If this is FreeBSD, create $LSOF_FBSD_ZFS_MKF.
 
 if test $LSOF_FBSD_ZFS -eq 1	# {