svn commit: r407217 - head/net/py-ldap

[Kubilay Kocak]

On 26/01/2016 1:39 AM, Ruslan Makhmatkhanov wrote:
> Author: rm
> Date: Mon Jan 25 14:39:37 2016
> New Revision: 407217
> URL: https://svnweb.freebsd.org/changeset/ports/407217
> 
> Log:
>   net/py-ldap: sync with py-ldap
>   
>   - convert to option helpers
>   - add conflicts with py27-pyldap: they install files into the same place
>   
>   These changes are non-functional, so no PORTREVISION bump.

What about in order for pkg to register the new conflict?

I'm not 100% sure, but I thought I'd ask the question

Btw, *awesome* use of Python setopt/saveopts

> Modified:
>   head/net/py-ldap/Makefile
> 
> Modified: head/net/py-ldap/Makefile
> ==============================================================================
> --- head/net/py-ldap/Makefile	Mon Jan 25 14:36:14 2016	(r407216)
> +++ head/net/py-ldap/Makefile	Mon Jan 25 14:39:37 2016	(r407217)
> @@ -15,25 +15,23 @@ LICENSE_FILE=	${WRKSRC}/LICENCE
>  
>  RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyasn1-modules>0:${PORTSDIR}/devel/py-pyasn1-modules
>  
> +CONFLICTS_INSTALL=	py27-pyldap
>  USES=		python:2
>  USE_PYTHON=	autoplist distutils
> -USE_OPENLDAP=		yes
> +USE_OPENLDAP=	yes
>  WANT_OPENLDAP_VER=	24
> -OPTIONS_DEFINE=	SASL
>  
> -.include <bsd.port.options.mk>
> +OPTIONS_DEFINE=	SASL
>  
> -.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} -e 's,/usr/local,${LOCALBASE},' ${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
>