From owner-svn-ports-head@freebsd.org Wed May 11 21:48:52 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 24817B3791F; Wed, 11 May 2016 21:48:52 +0000 (UTC) (envelope-from bapt@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 F3EB61491; Wed, 11 May 2016 21:48:51 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4BLmptG028280; Wed, 11 May 2016 21:48:51 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4BLmoUt028276; Wed, 11 May 2016 21:48:50 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201605112148.u4BLmoUt028276@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Wed, 11 May 2016 21:48:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r415036 - head/biology/lagan/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.22 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: Wed, 11 May 2016 21:48:52 -0000 Author: bapt Date: Wed May 11 21:48:50 2016 New Revision: 415036 URL: https://svnweb.freebsd.org/changeset/ports/415036 Log: Prevent collision with getline(3) While here regen patches Added: head/biology/lagan/files/patch-src_anchors.c (contents, props changed) Modified: head/biology/lagan/files/patch-src__glocal__rightinfluence.cpp head/biology/lagan/files/patch-src__glocal__score.cpp head/biology/lagan/files/patch-src__utils__Glue.cpp Modified: head/biology/lagan/files/patch-src__glocal__rightinfluence.cpp ============================================================================== --- head/biology/lagan/files/patch-src__glocal__rightinfluence.cpp Wed May 11 21:37:50 2016 (r415035) +++ head/biology/lagan/files/patch-src__glocal__rightinfluence.cpp Wed May 11 21:48:50 2016 (r415036) @@ -1,4 +1,4 @@ ---- src/glocal/rightinfluence.cpp.orig +--- src/glocal/rightinfluence.cpp.orig 2006-09-14 20:40:19 UTC +++ src/glocal/rightinfluence.cpp @@ -1,6 +1,6 @@ #include @@ -8,7 +8,7 @@ // Sets the first default owner of the whole region void initRI(RI *RightInfluence, long long int scoreIndex) { -@@ -18,17 +18,17 @@ +@@ -18,17 +18,17 @@ void initRI(RI *RightInfluence, long lon // hack to aid winner selection origin.score = -1; @@ -30,3 +30,4 @@ + RightInfluence->act[+INF] = &my_end; } + Modified: head/biology/lagan/files/patch-src__glocal__score.cpp ============================================================================== --- head/biology/lagan/files/patch-src__glocal__score.cpp Wed May 11 21:37:50 2016 (r415035) +++ head/biology/lagan/files/patch-src__glocal__score.cpp Wed May 11 21:48:50 2016 (r415036) @@ -1,5 +1,5 @@ ---- src/glocal/score.cpp.orig 2006-09-15 05:40:19.000000000 +0900 -+++ src/glocal/score.cpp 2012-10-03 00:22:50.000000000 +0900 +--- src/glocal/score.cpp.orig 2006-09-14 20:40:19 UTC ++++ src/glocal/score.cpp @@ -2,7 +2,7 @@ #include #include Modified: head/biology/lagan/files/patch-src__utils__Glue.cpp ============================================================================== --- head/biology/lagan/files/patch-src__utils__Glue.cpp Wed May 11 21:37:50 2016 (r415035) +++ head/biology/lagan/files/patch-src__utils__Glue.cpp Wed May 11 21:48:50 2016 (r415036) @@ -1,5 +1,5 @@ ---- src/utils/Glue.cpp.orig 2006-09-15 05:40:18.000000000 +0900 -+++ src/utils/Glue.cpp 2012-10-03 00:23:38.000000000 +0900 +--- src/utils/Glue.cpp.orig 2006-09-14 20:40:18 UTC ++++ src/utils/Glue.cpp @@ -6,6 +6,7 @@ #include #include Added: head/biology/lagan/files/patch-src_anchors.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/biology/lagan/files/patch-src_anchors.c Wed May 11 21:48:50 2016 (r415036) @@ -0,0 +1,20 @@ +--- src/anchors.c.orig 2016-05-11 21:46:55 UTC ++++ src/anchors.c +@@ -225,7 +225,7 @@ char* rolltonum(char* str) { + return &str[i]; + } + +-int getline(FILE* infile, hll* tt) { ++int get_line(FILE* infile, hll* tt) { + char temp[1024]; + char* help; + int z, h; +@@ -248,7 +248,7 @@ hll* parseCHAOS(FILE* infile, int* totnu + *totnum = 0; + while(!feof(infile)) { + tt = (hll*) malloc(sizeof(hll)); +- while (!feof(infile) && !getline(infile, tt)) ++ while (!feof(infile) && !get_line(infile, tt)) + ; + if (feof(infile)) break; + if (gapfreechunks) {