4 files changed, 8 insertions, 36 deletions

diff --git a/deskutils/xfce4-xkb-plugin/Makefile b/deskutils/xfce4-xkb-plugin/Makefile
index 2df6936437de..e905d00377ab 100644
--- a/deskutils/xfce4-xkb-plugin/Makefile
+++ b/deskutils/xfce4-xkb-plugin/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	xfce4-xkb-plugin
-PORTVERSION=	0.5.3.3
+PORTVERSION=	0.5.4.0
 CATEGORIES=	deskutils xfce
-MASTER_SITES=	CRITICAL/.
-DIST_SUBDIR=	xfce4
+MASTER_SITES=	${MASTER_SITE_XFCE}
+MASTER_SITE_SUBDIR=	src/panel-plugins/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	Keyboard layout switching plugin for XFce4
diff --git a/deskutils/xfce4-xkb-plugin/distinfo b/deskutils/xfce4-xkb-plugin/distinfo
index fde1d4d003b3..3abe2d9d43b8 100644
--- a/deskutils/xfce4-xkb-plugin/distinfo
+++ b/deskutils/xfce4-xkb-plugin/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xfce4/xfce4-xkb-plugin-0.5.3.3.tar.bz2) = 157284a5c7f261fcac47b1d352f0c45b8f480c660d28cba225cb4b0e3b9f7b5f
-SIZE (xfce4/xfce4-xkb-plugin-0.5.3.3.tar.bz2) = 700250
+SHA256 (xfce4-xkb-plugin-0.5.4.0.tar.bz2) = 6f1c508ffcc0409b3c75673772009474d0b7feeb0be9558f6af20c177f34cde7
+SIZE (xfce4-xkb-plugin-0.5.4.0.tar.bz2) = 770012
diff --git a/deskutils/xfce4-xkb-plugin/files/patch-panel-plugin__xkb-config.c b/deskutils/xfce4-xkb-plugin/files/patch-panel-plugin__xkb-config.c
deleted file mode 100644
index be21affd8a71..000000000000
--- a/deskutils/xfce4-xkb-plugin/files/patch-panel-plugin__xkb-config.c
+++ /dev/null
@@ -1,30 +0,0 @@
---- ./panel-plugin/xkb-config.c.orig	2011-03-21 11:32:35.000000000 +0100
-+++ ./panel-plugin/xkb-config.c	2011-03-21 11:34:21.000000000 +0100
-@@ -150,7 +150,7 @@
-     config->application_map = g_hash_table_new (g_direct_hash, NULL);
- 
-     registry = xkl_config_registry_get_instance (config->engine);
--    xkl_config_registry_load (registry);
-+    xkl_config_registry_load (registry, FALSE);
-     
-     config_item = xkl_config_item_new ();
- 
-@@ -214,7 +214,8 @@
- 
-     gdk_window_remove_filter (NULL, (GdkFilterFunc) handle_xevent, NULL);
- 
--    xkl_engine_stop_listen (config->engine);
-+    xkl_engine_stop_listen (config->engine,
-+	XKLL_MANAGE_LAYOUTS | XKLL_MANAGE_WINDOW_STATES);
- }
- 
- gint
-@@ -547,7 +548,7 @@
-     if (!config) return NULL;
- 
-     registry = xkl_config_registry_get_instance (config->engine);
--    xkl_config_registry_load (registry);
-+    xkl_config_registry_load (registry, FALSE);
- 
-     return registry;
- }
diff --git a/deskutils/xfce4-xkb-plugin/pkg-plist b/deskutils/xfce4-xkb-plugin/pkg-plist
index 319851d860db..e7102dc7407a 100644
--- a/deskutils/xfce4-xkb-plugin/pkg-plist
+++ b/deskutils/xfce4-xkb-plugin/pkg-plist
@@ -1,5 +1,6 @@
 libexec/xfce4/panel-plugins/xfce4-xkb-plugin
 share/locale/ar/LC_MESSAGES/xfce4-xkb-plugin.mo
+share/locale/ast/LC_MESSAGES/xfce4-xkb-plugin.mo
 share/locale/be/LC_MESSAGES/xfce4-xkb-plugin.mo
 share/locale/bg/LC_MESSAGES/xfce4-xkb-plugin.mo
 share/locale/ca/LC_MESSAGES/xfce4-xkb-plugin.mo
@@ -26,6 +27,7 @@ share/locale/sv/LC_MESSAGES/xfce4-xkb-plugin.mo
 share/locale/tr/LC_MESSAGES/xfce4-xkb-plugin.mo
 share/locale/uk/LC_MESSAGES/xfce4-xkb-plugin.mo
 share/locale/ur/LC_MESSAGES/xfce4-xkb-plugin.mo
+share/locale/ur_PK/LC_MESSAGES/xfce4-xkb-plugin.mo
 share/locale/zh_CN/LC_MESSAGES/xfce4-xkb-plugin.mo
 share/locale/zh_TW/LC_MESSAGES/xfce4-xkb-plugin.mo
 share/xfce4/panel-plugins/xkb-plugin.desktop
@@ -94,6 +96,7 @@ share/xfce4/xkb/flags/pl.svg
 share/xfce4/xkb/flags/pt.svg
 share/xfce4/xkb/flags/qa.svg
 share/xfce4/xkb/flags/ro.svg
+share/xfce4/xkb/flags/rs.svg
 share/xfce4/xkb/flags/ru.svg
 share/xfce4/xkb/flags/sa.svg
 share/xfce4/xkb/flags/sd.svg
@@ -112,7 +115,6 @@ share/xfce4/xkb/flags/uy.svg
 share/xfce4/xkb/flags/uz.svg
 share/xfce4/xkb/flags/vn.svg
 share/xfce4/xkb/flags/ye.svg
-share/xfce4/xkb/flags/yu.svg
 @dirrmtry libexec/xfce4/panel-plugins
 @dirrmtry libexec/xfce4
 @dirrmtry share/xfce4/panel-plugins