Update gok to 2.26.0.

What's new in GOK 2.26.0?

	* Lots of translation updates

What's new in GOK 2.25.91?

	Bug fixes:

	#435973 - Migrate to GtkAboutDialog
	#560441 - Remove deprecated GLib symbols
	#567105 - Fix empty msgid's
	#570756 - Disable XEvIE by default (Li Yuan)

	New and updated translations:

	[bg] Alexander Shopov
	[da] Kenneth Nielsen
    	[es] Jorge Gonzalez
    	[eu] Inaki Larranaga Murgoitio
    	[nb] Kjartan Maraas
    	[nl] Wouter Bolsterlee
    	[pt] Duarte Loreto
    	[sv] Daniel Nylander
    	[vi] Clytie Siddall
	[zh_HK] Chao-Hsiung Liao
	[zh_TW] Chao-Hsiung Liao

What's new in GOK 2.25.90?

	* Bug fixes: #536277
	* New '--disable-autobranch' command-line option.

What's new in GOK 2.25.3?

	* Migration to msgctxt (#567105), thanks to Leonardo Ferreira Fontenelle.

	* Updated translations.

4 files changed, 46 insertions, 8 deletions

diff --git a/misc/gok/Makefile b/misc/gok/Makefile
index ef92d42daf1..491a3021a4c 100644
--- a/misc/gok/Makefile
+++ b/misc/gok/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.60 2008/10/28 06:34:31 obache Exp $
+# $NetBSD: Makefile,v 1.61 2009/03/18 02:14:42 jmcneill Exp $
 #
 
-DISTNAME=		gok-2.24.0
+DISTNAME=		gok-2.26.0
 CATEGORIES=		misc
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gok/2.24/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gok/2.26/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
@@ -22,6 +22,14 @@ PKGCONFIG_OVERRIDE+=	gok-1.0.pc.in
 
 GCONF_SCHEMAS=		gok.schemas
 
+# The gettext version in pkgsrc cannot handle the .po files, so
+# we strip out usage of the newer features (context and fuzzy matches)
+post-patch:
+	for f in ${WRKSRC}/po/*.po ; do \
+		mv $$f $$f.original ; \
+		${AWK} -f ${FILESDIR}/msgfmtstrip $$f.original > $$f ; \
+	done
+
 BUILDLINK_DEPMETHOD.libXt?=	build
 
 BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.11.0
diff --git a/misc/gok/PLIST b/misc/gok/PLIST
index e9201c785dc..2fea89b28e4 100644
--- a/misc/gok/PLIST
+++ b/misc/gok/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2008/10/28 06:34:31 obache Exp $
+@comment $NetBSD: PLIST,v 1.20 2009/03/18 02:14:42 jmcneill Exp $
 bin/create-branching-keyboard
 bin/gok
 lib/bonobo/servers/GNOME_Gok.server
@@ -440,6 +440,16 @@ share/gok/lv/numberpad.kbd
 share/gok/lv/quit.kbd
 share/gok/lv/text-operations.kbd
 share/gok/lv/valuator.kbd
+share/gok/mai/gok-controls.kbd
+share/gok/mai/hide.kbd
+share/gok/mai/launcher.kbd
+share/gok/mai/main.kbd
+share/gok/mai/mouse.kbd
+share/gok/mai/move-resize.kbd
+share/gok/mai/numberpad.kbd
+share/gok/mai/quit.kbd
+share/gok/mai/text-operations.kbd
+share/gok/mai/valuator.kbd
 share/gok/manage.kbd
 share/gok/mk/gok-controls.kbd
 share/gok/mk/hide.kbd
@@ -890,6 +900,7 @@ share/locale/ko/LC_MESSAGES/gok.mo
 share/locale/ku/LC_MESSAGES/gok.mo
 share/locale/lt/LC_MESSAGES/gok.mo
 share/locale/lv/LC_MESSAGES/gok.mo
+share/locale/mai/LC_MESSAGES/gok.mo
 share/locale/mk/LC_MESSAGES/gok.mo
 share/locale/ml/LC_MESSAGES/gok.mo
 share/locale/mn/LC_MESSAGES/gok.mo
@@ -968,6 +979,7 @@ share/pixmaps/gok.png
 @dirrm share/gok/mn
 @dirrm share/gok/ml
 @dirrm share/gok/mk
+@dirrm share/gok/mai
 @dirrm share/gok/lv
 @dirrm share/gok/lt
 @dirrm share/gok/ku
diff --git a/misc/gok/distinfo b/misc/gok/distinfo
index e46aee2f38f..c7f5b40ea98 100644
--- a/misc/gok/distinfo
+++ b/misc/gok/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.22 2008/10/28 06:34:31 obache Exp $
+$NetBSD: distinfo,v 1.23 2009/03/18 02:14:42 jmcneill Exp $
 
-SHA1 (gok-2.24.0.tar.bz2) = bdcce76a073eb066d2820b60855b5a8d7562f600
-RMD160 (gok-2.24.0.tar.bz2) = c445605887b3051c28865f2c3a1725f19805627f
-Size (gok-2.24.0.tar.bz2) = 1304251 bytes
+SHA1 (gok-2.26.0.tar.bz2) = 8b97b61b1f88d4fe5ddd706481ce6b70d57c33ac
+RMD160 (gok-2.26.0.tar.bz2) = e7e15019819f46fd7d6839183eb5cda2db8fc4cb
+Size (gok-2.26.0.tar.bz2) = 1341889 bytes
diff --git a/misc/gok/files/msgfmtstrip b/misc/gok/files/msgfmtstrip
new file mode 100644
index 00000000000..af374e7954a
--- /dev/null
+++ b/misc/gok/files/msgfmtstrip
@@ -0,0 +1,18 @@
+# $Id: msgfmtstrip,v 1.1 2009/03/18 02:14:43 jmcneill Exp $
+# Simple awk script to strip out .po entries with "msgctxt" or "#~|", so the
+# resultant file can be handled by the msgfmt 0.14.4 in NetBSD 4.0
+{
+if (/^$/) { entry_end(); }
+else if ($1 == "msgctxt" || $2 == "msgctxt") { skip = 1; }
+else if ($1 == "#~|") { skip = 1; }
+else { entry = entry $0 "\n" }
+}
+
+END { entry_end(); }
+
+function entry_end() {
+    if (!skip)
+	print entry;
+    entry = "";
+    skip = 0;
+}