3 files changed, 25 insertions, 11 deletions

diff --git a/accessibility/gok/Makefile b/accessibility/gok/Makefile
index fd7ae5e6deb0..a8ca60a47af1 100644
--- a/accessibility/gok/Makefile
+++ b/accessibility/gok/Makefile
@@ -3,12 +3,11 @@
 # Whom:				Adam Weinberger <adamw@freebsd.org>
 #
 # $FreeBSD$
-#    $MCom: ports/accessibility/gok/Makefile,v 1.106 2009/10/19 19:03:32 kwm Exp $
+#    $MCom: ports/accessibility/gok/Makefile,v 1.110 2010/04/02 16:53:04 kwm Exp $
 #
 
 PORTNAME=	gok
-PORTVERSION=	2.28.1
-PORTREVISION=	2
+PORTVERSION=	2.30.0
 PORTEPOCH=	1
 CATEGORIES=	accessibility sysutils gnome
 MASTER_SITES=	GNOME
@@ -17,13 +16,14 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME On-Screen Keyboard (GOK)
 
-LIB_DEPENDS=	canberra-gtk.0:${PORTSDIR}/audio/libcanberra
+LIB_DEPENDS=	canberra-gtk.0:${PORTSDIR}/audio/libcanberra \
+    		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
 
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
 INSTALLS_OMF=	yes
 USE_GNOME=	gnomehack gnomeprefix intlhack libgnomeui atspi libwnck \
-		gnomespeech
+		gnomespeech libxml2
 USE_GMAKE=	yes
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
diff --git a/accessibility/gok/distinfo b/accessibility/gok/distinfo
index 52f56cb2e9ad..7f03e9291a64 100644
--- a/accessibility/gok/distinfo
+++ b/accessibility/gok/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gok-2.28.1.tar.bz2) = d7305f12c703e13eeaed796f996dbc86
-SHA256 (gnome2/gok-2.28.1.tar.bz2) = 121ab98605b0981c131cdc49bf190ba81e9a9d5c720fa94ed2fb3193f121e904
-SIZE (gnome2/gok-2.28.1.tar.bz2) = 1588038
+MD5 (gnome2/gok-2.30.0.tar.bz2) = 853c7825eb62d7c425f5a0efdc07412a
+SHA256 (gnome2/gok-2.30.0.tar.bz2) = 6fe6e116dc663d7f2132b44fc9959ce2e9a26e5259eea860db6829c736a386b6
+SIZE (gnome2/gok-2.30.0.tar.bz2) = 1544165
diff --git a/accessibility/gok/pkg-plist b/accessibility/gok/pkg-plist
index a80237b5f3f6..9de62b639997 100644
--- a/accessibility/gok/pkg-plist
+++ b/accessibility/gok/pkg-plist
@@ -7,7 +7,6 @@ share/applications/gok.desktop
 %%DOCSDIR%%/ch02.html
 %%DOCSDIR%%/ch03.html
 %%DOCSDIR%%/ch04.html
-%%DOCSDIR%%/gok-GokButton.html
 %%DOCSDIR%%/gok-arraylist.html
 %%DOCSDIR%%/gok-callbacks.html
 %%DOCSDIR%%/gok-command-common.html
@@ -20,6 +19,7 @@ share/applications/gok.desktop
 %%DOCSDIR%%/gok-global.html
 %%DOCSDIR%%/gok-gok-action.html
 %%DOCSDIR%%/gok-gok-branchback-stack.html
+%%DOCSDIR%%/gok-gok-button.html
 %%DOCSDIR%%/gok-gok-chunker.html
 %%DOCSDIR%%/gok-gok-control.html
 %%DOCSDIR%%/gok-gok-data.html
@@ -260,6 +260,16 @@ share/gnome/help/gok/C/legal.xml
 %%DATADIR%%/el/text-operations.kbd
 %%DATADIR%%/el/valuator.kbd
 %%DATADIR%%/empty.png
+%%DATADIR%%/en@shaw/gok-controls.kbd
+%%DATADIR%%/en@shaw/hide.kbd
+%%DATADIR%%/en@shaw/launcher.kbd
+%%DATADIR%%/en@shaw/main.kbd
+%%DATADIR%%/en@shaw/mouse.kbd
+%%DATADIR%%/en@shaw/move-resize.kbd
+%%DATADIR%%/en@shaw/numberpad.kbd
+%%DATADIR%%/en@shaw/quit.kbd
+%%DATADIR%%/en@shaw/text-operations.kbd
+%%DATADIR%%/en@shaw/valuator.kbd
 %%DATADIR%%/en_CA/gok-controls.kbd
 %%DATADIR%%/en_CA/hide.kbd
 %%DATADIR%%/en_CA/launcher.kbd
@@ -360,7 +370,8 @@ share/gnome/help/gok/C/legal.xml
 %%DATADIR%%/gl/quit.kbd
 %%DATADIR%%/gl/text-operations.kbd
 %%DATADIR%%/gl/valuator.kbd
-%%DATADIR%%/glade/gok.glade2
+%%DATADIR%%/gok-editor.ui
+%%DATADIR%%/gok-settingsdialog.ui
 %%DATADIR%%/gok.rc
 %%DATADIR%%/goklogo.png
 %%DATADIR%%/gu/gok-controls.kbd
@@ -885,6 +896,7 @@ share/locale/da/LC_MESSAGES/gok.mo
 share/locale/de/LC_MESSAGES/gok.mo
 share/locale/dz/LC_MESSAGES/gok.mo
 share/locale/el/LC_MESSAGES/gok.mo
+share/locale/en@shaw/LC_MESSAGES/gok.mo
 share/locale/en_CA/LC_MESSAGES/gok.mo
 share/locale/en_GB/LC_MESSAGES/gok.mo
 share/locale/es/LC_MESSAGES/gok.mo
@@ -1000,7 +1012,6 @@ share/sounds/freedesktop/stereo/goksound2.wav
 @dirrm %%DATADIR%%/hi
 @dirrm %%DATADIR%%/he
 @dirrm %%DATADIR%%/gu
-@dirrm %%DATADIR%%/glade
 @dirrm %%DATADIR%%/gl
 @dirrm %%DATADIR%%/ga
 @dirrm %%DATADIR%%/fr
@@ -1011,6 +1022,7 @@ share/sounds/freedesktop/stereo/goksound2.wav
 @dirrm %%DATADIR%%/es
 @dirrm %%DATADIR%%/en_GB
 @dirrm %%DATADIR%%/en_CA
+@dirrm %%DATADIR%%/en@shaw
 @dirrm %%DATADIR%%/el
 @dirrm %%DATADIR%%/dz
 @dirrm %%DATADIR%%/de
@@ -1052,6 +1064,8 @@ share/sounds/freedesktop/stereo/goksound2.wav
 @dirrmtry share/locale/mai
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
+@dirrmtry share/locale/en@shaw/LC_MESSAGES
+@dirrmtry share/locale/en@shaw
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
 @dirrmtry share/locale/ca@valencia/LC_MESSAGES