CVS commit: pkgsrc/net/libcares

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sat Jul 15 17:15:17 UTC 2017

Modified Files:
        pkgsrc/net/libcares: Makefile distinfo
Added Files:
        pkgsrc/net/libcares/patches: patch-configure.ac patch-m4_xc-cc-check.m4
Removed Files:
        pkgsrc/net/libcares/patches: patch-configure

Log Message:
Do not prescribe what should be in CFLAGS/CPPFLAGS.

While here, remove patch that does nothing since autoreconf is used.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 pkgsrc/net/libcares/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/net/libcares/distinfo
cvs rdiff -u -r1.1 -r0 pkgsrc/net/libcares/patches/patch-configure
cvs rdiff -u -r0 -r1.1 pkgsrc/net/libcares/patches/patch-configure.ac \
    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.21 pkgsrc/net/libcares/Makefile:1.22
--- pkgsrc/net/libcares/Makefile:1.21   Sat Jul  1 12:06:47 2017
+++ pkgsrc/net/libcares/Makefile        Sat Jul 15 17:15:16 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2017/07/01 12:06:47 jperkin Exp $
+# $NetBSD: Makefile,v 1.22 2017/07/15 17:15:16 wiz Exp $
 
 DISTNAME=      c-ares-1.13.0
 PKGNAME=       ${DISTNAME:S/c-/libc/1}
@@ -17,6 +17,7 @@ USE_TOOLS+=   automake
 PKGCONFIG_OVERRIDE+=   libcares.pc.in
 
 pre-configure:
+       ${RM} -f ${WRKSRC}/m4/xc-val-flgs.m4
        cd ${WRKSRC} && autoreconf -fiv
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/libcares/distinfo
diff -u pkgsrc/net/libcares/distinfo:1.13 pkgsrc/net/libcares/distinfo:1.14
--- pkgsrc/net/libcares/distinfo:1.13   Tue Jun 20 07:48:50 2017
+++ pkgsrc/net/libcares/distinfo        Sat Jul 15 17:15:16 2017
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.13 2017/06/20 07:48:50 wiz Exp $
+$NetBSD: distinfo,v 1.14 2017/07/15 17:15:16 wiz Exp $
 
 SHA1 (c-ares-1.13.0.tar.gz) = dde50284cc3d505fb2463ff6276e61d5531b1d68
 RMD160 (c-ares-1.13.0.tar.gz) = 97f312aa01d41f381c97ad30a07fbbfdf043f9ea
 SHA512 (c-ares-1.13.0.tar.gz) = 4a7942e754673f5b8d55a7471e31b0f390e8324b14c12077580c956147fad4d165c7fe8a3190199b1add95c710ceeb1a7957706d4f0d6299d39c5dddc719bd9d
 Size (c-ares-1.13.0.tar.gz) = 1446797 bytes
 SHA1 (patch-Makefile.am) = aef2a0e1975aadab33e647752fd44e30fbfb568a
-SHA1 (patch-configure) = 1726722a94960fabc7fd69c8e7f9ca40a1492713
+SHA1 (patch-configure.ac) = 0327491be4565b5121811d42288bd1d79b7c1241
+SHA1 (patch-m4_xc-cc-check.m4) = b979d60f1ecb5008b145ade55281c6e2a59be613

Added files:

Index: pkgsrc/net/libcares/patches/patch-configure.ac
diff -u /dev/null pkgsrc/net/libcares/patches/patch-configure.ac:1.1
--- /dev/null   Sat Jul 15 17:15:17 2017
+++ pkgsrc/net/libcares/patches/patch-configure.ac      Sat Jul 15 17:15:17 2017
@@ -0,0 +1,15 @@
+$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,
Index: pkgsrc/net/libcares/patches/patch-m4_xc-cc-check.m4
diff -u /dev/null pkgsrc/net/libcares/patches/patch-m4_xc-cc-check.m4:1.1
--- /dev/null   Sat Jul 15 17:15:17 2017
+++ pkgsrc/net/libcares/patches/patch-m4_xc-cc-check.m4 Sat Jul 15 17:15:17 2017
@@ -0,0 +1,14 @@
+$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