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] 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