diff options
| author | Ben Woods <woodsb02@FreeBSD.org> | 2017-05-29 13:50:20 +0000 |
|---|---|---|
| committer | Ben Woods <woodsb02@FreeBSD.org> | 2017-05-29 13:50:20 +0000 |
| commit | aac5c98a377cf554d3bc524199b084963b24a75f (patch) | |
| tree | 21312f2bf8cfa7324c7eb7fda287ac9ed077cd33 /misc/mc/files/extra-patch-src_diffviewer_ydiff.c | |
| parent | Update to version 1.1.7 (diff) | |
misc/mc: Use textproc/diffutils on FreeBSD 12
- The new bsddiff in FreeBSD 12 does not yet support --old-group-format
- Fix python shebangfix to require python2
PR: 219277
Submitted by: bsam
Notes
Notes:
svn path=/head/; revision=441985
Diffstat (limited to 'misc/mc/files/extra-patch-src_diffviewer_ydiff.c')
| -rw-r--r-- | misc/mc/files/extra-patch-src_diffviewer_ydiff.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/misc/mc/files/extra-patch-src_diffviewer_ydiff.c b/misc/mc/files/extra-patch-src_diffviewer_ydiff.c new file mode 100644 index 000000000000..988d45e447a5 --- /dev/null +++ b/misc/mc/files/extra-patch-src_diffviewer_ydiff.c @@ -0,0 +1,11 @@ +--- src/diffviewer/ydiff.c.orig 2017-03-04 20:51:38 UTC ++++ src/diffviewer/ydiff.c +@@ -816,7 +816,7 @@ dff_execute (const char *args, const char *extra, cons + /* escape potential $ to avoid shell variable substitutions in popen() */ + file1_esc = strutils_shell_escape (file1); + file2_esc = strutils_shell_escape (file2); +- cmd = g_strdup_printf ("diff %s %s %s %s %s", args, extra, opt, file1_esc, file2_esc); ++ cmd = g_strdup_printf ("gdiff %s %s %s %s %s", args, extra, opt, file1_esc, file2_esc); + g_free (file1_esc); + g_free (file2_esc); + |