diff options
author | jlam <jlam> | 2004-02-18 16:35:27 +0000 |
---|---|---|
committer | jlam <jlam> | 2004-02-18 16:35:27 +0000 |
commit | ff939e0dc77366add1742d37d4ed3fb8f9a9aba1 (patch) | |
tree | daac6b8473ed3f39f2dec5295d64812df616c1e4 /security | |
parent | 46884894e5707d65635b725e008cf5fe441040cd (diff) | |
download | pkgsrc-ff939e0dc77366add1742d37d4ed3fb8f9a9aba1.tar.gz |
Reorder some lines so that BUILDLINK_USE_BUILTIN.<pkg> set in the
environment overrides all other settings.
Diffstat (limited to 'security')
-rw-r--r-- | security/PAM/buildlink3.mk | 34 | ||||
-rw-r--r-- | security/heimdal/buildlink3.mk | 34 | ||||
-rw-r--r-- | security/openssl/buildlink3.mk | 34 |
3 files changed, 54 insertions, 48 deletions
diff --git a/security/PAM/buildlink3.mk b/security/PAM/buildlink3.mk index eca8411f143..8716a50b62d 100644 --- a/security/PAM/buildlink3.mk +++ b/security/PAM/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.10 2004/02/12 02:35:07 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2004/02/18 16:35:27 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ PAM_BUILDLINK3_MK:= ${PAM_BUILDLINK3_MK}+ @@ -20,29 +20,31 @@ BUILDLINK_IS_BUILTIN.pam= YES . endif .endif -.if !empty(BUILDLINK_IS_BUILTIN.pam:M[yY][eE][sS]) +.if !empty(BUILDLINK_CHECK_BUILTIN.pam:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.pam= YES -.else -BUILDLINK_USE_BUILTIN.pam= NO .endif -.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \ - !empty(BUILDLINK_IS_BUILTIN.pam:M[yY][eE][sS]) +.if !defined(BUILDLINK_USE_BUILTIN.pam) +. if !empty(BUILDLINK_IS_BUILTIN.pam:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.pam= YES -.endif -.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) +. else BUILDLINK_USE_BUILTIN.pam= NO -.endif -.if !empty(PREFER_NATIVE:Mpam) && \ - !empty(BUILDLINK_IS_BUILTIN.pam:M[yY][eE][sS]) +. endif + +. if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \ + !empty(BUILDLINK_IS_BUILTIN.pam:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.pam= YES -.endif -.if !empty(PREFER_PKGSRC:Mpam) +. endif +. if !empty(PREFER_PKGSRC:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.pam= NO -.endif - -.if !empty(BUILDLINK_CHECK_BUILTIN.pam:M[yY][eE][sS]) +. endif +. if !empty(PREFER_NATIVE:Mpam) && \ + !empty(BUILDLINK_IS_BUILTIN.pam:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.pam= YES +. endif +. if !empty(PREFER_PKGSRC:Mpam) +BUILDLINK_USE_BUILTIN.pam= NO +. endif .endif .if !empty(BUILDLINK_USE_BUILTIN.pam:M[nN][oO]) diff --git a/security/heimdal/buildlink3.mk b/security/heimdal/buildlink3.mk index e18886777a0..f7575d77e61 100644 --- a/security/heimdal/buildlink3.mk +++ b/security/heimdal/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.12 2004/02/12 02:35:07 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2004/02/18 16:35:27 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ HEIMDAL_BUILDLINK3_MK:= ${HEIMDAL_BUILDLINK3_MK}+ @@ -74,29 +74,31 @@ BUILDLINK_IS_BUILTIN.heimdal!= \ MAKEFLAGS+= BUILDLINK_IS_BUILTIN.heimdal=${BUILDLINK_IS_BUILTIN.heimdal} .endif -.if !empty(BUILDLINK_IS_BUILTIN.heimdal:M[yY][eE][sS]) +.if !empty(BUILDLINK_CHECK_BUILTIN.heimdal:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.heimdal= YES -.else -BUILDLINK_USE_BUILTIN.heimdal= NO .endif -.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \ - !empty(BUILDLINK_IS_BUILTIN.heimdal:M[yY][eE][sS]) +.if !defined(BUILDLINK_USE_BUILTIN.heimdal) +. if !empty(BUILDLINK_IS_BUILTIN.heimdal:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.heimdal= YES -.endif -.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) +. else BUILDLINK_USE_BUILTIN.heimdal= NO -.endif -.if !empty(PREFER_NATIVE:Mheimdal) && \ - !empty(BUILDLINK_IS_BUILTIN.heimdal:M[yY][eE][sS]) +. endif + +. if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \ + !empty(BUILDLINK_IS_BUILTIN.heimdal:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.heimdal= YES -.endif -.if !empty(PREFER_PKGSRC:Mheimdal) +. endif +. if !empty(PREFER_PKGSRC:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.heimdal= NO -.endif - -.if !empty(BUILDLINK_CHECK_BUILTIN.heimdal:M[yY][eE][sS]) +. endif +. if !empty(PREFER_NATIVE:Mheimdal) && \ + !empty(BUILDLINK_IS_BUILTIN.heimdal:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.heimdal= YES +. endif +. if !empty(PREFER_PKGSRC:Mheimdal) +BUILDLINK_USE_BUILTIN.heimdal= NO +. endif .endif .if !empty(BUILDLINK_USE_BUILTIN.heimdal:M[nN][oO]) diff --git a/security/openssl/buildlink3.mk b/security/openssl/buildlink3.mk index 9596663d053..163bd2ab162 100644 --- a/security/openssl/buildlink3.mk +++ b/security/openssl/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.14 2004/02/12 02:35:07 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.15 2004/02/18 16:35:27 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ OPENSSL_BUILDLINK3_MK:= ${OPENSSL_BUILDLINK3_MK}+ @@ -110,29 +110,31 @@ BUILDLINK_IS_BUILTIN.openssl!= \ MAKEFLAGS+= BUILDLINK_IS_BUILTIN.openssl=${BUILDLINK_IS_BUILTIN.openssl} .endif -.if !empty(BUILDLINK_IS_BUILTIN.openssl:M[yY][eE][sS]) +.if !empty(BUILDLINK_CHECK_BUILTIN.openssl:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.openssl= YES -.else -BUILDLINK_USE_BUILTIN.openssl= NO .endif -.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \ - !empty(BUILDLINK_IS_BUILTIN.openssl:M[yY][eE][sS]) +.if !defined(BUILDLINK_USE_BUILTIN.openssl) +. if !empty(BUILDLINK_IS_BUILTIN.openssl:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.openssl= YES -.endif -.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) +. else BUILDLINK_USE_BUILTIN.openssl= NO -.endif -.if !empty(PREFER_NATIVE:Mopenssl) && \ - !empty(BUILDLINK_IS_BUILTIN.openssl:M[yY][eE][sS]) +. endif + +. if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \ + !empty(BUILDLINK_IS_BUILTIN.openssl:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.openssl= YES -.endif -.if !empty(PREFER_PKGSRC:Mopenssl) +. endif +. if !empty(PREFER_PKGSRC:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.openssl= NO -.endif - -.if !empty(BUILDLINK_CHECK_BUILTIN.openssl:M[yY][eE][sS]) +. endif +. if !empty(PREFER_NATIVE:Mopenssl) && \ + !empty(BUILDLINK_IS_BUILTIN.openssl:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.openssl= YES +. endif +. if !empty(PREFER_PKGSRC:Mopenssl) +BUILDLINK_USE_BUILTIN.openssl= NO +. endif .endif .if !defined(_NEED_NEWER_OPENSSL) |