K 10 svn:author V 5 edwin K 8 svn:date V 27 2005-03-13T22:34:11.000000Z K 7 svn:log V 1361 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/ END