svn commit: r431080 - in branches/2017Q1/net: samba42 samba43 samba44

[Antoine Brodin]

Author: antoine
Date: Tue Jan 10 12:10:19 2017
New Revision: 431080
URL: https://svnweb.freebsd.org/changeset/ports/431080

Log:
  MFH: r431079
  
  Remove WANT_OPENLDAP_SASL from a few ports as it prevents users from easily
  installing a desktop environment and samba.
  WANT_OPENLDAP_SASL must not be used in invidual ports Makefiles.
  Note: there is a wip to rewrite the handling of openldap in ports
  
  With hat:	portmgr
  Reviewed by:	mat
  Differential Revision:	https://reviews.freebsd.org/D9083

Modified:
  branches/2017Q1/net/samba42/Makefile
  branches/2017Q1/net/samba43/Makefile
  branches/2017Q1/net/samba44/Makefile
Directory Properties:
  branches/2017Q1/   (props changed)

Modified: branches/2017Q1/net/samba42/Makefile
==============================================================================
--- branches/2017Q1/net/samba42/Makefile	Tue Jan 10 12:08:19 2017	(r431079)
+++ branches/2017Q1/net/samba42/Makefile	Tue Jan 10 12:10:19 2017	(r431080)
@@ -345,7 +345,6 @@ CONFIGURE_ARGS+=	--without-ads
 
 .if defined(SAMBA4_WANT_LDAP)
 USE_OPENLDAP=		yes
-#WANT_OPENLDAP_SASL=	yes
 CONFIGURE_ARGS+=	--with-ldap
 PLIST_SUB+=		LDAP=""
 .else

Modified: branches/2017Q1/net/samba43/Makefile
==============================================================================
--- branches/2017Q1/net/samba43/Makefile	Tue Jan 10 12:08:19 2017	(r431079)
+++ branches/2017Q1/net/samba43/Makefile	Tue Jan 10 12:10:19 2017	(r431080)
@@ -3,7 +3,7 @@
 
 PORTNAME?=		${SAMBA4_BASENAME}43
 PORTVERSION?=		${SAMBA4_VERSION}
-PORTREVISION?=		0
+PORTREVISION?=		1
 CATEGORIES?=		net
 MASTER_SITES=		SAMBA/samba/stable SAMBA/samba/rc
 DISTNAME=		${SAMBA4_DISTNAME}
@@ -345,7 +345,6 @@ CONFIGURE_ARGS+=	--without-ads
 
 .if defined(SAMBA4_WANT_LDAP)
 USE_OPENLDAP=		yes
-WANT_OPENLDAP_SASL=	yes
 CONFIGURE_ARGS+=	--with-ldap
 PLIST_SUB+=		LDAP=""
 .else

Modified: branches/2017Q1/net/samba44/Makefile
==============================================================================
--- branches/2017Q1/net/samba44/Makefile	Tue Jan 10 12:08:19 2017	(r431079)
+++ branches/2017Q1/net/samba44/Makefile	Tue Jan 10 12:10:19 2017	(r431080)
@@ -3,7 +3,7 @@
 
 PORTNAME?=		${SAMBA4_BASENAME}44
 PORTVERSION?=		${SAMBA4_VERSION}
-PORTREVISION?=		0
+PORTREVISION?=		1
 CATEGORIES?=		net
 MASTER_SITES=		SAMBA/samba/stable SAMBA/samba/rc
 DISTNAME=		${SAMBA4_DISTNAME}
@@ -333,7 +333,6 @@ PLIST_SUB+=		ADS="@comment "
 
 .if defined(SAMBA4_WANT_LDAP)
 USE_OPENLDAP=		yes
-WANT_OPENLDAP_SASL=	yes
 CONFIGURE_ARGS+=	--with-ldap
 PLIST_SUB+=		LDAP=""
 .else