Update to 0.9.4.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@1449 df743ca5-7f9a-e211-a948-0013205c9059

5 files changed, 6 insertions, 100 deletions

diff --git a/accessibility/gok/Makefile b/accessibility/gok/Makefile
index 2caaf2e7d..280172fde 100644
--- a/accessibility/gok/Makefile
+++ b/accessibility/gok/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gok
-PORTVERSION=	0.9.3
+PORTVERSION=	0.9.4
 CATEGORIES=	sysutils gnome accessibility
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.9
@@ -17,10 +17,10 @@ COMMENT=	GNOME On-Screen Keyboard (GOK)
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
-USE_GNOME=	gnomehack gnomeprefix libgnomeui atspi libwnck
+USE_GNOME=	gnomehack gnomeprefix intlhack lthack libgnomeui atspi libwnck
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 
diff --git a/accessibility/gok/distinfo b/accessibility/gok/distinfo
index 176d22979..843bde326 100644
--- a/accessibility/gok/distinfo
+++ b/accessibility/gok/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gok-0.9.3.tar.bz2) = 2023d94de48676c87f801910bf6d44e7
+MD5 (gnome2/gok-0.9.4.tar.bz2) = e31a4092b1815aa99cf1f0431bb7604e
diff --git a/accessibility/gok/files/patch-gok_gok-spy.c b/accessibility/gok/files/patch-gok_gok-spy.c
deleted file mode 100644
index ab0c2b872..000000000
--- a/accessibility/gok/files/patch-gok_gok-spy.c
+++ /dev/null
@@ -1,34 +0,0 @@
---- gok/gok-spy.c.orig	Fri Nov 14 13:24:02 2003
-+++ gok/gok-spy.c	Fri Nov 14 13:25:09 2003
-@@ -1246,8 +1246,9 @@
- 				if ( len != 0 )  {
- 					if (len > 18) 
- 					{
-+					    gchar *tmp;
- 						gok_log("shortening description");
--						gchar *tmp = g_strndup (s, 15);
-+						tmp = g_strndup (s, 15);
- 						pName = g_strconcat (tmp, "...", NULL);
- 						g_free (tmp);
- 					}
-@@ -1273,6 +1274,9 @@
- 		}
- 		*/
- 		else if (Accessible_isText (pAccessible)) {
-+		    	AccessibleText *text;
-+			gint j = 0, len;
-+			char *word, *gs = NULL;
- 			gok_log("still no name, but there is text...");
- 			/* 
- 			* sadly, many text objects are still nameless - yet we want 
-@@ -1281,9 +1285,7 @@
- 			* empty, then we can still "create" a name for it, though we 
- 			* can't assign it a unique meaningful name.
- 			*/
--			AccessibleText *text = Accessible_getText (pAccessible);
--			gint j = 0, len;
--			gchar *word, *gs = NULL;
-+			text = Accessible_getText (pAccessible);
- 			if (text) {
- 				long int start, end = 0;
- 				do {
diff --git a/accessibility/gok/files/patch-intltool-merge.in b/accessibility/gok/files/patch-intltool-merge.in
deleted file mode 100644
index 54c8a2331..000000000
--- a/accessibility/gok/files/patch-intltool-merge.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- intltool-merge.in.orig	Wed Nov 12 15:29:28 2003
-+++ intltool-merge.in	Wed Nov 12 15:31:54 2003
-@@ -858,7 +858,7 @@
-     if ($MULTIPLE_OUTPUT) {
-         for my $lang (sort keys %po_files_by_lang) {
- 	    if ( ! -e $lang ) {
--	        mkdir $lang or die "Cannot create subdirectory $lang: $!\n";
-+	        mkdir $lang, 0777 or die "Cannot create subdirectory $lang: $!\n";
-             }
-             open OUTPUT, ">$lang/$OUTFILE" or die "Cannot open $lang/$OUTFILE: $!\n";
-             my $tree = readXml($FILE);
diff --git a/accessibility/gok/pkg-plist b/accessibility/gok/pkg-plist
index e7b2df105..f2177694c 100644
--- a/accessibility/gok/pkg-plist
+++ b/accessibility/gok/pkg-plist
@@ -43,57 +43,6 @@ 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
-%%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
@@ -310,6 +259,8 @@ share/gnome/gok/pt_BR/quit.kbd
 share/gnome/gok/pt_BR/text-operations.kbd
 share/gnome/gok/quit.kbd
 share/gnome/gok/qwerty.kbd
+share/gnome/gok/singlekey-automatic-scanning.xam
+share/gnome/gok/singlekey-inverse-scanning.xam
 share/gnome/gok/sl/gok-controls.kbd
 share/gnome/gok/sl/hide.kbd
 share/gnome/gok/sl/launcher.kbd