svn commit: r407215 - head/net/py-pyldap

Ruslan Makhmatkhanov rm at FreeBSD.org
Mon Jan 25 14:30:07 UTC 2016


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


More information about the svn-ports-head mailing list