diff options
| author | jlam <jlam> | 2004-03-29 05:43:28 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2004-03-29 05:43:28 +0000 |
| commit | bdc005d46035e154e9ab9ada79f502e80e17e643 (patch) | |
| tree | 2684bb3d4a41538be1b78668954f44c69a49033d /security | |
| parent | cd3720af313224c26d5eacfaeb6f053262932c5b (diff) | |
| download | pkgsrc-bdc005d46035e154e9ab9ada79f502e80e17e643.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')
| -rw-r--r-- | security/PAM/builtin.mk | 9 | ||||
| -rw-r--r-- | security/heimdal/builtin.mk | 14 | ||||
| -rw-r--r-- | security/tcp_wrappers/builtin.mk | 9 |
3 files changed, 11 insertions, 21 deletions
diff --git a/security/PAM/builtin.mk b/security/PAM/builtin.mk index cd234981780..43cbb672fce 100644 --- a/security/PAM/builtin.mk +++ b/security/PAM/builtin.mk @@ -1,15 +1,10 @@ -# $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 $ .if !defined(IS_BUILTIN.pam) IS_BUILTIN.pam= no . if exists(/usr/include/security/pam_appl.h) IS_BUILTIN.pam= yes . endif -.endif - -CHECK_BUILTIN.pam?= no -.if !empty(CHECK_BUILTIN.pam:M[yY][eE][sS]) -USE_BUILTIN.pam= yes -.endif +.endif # IS_BUILTIN.pam USE_BUILTIN.pam?= ${IS_BUILTIN.pam} 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 diff --git a/security/tcp_wrappers/builtin.mk b/security/tcp_wrappers/builtin.mk index 468cc9ec558..86d119d53e0 100644 --- a/security/tcp_wrappers/builtin.mk +++ b/security/tcp_wrappers/builtin.mk @@ -1,15 +1,10 @@ -# $NetBSD: builtin.mk,v 1.1 2004/03/10 17:57:15 jlam Exp $ +# $NetBSD: builtin.mk,v 1.2 2004/03/29 05:43:35 jlam Exp $ .if !defined(IS_BUILTIN.tcp_wrappers) IS_BUILTIN.tcp_wrappers= no . if exists(/usr/include/tcpd.h) IS_BUILTIN.tcp_wrappers= yes . endif -.endif - -CHECK_BUILTIN.tcp_wrappers?= no -.if !empty(CHECK_BUILTIN.tcp_wrappers:M[yY][eE][sS]) -USE_BUILTIN.tcp_wrappers= yes -.endif +.endif # IS_BUILTIN.tcp_wrappers USE_BUILTIN.tcp_wrappers?= ${IS_BUILTIN.tcp_wrappers} |