[Midnightbsd-cvs] mports: net/openldap23-server: update to 2.3.40

[laffer1 at midnightbsd.org]

Log Message:
-----------
update to 2.3.40

Modified Files:
--------------
    mports/net/openldap23-server:
        Makefile (r1.4 -> r1.5)
        distinfo (r1.2 -> r1.3)
    mports/net/openldap23-server/files:
        patch-servers_slapd_overlays_Makefile.in (r1.1 -> r1.2)
        slapd.sh.in (r1.1 -> r1.2)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/net/openldap23-server/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -L net/openldap23-server/Makefile -L net/openldap23-server/Makefile -u -r1.4 -r1.5
--- net/openldap23-server/Makefile
+++ net/openldap23-server/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=		openldap
-DISTVERSION=		2.3.30
+DISTVERSION=		2.3.40
 PORTREVISION=		${OPENLDAP_PORTREVISION}
 CATEGORIES=		net databases
 MASTER_SITES=		ftp://ftp.OpenLDAP.org/pub/OpenLDAP/%SUBDIR%/ \
@@ -79,6 +79,8 @@
 OPENLDAP_PKGFILESUFX=
 .endif
 
+CONFIGURE_SED=	-e 's,-kthread,${PTHREAD_LIBS},g'
+
 .include <bsd.port.pre.mk>
 
 .if defined(CLIENT_ONLY)
@@ -270,8 +272,9 @@
 			BACK_HDB="@comment "
 .else
 
-WITH_BDB_VER?=		43
+WITH_BDB_VER?=		44
 USE_BDB=		yes
+INVALID_BDB_VER=	46
 
 .if ${WITH_BDB_VER} >= 42
 CONFIGURE_ARGS+=	--enable-bdb=${BACKEND_ENABLE} \
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/net/openldap23-server/distinfo,v
retrieving revision 1.2
retrieving revision 1.3
diff -L net/openldap23-server/distinfo -L net/openldap23-server/distinfo -u -r1.2 -r1.3
--- net/openldap23-server/distinfo
+++ net/openldap23-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (openldap-2.3.30.tgz) = 1c0f108a94070edbb4915e7e40e1ce9c
-SHA256 (openldap-2.3.30.tgz) = 3b27a5666dbe4584612be443bfa636238a48f3c16a4dc8f43d59171e8697687b
-SIZE (openldap-2.3.30.tgz) = 3763533
+MD5 (openldap-2.3.40.tgz) = 728e95d806a3d47d9686481d72e62072
+SHA256 (openldap-2.3.40.tgz) = ea7251be452611dbca106a7981ff706bf998aac4def7c224c613c46b1629aa51
+SIZE (openldap-2.3.40.tgz) = 3803330
Index: slapd.sh.in
===================================================================
RCS file: /home/cvs/mports/net/openldap23-server/files/slapd.sh.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -L net/openldap23-server/files/slapd.sh.in -L net/openldap23-server/files/slapd.sh.in -u -r1.1 -r1.2
--- net/openldap23-server/files/slapd.sh.in
+++ net/openldap23-server/files/slapd.sh.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: ports/net/openldap23-server/files/slapd.sh.in,v 1.1 2006/05/18 15:03:48 delphij Exp $
+# $FreeBSD: ports/net/openldap23-server/files/slapd.sh.in,v 1.4 2007/12/11 20:56:10 delphij Exp $
 #
 
 # PROVIDE: slapd
@@ -43,16 +43,17 @@
 {
   local slapd_ownername slapd_groupname
 
-  case x"$slapd_owner" in
+  case "$slapd_owner" in
   ""|[Nn][Oo][Nn][Ee]|[Dd][Ee][Ff][Aa][Uu][Ll][Tt])
     ;;
   *)
     chown "$slapd_owner" "%%LDAP_RUN_DIR%%"
     chown -RL "$slapd_owner" "%%DATABASEDIR%%"
+    chmod 700 "%%DATABASEDIR%%"
     chown "$slapd_owner" "%%PREFIX%%/etc/openldap/slapd.conf"
 
-    slapd_ownername=`expr //"$slapd_owner" : //'\([^:]*\)'`
-    slapd_groupname=`expr //"$slapd_owner" : //'.*:\([^:]*\)'`
+    slapd_ownername="${slapd_owner%:*}"
+    slapd_groupname="${slapd_owner#*:}"
 
     if [ -n "$slapd_ownername" ]; then
       rc_flags="$rc_flags -u $slapd_ownername"
Index: patch-servers_slapd_overlays_Makefile.in
===================================================================
RCS file: /home/cvs/mports/net/openldap23-server/files/patch-servers_slapd_overlays_Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -L net/openldap23-server/files/patch-servers_slapd_overlays_Makefile.in -L net/openldap23-server/files/patch-servers_slapd_overlays_Makefile.in -u -r1.1 -r1.2
--- net/openldap23-server/files/patch-servers_slapd_overlays_Makefile.in
+++ net/openldap23-server/files/patch-servers_slapd_overlays_Makefile.in
@@ -1,9 +1,9 @@
---- servers/slapd/overlays/Makefile.in.orig	Fri Sep  2 03:28:11 2005
-+++ servers/slapd/overlays/Makefile.in	Sun Sep  4 16:11:22 2005
-@@ -30,6 +30,9 @@
- 	valsort.c
- OBJS = overlays.o \
- 	@SLAPD_STATIC_OVERLAYS@
+--- servers/slapd/overlays/Makefile.in.orig	2007-05-30 05:57:47.000000000 +0800
++++ servers/slapd/overlays/Makefile.in	2007-06-18 11:45:18.466193747 +0800
+@@ -32,6 +32,9 @@
+ OBJS = statover.o \
+ 	@SLAPD_STATIC_OVERLAYS@ \
+ 	overlays.o
 +LIBTOOL_OBJS = overlays.lo \
 +	       glue.lo \
 +	       version.lo