mc: update recipe to 4.8.12

app-misc/mc/mc-4.8.12.recipe

@@ -0,0 +1,83 @@
+SUMMARY="Midnight Commander — 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."
+HOMEPAGE="http://www.midnight-commander.org"
+COPYRIGHT="2007 MC Team"
+LICENSE="GNU GPL v2"
+
+CHECKSUM_SHA256="5f2fd570a798dc0cc06374adffef8ca403588c4e73dfdf908e9a4311718153fe"
+
+SRC_URI="http://ftp.midnight-commander.org/mc-$portVersion.tar.xz"
+
+REVISION="1"
+
+ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
+PATCHES="mc.patch"
+
+GLOBAL_WRITABLE_FILES="settings/mc directory keep-old"
+
+PROVIDES="
+	mc$secondaryArchSuffix = $portVersion compat >= $portVersion
+	cmd:mc$secondaryArchSuffix = $portVersion compat >= $portVersion
+	cmd:mcedit$secondaryArchSuffix = $portVersion compat >= $portVersion
+	cmd:mcdiff$secondaryArchSuffix = $portVersion compat >= $portVersion
+	cmd:mcview$secondaryArchSuffix = $portVersion compat >= $portVersion
+	"
+
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libiconv$secondaryArchSuffix
+	lib:libintl$secondaryArchSuffix
+	lib:libncurses$secondaryArchSuffix
+	lib:libssh2$secondaryArchSuffix
+	lib:libssl$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	glib2$secondaryArchSuffix >= 2.38.1
+	"
+
+BUILD_REQUIRES="
+	devel:libglib_2.0$secondaryArchSuffix
+	devel:libiconv$secondaryArchSuffix
+	devel:libintl$secondaryArchSuffix
+	devel:libncurses$secondaryArchSuffix
+	devel:libssh2$secondaryArchSuffix
+	devel:libssl$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
+	"
+
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	cmd:awk
+	cmd:find
+	cmd:gcc$secondaryArchSuffix
+	cmd:gettext$secondaryArchSuffix
+	cmd:make
+	cmd:perl
+	cmd:pkg_config$secondaryArchSuffix
+	cmd:tar
+	"
+
+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
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make $jobArgs install-strip
+}

app-misc/mc/patches/mc.patch

@@ -1,6 +1,6 @@
-diff --git mc-4.8.11/lib/tty/tty-ncurses.c mc-4.8.11-haiku/lib/tty/tty-ncurses.c
---- mc-4.8.11/lib/tty/tty-ncurses.c
-+++ mc-4.8.11-haiku/lib/tty/tty-ncurses.c
+diff --git mc-4.8.12/lib/tty/tty-ncurses.c mc-4.8.12-haiku/lib/tty/tty-ncurses.c
+--- mc-4.8.12/lib/tty/tty-ncurses.c
++++ mc-4.8.12-haiku/lib/tty/tty-ncurses.c
 @@ -66,7 +66,7 @@
  
  /*** file scope macro definitions ****************************************************************/
@@ -9,4 +9,35 @@ diff --git mc-4.8.11/lib/tty/tty-ncurses.c mc-4.8.11-haiku/lib/tty/tty-ncurses.c
 +#if !defined(CTRL)
  #define CTRL(x) ((x) & 0x1f)
  #endif
+
+diff --git mc-4.8.12/lib/mcconfig/paths.c mc-4.8.12-haiku/lib/mcconfig/paths.c
+--- mc-4.8.12/lib/mcconfig/paths.c
++++ mc-4.8.12-haiku/lib/mcconfig/paths.c
+@@ -289,6 +289,7 @@
+ mc_config_init_config_paths (GError ** error)
+ {
+     char *dir;
++    char *defined_userconf_dir;
  
+     if (xdg_vars_initialized)
+         return;
+@@ -346,7 +347,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))
+
+diff --git mc-4.8.12/lib/tty/tty-slang.h mc-4.8.12-haiku/lib/tty/tty-slang.h
+--- mc-4.8.12/lib/tty/tty-slang.h
++++ mc-4.8.12-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>