Date: Sun, 14 May 2017 14:38:40 +0000 From: bugzilla-noreply@freebsd.org To: freebsd-ports-bugs@FreeBSD.org Subject: [Bug 219277] misc/mc: use textproc/diffutils at FreeBSD-12 after switch to bsddiff Message-ID: <bug-219277-13@https.bugs.freebsd.org/bugzilla/>
next in thread | raw e-mail | index | archive | help
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D219277 Bug ID: 219277 Summary: misc/mc: use textproc/diffutils at FreeBSD-12 after switch to bsddiff Product: Ports & Packages Version: Latest Hardware: Any OS: Any Status: New Severity: Affects Only Me Priority: --- Component: Individual Port(s) Assignee: freebsd-ports-bugs@FreeBSD.org Reporter: bsam@FreeBSD.org CC: johans@FreeBSD.org, woodsb02@freebsd.org CC: johans@FreeBSD.org, woodsb02@freebsd.org Created attachment 182593 --> https://bugs.freebsd.org/bugzilla/attachment.cgi?id=3D182593&action= =3Dedit Use textproc/diffutils at FreeBSD-12 after switch to bsddiff misc/mc has an awesome feature to compare two files and highlight the differences. However the gnu specific diff options are hardcoded at sources, ex. src/diffviewer/ydiff.c: --- 800 static int 801 dff_execute (const char *args, const char *extra, const char *file1, const char *file2, 802 GArray * ops) 803 { 804 static const char *opt =3D 805 " --old-group-format=3D'%df%(f=3Dl?:,%dl)d%dE\n'" 806 " --new-group-format=3D'%dea%dF%(F=3DL?:,%dL)\n'" 807 " --changed-group-format=3D'%df%(f=3Dl?:,%dl)c%dF%(F=3DL?:,= %dL)\n'" 808 " --unchanged-group-format=3D''"; --- FreeBSD has switched to bsddiff recently, from /usr/src/UPDATING: --- 20170420: GNU diff has been replaced by a BSD licensed diff. Some features of= GNU diff has not been implemented, if those are needed a newer version = of GNU diff is available via the diffutils package under the gdiff nam= e. --- So, to keep the aforementioned functionality we should use gnu diff util. To reproduce the issue, use a fresh FreeBSD-current, install misc/mc and tr= y to compare two files (F9->command->compare files) and get the error: --- diff: unrecognized option `--old-group-format=3D%df%(f=3Dl?:,%dl)d%dE` [...] --- I propose a patch (mind the new file at ${FILESDIR}). --=20 You are receiving this mail because: You are the assignee for the bug.=
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?bug-219277-13>