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.

4 files changed, 8 insertions, 12 deletions

diff --git a/multimedia/gstreamer/buildlink3.mk b/multimedia/gstreamer/buildlink3.mk
index 409c0224e9f..f7a9a8a40a2 100644
--- a/multimedia/gstreamer/buildlink3.mk
+++ b/multimedia/gstreamer/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:13 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GSTREAMER_BUILDLINK3_MK:=	${GSTREAMER_BUILDLINK3_MK}+
@@ -13,6 +13,7 @@ BUILDLINK_PACKAGES+=	gstreamer
 .if !empty(GSTREAMER_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.gstreamer+=	gstreamer>=0.6.4
 BUILDLINK_PKGSRCDIR.gstreamer?=	../../multimedia/gstreamer
+.endif	# GSTREAMER_BUILDLINK3_MK
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
@@ -20,6 +21,4 @@ BUILDLINK_PKGSRCDIR.gstreamer?=	../../multimedia/gstreamer
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
 
-.endif	# GSTREAMER_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/multimedia/mjpegtools/buildlink3.mk b/multimedia/mjpegtools/buildlink3.mk
index 905dc54d744..d50bcb95d99 100644
--- a/multimedia/mjpegtools/buildlink3.mk
+++ b/multimedia/mjpegtools/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:13 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 MJPEGTOOLS_BUILDLINK3_MK:=	${MJPEGTOOLS_BUILDLINK3_MK}+
@@ -13,12 +13,11 @@ BUILDLINK_PACKAGES+=	mjpegtools
 .if !empty(MJPEGTOOLS_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.mjpegtools+=		mjpegtools>=1.6.1.90nb3
 BUILDLINK_PKGSRCDIR.mjpegtools?=	../../multimedia/mjpegtools
+.endif	# MJPEGTOOLS_BUILDLINK3_MK
 
 .include "../../audio/lame/buildlink3.mk"
 .include "../../devel/SDL/buildlink3.mk"
 .include "../../graphics/ImageMagick/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 
-.endif	# MJPEGTOOLS_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/multimedia/openquicktime/buildlink3.mk b/multimedia/openquicktime/buildlink3.mk
index 918fbd3746f..977f9fc35f8 100644
--- a/multimedia/openquicktime/buildlink3.mk
+++ b/multimedia/openquicktime/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2004/03/06 11:09:44 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:13 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 OPENQUICKTIME_BUILDLINK3_MK:=	${OPENQUICKTIME_BUILDLINK3_MK}+
@@ -13,10 +13,9 @@ BUILDLINK_PACKAGES+=	openquicktime
 .if !empty(OPENQUICKTIME_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.openquicktime+=	openquicktime>=1.0nb2
 BUILDLINK_PKGSRCDIR.openquicktime?=	../../multimedia/openquicktime
+.endif	# OPENQUICKTIME_BUILDLINK3_MK
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 
-.endif	# OPENQUICKTIME_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/multimedia/xine-lib/buildlink3.mk b/multimedia/xine-lib/buildlink3.mk
index b06fb5f06a4..9e95b1b3af7 100644
--- a/multimedia/xine-lib/buildlink3.mk
+++ b/multimedia/xine-lib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/03/11 17:26:02 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/03/18 09:12:13 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XINE_LIB_BUILDLINK3_MK:=	${XINE_LIB_BUILDLINK3_MK}+
@@ -13,6 +13,7 @@ BUILDLINK_PACKAGES+=	xine-lib
 .if !empty(XINE_LIB_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.xine-lib+=	xine-lib>=1rc3a
 BUILDLINK_PKGSRCDIR.xine-lib?=	../../multimedia/xine-lib
+.endif	# XINE_LIB_BUILDLINK3_MK
 
 .include "../../audio/flac/buildlink3.mk"
 .include "../../audio/libvorbis/buildlink3.mk"
@@ -26,6 +27,4 @@ BUILDLINK_PKGSRCDIR.xine-lib?=	../../multimedia/xine-lib
 .include "../../graphics/png/buildlink3.mk"
 .include "../../multimedia/xvidcore/buildlink3.mk"
 
-.endif	# XINE_LIB_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}