DIST_SUBDIR not working with MASTER_SITE_OVERRIDE

[Cristian KLEIN]

Doug Barton a scris:
> On Wed, 23 Jan 2008, Rick C. Petty wrote:
> 
>> On Wed, Jan 23, 2008 at 01:06:03PM +0200, cristi at roedu.net wrote:
>>> Hi everybody,
>>>
>>> I recently wanted to install some gnome stuff from ports. In order to
>>> boost the download speed, I did something like this:
>>>
>>>  make 
>>> MASTER_SITE_OVERRIDE=ftp://ftp1.ro.freebsd.org/pub/FreeBSD/distfiles/
>>>
>>> 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.
>>
>> I used to do something similar to this by setting it in /etc/make.conf.
>> The only downside is if DIST_SUBDIR is not set you get paths that don't
>> look pretty, e.g.:
>>     ftp://ftp5.freebsd.org/pub/FreeBSD/distfiles//some_distfile.tgz
>>
>> Instead, I added something to my /etc/make.conf similar to:
>>
>> .if defined(DIST_SUBDIR)
>> DIST_SUBDIR_OVERRIDE=${DIST_SUBDIR}/
>> .else
>> DIST_SUBDIR_OVERRIDE=
>> .endif
>> MASTER_SITE_OVERRIDE=ftp://ftp5.freebsd.org/pub/FreeBSD/distfiles/${DIST_SUBDIR_OVERRIDE} 
>>
> 
> IMO it would be a lot more intuitive if the ports infrastructure did 
> exactly this for the user.

Perhaps there should be two variables:
MASTER_SITE_OVERRIDE and MASTER_SITE_OVERRIDE_ALL.