- update to OpenLDAP 2.2.8:

  - fixed slapd/slapadd syncrepl bugs (ITS#2948,2995)
  - fixed slapd sasl-regexp multiple entry bug (ITS#3033)
  - fixed slapd bind method portability bug (ITS#3038)
  - fixed libldap try_read1msg bug (ITS#2982)
  - added slapd numericStringOrderingMatch rule support (ITS#2988)
  - added slurpd replication interval config option (ITS#2768)

  - shared library soname change (ITS#3035) postponed until bsd.port.mk is patched

- enabled hdb backend

- prefer autodetection over PTHREAD_LIBS from bsd.port.mk, to avoid problems
  of clients which crash on -CURRENT while loading/unloading threading libraries

- added -sasl as a build option to the package name
- made the server requiring the matching client library

3 files changed, 34 insertions, 8 deletions

diff --git a/net/openldap22-server/files/patch-build::ltmain.sh b/net/openldap22-server/files/patch-build::ltmain.sh
index 69915180c4d9..515dd96d8756 100644
--- a/net/openldap22-server/files/patch-build::ltmain.sh
+++ b/net/openldap22-server/files/patch-build::ltmain.sh
@@ -1,5 +1,5 @@
 --- build/ltmain.sh.orig	Thu Jan  1 19:16:25 2004
-+++ build/ltmain.sh	Thu Mar 25 11:55:10 2004
++++ build/ltmain.sh	Sun Mar 28 14:58:06 2004
 @@ -1076,7 +1076,7 @@
  	  esac
  	 elif test "X$arg" = "X-lc_r"; then
@@ -9,7 +9,20 @@
  	    # Do not include libc_r directly, use -pthread flag.
  	    continue
  	    ;;
-@@ -4296,10 +4296,17 @@
+@@ -1088,6 +1088,12 @@
+ 
+       -module)
+ 	module=yes
++	case $host in
++	*-*-freebsd*)
++	  # Do not build the useless static library
++	  build_old_libs=no
++	  ;;
++	esac
+ 	continue
+ 	;;
+ 
+@@ -4296,10 +4302,17 @@
  	fi
  
  	# Install the pseudo-library for information purposes.
diff --git a/net/openldap22-server/files/patch-build::top.mk b/net/openldap22-server/files/patch-build::top.mk
index 7eab45e9ea09..b6ec9f5e1657 100644
--- a/net/openldap22-server/files/patch-build::top.mk
+++ b/net/openldap22-server/files/patch-build::top.mk
@@ -1,15 +1,15 @@
---- build/top.mk.orig	Wed Mar 17 21:15:31 2004
-+++ build/top.mk	Wed Mar 24 03:37:31 2004
-@@ -68,7 +68,7 @@
- 
+--- build/top.mk.orig	Wed Mar 24 22:51:22 2004
++++ build/top.mk	Wed Mar 31 22:28:53 2004
+@@ -69,7 +69,7 @@
  LIBTOOL = @LIBTOOL@
+ LIBRELEASE = @OPENLDAP_LIBRELEASE@
  LIBVERSION = @OPENLDAP_LIBVERSION@
--LTVERSION = -release $(LIBVERSION)
+-LTVERSION = -release $(LIBRELEASE) -version-info $(LIBVERSION)
 +LTVERSION = -version-info $(LIBVERSION)
  
  # libtool --only flag for libraries: platform specific
  NT_LTONLY_LIB = # --only-$(BUILD_LIBS_DYNAMIC)
-@@ -190,6 +190,8 @@
+@@ -191,6 +191,8 @@
  
  SLAPD_LIBS = @SLAPD_LIBS@ @SLAPD_PERL_LDFLAGS@ @SLAPD_SQL_LDFLAGS@ @SLAPD_SQL_LIBS@ @SLAPD_SLP_LIBS@
  SLURPD_LIBS = @SLURPD_LIBS@
diff --git a/net/openldap22-server/files/patch-build::version.var b/net/openldap22-server/files/patch-build::version.var
new file mode 100644
index 000000000000..f4b6bc1ec6d5
--- /dev/null
+++ b/net/openldap22-server/files/patch-build::version.var
@@ -0,0 +1,13 @@
+--- build/version.var.orig	Fri Mar 26 20:28:33 2004
++++ build/version.var	Wed Mar 31 23:33:47 2004
+@@ -17,7 +17,7 @@
+ ol_minor=2
+ ol_patch=8
+ ol_api_inc=20208
+-ol_api_current=7
+-ol_api_revision=1
+-ol_api_age=0
++ol_api_current=202
++ol_api_revision=2
++ol_api_age=200
+ ol_release_date="2004/03/26"