From owner-cvs-ports@FreeBSD.ORG Fri Dec 31 00:32:13 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 D940C16A4CE; Fri, 31 Dec 2004 00:32:13 +0000 (GMT) Received: from dragon.nuxi.com (trang.nuxi.com [66.93.134.19]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3ED0043D53; Fri, 31 Dec 2004 00:32:13 +0000 (GMT) (envelope-from obrien@NUXI.com) Received: from dragon.nuxi.com (obrien@localhost [127.0.0.1]) by dragon.nuxi.com (8.13.1/8.13.1) with ESMTP id iBV0WC10029351; Thu, 30 Dec 2004 16:32:12 -0800 (PST) (envelope-from obrien@dragon.nuxi.com) Received: (from obrien@localhost) by dragon.nuxi.com (8.13.1/8.13.1/Submit) id iBV0WCRR029350; Thu, 30 Dec 2004 16:32:12 -0800 (PST) (envelope-from obrien) Date: Thu, 30 Dec 2004 16:32:12 -0800 From: "David O'Brien" To: Trevor Johnson Message-ID: <20041231003212.GA23359@dragon.nuxi.com> References: <200412302001.iBUK10iV036621@repoman.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200412302001.iBUK10iV036621@repoman.freebsd.org> User-Agent: Mutt/1.4.1i X-Operating-System: FreeBSD 6.0-CURRENT Organization: The NUXI BSD Group X-Pgp-Rsa-Fingerprint: B7 4D 3E E9 11 39 5F A3 90 76 5D 69 58 D9 98 7A X-Pgp-Rsa-Keyid: 1024/34F9F9D5 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 Reply-To: obrien@FreeBSD.org 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 00:32:14 -0000 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'. Maybe I need to extract a single file and don't want to spam ${LINUXBASE}. 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. 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}