cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- fix a bug in fish ls helper (patch taken from upstream)

Browse Source 
- remove gettext module
 - remove trailing whitespace in DESCR

OK robert@ (maintainer)
This commit is contained in:
kirby 2016-04-25 13:35:06 +00:00
parent d0e4a3709d
commit 225d93f617
3 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
misc/mc/Makefile
View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.58 2016/04/25 10:16:41 robert Exp $
# $OpenBSD: Makefile,v 1.59 2016/04/25 13:35:06 kirby Exp $
COMMENT= free Norton Commander clone with many useful features
DISTNAME= mc-4.8.16
REVISION= 0
CATEGORIES= misc
HOMEPAGE= http://www.midnight-commander.org/
@ -14,13 +15,11 @@ EXTRACT_SUFX= .tar.xz
# GPLv2
PERMIT_PACKAGE_CDROM= Yes
WANTLIB += c m pcre pthread termcap glib-2.0 gmodule-2.0 slang
WANTLIB += c iconv intl m pcre pthread termcap glib-2.0 gmodule-2.0 slang
WANTLIB += crypto ssl z ssh2
USE_GMAKE= Yes
MODULES= devel/gettext
BUILD_DEPENDS= security/libssh2
LIB_DEPENDS= devel/glib2 \
devel/libslang

26
misc/mc/patches/patch-src_vfs_fish_helpers_ls Normal file
View File

@ -0,0 +1,26 @@
$OpenBSD: patch-src_vfs_fish_helpers_ls,v 1.1 2016/04/25 13:35:06 kirby Exp $
Upstream commit 263012123cb1e4bf8201da00a9c248497b326076
Fix for tickert 3611.
In #3599 a Perl warning was introduced in fish_list_perl(), so
fish_list_perl() was skipped (return code 255) and fallback ls function
was used instead.
Additionally, all % chars must quoted because of g_strconcat() after
reading script file into a string.
--- src/vfs/fish/helpers/ls.orig Sat Mar 12 18:45:48 2016
+++ src/vfs/fish/helpers/ls Thu Mar 31 14:45:40 2016
@@ -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 {

2
misc/mc/pkg/DESCR
View File

@ -11,4 +11,4 @@ Some of the features are:
* All of the Midnight Commander operations work with the virtual file
system, enabling you to do complex tasks.
* Mouse support under X11's xterms.
* Mouse support under X11's xterms.