FreeBSD Bugzilla – Attachment 186907 Details for
Bug 222777
comms/mlan3: conflicts with shells/fish
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Annotate the conflict between comms/mlan3 and shells/fish
222777.diff (text/plain), 816 bytes, created by
Alan Somers
on 2017-10-04 14:53:29 UTC
(
hide
)
Description:
Annotate the conflict between comms/mlan3 and shells/fish
Filename:
MIME Type:
Creator:
Alan Somers
Created:
2017-10-04 14:53:29 UTC
Size:
816 bytes
patch
obsolete
>Index: comms/mlan3/Makefile >=================================================================== >--- comms/mlan3/Makefile (revision 451230) >+++ comms/mlan3/Makefile (working copy) >@@ -17,6 +17,8 @@ > USES= dos2unix uidfix zip > DOS2UNIX_GLOB= *.c *.h > >+CONFLICTS_INSTALL= shells/fish >+ > post-patch: > @${REINPLACE_CMD} -e '/int main/s/short argc/int argc/' \ > ${WRKSRC}/apps/gethumd/gethumd.c ${WRKSRC}/apps/shaapp/shaapp.c >Index: shells/fish/Makefile >=================================================================== >--- shells/fish/Makefile (revision 451230) >+++ shells/fish/Makefile (working copy) >@@ -17,6 +17,8 @@ > localbase compiler:c++11-lang shebangfix > SHEBANG_FILES= share/tools/*.py share/tools/web_config/webconfig.py > >+CONFLICTS_INSTALL= comms/mlan3 >+ > GNU_CONFIGURE= yes > > CPE_VENDOR= fishshell
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=186907">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 222777
: 186907