Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 4 Nov 2015 02:29:38 +0000 (UTC)
From:      Cy Schubert <cy@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r400730 - head/security/pam_krb5
Message-ID:  <201511040229.tA42TcN7071319@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: cy
Date: Wed Nov  4 02:29:38 2015
New Revision: 400730
URL: https://svnweb.freebsd.org/changeset/ports/400730

Log:
  Simplify and standardize port structure.
  
  Submitted by:	hrs

Modified:
  head/security/pam_krb5/Makefile

Modified: head/security/pam_krb5/Makefile
==============================================================================
--- head/security/pam_krb5/Makefile	Wed Nov  4 02:16:18 2015	(r400729)
+++ head/security/pam_krb5/Makefile	Wed Nov  4 02:29:38 2015	(r400730)
@@ -23,36 +23,16 @@ OPTIONS_SINGLE=		LINK
 OPTIONS_SINGLE_LINK=	MIT HEIMDAL_BASE HEIMDAL_PORT
 OPTIONS_DEFAULT=	MIT
 MIT_DESC=		Link against MIT Kerberos
+MIT_USES=		gssapi:mit
 HEIMDAL_PORT_DESC=	Link against Heimdal in ports Kerberos
+HEIMDAL_PORT_USES=	gssapi:heimdal
 HEIMDAL_BASE_DESC=	Link against Heimdal in base Kerberos
+HEIMDAL_BASE_USES=	gssapi:base
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MHEIMDAL_BASE}
-USES+=			gssapi:base
-.elif ${PORT_OPTIONS:MHEIMDAL_PORT}
-USES+=			gssapi:heimdal
-.if defined(HEIMDAL_HOME)
-KRB5_DIR?=		${HEIMDAL_HOME}
-.else
-KRB5_DIR?=		${LOCALBASE}
-.endif
-CONFIGURE_ARGS+=	--with-krb5="${KRB5_DIR}" \
-			--with-krb5-include="${KRB5_DIR}/include/heimdal" \
-			--with-krb5-lib="${KRB5_DIR}/lib/heimdal"
-CONFIGURE_ENV=		PATH_KRB5_CONFIG=${KRB5_DIR}/bin/krb5-config
-.elif ${PORT_OPTIONS:MMIT}
-USES+=			gssapi:mit
-LIB_DEPENDS=		libkrb5.so.3:${PORTSDIR}/security/krb5
-.if defined(KRB5_HOME)
-KRB5_DIR?=		${KRB5_HOME}
-.else
-KRB5_DIR?=		${LOCALBASE}
-.endif
-CONFIGURE_ARGS+=	--with-krb5="${KRB5_DIR}"
-.else
-IGNORE=			 KRB5_IMPL option must be set
-.endif
+CONFIGURE_ARGS+=	--with-krb5="${GSSAPIBASEDIR}" \
+			--with-krb5-include="${GSSAPIINCDIR}" \
+			--with-krb5-lib="${GSSAPILIBDIR}"
+CONFIGURE_ENV=		PATH_KRB5_CONFIG="${KRB5CONFIG}"
 
 MANDIR=			${STAGEDIR}${MANPREFIX}/man
 



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