From owner-svn-ports-all@freebsd.org  Wed Sep  9 08:03:32 2015
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@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 534D8A00661;
 Wed,  9 Sep 2015 08:03:32 +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 2AC321FBC;
 Wed,  9 Sep 2015 08:03:32 +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 t8983Wwe066574;
 Wed, 9 Sep 2015 08:03:32 GMT (envelope-from hrs@FreeBSD.org)
Received: (from hrs@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8983Wm3066573;
 Wed, 9 Sep 2015 08:03:32 GMT (envelope-from hrs@FreeBSD.org)
Message-Id: <201509090803.t8983Wm3066573@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: Wed, 9 Sep 2015 08:03:32 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r396454 - 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-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 09 Sep 2015 08:03:32 -0000

Author: hrs
Date: Wed Sep  9 08:03:31 2015
New Revision: 396454
URL: https://svnweb.freebsd.org/changeset/ports/396454

Log:
  - Add KRB5CONFIG.
  - Use more complete library lists in GSSAPILIBS.

Modified:
  head/Mk/Uses/gssapi.mk

Modified: head/Mk/Uses/gssapi.mk
==============================================================================
--- head/Mk/Uses/gssapi.mk	Wed Sep  9 08:01:00 2015	(r396453)
+++ head/Mk/Uses/gssapi.mk	Wed Sep  9 08:03:31 2015	(r396454)
@@ -24,6 +24,7 @@
 #  GSSAPILIBDIR
 #  GSSAPILIBS
 #  GSSAPI_CONFIGURE_ARGS
+#  KRB5CONFIG
 #
 # Affected variables:
 #  PREFIX (bootstrap)
@@ -90,7 +91,9 @@ GSSAPILIBDIR=	${GSSAPIBASEDIR}/lib
 GSSAPIINCDIR=	${GSSAPIBASEDIR}/include
 _HEADERS+=	gssapi/gssapi.h gssapi/gssapi_krb5.h krb5.h
 GSSAPICPPFLAGS=	-I"${GSSAPIINCDIR}"
-GSSAPILIBS=	-lkrb5 -lgssapi -lgssapi_krb5
+GSSAPILIBS=	-lgssapi -lgssapi_krb5 -lheimntlm -lkrb5 -lhx509 \
+		-lcom_err -lcrypto -lasn1 -lwind -lheimbase -lroken \
+		-lcrypt -pthread
 GSSAPILDFLAGS=	-L"${GSSAPILIBDIR}"
 .elif ${_local} == "heimdal"
 HEIMDAL_HOME?=	${LOCALBASE}
@@ -105,7 +108,10 @@ RUN_DEPENDS+=	${_HEIMDAL_DEPENDS}
 PREFIX=		${HEIMDAL_HOME}
 .endif
 GSSAPICPPFLAGS=	-I"${GSSAPIINCDIR}"
-GSSAPILIBS=	-lkrb5 -lgssapi
+GSSAPILIBS=	-lgssapi -lheimntlm -lkrb5 -lhx509 \
+		-lcom_err -lcrypto -lasn1 -lwind -lheimbase -lroken \
+		-lcrypt -pthread
+GSSAPILDFLAGS=	-L"${GSSAPILIBDIR}"
 GSSAPILDFLAGS=	-L"${GSSAPILIBDIR}"
 _RPATH=		${GSSAPILIBDIR}
 .elif ${_local} == "mit"
@@ -120,7 +126,7 @@ RUN_DEPENDS+=	${_MITKRB5_DEPENDS}
 .else
 PREFIX=		${KRB5_HOME}
 .endif
-GSSAPILIBS=	-lkrb5 -lgssapi_krb5
+GSSAPILIBS=	-lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err
 GSSAPICPPFLAGS=	-I"${GSSAPIINCDIR}"
 GSSAPILDFLAGS=	-L"${GSSAPILIBDIR}"
 _RPATH=		${GSSAPILIBDIR}
@@ -133,6 +139,8 @@ IGNORE=	USES=gssapi - invalid args: [${_
 .endif
 .endfor
 
+KRB5CONFIG=${GSSAPIBASEDIR}/bin/krb5-config
+
 # Fix up -Wl,-rpath in LDFLAGS
 .if defined(_RPATH) && !empty(_RPATH)
 .if !empty(LDFLAGS:M-Wl,-rpath,*)
@@ -153,7 +161,8 @@ LDADD+=		${GSSAPILIBS}
 GSSAPI_CONFIGURE_ARGS=	\
 	CFLAGS="${GSSAPICPPFLAGS} ${CFLAGS}" \
 	LDFLAGS="${GSSAPILDFLAGS} ${LDFLAGS}" \
-	LIBS="${GSSAPILIBS} ${LIBS}"
+	LIBS="${GSSAPILIBS} ${LIBS}" \
+	KRB5CONFIG="${KRB5CONFIG}"
 
 debug-krb:
 	@(for I in ${_HEADERS}; do echo "#include <$$I>"; done; \
@@ -174,6 +183,7 @@ debug-krb:
 	@echo "GSSAPICPPFLAGS: ${GSSAPICPPFLAGS}"
 	@echo "GSSAPILDFLAGS: ${GSSAPILDFLAGS}"
 	@echo "GSSAPI_CONFIGURE_ARGS: ${GSSAPI_CONFIGURE_ARGS}"
+	@echo "KRB5CONFIG: ${KRB5CONFIG}"
 	@echo "CFLAGS: ${CFLAGS}"
 	@echo "LDFLAGS: ${LDFLAGS}"
 	@echo "LDADD: ${LDADD}"