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

43 files changed, 576 insertions, 92 deletions

diff --git a/audio/xfce4-mixer/Makefile b/audio/xfce4-mixer/Makefile
index 50fad415c6b..92d3e240a0c 100644
--- a/audio/xfce4-mixer/Makefile
+++ b/audio/xfce4-mixer/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"
 
@@ -6,7 +6,7 @@ DISTNAME=	xfce4-mixer-${XFCE4_VERSION}
 CATEGORIES=	audio
 COMMENT=	XFce4 mixer plugin
 
-.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/ossaudio.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/xfce4-mixer/buildlink3.mk b/audio/xfce4-mixer/buildlink3.mk
new file mode 100644
index 00000000000..752135ff61e
--- /dev/null
+++ b/audio/xfce4-mixer/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_MIXER_BUILDLINK3_MK:=	${XFCE4_MIXER_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	xfce4-mixer
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-mixer}
+BUILDLINK_PACKAGES+=	xfce4-mixer
+
+.if !empty(XFCE4_MIXER_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.xfce4-mixer+=		xfce4-mixer>=4.0.4nb1
+BUILDLINK_PKGSRCDIR.xfce4-mixer?=	../../audio/xfce4-mixer
+
+.include "../../textproc/libxml2/buildlink3.mk"
+.include "../../x11/xfce4-panel/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
+
+.endif	# XFCE4_MIXER_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/doc/CHANGES b/doc/CHANGES
index 0f1da716b4f..75ad6c16f9c 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.5184 2004/03/10 11:05:57 taca Exp $
+$NetBSD: CHANGES,v 1.5185 2004/03/10 11:53:38 xtraeme Exp $
 
 Changes to the packages collection and infrastructure in 2004:
 
@@ -1377,3 +1377,4 @@ Changes to the packages collection and infrastructure in 2004:
 	Updated xfce4-wm to 4.0.4 [martti 2004-03-10]
 	Updated xfce4-wm-themes to 4.0.4 [martti 2004-03-10]
 	Updated ruby-racc to 1.4.3nb1 [taca 2004-03-10]
+	Updated xfce4 to 4.0.4nb1 [xtraeme 2004-03-10]
diff --git a/graphics/xfce4-iconbox/Makefile b/graphics/xfce4-iconbox/Makefile
index 17a13c9de43..d96a8b052b5 100644
--- a/graphics/xfce4-iconbox/Makefile
+++ b/graphics/xfce4-iconbox/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"
 
@@ -6,6 +6,5 @@ DISTNAME=	xfce4-iconbox-${XFCE4_VERSION}
 CATEGORIES=	graphics
 COMMENT=	XFce4 icon displayer
 
-.include "../../devel/pkgconfig/buildlink2.mk"
-.include "../../x11/xfce4-mcs-plugins/buildlink2.mk"
+.include "../../x11/xfce4-mcs-plugins/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/xfce4-iconbox/buildlink3.mk b/graphics/xfce4-iconbox/buildlink3.mk
new file mode 100644
index 00000000000..12a01f799e0
--- /dev/null
+++ b/graphics/xfce4-iconbox/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_ICONBOX_BUILDLINK3_MK:=	${XFCE4_ICONBOX_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	xfce4-iconbox
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-iconbox}
+BUILDLINK_PACKAGES+=	xfce4-iconbox
+
+.if !empty(XFCE4_ICONBOX_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.xfce4-iconbox+=	xfce4-iconbox>=4.0.4nb1
+BUILDLINK_PKGSRCDIR.xfce4-iconbox?=	../../graphics/xfce4-iconbox
+
+.include "../../x11/xfce4-mcs-plugins/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
+
+.endif	# XFCE4_ICONBOX_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/meta-pkgs/xfce4/Makefile b/meta-pkgs/xfce4/Makefile
index 0099f586be2..4cfc91825f5 100644
--- a/meta-pkgs/xfce4/Makefile
+++ b/meta-pkgs/xfce4/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2004/03/10 07:41:16 martti Exp $
+# $NetBSD: Makefile,v 1.12 2004/03/10 11:53:37 xtraeme Exp $
 
 .include "Makefile.common"
 
 DISTNAME=	xfce4-${XFCE4_VERSION}
+PKGREVISION=	1
 DISTFILES=	# empty
 CATEGORIES=	meta-pkgs
 COMMENT=	XFce4
@@ -15,22 +16,22 @@ NO_MTREE=	# defined
 do-install:	# empty
 
 # Basic stuff
-.include "../../graphics/xfce4-iconbox/buildlink2.mk"
-.include "../../print/xfce4-print/buildlink2.mk"
-.include "../../sysutils/xfce4-fm/buildlink2.mk"
-.include "../../wm/xfce4-wm/buildlink2.mk"
-.include "../../x11/xfce4-desktop/buildlink2.mk"
-.include "../../x11/xfce4-gtk2-engines/buildlink2.mk"
-.include "../../x11/xfce4-utils/buildlink2.mk"
-.include "../../x11/xfce4-panel/buildlink2.mk"
+.include "../../graphics/xfce4-iconbox/buildlink3.mk"
+.include "../../print/xfce4-print/buildlink3.mk"
+.include "../../sysutils/xfce4-fm/buildlink3.mk"
+.include "../../wm/xfce4-wm/buildlink3.mk"
+.include "../../x11/xfce4-desktop/buildlink3.mk"
+.include "../../x11/xfce4-gtk2-engines/buildlink3.mk"
+.include "../../x11/xfce4-utils/buildlink3.mk"
+.include "../../x11/xfce4-panel/buildlink3.mk"
 
 # Extras
-.include "../../audio/xfce4-mixer/buildlink2.mk"
-.include "../../sysutils/xfce4-fm-icons/buildlink2.mk"
-.include "../../sysutils/xfce4-systray/buildlink2.mk"
-.include "../../wm/xfce4-wm-themes/buildlink2.mk"
-.include "../../x11/xfce4-themes/buildlink2.mk"
-.include "../../x11/xfce4-toys/buildlink2.mk"
-.include "../../x11/xfce4-trigger-launcher/buildlink2.mk"
+.include "../../audio/xfce4-mixer/buildlink3.mk"
+.include "../../sysutils/xfce4-fm-icons/buildlink3.mk"
+.include "../../sysutils/xfce4-systray/buildlink3.mk"
+.include "../../wm/xfce4-wm-themes/buildlink3.mk"
+.include "../../x11/xfce4-themes/buildlink3.mk"
+.include "../../x11/xfce4-toys/buildlink3.mk"
+.include "../../x11/xfce4-trigger-launcher/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/meta-pkgs/xfce4/Makefile.common b/meta-pkgs/xfce4/Makefile.common
index a44f732fad1..2204ac85d0b 100644
--- a/meta-pkgs/xfce4/Makefile.common
+++ b/meta-pkgs/xfce4/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.10 2004/03/10 07:41:16 martti Exp $
+# $NetBSD: Makefile.common,v 1.11 2004/03/10 11:53:37 xtraeme Exp $
 
 MASTER_SITES=		http://www.xfce.org/archive/xfce-4.0.4/src/ \
 			http://linux.imp.mx/xfce4/xfce_4.0.4/src/
@@ -7,9 +7,10 @@ MAINTAINER=		martti@NetBSD.org
 HOMEPAGE=		http://www.xfce.org/
 
 XFCE4_VERSION=		4.0.4
+PKGREVISION=		1
 
-USE_BUILDLINK2=		# defined
-USE_X11BASE=		# defined
+USE_BUILDLINK3=		# defined
+USE_X11=		# defined
 USE_PKGLOCALEDIR=	# defined
 USE_LIBTOOL=		# defined
 GNU_CONFIGURE=		# defined
@@ -23,5 +24,5 @@ MESSAGE_SRC?=		${.CURDIR}/../../fonts/fontconfig/MESSAGE
 
 PKG_CONFIG_PATH=	${BUILDLINK_DIR}/lib/pkgconfig
 
-.include "../../devel/glib2/buildlink2.mk"
-.include "../../devel/pkgconfig/buildlink2.mk"
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/pkgconfig/buildlink3.mk"
diff --git a/meta-pkgs/xfce4/buildlink3.mk b/meta-pkgs/xfce4/buildlink3.mk
new file mode 100644
index 00000000000..d06ee3b6b8f
--- /dev/null
+++ b/meta-pkgs/xfce4/buildlink3.mk
@@ -0,0 +1,36 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/03/10 11:53:37 xtraeme Exp $
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+XFCE4_BUILDLINK3_MK:=	${XFCE4_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	xfce4
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4}
+BUILDLINK_PACKAGES+=	xfce4
+
+.if !empty(XFCE4_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.xfce4+=	xfce4>=4.0.4nb1
+BUILDLINK_PKGSRCDIR.xfce4?=	../../meta-pkgs/xfce4
+
+.include "../../graphics/xfce4-iconbox/buildlink3.mk"
+.include "../../print/xfce4-print/buildlink3.mk"
+.include "../../sysutils/xfce4-fm/buildlink3.mk"
+.include "../../wm/xfce4-wm/buildlink3.mk"
+.include "../../x11/xfce4-desktop/buildlink3.mk"
+.include "../../x11/xfce4-gtk2-engines/buildlink3.mk"
+.include "../../x11/xfce4-utils/buildlink3.mk"
+.include "../../x11/xfce4-panel/buildlink3.mk"
+.include "../../audio/xfce4-mixer/buildlink3.mk"
+.include "../../sysutils/xfce4-fm-icons/buildlink3.mk"
+.include "../../sysutils/xfce4-systray/buildlink3.mk"
+.include "../../wm/xfce4-wm-themes/buildlink3.mk"
+.include "../../x11/xfce4-themes/buildlink3.mk"
+.include "../../x11/xfce4-toys/buildlink3.mk"
+.include "../../x11/xfce4-trigger-launcher/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
+
+.endif	# XFCE4_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/print/xfce4-print/Makefile b/print/xfce4-print/Makefile
index 97b42fd2326..8703776c87d 100644
--- a/print/xfce4-print/Makefile
+++ b/print/xfce4-print/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"
 
@@ -7,6 +7,5 @@ DISTNAME=	xfprint-${XFCE4_VERSION}
 CATEGORIES=	print
 COMMENT=	XFce4 print dialog
 
-.include "../../devel/pkgconfig/buildlink2.mk"
-.include "../../x11/xfce4-mcs-plugins/buildlink2.mk"
+.include "../../x11/xfce4-mcs-plugins/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/xfce4-print/buildlink3.mk b/print/xfce4-print/buildlink3.mk
new file mode 100644
index 00000000000..d70f82be0ba
--- /dev/null
+++ b/print/xfce4-print/buildlink3.mk
@@ -0,0 +1,27 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/03/10 11:53:37 xtraeme Exp $
+# XXX
+# XXX This file was created automatically using createbuildlink-3.3.
+# XXX After this file as been verified as correct, the comment lines
+# XXX beginning with "XXX" should be removed.  Please do not commit
+# XXX unverified buildlink[23].mk files.
+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
+XFCE4_PRINT_BUILDLINK3_MK:=	${XFCE4_PRINT_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	xfce4-print
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-print}
+BUILDLINK_PACKAGES+=	xfce4-print
+
+.if !empty(XFCE4_PRINT_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.xfce4-print+=	xfce4-print>=4.0.4nb1
+BUILDLINK_PKGSRCDIR.xfce4-print?=	../../print/xfce4-print
+
+.include "../../x11/xfce4-mcs-plugins/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
+
+.endif	# XFCE4_PRINT_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/sysutils/xfce4-fm-icons/Makefile b/sysutils/xfce4-fm-icons/Makefile
index aa37956e449..0218ca661e4 100644
--- a/sysutils/xfce4-fm-icons/Makefile
+++ b/sysutils/xfce4-fm-icons/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,5 +7,5 @@ DISTNAME=	xffm-icons-${XFCE4_VERSION}
 CATEGORIES=	sysutils
 COMMENT=	XFce4 filemanager icons
 
-.include "../../sysutils/xfce4-fm/buildlink2.mk"
+.include "../../sysutils/xfce4-fm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/xfce4-fm-icons/buildlink3.mk b/sysutils/xfce4-fm-icons/buildlink3.mk
new file mode 100644
index 00000000000..18c0aabf2b8
--- /dev/null
+++ b/sysutils/xfce4-fm-icons/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_FM_ICONS_BUILDLINK3_MK:=	${XFCE4_FM_ICONS_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	xfce4-fm-icons
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-fm-icons}
+BUILDLINK_PACKAGES+=	xfce4-fm-icons
+
+.if !empty(XFCE4_FM_ICONS_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.xfce4-fm-icons+=	xfce4-fm-icons>=4.0.4nb1
+BUILDLINK_PKGSRCDIR.xfce4-fm-icons?=	../../sysutils/xfce4-fm-icons
+
+.include "../../sysutils/xfce4-fm/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
+
+.endif	# XFCE4_FM_ICONS_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/sysutils/xfce4-fm/Makefile b/sysutils/xfce4-fm/Makefile
index 00395042042..d7be4c9df9e 100644
--- a/sysutils/xfce4-fm/Makefile
+++ b/sysutils/xfce4-fm/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"
 
@@ -13,8 +13,7 @@ PKGCONFIG_OVERRIDE=	src/xffm-1.0.pc.in
 
 UNLIMIT_RESOURCES+=     datasize
 
-.include "../../databases/dbh/buildlink2.mk"
-.include "../../devel/pkgconfig/buildlink2.mk"
-.include "../../textproc/libxml2/buildlink2.mk"
-.include "../../x11/xfce4-mcs-plugins/buildlink2.mk"
+.include "../../databases/dbh/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
+.include "../../x11/xfce4-mcs-plugins/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/xfce4-fm/buildlink3.mk b/sysutils/xfce4-fm/buildlink3.mk
new file mode 100644
index 00000000000..81edcf5414f
--- /dev/null
+++ b/sysutils/xfce4-fm/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_FM_BUILDLINK3_MK:=	${XFCE4_FM_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	xfce4-fm
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-fm}
+BUILDLINK_PACKAGES+=	xfce4-fm
+
+.if !empty(XFCE4_FM_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.xfce4-fm+=	xfce4-fm>=4.0.4nb1
+BUILDLINK_PKGSRCDIR.xfce4-fm?=	../../sysutils/xfce4-fm
+
+.include "../../databases/dbh/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
+.include "../../x11/xfce4-mcs-plugins/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
+
+.endif	# XFCE4_FM_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/sysutils/xfce4-systray/Makefile b/sysutils/xfce4-systray/Makefile
index d29b4fea34a..562ba2a5f1e 100644
--- a/sysutils/xfce4-systray/Makefile
+++ b/sysutils/xfce4-systray/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"
 
@@ -6,7 +6,6 @@ DISTNAME=	xfce4-systray-${XFCE4_VERSION}
 CATEGORIES=	sysutils
 COMMENT=	XFce4 systray plugin
 
-.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/sysutils/xfce4-systray/buildlink3.mk b/sysutils/xfce4-systray/buildlink3.mk
new file mode 100644
index 00000000000..30b6c9ce048
--- /dev/null
+++ b/sysutils/xfce4-systray/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_SYSTRAY_BUILDLINK3_MK:=	${XFCE4_SYSTRAY_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	xfce4-systray
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-systray}
+BUILDLINK_PACKAGES+=	xfce4-systray
+
+.if !empty(XFCE4_SYSTRAY_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.xfce4-systray+=	xfce4-systray>=4.0.4nb1
+BUILDLINK_PKGSRCDIR.xfce4-systray?=	../../sysutils/xfce4-systray
+
+.include "../../textproc/libxml2/buildlink3.mk"
+.include "../../x11/xfce4-panel/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
+
+.endif	# XFCE4_SYSTRAY_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/wm/xfce4-wm-themes/Makefile b/wm/xfce4-wm-themes/Makefile
index e3fef31338c..524f354bf2f 100644
--- a/wm/xfce4-wm-themes/Makefile
+++ b/wm/xfce4-wm-themes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/01/08 08:11:41 martti Exp $
+# $NetBSD: Makefile,v 1.7 2004/03/10 11:53:37 xtraeme Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
@@ -7,5 +7,5 @@ PKGNAME=	xfce4-wm-themes-${XFCE4_VERSION}
 CATEGORIES=	wm
 COMMENT=	XFce4 window manager themes
 
-.include "../../wm/xfce4-wm/buildlink2.mk"
+.include "../../wm/xfce4-wm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/xfce4-wm-themes/buildlink3.mk b/wm/xfce4-wm-themes/buildlink3.mk
new file mode 100644
index 00000000000..24750671bc3
--- /dev/null
+++ b/wm/xfce4-wm-themes/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_WM_THEMES_BUILDLINK3_MK:=	${XFCE4_WM_THEMES_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	xfce4-wm-themes
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-wm-themes}
+BUILDLINK_PACKAGES+=	xfce4-wm-themes
+
+.if !empty(XFCE4_WM_THEMES_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.xfce4-wm-themes+=	xfce4-wm-themes>=4.0.4nb1
+BUILDLINK_PKGSRCDIR.xfce4-wm-themes?=	../../wm/xfce4-wm-themes
+
+.include "../../wm/xfce4-wm/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
+
+.endif	# XFCE4_WM_THEMES_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/wm/xfce4-wm/Makefile b/wm/xfce4-wm/Makefile
index ea43e9e548d..b35c79cf49f 100644
--- a/wm/xfce4-wm/Makefile
+++ b/wm/xfce4-wm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/03/10 07:41:16 martti Exp $
+# $NetBSD: Makefile,v 1.8 2004/03/10 11:53:37 xtraeme Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
@@ -7,8 +7,7 @@ PKGNAME=	xfce4-wm-${XFCE4_VERSION}
 CATEGORIES=	wm
 COMMENT=	XFce4 window manager
 
-.include "../../devel/pkgconfig/buildlink2.mk"
-.include "../../graphics/xpm/buildlink2.mk"
-.include "../../x11/xfce4-mcs-plugins/buildlink2.mk"
-.include "../../x11/startup-notification/buildlink2.mk"
+.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/xfce4-mcs-plugins/buildlink3.mk"
+.include "../../x11/startup-notification/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/xfce4-wm/buildlink3.mk b/wm/xfce4-wm/buildlink3.mk
new file mode 100644
index 00000000000..3804c520bb0
--- /dev/null
+++ b/wm/xfce4-wm/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_WM_BUILDLINK3_MK:=	${XFCE4_WM_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	xfce4-wm
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-wm}
+BUILDLINK_PACKAGES+=	xfce4-wm
+
+.if !empty(XFCE4_WM_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.xfce4-wm+=	xfce4-wm>=4.0.4nb1
+BUILDLINK_PKGSRCDIR.xfce4-wm?=	../../wm/xfce4-wm
+
+.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/xfce4-mcs-plugins/buildlink3.mk"
+.include "../../x11/startup-notification/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
+
+.endif	# XFCE4_WM_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
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/+$//}