Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 10 Jan 2017 12:08:20 +0000 (UTC)
From:      Antoine Brodin <antoine@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r431079 - in head: databases/ldb net/samba42 net/samba43 net/samba44
Message-ID:  <201701101208.v0AC8KBl057315@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: antoine
Date: Tue Jan 10 12:08:19 2017
New Revision: 431079
URL: https://svnweb.freebsd.org/changeset/ports/431079

Log:
  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
  MFH:		2017Q1
  Differential Revision:	https://reviews.freebsd.org/D9083

Modified:
  head/databases/ldb/Makefile
  head/net/samba42/Makefile
  head/net/samba43/Makefile
  head/net/samba44/Makefile

Modified: head/databases/ldb/Makefile
==============================================================================
--- head/databases/ldb/Makefile	Tue Jan 10 11:42:49 2017	(r431078)
+++ head/databases/ldb/Makefile	Tue Jan 10 12:08:19 2017	(r431079)
@@ -2,7 +2,7 @@
 
 PORTNAME=		ldb
 PORTVERSION=		1.1.29
-PORTREVISION=		0
+PORTREVISION=		1
 PORTEPOCH=		0
 CATEGORIES=		databases
 MASTER_SITES=		SAMBA
@@ -20,7 +20,6 @@ WAF_CMD=		buildtools/bin/waf
 CONFIGURE_LOG=		bin/config.log
 
 USE_OPENLDAP=		yes
-WANT_OPENLDAP_SASL=	yes
 
 PKGCONFIGDIR?=		${PREFIX}/libdata/pkgconfig
 PLIST_SUB+=		PKGCONFIGDIR=${PKGCONFIGDIR:S;${PREFIX}/;;}

Modified: head/net/samba42/Makefile
==============================================================================
--- head/net/samba42/Makefile	Tue Jan 10 11:42:49 2017	(r431078)
+++ head/net/samba42/Makefile	Tue Jan 10 12:08:19 2017	(r431079)
@@ -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: head/net/samba43/Makefile
==============================================================================
--- head/net/samba43/Makefile	Tue Jan 10 11:42:49 2017	(r431078)
+++ head/net/samba43/Makefile	Tue Jan 10 12:08:19 2017	(r431079)
@@ -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: head/net/samba44/Makefile
==============================================================================
--- head/net/samba44/Makefile	Tue Jan 10 11:42:49 2017	(r431078)
+++ head/net/samba44/Makefile	Tue Jan 10 12:08:19 2017	(r431079)
@@ -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



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