Index: misc/mc/Makefile =================================================================== --- misc/mc/Makefile (revision 411247) +++ misc/mc/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= mc PORTVERSION= 4.8.16 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= misc shells MASTER_SITES= http://ftp.midnight-commander.org/ \ http://ftp.osuosl.org/pub/midnightcommander/ \ Index: misc/mc/files/patch-upstreamticket3611-fish-fix-perl-ls-helper.patch =================================================================== --- misc/mc/files/patch-upstreamticket3611-fish-fix-perl-ls-helper.patch (nonexistent) +++ misc/mc/files/patch-upstreamticket3611-fish-fix-perl-ls-helper.patch (working copy) @@ -0,0 +1,34 @@ +From e274e58cb7dff1683480f5538fd1bfa41a85c0c7 Mon Sep 17 00:00:00 2001 +From: Andreas Mohr +Date: Sun, 13 Mar 2016 20:59:47 +0000 +Subject: [PATCH] Fish: fix perl ls helper + +With #3599 I introduce a perl warning in fish_list_perl() +so fish_list_perl() was skipped (return code 255) and fallback ls +function was used instead. + +Plus all % chars must quoted because of g_strconcat() after reading +script file into string. + +Fix it! + +Signed-off-by: Andreas Mohr +--- + src/vfs/fish/helpers/ls | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/vfs/fish/helpers/ls b/src/vfs/fish/helpers/ls +index 1284e17..909a77d 100755 +--- src/vfs/fish/helpers/ls ++++ src/vfs/fish/helpers/ls +@@ -138,8 +138,8 @@ while((my $filename = readdir (DIR))){ + my $linkname = readlink ("$dirname/$filename"); + $linkname =~ $strutils_shell_escape_regex; + printf("R%%o %%o $uid.$gid\nS$size\nd$mloctime\n:\"%%s\" -> \"%%s\"\n\n", S_IMODE($mode), S_IFMT($mode), $e_filename, $linkname); +- } elseif (S_ISCHR ($mode) || S_ISBLK ($mode)) { +- my $minor = $rdev % 256; ++ } elsif (S_ISCHR ($mode) || S_ISBLK ($mode)) { ++ my $minor = $rdev %% 256; + my $major = int( $rdev / 256 ); + printf("R%%o %%o $uid.$gid\nE$major,$minor\nd$mloctime\n:\"%%s\"\n\n", S_IMODE($mode), S_IFMT($mode), $e_filename); + } else { Property changes on: misc/mc/files/patch-upstreamticket3611-fish-fix-perl-ls-helper.patch ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property