DIST_SUBDIR not working with MASTER_SITE_OVERRIDE

[cristi at roedu.net]

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.

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.

--- 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:=        ${MASTER_SITE_BACKUP}
+_MASTER_SITE_OVERRIDE:=        ${MASTER_SITE_BACKUP}/${DIST_SUBDIR}/
 _MASTER_SITE_BACKUP:=  # empty
 .else
-_MASTER_SITE_OVERRIDE= ${MASTER_SITE_OVERRIDE}
-_MASTER_SITE_BACKUP=   ${MASTER_SITE_BACKUP}
+_MASTER_SITE_OVERRIDE= ${MASTER_SITE_OVERRIDE}/${DIST_SUBDIR}/
+_MASTER_SITE_BACKUP=   ${MASTER_SITE_BACKUP}/${DIST_SUBDIR}/
 .endif

 # Search CDROM first if mounted, symlink instead of copy if