From 2fb46053f18eb19278157be3fd6247054de80c57 Mon Sep 17 00:00:00 2001
From: Oliver Tappe <zooey@hirschkaefer.de>
Date: Sat, 13 Apr 2013 14:55:49 +0000
Subject: [PATCH] * one more round of requirements shuffling, the base packages
 seem to   be declared properly, now * improve formatting of recipe files for
 better readability and better   compatibility with showing diffs (when moving
 specification lines) * add/improve DESCRIPTION where it was just a copy of
 SUMMARY

---
 app-arch/tar/tar-1.26.recipe              | 39 ++++++++++++----
 dev-lang/perl/perl-5.10.1.recipe          | 38 +++++++++++----
 sys-apps/gawk/gawk-3.1.8.recipe           | 49 +++++++++++++++-----
 sys-apps/sed/sed-4.2.1.recipe             | 37 +++++++++------
 sys-devel/autoconf/autoconf-2.68.recipe   | 32 ++++++++-----
 sys-devel/automake/automake-1.11.1.recipe | 32 ++++++++-----
 sys-devel/flex/flex-2.5.35.recipe         | 30 ++++++++----
 sys-devel/gcc/gcc-2.95.3_110711.recipe    | 56 +++++++++++++----------
 sys-devel/libtool/libtool-2.4.recipe      | 31 +++++++++----
 sys-devel/m4/m4-1.4.16.recipe             | 40 ++++++++++++----
 sys-devel/make/make-3.82.recipe           | 30 ++++++++----
 11 files changed, 286 insertions(+), 128 deletions(-)

diff --git a/app-arch/tar/tar-1.26.recipe b/app-arch/tar/tar-1.26.recipe
index 998a81597..b920a1403 100644
--- a/app-arch/tar/tar-1.26.recipe
+++ b/app-arch/tar/tar-1.26.recipe
@@ -1,21 +1,40 @@
-SUMMARY="tar saves and restores files from a tape or disk archive." 
-DESCRIPTION="tar saves and restores files from a tape or disk archive." 
+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/" 
 SRC_URI="http://ftp.gnu.org/gnu/tar/tar-1.26.tar.bz2"
 CHECKSUM_MD5="2cee42a2ff4f1cd4f9298eeeb2264519"
 REVISION="2"
 ARCHITECTURES="x86_gcc2 ?x86"
 
-PROVIDES="tar = $portVersion compat >= 1
-	cmd:tar = $portVersion compat >= 1"
-REQUIRES="haiku >= $haikuVersion"
-BUILD_REQUIRES="cmd:automake >= 1.11
+PROVIDES="
+	tar = $portVersion compat >= 1
+	cmd:tar = $portVersion compat >= 1
+	"
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+BUILD_REQUIRES="
+	cmd:automake >= 1.11
 	cmd:autoreconf >= 2.68
-	cmd:sed"
-BUILD_PREREQUIRES="haiku-devel >= $haikuVersion
-	cmd:make
+	cmd:sed
+	"
+BUILD_PREREQUIRES="
+	haiku-devel >= $haikuVersion
 	cmd:gcc
-	cmd:ld"
+	cmd:ld
+	cmd:make
+	"
 
 SOURCE_DIR="$portVersionedName"
 
diff --git a/dev-lang/perl/perl-5.10.1.recipe b/dev-lang/perl/perl-5.10.1.recipe
index cfa671d1c..09fcbfcc0 100644
--- a/dev-lang/perl/perl-5.10.1.recipe
+++ b/dev-lang/perl/perl-5.10.1.recipe
@@ -1,19 +1,41 @@
 SUMMARY="Larry Wall's Practical Extraction and Report Language"
-DESCRIPTION="Larry Wall's Practical Extraction and Report Language."
+DESCRIPTION="
+	Perl was originally developed by Larry Wall in 1987 as a general-purpose 
+	Unix scripting language to make report processing easier.
+
+	Perl borrows features from other programming languages including C, shell 
+	scripting (sh), AWK, and sed. The language provides powerful text 
+	processing facilities without the arbitrary data-length limits of many 
+	contemporary Unix tools, facilitating easy manipulation of text files. 
+
+	In addition to CGI, Perl is used for graphics programming, system 
+	administration, network programming, finance, bioinformatics, and other 
+	applications. Perl is nicknamed 'the Swiss Army chainsaw of scripting
+	languages' because of its flexibility and power, and possibly also 
+	because of its perceived 'ugliness'.
+	"
 HOMEPAGE="http://www.perl.org/"
 SRC_URI="http://www.cpan.org/src/perl-5.10.1.tar.gz"
+CHECKSUM_MD5="b9b2fdb957f50ada62d73f43ee75d044"
 REVISION="3"
 ARCHITECTURES="x86_gcc2 ?x86"
-PROVIDES="perl = $portVersion compat >= 5
+PROVIDES="
+	perl = $portVersion compat >= 5
 	cmd:perl = $portVersion compat >= 5
-	lib:libperl = $portVersion compat >= 5"
-REQUIRES="haiku >= $haikuVersion"
-BUILD_REQUIRES="cmd:sed"
-BUILD_PREREQUIRES="haiku-devel >= $haikuVersion
+	lib:libperl = $portVersion compat >= 5
+	"
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+BUILD_REQUIRES="
+	cmd:sed
+	"
+BUILD_PREREQUIRES="
+	haiku-devel >= $haikuVersion
 	cmd:gcc
 	cmd:ld
-	cmd:make"
-CHECKSUM_MD5="b9b2fdb957f50ada62d73f43ee75d044"
+	cmd:make
+	"
 
 SOURCE_DIR="$portVersionedName"
 BUILD_PACKAGE_ACTIVATION_PHASE="INSTALL"
diff --git a/sys-apps/gawk/gawk-3.1.8.recipe b/sys-apps/gawk/gawk-3.1.8.recipe
index 75cf770e1..d1e704637 100644
--- a/sys-apps/gawk/gawk-3.1.8.recipe
+++ b/sys-apps/gawk/gawk-3.1.8.recipe
@@ -1,30 +1,57 @@
-DESCRIPTION="standard GNU file utilities" 
+SUMMARY="A pattern scanning and processing language" 
+DESCRIPTION="
+	If you are like many computer users, you would frequently like to make 
+	changes in various text files wherever certain patterns appear, or 
+	extract data from parts of certain lines while discarding the rest. To 
+	write a program to do this in a language such as C or Pascal is a 
+	time-consuming inconvenience that may take many lines of code. The job 
+	is easy with awk, especially the GNU implementation: gawk.
+
+	The awk utility interprets a special-purpose programming language that 
+	makes it possible to handle simple data-reformatting jobs with just a 
+	few lines of code.
+	"
 HOMEPAGE="http://www.gnu.org/software/coreutils" 
 SRC_URI="http://ftp.gnu.org/gnu/gawk/gawk-3.1.8.tar.bz2"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
 CHECKSUM_MD5="52b41c6c4418b3226dfb8f82076193bb"
+REVISION="1"
+ARCHITECTURES="x86_gcc2 ?x86"
+
+PROVIDES="
+	gawk = $portVersion compat >= 3
+	cmd:awk = $portVersion compat >= 3
+	cmd:gawk = $portVersion compat >= 3
+	"
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+BUILD_REQUIRES="
+    cmd:libtoolize
+    cmd:sed
+	"
+BUILD_PREREQUIRES="
+	haiku-devel >= $haikuVersion
+	cmd:gcc
+	cmd:ld
+	cmd:make
+	"
+
+SOURCE_DIR="$portVersionedName"
+
 BUILD()
 {
-	cd gawk-3.1.8
 	libtoolize --force --copy --install
-	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
-		--datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \
-		--libexecdir=`finddir B_COMMON_BIN_DIRECTORY` \
-		--mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
+	./configure $configureDirArgs
 	make
 }
 
 INSTALL()
 {
-	cd gawk-3.1.8
 	make install
 }
 
 TEST()
 {
-	cd gawk-3.1.8
 	make check
 }
 
diff --git a/sys-apps/sed/sed-4.2.1.recipe b/sys-apps/sed/sed-4.2.1.recipe
index 1d96a77c8..a1a3eba63 100644
--- a/sys-apps/sed/sed-4.2.1.recipe
+++ b/sys-apps/sed/sed-4.2.1.recipe
@@ -1,29 +1,36 @@
-SUMMARY="sed - a stream editor" 
-DESCRIPTION="Sed is a stream editor. A stream editor is 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." 
+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). 
+	
+	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.
+	" 
 HOMEPAGE="http://www.gnu.org/software/sed" 
 SRC_URI="http://ftp.gnu.org/gnu/sed/sed-4.2.1.tar.gz"
 CHECKSUM_MD5="f0fd4d7da574d4707e442285fd2d3b86"
 REVISION="2"
 ARCHITECTURES="x86_gcc2 ?x86"
 
-PROVIDES="sed = $portVersion compat >= 4
-	cmd:sed = $portVersion compat >= 4"
-REQUIRES="haiku >= $haikuVersion"
-BUILD_PREREQUIRES="haiku-devel >= $haikuVersion
+PROVIDES="
+	sed = $portVersion compat >= 4
+	cmd:sed = $portVersion compat >= 4
+	"
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+BUILD_PREREQUIRES="
+	haiku-devel >= $haikuVersion
 	cmd:gcc
 	cmd:ld
 	cmd:aclocal >= 1.11
 	cmd:autoreconf >= 2.68
 	cmd:make
-	cmd:sed"
-
+	cmd:sed
+	"
 
 SOURCE_DIR="$portVersionedName"
 
diff --git a/sys-devel/autoconf/autoconf-2.68.recipe b/sys-devel/autoconf/autoconf-2.68.recipe
index 852677aa4..98c1c86f5 100644
--- a/sys-devel/autoconf/autoconf-2.68.recipe
+++ b/sys-devel/autoconf/autoconf-2.68.recipe
@@ -1,34 +1,44 @@
-SUMMARY="A GNU tool for automatically configuring source code"
-DESCRIPTION="GNU Autoconf is a tool for configuring source code and makefiles. Using
+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."
+	configuration options.
+	"
 HOMEPAGE="http://www.gnu.org/software/autoconf/" 
 SRC_URI="http://ftp.gnu.org/gnu/autoconf/autoconf-2.68.tar.bz2"
 CHECKSUM_MD5="864d785215aa60d627c91fcb21b05b07"
 REVISION="3"
 ARCHITECTURES="x86_gcc2 ?x86"
 
-PROVIDES="autoconf = $portVersion compat >= 2.60
+PROVIDES="
+	autoconf = $portVersion compat >= 2.60
 	cmd:autoconf = $portVersion compat >= 2.60
 	cmd:autoheader = $portVersion compat >= 2.60
 	cmd:autom4te = $portVersion compat >= 2.60
 	cmd:autoreconf = $portVersion compat >= 2.60
 	cmd:autoscan = $portVersion compat >= 2.60
 	cmd:autoupdate = $portVersion compat >= 2.60
-	cmd:ifnames = $portVersion compat >= 2.60"
-REQUIRES="haiku >= $haikuVersion
+	cmd:ifnames = $portVersion compat >= 2.60
+	"
+REQUIRES="
+	haiku >= $haikuVersion
 	cmd:awk
 	coreutils
 	diffutils
 	cmd:m4 >= 1.4
 	cmd:perl >= 5
-	cmd:sh"
-BUILD_REQUIRES="cmd:automake >= 1.11
-	cmd:sed"
-BUILD_PREREQUIRES="haiku-devel >= $haikuVersion
+	cmd:sh
+	"
+BUILD_REQUIRES="
+	cmd:automake >= 1.11
+	cmd:sed
+	"
+BUILD_PREREQUIRES="
+	haiku-devel >= $haikuVersion
 	cmd:autoreconf >= 2.60
-	cmd:make"
+	cmd:make
+	"
 
 SOURCE_DIR="$portVersionedName"
 BUILD_PACKAGE_ACTIVATION_PHASE="INSTALL"
diff --git a/sys-devel/automake/automake-1.11.1.recipe b/sys-devel/automake/automake-1.11.1.recipe
index 3353b69a2..f6866ec11 100644
--- a/sys-devel/automake/automake-1.11.1.recipe
+++ b/sys-devel/automake/automake-1.11.1.recipe
@@ -1,31 +1,41 @@
 SUMMARY="A tool for generating 'Makefile.in' from 'Makefile.am'"
-DESCRIPTION="Automake is a tool for automatically generating 'Makefile.in' files
+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."
+	'Makefile.in' files are compatible with the GNU Makefile standards.
+	"
 HOMEPAGE="http://www.gnu.org/software/automake/"
 SRC_URI="http://ftp.gnu.org/gnu/automake/automake-1.11.1.tar.gz"
 CHECKSUM_MD5="4ee7f0ff5f0e467d58b6bd5da96b1c74"
 REVISION="3"
 ARCHITECTURES="x86_gcc2 ?x86"
 
-PROVIDES="automake = $portVersion compat >= 1.11
+PROVIDES="
+	automake = $portVersion compat >= 1.11
 	cmd:automake = $portVersion compat >= 1.11
 	cmd:automake-1.11 = $portVersion compat >= 1.11
 	cmd:aclocal = $portVersion compat >= 1.11
-	cmd:aclocal-1.11 = $portVersion compat >= 1.11"
-REQUIRES="haiku >= $haikuVersion
+	cmd:aclocal-1.11 = $portVersion compat >= 1.11
+	"
+REQUIRES="
+	haiku >= $haikuVersion
 	cmd:awk
 	coreutils
 	diffutils
 	cmd:m4 >= 1.4
 	cmd:perl >= 5
-	cmd:sh"
-BUILD_REQUIRES="cmd:sed"
-BUILD_PREREQUIRES="haiku-devel >= $haikuVersion
-    cmd:autoconf >= 2.60
-    cmd:make
-    cmd:perl >= 5.8"
+	cmd:sh
+	"
+BUILD_REQUIRES="
+	cmd:perl >= 5.8
+	cmd:sed
+	"
+BUILD_PREREQUIRES="
+	haiku-devel >= $haikuVersion
+	cmd:autoconf >= 2.60
+	cmd:make
+	"
 
 SOURCE_DIR="$portVersionedName"
 
diff --git a/sys-devel/flex/flex-2.5.35.recipe b/sys-devel/flex/flex-2.5.35.recipe
index 22a9de705..2cc467a6b 100644
--- a/sys-devel/flex/flex-2.5.35.recipe
+++ b/sys-devel/flex/flex-2.5.35.recipe
@@ -1,25 +1,35 @@
-SUMMARY="Flex is a tool for generating scanners." 
-DESCRIPTION="Flex is a fast lexical analyser generator. It is a tool for generating 
-	programs that perform pattern-matching on text."
+SUMMARY="A tool for generating scanners." 
+DESCRIPTION="
+	Flex is a fast lexical analyser generator. It is a tool for generating 
+	programs that perform pattern-matching on text.
+	"
 HOMEPAGE="http://flex.sourceforge.net/" 
 SRC_URI="http://sourceforge.net/projects/flex/files/flex/flex-2.5.35/flex-2.5.35.tar.bz2/download"
 CHECKSUM_MD5="10714e50cea54dc7a227e3eddcd44d57"
 REVISION="3"
 ARCHITECTURES="x86_gcc2 ?x86"
 
-PROVIDES="flex = $portVersion compat >= 2.5
+PROVIDES="
+	flex = $portVersion compat >= 2.5
 	cmd:flex = $portVersion compat >= 2.5
 	lib:libfl.a = $portVersion compat >= 2.5
-	lib:libfl_pic.a = $portVersion compat >= 2.5"
-REQUIRES="haiku >= $haikuVersion"
-BUILD_REQUIRES="aclocal >= 1.11
+	lib:libfl_pic.a = $portVersion compat >= 2.5
+	"
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+BUILD_REQUIRES="
+	cmd:aclocal >= 1.11
 	cmd:autoconf >= 2.60
 	cmd:automake >= 1.11
-	cmd:libtoolize >= 2.4"
-BUILD_PREREQUIRES="haiku-devel >= $haikuVersion
+	cmd:libtoolize >= 2.4
+	cmd:make
+	"
+BUILD_PREREQUIRES="
+	haiku-devel >= $haikuVersion
 	cmd:gcc
 	cmd:ld
-	cmd:make"
+	"
 
 SOURCE_DIR="$portVersionedName"
 
diff --git a/sys-devel/gcc/gcc-2.95.3_110711.recipe b/sys-devel/gcc/gcc-2.95.3_110711.recipe
index c70297739..02d735256 100644
--- a/sys-devel/gcc/gcc-2.95.3_110711.recipe
+++ b/sys-devel/gcc/gcc-2.95.3_110711.recipe
@@ -1,12 +1,15 @@
 SUMMARY="C/C++ compiler"
-DESCRIPTION="Standard compiler for x86_gcc2 platform, ABI-compatible with BeOS R5."
+DESCRIPTION="
+	Standard compiler for x86_gcc2 platform, ABI-compatible with BeOS R5.
+	"
 HOMEPAGE="http://gcc.gnu.org"
 # TODO: Also: http://www.gnu.org/software/binutils
-SRC_URI="git+git://github.com/weinhold/buildtools.git#ba94fdf309096bd9bbf432ad53efba62bc47f98e"
-REVISION="2"
+SRC_URI="git+git://github.com/haiku/BuildtoolsPM.git#ba94fdf309096bd9bbf432ad53efba62bc47f98e"
+REVISION="3"
 ARCHITECTURES="x86_gcc2 ?x86"
 
-PROVIDES="gcc = $portVersion compat >= 2.95.3
+PROVIDES="
+	gcc = $portVersion compat >= 2.95.3
 	cmd:cpp = $portVersion compat >= 2.95.3
 	cmd:gcc = $portVersion compat >= 2.95.3
 	cmd:g++ = $portVersion compat >= 2.95.3
@@ -26,26 +29,37 @@ PROVIDES="gcc = $portVersion compat >= 2.95.3
 	cmd:size = 2.17_110711 compat >= 2.17
 	cmd:strings = 2.17_110711 compat >= 2.17
 	cmd:strip = 2.17_110711 compat >= 2.17
-	cmd:unprotoize = 2.17_110711 compat >= 2.17"
+	cmd:unprotoize = 2.17_110711 compat >= 2.17
+	"
 
-REQUIRES="haiku >= $haikuVersion"
-BUILD_PREREQUIRES="haiku-devel >= $haikuVersion
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+BUILD_REQUIRES="
+	"
+BUILD_PREREQUIRES="
+	haiku-devel >= $haikuVersion
+	cmd:autoconf
 	binutils
 	gcc
+	cmd:flex
 	cmd:make
-	texinfo"
+	cmd:sed
+	cmd:tar
+	texinfo
+	"
 
 SOURCE_DIR="$portVersionedName"
 
+gccDate=110711
+gccInstallDir="$prefix/develop/tools/gcc-2.95.3-${gccDate}"
+objectsDir=$(pwd)/../${portVersionedName}-obj
+binutilsObjectsDir=$objectsDir/binutils
+gccObjectsDir=$objectsDir/gcc
+buildtoolsDir=$(pwd)/legacy
+
 BUILD()
 {
-	gccDate=110711
-	gccInstallDir="$prefix/develop/tools/gcc-2.95.3-${gccDate}"
-	objectsDir=$(pwd)/../${portVersionedName}-obj
-	binutilsObjectsDir=$objectsDir/binutils
-	gccObjectsDir=$objectsDir/gcc
-	buildtoolsDir=$(pwd)/legacy
-
 	rm -rf $objectsDir
 
 	# Touch some files generated by bison, so that bison won't run to update
@@ -54,6 +68,9 @@ BUILD()
 	(cd $buildtoolsDir/gcc/gcc; touch c-parse.c c-parse.h cexp.c cp/parse.c \
 		cp/parse.h c-gperf.h)
 
+	# Touch all *.info files, as newer texinfos don't like their format
+	(cd $buildtoolsDir; find . -name \*.info | xargs touch)
+
 	# build binutils
 	mkdir -p $binutilsObjectsDir
 	cd $binutilsObjectsDir
@@ -79,15 +96,6 @@ BUILD()
 
 INSTALL()
 {
-	# TODO: Avoid the duplication by defining the variables globally once we've
-	# moved the bep-format to shell.
-	gccDate=110711
-	gccInstallDir="$prefix/develop/tools/gcc-2.95.3-${gccDate}"
-	objectsDir=$(pwd)/../${portVersionedName}-obj
-	binutilsObjectsDir=$objectsDir/binutils
-	gccObjectsDir=$objectsDir/gcc
-	buildtoolsDir=$(pwd)/legacy
-
 	cd $binutilsObjectsDir
 	make install
 
diff --git a/sys-devel/libtool/libtool-2.4.recipe b/sys-devel/libtool/libtool-2.4.recipe
index e780297c8..61c47131e 100644
--- a/sys-devel/libtool/libtool-2.4.recipe
+++ b/sys-devel/libtool/libtool-2.4.recipe
@@ -1,30 +1,41 @@
 SUMMARY="A generic library support script" 
-DESCRIPTION="GNU libtool is a set of shell scripts to automatically configure UNIX
-	architectures to build shared libraries in a generic fashion."
+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" 
 SRC_URI="ftp://ftp.gnu.org/gnu/libtool/libtool-2.4.tar.gz"
 CHECKSUM_MD5="b32b04148ecdd7344abc6fe8bd1bb021"
 REVISION="3"
 ARCHITECTURES="x86_gcc2 ?x86"
 
-PROVIDES="libtool = $portVersion compat >= 2.4
+PROVIDES="
+	libtool = $portVersion compat >= 2.4
 	cmd:libtool = $portVersion compat >= 2.4
 	cmd:libtoolize = $portVersion compat >= 2.4
 	lib:libltdl.a = 7.3.0 compat >= 7
-	lib:libltdl = 7.3.0 compat >= 7"
-REQUIRES="haiku >= $haikuVersion
+	lib:libltdl = 7.3.0 compat >= 7
+	"
+REQUIRES="
+	haiku >= $haikuVersion
 	cmd:aclocal >= 1.11
 	cmd:automake >= 1.11
-	cmd:tar"
-BUILD_REQUIRES="cmd:autoconf >= 2.60
+	cmd:sed
+	cmd:tar
+	"
+BUILD_REQUIRES="
+	cmd:autoconf >= 2.60
 	cmd:aclocal >= 1.11
 	cmd:autoheader >= 2.60
-	cmd:sed"
-BUILD_PREREQUIRES="haiku-devel >= $haikuVersion
+	cmd:sed
+	"
+BUILD_PREREQUIRES="
+	haiku-devel >= $haikuVersion
 	cmd:gcc
 	cmd:ld
 	cmd:make
-	cmd:nm"
+	cmd:nm
+	"
 
 SOURCE_DIR="$portVersionedName"
 
diff --git a/sys-devel/m4/m4-1.4.16.recipe b/sys-devel/m4/m4-1.4.16.recipe
index c506adb16..6ab48137e 100644
--- a/sys-devel/m4/m4-1.4.16.recipe
+++ b/sys-devel/m4/m4-1.4.16.recipe
@@ -1,19 +1,43 @@
-SUMMARY="m4 - GNU macro processor" 
-DESCRIPTION="m4 - GNU macro processor." 
+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.
+
+	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 builtin functions for including named files, 
+	running UNIX commands, doing 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.
+	" 
 HOMEPAGE="http://www.gnu.org/software/m4/" 
 SRC_URI="http://ftp.gnu.org/gnu/m4/m4-1.4.16.tar.gz"
 CHECKSUM_MD5="a5dfb4f2b7370e9d34293d23fd09b280"
 REVISION="3"
 ARCHITECTURES="x86_gcc2 ?x86"
 
-PROVIDES="m4 = $portVersion compat >= 1.4
-	cmd:m4 = $portVersion compat >= 1.4"
-REQUIRES="haiku >= $haikuVersion"
-BUILD_REQUIRES="cmd:sed"
-BUILD_PREREQUIRES="haiku-devel >= $haikuVersion
+PROVIDES="
+	m4 = $portVersion compat >= 1.4
+	cmd:m4 = $portVersion compat >= 1.4
+	"
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+BUILD_REQUIRES="
+	cmd:sed
+	"
+BUILD_PREREQUIRES="
+	haiku-devel >= $haikuVersion
 	cmd:gcc
 	cmd:ld
-	cmd:make"
+	cmd:make
+	"
 
 SOURCE_DIR="$portVersionedName"
 
diff --git a/sys-devel/make/make-3.82.recipe b/sys-devel/make/make-3.82.recipe
index 4216f59ae..d7a7eea3c 100644
--- a/sys-devel/make/make-3.82.recipe
+++ b/sys-devel/make/make-3.82.recipe
@@ -1,26 +1,36 @@
 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." 
+	program.
+	"
 HOMEPAGE="http://www.gnu.org/software/make/" 
 SRC_URI="http://ftp.gnu.org/pub/gnu/make/make-3.82.tar.bz2"
 CHECKSUM_MD5="1a11100f3c63fcf5753818e59d63088f"
 REVISION="3"
 ARCHITECTURES="x86_gcc2 ?x86"
 
-PROVIDES="make = $portVersion compat >= 3.82
-	cmd:make = $portVersion compat >= 3.82"
-REQUIRES="haiku >= $haikuVersion"
-BUILD_REQUIRES="cmd:libtoolize
-    cmd:sed"
-BUILD_PREREQUIRES="haiku-devel >= $haikuVersion
+PROVIDES="
+	make = $portVersion compat >= 3.82
+	cmd:make = $portVersion compat >= 3.82
+	"
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+BUILD_REQUIRES="
+	cmd:libtoolize
+	cmd:sed
+	"
+BUILD_PREREQUIRES="
+	haiku-devel >= $haikuVersion
 	cmd:gcc
-	cmd:ld"
+	cmd:ld
+	"
 
 SOURCE_DIR="$portVersionedName"