Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 28 Feb 2016 23:48:45 +0000 (UTC)
From:      Raphael Kubo da Costa <rakuco@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org
Subject:   svn commit: r409786 - branches/2016Q1/japanese/today
Message-ID:  <201602282348.u1SNmjKI016227@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <CQG00620@nifty.ne.jp> (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)
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201602282348.u1SNmjKI016227>