ports/135622: net/openldap2[34]-client: PKGNAME does not accurately reflect WITH_SASL

[Christian Ullrich]

>Number:         135622
>Category:       ports
>Synopsis:       net/openldap2[34]-client: PKGNAME does not accurately reflect WITH_SASL
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jun 16 09:40:01 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Christian Ullrich
>Release:        7.2
>Organization:
>Environment:
>Description:
There is a pair of slave ports for both version 2.3 and 2.4 of OpenLDAP, net/openldap*-{sasl-,}client, which build the client part of OpenLDAP either with or without SASL support, by defining either WITH_SASL or WITHOUT_SASL. The master, net/openldap*-server, determines the PKGNAME for the client builds based on whether WITH_SASL is defined.

On the other hand, whether to actually build in SASL is decided as (WITH_SASL && !WITHOUT_SASL). This logic must also be used for the PKGNAME: Until now, building net/openldap*-client WITH_SASL=yes will result in an openldap24-sasl-client package compiled without SASL support.

>How-To-Repeat:
make -C /usr/ports/net/openldap24-client BATCH=yes WITH_SASL=yes install
ldd /usr/local/bin/ldapsearch | grep sasl
>Fix:
While it may be a better solution to verify in the slave ports that only one of the knobs is in use, this patch at least fixes the PKGNAMEs.

--- net/openldap24-server/Makefile.orig 2009-06-16 11:19:10.000000000 +0200
+++ net/openldap24-server/Makefile      2009-06-16 11:19:22.000000000 +0200
@@ -95,7 +95,7 @@
 .include <bsd.port.pre.mk>

 .if defined(CLIENT_ONLY)
-.if defined(WITH_SASL)
+.if defined(WITH_SASL) && !defined(WITHOUT_SASL)
 PKGNAMESUFFIX=         -sasl-client
 COMMENT=               Open source LDAP client implementation with SASL2 support
 CONFLICTS=             ${PKGNAMEPREFIX}${PORTNAME}-client-2.* \
--- net/openldap23-server/Makefile.orig 2009-06-16 11:28:16.000000000 +0200
+++ net/openldap23-server/Makefile      2009-06-16 11:28:24.000000000 +0200
@@ -83,7 +83,7 @@
 .include <bsd.port.pre.mk>

 .if defined(CLIENT_ONLY)
-.if defined(WITH_SASL)
+.if defined(WITH_SASL) && !defined(WITHOUT_SASL)
 PKGNAMESUFFIX=         -sasl-client
 COMMENT=               Open source LDAP client implementation with SASL2 support
 CONFLICTS=             ${PKGNAMEPREFIX}${PORTNAME}-client-2.* \


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