Index: head/net/py-ldap2/Makefile
===================================================================
--- head/net/py-ldap2/Makefile	(revision 371149)
+++ head/net/py-ldap2/Makefile	(revision 371150)
@@ -1,45 +1,43 @@
 # $FreeBSD$
 
 PORTNAME=	ldap2
-PORTVERSION=	2.4.15
-PORTREVISION=	1
+PORTVERSION=	2.4.18
 CATEGORIES=	net python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	python-ldap-${PORTVERSION}
 
 MAINTAINER=	rm@FreeBSD.org
 COMMENT=	LDAP module for python, for OpenLDAP2
 
 LICENSE=	PSFL
+LICENSE_FILE=	${WRKSRC}/LICENCE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}asn1-modules>=0:${PORTSDIR}/devel/py-asn1-modules
 
-USE_PYTHON=		2
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python:2
+USE_PYTHON=	autoplist distutils
 USE_OPENLDAP=		yes
 WANT_OPENLDAP_VER=	24
 
-REPLACE_ARGS=	-e 's,/opt/openldap-RE24/lib,${LOCALBASE}/lib,' \
-		-e 's,/opt/openldap-RE24/include,${LOCALBASE}/include,' \
+REPLACE_ARGS=	-e 's,/opt/openldap/lib64,${LOCALBASE}/lib,' \
+		-e 's,/opt/openldap/include,${LOCALBASE}/include,' \
 		-e 's,/usr/include/sasl,${LOCALBASE}/include/sasl,'
 
-OPTIONSFILE=	${PORT_DBDIR}/py-${PORTNAME}/options
 OPTIONS_DEFINE=	SASL
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MSASL}
 WANT_OPENLDAP_SASL=	yes
 CONFLICTS+=		openldap2[34]-client-2.*
 .endif
 
 do-configure:
 	@${REINPLACE_CMD} ${REPLACE_ARGS} ${WRKSRC}/setup.cfg
 .if ! ${PORT_OPTIONS:MSASL}
 	@cd ${WRKSRC} && ${PYTHON_CMD} setup.py -q setopt -c _ldap -s HAVE_TLS -o defines
 	@cd ${WRKSRC} && ${PYTHON_CMD} setup.py -q saveopts
 .endif
 
 .include <bsd.port.mk>
Index: head/net/py-ldap2/distinfo
===================================================================
--- head/net/py-ldap2/distinfo	(revision 371149)
+++ head/net/py-ldap2/distinfo	(revision 371150)
@@ -1,2 +1,2 @@
-SHA256 (python-ldap-2.4.15.tar.gz) = 30bcac33ded943557fbafb1b6d9c345deab34d89d63dbcee9e6b59207db11670
-SIZE (python-ldap-2.4.15.tar.gz) = 111597
+SHA256 (python-ldap-2.4.18.tar.gz) = e375c5b9dea6022299a56435b5fef92c803d23659799df1f7d45c89a74b007fa
+SIZE (python-ldap-2.4.18.tar.gz) = 137451