[pkgsrc/trunk]: pkgsrc/net/libcares libcares: switch to CMake - needed for gr...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/net/libcares libcares: switch to CMake - needed for gr...
From: adam <adam%pkgsrc.org@localhost>
Date: Wed, 15 Jan 2020 11:18:14 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/f7d5d174849a
branches:  trunk
changeset: 396403:f7d5d174849a
user:      adam <adam%pkgsrc.org@localhost>
date:      Fri May 31 08:09:41 2019 +0000

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

diffstat:

 net/libcares/Makefile                            |  13 ++------
 net/libcares/PLIST                               |  13 +++++++-
 net/libcares/distinfo                            |   7 +---
 net/libcares/patches/patch-CMakeLists.txt        |  12 ++++++++
 net/libcares/patches/patch-Makefile.am           |  27 -------------------
 net/libcares/patches/patch-configure.ac          |  15 ----------
 net/libcares/patches/patch-m4_cares-compilers.m4 |  34 ------------------------
 net/libcares/patches/patch-m4_xc-cc-check.m4     |  14 ---------
 8 files changed, 29 insertions(+), 106 deletions(-)

diffs (192 lines):

diff -r 42cf17097453 -r f7d5d174849a net/libcares/Makefile
--- a/net/libcares/Makefile     Fri May 31 07:21:53 2019 +0000
+++ b/net/libcares/Makefile     Fri May 31 08:09:41 2019 +0000
@@ -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 @@
 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"
diff -r 42cf17097453 -r f7d5d174849a net/libcares/PLIST
--- a/net/libcares/PLIST        Fri May 31 07:21:53 2019 +0000
+++ b/net/libcares/PLIST        Fri May 31 08:09:41 2019 +0000
@@ -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
diff -r 42cf17097453 -r f7d5d174849a net/libcares/distinfo
--- a/net/libcares/distinfo     Fri May 31 07:21:53 2019 +0000
+++ b/net/libcares/distinfo     Fri May 31 08:09:41 2019 +0000
@@ -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
diff -r 42cf17097453 -r f7d5d174849a net/libcares/patches/patch-CMakeLists.txt
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/libcares/patches/patch-CMakeLists.txt Fri May 31 08:09:41 2019 +0000
@@ -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
diff -r 42cf17097453 -r f7d5d174849a net/libcares/patches/patch-Makefile.am
--- a/net/libcares/patches/patch-Makefile.am    Fri May 31 07:21:53 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-$NetBSD: patch-Makefile.am,v 1.1 2016/09/30 09:00:10 wiz Exp $
-
-Fix parallel build with BSD make.
-
---- Makefile.am.orig   2016-09-29 10:51:46.000000000 +0000
-+++ Makefile.am
-@@ -150,17 +150,17 @@ libcares_la_HEADERS = ares.h ares_versio
-       ares_build.h ares_rules.h
- 
- ahost_SOURCES = ahost.c $(SAMPLESOURCES) $(SAMPLEHEADERS)
--ahost_LDADD = $(top_builddir)/libcares.la
-+ahost_LDADD = libcares.la
- ahost_CFLAGS = $(AM_CFLAGS)
- ahost_CPPFLAGS = $(AM_CPPFLAGS)
- 
- adig_SOURCES = adig.c $(SAMPLESOURCES) $(SAMPLEHEADERS)
--adig_LDADD = $(top_builddir)/libcares.la
-+adig_LDADD = libcares.la
- adig_CFLAGS = $(AM_CFLAGS)
- adig_CPPFLAGS = $(AM_CPPFLAGS)
- 
- acountry_SOURCES = acountry.c $(SAMPLESOURCES) $(SAMPLEHEADERS)
--acountry_LDADD = $(top_builddir)/libcares.la
-+acountry_LDADD = libcares.la
- acountry_CFLAGS = $(AM_CFLAGS)
- acountry_CPPFLAGS = $(AM_CPPFLAGS)
- 
diff -r 42cf17097453 -r f7d5d174849a net/libcares/patches/patch-configure.ac
--- a/net/libcares/patches/patch-configure.ac   Fri May 31 07:21:53 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-configure.ac,v 1.1 2017/07/15 17:15:17 wiz Exp $
-
-Do not prescribe what should be in CFLAGS/CPPFLAGS.
-
---- configure.ac.orig  2017-06-20 06:03:54.000000000 +0000
-+++ configure.ac
-@@ -872,7 +872,7 @@ squeeze LIBS
- 
- squeeze CARES_PRIVATE_LIBS
- 
--XC_CHECK_BUILD_FLAGS
-+# XC_CHECK_BUILD_FLAGS
- 
- AC_MSG_CHECKING([whether to build tests])
- AC_ARG_ENABLE(tests,
diff -r 42cf17097453 -r f7d5d174849a net/libcares/patches/patch-m4_cares-compilers.m4
--- a/net/libcares/patches/patch-m4_cares-compilers.m4  Fri May 31 07:21:53 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-$NetBSD: patch-m4_cares-compilers.m4,v 1.1 2017/12/13 15:15:45 jperkin Exp $
-
-Don't strip out user-supplied debug flags.
-
---- m4/cares-compilers.m4.orig 2016-01-23 22:41:55.000000000 +0000
-+++ m4/cares-compilers.m4
-@@ -722,13 +722,6 @@ AC_DEFUN([CARES_SET_COMPILER_DEBUG_OPTS]
-       tmp_options="$flags_dbg_off"
-     fi
-     #
--    if test "$flags_prefer_cppflags" = "yes"; then
--      CPPFLAGS="$tmp_CPPFLAGS $tmp_options"
--      CFLAGS="$tmp_CFLAGS"
--    else
--      CPPFLAGS="$tmp_CPPFLAGS"
--      CFLAGS="$tmp_CFLAGS $tmp_options"
--    fi
-     squeeze CPPFLAGS
-     squeeze CFLAGS
-     CARES_COMPILER_WORKS_IFELSE([
-@@ -803,13 +796,6 @@ AC_DEFUN([CARES_SET_COMPILER_OPTIMIZE_OP
-         AC_MSG_CHECKING([if compiler accepts optimizer disabling options])
-         tmp_options="$flags_opt_off"
-       fi
--      if test "$flags_prefer_cppflags" = "yes"; then
--        CPPFLAGS="$tmp_CPPFLAGS $tmp_options"
--        CFLAGS="$tmp_CFLAGS"
--      else
--        CPPFLAGS="$tmp_CPPFLAGS"
--        CFLAGS="$tmp_CFLAGS $tmp_options"
--      fi
-       squeeze CPPFLAGS
-       squeeze CFLAGS
-       CARES_COMPILER_WORKS_IFELSE([
diff -r 42cf17097453 -r f7d5d174849a net/libcares/patches/patch-m4_xc-cc-check.m4
--- a/net/libcares/patches/patch-m4_xc-cc-check.m4      Fri May 31 07:21:53 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-$NetBSD: patch-m4_xc-cc-check.m4,v 1.1 2017/07/15 17:15:17 wiz Exp $
-
-Do not prescribe what should be in CFLAGS/CPPFLAGS.
-
---- m4/xc-cc-check.m4.orig     2016-01-23 22:41:55.000000000 +0000
-+++ m4/xc-cc-check.m4
-@@ -59,7 +59,6 @@ dnl Private macro.
- 
- AC_DEFUN([_XC_PROG_CC], [
-   AC_REQUIRE([_XC_PROG_CC_PREAMBLE])dnl
--  AC_REQUIRE([XC_CHECK_USER_FLAGS])dnl
-   AC_REQUIRE([AC_PROG_INSTALL])dnl
-   AC_REQUIRE([AC_PROG_CC])dnl
-   AC_REQUIRE([AM_PROG_CC_C_O])dnl
Prev by Date: [pkgsrc/trunk]: pkgsrc/multimedia/mate-media mate-media: amend patch-configur...
Next by Date: [pkgsrc/trunk]: pkgsrc/net/libcares libcares: comment patch
Previous by Thread: [pkgsrc/trunk]: pkgsrc/multimedia/mate-media mate-media: amend patch-configur...
Next by Thread: [pkgsrc/trunk]: pkgsrc/net/libcares libcares: comment patch
Indexes:
Home | Main Index | Thread Index | Old Index