Reorder location and setting of BUILDLINK_PACKAGES to match template

buildlink3.mk file in revision 1.101 of bsd.buildlink3.mk.

6 files changed, 46 insertions, 67 deletions

diff --git a/multimedia/gst-plugins/buildlink3.mk b/multimedia/gst-plugins/buildlink3.mk
index 2c28565aabe..33775b0556b 100644
--- a/multimedia/gst-plugins/buildlink3.mk
+++ b/multimedia/gst-plugins/buildlink3.mk
@@ -1,22 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/20 11:33:21 jmmv Exp $
-#
-# This Makefile fragment is included by packages that use gst-plugins.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:38 jlam Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GST_PLUGINS_BUILDLINK3_MK:=	${GST_PLUGINS_BUILDLINK3_MK}+
 
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	gst-plugins
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngst-plugins}
+BUILDLINK_PACKAGES+=	gst-plugins
+
 .if !empty(GST_PLUGINS_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			gst-plugins
 BUILDLINK_DEPENDS.gst-plugins+=		gst-plugins>=0.6.4
 BUILDLINK_PKGSRCDIR.gst-plugins?=	../../multimedia/gst-plugins
-
-.endif # GST_PLUGINS_BUILDLINK3_MK
+.endif	# GST_PLUGINS_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/multimedia/gstreamer/buildlink3.mk b/multimedia/gstreamer/buildlink3.mk
index ef4b1540f04..409c0224e9f 100644
--- a/multimedia/gstreamer/buildlink3.mk
+++ b/multimedia/gstreamer/buildlink3.mk
@@ -1,21 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 08:16:09 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use gstreamer.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:38 jlam Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GSTREAMER_BUILDLINK3_MK:=	${GSTREAMER_BUILDLINK3_MK}+
 
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	gstreamer
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngstreamer}
+BUILDLINK_PACKAGES+=	gstreamer
+
 .if !empty(GSTREAMER_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			gstreamer
-BUILDLINK_DEPENDS.gstreamer+=		gstreamer>=0.6.4
-BUILDLINK_PKGSRCDIR.gstreamer?=		../../multimedia/gstreamer
+BUILDLINK_DEPENDS.gstreamer+=	gstreamer>=0.6.4
+BUILDLINK_PKGSRCDIR.gstreamer?=	../../multimedia/gstreamer
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
@@ -23,6 +20,6 @@ BUILDLINK_PKGSRCDIR.gstreamer?=		../../multimedia/gstreamer
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
 
-.endif # GSTREAMER_BUILDLINK3_MK
+.endif	# GSTREAMER_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/multimedia/libdvdread/buildlink3.mk b/multimedia/libdvdread/buildlink3.mk
index d48cbe3b488..b68f0047b4b 100644
--- a/multimedia/libdvdread/buildlink3.mk
+++ b/multimedia/libdvdread/buildlink3.mk
@@ -1,22 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 08:59:40 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use libdvdread.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:38 jlam Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBDVDREAD_BUILDLINK3_MK:=	${LIBDVDREAD_BUILDLINK3_MK}+
 
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	libdvdread
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibdvdread}
+BUILDLINK_PACKAGES+=	libdvdread
+
 .if !empty(LIBDVDREAD_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			libdvdread
 BUILDLINK_DEPENDS.libdvdread+=		libdvdread>=0.9.4
 BUILDLINK_PKGSRCDIR.libdvdread?=	../../multimedia/libdvdread
-
-.endif # LIBDVDREAD_BUILDLINK3_MK
+.endif	# LIBDVDREAD_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/multimedia/mjpegtools/buildlink3.mk b/multimedia/mjpegtools/buildlink3.mk
index d9e7e0234af..905dc54d744 100644
--- a/multimedia/mjpegtools/buildlink3.mk
+++ b/multimedia/mjpegtools/buildlink3.mk
@@ -1,27 +1,24 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/18 00:13:28 jmmv Exp $
-#
-# This Makefile fragment is included by packages that use mjpegtools.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:38 jlam Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 MJPEGTOOLS_BUILDLINK3_MK:=	${MJPEGTOOLS_BUILDLINK3_MK}+
 
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	mjpegtools
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nmjpegtools}
+BUILDLINK_PACKAGES+=	mjpegtools
+
 .if !empty(MJPEGTOOLS_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			mjpegtools
 BUILDLINK_DEPENDS.mjpegtools+=		mjpegtools>=1.6.1.90nb3
-BUILDLINK_PKGSRCDIR.mjpegtools?=		../../multimedia/mjpegtools
+BUILDLINK_PKGSRCDIR.mjpegtools?=	../../multimedia/mjpegtools
 
 .include "../../audio/lame/buildlink3.mk"
 .include "../../devel/SDL/buildlink3.mk"
 .include "../../graphics/ImageMagick/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 
-.endif # MJPEGTOOLS_BUILDLINK3_MK
+.endif	# MJPEGTOOLS_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/multimedia/xine-lib/buildlink3.mk b/multimedia/xine-lib/buildlink3.mk
index 5348ea56482..e9b413a6197 100644
--- a/multimedia/xine-lib/buildlink3.mk
+++ b/multimedia/xine-lib/buildlink3.mk
@@ -1,34 +1,31 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/25 18:02:08 jmmv Exp $
-#
-# This Makefile fragment is included by packages that use xine-lib.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:38 jlam Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XINE_LIB_BUILDLINK3_MK:=	${XINE_LIB_BUILDLINK3_MK}+
 
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	xine-lib
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxine-lib}
+BUILDLINK_PACKAGES+=	xine-lib
+
 .if !empty(XINE_LIB_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			xine-lib
-BUILDLINK_DEPENDS.xine-lib+=		xine-lib>=1rc0anb2
-BUILDLINK_PKGSRCDIR.xine-lib?=		../../multimedia/xine-lib
+BUILDLINK_DEPENDS.xine-lib+=	xine-lib>=1rc0anb2
+BUILDLINK_PKGSRCDIR.xine-lib?=	../../multimedia/xine-lib
 
 .include "../../audio/flac/buildlink3.mk"
 .include "../../audio/libvorbis/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/SDL/buildlink3.mk"
-.include "../../graphics/aalib/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../graphics/Mesa/buildlink3.mk"
+.include "../../graphics/aalib/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/mng/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../multimedia/xvidcore/buildlink3.mk"
-.include "../../graphics/freetype2/buildlink3.mk"
 
-.endif # XINE_LIB_BUILDLINK3_MK
+.endif	# XINE_LIB_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/multimedia/xvidcore/buildlink3.mk b/multimedia/xvidcore/buildlink3.mk
index 4db98a95b3b..2720ec9bab5 100644
--- a/multimedia/xvidcore/buildlink3.mk
+++ b/multimedia/xvidcore/buildlink3.mk
@@ -1,22 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/20 17:23:44 jmmv Exp $
-#
-# This Makefile fragment is included by packages that use xvidcore.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:38 jlam Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XVIDCORE_BUILDLINK3_MK:=	${XVIDCORE_BUILDLINK3_MK}+
 
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	xvidcore
 .endif
 
-.if !empty(XVIDCORE_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			xvidcore
-BUILDLINK_DEPENDS.xvidcore+=		xvidcore>=0.9.1
-BUILDLINK_PKGSRCDIR.xvidcore?=		../../multimedia/xvidcore
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxvidcore}
+BUILDLINK_PACKAGES+=	xvidcore
 
-.endif # XVIDCORE_BUILDLINK3_MK
+.if !empty(XVIDCORE_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.xvidcore+=	xvidcore>=0.9.1
+BUILDLINK_PKGSRCDIR.xvidcore?=	../../multimedia/xvidcore
+.endif	# XVIDCORE_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}