Reorder location and setting of BUILDLINK_PACKAGES to match template

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

24 files changed, 195 insertions, 231 deletions

diff --git a/x11/Xfixes/buildlink3.mk b/x11/Xfixes/buildlink3.mk
index 202c537d0d9..cb3f355407c 100644
--- a/x11/Xfixes/buildlink3.mk
+++ b/x11/Xfixes/buildlink3.mk
@@ -1,5 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/15 09:45:30 recht Exp $
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:41 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 XFIXES_BUILDLINK3_MK:=	${XFIXES_BUILDLINK3_MK}+
@@ -8,13 +7,15 @@ XFIXES_BUILDLINK3_MK:=	${XFIXES_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	Xfixes
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NXfixes}
+BUILDLINK_PACKAGES+=	Xfixes
+
 .if !empty(XFIXES_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			Xfixes
-BUILDLINK_DEPENDS.Xfixes+=		Xfixes>=2.0.0
-BUILDLINK_PKGSRCDIR.Xfixes?=		../../x11/Xfixes
+BUILDLINK_DEPENDS.Xfixes+=	Xfixes>=2.0.0
+BUILDLINK_PKGSRCDIR.Xfixes?=	../../x11/Xfixes
 
 .include "../../x11/fixesext/buildlink3.mk"
 
-.endif # XFIXES_BUILDLINK3_MK
+.endif	# XFIXES_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/controlcenter/buildlink3.mk b/x11/controlcenter/buildlink3.mk
index 8a4752d267e..df114cd0b15 100644
--- a/x11/controlcenter/buildlink3.mk
+++ b/x11/controlcenter/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 control-center.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:41 jlam Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 CONTROL_CENTER_BUILDLINK3_MK:=	${CONTROL_CENTER_BUILDLINK3_MK}+
 
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	control-center
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ncontrol-center}
+BUILDLINK_PACKAGES+=	control-center
+
 .if !empty(CONTROL_CENTER_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			control-center
-BUILDLINK_DEPENDS.control-center+=		control-center>=1.4.0.4nb5
-BUILDLINK_PKGSRCDIR.control-center?=		../../x11/controlcenter
+BUILDLINK_DEPENDS.control-center+=	control-center>=1.4.0.4nb5
+BUILDLINK_PKGSRCDIR.control-center?=	../../x11/controlcenter
 
-.include "../../devel/popt/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/popt/buildlink3.mk"
 .include "../../graphics/gdk-pixbuf/buildlink3.mk"
 .include "../../sysutils/gnome-vfs/buildlink3.mk"
 .include "../../x11/gnome-libs/buildlink3.mk"
 
-.endif # CONTROL_CENTER_BUILDLINK3_MK
+.endif	# CONTROL_CENTER_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/fixesext/buildlink3.mk b/x11/fixesext/buildlink3.mk
index 6908f60f497..5ce848af9b6 100644
--- a/x11/fixesext/buildlink3.mk
+++ b/x11/fixesext/buildlink3.mk
@@ -1,19 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/15 09:45:30 recht Exp $
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:42 jlam Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 FIXESEXT_BUILDLINK3_MK:=	${FIXESEXT_BUILDLINK3_MK}+
 
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	fixesext
 .endif
 
-.if !empty(FIXESEXT_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			fixesext
-BUILDLINK_DEPENDS.fixesext+=		fixesext>=2.0
-BUILDLINK_PKGSRCDIR.fixesext?=		../../x11/fixesext
-
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nfixesext}
+BUILDLINK_PACKAGES+=	fixesext
 
-.endif # FIXESEXT_BUILDLINK3_MK
+.if !empty(FIXESEXT_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.fixesext+=	fixesext>=2.0
+BUILDLINK_PKGSRCDIR.fixesext?=	../../x11/fixesext
+.endif	# FIXESEXT_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/fltk/buildlink3.mk b/x11/fltk/buildlink3.mk
index 5b71b3cb04f..7c34c584034 100644
--- a/x11/fltk/buildlink3.mk
+++ b/x11/fltk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/18 10:21:15 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:42 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 FLTK_BUILDLINK3_MK:=	${FLTK_BUILDLINK3_MK}+
@@ -7,13 +7,16 @@ FLTK_BUILDLINK3_MK:=	${FLTK_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	fltk
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nfltk}
+BUILDLINK_PACKAGES+=	fltk
+
 .if !empty(FLTK_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=		fltk
 BUILDLINK_DEPENDS.fltk+=	fltk>=1.0.9
 BUILDLINK_PKGSRCDIR.fltk?=	../../x11/fltk
 
-.  include "../../graphics/MesaLib/buildlink3.mk"
-.  include "../../graphics/glu/buildlink3.mk"
-.endif # FLTK_BUILDLINK3_MK
+.include "../../graphics/MesaLib/buildlink3.mk"
+.include "../../graphics/glu/buildlink3.mk"
+
+.endif	# FLTK_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/gnome-desktop/buildlink3.mk b/x11/gnome-desktop/buildlink3.mk
index d25a1dbf80f..1c77c364ec5 100644
--- a/x11/gnome-desktop/buildlink3.mk
+++ b/x11/gnome-desktop/buildlink3.mk
@@ -1,30 +1,27 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 04:47:10 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use gnome-desktop.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:42 jlam Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GNOME_DESKTOP_BUILDLINK3_MK:=	${GNOME_DESKTOP_BUILDLINK3_MK}+
 
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	gnome-desktop
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnome-desktop}
+BUILDLINK_PACKAGES+=	gnome-desktop
+
 .if !empty(GNOME_DESKTOP_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			gnome-desktop
 BUILDLINK_DEPENDS.gnome-desktop+=	gnome-desktop>=2.4.1.1nb2
 BUILDLINK_PKGSRCDIR.gnome-desktop?=	../../x11/gnome-desktop
 
-.include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../graphics/libgnomecanvas/buildlink3.mk"
+.include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../graphics/gnome2-pixmaps/buildlink3.mk"
+.include "../../graphics/libgnomecanvas/buildlink3.mk"
 .include "../../sysutils/gnome-vfs2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/startup-notification/buildlink3.mk"
 
-.endif # GNOME_DESKTOP_BUILDLINK3_MK
+.endif	# GNOME_DESKTOP_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/gnome-libs/buildlink3.mk b/x11/gnome-libs/buildlink3.mk
index 72c3b345bb9..b3f08470eb6 100644
--- a/x11/gnome-libs/buildlink3.mk
+++ b/x11/gnome-libs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/01/24 03:26:48 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/03/05 19:25:42 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GNOME_LIBS_BUILDLINK3_MK:=	${GNOME_LIBS_BUILDLINK3_MK}+
@@ -9,20 +9,23 @@ GNOME_LIBS_BUILDLINK3_MK:=	${GNOME_LIBS_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	gnome-libs
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnome-libs}
+BUILDLINK_PACKAGES+=	gnome-libs
+
 .if !empty(GNOME_LIBS_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			gnome-libs
 BUILDLINK_DEPENDS.gnome-libs+=		gnome-libs>=1.4.2nb1
 BUILDLINK_PKGSRCDIR.gnome-libs?=	../../x11/gnome-libs
 
-.  include "../../audio/esound/buildlink3.mk"
-.  if ${OPSYS} == "SunOS"
-.    include "../../databases/db/buildlink2.mk"
-.  endif
-.  include "../../devel/gettext-lib/buildlink3.mk"
-.  include "../../graphics/imlib/buildlink3.mk"
-.  include "../../graphics/xpm/buildlink3.mk"
-.  include "../../net/ORBit/buildlink3.mk"
-.  include "../../x11/gtk/buildlink3.mk"
-.endif # GNOME_LIBS_BUILDLINK3_MK
+.include "../../audio/esound/buildlink3.mk"
+.if ${OPSYS} == "SunOS"
+.  include "../../databases/db/buildlink2.mk"
+.endif
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../graphics/imlib/buildlink3.mk"
+.include "../../graphics/xpm/buildlink3.mk"
+.include "../../net/ORBit/buildlink3.mk"
+.include "../../x11/gtk/buildlink3.mk"
+
+.endif	# GNOME_LIBS_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/gnome-mag/buildlink3.mk b/x11/gnome-mag/buildlink3.mk
index 5b9b96a85f3..b196e9efbf9 100644
--- a/x11/gnome-mag/buildlink3.mk
+++ b/x11/gnome-mag/buildlink3.mk
@@ -1,26 +1,23 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/02/17 23:50:33 jmmv Exp $
-#
-# This Makefile fragment is included by packages that use gnome-mag.
-#
-# This file was created automatically using createbuildlink-3.0.
-#
+# $NetBSD: buildlink3.mk,v 1.4 2004/03/05 19:25:42 jlam Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GNOME_MAG_BUILDLINK3_MK:=	${GNOME_MAG_BUILDLINK3_MK}+
 
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	gnome-mag
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnome-mag}
+BUILDLINK_PACKAGES+=	gnome-mag
+
 .if !empty(GNOME_MAG_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			gnome-mag
-BUILDLINK_DEPENDS.gnome-mag+=		gnome-mag>=0.10.4nb1
-BUILDLINK_PKGSRCDIR.gnome-mag?=		../../x11/gnome-mag
+BUILDLINK_DEPENDS.gnome-mag+=	gnome-mag>=0.10.4nb1
+BUILDLINK_PKGSRCDIR.gnome-mag?=	../../x11/gnome-mag
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libbonobo/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 
-.endif # GNOME_MAG_BUILDLINK3_MK
+.endif	# GNOME_MAG_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/gnome-panel/buildlink3.mk b/x11/gnome-panel/buildlink3.mk
index cd9b18cbc6e..b99ac58621c 100644
--- a/x11/gnome-panel/buildlink3.mk
+++ b/x11/gnome-panel/buildlink3.mk
@@ -1,32 +1,29 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 07:11:28 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use gnome-panel.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:42 jlam Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GNOME_PANEL_BUILDLINK3_MK:=	${GNOME_PANEL_BUILDLINK3_MK}+
 
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	gnome-panel
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnome-panel}
+BUILDLINK_PACKAGES+=	gnome-panel
+
 .if !empty(GNOME_PANEL_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			gnome-panel
 BUILDLINK_DEPENDS.gnome-panel+=		gnome-panel>=2.4.1nb3
 BUILDLINK_PKGSRCDIR.gnome-panel?=	../../x11/gnome-panel
 
+.include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libbonobo/buildlink3.mk"
-.include "../../devel/libwnck/buildlink3.mk"
 .include "../../devel/libglade2/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/libwnck/buildlink3.mk"
 .include "../../sysutils/gnome-vfs2/buildlink3.mk"
 .include "../../x11/gnome-desktop/buildlink3.mk"
 .include "../../x11/gnome2-control-center/buildlink3.mk"
 .include "../../x11/startup-notification/buildlink3.mk"
 
-.endif # GNOME_PANEL_BUILDLINK3_MK
+.endif	# GNOME_PANEL_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/gnome2-control-center/buildlink3.mk b/x11/gnome2-control-center/buildlink3.mk
index 915f3880b6b..091878d06df 100644
--- a/x11/gnome2-control-center/buildlink3.mk
+++ b/x11/gnome2-control-center/buildlink3.mk
@@ -1,31 +1,28 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/02/14 14:48:23 jmmv Exp $
-#
-# This Makefile fragment is included by packages that use gnome2-control-center.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:42 jlam Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 GNOME2_CONTROL_CENTER_BUILDLINK3_MK:=	${GNOME2_CONTROL_CENTER_BUILDLINK3_MK}+
 
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	gnome2-control-center
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnome2-control-center}
+BUILDLINK_PACKAGES+=	gnome2-control-center
+
 .if !empty(GNOME2_CONTROL_CENTER_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			gnome2-control-center
 BUILDLINK_DEPENDS.gnome2-control-center+=	gnome2-control-center>=2.4.0nb2
 BUILDLINK_PKGSRCDIR.gnome2-control-center?=	../../x11/gnome2-control-center
 
 .include "../../audio/esound/buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/GConf2/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libbonobo/buildlink3.mk"
 .include "../../devel/libbonoboui/buildlink3.mk"
 .include "../../devel/libglade2/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../fonts/Xft2/buildlink3.mk"
+.include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../sysutils/gnome-vfs2/buildlink3.mk"
 .include "../../sysutils/nautilus/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
@@ -34,6 +31,6 @@ BUILDLINK_PKGSRCDIR.gnome2-control-center?=	../../x11/gnome2-control-center
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/startup-notification/buildlink3.mk"
 
-.endif # GNOME2_CONTROL_CENTER_BUILDLINK3_MK
+.endif	# GNOME2_CONTROL_CENTER_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/gtk/buildlink3.mk b/x11/gtk/buildlink3.mk
index f4fd8b408af..c02e4f4af46 100644
--- a/x11/gtk/buildlink3.mk
+++ b/x11/gtk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/01/24 03:26:48 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2004/03/05 19:25:42 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GTK_BUILDLINK3_MK:=	${GTK_BUILDLINK3_MK}+
@@ -7,16 +7,19 @@ GTK_BUILDLINK3_MK:=	${GTK_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	gtk
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngtk}
+BUILDLINK_PACKAGES+=	gtk
+
 .if !empty(GTK_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=		gtk
 BUILDLINK_DEPENDS.gtk+=		gtk+>=1.2.10
 BUILDLINK_RECOMMENDED.gtk?=	gtk+>=1.2.10nb6
 BUILDLINK_PKGSRCDIR.gtk?=	../../x11/gtk
 
-USE_X11=	YES
+USE_X11=	yes
+
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/glib/buildlink3.mk"
 
-.  include "../../devel/gettext-lib/buildlink3.mk"
-.  include "../../devel/glib/buildlink3.mk"
 .endif	# GTK_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/gtk2-engines/buildlink3.mk b/x11/gtk2-engines/buildlink3.mk
index 38aac823847..d9270cd4c63 100644
--- a/x11/gtk2-engines/buildlink3.mk
+++ b/x11/gtk2-engines/buildlink3.mk
@@ -1,24 +1,21 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 07:11:28 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use gtk2-engines.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:42 jlam Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GTK2_ENGINES_BUILDLINK3_MK:=	${GTK2_ENGINES_BUILDLINK3_MK}+
 
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	gtk2-engines
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngtk2-engines}
+BUILDLINK_PACKAGES+=	gtk2-engines
+
 .if !empty(GTK2_ENGINES_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			gtk2-engines
 BUILDLINK_DEPENDS.gtk2-engines+=	gtk2-engines>=2.2.0nb4
 BUILDLINK_PKGSRCDIR.gtk2-engines?=	../../x11/gtk2-engines
 
 .include "../../x11/gtk2/buildlink3.mk"
 
-.endif # GTK2_ENGINES_BUILDLINK3_MK
+.endif	# GTK2_ENGINES_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/gtk2/buildlink3.mk b/x11/gtk2/buildlink3.mk
index 1abf1254351..14e3b791ce5 100644
--- a/x11/gtk2/buildlink3.mk
+++ b/x11/gtk2/buildlink3.mk
@@ -1,23 +1,20 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/02/14 22:10:46 recht Exp $
-#
-# This Makefile fragment is included by packages that use gtk2+.
-#
-# This file was created automatically using createbuildlink-3.0.
-#
+# $NetBSD: buildlink3.mk,v 1.5 2004/03/05 19:25:42 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-GTK2+_BUILDLINK3_MK:=	${GTK2+_BUILDLINK3_MK}+
+GTK2_BUILDLINK3_MK:=	${GTK2_BUILDLINK3_MK}+
 
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	gtk2
 .endif
 
-.if !empty(GTK2+_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			gtk2
-BUILDLINK_DEPENDS.gtk2+=		gtk2+>=2.2.4nb2
-BUILDLINK_PKGSRCDIR.gtk2?=		../../x11/gtk2
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngtk2}
+BUILDLINK_PACKAGES+=	gtk2
 
-USE_X11= yes
+.if !empty(GTK2_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.gtk2+=	gtk2+>=2.2.4nb2
+BUILDLINK_PKGSRCDIR.gtk2?=	../../x11/gtk2
+
+USE_X11= 	yes
 
 .include "../../devel/atk/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
@@ -28,6 +25,6 @@ USE_X11= yes
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 
-.endif # GTK2+_BUILDLINK3_MK
+.endif	# GTK2_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/gtkglarea2/buildlink3.mk b/x11/gtkglarea2/buildlink3.mk
index c5c098e4235..61b241a425e 100644
--- a/x11/gtkglarea2/buildlink3.mk
+++ b/x11/gtkglarea2/buildlink3.mk
@@ -1,25 +1,22 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/18 15:48:00 minskim Exp $
-#
-# This Makefile fragment is included by packages that use gtkglarea2.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:42 jlam Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GTKGLAREA2_BUILDLINK3_MK:=	${GTKGLAREA2_BUILDLINK3_MK}+
 
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	gtkglarea2
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngtkglarea2}
+BUILDLINK_PACKAGES+=	gtkglarea2
+
 .if !empty(GTKGLAREA2_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			gtkglarea2
 BUILDLINK_DEPENDS.gtkglarea2+=		gtkglarea2>=1.99.0nb3
-BUILDLINK_PKGSRCDIR.gtkglarea2?=		../../x11/gtkglarea2
+BUILDLINK_PKGSRCDIR.gtkglarea2?=	../../x11/gtkglarea2
 
 .include "../../graphics/Mesa/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 
-.endif # GTKGLAREA2_BUILDLINK3_MK
+.endif	# GTKGLAREA2_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/gtksourceview/buildlink3.mk b/x11/gtksourceview/buildlink3.mk
index 88d8fbe50e2..82f4ac41ee2 100644
--- a/x11/gtksourceview/buildlink3.mk
+++ b/x11/gtksourceview/buildlink3.mk
@@ -1,21 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 05:11:07 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use gtksourceview.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:42 jlam Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GTKSOURCEVIEW_BUILDLINK3_MK:=	${GTKSOURCEVIEW_BUILDLINK3_MK}+
 
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	gtksourceview
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngtksourceview}
+BUILDLINK_PACKAGES+=	gtksourceview
+
 .if !empty(GTKSOURCEVIEW_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			gtksourceview
-BUILDLINK_DEPENDS.gtksourceview+=		gtksourceview>=0.7.0nb8
-BUILDLINK_PKGSRCDIR.gtksourceview?=		../../x11/gtksourceview
+BUILDLINK_DEPENDS.gtksourceview+=	gtksourceview>=0.7.0nb8
+BUILDLINK_PKGSRCDIR.gtksourceview?=	../../x11/gtksourceview
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
@@ -23,6 +20,6 @@ BUILDLINK_PKGSRCDIR.gtksourceview?=		../../x11/gtksourceview
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 
-.endif # GTKSOURCEVIEW_BUILDLINK3_MK
+.endif	# GTKSOURCEVIEW_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/libxklavier/buildlink3.mk b/x11/libxklavier/buildlink3.mk
index b2c5624ef70..15b1f2a3858 100644
--- a/x11/libxklavier/buildlink3.mk
+++ b/x11/libxklavier/buildlink3.mk
@@ -1,24 +1,21 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2004/02/14 17:34:25 jmmv Exp $
-#
-# This Makefile fragment is included by packages that use libxklavier.
-#
-# This file was created automatically using createbuildlink-3.0.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:42 jlam Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBXKLAVIER_BUILDLINK3_MK:=	${LIBXKLAVIER_BUILDLINK3_MK}+
 
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	libxklavier
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibxklavier}
+BUILDLINK_PACKAGES+=	libxklavier
+
 .if !empty(LIBXKLAVIER_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			libxklavier
 BUILDLINK_DEPENDS.libxklavier?=		libxklavier>=0.97
 BUILDLINK_PKGSRCDIR.libxklavier?=	../../x11/libxklavier
 
 .include "../../textproc/libxml2/buildlink3.mk"
 
-.endif # LIBXKLAVIER_BUILDLINK3_MK
+.endif	# LIBXKLAVIER_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/libzvt/buildlink3.mk b/x11/libzvt/buildlink3.mk
index ba4dfca5441..f71916f54ab 100644
--- a/x11/libzvt/buildlink3.mk
+++ b/x11/libzvt/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 07:11:28 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use libzvt.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:42 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBZVT_BUILDLINK3_MK:=	${LIBZVT_BUILDLINK3_MK}+
@@ -12,14 +7,16 @@ LIBZVT_BUILDLINK3_MK:=	${LIBZVT_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	libzvt
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibzvt}
+BUILDLINK_PACKAGES+=	libzvt
+
 .if !empty(LIBZVT_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			libzvt
-BUILDLINK_DEPENDS.libzvt+=		libzvt>=2.0.1nb5
-BUILDLINK_PKGSRCDIR.libzvt?=		../../x11/libzvt
+BUILDLINK_DEPENDS.libzvt+=	libzvt>=2.0.1nb5
+BUILDLINK_PKGSRCDIR.libzvt?=	../../x11/libzvt
 
 .include "../../graphics/libart2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 
-.endif # LIBZVT_BUILDLINK3_MK
+.endif	# LIBZVT_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/py-gnome2/buildlink3.mk b/x11/py-gnome2/buildlink3.mk
index d56d71cbcbb..87e345eae96 100644
--- a/x11/py-gnome2/buildlink3.mk
+++ b/x11/py-gnome2/buildlink3.mk
@@ -1,9 +1,6 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/02/20 03:12:22 minskim Exp $
-#
-# This Makefile fragment is included by packages that use py-gnome2.
-#
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:42 jlam Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PY_GNOME2_BUILDLINK3_MK:=	${PY_GNOME2_BUILDLINK3_MK}+
 
 .include "../../lang/python/pyversion.mk"
@@ -12,19 +9,21 @@ PY_GNOME2_BUILDLINK3_MK:=	${PY_GNOME2_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	pygnome2
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npygnome2}
+BUILDLINK_PACKAGES+=	pygnome2
+
 .if !empty(PY_GNOME2_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			pygnome2
-BUILDLINK_DEPENDS.pygnome2+=		${PYPKGPREFIX}-gnome2>=2.0.0nb4
-BUILDLINK_PKGSRCDIR.pygnome2?=		../../x11/py-gnome2
+BUILDLINK_DEPENDS.pygnome2+=	${PYPKGPREFIX}-gnome2>=2.0.0nb4
+BUILDLINK_PKGSRCDIR.pygnome2?=	../../x11/py-gnome2
 
 .include "../../net/py-ORBit/buildlink3.mk"
 .include "../../print/libgnomeprintui/buildlink3.mk"
 .include "../../sysutils/nautilus/buildlink3.mk"
 .include "../../www/libgtkhtml/buildlink3.mk"
-.include "../../x11/libzvt/buildlink3.mk"
 .include "../../x11/gnome-panel/buildlink3.mk"
+.include "../../x11/libzvt/buildlink3.mk"
 .include "../../x11/py-gtk2/buildlink3.mk"
 
-.endif # PY_GNOME2_BUILDLINK3_MK
+.endif	# PY_GNOME2_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/py-gtk2/buildlink3.mk b/x11/py-gtk2/buildlink3.mk
index 5261eaccbe7..b39a3c6f604 100644
--- a/x11/py-gtk2/buildlink3.mk
+++ b/x11/py-gtk2/buildlink3.mk
@@ -1,7 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/02/20 03:12:22 minskim Exp $
-#
-# This Makefile fragment is included by packages that use py-gtk2.
-#
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:42 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PY_GTK2_BUILDLINK3_MK:=	${PY_GTK2_BUILDLINK3_MK}+
@@ -12,16 +9,18 @@ PY_GTK2_BUILDLINK3_MK:=	${PY_GTK2_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	pygtk2
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npygtk2}
+BUILDLINK_PACKAGES+=	pygtk2
+
 .if !empty(PY_GTK2_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			pygtk2
-BUILDLINK_DEPENDS.pygtk2+=		${PYPKGPREFIX}-gtk2>=2.0.0nb2
-BUILDLINK_PKGSRCDIR.pygtk2?=		../../x11/py-gtk2
+BUILDLINK_DEPENDS.pygtk2+=	${PYPKGPREFIX}-gtk2>=2.0.0nb2
+BUILDLINK_PKGSRCDIR.pygtk2?=	../../x11/py-gtk2
 
 .include "../../devel/libglade2/buildlink3.mk"
 .include "../../math/py-Numeric/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/gtkglarea2/buildlink3.mk"
 
-.endif # PY_GTK2_BUILDLINK3_MK
+.endif	# PY_GTK2_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/startup-notification/buildlink3.mk b/x11/startup-notification/buildlink3.mk
index df749c73bef..a4579584bd4 100644
--- a/x11/startup-notification/buildlink3.mk
+++ b/x11/startup-notification/buildlink3.mk
@@ -1,22 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 04:43:38 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use startup-notification.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:42 jlam Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 STARTUP_NOTIFICATION_BUILDLINK3_MK:=	${STARTUP_NOTIFICATION_BUILDLINK3_MK}+
 
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	startup-notification
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nstartup-notification}
+BUILDLINK_PACKAGES+=	startup-notification
+
 .if !empty(STARTUP_NOTIFICATION_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=				startup-notification
 BUILDLINK_DEPENDS.startup-notification+=	startup-notification>=0.5
 BUILDLINK_PKGSRCDIR.startup-notification?=	../../x11/startup-notification
-
-.endif # STARTUP_NOTIFICATION_BUILDLINK3_MK
+.endif	# STARTUP_NOTIFICATION_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/tk/buildlink3.mk b/x11/tk/buildlink3.mk
index ab1d5f62763..083e749f96b 100644
--- a/x11/tk/buildlink3.mk
+++ b/x11/tk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/01/24 03:26:48 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/03/05 19:25:42 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 TK_BUILDLINK3_MK:=	${TK_BUILDLINK3_MK}+
@@ -7,8 +7,10 @@ TK_BUILDLINK3_MK:=	${TK_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	tk
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ntk}
+BUILDLINK_PACKAGES+=	tk
+
 .if !empty(TK_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=		tk
 BUILDLINK_DEPENDS.tk+=		tk>=8.3.4
 BUILDLINK_PKGSRCDIR.tk?=	../../x11/tk
 
@@ -19,10 +21,11 @@ BUILDLINK_FILES.tk=	bin/wish*
 #
 BUILDLINK_TRANSFORM+=	l:tk:tk83
 
-USE_X11=	YES
+USE_X11=	yes
 TKCONFIG_SH?=	${BUILDLINK_PREFIX.tk}/lib/tkConfig.sh
 
-.  include "../../lang/tcl/buildlink3.mk"
+.include "../../lang/tcl/buildlink3.mk"
+
 .endif	# TK_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/vte/buildlink3.mk b/x11/vte/buildlink3.mk
index 88a66bf6315..1fef385a58f 100644
--- a/x11/vte/buildlink3.mk
+++ b/x11/vte/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 07:11:28 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use vte.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:42 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 VTE_BUILDLINK3_MK:=	${VTE_BUILDLINK3_MK}+
@@ -12,8 +7,10 @@ VTE_BUILDLINK3_MK:=	${VTE_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	vte
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nvte}
+BUILDLINK_PACKAGES+=	vte
+
 .if !empty(VTE_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=		vte
 BUILDLINK_DEPENDS.vte+=		vte>=0.11.10nb1
 BUILDLINK_PKGSRCDIR.vte?=	../../x11/vte
 
@@ -31,6 +28,6 @@ BUILDLINK_FILES.vte+=	lib/vte/window
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/libzvt/buildlink3.mk"
 
-.endif # VTE_BUILDLINK3_MK
+.endif	# VTE_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/wxGTK/buildlink3.mk b/x11/wxGTK/buildlink3.mk
index 45d24738cda..0ecb00f6fdc 100644
--- a/x11/wxGTK/buildlink3.mk
+++ b/x11/wxGTK/buildlink3.mk
@@ -1,25 +1,20 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/15 20:38:37 recht Exp $
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:43 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 WXGTK_BUILDLINK3_MK:=	${WXGTK_BUILDLINK3_MK}+
 
+.include "../../mk/bsd.prefs.mk"
+
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	wxGTK
 .endif
 
-.if !empty(WXGTK_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			wxGTK
-BUILDLINK_DEPENDS.wxGTK+=		wxGTK>=2.4.2
-BUILDLINK_PKGSRCDIR.wxGTK?=		../../x11/wxGTK
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NwxGTK}
+BUILDLINK_PACKAGES+=	wxGTK
 
-.include "../../mk/bsd.prefs.mk"
-
-.if !empty(WXGTK_USE_GTK1:M[Yy][Ee][Ss])
-.include "../../x11/gtk/buildlink3.mk"
-.else
-.include "../../x11/gtk2/buildlink3.mk"
-.endif
+.if !empty(WXGTK_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.wxGTK+=	wxGTK>=2.4.2
+BUILDLINK_PKGSRCDIR.wxGTK?=	../../x11/wxGTK
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"
@@ -27,6 +22,12 @@ BUILDLINK_PKGSRCDIR.wxGTK?=		../../x11/wxGTK
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 
-.endif # WXGTK_BUILDLINK3_MK
+.if !empty(WXGTK_USE_GTK1:M[Yy][Ee][Ss])
+.  include "../../x11/gtk/buildlink3.mk"
+.else
+.  include "../../x11/gtk2/buildlink3.mk"
+.endif
+
+.endif	# WXGTK_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/xosd/buildlink3.mk b/x11/xosd/buildlink3.mk
index ea601c3f1f3..9f5cb5e94ae 100644
--- a/x11/xosd/buildlink3.mk
+++ b/x11/xosd/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/19 15:00:38 wiz Exp $
-#
-# This Makefile fragment is included by packages that use xosd.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:43 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 XOSD_BUILDLINK3_MK:=	${XOSD_BUILDLINK3_MK}+
@@ -12,11 +7,12 @@ XOSD_BUILDLINK3_MK:=	${XOSD_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	xosd
 .endif
 
-.if !empty(XOSD_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			xosd
-BUILDLINK_DEPENDS.xosd+=		xosd>=2.2.5
-BUILDLINK_PKGSRCDIR.xosd?=		../../x11/xosd
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxosd}
+BUILDLINK_PACKAGES+=	xosd
 
-.endif # XOSD_BUILDLINK3_MK
+.if !empty(XOSD_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.xosd+=	xosd>=2.2.5
+BUILDLINK_PKGSRCDIR.xosd?=	../../x11/xosd
+.endif	# XOSD_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/xscreensaver/buildlink3.mk b/x11/xscreensaver/buildlink3.mk
index 359ceabbd6e..f55fb72f422 100644
--- a/x11/xscreensaver/buildlink3.mk
+++ b/x11/xscreensaver/buildlink3.mk
@@ -1,24 +1,21 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/26 17:31:40 jmmv Exp $
-#
-# This Makefile fragment is included by packages that use xscreensaver.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:43 jlam Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XSCREENSAVER_BUILDLINK3_MK:=	${XSCREENSAVER_BUILDLINK3_MK}+
 
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	xscreensaver
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxscreensaver}
+BUILDLINK_PACKAGES+=	xscreensaver
+
 .if !empty(XSCREENSAVER_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			xscreensaver
-BUILDLINK_DEPENDS.xscreensaver+=		xscreensaver>=4.14
-BUILDLINK_PKGSRCDIR.xscreensaver?=		../../x11/xscreensaver
+BUILDLINK_DEPENDS.xscreensaver+=	xscreensaver>=4.14
+BUILDLINK_PKGSRCDIR.xscreensaver?=	../../x11/xscreensaver
 
 .include "../../textproc/libxml2/buildlink3.mk"
 
-.endif # XSCREENSAVER_BUILDLINK3_MK
+.endif	# XSCREENSAVER_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}