From owner-cvs-ports@FreeBSD.ORG Mon Mar 14 07:30:48 2005 Return-Path: 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 62B2A16A4CE; Mon, 14 Mar 2005 07:30:48 +0000 (GMT) Received: from connectmail.carleton.ca (connectmail.carleton.ca [134.117.2.12]) by mx1.FreeBSD.org (Postfix) with ESMTP id D990443D41; Mon, 14 Mar 2005 07:30:47 +0000 (GMT) (envelope-from adamw@FreeBSD.org) Received: from [192.168.1.105] ([134.117.145.25]) by connectmail.carleton.ca (iPlanet Messaging Server 5.2 HotFix 2.02 (built Oct 21 2004)) with ESMTPSA id <0IDB009QPZJC42@connectmail.carleton.ca>; Mon, 14 Mar 2005 02:30:48 -0500 (EST) Date: Mon, 14 Mar 2005 02:31:03 -0500 From: Adam Weinberger In-reply-to: <20050314072536.GE98692@voodoo.oberon.net> To: Kirill Ponomarew Message-id: <42353DB7.5090506@FreeBSD.org> MIME-version: 1.0 Content-type: text/plain; charset=ISO-8859-1; format=flowed Content-transfer-encoding: 7BIT X-Accept-Language: en-ca, en-gb, en-us, en User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-CA; rv:1.7.5) Gecko/20050105 Thunderbird/1.0 OMFG PANTS References: <200503132234.j2DMYBlP089865@repoman.freebsd.org> <20050314072536.GE98692@voodoo.oberon.net> cc: cvs-ports@FreeBSD.org cc: ports-committers@FreeBSD.org cc: cvs-all@FreeBSD.org cc: Edwin Groothuis 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Mar 2005 07:30:48 -0000 Kirill Ponomarew wrote: > 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 Woah, I didn't even notice this commit. Edwin: you're awesome! Thank you! # Adam -- Adam Weinberger adamw@magnesium.net || adamw@FreeBSD.org adamw@vectors.cx || adamw@gnome.org http://www.vectors.cx