From owner-freebsd-ports-bugs@freebsd.org Sun May 14 14:38:41 2017 Return-Path: Delivered-To: freebsd-ports-bugs@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 04930D6CBD6 for ; Sun, 14 May 2017 14:38:41 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from kenobi.freebsd.org (kenobi.freebsd.org [IPv6:2001:1900:2254:206a::16:76]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CE73D61D for ; Sun, 14 May 2017 14:38:40 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from bugs.freebsd.org ([127.0.1.118]) by kenobi.freebsd.org (8.15.2/8.15.2) with ESMTP id v4EEceI4011969 for ; Sun, 14 May 2017 14:38:40 GMT (envelope-from bugzilla-noreply@freebsd.org) 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 Date: Sun, 14 May 2017 14:38:40 +0000 X-Bugzilla-Reason: AssignedTo X-Bugzilla-Type: new X-Bugzilla-Watch-Reason: None X-Bugzilla-Product: Ports & Packages X-Bugzilla-Component: Individual Port(s) X-Bugzilla-Version: Latest X-Bugzilla-Keywords: X-Bugzilla-Severity: Affects Only Me X-Bugzilla-Who: bsam@FreeBSD.org X-Bugzilla-Status: New X-Bugzilla-Resolution: X-Bugzilla-Priority: --- X-Bugzilla-Assigned-To: freebsd-ports-bugs@FreeBSD.org X-Bugzilla-Flags: X-Bugzilla-Changed-Fields: bug_id short_desc product version rep_platform op_sys bug_status bug_severity priority component assigned_to reporter cc attachments.created Message-ID: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Bugzilla-URL: https://bugs.freebsd.org/bugzilla/ Auto-Submitted: auto-generated MIME-Version: 1.0 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 May 2017 14:38:41 -0000 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.=