Reorder location and setting of BUILDLINK_PACKAGES to match template

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

5 files changed, 39 insertions, 49 deletions

diff --git a/sysutils/fam/buildlink3.mk b/sysutils/fam/buildlink3.mk
index b23c477b8f1..89a35df373c 100644
--- a/sysutils/fam/buildlink3.mk
+++ b/sysutils/fam/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 00:39:29 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use fam.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:40 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 FAM_BUILDLINK3_MK:=	${FAM_BUILDLINK3_MK}+
@@ -12,11 +7,12 @@ FAM_BUILDLINK3_MK:=	${FAM_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	fam
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nfam}
+BUILDLINK_PACKAGES+=	fam
+
 .if !empty(FAM_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=		fam
 BUILDLINK_DEPENDS.fam+=		fam>=2.6.10
 BUILDLINK_PKGSRCDIR.fam?=	../../sysutils/fam
-
-.endif # FAM_BUILDLINK3_MK
+.endif	# FAM_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/sysutils/gkrellm/buildlink3.mk b/sysutils/gkrellm/buildlink3.mk
index 7d401a55463..f93f7db3398 100644
--- a/sysutils/gkrellm/buildlink3.mk
+++ b/sysutils/gkrellm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2004/02/24 22:11:28 cube Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:40 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GKRELLM_BUILDLINK3_MK:=	${GKRELLM_BUILDLINK3_MK}+
@@ -7,14 +7,17 @@ GKRELLM_BUILDLINK3_MK:=	${GKRELLM_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	gkrellm
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngkrellm}
+BUILDLINK_PACKAGES+=	gkrellm
+
 .if !empty(GKRELLM_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			gkrellm
-BUILDLINK_DEPENDS.gkrellm+=		gkrellm>=2.1.22
-BUILDLINK_PKGSRCDIR.gkrellm?=		../../sysutils/gkrellm
-.include "../../x11/gtk2/buildlink3.mk"
+BUILDLINK_DEPENDS.gkrellm+=	gkrellm>=2.1.22
+BUILDLINK_PKGSRCDIR.gkrellm?=	../../sysutils/gkrellm
+
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
 
-.endif # GKRELLM_BUILDLINK3_MK
+.endif	# GKRELLM_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/sysutils/gnome-vfs/buildlink3.mk b/sysutils/gnome-vfs/buildlink3.mk
index fc5cb1064a3..efe9a4dde7e 100644
--- a/sysutils/gnome-vfs/buildlink3.mk
+++ b/sysutils/gnome-vfs/buildlink3.mk
@@ -1,28 +1,25 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/26 17:29:24 jmmv Exp $
-#
-# This Makefile fragment is included by packages that use gnome-vfs.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:40 jlam Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GNOME_VFS_BUILDLINK3_MK:=	${GNOME_VFS_BUILDLINK3_MK}+
 
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	gnome-vfs
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnome-vfs}
+BUILDLINK_PACKAGES+=	gnome-vfs
+
 .if !empty(GNOME_VFS_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			gnome-vfs
-BUILDLINK_DEPENDS.gnome-vfs+=		gnome-vfs>=1.0.5nb5
-BUILDLINK_PKGSRCDIR.gnome-vfs?=		../../sysutils/gnome-vfs
+BUILDLINK_DEPENDS.gnome-vfs+=	gnome-vfs>=1.0.5nb5
+BUILDLINK_PKGSRCDIR.gnome-vfs?=	../../sysutils/gnome-vfs
 
-.include "../../converters/libiconv/buildlink3.mk"
 .include "../../archivers/bzip2/buildlink3.mk"
+.include "../../converters/libiconv/buildlink3.mk"
 .include "../../databases/gnome-mime-data/buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/GConf/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
 
-.endif # GNOME_VFS_BUILDLINK3_MK
+.endif	# GNOME_VFS_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/sysutils/gnome-vfs2/buildlink3.mk b/sysutils/gnome-vfs2/buildlink3.mk
index 0a9eaae95a8..6159b546ecf 100644
--- a/sysutils/gnome-vfs2/buildlink3.mk
+++ b/sysutils/gnome-vfs2/buildlink3.mk
@@ -1,19 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/02/11 13:05:38 wiz Exp $
-#
-# This Makefile fragment is included by packages that use gnome-vfs2.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:40 jlam Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GNOME_VFS2_BUILDLINK3_MK:=	${GNOME_VFS2_BUILDLINK3_MK}+
 
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	gnome-vfs2
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnome-vfs2}
+BUILDLINK_PACKAGES+=	gnome-vfs2
+
 .if !empty(GNOME_VFS2_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			gnome-vfs2
 BUILDLINK_DEPENDS.gnome-vfs2+=		gnome-vfs2>=2.4.2nb2
 BUILDLINK_PKGSRCDIR.gnome-vfs2?=	../../sysutils/gnome-vfs2
 
@@ -26,10 +23,10 @@ BUILDLINK_PKGSRCDIR.gnome-vfs2?=	../../sysutils/gnome-vfs2
 .include "../../devel/libbonobo/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
 .include "../../net/ORBit2/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../sysutils/fam/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
 
-.endif # GNOME_VFS2_BUILDLINK3_MK
+.endif	# GNOME_VFS2_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/sysutils/nautilus/buildlink3.mk b/sysutils/nautilus/buildlink3.mk
index 3a491988f92..f5c1e816aa8 100644
--- a/sysutils/nautilus/buildlink3.mk
+++ b/sysutils/nautilus/buildlink3.mk
@@ -1,21 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/02/14 00:23:34 jmmv Exp $
-#
-# This Makefile fragment is included by packages that use nautilus.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.4 2004/03/05 19:25:40 jlam Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 NAUTILUS_BUILDLINK3_MK:=	${NAUTILUS_BUILDLINK3_MK}+
 
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	nautilus
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nnautilus}
+BUILDLINK_PACKAGES+=	nautilus
+
 .if !empty(NAUTILUS_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			nautilus
-BUILDLINK_DEPENDS.nautilus+=		nautilus>=2.4.2nb4
-BUILDLINK_PKGSRCDIR.nautilus?=		../../sysutils/nautilus
+BUILDLINK_DEPENDS.nautilus+=	nautilus>=2.4.2nb4
+BUILDLINK_PKGSRCDIR.nautilus?=	../../sysutils/nautilus
 
 .include "../../audio/esound/buildlink3.mk"
 .include "../../devel/GConf2/schemas.mk"
@@ -36,6 +33,6 @@ BUILDLINK_PKGSRCDIR.nautilus?=		../../sysutils/nautilus
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/startup-notification/buildlink3.mk"
 
-.endif # NAUTILUS_BUILDLINK3_MK
+.endif	# NAUTILUS_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}