13 files changed, 315 insertions, 41 deletions

diff --git a/deskutils/orage/Makefile b/deskutils/orage/Makefile
index 4eed76200f2a..0f65b23c9f22 100644
--- a/deskutils/orage/Makefile
+++ b/deskutils/orage/Makefile
@@ -6,16 +6,17 @@
 #
 
 PORTNAME=	orage
-PORTVERSION=	4.6.1
-PORTREVISION=	6
+PORTVERSION=	4.8.1
 CATEGORIES=	deskutils xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
-MASTER_SITE_SUBDIR=xfce/4.6.1/src
+MASTER_SITE_SUBDIR=/src/apps/${PORTNAME}/${PORTVERSION:R}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	A calendar application to manage your time with XFce 4
 
+LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt
+
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS= yes
 USE_BZIP2=	yes
@@ -25,11 +26,12 @@ USE_GNOME=	gnometarget gtk20 intltool intlhack pkgconfig
 USE_XFCE=	configenv libgui panel
 USE_XORG=	xext xrender xinerama xi xrandr xcursor xcomposite xdamage x11 \
 		xfixes
+CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
 
 OPTIONS=	BDB	"Enable BDB support"		off \
 		ICAL	"Enable libical support"	off
 
-MAN1=		globaltime.1 orage.1
+MAN1=		globaltime.1 orage.1 tz_convert.1
 
 .include <bsd.port.pre.mk>
 
diff --git a/deskutils/orage/distinfo b/deskutils/orage/distinfo
index 3cab6aec43be..52c265ed0f89 100644
--- a/deskutils/orage/distinfo
+++ b/deskutils/orage/distinfo
@@ -1,3 +1,2 @@
-MD5 (xfce4/orage-4.6.1.tar.bz2) = 24fa43dd86ec5af5a4766620fd972cf2
-SHA256 (xfce4/orage-4.6.1.tar.bz2) = f1580f5f0082eff89f7a76a57da9dce7e7d5380804939771611499482523bd4d
-SIZE (xfce4/orage-4.6.1.tar.bz2) = 1937593
+SHA256 (xfce4/orage-4.8.1.tar.bz2) = 612d9e0e6b0113e04332d13cfbe027e464ff1c8e7ddef5052369ac88e67e09d8
+SIZE (xfce4/orage-4.8.1.tar.bz2) = 2235528
diff --git a/deskutils/orage/pkg-plist b/deskutils/orage/pkg-plist
index 7816fef2bc03..61ad1dac82cb 100644
--- a/deskutils/orage/pkg-plist
+++ b/deskutils/orage/pkg-plist
@@ -1,14 +1,17 @@
 bin/globaltime
 bin/orage
-libexec/xfce4/panel-plugins/orageclock
+bin/tz_convert
+libexec/xfce4/panel-plugins/xfce4-orageclock-plugin
 share/applications/xfcalendar.desktop
 share/applications/xfce-xfcalendar-settings.desktop
+share/applications/globaltime.desktop
 share/dbus-1/services/org.xfce.calendar.service
 share/dbus-1/services/org.xfce.orage.service
 share/icons/hicolor/48x48/apps/xfcalendar.png
 share/icons/hicolor/scalable/apps/xfcalendar.svg
 share/locale/am/LC_MESSAGES/orage.mo
 share/locale/ar/LC_MESSAGES/orage.mo
+share/locale/ast/LC_MESSAGES/orage.mo
 share/locale/az/LC_MESSAGES/orage.mo
 share/locale/bg/LC_MESSAGES/orage.mo
 share/locale/da/LC_MESSAGES/orage.mo
@@ -45,6 +48,7 @@ share/locale/sv/LC_MESSAGES/orage.mo
 share/locale/ta/LC_MESSAGES/orage.mo
 share/locale/tr/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/be/LC_MESSAGES/orage.mo
 share/locale/ca/LC_MESSAGES/orage.mo
@@ -467,8 +471,210 @@ 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/CET.ics
+share/orage/zoneinfo/CST6CDT.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/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/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/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/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/Turkey.ics
+share/orage/zoneinfo/UCT.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/Africa/Asmara.ics
+share/orage/zoneinfo/America/Atikokan.ics
+share/orage/zoneinfo/America/Atka.ics
+share/orage/zoneinfo/America/Bahia.ics
+share/orage/zoneinfo/America/Blanc-Sablon.ics
+share/orage/zoneinfo/America/Campo_Grande.ics
+share/orage/zoneinfo/America/Coral_Harbour.ics
+share/orage/zoneinfo/America/Danmarkshavn.ics
+share/orage/zoneinfo/America/Ensenada.ics
+share/orage/zoneinfo/America/Fort_Wayne.ics
+share/orage/zoneinfo/America/Knox_IN.ics
+share/orage/zoneinfo/America/Marigot.ics
+share/orage/zoneinfo/America/Moncton.ics
+share/orage/zoneinfo/America/Porto_Acre.ics
+share/orage/zoneinfo/America/Resolute.ics
+share/orage/zoneinfo/America/Santarem.ics
+share/orage/zoneinfo/America/St_Barthelemy.ics
+share/orage/zoneinfo/America/Toronto.ics
+share/orage/zoneinfo/America/Virgin.ics
+share/orage/zoneinfo/America/Argentina/ComodRivadavia.ics
+share/orage/zoneinfo/America/Argentina/La_Rioja.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/Indiana/Petersburg.ics
+share/orage/zoneinfo/America/Indiana/Tell_City.ics
+share/orage/zoneinfo/America/Indiana/Vincennes.ics
+share/orage/zoneinfo/America/Indiana/Winamac.ics
+share/orage/zoneinfo/America/North_Dakota/Center.ics
+share/orage/zoneinfo/America/North_Dakota/New_Salem.ics
+share/orage/zoneinfo/Antarctica/Rothera.ics
+share/orage/zoneinfo/Asia/Ashkhabad.ics
+share/orage/zoneinfo/Asia/Choibalsan.ics
+share/orage/zoneinfo/Asia/Chongqing.ics
+share/orage/zoneinfo/Asia/Dacca.ics
+share/orage/zoneinfo/Asia/Ho_Chi_Minh.ics
+share/orage/zoneinfo/Asia/Kathmandu.ics
+share/orage/zoneinfo/Asia/Kolkata.ics
+share/orage/zoneinfo/Asia/Macau.ics
+share/orage/zoneinfo/Asia/Makassar.ics
+share/orage/zoneinfo/Asia/Oral.ics
+share/orage/zoneinfo/Asia/Qyzylorda.ics
+share/orage/zoneinfo/Asia/Riyadh87.ics
+share/orage/zoneinfo/Asia/Riyadh88.ics
+share/orage/zoneinfo/Asia/Riyadh89.ics
+share/orage/zoneinfo/Asia/Sakhalin.ics
+share/orage/zoneinfo/Asia/Tel_Aviv.ics
+share/orage/zoneinfo/Asia/Thimbu.ics
+share/orage/zoneinfo/Asia/Ulan_Bator.ics
+share/orage/zoneinfo/Atlantic/Faroe.ics
+share/orage/zoneinfo/Australia/ACT.ics
+share/orage/zoneinfo/Australia/Canberra.ics
+share/orage/zoneinfo/Australia/Currie.ics
+share/orage/zoneinfo/Australia/Eucla.ics
+share/orage/zoneinfo/Australia/LHI.ics
+share/orage/zoneinfo/Australia/NSW.ics
+share/orage/zoneinfo/Australia/North.ics
+share/orage/zoneinfo/Australia/Queensland.ics
+share/orage/zoneinfo/Australia/South.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/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/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/Guernsey.ics
+share/orage/zoneinfo/Europe/Isle_of_Man.ics
+share/orage/zoneinfo/Europe/Jersey.ics
+share/orage/zoneinfo/Europe/Mariehamn.ics
+share/orage/zoneinfo/Europe/Podgorica.ics
+share/orage/zoneinfo/Europe/Tiraspol.ics
+share/orage/zoneinfo/Europe/Volgograd.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/Pacific/Samoa.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/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/tz_convert.par
 share/orage/zoneinfo/zones.tab
-share/xfce4/panel-plugins/orageclock.desktop
+share/xfce4/panel-plugins/xfce4-orageclock-plugin.desktop
 @dirrmtry libexec/xfce4/panel-plugins
 @dirrmtry libexec/xfce4
 @dirrmtry share/applications
@@ -482,12 +688,21 @@ share/xfce4/panel-plugins/orageclock.desktop
 @dirrm share/orage/zoneinfo/America/Argentina
 @dirrm share/orage/zoneinfo/America/Indiana
 @dirrm share/orage/zoneinfo/America/Kentucky
+@dirrm share/orage/zoneinfo/America/North_Dakota
 @dirrm share/orage/zoneinfo/America
 @dirrm share/orage/zoneinfo/Antarctica
 @dirrm share/orage/zoneinfo/Arctic
 @dirrm share/orage/zoneinfo/Asia
 @dirrm share/orage/zoneinfo/Atlantic
 @dirrm share/orage/zoneinfo/Australia
+@dirrm share/orage/zoneinfo/Brazil
+@dirrm share/orage/zoneinfo/Canada
+@dirrm share/orage/zoneinfo/Chile
+@dirrm share/orage/zoneinfo/Etc
+@dirrm share/orage/zoneinfo/Mexico
+@dirrm share/orage/zoneinfo/Mideast
+@dirrm share/orage/zoneinfo/SystemV
+@dirrm share/orage/zoneinfo/US
 @dirrm share/orage/zoneinfo/Europe
 @dirrm share/orage/zoneinfo/Indian
 @dirrm share/orage/zoneinfo/Pacific
diff --git a/deskutils/xfce4-generic-slider/Makefile b/deskutils/xfce4-generic-slider/Makefile
index 07d697b1f0eb..95b0eaf8f4e6 100644
--- a/deskutils/xfce4-generic-slider/Makefile
+++ b/deskutils/xfce4-generic-slider/Makefile
@@ -7,17 +7,21 @@
 
 PORTNAME=	xfce4-generic-slider
 PORTVERSION=	0.0.20100827
+PORTREVISION=	1
 CATEGORIES=	deskutils
 MASTER_SITES=	CRITICAL
+MASTER_SITE_SUBDIR=xfce/4.6.2/src
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A slider plugin to adjust and/or monitor any numeric variable
 
-USE_XFCE=	panel
+#BROKEN=		Does not work with xfce 4.8
+
+USE_XFCE=	panel libutil libgui
 USE_GNOME=	pkgconfig
 
-CFLAGS+=	`pkg-config --cflags libxfce4panel-1.0`
-LDFLAGS+=	`pkg-config --libs libxfce4panel-1.0`
+CFLAGS+=	`pkg-config --cflags libxfce4panel-1.0 libxfcegui4-1.0`
+LDFLAGS+=	`pkg-config --libs libxfce4panel-1.0 libxfcegui4-1.0`
 
 LICENSE=	GPLv3
 
diff --git a/deskutils/xfce4-generic-slider/pkg-plist b/deskutils/xfce4-generic-slider/pkg-plist
index c640961a3e4c..8affa7fddb17 100644
--- a/deskutils/xfce4-generic-slider/pkg-plist
+++ b/deskutils/xfce4-generic-slider/pkg-plist
@@ -3,3 +3,5 @@ share/xfce4/panel-plugins/generic-slider.desktop
 @dirrmtry lib/xfce4/xfce4/panel-plugins
 @dirrmtry lib/xfce4/xfce4
 @dirrmtry lib/xfce4
+@dirrmtry share/xfce4/panel-plugins
+@dirrmtry share/xfce4
diff --git a/deskutils/xfce4-notes-plugin/Makefile b/deskutils/xfce4-notes-plugin/Makefile
index 1d361a67f608..88e0f9e49d59 100644
--- a/deskutils/xfce4-notes-plugin/Makefile
+++ b/deskutils/xfce4-notes-plugin/Makefile
@@ -7,8 +7,10 @@
 
 PORTNAME=	xfce4-notes-plugin
 PORTVERSION=	1.7.6
+PORTREVISION=	1
 CATEGORIES=	deskutils xfce
-MASTER_SITES=	http://archive.xfce.org/src/panel-plugins/${PORTNAME}/1.7/
+MASTER_SITES=	${MASTER_SITE_XFCE}
+MASTER_SITE_SUBDIR=/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	miwi@FreeBSD.org
diff --git a/deskutils/xfce4-notes-plugin/pkg-plist b/deskutils/xfce4-notes-plugin/pkg-plist
index 4f494891a5d1..cea1bc749f14 100644
--- a/deskutils/xfce4-notes-plugin/pkg-plist
+++ b/deskutils/xfce4-notes-plugin/pkg-plist
@@ -2,7 +2,10 @@ bin/xfce4-notes
 bin/xfce4-notes-settings
 bin/xfce4-popup-notes
 etc/xdg/autostart/xfce4-notes-autostart.desktop
-libexec/xfce4/panel-plugins/xfce4-notes-plugin
+lib/xfce4/panel-plugins/libnotes.a
+lib/xfce4/panel-plugins/libnotes.la
+lib/xfce4/panel-plugins/libnotes.so
+lib/xfce4/panel-plugins/libnotes.so.0
 share/applications/xfce4-notes.desktop
 share/icons/hicolor/16x16/apps/xfce4-notes-plugin.png
 share/icons/hicolor/22x22/apps/xfce4-notes-plugin.png
@@ -63,9 +66,11 @@ share/locale/zh_TW/LC_MESSAGES/xfce4-notes-plugin.mo
 %%DATADIR%%/gtk-2.0/scrollbars/trough-scrollbar-vert.png
 %%DATADIR%%/pixmaps/notes-menu-active.png
 %%DATADIR%%/pixmaps/notes-menu.png
-share/xfce4/panel-plugins/xfce4-notes-plugin.desktop
+share/xfce4/panel-plugins/xfce4-notes-plugin-47.desktop
 @dirrmtry share/xfce4/panel-plugins
 @dirrmtry share/xfce4
+@dirrmtry lib/xfce4/panel-plugins
+@dirrmtry lib/xfce4
 @dirrm %%DATADIR%%/pixmaps
 @dirrm %%DATADIR%%/gtk-2.0/scrollbars
 @dirrm %%DATADIR%%/gtk-2.0
diff --git a/deskutils/xfce4-notification-daemon/Makefile b/deskutils/xfce4-notification-daemon/Makefile
index d9b9e95ff33d..1de8bca69fff 100644
--- a/deskutils/xfce4-notification-daemon/Makefile
+++ b/deskutils/xfce4-notification-daemon/Makefile
@@ -7,10 +7,11 @@
 
 PORTNAME=	notification-daemon
 PORTVERSION=	0.3.7
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	deskutils xfce
 MASTER_SITES=	http://goodies.xfce.org/releases/notification-daemon-xfce/ \
 		CRITICAL
+MASTER_SITE_SUBDIR=xfce/4.6.2/src
 PKGNAMEPREFIX=	xfce4-
 DISTNAME=	${PORTNAME}-xfce-${PORTVERSION}
 DIST_SUBDIR=	xfce4
diff --git a/deskutils/xfce4-notifyd/Makefile b/deskutils/xfce4-notifyd/Makefile
index bba9c8a69dfc..51548e57b52a 100644
--- a/deskutils/xfce4-notifyd/Makefile
+++ b/deskutils/xfce4-notifyd/Makefile
@@ -6,44 +6,50 @@
 #
 
 PORTNAME=	xfce4-notifyd
-PORTVERSION=	0.1.0
-PORTREVISION=	6
+PORTVERSION=	0.2.1
 CATEGORIES=	deskutils xfce
-MASTER_SITES=	http://spuriousinterrupt.org/files/xfce4-notifyd/ \
-		CRITICAL
+MASTER_SITES=	${MASTER_SITE_XFCE}
+MASTER_SITE_SUBDIR=	src/apps/${PORTNAME}/${PORTVERSION:R}
+DIST_SUBDIR=	xfce4
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Visually-appealing notification daemon for Xfce
 
-LIB_DEPENDS=	sexy.2:${PORTSDIR}/x11-toolkits/libsexy \
-		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
-RUN_DEPENDS=	dbus-daemon:${PORTSDIR}/devel/dbus
+LIB_DEPENDS=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
+		notify.1:${PORTSDIR}/devel/libnotify
 
+USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GNOME=	intltool librsvg2
-USE_XFCE=	configenv libutil libgui
+USE_GNOME=	gtk20 gnomehack intltool intlhack desktopfileutils pkgconfig
+USE_XFCE=	configenv libexo libmenu libutil xfconf
 INSTALLS_ICONS=	yes
+USE_XORG=	x11
 
-CONFLICTS=	notification-daemon-[0-9]* xfce4-notification-daemon-[0-9]*
+CONFIGURE_ARGS=	--disable-debug
+
+CONFLICTS=	notification-daemon-[0-9]* xfce4-notification-daemon-[0-9]* \
+		xfce4-notifyd-0.1*
 
 OPTIONS=	NLS      "Enable Native Language Support"             on
 
+MAN1=	xfce4-notifyd-config.1
+
 LICENSE=	GPLv3
 
 .include <bsd.port.pre.mk>
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
+CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
 .else
+CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-post-patch: .SILENT
-.if defined(WITHOUT_NLS)
-	${REINPLACE_CMD} -e 's|\(USE_NLS=\)yes|\1no|' ${WRKSRC}/configure
-.endif
+post-install:
+	@-update-desktop-database
 
 .include <bsd.port.post.mk>
diff --git a/deskutils/xfce4-notifyd/distinfo b/deskutils/xfce4-notifyd/distinfo
index 3c2d34907fbb..9fcada4103da 100644
--- a/deskutils/xfce4-notifyd/distinfo
+++ b/deskutils/xfce4-notifyd/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xfce4-notifyd-0.1.0.tar.bz2) = 989b0e9ae9ff5bdbdbf56368a44eca039236033f84d05001e311c21c988bd0e1
-SIZE (xfce4-notifyd-0.1.0.tar.bz2) = 165593
+SHA256 (xfce4/xfce4-notifyd-0.2.1.tar.bz2) = aab2da3d14401ea91d816744e7c4b9e2e7a996e7d8b6756c7ad0c0b3bec3ed70
+SIZE (xfce4/xfce4-notifyd-0.2.1.tar.bz2) = 313671
diff --git a/deskutils/xfce4-notifyd/pkg-plist b/deskutils/xfce4-notifyd/pkg-plist
index bf841845a4a9..24e9d922e2fc 100644
--- a/deskutils/xfce4-notifyd/pkg-plist
+++ b/deskutils/xfce4-notifyd/pkg-plist
@@ -1,28 +1,62 @@
 bin/xfce4-notifyd-config
-libexec/xfce4-notifyd
+lib/xfce4/notifyd/xfce4-notifyd
 share/applications/xfce4-notifyd-config.desktop
 share/dbus-1/services/org.freedesktop.Notifications.service
 share/icons/hicolor/48x48/apps/xfce4-notifyd.png
-share/themes/Default/xfce-notify-4.0/gtkrc
-share/themes/Smoke/xfce-notify-4.0/gtkrc
-share/themes/ZOMG-PONIES!/xfce-notify-4.0/gtkrc
+%%NLS%%share/locale/ast/LC_MESSAGES/xfce4-notifyd.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/xfce4-notifyd.mo
 %%NLS%%share/locale/da/LC_MESSAGES/xfce4-notifyd.mo
 %%NLS%%share/locale/de/LC_MESSAGES/xfce4-notifyd.mo
 %%NLS%%share/locale/el/LC_MESSAGES/xfce4-notifyd.mo
 %%NLS%%share/locale/es/LC_MESSAGES/xfce4-notifyd.mo
+%%NLS%%share/locale/eu/LC_MESSAGES/xfce4-notifyd.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/xfce4-notifyd.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/xfce4-notifyd.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/xfce4-notifyd.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/xfce4-notifyd.mo
 %%NLS%%share/locale/id/LC_MESSAGES/xfce4-notifyd.mo
+%%NLS%%share/locale/it/LC_MESSAGES/xfce4-notifyd.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/xfce4-notifyd.mo
+%%NLS%%share/locale/kk/LC_MESSAGES/xfce4-notifyd.mo
+%%NLS%%share/locale/lv/LC_MESSAGES/xfce4-notifyd.mo
 %%NLS%%share/locale/nb/LC_MESSAGES/xfce4-notifyd.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/xfce4-notifyd.mo
+%%NLS%%share/locale/pa/LC_MESSAGES/xfce4-notifyd.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/xfce4-notifyd.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/xfce4-notifyd.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/xfce4-notifyd.mo
 %%NLS%%share/locale/pt_PT/LC_MESSAGES/xfce4-notifyd.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/xfce4-notifyd.mo
+%%NLS%%share/locale/si/LC_MESSAGES/xfce4-notifyd.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/xfce4-notifyd.mo
 %%NLS%%share/locale/sq/LC_MESSAGES/xfce4-notifyd.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/xfce4-notifyd.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/xfce4-notifyd.mo
+%%NLS%%share/locale/ug/LC_MESSAGES/xfce4-notifyd.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/xfce4-notifyd.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/xfce4-notifyd.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/xfce4-notifyd.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/xfce4-notifyd.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/xfce4-notifyd.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/xfce4-notifyd.mo
+share/themes/Default/xfce-notify-4.0/gtkrc
+share/themes/Smoke/xfce-notify-4.0/gtkrc
+share/themes/ZOMG-PONIES!/xfce-notify-4.0/gtkrc
 @dirrm share/themes/ZOMG-PONIES!/xfce-notify-4.0
-@dirrm share/themes/ZOMG-PONIES!
+@dirrmtry share/themes/ZOMG-PONIES!
 @dirrm share/themes/Smoke/xfce-notify-4.0
-@dirrm share/themes/Smoke
+@dirrmtry share/themes/Smoke
 @dirrm share/themes/Default/xfce-notify-4.0
 @dirrmtry share/themes/Default
-@dirrmtry share/applications
+%%NLS%%@dirrmtry share/locale/ug/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ug
+%%NLS%%@dirrmtry share/locale/si/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/si
+%%NLS%%@dirrmtry share/locale/kk/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/kk
+%%NLS%%@dirrmtry share/locale/ast/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ast
+@dirrm lib/xfce4/notifyd
+@dirrmtry lib/xfce4
+@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
diff --git a/deskutils/xfce4-volstatus-icon/Makefile b/deskutils/xfce4-volstatus-icon/Makefile
index fe8713e16903..b3a4d720d13f 100644
--- a/deskutils/xfce4-volstatus-icon/Makefile
+++ b/deskutils/xfce4-volstatus-icon/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xfce4-volstatus-icon
 PORTVERSION=	0.1.0
+PORTREVISION=	1
 CATEGORIES=	deskutils xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 MASTER_SITE_SUBDIR=	src/apps/${PORTNAME}/${PORTVERSION:R}
@@ -18,6 +19,8 @@ COMMENT=	Notification area icon that allows safe removal of removable devices
 LIB_DEPENDS=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
 	hal.1:${PORTSDIR}/sysutils/hal
 
+BROKEN=		Does not work with xfce 4.8
+
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
diff --git a/deskutils/xfce4-xkb-plugin/Makefile b/deskutils/xfce4-xkb-plugin/Makefile
index 8a5dd820d269..d74a13d13bdd 100644
--- a/deskutils/xfce4-xkb-plugin/Makefile
+++ b/deskutils/xfce4-xkb-plugin/Makefile
@@ -7,9 +7,10 @@
 
 PORTNAME=	xfce4-xkb-plugin
 PORTVERSION=	0.4.3
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	deskutils xfce
-MASTER_SITES=	http://goodies.xfce.org/releases/${PORTNAME}/
+MASTER_SITES=	${MASTER_SITE_XFCE}
+MASTER_SITE_SUBDIR=/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	des@FreeBSD.org