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/net/ORBit/buildlink3.mk b/net/ORBit/buildlink3.mk
index b92e3d33512..9406429c902 100644
--- a/net/ORBit/buildlink3.mk
+++ b/net/ORBit/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:38 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/03/18 09:12:13 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 ORBIT_BUILDLINK3_MK:=	${ORBIT_BUILDLINK3_MK}+
@@ -13,11 +13,10 @@ BUILDLINK_PACKAGES+=	ORBit
 .if !empty(ORBIT_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.ORBit+=	ORBit>=0.5.15nb5
 BUILDLINK_PKGSRCDIR.ORBit?=	../../net/ORBit
+.endif	# ORBIT_BUILDLINK3_MK
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib/buildlink3.mk"
 .include "../../security/tcp_wrappers/buildlink3.mk"
 
-.endif	# ORBIT_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/net/ORBit2/buildlink3.mk b/net/ORBit2/buildlink3.mk
index fb964e39e3b..b80feb63f7a 100644
--- a/net/ORBit2/buildlink3.mk
+++ b/net/ORBit2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/03/05 19:25:38 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/03/18 09:12:13 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 ORBIT2_BUILDLINK3_MK:=	${ORBIT2_BUILDLINK3_MK}+
@@ -13,11 +13,10 @@ BUILDLINK_PACKAGES+=	ORBit2
 .if !empty(ORBIT2_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.ORBit2+=	ORBit2>=2.8.2
 BUILDLINK_PKGSRCDIR.ORBit2?=	../../net/ORBit2
+.endif	# ORBIT2_BUILDLINK3_MK
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
 .include "../../net/libIDL/buildlink3.mk"
 
-.endif	# ORBIT2_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/net/SDL_net/buildlink3.mk b/net/SDL_net/buildlink3.mk
index 9803723e92b..6331ac11523 100644
--- a/net/SDL_net/buildlink3.mk
+++ b/net/SDL_net/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/03/06 17:28:59 xtraeme Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:13 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 SDL_NET_BUILDLINK3_MK:=	${SDL_NET_BUILDLINK3_MK}+
@@ -13,9 +13,8 @@ BUILDLINK_PACKAGES+=	SDL_net
 .if !empty(SDL_NET_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.SDL_net+=	SDL_net>=1.2.5nb1
 BUILDLINK_PKGSRCDIR.SDL_net?=	../../net/SDL_net
+.endif	# SDL_NET_BUILDLINK3_MK
 
 .include "../../devel/SDL/buildlink3.mk"
 
-.endif	# SDL_NET_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/net/gnet/buildlink3.mk b/net/gnet/buildlink3.mk
index 86d0e16da8b..2fac4f3c97d 100644
--- a/net/gnet/buildlink3.mk
+++ b/net/gnet/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:38 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:14 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GNET_BUILDLINK3_MK:=	${GNET_BUILDLINK3_MK}+
@@ -13,9 +13,8 @@ BUILDLINK_PACKAGES+=	gnet
 .if !empty(GNET_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.gnet+=	gnet>=2.0.3nb1
 BUILDLINK_PKGSRCDIR.gnet?=	../../net/gnet
+.endif	# GNET_BUILDLINK3_MK
 
 .include "../../devel/glib2/buildlink3.mk"
 
-.endif	# GNET_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/net/gnet1/buildlink3.mk b/net/gnet1/buildlink3.mk
index 503519f7731..35a8896ba1d 100644
--- a/net/gnet1/buildlink3.mk
+++ b/net/gnet1/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:38 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:14 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GNET1_BUILDLINK3_MK:=	${GNET1_BUILDLINK3_MK}+
@@ -13,9 +13,8 @@ BUILDLINK_PACKAGES+=	gnet1
 .if !empty(GNET1_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.gnet1+=	gnet1>=1.1.8nb2
 BUILDLINK_PKGSRCDIR.gnet1?=	../../net/gnet1
+.endif	# GNET1_BUILDLINK3_MK
 
 .include "../../devel/glib2/buildlink3.mk"
 
-.endif	# GNET1_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/net/libIDL/buildlink3.mk b/net/libIDL/buildlink3.mk
index 69ce8b1a0f2..3b39ccd7191 100644
--- a/net/libIDL/buildlink3.mk
+++ b/net/libIDL/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/03/05 19:25:38 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/03/18 09:12:14 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBIDL_BUILDLINK3_MK:=	${LIBIDL_BUILDLINK3_MK}+
@@ -13,10 +13,9 @@ BUILDLINK_PACKAGES+=	libIDL
 .if !empty(LIBIDL_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.libIDL+=	libIDL>=0.8.2
 BUILDLINK_PKGSRCDIR.libIDL?=	../../net/libIDL
+.endif	# LIBIDL_BUILDLINK3_MK
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 
-.endif	# LIBIDL_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/net/libsoup/buildlink3.mk b/net/libsoup/buildlink3.mk
index c45e3c0b482..6e37d043471 100644
--- a/net/libsoup/buildlink3.mk
+++ b/net/libsoup/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:38 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:14 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBSOUP_BUILDLINK3_MK:=	${LIBSOUP_BUILDLINK3_MK}+
@@ -13,11 +13,10 @@ BUILDLINK_PACKAGES+=	libsoup
 .if !empty(LIBSOUP_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.libsoup+=	libsoup>=1.99.26
 BUILDLINK_PKGSRCDIR.libsoup?=	../../net/libsoup
+.endif	# LIBSOUP_BUILDLINK3_MK
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 
-.endif	# LIBSOUP_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/net/netatalk/buildlink3.mk b/net/netatalk/buildlink3.mk
index 97bb87568ca..f3024f6ab54 100644
--- a/net/netatalk/buildlink3.mk
+++ b/net/netatalk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:38 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:14 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 NETATALK_BUILDLINK3_MK:=	${NETATALK_BUILDLINK3_MK}+
@@ -13,9 +13,8 @@ BUILDLINK_PACKAGES+=	netatalk
 .if !empty(NETATALK_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.netatalk+=	netatalk>=1.6.2
 BUILDLINK_PKGSRCDIR.netatalk?=	../../net/netatalk
+.endif	# NETATALK_BUILDLINK3_MK
 
 .include "../../devel/rx/buildlink3.mk"
 
-.endif	# NETATALK_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/net/py-ORBit/buildlink3.mk b/net/py-ORBit/buildlink3.mk
index fd064643c49..0f372bc4540 100644
--- a/net/py-ORBit/buildlink3.mk
+++ b/net/py-ORBit/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/03/16 18:23:27 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/03/18 09:12:14 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PY_ORBIT_BUILDLINK3_MK:=	${PY_ORBIT_BUILDLINK3_MK}+
@@ -16,9 +16,8 @@ BUILDLINK_PACKAGES+=	pyorbit
 BUILDLINK_PKGBASE.pyorbit?=	${PYPKGPREFIX}-ORBit
 BUILDLINK_DEPENDS.pyorbit+=	${PYPKGPREFIX}-ORBit>=2.0.0nb1
 BUILDLINK_PKGSRCDIR.pyorbit?=	../../net/py-ORBit
+.endif	# PY_ORBIT_BUILDLINK3_MK
 
 .include "../../net/ORBit2/buildlink3.mk"
 
-.endif	# PY_ORBIT_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}