From owner-freebsd-bugs@FreeBSD.ORG Mon Oct 10 08:20:10 2011 Return-Path: Delivered-To: freebsd-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 97602106564A for ; Mon, 10 Oct 2011 08:20:10 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 73E528FC0A for ; Mon, 10 Oct 2011 08:20:10 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p9A8KAUV072835 for ; Mon, 10 Oct 2011 08:20:10 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p9A8KAEY072834; Mon, 10 Oct 2011 08:20:10 GMT (envelope-from gnats) Resent-Date: Mon, 10 Oct 2011 08:20:10 GMT Resent-Message-Id: <201110100820.p9A8KAEY072834@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, yamayan Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 39785106566C for ; Mon, 10 Oct 2011 08:10:13 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id 0F3968FC0A for ; Mon, 10 Oct 2011 08:10:13 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.4/8.14.4) with ESMTP id p9A8ACIx073941 for ; Mon, 10 Oct 2011 08:10:12 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.4/8.14.4/Submit) id p9A8ACwv073940; Mon, 10 Oct 2011 08:10:12 GMT (envelope-from nobody) Message-Id: <201110100810.p9A8ACwv073940@red.freebsd.org> Date: Mon, 10 Oct 2011 08:10:12 GMT From: yamayan To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: misc/161454: because i18n/csmapper/Makefile.part bug, some mps files are not found X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Oct 2011 08:20:10 -0000 >Number: 161454 >Category: misc >Synopsis: because i18n/csmapper/Makefile.part bug, some mps files are not found >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Mon Oct 10 08:20:09 UTC 2011 >Closed-Date: >Last-Modified: >Originator: yamayan >Release: 10.0-CURRENT >Organization: >Environment: FreeBSD genius 10.0-CURRENT FreeBSD 10.0-CURRENT #0 r226179M: Mon Oct 10 08:39:39 JST 2011 root@genius:/usr/obj/usr/src/sys/NYANCO amd64 >Description: i18n/csmapper/Makefile.part bug. some mps file are not found, so /usr/bin/iconv can not work. For example, iconv -f cp932 can not work, because CP932VDC@IBM%UCS.mps and CP932VDC@NEC_IBM%UCS.mps are missing. id naming rule and mps naming rule are defferent. id: AAA:BBB mps: AAA@BBB converting id to mps with s/:/@/ but the converting NOT exist in Makefile.part. >How-To-Repeat: Check corresponding /usr/src/share/i18n/csmapper/*/*@*.src to /usr/share/i18n/csmapper/*/*@*.mps. >Fix: Patch my patch. Patch attached with submission follows: --- share/i18n/csmapper/Makefile.part.orig 2011-09-28 20:50:31.343859995 +0900 +++ share/i18n/csmapper/Makefile.part 2011-09-29 03:00:18.953860846 +0900 @@ -28,9 +28,9 @@ echo "# ${ESUBDIR}" > ${.TARGET} .for i in ${PART} printf "%-32s%-32s%s\n" ${ENCID:S@%%PART%%@${i}@}/UCS ${MAPPER} \ - ${ESUBDIR}/${TABLENAME:S@%%PART%%@${i}@}${ENCEXT} >> ${.TARGET} + ${ESUBDIR}/${TABLENAME:S@%%PART%%@${i}@:S/:/@/}${ENCEXT} >> ${.TARGET} printf "%-32s%-32s%s\n" UCS/${ENCID:S@%%PART%%@${i}@} ${MAPPER} \ - ${REVSYMBOL}${ESUBDIR}/${RTABLENAME:S@%%PART%%@${i}@}${ENCEXT} >> ${.TARGET} + ${REVSYMBOL}${ESUBDIR}/${RTABLENAME:S@%%PART%%@${i}@:S/:/@/}${ENCEXT} >> ${.TARGET} .endfor echo >> ${.TARGET} .else @@ -59,13 +59,13 @@ .if !defined(MAPS) .for i in ${PART} -.if exists(${TABLENAME:S@%%PART%%@${i}@}.src) -FILES+= ${TABLENAME:S@%%PART%%@${i}@}.mps -CLEANFILES+= ${TABLENAME:S@%%PART%%@${i}@}.mps -.endif -.if exists(${RTABLENAME:S@%%PART%%@${i}@}.src) -FILES+= ${RTABLENAME:S@%%PART%%@${i}@}.mps -CLEANFILES+= ${RTABLENAME:S@%%PART%%@${i}@}.mps +.if exists(${TABLENAME:S@%%PART%%@${i}@:S/:/@/}.src) +FILES+= ${TABLENAME:S@%%PART%%@${i}@:S/:/@/}.mps +CLEANFILES+= ${TABLENAME:S@%%PART%%@${i}@:S/:/@/}.mps +.endif +.if exists(${RTABLENAME:S@%%PART%%@${i}@:S/:/@/}.src) +FILES+= ${RTABLENAME:S@%%PART%%@${i}@:S/:/@/}.mps +CLEANFILES+= ${RTABLENAME:S@%%PART%%@${i}@:S/:/@/}.mps .endif .endfor .else >Release-Note: >Audit-Trail: >Unformatted: