From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Aug 15 16:10:28 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 279A516A528 for ; Tue, 15 Aug 2006 16:10:28 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 714D243D79 for ; Tue, 15 Aug 2006 16:10:21 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k7FGALeH038900 for ; Tue, 15 Aug 2006 16:10:21 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k7FGAL4b038899; Tue, 15 Aug 2006 16:10:21 GMT (envelope-from gnats) Resent-Date: Tue, 15 Aug 2006 16:10:21 GMT Resent-Message-Id: <200608151610.k7FGAL4b038899@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, Shaun Amott Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 410EA16A4DF for ; Tue, 15 Aug 2006 16:07:24 +0000 (UTC) (envelope-from shaun@inerd.com) Received: from dione.picobyte.net (host-212-158-207-124.bulldogdsl.com [212.158.207.124]) by mx1.FreeBSD.org (Postfix) with SMTP id 9F05F43D82 for ; Tue, 15 Aug 2006 16:07:19 +0000 (GMT) (envelope-from shaun@inerd.com) Received: from charon.picobyte.net (charon.picobyte.net [IPv6:2001:4bd0:201e::fe03]) by dione.picobyte.net (Postfix) with ESMTP for ; Tue, 15 Aug 2006 17:07:17 +0100 (BST) Message-Id: <1155658037.21789@charon.picobyte.net> Date: Tue, 15 Aug 2006 17:07:17 +0100 From: Shaun Amott To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/102100: [PATCH] bsd.port.mk: Add some quotes in 'missing' target (improve handling of duplicate origins) X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Shaun Amott List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 16:10:28 -0000 >Number: 102100 >Category: ports >Synopsis: [PATCH] bsd.port.mk: Add some quotes in 'missing' target (improve handling of duplicate origins) >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Tue Aug 15 16:10:20 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Shaun Amott >Release: FreeBSD 6.1-STABLE i386 >Organization: >Environment: >Description: In the event there are multiple ORIGINs recorded for a particular dependency, 'make missing' will spit out an error. This is non-critical, and an unlikely scenario, but the handling of this situation could be improved by adding some quotes, as below. >How-To-Repeat: charon# pkg_info -qO devel/libtool15 libtool-1.5.22_1 libtool-1.5.22_2 charon# make missing lang/php5 devel/php5-pcre textproc/php5-xml [: libtool-1.5.22_1: unexpected operator >Fix: --- bsd.port.mk.diff begins here --- Index: bsd.port.mk =================================================================== RCS file: /home/pcvs/ports/Mk/bsd.port.mk,v retrieving revision 1.540 diff -u -r1.540 bsd.port.mk --- bsd.port.mk 14 Aug 2006 13:24:18 -0000 1.540 +++ bsd.port.mk 15 Aug 2006 16:00:46 -0000 @@ -5190,7 +5190,7 @@ @for dir in $$(${ALL-DEPENDS-LIST}); do \ THISORIGIN=$$(${ECHO_CMD} $$dir | ${SED} 's,${PORTSDIR}/,,'); \ installed=$$(${PKG_INFO} -qO $${THISORIGIN}); \ - if [ -z $$installed ]; then \ + if [ -z "$$installed" ]; then \ ${ECHO_CMD} $$THISORIGIN; \ fi \ done --- bsd.port.mk.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: