Reorder location and setting of BUILDLINK_PACKAGES to match template

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

3 files changed, 23 insertions, 25 deletions

diff --git a/wm/metacity/buildlink3.mk b/wm/metacity/buildlink3.mk
index aa6af2716ad..1d9949882d6 100644
--- a/wm/metacity/buildlink3.mk
+++ b/wm/metacity/buildlink3.mk
@@ -1,21 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/04 19:17:04 minskim Exp $
-#
-# This Makefile fragment is included by packages that use metacity.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:41 jlam Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 METACITY_BUILDLINK3_MK:=	${METACITY_BUILDLINK3_MK}+
 
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	metacity
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nmetacity}
+BUILDLINK_PACKAGES+=	metacity
+
 .if !empty(METACITY_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			metacity
-BUILDLINK_DEPENDS.metacity+=		metacity>=2.6.3nb1
-BUILDLINK_PKGSRCDIR.metacity?=		../../wm/metacity
+BUILDLINK_DEPENDS.metacity+=	metacity>=2.6.3nb1
+BUILDLINK_PKGSRCDIR.metacity?=	../../wm/metacity
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libglade2/buildlink3.mk"
@@ -24,6 +21,6 @@ BUILDLINK_PKGSRCDIR.metacity?=		../../wm/metacity
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/startup-notification/buildlink3.mk"
 
-.endif # METACITY_BUILDLINK3_MK
+.endif	# METACITY_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/wm/openbox/buildlink3.mk b/wm/openbox/buildlink3.mk
index 615f8964fb3..1e753b5cce8 100644
--- a/wm/openbox/buildlink3.mk
+++ b/wm/openbox/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/16 23:00:47 snj Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:41 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 OPENBOX_BUILDLINK3_MK:=	${OPENBOX_BUILDLINK3_MK}+
@@ -7,16 +7,18 @@ OPENBOX_BUILDLINK3_MK:=	${OPENBOX_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	openbox
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nopenbox}
+BUILDLINK_PACKAGES+=	openbox
+
 .if !empty(OPENBOX_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			openbox
-BUILDLINK_DEPENDS.openbox+=		openbox>=3.1
-BUILDLINK_PKGSRCDIR.openbox?=		../../wm/openbox
+BUILDLINK_DEPENDS.openbox+=	openbox>=3.1
+BUILDLINK_PKGSRCDIR.openbox?=	../../wm/openbox
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../fonts/Xft2/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 
-.endif # OPENBOX_BUILDLINK3_MK
+.endif	# OPENBOX_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/wm/windowmaker/buildlink3.mk b/wm/windowmaker/buildlink3.mk
index 8042ffeadd2..8a29f2e33a9 100644
--- a/wm/windowmaker/buildlink3.mk
+++ b/wm/windowmaker/buildlink3.mk
@@ -1,28 +1,27 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/25 19:02:39 minskim Exp $
-#
-# This Makefile fragment is included by packages that use windowmaker.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:41 jlam Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 WINDOWMAKER_BUILDLINK3_MK:=	${WINDOWMAKER_BUILDLINK3_MK}+
 
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	windowmaker
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nwindowmaker}
+BUILDLINK_PACKAGES+=	windowmaker
+
 .if !empty(WINDOWMAKER_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			windowmaker
 BUILDLINK_DEPENDS.windowmaker+=		windowmaker>=0.80.2nb3
-BUILDLINK_PKGSRCDIR.windowmaker?=		../../wm/windowmaker
+BUILDLINK_PKGSRCDIR.windowmaker?=	../../wm/windowmaker
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../graphics/hermes/buildlink3.mk"
-.include "../../graphics/libungif/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
+.include "../../graphics/libungif/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../graphics/xpm/buildlink3.mk"
 
-.endif # WINDOWMAKER_BUILDLINK3_MK
+.endif	# WINDOWMAKER_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}