From owner-svn-src-user@FreeBSD.ORG Wed Sep 2 22:12:32 2009 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DE67C106568D; Wed, 2 Sep 2009 22:12:31 +0000 (UTC) (envelope-from edwin@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id CE6878FC19; Wed, 2 Sep 2009 22:12:31 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n82MCVUW008363; Wed, 2 Sep 2009 22:12:31 GMT (envelope-from edwin@svn.freebsd.org) Received: (from edwin@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n82MCVLl008360; Wed, 2 Sep 2009 22:12:31 GMT (envelope-from edwin@svn.freebsd.org) Message-Id: <200909022212.n82MCVLl008360@svn.freebsd.org> From: Edwin Groothuis Date: Wed, 2 Sep 2009 22:12:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r196774 - in user/edwin/locale/share: . msgdef X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Sep 2009 22:12:32 -0000 Author: edwin Date: Wed Sep 2 22:12:31 2009 New Revision: 196774 URL: http://svn.freebsd.org/changeset/base/196774 Log: Be able to use libiconv/bsdiconv aliases which don't match the "original" FreeBSD charactermaps (for example, macdevanaga with ISCII-DEV) without having to keep the old names. Modified: user/edwin/locale/share/Makefile.def.inc user/edwin/locale/share/msgdef/Makefile Modified: user/edwin/locale/share/Makefile.def.inc ============================================================================== --- user/edwin/locale/share/Makefile.def.inc Wed Sep 2 20:50:39 2009 (r196773) +++ user/edwin/locale/share/Makefile.def.inc Wed Sep 2 22:12:31 2009 (r196774) @@ -1,7 +1,18 @@ # $FreeBSD: user/edwin/locale/share/msgdef/Makefile 196760 2009-09-02 10:12:13Z edwin $ # -# All variables +# Predefined variables - Not for "end-users" to look at. +# + +# aliases for charactermaps +CMALIAS_ISCII-DEV= macdevanaga + +# libiconv doesn't understand iscii-dev, bsdiconv does +ICONV= /home/edwin/libiconv/bin/iconv +ICONV_hi_IN.ISCII-DEV= /usr/bin/iconv + +# +# Calculated variables # # All charactermaps @@ -120,10 +131,24 @@ SYMLINKS+= ../${ccln}.${cm}/${LCTYPE} ${ . endif . endfor +# +# Fill in the ICONV_ variables with the default values. +# +. if defined(CMS_${ccln}) +. for cms in ${CMS_${ccln}} +. if !defined(ICONV_${ccln}.${cms}) +ICONV_${ccln}.${cms}= ${ICONV} +. endif +. endfor +. endif + .endfor -ICONV= /home/edwin/libiconv/bin/iconv -ICONV_hi_IN.macdevanaga= /usr/bin/iconv +.for cm in ${CMS} +. if !defined(CMALIAS_${cm}) +CMALIAS_${cm}= ${cm} +. endif +.endfor # # All targets @@ -147,20 +172,14 @@ ${ccln}.UTF-8.out: ${ccln}.src . if defined(CMS_${ccln}) . for cms in ${CMS_${ccln}} + ${ccln}.${cms}.out: ${ccln}.src -. if defined(ICONV_${ccln}.${cms}) ${ICONV_${ccln}.${cms}} \ -f UTF-8 \ - -t ${cms} \ + -t ${CMALIAS_${cms}} \ ${.ALLSRC} > ${.TARGET} \ || rm ${.TARGET} && exit 0 -. else - ${ICONV} \ - -f UTF-8 \ - -t ${cms} \ - ${.ALLSRC} > ${.TARGET} \ - || rm ${.TARGET} && exit 0 -. endif + . endfor . endif .endfor Modified: user/edwin/locale/share/msgdef/Makefile ============================================================================== --- user/edwin/locale/share/msgdef/Makefile Wed Sep 2 20:50:39 2009 (r196773) +++ user/edwin/locale/share/msgdef/Makefile Wed Sep 2 22:12:31 2009 (r196774) @@ -13,7 +13,7 @@ CCLN= af_ZA am_ET be_BY bg_BG CMS_be_BY= CP1131 CP1251 ISO8859-5 CMS_bg_BG= CP1251 CMS_el_GR= ISO8859-7 -CMS_hi_IN= macdevanaga +CMS_hi_IN= ISCII-DEV CMS_hy_AM= ARMSCII-8 CMS_ja_JP= SJIS eucJP CMS_kk_KZ= PT154 @@ -79,15 +79,17 @@ LEGLINK_zh_Hant_TW= zh_TW zh_HK LEGLINK_sr_Cyrl_RS= sr_YU LEGLINK_sr_Latn_RS.ISO8859-2= sr_YU.ISO8859-2 LEGLINK_zh_Hans_CN.GBK2312= zh_CN.GBK -LEGLINK_hi_IN.macdevanaga= hi_IN.ISCII-DEV # # In theory there are no parts after here which should be touched when adding # or removing locales and charactermaps. # -LOCALEDIR= /usr/share/locale +# Required variables LCTYPE= LC_MESSAGES +LOCALEDIR= /usr/share/locale + +# For testing only DESTDIR= /home/edwin/locale/new/ SHAREOWN= edwin SHAREGRP= edwin @@ -96,5 +98,5 @@ SHAREGRP= edwin # All variables # -.include "../Makefile.def.in" +.include "../Makefile.def.inc" .include