Fix serious bug where BUILDLINK_PACKAGES wasn't being ordered properly

by moving the inclusion of buildlink3.mk files outside of the protected
region.  This bug would be seen by users that have set PREFER_PKGSRC
or PREFER_NATIVE to non-default values.

BUILDLINK_PACKAGES should be ordered so that for any package in the
list, that package doesn't depend on any packages to the left of it
in the list.  This ordering property is used to check for builtin
packages in the correct order.  The problem was that including a
buildlink3.mk file for <pkg> correctly ensured that <pkg> was removed
from BUILDLINK_PACKAGES and appended to the end.  However, since the
inclusion of any other buildlink3.mk files within that buildlink3.mk
was in a region that was protected against multiple inclusion, those
dependencies weren't also moved to the end of BUILDLINK_PACKAGES.

9 files changed, 18 insertions, 27 deletions

diff --git a/security/gnutls/buildlink3.mk b/security/gnutls/buildlink3.mk
index 999ab77d92d..2a7f06111fc 100644
--- a/security/gnutls/buildlink3.mk
+++ b/security/gnutls/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/03/16 17:58:01 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/03/18 09:12:14 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GNUTLS_BUILDLINK3_MK:=	${GNUTLS_BUILDLINK3_MK}+
@@ -13,6 +13,7 @@ BUILDLINK_PACKAGES+=	gnutls
 .if !empty(GNUTLS_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.gnutls+=	gnutls>=1.0.8
 BUILDLINK_PKGSRCDIR.gnutls?=	../../security/gnutls
+.endif	# GNUTLS_BUILDLINK3_MK
 
 .include "../../archivers/liblzo/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
@@ -21,6 +22,4 @@ BUILDLINK_PKGSRCDIR.gnutls?=	../../security/gnutls
 .include "../../security/libtasn1/buildlink3.mk"
 .include "../../security/opencdk/buildlink3.mk"
 
-.endif	# GNUTLS_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/security/gpgme/buildlink3.mk b/security/gpgme/buildlink3.mk
index c5b0d2a2d40..21f27b4df54 100644
--- a/security/gpgme/buildlink3.mk
+++ b/security/gpgme/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:39 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:14 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GPGME_BUILDLINK3_MK:=	${GPGME_BUILDLINK3_MK}+
@@ -13,9 +13,8 @@ BUILDLINK_PACKAGES+=	gpgme
 .if !empty(GPGME_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.gpgme+=	gpgme>=0.4.3
 BUILDLINK_PKGSRCDIR.gpgme?=	../../security/gpgme
+.endif	# GPGME_BUILDLINK3_MK
 
 .include "../../security/libgpg-error/buildlink3.mk"
 
-.endif	# GPGME_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/security/gsasl/buildlink3.mk b/security/gsasl/buildlink3.mk
index 484aa12af0c..c967c2092f2 100644
--- a/security/gsasl/buildlink3.mk
+++ b/security/gsasl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:39 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:14 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GSASL_BUILDLINK3_MK:=	${GSASL_BUILDLINK3_MK}+
@@ -13,6 +13,7 @@ BUILDLINK_PACKAGES+=	gsasl
 .if !empty(GSASL_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.gsasl+=	gsasl>=0.0.8
 BUILDLINK_PKGSRCDIR.gsasl?=	../../security/gsasl
+.endif	# GSASL_BUILDLINK3_MK
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libidn/buildlink3.mk"
@@ -20,6 +21,4 @@ BUILDLINK_PKGSRCDIR.gsasl?=	../../security/gsasl
 .include "../../security/gss/buildlink3.mk"
 .include "../../security/libgcrypt/buildlink3.mk"
 
-.endif	# GSASL_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/security/libgcrypt/buildlink3.mk b/security/libgcrypt/buildlink3.mk
index 9bdbd56efcc..86e3da5fc8c 100644
--- a/security/libgcrypt/buildlink3.mk
+++ b/security/libgcrypt/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:39 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/03/18 09:12:14 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBGCRYPT_BUILDLINK3_MK:=	${LIBGCRYPT_BUILDLINK3_MK}+
@@ -13,9 +13,8 @@ BUILDLINK_PACKAGES+=	libgcrypt
 .if !empty(LIBGCRYPT_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.libgcrypt+=	libgcrypt>=1.1.92
 BUILDLINK_PKGSRCDIR.libgcrypt?=	../../security/libgcrypt
+.endif	# LIBGCRYPT_BUILDLINK3_MK
 
 .include "../../security/libgpg-error/buildlink3.mk"
 
-.endif	# LIBGCRYPT_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/security/libgpg-error/buildlink3.mk b/security/libgpg-error/buildlink3.mk
index c46f2bf2c6d..71da79d7caa 100644
--- a/security/libgpg-error/buildlink3.mk
+++ b/security/libgpg-error/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:39 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/03/18 09:12:14 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBGPG_ERROR_BUILDLINK3_MK:=	${LIBGPG_ERROR_BUILDLINK3_MK}+
@@ -13,9 +13,8 @@ BUILDLINK_PACKAGES+=	libgpg-error
 .if !empty(LIBGPG_ERROR_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.libgpg-error+=	libgpg-error>=0.6
 BUILDLINK_PKGSRCDIR.libgpg-error?=	../../security/libgpg-error
+.endif	# LIBGPG_ERROR_BUILDLINK3_MK
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 
-.endif	# LIBGPG_ERROR_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/security/libksba/buildlink3.mk b/security/libksba/buildlink3.mk
index a8bbf83d17d..42b35cafa53 100644
--- a/security/libksba/buildlink3.mk
+++ b/security/libksba/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:39 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/03/18 09:12:14 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBKSBA_BUILDLINK3_MK:=	${LIBKSBA_BUILDLINK3_MK}+
@@ -13,10 +13,9 @@ BUILDLINK_PACKAGES+=	libksba
 .if !empty(LIBKSBA_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.libksba+=	libksba>=0.9.4
 BUILDLINK_PKGSRCDIR.libksba?=	../../security/libksba
+.endif	# LIBKSBA_BUILDLINK3_MK
 
 .include "../../security/libgcrypt/buildlink3.mk"
 .include "../../security/libgpg-error/buildlink3.mk"
 
-.endif	# LIBKSBA_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/security/libtcpa/buildlink3.mk b/security/libtcpa/buildlink3.mk
index 286b4b1564a..20e8ce8df85 100644
--- a/security/libtcpa/buildlink3.mk
+++ b/security/libtcpa/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:39 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/03/18 09:12:14 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBTCPA_BUILDLINK3_MK:=	${LIBTCPA_BUILDLINK3_MK}+
@@ -14,9 +14,8 @@ BUILDLINK_PACKAGES+=	libtcpa
 BUILDLINK_DEPENDS.libtcpa+=	libtcpa>=1.1b
 BUILDLINK_PKGSRCDIR.libtcpa?=	../../security/libtcpa
 BUILDLINK_DEPMETHOD.libtcpa?=	build
+.endif	# LIBTCPA_BUILDLINK3_MK
 
 .include "../../security/openssl/buildlink3.mk"
 
-.endif	# LIBTCPA_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/security/opencdk/buildlink3.mk b/security/opencdk/buildlink3.mk
index 2c3f836e1b6..f651d0cc604 100644
--- a/security/opencdk/buildlink3.mk
+++ b/security/opencdk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:40 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:14 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 OPENCDK_BUILDLINK3_MK:=	${OPENCDK_BUILDLINK3_MK}+
@@ -13,10 +13,9 @@ BUILDLINK_PACKAGES+=	opencdk
 .if !empty(OPENCDK_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.opencdk+=	opencdk>=0.5.3
 BUILDLINK_PKGSRCDIR.opencdk?=	../../security/opencdk
+.endif	# OPENCDK_BUILDLINK3_MK
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/libgcrypt/buildlink3.mk"
 
-.endif	# OPENCDK_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/security/openssl/buildlink3.mk b/security/openssl/buildlink3.mk
index 5002ed30884..5a600e1b50a 100644
--- a/security/openssl/buildlink3.mk
+++ b/security/openssl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.16 2004/03/10 17:57:15 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2004/03/18 09:12:14 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 OPENSSL_BUILDLINK3_MK:=	${OPENSSL_BUILDLINK3_MK}+
@@ -23,11 +23,10 @@ BUILDLINK_TRANSFORM+=	reorder:l:crypt:crypto
 
 SSLBASE=	${BUILDLINK_PREFIX.openssl}
 BUILD_DEFS+=	SSLBASE
+.endif	# OPENSSL_BUILDLINK3_MK
 
 .if defined(USE_RSAREF2) && !empty(USE_RSAREF2:M[yY][eE][sS])
 .  include "../../security/rsaref/buildlink3.mk"
 .endif
 
-.endif	# OPENSSL_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}