6 files changed, 75 insertions, 53 deletions

diff --git a/x11/gswitchit/Makefile b/x11/gswitchit/Makefile
index 7108038be072..5a9a24f5350e 100644
--- a/x11/gswitchit/Makefile
+++ b/x11/gswitchit/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gswitchit
-PORTVERSION=	2.3.3
+PORTVERSION=	2.5.0
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gswitchit
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR=	gswitchit
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A simple keyboard state indicator and switcher for GNOME Desktop
 
-LIB_DEPENDS=	xklavier.6:${PORTSDIR}/x11/libxklavier
+LIB_DEPENDS=	xklavier.7:${PORTSDIR}/x11/libxklavier
 RUN_DEPENDS=	${X11BASE}/lib/X11/xkb/rules/xfree86.xml:${PORTSDIR}/x11/XFree86-4-clients
 
 USE_X_PREFIX=	yes
diff --git a/x11/gswitchit/distinfo b/x11/gswitchit/distinfo
index 360c71549c32..392afd48cd68 100644
--- a/x11/gswitchit/distinfo
+++ b/x11/gswitchit/distinfo
@@ -1 +1 @@
-MD5 (gswitchit-2.3.3.tar.gz) = 883728c7752d5d75ccd3c15fb92f6faf
+MD5 (gswitchit-2.5.0.tar.gz) = b86074689c22a017bcb9ab392c3d60bd
diff --git a/x11/gswitchit/files/patch-applet::gswitchit_applet.c b/x11/gswitchit/files/patch-applet::gswitchit_applet.c
new file mode 100644
index 000000000000..4121f4ae1598
--- /dev/null
+++ b/x11/gswitchit/files/patch-applet::gswitchit_applet.c
@@ -0,0 +1,16 @@
+--- applet/gswitchit_applet.c.orig	Thu Oct 23 03:06:04 2003
++++ applet/gswitchit_applet.c	Thu Oct 23 03:08:53 2003
+@@ -520,11 +520,12 @@
+   unsigned i, nGroups;
+   char *pname;
+   BonoboUIComponent *popup;
++  GSList *layout;
+   popup = panel_applet_get_popup_component( PANEL_APPLET( sia->applet ) );
+   XklDebug( 160, "Registered group submenu\n" );
+   nGroups = XklGetNumGroups(  );
+   pname = ( char * ) sia->groupNames;
+-  GSList *layout = sia->xkbConfig.layouts;
++  layout = sia->xkbConfig.layouts;
+   for( i = 0; i < nGroups; i++ )
+   {
+     char verb[40];
diff --git a/x11/gswitchit/files/patch-capplets_xkb_capplet.c b/x11/gswitchit/files/patch-capplets_xkb_capplet.c
deleted file mode 100644
index 02cba716ffb2..000000000000
--- a/x11/gswitchit/files/patch-capplets_xkb_capplet.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- capplets/xkb_capplet.c.orig	Thu May 15 01:41:56 2003
-+++ capplets/xkb_capplet.c	Thu May 15 01:42:18 2003
-@@ -222,11 +222,12 @@
-                          CURRENT_OPTION_GROUP_NAME_PROPERTY, NULL );
-     } else if( GTK_IS_OPTION_MENU( optionsCtl ) )       // singlesel
-     {
-+      const gchar *optionName;
-       theItem =
-         gtk_menu_get_active( GTK_MENU
-                              ( gtk_option_menu_get_menu
-                                ( GTK_OPTION_MENU( optionsCtl ) ) ) );
--      const gchar *optionName = gtk_widget_get_name( theItem );
-+      optionName = gtk_widget_get_name( theItem );
-       XklDebug( 200, "Option [%s:%s] selected \n", groupName, optionName );
-       if( optionName != NULL && *optionName != '\0' )
-         GSwitchItConfigXkbOptionsAdd( &gswic->config, groupName, optionName );
diff --git a/x11/gswitchit/files/patch-capplets_xkb_capplet_preview.c b/x11/gswitchit/files/patch-capplets_xkb_capplet_preview.c
deleted file mode 100644
index 9d5632c5dec1..000000000000
--- a/x11/gswitchit/files/patch-capplets_xkb_capplet_preview.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- capplets/xkb_capplet_preview.c.orig	Wed Jul  2 19:50:07 2003
-+++ capplets/xkb_capplet_preview.c	Wed Jul  2 19:56:26 2003
-@@ -35,8 +35,9 @@
- static void XkbCappletPreviewRealized( GtkWidget * bonoboWidget,
-                                        GSwitchItCapplet * gswic )
- {
-+  GtkWidget *bonoboWindow;
-   XklDebug( 150, "REALIZED\n" );
--  GtkWidget *bonoboWindow =
-+  bonoboWindow =
-     GTK_WIDGET( g_object_get_data( G_OBJECT( gswic->capplet ),
-                                    PREVIEW_BONOBO_WINDOW_PROPERTY ) );
- 
-@@ -110,12 +111,13 @@
-   } else
-   {
-     // Existing bonobo window
--    XklDebug( 150, "Reusing existing bonobo window\n" );
-     GtkWidget *oldChild;
-+    BonoboUIEngine *uiEngine;
-+    XklDebug( 150, "Reusing existing bonobo window\n" );
-     bonoboWindow = GTK_WIDGET( bw );
-     bonobo_window_set_contents( BONOBO_WINDOW( bonoboWindow ), NULL );
-     uiContainer = bonobo_ui_container_new(  );
--    BonoboUIEngine *uiEngine =
-+    uiEngine =
-       bonobo_window_get_ui_engine( BONOBO_WINDOW( bonoboWindow ) );
-     bonobo_ui_container_set_engine( uiContainer, uiEngine );
-   }
diff --git a/x11/gswitchit/pkg-plist b/x11/gswitchit/pkg-plist
index 27c12ec91b65..0e45674a4ef0 100644
--- a/x11/gswitchit/pkg-plist
+++ b/x11/gswitchit/pkg-plist
@@ -7,10 +7,16 @@ etc/gconf/gconf.xml.defaults/schemas/apps/gswitchit/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gswitchit/General/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gswitchit/XKB/%gconf.xml
 etc/gconf/schemas/gswitchit.schemas
+include/gswitchit/common/gswitchit_plugin.h
+include/gswitchit/common/gswitchit_xkb_config.h
+lib/libgswitchit.a
+lib/libgswitchit.so.0
 libdata/bonobo/servers/GNOME_GSwitchItApplet.server
+libdata/pkgconfig/gswitchit.pc
 libexec/gswitchit-applet
 share/gnome/control-center-2.0/capplets/xkb-properties.desktop
 share/gnome/gnome-2.0/ui/GNOME_GSwitchItApplet.xml
+share/gnome/gswitchit/interfaces/gswitchit-plugins.glade
 share/gnome/gswitchit/interfaces/gswitchit-properties.glade
 share/gnome/gswitchit/interfaces/xkb-properties.glade
 share/gnome/help/gswitchit/C/III.applet.png
@@ -70,79 +76,119 @@ share/gnome/pixmaps/gswitchit/ar.xpm
 share/gnome/pixmaps/gswitchit/at.xpm
 share/gnome/pixmaps/gswitchit/az.xpm
 share/gnome/pixmaps/gswitchit/be.xpm
+share/gnome/pixmaps/gswitchit/ben.xpm
 share/gnome/pixmaps/gswitchit/bg.xpm
 share/gnome/pixmaps/gswitchit/bh.xpm
 share/gnome/pixmaps/gswitchit/br.xpm
+share/gnome/pixmaps/gswitchit/bs.xpm
 share/gnome/pixmaps/gswitchit/bu.xpm
 share/gnome/pixmaps/gswitchit/by-alt.xpm
 share/gnome/pixmaps/gswitchit/by.xpm
 share/gnome/pixmaps/gswitchit/ca.xpm
+share/gnome/pixmaps/gswitchit/ca_enhanced.xpm
 share/gnome/pixmaps/gswitchit/ch.xpm
 share/gnome/pixmaps/gswitchit/cu.xpm
 share/gnome/pixmaps/gswitchit/cz.xpm
-share/gnome/pixmaps/gswitchit/da.xpm
+share/gnome/pixmaps/gswitchit/cz_qwerty.xpm
 share/gnome/pixmaps/gswitchit/de.xpm
+share/gnome/pixmaps/gswitchit/de_CH.png
+share/gnome/pixmaps/gswitchit/dev.xpm
 share/gnome/pixmaps/gswitchit/dj.xpm
+share/gnome/pixmaps/gswitchit/dk.xpm
+share/gnome/pixmaps/gswitchit/dvorak.xpm
 share/gnome/pixmaps/gswitchit/dz.xpm
 share/gnome/pixmaps/gswitchit/ee.xpm
 share/gnome/pixmaps/gswitchit/eg.xpm
 share/gnome/pixmaps/gswitchit/el.xpm
-share/gnome/pixmaps/gswitchit/en7.xpm
+share/gnome/pixmaps/gswitchit/en_US.xpm
 share/gnome/pixmaps/gswitchit/es.xpm
 share/gnome/pixmaps/gswitchit/eu.xpm
 share/gnome/pixmaps/gswitchit/fi.xpm
+share/gnome/pixmaps/gswitchit/fr-latin9.xpm
 share/gnome/pixmaps/gswitchit/fr.xpm
+share/gnome/pixmaps/gswitchit/fr_CH.png
 share/gnome/pixmaps/gswitchit/gb.xpm
 share/gnome/pixmaps/gswitchit/ge.xpm
+share/gnome/pixmaps/gswitchit/ge_la.png
+share/gnome/pixmaps/gswitchit/ge_ru.png
+share/gnome/pixmaps/gswitchit/guj.xpm
+share/gnome/pixmaps/gswitchit/gur.xpm
 share/gnome/pixmaps/gswitchit/hr.xpm
 share/gnome/pixmaps/gswitchit/hu.xpm
+share/gnome/pixmaps/gswitchit/hu_qwerty.xpm
 share/gnome/pixmaps/gswitchit/ie.xpm
 share/gnome/pixmaps/gswitchit/il.xpm
+share/gnome/pixmaps/gswitchit/il_phonetic.xpm
 share/gnome/pixmaps/gswitchit/init.xpm
 share/gnome/pixmaps/gswitchit/iq.xpm
+share/gnome/pixmaps/gswitchit/ir.xpm
 share/gnome/pixmaps/gswitchit/is.xpm
 share/gnome/pixmaps/gswitchit/it.xpm
+share/gnome/pixmaps/gswitchit/iu.xpm
 share/gnome/pixmaps/gswitchit/jo.xpm
 share/gnome/pixmaps/gswitchit/jp.xpm
+share/gnome/pixmaps/gswitchit/kan.xpm
 share/gnome/pixmaps/gswitchit/km.xpm
 share/gnome/pixmaps/gswitchit/kw.xpm
 share/gnome/pixmaps/gswitchit/la.xpm
 share/gnome/pixmaps/gswitchit/lb.xpm
+share/gnome/pixmaps/gswitchit/lo.xpm
 share/gnome/pixmaps/gswitchit/lt.xpm
+share/gnome/pixmaps/gswitchit/lt_std.xpm
 share/gnome/pixmaps/gswitchit/lv.xpm
 share/gnome/pixmaps/gswitchit/ly.xpm
 share/gnome/pixmaps/gswitchit/ma.xpm
 share/gnome/pixmaps/gswitchit/mk.xpm
+share/gnome/pixmaps/gswitchit/ml.xpm
+share/gnome/pixmaps/gswitchit/mm.xpm
 share/gnome/pixmaps/gswitchit/mn.xpm
+share/gnome/pixmaps/gswitchit/mt.xpm
+share/gnome/pixmaps/gswitchit/mt_us.xpm
 share/gnome/pixmaps/gswitchit/mx.xpm
 share/gnome/pixmaps/gswitchit/nl.xpm
 share/gnome/pixmaps/gswitchit/no.xpm
+share/gnome/pixmaps/gswitchit/ogham.png
 share/gnome/pixmaps/gswitchit/om.xpm
+share/gnome/pixmaps/gswitchit/ori.xpm
 share/gnome/pixmaps/gswitchit/pl.xpm
+share/gnome/pixmaps/gswitchit/pl2.xpm
 share/gnome/pixmaps/gswitchit/ps.xpm
 share/gnome/pixmaps/gswitchit/pt.xpm
 share/gnome/pixmaps/gswitchit/qc.xpm
 share/gnome/pixmaps/gswitchit/ro.xpm
 share/gnome/pixmaps/gswitchit/ru.xpm
-share/gnome/pixmaps/gswitchit/sa.xpm
+share/gnome/pixmaps/gswitchit/ru_yawerty.xpm
+share/gnome/pixmaps/gswitchit/sapmi.xpm
+share/gnome/pixmaps/gswitchit/se.xpm
+share/gnome/pixmaps/gswitchit/se_FI.xpm
+share/gnome/pixmaps/gswitchit/se_NO.xpm
+share/gnome/pixmaps/gswitchit/se_SE.xpm
 share/gnome/pixmaps/gswitchit/si.xpm
 share/gnome/pixmaps/gswitchit/sk.xpm
+share/gnome/pixmaps/gswitchit/sk_qwerty.xpm
 share/gnome/pixmaps/gswitchit/so.xpm
+share/gnome/pixmaps/gswitchit/sr.xpm
 share/gnome/pixmaps/gswitchit/su.xpm
-share/gnome/pixmaps/gswitchit/sv.xpm
-share/gnome/pixmaps/gswitchit/sy.xpm
+share/gnome/pixmaps/gswitchit/syr.xpm
+share/gnome/pixmaps/gswitchit/tel.xpm
 share/gnome/pixmaps/gswitchit/th.xpm
+share/gnome/pixmaps/gswitchit/tj.xpm
+share/gnome/pixmaps/gswitchit/tml.xpm
 share/gnome/pixmaps/gswitchit/tn.xpm
 share/gnome/pixmaps/gswitchit/tr.xpm
 share/gnome/pixmaps/gswitchit/ua.xpm
 share/gnome/pixmaps/gswitchit/uk.xpm
 share/gnome/pixmaps/gswitchit/us.xpm
+share/gnome/pixmaps/gswitchit/us_intl.xpm
 share/gnome/pixmaps/gswitchit/uy.xpm
+share/gnome/pixmaps/gswitchit/uz.xpm
 share/gnome/pixmaps/gswitchit/vn.xpm
 share/gnome/pixmaps/gswitchit/ye.xpm
 share/gnome/pixmaps/gswitchit/yu.xpm
 share/gnome/pixmaps/xkb-properties-capplet.png
 share/locale/am/LC_MESSAGES/gswitchit.mo
+share/locale/az/LC_MESSAGES/gswitchit.mo
+share/locale/be/LC_MESSAGES/gswitchit.mo
 share/locale/bg/LC_MESSAGES/gswitchit.mo
 share/locale/cs/LC_MESSAGES/gswitchit.mo
 share/locale/de/LC_MESSAGES/gswitchit.mo
@@ -151,12 +197,15 @@ share/locale/es/LC_MESSAGES/gswitchit.mo
 share/locale/fa/LC_MESSAGES/gswitchit.mo
 share/locale/fr/LC_MESSAGES/gswitchit.mo
 share/locale/he/LC_MESSAGES/gswitchit.mo
+share/locale/it/LC_MESSAGES/gswitchit.mo
 share/locale/ja/LC_MESSAGES/gswitchit.mo
 share/locale/lv/LC_MESSAGES/gswitchit.mo
 share/locale/ml/LC_MESSAGES/gswitchit.mo
 share/locale/mn/LC_MESSAGES/gswitchit.mo
+share/locale/ms/LC_MESSAGES/gswitchit.mo
 share/locale/nl/LC_MESSAGES/gswitchit.mo
 share/locale/no/LC_MESSAGES/gswitchit.mo
+share/locale/pl/LC_MESSAGES/gswitchit.mo
 share/locale/pt/LC_MESSAGES/gswitchit.mo
 share/locale/pt_BR/LC_MESSAGES/gswitchit.mo
 share/locale/ru/LC_MESSAGES/gswitchit.mo
@@ -174,6 +223,8 @@ share/locale/zh_CN/LC_MESSAGES/gswitchit.mo
 @dirrm share/gnome/help/gswitchit
 @dirrm share/gnome/gswitchit/interfaces
 @dirrm share/gnome/gswitchit
+@dirrm include/gswitchit/common
+@dirrm include/gswitchit
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gswitchit/XKB
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gswitchit/General
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gswitchit