svn commit: r314863 - in head: . lib/libpcap

[Xin LI]

Author: delphij
Date: Tue Mar  7 16:06:53 2017
New Revision: 314863
URL: https://svnweb.freebsd.org/changeset/base/314863

Log:
  Stop installing pcap-int.h, which is the internal interface for libpcap.
  
  Reference:	https://github.com/the-tcpdump-group/libpcap/issues/560
  PR:		217221

Modified:
  head/ObsoleteFiles.inc
  head/lib/libpcap/Makefile

Modified: head/ObsoleteFiles.inc
==============================================================================
--- head/ObsoleteFiles.inc	Tue Mar  7 15:43:49 2017	(r314862)
+++ head/ObsoleteFiles.inc	Tue Mar  7 16:06:53 2017	(r314863)
@@ -38,6 +38,8 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20170307: remove pcap-int.h
+OLD_FILES+=usr/include/pcap-int.h
 # 20170302: new libc++ import which bumps version from 3.9.1 to 4.0.0.
 OLD_FILES+=usr/include/c++/v1/__undef___deallocate
 OLD_FILES+=usr/include/c++/v1/tr1/__undef___deallocate

Modified: head/lib/libpcap/Makefile
==============================================================================
--- head/lib/libpcap/Makefile	Tue Mar  7 15:43:49 2017	(r314862)
+++ head/lib/libpcap/Makefile	Tue Mar  7 16:06:53 2017	(r314863)
@@ -14,7 +14,7 @@ SRCS=	grammar.y tokdefs.h pcap_version.h
 	scanner.l sf-pcap.c sf-pcap-ng.c version.c
 
 # Old compatibility headers
-INCS=	pcap.h pcap-int.h pcap-namedb.h pcap-bpf.h
+INCS=	pcap.h pcap-namedb.h pcap-bpf.h
 
 PCAPINCS=	pcap/pcap.h pcap/namedb.h pcap/bpf.h pcap/dlt.h pcap/export-defs.h
 PCAPINCSDIR=	${INCLUDEDIR}/pcap