Bug 227447 - [PATCH] devel/rbtools: Make the port work with BSD diff
Summary: [PATCH] devel/rbtools: Make the port work with BSD diff
Status: New
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: Raphael Kubo da Costa
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2018-04-11 17:18 UTC by Raphael Kubo da Costa
Modified: 2018-04-11 17:22 UTC (History)
2 users (show)

See Also:


Attachments
Proposed patch (1.67 KB, patch)
2018-04-11 17:22 UTC, Raphael Kubo da Costa
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Raphael Kubo da Costa freebsd_committer 2018-04-11 17:18:01 UTC
I've received individual emails over the past few weeks concerning devel/rbtools, and how it does not work on HEAD because diff(1) there is BSD diff instead of GNU diff (per base r317209).

BSD diff does not support --version, which causes rbtools' verification code to fail.

While it's possible to make the verification code use gdiff instead, the rest of the code base does not seem to respect that and either hardcode diff as the command name or not seem to use diff directly at all.

I'm tempted to just disable the verification code altogether, as BSD diff should be compatible with GNU diff in most aspects as far as I know.
Comment 1 Andriy Gapon freebsd_committer 2018-04-11 17:19:44 UTC
That's fine by me.
Thank you!
Comment 2 Raphael Kubo da Costa freebsd_committer 2018-04-11 17:22:16 UTC
Created attachment 192436 [details]
Proposed patch

I'd appreciate it if someone could see if the attached patch works in production too. I've run rbtools' test suite and everything worked as expected with BSD diff and this patch.