diff options
author | jlam <jlam@pkgsrc.org> | 2004-02-05 07:06:15 +0000 |
---|---|---|
committer | jlam <jlam@pkgsrc.org> | 2004-02-05 07:06:15 +0000 |
commit | e7133cac25a67cadb35ea338f0d9924c2a9da764 (patch) | |
tree | 12fb12151bde110b07a88dc1c8875abc30741865 /security | |
parent | 07a9d8dfb209780130723eba289f41872654e7c3 (diff) | |
download | pkgsrc-e7133cac25a67cadb35ea338f0d9924c2a9da764.tar.gz |
Rename BUILDLINK_PREFER_PKGSRC to PREFER_PKGSRC so that we can use its
value outside of buildlink-related files.
Diffstat (limited to 'security')
-rw-r--r-- | security/PAM/buildlink2.mk | 9 | ||||
-rw-r--r-- | security/PAM/buildlink3.mk | 9 | ||||
-rw-r--r-- | security/heimdal/buildlink3.mk | 9 | ||||
-rw-r--r-- | security/openssl/buildlink2.mk | 9 | ||||
-rw-r--r-- | security/openssl/buildlink3.mk | 9 |
5 files changed, 20 insertions, 25 deletions
diff --git a/security/PAM/buildlink2.mk b/security/PAM/buildlink2.mk index 8543afaedf2..669dd55d98e 100644 --- a/security/PAM/buildlink2.mk +++ b/security/PAM/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.3 2004/02/05 06:58:03 jlam Exp $ +# $NetBSD: buildlink2.mk,v 1.4 2004/02/05 07:06:15 jlam Exp $ .if !defined(PAM_BUILDLINK2_MK) PAM_BUILDLINK2_MK= # defined @@ -14,10 +14,9 @@ _NEED_PAM= NO _NEED_PAM= YES .endif -.if defined(BUILDLINK_PREFER_PKGSRC) -. if empty(BUILDLINK_PREFER_PKGSRC) || \ - !empty(BUILDLINK_PREFER_PKGSRC:M[yY][eE][sS]) || \ - !empty(BUILDLINK_PREFER_PKGSRC:Mpam) +.if defined(PREFER_PKGSRC) +. if empty(PREFER_PKGSRC) || !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ + !empty(PREFER_PKGSRC:Mpam) _NEED_PAM= YES . endif .endif diff --git a/security/PAM/buildlink3.mk b/security/PAM/buildlink3.mk index fb548519bed..b45540e9de7 100644 --- a/security/PAM/buildlink3.mk +++ b/security/PAM/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.6 2004/02/05 06:58:03 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2004/02/05 07:06:15 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ PAM_BUILDLINK3_MK:= ${PAM_BUILDLINK3_MK}+ @@ -20,10 +20,9 @@ BUILDLINK_IS_BUILTIN.pam= YES . endif .endif -.if defined(BUILDLINK_PREFER_PKGSRC) -. if empty(BUILDLINK_PREFER_PKGSRC) || \ - !empty(BUILDLINK_PREFER_PKGSRC:M[yY][eE][sS]) || \ - !empty(BUILDLINK_PREFER_PKGSRC:Mpam) +.if defined(PREFER_PKGSRC) +. if empty(PREFER_PKGSRC) || !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ + !empty(PREFER_PKGSRC:Mpam) BUILDLINK_USE_BUILTIN.pam= NO . endif .endif diff --git a/security/heimdal/buildlink3.mk b/security/heimdal/buildlink3.mk index e85926668e0..7ae82479fb6 100644 --- a/security/heimdal/buildlink3.mk +++ b/security/heimdal/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.7 2004/02/05 06:58:03 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2004/02/05 07:06:15 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ HEIMDAL_BUILDLINK3_MK:= ${HEIMDAL_BUILDLINK3_MK}+ @@ -29,10 +29,9 @@ BUILDLINK_IS_BUILTIN.heimdal!= \ MAKEFLAGS+= BUILDLINK_IS_BUILTIN.heimdal="${BUILDLINK_IS_BUILTIN.heimdal}" .endif -.if defined(BUILDLINK_PREFER_PKGSRC) -. if empty(BUILDLINK_PREFER_PKGSRC) || \ - !empty(BUILDLINK_PREFER_PKGSRC:M[yY][eE][sS]) || \ - !empty(BUILDLINK_PREFER_PKGSRC:Mheimdal) +.if defined(PREFER_PKGSRC) +. if empty(PREFER_PKGSRC) || !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ + !empty(PREFER_PKGSRC:Mheimdal) BUILDLINK_USE_BUILTIN.heimdal= NO . endif .endif diff --git a/security/openssl/buildlink2.mk b/security/openssl/buildlink2.mk index 670158b4900..26d7681cd85 100644 --- a/security/openssl/buildlink2.mk +++ b/security/openssl/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.16 2004/02/05 06:58:03 jlam Exp $ +# $NetBSD: buildlink2.mk,v 1.17 2004/02/05 07:06:15 jlam Exp $ .if !defined(OPENSSL_BUILDLINK2_MK) OPENSSL_BUILDLINK2_MK= # defined @@ -24,10 +24,9 @@ BUILDLINK_IS_BUILTIN.openssl= YES . endif .endif -.if defined(BUILDLINK_PREFER_PKGSRC) -. if empty(BUILDLINK_PREFER_PKGSRC) || \ - !empty(BUILDLINK_PREFER_PKGSRC:M[yY][eE][sS]) || \ - !empty(BUILDLINK_PREFER_PKGSRC:Mopenssl) +.if defined(PREFER_PKGSRC) +. if empty(PREFER_PKGSRC) || !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ + !empty(PREFER_PKGSRC:Mopenssl) _NEED_OPENSSL= YES . endif .endif diff --git a/security/openssl/buildlink3.mk b/security/openssl/buildlink3.mk index bb2d0abb8dc..aafc62f8fda 100644 --- a/security/openssl/buildlink3.mk +++ b/security/openssl/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.9 2004/02/05 06:58:03 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2004/02/05 07:06:15 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ OPENSSL_BUILDLINK3_MK:= ${OPENSSL_BUILDLINK3_MK}+ @@ -28,10 +28,9 @@ BUILDLINK_IS_BUILTIN.openssl= YES . endif .endif -.if defined(BUILDLINK_PREFER_PKGSRC) -. if empty(BUILDLINK_PREFER_PKGSRC) || \ - !empty(BUILDLINK_PREFER_PKGSRC:M[yY][eE][sS]) || \ - !empty(BUILDLINK_PREFER_PKGSRC:Mopenssl) +.if defined(PREFER_PKGSRC) +. if empty(PREFER_PKGSRC) || !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ + !empty(PREFER_PKGSRC:Mopenssl) BUILDLINK_USE_BUILTIN.openssl= NO . endif .endif |