diff options
| author | Larry Rosenman <ler@FreeBSD.org> | 2017-09-10 14:05:33 +0000 |
|---|---|---|
| committer | Larry Rosenman <ler@FreeBSD.org> | 2017-09-10 14:05:33 +0000 |
| commit | 845a02f1de5b0bd69fbb198b1dbb99d4654da3af (patch) | |
| tree | 457014f414397cd1495152f78fcde4a6ebc11af6 /sysutils/lsof | |
| parent | 492175c49e43dd3da5d31b477bb1845952d43663 (diff) | |
| download | ports-845a02f1de5b0bd69fbb198b1dbb99d4654da3af.tar.gz ports-845a02f1de5b0bd69fbb198b1dbb99d4654da3af.zip | |
sysutils/lsof: unbreak after r323329
Notes
Notes:
svn path=/head/; revision=449573
Diffstat (limited to 'sysutils/lsof')
| -rw-r--r-- | sysutils/lsof/Makefile | 1 | ||||
| -rw-r--r-- | sysutils/lsof/files/patch-dialects_freebsd_dlsof.h | 16 |
2 files changed, 17 insertions, 0 deletions
diff --git a/sysutils/lsof/Makefile b/sysutils/lsof/Makefile index 3a156626b4a9..b4b01a03d951 100644 --- a/sysutils/lsof/Makefile +++ b/sysutils/lsof/Makefile @@ -4,6 +4,7 @@ PORTNAME= lsof DISTVERSION= 4.90M PORTEPOCH= 8 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/ \ ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/NEW/ \ 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..3f8973aa00fb --- /dev/null +++ b/sysutils/lsof/files/patch-dialects_freebsd_dlsof.h @@ -0,0 +1,16 @@ +--- dialects/freebsd/dlsof.h.orig 2017-09-10 14:02:39 UTC ++++ dialects/freebsd/dlsof.h +@@ -486,6 +486,13 @@ struct vop_advlock_args { int dummy; }; /* to pacify l + # endif /* FREEBSDV<5000 */ + # endif /* FREEBSDV>=2020 */ + ++/* ++ * Inclusion of kernel headers with _KERNEL specified causes a conflict with ++ * userspace. bzero is a macro, but is redefined to be a function in string.h ++ * Work around by just undefing. ++ */ ++#undef bzero ++ + #include <string.h> + + |