From owner-freebsd-hackers@FreeBSD.ORG Wed Jan 23 11:23:02 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 8194916A419 for ; Wed, 23 Jan 2008 11:23:02 +0000 (UTC) (envelope-from cristi@roedu.net) Received: from alpha.roedu.net (alpha.roedu.net [81.180.250.131]) by mx1.freebsd.org (Postfix) with ESMTP id 28C9313C469 for ; Wed, 23 Jan 2008 11:23:02 +0000 (UTC) (envelope-from cristi@roedu.net) Received: from localhost (localhost [127.0.0.1]) by alpha.roedu.net (Postfix) with ESMTP id 9F3819B39F for ; Wed, 23 Jan 2008 13:06:04 +0200 (EET) X-Virus-Scanned: amavisd-new at roedu.net Received: from alpha.roedu.net ([127.0.0.1]) by localhost (alpha.roedu.net [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 45i-EDKQG5e0 for ; Wed, 23 Jan 2008 13:06:03 +0200 (EET) Received: from mail.roedu.net (localhost [127.0.0.1]) by alpha.roedu.net (Postfix) with ESMTP id 820F79B31A for ; Wed, 23 Jan 2008 13:06:03 +0200 (EET) Received: from 193.226.5.33 (SquirrelMail authenticated user cristi) by mail.roedu.net with HTTP; Wed, 23 Jan 2008 13:06:03 +0200 (EET) Message-ID: <50587.193.226.5.33.1201086363.squirrel@mail.roedu.net> Date: Wed, 23 Jan 2008 13:06:03 +0200 (EET) From: cristi@roedu.net To: hackers@freebsd.org User-Agent: SquirrelMail/1.4.9a MIME-Version: 1.0 Content-Type: text/plain;charset=iso-8859-1 Content-Transfer-Encoding: 8bit X-Priority: 3 (Normal) Importance: Normal X-XheaderVersion: 1.1 X-UserAgent: Cc: Subject: 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 11:23:02 -0000 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