misc/161454: because i18n/csmapper/Makefile.part bug, some mps files are not found

[yamayan]

>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 at 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 at IBM%UCS.mps and CP932VDC at NEC_IBM%UCS.mps are missing.

id naming rule and mps naming rule are defferent.
id:
 AAA:BBB
mps:
 AAA at 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: