From 6cc0f32b5a790b03d3a8e0bf28b319c1e0889a97 Mon Sep 17 00:00:00 2001
From: jperkin <jperkin>
Date: Fri, 13 Dec 2013 10:42:57 +0000
Subject: Don't play games with CFLAGS/CPPFLAGS and munging -isystem, fixes
 SunOS.

---
 net/libcares/distinfo                |  3 ++-
 net/libcares/patches/patch-configure | 37 ++++++++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 net/libcares/patches/patch-configure

(limited to 'net/libcares')

diff --git a/net/libcares/distinfo b/net/libcares/distinfo
index 95e0ebf01b4..416fc5b337c 100644
--- a/net/libcares/distinfo
+++ b/net/libcares/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.8 2013/07/14 14:51:49 rodent Exp $
+$NetBSD: distinfo,v 1.9 2013/12/13 10:42:57 jperkin Exp $
 
 SHA1 (c-ares-1.10.0.tar.gz) = e44e6575d5af99cb3a38461486e1ee8b49810eb5
 RMD160 (c-ares-1.10.0.tar.gz) = aee918002d3fc1b2112c7d95aacf1c00059f4677
 Size (c-ares-1.10.0.tar.gz) = 809073 bytes
+SHA1 (patch-configure) = 1726722a94960fabc7fd69c8e7f9ca40a1492713
diff --git a/net/libcares/patches/patch-configure b/net/libcares/patches/patch-configure
new file mode 100644
index 00000000000..22f00bf4e4c
--- /dev/null
+++ b/net/libcares/patches/patch-configure
@@ -0,0 +1,37 @@
+$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
-- 
cgit v1.2.3