[PATCH] x11/xkeyboard-config: iconv's path is invalid

[NAKAJI Hiroyuki]

>Submitter-Id:	current-users
>Originator:	NAKAJI Hiroyuki
>Organization:	
>Confidential:	no 
>Synopsis:	[PATCH] x11/xkeyboard-config: iconv's path is invalid
>Severity:	non-critical
>Priority:	low
>Category:	ports 
>Class:		change-request
>Release:	FreeBSD 8.0-CURRENT i386
>Environment:
System: FreeBSD ra333.heimat.gr.jp 8.0-CURRENT FreeBSD 8.0-CURRENT #75: Thu Oct 25 16:18:01 JST 2007
>Description:
[DESCRIBE CHANGES]

Added file(s):
- files/patch-intltool-merge.in

Port maintainer (x11 at FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:

--- xkeyboard-config-1.0_2.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/x11/xkeyboard-config/Makefile /home/nakaji/work/ports/x11/xkeyboard-config/Makefile
--- /usr/ports/x11/xkeyboard-config/Makefile	2007-07-28 02:32:42.000000000 +0900
+++ /home/nakaji/work/ports/x11/xkeyboard-config/Makefile	2007-12-03 08:09:39.000000000 +0900
@@ -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}
diff -ruN --exclude=CVS /usr/ports/x11/xkeyboard-config/files/patch-intltool-merge.in /home/nakaji/work/ports/x11/xkeyboard-config/files/patch-intltool-merge.in
--- /usr/ports/x11/xkeyboard-config/files/patch-intltool-merge.in	1970-01-01 09:00:00.000000000 +0900
+++ /home/nakaji/work/ports/x11/xkeyboard-config/files/patch-intltool-merge.in	2007-12-03 08:01:28.000000000 +0900
@@ -0,0 +1,11 @@
+--- intltool-merge.in.orig	2007-12-03 07:58:17.000000000 +0900
++++ intltool-merge.in	2007-12-03 08:00:47.000000000 +0900
+@@ -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._:]";
--- xkeyboard-config-1.0_2.patch ends here ---