bl3ify, s,USE_X11BASE,USE_X11,g. Welcome to 4.0.4nb1, ok'ed by martti@

23 files changed, 305 insertions, 42 deletions

diff --git a/x11/libxfce4gui/Makefile b/x11/libxfce4gui/Makefile
index 2a9c165d646..c13afd1f25f 100644
--- a/x11/libxfce4gui/Makefile
+++ b/x11/libxfce4gui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/01/08 08:11:41 martti Exp $
+# $NetBSD: Makefile,v 1.6 2004/03/10 11:53:37 xtraeme Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
@@ -9,7 +9,6 @@ COMMENT=	XFce4 widget library
 
 PKGCONFIG_OVERRIDE=	libxfcegui4/libxfcegui4-1.0.pc.in
 
-.include "../../devel/pkgconfig/buildlink2.mk"
-.include "../../x11/libxfce4util/buildlink2.mk"
-.include "../../x11/gtk2/buildlink2.mk"
+.include "../../x11/libxfce4util/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/libxfce4gui/buildlink3.mk b/x11/libxfce4gui/buildlink3.mk
new file mode 100644
index 00000000000..6cc95b9e755
--- /dev/null
+++ b/x11/libxfce4gui/buildlink3.mk
@@ -0,0 +1,23 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/03/10 11:53:37 xtraeme Exp $
+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
+LIBXFCE4GUI_BUILDLINK3_MK:=	${LIBXFCE4GUI_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	libxfce4gui
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibxfce4gui}
+BUILDLINK_PACKAGES+=	libxfce4gui
+
+.if !empty(LIBXFCE4GUI_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.libxfce4gui+=		libxfce4gui>=4.0.4nb1
+BUILDLINK_PKGSRCDIR.libxfce4gui?=	../../x11/libxfce4gui
+
+.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/Makefile b/x11/libxfce4mcs/Makefile
index 166fd7fede0..c9f1660fba0 100644
--- a/x11/libxfce4mcs/Makefile
+++ b/x11/libxfce4mcs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/09/26 10:40:36 martti Exp $
+# $NetBSD: Makefile,v 1.2 2004/03/10 11:53:37 xtraeme Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
@@ -9,6 +9,5 @@ COMMENT=	XFce4 settings management library
 PKGCONFIG_OVERRIDE=	libxfce4mcs/libxfce4mcs-client-1.0.pc.in
 PKGCONFIG_OVERRIDE+=	libxfce4mcs/libxfce4mcs-manager-1.0.pc.in
 
-.include "../../devel/pkgconfig/buildlink2.mk"
-.include "../../x11/libxfce4util/buildlink2.mk"
+.include "../../x11/libxfce4util/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/libxfce4mcs/buildlink3.mk b/x11/libxfce4mcs/buildlink3.mk
new file mode 100644
index 00000000000..1e231efe885
--- /dev/null
+++ b/x11/libxfce4mcs/buildlink3.mk
@@ -0,0 +1,22 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/03/10 11:53:37 xtraeme Exp $
+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
+LIBXFCE4MCS_BUILDLINK3_MK:=	${LIBXFCE4MCS_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	libxfce4mcs
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibxfce4mcs}
+BUILDLINK_PACKAGES+=	libxfce4mcs
+
+.if !empty(LIBXFCE4MCS_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.libxfce4mcs+=		libxfce4mcs>=4.0.4nb1
+BUILDLINK_PKGSRCDIR.libxfce4mcs?=	../../x11/libxfce4mcs
+
+.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
new file mode 100644
index 00000000000..e2c17c818e2
--- /dev/null
+++ b/x11/libxfce4util/buildlink3.mk
@@ -0,0 +1,21 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/03/10 11:53:37 xtraeme Exp $
+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
+LIBXFCE4UTIL_BUILDLINK3_MK:=	${LIBXFCE4UTIL_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	libxfce4util
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibxfce4util}
+BUILDLINK_PACKAGES+=	libxfce4util
+
+.if !empty(LIBXFCE4UTIL_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.libxfce4util+=	libxfce4util>=4.0.4nb1
+BUILDLINK_PKGSRCDIR.libxfce4util?=	../../x11/libxfce4util
+
+.include "../../devel/glib2/buildlink3.mk"
+
+.endif	# LIBXFCE4UTIL_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/xfce4-desktop/Makefile b/x11/xfce4-desktop/Makefile
index 280af18dea1..976164ede37 100644
--- a/x11/xfce4-desktop/Makefile
+++ b/x11/xfce4-desktop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/03/10 07:41:16 martti Exp $
+# $NetBSD: Makefile,v 1.9 2004/03/10 11:53:37 xtraeme Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
@@ -7,8 +7,7 @@ PKGNAME=	xfce4-desktop-${XFCE4_VERSION}
 CATEGORIES=	x11
 COMMENT=	XFce4 desktop background manager
 
-.include "../../devel/pkgconfig/buildlink2.mk"
-.include "../../textproc/libxml2/buildlink2.mk"
-.include "../../x11/xfce4-mcs-plugins/buildlink2.mk"
-.include "../../x11/startup-notification/buildlink2.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
+.include "../../x11/xfce4-mcs-plugins/buildlink3.mk"
+.include "../../x11/startup-notification/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xfce4-desktop/buildlink3.mk b/x11/xfce4-desktop/buildlink3.mk
new file mode 100644
index 00000000000..9d85ed39b55
--- /dev/null
+++ b/x11/xfce4-desktop/buildlink3.mk
@@ -0,0 +1,24 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/03/10 11:53:37 xtraeme Exp $
+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
+XFCE4_DESKTOP_BUILDLINK3_MK:=	${XFCE4_DESKTOP_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	xfce4-desktop
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-desktop}
+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
+
+.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/Makefile b/x11/xfce4-gtk2-engines/Makefile
index 54023661310..4098a66c4b4 100644
--- a/x11/xfce4-gtk2-engines/Makefile
+++ b/x11/xfce4-gtk2-engines/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/03/10 07:41:16 martti Exp $
+# $NetBSD: Makefile,v 1.10 2004/03/10 11:53:37 xtraeme Exp $
 #
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
@@ -12,5 +12,5 @@ COMMENT=	XFce4 GTK2 themes
 
 DEPENDS+=	xdg-dirs>=1.1:../../misc/xdg-dirs
 
-.include "../../x11/gtk2/buildlink2.mk"
+.include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xfce4-gtk2-engines/buildlink3.mk b/x11/xfce4-gtk2-engines/buildlink3.mk
new file mode 100644
index 00000000000..ac1f5557bd0
--- /dev/null
+++ b/x11/xfce4-gtk2-engines/buildlink3.mk
@@ -0,0 +1,22 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/03/10 11:53:37 xtraeme Exp $
+
+BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
+XFCE4_GTK2_ENGINE_BUILDLINK3_MK:=	${XFCE4_GTK2_ENGINE_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	xfce4-gtk2-engine
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-gtk2-engine}
+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
+
+.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/Makefile b/x11/xfce4-mcs-manager/Makefile
index 4e202b459f5..b5504e2c7d8 100644
--- a/x11/xfce4-mcs-manager/Makefile
+++ b/x11/xfce4-mcs-manager/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/01/08 08:11:42 martti Exp $
+# $NetBSD: Makefile,v 1.6 2004/03/10 11:53:37 xtraeme Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
@@ -9,7 +9,6 @@ COMMENT=	XFce4 settings manager
 
 PKGCONFIG_OVERRIDE=	xfce-mcs-manager/xfce-mcs-manager.pc.in
 
-.include "../../devel/pkgconfig/buildlink2.mk"
-.include "../../x11/libxfce4gui/buildlink2.mk"
-.include "../../x11/libxfce4mcs/buildlink2.mk"
+.include "../../x11/libxfce4gui/buildlink3.mk"
+.include "../../x11/libxfce4mcs/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xfce4-mcs-manager/buildlink3.mk b/x11/xfce4-mcs-manager/buildlink3.mk
new file mode 100644
index 00000000000..28b907c8188
--- /dev/null
+++ b/x11/xfce4-mcs-manager/buildlink3.mk
@@ -0,0 +1,23 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/03/10 11:53:37 xtraeme Exp $
+
+BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
+XFCE4_MCS_MANAGER_BUILDLINK3_MK:=	${XFCE4_MCS_MANAGER_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	xfce4-mcs-manager
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-mcs-manager}
+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
+
+.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/Makefile b/x11/xfce4-mcs-plugins/Makefile
index ffa5ca7aca5..0562f7d05e2 100644
--- a/x11/xfce4-mcs-plugins/Makefile
+++ b/x11/xfce4-mcs-plugins/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/01/08 08:11:42 martti Exp $
+# $NetBSD: Makefile,v 1.6 2004/03/10 11:53:37 xtraeme Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
@@ -7,6 +7,5 @@ PKGNAME=	xfce4-mcs-plugins-${XFCE4_VERSION}
 CATEGORIES=	x11
 COMMENT=	XFce4 settings manager plugins
 
-.include "../../devel/pkgconfig/buildlink2.mk"
-.include "../../x11/xfce4-mcs-manager/buildlink2.mk"
+.include "../../x11/xfce4-mcs-manager/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xfce4-mcs-plugins/buildlink3.mk b/x11/xfce4-mcs-plugins/buildlink3.mk
new file mode 100644
index 00000000000..64a88d6cedb
--- /dev/null
+++ b/x11/xfce4-mcs-plugins/buildlink3.mk
@@ -0,0 +1,22 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/03/10 11:53:37 xtraeme Exp $
+
+BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
+XFCE4_MCS_PLUGINS_BUILDLINK3_MK:=	${XFCE4_MCS_PLUGINS_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	xfce4-mcs-plugins
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-mcs-plugins}
+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
+
+.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-panel/Makefile b/x11/xfce4-panel/Makefile
index dc40ed0c433..927a8adc4a8 100644
--- a/x11/xfce4-panel/Makefile
+++ b/x11/xfce4-panel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/03/10 07:41:17 martti Exp $
+# $NetBSD: Makefile,v 1.9 2004/03/10 11:53:37 xtraeme Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
@@ -8,8 +8,7 @@ COMMENT=	XFce4 panel
 
 PKGCONFIG_OVERRIDE=	panel/xfce4-panel-1.0.pc.in
 
-.include "../../devel/pkgconfig/buildlink2.mk"
-.include "../../textproc/libxml2/buildlink2.mk"
-.include "../../x11/xfce4-mcs-plugins/buildlink2.mk"
-.include "../../x11/startup-notification/buildlink2.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
+.include "../../x11/xfce4-mcs-plugins/buildlink3.mk"
+.include "../../x11/startup-notification/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xfce4-panel/buildlink3.mk b/x11/xfce4-panel/buildlink3.mk
new file mode 100644
index 00000000000..5ddbb1395ea
--- /dev/null
+++ b/x11/xfce4-panel/buildlink3.mk
@@ -0,0 +1,24 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/03/10 11:53:37 xtraeme Exp $
+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
+XFCE4_PANEL_BUILDLINK3_MK:=	${XFCE4_PANEL_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	xfce4-panel
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-panel}
+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
+
+.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/Makefile b/x11/xfce4-themes/Makefile
index c9913a31844..865eae718b8 100644
--- a/x11/xfce4-themes/Makefile
+++ b/x11/xfce4-themes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/03/10 07:41:17 martti Exp $
+# $NetBSD: Makefile,v 1.10 2004/03/10 11:53:38 xtraeme Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
@@ -6,7 +6,6 @@ DISTNAME=	xfce4-themes-${XFCE4_VERSION}
 CATEGORIES=	x11
 COMMENT=	XFce4 themes
 
-.include "../../devel/pkgconfig/buildlink2.mk"
-.include "../../textproc/libxml2/buildlink2.mk"
-.include "../../x11/xfce4-panel/buildlink2.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
+.include "../../x11/xfce4-panel/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xfce4-themes/buildlink3.mk b/x11/xfce4-themes/buildlink3.mk
new file mode 100644
index 00000000000..d0c8951a3ff
--- /dev/null
+++ b/x11/xfce4-themes/buildlink3.mk
@@ -0,0 +1,23 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/03/10 11:53:38 xtraeme Exp $
+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
+XFCE4_THEMES_BUILDLINK3_MK:=	${XFCE4_THEMES_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	xfce4-themes
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-themes}
+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
+
+.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/Makefile b/x11/xfce4-toys/Makefile
index 40e7f6de4ed..8df553e4be4 100644
--- a/x11/xfce4-toys/Makefile
+++ b/x11/xfce4-toys/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/03/10 07:41:17 martti Exp $
+# $NetBSD: Makefile,v 1.9 2004/03/10 11:53:38 xtraeme Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
@@ -6,7 +6,6 @@ DISTNAME=	xfce4-toys-${XFCE4_VERSION}
 CATEGORIES=	x11
 COMMENT=	XFce4 toys
 
-.include "../../devel/pkgconfig/buildlink2.mk"
-.include "../../textproc/libxml2/buildlink2.mk"
-.include "../../x11/xfce4-panel/buildlink2.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
+.include "../../x11/xfce4-panel/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xfce4-toys/buildlink3.mk b/x11/xfce4-toys/buildlink3.mk
new file mode 100644
index 00000000000..09094f7e577
--- /dev/null
+++ b/x11/xfce4-toys/buildlink3.mk
@@ -0,0 +1,23 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/03/10 11:53:38 xtraeme Exp $
+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
+XFCE4_TOYS_BUILDLINK3_MK:=	${XFCE4_TOYS_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	xfce4-toys
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-toys}
+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
+
+.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/Makefile b/x11/xfce4-trigger-launcher/Makefile
index 860fc4b52e4..17722d1744e 100644
--- a/x11/xfce4-trigger-launcher/Makefile
+++ b/x11/xfce4-trigger-launcher/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/03/10 07:41:17 martti Exp $
+# $NetBSD: Makefile,v 1.9 2004/03/10 11:53:38 xtraeme Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
@@ -6,7 +6,6 @@ DISTNAME=	xfce4-trigger-launcher-${XFCE4_VERSION}
 CATEGORIES=	x11
 COMMENT=	XFce4 trigger-launcher
 
-.include "../../devel/pkgconfig/buildlink2.mk"
-.include "../../textproc/libxml2/buildlink2.mk"
-.include "../../x11/xfce4-panel/buildlink2.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
+.include "../../x11/xfce4-panel/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xfce4-trigger-launcher/buildlink3.mk b/x11/xfce4-trigger-launcher/buildlink3.mk
new file mode 100644
index 00000000000..26572bae7d2
--- /dev/null
+++ b/x11/xfce4-trigger-launcher/buildlink3.mk
@@ -0,0 +1,23 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/03/10 11:53:38 xtraeme Exp $
+
+BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
+XFCE4_TRIGGER_LAUNCHER_BUILDLINK3_MK:=	${XFCE4_TRIGGER_LAUNCHER_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	xfce4-trigger-launcher
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-trigger-launcher}
+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
+
+.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/Makefile b/x11/xfce4-utils/Makefile
index 91f13e7e3f9..2c732b325eb 100644
--- a/x11/xfce4-utils/Makefile
+++ b/x11/xfce4-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/03/10 07:41:17 martti Exp $
+# $NetBSD: Makefile,v 1.9 2004/03/10 11:53:38 xtraeme Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
@@ -7,7 +7,6 @@ PKGNAME=	xfce4-utils-${XFCE4_VERSION}
 CATEGORIES=	x11
 COMMENT=	XFce4 utilities
 
-.include "../../devel/pkgconfig/buildlink2.mk"
-.include "../../x11/xfce4-mcs-plugins/buildlink2.mk"
-.include "../../x11/xscreensaver/buildlink2.mk"
+.include "../../x11/xfce4-mcs-plugins/buildlink3.mk"
+.include "../../x11/xscreensaver/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xfce4-utils/buildlink3.mk b/x11/xfce4-utils/buildlink3.mk
new file mode 100644
index 00000000000..2ae04657e1d
--- /dev/null
+++ b/x11/xfce4-utils/buildlink3.mk
@@ -0,0 +1,23 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/03/10 11:53:38 xtraeme Exp $
+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
+XFCE4_UTILS_BUILDLINK3_MK:=	${XFCE4_UTILS_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	xfce4-utils
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-utils}
+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
+
+.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/+$//}