pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/fonts/sgi-fonts Allow this to extract on systems where...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/1d8dc161bd5b
branches:  trunk
changeset: 464354:1d8dc161bd5b
user:      agc <agc%pkgsrc.org@localhost>
date:      Sun Dec 07 11:28:58 2003 +0000

description:
Allow this to extract on systems where tar's 'z' support does not know
anything about bzip2.

Move WRKSRC back to the right place.

diffstat:

 fonts/sgi-fonts/Makefile |  10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diffs (34 lines):

diff -r 90c83eadd48c -r 1d8dc161bd5b fonts/sgi-fonts/Makefile
--- a/fonts/sgi-fonts/Makefile  Sun Dec 07 04:14:45 2003 +0000
+++ b/fonts/sgi-fonts/Makefile  Sun Dec 07 11:28:58 2003 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2003/12/05 15:16:19 salo Exp $
+# $NetBSD: Makefile,v 1.3 2003/12/07 11:28:58 agc Exp $
 #
 
 DISTNAME=      sgi-fonts-1.0-457.src
 PKGNAME=       sgi-fonts-1.0.457
-WRKSRC=                ${WRKDIR}/sgi-fonts
 CATEGORIES=    fonts
 MASTER_SITES=  http://public.planetmirror.com/pub/suse/i386/8.2/suse/src/
 EXTRACT_SUFX=  .rpm
@@ -13,6 +12,11 @@
 COMMENT=       Linux compatibility package for SGI fonts
 
 BUILD_DEPENDS+=        rpm2pkg>=1.3:../../pkgtools/rpm2pkg
+.if !exists(/usr/bin/bzcat)
+BUILD_DEPENDS+=        bzip2>=1.0.2:../../archivers/bzip2
+.endif
+
+WRKSRC=                ${WRKDIR}/sgi-fonts
 
 USE_IMAKE=     YES
 
@@ -20,6 +24,6 @@
 
 do-extract:
        ${RPM2PKG} -d ${WRKDIR} ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES}
-       cd ${WRKDIR} && ${GTAR} xzf sgi-fonts.tar.bz2
+       cd ${WRKDIR} && bzcat sgi-fonts.tar.bz2 | ${GTAR} xf -
 
 .include "../../mk/bsd.pkg.mk"



Home | Main Index | Thread Index | Old Index