3 files changed, 27 insertions, 25 deletions

diff --git a/x11-wm/xfce4-session/Makefile b/x11-wm/xfce4-session/Makefile
index 95080790bf86..84cf6fc4ab30 100644
--- a/x11-wm/xfce4-session/Makefile
+++ b/x11-wm/xfce4-session/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xfce4-session
-PORTVERSION=	4.6.2
+PORTVERSION=	4.8.0
 CATEGORIES=	x11-wm xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 DIST_SUBDIR=	xfce4
@@ -26,12 +26,13 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnometarget gtk20 intltool intlhack pkgconfig
 USE_LDCONFIG=	yes
-USE_XFCE=	configenv libgui libutil xfconf
+USE_XFCE=	configenv libgui libmenu libutil xfconf
 USE_XORG=	x11 sm ice
 
 MAN1=		xfce4-session.1 xfce4-session-logout.1
 
-PLIST_SUB=	VERSION="${PORTVERSION:R}"
+#PLIST_SUB=	VERSION="${PORTVERSION:R}"
+PLIST_SUB=	VERSION="4.6"
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
diff --git a/x11-wm/xfce4-session/distinfo b/x11-wm/xfce4-session/distinfo
index c691973f2dfb..7e3eb4e90446 100644
--- a/x11-wm/xfce4-session/distinfo
+++ b/x11-wm/xfce4-session/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xfce4/xfce4-session-4.8.0.tar.bz2) = b93b6e06e28c97c1968cf9283b82618f4a4fdbf2ba838e8303e38122867a25d3
+SIZE (xfce4/xfce4-session-4.8.0.tar.bz2) = 1462995
diff --git a/x11-wm/xfce4-session/pkg-plist b/x11-wm/xfce4-session/pkg-plist
index 948b8737b0d6..40f16dbca5d5 100644
--- a/x11-wm/xfce4-session/pkg-plist
+++ b/x11-wm/xfce4-session/pkg-plist
@@ -10,20 +10,21 @@ 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
-lib/xfce4/splash/engines/libmice.a
-lib/xfce4/splash/engines/libmice.la
-lib/xfce4/splash/engines/libmice.so
-lib/xfce4/splash/engines/libsimple.a
-lib/xfce4/splash/engines/libsimple.la
-lib/xfce4/splash/engines/libsimple.so
+lib/xfce4/session/splash-engines/libbalou.a
+lib/xfce4/session/splash-engines/libbalou.la
+lib/xfce4/session/splash-engines/libbalou.so
+lib/xfce4/session/splash-engines/libmice.a
+lib/xfce4/session/splash-engines/libmice.la
+lib/xfce4/session/splash-engines/libmice.so
+lib/xfce4/session/splash-engines/libsimple.a
+lib/xfce4/session/splash-engines/libsimple.la
+lib/xfce4/session/splash-engines/libsimple.so
 libdata/pkgconfig/xfce4-session-2.0.pc
-libexec/balou-export-theme
-libexec/balou-install-theme
-libexec/xfsm-shutdown-helper
-%%NLS%%share/applications/xfce-session-settings.desktop
+lib/xfce4/session/balou-export-theme
+lib/xfce4/session/balou-install-theme
+lib/xfce4/session/xfsm-shutdown-helper
+share/applications/xfce-session-settings.desktop
+share/applications/xfce4-session-logout.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
@@ -43,6 +44,7 @@ share/icons/hicolor/scalable/apps/xfsm-shutdown.svg
 %%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/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
@@ -63,6 +65,7 @@ share/icons/hicolor/scalable/apps/xfsm-shutdown.svg
 %%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/hr/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
@@ -99,12 +102,11 @@ share/icons/hicolor/scalable/apps/xfsm-shutdown.svg
 share/themes/Default/balou/logo.png
 share/themes/Default/balou/themerc
 share/xfce4/tips/tips
-share/xfce4/tips/tips.dat
 @dirrm share/xfce4/tips
 @dirrmtry share/xfce4
 @dirrm share/themes/Default/balou
-@dirrm share/themes/Default
-@dirrm share/themes
+@dirrmtry share/themes/Default
+@dirrmtry share/themes
 %%NLS%%@dirrmtry share/applications
 %%NLS%%@dirrmtry share/locale/zh_TW/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/zh_TW
@@ -230,9 +232,9 @@ share/xfce4/tips/tips.dat
 @dirrmtry share/icons/hicolor/48x48
 @dirrmtry share/icons/hicolor/128x128/apps
 @dirrmtry share/icons/hicolor/128x128
-@dirrm lib/xfce4/splash/engines
-@dirrm lib/xfce4/splash
-@dirrm lib/xfce4
+@dirrm lib/xfce4/session/splash-engines
+@dirrm lib/xfce4/session
+@dirrmtry lib/xfce4
 @dirrm include/xfce4/xfce4-session-%%VERSION%%/libxfsm
 @dirrm include/xfce4/xfce4-session-%%VERSION%%
 @dirrmtry include/xfce4