From owner-svn-ports-all@FreeBSD.ORG Mon Nov 11 20:24:37 2013 Return-Path: Delivered-To: svn-ports-all@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 ESMTP id 19F63FD2; Mon, 11 Nov 2013 20:24:37 +0000 (UTC) (envelope-from flo@FreeBSD.org) 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 0645B2466; Mon, 11 Nov 2013 20:24:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rABKOaOC002651; Mon, 11 Nov 2013 20:24:36 GMT (envelope-from flo@svn.freebsd.org) Received: (from flo@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rABKOaKq002647; Mon, 11 Nov 2013 20:24:36 GMT (envelope-from flo@svn.freebsd.org) Message-Id: <201311112024.rABKOaKq002647@svn.freebsd.org> From: Florian Smeets Date: Mon, 11 Nov 2013 20:24:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r333531 - head/www/squid32/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-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Nov 2013 20:24:37 -0000 Author: flo Date: Mon Nov 11 20:24:35 2013 New Revision: 333531 URL: http://svnweb.freebsd.org/changeset/ports/333531 Log: Fix build on FreeBSD >= 10.0 PR: ports/183352 Submitted by: dim Approved by: maintainer timeout Added: head/www/squid32/files/patch-compat-stdio.h (contents, props changed) head/www/squid32/files/patch-include-Array.h (contents, props changed) head/www/squid32/files/patch-include-autoconf.h.in (contents, props changed) Modified: head/www/squid32/files/patch-configure Added: head/www/squid32/files/patch-compat-stdio.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/squid32/files/patch-compat-stdio.h Mon Nov 11 20:24:35 2013 (r333531) @@ -0,0 +1,11 @@ +--- compat/stdio.h.orig 2013-07-13 15:22:32.000000000 +0200 ++++ compat/stdio.h 2013-11-11 12:56:24.000000000 +0100 +@@ -46,7 +46,7 @@ + #endif /* __USE_FILE_OFFSET64 && !__REDIRECT */ + + // Finally import the stuff we actually use +-#if HAVE_CSTDIO ++#if defined(__cplusplus) && HAVE_CSTDIO + #include + #endif + Modified: head/www/squid32/files/patch-configure ============================================================================== --- head/www/squid32/files/patch-configure Mon Nov 11 18:51:17 2013 (r333530) +++ head/www/squid32/files/patch-configure Mon Nov 11 20:24:35 2013 (r333531) @@ -1,5 +1,14 @@ --- configure.orig 2012-10-21 18:10:03.000000000 +0200 +++ configure 2012-10-21 18:27:39.000000000 +0200 +@@ -18416,7 +18416,7 @@ + GCCVER2=`echo $GCCVER | awk '{print $1 * 100}'` + case "$host" in + i386-*-freebsd*) +- if test $GCCVER2 -lt 300 ; then ++ if test "x$GCCVER" != x -a $GCCVER2 -lt 300 ; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + as_fn_error $? "GCC $GCCVER causes a coredump on $host. @@ -22154,7 +22154,7 @@ done @@ -45,3 +54,11 @@ { $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 : +@@ -24033,6 +24033,7 @@ + cassert \ + crypt.h \ + cstdarg \ ++ cstdio \ + cstdlib \ + cstring \ + list \ Added: head/www/squid32/files/patch-include-Array.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/squid32/files/patch-include-Array.h Mon Nov 11 20:24:35 2013 (r333531) @@ -0,0 +1,33 @@ +--- include/Array.h.orig 2013-07-13 15:22:32.000000000 +0200 ++++ include/Array.h 2013-11-11 13:32:43.000000000 +0100 +@@ -44,12 +44,19 @@ + #include "compat/assert.h" + + /* iterator support */ ++#include + + template + class VectorIteratorBase + { + + public: ++ typedef typename C::value_type value_type; ++ typedef std::forward_iterator_tag iterator_category; ++ typedef typename C::pointer pointer; ++ typedef typename C::reference reference; ++ typedef typename C::difference_type difference_type; ++ + VectorIteratorBase(); + VectorIteratorBase(C &); + VectorIteratorBase(size_t, C &); +@@ -81,8 +88,10 @@ + public: + typedef E value_type; + typedef E* pointer; ++ typedef E& reference; + typedef VectorIteratorBase > iterator; + typedef VectorIteratorBase const> const_iterator; ++ typedef ptrdiff_t difference_type; + + void *operator new (size_t); + void operator delete (void *); Added: head/www/squid32/files/patch-include-autoconf.h.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/squid32/files/patch-include-autoconf.h.in Mon Nov 11 20:24:35 2013 (r333531) @@ -0,0 +1,12 @@ +--- include/autoconf.h.in.orig 2013-07-13 15:22:53.000000000 +0200 ++++ include/autoconf.h.in 2013-11-11 13:04:46.000000000 +0100 +@@ -151,6 +151,9 @@ + /* Define to 1 if you have the header file. */ + #undef HAVE_CSTDARG + ++/* Define to 1 if you have the header file. */ ++#undef HAVE_CSTDIO ++ + /* Define to 1 if you have the header file. */ + #undef HAVE_CSTDLIB +