Attachment 182593 Details for Bug 219277 – Use textproc/diffutils at FreeBSD-12 after switch to bsddiff

[patch] Use textproc/diffutils at FreeBSD-12 after switch to bsddiff

mc.diff (text/plain), 1.33 KB, created by Boris Samorodov on 2017-05-14 14:38:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Boris Samorodov

Created: 2017-05-14 14:38:40 UTC

Size: 1.33 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 440678)
>+++ Makefile	(working copy)
>@@ -90,4 +90,11 @@
> 		${STAGEDIR}${PREFIX}/share/pixmaps/
> 	${INSTALL_DATA} ${FILESDIR}/${PORTNAME}.desktop ${STAGEDIR}${DESKTOPDIR}
> 
>-.include <bsd.port.mk>
>+.include <bsd.port.pre.mk>
>+
>+.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200030
>+EXTRA_PATCHES=	${FILESDIR}/extra-patch-src_diffviewer_ydiff.c
>+RUN_DEPENDS=    gdiff:textproc/diffutils
>+.endif
>+
>+.include <bsd.port.post.mk>
>Index: files/extra-patch-src_diffviewer_ydiff.c
>===================================================================
>--- files/extra-patch-src_diffviewer_ydiff.c	(nonexistent)
>+++ files/extra-patch-src_diffviewer_ydiff.c	(working copy)
>@@ -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);
>+

Actions: View | Diff

Attachments on bug 219277: 182593