Update to 2.4.26

With tweaks from gsoares@ (thanks).

looks good to sthen@, ok gsoares@

databases/openldap/Makefile

@@ -1,24 +1,23 @@
-# $OpenBSD: Makefile,v 1.107 2011/09/16 08:48:03 espie Exp $
+# $OpenBSD: Makefile,v 1.108 2011/09/21 14:07:47 pea Exp $
 
 COMMENT-main=	Open source LDAP software (client)
 COMMENT-server=	Open source LDAP software (server)
 
-DISTNAME=		openldap-2.4.25
+DISTNAME=		openldap-2.4.26
 PKGNAME-main=		${DISTNAME:S/-/-client-/}
 PKGNAME-server=		${DISTNAME:S/-/-server-/}
 
-REVISION-server=	2
-
-SHARED_LIBS +=	lber                 11.0      # .8.0
-SHARED_LIBS +=	ldap                 11.0      # .8.0
-SHARED_LIBS +=	ldap_r               11.0      # .8.0
-SHARED_LIBS +=	lber-2.4             11.0      # .8.0
-SHARED_LIBS +=	ldap-2.4             11.0      # .8.0
-SHARED_LIBS +=	ldap_r-2.4           11.0      # .8.0
+SHARED_LIBS +=	lber                 11.0      # .9.1
+SHARED_LIBS +=	ldap                 11.1      # .9.1
+SHARED_LIBS +=	ldap_r               11.1      # .9.1
+SHARED_LIBS +=	lber-2.4             11.0      # .9.1
+SHARED_LIBS +=	ldap-2.4             11.1      # .9.1
+SHARED_LIBS +=	ldap_r-2.4           11.1      # .9.1
 CATEGORIES=	databases net
 
 HOMEPAGE=	http://www.openldap.org/
 
+# OpenLDAP Public License
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes 
@@ -81,7 +80,7 @@ LIB_DEPENDS-server =	${LIB_DEPENDS-main} \
 			databases/db/v4
 
 CONFIGURE_ENV +=	CPPFLAGS="-I${LOCALBASE}/include/sasl -I${LOCALBASE}/include/db4 -I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib/db4 -L${LOCALBASE}/lib" 
+			LDFLAGS="-L${LOCALBASE}/lib/db4 -L${LOCALBASE}/lib"
 
 RUN_DEPENDS-server=	${BASE_PKGPATH}
 WANTLIB-server += 	${WANTLIB} perl util wrap m pthread icudata icuuc

databases/openldap/distinfo

@@ -1,5 +1,5 @@
-MD5 (openldap-2.4.25.tgz) = 7GP5wq3VnzI6BFkSiEaQWw==
-RMD160 (openldap-2.4.25.tgz) = MSFxGfmoJxIkC+4QwqNQyPNeC44=
-SHA1 (openldap-2.4.25.tgz) = Vu+vNlbMaNO1vmZCLAyJ8BBNcYM=
-SHA256 (openldap-2.4.25.tgz) = YVrMmXCuL2Errn6AEtY/MZTvAqKmOLwf2cp/MdhcEHU=
-SIZE (openldap-2.4.25.tgz) = 5250595
+MD5 (openldap-2.4.26.tgz) = 828whgMd1WrpT3Iv+ujfXg==
+RMD160 (openldap-2.4.26.tgz) = p09MsT7vKWeBo14SqNYhBMX8KOw=
+SHA1 (openldap-2.4.26.tgz) = 1xF5u89yEf7wvkXiN2bKEPpqac8=
+SHA256 (openldap-2.4.26.tgz) = H0IEjOu82GR8nFZvjwcJRhA6FXFzRZFezV/M++GafD0=
+SIZE (openldap-2.4.26.tgz) = 5250064

databases/openldap/patches/patch-configure_in

@@ -1,7 +1,7 @@
-$OpenBSD: patch-configure_in,v 1.2 2011/03/03 14:52:04 jasper Exp $
---- configure.in.orig	Mon Jan 31 21:51:37 2011
-+++ configure.in	Wed Mar  2 15:44:56 2011
-@@ -582,7 +582,7 @@ SLAPD_SQL_LIBS=
+$OpenBSD: patch-configure_in,v 1.3 2011/09/21 14:07:47 pea Exp $
+--- configure.in.orig	Thu Jun 30 12:13:36 2011
++++ configure.in	Thu Sep 15 11:44:28 2011
+@@ -584,7 +584,7 @@ SLAPD_SQL_LIBS=
  SLAPD_SQL_INCLUDES=
 
  KRB4_LIBS=
@@ -10,7 +10,7 @@ $OpenBSD: patch-configure_in,v 1.2 2011/03/03 14:52:04 jasper Exp $
  SASL_LIBS=
  TLS_LIBS=
  MODULES_LIBS=
-@@ -1908,6 +1908,7 @@ if test $ol_enable_wrappers != no ; then
+@@ -1910,6 +1910,7 @@ if test $ol_enable_wrappers != no ; then
  		save_LIBS="$LIBS"
  		LIBS="$LIBS -lwrap"
  		AC_LINK_IFELSE([AC_LANG_PROGRAM([[

databases/openldap/pkg/PLIST-main

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-main,v 1.5 2011/03/03 14:52:04 jasper Exp $
+@comment $OpenBSD: PLIST-main,v 1.6 2011/09/21 14:07:47 pea Exp $
 @pkgpath ${BASE_PKGPATH}
 bin/ldapadd
 @bin bin/ldapcompare
@@ -17,6 +17,7 @@ include/ldap_cdefs.h
 include/ldap_features.h
 include/ldap_schema.h
 include/ldap_utf8.h
+include/ldif.h
 include/slapi-plugin.h
 lib/liblber.a
 lib/liblber.la
@@ -113,6 +114,7 @@ lib/libldap_r.la
 @man man/man3/ldap_dn2dcedn.3
 @man man/man3/ldap_dn2str.3
 @man man/man3/ldap_dn2ufn.3
+@man man/man3/ldap_dnfree.3
 @man man/man3/ldap_dup.3
 @man man/man3/ldap_err2string.3
 @man man/man3/ldap_errlist.3