From nobody Sun May 1 19:04:40 2022
X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 1BCF7199EC81;
Sun, 1 May 2022 19:04:41 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4KrwdP0CYFz3MFm;
Sun, 1 May 2022 19:04:41 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1651431881;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=ZxBklXa4+NmVppbSmCb2XOikYGkMLrxl8Gc1za13T8k=;
b=ik+IK/KGyEcskE1Vr77gbMNB+cROkbq675FV8K0aqak/sdDPjXgA9y69UirewuQxOMz23P
8cgDrCiOU7Kca+LpK49+5O1kjguPt/FgVYocMHZSkMkJT32UH4B1SrRBbkMsB6x9jLOH6V
B+zl/CDRuDFfnxGacqzXLJ6d86gC+MHGWhTYuxWkzJTOI3mzfdZi94UtAepOKGXYficz6f
b+/LwejDeW8rQ4ONOanASqAyc9WgImHLscCzS9daBpEUlyAeqv85WIOERYqjoY54OPb8AH
ryW0dC2NCQbThYIIOdE7kC63CK3mfGoEBMj6nidVX86HQAlLsrFDlV9zM1F+Kw==
Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D774A1B527;
Sun, 1 May 2022 19:04:40 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 241J4eFu098430;
Sun, 1 May 2022 19:04:40 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 241J4eMN098429;
Sun, 1 May 2022 19:04:40 GMT
(envelope-from git)
Date: Sun, 1 May 2022 19:04:40 GMT
Message-Id: <202205011904.241J4eMN098429@gitrepo.freebsd.org>
To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org,
dev-commits-ports-main@FreeBSD.org
From: Larry Rosenman <ler@FreeBSD.org>
Subject: git: 2c77770fcc6e - main - sysutils/lsof: upgrade to 4.95.0
List-Id: Commits to the main branch of the FreeBSD ports repository <dev-commits-ports-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main
List-Help: <mailto:dev-commits-ports-main+help@freebsd.org>
List-Post: <mailto:dev-commits-ports-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-ports-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-ports-main+unsubscribe@freebsd.org>
Sender: owner-dev-commits-ports-main@freebsd.org
X-BeenThere: dev-commits-ports-main@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: ler
X-Git-Repository: ports
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 2c77770fcc6e5897c2b0a5c4f4dd5fc1d0d0df51
Auto-Submitted: auto-generated
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1651431881;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=ZxBklXa4+NmVppbSmCb2XOikYGkMLrxl8Gc1za13T8k=;
b=GzRljWRgNaAmf3ZomgyJNRzn3dVbh6bsnp/5A5O+s4BAL0Pj1SzXvf/Bo31NkhaUoux1y+
Z9PD3plV0afgJlOYfm9ebylgTkISVzdr79GTZGvX+aXQhNNd55FFq3TSucMjKv7LsSESPY
OTbF0fAuGCvPGF9YtSZqckIxxnZkiNowYaGVKMURc9N8dWF5pEwJxfEeaVTIFZ3DkW+Fbj
Bl8+dHHKRbpLQBhYb5Vq9+8pMqVGDCtfybuZo/rnjBp+9+HGYND0IkQFFQt5Q3ctxlXRFf
JDC/BaMf1J7wQYWB6tfS2mHXycCEF0hoU7mONZY4jb9P/Is6OfTWMZ2WQ+d3XA==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651431881; a=rsa-sha256; cv=none;
b=ikdRmxcdJbOWQstYGAzgUTwSKmR1BQq7Bj3rCMlReZXy2ZIQssoBB5uwTUKBgVpkscCPJZ
cPxZa+pYJSiXtIt83ZVy0pnE/zBE+aPBxFm4q5UV0FPsknc1W1mgDZMA3Oe3+g8Ft47Sbh
w8jLAJA5NCEKChO9EXkfochxQVB5CKFsI/RKpvILVvESJdc8VngrBXidOoH9AaN7K3RvTc
3q0MUgt+QAI6NxxeRQGti9QehreIyI6nWExHBizliknhqB4wF5N1KlYme3m5lsZi4kG1io
FPLcmR47/ncaJ/RpBXw3gDNryvMLhBs0G6mUAsCkUooyx7vkU4X/FcuQRGCIjw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
X-ThisMailContainsUnwantedMimeParts: N
The branch main has been updated by ler:
URL: https://cgit.FreeBSD.org/ports/commit/?id=2c77770fcc6e5897c2b0a5c4f4dd5fc1d0d0df51
commit 2c77770fcc6e5897c2b0a5c4f4dd5fc1d0d0df51
Author: Larry Rosenman <ler@FreeBSD.org>
AuthorDate: 2022-05-01 19:03:41 +0000
Commit: Larry Rosenman <ler@FreeBSD.org>
CommitDate: 2022-05-01 19:04:36 +0000
sysutils/lsof: upgrade to 4.95.0
* Remove unnecessary tar:bzip2 from USES. [1]
* Update WWW.
* Pet portclippy.
* Tidy up Makefile with portfmt.
ChangeLog: https://github.com/lsof-org/lsof/releases/tag/4.95.0
PR: 263637
Reported by: diizzy [1], yasu@freebsd.org
---
sysutils/lsof/Makefile | 30 +-
sysutils/lsof/distinfo | 6 +-
sysutils/lsof/files/patch-Configure | 22 --
sysutils/lsof/files/patch-dialects-freebsd-dlsof.h | 388 ---------------------
sysutils/lsof/files/patch-dialects_freebsd_dproc.c | 204 -----------
sysutils/lsof/pkg-descr | 2 +-
sysutils/lsof/pkg-plist | 20 +-
7 files changed, 28 insertions(+), 644 deletions(-)
diff --git a/sysutils/lsof/Makefile b/sysutils/lsof/Makefile
index 3dee55fbb9db..c391b6437419 100644
--- a/sysutils/lsof/Makefile
+++ b/sysutils/lsof/Makefile
@@ -4,7 +4,7 @@
# to commit it. I (ler) don't have access to all the ARCH's
PORTNAME= lsof
-DISTVERSION= 4.94.0
+DISTVERSION= 4.95.0
PORTEPOCH= 8
CATEGORIES= sysutils
@@ -16,42 +16,42 @@ LICENSE_NAME= lsof
LICENSE_FILE= ${FILESDIR}/LICENSE
LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
-USES= compiler cpe shebangfix tar:bzip2
-
+USES= compiler cpe shebangfix
CPE_VENDOR= lsof_project
+USE_GITHUB= yes
+GH_ACCOUNT= lsof-org
+
+SHEBANG_FILES= scripts/*.pl
HAS_CONFIGURE= yes
-USE_GITHUB= yes
-GH_ACCOUNT= lsof-org
+CFLAGS_powerpc= -DAIM
+CFLAGS_powerpcspe= -DBOOKE
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_powerpc= -DAIM
-CFLAGS_powerpcspe= -DBOOKE
-SHEBANG_FILES= scripts/sort_res.perl5
+AIM_CFLAGS= -DAIM
+BOOKE_CFLAGS= -DBOOKE
.include <bsd.port.pre.mk>
CONFIGURE_SCRIPT= Configure
-CONFIGURE_ARGS= -n freebsd
-CONFIGURE_ENV= LSOF_CC="${CC}" FREEBSD_SYS="${SRC_BASE}/sys"
+CONFIGURE_ARGS= -n freebsd
+CONFIGURE_ENV= FREEBSD_SYS="${SRC_BASE}/sys" \
+ LSOF_CC="${CC}"
# 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
+.endif
.if !exists(${SRC_BASE}/sys/kern/kern_lockf.c)
-IGNORE+= requires kernel sources
+IGNORE+= requires kernel sources
.endif
do-install:
diff --git a/sysutils/lsof/distinfo b/sysutils/lsof/distinfo
index cd81ec4afd12..c7254f16434e 100644
--- a/sysutils/lsof/distinfo
+++ b/sysutils/lsof/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1605257406
-SHA256 (lsof-org-lsof-4.94.0_GH0.tar.gz) = a9865eeb581c3abaac7426962ddb112ecfd86a5ae93086eb4581ce100f8fa8f4
-SIZE (lsof-org-lsof-4.94.0_GH0.tar.gz) = 1340224
+TIMESTAMP = 1651172540
+SHA256 (lsof-org-lsof-4.95.0_GH0.tar.gz) = 8ff4c77736cc7d9556da9e2c7614cc4292a12f1979f20bd520d3c6f64b66a4d7
+SIZE (lsof-org-lsof-4.95.0_GH0.tar.gz) = 1343380
diff --git a/sysutils/lsof/files/patch-Configure b/sysutils/lsof/files/patch-Configure
deleted file mode 100644
index c514e4c8be77..000000000000
--- a/sysutils/lsof/files/patch-Configure
+++ /dev/null
@@ -1,22 +0,0 @@
---- Configure.orig 2020-11-10 19:00:21 UTC
-+++ Configure
-@@ -1628,6 +1628,10 @@ kernel generation process.
- LSOF_TSTBIGF=" "
- LSOF_VERS=13000
- ;;
-+ 14*)
-+ LSOF_TSTBIGF=" "
-+ LSOF_VERS=14000
-+ ;;
- *)
- echo Unknown FreeBSD release: `uname -r`
- rm -f $LSOF_HLP
-@@ -1639,7 +1643,7 @@ kernel generation process.
- # Clear LSOF_UNSUP message for supported versions of FreeBSD.
-
- case $LSOF_VERS in # {
-- 4090|8020|8030|8040|9000|10000|11000|12000|13000)
-+ 4090|8020|8030|8040|9000|10000|11000|12000|13000|14000)
- LSOF_UNSUP=""
- ;;
- esac # }
diff --git a/sysutils/lsof/files/patch-dialects-freebsd-dlsof.h b/sysutils/lsof/files/patch-dialects-freebsd-dlsof.h
deleted file mode 100644
index 08b9d00204ae..000000000000
--- a/sysutils/lsof/files/patch-dialects-freebsd-dlsof.h
+++ /dev/null
@@ -1,388 +0,0 @@
---- dialects/freebsd/dlsof.h.orig 2020-11-10 19:00:21 UTC
-+++ dialects/freebsd/dlsof.h
-@@ -52,27 +52,7 @@
- #include <sys/_lock.h>
- #undef _KERNEL
- #endif /* FREEBSDV>=13000 */
--# if FREEBSDV>=4000
--# if FREEBSDV>=5000
--# if FREEBSDV<6020
--# if defined(__alpha__)
--/*
-- * For Alpha below 6.2, #include <machine/pcpu.h> before #define'ing _KERNEL.
-- * Then #define PCPU_MD_FIELDS independently. This hack avoids a compiler
-- * complaint about register use.
-- */
--
--#include <machine/pcpu.h>
--#define PCPU_MD_FIELDS \
-- struct alpha_pcb pc_idlepcb; /* pcb for idling */ \
-- u_int64_t pc_idlepcbphys; /* pa of pc_idlepcb */ \
-- u_int64_t pc_pending_ipis; /* pending IPI's */ \
-- u_int32_t pc_next_asn; /* next ASN to alloc */ \
-- u_int32_t pc_current_asngen /* ASN rollover check */
--# endif /* defined(__alpha__) */
--# endif /* FREEBSDV<6020 */
- #define _KERNEL 1
--# endif /* FREEBSDV>=5000 */
-
- # if defined(HAS_VM_MEMATTR_T)
- /*
-@@ -129,23 +109,17 @@ typedef struct device *device_t;
- #include "fbsd_minor.h"
- # endif /* defined(HAS_CONF_MINOR) */
-
--# if FREEBSDV>=5000
- #undef _KERNEL
--# endif /* FREEBSDV>=5000 */
--# endif /* FREEBSDV>=4000 */
-
- #include <sys/filedesc.h>
- #include <sys/mbuf.h>
- #define NFS
- #define m_stat mnt_stat
-
--# if FREEBSDV>=3020
- #define _KERNEL
--# endif /* FREEBSDV>=3020 */
-
- #include <sys/mount.h>
-
--# if FREEBSDV>=3020
- # if defined(__clang__)
- /*
- * This definition is needed when clang is used, because <sys/mount.h> must
-@@ -156,7 +130,6 @@ int getmntinfo(struct statfs **, int);
- # endif /* defined(__clang__) */
-
- #undef _KERNEL
--# endif /* FREEBSDV>=3020 */
-
- #include <rpc/types.h>
- #include <sys/protosw.h>
-@@ -167,9 +140,7 @@ int getmntinfo(struct statfs **, int);
- #define _WANT_UNPCB
- #include <sys/unpcb.h>
-
--# if FREEBSDV>=3000
- #undef INADDR_LOOPBACK
--# endif /* FREEBSDV>=3000 */
-
- #include <netinet/in.h>
- #include <netinet/in_systm.h>
-@@ -202,21 +173,9 @@ int getmntinfo(struct statfs **, int);
- #include <rpc/pmap_prot.h>
- #undef pmap
-
--# if FREEBSDV<2000
--#include <ufs/quota.h>
--#include <ufs/inode.h>
--#include <ufs/ufsmount.h>
--#include <ufs/mfsnode.h>
--# else /* FREEBSDV>=2000 */
- #include <paths.h>
- #include <ufs/ufs/quota.h>
-
--# if FREEBSDV>=4000 && FREEBSDV<5000
--# if defined(__alpha__) || defined(__sparc64__)
--#define dev_t void *
--# endif /* defined(__alpha__) || defined(__sparc64__) */
--# endif /* FREEBSDV>=4000 && FREEBSDV<5000 */
--
- #include <ufs/ufs/inode.h>
-
- # if defined(HAS_UFS1_2)
-@@ -250,59 +209,28 @@ struct vop_setextattr_args;
- #undef _KERNEL
- # endif /* defined(HAS_UFS1_2) */
-
--# if FREEBSDV>=5010
- #undef i_devvp
--# endif /* FREEBSDV>=5010 */
-
--# if FREEBSDV>=4000 && FREEBSDV<5000
--# if defined(__alpha__) || defined(__sparc64__)
--#undef dev_t
--# endif /* defined(__alpha__) || defined(__sparc64__) */
--# endif /* FREEBSDV>=4000 && FREEBSDV<5000 */
--
--# if FREEBSDV<2020
--#include <ufs/mfs/mfsnode.h>
--# endif /* FREEBSDV<2020 */
--
--# endif /* FREEBSDV<2000 */
--
--# if FREEBSDV<5000
--#include <nfs/nfsv2.h>
--# else /* FREEBSDV>=5000 */
- #include <nfs/nfsproto.h>
--# endif /* FREEBSDV<5000 */
-
- # if defined(HASRPCV2H)
- #include <nfs/rpcv2.h>
- # endif /* defined(HASRPCV2H) */
-
--# if FREEBSDV>=5000
- #include <nfsclient/nfs.h>
- #include <nfsclient/nfsnode.h>
--# else /* FREEBSDV<5000 */
--#include <nfs/nfs.h>
--#include <nfs/nfsnode.h>
--# endif /* FREEBSDV>=5000 */
-
- #include <sys/proc.h>
- #include <kvm.h>
- #undef TRUE
- #undef FALSE
-
--# if FREEBSDV<2000
--#include <sys/kinfo.h>
--# else /* FREEBSDV>=2000 */
- #include <sys/sysctl.h>
--# endif /* FREEBSDV<2000 */
-
- # if defined(HASFDESCFS)
- #define _KERNEL
- #define KERNEL
--# if FREEBSDV>=5000
- #include <fs/fdescfs/fdesc.h>
--# else /* FREEBSDV<5000 */
--#include <miscfs/fdesc/fdesc.h>
--# endif /* FREEBSDV>=5000 */
- #undef _KERNEL
- #undef KERNEL
- # endif /* defined(HASFDESCFS) */
-@@ -311,24 +239,13 @@ struct vop_setextattr_args;
- #define _KERNEL
- #define KERNEL
- struct vop_generic_args;
--# if FREEBSDV>=5000
- #include <fs/nullfs/null.h>
--# else /* FREEBSDV<5000 */
--#include <miscfs/nullfs/null.h>
--# endif /* FREEBSDV>=5000 */
- #undef _KERNEL
- #undef KERNEL
- # endif /* defined(HASNULLFS) */
-
- # if defined(HASPROCFS)
--# if FREEBSDV<2000
--#include <procfs/pfsnode.h>
--# else /* FREEBSDV>=2000 */
--# if FREEBSDV<5000
--#include <miscfs/procfs/procfs.h>
--# endif /* FREEBSDV<5000 */
- #include <machine/reg.h>
--# endif /* FREEBSDV<2000 */
-
- #define PNSIZ 5
- # endif /* defined(HASPROCFS) */
-@@ -342,24 +259,6 @@ struct vop_generic_args;
- # endif /* defined(HAS_ZFS) */
-
-
--# if FREEBSDV<2000
--#define P_COMM p_comm
--#define P_FD p_fd
--#define P_PID p_pid
--#define P_PGID p_pgrp
--#define P_STAT p_stat
--#define P_VMSPACE p_vmspace
--# else /* FREEBSDV>=2000 */
--# if FREEBSDV<5000
--#define P_ADDR kp_eproc.e_paddr
--#define P_COMM kp_proc.p_comm
--#define P_FD kp_proc.p_fd
--#define P_PID kp_proc.p_pid
--#define P_PGID kp_eproc.e_pgid
--#define P_PPID kp_eproc.e_ppid
--#define P_STAT kp_proc.p_stat
--#define P_VMSPACE kp_proc.p_vmspace
--# else /* FREEBSDV>=5000 */
- #define P_ADDR ki_paddr
- #define P_COMM ki_comm
- #define P_FD ki_fd
-@@ -368,8 +267,6 @@ struct vop_generic_args;
- #define P_PPID ki_ppid
- #define P_STAT ki_stat
- #define P_VMSPACE ki_vmspace
--# endif /* FREEBSDV<5000 */
--# endif /* FREEBSDV<2000 */
-
- #include <vm/vm.h>
-
-@@ -431,20 +328,12 @@ int open(const char *, int, ...);
-
- # if defined(DTYPE_KQUEUE)
- #define HASKQUEUE /* has the kqueue file type */
--# if FREEBSDV>=4090
- #define _KERNEL
--# endif /* FREEBSDV>=4090 */
- #include <sys/eventvar.h>
--# if FREEBSDV>=4090
- #undef _KERNEL
--# endif /* FREEBSDV>=4090 */
- # endif /* defined(DTYPE_KQUEUE) */
-
--# if FREEBSDV<2000
--#include <ufs/lockf.h>
--# else /* FREEBSDV>=2000 */
- struct vop_advlock_args { int dummy; }; /* to pacify lf_advlock() prototype */
--# if FREEBSDV>=5000
- #undef MALLOC_DECLARE
- #define MALLOC_DECLARE(type) extern struct malloc_type type[1]
- /* to pacify <sys/lockf.h> */
-@@ -460,23 +349,15 @@ struct vop_advlock_args { int dummy; }; /* to pacify l
-
- #include <fs/devfs/devfs.h>
- #undef _KERNEL
--# endif /* FREEBSDV>=5000 */
- #include <sys/lockf.h>
--# endif /* FREEBSDV<2000 */
-
--# if FREEBSDV>=2020
--# if FREEBSDV>=4090
- #define _KERNEL
--# endif /* FREEBSDV>=4090 */
- #include <sys/pipe.h>
--# if FREEBSDV>=4090
- #undef _KERNEL
--# endif /* FREEBSDV>=4090 */
- # if defined(HASVMLOCKH)
- #include <vm/lock.h>
- # endif /* defined(HASVMLOCKH) */
- #include <vm/pmap.h>
--# endif /* FREEBSDV>=2020 */
-
- #include <vm/vm_map.h>
-
-@@ -492,21 +373,13 @@ struct vop_advlock_args { int dummy; }; /* to pacify l
- #include <vm/vm_object.h>
- #include <vm/vm_pager.h>
-
--# if FREEBSDV>=2020
- #undef B_NEEDCOMMIT
-
--# if FREEBSDV>=5000
- #include <sys/bio.h>
--# endif /* FREEBSDV>=5000 */
-
- #include <sys/buf.h>
- #include <sys/user.h>
-
--# if FREEBSDV<5000
--#include <ufs/mfs/mfsnode.h>
--# endif /* FREEBSDV<5000 */
--# endif /* FREEBSDV>=2020 */
--
- #undef bcmp /* avoid _KERNEL conflict */
- #undef bcopy /* avoid _KERNEL conflict */
- #undef bzero /* avoid _KERNEL conflict */
-@@ -521,11 +394,7 @@ struct vop_advlock_args { int dummy; }; /* to pacify l
- #define DEVINCR 1024 /* device table malloc() increment */
-
- # if !defined(FREEBSD_KA_T)
--# if FREEBSDV<2000
--typedef off_t KA_T;
--# else /* FREEBSDV>=2000 */
- typedef u_long KA_T;
--# endif /* FREEBSDV<2000 */
- # endif /* !defined(FREEBSD_KA_T) */
-
- #define KMEM "/dev/kmem"
-@@ -559,11 +428,9 @@ typedef u_long KA_T;
- * Global storage definitions (including their structure definitions)
- */
-
--struct file * Cfp;
-+extern struct file * Cfp;
-
--# if FREEBSDV>=2000
- extern kvm_t *Kd;
--# endif /* FREEBSDV>=2000 */
-
- # if defined(P_ADDR)
- extern KA_T Kpa;
-@@ -607,9 +474,7 @@ extern KA_T X_bfopsa;
-
- extern int Np; /* number of kernel processes */
-
--# if FREEBSDV>=2000
- extern struct kinfo_proc *P; /* local process table copy */
--# endif /* FREEBSDV>=2000 */
-
- struct sfile {
- char *aname; /* argument file name */
-@@ -626,15 +491,8 @@ struct sfile {
-
- };
-
--# if FREEBSDV==4100 || FREEBSDV==4110
--#define XDR_VOID (xdrproc_t)xdr_void
--#define XDR_PMAPLIST (xdrproc_t)xdr_pmaplist
--# endif /* FREEBSDV==4100 || FREEBSDV==4110 */
--
--# if FREEBSDV>=5000
- #define XDR_VOID (const xdrproc_t)xdr_void
- #define XDR_PMAPLIST (const xdrproc_t)xdr_pmaplist
--# endif /* FREEBSDV>=5000 */
-
-
- /*
-@@ -651,9 +509,9 @@ struct sfile {
-
- # if defined(HASNCACHE)
- #include <sys/uio.h>
--# if FREEBSDV<4000 || (FREEBSDV>=4000 && defined(HASNAMECACHE))
-+# if defined(HASNAMECACHE)
- #include <sys/namei.h>
--# else /* FREEBSDV>=4000 && !defined(HASNAMECACHE) */
-+# else /* !defined(HASNAMECACHE) */
- /*
- * The namecache struct definition should come from a header file that
- * can be #include'd, but it has been moved to a kernel source file in
-@@ -663,9 +521,9 @@ struct sfile {
- */
-
- struct namecache {
-- LIST_ENTRY(namecache) nc_hash; /* hash chain */
- LIST_ENTRY(namecache) nc_src; /* source vnode list */
- TAILQ_ENTRY(namecache) nc_dst; /* destination vnode list */
-+ LIST_ENTRY(namecache) nc_hash; /* hash chain */
- struct vnode *nc_dvp; /* vnode of parent of name */
- struct vnode *nc_vp; /* vnode the name refers to */
- u_char nc_flag; /* flag bits */
-@@ -682,22 +540,14 @@ struct namecache {
- * suggesting the guess is a safe one.
- * (VAA, 10 Apr 2002) */
- };
--# endif /* FREEBSDV<4000 || (FREEBSDV>=4000 && defined(HASNAMECACHE)) */
-+# endif /* defined(HASNAMECACHE) */
-
- #define NCACHE namecache /* kernel's structure name */
- #define NCACHE_NM nc_name /* name in NCACHE */
- #define NCACHE_NMLEN nc_nlen /* name length in NCACHE */
-
--# if FREEBSDV<2005
--#define NCACHE_NXT nc_nxt /* link in NCACHE */
--# else /* FREEBSDV>=2005 */
--# if FREEBSDV<2010
--#define NCACHE_NXT nc_lru.tqe_next /* link in NCACHE */
--# else /* FREEBSDV>=2010 */
- #include <stddef.h>
- #define NCACHE_NXT nc_hash.le_next /* link in NCACHE */
--# endif /* FREEBSDV<2010 */
--# endif /* FREEBSDV<2005 */
-
- #define NCACHE_NODEADDR nc_vp /* node address in NCACHE */
- #define NCACHE_PARADDR nc_dvp /* parent node address in NCACHE */
-@@ -708,9 +558,7 @@ struct namecache {
- # endif /* DEFINED(HASNCVPID) */
- # endif /* defined(HASNCACHE) */
-
--# if FREEBSDV>=5000
- #define VNODE_VFLAG v_iflag
- #define NCACHE_VROOT VV_ROOT
--# endif /* FREEBSDV>=5000 */
-
- #endif /* defined(FREEBSD_LSOF_H) */
diff --git a/sysutils/lsof/files/patch-dialects_freebsd_dproc.c b/sysutils/lsof/files/patch-dialects_freebsd_dproc.c
deleted file mode 100644
index 28c7290f2298..000000000000
--- a/sysutils/lsof/files/patch-dialects_freebsd_dproc.c
+++ /dev/null
@@ -1,204 +0,0 @@
---- dialects/freebsd/dproc.c.orig 2020-11-10 19:00:21 UTC
-+++ dialects/freebsd/dproc.c
-@@ -125,6 +125,9 @@ gather_proc_info()
- * streams with eXPORT data,
- * where supported */
- struct filedesc fd;
-+#if defined(PWDDESC_KVM_LOAD_PWD)
-+ struct pwddesc pd;
-+#endif /* defined(PWDDESC_KVM_LOAD_PWD) */
- int i, nf;
- MALLOC_S nb;
-
-@@ -157,13 +160,7 @@ gather_proc_info()
- int tid; /* thread (task) ID */
- uid_t uid;
-
--#if FREEBSDV<2000
-- struct proc *p;
-- struct pcred pc;
-- struct pgrp pg;
--#else /* FREEBSDV>=2000 */
- struct kinfo_proc *p;
--#endif /* FREEBSDV<2000 */
-
- #if defined(HASFSTRUCT) && !defined(HAS_FILEDESCENT)
- static char *pof = (char *)NULL;
-@@ -223,9 +220,6 @@ gather_proc_info()
- * Read the process table.
- */
-
--#if FREEBSDV<2000
-- if ((Np = kvm_getprocs(KINFO_PROC_ALL, 0)) < 0)
--#else /* FREEBSDV>=2000 */
-
- # if !defined(KERN_PROC_PROC)
- #define KERN_PROC_PROC KERN_PROC_ALL
-@@ -234,18 +228,11 @@ gather_proc_info()
- if ((P = kvm_getprocs(Kd, Ftask ? KERN_PROC_ALL : KERN_PROC_PROC,
- 0, &Np))
- == NULL)
--#endif /* FREEBSDV<2000 */
-
- {
- (void) fprintf(stderr, "%s: can't read process table: %s\n",
- Pn,
--
--#if FREEBSDV<2000
-- kvm_geterr()
--#else /* FREEBSDV>=2000 */
- kvm_geterr(Kd)
--#endif /* FREEBSDV<2000 */
--
- );
- Exit(1);
- }
-@@ -253,43 +240,13 @@ gather_proc_info()
- * Examine proc structures and their associated information.
- */
-
--#if FREEBSDV<2000
-- for (px = 0; px < Np; px++)
--#else /* FREEBSDV>=2000 */
- for (p = P, px = 0; px < Np; p++, px++)
--#endif /* FREEBSDV<2000 */
--
- {
-
--#if FREEBSDV<2000
-- /*
-- * Read process information, process group structure (if
-- * necessary), and User ID (if necessary).
-- */
-- if (!(p = kvm_nextproc()))
-- continue;
- if (p->P_STAT == 0 || p->P_STAT == SZOMB)
- continue;
-- pg.pg_id = 0;
-- if (Fpgid && p->P_PGID) {
-- if (kread((KA_T)p->P_PGID, (char *)&pg, sizeof(pg)))
-- continue;
-- }
-- pgid = pg.pg_id;
-- if (!p->p_cred
-- || kread((KA_T)p->p_cred, (char *)&pc, sizeof(pc)))
-- continue;
-- uid = pc.p_ruid;
--#else /* FREEBSDV>=2000 */
-- if (p->P_STAT == 0 || p->P_STAT == SZOMB)
-- continue;
- pgid = p->P_PGID;
--# if FREEBSDV<5000
-- uid = p->kp_eproc.e_ucred.cr_uid;
--# else /* FREEBSDV>=5000 */
- uid = p->ki_uid;
--# endif /* FREEBSDV<5000 */
--#endif /* FREEBSDV<2000 */
-
- #if defined(HASPPID)
- ppid = p->P_PPID;
-@@ -330,7 +287,11 @@ gather_proc_info()
-
- #if defined(HAS_PWD)
- cdir = rdir = jdir = NULL;
-+#if defined(PWDDESC_KVM_LOAD_PWD)
-+ pwd_addr = (KA_T)PWDDESC_KVM_LOAD_PWD(&pd);
-+#else /* defined(PWDDESC_KVM_LOAD_PWD) */
- pwd_addr = (KA_T)FILEDESC_KVM_LOAD_PWD(&fd);
-+#endif /* defened(PWDDESC_KVM_LOAD_PWD) */
- if (pwd_addr != 0) {
- if (!kread(pwd_addr, (char *)&pwd, sizeof(pwd))) {
- cdir = pwd.pwd_cdir;
-@@ -397,7 +358,6 @@ gather_proc_info()
- link_lfile();
- }
-
--#if FREEBSDV>=5000
- /*
- * Save jail directory information.
- */
-@@ -408,7 +368,6 @@ gather_proc_info()
- if (Lf->sf)
- link_lfile();
- }
--#endif /* FREEBSDV>=5000 */
-
- /*
- * Save information on the text file.
-@@ -561,23 +520,13 @@ get_kernel_access()
- * Open kernel memory access.
- */
-
--#if FREEBSDV<2000
-- if (kvm_openfiles(Nmlst, Memory, NULL) == -1)
--#else /* FREEBSDV>=2000 */
- if ((Kd = kvm_open(Nmlst, Memory, NULL, O_RDONLY, NULL)) == NULL)
--#endif /* FREEBSDV<2000 */
-
- {
- (void) fprintf(stderr,
- "%s: kvm_open%s(execfile=%s, corefile=%s): %s\n",
- Pn,
--
--#if FREEBSDV<2000
-- "files",
--#else /* FREEBSDV>=2000 */
- "",
--#endif /* FREEBSDV<2000 */
--
- Nmlst ? Nmlst : "default",
- Memory ? Memory :
-
-@@ -678,11 +627,7 @@ kread(addr, buf, len)
- {
- int br;
-
--#if FREEBSDV<2000
-- br = kvm_read((void *)addr, (void *)buf, len);
--#else /* FREEBSDV>=2000 */
- br = kvm_read(Kd, (u_long)addr, buf, len);
--#endif /* FREEBSDV<2000 */
-
- return((br == len) ? 0 : 1);
- }
-@@ -724,9 +669,6 @@ process_text(vm)
- struct vm_object vmo;
- struct vmspace vmsp;
-
--#if FREEBSDV<2020
-- struct pager_struct pg;
--#endif /* FREEBSDV<2020 */
-
- /*
- * Read the vmspace structure for the process.
-@@ -762,30 +704,16 @@ process_text(vm)
- j < 2 && ka;
- j++,
-
--#if FREEBSDV<2020
-- ka = (KA_T)vmo.shadow
--#else /* FREEBSDV>=2020 */
- ka = (KA_T)vmo.backing_object
--#endif /* FREEBSDV<2020 */
- )
- {
- if (kread(ka, (char *)&vmo, sizeof(vmo)))
- break;
-
--#if FREEBSDV<2020
-- if ((ka = (KA_T)vmo.pager) == NULL
-- || kread(ka, (char *)&pg, sizeof(pg)))
-- continue;
-- if (pg.pg_handle == NULL || pg.pg_type != PG_VNODE)
-- continue;
-- (void) (enter_vn_text((KA_T)pg.pg_handle, &n));
--#else /* FREEBSDV>=2020 */
- if (vmo.type != OBJT_VNODE
- || vmo.handle == (void *)NULL)
- continue;
- (void) (enter_vn_text((KA_T)vmo.handle, &n));
--#endif /* FREEBSDV<2020 */
--
- }
- }
- }
diff --git a/sysutils/lsof/pkg-descr b/sysutils/lsof/pkg-descr
index 379f68f241e5..465657bb8c99 100644
--- a/sysutils/lsof/pkg-descr
+++ b/sysutils/lsof/pkg-descr
@@ -6,4 +6,4 @@ socket).
See also fstat(1) in the base system.
-WWW: https://people.freebsd.org/~abe/
+WWW: https://github.com/lsof-org/lsof
diff --git a/sysutils/lsof/pkg-plist b/sysutils/lsof/pkg-plist
index 8338f9c8f36a..4d407db7860e 100644
--- a/sysutils/lsof/pkg-plist
+++ b/sysutils/lsof/pkg-plist
@@ -6,16 +6,14 @@ sbin/lsof
@group wheel
%%DATADIR%%/00MANIFEST
%%DATADIR%%/00README
-%%DATADIR%%/big_brother.perl5
-%%DATADIR%%/count_pf.perl
-%%DATADIR%%/count_pf.perl5
-%%DATADIR%%/identd.perl5
-%%DATADIR%%/idrlogin.perl
-%%DATADIR%%/idrlogin.perl5
-%%DATADIR%%/list_NULf.perl5
+%%DATADIR%%/big_brother.pl
+%%DATADIR%%/count_pf.pl
+%%DATADIR%%/identd.pl
+%%DATADIR%%/idrlogin.pl
+%%DATADIR%%/list_NULf.pl
%%DATADIR%%/list_fields.awk
-%%DATADIR%%/list_fields.perl
-%%DATADIR%%/shared.perl5
-%%DATADIR%%/sort_res.perl5
-%%DATADIR%%/watch_a_file.perl
+%%DATADIR%%/list_fields.pl
+%%DATADIR%%/shared.pl
+%%DATADIR%%/sort_res.pl
+%%DATADIR%%/watch_a_file.pl
%%DATADIR%%/xusers.awk