From db14b05ecdfa92241cb3b9ca1a9c55447e2b1ae4 Mon Sep 17 00:00:00 2001 From: jlam Date: Thu, 12 Feb 2004 01:59:37 +0000 Subject: Reorganize code so that any dependencies are checked as part of deciding whether the software is built-in or not. This facilitates implementing the forthcoming PKGSRC_NATIVE variable. --- security/PAM/buildlink2.mk | 8 ++++- security/PAM/buildlink3.mk | 16 +++++----- security/heimdal/buildlink3.mk | 71 +++++++++++++++++++++--------------------- security/openssl/buildlink2.mk | 42 ++++++++++++------------- security/openssl/buildlink3.mk | 54 ++++++++++++++++---------------- 5 files changed, 97 insertions(+), 94 deletions(-) (limited to 'security') diff --git a/security/PAM/buildlink2.mk b/security/PAM/buildlink2.mk index 39e44bf1d7d..f2348d0f858 100644 --- a/security/PAM/buildlink2.mk +++ b/security/PAM/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.5 2004/02/05 07:17:14 jlam Exp $ +# $NetBSD: buildlink2.mk,v 1.6 2004/02/12 01:59:38 jlam Exp $ .if !defined(PAM_BUILDLINK2_MK) PAM_BUILDLINK2_MK= # defined @@ -9,6 +9,12 @@ BUILDLINK_DEPENDS.pam?= PAM>=0.75 BUILDLINK_PKGSRCDIR.pam?= ../../security/PAM .if exists(/usr/include/security/pam_appl.h) +_BUILTIN_PAM= YES +.else +_BUILTIN_PAM= NO +.endif + +.if ${_BUILTIN_PAM} == "YES" _NEED_PAM= NO .else _NEED_PAM= YES diff --git a/security/PAM/buildlink3.mk b/security/PAM/buildlink3.mk index ca1f2d334af..b80345cf8ab 100644 --- a/security/PAM/buildlink3.mk +++ b/security/PAM/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.8 2004/02/05 07:17:14 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2004/02/12 01:59:38 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ PAM_BUILDLINK3_MK:= ${PAM_BUILDLINK3_MK}+ @@ -20,6 +20,12 @@ BUILDLINK_IS_BUILTIN.pam= YES . endif .endif +.if !empty(BUILDLINK_IS_BUILTIN.pam:M[yY][eE][sS]) +BUILDLINK_USE_BUILTIN.pam= YES +.else +BUILDLINK_USE_BUILTIN.pam= NO +.endif + .if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ !empty(PREFER_PKGSRC:Mpam) BUILDLINK_USE_BUILTIN.pam= NO @@ -29,14 +35,6 @@ BUILDLINK_USE_BUILTIN.pam= NO BUILDLINK_USE_BUILTIN.pam= YES .endif -.if !defined(BUILDLINK_USE_BUILTIN.pam) -. if !empty(BUILDLINK_IS_BUILTIN.pam:M[nN][oO]) -BUILDLINK_USE_BUILTIN.pam= NO -. else -BUILDLINK_USE_BUILTIN.pam= YES -. endif -.endif - .if !empty(BUILDLINK_USE_BUILTIN.pam:M[nN][oO]) . if !empty(BUILDLINK_DEPTH:M+) BUILDLINK_DEPENDS+= pam diff --git a/security/heimdal/buildlink3.mk b/security/heimdal/buildlink3.mk index 6e131e0a674..a69fee08e9a 100644 --- a/security/heimdal/buildlink3.mk +++ b/security/heimdal/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.10 2004/02/06 19:04:25 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2004/02/12 01:59:38 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ HEIMDAL_BUILDLINK3_MK:= ${HEIMDAL_BUILDLINK3_MK}+ @@ -19,29 +19,15 @@ _KRB5_KRB5_H= /usr/include/krb5/krb5.h .if !defined(BUILDLINK_IS_BUILTIN.heimdal) BUILDLINK_IS_BUILTIN.heimdal= NO . if exists(${_KRB5_KRB5_H}) -BUILDLINK_IS_BUILTIN.heimdal!= \ +_IS_BUILTIN.heimdal!= \ if ${GREP} -q heimdal_version ${_KRB5_KRB5_H}; then \ ${ECHO} "YES"; \ else \ ${ECHO} "NO"; \ fi -. endif -MAKEFLAGS+= BUILDLINK_IS_BUILTIN.heimdal=${BUILDLINK_IS_BUILTIN.heimdal} -.endif - -.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ - !empty(PREFER_PKGSRC:Mheimdal) -BUILDLINK_USE_BUILTIN.heimdal= NO -.endif - -.if !empty(BUILDLINK_CHECK_BUILTIN.heimdal:M[yY][eE][sS]) -BUILDLINK_USE_BUILTIN.heimdal= YES -.endif - -.if !defined(BUILDLINK_USE_BUILTIN.heimdal) -. if !empty(BUILDLINK_IS_BUILTIN.heimdal:M[nN][oO]) -BUILDLINK_USE_BUILTIN.heimdal= NO -. else +BUILDLINK_IS_BUILTIN.heimdal= ${_IS_BUILTIN.heimdal} +. if !empty(BUILDLINK_CHECK_BUILTIN.heimdal:M[nN][oO]) && \ + !empty(_IS_BUILTIN.heimdal:M[yY][eE][sS]) # # Create an appropriate name for the built-in package distributed # with the system. This package name can be used to check against @@ -52,7 +38,7 @@ BUILDLINK_USE_BUILTIN.heimdal= NO # the version number of the software. Match up heimdal versions with # OS versions for an approximate determination of the heimdal version. # -. if !defined(_HEIMDAL_VERSION) +. if !defined(_HEIMDAL_VERSION) _HEIMDAL_VERSIONS= 0.6 0.5 0.4e 0.3f 0.3e _HEIMDAL_0.6= NetBSD-1.6[U-Z]-* NetBSD-1.6Z*-* NetBSD-[2-9]*-* _HEIMDAL_0.5= NetBSD-1.6[I-T]-* @@ -62,32 +48,45 @@ _HEIMDAL_0.4e= NetBSD-1.6[A-H]-* \ _HEIMDAL_0.3f= NetBSD-1.5X-* _HEIMDAL_0.3e= NetBSD-1.5[UVW]-* \ NetBSD-1.5.*-* -. for _heimdal_version_ in ${_HEIMDAL_VERSIONS} -. for _pattern_ in ${_HEIMDAL_${_heimdal_version_}} -. if !empty(MACHINE_PLATFORM:M${_pattern_}) +. for _heimdal_version_ in ${_HEIMDAL_VERSIONS} +. for _pattern_ in ${_HEIMDAL_${_heimdal_version_}} +. if !empty(MACHINE_PLATFORM:M${_pattern_}) _HEIMDAL_VERSION?= ${_heimdal_version_} -. endif +. endif +. endfor . endfor -. endfor _HEIMDAL_VERSION?= 0.2t -MAKEFLAGS+= _HEIMDAL_VERSION=${_HEIMDAL_VERSION} -. endif - +. endif _HEIMDAL_PKG= heimdal-${_HEIMDAL_VERSION} -BUILDLINK_USE_BUILTIN.heimdal?= YES -. for _depend_ in ${BUILDLINK_DEPENDS.heimdal} -. if !empty(BUILDLINK_USE_BUILTIN.heimdal:M[yY][eE][sS]) -BUILDLINK_USE_BUILTIN.heimdal!= \ +BUILDLINK_IS_BUILTIN.heimdal?= YES +. for _depend_ in ${BUILDLINK_DEPENDS.heimdal} +. if !empty(BUILDLINK_IS_BUILTIN.heimdal:M[yY][eE][sS]) +BUILDLINK_IS_BUILTIN.heimdal!= \ if ${PKG_ADMIN} pmatch '${_depend_}' ${_HEIMDAL_PKG}; then \ ${ECHO} "YES"; \ else \ ${ECHO} "NO"; \ fi -. endif -. endfor +. endif +. endfor +. endif . endif -MAKEFLAGS+= \ - BUILDLINK_USE_BUILTIN.heimdal=${BUILDLINK_USE_BUILTIN.heimdal} +MAKEFLAGS+= BUILDLINK_IS_BUILTIN.heimdal=${BUILDLINK_IS_BUILTIN.heimdal} +.endif + +.if !empty(BUILDLINK_IS_BUILTIN.heimdal:M[yY][eE][sS]) +BUILDLINK_USE_BUILTIN.heimdal= YES +.else +BUILDLINK_USE_BUILTIN.heimdal= NO +.endif + +.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ + !empty(PREFER_PKGSRC:Mheimdal) +BUILDLINK_USE_BUILTIN.heimdal= NO +.endif + +.if !empty(BUILDLINK_CHECK_BUILTIN.heimdal:M[yY][eE][sS]) +BUILDLINK_USE_BUILTIN.heimdal= YES .endif .if !empty(BUILDLINK_USE_BUILTIN.heimdal:M[nN][oO]) diff --git a/security/openssl/buildlink2.mk b/security/openssl/buildlink2.mk index 1e1cf1cbfdb..7d6e0412657 100644 --- a/security/openssl/buildlink2.mk +++ b/security/openssl/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.19 2004/02/06 19:04:25 jlam Exp $ +# $NetBSD: buildlink2.mk,v 1.20 2004/02/12 01:59:38 jlam Exp $ .if !defined(OPENSSL_BUILDLINK2_MK) OPENSSL_BUILDLINK2_MK= # defined @@ -20,21 +20,6 @@ _OPENSSL_OPENSSLV_H= /usr/include/openssl/opensslv.h .if !defined(BUILDLINK_IS_BUILTIN.openssl) BUILDLINK_IS_BUILTIN.openssl= NO . if exists(${_OPENSSL_OPENSSLV_H}) -BUILDLINK_IS_BUILTIN.openssl= YES -. endif -.endif - -.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ - !empty(PREFER_PKGSRC:Mopenssl) -_NEED_OPENSSL= YES -.endif - -.if !empty(BUILDLINK_CHECK_BUILTIN.openssl:M[yY][eE][sS]) -_NEED_OPENSSL= NO -.else -. if !empty(BUILDLINK_IS_BUILTIN.openssl:M[nN][oO]) -_NEED_OPENSSL= YES -. elif !defined(_NEED_OPENSSL) # # Create an appropriate name for the built-in package distributed # with the system. This package name can be used to check against @@ -104,14 +89,29 @@ _OPENSSL_PKG= openssl-0.9.6l . endif _OPENSSL_DEPENDS= ${BUILDLINK_DEPENDS.openssl} -_NEED_OPENSSL!= \ +BUILDLINK_IS_BUILTIN.openssl!= \ if ${PKG_ADMIN} pmatch '${_OPENSSL_DEPENDS}' ${_OPENSSL_PKG}; then \ - ${ECHO} "NO"; \ - else \ ${ECHO} "YES"; \ + else \ + ${ECHO} "NO"; \ fi -MAKEFLAGS+= _NEED_OPENSSL=${_NEED_OPENSSL} -. endif # !defined(_NEED_OPENSSL) +. endif +MAKEFLAGS+= BUILDLINK_IS_BUILTIN.openssl=${BUILDLINK_IS_BUILTIN.openssl} +.endif + +.if !empty(BUILDLINK_IS_BUILTIN.openssl:M[yY][eE][sS]) +_NEED_OPENSSL= NO +.else +_NEED_OPENSSL= YES +.endif + +.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ + !empty(PREFER_PKGSRC:Mopenssl) +_NEED_OPENSSL= YES +.endif + +.if !empty(BUILDLINK_CHECK_BUILTIN.openssl:M[yY][eE][sS]) +_NEED_OPENSSL= NO .endif .if !defined(_NEED_NEWER_OPENSSL) diff --git a/security/openssl/buildlink3.mk b/security/openssl/buildlink3.mk index 111b6655c69..a559c5a66f8 100644 --- a/security/openssl/buildlink3.mk +++ b/security/openssl/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.12 2004/02/06 19:04:25 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2004/02/12 01:59:38 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ OPENSSL_BUILDLINK3_MK:= ${OPENSSL_BUILDLINK3_MK}+ @@ -25,22 +25,7 @@ _OPENSSL_OPENSSLV_H= /usr/include/openssl/opensslv.h BUILDLINK_IS_BUILTIN.openssl= NO . if exists(${_OPENSSL_OPENSSLV_H}) BUILDLINK_IS_BUILTIN.openssl= YES -. endif -.endif - -.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ - !empty(PREFER_PKGSRC:Mopenssl) -BUILDLINK_USE_BUILTIN.openssl= NO -.endif - -.if !empty(BUILDLINK_CHECK_BUILTIN.openssl:M[yY][eE][sS]) -BUILDLINK_USE_BUILTIN.openssl= YES -.endif - -.if !defined(BUILDLINK_USE_BUILTIN.openssl) -. if !empty(BUILDLINK_IS_BUILTIN.openssl:M[nN][oO]) -BUILDLINK_USE_BUILTIN.openssl= NO -. else +. if !empty(BUILDLINK_CHECK_BUILTIN.openssl:M[nN][oO]) # # Create an appropriate name for the built-in package distributed # with the system. This package name can be used to check against @@ -105,24 +90,39 @@ _OPENSSL_HAS_FIX!= \ /OPENSSL_HAS_20031107_FIX/ { ans = "YES" } \ END { print ans; exit 0 } \ ' ${_OPENSSL_OPENSSLV_H} -. if !empty(_OPENSSL_VERSION:M0\.9\.6g) && (${_OPENSSL_HAS_FIX} == "YES") +. if !empty(_OPENSSL_VERSION:M0\.9\.6g) && (${_OPENSSL_HAS_FIX} == "YES") _OPENSSL_PKG= openssl-0.9.6l -. endif +. endif -BUILDLINK_USE_BUILTIN.openssl?= YES -. for _depend_ in ${BUILDLINK_DEPENDS.openssl} -. if !empty(BUILDLINK_USE_BUILTIN.openssl:M[yY][eE][sS]) -BUILDLINK_USE_BUILTIN.openssl!= \ +BUILDLINK_IS_BUILTIN.openssl?= YES +. for _depend_ in ${BUILDLINK_DEPENDS.openssl} +. if !empty(BUILDLINK_IS_BUILTIN.openssl:M[yY][eE][sS]) +BUILDLINK_IS_BUILTIN.openssl!= \ if ${PKG_ADMIN} pmatch '${_depend_}' ${_OPENSSL_PKG}; then \ ${ECHO} "YES"; \ else \ ${ECHO} "NO"; \ fi -. endif -. endfor +. endif +. endfor +. endif . endif -MAKEFLAGS+= \ - BUILDLINK_USE_BUILTIN.openssl=${BUILDLINK_USE_BUILTIN.openssl} +MAKEFLAGS+= BUILDLINK_IS_BUILTIN.openssl=${BUILDLINK_IS_BUILTIN.openssl} +.endif + +.if !empty(BUILDLINK_IS_BUILTIN.openssl:M[yY][eE][sS]) +BUILDLINK_USE_BUILTIN.openssl= YES +.else +BUILDLINK_USE_BUILTIN.openssl= NO +.endif + +.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ + !empty(PREFER_PKGSRC:Mopenssl) +BUILDLINK_USE_BUILTIN.openssl= NO +.endif + +.if !empty(BUILDLINK_CHECK_BUILTIN.openssl:M[yY][eE][sS]) +BUILDLINK_USE_BUILTIN.openssl= YES .endif .if !defined(_NEED_NEWER_OPENSSL) -- cgit v1.2.3