From owner-cvs-ports@FreeBSD.ORG Fri Dec 31 19:52:40 2004 Return-Path: Delivered-To: cvs-ports@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0C5E316A4CE; Fri, 31 Dec 2004 19:52:40 +0000 (GMT) Received: from blues.jpj.net (blues.jpj.net [208.210.80.156]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9EDF543D1F; Fri, 31 Dec 2004 19:52:39 +0000 (GMT) (envelope-from trevor@jpj.net) Received: from blues.jpj.net (localhost [127.0.0.1]) by blues.jpj.net (8.12.9p2/8.12.9) with ESMTP id iBVJqeJa016799; Fri, 31 Dec 2004 14:52:40 -0500 (EST) (envelope-from trevor@jpj.net) Received: from localhost (trevor@localhost)iBVJqejD016796; Fri, 31 Dec 2004 14:52:40 -0500 (EST) X-Authentication-Warning: blues.jpj.net: trevor owned process doing -bs Date: Fri, 31 Dec 2004 14:52:40 -0500 (EST) From: Trevor Johnson To: "David O'Brien" In-Reply-To: <20041231003212.GA23359@dragon.nuxi.com> Message-ID: <20041231142144.G12851@blues.jpj.net> References: <200412302001.iBUK10iV036621@repoman.freebsd.org> <20041231003212.GA23359@dragon.nuxi.com> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII X-Scanned-By: MIMEDefang 2.48 on 127.0.0.1 cc: cvs-ports@FreeBSD.org cc: cvs-all@FreeBSD.org cc: ports-committers@FreeBSD.org Subject: Re: cvs commit: ports/emulators/linux_base-gentoo-stage1 Makefile X-BeenThere: cvs-ports@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 31 Dec 2004 19:52:40 -0000 David O'Brien wrote: > On Thu, Dec 30, 2004 at 08:01:00PM +0000, Trevor Johnson wrote: > > trevor 2004-12-30 20:01:00 UTC > > > > FreeBSD ports repository > > > > Modified files: > > emulators/linux_base-gentoo-stage1 Makefile > > Log: > > Rename pre-install target to do-extract, so packing list will be > > available after "make all". > > > > Submitted by: obrien > > Missed in my patch was not doing: > > do-extct: > ..snip.. > + @${RM} -fr ${WRKSRC} > > Please don't do that -- rm'ing of ${WRKSRC} is for 'make clean'. It wasn't missed, but intentional. Those files are not precious--they weren't compiled (by the port), just untarred. Unlike most ports, this port doesn't do anything with them except make the packing list. In my judgment, it's better to remove them afterward, so someone who simply does "make install" will need half as much disk space. > Maybe I need to extract a single file and don't want to spam > ${LINUXBASE}. I think it's okay to expect a user to be able to do "tar xyf" when they need to do that. The way you expressed the purpose of your patch was to the effect "do as much work as possible in `make all,' which does not need root privileges." That seemed like a good idea. I don't see the benefit of this though. > Here > is a patch that makes 'make extract' do what's expected. It also puts > the ONLY_FOR_ARCHS where it belongs. EXTRACT_ONLY isn't needed since > 'do-install' isn't the standard target. Thank you. I intend to take a closer look at the rest of this, later on. > Index: Makefile > =================================================================== > RCS file: /home/ncvs/ports/emulators/linux_base-gentoo-stage1/Makefile,v > retrieving revision 1.20 > diff -u -r1.20 Makefile > --- Makefile 30 Dec 2004 20:01:00 -0000 1.20 > +++ Makefile 31 Dec 2004 00:27:49 -0000 > @@ -9,22 +9,21 @@ > PORTVERSION= 2004.3 > CATEGORIES= emulators linux > MASTER_SITES= ${MASTER_SITE_GENTOO} > -EXTRACT_ONLY= > > MAINTAINER= trevor@FreeBSD.org > COMMENT= Files from Gentoo distribution, for Linux compatibility > > RESTRICTED= "binaries licensed under GNU GPL without accompanying source" > > +ONLY_FOR_ARCHS= alpha amd64 ia64 i386 > + > CONFLICTS= linux_base-6* linux_base-7* linux_base-8* linux_base-debian* \ > linux_base-rh* linux_base-suse* > > DIST_SUBDIR= gentoo-linux > MD5_FILE= ${MASTERDIR}/distinfo.${ARCH} > -NO_BUILD= y > NO_FILTER_SHLIBS=y > NO_MTREE= y > -ONLY_FOR_ARCHS= alpha amd64 ia64 i386 > PLIST= ${WRKDIR}/pkg-plist > PREFIX= ${LINUXBASE} > USE_BZIP2= y > @@ -47,11 +46,12 @@ > @${MKDIR} ${WRKSRC} > @${TAR} --exclude=./dev -xp -C ${WRKSRC} \ > -f ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES} > + > +do-build: > @${ECHO_CMD} etc/resolv.conf > ${PLIST} > @cd ${WRKSRC} && ${FIND} * -type f -o -type l >> ${PLIST} \ > && ${FIND} * -type d | ${SORT} -r | ${SED} -e 's:^:@dirrm :' \ > >> ${PLIST} > - @${RM} -fr ${WRKSRC} > > do-install: > - ${MKDIR} ${PREFIX} -- Trevor Johnson