From owner-svn-ports-head@FreeBSD.ORG Tue Feb 18 13:11:08 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2938614A; Tue, 18 Feb 2014 13:11:08 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 1528612D4; Tue, 18 Feb 2014 13:11:08 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1IDB7Ig034520; Tue, 18 Feb 2014 13:11:07 GMT (envelope-from garga@svn.freebsd.org) Received: (from garga@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1IDB7AV034518; Tue, 18 Feb 2014 13:11:07 GMT (envelope-from garga@svn.freebsd.org) Message-Id: <201402181311.s1IDB7AV034518@svn.freebsd.org> From: Renato Botelho Date: Tue, 18 Feb 2014 13:11:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r344883 - in head/www: squid32/files squid33/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Feb 2014 13:11:08 -0000 Author: garga Date: Tue Feb 18 13:11:07 2014 New Revision: 344883 URL: http://svnweb.freebsd.org/changeset/ports/344883 QAT: https://qat.redports.org/buildarchive/r344883/ Log: Fix build with TP_PF option enabled with clang Approved by: portmgr (mat) Modified: head/www/squid32/files/patch-configure head/www/squid33/files/patch-configure Modified: head/www/squid32/files/patch-configure ============================================================================== --- head/www/squid32/files/patch-configure Tue Feb 18 13:09:58 2014 (r344882) +++ head/www/squid32/files/patch-configure Tue Feb 18 13:11:07 2014 (r344883) @@ -1,5 +1,5 @@ ---- configure.orig 2012-10-21 18:10:03.000000000 +0200 -+++ configure 2012-10-21 18:27:39.000000000 +0200 +--- configure.orig 2013-07-13 10:23:28.000000000 -0300 ++++ configure 2014-02-18 01:53:05.000000000 -0300 @@ -18416,7 +18416,7 @@ GCCVER2=`echo $GCCVER | awk '{print $1 * 100}'` case "$host" in @@ -62,3 +62,19 @@ cstdlib \ cstring \ list \ +@@ -24341,12 +24342,12 @@ + #if HAVE_NETINET_IP_H + #include + #endif +-#if HAVE_NETINET_IP_COMPAT_H +-#include +-#endif + #if HAVE_NET_IF_H + #include + #endif ++#if HAVE_NETINET_IP_COMPAT_H ++#include ++#endif + #if HAVE_NETINET_IP_FIL_H + #include + #endif Modified: head/www/squid33/files/patch-configure ============================================================================== --- head/www/squid33/files/patch-configure Tue Feb 18 13:09:58 2014 (r344882) +++ head/www/squid33/files/patch-configure Tue Feb 18 13:11:07 2014 (r344883) @@ -1,6 +1,6 @@ ---- configure.orig 2013-03-12 11:18:22.000000000 +0100 -+++ configure 2013-04-09 11:43:01.000000000 +0200 -@@ -22798,7 +22798,7 @@ +--- configure.orig 2013-11-30 07:56:05.000000000 -0600 ++++ configure 2014-02-12 10:53:47.000000000 -0600 +@@ -22964,7 +22964,7 @@ done @@ -9,7 +9,7 @@ for ac_header in gssapi/gssapi_generic.h do : ac_fn_cxx_check_header_mongrel "$LINENO" "gssapi/gssapi_generic.h" "ac_cv_header_gssapi_gssapi_generic_h" "$ac_includes_default" -@@ -22995,7 +22995,7 @@ +@@ -23161,7 +23161,7 @@ ac_com_error_message=no @@ -18,7 +18,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include -@@ -23007,7 +23007,7 @@ +@@ -23173,7 +23173,7 @@ fi rm -f conftest* @@ -27,7 +27,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include -@@ -23068,7 +23068,7 @@ +@@ -23234,7 +23234,7 @@ fi @@ -36,7 +36,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for error_message in -lcom_err" >&5 $as_echo_n "checking for error_message in -lcom_err... " >&6; } if ${ac_cv_lib_com_err_error_message+:} false; then : -@@ -23111,7 +23111,7 @@ +@@ -23277,7 +23277,7 @@ fi @@ -45,7 +45,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for error_message in -lkrb5" >&5 $as_echo_n "checking for error_message in -lkrb5... " >&6; } if ${ac_cv_lib_krb5_error_message+:} false; then : -@@ -24704,6 +24704,7 @@ +@@ -24870,6 +24870,7 @@ cassert \ crypt.h \ cstdarg \ @@ -53,3 +53,19 @@ cstdlib \ cstring \ list \ +@@ -25178,12 +25179,12 @@ + #if HAVE_NETINET_IP_H + #include + #endif +-#if HAVE_NETINET_IP_COMPAT_H +-#include +-#endif + #if HAVE_NET_IF_H + #include + #endif ++#if HAVE_NETINET_IP_COMPAT_H ++#include ++#endif + #if HAVE_NETINET_IP_FIL_H + #include + #endif