From owner-svn-ports-head@FreeBSD.ORG  Sat Jan  4 18:55:52 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 96D497AF;
 Sat,  4 Jan 2014 18:55:52 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 829C31845;
 Sat,  4 Jan 2014 18:55:52 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s04ItqTH051451;
 Sat, 4 Jan 2014 18:55:52 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s04ItqSd051450;
 Sat, 4 Jan 2014 18:55:52 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201401041855.s04ItqSd051450@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Sat, 4 Jan 2014 18:55:52 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r338673 - head/archivers/rpm2cpio
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 04 Jan 2014 18:55:52 -0000

Author: bapt
Date: Sat Jan  4 18:55:52 2014
New Revision: 338673
URL: http://svnweb.freebsd.org/changeset/ports/338673

Log:
  Support stage
  Check for xz in path instead of checking osversion and looking for it in localbase
  Remove useless do-fetch target

Modified:
  head/archivers/rpm2cpio/Makefile

Modified: head/archivers/rpm2cpio/Makefile
==============================================================================
--- head/archivers/rpm2cpio/Makefile	Sat Jan  4 18:51:39 2014	(r338672)
+++ head/archivers/rpm2cpio/Makefile	Sat Jan  4 18:55:52 2014	(r338673)
@@ -14,26 +14,18 @@ COMMENT=	Convert .rpm files for extracti
 NO_WRKSUBDIR=	yes
 
 USES=		perl5
-NO_STAGE=	yes
 NO_BUILD=	yes
 REINPLACE_ARGS=
 
 PLIST_FILES=	bin/rpm2cpio.pl
 
-.include <bsd.port.pre.mk>
-
-.if ( (${OSVERSION} >= 900000 && ${OSVERSION} < 900012) || ${OSVERSION} < 800505 )
-RUN_DEPENDS+=	${LOCALBASE}/bin/xz:${PORTSDIR}/archivers/xz
-.endif
-
-do-fetch:
-	@${DO_NADA}
+RUN_DEPENDS+=	xz:${PORTSDIR}/archivers/xz
 
 do-extract:
 	@${MKDIR} ${WRKSRC}
 	@${REINPLACE_CMD} -e 's|^#!/usr/bin/perl|#!${PERL}|' ${FILESDIR}/${PORTNAME} >${WRKDIR}/${PORTNAME}
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin/${PORTNAME}.pl
+	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}.pl
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>