From owner-svn-ports-head@freebsd.org  Fri Sep 18 21:02:22 2015
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@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 1A99D9CFDD4;
 Fri, 18 Sep 2015 21:02:22 +0000 (UTC) (envelope-from hrs@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::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 0B95E1C9C;
 Fri, 18 Sep 2015 21:02:22 +0000 (UTC) (envelope-from hrs@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8IL2LCK074040;
 Fri, 18 Sep 2015 21:02:21 GMT (envelope-from hrs@FreeBSD.org)
Received: (from hrs@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8IL2LHq074039;
 Fri, 18 Sep 2015 21:02:21 GMT (envelope-from hrs@FreeBSD.org)
Message-Id: <201509182102.t8IL2LHq074039@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: hrs set sender to hrs@FreeBSD.org
 using -f
From: Hiroki Sato <hrs@FreeBSD.org>
Date: Fri, 18 Sep 2015 21:02:21 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r397294 - head/Mk/Uses
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 18 Sep 2015 21:02:22 -0000

Author: hrs
Date: Fri Sep 18 21:02:21 2015
New Revision: 397294
URL: https://svnweb.freebsd.org/changeset/ports/397294

Log:
  Add a fixup for broken krb5-config script included in 9.X
  and some 10.X releases.

Modified:
  head/Mk/Uses/gssapi.mk

Modified: head/Mk/Uses/gssapi.mk
==============================================================================
--- head/Mk/Uses/gssapi.mk	Fri Sep 18 20:40:04 2015	(r397293)
+++ head/Mk/Uses/gssapi.mk	Fri Sep 18 21:02:21 2015	(r397294)
@@ -79,6 +79,7 @@ _HEIMDAL_DEPENDS=${GSSAPILIBDIR}/libgssa
 _MITKRB5_DEPENDS=${GSSAPILIBDIR}/libkrb5support.so:${PORTSDIR}/security/krb5
 _HEADERS=	sys/types.h sys/stat.h stdint.h
 
+.undef _FIXUP_KRB5CONFIG
 .if empty(gssapi_ARGS)
 gssapi_ARGS=	base
 .endif
@@ -93,6 +94,9 @@ _HEADERS+=	gssapi/gssapi.h gssapi/gssapi
 GSSAPICPPFLAGS=	-I"${GSSAPIINCDIR}"
 GSSAPILIBS=	-lkrb5 -lgssapi -lgssapi_krb5
 GSSAPILDFLAGS=	-L"${GSSAPILIBDIR}"
+.if empty(OSREL:N9.*:N10.0])
+_FIXUP_KRB5CONFIG=	yes
+.endif
 .elif ${_local} == "heimdal"
 HEIMDAL_HOME?=	${LOCALBASE}
 GSSAPIBASEDIR=	${HEIMDAL_HOME}
@@ -134,7 +138,18 @@ IGNORE=	USES=gssapi - invalid args: [${_
 .endif
 .endfor
 
+# Fix up krb5-config if broken.  This script included in 9.X prior to
+# r271474 and in 10.X prior to r271473 are broken because
+# libgssapi_krb5 for some interfaces of GSS-API is missing.
+.if defined(_FIXUP_KRB5CONFIG)
+KRB5CONFIG=${WRKDIR}/krb5-config
+krb5config-fix::
+	${SED} -e 's,\$$lib_flags -lgssapi -lheimntlm,\$$lib_flags -lgssapi -lgssapi_krb5 -lheimntlm,' < ${GSSAPIBASEDIR}/bin/krb5-config > ${KRB5CONFIG}
+	${CHMOD} a+rx ${KRB5CONFIG}
+pre-configure: krb5config-fix
+.else
 KRB5CONFIG=${GSSAPIBASEDIR}/bin/krb5-config
+.endif
 
 # Fix up -Wl,-rpath in LDFLAGS
 .if defined(_RPATH) && !empty(_RPATH)