diff options
| author | jlam <jlam@pkgsrc.org> | 2005-05-02 03:09:04 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2005-05-02 03:09:04 +0000 |
| commit | 4ba6c74f9306a0e18a429b35c0942e5830d87050 (patch) | |
| tree | 5256baba84a3d1edbf60d599646a08de0cd9d1b9 | |
| parent | 96c5deea72ebf36f0c7fcd4baa82fb20b22a5539 (diff) | |
| download | pkgsrc-4ba6c74f9306a0e18a429b35c0942e5830d87050.tar.gz | |
Re-order nested .if statements for brevity.
| -rw-r--r-- | mk/bsd.pkg.mk | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index c787d3a933b..3072b957fd1 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1619 2005/05/02 02:50:33 jlam Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1620 2005/05/02 03:09:04 jlam Exp $ # # This file is in the public domain. # @@ -1753,14 +1753,11 @@ BUILD_DEPENDS+= unzip-[0-9]*:../../archivers/unzip !empty(EXTRACT_SUFX:M*.lzh) || !empty(EXTRACT_SUFX:M*.lha) BUILD_DEPENDS+= lha>=114.9:../../archivers/lha .endif -.if !empty(_USE_NEW_TOOLS:M[yY][eE][sS]) -. if !empty(EXTRACT_ONLY:M*.gz) || !empty(EXTRACT_ONLY:M*.tgz) || \ - !empty(EXTRACT_SUFX:M*.gz) || !empty(EXTRACT_SUFX:M*.tgz) +.if !empty(EXTRACT_ONLY:M*.gz) || !empty(EXTRACT_ONLY:M*.tgz) || \ + !empty(EXTRACT_SUFX:M*.gz) || !empty(EXTRACT_SUFX:M*.tgz) +. if !empty(_USE_NEW_TOOLS:M[yY][eE][sS]) USE_TOOLS+= gzcat -. endif -.elif !defined(GZCAT) -. if !empty(EXTRACT_ONLY:M*.gz) || !empty(EXTRACT_ONLY:M*.tgz) || \ - !empty(EXTRACT_SUFX:M*.gz) || !empty(EXTRACT_SUFX:M*.tgz) +. elif !defined(GZCAT) BUILD_DEPENDS+= gzip-base>=1.2.4b:../../archivers/gzip-base GZCAT= ${LOCALBASE}/bin/zcat . endif |