From owner-svn-ports-head@FreeBSD.ORG Wed Nov 27 13:16:48 2013 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 804B1EA4; Wed, 27 Nov 2013 13:16:48 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 6FC652F98; Wed, 27 Nov 2013 13:16:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rARDGmrc073231; Wed, 27 Nov 2013 13:16:48 GMT (envelope-from jadawin@svn.freebsd.org) Received: (from jadawin@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rARDGmIi073229; Wed, 27 Nov 2013 13:16:48 GMT (envelope-from jadawin@svn.freebsd.org) Message-Id: <201311271316.rARDGmIi073229@svn.freebsd.org> From: Philippe Audeoud Date: Wed, 27 Nov 2013 13:16:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r335011 - in 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.16 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, 27 Nov 2013 13:16:48 -0000 Author: jadawin Date: Wed Nov 27 13:16:47 2013 New Revision: 335011 URL: http://svnweb.freebsd.org/changeset/ports/335011 Log: - Fix build - Support STAGEDIR PR: ports/184238 Submitted by: KATO Tsuguru Added: head/biology/lagan/files/patch-src__glocal__rightinfluence.cpp (contents, props changed) Modified: head/biology/lagan/Makefile Modified: head/biology/lagan/Makefile ============================================================================== --- head/biology/lagan/Makefile Wed Nov 27 12:54:54 2013 (r335010) +++ head/biology/lagan/Makefile Wed Nov 27 13:16:47 2013 (r335011) @@ -39,7 +39,6 @@ SCRIPTUTILS= cmerge2.pl draft.pl mextrac READMES= README.FIRST README.chaos README.lagan README.mlagan \ README.tools README.shuffle -NO_STAGE= yes post-patch: @${FIND} ${WRKSRC} -name "Makefile" | ${XARGS} ${REINPLACE_CMD} -e \ '/^CC/s|^|#| ; \ @@ -47,26 +46,27 @@ post-patch: s|$$(CC) -o|$$(CC) $$(CFLAGS) -o| ; \ s|$$(CPP) -o|$$(CXX) $$(CXXFLAGS) -o| ; \ s|$$(CLINKER) $$(OPTFLAGS)|$$(CXX) $$(LDFLAGS)|' + @${FIND} ${WRKSRC}/src -name "*.c" | ${XARGS} ${REINPLACE_CMD} -e \ + 's|^inline |static inline |' do-install: - @${MKDIR} ${LAGAN_DIR} + @${MKDIR} ${STAGEDIR}${LAGAN_DIR} .for exe in ${EXECUTABLES} - ${INSTALL_PROGRAM} ${WRKSRC}/${exe} ${LAGAN_DIR} + ${INSTALL_PROGRAM} ${WRKSRC}/${exe} ${STAGEDIR}${LAGAN_DIR} .endfor .for script in ${SCRIPTS} - ${INSTALL_SCRIPT} ${WRKSRC}/${script} ${LAGAN_DIR} + ${INSTALL_SCRIPT} ${WRKSRC}/${script} ${STAGEDIR}${LAGAN_DIR} .endfor - @${MKDIR} ${LAGAN_DIR}/utils + @${MKDIR} ${STAGEDIR}${LAGAN_DIR}/utils .for exeutil in ${EXEUTILS} - ${INSTALL_PROGRAM} ${WRKSRC}/utils/${exeutil} ${LAGAN_DIR}/utils + ${INSTALL_PROGRAM} ${WRKSRC}/utils/${exeutil} ${STAGEDIR}${LAGAN_DIR}/utils .endfor .for scriptutil in ${SCRIPTUTILS} - ${INSTALL_SCRIPT} ${WRKSRC}/utils/${scriptutil} ${LAGAN_DIR}/utils + ${INSTALL_SCRIPT} ${WRKSRC}/utils/${scriptutil} ${STAGEDIR}${LAGAN_DIR}/utils .endfor - @${MKDIR} ${LAGAN_DIR}/Readmes + @${MKDIR} ${STAGEDIR}${LAGAN_DIR}/Readmes .for readme in ${READMES} - ${INSTALL_DATA} ${WRKSRC}/Readmes/${readme} ${LAGAN_DIR}/Readmes + ${INSTALL_DATA} ${WRKSRC}/Readmes/${readme} ${STAGEDIR}${LAGAN_DIR}/Readmes .endfor - @${CAT} ${PKGMESSAGE} .include Added: head/biology/lagan/files/patch-src__glocal__rightinfluence.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/biology/lagan/files/patch-src__glocal__rightinfluence.cpp Wed Nov 27 13:16:47 2013 (r335011) @@ -0,0 +1,32 @@ +--- src/glocal/rightinfluence.cpp.orig ++++ src/glocal/rightinfluence.cpp +@@ -1,6 +1,6 @@ + #include + +-Fragment origin, end; ++Fragment origin, my_end; + + // Sets the first default owner of the whole region + void initRI(RI *RightInfluence, long long int scoreIndex) { +@@ -18,17 +18,17 @@ + + // hack to aid winner selection + origin.score = -1; +- end.score = -2; +- origin.totalScore = end.totalScore = 0; ++ my_end.score = -2; ++ origin.totalScore = my_end.totalScore = 0; + + // will win against anyone +- end.seq1End = 0; end.seq2End = 0; +- end.seq1Start = 0; end.seq2Start = 0; ++ my_end.seq1End = 0; my_end.seq2End = 0; ++ my_end.seq1Start = 0; my_end.seq2Start = 0; + + origin.back = NULL; + + RightInfluence->act[-INF] = &origin; +- RightInfluence->act[+INF] = &end; ++ RightInfluence->act[+INF] = &my_end; + } +