Merged haikuports/haikuports into master

.hgignore

@@ -0,0 +1,6 @@
+syntax: glob
+
+packages
+repository
+*/*/download
+*/*/work-*

FormatVersions

@@ -0,0 +1,2 @@
+# contains the format versions used by this ports tree
+RecipeFormatVersion=1

app-admin/keepassx/additional-files/keepassx.rdef

@@ -0,0 +1,62 @@
+
+resource app_flags B_SINGLE_LAUNCH | B_ARGV_ONLY;
+
+resource app_version {
+	major  = 2,
+	middle = 0,
+	minor  = 0,
+
+	variety = B_APPV_ALPHA,
+	internal = 5,
+
+	short_info = "Qt password manager",
+	long_info = ""
+};
+
+resource app_signature "application/x-vnd.keepassx";
+
+resource file_types message;
+
+resource vector_icon {
+	$"6E6369660404007F050005FF0200060240810E3D757BBD7874408335CB76E94C"
+	$"216A00226E23FF63AB3A0A0216B40BCB63B40BCB63B40BCB63B46ECB70B46ECB"
+	$"70B4EFCB9DB548CB85B4D5CB85B548CB85B8DCCB80B8DCCB80B91ECB8130CAD0"
+	$"B932CB00BA04CA25BAE7C959BA57C9B3BAE7C959BD80C944BD80C944BE02C943"
+	$"BEC6C8BCBEC6C940BEC6C8BCBF65C858BF65C858BF65C858C219CB19C219CB19"
+	$"C245CB46C2BECB6CC280CB61C2BECB6CC339CB8CC339CB8CC483CB89C71DCB73"
+	$"C594CB75C79FCB73C809CAC9C7B9CB37C7EBC943C7EDC638C7FAC74CC7E4C5F6"
+	$"C79AC587C7C9C5B7C6DFC4C8C4D9C289C594C348C6C0C206C979C019C840C128"
+	$"CAB3BF0BCB8DBBC8CB8DBDBECB8D32CADBB78ECB7CB8C2CAD9B78BCAD7B786CA"
+	$"D9B788C8B0B76FB40BCB63AFA4CB42B40BCB63021CC3F6B334C3F6B334BFF3B3"
+	$"34BC9ABA9DBCA5B687BB4AB948B8B0B69CB9FAB7F2B882B66BB7FCB64FB83FB6"
+	$"4FB7FCB64FB430B64FB430B64FB3ADB64FB335B74FB335B6C9B335B74FB335BB"
+	$"36B335BB36B335BB7AB380BBEDB351BBBEB51ABD8AB848C0CCB6AFBF2BB848C0"
+	$"CCB37EC5ADB37EC5ADB350C5DCB335C660B335C61EB335C660B335CA3DB335CA"
+	$"3DB335CAC3B430CB3DB3ADCB3DB430CB3DB804CB3DB804CB3DB847CB3DB8B8CA"
+	$"F0B889CB21B95ECA43BAB457BA09C997BAB457BD5857BD5857BDDB57BE53C7EB"
+	$"BE53C871BE53C7EBBE53C6F3BE53C6F3BE53C6F3C23FCAF2C23FCAF2C26ECB21"
+	$"C2F1CB3DC2AFCB3DC2F1CB3DC6C3CB3DC6C3CB3DC747CB3DC7BECA3DC7BECAC3"
+	$"C7BECA3DC7BEC660C7BEC660C7BEC61EC775C5ADC7A3C5DCC652C484C40CC230"
+	$"C52FC35AC80D46CB4FBAB1CB4FBEC7CB4FB694C3F6B334C7FFB334C3F6B33406"
+	$"17FFF3F7F4FC3FC3F6B433C3F6B433C075B433BD93BAB1BD93B71EBD93BB54BD"
+	$"DEBC82BDB3BBEEBDDEBC82BD7ABCE9BD7ABCE9BBA7BB09B7FCB74FB9CCB931B7"
+	$"FCB74FB430B430BB36B430BB36B606BD10B9ABC0CAB7D8BEEEB7D8C2A7B430C6"
+	$"60B604C483B430C660CA3DB804CA3DB804CA3DB8C5C975BA4BC7EBB989C8B0BA"
+	$"4BC7EBBD58C4DDBDABC4DDBDABC4DDBF6DC6A8C2F1CA3DC12FC872C2F1CA3DC6"
+	$"C3C6C3C660C6C3C660C4F0C483C14AC0CAC31DC2A7C14AC0CAC16CC0A8C16CC0"
+	$"A8C234C100C3F6C133C310C133C778C133CA54BAB1CA54BE43CA54B71FC3F6B4"
+	$"33C776B433C3F6B4330603378000C34B8000C3488000C34BC34F8000C34F8000"
+	$"C34F8000C34C0603338000B0028000AD1E8000B00280008000AFFE8000AFFE80"
+	$"00AA520617BF928684E43FC3F6B591C3F6B591C12DB591BEEABAB1BEEAB7DBBE"
+	$"EABB79BF65BCE1BF17BC37BF65BCE1BD7ABED5B76EB8ACB587BAA5BB8FC0CAB5"
+	$"87C6EFC8E0B776B9BCC68FBC03C380BE38C37EC8E0C56DC6EFBF65C0CAC12BBE"
+	$"FBC12BBEFBC1F8BF85C3F6BFD6C2EEBFD6C6BEBFD6C8FEBAB1C8FEBD87C8FEB7"
+	$"DBC3F6B591C6BEB591C3F6B5910204C7AABA18C7AAB8D1C7AA35C582BC68C6B3"
+	$"BC68C451BC68C35ABA18C35A35C35AB8D1C5822CC4512CC6B32C0204C7AABA18"
+	$"C7AAB8D1C7AA35C582BC68C6B3BC68C451BC68C35ABA18C35A35C35AB8D1C582"
+	$"2CC4512CC6B32C0204C710B9C8C710B8DCC710BAB3C56BBB73C654BB73C482BB"
+	$"73C3C5B9C8C3C5BAB3C3C5B8DCC56BB81DC482B81DC654B81D0204C710B9C8C7"
+	$"10B8DCC710BAB3C56BBB73C654BB73C482BB73C3C5B9C8C3C5BAB3C3C5B8DCC5"
+	$"6BB81DC482B81DC654B81D080A000100000A010101000A0203020304000A0301"
+	$"05000A010106000A0101071001178000040A020108000A010109100117800004"
+};

app-admin/keepassx/keepassx-2.0a5.recipe

@@ -0,0 +1,85 @@
+SUMMARY="Qt password manager"
+DESCRIPTION="
+KeePassX is an application for people with extremly high demands on secure \
+personal data management. It has a light interface, is cross platform and \
+published under the terms of the GNU General Public License.
+KeePassX saves many different information e.g. user names, passwords, urls, \
+attachments and comments in one single database. For a better management \
+user-defined titles and icons can be specified for each single entry. \
+Furthermore the entries are sorted in groups, which are customizable as well. \
+The integrated search function allows to search in a single group or the \
+complete database.
+KeePassX offers a little utility for secure password generation. The password \
+generator is very customizable, fast and easy to use. Especially someone who \
+generates passwords frequently will appreciate this feature.
+"
+HOMEPAGE="http://www.keepassx.org/"
+SRC_URI="git+https://github.com/keepassx/keepassx.git#2.0-alpha5"
+COPYRIGHT="
+	2010-2012, Felix Geyer
+	2011-2012, Florian Geyer
+	2012, Tobias Tangemann
+	2007, Trolltech ASA
+	2012, Intel Corporation
+	2012, Nokia Corporation and/or its subsidiary(-ies)
+	2000-2008, Tom Sato
+	"
+
+LICENSE="GNU GPL v2"
+REVISION="2"
+ARCHITECTURES="x86"
+
+PROVIDES="
+	keepassx = $portVersion
+	app:keepassx = $portVersion
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	lib:libgcrypt
+	lib:libQtCore
+	lib:libQtGui
+	lib:libz
+	"
+
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	devel:libz
+	devel:libgcrypt
+	devel:libQtCore
+	devel:libQtGui
+	"
+
+BUILD_PREREQUIRES="
+	cmd:cmake
+	cmd:make
+	cmd:g++
+	cmd:qmake
+	cmd:moc
+	cmd:xres
+	"
+
+PATCHES="keepassx-2.0a5.patchset"
+
+BUILD()
+{
+	cmake -DCMAKE_INSTALL_PREFIX=$prefix \
+	-DCMAKE_INSTALL_DATAROOTDIR=$dataDir \
+	-DWITH_TESTS=off .
+
+	make $jobArgs
+
+    rc $portDir/additional-files/keepassx.rdef \
+        -o $sourceDir/src/keepassx.rsrc
+
+    xres -o $sourceDir/src/keepassx $sourceDir/src/keepassx.rsrc
+    mimeset -f $sourceDir/src/keepassx
+}
+
+INSTALL()
+{
+	make install
+	mkdir -p $appsDir
+	mv $binDir/keepassx $appsDir/KeePassX
+	addAppDeskbarSymlink $appsDir/KeePassX KeePassX
+}

app-admin/keepassx/patches/keepassx-2.0a5.patchset

@@ -0,0 +1,103 @@
+From a31497e5c3979dcbe76dd3df98db191506f6f26e Mon Sep 17 00:00:00 2001
+From: Chris Roberts <cpr420@gmail.com>
+Date: Thu, 28 Nov 2013 01:27:03 -0700
+Subject: Add Haiku support
+
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3ec6023..1acfb25 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -148,7 +148,7 @@ if(WITH_TESTS)
+ endif(WITH_TESTS)
+ 
+ set(QT_REQUIRED_MODULES QtCore QtGui QtTest)
+-if(UNIX AND NOT APPLE)
++if(UNIX AND NOT APPLE AND NOT HAIKU)
+   set(QT_REQUIRED_MODULES ${QT_REQUIRED_MODULES} QtDBus)
+ endif()
+ 
+diff --git a/share/CMakeLists.txt b/share/CMakeLists.txt
+index 06b6a52..930a0cd 100644
+--- a/share/CMakeLists.txt
++++ b/share/CMakeLists.txt
+@@ -17,11 +17,11 @@ file(GLOB DATABASE_ICONS icons/database/*.png)
+ 
+ install(FILES ${DATABASE_ICONS} DESTINATION ${DATA_INSTALL_DIR}/icons/database)
+ 
+-if(UNIX AND NOT APPLE)
++if(UNIX AND NOT APPLE AND NOT HAIKU)
+     install(DIRECTORY icons/application/ DESTINATION share/icons/hicolor
+             FILES_MATCHING PATTERN "keepassx.png" PATTERN "keepassx.svgz")
+     install(FILES linux/keepassx.desktop DESTINATION share/applications)
+-endif(UNIX AND NOT APPLE)
++endif(UNIX AND NOT APPLE AND NOT HAIKU)
+ 
+ if(APPLE)
+   install(FILES macosx/keepassx.icns DESTINATION ${DATA_INSTALL_DIR})
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 176ecb3..4facf63 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -216,7 +216,7 @@ target_link_libraries(${PROGNAME}
+                       ${GCRYPT_LIBRARIES}
+                       ${ZLIB_LIBRARIES})
+ 
+-if(UNIX AND NOT APPLE)
++if(UNIX AND NOT APPLE AND NOT HAIKU)
+   target_link_libraries(${PROGNAME} ${QT_QTDBUS_LIBRARY})
+ endif()
+ 
+diff --git a/src/config-keepassx.h.cmake b/src/config-keepassx.h.cmake
+index 479a5f6..0841d21 100644
+--- a/src/config-keepassx.h.cmake
++++ b/src/config-keepassx.h.cmake
+@@ -9,6 +9,8 @@
+ 
+ #define KEEPASSX_PLUGIN_DIR "${PLUGIN_INSTALL_DIR}"
+ 
++#define KEEPASSX_DATA_DIR "${DATA_INSTALL_DIR}"
++
+ #cmakedefine HAVE_PR_SET_DUMPABLE 1
+ #cmakedefine HAVE_RLIMIT_CORE 1
+ #cmakedefine HAVE_PT_DENY_ATTACH 1
+diff --git a/src/core/FilePath.cpp b/src/core/FilePath.cpp
+index dd300ec..968269f 100644
+--- a/src/core/FilePath.cpp
++++ b/src/core/FilePath.cpp
+@@ -137,6 +137,10 @@ FilePath::FilePath()
+     else if (testSetDir(QCoreApplication::applicationDirPath() + "/share")) {
+     }
+ #endif
++#ifdef KEEPASSX_DATA_DIR
++    else if (testSetDir(QString(KEEPASSX_DATA_DIR))) {
++    }
++#endif
+ 
+     if (m_dataPath.isEmpty()) {
+         qWarning("FilePath::DataPath: can't find data dir");
+diff --git a/src/gui/Clipboard.cpp b/src/gui/Clipboard.cpp
+index eb77d2b..958eacb 100644
+--- a/src/gui/Clipboard.cpp
++++ b/src/gui/Clipboard.cpp
+@@ -21,7 +21,7 @@
+ #include <QClipboard>
+ #include <QTimer>
+ 
+-#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
++#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC) && !defined(Q_OS_HAIKU)
+ #include <QDBusConnection>
+ #include <QDBusMessage>
+ #endif
+@@ -70,7 +70,7 @@ void Clipboard::clearClipboard()
+         clipboard->clear(QClipboard::Selection);
+     }
+ 
+-#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
++#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC) && !defined(Q_OS_HAIKU)
+     QDBusMessage message = QDBusMessage::createMethodCall("org.kde.klipper", "/klipper", "", "clearClipboardHistory");
+     QDBusConnection::sessionBus().send(message);
+ #endif
+-- 
+1.8.3.4
+

app-admin/pwgen/pwgen-2.06.recipe

@@ -1,19 +1,59 @@
-DESCRIPTION="pwgen - password generator" 
+SUMMARY="pwgen - password generator"
+DESCRIPTION="
+The pwgen program generates passwords which are designed to be easily \
+memorized by humans, while being as secure as possible. Human- memorable \
+passwords are never going to be as secure as completely completely random \
+passwords. In particular, passwords generated by pwgen without the -s option \
+should not be used in places where the password could be attacked via an \
+off-line brute-force attack. On the other hand, completely randomly generated \
+passwords have a tendency to be written down, and are subject to being \
+compromised in that fashion.
+The pwgen program is designed to be used both interactively, and in shell \
+scripts. Hence, its default behavior differs depending on whether the standard \
+output is a tty device or a pipe to another program. Used interactively, pwgen \
+will display a screenful of passwords, allowing the user to pick a single \
+password, and then quickly erase the screen. This prevents someone from being \
+able to 'shoulder surf' the user's chosen password.
+"
 HOMEPAGE="http://sourceforge.net/projects/pwgen" 
-SRC_URI="http://voxel.dl.sourceforge.net/sourceforge/pwgen/pwgen-2.06.tar.gz"
-CHECKSUM_MD5="935aebcbe610fbc9de8125e7b7d71297"
+SRC_URI="http://sourceforge.net/projects/pwgen/files/pwgen/2.06/pwgen-2.06.tar.gz"
+CHECKSUM_SHA256="61598c9e3a0f7eb2e7367d4ecc71522c4f16a7d41ed31db29e3afee8d9843454"
 REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
+ARCHITECTURES="x86 x86_gcc2 x86_64"
+COPYRIGHT="2001-2006 by Theodore Ts'o
+	2001-2003  Christophe Devine
+	2005 by Olivier Guerrier
+	"
+
+LICENSE="GNU GPL v2"
+
+PROVIDES="
+	pwgen = $portVersion
+	cmd:pwgen = $portVersion
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	"
+
+BUILD_PREREQUIRES="
+	cmd:autoconf
+	cmd:make
+	cmd:gcc
+	"
+
 BUILD()
 {
-	cd pwgen-2.06
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
+	autoconf
+	runConfigure ./configure
 	make
 }
 
 INSTALL()
 {
-	cd pwgen-2.06
 	make install
 }

app-arch/arc/arc-5.21o.recipe

@@ -1,23 +0,0 @@
-DESCRIPTION="Create & extract files from DOS .ARC files" 
-HOMEPAGE="http://arc.sourceforge.net/" 
-SRC_URI="http://sunet.dl.sourceforge.net/project/arc/arc/arc-5.21o/arc-5.21o.tgz"
-CHECKSUM_MD5="3b30c739b42b2fe8ac4ec0a05f34f284"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-BUILD()
-{
-	cd arc-5.21o
-	make
-}
-
-INSTALL()
-{
-	cd arc-5.21o
-	install arc --prefix={$DESTDIR}`finddir B_COMMON_DIRECTORY`
-	install marc --prefix={$DESTDIR}`finddir B_COMMON_DIRECTORY`
-	install arc.1 {$DESTDIR}`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man/man1
-}
-
-LICENSE="GNU GPL v2"
-COPYRIGHT="1985-2009 Thom Henderson"

app-arch/arc/arc-5.21p.recipe

@@ -0,0 +1,45 @@
+SUMMARY="Create & extract files from DOS .ARC files"
+DESCRIPTION="
+Create & extract files from DOS .ARC files
+"
+HOMEPAGE="http://arc.sourceforge.net/" 
+LICENSE="GNU GPL v2"
+COPYRIGHT="1985-2009 Thom Henderson"
+SRC_URI="http://sourceforge.net/projects/arc/files/arc/arc-5.21p/arc-5.21p.tar.gz"
+CHECKSUM_SHA256="eacf870a245f155a4ba8c6f8e0fbb2e8a267aafa157f56ba7a8cb1d74fd8b5a1"
+REVISION="1"
+ARCHITECTURES="x86 ?x86_gcc2 ?x86_64"
+
+PATCHES="arc-5.21p.patchset"
+
+PROVIDES="
+	arc = $portVersion
+	cmd:arc = $portVersion
+	cmd:marc = $portVersion
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	"
+
+BUILD_REQUIRES="
+	cmd:make
+	cmd:gcc
+	"
+
+BUILD()
+{
+	make
+}
+
+INSTALL()
+{
+	mkdir -p $binDir
+	cp -af arc marc $binDir
+	mkdir -p $manDir/man1
+	cp -af arc.1 marc.1 $manDir/man1
+}

app-arch/arc/patches/arc-5.21o.patch

@@ -1,131 +0,0 @@
-diff -Naur arc-5.21o.orig/Makefile arc-5.21o/Makefile
---- arc-5.21o.orig/Makefile	2009-11-23 21:01:04.000000000 +0000
-+++ arc-5.21o/Makefile	2009-11-23 21:59:58.000000000 +0000
-@@ -38,14 +38,14 @@
- #SYSTEM = -DBSD=1
- SYSTEM = -DSYSV=1
- 
--OPT = -O
-+OPT = -O2 -DNEED_ALPHASORT 
- # For MWC 3.0 on the Atari ST, use:
- #CFLAGS = -VCOMPAC -VPEEP
- CFLAGS = $(OPT) $(SYSTEM)
- 
- # GNU's gcc is very nice, if you've got it. Otherwise just cc.
- #CC = cgcc -mshort -mbaserel
--CC = cc
-+#CC = cc
- 
- # tmclock is only needed on Unix systems...
- TMCLOCK = tmclock.o
-diff -Naur arc-5.21o.orig/arcdos.c arc-5.21o/arcdos.c
---- arc-5.21o.orig/arcdos.c	2009-11-23 21:01:04.000000000 +0000
-+++ arc-5.21o/arcdos.c	2009-11-23 21:26:18.000000000 +0000
-@@ -33,7 +33,7 @@
- #if	BSD
- #include <sys/time.h>
- #else	
--#include <time.h>		/* Sys V. Bleah. */
-+#include <sys/time.h>		/* Sys V. Bleah. */
- #if	NEED_TIMEVAL
- struct	timeval {
- 	long	tv_sec;
-diff -Naur arc-5.21o.orig/arcmisc.c arc-5.21o/arcmisc.c
---- arc-5.21o.orig/arcmisc.c	2009-11-23 21:01:04.000000000 +0000
-+++ arc-5.21o/arcmisc.c	2009-11-23 22:22:03.000000000 +0000
-@@ -8,6 +8,8 @@
- #include "arc.h"
- 
- #include <string.h>
-+#include <dirent.h>
-+#include <errno.h>
- #if	BSD
- #include <strings.h>
- #endif
-@@ -211,6 +213,73 @@
- 
- #endif
- 
-+#if UNIX
-+
-+#define DIRSIZ(d) (sizeof(struct dirent) + strlen(d->d_name) + 1)
-+#define INITIAL_SIZE 30
-+
-+int
-+scandir(name, dirlist, selector, sorter)
-+        const char      *name;
-+        struct dirent   ***dirlist;
-+        int             (*selector)();
-+        int             (*sorter)();
-+{
-+        static struct dirent *E;
-+        struct dirent   **names;
-+        DIR             *Dp;
-+        int             i;
-+        int             size = INITIAL_SIZE;
-+
-+        if (!(names = (struct dirent **) malloc(size * sizeof names[0])) ||
-+             access(name, R_OK | X_OK) || !(Dp = opendir(name)))
-+                return -1;
-+
-+        /* Read entries in the directory. */
-+
-+        for (i = 0; (E = readdir(Dp)); )
-+                if (selector == NULL || (*selector)(E))
-+        {
-+                /* User wants them all, or he wants this one. */
-+                if (++i >= size)
-+                {
-+                        size <<= 1;
-+                        names = (struct dirent **) realloc(names,
-+                                                size * sizeof names[0]);
-+                        if (names == NULL)
-+                        {
-+                                closedir(Dp);
-+                                free(&names);
-+                                return(-1);
-+                        }
-+                }
-+
-+                /* Copy the entry. */
-+                names[i - 1] = (struct dirent *) malloc(DIRSIZ(E));
-+                if (names[i - 1] == NULL)
-+                {
-+                        closedir(Dp);
-+                        free(&names);
-+                        return(-1);
-+                }
-+                strcpy(names[i - 1]->d_name, E->d_name);
-+        }
-+
-+        /* Close things off. */
-+        names = (struct dirent **) realloc(names,
-+                                        (i + 1) * sizeof names[0]);
-+        names[i] = 0;
-+        *dirlist = names;
-+        closedir(Dp);
-+
-+        /* Sort? */
-+        if (i && sorter)
-+                qsort((char *)names, i, sizeof names[0], sorter);
-+
-+        return i;
-+}
-+#endif
-+
- VOID
- upper(string)
- 	char           *string;
-@@ -309,9 +378,10 @@
- 	static char   **NameList;
- 	static char	namecopy[STRLEN], *dirname;
- #if	UNIX
--	int             alphasort();
--	int             scandir();
-+	//int             alphasort();
-+	//int             scandir();
- #endif				/* UNIX */
-+
- 	int             fmatch();
- 	static int      Nnum = 0, ii;
- 

app-arch/arc/patches/arc-5.21p.patchset

@@ -0,0 +1,45 @@
+From 6a8719729899cb89bdd1ae5602ab882eb832644e Mon Sep 17 00:00:00 2001
+From: Chris Roberts <cpr420@gmail.com>
+Date: Sun, 24 Nov 2013 18:37:38 -0700
+Subject: Minor Haiku fixes
+
+
+diff --git a/Makefile b/Makefile
+index c6273d0..d4b6a86 100644
+--- a/Makefile
++++ b/Makefile
+@@ -39,9 +39,9 @@ PROG =
+ # (See the Sysvarcstuf shar file)
+ #SYSTEM = -DGEMDOS=1 -fstrength-reduce -fomit-frame-pointer -finline-functions -fdefer-pop -mpcrel
+ #SYSTEM = -DBSD=1
+-SYSTEM = -DSYSV=1
++SYSTEM = -DSYSV=1 -DHAIKU=1
+ 
+-OPT = -O -Wall
++OPT = -O2 -Wall
+ # For MWC 3.0 on the Atari ST, use:
+ #CFLAGS = -VCOMPAC -VPEEP
+ CFLAGS = $(OPT) $(SYSTEM)
+@@ -137,4 +137,4 @@ install: all
+ 	install -s -m 0755 -D marc $(DESTDIR)$(PREFIX)/bin/marc
+ 	install -m 0644 -D arc.1 $(DESTDIR)$(PREFIX)/share/man/man1/arc.1
+ 	install -m 0644 -D marc.1 $(DESTDIR)$(PREFIX)/share/man/man1/marc.1
+-	 	
+\ No newline at end of file
++	 	
+diff --git a/arcdos.c b/arcdos.c
+index a47e6f1..4743ac3 100644
+--- a/arcdos.c
++++ b/arcdos.c
+@@ -30,7 +30,7 @@
+ #if	UNIX
+ #include <sys/types.h>
+ #include <sys/stat.h>
+-#if	BSD
++#if	BSD || HAIKU
+ #include <sys/time.h>
+ #else	
+ #include <time.h>		/* Sys V. Bleah. */
+-- 
+1.8.3.4
+

app-arch/bzip2/bzip2-1.0.6.recipe

@@ -1,15 +1,27 @@
 SUMMARY="bzip2 data compression utilities and libraries"
-DESCRIPTION="bzip2 is a freely available, patent free (see below), high-quality data compressor. It typically compresses files to within 10% to 15% of the best available techniques (the PPM family of statistical compressors), whilst being around twice as fast at compression and six times faster at decompression."
+DESCRIPTION="
+bzip2 is a patent free, high-quality data compressor. It typically compresses \
+files to within 10% to 15% of the best available techniques (the PPM family of \
+statistical compressors), whilst being around twice as fast at compression and \
+six times faster at decompression. bzip2 supports recovery from media errors \
+as well. Its command line flags are similar to those of GNU Gzip.
+"
 HOMEPAGE="http://www.bzip.org/"
 LICENSE="bzip2"
 COPYRIGHT="1996-2010 Julian R Seward"
 SRC_URI="http://www.bzip.org/1.0.6/bzip2-1.0.6.tar.gz"
-CHECKSUM_MD5="00b516f4704d4a7cb50a1d97e6e8e15b"
-REVISION="4"
-ARCHITECTURES="x86_gcc2 x86 x86_64"
+CHECKSUM_SHA256="a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e2909dc61d9cd"
+REVISION="5"
+ARCHITECTURES="x86_gcc2 x86 x86_64 arm"
+SECONDARY_ARCHITECTURES="x86 x86_gcc2"
 
 PROVIDES="
-	bzip2 = $portVersion compat >= 1
+	bzip2$secondaryArchSuffix = $portVersion compat >= 1
+	lib:libbz2$secondaryArchSuffix = $portVersion compat >= 1.0
+	"
+
+if [ -z "$secondaryArchSuffix" ]; then
+PROVIDES="$PROVIDES
 	cmd:bzcat = $portVersion compat >= 1
 	cmd:bzcmp = $portVersion compat >= 1
 	cmd:bzdiff = $portVersion compat >= 1
@@ -21,23 +33,23 @@ PROVIDES="
 	cmd:bzless = $portVersion compat >= 1
 	cmd:bzmore = $portVersion compat >= 1
 	cmd:bunzip2 = $portVersion compat >= 1
-	lib:libbz2 = $portVersion compat >= 1.0
 	"
+fi
+
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku$secondaryArchSuffix >= $haikuVersion
 	"
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
 	cmd:ar
-	cmd:gcc
-	cmd:ld
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
 	cmd:make
 	cmd:sed
 	"
 
-SOURCE_DIR="$portVersionedName"
 
 BUILD()
 {
@@ -50,8 +62,16 @@ INSTALL()
 {
 	make install PREFIX=$prefix
 
+	mkdir -p $libDir
+
+	#move the static library to the right dir for secondary arch builds
+	if [ -n "$secondaryArchSuffix" ];then
+		mv $prefix/lib/libbz2.a $libDir
+	fi
+
 	# also install shared lib
-	cp -a libbz2.so.1.0.6 libbz2.so.1.0 $libDir
+	ln -sf libbz2.so.1.0.6 libbz2.so
+	cp -a libbz2.so.1.0.6 libbz2.so.1.0 libbz2.so $libDir
 
 	# move man pages
 	mkdir -p $manDir
@@ -70,14 +90,20 @@ INSTALL()
 	# devel package
 	packageEntries devel \
 		$developDir
+
+	#remove bin commands and man pages when building for secondary arch
+	if [ -n "$secondaryArchSuffix" ];then
+		rm -rf $prefix/bin
+		rm -rf $manDir
+	fi
 }
 
 # ----- devel package -------------------------------------------------------
 
 PROVIDES_devel="
-	bzip2_devel = $portVersion compat >= 1
-	devel:libbz2 = $portVersion compat >= 1.0
+	bzip2${secondaryArchSuffix}_devel = $portVersion compat >= 1
+	devel:libbz2$secondaryArchSuffix = $portVersion compat >= 1.0
 	"
 REQUIRES_devel="
-	bzip2 == $portVersion base
+	bzip2$secondaryArchSuffix == $portVersion base
 	"

app-arch/cabextract/cabextract-1.2.recipe

@@ -1,21 +0,0 @@
-DESCRIPTION="A program to extract Microsoft Cabinet Files." 
-HOMEPAGE="http://www.cabextract.org.uk" 
-SRC_URI="http://www.cabextract.org.uk/cabextract-1.2.tar.gz"
-CHECKSUM_MD5="dc421a690648b503265c82ade84e143e"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-BUILD()
-{
-	cd cabextract-1.2
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
-	make
-}
-
-INSTALL()
-{
-	cd cabextract-1.2
-	make install
-}
-LICENSE="GNU GPL v2"
-COPYRIGHT="2000-2006 Stuart Caie"

app-arch/cabextract/cabextract-1.3.recipe

@@ -1,21 +0,0 @@
-DESCRIPTION="A program to extract Microsoft Cabinet Files." 
-HOMEPAGE="http://www.cabextract.org.uk" 
-SRC_URI="http://www.cabextract.org.uk/cabextract-1.3.tar.gz"
-CHECKSUM_MD5="cb9a4a38470d2a71a0275968e7eb64d3"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-BUILD()
-{
-	cd cabextract-1.3
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
-	make
-}
-
-INSTALL()
-{
-	cd cabextract-1.3
-	make install
-}
-LICENSE="GNU GPL v2"
-COPYRIGHT="2000-2010 Stuart Caie"

app-arch/cabextract/cabextract-1.4.recipe

@@ -0,0 +1,43 @@
+SUMMARY="A program to extract Microsoft Cabinet Files"
+DESCRIPTION="
+cabextract is Free Software for extracting Microsoft cabinet files, also \
+called .CAB files. cabextract is distributed under the GPL license. It is \
+based on the portable LGPL libmspack library. cabextract supports all special \
+features and all compression formats of Microsoft cabinet files.
+"
+HOMEPAGE="http://www.cabextract.org.uk" 
+LICENSE="GNU GPL v2"
+COPYRIGHT="2000-2011 Stuart Caie"
+SRC_URI="http://www.cabextract.org.uk/cabextract-1.4.tar.gz"
+CHECKSUM_SHA256="f7ba8ba2c2d71912846eaaa2bed9200a7722ef0addeec32db7471c350a48e41e"
+REVISION="1"
+ARCHITECTURES="x86 ?x86_gcc2 ?x86_64"
+
+PROVIDES="
+	cabextract = $portVersion
+	cmd:cabextract = $portVersion
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	"
+
+BUILD_PREREQUIRES="
+	cmd:make
+	cmd:gcc
+	"
+
+BUILD()
+{
+	runConfigure ./configure
+	make
+}
+
+INSTALL()
+{
+	make install
+}

app-arch/cpio/cpio-2.10.recipe

@@ -1,32 +1,71 @@
-DESCRIPTION="GNU cpio copies files into or out of a cpio or tar archive. The archive can be another file on the disk, a magnetic tape, or a pipe." 
-HOMEPAGE="http://www.gnu.org/software/cpio/cpio.html" 
+SUMMARY="GNU cpio copies files into or out of a cpio or tar archive"
+DESCRIPTION="
+GNU cpio copies files into or out of a cpio or tar archive. \
+The archive can be another file on the disk, a magnetic tape, or a pipe.
+
+GNU cpio supports the following archive formats: binary, old ASCII, \
+new ASCII, crc, HPUX binary, HPUX old ASCII, old tar, and POSIX.1 tar. \
+The tar format is provided for compatability with the tar program. \
+By default, cpio creates binary format archives, for compatibility \
+with older cpio programs. When extracting from archives, cpio automatically \
+recognizes which kind of archive it is reading and can read archives created \
+on machines with a different byte-order.
+"
+HOMEPAGE="http://www.gnu.org/software/cpio/cpio.html"
+COPYRIGHT="1988-2009 Free Software Foundation, Inc."
+LICENSE="GNU GPL v3"
 SRC_URI="http://ftp.gnu.org/gnu/cpio/cpio-2.10.tar.gz"
-CHECKSUM_MD5="351ab3d38d8949913e478cc23b9d6ad4"
+CHECKSUM_SHA256="2a2da2dbb741a75b9a374ceca46036ac3f3c3698e3756b9e3cd44edac8536ba5"
 REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
+ARCHITECTURES="x86 ?x86_gcc2"
+
+PATCHES="cpio-2.10.patch"
+
+PROVIDES="
+	cpio = $portVersion
+	cmd:cpio = $portVersion compat >= 2
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	"
+
+BUILD_PREREQUIRES="
+	cmd:awk
+	cmd:make
+	cmd:gcc
+	cmd:ld
+	"
+
+PATCH()
+{
+	sed -i 's/restrict//g' gnu/string.in.h
+}
+
 BUILD()
 {
-	cd cpio-2.10
-	sed -i 's/restrict//g' gnu/string.in.h
-	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
-		infodir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/info \
-		mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \
-		localedir=`finddir B_COMMON_DATA_DIRECTORY`/locale
-	make
+# TODO: The patch already contains a fix for libnetwork not being auto-detected,
+# but rebuilding the build system seems to be severely broken for gnulib (gnu/).
+# Maybe the included gnulib needs to be replaced by a newer version.
+#	libtoolize --force --copy --install
+#	aclocal
+#	autoconf
+	LIBS=-lnetwork runConfigure ./configure
+	make $jobArgs
 }
 
 INSTALL()
 {
-	cd cpio-2.10
 	make install
+
+	rm $libDir/charset.alias
 }
 
 TEST()
 {
-	cd cpio-2.10
 	make check
 }
-
-LICENSE="GNU GPL v3"
-COPYRIGHT="1988-2009 Free Software Foundation, Inc."

app-arch/cpio/cpio-2.11.recipe

@@ -1,5 +1,17 @@
-DESCRIPTION="GNU cpio copies files into or out of a cpio or tar archive. The archive can be another file on the disk, a magnetic tape, or a pipe." 
-HOMEPAGE="http://www.gnu.org/software/cpio/cpio.html" 
+SUMMARY="GNU cpio copies files into or out of a cpio or tar archive"
+DESCRIPTION="
+GNU cpio copies files into or out of a cpio or tar archive. \
+The archive can be another file on the disk, a magnetic tape, or a pipe.
+
+GNU cpio supports the following archive formats: binary, old ASCII, \
+new ASCII, crc, HPUX binary, HPUX old ASCII, old tar, and POSIX.1 tar. \
+The tar format is provided for compatability with the tar program. \
+By default, cpio creates binary format archives, for compatibility \
+with older cpio programs. When extracting from archives, cpio automatically \
+recognizes which kind of archive it is reading and can read archives created \
+on machines with a different byte-order.
+"
+HOMEPAGE="http://www.gnu.org/software/cpio/cpio.html"
 SRC_URI="http://ftp.gnu.org/gnu/cpio/cpio-2.11.tar.gz"
 CHECKSUM_MD5="1112bb6c45863468b5496ba128792f6c"
 REVISION="1"

app-arch/cpio/patches/cpio-2.10.patch

@@ -35,7 +35,7 @@ diff -urN cpio-2.10/gnu/hash.c cpio-2.10-haiku/gnu/hash.c
    char *dirpath;		/* A copy we can scribble NULs on.  */
    struct stat stats;
    int retval = 0;
-+  char *slash;  
++  char *slash;
    mode_t tmpmode;
    mode_t invert_permissions;
    int we_are_root = getuid () == 0;

app-arch/cpio/patches/cpio-2.11.patch

@@ -17,7 +17,7 @@ diff -urN cpio-2.11/src/makepath.c cpio-2.11-haiku/src/makepath.c
    char *dirpath;		/* A copy we can scribble NULs on.  */
    struct stat stats;
    int retval = 0;
-+  char *slash;  
++  char *slash;
    mode_t tmpmode;
    mode_t invert_permissions;
    int we_are_root = getuid () == 0;

app-arch/fastjar/fastjar-0.98.recipe

@@ -1,23 +1,54 @@
-DESCRIPTION="A jar program written in C"
+SUMMARY="A jar(java archive) program written in C"
+DESCRIPTION="
+FastJar is an attempt at creating a feature-for-feature copy of Sun's JDK's \
+'jar' command.  Sun's jar (or Blackdown's for that matter) is written entirely \
+in Java which makes it dog slow.  Since FastJar is written in C, it can create \
+the same .jar file as Sun's tool in a fraction of the time.
+"
 HOMEPAGE="https://savannah.nongnu.org/projects/fastjar"
-SRC_URI="http://mirror.its.uidaho.edu/pub/savannah/fastjar/fastjar-0.98.tar.gz"
-CHECKSUM_MD5="d2d264d343d4d0e1575832cc1023c3bf"
-REVISION="2"
-STATUS_HAIKU="stable"
-DEPEND=""
+LICENSE="GNU GPL v2"
+COPYRIGHT="1999-2001 Bryan Burns, Cory Jon Hollingsworth, Matthias Klose (documentation)
+	2007-2009  Dalibor Topic"
+SRC_URI="http://download.savannah.gnu.org/releases/fastjar/fastjar-0.98.tar.gz"
+CHECKSUM_SHA256="f156abc5de8658f22ee8f08d7a72c88f9409ebd8c7933e9466b0842afeb2f145"
+REVISION="1"
+ARCHITECTURES="x86 ?x86_gcc2 ?x86_64"
+
+PROVIDES="
+	fastjar = $portVersion
+	cmd:fastjar = $portVersion
+	cmd:grepjar = $portVersion
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	lib:libz
+	"
+
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	devel:libz
+	"
+
+BUILD_PREREQUIRES="
+	cmd:autoreconf
+	cmd:autoconf
+	cmd:aclocal
+	cmd:automake
+	cmd:libtoolize
+	cmd:make
+	cmd:gcc
+	"
+
 BUILD()
 {
-	cd fastjar-0.98
 	autoreconf -vfi
-	configure --prefix=`finddir B_COMMON_DIRECTORY`
+	runConfigure ./configure
 	make
 }
 
 INSTALL()
 {
-	cd fastjar-0.98
 	make install
+	rm -rf $libDir
 }
-LICENSE="GNU GPL v2"
-COPYRIGHT="1999-2001 Bryan Burns, Cory Jon Hollingsworth, Matthias Klose (documentation)
-	2007-2009  Dalibor Topic"

app-arch/gzip/gzip-1.2.4a.recipe

@@ -1,5 +1,10 @@
-DESCRIPTION="GNU zip" 
-HOMEPAGE="http://www.gzip.org/" 
+SUMMARY="gzip compression utilities and libraries"
+DESCRIPTION="
+gzip (GNU zip) is a compression utility designed to be a \
+replacement for compress. It provides better compression than compress \
+and although bzip2 produces smaller files is not as fast as bzip2 is.
+"
+HOMEPAGE="http://www.gzip.org/"
 SRC_URI="ftp://ftp.gnu.org/gnu/gzip/gzip-1.2.4a.tar.gz"
 CHECKSUM_MD5="39053e044b18ecd0627f80fbe7cfeaad"
 REVISION="1"

app-arch/gzip/gzip-1.3.12.recipe

@@ -1,5 +1,10 @@
-DESCRIPTION="GNU zip" 
-HOMEPAGE="http://www.gzip.org/" 
+SUMMARY="gzip compression utilities and libraries"
+DESCRIPTION="
+gzip (GNU zip) is a compression utility designed to be a \
+replacement for compress. It provides better compression than compress \
+and although bzip2 produces smaller files is not as fast as bzip2 is.
+"
+HOMEPAGE="http://www.gzip.org/"
 SRC_URI="ftp://ftp.gnu.org/gnu/gzip/gzip-1.3.12.tar.gz"
 CHECKSUM_MD5="b5bac2d21840ae077e0217bc5e4845b1"
 REVISION="1"

app-arch/gzip/gzip-1.4.recipe

@@ -1,4 +1,9 @@
-DESCRIPTION="GNU zip"
+SUMMARY="gzip compression utilities and libraries"
+DESCRIPTION="
+gzip (GNU zip) is a compression utility designed to be a \
+replacement for compress. It provides better compression than compress \
+and although bzip2 produces smaller files is not as fast as bzip2 is.
+"
 HOMEPAGE="http://www.gzip.org/"
 SRC_URI="ftp://ftp.gnu.org/gnu/gzip/gzip-1.4.tar.gz"
 CHECKSUM_MD5="e381b8506210c794278f5527cba0e765"

app-arch/ha/ha-0999.recipe

@@ -1,10 +1,37 @@
-DESCRIPTION="The HA archiver using the HSC compression method" 
-HOMEPAGE="http://packages.debian.org/squeeze/ha" 
-SRC_URI="ftp://ftp.freebsd.org/pub/FreeBSD/ports/distfiles/ha0999.tgz"
+SUMMARY="The HA archiver using the HSC compression method"
+DESCRIPTION="
+The HA archiver using the HSC compression method
+"
+LICENSE="GNU GPL v2"
+COPYRIGHT="1993-1995 Harri Hirvola"
+HOMEPAGE="https://code.google.com/p/ak-various-projects/"
+SRC_URI="https://ak-various-projects.googlecode.com/files/ha0999.tgz"
+CHECKSUM_SHA256="641417d256f645c92fe1ee042b9c133b5173d33d540af99ed4932f7d79a30228"
 REVISION="1"
-CHECKSUM_MD5="77f3266a451712bec55d60df67f61486"
-STATUS_HAIKU="stable"
-DEPEND=""
+ARCHITECTURES="x86 ?x86_gcc2 ?x86_64"
+
+PROVIDES="
+	ha = $portVersion
+	cmd:ha = $portVersion
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	"
+
+BUILD_PREREQUIRES="
+	cmd:make
+	cmd:gcc
+	"
+
+# This is intentionally empty to make haikuporter happy with the
+# way the source tarball is packaged
+SOURCE_DIR=""
+
 BUILD()
 {
 	make -f makefile.nix
@@ -12,9 +39,6 @@ BUILD()
 
 INSTALL()
 {
-	mkdir -p ${DESTDIR}/`finddir B_COMMON_BIN_DIRECTORY`
-	cp ha ${DESTDIR}/`finddir B_COMMON_BIN_DIRECTORY`/ha
+	mkdir -p $binDir
+	cp -af ha $binDir
 }
-
-LICENSE="GNU GPL v2"
-COPYRIGHT="1993-1995 Harri Hirvola"

app-arch/ha/patches/ha-0999.patch

@@ -1,11 +0,0 @@
-diff -Naur nix.orig/machine.c nix/machine.c
---- nix/machine.c	2009-11-24 15:27:43.000000000 +0000
-+++ nix/machine.c	2009-11-24 15:23:26.000000000 +0000
-@@ -22,6 +22,7 @@
- #include <stdlib.h>
- #include <ctype.h>
- #include <stdio.h>
-+#include <string.h>
- #include <sys/types.h>
- #include <utime.h>
- #include <time.h>

app-arch/lha/lha-1.14i.recipe

@@ -1,32 +1,58 @@
-DESCRIPTION="Archive files using LZSS and Huffman compression (.lzh files)" 
+SUMMARY="Archive files using LZSS and Huffman compression (.lzh files)"
+DESCRIPTION="
+Archive files using LZSS and Huffman compression (.lzh files)
+"
+LICENSE="lha"
+COPYRIGHT="1991, Masaru Oki
+	1993-1995, Nobutaka Watazaki
+	2000, Tsugio Okamoto et al."
 HOMEPAGE="http://sourceforge.jp/projects/lha/" 
 SRC_URI="http://jaist.dl.sourceforge.jp/lha/22231/lha-1.14i-ac20050924p1.tar.gz"
-CHECKSUM_MD5="9f52430410928ba4390a73a41a36d56f"
+CHECKSUM_SHA256="b5261e9f98538816aa9e64791f23cb83f1632ecda61f02e54b6749e9ca5e9ee4"
 REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
+ARCHITECTURES="x86 ?x86_gcc2 ?x86_64"
+
+PROVIDES="
+	lha = $portVersion
+	cmd:lha = $portVersion
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	"
+
+BUILD_PREREQUIRES="
+	cmd:autoreconf
+	cmd:autoconf
+	cmd:automake
+	cmd:aclocal
+	cmd:autoheader
+	cmd:libtoolize
+	cmd:make
+	cmd:gcc
+	"
+
+PATCHES="lha-1.14i.patchset"
+
+SOURCE_DIR="lha-1.14i-ac20050924p1"
+
 BUILD()
 {
-	cd lha-1.14i-ac20050924p1
 	autoreconf -vfi
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`/
+	runConfigure ./configure
 	make
 }
 
 INSTALL()
 {
-	cd lha-1.14i-ac20050924p1
-	make install DESTDIR=${DESTDIR}
-
+	make install
 }
 
 TEST()
 {
-	cd lha-1.14i-ac20050924p1
 	make check
 }
-
-LICENSE="lha"
-COPYRIGHT="1991, Masaru Oki
-	1993-1995, Nobutaka Watazaki
-	2000, Tsugio Okamoto et al."

app-arch/lha/patches/lha-1.14i.patchset

@@ -0,0 +1,58 @@
+From d6ee6e73f4d5db9e15580bfa746a0e885bbd9218 Mon Sep 17 00:00:00 2001
+From: Chris Roberts <cpr420@gmail.com>
+Date: Sun, 24 Nov 2013 19:28:57 -0700
+Subject: Updates for newer autotools and misc fixes
+
+
+diff --git a/configure.ac b/configure.ac
+index 5161979..cb0524a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -3,7 +3,7 @@ AC_INIT([LHa for UNIX], 1.14i-ac20050924p1, arai@users.sourceforge.jp, lha)
+ AC_CANONICAL_HOST
+ AC_CANONICAL_TARGET
+ AM_INIT_AUTOMAKE
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS([config.h])
+ 
+ AC_DEFINE_UNQUOTED(PLATFORM, "$ac_cv_host",
+ 		   [the type of system on which the package will run.])
+@@ -14,7 +14,6 @@ AC_PROG_GCC_TRADITIONAL
+ AC_PROG_INSTALL
+ AC_PROG_MAKE_SET
+ AC_MINIX
+-AM_C_PROTOTYPES
+ AC_SYS_LARGEFILE
+ 
+ # Checks for libraries.
+diff --git a/src/prototypes.h b/src/prototypes.h
+index 79e1330..cd456eb 100644
+--- a/src/prototypes.h
++++ b/src/prototypes.h
+@@ -70,10 +70,10 @@ void temporary_to_new_archive_file P_((size_t new_archive_size));
+ void cmd_add P_((void));
+ void cmd_delete P_((void));
+ /* lharc.c */
+-void message P_((char *fmt, ...));
+-void warning P_((char *fmt, ...));
+-void error P_((char *fmt, ...));
+-void fatal_error P_((char *fmt, ...));
++//void message P_((char *fmt, ...));
++//void warning P_((char *fmt, ...));
++//void error P_((char *fmt, ...));
++//void fatal_error P_((char *fmt, ...));
+ void cleanup P_((void));
+ RETSIGTYPE interrupt P_((int signo));
+ void *xmalloc P_((size_t size));
+@@ -122,7 +122,7 @@ unsigned int decode P_((struct interfacing *interface));
+ size_t copyfile P_((FILE *f1, FILE *f2, size_t size, int text_flg, unsigned int *crcp));
+ int encode_stored_crc P_((FILE *ifp, FILE *ofp, size_t size, size_t *original_size_var, size_t *write_size_var));
+ boolean archive_is_msdos_sfx1 P_((char *name));
+-int xsnprintf P_((char *dest, size_t size, char *fmt, ...));
++//int xsnprintf P_((char *dest, size_t size, char *fmt, ...));
+ char *xstrchr P_((const char *s, int c));
+ char *xstrrchr P_((const char *s, int c));
+ char *xmemchr P_((const char *s, int c, size_t n));
+-- 
+1.8.3.4
+

app-arch/libarchive/libarchive-2.8.3.recipe

@@ -1,33 +0,0 @@
-DESCRIPTION="C library and command-line tools for reading and writing tar, cpio, zip, ISO, and other archive formats." 
-HOMEPAGE="http://code.google.com/p/libarchive/" 
-SRC_URI="http://libarchive.googlecode.com/files/libarchive-2.8.3.zip"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-CHECKSUM_MD5="e4fb38b224f623e1cf1122631bf35b82"
-BUILD()
-{
-	cd libarchive-2.8.3
-	libtoolize --force --copy --install
-	aclocal -I build/autoconf
-	autoconf
-	automake
-	chmod 755 configure
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
-	make
-}
-
-INSTALL()
-{
-	cd libarchive-2.8.3
-	make install
-}
-
-TEST()
-{ 
-        cd libarchive-2.8.3 
-        make check 
-}
-
-LICENSE="BSD (2-clause)"
-COPYRIGHT="2003-2009 Tim Kientzle"

app-arch/libarchive/libarchive-2.8.4.recipe

@@ -1,33 +0,0 @@
-DESCRIPTION="C library and command-line tools for reading and writing tar, cpio, zip, ISO, and other archive formats." 
-HOMEPAGE="http://code.google.com/p/libarchive/" 
-SRC_URI="http://libarchive.googlecode.com/files/libarchive-2.8.4.tar.gz"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-CHECKSUM_MD5="83b237a542f27969a8d68ac217dc3796"
-BUILD()
-{
-	cd libarchive-2.8.4
-	libtoolize --force --copy --install
-	aclocal -I build/autoconf
-	autoconf
-	automake
-	chmod 755 configure
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
-	make
-}
-
-INSTALL()
-{
-	cd libarchive-2.8.4
-	make install
-}
-
-TEST()
-{ 
-        cd libarchive-2.8.4 
-        make check 
-}
-
-LICENSE="BSD (2-clause)"
-COPYRIGHT="2003-2009 Tim Kientzle"

app-arch/libarchive/libarchive-2.8.5.recipe

@@ -1,37 +0,0 @@
-DESCRIPTION="C library and command-line tools for reading and writing tar, cpio, zip, ISO, and other archive formats." 
-HOMEPAGE="http://libarchive.github.com/" 
-SRC_URI="https://github.com/downloads/libarchive/libarchive/libarchive-2.8.5.zip"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-CHECKSUM_MD5="58d1b202b4878e9da45cfe6d2a740881"
-BUILD()
-{
-	cd libarchive-2.8.5
-	libtoolize --force --copy --install
-	aclocal -I build/autoconf
-	autoconf
-	automake
-	chmod 755 configure
-	COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
-	COMMON_BIN=`finddir B_COMMON_BIN_DIRECTORY`
-	COMMON_DIR=`finddir B_COMMON_DIRECTORY`
-	./configure --prefix=$COMMON_DIR \
-	--mandir=$COMMON_DOCS/man
-	make
-}
-
-INSTALL()
-{
-	cd libarchive-2.8.5
-	make install
-}
-
-TEST()
-{ 
-        cd libarchive-2.8.5
-        make check 
-}
-
-LICENSE="BSD (2-clause)"
-COPYRIGHT="2003-2009 Tim Kientzle"

app-arch/libarchive/libarchive-3.0.3.recipe

@@ -1,37 +0,0 @@
-DESCRIPTION="C library and command-line tools for reading and writing tar, cpio, zip, ISO, and other archive formats." 
-HOMEPAGE="http://libarchive.github.com/" 
-SRC_URI="https://github.com/downloads/libarchive/libarchive/libarchive-3.0.3.tar.gz"
-REVISION="1"
-STATUS_HAIKU="broken"
-DEPEND=""
-CHECKSUM_MD5="ca4090f0099432a9ac5a8b6618dc3892"
-BUILD()
-{
-	cd libarchive-3.0.3
-	libtoolize --force --copy --install
-	aclocal -I build/autoconf
-	autoconf
-	automake
-	chmod 755 configure
-	COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
-	COMMON_BIN=`finddir B_COMMON_BIN_DIRECTORY`
-	COMMON_DIR=`finddir B_COMMON_DIRECTORY`
-	./configure --prefix=$COMMON_DIR \
-	--mandir=$COMMON_DOCS/man
-	make
-}
-
-INSTALL()
-{
-	cd libarchive-3.0.3
-	make install
-}
-
-TEST()
-{ 
-	cd libarchive-3.0.3
-	make check 
-}
-
-LICENSE="BSD (2-clause)"
-COPYRIGHT="2003-2009 Tim Kientzle"

app-arch/libarchive/libarchive-3.1.2.recipe

@@ -0,0 +1,117 @@
+SUMMARY="C library and tools for working with many archive formats."
+DESCRIPTION="
+The libarchive library features:
+* Support for a variety of archive and compression formats.
+* Robust automatic format detection, including archive/compression \
+combinations such as tar.gz.
+* Zero-copy internal architecture for high performance.
+* Streaming architecture eliminates all limits on size of archive, limits on \
+entry sizes depend on particular formats.
+* Carefully factored code to minimize bloat when programs are statically linked.
+* Growing test suite ? to verify correctness of new ports.
+* Works on most POSIX-like systems
+* Supports Windows, including Cygwin, MinGW, and Visual Studio.
+The bsdtar and bscpio command-line utilities are feature- and \
+performance-competitive with other tar and cpio implementations:
+* Reads a variety of formats, including tar, pax, cpio, zip, xar, lha, ar, \
+cab, mtree, rar, and ISO images.
+* Writes tar, pax, cpio, zip, xar, ar, ISO, mtree, and shar archives
+* Automatically handles archives compressed with gzip, bzip2, lzip, xz, lzma, \
+or compress.
+* Unique format conversion feature.
+"
+LICENSE="BSD (2-clause)"
+COPYRIGHT="2003-2013 Tim Kientzle"
+HOMEPAGE="http://www.libarchive.org/"
+SRC_URI="http://www.libarchive.org/downloads/libarchive-3.1.2.tar.gz"
+CHECKSUM_SHA256="eb87eacd8fe49e8d90c8fdc189813023ccc319c5e752b01fb6ad0cc7b2c53d5e"
+REVISION="1"
+ARCHITECTURES="x86"
+if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
+    # x86_gcc2 is fine as primary target architecture as long as we're building
+    # for a different secondary architecture.
+    ARCHITECTURES="$ARCHITECTURES x86_gcc2"
+else
+    ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
+fi
+SECONDARY_ARCHITECTURES="x86"
+
+# On x86_gcc2 we don't want to install the commands in bin/<arch>/, but in bin/.
+commandSuffix=$secondaryArchSuffix
+commandBinDir=$binDir
+if [ "$targetArchitecture" = x86_gcc2 ]; then
+    commandSuffix=
+    commandBinDir=$prefix/bin
+fi
+
+PROVIDES="
+	libarchive$secondaryArchSuffix = $portVersion compat >= 3.0
+	cmd:bsdtar$commandSuffix = $portVersion compat >= 3.0
+	cmd:bsdcpio$commandSuffix = $portVersion compat >= 3.0
+	lib:libarchive$secondaryArchSuffix = $portVersion compat >= 3.0
+	"
+
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:liblzma$secondaryArchSuffix
+	lib:libxml2$secondaryArchSuffix
+	lib:libssl$secondaryArchSuffix
+	lib:libcrypto$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	lib:libbz2$secondaryArchSuffix
+	"
+
+BUILD_REQUIRES="
+	devel:liblzma$secondaryArchSuffix
+	devel:libxml2$secondaryArchSuffix
+	devel:libssl$secondaryArchSuffix
+	devel:libcrypto$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
+	devel:libbz2$secondaryArchSuffix
+	"
+
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	cmd:libtoolize
+	cmd:aclocal
+	cmd:autoconf
+	cmd:automake
+	cmd:make
+	cmd:gcc$secondaryArchSuffix
+	cmd:xml2_config
+	"
+
+PROVIDES_devel="
+	libarchive${secondaryArchSuffix}_devel = $portVersion compat >= 3.0
+	devel:libarchive$secondaryArchSuffix = $portVersion compat >= 3.0
+	"
+
+REQUIRES_devel="
+	libarchive$secondaryArchSuffix == $portVersion
+	"
+
+PATCHES="libarchive-3.1.2.patchset"
+
+
+BUILD()
+{
+	libtoolize -fci
+	aclocal -I build/autoconf
+	automake --add-missing
+	autoconf
+	runConfigure --omit-dirs binDir ./configure --bindir=$commandBinDir
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+	prepareInstalledDevelLibs libarchive
+	fixPkgconfig
+	packageEntries devel $developDir $manDir/man3
+}
+
+TEST()
+{ 
+	make check 
+}

app-arch/libarchive/patches/libarchive-3.1.2.patchset

@@ -0,0 +1,21 @@
+From e3947009a6fee8dfd0ac635812df2825cdc8c338 Mon Sep 17 00:00:00 2001
+From: Chris Roberts <cpr420@gmail.com>
+Date: Sat, 26 Oct 2013 18:36:43 -0600
+Subject: Check libgnu for xattr functions on Haiku
+
+
+diff --git a/configure.ac b/configure.ac
+index 73944d3..9bfdaa2 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -569,6 +569,7 @@ if test "x$enable_xattr" != "xno"; then
+ 	AC_CHECK_HEADERS([attr/xattr.h])
+ 	AC_CHECK_HEADERS([sys/xattr.h sys/ea.h])
+ 	AC_CHECK_LIB(attr,setxattr)
++	AC_CHECK_LIB(gnu,setxattr)
+ 	AC_CHECK_FUNCS([extattr_get_file extattr_list_file])
+ 	AC_CHECK_FUNCS([extattr_set_fd extattr_set_file])
+ 	AC_CHECK_FUNCS([fgetxattr flistxattr fsetxattr getxattr])
+-- 
+1.8.3.4
+

app-arch/lz4/lz4-r117.recipe

@@ -0,0 +1,69 @@
+SUMMARY="lz4 data compression utilities and libraries"
+DESCRIPTION="
+LZ4 is a very fast lossless compression algorithm, providing compression speed \
+at 400 MB/s per core, scalable with multi-cores CPU. It also features an \
+extremely fast decoder, with speed in multiple GB/s per core, typically \
+reaching RAM speed limits on multi-core systems.
+"
+HOMEPAGE="https://code.google.com/p/lz4/"
+LICENSE="BSD (2-clause)"
+COPYRIGHT="2011-2014, Yann Collet"
+SRC_URI="https://github.com/Cyan4973/lz4/archive/r117.tar.gz"
+SRC_FILENAME="$portVersionedName.tar.gz"
+CHECKSUM_SHA256="c4ca70bf6711021d5ae64e79469a619a4e5899a4c7e07e665f3eb3a517cd029d"
+REVISION="1"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86 x86_gcc2"
+
+PATCHES="lz4-$portVersion.patchset"
+
+PROVIDES="
+	lz4${secondaryArchSuffix} = $portVersion
+	lib:liblz4${secondaryArchSuffix} = 1.0.0 compat >= 1
+	"
+
+if [ -z "$secondaryArchSuffix" ]; then
+PROVIDES="$PROVIDES
+	cmd:lz4 = $portVersion
+	cmd:lz4c = $portVersion
+	cmd:lz4cat = $portVersion
+	"
+fi
+
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	"
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	"
+BUILD_PREREQUIRES="
+	cmd:ar
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:make
+	"
+
+BUILD()
+{
+	make $jobArgs all
+}
+
+INSTALL()
+{
+	make install LIBDIR=$libDir INCLUDEDIR=$includeDir \
+		BINDIR=$binDir MANDIR=$manDir 
+	prepareInstalledDevelLibs liblz4
+	
+	packageEntries devel \
+    	$developDir
+}
+
+# ----- devel package -------------------------------------------------------
+
+PROVIDES_devel="
+	lz4${secondaryArchSuffix}_devel = $portVersion
+	devel:liblz4$secondaryArchSuffix = 1.0.0 compat >= 1
+	"
+REQUIRES_devel="
+	lz4${secondaryArchSuffix} == $portVersion base
+	"

app-arch/lz4/patches/lz4-r117.patchset

@@ -0,0 +1,173 @@
+From 9c137ea48247801d309d867244820833685e2477 Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Thu, 15 May 2014 16:14:06 +0000
+Subject: undef _PACKED (defined in Bebuild.h)
+
+
+diff --git a/lz4.c b/lz4.c
+index fd229ef..9284bbf 100644
+--- a/lz4.c
++++ b/lz4.c
+@@ -188,6 +188,7 @@
+   typedef unsigned long long  U64;
+ #endif
+ 
++#undef _PACKED
+ #if defined(__GNUC__)  && !defined(LZ4_FORCE_UNALIGNED_ACCESS)
+ #  define _PACKED __attribute__ ((packed))
+ #else
+diff --git a/lz4hc.c b/lz4hc.c
+index e84de2b..cb72ef8 100644
+--- a/lz4hc.c
++++ b/lz4hc.c
+@@ -158,6 +158,7 @@
+   typedef unsigned long long  U64;
+ #endif
+ 
++#undef _PACKED
+ #if defined(__GNUC__)  && !defined(LZ4_FORCE_UNALIGNED_ACCESS)
+ #  define _PACKED __attribute__ ((packed))
+ #else
+diff --git a/programs/xxhash.c b/programs/xxhash.c
+index 8304ec2..d4aa50e 100644
+--- a/programs/xxhash.c
++++ b/programs/xxhash.c
+@@ -110,6 +110,7 @@ FORCE_INLINE void* XXH_memcpy(void* dest, const void* src, size_t size) { return
+   typedef unsigned long long U64;
+ #endif
+ 
++#undef _PACKED
+ #if defined(__GNUC__)  && !defined(XXH_USE_UNALIGNED_ACCESS)
+ #  define _PACKED __attribute__ ((packed))
+ #else
+-- 
+1.8.3.4
+
+
+From 83f35b4005aa62773f52a843d3f515854baaf787 Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Thu, 15 May 2014 16:18:40 +0000
+Subject: PAGE_SIZE is already defined on Haiku
+
+
+diff --git a/programs/fuzzer.c b/programs/fuzzer.c
+index ba4f960..fa84aec 100644
+--- a/programs/fuzzer.c
++++ b/programs/fuzzer.c
+@@ -53,6 +53,7 @@
+ #define SEQ_MSK ((NUM_SEQ) - 1)
+ #define MOD_SEQ(x) ((((x) >> 8) & 255) == 0)
+ #define NEW_SEQ(x) ((((x) >> 10) %10) == 0)
++#undef PAGE_SIZE
+ #define PAGE_SIZE 4096
+ #define ROUND_PAGE(x) (((x) + PAGE_SIZE - 1) & ~(PAGE_SIZE - 1))
+ #define PRIME1   2654435761U
+-- 
+1.8.3.4
+
+
+From fbc8cf911a39fa5d64db09f5a3cf3d54f8614a24 Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Thu, 15 May 2014 16:20:36 +0000
+Subject: Haiku install support
+
+
+diff --git a/Makefile b/Makefile
+index e5797c7..c976c95 100644
+--- a/Makefile
++++ b/Makefile
+@@ -106,7 +106,7 @@ clean:
+ 
+ 
+ #make install option is reserved to Linux & OSX targets
+-ifneq (,$(filter $(shell uname),Linux Darwin))
++ifneq (,$(filter $(shell uname),Linux Darwin Haiku))
+ 
+ install: liblz4
+ 	@install -d -m 755 $(DESTDIR)$(LIBDIR)/ $(DESTDIR)$(INCLUDEDIR)/
+diff --git a/programs/Makefile b/programs/Makefile
+index 8ec0b85..aa5926b 100644
+--- a/programs/Makefile
++++ b/programs/Makefile
+@@ -37,8 +37,8 @@ CC:=$(CC)
+ CFLAGS+= -std=c99 -O3 -Wall -W -Wundef -DLZ4_VERSION=\"$(RELEASE)\"
+ FLAGS= -I.. $(CFLAGS)
+ 
+-BINDIR=$(PREFIX)/bin
+-MANDIR=$(PREFIX)/share/man/man1
++#BINDIR=$(PREFIX)/bin
++#MANDIR=$(PREFIX)/share/man/man1
+ LZ4DIR=..
+ 
+ TEST_FILES = COPYING
+@@ -83,7 +83,7 @@ clean:
+ 	@echo Cleaning completed
+ 
+ 
+-ifneq (,$(filter $(shell uname),Linux Darwin))
++ifneq (,$(filter $(shell uname),Linux Darwin, Haiku))
+ 
+ install: lz4 lz4c
+ 	@echo Installing binaries
+-- 
+1.8.3.4
+
+
+From 52f22e57e55cc5f4dbaab5dc9acae3491916b306 Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Fri, 16 May 2014 14:16:07 +0000
+Subject: gcc2 doesn't know std=c99
+
+
+diff --git a/Makefile b/Makefile
+index c976c95..4964a59 100644
+--- a/Makefile
++++ b/Makefile
+@@ -39,7 +39,7 @@ LIBVER=$(LIBVER_MAJOR).$(LIBVER_MINOR).$(LIBVER_PATCH)
+ DESTDIR=
+ PREFIX=/usr
+ CC:=$(CC)
+-CFLAGS+= -I. -std=c99 -O3 -Wall -W -Wundef -DLZ4_VERSION=\"$(RELEASE)\"
++CFLAGS+= -I. -O3 -Wall -W -Wundef -DLZ4_VERSION=\"$(RELEASE)\"
+ 
+ LIBDIR=$(PREFIX)/lib
+ INCLUDEDIR=$(PREFIX)/include
+diff --git a/programs/Makefile b/programs/Makefile
+index aa5926b..e380c35 100644
+--- a/programs/Makefile
++++ b/programs/Makefile
+@@ -34,7 +34,7 @@ RELEASE=r116
+ DESTDIR=
+ PREFIX=/usr
+ CC:=$(CC)
+-CFLAGS+= -std=c99 -O3 -Wall -W -Wundef -DLZ4_VERSION=\"$(RELEASE)\"
++CFLAGS+= -O3 -Wall -W -Wundef -DLZ4_VERSION=\"$(RELEASE)\"
+ FLAGS= -I.. $(CFLAGS)
+ 
+ #BINDIR=$(PREFIX)/bin
+-- 
+1.8.3.4
+
+
+From bf73e35f83ed099523193493e77dd3b342937d89 Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Fri, 16 May 2014 14:20:25 +0000
+Subject: we don't want 32-bit versions
+
+
+diff --git a/programs/Makefile b/programs/Makefile
+index e380c35..b89410f 100644
+--- a/programs/Makefile
++++ b/programs/Makefile
+@@ -53,7 +53,7 @@ endif
+ 
+ default: lz4 lz4c
+ 
+-all: lz4 lz4c lz4c32 fuzzer fuzzer32 fullbench fullbench32
++all: lz4 lz4c fuzzer fullbench
+ 
+ lz4: $(LZ4DIR)/lz4.c $(LZ4DIR)/lz4hc.c bench.c xxhash.c lz4io.c lz4cli.c
+ 	$(CC)      $(FLAGS) -DDISABLE_LZ4C_LEGACY_OPTIONS $^ -o $@$(EXT)
+-- 
+1.8.3.4
+

app-arch/p7zip/p7zip-9.13.recipe

@@ -1,8 +1,12 @@
 SUMMARY="7-zip file compression program"
-DESCRIPTION="p7zip is a port of 7za.exe for POSIX systems like Unix (Linux, Solaris, OpenBSD, FreeBSD, Cygwin, AIX, ...), MacOS X and also for BeOS and Amiga."
+DESCRIPTION="p7zip is a port of 7za.exe (command line 7-Zip) for POSIX systems. 7-Zip is a file archiver with a high compression ratio in 7z format with LZMA and LZMA2 compression. It provides a compression ratio that is 2-10% better than the ratio provided by PKZip and WinZip, and features AES-256 encryption in 7z and ZIP formats. 7-Zip also self-extracts files in 7z format.
+
+Supported Formats:
+- Packing/Unpacking: 7z, XZ, BZIP2, GZIP, TAR, ZIP, and WIM
+- Unpacking Only: ARJ, CAB, CHM, CPIO, CramFS, DEB, DMG, FAT, HFS, ISO, LZH, LZMA, MBR, MSI, NSIS, NTFS, RAR, RPM, SquashFS, UDF, VHD, WIM, XAR, and Z."
 HOMEPAGE="http://p7zip.sourceforge.net"
 SRC_URI="http://downloads.sourceforge.net/project/p7zip/p7zip/9.13/p7zip_9.13_src_all.tar.bz2"
-CHECKSUM_MD5="8ddb5053db3b1f2696407d01be145779"
+CHECKSUM_SHA256="fc9c0fa2eabd367d6adbc3ea07bb305dbdc1f68717eea362c8c074b91c03d923"
 LICENSE="GNU LGPL v2.1"
 COPYRIGHT="1999-2010 7-Zip Igor Pavlov."
 REVISION="2"

app-arch/p7zip/p7zip-9.20.1.recipe

@@ -1,8 +1,11 @@
 SUMMARY="7-zip file compression program"
-DESCRIPTION="p7zip is a port of 7za.exe for POSIX systems like Unix (Linux, Solaris, OpenBSD, FreeBSD, Cygwin, AIX, ...), MacOS X and also for BeOS and Amiga."
+DESCRIPTION="
+p7zip is a port of 7za.exe for POSIX systems like Unix (Linux, Solaris, \
+OpenBSD, FreeBSD, Cygwin, AIX, ...), MacOS X and also for BeOS and Amiga.
+"
 HOMEPAGE="http://p7zip.sourceforge.net"
 SRC_URI="http://downloads.sourceforge.net/project/p7zip/p7zip/9.20.1/p7zip_9.20.1_src_all.tar.bz2"
-CHECKSUM_MD5="bd6caaea567dc0d995c990c5cc883c89"
+CHECKSUM_SHA256="49557e7ffca08100f9fc687f4dfc5aea703ca207640c76d9dee7b66f03cb4782"
 LICENSE="GNU LGPL v2.1"
 COPYRIGHT="1999-2011 7-Zip Igor Pavlov."
 REVISION="5"

app-arch/pigz/pigz-2.1.6.recipe

@@ -1,31 +0,0 @@
-DESCRIPTION="pigz" 
-HOMEPAGE="http://www.zlib.net/pigz" 
-SRC_URI="http://www.zlib.net/pigz/pigz-2.1.6.tar.gz"
-CHECKSUM_MD5="cbe9030c4be3d0ef2438ee5f8b169ca4"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-BUILD()
-{
-	cd pigz-2.1.6
-	sed -i 's/-lpthread/ /g' Makefile
-	sed -i 's/ln -f pigz unpigz/cp pigz unpigz/' Makefile
-	make
-}
-
-INSTALL()
-{
-	cd pigz-2.1.6
-	mkdir -p ${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY`
-	cp pigz ${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY`/pigz
-	cp unpigz ${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY`/unpigz
-}
-
-TEST()
-{
-	cd pigz-2.1.6
-	make test
-}
-
-LICENSE="Zlib"
-COPYRIGHT="2008 Mark Adler"

app-arch/pigz/pigz-2.3.1.recipe

@@ -0,0 +1,64 @@
+SUMMARY="A parallel implementation of gzip for multi-processor machines"
+DESCRIPTION="
+pigz, which stands for Parallel Implementation of GZip, is a fully functional \
+replacement for gzip that exploits multiple processors and multiple cores to \
+the hilt when compressing data.
+
+pigz was written by Mark Adler, and uses the zlib and pthread libraries.
+
+This version of pigz is written to be portable across Unix-style operating \
+systems that provide the zlib and pthread libraries.
+"
+LICENSE="Zlib"
+COPYRIGHT="2008-2013 Mark Adler"
+HOMEPAGE="http://www.zlib.net/pigz" 
+SRC_URI="http://www.zlib.net/pigz/pigz-2.3.1.tar.gz"
+CHECKSUM_SHA256="629b0ce5422a3978f31742bf8275d0be2f84987140d18f390f1e3b4e46e0af54"
+REVISION="1"
+ARCHITECTURES="x86 ?x86_gcc2 ?x86_64"
+
+PROVIDES="
+	pigz = $portVersion
+	cmd:pigz = $portVersion
+	cmd:unpigz = $portVersion
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	lib:libz
+	"
+
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	devel:libz
+	"
+
+BUILD_PREREQUIRES="
+	cmd:make
+	cmd:gcc
+	"
+
+PATCH()
+{
+	sed -i 's/-lm//g' Makefile
+	sed -i 's/-lpthread//g' Makefile
+	sed -i 's/ln -f/ln -sf/g' Makefile
+}
+
+BUILD()
+{
+	make
+}
+
+INSTALL()
+{
+	mkdir -p $binDir
+	cp -af pigz unpigz $binDir
+	mkdir -p $manDir/man1
+	cp -af pigz.1 $manDir/man1
+}
+
+TEST()
+{
+	make test
+}

app-arch/sharutils/patches/sharutils-4.14.patchset

@@ -0,0 +1,55 @@
+From ddc3088b56acff9a92dd611bc35989cbea8ba580 Mon Sep 17 00:00:00 2001
+From: Chris Roberts <cpr420@gmail.com>
+Date: Sun, 24 Nov 2013 19:58:36 -0700
+Subject: Include config.h before other headers
+
+
+diff --git a/src/scribble.c b/src/scribble.c
+index 57fa9d0..26e820b 100644
+--- a/src/scribble.c
++++ b/src/scribble.c
+@@ -1,4 +1,5 @@
+ 
++#include "config.h"
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include "scribble.h"
+-- 
+1.8.3.4
+
+
+From a9cb54731100e3d642a38721d655340d7ba47778 Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Mon, 14 Apr 2014 18:36:36 +0000
+Subject: gcc2 fix
+
+
+diff --git a/configure b/configure
+index 98d81a5..b7af1ec 100755
+--- a/configure
++++ b/configure
+@@ -17612,6 +17612,8 @@ if ac_fn_c_try_compile "$LINENO"; then :
+ else
+   ac_cv_header_stdbool_h=no
+ fi
++ac_cv_header_stdbool_h=yes
++
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdbool_h" >&5
+diff --git a/src/uuencode.c b/src/uuencode.c
+index 370726e..bbf259d 100644
+--- a/src/uuencode.c
++++ b/src/uuencode.c
+@@ -249,7 +249,7 @@ process_opts (int argc, char ** argv, int * mode)
+   if (HAVE_OPT(ENCODE_FILE_NAME))
+     {
+       size_t nmlen = strlen (output_name);
+-      size_t bfsz  = nmlen + (nmlen / 3) + 4;;
++      size_t bfsz  = nmlen + (nmlen / 3) + 4;
+       char * p = malloc (bfsz);
+       if (p == NULL)
+         fserr (UUENCODE_EXIT_FAILURE, "malloc", _("file name"));
+-- 
+1.8.3.4
+

app-arch/sharutils/sharutils-4.10.recipe

@@ -1,27 +0,0 @@
-DESCRIPTION="sharutils"
-HOMEPAGE="http://www.gnu.org/software/sharutils/"
-SRC_URI="ftp://ftp.gnu.org/gnu/sharutils/sharutils-4.10.tar.gz"
-CHECKSUM_MD5="c8bbfa89810ce9f5399b38392549207c"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building."
-BUILD()
-{
-	cd sharutils-4.10
-	COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
-	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
-		--infodir=$COMMON_DOCS/info \
-		--mandir=$COMMON_DOCS/man \
-		--disable-nls
-	make
-}
-
-INSTALL()
-{
-	cd sharutils-4.10
-	make install
-}
-
-LICENSE="GNU GPL v3"
-COPYRIGHT="1990-2010 Free Software Foundation, Inc."

app-arch/sharutils/sharutils-4.14.recipe

@@ -0,0 +1,64 @@
+SUMMARY="sharutils"
+DESCRIPTION="
+GNU shar makes so-called shell archives out of many files, preparing them for \
+transmission by electronic mail services. A shell archive is a collection of \
+files that can be unpacked by /bin/sh. A wide range of features provide \
+extensive flexibility in manufacturing shars and in specifying shar smartness. \
+For example, shar may compress files, uuencode binary files, split long files \
+and construct multi-part mailings, ensure correct unsharing order, and provide \
+simplistic checksums.
+GNU unshar scans a set of mail messages looking for the start of shell \
+archives. It will automatically strip off the mail headers and other \
+introductory text. The archive bodies are then unpacked by a copy of the \
+shell. unshar may also process files containing concatenated shell archives.
+"
+HOMEPAGE="http://www.gnu.org/software/sharutils/"
+LICENSE="GNU GPL v3"
+COPYRIGHT="1990-2013 Free Software Foundation, Inc."
+SRC_URI="http://ftp.gnu.org/gnu/sharutils/sharutils-4.14.tar.gz"
+CHECKSUM_SHA256="90f5107c167cfd1b299bb211828d2586471087863dbed698f53109cd5f717208"
+REVISION="1"
+
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
+PROVIDES="
+	sharutils$secondaryArchSuffix = $portVersion
+	cmd:shar$secondaryArchSuffix = $portVersion
+	cmd:unshar$secondaryArchSuffix = $portVersion
+	cmd:uudecode$secondaryArchSuffix = $portVersion
+	cmd:uuencode$secondaryArchSuffix = $portVersion
+	"
+
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	"
+
+BUILD_PREREQUIRES="
+	cmd:awk
+	cmd:make
+	cmd:which
+	cmd:bison
+	cmd:makeinfo
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	"
+
+PATCHES="sharutils-4.14.patchset"
+
+BUILD()
+{
+	runConfigure ./configure \
+	--disable-nls
+	make
+}
+
+INSTALL()
+{
+	make install
+	rm -rf $libDir
+}

app-arch/sharutils/sharutils-4.6.3.recipe

@@ -1,19 +0,0 @@
-DESCRIPTION="sharutils" 
-HOMEPAGE="http://www.gnu.org/software/sharutils/" 
-SRC_URI="ftp://ftp.gnu.org/gnu/sharutils/REL-4.6.3/sharutils-4.6.3.tar.gz"
-CHECKSUM_MD5="74127a560e59be6dfa8b59993eb0ca91"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-BUILD()
-{
-	cd sharutils-4.6.3
-	./configure --prefix=/boot/home/common
-	make
-}
-
-INSTALL()
-{
-	cd sharutils-4.6.3
-	make install
-}

app-arch/tar/patches/tar-1.27.1.patchset

@@ -0,0 +1,147 @@
+From 25395e3fa0b01a898b6e6ae456c8eef3c66849f1 Mon Sep 17 00:00:00 2001
+From: Jonathan Schleifer <js@webkeks.org>
+Date: Thu, 20 Mar 2014 14:52:58 +0100
+Subject: Patches from tar-1.26
+
+
+diff --git a/src/common.h b/src/common.h
+index 42fd539..633ca19 100644
+--- a/src/common.h
++++ b/src/common.h
+@@ -192,6 +192,8 @@ GLOBAL enum old_files old_files_option;
+ 
+ GLOBAL bool keep_directory_symlink_option;
+ 
++GLOBAL bool simulate_hardlinks_option;
++
+ /* Specified file name for incremental list.  */
+ GLOBAL const char *listed_incremental_option;
+ /* Incremental dump level */
+diff --git a/src/extract.c b/src/extract.c
+index 9b6b7f9..26b027f 100644
+--- a/src/extract.c
++++ b/src/extract.c
+@@ -33,6 +33,8 @@ static bool we_are_root;	/* true if our effective uid == 0 */
+ static mode_t newdir_umask;	/* umask when creating new directories */
+ static mode_t current_umask;	/* current umask (which is set to 0 if -p) */
+ 
++static int extract_symlink (char *, int);
++
+ #define ALL_MODE_BITS ((mode_t) ~ (mode_t) 0)
+ 
+ #if ! HAVE_FCHMOD && ! defined fchmod
+@@ -1268,6 +1270,38 @@ extract_link (char *file_name, int typeflag)
+   char const *link_name;
+   int rc;
+ 
++  if (simulate_hardlinks_option)
++  {
++	/* symlinks have to be normalized */
++	const char* f = file_name;
++	const char* l = current_stat_info.link_name;
++	int sep_pos = 0;
++	int p_count = 0;
++	char *link_name = (char*) xmalloc(strlen(current_stat_info.link_name) * 2);
++
++   for (; *f && *l; f++, l++)
++	{
++	  if (*f != *l)
++		  break;
++	  if (*f == DIRECTORY_SEPARATOR)
++		  sep_pos = f - file_name;
++	}
++
++	for (p_count = 0; *f; f++)
++	  if (*f == DIRECTORY_SEPARATOR)
++	    p_count++;
++
++	link_name[0] = '\0';
++	while (p_count--)
++	  strcat(link_name, "../");
++
++	strcat(link_name, &current_stat_info.link_name[sep_pos + 1]);
++	free(current_stat_info.link_name);
++	current_stat_info.link_name = link_name;
++
++	return extract_symlink(file_name, typeflag);
++  }
++
+   link_name = current_stat_info.link_name;
+ 
+   if (! absolute_names_option && contains_dot_dot (link_name))
+@@ -1357,6 +1391,13 @@ extract_symlink (char *file_name, int typeflag)
+ #else
+   static int warned_once;
+ 
++  /* recursion is not welcomed here */
++  if (simulate_hardlinks_option && typeflag == LINKTYPE)
++  {
++	link_error (current_stat_info.link_name, file_name);
++	return -1;
++  }
++
+   if (!warned_once)
+     {
+       warned_once = 1;
+diff --git a/src/tar.c b/src/tar.c
+index 4f5017d..2dd5200 100644
+--- a/src/tar.c
++++ b/src/tar.c
+@@ -457,6 +457,8 @@ static struct argp_option options[] = {
+   {"check-device", CHECK_DEVICE_OPTION, NULL, 0,
+    N_("check device numbers when creating incremental archives (default)"),
+    GRID+1 },
++  {"replace-hardlinks", 'Q', 0, 0,
++   N_("replace hardlinks with corresponding symlink when extracting"), GRID+1 },
+ #undef GRID
+ 
+ #define GRID 30
+@@ -1756,6 +1758,10 @@ parse_opt (int key, char *arg, struct argp_state *state)
+       set_archive_format (arg);
+       break;
+ 
++    case 'Q':
++      simulate_hardlinks_option = true;
++      break;
++
+     case INDEX_FILE_OPTION:
+       index_file_name = arg;
+       break;
+@@ -2253,6 +2259,7 @@ decode_options (int argc, char **argv)
+   unquote_option = true;
+   tar_sparse_major = 1;
+   tar_sparse_minor = 0;
++  simulate_hardlinks_option = false;
+ 
+   owner_option = -1; owner_name_option = NULL;
+   group_option = -1; group_name_option = NULL;
+-- 
+1.8.3.4
+
+
+From 6f729d50ba6ca87c6cd33d87462884d90d4504c0 Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@pulkomandy.tk>
+Date: Fri, 28 Mar 2014 21:44:58 +0100
+Subject: gcc2 build fix.
+
+
+diff --git a/lib/wordsplit.h b/lib/wordsplit.h
+index b48e3cd..d286ffb 100644
+--- a/lib/wordsplit.h
++++ b/lib/wordsplit.h
+@@ -33,10 +33,8 @@ struct wordsplit
+   const char *ws_comment;
+   const char *ws_escape;
+   void (*ws_alloc_die) (struct wordsplit * wsp);
+-  void (*ws_error) (const char *, ...)
+-                   __attribute__ ((__format__ (__printf__, 1, 2)));
+-  void (*ws_debug) (const char *, ...)
+-                   __attribute__ ((__format__ (__printf__, 1, 2)));
++  void (*ws_error) (const char *, ...);
++  void (*ws_debug) (const char *, ...);
+ 
+   const char **ws_env;
+   const char *(*ws_getvar) (const char *, size_t, void *);
+-- 
+1.8.3.4
+

app-arch/tar/tar-1.26.recipe

@@ -1,21 +1,20 @@
 SUMMARY="Saves and restores files to/from a tape or disk archive."
 DESCRIPTION="
-	The Tar program provides the ability to create tar archives, as well as
-	various other kinds of manipulation. For example, you can use Tar on
-	previously created archives to extract files, to store additional files,
-	or to update or list files which were already stored.
-
-	Initially, tar archives were used to store files conveniently on magnetic
-	tape. The name "Tar" comes from this use; it stands for tape archiver.
-	Despite the utility's name, Tar can direct its output to available
-	devices, files, or other programs (using pipes), it can even access remote
-	devices or files (as archives).
-	"
+The Tar program provides the ability to create tar archives, as well as \
+various other kinds of manipulation. For example, you can use Tar on \
+previously created archives to extract files, to store additional files, or to \
+update or list files which were already stored.
+Initially, tar archives were used to store files conveniently on magnetic \
+tape. The name "Tar" comes from this use; it stands for tape archiver. Despite \
+the utility's name, Tar can direct its output to available devices, files, or \
+other programs (using pipes), it can even access remote devices or files (as \
+archives).
+"
 HOMEPAGE="http://www.gnu.org/software/tar/"
 COPYRIGHT="1990-2011 Free Software Foundation, Inc."
 LICENSE="GNU GPL v3"
 SRC_URI="http://ftp.gnu.org/gnu/tar/tar-1.26.tar.bz2"
-CHECKSUM_MD5="2cee42a2ff4f1cd4f9298eeeb2264519"
+CHECKSUM_SHA256="5a5369f464502a598e938029c310d4b3abd51e6bb8dfd045663e61c8ea9f6d41"
 REVISION="6"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 
@@ -43,7 +42,6 @@ BUILD_PREREQUIRES="
 defineDebugInfoPackage tar \
 	$binDir/tar
 
-SOURCE_DIR="$portVersionedName"
 
 BUILD()
 {

app-arch/tar/tar-1.27.1.recipe

@@ -0,0 +1,61 @@
+SUMMARY="Saves and restores files to/from a tape or disk archive."
+DESCRIPTION="
+The Tar program provides the ability to create tar archives, as well as \
+various other kinds of manipulation. For example, you can use Tar on \
+previously created archives to extract files, to store additional files, or to \
+update or list files which were already stored.
+Initially, tar archives were used to store files conveniently on magnetic \
+tape. The name \"Tar\" comes from this use; it stands for tape archiver. Despite \
+the utility's name, Tar can direct its output to available devices, files, or \
+other programs (using pipes), it can even access remote devices or files (as \
+archives).
+"
+HOMEPAGE="http://www.gnu.org/software/tar/"
+COPYRIGHT="1990-2011 Free Software Foundation, Inc."
+LICENSE="GNU GPL v3"
+SRC_URI="http://ftp.gnu.org/gnu/tar/tar-1.27.1.tar.bz2"
+CHECKSUM_SHA256="9b0fb3ce8512059337add0da5f8f0f7d7647f2201f5ece24581d620ea60337c6"
+REVISION="2"
+ARCHITECTURES="x86_gcc2 ?x86 x86_64 arm"
+
+PATCHES="tar-1.27.1.patchset"
+
+PROVIDES="
+	tar = $portVersion compat >= 1
+	cmd:tar = $portVersion compat >= 1
+	"
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+BUILD_REQUIRES="
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	cmd:automake
+	cmd:autoreconf
+	cmd:gcc
+	cmd:ld
+	cmd:make
+	cmd:sed
+	"
+
+defineDebugInfoPackage tar \
+	$binDir/tar
+
+
+BUILD()
+{
+	runConfigure ./configure \
+		--disable-nls \
+		--disable-gcc-warnings \
+		LDFLAGS="-lnetwork" \
+		FORCE_UNSAFE_CONFIGURE=1
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+
+	rm $libDir/charset.alias
+}

app-arch/unrar/patches/unrar-5.0.14.patchset

@@ -0,0 +1,95 @@
+From a24228db5eb4450d185904b3a3795bffa28ce5f7 Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Mon, 14 Apr 2014 16:24:18 +0000
+Subject: initial haiku patch
+
+
+diff --git a/archive.hpp b/archive.hpp
+index 95645ed..377b779 100644
+--- a/archive.hpp
++++ b/archive.hpp
+@@ -67,7 +67,6 @@ class Archive:public File
+     size_t SearchSubBlock(const wchar *Type);
+     size_t SearchRR();
+     void WriteBlock(HEADER_TYPE HeaderType,BaseBlock *wb=NULL,bool OnlySetSize=false,bool NonFinalWrite=false);
+-    void SetBlockSize(HEADER_TYPE HeaderType,BaseBlock *wb=NULL) {WriteBlock(HeaderType,wb,true);}
+     size_t ReadHeader();
+     void CheckArc(bool EnableBroken);
+     void CheckOpen(const wchar *Name);
+diff --git a/makefile b/makefile
+index dfb3efb..bc6419a 100644
+--- a/makefile
++++ b/makefile
+@@ -7,8 +7,12 @@ CXXFLAGS=-O2
+ LIBFLAGS=-fPIC
+ DEFINES=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -DRAR_SMP
+ STRIP=strip
+-LDFLAGS=-pthread
++LDFLAGS=-lbsd
+ DESTDIR=/usr
++RC=rc
++XRES=xres
++MIMESET=mimeset
++DESTDIR=(shell finddir B_SYSTEM_DIRECTORY)
+ 
+ # Linux using LCC
+ #CXX=lcc
+@@ -116,12 +120,14 @@ install:	install-unrar
+ uninstall:	uninstall-unrar
+ 
+ clean:
+-	@rm -f *.o *.bak *~
++	@rm -f *.o *.bak *~ *.rsrc
+ 
+ unrar:	clean $(OBJECTS) $(UNRAR_OBJ)
+ 	@rm -f unrar
+ 	$(LINK) -o unrar $(LDFLAGS) $(OBJECTS) $(UNRAR_OBJ) $(LIBS)	
+-	$(STRIP) unrar
++	$(RC) -o unrar.rsrc unrar.rdef
++	$(XRES) -o unrar unrar.rsrc
++	$(MIMESET) unrar
+ 
+ sfx:	WHAT=SFX_MODULE
+ sfx:	clean $(OBJECTS)
+diff --git a/os.hpp b/os.hpp
+index ed76a19..41594be 100644
+--- a/os.hpp
++++ b/os.hpp
+@@ -187,6 +187,15 @@
+   #endif
+ #endif
+ 
++#ifdef __HAIKU__
++  #include <endian.h>
++  #if LITTLE_ENDIAN
++    #undef BIG_ENDIAN
++  #elif BIG_ENDIAN
++    #undef LITTLE_ENDIAN
++  #endif
++#endif
++
+ #if defined(__sparc) || defined(sparc) || defined(__hpux)
+   #ifndef BIG_ENDIAN
+      #define BIG_ENDIAN
+diff --git a/unrar.rdef b/unrar.rdef
+new file mode 100644
+index 0000000..79411da
+--- /dev/null
++++ b/unrar.rdef
+@@ -0,0 +1,13 @@
++
++resource app_signature "application/x-vnd.Roshal-UnRAR";
++resource app_flags B_MULTIPLE_LAUNCH | B_BACKGROUND_APP;
++
++resource app_version {
++	major = 5,
++	middle = 0,
++	minor = 4,
++	variety = 0,
++	internal = 0,
++	short_info = "5.0.4", 
++	long_info = "5.0.4 Alexander Roshal"
++};
+-- 
+1.8.3.4
+

app-arch/unrar/patches/unrar-5.1.5.patchset

@@ -0,0 +1,95 @@
+From ebe959af19ad3f72d3119444f9afc0ab15caaa7a Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Mon, 12 May 2014 18:07:44 +0000
+Subject: initial Haiku patch
+
+
+diff --git a/archive.hpp b/archive.hpp
+index 1d8444b..252b850 100644
+--- a/archive.hpp
++++ b/archive.hpp
+@@ -67,7 +67,6 @@ class Archive:public File
+     size_t SearchSubBlock(const wchar *Type);
+     size_t SearchRR();
+     void WriteBlock(HEADER_TYPE HeaderType,BaseBlock *wb=NULL,bool OnlySetSize=false,bool NonFinalWrite=false);
+-    void SetBlockSize(HEADER_TYPE HeaderType,BaseBlock *wb=NULL) {WriteBlock(HeaderType,wb,true);}
+     size_t ReadHeader();
+     void CheckArc(bool EnableBroken);
+     void CheckOpen(const wchar *Name);
+diff --git a/makefile b/makefile
+index 3c38027..5d69089 100644
+--- a/makefile
++++ b/makefile
+@@ -7,8 +7,12 @@ CXXFLAGS=-O2
+ LIBFLAGS=-fPIC
+ DEFINES=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -DRAR_SMP
+ STRIP=strip
+-LDFLAGS=-pthread
++LDFLAGS=-lbsd
+ DESTDIR=/usr
++RC=rc
++XRES=xres
++MIMESET=mimeset
++DESTDIR=(shell finddir B_SYSTEM_DIRECTORY)
+ 
+ # Linux using LCC
+ #CXX=lcc
+@@ -116,12 +120,14 @@ install:	install-unrar
+ uninstall:	uninstall-unrar
+ 
+ clean:
+-	@rm -f *.o *.bak *~
++	@rm -f *.o *.bak *~ *.rsrc
+ 
+ unrar:	clean $(OBJECTS) $(UNRAR_OBJ)
+ 	@rm -f unrar
+ 	$(LINK) -o unrar $(LDFLAGS) $(OBJECTS) $(UNRAR_OBJ) $(LIBS)	
+-	$(STRIP) unrar
++	$(RC) -o unrar.rsrc unrar.rdef
++	$(XRES) -o unrar unrar.rsrc
++	$(MIMESET) unrar
+ 
+ sfx:	WHAT=SFX_MODULE
+ sfx:	clean $(OBJECTS)
+diff --git a/os.hpp b/os.hpp
+index 95fa5d6..2ae36ba 100644
+--- a/os.hpp
++++ b/os.hpp
+@@ -189,6 +189,15 @@
+   #endif
+ #endif
+ 
++#ifdef __HAIKU__
++  #include <endian.h>
++  #if LITTLE_ENDIAN
++    #undef BIG_ENDIAN
++  #elif BIG_ENDIAN
++    #undef LITTLE_ENDIAN
++  #endif
++#endif
++
+ #if defined(__sparc) || defined(sparc) || defined(__hpux)
+   #ifndef BIG_ENDIAN
+      #define BIG_ENDIAN
+diff --git a/unrar.rdef b/unrar.rdef
+new file mode 100644
+index 0000000..28bb5e2
+--- /dev/null
++++ b/unrar.rdef
+@@ -0,0 +1,13 @@
++
++resource app_signature "application/x-vnd.Roshal-UnRAR";
++resource app_flags B_MULTIPLE_LAUNCH | B_BACKGROUND_APP;
++
++resource app_version {
++	major = 5,
++	middle = 1,
++	minor = 5,
++	variety = 0,
++	internal = 0,
++	short_info = "5.1.5", 
++	long_info = "5.1.5 Alexander Roshal"
++};
+-- 
+1.8.3.4
+

app-arch/unrar/unrar-4.2.4.recipe

@@ -1,9 +1,29 @@
 SUMMARY="Uncompress rar files"
+DESCRIPTION="
+Unrar decompresses rar files. It is a powerful archive manager that can backup \
+your data and reduce the size of email attachments. Unrar can decompress the \
+following file formats:
+- RAR
+- ZIP
+- CAB
+- ARJ
+- JZH
+- TAR
+- GZ and TAR.GZ
+- BZ2 and TAR.BZ2
+- ACE
+- UUE
+- JAR (Java Archive)
+- ISO
+- 7Z
+- XZ
+- Z (Unix Compress)
+"
 HOMEPAGE="http://www.rarlab.com/"
 SRC_URI="http://www.rarlab.com/rar/unrarsrc-4.2.4.tar.gz"
+CHECKSUM_SHA256="9432bf798e5f7123f3060f37b75b7c07f36f0091305f46473dcae9154f8cd686"
 REVISION="1"
 ARCHITECTURES="x86_gcc2 x86"
-CHECKSUM_MD5="8ea9d1b4139474b282d76e627a2de3e4"
 
 PROVIDES="
 	unrar = $portVersion
@@ -31,4 +51,3 @@ INSTALL()
 
 LICENSE="UnRAR"
 COPYRIGHT="Alexander Roshal"
-DESCRIPTION="Uncompress rar files"

app-arch/unrar/unrar-5.0.14.recipe

@@ -0,0 +1,56 @@
+SUMMARY="Uncompress rar files"
+DESCRIPTION="
+Unrar decompresses rar files. It is a powerful archive manager that can backup \
+your data and reduce the size of email attachments. Unrar can decompress the \
+following file formats:
+- RAR
+- ZIP
+- CAB
+- ARJ
+- JZH
+- TAR
+- GZ and TAR.GZ
+- BZ2 and TAR.BZ2
+- ACE
+- UUE
+- JAR (Java Archive)
+- ISO
+- 7Z
+- XZ
+- Z (Unix Compress)
+"
+HOMEPAGE="http://www.rarlab.com/"
+SRC_URI="http://www.rarlab.com/rar/unrarsrc-$portVersion.tar.gz"
+CHECKSUM_SHA256="e276ea30a2dc9b8961a4268772e5b6caccaa984664e2d5255a43fcb0f5d59806"
+REVISION="1"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+
+PATCHES="unrar-5.0.14.patchset"
+
+PROVIDES="
+	unrar = $portVersion
+	cmd:unrar = $portVersion
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	cmd:make
+	cmd:g++
+	"
+
+SOURCE_DIR="unrar"
+BUILD()
+{
+	make DESTDIR=$prefix
+}
+
+INSTALL()
+{
+	make DESTDIR=$prefix install
+}
+
+LICENSE="UnRAR"
+COPYRIGHT="Alexander Roshal"

app-arch/unrar/unrar-5.1.5.recipe

@@ -0,0 +1,56 @@
+SUMMARY="Uncompress rar files"
+DESCRIPTION="
+Unrar decompresses rar files. It is a powerful archive manager that can backup \
+your data and reduce the size of email attachments. Unrar can decompress the \
+following file formats:
+- RAR
+- ZIP
+- CAB
+- ARJ
+- JZH
+- TAR
+- GZ and TAR.GZ
+- BZ2 and TAR.BZ2
+- ACE
+- UUE
+- JAR (Java Archive)
+- ISO
+- 7Z
+- XZ
+- Z (Unix Compress)
+"
+HOMEPAGE="http://www.rarlab.com/"
+SRC_URI="http://www.rarlab.com/rar/unrarsrc-$portVersion.tar.gz"
+CHECKSUM_SHA256="2224ced8288553392abe94e410e29d2570bfdfea22af51125d3984548a5034cb"
+REVISION="1"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+
+PATCHES="unrar-$portVersion.patchset"
+
+PROVIDES="
+	unrar = $portVersion
+	cmd:unrar = $portVersion
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	cmd:make
+	cmd:g++
+	"
+
+SOURCE_DIR="unrar"
+BUILD()
+{
+	make DESTDIR=$prefix
+}
+
+INSTALL()
+{
+	make DESTDIR=$prefix install
+}
+
+LICENSE="UnRAR"
+COPYRIGHT="Alexander Roshal"

app-arch/unzip/unzip-6.0.recipe

@@ -1,5 +1,10 @@
-DESCRIPTION="unzip" 
-HOMEPAGE="http://www.info-zip.org/UnZip.html" 
+SUMMARY="Extraction utility for zip archives."
+DESCRIPTION="
+UnZip is an extraction utility for archives compressed in \
+.zip format (zipfiles). UnZip can list or extract files from an archive \
+or test its integrity.
+"
+HOMEPAGE="http://www.info-zip.org/UnZip.html"
 SRC_URI="http://downloads.sourceforge.net/project/infozip/UnZip%206.x%20%28latest%29/UnZip%206.0/unzip60.tar.gz"
 REVISION="1"
 STATUS_HAIKU="broken"

app-arch/xar/patches/xar-1.5.2.patch

@@ -1,24 +0,0 @@
-diff -Naur xar-1.5.2/lib/darwinattr.c xar-1.5.2-haiku/lib/darwinattr.c
---- xar-1.5.2/lib/darwinattr.c	2007-12-29 18:49:57.035651584 +0000
-+++ xar-1.5.2-haiku/lib/darwinattr.c	2013-01-09 20:55:26.246415360 +0000
-@@ -40,7 +40,7 @@
- #include <unistd.h>
- #include <string.h>
- #include <libgen.h>
--#include <sys/fcntl.h>
-+#include <fcntl.h>
- #include <sys/stat.h>
- #include <arpa/inet.h>
- #include "xar.h"
-diff -Naur xar-1.5.2/lib/stat.c xar-1.5.2-haiku/lib/stat.c
---- xar-1.5.2/lib/stat.c	2007-12-29 18:49:57.033554432 +0000
-+++ xar-1.5.2-haiku/lib/stat.c	2013-01-09 20:55:34.206307328 +0000
-@@ -53,7 +53,7 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <sys/time.h>
--#include <sys/fcntl.h>
-+#include <fcntl.h>
- #include <time.h>
- #include <pwd.h>
- #include <grp.h>

app-arch/xar/patches/xar-1.5.2.patchset

@@ -0,0 +1,88 @@
+From f1df8eee79076b29537b7d8a4b909c2c87299225 Mon Sep 17 00:00:00 2001
+From: Chris Roberts <cpr420@gmail.com>
+Date: Sun, 24 Nov 2013 20:15:58 -0700
+Subject: applying patch xar-1.5.2.patch
+
+
+diff --git a/lib/darwinattr.c b/lib/darwinattr.c
+index d3bf136..94206d7 100644
+--- a/lib/darwinattr.c
++++ b/lib/darwinattr.c
+@@ -40,7 +40,7 @@
+ #include <unistd.h>
+ #include <string.h>
+ #include <libgen.h>
+-#include <sys/fcntl.h>
++#include <fcntl.h>
+ #include <sys/stat.h>
+ #include <arpa/inet.h>
+ #include "xar.h"
+diff --git a/lib/stat.c b/lib/stat.c
+index dddb1d4..41634bc 100644
+--- a/lib/stat.c
++++ b/lib/stat.c
+@@ -53,7 +53,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <sys/time.h>
+-#include <sys/fcntl.h>
++#include <fcntl.h>
+ #include <time.h>
+ #include <pwd.h>
+ #include <grp.h>
+-- 
+1.8.3.4
+
+
+From adddad2e4b7bd548ba8a84a4bd44ed8fe298deef Mon Sep 17 00:00:00 2001
+From: Chris Roberts <cpr420@gmail.com>
+Date: Sun, 24 Nov 2013 20:46:25 -0700
+Subject: Search for xattr support on Haiku
+
+
+diff --git a/configure.ac b/configure.ac
+index 5c905fa..f3e0d5a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -184,6 +184,7 @@ AC_SUBST([enable_autogen])
+ AC_TRY_COMPILE([#include <sys/types.h>
+ #include <sys/acl.h>], [acl_t a], [AC_DEFINE([HAVE_SYS_ACL_H],[1], [define if you have sys/acl.h and it has a working acl_t type])])
+ AC_CHECK_HEADERS(ext2fs/ext2_fs.h sys/statfs.h sys/xattr.h sys/param.h sys/extattr.h libutil.h)
++AC_SEARCH_LIBS(getxattr, gnu)
+ AC_CHECK_FUNCS(lgetxattr)
+ AC_CHECK_FUNCS(lsetxattr)
+ AC_CHECK_FUNCS(getxattr)
+@@ -197,6 +198,8 @@ AC_CHECK_FUNCS(statvfs)
+ AC_CHECK_FUNCS(statfs)
+ AC_CHECK_FUNCS(strmode)
+ 
++AC_SEARCH_LIBS(strsep, bsd)
++
+ AC_CHECK_MEMBERS([struct statfs.f_fstypename],,,[#include <sys/types.h>
+ #include <sys/param.h>
+ #include <sys/mount.h>])
+diff --git a/lib/linuxattr.c b/lib/linuxattr.c
+index 29d8147..fd4f8e7 100644
+--- a/lib/linuxattr.c
++++ b/lib/linuxattr.c
+@@ -135,7 +135,7 @@ int32_t xar_linuxattr_write(xar_t x, xar_file_t f, void *buf, size_t len, void *
+ 
+ int32_t xar_linuxattr_archive(xar_t x, xar_file_t f, const char* file, const char *buffer, size_t len)
+ {
+-#if defined(HAVE_SYS_XATTR_H) && defined(HAVE_LGETXATTR) && !defined(__APPLE__)
++#if defined(HAVE_SYS_XATTR_H) && defined(HAVE_LGETXATTR) && !defined(__APPLE__) && !defined(__HAIKU__)
+ 	char *i, *buf = NULL;
+ 	int ret, retval=0, bufsz = 1024;
+ 	struct statfs sfs;
+@@ -200,7 +200,7 @@ BAIL:
+ 
+ int32_t xar_linuxattr_extract(xar_t x, xar_file_t f, const char* file, char *buffer, size_t len)
+ {
+-#if defined HAVE_SYS_XATTR_H && defined(HAVE_LSETXATTR) && !defined(__APPLE__)
++#if defined HAVE_SYS_XATTR_H && defined(HAVE_LSETXATTR) && !defined(__APPLE__) && !defined(__HAIKU__)
+ 	const char *fsname = "bogus";
+ 	struct statfs sfs;
+ 	int eaopt = 0;
+-- 
+1.8.3.4
+

app-arch/xar/xar-1.5.2.recipe

@@ -1,27 +1,86 @@
-DESCRIPTION="Easily extensible archiver"
+SUMMARY="Easily extensible archiver"
+DESCRIPTION="
+The XAR project aims to provide an easily extensible archive format. Important \
+design decisions include an easily extensible XML table of contents for random \
+access to archived files, storing the toc at the beginning of the archive to \
+allow for efficient handling of streamed archives, the ability to handle files \
+of arbitrarily large sizes, the ability to choose independent encodings for \
+individual files in the archive, the ability to store checksums for individual \
+files in both compressed and uncompressed form, and the ability to query the \
+table of content's rich meta-data.
+"
+LICENSE="BSD (3-clause)"
+COPYRIGHT="2005 Rob Braun"
 HOMEPAGE="http://code.google.com/p/xar/"
 SRC_URI="http://xar.googlecode.com/files/xar-1.5.2.tar.gz"
-CHECKSUM_MD5="8eabb055d3387b8edc30ecfb08d2e80d"
-REVISION="1"
-STATUS_HAIKU="stable"
-MESSAGE="This port builds only with gcc4. Use 'setgcc gcc4' before building."
-DEPEND=""
+CHECKSUM_SHA256="4c5d5682803cdfab16d72365cf51fc4075d597c5eeaa8c7d1990fea98cdae3e6"
+REVISION="2"
+ARCHITECTURES="x86"
+if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
+	# x86_gcc2 is fine as primary target architecture as long as we're building
+	# for a different secondary architecture.
+	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
+else
+	ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
+fi
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	xar$secondaryArchSuffix = $portVersion compat = 1.5.2
+	cmd:xar$secondaryArchSuffix = $portVersion compat = 1.5.2
+	lib:libxar$secondaryArchSuffix = $portVersion compat = 1.5.2
+	"
+
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libxml2$secondaryArchSuffix
+	lib:libcrypto$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	lib:libbz2$secondaryArchSuffix
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	devel:libxml2$secondaryArchSuffix
+	devel:libcrypto$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
+	devel:libbz2$secondaryArchSuffix
+	"
+
+BUILD_PREREQUIRES="
+	cmd:libtoolize
+	cmd:aclocal
+	cmd:autoconf
+	cmd:make
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	"
+
+PROVIDES_devel="
+	devel:libxar$secondaryArchSuffix = $portVersion compat = 1.5.2
+	"
+
+REQUIRES_devel="
+	xar$secondaryArchSuffix == $portVersion
+	"
+
+PATCHES="xar-1.5.2.patchset"
 
 BUILD()
 {
-	cd xar-1.5.2
 	libtoolize --force --copy --install
 	aclocal
 	autoconf
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
+	runConfigure ./configure
 	make
 }
 
 INSTALL()
 {
-	cd xar-1.5.2
 	make install
-}
 
-LICENSE="BSD (3-clause)"
-COPYRIGHT="2005 Rob Braun"
+	prepareInstalledDevelLibs libxar
+
+	packageEntries devel \
+	$developDir
+}

app-arch/xz_utils/xz_utils-5.0.1.recipe

@@ -1,7 +1,7 @@
 SUMMARY="Free general-purpose data compression software"
 HOMEPAGE="http://tukaani.org/xz/"
 SRC_URI="http://tukaani.org/xz/xz-5.0.1.tar.bz2"
-CHECKSUM_MD5="cb6c7a58cec4d663a395c54d186ca0c6"
+CHECKSUM_SHA256="9b380f502d37085a60821484a3a13747454638927cc36033be64970512451ed8"
 LICENSE="
 	GNU LGPL v2.1
 	GNU GPL v2

app-arch/xz_utils/xz_utils-5.0.4.recipe

@@ -1,14 +1,14 @@
 SUMMARY="Free general-purpose data compression software"
 HOMEPAGE="http://tukaani.org/xz/"
 SRC_URI="http://tukaani.org/xz/xz-5.0.4.tar.bz2"
-CHECKSUM_MD5="741cd3a5f64b23b7bac56ec5b2258715"
+CHECKSUM_SHA256="5cd9b060d3a1ad396b3be52c9b9311046a1c369e6062aea752658c435629ce92"
 LICENSE="
 	GNU LGPL v2.1
 	GNU GPL v2
 	GNU GPL v3
 	"
 COPYRIGHT="2005-2012 Lasse Collin"
-REVISION="2"
+REVISION="3"
 ARCHITECTURES="x86 x86_64"
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
 	# x86_gcc2 is fine as primary target architecture as long as we're building
@@ -88,6 +88,7 @@ INSTALL()
 	cp "$portDir/additional-files/xz_utils-expander-rules" \
 		"$expanderRulesDir/xz_utils"
 
+	fixPkgconfig liblzma
 	prepareInstalledDevelLibs liblzma
 }
 
@@ -96,16 +97,24 @@ TEST()
 	make check
 }
 
-DESCRIPTION="XZ Utils is free general-purpose data compression software with high compression ratio. XZ Utils were written for POSIX-like systems, but also work on some not-so-POSIX systems. XZ Utils are the successor to LZMA Utils.
-
-The core of the XZ Utils compression code is based on LZMA SDK, but it has been modified quite a lot to be suitable for XZ Utils. The primary compression algorithm is currently LZMA2, which is used inside the .xz container format. With typical files, XZ Utils create 30 % smaller output than gzip and 15 % smaller output than bzip2.
-
+DESCRIPTION="
+XZ Utils is free general-purpose data compression software with high \
+compression ratio. XZ Utils were written for POSIX-like systems, but also work \
+on some not-so-POSIX systems. XZ Utils are the successor to LZMA Utils.
+The core of the XZ Utils compression code is based on LZMA SDK, but it has \
+been modified quite a lot to be suitable for XZ Utils. The primary compression \
+algorithm is currently LZMA2, which is used inside the .xz container format. \
+With typical files, XZ Utils create 30 % smaller output than gzip and 15 % \
+smaller output than bzip2.
 XZ Utils consist of several components:
-
-    * liblzma is a compression library with API similar to that of zlib.
-    * xz is a command line tool with syntax similar to that of gzip.
-    * xzdec is a decompression-only tool smaller than the full-featured xz tool.
-    * A set of shell scripts (xzgrep, xzdiff, etc.) have been adapted from gzip to ease viewing, grepping, and comparing compressed files.
-    * Emulation of command line tools of LZMA Utils eases transition from LZMA Utils to XZ Utils.
-
-While liblzma has a zlib-like API, liblzma doesn't include any file I/O functions. A separate I/O library is planned, which would abstract handling of .gz, .bz2, and .xz files with an easy to use API."
+* liblzma is a compression library with API similar to that of zlib.
+* xz is a command line tool with syntax similar to that of gzip.
+* xzdec is a decompression-only tool smaller than the full-featured xz tool.
+* A set of shell scripts (xzgrep, xzdiff, etc.) have been adapted from gzip to \
+ease viewing, grepping, and comparing compressed files.
+* Emulation of command line tools of LZMA Utils eases transition from LZMA \
+Utils to XZ Utils.
+While liblzma has a zlib-like API, liblzma doesn't include any file I/O \
+functions. A separate I/O library is planned, which would abstract handling of \
+.gz, .bz2, and .xz files with an easy to use API.
+"

app-arch/xz_utils/xz_utils-5.0.5.recipe

@@ -0,0 +1,120 @@
+SUMMARY="Free general-purpose data compression software"
+HOMEPAGE="http://tukaani.org/xz/"
+SRC_URI="http://tukaani.org/xz/xz-5.0.5.tar.bz2"
+CHECKSUM_SHA256="166c48d2842519bc4f96333bff9e265f8cdda44d38e40594ef3f9bbb52890490"
+LICENSE="
+	GNU LGPL v2.1
+	GNU GPL v2
+	GNU GPL v3
+	"
+COPYRIGHT="2005-2013 Lasse Collin"
+REVISION="1"
+ARCHITECTURES="x86 x86_64"
+if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
+	# x86_gcc2 is fine as primary target architecture as long as we're building
+	# for a different secondary architecture.
+	ARCHITECTURES="$ARCHITECTURES ?x86_gcc2"
+else
+	ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
+fi
+SECONDARY_ARCHITECTURES="x86"
+
+ADDITIONAL_FILES="xz_utils-expander-rules"
+
+# On x86_gcc2 we don't want to install the commands in bin/<arch>/, but in bin/.
+commandSuffix=$secondaryArchSuffix
+commandBinDir=$binDir
+if [ "$targetArchitecture" = x86_gcc2 ]; then
+	commandSuffix=
+	commandBinDir=$prefix/bin
+fi
+
+PROVIDES="
+	xz_utils$secondaryArchSuffix = $portVersion compat >= 5
+	cmd:lzcat$commandSuffix = $portVersion compat >= 5
+	cmd:lzcmp$commandSuffix = $portVersion compat >= 5
+	cmd:lzdiff$commandSuffix = $portVersion compat >= 5
+	cmd:lzegrep$commandSuffix = $portVersion compat >= 5
+	cmd:lzfgrep$commandSuffix = $portVersion compat >= 5
+	cmd:lzgrep$commandSuffix = $portVersion compat >= 5
+	cmd:lzless$commandSuffix = $portVersion compat >= 5
+	cmd:lzma$commandSuffix = $portVersion compat >= 5
+	cmd:lzmadec$commandSuffix = $portVersion compat >= 5
+	cmd:lzmainfo$commandSuffix = $portVersion compat >= 5
+	cmd:lzmore$commandSuffix = $portVersion compat >= 5
+	cmd:unlzma$commandSuffix = $portVersion compat >= 5
+	cmd:unxz$commandSuffix = $portVersion compat >= 5
+	cmd:xz$commandSuffix = $portVersion compat >= 5
+	cmd:xzcat$commandSuffix = $portVersion compat >= 5
+	cmd:xzcmp$commandSuffix = $portVersion compat >= 5
+	cmd:xzdec$commandSuffix = $portVersion compat >= 5
+	cmd:xzdiff$commandSuffix = $portVersion compat >= 5
+	cmd:xzegrep$commandSuffix = $portVersion compat >= 5
+	cmd:xzfgrep$commandSuffix = $portVersion compat >= 5
+	cmd:xzgrep$commandSuffix = $portVersion compat >= 5
+	cmd:xzless$commandSuffix = $portVersion compat >= 5
+	cmd:xzmore$commandSuffix = $portVersion compat >= 5
+	lib:liblzma$secondaryArchSuffix = $portVersion compat >= 5
+	devel:liblzma$secondaryArchSuffix = $portVersion compat >= 5
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	"
+BUILD_REQUIRES="
+	"
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:libtoolize
+	cmd:make
+	"
+
+SOURCE_DIR="xz-$portVersion"
+
+BUILD()
+{
+	touch po/t-cs.gmo
+	runConfigure --omit-dirs binDir ./configure --bindir=$commandBinDir
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+
+	expanderRulesDir=$dataDir/expander/rules
+	mkdir -p $expanderRulesDir
+	cp "$portDir/additional-files/xz_utils-expander-rules" \
+		"$expanderRulesDir/xz_utils"
+
+	fixPkgconfig liblzma
+	prepareInstalledDevelLibs liblzma
+}
+
+TEST()
+{
+	make check
+}
+
+DESCRIPTION="
+XZ Utils is free general-purpose data compression software with high \
+compression ratio. XZ Utils were written for POSIX-like systems, but also work \
+on some not-so-POSIX systems. XZ Utils are the successor to LZMA Utils.
+The core of the XZ Utils compression code is based on LZMA SDK, but it has \
+been modified quite a lot to be suitable for XZ Utils. The primary compression \
+algorithm is currently LZMA2, which is used inside the .xz container format. \
+With typical files, XZ Utils create 30 % smaller output than gzip and 15 % \
+smaller output than bzip2.
+XZ Utils consist of several components:
+* liblzma is a compression library with API similar to that of zlib.
+* xz is a command line tool with syntax similar to that of gzip.
+* xzdec is a decompression-only tool smaller than the full-featured xz tool.
+* A set of shell scripts (xzgrep, xzdiff, etc.) have been adapted from gzip to \
+ease viewing, grepping, and comparing compressed files.
+* Emulation of command line tools of LZMA Utils eases transition from LZMA \
+Utils to XZ Utils.
+While liblzma has a zlib-like API, liblzma doesn't include any file I/O \
+functions. A separate I/O library is planned, which would abstract handling of \
+.gz, .bz2, and .xz files with an easy to use API.
+"

app-arch/zip/patches/zip-3.0.patch

@@ -1,122 +0,0 @@
-diff -Naur zip30-original/beos/beos.c zip30/beos/beos.c
---- zip30-original/beos/beos.c	2009-04-12 17:23:24.000000000 +0000
-+++ zip30/beos/beos.c	2009-04-12 15:11:50.000000000 +0000
-@@ -31,8 +31,12 @@
- 
- #include <kernel/fs_attr.h>
- #include <storage/Mime.h>
-+#ifdef __BEOS__
- #include <support/byteorder.h>
--
-+#endif
-+#ifdef __HAIKU__
-+#include <support/ByteOrder.h>
-+#endif
- 
- #define PAD 0
- #define PATH_END '/'
-diff -Naur zip30-original/tailor.h zip30/tailor.h
---- zip30-original/tailor.h	2009-04-12 17:23:24.000000000 +0000
-+++ zip30/tailor.h	2009-04-12 15:15:56.000000000 +0000
-@@ -52,7 +52,7 @@
- #include "atheos/osdep.h"
- #endif
- 
--#ifdef __BEOS__
-+#if (defined(__BEOS__) || defined(__HAIKU__))
- #include "beos/osdep.h"
- #endif
- 
-@@ -835,7 +835,7 @@
- #ifdef MVS
- #  define OS_CODE  0xf00
- #endif
--#ifdef __BEOS__
-+#if (defined(__BEOS__) || defined(__HAIKU__))
- #  define OS_CODE  0x1000
- #endif
- #ifdef TANDEM
-diff -Naur zip30-original/ttyio.c zip30/ttyio.c
---- zip30-original/ttyio.c	2009-04-12 17:23:25.000000000 +0000
-+++ zip30/ttyio.c	2009-04-12 14:05:26.000000000 +0000
-@@ -52,7 +52,7 @@
- #  define GLOBAL(g) G.g
- #endif
- 
--#if (defined(__ATHEOS__) || defined(__BEOS__))  /* why yes, we do */
-+#if (defined(__ATHEOS__) || defined(__BEOS__) || defined(__HAIKU__))  /* why yes, we do */
- #  define HAVE_TERMIOS_H
- #endif
- 
-diff -Naur zip30-original/ttyio.h zip30/ttyio.h
---- zip30-original/ttyio.h	2009-04-12 17:23:25.000000000 +0000
-+++ zip30/ttyio.h	2009-04-12 14:06:12.000000000 +0000
-@@ -60,7 +60,7 @@
- #  endif
- #endif
- 
--#if (defined(__ATHEOS__) || defined(__BEOS__) || defined(UNIX))
-+#if (defined(__ATHEOS__) || defined(__BEOS__) || defined(__HAIKU__) || defined(UNIX))
- #  ifndef ATH_BEO_UNX
- #    define ATH_BEO_UNX
- #  endif
-diff -Naur zip30-original/zip.c zip30/zip.c
---- zip30-original/zip.c	2009-04-12 17:23:25.000000000 +0000
-+++ zip30/zip.c	2009-04-12 14:06:31.000000000 +0000
-@@ -1845,7 +1845,7 @@
- int set_filetype(out_path)
-   char *out_path;
- {
--#ifdef __BEOS__
-+#if (defined(__BEOS__) || defined(__HAIKU__))
-   /* Set the filetype of the zipfile to "application/zip" */
-   setfiletype( out_path, "application/zip" );
- #endif
-diff -Naur zip30-original/zipcloak.c zip30/zipcloak.c
---- zip30-original/zipcloak.c	2009-04-12 17:23:25.000000000 +0000
-+++ zip30/zipcloak.c	2009-04-12 14:06:59.000000000 +0000
-@@ -54,7 +54,7 @@
- int set_filetype(out_path)
-   char *out_path;
- {
--#ifdef __BEOS__
-+#if (defined(__BEOS__) || defined(__HAIKU__))
-   /* Set the filetype of the zipfile to "application/zip" */
-   setfiletype( out_path, "application/zip" );
- #endif
-diff -Naur zip30-original/zipnote.c zip30/zipnote.c
---- zip30-original/zipnote.c	2009-04-12 17:23:25.000000000 +0000
-+++ zip30/zipnote.c	2009-04-12 14:07:19.000000000 +0000
-@@ -72,7 +72,7 @@
- int set_filetype(out_path)
-   char *out_path;
- {
--#ifdef __BEOS__
-+#if (defined(__BEOS__) || defined(__HAIKU__))
-   /* Set the filetype of the zipfile to "application/zip" */
-   setfiletype( out_path, "application/zip" );
- #endif
-diff -Naur zip30-original/zipsplit.c zip30/zipsplit.c
---- zip30-original/zipsplit.c	2009-04-12 17:23:25.000000000 +0000
-+++ zip30/zipsplit.c	2009-04-12 14:07:37.000000000 +0000
-@@ -96,7 +96,7 @@
- int set_filetype(out_path)
-   char *out_path;
- {
--#ifdef __BEOS__
-+#if (defined(__BEOS__) || defined(__HAIKU__))
-   /* Set the filetype of the zipfile to "application/zip" */
-   setfiletype( out_path, "application/zip" );
- #endif
-diff -Naur zip30-original/zipup.c zip30/zipup.c
---- zip30-original/zipup.c	2009-04-12 17:23:25.000000000 +0000
-+++ zip30/zipup.c	2009-04-12 14:07:58.000000000 +0000
-@@ -68,7 +68,7 @@
- #  include "atari/zipup.h"
- #endif
- 
--#ifdef __BEOS__
-+#if (defined(__BEOS__) || defined(__HAIKU__))
- #  include "beos/zipup.h"
- #endif
- 

app-arch/zip/patches/zip-3.0.patchset

@@ -0,0 +1,436 @@
+From 6041b90bd0edc53e7596d2e18119cde24987b314 Mon Sep 17 00:00:00 2001
+From: Kacper Kasper <kacperkasper@gmail.com>
+Date: Thu, 3 Apr 2014 20:58:47 +0000
+Subject: Haiku support
+
+
+diff --git a/beos/Makefile b/beos/Makefile
+index 1b9e613..d66e6e3 100644
+--- a/beos/Makefile
++++ b/beos/Makefile
+@@ -22,16 +22,30 @@ BIND = $(CC)
+ AS   = $(CC) -c
+ CPP  = $(CC) -E
+ 
+-INSTALL = install
++# probably can change this to 'install' if you have it
++INSTALL_PROGRAM = cp
++# probably can change this to 'install -d' if you have it
++# XXX NextStep 3.3 and Openstep 4.x don't know about -p !
++INSTALL_D = mkdir -p
++CHMOD = chmod
++BINFLAGS = 755
++MANFLAGS = 644
+ 
+ # Target directories
+-prefix = /boot/home/config
+-BINDIR = $(prefix)/bin
+-manext = 1
+-MANDIR = $(prefix)/man/man$(manext)
++PREFIX = `finddir B_COMMON_DIRECTORY`
++BINDIR = $(PREFIX)/bin
++MANEXT = 1
++MANDIR = $(PREFIX)/documentation/man
++MANDIRF = $(MANDIR)/man$(MANEXT)
++INCLUDEDIR = `finddir B_SYSTEM_DEVELOP_DIRECTORY`/headers
++LIBDIR = `finddir B_SYSTEM_LIB_DIRECTORY`
+ ZIPMANUAL = MANUAL
+-
+-VERSION = Version 2.3 of __DATE__
++ZIPMANUALcloak = zipcloak.txt
++ZIPMANUALnote = zipnote.txt
++ZIPMANUALsplit = zipsplit.txt
++ZIPMANUALs = zip.txt zipcloak.txt zipnote.txt zipsplit.txt
++PKGDIR = IZzip
++VERSION = Version 3.0
+ 
+ ######################################################################
+ # Things that change:
+@@ -65,14 +79,14 @@ CC:=gcc
+ 
+ # Removed -Wconversion and -Wshadow because of the unnecessary warnings 
+ # they generate. - Sept. 28, 1999
+-CFLAGS:=-O3 -mpentiumpro \
++CFLAGS:=-O3  \
+ 		-Wall -Wno-multichar -Wno-ctor-dtor-privacy \
+ 		-Wbad-function-cast -Woverloaded-virtual \
+-		-I. -I/boot/develop/headers/be/support \
+-	    -I/boot/develop/headers/be/storage \
++		-I. -I$(INCLUDEDIR)/be/support \
++	    -I$(INCLUDEDIR)/be/storage \
+ 	    -DHAVE_DIRENT_H -DPASSWD_FROM_STDIN # -DASMV
+ LFLAGS1:=
+-LFLAGS2:=-L/boot/develop/lib/x86 -lbe -lroot
++LFLAGS2:=-L$(LIBDIR) -lbe -lroot
+ OBJA = #match.o
+ TARGET=$(ZIPS)
+ 
+@@ -88,44 +102,40 @@ all:
+ ######################################################################
+ # Object file lists and other build goodies
+ 
+-# Object file lists
++# object file lists
+ OBJZ = zip.o zipfile.o zipup.o fileio.o util.o globals.o crypt.o ttyio.o \
+-       beos.o crc32.o
++       beos.o crc32.o zbz2err.o setfiletype.o
+ OBJI = deflate.o trees.o
+-# OBJA moved into ifeq block above; we'll use assembly for x86
+-OBJU = zipfile_.o fileio_.o util_.o globals.o beos_.o
++OBJA =
++OCRCU8 =
++OCRCTB = crc32_.o
++OBJU = zipfile_.o fileio_.o util_.o globals.o beos_.o setfiletype.o $(OCRCU8)
+ OBJN = zipnote.o  $(OBJU)
+-OBJC = zipcloak.o $(OBJU) crc32_.o crypt_.o ttyio.o
++OBJC = zipcloak.o $(OBJU) $(OCRCTB) crypt_.o ttyio.o
+ OBJS = zipsplit.o $(OBJU)
+ 
+-# Headers
+ ZIP_H = zip.h ziperr.h tailor.h beos/osdep.h
+ 
+-# What to build?
+-ZIPS = zip zipnote zipsplit zipcloak
+-
+ # suffix rules
+ .SUFFIXES:
+ .SUFFIXES: _.o .o .c .doc .1
+ .c_.o:
+-	rm -f $*_.c; $(LN) $< $*_.c
+-	$(CC) -c $(CFLAGS) -DUTIL $*_.c
+-	rm -f $*_.c
++	$(CC) -c $(CFLAGS) -DUTIL -o $@ $<
+ 
+ .c.o:
+ 	$(CC) -c $(CFLAGS) $<
+ 
+ .1.doc:
+-	groff -man -Tascii $< > $@
++	nroff -man $< | col -bx | uniq > $@
+ 
+-# rules for zip, zipnote, zipcloak, zipsplit, and the Zip MANUAL.
++# rules for zip, zipnote, zipcloak, zipsplit, and the Zip MANUALs.
+ $(OBJZ): $(ZIP_H)
+ $(OBJI): $(ZIP_H)
+ $(OBJN): $(ZIP_H)
+ $(OBJS): $(ZIP_H)
+ $(OBJC): $(ZIP_H)
+-zip.o crc32.o crypt.o fileio.o zipfile.o zipup.o: crc32.h
+-zipcloak.o crc32_.o crypt_.o fileio_.o zipfile_.o: crc32.h
++zip.o zipup.o zipfile.o fileio.o crc32.o crypt.o: crc32.h
++zipcloak.o zipfile_.o fileio_.o crc32_.o crypt_.o: crc32.h
+ zip.o zipup.o crypt.o ttyio.o zipcloak.o crypt_.o: crypt.h
+ zip.o zipup.o zipnote.o zipcloak.o zipsplit.o: revision.h
+ zip.o crypt.o ttyio.o zipcloak.o crypt_.o: ttyio.h
+@@ -134,42 +144,69 @@ zipup.o: beos/zipup.h
+ match.o: match.S
+ 	$(CPP) match.S > _match.s
+ 	$(AS) _match.s
+-	mv -f _match.o match.o
++	mv _match.o match.o
+ 	rm -f _match.s
+ 
++crc_i386.o: crc_i386.S
++	$(CPP) crc_i386.S > _crc_i386.s
++	$(AS) _crc_i386.s
++	mv _crc_i386.o crc_i386.o
++	rm -f _crc_i386.s
++
+ beos.o: beos/beos.c
+ 	$(CC) -c $(CFLAGS) beos/beos.c
+ 
+ beos_.o: beos/beos.c
+-	rm -f $*_.c; $(LN) beos/beos.c $*_.c
+-	$(CC) -c $(CFLAGS) -DUTIL $*_.c
+-	rm -f $*_.c
++	$(CC) -c $(CFLAGS) -DUTIL -o $@ beos/beos.c
++	
++setfiletype.o: beos/setfiletype.c
++	$(CC) -c $(CFLAGS) -o $@ beos/setfiletype.c
++
++ZIPS = zip$E zipcloak$E zipnote$E zipsplit$E
+ 
+ zips: $(ZIPS)
+-zipsman: $(ZIPS) $(ZIPMANUAL)
++zipsman: $(ZIPS) $(ZIPMANUALs)
+ 
+-zip: $(OBJZ) $(OBJI) $(OBJA)
+-	$(BIND) -o zip $(LFLAGS1) $(OBJZ) $(OBJI) $(OBJA) $(LFLAGS2)
+-zipnote: $(OBJN)
+-	$(BIND) -o zipnote $(LFLAGS1) $(OBJN) $(LFLAGS2)
+-zipcloak: $(OBJC)
+-	$(BIND) -o zipcloak $(LFLAGS1) $(OBJC) $(LFLAGS2)
+-zipsplit: $(OBJS)
+-	$(BIND) -o zipsplit $(LFLAGS1) $(OBJS) $(LFLAGS2)
++zip$E: $(OBJZ) $(OBJI) $(OBJA) $(LIB_BZ)
++	$(BIND) -o zip$E $(LFLAGS1) $(OBJZ) $(OBJI) $(OBJA) $(LFLAGS2)
++zipnote$E: $(OBJN)
++	$(BIND) -o zipnote$E $(LFLAGS1) $(OBJN) $(LFLAGS2)
++zipcloak$E: $(OBJC) $(OCRCTB)
++	$(BIND) -o zipcloak$E $(LFLAGS1) $(OBJC) $(LFLAGS2)
++zipsplit$E: $(OBJS)
++	$(BIND) -o zipsplit$E $(LFLAGS1) $(OBJS) $(LFLAGS2)
+ 
+ $(ZIPMANUAL): man/zip.1
+-	groff -man -Tascii man/zip.1 > $(ZIPMANUAL)
++	nroff -man man/zip.1 | col -bx | uniq > $(ZIPMANUAL)
++
++$(ZIPMANUALcloak): man/zipcloak.1
++	nroff -man man/zipcloak.1 | col -bx | uniq > $(ZIPMANUALcloak)
+ 
++$(ZIPMANUALnote): man/zipnote.1
++	nroff -man man/zipnote.1 | col -bx | uniq > $(ZIPMANUALnote)
++
++$(ZIPMANUALsplit): man/zipsplit.1
++	nroff -man man/zipsplit.1 | col -bx | uniq > $(ZIPMANUALsplit)
++	
+ # install
+ install:        $(ZIPS)
+-	$(INSTALL) -m755 $(ZIPS) $(BINDIR)
+-	mkdir -p $(MANDIR)
+-	$(INSTALL) -m644 man/zip.1 $(MANDIR)/zip.$(manext)
++	-$(INSTALL_D) $(BINDIR)
++	$(INSTALL_PROGRAM) $(ZIPS) $(BINDIR)
++	-cd $(BINDIR); $(CHMOD) $(BINFLAGS) $(ZIPS)
++	-$(INSTALL_D) $(MANDIRF)
++	$(INSTALL_PROGRAM) man/zip.1 $(MANDIRF)/zip.$(MANEXT)
++	$(CHMOD) $(MANFLAGS) $(MANDIRF)/zip.$(MANEXT)
++	$(INSTALL_PROGRAM) man/zipcloak.1 $(MANDIRF)/zipcloak.$(MANEXT)
++	$(CHMOD) $(MANFLAGS) $(MANDIRF)/zipcloak.$(MANEXT)
++	$(INSTALL_PROGRAM) man/zipnote.1 $(MANDIRF)/zipnote.$(MANEXT)
++	$(CHMOD) $(MANFLAGS) $(MANDIRF)/zipnote.$(MANEXT)
++	$(INSTALL_PROGRAM) man/zipsplit.1 $(MANDIRF)/zipsplit.$(MANEXT)
++	$(CHMOD) $(MANFLAGS) $(MANDIRF)/zipsplit.$(MANEXT)
+ 
+ uninstall:
+ 	-cd $(BINDIR); rm -f $(ZIPS)
+-	-cd $(MANDIR); rm -f zip.$(manext)
+-
++	-cd $(MANDIRF); rm -f \
++	 zip.$(MANEXT) zipcloak.$(MANEXT) zipnote.$(MANEXT) zipsplit.$(MANEXT)
+ dist: $(ZIPMANUAL)
+ 	zip -u9T zip`sed -e '/VERSION/!d' -e 's/.*"\(.*\)".*/\1/' \
+ 			  -e s/[.]//g -e q revision.h` \
+diff --git a/beos/beos.c b/beos/beos.c
+index d8d16df..d8df5d5 100644
+--- a/beos/beos.c
++++ b/beos/beos.c
+@@ -31,7 +31,7 @@
+ 
+ #include <kernel/fs_attr.h>
+ #include <storage/Mime.h>
+-#include <support/byteorder.h>
++#include <support/ByteOrder.h>
+ 
+ 
+ #define PAD 0
+@@ -851,32 +851,6 @@ int set_extra_field(z, z_utim)
+     return ZE_OK;
+ }
+ 
+-/* ---------------------------------------------------------------------- */
+-/* Set a file's MIME type.                                                */
+-void setfiletype( const char *file, const char *type )
+-{
+-    int fd;
+-    attr_info fa;
+-    ssize_t wrote_bytes;
+-
+-    fd = open( file, O_RDWR );
+-    if( fd < 0 ) {
+-        zipwarn( "can't open zipfile to write file type", "" );
+-        return;
+-    }
+-
+-    fa.type = B_MIME_STRING_TYPE;
+-    fa.size = (off_t)(strlen( type ) + 1);
+-
+-    wrote_bytes = fs_write_attr( fd, BE_FILE_TYPE_NAME, fa.type, 0,
+-                                 type, fa.size );
+-    if( wrote_bytes != (ssize_t)fa.size ) {
+-        zipwarn( "couldn't write complete file type", "" );
+-    }
+-
+-    close( fd );
+-}
+-
+ int deletedir(d)
+ char *d;                /* directory to delete */
+ /* Delete the directory *d if it is empty, do nothing otherwise.
+diff --git a/beos/setfiletype.c b/beos/setfiletype.c
+new file mode 100644
+index 0000000..cd8dd2e
+--- /dev/null
++++ b/beos/setfiletype.c
+@@ -0,0 +1,33 @@
++#include <fcntl.h>
++#include <string.h>
++
++#include <kernel/fs_attr.h>
++#include <storage/Mime.h>
++
++#include "beos/osdep.h"
++
++/* ---------------------------------------------------------------------- */
++/* Set a file's MIME type.                                                */
++void setfiletype( const char *file, const char *type )
++{
++    int fd;
++    attr_info fa;
++    ssize_t wrote_bytes;
++
++    fd = open( file, O_RDWR );
++    if( fd < 0 ) {
++        zipwarn( "can't open zipfile to write file type", "" );
++        return;
++    }
++
++    fa.type = B_MIME_STRING_TYPE;
++    fa.size = (off_t)(strlen( type ) + 1);
++
++    wrote_bytes = fs_write_attr( fd, BE_FILE_TYPE_NAME, fa.type, 0,
++                                 type, fa.size );
++    if( wrote_bytes != (ssize_t)fa.size ) {
++        zipwarn( "couldn't write complete file type", "" );
++    }
++
++    close( fd );
++}
+diff --git a/tailor.h b/tailor.h
+index 272f979..579609a 100644
+--- a/tailor.h
++++ b/tailor.h
+@@ -52,7 +52,7 @@
+ #include "atheos/osdep.h"
+ #endif
+ 
+-#ifdef __BEOS__
++#if (defined(__BEOS__) || defined(__HAIKU__))
+ #include "beos/osdep.h"
+ #endif
+ 
+diff --git a/ttyio.c b/ttyio.c
+index 5899fdc..15cc835 100644
+--- a/ttyio.c
++++ b/ttyio.c
+@@ -52,7 +52,7 @@
+ #  define GLOBAL(g) G.g
+ #endif
+ 
+-#if (defined(__ATHEOS__) || defined(__BEOS__))  /* why yes, we do */
++#if (defined(__ATHEOS__) || defined(__BEOS__) || defined(__HAIKU__))  /* why yes, we do */
+ #  define HAVE_TERMIOS_H
+ #endif
+ 
+diff --git a/ttyio.h b/ttyio.h
+index df6a4ed..5180af1 100644
+--- a/ttyio.h
++++ b/ttyio.h
+@@ -60,7 +60,7 @@
+ #  endif
+ #endif
+ 
+-#if (defined(__ATHEOS__) || defined(__BEOS__) || defined(UNIX))
++#if (defined(__ATHEOS__) || defined(__BEOS__) || defined(__HAIKU__) || defined(UNIX))
+ #  ifndef ATH_BEO_UNX
+ #    define ATH_BEO_UNX
+ #  endif
+diff --git a/zip.c b/zip.c
+index 439821f..173d922 100644
+--- a/zip.c
++++ b/zip.c
+@@ -1845,7 +1845,7 @@ int rename_split(temp_name, out_path)
+ int set_filetype(out_path)
+   char *out_path;
+ {
+-#ifdef __BEOS__
++#if (defined(__BEOS__) || defined(__HAIKU__))
+   /* Set the filetype of the zipfile to "application/zip" */
+   setfiletype( out_path, "application/zip" );
+ #endif
+diff --git a/zip.h b/zip.h
+index ba03160..208a0c7 100644
+--- a/zip.h
++++ b/zip.h
+@@ -78,12 +78,6 @@ freely, subject to the above disclaimer and the following restrictions:
+ 
+ #define ZIP   /* for crypt.c:  include zip password functions, not unzip */
+ 
+-/* Types centralized here for easy modification */
+-#define local static            /* More meaningful outside functions */
+-typedef unsigned char uch;      /* unsigned 8-bit value */
+-typedef unsigned short ush;     /* unsigned 16-bit value */
+-typedef unsigned long ulg;      /* unsigned 32-bit value */
+-
+ /* Set up portability */
+ #include "tailor.h"
+ 
+@@ -129,6 +123,13 @@ typedef unsigned long ulg;      /* unsigned 32-bit value */
+ #  define MATCH shmatch         /* Default for pattern matching: UNIX style */
+ #endif
+ 
++/* Types centralized here for easy modification */
++#define local static            /* More meaningful outside functions */
++typedef unsigned char uch;      /* unsigned 8-bit value */
++typedef unsigned short ush;     /* unsigned 16-bit value */
++typedef unsigned long ulg;      /* unsigned 32-bit value */
++
++
+ /* Structure carrying extended timestamp information */
+ typedef struct iztimes {
+    time_t atime;                /* new access time */
+diff --git a/zipcloak.c b/zipcloak.c
+index 37bd414..f3afc36 100644
+--- a/zipcloak.c
++++ b/zipcloak.c
+@@ -54,7 +54,7 @@ ZCONST uLongf *crc_32_tab;
+ int set_filetype(out_path)
+   char *out_path;
+ {
+-#ifdef __BEOS__
++#if (defined(__BEOS__) || defined(__HAIKU__))
+   /* Set the filetype of the zipfile to "application/zip" */
+   setfiletype( out_path, "application/zip" );
+ #endif
+diff --git a/zipnote.c b/zipnote.c
+index 5e02cb6..315a3de 100644
+--- a/zipnote.c
++++ b/zipnote.c
+@@ -72,7 +72,7 @@ void zipnotewarn(ZCONST char *a, ZCONST char *b);
+ int set_filetype(out_path)
+   char *out_path;
+ {
+-#ifdef __BEOS__
++#if (defined(__BEOS__) || defined(__HAIKU__))
+   /* Set the filetype of the zipfile to "application/zip" */
+   setfiletype( out_path, "application/zip" );
+ #endif
+diff --git a/zipsplit.c b/zipsplit.c
+index 8db76a1..ecced0c 100644
+--- a/zipsplit.c
++++ b/zipsplit.c
+@@ -96,7 +96,7 @@ int talln = 0;          /* number of entries in talls[] */
+ int set_filetype(out_path)
+   char *out_path;
+ {
+-#ifdef __BEOS__
++#if (defined(__BEOS__) || defined(__HAIKU__))
+   /* Set the filetype of the zipfile to "application/zip" */
+   setfiletype( out_path, "application/zip" );
+ #endif
+diff --git a/zipup.c b/zipup.c
+index 39f7d9c..80c3101 100644
+--- a/zipup.c
++++ b/zipup.c
+@@ -68,7 +68,7 @@
+ #  include "atari/zipup.h"
+ #endif
+ 
+-#ifdef __BEOS__
++#if (defined(__BEOS__) || defined(__HAIKU__))
+ #  include "beos/zipup.h"
+ #endif
+ 
+-- 
+1.8.3.4
+

app-arch/zip/zip-3.0.recipe

@@ -1,30 +1,51 @@
-DESCRIPTION="zip" 
-HOMEPAGE="http://www.info-zip.org/Zip.html" 
+SUMMARY="Compression utility for zip archives"
+DESCRIPTION="
+Zip is a compression and packaging utility with high \
+portability. It supports password-based encryption of files and filenames, \
+incremental backups and multi-part archives.
+"
+HOMEPAGE="http://www.info-zip.org/Zip.html"
 SRC_URI="http://downloads.sourceforge.net/project/infozip/Zip%203.x%20%28latest%29/3.0/zip30.tar.gz"
+CHECKSUM_SHA256="f0e8bb1f9b7eb0b01285495a2699df3a4b766784c1765a8f1aeedf63c0806369"
 REVISION="1"
-STATUS_HAIKU="broken"
-DEPEND=""
-CHECKSUM_MD5="7b74551e63f8ee6aab6fbc86676c0d37"
+LICENSE="Info-ZIP"
+COPYRIGHT="1990-2008 Info-ZIP"
+
+ARCHITECTURES="x86 x86_gcc2"
+
+PATCHES="$portName-$portVersion.patchset"
+
+PROVIDES="
+	$portName = $portVersion
+	cmd:zip = $portVersion
+	cmd:zipcloak = $portVersion
+	cmd:zipnote = $portVersion
+	cmd:zipsplit = $portVersion
+	"
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+BUILD_REQUIRES="
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	cmd:gcc
+	cmd:ld
+	cmd:make
+	"
+	
+SOURCE_DIR="zip30"
+
 BUILD()
 {
-	cd zip30
-	make -f beos/Makefile \
-		PREFIX=`finddir B_COMMON_DIRECTORY` \
-		MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
+	make $jobArgs -f beos/Makefile
 }
 
 INSTALL()
 {
-	cd zip30
-	make -f beos/Makefile install
+	make -f beos/Makefile install \
+		BINDIR=$binDir \
+		INCLUDEDIR=$includeDir \
+		LIBDIR=$libDir \
+		MANDIR=$manDir
 }
-
-TEST()
-{
-	cd zip30
-#	make test
-#	make check
-}
-
-#LICENSE="Info-Zip"
-#COPYRIGHT=""

app-arch/zoo/zoo-2.10.recipe

@@ -1,5 +1,13 @@
-DESCRIPTION="Manipulate archives of files in compressed form" 
-HOMEPAGE="unknown" 
+SUMMARY="Zoo archive utility"
+DESCRIPTION="
+Zoo is a compression utility. It uses LZW compression algorithm \
+which compresses files to 20-80% of their original size depending on the data type. \
+Zoo can store and selectively extract multiple generations of the same file.
+
+This package exists for its historical value. If you are looking for a compression \
+tool for serious use, check tar and gzip.
+"
+HOMEPAGE="unknown"
 SRC_URI="ftp://ftp.kiarchive.ru/pub/unix/arcers/zoo-2.10pl1.tar.gz"
 CHECKSUM_MD5="70a0a785ecc8f7f747be1421e495d837"
 REVISION="1"

app-benchmarks/bonnie++/bonnie++-1.03e.recipe

@@ -1,27 +1,60 @@
-DESCRIPTION="Multi-producer-multi-consumer signal dispatching mechanism in python"
-HOMEPAGE="http://www.coker.com.au/bonnie++/"
-SRC_URI="http://www.coker.com.au/bonnie++/bonnie++-1.03e.tgz"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-CHECKSUM_MD5="750aa5b5051263a99c6c195888c74968"
-BUILD()
-{
-        cd bonnie++-1.03e
-        COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
-        COMMON_BIN=`finddir B_COMMON_BIN_DIRECTORY`
-        ./configure --prefix=`finddir B_COMMON_DIRECTORY` \
-		--mandir=$COMMON_DOCS/man \
-		--bindir=$COMMON_BIN \
-		--sbindir=$COMMON_BIN
-        make
-}
-INSTALL()
-{
-        cd bonnie++-1.03e
-        make install DESTDIR=${DESTDIR}
-
-}
+SUMMARY="Bonnie++ is a benchmark and test suite for filesystems"
+DESCRIPTION="
+Bonnie++ is a benchmark suite that is aimed at performing a number of simple \
+tests of hard drive and file system performance. Then you can decide which \
+test is important and decide how to compare different systems after running \
+it. I have no plans to ever have it produce a single number, because I don't \
+think that a single number can be useful when comparing such things.
+The main program tests database type access to a single file (or a set of \
+files if you wish to test more than 1G of storage), and it tests creation, \
+reading, and deleting of small files which can simulate the usage of programs \
+such as Squid, INN, or Maildir format email.
+The ZCAV program which I initially released as a seperate package tests the \
+performance of different zones of a hard drive. It does not write any data (so \
+you can use it on full file systems). It can show why comparing the speed of \
+Windows at the start of a hard drive to Linux at the end of the hard drive \
+(typical dual-boot scenario) isn't a valid comparison.
+"
 LICENSE="GNU GPL v2"
 COPYRIGHT="1990, Tim Bray
 	1999, Russell Coker"
+HOMEPAGE="http://www.coker.com.au/bonnie++/"
+SRC_URI="http://www.coker.com.au/bonnie++/bonnie++-1.03e.tgz"
+CHECKSUM_SHA256="cb3866116634bf65760b6806be4afa7e24a1cad6f145c876df8721f01ba2e2cb"
+REVISION="1"
+ARCHITECTURES="x86 ?x86_gcc2 ?x86_64"
+
+PROVIDES="
+	bonnie++ = $portVersion
+	cmd:bonnie++ = $portVersion
+	cmd:zcav = $portVersion
+	cmd:bon_csv2html = $portVersion
+	cmd:bon_csv2txt = $portVersion
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	"
+
+BUILD_PREREQUIRES="
+	cmd:make
+	cmd:g++
+	"
+
+BUILD()
+{
+	runConfigure ./configure \
+	--sbindir=$binDir
+	make
+}
+
+INSTALL()
+{
+	make install
+	mv $prefix/sbin/* $binDir
+	rm -rf $prefix/sbin
+}

app-benchmarks/bonnie++/patches/bonnie++-1.03e.patch

@@ -1,24 +0,0 @@
-diff -urN bonnie++-1.03e/Makefile.in bonnie++-1.03e-haiku/Makefile.in
---- bonnie++-1.03e/Makefile.in	2002-10-13 20:26:36.041418752 +0000
-+++ bonnie++-1.03e-haiku/Makefile.in	2011-01-04 12:23:13.153616384 +0000
-@@ -33,14 +33,14 @@
- 	$(CXX) zcav.cpp -o zcav $(ZCAVOBJS) $(LFLAGS)
- 
- install-bin: $(EXES)
--	mkdir -p $(eprefix)/bin $(eprefix)/sbin
--	@INSTALL_PROGRAM@ @stripping@ $(EXES) $(eprefix)/sbin
--	@INSTALL_SCRIPT@ $(SCRIPTS) $(eprefix)/bin
-+	mkdir -p $(DESTDIR)$(eprefix)/bin $(DESTDIR)$(eprefix)/sbin
-+	@INSTALL_PROGRAM@ @stripping@ $(EXES) $(DESTDIR)$(eprefix)/sbin
-+	@INSTALL_SCRIPT@ $(SCRIPTS) $(DESTDIR)$(eprefix)/bin
- 
- install: install-bin
--	mkdir -p @mandir@/man1 @mandir@/man8
--	@INSTALL_DATA@ $(MAN1) @mandir@/man1
--	@INSTALL_DATA@ $(MAN8) @mandir@/man8
-+	mkdir -p $(DESTDIR)@mandir@/man1 $(DESTDIR)@mandir@/man8
-+	@INSTALL_DATA@ $(MAN1) $(DESTDIR)@mandir@/man1
-+	@INSTALL_DATA@ $(MAN8) $(DESTDIR)@mandir@/man8
- 
- %.o: %.cpp %.h bonnie.h port.h
- 	$(CXX) -c $<

app-benchmarks/ffsb/ffsb-6.0_rc2.recipe

@@ -1,25 +1,57 @@
-DESCRIPTION="Flexible Filesystem Benchmark" 
+SUMMARY="Flexible Filesystem Benchmark"
+DESCRIPTION="
+The Flexible Filesystem Benchmark (FFSB) is a cross-platform filesystem \
+performance measurement tool. It uses customizable profiles to measure of \
+different workloads, and it supports multiple groups of threads across \
+multiple filesystems.
+"
+LICENSE="GNU GPL v2"
+COPYRIGHT="2001-2004 International Business Machines Corp."
 HOMEPAGE="http://sourceforge.net/projects/ffsb" 
 SRC_URI="http://downloads.sourceforge.net/project/ffsb/ffsb/ffsb-6.0-rc2/ffsb-6.0-rc2.tar.bz2"
+CHECKSUM_SHA256="e5867692aae8c9bfbcdc774599022289c4d89c1d90f4dd7101fb9865ac773c71"
 REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-CHECKSUM_MD5="cabfc1021c2ec6c6b168fefc84210891"
+ARCHITECTURES="x86 ?x86_gcc2 ?x86_64"
+
+PROVIDES="
+	ffsb = $portVersion
+	cmd:ffsb = $portVersion
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	"
+
+BUILD_PREREQUIRES="
+	cmd:libtoolize
+	cmd:aclocal
+	cmd:autoconf
+	cmd:automake
+	cmd:make
+	cmd:gcc
+	"
+
+SOURCE_DIR="ffsb-6.0-rc2"
+
+PATCHES="ffsb-6.0_rc2.patchset"
+
 BUILD()
 {
-	cd ffsb-6.0-rc2
 	libtoolize --force --copy --install
 	aclocal
 	autoconf
 	automake
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
+	runConfigure ./configure
 	make
 }
 
 INSTALL()
 {
-	cd ffsb-6.0-rc2
 	make install
+	mkdir -p $docDir
+	cp -af README $docDir
 }
-LICENSE="GNU GPL v2"
-COPYRIGHT="2001-2004 International Business Machines Corp."

app-benchmarks/ffsb/patches/ffsb-6.0_rc2.patchset

@@ -1,7 +1,14 @@
-diff -urN ffsb-6.0-rc2/fh.c ffsb-6.0-rc2-haiku/fh.c
---- ffsb-6.0-rc2/fh.c	2008-10-27 20:17:05.051118080 +0000
-+++ ffsb-6.0-rc2-haiku/fh.c	2010-09-23 14:01:27.966262784 +0000
-@@ -74,7 +74,9 @@
+From ed4728017e63bf8b6046da6542287a22ceeb1944 Mon Sep 17 00:00:00 2001
+From: Chris Roberts <cpr420@gmail.com>
+Date: Sun, 24 Nov 2013 23:50:21 -0700
+Subject: applying patch ffsb-6.0-rc2.patch
+
+
+diff --git a/fh.c b/fh.c
+index f99b455..a1e8236 100644
+--- a/fh.c
++++ b/fh.c
+@@ -74,7 +74,9 @@ static int fhopenhelper(char *filename, char *bufflags, int flags,
  	int need_stats = ft_needs_stats(ft, SYS_OPEN) ||
  		fs_needs_stats(fs, SYS_OPEN);
  
@@ -12,10 +19,11 @@ diff -urN ffsb-6.0-rc2/fh.c ffsb-6.0-rc2-haiku/fh.c
  
  	if (need_stats)
  		gettimeofday(&start, NULL);
-diff -urN ffsb-6.0-rc2/parser.c ffsb-6.0-rc2-haiku/parser.c
---- ffsb-6.0-rc2/parser.c	2008-10-27 20:17:05.048234496 +0000
-+++ ffsb-6.0-rc2-haiku/parser.c	2010-09-23 14:01:27.976486400 +0000
-@@ -320,7 +320,8 @@
+diff --git a/parser.c b/parser.c
+index 8f3f086..98d8479 100644
+--- a/parser.c
++++ b/parser.c
+@@ -320,7 +320,8 @@ static container_t *init_container(void)
  static int set_option(char *buf, config_options_t *options)
  {
  	void *value;
@@ -25,7 +33,7 @@ diff -urN ffsb-6.0-rc2/parser.c ffsb-6.0-rc2-haiku/parser.c
  	while (options->name) {
  		switch (options->type) {
  		case TYPE_WEIGHT:
-@@ -392,7 +393,6 @@
+@@ -392,7 +393,6 @@ out:
  			INIT_LIST_HEAD(&lhead->list);
  			options->value = lhead;
  		}
@@ -33,7 +41,7 @@ diff -urN ffsb-6.0-rc2/parser.c ffsb-6.0-rc2-haiku/parser.c
  		tmp_list = malloc(sizeof(struct value_list));
  		INIT_LIST_HEAD(&tmp_list->list);
  		tmp_list->value = value;
-@@ -567,6 +567,7 @@
+@@ -567,6 +567,7 @@ double get_config_double(config_options_t *config, char *name)
  static profile_config_t *parse(FILE *f)
  {
  	char *buf;
@@ -41,7 +49,7 @@ diff -urN ffsb-6.0-rc2/parser.c ffsb-6.0-rc2-haiku/parser.c
  	profile_config_t *profile_conf;
  	container_t *tmp_container;
  
-@@ -575,9 +576,8 @@
+@@ -575,9 +576,8 @@ static profile_config_t *parse(FILE *f)
  	memcpy(profile_conf->global, global_options, sizeof(global_options));
  	profile_conf->fs_container = NULL;
  	profile_conf->tg_container = NULL;
@@ -52,7 +60,7 @@ diff -urN ffsb-6.0-rc2/parser.c ffsb-6.0-rc2-haiku/parser.c
  	while (buf) {
  		is_option = set_option(buf, profile_conf->global);
  		tmp_container = search_group(buf, f);
-@@ -858,6 +858,7 @@
+@@ -858,6 +858,7 @@ static void init_filesys(ffsb_config_t *fc, int num)
  	profile_config_t *profile_conf = fc->profile_conf;
  	ffsb_fs_t *fs = &fc->filesystems[num];
  	value_list_t *tmp_list, *list_head;
@@ -60,7 +68,7 @@ diff -urN ffsb-6.0-rc2/parser.c ffsb-6.0-rc2-haiku/parser.c
  
  	memset(fs, 0, sizeof(ffsb_fs_t));
  
-@@ -910,7 +911,7 @@
+@@ -910,7 +911,7 @@ static void init_filesys(ffsb_config_t *fc, int num)
  		}
  
  		age_cont = age_cont->child;
@@ -69,10 +77,11 @@ diff -urN ffsb-6.0-rc2/parser.c ffsb-6.0-rc2-haiku/parser.c
  		init_threadgroup(fc, age_cont->config, age_tg, 0);
  		fs->aging_tg = age_tg;
  		fs->age_fs = 1;
-diff -urN ffsb-6.0-rc2/util.c ffsb-6.0-rc2-haiku/util.c
---- ffsb-6.0-rc2/util.c	2008-10-27 20:17:05.049283072 +0000
-+++ ffsb-6.0-rc2-haiku/util.c	2010-09-23 14:09:14.267386880 +0000
-@@ -190,9 +190,14 @@
+diff --git a/util.c b/util.c
+index df5d755..84b6513 100644
+--- a/util.c
++++ b/util.c
+@@ -190,9 +190,14 @@ double cpu_so_far_children(void)
  /* !!!! check portability */
  float getfsutil(char *dirname)
  {
@@ -88,7 +97,7 @@ diff -urN ffsb-6.0-rc2/util.c ffsb-6.0-rc2-haiku/util.c
  
  /* 	return (float)(fsdata.f_blocks-fsdata.f_bfree)/ */
  /* 		(float)(fsdata.f_blocks-fsdata.f_bfree+fsdata.f_bavail); */
-@@ -202,8 +207,13 @@
+@@ -202,8 +207,13 @@ float getfsutil(char *dirname)
  
  uint64_t getfsutil_size(char *dirname)
  {
@@ -102,3 +111,29 @@ diff -urN ffsb-6.0-rc2/util.c ffsb-6.0-rc2-haiku/util.c
  
  	return (fsdata.f_blocks - fsdata.f_bfree) * fsdata.f_bsize;
  }
+-- 
+1.8.3.4
+
+
+From bac090a21efe6efaa5334b357d8c0ec73a5135b0 Mon Sep 17 00:00:00 2001
+From: Chris Roberts <cpr420@gmail.com>
+Date: Sun, 24 Nov 2013 23:52:13 -0700
+Subject: Update configure.in for newer autotools
+
+
+diff --git a/configure.in b/configure.in
+index 668e080..96514e8 100644
+--- a/configure.in
++++ b/configure.in
+@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
+ AC_INIT(main.c)
+ AM_INIT_AUTOMAKE(ffsb, 6.0-RC2)
+ 
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS([config.h])
+ AC_CANONICAL_HOST
+ 
+ dnl need to define _ALL_SOURCE and _THREAD_SAFE on AIX
+-- 
+1.8.3.4
+

app-benchmarks/libmicro/libmicro-0.4.2.hg.recipe

@@ -0,0 +1,46 @@
+SUMMARY="libmicro - portable microbenchmarks"
+DESCRIPTION="
+LibMicro is a portable set of microbenchmarks that many Solaris
+engineers used during Solaris 10 development to measure the
+performance of various system and library calls. LibMicro was
+developed by Bart Smaalders and Phil Harman as part of their If Linux
+is faster it's a Solaris bug performance campaign. LibMicro is Open
+Source and uses the CDDL license.The libMicro sources include an awk
+script that generates color coded html pages to easily compare
+various OS revs, processors and other differences in a quick manner
+"
+LICENSE="CDDL v1"
+COPYRIGHT="2013 Oracle"
+HOMEPAGE="https://java.net/projects/libmicro"
+SRC_URI="hg+https://hg.java.net/hg/libmicro~hg-repo#7dd95b416c3c"
+REVISION="1"
+ARCHITECTURES="!x86 !x86_gcc2"
+
+PROVIDES="
+	libmicro = $portVersion
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	"
+
+BUILD_PREREQUIRES="
+	cmd:make
+	cmd:gcc
+	"
+
+PATCHES="libmicro-0.4.2.patchset"
+
+BUILD()
+{
+	make
+}
+
+INSTALL()
+{
+	make install
+}

app-benchmarks/libmicro/patches/libmicro-0.4.2.hg.patchset

@@ -0,0 +1,139 @@
+From 4beb46cb703e13ca5b6a055efec5f18c961b11fe Mon Sep 17 00:00:00 2001
+From: Chris Roberts <cpr420@gmail.com>
+Date: Sun, 26 Jan 2014 11:57:02 -0700
+Subject: applying patch libmicro-0.4.1.patch
+
+
+diff --git a/Makefile.Haiku b/Makefile.Haiku
+new file mode 100644
+index 0000000..5181d91
+--- /dev/null
++++ b/Makefile.Haiku
+@@ -0,0 +1,43 @@
++#
++# CDDL HEADER START
++#
++# The contents of this file are subject to the terms
++# of the Common Development and Distribution License
++# (the "License").  You may not use this file except
++# in compliance with the License.
++#
++# You can obtain a copy of the license at
++# src/OPENSOLARIS.LICENSE
++# or http://www.opensolaris.org/os/licensing.
++# See the License for the specific language governing
++# permissions and limitations under the License.
++#
++# When distributing Covered Code, include this CDDL
++# HEADER in each file and include the License file at
++# usr/src/OPENSOLARIS.LICENSE.  If applicable,
++# add the following below this CDDL HEADER, with the
++# fields enclosed by brackets "[]" replaced with your
++# own identifying information: Portions Copyright [yyyy]
++# [name of copyright owner]
++#
++# CDDL HEADER END
++#
++
++#
++# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
++# Use is subject to license terms.
++#
++
++
++CC=		gcc
++
++#CFLAGS=		-O -DUSE_SEMOP
++CPPFLAGS=		-DUSE_SEMOP -D_REENTRANT
++MATHLIB=
++
++ELIDED_BENCHMARKS=	\
++	cachetocache	\
++	atomic
++
++
++include ../Makefile.com
+diff --git a/Makefile.benchmarks b/Makefile.benchmarks
+index ed1923a..d1b1ff8 100644
+--- a/Makefile.benchmarks
++++ b/Makefile.benchmarks
+@@ -50,7 +50,7 @@ ALL=				\
+ 		fcntl_ndelay	\
+ 		file_lock	\
+ 		fork		\
+-		getcontext	\
++#		getcontext	\
+ 		getenv		\
+ 		gettimeofday	\
+ 		getpeername	\
+diff --git a/Makefile.com b/Makefile.com
+index 2ba7e76..5773900 100644
+--- a/Makefile.com
++++ b/Makefile.com
+@@ -54,10 +54,10 @@ lint:	libmicro.ln $(ALL:%=%.lint) $(EXTRA_CFILES:%.c=%.lint)
+ 
+ 
+ $(EXTRA_CFILES:%.c=%.lint):
+-	$(LINT) ../$(@:%.lint=%.c) -I. -mu -lc libmicro.ln -lm
++	$(LINT) ../$(@:%.lint=%.c) -I. -mu -lc libmicro.ln 
+ 
+ %.lint:	../%.c libmicro.ln
+-	$(LINT) -mu $(CPPFLAGS) $< libmicro.ln -lpthread -lsocket -lnsl -lm
++	$(LINT) -mu $(CPPFLAGS) $< libmicro.ln  -lnetwork
+ 
+ %.o:	../%.c
+ 	$(CC) -c $(CFLAGS) $(CPPFLAGS) $< -o $@
+@@ -107,13 +107,13 @@ tattle:		../tattle.c	libmicro.a
+ 	echo "char compiler_version[] = \""`$(COMPILER_VERSION_CMD)`"\";" > tattle.h
+ 	echo "char CC[] = \""$(CC)"\";" >> tattle.h
+ 	echo "char extra_compiler_flags[] = \""$(extra_CFLAGS)"\";" >> tattle.h
+-	$(CC) -o tattle $(CFLAGS) -I. ../tattle.c libmicro.a -lrt -lm
++	$(CC) -o tattle $(CFLAGS) -I. ../tattle.c libmicro.a
+ 
+ $(ELIDED_BENCHMARKS):	../elided.c
+ 	$(CC) -o $(@) ../elided.c
+ 
+ %: libmicro.a %.o 
+-	$(CC) -o $(@) $(@).o $($(@)_EXTRA_DEPS) $(CFLAGS) libmicro.a $($(@)_EXTRA_LIBS) $(EXTRA_LIBS) -lpthread -lm
++	$(CC) -o $(@) $(@).o $($(@)_EXTRA_DEPS) $(CFLAGS) libmicro.a $($(@)_EXTRA_LIBS) $(EXTRA_LIBS) -lnetwork
+ 
+ exec:	exec_bin
+ 
+diff --git a/bench.sh b/bench.sh
+index 4795c10..24ca1d9 100644
+--- a/bench.sh
++++ b/bench.sh
+@@ -56,7 +56,7 @@ VDIR1=$VARROOT/0/1/2/3/4/5/6/7/8/9
+ VDIR2=$VARROOT/1/2/3/4/5/6/7/8/9/0
+ 
+ 
+-OPTS="-E -C 200 -L -S -W"
++OPTS="-l -E -C 200 -L -S -W"
+ 
+ dd if=/dev/zero of=$TFILE bs=1024k count=10 2>/dev/null
+ dd if=/dev/zero of=$VFILE bs=1024k count=10 2>/dev/null
+@@ -65,7 +65,7 @@ mkdir -p $VDIR1 $VDIR2
+ 
+ touch $IFILE
+ 
+-ARCH=`arch -k`
++ARCH=`uname -m`
+ 
+ # produce benchmark header for easier comparisons
+ 
+diff --git a/cascade_flock.c b/cascade_flock.c
+index 27d95d1..a6634a1 100644
+--- a/cascade_flock.c
++++ b/cascade_flock.c
+@@ -50,7 +50,7 @@
+ #include "libmicro.h"
+ 
+ #ifndef LOCK_EX
+-#include "/usr/ucbinclude/sys/file.h"
++#include "sys/file.h"
+ extern int flock(int fd, int operation);
+ #endif
+ 
+-- 
+1.8.3.4
+

app-benchmarks/piozone/piozone-1.0.recipe

@@ -1,22 +1,42 @@
-DESCRIPTION="Hard disk benchmarking program" 
+SUMMARY="Hard disk benchmarking program"
+DESCRIPTION="
+Hard disk benchmarking program
+"
+LICENSE="GNU GPL v2"
+COPYRIGHT="2002 Peter Eriksson"
 HOMEPAGE="http://www.lysator.se/~pen/piozone/" 
 SRC_URI="ftp://ftp.lysator.liu.se/pub/unix/piozone/piozone-1.0.tar.gz"
-CHECKSUM_MD5="e48370a9aa80aed212b18e16c08b9056"
+CHECKSUM_SHA256="0b7f880b72b10664a24b712c22c90b4caab4f0cb1a8c99cba0d1a106fd63d15d"
 REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
+ARCHITECTURES="?x86 ?x86_gcc2 ?x86_64"
+
+PROVIDES="
+	piozone = $portVersion
+	cmd:piozone = $portVersion
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	"
+
+BUILD_PREREQUIRES="
+	cmd:make
+	cmd:gcc
+	"
+
+PATCHES="piozone-1.0.patch"
+
 BUILD()
 {
-	cd piozone-1.0
 	make
 }
 
 INSTALL()
 {
-	cd piozone-1.0	
-	mkdir -p $DESTDIR/`finddir B_COMMON_BIN_DIRECTORY`
-	cp -a piozone $DESTDIR/`finddir B_COMMON_BIN_DIRECTORY`/piozone
+	mkdir $binDir
+	cp -af piozone $binDir
 }
-
-LICENSE="GNU GPL v2"
-COPYRIGHT="2002 Peter Eriksson"

app-cdr/bchunk/bchunk-1.2.0.recipe

@@ -1,27 +1,46 @@
-DESCRIPTION="binchunker converts a CD image in .bin/.cue format to a set of .iso and .cdr tracks."
+SUMMARY="binchunker converts CD .bin/.cue formats to .iso and .cdr"
+DESCRIPTION="
+binchunker converts a CD image in a '.bin / .cue' format (sometimes '.raw / \
+.cue') to a set of .iso and .cdr tracks. The bin/cue format is used by some \
+popular non-Unix cd-writing software, but is not supported on most other CD \
+burning programs. A lot of CD/VCD images distributed on the Internet are in \
+BIN/CUE format, I've been told.
+"
+LICENSE="GNU GPL v2"
+COPYRIGHT="1998-2004 Heikki Hannikainen"
 HOMEPAGE="http://he.fi/bchunk/"
 SRC_URI="http://he.fi/bchunk/bchunk-1.2.0.tar.gz"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-CHECKSUM_MD5="6a613da3f34f9a303f202d2e9731d231"
+CHECKSUM_SHA256="afdc9d5e38bdd16f0b8b9d9d382b0faee0b1e0494446d686a08b256446f78b5d"
+REVISION="2"
+ARCHITECTURES="x86 x86_gcc2 x86_64"
+
+PROVIDES="
+	bchunk = $portVersion
+	cmd:bchunk = $portVersion
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	"
+
+BUILD_PREREQUIRES="
+	cmd:make
+	cmd:gcc
+	"
+
 BUILD()
 {
-	cd bchunk-1.2.0
 	make
 }
 
 INSTALL()
 {
-	cd bchunk-1.2.0
-	COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
-	COMMON_BIN=`finddir B_COMMON_BIN_DIRECTORY`
-	mkdir -p $COMMON_BIN
-	mkdir -p $COMMON_DOCS/man/man1
-	mkdir -p ${DESTDIR}$COMMON_BIN
-	mkdir -p ${DESTDIR}$COMMON_DOCS/man/man1
-	install -m 755 -s bchunk ${DESTDIR}$COMMON_BIN
-	install -m 644 bchunk.1 ${DESTDIR}$COMMON_DOCS/man/man1
+	mkdir -p $binDir
+	cp -af bchunk $binDir
+	mkdir -p $manDir/man1
+	cp -af bchunk.1 $manDir/man1
 }
-LICENSE="GNU GPL v2"
-COPYRIGHT="1998-2004 Heikki Hannikainen"

app-cdr/cdrtools/cdrtools-3.01~a07.recipe

@@ -23,7 +23,7 @@ LICENSE="
 	CDDL v1
 	"
 SRC_URI="ftp://ftp.berlios.de/pub/cdrecord/alpha/cdrtools-3.01a07.tar.bz2"
-CHECKSUM_MD5="266bae8db7d1e5473555b48c306aa216"
+CHECKSUM_SHA256="cc54fefaf4ed5b6b49b996da1d1ebb1c44e88bbfada5c60e8f76c3a082591428"
 REVISION="3"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 

app-cdr/cdrtools/cdrtools-3.01~a17.recipe

@@ -23,7 +23,7 @@ LICENSE="
 	CDDL v1
 	"
 SRC_URI="ftp://ftp.berlios.de/pub/cdrecord/alpha/cdrtools-3.01a17.tar.bz2"
-CHECKSUM_MD5="4cef9db0cf15a770c52d65b00bbee2db"
+CHECKSUM_SHA256="3d613965b213ad83e4be0ba2535e784901839ea4d11a20a2beb6765f0eb76dfa"
 REVISION="1"
 ARCHITECTURES="x86_gcc2 x86"
 

app-cdr/cdrtools/cdrtools-3.01~a18.recipe

@@ -1,18 +1,19 @@
 SUMMARY="A highly portable CD/DVD/BluRay command line recording software"
-DESCRIPTION="Cdrtools is a set of command line programs that allows to record CD/DVD/BluRay media.
-
+DESCRIPTION="
+Cdrtools is a set of command line programs that allows to record CD/DVD/BluRay \
+media.
 The suite includes the following programs:
-
-    cdrecord  A CD/DVD/BD recording program 
-    readcd    A program to read CD/DVD/BD media with CD-clone features 
-    cdda2wav  The most evolved CD-audio extraction program with paranoia support 
-    mkisofs   A program to create hybrid ISO9660/JOLIET/HFS filesystes with optional Rock Ridge attributes 
-    isodebug  A program to print mkisofs debug information from media 
-    isodump   A program to dump ISO-9660 media 
-    isoinfo   A program to analyse/verify ISO/9660/Joliet/Rock-Ridge Filesystems 
-    isovfy    A program to verify the ISO-9660 structures 
-    rscsi     A Remote SCSI enabling daemon
-    "
+- cdrecord  A CD/DVD/BD recording program 
+- readcd    A program to read CD/DVD/BD media with CD-clone features 
+- cdda2wav  The most evolved CD-audio extraction program with paranoia support 
+- mkisofs   A program to create hybrid ISO9660/JOLIET/HFS filesystes with \
+optional Rock Ridge attributes 
+- isodebug  A program to print mkisofs debug information from media 
+- isodump   A program to dump ISO-9660 media 
+- isoinfo   A program to analyse/verify ISO/9660/Joliet/Rock-Ridge Filesystems 
+- isovfy    A program to verify the ISO-9660 structures 
+- rscsi     A Remote SCSI enabling daemon
+"
 HOMEPAGE="http://cdrecord.berlios.de" 
 COPYRIGHT="
 	1993-1997 Eric Youngdale, 1997-2010 J. Schilling (mkisofs)
@@ -23,7 +24,7 @@ LICENSE="
 	CDDL v1
 	"
 SRC_URI="ftp://ftp.berlios.de/pub/cdrecord/alpha/cdrtools-3.01a18.tar.bz2"
-CHECKSUM_MD5="cf3e5dc49c654a87c20b9fa55eb84ed4"
+CHECKSUM_SHA256="7e9ad9e00679bb0c0456455243eb41614a5a3395eebded9371a0c843dd3494d6"
 REVISION="1"
 ARCHITECTURES="x86_gcc2 x86"
 

app-cdr/daa2iso/daa2iso-0.1.7e.recipe

@@ -1,10 +1,38 @@
-DESCRIPTION="DAA2ISO is an open source command-line/GUI tool for converting single and multipart DAA and GBI images to the original ISO format."
+SUMMARY="A tool for converting DAA/GBI images to ISO format."
+DESCRIPTION="
+DAA2ISO is an open source command-line/GUI tool for converting single and \
+multipart DAA and GBI images to the original ISO format.
+DAA/GBI files are 'Direct Access Archive' used by PowerISO and gBurner
+"
+LICENSE="GNU GPL v2"
+COPYRIGHT="Luigi Auriemma"
 HOMEPAGE="http://aluigi.org/mytoolz.htm#daa2iso"
 SRC_URI="http://aluigi.altervista.org/mytoolz/daa2iso.zip"
+CHECKSUM_SHA256="f5990542bbfb632a18e664bb956d1dfa35b20945881c617af641a9ee8cfbc47b"
+SRC_FILENAME="daa2iso-$portVersion.zip"
 REVISION="1"
-DEPEND=""
-STATUS_HAIKU="stable"
-CHECKSUM_MD5="6930ebcd8568e8ade0a175352d4a3481"
+ARCHITECTURES="x86 ?x86_gcc2 ?x86_64"
+
+PROVIDES="
+	daa2iso = $portVersion
+	cmd:daa2iso = $portVersion
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	"
+
+BUILD_PREREQUIRES="
+	cmd:make
+	cmd:gcc
+	"
+
+#intentionally empty
+SOURCE_DIR=""
 
 BUILD()
 {
@@ -15,8 +43,5 @@ BUILD()
 INSTALL()
 {
 	cd src
-	make install PREFIX=${DESTDIR}/$(finddir B_COMMON_DIRECTORY)
+	make install PREFIX=$prefix
 }
-
-LICENSE="GNU GPL v2"
-COPYRIGHT="Luigi Auriemma"

app-cdr/uif2iso/uif2iso-0.1.7c.recipe

@@ -1,4 +1,7 @@
-DESCRIPTION="A command-line tool for converting single and multipart UIF images to the ISO format."
+DESCRIPTION="
+A command-line tool for converting single and multipart UIF images to the ISO \
+format.
+"
 HOMEPAGE="http://aluigi.org/mytoolz.htm#uif2iso"
 SRC_URI="http://aluigi.altervista.org/mytoolz/uif2iso.zip"
 REVISION="1"

app-crypt/gnupg/gnupg-1.4.10.recipe

@@ -1,5 +1,13 @@
-DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement." 
-HOMEPAGE="http://www.gnupg.org/" 
+SUMMARY="GnuPG is the GNU project's free implementation of the OpenPGP standard."
+DESCRIPTION="
+GnuPG is the GNU project's complete and free implementation of the OpenPGP \
+standard as defined by RFC4880 . GnuPG allows to encrypt and sign your data \
+and communication, features a versatile key management system as well as \
+access modules for all kinds of public key directories. GnuPG, also known as \
+GPG, is a command line tool with features for easy integration with other \
+applications.
+"
+HOMEPAGE="http://www.gnupg.org/"
 SRC_URI="ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-1.4.10.tar.bz2"
 CHECKSUM_MD5="dcf7ed712997888d616e029637bfc303"
 REVISION="1"

app-crypt/gnupg/gnupg-1.4.11.recipe

@@ -1,8 +1,15 @@
-SUMMARY="GnuPG is the GNU project's free implementation of the OpenPGP standard." 
-DESCRIPTION="GnuPG is the GNU project's complete and free implementation of the OpenPGP standard as defined by RFC4880 . GnuPG allows to encrypt and sign your data and communication, features a versatile key management system as well as access modules for all kinds of public key directories. GnuPG, also known as GPG, is a command line tool with features for easy integration with other applications." 
-HOMEPAGE="http://www.gnupg.org/" 
+SUMMARY="GnuPG is the GNU project's free implementation of the OpenPGP standard."
+DESCRIPTION="
+GnuPG is the GNU project's complete and free implementation of the OpenPGP \
+standard as defined by RFC4880 . GnuPG allows to encrypt and sign your data \
+and communication, features a versatile key management system as well as \
+access modules for all kinds of public key directories. GnuPG, also known as \
+GPG, is a command line tool with features for easy integration with other \
+applications.
+"
+HOMEPAGE="http://www.gnupg.org/"
 SRC_URI="ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-1.4.11.tar.bz2"
-CHECKSUM_MD5="411744e1ef8ce90b87938c4203f001f1"
+CHECKSUM_SHA256="d18ceeac16e554a501170b9bfde611625252d0fe9448685a69c93bf149ee6ef6"
 REVISION="1"
 LICENSE="GNU GPL v3"
 COPYRIGHT="1998-2010 Free Software Foundation, Inc."

app-crypt/gnupg/gnupg-1.4.16.recipe

@@ -0,0 +1,56 @@
+SUMMARY="GnuPG is the GNU project's free implementation of the OpenPGP standard."
+DESCRIPTION="
+GnuPG is the GNU project's complete and free implementation of the OpenPGP \
+standard as defined by RFC4880 . GnuPG allows to encrypt and sign your data \
+and communication, features a versatile key management system as well as \
+access modules for all kinds of public key directories. GnuPG, also known as \
+GPG, is a command line tool with features for easy integration with other \
+applications.
+"
+HOMEPAGE="http://www.gnupg.org/"
+SRC_URI="ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-1.4.16.tar.bz2"
+CHECKSUM_SHA256="7b3b748e6aaa338092a0b26b1730cd9355765b55e3684f58dd70f9a1b00f4a2f"
+REVISION="1"
+LICENSE="GNU GPL v3"
+COPYRIGHT="1998-2010 Free Software Foundation, Inc."
+
+ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+
+PROVIDES="gnupg = $portVersion
+	cmd:gpg = $portVersion compat >= 1.4
+	cmd:gpg_zip = $portVersion compat >= 1.4
+	cmd:gpgsplit = $portVersion compat >= 1.4
+	cmd:gpgv = $portVersion compat >= 1.4
+	"
+REQUIRES="
+	haiku >= $haikuVersion
+	lib:libz
+	"
+BUILD_REQUIRES="
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	cmd:autoconf
+	cmd:gcc
+	cmd:ld
+	cmd:libtoolize
+	cmd:make
+	"
+
+BUILD()
+{
+	#libtoolize --force --copy --install
+	#autoconf
+	runConfigure ./configure 
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+}
+
+TEST()
+{
+	make check
+}

app-dicts/aspell_en/aspell_en-7.1_0.recipe

@@ -0,0 +1,50 @@
+SUMMARY="English dictionary for aspell program/library"
+DESCRIPTION="
+This is the English dictionary for the GNU Aspell program, an open source \
+spell checker. Its advantage is its superiority of suggesting possible \
+replacements for a misspelled wordx than most other spellcheck programs. \
+Aspell is also able to maintain support for more than one langague at a time \
+and can check documents in UTF-8.
+"
+LICENSE="GNU GPL v2"
+COPYRIGHT="2000-2011 Kevin Atkinson"
+HOMEPAGE="http://aspell.net" 
+SRC_URI="ftp://ftp.gnu.org/gnu/aspell/dict/en/aspell6-en-7.1-0.tar.bz2"
+CHECKSUM_SHA256="ff9df3c2e8c5bb19c6a66078b36a0ef4c4dfb0fcb969e29f7b5345e26d748d0a"
+REVISION="1"
+ARCHITECTURES="x86 x86_gcc2"
+
+PROVIDES="
+	aspell_en = $portVersion
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	aspell >= 0.60
+	"
+
+BUILD_REQUIRES="
+	devel:libaspell
+	"
+
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	cmd:make
+	cmd:prezip_bin
+	cmd:which
+	cmd:basename
+	"
+
+SOURCE_DIR="aspell6-en-7.1-0"
+
+BUILD()
+{
+	./configure
+	make
+}
+
+INSTALL()
+{
+	spellDir=$dataDir/$(basename $(aspell dump config dict-dir))
+	make dictdir=$spellDir datadir=$spellDir install
+}

app-doc/doxygen/doxygen-1.6.3.recipe

@@ -1,16 +1,29 @@
 SUMMARY="Generate documentation from source code"
-DESCRIPTION="Doxygen is the de facto standard tool for generating documentation from annotated C++ sources, but it also supports other popular programming languages such as C, Objective-C, C#, PHP, Java, Python, IDL (Corba and Microsoft flavors), Fortran, VHDL, Tcl, and to some extent D.
-
+DESCRIPTION="
+Doxygen is the de facto standard tool for generating documentation from \
+annotated C++ sources, but it also supports other popular programming \
+languages such as C, Objective-C, C#, PHP, Java, Python, IDL (Corba and \
+Microsoft flavors), Fortran, VHDL, Tcl, and to some extent D.
 Doxygen can help you in three ways:
-
-   1. It can generate an on-line documentation browser (in HTML) and/or an off-line reference manual (in $\mbox{\LaTeX}$) from a set of documented source files. There is also support for generating output in RTF (MS-Word), PostScript, hyperlinked PDF, compressed HTML, and Unix man pages. The documentation is extracted directly from the sources, which makes it much easier to keep the documentation consistent with the source code.
-   2. You can configure doxygen to extract the code structure from undocumented source files. This is very useful to quickly find your way in large source distributions. Doxygen can also visualize the relations between the various elements by means of include dependency graphs, inheritance diagrams, and collaboration diagrams, which are all generated automatically.
-   3. You can also use doxygen for creating normal documentation (as I did for the doxygen user manual and web-site)."
+1. It can generate an on-line documentation browser (in HTML) and/or an \
+off-line reference manual (in $\mbox{\LaTeX}$) from a set of documented source \
+files. There is also support for generating output in RTF (MS-Word), \
+PostScript, hyperlinked PDF, compressed HTML, and Unix man pages. The \
+documentation is extracted directly from the sources, which makes it much \
+easier to keep the documentation consistent with the source code.
+2. You can configure doxygen to extract the code structure from undocumented \
+source files. This is very useful to quickly find your way in large source \
+distributions. Doxygen can also visualize the relations between the various \
+elements by means of include dependency graphs, inheritance diagrams, and \
+collaboration diagrams, which are all generated automatically.
+3. You can also use doxygen for creating normal documentation (as I did for \
+the doxygen user manual and web-site).
+"
 HOMEPAGE="http://www.doxygen.org"
 COPYRIGHT="1997-2010 Dimitri van Heesch"
 LICENSE="GNU GPL v2"
 SRC_URI="http://ftp.stack.nl/pub/users/dimitri/doxygen-1.6.3.src.tar.gz"
-CHECKSUM_MD5="2d6ea20a9d850d94321cee78bab7bb87"
+CHECKSUM_SHA256="a3a6524b5fc1da084fd0e081507c99240abaffff85f76ef7b15c9fb3ae248492"
 REVISION="4"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 
@@ -39,7 +52,6 @@ BUILD_PREREQUIRES="
 	cmd:sed
 	"
 
-SOURCE_DIR="$portVersionedName"
 
 PATCH()
 {

app-doc/doxygen/doxygen-1.7.4.recipe

@@ -1,5 +1,25 @@
-DESCRIPTION="Doxygen is a documentation system for C++, C, Java, Objective-C, Python, IDL (Corba and Microsoft flavors), Fortran, VHDL, PHP, C#, and to some extent D." 
-HOMEPAGE="http://www.doxygen.org" 
+SUMMARY="Generate documentation from source code"
+DESCRIPTION="
+Doxygen is the de facto standard tool for generating documentation from \
+annotated C++ sources, but it also supports other popular programming \
+languages such as C, Objective-C, C#, PHP, Java, Python, IDL (Corba and \
+Microsoft flavors), Fortran, VHDL, Tcl, and to some extent D.
+Doxygen can help you in three ways:
+1. It can generate an on-line documentation browser (in HTML) and/or an \
+off-line reference manual (in $\mbox{\LaTeX}$) from a set of documented source \
+files. There is also support for generating output in RTF (MS-Word), \
+PostScript, hyperlinked PDF, compressed HTML, and Unix man pages. The \
+documentation is extracted directly from the sources, which makes it much \
+easier to keep the documentation consistent with the source code.
+2. You can configure doxygen to extract the code structure from undocumented \
+source files. This is very useful to quickly find your way in large source \
+distributions. Doxygen can also visualize the relations between the various \
+elements by means of include dependency graphs, inheritance diagrams, and \
+collaboration diagrams, which are all generated automatically.
+3. You can also use doxygen for creating normal documentation (as I did for \
+the doxygen user manual and web-site).
+"
+HOMEPAGE="http://www.doxygen.org"
 SRC_URI="http://ftp.stack.nl/pub/users/dimitri/doxygen-1.7.4.src.tar.gz"
 CHECKSUM_MD5="ff908759ff7cd9464424b04ae6c68e48"
 REVISION="1"

app-editors/jed/jed-0.99_19.recipe

@@ -1,5 +1,11 @@
-DESCRIPTION="JED is a freely available text editor" 
-HOMEPAGE="http://www.jedsoft.org/jed/" 
+SUMMARY="Editor for programmers"
+DESCRIPTION="
+Jed is a small, fast and powerful text editor.\
+It is completely customizable with prepared emulation modes for Emacs, \
+CUA (similar to Openoffice), Borland-IDE, Brief, and EDT using the S-Lang \
+scripting language (with a syntax resembling C).
+"
+HOMEPAGE="http://www.jedsoft.org/jed/"
 SRC_URI="ftp://space.mit.edu/pub/davis/jed/v0.99/jed-0.99-19.tar.bz2"
 REVISION="1"
 STATUS_HAIKU="stable"
@@ -14,7 +20,7 @@ BUILD()
 	cd ..
 	./configure --prefix=`finddir B_COMMON_DIRECTORY` LIBS="-lnetwork" JED_ROOT=`finddir B_COMMON_LIB_DIRECTORY`/jed
 	make clean
-	make 
+	make
 }
 
 INSTALL()

app-editors/joe/joe-3.8_hg.recipe

@@ -1,5 +1,11 @@
-DESCRIPTION="JOE is a full featured terminal-based screen editor which is distributed under the GNU General Public License (GPL)." 
-HOMEPAGE="http://joe-editor.sourceforge.net/" 
+SUMMARY="Terminal-based text editor"
+DESCRIPTION="
+Joe's Own Editor is a full-featured text editor with minimal requirements. \
+It is fully customizable (Emacs, pico or WordStar are preset). Is also has multiple \
+windows, hexadecimal edit mode for binary files or syntax highlighting for more than 40 languages. \
+It also supports mouse for both text and window manipulation.
+"
+HOMEPAGE="http://joe-editor.sourceforge.net/"
 SRC_URI="hg+http://joe-editor.hg.sourceforge.net:8000/hgroot/joe-editor/joe-editor"
 REVISION="2"
 STATUS_HAIKU="stable"
@@ -14,7 +20,6 @@ BUILD()
 		--datadir=`finddir B_COMMON_DATA_DIRECTORY` \
 		--docdir=$COMMON_DOCS/doc/joe \
 		--mandir=$COMMON_DOCS/man
-		
 	make
 }
 

app-editors/nano/nano-2.2.3.recipe

@@ -1,21 +0,0 @@
-DESCRIPTION="GNU GPL'd Pico clone with more functionality" 
-HOMEPAGE="http://www.nano-editor.org/" 
-SRC_URI="http://www.nano-editor.org/dist/v2.2/nano-2.2.3.tar.gz"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="sys-libs/ncurses >= 5.6"
-CHECKSUM_MD5="91918a484f54f94fedaebe00dc393a50"
-BUILD()
-{
-	cd nano-2.2.3
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
-	make
-}
-
-INSTALL()
-{
-	cd nano-2.2.3
-	make install
-}
-LICENSE="GNU GPL v3"
-COPYRIGHT="1999-2010 Free Software Foundation, Inc. "

app-editors/nano/nano-2.2.5.recipe

@@ -1,22 +0,0 @@
-DESCRIPTION="GNU GPL'd Pico clone with more functionality" 
-HOMEPAGE="http://www.nano-editor.org/" 
-SRC_URI="http://www.nano-editor.org/dist/v2.2/nano-2.2.5.tar.gz"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="sys-libs/ncurses >= 5.6"
-CHECKSUM_MD5="77a10a49589f975ce98350a4527a2ebf"
-BUILD()
-{
-	cd nano-2.2.5
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
-	make
-}
-
-INSTALL()
-{
-	cd nano-2.2.5
-	make install
-}
-
-LICENSE="GNU GPL v3"
-COPYRIGHT="1999-2010 Free Software Foundation, Inc. "

app-editors/nano/nano-2.2.6.recipe

@@ -1,8 +1,19 @@
-SUMMARY="GNU GPL'd Pico clone with more functionality"
-DESCRIPTION="GNU GPL'd Pico clone with more functionality."
+SUMMARY="GNU Pico clone with more functionality under the GPL license"
+DESCRIPTION="
+nano is a simple text editor for Unix-like computing systems \
+or operating environments using a command line interface. It emulates the \
+Pico text editor, part of the Pine email client, and also provides additional \
+functionality. Features include:
+- Customizable key bindings
+- \'soft\' line wrapping
+- Full undo/redo support
+- Pager support (reading from stdin)
+- Warnings for un-writable files
+- More syntax highlighting samples (Fortran, objC, OCaml, Makefiles)
+"
 HOMEPAGE="http://www.nano-editor.org/"
 SRC_URI="http://www.nano-editor.org/dist/v2.2/nano-2.2.6.tar.gz"
-CHECKSUM_MD5="03233ae480689a008eb98feb1b599807"
+CHECKSUM_SHA256="be68e133b5e81df41873d32c517b3e5950770c00fc5f4dd23810cd635abce67a"
 LICENSE="GNU GPL v3"
 COPYRIGHT="1999-2010 Free Software Foundation, Inc. "
 REVISION="3"
@@ -33,7 +44,6 @@ BUILD_PREREQUIRES="
 	cmd:make
 	"
 
-SOURCE_DIR="$portVersionedName"
 
 BUILD()
 {

app-editors/nano/nano-2.3.1.recipe

@@ -1,4 +1,16 @@
-DESCRIPTION="GNU GPL'd Pico clone with more functionality"
+SUMMARY="GNU Pico clone with more functionality under the GPL license"
+DESCRIPTION="
+nano is a simple text editor for Unix-like computing systems \
+or operating environments using a command line interface. It emulates the \
+Pico text editor, part of the Pine email client, and also provides additional \
+functionality. Features include:
+- Customizable key bindings
+- \'soft\' line wrapping
+- Full undo/redo support
+- Pager support (reading from stdin)
+- Warnings for un-writable files
+- More syntax highlighting samples (Fortran, objC, OCaml, Makefiles)
+"
 HOMEPAGE="http://www.nano-editor.org/"
 SRC_URI="http://ftpmirror.gnu.org/nano/nano-2.3.1.tar.gz"
 CHECKSUM_MD5="af09f8828744b0ea0808d6c19a2b4bfd"

app-editors/ne/ne-2.1.recipe

@@ -1,4 +1,10 @@
-DESCRIPTION="ne, the nice editor"
+SUMMARY="ne, the nice editor"
+DESCRIPTION="
+ne is one of the few text editors which are \
+both easy to use for beginners and powerful enough for powerusers. \
+It supports UTF-8 and multi-column characters as well as syntax highlighting. \
+Is also has fully configurable key bindings and supports macros.
+"
 HOMEPAGE="http://ne.dsi.unimi.it"
 SRC_URI="http://ne.dsi.unimi.it/ne-2.1.tar.gz"
 REVISION="1"

app-editors/qemacs/qemacs-0.3.2dev_cvs.recipe

@@ -1,4 +1,17 @@
-DESCRIPTION="QEmacs (for Quick Emacs), a very small but powerful UNIX editor"
+SUMMARY="QEmacs editor"
+DESCRIPTION="
+QEmacs (for Quick Emacs), a very small but powerful UNIX editor.
+It has features that even big editors lack :
+- Full screen editor with an Emacs look and feel with all Emacs common features.
+- Full UTF8 support.
+- WYSIWYG HTML/XML/CSS2 mode graphical editing.
+- WYSIWYG DocBook.
+- C mode: coloring with immediate update. Emacs like auto-indent.
+- Shell mode, Hexadecimal editing...
+
+The provided qemacs-pe2qe script converts your Pe color settings to the Qemacs \
+syntax.
+"
 HOMEPAGE="http://bellard.org/qemacs/"
 SRC_URI="cvs://:pserver:anonymous@cvs.savannah.nongnu.org:/sources/qemacs/qemacs"
 #CHECKSUM_MD5=""

app-editors/qemacs/qemacs-0.3.3.recipe

@@ -1,22 +1,67 @@
-DESCRIPTION="QEmacs (for Quick Emacs), a very small but powerful UNIX editor"
+SUMMARY="QEmacs editor"
+DESCRIPTION="
+QEmacs (for Quick Emacs), a very small but powerful UNIX editor.
+It has features that even big editors lack :
+- Full screen editor with an Emacs look and feel with all Emacs common features.
+- Full UTF8 support.
+- WYSIWYG HTML/XML/CSS2 mode graphical editing.
+- WYSIWYG DocBook.
+- C mode: coloring with immediate update. Emacs like auto-indent.
+- Shell mode, Hexadecimal editing...
+
+The provided qemacs-pe2qe script converts your Pe color settings to the Qemacs \
+syntax.
+"
 HOMEPAGE="http://bellard.org/qemacs/"
 SRC_URI="http://bellard.org/qemacs/qemacs-0.3.3.tar.gz"
-CHECKSUM_MD5="42fe8cc431bb9cbbeb898a2c18335990"
+CHECKSUM_SHA256="2ffba66a44783849282199acfcc08707debc7169394a8fd0902626222f27df94"
 REVISION="1"
-STATUS_HAIKU="broken"
-DEPEND="app-text/texi2html >= 1.82"
+LICENSE="GNU LGPL v2.1"
+COPYRIGHT="2000-2003 Fabrice Bellard"
+
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
+PROVIDES="
+	qemacs$secondaryArchSuffix = $portVersion
+	app:qemacs$secondaryArchSuffix = $portVersion
+	cmd:qemacs$secondaryArchSuffix = $portVersion
+	cmd:qe$secondaryArchSuffix = $portVersion
+	cmd:html2png$secondaryArchSuffix = $portVersion
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libpng$secondaryArchSuffix
+	lib:libjpeg$secondaryArchSuffix
+#	lib:libavcodec$secondaryArchSuffix
+#	lib:libavformat$secondaryArchSuffix
+	"
+
+BUILD_REQUIRES="
+	devel:libpng$secondaryArchSuffix
+#	devel:libavcodec$secondaryArchSuffix
+#	devel:libavformat$secondaryArchSuffix
+	"
+
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	cmd:make
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:texi2html
+	"
+
+PATCHES="qemacs-0.3.3.patch"
+
 BUILD()
 {
-	cd qemacs-0.3.3
-	./configure
+	runConfigure ./configure
 	make
 }
 
 INSTALL()
 {
-	cd qemacs-0.3.3
 	make install
+	addAppDeskbarSymlink $binDir/qe QEmacs
 }
 
-LICENSE="GNU LGPL v2.1"
-COPYRIGHT="2000-2003 Fabrice Bellard"

app-editors/qemacs/qemacs-0.4.0dev.recipe

@@ -0,0 +1,68 @@
+SUMMARY="QEmacs editor"
+DESCRIPTION="
+QEmacs (for Quick Emacs), a very small but powerful UNIX editor.
+It has features that even big editors lack :
+- Full screen editor with an Emacs look and feel with all Emacs common features.
+- Full UTF8 support.
+- WYSIWYG HTML/XML/CSS2 mode graphical editing.
+- WYSIWYG DocBook.
+- C mode: coloring with immediate update. Emacs like auto-indent.
+- Shell mode, Hexadecimal editing...
+
+The provided qemacs-pe2qe script converts your Pe color settings to the Qemacs \
+syntax.
+"
+HOMEPAGE="http://bellard.org/qemacs/"
+SRC_URI="cvs://:pserver:anonymous@cvs.savannah.nongnu.org:/sources/qemacs/qemacs"
+#CHECKSUM_MD5=""
+REVISION="1"
+LICENSE="GNU LGPL v2.1"
+COPYRIGHT="2000-2003 Fabrice Bellard"
+
+ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64"
+SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86"
+
+PROVIDES="
+	qemacs$secondaryArchSuffix = $portVersion
+	app:qemacs$secondaryArchSuffix = $portVersion
+	cmd:qemacs$secondaryArchSuffix = $portVersion
+	cmd:qe$secondaryArchSuffix = $portVersion
+	cmd:html2png$secondaryArchSuffix = $portVersion
+	cmd:qemacs_pe2qe$secondaryArchSuffix = $portVersion
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libpng$secondaryArchSuffix
+	lib:libjpeg$secondaryArchSuffix
+#	lib:libavcodec$secondaryArchSuffix
+#	lib:libavformat$secondaryArchSuffix
+	"
+
+BUILD_REQUIRES="
+	devel:libpng$secondaryArchSuffix
+#	devel:libavcodec$secondaryArchSuffix
+#	devel:libavformat$secondaryArchSuffix
+	"
+
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	cmd:which
+	cmd:make
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:texi2html
+	"
+
+BUILD()
+{
+	./configure --prefix=$prefix --datadir=$dataDir --mandir=$manDir
+	make
+}
+
+INSTALL()
+{
+	make install
+	install -m 755 haiku-pe2qe.sh $binDir/qemacs-pe2qe
+	addAppDeskbarSymlink $binDir/qe QEmacs
+}
+

app-editors/se/se-3.0.recipe

@@ -1,4 +1,9 @@
-DESCRIPTION="Screen oriented version of ed"
+SUMMARY="Screen oriented version of ed"
+DESCRIPTION="
+se (Screen Editor) is a screen oriented version of the classic \
+UNIX text editor ed. It’s similar to vi as both are modal editors with curses \
+interfaces. However, it differs from vi in that it has the same command syntax as ed.
+"
 HOMEPAGE="http://se-editor.org/"
 SRC_URI="http://se-editor.org/dist/se-3.0.tar.gz"
 CHECKSUM_MD5="b080a5377b95d989e14ad01b0d25e33a"

app-editors/vim/vim-7.2.recipe

@@ -1,22 +0,0 @@
-DESCRIPTION="Vim is highly configurable text editor." 
-HOMEPAGE="http://www.vim.org" 
-SRC_URI="http://www.bedrivers.com/vim72-with-lang-and-extra.zip"
-REVISION="1"
-CHECKSUM_MD5="c368894a65c09605517fd56ced57fb12"
-STATUS_HAIKU="unstable"
-DEPEND=""
-BUILD()
-{
-	cd vim72
-	cd src
-	make autoconf
-	cd ../
-	./configure --prefix=`finddir B_COMMON_DIRECTORY` --with-features=big
-	make
-}
-
-INSTALL()
-{
-	cd vim72
-	make install
-}

app-editors/vim/vim-7.3.recipe

@@ -1,23 +1,21 @@
-SUMMARY="Vim is highly configurable text editor." 
+SUMMARY="Vim is highly configurable text editor."
 DESCRIPTION="
-	Vim is a highly configurable text editor built to enable efficient text
-	editing. It is an improved version of the vi editor distributed with most
-	UNIX systems.
-
-	Vim is often called a \"programmer's editor,\" and so useful for programming
-	that many consider it an entire IDE. It's not just for programmers, though.
-	Vim is perfect for all kinds of text editing, from composing email to editing
-	configuration files.
-
-	Despite what the above comic suggests, Vim can be configured to work in a very
-	simple (Notepad-like) way, called evim or Easy Vim.
-	"
-HOMEPAGE="http://www.vim.org" 
+Vim is a highly configurable text editor built to enable efficient text \
+editing. It is an improved version of the vi editor distributed with most UNIX \
+systems.
+Vim is often called a \"programmer's editor,\" and so useful for programming \
+that many consider it an entire IDE. It's not just for programmers, though. \
+Vim is perfect for all kinds of text editing, from composing email to editing \
+configuration files.
+Despite this, Vim can be configured to work in a very \
+simple (Notepad-like) way, called evim or Easy Vim.
+"
+HOMEPAGE="http://www.vim.org"
 SRC_URI="ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2"
+CHECKSUM_SHA256="5c5d5d6e07f1bbc49b6fe3906ff8a7e39b049928b68195b38e3e3d347100221d"
 COPYRIGHT="Bram Moleenar et al."
 LICENSE="Vim"
 REVISION="1"
-CHECKSUM_MD5="5b9510a17074e2b37d8bb38ae09edbf2"
 ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="

app-editors/vim/vim-7.4.recipe

@@ -0,0 +1,80 @@
+SUMMARY="Vim is highly configurable text editor."
+DESCRIPTION="
+Vim is a highly configurable text editor built to enable efficient text \
+editing. It is an improved version of the vi editor distributed with most UNIX \
+systems.
+Vim is often called a \"programmer's editor,\" and so useful for programming \
+that many consider it an entire IDE. It's not just for programmers, though. \
+Vim is perfect for all kinds of text editing, from composing email to editing \
+configuration files.
+Despite this, Vim can be configured to work in a very \
+simple (Notepad-like) way, called evim or Easy Vim.
+"
+HOMEPAGE="http://www.vim.org"
+SRC_URI="ftp://ftp.vim.org/pub/vim/unix/vim-7.4.tar.bz2"
+CHECKSUM_SHA256="d0f5a6d2c439f02d97fa21bd9121f4c5abb1f6cd8b5a79d3ca82867495734ade"
+COPYRIGHT="Bram Moleenar et al."
+LICENSE="Vim"
+REVISION="2"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+
+PROVIDES="
+	vim = $portVersion
+	cmd:ex = $portVersion
+	cmd:gview = $portVersion
+	cmd:gvim = $portVersion
+	cmd:gvimdiff = $portVersion
+	cmd:rgview = $portVersion
+	cmd:rgvim = $portVersion
+	cmd:rview = $portVersion
+	cmd:rvim = $portVersion
+	cmd:vi = $portVersion
+	cmd:vim = $portVersion
+	cmd:vimdiff = $portVersion
+	cmd:vimtutor = $portVersion
+	cmd:view = $portVersion
+	cmd:xxd = $portVersion
+"
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libncurses
+	lib:libintl
+"
+BUILD_REQUIRES="
+	ncurses_devel
+	gettext
+"
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	cmd:make
+	cmd:autoconf
+	cmd:gcc
+	cmd:find
+"
+
+SOURCE_DIR="vim74"
+PATCHES="
+	vim-7.4.patch
+"
+
+BUILD()
+{
+	cd src
+	autoconf
+	runConfigure ./configure --disable-gui --with-features=big --with-compiledby=$packager
+	make $jobArgs
+	cp vim vim.con # preserve gui-less executable
+	rm objects/*.o
+	runConfigure ./configure --with-features=big --with-compiledby=$packager
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+
+	# Make arrow keys, backspace, delete, etc behave as expected.
+	echo "set nocompatible" > $dataDir/vim/vimrc
+
+	ln -s vim $binDir/vi
+}

app-editors/xemacs/xemacs-21.5_hg.recipe

@@ -0,0 +1,99 @@
+SUMMARY="XEmacs editor"
+DESCRIPTION="
+highly customizable open source text editor and application development system
+"
+HOMEPAGE="http://xemacs.org/"
+SRC_URI="hg+https://bitbucket.org/mmu_man/xemacs#24b993054953"
+REVISION="1"
+LICENSE="GNU GPL v3"
+COPYRIGHT="1998-2000 Hrvoje Niksic
+	2000-2001 Michael Sperber
+	2001 Ben Wing
+	2001 Didier Verna
+	2004 Stephen Turnbull
+	2005-2006 Aidan Kehoe"
+# TODO: FIXME:
+#Bootstrapping from temacs...
+#Warning: 
+#        XEmacs was unable to determine a good value for the user's $HOME
+#        directory, and will be using the value:
+#                /
+#        This is probably incorrect.
+
+
+ARCHITECTURES="x86_gcc2 x86 ?x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
+#POLICY WARNING: no matching provides "cmd:b2m" for "bin/b2m"
+#POLICY WARNING: no matching provides "cmd:ctags" for "bin/ctags"
+#POLICY WARNING: no matching provides "cmd:ellcc" for "bin/ellcc"
+#POLICY WARNING: no matching provides "cmd:etags" for "bin/etags"
+#POLICY WARNING: no matching provides "cmd:gnuattach" for "bin/gnuattach"
+#POLICY WARNING: no matching provides "cmd:gnuclient" for "bin/gnuclient"
+#POLICY WARNING: no matching provides "cmd:gnudoit" for "bin/gnudoit"
+#POLICY WARNING: no matching provides "cmd:ootags" for "bin/ootags"
+#POLICY WARNING: no matching provides "cmd:xemacs_21.5_b34" for "bin/xemacs-21.5-b34"
+#POLICY WARNING: no matching provides "cmd:xemacs_script" for "bin/xemacs-script
+PROVIDES="
+	xemacs$secondaryArchSuffix = $portVersion
+	app:xemacs = $portVersion
+	cmd:xemacs = $portVersion
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	lib:libiconv$secondaryArchSuffix
+	lib:libncurses$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	lib:libpng$secondaryArchSuffix
+	lib:libjpeg$secondaryArchSuffix
+#	lib:libtiff$secondaryArchSuffix
+#	lib:libxpm$secondaryArchSuffix
+	"
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	devel:libiconv$secondaryArchSuffix
+	devel:libncurses$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix >= 1.2.8
+	devel:libpng$secondaryArchSuffix
+	devel:libjpeg$secondaryArchSuffix
+#	devel:libtiff$secondaryArchSuffix
+#	devel:libxpm$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	cmd:autoconf
+	cmd:make
+	cmd:gcc$secondaryArchSuffix
+	cmd:tar
+	cmd:which
+	cmd:makeinfo
+	"
+
+# TODO: fix lispdir to not use $HOME
+BUILD()
+{
+	autoconf
+	export HOME=/boot/home
+	runConfigure ./configure \
+		--with-tty=yes --with-pop --with-x11=no --with-ipv6-cname=no \
+		--with-mule --with-wnn=no \
+		-with-beos=yes \
+		--with-toolbars=yes \
+		--with-scrollbars=no \
+		--with-menubars=no \
+		--with-dialogs=no \
+		--with-widgets=no \
+		--with-dragndrop=yes \
+		--with-system-malloc --disable-mc-alloc --with-mc-alloc=no \
+		--with-postgresql=no \
+		--disable-kkcc \
+		--with-png
+	make clean
+	make
+}
+
+INSTALL()
+{
+	make install
+	addattr SYS:ENV DISABLE_ASLR=1 $binDir/xemacs-21*
+	addAppDeskbarSymlink $binDir/xemacs XEmacs
+}

app-emulation/aranym/aranym-0.9.11_cvs.recipe

@@ -1,25 +0,0 @@
-DESCRIPTION="ARAnyM (Atari Running on Any Machine) is a multiplatform virtual machine for running Atari ST/TT/Falcon operating systems and applications."
-HOMEPAGE="http://aranym.org/"
-SRC_URI="cvs://:pserver:anoncvs@cvs.aranym.org:/var/repos/aranym"
-REVISION="1"
-STATUS_HAIKU="untested"
-DEPEND="dev-libs/libcdio >= 0.82
-		media-libs/libsdl >= 1.2.10"
-#CHECKSUM_MD5=""
-
-BUILD()
-{
-	cd aranym
-	./autogen.sh --help >/dev/null
-	./configure --prefix=/boot/apps/ARAnyM
-	make
-}
-
-INSTALL()
-{
-	cd aranym
-	make install
-}
-
-COPYRIGHT="2001-2010 ARAnyM developer team"
-LICENSE="GNU GPL v2"

app-emulation/aranym/aranym-0.9.15_git.recipe

@@ -0,0 +1,53 @@
+SUMMARY="ARAnyM (Atari Running on Any Machine)"
+DESCRIPTION="
+ARAnyM (Atari Running on Any Machine) is a multiplatform virtual machine for \
+running Atari ST/TT/Falcon operating systems and applications.
+"
+HOMEPAGE="http://aranym.org/"
+SRC_URI="git://git.code.sf.net/p/aranym/code"
+REVISION="1"
+#CHECKSUM_MD5=""
+COPYRIGHT="2001-2010 ARAnyM developer team"
+LICENSE="GNU GPL v2"
+
+ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+
+SOURCE_DIR="code"
+
+PROVIDES="
+	aranym = $portVersion
+	app:aranym = $portVersion
+	cmd:aranym = $portVersion
+	"
+REQUIRES="
+	haiku
+	libsdl
+	lib:libsdl_image_1.2
+	"
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	devel:libsdl_1.2 >= 0.10
+	devel:libSDL_image_1.2 >= 0.8.4
+	"
+BUILD_PREREQUIRES="
+	cmd:aclocal
+	cmd:autoconf
+	cmd:make
+	cmd:gcc
+	cmd:sdl_config
+	"
+
+BUILD()
+{
+	./autogen.sh --help >/dev/null
+	runConfigure ./configure
+	make
+}
+
+INSTALL()
+{
+	make install
+	mimeset $prefix/bin/aranym
+	addAppDeskbarSymlink /bin/aranym ARAnyM
+}
+

app-emulation/joyce/joyce-2.2.6.recipe

@@ -0,0 +1,58 @@
+SUMMARY="JOYCE emulates the Amstrad PCW."
+DESCRIPTION="
+The latest version of JOYCE (2.2.5) includes ANNE, which emulates the PcW16.
+"
+HOMEPAGE="http://www.seasip.demon.co.uk/Unix/Joyce/"
+SRC_URI="http://www.seasip.info/Unix/Joyce/joyce-2.2.6.tar.gz"
+CHECKSUM_SHA256="d92089dc3e583e88973ef6708dc35e649500949086da0a03f973efe3f62c3d8f"
+REVISION="1"
+COPYRIGHT="2002-2012 John Elliott"
+LICENSE="GNU GPL v2"
+
+ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+
+PROVIDES="
+	joyce = $portVersion
+	cmd:xjoyce = $portVersion
+	cmd:xanne = $portVersion
+	devel:lib765
+	devel:libcpmredir
+	devel:liblink
+	"
+REQUIRES="
+	haiku
+	lib:libsdl
+	lib:libpng
+	lib:libxml2
+	lib:libz
+	lib:libgl
+	"
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	devel:libsdl
+	devel:libpng
+	devel:libxml2
+	devel:libz
+	"
+BUILD_PREREQUIRES="
+	cmd:make
+	cmd:gcc
+	cmd:awk
+	"
+
+PATCHES="joyce-2.2.6.patchset"
+BUILD()
+{
+	runConfigure ./configure
+	make
+}
+
+INSTALL()
+{
+	make install
+
+	# These are already provided in the libdsk package.
+	rm $binDir/apriboot $binDir/dsk* $binDir/md3serial $libDir/libdsk*
+	prepareInstalledDevelLibs lib765 libcpmredir liblink
+}
+

app-emulation/joyce/patches/joyce-2.2.6.patchset

@@ -0,0 +1,64 @@
+From acd7536857589b44814463078787ebe32cc2e519 Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@pulkomandy.tk>
+Date: Tue, 6 May 2014 13:48:58 +0200
+Subject: Small build fixes for Haiku.
+
+
+diff --git a/LibLink/lib/llparsocket.c b/LibLink/lib/llparsocket.c
+index 6d09d1f..7f723c2 100644
+--- a/LibLink/lib/llparsocket.c
++++ b/LibLink/lib/llparsocket.c
+@@ -21,6 +21,8 @@
+ #include "llparsocket.h"
+ #include "llspacket.h"
+ 
++#include <errno.h>
++
+ #ifdef HAVE_WINSOCK_H
+ #define AGAIN (WSAGetLastError() == WSAEWOULDBLOCK)
+ #else
+diff --git a/cpmredir/lib/cpmdrv.c b/cpmredir/lib/cpmdrv.c
+index 79a872d..fd0511a 100644
+--- a/cpmredir/lib/cpmdrv.c
++++ b/cpmredir/lib/cpmdrv.c
+@@ -22,6 +22,8 @@
+ 
+ #include "cpmint.h"
+ 
++#include <sys/statvfs.h>
++
+ cpm_byte fcb_reset(void)
+ {
+ #ifdef __MSDOS__
+@@ -131,11 +133,11 @@ cpm_word fcb_getdpb(cpm_byte *dpb)
+ #ifndef WIN32
+ /* XXX In WIN32, use some function or other to do this */
+ 
+-        struct statfs buf;
++        struct statvfs buf;
+ 	cpm_word nfiles;
+ 
+ 	/* Get DPB for redir_cpmdrive. Currently just returns a dummy. */
+-        if (!statfs(redir_drive_prefix[redir_cpmdrive], &buf))
++        if (!statvfs(redir_drive_prefix[redir_cpmdrive], &buf))
+ 	{
+ 		/* Store correct directory entry count */
+ 
+@@ -184,12 +186,12 @@ cpm_word fcb_dfree (cpm_byte drive, cpm_byte *dma)
+ 		dfree = 4194303L;
+ 	}
+ #else
+-	struct statfs buf;
++	struct statvfs buf;
+ 	long dfree;
+ 
+ 	if (!redir_drive_prefix[drive]) return 0x01FF;	/* Can't select */
+ 	
+-	if (statfs(redir_drive_prefix[drive], &buf)) return 0x01FF;
++	if (statvfs(redir_drive_prefix[drive], &buf)) return 0x01FF;
+ 
+ 	dfree = (buf.f_bavail * (buf.f_bsize / 128));
+ 
+-- 
+1.8.3.4
+