CVS commit: pkgsrc/geography/opencpn

["Manuel Bouyer" <bouyer%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bouyer
Date:           Sun Feb 22 22:23:16 UTC 2026

Modified Files:
        pkgsrc/geography/opencpn: distinfo
Added Files:
        pkgsrc/geography/opencpn/patches: patch-src_pluginmanager.cpp

Log Message:
Don't include both <elf.h> and <libelf.h> on NetBSD, fix build on
NetBSD 11


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 pkgsrc/geography/opencpn/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/geography/opencpn/patches/patch-src_pluginmanager.cpp

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

Modified files:

Index: pkgsrc/geography/opencpn/distinfo
diff -u pkgsrc/geography/opencpn/distinfo:1.28 pkgsrc/geography/opencpn/distinfo:1.29
--- pkgsrc/geography/opencpn/distinfo:1.28      Sun Sep 14 10:53:56 2025
+++ pkgsrc/geography/opencpn/distinfo   Sun Feb 22 22:23:16 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.28 2025/09/14 10:53:56 wiz Exp $
+$NetBSD: distinfo,v 1.29 2026/02/22 22:23:16 bouyer Exp $
 
 BLAKE2s (OpenCPN-5.0.0.zip) = b29dc2c6cde51a2984e835496ed424f919824df8aa3dd48f14dfa654221b8571
 SHA512 (OpenCPN-5.0.0.zip) = 146fe0bf29424f72138168cd20617aabc2f130d2ffd47b8da4aa1e0aa6d7176093b36d96d8f0d456af1f7805db13ed87be67f4f3af7a7a2d6abf0d5734834f7a
@@ -12,6 +12,7 @@ SHA1 (patch-plugins_wmm_pi_CMakeLists.tx
 SHA1 (patch-src_glu_CMakeLists.txt) = 6d17d0e878c7ce52e49837c94cb003d18829be40
 SHA1 (patch-src_mipmap_mipmap.c) = 3bdb2c37e7a6d89fc6a531af6e0396a1ff385aeb
 SHA1 (patch-src_ocpndc.cpp) = d0f32a34a9a9401c07a6c071994b2173343ed7d1
+SHA1 (patch-src_pluginmanager.cpp) = ed1054c130cdbe4679cc95423c27a5887f023fe4
 SHA1 (patch-src_printtable.cpp) = 52ed0f09610d56e9acc5ec9b8e4cbdc7ad55d043
 SHA1 (patch-src_routeprintout.cpp) = c0f960b76b1b7a8acb7e5faca5f656a5c259f02c
 SHA1 (patch-src_wxcurl_base.cpp) = 25c6d03dd1215885f15221d888327f0535080284

Added files:

Index: pkgsrc/geography/opencpn/patches/patch-src_pluginmanager.cpp
diff -u /dev/null pkgsrc/geography/opencpn/patches/patch-src_pluginmanager.cpp:1.1
--- /dev/null   Sun Feb 22 22:23:16 2026
+++ pkgsrc/geography/opencpn/patches/patch-src_pluginmanager.cpp        Sun Feb 22 22:23:16 2026
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_pluginmanager.cpp,v 1.1 2026/02/22 22:23:16 bouyer Exp $
+
+Avoid conflicting definitions between elf.h and libelf.h
+
+--- src/pluginmanager.cpp.orig 2026-02-22 15:39:46.203344963 +0100
++++ src/pluginmanager.cpp      2026-02-22 15:40:14.895800822 +0100
+@@ -44,7 +44,9 @@
+ #include <errno.h>
+ 
+ #ifdef USE_LIBELF
++#ifndef __NetBSD__
+ #include <elf.h>
++#endif
+ #include <libelf.h>
+ #include <gelf.h>
+ #endif