Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 17 Apr 2013 16:56:04 +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: r315987 - head/x11-fonts/sgifonts
Message-ID:  <201304171656.r3HGu4PG076870@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bapt
Date: Wed Apr 17 16:56:04 2013
New Revision: 315987
URL: http://svnweb.freebsd.org/changeset/ports/315987

Log:
  All supported version of FreeBSD have a bsdtar version that support extracting rpm.
  Remove now useless dependency on rpm2cpio
  
  Feature safe:	yes

Modified:
  head/x11-fonts/sgifonts/Makefile

Modified: head/x11-fonts/sgifonts/Makefile
==============================================================================
--- head/x11-fonts/sgifonts/Makefile	Wed Apr 17 16:52:34 2013	(r315986)
+++ head/x11-fonts/sgifonts/Makefile	Wed Apr 17 16:56:04 2013	(r315987)
@@ -13,7 +13,6 @@ EXTRACT_SUFX=	.rpm
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Fonts from the SGI ProPack 1.4 (originally for Linux)
 
-EXTRACT_DEPENDS=	rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio
 BUILD_DEPENDS=		bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \
 			mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir
 
@@ -21,15 +20,11 @@ PLIST=		${WRKDIR}/pkg-plist
 PLIST_DIRS=	lib/X11/fonts/local/sgi
 PKGMESSAGE=	${WRKDIR}/pkg-message
 USE_IMAKE=	yes
+EXTRACT_CMD=	${TAR}
+EXTRACT_BEFORE_ARGS=	-O -xf
+EXTRACT_AFTER_ARGS=	sgi-fonts.tar.gz | ${TAR} -xf -
 WRKSRC=		${WRKDIR}/sgi-fonts
 
-do-extract:
-	@${MKDIR} ${WRKDIR}
-	@cd ${WRKDIR}; rpm2cpio.pl ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES} \
-		| ${CPIO} --extract --no-preserve-owner \
-		--preserve-modification-time --unconditional --quiet
-	@${TAR} -C ${WRKDIR} -xf ${WRKDIR}/sgi-fonts.tar.gz
-
 pre-install:
 	@${RM} -f ${PLIST}
 	@cd ${WRKSRC}; for ii in `${LS} *gz fonts.alias fonts.dir|${SORT}`; do \



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