From owner-svn-ports-head@FreeBSD.ORG Sun May 25 10:47:40 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 83CE78A8; Sun, 25 May 2014 10:47:40 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 578CF2480; Sun, 25 May 2014 10:47:40 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4PAleQl079686; Sun, 25 May 2014 10:47:40 GMT (envelope-from miwi@svn.freebsd.org) Received: (from miwi@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4PAleM2079684; Sun, 25 May 2014 10:47:40 GMT (envelope-from miwi@svn.freebsd.org) Message-Id: <201405251047.s4PAleM2079684@svn.freebsd.org> From: Martin Wilke Date: Sun, 25 May 2014 10:47:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r355158 - head/japanese/plain2/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.18 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, 25 May 2014 10:47:40 -0000 Author: miwi Date: Sun May 25 10:47:39 2014 New Revision: 355158 URL: http://svnweb.freebsd.org/changeset/ports/355158 QAT: https://qat.redports.org/buildarchive/r355158/ Log: - Unbreak build with clang PR: 184208 Submitted by: maintainer Added: head/japanese/plain2/files/patch-src-plain2.c (contents, props changed) Modified: head/japanese/plain2/files/patch-src-Makefile Modified: head/japanese/plain2/files/patch-src-Makefile ============================================================================== --- head/japanese/plain2/files/patch-src-Makefile Sun May 25 10:42:18 2014 (r355157) +++ head/japanese/plain2/files/patch-src-Makefile Sun May 25 10:47:39 2014 (r355158) @@ -1,6 +1,6 @@ --- src/Makefile.orig 2011-10-01 00:07:58.000000000 +0900 +++ src/Makefile 2011-10-01 00:08:17.000000000 +0900 -@@ -12,8 +12,8 @@ +@@ -12,8 +12,9 @@ DEFINES=-DKANJI -DPICTURE -DHTML @@ -8,10 +8,11 @@ -CFLAGS= -fwritable-strings ${DEFINES} -DBSD -DDEBUG -O2 -s +CC?=gcc +CFLAGS?= -fwritable-strings ${DEFINES} -DBSD -DDEBUG -O2 -s ++CFLAGS+= ${DEFINES} #CC=cc #CFLAGS= -O -fwritable-strings ${DEFINES} -DBSD -DDEBUG -@@ -33,8 +33,8 @@ +@@ -33,8 +34,8 @@ OBJS_KANJI=roffout.o analyze.o table.o title.o picture.o ftitle.o HDRS=plain2.h table.h picture.h kanji.h Added: head/japanese/plain2/files/patch-src-plain2.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/japanese/plain2/files/patch-src-plain2.c Sun May 25 10:47:39 2014 (r355158) @@ -0,0 +1,19 @@ +--- src/plain2.c.orig 2013-11-24 13:27:57.000000000 +0900 ++++ src/plain2.c 2013-11-24 13:45:59.000000000 +0900 +@@ -643,7 +643,7 @@ + char buf[MAX_LINE_LEN]; + FILE *initf; + if ((plainEnv = getenv(PLAIN2_ENV)) == NULL) +- return; ++ return 0; + if ((initf = fopen(plainEnv, "r")) == NULL) { + char envOpt[MAX_LINE_LEN]; + strcpy(envOpt, plainEnv); +@@ -669,6 +669,7 @@ + } + fclose(initf); + } ++ return 0; + } + /* + * Save & Restore Parameters for Parsing