CVS commit: pkgsrc/net/libcares

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Oct 14 22:06:30 UTC 2024

Modified Files:
        pkgsrc/net/libcares: Makefile distinfo
Added Files:
        pkgsrc/net/libcares/patches: patch-include_ares__version.h

Log Message:
libcares: fix version string in header for CMake

Bug report filed upstream.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 pkgsrc/net/libcares/Makefile
cvs rdiff -u -r1.40 -r1.41 pkgsrc/net/libcares/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/net/libcares/patches/patch-include_ares__version.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/libcares/Makefile
diff -u pkgsrc/net/libcares/Makefile:1.48 pkgsrc/net/libcares/Makefile:1.49
--- pkgsrc/net/libcares/Makefile:1.48   Sun Oct 13 07:45:54 2024
+++ pkgsrc/net/libcares/Makefile        Mon Oct 14 22:06:30 2024
@@ -1,7 +1,10 @@
-# $NetBSD: Makefile,v 1.48 2024/10/13 07:45:54 wiz Exp $
+# $NetBSD: Makefile,v 1.49 2024/10/14 22:06:30 wiz Exp $
 
+# NOTE: when updating this, also update the version in
+# patches/patch-include_ares__version.h!
 DISTNAME=      c-ares-1.34.1
 PKGNAME=       ${DISTNAME:S/c-/libc/1}
+PKGREVISION=   1
 CATEGORIES=    net
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=c-ares/}
 GITHUB_PROJECT=        c-ares

Index: pkgsrc/net/libcares/distinfo
diff -u pkgsrc/net/libcares/distinfo:1.40 pkgsrc/net/libcares/distinfo:1.41
--- pkgsrc/net/libcares/distinfo:1.40   Sun Oct 13 07:45:54 2024
+++ pkgsrc/net/libcares/distinfo        Mon Oct 14 22:06:30 2024
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.40 2024/10/13 07:45:54 wiz Exp $
+$NetBSD: distinfo,v 1.41 2024/10/14 22:06:30 wiz Exp $
 
 BLAKE2s (c-ares-1.34.1.tar.gz) = 0128284c4cd3557f7ba44e499fb2f69d85ad72f7b89eef726e06914c37d35e88
 SHA512 (c-ares-1.34.1.tar.gz) = 193a4b304dd81dcaf9854ae26662868187521eddd3514a7ba32b2f4f45dc158081bf5829b07e36436e2f16344120e83fe1b9369a11d701ad053824d0b03371bb
 Size (c-ares-1.34.1.tar.gz) = 1008224 bytes
+SHA1 (patch-include_ares__version.h) = f727b16ff1f3d4356ba44f834a281e1839be0f75

Added files:

Index: pkgsrc/net/libcares/patches/patch-include_ares__version.h
diff -u /dev/null pkgsrc/net/libcares/patches/patch-include_ares__version.h:1.1
--- /dev/null   Mon Oct 14 22:06:30 2024
+++ pkgsrc/net/libcares/patches/patch-include_ares__version.h   Mon Oct 14 22:06:30 2024
@@ -0,0 +1,17 @@
+$NetBSD: patch-include_ares__version.h,v 1.1 2024/10/14 22:06:30 wiz Exp $
+
+Fix version for CMake.
+https://github.com/c-ares/c-ares/issues/902
+
+--- include/ares_version.h.orig        2024-10-14 22:00:00.204787470 +0000
++++ include/ares_version.h
+@@ -44,8 +44,6 @@
+ #define ARES_STRINGIFY_PRE(s) #s
+ #define ARES_STRINGIFY(s)     ARES_STRINGIFY_PRE(s)
+ 
+-#define ARES_VERSION_STR             \
+-  ARES_STRINGIFY(ARES_VERSION_MAJOR) \
+-  "." ARES_STRINGIFY(ARES_VERSION_MINOR) "." ARES_STRINGIFY(ARES_VERSION_PATCH)
++#define ARES_VERSION_STR             "1.34.1"
+ 
+ #endif