From 1b76571978869acdbb75ec58d1db28b5e335d7d3 Mon Sep 17 00:00:00 2001
From: fbrosson <fbrosson@users.noreply.github.com>
Date: Mon, 31 Aug 2015 21:36:37 +0200
Subject: [PATCH 1/6] Update cdrtools to 3.01 (final)

---
 app-cdr/cdrtools/cdrtools-3.01.recipe        | 154 +++++++++++++++++++
 app-cdr/cdrtools/patches/cdrtools-3.01.patch |  54 +++++++
 2 files changed, 208 insertions(+)
 create mode 100644 app-cdr/cdrtools/cdrtools-3.01.recipe
 create mode 100644 app-cdr/cdrtools/patches/cdrtools-3.01.patch

diff --git a/app-cdr/cdrtools/cdrtools-3.01.recipe b/app-cdr/cdrtools/cdrtools-3.01.recipe
new file mode 100644
index 000000000..6bb6625c0
--- /dev/null
+++ b/app-cdr/cdrtools/cdrtools-3.01.recipe
@@ -0,0 +1,154 @@
+SUMMARY="A CD/DVD/Blu-ray premastering and recording software"
+DESCRIPTION="cdrtools is a set of command line programs suitable for creating \
+and recording file system images to CD, DVD and Blu-ray 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 filesystems 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.org/"
+COPYRIGHT="1995-2015 Joerg Schilling (cdrecord, readcd)
+	1993-2004 Heiko Eissfeldt, 2004-2015 Joerg Schilling (cdda2wav)
+	1993-1997 Eric Youngdale, 1997-2002 James Pearson, 1997-2015 Joerg \
+Schilling (mkisofs)"
+LICENSE="GNU GPL v2
+	CDDL v1"
+REVISION="1"
+SOURCE_URI="http://downloads.sourceforge.net/project/cdrtools/cdrtools-3.01.tar.bz2"
+CHECKSUM_SHA256="ed282eb6276c4154ce6a0b5dee0bdb81940d0cbbfc7d03f769c4735ef5f5860f"
+PATCHES="cdrtools-3.01.patch"
+
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+
+GLOBAL_WRITABLE_FILES="
+	settings/cdrecord keep-old
+	settings/rscsi keep-old
+	"
+
+PROVIDES="
+	cdrtools = $portVersion compat >= 3
+	cmd:devdump = $portVersion compat >= 3
+	cmd:rscsi = $portVersion compat >= 3
+	cmd:scgcheck = $portVersion compat >= 3
+	cmd:mkisofs = $portVersion compat >= 3
+	cmd:btcflash = $portVersion compat >= 3
+	cmd:scgskeleton = $portVersion compat >= 3
+	cmd:isovfy = $portVersion compat >= 3
+	cmd:readcd = $portVersion compat >= 3
+	cmd:isodebug = $portVersion compat >= 3
+	cmd:cdda2mp3 = $portVersion compat >= 3
+	cmd:cdda2ogg = $portVersion compat >= 3
+	cmd:cdda2wav = $portVersion compat >= 3
+	cmd:mkhybrid = $portVersion compat >= 3
+	cmd:cdrecord = $portVersion compat >= 3
+	cmd:isodump = $portVersion compat >= 3
+	cmd:isoinfo = $portVersion compat >= 3
+	"
+REQUIRES="
+	haiku
+	"
+
+PROVIDES_devel="
+	cdrtools_devel = $portVersion
+	devel:libcdrdeflt = $portVersion compat >= 3
+	devel:libedc_ecc = $portVersion compat >= 3
+	devel:libedc_ecc_dec = $portVersion compat >= 3
+	devel:libdeflt = $portVersion compat >= 3
+	devel:libfile = $portVersion compat >= 3
+	devel:libfind = $portVersion compat >= 3
+	devel:libhfs = $portVersion compat >= 3
+	devel:libmdigest = $portVersion compat >= 3
+	devel:libparanoia = $portVersion compat >= 3
+	devel:librscg = $portVersion compat >= 3
+	devel:libscg = $portVersion compat >= 3
+	devel:libsiconv = $portVersion compat >= 3
+	devel:libscgcmd = $portVersion compat >= 3
+	devel:libschily = $portVersion compat >= 3
+	"
+REQUIRES_devel="
+	cdrtools == $portVersion
+	"
+
+BUILD_REQUIRES="
+	haiku_devel
+	"
+BUILD_PREREQUIRES="
+	cmd:find
+	cmd:gcc
+	cmd:grep
+	cmd:ld
+	cmd:make
+	cmd:sed
+	"
+
+patchInsdir()
+{
+	# Usage: patchInsdir <oldDir> <newDir> <file> ...
+	oldDir=$1
+	newDir=$2
+	shift 2
+
+	sed -i "s,^INSDIR=\s*$oldDir,INSDIR= $newDir," $@
+}
+
+PATCH()
+{
+	allMakefiles="$(find . -name Makefile\*) $(find . -name \*.mk)"
+
+	patchInsdir bin $relativeBinDir $allMakefiles
+	patchInsdir sbin $relativeBinDir $allMakefiles
+	patchInsdir share/doc $relativeDocDir $allMakefiles
+	patchInsdir include $relativeIncludeDir $allMakefiles
+	patchInsdir lib $relativeLibDir $allMakefiles
+	patchInsdir etc/default settings $allMakefiles
+
+	sed -i "s,/etc/default,$sysconfDir," \
+		btcflash/btcflash.1 \
+		cdda2wav/cdda2mp3 \
+		cdda2wav/cdda2ogg \
+		cdda2wav/cdda2*.1 \
+		cdrecord/COPYING \
+		cdrecord/README.* \
+		cdrecord/auinfo.c \
+		cdrecord/cdrecord.1 \
+		doc/*.man \
+		doc/*.ps \
+		include/schily/deflts.h \
+		libcdrdeflt/cdrdeflt.c \
+		libcdrdeflt/cdrdeflt.h \
+		mkisofs/diag/isoinfo.8 \
+		readcd/readcd.1 \
+		rscsi/rscsi.1 \
+		rscsi/rscsi.c \
+		scgskeleton/scgskeleton.1
+}
+
+BUILD()
+{
+	# not multi-job safe
+	make GMAKE_NOWARN=true INS_BASE=$prefix INS_RBASE=$prefix LDPATH="" \
+		RUNPATH="" DEFMANBASE=$relativeDocumentationDir
+}
+
+INSTALL()
+{
+	make GMAKE_NOWARN=true INS_BASE=$prefix INS_RBASE=$prefix LDPATH="" \
+		RUNPATH="" DEFMANBASE=$relativeDocumentationDir install
+
+	# The whole lib folder only contains static libraries (even in several
+	# subdirectories).
+	mkdir -p $developLibDir
+	mv $libDir/* $developLibDir/
+	rmdir $libDir
+
+	# devel package
+	packageEntries devel \
+		$developDir
+}
diff --git a/app-cdr/cdrtools/patches/cdrtools-3.01.patch b/app-cdr/cdrtools/patches/cdrtools-3.01.patch
new file mode 100644
index 000000000..5b012a572
--- /dev/null
+++ b/app-cdr/cdrtools/patches/cdrtools-3.01.patch
@@ -0,0 +1,54 @@
+diff -urp cdrtools-3.01/DEFAULTS/Defaults.haiku cdrtools-3.01-haiku/DEFAULTS/Defaults.haiku
+--- cdrtools-3.01/DEFAULTS/Defaults.haiku	2013-11-04 20:58:20.000000000 +0000
++++ cdrtools-3.01-haiku/DEFAULTS/Defaults.haiku
+@@ -30,16 +30,16 @@ CWARNOPTS=
+ 
+ DEFINCDIRS=	$(SRCROOT)/include
+ DEFOSINCDIRS=
+-LDPATH=		-L/opt/schily/lib
++LDPATH=		-L$(shell finddir B_SYSTEM_LIB_DIRECTORY)
+ #RUNPATH=	-R$(INS_BASE)/lib -R/opt/schily/lib -R$(OLIBSDIR)
+-RUNPATH=	-R$(INS_BASE)/lib -R/opt/schily/lib
++RUNPATH=	-R$(INS_BASE)/lib
+ 
+ ###########################################################################
+ #
+ # Installation config stuff
+ #
+ ###########################################################################
+-INS_BASE=	/boot/opt/schily
++#INS_BASE=	/boot/opt/schily
+ INS_KBASE=	/
+ INS_RBASE=	/
+ #
+diff -urp cdrtools-3.01/libscg/scsi-beos.c cdrtools-3.01-haiku/libscg/scsi-beos.c
+--- cdrtools-3.01/libscg/scsi-beos.c	2009-06-30 18:34:03.000000000 +0000
++++ cdrtools-3.01-haiku/libscg/scsi-beos.c
+@@ -292,7 +292,11 @@ scgo_havebus(scgp, busno)
+ 	char		buf[128];
+ 
+ 	if (busno < 8)
++#ifdef	__HAIKU__
++		js_snprintf(buf, sizeof (buf), "/dev/disk/scsi/%d", busno);
++#else
+ 		js_snprintf(buf, sizeof (buf), "/dev/bus/scsi/%d", busno);
++#endif
+ 	else
+ #ifdef	__HAIKU__
+ 		js_snprintf(buf, sizeof (buf), "/dev/disk/atapi/%d", busno-8);
+@@ -320,9 +324,15 @@ scgo_fileno(scgp, busno, tgt, tlun)
+ 			return (f->fd);
+ 	}
+ 	if (busno < 8) {
++#ifdef __HAIKU__
++		js_snprintf(buf, sizeof (buf),
++					"/dev/disk/scsi/%d/%d/%d/raw",
++					busno, tgt, tlun);
++#else
+ 		js_snprintf(buf, sizeof (buf),
+ 					"/dev/bus/scsi/%d/%d/%d/raw",
+ 					busno, tgt, tlun);
++#endif
+ 	} else {
+ 		char *tgtstr = (tgt == 0) ? "master" : (tgt == 1) ? "slave" : "dummy";
+ 		js_snprintf(buf, sizeof (buf),

From 3bd3d838e75a0286395e8c9fab94eb9adcd581e2 Mon Sep 17 00:00:00 2001
From: Sergei Reznikov <diver@gelios.net>
Date: Wed, 2 Sep 2015 19:23:26 +0300
Subject: [PATCH 2/6] qutIM: more fixes and patches

* Show qutIM icon in notifications
* Directory structure adjusted
* Add resource file
* Add libqca to requires

TODO: fix icon loading and empty settings window...
---
 net-im/qutim/additional-files/qutim.rdef      | 49 +++++++++
 net-im/qutim/patches/qutim_x86-0.3.3.patchset | 99 +++++++++++++++++++
 net-im/qutim/qutim-0.3.3.recipe               | 24 ++++-
 3 files changed, 169 insertions(+), 3 deletions(-)
 create mode 100644 net-im/qutim/additional-files/qutim.rdef
 create mode 100644 net-im/qutim/patches/qutim_x86-0.3.3.patchset

diff --git a/net-im/qutim/additional-files/qutim.rdef b/net-im/qutim/additional-files/qutim.rdef
new file mode 100644
index 000000000..e8c0cfe94
--- /dev/null
+++ b/net-im/qutim/additional-files/qutim.rdef
@@ -0,0 +1,49 @@
+
+resource app_signature "application/x-vnd.qutIM";
+
+resource app_flags B_MULTIPLE_LAUNCH;
+
+resource app_version {
+	major  = 0,
+	middle = 3,
+	minor  = 3,
+
+	variety = B_APPV_DEVELOPMENT,
+	internal = 0,
+
+	short_info = "QutIM 0.3.3",
+	long_info = "Qt4-based multi-protocol instant messenger"
+};
+
+resource vector_icon array {
+	$"6E63696604020006053DCCA338951EB8951E3DCCA348A47A4985C20070757F4D"
+	$"D6DADF53838289C4434343FFDDDDDD0201160338E60CB8EA24391EDC391A7949"
+	$"E0F44A7B8400FFB5D3FFF6020006033DD2E13D9828BD98283DD2E1C250A34B3F"
+	$"7000FFFFFF5927BAF2FF0053CC050003022ABFE1B9D6BFE1B9D6BFECBAF9BF00"
+	$"B9B6BEC3BB06BF45B834BD5F2ABE4DB787BF41B98ABC1FBCD5BD01B98BBBD3BD"
+	$"F2BC03C014BB96BF19BC21C05DBC6DC10BBC75C0B4BC66C165BC10C1F9BC36C1"
+	$"AABBD8C272BB39C34DBB6BC2E0BB1EC389BB92C3D3BB61C3B6BBDBC3FFBC6BC4"
+	$"5CBC41C40CBC88C495BC68C507BC81C4D0BC50C539BC6FC5A6BC3FC585BC93C5"
+	$"BFBCDCC5F8BCC3C5CEBCF3C622BD0EC673BCE8C653BD4DC6A9BDE4C714BDB4C6"
+	$"A4BDF9C748BE26C7B6BE09C782BE52C804BF25C813BECFC81CBF81C809C01FC7"
+	$"D1BFC5C7ECC105C786C2AAC69FC1DCC725C359C62EC45CC58EC3C0C5EDC4CDC5"
+	$"4BC5EDC540C56FC562C687C517C7B1C467C742C4D6C824C3F0C878C2B8C853C3"
+	$"92C846C2FFC743C3CFC7C5C3A2C6B7C3FEC65AC3A8C684C3E5C636C375C62FC2"
+	$"F3C62DC332C682C1D6C8DEC1EAC7EBC24CCA98C137CB19BE60CAFEBF9FCB28BD"
+	$"B2CC58BBDDCB3BBD3DCAF5BC7BCA10BDC6CA62BD0DC9C3BE74C83DBE96C8D0BF"
+	$"40C785BDBCCA51BC4BC922BC99CB43BC0DCC54BA21CC23BB12CCCEB6E0CC72B3"
+	$"05CB51B56CC916B5BAC9CCB971CBF2B735C893BAB7C7C3B8F3C747BA0AC814B8"
+	$"41C914B710C8D4B8ADC862B81CC57CB91AC621B768C45CBC11C55CB7CDC2CEB9"
+	$"38C66FB733C9AAB31FC908B764C867B5A6C2D0B656C54DB540C186B6E7BFE1B9"
+	$"D6BFD3B838BFE1B9D6020A4BB3054BB305C401B306C3C1B31BC3DFB30DC3C1B3"
+	$"1BB390BA75B390BA75B314BAADB315BBBBB2DDBB40B315BBBBBA6FCBEEBA6FCB"
+	$"EEBAA8CC6ABBB6CC68BB39CCA2BBB6CC68CBE8C50DCBE8C50DCC65C4D5CC63C3"
+	$"C7CC9BC443CC63C3C7C507B395C507B395C4DDB3384BB305C481B3024BB3050A"
+	$"04CAD3C3EBBB91CAD8B4A4BB98C3E6B4AA050A030100123FC488000000000000"
+	$"3FA7CC41C4BC43AEE401178000040A030101123FC4880000000000003FA7CC41"
+	$"C4BC43AEE401178400040A000101023FC4880000000000003FA7CC41C4BC43AE"
+	$"E40A010102023FC4880000000000003FA7CC41C4BC43AEE40A020100023FC488"
+	$"0000000000003FA7CC41C4BC43AEE4"
+};
+
+resource file_types message;
diff --git a/net-im/qutim/patches/qutim_x86-0.3.3.patchset b/net-im/qutim/patches/qutim_x86-0.3.3.patchset
new file mode 100644
index 000000000..1da43c04e
--- /dev/null
+++ b/net-im/qutim/patches/qutim_x86-0.3.3.patchset
@@ -0,0 +1,99 @@
+From bb855e1ee635a190b919da43993901f8d6108309 Mon Sep 17 00:00:00 2001
+From: Sergei Reznikov <diver@gelios.net>
+Date: Mon, 31 Aug 2015 14:18:34 +0300
+Subject: Haiku: disable adding an icon to a binary
+
+Build fails with this rule if QUTIM_BINARY_DIR is defined with this error:
+Error: Failed to open input file
+"/packages/qutim_x86-0.3.3-1/.self/apps/qutIM/qutim.rsrc": No such file or directory
+
+diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
+index 237d407..dde5eb5 100644
+--- a/core/CMakeLists.txt
++++ b/core/CMakeLists.txt
+@@ -334,28 +334,6 @@ IF(APPLE AND QUTIM_BUNDLE_LOCATION)
+ 
+ ENDIF(APPLE AND QUTIM_BUNDLE_LOCATION)
+ 
+-if(HAIKU)
+-	find_program( HAIKU_RC_COMPILER xres )
+-	if( NOT HAIKU_RC_COMPILER )
+-		message("No RC compiler (Haiku's xres) found.")
+-		return()
+-	endif()
+-	
+-	find_program( HAIKU_MIMESET mimeset )
+-	if( NOT HAIKU_MIMESET )
+-		message("Haiku's mimeset is not found.")
+-		return()
+-	endif()
+-
+-	add_custom_command(TARGET qutim POST_BUILD
+-		COMMAND ${HAIKU_RC_COMPILER} ARGS
+-			"-o" ${QUTIM_BINARY_DIR}/qutim
+-			${QUTIM_BINARY_DIR}/qutim.rsrc
+-		COMMAND ${HAIKU_MIMESET} ARGS
+-			"-f" ${QUTIM_BINARY_DIR}/qutim
+-	)
+-endif(HAIKU)
+-
+ if(LANGUAGE)
+ 	LANGUAGE_UPDATE( core ${LANGUAGE} "${CMAKE_CURRENT_SOURCE_DIR}" )
+ endif( LANGUAGE )
+-- 
+2.2.2
+
+
+From 01a16aeb9e8e69b5640d7e3695483c6f6a59a34d Mon Sep 17 00:00:00 2001
+From: Sergei Reznikov <diver@gelios.net>
+Date: Wed, 2 Sep 2015 19:17:52 +0300
+Subject: haikunotifications: show icon from the binary
+
+
+diff --git a/plugins/haikunotifications/src/haikunotificationsbackend.cpp b/plugins/haikunotifications/src/haikunotificationsbackend.cpp
+index f6a570d..4d28b77 100644
+--- a/plugins/haikunotifications/src/haikunotificationsbackend.cpp
++++ b/plugins/haikunotifications/src/haikunotificationsbackend.cpp
+@@ -31,10 +31,12 @@
+ #include <QTextDocument>
+ 
+ #ifdef Q_OS_HAIKU
++#include <Application.h>
+ #include <Roster.h>
+ #include <Notification.h>
+ #include <String.h>
+ #include <Bitmap.h>
++#include <IconUtils.h>
+ #endif
+ 
+ using namespace qutim_sdk_0_3;
+@@ -48,7 +50,7 @@ HaikuNotificationsBackend::HaikuNotificationsBackend() :
+ 
+ 
+ void HaikuNotificationsBackend::handleNotification(qutim_sdk_0_3::Notification *notification)
+-{
++{	
+ 	//ref(notification);
+ 	NotificationRequest request = notification->request();
+ 	QString text = request.text();
+@@ -56,10 +58,13 @@ void HaikuNotificationsBackend::handleNotification(qutim_sdk_0_3::Notification *
+ 	BNotification notify(B_INFORMATION_NOTIFICATION);
+ 	notify.SetTitle(static_cast<BString>(request.title().toLocal8Bit()));
+ 	notify.SetContent(static_cast<BString>(text.toLocal8Bit()));
+-	if(!request.image().isNull()) {
+-		BBitmap *bitmap = request.image().toHaikuBitmap();
+-		notify.SetIcon(bitmap);
+-	}
++
++	app_info info;
++	be_app->GetAppInfo(&info);
++	BBitmap icon(BRect(0, 0, 32, 32), B_RGBA32);
++	BNode node(&info.ref);
++	BIconUtils::GetVectorIcon(&node, "BEOS:ICON", &icon);
++	notify.SetIcon(&icon);
+ 		
+ 	notify.Send();
+ }
+-- 
+2.2.2
+
diff --git a/net-im/qutim/qutim-0.3.3.recipe b/net-im/qutim/qutim-0.3.3.recipe
index 98b177f5a..a86b4f118 100644
--- a/net-im/qutim/qutim-0.3.3.recipe
+++ b/net-im/qutim/qutim-0.3.3.recipe
@@ -31,6 +31,7 @@ REQUIRES="
 	libqt4${secondaryArchSuffix} >= 4.8
 	lib:libaspell$secondaryArchSuffix
 	lib:libgsasl$secondaryArchSuffix
+	lib:libqca$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
@@ -52,6 +53,8 @@ BUILD_PREREQUIRES="
 	cmd:pkg_config${secondaryArchSuffix}
 	"
 
+PATCHES="qutim_x86-0.3.3.patchset"
+
 BUILD()
 {
 	# prepare the directory structure
@@ -63,6 +66,7 @@ BUILD()
 
 	mkdir -p ../qutim-build
 	cd ../qutim-build
+
 	cmake ../qutim-0.3.3 \
 		-DVREEN=0 \
 		-DVKONTAKTE=0 \
@@ -70,15 +74,29 @@ BUILD()
 		-DDBUSAPI=off \
 		-DDBUSNOTIFICATIONS=off \
 		-DNOWPLAYING=off \
-		-DCMAKE_INSTALL_PREFIX=$appsDir/qutIM
-#		-DDATA_INSTALL_DIR=$appsDir/qutIM/data \
-#		-DQUTIM_SHARE_DIR_DEF=$appsDir/qutIM/data
+		-DCMAKE_INSTALL_PREFIX=$appsDir/qutIM \
+		-DDATA_INSTALL_DIR=$appsDir/qutIM/data \
+		-DQUTIM_SHARE_DIR_DEF=$appsDir/qutIM/data \
+		-DQUTIM_SHARE_DIR=$appsDir/qutIM/data \
+		-DQUTIM_BINARY_DIR=$appsDir/qutIM \
+		-DQUTIM_PLUGINS_DEST=$appsDir/qutIM
+
 	make $jobArgs
+
 }
 
 INSTALL()
 {
 	cd ../qutim-build
 	make install
+
+	mv $appsDir/qutIM/bin/qutim $appsDir/qutIM/qutIM
+	rm -rf $appsDir/qutIM/bin
+
+	addResourcesToBinaries $portDir/additional-files/qutim.rdef $appsDir/qutIM/qutIM
+
+	rm -rf $appsDir/qutIM/{include,libqutim,share}
+	rm -rf $appsDir/qutIM/lib/{pkgconfig,qutim}
+
 	addAppDeskbarSymlink $appsDir/qutIM/qutIM
 }

From 2544d64f77e15301e731c7a925f140e7c94d1324 Mon Sep 17 00:00:00 2001
From: Sergei Reznikov <diver@gelios.net>
Date: Thu, 3 Sep 2015 08:26:32 +0300
Subject: [PATCH 3/6] qutIM: more fixes to the recipe and the patch

* disabble mobile plugins, those are not needed.
* correctly set QUTIM_SHARE_DIR on Haiku so that qutIM can find its icons. This also fixes crashes in some plugins.
* clean up patch.

TODO: some icons are still missing. Statistics gatherer window always shows on start-up.
---
 net-im/qutim/patches/qutim_x86-0.3.3.patchset | 110 +++++++++---------
 net-im/qutim/patches/xdg.patchset             |  22 ++++
 net-im/qutim/qutim-0.3.3.recipe               |  18 +--
 3 files changed, 87 insertions(+), 63 deletions(-)
 create mode 100644 net-im/qutim/patches/xdg.patchset

diff --git a/net-im/qutim/patches/qutim_x86-0.3.3.patchset b/net-im/qutim/patches/qutim_x86-0.3.3.patchset
index 1da43c04e..19bfb90af 100644
--- a/net-im/qutim/patches/qutim_x86-0.3.3.patchset
+++ b/net-im/qutim/patches/qutim_x86-0.3.3.patchset
@@ -1,50 +1,4 @@
-From bb855e1ee635a190b919da43993901f8d6108309 Mon Sep 17 00:00:00 2001
-From: Sergei Reznikov <diver@gelios.net>
-Date: Mon, 31 Aug 2015 14:18:34 +0300
-Subject: Haiku: disable adding an icon to a binary
-
-Build fails with this rule if QUTIM_BINARY_DIR is defined with this error:
-Error: Failed to open input file
-"/packages/qutim_x86-0.3.3-1/.self/apps/qutIM/qutim.rsrc": No such file or directory
-
-diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
-index 237d407..dde5eb5 100644
---- a/core/CMakeLists.txt
-+++ b/core/CMakeLists.txt
-@@ -334,28 +334,6 @@ IF(APPLE AND QUTIM_BUNDLE_LOCATION)
- 
- ENDIF(APPLE AND QUTIM_BUNDLE_LOCATION)
- 
--if(HAIKU)
--	find_program( HAIKU_RC_COMPILER xres )
--	if( NOT HAIKU_RC_COMPILER )
--		message("No RC compiler (Haiku's xres) found.")
--		return()
--	endif()
--	
--	find_program( HAIKU_MIMESET mimeset )
--	if( NOT HAIKU_MIMESET )
--		message("Haiku's mimeset is not found.")
--		return()
--	endif()
--
--	add_custom_command(TARGET qutim POST_BUILD
--		COMMAND ${HAIKU_RC_COMPILER} ARGS
--			"-o" ${QUTIM_BINARY_DIR}/qutim
--			${QUTIM_BINARY_DIR}/qutim.rsrc
--		COMMAND ${HAIKU_MIMESET} ARGS
--			"-f" ${QUTIM_BINARY_DIR}/qutim
--	)
--endif(HAIKU)
--
- if(LANGUAGE)
- 	LANGUAGE_UPDATE( core ${LANGUAGE} "${CMAKE_CURRENT_SOURCE_DIR}" )
- endif( LANGUAGE )
--- 
-2.2.2
-
-
-From 01a16aeb9e8e69b5640d7e3695483c6f6a59a34d Mon Sep 17 00:00:00 2001
+From e8c5834e624b82b5f4a8282104cc5ac2852d5631 Mon Sep 17 00:00:00 2001
 From: Sergei Reznikov <diver@gelios.net>
 Date: Wed, 2 Sep 2015 19:17:52 +0300
 Subject: haikunotifications: show icon from the binary
@@ -67,15 +21,6 @@ index f6a570d..4d28b77 100644
  #endif
  
  using namespace qutim_sdk_0_3;
-@@ -48,7 +50,7 @@ HaikuNotificationsBackend::HaikuNotificationsBackend() :
- 
- 
- void HaikuNotificationsBackend::handleNotification(qutim_sdk_0_3::Notification *notification)
--{
-+{	
- 	//ref(notification);
- 	NotificationRequest request = notification->request();
- 	QString text = request.text();
 @@ -56,10 +58,13 @@ void HaikuNotificationsBackend::handleNotification(qutim_sdk_0_3::Notification *
  	BNotification notify(B_INFORMATION_NOTIFICATION);
  	notify.SetTitle(static_cast<BString>(request.title().toLocal8Bit()));
@@ -97,3 +42,56 @@ index f6a570d..4d28b77 100644
 -- 
 2.2.2
 
+
+From 37cc118cf0beb8e3134d3abe26ce06d868dba46a Mon Sep 17 00:00:00 2001
+From: Sergei Reznikov <diver@gelios.net>
+Date: Wed, 2 Sep 2015 21:21:44 +0300
+Subject: systeminfo: correctly set QUTIM_SHARE_DIR on Haiku
+
+
+diff --git a/core/libqutim/systeminfo.cpp b/core/libqutim/systeminfo.cpp
+index 0ea79ad..54e85ed 100644
+--- a/core/libqutim/systeminfo.cpp
++++ b/core/libqutim/systeminfo.cpp
+@@ -296,8 +296,15 @@ void init(SystemInfoPrivate *d)
+ 	d->dirs[SystemInfo::HistoryDir]        = QDir::homePath() % QLatin1Literal("/.qutim/profiles/default/history");
+ 	d->dirs[SystemInfo::ShareDir]          = QDir::homePath() % QLatin1Literal("/.qutim/share");
+ #if defined(QUTIM_SHARE_DIR)
++
++#ifdef Q_OS_HAIKU
++	d->dirs[SystemInfo::SystemConfigDir]   = QString(QUTIM_SHARE_DIR) % QLatin1Literal("/config");
++	d->dirs[SystemInfo::SystemShareDir]    = QString(QUTIM_SHARE_DIR);
++#else
+ 	d->dirs[SystemInfo::SystemConfigDir]   = qApp->applicationDirPath() % QLatin1Literal("/../") % QLatin1Literal(QUTIM_SHARE_DIR) % QLatin1Literal("/config");
+ 	d->dirs[SystemInfo::SystemShareDir]    = qApp->applicationDirPath() % QLatin1Literal("/../") % QLatin1Literal(QUTIM_SHARE_DIR);
++#endif
++
+ #else
+ # error QUTIM_SHARE_DIR undefined!
+ #endif
+-- 
+2.2.2
+
+
+From e18e89cef444259ad70a905e6ce02a7696d289be Mon Sep 17 00:00:00 2001
+From: Sergei Reznikov <diver@gelios.net>
+Date: Wed, 2 Sep 2015 21:57:10 +0300
+Subject: iconsloaderimpl: use qutim-default on Haiku
+
+
+diff --git a/core/src/corelayers/qticons/iconsloaderimpl.cpp b/core/src/corelayers/qticons/iconsloaderimpl.cpp
+index e58639c..1ad20ad 100644
+--- a/core/src/corelayers/qticons/iconsloaderimpl.cpp
++++ b/core/src/corelayers/qticons/iconsloaderimpl.cpp
+@@ -31,7 +31,7 @@
+ #include <QFormLayout>
+ #include <qutim/icon.h>
+ 
+-#if defined(Q_OS_MAC) || defined(Q_OS_WIN)
++#if defined(Q_OS_MAC) || defined(Q_OS_WIN) || defined(Q_OS_HAIKU)
+ #	define QUTIM_DEFAULT_ICON_THEME "qutim-default"
+ #else
+ #	define QUTIM_DEFAULT_ICON_THEME ""
+-- 
+2.2.2
+
diff --git a/net-im/qutim/patches/xdg.patchset b/net-im/qutim/patches/xdg.patchset
new file mode 100644
index 000000000..d6ea56728
--- /dev/null
+++ b/net-im/qutim/patches/xdg.patchset
@@ -0,0 +1,22 @@
+From d40ce74366293170c80e40d06b0d47d7504d6888 Mon Sep 17 00:00:00 2001
+From: Sergei Reznikov <diver@gelios.net>
+Date: Wed, 2 Sep 2015 22:09:11 +0300
+Subject: xdgenvironment: define XdgEnvironment::dataDirs for Haiku
+
+
+diff --git a/src/xdgenvironment.cpp b/src/xdgenvironment.cpp
+index 6bf283d..0e082ff 100644
+--- a/src/xdgenvironment.cpp
++++ b/src/xdgenvironment.cpp
+@@ -104,7 +104,7 @@ QDir XdgEnvironment::configHome()
+ */
+ QList<QDir> XdgEnvironment::dataDirs()
+ {
+-#if defined(Q_WS_WIN) || defined (Q_WS_MAC)
++#if defined(Q_WS_WIN) || defined (Q_WS_MAC) || defined (Q_WS_HAIKU)
+     QList<QDir> list;
+     list.append(QDir(QCoreApplication::applicationDirPath()));
+     return list;
+-- 
+2.2.2
+
diff --git a/net-im/qutim/qutim-0.3.3.recipe b/net-im/qutim/qutim-0.3.3.recipe
index a86b4f118..6dc483544 100644
--- a/net-im/qutim/qutim-0.3.3.recipe
+++ b/net-im/qutim/qutim-0.3.3.recipe
@@ -30,7 +30,9 @@ REQUIRES="
 	haiku${secondaryArchSuffix}
 	libqt4${secondaryArchSuffix} >= 4.8
 	lib:libaspell$secondaryArchSuffix
+#	lib:libattica$secondaryArchSuffix
 	lib:libgsasl$secondaryArchSuffix
+#	lib:libpurple$secondaryArchSuffix
 	lib:libqca$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
@@ -54,6 +56,7 @@ BUILD_PREREQUIRES="
 	"
 
 PATCHES="qutim_x86-0.3.3.patchset"
+PATCHES_3="xdg.patchset"
 
 BUILD()
 {
@@ -74,15 +77,16 @@ BUILD()
 		-DDBUSAPI=off \
 		-DDBUSNOTIFICATIONS=off \
 		-DNOWPLAYING=off \
+		-DMOBILEABOUT=off \
+		-DMOBILECONTACTINFO=off \
+		-DMOBILENOTIFICATIONSSETTINGS=off \
+		-DMOBILESETTINGSDIALOG=off \
 		-DCMAKE_INSTALL_PREFIX=$appsDir/qutIM \
 		-DDATA_INSTALL_DIR=$appsDir/qutIM/data \
 		-DQUTIM_SHARE_DIR_DEF=$appsDir/qutIM/data \
-		-DQUTIM_SHARE_DIR=$appsDir/qutIM/data \
-		-DQUTIM_BINARY_DIR=$appsDir/qutIM \
-		-DQUTIM_PLUGINS_DEST=$appsDir/qutIM
+		-DQUTIM_SHARE_DIR=$appsDir/qutIM/data
 
 	make $jobArgs
-
 }
 
 INSTALL()
@@ -90,13 +94,13 @@ INSTALL()
 	cd ../qutim-build
 	make install
 
+	mv $appsDir/qutIM/lib/qutim/plugins $appsDir/qutIM
 	mv $appsDir/qutIM/bin/qutim $appsDir/qutIM/qutIM
-	rm -rf $appsDir/qutIM/bin
-
-	addResourcesToBinaries $portDir/additional-files/qutim.rdef $appsDir/qutIM/qutIM
 
 	rm -rf $appsDir/qutIM/{include,libqutim,share}
 	rm -rf $appsDir/qutIM/lib/{pkgconfig,qutim}
+	rm -rf $appsDir/qutIM/bin
 
+	addResourcesToBinaries $portDir/additional-files/qutim.rdef $appsDir/qutIM/qutIM
 	addAppDeskbarSymlink $appsDir/qutIM/qutIM
 }

From 82d0a570cda9ad243783689465a46859f5e8219b Mon Sep 17 00:00:00 2001
From: Humdinger <humdingerb@gmail.com>
Date: Thu, 3 Sep 2015 17:55:00 +0200
Subject: [PATCH 4/6] Recipe primping, improved SUMMARY/DESCRIPTION,
 re-ordering blocks.

---
 sys-apps/most/most-pre5.1_15.recipe           | 10 ++-
 sys-apps/sed/sed-4.2.1.recipe                 | 21 +++---
 sys-apps/which/which-2.21.recipe              | 17 +++--
 sys-devel/autoconf/autoconf-2.69.recipe       | 27 ++++---
 sys-devel/autoconf213/autoconf213-2.13.recipe | 20 +++---
 sys-devel/automake/automake-1.13.1.recipe     | 19 +++--
 .../binutils/binutils-2.25_12015_07_31.recipe | 62 ++++++++--------
 sys-devel/bison/bison-2.6.5.recipe            | 27 ++++---
 sys-devel/clang/clang-3.5.1.recipe            | 70 ++++++++-----------
 sys-devel/jam/jam-2.5_2012_10_12.recipe       | 28 ++++----
 sys-devel/libtool/libtool-2.4.2.recipe        | 17 ++---
 sys-devel/libuuid/libuuid-1.0.3.recipe        | 43 ++++++------
 12 files changed, 164 insertions(+), 197 deletions(-)

diff --git a/sys-apps/most/most-pre5.1_15.recipe b/sys-apps/most/most-pre5.1_15.recipe
index 38f977656..1d4297785 100644
--- a/sys-apps/most/most-pre5.1_15.recipe
+++ b/sys-apps/most/most-pre5.1_15.recipe
@@ -1,6 +1,6 @@
-SUMMARY="A paging program similar to more and less"
-DESCRIPTION="MOST is a powerful paging program for Unix, VMS, MSDOS, and win32 systems. \
-Unlike other well-known paging programs most supports multiple windows and can \
+SUMMARY="A paging program similar to 'more' and 'less'"
+DESCRIPTION="'Most' is a powerful paging program for Unix, VMS, MSDOS, and win32 systems. \
+Unlike other well-known paging programs 'most' supports multiple windows and can \
 scroll left and right. Why settle for less?"
 HOMEPAGE="http://www.jedsoft.org/most/"
 COPYRIGHT="2004-2013 John E. Davis"
@@ -17,7 +17,6 @@ PROVIDES="
 	most = $portVersion compat >= 5
 	cmd:most = $portVersion compat >= 5
 	"
-
 REQUIRES="
 	haiku
 	lib:libncurses
@@ -25,12 +24,11 @@ REQUIRES="
 	"
 
 BUILD_REQUIRES="
+	haiku_devel
 	devel:libncurses
 	devel:libslang
 	"
-
 BUILD_PREREQUIRES="
-	haiku_devel
 	cmd:autoconf
 	cmd:find
 	cmd:gcc
diff --git a/sys-apps/sed/sed-4.2.1.recipe b/sys-apps/sed/sed-4.2.1.recipe
index b1818eb11..229b6cc7c 100644
--- a/sys-apps/sed/sed-4.2.1.recipe
+++ b/sys-apps/sed/sed-4.2.1.recipe
@@ -1,22 +1,20 @@
-SUMMARY="A stream editor"
-DESCRIPTION="
-Sed is a stream editor, i.e. it can be used to perform basic text \
-transformations on an input stream (a file or input from a pipeline).
+SUMMARY="The famous stream editor"
+DESCRIPTION="Sed is a stream editor, i.e. it can be used to perform basic \
+text transformations on an input stream (a file or input from a pipeline).
 While in some ways similar to an editor which permits scripted edits (such as \
 ed), sed works by making only one pass over the input(s), and is consequently \
 more efficient. But it is sed's ability to filter text in a pipeline which \
-particularly distinguishes it from other types of editors.
-"
+particularly distinguishes it from other types of editors."
 HOMEPAGE="http://www.gnu.org/software/sed"
 COPYRIGHT="1989-2009 Free Software Foundation, Inc."
 LICENSE="GNU GPL v3"
+REVISION="6"
 SOURCE_URI="http://ftp.gnu.org/gnu/sed/sed-4.2.1.tar.gz"
 CHECKSUM_SHA256="8773541ce097fdc4c5b9e7da12a82dffbb30cd91f7bc169f52f05f93b7fc3060"
-REVISION="6"
-ARCHITECTURES="x86_gcc2 x86 x86_64 arm"
-
 PATCHES="sed-4.2.1.patchset"
 
+ARCHITECTURES="x86_gcc2 x86 x86_64 arm"
+
 PROVIDES="
 	sed = $portVersion compat >= 4
 	cmd:sed = $portVersion compat >= 4
@@ -24,8 +22,11 @@ PROVIDES="
 REQUIRES="
 	haiku
 	"
-BUILD_PREREQUIRES="
+
+BUILD_REQUIRES="
 	haiku_devel
+	"
+BUILD_PREREQUIRES="
 	cmd:gcc
 	cmd:ld
 	cmd:make
diff --git a/sys-apps/which/which-2.21.recipe b/sys-apps/which/which-2.21.recipe
index 2ea843b42..c024f58ce 100644
--- a/sys-apps/which/which-2.21.recipe
+++ b/sys-apps/which/which-2.21.recipe
@@ -1,18 +1,16 @@
-SUMMARY="Prints out location of specified executables that are in your path"
-DESCRIPTION="
-GNU which is an utility that is used to find which executable (or alias or \
-shell function) is executed when entered on the shell prompt.
-"
+SUMMARY="Prints out location of specified executables that are in your PATH"
+DESCRIPTION="GNU 'which' is an utility that is used to find which executable \
+(or alias or shell function) is executed when entered on the shell prompt."
 HOMEPAGE="http://carlo17.home.xs4all.nl/which/"
 COPYRIGHT="Free Software Foundation"
 LICENSE="GNU GPL v2"
+REVISION="1"
 SOURCE_URI="http://ftp.gnu.org/gnu/which/which-$portVersion.tar.gz"
 CHECKSUM_SHA256="f4a245b94124b377d8b49646bf421f9155d36aa7614b6ebf83705d3ffc76eaad"
-REVISION="1"
-ARCHITECTURES="x86_gcc2 x86 x86_64 arm"
-
 PATCHES="which-$portVersion.patch"
 
+ARCHITECTURES="x86_gcc2 x86 x86_64 arm"
+
 PROVIDES="
 	which = $portVersion
 	cmd:which = $portVersion
@@ -20,10 +18,11 @@ PROVIDES="
 REQUIRES="
 	haiku
 	"
+
 BUILD_REQUIRES="
+	haiku_devel
 	"
 BUILD_PREREQUIRES="
-	haiku_devel
 	cmd:gcc
 	cmd:make
 	cmd:sed
diff --git a/sys-devel/autoconf/autoconf-2.69.recipe b/sys-devel/autoconf/autoconf-2.69.recipe
index 02503d438..308a2cee1 100644
--- a/sys-devel/autoconf/autoconf-2.69.recipe
+++ b/sys-devel/autoconf/autoconf-2.69.recipe
@@ -1,23 +1,19 @@
-SUMMARY="A tool for automatically configuring source code"
-DESCRIPTION="
-GNU Autoconf is a tool for configuring source code and makefiles. Using \
-autoconf, programmers can create portable and configurable packages, because \
-the person building the package is allowed to specify various configuration \
-options.
-"
+SUMMARY="A tool to automatically configure source code"
+DESCRIPTION="GNU Autoconf is a tool for configuring source code and \
+makefiles. Using autoconf, programmers can create portable and configurable \
+packages, because the person building the package is allowed to specify \
+various configuration options."
 HOMEPAGE="http://www.gnu.org/software/autoconf/"
 COPYRIGHT="1992-2012 Free Software Foundation, Inc."
-LICENSE="
-	GNU GPL v2
-	GNU GPL v3
-	"
+LICENSE="GNU GPL v2
+	GNU GPL v3"
+REVISION="6"
 SOURCE_URI="http://ftp.gnu.org/gnu/autoconf/autoconf-2.69.tar.gz"
 CHECKSUM_SHA256="954bd69b391edc12d6a4a51a2dd1476543da5c6bbf05a95b59dc0dd6fd4c2969"
-REVISION="6"
-ARCHITECTURES="x86_gcc2 x86 x86_64 arm"
-
 PATCHES='autoconf-2.69.patchset'
 
+ARCHITECTURES="x86_gcc2 x86 x86_64 arm"
+
 PROVIDES="
 	autoconf = $portVersion compat >= 2.60
 	cmd:autoconf = $portVersion compat >= 2.60
@@ -37,10 +33,11 @@ REQUIRES="
 	cmd:perl >= 5
 	cmd:sh
 	"
+
 BUILD_REQUIRES="
+	haiku_devel
 	"
 BUILD_PREREQUIRES="
-	haiku_devel
 	cmd:awk
 	cmd:m4
 	cmd:make
diff --git a/sys-devel/autoconf213/autoconf213-2.13.recipe b/sys-devel/autoconf213/autoconf213-2.13.recipe
index 63862358f..4bd38e673 100644
--- a/sys-devel/autoconf213/autoconf213-2.13.recipe
+++ b/sys-devel/autoconf213/autoconf213-2.13.recipe
@@ -1,18 +1,16 @@
-SUMMARY="A tool for automatically configuring source code"
-DESCRIPTION="GNU Autoconf is a tool for configuring source code and makefiles. Using \
-autoconf, programmers can create portable and configurable packages, because \
-the person building the package is allowed to specify various configuration \
-options."
+SUMMARY="A tool to automatically configure source code"
+DESCRIPTION="GNU Autoconf is a tool for configuring source code and \
+makefiles. Using autoconf, programmers can create portable and configurable \
+packages, because the person building the package is allowed to specify \
+various configuration options."
 HOMEPAGE="http://www.gnu.org/software/autoconf/"
+COPYRIGHT="1992-1998 Free Software Foundation, Inc."
+LICENSE="GNU GPL v2"
+REVISION="2"
 SOURCE_URI="http://ftp.gnu.org/gnu/autoconf/autoconf-$portVersion.tar.gz"
 CHECKSUM_SHA256="f0611136bee505811e9ca11ca7ac188ef5323a8e2ef19cffd3edb3cf08fd791e"
-REVISION="2"
-
 SOURCE_DIR="autoconf-$portVersion"
 
-LICENSE="GNU GPL v2"
-COPYRIGHT="1992-1998 Free Software Foundation, Inc."
-
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
@@ -25,7 +23,6 @@ PROVIDES="
 	cmd:autoupdate_$portVersion$secondaryArchSuffix = $portVersion
 	cmd:ifnames_$portVersion$secondaryArchSuffix = $portVersion
 	"
-
 REQUIRES="
 	haiku$secondaryArchSuffix
 	"
@@ -33,7 +30,6 @@ REQUIRES="
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	"
-
 BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
 	cmd:make
diff --git a/sys-devel/automake/automake-1.13.1.recipe b/sys-devel/automake/automake-1.13.1.recipe
index 1b4e31285..b1473b9fa 100644
--- a/sys-devel/automake/automake-1.13.1.recipe
+++ b/sys-devel/automake/automake-1.13.1.recipe
@@ -1,16 +1,15 @@
 SUMMARY="A tool for generating 'Makefile.in' from 'Makefile.am'"
-DESCRIPTION="
-Automake is a tool for automatically generating 'Makefile.in' files from \
-'Makefile.am' files.  'Makefile.am' is a series of 'make' macro definitions \
-(with rules occasionally thrown in).  The generated 'Makefile.in' files are \
-compatible with the GNU Makefile standards.
-"
+DESCRIPTION="Automake is a tool for automatically generating 'Makefile.in' \
+files from 'Makefile.am' files.  'Makefile.am' is a series of 'make' macro \
+definitions (with rules occasionally thrown in).  The generated 'Makefile.in' \
+files are compatible with the GNU Makefile standards."
 HOMEPAGE="http://www.gnu.org/software/automake/"
 COPYRIGHT="2013 Free Software Foundation, Inc."
 LICENSE="GNU GPL v2"
+REVISION="4"
 SOURCE_URI="http://ftp.gnu.org/gnu/automake/automake-1.13.1.tar.gz"
 CHECKSUM_SHA256="51bc10031847e9965c4f2c16a0a66552309ce28ea82b1afa8cef736643ebaa27"
-REVISION="4"
+
 ARCHITECTURES="x86_gcc2 x86 x86_64 arm"
 
 PROVIDES="
@@ -29,10 +28,11 @@ REQUIRES="
 	cmd:perl >= 5.8
 	cmd:sh
 	"
+
 BUILD_REQUIRES="
+	haiku_devel
 	"
 BUILD_PREREQUIRES="
-	haiku_devel
 	cmd:autoconf >= 2.60
 	cmd:find
 	cmd:gcc
@@ -41,8 +41,7 @@ BUILD_PREREQUIRES="
 	cmd:makeinfo
 	cmd:perl >= 5.8
 	cmd:sed
-    "
-
+	"
 
 BUILD()
 {
diff --git a/sys-devel/binutils/binutils-2.25_12015_07_31.recipe b/sys-devel/binutils/binutils-2.25_12015_07_31.recipe
index 3d2bdaf29..bf2f0162a 100644
--- a/sys-devel/binutils/binutils-2.25_12015_07_31.recipe
+++ b/sys-devel/binutils/binutils-2.25_12015_07_31.recipe
@@ -1,17 +1,35 @@
 SUMMARY="Assembler, linker and binary tools for target ${targetMachineTriple}"
-HOMEPAGE="http://www.gnu.org/software/binutils"
+DESCRIPTION="The GNU Binutils are a collection of binary tools.
 
+The main ones are:
+- ld - the GNU linker.
+- as - the GNU assembler.
+
+But they also include:
+- addr2line - converts addresses into filenames and line numbers.
+- ar - a utility for creating, modifying and extracting of archives.
+- c++filt - filter to demangle encoded C++ symbols.
+- nm - lists symbols from object files.
+- objcopy - copys and translates object files.
+- objdump - displays information from object files.
+- ranlib - generates an index to the contents of an archive.
+- readelf - displays information from any ELF format object file.
+- size - lists the section sizes of an object or archive file.
+- strings - lists printable strings from files.
+- strip - discards symbols.
+
+The tools of this package can be used for cross-builds to \
+$effectiveTargetMachineTriple."
+HOMEPAGE="http://www.gnu.org/software/binutils"
+COPYRIGHT="1988-2015 Free Software Foundation, Inc."
+LICENSE="GNU GPL v3
+	GNU LGPL v3"
+REVISION="1"
 srcGitRev="e2963a55e6d09d838bd84135091fbc73ffa2c2bf"
 SOURCE_URI="https://github.com/haiku/buildtools/archive/$srcGitRev.tar.gz"
 CHECKSUM_SHA256="1e1214ea3cf87403cbd1176b41f823a6d0505074f513fb8eeb7e46c1aaa1c196"
+SOURCE_DIR="buildtools-$srcGitRev/binutils"
 SOURCE_FILENAME="binutils-$portVersion.tar.gz"
-REVISION="1"
-LICENSE="
-	GNU GPL v3
-	GNU LGPL v3
-	"
-COPYRIGHT="1988-2015 Free Software Foundation, Inc."
-
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64 arm"
 SECONDARY_ARCHITECTURES="x86"
@@ -37,16 +55,16 @@ PROVIDES="
 	lib:libbfd_2.25.1$secondaryArchSuffix = $portVersion compat >= 2.23
 	lib:libopcodes_2.25.1$secondaryArchSuffix = $portVersion compat >= 2.23
 	"
-
 REQUIRES="
 	haiku$secondaryArchSuffix
 	"
+
 BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
 	cmd:find
 	cmd:xargs
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel
 	cmd:autoconf
 	cmd:awk
 	cmd:find
@@ -61,7 +79,7 @@ BUILD_PREREQUIRES="
 	cmd:xargs
 	"
 
-SOURCE_DIR="buildtools-$srcGitRev/binutils"
+
 BUILD_PACKAGE_ACTIVATION_PHASE=INSTALL
 
 sourceDir=$(pwd)
@@ -149,24 +167,4 @@ INSTALL()
 	for cmd in dlltool nlmconv windmc windres; do
 		rm -f man1/$cmd.1
 	done
-}
-
-DESCRIPTION="
-The GNU Binutils are a collection of binary tools. The main ones are:
-- ld - the GNU linker.
-- as - the GNU assembler.
-But they also include:
-- addr2line - Converts addresses into filenames and line numbers.
-- ar - A utility for creating, modifying and extracting from archives.
-- c++filt - Filter to demangle encoded C++ symbols.
-- nm - Lists symbols from object files.
-- objcopy - Copys and translates object files.
-- objdump - Displays information from object files.
-- ranlib - Generates an index to the contents of an archive.
-- readelf - Displays information from any ELF format object file.
-- size - Lists the section sizes of an object or archive file.
-- strings - Lists printable strings from files.
-- strip - Discards symbols.
-The tools of this package can be used for cross-builds to \
-$effectiveTargetMachineTriple.
-"
+}
\ No newline at end of file
diff --git a/sys-devel/bison/bison-2.6.5.recipe b/sys-devel/bison/bison-2.6.5.recipe
index b18b8ea89..a4479e3bc 100644
--- a/sys-devel/bison/bison-2.6.5.recipe
+++ b/sys-devel/bison/bison-2.6.5.recipe
@@ -1,26 +1,25 @@
 SUMMARY="A yacc-compatible parser generator"
-DESCRIPTION="
-Bison is a general-purpose parser generator that converts an annotated \
-context-free grammar into an LALR(1) or GLR parser for that grammar. Once you \
-are proficient with Bison, you can use it to develop a wide range of language \
-parsers, from those used in simple desk calculators to complex programming \
-languages.
+DESCRIPTION="Bison is a general-purpose parser generator that converts an \
+annotated context-free grammar into an LALR(1) or GLR parser for that \
+grammar. Once you are proficient with Bison, you can use it to develop a wide \
+range of language parsers, from those used in simple desk calculators to \
+complex programming languages.
+
 Bison is upward compatible with Yacc: all properly-written Yacc grammars ought \
 to work with Bison with no change. Anyone familiar with Yacc should be able to \
 use Bison with little trouble. You need to be fluent in C or C++ programming \
-in order to use Bison.
-"
+in order to use Bison."
 HOMEPAGE="http://www.gnu.org/software/bison/bison.html"
 COPYRIGHT="1992-2011 Free Software Foundation, Inc."
 LICENSE="GNU GPL v3"
+REVISION="1"
 SOURCE_URI="http://ftp.gnu.org/gnu/bison/bison-$portVersion.tar.gz"
 CHECKSUM_SHA256="856487963d9d57eff2c5de54841d00ff36399f6a9f232711702701ce589c3afa"
-REVISION="1"
+PATCHES="bison-${portVersion}.patchset"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86 x86_gcc2"
 
-PATCHES="bison-${portVersion}.patchset"
 
 PROVIDES="
 	bison$secondaryArchSuffix = $portVersion compat >= 2.6
@@ -28,17 +27,15 @@ PROVIDES="
 	cmd:yacc$secondaryArchSuffix
 	devel:liby$secondaryArchSuffix = $portVersion compat >= 2.6
 	"
-
 REQUIRES="
 	haiku$secondaryArchSuffix
 	cmd:m4
 	"
 
 BUILD_REQUIRES="
-	"
-
-BUILD_PREREQUIRES="
 	haiku${secondaryArchSuffix}_devel
+	"
+BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:awk
@@ -69,4 +66,4 @@ INSTALL()
 TEST()
 {
 	make check
-}
+}
\ No newline at end of file
diff --git a/sys-devel/clang/clang-3.5.1.recipe b/sys-devel/clang/clang-3.5.1.recipe
index 0bb866de6..4aace9f4a 100644
--- a/sys-devel/clang/clang-3.5.1.recipe
+++ b/sys-devel/clang/clang-3.5.1.recipe
@@ -1,25 +1,23 @@
-SUMMARY="A llvm front end compiler for C and C++"
-DESCRIPTION="
-Clang is an 'LLVM native' C/C++/Objective-C compiler, which aims to deliver \
-amazingly fast compiles (e.g. about 3x faster than GCC when compiling \
-Objective-C code in a debug configuration), extremely useful error and warning \
-messages and to provide a platform for building great source level tools.
-"
-
+SUMMARY="A llvm front end compiler for C, C++ and Objective-C"
+SUMMARY_analysis="Static analysis tools using the clang compiler"
+DESCRIPTION="Clang is an 'LLVM native' C/C++/Objective-C compiler, which aims \
+to deliver amazingly fast compiles (e.g. about 3x faster than GCC when \
+compiling Objective-C code in a debug configuration), extremely useful error \
+and warning messages and to provide a platform for building great source \
+level tools."
 HOMEPAGE="http://www.llvm.org/"
-LICENSE="UIUC"
 COPYRIGHT="2003-2012 University of Illinois at Urbana-Champaign"
-
-SOURCE_URI="http://llvm.org/releases/${portVersion}/llvm-${portVersion}.src.tar.xz"
-CHECKSUM_SHA256="bf3275d2d7890015c8d8f5e6f4f882f8cf3bf51967297ebe74111d6d8b53be15"
-
-SOURCE_URI_2="http://llvm.org/releases/${portVersion}/cfe-${portVersion}.src.tar.xz"
-CHECKSUM_SHA256_2="6773f3f9cf815631cc7e779ec134ddd228dc8e9a250e1ea3a910610c59eb8f5c"
-
-SOURCE_URI_3="http://llvm.org/releases/${portVersion}/clang-tools-extra-${portVersion}.src.tar.xz"
-CHECKSUM_SHA256_3="e8d011250389cfc36eb51557ca25ae66ab08173e8d53536a0747356105d72906"
-
+LICENSE="UIUC"
 REVISION="1"
+SOURCE_URI="http://llvm.org/releases/${portVersion}/llvm-${portVersion}.src.tar.xz"
+SOURCE_URI_2="http://llvm.org/releases/${portVersion}/cfe-${portVersion}.src.tar.xz"
+SOURCE_URI_3="http://llvm.org/releases/${portVersion}/clang-tools-extra-${portVersion}.src.tar.xz"
+CHECKSUM_SHA256="bf3275d2d7890015c8d8f5e6f4f882f8cf3bf51967297ebe74111d6d8b53be15"
+CHECKSUM_SHA256_2="6773f3f9cf815631cc7e779ec134ddd228dc8e9a250e1ea3a910610c59eb8f5c"
+CHECKSUM_SHA256_3="e8d011250389cfc36eb51557ca25ae66ab08173e8d53536a0747356105d72906"
+SOURCE_DIR="llvm-$portVersion.src"
+PATCHES="llvm-${portVersion}.patchset"
+PATCHES_2="clang-${portVersion}.patchset"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
@@ -34,16 +32,23 @@ PROVIDES="
 	devel:libLTO$secondaryArchSuffix = $portVersion
 	devel:libclang$secondaryArchSuffix = $portVersion
 	"
-
 REQUIRES="
 	haiku$secondaryArchSuffix
 	"
 
-BUILD_REQUIRES="
+PROVIDES_analysis="
+	clang${secondaryArchSuffix}_analysis = $portVersion
+	cmd:scan_build$secondaryArchSuffix = $portVersion
+	cmd:scan_view$secondaryArchSuffix = $portVersion
+	"
+REQUIRES_analysis="
+	clang$secondaryArchSuffix == $portVersion base
 	"
 
-BUILD_PREREQUIRES="
+BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
+	"
+BUILD_PREREQUIRES="
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
@@ -56,11 +61,6 @@ BUILD_PREREQUIRES="
 	cmd:sed
 	"
 
-SOURCE_DIR="llvm-$portVersion.src"
-
-PATCHES="llvm-${portVersion}.patchset"
-PATCHES_2="clang-${portVersion}.patchset"
-
 BUILD()
 {
 	# Add clang tools
@@ -114,18 +114,4 @@ INSTALL()
 TEST()
 {
 	make check
-}
-
-
-# ----- analysis package -------------------------------------------------------
-
-SUMMARY_analysis="Static analysis tools using the clang compiler"
-PROVIDES_analysis="
-	clang${secondaryArchSuffix}_analysis = $portVersion
-	cmd:scan_build$secondaryArchSuffix = $portVersion
-	cmd:scan_view$secondaryArchSuffix = $portVersion
-	"
-
-REQUIRES_analysis="
-	clang$secondaryArchSuffix == $portVersion base
-	"
+}
\ No newline at end of file
diff --git a/sys-devel/jam/jam-2.5_2012_10_12.recipe b/sys-devel/jam/jam-2.5_2012_10_12.recipe
index 0921267f0..810af8e30 100644
--- a/sys-devel/jam/jam-2.5_2012_10_12.recipe
+++ b/sys-devel/jam/jam-2.5_2012_10_12.recipe
@@ -1,25 +1,26 @@
 SUMMARY="Build tool, replacement for make"
-DESCRIPTION="
-Jam is a small open-source build tool that can be used as a replacement for \
-Make. Even though Jam is a lot simpler to use than Make, it is far more \
-powerful and easy to master. Its design is sufficiently clear to allow any \
-average programmer to extend it with advanced features at will.
+DESCRIPTION="Jam is a small open-source build tool that can be used as a \
+replacement for Make. Even though Jam is a lot simpler to use than Make, \
+it is far more powerful and easy to master. Its design is sufficiently \
+clear to allow any average programmer to extend it with advanced features \
+at will.
 
-The main differences between Jam and Make are as follows:
-- Jam uses ‘Jamfiles’ instead of ‘Makefiles’.
+The main differences between Jam and Make are:
+- Jam uses 'Jamfiles' instead of 'Makefiles'.
 - Jamfiles do not normally contain toolset-specific rules or actions. They are \
 thus portable among distinct compilers.
 - Jamfiles are a lot simpler than Makefiles to write and understand, while \
-providing the same functionality, and much, much more.
-"
+providing the same functionality, and much, much more."
 HOMEPAGE="http://www.perforce.com/jam/jam.html"
-LICENSE="Jam"
 COPYRIGHT="1993-2003 Christopher Seiwald"
+LICENSE="Jam"
+REVISION="2"
 srcGitRev="278de7bc9243876c2e08f8d6a243d510c5000462"
 SOURCE_URI="https://github.com/haiku/buildtools/archive/$srcGitRev.tar.gz"
 SOURCE_FILENAME="$portVersionedName.tar.gz"
 CHECKSUM_SHA256="d9238f91caea1b6989b3331685c3713ab4dde50e1b0b6ab8c254047d4849186f"
-REVISION="2"
+SOURCE_DIR="buildtools-$srcGitRev/jam"
+
 ARCHITECTURES="x86_gcc2 x86 x86_64 arm"
 
 PROVIDES="
@@ -29,17 +30,16 @@ PROVIDES="
 REQUIRES="
 	haiku
 	"
+
 BUILD_REQUIRES="
+	haiku_devel
 	"
 BUILD_PREREQUIRES="
-	haiku_devel
 	cmd:gcc
 	cmd:make
 	cmd:ld
 	"
 
-SOURCE_DIR="buildtools-$srcGitRev/jam"
-
 BUILD()
 {
 	make
diff --git a/sys-devel/libtool/libtool-2.4.2.recipe b/sys-devel/libtool/libtool-2.4.2.recipe
index 713197cec..f2a4855c6 100644
--- a/sys-devel/libtool/libtool-2.4.2.recipe
+++ b/sys-devel/libtool/libtool-2.4.2.recipe
@@ -1,22 +1,18 @@
-SUMMARY="A generic library support script"
+SUMMARY="A generic library of support scripts"
 SUMMARY_libltdl="The libtool libltdl library"
 DESCRIPTION="GNU libtool is a set of shell scripts to automatically configure \
 UNIX architectures to build shared libraries in a generic fashion."
 HOMEPAGE="http://www.gnu.org/software/libtool"
-LICENSE="GNU GPL v2"
+COPYRIGHT="2004-2010 Free Software Foundation, Inc."LICENSE="GNU GPL v2"
 REVISION="1"
+SOURCE_URI="ftp://ftp.gnu.org/gnu/libtool/libtool-2.4.2.tar.gz"
+CHECKSUM_SHA256="b38de44862a987293cd3d8dfae1c409d514b6c4e794ebc93648febf9afc38918"
+PATCHES="2.4.2/adjust_config_for_packaging.patch
+	2.4.2/remove_help2man_dependency.patch"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64 arm"
 SECONDARY_ARCHITECTURES="x86"
 
-SOURCE_URI="ftp://ftp.gnu.org/gnu/libtool/libtool-2.4.2.tar.gz"
-CHECKSUM_SHA256="b38de44862a987293cd3d8dfae1c409d514b6c4e794ebc93648febf9afc38918"
-COPYRIGHT="2004-2010 Free Software Foundation, Inc."
-PATCHES="
-	2.4.2/adjust_config_for_packaging.patch
-	2.4.2/remove_help2man_dependency.patch
-	"
-
 PROVIDES="
 	libtool$secondaryArchSuffix = $portVersion compat >= 2.4
 	cmd:libtool$secondaryArchSuffix = $portVersion compat >= 2.4
@@ -33,6 +29,7 @@ REQUIRES="
 	cmd:find
 	cmd:xargs
 	"
+
 PROVIDES_libltdl="
 	libtool_libltdl$secondaryArchSuffix = $portVersion compat >= 2.4
 	lib:libltdl$secondaryArchSuffix = 7.3.0 compat >= 7
diff --git a/sys-devel/libuuid/libuuid-1.0.3.recipe b/sys-devel/libuuid/libuuid-1.0.3.recipe
index c6ca78071..a9b5dfe3f 100644
--- a/sys-devel/libuuid/libuuid-1.0.3.recipe
+++ b/sys-devel/libuuid/libuuid-1.0.3.recipe
@@ -6,34 +6,42 @@ used in software construction, standardized by the Open Software Foundation \
 The intent of UUIDs is to enable distributed systems to uniquely identify \
 information without significant central coordination. In this context the word \
 unique should be taken to mean \"practically unique\" rather than \"guaranteed \
-unique\".
-"
+unique\"."
 HOMEPAGE="http://sourceforge.net/projects/libuuid/"
-REVISION="2"
-LICENSE="GNU GPL v2"
-ARCHITECTURES="x86_gcc2 x86"
-SECONDARY_ARCHITECTURES="x86"
 COPYRIGHT="2013-2014 Ralph Böhme"
-
+LICENSE="GNU GPL v2"
+REVISION="2"
 SOURCE_URI="http://downloads.sourceforge.net/project/libuuid/libuuid-1.0.3.tar.gz"
 CHECKSUM_SHA256="46af3275291091009ad7f1b899de3d0cea0252737550e7919d17237997db5644"
 PATCHES="libuuid-1.0.3.patchset"
 
+ARCHITECTURES="x86_gcc2 x86"
+SECONDARY_ARCHITECTURES="x86"
+
 PROVIDES="
 	libuuid$secondaryArchSuffix = $portVersion
 	lib:libuuid$secondaryArchSuffix = 1.0.0 compat >= 1
-"
-
+	"
 REQUIRES="
 	haiku$secondaryArchSuffix
-"
+	"
 
-BUILD_PREREQUIRES="
+PROVIDES_devel="
+	libuuid${secondaryArchSuffix}_devel = $portVersion
+	devel:libuuid$secondaryArchSuffix
+	"
+REQUIRES_devel="
+	libuuid$secondaryArchSuffix == $portVersion base
+	"
+
+BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
+	"
+BUILD_PREREQUIRES="
 	cmd:awk
 	cmd:gcc$secondaryArchSuffix
 	cmd:make
-"
+	"
 
 BUILD()
 {
@@ -54,13 +62,4 @@ TEST()
 {
 	make check
 	./test_uuid
-}
-
-PROVIDES_devel="
-	libuuid${secondaryArchSuffix}_devel = $portVersion
-	devel:libuuid$secondaryArchSuffix
-"
-
-REQUIRES_devel="
-	libuuid$secondaryArchSuffix == $portVersion base
-"
+}
\ No newline at end of file

From 5676d46cd92ab102cf3be1747290a44440766bd3 Mon Sep 17 00:00:00 2001
From: Humdinger <humdingerb@gmail.com>
Date: Thu, 3 Sep 2015 19:19:08 +0200
Subject: [PATCH 5/6] New recipe for QuickLaunch 0.9.12

---
 .../quicklaunch/quicklaunch-0.9.12.recipe     | 57 +++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100644 haiku-apps/quicklaunch/quicklaunch-0.9.12.recipe

diff --git a/haiku-apps/quicklaunch/quicklaunch-0.9.12.recipe b/haiku-apps/quicklaunch/quicklaunch-0.9.12.recipe
new file mode 100644
index 000000000..3cc3ee961
--- /dev/null
+++ b/haiku-apps/quicklaunch/quicklaunch-0.9.12.recipe
@@ -0,0 +1,57 @@
+SUMMARY="A tool to quickly start any installed application"
+DESCRIPTION="QuickLaunch is a small launcher tool that helps you to quickly \
+start any installed application (as long as it has an app-signature). Simply \
+start to enter the name of an application and QuickLaunch will find all \
+programs matching these initial letters and show them in a list.
+You choose an app from that list with the CursorUp/Down keys and launch it \
+by hitting RETURN. ESC quits QuickLaunch.
+
+It's recommended to set a key combo to start QuickLaunch with Haiku's \
+Shortcuts preferences."
+HOMEPAGE="http://humdingerb.github.io/quicklaunch/"
+COPYRIGHT="2010-2015 Humdinger"
+LICENSE="MIT"
+REVISION="1"
+
+SOURCE_URI="git://github.com/humdingerb/quicklaunch.git#5153fa3616fa2e59bf064cde35061b2049d4b953"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+
+PROVIDES="
+	quicklaunch = $portVersion
+	app:QuickLaunch = $portVersion
+	"
+REQUIRES="
+	haiku
+	"
+
+BUILD_REQUIRES="
+	haiku_devel
+	"
+BUILD_PREREQUIRES="
+	makefile_engine
+	cmd:g++
+	cmd:make
+	"
+
+USER_SETTINGS_FILES="settings/QuickLaunch_settings"
+
+BUILD()
+{
+	make $jobArgs OBJ_DIR=objects
+	make bindcatalogs OBJ_DIR=objects
+}
+
+INSTALL()
+{
+	quicklaunchDir=$appsDir/QuickLaunch
+	mkdir -p $quicklaunchDir
+
+	cp -af objects/QuickLaunch $quicklaunchDir
+	cp -af ReadMe.html $quicklaunchDir
+	cp -r images $quicklaunchDir
+
+	chmod +x Add\ to\ Deskbar.sh
+	cp -af Add\ to\ Deskbar.sh $quicklaunchDir
+
+	addAppDeskbarSymlink $quicklaunchDir/QuickLaunch
+}

From 062af5ca5efd5728fdff2dd43f224a84b162e38e Mon Sep 17 00:00:00 2001
From: Humdinger <humdingerb@gmail.com>
Date: Fri, 4 Sep 2015 15:02:11 +0200
Subject: [PATCH 6/6] Recipe cosmetics: improved SUMMARY/DESCRIPTION,
 re-ordered blocks.

---
 sys-devel/llvm/llvm-3.5.2.recipe            | 47 ++++++++++++++++-----
 sys-devel/m4/m4-1.4.16.recipe               | 25 ++++++-----
 sys-devel/make/make-3.82.recipe             | 20 ++++-----
 sys-libs/libexecinfo/libexecinfo-1.1.recipe | 37 ++++++++--------
 4 files changed, 74 insertions(+), 55 deletions(-)

diff --git a/sys-devel/llvm/llvm-3.5.2.recipe b/sys-devel/llvm/llvm-3.5.2.recipe
index 441054d70..e7a2a2d97 100644
--- a/sys-devel/llvm/llvm-3.5.2.recipe
+++ b/sys-devel/llvm/llvm-3.5.2.recipe
@@ -1,14 +1,42 @@
 SUMMARY="Modular and reuseable compiler and toolchain technologies"
-DESCRIPTION="
-LLVM is a collection of modular and reuseable compiler and and toolchain \
-technologies.
-"
+DESCRIPTION="LLVM is a collection of modular and reuseable compiler and and \
+toolchain technologies.The LLVM compiler system for C and C++ includes the \
+following:
+
+- Front-ends for C, C++, Objective-C, Fortran, etc. based on the GCC 4.2 \
+parsers. They support the ANSI-standard C and C++ languages to the same \
+degree that GCC supports them. Additionally, many GCC extensions are \
+supported.
+- A stable implementation of the LLVM instruction set, which serves as both \
+the online and offline code representation, together with assembly (ASCII) \
+and bytecode (binary) readers and writers, and a verifier.
+- A powerful pass-management system that automatically sequences passes \
+(including analysis, transformation, and code-generation passes) based on \
+their dependences, and pipelines them for efficiency.
+- A wide range of global scalar optimizations.
+- A link-time interprocedural optimization framework with a rich set of \
+analyses and transformations, including sophisticated whole-program pointer \
+analysis, call graph construction, and support for profile-guided optimizations.
+- An easily retargettable code generator, which currently supports X86, \
+X86-64, PowerPC, PowerPC-64, ARM, Thumb, SPARC, Alpha, CellSPU, MIPS, MSP430, \
+SystemZ, and XCore.
+- A Just-In-Time (JIT) code generation system, which currently supports X86, \
+X86-64, ARM, AArch64, Mips, SystemZ, PowerPC, and PowerPC-64.
+- Support for generating DWARF debugging information.
+- A C back-end useful for testing and for generating native code on targets \
+other than the ones listed above.
+- A profiling system similar to gprof.
+- A test framework with a number of benchmark codes and applications.
+- APIs and debugging tools to simplify rapid development of LLVM components."
 HOMEPAGE="http://www.llvm.org/"
-LICENSE="UIUC"
 COPYRIGHT="2003-2014 University of Illinois at Urbana-Champaign"
+LICENSE="UIUC"
+REVISION="1"
 SOURCE_URI="http://llvm.org/releases/${portVersion}/llvm-${portVersion}.src.tar.xz"
 CHECKSUM_SHA256="44196156d5749eb4b4224fe471a29cc3984df92570a4a89fa859f7394fc0c575"
-REVISION="1"
+SOURCE_DIR="llvm-$portVersion.src"
+PATCHES="llvm-${portVersion}.patchset"
+
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
@@ -157,10 +185,11 @@ PROVIDES="
 REQUIRES="
 	haiku$secondaryArchSuffix >= $haikuVersion
 	"
+
 BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
@@ -175,10 +204,6 @@ BUILD_PREREQUIRES="
 	cmd:grep
 	"
 
-PATCHES="llvm-${portVersion}.patchset"
-
-SOURCE_DIR="llvm-$portVersion.src"
-
 BUILD()
 {
 	# Haiku C++ requires rtti in a lot of central system components
diff --git a/sys-devel/m4/m4-1.4.16.recipe b/sys-devel/m4/m4-1.4.16.recipe
index 3c55f47cd..e4c7baea1 100644
--- a/sys-devel/m4/m4-1.4.16.recipe
+++ b/sys-devel/m4/m4-1.4.16.recipe
@@ -1,24 +1,23 @@
-SUMMARY="A macro processor"
-DESCRIPTION="
-GNU M4 is an implementation of the traditional Unix macro processor. It is \
-mostly SVR4 compatible although it has some extensions (for example, handling \
-more than 9 positional parameters to macros). GNU M4 also has built-in \
-functions for including files, running shell commands, doing arithmetic, etc.
+SUMMARY="The GNU macro processor"
+DESCRIPTION="GNU M4 is an implementation of the traditional UNIX macro \
+processor. It is mostly SVR4 compatible although it has some extensions \
+(for example, handling more than 9 positional parameters to macros).
+
 M4 is a macro processor in the sense that it copies its input to the output \
 expanding macros as it goes. Macros are either builtin or user-defined and can \
-take any number of arguments. Besides just doing macro expansion, m4 has \
+take any number of arguments. Besides just doing macro expansion, M4 has \
 builtin functions for including named files, running UNIX commands, doing \
-integer arithmetic, manipulating text in various ways, recursion etc... M4 can \
+integer arithmetic, manipulating text in various ways, recursion, etc. M4 can \
 be used either as a front-end to a compiler or as a macro processor in its own \
 right.
-One of the biggest users of M4 is the GNU Autoconf project.
-"
+One of the biggest users of M4 is the GNU Autoconf project."
 HOMEPAGE="http://www.gnu.org/software/m4/"
 COPYRIGHT="2000, 2005-2011 Free Software Foundation, Inc."
 LICENSE="GNU GPL v3"
+REVISION="5"
 SOURCE_URI="http://ftp.gnu.org/gnu/m4/m4-1.4.16.tar.gz"
 CHECKSUM_SHA256="e9176a35bb13a1b08482359aa554ee8072794f58f00e4827bf0e06b570c827da"
-REVISION="5"
+
 ARCHITECTURES="x86_gcc2 x86 x86_64 arm"
 
 PROVIDES="
@@ -28,10 +27,11 @@ PROVIDES="
 REQUIRES="
 	haiku
 	"
+
 BUILD_REQUIRES="
+	haiku_devel
 	"
 BUILD_PREREQUIRES="
-	haiku_devel
 	cmd:awk
 	cmd:gcc
 	cmd:ld
@@ -41,7 +41,6 @@ BUILD_PREREQUIRES="
 	cmd:grep
 	"
 
-
 BUILD()
 {
 	runConfigure ./configure \
diff --git a/sys-devel/make/make-3.82.recipe b/sys-devel/make/make-3.82.recipe
index f90e84417..ff4be35b6 100644
--- a/sys-devel/make/make-3.82.recipe
+++ b/sys-devel/make/make-3.82.recipe
@@ -1,22 +1,20 @@
 SUMMARY="Standard tool to compile source trees"
-DESCRIPTION="
-Make is a tool which controls the generation of executables and other \
-non-source files of a program from the program's source files.
+DESCRIPTION="Make is a tool which controls the generation of executables and \
+other non-source files of a program from the program's source files.
 Make gets its knowledge of how to build your program from a file called the \
 makefile, which lists each of the non-source files and how to compute it from \
 other files. When you write a program, you should write a makefile for it, so \
-that it is possible to use Make to build and install the program.
-"
+that it is possible to use Make to build and install the program."
 HOMEPAGE="http://www.gnu.org/software/make/"
-LICENSE="GNU GPL v3"
 COPYRIGHT="1988-2010 Free Software Foundation, Inc."
+LICENSE="GNU GPL v3"
+REVISION="5"
 SOURCE_URI="http://ftp.gnu.org/pub/gnu/make/make-3.82.tar.bz2"
 CHECKSUM_SHA256="e2c1a73f179c40c71e2fe8abf8a8a0688b8499538512984da4a76958d0402966"
-REVISION="5"
-ARCHITECTURES="x86_gcc2 x86 x86_64 arm"
-
 PATCHES="make-3.82.patch"
 
+ARCHITECTURES="x86_gcc2 x86 x86_64 arm"
+
 PROVIDES="
 	make = $portVersion compat >= 3.82
 	cmd:make = $portVersion compat >= 3.82
@@ -24,10 +22,11 @@ PROVIDES="
 REQUIRES="
 	haiku
 	"
+
 BUILD_REQUIRES="
+	haiku_devel
 	"
 BUILD_PREREQUIRES="
-	haiku_devel
 	cmd:gcc
 	cmd:ld
 	cmd:libtoolize
@@ -35,7 +34,6 @@ BUILD_PREREQUIRES="
 	cmd:grep
 	"
 
-
 BUILD()
 {
 	libtoolize --force --copy --install
diff --git a/sys-libs/libexecinfo/libexecinfo-1.1.recipe b/sys-libs/libexecinfo/libexecinfo-1.1.recipe
index 044357671..9ee4158b0 100644
--- a/sys-libs/libexecinfo/libexecinfo-1.1.recipe
+++ b/sys-libs/libexecinfo/libexecinfo-1.1.recipe
@@ -1,15 +1,15 @@
 SUMMARY="Library for inspecting a program's backtrace"
-DESCRIPTION="
-This is a quick-n-dirty BSD licensed clone of backtrace facility found in the \
-GNU libc, mainly intended for porting linuxish code to BSD platforms, however \
-it can be used at any platform which has a gcc compiler.
-"
+DESCRIPTION="This is a quick-n-dirty BSD licensed clone of backtrace facility \
+found in the GNU libc, mainly intended for porting linuxish code to BSD \
+platforms, however it can be used at any platform which has a GCC compiler."
 HOMEPAGE="http://www.freshports.org/devel/libexecinfo"
 COPYRIGHT="2003-2014 Maxim Sobolev"
 LICENSE="BSD (2-clause)"
+REVISION="1"
 SOURCE_URI="http://ftp.freebsd.org/pub/FreeBSD/ports/local-distfiles/itetcu/libexecinfo-1.1.tar.bz2"
 CHECKSUM_SHA256="c9a21913e7fdac8ef6b33250b167aa1fc0a7b8a175145e26913a4c19d8a59b1f"
-REVISION="1"
+PATCHES="libexecinfo-$portVersion.patchset"
+
 ARCHITECTURES="x86_gcc2 x86 ?x86_64"
 SECONDARY_ARCHITECTURES="x86 x86_gcc2"
 
@@ -20,17 +20,24 @@ PROVIDES="
 REQUIRES="
 	haiku$secondaryArchSuffix
 	"
+
+PROVIDES_devel="
+	libexecinfo${secondaryArchSuffix}_devel = $portVersion compat >= 1
+	devel:libexecinfo${secondaryArchSuffix} = $portVersion compat >= 1
+	"
+REQUIRES_devel="
+	libexecinfo${secondaryArchSuffix} == $portVersion base
+	"
+
 BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:make
 	"
 
-PATCHES="libexecinfo-$portVersion.patchset"
-
 BUILD()
 {
 	gcc -c -o execinfo.o execinfo.c
@@ -60,14 +67,4 @@ TEST()
 {
 	gcc test.c -o test libexecinfo.a
 	./test
-}
-
-# ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
-	libexecinfo${secondaryArchSuffix}_devel = $portVersion compat >= 1
-	devel:libexecinfo${secondaryArchSuffix} = $portVersion compat >= 1
-	"
-REQUIRES_devel="
-	libexecinfo${secondaryArchSuffix} == $portVersion base
-	"
+}
\ No newline at end of file