Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 14 Oct 2015 03:46:52 +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: r399238 - head/security/pam_krb5
Message-ID:  <201510140346.t9E3kqE6088229@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: cy
Date: Wed Oct 14 03:46:52 2015
New Revision: 399238
URL: https://svnweb.freebsd.org/changeset/ports/399238

Log:
  Replace HEIMDAL option with HEIMDAL_PORTS and HEIMDAL_BASE.

Modified:
  head/security/pam_krb5/Makefile

Modified: head/security/pam_krb5/Makefile
==============================================================================
--- head/security/pam_krb5/Makefile	Wed Oct 14 03:44:52 2015	(r399237)
+++ head/security/pam_krb5/Makefile	Wed Oct 14 03:46:52 2015	(r399238)
@@ -16,31 +16,42 @@ CONFLICTS=		pam_krb5-rh-2.*
 GNU_CONFIGURE=		yes
 INSTALL_TARGET=		install-strip
 USES=			gmake libtool perl5
+USE_PERL5=		build
 
 OPTIONS_SINGLE=		LINK
-OPTIONS_SINGLE_LINK=	MIT HEIMDAL
+OPTIONS_SINGLE_LINK=	MIT HEIMDAL_BASE HEIMDAL_PORT
 OPTIONS_DEFAULT=	MIT
 MIT_DESC=		Link against MIT Kerberos
-HEIMDAL_DESC=		Link against Heimdal Kerberos
+HEIMDAL_PORT_DESC=	Link against Heimdal in ports Kerberos
+HEIMDAL_BASE_DESC=	Link against Heimdal in base Kerberos
 
 .include <bsd.port.pre.mk>
 
-.if ${PORT_OPTIONS:MHEIMDAL}
+.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}"
+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=			you must define KRB5_IMPL to be "mit" or "heimdal"
+IGNORE=			 KRB5_IMPL option must be set
 .endif
 
 MANDIR=			${STAGEDIR}${MANPREFIX}/man
-KRB5_DIR?=		${LOCALBASE}
-CONFIGURE_ARGS=		--with-krb5="${KRB5_DIR}"
 
 post-install:
 	cd ${WRKSRC} && ${MAKE_CMD} install-man DESTDIR=${STAGEDIR}



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