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.

2 files changed, 48 insertions, 48 deletions

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)