ports/74069: security/cyrus-sasl: Fix build with OpenLDAP2

[Ceri Davies]

>Number:         74069
>Category:       ports
>Synopsis:       security/cyrus-sasl: Fix build with OpenLDAP2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Thu Nov 18 12:40:25 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Ceri Davies
>Release:        FreeBSD 4.10-STABLE i386
>Organization:
Submonkey
>Environment:
System: FreeBSD shrike.private.submonkey.net 4.10-STABLE FreeBSD 4.10-STABLE #45: Sun Sep 12 17:50:50 BST 2004 setantae at shrike.private.submonkey.net:/usr/obj/usr/src/sys/SHRIKE i386

	
>Description:

	security/cyrus-sasl does not currently build when OpenLDAP2
	support is desired.

>How-To-Repeat:

	cd /usr/ports/security/cyrus-sasl; make install
	Choose OpenLDAP2 in the config box, watch it fail trying to
	install openldap20-client.

>Fix:
	Ugly patch attached.

Index: scripts/configure.sasl
===================================================================
RCS file: /home/ncvs/ports/security/cyrus-sasl/scripts/configure.sasl,v
retrieving revision 1.20
diff -u -r1.20 configure.sasl
--- scripts/configure.sasl	15 Aug 2003 00:49:30 -0000	1.20
+++ scripts/configure.sasl	18 Nov 2004 12:28:13 -0000
@@ -47,10 +47,10 @@
 		SET_MYSQL="OFF"
 	fi
 
-	#Perfer LDAP2 over LDAP1
+	#Prefer LDAP2 over LDAP1
 	SET_LDAP1="OFF"
 	SET_LDAP2="OFF"
-	if [ "${WITH_LDAP2}" -o -f ${PREFIX}/lib/libldap.so.2 -a -f ${PREFIX}/lib/liblber.so.2 ] ; then
+	if [ "${WITH_LDAP2}" -o -f ${PREFIX}/lib/libldap-2.2.so -a -f ${PREFIX}/lib/liblber-2.2.so ] ; then
 		SET_LDAP2="ON"
 	elif [ "${WITH_LDAP1}" -o -f ${PREFIX}/lib/libldap.so.1 -a -f ${PREFIX}/lib/liblber.so.1 ]; then
 		SET_LDAP1="ON"
@@ -155,8 +155,8 @@
 				rm -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
 				exit 1
 			fi
-			echo "LIB_DEPENDS+=	ldap.2:\${PORTSDIR}/net/openldap20-client"
-			echo "LIB_DEPENDS+=	lber.2:\${PORTSDIR}/net/openldap20-client"
+			echo "LIB_DEPENDS+=	ldap-2.2:\${PORTSDIR}/net/openldap22-client"
+			echo "LIB_DEPENDS+=	lber-2.2:\${PORTSDIR}/net/openldap22-client"
 			echo "CONFIGURE_ARGS+=	--with-ldap=\${PREFIX}"
 			LDAP_REQ=ldap
 			OPENLDAP=1
>Release-Note:
>Audit-Trail:
>Unformatted: