From owner-svn-ports-head@FreeBSD.ORG Thu Sep 18 15:22:38 2014 Return-Path: Delivered-To: svn-ports-head@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 ESMTPS id 8E380C9D; Thu, 18 Sep 2014 15:22:38 +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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5FB5C781; Thu, 18 Sep 2014 15:22:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8IFMcBd097648; Thu, 18 Sep 2014 15:22:38 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8IFMc1i097646; Thu, 18 Sep 2014 15:22:38 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201409181522.s8IFMc1i097646@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Thu, 18 Sep 2014 15:22:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r368485 - in head/www: squid squid33 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.18-1 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: Thu, 18 Sep 2014 15:22:38 -0000 Author: amdmi3 Date: Thu Sep 18 15:22:37 2014 New Revision: 368485 URL: http://svnweb.freebsd.org/changeset/ports/368485 QAT: https://qat.redports.org/buildarchive/r368485/ Log: - Unbreak ECAP option Modified: head/www/squid/Makefile head/www/squid33/Makefile Modified: head/www/squid/Makefile ============================================================================== --- head/www/squid/Makefile Thu Sep 18 15:17:39 2014 (r368484) +++ head/www/squid/Makefile Thu Sep 18 15:22:37 2014 (r368485) @@ -115,7 +115,7 @@ CACHE_DIGESTS_DESC= Use cache digests DEBUG_DESC= Build with extended debugging support DELAY_POOLS_DESC= Delay pools (bandwidth limiting) DNS_HELPER_DESC= Use external dnsserver processes for DNS -ECAP_DESC= Loadable content adaptation modules (broken on FreeBSD 10+) +ECAP_DESC= Loadable content adaptation modules ESI_DESC= ESI support FOLLOW_XFF_DESC= Support for the X-Following-For header FS_AUFS_DESC= AUFS (async-io) support @@ -284,17 +284,6 @@ CFLAGS+= -I${OPENSSLINC} LDFLAGS+= -L${OPENSSLLIB} .endif -.if ${PORT_OPTIONS:MECAP} -.if ${OPSYS} == FreeBSD && ${OSVERSION} > 1000000 -# re-evaluate on FreeBSD 10+ with the next release -# http://www.squid-cache.org/mail-archive/squid-users/201402/0324.html -BROKEN= ECAP and clang are not friendly -.endif -LIB_DEPENDS+= libecap.so:${PORTSDIR}/www/libecap -CFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -.endif - .if ${PORT_OPTIONS:MSTACKTRACES} CFLAGS+= -g STRIP= Modified: head/www/squid33/Makefile ============================================================================== --- head/www/squid33/Makefile Thu Sep 18 15:17:39 2014 (r368484) +++ head/www/squid33/Makefile Thu Sep 18 15:22:37 2014 (r368485) @@ -124,7 +124,7 @@ CACHE_DIGESTS_DESC= Use cache digests DEBUG_DESC= Build with extended debugging support DELAY_POOLS_DESC= Delay pools (bandwidth limiting) DNS_HELPER_DESC= Use external dnsserver processes for DNS -ECAP_DESC= Loadable content adaptation modules (broken on FreeBSD 10+) +ECAP_DESC= Loadable content adaptation modules ESI_DESC= ESI support FOLLOW_XFF_DESC= Support for the X-Following-For header FS_AUFS_DESC= AUFS (async-io) support @@ -288,17 +288,6 @@ CFLAGS+= -I${OPENSSLINC} LDFLAGS+= -L${OPENSSLLIB} .endif -.if ${PORT_OPTIONS:MECAP} -.if ${OPSYS} == FreeBSD && ${OSVERSION} > 1000000 -# re-evaluate on FreeBSD 10+ with the next release -# http://www.squid-cache.org/mail-archive/squid-users/201402/0324.html -BROKEN= ECAP and clang are not friendly -.endif -LIB_DEPENDS+= libecap.so:${PORTSDIR}/www/libecap -CFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -.endif - .if ${PORT_OPTIONS:MSTACKTRACES} CFLAGS+= -g STRIP=