aboutsummaryrefslogtreecommitdiff
path: root/sysutils/lsof
diff options
context:
space:
mode:
authorLarry Rosenman <ler@FreeBSD.org>2019-05-22 02:34:39 +0000
committerLarry Rosenman <ler@FreeBSD.org>2019-05-22 02:34:39 +0000
commita578d380e9443202169d6b4f9ec27978a30cea96 (patch)
treee9264857a7e55af45b7afbf51f238fa85dedc83c /sysutils/lsof
parentd54495a72e5de6f5634223fdafb710e8e57f6ce5 (diff)
downloadports-a578d380e9443202169d6b4f9ec27978a30cea96.tar.gz
ports-a578d380e9443202169d6b4f9ec27978a30cea96.zip
sysutils/lsof: fix build on -CURRENT.
sys/_lock.h is no longer implicitly included in such a way that the #ifdef _KERNEL #error in lockmgr.h is bypassed after r347984. Fix lsof to explicitly include _lock.h with _KERNEL defined on 13. Submitted by: cem Reported by: pkg-fallout Differential Revision: https://reviews.freebsd.org/D20341
Notes
Notes: svn path=/head/; revision=502243
Diffstat (limited to 'sysutils/lsof')
-rw-r--r--sysutils/lsof/Makefile1
-rw-r--r--sysutils/lsof/files/patch-dialects-freebsd-dlsof.h21
2 files changed, 22 insertions, 0 deletions
diff --git a/sysutils/lsof/Makefile b/sysutils/lsof/Makefile
index 62d285d85402..a46250c1f007 100644
--- a/sysutils/lsof/Makefile
+++ b/sysutils/lsof/Makefile
@@ -3,6 +3,7 @@
PORTNAME= lsof
DISTVERSION= 4.93.2
+PORTREVISION= 1
PORTEPOCH= 8
CATEGORIES= sysutils
diff --git a/sysutils/lsof/files/patch-dialects-freebsd-dlsof.h b/sysutils/lsof/files/patch-dialects-freebsd-dlsof.h
new file mode 100644
index 000000000000..fb79749196fa
--- /dev/null
+++ b/sysutils/lsof/files/patch-dialects-freebsd-dlsof.h
@@ -0,0 +1,21 @@
+Index: sysutils/lsof/files/patch-dialects-freebsd-dlsof.h
+===================================================================
+--- /dev/null
++++ sysutils/lsof/files/patch-dialects-freebsd-dlsof.h
+@@ -0,0 +1,16 @@
++--- dialects/freebsd/dlsof.h.orig 2019-05-08 07:32:25 UTC
+++++ dialects/freebsd/dlsof.h
++@@ -45,6 +45,13 @@
++ #include <signal.h>
++ #include <unistd.h>
++
+++#if FREEBSDV>=13000
+++/* This header is a huge mess. Please don't support EOL FreeBSD releases. */
+++#define _KERNEL 1
+++#include <sys/_lock.h>
+++#undef _KERNEL
+++#endif /* FREEBSDV>=13000 */
+++
++ # if FREEBSDV>=4000
++ # if FREEBSDV>=5000
++ # if FREEBSDV<6020