From 03f2657f299d86378a558366d68e6c7e573fbd72 Mon Sep 17 00:00:00 2001 From: Gleb Smirnoff Date: Sat, 23 Mar 2024 12:49:33 -0700 Subject: [PATCH] sysutils/lsof: pull in two upstream patches for FreeBSD 15 Approved by: arrowd --- sysutils/lsof/Makefile | 7 ++++++- sysutils/lsof/distinfo | 6 +++++- sysutils/lsof/files/patch-Configure | 14 -------------- 3 files changed, 11 insertions(+), 16 deletions(-) delete mode 100644 sysutils/lsof/files/patch-Configure diff --git a/sysutils/lsof/Makefile b/sysutils/lsof/Makefile index 395bb0ca21fb5..4c1bac9d73173 100644 --- a/sysutils/lsof/Makefile +++ b/sysutils/lsof/Makefile @@ -3,7 +3,7 @@ PORTNAME= lsof DISTVERSION= 4.99.3 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 8 CATEGORIES= sysutils @@ -21,6 +21,11 @@ CPE_VENDOR= lsof_project USE_GITHUB= yes GH_ACCOUNT= lsof-org +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ +PATCHFILES= 003c8463fd6b8cf2d25a4b10a874825f8f4b471b.patch \ + 5233d10ec63ba674c250bdc4308c3a22a04f6d20.patch +PATCH_DIST_STRIP= -p1 + SHEBANG_FILES= scripts/*.pl HAS_CONFIGURE= yes diff --git a/sysutils/lsof/distinfo b/sysutils/lsof/distinfo index ce08800328f80..3a422a129f111 100644 --- a/sysutils/lsof/distinfo +++ b/sysutils/lsof/distinfo @@ -1,3 +1,7 @@ -TIMESTAMP = 1702773381 +TIMESTAMP = 1711222041 SHA256 (lsof-org-lsof-4.99.3_GH0.tar.gz) = b9c56468b927d9691ab168c0b1e9f8f1f835694a35ff898c549d383bd8d09bd4 SIZE (lsof-org-lsof-4.99.3_GH0.tar.gz) = 1134357 +SHA256 (003c8463fd6b8cf2d25a4b10a874825f8f4b471b.patch) = 08a6982c00b937058a700657307b91486c873d8403e8b4ff7e127ce1ab41bbfd +SIZE (003c8463fd6b8cf2d25a4b10a874825f8f4b471b.patch) = 2670 +SHA256 (5233d10ec63ba674c250bdc4308c3a22a04f6d20.patch) = d035dfdd9de8aebbb901c1992bd934d528808ec4376865e8857f3a219777c825 +SIZE (5233d10ec63ba674c250bdc4308c3a22a04f6d20.patch) = 603 diff --git a/sysutils/lsof/files/patch-Configure b/sysutils/lsof/files/patch-Configure deleted file mode 100644 index 390a3f07b7bfc..0000000000000 --- a/sysutils/lsof/files/patch-Configure +++ /dev/null @@ -1,14 +0,0 @@ ---- Configure.orig 2023-01-16 22:42:40.000000000 -0800 -+++ Configure 2023-08-29 18:43:40.296306000 -0700 -@@ -1209,6 +1209,11 @@ - LSOF_TSTBIGF=" " - LSOF_VERS=14000 - ;; -+ 15*) -+ LSOF_CFGL="$LSOF_CFGL -lutil" -+ LSOF_TSTBIGF=" " -+ LSOF_VERS=15000 -+ ;; - *) - echo Unknown FreeBSD release: `uname -r` - rm -f $LSOF_HLP