From owner-cvs-ports@FreeBSD.ORG  Mon Mar 14 07:25:34 2005
Return-Path: <owner-cvs-ports@FreeBSD.ORG>
Delivered-To: cvs-ports@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 8A23316A4CE; Mon, 14 Mar 2005 07:25:34 +0000 (GMT)
Received: from voodoo.oberon.net (voodoo.oberon.net [212.118.165.100])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id B427843D5C; Mon, 14 Mar 2005 07:25:33 +0000 (GMT)
	(envelope-from krion@voodoo.oberon.net)
Received: from krion by voodoo.oberon.net with local (Exim 4.50 (FreeBSD))
	id 1DAjxI-0002W4-QU; Mon, 14 Mar 2005 08:25:36 +0100
Date: Mon, 14 Mar 2005 08:25:36 +0100
From: Kirill Ponomarew <krion@voodoo.oberon.net>
To: Edwin Groothuis <edwin@FreeBSD.org>
Message-ID: <20050314072536.GE98692@voodoo.oberon.net>
References: <200503132234.j2DMYBlP089865@repoman.freebsd.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <200503132234.j2DMYBlP089865@repoman.freebsd.org>
X-NCC-Regid: de.oberon
X-NIC-HDL: KP869-RIPE
Keywords: 579279786
cc: cvs-ports@FreeBSD.org
cc: cvs-all@FreeBSD.org
cc: ports-committers@FreeBSD.org
Subject: Re: cvs commit: ports/Mk bsd.sites.mk
X-BeenThere: cvs-ports@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the ports tree <cvs-ports.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-ports>,
	<mailto:cvs-ports-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-ports>
List-Post: <mailto:cvs-ports@freebsd.org>
List-Help: <mailto:cvs-ports-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-ports>,
	<mailto:cvs-ports-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 14 Mar 2005 07:25:34 -0000

On Sun, Mar 13, 2005 at 10:34:11PM +0000, Edwin Groothuis wrote:
> edwin       2005-03-13 22:34:11 UTC
> 
>   FreeBSD ports repository
> 
>   Modified files:
>     Mk                   bsd.sites.mk 
>   Log:
>   Implement Adam Weinbergers idea of an overridable bsd.sites.mk:
>   
>   His idea was:
>   
>       What do you guys think of changing the +='s in bsd.sites.mk to
>       ?='s? The deal is this: say I have a specific AfterStep dist
>       site that I want to use, and I don't want the default listed
>       sites to be attempted at all.
>   
>       As it stands now, there are two current solutions that I see:
>       * edit bsd.sites.mk after every cvsup
>       * put like 100 entries for that site in MASTER_SITE_AFTERSTEP
>         in /etc/make.conf and turn on RANDOMIZE_MASTER_SITES
>   
>   His solution was:
>   
>       Change the bsd.sites.mk to MASTER_SITE_AFTERSTEP?=, and then I
>       can define MASTER_SITE_AFTERSTEP to be whatever I want it to
>       be.
>   
>   The final solution is:
>   
>       Add an .if !defined(IGNORE_MASTER_SITE_xxx) / .endif around all
>       MASTER_SITE definitions:
>   
>       +.if !defined(IGNORE_MASTER_SITE_XORG)
>        MASTER_SITE_XORG+= \
>                ftp://ftp.x.org/pub/%SUBDIR%/ \
>                ftp://ftp.gwdg.de/pub/x11/x.org/pub/%SUBDIR%/ \
>        [...]
>       +.endif
>   
>   This way, if you want to ignore the default MASTER_SITE_xxx and use
>   a certain mastersite for this collection, you set this in your
>   /etc/make.conf:
>   
>       IGNORE_MASTER_SITE_xxx=yes
>       MASTER_SITE_xxx=http://z.x.y/
>   
>   While if you prefer a certain mastersite for this collection, you
>   set this in your /etc/make.conf:
>   
>       MASTER_SITE_xxx=http://z.x.y/

Adding it to CHANGES would be a great idea.

-Kirill