From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Jun 17 16:30:04 2009 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D5092106564A for ; Wed, 17 Jun 2009 16:30:04 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id C2D3A8FC13 for ; Wed, 17 Jun 2009 16:30:04 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n5HGU4mI026800 for ; Wed, 17 Jun 2009 16:30:04 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n5HGU4dN026797; Wed, 17 Jun 2009 16:30:04 GMT (envelope-from gnats) Date: Wed, 17 Jun 2009 16:30:04 GMT Message-Id: <200906171630.n5HGU4dN026797@freefall.freebsd.org> To: freebsd-ports-bugs@FreeBSD.org From: Yuri Pankov Cc: Subject: Re: ports/135664: [PATCH]: bsd.ldap.mk: Detect flavour of installed openldap-client X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Yuri Pankov List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Jun 2009 16:30:05 -0000 The following reply was made to PR ports/135664; it has been noted by GNATS. From: Yuri Pankov 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--