Do not prescribe what should be in CFLAGS/CPPFLAGS.

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

5 files changed, 34 insertions, 40 deletions

diff --git a/net/libcares/Makefile b/net/libcares/Makefile
index 7bcdeb458c6..a00a48cdcce 100644
--- a/net/libcares/Makefile
+++ b/net/libcares/Makefile
@@ -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"
diff --git a/net/libcares/distinfo b/net/libcares/distinfo
index 4463d7b8861..1827527cb2f 100644
--- a/net/libcares/distinfo
+++ b/net/libcares/distinfo
@@ -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
diff --git a/net/libcares/patches/patch-configure b/net/libcares/patches/patch-configure
deleted file mode 100644
index 22f00bf4e4c..00000000000
--- a/net/libcares/patches/patch-configure
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: patch-configure,v 1.1 2013/12/13 10:42:57 jperkin Exp $
-
-Disable CFLAGS and CPPFLAGS munging.
-
---- configure.orig	2013-05-12 13:39:47.000000000 +0000
-+++ configure
-@@ -3503,7 +3503,7 @@ $as_echo "$as_me: $xc_bad_var_msg librar
-      test $xc_bad_var_cflags = yes ||
-      test $xc_bad_var_ldflags = yes ||
-      test $xc_bad_var_cppflags = yes; then
--     as_fn_error $? "Can not continue. Fix errors mentioned immediately above this line." "$LINENO" 5
-+     : as_fn_error $? "Can not continue. Fix errors mentioned immediately above this line." "$LINENO" 5
-   fi
- 
- # Find a good install program.  We prefer a C program (faster),
-@@ -15525,8 +15525,8 @@ squeeze() {
-       esac
-     done
-     if test "$tmp_has_include" = "yes"; then
--      tmp_chg_FLAGS=`echo "$tmp_chg_FLAGS" | "$SED" 's/^-I/ -isystem /g'`
--      tmp_chg_FLAGS=`echo "$tmp_chg_FLAGS" | "$SED" 's/ -I/ -isystem /g'`
-+      #tmp_chg_FLAGS=`echo "$tmp_chg_FLAGS" | "$SED" 's/^-I/ -isystem /g'`
-+      #tmp_chg_FLAGS=`echo "$tmp_chg_FLAGS" | "$SED" 's/ -I/ -isystem /g'`
-       CFLAGS="$tmp_chg_FLAGS"
-       squeeze CFLAGS
-     fi
-@@ -15540,8 +15540,8 @@ squeeze() {
-       esac
-     done
-     if test "$tmp_has_include" = "yes"; then
--      tmp_chg_FLAGS=`echo "$tmp_chg_FLAGS" | "$SED" 's/^-I/ -isystem /g'`
--      tmp_chg_FLAGS=`echo "$tmp_chg_FLAGS" | "$SED" 's/ -I/ -isystem /g'`
-+      #tmp_chg_FLAGS=`echo "$tmp_chg_FLAGS" | "$SED" 's/^-I/ -isystem /g'`
-+      #tmp_chg_FLAGS=`echo "$tmp_chg_FLAGS" | "$SED" 's/ -I/ -isystem /g'`
-       CPPFLAGS="$tmp_chg_FLAGS"
-       squeeze CPPFLAGS
-     fi
diff --git a/net/libcares/patches/patch-configure.ac b/net/libcares/patches/patch-configure.ac
new file mode 100644
index 00000000000..9489baaa58b
--- /dev/null
+++ b/net/libcares/patches/patch-configure.ac
@@ -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,
diff --git a/net/libcares/patches/patch-m4_xc-cc-check.m4 b/net/libcares/patches/patch-m4_xc-cc-check.m4
new file mode 100644
index 00000000000..f482f9e2f1f
--- /dev/null
+++ b/net/libcares/patches/patch-m4_xc-cc-check.m4
@@ -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