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 | 9cbd62fd0ae1890790c971e914f6ff3cf6203177 (patch) | |
| tree | edbbed6f9491b43337c846644df6d1c3e8ce8f32 /devel/zlib | |
| parent | 4006dd8d3c16be15e01d264394098f7a0798db4c (diff) | |
| download | pkgsrc-9cbd62fd0ae1890790c971e914f6ff3cf6203177.tar.gz | |
Make PREFER_PKGSRC just yes/no or a list of packages. This makes it
simpler to understand.
Diffstat (limited to 'devel/zlib')
| -rw-r--r-- | devel/zlib/buildlink2.mk | 8 | ||||
| -rw-r--r-- | devel/zlib/buildlink3.mk | 8 |
2 files changed, 6 insertions, 10 deletions
diff --git a/devel/zlib/buildlink2.mk b/devel/zlib/buildlink2.mk index 443a4638338..9f2e35b843a 100644 --- a/devel/zlib/buildlink2.mk +++ b/devel/zlib/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.10 2004/02/05 07:06:15 jlam Exp $ +# $NetBSD: buildlink2.mk,v 1.11 2004/02/05 07:17:14 jlam Exp $ .if !defined(ZLIB_BUILDLINK2_MK) ZLIB_BUILDLINK2_MK= # defined @@ -17,11 +17,9 @@ BUILDLINK_IS_BUILTIN.zlib= YES . endif .endif -.if defined(PREFER_PKGSRC) -. if empty(PREFER_PKGSRC) || !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ - !empty(PREFER_PKGSRC:Mzlib) +.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ + !empty(PREFER_PKGSRC:Mzlib) BUILDLINK_USE_BUILTIN.zlib= NO -. endif .endif .if defined(USE_ZLIB) diff --git a/devel/zlib/buildlink3.mk b/devel/zlib/buildlink3.mk index 024a10f6007..fad9c1c33b5 100644 --- a/devel/zlib/buildlink3.mk +++ b/devel/zlib/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.10 2004/02/05 07:06:15 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2004/02/05 07:17:14 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ ZLIB_BUILDLINK3_MK:= ${ZLIB_BUILDLINK3_MK}+ @@ -22,11 +22,9 @@ BUILDLINK_IS_BUILTIN.zlib= YES . endif .endif -.if defined(PREFER_PKGSRC) -. if empty(PREFER_PKGSRC) || !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ - !empty(PREFER_PKGSRC:Mzlib) +.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ + !empty(PREFER_PKGSRC:Mzlib) BUILDLINK_USE_BUILTIN.zlib= NO -. endif .endif .if defined(USE_ZLIB) |