--- a/components/tcpdump/Makefile	Thu Jun 16 06:52:10 2016 -0700
+++ b/components/tcpdump/Makefile	Thu Jun 16 09:06:16 2016 -0700
@@ -34,9 +34,6 @@
 
 TPNO=			22949
 
-# Prevent macro redefinition error 
-CFLAGS += -D _NETINET_IP_H
-
 include $(WS_MAKE_RULES)/common.mk
 
 # Rebuild the configure script so the man pages are normalized.

--- a/components/tcpdump/patches/man.patch	Thu Jun 16 06:52:10 2016 -0700
+++ b/components/tcpdump/patches/man.patch	Thu Jun 16 09:06:16 2016 -0700
@@ -5,6 +5,15 @@
 
 --- tcpdump-4.7.4/tcpdump.1.in.orig	Thu Apr 21 11:21:42 2016
 +++ tcpdump-4.7.4/tcpdump.1.in	Thu Apr 21 11:29:23 2016
+@@ -20,7 +20,7 @@
+ .\" WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
+ .\" MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ .\"
+-.TH TCPDUMP 1  "11 July 2014"
++.TH TCPDUMP 8  "11 July 2014"
+ .SH NAME
+ tcpdump \- dump traffic on a network
+ .SH SYNOPSIS
 @@ -393,7 +393,7 @@
  .I interface
  argument of ``any'' can be used to capture packets from all interfaces.
@@ -14,3 +23,23 @@
  .IP
  If the
  .B \-D
+--- tcpdump-4.7.4//Makefile.in	2016-06-15 14:27:29.370657670 -0700
++++ tcpdump-4.7.4//Makefile.in	2016-06-15 14:26:30.183856767 -0700
+@@ -409,13 +409,13 @@ install: all
+ 	    (mkdir -p $(DESTDIR)$(sbindir); chmod 755 $(DESTDIR)$(sbindir))
+ 	$(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(sbindir)/$(PROG)
+ 	$(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(sbindir)/$(PROG).`cat ${srcdir}/VERSION`
+-	[ -d $(DESTDIR)$(mandir)/man1 ] || \
+-	    (mkdir -p $(DESTDIR)$(mandir)/man1; chmod 755 $(DESTDIR)$(mandir)/man1)
+-	$(INSTALL_DATA) $(PROG).1 $(DESTDIR)$(mandir)/man1/$(PROG).1
++	[ -d $(DESTDIR)$(mandir)/man8 ] || \
++	    (mkdir -p $(DESTDIR)$(mandir)/man8; chmod 755 $(DESTDIR)$(mandir)/man8)
++	$(INSTALL_DATA) $(PROG).1 $(DESTDIR)$(mandir)/man8/$(PROG).8
+ 
+ uninstall:
+ 	rm -f $(DESTDIR)$(sbindir)/$(PROG)
+-	rm -f $(DESTDIR)$(mandir)/man1/$(PROG).1
++	rm -f $(DESTDIR)$(mandir)/man8/$(PROG).8
+ 
+ lint: $(GENSRC)
+ 	lint -hbxn $(SRC) | \

--- a/components/tcpdump/tcpdump.p5m	Thu Jun 16 06:52:10 2016 -0700
+++ b/components/tcpdump/tcpdump.p5m	Thu Jun 16 09:06:16 2016 -0700
@@ -37,5 +37,5 @@
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 file exec_attr.tcpdump path=etc/security/exec_attr.d/diagnostic:tcpdump
 file path=usr/sbin/tcpdump
-file path=usr/share/man/man1/tcpdump.1
+file path=usr/share/man/man8/tcpdump.8
 license tcpdump.license license=BSD