From owner-svn-ports-head@freebsd.org  Mon Jan 25 14:30:06 2016
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id DA965A46927;
 Mon, 25 Jan 2016 14:30:06 +0000 (UTC) (envelope-from rm@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id AC1839B4;
 Mon, 25 Jan 2016 14:30:06 +0000 (UTC) (envelope-from rm@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0PEU5r3019564;
 Mon, 25 Jan 2016 14:30:05 GMT (envelope-from rm@FreeBSD.org)
Received: (from rm@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0PEU5iY019563;
 Mon, 25 Jan 2016 14:30:05 GMT (envelope-from rm@FreeBSD.org)
Message-Id: <201601251430.u0PEU5iY019563@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: rm set sender to rm@FreeBSD.org
 using -f
From: Ruslan Makhmatkhanov <rm@FreeBSD.org>
Date: Mon, 25 Jan 2016 14:30:05 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r407215 - head/net/py-pyldap
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 25 Jan 2016 14:30:07 -0000

Author: rm
Date: Mon Jan 25 14:30:05 2016
New Revision: 407215
URL: https://svnweb.freebsd.org/changeset/ports/407215

Log:
  net/py-pyldap: convert to option helpers; non-functional change
  
  Suggested by:	koobs

Modified:
  head/net/py-pyldap/Makefile

Modified: head/net/py-pyldap/Makefile
==============================================================================
--- head/net/py-pyldap/Makefile	Mon Jan 25 14:14:03 2016	(r407214)
+++ head/net/py-pyldap/Makefile	Mon Jan 25 14:30:05 2016	(r407215)
@@ -16,7 +16,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyas
 CONFLICTS_INSTALL=	py27-ldap
 USES=		python
 USE_PYTHON=	autoplist distutils
-USE_OPENLDAP=		yes
+USE_OPENLDAP=	yes
 WANT_OPENLDAP_VER=	24
 
 REPLACE_ARGS=	-e 's,/usr/include/sasl,${LOCALBASE}/include/sasl,' \
@@ -24,19 +24,15 @@ REPLACE_ARGS=	-e 's,/usr/include/sasl,${
 
 OPTIONS_DEFINE=	SASL
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MSASL}
-WANT_OPENLDAP_SASL=	yes
-CONFLICTS+=		openldap24-client-2.*
-.endif
+SASL_VARS=	WANT_OPENLDAP_SASL=yes
+SASL_CONFLICTS=	openldap24-client-2.*
 
 do-configure:
 	@${REINPLACE_CMD} ${REPLACE_ARGS} ${WRKSRC}/setup.cfg
-.if ! ${PORT_OPTIONS:MSASL}
+
+do-configure-SASL-off:
 	@cd ${WRKSRC} && ${PYTHON_CMD} setup.py -q setopt -c _ldap -s HAVE_TLS -o defines
 	@cd ${WRKSRC} && ${PYTHON_CMD} setup.py -q saveopts
-.endif
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/_ldap.so