Update Xfce to 4.12.0.

This is a very large change, and incorporates the 4.8, 4.10, and 4.12 major
Xfce releases since 4.6.2, our previous pkgsrc release.  For more information
about the thousands of changes in each major release since then, please see:

  Xfce 4.12 announcement:
    http://www.xfce.org/about/news

  Xfce 4.12 tour:
    http://www.xfce.org/about/tour

  Xfce 4.10 announcement:
    http://www.xfce.org/about/news/?post=1335571200

  Xfce 4.10 tour:
    http://www.xfce.org/about/tour410

  Xfce 4.8 announcement:
    http://www.xfce.org/about/news/?post=1295136000

  Xfce 4.8 tour:
    http://www.xfce.org/about/tour48

The pkgsrc changes since then are:

  New packages:
    archivers/xfce4-thunar-archive
    graphics/elementary-xfce-icon-theme
    mail/xfce4-mailwatch-plugin
    misc/xfce4-time-out-plugin
    multimedia/xfce4-thunar-media-tags
    sysutils/xfce4-mount-plugin
    sysutils/xfce4-taskmanager
    sysutils/xfce4-thunar-vcs
    sysutils/xfce4-verve-plugin
    x11/xfce4-garcon
    x11/xfce4-notifyd
    x11/xfce4-tumbler
    x11/xfce4-whiskermenu-plugin

  Renamed packages:
    devel/xfconf to devel/xfce4-conf
    x11/libxfce4menu to x11/libxfce4ui
    x11/xfce4-screenshooter-plugin to x11/xfce4-screenshooter

  Updated packages:
    audio/xfce4-mixer
    audio/xfce4-xmms-plugin
    devel/xfce4-dev-tools
    editors/xfce4-mousepad
    graphics/ristretto
    meta-pkgs/xfce4-extras
    meta-pkgs/xfce4
    misc/xfce4-weather-plugin
    multimedia/xfce4-mpc-plugin
    net/xfce4-wavelan-plugin
    sysutils/xfce4-appfinder
    sysutils/xfce4-battery-plugin
    sysutils/xfce4-cpugraph-plugin
    sysutils/xfce4-diskperf-plugin
    sysutils/xfce4-fsguard-plugin
    sysutils/xfce4-genmon-plugin
    sysutils/xfce4-netload-plugin
    sysutils/xfce4-quicklauncher-plugin
    sysutils/xfce4-systemload-plugin
    sysutils/xfce4-thunar
    sysutils/xfce4-xarchiver
    sysutils/xfce4-xkb-plugin
    textproc/xfce4-dict-plugin
    time/xfce4-datetime-plugin
    time/xfce4-orage
    time/xfce4-timer-plugin
    wm/xfce4-wm-themes
    wm/xfce4-wm
    x11/libxfce4gui
    x11/libxfce4util
    x11/xfce4-clipman-plugin
    x11/xfce4-desktop
    x11/xfce4-exo
    x11/xfce4-eyes-plugin
    x11/xfce4-gtk2-engine
    x11/xfce4-notes-plugin
    x11/xfce4-panel
    x11/xfce4-places-plugin
    x11/xfce4-session
    x11/xfce4-settings
    x11/xfce4-terminal

  Removed packages:
    sysutils/xfce4-volman
    x11/xfce4-utils

This is based on a huge amount of work by the NetBSDfr team and Youri Mouton,
who takes over as MAINTAINER, and has been tested by Youri on a large number
of platforms prior to commit.  A massive thanks to them.  Any issues with the
import are mine alone as the committer-by-proxy.

4 files changed, 91 insertions, 108 deletions

diff --git a/meta-pkgs/xfce4-extras/Makefile b/meta-pkgs/xfce4-extras/Makefile
index ba93e20eee0..5b5066415cf 100644
--- a/meta-pkgs/xfce4-extras/Makefile
+++ b/meta-pkgs/xfce4-extras/Makefile
@@ -1,48 +1,57 @@
-# $NetBSD: Makefile,v 1.61 2014/05/05 00:48:08 ryoon Exp $
+# $NetBSD: Makefile,v 1.62 2015/04/21 08:56:38 jperkin Exp $
 
 META_PACKAGE=	yes
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 DISTNAME=	xfce4-extras-${XFCE4_VERSION}
-PKGREVISION=	31
 CATEGORIES=	meta-pkgs
 COMMENT=	Xfce extras
 
-# Xfce
-.include "../../meta-pkgs/xfce4/buildlink3.mk"
-
-#
-# Do you want to have more plugins? See http://goodies.xfce.org/releases/
-# for all available plugins...
-#
-
-# Additional plugins etc.
-
+# Applications
 DEPENDS+=	ristretto-[0-9]*:../../graphics/ristretto
-
-.include "../../audio/xfce4-xmms-plugin/buildlink3.mk"
-.include "../../misc/xfce4-weather-plugin/buildlink3.mk"
-.include "../../net/xfce4-wavelan-plugin/buildlink3.mk"
-.include "../../multimedia/xfce4-mpc-plugin/buildlink3.mk"
-.include "../../sysutils/xfce4-battery-plugin/buildlink3.mk"
-.include "../../sysutils/xfce4-cpugraph-plugin/buildlink3.mk"
-.if ${OPSYS} == "NetBSD" || ${OPSYS} == "Linux"
-.include "../../sysutils/xfce4-diskperf-plugin/buildlink3.mk"
-.endif
-.include "../../sysutils/xfce4-fsguard-plugin/buildlink3.mk"
-.include "../../sysutils/xfce4-genmon-plugin/buildlink3.mk"
-.include "../../sysutils/xfce4-netload-plugin/buildlink3.mk"
-.include "../../sysutils/xfce4-quicklauncher-plugin/buildlink3.mk"
-.include "../../sysutils/xfce4-systemload-plugin/buildlink3.mk"
-.include "../../sysutils/xfce4-xkb-plugin/buildlink3.mk"
-.include "../../textproc/xfce4-dict-plugin/buildlink3.mk"
-.include "../../time/xfce4-datetime-plugin/buildlink3.mk"
-.include "../../time/xfce4-timer-plugin/buildlink3.mk"
-.include "../../x11/xfce4-clipman-plugin/buildlink3.mk"
-.include "../../x11/xfce4-eyes-plugin/buildlink3.mk"
-.include "../../x11/xfce4-notes-plugin/buildlink3.mk"
-.include "../../x11/xfce4-places-plugin/buildlink3.mk"
-.include "../../x11/xfce4-screenshooter-plugin/buildlink3.mk"
+DEPENDS+=	xfce4-taskmanager>=1.1.0:../../sysutils/xfce4-taskmanager
+
+# Panel Plugins
+DEPENDS+=	xfce4-diskperf-plugin>=2.5.4:../../sysutils/xfce4-diskperf-plugin
+DEPENDS+=	xfce4-systemload-plugin>=1.1.2:../../sysutils/xfce4-systemload-plugin
+DEPENDS+=	xfce4-cpugraph-plugin>=1.0.5:../../sysutils/xfce4-cpugraph-plugin
+DEPENDS+=	xfce4-wavelan-plugin>=0.5.11:../../net/xfce4-wavelan-plugin
+
+DEPENDS+=	xfce4-battery-plugin>=1.0.5:../../sysutils/xfce4-battery-plugin
+DEPENDS+=	xfce4-clipman-plugin>=1.2.6:../../x11/xfce4-clipman-plugin
+DEPENDS+=	xfce4-datetime-plugin>=0.6.2:../../time/xfce4-datetime-plugin
+DEPENDS+=	xfce4-dict-plugin>=0.3.0:../../textproc/xfce4-dict-plugin
+DEPENDS+=	xfce4-eyes-plugin>=4.4.3:../../x11/xfce4-eyes-plugin
+DEPENDS+=	xfce4-fsguard-plugin>=1.0.1:../../sysutils/xfce4-fsguard-plugin
+DEPENDS+=	xfce4-genmon-plugin>=3.4:../../sysutils/xfce4-genmon-plugin
+DEPENDS+=	xfce4-mailwatch-plugin>=1.2.0:../../mail/xfce4-mailwatch-plugin
+DEPENDS+=	xfce4-mixer>=4.10.0:../../audio/xfce4-mixer
+DEPENDS+=	xfce4-mount-plugin>=0.6.7:../../sysutils/xfce4-mount-plugin
+DEPENDS+=	xfce4-mpc-plugin>=0.4.4:../../multimedia/xfce4-mpc-plugin
+DEPENDS+=	xfce4-netload-plugin>=1.2.4:../../sysutils/xfce4-netload-plugin
+DEPENDS+=	xfce4-notes-plugin>=1.7.7:../../x11/xfce4-notes-plugin
+DEPENDS+=	xfce4-notifyd>=0.2.4:../../x11/xfce4-notifyd
+DEPENDS+=	xfce4-places-plugin>=1.6.0:../../x11/xfce4-places-plugin
+DEPENDS+=	xfce4-quicklauncher-plugin>=1.9.4:../../sysutils/xfce4-quicklauncher-plugin
+DEPENDS+=	xfce4-screenshooter>=1.8.2:../../x11/xfce4-screenshooter
+DEPENDS+=	xfce4-time-out-plugin>=1.0.2:../../misc/xfce4-time-out-plugin
+DEPENDS+=	xfce4-timer-plugin>=1.6.0:../../time/xfce4-timer-plugin
+DEPENDS+=	xfce4-verve-plugin>=1.0.1:../../sysutils/xfce4-verve-plugin
+DEPENDS+=	xfce4-weather-plugin>=0.8.5:../../misc/xfce4-weather-plugin
+DEPENDS+=	xfce4-xkb-plugin>=0.7.0:../../sysutils/xfce4-xkb-plugin
+DEPENDS+=	xfce4-xmms-plugin>=0.5.3:../../audio/xfce4-xmms-plugin
+
+# File Manager Plugins
+DEPENDS+=	xfce4-thunar-archive-plugin>=0.3.1:../../archivers/xfce4-thunar-archive
+DEPENDS+=	xfce4-thunar-media-tags-plugin>=0.2.1:../../multimedia/xfce4-thunar-media-tags
+#DEPENDS+=	xfce4-thunar-vcs-plugin>=0.1.4:../../sysutils/xfce4-thunar-vcs
+
+# Broken
+# 0.2.0 fails because our thunar is too new. Fixed upstream already.
+#DEPENDS+=	xfce4-thunar-shares>=0.2.0:../../sysutils/xfce4-thunar-shares
+
+pre-extract:
+	${MKDIR} ${WRKSRC}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/meta-pkgs/xfce4/Makefile b/meta-pkgs/xfce4/Makefile
index ce24ff2c273..a2d44d866b3 100644
--- a/meta-pkgs/xfce4/Makefile
+++ b/meta-pkgs/xfce4/Makefile
@@ -1,32 +1,30 @@
-# $NetBSD: Makefile,v 1.70 2014/06/09 14:18:07 ryoon Exp $
+# $NetBSD: Makefile,v 1.71 2015/04/21 08:56:38 jperkin Exp $
 
 META_PACKAGE=	yes
 
 .include "Makefile.common"
 
 DISTNAME=	xfce4-${XFCE4_VERSION}
-PKGREVISION=	32
 CATEGORIES=	meta-pkgs
 COMMENT=	Xfce
 
-.include "../../audio/xfce4-mixer/buildlink3.mk"
-.include "../../editors/xfce4-mousepad/buildlink3.mk"
-.include "../../graphics/gnome-icon-theme/buildlink3.mk"
-.include "../../graphics/xfce4-icon-theme/buildlink3.mk"
-.include "../../print/xfce4-print/buildlink3.mk"
-.include "../../sysutils/xfce4-appfinder/buildlink3.mk"
-.include "../../sysutils/xfce4-thunar/buildlink3.mk"
-.include "../../sysutils/xfce4-volman/buildlink3.mk"
-.include "../../sysutils/xfce4-xarchiver/buildlink3.mk"
-.include "../../time/xfce4-orage/buildlink3.mk"
-.include "../../wm/xfce4-wm-themes/buildlink3.mk"
-.include "../../wm/xfce4-wm/buildlink3.mk"
-.include "../../x11/xfce4-desktop/buildlink3.mk"
-.include "../../x11/xfce4-gtk2-engine/buildlink3.mk"
-.include "../../x11/xfce4-panel/buildlink3.mk"
-.include "../../x11/xfce4-session/buildlink3.mk"
-.include "../../x11/xfce4-settings/buildlink3.mk"
-.include "../../x11/xfce4-terminal/buildlink3.mk"
-.include "../../x11/xfce4-utils/buildlink3.mk"
+DEPENDS+=	xfce4-tumbler>=0.1.27:../../x11/xfce4-tumbler
+DEPENDS+=	xfce4-appfinder>=4.10.0:../../sysutils/xfce4-appfinder
+DEPENDS+=	xfce4-desktop>=4.10.0:../../x11/xfce4-desktop
+DEPENDS+=	xfce4-gtk2-engine>=3.0.1:../../x11/xfce4-gtk2-engine
+DEPENDS+=	xfce4-mousepad>=0.3.0:../../editors/xfce4-mousepad
+DEPENDS+=	xfce4-panel>=4.10.0:../../x11/xfce4-panel
+DEPENDS+=	xfce4-orage>=4.8.4:../../time/xfce4-orage
+DEPENDS+=	xfce4-settings>=4.10.0:../../x11/xfce4-settings
+DEPENDS+=	xfce4-session>=4.10.0:../../x11/xfce4-session
+DEPENDS+=	xfce4-terminal>=0.6.1:../../x11/xfce4-terminal
+DEPENDS+=	xfce4-thunar>=1.6.0:../../sysutils/xfce4-thunar
+DEPENDS+=	xfce4-wm>=4.10.0:../../wm/xfce4-wm
+DEPENDS+=	xfce4-wm-themes>=4.10.0:../../wm/xfce4-wm-themes
+DEPENDS+=	xfce4-xarchiver>=0.5.2:../../sysutils/xfce4-xarchiver
+DEPENDS+=	elementary-xfce-icon-theme>=0.5:../../graphics/elementary-xfce-icon-theme
+
+pre-extract:
+	${MKDIR} ${WRKSRC}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/meta-pkgs/xfce4/Makefile.common b/meta-pkgs/xfce4/Makefile.common
index 2e61910e1f7..20c7fe4fdad 100644
--- a/meta-pkgs/xfce4/Makefile.common
+++ b/meta-pkgs/xfce4/Makefile.common
@@ -1,27 +1,34 @@
-# $NetBSD: Makefile.common,v 1.47 2015/04/05 13:02:15 joerg Exp $
+# $NetBSD: Makefile.common,v 1.48 2015/04/21 08:56:38 jperkin Exp $
 #
+# used by archivers/xfce4-thunar-archive/Makefile
 # used by audio/xfce4-mixer/Makefile
+# used by audio/xfce4-mpc-plugin/Makefile
 # used by audio/xfce4-xmms-plugin/Makefile
+# used by devel/xfce4-conf/Makefile
 # used by devel/xfce4-dev-tools/Makefile
-# used by devel/xfconf/Makefile
 # used by editors/xfce4-mousepad/Makefile
-# used by graphics/xfce4-icon-theme/Makefile
+# used by mail/xfce4-mailwatch-plugin/Makefile
 # used by meta-pkgs/xfce4-extras/Makefile
+# used by misc/xfce4-time-out-plugin/Makefile
 # used by misc/xfce4-weather-plugin/Makefile
 # used by multimedia/xfce4-mpc-plugin/Makefile
+# used by multimedia/xfce4-thunar-media-tags/Makefile
 # used by net/xfce4-wavelan-plugin/Makefile
-# used by print/xfce4-print/Makefile
 # used by sysutils/xfce4-appfinder/Makefile
 # used by sysutils/xfce4-battery-plugin/Makefile
+# used by sysutils/xfce4-cpufreq-plugin/Makefile
 # used by sysutils/xfce4-cpugraph-plugin/Makefile
 # used by sysutils/xfce4-diskperf-plugin/Makefile
 # used by sysutils/xfce4-fsguard-plugin/Makefile
 # used by sysutils/xfce4-genmon-plugin/Makefile
+# used by sysutils/xfce4-mount-plugin/Makefile
 # used by sysutils/xfce4-netload-plugin/Makefile
 # used by sysutils/xfce4-quicklauncher-plugin/Makefile
 # used by sysutils/xfce4-systemload-plugin/Makefile
+# used by sysutils/xfce4-taskmanager/Makefile
+# used by sysutils/xfce4-thunar-vcs/Makefile
 # used by sysutils/xfce4-thunar/Makefile
-# used by sysutils/xfce4-volman/Makefile
+# used by sysutils/xfce4-verve-plugin/Makefile
 # used by sysutils/xfce4-xarchiver/Makefile
 # used by sysutils/xfce4-xkb-plugin/Makefile
 # used by textproc/xfce4-dict-plugin/Makefile
@@ -31,44 +38,45 @@
 # used by wm/xfce4-wm-themes/Makefile
 # used by wm/xfce4-wm/Makefile
 # used by x11/libxfce4gui/Makefile
-# used by x11/libxfce4menu/Makefile
+# used by x11/libxfce4ui/Makefile
 # used by x11/libxfce4util/Makefile
 # used by x11/xfce4-clipman-plugin/Makefile
 # used by x11/xfce4-desktop/Makefile
 # used by x11/xfce4-exo/Makefile
 # used by x11/xfce4-eyes-plugin/Makefile
+# used by x11/xfce4-garcon/Makefile
 # used by x11/xfce4-gtk2-engine/Makefile
 # used by x11/xfce4-notes-plugin/Makefile
+# used by x11/xfce4-notifyd/Makefile
 # used by x11/xfce4-panel/Makefile
 # used by x11/xfce4-places-plugin/Makefile
-# used by x11/xfce4-screenshooter-plugin/Makefile
+# used by x11/xfce4-screenshooter/Makefile
 # used by x11/xfce4-session/Makefile
 # used by x11/xfce4-settings/Makefile
 # used by x11/xfce4-terminal/Makefile
-# used by x11/xfce4-utils/Makefile
+# used by x11/xfce4-tumbler/Makefile
+# used by x11/xfce4-whiskermenu-plugin/Makefile
 
-MASTER_SITES=		http://www.xfce.org/archive/xfce-4.6.1/src/
+MASTER_SITES=		http://archive.xfce.org/xfce/4.12/src/
 EXTRACT_SUFX=		.tar.bz2
 
-MAINTAINER=		pkgsrc-users@NetBSD.org
+MAINTAINER=		youri.mout@gmail.com
 HOMEPAGE=		http://www.xfce.org/
 LICENSE=		gnu-gpl-v2
 
-XFCE4_VERSION=		4.6.1
-
-# Do NOT put a PKGREVISION statement in this file!
+XFCE4_VERSION=		4.12.0
 
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		gmake pkg-config msgfmt perl intltool
 
-.if ${MACHINE_ARCH} == "alpha"
-GCC_REQD+=		3.0
-.endif
-
 XFCE4_EGBASE=		${PREFIX}/share/examples/xfce4
 
-.include "../../devel/glib2/buildlink3.mk"
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "Darwin"
+CONFIGURE_ARGS+=	--disable-visibility
+.endif
+
 .include "../../x11/gtk2/buildlink3.mk"
-.include "../../x11/libSM/buildlink3.mk"
diff --git a/meta-pkgs/xfce4/buildlink3.mk b/meta-pkgs/xfce4/buildlink3.mk
deleted file mode 100644
index fec08c35cc9..00000000000
--- a/meta-pkgs/xfce4/buildlink3.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.48 2014/05/05 00:48:08 ryoon Exp $
-
-BUILDLINK_TREE+=	xfce4
-
-.if !defined(XFCE4_BUILDLINK3_MK)
-XFCE4_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.xfce4+=	xfce4>=4.6.0
-BUILDLINK_ABI_DEPENDS.xfce4+=	xfce4>=4.6.1nb30
-BUILDLINK_PKGSRCDIR.xfce4?=	../../meta-pkgs/xfce4
-
-.include "../../audio/xfce4-mixer/buildlink3.mk"
-.include "../../editors/xfce4-mousepad/buildlink3.mk"
-.include "../../graphics/xfce4-icon-theme/buildlink3.mk"
-.include "../../print/xfce4-print/buildlink3.mk"
-.include "../../sysutils/xfce4-appfinder/buildlink3.mk"
-.include "../../sysutils/xfce4-xarchiver/buildlink3.mk"
-.include "../../time/xfce4-orage/buildlink3.mk"
-.include "../../wm/xfce4-wm-themes/buildlink3.mk"
-.include "../../wm/xfce4-wm/buildlink3.mk"
-.include "../../x11/xfce4-desktop/buildlink3.mk"
-.include "../../x11/xfce4-gtk2-engine/buildlink3.mk"
-.include "../../x11/xfce4-panel/buildlink3.mk"
-.include "../../x11/xfce4-session/buildlink3.mk"
-.include "../../x11/xfce4-terminal/buildlink3.mk"
-.include "../../x11/xfce4-utils/buildlink3.mk"
-.include "../../x11/libSM/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
-.endif # XFCE4_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-xfce4