From owner-svn-ports-branches@freebsd.org  Tue Jan  5 01:52:54 2016
Return-Path: <owner-svn-ports-branches@freebsd.org>
Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 38610A61582;
 Tue,  5 Jan 2016 01:52:54 +0000 (UTC)
 (envelope-from junovitch@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 0B4C71C83;
 Tue,  5 Jan 2016 01:52:53 +0000 (UTC)
 (envelope-from junovitch@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u051qrkU028792;
 Tue, 5 Jan 2016 01:52:53 GMT (envelope-from junovitch@FreeBSD.org)
Received: (from junovitch@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u051qr0C028791;
 Tue, 5 Jan 2016 01:52:53 GMT (envelope-from junovitch@FreeBSD.org)
Message-Id: <201601050152.u051qr0C028791@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: junovitch set sender to
 junovitch@FreeBSD.org using -f
From: Jason Unovitch <junovitch@FreeBSD.org>
Date: Tue, 5 Jan 2016 01:52:53 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r405268 - branches/2016Q1/www/squid/files
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-branches@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for all the branches of the ports tree
 <svn-ports-branches.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-branches/>
List-Post: <mailto:svn-ports-branches@freebsd.org>
List-Help: <mailto:svn-ports-branches-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 05 Jan 2016 01:52:54 -0000

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

Log:
  MFH: r405267
  
  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@heuristicsystems.com.au
  Submitted by:	Pavel Timofeev <timp87@gmail.com> (maintainer)
  Approved by:	ports-secteam blanket

Modified:
  branches/2016Q1/www/squid/files/patch-configure
Directory Properties:
  branches/2016Q1/   (props changed)

Modified: branches/2016Q1/www/squid/files/patch-configure
==============================================================================
--- branches/2016Q1/www/squid/files/patch-configure	Tue Jan  5 01:52:08 2016	(r405267)
+++ branches/2016Q1/www/squid/files/patch-configure	Tue Jan  5 01:52:52 2016	(r405268)
@@ -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
  ##