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

10 files changed, 125 insertions, 15 deletions

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/+$//}