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 /lang | |
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 'lang')
-rw-r--r-- | lang/blackdown-jre13/Makefile.common | 4 | ||||
-rw-r--r-- | lang/sun-jre13/Makefile.common | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/lang/blackdown-jre13/Makefile.common b/lang/blackdown-jre13/Makefile.common index 2df3c8c81a2..7aa1eb0bd8d 100644 --- a/lang/blackdown-jre13/Makefile.common +++ b/lang/blackdown-jre13/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.21 2005/12/05 20:50:24 rillig Exp $ +# $NetBSD: Makefile.common,v 1.22 2006/01/21 18:57:41 jlam Exp $ # RELVERSION= 1.3.1 @@ -52,7 +52,7 @@ ONLY_FOR_PLATFORM= NetBSD-*-i386 NetBSD-*-powerpc NetBSD-*-sparc \ Linux-*-i[3-6]86 Linux-*-powerpc Linux-*-sparc .if ${EXTRACT_SUFX} == ".bin" -EXTRACT_CMD= ${ECHO} yes | ${DISTDIR}/${DISTFILES} --nox11 > /dev/null +EXTRACT_OPTS_BIN= --nox11 post-fetch: @if [ ! -x ${DISTDIR}/${DISTFILES} ]; then \ ${CHMOD} +x ${DISTDIR}/${DISTFILES}; \ diff --git a/lang/sun-jre13/Makefile.common b/lang/sun-jre13/Makefile.common index c62e29b6ce7..e6859c73035 100644 --- a/lang/sun-jre13/Makefile.common +++ b/lang/sun-jre13/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.26 2005/12/12 14:43:25 joerg Exp $ +# $NetBSD: Makefile.common,v 1.27 2006/01/21 18:57:41 jlam Exp $ # MASTER_SITES is very special, and must end in "=": CATEGORIES= lang java @@ -9,8 +9,6 @@ HOMEPAGE= http://java.sun.com/ DOWNLOAD= http://java.sun.com/j2se/1.3/download.html ARCHIVE= http://java.sun.com/products/archive/index.html -EXTRACT_CMD= ${ECHO} yes | ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} >/dev/null - LICENSE= jdk13-license RESTRICTED= "Redistribution of repackaged binaries not permitted" NO_SRC_ON_CDROM=${RESTRICTED} |