Update to GNOME 2.4.0. For all the goodies on what's changed, known issues,

future plans, etc., please see http://www.gnome.org/start/2.4/.

This commit represents work done by adamw, bland, and myself as well as
many other contributers:

Koop Mast <einekoai@chello.nl>
Akifyev Sergey <asa@gascom.ru>
Franz Klammer <klammer@webonaut.com>
Øyvind Kolbu <oyvind@kebab.gaffel.nu>
Thomas E. Zander <riggs@rrr.de>
Jeremy Messenger <mezz7@cox.net>

Without these contirbuters, and our faithful users, GNOME 2.4.0 would not
be possible.

Please check the FreeBSD GNOME site for any FreeBSD gotchas, as well as
general FAQs and documentation (GNOME 2.4 updates to be posted soon).  The
best way to upgrade so that you get all shared library dependencies is:

portupgrade -rf -m BATCH=yes atk
portupgrade -R -m BATCH=yes gnome2

Approved by:	portmgr (kris, will, myself implicitly)
Requested by:	re as well as many other users

4 files changed, 95 insertions, 70 deletions

diff --git a/accessibility/gok/Makefile b/accessibility/gok/Makefile
index 020a95a5f68e..405fba06569d 100644
--- a/accessibility/gok/Makefile
+++ b/accessibility/gok/Makefile
@@ -6,15 +6,16 @@
 #
 
 PORTNAME=	gok
-PORTVERSION=	0.7.5
-CATEGORIES=	sysutils gnome
+PORTVERSION=	0.8.2
+CATEGORIES=	sysutils gnome accessibility
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.7
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.8
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME On-Screen Keyboard (GOK)
 
+USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack gnomeprefix libgnomeui atspi libwnck
 USE_REINPLACE=	yes
diff --git a/accessibility/gok/distinfo b/accessibility/gok/distinfo
index 243d98493042..76fde0ba0bf1 100644
--- a/accessibility/gok/distinfo
+++ b/accessibility/gok/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gok-0.7.5.tar.gz) = 8ae32031b253371eb76be5f59c26bafd
+MD5 (gnome2/gok-0.8.2.tar.bz2) = 3b495c7b8f8e10e370246c95d75f58eb
diff --git a/accessibility/gok/files/patch-gok_gok-data.c b/accessibility/gok/files/patch-gok_gok-data.c
index 901b763b08ab..e69de29bb2d1 100644
--- a/accessibility/gok/files/patch-gok_gok-data.c
+++ b/accessibility/gok/files/patch-gok_gok-data.c
@@ -1,12 +0,0 @@
---- gok/gok-data.c.orig	Mon Jun  2 21:49:16 2003
-+++ gok/gok-data.c	Mon Jun  2 21:49:26 2003
-@@ -707,8 +707,8 @@
-  */
- void gok_data_set_is_dock (GokDockType val)
- {
--	m_eDockType = val;
- 	gchar *typestring;
-+	m_eDockType = val;
- 	switch (val) {
- 	case GOK_DOCK_TOP:
- 	  typestring = "top";
diff --git a/accessibility/gok/pkg-plist b/accessibility/gok/pkg-plist
index 35335cb46f8b..bdcaccbfbc81 100644
--- a/accessibility/gok/pkg-plist
+++ b/accessibility/gok/pkg-plist
@@ -19,6 +19,7 @@ etc/gconf/gconf.xml.defaults/apps/gok/feedbacks/goksound2/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gok/feedbacks/key_flashing/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gok/feedbacks/none/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gok/layout/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/gok/spy/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gok/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gok/actions/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gok/actions/dwell/%gconf.xml
@@ -39,65 +40,77 @@ etc/gconf/gconf.xml.defaults/schemas/apps/gok/feedbacks/goksound2/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gok/feedbacks/key_flashing/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gok/feedbacks/none/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gok/layout/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/gok/spy/%gconf.xml
 etc/gconf/schemas/gok.schemas
 libdata/pkgconfig/gok-1.0.pc
-share/doc/gok/c4.html
-share/doc/gok/gok-arraylist.html
-share/doc/gok/gok-callbacks.html
-share/doc/gok/gok-command-common.html
-share/doc/gok/gok-command-edge-data.html
-share/doc/gok/gok-command-edge.html
-share/doc/gok/gok-command-graph.html
-share/doc/gok/gok-command-predictor.html
-share/doc/gok/gok-command-vertex-data.html
-share/doc/gok/gok-command-vertex.html
-share/doc/gok/gok-global.html
-share/doc/gok/gok-gok-action.html
-share/doc/gok/gok-gok-branchback-stack.html
-share/doc/gok/gok-gok-chunker.html
-share/doc/gok/gok-gok-control.html
-share/doc/gok/gok-gok-data.html
-share/doc/gok/gok-gok-editor.html
-share/doc/gok/gok-gok-feedback.html
-share/doc/gok/gok-gok-file-util.html
-share/doc/gok/gok-gok-gconf-keys.html
-share/doc/gok/gok-gok-gconf.html
-share/doc/gok/gok-gok-key.html
-share/doc/gok/gok-gok-keyboard.html
-share/doc/gok/gok-gok-keyslotter.html
-share/doc/gok/gok-gok-log-priv.html
-share/doc/gok/gok-gok-log-reader.html
-share/doc/gok/gok-gok-log.html
-share/doc/gok/gok-gok-modifier.html
-share/doc/gok/gok-gok-output.html
-share/doc/gok/gok-gok-page-accessmethod.html
-share/doc/gok/gok-gok-page-actions.html
-share/doc/gok/gok-gok-page-feedbacks.html
-share/doc/gok/gok-gok-page-keysizespace.html
-share/doc/gok/gok-gok-page-wordcomplete.html
-share/doc/gok/gok-gok-predictor.html
-share/doc/gok/gok-gok-scanner.html
-share/doc/gok/gok-gok-settings-dialog.html
-share/doc/gok/gok-gok-sound.html
-share/doc/gok/gok-gok-spy-priv.html
-share/doc/gok/gok-gok-spy.html
-share/doc/gok/gok-gok-word-complete.html
-share/doc/gok/gok-gok.html
-share/doc/gok/gok-gokbutton.html
-share/doc/gok/gok-gtkjoyswitch.html
-share/doc/gok/gok-interface.html
-share/doc/gok/gok-main.html
-share/doc/gok/gok-support.html
-share/doc/gok/gok-switchapi.html
-share/doc/gok/gok-word-complete.html
-share/doc/gok/index.html
-share/doc/gok/index.sgml
+%%DOCSDIR%%/c4.html
+%%DOCSDIR%%/gok-arraylist.html
+%%DOCSDIR%%/gok-callbacks.html
+%%DOCSDIR%%/gok-command-common.html
+%%DOCSDIR%%/gok-command-edge-data.html
+%%DOCSDIR%%/gok-command-edge.html
+%%DOCSDIR%%/gok-command-graph.html
+%%DOCSDIR%%/gok-command-predictor.html
+%%DOCSDIR%%/gok-command-vertex-data.html
+%%DOCSDIR%%/gok-command-vertex.html
+%%DOCSDIR%%/gok-global.html
+%%DOCSDIR%%/gok-gok-action.html
+%%DOCSDIR%%/gok-gok-branchback-stack.html
+%%DOCSDIR%%/gok-gok-chunker.html
+%%DOCSDIR%%/gok-gok-control.html
+%%DOCSDIR%%/gok-gok-data.html
+%%DOCSDIR%%/gok-gok-editor.html
+%%DOCSDIR%%/gok-gok-feedback.html
+%%DOCSDIR%%/gok-gok-file-util.html
+%%DOCSDIR%%/gok-gok-gconf-keys.html
+%%DOCSDIR%%/gok-gok-gconf.html
+%%DOCSDIR%%/gok-gok-key.html
+%%DOCSDIR%%/gok-gok-keyboard.html
+%%DOCSDIR%%/gok-gok-keyslotter.html
+%%DOCSDIR%%/gok-gok-log-priv.html
+%%DOCSDIR%%/gok-gok-log-reader.html
+%%DOCSDIR%%/gok-gok-log.html
+%%DOCSDIR%%/gok-gok-modifier.html
+%%DOCSDIR%%/gok-gok-output.html
+%%DOCSDIR%%/gok-gok-page-accessmethod.html
+%%DOCSDIR%%/gok-gok-page-actions.html
+%%DOCSDIR%%/gok-gok-page-feedbacks.html
+%%DOCSDIR%%/gok-gok-page-keysizespace.html
+%%DOCSDIR%%/gok-gok-page-wordcomplete.html
+%%DOCSDIR%%/gok-gok-predictor.html
+%%DOCSDIR%%/gok-gok-scanner.html
+%%DOCSDIR%%/gok-gok-settings-dialog.html
+%%DOCSDIR%%/gok-gok-sound.html
+%%DOCSDIR%%/gok-gok-spy-priv.html
+%%DOCSDIR%%/gok-gok-spy.html
+%%DOCSDIR%%/gok-gok-word-complete.html
+%%DOCSDIR%%/gok-gok.html
+%%DOCSDIR%%/gok-gokbutton.html
+%%DOCSDIR%%/gok-gtkjoyswitch.html
+%%DOCSDIR%%/gok-interface.html
+%%DOCSDIR%%/gok-main.html
+%%DOCSDIR%%/gok-support.html
+%%DOCSDIR%%/gok-switchapi.html
+%%DOCSDIR%%/gok-word-complete.html
+%%DOCSDIR%%/index.html
+%%DOCSDIR%%/index.sgml
+share/gnome/applications/gok.desktop
+share/gnome/gok/East.png
 share/gnome/gok/Keyboard.kbd
+share/gnome/gok/NE.png
+share/gnome/gok/NW.png
+share/gnome/gok/North.png
+share/gnome/gok/SE.png
+share/gnome/gok/SW.png
+share/gnome/gok/South.png
+share/gnome/gok/West.png
 share/gnome/gok/alphabet.kbd
 share/gnome/gok/automatic-scanning.xam
 share/gnome/gok/dictionary.txt
 share/gnome/gok/direct-selection.xam
 share/gnome/gok/dwell-selection.xam
+share/gnome/gok/empty.png
+share/gnome/gok/gok.png
 share/gnome/gok/gok.rc
 share/gnome/gok/gok-controls.kbd
 share/gnome/gok/goklogo.png
@@ -105,38 +118,60 @@ share/gnome/gok/goksound1.wav
 share/gnome/gok/goksound2.wav
 share/gnome/gok/inverse-scanning.xam
 share/gnome/gok/hide.kbd
+share/gnome/gok/latched.png
 share/gnome/gok/launcher.kbd
+share/gnome/gok/locked.png
 share/gnome/gok/main.kbd
 share/gnome/gok/manage.kbd
+share/gnome/gok/mouse.kbd
 share/gnome/gok/move-resize.kbd
+share/gnome/gok/quit.kbd
 share/gnome/gok/qwerty.kbd
+share/gnome/gok/small-empty.png
+share/gnome/gok/text-operations.kbd
 share/gnome/help/gok/C/gok.xml
 share/gnome/omf/gok/gok-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gok/gok-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gok/gok-C.omf || /usr/bin/true
+share/gnome/pixmaps/gok.png
 share/locale/am/LC_MESSAGES/gok.mo
+share/locale/az/LC_MESSAGES/gok.mo
+share/locale/be/LC_MESSAGES/gok.mo
 share/locale/ca/LC_MESSAGES/gok.mo
 share/locale/cs/LC_MESSAGES/gok.mo
+share/locale/cy/LC_MESSAGES/gok.mo
 share/locale/da/LC_MESSAGES/gok.mo
 share/locale/de/LC_MESSAGES/gok.mo
+share/locale/el/LC_MESSAGES/gok.mo
 share/locale/es/LC_MESSAGES/gok.mo
 share/locale/fr/LC_MESSAGES/gok.mo
+share/locale/hi/LC_MESSAGES/gok.mo
 share/locale/it/LC_MESSAGES/gok.mo
 share/locale/ja/LC_MESSAGES/gok.mo
+share/locale/ko/LC_MESSAGES/gok.mo
+share/locale/mk/LC_MESSAGES/gok.mo
+share/locale/ml/LC_MESSAGES/gok.mo
+share/locale/ms/LC_MESSAGES/gok.mo
 share/locale/nl/LC_MESSAGES/gok.mo
 share/locale/no/LC_MESSAGES/gok.mo
+share/locale/pl/LC_MESSAGES/gok.mo
 share/locale/pt/LC_MESSAGES/gok.mo
 share/locale/pt_BR/LC_MESSAGES/gok.mo
+share/locale/sl/LC_MESSAGES/gok.mo
+share/locale/sq/LC_MESSAGES/gok.mo
 share/locale/sr/LC_MESSAGES/gok.mo
 share/locale/sr@Latn/LC_MESSAGES/gok.mo
 share/locale/sv/LC_MESSAGES/gok.mo
 share/locale/uk/LC_MESSAGES/gok.mo
 share/locale/vi/LC_MESSAGES/gok.mo
+share/locale/zh_CN/LC_MESSAGES/gok.mo
+share/locale/zh_TW/LC_MESSAGES/gok.mo
 @dirrm share/gnome/omf/gok
 @dirrm share/gnome/help/gok/C/figures
 @dirrm share/gnome/help/gok/C
 @dirrm share/gnome/help/gok
 @dirrm share/gnome/gok
-@dirrm share/doc/gok
+@dirrm %%DOCSDIR%%
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gok/spy
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gok/layout
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gok/feedbacks/none
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gok/feedbacks/key_flashing
@@ -157,6 +192,7 @@ share/locale/vi/LC_MESSAGES/gok.mo
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gok/actions/dwell
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gok/actions
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gok
+@dirrm etc/gconf/gconf.xml.defaults/apps/gok/spy
 @dirrm etc/gconf/gconf.xml.defaults/apps/gok/layout
 @dirrm etc/gconf/gconf.xml.defaults/apps/gok/feedbacks/none
 @dirrm etc/gconf/gconf.xml.defaults/apps/gok/feedbacks/key_flashing
@@ -177,4 +213,4 @@ share/locale/vi/LC_MESSAGES/gok.mo
 @dirrm etc/gconf/gconf.xml.defaults/apps/gok/actions/dwell
 @dirrm etc/gconf/gconf.xml.defaults/apps/gok/actions
 @dirrm etc/gconf/gconf.xml.defaults/apps/gok
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gok/gok-C.omf
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gok/gok-C.omf || /usr/bin/true