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.

10 files changed, 117 insertions, 85 deletions

diff --git a/sysutils/xfce4-netload-plugin/Makefile b/sysutils/xfce4-netload-plugin/Makefile
index 6f592ef0667..b6cddecad7a 100644
--- a/sysutils/xfce4-netload-plugin/Makefile
+++ b/sysutils/xfce4-netload-plugin/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.41 2014/08/21 14:51:30 jperkin Exp $
+# $NetBSD: Makefile,v 1.42 2015/04/21 08:56:41 jperkin Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
-XFCE4_VERSION=	0.4.0
-
-DISTNAME=	xfce4-netload-plugin-${XFCE4_VERSION}
-PKGREVISION=	21
+DISTNAME=	xfce4-netload-plugin-1.2.4
 CATEGORIES=	sysutils
-MASTER_SITES=	http://goodies.xfce.org/releases/xfce4-netload-plugin/
+MASTER_SITES=	http://archive.xfce.org/src/panel-plugins/xfce4-netload-plugin/1.2/
+
+HOMEPAGE=	http://goodies.xfce.org/projects/panel-plugins/xfce4-netload-plugin
 COMMENT=	Xfce network load plugin
 
 LDFLAGS.SunOS+=	-lnsl
 
 .include "../../x11/xfce4-panel/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/xfce4-netload-plugin/PLIST b/sysutils/xfce4-netload-plugin/PLIST
index 165707d67fe..d6460b2e6be 100644
--- a/sysutils/xfce4-netload-plugin/PLIST
+++ b/sysutils/xfce4-netload-plugin/PLIST
@@ -1,10 +1,56 @@
-@comment $NetBSD: PLIST,v 1.7 2007/04/12 09:55:16 martti Exp $
-libexec/xfce4/panel-plugins/xfce4-netload-plugin
+@comment $NetBSD: PLIST,v 1.8 2015/04/21 08:56:41 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.8 2015/04/21 08:56:41 jperkin Exp $
+lib/xfce4/panel/plugins/libnetload.la
+share/icons/hicolor/24x24/apps/xfce4-netload-plugin.png
+share/icons/hicolor/48x48/apps/xfce4-netload-plugin.png
+share/icons/hicolor/scalable/apps/xfce4-netload-plugin.svg
+share/locale/ar/LC_MESSAGES/xfce4-netload-plugin.mo
+share/locale/ast/LC_MESSAGES/xfce4-netload-plugin.mo
+share/locale/bg/LC_MESSAGES/xfce4-netload-plugin.mo
 share/locale/ca/LC_MESSAGES/xfce4-netload-plugin.mo
+share/locale/cs/LC_MESSAGES/xfce4-netload-plugin.mo
+share/locale/da/LC_MESSAGES/xfce4-netload-plugin.mo
 share/locale/de/LC_MESSAGES/xfce4-netload-plugin.mo
+share/locale/el/LC_MESSAGES/xfce4-netload-plugin.mo
+share/locale/en_AU/LC_MESSAGES/xfce4-netload-plugin.mo
+share/locale/en_GB/LC_MESSAGES/xfce4-netload-plugin.mo
+share/locale/eo/LC_MESSAGES/xfce4-netload-plugin.mo
+share/locale/es/LC_MESSAGES/xfce4-netload-plugin.mo
+share/locale/eu/LC_MESSAGES/xfce4-netload-plugin.mo
+share/locale/fi/LC_MESSAGES/xfce4-netload-plugin.mo
 share/locale/fr/LC_MESSAGES/xfce4-netload-plugin.mo
+share/locale/gl/LC_MESSAGES/xfce4-netload-plugin.mo
+share/locale/he/LC_MESSAGES/xfce4-netload-plugin.mo
+share/locale/hr/LC_MESSAGES/xfce4-netload-plugin.mo
+share/locale/hu/LC_MESSAGES/xfce4-netload-plugin.mo
+share/locale/id/LC_MESSAGES/xfce4-netload-plugin.mo
+share/locale/is/LC_MESSAGES/xfce4-netload-plugin.mo
+share/locale/it/LC_MESSAGES/xfce4-netload-plugin.mo
+share/locale/ja/LC_MESSAGES/xfce4-netload-plugin.mo
+share/locale/kk/LC_MESSAGES/xfce4-netload-plugin.mo
 share/locale/ko/LC_MESSAGES/xfce4-netload-plugin.mo
 share/locale/lt/LC_MESSAGES/xfce4-netload-plugin.mo
+share/locale/lv/LC_MESSAGES/xfce4-netload-plugin.mo
+share/locale/ms/LC_MESSAGES/xfce4-netload-plugin.mo
+share/locale/nb/LC_MESSAGES/xfce4-netload-plugin.mo
+share/locale/nl/LC_MESSAGES/xfce4-netload-plugin.mo
+share/locale/oc/LC_MESSAGES/xfce4-netload-plugin.mo
+share/locale/pa/LC_MESSAGES/xfce4-netload-plugin.mo
 share/locale/pl/LC_MESSAGES/xfce4-netload-plugin.mo
+share/locale/pt/LC_MESSAGES/xfce4-netload-plugin.mo
+share/locale/pt_BR/LC_MESSAGES/xfce4-netload-plugin.mo
+share/locale/ru/LC_MESSAGES/xfce4-netload-plugin.mo
+share/locale/sk/LC_MESSAGES/xfce4-netload-plugin.mo
+share/locale/sq/LC_MESSAGES/xfce4-netload-plugin.mo
+share/locale/sr/LC_MESSAGES/xfce4-netload-plugin.mo
+share/locale/sv/LC_MESSAGES/xfce4-netload-plugin.mo
+share/locale/th/LC_MESSAGES/xfce4-netload-plugin.mo
+share/locale/tr/LC_MESSAGES/xfce4-netload-plugin.mo
+share/locale/ug/LC_MESSAGES/xfce4-netload-plugin.mo
 share/locale/uk/LC_MESSAGES/xfce4-netload-plugin.mo
-share/xfce4/panel-plugins/netload.desktop
+share/locale/ur/LC_MESSAGES/xfce4-netload-plugin.mo
+share/locale/ur_PK/LC_MESSAGES/xfce4-netload-plugin.mo
+share/locale/vi/LC_MESSAGES/xfce4-netload-plugin.mo
+share/locale/zh_CN/LC_MESSAGES/xfce4-netload-plugin.mo
+share/locale/zh_TW/LC_MESSAGES/xfce4-netload-plugin.mo
+share/xfce4/panel/plugins/netload.desktop
diff --git a/sysutils/xfce4-netload-plugin/buildlink3.mk b/sysutils/xfce4-netload-plugin/buildlink3.mk
deleted file mode 100644
index eb8f17ae550..00000000000
--- a/sysutils/xfce4-netload-plugin/buildlink3.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.41 2014/05/05 00:48:22 ryoon Exp $
-
-BUILDLINK_TREE+=	xfce4-netload-plugin
-
-.if !defined(XFCE4_NETLOAD_PLUGIN_BUILDLINK3_MK)
-XFCE4_NETLOAD_PLUGIN_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.xfce4-netload-plugin+=	xfce4-netload-plugin>=0.4.0
-BUILDLINK_ABI_DEPENDS.xfce4-netload-plugin+=	xfce4-netload-plugin>=0.4.0nb21
-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_TREE+=	-xfce4-netload-plugin
diff --git a/sysutils/xfce4-netload-plugin/distinfo b/sysutils/xfce4-netload-plugin/distinfo
index e88552efce1..2a53b1e5156 100644
--- a/sysutils/xfce4-netload-plugin/distinfo
+++ b/sysutils/xfce4-netload-plugin/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.10 2007/06/30 18:14:35 joerg Exp $
+$NetBSD: distinfo,v 1.11 2015/04/21 08:56:41 jperkin Exp $
 
-SHA1 (xfce4-netload-plugin-0.4.0.tar.bz2) = 197231f99773f4e299c64125dd0d1a25bfb533bb
-RMD160 (xfce4-netload-plugin-0.4.0.tar.bz2) = 47d8183da3885b6a476504fd8d5762be7d4fffac
-Size (xfce4-netload-plugin-0.4.0.tar.bz2) = 125046 bytes
-SHA1 (patch-aa) = c58b274d5bc8f065a3d002bd60cd2b1315f6b543
-SHA1 (patch-ab) = 427f7330e5c39738b12ab7fdf23be64ce60a61f4
-SHA1 (patch-ac) = de6c9c1df01be8da6228cff02741204c12aecd6d
+SHA1 (xfce4-netload-plugin-1.2.4.tar.bz2) = 2d038dc675ebf2e4d28842f0d33e3d215fe2bcb3
+RMD160 (xfce4-netload-plugin-1.2.4.tar.bz2) = 45ef4df8da5525d81da4bf3e3dea6abe697516c2
+Size (xfce4-netload-plugin-1.2.4.tar.bz2) = 361889 bytes
+SHA1 (patch-panel-plugin_Makefile.in) = 4fad81348816506d6b89a471d72ecfccb2182bfe
+SHA1 (patch-panel-plugin_net.c) = fbe62641a28154cf9b3ee8c9e5a5ba0c5691f09b
+SHA1 (patch-panel-plugin_net.h) = 5626f945ad552f313f07be857d74fe42604ab963
diff --git a/sysutils/xfce4-netload-plugin/patches/patch-aa b/sysutils/xfce4-netload-plugin/patches/patch-aa
deleted file mode 100644
index bca95c4bfbb..00000000000
--- a/sysutils/xfce4-netload-plugin/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2007/06/30 18:14:36 joerg Exp $
-
---- panel-plugin/net.c.orig	2007-06-30 17:58:57.000000000 +0000
-+++ panel-plugin/net.c
-@@ -46,7 +46,7 @@
- #elif __APPLE__
- # include "src/macos.h"
- # include "src/macos.c"
--#elif __FreeBSD__
-+#elif defined(__FreeBSD__) || defined(__DragonFly__)
- # include "wormulon/freebsd.h"
- # include "wormulon/freebsd.c"
- #elif __linux__
diff --git a/sysutils/xfce4-netload-plugin/patches/patch-ab b/sysutils/xfce4-netload-plugin/patches/patch-ab
deleted file mode 100644
index d7c3e5efd18..00000000000
--- a/sysutils/xfce4-netload-plugin/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2007/06/30 18:14:36 joerg Exp $
-
---- panel-plugin/net.h.orig	2007-06-30 17:58:11.000000000 +0000
-+++ panel-plugin/net.h
-@@ -62,7 +62,7 @@ typedef struct
- #ifdef __HPUX__
-     int             wait_pcks_counter;
-     nmapi_logstat*  if_ptr;
--#elif __FreeBSD__
-+#elif defined(__FreeBSD__) || defined(__DragonFly__)
-     int             watchif;
-     int             dev_opened;
- #elif __NetBSD__
diff --git a/sysutils/xfce4-netload-plugin/patches/patch-ac b/sysutils/xfce4-netload-plugin/patches/patch-ac
deleted file mode 100644
index 0ae4417676e..00000000000
--- a/sysutils/xfce4-netload-plugin/patches/patch-ac
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2007/06/30 18:14:36 joerg Exp $
-
---- panel-plugin/os.h.orig	2007-06-30 17:53:50.000000000 +0000
-+++ panel-plugin/os.h
-@@ -72,7 +72,7 @@
- #include <net/if_media.h>
- #include <net/if_mib.h>
- #include <arpa/inet.h>
--#elif __FreeBSD__           /* F R E E B S D */
-+#elif defined(__FreeBSD__) || defined(__DragonFly__)           /* F R E E B S D */
- #include <stdio.h>
- #include <stdlib.h>
- #include <stdarg.h>
-@@ -94,8 +94,13 @@
- #include <net/if_media.h>
- #include <net/if_mib.h>
- #include <arpa/inet.h>
-+#  if defined(__DragonFly__)
-+#include <net/ppp_layer/ppp_defs.h>
-+#include <net/ppp/if_ppp.h>
-+#  else
- #include <net/ppp_defs.h>
- #include <net/if_ppp.h>
-+#  endif
- #elif __NetBSD__            /* N E T B S D */
- #include <stdio.h>
- #include <sys/param.h>
diff --git a/sysutils/xfce4-netload-plugin/patches/patch-panel-plugin_Makefile.in b/sysutils/xfce4-netload-plugin/patches/patch-panel-plugin_Makefile.in
new file mode 100644
index 00000000000..d2dd25ae2b7
--- /dev/null
+++ b/sysutils/xfce4-netload-plugin/patches/patch-panel-plugin_Makefile.in
@@ -0,0 +1,23 @@
+$NetBSD: patch-panel-plugin_Makefile.in,v 1.1 2015/04/21 08:56:41 jperkin Exp $
+
+Adjust config path.
+--- panel-plugin/Makefile.in.orig	2014-11-22 21:10:32.000000000 +0000
++++ panel-plugin/Makefile.in
+@@ -355,7 +355,7 @@ commandline_LDADD = @LIBXFCE4PANEL_LIBS@
+ # 
+ desktop_in_in_files = netload.desktop.in.in
+ desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
+-desktopdir = $(datadir)/xfce4/panel-plugins
++desktopdir = $(datadir)/xfce4/panel/plugins
+ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+ EXTRA_DIST = \
+ 	wormulon commandline.c						\
+@@ -791,7 +791,7 @@ uninstall-am: uninstall-desktopDATA unin
+ 
+ # get full path into .desktop file
+ %.desktop.in: %.desktop.in.in
+-	sed -e "s^@PLUGIN_PATH@^$(libexecdir)/xfce4/panel-plugins^" \
++	sed -e "s^@PLUGIN_PATH@^$(libexecdir)/xfce4/panel/plugins^" \
+ 		$< > $@
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/sysutils/xfce4-netload-plugin/patches/patch-panel-plugin_net.c b/sysutils/xfce4-netload-plugin/patches/patch-panel-plugin_net.c
new file mode 100644
index 00000000000..5a246ef4945
--- /dev/null
+++ b/sysutils/xfce4-netload-plugin/patches/patch-panel-plugin_net.c
@@ -0,0 +1,18 @@
+$NetBSD: patch-panel-plugin_net.c,v 1.1 2015/04/21 08:56:41 jperkin Exp $
+
+Fix DragonFly build.
+--- panel-plugin/net.c.orig	2014-11-02 11:50:26.000000000 +0000
++++ panel-plugin/net.c
+@@ -48,9 +48,9 @@
+ # include "wormulon/hpux.h"
+ # include "wormulon/hpux.c"
+ #elif __APPLE__
+-# include "src/macos.h"
+-# include "src/macos.c"
+-#elif __FreeBSD__ || __DragonFly__ || __FreeBSD_kernel__
++# include "wormulon/macos.h"
++# include "wormulon/macos.c"
++#elif defined(__FreeBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__)
+ # include "wormulon/freebsd.h"
+ # include "wormulon/freebsd.c"
+ #elif __linux__
diff --git a/sysutils/xfce4-netload-plugin/patches/patch-panel-plugin_net.h b/sysutils/xfce4-netload-plugin/patches/patch-panel-plugin_net.h
new file mode 100644
index 00000000000..48f248c516c
--- /dev/null
+++ b/sysutils/xfce4-netload-plugin/patches/patch-panel-plugin_net.h
@@ -0,0 +1,14 @@
+$NetBSD: patch-panel-plugin_net.h,v 1.1 2015/04/21 08:56:41 jperkin Exp $
+
+Fix DragonFly build.
+--- panel-plugin/net.h.orig	2014-11-22 17:11:26.000000000 +0000
++++ panel-plugin/net.h
+@@ -69,7 +69,7 @@ typedef struct
+ #ifdef __HPUX__
+     int             wait_pcks_counter;
+     nmapi_logstat*  if_ptr;
+-#elif __FreeBSD__ || __DragonFly__ || __FreeBSD_kernel__
++#elif defined(__FreeBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__)
+     int             watchif;
+     int             dev_opened;
+ #elif __NetBSD__