From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Jun 17 10:40:02 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 336A91065680 for ; Wed, 17 Jun 2009 10:40:02 +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 E6EE88FC0C for ; Wed, 17 Jun 2009 10:40:01 +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 n5HAe1Gl060503 for ; Wed, 17 Jun 2009 10:40:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n5HAe14b060502; Wed, 17 Jun 2009 10:40:01 GMT (envelope-from gnats) Resent-Date: Wed, 17 Jun 2009 10:40:01 GMT Resent-Message-Id: <200906171040.n5HAe14b060502@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Yuri Pankov Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 12F93106564A for ; Wed, 17 Jun 2009 10:34:46 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id 00FC88FC19 for ; Wed, 17 Jun 2009 10:34:46 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.3/8.14.3) with ESMTP id n5HAYjck052239 for ; Wed, 17 Jun 2009 10:34:45 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.3/8.14.3/Submit) id n5HAYjlV052238; Wed, 17 Jun 2009 10:34:45 GMT (envelope-from nobody) Message-Id: <200906171034.n5HAYjlV052238@www.freebsd.org> Date: Wed, 17 Jun 2009 10:34:45 GMT From: Yuri Pankov To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: 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 List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Jun 2009 10:40:02 -0000 >Number: 135664 >Category: ports >Synopsis: [PATCH]: bsd.ldap.mk: Detect flavour of installed openldap-client >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Jun 17 10:40:01 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Yuri Pankov >Release: 7.2-RELEASE >Organization: >Environment: >Description: Try to detect flavour of installed openldap-client package. This should at least fix dependency recording in case when we have openldap-sasl-client installed and we don't set WANT_OPENLDAP_SASL (WANT_* variables aren't supposed to be user-settable, are they?) (security/sudo, for example, building sudo using -DWITH_LDAP when we have openldap-sasl-client installed results in missing dependency). Depends on ports/135663 (uses PKG_INFO). >How-To-Repeat: >Fix: Patch attached with submission follows: 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 10:24:32 -0000 @@ -69,7 +69,8 @@ .if defined(WANT_OPENLDAP_SASL) _OPENLDAP_FLAVOUR= -sasl .else -_OPENLDAP_FLAVOUR= +# We should try to detect flavour of already installed openldap-client +_OPENLDAP_FLAVOUR!= ${PKG_INFO} -Ex openldap.\*-client | ${SED} -e 's/openldap\(-sasl\)*-client-.*/\1/' .endif # And now we are checking if we can use it >Release-Note: >Audit-Trail: >Unformatted: