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