Lost translations in x11/xkeyboard-config.

[Alexander Nedotsukov]

Hi guys,

I noticed a minor problem in x11/xkeyboard-config port. It have wired 
intltool-merge.in which fail to locate iconv binary.
The penalty is lost af, da and en_GB translations:

...
gmake[2]: Entering directory 
`/usr/home/bland/work/xkeyboard-config/work/xkeyboard-config-1.0/rules'
LC_ALL=C ../intltool-merge -x -u -c ../po/.intltool-merge-cache ../po 
base.xml.in base.xml
Generating and caching the translation database
WARNING: ../po/af.po is not in UTF-8 but iso-8859-1, converting...
Can't exec "/usr/bin/iconv": No such file or directory at 
../intltool-merge line 399.
readline() on closed filehandle PO_FILE at ../intltool-merge line 413, 
<PO_FILE> line 5697.
WARNING: ../po/da.po is not in UTF-8 but iso-8859-1, converting...
Can't exec "/usr/bin/iconv": No such file or directory at 
../intltool-merge line 399.
readline() on closed filehandle PO_FILE at ../intltool-merge line 413, 
<PO_FILE> line 8462.
WARNING: ../po/en_GB.po is not in UTF-8 but ASCII, converting...
Can't exec "/usr/bin/iconv": No such file or directory at 
../intltool-merge line 399.
readline() on closed filehandle PO_FILE at ../intltool-merge line 413, 
<PO_FILE> line 52684.
Merging translations into base.xml.
CREATED base.xml
perl ./xml2lst.pl < base.xml > base.lst
...

May I commit patch attached to fix this?

Thanks,
Alexander.
-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/x11/xkeyboard-config/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- Makefile	27 Jul 2007 09:51:19 -0000	1.4
+++ Makefile	31 Jul 2007 02:55:35 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	xkeyboard-config
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	http://xlibs.freedesktop.org/xkbdesc/
 DISTNAME=	xkeyboard-config-${PORTVERSION}
Index: files/patch-intltool-merge.in
===================================================================
RCS file: files/patch-intltool-merge.in
diff -N files/patch-intltool-merge.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-intltool-merge.in	31 Jul 2007 02:55:35 -0000
@@ -0,0 +1,11 @@
+--- intltool-merge.in.orig	Tue Jul 31 11:49:10 2007
++++ intltool-merge.in	Tue Jul 31 11:49:34 2007
+@@ -91,7 +91,7 @@
+ 
+ my %po_files_by_lang = ();
+ my %translations = ();
+-my $iconv = $ENV{"ICONV"} || $ENV{"INTLTOOL_ICONV"} || "/usr/bin/iconv";
++my $iconv = $ENV{"ICONV"} || $ENV{"INTLTOOL_ICONV"} || "@INTLTOOL_ICONV@";
+ 
+ # Use this instead of \w for XML files to handle more possible characters.
+ my $w = "[-A-Za-z0-9._:]";