FreeBSD Bugzilla – Attachment 138310 Details for
Bug 184238
biology/lagan: Fix build
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
file.diff
file.diff (text/plain), 3.00 KB, created by
tkato432
on 2013-11-24 18:10:06 UTC
(
hide
)
Description:
file.diff
Filename:
MIME Type:
Creator:
tkato432
Created:
2013-11-24 18:10:06 UTC
Size:
3.00 KB
patch
obsolete
>diff -urN /usr/ports/biology/lagan/Makefile biology/lagan/Makefile >--- /usr/ports/biology/lagan/Makefile 2013-11-06 22:05:39.000000000 +0900 >+++ biology/lagan/Makefile 2013-11-25 00:00:00.000000000 +0900 >@@ -39,7 +39,6 @@ > 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 @@ > 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> >diff -urN /usr/ports/biology/lagan/files/patch-src__glocal__rightinfluence.cpp biology/lagan/files/patch-src__glocal__rightinfluence.cpp >--- /usr/ports/biology/lagan/files/patch-src__glocal__rightinfluence.cpp 1970-01-01 09:00:00.000000000 +0900 >+++ biology/lagan/files/patch-src__glocal__rightinfluence.cpp 2013-11-25 00:00:00.000000000 +0900 >@@ -0,0 +1,33 @@ >+--- 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; >+ } >+ >+
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 184238
: 138310