CVS commit: pkgsrc/net/pim6dd

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Jun 30 19:55:53 UTC 2026

Modified Files:
        pkgsrc/net/pim6dd: Makefile distinfo
Added Files:
        pkgsrc/net/pim6dd/patches: patch-pimdd.h

Log Message:
pim6dd: fix build on NetBSD-current

Based on a patch by kre@


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 pkgsrc/net/pim6dd/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/net/pim6dd/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/net/pim6dd/patches/patch-pimdd.h

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

Modified files:

Index: pkgsrc/net/pim6dd/Makefile
diff -u pkgsrc/net/pim6dd/Makefile:1.19 pkgsrc/net/pim6dd/Makefile:1.20
--- pkgsrc/net/pim6dd/Makefile:1.19     Wed Mar 18 17:59:20 2020
+++ pkgsrc/net/pim6dd/Makefile  Tue Jun 30 19:55:52 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2020/03/18 17:59:20 joerg Exp $
+# $NetBSD: Makefile,v 1.20 2026/06/30 19:55:52 wiz Exp $
 
 DISTNAME=      pim6dd-20031021a
 PKGREVISION=   1
@@ -11,15 +11,16 @@ COMMENT=    IPv6 PIM dense mode daemon
 USE_BSD_MAKEFILE=      yes
 USE_FEATURES+=         inet6
 
-CWARNFLAGS.clang=      -Wno-error=knr-promoted-parameter \
-                       -Wno-error=address-of-packed-member
-MAKE_ENV+=     CWARNFLAGS.clang=${CWARNFLAGS.clang:Q}
+CWARNFLAGS.clang=      -Wno-error=knr-promoted-parameter
+CWARNFLAGS.clang+=     -Wno-error=address-of-packed-member
+MAKE_ENV+=             CWARNFLAGS.clang=${CWARNFLAGS.clang:Q}
+MAKE_FLAGS+=           PREFIX=${PREFIX}
 
-CONFLICTS=     mcast-tools-*
+CONFLICTS=     mcast-tools-[0-9]*
 
 WRKSRC=                ${WRKDIR}/${DISTNAME}/pim6dd/
 
-INSTALLATION_DIRS=     ${PKGMANDIR}/cat5 ${PKGMANDIR}/cat8 \
-                       ${PKGMANDIR}/man5 ${PKGMANDIR}/man8 sbin
+INSTALLATION_DIRS+=    ${PKGMANDIR}/cat5 ${PKGMANDIR}/cat8
+INSTALLATION_DIRS+=    ${PKGMANDIR}/man5 ${PKGMANDIR}/man8 sbin
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/pim6dd/distinfo
diff -u pkgsrc/net/pim6dd/distinfo:1.12 pkgsrc/net/pim6dd/distinfo:1.13
--- pkgsrc/net/pim6dd/distinfo:1.12     Tue Oct 26 11:06:30 2021
+++ pkgsrc/net/pim6dd/distinfo  Tue Jun 30 19:55:52 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2021/10/26 11:06:30 nia Exp $
+$NetBSD: distinfo,v 1.13 2026/06/30 19:55:52 wiz Exp $
 
 BLAKE2s (pim6dd-20031021a.tar.gz) = 2e0ffd55af9062bfd3c85ff270c7a82e9916722e08361aa9e1fab94da7a24887
 SHA512 (pim6dd-20031021a.tar.gz) = ff92131fd0cc804f6a2ef6d48f8b23f6d40e1e76e9e9d3719c283b968f7d2236d27af1facbdc68d48f1b214cc16ef7f9560eaa9e52675c4557a077bb28b59e90
@@ -7,3 +7,4 @@ SHA1 (patch-aa) = 8b11f1530d6e382ff4a456
 SHA1 (patch-ab) = 631ff729b8aad01d46b8443a4838d35b59725854
 SHA1 (patch-ac) = e2cf4f7388f0ab8ade9843a42329c37130bf62af
 SHA1 (patch-pim6.c) = b5f9f615d34859d152968136833ddef194cb7bbf
+SHA1 (patch-pimdd.h) = 186e834faaa03f25048754303e41c0091ffacf53

Added files:

Index: pkgsrc/net/pim6dd/patches/patch-pimdd.h
diff -u /dev/null pkgsrc/net/pim6dd/patches/patch-pimdd.h:1.1
--- /dev/null   Tue Jun 30 19:55:53 2026
+++ pkgsrc/net/pim6dd/patches/patch-pimdd.h     Tue Jun 30 19:55:53 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-pimdd.h,v 1.1 2026/06/30 19:55:53 wiz Exp $
+
+Fix build for NetBSD after 2025.
+
+--- pimdd.h.orig       2026-06-30 19:51:10.909831591 +0000
++++ pimdd.h
+@@ -532,7 +532,7 @@ do {                                                  
+ #define PIM_LEAF_TIMEOUT               (3.5 * IGMP_QUERY_INTERVAL)
+ #endif /* NOSUCHDEF */
+ 
+-#if defined(__bsdi__) || defined(__NetBSD__)
++#if defined(__bsdi__) || (defined(__NetBSD__) && !defined(IGMPMSG_NOCACHE))
+ /*
+  * Struct used to communicate from kernel to multicast router
+  * note the convenient similarity to an IP packet