13 files changed, 22 insertions, 18 deletions

diff --git a/MOVED b/MOVED
index dd9a386a97c5..e8f6e6886fe7 100644
--- a/MOVED
+++ b/MOVED
@@ -7638,4 +7638,5 @@ databases/postgresql84-server||2015-06-10|Has expired: "EOL was reached in July
 ftp/ncftp1||2015-06-12|Unfetchable
 multimedia/avidemux2||2015-06-13|Branch no longer maintained upstream, use multimedia/avidemux26
 multimedia/avidemux26|multimedia/avidemux|2015-06-13|Renamed
-editors/zim|deskutils/zim|2015-06-13|Move to more appropriate category
+editors/zim|deskutils/zim|2015-06-18|Move to more appropriate category
+net/py-ldap2|net/py-ldap|2015-06-18|Rename to better match upstream name
diff --git a/devel/py-Products.LDAPMultiPlugins/Makefile b/devel/py-Products.LDAPMultiPlugins/Makefile
index f5bcdfdc4294..da8b6095713d 100644
--- a/devel/py-Products.LDAPMultiPlugins/Makefile
+++ b/devel/py-Products.LDAPMultiPlugins/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Products.LDAPMultiPlugins
 PORTVERSION=	1.14
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -14,7 +14,7 @@ COMMENT=	LDAP-backed plugins for the Zope2 PluggableAuthService
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ldap2>=2.0.6:${PORTSDIR}/net/py-ldap2 \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ldap>=2.0.6:${PORTSDIR}/net/py-ldap \
 		${PYTHON_PKGNAMEPREFIX}Products.LDAPUserFolder>=2.9:${PORTSDIR}/devel/py-Products.LDAPUserFolder \
 		${PYTHON_PKGNAMEPREFIX}Products.PluggableAuthService>=1.4.0:${PORTSDIR}/security/py-Products.PluggableAuthService
 
diff --git a/devel/py-Products.LDAPUserFolder/Makefile b/devel/py-Products.LDAPUserFolder/Makefile
index ecb513fbcc05..4f5b2ac9d094 100644
--- a/devel/py-Products.LDAPUserFolder/Makefile
+++ b/devel/py-Products.LDAPUserFolder/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Products.LDAPUserFolder
 PORTVERSION=	2.26
+PORTREVISION=	1
 CATEGORIES=	devel python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -14,7 +15,7 @@ COMMENT=	LDAP-enabled Zope 2 user folder
 LICENSE=	ZPL21
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools-git>=0.4.2:${PORTSDIR}/devel/py-setuptools-git
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ldap2>=2.0.6:${PORTSDIR}/net/py-ldap2
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ldap>=2.0.6:${PORTSDIR}/net/py-ldap
 
 OPTIONS_DEFINE=		POSIXGROUP_PATCH
 POSIXGROUP_PATCH_DESC=	Use posixGroup for group membership
diff --git a/finance/trytond28_ldap_connection/Makefile b/finance/trytond28_ldap_connection/Makefile
index 4b1a95c3eb06..92cd38488445 100644
--- a/finance/trytond28_ldap_connection/Makefile
+++ b/finance/trytond28_ldap_connection/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	trytond28_ldap_connection
 PORTVERSION=	2.8.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	finance python
 MASTER_SITES=	https://pypi.python.org/packages/source/t/trytond_ldap_connection/ \
 		http://downloads.tryton.org/${PORTVERSION:R}/
@@ -15,7 +15,7 @@ COMMENT=	Tryton Application Platform (LDAP Connection Module)
 LICENSE=	GPLv3
 
 RUN_DEPENDS=	trytond28>=2.8.2:${PORTSDIR}/finance/trytond28 \
-		${PYTHON_PKGNAMEPREFIX}ldap2>=2.4.10:${PORTSDIR}/net/py-ldap2
+		${PYTHON_PKGNAMEPREFIX}ldap>=2.4.10:${PORTSDIR}/net/py-ldap
 
 CONFLICTS=	trytond_ldap_connection-2.[46].*
 
diff --git a/finance/trytond_ldap_connection/Makefile b/finance/trytond_ldap_connection/Makefile
index dba73eb8d336..27c7f4868b26 100644
--- a/finance/trytond_ldap_connection/Makefile
+++ b/finance/trytond_ldap_connection/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	trytond_ldap_connection
 PORTVERSION=	2.4.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	finance python
 MASTER_SITES=	http://downloads.tryton.org/${PORTVERSION:R}/
 
@@ -13,7 +13,7 @@ COMMENT=	Tryton Application Platform (LDAP Connection Module)
 LICENSE=	GPLv3
 
 RUN_DEPENDS=	trytond>=2.4.0:${PORTSDIR}/finance/trytond \
-		${PYTHON_PKGNAMEPREFIX}ldap2>=2.4.10:${PORTSDIR}/net/py-ldap2
+		${PYTHON_PKGNAMEPREFIX}ldap>=2.4.10:${PORTSDIR}/net/py-ldap
 
 CONFLICTS=	trytond28_ldap_connection-2.8.*
 
diff --git a/mail/py-ppolicy/Makefile b/mail/py-ppolicy/Makefile
index 3aa41f3fa49e..e63125749d76 100644
--- a/mail/py-ppolicy/Makefile
+++ b/mail/py-ppolicy/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ppolicy
 PORTVERSION=	2.6.6
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	mail python
 MASTER_SITES=	http://kmlinux.fjfi.cvut.cz/~vokac/activities/ppolicy/download/%SUBDIR%/ \
 		http://www.chifeng.name/dist/ppolicy/%SUBDIR%/
@@ -34,7 +34,7 @@ RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/GeoIP.so:${PORTSDIR}/net/py-GeoIP
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}MySQLdb>=0:${PORTSDIR}/databases/py-MySQLdb
 .endif
 .if ${PORT_OPTIONS:MLDAP}
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}ldap2>=2.3.1:${PORTSDIR}/net/py-ldap2
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}ldap>=2.3.1:${PORTSDIR}/net/py-ldap
 .endif
 
 post-install:
diff --git a/net/Makefile b/net/Makefile
index 451cb51afc19..ede96366844a 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -914,7 +914,7 @@
     SUBDIR += py-ipaddress
     SUBDIR += py-iplib
     SUBDIR += py-kombu
-    SUBDIR += py-ldap2
+    SUBDIR += py-ldap
     SUBDIR += py-ldap3
     SUBDIR += py-ldaptor
     SUBDIR += py-libcloud
diff --git a/net/py-ldap2/Makefile b/net/py-ldap/Makefile
index de104d7f2dd0..fa32b70cf591 100644
--- a/net/py-ldap2/Makefile
+++ b/net/py-ldap/Makefile
@@ -1,11 +1,11 @@
 # $FreeBSD$
 
-PORTNAME=	ldap2
+PORTNAME=	ldap
 PORTVERSION=	2.4.19
 CATEGORIES=	net python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	python-ldap-${PORTVERSION}
+DISTNAME=	python-${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	rm@FreeBSD.org
 COMMENT=	LDAP module for python, for OpenLDAP2
@@ -30,7 +30,7 @@ OPTIONS_DEFINE=	SASL
 
 .if ${PORT_OPTIONS:MSASL}
 WANT_OPENLDAP_SASL=	yes
-CONFLICTS+=		openldap2[34]-client-2.*
+CONFLICTS+=		openldap24-client-2.*
 .endif
 
 do-configure:
diff --git a/net/py-ldap2/distinfo b/net/py-ldap/distinfo
index b0eae38ea481..b0eae38ea481 100644
--- a/net/py-ldap2/distinfo
+++ b/net/py-ldap/distinfo
diff --git a/net/py-ldap2/pkg-descr b/net/py-ldap/pkg-descr
index add35193d5e6..add35193d5e6 100644
--- a/net/py-ldap2/pkg-descr
+++ b/net/py-ldap/pkg-descr
diff --git a/net/splatd/Makefile b/net/splatd/Makefile
index aac28695c57b..cb5f33d77e8e 100644
--- a/net/splatd/Makefile
+++ b/net/splatd/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	splatd
 PORTVERSION=	1.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	net
 MASTER_SITES=	GOOGLE_CODE
 
@@ -13,7 +13,7 @@ COMMENT=	Splat is the Scalable Periodic LDAP Attribute Transmogrifier
 LICENSE=	BSD3CLAUSE
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/zconfig:${PORTSDIR}/devel/py-zconfig \
-		${PYTHON_PKGNAMEPREFIX}ldap2>=2.3.1:${PORTSDIR}/net/py-ldap2
+		${PYTHON_PKGNAMEPREFIX}ldap>=2.3.1:${PORTSDIR}/net/py-ldap
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 OPTIONS_DEFINE=	DOCS
diff --git a/www/py-django-auth-ldap/Makefile b/www/py-django-auth-ldap/Makefile
index 88df7a974d7c..281ac2566881 100644
--- a/www/py-django-auth-ldap/Makefile
+++ b/www/py-django-auth-ldap/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	django-auth-ldap
 PORTVERSION=	1.1.7
+PORTREVISION=	1
 CATEGORIES=	www security python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -13,7 +14,7 @@ COMMENT=	LDAP integration for django.contrib.auth
 LICENSE=	BSD2CLAUSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>=1.3.1:${PORTSDIR}/www/py-django \
-		${PYTHON_PKGNAMEPREFIX}ldap2>=2.0:${PORTSDIR}/net/py-ldap2
+		${PYTHON_PKGNAMEPREFIX}ldap>=2.0:${PORTSDIR}/net/py-ldap
 
 USES=		python:2
 USE_PYTHON=	autoplist distutils
diff --git a/www/py-django-ldapdb/Makefile b/www/py-django-ldapdb/Makefile
index 52ae7f85e823..de6697040048 100644
--- a/www/py-django-ldapdb/Makefile
+++ b/www/py-django-ldapdb/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	django-ldapdb
 PORTVERSION=	0.3.2
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -13,7 +14,7 @@ COMMENT=	Support for django models over LDAP
 LICENSE=	BSD2CLAUSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>=1.6.0:${PORTSDIR}/www/py-django \
-		${PYTHON_PKGNAMEPREFIX}ldap2>=2.0:${PORTSDIR}/net/py-ldap2
+		${PYTHON_PKGNAMEPREFIX}ldap>=2.0:${PORTSDIR}/net/py-ldap
 
 USES=		python
 USE_PYTHON=	distutils autoplist