View | Details | Raw Unified | Return to bug 193737 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-6 / +4 lines)
Lines 1-8 Link Here
1
# $FreeBSD: head/www/squid/Makefile 368421 2014-09-18 06:58:47Z marino $
1
# $FreeBSD: head/www/squid/Makefile 368421 2014-09-18 06:58:47Z marino $
2
2
3
PORTNAME=	squid
3
PORTNAME=	squid
4
PORTVERSION=	3.4.7
4
PORTVERSION=	3.4.8
5
PORTREVISION=	1
6
CATEGORIES=	www ipv6
5
CATEGORIES=	www ipv6
7
MASTER_SITES=	http://www.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \
6
MASTER_SITES=	http://www.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \
8
		http://www2.us.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \
7
		http://www2.us.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \
Lines 222-229 Link Here
222
. if ${OPSYS} == DragonFly
221
. if ${OPSYS} == DragonFly
223
LIB_DEPENDS+=	libkrb5.so:${PORTSDIR}/security/krb5
222
LIB_DEPENDS+=	libkrb5.so:${PORTSDIR}/security/krb5
224
. endif
223
. endif
225
# the kerberos_ldap_group external helper depends on LDAP and SASL:
224
# the kerberos_ldap_group external helper depends on KERB, LDAP and SASL:
226
. if ${PORT_OPTIONS:MAUTH_LDAP} && ${PORT_OPTIONS:MAUTH_SASL}
225
. if ${PORT_OPTIONS:MAUTH_KERB} && ${PORT_OPTIONS:MAUTH_LDAP} && ${PORT_OPTIONS:MAUTH_SASL}
227
external_acl+=	kerberos_ldap_group
226
external_acl+=	kerberos_ldap_group
228
. endif
227
. endif
229
.else
228
.else
Lines 278-285 Link Here
278
# This makes it currently impossible to combine this macro with OPTIONS to
277
# This makes it currently impossible to combine this macro with OPTIONS to
279
# conditionally include OpenSSL support.
278
# conditionally include OpenSSL support.
280
# XXX: is this still true with OptionsNG as of 2014-09?
279
# XXX: is this still true with OptionsNG as of 2014-09?
281
#.include "${.CURDIR}/../../Mk/bsd.openssl.mk"
280
.include "${.CURDIR}/../../Mk/bsd.openssl.mk"
282
.include "${PORTSDIR}/Mk/bsd.openssl.mk"
283
CONFIGURE_ARGS+=	--with-openssl="${OPENSSLBASE}"
281
CONFIGURE_ARGS+=	--with-openssl="${OPENSSLBASE}"
284
CFLAGS+=		-I${OPENSSLINC}
282
CFLAGS+=		-I${OPENSSLINC}
285
LDFLAGS+=		-L${OPENSSLLIB}
283
LDFLAGS+=		-L${OPENSSLLIB}
(-)distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (squid3.4/squid-3.4.7.tar.xz) = cc40a3cccdcdfc11269ea969e658d99e3ef2202999b78aa01a647a6bc71759ee
1
SHA256 (squid3.4/squid-3.4.8.tar.xz) = 9146017d0e4ad48fbc1d1b6c03d544227c8e7fc7720952b588b688e65beedc18
2
SIZE (squid3.4/squid-3.4.7.tar.xz) = 2158672
2
SIZE (squid3.4/squid-3.4.8.tar.xz) = 2159904

Return to bug 193737