CVS commit: pkgsrc/net/libcares

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Fri May 31 08:09:41 UTC 2019

Modified Files:
        pkgsrc/net/libcares: Makefile PLIST distinfo
Added Files:
        pkgsrc/net/libcares/patches: patch-CMakeLists.txt
Removed Files:
        pkgsrc/net/libcares/patches: patch-Makefile.am patch-configure.ac
            patch-m4_cares-compilers.m4 patch-m4_xc-cc-check.m4

Log Message:
libcares: switch to CMake - needed for grpc; bump revision


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 pkgsrc/net/libcares/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/net/libcares/PLIST
cvs rdiff -u -r1.17 -r1.18 pkgsrc/net/libcares/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/net/libcares/patches/patch-CMakeLists.txt
cvs rdiff -u -r1.1 -r0 pkgsrc/net/libcares/patches/patch-Makefile.am \
    pkgsrc/net/libcares/patches/patch-configure.ac \
    pkgsrc/net/libcares/patches/patch-m4_cares-compilers.m4 \
    pkgsrc/net/libcares/patches/patch-m4_xc-cc-check.m4

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.25 pkgsrc/net/libcares/Makefile:1.26
--- pkgsrc/net/libcares/Makefile:1.25   Wed Nov 28 08:53:18 2018
+++ pkgsrc/net/libcares/Makefile        Fri May 31 08:09:41 2019
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2018/11/28 08:53:18 adam Exp $
+# $NetBSD: Makefile,v 1.26 2019/05/31 08:09:41 adam Exp $
 
 DISTNAME=      c-ares-1.15.0
 PKGNAME=       ${DISTNAME:S/c-/libc/1}
+PKGREVISION=   1
 CATEGORIES=    net
 MASTER_SITES=  https://c-ares.haxx.se/download/
 
@@ -10,13 +11,7 @@ HOMEPAGE=    https://c-ares.haxx.se/
 COMMENT=       Asynchronous resolver library, c-ares
 LICENSE=       mit
 
-USE_LIBTOOL=           yes
-USE_TOOLS+=            automake autoreconf
-GNU_CONFIGURE=         yes
-PKGCONFIG_OVERRIDE+=   libcares.pc.in
-
-pre-configure:
-       ${RM} -f ${WRKSRC}/m4/xc-val-flgs.m4
-       cd ${WRKSRC} && autoreconf -fiv
+USE_CMAKE=     yes
+CMAKE_ARGS+=   -DCARES_STATIC=ON
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/libcares/PLIST
diff -u pkgsrc/net/libcares/PLIST:1.10 pkgsrc/net/libcares/PLIST:1.11
--- pkgsrc/net/libcares/PLIST:1.10      Wed Nov 28 08:53:18 2018
+++ pkgsrc/net/libcares/PLIST   Fri May 31 08:09:41 2019
@@ -1,10 +1,19 @@
-@comment $NetBSD: PLIST,v 1.10 2018/11/28 08:53:18 adam Exp $
+@comment $NetBSD: PLIST,v 1.11 2019/05/31 08:09:41 adam Exp $
+bin/acountry
+bin/adig
+bin/ahost
 include/ares.h
 include/ares_build.h
 include/ares_dns.h
 include/ares_rules.h
 include/ares_version.h
-lib/libcares.la
+lib/cmake/c-ares/c-ares-config.cmake
+lib/cmake/c-ares/c-ares-targets-noconfig.cmake
+lib/cmake/c-ares/c-ares-targets.cmake
+lib/libcares.so
+lib/libcares.so.2
+lib/libcares.so.2.3.0
+lib/libcares_static.a
 lib/pkgconfig/libcares.pc
 man/man3/ares_cancel.3
 man/man3/ares_create_query.3

Index: pkgsrc/net/libcares/distinfo
diff -u pkgsrc/net/libcares/distinfo:1.17 pkgsrc/net/libcares/distinfo:1.18
--- pkgsrc/net/libcares/distinfo:1.17   Wed Nov 28 08:53:18 2018
+++ pkgsrc/net/libcares/distinfo        Fri May 31 08:09:41 2019
@@ -1,10 +1,7 @@
-$NetBSD: distinfo,v 1.17 2018/11/28 08:53:18 adam Exp $
+$NetBSD: distinfo,v 1.18 2019/05/31 08:09:41 adam Exp $
 
 SHA1 (c-ares-1.15.0.tar.gz) = 74a50c02b7f051c4fb66c0f60f187350f196d908
 RMD160 (c-ares-1.15.0.tar.gz) = a819b9eec9864cca80bf9a2e0669d1ef4190bb91
 SHA512 (c-ares-1.15.0.tar.gz) = a1de6c5e7e1a6a13c926aae690e83d5caa51e7313d63da1cf2af6bc757c41d585aad5466bc3ba7b7f7793cb1748fa589f40972b196728851c8b059cfc8c3be50
 Size (c-ares-1.15.0.tar.gz) = 1347687 bytes
-SHA1 (patch-Makefile.am) = aef2a0e1975aadab33e647752fd44e30fbfb568a
-SHA1 (patch-configure.ac) = 0327491be4565b5121811d42288bd1d79b7c1241
-SHA1 (patch-m4_cares-compilers.m4) = 3a5cf27d33ebb7803eab873c6adfc6a70fa4a782
-SHA1 (patch-m4_xc-cc-check.m4) = b979d60f1ecb5008b145ade55281c6e2a59be613
+SHA1 (patch-CMakeLists.txt) = 14becd3317e36320ec01ee2d01c775674c178ad6

Added files:

Index: pkgsrc/net/libcares/patches/patch-CMakeLists.txt
diff -u /dev/null pkgsrc/net/libcares/patches/patch-CMakeLists.txt:1.1
--- /dev/null   Fri May 31 08:09:41 2019
+++ pkgsrc/net/libcares/patches/patch-CMakeLists.txt    Fri May 31 08:09:41 2019
@@ -0,0 +1,12 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2019/05/31 08:09:41 adam Exp $
+
+--- CMakeLists.txt.orig        2019-05-26 21:44:42.000000000 +0000
++++ CMakeLists.txt
+@@ -639,6 +639,7 @@ ENDIF ()
+ IF (CARES_INSTALL)
+       SET (CARES_HEADERS ares.h ares_version.h ares_dns.h "${PROJECT_BINARY_DIR}/ares_build.h" ares_rules.h)
+       INSTALL (FILES ${CARES_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
++      install(FILES ${MANPAGES} DESTINATION ${CMAKE_INSTALL_MANDIR}/man3)
+ ENDIF ()
+ 
+ # Export targets