4 files changed, 17 insertions, 57 deletions

diff --git a/x11-wm/xfce4-desktop/Makefile b/x11-wm/xfce4-desktop/Makefile
index d4a60ee1b480..29bc3bc4eca8 100644
--- a/x11-wm/xfce4-desktop/Makefile
+++ b/x11-wm/xfce4-desktop/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	xfce4-desktop
-PORTVERSION=	4.10.2
-PORTREVISION=	2
+PORTVERSION=	4.10.3
 CATEGORIES=	x11-wm xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 MASTER_SITE_SUBDIR=	src/xfce/xfdesktop/${PORTVERSION:R}
@@ -13,17 +12,22 @@ DIST_SUBDIR=	xfce4
 MAINTAINER=	xfce@FreeBSD.org
 COMMENT=	Xfce's desktop manager
 
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
-		libwnck-1.so:${PORTSDIR}/x11-toolkits/libwnck \
 		libnotify.so:${PORTSDIR}/devel/libnotify
 
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
-USE_GNOME=	glib20 gtk20 intltool intlhack
+USE_GNOME=	glib20 gtk20 intltool intlhack libwnck
 USE_XFCE=	configenv garcon libmenu libutil libexo xfconf
-USES=	pathfix pkgconfig gmake tar:bzip2
+USES=	pkgconfig gmake tar:bzip2
 USE_XORG=	x11 sm
 
+# Prevent build error, with macro 'g_return_val_if_fail ()'
+CFLAGS+=	-Wno-return-type
+
 CONFIGURE_ARGS+=--enable-gio-unix \
 	--enable-notifications
 
diff --git a/x11-wm/xfce4-desktop/distinfo b/x11-wm/xfce4-desktop/distinfo
index c137d989815b..caafbe6fbc09 100644
--- a/x11-wm/xfce4-desktop/distinfo
+++ b/x11-wm/xfce4-desktop/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xfce4/xfdesktop-4.10.2.tar.bz2) = 49a6e0be513e307e896f7e5929825babec9bbcd4b2e73552f9d27647a4db797d
-SIZE (xfce4/xfdesktop-4.10.2.tar.bz2) = 1144561
+SHA256 (xfce4/xfdesktop-4.10.3.tar.bz2) = 09ca2ba554d8b724b4bbb34b6fb3523de36b556efa4f28ecd802c9c5ba3272ce
+SIZE (xfce4/xfdesktop-4.10.3.tar.bz2) = 1054828
diff --git a/x11-wm/xfce4-desktop/files/patch-src__main.c b/x11-wm/xfce4-desktop/files/patch-src__main.c
deleted file mode 100644
index 14025379f7f1..000000000000
--- a/x11-wm/xfce4-desktop/files/patch-src__main.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./src/main.c.orig	2013-03-02 16:37:34.000000000 +0000
-+++ ./src/main.c	2013-03-09 11:32:10.000000000 +0000
-@@ -255,8 +255,10 @@
-     xfce_textdomain(GETTEXT_PACKAGE, LOCALEDIR, "UTF-8");
-     
- #if defined(ENABLE_FILE_ICONS) || defined(USE_DESKTOP_MENU)
-+#if !GLIB_CHECK_VERSION (2, 32, 0)
-     g_thread_init(NULL);
- #endif
-+#endif
- #ifdef ENABLE_FILE_ICONS
-     dbus_g_thread_init();
- #endif
diff --git a/x11-wm/xfce4-desktop/pkg-plist b/x11-wm/xfce4-desktop/pkg-plist
index b7df3646a198..de9240f7d343 100644
--- a/x11-wm/xfce4-desktop/pkg-plist
+++ b/x11-wm/xfce4-desktop/pkg-plist
@@ -12,48 +12,39 @@ share/icons/hicolor/scalable/apps/xfce4-menueditor.svg
 %%NLS%%share/locale/am/LC_MESSAGES/xfdesktop.mo
 %%NLS%%share/locale/ar/LC_MESSAGES/xfdesktop.mo
 %%NLS%%share/locale/ast/LC_MESSAGES/xfdesktop.mo
-%%NLS%%share/locale/az/LC_MESSAGES/xfdesktop.mo
 %%NLS%%share/locale/be/LC_MESSAGES/xfdesktop.mo
 %%NLS%%share/locale/bg/LC_MESSAGES/xfdesktop.mo
 %%NLS%%share/locale/bn/LC_MESSAGES/xfdesktop.mo
-%%NLS%%share/locale/bn_IN/LC_MESSAGES/xfdesktop.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/xfdesktop.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/xfdesktop.mo
 %%NLS%%share/locale/da/LC_MESSAGES/xfdesktop.mo
 %%NLS%%share/locale/de/LC_MESSAGES/xfdesktop.mo
-%%NLS%%share/locale/dz/LC_MESSAGES/xfdesktop.mo
 %%NLS%%share/locale/el/LC_MESSAGES/xfdesktop.mo
+%%NLS%%share/locale/en_AU/LC_MESSAGES/xfdesktop.mo
 %%NLS%%share/locale/en_GB/LC_MESSAGES/xfdesktop.mo
 %%NLS%%share/locale/eo/LC_MESSAGES/xfdesktop.mo
 %%NLS%%share/locale/es/LC_MESSAGES/xfdesktop.mo
-%%NLS%%share/locale/es_MX/LC_MESSAGES/xfdesktop.mo
 %%NLS%%share/locale/et/LC_MESSAGES/xfdesktop.mo
 %%NLS%%share/locale/eu/LC_MESSAGES/xfdesktop.mo
-%%NLS%%share/locale/fa/LC_MESSAGES/xfdesktop.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/xfdesktop.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/xfdesktop.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/xfdesktop.mo
-%%NLS%%share/locale/gu/LC_MESSAGES/xfdesktop.mo
 %%NLS%%share/locale/he/LC_MESSAGES/xfdesktop.mo
-%%NLS%%share/locale/hi/LC_MESSAGES/xfdesktop.mo
 %%NLS%%share/locale/hr/LC_MESSAGES/xfdesktop.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/xfdesktop.mo
-%%NLS%%share/locale/hy/LC_MESSAGES/xfdesktop.mo
 %%NLS%%share/locale/id/LC_MESSAGES/xfdesktop.mo
 %%NLS%%share/locale/is/LC_MESSAGES/xfdesktop.mo
 %%NLS%%share/locale/it/LC_MESSAGES/xfdesktop.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/xfdesktop.mo
-%%NLS%%share/locale/ka/LC_MESSAGES/xfdesktop.mo
 %%NLS%%share/locale/kk/LC_MESSAGES/xfdesktop.mo
 %%NLS%%share/locale/ko/LC_MESSAGES/xfdesktop.mo
 %%NLS%%share/locale/lt/LC_MESSAGES/xfdesktop.mo
 %%NLS%%share/locale/lv/LC_MESSAGES/xfdesktop.mo
-%%NLS%%share/locale/mk/LC_MESSAGES/xfdesktop.mo
-%%NLS%%share/locale/mr/LC_MESSAGES/xfdesktop.mo
 %%NLS%%share/locale/ms/LC_MESSAGES/xfdesktop.mo
 %%NLS%%share/locale/nb/LC_MESSAGES/xfdesktop.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/xfdesktop.mo
 %%NLS%%share/locale/nn/LC_MESSAGES/xfdesktop.mo
+%%NLS%%share/locale/oc/LC_MESSAGES/xfdesktop.mo
 %%NLS%%share/locale/pa/LC_MESSAGES/xfdesktop.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/xfdesktop.mo
 %%NLS%%share/locale/pt/LC_MESSAGES/xfdesktop.mo
@@ -62,18 +53,21 @@ share/icons/hicolor/scalable/apps/xfce4-menueditor.svg
 %%NLS%%share/locale/ru/LC_MESSAGES/xfdesktop.mo
 %%NLS%%share/locale/si/LC_MESSAGES/xfdesktop.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/xfdesktop.mo
+%%NLS%%share/locale/sl/LC_MESSAGES/xfdesktop.mo
 %%NLS%%share/locale/sq/LC_MESSAGES/xfdesktop.mo
 %%NLS%%share/locale/sr/LC_MESSAGES/xfdesktop.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/xfdesktop.mo
-%%NLS%%share/locale/ta/LC_MESSAGES/xfdesktop.mo
 %%NLS%%share/locale/te/LC_MESSAGES/xfdesktop.mo
+%%NLS%%share/locale/th/LC_MESSAGES/xfdesktop.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/xfdesktop.mo
 %%NLS%%share/locale/ug/LC_MESSAGES/xfdesktop.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/xfdesktop.mo
 %%NLS%%share/locale/ur/LC_MESSAGES/xfdesktop.mo
 %%NLS%%share/locale/ur_PK/LC_MESSAGES/xfdesktop.mo
+%%NLS%%share/locale/uz/LC_MESSAGES/xfdesktop.mo
 %%NLS%%share/locale/vi/LC_MESSAGES/xfdesktop.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/xfdesktop.mo
+%%NLS%%share/locale/zh_HK/LC_MESSAGES/xfdesktop.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/xfdesktop.mo
 share/pixmaps/xfce4_xicon.png
 share/pixmaps/xfce4_xicon1.png
@@ -81,28 +75,3 @@ share/pixmaps/xfce4_xicon2.png
 share/pixmaps/xfce4_xicon3.png
 share/pixmaps/xfce4_xicon4.png
 share/pixmaps/xfdesktop/xfdesktop-fallback-icon.png
-@dirrm share/pixmaps/xfdesktop
-%%NLS%%@dirrmtry share/locale/ur_PK/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ur_PK
-%%NLS%%@dirrmtry share/locale/ur/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ur
-%%NLS%%@dirrmtry share/locale/ug/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ug
-%%NLS%%@dirrmtry share/locale/te/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/te
-%%NLS%%@dirrmtry share/locale/si/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/si
-%%NLS%%@dirrmtry share/locale/mr/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/mr
-%%NLS%%@dirrmtry share/locale/kk/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/kk
-%%NLS%%@dirrmtry share/locale/hy/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/hy
-%%NLS%%@dirrmtry share/locale/dz/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/dz
-%%NLS%%@dirrmtry share/locale/bn_IN/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/bn_IN
-%%NLS%%@dirrmtry share/locale/ast/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ast
-@dirrm share/backgrounds/xfce
-@dirrmtry share/backgrounds