From 977a121be4a80741c57019274e5c9a14602740c8 Mon Sep 17 00:00:00 2001
From: Ruslan Makhmatkhanov <rm@FreeBSD.org>
Date: Fri, 17 Nov 2023 04:53:44 +0300
Subject: [PATCH] Rename net/py-ldap to net/py-python-ldap

This makes portname conformant to upstream one. Also it is now allow
us to build a package with pep517, so switch to it
---
 MOVED                                                | 1 +
 net/Makefile                                         | 2 +-
 net/{py-ldap => py-python-ldap}/Makefile             | 9 ++++++---
 net/{py-ldap => py-python-ldap}/distinfo             | 0
 net/{py-ldap => py-python-ldap}/files/patch-setup.py | 0
 net/{py-ldap => py-python-ldap}/pkg-descr            | 0
 6 files changed, 8 insertions(+), 4 deletions(-)
 rename net/{py-ldap => py-python-ldap}/Makefile (73%)
 rename net/{py-ldap => py-python-ldap}/distinfo (100%)
 rename net/{py-ldap => py-python-ldap}/files/patch-setup.py (100%)
 rename net/{py-ldap => py-python-ldap}/pkg-descr (100%)

diff --git a/MOVED b/MOVED
index 7f6c14f81b691..dbd4665990e15 100644
--- a/MOVED
+++ b/MOVED
@@ -8078,3 +8078,4 @@ x11-fonts/fpc-libfontconfig|lang/fpc|2023-11-12|This port was merged into lang/f
 x11-toolkits/fpc-xforms|lang/fpc|2023-11-12|This port was merged into lang/fpc
 x11-toolkits/fpc-gtk2|lang/fpc|2023-11-12|This port was merged into lang/fpc
 sysutils/fpc-users|lang/fpc|2023-11-14|This port was merged into lang/fpc
+net/py-ldap|net/py-python-ldap|2023-11-17|Rename to conform upstream name
diff --git a/net/Makefile b/net/Makefile
index 0b1ad194b24ea..4039e79d705cb 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -1064,7 +1064,6 @@
     SUBDIR += py-iptools
     SUBDIR += py-kafka-python
     SUBDIR += py-kombu
-    SUBDIR += py-ldap
     SUBDIR += py-ldap0
     SUBDIR += py-ldap3
     SUBDIR += py-ldapdomaindump
@@ -1117,6 +1116,7 @@
     SUBDIR += py-python-glanceclient
     SUBDIR += py-python-heatclient
     SUBDIR += py-python-keystoneclient
+    SUBDIR += py-python-ldap
     SUBDIR += py-python-neutronclient
     SUBDIR += py-python-novaclient
     SUBDIR += py-python-openstackclient
diff --git a/net/py-ldap/Makefile b/net/py-python-ldap/Makefile
similarity index 73%
rename from net/py-ldap/Makefile
rename to net/py-python-ldap/Makefile
index b84ec4926238e..99b48b136cefa 100644
--- a/net/py-ldap/Makefile
+++ b/net/py-python-ldap/Makefile
@@ -1,9 +1,9 @@
-PORTNAME=	ldap
+PORTNAME=	python-ldap
 DISTVERSION=	3.4.3
+PORTREVISION=	1
 CATEGORIES=	net python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	python-${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	rm@FreeBSD.org
 COMMENT=	LDAP module for python, for OpenLDAP2
@@ -12,11 +12,14 @@ WWW=		https://www.python-ldap.org
 LICENSE=	PSFL
 LICENSE_FILE=	${WRKSRC}/LICENCE
 
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}build>0:devel/py-build@${PY_FLAVOR} \
+		${PY_SETUPTOOLS} \
+		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyasn1>0:devel/py-pyasn1@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyasn1-modules>0:devel/py-pyasn1-modules@${PY_FLAVOR}
 
 USES=		ldap python
-USE_PYTHON=	autoplist distutils
+USE_PYTHON=	autoplist pep517
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/setup.py
diff --git a/net/py-ldap/distinfo b/net/py-python-ldap/distinfo
similarity index 100%
rename from net/py-ldap/distinfo
rename to net/py-python-ldap/distinfo
diff --git a/net/py-ldap/files/patch-setup.py b/net/py-python-ldap/files/patch-setup.py
similarity index 100%
rename from net/py-ldap/files/patch-setup.py
rename to net/py-python-ldap/files/patch-setup.py
diff --git a/net/py-ldap/pkg-descr b/net/py-python-ldap/pkg-descr
similarity index 100%
rename from net/py-ldap/pkg-descr
rename to net/py-python-ldap/pkg-descr