update xfce to 4.6.2

bump PORTREVISION on all depending ports

13 files changed, 566 insertions, 227 deletions

diff --git a/x11-wm/xfce4-desktop/Makefile b/x11-wm/xfce4-desktop/Makefile
index db79981883e3..4872c51d5378 100644
--- a/x11-wm/xfce4-desktop/Makefile
+++ b/x11-wm/xfce4-desktop/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xfce4-desktop
-PORTVERSION=	4.6.1
-PORTREVISION=	5
+PORTVERSION=	4.6.2
 CATEGORIES=	x11-wm xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 DISTNAME=	xfdesktop-${PORTVERSION}
diff --git a/x11-wm/xfce4-desktop/distinfo b/x11-wm/xfce4-desktop/distinfo
index 96c172b633e3..88ebf94ef907 100644
--- a/x11-wm/xfce4-desktop/distinfo
+++ b/x11-wm/xfce4-desktop/distinfo
@@ -1,3 +1,3 @@
-MD5 (xfce4/xfdesktop-4.6.1.tar.bz2) = ae15cacc3e3834cca7238a8e1035c50d
-SHA256 (xfce4/xfdesktop-4.6.1.tar.bz2) = 22aa4a654798dcfa728a9c0056486f73ae87a51239950c8f85aedef488cd571a
-SIZE (xfce4/xfdesktop-4.6.1.tar.bz2) = 3671378
+MD5 (xfce4/xfdesktop-4.6.2.tar.bz2) = e800ea9fee7a5c5eaf2ae96e23a83e3a
+SHA256 (xfce4/xfdesktop-4.6.2.tar.bz2) = cd760f95486ba3f1c6d0179bb10a4c21c99c1d459dd8265823fed85f7376a3fb
+SIZE (xfce4/xfdesktop-4.6.2.tar.bz2) = 4480477
diff --git a/x11-wm/xfce4-desktop/pkg-plist b/x11-wm/xfce4-desktop/pkg-plist
index 6b45ed75bfaa..48122ae3608c 100644
--- a/x11-wm/xfce4-desktop/pkg-plist
+++ b/x11-wm/xfce4-desktop/pkg-plist
@@ -33,6 +33,12 @@ share/icons/hicolor/48x48/apps/xfce4-backdrop.png
 share/icons/hicolor/48x48/apps/xfce4-menueditor.png
 share/icons/hicolor/scalable/apps/xfce4-backdrop.svg
 share/icons/hicolor/scalable/apps/xfce4-menueditor.svg
+share/locale/ast/LC_MESSAGES/xfdesktop.mo
+share/locale/kk/LC_MESSAGES/xfdesktop.mo
+share/locale/nn/LC_MESSAGES/xfdesktop.mo
+share/locale/si/LC_MESSAGES/xfdesktop.mo
+share/locale/ug/LC_MESSAGES/xfdesktop.mo
+share/locale/ur_PK/LC_MESSAGES/xfdesktop.mo
 share/locale/am/LC_MESSAGES/xfdesktop.mo
 share/locale/ar/LC_MESSAGES/xfdesktop.mo
 share/locale/az/LC_MESSAGES/xfdesktop.mo
@@ -112,6 +118,22 @@ share/xfce4/doc/C/images/xfdesktop-behavior-tab.png
 share/xfce4/doc/C/images/xfdesktop-editor.png
 share/xfce4/doc/C/images/xfdesktop-list.png
 share/xfce4/doc/C/xfdesktop.html
+share/xfce4/doc/am/images/root_menu2.png
+share/xfce4/doc/am/images/root_menu.png
+share/xfce4/doc/am/images/select_bg_color.png
+share/xfce4/doc/am/images/xfdesktop-appearance-tab.png
+share/xfce4/doc/am/images/xfdesktop-behavior-tab.png
+share/xfce4/doc/am/images/xfdesktop-editor.png
+share/xfce4/doc/am/images/xfdesktop-list.png
+share/xfce4/doc/am/xfdesktop.html
+share/xfce4/doc/ca/images/root_menu2.png
+share/xfce4/doc/ca/images/root_menu.png
+share/xfce4/doc/ca/images/select_bg_color.png
+share/xfce4/doc/ca/images/xfdesktop-appearance-tab.png
+share/xfce4/doc/ca/images/xfdesktop-behavior-tab.png
+share/xfce4/doc/ca/images/xfdesktop-list.png
+share/xfce4/doc/ca/images/xfdesktop-editor.png
+share/xfce4/doc/ca/xfdesktop.html
 share/xfce4/doc/da/xfdesktop.html
 share/xfce4/doc/fr/images/root_menu2.png
 share/xfce4/doc/fr/images/root_menu.png
@@ -121,6 +143,15 @@ share/xfce4/doc/fr/images/xfdesktop-behavior-tab.png
 share/xfce4/doc/fr/images/xfdesktop-editor.png
 share/xfce4/doc/fr/images/xfdesktop-list.png
 share/xfce4/doc/fr/xfdesktop.html
+share/xfce4/doc/gl/images
+share/xfce4/doc/gl/images/root_menu2.png
+share/xfce4/doc/gl/images/root_menu.png
+share/xfce4/doc/gl/images/select_bg_color.png
+share/xfce4/doc/gl/images/xfdesktop-appearance-tab.png
+share/xfce4/doc/gl/images/xfdesktop-behavior-tab.png
+share/xfce4/doc/gl/images/xfdesktop-list.png
+share/xfce4/doc/gl/images/xfdesktop-editor.png
+share/xfce4/doc/gl/xfdesktop.html
 share/xfce4/doc/it/images/root_menu2.png
 share/xfce4/doc/it/images/root_menu.png
 share/xfce4/doc/it/images/select_bg_color.png
@@ -136,6 +167,14 @@ share/xfce4/doc/ja/images/xfdesktop-background-tab.png
 share/xfce4/doc/ja/images/xfdesktop-icons-tab.png
 share/xfce4/doc/ja/images/xfdesktop-menus-tab.png
 share/xfce4/doc/ja/xfdesktop.html
+share/xfce4/doc/ug/images/root_menu2.png
+share/xfce4/doc/ug/images/root_menu.png
+share/xfce4/doc/ug/images/select_bg_color.png
+share/xfce4/doc/ug/images/xfdesktop-appearance-tab.png
+share/xfce4/doc/ug/images/xfdesktop-behavior-tab.png
+share/xfce4/doc/ug/images/xfdesktop-editor.png
+share/xfce4/doc/ug/images/xfdesktop-list.png
+share/xfce4/doc/ug/xfdesktop.html
 @dirrmtry etc/xdg/menus
 @dirrmtry etc/xdg
 @dirrmtry etc/xfce4
@@ -150,6 +189,14 @@ share/xfce4/doc/ja/xfdesktop.html
 @dirrmtry share/locale/bn_IN
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
+@dirrmtry share/locale/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
+@dirrmtry share/locale/kk/LC_MESSAGES
+@dirrmtry share/locale/kk
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
+@dirrmtry share/locale/ur_PK/LC_MESSAGES
+@dirrmtry share/locale/ur_PK
 @dirrm share/xfce4/backdrops
 @dirrmtry share/xfce4/doc/C/images
 @dirrmtry share/xfce4/doc/C
@@ -160,6 +207,14 @@ share/xfce4/doc/ja/xfdesktop.html
 @dirrmtry share/xfce4/doc/it
 @dirrmtry share/xfce4/doc/ja/images
 @dirrmtry share/xfce4/doc/ja
+@dirrmtry share/xfce4/doc/am/images
+@dirrmtry share/xfce4/doc/am
+@dirrmtry share/xfce4/doc/ca/images
+@dirrmtry share/xfce4/doc/ca
+@dirrmtry share/xfce4/doc/gl/images
+@dirrmtry share/xfce4/doc/gl
+@dirrmtry share/xfce4/doc/ug/images
+@dirrmtry share/xfce4/doc/ug
 @dirrmtry share/xfce4/doc
 @dirrmtry share/xfce4/panel-plugins
 @dirrmtry share/xfce4
diff --git a/x11-wm/xfce4-panel/Makefile b/x11-wm/xfce4-panel/Makefile
index dfe602b3dc28..e2f8bff8b437 100644
--- a/x11-wm/xfce4-panel/Makefile
+++ b/x11-wm/xfce4-panel/Makefile
@@ -6,29 +6,36 @@
 #
 
 PORTNAME=	xfce4-panel
-PORTVERSION=	4.6.3
-PORTREVISION=	3
+PORTVERSION=	4.6.4
 CATEGORIES=	x11-wm xfce
-MASTER_SITES=	http://archive.xfce.org/src/xfce/xfce4-panel/4.6/
+MASTER_SITES=	${MASTER_SITE_XFCE}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	XFce 4 panel module
 
-LIB_DEPENDS=	wnck-1.22:${PORTSDIR}/x11-toolkits/libwnck
+LIB_DEPENDS=	wnck-1.22:${PORTSDIR}/x11-toolkits/libwnck \
+		cairo.2:${PORTSDIR}/graphics/cairo
 
 CONFLICTS=	xfce4-systray-*
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS= yes
+USE_AUTOTOOLS=	libtool:22
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnometarget gtk20 intltool intlhack pkgconfig
 USE_LDCONFIG=	yes
+USE_PERL5=	yes
 USE_XFCE=	configenv libexo libgui libutil
+USE_XORG=	x11 sm
+
+CONFIGURE_ARGS=	--enable-gtk-doc-html=no \
+		--disable-debug
 
 OPTIONS=	GTKDOC	"install the library documentation"	off \
-		STARTUP "Enable startup notification support"	on
+		STARTUP "Enable startup notification support"	on \
+		NLS	"Enable Native Language Support" 	on
 
 .include <bsd.port.pre.mk>
 
@@ -48,4 +55,16 @@ CONFIGURE_ARGS+=--enable-startup-notification
 CONFIGURE_ARGS+=--disable-startup-notification
 .endif
 
+.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:
+	@${REINPLACE_CMD} -e 's| manual||g' ${WRKSRC}/docs/Makefile.in
+
 .include <bsd.port.post.mk>
diff --git a/x11-wm/xfce4-panel/distinfo b/x11-wm/xfce4-panel/distinfo
index acf3ff7f392f..dd6ea9d6b296 100644
--- a/x11-wm/xfce4-panel/distinfo
+++ b/x11-wm/xfce4-panel/distinfo
@@ -1,3 +1,3 @@
-MD5 (xfce4/xfce4-panel-4.6.3.tar.bz2) = 0b715abb929220f136483ccd7303ff62
-SHA256 (xfce4/xfce4-panel-4.6.3.tar.bz2) = 4f5e19187ddf9f812303b77479124562079d25c6263674040aba4395c6b2e41c
-SIZE (xfce4/xfce4-panel-4.6.3.tar.bz2) = 902086
+MD5 (xfce4/xfce4-panel-4.6.4.tar.bz2) = 82f10a42aefca4cc26a6633e7478cc65
+SHA256 (xfce4/xfce4-panel-4.6.4.tar.bz2) = cc9b70bdc73ab80f46655a34cdbaf876a67cd90b50230cbf4d77a3106a5c54e7
+SIZE (xfce4/xfce4-panel-4.6.4.tar.bz2) = 902913
diff --git a/x11-wm/xfce4-panel/pkg-plist b/x11-wm/xfce4-panel/pkg-plist
index ada160113718..593bbe1b66f1 100644
--- a/x11-wm/xfce4-panel/pkg-plist
+++ b/x11-wm/xfce4-panel/pkg-plist
@@ -8,8 +8,8 @@ etc/xdg/xfce4/panel/launcher-9.rc
 etc/xdg/xfce4/panel/panels.xml
 etc/xdg/xfce4/panel/systray-4.rc
 etc/xdg/xfce4/panel/xfce4-menu-5.rc
-include/xfce4/libxfce4panel/libxfce4panel.h
 include/xfce4/libxfce4panel/libxfce4panel-enum-types.h
+include/xfce4/libxfce4panel/libxfce4panel.h
 include/xfce4/libxfce4panel/xfce-arrow-button.h
 include/xfce4/libxfce4panel/xfce-hvbox.h
 include/xfce4/libxfce4panel/xfce-itembar.h
@@ -21,31 +21,42 @@ include/xfce4/libxfce4panel/xfce-panel-macros.h
 include/xfce4/libxfce4panel/xfce-panel-plugin-iface.h
 include/xfce4/libxfce4panel/xfce-panel-plugin.h
 include/xfce4/libxfce4panel/xfce-panel-window.h
+lib/libxfce4panel.a
 lib/libxfce4panel.la
 lib/libxfce4panel.so
 lib/libxfce4panel.so.2
+lib/xfce4/panel-plugins/libactions.a
 lib/xfce4/panel-plugins/libactions.la
 lib/xfce4/panel-plugins/libactions.so
+lib/xfce4/panel-plugins/libclock.a
 lib/xfce4/panel-plugins/libclock.la
 lib/xfce4/panel-plugins/libclock.so
+lib/xfce4/panel-plugins/libiconbox.a
 lib/xfce4/panel-plugins/libiconbox.la
 lib/xfce4/panel-plugins/libiconbox.so
+lib/xfce4/panel-plugins/liblauncher.a
 lib/xfce4/panel-plugins/liblauncher.la
 lib/xfce4/panel-plugins/liblauncher.so
+lib/xfce4/panel-plugins/libpager.a
 lib/xfce4/panel-plugins/libpager.la
 lib/xfce4/panel-plugins/libpager.so
+lib/xfce4/panel-plugins/libseparator.a
 lib/xfce4/panel-plugins/libseparator.la
 lib/xfce4/panel-plugins/libseparator.so
+lib/xfce4/panel-plugins/libshowdesktop.a
 lib/xfce4/panel-plugins/libshowdesktop.la
 lib/xfce4/panel-plugins/libshowdesktop.so
+lib/xfce4/panel-plugins/libsystray.a
 lib/xfce4/panel-plugins/libsystray.la
 lib/xfce4/panel-plugins/libsystray.so
+lib/xfce4/panel-plugins/libtasklist.a
 lib/xfce4/panel-plugins/libtasklist.la
 lib/xfce4/panel-plugins/libtasklist.so
+lib/xfce4/panel-plugins/libwindowlist.a
 lib/xfce4/panel-plugins/libwindowlist.la
 lib/xfce4/panel-plugins/libwindowlist.so
 libdata/pkgconfig/libxfce4panel-1.0.pc
-share/applications/xfce4-panel-manager.desktop
+%%NLS%%share/applications/xfce4-panel-manager.desktop
 share/gtk-doc/html/libxfce4panel/XfceArrowButton.html
 share/gtk-doc/html/libxfce4panel/XfceExternalPanelPlugin.html
 share/gtk-doc/html/libxfce4panel/XfceHVBox.html
@@ -71,9 +82,9 @@ share/gtk-doc/html/libxfce4panel/libxfce4panel.devhelp2
 share/gtk-doc/html/libxfce4panel/right.png
 share/gtk-doc/html/libxfce4panel/style.css
 share/gtk-doc/html/libxfce4panel/up.png
-share/icons/hicolor/16x16/apps/xfce4-panel.png
 share/icons/hicolor/16x16/apps/xfce-system-exit.png
 share/icons/hicolor/16x16/apps/xfce-system-lock.png
+share/icons/hicolor/16x16/apps/xfce4-panel.png
 share/icons/hicolor/22x22/apps/xfce4-panel.png
 share/icons/hicolor/24x24/apps/xfce4-panel.png
 share/icons/hicolor/32x32/apps/xfce4-panel.png
@@ -84,74 +95,68 @@ share/icons/hicolor/48x48/apps/xfce4-panel.png
 share/icons/hicolor/48x48/apps/xfce4-separator.png
 share/icons/hicolor/48x48/apps/xfce4-systray.png
 share/icons/hicolor/48x48/apps/xfce4-taskbar.png
-share/locale/am/LC_MESSAGES/xfce4-panel.mo
-share/locale/ar/LC_MESSAGES/xfce4-panel.mo
-share/locale/ast/LC_MESSAGES/xfce4-panel.mo
-share/locale/az/LC_MESSAGES/xfce4-panel.mo
-share/locale/be/LC_MESSAGES/xfce4-panel.mo
-share/locale/bg/LC_MESSAGES/xfce4-panel.mo
-share/locale/bn_IN/LC_MESSAGES/xfce4-panel.mo
-share/locale/ca/LC_MESSAGES/xfce4-panel.mo
-share/locale/cs/LC_MESSAGES/xfce4-panel.mo
-share/locale/da/LC_MESSAGES/xfce4-panel.mo
-share/locale/de/LC_MESSAGES/xfce4-panel.mo
-share/locale/dz/LC_MESSAGES/xfce4-panel.mo
-share/locale/el/LC_MESSAGES/xfce4-panel.mo
-share/locale/en_GB/LC_MESSAGES/xfce4-panel.mo
-share/locale/eo/LC_MESSAGES/xfce4-panel.mo
-share/locale/es/LC_MESSAGES/xfce4-panel.mo
-share/locale/es_MX/LC_MESSAGES/xfce4-panel.mo
-share/locale/et/LC_MESSAGES/xfce4-panel.mo
-share/locale/eu/LC_MESSAGES/xfce4-panel.mo
-share/locale/fa/LC_MESSAGES/xfce4-panel.mo
-share/locale/fi/LC_MESSAGES/xfce4-panel.mo
-share/locale/fr/LC_MESSAGES/xfce4-panel.mo
-share/locale/gl/LC_MESSAGES/xfce4-panel.mo
-share/locale/gu/LC_MESSAGES/xfce4-panel.mo
-share/locale/he/LC_MESSAGES/xfce4-panel.mo
-share/locale/hi/LC_MESSAGES/xfce4-panel.mo
-share/locale/hu/LC_MESSAGES/xfce4-panel.mo
-share/locale/hy/LC_MESSAGES/xfce4-panel.mo
-share/locale/id/LC_MESSAGES/xfce4-panel.mo
-share/locale/it/LC_MESSAGES/xfce4-panel.mo
-share/locale/ja/LC_MESSAGES/xfce4-panel.mo
-share/locale/ka/LC_MESSAGES/xfce4-panel.mo
-share/locale/kk/LC_MESSAGES/xfce4-panel.mo
-share/locale/ko/LC_MESSAGES/xfce4-panel.mo
-share/locale/ku/LC_MESSAGES/xfce4-panel.mo
-share/locale/lt/LC_MESSAGES/xfce4-panel.mo
-share/locale/lv/LC_MESSAGES/xfce4-panel.mo
-share/locale/mk/LC_MESSAGES/xfce4-panel.mo
-share/locale/mr/LC_MESSAGES/xfce4-panel.mo
-share/locale/ms/LC_MESSAGES/xfce4-panel.mo
-share/locale/nb/LC_MESSAGES/xfce4-panel.mo
-share/locale/nl/LC_MESSAGES/xfce4-panel.mo
-share/locale/nn/LC_MESSAGES/xfce4-panel.mo
-share/locale/pa/LC_MESSAGES/xfce4-panel.mo
-share/locale/pl/LC_MESSAGES/xfce4-panel.mo
-share/locale/pt_BR/LC_MESSAGES/xfce4-panel.mo
-share/locale/pt/LC_MESSAGES/xfce4-panel.mo
-share/locale/ro/LC_MESSAGES/xfce4-panel.mo
-share/locale/ru/LC_MESSAGES/xfce4-panel.mo
-share/locale/si/LC_MESSAGES/xfce4-panel.mo
-share/locale/sk/LC_MESSAGES/xfce4-panel.mo
-share/locale/sq/LC_MESSAGES/xfce4-panel.mo
-share/locale/sv/LC_MESSAGES/xfce4-panel.mo
-share/locale/ta/LC_MESSAGES/xfce4-panel.mo
-share/locale/tr/LC_MESSAGES/xfce4-panel.mo
-share/locale/uk/LC_MESSAGES/xfce4-panel.mo
-share/locale/ur/LC_MESSAGES/xfce4-panel.mo
-share/locale/ur_PK/LC_MESSAGES/xfce4-panel.mo
-share/locale/vi/LC_MESSAGES/xfce4-panel.mo
-share/locale/zh_CN/LC_MESSAGES/xfce4-panel.mo
-share/locale/zh_TW/LC_MESSAGES/xfce4-panel.mo
-share/xfce4/doc/C/images/default_top_panel.png
-share/xfce4/doc/C/images/default_bottom_panel.png
-share/xfce4/doc/C/images/item_popup.png
-share/xfce4/doc/C/images/add_item_dialog.png
-share/xfce4/doc/C/images/launcher_properties.png
-share/xfce4/doc/C/images/panel_manager.png
-share/xfce4/doc/C/xfce4-panel.html
+%%NLS%%share/locale/am/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/ar/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/ast/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/az/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/be/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/bg/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/bn_IN/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/da/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/de/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/dz/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/el/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/eo/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/es/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/es_MX/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/et/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/eu/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/fa/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/gu/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/he/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/hi/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/hy/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/id/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/it/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/ka/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/kk/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/ku/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/lv/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/mk/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/mr/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/ms/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/nb/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/nn/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/pa/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/si/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/sq/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/ta/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/ug/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/ur/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/ur_PK/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/xfce4-panel.mo
 share/xfce4/panel-plugins/actions.desktop
 share/xfce4/panel-plugins/clock.desktop
 share/xfce4/panel-plugins/iconbox.desktop
@@ -162,35 +167,148 @@ share/xfce4/panel-plugins/showdesktop.desktop
 share/xfce4/panel-plugins/systray.desktop
 share/xfce4/panel-plugins/tasklist.desktop
 share/xfce4/panel-plugins/windowlist.desktop
-@dirrm etc/xdg/xfce4/panel
-@dirrmtry etc/xdg/xfce4
-@dirrmtry etc/xdg
-@dirrm include/xfce4/libxfce4panel
-@dirrmtry include/xfce4
-@dirrmtry lib/xfce4/mcs-plugins
-@dirrmtry lib/xfce4/panel-plugins
-@dirrmtry lib/xfce4
-@dirrm share/gtk-doc/html/libxfce4panel
-@dirrmtry share/gtk-doc/html
-@dirrmtry share/gtk-doc
-@dirrmtry share/locale/ast/LC_MESSAGES
-@dirrmtry share/locale/ast
-@dirrmtry share/locale/bn_IN/LC_MESSAGES
-@dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/kk/LC_MESSAGES
-@dirrmtry share/locale/kk
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrmtry share/locale/ur/LC_MESSAGES
-@dirrmtry share/locale/ur
-@dirrmtry share/locale/ur_PK/LC_MESSAGES
-@dirrmtry share/locale/ur_PK
-@dirrmtry share/xfce4/doc/C/images
-@dirrmtry share/xfce4/doc/C
-@dirrmtry share/xfce4/doc
 @dirrmtry share/xfce4/panel-plugins
 @dirrmtry share/xfce4
-@dirrmtry share/locale/hy/LC_MESSAGES
-@dirrmtry share/locale/hy
+%%NLS%%@dirrmtry share/applications
+%%NLS%%@dirrmtry share/locale/zh_TW/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/zh_TW
+%%NLS%%@dirrmtry share/locale/zh_CN/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/zh_CN
+%%NLS%%@dirrmtry share/locale/vi/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/vi
+%%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/uk/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/uk
+%%NLS%%@dirrmtry share/locale/ug/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ug
+%%NLS%%@dirrmtry share/locale/tr/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/tr
+%%NLS%%@dirrmtry share/locale/ta/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ta
+%%NLS%%@dirrmtry share/locale/sv/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/sv
+%%NLS%%@dirrmtry share/locale/sq/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/sq
+%%NLS%%@dirrmtry share/locale/sk/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/sk
+%%NLS%%@dirrmtry share/locale/si/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/si
+%%NLS%%@dirrmtry share/locale/ru/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ru
+%%NLS%%@dirrmtry share/locale/ro/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ro
+%%NLS%%@dirrmtry share/locale/pt_BR/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/pt_BR
+%%NLS%%@dirrmtry share/locale/pt/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/pt
+%%NLS%%@dirrmtry share/locale/pl/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/pl
+%%NLS%%@dirrmtry share/locale/pa/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/pa
+%%NLS%%@dirrmtry share/locale/nn/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/nn
+%%NLS%%@dirrmtry share/locale/nl/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/nl
+%%NLS%%@dirrmtry share/locale/nb/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/nb
+%%NLS%%@dirrmtry share/locale/ms/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ms
+%%NLS%%@dirrmtry share/locale/mr/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/mr
+%%NLS%%@dirrmtry share/locale/mk/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/mk
+%%NLS%%@dirrmtry share/locale/lv/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/lv
+%%NLS%%@dirrmtry share/locale/lt/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/lt
+%%NLS%%@dirrmtry share/locale/ku/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ku
+%%NLS%%@dirrmtry share/locale/ko/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ko
+%%NLS%%@dirrmtry share/locale/kk/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/kk
+%%NLS%%@dirrmtry share/locale/ka/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ka
+%%NLS%%@dirrmtry share/locale/ja/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ja
+%%NLS%%@dirrmtry share/locale/it/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/it
+%%NLS%%@dirrmtry share/locale/id/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/id
+%%NLS%%@dirrmtry share/locale/hy/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/hy
+%%NLS%%@dirrmtry share/locale/hu/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/hu
+%%NLS%%@dirrmtry share/locale/hi/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/hi
+%%NLS%%@dirrmtry share/locale/he/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/he
+%%NLS%%@dirrmtry share/locale/gu/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/gu
+%%NLS%%@dirrmtry share/locale/gl/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/gl
+%%NLS%%@dirrmtry share/locale/fr/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/fr
+%%NLS%%@dirrmtry share/locale/fi/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/fi
+%%NLS%%@dirrmtry share/locale/fa/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/fa
+%%NLS%%@dirrmtry share/locale/eu/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/eu
+%%NLS%%@dirrmtry share/locale/et/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/et
+%%NLS%%@dirrmtry share/locale/es/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/es
+%%NLS%%@dirrmtry share/locale/eo/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/eo
+%%NLS%%@dirrmtry share/locale/en_GB/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/en_GB
+%%NLS%%@dirrmtry share/locale/el/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/el
+%%NLS%%@dirrmtry share/locale/dz/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/dz
+%%NLS%%@dirrmtry share/locale/de/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/de
+%%NLS%%@dirrmtry share/locale/da/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/da
+%%NLS%%@dirrmtry share/locale/cs/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/cs
+%%NLS%%@dirrmtry share/locale/ca/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ca
+%%NLS%%@dirrmtry share/locale/bn_IN/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/bn_IN
+%%NLS%%@dirrmtry share/locale/bg/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/bg
+%%NLS%%@dirrmtry share/locale/be/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/be
+%%NLS%%@dirrmtry share/locale/az/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/az
+%%NLS%%@dirrmtry share/locale/ast/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ast
+%%NLS%%@dirrmtry share/locale/ar/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ar
+%%NLS%%@dirrmtry share/locale/am/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/am
+@dirrmtry share/icons/hicolor/48x48/apps
+@dirrmtry share/icons/hicolor/48x48
+@dirrmtry share/icons/hicolor/32x32/apps
+@dirrmtry share/icons/hicolor/32x32
+@dirrmtry share/icons/hicolor/24x24/apps
+@dirrmtry share/icons/hicolor/24x24
+@dirrmtry share/icons/hicolor/22x22/apps
+@dirrmtry share/icons/hicolor/22x22
 @dirrmtry share/icons/hicolor/16x16/apps
 @dirrmtry share/icons/hicolor/16x16
+@dirrm share/gtk-doc/html/libxfce4panel
+@dirrmtry share/gtk-doc/html
+@dirrmtry share/gtk-doc
+@dirrmtry lib/xfce4/panel-plugins
+@dirrmtry lib/xfce4
+@dirrm include/xfce4/libxfce4panel
+@dirrmtry include/xfce4
+@dirrmtry etc/xdg/xfce4/panel
+@dirrmtry etc/xdg/xfce4
+@dirrmtry etc/xdg
diff --git a/x11-wm/xfce4-session/Makefile b/x11-wm/xfce4-session/Makefile
index 9d14c60db74d..cdbada0d6d8b 100644
--- a/x11-wm/xfce4-session/Makefile
+++ b/x11-wm/xfce4-session/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xfce4-session
-PORTVERSION=	4.6.1
-PORTREVISION=	5
+PORTVERSION=	4.6.2
 CATEGORIES=	x11-wm xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 DIST_SUBDIR=	xfce4
@@ -20,10 +19,10 @@ RUN_DEPENDS=	iceauth:${PORTSDIR}/x11/iceauth
 LIB_DEPENDS=	wnck-1.22:${PORTSDIR}/x11-toolkits/libwnck \
 		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
 
+USE_AUTOTOOLS=	libtool:22
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnometarget gtk20 intltool intlhack pkgconfig
 USE_LDCONFIG=	yes
@@ -32,4 +31,15 @@ USE_XORG=	x11 sm ice
 
 MAN1=		xfce4-session.1 xfce4-session-logout.1
 
+PLIST_SUB=	VERSION="${PORTVERSION:R}"
+
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT=	yes
+CONFIGURE_ARGS+=	--enable-nls
+PLIST_SUB+=	NLS=""
+.else
+CONFIGURE_ARGS+=	--disable-nls
+PLIST_SUB+=	NLS="@comment "
+.endif
+
 .include <bsd.port.mk>
diff --git a/x11-wm/xfce4-session/distinfo b/x11-wm/xfce4-session/distinfo
index efeecc67be00..c691973f2dfb 100644
--- a/x11-wm/xfce4-session/distinfo
+++ b/x11-wm/xfce4-session/distinfo
@@ -1,3 +1,3 @@
-MD5 (xfce4/xfce4-session-4.6.1.tar.bz2) = 7628be41ed3511a20cff5673d9d39858
-SHA256 (xfce4/xfce4-session-4.6.1.tar.bz2) = feed3f9053b83233697223a20f95ca0ad6efe9fedffcc098e4935a425e8f9f0e
-SIZE (xfce4/xfce4-session-4.6.1.tar.bz2) = 1365247
+MD5 (xfce4/xfce4-session-4.6.2.tar.bz2) = 9d9890130e45e0e9476591ed9ba2c9d5
+SHA256 (xfce4/xfce4-session-4.6.2.tar.bz2) = 725e269254c34c530acb670f5ccd0fd69b57cbe9f2176abd8499fc5d6dcd30a8
+SIZE (xfce4/xfce4-session-4.6.2.tar.bz2) = 1385541
diff --git a/x11-wm/xfce4-session/files/patch-Makefile.in b/x11-wm/xfce4-session/files/patch-Makefile.in
new file mode 100644
index 000000000000..21f5163ddacc
--- /dev/null
+++ b/x11-wm/xfce4-session/files/patch-Makefile.in
@@ -0,0 +1,28 @@
+--- Makefile.in.orig	2010-05-21 18:58:41.000000000 +0200
++++ Makefile.in	2010-05-24 12:01:05.000000000 +0200
+@@ -293,7 +293,6 @@
+ top_srcdir = @top_srcdir@
+ SUBDIRS = \
+ 	libxfsm								\
+-	doc								\
+ 	engines								\
+ 	icons								\
+ 	po								\
+@@ -809,7 +808,7 @@
+ 	dist-gzip dist-hook dist-lzma dist-shar dist-tarZ dist-xz \
+ 	dist-zip distcheck distclean distclean-generic distclean-hdr \
+ 	distclean-libtool distclean-local distclean-tags \
+-	distcleancheck distdir distuninstallcheck dvi dvi-am html \
++	distcleancheck distdir distuninstallcheck dvi dvi-am \
+ 	html-am info info-am install install-am install-data \
+ 	install-data-am install-dvi install-dvi-am install-exec \
+ 	install-exec-am install-html install-html-am install-info \
+@@ -821,8 +820,6 @@
+ 	uninstall uninstall-am
+ 
+ 
+-html:
+-	(cd doc && $(MAKE) $(AM_MAKEFLAGS) html)
+ 
+ distclean-local:
+ 	rm -rf xfce4-session.spec *.cache *~
diff --git a/x11-wm/xfce4-session/pkg-plist b/x11-wm/xfce4-session/pkg-plist
index fd071eed978a..948b8737b0d6 100644
--- a/x11-wm/xfce4-session/pkg-plist
+++ b/x11-wm/xfce4-session/pkg-plist
@@ -4,12 +4,12 @@ bin/xfce4-session-settings
 bin/xfce4-tips
 etc/xdg/autostart/xfce4-tips-autostart.desktop
 etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
-include/xfce4/xfce4-session-4.6/libxfsm/xfsm-splash-engine.h
-include/xfce4/xfce4-session-4.6/libxfsm/xfsm-splash-rc.h
-lib/libxfsm-4.6.a
-lib/libxfsm-4.6.la
-lib/libxfsm-4.6.so
-lib/libxfsm-4.6.so.0
+include/xfce4/xfce4-session-%%VERSION%%/libxfsm/xfsm-splash-engine.h
+include/xfce4/xfce4-session-%%VERSION%%/libxfsm/xfsm-splash-rc.h
+lib/libxfsm-%%VERSION%%.a
+lib/libxfsm-%%VERSION%%.la
+lib/libxfsm-%%VERSION%%.so
+lib/libxfsm-%%VERSION%%.so.0
 lib/xfce4/splash/engines/libbalou.a
 lib/xfce4/splash/engines/libbalou.la
 lib/xfce4/splash/engines/libbalou.so
@@ -23,12 +23,14 @@ libdata/pkgconfig/xfce4-session-2.0.pc
 libexec/balou-export-theme
 libexec/balou-install-theme
 libexec/xfsm-shutdown-helper
-share/applications/xfce-session-settings.desktop
+%%NLS%%share/applications/xfce-session-settings.desktop
 share/icons/hicolor/128x128/apps/xfce4-session.png
 share/icons/hicolor/48x48/apps/xfce4-autostart-editor.png
 share/icons/hicolor/48x48/apps/xfce4-session.png
 share/icons/hicolor/48x48/apps/xfce4-splash.png
 share/icons/hicolor/48x48/apps/xfsm-hibernate.png
+share/icons/hicolor/48x48/apps/xfsm-logout.png
+share/icons/hicolor/48x48/apps/xfsm-reboot.png
 share/icons/hicolor/48x48/apps/xfsm-shutdown.png
 share/icons/hicolor/48x48/apps/xfsm-suspend.png
 share/icons/hicolor/64x64/apps/xfsm-gnome-kde-logo.png
@@ -36,109 +38,206 @@ share/icons/hicolor/72x72/apps/xfsm-trash-hilight.png
 share/icons/hicolor/72x72/apps/xfsm-trash-normal.png
 share/icons/hicolor/scalable/apps/xfce4-session.svg
 share/icons/hicolor/scalable/apps/xfsm-shutdown.svg
-share/locale/am/LC_MESSAGES/xfce4-session.mo
-share/locale/ar/LC_MESSAGES/xfce4-session.mo
-share/locale/az/LC_MESSAGES/xfce4-session.mo
-share/locale/be/LC_MESSAGES/xfce4-session.mo
-share/locale/bn_IN/LC_MESSAGES/xfce4-session.mo
-share/locale/ca/LC_MESSAGES/xfce4-session.mo
-share/locale/cs/LC_MESSAGES/xfce4-session.mo
-share/locale/da/LC_MESSAGES/xfce4-session.mo
-share/locale/de/LC_MESSAGES/xfce4-session.mo
-share/locale/dz/LC_MESSAGES/xfce4-session.mo
-share/locale/el/LC_MESSAGES/xfce4-session.mo
-share/locale/en_GB/LC_MESSAGES/xfce4-session.mo
-share/locale/eo/LC_MESSAGES/xfce4-session.mo
-share/locale/es/LC_MESSAGES/xfce4-session.mo
-share/locale/es_MX/LC_MESSAGES/xfce4-session.mo
-share/locale/et/LC_MESSAGES/xfce4-session.mo
-share/locale/eu/LC_MESSAGES/xfce4-session.mo
-share/locale/fa/LC_MESSAGES/xfce4-session.mo
-share/locale/fi/LC_MESSAGES/xfce4-session.mo
-share/locale/fr/LC_MESSAGES/xfce4-session.mo
-share/locale/gl/LC_MESSAGES/xfce4-session.mo
-share/locale/gu/LC_MESSAGES/xfce4-session.mo
-share/locale/he/LC_MESSAGES/xfce4-session.mo
-share/locale/hi/LC_MESSAGES/xfce4-session.mo
-share/locale/hu/LC_MESSAGES/xfce4-session.mo
-share/locale/id/LC_MESSAGES/xfce4-session.mo
-share/locale/it/LC_MESSAGES/xfce4-session.mo
-share/locale/ja/LC_MESSAGES/xfce4-session.mo
-share/locale/ka/LC_MESSAGES/xfce4-session.mo
-share/locale/ko/LC_MESSAGES/xfce4-session.mo
-share/locale/lt/LC_MESSAGES/xfce4-session.mo
-share/locale/lv/LC_MESSAGES/xfce4-session.mo
-share/locale/mk/LC_MESSAGES/xfce4-session.mo
-share/locale/mr/LC_MESSAGES/xfce4-session.mo
-share/locale/ms/LC_MESSAGES/xfce4-session.mo
-share/locale/nb/LC_MESSAGES/xfce4-session.mo
-share/locale/nl/LC_MESSAGES/xfce4-session.mo
-share/locale/pa/LC_MESSAGES/xfce4-session.mo
-share/locale/pl/LC_MESSAGES/xfce4-session.mo
-share/locale/pt_BR/LC_MESSAGES/xfce4-session.mo
-share/locale/pt/LC_MESSAGES/xfce4-session.mo
-share/locale/ro/LC_MESSAGES/xfce4-session.mo
-share/locale/ru/LC_MESSAGES/xfce4-session.mo
-share/locale/si/LC_MESSAGES/xfce4-session.mo
-share/locale/sk/LC_MESSAGES/xfce4-session.mo
-share/locale/sq/LC_MESSAGES/xfce4-session.mo
-share/locale/sv/LC_MESSAGES/xfce4-session.mo
-share/locale/ta/LC_MESSAGES/xfce4-session.mo
-share/locale/tr/LC_MESSAGES/xfce4-session.mo
-share/locale/uk/LC_MESSAGES/xfce4-session.mo
-share/locale/ur/LC_MESSAGES/xfce4-session.mo
-share/locale/vi/LC_MESSAGES/xfce4-session.mo
-share/locale/zh_CN/LC_MESSAGES/xfce4-session.mo
-share/locale/zh_TW/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/am/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/ar/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/ast/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/az/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/be/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/bn_IN/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/da/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/de/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/dz/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/el/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/eo/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/es/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/es_MX/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/et/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/eu/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/fa/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/gu/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/he/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/hi/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/id/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/it/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/ka/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/kk/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/lv/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/mk/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/mr/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/ms/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/nb/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/pa/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/si/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/sq/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/ta/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/ug/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/ur/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/ur_PK/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/xfce4-session.mo
 share/themes/Default/balou/logo.png
 share/themes/Default/balou/themerc
-share/xfce4/doc/C/images/xfsm-advanced.png
-share/xfce4/doc/C/images/xfsm-general.png
-share/xfce4/doc/C/images/xfsm-splash.png
-share/xfce4/doc/C/xfce4-session.html
-share/xfce4/doc/fr/images/xfsm-advanced.png
-share/xfce4/doc/fr/images/xfsm-general.png
-share/xfce4/doc/fr/images/xfsm-splash.png
-share/xfce4/doc/fr/xfce4-session.html
 share/xfce4/tips/tips
 share/xfce4/tips/tips.dat
-share/icons/hicolor/48x48/apps/xfsm-logout.png
-share/icons/hicolor/48x48/apps/xfsm-reboot.png
-@dirrm etc/xdg/autostart
-@dirrmtry etc/xdg/xfce4/xfconf/xfce-perchannel-xml
-@dirrmtry etc/xdg/xfce4/xfconf
-@dirrmtry etc/xdg/xfce4
-@dirrmtry etc/xdg
-@dirrm include/xfce4/xfce4-session-4.6/libxfsm
-@dirrm include/xfce4/xfce4-session-4.6
-@dirrmtry include/xfce4
-@dirrmtry share/applications
-@dirrmtry share/icons/hicolor/48x48/apps
-@dirrmtry share/icons/hicolor/48x48
-@dirrmtry share/icons/hicolor
-@dirrmtry share/icons
-@dirrmtry share/locale/bn_IN/LC_MESSAGES
-@dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrm share/themes/Default/balou
-@dirrmtry share/themes/Default
-@dirrmtry share/themes
-@dirrmtry share/xfce4/doc/C/images
-@dirrmtry share/xfce4/doc/C
-@dirrmtry share/xfce4/doc/fr/images
-@dirrmtry share/xfce4/doc/fr
-@dirrmtry share/xfce4/doc
-@dirrmtry share/xfce4/tips
+@dirrm share/xfce4/tips
 @dirrmtry share/xfce4
-@dirrmtry lib/xfce4/splash/engines
-@dirrmtry lib/xfce4/splash
-@dirrmtry lib/xfce4
-@dirrmtry share/icons/hicolor/64x64/apps
-@dirrmtry share/icons/hicolor/64x64
+@dirrm share/themes/Default/balou
+@dirrm share/themes/Default
+@dirrm share/themes
+%%NLS%%@dirrmtry share/applications
+%%NLS%%@dirrmtry share/locale/zh_TW/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/zh_TW
+%%NLS%%@dirrmtry share/locale/zh_CN/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/zh_CN
+%%NLS%%@dirrmtry share/locale/vi/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/vi
+%%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/uk/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/uk
+%%NLS%%@dirrmtry share/locale/ug/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ug
+%%NLS%%@dirrmtry share/locale/tr/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/tr
+%%NLS%%@dirrmtry share/locale/ta/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ta
+%%NLS%%@dirrmtry share/locale/sv/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/sv
+%%NLS%%@dirrmtry share/locale/sq/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/sq
+%%NLS%%@dirrmtry share/locale/sk/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/sk
+%%NLS%%@dirrmtry share/locale/si/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/si
+%%NLS%%@dirrmtry share/locale/ru/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ru
+%%NLS%%@dirrmtry share/locale/ro/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ro
+%%NLS%%@dirrmtry share/locale/pt_BR/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/pt_BR
+%%NLS%%@dirrmtry share/locale/pt/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/pt
+%%NLS%%@dirrmtry share/locale/pl/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/pl
+%%NLS%%@dirrmtry share/locale/pa/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/pa
+%%NLS%%@dirrmtry share/locale/nl/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/nl
+%%NLS%%@dirrmtry share/locale/nb/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/nb
+%%NLS%%@dirrmtry share/locale/ms/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ms
+%%NLS%%@dirrmtry share/locale/mr/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/mr
+%%NLS%%@dirrmtry share/locale/mk/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/mk
+%%NLS%%@dirrmtry share/locale/lv/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/lv
+%%NLS%%@dirrmtry share/locale/lt/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/lt
+%%NLS%%@dirrmtry share/locale/ko/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ko
+%%NLS%%@dirrmtry share/locale/kk/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/kk
+%%NLS%%@dirrmtry share/locale/ka/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ka
+%%NLS%%@dirrmtry share/locale/ja/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ja
+%%NLS%%@dirrmtry share/locale/it/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/it
+%%NLS%%@dirrmtry share/locale/id/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/id
+%%NLS%%@dirrmtry share/locale/hu/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/hu
+%%NLS%%@dirrmtry share/locale/hi/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/hi
+%%NLS%%@dirrmtry share/locale/he/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/he
+%%NLS%%@dirrmtry share/locale/gu/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/gu
+%%NLS%%@dirrmtry share/locale/gl/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/gl
+%%NLS%%@dirrmtry share/locale/fr/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/fr
+%%NLS%%@dirrmtry share/locale/fi/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/fi
+%%NLS%%@dirrmtry share/locale/fa/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/fa
+%%NLS%%@dirrmtry share/locale/eu/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/eu
+%%NLS%%@dirrmtry share/locale/et/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/et
+%%NLS%%@dirrmtry share/locale/es/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/es
+%%NLS%%@dirrmtry share/locale/eo/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/eo
+%%NLS%%@dirrmtry share/locale/en_GB/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/en_GB
+%%NLS%%@dirrmtry share/locale/el/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/el
+%%NLS%%@dirrmtry share/locale/dz/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/dz
+%%NLS%%@dirrmtry share/locale/de/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/de
+%%NLS%%@dirrmtry share/locale/da/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/da
+%%NLS%%@dirrmtry share/locale/cs/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/cs
+%%NLS%%@dirrmtry share/locale/ca/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ca
+%%NLS%%@dirrmtry share/locale/bn_IN/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/bn_IN
+%%NLS%%@dirrmtry share/locale/be/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/be
+%%NLS%%@dirrmtry share/locale/az/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/az
+%%NLS%%@dirrmtry share/locale/ast/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ast
+%%NLS%%@dirrmtry share/locale/ar/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ar
+%%NLS%%@dirrmtry share/locale/am/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/am
+@dirrmtry share/icons/hicolor/scalable/apps
+@dirrmtry share/icons/hicolor/scalable
 @dirrmtry share/icons/hicolor/72x72/apps
 @dirrmtry share/icons/hicolor/72x72
+@dirrmtry share/icons/hicolor/64x64/apps
+@dirrmtry share/icons/hicolor/64x64
+@dirrmtry share/icons/hicolor/48x48/apps
+@dirrmtry share/icons/hicolor/48x48
 @dirrmtry share/icons/hicolor/128x128/apps
 @dirrmtry share/icons/hicolor/128x128
-@dirrmtry share/icons/hicolor/scalable/apps
-@dirrmtry share/icons/hicolor/scalable
+@dirrm lib/xfce4/splash/engines
+@dirrm lib/xfce4/splash
+@dirrm lib/xfce4
+@dirrm include/xfce4/xfce4-session-%%VERSION%%/libxfsm
+@dirrm include/xfce4/xfce4-session-%%VERSION%%
+@dirrmtry include/xfce4
+@dirrmtry etc/xdg/xfce4/xfconf/xfce-perchannel-xml
+@dirrmtry etc/xdg/xfce4/xfconf
+@dirrmtry etc/xdg/xfce4
+@dirrmtry etc/xdg/autostart
+@dirrmtry etc/xdg
diff --git a/x11-wm/xfce4-wm/Makefile b/x11-wm/xfce4-wm/Makefile
index e511a41dd709..abcdf6fa55c2 100644
--- a/x11-wm/xfce4-wm/Makefile
+++ b/x11-wm/xfce4-wm/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xfce4-wm
-PORTVERSION=	4.6.1
-PORTREVISION=	5
+PORTVERSION=	4.6.2
 CATEGORIES=	x11-wm xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 DISTNAME=	xfwm4-${PORTVERSION}
diff --git a/x11-wm/xfce4-wm/distinfo b/x11-wm/xfce4-wm/distinfo
index 478e1a54b7ac..af941d84a251 100644
--- a/x11-wm/xfce4-wm/distinfo
+++ b/x11-wm/xfce4-wm/distinfo
@@ -1,3 +1,3 @@
-MD5 (xfce4/xfwm4-4.6.1.tar.bz2) = 538ff2554a23bf877d336e573884da9a
-SHA256 (xfce4/xfwm4-4.6.1.tar.bz2) = 0a808d19a7ddf1f5271d0b7009a5d0dc919562a85afab4071df060f51e9ee9ed
-SIZE (xfce4/xfwm4-4.6.1.tar.bz2) = 1765862
+MD5 (xfce4/xfwm4-4.6.2.tar.bz2) = 3e6c0c54b028b6ea60e865e55ecdf3f8
+SHA256 (xfce4/xfwm4-4.6.2.tar.bz2) = 212819ee03c24635f79d50930284c422469e22489952d0b286e6fe5af2155828
+SIZE (xfce4/xfwm4-4.6.2.tar.bz2) = 1849923
diff --git a/x11-wm/xfce4-wm/pkg-plist b/x11-wm/xfce4-wm/pkg-plist
index 3ee33e421718..510e97efcdb9 100644
--- a/x11-wm/xfce4-wm/pkg-plist
+++ b/x11-wm/xfce4-wm/pkg-plist
@@ -12,6 +12,10 @@ share/icons/hicolor/48x48/apps/xfwm4.png
 share/icons/hicolor/scalable/apps/wmtweaks.svg
 share/icons/hicolor/scalable/apps/xfce4-workspaces.svg
 share/icons/hicolor/scalable/apps/xfwm4.svg
+share/locale/ast/LC_MESSAGES/xfwm4.mo
+share/locale/kk/LC_MESSAGES/xfwm4.mo
+share/locale/ug/LC_MESSAGES/xfwm4.mo
+share/locale/ur_PK/LC_MESSAGES/xfwm4.mo
 share/locale/am/LC_MESSAGES/xfwm4.mo
 share/locale/ar/LC_MESSAGES/xfwm4.mo
 share/locale/az/LC_MESSAGES/xfwm4.mo
@@ -1339,6 +1343,14 @@ share/xfwm4/defaults
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/nb_NO/LC_MESSAGES
 @dirrmtry share/locale/nb_NO
+@dirrmtry share/locale/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
+@dirrmtry share/locale/kk/LC_MESSAGES
+@dirrmtry share/locale/kk
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
+@dirrmtry share/locale/ur_PK/LC_MESSAGES
+@dirrmtry share/locale/ur_PK
 @dirrmtry share/xfce4/doc/C/images
 @dirrmtry share/xfce4/doc/C
 @dirrmtry share/xfce4/doc/fr/images