[pkgsrc/trunk]: pkgsrc bl3ify and bump PKGREVISION due to meta-pkgs/xfce4 upg...

[xtraeme <xtraeme%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/430a92dc872f
branches:  trunk
changeset: 470572:430a92dc872f
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Wed Mar 10 11:59:31 2004 +0000

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

diffstat:

 audio/xfce4-xmms-plugin/Makefile                |   8 +++---
 audio/xfce4-xmms-plugin/buildlink3.mk           |  23 ++++++++++++++++++++++
 doc/CHANGES                                     |   3 +-
 graphics/xfce4-artwork/Makefile                 |   6 ++--
 graphics/xfce4-artwork/buildlink3.mk            |  22 +++++++++++++++++++++
 meta-pkgs/xfce4-extras/Makefile                 |  26 ++++++++++++------------
 sysutils/xfce4-diskperf-plugin/Makefile         |   6 ++--
 sysutils/xfce4-diskperf-plugin/buildlink3.mk    |  22 +++++++++++++++++++++
 sysutils/xfce4-minicmd-plugin/Makefile          |   6 ++--
 sysutils/xfce4-minicmd-plugin/buildlink3.mk     |  22 +++++++++++++++++++++
 sysutils/xfce4-netload-plugin/Makefile          |   6 ++--
 sysutils/xfce4-netload-plugin/buildlink3.mk     |  22 +++++++++++++++++++++
 sysutils/xfce4-showdesktop-plugin/Makefile      |   6 ++--
 sysutils/xfce4-showdesktop-plugin/buildlink3.mk |  22 +++++++++++++++++++++
 sysutils/xfce4-systemload-plugin/Makefile       |   6 ++--
 sysutils/xfce4-systemload-plugin/buildlink3.mk  |  22 +++++++++++++++++++++
 time/xfce4-datetime-plugin/Makefile             |   6 ++--
 time/xfce4-datetime-plugin/buildlink3.mk        |  22 +++++++++++++++++++++
 x11/xfce4-clipman-plugin/Makefile               |   6 ++--
 x11/xfce4-clipman-plugin/buildlink3.mk          |  22 +++++++++++++++++++++
 x11/xfce4-menueditor/Makefile                   |   8 +++---
 x11/xfce4-menueditor/buildlink3.mk              |  23 ++++++++++++++++++++++
 x11/xfce4-notes-plugin/Makefile                 |   6 ++--
 x11/xfce4-notes-plugin/buildlink3.mk            |  22 +++++++++++++++++++++
 24 files changed, 294 insertions(+), 49 deletions(-)

diffs (truncated from 583 to 300 lines):

diff -r 9bc70be9ee93 -r 430a92dc872f audio/xfce4-xmms-plugin/Makefile
--- a/audio/xfce4-xmms-plugin/Makefile  Wed Mar 10 11:53:37 2004 +0000
+++ b/audio/xfce4-xmms-plugin/Makefile  Wed Mar 10 11:59:31 2004 +0000
@@ -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 -r 9bc70be9ee93 -r 430a92dc872f audio/xfce4-xmms-plugin/buildlink3.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/xfce4-xmms-plugin/buildlink3.mk     Wed Mar 10 11:59:31 2004 +0000
@@ -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 -r 9bc70be9ee93 -r 430a92dc872f doc/CHANGES
--- a/doc/CHANGES       Wed Mar 10 11:53:37 2004 +0000
+++ b/doc/CHANGES       Wed Mar 10 11:59:31 2004 +0000
@@ -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 @@
        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 -r 9bc70be9ee93 -r 430a92dc872f graphics/xfce4-artwork/Makefile
--- a/graphics/xfce4-artwork/Makefile   Wed Mar 10 11:53:37 2004 +0000
+++ b/graphics/xfce4-artwork/Makefile   Wed Mar 10 11:59:31 2004 +0000
@@ -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 -r 9bc70be9ee93 -r 430a92dc872f graphics/xfce4-artwork/buildlink3.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/xfce4-artwork/buildlink3.mk      Wed Mar 10 11:59:31 2004 +0000
@@ -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 -r 9bc70be9ee93 -r 430a92dc872f meta-pkgs/xfce4-extras/Makefile
--- a/meta-pkgs/xfce4-extras/Makefile   Wed Mar 10 11:53:37 2004 +0000
+++ b/meta-pkgs/xfce4-extras/Makefile   Wed Mar 10 11:59:31 2004 +0000
@@ -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 @@
 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 -r 9bc70be9ee93 -r 430a92dc872f sysutils/xfce4-diskperf-plugin/Makefile
--- a/sysutils/xfce4-diskperf-plugin/Makefile   Wed Mar 10 11:53:37 2004 +0000
+++ b/sysutils/xfce4-diskperf-plugin/Makefile   Wed Mar 10 11:59:31 2004 +0000
@@ -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 -r 9bc70be9ee93 -r 430a92dc872f sysutils/xfce4-diskperf-plugin/buildlink3.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/xfce4-diskperf-plugin/buildlink3.mk      Wed Mar 10 11:59:31 2004 +0000
@@ -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 -r 9bc70be9ee93 -r 430a92dc872f sysutils/xfce4-minicmd-plugin/Makefile
--- a/sysutils/xfce4-minicmd-plugin/Makefile    Wed Mar 10 11:53:37 2004 +0000
+++ b/sysutils/xfce4-minicmd-plugin/Makefile    Wed Mar 10 11:59:31 2004 +0000
@@ -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 -r 9bc70be9ee93 -r 430a92dc872f sysutils/xfce4-minicmd-plugin/buildlink3.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/xfce4-minicmd-plugin/buildlink3.mk       Wed Mar 10 11:59:31 2004 +0000
@@ -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 -r 9bc70be9ee93 -r 430a92dc872f sysutils/xfce4-netload-plugin/Makefile
--- a/sysutils/xfce4-netload-plugin/Makefile    Wed Mar 10 11:53:37 2004 +0000
+++ b/sysutils/xfce4-netload-plugin/Makefile    Wed Mar 10 11:59:31 2004 +0000
@@ -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 -r 9bc70be9ee93 -r 430a92dc872f sysutils/xfce4-netload-plugin/buildlink3.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/xfce4-netload-plugin/buildlink3.mk       Wed Mar 10 11:59:31 2004 +0000
@@ -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 -r 9bc70be9ee93 -r 430a92dc872f sysutils/xfce4-showdesktop-plugin/Makefile
--- a/sysutils/xfce4-showdesktop-plugin/Makefile        Wed Mar 10 11:53:37 2004 +0000
+++ b/sysutils/xfce4-showdesktop-plugin/Makefile        Wed Mar 10 11:59:31 2004 +0000
@@ -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 $