diff --git a/sysutils/lsof/Makefile b/sysutils/lsof/Makefile index b4b01a03d951..29bd2c387504 100644 --- a/sysutils/lsof/Makefile +++ b/sysutils/lsof/Makefile @@ -2,9 +2,8 @@ # $FreeBSD$ PORTNAME= lsof -DISTVERSION= 4.90M +DISTVERSION= 4.90P 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/distinfo b/sysutils/lsof/distinfo index 4a9e44b258dd..52e75384d9f3 100644 --- a/sysutils/lsof/distinfo +++ b/sysutils/lsof/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1497206529 -SHA256 (lsof_4.90M.freebsd.tar.bz2) = 629c4652e94ca1fff1eeb2a5c6c42126efab6a75978daf07f69af569ae4376eb -SIZE (lsof_4.90M.freebsd.tar.bz2) = 488695 +TIMESTAMP = 1505085809 +SHA256 (lsof_4.90P.freebsd.tar.bz2) = 5a8f70036c3059b1c403d675d5e2641e8493cc4bf77f61893bde6e0fd3ada3b6 +SIZE (lsof_4.90P.freebsd.tar.bz2) = 488892 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 3f8973aa00fb..000000000000 --- a/sysutils/lsof/files/patch-dialects_freebsd_dlsof.h +++ /dev/null @@ -1,16 +0,0 @@ ---- 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 - -