Cleanup: fix names of recipe and patch files.

* this fixes the wrong recipe names introduced by myself in #d525fee
* adjust patch names to match corresponding recipes
* additionally: create 'additional-files' folders as hint to some
  ports that do not have a proper recipe yet

app-admin/pwgen/pwgen-2.06.sh

@@ -1,26 +0,0 @@
-#!/bin/sh
-
-PACKAGE="app-admin/pwgen"
-VERSION="2.06"
-HOMEPAGE="http://sourceforge.net/projects/pwgen/"
-URL="http://voxel.dl.sourceforge.net/sourceforge/pwgen/"
-FILE="pwgen-2.06.tar.gz"
-
-PREFIX=--prefix=/boot/common
-HAIKUPORTS="http://ports.haiku-files.org/wiki"
-CWD=`pwd`
-
-if [ ! -d ${PACKAGE}/${VERSION} ] ; then
-	mkdir -p ${PACKAGE}/${VERSION}
-fi
-if [ ! -e ${FILE} ] ; then
-	wget ${URL}${FILE}
-fi
-cd ${PACKAGE}/${VERSION}
-tar xvf ${CWD}/${FILE}
-cd pwgen-2.06
-configure ${PREFIX}
-`make && make install && echo  && echo "  Installation complete."` || echo "  Installation FAILED !"
-
-echo "  For more information, see ${HAIKUPORTS}/${PACKAGE}"
-echo

app-arch/fastjar/fastjar-0.97.sh

@@ -1,38 +0,0 @@
-#!/bin/sh
-
-HOMEPAGE="https://savannah.nongnu.org/projects/fastjar/"
-PACKAGE="app-arch/fastjar/"
-VERSION="0.97"
-URL="http://mirror.its.uidaho.edu/pub/savannah/fastjar/"
-FILE="fastjar-0.97.tar.gz"
-
-# ------- This should not be edited ------- 
-PFX=/boot/common/
-HAIKUPORTS="http://ports.haiku-files.org/wiki/"
-CWD=`pwd`/
-if [ ! -d ${PACKAGE}${VERSION} ] ; then
-	mkdir -p ${PACKAGE}${VERSION}
-fi
-if [ ! -e ${FILE} ] ; then
-	wget ${URL}${FILE}
-fi
-cd ${PACKAGE}${VERSION}
-if [ ${FILE:(-7)} = "tar.bz2" ] ; then
-	tar -jxvf ${CWD}${FILE}
-elif [ ${FILE:(-7)} = ".tar.gz" ] ; then
-	tar xvf ${CWD}${FILE}
-fi
-# ------- Begin Instructions ------- 
-cd fastjar-0.97
-libtoolize --force --install
-aclocal --force 
-automake --force-missing
-autoconf --force
-configure --prefix=${PREFIX} 
-make && make install && echo  && echo "  Installation complete." || echo "  Installation FAILED !"
-
-echo "  For more information, see:"
-echo "    ${HAIKUPORTS}${PACKAGE}"
-echo "    ${HOMEPAGE}"
-echo
-

app-arch/gzip/gzip-1.3.12.sh

@@ -1,39 +0,0 @@
-#!/bin/sh
-
-HOMEPAGE="http://www.gnu.org/software/gzip/"
-PACKAGE="app-arch/gzip/"
-VERSION="1.3.12"
-URL="http://ftp.gnu.org/gnu/gzip/"
-FILE="gzip-1.3.12.tar.gz"
-PATCH_URL="http://ports.haiku-files.org/svn/haikuports/trunk/"
-PATCH_FILE="gzip-1.3.12-downstream.patch"
-
-# ------- This should not be edited ------- 
-PFX=/boot/common/
-HAIKUPORTS="http://ports.haiku-files.org/wiki/"
-CWD=`pwd`/
-if [ ! -d ${PACKAGE}${VERSION} ] ; then
-	mkdir -p ${PACKAGE}${VERSION}
-fi
-if [ ! -e ${FILE} ] ; then
-	wget ${URL}${FILE}
-fi
-cd ${PACKAGE}${VERSION}
-if [ ${FILE:(-7)} = "tar.bz2" ] ; then
-	tar -jxvf ${CWD}${FILE}
-elif [ ${FILE:(-7)} = ".tar.gz" ] ; then
-	tar xvf ${CWD}${FILE}
-fi
-# ------- Begin Instructions ------- 
-cd gzip-1.3.12
-wget ${PATCH_URL}${PACKAGE}/${PATCH_FILE}
-patch -p1 -i ${PATCH_FILE}
-libtoolize --force --install
-configure --prefix=${PFX}
-make && make install && echo  && echo "  Installation complete." || echo "  Installation FAILED !"
-
-echo "  For more information, see:"
-echo "    ${HAIKUPORTS}${PACKAGE}"
-echo "    ${HOMEPAGE}"
-echo
-

dev-lang/lua/lua-5.1.4_3

@@ -1,23 +0,0 @@
-DESCRIPTION="Lua is a powerful, fast, light-weight, embeddable scripting language."
-HOMEPAGE="http://www.lua.org"
-SRC_URI="http://www.lua.org/ftp/lua-5.1.4.tar.gz"
-CHECKSUM_MD5="d0870f2de55d59c1c8419f36e8fac150"
-REVISION="3"
-STATUS_HAIKU="stable"
-DEPEND="pkgconfig >= 0.25"
-BUILD()
-{
-	cd lua-5.1.4
-	make haiku
-}
-
-INSTALL()
-{
-	cd lua-5.1.4
-	make install INSTALL_TOP="${DESTDIR}`finddir B_COMMON_DIRECTORY`" \
-		INSTALL_MAN="${DESTDIR}`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man"
-	mkdir -p ${DESTDIR}`finddir B_COMMON_LIB_DIRECTORY`/pkgconfig
-	cp etc/lua.pc ${DESTDIR}`finddir B_COMMON_LIB_DIRECTORY`/pkgconfig/lua.pc
-}
-LICENSE="MIT"
-COPYRIGHT="1994-2009, Lua.org, PUC-Rio"

dev-lang/lua/patches/lua-5.1.4-3.patch

@@ -1,276 +0,0 @@
-diff -urN lua-5.1.4/Makefile lua-5.1.4-haiku/Makefile
---- lua-5.1.4/Makefile	2008-08-12 00:40:48.066322432 +0000
-+++ lua-5.1.4-haiku/Makefile	2011-05-03 22:29:07.568328192 +0000
-@@ -13,11 +13,11 @@
- INSTALL_BIN= $(INSTALL_TOP)/bin
- INSTALL_INC= $(INSTALL_TOP)/include
- INSTALL_LIB= $(INSTALL_TOP)/lib
--INSTALL_MAN= $(INSTALL_TOP)/man/man1
-+INSTALL_MAN= `finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man/man1
- #
- # You probably want to make INSTALL_LMOD and INSTALL_CMOD consistent with
- # LUA_ROOT, LUA_LDIR, and LUA_CDIR in luaconf.h (and also with etc/lua.pc).
--INSTALL_LMOD= $(INSTALL_TOP)/share/lua/$V
-+INSTALL_LMOD= `finddir B_COMMON_DATA_DIRECTORY`/lua/$V
- INSTALL_CMOD= $(INSTALL_TOP)/lib/lua/$V
- 
- # How to install. If your install program does not support "-p", then you
-@@ -38,12 +38,12 @@
- # == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE =========
- 
- # Convenience platforms targets.
--PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
-+PLATS= aix ansi bsd freebsd generic haiku linux macosx mingw posix solaris
- 
- # What to install.
- TO_BIN= lua luac
- TO_INC= lua.h luaconf.h lualib.h lauxlib.h ../etc/lua.hpp
--TO_LIB= liblua.a
-+TO_LIB= liblua.a liblua.so
- TO_MAN= lua.1 luac.1
- 
- # Lua version and release.
-diff -urN lua-5.1.4/src/Makefile lua-5.1.4-haiku/src/Makefile
---- lua-5.1.4/src/Makefile	2008-01-19 19:37:58.066584576 +0000
-+++ lua-5.1.4-haiku/src/Makefile	2011-05-03 22:08:17.191627264 +0000
-@@ -20,9 +20,10 @@
- 
- # == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE =========
- 
--PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
-+PLATS= aix ansi bsd freebsd generic haiku linux macosx mingw posix solaris
- 
- LUA_A=	liblua.a
-+LUA_SO=	liblua.so
- CORE_O=	lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o \
- 	lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o  \
- 	lundump.o lvm.o lzio.o
-@@ -36,7 +37,7 @@
- LUAC_O=	luac.o print.o
- 
- ALL_O= $(CORE_O) $(LIB_O) $(LUA_O) $(LUAC_O)
--ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T)
-+ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) $(LUA_SO)
- ALL_A= $(LUA_A)
- 
- default: $(PLAT)
-@@ -57,6 +58,9 @@
- $(LUAC_T): $(LUAC_O) $(LUA_A)
- 	$(CC) -o $@ $(MYLDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS)
- 
-+$(LUA_SO): $(CORE_O) $(LIB_O)
-+	$(CC) -o $@ -shared -fPIC $(MYLDFLAGS) $? $(LIBS)
-+
- clean:
- 	$(RM) $(ALL_T) $(ALL_O)
- 
-@@ -95,6 +99,9 @@
- generic:
- 	$(MAKE) all MYCFLAGS=
- 
-+haiku:
-+	$(MAKE) all MYCFLAGS=-DLUA_USE_HAIKU LIBS=
-+
- linux:
- 	$(MAKE) all MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-Wl,-E -ldl -lreadline -lhistory -lncurses"
- 
-diff -urN lua-5.1.4/src/lcode.c lua-5.1.4-haiku/src/lcode.c
---- lua-5.1.4/src/lcode.c	2007-12-28 15:32:23.000262144 +0000
-+++ lua-5.1.4-haiku/src/lcode.c	2011-05-03 22:06:13.312999936 +0000
-@@ -1,5 +1,5 @@
- /*
--** $Id: lcode.c,v 2.25.1.3 2007/12/28 15:32:23 roberto Exp $
-+** $Id: lcode.c,v 2.25.1.5 2011/01/31 14:53:16 roberto Exp $
- ** Code generator for Lua
- ** See Copyright Notice in lua.h
- */
-@@ -544,10 +544,6 @@
-       pc = NO_JUMP;  /* always true; do nothing */
-       break;
-     }
--    case VFALSE: {
--      pc = luaK_jump(fs);  /* always jump */
--      break;
--    }
-     case VJMP: {
-       invertjump(fs, e);
-       pc = e->u.s.info;
-@@ -572,10 +568,6 @@
-       pc = NO_JUMP;  /* always false; do nothing */
-       break;
-     }
--    case VTRUE: {
--      pc = luaK_jump(fs);  /* always jump */
--      break;
--    }
-     case VJMP: {
-       pc = e->u.s.info;
-       break;
-diff -urN lua-5.1.4/src/ldblib.c lua-5.1.4-haiku/src/ldblib.c
---- lua-5.1.4/src/ldblib.c	2008-01-21 13:11:21.000262144 +0000
-+++ lua-5.1.4-haiku/src/ldblib.c	2011-05-03 22:06:13.322699264 +0000
-@@ -1,5 +1,5 @@
- /*
--** $Id: ldblib.c,v 1.104.1.3 2008/01/21 13:11:21 roberto Exp $
-+** $Id: ldblib.c,v 1.104.1.4 2009/08/04 18:50:18 roberto Exp $
- ** Interface from Lua to its debug API
- ** See Copyright Notice in lua.h
- */
-@@ -45,6 +45,7 @@
- 
- 
- static int db_getfenv (lua_State *L) {
-+  luaL_checkany(L, 1);
-   lua_getfenv(L, 1);
-   return 1;
- }
-diff -urN lua-5.1.4/src/liolib.c lua-5.1.4-haiku/src/liolib.c
---- lua-5.1.4/src/liolib.c	2008-01-18 17:47:43.001572864 +0000
-+++ lua-5.1.4-haiku/src/liolib.c	2011-05-03 22:06:13.346292224 +0000
-@@ -1,5 +1,5 @@
- /*
--** $Id: liolib.c,v 2.73.1.3 2008/01/18 17:47:43 roberto Exp $
-+** $Id: liolib.c,v 2.73.1.4 2010/05/14 15:33:51 roberto Exp $
- ** Standard I/O (and system) library
- ** See Copyright Notice in lua.h
- */
-@@ -276,7 +276,10 @@
-     lua_pushnumber(L, d);
-     return 1;
-   }
--  else return 0;  /* read fails */
-+  else {
-+    lua_pushnil(L);  /* "result" to be removed */
-+    return 0;  /* read fails */
-+  }
- }
- 
- 
-diff -urN lua-5.1.4/src/llex.c lua-5.1.4-haiku/src/llex.c
---- lua-5.1.4/src/llex.c	2007-12-27 13:02:25.001835008 +0000
-+++ lua-5.1.4-haiku/src/llex.c	2011-05-03 22:06:13.368050176 +0000
-@@ -1,5 +1,5 @@
- /*
--** $Id: llex.c,v 2.20.1.1 2007/12/27 13:02:25 roberto Exp $
-+** $Id: llex.c,v 2.20.1.2 2009/11/23 14:58:22 roberto Exp $
- ** Lexical Analyzer
- ** See Copyright Notice in lua.h
- */
-@@ -118,8 +118,10 @@
-   lua_State *L = ls->L;
-   TString *ts = luaS_newlstr(L, str, l);
-   TValue *o = luaH_setstr(L, ls->fs->h, ts);  /* entry for `str' */
--  if (ttisnil(o))
-+  if (ttisnil(o)) {
-     setbvalue(o, 1);  /* make sure `str' will not be collected */
-+    luaC_checkGC(L);
-+  }
-   return ts;
- }
- 
-diff -urN lua-5.1.4/src/loadlib.c lua-5.1.4-haiku/src/loadlib.c
---- lua-5.1.4/src/loadlib.c	2008-08-06 13:29:28.002621440 +0000
-+++ lua-5.1.4-haiku/src/loadlib.c	2011-05-03 22:06:13.391380992 +0000
-@@ -1,5 +1,5 @@
- /*
--** $Id: loadlib.c,v 1.52.1.3 2008/08/06 13:29:28 roberto Exp $
-+** $Id: loadlib.c,v 1.52.1.4 2009/09/09 13:17:16 roberto Exp $
- ** Dynamic library loader for Lua
- ** See Copyright Notice in lua.h
- **
-@@ -639,7 +639,7 @@
-   lua_pushvalue(L, -1);
-   lua_replace(L, LUA_ENVIRONINDEX);
-   /* create `loaders' table */
--  lua_createtable(L, 0, sizeof(loaders)/sizeof(loaders[0]) - 1);
-+  lua_createtable(L, sizeof(loaders)/sizeof(loaders[0]) - 1, 0);
-   /* fill it with pre-defined loaders */
-   for (i=0; loaders[i] != NULL; i++) {
-     lua_pushcfunction(L, loaders[i]);
-diff -urN lua-5.1.4/src/lstrlib.c lua-5.1.4-haiku/src/lstrlib.c
---- lua-5.1.4/src/lstrlib.c	2008-07-11 17:27:21.004194304 +0000
-+++ lua-5.1.4-haiku/src/lstrlib.c	2011-05-03 22:06:13.411303936 +0000
-@@ -1,5 +1,5 @@
- /*
--** $Id: lstrlib.c,v 1.132.1.4 2008/07/11 17:27:21 roberto Exp $
-+** $Id: lstrlib.c,v 1.132.1.5 2010/05/14 15:34:19 roberto Exp $
- ** Standard library for string operations and pattern-matching
- ** See Copyright Notice in lua.h
- */
-@@ -754,6 +754,7 @@
- 
- 
- static int str_format (lua_State *L) {
-+  int top = lua_gettop(L);
-   int arg = 1;
-   size_t sfl;
-   const char *strfrmt = luaL_checklstring(L, arg, &sfl);
-@@ -768,7 +769,8 @@
-     else { /* format item */
-       char form[MAX_FORMAT];  /* to store the format (`%...') */
-       char buff[MAX_ITEM];  /* to store the formatted item */
--      arg++;
-+      if (++arg > top)
-+        luaL_argerror(L, arg, "no value");
-       strfrmt = scanformat(L, strfrmt, form);
-       switch (*strfrmt++) {
-         case 'c': {
-diff -urN lua-5.1.4/src/luaconf.h lua-5.1.4-haiku/src/luaconf.h
---- lua-5.1.4/src/luaconf.h	2008-02-11 16:25:08.004980736 +0000
-+++ lua-5.1.4-haiku/src/luaconf.h	2011-05-03 22:08:17.243793920 +0000
-@@ -33,6 +33,13 @@
- #define LUA_WIN
- #endif
- 
-+#if defined(LUA_USE_HAIKU)
-+#define LUA_USE_MKSTEMP
-+#define LUA_USE_ISATTY
-+#define LUA_USE_POPEN
-+#define LUA_USE_DLOPEN
-+#endif
-+
- #if defined(LUA_USE_LINUX)
- #define LUA_USE_POSIX
- #define LUA_USE_DLOPEN		/* needs an extra library: -ldl */
-@@ -94,7 +101,11 @@
- 	".\\?.dll;"  LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll"
- 
- #else
--#define LUA_ROOT	"/usr/local/"
-+# if defined(LUA_USE_HAIKU)
-+#  define LUA_ROOT	"/boot/common/"
-+# else
-+#  define LUA_ROOT	"/usr/local/"
-+# endif
- #define LUA_LDIR	LUA_ROOT "share/lua/5.1/"
- #define LUA_CDIR	LUA_ROOT "lib/lua/5.1/"
- #define LUA_PATH_DEFAULT  \
-diff -urN lua-5.1.4/src/lvm.c lua-5.1.4-haiku/src/lvm.c
---- lua-5.1.4/src/lvm.c	2007-12-28 15:32:23.005242880 +0000
-+++ lua-5.1.4-haiku/src/lvm.c	2011-05-03 22:06:13.432537600 +0000
-@@ -1,5 +1,5 @@
- /*
--** $Id: lvm.c,v 2.63.1.3 2007/12/28 15:32:23 roberto Exp $
-+** $Id: lvm.c,v 2.63.1.4 2009/07/01 21:10:33 roberto Exp $
- ** Lua virtual machine
- ** See Copyright Notice in lua.h
- */
-@@ -133,6 +133,7 @@
- 
- void luaV_settable (lua_State *L, const TValue *t, TValue *key, StkId val) {
-   int loop;
-+  TValue temp;
-   for (loop = 0; loop < MAXTAGLOOP; loop++) {
-     const TValue *tm;
-     if (ttistable(t)) {  /* `t' is a table? */
-@@ -152,7 +153,9 @@
-       callTM(L, tm, t, key, val);
-       return;
-     }
--    t = tm;  /* else repeat with `tm' */ 
-+    /* else repeat with `tm' */
-+    setobj(L, &temp, tm);  /* avoid pointing inside table (may rehash) */
-+    t = &temp;
-   }
-   luaG_runerror(L, "loop in settable");
- }

dev-lang/lua/patches/lua-5.1.4.patch

@@ -1,7 +1,21 @@
-diff -up lua-5.1.4/Makefile.orig lua-5.1.4/Makefile
---- lua-5.1.4/Makefile.orig	2010-04-27 22:29:15.068419584 -0600
-+++ lua-5.1.4/Makefile	2010-04-27 22:29:20.697303040 -0600
-@@ -38,12 +38,12 @@ RANLIB= ranlib
+diff -urN lua-5.1.4/Makefile lua-5.1.4-haiku/Makefile
+--- lua-5.1.4/Makefile	2008-08-12 00:40:48.066322432 +0000
++++ lua-5.1.4-haiku/Makefile	2011-05-03 22:29:07.568328192 +0000
+@@ -13,11 +13,11 @@
+ INSTALL_BIN= $(INSTALL_TOP)/bin
+ INSTALL_INC= $(INSTALL_TOP)/include
+ INSTALL_LIB= $(INSTALL_TOP)/lib
+-INSTALL_MAN= $(INSTALL_TOP)/man/man1
++INSTALL_MAN= `finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man/man1
+ #
+ # You probably want to make INSTALL_LMOD and INSTALL_CMOD consistent with
+ # LUA_ROOT, LUA_LDIR, and LUA_CDIR in luaconf.h (and also with etc/lua.pc).
+-INSTALL_LMOD= $(INSTALL_TOP)/share/lua/$V
++INSTALL_LMOD= `finddir B_COMMON_DATA_DIRECTORY`/lua/$V
+ INSTALL_CMOD= $(INSTALL_TOP)/lib/lua/$V
+ 
+ # How to install. If your install program does not support "-p", then you
+@@ -38,12 +38,12 @@
  # == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE =========
  
  # Convenience platforms targets.
@@ -16,10 +30,10 @@ diff -up lua-5.1.4/Makefile.orig lua-5.1.4/Makefile
  TO_MAN= lua.1 luac.1
  
  # Lua version and release.
-diff -up lua-5.1.4/src/Makefile.orig lua-5.1.4/src/Makefile
---- lua-5.1.4/src/Makefile.orig	2010-04-27 22:29:26.027787264 -0600
-+++ lua-5.1.4/src/Makefile	2010-04-27 22:29:38.680525824 -0600
-@@ -20,9 +20,10 @@ MYLIBS=
+diff -urN lua-5.1.4/src/Makefile lua-5.1.4-haiku/src/Makefile
+--- lua-5.1.4/src/Makefile	2008-01-19 19:37:58.066584576 +0000
++++ lua-5.1.4-haiku/src/Makefile	2011-05-03 22:08:17.191627264 +0000
+@@ -20,9 +20,10 @@
  
  # == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE =========
  
@@ -31,7 +45,7 @@ diff -up lua-5.1.4/src/Makefile.orig lua-5.1.4/src/Makefile
  CORE_O=	lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o \
  	lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o  \
  	lundump.o lvm.o lzio.o
-@@ -36,7 +37,7 @@ LUAC_T=	luac
+@@ -36,7 +37,7 @@
  LUAC_O=	luac.o print.o
  
  ALL_O= $(CORE_O) $(LIB_O) $(LUA_O) $(LUAC_O)
@@ -40,7 +54,7 @@ diff -up lua-5.1.4/src/Makefile.orig lua-5.1.4/src/Makefile
  ALL_A= $(LUA_A)
  
  default: $(PLAT)
-@@ -57,6 +58,9 @@ $(LUA_T): $(LUA_O) $(LUA_A)
+@@ -57,6 +58,9 @@
  $(LUAC_T): $(LUAC_O) $(LUA_A)
  	$(CC) -o $@ $(MYLDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS)
  
@@ -50,7 +64,7 @@ diff -up lua-5.1.4/src/Makefile.orig lua-5.1.4/src/Makefile
  clean:
  	$(RM) $(ALL_T) $(ALL_O)
  
-@@ -95,6 +99,9 @@ freebsd:
+@@ -95,6 +99,9 @@
  generic:
  	$(MAKE) all MYCFLAGS=
  
@@ -60,9 +74,150 @@ diff -up lua-5.1.4/src/Makefile.orig lua-5.1.4/src/Makefile
  linux:
  	$(MAKE) all MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-Wl,-E -ldl -lreadline -lhistory -lncurses"
  
-diff -up lua-5.1.4/src/luaconf.h.orig lua-5.1.4/src/luaconf.h
---- lua-5.1.4/src/luaconf.h.orig	2010-04-27 22:29:48.387448832 -0600
-+++ lua-5.1.4/src/luaconf.h	2010-04-27 22:29:58.184025088 -0600
+diff -urN lua-5.1.4/src/lcode.c lua-5.1.4-haiku/src/lcode.c
+--- lua-5.1.4/src/lcode.c	2007-12-28 15:32:23.000262144 +0000
++++ lua-5.1.4-haiku/src/lcode.c	2011-05-03 22:06:13.312999936 +0000
+@@ -1,5 +1,5 @@
+ /*
+-** $Id: lcode.c,v 2.25.1.3 2007/12/28 15:32:23 roberto Exp $
++** $Id: lcode.c,v 2.25.1.5 2011/01/31 14:53:16 roberto Exp $
+ ** Code generator for Lua
+ ** See Copyright Notice in lua.h
+ */
+@@ -544,10 +544,6 @@
+       pc = NO_JUMP;  /* always true; do nothing */
+       break;
+     }
+-    case VFALSE: {
+-      pc = luaK_jump(fs);  /* always jump */
+-      break;
+-    }
+     case VJMP: {
+       invertjump(fs, e);
+       pc = e->u.s.info;
+@@ -572,10 +568,6 @@
+       pc = NO_JUMP;  /* always false; do nothing */
+       break;
+     }
+-    case VTRUE: {
+-      pc = luaK_jump(fs);  /* always jump */
+-      break;
+-    }
+     case VJMP: {
+       pc = e->u.s.info;
+       break;
+diff -urN lua-5.1.4/src/ldblib.c lua-5.1.4-haiku/src/ldblib.c
+--- lua-5.1.4/src/ldblib.c	2008-01-21 13:11:21.000262144 +0000
++++ lua-5.1.4-haiku/src/ldblib.c	2011-05-03 22:06:13.322699264 +0000
+@@ -1,5 +1,5 @@
+ /*
+-** $Id: ldblib.c,v 1.104.1.3 2008/01/21 13:11:21 roberto Exp $
++** $Id: ldblib.c,v 1.104.1.4 2009/08/04 18:50:18 roberto Exp $
+ ** Interface from Lua to its debug API
+ ** See Copyright Notice in lua.h
+ */
+@@ -45,6 +45,7 @@
+ 
+ 
+ static int db_getfenv (lua_State *L) {
++  luaL_checkany(L, 1);
+   lua_getfenv(L, 1);
+   return 1;
+ }
+diff -urN lua-5.1.4/src/liolib.c lua-5.1.4-haiku/src/liolib.c
+--- lua-5.1.4/src/liolib.c	2008-01-18 17:47:43.001572864 +0000
++++ lua-5.1.4-haiku/src/liolib.c	2011-05-03 22:06:13.346292224 +0000
+@@ -1,5 +1,5 @@
+ /*
+-** $Id: liolib.c,v 2.73.1.3 2008/01/18 17:47:43 roberto Exp $
++** $Id: liolib.c,v 2.73.1.4 2010/05/14 15:33:51 roberto Exp $
+ ** Standard I/O (and system) library
+ ** See Copyright Notice in lua.h
+ */
+@@ -276,7 +276,10 @@
+     lua_pushnumber(L, d);
+     return 1;
+   }
+-  else return 0;  /* read fails */
++  else {
++    lua_pushnil(L);  /* "result" to be removed */
++    return 0;  /* read fails */
++  }
+ }
+ 
+ 
+diff -urN lua-5.1.4/src/llex.c lua-5.1.4-haiku/src/llex.c
+--- lua-5.1.4/src/llex.c	2007-12-27 13:02:25.001835008 +0000
++++ lua-5.1.4-haiku/src/llex.c	2011-05-03 22:06:13.368050176 +0000
+@@ -1,5 +1,5 @@
+ /*
+-** $Id: llex.c,v 2.20.1.1 2007/12/27 13:02:25 roberto Exp $
++** $Id: llex.c,v 2.20.1.2 2009/11/23 14:58:22 roberto Exp $
+ ** Lexical Analyzer
+ ** See Copyright Notice in lua.h
+ */
+@@ -118,8 +118,10 @@
+   lua_State *L = ls->L;
+   TString *ts = luaS_newlstr(L, str, l);
+   TValue *o = luaH_setstr(L, ls->fs->h, ts);  /* entry for `str' */
+-  if (ttisnil(o))
++  if (ttisnil(o)) {
+     setbvalue(o, 1);  /* make sure `str' will not be collected */
++    luaC_checkGC(L);
++  }
+   return ts;
+ }
+ 
+diff -urN lua-5.1.4/src/loadlib.c lua-5.1.4-haiku/src/loadlib.c
+--- lua-5.1.4/src/loadlib.c	2008-08-06 13:29:28.002621440 +0000
++++ lua-5.1.4-haiku/src/loadlib.c	2011-05-03 22:06:13.391380992 +0000
+@@ -1,5 +1,5 @@
+ /*
+-** $Id: loadlib.c,v 1.52.1.3 2008/08/06 13:29:28 roberto Exp $
++** $Id: loadlib.c,v 1.52.1.4 2009/09/09 13:17:16 roberto Exp $
+ ** Dynamic library loader for Lua
+ ** See Copyright Notice in lua.h
+ **
+@@ -639,7 +639,7 @@
+   lua_pushvalue(L, -1);
+   lua_replace(L, LUA_ENVIRONINDEX);
+   /* create `loaders' table */
+-  lua_createtable(L, 0, sizeof(loaders)/sizeof(loaders[0]) - 1);
++  lua_createtable(L, sizeof(loaders)/sizeof(loaders[0]) - 1, 0);
+   /* fill it with pre-defined loaders */
+   for (i=0; loaders[i] != NULL; i++) {
+     lua_pushcfunction(L, loaders[i]);
+diff -urN lua-5.1.4/src/lstrlib.c lua-5.1.4-haiku/src/lstrlib.c
+--- lua-5.1.4/src/lstrlib.c	2008-07-11 17:27:21.004194304 +0000
++++ lua-5.1.4-haiku/src/lstrlib.c	2011-05-03 22:06:13.411303936 +0000
+@@ -1,5 +1,5 @@
+ /*
+-** $Id: lstrlib.c,v 1.132.1.4 2008/07/11 17:27:21 roberto Exp $
++** $Id: lstrlib.c,v 1.132.1.5 2010/05/14 15:34:19 roberto Exp $
+ ** Standard library for string operations and pattern-matching
+ ** See Copyright Notice in lua.h
+ */
+@@ -754,6 +754,7 @@
+ 
+ 
+ static int str_format (lua_State *L) {
++  int top = lua_gettop(L);
+   int arg = 1;
+   size_t sfl;
+   const char *strfrmt = luaL_checklstring(L, arg, &sfl);
+@@ -768,7 +769,8 @@
+     else { /* format item */
+       char form[MAX_FORMAT];  /* to store the format (`%...') */
+       char buff[MAX_ITEM];  /* to store the formatted item */
+-      arg++;
++      if (++arg > top)
++        luaL_argerror(L, arg, "no value");
+       strfrmt = scanformat(L, strfrmt, form);
+       switch (*strfrmt++) {
+         case 'c': {
+diff -urN lua-5.1.4/src/luaconf.h lua-5.1.4-haiku/src/luaconf.h
+--- lua-5.1.4/src/luaconf.h	2008-02-11 16:25:08.004980736 +0000
++++ lua-5.1.4-haiku/src/luaconf.h	2011-05-03 22:08:17.243793920 +0000
 @@ -33,6 +33,13 @@
  #define LUA_WIN
  #endif
@@ -90,3 +245,32 @@ diff -up lua-5.1.4/src/luaconf.h.orig lua-5.1.4/src/luaconf.h
  #define LUA_LDIR	LUA_ROOT "share/lua/5.1/"
  #define LUA_CDIR	LUA_ROOT "lib/lua/5.1/"
  #define LUA_PATH_DEFAULT  \
+diff -urN lua-5.1.4/src/lvm.c lua-5.1.4-haiku/src/lvm.c
+--- lua-5.1.4/src/lvm.c	2007-12-28 15:32:23.005242880 +0000
++++ lua-5.1.4-haiku/src/lvm.c	2011-05-03 22:06:13.432537600 +0000
+@@ -1,5 +1,5 @@
+ /*
+-** $Id: lvm.c,v 2.63.1.3 2007/12/28 15:32:23 roberto Exp $
++** $Id: lvm.c,v 2.63.1.4 2009/07/01 21:10:33 roberto Exp $
+ ** Lua virtual machine
+ ** See Copyright Notice in lua.h
+ */
+@@ -133,6 +133,7 @@
+ 
+ void luaV_settable (lua_State *L, const TValue *t, TValue *key, StkId val) {
+   int loop;
++  TValue temp;
+   for (loop = 0; loop < MAXTAGLOOP; loop++) {
+     const TValue *tm;
+     if (ttistable(t)) {  /* `t' is a table? */
+@@ -152,7 +153,9 @@
+       callTM(L, tm, t, key, val);
+       return;
+     }
+-    t = tm;  /* else repeat with `tm' */ 
++    /* else repeat with `tm' */
++    setobj(L, &temp, tm);  /* avoid pointing inside table (may rehash) */
++    t = &temp;
+   }
+   luaG_runerror(L, "loop in settable");
+ }

dev-libs/mpfr/mpfr-3.0.0_7047

@@ -1,27 +0,0 @@
-DESCRIPTION="library for multiple-precision floating-point computations with exact rounding" 
-HOMEPAGE="www.mpfr.org" 
-SRC_URI="svn://scm.gforge.inria.fr/svn/mpfr/branches/3.0#7047"
-REVISION="1"
-STATUS_HAIKU="broken"
-DEPEND="dev-libs/gmp = ?.?.?"
-#CHECKSUM_MD5=""
-BUILD()
-{
-	cd mpfr-3.0.0-7047
-	libtoolize --force --copy --install
-	aclocal -I m4
-	automake --add-missing
-	autoconf
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
-	make
-}
-
-INSTALL()
-{
-	cd mpfr-3.0.0-7047
-	make install
-	make check
-}
-
-LICENSE="GNU LGPL v3"
-#COPYRIGHT=""

dev-qt/qtcore/qtcore-4.8.x_git

@@ -1,26 +0,0 @@
-DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework" 
-HOMEPAGE="http://qt-haiku.ru" 
-SRC_URI="git://gitorious.org/+qt-haiku/qt/qt-haiku-port.git"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-#CHECKSUM_MD5=""
-MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building."
-BUILD()
-{
-	cd qtcore-4.8.x-git
-	configure --prefix-install=no -no-pch -no-opengl -no-largefile \
-		-fast -nomake examples -nomake demos -release -opensource \
-		-confirm-license -no-iconv -phonon -no-phonon-backend \
-		-multimedia -no-audio-backend
-	make
-}
-
-INSTALL()
-{
-	cd qtcore-4.8.x-git
-	make install INSTALL_ROOT=${DESTDIR}
-}
-
-LICENSE="GNU LGPL v2.1"
-COPYRIGHT="2010 Nokia Corporation and/or its subsidiary(-ies)."

dev-util/cmake/cmake-2.6.4.recipe

@@ -1,21 +0,0 @@
-DESCRIPTION="cmake - Cross platform Make" 
-HOMEPAGE="http://www.cmake.org" 
-SRC_URI="http://www.cmake.org/files/v2.6/cmake-2.6.4.tar.gz"
-CHECKSUM_MD5="50f387d0436696c4a68b5512a72c9cde"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-BUILD()
-{
-	cd cmake-2.6.4
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
-	make
-}
-
-INSTALL()
-{
-	cd cmake-2.6.4
-	make install
-}
-LICENSE="CMake"
-COPYRIGHT="2002-2010 Kitware, Inc., Insight Consortium, All rights reserved."

dev-util/cmake/cmake-2.8.0.recipe

@@ -1,21 +0,0 @@
-DESCRIPTION="cmake - Cross platform Make" 
-HOMEPAGE="http://www.cmake.org" 
-SRC_URI="http://www.cmake.org/files/v2.8/cmake-2.8.0.tar.gz"
-CHECKSUM_MD5="3b3679b8a6afaedc38a8c15dd7ff4fcf"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-BUILD()
-{
-	cd cmake-2.8.0
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
-	make
-}
-
-INSTALL()
-{
-	cd cmake-2.8.0
-	make install
-}
-LICENSE="CMake"
-COPYRIGHT="2002-2010 Kitware, Inc., Insight Consortium, All rights reserved."

dev-util/cmake/cmake-2.8.1.recipe

@@ -1,21 +0,0 @@
-DESCRIPTION="cmake - Cross platform Make" 
-HOMEPAGE="http://www.cmake.org" 
-SRC_URI="http://www.cmake.org/files/v2.8/cmake-2.8.1.tar.gz"
-CHECKSUM_MD5="feadc2e5ebbfed0efc90178583503725"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-BUILD()
-{
-	cd cmake-2.8.1
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
-	make
-}
-
-INSTALL()
-{
-	cd cmake-2.8.1
-	make install
-}
-LICENSE="CMake"
-COPYRIGHT="2002-2010 Kitware, Inc., Insight Consortium, All rights reserved."

dev-util/cmake/cmake-2.8.2.recipe

@@ -1,21 +0,0 @@
-DESCRIPTION="cmake - Cross platform Make" 
-HOMEPAGE="http://www.cmake.org" 
-SRC_URI="http://www.cmake.org/files/v2.8/cmake-2.8.2.tar.gz"
-CHECKSUM_MD5="8c967d5264657a798f22ee23976ff0d9"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-BUILD()
-{
-	cd cmake-2.8.2
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
-	make
-}
-
-INSTALL()
-{
-	cd cmake-2.8.2
-	make install
-}
-LICENSE="CMake"
-COPYRIGHT="2002-2010 Kitware, Inc., Insight Consortium, All rights reserved."

dev-util/cmake/cmake-2.8.3.recipe

@@ -1,21 +0,0 @@
-DESCRIPTION="cmake - Cross platform Make" 
-HOMEPAGE="http://www.cmake.org" 
-SRC_URI="http://www.cmake.org/files/v2.8/cmake-2.8.3.tar.gz"
-CHECKSUM_MD5="a76a44b93acf5e3badda9de111385921"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-BUILD()
-{
-	cd cmake-2.8.3
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
-	make
-}
-
-INSTALL()
-{
-	cd cmake-2.8.3
-	make install
-}
-LICENSE="CMake"
-COPYRIGHT="2002-2010 Kitware, Inc., Insight Consortium, All rights reserved."

dev-util/cmake/cmake-2.8.4.recipe

@@ -1,30 +0,0 @@
-DESCRIPTION="cmake - Cross platform Make" 
-HOMEPAGE="http://www.cmake.org" 
-SRC_URI="http://www.cmake.org/files/v2.8/cmake-2.8.4.tar.gz"
-CHECKSUM_MD5="209b7d1d04b2e00986538d74ba764fcf"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-BUILD()
-{
-	cd cmake-2.8.4
-	# cmake appends the prefix to mandir and datadir 
-	# so using ../../ to back that part out but for some reason
-	# the doc was also picking up /boot, so had to back it out 3 times
-	# this seems to work but might still need some further adjusting
-#	sed -i 's/${CMAKE_DATA_DIR}\/include cmCPluginAPI.h/${CMAKE_PREFIX_DIR}\/include cmCPluginAPI.h/g' Source/CMakeLists.txt
-	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
-		--datadir=/data/cmake \
-		--docdir=/documentation/doc/CMake \
-		--mandir=/documentation/man
-	make
-}
-
-INSTALL()
-{
-	cd cmake-2.8.4
-	make install
-}
-
-LICENSE="CMake"
-COPYRIGHT="2002-2011 Kitware, Inc., Insight Consortium, All rights reserved."

dev-util/cmake/cmake-2.8_git

@@ -1,36 +0,0 @@
-DESCRIPTION="cmake - Cross platform Make" 
-HOMEPAGE="http://www.cmake.org" 
-SRC_URI="git+http://cmake.org/cmake.git"
-#CHECKSUM_MD5=""
-REVISION="1"
-STATUS_HAIKU="broken"
-DEPEND=""
-BUILD()
-{
-	cd cmake-2.8-git
-	# cmake appends the prefix to mandir and datadir 
-	# so using ../../ to back that part out but for some reason
-	# the doc was also picking up /boot, so had to back it out 3 times
-	# this seems to work but might still need some further adjusting
-#	sed -i 's/${CMAKE_DATA_DIR}\/include cmCPluginAPI.h/${CMAKE_PREFIX_DIR}\/include cmCPluginAPI.h/g' Source/CMakeLists.txt
-	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
-		--datadir=/data/cmake \
-		--docdir=/documentation/doc/CMake \
-		--mandir=/documentation/man
-	make
-}
-
-INSTALL()
-{
-	cd cmake-2.8-git
-	make install
-}
-
-TEST()
-{
-	cd cmake-2.8-git
-	make test
-}
-
-LICENSE="CMake"
-COPYRIGHT="2002-2012 Kitware, Inc., Insight Consortium, All rights reserved."

dev-util/cmake/patches/cmake-2.6.0-haiku.diff

@@ -1,300 +0,0 @@
-diff -ur cmake-2.6.0/Modules/CMakeFortranCompilerId.F90.in cmake-2.6.0-haiku/Modules/CMakeFortranCompilerId.F90.in
---- cmake-2.6.0/Modules/CMakeFortranCompilerId.F90.in	2008-05-05 18:26:04.000000000 +0000
-+++ cmake-2.6.0-haiku/Modules/CMakeFortranCompilerId.F90.in	2008-06-19 11:16:50.000000000 +0000
-@@ -48,6 +48,10 @@
-    PRINT *, 'INFO:platform[IRIX]'
- #elif defined(__hpux) || defined(__hpux__)
-    PRINT *, 'INFO:platform[HP-UX]'
-+#elif defined(__HAIKU) || defined(__HAIKU__) || defined(_HAIKU)
-+   PRINT *, 'INFO:platform[Haiku]'
-+! Haiku also defines __BEOS__ so we must 
-+! put it prior to the check for __BEOS__
- #elif defined(__BeOS) || defined(__BEOS__) || defined(_BEOS)
-    PRINT *, 'INFO:platform[BeOS]'
- #elif defined(__QNX__) || defined(__QNXNTO__)
-diff -ur cmake-2.6.0/Modules/CMakePlatformId.h.in cmake-2.6.0-haiku/Modules/CMakePlatformId.h.in
---- cmake-2.6.0/Modules/CMakePlatformId.h.in	2008-05-05 18:26:04.000000000 +0000
-+++ cmake-2.6.0-haiku/Modules/CMakePlatformId.h.in	2008-06-19 11:16:50.000000000 +0000
-@@ -35,6 +35,11 @@
- #elif defined(__hpux) || defined(__hpux__)
- # define PLATFORM_ID "HP-UX"
- 
-+#elif defined(__HAIKU) || defined(__HAIKU__) || defined(_HAIKU)
-+# define PLATFORM_ID "Haiku"
-+! Haiku also defines __BEOS__ so we must 
-+! put it prior to the check for __BEOS__
-+
- #elif defined(__BeOS) || defined(__BEOS__) || defined(_BEOS)
- # define PLATFORM_ID "BeOS"
- 
-diff -ur cmake-2.6.0/Modules/CheckForPthreads.c cmake-2.6.0-haiku/Modules/CheckForPthreads.c
---- cmake-2.6.0/Modules/CheckForPthreads.c	2008-05-05 18:26:04.000000000 +0000
-+++ cmake-2.6.0-haiku/Modules/CheckForPthreads.c	2008-06-19 11:16:50.000000000 +0000
-@@ -16,7 +16,7 @@
-   pthread_create(&tid[0], 0, runner, (void*)1);
-   pthread_create(&tid[1], 0, runner, (void*)2);
-   
--#if defined(__BEOS__) && !defined(__ZETA__)  // (no usleep on BeOS 5.)
-+#if defined(__BEOS__) && !defined(__ZETA__)  && !defined(__HAIKU__) // (no usleep on BeOS 5.)
-   usleep(1); // for strange behavior on single-processor sun
- #endif
- 
-Only in cmake-2.6.0-haiku/Modules/Platform: Haiku.cmake
-diff -ur cmake-2.6.0/Source/CPack/cmCPackGeneratorFactory.cxx cmake-2.6.0-haiku/Source/CPack/cmCPackGeneratorFactory.cxx
---- cmake-2.6.0/Source/CPack/cmCPackGeneratorFactory.cxx	2008-05-05 18:26:05.000000000 +0000
-+++ cmake-2.6.0-haiku/Source/CPack/cmCPackGeneratorFactory.cxx	2008-06-19 11:16:50.000000000 +0000
-@@ -35,7 +35,7 @@
- #endif
- 
- #if !defined(_WIN32) && !defined(__APPLE__) \
-- && !defined(__QNXNTO__) && !defined(__BEOS__)
-+ && !defined(__QNXNTO__) && !defined(__BEOS__) && !defined(__HAIKU__)
- #  include "cmCPackDebGenerator.h"
- #  include "cmCPackRPMGenerator.h"
- #endif
-@@ -72,7 +72,8 @@
-     cmCPackOSXX11Generator::CreateGenerator);
- #endif
- #if !defined(_WIN32) && !defined(__APPLE__) \
--  && !defined(__QNXNTO__) && !defined(__BEOS__)
-+  && !defined(__QNXNTO__) && !defined(__BEOS__)\
-+  && !defined(__HAIKU__)
-   this->RegisterGenerator("DEB", "Debian packages",
-     cmCPackDebGenerator::CreateGenerator);
-   this->RegisterGenerator("RPM", "RPM packages",
-diff -ur cmake-2.6.0/Source/cmCTest.cxx cmake-2.6.0-haiku/Source/cmCTest.cxx
---- cmake-2.6.0/Source/cmCTest.cxx	2008-05-05 18:26:04.000000000 +0000
-+++ cmake-2.6.0-haiku/Source/cmCTest.cxx	2008-06-19 11:16:50.000000000 +0000
-@@ -49,10 +49,15 @@
- 
- #include <memory> // auto_ptr
- 
--#if defined(__BEOS__)
-+#if defined(__BEOS__) && !defined(__HAIKU__)
- #include <be/kernel/OS.h>   /* disable_debugger() API. */
- #endif
- 
-+#if defined(__HAIKU__)
-+#include <os/kernel/OS.h>   /* disable_debugger() API. */
-+#endif
-+
-+
- #define DEBUGOUT std::cout << __LINE__ << " "; std::cout
- #define DEBUGERR std::cerr << __LINE__ << " "; std::cerr
- 
-diff -ur cmake-2.6.0/Source/kwsys/DynamicLoader.cxx cmake-2.6.0-haiku/Source/kwsys/DynamicLoader.cxx
---- cmake-2.6.0/Source/kwsys/DynamicLoader.cxx	2008-05-05 18:26:05.000000000 +0000
-+++ cmake-2.6.0-haiku/Source/kwsys/DynamicLoader.cxx	2008-06-20 14:08:23.000000000 +0000
-@@ -331,7 +331,7 @@
- 
- // ---------------------------------------------------------------
- // 4. Implementation for BeOS
--#ifdef __BEOS__
-+#if defined __BEOS__ && !defined(__HAIKU__)
- #include <string.h> // for strerror()
- #include <be/kernel/image.h>
- #include <be/support/Errors.h>
-diff -ur cmake-2.6.0/Source/kwsys/ProcessUNIX.c cmake-2.6.0-haiku/Source/kwsys/ProcessUNIX.c
---- cmake-2.6.0/Source/kwsys/ProcessUNIX.c	2008-05-05 18:26:05.000000000 +0000
-+++ cmake-2.6.0-haiku/Source/kwsys/ProcessUNIX.c	2008-06-20 14:06:56.000000000 +0000
-@@ -75,7 +75,7 @@
- typedef int kwsysProcess_ssize_t;
- #endif
- 
--#if defined(__BEOS__) && !defined(__ZETA__)
-+#if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__)
- /* BeOS 5 doesn't have usleep(), but it has snooze(), which is identical. */
- # include <be/kernel/OS.h>
- static inline void kwsysProcess_usleep(unsigned int msec)
-diff -ur cmake-2.6.0/Source/kwsys/SystemTools.cxx cmake-2.6.0-haiku/Source/kwsys/SystemTools.cxx
---- cmake-2.6.0/Source/kwsys/SystemTools.cxx	2008-05-05 18:26:05.000000000 +0000
-+++ cmake-2.6.0-haiku/Source/kwsys/SystemTools.cxx	2008-06-19 15:49:33.000000000 +0000
-@@ -131,7 +131,12 @@
- #define _chdir chdir
- #endif
- 
--#if defined(__BEOS__) && !defined(__ZETA__)
-+#ifdef (__HAIKU__)
-+#include <os/kernel.OS.h>
-+#include <os/storage/Path.h>
-+#endif
-+
-+#if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__)
- #include <be/kernel/OS.h>
- #include <be/storage/Path.h>
- 
-diff -ur cmake-2.6.0/Source/kwsys/testProcess.c cmake-2.6.0-haiku/Source/kwsys/testProcess.c
---- cmake-2.6.0/Source/kwsys/testProcess.c	2008-05-05 18:26:05.000000000 +0000
-+++ cmake-2.6.0-haiku/Source/kwsys/testProcess.c	2008-06-19 11:16:51.000000000 +0000
-@@ -34,7 +34,7 @@
- # pragma warn -8060 /* possibly incorrect assignment */
- #endif
- 
--#if defined(__BEOS__) && !defined(__ZETA__)
-+#if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__)
- /* BeOS 5 doesn't have usleep(), but it has snooze(), which is identical. */
- # include <be/kernel/OS.h>
- static inline void testProcess_usleep(unsigned int msec)
-diff -ur cmake-2.6.0/Tests/Complex/Library/CMakeLists.txt cmake-2.6.0-haiku/Tests/Complex/Library/CMakeLists.txt
---- cmake-2.6.0/Tests/Complex/Library/CMakeLists.txt	2008-05-05 18:26:05.000000000 +0000
-+++ cmake-2.6.0-haiku/Tests/Complex/Library/CMakeLists.txt	2008-06-19 11:16:51.000000000 +0000
-@@ -53,7 +53,9 @@
-   )
- SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES FOO BAR)
- IF(NOT BEOS)  # No libm on BeOS.
--  SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES LINK_FLAGS "-lm")
-+  IF(NOT HAIKU) # libm in included in libroot on Haiku
-+    SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES LINK_FLAGS "-lm")
-+  ENDIF(NOT HAIKU)
- ENDIF(NOT BEOS)
- GET_TARGET_PROPERTY(FOO_BAR_VAR CMakeTestCLibraryShared FOO)
- IF(${FOO_BAR_VAR} MATCHES "BAR")
-diff -ur cmake-2.6.0/Utilities/cmcurl/CMake/CurlTests.c cmake-2.6.0-haiku/Utilities/cmcurl/CMake/CurlTests.c
---- cmake-2.6.0/Utilities/cmcurl/CMake/CurlTests.c	2008-05-05 18:26:06.000000000 +0000
-+++ cmake-2.6.0-haiku/Utilities/cmcurl/CMake/CurlTests.c	2008-06-19 11:16:51.000000000 +0000
-@@ -38,6 +38,12 @@
- # define PLATFORM_AIX_V3
- #endif
- 
-+/* Haiku defines both __HAIKU__ and __BEOS__ (for now) */
-+/* many BeOS workarounds are no longer needed in Haiku */
-+#if defined(__HAIKU__) && defined(__BEOS__)
-+undef (__BEOS__)
-+#endif
-+
- #if defined(PLATFORM_SUNOS4) || defined(PLATFORM_AIX_V3) || defined(__BEOS__)
- #error "O_NONBLOCK does not work on this platform"
- #endif
-diff -ur cmake-2.6.0/Utilities/cmcurl/curl/curl.h cmake-2.6.0-haiku/Utilities/cmcurl/curl/curl.h
---- cmake-2.6.0/Utilities/cmcurl/curl/curl.h	2008-05-05 18:26:06.000000000 +0000
-+++ cmake-2.6.0-haiku/Utilities/cmcurl/curl/curl.h	2008-06-19 11:16:51.000000000 +0000
-@@ -1133,7 +1133,7 @@
- }
- #endif
- 
--#ifdef __BEOS__
-+#if defined __BEOS__ || defined __HAIKU__
- #include <support/SupportDefs.h>
- #endif
- 
-diff -ur cmake-2.6.0/Utilities/cmcurl/if2ip.c cmake-2.6.0-haiku/Utilities/cmcurl/if2ip.c
---- cmake-2.6.0/Utilities/cmcurl/if2ip.c	2008-05-05 18:26:06.000000000 +0000
-+++ cmake-2.6.0-haiku/Utilities/cmcurl/if2ip.c	2008-06-19 11:16:51.000000000 +0000
-@@ -39,7 +39,7 @@
-  */
- #if !defined(WIN32) && !defined(__BEOS__) && !defined(__CYGWIN__) && \
-     !defined(__riscos__) && !defined(__INTERIX) && !defined(NETWARE) && \
--    !defined(_AMIGASF) && !defined(__minix)
-+    !defined(_AMIGASF) && !defined(__minix) && !defined(__HAIKU__)
- 
- #ifdef HAVE_SYS_SOCKET_H
- #include <sys/socket.h>
-diff -ur cmake-2.6.0/Utilities/cmcurl/select.c cmake-2.6.0-haiku/Utilities/cmcurl/select.c
---- cmake-2.6.0/Utilities/cmcurl/select.c	2008-05-05 18:26:06.000000000 +0000
-+++ cmake-2.6.0-haiku/Utilities/cmcurl/select.c	2008-06-19 11:16:51.000000000 +0000
-@@ -39,7 +39,7 @@
- #error "We can't compile without select() support!"
- #endif
- 
--#ifdef __BEOS__
-+#if defined __BEOS__ && !defined __HAIKU__
- /* BeOS has FD_SET defined in socket.h */
- #include <socket.h>
- #endif
-diff -ur cmake-2.6.0/Utilities/cmcurl/setup.h cmake-2.6.0-haiku/Utilities/cmcurl/setup.h
---- cmake-2.6.0/Utilities/cmcurl/setup.h	2008-05-05 18:26:06.000000000 +0000
-+++ cmake-2.6.0-haiku/Utilities/cmcurl/setup.h	2008-06-19 11:16:51.000000000 +0000
-@@ -264,7 +264,7 @@
- 
- #else /* MSDOS */
- 
--#ifdef __BEOS__
-+#if defined __BEOS__ && !defined __HAIKU__
- #define sclose(x) closesocket(x)
- #else /* __BEOS__ */
- #define sclose(x) close(x)
-diff -ur cmake-2.6.0/Utilities/cmtar/libtar.c cmake-2.6.0-haiku/Utilities/cmtar/libtar.c
---- cmake-2.6.0/Utilities/cmtar/libtar.c	2008-05-05 18:26:07.000000000 +0000
-+++ cmake-2.6.0-haiku/Utilities/cmtar/libtar.c	2008-06-19 11:16:51.000000000 +0000
-@@ -98,8 +98,8 @@
-     {
-     return -1;
-     }
--
--#if defined(__BEOS__) && !defined(__ZETA__)  /* no fchmod on BeOS...do pathname instead. */
-+/* no fchmod on BeOS...do pathname instead. */
-+#if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__)
-   if ((oflags & O_CREAT) && chmod(pathname, mode & 07777))
-     {
-     return -1;
-diff -ur cmake-2.6.0/Utilities/cmxmlrpc/xmlrpc_curl_transport.c cmake-2.6.0-haiku/Utilities/cmxmlrpc/xmlrpc_curl_transport.c
---- cmake-2.6.0/Utilities/cmxmlrpc/xmlrpc_curl_transport.c	2008-05-05 18:26:07.000000000 +0000
-+++ cmake-2.6.0-haiku/Utilities/cmxmlrpc/xmlrpc_curl_transport.c	2008-06-19 11:16:51.000000000 +0000
-@@ -10,7 +10,7 @@
- 
- #include "xmlrpc_config.h"
- 
--#if defined(__BEOS__)
-+#if defined(__BEOS__) && !defined(__HAIKU__)
- /* Some helpful system header has char==bool, then bool.h does int==bool. */
- #define HAVE_BOOL 1
- #endif
-diff -ur cmake-2.6.0/Utilities/cmzlib/zconf.h cmake-2.6.0-haiku/Utilities/cmzlib/zconf.h
---- cmake-2.6.0/Utilities/cmzlib/zconf.h	2008-05-05 18:26:07.000000000 +0000
-+++ cmake-2.6.0-haiku/Utilities/cmzlib/zconf.h	2008-06-19 11:16:51.000000000 +0000
-@@ -237,7 +237,7 @@
- #  endif
- #endif
- 
--#if defined (__BEOS__)
-+#if defined (__BEOS__) && !defined (__HAIKU__)
- #  ifdef ZLIB_DLL
- #    ifdef ZLIB_INTERNAL
- #      define ZEXPORT   __declspec(dllexport)
-diff -ur cmake-2.6.0/Utilities/cmzlib/zutil.h cmake-2.6.0-haiku/Utilities/cmzlib/zutil.h
---- cmake-2.6.0/Utilities/cmzlib/zutil.h	2008-05-05 18:26:07.000000000 +0000
-+++ cmake-2.6.0-haiku/Utilities/cmzlib/zutil.h	2008-06-19 11:16:51.000000000 +0000
-@@ -147,7 +147,13 @@
- #  define OS_CODE  0x0f
- #endif
- 
--#if defined(_BEOS_) || defined(RISCOS)
-+/* Haiku defines both __HAIKU__ and __BEOS__ (for now) */
-+/* many BeOS workarounds are no longer needed in Haiku */
-+#if defined(__HAIKU__) && defined(__BEOS__)
-+undef (__BEOS__)
-+#endif
-+
-+#if defined(_BEOS_) || defined(RISCOS) 
- #  define fdopen(fd,mode) NULL /* No fdopen() */
- #endif
- 
-diff -ur cmake-2.6.0/bootstrap cmake-2.6.0-haiku/bootstrap
---- cmake-2.6.0/bootstrap	2008-05-05 18:26:04.000000000 +0000
-+++ cmake-2.6.0-haiku/bootstrap	2008-06-19 11:16:51.000000000 +0000
-@@ -73,6 +73,13 @@
-   cmake_system_beos=false
- fi
- 
-+# Determine whether this is Haiku 
-+if echo "${cmake_system}" | grep Haiku >/dev/null 2>&1; then
-+  cmake_system_haiku=true
-+else
-+  cmake_system_haiku=false
-+fi
-+
- # Choose the generator to use for bootstrapping.
- if ${cmake_system_mingw}; then
-   # Bootstrapping from an MSYS prompt.
-@@ -603,6 +610,11 @@
-   cmake_ld_flags="${LDFLAGS} -lroot -lbe"
- fi
- 
-+# Add Haiku toolkits...
-+if ${cmake_system_haiku}; then
-+  cmake_ld_flags="${LDFLAGS} -lroot -lbe"
-+fi
-+
- # Test C compiler
- cmake_c_compiler=
- 

dev-util/cmake/patches/cmake-2.6.1-haiku-2.diff

@@ -1,474 +0,0 @@
-diff -urN cmake-2.6.1/Modules/CMakeFortranCompilerId.F90.in cmake-2.6.1-haiku/Modules/CMakeFortranCompilerId.F90.in
---- cmake-2.6.1/Modules/CMakeFortranCompilerId.F90.in	2008-08-01 15:34:50.000000000 +0000
-+++ cmake-2.6.1-haiku/Modules/CMakeFortranCompilerId.F90.in	2008-09-12 15:11:49.000000000 +0000
-@@ -50,6 +50,8 @@
-    PRINT *, 'INFO:platform[IRIX]'
- #elif defined(__hpux) || defined(__hpux__)
-    PRINT *, 'INFO:platform[HP-UX]'
-+#elif defined(__HAIKU) || defined(__HAIKU__) || defined(_HAIKU)
-+   PRINT *, 'INFO:platform[Haiku]'
- #elif defined(__BeOS) || defined(__BEOS__) || defined(_BEOS)
-    PRINT *, 'INFO:platform[BeOS]'
- #elif defined(__QNX__) || defined(__QNXNTO__)
-diff -urN cmake-2.6.1/Modules/CMakePlatformId.h.in cmake-2.6.1-haiku/Modules/CMakePlatformId.h.in
---- cmake-2.6.1/Modules/CMakePlatformId.h.in	2008-08-01 15:34:50.000000000 +0000
-+++ cmake-2.6.1-haiku/Modules/CMakePlatformId.h.in	2008-09-12 15:12:47.000000000 +0000
-@@ -35,6 +35,9 @@
- #elif defined(__hpux) || defined(__hpux__)
- # define PLATFORM_ID "HP-UX"
- 
-+#elif defined(__HAIKU) || defined(__HAIKU__) || defined(_HAIKU)
-+# define PLATFORM_ID "Haiku"
-+
- #elif defined(__BeOS) || defined(__BEOS__) || defined(_BEOS)
- # define PLATFORM_ID "BeOS"
- 
-diff -urN cmake-2.6.1/Modules/CheckForPthreads.c cmake-2.6.1-haiku/Modules/CheckForPthreads.c
---- cmake-2.6.1/Modules/CheckForPthreads.c	2008-08-01 15:34:50.000000000 +0000
-+++ cmake-2.6.1-haiku/Modules/CheckForPthreads.c	2008-09-12 15:07:32.000000000 +0000
-@@ -16,7 +16,7 @@
-   pthread_create(&tid[0], 0, runner, (void*)1);
-   pthread_create(&tid[1], 0, runner, (void*)2);
-   
--#if defined(__BEOS__) && !defined(__ZETA__)  // (no usleep on BeOS 5.)
-+#if defined(__BEOS__) && !defined(__ZETA__)  && !defined(__HAIKU__) // (no usleep on BeOS 5.)
-   usleep(1); // for strange behavior on single-processor sun
- #endif
- 
-diff -urN cmake-2.6.1/Modules/Platform/Haiku.cmake cmake-2.6.1-haiku/Modules/Platform/Haiku.cmake
---- cmake-2.6.1/Modules/Platform/Haiku.cmake	1970-01-01 00:00:00.000000000 +0000
-+++ cmake-2.6.1-haiku/Modules/Platform/Haiku.cmake	2008-09-12 15:07:32.000000000 +0000
-@@ -0,0 +1,14 @@
-+SET(BEOS 1)
-+
-+# GCC is the default compiler on Haiku.
-+INCLUDE(${CMAKE_ROOT}/Modules/Platform/gcc.cmake)
-+
-+SET(CMAKE_DL_LIBS root be)
-+SET(CMAKE_SHARED_LIBRARY_C_FLAGS "-fPIC")
-+SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-nostart")
-+SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,-rpath,")
-+SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":")
-+SET(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-soname,")
-+SET(CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG "-Wl,-soname,")
-+
-+INCLUDE(Platform/UnixPaths)
-diff -urN cmake-2.6.1/Source/CPack/cmCPackGeneratorFactory.cxx cmake-2.6.1-haiku/Source/CPack/cmCPackGeneratorFactory.cxx
---- cmake-2.6.1/Source/CPack/cmCPackGeneratorFactory.cxx	2008-08-01 15:34:53.000000000 +0000
-+++ cmake-2.6.1-haiku/Source/CPack/cmCPackGeneratorFactory.cxx	2008-09-12 15:07:32.000000000 +0000
-@@ -36,7 +36,7 @@
- #endif
- 
- #if !defined(_WIN32) && !defined(__APPLE__) \
-- && !defined(__QNXNTO__) && !defined(__BEOS__)
-+ && !defined(__QNXNTO__) && !defined(__BEOS__) && !defined(__HAIKU__)
- #  include "cmCPackDebGenerator.h"
- #  include "cmCPackRPMGenerator.h"
- #endif
-@@ -75,7 +75,8 @@
-     cmCPackOSXX11Generator::CreateGenerator);
- #endif
- #if !defined(_WIN32) && !defined(__APPLE__) \
--  && !defined(__QNXNTO__) && !defined(__BEOS__)
-+  && !defined(__QNXNTO__) && !defined(__BEOS__)\
-+  && !defined(__HAIKU__)
-   this->RegisterGenerator("DEB", "Debian packages",
-     cmCPackDebGenerator::CreateGenerator);
-   this->RegisterGenerator("RPM", "RPM packages",
-diff -urN cmake-2.6.1/Source/cmCTest.cxx cmake-2.6.1-haiku/Source/cmCTest.cxx
---- cmake-2.6.1/Source/cmCTest.cxx	2008-08-01 15:34:51.000000000 +0000
-+++ cmake-2.6.1-haiku/Source/cmCTest.cxx	2008-09-12 15:07:32.000000000 +0000
-@@ -49,10 +49,15 @@
- 
- #include <memory> // auto_ptr
- 
--#if defined(__BEOS__)
-+#if defined(__BEOS__) && !defined(__HAIKU__)
- #include <be/kernel/OS.h>   /* disable_debugger() API. */
- #endif
- 
-+#if defined(__HAIKU__)
-+#include <os/kernel/OS.h>   /* disable_debugger() API. */
-+#endif
-+
-+
- #define DEBUGOUT std::cout << __LINE__ << " "; std::cout
- #define DEBUGERR std::cerr << __LINE__ << " "; std::cerr
- 
-@@ -607,7 +612,7 @@
-   cmSystemTools::PutEnv("DASHBOARD_TEST_FROM_CTEST=" CMake_VERSION);
- #if defined(_WIN32)
-   SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX);
--#elif defined(__BEOS__)
-+#elif defined(__BEOS__) || defined(__HAIKU__)
-   disable_debugger(1);
- #endif
- }
-diff -urN cmake-2.6.1/Source/cmDependsJavaLexer.cxx cmake-2.6.1-haiku/Source/cmDependsJavaLexer.cxx
---- cmake-2.6.1/Source/cmDependsJavaLexer.cxx	2008-08-01 15:34:51.000000000 +0000
-+++ cmake-2.6.1-haiku/Source/cmDependsJavaLexer.cxx	2008-09-12 15:07:33.000000000 +0000
-@@ -23,7 +23,7 @@
- #include <errno.h>
- #include <stdlib.h>
- 
--#if defined(__BEOS__)
-+#if defined(__BEOS__) || defined (__HAIKU__)
- #include <unistd.h>   /* prevents a conflict with a #define later on... */
- #endif
- 
-diff -urN cmake-2.6.1/Source/cmDependsJavaLexer.h cmake-2.6.1-haiku/Source/cmDependsJavaLexer.h
---- cmake-2.6.1/Source/cmDependsJavaLexer.h	2008-08-01 15:34:51.000000000 +0000
-+++ cmake-2.6.1-haiku/Source/cmDependsJavaLexer.h	2008-09-12 15:07:33.000000000 +0000
-@@ -38,7 +38,7 @@
- #include <errno.h>
- #include <stdlib.h>
- 
--#if defined(__BEOS__)
-+#if defined(__BEOS__) || defined(__HAIKU__)
- #include <unistd.h>   /* prevents a conflict with a #define later on... */
- #endif
- 
-diff -urN cmake-2.6.1/Source/cmSystemTools.cxx cmake-2.6.1-haiku/Source/cmSystemTools.cxx
---- cmake-2.6.1/Source/cmSystemTools.cxx	2008-08-01 15:34:53.000000000 +0000
-+++ cmake-2.6.1-haiku/Source/cmSystemTools.cxx	2008-09-12 15:10:22.000000000 +0000
-@@ -910,7 +910,7 @@
-   fflush(stdout);
-   fflush(stderr);
- 
--#ifdef __BEOS__
-+#if defined __BEOS__ && !defined __HAIKU__
-   beos_seen_signal = false;
-   signal(SIGCHLD, beos_popen_workaround);
- #endif
-@@ -918,7 +918,7 @@
-   FILE* cpipe = popen(command, "r");
-   if(!cpipe)
-     {
--#ifdef __BEOS__
-+#if defined __BEOS__ && !defined __HAIKU__
-     signal(SIGCHLD, SIG_DFL);
- #endif
-     return false;
-@@ -931,12 +931,13 @@
-       cmSystemTools::Stdout(buffer);
-       }
-     output += buffer;
-+    buffer[0] = 0;
-     fgets(buffer, BUFFER_SIZE, cpipe);
-     }
- 
-   retVal = pclose(cpipe);
- 
--#ifdef __BEOS__
-+#if defined __BEOS__ && !defined __HAIKU__
-   for (int i = 0; (!beos_seen_signal) && (i < 3); i++)
-     {
-     ::sleep(1);   // signals should interrupt this...
-@@ -970,11 +971,13 @@
-         error << "SIGFPE";
-         break;
- #endif
-+#ifndef __HAIKU__
- #ifdef SIGBUS
-       case SIGBUS:
-         error << "SIGBUS";
-         break;
- #endif
-+#endif
- #ifdef SIGSEGV
-       case SIGSEGV:
-         error << "SIGSEGV";
-@@ -1696,7 +1699,7 @@
-     }
- 
- // no fchmod on BeOS 5...do pathname instead.
--#if defined(__BEOS__) && !defined(__ZETA__) 
-+#if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__)
-   if ((oflags & O_CREAT) && chmod(pathname, mode))
-     {
-     return -1;
-diff -urN cmake-2.6.1/Source/kwsys/DynamicLoader.cxx cmake-2.6.1-haiku/Source/kwsys/DynamicLoader.cxx
---- cmake-2.6.1/Source/kwsys/DynamicLoader.cxx	2008-08-01 15:34:54.000000000 +0000
-+++ cmake-2.6.1-haiku/Source/kwsys/DynamicLoader.cxx	2008-09-12 15:07:33.000000000 +0000
-@@ -335,11 +335,21 @@
- #endif //_WIN32
- 
- // ---------------------------------------------------------------
--// 4. Implementation for BeOS
--#ifdef __BEOS__
-+// 4. Implementation for BeOS / Haiku
-+#if defined __BEOS__ || defined(__HAIKU__)
-+
- #include <string.h> // for strerror()
-+
-+#ifdef __BEOS__
- #include <be/kernel/image.h>
- #include <be/support/Errors.h>
-+#endif
-+
-+#ifdef __HAIKU__
-+#include <os/kernel/image.h>
-+#include <os/support/Errors.h>
-+#endif
-+
- #define DYNAMICLOADER_DEFINED 1
- 
- namespace KWSYS_NAMESPACE
-diff -urN cmake-2.6.1/Source/kwsys/ProcessUNIX.c cmake-2.6.1-haiku/Source/kwsys/ProcessUNIX.c
---- cmake-2.6.1/Source/kwsys/ProcessUNIX.c	2008-08-01 15:34:54.000000000 +0000
-+++ cmake-2.6.1-haiku/Source/kwsys/ProcessUNIX.c	2008-09-12 15:07:33.000000000 +0000
-@@ -75,7 +75,7 @@
- typedef int kwsysProcess_ssize_t;
- #endif
- 
--#if defined(__BEOS__) && !defined(__ZETA__)
-+#if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__)
- /* BeOS 5 doesn't have usleep(), but it has snooze(), which is identical. */
- # include <be/kernel/OS.h>
- static inline void kwsysProcess_usleep(unsigned int msec)
-diff -urN cmake-2.6.1/Source/kwsys/SystemTools.cxx cmake-2.6.1-haiku/Source/kwsys/SystemTools.cxx
---- cmake-2.6.1/Source/kwsys/SystemTools.cxx	2008-08-01 15:34:55.000000000 +0000
-+++ cmake-2.6.1-haiku/Source/kwsys/SystemTools.cxx	2008-09-12 15:07:33.000000000 +0000
-@@ -131,7 +131,12 @@
- #define _chdir chdir
- #endif
- 
--#if defined(__BEOS__) && !defined(__ZETA__)
-+#if defined(__HAIKU__)
-+#include <os/kernel/OS.h>
-+#include <os/storage/Path.h>
-+#endif
-+
-+#if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__)
- #include <be/kernel/OS.h>
- #include <be/storage/Path.h>
- 
-diff -urN cmake-2.6.1/Source/kwsys/testDynamicLoader.cxx cmake-2.6.1-haiku/Source/kwsys/testDynamicLoader.cxx
---- cmake-2.6.1/Source/kwsys/testDynamicLoader.cxx	2008-08-01 15:34:55.000000000 +0000
-+++ cmake-2.6.1-haiku/Source/kwsys/testDynamicLoader.cxx	2008-09-12 15:07:33.000000000 +0000
-@@ -17,10 +17,14 @@
- #include KWSYS_HEADER(ios/iostream)
- #include KWSYS_HEADER(stl/string)
- 
--#if defined(__BEOS__)
-+#if defined(__BEOS__) && !defined(__HAIKU__)
- #include <be/kernel/OS.h>  /* disable_debugger() API. */
- #endif
- 
-+#if defined(__HAIKU__)
-+#include <os/kernel/OS.h>  /* disable_debugger() API. */
-+#endif
-+
- // Work-around CMake dependency scanning limitation.  This must
- // duplicate the above list of headers.
- #if 0
-diff -urN cmake-2.6.1/Source/kwsys/testProcess.c cmake-2.6.1-haiku/Source/kwsys/testProcess.c
---- cmake-2.6.1/Source/kwsys/testProcess.c	2008-08-01 15:34:55.000000000 +0000
-+++ cmake-2.6.1-haiku/Source/kwsys/testProcess.c	2008-09-12 15:07:33.000000000 +0000
-@@ -34,7 +34,7 @@
- # pragma warn -8060 /* possibly incorrect assignment */
- #endif
- 
--#if defined(__BEOS__) && !defined(__ZETA__)
-+#if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__)
- /* BeOS 5 doesn't have usleep(), but it has snooze(), which is identical. */
- # include <be/kernel/OS.h>
- static inline void testProcess_usleep(unsigned int msec)
-diff -urN cmake-2.6.1/Tests/Complex/Library/CMakeLists.txt cmake-2.6.1-haiku/Tests/Complex/Library/CMakeLists.txt
---- cmake-2.6.1/Tests/Complex/Library/CMakeLists.txt	2008-08-01 15:34:55.000000000 +0000
-+++ cmake-2.6.1-haiku/Tests/Complex/Library/CMakeLists.txt	2008-09-12 15:07:33.000000000 +0000
-@@ -53,7 +53,9 @@
-   )
- SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES FOO BAR)
- IF(NOT BEOS)  # No libm on BeOS.
--  SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES LINK_FLAGS "-lm")
-+  IF(NOT HAIKU) # libm in included in libroot on Haiku
-+    SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES LINK_FLAGS "-lm")
-+  ENDIF(NOT HAIKU)
- ENDIF(NOT BEOS)
- GET_TARGET_PROPERTY(FOO_BAR_VAR CMakeTestCLibraryShared FOO)
- IF(${FOO_BAR_VAR} MATCHES "BAR")
-diff -urN cmake-2.6.1/Tests/ComplexOneConfig/Library/CMakeLists.txt cmake-2.6.1-haiku/Tests/ComplexOneConfig/Library/CMakeLists.txt
---- cmake-2.6.1/Tests/ComplexOneConfig/Library/CMakeLists.txt	2008-08-01 15:34:56.000000000 +0000
-+++ cmake-2.6.1-haiku/Tests/ComplexOneConfig/Library/CMakeLists.txt	2008-09-12 15:07:33.000000000 +0000
-@@ -53,7 +53,9 @@
-   )
- SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES FOO BAR)
- IF(NOT BEOS)  # No libm on BeOS.
-+  IF(NOT HAIKU) # No limb on Haiku.
-   SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES LINK_FLAGS "-lm")
-+  ENDIF(NOT HAIKU)
- ENDIF(NOT BEOS)
- GET_TARGET_PROPERTY(FOO_BAR_VAR CMakeTestCLibraryShared FOO)
- IF(${FOO_BAR_VAR} MATCHES "BAR")
-diff -urN cmake-2.6.1/Tests/ComplexRelativePaths/Library/CMakeLists.txt cmake-2.6.1-haiku/Tests/ComplexRelativePaths/Library/CMakeLists.txt
---- cmake-2.6.1/Tests/ComplexRelativePaths/Library/CMakeLists.txt	2008-08-01 15:34:56.000000000 +0000
-+++ cmake-2.6.1-haiku/Tests/ComplexRelativePaths/Library/CMakeLists.txt	2008-09-12 15:07:33.000000000 +0000
-@@ -53,7 +53,9 @@
-   )
- SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES FOO BAR)
- IF(NOT BEOS)  # No libm on BeOS.
-+  IF(NOT HAIKU) # No libm on Haiku.
-   SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES LINK_FLAGS "-lm")
-+  ENDIF(NOT HAIKU)
- ENDIF(NOT BEOS)
- GET_TARGET_PROPERTY(FOO_BAR_VAR CMakeTestCLibraryShared FOO)
- IF(${FOO_BAR_VAR} MATCHES "BAR")
-diff -urN cmake-2.6.1/Utilities/cmcurl/CMake/CurlTests.c cmake-2.6.1-haiku/Utilities/cmcurl/CMake/CurlTests.c
---- cmake-2.6.1/Utilities/cmcurl/CMake/CurlTests.c	2008-08-01 15:34:57.000000000 +0000
-+++ cmake-2.6.1-haiku/Utilities/cmcurl/CMake/CurlTests.c	2008-09-12 15:07:34.000000000 +0000
-@@ -38,7 +38,7 @@
- # define PLATFORM_AIX_V3
- #endif
- 
--#if defined(PLATFORM_SUNOS4) || defined(PLATFORM_AIX_V3) || defined(__BEOS__)
-+#if defined(PLATFORM_SUNOS4) || defined(PLATFORM_AIX_V3) || (defined(__BEOS__) && !defined(__HAIKU__))
- #error "O_NONBLOCK does not work on this platform"
- #endif
-   int socket;
-diff -urN cmake-2.6.1/Utilities/cmcurl/CMakeLists.txt cmake-2.6.1-haiku/Utilities/cmcurl/CMakeLists.txt
---- cmake-2.6.1/Utilities/cmcurl/CMakeLists.txt	2008-08-01 15:34:57.000000000 +0000
-+++ cmake-2.6.1-haiku/Utilities/cmcurl/CMakeLists.txt	2008-09-12 15:07:34.000000000 +0000
-@@ -165,6 +165,8 @@
-   CHECK_LIBRARY_EXISTS_CONCAT("bnetapi" closesocket HAVE_LIBBNETAPI)
- ENDIF(BEOS)
- 
-+CHECK_LIBRARY_EXISTS_CONCAT("network" recv HAVE_LIBNETWORK)
-+
- IF(NOT NOT_NEED_LIBNSL)
-   CHECK_LIBRARY_EXISTS_CONCAT("nsl"    gethostbyname  HAVE_LIBNSL)
- ENDIF(NOT NOT_NEED_LIBNSL)
-diff -urN cmake-2.6.1/Utilities/cmcurl/curl/curl.h cmake-2.6.1-haiku/Utilities/cmcurl/curl/curl.h
---- cmake-2.6.1/Utilities/cmcurl/curl/curl.h	2008-08-01 15:34:57.000000000 +0000
-+++ cmake-2.6.1-haiku/Utilities/cmcurl/curl/curl.h	2008-09-12 15:07:34.000000000 +0000
-@@ -1133,7 +1133,7 @@
- }
- #endif
- 
--#ifdef __BEOS__
-+#if defined __BEOS__ || defined __HAIKU__
- #include <support/SupportDefs.h>
- #endif
- 
-diff -urN cmake-2.6.1/Utilities/cmcurl/if2ip.c cmake-2.6.1-haiku/Utilities/cmcurl/if2ip.c
---- cmake-2.6.1/Utilities/cmcurl/if2ip.c	2008-08-01 15:34:57.000000000 +0000
-+++ cmake-2.6.1-haiku/Utilities/cmcurl/if2ip.c	2008-09-12 15:07:34.000000000 +0000
-@@ -39,7 +39,7 @@
-  */
- #if !defined(WIN32) && !defined(__BEOS__) && !defined(__CYGWIN__) && \
-     !defined(__riscos__) && !defined(__INTERIX) && !defined(NETWARE) && \
--    !defined(_AMIGASF) && !defined(__minix)
-+    !defined(_AMIGASF) && !defined(__minix) && !defined(__HAIKU__)
- 
- #ifdef HAVE_SYS_SOCKET_H
- #include <sys/socket.h>
-diff -urN cmake-2.6.1/Utilities/cmcurl/select.c cmake-2.6.1-haiku/Utilities/cmcurl/select.c
---- cmake-2.6.1/Utilities/cmcurl/select.c	2008-08-01 15:34:57.000000000 +0000
-+++ cmake-2.6.1-haiku/Utilities/cmcurl/select.c	2008-09-12 15:07:34.000000000 +0000
-@@ -39,7 +39,7 @@
- #error "We can't compile without select() support!"
- #endif
- 
--#ifdef __BEOS__
-+#if defined __BEOS__ && !defined __HAIKU__
- /* BeOS has FD_SET defined in socket.h */
- #include <socket.h>
- #endif
-diff -urN cmake-2.6.1/Utilities/cmcurl/setup.h cmake-2.6.1-haiku/Utilities/cmcurl/setup.h
---- cmake-2.6.1/Utilities/cmcurl/setup.h	2008-08-01 15:34:57.000000000 +0000
-+++ cmake-2.6.1-haiku/Utilities/cmcurl/setup.h	2008-09-12 15:07:34.000000000 +0000
-@@ -264,7 +264,7 @@
- 
- #else /* MSDOS */
- 
--#ifdef __BEOS__
-+#if defined __BEOS__ && !defined __HAIKU__
- #define sclose(x) closesocket(x)
- #else /* __BEOS__ */
- #define sclose(x) close(x)
-diff -urN cmake-2.6.1/Utilities/cmtar/libtar.c cmake-2.6.1-haiku/Utilities/cmtar/libtar.c
---- cmake-2.6.1/Utilities/cmtar/libtar.c	2008-08-01 15:34:58.000000000 +0000
-+++ cmake-2.6.1-haiku/Utilities/cmtar/libtar.c	2008-09-12 15:07:34.000000000 +0000
-@@ -98,8 +98,8 @@
-     {
-     return -1;
-     }
--
--#if defined(__BEOS__) && !defined(__ZETA__)  /* no fchmod on BeOS...do pathname instead. */
-+/* no fchmod on BeOS...do pathname instead. */
-+#if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__)
-   if ((oflags & O_CREAT) && chmod(pathname, mode & 07777))
-     {
-     return -1;
-diff -urN cmake-2.6.1/Utilities/cmxmlrpc/xmlrpc_curl_transport.c cmake-2.6.1-haiku/Utilities/cmxmlrpc/xmlrpc_curl_transport.c
---- cmake-2.6.1/Utilities/cmxmlrpc/xmlrpc_curl_transport.c	2008-08-01 15:34:58.000000000 +0000
-+++ cmake-2.6.1-haiku/Utilities/cmxmlrpc/xmlrpc_curl_transport.c	2008-09-12 15:07:34.000000000 +0000
-@@ -10,7 +10,7 @@
- 
- #include "xmlrpc_config.h"
- 
--#if defined(__BEOS__)
-+#if defined(__BEOS__) && !defined(__HAIKU__)
- /* Some helpful system header has char==bool, then bool.h does int==bool. */
- #define HAVE_BOOL 1
- #endif
-diff -urN cmake-2.6.1/Utilities/cmzlib/zconf.h cmake-2.6.1-haiku/Utilities/cmzlib/zconf.h
---- cmake-2.6.1/Utilities/cmzlib/zconf.h	2008-08-01 15:34:58.000000000 +0000
-+++ cmake-2.6.1-haiku/Utilities/cmzlib/zconf.h	2008-09-12 15:07:34.000000000 +0000
-@@ -237,7 +237,7 @@
- #  endif
- #endif
- 
--#if defined (__BEOS__)
-
-+#if defined (__BEOS__) && !defined (__HAIKU__)
- #  ifdef ZLIB_DLL
- #    ifdef ZLIB_INTERNAL
- #      define ZEXPORT   __declspec(dllexport)
-diff -urN cmake-2.6.1/Utilities/cmzlib/zutil.h cmake-2.6.1-haiku/Utilities/cmzlib/zutil.h
---- cmake-2.6.1/Utilities/cmzlib/zutil.h	2008-08-01 15:34:59.000000000 +0000
-+++ cmake-2.6.1-haiku/Utilities/cmzlib/zutil.h	2008-09-12 15:07:34.000000000 +0000
-@@ -147,7 +147,13 @@
- #  define OS_CODE  0x0f
- #endif
- 
--#if defined(_BEOS_) || defined(RISCOS)
-+/* Haiku defines both __HAIKU__ and __BEOS__ (for now) */
-+/* many BeOS workarounds are no longer needed in Haiku */
-+#if defined(__HAIKU__) && defined(__BEOS__)
-+#undef __BEOS__
-+#endif
-+
-+#if defined(_BEOS_) || defined(RISCOS) 
- #  define fdopen(fd,mode) NULL /* No fdopen() */
- #endif
- 
-diff -urN cmake-2.6.1/bootstrap cmake-2.6.1-haiku/bootstrap
---- cmake-2.6.1/bootstrap	2008-08-01 15:34:50.000000000 +0000
-+++ cmake-2.6.1-haiku/bootstrap	2008-09-12 15:07:34.000000000 +0000
-@@ -73,6 +73,13 @@
-   cmake_system_beos=false
- fi
- 
-+# Determine whether this is Haiku 
-+if echo "${cmake_system}" | grep Haiku >/dev/null 2>&1; then
-+  cmake_system_haiku=true
-+else
-+  cmake_system_haiku=false
-+fi
-+
- # Choose the generator to use for bootstrapping.
- if ${cmake_system_mingw}; then
-   # Bootstrapping from an MSYS prompt.
-@@ -603,6 +610,11 @@
-   cmake_ld_flags="${LDFLAGS} -lroot -lbe"
- fi
- 
-+# Add Haiku toolkits...
-+if ${cmake_system_haiku}; then
-+  cmake_ld_flags="${LDFLAGS} -lroot -lbe"
-+fi
-+
- # Test C compiler
- cmake_c_compiler=
- 

dev-util/cmake/patches/cmake-2.6.1-haiku.diff

@@ -1,449 +0,0 @@
-diff -urN cmake-2.6.1/Modules/CMakeFortranCompilerId.F90.in cmake-2.6.1-haiku/Modules/CMakeFortranCompilerId.F90.in
---- cmake-2.6.1/Modules/CMakeFortranCompilerId.F90.in	2008-08-01 15:34:50.000000000 +0000
-+++ cmake-2.6.1-haiku/Modules/CMakeFortranCompilerId.F90.in	2008-08-20 13:49:06.000000000 +0000
-@@ -50,6 +50,10 @@
-    PRINT *, 'INFO:platform[IRIX]'
- #elif defined(__hpux) || defined(__hpux__)
-    PRINT *, 'INFO:platform[HP-UX]'
-+#elif defined(__HAIKU) || defined(__HAIKU__) || defined(_HAIKU)
-+   PRINT *, 'INFO:platform[Haiku]'
-+! Haiku also defines __BEOS__ so we must 
-+! put it prior to the check for __BEOS__
- #elif defined(__BeOS) || defined(__BEOS__) || defined(_BEOS)
-    PRINT *, 'INFO:platform[BeOS]'
- #elif defined(__QNX__) || defined(__QNXNTO__)
-diff -urN cmake-2.6.1/Modules/CMakePlatformId.h.in cmake-2.6.1-haiku/Modules/CMakePlatformId.h.in
---- cmake-2.6.1/Modules/CMakePlatformId.h.in	2008-08-01 15:34:50.000000000 +0000
-+++ cmake-2.6.1-haiku/Modules/CMakePlatformId.h.in	2008-08-20 13:49:06.000000000 +0000
-@@ -35,6 +35,11 @@
- #elif defined(__hpux) || defined(__hpux__)
- # define PLATFORM_ID "HP-UX"
- 
-+#elif defined(__HAIKU) || defined(__HAIKU__) || defined(_HAIKU)
-+# define PLATFORM_ID "Haiku"
-+! Haiku also defines __BEOS__ so we must 
-+! put it prior to the check for __BEOS__
-+
- #elif defined(__BeOS) || defined(__BEOS__) || defined(_BEOS)
- # define PLATFORM_ID "BeOS"
- 
-diff -urN cmake-2.6.1/Modules/CheckForPthreads.c cmake-2.6.1-haiku/Modules/CheckForPthreads.c
---- cmake-2.6.1/Modules/CheckForPthreads.c	2008-08-01 15:34:50.000000000 +0000
-+++ cmake-2.6.1-haiku/Modules/CheckForPthreads.c	2008-08-20 13:49:06.000000000 +0000
-@@ -16,7 +16,7 @@
-   pthread_create(&tid[0], 0, runner, (void*)1);
-   pthread_create(&tid[1], 0, runner, (void*)2);
-   
--#if defined(__BEOS__) && !defined(__ZETA__)  // (no usleep on BeOS 5.)
-+#if defined(__BEOS__) && !defined(__ZETA__)  && !defined(__HAIKU__) // (no usleep on BeOS 5.)
-   usleep(1); // for strange behavior on single-processor sun
- #endif
- 
-diff -urN cmake-2.6.1/Modules/Platform/Haiku.cmake cmake-2.6.1-haiku/Modules/Platform/Haiku.cmake
---- cmake-2.6.1/Modules/Platform/Haiku.cmake	1970-01-01 00:00:00.000000000 +0000
-+++ cmake-2.6.1-haiku/Modules/Platform/Haiku.cmake	2008-08-20 13:49:06.000000000 +0000
-@@ -0,0 +1,14 @@
-+SET(BEOS 1)
-+
-+# GCC is the default compiler on Haiku.
-+INCLUDE(${CMAKE_ROOT}/Modules/Platform/gcc.cmake)
-+
-+SET(CMAKE_DL_LIBS root be)
-+SET(CMAKE_SHARED_LIBRARY_C_FLAGS "-fPIC")
-+SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-nostart")
-+SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,-rpath,")
-+SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":")
-+SET(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-soname,")
-+SET(CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG "-Wl,-soname,")
-+
-+INCLUDE(Platform/UnixPaths)
-diff -urN cmake-2.6.1/Source/CPack/cmCPackGeneratorFactory.cxx cmake-2.6.1-haiku/Source/CPack/cmCPackGeneratorFactory.cxx
---- cmake-2.6.1/Source/CPack/cmCPackGeneratorFactory.cxx	2008-08-01 15:34:53.000000000 +0000
-+++ cmake-2.6.1-haiku/Source/CPack/cmCPackGeneratorFactory.cxx	2008-08-20 13:49:06.000000000 +0000
-@@ -36,7 +36,7 @@
- #endif
- 
- #if !defined(_WIN32) && !defined(__APPLE__) \
-- && !defined(__QNXNTO__) && !defined(__BEOS__)
-+ && !defined(__QNXNTO__) && !defined(__BEOS__) && !defined(__HAIKU__)
- #  include "cmCPackDebGenerator.h"
- #  include "cmCPackRPMGenerator.h"
- #endif
-@@ -75,7 +75,8 @@
-     cmCPackOSXX11Generator::CreateGenerator);
- #endif
- #if !defined(_WIN32) && !defined(__APPLE__) \
--  && !defined(__QNXNTO__) && !defined(__BEOS__)
-+  && !defined(__QNXNTO__) && !defined(__BEOS__)\
-+  && !defined(__HAIKU__)
-   this->RegisterGenerator("DEB", "Debian packages",
-     cmCPackDebGenerator::CreateGenerator);
-   this->RegisterGenerator("RPM", "RPM packages",
-diff -urN cmake-2.6.1/Source/cmCTest.cxx cmake-2.6.1-haiku/Source/cmCTest.cxx
---- cmake-2.6.1/Source/cmCTest.cxx	2008-08-01 15:34:51.000000000 +0000
-+++ cmake-2.6.1-haiku/Source/cmCTest.cxx	2008-08-20 13:49:06.000000000 +0000
-@@ -49,10 +49,15 @@
- 
- #include <memory> // auto_ptr
- 
--#if defined(__BEOS__)
-+#if defined(__BEOS__) && !defined(__HAIKU__)
- #include <be/kernel/OS.h>   /* disable_debugger() API. */
- #endif
- 
-+#if defined(__HAIKU__)
-+#include <os/kernel/OS.h>   /* disable_debugger() API. */
-+#endif
-+
-+
- #define DEBUGOUT std::cout << __LINE__ << " "; std::cout
- #define DEBUGERR std::cerr << __LINE__ << " "; std::cerr
- 
-@@ -607,7 +612,7 @@
-   cmSystemTools::PutEnv("DASHBOARD_TEST_FROM_CTEST=" CMake_VERSION);
- #if defined(_WIN32)
-   SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX);
--#elif defined(__BEOS__)
-+#elif defined(__BEOS__) || defined(__HAIKU__)
-   disable_debugger(1);
- #endif
- }
-diff -urN cmake-2.6.1/Source/cmDependsJavaLexer.cxx cmake-2.6.1-haiku/Source/cmDependsJavaLexer.cxx
---- cmake-2.6.1/Source/cmDependsJavaLexer.cxx	2008-08-01 15:34:51.000000000 +0000
-+++ cmake-2.6.1-haiku/Source/cmDependsJavaLexer.cxx	2008-08-20 13:49:06.000000000 +0000
-@@ -23,7 +23,7 @@
- #include <errno.h>
- #include <stdlib.h>
- 
--#if defined(__BEOS__)
-+#if defined(__BEOS__) || defined (__HAIKU__)
- #include <unistd.h>   /* prevents a conflict with a #define later on... */
- #endif
- 
-diff -urN cmake-2.6.1/Source/cmDependsJavaLexer.h cmake-2.6.1-haiku/Source/cmDependsJavaLexer.h
---- cmake-2.6.1/Source/cmDependsJavaLexer.h	2008-08-01 15:34:51.000000000 +0000
-+++ cmake-2.6.1-haiku/Source/cmDependsJavaLexer.h	2008-08-20 13:49:06.000000000 +0000
-@@ -38,7 +38,7 @@
- #include <errno.h>
- #include <stdlib.h>
- 
--#if defined(__BEOS__)
-+#if defined(__BEOS__) || defined(__HAIKU__)
- #include <unistd.h>   /* prevents a conflict with a #define later on... */
- #endif
- 
-diff -urN cmake-2.6.1/Source/cmSystemTools.cxx cmake-2.6.1-haiku/Source/cmSystemTools.cxx
---- cmake-2.6.1/Source/cmSystemTools.cxx	2008-08-01 15:34:53.000000000 +0000
-+++ cmake-2.6.1-haiku/Source/cmSystemTools.cxx	2008-08-20 13:49:06.000000000 +0000
-@@ -970,11 +970,13 @@
-         error << "SIGFPE";
-         break;
- #endif
-+#ifndef __HAIKU__
- #ifdef SIGBUS
-       case SIGBUS:
-         error << "SIGBUS";
-         break;
- #endif
-+#endif
- #ifdef SIGSEGV
-       case SIGSEGV:
-         error << "SIGSEGV";
-@@ -1696,7 +1698,7 @@
-     }
- 
- // no fchmod on BeOS 5...do pathname instead.
--#if defined(__BEOS__) && !defined(__ZETA__) 
-+#if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__)
-   if ((oflags & O_CREAT) && chmod(pathname, mode))
-     {
-     return -1;
-diff -urN cmake-2.6.1/Source/kwsys/DynamicLoader.cxx cmake-2.6.1-haiku/Source/kwsys/DynamicLoader.cxx
---- cmake-2.6.1/Source/kwsys/DynamicLoader.cxx	2008-08-01 15:34:54.000000000 +0000
-+++ cmake-2.6.1-haiku/Source/kwsys/DynamicLoader.cxx	2008-08-20 13:49:06.000000000 +0000
-@@ -335,11 +335,21 @@
- #endif //_WIN32
- 
- // ---------------------------------------------------------------
--// 4. Implementation for BeOS
--#ifdef __BEOS__
-+// 4. Implementation for BeOS / Haiku
-+#if defined __BEOS__ || defined(__HAIKU__)
-+
- #include <string.h> // for strerror()
-+
-+#ifdef __BEOS__
- #include <be/kernel/image.h>
- #include <be/support/Errors.h>
-+#endif
-+
-+#ifdef __HAIKU__
-+#include <os/kernel/image.h>
-+#include <os/support/Errors.h>
-+#endif
-+
- #define DYNAMICLOADER_DEFINED 1
- 
- namespace KWSYS_NAMESPACE
-diff -urN cmake-2.6.1/Source/kwsys/ProcessUNIX.c cmake-2.6.1-haiku/Source/kwsys/ProcessUNIX.c
---- cmake-2.6.1/Source/kwsys/ProcessUNIX.c	2008-08-01 15:34:54.000000000 +0000
-+++ cmake-2.6.1-haiku/Source/kwsys/ProcessUNIX.c	2008-08-20 13:49:06.000000000 +0000
-@@ -75,7 +75,7 @@
- typedef int kwsysProcess_ssize_t;
- #endif
- 
--#if defined(__BEOS__) && !defined(__ZETA__)
-+#if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__)
- /* BeOS 5 doesn't have usleep(), but it has snooze(), which is identical. */
- # include <be/kernel/OS.h>
- static inline void kwsysProcess_usleep(unsigned int msec)
-@@ -2534,6 +2534,7 @@
-     }
- 
-   /* If this is the first process, enable the signal handler.  */
-+#ifndef __HAIKU__
-   if(newProcesses.Count == 1)
-     {
-     /* Install our handler for SIGCHLD.  Repeat call until it is not
-@@ -2554,6 +2555,7 @@
-                      &kwsysProcessesOldSigChldAction) < 0) &&
-           (errno == EINTR));
-     }
-+#endif
-   }
- 
-   return 1;
-
-diff -urN cmake-2.6.1/Source/kwsys/SystemTools.cxx cmake-2.6.1-haiku/Source/kwsys/SystemTools.cxx
---- cmake-2.6.1/Source/kwsys/SystemTools.cxx	2008-08-01 15:34:55.000000000 +0000
-+++ cmake-2.6.1-haiku/Source/kwsys/SystemTools.cxx	2008-08-20 13:49:06.000000000 +0000
-@@ -131,7 +131,12 @@
- #define _chdir chdir
- #endif
- 
--#if defined(__BEOS__) && !defined(__ZETA__)
-+#if defined(__HAIKU__)
-+#include <os/kernel/OS.h>
-+#include <os/storage/Path.h>
-+#endif
-+
-+#if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__)
- #include <be/kernel/OS.h>
- #include <be/storage/Path.h>
- 
-diff -urN cmake-2.6.1/Source/kwsys/testDynamicLoader.cxx cmake-2.6.1-haiku/Source/kwsys/testDynamicLoader.cxx
---- cmake-2.6.1/Source/kwsys/testDynamicLoader.cxx	2008-08-01 15:34:55.000000000 +0000
-+++ cmake-2.6.1-haiku/Source/kwsys/testDynamicLoader.cxx	2008-08-20 13:49:06.000000000 +0000
-@@ -17,10 +17,14 @@
- #include KWSYS_HEADER(ios/iostream)
- #include KWSYS_HEADER(stl/string)
- 
--#if defined(__BEOS__)
-+#if defined(__BEOS__) && !defined(__HAIKU__)
- #include <be/kernel/OS.h>  /* disable_debugger() API. */
- #endif
- 
-+#if defined(__HAIKU__)
-+#include <os/kernel/OS.h>  /* disable_debugger() API. */
-+#endif
-+
- // Work-around CMake dependency scanning limitation.  This must
- // duplicate the above list of headers.
- #if 0
-diff -urN cmake-2.6.1/Source/kwsys/testProcess.c cmake-2.6.1-haiku/Source/kwsys/testProcess.c
---- cmake-2.6.1/Source/kwsys/testProcess.c	2008-08-01 15:34:55.000000000 +0000
-+++ cmake-2.6.1-haiku/Source/kwsys/testProcess.c	2008-08-20 13:49:06.000000000 +0000
-@@ -34,7 +34,7 @@
- # pragma warn -8060 /* possibly incorrect assignment */
- #endif
- 
--#if defined(__BEOS__) && !defined(__ZETA__)
-+#if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__)
- /* BeOS 5 doesn't have usleep(), but it has snooze(), which is identical. */
- # include <be/kernel/OS.h>
- static inline void testProcess_usleep(unsigned int msec)
-diff -urN cmake-2.6.1/Tests/Complex/Library/CMakeLists.txt cmake-2.6.1-haiku/Tests/Complex/Library/CMakeLists.txt
---- cmake-2.6.1/Tests/Complex/Library/CMakeLists.txt	2008-08-01 15:34:55.000000000 +0000
-+++ cmake-2.6.1-haiku/Tests/Complex/Library/CMakeLists.txt	2008-08-20 13:49:06.000000000 +0000
-@@ -53,7 +53,9 @@
-   )
- SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES FOO BAR)
- IF(NOT BEOS)  # No libm on BeOS.
--  SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES LINK_FLAGS "-lm")
-+  IF(NOT HAIKU) # libm in included in libroot on Haiku
-+    SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES LINK_FLAGS "-lm")
-+  ENDIF(NOT HAIKU)
- ENDIF(NOT BEOS)
- GET_TARGET_PROPERTY(FOO_BAR_VAR CMakeTestCLibraryShared FOO)
- IF(${FOO_BAR_VAR} MATCHES "BAR")
-diff -urN cmake-2.6.1/Tests/ComplexOneConfig/Library/CMakeLists.txt cmake-2.6.1-haiku/Tests/ComplexOneConfig/Library/CMakeLists.txt
---- cmake-2.6.1/Tests/ComplexOneConfig/Library/CMakeLists.txt	2008-08-01 15:34:56.000000000 +0000
-+++ cmake-2.6.1-haiku/Tests/ComplexOneConfig/Library/CMakeLists.txt	2008-08-20 13:49:06.000000000 +0000
-@@ -53,7 +53,9 @@
-   )
- SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES FOO BAR)
- IF(NOT BEOS)  # No libm on BeOS.
-+  IF(NOT HAIKU) # No limb on Haiku.
-   SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES LINK_FLAGS "-lm")
-+  ENDIF(NOT HAIKU)
- ENDIF(NOT BEOS)
- GET_TARGET_PROPERTY(FOO_BAR_VAR CMakeTestCLibraryShared FOO)
- IF(${FOO_BAR_VAR} MATCHES "BAR")
-diff -urN cmake-2.6.1/Tests/ComplexRelativePaths/Library/CMakeLists.txt cmake-2.6.1-haiku/Tests/ComplexRelativePaths/Library/CMakeLists.txt
---- cmake-2.6.1/Tests/ComplexRelativePaths/Library/CMakeLists.txt	2008-08-01 15:34:56.000000000 +0000
-+++ cmake-2.6.1-haiku/Tests/ComplexRelativePaths/Library/CMakeLists.txt	2008-08-20 13:49:07.000000000 +0000
-@@ -53,7 +53,9 @@
-   )
- SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES FOO BAR)
- IF(NOT BEOS)  # No libm on BeOS.
-+  IF(NOT HAIKU) # No libm on Haiku.
-   SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES LINK_FLAGS "-lm")
-+  ENDIF(NOT HAIKU)
- ENDIF(NOT BEOS)
- GET_TARGET_PROPERTY(FOO_BAR_VAR CMakeTestCLibraryShared FOO)
- IF(${FOO_BAR_VAR} MATCHES "BAR")
-diff -urN cmake-2.6.1/Utilities/cmcurl/CMake/CurlTests.c cmake-2.6.1-haiku/Utilities/cmcurl/CMake/CurlTests.c
---- cmake-2.6.1/Utilities/cmcurl/CMake/CurlTests.c	2008-08-01 15:34:57.000000000 +0000
-+++ cmake-2.6.1-haiku/Utilities/cmcurl/CMake/CurlTests.c	2008-08-20 13:49:07.000000000 +0000
-@@ -38,7 +38,7 @@
- # define PLATFORM_AIX_V3
- #endif
- 
--#if defined(PLATFORM_SUNOS4) || defined(PLATFORM_AIX_V3) || defined(__BEOS__)
-+#if defined(PLATFORM_SUNOS4) || defined(PLATFORM_AIX_V3) || (defined(__BEOS__) && !defined(__HAIKU__))
- #error "O_NONBLOCK does not work on this platform"
- #endif
-   int socket;
-diff -urN cmake-2.6.1/Utilities/cmcurl/curl/curl.h cmake-2.6.1-haiku/Utilities/cmcurl/curl/curl.h
---- cmake-2.6.1/Utilities/cmcurl/curl/curl.h	2008-08-01 15:34:57.000000000 +0000
-+++ cmake-2.6.1-haiku/Utilities/cmcurl/curl/curl.h	2008-08-20 13:49:07.000000000 +0000
-@@ -1133,7 +1133,7 @@
- }
- #endif
- 
--#ifdef __BEOS__
-+#if defined __BEOS__ || defined __HAIKU__
- #include <support/SupportDefs.h>
- #endif
- 
-diff -urN cmake-2.6.1/Utilities/cmcurl/if2ip.c cmake-2.6.1-haiku/Utilities/cmcurl/if2ip.c
---- cmake-2.6.1/Utilities/cmcurl/if2ip.c	2008-08-01 15:34:57.000000000 +0000
-+++ cmake-2.6.1-haiku/Utilities/cmcurl/if2ip.c	2008-08-20 13:49:07.000000000 +0000
-@@ -39,7 +39,7 @@
-  */
- #if !defined(WIN32) && !defined(__BEOS__) && !defined(__CYGWIN__) && \
-     !defined(__riscos__) && !defined(__INTERIX) && !defined(NETWARE) && \
--    !defined(_AMIGASF) && !defined(__minix)
-+    !defined(_AMIGASF) && !defined(__minix) && !defined(__HAIKU__)
- 
- #ifdef HAVE_SYS_SOCKET_H
- #include <sys/socket.h>
-diff -urN cmake-2.6.1/Utilities/cmcurl/select.c cmake-2.6.1-haiku/Utilities/cmcurl/select.c
---- cmake-2.6.1/Utilities/cmcurl/select.c	2008-08-01 15:34:57.000000000 +0000
-+++ cmake-2.6.1-haiku/Utilities/cmcurl/select.c	2008-08-20 13:49:07.000000000 +0000
-@@ -39,7 +39,7 @@
- #error "We can't compile without select() support!"
- #endif
- 
--#ifdef __BEOS__
-+#if defined __BEOS__ && !defined __HAIKU__
- /* BeOS has FD_SET defined in socket.h */
- #include <socket.h>
- #endif
-diff -urN cmake-2.6.1/Utilities/cmcurl/setup.h cmake-2.6.1-haiku/Utilities/cmcurl/setup.h
---- cmake-2.6.1/Utilities/cmcurl/setup.h	2008-08-01 15:34:57.000000000 +0000
-+++ cmake-2.6.1-haiku/Utilities/cmcurl/setup.h	2008-08-20 13:49:07.000000000 +0000
-@@ -264,7 +264,7 @@
- 
- #else /* MSDOS */
- 
--#ifdef __BEOS__
-+#if defined __BEOS__ && !defined __HAIKU__
- #define sclose(x) closesocket(x)
- #else /* __BEOS__ */
- #define sclose(x) close(x)
-diff -urN cmake-2.6.1/Utilities/cmtar/libtar.c cmake-2.6.1-haiku/Utilities/cmtar/libtar.c
---- cmake-2.6.1/Utilities/cmtar/libtar.c	2008-08-01 15:34:58.000000000 +0000
-+++ cmake-2.6.1-haiku/Utilities/cmtar/libtar.c	2008-08-20 13:49:07.000000000 +0000
-@@ -98,8 +98,8 @@
-     {
-     return -1;
-     }
--
--#if defined(__BEOS__) && !defined(__ZETA__)  /* no fchmod on BeOS...do pathname instead. */
-+/* no fchmod on BeOS...do pathname instead. */
-+#if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__)
-   if ((oflags & O_CREAT) && chmod(pathname, mode & 07777))
-     {
-     return -1;
-diff -urN cmake-2.6.1/Utilities/cmxmlrpc/xmlrpc_curl_transport.c cmake-2.6.1-haiku/Utilities/cmxmlrpc/xmlrpc_curl_transport.c
---- cmake-2.6.1/Utilities/cmxmlrpc/xmlrpc_curl_transport.c	2008-08-01 15:34:58.000000000 +0000
-+++ cmake-2.6.1-haiku/Utilities/cmxmlrpc/xmlrpc_curl_transport.c	2008-08-20 13:49:07.000000000 +0000
-@@ -10,7 +10,7 @@
- 
- #include "xmlrpc_config.h"
- 
--#if defined(__BEOS__)
-+#if defined(__BEOS__) && !defined(__HAIKU__)
- /* Some helpful system header has char==bool, then bool.h does int==bool. */
- #define HAVE_BOOL 1
- #endif
-diff -urN cmake-2.6.1/Utilities/cmzlib/zconf.h cmake-2.6.1-haiku/Utilities/cmzlib/zconf.h
---- cmake-2.6.1/Utilities/cmzlib/zconf.h	2008-08-01 15:34:58.000000000 +0000
-+++ cmake-2.6.1-haiku/Utilities/cmzlib/zconf.h	2008-08-20 13:49:07.000000000 +0000
-@@ -237,7 +237,7 @@
- #  endif
- #endif
- 
--#if defined (__BEOS__)
-+#if defined (__BEOS__) && !defined (__HAIKU__)
- #  ifdef ZLIB_DLL
- #    ifdef ZLIB_INTERNAL
- #      define ZEXPORT   __declspec(dllexport)
-diff -urN cmake-2.6.1/Utilities/cmzlib/zutil.h cmake-2.6.1-haiku/Utilities/cmzlib/zutil.h
---- cmake-2.6.1/Utilities/cmzlib/zutil.h	2008-08-01 15:34:59.000000000 +0000
-+++ cmake-2.6.1-haiku/Utilities/cmzlib/zutil.h	2008-08-20 13:49:07.000000000 +0000
-@@ -147,7 +147,13 @@
- #  define OS_CODE  0x0f
- #endif
- 
--#if defined(_BEOS_) || defined(RISCOS)
-+/* Haiku defines both __HAIKU__ and __BEOS__ (for now) */
-+/* many BeOS workarounds are no longer needed in Haiku */
-+#if defined(__HAIKU__) && defined(__BEOS__)
-+undef (__BEOS__)
-+#endif
-+
-+#if defined(_BEOS_) || defined(RISCOS) 
- #  define fdopen(fd,mode) NULL /* No fdopen() */
- #endif
- 
-diff -urN cmake-2.6.1/bootstrap cmake-2.6.1-haiku/bootstrap
---- cmake-2.6.1/bootstrap	2008-08-01 15:34:50.000000000 +0000
-+++ cmake-2.6.1-haiku/bootstrap	2008-08-20 13:49:07.000000000 +0000
-@@ -73,6 +73,13 @@
-   cmake_system_beos=false
- fi
- 
-+# Determine whether this is Haiku 
-+if echo "${cmake_system}" | grep Haiku >/dev/null 2>&1; then
-+  cmake_system_haiku=true
-+else
-+  cmake_system_haiku=false
-+fi
-+
- # Choose the generator to use for bootstrapping.
- if ${cmake_system_mingw}; then
-   # Bootstrapping from an MSYS prompt.
-@@ -603,6 +610,11 @@
-   cmake_ld_flags="${LDFLAGS} -lroot -lbe"
- fi
- 
-+# Add Haiku toolkits...
-+if ${cmake_system_haiku}; then
-+  cmake_ld_flags="${LDFLAGS} -lroot -lbe"
-+fi
-+
- # Test C compiler
- cmake_c_compiler=
- 

dev-util/cmake/patches/cmake-2.8-git.patch

@@ -1,229 +0,0 @@
-diff -urN cmake-2.8-git-orig/Modules/Platform/Haiku.cmake cmake-2.8-git/Modules/Platform/Haiku.cmake
---- cmake-2.8-git-orig/Modules/Platform/Haiku.cmake	2012-12-03 12:11:47.804519936 -0800
-+++ cmake-2.8-git/Modules/Platform/Haiku.cmake	2012-12-03 12:02:17.652738560 -0800
-@@ -1,20 +1,25 @@
-+set(HAIKU 1)
-+set(UNIX 1)
-+  
-+set(CMAKE_DL_LIBS "")
--set(BEOS 1)
--
--set(CMAKE_DL_LIBS root be)
--set(CMAKE_C_COMPILE_OPTIONS_PIC "-fPIC")
--set(CMAKE_C_COMPILE_OPTIONS_PIE "-fPIE")
- set(CMAKE_SHARED_LIBRARY_C_FLAGS "-fPIC")
-+set(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-shared")
--set(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-nostart")
- set(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,-rpath,")
- set(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":")
-+set(CMAKE_SHARED_LIBRARY_RPATH_LINK_C_FLAG "-Wl,-rpath-link,")
- set(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-soname,")
-+set(CMAKE_EXE_EXPORTS_C_FLAG "-Wl,--export-dynamic")
-+  
-+list(APPEND CMAKE_SYSTEM_PREFIX_PATH
-+  /boot/common/non-packaged
-+  /boot/common
-+  /boot/system
-+  )
-+list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
-+  /boot/common/non-packaged/lib
-+  /boot/common/lib
-+  /boot/develop/lib/x86
-+  )
--
--include(Platform/UnixPaths)
--list(APPEND CMAKE_SYSTEM_PREFIX_PATH /boot/common)
--list(APPEND CMAKE_SYSTEM_INCLUDE_PATH /boot/common/include)
--list(APPEND CMAKE_SYSTEM_LIBRARY_PATH /boot/common/lib)
--list(APPEND CMAKE_SYSTEM_PROGRAM_PATH /boot/common/bin)
--list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES /boot/common/lib)
- list(APPEND CMAKE_SYSTEM_INCLUDE_PATH /boot/develop/headers/3rdparty)
- list(APPEND CMAKE_SYSTEM_LIBRARY_PATH /boot/develop/lib/x86)
- 
-diff -urN cmake-2.8-git-orig/Source/cmExportCommand.cxx cmake-2.8-git/Source/cmExportCommand.cxx
---- cmake-2.8-git-orig/Source/cmExportCommand.cxx	2012-11-27 05:26:33.039059456 -0800
-+++ cmake-2.8-git/Source/cmExportCommand.cxx	2012-12-03 12:02:17.665059328 -0800
-@@ -20,7 +20,8 @@
- #include "cmExportBuildFileGenerator.h"
- 
- #if defined(__HAIKU__)
--#include <StorageKit.h>
-+#include <FindDirectory.h>
-+#include <StorageDefs.h>
- #endif
- 
- cmExportCommand::cmExportCommand()
-@@ -305,14 +306,15 @@
-                                               const char* hash)
- {
- #if defined(__HAIKU__)
--  BPath dir;
--  if (find_directory(B_USER_SETTINGS_DIRECTORY, &dir) != B_OK)
-+  char dir[B_PATH_NAME_LENGTH];
-+  if (find_directory(B_USER_SETTINGS_DIRECTORY, -1, false, dir, sizeof(dir)) !=
-+      B_OK)
-     {
-     return;
-     }
--  dir.Append("cmake/packages");
--  dir.Append(package.c_str());
--  std::string fname = dir.Path();
-+  std::string fname = dir;
-+  fname += "/cmake/packages/";
-+  fname += package;
- #else
-   const char* home = cmSystemTools::GetEnv("HOME");
-   if(!home)
-diff -urN cmake-2.8-git-orig/Source/cmFindPackageCommand.cxx cmake-2.8-git/Source/cmFindPackageCommand.cxx
---- cmake-2.8-git-orig/Source/cmFindPackageCommand.cxx	2012-11-27 05:26:33.059768832 -0800
-+++ cmake-2.8-git/Source/cmFindPackageCommand.cxx	2012-12-03 12:02:17.666107904 -0800
-@@ -19,7 +19,9 @@
- #endif
- 
- #if defined(__HAIKU__)
--#include <StorageKit.h>
-+#include <string.h>
-+#include <FindDirectory.h>
-+#include <StorageDefs.h>
- #endif
- 
- void cmFindPackageNeedBackwardsCompatibility(const std::string& variable,
-@@ -1583,12 +1585,13 @@
- #if defined(_WIN32) && !defined(__CYGWIN__)
-   this->LoadPackageRegistryWinUser();
- #elif defined(__HAIKU__)
--  BPath dir;
--  if (find_directory(B_USER_SETTINGS_DIRECTORY, &dir) == B_OK)
-+  char dir[B_PATH_NAME_LENGTH];
-+  if (find_directory(B_USER_SETTINGS_DIRECTORY, -1, false, dir, sizeof(dir)) ==
-+      B_OK)
-     {
--    dir.Append("cmake/packages");
--    dir.Append(this->Name.c_str());
--    this->LoadPackageRegistryDir(dir.Path());
-+    strlcat(dir, "/cmake/packages/", sizeof(dir));
-+    strlcat(dir, this->Name.c_str(), sizeof(dir));
-+    this->LoadPackageRegistryDir(dir);
-     }
- #else
-   if(const char* home = cmSystemTools::GetEnv("HOME"))
-diff -urN cmake-2.8-git-orig/Source/cmLocalGenerator.cxx cmake-2.8-git/Source/cmLocalGenerator.cxx
---- cmake-2.8-git-orig/Source/cmLocalGenerator.cxx	2012-11-27 05:26:33.035389440 -0800
-+++ cmake-2.8-git/Source/cmLocalGenerator.cxx	2012-12-03 12:02:17.672399360 -0800
-@@ -37,7 +37,8 @@
- #include <assert.h>
- 
- #if defined(__HAIKU__)
--#include <StorageKit.h>
-+#include <FindDirectory.h>
-+#include <StorageDefs.h>
- #endif
- 
- cmLocalGenerator::cmLocalGenerator()
-@@ -354,12 +355,12 @@
-     prefix = prefix_win32.c_str();
-     }
- #elif defined(__HAIKU__)
-+  char dir[B_PATH_NAME_LENGTH];
-   if (!prefix)
-     {
--    BPath dir;
--    if (find_directory(B_COMMON_DIRECTORY, &dir) == B_OK)
-+    if (find_directory(B_COMMON_DIRECTORY, -1, false, dir, sizeof(dir)) == B_OK)
-       {
--      prefix = dir.Path();
-+      prefix = dir;
-       }
-     else
-       {
-diff -urN cmake-2.8-git-orig/Source/CPack/cmCPackGenerator.cxx cmake-2.8-git/Source/CPack/cmCPackGenerator.cxx
---- cmake-2.8-git-orig/Source/CPack/cmCPackGenerator.cxx	2012-11-27 05:26:32.015466496 -0800
-+++ cmake-2.8-git/Source/CPack/cmCPackGenerator.cxx	2012-12-03 12:02:17.677904384 -0800
-@@ -27,7 +27,8 @@
- #include <algorithm>
- 
- #if defined(__HAIKU__)
--#include <StorageKit.h>
-+#include <FindDirectory.h>
-+#include <StorageDefs.h>
- #endif
- 
- //----------------------------------------------------------------------
-@@ -1265,10 +1266,10 @@
-   this->InstallPath += "-";
-   this->InstallPath += this->GetOption("CPACK_PACKAGE_VERSION");
- #elif defined(__HAIKU__)
--  BPath dir;
--  if (find_directory(B_COMMON_DIRECTORY, &dir) == B_OK)
-+  char dir[B_PATH_NAME_LENGTH];
-+  if (find_directory(B_COMMON_DIRECTORY, -1, false, dir, sizeof(dir)) == B_OK)
-     {
--    this->InstallPath = dir.Path();
-+    this->InstallPath = dir;
-     }
-   else
-     {
-diff -urN cmake-2.8-git-orig/Tests/ComplexOneConfig/Library/CMakeLists.txt cmake-2.8-git/Tests/ComplexOneConfig/Library/CMakeLists.txt
---- cmake-2.8-git-orig/Tests/ComplexOneConfig/Library/CMakeLists.txt	2012-11-27 05:26:34.013369344 -0800
-+++ cmake-2.8-git/Tests/ComplexOneConfig/Library/CMakeLists.txt	2012-12-03 12:02:42.181665792 -0800
-@@ -51,7 +51,7 @@
-   FULL_DOCS "A simple etst proerty that means nothign and is used for nothing"
-   )
- set_target_properties(CMakeTestCLibraryShared PROPERTIES FOO BAR)
--if(NOT BEOS AND NOT WIN32)  # No libm on BeOS.
-+if(NOT BEOS AND NOT WIN32 AND NOT HAIKU)  # No libm on BeOS.
-   set_target_properties(CMakeTestCLibraryShared PROPERTIES LINK_FLAGS "-lm")
- endif()
- get_target_property(FOO_BAR_VAR CMakeTestCLibraryShared FOO)
-diff -urN cmake-2.8-git-orig/Utilities/cmcurl/CMake/CurlTests.c cmake-2.8-git/Utilities/cmcurl/CMake/CurlTests.c
---- cmake-2.8-git-orig/Utilities/cmcurl/CMake/CurlTests.c	2012-11-27 05:26:34.045350912 -0800
-+++ cmake-2.8-git/Utilities/cmcurl/CMake/CurlTests.c	2012-12-03 12:02:42.189005824 -0800
-@@ -38,7 +38,7 @@
- # define PLATFORM_AIX_V3
- #endif
- 
--#if defined(PLATFORM_SUNOS4) || defined(PLATFORM_AIX_V3) || (defined(__BEOS__) && !defined(__HAIKU__))
-+#if defined(PLATFORM_SUNOS4) || defined(PLATFORM_AIX_V3) || defined(__BEOS__)
- #error "O_NONBLOCK does not work on this platform"
- #endif
-   int socket;
-diff -urN cmake-2.8-git-orig/Utilities/cmcurl/select.c cmake-2.8-git/Utilities/cmcurl/select.c
---- cmake-2.8-git-orig/Utilities/cmcurl/select.c	2012-11-27 05:26:34.055312384 -0800
-+++ cmake-2.8-git/Utilities/cmcurl/select.c	2012-12-03 12:02:42.189792256 -0800
-@@ -39,7 +39,7 @@
- #error "We can't compile without select() support!"
- #endif
- 
--#if defined(__BEOS__) && !defined(__HAIKU__)
-+#if defined(__BEOS__)
- /* BeOS has FD_SET defined in socket.h */
- #include <socket.h>
- #endif
-diff -urN cmake-2.8-git-orig/Utilities/cmzlib/zconf.h cmake-2.8-git/Utilities/cmzlib/zconf.h
---- cmake-2.8-git-orig/Utilities/cmzlib/zconf.h	2012-11-27 05:26:34.022020096 -0800
-+++ cmake-2.8-git/Utilities/cmzlib/zconf.h	2012-12-03 12:02:42.190578688 -0800
-@@ -237,7 +237,7 @@
- #  endif
- #endif
- 
--#if defined (__BEOS__) && !defined (__HAIKU__)
-+#if defined (__BEOS__)
- #  ifdef ZLIB_DLL
- #    ifdef ZLIB_INTERNAL
- #      define ZEXPORT   __declspec(dllexport)
-diff -urN cmake-2.8-git-orig/Utilities/cmzlib/zutil.h cmake-2.8-git/Utilities/cmzlib/zutil.h
---- cmake-2.8-git-orig/Utilities/cmzlib/zutil.h	2012-11-27 05:26:34.022806528 -0800
-+++ cmake-2.8-git/Utilities/cmzlib/zutil.h	2012-12-03 12:02:42.195559424 -0800
-@@ -147,12 +147,6 @@
- #  define OS_CODE  0x0f
- #endif
- 
--/* Haiku defines both __HAIKU__ and __BEOS__ (for now) */
--/* many BeOS workarounds are no longer needed in Haiku */
--#if defined(__HAIKU__) && defined(__BEOS__)
--#undef __BEOS__
--#endif
--
- #if defined(_BEOS_) || defined(RISCOS) 
- #  define fdopen(fd,mode) NULL /* No fdopen() */
- #endif

dev-util/cmake/patches/cmake-2.8.1.patch

@@ -1,14 +0,0 @@
-diff -urN cmake-2.8.1/bootstrap cmake-2.8.1-haiku/bootstrap
---- cmake-2.8.1/bootstrap	2010-04-06 14:45:29.040370176 +0000
-+++ cmake-2.8.1-haiku/bootstrap	2010-08-31 05:39:55.518520832 +0000
-@@ -132,7 +132,9 @@
-     cmake_default_prefix="c:/Program Files/CMake"
-   fi
- elif ${cmake_system_haiku}; then
--  cmake_default_prefix=`/bin/finddir B_COMMON_DIRECTORY`
-+  cmake_default_prefix=`finddir B_COMMON_DIRECTORY`
-+  cmake_man_dir="/documentation/man"
-+  cmake_doc_dir="/documentation/doc/cmake-${cmake_version}"
- else
-   cmake_default_prefix="/usr/local"
- fi

dev-util/cmake/patches/cmake-2.8.2.patch

@@ -1,14 +0,0 @@
-diff -urN cmake-2.8.2/bootstrap cmake-2.8.2-haiku/bootstrap
---- cmake-2.8.2/bootstrap	2010-04-06 14:45:29.040370176 +0000
-+++ cmake-2.8.2-haiku/bootstrap	2010-08-31 05:39:55.518520832 +0000
-@@ -132,7 +132,9 @@
-     cmake_default_prefix="c:/Program Files/CMake"
-   fi
- elif ${cmake_system_haiku}; then
--  cmake_default_prefix=`/bin/finddir B_COMMON_DIRECTORY`
-+  cmake_default_prefix=`finddir B_COMMON_DIRECTORY`
-+  cmake_man_dir="/documentation/man"
-+  cmake_doc_dir="/documentation/doc/cmake-${cmake_version}"
- else
-   cmake_default_prefix="/usr/local"
- fi

dev-util/cmake/patches/cmake-2.8.3.patch

@@ -1,116 +0,0 @@
-diff -urN cmake-2.8.3/Modules/FindGLUT.cmake cmake-2.8.3-haiku/Modules/FindGLUT.cmake
---- cmake-2.8.3/Modules/FindGLUT.cmake	2010-11-03 19:58:27.020971520 +0000
-+++ cmake-2.8.3-haiku/Modules/FindGLUT.cmake	2011-01-29 10:22:22.032505856 +0000
-@@ -46,12 +46,15 @@
-       /usr/openwin/include
-       /opt/graphics/OpenGL/include
-       /opt/graphics/OpenGL/contrib/libglut
-+      /boot/develop/headers/os/opengl
-       )
-   
-     FIND_LIBRARY( GLUT_glut_LIBRARY glut
-       /usr/openwin/lib
-+      /boot/develop/lib/x86/ 
-       )
--    
-+  
-+  IF(NOT BEOS)
-     FIND_LIBRARY( GLUT_Xi_LIBRARY Xi
-       /usr/openwin/lib
-       )
-@@ -59,6 +62,7 @@
-     FIND_LIBRARY( GLUT_Xmu_LIBRARY Xmu
-       /usr/openwin/lib
-       )
-+  ENDIF(NOT BEOS)
-     
-   ENDIF (APPLE)
-   
-@@ -69,12 +73,18 @@
-   IF(GLUT_glut_LIBRARY)
-     # Is -lXi and -lXmu required on all platforms that have it?
-     # If not, we need some way to figure out what platform we are on.
-+    IF(BEOS)
-+    SET( GLUT_LIBRARIES
-+      ${GLUT_glut_LIBRARY}
-+      )
-+    ELSE(BEOS)
-     SET( GLUT_LIBRARIES
-       ${GLUT_glut_LIBRARY}
-       ${GLUT_Xmu_LIBRARY}
-       ${GLUT_Xi_LIBRARY} 
-       ${GLUT_cocoa_LIBRARY}
-       )
-+  	ENDIF(BEOS)
-     SET( GLUT_FOUND "YES" )
-     
-     #The following deprecated settings are for backwards compatibility with CMake1.4
-@@ -84,9 +94,16 @@
-   ENDIF(GLUT_glut_LIBRARY)
- ENDIF(GLUT_INCLUDE_DIR)
- 
-+IF(BEOS)
-+MARK_AS_ADVANCED(
-+  GLUT_INCLUDE_DIR
-+  GLUT_glut_LIBRARY
-+  )
-+ELSE(BEOS)
- MARK_AS_ADVANCED(
-   GLUT_INCLUDE_DIR
-   GLUT_glut_LIBRARY
-   GLUT_Xmu_LIBRARY
-   GLUT_Xi_LIBRARY
-   )
-+ENDIF(BEOS)
-diff -urN cmake-2.8.3/Modules/FindLua51.cmake cmake-2.8.3-haiku/Modules/FindLua51.cmake
---- cmake-2.8.3/Modules/FindLua51.cmake	2010-11-03 19:58:27.023330816 +0000
-+++ cmake-2.8.3-haiku/Modules/FindLua51.cmake	2011-01-29 10:22:22.035127296 +0000
-@@ -57,13 +57,13 @@
- 
- IF(LUA_LIBRARY)
-   # include the math library for Unix
--  IF(UNIX AND NOT APPLE)
-+  IF(UNIX AND NOT APPLE AND NOT BEOS)
-     FIND_LIBRARY(LUA_MATH_LIBRARY m)
-     SET( LUA_LIBRARIES "${LUA_LIBRARY};${LUA_MATH_LIBRARY}" CACHE STRING "Lua Libraries")
-   # For Windows and Mac, don't need to explicitly include the math library
-   ELSE(UNIX AND NOT APPLE)
-     SET( LUA_LIBRARIES "${LUA_LIBRARY}" CACHE STRING "Lua Libraries")
--  ENDIF(UNIX AND NOT APPLE)
-+  ENDIF(UNIX AND NOT APPLE AND NOT BEOS)
- ENDIF(LUA_LIBRARY)
- 
- INCLUDE("${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake")
-diff -urN cmake-2.8.3/Modules/FindOpenGL.cmake cmake-2.8.3-haiku/Modules/FindOpenGL.cmake
---- cmake-2.8.3/Modules/FindOpenGL.cmake	2010-11-03 19:58:27.024117248 +0000
-+++ cmake-2.8.3-haiku/Modules/FindOpenGL.cmake	2011-01-29 10:22:22.035913728 +0000
-@@ -80,6 +80,7 @@
-       /usr/share/doc/NVIDIA_GLX-1.0/include
-       /usr/openwin/share/include
-       /opt/graphics/OpenGL/include /usr/X11R6/include
-+      /boot/develop/headers/os/opengl
-     )
- 
-     FIND_PATH(OPENGL_xmesa_INCLUDE_DIR GL/xmesa.h
-@@ -94,6 +95,7 @@
-             /usr/openwin/lib
-             /usr/shlib /usr/X11R6/lib
-             ${HPUX_IA_OPENGL_LIB_PATH}
-+            /boot/develop/lib/x86/
-     )
- 
-     # On Unix OpenGL most certainly always requires X11.
-diff -urN cmake-2.8.3/bootstrap cmake-2.8.3-haiku/bootstrap
---- cmake-2.8.3/bootstrap	2010-11-03 19:58:26.058720256 +0000
-+++ cmake-2.8.3-haiku/bootstrap	2011-01-29 10:22:22.031981568 +0000
-@@ -137,7 +137,9 @@
-     cmake_default_prefix="c:/Program Files/CMake"
-   fi
- elif ${cmake_system_haiku}; then
--  cmake_default_prefix=`/bin/finddir B_COMMON_DIRECTORY`
-+  cmake_default_prefix=`finddir B_COMMON_DIRECTORY`
-+  cmake_man_dir="/documentation/man"
-+  cmake_doc_dir="/documentation/doc/cmake-${cmake_version}"
- else
-   cmake_default_prefix="/usr/local"
- fi

dev-util/cmake/patches/cmake-2.8.4.patch

@@ -1,116 +0,0 @@
-diff -urN cmake-2.8.4/Modules/FindGLUT.cmake cmake-2.8.4-haiku/Modules/FindGLUT.cmake
---- cmake-2.8.4/Modules/FindGLUT.cmake	2011-02-15 17:47:27.017301504 +0000
-+++ cmake-2.8.4-haiku/Modules/FindGLUT.cmake	2011-04-26 07:50:24.890241024 +0000
-@@ -46,12 +46,14 @@
-       /usr/openwin/include
-       /opt/graphics/OpenGL/include
-       /opt/graphics/OpenGL/contrib/libglut
-+      /boot/develop/headers/os/opengl
-       )
-   
-     FIND_LIBRARY( GLUT_glut_LIBRARY glut
-       /usr/openwin/lib
-+      /boot/develop/lib/x86/
-       )
--    
-+    IF(NOT BEOS)
-     FIND_LIBRARY( GLUT_Xi_LIBRARY Xi
-       /usr/openwin/lib
-       )
-@@ -59,7 +61,7 @@
-     FIND_LIBRARY( GLUT_Xmu_LIBRARY Xmu
-       /usr/openwin/lib
-       )
--    
-+    ENDIF(NOT BEOS)
-   ENDIF (APPLE)
-   
- ENDIF (WIN32)
-@@ -69,12 +71,18 @@
-   IF(GLUT_glut_LIBRARY)
-     # Is -lXi and -lXmu required on all platforms that have it?
-     # If not, we need some way to figure out what platform we are on.
-+    IF(BEOS)
-+    SET( GLUT_LIBRARIES
-+      ${GLUT_glut_LIBRARY}
-+      )
-+    ELSE(BEOS)
-     SET( GLUT_LIBRARIES
-       ${GLUT_glut_LIBRARY}
-       ${GLUT_Xmu_LIBRARY}
-       ${GLUT_Xi_LIBRARY} 
-       ${GLUT_cocoa_LIBRARY}
-       )
-+    ENDIF(BEOS)
-     SET( GLUT_FOUND "YES" )
-     
-     #The following deprecated settings are for backwards compatibility with CMake1.4
-@@ -84,9 +92,16 @@
-   ENDIF(GLUT_glut_LIBRARY)
- ENDIF(GLUT_INCLUDE_DIR)
- 
-+IF(BEOS)
-+MARK_AS_ADVANCED(
-+  GLUT_INCLUDE_DIR
-+  GLUT_glut_LIBRARY
-+  )
-+ELSE(BEOS)
- MARK_AS_ADVANCED(
-   GLUT_INCLUDE_DIR
-   GLUT_glut_LIBRARY
-   GLUT_Xmu_LIBRARY
-   GLUT_Xi_LIBRARY
-   )
-+ENDIF(BEOS)
-diff -urN cmake-2.8.4/Modules/FindLua51.cmake cmake-2.8.4-haiku/Modules/FindLua51.cmake
---- cmake-2.8.4/Modules/FindLua51.cmake	2011-02-15 17:47:27.019660800 +0000
-+++ cmake-2.8.4-haiku/Modules/FindLua51.cmake	2011-04-26 07:50:24.944504832 +0000
-@@ -57,13 +57,13 @@
- 
- IF(LUA_LIBRARY)
-   # include the math library for Unix
--  IF(UNIX AND NOT APPLE)
-+  IF(UNIX AND NOT APPLE AND NOT BEOS)
-     FIND_LIBRARY(LUA_MATH_LIBRARY m)
-     SET( LUA_LIBRARIES "${LUA_LIBRARY};${LUA_MATH_LIBRARY}" CACHE STRING "Lua Libraries")
-   # For Windows and Mac, don't need to explicitly include the math library
-   ELSE(UNIX AND NOT APPLE)
-     SET( LUA_LIBRARIES "${LUA_LIBRARY}" CACHE STRING "Lua Libraries")
--  ENDIF(UNIX AND NOT APPLE)
-+  ENDIF(UNIX AND NOT APPLE AND NOT BEOS)
- ENDIF(LUA_LIBRARY)
- 
- INCLUDE(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
-diff -urN cmake-2.8.4/Modules/FindOpenGL.cmake cmake-2.8.4-haiku/Modules/FindOpenGL.cmake
---- cmake-2.8.4/Modules/FindOpenGL.cmake	2011-02-15 17:47:27.020447232 +0000
-+++ cmake-2.8.4-haiku/Modules/FindOpenGL.cmake	2011-04-26 07:50:25.026214400 +0000
-@@ -80,6 +80,7 @@
-       /usr/share/doc/NVIDIA_GLX-1.0/include
-       /usr/openwin/share/include
-       /opt/graphics/OpenGL/include /usr/X11R6/include
-+      /boot/develop/headers/os/opengl
-     )
- 
-     FIND_PATH(OPENGL_xmesa_INCLUDE_DIR GL/xmesa.h
-@@ -94,6 +95,7 @@
-             /usr/openwin/lib
-             /usr/shlib /usr/X11R6/lib
-             ${HPUX_IA_OPENGL_LIB_PATH}
-+            /boot/develop/lib/x86/
-     )
- 
-     # On Unix OpenGL most certainly always requires X11.
-diff -urN cmake-2.8.4/bootstrap cmake-2.8.4-haiku/bootstrap
---- cmake-2.8.4/bootstrap	2011-02-15 17:47:26.054001664 +0000
-+++ cmake-2.8.4-haiku/bootstrap	2011-04-26 07:50:25.222035968 +0000
-@@ -142,7 +142,9 @@
-     cmake_default_prefix="c:/Program Files/CMake"
-   fi
- elif ${cmake_system_haiku}; then
--  cmake_default_prefix=`/bin/finddir B_COMMON_DIRECTORY`
-+  cmake_default_prefix=`finddir B_COMMON_DIRECTORY`
-+  cmake_man_dir="/documentation/man"
-+  cmake_doc_dir="/documentation/doc/cmake-${cmake_version}"
- else
-   cmake_default_prefix="/usr/local"
- fi

dev-vcs/fossil/fossil-1.22_fossil

@@ -1,26 +0,0 @@
-DESCRIPTION="Simple, high-reliability, distributed software configuration management" 
-HOMEPAGE="http://www.fossil-scm.org/" 
-SRC_URI="fossil+http://www.fossil-scm.org/"
-#CHECKSUM_MD5=""
-REVISION="3"
-STATUS_HAIKU="stable"
-DEPEND=""
-
-BUILD()
-{
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
-	make
-}
-
-INSTALL()
-{
-	make install
-}
-
-TEST()
-{
-	make test
-}
-
-LICENSE="BSD (2-clause)"
-COPYRIGHT="2007 D. Richard Hipp"

dev-vcs/subversion/subversion-1.7.xx_svn

@@ -1,30 +0,0 @@
-DESCRIPTION="Subversion is an open source version control system" 
-HOMEPAGE="http://subversion.apache.org" 
-SRC_URI="svn+http://svn.apache.org/repos/asf/subversion/trunk"
-#CHECKSUM_MD5=""
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-BUILD()
-{
-	cd subversion-1.7.xx-svn
-	libtoolize --force --copy --install
-	aclocal -I build -I build/ac-macros
-	autoconf
-	./autogen.sh
-	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
-	--with-apr=`finddir B_COMMON_BIN_DIRECTORY`/apr-1-config \
-	--with-apr-util=`finddir B_COMMON_BIN_DIRECTORY`/apu-1-config \
-	--with-neon=/boot/common \
-	--with-editor=nano \
-	--with-zlib=/boot/common
-	make
-}
-
-INSTALL()
-{
-	cd subversion-1.7.xx-svn
-	make install
-}
-LICENSE="Apache-Subversion"
-COPYRIGHT="2010 The Apache Software Foundation"

haiku-apps/armyknife/armyknife-999_git

@@ -1,21 +0,0 @@
-DESCRIPTION="ArmyKnife is an application that lets you edit the metadata of audio files." 
-HOMEPAGE="http://dev.osdrawer.net/projects/armyknife" 
-SRC_URI="git+https://github.com/scottmc/ArmyKnife.git"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="media-libs/taglib >= 1.6.3"
-#CHECKSUM_MD5=""
-BUILD()
-{
-	cd armyknife-999-git
-	make
-}
-
-INSTALL()
-{
-	cd armyknife-999-git
-	make zipfile
-	mkdir -p ${DESTDIR}/boot/apps
-	unzip release/ArmyKnife-*.zip -d ${DESTDIR}/boot/apps
-}
-

haiku-apps/burnitnow/burnitnow-2_svn

@@ -1,26 +0,0 @@
-DESCRIPTION="BurnItNow - GUI CD burning app for Haiku" 
-HOMEPAGE="http://dev.osdrawer.net/projects/burnitnow" 
-SRC_URI="svn+http://svn.osdrawer.net/burnitnow/trunk"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="dev-util/cmake >= 2.8.0
-	app-cdr/cdrtools > 3.00"
-#CHECKSUM_MD5=""
-BUILD()
-{
-	cd burnitnow-2-svn
-	cmake .
-	make
-}
-
-INSTALL()
-{
-       cd burnitnow-2-svn
-       mkdir -p ${DESTDIR}/boot/apps/BurnItNow
-       cp -a BurnItNow ${DESTDIR}/boot/apps/BurnItNow
-       if [ -z ${DESTDIR} ];then
-               find /boot/apps/BurnItNow -type d -name ".svn" | xargs rm -rf
-       fi
-}
-LICENSE="MIT"
-COPYRIGHT="Copyright 2010-2011 BurnItNow Team"

haiku-apps/burnitnow/burnitnow-beta6_git

@@ -1,35 +0,0 @@
-DESCRIPTION="BurnItNow - GUI CD burning app for Haiku" 
-HOMEPAGE="http://github.com/scottmc/burnitnow" 
-SRC_URI="git://github.com/scottmc/BurnItNow.git"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="app-cdr/cdrtools > 3.00"
-#CHECKSUM_MD5=""
-
-BUILD()
-{
-	cd burnitnow-beta6-git/legacy
-	cmake .
-	make
-}
-
-INSTALL()
-{
-	cd burnitnow-beta6-git/legacy
-	BURNITNOWDIR=${DESTDIR}/`finddir B_APPS_DIRECTORY`/BurnItNow
-	mkdir -p ${BURNITNOWDIR}/Docs
-	cp -a BurnItNow ${BURNITNOWDIR}
-	cp -a LICENSE ${BURNITNOWDIR}/LICENSE
-	cp -a TODO ${BURNITNOWDIR}/TODO
-	cp -a README ${BURNITNOWDIR}/README
-	cp -a AUTHORS ${BURNITNOWDIR}/AUTHORS
-	cp -a Changes ${BURNITNOWDIR}/Changes
-	cp -a Docs ${BURNITNOWDIR}/
-	if [ -z ${DESTDIR} ];then
-		find /boot/apps/BurnItNow -type d -name ".svn" | xargs rm -rf
-	fi
-}
-
-LICENSE="MIT"
-COPYRIGHT="2000-2002 Johan Nilsson
-	2010-2013 BurnItNow Maintainers"

haiku-apps/haikutwitter/haikutwitter-1.0_svn

@@ -1,20 +0,0 @@
-DESCRIPTION="Twitter client for Haiku OS"
-HOMEPAGE="http://code.google.com/p/haikutwitter/"
-SRC_URI="svn+http://haikutwitter.googlecode.com/svn/trunk/HaikuTwitter"
-REVISION="1"
-STATUS_HAIKUE="broken"
-MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building."
-DEPEND="net-misc/curl >= 7.26.0"
-BUILD()
-{
-	cd haikutwitter-1.0-svn
-	make
-}
-
-INSTALL()
-{
-	cd haikutwitter-1.0-svn
-	make install
-}
-LICENSE="MIT"
-COPYRIGHT="2010-2012 Martin Hebnes Pedersen"