diff -ruN /home/timp/squid.orig/Makefile squid/Makefile --- /home/timp/squid.orig/Makefile 2015-11-30 15:02:35.637977000 +0300 +++ squid/Makefile 2015-11-30 15:03:03.305575000 +0300 @@ -1,7 +1,7 @@ # $FreeBSD: head/www/squid/Makefile 401286 2015-11-11 17:24:31Z junovitch $ PORTNAME= squid -PORTVERSION= 3.5.11 +PORTVERSION= 3.5.12 CATEGORIES= www ipv6 MASTER_SITES= http://www.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \ http://www2.us.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \ diff -ruN /home/timp/squid.orig/distinfo squid/distinfo --- /home/timp/squid.orig/distinfo 2015-11-30 15:02:35.638902000 +0300 +++ squid/distinfo 2015-11-30 15:04:28.599837000 +0300 @@ -1,2 +1,2 @@ -SHA256 (squid3.5/squid-3.5.11.tar.xz) = c26211b8e349fd9a5fd357da33074ff6523c111024dd3a5a1f77153538aa40cf -SIZE (squid3.5/squid-3.5.11.tar.xz) = 2298436 +SHA256 (squid3.5/squid-3.5.12.tar.xz) = 8bc83f3869f7404aefb10883109e28443255cf6dde50a13904c7954619707a42 +SIZE (squid3.5/squid-3.5.12.tar.xz) = 2299644 diff -ruN /home/timp/squid.orig/files/patch-configure squid/files/patch-configure --- /home/timp/squid.orig/files/patch-configure 2015-11-30 15:02:35.659348000 +0300 +++ squid/files/patch-configure 2015-11-30 15:05:55.054163000 +0300 @@ -1,16 +1,5 @@ --- configure.orig 2015-11-01 10:46:19 UTC +++ configure -@@ -23624,7 +23624,9 @@ fi - - if test $ac_with_krb5_count -gt 1 ; then - as_fn_error $? "Please choose only one Kerberos library." "$LINENO" 5 --elif test $ac_with_krb5_count -eq 0 ; then -+# XXX: On FreeBSD we don't need to involve krb5-config. -+# This change makes GSSAPI_NONE work properly. -+elif test $ac_with_krb5_count -eq 100 ; then - # find installed libs via pkg-config or krb5-config - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gssapi-krb5 krb5\""; } >&5 @@ -32038,7 +32040,7 @@ done ##