From alex@armada.alexdupre.com  Tue Nov 18 15:16:48 2003
Return-Path: <alex@armada.alexdupre.com>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id B92D816A4CE; Tue, 18 Nov 2003 15:16:48 -0800 (PST)
Received: from relay.gufi.org (civetta.gufi.org [212.110.23.10])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 8798343F75; Tue, 18 Nov 2003 15:16:47 -0800 (PST)
	(envelope-from alex@armada.alexdupre.com)
Received: from armada.alexdupre.com (host245-49.pool8288.interbusiness.it [82.88.49.245])
	by relay.gufi.org (Postfix) with ESMTP
	id A84E320F99; Wed, 19 Nov 2003 00:16:45 +0100 (CET)
Received: from armada.alexdupre.com (localhost [127.0.0.1])
	by armada.alexdupre.com (8.12.10/8.12.10) with ESMTP id hAINGjcN015840;
	Wed, 19 Nov 2003 00:16:45 +0100 (CET)
	(envelope-from alex@armada.alexdupre.com)
Received: (from alex@localhost)
	by armada.alexdupre.com (8.12.10/8.12.10/Submit) id hAINGj3N015839;
	Wed, 19 Nov 2003 00:16:45 +0100 (CET)
	(envelope-from alex)
Message-Id: <200311182316.hAINGj3N015839@armada.alexdupre.com>
Date: Wed, 19 Nov 2003 00:16:45 +0100 (CET)
From: Alex Dupre <sysadmin@alexdupre.com>
Reply-To: Alex Dupre <sysadmin@alexdupre.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc: marcus@freebsd.org
Subject: Fix bug in RADOMIZE_MASTER_SITES
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         59441
>Category:       ports
>Synopsis:       Fix bug in RADOMIZE_MASTER_SITES
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    portmgr
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Nov 18 15:20:16 PST 2003
>Closed-Date:    Tue Nov 18 15:52:52 PST 2003
>Last-Modified:  Tue Nov 18 15:52:52 PST 2003
>Originator:     Alex Dupre
>Release:        FreeBSD 5.1-CURRENT i386
>Organization:
>Environment:
System: FreeBSD armada.alexdupre.com 5.1-CURRENT FreeBSD 5.1-CURRENT #0: Thu Nov 13 00:04:58 CET 2003 alex@armada.alexdupre.com:/usr/obj/usr/src/sys/ARMADA i386


	
>Description:
The first OSVERSION check is overwrited by the second one, and so
RANDOMIZE_MASTER_SITES is set to '' even with FreeBSD 5.1 or later.
Fix it doing only one check.
	
>How-To-Repeat:
	
>Fix:

	

--- bsd.port.mk.diff begins here ---
--- bsd.port.mk.orig	Wed Nov 19 00:05:43 2003
+++ bsd.port.mk	Wed Nov 19 00:07:37 2003
@@ -1756,12 +1756,7 @@
 .if exists(/usr/games/random)
 RANDOM_CMD?=	/usr/games/random
 RANDOM_ARGS?=	"-w -f -"
-.if ${OSVERSION} > 500100
-_RANDOMIZE_SITES=	" |${RANDOM_CMD} ${RANDOM_ARGS}"
-.else
-_RANDOMIZE_SITES=	''
-.endif
-.if ${OSVERSION} > 480000 && ${OSVERSION} < 500000
+.if (${OSVERSION} > 480000 && ${OSVERSION} < 500000) || ${OSVERSION} > 500100
 _RANDOMIZE_SITES=	" |${RANDOM_CMD} ${RANDOM_ARGS}"
 .else
 _RANDOMIZE_SITES=	''
--- bsd.port.mk.diff ends here ---



>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->portmgr 
Responsible-Changed-By: pav 
Responsible-Changed-When: Tue Nov 18 15:27:24 PST 2003 
Responsible-Changed-Why:  
portmgr territory 

http://www.freebsd.org/cgi/query-pr.cgi?pr=59441 
State-Changed-From-To: open->closed 
State-Changed-By: marcus 
State-Changed-When: Tue Nov 18 15:52:41 PST 2003 
State-Changed-Why:  
Dup of 59315. 

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