ports/135664: [PATCH]: bsd.ldap.mk: Detect flavour of installed openldap-client

[Yuri Pankov]

>Number:         135664
>Category:       ports
>Synopsis:       [PATCH]: bsd.ldap.mk: Detect flavour of installed openldap-client
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jun 17 10:40:01 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Yuri Pankov
>Release:        7.2-RELEASE
>Organization:
>Environment:
>Description:
Try to detect flavour of installed openldap-client package. This should at least fix dependency recording in case when we have openldap-sasl-client installed and we don't set WANT_OPENLDAP_SASL (WANT_* variables aren't supposed to be user-settable, are they?) (security/sudo, for example, building sudo using -DWITH_LDAP when we have openldap-sasl-client installed results in missing dependency).

Depends on ports/135663 (uses PKG_INFO).
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: bsd.ldap.mk
===================================================================
RCS file: /home/ncvs/ports/Mk/bsd.ldap.mk,v
retrieving revision 1.4
diff -u -r1.4 bsd.ldap.mk
--- bsd.ldap.mk	17 Feb 2009 02:54:37 -0000	1.4
+++ bsd.ldap.mk	17 Jun 2009 10:24:32 -0000
@@ -69,7 +69,8 @@
 .if defined(WANT_OPENLDAP_SASL)
 _OPENLDAP_FLAVOUR=	-sasl
 .else
-_OPENLDAP_FLAVOUR=
+# We should try to detect flavour of already installed openldap-client
+_OPENLDAP_FLAVOUR!=	${PKG_INFO} -Ex openldap.\*-client | ${SED} -e 's/openldap\(-sasl\)*-client-.*/\1/'
 .endif
 
 # And now we are checking if we can use it


>Release-Note:
>Audit-Trail:
>Unformatted: