Date: Wed, 23 Jan 2008 10:10:19 -0600 From: Brooks Davis <brooks@freebsd.org> To: cristi@roedu.net Cc: hackers@freebsd.org Subject: Re: DIST_SUBDIR not working with MASTER_SITE_OVERRIDE Message-ID: <20080123161019.GA96555@lor.one-eyed-alien.net> In-Reply-To: <50587.193.226.5.33.1201086363.squirrel@mail.roedu.net> References: <50587.193.226.5.33.1201086363.squirrel@mail.roedu.net>
next in thread | previous in thread | raw e-mail | index | archive | help
--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--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20080123161019.GA96555>