Date: Tue, 26 Nov 2013 14:57:45 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r334940 - in head/www: squid32 squid33 Message-ID: <201311261457.rAQEvjrv010240@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311261457.rAQEvjrv010240>