CVS commit: pkgsrc/sysutils

[Frédéric Fauberteau <triaxx%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   triaxx
Date:           Mon Feb  3 09:12:32 UTC 2020

Modified Files:
        pkgsrc/sysutils/collectd-dns: Makefile
        pkgsrc/sysutils/collectd/patches: patch-src_utils__dns.c

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/sysutils/collectd-dns/Makefile
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/sysutils/collectd/patches/patch-src_utils__dns.c

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

Modified files:

Index: pkgsrc/sysutils/collectd-dns/Makefile
diff -u pkgsrc/sysutils/collectd-dns/Makefile:1.4 pkgsrc/sysutils/collectd-dns/Makefile:1.5
--- pkgsrc/sysutils/collectd-dns/Makefile:1.4   Sun Aug 11 13:23:04 2019
+++ pkgsrc/sysutils/collectd-dns/Makefile       Mon Feb  3 09:12:32 2020
@@ -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"
 

Index: pkgsrc/sysutils/collectd/patches/patch-src_utils__dns.c
diff -u pkgsrc/sysutils/collectd/patches/patch-src_utils__dns.c:1.2 pkgsrc/sysutils/collectd/patches/patch-src_utils__dns.c:1.3
--- pkgsrc/sysutils/collectd/patches/patch-src_utils__dns.c:1.2 Wed Dec  7 17:28:39 2016
+++ pkgsrc/sysutils/collectd/patches/patch-src_utils__dns.c     Mon Feb  3 09:12:32 2020
@@ -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.
---- src/utils_dns.c.orig       2016-11-30 08:52:01.328910078 +0000
+Resolve conflict with pkgsrc PCAP on NetBSD 7 and 8.
+
+--- 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