Thu Jun 14 11:17:24 2012 UTC ()
Use pkgsrc extract features instead of own do-extract target.


(obache)
diff -r1.20 -r1.21 pkgsrc/fonts/chkfontpath/Makefile
cvs diff -r1.20 -r1.21 pkgsrc/fonts/chkfontpath/Makefile (expand / switch to unified diff)

--- pkgsrc/fonts/chkfontpath/Makefile 2012/06/14 09:59:12 1.20
+++ pkgsrc/fonts/chkfontpath/Makefile 2012/06/14 11:17:24 1.21
@@ -1,42 +1,28 @@ @@ -1,42 +1,28 @@
1# $NetBSD: Makefile,v 1.20 2012/06/14 09:59:12 jperkin Exp $ 1# $NetBSD: Makefile,v 1.21 2012/06/14 11:17:24 obache Exp $
2# 2#
3 3
4DISTNAME= chkfontpath-1.9.7 4DISTNAME= chkfontpath-1.9.7
5PKGREVISION= 4 5PKGREVISION= 4
6CATEGORIES= fonts 6CATEGORIES= fonts
7MASTER_SITES= ftp://ftp.redhat.com/pub/redhat/linux/9/en/os/i386/SRPMS/ 7MASTER_SITES= ftp://ftp.redhat.com/pub/redhat/linux/9/en/os/i386/SRPMS/
8EXTRACT_SUFX= -1.src.rpm 8EXTRACT_SUFX= -1.src.rpm
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11COMMENT= Command line tool to manage X server's font path 11COMMENT= Command line tool to manage X server's font path
12 12
13BUILD_DEPENDS+= rpm2cpio>=1.1:../../converters/rpm2cpio 
14 
15PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
16 14
17MAKE_ENV+= VERSION=${PKGVERSION:Q} 15MAKE_ENV+= VERSION=${PKGVERSION:Q}
18USE_TOOLS+= gmake gtar pax 16USE_TOOLS+= gmake tar gzcat
19 17
20INSTALLATION_DIRS= bin ${PKGMANDIR}/man8 18INSTALLATION_DIRS= bin ${PKGMANDIR}/man8
21 19
22.include "../../mk/bsd.prefs.mk" 20post-extract:
23 21 ${RUN}cd ${WRKDIR};${EXTRACTOR} ${DISTNAME}.tar.gz
24# Native Solaris pax cannot handle cpio archives produced by rpm2cpio.pl, cpio 
25# can but it is not a tool. 
26.if ${OPSYS} == "SunOS" 
27TOOLS_PLATFORM.pax= 
28.endif 
29 
30# Might as well make this a general scheme for .src.rpm files... - HF 
31do-extract: 
32 cd ${WRKDIR} ; \ 
33 ${PREFIX}/bin/rpm2cpio.pl ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} \ 
34 | pax -r ; \ 
35 ${GTAR} zxf ${DISTNAME}.tar.gz 
36 22
37do-install: 23do-install:
38 ${INSTALL_PROGRAM} ${WRKSRC}/chkfontpath ${DESTDIR}${PREFIX}/bin 24 ${INSTALL_PROGRAM} ${WRKSRC}/chkfontpath ${DESTDIR}${PREFIX}/bin
39 ${INSTALL_MAN} ${WRKSRC}/man/en/chkfontpath.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8 25 ${INSTALL_MAN} ${WRKSRC}/man/en/chkfontpath.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
40 26
41.include "../../devel/popt/buildlink3.mk" 27.include "../../devel/popt/buildlink3.mk"
42.include "../../mk/bsd.pkg.mk" 28.include "../../mk/bsd.pkg.mk"