From owner-svn-ports-head@freebsd.org Sun Feb 21 19:53:10 2016 Return-Path: Delivered-To: svn-ports-head@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 220D2AB013D; Sun, 21 Feb 2016 19:53:10 +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 CCED9CD8; Sun, 21 Feb 2016 19:53:09 +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 u1LJr8a5058759; Sun, 21 Feb 2016 19:53:08 GMT (envelope-from rakuco@FreeBSD.org) Received: (from rakuco@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u1LJr8gd058756; Sun, 21 Feb 2016 19:53:08 GMT (envelope-from rakuco@FreeBSD.org) Message-Id: <201602211953.u1LJr8gd058756@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, 21 Feb 2016 19:53:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r409309 - in head/chinese/tin: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Feb 2016 19:53:10 -0000 Author: rakuco Date: Sun Feb 21 19:53:08 2016 New Revision: 409309 URL: https://svnweb.freebsd.org/changeset/ports/409309 Log: Regenerate a few patches to unbreak after the news/tin update in r406242. Modified: head/chinese/tin/Makefile head/chinese/tin/files/patch-attrib.c head/chinese/tin/files/patch-cook.c Modified: head/chinese/tin/Makefile ============================================================================== --- head/chinese/tin/Makefile Sun Feb 21 18:53:21 2016 (r409308) +++ head/chinese/tin/Makefile Sun Feb 21 19:53:08 2016 (r409309) @@ -7,8 +7,6 @@ CATEGORIES= chinese MAINTAINER= ports@FreeBSD.org -BROKEN= fails to patch - EXTRA_PATCHES= ${.CURDIR}/files/patch-attrib.c \ ${.CURDIR}/files/patch-cook.c \ ${.CURDIR}/files/patch-mail.c \ Modified: head/chinese/tin/files/patch-attrib.c ============================================================================== --- head/chinese/tin/files/patch-attrib.c Sun Feb 21 18:53:21 2016 (r409308) +++ head/chinese/tin/files/patch-attrib.c Sun Feb 21 19:53:08 2016 (r409309) @@ -1,6 +1,6 @@ ---- src/attrib.c.orig 2014-07-16 00:41:51.940655746 +0800 -+++ src/attrib.c 2014-07-16 00:43:36.205651630 +0800 -@@ -583,6 +583,9 @@ +--- src/attrib.c.orig 2015-11-22 01:14:29.000000000 +0100 ++++ src/attrib.c 2016-02-21 20:49:48.322143000 +0100 +@@ -593,6 +593,9 @@ add_scope("*"); snprintf(buf, sizeof(buf), "%s", "~/.tin/headers"); set_attrib(OPT_ATTRIB_X_HEADERS, "*", "", buf); Modified: head/chinese/tin/files/patch-cook.c ============================================================================== --- head/chinese/tin/files/patch-cook.c Sun Feb 21 18:53:21 2016 (r409308) +++ head/chinese/tin/files/patch-cook.c Sun Feb 21 19:53:08 2016 (r409309) @@ -1,11 +1,11 @@ ---- src/cook.c.orig 2014-07-16 00:43:47.656653653 +0800 -+++ src/cook.c 2014-07-16 00:47:26.498655673 +0800 -@@ -471,7 +471,12 @@ +--- src/cook.c.orig 2015-12-23 19:42:27.000000000 +0100 ++++ src/cook.c 2016-02-21 20:50:33.672278000 +0100 +@@ -470,7 +470,12 @@ /* convert network to local charset, tex2iso, iso2asc etc. */ ncharset = get_param(part->params, "charset"); +#ifndef CHARSET_CONVERSION - process_charsets(&line, &max_line_len, ncharset ? ncharset : "US-ASCII" , tinrc.mm_local_charset, curr_group->attribute->tex2iso_conv && art->tex2iso); + process_charsets(&line, &max_line_len, ncharset ? ncharset : "US-ASCII", tinrc.mm_local_charset, curr_group->attribute->tex2iso_conv && art->tex2iso); +#else + /* use undeclared charset */ + process_charsets(&line, &max_line_len, get_param(part->params, "charset") ? get_param(part->params, "charset") : curr_group->attribute->undeclared_charset, tinrc.mm_local_charset, curr_group->attribute->tex2iso_conv && art->tex2iso);