From owner-cvs-all@FreeBSD.ORG  Sun Mar 13 22:34:11 2005
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Delivered-To: cvs-all@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id C118916A4CE; Sun, 13 Mar 2005 22:34:11 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id A02F443D31; Sun, 13 Mar 2005 22:34:11 +0000 (GMT)
	(envelope-from edwin@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j2DMYBeu089866;
	Sun, 13 Mar 2005 22:34:11 GMT
	(envelope-from edwin@repoman.freebsd.org)
Received: (from edwin@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j2DMYBlP089865;
	Sun, 13 Mar 2005 22:34:11 GMT
	(envelope-from edwin)
Message-Id: <200503132234.j2DMYBlP089865@repoman.freebsd.org>
From: Edwin Groothuis <edwin@FreeBSD.org>
Date: Sun, 13 Mar 2005 22:34:11 +0000 (UTC)
To: ports-committers@FreeBSD.org, cvs-ports@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: ports/Mk bsd.sites.mk
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 13 Mar 2005 22:34:11 -0000

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/
  
  Revision  Changes    Path
  1.288     +118 -9    ports/Mk/bsd.sites.mk