Index: head/net/py-ldap0/Makefile
===================================================================
--- head/net/py-ldap0/Makefile	(revision 522844)
+++ head/net/py-ldap0/Makefile	(revision 522845)
@@ -1,25 +1,44 @@
 # $FreeBSD$
 
 PORTNAME=	ldap0
-PORTVERSION=	0.0.60
-PORTREVISION=	1
+PORTVERSION=	0.6.8
 CATEGORIES=	net python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	girgen@FreeBSD.org
-COMMENT=	Python module package for implementing LDAP clients
+COMMENT=	Module package for implementing LDAP clients
 
 LICENSE=	PSFL
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyasn1-modules>=0.2.1:devel/py-pyasn1-modules@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyasn1>=0.4.5:devel/py-pyasn1-modules@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyasn1-modules>=0.2.5:devel/py-pyasn1-modules@${PY_FLAVOR}
+# OpenLDAP needs SASL option enabled
+# Cyrus needs PLAIN / CRAM-MD5 / DIGEST-MD5 enabled
+TEST_DEPENDS=	${LOCALBASE}/libexec/slapd:net/openldap24-server
 
-MAKE_ENV+=	INCLUDES=${LOCALBASE}/include
-WANT_OPENLDAP_SASL=yes
-
-USES=		python:2.7
+USES=		localbase python:3.6+
 USE_LOCALE=	en_US.UTF-8
 USE_OPENLDAP=	yes
 USE_PYTHON=	autoplist distutils
+
+WANT_OPENLDAP_SASL=	yes
+
+PYDISTUTILS_BUILD_TARGET=	build_ext
+PYDISTUTILS_BUILDARGS+=		--inplace
+
+# Add LOGLEVEL=DEBUG to debug tests
+TEST_ENV=	LDAPNOINIT=1 \
+		SLAPD=${LOCALBASE}/libexec/slapd \
+		SCHEMA=${LOCALBASE}/etc/openldap/schema \
+		BIN=${LOCALBASE}/bin \
+		SBIN=${LOCALBASE}/sbin \
+		TMP=${WRKDIR}
+
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/_libldap0.so
+
+do-test:
+	@cd ${WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test
 
 .include <bsd.port.mk>
Index: head/net/py-ldap0/distinfo
===================================================================
--- head/net/py-ldap0/distinfo	(revision 522844)
+++ head/net/py-ldap0/distinfo	(revision 522845)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1525015315
-SHA256 (ldap0-0.0.60.tar.gz) = a6f02941dda63249e8c7c68947d0c7fb47efaa59ca085396a3ddedadb90a65fe
-SIZE (ldap0-0.0.60.tar.gz) = 219348
+TIMESTAMP = 1578802932
+SHA256 (ldap0-0.6.8.tar.gz) = 2490ae871180d21b42bfc073ee8b73f1493fe700ae02dff87a7388e7414fb8b4
+SIZE (ldap0-0.6.8.tar.gz) = 233543
Index: head/net/py-ldap0/files/patch-setup.py
===================================================================
--- head/net/py-ldap0/files/patch-setup.py	(revision 522844)
+++ head/net/py-ldap0/files/patch-setup.py	(nonexistent)
@@ -1,11 +0,0 @@
---- setup.py.orig	2018-02-06 13:04:47 UTC
-+++ setup.py
-@@ -22,7 +22,7 @@ class OpenLDAP2BuildConfig:
- 
-     def __init__(self, meta_defines):
-         self.library_dirs = []
--        self.include_dirs = []
-+        self.include_dirs = [os.environ['INCLUDES']]
-         self.extra_compile_args = []
-         self.extra_link_args = []
-         self.extra_objects = []

Property changes on: head/net/py-ldap0/files/patch-setup.py
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/net/py-ldap0/files/patch-setup.cfg
===================================================================
--- head/net/py-ldap0/files/patch-setup.cfg	(nonexistent)
+++ head/net/py-ldap0/files/patch-setup.cfg	(revision 522845)
@@ -0,0 +1,10 @@
+--- setup.cfg.orig	2020-01-12 07:58:53 UTC
++++ setup.cfg
+@@ -1,6 +1,6 @@
+ [_libldap0]
+ defines = HAVE_SASL HAVE_TLS HAVE_LIBLDAP_R
+-extra_compile_args = -Wall -O1 -g -DPYMALLOC_DEBUG
++extra_compile_args = -Wall
+ extra_objects = 
+ libs = ldap_r
+ 

Property changes on: head/net/py-ldap0/files/patch-setup.cfg
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/net/py-ldap0/pkg-descr
===================================================================
--- head/net/py-ldap0/pkg-descr	(revision 522844)
+++ head/net/py-ldap0/pkg-descr	(revision 522845)
@@ -1,11 +1,13 @@
 ldap0 provides an object-oriented API to access LDAP directory servers from
 Python programs. Mainly it wraps the OpenLDAP 2.x libs for that purpose.
+
 Additionally the package contains Python modules:
-- parsing and producing LDIF
-- handle LDAPURLs
-- parse and handle LDAPv3 subschema
-- LDAPv3 extended operations and controls
-- automatic tests with OpenLDAP server This package is a non-compatible fork of
-  python-ldap and therefore uses the separate module name-space 'ldap0'.
 
-WWW: https://pypi.org/project/ldap0/#description
+  - parsing and producing LDIF
+  - handle LDAPURLs
+  - parse and handle LDAPv3 subschema
+  - LDAPv3 extended operations and controls
+  - automatic tests with OpenLDAP server This package is a non-compatible for
+    of python-ldap and therefore uses the separate module name-space 'ldap0'.
+
+WWW: https://gitlab.com/ae-dir/python-ldap0