From owner-freebsd-ports@FreeBSD.ORG Thu May 26 12:38:21 2005 Return-Path: X-Original-To: ports@freebsd.org Delivered-To: freebsd-ports@FreeBSD.ORG Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EF2B216A41F for ; Thu, 26 May 2005 12:38:21 +0000 (GMT) (envelope-from neuhauser@sigpipe.cz) Received: from isis.sigpipe.cz (fw.sigpipe.cz [62.245.70.224]) by mx1.FreeBSD.org (Postfix) with ESMTP id 73B6343D1F for ; Thu, 26 May 2005 12:38:20 +0000 (GMT) (envelope-from neuhauser@sigpipe.cz) Received: by isis.sigpipe.cz (Postfix, from userid 1001) id EC15E1F87BEE; Thu, 26 May 2005 14:38:19 +0200 (CEST) Date: Thu, 26 May 2005 14:38:19 +0200 From: Roman Neuhauser To: Scot Hetzel Message-ID: <20050526123819.GC95875@isis.sigpipe.cz> Mail-Followup-To: Scot Hetzel , bv@wjv.com, ports@freebsd.org, Kris Kennaway References: <200505180256.j4I2uuR1007388@bilver.wjv.com> <20050518051153.GA92754@xor.obsecurity.org> <20050522014713.GA41935@wjv.com> <20050522030853.GA60445@xor.obsecurity.org> <20050522035314.GA42806@wjv.com> <790a9fff05052508441f0444c8@mail.gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <790a9fff05052508441f0444c8@mail.gmail.com> User-Agent: Mutt/1.5.9i Cc: bv@wjv.com, ports@freebsd.org, Kris Kennaway Subject: Re: file://localhost/usr/ports/misc/mmv/README.html X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 May 2005 12:38:22 -0000 # swhetzel@gmail.com / 2005-05-25 10:44:15 -0500: > On 5/21/05, Bill Vermillion wrote: > > > P.S. The reason this distfile is not available on ftp.freebsd.org is > > > because the port is marked NO_PACKAGE. > > > > In that case why does the 'make' in /usr/ports/misc/mmv try to find > > one when it can't get the one from wustl.edu? > > Maybe we should change bsd.port.mk, so that _MASTER_SITE_BACKUP is > empty when NO_PACKAGE is set on a port. Since the file won't be > available from ftp.freebsd.org web site. There's a wee bit more to it. Mk/bsd.port.mk: 146 # RESTRICTED - Prevent the distribution of distfiles and packages to 147 # the FTP sites or on CDROM (e.g. forbidden by license 148 # considerations). 149 # NO_CDROM - Packages and distfiles may not go on CDROM (e.g. must 150 # not be re-sold) but can go on FTP sites. 151 # NO_PACKAGE - Port should not be packaged for ftp sites or CDROMs, 152 # but distfiles can be put on ftp sites and CDROMs. If NO_PACKAGE prevents distfiles from being put on ftp.freebsd.org then there's a bug. Other than that, this should fix the double checking for RESTRICTED ports (untested): --- Mk/bsd.port.mk 17 Mar 2005 23:22:07 -0000 1.511 +++ Mk/bsd.port.mk 26 May 2005 12:25:00 -0000 @@ -2317,8 +2317,12 @@ _MASTER_SITE_BACKUP:= # empty .else _MASTER_SITE_OVERRIDE= ${MASTER_SITE_OVERRIDE} +.if defined(RESTRICTED) +_MASTER_SITE_BACKUP:= # empty +.else _MASTER_SITE_BACKUP= ${MASTER_SITE_BACKUP} .endif +.endif # Search CDROM first if mounted, symlink instead of copy if # FETCH_SYMLINK_DISTFILES is set -- How many Vietnam vets does it take to screw in a light bulb? You don't know, man. You don't KNOW. Cause you weren't THERE. http://bash.org/?255991