From owner-svn-src-user@FreeBSD.ORG  Wed Sep  2 09:54:43 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
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 63BCC1065672;
	Wed,  2 Sep 2009 09:54:43 +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 540118FC08;
	Wed,  2 Sep 2009 09:54:43 +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 n829shD4088358;
	Wed, 2 Sep 2009 09:54:43 GMT (envelope-from edwin@svn.freebsd.org)
Received: (from edwin@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n829shNo088356;
	Wed, 2 Sep 2009 09:54:43 GMT (envelope-from edwin@svn.freebsd.org)
Message-Id: <200909020954.n829shNo088356@svn.freebsd.org>
From: Edwin Groothuis <edwin@FreeBSD.org>
Date: Wed, 2 Sep 2009 09:54:43 +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: r196758 - 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 &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 02 Sep 2009 09:54:43 -0000

Author: edwin
Date: Wed Sep  2 09:54:43 2009
New Revision: 196758
URL: http://svn.freebsd.org/changeset/base/196758

Log:
  Use unicode2src and iconv to convert the raw data into usable data

Modified:
  user/edwin/locale/share/msgdef/Makefile

Modified: user/edwin/locale/share/msgdef/Makefile
==============================================================================
--- user/edwin/locale/share/msgdef/Makefile	Wed Sep  2 09:53:32 2009	(r196757)
+++ user/edwin/locale/share/msgdef/Makefile	Wed Sep  2 09:54:43 2009	(r196758)
@@ -222,7 +222,12 @@ SYMLINKS+=	../${ccln}.${cm}/${LCTYPE} ${
 # Normal makes don't need to convert from .unicode to .src
 . if defined(FULL)
 ${ccln}.src: ${ccln}.unicode
-	echo ${.ALLSRC} > ${.TARGET}
+	../../cldr/tools/unicode2src.pl \
+	    --cldr=/home/edwin/unicode/cldr/1.7.1 \
+	    --unidata=/home/edwin/unicode/UNIDATA/5.1.0/ \
+	    --input=${.ALLSRC} \
+	    --output=${.TARGET}
+
 . endif
 
 ${ccln}.UTF-8.out: ${ccln}.src
@@ -231,7 +236,11 @@ ${ccln}.UTF-8.out: ${ccln}.src
 .if defined(CMS_${ccln})
 .for cms in ${CMS_${ccln}}
 ${ccln}.${cms}.out: ${ccln}.src
-	grep -v '^#' < ${.ALLSRC} > ${.TARGET}
+	iconv \
+	    -f UTF-8 \
+	    -t ${.TARGET:S/${.ALLSRC:S/.src//}.//:S/.out//} \
+	    ${.ALLSRC} > ${.TARGET} \
+	|| rm ${.TARGET} && exit 0
 .endfor
 .endif
 .endfor