diff options
author | jlam <jlam> | 2006-01-21 18:57:40 +0000 |
---|---|---|
committer | jlam <jlam> | 2006-01-21 18:57:40 +0000 |
commit | 68e275d406913f1ae5e37c37ce004880df826458 (patch) | |
tree | 505836e71024eea9e19676a0f20b017dda96b7a3 /devel | |
parent | 04641e80e417f21412d018141babfd7f258ccc2e (diff) | |
download | pkgsrc-68e275d406913f1ae5e37c37ce004880df826458.tar.gz |
Update package Makefile now that bsd.pkg.extract.mk is using the
"extract" script for extraction. Many cases where a custom EXTRACT_CMD
simply copied the distfile into the work directory are no longer
needed. The extract script also hides differences between pax and
tar behind a common command-line interface, so we no longer need code
that's conditional on whether EXTRACT_USING is tar or pax.
Diffstat (limited to 'devel')
-rw-r--r-- | devel/as31/Makefile | 4 | ||||
-rw-r--r-- | devel/gobo-eiffel/Makefile | 7 | ||||
-rw-r--r-- | devel/p4-docs/Makefile | 6 | ||||
-rw-r--r-- | devel/unidiff/Makefile | 4 |
4 files changed, 10 insertions, 11 deletions
diff --git a/devel/as31/Makefile b/devel/as31/Makefile index 595972f50eb..e667f72adce 100644 --- a/devel/as31/Makefile +++ b/devel/as31/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/11/01 04:16:58 tv Exp $ +# $NetBSD: Makefile,v 1.11 2006/01/21 18:57:40 jlam Exp $ DISTNAME= asm.8051 PKGNAME= as31-19900126 @@ -12,7 +12,7 @@ MAINTAINER= bjh21@NetBSD.org COMMENT= 8031/8051 assembler WRKSRC= ${WRKDIR} -EXTRACT_CMD= ${DECOMPRESS_CMD} ${DOWNLOADED_DISTFILE} | \ +EXTRACT_CMD= ${GZCAT} ${DOWNLOADED_DISTFILE} | \ ${SED} '1,/^.! \/bin\/sh/d' | ${SH} MAKEFILE= makefile BUILD_TARGET= as31 diff --git a/devel/gobo-eiffel/Makefile b/devel/gobo-eiffel/Makefile index a892fc3eb94..38338a867c2 100644 --- a/devel/gobo-eiffel/Makefile +++ b/devel/gobo-eiffel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/06/16 06:57:46 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2006/01/21 18:57:40 jlam Exp $ # DISTNAME= gobo15 @@ -15,10 +15,9 @@ COMMENT= Portable Eiffel structure libraries and tools BUILD_DEPENDS+= smalleiffel-0.77:../../lang/smalleiffel -WRKSRC= ${WRKDIR} -EXTRACT_CMD= ${LOCALBASE}/bin/unzip -uLa \ - ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} +EXTRACT_OPTS_ZIP= -uLa +WRKSRC= ${WRKDIR} GOBO= ${PREFIX}/share/gobo-eiffel INSTALLATION_DIRS= bin diff --git a/devel/p4-docs/Makefile b/devel/p4-docs/Makefile index 916a4c23dd2..389d67679cb 100644 --- a/devel/p4-docs/Makefile +++ b/devel/p4-docs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:06 rillig Exp $ +# $NetBSD: Makefile,v 1.6 2006/01/21 18:57:40 jlam Exp $ # DISTNAME= p4-docs @@ -35,8 +35,8 @@ SITES_p4sag_html.zip= ${P4_DOCURL_PREFIX}/manuals/p4sag/ EXTRACT_ONLY= cmdref_html.zip p4ftp_html.zip EXTRACT_ONLY+= p4guide_html.zip p4sag_html.zip -EXTRACT_CMD.zip= ${LOCALBASE}/bin/unzip -Laq $${extract_file} \ - -d `${BASENAME} $${extract_file} _html.zip` +EXTRACT_OPTS+= -d `${BASENAME} ${DOWNLOADED_DISTFILE} _html.zip` +EXTRACT_OPTS_ZIP= -Laq DOCDIR= share/doc/p4 HTMLDIR= share/doc/html/p4 diff --git a/devel/unidiff/Makefile b/devel/unidiff/Makefile index ac435b62f53..c9ee33f6186 100644 --- a/devel/unidiff/Makefile +++ b/devel/unidiff/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:09 rillig Exp $ +# $NetBSD: Makefile,v 1.12 2006/01/21 18:57:40 jlam Exp $ # DISTNAME= part01 @@ -15,7 +15,7 @@ COMMENT= Converts between uni-diffs and context diffs BUILD_DEPENDS+= gsharutils>=4.2.1:../../archivers/gsharutils WRKSRC= ${WRKDIR} -EXTRACT_CMD= zcat ${DOWNLOADED_DISTFILE} | ${PREFIX}/bin/gunshar +EXTRACT_CMD= ${GZCAT} ${DOWNLOADED_DISTFILE} | ${PREFIX}/bin/gunshar INSTALLATION_DIRS= bin man/man1 |