- Welcome XFCE 4.10 to the portstree!

Special Thanks to:      rene, Olivier Duchateau <duchateau.olivier@gmail.com>
Submitted by:	 	Olivier Duchateau <duchateau.olivier@gmail.com>

Tested by:	phw

6 files changed, 24 insertions, 17 deletions

diff --git a/sysutils/garcon/Makefile b/sysutils/garcon/Makefile
index 363c59908a41..ab2f255895c2 100644
--- a/sysutils/garcon/Makefile
+++ b/sysutils/garcon/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	garcon
-PORTVERSION=	0.1.11
+PORTVERSION=	0.2.0
 CATEGORIES=	sysutils xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
-MASTER_SITE_SUBDIR=/src/xfce/${PORTNAME}/${PORTVERSION:R}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
@@ -22,6 +21,8 @@ USE_GMAKE=	yes
 USE_GNOME=	gnomehack glib20 intltool intlhack pkgconfig
 USE_XFCE=	configenv libutil
 
+CONFIGURE_ARGS+=--disable-gtk-doc-html
+
 OPTIONS=	NLS	"Enable Native Language Support"	on \
 		APIDOCS	"Install api documentation"		off
 
diff --git a/sysutils/garcon/distinfo b/sysutils/garcon/distinfo
index 08d64e86a78f..99909ff0ed0f 100644
--- a/sysutils/garcon/distinfo
+++ b/sysutils/garcon/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xfce4/garcon-0.1.11.tar.bz2) = 272c1207a3449ce969a86ebdc61c6afcad05003f0a986e222bb90c01c1692dfc
-SIZE (xfce4/garcon-0.1.11.tar.bz2) = 427707
+SHA256 (xfce4/garcon-0.2.0.tar.bz2) = 02dea3edb9c0039eca4748e964c61b0e1cc10f2d7f9ce0c837287ac5fa9ef76c
+SIZE (xfce4/garcon-0.2.0.tar.bz2) = 431573
diff --git a/sysutils/xfce4-settings/Makefile b/sysutils/xfce4-settings/Makefile
index ad9e4753b513..df7993eecccd 100644
--- a/sysutils/xfce4-settings/Makefile
+++ b/sysutils/xfce4-settings/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	xfce4-settings
-PORTVERSION=	4.8.3
+PORTVERSION=	4.10.0
 CATEGORIES=	sysutils xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
-MASTER_SITE_SUBDIR=	src/xfce/${PORTNAME}/${PORTVERSION:R}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
@@ -24,7 +23,6 @@ OPTIONS=	XKLAVIER	"Keyboard layout settings"		off \
 		NLS		"Enable Native Language Support"	on \
 		SOUND		"Enable sound control"	off
 
-CONFIGURE_ENV+=	ac_cv_prog_AWK="${AWK}"
 USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
@@ -32,9 +30,12 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack glib20 gtk20 desktopfileutils intltool intlhack \
 		pkgconfig
-USE_XFCE=	configenv libexo libmenu libutil xfconf
+USE_XFCE=	configenv garcon libexo libmenu libutil xfconf
 USE_XORG=	inputproto x11 xi
 
+CONFIGURE_ARGS=	--enable-pluggable-dialogs \
+	--enable-gio-unix
+
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_XKLAVIER)
diff --git a/sysutils/xfce4-settings/distinfo b/sysutils/xfce4-settings/distinfo
index 1ebf1ea75c1f..b775850c3a3b 100644
--- a/sysutils/xfce4-settings/distinfo
+++ b/sysutils/xfce4-settings/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xfce4/xfce4-settings-4.8.3.tar.bz2) = d878cc474e1e677e9607279b9a1007cb90ed35ff078de180259a8b2b8d06bc2e
-SIZE (xfce4/xfce4-settings-4.8.3.tar.bz2) = 672266
+SHA256 (xfce4/xfce4-settings-4.10.0.tar.bz2) = 0843f09ba9673f1d1b5df8dce4a17b63c183a9ba3be75fb6ef99a67fc8c1f77e
+SIZE (xfce4/xfce4-settings-4.10.0.tar.bz2) = 782922
diff --git a/sysutils/xfce4-settings/pkg-descr b/sysutils/xfce4-settings/pkg-descr
index f3be82d49a40..2e7ba9b595f4 100644
--- a/sysutils/xfce4-settings/pkg-descr
+++ b/sysutils/xfce4-settings/pkg-descr
@@ -1,6 +1,4 @@
-The settings manager allows you to customize your desktop environment in
-an easy and intuitive way. You can set some hardware components such as
-mouse, keyboard or display; but also theme your windows, widgets and icons,
-set your preferred applications, manage your sessions... 
+The settings manager allows you to configure every detail of your desktop
+environment.
 
-WWW: http://www.xfce.org/projects/xfce4-settings/
+WWW: http://docs.xfce.org/xfce/xfce4-settings/start
diff --git a/sysutils/xfce4-settings/pkg-plist b/sysutils/xfce4-settings/pkg-plist
index 107bb7579238..74e1a2400ed8 100644
--- a/sysutils/xfce4-settings/pkg-plist
+++ b/sysutils/xfce4-settings/pkg-plist
@@ -2,15 +2,18 @@ bin/xfce4-accessibility-settings
 bin/xfce4-appearance-settings
 %%XRANDR%%bin/xfce4-display-settings
 bin/xfce4-keyboard-settings
+bin/xfce4-mime-settings
 bin/xfce4-mouse-settings
 bin/xfce4-settings-editor
-bin/xfce4-settings-helper
 bin/xfce4-settings-manager
 bin/xfsettingsd
-etc/xdg/autostart/xfce4-settings-helper-autostart.desktop
+etc/xdg/autostart/xfsettingsd.desktop
 etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
+etc/xdg/menus/xfce-settings-manager.menu
+lib/xfce4/settings/appearance-install-theme
 %%XRANDR%%%%NLS%%share/applications/xfce-display-settings.desktop
 share/applications/xfce-keyboard-settings.desktop
+share/applications/xfce4-mime-settings.desktop
 share/applications/xfce-mouse-settings.desktop
 share/applications/xfce-settings-manager.desktop
 share/applications/xfce-ui-settings.desktop
@@ -39,9 +42,11 @@ share/applications/xfce4-settings-editor.desktop
 %%NLS%%share/locale/ja/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/kk/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/ko/LC_MESSAGES/xfce4-settings.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/lv/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/nb/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/xfce4-settings.mo
+%%NLS%%share/locale/nn/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/pa/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/pt/LC_MESSAGES/xfce4-settings.mo
@@ -75,9 +80,11 @@ share/applications/xfce4-settings-editor.desktop
 %%NLS%%@dirrmtry share/locale/kk
 %%NLS%%@dirrmtry share/locale/ast/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/ast
+@dirrmtry lib/xfce4/settings
 @dirrmtry etc/xdg/xfce4/xfconf/xfce-perchannel-xml
 @dirrmtry etc/xdg/xfce4/xfconf
 @dirrmtry etc/xdg/xfce4
+@dirrmtry etc/xdg/menus
 @dirrmtry etc/xdg/autostart
 @dirrmtry etc/xdg