Date: Wed, 17 Jun 2009 16:30:04 GMT From: Yuri Pankov <yuri.pankov@gmail.com> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/135664: [PATCH]: bsd.ldap.mk: Detect flavour of installed openldap-client Message-ID: <200906171630.n5HGU4dN026797@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/135664; it has been noted by GNATS.
From: Yuri Pankov <yuri.pankov@gmail.com>
To: bug-followup@FreeBSD.org
Cc:
Subject: Re: ports/135664: [PATCH]: bsd.ldap.mk: Detect flavour of installed
openldap-client
Date: Wed, 17 Jun 2009 20:05:41 +0400
This is a multi-part message in MIME format.
--------------090807030809090105010109
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Improved version of the patch.
--------------090807030809090105010109
Content-Type: text/plain;
name="bsd.ldap.mk.diff.txt"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
filename="bsd.ldap.mk.diff.txt"
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 16:01:53 -0000
@@ -66,10 +66,14 @@
CFLAGS+= -DLDAP_DEPRECATED
+_OPENLDAP_CLIENT_PKG!= ${PKG_INFO} -Ex openldap.\*-client || ${TRUE}
+_OPENLDAP_FLAVOUR= ${_OPENLDAP_CLIENT_PKG:C/openldap//:C/-client-.*//}
+
.if defined(WANT_OPENLDAP_SASL)
+.if !empty(_OPENLDAP_CLIENT_PKG) && empty(_OPENLDAP_FLAVOUR)
+IGNORE= cannot install: SASL support requested and ${_OPENLDAP_CLIENT_PKG} is installed
+.endif
_OPENLDAP_FLAVOUR= -sasl
-.else
-_OPENLDAP_FLAVOUR=
.endif
# And now we are checking if we can use it
--------------090807030809090105010109--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200906171630.n5HGU4dN026797>