svn commit: r405267 - head/www/squid/files

[Jason Unovitch]

Author: junovitch
Date: Tue Jan  5 01:52:08 2016
New Revision: 405267
URL: https://svnweb.freebsd.org/changeset/ports/405267

Log:
  www/squid: Heimdal option build fixes
  
  - Fix squid build with Heimdal from ports.
  - Additionally fix squid build with base Heimdal when Heimdal from ports
    is installed.
  
  PR:		205461
  Reported by:	dewayne at heuristicsystems.com.au
  Submitted by:	Pavel Timofeev <timp87 at gmail.com> (maintainer)
  MFH:		2016Q1 (build fix blanket)

Modified:
  head/www/squid/files/patch-configure

Modified: head/www/squid/files/patch-configure
==============================================================================
--- head/www/squid/files/patch-configure	Mon Jan  4 20:42:46 2016	(r405266)
+++ head/www/squid/files/patch-configure	Tue Jan  5 01:52:08 2016	(r405267)
@@ -1,5 +1,15 @@
 --- configure.orig	2015-11-01 10:46:19 UTC
 +++ configure
+@@ -27107,9 +27107,6 @@
+     if test "x$ac_cv_path_krb5_config" != "xno" ; then
+       krb5confpath="`dirname $ac_cv_path_krb5_config`"
+       ac_heimdal="`$ac_cv_path_krb5_config --version 2>/dev/null | grep -c -i heimdal`"
+-      if test "x$with_heimdal_krb5" = "xyes"; then
+-        as_fn_error $? "Could not find pkg-config or krb5-config for Heimdal Kerberos" "$LINENO" 5
+-      fi
+     else
+       if test "x$with_heimdal_krb5" = "xyes"; then
+         as_fn_error $? "Could not find krb5-config in path" "$LINENO" 5
 @@ -32038,7 +32040,7 @@ done
  ##