diff options
| author | jlam <jlam@pkgsrc.org> | 2004-03-29 05:43:28 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2004-03-29 05:43:28 +0000 |
| commit | 6d92080aa240757729992f43156b2924bbda71c4 (patch) | |
| tree | 2684bb3d4a41538be1b78668954f44c69a49033d /devel/zlib | |
| parent | 82cd68d38a1d8bd0262376d4a40e4c201e6c55b3 (diff) | |
| download | pkgsrc-6d92080aa240757729992f43156b2924bbda71c4.tar.gz | |
Match the template builtin.mk file in bsd.builtin.mk, and make the two
packages that use builtin.mk files (graphics/xpm and pkgtools/x11-links)
use the new format correctly.
Diffstat (limited to 'devel/zlib')
| -rw-r--r-- | devel/zlib/builtin.mk | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/devel/zlib/builtin.mk b/devel/zlib/builtin.mk index 7df7fe471b4..ca90ebdcd28 100644 --- a/devel/zlib/builtin.mk +++ b/devel/zlib/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.1 2004/03/10 17:57:14 jlam Exp $ +# $NetBSD: builtin.mk,v 1.2 2004/03/29 05:43:30 jlam Exp $ _ZLIB_H= /usr/include/zlib.h @@ -40,15 +40,10 @@ BUILTIN_PKG.zlib= zlib-1.1.4nb1 . endif . endfor . endif -MAKEFLAGS+= BUILTIN_PKG.zlib=${BUILTIN_PKG.zlib} +BUILDLINK_VARS+= BUILTIN_PKG.zlib . endif -MAKEFLAGS+= IS_BUILTIN.zlib=${IS_BUILTIN.zlib} -.endif - -CHECK_BUILTIN.zlib?= no -.if !empty(CHECK_BUILTIN.zlib:M[yY][eE][sS]) -USE_BUILTIN.zlib= yes -.endif +BUILDLINK_VARS+= IS_BUILTIN.zlib +.endif # IS_BUILTIN.zlib .if !defined(USE_BUILTIN.zlib) USE_BUILTIN.zlib?= ${IS_BUILTIN.zlib} @@ -76,6 +71,11 @@ USE_BUILTIN.zlib= no . endif .endif # USE_BUILTIN.zlib +CHECK_BUILTIN.zlib?= no +.if !empty(CHECK_BUILTIN.zlib:M[nN][oO]) + .if !empty(USE_BUILTIN.zlib:M[nN][oO]) BUILDLINK_DEPENDS.zlib+= zlib>=1.2.1 .endif + +.endif # CHECK_BUILTIN.zlib |