From owner-freebsd-hackers@FreeBSD.ORG Wed Jan 23 16:10:22 2008 Return-Path: Delivered-To: hackers@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 144C916A420 for ; Wed, 23 Jan 2008 16:10:22 +0000 (UTC) (envelope-from brooks@lor.one-eyed-alien.net) Received: from lor.one-eyed-alien.net (cl-162.ewr-01.us.sixxs.net [IPv6:2001:4830:1200:a1::2]) by mx1.freebsd.org (Postfix) with ESMTP id 9078B13C46A for ; Wed, 23 Jan 2008 16:10:21 +0000 (UTC) (envelope-from brooks@lor.one-eyed-alien.net) Received: from lor.one-eyed-alien.net (localhost [127.0.0.1]) by lor.one-eyed-alien.net (8.14.1/8.13.8) with ESMTP id m0NGAK7a009930; Wed, 23 Jan 2008 10:10:20 -0600 (CST) (envelope-from brooks@lor.one-eyed-alien.net) Received: (from brooks@localhost) by lor.one-eyed-alien.net (8.14.1/8.13.8/Submit) id m0NGAJtu009929; Wed, 23 Jan 2008 10:10:19 -0600 (CST) (envelope-from brooks) Date: Wed, 23 Jan 2008 10:10:19 -0600 From: Brooks Davis To: cristi@roedu.net Message-ID: <20080123161019.GA96555@lor.one-eyed-alien.net> References: <50587.193.226.5.33.1201086363.squirrel@mail.roedu.net> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="BXVAT5kNtrzKuDFl" Content-Disposition: inline In-Reply-To: <50587.193.226.5.33.1201086363.squirrel@mail.roedu.net> User-Agent: Mutt/1.5.16 (2007-06-09) X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-3.0 (lor.one-eyed-alien.net [127.0.0.1]); Wed, 23 Jan 2008 10:10:20 -0600 (CST) Cc: hackers@freebsd.org Subject: Re: DIST_SUBDIR not working with MASTER_SITE_OVERRIDE X-BeenThere: freebsd-hackers@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Technical Discussions relating to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Jan 2008 16:10:22 -0000 --BXVAT5kNtrzKuDFl Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Jan 23, 2008 at 01:06:03PM +0200, cristi@roedu.net wrote: > Hi everybody, >=20 > I recently wanted to install some gnome stuff from ports. In order to > boost the download speed, I did something like this: >=20 > make MASTER_SITE_OVERRIDE=3Dftp://ftp1.ro.freebsd.org/pub/FreeBSD/distfi= les/ >=20 > as documented in the Handbook. However, many gnome packages seem to have > DIST_SUBDIR in their Makefile, but MASTER_SITE_OVERRIDE doesn't care. This > makes installing ports (with many dependencies) from known non-default > sources very hard. You just need to set MASTER_SITE_OVERRIDE in /etc/make.conf or ports.conf like: MASTER_SITE_OVERRIDE=3Dftp://ftp1.ro.freebsd.org/pub/FreeBSD/distfiles/${DI= ST_SUBDIR}/ The Handbook should be updated. > The following patch addresses this problem. As a side-effect, if somebody > does not have distfiles structured as on a FreeBSD mirror (a rare case I > would say) he will have to find a workaround. IMO this patch is not a good idea because it would prevent someone from building a more interesting distfile mirror. -- Brooks > --- bsd.port.mk.orig 2008-01-23 13:01:18.000000000 +0200 > +++ bsd.port.mk 2008-01-23 13:01:45.000000000 +0200 > @@ -2578,11 +2578,11 @@ > # If the user has MASTER_SITE_FREEBSD set, go to the FreeBSD repository > # for everything, but don't search it twice by appending it to the end. > .if defined(MASTER_SITE_FREEBSD) > -_MASTER_SITE_OVERRIDE:=3D ${MASTER_SITE_BACKUP} > +_MASTER_SITE_OVERRIDE:=3D ${MASTER_SITE_BACKUP}/${DIST_SUBDIR}/ > _MASTER_SITE_BACKUP:=3D # empty > .else > -_MASTER_SITE_OVERRIDE=3D ${MASTER_SITE_OVERRIDE} > -_MASTER_SITE_BACKUP=3D ${MASTER_SITE_BACKUP} > +_MASTER_SITE_OVERRIDE=3D ${MASTER_SITE_OVERRIDE}/${DIST_SUBDIR}/ > +_MASTER_SITE_BACKUP=3D ${MASTER_SITE_BACKUP}/${DIST_SUBDIR}/ > .endif >=20 > # Search CDROM first if mounted, symlink instead of copy if >=20 >=20 > _______________________________________________ > freebsd-hackers@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/freebsd-hackers > To unsubscribe, send any mail to "freebsd-hackers-unsubscribe@freebsd.org" >=20 --BXVAT5kNtrzKuDFl Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (FreeBSD) iD8DBQFHl2brXY6L6fI4GtQRAlU6AKDbAmZjDDoRWz5C0Hi4OL0U+AKVDgCggmuM 8lAV+Uw//E4b7AlPGdD9jfg= =T8ur -----END PGP SIGNATURE----- --BXVAT5kNtrzKuDFl--