From owner-svn-ports-all@freebsd.org Sun Feb 28 23:48:47 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 17010AB7594; Sun, 28 Feb 2016 23:48:47 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D94AB13C3; Sun, 28 Feb 2016 23:48:46 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u1SNmjlI016228; Sun, 28 Feb 2016 23:48:45 GMT (envelope-from rakuco@FreeBSD.org) Received: (from rakuco@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u1SNmjKI016227; Sun, 28 Feb 2016 23:48:45 GMT (envelope-from rakuco@FreeBSD.org) Message-Id: <201602282348.u1SNmjKI016227@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rakuco set sender to rakuco@FreeBSD.org using -f From: Raphael Kubo da Costa Date: Sun, 28 Feb 2016 23:48:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r409786 - branches/2016Q1/japanese/today X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Feb 2016 23:48:47 -0000 Author: rakuco Date: Sun Feb 28 23:48:45 2016 New Revision: 409786 URL: https://svnweb.freebsd.org/changeset/ports/409786 Log: MFH: r409785 Fix line breaks conversion. Current japanese/today converts each file's line breaks from CRLF to LF with the following procedure in Makefile: ${SED} 's/.$$//' It is a very problematic method, and breaks many Japanese strings in the data files (*.tbl). To solve the problem, use "${TR} -d '\015'" for the conversion. PR: 206568 Submitted by: WATANABE Kazuhiro (maintainer) Approved by: portmgr blanket approval Modified: branches/2016Q1/japanese/today/Makefile Directory Properties: branches/2016Q1/ (props changed) Modified: branches/2016Q1/japanese/today/Makefile ============================================================================== --- branches/2016Q1/japanese/today/Makefile Sun Feb 28 23:47:38 2016 (r409785) +++ branches/2016Q1/japanese/today/Makefile Sun Feb 28 23:48:45 2016 (r409786) @@ -3,7 +3,7 @@ PORTNAME= today PORTVERSION= 2.12 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= japanese games MASTER_SITES= http://ftp.vector.co.jp/29/42/476/ DISTNAME= ja-${PORTNAME}-${PORTVERSION} @@ -32,7 +32,7 @@ post-extract: gengo.tbl hist??.tbl history.tbl holiday.tbl magazine.tbl \ monthly.tbl schedule.tbl suffix.tbl week.tbl; \ do \ - ${SED} 's/.$$//' $$i | nkf -Se > $$i.tmp ;\ + nkf -Se $$i | ${TR} -d '\015' > $$i.tmp ;\ ${MV} -f $$i.tmp $$i ; \ done)