mc: bump version

app-misc/mc/mc-4.8.15.recipe

@@ -1,22 +1,20 @@
 SUMMARY="A powerful file manager"
-DESCRIPTION="
-GNU Midnight Commander is a text-mode full-screen file manager. It uses a two \
-panel interface and a subshell for command execution. It includes an internal \
-editor with syntax highlighting and an internal viewer with support for \
-binary files. Also included is Virtual Filesystem (VFS), that allows files on \
-remote systems (e.g. FTP, SSH servers) and files inside archives to be \
-manipulated like real files.
-"
+DESCRIPTION="GNU Midnight Commander is a text-mode full-screen file manager. \
+It uses a two panel interface and a subshell for command execution. It \
+includes an internal editor with syntax highlighting and an internal viewer \
+with support for binary files. Also included is Virtual Filesystem (VFS), \
+that allows files on remote systems (e.g. FTP, SSH servers) and files inside \
+archives to be manipulated like real files."
 HOMEPAGE="http://www.midnight-commander.org"
 SOURCE_URI="http://ftp.midnight-commander.org/mc-$portVersion.tar.xz"
-CHECKSUM_SHA256="36d6191a47ec5d89d3788e48846fb620c481816441ff25264add8898d277b657"
-COPYRIGHT="2007 MC Team"
+CHECKSUM_SHA256="cf4e8f5dfe419830d56ca7e5f2495898e37ebcd05da1e47ff7041446c87fba16"
+COPYRIGHT="1994-2015, Free Software Foundation"
 LICENSE="GNU GPL v2"
 REVISION="1"
 ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
-PATCHES="mc-4.8.13.patch"
+PATCHES="mc-$portVersion.patch"
 
 GLOBAL_WRITABLE_FILES="settings/mc directory keep-old"
 
@@ -60,14 +58,14 @@ BUILD_PREREQUIRES="
 
 BUILD()
 {
-	 LIBS=-lnetwork runConfigure configure \
-	 						--prefix="$prefix" \
-							--datarootdir="$dataRootDir" \
-							--enable-vfs-smb \
-							--with-smb-configdir="$settingsDir/samba" \
-							--with-smb-codepagedir="$settingsDir/samba" \
-							--with-homedir="$settingsDir/samba" \
-							--with-screen=ncurses
+	 CFLAGS="-D_BSD_SOURCE" LIBS=-lnetwork runConfigure configure \
+		--prefix="$prefix" \
+		--datarootdir="$dataRootDir" \
+		--enable-vfs-smb \
+		--with-smb-configdir="$settingsDir/samba" \
+		--with-smb-codepagedir="$settingsDir/samba" \
+		--with-homedir="$settingsDir/samba" \
+		--with-screen=ncurses
 	make $jobArgs
 }
 

app-misc/mc/patches/mc-4.8.13.patch

@@ -1,53 +0,0 @@
-diff --git mc-4.8.13/lib/tty/tty-ncurses.c mc-4.8.13-haiku/lib/tty/tty-ncurses.c
---- mc-4.8.13/lib/tty/tty-ncurses.c
-+++ mc-4.8.13-haiku/lib/tty/tty-ncurses.c
-@@ -66,7 +66,7 @@
- 
- /*** file scope macro definitions ****************************************************************/
- 
--#if defined(_AIX) && !defined(CTRL)
-+#if !defined(CTRL)
- #define CTRL(x) ((x) & 0x1f)
- #endif
-
-diff --git mc-4.8.13/lib/tty/tty-slang.h mc-4.8.13-haiku/lib/tty/tty-slang.h
---- mc-4.8.13/lib/tty/tty-slang.h
-+++ mc-4.8.13-haiku/lib/tty/tty-slang.h
-@@ -1,6 +1,7 @@
- 
- #ifndef MC__TTY_SLANG_H
- #define MC__TTY_SLANG_H
-+#define REAL_UNIX_SYSTEM
- 
- #ifdef HAVE_SLANG_SLANG_H
- #include <slang/slang.h>
---- mc-4.8.13/lib/mcconfig/paths.c	2014-09-06 19:04:12.000000000 +0400
-+++ mc-4.8.13-haiku/lib/mcconfig/paths.c	2014-09-06 19:07:53.861143040 +0400
-@@ -286,7 +286,8 @@
- mc_config_init_config_paths (GError ** mcerror)
- {
-     char *dir;
--
-+	char *defined_userconf_dir;
-+
-     mc_return_if_error (mcerror);
- 
-     if (xdg_vars_initialized)
-@@ -345,7 +346,6 @@
- 
-     mc_config_fix_migrated_rules ();
- #else /* MC_HOMEDIR_XDG */
--    char *defined_userconf_dir;
- 
-     defined_userconf_dir = tilde_expand (MC_USERCONF_DIR);
-     if (g_path_is_absolute (defined_userconf_dir))
---- mc-4.8.13/src/filemanager/ext.c.dist	2014-09-06 19:15:37.899940352 +0400
-+++ mc-4.8.13-haiku/src/filemanager/ext.c	2014-09-06 19:14:42.802422784 +0400
-@@ -36,6 +36,7 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
-+#include <strings.h>
- #include <unistd.h>
- 
- #include "lib/global.h"

app-misc/mc/patches/mc-4.8.15.patch

@@ -0,0 +1,11 @@
+diff --git mc-4.8.13/lib/tty/tty-slang.h mc-4.8.13-haiku/lib/tty/tty-slang.h
+--- mc-4.8.13/lib/tty/tty-slang.h
++++ mc-4.8.13-haiku/lib/tty/tty-slang.h
+@@ -1,6 +1,7 @@
+ 
+ #ifndef MC__TTY_SLANG_H
+ #define MC__TTY_SLANG_H
++#define REAL_UNIX_SYSTEM
+ 
+ #ifdef HAVE_SLANG_SLANG_H
+ #include <slang/slang.h>