From owner-freebsd-x11@FreeBSD.ORG Sun Dec 2 23:12:47 2007 Return-Path: Delivered-To: x11@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EBAE616A418; Sun, 2 Dec 2007 23:12:47 +0000 (UTC) (envelope-from nakaji@ra333.heimat.gr.jp) Received: from www.heimat.gr.jp (unknown [IPv6:2001:3e0:a84::1]) by mx1.freebsd.org (Postfix) with ESMTP id 7AC4E13C442; Sun, 2 Dec 2007 23:12:47 +0000 (UTC) (envelope-from nakaji@ra333.heimat.gr.jp) Received: from ra333.heimat.gr.jp ([IPv6:2001:3e0:a84:0:200:4cff:fe17:573c]) by www.heimat.gr.jp (8.14.2/8.14.2) with ESMTP id lB2NCLN5049089; Mon, 3 Dec 2007 08:12:21 +0900 (JST) (envelope-from nakaji@ra333.heimat.gr.jp) Received: (from nakaji@localhost) by ra333.heimat.gr.jp (8.14.1/8.14.1/Submit) id lB2NCLCC041041; Mon, 3 Dec 2007 08:12:21 +0900 (JST) (envelope-from nakaji) Date: Mon, 3 Dec 2007 08:12:21 +0900 (JST) Message-Id: <200712022312.lB2NCLCC041041@ra333.heimat.gr.jp> To: FreeBSD-gnats-submit@freebsd.org From: NAKAJI Hiroyuki X-send-pr-version: 3.113 X-GNATS-Notify: X-Spam-Status: No, score=0.2 required=12.0 tests=NOTINCONTENTTYPE,NO_RELAYS autolearn=no version=3.2.3 X-Spam-Checker-Version: SpamAssassin 3.2.3 (2007-08-08) on www.heimat.gr.jp X-Virus-Scanned: by amavisd-new Cc: x11@freebsd.org Subject: [PATCH] x11/xkeyboard-config: iconv's path is invalid X-BeenThere: freebsd-x11@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: X11 on FreeBSD -- maintaining and support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Dec 2007 23:12:48 -0000 >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@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 ---