View | Details | Raw Unified | Return to bug 219277
Collapse All | Expand All

(-)Makefile (-1 / +8 lines)
Lines 90-93 Link Here
90
		${STAGEDIR}${PREFIX}/share/pixmaps/
90
		${STAGEDIR}${PREFIX}/share/pixmaps/
91
	${INSTALL_DATA} ${FILESDIR}/${PORTNAME}.desktop ${STAGEDIR}${DESKTOPDIR}
91
	${INSTALL_DATA} ${FILESDIR}/${PORTNAME}.desktop ${STAGEDIR}${DESKTOPDIR}
92
92
93
.include <bsd.port.mk>
93
.include <bsd.port.pre.mk>
94
95
.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200030
96
EXTRA_PATCHES=	${FILESDIR}/extra-patch-src_diffviewer_ydiff.c
97
RUN_DEPENDS=    gdiff:textproc/diffutils
98
.endif
99
100
.include <bsd.port.post.mk>
(-)files/extra-patch-src_diffviewer_ydiff.c (+11 lines)
Line 0 Link Here
1
--- src/diffviewer/ydiff.c.orig	2017-03-04 20:51:38 UTC
2
+++ src/diffviewer/ydiff.c
3
@@ -816,7 +816,7 @@ dff_execute (const char *args, const char *extra, cons
4
     /* escape potential $ to avoid shell variable substitutions in popen() */
5
     file1_esc = strutils_shell_escape (file1);
6
     file2_esc = strutils_shell_escape (file2);
7
-    cmd = g_strdup_printf ("diff %s %s %s %s %s", args, extra, opt, file1_esc, file2_esc);
8
+    cmd = g_strdup_printf ("gdiff %s %s %s %s %s", args, extra, opt, file1_esc, file2_esc);
9
     g_free (file1_esc);
10
     g_free (file2_esc);
11
 

Return to bug 219277