bl3ify and bump PKGREVISION due to meta-pkgs/xfce4 upgrade.

24 files changed, 294 insertions, 49 deletions

diff --git a/audio/xfce4-xmms-plugin/Makefile b/audio/xfce4-xmms-plugin/Makefile
index 20ba8b5f95c..b438757bc2f 100644
--- a/audio/xfce4-xmms-plugin/Makefile
+++ b/audio/xfce4-xmms-plugin/Makefile
@@ -1,17 +1,17 @@
-# $NetBSD: Makefile,v 1.4 2004/01/23 21:50:42 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2004/03/10 11:59:31 xtraeme Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 XFCE4_VERSION=	0.1.1
 
 DISTNAME=	xfce4-xmms-plugin-${XFCE4_VERSION}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	http://download.berlios.de/xfce-goodies/
 COMMENT=	XFce4 XMMS plugin
 
 EXTRACT_SUFX=	.tar.bz2
 
-.include "../../audio/xmms/buildlink2.mk"
-.include "../../x11/xfce4-panel/buildlink2.mk"
+.include "../../audio/xmms/buildlink3.mk"
+.include "../../x11/xfce4-panel/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/xfce4-xmms-plugin/buildlink3.mk b/audio/xfce4-xmms-plugin/buildlink3.mk
new file mode 100644
index 00000000000..f7c53657df8
--- /dev/null
+++ b/audio/xfce4-xmms-plugin/buildlink3.mk
@@ -0,0 +1,23 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/03/10 11:59:31 xtraeme Exp $
+
+BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
+XFCE4_XMMS_PLUGIN_BUILDLINK3_MK:=	${XFCE4_XMMS_PLUGIN_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	xfce4-xmms-plugin
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-xmms-plugin}
+BUILDLINK_PACKAGES+=	xfce4-xmms-plugin
+
+.if !empty(XFCE4_XMMS_PLUGIN_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.xfce4-xmms-plugin+=	xfce4-xmms-plugin>=0.1.1nb4
+BUILDLINK_PKGSRCDIR.xfce4-xmms-plugin?=	../../audio/xfce4-xmms-plugin
+
+.include "../../audio/xmms/buildlink3.mk"
+.include "../../x11/xfce4-panel/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
+
+.endif	# XFCE4_XMMS_PLUGIN_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/doc/CHANGES b/doc/CHANGES
index 75ad6c16f9c..9edd0ed5ad0 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.5185 2004/03/10 11:53:38 xtraeme Exp $
+$NetBSD: CHANGES,v 1.5186 2004/03/10 11:59:32 xtraeme Exp $
 
 Changes to the packages collection and infrastructure in 2004:
 
@@ -1378,3 +1378,4 @@ Changes to the packages collection and infrastructure in 2004:
 	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]
+	Updated xfce4-extras to 4.0.4nb1 [xtraeme 2004-03-10]
diff --git a/graphics/xfce4-artwork/Makefile b/graphics/xfce4-artwork/Makefile
index 2166954f10e..2ac5177233d 100644
--- a/graphics/xfce4-artwork/Makefile
+++ b/graphics/xfce4-artwork/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.4 2004/01/23 21:50:46 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2004/03/10 11:59:31 xtraeme Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 XFCE4_VERSION=	0.0.4
 
 DISTNAME=	xfce4-artwork-${XFCE4_VERSION}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	graphics
 MASTER_SITES=	http://download.berlios.de/xfce-goodies/
 COMMENT=	XFce4 artwork
 
-.include "../../x11/xfce4-desktop/buildlink2.mk"
+.include "../../x11/xfce4-desktop/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/xfce4-artwork/buildlink3.mk b/graphics/xfce4-artwork/buildlink3.mk
new file mode 100644
index 00000000000..9e75e669946
--- /dev/null
+++ b/graphics/xfce4-artwork/buildlink3.mk
@@ -0,0 +1,22 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/03/10 11:59:31 xtraeme Exp $
+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
+XFCE4_ARTWORK_BUILDLINK3_MK:=	${XFCE4_ARTWORK_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	xfce4-artwork
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-artwork}
+BUILDLINK_PACKAGES+=	xfce4-artwork
+
+.if !empty(XFCE4_ARTWORK_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.xfce4-artwork+=	xfce4-artwork>=0.0.4nb4
+BUILDLINK_PKGSRCDIR.xfce4-artwork?=	../../graphics/xfce4-artwork
+
+.include "../../x11/xfce4-desktop/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
+
+.endif	# XFCE4_ARTWORK_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/meta-pkgs/xfce4-extras/Makefile b/meta-pkgs/xfce4-extras/Makefile
index 9437dc5c6a3..99c5b6910de 100644
--- a/meta-pkgs/xfce4-extras/Makefile
+++ b/meta-pkgs/xfce4-extras/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/02/22 20:48:16 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2004/03/10 11:59:32 xtraeme Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
@@ -16,17 +16,17 @@ NO_MTREE=	# defined
 do-install:	# empty
 
 # Additional plugins etc.
-.include "../../audio/xfce4-xmms-plugin/buildlink2.mk"
-.include "../../graphics/xfce4-artwork/buildlink2.mk"
-.include "../../time/xfce4-datetime-plugin/buildlink2.mk"
-.include "../../sysutils/xfce4-diskperf-plugin/buildlink2.mk"
-.include "../../sysutils/xfce4-minicmd-plugin/buildlink2.mk"
-.include "../../sysutils/xfce4-netload-plugin/buildlink2.mk"
-.include "../../sysutils/xfce4-showdesktop-plugin/buildlink2.mk"
-.include "../../sysutils/xfce4-systemload-plugin/buildlink2.mk"
-.include "../../x11/xfce4-clipman-plugin/buildlink2.mk"
-.include "../../x11/xfce4-menueditor/buildlink2.mk"
-.include "../../x11/xfce4-notes-plugin/buildlink2.mk"
+.include "../../audio/xfce4-xmms-plugin/buildlink3.mk"
+.include "../../graphics/xfce4-artwork/buildlink3.mk"
+.include "../../time/xfce4-datetime-plugin/buildlink3.mk"
+.include "../../sysutils/xfce4-diskperf-plugin/buildlink3.mk"
+.include "../../sysutils/xfce4-minicmd-plugin/buildlink3.mk"
+.include "../../sysutils/xfce4-netload-plugin/buildlink3.mk"
+.include "../../sysutils/xfce4-showdesktop-plugin/buildlink3.mk"
+.include "../../sysutils/xfce4-systemload-plugin/buildlink3.mk"
+.include "../../x11/xfce4-clipman-plugin/buildlink3.mk"
+.include "../../x11/xfce4-menueditor/buildlink3.mk"
+.include "../../x11/xfce4-notes-plugin/buildlink3.mk"
 
-.include "../../meta-pkgs/xfce4/buildlink2.mk"
+.include "../../meta-pkgs/xfce4/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/xfce4-diskperf-plugin/Makefile b/sysutils/xfce4-diskperf-plugin/Makefile
index 42ae9a8ccb9..c6419035004 100644
--- a/sysutils/xfce4-diskperf-plugin/Makefile
+++ b/sysutils/xfce4-diskperf-plugin/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.4 2004/01/23 21:50:48 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2004/03/10 11:59:31 xtraeme Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 XFCE4_VERSION=	1.4
 
 DISTNAME=	xfce4-diskperf-plugin-${XFCE4_VERSION}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	sysutils
 MASTER_SITES=	http://download.berlios.de/xfce-goodies/
 COMMENT=	XFce4 disk performance plugin
 
-.include "../../x11/xfce4-panel/buildlink2.mk"
+.include "../../x11/xfce4-panel/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/xfce4-diskperf-plugin/buildlink3.mk b/sysutils/xfce4-diskperf-plugin/buildlink3.mk
new file mode 100644
index 00000000000..ead6ecbd4f1
--- /dev/null
+++ b/sysutils/xfce4-diskperf-plugin/buildlink3.mk
@@ -0,0 +1,22 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/03/10 11:59:31 xtraeme Exp $
+
+BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
+XFCE4_DISKPERF_PLUGIN_BUILDLINK3_MK:=	${XFCE4_DISKPERF_PLUGIN_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	xfce4-diskperf-plugin
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-diskperf-plugin}
+BUILDLINK_PACKAGES+=	xfce4-diskperf-plugin
+
+.if !empty(XFCE4_DISKPERF_PLUGIN_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.xfce4-diskperf-plugin+=	xfce4-diskperf-plugin>=1.4nb4
+BUILDLINK_PKGSRCDIR.xfce4-diskperf-plugin?=	../../sysutils/xfce4-diskperf-plugin
+
+.include "../../x11/xfce4-panel/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
+
+.endif	# XFCE4_DISKPERF_PLUGIN_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/sysutils/xfce4-minicmd-plugin/Makefile b/sysutils/xfce4-minicmd-plugin/Makefile
index fb3ec5f7ee2..3c1c4446e63 100644
--- a/sysutils/xfce4-minicmd-plugin/Makefile
+++ b/sysutils/xfce4-minicmd-plugin/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.5 2004/01/23 21:50:48 jmmv Exp $
+# $NetBSD: Makefile,v 1.6 2004/03/10 11:59:31 xtraeme Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 XFCE4_VERSION=	0.2.0
 
 DISTNAME=	xfce4-minicmd-plugin-${XFCE4_VERSION}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	sysutils
 MASTER_SITES=	http://download.berlios.de/xfce-goodies/
 COMMENT=	XFce4 command plugin
 
-.include "../../x11/xfce4-panel/buildlink2.mk"
+.include "../../x11/xfce4-panel/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/xfce4-minicmd-plugin/buildlink3.mk b/sysutils/xfce4-minicmd-plugin/buildlink3.mk
new file mode 100644
index 00000000000..3cf1d8770e3
--- /dev/null
+++ b/sysutils/xfce4-minicmd-plugin/buildlink3.mk
@@ -0,0 +1,22 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/03/10 11:59:31 xtraeme Exp $
+
+BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
+XFCE4_MINICMD_PLUGIN_BUILDLINK3_MK:=	${XFCE4_MINICMD_PLUGIN_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	xfce4-minicmd-plugin
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-minicmd-plugin}
+BUILDLINK_PACKAGES+=	xfce4-minicmd-plugin
+
+.if !empty(XFCE4_MINICMD_PLUGIN_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.xfce4-minicmd-plugin+=	xfce4-minicmd-plugin>=0.2.0nb4
+BUILDLINK_PKGSRCDIR.xfce4-minicmd-plugin?=	../../sysutils/xfce4-minicmd-plugin
+
+.include "../../x11/xfce4-panel/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
+
+.endif	# XFCE4_MINICMD_PLUGIN_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/sysutils/xfce4-netload-plugin/Makefile b/sysutils/xfce4-netload-plugin/Makefile
index c0b8803f45b..5e67d375d19 100644
--- a/sysutils/xfce4-netload-plugin/Makefile
+++ b/sysutils/xfce4-netload-plugin/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.6 2004/01/23 21:50:48 jmmv Exp $
+# $NetBSD: Makefile,v 1.7 2004/03/10 11:59:31 xtraeme Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 XFCE4_VERSION=	0.2.2
 
 DISTNAME=	xfce4-netload-plugin-${XFCE4_VERSION}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	sysutils
 MASTER_SITES=	http://download.berlios.de/xfce-goodies/
 COMMENT=	XFce4 network load plugin
 
-.include "../../x11/xfce4-panel/buildlink2.mk"
+.include "../../x11/xfce4-panel/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/xfce4-netload-plugin/buildlink3.mk b/sysutils/xfce4-netload-plugin/buildlink3.mk
new file mode 100644
index 00000000000..b0190a3b962
--- /dev/null
+++ b/sysutils/xfce4-netload-plugin/buildlink3.mk
@@ -0,0 +1,22 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/03/10 11:59:31 xtraeme Exp $
+
+BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
+XFCE4_NETLOAD_PLUGIN_BUILDLINK3_MK:=	${XFCE4_NETLOAD_PLUGIN_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	xfce4-netload-plugin
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-netload-plugin}
+BUILDLINK_PACKAGES+=	xfce4-netload-plugin
+
+.if !empty(XFCE4_NETLOAD_PLUGIN_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.xfce4-netload-plugin+=	xfce4-netload-plugin>=0.2.2nb4
+BUILDLINK_PKGSRCDIR.xfce4-netload-plugin?=	../../sysutils/xfce4-netload-plugin
+
+.include "../../x11/xfce4-panel/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
+
+.endif	# XFCE4_NETLOAD_PLUGIN_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/sysutils/xfce4-showdesktop-plugin/Makefile b/sysutils/xfce4-showdesktop-plugin/Makefile
index b23ae10436c..1f63e5ec114 100644
--- a/sysutils/xfce4-showdesktop-plugin/Makefile
+++ b/sysutils/xfce4-showdesktop-plugin/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.4 2004/01/23 21:50:48 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2004/03/10 11:59:31 xtraeme Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 XFCE4_VERSION=	0.1.1
 
 DISTNAME=	xfce4-showdesktop-plugin-${XFCE4_VERSION}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	sysutils
 MASTER_SITES=	http://download.berlios.de/xfce-goodies/
 COMMENT=	XFce4 showdesktop plugin
 
 WRKSRC=		${WRKDIR}/xfce4-showdesktop-plugin
 
-.include "../../x11/xfce4-panel/buildlink2.mk"
+.include "../../x11/xfce4-panel/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/xfce4-showdesktop-plugin/buildlink3.mk b/sysutils/xfce4-showdesktop-plugin/buildlink3.mk
new file mode 100644
index 00000000000..8f79a17d7a3
--- /dev/null
+++ b/sysutils/xfce4-showdesktop-plugin/buildlink3.mk
@@ -0,0 +1,22 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/03/10 11:59:31 xtraeme Exp $
+
+BUILDLINK_DEPTH:=				${BUILDLINK_DEPTH}+
+XFCE4_SHOWDESKTOP_PLUGIN_BUILDLINK3_MK:=	${XFCE4_SHOWDESKTOP_PLUGIN_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	xfce4-showdesktop-plugin
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-showdesktop-plugin}
+BUILDLINK_PACKAGES+=	xfce4-showdesktop-plugin
+
+.if !empty(XFCE4_SHOWDESKTOP_PLUGIN_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.xfce4-showdesktop-plugin+=	xfce4-showdesktop-plugin>=0.1.1nb4
+BUILDLINK_PKGSRCDIR.xfce4-showdesktop-plugin?=	../../sysutils/xfce4-showdesktop-plugin
+
+.include "../../x11/xfce4-panel/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
+
+.endif	# XFCE4_SHOWDESKTOP_PLUGIN_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/sysutils/xfce4-systemload-plugin/Makefile b/sysutils/xfce4-systemload-plugin/Makefile
index 35cdd7a5d36..54548997bf5 100644
--- a/sysutils/xfce4-systemload-plugin/Makefile
+++ b/sysutils/xfce4-systemload-plugin/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.5 2004/01/23 21:50:48 jmmv Exp $
+# $NetBSD: Makefile,v 1.6 2004/03/10 11:59:31 xtraeme Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 XFCE4_VERSION=	0.3.4
 
 DISTNAME=	xfce4-systemload-plugin-${XFCE4_VERSION}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	sysutils
 MASTER_SITES=	http://download.berlios.de/xfce-goodies/
 COMMENT=	XFce4 system load plugin
 
-.include "../../x11/xfce4-panel/buildlink2.mk"
+.include "../../x11/xfce4-panel/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/xfce4-systemload-plugin/buildlink3.mk b/sysutils/xfce4-systemload-plugin/buildlink3.mk
new file mode 100644
index 00000000000..bc9cce271ce
--- /dev/null
+++ b/sysutils/xfce4-systemload-plugin/buildlink3.mk
@@ -0,0 +1,22 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/03/10 11:59:31 xtraeme Exp $
+
+BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
+XFCE4_SYSTEMLOAD_PLUGIN_BUILDLINK3_MK:=	${XFCE4_SYSTEMLOAD_PLUGIN_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	xfce4-systemload-plugin
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-systemload-plugin}
+BUILDLINK_PACKAGES+=	xfce4-systemload-plugin
+
+.if !empty(XFCE4_SYSTEMLOAD_PLUGIN_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.xfce4-systemload-plugin+=	xfce4-systemload-plugin>=0.3.4nb4
+BUILDLINK_PKGSRCDIR.xfce4-systemload-plugin?=	../../sysutils/xfce4-systemload-plugin
+
+.include "../../x11/xfce4-panel/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
+
+.endif	# XFCE4_SYSTEMLOAD_PLUGIN_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/time/xfce4-datetime-plugin/Makefile b/time/xfce4-datetime-plugin/Makefile
index f2e1e1a03c1..bdacc24db64 100644
--- a/time/xfce4-datetime-plugin/Makefile
+++ b/time/xfce4-datetime-plugin/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.4 2004/01/23 21:50:49 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2004/03/10 11:59:31 xtraeme Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 XFCE4_VERSION=	0.2
 
 DISTNAME=	xfce4-datetime-plugin-${XFCE4_VERSION}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	sysutils
 MASTER_SITES=	http://download.berlios.de/xfce-goodies/
 COMMENT=	XFce4 calendar plugin
 
-.include "../../x11/xfce4-panel/buildlink2.mk"
+.include "../../x11/xfce4-panel/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/xfce4-datetime-plugin/buildlink3.mk b/time/xfce4-datetime-plugin/buildlink3.mk
new file mode 100644
index 00000000000..4466977146e
--- /dev/null
+++ b/time/xfce4-datetime-plugin/buildlink3.mk
@@ -0,0 +1,22 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/03/10 11:59:31 xtraeme Exp $
+
+BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
+XFCE4_DATETIME_PLUGIN_BUILDLINK3_MK:=	${XFCE4_DATETIME_PLUGIN_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	xfce4-datetime-plugin
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-datetime-plugin}
+BUILDLINK_PACKAGES+=	xfce4-datetime-plugin
+
+.if !empty(XFCE4_DATETIME_PLUGIN_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.xfce4-datetime-plugin+=	xfce4-datetime-plugin>=0.2nb4
+BUILDLINK_PKGSRCDIR.xfce4-datetime-plugin?=	../../time/xfce4-datetime-plugin
+
+.include "../../x11/xfce4-panel/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
+
+.endif	# XFCE4_DATETIME_PLUGIN_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/xfce4-clipman-plugin/Makefile b/x11/xfce4-clipman-plugin/Makefile
index 63f5492bb55..d7c78bef149 100644
--- a/x11/xfce4-clipman-plugin/Makefile
+++ b/x11/xfce4-clipman-plugin/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.5 2004/01/23 21:50:52 jmmv Exp $
+# $NetBSD: Makefile,v 1.6 2004/03/10 11:59:31 xtraeme Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 XFCE4_VERSION=	0.4.0
 
 DISTNAME=	xfce4-clipman-plugin-${XFCE4_VERSION}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	sysutils
 MASTER_SITES=	http://download.berlios.de/xfce-goodies/
 COMMENT=	XFce4 clipboard plugin
 
-.include "../../x11/xfce4-panel/buildlink2.mk"
+.include "../../x11/xfce4-panel/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xfce4-clipman-plugin/buildlink3.mk b/x11/xfce4-clipman-plugin/buildlink3.mk
new file mode 100644
index 00000000000..697844074d5
--- /dev/null
+++ b/x11/xfce4-clipman-plugin/buildlink3.mk
@@ -0,0 +1,22 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/03/10 11:59:31 xtraeme Exp $
+
+BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
+XFCE4_CLIPMAN_PLUGIN_BUILDLINK3_MK:=	${XFCE4_CLIPMAN_PLUGIN_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	xfce4-clipman-plugin
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-clipman-plugin}
+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
+
+.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-menueditor/Makefile b/x11/xfce4-menueditor/Makefile
index 4a8ced7ca76..4658db2cf8a 100644
--- a/x11/xfce4-menueditor/Makefile
+++ b/x11/xfce4-menueditor/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2004/02/04 11:51:57 martti Exp $
+# $NetBSD: Makefile,v 1.3 2004/03/10 11:59:31 xtraeme Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 XFCE4_VERSION=	1.0rc3
 
 DISTNAME=	xfce4-menueditor-${XFCE4_VERSION}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	http://users.skynet.be/p0llux/files/
 COMMENT=	XFce4 menu editor
@@ -15,6 +15,6 @@ WRKSRC=		${WRKDIR}/xfce4-menueditor
 
 CONFIGURE_ARGS+=--disable-cvs
 
-.include "../../textproc/libxml2/buildlink2.mk"
-.include "../../x11/libxfce4gui/buildlink2.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
+.include "../../x11/libxfce4gui/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xfce4-menueditor/buildlink3.mk b/x11/xfce4-menueditor/buildlink3.mk
new file mode 100644
index 00000000000..24fdfb2a97a
--- /dev/null
+++ b/x11/xfce4-menueditor/buildlink3.mk
@@ -0,0 +1,23 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/03/10 11:59:31 xtraeme Exp $
+
+BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
+XFCE4_MENUEDITOR_BUILDLINK3_MK:=	${XFCE4_MENUEDITOR_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	xfce4-menueditor
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-menueditor}
+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
+
+.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/Makefile b/x11/xfce4-notes-plugin/Makefile
index 8cc6df46542..28ce5b23f23 100644
--- a/x11/xfce4-notes-plugin/Makefile
+++ b/x11/xfce4-notes-plugin/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.4 2004/01/23 21:50:52 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2004/03/10 11:59:31 xtraeme Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 XFCE4_VERSION=	0.9.7
 
 DISTNAME=	xfce4-notes-plugin-${XFCE4_VERSION}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	sysutils
 MASTER_SITES=	http://download.berlios.de/xfce-goodies/
 COMMENT=	XFce4 notes plugin
 
-.include "../../x11/xfce4-panel/buildlink2.mk"
+.include "../../x11/xfce4-panel/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xfce4-notes-plugin/buildlink3.mk b/x11/xfce4-notes-plugin/buildlink3.mk
new file mode 100644
index 00000000000..4e2a203a4ab
--- /dev/null
+++ b/x11/xfce4-notes-plugin/buildlink3.mk
@@ -0,0 +1,22 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/03/10 11:59:31 xtraeme Exp $
+
+BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
+XFCE4_NOTES_PLUGIN_BUILDLINK3_MK:=	${XFCE4_NOTES_PLUGIN_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	xfce4-notes-plugin
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-notes-plugin}
+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
+
+.include "../../x11/xfce4-panel/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
+
+.endif	# XFCE4_NOTES_PLUGIN_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}