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 /security/heimdal | |
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 'security/heimdal')
-rw-r--r-- | security/heimdal/builtin.mk | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/security/heimdal/builtin.mk b/security/heimdal/builtin.mk index 5267e9e0b75..73cd87e4d5b 100644 --- a/security/heimdal/builtin.mk +++ b/security/heimdal/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:35 jlam Exp $ _KRB5_KRB5_H= /usr/include/krb5/krb5.h @@ -48,11 +48,6 @@ MAKEFLAGS+= BUILTIN_PKG.heimdal=${BUILTIN_PKG.heimdal} MAKEFLAGS+= IS_BUILTIN.heimdal=${IS_BUILTIN.heimdal} .endif -CHECK_BUILTIN.heimdal?= no -.if !empty(CHECK_BUILTIN.heimdal:M[yY][eE][sS]) -USE_BUILTIN.heimdal= yes -.endif - .if !defined(USE_BUILTIN.heimdal) USE_BUILTIN.heimdal?= ${IS_BUILTIN.heimdal} @@ -71,10 +66,15 @@ USE_BUILTIN.heimdal!= \ . endif .endif # USE_BUILTIN.heimdal +CHECK_BUILTIN.heimdal?= no +.if !empty(CHECK_BUILTIN.heimdal:M[nN][oO]) + .if !empty(USE_BUILTIN.heimdal:M[nN][oO]) BUILDLINK_DEPENDS.heimdal+= heimdal>=0.6 KRB5_CONFIG?= ${BUILDLINK_PREFIX.heimdal}/bin/krb5-config CONFIGURE_ENV+= KRB5_CONFIG="${KRB5_CONFIG}" MAKE_ENV+= KRB5_CONFIG="${KRB5_CONFIG}" -.endif # HEIMDAL_BUILDLINK3_MK +.endif + +.endif # CHECK_BUILTIN.heimdal |