From owner-svn-ports-head@FreeBSD.ORG  Tue Nov 26 14:57:46 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
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 158F613B;
 Tue, 26 Nov 2013 14:57:46 +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 0500D244A;
 Tue, 26 Nov 2013 14:57: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 rAQEvjYO010242;
 Tue, 26 Nov 2013 14:57:45 GMT (envelope-from mat@svn.freebsd.org)
Received: (from mat@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAQEvjrv010240;
 Tue, 26 Nov 2013 14:57:45 GMT (envelope-from mat@svn.freebsd.org)
Message-Id: <201311261457.rAQEvjrv010240@svn.freebsd.org>
From: Mathieu Arnold <mat@FreeBSD.org>
Date: Tue, 26 Nov 2013 14:57:45 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r334940 - in head/www: squid32 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.16
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 26 Nov 2013 14:57:46 -0000

Author: mat
Date: Tue Nov 26 14:57:45 2013
New Revision: 334940
URL: http://svnweb.freebsd.org/changeset/ports/334940

Log:
  Fix build with ECAP.
  
  USES can't be fiddled with after including bsd.port.pre.mk.
  
  maintainer timeout
  
  PR:		ports/183894
  Submitted by:	mat

Modified:
  head/www/squid32/Makefile
  head/www/squid33/Makefile

Modified: head/www/squid32/Makefile
==============================================================================
--- head/www/squid32/Makefile	Tue Nov 26 14:57:00 2013	(r334939)
+++ head/www/squid32/Makefile	Tue Nov 26 14:57:45 2013	(r334940)
@@ -101,6 +101,8 @@ WCCP_DESC=	Enable Web Cache Coordination
 OPTIONS_DEFAULT=	AUTH_KERB AUTH_NIS FS_AUFS HTCP IDENT KQUEUE \
 			SNMP WCCP WCCPV2
 
+ECAP_USES=		pkgconfig:build
+
 etc_files=	squid/cachemgr.conf.default \
 		squid/errorpage.css.default \
 		squid/mib.txt \
@@ -423,7 +425,6 @@ CONFIGURE_ARGS+=	--enable-ecap
 LIB_DEPENDS+=	ecap:${PORTSDIR}/www/libecap
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-USES+=		pkgconfig:build
 .else
 CONFIGURE_ARGS+=	--disable-ecap
 .endif

Modified: head/www/squid33/Makefile
==============================================================================
--- head/www/squid33/Makefile	Tue Nov 26 14:57:00 2013	(r334939)
+++ head/www/squid33/Makefile	Tue Nov 26 14:57:45 2013	(r334940)
@@ -107,6 +107,8 @@ WCCP_DESC=	Enable Web Cache Coordination
 OPTIONS_DEFAULT=	AUTH_KERB AUTH_NIS FS_AUFS HTCP IDENT KQUEUE \
 			SNMP WCCP WCCPV2
 
+ECAP_USES=		pkgconfig:build
+
 etc_files=	squid/cachemgr.conf.default \
 		squid/errorpage.css.default \
 		squid/mib.txt \
@@ -433,7 +435,6 @@ CONFIGURE_ARGS+=	--enable-ecap
 LIB_DEPENDS+=	ecap:${PORTSDIR}/www/libecap
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-USES+=		pkgconfig:build
 .else
 CONFIGURE_ARGS+=	--disable-ecap
 .endif