Bug 135622
| Summary: | net/openldap2[34]-client: PKGNAME does not accurately reflect WITH_SASL | ||||||
|---|---|---|---|---|---|---|---|
| Product: | Ports & Packages | Reporter: | Christian Ullrich <chris+freebsd> | ||||
| Component: | Individual Port(s) | Assignee: | Xin LI <delphij> | ||||
| Status: | Closed FIXED | ||||||
| Severity: | Affects Only Me | ||||||
| Priority: | Normal | ||||||
| Version: | Latest | ||||||
| Hardware: | Any | ||||||
| OS: | Any | ||||||
| Attachments: |
|
||||||
Responsible Changed From-To: freebsd-ports-bugs->delphij Over to maintainer. delphij 2009-10-01 00:08:03 UTC
FreeBSD ports repository
Modified files:
net/openldap23-server Makefile
net/openldap24-server Makefile
Log:
Use same logic when creating the name for client package, as what we have
used in building 'em.
PR: ports/135622
Submitted by: Christian Ullrich <chris+freebsd chrullrich net>
Revision Changes Path
1.168 +1 -1 ports/net/openldap23-server/Makefile
1.173 +1 -1 ports/net/openldap24-server/Makefile
_______________________________________________
cvs-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/cvs-all
To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
State Changed From-To: open->closed Committed, thanks! |
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. 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. .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.* \ .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.* \--0elpV34D3MMD3S9pT6GqPCti8rtGCbS8AjPtiH966red1d8m Content-Type: text/plain; name="file.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="file.diff" --- 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> How-To-Repeat: make -C /usr/ports/net/openldap24-client BATCH=yes WITH_SASL=yes install ldd /usr/local/bin/ldapsearch | grep sasl