aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--audio/xfce4-mixer/Makefile2
-rw-r--r--audio/xfce4-mixer/distinfo4
-rw-r--r--audio/xfce4-mixer/pkg-plist7
-rw-r--r--games/xfce4-toys/Makefile2
-rw-r--r--games/xfce4-toys/distinfo4
-rw-r--r--games/xfce4-toys/pkg-plist7
-rw-r--r--misc/xfce4-appfinder/Makefile2
-rw-r--r--misc/xfce4-appfinder/distinfo4
-rw-r--r--misc/xfce4-appfinder/pkg-plist9
-rw-r--r--misc/xfce4-iconbox/Makefile2
-rw-r--r--misc/xfce4-iconbox/distinfo4
-rw-r--r--misc/xfce4-iconbox/pkg-plist6
-rw-r--r--misc/xfce4-wm-themes/Makefile2
-rw-r--r--misc/xfce4-wm-themes/distinfo4
-rw-r--r--print/xfce4-print/Makefile4
-rw-r--r--print/xfce4-print/distinfo4
-rw-r--r--print/xfce4-print/files/patch-xfprint-manager::main.c33
-rw-r--r--print/xfce4-print/files/patch-xfprint::main.c33
-rw-r--r--print/xfce4-print/pkg-plist18
-rw-r--r--sysutils/xfce4-mcs-manager/Makefile8
-rw-r--r--sysutils/xfce4-mcs-manager/distinfo4
-rw-r--r--sysutils/xfce4-mcs-manager/pkg-plist15
-rw-r--r--sysutils/xfce4-mcs-plugins/Makefile2
-rw-r--r--sysutils/xfce4-mcs-plugins/distinfo4
-rw-r--r--sysutils/xfce4-mcs-plugins/pkg-plist15
-rw-r--r--sysutils/xfce4-utils/Makefile2
-rw-r--r--sysutils/xfce4-utils/distinfo4
-rw-r--r--sysutils/xfce4-utils/pkg-plist25
-rw-r--r--x11-fm/xfce4-fm/Makefile15
-rw-r--r--x11-fm/xfce4-fm/distinfo4
-rw-r--r--x11-fm/xfce4-fm/pkg-plist42
-rw-r--r--x11-themes/gtk-xfce-engine/Makefile8
-rw-r--r--x11-themes/gtk-xfce-engine/distinfo4
-rw-r--r--x11-themes/xfce4-icon-theme/Makefile2
-rw-r--r--x11-themes/xfce4-icon-theme/distinfo4
-rw-r--r--x11-toolkits/libxfce4gui/Makefile8
-rw-r--r--x11-toolkits/libxfce4gui/distinfo4
-rw-r--r--x11-wm/xfce4-desktop/Makefile4
-rw-r--r--x11-wm/xfce4-desktop/distinfo4
-rw-r--r--x11-wm/xfce4-desktop/pkg-plist29
-rw-r--r--x11-wm/xfce4-panel/Makefile8
-rw-r--r--x11-wm/xfce4-panel/distinfo4
-rw-r--r--x11-wm/xfce4-panel/pkg-plist22
-rw-r--r--x11-wm/xfce4-session/Makefile4
-rw-r--r--x11-wm/xfce4-session/distinfo4
-rw-r--r--x11-wm/xfce4-session/pkg-plist13
-rw-r--r--x11-wm/xfce4-systray/Makefile2
-rw-r--r--x11-wm/xfce4-systray/distinfo4
-rw-r--r--x11-wm/xfce4-wm/Makefile2
-rw-r--r--x11-wm/xfce4-wm/distinfo4
-rw-r--r--x11-wm/xfce4-wm/pkg-plist46
-rw-r--r--x11-wm/xfce4/Makefile2
-rw-r--r--x11/libxfce4mcs/Makefile8
-rw-r--r--x11/libxfce4mcs/distinfo4
-rw-r--r--x11/libxfce4util/Makefile8
-rw-r--r--x11/libxfce4util/distinfo4
-rw-r--r--x11/xfce4-trigger-launcher/Makefile2
-rw-r--r--x11/xfce4-trigger-launcher/distinfo4
58 files changed, 317 insertions, 186 deletions
diff --git a/audio/xfce4-mixer/Makefile b/audio/xfce4-mixer/Makefile
index 0c807adca81f..392a4e6018d0 100644
--- a/audio/xfce4-mixer/Makefile
+++ b/audio/xfce4-mixer/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xfce4-mixer
-PORTVERSION= 4.2.1
+PORTVERSION= 4.2.2
PORTREVISION= 0
CATEGORIES= audio xfce
MASTER_SITES= http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
diff --git a/audio/xfce4-mixer/distinfo b/audio/xfce4-mixer/distinfo
index 36a9adbfcb90..25ed1c8fee71 100644
--- a/audio/xfce4-mixer/distinfo
+++ b/audio/xfce4-mixer/distinfo
@@ -1,2 +1,2 @@
-MD5 (xfce4/xfce4-mixer-4.2.1.tar.gz) = 488b6d2a6328a7b00dcc4781d388d604
-SIZE(xfce4/xfce4-mixer-4.2.1.tar.gz) = 548604
+MD5 (xfce4/xfce4-mixer-4.2.2.tar.gz) = fd5eb62c04d10659402a228b304f735b
+SIZE(xfce4/xfce4-mixer-4.2.2.tar.gz) = 582555
diff --git a/audio/xfce4-mixer/pkg-plist b/audio/xfce4-mixer/pkg-plist
index 8bf282a16484..cd35e461a375 100644
--- a/audio/xfce4-mixer/pkg-plist
+++ b/audio/xfce4-mixer/pkg-plist
@@ -10,9 +10,11 @@ share/locale/ar/LC_MESSAGES/xfce4-mixer.mo
share/locale/az/LC_MESSAGES/xfce4-mixer.mo
share/locale/be/LC_MESSAGES/xfce4-mixer.mo
share/locale/bg/LC_MESSAGES/xfce4-mixer.mo
+share/locale/bn_IN/LC_MESSAGES/xfce4-mixer.mo
share/locale/ca/LC_MESSAGES/xfce4-mixer.mo
share/locale/da/LC_MESSAGES/xfce4-mixer.mo
share/locale/de/LC_MESSAGES/xfce4-mixer.mo
+share/locale/el/LC_MESSAGES/xfce4-mixer.mo
share/locale/en_GB/LC_MESSAGES/xfce4-mixer.mo
share/locale/es/LC_MESSAGES/xfce4-mixer.mo
share/locale/es_MX/LC_MESSAGES/xfce4-mixer.mo
@@ -28,6 +30,7 @@ share/locale/it/LC_MESSAGES/xfce4-mixer.mo
share/locale/ja/LC_MESSAGES/xfce4-mixer.mo
share/locale/ko/LC_MESSAGES/xfce4-mixer.mo
share/locale/lt/LC_MESSAGES/xfce4-mixer.mo
+share/locale/mr/LC_MESSAGES/xfce4-mixer.mo
share/locale/ms/LC_MESSAGES/xfce4-mixer.mo
share/locale/nb_NO/LC_MESSAGES/xfce4-mixer.mo
share/locale/nl/LC_MESSAGES/xfce4-mixer.mo
@@ -45,5 +48,9 @@ share/locale/zh_TW/LC_MESSAGES/xfce4-mixer.mo
@unexec rmdir %D/lib/xfce4/mcs-plugins 2>/dev/null || true
@unexec rmdir %D/lib/xfce4/panel-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
diff --git a/games/xfce4-toys/Makefile b/games/xfce4-toys/Makefile
index 5c78c46cba94..bc5f1db24ef0 100644
--- a/games/xfce4-toys/Makefile
+++ b/games/xfce4-toys/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xfce4-toys
-PORTVERSION= 4.2.1
+PORTVERSION= 4.2.2
PORTREVISION= 0
CATEGORIES= games xfce
MASTER_SITES= http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
diff --git a/games/xfce4-toys/distinfo b/games/xfce4-toys/distinfo
index 6e30444382c1..30b81f9770d2 100644
--- a/games/xfce4-toys/distinfo
+++ b/games/xfce4-toys/distinfo
@@ -1,2 +1,2 @@
-MD5 (xfce4/xfce4-toys-4.2.1.tar.gz) = a7700980c111dbab07172652a365fafd
-SIZE(xfce4/xfce4-toys-4.2.1.tar.gz) = 403562
+MD5 (xfce4/xfce4-toys-4.2.2.tar.gz) = b8f10d38a94622f38d4a064bcae6fdc6
+SIZE(xfce4/xfce4-toys-4.2.2.tar.gz) = 412857
diff --git a/games/xfce4-toys/pkg-plist b/games/xfce4-toys/pkg-plist
index 1065a071e7c8..a045d8d5ac1a 100644
--- a/games/xfce4-toys/pkg-plist
+++ b/games/xfce4-toys/pkg-plist
@@ -4,10 +4,12 @@ share/locale/ar/LC_MESSAGES/xfce4-toys.mo
share/locale/az/LC_MESSAGES/xfce4-toys.mo
share/locale/be/LC_MESSAGES/xfce4-toys.mo
share/locale/bg/LC_MESSAGES/xfce4-toys.mo
+share/locale/bn_IN/LC_MESSAGES/xfce4-toys.mo
share/locale/ca/LC_MESSAGES/xfce4-toys.mo
share/locale/cs/LC_MESSAGES/xfce4-toys.mo
share/locale/da/LC_MESSAGES/xfce4-toys.mo
share/locale/de/LC_MESSAGES/xfce4-toys.mo
+share/locale/el/LC_MESSAGES/xfce4-toys.mo
share/locale/en_GB/LC_MESSAGES/xfce4-toys.mo
share/locale/es/LC_MESSAGES/xfce4-toys.mo
share/locale/et/LC_MESSAGES/xfce4-toys.mo
@@ -23,6 +25,7 @@ share/locale/it/LC_MESSAGES/xfce4-toys.mo
share/locale/ja/LC_MESSAGES/xfce4-toys.mo
share/locale/ko/LC_MESSAGES/xfce4-toys.mo
share/locale/lt/LC_MESSAGES/xfce4-toys.mo
+share/locale/mr/LC_MESSAGES/xfce4-toys.mo
share/locale/ms/LC_MESSAGES/xfce4-toys.mo
share/locale/nb_NO/LC_MESSAGES/xfce4-toys.mo
share/locale/nl/LC_MESSAGES/xfce4-toys.mo
@@ -67,5 +70,9 @@ share/xfce4/tips/tips.dat
@dirrm share/xfce4/tips
@unexec rmdir %D/share/xfce4 2>/dev/null || true
@unexec rmdir %D/lib/xfce4/panel-plugins 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
diff --git a/misc/xfce4-appfinder/Makefile b/misc/xfce4-appfinder/Makefile
index 42a34854cc10..93bc66752777 100644
--- a/misc/xfce4-appfinder/Makefile
+++ b/misc/xfce4-appfinder/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xfce4-appfinder
-PORTVERSION= 4.2.1
+PORTVERSION= 4.2.2
PORTREVISION= 0
CATEGORIES= misc xfce
MASTER_SITES= http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
diff --git a/misc/xfce4-appfinder/distinfo b/misc/xfce4-appfinder/distinfo
index 8084e8a5dc82..e98fbd5f7919 100644
--- a/misc/xfce4-appfinder/distinfo
+++ b/misc/xfce4-appfinder/distinfo
@@ -1,2 +1,2 @@
-MD5 (xfce4/xfce4-appfinder-4.2.1.tar.gz) = 5077312a6390d20b9d0d44cc0891ee96
-SIZE(xfce4/xfce4-appfinder-4.2.1.tar.gz) = 442219
+MD5 (xfce4/xfce4-appfinder-4.2.2.tar.gz) = 0ef8c944e8aa2db06719e02b2c40d70c
+SIZE(xfce4/xfce4-appfinder-4.2.2.tar.gz) = 570719
diff --git a/misc/xfce4-appfinder/pkg-plist b/misc/xfce4-appfinder/pkg-plist
index 7075620c79ff..580bea25b992 100644
--- a/misc/xfce4-appfinder/pkg-plist
+++ b/misc/xfce4-appfinder/pkg-plist
@@ -1,13 +1,20 @@
bin/xfce4-appfinder
share/applications/xfce4-appfinder.desktop
share/pixmaps/xfce4-appfinder.png
-share/xfce4/doc/C/images/default_appfinder.png
share/xfce4/doc/C/images/appfinder-handle-popup.png
share/xfce4/doc/C/images/appfinder-item-popup.png
+share/xfce4/doc/C/images/default_appfinder.png
share/xfce4/doc/C/xfce4-appfinder.html
+share/xfce4/doc/fr/images/appfinder-handle-popup.png
+share/xfce4/doc/fr/images/appfinder-item-popup.png
+share/xfce4/doc/fr/images/default_appfinder.png
+share/xfce4/doc/fr/xfce4-appfinder.html
@unexec rmdir %D/share/applications 2>/dev/null || true
@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
+
diff --git a/misc/xfce4-iconbox/Makefile b/misc/xfce4-iconbox/Makefile
index ce5c340e6323..b4762f729759 100644
--- a/misc/xfce4-iconbox/Makefile
+++ b/misc/xfce4-iconbox/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xfce4-iconbox
-PORTVERSION= 4.2.1
+PORTVERSION= 4.2.2
PORTREVISION= 0
CATEGORIES= misc xfce
MASTER_SITES= http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
diff --git a/misc/xfce4-iconbox/distinfo b/misc/xfce4-iconbox/distinfo
index 4e2b16cff305..5ed384980784 100644
--- a/misc/xfce4-iconbox/distinfo
+++ b/misc/xfce4-iconbox/distinfo
@@ -1,2 +1,2 @@
-MD5 (xfce4/xfce4-iconbox-4.2.1.tar.gz) = 9080ed126c970de733c529ac1864f12a
-SIZE(xfce4/xfce4-iconbox-4.2.1.tar.gz) = 395875
+MD5 (xfce4/xfce4-iconbox-4.2.2.tar.gz) = 9c269aa3805ac2503029ad00e8d8c8a3
+SIZE(xfce4/xfce4-iconbox-4.2.2.tar.gz) = 409710
diff --git a/misc/xfce4-iconbox/pkg-plist b/misc/xfce4-iconbox/pkg-plist
index b632ecb40ec7..63cab6e8c267 100644
--- a/misc/xfce4-iconbox/pkg-plist
+++ b/misc/xfce4-iconbox/pkg-plist
@@ -7,10 +7,12 @@ share/locale/ar/LC_MESSAGES/xfce4-iconbox.mo
share/locale/az/LC_MESSAGES/xfce4-iconbox.mo
share/locale/be/LC_MESSAGES/xfce4-iconbox.mo
share/locale/bg/LC_MESSAGES/xfce4-iconbox.mo
+share/locale/bn_IN/LC_MESSAGES/xfce4-iconbox.mo
share/locale/ca/LC_MESSAGES/xfce4-iconbox.mo
share/locale/cs/LC_MESSAGES/xfce4-iconbox.mo
share/locale/da/LC_MESSAGES/xfce4-iconbox.mo
share/locale/de/LC_MESSAGES/xfce4-iconbox.mo
+share/locale/el/LC_MESSAGES/xfce4-iconbox.mo
share/locale/en_GB/LC_MESSAGES/xfce4-iconbox.mo
share/locale/es/LC_MESSAGES/xfce4-iconbox.mo
share/locale/es_MX/LC_MESSAGES/xfce4-iconbox.mo
@@ -44,6 +46,10 @@ share/locale/uk/LC_MESSAGES/xfce4-iconbox.mo
share/locale/vi/LC_MESSAGES/xfce4-iconbox.mo
share/locale/zh_CN/LC_MESSAGES/xfce4-iconbox.mo
share/locale/zh_TW/LC_MESSAGES/xfce4-iconbox.mo
+@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/lib/xfce4/mcs-plugins 2>/dev/null || true
diff --git a/misc/xfce4-wm-themes/Makefile b/misc/xfce4-wm-themes/Makefile
index a79b34d94c88..6c970e87f273 100644
--- a/misc/xfce4-wm-themes/Makefile
+++ b/misc/xfce4-wm-themes/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xfce4-wm-themes
-PORTVERSION= 4.2.1
+PORTVERSION= 4.2.2
CATEGORIES= misc 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/misc/xfce4-wm-themes/distinfo b/misc/xfce4-wm-themes/distinfo
index 5f4fb9d45a86..2aceb1fcf330 100644
--- a/misc/xfce4-wm-themes/distinfo
+++ b/misc/xfce4-wm-themes/distinfo
@@ -1,2 +1,2 @@
-MD5 (xfce4/xfwm4-themes-4.2.1.tar.gz) = d02ca2fc931ffd336b9a9fe767da80fc
-SIZE(xfce4/xfwm4-themes-4.2.1.tar.gz) = 779707
+MD5 (xfce4/xfwm4-themes-4.2.2.tar.gz) = 440977408bd1395f4464f18f01faf644
+SIZE(xfce4/xfwm4-themes-4.2.2.tar.gz) = 879842
diff --git a/print/xfce4-print/Makefile b/print/xfce4-print/Makefile
index 36443084d8b2..39a72b962b9b 100644
--- a/print/xfce4-print/Makefile
+++ b/print/xfce4-print/Makefile
@@ -6,8 +6,8 @@
#
PORTNAME= xfce4-print
-PORTVERSION= 4.2.1
-PORTREVISION= 1
+PORTVERSION= 4.2.2
+PORTREVISION= 0
CATEGORIES= print 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/print/xfce4-print/distinfo b/print/xfce4-print/distinfo
index f3163517ba83..3b6de71fee31 100644
--- a/print/xfce4-print/distinfo
+++ b/print/xfce4-print/distinfo
@@ -1,2 +1,2 @@
-MD5 (xfce4/xfprint-4.2.1.tar.gz) = da40a8881566880b166a9b91a70ef8c9
-SIZE(xfce4/xfprint-4.2.1.tar.gz) = 687685
+MD5 (xfce4/xfprint-4.2.2.tar.gz) = 033cc5a89b781bd13491d39ac7b351ba
+SIZE(xfce4/xfprint-4.2.2.tar.gz) = 960769
diff --git a/print/xfce4-print/files/patch-xfprint-manager::main.c b/print/xfce4-print/files/patch-xfprint-manager::main.c
deleted file mode 100644
index 33c55a70fe77..000000000000
--- a/print/xfce4-print/files/patch-xfprint-manager::main.c
+++ /dev/null
@@ -1,33 +0,0 @@
---- xfprint-manager/main.c.orig Wed Apr 13 23:56:53 2005
-+++ xfprint-manager/main.c Wed Apr 13 23:55:57 2005
-@@ -101,22 +101,17 @@
- mcs_client_add_channel (client, CHANNEL);
-
- if (mcs_client_get_setting (client, "XfPrint/system", CHANNEL, &setting) == MCS_SUCCESS) {
-- if (!load_printing_system (setting->data.v_string))
-- g_error ("Unable to load printing system module %s", setting->data.v_string);
-+ if (!load_printing_system (setting->data.v_string) && strncmp(setting->data.v_string,"file_plugin.so",14) == 0) {
-+ g_print ("Configure your printing system using the Xfce Settings Manager first\n");
-+ exit (EXIT_FAILURE);
-+ } else if (!load_printing_system (setting->data.v_string) ) {
-+ g_error ("Unable to load printing system module %s", setting->data.v_string);
-+ }
- mcs_setting_free (setting);
- }
- else {
-- gchar *default_system = NULL;
--
-- g_warning ("No mcs-setting found for XfPrint/system in channel %s, using default printing-system", CHANNEL);
--
-- default_system = g_build_filename (PLUGIN_DIR, "file_plugin.so", NULL);
--
-- if (!load_printing_system (default_system)) {
-- g_error ("Unable to load default printing system module %s", default_system);
-- }
--
-- g_free (default_system);
-+ g_print ("Configure your printing system using the Xfce Settings Manager first\n");
-+ exit (EXIT_FAILURE);
- }
-
- mcs_client_destroy (client);
diff --git a/print/xfce4-print/files/patch-xfprint::main.c b/print/xfce4-print/files/patch-xfprint::main.c
deleted file mode 100644
index 900a89423c5f..000000000000
--- a/print/xfce4-print/files/patch-xfprint::main.c
+++ /dev/null
@@ -1,33 +0,0 @@
---- xfprint/main.c.orig Wed Apr 13 23:55:06 2005
-+++ xfprint/main.c Wed Apr 13 23:55:07 2005
-@@ -87,22 +87,17 @@
- mcs_client_add_channel (client, CHANNEL);
-
- if (mcs_client_get_setting (client, "XfPrint/system", CHANNEL, &setting) == MCS_SUCCESS) {
-- if (!load_printing_system (setting->data.v_string))
-- g_error ("Unable to load printing system module %s", setting->data.v_string);
-+ if (!load_printing_system (setting->data.v_string) && strncmp(setting->data.v_string,"file_plugin.so",14) == 0) {
-+ g_print ("Configure your printing system using the Xfce Settings Manager first\n");
-+ exit (EXIT_FAILURE);
-+ } else if (!load_printing_system (setting->data.v_string) ) {
-+ g_error ("Unable to load printing system module %s", setting->data.v_string);
-+ }
- mcs_setting_free (setting);
- }
- else {
-- gchar *default_system = NULL;
--
-- g_warning ("No mcs-setting found for XfPrint/system in channel %s, using default printing-system", CHANNEL);
--
-- default_system = g_build_filename (PLUGIN_DIR, "file_plugin.so", NULL);
--
-- if (!load_printing_system (default_system)) {
-- g_error ("Unable to load default printing system module %s", default_system);
-- }
--
-- g_free (default_system);
-+ g_print ("Configure your printing system using the Xfce Settings Manager first\n");
-+ exit (EXIT_FAILURE);
- }
-
- mcs_client_destroy (client);
diff --git a/print/xfce4-print/pkg-plist b/print/xfce4-print/pkg-plist
index de2ff3edc95a..63f34005498b 100644
--- a/print/xfce4-print/pkg-plist
+++ b/print/xfce4-print/pkg-plist
@@ -12,9 +12,11 @@ share/locale/ar/LC_MESSAGES/xfprint.mo
share/locale/az/LC_MESSAGES/xfprint.mo
share/locale/be/LC_MESSAGES/xfprint.mo
share/locale/bg/LC_MESSAGES/xfprint.mo
+share/locale/bn_IN/LC_MESSAGES/xfprint.mo
share/locale/ca/LC_MESSAGES/xfprint.mo
share/locale/cs/LC_MESSAGES/xfprint.mo
share/locale/de/LC_MESSAGES/xfprint.mo
+share/locale/el/LC_MESSAGES/xfprint.mo
share/locale/en_GB/LC_MESSAGES/xfprint.mo
share/locale/es/LC_MESSAGES/xfprint.mo
share/locale/es_MX/LC_MESSAGES/xfprint.mo
@@ -31,6 +33,7 @@ share/locale/it/LC_MESSAGES/xfprint.mo
share/locale/ja/LC_MESSAGES/xfprint.mo
share/locale/ko/LC_MESSAGES/xfprint.mo
share/locale/lt/LC_MESSAGES/xfprint.mo
+share/locale/mr/LC_MESSAGES/xfprint.mo
share/locale/ms/LC_MESSAGES/xfprint.mo
share/locale/nl/LC_MESSAGES/xfprint.mo
share/locale/pa/LC_MESSAGES/xfprint.mo
@@ -55,11 +58,26 @@ share/xfce4/doc/C/images/xfprint_prettyprinting.png
share/xfce4/doc/C/images/xfprint_sheets.png
share/xfce4/doc/C/images/xfprint_virtualpages.png
share/xfce4/doc/C/xfprint.html
+share/xfce4/doc/fr/images/xfprint_headings.png
+share/xfce4/doc/fr/images/xfprint_input.png
+share/xfce4/doc/fr/images/xfprint-manager.png
+share/xfce4/doc/fr/images/xfprint-manager-queue.png
+share/xfce4/doc/fr/images/xfprint_mcs_plugin.png
+share/xfce4/doc/fr/images/xfprint_prettyprinting.png
+share/xfce4/doc/fr/images/xfprint_sheets.png
+share/xfce4/doc/fr/images/xfprint_virtualpages.png
+share/xfce4/doc/fr/xfprint.html
@unexec rmdir %D/lib/xfce4/mcs-plugins 2>/dev/null || true
@unexec rmdir %D/lib/xfce4/xfprint-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
diff --git a/sysutils/xfce4-mcs-manager/Makefile b/sysutils/xfce4-mcs-manager/Makefile
index af62cca917f4..265a8c7a4d61 100644
--- a/sysutils/xfce4-mcs-manager/Makefile
+++ b/sysutils/xfce4-mcs-manager/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xfce4-mcs-manager
-PORTVERSION= 4.2.1
+PORTVERSION= 4.2.2
PORTREVISION= 0
CATEGORIES= sysutils xfce
MASTER_SITES= http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
@@ -24,7 +24,7 @@ LIB_DEPENDS= xfce4util.1:${PORTSDIR}/x11/libxfce4util \
xfce4mcs-manager.2:${PORTSDIR}/x11/libxfce4mcs
USE_GETTEXT= yes
-USE_GNOME= glib20
+USE_GNOME= glib20 gnomehack
USE_REINPLACE= yes
USE_X_PREFIX= yes
GNU_CONFIGURE= yes
@@ -33,8 +33,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}/xfce-mcs-manager/Makefile.in
-
.include <bsd.port.mk>
diff --git a/sysutils/xfce4-mcs-manager/distinfo b/sysutils/xfce4-mcs-manager/distinfo
index 9445e274832e..5ee2583f0792 100644
--- a/sysutils/xfce4-mcs-manager/distinfo
+++ b/sysutils/xfce4-mcs-manager/distinfo
@@ -1,2 +1,2 @@
-MD5 (xfce4/xfce-mcs-manager-4.2.1.tar.gz) = 72b68d04bd5ec76fd0a147f824ee049c
-SIZE(xfce4/xfce-mcs-manager-4.2.1.tar.gz) = 503481
+MD5 (xfce4/xfce-mcs-manager-4.2.2.tar.gz) = 9f6cdb3f11fc57a458fe7c91540181c9
+SIZE(xfce4/xfce-mcs-manager-4.2.2.tar.gz) = 642964
diff --git a/sysutils/xfce4-mcs-manager/pkg-plist b/sysutils/xfce4-mcs-manager/pkg-plist
index 63af73fa2d35..48b70fbadcb7 100644
--- a/sysutils/xfce4-mcs-manager/pkg-plist
+++ b/sysutils/xfce4-mcs-manager/pkg-plist
@@ -8,11 +8,14 @@ share/locale/ar/LC_MESSAGES/xfce-mcs-manager.mo
share/locale/az/LC_MESSAGES/xfce-mcs-manager.mo
share/locale/be/LC_MESSAGES/xfce-mcs-manager.mo
share/locale/bg/LC_MESSAGES/xfce-mcs-manager.mo
+share/locale/bn_IN/LC_MESSAGES/xfce-mcs-manager.mo
share/locale/ca/LC_MESSAGES/xfce-mcs-manager.mo
share/locale/cs/LC_MESSAGES/xfce-mcs-manager.mo
share/locale/da/LC_MESSAGES/xfce-mcs-manager.mo
share/locale/de/LC_MESSAGES/xfce-mcs-manager.mo
+share/locale/el/LC_MESSAGES/xfce-mcs-manager.mo
share/locale/en_GB/LC_MESSAGES/xfce-mcs-manager.mo
+share/locale/eo/LC_MESSAGES/xfce-mcs-manager.mo
share/locale/es/LC_MESSAGES/xfce-mcs-manager.mo
share/locale/es_MX/LC_MESSAGES/xfce-mcs-manager.mo
share/locale/et/LC_MESSAGES/xfce-mcs-manager.mo
@@ -28,6 +31,7 @@ share/locale/it/LC_MESSAGES/xfce-mcs-manager.mo
share/locale/ja/LC_MESSAGES/xfce-mcs-manager.mo
share/locale/ko/LC_MESSAGES/xfce-mcs-manager.mo
share/locale/lt/LC_MESSAGES/xfce-mcs-manager.mo
+share/locale/mr/LC_MESSAGES/xfce-mcs-manager.mo
share/locale/ms/LC_MESSAGES/xfce-mcs-manager.mo
share/locale/nb_NO/LC_MESSAGES/xfce-mcs-manager.mo
share/locale/nl/LC_MESSAGES/xfce-mcs-manager.mo
@@ -49,13 +53,24 @@ share/xfce4/doc/C/images/settings_manager.png
share/xfce4/doc/C/images/smgr_from_root_menu.png
share/xfce4/doc/C/images/smgr_from_setup_button.png
share/xfce4/doc/C/xfce-mcs-manager.html
+share/xfce4/doc/fr/images/settings_manager.png
+share/xfce4/doc/fr/images/smgr_from_panel.png
+share/xfce4/doc/fr/images/smgr_from_root_menu.png
+share/xfce4/doc/fr/images/smgr_from_setup_button.png
+share/xfce4/doc/fr/xfce-mcs-manager.html
@dirrm include/xfce4/xfce-mcs-manager
@unexec rmdir %D/include/xfce4 2>/dev/null || true
@unexec rmdir %D/share/applications 2>/dev/null || true
@unexec rmdir %D/share/icons/hicolor 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
diff --git a/sysutils/xfce4-mcs-plugins/Makefile b/sysutils/xfce4-mcs-plugins/Makefile
index a91dc28eb937..1b8b132b462a 100644
--- a/sysutils/xfce4-mcs-plugins/Makefile
+++ b/sysutils/xfce4-mcs-plugins/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xfce4-mcs-plugins
-PORTVERSION= 4.2.1
+PORTVERSION= 4.2.2
PORTREVISION= 0
CATEGORIES= sysutils xfce
MASTER_SITES= http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
diff --git a/sysutils/xfce4-mcs-plugins/distinfo b/sysutils/xfce4-mcs-plugins/distinfo
index 696d0bdad3a0..4ed91f09b04f 100644
--- a/sysutils/xfce4-mcs-plugins/distinfo
+++ b/sysutils/xfce4-mcs-plugins/distinfo
@@ -1,2 +1,2 @@
-MD5 (xfce4/xfce-mcs-plugins-4.2.1.tar.gz) = 808bf377fbbbb2fad06095286be52dc5
-SIZE(xfce4/xfce-mcs-plugins-4.2.1.tar.gz) = 662653
+MD5 (xfce4/xfce-mcs-plugins-4.2.2.tar.gz) = 6e23972a2a0b3b3e7852bfc68dc0eeb8
+SIZE(xfce4/xfce-mcs-plugins-4.2.2.tar.gz) = 857474
diff --git a/sysutils/xfce4-mcs-plugins/pkg-plist b/sysutils/xfce4-mcs-plugins/pkg-plist
index 3f30b8c6c896..e1115196838c 100644
--- a/sysutils/xfce4-mcs-plugins/pkg-plist
+++ b/sysutils/xfce4-mcs-plugins/pkg-plist
@@ -19,9 +19,11 @@ share/locale/ar/LC_MESSAGES/xfce-mcs-plugins.mo
share/locale/az/LC_MESSAGES/xfce-mcs-plugins.mo
share/locale/bg/LC_MESSAGES/xfce-mcs-plugins.mo
share/locale/be/LC_MESSAGES/xfce-mcs-plugins.mo
+share/locale/bn_IN/LC_MESSAGES/xfce-mcs-plugins.mo
share/locale/ca/LC_MESSAGES/xfce-mcs-plugins.mo
share/locale/cs/LC_MESSAGES/xfce-mcs-plugins.mo
share/locale/de/LC_MESSAGES/xfce-mcs-plugins.mo
+share/locale/el/LC_MESSAGES/xfce-mcs-plugins.mo
share/locale/en_GB/LC_MESSAGES/xfce-mcs-plugins.mo
share/locale/es/LC_MESSAGES/xfce-mcs-plugins.mo
share/locale/es_MX/LC_MESSAGES/xfce-mcs-plugins.mo
@@ -38,6 +40,7 @@ share/locale/it/LC_MESSAGES/xfce-mcs-plugins.mo
share/locale/ja/LC_MESSAGES/xfce-mcs-plugins.mo
share/locale/ko/LC_MESSAGES/xfce-mcs-plugins.mo
share/locale/lt/LC_MESSAGES/xfce-mcs-plugins.mo
+share/locale/mr/LC_MESSAGES/xfce-mcs-plugins.mo
share/locale/ms/LC_MESSAGES/xfce-mcs-plugins.mo
share/locale/nl/LC_MESSAGES/xfce-mcs-plugins.mo
share/locale/pa/LC_MESSAGES/xfce-mcs-plugins.mo
@@ -61,9 +64,21 @@ share/xfce4/doc/C/images/mouse_settings.png
share/xfce4/doc/C/images/user_interface_settings.png
share/xfce4/doc/C/images/user_interface_settings_icons.png
share/xfce4/doc/C/xfce-mcs-plugins.html
+share/xfce4/doc/fr/images/display_preferences.png
+share/xfce4/doc/fr/images/font_selection.png
+share/xfce4/doc/fr/images/keyboard_settings.png
+share/xfce4/doc/fr/images/mouse_settings.png
+share/xfce4/doc/fr/images/user_interface_settings.png
+share/xfce4/doc/fr/xfce-mcs-plugins.html
@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/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
diff --git a/sysutils/xfce4-utils/Makefile b/sysutils/xfce4-utils/Makefile
index 1c1e761c8bad..40fa7559406e 100644
--- a/sysutils/xfce4-utils/Makefile
+++ b/sysutils/xfce4-utils/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xfce4-utils
-PORTVERSION= 4.2.1
+PORTVERSION= 4.2.2
PORTREVISION= 0
CATEGORIES= sysutils xfce
MASTER_SITES= http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
diff --git a/sysutils/xfce4-utils/distinfo b/sysutils/xfce4-utils/distinfo
index f302a7f1c3e7..e346acac1eb8 100644
--- a/sysutils/xfce4-utils/distinfo
+++ b/sysutils/xfce4-utils/distinfo
@@ -1,2 +1,2 @@
-MD5 (xfce4/xfce-utils-4.2.1.tar.gz) = 73b75582ab05f443e3106d4d661207e9
-SIZE(xfce4/xfce-utils-4.2.1.tar.gz) = 748056
+MD5 (xfce4/xfce-utils-4.2.2.tar.gz) = 585e1fd48dee70c50271ac478e8adcd0
+SIZE(xfce4/xfce-utils-4.2.2.tar.gz) = 1031911
diff --git a/sysutils/xfce4-utils/pkg-plist b/sysutils/xfce4-utils/pkg-plist
index 596f7713ca84..8e6b3fc4ea67 100644
--- a/sysutils/xfce4-utils/pkg-plist
+++ b/sysutils/xfce4-utils/pkg-plist
@@ -16,10 +16,12 @@ share/locale/ar/LC_MESSAGES/xfce-utils.mo
share/locale/az/LC_MESSAGES/xfce-utils.mo
share/locale/be/LC_MESSAGES/xfce-utils.mo
share/locale/bg/LC_MESSAGES/xfce-utils.mo
+share/locale/bn_IN/LC_MESSAGES/xfce-utils.mo
share/locale/ca/LC_MESSAGES/xfce-utils.mo
share/locale/cs/LC_MESSAGES/xfce-utils.mo
share/locale/da/LC_MESSAGES/xfce-utils.mo
share/locale/de/LC_MESSAGES/xfce-utils.mo
+share/locale/el/LC_MESSAGES/xfce-utils.mo
share/locale/en_GB/LC_MESSAGES/xfce-utils.mo
share/locale/es/LC_MESSAGES/xfce-utils.mo
share/locale/es_MX/LC_MESSAGES/xfce-utils.mo
@@ -36,6 +38,7 @@ share/locale/it/LC_MESSAGES/xfce-utils.mo
share/locale/ja/LC_MESSAGES/xfce-utils.mo
share/locale/ko/LC_MESSAGES/xfce-utils.mo
share/locale/lt/LC_MESSAGES/xfce-utils.mo
+share/locale/mr/LC_MESSAGES/xfce-utils.mo
share/locale/ms/LC_MESSAGES/xfce-utils.mo
share/locale/nl/LC_MESSAGES/xfce-utils.mo
share/locale/pl/LC_MESSAGES/xfce-utils.mo
@@ -132,6 +135,22 @@ share/xfce4/doc/C/xfce4-intro.html
share/xfce4/doc/C/xfce4-copyright.html
share/xfce4/doc/C/xfce4-use.html
share/xfce4/doc/C/xfce4-install.html
+share/xfce4/doc/fr/index.html
+share/xfce4/doc/fr/images/default-session.png
+share/xfce4/doc/fr/images/link_xfce.jpg
+share/xfce4/doc/fr/images/about-dialog.png
+share/xfce4/doc/fr/images/run-dialog.png
+share/xfce4/doc/fr/images/taskbar_settings.png
+share/xfce4/doc/fr/BSD.html
+share/xfce4/doc/fr/GPL.html
+share/xfce4/doc/fr/LGPL.html
+share/xfce4/doc/fr/xfce4-user-guide.html
+share/xfce4/doc/fr/xfce4-intro.html
+share/xfce4/doc/fr/xfce4-copyright.html
+share/xfce4/doc/fr/xfce4-components.html
+share/xfce4/doc/fr/xfce4-use.html
+share/xfce4/doc/fr/xfce4-install.html
+share/xfce4/doc/fr/xfce-utils.html
share/xfce4/doc/xfce.css
share/xfce4/doc/xfce-mouse.png
@unexec rmdir %D/etc/xdg/xfce4 2>/dev/null || true
@@ -140,11 +159,13 @@ share/xfce4/doc/xfce-mouse.png
@unexec rmdir %D/lib/xfce4/mcs-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/it/images 2>/dev/null || true
-@unexec rmdir %D/share/xfce4/doc/it 2>/dev/null || true
@unexec rmdir %D/share/xfce4/doc 2>/dev/null || true
@unexec rmdir %D/share/xfce4 2>/dev/null || true
diff --git a/x11-fm/xfce4-fm/Makefile b/x11-fm/xfce4-fm/Makefile
index 9982be0c476b..d15e9255ef68 100644
--- a/x11-fm/xfce4-fm/Makefile
+++ b/x11-fm/xfce4-fm/Makefile
@@ -6,8 +6,8 @@
#
PORTNAME= xfce4-fm
-PORTVERSION= 4.2.1
-PORTREVISION= 1
+PORTVERSION= 4.2.2
+PORTREVISION= 0
CATEGORIES= x11-fm xfce
MASTER_SITES= http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
http://www.ca-us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
@@ -26,7 +26,7 @@ LIB_DEPENDS= dbh-1.0.1:${PORTSDIR}/databases/dbh \
xfcegui4.3:${PORTSDIR}/x11-toolkits/libxfce4gui
USE_GETTEXT= yes
-USE_GNOME= gtk20
+USE_GNOME= gtk20 gnomehack
USE_REINPLACE= yes
USE_X_PREFIX= yes
USE_XPM= yes
@@ -46,13 +46,4 @@ CONFIGURE_ARGS+=--enable-librsvg
CONFIGURE_ARGS+=--disable-librsvg
.endif
-post-build:
- cd ${WRKSRC}/modules && \
- ${CC} -shared .libs/libxffm_prop_la-properties.o ../src/xffm-easy.o \
- -L${LOCALBASE}/lib -Wl,-soname -Wl,libxffm_prop.so.0 \
- -o .libs/libxffm_prop.so.0
-post-patch:
- @${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \
- ${WRKSRC}/src/Makefile.in
-
.include <bsd.port.mk>
diff --git a/x11-fm/xfce4-fm/distinfo b/x11-fm/xfce4-fm/distinfo
index e9f6be6c46e8..12e231d46b41 100644
--- a/x11-fm/xfce4-fm/distinfo
+++ b/x11-fm/xfce4-fm/distinfo
@@ -1,2 +1,2 @@
-MD5 (xfce4/xffm-4.2.1.tar.gz) = 3a0acb92243a303c7454840a8e832ba0
-SIZE(xfce4/xffm-4.2.1.tar.gz) = 2984716
+MD5 (xfce4/xffm-4.2.2.tar.gz) = 5eb5ede5b2bfac564c26d96ee06a3241
+SIZE(xfce4/xffm-4.2.2.tar.gz) = 4393723
diff --git a/x11-fm/xfce4-fm/pkg-plist b/x11-fm/xfce4-fm/pkg-plist
index b8fc8bc44735..dc58f362edf1 100644
--- a/x11-fm/xfce4-fm/pkg-plist
+++ b/x11-fm/xfce4-fm/pkg-plist
@@ -45,7 +45,7 @@ lib/xfce4/xffm/libxffm_fstab.so
lib/xfce4/xffm/libxffm_fstab.so.1
lib/xfce4/xffm/libxffm_prop.a
lib/xfce4/xffm/libxffm_prop.so
-lib/xfce4/xffm/libxffm_prop.so.0
+lib/xfce4/xffm/libxffm_prop.so.1
lib/xfce4/xffm/libxffm_recent.a
lib/xfce4/xffm/libxffm_recent.so
lib/xfce4/xffm/libxffm_recent.so.1
@@ -169,6 +169,7 @@ share/icons/hicolor/48x48/stock/generic/t-pastelink.png
share/locale/ar/LC_MESSAGES/xffm.mo
share/locale/az/LC_MESSAGES/xffm.mo
share/locale/bg/LC_MESSAGES/xffm.mo
+share/locale/bn_IN/LC_MESSAGES/xffm.mo
share/locale/ca/LC_MESSAGES/xffm.mo
share/locale/cs/LC_MESSAGES/xffm.mo
share/locale/de/LC_MESSAGES/xffm.mo
@@ -188,6 +189,7 @@ share/locale/it/LC_MESSAGES/xffm.mo
share/locale/ja/LC_MESSAGES/xffm.mo
share/locale/ko/LC_MESSAGES/xffm.mo
share/locale/lt/LC_MESSAGES/xffm.mo
+share/locale/mr/LC_MESSAGES/xffm.mo
share/locale/ms/LC_MESSAGES/xffm.mo
share/locale/nb_NO/LC_MESSAGES/xffm.mo
share/locale/nl/LC_MESSAGES/xffm.mo
@@ -238,6 +240,38 @@ share/xfce4/doc/C/images/tools_menu.png
share/xfce4/doc/C/images/trash_popup.png
share/xfce4/doc/C/images/xffm_default.png
share/xfce4/doc/C/xffm.html
+share/xfce4/doc/fr/images/book_popup.png
+share/xfce4/doc/fr/images/column_titles_popup.png
+share/xfce4/doc/fr/images/diagnostics_window.png
+share/xfce4/doc/fr/images/directory_popup.png
+share/xfce4/doc/fr/images/directory_popup_unmount.png
+share/xfce4/doc/fr/images/file_popup.png
+share/xfce4/doc/fr/images/file_subpopup.png
+share/xfce4/doc/fr/images/filter_box.png
+share/xfce4/doc/fr/images/frequent_popup.png
+share/xfce4/doc/fr/images/fstab_popup_mount.png
+share/xfce4/doc/fr/images/go_menu.png
+share/xfce4/doc/fr/images/hide_show_buttons.png
+share/xfce4/doc/fr/images/icon_title_smartbutton.png
+share/xfce4/doc/fr/images/main_menu.png
+share/xfce4/doc/fr/images/mcs-plugin.png
+share/xfce4/doc/fr/images/netfile_popup.png
+share/xfce4/doc/fr/images/open_menu.png
+share/xfce4/doc/fr/images/options_menu.png
+share/xfce4/doc/fr/images/preferences_menu.png
+share/xfce4/doc/fr/images/recent_popup.png
+share/xfce4/doc/fr/images/sidebar_filesubmenu.png
+share/xfce4/doc/fr/images/sidebar_go.png
+share/xfce4/doc/fr/images/sidebar_multiple_select.png
+share/xfce4/doc/fr/images/sidebar_open.png
+share/xfce4/doc/fr/images/sidebar_options.png
+share/xfce4/doc/fr/images/sidebar_paste.png
+share/xfce4/doc/fr/images/sidebar_tools.png
+share/xfce4/doc/fr/images/sort_subpopup.png
+share/xfce4/doc/fr/images/tools_menu.png
+share/xfce4/doc/fr/images/trash_popup.png
+share/xfce4/doc/fr/images/xffm_default.png
+share/xfce4/doc/fr/xffm.html
share/xfce4/xffm/AUTHORS
share/xfce4/xffm/AUTHORS.vi
share/xfce4/xffm/xffm.spec
@@ -251,12 +285,16 @@ share/xfce4/xffm/xffm.spec.in
@unexec rmdir %D/share/icons/hicolor/48x48 2>/dev/null || true
@unexec rmdir %D/share/icons/hicolor 2>/dev/null || true
@unexec rmdir %D/share/icons 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/it 2>/dev/null || true
@unexec rmdir %D/share/xfce4/doc 2>/dev/null || true
@unexec rmdir %D/share/xfce4/mime 2>/dev/null || true
@dirrm share/xfce4/xffm
diff --git a/x11-themes/gtk-xfce-engine/Makefile b/x11-themes/gtk-xfce-engine/Makefile
index f3a64a63e569..1a8c1d6d8c04 100644
--- a/x11-themes/gtk-xfce-engine/Makefile
+++ b/x11-themes/gtk-xfce-engine/Makefile
@@ -6,12 +6,12 @@
#
PORTNAME= gtk-xfce-engine
-PORTVERSION= 2.2.6
+PORTVERSION= 2.2.7
PORTREVISION= 0
CATEGORIES= x11-themes xfce
-MASTER_SITES= http://www.us.xfce.org/archive/xfce-4.2.1.1/src/ \
- http://www.ca-us.xfce.org/archive/xfce-4.2.1.1/src/ \
- http://public.fh-wolfenbuettel.de/~luedickj/xfce4/xfce-4.2.1.1/src/
+MASTER_SITES= http://www.us.xfce.org/archive/xfce-4.2.2/src/ \
+ http://www.ca-us.xfce.org/archive/xfce-4.2.2/src/ \
+ http://public.fh-wolfenbuettel.de/~luedickj/xfce4/xfce-4.2.2/src/
MAINTAINER= oliver@FreeBSD.org
COMMENT= An XFCE engine for GTK 2.0
diff --git a/x11-themes/gtk-xfce-engine/distinfo b/x11-themes/gtk-xfce-engine/distinfo
index e69f79264305..ccb2c7c424b8 100644
--- a/x11-themes/gtk-xfce-engine/distinfo
+++ b/x11-themes/gtk-xfce-engine/distinfo
@@ -1,2 +1,2 @@
-MD5 (gtk-xfce-engine-2.2.6.tar.gz) = 9c713ba355d0c108599c4a8abe13db47
-SIZE(gtk-xfce-engine-2.2.6.tar.gz) = 377656
+MD5 (gtk-xfce-engine-2.2.7.tar.gz) = f9d592aa714bb003b6b012aa9002bbf7
+SIZE(gtk-xfce-engine-2.2.7.tar.gz) = 381970
diff --git a/x11-themes/xfce4-icon-theme/Makefile b/x11-themes/xfce4-icon-theme/Makefile
index d0dfeaeadb11..96d1e947fcc4 100644
--- a/x11-themes/xfce4-icon-theme/Makefile
+++ b/x11-themes/xfce4-icon-theme/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xfce4-icon-theme
-PORTVERSION= 4.2.1
+PORTVERSION= 4.2.2
PORTREVISION= 0
CATEGORIES= x11-themes xfce
MASTER_SITES= http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
diff --git a/x11-themes/xfce4-icon-theme/distinfo b/x11-themes/xfce4-icon-theme/distinfo
index a5ed7b549f4a..c817e29bbb07 100644
--- a/x11-themes/xfce4-icon-theme/distinfo
+++ b/x11-themes/xfce4-icon-theme/distinfo
@@ -1,2 +1,2 @@
-MD5 (xfce4/xfce4-icon-theme-4.2.1.tar.gz) = 951bd1d303b099a20a465f558b48d31d
-SIZE(xfce4/xfce4-icon-theme-4.2.1.tar.gz) = 1555028
+MD5 (xfce4/xfce4-icon-theme-4.2.2.tar.gz) = 9e6bdbe92649318de671f7aa3446af58
+SIZE(xfce4/xfce4-icon-theme-4.2.2.tar.gz) = 1560723
diff --git a/x11-toolkits/libxfce4gui/Makefile b/x11-toolkits/libxfce4gui/Makefile
index d2c2c2d28056..73dcecd995b3 100644
--- a/x11-toolkits/libxfce4gui/Makefile
+++ b/x11-toolkits/libxfce4gui/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= libxfce4gui
-PORTVERSION= 4.2.1
+PORTVERSION= 4.2.2
PORTREVISION= 0
CATEGORIES= x11-toolkits xfce
MASTER_SITES= http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
@@ -22,7 +22,7 @@ COMMENT= XFce 4 widget library required by xfce4 and xfwm4
LIB_DEPENDS= dbh-1.0.1:${PORTSDIR}/databases/dbh \
xfce4util.1:${PORTSDIR}/x11/libxfce4util
-USE_GNOME= gtk20
+USE_GNOME= gtk20 gnomehack
USE_REINPLACE= yes
USE_X_PREFIX= yes
USE_LIBTOOL_VER=15
@@ -37,8 +37,4 @@ CONFIGURE_ARGS+=--enable-gtk-doc
CONFIGURE_ARGS+=--disable-gtk-doc
.endif
-post-patch:
- @${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \
- ${WRKSRC}/libxfcegui4/Makefile.in
-
.include <bsd.port.mk>
diff --git a/x11-toolkits/libxfce4gui/distinfo b/x11-toolkits/libxfce4gui/distinfo
index 748cba9eb332..a706b9281490 100644
--- a/x11-toolkits/libxfce4gui/distinfo
+++ b/x11-toolkits/libxfce4gui/distinfo
@@ -1,2 +1,2 @@
-MD5 (xfce4/libxfcegui4-4.2.1.tar.gz) = b9f19e48fe64eec4cb0878dd0c795d9d
-SIZE(xfce4/libxfcegui4-4.2.1.tar.gz) = 832328
+MD5 (xfce4/libxfcegui4-4.2.2.tar.gz) = e88d6e8379eae60cee6dd6122bf3ae59
+SIZE(xfce4/libxfcegui4-4.2.2.tar.gz) = 853844
diff --git a/x11-wm/xfce4-desktop/Makefile b/x11-wm/xfce4-desktop/Makefile
index ed515d4c16d5..9a2de7e6e903 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 3c2eba95b670..8159261615b5 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 0d5bc67e53ef..224f9481ee29 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 f3417959d011..921f1ba31a9d 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 c94026479aea..7d6c9ecfaf43 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 c9b19919ea27..255eafbcdb32 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 b5e65666aee3..2547388c0f8e 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 873dde960bee..910bf549bb77 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 ff0407dc63c4..2a5eb1d4b1b1 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 27d8075b7495..38ae61e85e80 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 ddd7aa05725b..d2c05398a4ea 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 e2298e31fa0c..1d23d2b4c770 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 c9fe5a95a25c..86758e1ff5f4 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 c443a89c1f14..04580daaf5a4 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 32ae43310f69..2c61272905fe 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
diff --git a/x11/libxfce4mcs/Makefile b/x11/libxfce4mcs/Makefile
index bf6141038720..4b20bed6a973 100644
--- a/x11/libxfce4mcs/Makefile
+++ b/x11/libxfce4mcs/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= libxfce4mcs
-PORTVERSION= 4.2.1
+PORTVERSION= 4.2.2
PORTREVISION= 0
CATEGORIES= x11 xfce
MASTER_SITES= http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
@@ -20,7 +20,7 @@ COMMENT= XFce 4 settings management library used by most XFce 4 modules
LIB_DEPENDS= xfce4util.1:${PORTSDIR}/x11/libxfce4util
-USE_GNOME= glib20
+USE_GNOME= glib20 gnomehack
USE_REINPLACE= yes
USE_X_PREFIX= yes
GNU_CONFIGURE= yes
@@ -36,8 +36,4 @@ CONFIGURE_ARGS+=--enable-gtk-doc
CONFIGURE_ARGS+=--disable-gtk-doc
.endif
-post-patch:
- @${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \
- ${WRKSRC}/${PORTNAME}/Makefile.in
-
.include <bsd.port.mk>
diff --git a/x11/libxfce4mcs/distinfo b/x11/libxfce4mcs/distinfo
index ff576aba9aba..fae2f88028ad 100644
--- a/x11/libxfce4mcs/distinfo
+++ b/x11/libxfce4mcs/distinfo
@@ -1,2 +1,2 @@
-MD5 (xfce4/libxfce4mcs-4.2.1.tar.gz) = 776e3701d7b369722fc77101d523a7c4
-SIZE(xfce4/libxfce4mcs-4.2.1.tar.gz) = 369471
+MD5 (xfce4/libxfce4mcs-4.2.2.tar.gz) = 06c3d8ea6826d9a2fbcc1da6b86f1361
+SIZE(xfce4/libxfce4mcs-4.2.2.tar.gz) = 372951
diff --git a/x11/libxfce4util/Makefile b/x11/libxfce4util/Makefile
index 6e5476214a45..9bebbd809be0 100644
--- a/x11/libxfce4util/Makefile
+++ b/x11/libxfce4util/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= libxfce4util
-PORTVERSION= 4.2.1
+PORTVERSION= 4.2.2
PORTREVISION= 0
CATEGORIES= x11 xfce
MASTER_SITES= http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
@@ -18,7 +18,7 @@ DIST_SUBDIR= xfce4
MAINTAINER= oliver@FreeBSD.org
COMMENT= XFce 4 library with non-graphical helper functions
-USE_GNOME= glib20
+USE_GNOME= glib20 gnomehack
USE_REINPLACE= yes
USE_X_PREFIX= yes
GNU_CONFIGURE= yes
@@ -34,8 +34,4 @@ CONFIGURE_ARGS+=--enable-gtk-doc
CONFIGURE_ARGS+=--disable-gtk-doc
.endif
-post-patch:
- @${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \
- ${WRKSRC}/${PORTNAME}/Makefile.in
-
.include <bsd.port.mk>
diff --git a/x11/libxfce4util/distinfo b/x11/libxfce4util/distinfo
index 5f0500a9fbad..b615f5fdd33d 100644
--- a/x11/libxfce4util/distinfo
+++ b/x11/libxfce4util/distinfo
@@ -1,2 +1,2 @@
-MD5 (xfce4/libxfce4util-4.2.1.tar.gz) = c3e8b0cb8ccbf639dbec1cf516e3be57
-SIZE(xfce4/libxfce4util-4.2.1.tar.gz) = 447569
+MD5 (xfce4/libxfce4util-4.2.2.tar.gz) = 5f27635aa0ba5e40ffaf3031b530b36b
+SIZE(xfce4/libxfce4util-4.2.2.tar.gz) = 458244
diff --git a/x11/xfce4-trigger-launcher/Makefile b/x11/xfce4-trigger-launcher/Makefile
index 34c6343ac4b0..809f09235178 100644
--- a/x11/xfce4-trigger-launcher/Makefile
+++ b/x11/xfce4-trigger-launcher/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xfce4-trigger-launcher
-PORTVERSION= 4.2.1
+PORTVERSION= 4.2.2
PORTREVISION= 0
CATEGORIES= x11 xfce
MASTER_SITES= http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
diff --git a/x11/xfce4-trigger-launcher/distinfo b/x11/xfce4-trigger-launcher/distinfo
index adc065b91bd4..1b859ff00201 100644
--- a/x11/xfce4-trigger-launcher/distinfo
+++ b/x11/xfce4-trigger-launcher/distinfo
@@ -1,2 +1,2 @@
-MD5 (xfce4/xfce4-trigger-launcher-4.2.1.tar.gz) = b7389af7f87f0962decab5c248aaa6d6
-SIZE(xfce4/xfce4-trigger-launcher-4.2.1.tar.gz) = 345483
+MD5 (xfce4/xfce4-trigger-launcher-4.2.2.tar.gz) = 1cab5f643c86b0ad7cc6be4d6e88f7ec
+SIZE(xfce4/xfce4-trigger-launcher-4.2.2.tar.gz) = 352792