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

[laffer1 at midnightbsd.org]

Log Message:
-----------
update to 2.3.41

Modified Files:
--------------
    mports/net/openldap23-server:
        Makefile (r1.5 -> r1.6)
        distinfo (r1.3 -> r1.4)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/net/openldap23-server/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -L net/openldap23-server/Makefile -L net/openldap23-server/Makefile -u -r1.5 -r1.6
--- net/openldap23-server/Makefile
+++ net/openldap23-server/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=		openldap
-DISTVERSION=		2.3.40
+DISTVERSION=		2.3.41
 PORTREVISION=		${OPENLDAP_PORTREVISION}
 CATEGORIES=		net databases
 MASTER_SITES=		ftp://ftp.OpenLDAP.org/pub/OpenLDAP/%SUBDIR%/ \
@@ -43,7 +43,7 @@
 PORTREVISION_SERVER=	0
 
 .if !defined(CLIENT_ONLY)
-OPTIONS=	SASL "With (Cyrus) SASL2 support" on \
+OPTIONS=	SASL "With (Cyrus) SASL2 support" off \
 		PERL "With Perl backend" off \
 		SHELL "With Shell backend (disables threading)" off \
 		ODBC "With SQL backend" off \
@@ -107,6 +107,7 @@
 
 .if defined(WITH_SASL) && !defined(WITHOUT_SASL)
 WANT_OPENLDAP_SASL=	yes
+PKGNAMESUFFIX=		-sasl-server
 CONFLICTS=		${PKGNAMEPREFIX}${PORTNAME}-client-2.*
 .else
 CONFLICTS=		${PKGNAMEPREFIX}${PORTNAME}-sasl-client-2.*
@@ -161,6 +162,7 @@
 .else
 # server specific configuration
 
+USE_LDCONFIG=		${PREFIX}/libexec/openldap
 SUB_FILES+=		pkg-deinstall pkg-message pkg-install
 USE_RC_SUBR=		slapd.sh ${SLURPDSH}
 
@@ -320,6 +322,14 @@
 CONFIGURE_ARGS+=	--enable-spasswd
 .endif
 
+.if defined(WITH_IODBC) && defined(WITH_UNIXODBC)
+IGNORE=               selected mutually exclusive options: WITH_IODBC and WITH_UNIXODBC
+.endif
+
+.if !defined(WITH_IODBC) && !defined(WITH_UNIXODBC)
+WITH_IODBC?=  yes
+.endif
+
 .if defined(WITH_ODBC)
 CONFIGURE_ARGS+=	--enable-sql=${BACKEND_ENABLE}
 PLIST_SUB+=		BACK_SQL=${BACKEND_PLIST}
@@ -383,7 +393,7 @@
 .else
 RC_SUFX=
 SUB_LIST+=		RC_DIR=${PREFIX} \
-			RC_SUFX=${RC_SUFX} \
+			RC_SUFX=${RC_SUBR_SUFFIX} \
 			LDAP_RUN_DIR=${LDAP_RUN_DIR} \
 			DATABASEDIR=${DATABASEDIR}
 .endif
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/net/openldap23-server/distinfo,v
retrieving revision 1.3
retrieving revision 1.4
diff -L net/openldap23-server/distinfo -L net/openldap23-server/distinfo -u -r1.3 -r1.4
--- net/openldap23-server/distinfo
+++ net/openldap23-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (openldap-2.3.40.tgz) = 728e95d806a3d47d9686481d72e62072
-SHA256 (openldap-2.3.40.tgz) = ea7251be452611dbca106a7981ff706bf998aac4def7c224c613c46b1629aa51
-SIZE (openldap-2.3.40.tgz) = 3803330
+MD5 (openldap-2.3.41.tgz) = 7551b72365f87eeaa3a334c8b3029403
+SHA256 (openldap-2.3.41.tgz) = 56fd1ee690df2d1ff164f6ba554fedfcfc13049d95dbdc440af11e56b0dfea0a
+SIZE (openldap-2.3.41.tgz) = 3800142