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.

5 files changed, 71 insertions, 30 deletions

diff --git a/time/xfce4-timer-plugin/Makefile b/time/xfce4-timer-plugin/Makefile
index 7fb6eca1493..d189a23e57d 100644
--- a/time/xfce4-timer-plugin/Makefile
+++ b/time/xfce4-timer-plugin/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.24 2014/05/05 00:48:24 ryoon Exp $
+# $NetBSD: Makefile,v 1.25 2015/04/21 08:56:42 jperkin Exp $
 #
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
-XFCE4_VERSION=	0.5.1
-
-DISTNAME=	xfce4-timer-plugin-${XFCE4_VERSION}
-PKGREVISION=	21
+DISTNAME=	xfce4-timer-plugin-1.6.0
 CATEGORIES=	time
-MASTER_SITES=	http://goodies.xfce.org/releases/xfce4-timer-plugin/
+MASTER_SITES=	http://archive.xfce.org/src/panel-plugins/xfce4-timer-plugin/1.6/
+
+HOMEPAGE=	http://goodies.xfce.org/projects/panel-plugins/xfce4-timer-plugin
 COMMENT=	Xfce4 timer plugin
 
 .include "../../x11/xfce4-panel/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/xfce4-timer-plugin/PLIST b/time/xfce4-timer-plugin/PLIST
index b1c4ae5266a..d6be3f8d629 100644
--- a/time/xfce4-timer-plugin/PLIST
+++ b/time/xfce4-timer-plugin/PLIST
@@ -1,11 +1,45 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:18:01 joerg Exp $
-libexec/xfce4/panel-plugins/xfce4-timer
+@comment $NetBSD: PLIST,v 1.3 2015/04/21 08:56:42 jperkin Exp $
+libexec/xfce4/panel/plugins/xfce4-timer
+share/icons/hicolor/48x48/apps/xfce4-timer.png
+share/locale/ar/LC_MESSAGES/xfce4-timer-plugin.mo
+share/locale/ast/LC_MESSAGES/xfce4-timer-plugin.mo
+share/locale/bg/LC_MESSAGES/xfce4-timer-plugin.mo
+share/locale/ca/LC_MESSAGES/xfce4-timer-plugin.mo
 share/locale/cs/LC_MESSAGES/xfce4-timer-plugin.mo
+share/locale/da/LC_MESSAGES/xfce4-timer-plugin.mo
+share/locale/de/LC_MESSAGES/xfce4-timer-plugin.mo
+share/locale/el/LC_MESSAGES/xfce4-timer-plugin.mo
+share/locale/en_AU/LC_MESSAGES/xfce4-timer-plugin.mo
+share/locale/en_GB/LC_MESSAGES/xfce4-timer-plugin.mo
+share/locale/es/LC_MESSAGES/xfce4-timer-plugin.mo
 share/locale/eu/LC_MESSAGES/xfce4-timer-plugin.mo
 share/locale/fr/LC_MESSAGES/xfce4-timer-plugin.mo
+share/locale/gl/LC_MESSAGES/xfce4-timer-plugin.mo
+share/locale/hr/LC_MESSAGES/xfce4-timer-plugin.mo
 share/locale/hu/LC_MESSAGES/xfce4-timer-plugin.mo
+share/locale/id/LC_MESSAGES/xfce4-timer-plugin.mo
+share/locale/it/LC_MESSAGES/xfce4-timer-plugin.mo
 share/locale/ja/LC_MESSAGES/xfce4-timer-plugin.mo
+share/locale/ko/LC_MESSAGES/xfce4-timer-plugin.mo
+share/locale/lv/LC_MESSAGES/xfce4-timer-plugin.mo
+share/locale/ms/LC_MESSAGES/xfce4-timer-plugin.mo
+share/locale/nb/LC_MESSAGES/xfce4-timer-plugin.mo
+share/locale/nl/LC_MESSAGES/xfce4-timer-plugin.mo
+share/locale/oc/LC_MESSAGES/xfce4-timer-plugin.mo
 share/locale/pl/LC_MESSAGES/xfce4-timer-plugin.mo
+share/locale/pt/LC_MESSAGES/xfce4-timer-plugin.mo
+share/locale/pt_BR/LC_MESSAGES/xfce4-timer-plugin.mo
 share/locale/ru/LC_MESSAGES/xfce4-timer-plugin.mo
+share/locale/sk/LC_MESSAGES/xfce4-timer-plugin.mo
+share/locale/sq/LC_MESSAGES/xfce4-timer-plugin.mo
+share/locale/sr/LC_MESSAGES/xfce4-timer-plugin.mo
+share/locale/sv/LC_MESSAGES/xfce4-timer-plugin.mo
+share/locale/th/LC_MESSAGES/xfce4-timer-plugin.mo
 share/locale/tr/LC_MESSAGES/xfce4-timer-plugin.mo
-share/xfce4/panel-plugins/xfce4-timer.desktop
+share/locale/ug/LC_MESSAGES/xfce4-timer-plugin.mo
+share/locale/uk/LC_MESSAGES/xfce4-timer-plugin.mo
+share/locale/ur/LC_MESSAGES/xfce4-timer-plugin.mo
+share/locale/ur_PK/LC_MESSAGES/xfce4-timer-plugin.mo
+share/locale/zh_CN/LC_MESSAGES/xfce4-timer-plugin.mo
+share/locale/zh_TW/LC_MESSAGES/xfce4-timer-plugin.mo
+share/xfce4/panel/plugins/xfce4-timer.desktop
diff --git a/time/xfce4-timer-plugin/buildlink3.mk b/time/xfce4-timer-plugin/buildlink3.mk
deleted file mode 100644
index d7b6ed394b6..00000000000
--- a/time/xfce4-timer-plugin/buildlink3.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.25 2014/05/05 00:48:24 ryoon Exp $
-
-BUILDLINK_TREE+=	xfce4-timer-plugin
-
-.if !defined(XFCE4_TIMER_PLUGIN_BUILDLINK3_MK)
-XFCE4_TIMER_PLUGIN_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.xfce4-timer-plugin+=	xfce4-timer-plugin>=0.5.1
-BUILDLINK_ABI_DEPENDS.xfce4-timer-plugin+=	xfce4-timer-plugin>=0.5.1nb21
-BUILDLINK_PKGSRCDIR.xfce4-timer-plugin?=	../../time/xfce4-timer-plugin
-
-.include "../../x11/xfce4-panel/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
-.endif # XFCE4_TIMER_PLUGIN_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-xfce4-timer-plugin
diff --git a/time/xfce4-timer-plugin/distinfo b/time/xfce4-timer-plugin/distinfo
index 1632d7f895b..d49068e0084 100644
--- a/time/xfce4-timer-plugin/distinfo
+++ b/time/xfce4-timer-plugin/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/04/27 10:48:06 martti Exp $
+$NetBSD: distinfo,v 1.2 2015/04/21 08:56:42 jperkin Exp $
 
-SHA1 (xfce4-timer-plugin-0.5.1.tar.bz2) = 3d0d36139c1d757bd92d177c693071ca3599529a
-RMD160 (xfce4-timer-plugin-0.5.1.tar.bz2) = 02018ce4801883ec6005a132062fdfd1ec4c61ae
-Size (xfce4-timer-plugin-0.5.1.tar.bz2) = 311862 bytes
+SHA1 (xfce4-timer-plugin-1.6.0.tar.bz2) = aa37ccf7dad36000f413fd7dd29068da4858c8fe
+RMD160 (xfce4-timer-plugin-1.6.0.tar.bz2) = e7ffdbd03a19c87f206eef9920a4402a45d74405
+Size (xfce4-timer-plugin-1.6.0.tar.bz2) = 325662 bytes
+SHA1 (patch-src_Makefile.in) = 4778b32931ff6f2c10364cd824abfec43bc96082
diff --git a/time/xfce4-timer-plugin/patches/patch-src_Makefile.in b/time/xfce4-timer-plugin/patches/patch-src_Makefile.in
new file mode 100644
index 00000000000..e48c4f1c60c
--- /dev/null
+++ b/time/xfce4-timer-plugin/patches/patch-src_Makefile.in
@@ -0,0 +1,23 @@
+$NetBSD: patch-src_Makefile.in,v 1.1 2015/04/21 08:56:42 jperkin Exp $
+
+Adjust config path.
+--- src/Makefile.in.orig	2014-06-04 22:42:33.000000000 +0000
++++ src/Makefile.in
+@@ -298,7 +298,7 @@ target_alias = @target_alias@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-plugindir = $(libexecdir)/xfce4/panel-plugins
++plugindir = $(libexecdir)/xfce4/panel/plugins
+ 
+ # deprecated?
+ #plugin_LTLIBRARIES =							\
+@@ -337,7 +337,7 @@ desktop_in_in_files = \
+ 	xfce4-timer.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 = xfce4-timer.desktop
+ EXTRA_DIST = \
+ 	$(desktop_in_in_files)