4 files changed, 5 insertions, 67 deletions

diff --git a/net/py-ldap2/Makefile b/net/py-ldap2/Makefile
index 63522fc45822..5c42e1618289 100644
--- a/net/py-ldap2/Makefile
+++ b/net/py-ldap2/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	ldap2
-PORTVERSION=	2.3.10
+PORTVERSION=	2.3.11
 CATEGORIES=	net python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -20,7 +20,7 @@ USE_OPENLDAP=	yes
 PYDISTUTILS_PKGNAME=	python-ldap
 PYEASYINSTALL_ARCHDEP=	yes
 
-REPLACE_ARGS=	-e 's,/usr/local/openldap-2.3,${LOCALBASE},'
+REPLACE_ARGS=	-e 's,/opt/openldap-RE24,${LOCALBASE},'
 
 .if defined(WITH_SASL)
 WANT_OPENLDAP_SASL=	yes
diff --git a/net/py-ldap2/distinfo b/net/py-ldap2/distinfo
index d4b4dfd29a55..f7dcdc60267e 100644
--- a/net/py-ldap2/distinfo
+++ b/net/py-ldap2/distinfo
@@ -1,3 +1,3 @@
-MD5 (python-ldap-2.3.10.tar.gz) = 564d741a7c6d5fdcb45322fe9262d1a5
-SHA256 (python-ldap-2.3.10.tar.gz) = 3c3bbf723440f2b8c7102994c9cd4666307df3d3538e110fff2d03681e7f284f
-SIZE (python-ldap-2.3.10.tar.gz) = 112840
+MD5 (python-ldap-2.3.11.tar.gz) = d23f95d497fe180be4ffc90a7f9b42ed
+SHA256 (python-ldap-2.3.11.tar.gz) = bed37b5663b3f61e238477f261dbf0402e613c1ac0a4828de4e2e886850e60bf
+SIZE (python-ldap-2.3.11.tar.gz) = 119459
diff --git a/net/py-ldap2/files/patch-Modules__constants.c b/net/py-ldap2/files/patch-Modules__constants.c
deleted file mode 100644
index 2b9c2cc524e3..000000000000
--- a/net/py-ldap2/files/patch-Modules__constants.c
+++ /dev/null
@@ -1,32 +0,0 @@
---- ./Modules/constants.c.orig	2009-10-30 06:20:47.000000000 -0700
-+++ ./Modules/constants.c	2009-11-24 11:36:43.304856749 -0800
-@@ -1,6 +1,6 @@
- /* constants defined for LDAP
-  * See http://www.python-ldap.org/ for details.
-- * $Id: constants.c,v 1.43 2009/10/23 09:09:37 stroeder Exp $ */
-+ * $Id: constants.c,v 1.45 2009/11/13 08:44:07 stroeder Exp $ */
- 
- #include "common.h"
- #include "constants.h"
-@@ -162,7 +162,9 @@
- 	add_int(d,OPT_URI);
- #ifdef HAVE_TLS
- 	add_int(d,OPT_X_TLS);
-+#ifdef LDAP_OPT_X_TLS_NEWCTX
- 	add_int(d,OPT_X_TLS_CTX);
-+#endif
- 	add_int(d,OPT_X_TLS_CACERTFILE);
- 	add_int(d,OPT_X_TLS_CACERTDIR);
- 	add_int(d,OPT_X_TLS_CERTFILE);
-@@ -181,8 +183,10 @@
- 	add_int(d,OPT_X_TLS_CRL_NONE);
- 	add_int(d,OPT_X_TLS_CRL_PEER);
- 	add_int(d,OPT_X_TLS_CRL_ALL);
-+#ifdef LDAP_OPT_X_TLS_NEWCTX
- 	add_int(d,OPT_X_TLS_NEWCTX);
--#ifdef OPT_X_TLS_PROTOCOL_MIN
-+#endif
-+#ifdef LDAP_OPT_X_TLS_PROTOCOL_MIN
- 	add_int(d,OPT_X_TLS_PROTOCOL_MIN);
- #endif
- #endif
diff --git a/net/py-ldap2/files/patch-Modules__options.c b/net/py-ldap2/files/patch-Modules__options.c
deleted file mode 100644
index ce738e3de4be..000000000000
--- a/net/py-ldap2/files/patch-Modules__options.c
+++ /dev/null
@@ -1,30 +0,0 @@
---- ./Modules/options.c.orig	2009-10-30 06:20:47.000000000 -0700
-+++ ./Modules/options.c	2009-11-24 11:36:43.305856626 -0800
-@@ -1,5 +1,5 @@
- /* See http://www.python-ldap.org/ for details.
-- * $Id: options.c,v 1.33 2009/10/23 09:09:37 stroeder Exp $ */
-+ * $Id: options.c,v 1.35 2009/11/13 08:45:50 stroeder Exp $ */
- 
- #include "common.h"
- #include "errors.h"
-@@ -79,8 +79,10 @@
- #ifdef HAVE_TLS
-     case LDAP_OPT_X_TLS:
-     case LDAP_OPT_X_TLS_REQUIRE_CERT:
-+#ifdef LDAP_OPT_X_TLS_NEWCTX
-     case LDAP_OPT_X_TLS_NEWCTX:
--#ifdef OPT_X_TLS_PROTOCOL_MIN
-+#endif
-+#ifdef LDAP_OPT_X_TLS_PROTOCOL_MIN
-     case LDAP_OPT_X_TLS_PROTOCOL_MIN:
- #endif
- #endif
-@@ -218,7 +220,7 @@
- #ifdef HAVE_TLS
-     case LDAP_OPT_X_TLS:
-     case LDAP_OPT_X_TLS_REQUIRE_CERT:
--#ifdef OPT_X_TLS_PROTOCOL_MIN
-+#ifdef LDAP_OPT_X_TLS_PROTOCOL_MIN
-     case LDAP_OPT_X_TLS_PROTOCOL_MIN:
- #endif
- #endif