compiler-rt-netbsd: Patch out obsolete includes to fix build again

[Michał Górny <mgorny%gentoo.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Michał Górny <mgorny%gentoo.org@localhost>
Pushed By:	mgorny
Date:		Tue Oct 30 23:04:57 2018 +0100
Changeset:	3ecd0ac50ab3fa7bcd58a85f237f9f42ae40c91c

Modified Files:
	compiler-rt-netbsd/distinfo
	compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cc

Log Message:
compiler-rt-netbsd: Patch out obsolete includes to fix build again

Patch out the obsolete includes that have been accidentally readded
while rebasing the patches.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=3ecd0ac50ab3fa7bcd58a85f237f9f42ae40c91c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 compiler-rt-netbsd/distinfo                        |  2 +-
 ...__common_sanitizer__platform__limits__netbsd.cc | 36 ++++++++++++++++------
 2 files changed, 27 insertions(+), 11 deletions(-)

diffs:
diff --git a/compiler-rt-netbsd/distinfo b/compiler-rt-netbsd/distinfo
index 095c5bbaca..cb291517bf 100644
--- a/compiler-rt-netbsd/distinfo
+++ b/compiler-rt-netbsd/distinfo
@@ -12,7 +12,7 @@ SHA1 (patch-lib_sanitizer__common_sanitizer__interceptors__ioctl__netbsd.inc) =
 SHA1 (patch-lib_sanitizer__common_sanitizer__internal__defs.h) = 9475c8018dadbc4d865b52a03e43f9eae2011c3e
 SHA1 (patch-lib_sanitizer__common_sanitizer__linux__libcdep.cc) = 58a1dea6a852a4de20f23cd90900c387fe555dce
 SHA1 (patch-lib_sanitizer__common_sanitizer__platform__interceptors.h) = 48a0178377ff0610913487e1ee7032b198cd0437
-SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cc) = db78d4ade22951d8849ffb982ac18e8cf1e8a203
+SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cc) = 468924aba6200ddfdf359c3f33c2ca78fb6e0d31
 SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.h) = e8a0d9389f3ddd41f911e00f8ff62e214441296d
 SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__posix.cc) = 7c16ba866352f3a695a544094ca46f0f561c43c5
 SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__posix.h) = 9f535e84c3e1ab5704b11e388ac240439a9900d6
diff --git a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cc b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cc
index 72d0eca7cf..833585abf5 100644
--- a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cc
+++ b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cc
@@ -1,8 +1,24 @@
 $NetBSD$
 
---- lib/sanitizer_common/sanitizer_platform_limits_netbsd.cc.orig	2018-10-30 18:38:54.122499322 +0000
+--- lib/sanitizer_common/sanitizer_platform_limits_netbsd.cc.orig	2018-10-30 21:53:20.000000000 +0000
 +++ lib/sanitizer_common/sanitizer_platform_limits_netbsd.cc
-@@ -252,6 +252,10 @@ unsigned struct_rlimit_sz = sizeof(struc
+@@ -132,7 +132,6 @@
+ #include <dev/pci/tweio.h>
+ #include <dev/pcmcia/if_cnwioctl.h>
+ #include <net/bpf.h>
+-#include <net/if_atm.h>
+ #include <net/if_gre.h>
+ #include <net/ppp_defs.h>
+ #include <net/if_ppp.h>
+@@ -151,7 +150,6 @@
+ #include <netinet/ip_proxy.h>
+ #include <netinet6/in6_var.h>
+ #include <netinet6/nd6.h>
+-#include <netnatm/natm.h>
+ #include <netsmb/smb_dev.h>
+ #include <dev/biovar.h>
+ #include <dev/bluetooth/btdev.h>
+@@ -252,6 +250,10 @@ unsigned struct_rlimit_sz = sizeof(struc
  unsigned struct_timespec_sz = sizeof(struct timespec);
  unsigned struct_sembuf_sz = sizeof(struct sembuf);
  unsigned struct_kevent_sz = sizeof(struct kevent);
@@ -13,7 +29,7 @@ $NetBSD$
  unsigned struct_utimbuf_sz = sizeof(struct utimbuf);
  unsigned struct_itimerspec_sz = sizeof(struct itimerspec);
  unsigned struct_timex_sz = sizeof(struct timex);
-@@ -364,7 +368,6 @@ unsigned struct_atabusiodetach_args_sz =
+@@ -364,7 +366,6 @@ unsigned struct_atabusiodetach_args_sz =
  unsigned struct_atabusioscan_args_sz = sizeof(atabusioscan_args);
  unsigned struct_ath_diag_sz = sizeof(ath_diag);
  unsigned struct_atm_flowmap_sz = sizeof(atm_flowmap);
@@ -21,7 +37,7 @@ $NetBSD$
  unsigned struct_audio_buf_info_sz = sizeof(audio_buf_info);
  unsigned struct_audio_device_sz = sizeof(audio_device);
  unsigned struct_audio_encoding_sz = sizeof(audio_encoding);
-@@ -610,7 +613,6 @@ unsigned struct_priq_delete_filter_sz = 
+@@ -610,7 +611,6 @@ unsigned struct_priq_delete_filter_sz = 
  unsigned struct_priq_interface_sz = sizeof(priq_interface);
  unsigned struct_priq_modify_class_sz = sizeof(priq_modify_class);
  unsigned struct_ptmget_sz = sizeof(ptmget);
@@ -29,7 +45,7 @@ $NetBSD$
  unsigned struct_radio_info_sz = sizeof(radio_info);
  unsigned struct_red_conf_sz = sizeof(red_conf);
  unsigned struct_red_interface_sz = sizeof(red_interface);
-@@ -1428,13 +1430,6 @@ unsigned IOCTL_BIOCSRTIMEOUT = BIOCSRTIM
+@@ -1428,13 +1428,6 @@ unsigned IOCTL_BIOCSRTIMEOUT = BIOCSRTIM
  unsigned IOCTL_BIOCGRTIMEOUT = BIOCGRTIMEOUT;
  unsigned IOCTL_BIOCGFEEDBACK = BIOCGFEEDBACK;
  unsigned IOCTL_BIOCSFEEDBACK = BIOCSFEEDBACK;
@@ -43,7 +59,7 @@ $NetBSD$
  unsigned IOCTL_GRESADDRS = GRESADDRS;
  unsigned IOCTL_GRESADDRD = GRESADDRD;
  unsigned IOCTL_GREGADDRS = GREGADDRS;
-@@ -1465,6 +1460,7 @@ unsigned IOCTL_PPPIOCGMTU = PPPIOCGMTU;
+@@ -1465,6 +1458,7 @@ unsigned IOCTL_PPPIOCGMTU = PPPIOCGMTU;
  unsigned IOCTL_PPPIOCSMTU = PPPIOCSMTU;
  unsigned IOCTL_SIOCGPPPSTATS = SIOCGPPPSTATS;
  unsigned IOCTL_SIOCGPPPCSTATS = SIOCGPPPCSTATS;
@@ -51,7 +67,7 @@ $NetBSD$
  unsigned IOCTL_IOC_NPF_VERSION = IOC_NPF_VERSION;
  unsigned IOCTL_IOC_NPF_SWITCH = IOC_NPF_SWITCH;
  unsigned IOCTL_IOC_NPF_LOAD = IOC_NPF_LOAD;
-@@ -1473,6 +1469,7 @@ unsigned IOCTL_IOC_NPF_STATS = IOC_NPF_S
+@@ -1473,6 +1467,7 @@ unsigned IOCTL_IOC_NPF_STATS = IOC_NPF_S
  unsigned IOCTL_IOC_NPF_SAVE = IOC_NPF_SAVE;
  unsigned IOCTL_IOC_NPF_RULE = IOC_NPF_RULE;
  unsigned IOCTL_IOC_NPF_CONN_LOOKUP = IOC_NPF_CONN_LOOKUP;
@@ -59,7 +75,7 @@ $NetBSD$
  unsigned IOCTL_PPPOESETPARMS = PPPOESETPARMS;
  unsigned IOCTL_PPPOEGETPARMS = PPPOEGETPARMS;
  unsigned IOCTL_PPPOEGETSESSION = PPPOEGETSESSION;
-@@ -1818,8 +1815,6 @@ unsigned IOCTL_MTIOCSLOCATE = MTIOCSLOCA
+@@ -1818,8 +1813,6 @@ unsigned IOCTL_MTIOCSLOCATE = MTIOCSLOCA
  unsigned IOCTL_MTIOCHLOCATE = MTIOCHLOCATE;
  unsigned IOCTL_POWER_EVENT_RECVDICT = POWER_EVENT_RECVDICT;
  unsigned IOCTL_POWER_IOC_GET_TYPE = POWER_IOC_GET_TYPE;
@@ -68,7 +84,7 @@ $NetBSD$
  unsigned IOCTL_RIOCGINFO = RIOCGINFO;
  unsigned IOCTL_RIOCSINFO = RIOCSINFO;
  unsigned IOCTL_RIOCSSRCH = RIOCSSRCH;
-@@ -2077,6 +2072,39 @@ unsigned IOCTL_SNDCTL_DSP_SILENCE = SNDC
+@@ -2077,6 +2070,39 @@ unsigned IOCTL_SNDCTL_DSP_SILENCE = SNDC
  
  const int si_SEGV_MAPERR = SEGV_MAPERR;
  const int si_SEGV_ACCERR = SEGV_ACCERR;
@@ -108,7 +124,7 @@ $NetBSD$
  }  // namespace __sanitizer
  
  using namespace __sanitizer;
-@@ -2238,4 +2266,10 @@ CHECK_SIZE_AND_OFFSET(group, gr_passwd);
+@@ -2238,4 +2264,10 @@ CHECK_SIZE_AND_OFFSET(group, gr_passwd);
  CHECK_SIZE_AND_OFFSET(group, gr_gid);
  CHECK_SIZE_AND_OFFSET(group, gr_mem);