From Joerg.Pulz@frm2.tum.de  Sat Apr 22 19:22:15 2006
Return-Path: <Joerg.Pulz@frm2.tum.de>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id AA00216A400
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 22 Apr 2006 19:22:15 +0000 (UTC)
	(envelope-from Joerg.Pulz@frm2.tum.de)
Received: from mailhost.frm2.tum.de (mailhost.frm2.tum.de [129.187.179.12])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 952C443D48
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 22 Apr 2006 19:22:11 +0000 (GMT)
	(envelope-from Joerg.Pulz@frm2.tum.de)
Received: from localhost (mailhost.frm2.tum.de [129.187.179.12])
	by mailhost.frm2.tum.de (8.13.4/8.13.4) with ESMTP id k3MJM86A006310
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 22 Apr 2006 21:22:08 +0200 (CEST)
	(envelope-from jpulz@frm2.tum.de)
Received: from hades.admin.frm2 (hades.admin.frm2 [172.25.1.10])
	by mailhost.frm2.tum.de (8.13.4/8.13.4) with ESMTP id k3MJM4MA006306
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT)
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 22 Apr 2006 21:22:05 +0200 (CEST)
	(envelope-from jpulz@frm2.tum.de)
Received: from hades.admin.frm2 (localhost [127.0.0.1])
	by hades.admin.frm2 (8.13.4/8.13.4) with ESMTP id k3MJM4mW066312
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 22 Apr 2006 21:22:04 +0200 (CEST)
	(envelope-from jpulz@frm2.tum.de)
Received: (from jpulz@localhost)
	by hades.admin.frm2 (8.13.4/8.13.4/Submit) id k3MJM4G0066311;
	Sat, 22 Apr 2006 21:22:04 +0200 (CEST)
	(envelope-from jpulz)
Message-Id: <200604221922.k3MJM4G0066311@hades.admin.frm2>
Date: Sat, 22 Apr 2006 21:22:04 +0200 (CEST)
From: Joerg Pulz <Joerg.Pulz@frm2.tum.de>
Reply-To: Joerg Pulz <Joerg.Pulz@frm2.tum.de>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: repo-copy: net/openldap23-* to net/openldap24-* to add openldap2.4.0alpha
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         96165
>Category:       ports
>Synopsis:       repo-copy: net/openldap23-* to net/openldap24-* to add openldap2.4.0alpha
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    delphij
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Apr 22 19:30:15 GMT 2006
>Closed-Date:    Fri May 26 02:52:37 GMT 2006
>Last-Modified:  Fri May 26 02:52:37 GMT 2006
>Originator:     Joerg Pulz
>Release:        FreeBSD 6.1-PRERELEASE i386
>Organization:
TU-Munich / ZWE FRM-II
>Environment:
System: FreeBSD hades.admin.frm2 6.1-PRERELEASE FreeBSD 6.1-PRERELEASE #11: Wed Feb 22 19:01:44 CET 2006 root@hades.admin.frm2:/usr/obj/usr/src/sys/HADES i386


	
>Description:
	OpenLDAP-2.4.0alpha is the first publically available release of the
	upcoming 2.4 series. It is meant as test-release for people who want to
	give the new features (overlays, backends and new LDAPv3 extensions) a
	try and should NOT be used in production environments.
	These ports are provided to keep up with the recent OpenLDAP development
	and to make sure that there will be good support for FreeBSD.
	The ports can, and should, also be used to test applications to make
	sure that they still work with the new version.

	Tested on:	RELENG_6_1 i386, amd64, sparc64
			CURRENT i386, amd64
>How-To-Repeat:
	
>Fix:

	repo-copy:
	  net/openldap23-server		-> net/openldap24-server
	  net/openldap23-client		-> net/openldap24-client
	  net/openldap23-sasl-client	-> net/openldap24-sasl-client

	- apply the attached patches to the repo-copied directories and
	  to Mk/bsd.port.mk

--- net_openldap24-server.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/net/openldap23-server/Makefile,v
retrieving revision 1.128
diff -u -r1.128 Makefile
--- Makefile	18 Apr 2006 14:08:35 -0000	1.128
+++ Makefile	22 Apr 2006 18:35:46 -0000
@@ -1,12 +1,12 @@
-# New ports collection makefile for:	openldap23-server
-# Date created:				02 May 2005
-# Whom:					Vsevolod Stakhov <vsevolod@highsecure.ru>
+# New ports collection makefile for:	openldap24-server
+# Date created:				22 Apr 2006
+# Whom:					Joerg Pulz <Joerg.Pulz@frm2.tum.de>
 #
-# $FreeBSD: ports/net/openldap23-server/Makefile,v 1.128 2006/04/18 14:08:35 sem Exp $
+# $FreeBSD$
 #
 
 PORTNAME=		openldap
-DISTVERSION=		2.3.21
+DISTVERSION=		2.4.0alpha
 PORTREVISION=		${OPENLDAP_PORTREVISION}
 CATEGORIES=		net databases
 MASTER_SITES=		ftp://ftp.OpenLDAP.org/pub/OpenLDAP/%SUBDIR%/ \
@@ -23,35 +23,40 @@
 			ftp://ftp.rediris.es/mirror/OpenLDAP/%SUBDIR%/ \
 			ftp://sunsite.cnlab-switch.ch/mirror/OpenLDAP/%SUBDIR%/ \
 			ftp://ftp.plig.org/pub/OpenLDAP/%SUBDIR%/
-MASTER_SITE_SUBDIR=	openldap-release
+MASTER_SITE_SUBDIR=	openldap-test
 PKGNAMESUFFIX?=		-server
 EXTRACT_SUFX=		.tgz
 
-MAINTAINER=		delphij@FreeBSD.org
+MAINTAINER=		Joerg.Pulz@frm2.tum.de
 COMMENT?=		Open source LDAP server implementation
 
-UNIQUENAME?=		${PKGNAMEPREFIX}openldap23
+UNIQUENAME?=		${PKGNAMEPREFIX}openldap24
 LATEST_LINK?=		${UNIQUENAME}${PKGNAMESUFFIX}
 
-WANT_OPENLDAP_VER?=	23
-.if ${WANT_OPENLDAP_VER} != 23
+WANT_OPENLDAP_VER?=	24
+.if ${WANT_OPENLDAP_VER} != 24
 BROKEN=			"incompatible OpenLDAP version: ${WANT_OPENLDAP_VER}"
 .endif
 
 PORTREVISION_CLIENT=	0
-PORTREVISION_SERVER=	2
+PORTREVISION_SERVER=	0
 
 .if !defined(CLIENT_ONLY)
 OPTIONS=	SASL "With (Cyrus) SASL2 support" on \
+		DNSSRV "With Dnssrv backend" off \
+		PASSWD "With Passwd backend" off \
 		PERL "With Perl backend" off \
+		RELAY "With Relay backend" off \
 		SHELL "With Shell backend" on \
 		ODBC "With SQL backend" off \
+		RLOOKUPS "With reverse lookups of client hostnames" off \
 		SLP "With SLPv2 (RFC 2608) support" off \
 		SLAPI "With Netscape SLAPI plugin API" off \
 		TCP_WRAPPERS "With tcp wrapper support" on \
 		BDB "With BerkeleyDB support" on \
 		ACCESSLOG "With In-Directory Access Logging overlay" off \
 		AUDITLOG "With Audit Logging overlay" off \
+		DDS "Dynamic Directory Services overlay" off \
 		DENYOP "With Deny Operation overlay" off \
 		DYNGROUP "With Dynamic Group overlay" off \
 		DYNLIST "With Dynamic List overlay" off \
@@ -61,11 +66,13 @@
 		REFINT "With Referential Integrity overlay" off \
 		RETCODE "With Return Code testing overlay" off \
 		RWM "With Rewrite/Remap overlay" off \
+		SEQMOD "Sequential Modify overlay" off \
 		SYNCPROV "With Syncrepl Provider overlay" off \
 		TRANSLUCENT "With Translucent Proxy overlay" off \
 		UNIQUE "With attribute Uniqueness overlay" off \
 		VALSORT "With Value Sorting overlay" off \
 		ACI "With per-object ACIs (experimental)" off \
+		DYNACL "With run-time loadable ACLs (experimental)" off \
 		DYNAMIC_BACKENDS "Build dynamic backends" on \
 		RCORDER "Add rc order for slapd(1)" off
 .endif
@@ -78,9 +85,9 @@
 
 .if ${PKGNAMESUFFIX} == "-sasl-client"
 CONFLICTS=		${PKGNAMEPREFIX}${PORTNAME}-client-2.* \
-			${PKGNAMEPREFIX}${PORTNAME}-sasl-client-2.[!3].*
+			${PKGNAMEPREFIX}${PORTNAME}-sasl-client-2.[!4].*
 .elif ${PKGNAMESUFFIX} == "-client"
-CONFLICTS=		${PKGNAMEPREFIX}${PORTNAME}-client-2.[!3].* \
+CONFLICTS=		${PKGNAMEPREFIX}${PORTNAME}-client-2.[!4].* \
 			${PKGNAMEPREFIX}${PORTNAME}-sasl-client-2.*
 .else
 BROKEN=			"Unknown PKGNAMESUFFIX ${PKGNAMESUFFIX}"
@@ -96,10 +103,10 @@
 OPENLDAP_PKGFILESUFX=
 
 .if defined(WITH_SASL) && !defined(WITHOUT_SASL)
-RUN_DEPENDS=		${LOCALBASE}/lib/libldap-2.3.so.2:${PORTSDIR}/net/openldap23-sasl-client
+RUN_DEPENDS=		${LOCALBASE}/lib/libldap-2.4.so.0:${PORTSDIR}/net/openldap24-sasl-client
 CONFLICTS=		${PKGNAMEPREFIX}${PORTNAME}-client-2.*
 .else
-RUN_DEPENDS=		${LOCALBASE}/lib/libldap-2.3.so.2:${PORTSDIR}/net/openldap23-client
+RUN_DEPENDS=		${LOCALBASE}/lib/libldap-2.4.so.0:${PORTSDIR}/net/openldap24-client
 CONFLICTS=		${PKGNAMEPREFIX}${PORTNAME}-sasl-client-2.*
 .endif
 
@@ -115,8 +122,8 @@
 PKGMESSAGE=		${WRKDIR}/pkg-message
 PKGDEINSTALL=		${WRKDIR}/pkg-deinstall
 
-SCHEMATA=		corba core cosine dyngroup \
-			inetorgperson java misc \
+SCHEMATA=		collective corba core cosine duaconf dyngroup \
+			inetorgperson java misc nadf \
 			nis openldap ppolicy
 
 LDAP_RUN_DIR?=		/var/run/openldap
@@ -185,7 +192,6 @@
 .endif
 
 CONFIGURE_ARGS+=	--localstatedir=${LOCALSTATEDIR} \
-			--enable-ldbm=${BACKEND_ENABLE} \
 			--enable-crypt \
 			--enable-lmpasswd \
 			--enable-ldap=${BACKEND_ENABLE} \
@@ -204,6 +210,10 @@
 CONFIGURE_ARGS+=	--enable-auditlog
 .endif
 
+.if defined(WITH_DDS)
+CONFIGURE_ARGS+=	--enable-dds
+.endif
+
 .if defined(WITH_DENYOP)
 CONFIGURE_ARGS+=	--enable-denyop
 .endif
@@ -240,6 +250,10 @@
 CONFIGURE_ARGS+=	--enable-rwm
 .endif
 
+.if defined(WITH_SEQMOD)
+CONFIGURE_ARGS+=	--enable-seqmod
+.endif
+
 .if defined(WITH_SYNCPROV)
 CONFIGURE_ARGS+=	--enable-syncprov
 .else
@@ -262,17 +276,26 @@
 CONFIGURE_ARGS+=	--enable-aci
 .endif
 
+.if defined(WITH_DYNACL)
+CONFIGURE_ARGS+=	--enable-dynacl
+.endif
+
 .if defined(WITHOUT_BDB)
 CONFIGURE_ARGS+=	--disable-bdb \
-			--disable-hdb \
-			--enable-ldbm-api=bcompat
+			--disable-hdb
 PLIST_SUB+=		BACK_BDB="@comment " \
 			BACK_HDB="@comment "
 .else
 
 WITH_BDB_VER?=		43
 
-.if ${WITH_BDB_VER} == 43
+.if ${WITH_BDB_VER} == 44
+CONFIGURE_ARGS+=	--enable-bdb=${BACKEND_ENABLE} \
+			--enable-hdb=${BACKEND_ENABLE}
+PLIST_SUB+=		BACK_BDB=${BACKEND_PLIST} \
+			BACK_HDB=${BACKEND_PLIST}
+BDBLIB=			db-4.4.0
+.elif ${WITH_BDB_VER} == 43
 CONFIGURE_ARGS+=	--enable-bdb=${BACKEND_ENABLE} \
 			--enable-hdb=${BACKEND_ENABLE}
 PLIST_SUB+=		BACK_BDB=${BACKEND_PLIST} \
@@ -303,16 +326,36 @@
 			BACK_HDB="@comment "
 BDBLIB=			db3.3
 .else
-IGNORE=			: WITH_BDB_VER must be 3, 4, 41, 42 or 43
+IGNORE=			: WITH_BDB_VER must be 3, 4, 41, 42, 43 or 44
 .endif
 
 LIB_DEPENDS+=		${BDBLIB}:${PORTSDIR}/databases/db${WITH_BDB_VER}
 CPPFLAGS+=		-I${LOCALBASE}/include/db${WITH_BDB_VER}
-CONFIGURE_ARGS+=	--enable-ldbm-api=berkeley
 CONFIGURE_SED+=		-e 's,ol_DB_LIB=$$,&-l${BDBLIB:R},' \
 			-e 's,(ol_cv_lib_db=)yes$$,\1-l${BDBLIB:R},'
 .endif
 
+.if defined(WITH_DNSSRV)
+CONFIGURE_ARGS+=	--enable-dnssrv=${BACKEND_ENABLE}
+PLIST_SUB+=		BACK_DNSSRV=${BACKEND_PLIST}
+.else
+PLIST_SUB+=		BACK_DNSSRV="@comment "
+.endif
+
+.if defined(WITH_PASSWD)
+CONFIGURE_ARGS+=	--enable-passwd=${BACKEND_ENABLE}
+PLIST_SUB+=		BACK_PASSWD=${BACKEND_PLIST}
+.else
+PLIST_SUB+=		BACK_PASSWD="@comment "
+.endif
+
+.if defined(WITH_RELAY)
+CONFIGURE_ARGS+=	--enable-relay=${BACKEND_ENABLE}
+PLIST_SUB+=		BACK_RELAY=${BACKEND_PLIST}
+.else
+PLIST_SUB+=		BACK_RELAY="@comment "
+.endif
+
 .if defined(WITHOUT_SHELL)
 PLIST_SUB+=		BACK_SHELL="@comment "
 .else
@@ -348,6 +391,13 @@
 PLIST_SUB+=		BACK_SQL="@comment "
 .endif
 
+.if defined(WITH_RLOOKUPS)
+CONFIGURE_ARGS+=	--enable-rlookups
+PLIST_SUB+=		RLOOKUPS=""
+.else
+PLIST_SUB+=		RLOOKUPS="@comment "
+.endif
+
 .if defined(WITH_SLAPI)
 CONFIGURE_ARGS+=	--enable-slapi
 PLIST_SUB+=		SLAPI=""
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/net/openldap23-server/distinfo,v
retrieving revision 1.60
diff -u -r1.60 distinfo
--- distinfo	15 Apr 2006 20:34:27 -0000	1.60
+++ distinfo	22 Apr 2006 18:35:46 -0000
@@ -1,3 +1,3 @@
-MD5 (openldap-2.3.21.tgz) = 37ef142fc05abd088a4bb2d30dc4c679
-SHA256 (openldap-2.3.21.tgz) = 12204e82276036742f4595122ca2c4ca173e7144a449f1d6d4950273c94a0ef5
-SIZE (openldap-2.3.21.tgz) = 3750778
+MD5 (openldap-2.4.0alpha.tgz) = 71437ee9df3f04b78365a206209f1675
+SHA256 (openldap-2.4.0alpha.tgz) = ab31b30d1af2657525a158aa09f0d22d8e20f5207b0f0a930343be6d1a50451e
+SIZE (openldap-2.4.0alpha.tgz) = 3795685
Index: pkg-deinstall
===================================================================
RCS file: /home/ncvs/ports/net/openldap23-server/pkg-deinstall,v
retrieving revision 1.3
diff -u -r1.3 pkg-deinstall
--- pkg-deinstall	5 May 2005 00:53:44 -0000	1.3
+++ pkg-deinstall	22 Apr 2006 18:35:46 -0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: ports/net/openldap23-server/pkg-deinstall,v 1.3 2005/05/05 00:53:44 edwin Exp $
+# $FreeBSD$
 #
 
 ECHO_CMD=echo
Index: pkg-install
===================================================================
RCS file: /home/ncvs/ports/net/openldap23-server/pkg-install,v
retrieving revision 1.10
diff -u -r1.10 pkg-install
--- pkg-install	5 May 2005 00:53:44 -0000	1.10
+++ pkg-install	22 Apr 2006 18:35:46 -0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: ports/net/openldap23-server/pkg-install,v 1.10 2005/05/05 00:53:44 edwin Exp $
+# $FreeBSD$
 #
 
 CHOWN=/usr/sbin/chown
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/net/openldap23-server/pkg-plist,v
retrieving revision 1.35
diff -u -r1.35 pkg-plist
--- pkg-plist	23 Feb 2006 10:38:25 -0000	1.35
+++ pkg-plist	22 Apr 2006 18:35:46 -0000
@@ -1,4 +1,4 @@
-@comment $FreeBSD: ports/net/openldap23-server/pkg-plist,v 1.35 2006/02/23 10:38:25 ade Exp $
+@comment $FreeBSD$
 @unexec %%RC_DIR%%/etc/rc.d/slapd%%RC_SUFX%% stop 2>&1 >/dev/null || true
 @unexec %%RC_DIR%%/etc/rc.d/slurpd%%RC_SUFX%% stop 2>&1 >/dev/null || true
 etc/openldap/schema/README
@@ -11,47 +11,55 @@
 %%SLAPI%%lib/libslapi.a
 %%SLAPI%%lib/libslapi.la
 %%SLAPI%%lib/libslapi.so
-%%SLAPI%%lib/libslapi-2.3.so
-%%SLAPI%%lib/libslapi-2.3.so.2
+%%SLAPI%%lib/libslapi-2.4.so
+%%SLAPI%%lib/libslapi-2.4.so.0
 %%MODULES%%@exec mkdir -p %D/libexec/openldap
-%%BACK_BDB%%libexec/openldap/back_bdb-2.3.so
-%%BACK_BDB%%libexec/openldap/back_bdb-2.3.so.2
+%%BACK_BDB%%libexec/openldap/back_bdb-2.4.so
+%%BACK_BDB%%libexec/openldap/back_bdb-2.4.so.0
 %%BACK_BDB%%libexec/openldap/back_bdb.la
 %%BACK_BDB%%libexec/openldap/back_bdb.so
-%%BACK_HDB%%libexec/openldap/back_hdb-2.3.so
-%%BACK_HDB%%libexec/openldap/back_hdb-2.3.so.2
+%%BACK_HDB%%libexec/openldap/back_hdb-2.4.so
+%%BACK_HDB%%libexec/openldap/back_hdb-2.4.so.0
 %%BACK_HDB%%libexec/openldap/back_hdb.la
 %%BACK_HDB%%libexec/openldap/back_hdb.so
-%%BACKEND%%libexec/openldap/back_ldap-2.3.so
-%%BACKEND%%libexec/openldap/back_ldap-2.3.so.2
+%%BACKEND%%libexec/openldap/back_ldap-2.4.so
+%%BACKEND%%libexec/openldap/back_ldap-2.4.so.0
 %%BACKEND%%libexec/openldap/back_ldap.la
 %%BACKEND%%libexec/openldap/back_ldap.so
-%%BACKEND%%libexec/openldap/back_ldbm-2.3.so
-%%BACKEND%%libexec/openldap/back_ldbm-2.3.so.2
-%%BACKEND%%libexec/openldap/back_ldbm.la
-%%BACKEND%%libexec/openldap/back_ldbm.so
-%%BACKEND%%libexec/openldap/back_meta-2.3.so
-%%BACKEND%%libexec/openldap/back_meta-2.3.so.2
+%%BACKEND%%libexec/openldap/back_meta-2.4.so
+%%BACKEND%%libexec/openldap/back_meta-2.4.so.0
 %%BACKEND%%libexec/openldap/back_meta.la
 %%BACKEND%%libexec/openldap/back_meta.so
-%%BACKEND%%libexec/openldap/back_monitor-2.3.so
-%%BACKEND%%libexec/openldap/back_monitor-2.3.so.2
+%%BACKEND%%libexec/openldap/back_monitor-2.4.so
+%%BACKEND%%libexec/openldap/back_monitor-2.4.so.0
 %%BACKEND%%libexec/openldap/back_monitor.la
 %%BACKEND%%libexec/openldap/back_monitor.so
-%%BACKEND%%libexec/openldap/back_null-2.3.so
-%%BACKEND%%libexec/openldap/back_null-2.3.so.2
+%%BACKEND%%libexec/openldap/back_null-2.4.so
+%%BACKEND%%libexec/openldap/back_null-2.4.so.0
 %%BACKEND%%libexec/openldap/back_null.la
 %%BACKEND%%libexec/openldap/back_null.so
-%%BACK_PERL%%libexec/openldap/back_perl-2.3.so
-%%BACK_PERL%%libexec/openldap/back_perl-2.3.so.2
+%%BACK_DNSSRV%%libexec/openldap/back_dnssrv-2.4.so
+%%BACK_DNSSRV%%libexec/openldap/back_dnssrv-2.4.so.0
+%%BACK_DNSSRV%%libexec/openldap/back_dnssrv.la
+%%BACK_DNSSRV%%libexec/openldap/back_dnssrv.so
+%%BACK_PASSWD%%libexec/openldap/back_passwd-2.4.so
+%%BACK_PASSWD%%libexec/openldap/back_passwd-2.4.so.0
+%%BACK_PASSWD%%libexec/openldap/back_passwd.la
+%%BACK_PASSWD%%libexec/openldap/back_passwd.so
+%%BACK_PERL%%libexec/openldap/back_perl-2.4.so
+%%BACK_PERL%%libexec/openldap/back_perl-2.4.so.0
 %%BACK_PERL%%libexec/openldap/back_perl.la
 %%BACK_PERL%%libexec/openldap/back_perl.so
-%%BACK_SHELL%%libexec/openldap/back_shell-2.3.so
-%%BACK_SHELL%%libexec/openldap/back_shell-2.3.so.2
+%%BACK_RELAY%%libexec/openldap/back_relay-2.4.so
+%%BACK_RELAY%%libexec/openldap/back_relay-2.4.so.0
+%%BACK_RELAY%%libexec/openldap/back_relay.la
+%%BACK_RELAY%%libexec/openldap/back_relay.so
+%%BACK_SHELL%%libexec/openldap/back_shell-2.4.so
+%%BACK_SHELL%%libexec/openldap/back_shell-2.4.so.0
 %%BACK_SHELL%%libexec/openldap/back_shell.la
 %%BACK_SHELL%%libexec/openldap/back_shell.so
-%%BACK_SQL%%libexec/openldap/back_sql-2.3.so
-%%BACK_SQL%%libexec/openldap/back_sql-2.3.so.2
+%%BACK_SQL%%libexec/openldap/back_sql-2.4.so
+%%BACK_SQL%%libexec/openldap/back_sql-2.4.so.0
 %%BACK_SQL%%libexec/openldap/back_sql.la
 %%BACK_SQL%%libexec/openldap/back_sql.so
 libexec/slapd
Index: pkg-plist.client
===================================================================
RCS file: /home/ncvs/ports/net/openldap23-server/pkg-plist.client,v
retrieving revision 1.13
diff -u -r1.13 pkg-plist.client
--- pkg-plist.client	23 Feb 2006 10:38:26 -0000	1.13
+++ pkg-plist.client	22 Apr 2006 18:35:46 -0000
@@ -1,7 +1,8 @@
-@comment $FreeBSD: ports/net/openldap23-server/pkg-plist.client,v 1.13 2006/02/23 10:38:26 ade Exp $
+@comment $FreeBSD$
 bin/ldapadd
 bin/ldapcompare
 bin/ldapdelete
+bin/ldapexop
 bin/ldapmodify
 bin/ldapmodrdn
 bin/ldappasswd
@@ -19,18 +20,18 @@
 include/ldap_schema.h
 include/ldap_utf8.h
 include/slapi-plugin.h
-lib/liblber-2.3.so
-lib/liblber-2.3.so.2
+lib/liblber-2.4.so
+lib/liblber-2.4.so.0
 lib/liblber.a
 lib/liblber.la
 lib/liblber.so
-lib/libldap-2.3.so
-lib/libldap-2.3.so.2
+lib/libldap-2.4.so
+lib/libldap-2.4.so.0
 lib/libldap.a
 lib/libldap.la
 lib/libldap.so
-lib/libldap_r-2.3.so
-lib/libldap_r-2.3.so.2
+lib/libldap_r-2.4.so
+lib/libldap_r-2.4.so.0
 lib/libldap_r.a
 lib/libldap_r.la
 lib/libldap_r.so
Index: files/manpages
===================================================================
RCS file: /home/ncvs/ports/net/openldap23-server/files/manpages,v
retrieving revision 1.15
diff -u -r1.15 manpages
--- files/manpages	12 Oct 2005 12:43:57 -0000	1.15
+++ files/manpages	22 Apr 2006 18:35:46 -0000
@@ -1,5 +1,5 @@
 #
-# $FreeBSD: ports/net/openldap23-server/files/manpages,v 1.15 2005/10/12 12:43:57 vsevolod Exp $
+# $FreeBSD$
 #
 
 MAN1+=	ldapcompare.1 \
@@ -23,6 +23,7 @@
 	ldap_compare.3 \
 	ldap_delete.3 \
 	ldap_error.3 \
+	ldap_extended_operation.3 \
 	ldap_first_attribute.3 \
 	ldap_first_entry.3 \
 	ldap_first_message.3 \
@@ -34,6 +35,9 @@
 	ldap_open.3 \
 	ldap_parse_reference.3 \
 	ldap_parse_result.3 \
+	ldap_parse_sort_control.3 \
+	ldap_parse_vlv_control.3 \
+	ldap_rename.3 \
 	ldap_result.3 \
 	ldap_schema.3 \
 	ldap_search.3 \
@@ -180,7 +184,6 @@
 	slapd-relay.5 \
 	slapd-shell.5 \
 	slapd-sql.5 \
-	slapd-tcl.5 \
 	slapd.access.5 \
 	slapd.conf.5 \
 	slapd.plugin.5 \
@@ -188,6 +191,7 @@
 	slapo-accesslog.5 \
 	slapo-auditlog.5 \
 	slapo-chain.5 \
+	slapo-dds.5 \
 	slapo-dynlist.5 \
 	slapo-lastmod.5 \
 	slapo-pcache.5 \
Index: files/slapd.sh
===================================================================
RCS file: /home/ncvs/ports/net/openldap23-server/files/slapd.sh,v
retrieving revision 1.17
diff -u -r1.17 slapd.sh
--- files/slapd.sh	20 Feb 2006 20:47:27 -0000	1.17
+++ files/slapd.sh	22 Apr 2006 18:35:46 -0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: ports/net/openldap23-server/files/slapd.sh,v 1.17 2006/02/20 20:47:27 dougb Exp $
+# $FreeBSD$
 #
 
 # PROVIDE: slapd
Index: files/slurpd.sh
===================================================================
RCS file: /home/ncvs/ports/net/openldap23-server/files/slurpd.sh,v
retrieving revision 1.11
diff -u -r1.11 slurpd.sh
--- files/slurpd.sh	20 Feb 2006 20:47:27 -0000	1.11
+++ files/slurpd.sh	22 Apr 2006 18:35:46 -0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: ports/net/openldap23-server/files/slurpd.sh,v 1.11 2006/02/20 20:47:27 dougb Exp $
+# $FreeBSD$
 #
 
 # PROVIDE: slurpd
--- net_openldap24-server.diff ends here ---

--- net_openldap24-client.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/net/openldap23-client/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- Makefile	15 Sep 2005 11:47:24 -0000	1.5
+++ Makefile	22 Apr 2006 18:32:10 -0000
@@ -1,8 +1,8 @@
-# New ports collection makefile for:	openldap23-client
-# Date created:				02 May 2005
-# Whom:					Vsevolod Stakhov <vsevolod@highsecure.ru>
+# New ports collection makefile for:	openldap24-client
+# Date created:				22 Apr 2006
+# Whom:					Joerg Pulz <Joerg.Pulz@frm2.tum.de>
 #
-# $FreeBSD: ports/net/openldap23-client/Makefile,v 1.5 2005/09/15 11:47:24 vsevolod Exp $
+# $FreeBSD$
 #
 
 PKGNAMESUFFIX=		-client
@@ -12,6 +12,6 @@
 CLIENT_ONLY=		yes
 WITHOUT_SASL=		yes
 
-MASTERDIR=		${.CURDIR}/../openldap23-server
+MASTERDIR=		${.CURDIR}/../openldap24-server
 
 .include "${MASTERDIR}/Makefile"
--- net_openldap24-client.diff ends here ---

--- net_openldap24-sasl-client.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/net/openldap23-sasl-client/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- Makefile	5 May 2005 00:53:43 -0000	1.4
+++ Makefile	22 Apr 2006 18:32:36 -0000
@@ -1,8 +1,8 @@
-# New ports collection makefile for:	openldap23-sasl-client
-# Date created:				02 May 2005
-# Whom:					Vsevolod Stakhov <vsevolod@highsecure.ru>
+# New ports collection makefile for:	openldap24-sasl-client
+# Date created:				22 Apr 2006
+# Whom:					Joerg Pulz <Joerg.Pulz@frm2.tum.de>
 #
-# $FreeBSD: ports/net/openldap23-sasl-client/Makefile,v 1.4 2005/05/05 00:53:43 edwin Exp $
+# $FreeBSD$
 #
 
 PKGNAMESUFFIX=		-sasl-client
@@ -12,6 +12,6 @@
 CLIENT_ONLY=		yes
 WITH_SASL=		yes
 
-MASTERDIR=		${.CURDIR}/../openldap23-server
+MASTERDIR=		${.CURDIR}/../openldap24-server
 
 .include "${MASTERDIR}/Makefile"
--- net_openldap24-sasl-client.diff ends here ---

--- Mk_bsd.port.mk.diff begins here ---
Index: bsd.port.mk
===================================================================
RCS file: /home/ncvs/ports/Mk/bsd.port.mk,v
retrieving revision 1.529
diff -u -r1.529 bsd.port.mk
--- bsd.port.mk	23 Feb 2006 15:37:20 -0000	1.529
+++ bsd.port.mk	22 Apr 2006 18:39:45 -0000
@@ -1512,6 +1512,8 @@
 LIB_DEPENDS+=		ldap-2.2.7:${PORTSDIR}/net/openldap22${_OPENLDAP_FLAVOUR}-client
 .elif ${WANT_OPENLDAP_VER} == 23
 LIB_DEPENDS+=		ldap-2.3.2:${PORTSDIR}/net/openldap23${_OPENLDAP_FLAVOUR}-client
+.elif ${WANT_OPENLDAP_VER} == 24
+LIB_DEPENDS+=		ldap-2.4.0:${PORTSDIR}/net/openldap24${_OPENLDAP_FLAVOUR}-client
 .else
 BROKEN=				unknown OpenLDAP version: ${WANT_OPENLDAP_VER}
 .endif
--- Mk_bsd.port.mk.diff ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->delphij 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sat Apr 22 22:26:46 UTC 2006 
Responsible-Changed-Why:  
Over to maintainer 

http://www.freebsd.org/cgi/query-pr.cgi?pr=96165 
State-Changed-From-To: open->repocopy 
State-Changed-By: delphij 
State-Changed-When: Sun Apr 23 06:48:30 UTC 2006 
State-Changed-Why:  
Repocopy request, assign to portmgr@ 


Responsible-Changed-From-To: delphij->portmgr 
Responsible-Changed-By: delphij 
Responsible-Changed-When: Sun Apr 23 06:48:30 UTC 2006 
Responsible-Changed-Why:  
Repocopy request, assign to portmgr@ 

http://www.freebsd.org/cgi/query-pr.cgi?pr=96165 
State-Changed-From-To: repocopy->open 
State-Changed-By: marcus 
State-Changed-When: Sat Apr 29 21:36:26 UTC 2006 
State-Changed-Why:  
Repocopies completed. 


Responsible-Changed-From-To: portmgr->delphij 
Responsible-Changed-By: marcus 
Responsible-Changed-When: Sat Apr 29 21:36:26 UTC 2006 
Responsible-Changed-Why:  
Repocopies completed. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=96165 
State-Changed-From-To: open->analyzed 
State-Changed-By: delphij 
State-Changed-When: Tue May 16 15:56:54 UTC 2006 
State-Changed-Why:  
Make a note that the update would happen after ports/91902, 
ports/96752 and some other glitches were taken into account, 
and not being forgotten. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=96165 

From: Joerg Pulz <Joerg.Pulz@frm2.tum.de>
To: bug-followup@FreeBSD.org, Xin LI <delphij@FreeBSD.org>
Cc:  
Subject: Re: ports/96165: repo-copy: net/openldap23-* to net/openldap24-* to
 add openldap2.4.0alpha
Date: Tue, 16 May 2006 21:20:21 +0200 (CEST)

 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
 
 Hi,
 
 please drop me a short note, when you have finished your work and it is 
 committed.
 I will make a new patch afterwards, based on your changes to the 
 openldap23-* ports, as the 2.4.0alpha release will be outdated very soon, 
 the distfile for 2.4.1alpha is already created and downloadable, and the 
 announcement should follow very soon.
 
 Thanks for all the hard work
 Joerg
 
 - -- 
 The beginning is the most important part of the work.
  				-Plato
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (FreeBSD)
 
 iD8DBQFEaiX4SPOsGF+KA+MRAgwXAJ4yrEYSLnMNv2VONTtm95p51tJ+9wCgkTCC
 +gNbCSGp1DGZGRWQ6po9Aq4=
 =rnT+
 -----END PGP SIGNATURE-----
State-Changed-From-To: analyzed->feedback 
State-Changed-By: delphij 
State-Changed-When: Thu May 18 17:20:17 UTC 2006 
State-Changed-Why:  
Awaiting feedback for recent OpenLDAP upgrade and the port skeleton update. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=96165 
State-Changed-From-To: feedback->closed 
State-Changed-By: delphij 
State-Changed-When: Fri May 26 02:51:20 UTC 2006 
State-Changed-Why:  
Feedback timeout.  I have committed an update to a newer 
OpenLDAP version and merged my 2.3.x changes together, 
which is based on your patch.  Thanks for your submission! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=96165 
>Unformatted:
