Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 18 Sep 2015 22:11:12 +0000 (UTC)
From:      Mathieu Arnold <mat@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r397300 - head/Mk/Uses
Message-ID:  <201509182211.t8IMBCrk003260@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mat
Date: Fri Sep 18 22:11:11 2015
New Revision: 397300
URL: https://svnweb.freebsd.org/changeset/ports/397300

Log:
  Fixup gssapi.mk, no need to support more releases than needed, and use
  the correct way to insert targets in the pipe.
  
  Sponsored by:	Absolight

Modified:
  head/Mk/Uses/gssapi.mk

Modified: head/Mk/Uses/gssapi.mk
==============================================================================
--- head/Mk/Uses/gssapi.mk	Fri Sep 18 21:48:57 2015	(r397299)
+++ head/Mk/Uses/gssapi.mk	Fri Sep 18 22:11:11 2015	(r397300)
@@ -94,7 +94,7 @@ _HEADERS+=	gssapi/gssapi.h gssapi/gssapi
 GSSAPICPPFLAGS=	-I"${GSSAPIINCDIR}"
 GSSAPILIBS=	-lkrb5 -lgssapi -lgssapi_krb5
 GSSAPILDFLAGS=	-L"${GSSAPILIBDIR}"
-.if empty(OSREL:N9.*:N10.0])
+.if empty(OSREL:N9.3)
 _FIXUP_KRB5CONFIG=	yes
 .endif
 .elif ${_local} == "heimdal"
@@ -143,10 +143,10 @@ IGNORE=	USES=gssapi - invalid args: [${_
 # libgssapi_krb5 for some interfaces of GSS-API is missing.
 .if defined(_FIXUP_KRB5CONFIG)
 KRB5CONFIG=${WRKDIR}/krb5-config
-krb5config-fix::
+_USES_configure+=	290:krb5config-fix
+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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509182211.t8IMBCrk003260>