[pkgsrc/trunk]: pkgsrc/sysutils collectd-dns: fix PR pkg/54304

[triaxx <triaxx%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/99395a2a24bb
branches:  trunk
changeset: 411010:99395a2a24bb
user:      triaxx <triaxx%pkgsrc.org@localhost>
date:      Mon Feb 03 09:12:32 2020 +0000

description:
collectd-dns: fix PR pkg/54304

pkgsrc changes:
---------------
  * Update patch to undef DLT_IEEE802_15_4 when already defined in
    /usr/include/net/dlt.h.
  * Bump revision.

diffstat:

 sysutils/collectd-dns/Makefile                   |   4 ++--
 sysutils/collectd/patches/patch-src_utils__dns.c |  12 ++++++++----
 2 files changed, 10 insertions(+), 6 deletions(-)

diffs (42 lines):

diff -r 5b0ab2f5049f -r 99395a2a24bb sysutils/collectd-dns/Makefile
--- a/sysutils/collectd-dns/Makefile    Mon Feb 03 08:26:17 2020 +0000
+++ b/sysutils/collectd-dns/Makefile    Mon Feb 03 09:12:32 2020 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2019/08/11 13:23:04 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2020/02/03 09:12:32 triaxx Exp $
 
 COLLECTD_PACKAGE=      dns
 
 COMMENT=               Statistics collection daemon - dns plugin
-PKGREVISION=           2
+PKGREVISION=           3
 
 .include "../../sysutils/collectd/Makefile.common"
 
diff -r 5b0ab2f5049f -r 99395a2a24bb sysutils/collectd/patches/patch-src_utils__dns.c
--- a/sysutils/collectd/patches/patch-src_utils__dns.c  Mon Feb 03 08:26:17 2020 +0000
+++ b/sysutils/collectd/patches/patch-src_utils__dns.c  Mon Feb 03 09:12:32 2020 +0000
@@ -1,15 +1,19 @@
-$NetBSD: patch-src_utils__dns.c,v 1.2 2016/12/07 17:28:39 fhajny Exp $
+$NetBSD: patch-src_utils__dns.c,v 1.3 2020/02/03 09:12:32 triaxx Exp $
+
+Resolve conflict with pkgsrc PCAP on NetBSD 7 and 8.
 
-Resolve conflict with pkgsrc PCAP on NetBSD 7.
---- src/utils_dns.c.orig       2016-11-30 08:52:01.328910078 +0000
+--- src/utils_dns.c.orig       2017-11-18 09:03:27.370749644 +0000
 +++ src/utils_dns.c
-@@ -91,6 +91,9 @@
+@@ -91,6 +91,12 @@
  #endif
  
  #if HAVE_PCAP_H
 +# if defined(DLT_MATCHING_MAX)
 +#  undef DLT_MATCHING_MAX
 +# endif
++# if defined(DLT_IEEE802_15_4)
++#  undef DLT_IEEE802_15_4
++# endif
  #include <pcap.h>
  #endif