cvs commit: ports/emulators/linux_base-gentoo-stage1 Makefile

[David O'Brien]

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 at 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}