Bug 183894 - [PATCH] www/squid: Fixup build with ECAP.
Summary: [PATCH] www/squid: Fixup build with ECAP.
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: tmseck
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-11-12 14:20 UTC by Mathieu Arnold
Modified: 2013-11-26 15:00 UTC (History)
0 users

See Also:


Attachments
squid-3.3.10.patch (575 bytes, patch)
2013-11-12 14:20 UTC, Mathieu Arnold
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Mathieu Arnold freebsd_committer freebsd_triage 2013-11-12 14:20:00 UTC
Fixup build with ECAP.

USES can't be fiddled with after bsd.port.pre.mk.

www/squid32 has the same problem.

Generated with FreeBSD Port Tools 0.99_9 (mode: change, diff: SVN)
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2013-11-12 14:20:07 UTC
Responsible Changed
From-To: freebsd-ports-bugs->tmseck

Over to maintainer (via the GNATS Auto Assign Tool)
Comment 2 Mathieu Arnold freebsd_committer freebsd_triage 2013-11-26 14:57:14 UTC
State Changed
From-To: open->closed

Committed, thanks!
Comment 3 dfilter service freebsd_committer freebsd_triage 2013-11-26 14:57:52 UTC
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
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"