Date: Mon, 11 Nov 2013 20:24:36 +0000 (UTC) From: Florian Smeets <flo@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r333531 - head/www/squid32/files Message-ID: <201311112024.rABKOaKq002647@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <cstdio> stuff we actually use +-#if HAVE_CSTDIO ++#if defined(__cplusplus) && HAVE_CSTDIO + #include<cstdio> + #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 <iterator> + + template <class C> + 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<Vector<E> > iterator; + typedef VectorIteratorBase<Vector<E> 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 <cstdarg> header file. */ + #undef HAVE_CSTDARG + ++/* Define to 1 if you have the <cstdio> header file. */ ++#undef HAVE_CSTDIO ++ + /* Define to 1 if you have the <cstdlib> header file. */ + #undef HAVE_CSTDLIB +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311112024.rABKOaKq002647>