Index: head/sysutils/lsof/Makefile =================================================================== --- head/sysutils/lsof/Makefile (revision 554914) +++ head/sysutils/lsof/Makefile (revision 554915) @@ -1,66 +1,66 @@ # Created by: David O'Brien # $FreeBSD$ # note: If someone has a fix for a particular ARCH please feel free # to commit it. I (ler) don't have access to all the ARCH's PORTNAME= lsof DISTVERSION= 4.93.2 -PORTREVISION= 13 +PORTREVISION= 14 PORTEPOCH= 8 CATEGORIES= sysutils MAINTAINER= ler@FreeBSD.org COMMENT= Lists information about open files (similar to fstat(1)) LICENSE= lsof LICENSE_NAME= lsof LICENSE_FILE= ${FILESDIR}/LICENSE LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept USES= compiler shebangfix tar:bzip2 HAS_CONFIGURE= yes USE_GITHUB= yes GH_ACCOUNT= lsof-org OPTIONS_DEFINE_powerpc64= AIM BOOKE OPTIONS_DEFAULT_powerpc64= AIM AIM_DESC= Set for AIM hardware AIM_CFLAGS= -DAIM BOOKE_DESC= Set for BOOKE hardware BOOKE_CFLAGS= -DBOOKE CFLAGS+= -fcommon CFLAGS_powerpc= -DAIM CFLAGS_powerpcspe= -DBOOKE SHEBANG_FILES= scripts/sort_res.perl5 .include CONFIGURE_SCRIPT= Configure CONFIGURE_ARGS= -n freebsd CONFIGURE_ENV= LSOF_CC="${CC}" FREEBSD_SYS="${SRC_BASE}/sys" # GCC needs -lzfs -lzpool for reasons unknown. If someone can # figure out why, I (ler) am all ears. .if ${CHOSEN_COMPILER_TYPE} == gcc CONFIGURE_ENV+= LSOF_CFGL="-lzfs -lzpool" . endif .if !exists(${SRC_BASE}/sys/kern/kern_lockf.c) IGNORE+= requires kernel sources .endif do-install: ${INSTALL_PROGRAM} ${WRKSRC}/lsof ${STAGEDIR}${PREFIX}/sbin (cd ${WRKSRC} && /usr/bin/soelim Lsof.8 > ${WRKSRC}/lsof.8) ${INSTALL_MAN} ${WRKSRC}/lsof.8 ${STAGEDIR}${MAN8PREFIX}/man/man8/lsof.8 @${MKDIR} ${STAGEDIR}${PREFIX}/share/lsof ${INSTALL_SCRIPT} ${WRKSRC}/scripts/* ${STAGEDIR}${PREFIX}/share/lsof @${CHMOD} 0444 ${STAGEDIR}${PREFIX}/share/lsof/00* .include Index: head/sysutils/lsof/files/patch-dialects-freebsd-dlsof.h =================================================================== --- head/sysutils/lsof/files/patch-dialects-freebsd-dlsof.h (revision 554914) +++ head/sysutils/lsof/files/patch-dialects-freebsd-dlsof.h (revision 554915) @@ -1,36 +1,52 @@ --- dialects/freebsd/dlsof.h.orig 2019-05-08 07:32:25 UTC +++ dialects/freebsd/dlsof.h @@ -38,6 +38,7 @@ #if !defined(FREEBSD_LSOF_H) #define FREEBSD_LSOF_H 1 +#include #include #include #include @@ -45,6 +46,12 @@ #include #include +#if FREEBSDV>=13000 +/* This header is a huge mess. Please don't support EOL FreeBSD releases. */ +#define _KERNEL 1 +#include +#undef _KERNEL +#endif /* FREEBSDV>=13000 */ # if FREEBSDV>=4000 # if FREEBSDV>=5000 # if FREEBSDV<6020 -@@ -104,6 +111,12 @@ typedef struct device *device_t; +@@ -105,6 +112,12 @@ typedef struct device *device_t; - #include -+ + +/* + * include for refcount(9) + */ +#include + - ++ # if defined(HAS_VM_MEMATTR_T) #undef vm_memattr_t + # endif /* defined(HAS_VM_MEMATTR_T) */ +@@ -652,9 +665,15 @@ struct sfile { + */ + + struct namecache { ++# if __FreeBSD_version < 1202000 || (__FreeBSD_version >= 1300000 && __FreeBSD_version < 1300105) + LIST_ENTRY(namecache) nc_hash; /* hash chain */ + LIST_ENTRY(namecache) nc_src; /* source vnode list */ + TAILQ_ENTRY(namecache) nc_dst; /* destination vnode list */ ++# else ++ LIST_ENTRY(namecache) nc_src; /* source vnode list */ ++ TAILQ_ENTRY(namecache) nc_dst; /* destination vnode list */ ++ LIST_ENTRY(namecache) nc_hash; /* hash chain */ ++# endif + struct vnode *nc_dvp; /* vnode of parent of name */ + struct vnode *nc_vp; /* vnode the name refers to */ + u_char nc_flag; /* flag bits */