Attachment #138310 for bug #184238

View | Details | Raw Unified | Return to bug 184238
Collapse All | Expand All




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|^|#| ; \

		 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} ${STAGEDIR}${LAGAN_DIR}
.for exe in ${EXECUTABLES}
	${INSTALL_PROGRAM} ${WRKSRC}/${exe} ${STAGEDIR}${LAGAN_DIR}
.endfor
.for script in ${SCRIPTS}
	${INSTALL_SCRIPT} ${WRKSRC}/${script} ${STAGEDIR}${LAGAN_DIR}
.endfor
	@${MKDIR} ${STAGEDIR}${LAGAN_DIR}/utils
.for exeutil in ${EXEUTILS}
	${INSTALL_PROGRAM} ${WRKSRC}/utils/${exeutil} ${STAGEDIR}${LAGAN_DIR}/utils
.endfor
.for scriptutil in ${SCRIPTUTILS}
	${INSTALL_SCRIPT} ${WRKSRC}/utils/${scriptutil} ${STAGEDIR}${LAGAN_DIR}/utils
.endfor
	@${MKDIR} ${STAGEDIR}${LAGAN_DIR}/Readmes
.for readme in ${READMES}
	${INSTALL_DATA} ${WRKSRC}/Readmes/${readme} ${STAGEDIR}${LAGAN_DIR}/Readmes
.endfor
	@${CAT} ${PKGMESSAGE}

.include <bsd.port.mk>




--- 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;
 }
 


Return to bug 184238

Lines 39-45 Link Here

(-)biology/lagan/Makefile (-10 / +10 lines)
39	READMES= README.FIRST README.chaos README.lagan README.mlagan \	39	READMES= README.FIRST README.chaos README.lagan README.mlagan \
40	README.tools README.shuffle	40	README.tools README.shuffle
41		41
42	NO_STAGE= yes
43	post-patch:	42	post-patch:
44	@${FIND} ${WRKSRC} -name "Makefile" \| ${XARGS} ${REINPLACE_CMD} -e \	43	@${FIND} ${WRKSRC} -name "Makefile" \| ${XARGS} ${REINPLACE_CMD} -e \
45	'/^CC/s\|^\|#\| ; \	44	'/^CC/s\|^\|#\| ; \
Lines 47-72 Link Here
47	s\|$$(CC) -o\|$$(CC) $$(CFLAGS) -o\| ; \	46	s\|$$(CC) -o\|$$(CC) $$(CFLAGS) -o\| ; \
48	s\|$$(CPP) -o\|$$(CXX) $$(CXXFLAGS) -o\| ; \	47	s\|$$(CPP) -o\|$$(CXX) $$(CXXFLAGS) -o\| ; \
49	s\|$$(CLINKER) $$(OPTFLAGS)\|$$(CXX) $$(LDFLAGS)\|'	48	s\|$$(CLINKER) $$(OPTFLAGS)\|$$(CXX) $$(LDFLAGS)\|'
		49	@${FIND} ${WRKSRC}/src -name "*.c" \| ${XARGS} ${REINPLACE_CMD} -e \
		50	's\|^inline \|static inline \|'
50		51
51	do-install:	52	do-install:
52	@${MKDIR} ${LAGAN_DIR}	53	@${MKDIR} ${STAGEDIR}${LAGAN_DIR}
53	.for exe in ${EXECUTABLES}	54	.for exe in ${EXECUTABLES}
54	${INSTALL_PROGRAM} ${WRKSRC}/${exe} ${LAGAN_DIR}	55	${INSTALL_PROGRAM} ${WRKSRC}/${exe} ${STAGEDIR}${LAGAN_DIR}
55	.endfor	56	.endfor
56	.for script in ${SCRIPTS}	57	.for script in ${SCRIPTS}
57	${INSTALL_SCRIPT} ${WRKSRC}/${script} ${LAGAN_DIR}	58	${INSTALL_SCRIPT} ${WRKSRC}/${script} ${STAGEDIR}${LAGAN_DIR}
58	.endfor	59	.endfor
59	@${MKDIR} ${LAGAN_DIR}/utils	60	@${MKDIR} ${STAGEDIR}${LAGAN_DIR}/utils
60	.for exeutil in ${EXEUTILS}	61	.for exeutil in ${EXEUTILS}
61	${INSTALL_PROGRAM} ${WRKSRC}/utils/${exeutil} ${LAGAN_DIR}/utils	62	${INSTALL_PROGRAM} ${WRKSRC}/utils/${exeutil} ${STAGEDIR}${LAGAN_DIR}/utils
62	.endfor	63	.endfor
63	.for scriptutil in ${SCRIPTUTILS}	64	.for scriptutil in ${SCRIPTUTILS}
64	${INSTALL_SCRIPT} ${WRKSRC}/utils/${scriptutil} ${LAGAN_DIR}/utils	65	${INSTALL_SCRIPT} ${WRKSRC}/utils/${scriptutil} ${STAGEDIR}${LAGAN_DIR}/utils
65	.endfor	66	.endfor
66	@${MKDIR} ${LAGAN_DIR}/Readmes	67	@${MKDIR} ${STAGEDIR}${LAGAN_DIR}/Readmes
67	.for readme in ${READMES}	68	.for readme in ${READMES}
68	${INSTALL_DATA} ${WRKSRC}/Readmes/${readme} ${LAGAN_DIR}/Readmes	69	${INSTALL_DATA} ${WRKSRC}/Readmes/${readme} ${STAGEDIR}${LAGAN_DIR}/Readmes
69	.endfor	70	.endfor
70	@${CAT} ${PKGMESSAGE}
71		71
72	.include <bsd.port.mk>	72	.include <bsd.port.mk>

Line 0 Link Here

(-)biology/lagan/files/patch-src__glocal__rightinfluence.cpp (+33 lines)
	1	--- src/glocal/rightinfluence.cpp.orig
	2	+++ src/glocal/rightinfluence.cpp
	3	@@ -1,6 +1,6 @@
	4	#include <rightinfluence.h>
	5
	6	-Fragment origin, end;
	7	+Fragment origin, my_end;
	8
	9	// Sets the first default owner of the whole region
	10	void initRI(RI *RightInfluence, long long int scoreIndex) {
	11	@@ -18,17 +18,17 @@
	12
	13	// hack to aid winner selection
	14	origin.score = -1;
	15	- end.score = -2;
	16	- origin.totalScore = end.totalScore = 0;
	17	+ my_end.score = -2;
	18	+ origin.totalScore = my_end.totalScore = 0;
	19
	20	// will win against anyone
	21	- end.seq1End = 0; end.seq2End = 0;
	22	- end.seq1Start = 0; end.seq2Start = 0;
	23	+ my_end.seq1End = 0; my_end.seq2End = 0;
	24	+ my_end.seq1Start = 0; my_end.seq2Start = 0;
	25
	26	origin.back = NULL;
	27
	28	RightInfluence->act[-INF] = &origin;
	29	- RightInfluence->act[+INF] = &end;
	30	+ RightInfluence->act[+INF] = &my_end;
	31	}
	32
	33