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.

5 files changed, 10 insertions, 15 deletions

diff --git a/wm/metacity/buildlink3.mk b/wm/metacity/buildlink3.mk
index 1d9949882d6..b57fe67583e 100644
--- a/wm/metacity/buildlink3.mk
+++ b/wm/metacity/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:41 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/03/18 09:12:15 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 METACITY_BUILDLINK3_MK:=	${METACITY_BUILDLINK3_MK}+
@@ -13,6 +13,7 @@ BUILDLINK_PACKAGES+=	metacity
 .if !empty(METACITY_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.metacity+=	metacity>=2.6.3nb1
 BUILDLINK_PKGSRCDIR.metacity?=	../../wm/metacity
+.endif	# METACITY_BUILDLINK3_MK
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libglade2/buildlink3.mk"
@@ -21,6 +22,4 @@ BUILDLINK_PKGSRCDIR.metacity?=	../../wm/metacity
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/startup-notification/buildlink3.mk"
 
-.endif	# METACITY_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/wm/openbox/buildlink3.mk b/wm/openbox/buildlink3.mk
index 1e753b5cce8..f20a80d7231 100644
--- a/wm/openbox/buildlink3.mk
+++ b/wm/openbox/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:41 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:15 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 OPENBOX_BUILDLINK3_MK:=	${OPENBOX_BUILDLINK3_MK}+
@@ -13,12 +13,11 @@ BUILDLINK_PACKAGES+=	openbox
 .if !empty(OPENBOX_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.openbox+=	openbox>=3.1
 BUILDLINK_PKGSRCDIR.openbox?=	../../wm/openbox
+.endif	# OPENBOX_BUILDLINK3_MK
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../fonts/Xft2/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 
-.endif	# OPENBOX_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/wm/windowmaker/buildlink3.mk b/wm/windowmaker/buildlink3.mk
index 8a29f2e33a9..e56f1188738 100644
--- a/wm/windowmaker/buildlink3.mk
+++ b/wm/windowmaker/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:41 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:15 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 WINDOWMAKER_BUILDLINK3_MK:=	${WINDOWMAKER_BUILDLINK3_MK}+
@@ -13,6 +13,7 @@ BUILDLINK_PACKAGES+=	windowmaker
 .if !empty(WINDOWMAKER_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.windowmaker+=		windowmaker>=0.80.2nb3
 BUILDLINK_PKGSRCDIR.windowmaker?=	../../wm/windowmaker
+.endif	# WINDOWMAKER_BUILDLINK3_MK
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../graphics/hermes/buildlink3.mk"
@@ -22,6 +23,4 @@ BUILDLINK_PKGSRCDIR.windowmaker?=	../../wm/windowmaker
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../graphics/xpm/buildlink3.mk"
 
-.endif	# WINDOWMAKER_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/wm/xfce4-wm-themes/buildlink3.mk b/wm/xfce4-wm-themes/buildlink3.mk
index 24750671bc3..f5aa94780ea 100644
--- a/wm/xfce4-wm-themes/buildlink3.mk
+++ b/wm/xfce4-wm-themes/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/03/10 11:53:37 xtraeme Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:15 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XFCE4_WM_THEMES_BUILDLINK3_MK:=	${XFCE4_WM_THEMES_BUILDLINK3_MK}+
@@ -13,10 +13,9 @@ BUILDLINK_PACKAGES+=	xfce4-wm-themes
 .if !empty(XFCE4_WM_THEMES_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.xfce4-wm-themes+=	xfce4-wm-themes>=4.0.4nb1
 BUILDLINK_PKGSRCDIR.xfce4-wm-themes?=	../../wm/xfce4-wm-themes
+.endif	# XFCE4_WM_THEMES_BUILDLINK3_MK
 
 .include "../../wm/xfce4-wm/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 
-.endif	# XFCE4_WM_THEMES_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/wm/xfce4-wm/buildlink3.mk b/wm/xfce4-wm/buildlink3.mk
index 3804c520bb0..448b338efb9 100644
--- a/wm/xfce4-wm/buildlink3.mk
+++ b/wm/xfce4-wm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/03/10 11:53:37 xtraeme Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:15 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XFCE4_WM_BUILDLINK3_MK:=	${XFCE4_WM_BUILDLINK3_MK}+
@@ -13,12 +13,11 @@ BUILDLINK_PACKAGES+=	xfce4-wm
 .if !empty(XFCE4_WM_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.xfce4-wm+=	xfce4-wm>=4.0.4nb1
 BUILDLINK_PKGSRCDIR.xfce4-wm?=	../../wm/xfce4-wm
+.endif	# XFCE4_WM_BUILDLINK3_MK
 
 .include "../../graphics/xpm/buildlink3.mk"
 .include "../../x11/xfce4-mcs-plugins/buildlink3.mk"
 .include "../../x11/startup-notification/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 
-.endif	# XFCE4_WM_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}