diff options
| author | jlam <jlam@pkgsrc.org> | 2004-02-05 07:17:14 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2004-02-05 07:17:14 +0000 |
| commit | 317cc72791f8dcfcdd50f770e1ae9ccce68ddb47 (patch) | |
| tree | edbbed6f9491b43337c846644df6d1c3e8ce8f32 /archivers/bzip2 | |
| parent | e7133cac25a67cadb35ea338f0d9924c2a9da764 (diff) | |
| download | pkgsrc-317cc72791f8dcfcdd50f770e1ae9ccce68ddb47.tar.gz | |
Make PREFER_PKGSRC just yes/no or a list of packages. This makes it
simpler to understand.
Diffstat (limited to 'archivers/bzip2')
| -rw-r--r-- | archivers/bzip2/buildlink2.mk | 8 | ||||
| -rw-r--r-- | archivers/bzip2/buildlink3.mk | 8 |
2 files changed, 6 insertions, 10 deletions
diff --git a/archivers/bzip2/buildlink2.mk b/archivers/bzip2/buildlink2.mk index d87f95b99fe..0dbc71604e9 100644 --- a/archivers/bzip2/buildlink2.mk +++ b/archivers/bzip2/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.8 2004/02/05 07:06:15 jlam Exp $ +# $NetBSD: buildlink2.mk,v 1.9 2004/02/05 07:17:14 jlam Exp $ .if !defined(BZIP2_BUILDLINK2_MK) BZIP2_BUILDLINK2_MK= # defined @@ -37,11 +37,9 @@ _NEED_BZIP2= YES . endfor .endif -.if defined(PREFER_PKGSRC) -. if empty(PREFER_PKGSRC) || !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ - !empty(PREFER_PKGSRC:Mbzip2) +.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ + !empty(PREFER_PKGSRC:Mbzip2) _NEED_BZIP2= YES -. endif .endif .if ${_NEED_BZIP2} == "YES" diff --git a/archivers/bzip2/buildlink3.mk b/archivers/bzip2/buildlink3.mk index a4b4f1d3c05..846101198d6 100644 --- a/archivers/bzip2/buildlink3.mk +++ b/archivers/bzip2/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.8 2004/02/05 07:06:15 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2004/02/05 07:17:14 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ BZIP2_BUILDLINK3_MK:= ${BZIP2_BUILDLINK3_MK}+ @@ -26,11 +26,9 @@ BUILDLINK_IS_BUILTIN.bzip2!= \ MAKEFLAGS+= BUILDLINK_IS_BUILTIN.bzip2="${BUILDLINK_IS_BUILTIN.bzip2}" .endif -.if defined(PREFER_PKGSRC) -. if empty(PREFER_PKGSRC) || !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ - !empty(PREFER_PKGSRC:Mbzip2) +.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ + !empty(PREFER_PKGSRC:Mbzip2) BUILDLINK_USE_BUILTIN.bzip2= NO -. endif .endif .if defined(USE_BZIP2) |