update to 4.2.2

15 files changed, 120 insertions, 32 deletions

diff --git a/x11-wm/xfce4-desktop/Makefile b/x11-wm/xfce4-desktop/Makefile
index ed515d4c16d..9a2de7e6e90 100644
--- a/x11-wm/xfce4-desktop/Makefile
+++ b/x11-wm/xfce4-desktop/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	xfce4-desktop
-PORTVERSION=	4.2.1
-PORTREVISION=	1
+PORTVERSION=	4.2.2
+PORTREVISION=	0
 CATEGORIES=	x11-wm xfce
 MASTER_SITES=	http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
 		http://www.ca-us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
diff --git a/x11-wm/xfce4-desktop/distinfo b/x11-wm/xfce4-desktop/distinfo
index 3c2eba95b67..8159261615b 100644
--- a/x11-wm/xfce4-desktop/distinfo
+++ b/x11-wm/xfce4-desktop/distinfo
@@ -1,2 +1,2 @@
-MD5 (xfce4/xfdesktop-4.2.1.tar.gz) = 27f2d30695b73702846d07d71d0f39e0
-SIZE(xfce4/xfdesktop-4.2.1.tar.gz) = 2605875
+MD5 (xfce4/xfdesktop-4.2.2.tar.gz) = 746641ae286994c0f42d7c4f58a90716
+SIZE(xfce4/xfdesktop-4.2.2.tar.gz) = 2945698
diff --git a/x11-wm/xfce4-desktop/pkg-plist b/x11-wm/xfce4-desktop/pkg-plist
index 0d5bc67e53e..224f9481ee2 100644
--- a/x11-wm/xfce4-desktop/pkg-plist
+++ b/x11-wm/xfce4-desktop/pkg-plist
@@ -1,6 +1,8 @@
 bin/xfce4-menueditor
 bin/xfdesktop
 etc/xdg/xfce4/desktop/xfce-registered-categories.xml
+etc/xdg/xfce4/desktop/xfce-registered-categories.xml.cs
+etc/xdg/xfce4/desktop/xfce-registered-categories.xml.eu
 etc/xdg/xfce4/desktop/xfce-registered-categories.xml.fi
 etc/xdg/xfce4/desktop/xfce-registered-categories.xml.hu
 etc/xdg/xfce4/desktop/xfce-registered-categories.xml.ja
@@ -12,31 +14,23 @@ etc/xdg/xfce4/desktop/xfce-registered-categories.xml.sk
 etc/xdg/xfce4/desktop/xfce-registered-categories.xml.zh_CN
 etc/xdg/xfce4/desktop/xfce-registered-categories.xml.zh_TW
 etc/xdg/xfce4/desktop/menu.xml
-etc/xdg/xfce4/desktop/menu.xml.az
-etc/xdg/xfce4/desktop/menu.xml.ca
+etc/xdg/xfce4/desktop/menu.xml.cs
 etc/xdg/xfce4/desktop/menu.xml.da
 etc/xdg/xfce4/desktop/menu.xml.de
 etc/xdg/xfce4/desktop/menu.xml.es
-etc/xdg/xfce4/desktop/menu.xml.eu
 etc/xdg/xfce4/desktop/menu.xml.et
-etc/xdg/xfce4/desktop/menu.xml.fa_IR
 etc/xdg/xfce4/desktop/menu.xml.fi
 etc/xdg/xfce4/desktop/menu.xml.fr
 etc/xdg/xfce4/desktop/menu.xml.he
-etc/xdg/xfce4/desktop/menu.xml.hu
 etc/xdg/xfce4/desktop/menu.xml.ja
 etc/xdg/xfce4/desktop/menu.xml.ko
-etc/xdg/xfce4/desktop/menu.xml.ms
 etc/xdg/xfce4/desktop/menu.xml.nl
 etc/xdg/xfce4/desktop/menu.xml.pt_BR
 etc/xdg/xfce4/desktop/menu.xml.ro
 etc/xdg/xfce4/desktop/menu.xml.ru
 etc/xdg/xfce4/desktop/menu.xml.sk
-etc/xdg/xfce4/desktop/menu.xml.ta
-etc/xdg/xfce4/desktop/menu.xml.tr
 etc/xdg/xfce4/desktop/menu.xml.uk
 etc/xdg/xfce4/desktop/menu.xml.vi
-etc/xdg/xfce4/desktop/menu.xml.zh_CN
 etc/xdg/xfce4/desktop/menu.xml.zh_TW
 lib/xfce4/mcs-plugins/backdrop_settings.so
 lib/xfce4/modules/xfce4_desktop_menu.so
@@ -53,10 +47,12 @@ share/locale/ar/LC_MESSAGES/xfdesktop.mo
 share/locale/az/LC_MESSAGES/xfdesktop.mo
 share/locale/be/LC_MESSAGES/xfdesktop.mo
 share/locale/bg/LC_MESSAGES/xfdesktop.mo
+share/locale/bn_IN/LC_MESSAGES/xfdesktop.mo 
 share/locale/ca/LC_MESSAGES/xfdesktop.mo
 share/locale/cs/LC_MESSAGES/xfdesktop.mo
 share/locale/da/LC_MESSAGES/xfdesktop.mo
 share/locale/de/LC_MESSAGES/xfdesktop.mo
+share/locale/el/LC_MESSAGES/xfdesktop.mo   
 share/locale/en_GB/LC_MESSAGES/xfdesktop.mo
 share/locale/es/LC_MESSAGES/xfdesktop.mo
 share/locale/es_MX/LC_MESSAGES/xfdesktop.mo
@@ -73,6 +69,7 @@ share/locale/it/LC_MESSAGES/xfdesktop.mo
 share/locale/ja/LC_MESSAGES/xfdesktop.mo
 share/locale/ko/LC_MESSAGES/xfdesktop.mo
 share/locale/lt/LC_MESSAGES/xfdesktop.mo
+share/locale/mr/LC_MESSAGES/xfdesktop.mo 
 share/locale/ms/LC_MESSAGES/xfdesktop.mo
 share/locale/nb_NO/LC_MESSAGES/xfdesktop.mo
 share/locale/nl/LC_MESSAGES/xfdesktop.mo
@@ -112,6 +109,14 @@ share/xfce4/doc/C/images/xfdesktop-background.png
 share/xfce4/doc/C/images/xfdesktop-list.png
 share/xfce4/doc/C/images/xfdesktop-menu-tab.png
 share/xfce4/doc/C/xfdesktop.html
+share/xfce4/doc/fr/images/root_menu2.png
+share/xfce4/doc/fr/images/root_menu.png
+share/xfce4/doc/fr/images/select_bg_color.png
+share/xfce4/doc/fr/images/xfdesktop-background.png
+share/xfce4/doc/fr/images/xfdesktop-editor.png
+share/xfce4/doc/fr/images/xfdesktop-menu-tab.png
+share/xfce4/doc/fr/images/xfdesktop-list.png
+share/xfce4/doc/fr/xfdesktop.html
 @dirrm etc/xdg/xfce4/desktop
 @unexec rmdir %D/share/applications 2>/dev/null || true
 @unexec rmdir %D/etc/xdg/xfce4 2>/dev/null || true
@@ -119,10 +124,16 @@ share/xfce4/doc/C/xfdesktop.html
 @unexec rmdir %D/etc/xfce4 2>/dev/null || true
 @unexec rmdir %D/lib/xfce4/mcs-plugins 2>/dev/null || true
 @unexec rmdir %D/lib/xfce4 2>/dev/null || true
+@unexec rmdir %D/share/locale/bn_IN/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/bn_IN 2>/dev/null || true
+@unexec rmdir %D/share/locale/mr/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/mr 2>/dev/null || true
 @dirrm share/xfce4/backdrops
 @unexec rmdir %D/share/pixmaps 2>/dev/null || true
 @unexec rmdir %D/share/xfce4/doc/C/images 2>/dev/null || true
 @unexec rmdir %D/share/xfce4/doc/C 2>/dev/null || true
+@unexec rmdir %D/share/xfce4/doc/fr/images 2>/dev/null || true
+@unexec rmdir %D/share/xfce4/doc/fr 2>/dev/null || true
 @unexec rmdir %D/share/xfce4/doc 2>/dev/null || true
 @unexec rmdir %D/share/xfce4 2>/dev/null || true
 @unexec rmdir %D/share/locale/nb_NO/LC_MESSAGES 2>/dev/null || true
diff --git a/x11-wm/xfce4-panel/Makefile b/x11-wm/xfce4-panel/Makefile
index f3417959d01..921f1ba31a9 100644
--- a/x11-wm/xfce4-panel/Makefile
+++ b/x11-wm/xfce4-panel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xfce4-panel
-PORTVERSION=	4.2.1.1
+PORTVERSION=	4.2.2
 PORTREVISION=	0
 CATEGORIES=	x11-wm xfce
 MASTER_SITES=	http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
@@ -25,7 +25,7 @@ LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2 \
 		xfcegui4.3:${PORTSDIR}/x11-toolkits/libxfce4gui
 
 USE_GETTEXT=	yes
-USE_GNOME=	gtk20
+USE_GNOME=	gtk20 gnomehack
 USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
 USE_LIBTOOL_VER=15
@@ -35,8 +35,4 @@ CONFIGURE_ENV=	CFLAGS=-I${LOCALBASE}/include \
 		CPPFLAGS=-I${LOCALBASE}/include \
 		LIBS=-L${LOCALBASE}/lib
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \
-		${WRKSRC}/panel/Makefile.in
-
 .include <bsd.port.mk>
diff --git a/x11-wm/xfce4-panel/distinfo b/x11-wm/xfce4-panel/distinfo
index c94026479ae..7d6c9ecfaf4 100644
--- a/x11-wm/xfce4-panel/distinfo
+++ b/x11-wm/xfce4-panel/distinfo
@@ -1,2 +1,2 @@
-MD5 (xfce4/xfce4-panel-4.2.1.1.tar.gz) = 93986465cd92a9f32de60a44718a249e
-SIZE(xfce4/xfce4-panel-4.2.1.1.tar.gz) = 836191
+MD5 (xfce4/xfce4-panel-4.2.2.tar.gz) = 50699e6c8e4a79f0a4f962e12559c9d0
+SIZE(xfce4/xfce4-panel-4.2.2.tar.gz) = 1184587
diff --git a/x11-wm/xfce4-panel/pkg-plist b/x11-wm/xfce4-panel/pkg-plist
index c9b19919ea2..255eafbcdb3 100644
--- a/x11-wm/xfce4-panel/pkg-plist
+++ b/x11-wm/xfce4-panel/pkg-plist
@@ -65,10 +65,12 @@ share/locale/ar/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/el/LC_MESSAGES/xfce4-panel.mo
 share/locale/en_GB/LC_MESSAGES/xfce4-panel.mo
 share/locale/es/LC_MESSAGES/xfce4-panel.mo
 share/locale/es_MX/LC_MESSAGES/xfce4-panel.mo
@@ -85,6 +87,7 @@ share/locale/it/LC_MESSAGES/xfce4-panel.mo
 share/locale/ja/LC_MESSAGES/xfce4-panel.mo
 share/locale/ko/LC_MESSAGES/xfce4-panel.mo
 share/locale/lt/LC_MESSAGES/xfce4-panel.mo
+share/locale/mr/LC_MESSAGES/xfce4-panel.mo
 share/locale/ms/LC_MESSAGES/xfce4-panel.mo
 share/locale/nb_NO/LC_MESSAGES/xfce4-panel.mo
 share/locale/nl/LC_MESSAGES/xfce4-panel.mo
@@ -114,6 +117,19 @@ share/xfce4/doc/C/images/pager-properties.png
 share/xfce4/doc/C/images/panel-settings.png
 share/xfce4/doc/C/images/systembuttons-properties.png
 share/xfce4/doc/C/xfce4-panel.html
+share/xfce4/doc/fr/images/add-item-dialog.png
+share/xfce4/doc/fr/images/clock-properties.png
+share/xfce4/doc/fr/images/default_panel.png
+share/xfce4/doc/fr/images/handle-popup.png
+share/xfce4/doc/fr/images/item-popup.png
+share/xfce4/doc/fr/images/launcher-properties.png
+share/xfce4/doc/fr/images/mailcheck-properties.png
+share/xfce4/doc/fr/images/menuitem-properties.png
+share/xfce4/doc/fr/images/nooptions-properties.png
+share/xfce4/doc/fr/images/pager-properties.png
+share/xfce4/doc/fr/images/panel-settings.png
+share/xfce4/doc/fr/images/systembuttons-properties.png
+share/xfce4/doc/fr/xfce4-panel.html
 @dirrm etc/xdg/xfce4/panel
 @unexec rmdir %D/etc/xdg/xfce4 2>/dev/null || true
 @unexec rmdir %D/etc/xdg 2>/dev/null || true
@@ -124,8 +140,14 @@ share/xfce4/doc/C/xfce4-panel.html
 @unexec rmdir %D/lib/xfce4/panel-plugins 2>/dev/null || true
 @unexec rmdir %D/lib/xfce4 2>/dev/null || true
 @unexec rmdir %D/share/applications 2>/dev/null || true
+@unexec rmdir %D/share/locale/bn_IN/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/bn_IN 2>/dev/null || true
+@unexec rmdir %D/share/locale/mr/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/mr 2>/dev/null || true
 @unexec rmdir %D/share/xfce4/doc/C/images 2>/dev/null || true
 @unexec rmdir %D/share/xfce4/doc/C 2>/dev/null || true
+@unexec rmdir %D/share/xfce4/doc/fr/images 2>/dev/null || true
+@unexec rmdir %D/share/xfce4/doc/fr 2>/dev/null || true
 @unexec rmdir %D/share/xfce4/doc 2>/dev/null || true
 @unexec rmdir %D/share/xfce4 2>/dev/null || true
 @unexec rmdir %D/share/locale/nb_NO/LC_MESSAGES 2>/dev/null || true
diff --git a/x11-wm/xfce4-session/Makefile b/x11-wm/xfce4-session/Makefile
index b5e65666aee..2547388c0f8 100644
--- a/x11-wm/xfce4-session/Makefile
+++ b/x11-wm/xfce4-session/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	xfce4-session
-PORTVERSION=	4.2.1
-PORTREVISION=	1
+PORTVERSION=	4.2.2
+PORTREVISION=	0
 CATEGORIES=	x11-wm xfce
 MASTER_SITES=	http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
 		http://www.ca-us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
diff --git a/x11-wm/xfce4-session/distinfo b/x11-wm/xfce4-session/distinfo
index 873dde960be..910bf549bb7 100644
--- a/x11-wm/xfce4-session/distinfo
+++ b/x11-wm/xfce4-session/distinfo
@@ -1,2 +1,2 @@
-MD5 (xfce4/xfce4-session-4.2.1.tar.gz) = d9941a2a2e85a05e4e8677301db0ab2a
-SIZE(xfce4/xfce4-session-4.2.1.tar.gz) = 1316467
+MD5 (xfce4/xfce4-session-4.2.2.tar.gz) = 4d2f36ab0d4fa4b62a80b762c127d3aa
+SIZE(xfce4/xfce4-session-4.2.2.tar.gz) = 1499674
diff --git a/x11-wm/xfce4-session/pkg-plist b/x11-wm/xfce4-session/pkg-plist
index ff0407dc63c..2a5eb1d4b1b 100644
--- a/x11-wm/xfce4-session/pkg-plist
+++ b/x11-wm/xfce4-session/pkg-plist
@@ -29,10 +29,12 @@ share/icons/hicolor/scalable/apps/xfsm-shutdown.svg
 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/el/LC_MESSAGES/xfce4-session.mo
 share/locale/en_GB/LC_MESSAGES/xfce4-session.mo
 share/locale/es/LC_MESSAGES/xfce4-session.mo
 share/locale/es_MX/LC_MESSAGES/xfce4-session.mo
@@ -49,6 +51,7 @@ share/locale/it/LC_MESSAGES/xfce4-session.mo
 share/locale/ja/LC_MESSAGES/xfce4-session.mo
 share/locale/ko/LC_MESSAGES/xfce4-session.mo
 share/locale/lt/LC_MESSAGES/xfce4-session.mo
+share/locale/mr/LC_MESSAGES/xfce4-session.mo
 share/locale/ms/LC_MESSAGES/xfce4-session.mo
 share/locale/nb_NO/LC_MESSAGES/xfce4-session.mo
 share/locale/nl/LC_MESSAGES/xfce4-session.mo
@@ -72,17 +75,27 @@ 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  
 @dirrm etc/xdg/xfce4-session
 @unexec rmdir %D/etc/xdg 2>/dev/null || true
 @dirrm include/xfce4/xfce4-session-4.2/libxfsm
 @dirrm include/xfce4/xfce4-session-4.2
 @unexec rmdir %D/include/xfce4 2>/dev/null || true
 @unexec rmdir %D/share/applications 2>/dev/null || true
+@unexec rmdir %D/share/locale/bn_IN/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/bn_IN 2>/dev/null || true
+@unexec rmdir %D/share/locale/mr/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/mr 2>/dev/null || true
 @dirrm share/themes/Default/balou
 @unexec rmdir %D/share/themes/Default 2>/dev/null || true
 @unexec rmdir %D/share/themes 2>/dev/null || true
 @unexec rmdir %D/share/xfce4/doc/C/images 2>/dev/null || true
 @unexec rmdir %D/share/xfce4/doc/C 2>/dev/null || true
+@unexec rmdir %D/share/xfce4/doc/fr/images 2>/dev/null || true
+@unexec rmdir %D/share/xfce4/doc/fr 2>/dev/null || true
 @unexec rmdir %D/share/xfce4/doc 2>/dev/null || true
 @unexec rmdir %D/share/xfce4 2>/dev/null || true
 @unexec rmdir %D/lib/xfce4/splash/engines 2>/dev/null || true
diff --git a/x11-wm/xfce4-systray/Makefile b/x11-wm/xfce4-systray/Makefile
index 27d8075b749..38ae61e85e8 100644
--- a/x11-wm/xfce4-systray/Makefile
+++ b/x11-wm/xfce4-systray/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xfce4-systray
-PORTVERSION=	4.2.1
+PORTVERSION=	4.2.2
 PORTREVISION=	0
 CATEGORIES=	x11-wm xfce
 MASTER_SITES=	http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
diff --git a/x11-wm/xfce4-systray/distinfo b/x11-wm/xfce4-systray/distinfo
index ddd7aa05725..d2c05398a4e 100644
--- a/x11-wm/xfce4-systray/distinfo
+++ b/x11-wm/xfce4-systray/distinfo
@@ -1,2 +1,2 @@
-MD5 (xfce4/xfce4-systray-4.2.1.tar.gz) = eca2cc9291d49637dca74a8889ae930b
-SIZE(xfce4/xfce4-systray-4.2.1.tar.gz) = 312823
+MD5 (xfce4/xfce4-systray-4.2.2.tar.gz) = d9303f307e12ca297876571d6968e8aa
+SIZE(xfce4/xfce4-systray-4.2.2.tar.gz) = 312188
diff --git a/x11-wm/xfce4-wm/Makefile b/x11-wm/xfce4-wm/Makefile
index e2298e31fa0..1d23d2b4c77 100644
--- a/x11-wm/xfce4-wm/Makefile
+++ b/x11-wm/xfce4-wm/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xfce4-wm
-PORTVERSION=	4.2.1
+PORTVERSION=	4.2.2
 PORTREVISION=	0
 CATEGORIES=	x11-wm xfce
 MASTER_SITES=	http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
diff --git a/x11-wm/xfce4-wm/distinfo b/x11-wm/xfce4-wm/distinfo
index c9fe5a95a25..86758e1ff5f 100644
--- a/x11-wm/xfce4-wm/distinfo
+++ b/x11-wm/xfce4-wm/distinfo
@@ -1,2 +1,2 @@
-MD5 (xfce4/xfwm4-4.2.1.tar.gz) = a45792df95944d6bd15ff5c23ec26e1b
-SIZE(xfce4/xfwm4-4.2.1.tar.gz) = 1115932
+MD5 (xfce4/xfwm4-4.2.2.tar.gz) = e4c91c59da7d1bdc6141cde3263ea6f9
+SIZE(xfce4/xfwm4-4.2.2.tar.gz) = 1560702
diff --git a/x11-wm/xfce4-wm/pkg-plist b/x11-wm/xfce4-wm/pkg-plist
index c443a89c1f1..04580daaf5a 100644
--- a/x11-wm/xfce4-wm/pkg-plist
+++ b/x11-wm/xfce4-wm/pkg-plist
@@ -12,9 +12,11 @@ share/locale/az/LC_MESSAGES/xfwm4.mo
 share/locale/ar/LC_MESSAGES/xfwm4.mo
 share/locale/be/LC_MESSAGES/xfwm4.mo
 share/locale/bg/LC_MESSAGES/xfwm4.mo
+share/locale/bn_IN/LC_MESSAGES/xfwm4.mo
 share/locale/ca/LC_MESSAGES/xfwm4.mo
 share/locale/cs/LC_MESSAGES/xfwm4.mo
 share/locale/de/LC_MESSAGES/xfwm4.mo
+share/locale/el/LC_MESSAGES/xfwm4.mo
 share/locale/en_GB/LC_MESSAGES/xfwm4.mo
 share/locale/es/LC_MESSAGES/xfwm4.mo
 share/locale/es_MX/LC_MESSAGES/xfwm4.mo
@@ -31,6 +33,7 @@ share/locale/it/LC_MESSAGES/xfwm4.mo
 share/locale/ja/LC_MESSAGES/xfwm4.mo
 share/locale/ko/LC_MESSAGES/xfwm4.mo
 share/locale/lt/LC_MESSAGES/xfwm4.mo
+share/locale/mr/LC_MESSAGES/xfwm4.mo
 share/locale/ms/LC_MESSAGES/xfwm4.mo
 share/locale/nb_NO/LC_MESSAGES/xfwm4.mo
 share/locale/nl/LC_MESSAGES/xfwm4.mo
@@ -425,39 +428,66 @@ share/themes/Tyrex/xfwm4/bottom-right-active.xpm
 share/themes/Tyrex/xfwm4/bottom-right-inactive.png
 share/themes/Tyrex/xfwm4/bottom-right-inactive.xpm
 share/themes/Tyrex/xfwm4/close-active.xpm
+share/themes/Tyrex/xfwm4/close-active.png
 share/themes/Tyrex/xfwm4/close-inactive.xpm
+share/themes/Tyrex/xfwm4/close-inactive.png
 share/themes/Tyrex/xfwm4/close-pressed.xpm
+share/themes/Tyrex/xfwm4/close-pressed.png
 share/themes/Tyrex/xfwm4/hide-active.xpm
+share/themes/Tyrex/xfwm4/hide-active.png
 share/themes/Tyrex/xfwm4/hide-inactive.xpm
+share/themes/Tyrex/xfwm4/hide-inactive.png
 share/themes/Tyrex/xfwm4/hide-pressed.xpm
+share/themes/Tyrex/xfwm4/hide-pressed.png
 share/themes/Tyrex/xfwm4/left-active.png
 share/themes/Tyrex/xfwm4/left-active.xpm
 share/themes/Tyrex/xfwm4/left-inactive.png
 share/themes/Tyrex/xfwm4/left-inactive.xpm
 share/themes/Tyrex/xfwm4/maximize-active.xpm
+share/themes/Tyrex/xfwm4/maximize-active.png
 share/themes/Tyrex/xfwm4/maximize-inactive.xpm
+share/themes/Tyrex/xfwm4/maximize-inactive.png
 share/themes/Tyrex/xfwm4/maximize-pressed.xpm
+share/themes/Tyrex/xfwm4/maximize-pressed.png
 share/themes/Tyrex/xfwm4/maximize-toggled-active.xpm
+share/themes/Tyrex/xfwm4/maximize-toggled-active.png
 share/themes/Tyrex/xfwm4/maximize-toggled-inactive.xpm
+share/themes/Tyrex/xfwm4/maximize-toggled-inactive.png
 share/themes/Tyrex/xfwm4/maximize-toggled-pressed.xpm
+share/themes/Tyrex/xfwm4/maximize-toggled-pressed.png
 share/themes/Tyrex/xfwm4/menu-active.xpm
+share/themes/Tyrex/xfwm4/menu-active.png
 share/themes/Tyrex/xfwm4/menu-inactive.xpm
+share/themes/Tyrex/xfwm4/menu-inactive.png
 share/themes/Tyrex/xfwm4/menu-pressed.xpm
+share/themes/Tyrex/xfwm4/menu-pressed.png
 share/themes/Tyrex/xfwm4/right-active.png
 share/themes/Tyrex/xfwm4/right-active.xpm
 share/themes/Tyrex/xfwm4/right-inactive.png
 share/themes/Tyrex/xfwm4/right-inactive.xpm
 share/themes/Tyrex/xfwm4/shade-active.xpm
+share/themes/Tyrex/xfwm4/shade-active.png
 share/themes/Tyrex/xfwm4/shade-inactive.xpm
+share/themes/Tyrex/xfwm4/shade-inactive.png
 share/themes/Tyrex/xfwm4/shade-pressed.xpm
+share/themes/Tyrex/xfwm4/shade-pressed.png
 share/themes/Tyrex/xfwm4/shade-toggled-active.xpm
+share/themes/Tyrex/xfwm4/shade-toggled-active.png
+share/themes/Tyrex/xfwm4/shade-toggled-inactive.png
 share/themes/Tyrex/xfwm4/shade-toggled-inactive.xpm
+share/themes/Tyrex/xfwm4/shade-toggled-pressed.png
 share/themes/Tyrex/xfwm4/shade-toggled-pressed.xpm
+share/themes/Tyrex/xfwm4/stick-active.png
 share/themes/Tyrex/xfwm4/stick-active.xpm
+share/themes/Tyrex/xfwm4/stick-inactive.png
 share/themes/Tyrex/xfwm4/stick-inactive.xpm
+share/themes/Tyrex/xfwm4/stick-pressed.png
 share/themes/Tyrex/xfwm4/stick-pressed.xpm
+share/themes/Tyrex/xfwm4/stick-toggled-active.png
 share/themes/Tyrex/xfwm4/stick-toggled-active.xpm
+share/themes/Tyrex/xfwm4/stick-toggled-inactive.png
 share/themes/Tyrex/xfwm4/stick-toggled-inactive.xpm
+share/themes/Tyrex/xfwm4/stick-toggled-pressed.png
 share/themes/Tyrex/xfwm4/stick-toggled-pressed.xpm
 share/themes/Tyrex/xfwm4/title-1-active.png
 share/themes/Tyrex/xfwm4/title-1-active.xpm
@@ -667,13 +697,29 @@ share/xfce4/doc/C/images/titlebar.png
 share/xfce4/doc/C/images/workspace_margins.png
 share/xfce4/doc/C/images/xfwm_workspaces.png
 share/xfce4/doc/C/xfwm4.html
+share/xfce4/doc/fr/images/compose_shortcut.png
+share/xfce4/doc/fr/images/decoration_style.png
+share/xfce4/doc/fr/images/focus.png
+share/xfce4/doc/fr/images/keyboard_and_focus.png
+share/xfce4/doc/fr/images/keyboard_shortcuts.png
+share/xfce4/doc/fr/images/misc_wm_prefs.png
+share/xfce4/doc/fr/images/titlebar.png
+share/xfce4/doc/fr/images/workspace_margins.png
+share/xfce4/doc/fr/images/xfwm_workspaces.png
+share/xfce4/doc/fr/xfwm4.html
 share/xfwm4/defaults
 @unexec rmdir %D/lib/xfce4/mcs-plugins 2>/dev/null || true
 @unexec rmdir %D/lib/xfce4 2>/dev/null || true
+@unexec rmdir %D/share/locale/bn_IN/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/bn_IN 2>/dev/null || true
+@unexec rmdir %D/share/locale/mr/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/mr 2>/dev/null || true
 @unexec rmdir %D/share/locale/nb_NO/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/nb_NO 2>/dev/null || true
 @unexec rmdir %D/share/xfce4/doc/C/images 2>/dev/null || true
 @unexec rmdir %D/share/xfce4/doc/C 2>/dev/null || true
+@unexec rmdir %D/share/xfce4/doc/fr/images 2>/dev/null || true
+@unexec rmdir %D/share/xfce4/doc/fr 2>/dev/null || true
 @unexec rmdir %D/share/xfce4/doc 2>/dev/null || true
 @unexec rmdir %D/share/xfce4 2>/dev/null || true
 @dirrm share/themes/Default/xfwm4
diff --git a/x11-wm/xfce4/Makefile b/x11-wm/xfce4/Makefile
index 32ae43310f6..2c61272905f 100644
--- a/x11-wm/xfce4/Makefile
+++ b/x11-wm/xfce4/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xfce
-PORTVERSION=	4.2.1.1
+PORTVERSION=	4.2.2
 PORTREVISION=	0
 CATEGORIES=	x11-wm xfce
 MASTER_SITES=	# empty