svn commit: r449573 - in head/sysutils/lsof: . files

[Larry Rosenman]

Author: ler
Date: Sun Sep 10 14:05:33 2017
New Revision: 449573
URL: https://svnweb.freebsd.org/changeset/ports/449573

Log:
  sysutils/lsof: unbreak after r323329

Added:
  head/sysutils/lsof/files/patch-dialects_freebsd_dlsof.h   (contents, props changed)
Modified:
  head/sysutils/lsof/Makefile

Modified: head/sysutils/lsof/Makefile
==============================================================================
--- head/sysutils/lsof/Makefile	Sun Sep 10 13:43:09 2017	(r449572)
+++ head/sysutils/lsof/Makefile	Sun Sep 10 14:05:33 2017	(r449573)
@@ -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/ \

Added: head/sysutils/lsof/files/patch-dialects_freebsd_dlsof.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/lsof/files/patch-dialects_freebsd_dlsof.h	Sun Sep 10 14:05:33 2017	(r449573)
@@ -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>
+ 
+