ports/183377: Fix conflicting dependencies

[Lukas Slebodnik]

>Number:         183377
>Category:       ports
>Synopsis:       Fix conflicting dependencies
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Oct 28 00:30:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Lukas Slebodnik
>Release:        FreeBSD 9.2-RELEASE
>Organization:
>Environment:
FreeBSD bsd 9.2-RELEASE FreeBSD 9.2-RELEASE #0 r255898: Thu Sep 26 22:50:31 UTC 2013     root at bake.isc.freebsd.org:/usr/obj/usr/src/sys/GENERIC  amd64
>Description:
There are conflicting dependencies in sssd port.

https://qat.redports.org/~wg@FreeBSD.org/20131026230201-23531-213906/sssd-1.9.5.log

pkg_add openldap-sasl-client-2.4.36.txz
Installing openldap-sasl-client-2.4.36...pkg: openldap-sasl-client-2.4.36 conflicts with openldap-client-2.4.36 (installs files into the same place).  Problematic file: /usr/local/bin/ldapadd

Failed to install the following 1 package(s): openldap-sasl-client-2.4.36.txz
error in dependency openldap-sasl-client-2.4.36.txz, exiting
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff --git a/Makefile b/Makefile
index 8c4e807..cb45f08 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,7 @@ LIB_DEPENDS=	libpopt.so:${PORTSDIR}/devel/popt \
 		libnss3.so:${PORTSDIR}/security/nss \
 		libsasl2.so:${PORTSDIR}/security/cyrus-sasl2 \
 		libkrb5.so:${PORTSDIR}/security/krb5 \
-		libldap.so:${PORTSDIR}/net/openldap24-sasl-client \
+		libldap.so:${PORTSDIR}/net/openldap24-client \
 		libinotify.so:${PORTSDIR}/devel/libinotify
 BUILD_DEPENDS=	xmlcatalog:${PORTSDIR}/textproc/libxml2 \
 		docbook-xsl>=1:${PORTSDIR}/textproc/docbook-xsl \


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