diff options
| author | jlam <jlam> | 2002-01-28 19:08:18 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2002-01-28 19:08:18 +0000 |
| commit | 81b5709c993d6b02b66274d944fa96763dd6bc39 (patch) | |
| tree | c32bfa8a3a57f9c11a98268b81a219668c28a21f /mk/bsd.pkg.mk | |
| parent | 07edfcea56c3096845aa9b4327cb4e95a14aad36 (diff) | |
| download | pkgsrc-81b5709c993d6b02b66274d944fa96763dd6bc39.tar.gz | |
Make sure that the decompression/extraction programs needed are
automatically DEPENDed if EXTRACT_SUFX is set to a known suffix but
EXTRACT_ONLY is set to an empty value. This should fix the problems for
audio/guspatches and textproc/iso8879 in the 2002-01-28 i386 bulk-build
results.
Diffstat (limited to 'mk/bsd.pkg.mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 8bdc92905af..d80c37f18c8 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.917 2002/01/28 19:00:05 jlam Exp $ +# $NetBSD: bsd.pkg.mk,v 1.918 2002/01/28 19:08:18 jlam Exp $ # # This file is in the public domain. # @@ -1425,7 +1425,8 @@ _EXTRACT_SUFFICES+= .lzh .lha # the benefit of pre-1.5 NetBSD systems. "gzcat" on newer systems happily # decodes bzip2.] Do likewise for ".zip" and ".lha" distfiles. # -.if !empty(EXTRACT_ONLY:M*.bz2) || !empty(EXTRACT_ONLY:M*.tbz) +.if !empty(EXTRACT_ONLY:M*.bz2) || !empty(EXTRACT_ONLY:M*.tbz) || \ + !empty(EXTRACT_SUFX:M*.bz2) || !empty(EXTRACT_SUFX:M*.tbz) . if exists(/usr/bin/bzcat) BZCAT= /usr/bin/bzcat < . else @@ -1433,10 +1434,11 @@ BUILD_DEPENDS+= bzip2>=0.9.0b:../../archivers/bzip2 BZCAT= ${LOCALBASE}/bin/bzcat . endif .endif -.if !empty(EXTRACT_ONLY:M*.zip) +.if !empty(EXTRACT_ONLY:M*.zip) || !empty(EXTRACT_SUFX:M*.zip) BUILD_DEPENDS+= unzip-[0-9]*:../../archivers/unzip .endif -.if !empty(EXTRACT_ONLY:M*.lzh) || !empty(EXTRACT_ONLY:M*.lha) +.if !empty(EXTRACT_ONLY:M*.lzh) || !empty(EXTRACT_ONLY:M*.lha) || \ + !empty(EXTRACT_SUFX:M*.lzh) || !empty(EXTRACT_SUFX:M*.lha) BUILD_DEPENDS+= lha-[0-9]*:../../archivers/lha .endif |