From 7b92e0b46e22740bf306ee5dae45b75103d41376 Mon Sep 17 00:00:00 2001 From: Maxim Sokhatsky Date: Thu, 16 Jan 2014 19:38:18 +0000 Subject: [PATCH 1/3] Midnight Commander 4.8.11 recipe --- app-misc/mc/mc-4.8.11.recipe | 57 ++++++++++++++++++++++++++++++++++++ app-misc/mc/patches/mc.patch | 12 ++++++++ 2 files changed, 69 insertions(+) create mode 100644 app-misc/mc/mc-4.8.11.recipe create mode 100644 app-misc/mc/patches/mc.patch diff --git a/app-misc/mc/mc-4.8.11.recipe b/app-misc/mc/mc-4.8.11.recipe new file mode 100644 index 000000000..9a2bfe51e --- /dev/null +++ b/app-misc/mc/mc-4.8.11.recipe @@ -0,0 +1,57 @@ +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/" +SRC_URI="git+https://github.com/MidnightCommander/mc#a8ffc26817fd7a5a60f7672b31b6368b0753226e" +REVISION="1" +LICENSE="GNU GPL v2" +COPYRIGHT="2007 MC Team" +ARCHITECTURES="x86 x86_gcc2" +PATCHES="mc.patch" +SOURCE_DIR="mc-4.8.11" +COOK="Maxim Sokhatsky " + +PROVIDES=" + mc = $portVersion + cmd:mc = $portVersion + cmd:mcedit = $portVersion + " + +REQUIRES=" + haiku >= $haikuVersion + " + +BUILD_REQUIRES=" + devel:libncurses + devel:libintl + devel:libiconv + " + +BUILD_PREREQUIRES=" + cmd:pkg_config + haiku_devel >= $haikuVersion + devel:libglib_2.0 + devel:libslang + cmd:gettext + cmd:make + cmd:tar + cmd:libtoolize + cmd:aclocal + cmd:autom4te + cmd:autoconf + cmd:automake + cmd:autoheader + cmd:gcc + " + +BUILD() +{ + autogen.sh + runConfigure configure --prefix="$prefix" --with-screen=ncurses + make +} + +INSTALL() +{ + make install +} diff --git a/app-misc/mc/patches/mc.patch b/app-misc/mc/patches/mc.patch new file mode 100644 index 000000000..acbb58cfa --- /dev/null +++ b/app-misc/mc/patches/mc.patch @@ -0,0 +1,12 @@ +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 +@@ -66,7 +66,7 @@ + + /*** file scope macro definitions ****************************************************************/ + +-#if defined(_AIX) && !defined(CTRL) ++#if !defined(CTRL) + #define CTRL(x) ((x) & 0x1f) + #endif + From 29526654a5d7d9ae77b11e11a24d2b966b1fbc48 Mon Sep 17 00:00:00 2001 From: Maxim Sokhatsky Date: Sun, 19 Jan 2014 00:00:27 +0000 Subject: [PATCH 2/3] fix REQUIRES libs, fix hash, fix writable files, POLICY OK --- app-misc/mc/mc-4.8.11.recipe | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/app-misc/mc/mc-4.8.11.recipe b/app-misc/mc/mc-4.8.11.recipe index 9a2bfe51e..58d11712e 100644 --- a/app-misc/mc/mc-4.8.11.recipe +++ b/app-misc/mc/mc-4.8.11.recipe @@ -2,7 +2,7 @@ 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/" -SRC_URI="git+https://github.com/MidnightCommander/mc#a8ffc26817fd7a5a60f7672b31b6368b0753226e" +SRC_URI="git+https://github.com/MidnightCommander/mc#d26b7dd6ee49211f4d18fdfbe193023a3e480389" REVISION="1" LICENSE="GNU GPL v2" COPYRIGHT="2007 MC Team" @@ -11,27 +11,36 @@ PATCHES="mc.patch" SOURCE_DIR="mc-4.8.11" COOK="Maxim Sokhatsky " +GLOBAL_WRITABLE_FILES=" + settings/mc directory keep-old + " + PROVIDES=" mc = $portVersion cmd:mc = $portVersion cmd:mcedit = $portVersion + cmd:mcdiff = $portVersion + cmd:mcview = $portVersion " REQUIRES=" haiku >= $haikuVersion + lib:libncurses + lib:libintl + lib:libiconv + lib:libglib_2.0 " BUILD_REQUIRES=" devel:libncurses devel:libintl devel:libiconv + devel:libglib_2.0 " BUILD_PREREQUIRES=" cmd:pkg_config haiku_devel >= $haikuVersion - devel:libglib_2.0 - devel:libslang cmd:gettext cmd:make cmd:tar @@ -47,7 +56,7 @@ BUILD_PREREQUIRES=" BUILD() { autogen.sh - runConfigure configure --prefix="$prefix" --with-screen=ncurses + runConfigure configure --prefix="$prefix" --datarootdir="$dataRootDir" --with-screen=ncurses make } From 922e4046d8e4b8562426513d9706d3d0802fc16a Mon Sep 17 00:00:00 2001 From: Maxim Sokhatsky Date: Sun, 19 Jan 2014 01:08:40 +0000 Subject: [PATCH 3/3] Haiku Chat fixes --- haiku-apps/chat/chat-20100903.recipe | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/haiku-apps/chat/chat-20100903.recipe b/haiku-apps/chat/chat-20100903.recipe index 43ae6edd2..638642519 100644 --- a/haiku-apps/chat/chat-20100903.recipe +++ b/haiku-apps/chat/chat-20100903.recipe @@ -9,13 +9,13 @@ DESCRIPTION=" HOMEPAGE="http://synrc.com/client/chat/haiku/" SRC_URI="git+https://github.com/devaspot/chat.git" LICENSE="MIT" -COPYRIGHT="2012 Maxim Sokhatsky" -REVISION="1" +COPYRIGHT="2010-2014 Maxim Sokhatsky" +REVISION="2" ARCHITECTURES="x86_gcc2 x86" PROVIDES=" - chat = $portVersion - app:chat = $portVersion + Chat = $portVersion + app:Chat = $portVersion " REQUIRES=" @@ -35,18 +35,18 @@ BUILD_PREREQUIRES=" cmd:gcc$secondaryArchSuffix cmd:make cmd:which + cmd:mkdepend " BUILD() -{ +{ cd src - make -f Makefile.gcc2 BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY` - chmod 755 Chat + BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY` make } INSTALL() { mkdir -p $appsDir - cp src/Chat $appsDir/Chat + cp src/objects.x86-gcc2-release/Chat $appsDir/Chat addAppDeskbarSymlink $appsDir/Chat "Chat" }