From nobody@FreeBSD.org  Mon Oct 10 08:10:13 2011
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 39785106566C
	for <freebsd-gnats-submit@FreeBSD.org>; 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 <freebsd-gnats-submit@FreeBSD.org>; 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 <freebsd-gnats-submit@FreeBSD.org>; 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 <yamayan@kbh.biglobe.ne.jp>
To: freebsd-gnats-submit@FreeBSD.org
Subject: because i18n/csmapper/Makefile.part bug, some mps files are not found
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         161454
>Category:       bin
>Synopsis:       [i18n] [patch] because i18n/csmapper/Makefile.part bug, some mps files are not found
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    gabor
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Oct 10 08:20:09 UTC 2011
>Closed-Date:    Mon Dec 17 10:12:53 UTC 2012
>Last-Modified:  Mon Dec 17 10:12:53 UTC 2012
>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:

From: Mark Linimon <linimon@lonesome.com>
To: yamayan <yamayan@kbh.biglobe.ne.jp>
Cc: freebsd-gnats-submit@FreeBSD.org
Subject: Re: misc/161454: because i18n/csmapper/Makefile.part bug, some mps
 files are not found
Date: Mon, 10 Oct 2011 04:48:23 -0500

 To which port does this PR apply?

From: poyopoyo@puripuri.plala.or.jp
To: Mark Linimon <linimon@lonesome.com>
Cc: bug-followup@FreeBSD.org
Subject: Re: misc/161454: because i18n/csmapper/Makefile.part bug, some mps files are not found
Date: Mon, 10 Oct 2011 19:34:29 +0900

 Mark, does How-To-Repeat: section help? This PR is for src.

From: Yamaya Takashi <yamayan@kbh.biglobe.ne.jp>
To: bug-followup@FreeBSD.org, yamayan@kbh.biglobe.ne.jp
Cc:  
Subject: Re: kern/161454: [i18n] [patch] because i18n/csmapper/Makefile.part
 bug, some mps files are not found
Date: Tue, 01 May 2012 10:40:47 +0900

 I forgot CC: bug-followup@FreeBSD.org.
 
 This PR is /usr/src/share/i18n/csmapper.
 
 Who's committer?
 
Responsible-Changed-From-To: freebsd-bugs->gabor 
Responsible-Changed-By: gabor 
Responsible-Changed-When: Tue Aug 21 19:16:16 UTC 2012 
Responsible-Changed-Why:  
Take. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=161454 
State-Changed-From-To: open->closed 
State-Changed-By: gabor 
State-Changed-When: Mon Dec 17 10:12:36 UTC 2012 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=161454 
>Unformatted:
