From shaun@inerd.com  Tue Aug 15 16:07:24 2006
Return-Path: <shaun@inerd.com>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 410EA16A4DF
	for <FreeBSD-gnats-submit@freebsd.org>; 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 <FreeBSD-gnats-submit@freebsd.org>; 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 <FreeBSD-gnats-submit@freebsd.org>; 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 <shaun@FreeBSD.org>
Reply-To: Shaun Amott <shaun@FreeBSD.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [PATCH] bsd.port.mk: Add some quotes in 'missing' target (improve handling of duplicate origins)
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>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:    portmgr
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Aug 15 16:10:20 GMT 2006
>Closed-Date:    Fri Sep 15 07:37:34 GMT 2006
>Last-Modified:  Fri Sep 15 07:37:34 GMT 2006
>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:
Responsible-Changed-From-To: freebsd-ports-bugs->portmgr 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Tue Aug 15 16:10:35 UTC 2006 
Responsible-Changed-Why:  
bsd.port.mk is port manager territory 

http://www.freebsd.org/cgi/query-pr.cgi?pr=102100 
State-Changed-From-To: open->analyzed 
State-Changed-By: linimon 
State-Changed-When: Mon Aug 28 04:46:38 UTC 2006 
State-Changed-Why:  
Accepted for a test build on the cluster. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=102100 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/102100: commit references a PR
Date: Fri, 15 Sep 2006 06:57:15 +0000 (UTC)

 linimon     2006-09-15 06:57:07 UTC
 
   FreeBSD ports repository
 
   Modified files:
     Mk                   bsd.port.mk 
     .                    CHANGES 
   Added files:
     Mk                   bsd.lua.mk 
   Log:
   * Add PKGVERSION to bsd.port.mk [1]
   
   * Add bsd.lua.mk to support for lua-based ports [2]
   
   * Remove DESTDIR from bsd.scons.mk [3]
   
   * Add some quotes in 'missing' target to improve handling of duplicate
     origins [4]
   
   PR:     98565 [1], 101612 [2], 101952 [3], 102100 [4]
   
   Submitted by:   ahze [1], alepulver [2], alexbl [3], shaun [4]
   
   Revision  Changes    Path
   1.60      +15 -1     ports/CHANGES
   1.1       +420 -0    ports/Mk/bsd.lua.mk (new)
   1.541     +23 -3     ports/Mk/bsd.port.mk
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: analyzed->closed 
State-Changed-By: linimon 
State-Changed-When: Fri Sep 15 07:37:24 UTC 2006 
State-Changed-Why:  
Committed, thanks. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=102100 
>Unformatted:
