diff --git a/sys-libs/slang/patches/slang-2.1.3-haiku.diff b/sys-libs/slang/patches/slang-2.1.3-haiku.diff
deleted file mode 100644
index 779409841..000000000
--- a/sys-libs/slang/patches/slang-2.1.3-haiku.diff
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -urN slang-2.1.3/src/sldisply.c slang-2.1.3-haiku/src/sldisply.c
---- slang-2.1.3/src/sldisply.c	2007-05-16 02:47:04.000000000 +0000
-+++ slang-2.1.3-haiku/src/sldisply.c	2008-08-24 04:35:29.000000000 +0000
-@@ -26,13 +26,13 @@
- 
- #if !defined(VMS) || (__VMS_VER >= 70000000)
- # include <sys/time.h>
--# ifdef __QNX__
-+# if defined __QNX__ || defined __HAIKU__
- #  include <sys/select.h>
- # endif
- # include <sys/types.h>
- #endif
- 
--#ifdef __BEOS__
-+#if defined __BEOS__ && !defined __HAIKU__
- /* Prototype for select */
- # include <net/socket.h>
- #endif
-diff -urN slang-2.1.3/src/slutty.c slang-2.1.3-haiku/src/slutty.c
---- slang-2.1.3/src/slutty.c	2007-04-23 06:36:37.000000000 +0000
-+++ slang-2.1.3-haiku/src/slutty.c	2008-08-24 04:37:32.000000000 +0000
-@@ -43,7 +43,7 @@
- # endif
- #endif
- 
--#ifdef __BEOS__
-+#if defined  __BEOS__ && !defined __HAIKU__
- /* Prototype for select */
- # include <net/socket.h>
- #endif
-@@ -54,7 +54,7 @@
- # include <sys/ioctl.h>
- #endif
- 
--#ifdef __QNX__
-+#if defined __QNX__ || defined __HAIKU__
- # include <sys/select.h>
- #endif
- 
diff --git a/sys-libs/slang/patches/slang-2.1.3-lm-fix.diff b/sys-libs/slang/patches/slang-2.1.3-lm-fix.diff
deleted file mode 100644
index dd692ec8c..000000000
--- a/sys-libs/slang/patches/slang-2.1.3-lm-fix.diff
+++ /dev/null
@@ -1,205 +0,0 @@
-diff -urN slang-2.1.3/autoconf/aclocal.m4 slang-2.1.3-haiku/autoconf/aclocal.m4
---- slang-2.1.3/autoconf/aclocal.m4	2007-10-22 17:49:55.000000000 +0000
-+++ slang-2.1.3-haiku/autoconf/aclocal.m4	2008-08-24 21:38:53.000000000 +0000
-@@ -580,7 +580,7 @@
-     ELF_CC="\$(CC)"
-     ELF_CFLAGS="\$(CFLAGS) -fPIC"
-     ELF_LINK="\$(CC) \$(LDFLAGS) -shared -Wl,-O1 -Wl,--version-script,\$(VERSION_SCRIPT) -Wl,-soname,\$(ELFLIB_MAJOR)"
--    ELF_DEP_LIBS="\$(DL_LIB) -lm -lc"
-+    ELF_DEP_LIBS="\$(DL_LIB) $(M_LIB) -lc"
-     CC_SHARED="\$(CC) \$(CFLAGS) -shared -fPIC"
-     ;;
-   *solaris* )
-@@ -590,14 +590,14 @@
-       ELF_CC="\$(CC)"
-       ELF_CFLAGS="\$(CFLAGS) -fPIC"
-       ELF_LINK="\$(CC) \$(LDFLAGS) -shared -Wl,-ztext -Wl,-h,\$(ELFLIB_MAJOR)"
--      ELF_DEP_LIBS="\$(DL_LIB) -lm -lc"
-+      ELF_DEP_LIBS="\$(DL_LIB) $(M_LIB) -lc"
-       CC_SHARED="\$(CC) \$(CFLAGS) -G -fPIC"
-     else
-       DYNAMIC_LINK_FLAGS=""
-       ELF_CC="\$(CC)"
-       ELF_CFLAGS="\$(CFLAGS) -K PIC"
-       ELF_LINK="\$(CC) \$(LDFLAGS) -G -h\$(ELFLIB_MAJOR)"
--      ELF_DEP_LIBS="\$(DL_LIB) -lm -lc"
-+      ELF_DEP_LIBS="\$(DL_LIB) $(M_LIB) -lc"
-       CC_SHARED="\$(CC) \$(CFLAGS) -G -K PIC"
-     fi
-     ;;
-@@ -663,7 +663,15 @@
-     #  ELF_LINK="ld -Bshareable -x"
-     #fi
-     ELF_LINK="\$(CC) \$(LDFLAGS) -shared -Wl,-soname,\$(ELFLIB_MAJOR)"
--    ELF_DEP_LIBS="\$(DL_LIB) -lm"
-+    ELF_DEP_LIBS="\$(DL_LIB) $(M_LIB)"
-+    CC_SHARED="\$(CC) \$(CFLAGS) -shared -fPIC"
-+    ;;
-+  *haiku* )
-+    DYNAMIC_LINK_FLAGS="-Wl,-export-dynamic"
-+    ELF_CC="\$(CC)"
-+    ELF_CFLAGS="\$(CFLAGS) -fPIC"
-+    ELF_LINK="\$(CC) \$(LDFLAGS) -shared -Wl,-O1 -Wl,--version-script,\$(VERSION_SCRIPT) -Wl,-soname,\$(ELFLIB_MAJOR)"
-+    ELF_DEP_LIBS="\$(DL_LIB)"
-     CC_SHARED="\$(CC) \$(CFLAGS) -shared -fPIC"
-     ;;
-   *cygwin* )
-@@ -674,7 +682,7 @@
-     DLL_IMPLIB_NAME="lib\$(THIS_LIB)\$(ELFLIB_MAJOR_VERSION).dll.a"
-     #ELF_LINK="\$(CC) \$(LDFLAGS) -shared -Wl,-O1 -Wl,--version-script,\$(VERSION_SCRIPT) -Wl,-soname,\$(ELFLIB_MAJOR) -Wl,--out-implib=\$(DLL_IMPLIB_NAME) -Wl,-export-all-symbols -Wl,-enable-auto-import"
-     ELF_LINK="\$(CC) \$(LDFLAGS) -shared -Wl,-O1 -Wl,--version-script,\$(VERSION_SCRIPT) -Wl,-soname,\$(ELFLIB_MAJOR) -Wl,--out-implib=\$(DLL_IMPLIB_NAME)"
--    ELF_DEP_LIBS="\$(DL_LIB) -lm"
-+    ELF_DEP_LIBS="\$(DL_LIB) $(M_LIB)"
-     CC_SHARED="\$(CC) \$(CFLAGS) -shared -DSLANG_DLL=1"
-     dnl# CYGWIN prohibits undefined symbols when linking shared libs
-     SLANG_LIB_FOR_MODULES="-L\$(ELFDIR) -lslang"
-@@ -691,7 +699,7 @@
-     ELF_CC="\$(CC)"
-     ELF_CFLAGS="\$(CFLAGS) -fPIC"
-     ELF_LINK="\$(CC) \$(LDFLAGS) -shared"
--    ELF_DEP_LIBS="\$(DL_LIB) -lm -lc"
-+    ELF_DEP_LIBS="\$(DL_LIB) $(M_LIB) -lc"
-     CC_SHARED="\$(CC) \$(CFLAGS) -shared -fPIC"
- esac
- 
-diff -urN slang-2.1.3/demo/Makefile.in slang-2.1.3-haiku/demo/Makefile.in
---- slang-2.1.3/demo/Makefile.in	2006-05-12 19:09:10.000000000 +0000
-+++ slang-2.1.3-haiku/demo/Makefile.in	2008-08-24 21:40:28.000000000 +0000
-@@ -29,7 +29,7 @@
- ALL_CFLAGS = $(CFLAGS) -Dunix -I$(SLANG_INCLUDE)
- 
- COMPILE_CMD = $(CC) -c $(ALL_CFLAGS)
--EXECLIBS = -L$(SLANG_LIB) -lslang -lm $(TCAPLIB)
-+EXECLIBS = -L$(SLANG_LIB) -lslang $(M_LIB) $(TCAPLIB)
- EXECDEPS = $(SLANG_LIB)/libslang.a
- DOT_O_DEPS = demolib.c
- 
-diff -urN slang-2.1.3/doc/tm/tools/Makefile slang-2.1.3-haiku/doc/tm/tools/Makefile
---- slang-2.1.3/doc/tm/tools/Makefile	2006-05-12 19:09:10.000000000 +0000
-+++ slang-2.1.3-haiku/doc/tm/tools/Makefile	2008-08-24 21:40:28.000000000 +0000
-@@ -7,7 +7,7 @@
- OBJDIR=$(ARCH)objs#
- 
- SLANGDIR=../../../../src
--EXECLIBS = -L$(SLANGDIR)/$(ARCH)$(ELF)objs -lslang -lm
-+EXECLIBS = -L$(SLANGDIR)/$(ARCH)$(ELF)objs -lslang $(M_LIB)
- EXECINC = -I$(SLANGDIR)
- 
- COMPILE_CMD=$(CC) -c $(CFLAGS) $(EXECINC)
-diff -urN slang-2.1.3/modules/Makefile.in slang-2.1.3-haiku/modules/Makefile.in
---- slang-2.1.3/modules/Makefile.in	2007-09-08 02:47:29.000000000 +0000
-+++ slang-2.1.3-haiku/modules/Makefile.in	2008-08-24 21:40:28.000000000 +0000
-@@ -69,7 +69,7 @@
- #---------------------------------------------------------------------------
- RPATH = @RPATH@
- 
--LIBS = $(LDFLAGS) $(RPATH) $(SLANG_LIB) $(DL_LIB) -lm
-+LIBS = $(LDFLAGS) $(RPATH) $(SLANG_LIB) $(DL_LIB) $(M_LIB)
- #LIBS = $(RPATH) $(DL_LIB) -lm
- INCS = $(SLANG_INC)
- 
-diff -urN slang-2.1.3/slsh/Makefile.in slang-2.1.3-haiku/slsh/Makefile.in
---- slang-2.1.3/slsh/Makefile.in	2007-09-09 01:39:18.000000000 +0000
-+++ slang-2.1.3-haiku/slsh/Makefile.in	2008-08-24 21:40:28.000000000 +0000
-@@ -14,7 +14,7 @@
- SLANG_SRCINC	= -I@SRCDIR@
- SLANG_SRCLIB	= -L@ELFDIR@
- #---------------------------------------------------------------------------
--OTHER_LIBS	= @TERMCAP@ @DYNAMIC_LINK_LIB@ @LIBS@ -lm
-+OTHER_LIBS	= @TERMCAP@ @DYNAMIC_LINK_LIB@ @LIBS@
- RPATH		= @RPATH@
- #----------------------------------------------------------------------------
- INSTALL		= @INSTALL@
-@@ -64,11 +64,11 @@
- #----------------------------------------------------------------------------
- @SET_MAKE@
- SHELL = /bin/sh
--INST_LIBS = $(RPATH) $(SLANG_INST_LIB) $(DEST_LIB_DIR) -lslang $(READLINE_LIB) $(OTHER_LIBS)
-+INST_LIBS = $(RPATH) $(SLANG_INST_LIB) $(DEST_LIB_DIR) -lslang $(READLINE_LIB) $(OTHER_LIBS) $(M_LIB)
- DEFS = -DSLSH_CONF_DIR='"$(SLSH_CONF_DIR)"' -DSLSH_PATH='"$(SLSH_LIB_DIR)"' \
-  -DSLSH_CONF_DIR_ENV='$(SLSH_CONF_DIR_ENV)' -DSLSH_LIB_DIR_ENV='$(SLSH_LIB_DIR_ENV)' \
-  -DSLSH_PATH_ENV='$(SLSH_PATH_ENV)' 
--SRC_LIBS = $(SLANG_SRCLIB) -lslang $(READLINE_LIB) $(OTHER_LIBS)
-+SRC_LIBS = $(SLANG_SRCLIB) -lslang $(READLINE_LIB) $(OTHER_LIBS) $(M_LIB)
- #
- all: slsh_exe
- slsh_exe: slsh.o readline.o
-diff -urN slang-2.1.3/src/Makefile.in slang-2.1.3-haiku/src/Makefile.in
---- slang-2.1.3/src/Makefile.in	2007-09-08 02:47:29.000000000 +0000
-+++ slang-2.1.3-haiku/src/Makefile.in	2008-08-24 21:40:28.000000000 +0000
-@@ -36,7 +36,7 @@
- #---------------------------------------------------------------------------
- # Misc Libraries
- MISC_TERMINFO_DIRS = @MISC_TERMINFO_DIRS@
--OTHERLIBS = @TERMCAP@ @LIBS@ -lm
-+OTHERLIBS = @TERMCAP@ @LIBS@
- #---------------------------------------------------------------------------
- # Directory where library is going to go when installed
- #---------------------------------------------------------------------------
-@@ -107,7 +107,7 @@
- ELFDIR_ELF_LIB = $(ELFDIR)/$(ELFLIB_BUILD_NAME)#
- ELFDIR_DLL_LIB = $(ELFDIR)/$(DLL_IMPLIB_NAME)#
- 
--EXECLIBS = -L$(OBJDIR) -lslang $(OTHERLIBS) $(DL_LIB)
-+EXECLIBS = -L$(OBJDIR) -lslang $(OTHERLIBS) $(DL_LIB) $(M_LIB)
- EXECDEPS = $(OBJDIR_NORMAL_LIB)
- 
- OFILES = @PROGRAM_OFILES@
-diff -urN slang-2.1.3/src/curses/Makefile slang-2.1.3-haiku/src/curses/Makefile
---- slang-2.1.3/src/curses/Makefile	2006-05-12 19:09:10.000000000 +0000
-+++ slang-2.1.3-haiku/src/curses/Makefile	2008-08-24 21:40:28.000000000 +0000
-@@ -29,23 +29,23 @@
- firework: $(CURSES_H) firework.c
- 	$(COMPILE) $@.c -o $@ $(LFLAGS)
- tclock: $(CURSES_H) tclock.c
--	$(COMPILE) $@.c -o $@ $(LFLAGS) -lm
-+	$(COMPILE) $@.c -o $@ $(LFLAGS) $(M_LIB)
- worm: worm.c
--	$(COMPILE) $@.c -o $@ $(LFLAGS) -lm
-+	$(COMPILE) $@.c -o $@ $(LFLAGS) $(M_LIB)
- knight: knight.c
--	$(COMPILE) $@.c -o $@ $(LFLAGS) -lm
-+	$(COMPILE) $@.c -o $@ $(LFLAGS) $(M_LIB)
- xmas: xmas.c
--	$(COMPILE) $@.c -o $@ $(LFLAGS) -lm
-+	$(COMPILE) $@.c -o $@ $(LFLAGS) $(M_LIB)
- newdemo: newdemo.c
--	$(COMPILE) $@.c -o $@ $(LFLAGS) -lm
-+	$(COMPILE) $@.c -o $@ $(LFLAGS) $(M_LIB)
- testcurs: testcurs.c
--	$(COMPILE) $@.c -o $@ $(LFLAGS) -lm
-+	$(COMPILE) $@.c -o $@ $(LFLAGS) $(M_LIB)
- lrtest: lrtest.c
--	$(COMPILE) $@.c -o $@ $(LFLAGS) -lm
-+	$(COMPILE) $@.c -o $@ $(LFLAGS) $(M_LIB)
- t: t.c
--	$(COMPILE) $@.c -o $@ $(LFLAGS) -lm
-+	$(COMPILE) $@.c -o $@ $(LFLAGS) $(M_LIB)
- key: key.c
--	$(COMPILE) $@.c -o $@ $(LFLAGS) -lm
-+	$(COMPILE) $@.c -o $@ $(LFLAGS) $(M_LIB)
- 
- clean:
- 	/bin/rm $(EXECS)
-diff -urN slang-2.1.3/src/test/Makefile slang-2.1.3-haiku/src/test/Makefile
---- slang-2.1.3/src/test/Makefile	2007-07-31 16:11:38.000000000 +0000
-+++ slang-2.1.3-haiku/src/test/Makefile	2008-08-24 21:40:28.000000000 +0000
-@@ -13,7 +13,7 @@
- RUN_TEST_PGM = ./$(TEST_PGM)
- SLANGINC = ..
- SLANGLIB = ../$(ARCH)objs
--OTHERLIBS = -lm
-+OTHERLIBS = $(M_LIB)
- 
- run_tests: $(TEST_PGM)
- 	@echo ""
-diff -urN slang-2.1.3/src/util/Makefile slang-2.1.3-haiku/src/util/Makefile
---- slang-2.1.3/src/util/Makefile	2006-05-12 19:09:10.000000000 +0000
-+++ slang-2.1.3-haiku/src/util/Makefile	2008-08-24 21:40:28.000000000 +0000
-@@ -1,5 +1,5 @@
- INCS = -I..
--LIBS = -L../$(ARCH)objs -lslang -lm
-+LIBS = -L../$(ARCH)objs -lslang $(M_LIB)
- 
- bcdump: bcdump.c ../$(ARCH)objs/libslang.a
- 	$(CC) $(CFLAGS) $(INCS) bcdump.c -o bcdump $(LIBS)
diff --git a/sys-libs/slang/patches/slang-2.2.2.patch b/sys-libs/slang/patches/slang-2.2.2.patch
deleted file mode 100644
index a8caa7f7a..000000000
--- a/sys-libs/slang/patches/slang-2.2.2.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Naur slang-2.2.2/src/slang.h slang-2.2.2-haiku/src/slang.h
---- slang-2.2.2/src/slang.h	2009-12-05 17:03:51.043253760 -0200
-+++ slang-2.2.2-haiku/src/slang.h	2010-09-21 08:33:49.000000000 -0300
-@@ -1377,7 +1377,7 @@
- 
- /*{{{ SLang getkey interface Functions */
- 
--#ifdef REAL_UNIX_SYSTEM
-+#if defined(REAL_UNIX_SYSTEM) || defined(__HAIKU__)
- SL_EXTERN int SLang_TT_Baud_Rate;
- SL_EXTERN int SLang_TT_Read_FD;
- #else
-@@ -1614,7 +1614,7 @@
- #endif
- 
- #ifndef __GO32__
--#if defined(VMS) || defined(REAL_UNIX_SYSTEM)
-+#if defined(VMS) || defined(REAL_UNIX_SYSTEM) || defined(__HAIKU__)
- SL_EXTERN int SLtt_Blink_Mode;
- SL_EXTERN int SLtt_Use_Blink_For_ACS;
- SL_EXTERN int SLtt_Newline_Ok;
diff --git a/sys-libs/slang/patches/slang-2.2.4.patchset b/sys-libs/slang/patches/slang-2.2.4.patchset
new file mode 100644
index 000000000..4f61f4de7
--- /dev/null
+++ b/sys-libs/slang/patches/slang-2.2.4.patchset
@@ -0,0 +1,126 @@
+From fc18ce32a741119f78108823fbcc0ec6012121c5 Mon Sep 17 00:00:00 2001
+From: Chris Roberts <cpr420@gmail.com>
+Date: Wed, 9 Oct 2013 16:04:04 -0600
+Subject: Enhance Haiku support by tweaking paths and defining a HAIKU
+ variable.
+
+
+diff --git a/slsh/slsh.c b/slsh/slsh.c
+index 9745543..18a599e 100644
+--- a/slsh/slsh.c
++++ b/slsh/slsh.c
+@@ -26,6 +26,10 @@ USA.
+ # include <windows.h>
+ # include <io.h>
+ #endif
++#ifdef __HAIKU__
++#include <FindDirectory.h>
++#include <fs_info.h>
++#endif
+ 
+ #include <sys/stat.h>
+ 
+@@ -52,7 +56,11 @@ static char *Slsh_Version = "0.8.6-0";
+ # define SLSH_LIB_DIR_ENV "SLSH_LIB_DIR"
+ #endif
+ 
+-#if defined(REAL_UNIX_SYSTEM) || defined(__APPLE__)
++#if defined(__HAIKU__)
++/* # define DEFAULT_LIBRARY_PATH "/usr/local/share/slsh:/usr/local/lib/slsh:/usr/share/slsh:/usr/lib/slsh"; */
++# define DEFAULT_CONF_PATH "/boot/system/settings:/boot/home/config/settings";
++# define USER_SLSHRC "slsh.rc"
++#elif defined(REAL_UNIX_SYSTEM) || defined(__APPLE__)
+ /* # define DEFAULT_LIBRARY_PATH "/usr/local/share/slsh:/usr/local/lib/slsh:/usr/share/slsh:/usr/lib/slsh"; */
+ # define DEFAULT_CONF_PATH "/usr/local/etc:/usr/local/etc/slsh:/etc:/etc/slsh";
+ # define USER_SLSHRC ".slshrc"
+@@ -494,6 +502,9 @@ int main (int argc, char **argv)
+    int test_mode = 0;
+    char *exec_string = NULL;
+    int quiet = 0;
++#if defined(__HAIKU__)
++   char buffer[B_PATH_NAME_LENGTH+B_FILE_NAME_LENGTH];
++#endif
+ 
+    (void) SLutf8_enable (-1);
+ 
+@@ -512,8 +523,13 @@ int main (int argc, char **argv)
+ #endif
+ 
+    /* FIXME for other systems */
+-#ifdef __WIN32__
++#if defined(__WIN32__)
+    init_file_dir = getenv ("USERPROFILE");
++#elif defined(__HAIKU__)
++   if (find_directory(B_USER_SETTINGS_DIRECTORY, -1, false, buffer, sizeof(buffer)) != B_OK)
++     sprintf(buffer, "/boot/home/config/settings");
++
++   init_file_dir = &buffer;
+ #else
+    init_file_dir = getenv ("HOME");
+ #endif
+diff --git a/src/slstd.c b/src/slstd.c
+index d86765e..f80295e 100644
+--- a/src/slstd.c
++++ b/src/slstd.c
+@@ -1279,6 +1279,9 @@ int SLang_init_slang (void) /*{{{*/
+ #ifdef REAL_UNIX_SYSTEM
+ 	"UNIX",
+ #endif
++#if defined(__HAIKU__)
++	"HAIKU",
++#endif
+ #if SLANG_HAS_FLOAT
+ 	"SLANG_DOUBLE_TYPE",
+ #endif
+-- 
+1.8.3.4
+
+
+From 95a0248382ceb2d0248fa95379136a74bf998075 Mon Sep 17 00:00:00 2001
+From: Chris Roberts <cpr420@gmail.com>
+Date: Fri, 11 Oct 2013 00:32:22 -0600
+Subject: Change location of some install paths
+
+
+diff --git a/modules/Makefile.in b/modules/Makefile.in
+index 0384359..9d84c93 100644
+--- a/modules/Makefile.in
++++ b/modules/Makefile.in
+@@ -63,7 +63,7 @@ INSTALL		= @INSTALL@
+ INSTALL_DATA	= @INSTALL_DATA@
+ INSTALL_MODULE	= @INSTALL_MODULE@
+ MKINSDIR	= $(CONFIG_DIR)/autoconf/mkinsdir.sh
+-SLSH_DIR	= $(prefix)/share/slsh
++SLSH_DIR	= @datarootdir@/slsh
+ CMAPS_DIR	= $(SLSH_DIR)/cmaps
+ HELP_DIR	= $(SLSH_DIR)/help
+ #---------------------------------------------------------------------------
+diff --git a/slsh/Makefile.in b/slsh/Makefile.in
+index b71b9bc..be16ada 100644
+--- a/slsh/Makefile.in
++++ b/slsh/Makefile.in
+@@ -30,7 +30,7 @@ MKINSDIR	= $(CONFIG_DIR)/autoconf/mkinsdir.sh
+ SLSH_CONF_DIR	= @sysconfdir@
+ SLSH_LIB_DIR	= $(datarootdir)/slsh
+ SLSH_HELP_DIR	= $(SLSH_LIB_DIR)/help
+-SLSH_DOC_DIR	= $(datarootdir)/doc/slsh
++SLSH_DOC_DIR	= @docdir@/slsh
+ SLSH_LOCALLIB_DIR = $(SLSH_LIB_DIR)/local-packages
+ SLSH_SCRIPT_DIR	= $(SLSH_LIB_DIR)/scripts
+ SCRIPTS		= jpegsize lsrpm sldb svnsh slprof slstkchk
+diff --git a/src/Makefile.in b/src/Makefile.in
+index 03fa056..fab1477 100644
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -45,7 +45,7 @@ exec_prefix = @exec_prefix@
+ install_lib_dir = @libdir@
+ install_bin_dir = @bindir@
+ install_include_dir = @includedir@
+-install_doc_dir = $(prefix)/share/doc/slang/v@slang_major_version@
++install_doc_dir = @docdir@/slang/v@slang_major_version@
+ DOC_FILES = ../changes.txt ../COPY* ../doc/slangdoc.html ../doc/text/*.txt
+ MODULE_INSTALL_DIR = @libdir@/slang/v@slang_major_version@/modules
+ #---------------------------------------------------------------------------
+-- 
+1.8.3.4
+
diff --git a/sys-libs/slang/slang-2.2.2.recipe b/sys-libs/slang/slang-2.2.2.recipe
deleted file mode 100644
index c65383837..000000000
--- a/sys-libs/slang/slang-2.2.2.recipe
+++ /dev/null
@@ -1,26 +0,0 @@
-DESCRIPTION="S-Lang is a multi-platform programmer's library designed to allow a developer to create robust multi-platform software." 
-HOMEPAGE="http://www.s-lang.org/" 
-SRC_URI="ftp://space.mit.edu/pub/davis/slang/v2.2/slang-2.2.2.tar.gz"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-CHECKSUM_MD5="e7183d0acab9cc35fae12849f8b848e2"
-BUILD()
-{
-	cd slang-2.2.2/autoconf
-	libtoolize --force --copy --install
-	cp autoconf/config.guess config.guess
-	cd ..
-	sed -i -e '/^TERMCAP=/s:=.*:=:' configure || die
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
-	make
-}
-
-INSTALL()
-{
-	cd slang-2.2.2
-	make install DESTDIR="${DESTDIR}"
-}
-
-LICENSE="GNU GPL v2"
-COPYRIGHT="2004-2010 John E. Davis"
diff --git a/sys-libs/slang/slang-2.2.4.recipe b/sys-libs/slang/slang-2.2.4.recipe
new file mode 100644
index 000000000..5fd2852d7
--- /dev/null
+++ b/sys-libs/slang/slang-2.2.4.recipe
@@ -0,0 +1,95 @@
+SUMMARY="S-Lang is a multi-platform programmer's library designed to allow a developer to create robust multi-platform software."
+DESCRIPTION="
+S-Lang is a multi-platform programmer's library designed to allow a
+developer to create robust multi-platform software. It provides
+facilities required by interactive applications such as display/screen
+management, keyboard input, keymaps, and so on. The most exciting
+feature of the library is the slang interpreter that may be easily
+embedded into a program to make it extensible. While the emphasis has
+always been on the embedded nature of the interpreter, it may also be
+used in a stand-alone fashion through the use of slsh, which is part
+of the S-Lang distribution."
+
+HOMEPAGE="http://www.jedsoft.org/slang/"
+SRC_URI="ftp://space.mit.edu/pub/davis/slang/v2.2/slang-2.2.4.tar.bz2"
+CHECKSUM_MD5="7fcfd447e378f07dd0c0bae671fe6487"
+LICENSE="GNU GPL v2"
+COPYRIGHT="2004-2013 John E. Davis"
+REVISION="1"
+ARCHITECTURES="x86_gcc2 x86"
+PATCHES="slang-${portVersion}.patchset"
+
+PROVIDES="
+	slang = $portVersion compat >= 2.2
+	lib:libslang = $portVersion compat >= 2.2
+	cmd:slsh = $portVersion compat >= 2.2
+	"
+
+REQUIRES="
+	haiku
+	lib:libpcre
+	lib:libiconv
+	lib:libpng
+	lib:libz
+	"
+
+BUILD_REQUIRES="
+	devel:libncurses
+	devel:libpcre
+	devel:libiconv
+	devel:libpng
+	devel:libz
+	"
+
+BUILD_PREREQUIRES="
+	haiku_devel
+	cmd:autoconf
+	cmd:find
+	cmd:gcc
+	cmd:ld
+	cmd:make
+	cmd:ncurses5_config
+	"
+
+SOURCE_DIR="$portVersionedName"
+
+GLOBAL_WRITABLE_FILES="
+        settings/slsh.rc keep-old
+	"
+
+BUILD()
+{
+	runConfigure ./configure \
+	--with-pnglib=$libDir \
+	--with-pnginc=$includeDir \
+	--with-zlib=$libDir \
+	--with-zinc=$includeDir \
+	--with-iconvlib=$libDir \
+	--with-iconvinc=$includeDir \
+	--with-pcrelib=$libDir \
+	--with-pcreinc=$includeDir
+	#--with-oniglib=$libDir \
+	#--with-oniginc=$includeDir
+
+	make
+}
+
+INSTALL()
+{
+	make install
+
+	fixPkgconfig
+
+	prepareInstalledDevelLibs libslang
+
+	packageEntries devel $developDir
+}
+
+PROVIDES_devel="
+	slang_devel = $portVersion compat >= 2.2
+	devel:libslang = $portVersion compat >= 2.2
+	"
+
+REQUIRES_devel="
+	slang == $portVersion
+	"