svn commit: r335011 - in head/biology/lagan: . files

[Philippe Audeoud]

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 <tkato432 at yahoo.com>

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 <bsd.port.mk>

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 <rightinfluence.h>
+ 
+-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;
+ }
+