From 20501b09c6656a0b4418e4629785f965eb08251c Mon Sep 17 00:00:00 2001
From: jperkin <jperkin@pkgsrc.org>
Date: Fri, 15 Dec 2017 16:11:10 +0000
Subject: libnet10: Don't overwrite user CFLAGS with bogus ones.

---
 devel/libnet10/distinfo         |  4 ++--
 devel/libnet10/patches/patch-ac | 11 ++++++++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

(limited to 'devel')

diff --git a/devel/libnet10/distinfo b/devel/libnet10/distinfo
index ee7fcc56e46..25925992c40 100644
--- a/devel/libnet10/distinfo
+++ b/devel/libnet10/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2016/08/30 13:57:31 he Exp $
+$NetBSD: distinfo,v 1.8 2017/12/15 16:11:10 jperkin Exp $
 
 SHA1 (libnet-1.0.2a.tar.gz) = 804eaf43bb90f93e505d46a9668c914a112bf136
 RMD160 (libnet-1.0.2a.tar.gz) = 43dd2edc31e56b42792727b88d81342dc26d3308
@@ -6,6 +6,6 @@ SHA512 (libnet-1.0.2a.tar.gz) = 2e9a73bd767e1f46eea92e18ddd83cc3179144c8cc5b1a22
 Size (libnet-1.0.2a.tar.gz) = 140191 bytes
 SHA1 (patch-aa) = fa71db191c421aa1b36d1107236645fdde0bc8f9
 SHA1 (patch-ab) = 56a2cb8b214529fdaacdbc6154ec2fc88edfa1c8
-SHA1 (patch-ac) = 73c68c9e6ca1dfc751cf8d5b00444fa38ae87e70
+SHA1 (patch-ac) = 7224d5fc0ac7084cda9b932d1a742c5055cde7f2
 SHA1 (patch-ad) = 237a8caae854df28790b3038c0b782b95b336004
 SHA1 (patch-ae) = d3b0e651bee5344b0d0539065058a939036a8152
diff --git a/devel/libnet10/patches/patch-ac b/devel/libnet10/patches/patch-ac
index f47b2464412..5a5908538a0 100644
--- a/devel/libnet10/patches/patch-ac
+++ b/devel/libnet10/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.2 2013/02/22 21:12:25 jperkin Exp $
+$NetBSD: patch-ac,v 1.3 2017/12/15 16:11:11 jperkin Exp $
 
 Look for dlpi before bpf, SunOS has both but this package assumes
 bpf is only on BSD systems and tries to use sysctl etc.
@@ -32,6 +32,15 @@ bpf is only on BSD systems and tries to use sysctl etc.
  ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
  ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
  cross_compiling=$ac_cv_prog_cc_cross
+@@ -958,7 +958,7 @@ fi
+ 
+ 
+ 
+-if test $ac_cv_prog_gcc = yes; then
++if test $ac_cv_prog_gcc = notyes; then
+     CCOPTS='-O2 -funroll-loops -fomit-frame-pointer -Wall'
+     CFLAGS="$CCOPTS"
+ fi
 @@ -1284,7 +1284,13 @@ fi
  echo $ac_n "checking low-level packet interface type""... $ac_c" 1>&6
  echo "configure:1286: checking low-level packet interface type" >&5
-- 
cgit v1.2.3