Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 4 Jan 2014 18:55:52 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r338673 - head/archivers/rpm2cpio
Message-ID:  <201401041855.s04ItqSd051450@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401041855.s04ItqSd051450>