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.

16 files changed, 378 insertions, 179 deletions

diff --git a/time/xfce4-datetime-plugin/Makefile b/time/xfce4-datetime-plugin/Makefile
index 8918895cd8f..411d4f7c4b9 100644
--- a/time/xfce4-datetime-plugin/Makefile
+++ b/time/xfce4-datetime-plugin/Makefile
@@ -1,16 +1,13 @@
-# $NetBSD: Makefile,v 1.38 2014/05/05 00:48:24 ryoon Exp $
+# $NetBSD: Makefile,v 1.39 2015/04/21 08:56:42 jperkin Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
-XFCE4_VERSION=	0.6.1
-
-DISTNAME=	xfce4-datetime-plugin-${XFCE4_VERSION}
-PKGREVISION=	20
+DISTNAME=	xfce4-datetime-plugin-0.6.2
 CATEGORIES=	time
-MASTER_SITES=	http://goodies.xfce.org/releases/xfce4-datetime-plugin/
-EXTRACT_SUFX=	.tar.bz2
+MASTER_SITES=	http://archive.xfce.org/src/panel-plugins/xfce4-datetime-plugin/0.6/
+
+HOMEPAGE=	http://goodies.xfce.org/projects/panel-plugins/xfce4-datetime-plugin
 COMMENT=	Xfce calendar plugin
 
 .include "../../x11/xfce4-panel/buildlink3.mk"
-.include "../../x11/libxfce4gui/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/xfce4-datetime-plugin/PLIST b/time/xfce4-datetime-plugin/PLIST
index 5a49c78fe93..99b815758e5 100644
--- a/time/xfce4-datetime-plugin/PLIST
+++ b/time/xfce4-datetime-plugin/PLIST
@@ -1,20 +1,44 @@
-@comment $NetBSD: PLIST,v 1.7 2009/09/16 02:25:35 reed Exp $
-lib/xfce4/panel-plugins/libdatetime.la
+@comment $NetBSD: PLIST,v 1.8 2015/04/21 08:56:42 jperkin Exp $
+lib/xfce4/panel/plugins/libdatetime.la
 share/locale/ar/LC_MESSAGES/xfce4-datetime-plugin.mo
+share/locale/ast/LC_MESSAGES/xfce4-datetime-plugin.mo
+share/locale/bg/LC_MESSAGES/xfce4-datetime-plugin.mo
+share/locale/ca/LC_MESSAGES/xfce4-datetime-plugin.mo
+share/locale/cs/LC_MESSAGES/xfce4-datetime-plugin.mo
 share/locale/da/LC_MESSAGES/xfce4-datetime-plugin.mo
+share/locale/de/LC_MESSAGES/xfce4-datetime-plugin.mo
 share/locale/el/LC_MESSAGES/xfce4-datetime-plugin.mo
 share/locale/en_GB/LC_MESSAGES/xfce4-datetime-plugin.mo
 share/locale/es/LC_MESSAGES/xfce4-datetime-plugin.mo
 share/locale/eu/LC_MESSAGES/xfce4-datetime-plugin.mo
 share/locale/fr/LC_MESSAGES/xfce4-datetime-plugin.mo
 share/locale/gl/LC_MESSAGES/xfce4-datetime-plugin.mo
+share/locale/hr/LC_MESSAGES/xfce4-datetime-plugin.mo
 share/locale/hu/LC_MESSAGES/xfce4-datetime-plugin.mo
+share/locale/id/LC_MESSAGES/xfce4-datetime-plugin.mo
+share/locale/is/LC_MESSAGES/xfce4-datetime-plugin.mo
+share/locale/it/LC_MESSAGES/xfce4-datetime-plugin.mo
 share/locale/ja/LC_MESSAGES/xfce4-datetime-plugin.mo
+share/locale/kk/LC_MESSAGES/xfce4-datetime-plugin.mo
+share/locale/ko/LC_MESSAGES/xfce4-datetime-plugin.mo
+share/locale/lt/LC_MESSAGES/xfce4-datetime-plugin.mo
 share/locale/lv/LC_MESSAGES/xfce4-datetime-plugin.mo
 share/locale/nl/LC_MESSAGES/xfce4-datetime-plugin.mo
+share/locale/nn/LC_MESSAGES/xfce4-datetime-plugin.mo
+share/locale/pa/LC_MESSAGES/xfce4-datetime-plugin.mo
+share/locale/pl/LC_MESSAGES/xfce4-datetime-plugin.mo
+share/locale/pt/LC_MESSAGES/xfce4-datetime-plugin.mo
 share/locale/pt_BR/LC_MESSAGES/xfce4-datetime-plugin.mo
-share/locale/pt_PT/LC_MESSAGES/xfce4-datetime-plugin.mo
+share/locale/ro/LC_MESSAGES/xfce4-datetime-plugin.mo
+share/locale/ru/LC_MESSAGES/xfce4-datetime-plugin.mo
+share/locale/sk/LC_MESSAGES/xfce4-datetime-plugin.mo
+share/locale/sr/LC_MESSAGES/xfce4-datetime-plugin.mo
+share/locale/sv/LC_MESSAGES/xfce4-datetime-plugin.mo
 share/locale/tr/LC_MESSAGES/xfce4-datetime-plugin.mo
+share/locale/ug/LC_MESSAGES/xfce4-datetime-plugin.mo
 share/locale/uk/LC_MESSAGES/xfce4-datetime-plugin.mo
 share/locale/ur/LC_MESSAGES/xfce4-datetime-plugin.mo
-share/xfce4/panel-plugins/datetime.desktop
+share/locale/ur_PK/LC_MESSAGES/xfce4-datetime-plugin.mo
+share/locale/zh_CN/LC_MESSAGES/xfce4-datetime-plugin.mo
+share/locale/zh_TW/LC_MESSAGES/xfce4-datetime-plugin.mo
+share/xfce4/panel/plugins/datetime.desktop
diff --git a/time/xfce4-datetime-plugin/buildlink3.mk b/time/xfce4-datetime-plugin/buildlink3.mk
deleted file mode 100644
index 8f8e6013781..00000000000
--- a/time/xfce4-datetime-plugin/buildlink3.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.37 2014/05/05 00:48:24 ryoon Exp $
-
-BUILDLINK_TREE+=	xfce4-datetime-plugin
-
-.if !defined(XFCE4_DATETIME_PLUGIN_BUILDLINK3_MK)
-XFCE4_DATETIME_PLUGIN_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.xfce4-datetime-plugin+=	xfce4-datetime-plugin>=0.4.1
-BUILDLINK_ABI_DEPENDS.xfce4-datetime-plugin+=	xfce4-datetime-plugin>=0.6.1nb20
-BUILDLINK_PKGSRCDIR.xfce4-datetime-plugin?=	../../time/xfce4-datetime-plugin
-
-.include "../../x11/xfce4-panel/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
-.endif # XFCE4_DATETIME_PLUGIN_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-xfce4-datetime-plugin
diff --git a/time/xfce4-datetime-plugin/distinfo b/time/xfce4-datetime-plugin/distinfo
index e14c305583c..9d5c2651d73 100644
--- a/time/xfce4-datetime-plugin/distinfo
+++ b/time/xfce4-datetime-plugin/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.6 2009/09/16 02:25:35 reed Exp $
+$NetBSD: distinfo,v 1.7 2015/04/21 08:56:42 jperkin Exp $
 
-SHA1 (xfce4-datetime-plugin-0.6.1.tar.bz2) = 7ad64f68787446e8daf5102fc0691bd8e4cc2fa6
-RMD160 (xfce4-datetime-plugin-0.6.1.tar.bz2) = 347b225b28195f07ac6954d5a70b9850c0629f09
-Size (xfce4-datetime-plugin-0.6.1.tar.bz2) = 289328 bytes
+SHA1 (xfce4-datetime-plugin-0.6.2.tar.bz2) = 5a7e665fcfd06859c45e14b7063d719b5b26885f
+RMD160 (xfce4-datetime-plugin-0.6.2.tar.bz2) = 255b47032f43698d6ba8690792832296251436b7
+Size (xfce4-datetime-plugin-0.6.2.tar.bz2) = 287129 bytes
diff --git a/time/xfce4-orage/Makefile b/time/xfce4-orage/Makefile
index 062c8a65f04..7972d6ee4f3 100644
--- a/time/xfce4-orage/Makefile
+++ b/time/xfce4-orage/Makefile
@@ -1,20 +1,23 @@
-# $NetBSD: Makefile,v 1.30 2014/05/05 00:48:24 ryoon Exp $
+# $NetBSD: Makefile,v 1.31 2015/04/21 08:56:42 jperkin Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
-DISTNAME=	orage-${XFCE4_VERSION}
-PKGNAME=	xfce4-orage-${XFCE4_VERSION}
-PKGREVISION=	23
+VERSION=	4.10.0
+DISTNAME=	orage-${VERSION}
+PKGNAME=	xfce4-orage-${VERSION}
 CATEGORIES=	time
+MASTER_SITES=	http://archive.xfce.org/src/apps/orage/4.10/
+
+HOMEPAGE=	http://www.kolumbus.fi/~w408237/orage/
 COMMENT=	Xfce time managing application
 
 CONFIGURE_ARGS+=	--disable-libxfce4mcs
 
-.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../sysutils/dbus-glib/buildlink3.mk"
+MAKE_DIRS+=	${PREFIX}/libexec/xfce4 ${PREFIX}/libexec/xfce4/panel-plugins
+MAKE_DIRS+=	${PREFIX}/share/xfce4 ${PREFIX}/share/xfce4/panel-plugins
+
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../sysutils/libnotify/buildlink3.mk"
-.include "../../x11/libxfce4gui/buildlink3.mk"
 .include "../../x11/xfce4-panel/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/xfce4-orage/PLIST b/time/xfce4-orage/PLIST
index 6580699f293..b25642db345 100644
--- a/time/xfce4-orage/PLIST
+++ b/time/xfce4-orage/PLIST
@@ -1,26 +1,30 @@
-@comment $NetBSD: PLIST,v 1.6 2009/09/16 01:15:34 reed Exp $
+@comment $NetBSD: PLIST,v 1.7 2015/04/21 08:56:42 jperkin Exp $
 bin/globaltime
 bin/orage
-libexec/xfce4/panel-plugins/orageclock
+libexec/xfce4/panel/plugins/xfce4-orageclock-plugin
 man/man1/globaltime.1
 man/man1/orage.1
+man/man1/tz_convert.1
+share/applications/globaltime.desktop
 share/applications/xfcalendar.desktop
 share/applications/xfce-xfcalendar-settings.desktop
 share/dbus-1/services/org.xfce.calendar.service
 share/dbus-1/services/org.xfce.orage.service
+share/icons/hicolor/160x160/apps/orage.xpm
+share/icons/hicolor/160x160/apps/orage_ice.xpm
+share/icons/hicolor/160x160/apps/orage_round.xpm
+share/icons/hicolor/160x160/apps/orage_sun.xpm
+share/icons/hicolor/48x48/apps/orage_globaltime.png
 share/icons/hicolor/48x48/apps/xfcalendar.png
+share/icons/hicolor/scalable/apps/orage_globaltime.svg
 share/icons/hicolor/scalable/apps/xfcalendar.svg
 share/locale/am/LC_MESSAGES/orage.mo
 share/locale/ar/LC_MESSAGES/orage.mo
-share/locale/az/LC_MESSAGES/orage.mo
+share/locale/ast/LC_MESSAGES/orage.mo
 share/locale/be/LC_MESSAGES/orage.mo
 share/locale/bg/LC_MESSAGES/orage.mo
-share/locale/bn_IN/LC_MESSAGES/orage.mo
 share/locale/ca/LC_MESSAGES/orage.mo
 share/locale/cs/LC_MESSAGES/orage.mo
-share/locale/da/LC_MESSAGES/orage.mo
-share/locale/de/LC_MESSAGES/orage.mo
-share/locale/dz/LC_MESSAGES/orage.mo
 share/locale/el/LC_MESSAGES/orage.mo
 share/locale/en_AU/LC_MESSAGES/orage.mo
 share/locale/en_GB/LC_MESSAGES/orage.mo
@@ -28,41 +32,38 @@ share/locale/eo/LC_MESSAGES/orage.mo
 share/locale/es/LC_MESSAGES/orage.mo
 share/locale/et/LC_MESSAGES/orage.mo
 share/locale/eu/LC_MESSAGES/orage.mo
-share/locale/fa/LC_MESSAGES/orage.mo
-share/locale/fi/LC_MESSAGES/orage.mo
 share/locale/fr/LC_MESSAGES/orage.mo
 share/locale/gl/LC_MESSAGES/orage.mo
-share/locale/gu/LC_MESSAGES/orage.mo
 share/locale/he/LC_MESSAGES/orage.mo
-share/locale/hi/LC_MESSAGES/orage.mo
+share/locale/hr/LC_MESSAGES/orage.mo
 share/locale/hu/LC_MESSAGES/orage.mo
-share/locale/hy/LC_MESSAGES/orage.mo
 share/locale/id/LC_MESSAGES/orage.mo
 share/locale/it/LC_MESSAGES/orage.mo
 share/locale/ja/LC_MESSAGES/orage.mo
-share/locale/ka/LC_MESSAGES/orage.mo
+share/locale/kk/LC_MESSAGES/orage.mo
 share/locale/ko/LC_MESSAGES/orage.mo
-share/locale/ku/LC_MESSAGES/orage.mo
 share/locale/lt/LC_MESSAGES/orage.mo
 share/locale/lv/LC_MESSAGES/orage.mo
-share/locale/mk/LC_MESSAGES/orage.mo
-share/locale/mr/LC_MESSAGES/orage.mo
-share/locale/ms/LC_MESSAGES/orage.mo
 share/locale/nb/LC_MESSAGES/orage.mo
 share/locale/nl/LC_MESSAGES/orage.mo
+share/locale/nn/LC_MESSAGES/orage.mo
+share/locale/oc/LC_MESSAGES/orage.mo
 share/locale/pa/LC_MESSAGES/orage.mo
 share/locale/pl/LC_MESSAGES/orage.mo
 share/locale/pt/LC_MESSAGES/orage.mo
 share/locale/pt_BR/LC_MESSAGES/orage.mo
 share/locale/ro/LC_MESSAGES/orage.mo
 share/locale/ru/LC_MESSAGES/orage.mo
+share/locale/si/LC_MESSAGES/orage.mo
 share/locale/sk/LC_MESSAGES/orage.mo
 share/locale/sq/LC_MESSAGES/orage.mo
+share/locale/sr/LC_MESSAGES/orage.mo
 share/locale/sv/LC_MESSAGES/orage.mo
-share/locale/ta/LC_MESSAGES/orage.mo
 share/locale/tr/LC_MESSAGES/orage.mo
+share/locale/ug/LC_MESSAGES/orage.mo
 share/locale/uk/LC_MESSAGES/orage.mo
 share/locale/ur/LC_MESSAGES/orage.mo
+share/locale/ur_PK/LC_MESSAGES/orage.mo
 share/locale/vi/LC_MESSAGES/orage.mo
 share/locale/zh_CN/LC_MESSAGES/orage.mo
 share/locale/zh_TW/LC_MESSAGES/orage.mo
@@ -96,6 +97,7 @@ share/orage/zoneinfo/Africa/Abidjan.ics
 share/orage/zoneinfo/Africa/Accra.ics
 share/orage/zoneinfo/Africa/Addis_Ababa.ics
 share/orage/zoneinfo/Africa/Algiers.ics
+share/orage/zoneinfo/Africa/Asmara.ics
 share/orage/zoneinfo/Africa/Asmera.ics
 share/orage/zoneinfo/Africa/Bamako.ics
 share/orage/zoneinfo/Africa/Bangui.ics
@@ -151,19 +153,32 @@ share/orage/zoneinfo/America/Antigua.ics
 share/orage/zoneinfo/America/Araguaina.ics
 share/orage/zoneinfo/America/Argentina/Buenos_Aires.ics
 share/orage/zoneinfo/America/Argentina/Catamarca.ics
+share/orage/zoneinfo/America/Argentina/ComodRivadavia.ics
 share/orage/zoneinfo/America/Argentina/Cordoba.ics
 share/orage/zoneinfo/America/Argentina/Jujuy.ics
+share/orage/zoneinfo/America/Argentina/La_Rioja.ics
 share/orage/zoneinfo/America/Argentina/Mendoza.ics
+share/orage/zoneinfo/America/Argentina/Rio_Gallegos.ics
+share/orage/zoneinfo/America/Argentina/Salta.ics
+share/orage/zoneinfo/America/Argentina/San_Juan.ics
+share/orage/zoneinfo/America/Argentina/San_Luis.ics
+share/orage/zoneinfo/America/Argentina/Tucuman.ics
+share/orage/zoneinfo/America/Argentina/Ushuaia.ics
 share/orage/zoneinfo/America/Aruba.ics
 share/orage/zoneinfo/America/Asuncion.ics
+share/orage/zoneinfo/America/Atikokan.ics
+share/orage/zoneinfo/America/Atka.ics
+share/orage/zoneinfo/America/Bahia.ics
 share/orage/zoneinfo/America/Barbados.ics
 share/orage/zoneinfo/America/Belem.ics
 share/orage/zoneinfo/America/Belize.ics
+share/orage/zoneinfo/America/Blanc-Sablon.ics
 share/orage/zoneinfo/America/Boa_Vista.ics
 share/orage/zoneinfo/America/Bogota.ics
 share/orage/zoneinfo/America/Boise.ics
 share/orage/zoneinfo/America/Buenos_Aires.ics
 share/orage/zoneinfo/America/Cambridge_Bay.ics
+share/orage/zoneinfo/America/Campo_Grande.ics
 share/orage/zoneinfo/America/Cancun.ics
 share/orage/zoneinfo/America/Caracas.ics
 share/orage/zoneinfo/America/Catamarca.ics
@@ -171,10 +186,12 @@ share/orage/zoneinfo/America/Cayenne.ics
 share/orage/zoneinfo/America/Cayman.ics
 share/orage/zoneinfo/America/Chicago.ics
 share/orage/zoneinfo/America/Chihuahua.ics
+share/orage/zoneinfo/America/Coral_Harbour.ics
 share/orage/zoneinfo/America/Cordoba.ics
 share/orage/zoneinfo/America/Costa_Rica.ics
 share/orage/zoneinfo/America/Cuiaba.ics
 share/orage/zoneinfo/America/Curacao.ics
+share/orage/zoneinfo/America/Danmarkshavn.ics
 share/orage/zoneinfo/America/Dawson.ics
 share/orage/zoneinfo/America/Dawson_Creek.ics
 share/orage/zoneinfo/America/Denver.ics
@@ -183,6 +200,8 @@ share/orage/zoneinfo/America/Dominica.ics
 share/orage/zoneinfo/America/Edmonton.ics
 share/orage/zoneinfo/America/Eirunepe.ics
 share/orage/zoneinfo/America/El_Salvador.ics
+share/orage/zoneinfo/America/Ensenada.ics
+share/orage/zoneinfo/America/Fort_Wayne.ics
 share/orage/zoneinfo/America/Fortaleza.ics
 share/orage/zoneinfo/America/Glace_Bay.ics
 share/orage/zoneinfo/America/Godthab.ics
@@ -199,7 +218,11 @@ share/orage/zoneinfo/America/Hermosillo.ics
 share/orage/zoneinfo/America/Indiana/Indianapolis.ics
 share/orage/zoneinfo/America/Indiana/Knox.ics
 share/orage/zoneinfo/America/Indiana/Marengo.ics
+share/orage/zoneinfo/America/Indiana/Petersburg.ics
+share/orage/zoneinfo/America/Indiana/Tell_City.ics
 share/orage/zoneinfo/America/Indiana/Vevay.ics
+share/orage/zoneinfo/America/Indiana/Vincennes.ics
+share/orage/zoneinfo/America/Indiana/Winamac.ics
 share/orage/zoneinfo/America/Indianapolis.ics
 share/orage/zoneinfo/America/Inuvik.ics
 share/orage/zoneinfo/America/Iqaluit.ics
@@ -208,6 +231,7 @@ share/orage/zoneinfo/America/Jujuy.ics
 share/orage/zoneinfo/America/Juneau.ics
 share/orage/zoneinfo/America/Kentucky/Louisville.ics
 share/orage/zoneinfo/America/Kentucky/Monticello.ics
+share/orage/zoneinfo/America/Knox_IN.ics
 share/orage/zoneinfo/America/La_Paz.ics
 share/orage/zoneinfo/America/Lima.ics
 share/orage/zoneinfo/America/Los_Angeles.ics
@@ -215,6 +239,7 @@ share/orage/zoneinfo/America/Louisville.ics
 share/orage/zoneinfo/America/Maceio.ics
 share/orage/zoneinfo/America/Managua.ics
 share/orage/zoneinfo/America/Manaus.ics
+share/orage/zoneinfo/America/Marigot.ics
 share/orage/zoneinfo/America/Martinique.ics
 share/orage/zoneinfo/America/Mazatlan.ics
 share/orage/zoneinfo/America/Mendoza.ics
@@ -222,6 +247,7 @@ share/orage/zoneinfo/America/Menominee.ics
 share/orage/zoneinfo/America/Merida.ics
 share/orage/zoneinfo/America/Mexico_City.ics
 share/orage/zoneinfo/America/Miquelon.ics
+share/orage/zoneinfo/America/Moncton.ics
 share/orage/zoneinfo/America/Monterrey.ics
 share/orage/zoneinfo/America/Montevideo.ics
 share/orage/zoneinfo/America/Montreal.ics
@@ -231,25 +257,31 @@ share/orage/zoneinfo/America/New_York.ics
 share/orage/zoneinfo/America/Nipigon.ics
 share/orage/zoneinfo/America/Nome.ics
 share/orage/zoneinfo/America/Noronha.ics
+share/orage/zoneinfo/America/North_Dakota/Center.ics
+share/orage/zoneinfo/America/North_Dakota/New_Salem.ics
 share/orage/zoneinfo/America/Panama.ics
 share/orage/zoneinfo/America/Pangnirtung.ics
 share/orage/zoneinfo/America/Paramaribo.ics
 share/orage/zoneinfo/America/Phoenix.ics
 share/orage/zoneinfo/America/Port-au-Prince.ics
 share/orage/zoneinfo/America/Port_of_Spain.ics
+share/orage/zoneinfo/America/Porto_Acre.ics
 share/orage/zoneinfo/America/Porto_Velho.ics
 share/orage/zoneinfo/America/Puerto_Rico.ics
 share/orage/zoneinfo/America/Rainy_River.ics
 share/orage/zoneinfo/America/Rankin_Inlet.ics
 share/orage/zoneinfo/America/Recife.ics
 share/orage/zoneinfo/America/Regina.ics
+share/orage/zoneinfo/America/Resolute.ics
 share/orage/zoneinfo/America/Rio_Branco.ics
 share/orage/zoneinfo/America/Rosario.ics
+share/orage/zoneinfo/America/Santarem.ics
 share/orage/zoneinfo/America/Santiago.ics
 share/orage/zoneinfo/America/Santo_Domingo.ics
 share/orage/zoneinfo/America/Sao_Paulo.ics
 share/orage/zoneinfo/America/Scoresbysund.ics
 share/orage/zoneinfo/America/Shiprock.ics
+share/orage/zoneinfo/America/St_Barthelemy.ics
 share/orage/zoneinfo/America/St_Johns.ics
 share/orage/zoneinfo/America/St_Kitts.ics
 share/orage/zoneinfo/America/St_Lucia.ics
@@ -260,8 +292,10 @@ share/orage/zoneinfo/America/Tegucigalpa.ics
 share/orage/zoneinfo/America/Thule.ics
 share/orage/zoneinfo/America/Thunder_Bay.ics
 share/orage/zoneinfo/America/Tijuana.ics
+share/orage/zoneinfo/America/Toronto.ics
 share/orage/zoneinfo/America/Tortola.ics
 share/orage/zoneinfo/America/Vancouver.ics
+share/orage/zoneinfo/America/Virgin.ics
 share/orage/zoneinfo/America/Whitehorse.ics
 share/orage/zoneinfo/America/Winnipeg.ics
 share/orage/zoneinfo/America/Yakutat.ics
@@ -272,6 +306,7 @@ share/orage/zoneinfo/Antarctica/DumontDUrville.ics
 share/orage/zoneinfo/Antarctica/Mawson.ics
 share/orage/zoneinfo/Antarctica/McMurdo.ics
 share/orage/zoneinfo/Antarctica/Palmer.ics
+share/orage/zoneinfo/Antarctica/Rothera.ics
 share/orage/zoneinfo/Antarctica/South_Pole.ics
 share/orage/zoneinfo/Antarctica/Syowa.ics
 share/orage/zoneinfo/Antarctica/Vostok.ics
@@ -283,6 +318,7 @@ share/orage/zoneinfo/Asia/Anadyr.ics
 share/orage/zoneinfo/Asia/Aqtau.ics
 share/orage/zoneinfo/Asia/Aqtobe.ics
 share/orage/zoneinfo/Asia/Ashgabat.ics
+share/orage/zoneinfo/Asia/Ashkhabad.ics
 share/orage/zoneinfo/Asia/Baghdad.ics
 share/orage/zoneinfo/Asia/Bahrain.ics
 share/orage/zoneinfo/Asia/Baku.ics
@@ -291,8 +327,11 @@ share/orage/zoneinfo/Asia/Beirut.ics
 share/orage/zoneinfo/Asia/Bishkek.ics
 share/orage/zoneinfo/Asia/Brunei.ics
 share/orage/zoneinfo/Asia/Calcutta.ics
+share/orage/zoneinfo/Asia/Choibalsan.ics
+share/orage/zoneinfo/Asia/Chongqing.ics
 share/orage/zoneinfo/Asia/Chungking.ics
 share/orage/zoneinfo/Asia/Colombo.ics
+share/orage/zoneinfo/Asia/Dacca.ics
 share/orage/zoneinfo/Asia/Damascus.ics
 share/orage/zoneinfo/Asia/Dhaka.ics
 share/orage/zoneinfo/Asia/Dili.ics
@@ -300,6 +339,7 @@ share/orage/zoneinfo/Asia/Dubai.ics
 share/orage/zoneinfo/Asia/Dushanbe.ics
 share/orage/zoneinfo/Asia/Gaza.ics
 share/orage/zoneinfo/Asia/Harbin.ics
+share/orage/zoneinfo/Asia/Ho_Chi_Minh.ics
 share/orage/zoneinfo/Asia/Hong_Kong.ics
 share/orage/zoneinfo/Asia/Hovd.ics
 share/orage/zoneinfo/Asia/Irkutsk.ics
@@ -311,25 +351,35 @@ share/orage/zoneinfo/Asia/Kabul.ics
 share/orage/zoneinfo/Asia/Kamchatka.ics
 share/orage/zoneinfo/Asia/Karachi.ics
 share/orage/zoneinfo/Asia/Kashgar.ics
+share/orage/zoneinfo/Asia/Kathmandu.ics
 share/orage/zoneinfo/Asia/Katmandu.ics
+share/orage/zoneinfo/Asia/Kolkata.ics
 share/orage/zoneinfo/Asia/Krasnoyarsk.ics
 share/orage/zoneinfo/Asia/Kuala_Lumpur.ics
 share/orage/zoneinfo/Asia/Kuching.ics
 share/orage/zoneinfo/Asia/Kuwait.ics
 share/orage/zoneinfo/Asia/Macao.ics
+share/orage/zoneinfo/Asia/Macau.ics
 share/orage/zoneinfo/Asia/Magadan.ics
+share/orage/zoneinfo/Asia/Makassar.ics
 share/orage/zoneinfo/Asia/Manila.ics
 share/orage/zoneinfo/Asia/Muscat.ics
 share/orage/zoneinfo/Asia/Nicosia.ics
 share/orage/zoneinfo/Asia/Novosibirsk.ics
 share/orage/zoneinfo/Asia/Omsk.ics
+share/orage/zoneinfo/Asia/Oral.ics
 share/orage/zoneinfo/Asia/Phnom_Penh.ics
 share/orage/zoneinfo/Asia/Pontianak.ics
 share/orage/zoneinfo/Asia/Pyongyang.ics
 share/orage/zoneinfo/Asia/Qatar.ics
+share/orage/zoneinfo/Asia/Qyzylorda.ics
 share/orage/zoneinfo/Asia/Rangoon.ics
 share/orage/zoneinfo/Asia/Riyadh.ics
+share/orage/zoneinfo/Asia/Riyadh87.ics
+share/orage/zoneinfo/Asia/Riyadh88.ics
+share/orage/zoneinfo/Asia/Riyadh89.ics
 share/orage/zoneinfo/Asia/Saigon.ics
+share/orage/zoneinfo/Asia/Sakhalin.ics
 share/orage/zoneinfo/Asia/Samarkand.ics
 share/orage/zoneinfo/Asia/Seoul.ics
 share/orage/zoneinfo/Asia/Shanghai.ics
@@ -338,10 +388,13 @@ share/orage/zoneinfo/Asia/Taipei.ics
 share/orage/zoneinfo/Asia/Tashkent.ics
 share/orage/zoneinfo/Asia/Tbilisi.ics
 share/orage/zoneinfo/Asia/Tehran.ics
+share/orage/zoneinfo/Asia/Tel_Aviv.ics
+share/orage/zoneinfo/Asia/Thimbu.ics
 share/orage/zoneinfo/Asia/Thimphu.ics
 share/orage/zoneinfo/Asia/Tokyo.ics
 share/orage/zoneinfo/Asia/Ujung_Pandang.ics
 share/orage/zoneinfo/Asia/Ulaanbaatar.ics
+share/orage/zoneinfo/Asia/Ulan_Bator.ics
 share/orage/zoneinfo/Asia/Urumqi.ics
 share/orage/zoneinfo/Asia/Vientiane.ics
 share/orage/zoneinfo/Asia/Vladivostok.ics
@@ -353,22 +406,94 @@ share/orage/zoneinfo/Atlantic/Bermuda.ics
 share/orage/zoneinfo/Atlantic/Canary.ics
 share/orage/zoneinfo/Atlantic/Cape_Verde.ics
 share/orage/zoneinfo/Atlantic/Faeroe.ics
+share/orage/zoneinfo/Atlantic/Faroe.ics
 share/orage/zoneinfo/Atlantic/Jan_Mayen.ics
 share/orage/zoneinfo/Atlantic/Madeira.ics
 share/orage/zoneinfo/Atlantic/Reykjavik.ics
 share/orage/zoneinfo/Atlantic/South_Georgia.ics
 share/orage/zoneinfo/Atlantic/St_Helena.ics
 share/orage/zoneinfo/Atlantic/Stanley.ics
+share/orage/zoneinfo/Australia/ACT.ics
 share/orage/zoneinfo/Australia/Adelaide.ics
 share/orage/zoneinfo/Australia/Brisbane.ics
 share/orage/zoneinfo/Australia/Broken_Hill.ics
+share/orage/zoneinfo/Australia/Canberra.ics
+share/orage/zoneinfo/Australia/Currie.ics
 share/orage/zoneinfo/Australia/Darwin.ics
+share/orage/zoneinfo/Australia/Eucla.ics
 share/orage/zoneinfo/Australia/Hobart.ics
+share/orage/zoneinfo/Australia/LHI.ics
 share/orage/zoneinfo/Australia/Lindeman.ics
 share/orage/zoneinfo/Australia/Lord_Howe.ics
 share/orage/zoneinfo/Australia/Melbourne.ics
+share/orage/zoneinfo/Australia/NSW.ics
+share/orage/zoneinfo/Australia/North.ics
 share/orage/zoneinfo/Australia/Perth.ics
+share/orage/zoneinfo/Australia/Queensland.ics
+share/orage/zoneinfo/Australia/South.ics
 share/orage/zoneinfo/Australia/Sydney.ics
+share/orage/zoneinfo/Australia/Tasmania.ics
+share/orage/zoneinfo/Australia/Victoria.ics
+share/orage/zoneinfo/Australia/West.ics
+share/orage/zoneinfo/Australia/Yancowinna.ics
+share/orage/zoneinfo/Brazil/Acre.ics
+share/orage/zoneinfo/Brazil/DeNoronha.ics
+share/orage/zoneinfo/Brazil/East.ics
+share/orage/zoneinfo/Brazil/West.ics
+share/orage/zoneinfo/CET.ics
+share/orage/zoneinfo/CST6CDT.ics
+share/orage/zoneinfo/Canada/Atlantic.ics
+share/orage/zoneinfo/Canada/Central.ics
+share/orage/zoneinfo/Canada/East-Saskatchewan.ics
+share/orage/zoneinfo/Canada/Eastern.ics
+share/orage/zoneinfo/Canada/Mountain.ics
+share/orage/zoneinfo/Canada/Newfoundland.ics
+share/orage/zoneinfo/Canada/Pacific.ics
+share/orage/zoneinfo/Canada/Saskatchewan.ics
+share/orage/zoneinfo/Canada/Yukon.ics
+share/orage/zoneinfo/Chile/Continental.ics
+share/orage/zoneinfo/Chile/EasterIsland.ics
+share/orage/zoneinfo/Cuba.ics
+share/orage/zoneinfo/EET.ics
+share/orage/zoneinfo/EST.ics
+share/orage/zoneinfo/EST5EDT.ics
+share/orage/zoneinfo/Egypt.ics
+share/orage/zoneinfo/Eire.ics
+share/orage/zoneinfo/Etc/GMT+0.ics
+share/orage/zoneinfo/Etc/GMT+1.ics
+share/orage/zoneinfo/Etc/GMT+10.ics
+share/orage/zoneinfo/Etc/GMT+11.ics
+share/orage/zoneinfo/Etc/GMT+12.ics
+share/orage/zoneinfo/Etc/GMT+2.ics
+share/orage/zoneinfo/Etc/GMT+3.ics
+share/orage/zoneinfo/Etc/GMT+4.ics
+share/orage/zoneinfo/Etc/GMT+5.ics
+share/orage/zoneinfo/Etc/GMT+6.ics
+share/orage/zoneinfo/Etc/GMT+7.ics
+share/orage/zoneinfo/Etc/GMT+8.ics
+share/orage/zoneinfo/Etc/GMT+9.ics
+share/orage/zoneinfo/Etc/GMT-0.ics
+share/orage/zoneinfo/Etc/GMT-1.ics
+share/orage/zoneinfo/Etc/GMT-10.ics
+share/orage/zoneinfo/Etc/GMT-11.ics
+share/orage/zoneinfo/Etc/GMT-12.ics
+share/orage/zoneinfo/Etc/GMT-13.ics
+share/orage/zoneinfo/Etc/GMT-14.ics
+share/orage/zoneinfo/Etc/GMT-2.ics
+share/orage/zoneinfo/Etc/GMT-3.ics
+share/orage/zoneinfo/Etc/GMT-4.ics
+share/orage/zoneinfo/Etc/GMT-5.ics
+share/orage/zoneinfo/Etc/GMT-6.ics
+share/orage/zoneinfo/Etc/GMT-7.ics
+share/orage/zoneinfo/Etc/GMT-8.ics
+share/orage/zoneinfo/Etc/GMT-9.ics
+share/orage/zoneinfo/Etc/GMT.ics
+share/orage/zoneinfo/Etc/GMT0.ics
+share/orage/zoneinfo/Etc/Greenwich.ics
+share/orage/zoneinfo/Etc/UCT.ics
+share/orage/zoneinfo/Etc/UTC.ics
+share/orage/zoneinfo/Etc/Universal.ics
+share/orage/zoneinfo/Etc/Zulu.ics
 share/orage/zoneinfo/Europe/Amsterdam.ics
 share/orage/zoneinfo/Europe/Andorra.ics
 share/orage/zoneinfo/Europe/Athens.ics
@@ -383,8 +508,11 @@ share/orage/zoneinfo/Europe/Chisinau.ics
 share/orage/zoneinfo/Europe/Copenhagen.ics
 share/orage/zoneinfo/Europe/Dublin.ics
 share/orage/zoneinfo/Europe/Gibraltar.ics
+share/orage/zoneinfo/Europe/Guernsey.ics
 share/orage/zoneinfo/Europe/Helsinki.ics
+share/orage/zoneinfo/Europe/Isle_of_Man.ics
 share/orage/zoneinfo/Europe/Istanbul.ics
+share/orage/zoneinfo/Europe/Jersey.ics
 share/orage/zoneinfo/Europe/Kaliningrad.ics
 share/orage/zoneinfo/Europe/Kiev.ics
 share/orage/zoneinfo/Europe/Lisbon.ics
@@ -393,12 +521,14 @@ share/orage/zoneinfo/Europe/London.ics
 share/orage/zoneinfo/Europe/Luxembourg.ics
 share/orage/zoneinfo/Europe/Madrid.ics
 share/orage/zoneinfo/Europe/Malta.ics
+share/orage/zoneinfo/Europe/Mariehamn.ics
 share/orage/zoneinfo/Europe/Minsk.ics
 share/orage/zoneinfo/Europe/Monaco.ics
 share/orage/zoneinfo/Europe/Moscow.ics
 share/orage/zoneinfo/Europe/Nicosia.ics
 share/orage/zoneinfo/Europe/Oslo.ics
 share/orage/zoneinfo/Europe/Paris.ics
+share/orage/zoneinfo/Europe/Podgorica.ics
 share/orage/zoneinfo/Europe/Prague.ics
 share/orage/zoneinfo/Europe/Riga.ics
 share/orage/zoneinfo/Europe/Rome.ics
@@ -411,15 +541,28 @@ share/orage/zoneinfo/Europe/Sofia.ics
 share/orage/zoneinfo/Europe/Stockholm.ics
 share/orage/zoneinfo/Europe/Tallinn.ics
 share/orage/zoneinfo/Europe/Tirane.ics
+share/orage/zoneinfo/Europe/Tiraspol.ics
 share/orage/zoneinfo/Europe/Uzhgorod.ics
 share/orage/zoneinfo/Europe/Vaduz.ics
 share/orage/zoneinfo/Europe/Vatican.ics
 share/orage/zoneinfo/Europe/Vienna.ics
 share/orage/zoneinfo/Europe/Vilnius.ics
+share/orage/zoneinfo/Europe/Volgograd.ics
 share/orage/zoneinfo/Europe/Warsaw.ics
 share/orage/zoneinfo/Europe/Zagreb.ics
 share/orage/zoneinfo/Europe/Zaporozhye.ics
 share/orage/zoneinfo/Europe/Zurich.ics
+share/orage/zoneinfo/Factory.ics
+share/orage/zoneinfo/GB-Eire.ics
+share/orage/zoneinfo/GB.ics
+share/orage/zoneinfo/GMT+0.ics
+share/orage/zoneinfo/GMT-0.ics
+share/orage/zoneinfo/GMT.ics
+share/orage/zoneinfo/GMT0.ics
+share/orage/zoneinfo/Greenwich.ics
+share/orage/zoneinfo/HST.ics
+share/orage/zoneinfo/Hongkong.ics
+share/orage/zoneinfo/Iceland.ics
 share/orage/zoneinfo/Indian/Antananarivo.ics
 share/orage/zoneinfo/Indian/Chagos.ics
 share/orage/zoneinfo/Indian/Christmas.ics
@@ -431,6 +574,26 @@ share/orage/zoneinfo/Indian/Maldives.ics
 share/orage/zoneinfo/Indian/Mauritius.ics
 share/orage/zoneinfo/Indian/Mayotte.ics
 share/orage/zoneinfo/Indian/Reunion.ics
+share/orage/zoneinfo/Iran.ics
+share/orage/zoneinfo/Israel.ics
+share/orage/zoneinfo/Jamaica.ics
+share/orage/zoneinfo/Japan.ics
+share/orage/zoneinfo/Kwajalein.ics
+share/orage/zoneinfo/Libya.ics
+share/orage/zoneinfo/MET.ics
+share/orage/zoneinfo/MST.ics
+share/orage/zoneinfo/MST7MDT.ics
+share/orage/zoneinfo/Mexico/BajaNorte.ics
+share/orage/zoneinfo/Mexico/BajaSur.ics
+share/orage/zoneinfo/Mexico/General.ics
+share/orage/zoneinfo/Mideast/Riyadh87.ics
+share/orage/zoneinfo/Mideast/Riyadh88.ics
+share/orage/zoneinfo/Mideast/Riyadh89.ics
+share/orage/zoneinfo/NZ-CHAT.ics
+share/orage/zoneinfo/NZ.ics
+share/orage/zoneinfo/Navajo.ics
+share/orage/zoneinfo/PRC.ics
+share/orage/zoneinfo/PST8PDT.ics
 share/orage/zoneinfo/Pacific/Apia.ics
 share/orage/zoneinfo/Pacific/Auckland.ics
 share/orage/zoneinfo/Pacific/Chatham.ics
@@ -463,6 +626,7 @@ share/orage/zoneinfo/Pacific/Ponape.ics
 share/orage/zoneinfo/Pacific/Port_Moresby.ics
 share/orage/zoneinfo/Pacific/Rarotonga.ics
 share/orage/zoneinfo/Pacific/Saipan.ics
+share/orage/zoneinfo/Pacific/Samoa.ics
 share/orage/zoneinfo/Pacific/Tahiti.ics
 share/orage/zoneinfo/Pacific/Tarawa.ics
 share/orage/zoneinfo/Pacific/Tongatapu.ics
@@ -470,5 +634,44 @@ share/orage/zoneinfo/Pacific/Truk.ics
 share/orage/zoneinfo/Pacific/Wake.ics
 share/orage/zoneinfo/Pacific/Wallis.ics
 share/orage/zoneinfo/Pacific/Yap.ics
+share/orage/zoneinfo/Poland.ics
+share/orage/zoneinfo/Portugal.ics
+share/orage/zoneinfo/ROC.ics
+share/orage/zoneinfo/ROK.ics
+share/orage/zoneinfo/Singapore.ics
+share/orage/zoneinfo/SystemV/AST4.ics
+share/orage/zoneinfo/SystemV/AST4ADT.ics
+share/orage/zoneinfo/SystemV/CST6.ics
+share/orage/zoneinfo/SystemV/CST6CDT.ics
+share/orage/zoneinfo/SystemV/EST5.ics
+share/orage/zoneinfo/SystemV/EST5EDT.ics
+share/orage/zoneinfo/SystemV/HST10.ics
+share/orage/zoneinfo/SystemV/MST7.ics
+share/orage/zoneinfo/SystemV/MST7MDT.ics
+share/orage/zoneinfo/SystemV/PST8.ics
+share/orage/zoneinfo/SystemV/PST8PDT.ics
+share/orage/zoneinfo/SystemV/YST9.ics
+share/orage/zoneinfo/SystemV/YST9YDT.ics
+share/orage/zoneinfo/Turkey.ics
+share/orage/zoneinfo/UCT.ics
+share/orage/zoneinfo/US/Alaska.ics
+share/orage/zoneinfo/US/Aleutian.ics
+share/orage/zoneinfo/US/Arizona.ics
+share/orage/zoneinfo/US/Central.ics
+share/orage/zoneinfo/US/East-Indiana.ics
+share/orage/zoneinfo/US/Eastern.ics
+share/orage/zoneinfo/US/Hawaii.ics
+share/orage/zoneinfo/US/Indiana-Starke.ics
+share/orage/zoneinfo/US/Michigan.ics
+share/orage/zoneinfo/US/Mountain.ics
+share/orage/zoneinfo/US/Pacific.ics
+share/orage/zoneinfo/US/Samoa.ics
+share/orage/zoneinfo/UTC.ics
+share/orage/zoneinfo/Universal.ics
+share/orage/zoneinfo/W-SU.ics
+share/orage/zoneinfo/WET.ics
+share/orage/zoneinfo/Zulu.ics
+share/orage/zoneinfo/posixrules.ics
+share/orage/zoneinfo/tz_convert.par
 share/orage/zoneinfo/zones.tab
-share/xfce4/panel-plugins/orageclock.desktop
+share/xfce4/panel/plugins/xfce4-orageclock-plugin.desktop
diff --git a/time/xfce4-orage/buildlink3.mk b/time/xfce4-orage/buildlink3.mk
deleted file mode 100644
index fa37d1ddec0..00000000000
--- a/time/xfce4-orage/buildlink3.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.6 2009/09/16 01:15:34 reed Exp $
-
-BUILDLINK_TREE+=	xfce4-orage
-
-.if !defined(XFCE4_ORAGE_BUILDLINK3_MK)
-XFCE4_ORAGE_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.xfce4-orage+=	xfce4-orage>=4.6.0
-BUILDLINK_PKGSRCDIR.xfce4-orage?=	../../time/xfce4-orage
-
-.endif # XFCE4_ORAGE_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-xfce4-orage
diff --git a/time/xfce4-orage/distinfo b/time/xfce4-orage/distinfo
index 1d903761212..37c00764ced 100644
--- a/time/xfce4-orage/distinfo
+++ b/time/xfce4-orage/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.6 2013/08/16 08:14:31 obache Exp $
+$NetBSD: distinfo,v 1.7 2015/04/21 08:56:42 jperkin Exp $
 
-SHA1 (orage-4.6.1.tar.bz2) = 2db15404197ef9aa6f588c0eebac9fc4f68426df
-RMD160 (orage-4.6.1.tar.bz2) = 7724992e2e177487c71597a15d7faf7f865bb56b
-Size (orage-4.6.1.tar.bz2) = 1937593 bytes
-SHA1 (patch-aa) = 443913928b351028d34bdd07cb6cf60006f60e25
-SHA1 (patch-src_reminder.c) = 33267e51deb1ee1ec8e01155f9422f093c073175
+SHA1 (orage-4.10.0.tar.bz2) = 1d19e097958b710005789973d385ca13338b26f9
+RMD160 (orage-4.10.0.tar.bz2) = 863c4c681dc20e4244a1b3e27707a97008505de9
+Size (orage-4.10.0.tar.bz2) = 2513559 bytes
+SHA1 (patch-panel-plugin_Makefile.in) = a437a026d2575a22568dda1fe1622458d7b1a511
diff --git a/time/xfce4-orage/patches/patch-aa b/time/xfce4-orage/patches/patch-aa
deleted file mode 100644
index 66a1c547d64..00000000000
--- a/time/xfce4-orage/patches/patch-aa
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2010/10/01 19:44:02 drochner Exp $
-
---- src/tray_icon.c.orig	2009-04-14 22:58:27.000000000 +0000
-+++ src/tray_icon.c
-@@ -198,12 +198,16 @@ GdkPixbuf *orage_create_icon(gboolean st
-         orage_message(110, "trayicon: heading does not fit in dynamic icon");
- 
-     /* month */
--    if (strftime(month, 19, "%^b", t) == 0) {
--        g_warning("orage_create_icon: strftime %%^b failed");
--        if (strftime(month, 19, "%b", t) == 0) {
--            g_warning("orage_create_icon: strftime %%b failed");
--            g_sprintf(month, "orage");
--        }
-+    if (strftime(month, 19, "%b", t) == 0) {
-+        g_warning("orage_create_icon: strftime %%b failed");
-+        g_sprintf(month, "orage");
-+    } else {
-+	char *c = month;
-+	month[19] = '\0';
-+	while (*c) {
-+		*c = toupper(*c);
-+		c++;
-+	}
-     }
-     g_snprintf(ts, 199
-             , "<span foreground=\"blue\" size=\"x-small\">%s</span>", month);
diff --git a/time/xfce4-orage/patches/patch-panel-plugin_Makefile.in b/time/xfce4-orage/patches/patch-panel-plugin_Makefile.in
new file mode 100644
index 00000000000..fab88e95294
--- /dev/null
+++ b/time/xfce4-orage/patches/patch-panel-plugin_Makefile.in
@@ -0,0 +1,32 @@
+$NetBSD: patch-panel-plugin_Makefile.in,v 1.1 2015/04/21 08:56:42 jperkin Exp $
+
+Adjust config path.
+--- panel-plugin/Makefile.in.orig	2015-03-11 12:59:39.000000000 +0000
++++ panel-plugin/Makefile.in
+@@ -279,7 +279,7 @@ target_vendor = @target_vendor@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-plugindir = $(libexecdir)/xfce4/panel-plugins
++plugindir = $(libexecdir)/xfce4/panel/plugins
+ xfce4_orageclock_plugin_CFLAGS = \
+ 	-DPACKAGE_DATA_DIR=\"$(datadir)\"				\
+ 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"			\
+@@ -308,7 +308,7 @@ xfce4_orageclock_plugin_SOURCES = \
+ # 
+ desktop_in_in_files = xfce4-orageclock-plugin.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 = \
+ 	$(desktop_in_in_files)
+@@ -734,7 +734,7 @@ uninstall-am: uninstall-desktopDATA unin
+ # get full path into .desktop file
+ #%.desktop.in: %.desktop.in.in
+ xfce4-orageclock-plugin.desktop.in: xfce4-orageclock-plugin.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/time/xfce4-orage/patches/patch-src_reminder.c b/time/xfce4-orage/patches/patch-src_reminder.c
deleted file mode 100644
index 19f13363153..00000000000
--- a/time/xfce4-orage/patches/patch-src_reminder.c
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD: patch-src_reminder.c,v 1.1 2013/08/16 08:14:31 obache Exp $
-
-* for libnotify-0.7 API change
-  http://git.xfce.org/apps/orage/commit/src/reminder.c?id=bfa601ba135f84163eded2bb2e060e21d9ca08ce
-
---- src/reminder.c.orig	2009-04-14 22:58:27.000000000 +0000
-+++ src/reminder.c
-@@ -61,6 +61,12 @@
- #define ORAGE_DEBUG 1
- */
- 
-+/* Compatibility macro for < libnotify-0.7 */
-+/* NOTIFY_CHECK_VERSION was created in 0.5.2 */
-+#ifndef NOTIFY_CHECK_VERSION
-+#deifne NOTIFY_CHECK_VERSION(x,y,z) 0
-+#endif
-+
- static void create_notify_reminder(alarm_struct *alarm);
- static void create_reminders(alarm_struct *alarm);
- static void reset_orage_alarm_clock();
-@@ -425,8 +431,13 @@ static void create_notify_reminder(alarm
-     strncpy(heading,  _("Reminder "), 199);
-     if (alarm->title)
-         g_strlcat(heading, alarm->title, 50);
-+    /* since version 0.7.0, libnotify does not have the widget parameter in
-+       notify_notification_new and it does not have function
-+       notify_notification_attach_to_status_icon at all */
-+#if NOTIFY_CHECK_VERSION(0, 7, 0)
-+    n = notify_notification_new(heading, alarm->description, NULL);
-+#else
-     n = notify_notification_new(heading, alarm->description, NULL, NULL);
--    alarm->active_alarm->active_notify = n;
- #if GTK_CHECK_VERSION(2,10,0)
-     if (g_par.trayIcon 
-     && gtk_status_icon_is_embedded((GtkStatusIcon *)g_par.trayIcon))
-@@ -438,6 +449,8 @@ static void create_notify_reminder(alarm
-         notify_notification_attach_to_widget(n
-                 , ((XfceTrayIcon *)g_par.trayIcon)->image);
- #endif
-+#endif
-+    alarm->active_alarm->active_notify = n;
- 
-     if (alarm->notify_timeout == -1)
-         notify_notification_set_timeout(n, NOTIFY_EXPIRES_NEVER);
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)