16 files changed, 54 insertions, 168 deletions

diff --git a/x11/libexo/Makefile b/x11/libexo/Makefile
index a451cfe01f48..b6efff544d1c 100644
--- a/x11/libexo/Makefile
+++ b/x11/libexo/Makefile
@@ -6,16 +6,14 @@
 #    $MCom: ports/x11/libexo/Makefile,v 1.1 2006/10/02 21:05:55 ahze Exp $
 
 PORTNAME=	libexo
-PORTVERSION=	0.6.2
-PORTREVISION=	1
+PORTVERSION=	0.8.0
 CATEGORIES=	x11 xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
-MASTER_SITE_SUBDIR=	src/xfce/exo/${PORTVERSION:R}
 DISTNAME=	exo-${PORTVERSION}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
-COMMENT=	Application library for the Xfce environment
+COMMENT=	Application library for the Xfce desktop environment
 
 BUILD_DEPENDS=	${SITE_PERL}/URI.pm:${PORTSDIR}/net/p5-URI
 RUN_DEPENDS=	${SITE_PERL}/URI.pm:${PORTSDIR}/net/p5-URI
@@ -31,14 +29,13 @@ USE_GNOME=	gnomehack glib20 gtk20 intltool intlhack pkgconfig \
 		desktopfileutils
 USE_LDCONFIG=	yes
 USE_PERL5=	yes
-USE_XFCE=	configenv libutil
+USE_XFCE=	configenv libmenu libutil
 USE_XORG=	x11
+
 CONFIGURE_ARGS+=--enable-gio-unix \
-		--with-gio-module-dir=${PREFIX}/lib/gio/modules
-CONFIGURE_ENV+=	ac_cv_prog_AWK="${AWK}"
+	--disable-gtk-doc-html
 
 OPTIONS=	APIDOCS	"Install api documentation"		off \
-		PYTHON	"Enable Python support"			off \
 		NLS	"Enable Native Language Support"	on
 
 MAN1=		exo-csource.1 exo-open.1
@@ -53,17 +50,6 @@ CONFIGURE_ARGS+=--with-html-dir=${PREFIX}/share/gtk-doc/html
 PLIST_SUB+=	APIDOCS=""
 .endif
 
-.if defined(WITH_PYTHON)
-USE_PYTHON=	yes
-CONFIGURE_ARGS+=--enable-python
-BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}gtk>=2:${PORTSDIR}/x11-toolkits/py-gtk2
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}gtk>=2:${PORTSDIR}/x11-toolkits/py-gtk2
-PLIST_SUB+=	PYTHON="" EXODIR="exo-0.6"
-.else
-CONFIGURE_ARGS+=--disable-python
-PLIST_SUB+=	PYTHON="@comment "
-.endif
-
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
 CONFIGURE_ARGS+=--enable-nls
@@ -74,8 +60,6 @@ PLIST_SUB+=	NLS="@comment "
 .endif
 
 post-install:
-	${FIND} ${WRKSRC}/docs/reference -type f -regex '.*\.1' \
-	-exec ${INSTALL_MAN} "{}" "${MANPREFIX}/man/man1" \;
 	@-update-desktop-database
 
 .include <bsd.port.mk>
diff --git a/x11/libexo/distinfo b/x11/libexo/distinfo
index 38ad7ef374f2..9f028c332f10 100644
--- a/x11/libexo/distinfo
+++ b/x11/libexo/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xfce4/exo-0.6.2.tar.bz2) = f49cf6a85546f47a1dddb58ce9a5f9364384a6f173cba99deb879e027c811f39
-SIZE (xfce4/exo-0.6.2.tar.bz2) = 1692288
+SHA256 (xfce4/exo-0.8.0.tar.bz2) = 6e21aa30692affcb45fc8283d034da4a02221d26e3e1facb968d04fed4ba05b0
+SIZE (xfce4/exo-0.8.0.tar.bz2) = 1120701
diff --git a/x11/libexo/pkg-descr b/x11/libexo/pkg-descr
index 8dba913482d4..e06ce364e69b 100644
--- a/x11/libexo/pkg-descr
+++ b/x11/libexo/pkg-descr
@@ -1,6 +1,3 @@
-libexo is the extension library to Xfce developed by os-cillation.
-While Xfce ships with quite a few libraries that are primarly
-targeted at desktop development, libexo is targeted at application
-development, with a focus on applications for Xfce.
+libexo is a support library used in the Xfce desktop environment.
 
-WWW: http://www.os-cillation.de/index.php?id=29&L=5
+WWW: http://docs.xfce.org/xfce/exo/start
diff --git a/x11/libexo/pkg-plist b/x11/libexo/pkg-plist
index 09e9cc4e52b1..d68d2f24d221 100644
--- a/x11/libexo/pkg-plist
+++ b/x11/libexo/pkg-plist
@@ -27,7 +27,6 @@ include/exo-1/exo/exo-utils.h
 include/exo-1/exo/exo-wrap-table.h
 include/exo-1/exo/exo-xsession-client.h
 include/exo-1/exo/exo.h
-lib/libexo-1.a
 lib/libexo-1.la
 lib/libexo-1.so
 lib/libexo-1.so.0
@@ -39,60 +38,6 @@ share/applications/exo-mail-reader.desktop
 share/applications/exo-preferred-applications.desktop
 share/applications/exo-terminal-emulator.desktop
 share/applications/exo-web-browser.desktop
-%%DOCSDIR%%/html/C/exo-preferred-applications.html
-%%DOCSDIR%%/html/C/images/exo-preferred-applications-internet.png
-%%DOCSDIR%%/html/C/images/exo-preferred-applications-utilities.png
-%%DOCSDIR%%/html/C/images/exo-preferred-applications-webbrowser-custom.png
-%%DOCSDIR%%/html/C/images/exo-preferred-applications-webbrowser-menu.png
-%%DOCSDIR%%/html/bn/exo-preferred-applications.html
-%%DOCSDIR%%/html/bn/images
-%%DOCSDIR%%/html/ca/exo-preferred-applications.html
-%%DOCSDIR%%/html/ca/images
-%%DOCSDIR%%/html/da/exo-preferred-applications.html
-%%DOCSDIR%%/html/da/images
-%%DOCSDIR%%/html/de/exo-preferred-applications.html
-%%DOCSDIR%%/html/de/images
-%%DOCSDIR%%/html/el/exo-preferred-applications.html
-%%DOCSDIR%%/html/el/images/exo-preferred-applications-internet.png
-%%DOCSDIR%%/html/el/images/exo-preferred-applications-utilities.png
-%%DOCSDIR%%/html/el/images/exo-preferred-applications-webbrowser-custom.png
-%%DOCSDIR%%/html/el/images/exo-preferred-applications-webbrowser-menu.png
-%%DOCSDIR%%/html/es/exo-preferred-applications.html
-%%DOCSDIR%%/html/es/images/exo-preferred-applications-internet.png
-%%DOCSDIR%%/html/es/images/exo-preferred-applications-utilities.png
-%%DOCSDIR%%/html/es/images/exo-preferred-applications-webbrowser-custom.png
-%%DOCSDIR%%/html/es/images/exo-preferred-applications-webbrowser-menu.png
-%%DOCSDIR%%/html/exo-preferred-applications.css
-%%DOCSDIR%%/html/fr/exo-preferred-applications.html
-%%DOCSDIR%%/html/fr/images
-%%DOCSDIR%%/html/gl/exo-preferred-applications.html
-%%DOCSDIR%%/html/gl/images
-%%DOCSDIR%%/html/id/exo-preferred-applications.html
-%%DOCSDIR%%/html/id/images
-%%DOCSDIR%%/html/it/exo-preferred-applications.html
-%%DOCSDIR%%/html/it/images
-%%DOCSDIR%%/html/ja/exo-preferred-applications.html
-%%DOCSDIR%%/html/ja/images/exo-preferred-applications-internet.png
-%%DOCSDIR%%/html/ja/images/exo-preferred-applications-utilities.png
-%%DOCSDIR%%/html/ja/images/exo-preferred-applications-webbrowser-custom.png
-%%DOCSDIR%%/html/ja/images/exo-preferred-applications-webbrowser-menu.png
-%%DOCSDIR%%/html/pt/exo-preferred-applications.html
-%%DOCSDIR%%/html/pt/images
-%%DOCSDIR%%/html/pt_BR/exo-preferred-applications.html
-%%DOCSDIR%%/html/pt_BR/images
-%%DOCSDIR%%/html/ru/exo-preferred-applications.html
-%%DOCSDIR%%/html/ru/images
-%%DOCSDIR%%/html/tr/exo-preferred-applications.html
-%%DOCSDIR%%/html/tr/images
-%%DOCSDIR%%/html/sv/exo-preferred-applications.html
-%%DOCSDIR%%/html/sv/images/exo-preferred-applications-internet.png
-%%DOCSDIR%%/html/sv/images/exo-preferred-applications-utilities.png
-%%DOCSDIR%%/html/sv/images/exo-preferred-applications-webbrowser-custom.png
-%%DOCSDIR%%/html/sv/images/exo-preferred-applications-webbrowser-menu.png
-%%DOCSDIR%%/html/ug/exo-preferred-applications.html
-%%DOCSDIR%%/html/ug/images
-%%DOCSDIR%%/html/zh_CN/exo-preferred-applications.html
-%%DOCSDIR%%/html/zh_CN/images
 %%APIDOCS%%share/gtk-doc/html/exo-1/ExoCellRendererEllipsizedText.html
 %%APIDOCS%%share/gtk-doc/html/exo-1/ExoCellRendererIcon.html
 %%APIDOCS%%share/gtk-doc/html/exo-1/ExoIconBar.html
@@ -108,7 +53,6 @@ share/applications/exo-web-browser.desktop
 %%APIDOCS%%share/gtk-doc/html/exo-1/ExoWrapTable.html
 %%APIDOCS%%share/gtk-doc/html/exo-1/ExoXsessionClient.html
 %%APIDOCS%%share/gtk-doc/html/exo-1/ch01.html
-%%APIDOCS%%share/gtk-doc/html/exo-1/exo-1.devhelp
 %%APIDOCS%%share/gtk-doc/html/exo-1/exo-1.devhelp2
 %%APIDOCS%%share/gtk-doc/html/exo-1/exo-Binding-Properties-Functions.html
 %%APIDOCS%%share/gtk-doc/html/exo-1/exo-Executing-Applications.html
@@ -173,12 +117,14 @@ share/icons/hicolor/48x48/apps/preferences-desktop-default-applications.png
 %%NLS%%share/locale/ja/LC_MESSAGES/exo-1.mo
 %%NLS%%share/locale/ka/LC_MESSAGES/exo-1.mo
 %%NLS%%share/locale/kk/LC_MESSAGES/exo-1.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/exo-1.mo
 %%NLS%%share/locale/ku/LC_MESSAGES/exo-1.mo
 %%NLS%%share/locale/lt/LC_MESSAGES/exo-1.mo
 %%NLS%%share/locale/lv/LC_MESSAGES/exo-1.mo
 %%NLS%%share/locale/mk/LC_MESSAGES/exo-1.mo
 %%NLS%%share/locale/nb/LC_MESSAGES/exo-1.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/exo-1.mo
+%%NLS%%share/locale/nn/LC_MESSAGES/exo-1.mo
 %%NLS%%share/locale/pa/LC_MESSAGES/exo-1.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/exo-1.mo
 %%NLS%%share/locale/pt/LC_MESSAGES/exo-1.mo
@@ -199,11 +145,11 @@ share/icons/hicolor/48x48/apps/preferences-desktop-default-applications.png
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/exo-1.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/exo-1.mo
 share/pixmaps/exo-1/exo-thumbnail-frame.png
-%%PYTHON%%share/pygtk/2.0/defs/%%EXODIR%%/exo.defs
 share/xfce4/helpers/Terminal.desktop
 share/xfce4/helpers/Thunar.desktop
 share/xfce4/helpers/aterm.desktop
 share/xfce4/helpers/balsa.desktop
+share/xfce4/helpers/chromium.desktop
 share/xfce4/helpers/debian-sensible-browser.desktop
 share/xfce4/helpers/debian-x-terminal-emulator.desktop
 share/xfce4/helpers/encompass.desktop
@@ -214,6 +160,7 @@ share/xfce4/helpers/firefox.desktop
 share/xfce4/helpers/galeon.desktop
 share/xfce4/helpers/gnome-terminal.desktop
 share/xfce4/helpers/icedove.desktop
+share/xfce4/helpers/iceweasel.desktop
 share/xfce4/helpers/kmail.desktop
 share/xfce4/helpers/konqueror.desktop
 share/xfce4/helpers/links.desktop
@@ -234,20 +181,6 @@ share/xfce4/helpers/thunderbird.desktop
 share/xfce4/helpers/urxvt.desktop
 share/xfce4/helpers/w3m.desktop
 share/xfce4/helpers/xterm.desktop
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/%%EXODIR%%
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/%%EXODIR%%/_exo.so
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/%%EXODIR%%/_exo.la
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/%%EXODIR%%/_exo.a
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/%%EXODIR%%/exo
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/%%EXODIR%%/exo/__init__.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/%%EXODIR%%/exo/__init__.pyc
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/%%EXODIR%%/exo/__init__.pyo
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/pyexo.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/pyexo.pyc
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/pyexo.pyo
-%%PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/%%EXODIR%%/exo
-%%PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/%%EXODIR%%
-%%PYTHON%%@dirrm share/pygtk/2.0/defs/%%EXODIR%%
 @dirrm share/xfce4/helpers
 @dirrmtry share/xfce4
 @dirrm share/pixmaps/exo-1
@@ -272,44 +205,12 @@ share/xfce4/helpers/xterm.desktop
 %%APIDOCS%%@dirrm share/gtk-doc/html/exo-1
 %%APIDOCS%%@dirrmtry share/gtk-doc/html
 %%APIDOCS%%@dirrmtry share/gtk-doc
-@dirrm %%DOCSDIR%%/html/zh_CN
-@dirrm %%DOCSDIR%%/html/ug
-@dirrm %%DOCSDIR%%/html/tr
-@dirrm %%DOCSDIR%%/html/sv/images
-@dirrm %%DOCSDIR%%/html/sv
-@dirrm %%DOCSDIR%%/html/ru
-@dirrm %%DOCSDIR%%/html/pt_BR
-@dirrm %%DOCSDIR%%/html/pt
-@dirrm %%DOCSDIR%%/html/ja/images
-@dirrm %%DOCSDIR%%/html/ja
-@dirrm %%DOCSDIR%%/html/it
-@dirrm %%DOCSDIR%%/html/id
-@dirrm %%DOCSDIR%%/html/gl
-@dirrm %%DOCSDIR%%/html/fr
-@dirrm %%DOCSDIR%%/html/es/images
-@dirrm %%DOCSDIR%%/html/es
-@dirrm %%DOCSDIR%%/html/el/images
-@dirrm %%DOCSDIR%%/html/el
-@dirrm %%DOCSDIR%%/html/de
-@dirrm %%DOCSDIR%%/html/da
-@dirrm %%DOCSDIR%%/html/ca
-@dirrm %%DOCSDIR%%/html/bn
-@dirrm %%DOCSDIR%%/html/C/images
-@dirrm %%DOCSDIR%%/html/C
-@dirrm %%DOCSDIR%%/html
-@dirrm %%DOCSDIR%%
 @dirrm lib/xfce4/exo-1
 @dirrmtry lib/xfce4
 @dirrm include/exo-1/exo
 @dirrm include/exo-1
 @dirrmtry etc/xdg/xfce4
 @dirrmtry etc/xdg
-%%PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/%%EXODIR%%/exo
-%%PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/%%EXODIR%%
-%%PYTHON%%@dirrm share/pygtk/2.0/defs/%%EXODIR%%
-%%PYTHON%%@dirrmtry share/pygtk/2.0/defs
-%%PYTHON%%@dirrmtry share/pygtk/2.0
-%%PYTHON%%@dirrmtry share/pygtk
 @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/x11/libxfce4menu/Makefile b/x11/libxfce4menu/Makefile
index 824c3f89d0d5..a76740b8c1e6 100644
--- a/x11/libxfce4menu/Makefile
+++ b/x11/libxfce4menu/Makefile
@@ -6,23 +6,26 @@
 #
 
 PORTNAME=	libxfce4menu
-PORTVERSION=	4.8.1
+PORTVERSION=	4.10.0
 CATEGORIES=	x11 xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
-MASTER_SITE_SUBDIR=	src/xfce/libxfce4ui/${PORTVERSION:R}
 DISTNAME=	libxfce4ui-${PORTVERSION}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
-COMMENT=	Xfce 4 library for a freedesktop.org compliant menu implementation
+COMMENT=	Widgets library for the Xfce desktop environment
 
 USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GNOME=	glib20 gnomehack gtk20 intltool intlhack pkgconfig
+USE_GNOME=	glib20 gnomehack gtk20 intltool intlhack pkgconfig desktopfileutils
 USE_LDCONFIG=	yes
 USE_XFCE=	configenv libutil xfconf
+INSTALLS_ICONS=	yes
+
+CONFIGURE_ARGS=	--disable-gtk-doc-html \
+	--with-vendor-info=FreeBSD
 
 OPTIONS=	APIDOCS	"Install api documentation"	off \
 		NLS	"Enable Native Language Support"	on \
diff --git a/x11/libxfce4menu/distinfo b/x11/libxfce4menu/distinfo
index 58164d11d428..9c5f72758052 100644
--- a/x11/libxfce4menu/distinfo
+++ b/x11/libxfce4menu/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xfce4/libxfce4ui-4.8.1.tar.bz2) = 39cbed29da06960074014b74abc2ba57db49dc81ab8995fb2160579c51669956
-SIZE (xfce4/libxfce4ui-4.8.1.tar.bz2) = 426831
+SHA256 (xfce4/libxfce4ui-4.10.0.tar.bz2) = a2b9fa288ccb5f16fa13264e507ba3f7b8da0176da259a11239f21538c0ea3e2
+SIZE (xfce4/libxfce4ui-4.10.0.tar.bz2) = 545486
diff --git a/x11/libxfce4menu/pkg-descr b/x11/libxfce4menu/pkg-descr
index 3cdd840050c4..1453c4442082 100644
--- a/x11/libxfce4menu/pkg-descr
+++ b/x11/libxfce4menu/pkg-descr
@@ -1,3 +1,4 @@
-Xfce 4 library for a freedesktop.org compliant menu implementation
+libxfce4ui is used to share commonly used Xfce widgets amoung the Xfce 
+applications.
 
-WWW: http://www.xfce.org/projects/libraries/
+WWW: http://www.xfce.org/projects
diff --git a/x11/libxfce4menu/pkg-plist b/x11/libxfce4menu/pkg-plist
index 859272ed28bf..cd3dcf8cd32c 100644
--- a/x11/libxfce4menu/pkg-plist
+++ b/x11/libxfce4menu/pkg-plist
@@ -1,3 +1,4 @@
+bin/xfce4-about
 etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml
 include/xfce4/libxfce4kbd-private-2/libxfce4kbd-private/xfce-shortcut-dialog.h
 include/xfce4/libxfce4kbd-private-2/libxfce4kbd-private/xfce-shortcuts-grabber.h
@@ -22,6 +23,7 @@ lib/libxfce4ui-1.so
 lib/libxfce4ui-1.so.0
 libdata/pkgconfig/libxfce4kbd-private-2.pc
 libdata/pkgconfig/libxfce4ui-1.pc
+share/applications/xfce4-about.desktop
 %%APIDOCS%%share/gtk-doc/html/libxfce4ui/XfceSMClient.html
 %%APIDOCS%%share/gtk-doc/html/libxfce4ui/home.png
 %%APIDOCS%%share/gtk-doc/html/libxfce4ui/index.html
@@ -43,6 +45,7 @@ libdata/pkgconfig/libxfce4ui-1.pc
 %%APIDOCS%%share/gtk-doc/html/libxfce4ui/right.png
 %%APIDOCS%%share/gtk-doc/html/libxfce4ui/style.css
 %%APIDOCS%%share/gtk-doc/html/libxfce4ui/up.png
+share/icons/hicolor/48x48/apps/xfce4-logo.png
 %%NLS%%share/locale/ar/LC_MESSAGES/libxfce4ui.mo
 %%NLS%%share/locale/ast/LC_MESSAGES/libxfce4ui.mo
 %%NLS%%share/locale/bn/LC_MESSAGES/libxfce4ui.mo
@@ -67,10 +70,11 @@ libdata/pkgconfig/libxfce4ui-1.pc
 %%NLS%%share/locale/kk/LC_MESSAGES/libxfce4ui.mo
 %%NLS%%share/locale/ko/LC_MESSAGES/libxfce4ui.mo
 %%NLS%%share/locale/ku/LC_MESSAGES/libxfce4ui.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/libxfce4ui.mo
 %%NLS%%share/locale/lv/LC_MESSAGES/libxfce4ui.mo
-%%NLS%%share/locale/ms/LC_MESSAGES/libxfce4ui.mo
 %%NLS%%share/locale/nb/LC_MESSAGES/libxfce4ui.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/libxfce4ui.mo
+%%NLS%%share/locale/nn/LC_MESSAGES/libxfce4ui.mo
 %%NLS%%share/locale/pa/LC_MESSAGES/libxfce4ui.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/libxfce4ui.mo
 %%NLS%%share/locale/pt/LC_MESSAGES/libxfce4ui.mo
@@ -88,6 +92,7 @@ libdata/pkgconfig/libxfce4ui-1.pc
 %%NLS%%share/locale/uk/LC_MESSAGES/libxfce4ui.mo
 %%NLS%%share/locale/ur/LC_MESSAGES/libxfce4ui.mo
 %%NLS%%share/locale/ur_PK/LC_MESSAGES/libxfce4ui.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/libxfce4ui.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/libxfce4ui.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/libxfce4ui.mo
 %%NLS%%@dirrmtry share/locale/ur_PK/LC_MESSAGES
@@ -122,3 +127,5 @@ libdata/pkgconfig/libxfce4ui-1.pc
 @dirrmtry etc/xdg/xfce4/xfconf
 @dirrmtry etc/xdg/xfce4
 @dirrmtry etc/xdg
+@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/x11/libxfce4util/Makefile b/x11/libxfce4util/Makefile
index aeec158019b7..63aa1a74aaa3 100644
--- a/x11/libxfce4util/Makefile
+++ b/x11/libxfce4util/Makefile
@@ -6,14 +6,13 @@
 #
 
 PORTNAME=	libxfce4util
-PORTVERSION=	4.8.2
+PORTVERSION=	4.10.0
 CATEGORIES=	x11 xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
-MASTER_SITE_SUBDIR=	src/xfce/${PORTNAME}/${PORTVERSION:R}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
-COMMENT=	Xfce 4 library with non-graphical helper functions
+COMMENT=	Extension library for the Xfce desktop environment
 
 USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
@@ -24,6 +23,8 @@ USE_PERL5=	yes
 USE_LDCONFIG=	yes
 USE_XFCE=	configenv
 
+CONFIGURE_ARGS+=--disable-gtk-doc-html
+
 OPTIONS=	NLS "Enable Native Language Support" on \
 	APIDOCS "Install api documentation" off
 
diff --git a/x11/libxfce4util/distinfo b/x11/libxfce4util/distinfo
index 12468cf985aa..d8b4c8c77a8c 100644
--- a/x11/libxfce4util/distinfo
+++ b/x11/libxfce4util/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xfce4/libxfce4util-4.8.2.tar.bz2) = 05a149841575cb961588742c8c9795c6f0d09f27d59546dd8a933b010d2ac816
-SIZE (xfce4/libxfce4util-4.8.2.tar.bz2) = 436692
+SHA256 (xfce4/libxfce4util-4.10.0.tar.bz2) = 0979fee12880bb5f011ab38d6c7cc9afe5fd68eb96ccda895cb56dbc16e7608e
+SIZE (xfce4/libxfce4util-4.10.0.tar.bz2) = 430542
diff --git a/x11/libxfce4util/pkg-descr b/x11/libxfce4util/pkg-descr
index 3f7d079c2e4c..97c01f11c20b 100644
--- a/x11/libxfce4util/pkg-descr
+++ b/x11/libxfce4util/pkg-descr
@@ -1,3 +1,3 @@
 Xfce 4 library providing basic utilities. 
 
-WWW: http://www.xfce.org/projects/libraries/
+WWW: http://www.xfce.org/projects
diff --git a/x11/libxfce4util/pkg-plist b/x11/libxfce4util/pkg-plist
index 4efcf9862424..f5f5b04a971f 100644
--- a/x11/libxfce4util/pkg-plist
+++ b/x11/libxfce4util/pkg-plist
@@ -1,11 +1,6 @@
-include/xfce4/libxfce4util/debug.h
-include/xfce4/libxfce4util/i18n.h
 include/xfce4/libxfce4util/libxfce4util-config.h
-include/xfce4/libxfce4util/libxfce4util-enum-types.h
 include/xfce4/libxfce4util/libxfce4util.h
-include/xfce4/libxfce4util/utf8.h
-include/xfce4/libxfce4util/util.h
-include/xfce4/libxfce4util/xfce-desktopentry.h
+include/xfce4/libxfce4util/xfce-debug.h
 include/xfce4/libxfce4util/xfce-fileutils.h
 include/xfce4/libxfce4util/xfce-generics.h
 include/xfce4/libxfce4util/xfce-i18n.h
@@ -19,14 +14,13 @@ include/xfce4/libxfce4util/xfce-utf8.h
 lib/libxfce4util.a
 lib/libxfce4util.la
 lib/libxfce4util.so
-lib/libxfce4util.so.5
+lib/libxfce4util.so.6
 libdata/pkgconfig/libxfce4util-1.0.pc
 sbin/xfce4-kiosk-query
 %%APIDOCS%%share/gtk-doc/html/libxfce4util/home.png
 %%APIDOCS%%share/gtk-doc/html/libxfce4util/index.html
 %%APIDOCS%%share/gtk-doc/html/libxfce4util/index.sgml
 %%APIDOCS%%share/gtk-doc/html/libxfce4util/left.png
-%%APIDOCS%%share/gtk-doc/html/libxfce4util/libxfce4util-Desktop-entries.html
 %%APIDOCS%%share/gtk-doc/html/libxfce4util/libxfce4util-File-Utilities.html
 %%APIDOCS%%share/gtk-doc/html/libxfce4util/libxfce4util-Internationalisation.html
 %%APIDOCS%%share/gtk-doc/html/libxfce4util/libxfce4util-Miscellaneous-Utilities.html
@@ -42,7 +36,6 @@ sbin/xfce4-kiosk-query
 %%APIDOCS%%share/gtk-doc/html/libxfce4util/libxfce4util-datatypes.html
 %%APIDOCS%%share/gtk-doc/html/libxfce4util/libxfce4util-fundamentals.html
 %%APIDOCS%%share/gtk-doc/html/libxfce4util/libxfce4util-utilities.html
-%%APIDOCS%%share/gtk-doc/html/libxfce4util/libxfce4util.devhelp
 %%APIDOCS%%share/gtk-doc/html/libxfce4util/libxfce4util.devhelp2
 %%APIDOCS%%share/gtk-doc/html/libxfce4util/reference.html
 %%APIDOCS%%share/gtk-doc/html/libxfce4util/right.png
@@ -69,6 +62,7 @@ sbin/xfce4-kiosk-query
 %%NLS%%share/locale/he/LC_MESSAGES/libxfce4util.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/libxfce4util.mo
 %%NLS%%share/locale/id/LC_MESSAGES/libxfce4util.mo
+%%NLS%%share/locale/is/LC_MESSAGES/libxfce4util.mo
 %%NLS%%share/locale/it/LC_MESSAGES/libxfce4util.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/libxfce4util.mo
 %%NLS%%share/locale/ka/LC_MESSAGES/libxfce4util.mo
@@ -79,6 +73,7 @@ sbin/xfce4-kiosk-query
 %%NLS%%share/locale/mk/LC_MESSAGES/libxfce4util.mo
 %%NLS%%share/locale/nb/LC_MESSAGES/libxfce4util.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/libxfce4util.mo
+%%NLS%%share/locale/nn/LC_MESSAGES/libxfce4util.mo
 %%NLS%%share/locale/pa/LC_MESSAGES/libxfce4util.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/libxfce4util.mo
 %%NLS%%share/locale/pt/LC_MESSAGES/libxfce4util.mo
diff --git a/x11/xfce4-conf/Makefile b/x11/xfce4-conf/Makefile
index ea0d00007e8d..6c35952f44f4 100644
--- a/x11/xfce4-conf/Makefile
+++ b/x11/xfce4-conf/Makefile
@@ -6,15 +6,14 @@
 #
 
 PORTNAME=	xfce4-conf
-PORTVERSION=	4.8.1
+PORTVERSION=	4.10.0
 CATEGORIES=	x11 xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
-MASTER_SITE_SUBDIR=	src/xfce/xfconf/${PORTVERSION:R}
 DISTNAME=	xfconf-${PORTVERSION}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
-COMMENT=	Xfce 4 configuration mananger
+COMMENT=	D-Bus-based configuration storage system
 
 LIB_DEPENDS=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
 
@@ -27,6 +26,8 @@ USE_LDCONFIG=	yes
 USE_XFCE=	configenv libutil
 USE_XORG=	x11
 
+CONFIGURE_ARGS+=--disable-gtk-doc-html
+
 OPTIONS=	APIDOCS	"Install api documentation"	off \
 		PERL	"Install Perl bindings"			off \
 		NLS	"Enable Native Language Support"	on
@@ -65,8 +66,4 @@ CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|--module-dir|--module=xfconf &|' \
-		${WRKSRC}/docs/reference/Makefile.in
-
 .include <bsd.port.post.mk>
diff --git a/x11/xfce4-conf/distinfo b/x11/xfce4-conf/distinfo
index 48a15c3142ca..180bec8bb0c6 100644
--- a/x11/xfce4-conf/distinfo
+++ b/x11/xfce4-conf/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xfce4/xfconf-4.8.1.tar.bz2) = 9860737539fab2b852e8c07c50c205a5fbe894b08bcb4488a70e3fd6c75993cb
-SIZE (xfce4/xfconf-4.8.1.tar.bz2) = 501216
+SHA256 (xfce4/xfconf-4.10.0.tar.bz2) = 175219a441cc7d0f210bbd1a3b0abba41598627cd9db27235811400c3e100576
+SIZE (xfce4/xfconf-4.10.0.tar.bz2) = 517425
diff --git a/x11/xfce4-conf/pkg-descr b/x11/xfce4-conf/pkg-descr
index fb1ff718a398..9ac1ebecd375 100644
--- a/x11/xfce4-conf/pkg-descr
+++ b/x11/xfce4-conf/pkg-descr
@@ -1,3 +1,3 @@
-Xfce 4 configuration mananger
+D-Bus-based configuration storage system.
 
-WWW: http://www.xfce.org/projects/libraries/
+WWW: http://www.xfce.org/projects
diff --git a/x11/xfce4-conf/pkg-plist b/x11/xfce4-conf/pkg-plist
index 319f81434ee1..2e65bf3bbab4 100644
--- a/x11/xfce4-conf/pkg-plist
+++ b/x11/xfce4-conf/pkg-plist
@@ -27,7 +27,6 @@ share/dbus-1/services/org.xfce.Xfconf.service
 %%APIDOCS%%share/gtk-doc/html/xfconf/xfconf-xfconf-errors.html
 %%APIDOCS%%share/gtk-doc/html/xfconf/xfconf-xfconf-types.html
 %%APIDOCS%%share/gtk-doc/html/xfconf/xfconf-xfconf.html
-%%APIDOCS%%share/gtk-doc/html/xfconf/xfconf.devhelp
 %%APIDOCS%%share/gtk-doc/html/xfconf/xfconf.devhelp2
 %%NLS%%share/locale/ar/LC_MESSAGES/xfconf.mo
 %%NLS%%share/locale/ast/LC_MESSAGES/xfconf.mo
@@ -52,10 +51,11 @@ share/dbus-1/services/org.xfce.Xfconf.service
 %%NLS%%share/locale/ja/LC_MESSAGES/xfconf.mo
 %%NLS%%share/locale/kk/LC_MESSAGES/xfconf.mo
 %%NLS%%share/locale/ko/LC_MESSAGES/xfconf.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/xfconf.mo
 %%NLS%%share/locale/lv/LC_MESSAGES/xfconf.mo
-%%NLS%%share/locale/ms/LC_MESSAGES/xfconf.mo
 %%NLS%%share/locale/nb/LC_MESSAGES/xfconf.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/xfconf.mo
+%%NLS%%share/locale/nn/LC_MESSAGES/xfconf.mo
 %%NLS%%share/locale/pa/LC_MESSAGES/xfconf.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/xfconf.mo
 %%NLS%%share/locale/pt/LC_MESSAGES/xfconf.mo