svn commit: r368485 - in head/www: squid squid33

[Dmitry Marakasov]

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=