From brian@Awfulhak.org  Wed Jun  6 08:44:03 2001
Return-Path: <brian@Awfulhak.org>
Received: from Awfulhak.org (gw.Awfulhak.org [217.204.245.18])
	by hub.freebsd.org (Postfix) with ESMTP id 1EE0537B403
	for <FreeBSD-gnats-submit@freebsd.org>; Wed,  6 Jun 2001 08:44:02 -0700 (PDT)
	(envelope-from brian@Awfulhak.org)
Received: from dev.lan.Awfulhak.org (root@dev.lan.Awfulhak.org [172.16.0.5])
	by Awfulhak.org (8.11.3/8.11.3) with ESMTP id f56Fi1t27314
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 6 Jun 2001 16:44:01 +0100 (BST)
	(envelope-from brian@lan.Awfulhak.org)
Received: (from brian@localhost)
	by dev.lan.Awfulhak.org (8.11.4/8.11.4) id f56Fi0L59680;
	Wed, 6 Jun 2001 16:44:00 +0100 (BST)
	(envelope-from brian)
Message-Id: <200106061544.f56Fi0L59680@dev.lan.Awfulhak.org>
Date: Wed, 6 Jun 2001 16:44:00 +0100 (BST)
From: Brian Somers <brian@Awfulhak.org>
Reply-To: Brian Somers <brian@Awfulhak.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: bsd.ports.mk's fetch-list target is wrong [PATCH included]
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         27909
>Category:       ports
>Synopsis:       bsd.ports.mk's fetch-list target is wrong [PATCH included]
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    portmgr
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jun 06 08:50:01 PDT 2001
>Closed-Date:    Thu Jun 28 07:59:58 PDT 2001
>Last-Modified:  Thu Jun 28 08:00:28 PDT 2001
>Originator:     Brian Somers
>Release:        FreeBSD 5.0-CURRENT i386
>Organization:
Awfulhak Ltd.
>Environment:

System: FreeBSD dev.lan.Awfulhak.org 5.0-CURRENT FreeBSD 5.0-CURRENT #1: Wed Jun 6 10:01:37 BST 2001 brian@dev.lan.Awfulhak.org:/usr/obj/usr/src/sys/DEV i386

File: $FreeBSD: ports/Mk/bsd.port.mk,v 1.367 2001/05/23 02:46:52 dougb Exp $

>Description:

	Doing a ``make fetch-list'' under /usr/ports produces a command
	that only attempts to fetch from the first master site.  This is
	because of an (apparently) extraneous break in bsd.port.mk.

>How-To-Repeat:

	cd /usr/ports/x11/XFree86-4
	make DISTDIR=/tmp fetch-list
	rmdir /tmp/xc

	This only produces a command with a single fetch attempt.

>Fix:

Apply this:

Index: bsd.port.mk
===================================================================
RCS file: /home/ncvs/ports/Mk/bsd.port.mk,v
retrieving revision 1.367
diff -u -r1.367 bsd.port.mk
--- bsd.port.mk	2001/05/23 02:46:52	1.367
+++ bsd.port.mk	2001/06/06 15:35:05
@@ -2317,8 +2317,7 @@
 				*/*)	args="-o $${file} $${site}$${file}";; \
 				*)		args=$${site}$${file};; \
 				esac; \
-				${ECHO} -n ${SETENV} ${FETCH_ENV} ${FETCH_CMD} ${FETCH_BEFORE_ARGS} $${args} "${FETCH_AFTER_ARGS}" '||' ; \
-					break; \
+				${ECHO} -n ${SETENV} ${FETCH_ENV} ${FETCH_CMD} ${FETCH_BEFORE_ARGS} $${args} "${FETCH_AFTER_ARGS}" '|| ' ; \
 			done; \
 			${ECHO} "echo $${file} not fetched" ; \
 		fi \
@@ -2334,8 +2333,7 @@
 				*/*)	args="-o $${file} $${site}$${file}";; \
 				*)		args=$${site}$${file};; \
 				esac; \
-				${ECHO} -n ${SETENV} ${FETCH_ENV} ${FETCH_CMD} ${FETCH_BEFORE_ARGS} $${args} "${FETCH_AFTER_ARGS}" '||' ; \
-					break; \
+				${ECHO} -n ${SETENV} ${FETCH_ENV} ${FETCH_CMD} ${FETCH_BEFORE_ARGS} $${args} "${FETCH_AFTER_ARGS}" '|| ' ; \
 			done; \
 			${ECHO} "echo $${file} not fetched" ; \
 		fi \
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports->portmgr 
Responsible-Changed-By: brian 
Responsible-Changed-When: Wed Jun 6 08:52:49 PDT 2001 
Responsible-Changed-Why:  
I'm sure our ports manager can apply this (please?) 

http://www.FreeBSD.org/cgi/query-pr.cgi?pr=27909 

From: Peter Pentchev <roam@orbitel.bg>
To: Brian Somers <brian@Awfulhak.org>
Cc: FreeBSD-gnats-submit@freebsd.org
Subject: Re: ports/27909: bsd.ports.mk's fetch-list target is wrong [PATCH included]
Date: Wed, 6 Jun 2001 19:51:57 +0300

 On Wed, Jun 06, 2001 at 04:44:00PM +0100, Brian Somers wrote:
 > 
 > >Number:         27909
 > >Category:       ports
 > >Synopsis:       bsd.ports.mk's fetch-list target is wrong [PATCH included]
 > >Originator:     Brian Somers
 > >Organization:
 > Awfulhak Ltd.
 > >Environment:
 > 
 > System: FreeBSD dev.lan.Awfulhak.org 5.0-CURRENT FreeBSD 5.0-CURRENT #1: Wed Jun 6 10:01:37 BST 2001 brian@dev.lan.Awfulhak.org:/usr/obj/usr/src/sys/DEV i386
 > 
 > File: $FreeBSD: ports/Mk/bsd.port.mk,v 1.367 2001/05/23 02:46:52 dougb Exp $
 > 
 > >Description:
 > 
 > 	Doing a ``make fetch-list'' under /usr/ports produces a command
 > 	that only attempts to fetch from the first master site.  This is
 > 	because of an (apparently) extraneous break in bsd.port.mk.
 
 Errr.. isn't this very very very similar to ports/25779?
 
 G'luck,
 Peter
 
 -- 
 If this sentence were in Chinese, it would say something else.

From: Brian Somers <brian@Awfulhak.org>
To: Peter Pentchev <roam@orbitel.bg>
Cc: Brian Somers <brian@Awfulhak.org>,
	FreeBSD-gnats-submit@freebsd.org, brian@Awfulhak.org
Subject: Re: ports/27909: bsd.ports.mk's fetch-list target is wrong [PATCH included] 
Date: Thu, 07 Jun 2001 08:40:06 +0100

 Yes, and it was assigned to the maintainer over a month ago.  That 
 makes it a timeout I guess, but unfortunately the patch for PR 25779 
 doesn't exist any more.
 
 I guess I'll sit on 27909 for 3 weeks then commit it myself.
 
 > On Wed, Jun 06, 2001 at 04:44:00PM +0100, Brian Somers wrote:
 > > 
 > > >Number:         27909
 > > >Category:       ports
 > > >Synopsis:       bsd.ports.mk's fetch-list target is wrong [PATCH included]
 > > >Originator:     Brian Somers
 > > >Organization:
 > > Awfulhak Ltd.
 > > >Environment:
 > > 
 > > System: FreeBSD dev.lan.Awfulhak.org 5.0-CURRENT FreeBSD 5.0-CURRENT #1: Wed Jun 6 10:01:37 BST 2001 brian@dev.lan.Awfulhak.org:/usr/obj/usr/src/sys/DEV i386
 > > 
 > > File: $FreeBSD: ports/Mk/bsd.port.mk,v 1.367 2001/05/23 02:46:52 dougb Exp $
 > > 
 > > >Description:
 > > 
 > > 	Doing a ``make fetch-list'' under /usr/ports produces a command
 > > 	that only attempts to fetch from the first master site.  This is
 > > 	because of an (apparently) extraneous break in bsd.port.mk.
 > 
 > Errr.. isn't this very very very similar to ports/25779?
 > 
 > G'luck,
 > Peter
 > 
 > -- 
 > If this sentence were in Chinese, it would say something else.
 
 -- 
 Brian <brian@Awfulhak.org>                        <brian@[uk.]FreeBSD.org>
       <http://www.Awfulhak.org>                   <brian@[uk.]OpenBSD.org>
 Don't _EVER_ lose your sense of humour !
 
 
State-Changed-From-To: open->closed 
State-Changed-By: brian 
State-Changed-When: Thu Jun 28 07:59:58 PDT 2001 
State-Changed-Why:  
Applied after a 3 week timeout. 

http://www.FreeBSD.org/cgi/query-pr.cgi?pr=27909 
>Unformatted:
