From owner-svn-ports-all@FreeBSD.ORG Mon Nov 11 20:29:46 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id D0DF62B5; Mon, 11 Nov 2013 20:29:46 +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 AEE5E248B; Mon, 11 Nov 2013 20:29:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rABKTkQB003427; Mon, 11 Nov 2013 20:29:46 GMT (envelope-from flo@svn.freebsd.org) Received: (from flo@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rABKTjM1003421; Mon, 11 Nov 2013 20:29:45 GMT (envelope-from flo@svn.freebsd.org) Message-Id: <201311112029.rABKTjM1003421@svn.freebsd.org> From: Florian Smeets Date: Mon, 11 Nov 2013 20:29:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r333532 - in head/www/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-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:29:47 -0000 Author: flo Date: Mon Nov 11 20:29:45 2013 New Revision: 333532 URL: http://svnweb.freebsd.org/changeset/ports/333532 Log: - fix build on FreeBSD >= 10.0 [1] - update to 3.3.10 PR: ports/183352 Submitted by: dim [1] Approved by: maintainer timeout Added: head/www/squid33/files/patch-compat__stdio.h (contents, props changed) head/www/squid33/files/patch-include__Array.h (contents, props changed) head/www/squid33/files/patch-include__autoconf.h.in (contents, props changed) Modified: head/www/squid33/Makefile head/www/squid33/distinfo head/www/squid33/files/patch-configure Modified: head/www/squid33/Makefile ============================================================================== --- head/www/squid33/Makefile Mon Nov 11 20:24:35 2013 (r333531) +++ head/www/squid33/Makefile Mon Nov 11 20:29:45 2013 (r333532) @@ -41,7 +41,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING LATEST_LINK= squid33 -SQUID_STABLE_VER= 9 +SQUID_STABLE_VER= 10 CONFLICTS_INSTALL= squid-2.[0-9].* squid-3.[!3].* cacheboy-[0-9]* lusca-head-[0-9]* USES= perl5 Modified: head/www/squid33/distinfo ============================================================================== --- head/www/squid33/distinfo Mon Nov 11 20:24:35 2013 (r333531) +++ head/www/squid33/distinfo Mon Nov 11 20:29:45 2013 (r333532) @@ -1,2 +1,2 @@ -SHA256 (squid3.3/squid-3.3.9.tar.bz2) = 2bb048725745de755f35a84133e25c7db0d56f4cc7002962e84b80091866eb45 -SIZE (squid3.3/squid-3.3.9.tar.bz2) = 2988736 +SHA256 (squid3.3/squid-3.3.10.tar.bz2) = 61743782e3b0c7c5bdf2e2457ecc1a5d3e7cc6b56a3d55f2106afe777ce2e5e9 +SIZE (squid3.3/squid-3.3.10.tar.bz2) = 2988601 Added: head/www/squid33/files/patch-compat__stdio.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/squid33/files/patch-compat__stdio.h Mon Nov 11 20:29:45 2013 (r333532) @@ -0,0 +1,11 @@ +--- compat/stdio.h.orig 2013-05-20 13:48:55.000000000 +0200 ++++ compat/stdio.h 2013-07-15 22:34:49.000000000 +0200 +@@ -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/squid33/files/patch-configure ============================================================================== --- head/www/squid33/files/patch-configure Mon Nov 11 20:24:35 2013 (r333531) +++ head/www/squid33/files/patch-configure Mon Nov 11 20:29:45 2013 (r333532) @@ -1,6 +1,6 @@ --- configure.orig 2013-03-12 11:18:22.000000000 +0100 +++ configure 2013-04-09 11:43:01.000000000 +0200 -@@ -22437,7 +22437,7 @@ +@@ -22798,7 +22798,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" -@@ -22634,7 +22634,7 @@ +@@ -22995,7 +22995,7 @@ ac_com_error_message=no @@ -18,7 +18,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include -@@ -22646,7 +22646,7 @@ +@@ -23007,7 +23007,7 @@ fi rm -f conftest* @@ -27,7 +27,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include -@@ -22707,7 +22707,7 @@ +@@ -23068,7 +23068,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 : -@@ -22750,7 +22750,7 @@ +@@ -23111,7 +23111,7 @@ fi @@ -45,3 +45,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 : +@@ -24704,6 +24704,7 @@ + cassert \ + crypt.h \ + cstdarg \ ++ cstdio \ + cstdlib \ + cstring \ + list \ Added: head/www/squid33/files/patch-include__Array.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/squid33/files/patch-include__Array.h Mon Nov 11 20:29:45 2013 (r333532) @@ -0,0 +1,33 @@ +--- include/Array.h.orig 2013-05-20 13:48:55.000000000 +0200 ++++ include/Array.h 2013-07-15 23:00:06.000000000 +0200 +@@ -42,12 +42,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 &); +@@ -79,8 +86,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/squid33/files/patch-include__autoconf.h.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/squid33/files/patch-include__autoconf.h.in Mon Nov 11 20:29:45 2013 (r333532) @@ -0,0 +1,12 @@ +--- include/autoconf.h.in.orig 2013-05-20 13:49:34.000000000 +0200 ++++ include/autoconf.h.in 2013-07-15 22:23:33.000000000 +0200 +@@ -158,6 +158,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 +