diff options
| author | amdmi3 <amdmi3@FreeBSD.org> | 2014-09-18 23:22:37 +0800 |
|---|---|---|
| committer | amdmi3 <amdmi3@FreeBSD.org> | 2014-09-18 23:22:37 +0800 |
| commit | d3f0354723b45af586d0e02f4a0cb56a87472b95 (patch) | |
| tree | c682ff6544e887fd7dd4c2c450177b26373013e2 /www | |
| parent | a3296355b390842d7fe41cff0f767e868621b9b9 (diff) | |
| download | freebsd-ports-gnome-d3f0354723b45af586d0e02f4a0cb56a87472b95.tar.gz freebsd-ports-gnome-d3f0354723b45af586d0e02f4a0cb56a87472b95.tar.zst freebsd-ports-gnome-d3f0354723b45af586d0e02f4a0cb56a87472b95.zip | |
- Unbreak ECAP option
Diffstat (limited to 'www')
| -rw-r--r-- | www/squid/Makefile | 13 | ||||
| -rw-r--r-- | www/squid33/Makefile | 13 |
2 files changed, 2 insertions, 24 deletions
diff --git a/www/squid/Makefile b/www/squid/Makefile index c4cf1107003a..fe415818fa3e 100644 --- a/www/squid/Makefile +++ b/www/squid/Makefile @@ -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= diff --git a/www/squid33/Makefile b/www/squid33/Makefile index b72f1c22ffb2..2192cc78b9ce 100644 --- a/www/squid33/Makefile +++ b/www/squid33/Makefile @@ -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= |