Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 11 Jun 2015 00:53:03 +0000 (UTC)
From:      Ryan Steinmetz <zi@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r389154 - head/net/nss-pam-ldapd
Message-ID:  <201506110053.t5B0r3vr088785@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: zi
Date: Thu Jun 11 00:53:03 2015
New Revision: 389154
URL: https://svnweb.freebsd.org/changeset/ports/389154

Log:
  - Add ability to disable kerberos
  - Do not bump PORTREVISION: defaults not changing
  
  PR:		200689
  Submitted by:	fullermd@over-yonder.net

Modified:
  head/net/nss-pam-ldapd/Makefile

Modified: head/net/nss-pam-ldapd/Makefile
==============================================================================
--- head/net/nss-pam-ldapd/Makefile	Wed Jun 10 23:18:37 2015	(r389153)
+++ head/net/nss-pam-ldapd/Makefile	Thu Jun 11 00:53:03 2015	(r389154)
@@ -27,21 +27,24 @@ SUB_FILES+=		pkg-message
 NSLCD_PIDFILE?=		/var/run/nslcd.pid
 NSLCD_SOCKET?=		/var/run/nslcd.ctl
 
+OPTIONS_DEFINE=		KERBEROS
+OPTIONS_DEFAULT=	KERBEROS
+
 .if defined(SLAVE_PORT)
-OPTIONS_DEFINE=		SASL
+OPTIONS_DEFINE+=	SASL
 OPTIONS_MULTI=		MG1
 OPTIONS_MULTI_MG1=	PAM NSS
 PAM_DESC=		Build pam_ldap
 NSS_DESC=		Build nss support
 SASL_DESC=		Build sasl support
-OPTIONS_DEFAULT=	PAM NSS
+OPTIONS_DEFAULT+=	PAM NSS
 CONFLICTS+=		nss-pam-ldapd-[0-9]*
 .else
 OPTIONS_MULTI=		MG1
 OPTIONS_MULTI_MG1=	PAM NSS
 PAM_DESC=		Build pam_ldap
 NSS_DESC=		Build nss support
-OPTIONS_DEFAULT=	PAM NSS
+OPTIONS_DEFAULT+=	PAM NSS
 CONFLICTS+=		nss-pam-ldapd-sasl-[0-9]*
 .endif
 
@@ -65,6 +68,10 @@ PLIST_SUB+=		CONFIG="${CONFIG_FILE}" \
 			NSS_LDAP_SHMAJOR="${NSS_LDAP_SHMAJOR}"
 SUB_LIST+=		CONFIG_FILE="${PREFIX}/etc/${CONFIG_FILE}"
 
+.if empty(PORT_OPTIONS:MKERBEROS)
+CONFIGURE_ARGS+=	--disable-kerberos
+.endif
+
 .if ${PORT_OPTIONS:MSASL}
 WANT_OPENLDAP_SASL=	yes
 CONFIGURE_ARGS+=	--enable-sasl



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