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.

46 files changed, 95 insertions, 143 deletions

diff --git a/x11/Xfixes/buildlink3.mk b/x11/Xfixes/buildlink3.mk
index cb3f355407c..85536f4506d 100644
--- a/x11/Xfixes/buildlink3.mk
+++ b/x11/Xfixes/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:41 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:16 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 XFIXES_BUILDLINK3_MK:=	${XFIXES_BUILDLINK3_MK}+
@@ -13,9 +13,8 @@ BUILDLINK_PACKAGES+=	Xfixes
 .if !empty(XFIXES_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.Xfixes+=	Xfixes>=2.0.0
 BUILDLINK_PKGSRCDIR.Xfixes?=	../../x11/Xfixes
+.endif	# XFIXES_BUILDLINK3_MK
 
 .include "../../x11/fixesext/buildlink3.mk"
 
-.endif	# XFIXES_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/Xrandr-mixedcase/buildlink3.mk b/x11/Xrandr-mixedcase/buildlink3.mk
index 571c9671547..6d444f3c63e 100644
--- a/x11/Xrandr-mixedcase/buildlink3.mk
+++ b/x11/Xrandr-mixedcase/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2004/03/10 17:57:15 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2004/03/18 09:12:16 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 XRANDR_BUILDLINK3_MK:=	${XRANDR_BUILDLINK3_MK}+
@@ -13,12 +13,11 @@ BUILDLINK_PACKAGES+=	Xrandr
 .if !empty(XRANDR_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.Xrandr+=	Xrandr>=1.0
 BUILDLINK_PKGSRCDIR.Xrandr?=	../../x11/Xrandr
+.endif	# XRANDR_BUILDLINK3_MK
 
 USE_X11=	yes
 
 .include "../../x11/randrext/buildlink3.mk"
 .include "../../x11/Xrender/buildlink3.mk"
 
-.endif	# XRANDR_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/Xrender/buildlink3.mk b/x11/Xrender/buildlink3.mk
index 80e93c5e097..c28704985ab 100644
--- a/x11/Xrender/buildlink3.mk
+++ b/x11/Xrender/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.30 2004/03/10 17:57:15 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.31 2004/03/18 09:12:16 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 XRENDER_BUILDLINK3_MK:=	${XRENDER_BUILDLINK3_MK}+
@@ -13,11 +13,10 @@ BUILDLINK_PACKAGES+=	Xrender
 .if !empty(XRENDER_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.Xrender+=	Xrender>=0.2
 BUILDLINK_PKGSRCDIR.Xrender?=	../../x11/Xrender
+.endif	# XRENDER_BUILDLINK3_MK
 
 USE_X11=	yes
 
 .include "../../x11/render/buildlink3.mk"
 
-.endif	# XRENDER_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=       ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/blt/buildlink3.mk b/x11/blt/buildlink3.mk
index 9171ab09873..cf6652e7759 100644
--- a/x11/blt/buildlink3.mk
+++ b/x11/blt/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/03/08 20:27:17 minskim Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/03/18 09:12:16 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 BLT_BUILDLINK3_MK:=	${BLT_BUILDLINK3_MK}+
@@ -13,10 +13,9 @@ BUILDLINK_PACKAGES+=	blt
 .if !empty(BLT_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.blt+=		blt>=2.4o
 BUILDLINK_PKGSRCDIR.blt?=	../../x11/blt
+.endif	# BLT_BUILDLINK3_MK
 
 .include "../../lang/tcl83/buildlink3.mk"
 .include "../../x11/tk83/buildlink3.mk"
 
-.endif	# BLT_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/controlcenter/buildlink3.mk b/x11/controlcenter/buildlink3.mk
index df114cd0b15..fcc5700714c 100644
--- a/x11/controlcenter/buildlink3.mk
+++ b/x11/controlcenter/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:41 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:16 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 CONTROL_CENTER_BUILDLINK3_MK:=	${CONTROL_CENTER_BUILDLINK3_MK}+
@@ -13,6 +13,7 @@ BUILDLINK_PACKAGES+=	control-center
 .if !empty(CONTROL_CENTER_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.control-center+=	control-center>=1.4.0.4nb5
 BUILDLINK_PKGSRCDIR.control-center?=	../../x11/controlcenter
+.endif	# CONTROL_CENTER_BUILDLINK3_MK
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
@@ -20,6 +21,4 @@ BUILDLINK_PKGSRCDIR.control-center?=	../../x11/controlcenter
 .include "../../sysutils/gnome-vfs/buildlink3.mk"
 .include "../../x11/gnome-libs/buildlink3.mk"
 
-.endif	# CONTROL_CENTER_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/fltk/buildlink3.mk b/x11/fltk/buildlink3.mk
index 7c34c584034..69a1c331dab 100644
--- a/x11/fltk/buildlink3.mk
+++ b/x11/fltk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:42 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:16 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 FLTK_BUILDLINK3_MK:=	${FLTK_BUILDLINK3_MK}+
@@ -13,10 +13,9 @@ BUILDLINK_PACKAGES+=	fltk
 .if !empty(FLTK_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.fltk+=	fltk>=1.0.9
 BUILDLINK_PKGSRCDIR.fltk?=	../../x11/fltk
+.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/fox/buildlink3.mk b/x11/fox/buildlink3.mk
index f11020e5419..f04ba0ab8e7 100644
--- a/x11/fox/buildlink3.mk
+++ b/x11/fox/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/03/11 17:22:55 xtraeme Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:16 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 FOX_BUILDLINK3_MK:=	${FOX_BUILDLINK3_MK}+
@@ -13,6 +13,8 @@ BUILDLINK_PACKAGES+=	fox
 .if !empty(FOX_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.fox+=		fox>=1.0.43nb2
 BUILDLINK_PKGSRCDIR.fox?=	../../x11/fox
+BUILDLINK_INCDIRS.fox?=		include/fox
+.endif	# FOX_BUILDLINK3_MK
 
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
@@ -20,9 +22,4 @@ BUILDLINK_PKGSRCDIR.fox?=	../../x11/fox
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
 
-BUILDLINK_CPPFLAGS.fox+=	-I${BUILDLINK_PREFIX.fox}/include/fox
-CPPFLAGS+=			${BUILDLINK_CPPFLAGS.fox}
-
-.endif	# FOX_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/gnome-desktop/buildlink3.mk b/x11/gnome-desktop/buildlink3.mk
index 1c77c364ec5..60901e0cad0 100644
--- a/x11/gnome-desktop/buildlink3.mk
+++ b/x11/gnome-desktop/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:42 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:16 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GNOME_DESKTOP_BUILDLINK3_MK:=	${GNOME_DESKTOP_BUILDLINK3_MK}+
@@ -13,6 +13,7 @@ BUILDLINK_PACKAGES+=	gnome-desktop
 .if !empty(GNOME_DESKTOP_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.gnome-desktop+=	gnome-desktop>=2.4.1.1nb2
 BUILDLINK_PKGSRCDIR.gnome-desktop?=	../../x11/gnome-desktop
+.endif	# GNOME_DESKTOP_BUILDLINK3_MK
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
@@ -22,6 +23,4 @@ BUILDLINK_PKGSRCDIR.gnome-desktop?=	../../x11/gnome-desktop
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/startup-notification/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 b38db5f9b41..676a402c2f1 100644
--- a/x11/gnome-libs/buildlink3.mk
+++ b/x11/gnome-libs/buildlink3.mk
@@ -1,10 +1,8 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/03/12 21:20:16 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2004/03/18 09:12:16 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GNOME_LIBS_BUILDLINK3_MK:=	${GNOME_LIBS_BUILDLINK3_MK}+
 
-.include "../../mk/bsd.prefs.mk"
-
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	gnome-libs
 .endif
@@ -15,6 +13,7 @@ BUILDLINK_PACKAGES+=	gnome-libs
 .if !empty(GNOME_LIBS_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.gnome-libs+=		gnome-libs>=1.4.2nb1
 BUILDLINK_PKGSRCDIR.gnome-libs?=	../../x11/gnome-libs
+.endif	# GNOME_LIBS_BUILDLINK3_MK
 
 .include "../../audio/esound/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
@@ -24,6 +23,4 @@ BUILDLINK_PKGSRCDIR.gnome-libs?=	../../x11/gnome-libs
 .include "../../x11/gtk/buildlink3.mk"
 .include "../../mk/bdb.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 b196e9efbf9..c317c39c161 100644
--- a/x11/gnome-mag/buildlink3.mk
+++ b/x11/gnome-mag/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/03/05 19:25:42 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/03/18 09:12:16 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GNOME_MAG_BUILDLINK3_MK:=	${GNOME_MAG_BUILDLINK3_MK}+
@@ -13,11 +13,10 @@ BUILDLINK_PACKAGES+=	gnome-mag
 .if !empty(GNOME_MAG_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.gnome-mag+=	gnome-mag>=0.10.4nb1
 BUILDLINK_PKGSRCDIR.gnome-mag?=	../../x11/gnome-mag
+.endif	# GNOME_MAG_BUILDLINK3_MK
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libbonobo/buildlink3.mk"
 .include "../../x11/gtk2/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 b99ac58621c..c18f807ee12 100644
--- a/x11/gnome-panel/buildlink3.mk
+++ b/x11/gnome-panel/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:42 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:16 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GNOME_PANEL_BUILDLINK3_MK:=	${GNOME_PANEL_BUILDLINK3_MK}+
@@ -13,6 +13,7 @@ BUILDLINK_PACKAGES+=	gnome-panel
 .if !empty(GNOME_PANEL_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.gnome-panel+=		gnome-panel>=2.4.1nb3
 BUILDLINK_PKGSRCDIR.gnome-panel?=	../../x11/gnome-panel
+.endif	# GNOME_PANEL_BUILDLINK3_MK
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libbonobo/buildlink3.mk"
@@ -24,6 +25,4 @@ BUILDLINK_PKGSRCDIR.gnome-panel?=	../../x11/gnome-panel
 .include "../../x11/gnome2-control-center/buildlink3.mk"
 .include "../../x11/startup-notification/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 091878d06df..d55bb6a0426 100644
--- a/x11/gnome2-control-center/buildlink3.mk
+++ b/x11/gnome2-control-center/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:42 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/03/18 09:12:16 jlam Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 GNOME2_CONTROL_CENTER_BUILDLINK3_MK:=	${GNOME2_CONTROL_CENTER_BUILDLINK3_MK}+
@@ -13,6 +13,7 @@ BUILDLINK_PACKAGES+=	gnome2-control-center
 .if !empty(GNOME2_CONTROL_CENTER_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.gnome2-control-center+=	gnome2-control-center>=2.4.0nb2
 BUILDLINK_PKGSRCDIR.gnome2-control-center?=	../../x11/gnome2-control-center
+.endif	# GNOME2_CONTROL_CENTER_BUILDLINK3_MK
 
 .include "../../audio/esound/buildlink3.mk"
 .include "../../devel/GConf2/buildlink3.mk"
@@ -31,6 +32,4 @@ 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
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/gtk/buildlink3.mk b/x11/gtk/buildlink3.mk
index e75d6d371ab..804c5ecff91 100644
--- a/x11/gtk/buildlink3.mk
+++ b/x11/gtk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2004/03/16 18:23:27 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2004/03/18 09:12:16 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GTK_BUILDLINK3_MK:=	${GTK_BUILDLINK3_MK}+
@@ -15,12 +15,11 @@ BUILDLINK_PKGBASE.gtk?=		gtk+
 BUILDLINK_DEPENDS.gtk+=		gtk+>=1.2.10
 BUILDLINK_RECOMMENDED.gtk?=	gtk+>=1.2.10nb6
 BUILDLINK_PKGSRCDIR.gtk?=	../../x11/gtk
+.endif	# GTK_BUILDLINK3_MK
 
 USE_X11=	yes
 
 .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 d9270cd4c63..80091635960 100644
--- a/x11/gtk2-engines/buildlink3.mk
+++ b/x11/gtk2-engines/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:42 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:16 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GTK2_ENGINES_BUILDLINK3_MK:=	${GTK2_ENGINES_BUILDLINK3_MK}+
@@ -13,9 +13,8 @@ BUILDLINK_PACKAGES+=	gtk2-engines
 .if !empty(GTK2_ENGINES_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.gtk2-engines+=	gtk2-engines>=2.2.0nb4
 BUILDLINK_PKGSRCDIR.gtk2-engines?=	../../x11/gtk2-engines
+.endif	# GTK2_ENGINES_BUILDLINK3_MK
 
 .include "../../x11/gtk2/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 9f824d0f401..9b38c2b57c8 100644
--- a/x11/gtk2/buildlink3.mk
+++ b/x11/gtk2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2004/03/16 18:23:28 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2004/03/18 09:12:17 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GTK2_BUILDLINK3_MK:=	${GTK2_BUILDLINK3_MK}+
@@ -14,6 +14,7 @@ BUILDLINK_PACKAGES+=	gtk2
 BUILDLINK_PKGBASE.gtk2?=	gtk2+
 BUILDLINK_DEPENDS.gtk2+=	gtk2+>=2.2.4nb2
 BUILDLINK_PKGSRCDIR.gtk2?=	../../x11/gtk2
+.endif	# GTK2_BUILDLINK3_MK
 
 USE_X11= 	yes
 
@@ -27,6 +28,4 @@ USE_X11= 	yes
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../x11/Xrandr/buildlink3.mk"
 
-.endif	# GTK2_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/gtkglarea/buildlink3.mk b/x11/gtkglarea/buildlink3.mk
index 665cb8ce491..40745dd78bd 100644
--- a/x11/gtkglarea/buildlink3.mk
+++ b/x11/gtkglarea/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/03/08 02:36:23 snj Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:17 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GTKGLAREA_BUILDLINK3_MK:=	${GTKGLAREA_BUILDLINK3_MK}+
@@ -13,11 +13,10 @@ BUILDLINK_PACKAGES+=	gtkglarea
 .if !empty(GTKGLAREA_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.gtkglarea+=	gtkglarea>=1.2.2nb3
 BUILDLINK_PKGSRCDIR.gtkglarea?=	../../x11/gtkglarea
+.endif	# GTKGLAREA_BUILDLINK3_MK
 
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
 .include "../../x11/gtk/buildlink3.mk"
 
-.endif	# GTKGLAREA_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/gtkglarea2/buildlink3.mk b/x11/gtkglarea2/buildlink3.mk
index 61b241a425e..ba38b45cdf5 100644
--- a/x11/gtkglarea2/buildlink3.mk
+++ b/x11/gtkglarea2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:42 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:17 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GTKGLAREA2_BUILDLINK3_MK:=	${GTKGLAREA2_BUILDLINK3_MK}+
@@ -13,10 +13,9 @@ BUILDLINK_PACKAGES+=	gtkglarea2
 .if !empty(GTKGLAREA2_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.gtkglarea2+=		gtkglarea2>=1.99.0nb3
 BUILDLINK_PKGSRCDIR.gtkglarea2?=	../../x11/gtkglarea2
+.endif	# GTKGLAREA2_BUILDLINK3_MK
 
 .include "../../graphics/Mesa/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 
-.endif	# GTKGLAREA2_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/gtkmm/buildlink3.mk b/x11/gtkmm/buildlink3.mk
index 8bfbc3d2c19..0358782f9c0 100644
--- a/x11/gtkmm/buildlink3.mk
+++ b/x11/gtkmm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/03/09 20:56:35 minskim Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:17 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GTKMM_BUILDLINK3_MK:=	${GTKMM_BUILDLINK3_MK}+
@@ -13,10 +13,9 @@ BUILDLINK_PACKAGES+=	gtkmm
 .if !empty(GTKMM_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.gtkmm+=	gtkmm>=2.2.8nb2
 BUILDLINK_PKGSRCDIR.gtkmm?=	../../x11/gtkmm
+.endif	# GTKMM_BUILDLINK3_MK
 
 .include "../../devel/libsigc++/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 
-.endif	# GTKMM_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/gtksourceview/buildlink3.mk b/x11/gtksourceview/buildlink3.mk
index 82f4ac41ee2..8396d7bd63c 100644
--- a/x11/gtksourceview/buildlink3.mk
+++ b/x11/gtksourceview/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:42 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:17 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GTKSOURCEVIEW_BUILDLINK3_MK:=	${GTKSOURCEVIEW_BUILDLINK3_MK}+
@@ -13,6 +13,7 @@ BUILDLINK_PACKAGES+=	gtksourceview
 .if !empty(GTKSOURCEVIEW_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.gtksourceview+=	gtksourceview>=0.7.0nb8
 BUILDLINK_PKGSRCDIR.gtksourceview?=	../../x11/gtksourceview
+.endif	# GTKSOURCEVIEW_BUILDLINK3_MK
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
@@ -20,6 +21,4 @@ BUILDLINK_PKGSRCDIR.gtksourceview?=	../../x11/gtksourceview
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 
-.endif	# GTKSOURCEVIEW_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/lablgtk/buildlink3.mk b/x11/lablgtk/buildlink3.mk
index 7444c2bdd2d..312005414ff 100644
--- a/x11/lablgtk/buildlink3.mk
+++ b/x11/lablgtk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/06 23:46:06 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:17 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LABLGTK_BUILDLINK3_MK:=	${LABLGTK_BUILDLINK3_MK}+
@@ -13,10 +13,9 @@ BUILDLINK_PACKAGES+=	lablgtk
 .if !empty(LABLGTK_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.lablgtk+=	lablgtk>=1.2.5nb3
 BUILDLINK_PKGSRCDIR.lablgtk?=	../../x11/lablgtk
+.endif	# LABLGTK_BUILDLINK3_MK
 
 .include "../../x11/gtk/buildlink3.mk"
 .include "../../lang/ocaml/buildlink3.mk"
 
-.endif	# LABLGTK_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/libxfce4gui/buildlink3.mk b/x11/libxfce4gui/buildlink3.mk
index 6cc95b9e755..dfcdb4e0b7c 100644
--- a/x11/libxfce4gui/buildlink3.mk
+++ b/x11/libxfce4gui/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/03/10 11:53:37 xtraeme Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:17 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBXFCE4GUI_BUILDLINK3_MK:=	${LIBXFCE4GUI_BUILDLINK3_MK}+
@@ -13,11 +13,10 @@ BUILDLINK_PACKAGES+=	libxfce4gui
 .if !empty(LIBXFCE4GUI_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.libxfce4gui+=		libxfce4gui>=4.0.4nb1
 BUILDLINK_PKGSRCDIR.libxfce4gui?=	../../x11/libxfce4gui
+.endif	# LIBXFCE4GUI_BUILDLINK3_MK
 
 .include "../../x11/libxfce4util/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 
-.endif	# LIBXFCE4GUI_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/libxfce4mcs/buildlink3.mk b/x11/libxfce4mcs/buildlink3.mk
index 1e231efe885..284e6e299e4 100644
--- a/x11/libxfce4mcs/buildlink3.mk
+++ b/x11/libxfce4mcs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/03/10 11:53:37 xtraeme Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:17 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBXFCE4MCS_BUILDLINK3_MK:=	${LIBXFCE4MCS_BUILDLINK3_MK}+
@@ -13,10 +13,9 @@ BUILDLINK_PACKAGES+=	libxfce4mcs
 .if !empty(LIBXFCE4MCS_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.libxfce4mcs+=		libxfce4mcs>=4.0.4nb1
 BUILDLINK_PKGSRCDIR.libxfce4mcs?=	../../x11/libxfce4mcs
+.endif	# LIBXFCE4MCS_BUILDLINK3_MK
 
 .include "../../x11/libxfce4util/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 
-.endif	# LIBXFCE4MCS_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/libxfce4util/buildlink3.mk b/x11/libxfce4util/buildlink3.mk
index e2c17c818e2..148db34c7a1 100644
--- a/x11/libxfce4util/buildlink3.mk
+++ b/x11/libxfce4util/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/03/10 11:53:37 xtraeme Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:17 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBXFCE4UTIL_BUILDLINK3_MK:=	${LIBXFCE4UTIL_BUILDLINK3_MK}+
@@ -13,9 +13,8 @@ BUILDLINK_PACKAGES+=	libxfce4util
 .if !empty(LIBXFCE4UTIL_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.libxfce4util+=	libxfce4util>=4.0.4nb1
 BUILDLINK_PKGSRCDIR.libxfce4util?=	../../x11/libxfce4util
+.endif	# LIBXFCE4UTIL_BUILDLINK3_MK
 
 .include "../../devel/glib2/buildlink3.mk"
 
-.endif	# LIBXFCE4UTIL_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/libxklavier/buildlink3.mk b/x11/libxklavier/buildlink3.mk
index e8af37e6c0f..d6bcd37801f 100644
--- a/x11/libxklavier/buildlink3.mk
+++ b/x11/libxklavier/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/03/16 17:55:35 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/03/18 09:12:17 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBXKLAVIER_BUILDLINK3_MK:=	${LIBXKLAVIER_BUILDLINK3_MK}+
@@ -13,9 +13,8 @@ BUILDLINK_PACKAGES+=	libxklavier
 .if !empty(LIBXKLAVIER_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.libxklavier+=		libxklavier>=0.97
 BUILDLINK_PKGSRCDIR.libxklavier?=	../../x11/libxklavier
+.endif	# LIBXKLAVIER_BUILDLINK3_MK
 
 .include "../../textproc/libxml2/buildlink3.mk"
 
-.endif	# LIBXKLAVIER_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/libzvt/buildlink3.mk b/x11/libzvt/buildlink3.mk
index f71916f54ab..df9ee7673fc 100644
--- a/x11/libzvt/buildlink3.mk
+++ b/x11/libzvt/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:42 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:17 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBZVT_BUILDLINK3_MK:=	${LIBZVT_BUILDLINK3_MK}+
@@ -13,10 +13,9 @@ BUILDLINK_PACKAGES+=	libzvt
 .if !empty(LIBZVT_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.libzvt+=	libzvt>=2.0.1nb5
 BUILDLINK_PKGSRCDIR.libzvt?=	../../x11/libzvt
+.endif	# LIBZVT_BUILDLINK3_MK
 
 .include "../../graphics/libart2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 
-.endif	# LIBZVT_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/paragui/buildlink3.mk b/x11/paragui/buildlink3.mk
index 18363ea43df..6d0d04d62c7 100644
--- a/x11/paragui/buildlink3.mk
+++ b/x11/paragui/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/12 19:44:59 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:17 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PARAGUI_BUILDLINK3_MK:=	${PARAGUI_BUILDLINK3_MK}+
@@ -13,6 +13,7 @@ BUILDLINK_PACKAGES+=	paragui
 .if !empty(PARAGUI_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.paragui+=	paragui>=1.0.4nb3
 BUILDLINK_PKGSRCDIR.paragui?=	../../x11/paragui
+.endif	# PARAGUI_BUILDLINK3_MK
 
 .include "../../devel/SDL/buildlink3.mk"
 .include "../../devel/physfs/buildlink3.mk"
@@ -20,6 +21,4 @@ BUILDLINK_PKGSRCDIR.paragui?=	../../x11/paragui
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
 
-.endif	# PARAGUI_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/py-gnome2/buildlink3.mk b/x11/py-gnome2/buildlink3.mk
index 03db647181d..2798c6d29bb 100644
--- a/x11/py-gnome2/buildlink3.mk
+++ b/x11/py-gnome2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/03/16 18:23:28 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/03/18 09:12:17 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PY_GNOME2_BUILDLINK3_MK:=	${PY_GNOME2_BUILDLINK3_MK}+
@@ -16,6 +16,7 @@ BUILDLINK_PACKAGES+=	pygnome2
 BUILDLINK_PKGBASE.pygnome2?=	${PYPKGPREFIX}-gnome2
 BUILDLINK_DEPENDS.pygnome2+=	${PYPKGPREFIX}-gnome2>=2.0.0nb4
 BUILDLINK_PKGSRCDIR.pygnome2?=	../../x11/py-gnome2
+.endif	# PY_GNOME2_BUILDLINK3_MK
 
 .include "../../net/py-ORBit/buildlink3.mk"
 .include "../../print/libgnomeprintui/buildlink3.mk"
@@ -25,6 +26,4 @@ BUILDLINK_PKGSRCDIR.pygnome2?=	../../x11/py-gnome2
 .include "../../x11/libzvt/buildlink3.mk"
 .include "../../x11/py-gtk2/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 8181c3a0b63..e552d501806 100644
--- a/x11/py-gtk2/buildlink3.mk
+++ b/x11/py-gtk2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/03/16 18:23:28 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2004/03/18 09:12:17 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PY_GTK2_BUILDLINK3_MK:=	${PY_GTK2_BUILDLINK3_MK}+
@@ -16,11 +16,10 @@ BUILDLINK_PACKAGES+=	pygtk2
 BUILDLINK_PKGBASE.pygtk2?=	${PYPKGPREFIX}-gtk2
 BUILDLINK_DEPENDS.pygtk2+=	${PYPKGPREFIX}-gtk2>=2.0.0nb2
 BUILDLINK_PKGSRCDIR.pygtk2?=	../../x11/py-gtk2
+.endif	# PY_GTK2_BUILDLINK3_MK
 
 .include "../../devel/libglade2/buildlink3.mk"
 .include "../../math/py-Numeric/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 
-.endif	# PY_GTK2_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/tk/buildlink3.mk b/x11/tk/buildlink3.mk
index a760f2b4f11..97b6e511321 100644
--- a/x11/tk/buildlink3.mk
+++ b/x11/tk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2004/03/08 20:29:43 minskim Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2004/03/18 09:12:17 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 TK_BUILDLINK3_MK:=	${TK_BUILDLINK3_MK}+
@@ -21,11 +21,11 @@ BUILDLINK_FILES.tk=	bin/wish*
 #
 BUILDLINK_TRANSFORM+=	l:tk:tk84
 
+.endif	# TK_BUILDLINK3_MK
+
 USE_X11=	yes
 TKCONFIG_SH?=	${BUILDLINK_PREFIX.tk}/lib/tkConfig.sh
 
 .include "../../lang/tcl/buildlink3.mk"
 
-.endif	# TK_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/tk83/buildlink3.mk b/x11/tk83/buildlink3.mk
index 1f9cc4014b4..172ac16c60e 100644
--- a/x11/tk83/buildlink3.mk
+++ b/x11/tk83/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2004/03/08 20:07:40 minskim Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:17 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 TK_BUILDLINK3_MK:=	${TK_BUILDLINK3_MK}+
@@ -21,11 +21,11 @@ BUILDLINK_FILES.tk=	bin/wish*
 #
 BUILDLINK_TRANSFORM+=	l:tk:tk83
 
+.endif	# TK_BUILDLINK3_MK
+
 USE_X11=	yes
 TKCONFIG_SH?=	${BUILDLINK_PREFIX.tk}/lib/tkConfig.sh
 
 .include "../../lang/tcl83/buildlink3.mk"
 
-.endif	# TK_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/vte/buildlink3.mk b/x11/vte/buildlink3.mk
index 1fef385a58f..26b2ef83fcf 100644
--- a/x11/vte/buildlink3.mk
+++ b/x11/vte/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:42 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:17 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 VTE_BUILDLINK3_MK:=	${VTE_BUILDLINK3_MK}+
@@ -24,10 +24,9 @@ BUILDLINK_FILES.vte+=	lib/vte/utf8echo
 BUILDLINK_FILES.vte+=	lib/vte/utf8mode
 BUILDLINK_FILES.vte+=	lib/vte/vterdb
 BUILDLINK_FILES.vte+=	lib/vte/window
+.endif	# VTE_BUILDLINK3_MK
 
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/libzvt/buildlink3.mk"
 
-.endif	# VTE_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/wxGTK/buildlink3.mk b/x11/wxGTK/buildlink3.mk
index 0ecb00f6fdc..3d8d526c2a1 100644
--- a/x11/wxGTK/buildlink3.mk
+++ b/x11/wxGTK/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:43 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:17 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 WXGTK_BUILDLINK3_MK:=	${WXGTK_BUILDLINK3_MK}+
@@ -15,6 +15,7 @@ BUILDLINK_PACKAGES+=	wxGTK
 .if !empty(WXGTK_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.wxGTK+=	wxGTK>=2.4.2
 BUILDLINK_PKGSRCDIR.wxGTK?=	../../x11/wxGTK
+.endif	# WXGTK_BUILDLINK3_MK
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"
@@ -28,6 +29,4 @@ BUILDLINK_PKGSRCDIR.wxGTK?=	../../x11/wxGTK
 .  include "../../x11/gtk2/buildlink3.mk"
 .endif
 
-.endif	# WXGTK_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/xcursor/buildlink3.mk b/x11/xcursor/buildlink3.mk
index aa7d3027cfd..5ef8156487d 100644
--- a/x11/xcursor/buildlink3.mk
+++ b/x11/xcursor/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2004/03/10 17:57:15 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2004/03/18 09:12:17 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 XCURSOR_BUILDLINK3_MK:=	${XCURSOR_BUILDLINK3_MK}+
@@ -13,6 +13,7 @@ BUILDLINK_PACKAGES+=	xcursor
 .if !empty(XCURSOR_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.xcursor+=	xcursor>=1.0
 BUILDLINK_PKGSRCDIR.xcursor?=	../../x11/xcursor
+.endif	# XCURSOR_BUILDLINK3_MK
 
 USE_X11=	yes
 
@@ -21,6 +22,4 @@ USE_X11=	yes
 
 .include "../../x11/Xrender/buildlink3.mk"
 
-.endif	# XCURSOR_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/xfce4-clipman-plugin/buildlink3.mk b/x11/xfce4-clipman-plugin/buildlink3.mk
index 697844074d5..511c4df5a91 100644
--- a/x11/xfce4-clipman-plugin/buildlink3.mk
+++ b/x11/xfce4-clipman-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/03/10 11:59:31 xtraeme Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:17 jlam Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 XFCE4_CLIPMAN_PLUGIN_BUILDLINK3_MK:=	${XFCE4_CLIPMAN_PLUGIN_BUILDLINK3_MK}+
@@ -13,10 +13,9 @@ BUILDLINK_PACKAGES+=	xfce4-clipman-plugin
 .if !empty(XFCE4_CLIPMAN_PLUGIN_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.xfce4-clipman-plugin+=	xfce4-clipman-plugin>=0.4.0nb3
 BUILDLINK_PKGSRCDIR.xfce4-clipman-plugin?=	../../x11/xfce4-clipman-plugin
+.endif	# XFCE4_CLIPMAN_PLUGIN_BUILDLINK3_MK
 
 .include "../../x11/xfce4-panel/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 
-.endif	# XFCE4_CLIPMAN_PLUGIN_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/xfce4-desktop/buildlink3.mk b/x11/xfce4-desktop/buildlink3.mk
index 9d85ed39b55..d55e216a4a4 100644
--- a/x11/xfce4-desktop/buildlink3.mk
+++ b/x11/xfce4-desktop/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/03/10 11:53:37 xtraeme Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:17 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XFCE4_DESKTOP_BUILDLINK3_MK:=	${XFCE4_DESKTOP_BUILDLINK3_MK}+
@@ -13,12 +13,11 @@ BUILDLINK_PACKAGES+=	xfce4-desktop
 .if !empty(XFCE4_DESKTOP_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.xfce4-desktop+=	xfce4-desktop>=4.0.4nb1
 BUILDLINK_PKGSRCDIR.xfce4-desktop?=	../../x11/xfce4-desktop
+.endif	# XFCE4_DESKTOP_BUILDLINK3_MK
 
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/xfce4-mcs-plugins/buildlink3.mk"
 .include "../../x11/startup-notification/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 
-.endif	# XFCE4_DESKTOP_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/xfce4-gtk2-engines/buildlink3.mk b/x11/xfce4-gtk2-engines/buildlink3.mk
index ac1f5557bd0..9319443bdcd 100644
--- a/x11/xfce4-gtk2-engines/buildlink3.mk
+++ b/x11/xfce4-gtk2-engines/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/03/10 11:53:37 xtraeme Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:17 jlam Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 XFCE4_GTK2_ENGINE_BUILDLINK3_MK:=	${XFCE4_GTK2_ENGINE_BUILDLINK3_MK}+
@@ -13,10 +13,9 @@ BUILDLINK_PACKAGES+=	xfce4-gtk2-engine
 .if !empty(XFCE4_GTK2_ENGINE_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.xfce4-gtk2-engine+=	xfce4-gtk2-engine>=2.1.9nb1
 BUILDLINK_PKGSRCDIR.xfce4-gtk2-engine?=	../../x11/xfce4-gtk2-engines
+.endif	# XFCE4_GTK2_ENGINE_BUILDLINK3_MK
 
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 
-.endif	# XFCE4_GTK2_ENGINE_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/xfce4-mcs-manager/buildlink3.mk b/x11/xfce4-mcs-manager/buildlink3.mk
index 28b907c8188..bb04f96361b 100644
--- a/x11/xfce4-mcs-manager/buildlink3.mk
+++ b/x11/xfce4-mcs-manager/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/03/10 11:53:37 xtraeme Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:17 jlam Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 XFCE4_MCS_MANAGER_BUILDLINK3_MK:=	${XFCE4_MCS_MANAGER_BUILDLINK3_MK}+
@@ -13,11 +13,10 @@ BUILDLINK_PACKAGES+=	xfce4-mcs-manager
 .if !empty(XFCE4_MCS_MANAGER_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.xfce4-mcs-manager+=	xfce4-mcs-manager>=4.0.4nb1
 BUILDLINK_PKGSRCDIR.xfce4-mcs-manager?=	../../x11/xfce4-mcs-manager
+.endif	# XFCE4_MCS_MANAGER_BUILDLINK3_MK
 
 .include "../../x11/libxfce4gui/buildlink3.mk"
 .include "../../x11/libxfce4mcs/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 
-.endif	# XFCE4_MCS_MANAGER_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/xfce4-mcs-plugins/buildlink3.mk b/x11/xfce4-mcs-plugins/buildlink3.mk
index 64a88d6cedb..d769f3b63c3 100644
--- a/x11/xfce4-mcs-plugins/buildlink3.mk
+++ b/x11/xfce4-mcs-plugins/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/03/10 11:53:37 xtraeme Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:17 jlam Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 XFCE4_MCS_PLUGINS_BUILDLINK3_MK:=	${XFCE4_MCS_PLUGINS_BUILDLINK3_MK}+
@@ -13,10 +13,9 @@ BUILDLINK_PACKAGES+=	xfce4-mcs-plugins
 .if !empty(XFCE4_MCS_PLUGINS_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.xfce4-mcs-plugins+=	xfce4-mcs-plugins>=4.0.4nb1
 BUILDLINK_PKGSRCDIR.xfce4-mcs-plugins?=	../../x11/xfce4-mcs-plugins
+.endif	# XFCE4_MCS_PLUGINS_BUILDLINK3_MK
 
 .include "../../x11/xfce4-mcs-manager/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 
-.endif	# XFCE4_MCS_PLUGINS_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/xfce4-menueditor/buildlink3.mk b/x11/xfce4-menueditor/buildlink3.mk
index 24fdfb2a97a..ff7b10a6a22 100644
--- a/x11/xfce4-menueditor/buildlink3.mk
+++ b/x11/xfce4-menueditor/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/03/10 11:59:31 xtraeme Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:17 jlam Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 XFCE4_MENUEDITOR_BUILDLINK3_MK:=	${XFCE4_MENUEDITOR_BUILDLINK3_MK}+
@@ -13,11 +13,10 @@ BUILDLINK_PACKAGES+=	xfce4-menueditor
 .if !empty(XFCE4_MENUEDITOR_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.xfce4-menueditor+=	xfce4-menueditor>=1.0rc3nb2
 BUILDLINK_PKGSRCDIR.xfce4-menueditor?=	../../x11/xfce4-menueditor
+.endif	# XFCE4_MENUEDITOR_BUILDLINK3_MK
 
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/libxfce4gui/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 
-.endif	# XFCE4_MENUEDITOR_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/xfce4-notes-plugin/buildlink3.mk b/x11/xfce4-notes-plugin/buildlink3.mk
index 4e2a203a4ab..cf8c4e3a4d9 100644
--- a/x11/xfce4-notes-plugin/buildlink3.mk
+++ b/x11/xfce4-notes-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/03/10 11:59:31 xtraeme Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:18 jlam Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 XFCE4_NOTES_PLUGIN_BUILDLINK3_MK:=	${XFCE4_NOTES_PLUGIN_BUILDLINK3_MK}+
@@ -13,10 +13,9 @@ BUILDLINK_PACKAGES+=	xfce4-notes-plugin
 .if !empty(XFCE4_NOTES_PLUGIN_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.xfce4-notes-plugin+=	xfce4-notes-plugin>=0.9.7nb3
 BUILDLINK_PKGSRCDIR.xfce4-notes-plugin?=	../../x11/xfce4-notes-plugin
+.endif	# XFCE4_NOTES_PLUGIN_BUILDLINK3_MK
 
 .include "../../x11/xfce4-panel/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 
-.endif	# XFCE4_NOTES_PLUGIN_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/xfce4-panel/buildlink3.mk b/x11/xfce4-panel/buildlink3.mk
index 5ddbb1395ea..82b6f87f2fb 100644
--- a/x11/xfce4-panel/buildlink3.mk
+++ b/x11/xfce4-panel/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/03/10 11:53:37 xtraeme Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:18 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XFCE4_PANEL_BUILDLINK3_MK:=	${XFCE4_PANEL_BUILDLINK3_MK}+
@@ -13,12 +13,11 @@ BUILDLINK_PACKAGES+=	xfce4-panel
 .if !empty(XFCE4_PANEL_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.xfce4-panel+=		xfce4-panel>=4.0.4nb1
 BUILDLINK_PKGSRCDIR.xfce4-panel?=	../../x11/xfce4-panel
+.endif	# XFCE4_PANEL_BUILDLINK3_MK
 
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/xfce4-mcs-plugins/buildlink3.mk"
 .include "../../x11/startup-notification/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 
-.endif	# XFCE4_PANEL_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/xfce4-themes/buildlink3.mk b/x11/xfce4-themes/buildlink3.mk
index d0c8951a3ff..eaf6392ee4f 100644
--- a/x11/xfce4-themes/buildlink3.mk
+++ b/x11/xfce4-themes/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/03/10 11:53:38 xtraeme Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:18 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XFCE4_THEMES_BUILDLINK3_MK:=	${XFCE4_THEMES_BUILDLINK3_MK}+
@@ -13,11 +13,10 @@ BUILDLINK_PACKAGES+=	xfce4-themes
 .if !empty(XFCE4_THEMES_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.xfce4-themes+=	xfce4-themes>=4.0.4nb1
 BUILDLINK_PKGSRCDIR.xfce4-themes?=	../../x11/xfce4-themes
+.endif	# XFCE4_THEMES_BUILDLINK3_MK
 
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/xfce4-panel/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 
-.endif	# XFCE4_THEMES_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/xfce4-toys/buildlink3.mk b/x11/xfce4-toys/buildlink3.mk
index 09094f7e577..1fad27c3c42 100644
--- a/x11/xfce4-toys/buildlink3.mk
+++ b/x11/xfce4-toys/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/03/10 11:53:38 xtraeme Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:18 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XFCE4_TOYS_BUILDLINK3_MK:=	${XFCE4_TOYS_BUILDLINK3_MK}+
@@ -13,11 +13,10 @@ BUILDLINK_PACKAGES+=	xfce4-toys
 .if !empty(XFCE4_TOYS_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.xfce4-toys+=		xfce4-toys>=4.0.4nb1
 BUILDLINK_PKGSRCDIR.xfce4-toys?=	../../x11/xfce4-toys
+.endif	# XFCE4_TOYS_BUILDLINK3_MK
 
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/xfce4-panel/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 
-.endif	# XFCE4_TOYS_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/xfce4-trigger-launcher/buildlink3.mk b/x11/xfce4-trigger-launcher/buildlink3.mk
index 26572bae7d2..a5b3dfb82d6 100644
--- a/x11/xfce4-trigger-launcher/buildlink3.mk
+++ b/x11/xfce4-trigger-launcher/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/03/10 11:53:38 xtraeme Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:18 jlam Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 XFCE4_TRIGGER_LAUNCHER_BUILDLINK3_MK:=	${XFCE4_TRIGGER_LAUNCHER_BUILDLINK3_MK}+
@@ -13,11 +13,10 @@ BUILDLINK_PACKAGES+=	xfce4-trigger-launcher
 .if !empty(XFCE4_TRIGGER_LAUNCHER_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.xfce4-trigger-launcher+=	xfce4-trigger-launcher>=4.0.4nb1
 BUILDLINK_PKGSRCDIR.xfce4-trigger-launcher?=	../../x11/xfce4-trigger-launcher
+.endif	# XFCE4_TRIGGER_LAUNCHER_BUILDLINK3_MK
 
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/xfce4-panel/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 
-.endif	# XFCE4_TRIGGER_LAUNCHER_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/xfce4-utils/buildlink3.mk b/x11/xfce4-utils/buildlink3.mk
index 2ae04657e1d..07247942817 100644
--- a/x11/xfce4-utils/buildlink3.mk
+++ b/x11/xfce4-utils/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/03/10 11:53:38 xtraeme Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:18 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XFCE4_UTILS_BUILDLINK3_MK:=	${XFCE4_UTILS_BUILDLINK3_MK}+
@@ -13,11 +13,10 @@ BUILDLINK_PACKAGES+=	xfce4-utils
 .if !empty(XFCE4_UTILS_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.xfce4-utils+=		xfce4-utils>=4.0.4nb1
 BUILDLINK_PKGSRCDIR.xfce4-utils?=	../../x11/xfce4-utils
+.endif	# XFCE4_UTILS_BUILDLINK3_MK
 
 .include "../../x11/xfce4-mcs-plugins/buildlink3.mk"
 .include "../../x11/xscreensaver/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 
-.endif	# XFCE4_UTILS_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/xscreensaver/buildlink3.mk b/x11/xscreensaver/buildlink3.mk
index f55fb72f422..23530ca307e 100644
--- a/x11/xscreensaver/buildlink3.mk
+++ b/x11/xscreensaver/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:43 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:18 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XSCREENSAVER_BUILDLINK3_MK:=	${XSCREENSAVER_BUILDLINK3_MK}+
@@ -13,9 +13,8 @@ BUILDLINK_PACKAGES+=	xscreensaver
 .if !empty(XSCREENSAVER_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.xscreensaver+=	xscreensaver>=4.14
 BUILDLINK_PKGSRCDIR.xscreensaver?=	../../x11/xscreensaver
+.endif	# XSCREENSAVER_BUILDLINK3_MK
 
 .include "../../textproc/libxml2/buildlink3.mk"
 
-.endif	# XSCREENSAVER_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}