From 55f977ef8e39031ce36a5f658885447159b563be Mon Sep 17 00:00:00 2001
From: Xin LI <delphij@FreeBSD.org>
Date: Fri, 10 Nov 2006 10:49:20 +0000
Subject: [PATCH] Update to 2.3.29

---
 net/openldap23-server/Makefile                |  6 ++--
 net/openldap23-server/distinfo                |  6 ++--
 .../patch-servers_slapd_back_perl_bind.c      | 11 -------
 .../patch-servers_slapd_back_perl_init.c      | 31 -------------------
 ...patch-servers_slapd_back_perl_proto_perl.h | 10 ------
 5 files changed, 6 insertions(+), 58 deletions(-)
 delete mode 100644 net/openldap23-server/files/patch-servers_slapd_back_perl_bind.c
 delete mode 100644 net/openldap23-server/files/patch-servers_slapd_back_perl_init.c
 delete mode 100644 net/openldap23-server/files/patch-servers_slapd_back_perl_proto_perl.h

diff --git a/net/openldap23-server/Makefile b/net/openldap23-server/Makefile
index f7d99e1ae536..6882ef3223e5 100644
--- a/net/openldap23-server/Makefile
+++ b/net/openldap23-server/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=		openldap
-DISTVERSION=		2.3.27
+DISTVERSION=		2.3.29
 PORTREVISION=		${OPENLDAP_PORTREVISION}
 CATEGORIES=		net databases
 MASTER_SITES=		ftp://ftp.OpenLDAP.org/pub/OpenLDAP/%SUBDIR%/ \
@@ -151,7 +151,7 @@ CONFIGURE_ARGS+=	--disable-slapd \
 			--disable-glue \
 			--disable-syncprov
 
-INSTALLS_SHLIB=		yes
+USE_LDCONFIG=		yes
 SUB_FILES+=		pkg-message.client
 PKGMESSAGE=		${WRKSRC}/pkg-message.client
 
@@ -339,7 +339,7 @@ PLIST_SUB+=		BACK_SQL="@comment "
 .if defined(WITH_SLAPI)
 CONFIGURE_ARGS+=	--enable-slapi
 PLIST_SUB+=		SLAPI=""
-INSTALLS_SHLIB=		yes
+USE_LDCONFIG=		yes
 .else
 PLIST_SUB+=		SLAPI="@comment "
 .endif
diff --git a/net/openldap23-server/distinfo b/net/openldap23-server/distinfo
index 8a72a038d835..74e14833d33b 100644
--- a/net/openldap23-server/distinfo
+++ b/net/openldap23-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (openldap-2.3.27.tgz) = 0fbae4e9279aaa586adcd9f19b66a5ed
-SHA256 (openldap-2.3.27.tgz) = 6ddf211d65aa62bb2165a612f96545d5dc8baf01d269e0f7945ebe066c282ed7
-SIZE (openldap-2.3.27.tgz) = 3757519
+MD5 (openldap-2.3.29.tgz) = c471361a6e67e2a7b6d841f016d370f2
+SHA256 (openldap-2.3.29.tgz) = d06c55852fdb5404482754d7423e938c805b449d73d87c992dcc9e6276a1b0c4
+SIZE (openldap-2.3.29.tgz) = 3763050
diff --git a/net/openldap23-server/files/patch-servers_slapd_back_perl_bind.c b/net/openldap23-server/files/patch-servers_slapd_back_perl_bind.c
deleted file mode 100644
index 97af0fc2c97f..000000000000
--- a/net/openldap23-server/files/patch-servers_slapd_back_perl_bind.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- servers/slapd/back-perl/bind.c.orig	Fri Aug 18 16:04:41 2006
-+++ servers/slapd/back-perl/bind.c	Fri Aug 18 16:05:14 2006
-@@ -32,7 +32,7 @@
- 
- 	PerlBackend *perl_back = (PerlBackend *) op->o_bd->be_private;
- 
--#ifdef HAVE_WIN32_ASPERL
-+#if defined(HAVE_WIN32_ASPERL) || defined(USE_ITHREADS)
- 	PERL_SET_CONTEXT( PERL_INTERPRETER );
- #endif
- 
diff --git a/net/openldap23-server/files/patch-servers_slapd_back_perl_init.c b/net/openldap23-server/files/patch-servers_slapd_back_perl_init.c
deleted file mode 100644
index c07a6ccc891a..000000000000
--- a/net/openldap23-server/files/patch-servers_slapd_back_perl_init.c
+++ /dev/null
@@ -1,31 +0,0 @@
---- servers/slapd/back-perl/init.c.orig	Fri Aug 18 16:01:34 2006
-+++ servers/slapd/back-perl/init.c	Fri Aug 18 16:04:28 2006
-@@ -35,7 +35,9 @@
- 	BackendInfo	*bi
- )
- {
--	bi->bi_open = perl_back_open;
-+	char *embedding[] = { "", "-e", "0" };
-+
-+	bi->bi_open = NULL;
- 	bi->bi_config = 0;
- 	bi->bi_close = perl_back_close;
- 	bi->bi_destroy = 0;
-@@ -63,16 +65,8 @@
- 	bi->bi_connection_init = 0;
- 	bi->bi_connection_destroy = 0;
- 
--	return 0;
--}
--		
--int
--perl_back_open(
--	BackendInfo	*bi
--)
--{
--	char *embedding[] = { "", "-e", "0" };
- 
-+	// injecting code from perl_back_open, because using fonction reference  (bi->bi_open) is not fonctionnal
- 	Debug( LDAP_DEBUG_TRACE, "perl backend open\n", 0, 0, 0 );
- 
- 	if( PERL_INTERPRETER != NULL ) {
diff --git a/net/openldap23-server/files/patch-servers_slapd_back_perl_proto_perl.h b/net/openldap23-server/files/patch-servers_slapd_back_perl_proto_perl.h
deleted file mode 100644
index 19641ca1fae5..000000000000
--- a/net/openldap23-server/files/patch-servers_slapd_back_perl_proto_perl.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- servers/slapd/back-perl/proto-perl.h.orig	Fri Aug 18 16:05:27 2006
-+++ servers/slapd/back-perl/proto-perl.h	Fri Aug 18 16:05:40 2006
-@@ -22,7 +22,6 @@
- 
- extern BI_init		perl_back_initialize;
- 
--extern BI_open		perl_back_open;
- extern BI_close		perl_back_close;
- 
- extern BI_db_init	perl_back_db_init;