svn commit: r441985 - in head/misc/mc: . files

[Ben Woods]

Author: woodsb02
Date: Mon May 29 13:50:20 2017
New Revision: 441985
URL: https://svnweb.freebsd.org/changeset/ports/441985

Log:
  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

Added:
  head/misc/mc/files/extra-patch-src_diffviewer_ydiff.c   (contents, props changed)
Modified:
  head/misc/mc/Makefile

Modified: head/misc/mc/Makefile
==============================================================================
--- head/misc/mc/Makefile	Mon May 29 12:43:15 2017	(r441984)
+++ head/misc/mc/Makefile	Mon May 29 13:50:20 2017	(r441985)
@@ -3,7 +3,7 @@
 
 PORTNAME=	mc
 PORTVERSION=	4.8.19
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc shells
 MASTER_SITES=	http://ftp.midnight-commander.org/ \
 		http://ftp.osuosl.org/pub/midnightcommander/
@@ -20,6 +20,7 @@ SHEBANG_FILES=	misc/mcedit.menu.in confi
 		${WRKSRC}/src/vfs/extfs/helpers/Makefile.in \
 		${WRKSRC}/src/vfs/extfs/helpers/s3+.in \
 		${WRKSRC}/src/vfs/extfs/helpers/uc1541.in
+python_CMD=	${LOCALBASE}/bin/python2
 python_OLD_CMD=	@PYTHON@
 USE_GNOME=	glib20
 GNU_CONFIGURE=	yes
@@ -90,4 +91,11 @@ post-install-X11-on:
 		${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>

Added: head/misc/mc/files/extra-patch-src_diffviewer_ydiff.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/misc/mc/files/extra-patch-src_diffviewer_ydiff.c	Mon May 29 13:50:20 2017	(r441985)
@@ -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);
+