diff --git a/app-benchmarks/ltp/ltp-20140422.recipe b/app-benchmarks/ltp/ltp-20140422.recipe
index d8f3bd6e0..d7cd41d78 100644
--- a/app-benchmarks/ltp/ltp-20140422.recipe
+++ b/app-benchmarks/ltp/ltp-20140422.recipe
@@ -1,4 +1,4 @@
-SUMMARY="A testsuit for the Linux kernel"
+SUMMARY="A testsuite for the Linux kernel"
 DESCRIPTION="The Linux Test Project is a joint project started by SGI, \
 developed and maintained by IBM, Cisco, Fujitsu, SUSE, Red Hat and others, \
 that has a goal to deliver test suites to the open source community that \
diff --git a/app-text/mdocml/mdocml-1.12.2.recipe b/app-text/mdocml/mdocml-1.12.2.recipe
index 1cf021e1d..0676521df 100644
--- a/app-text/mdocml/mdocml-1.12.2.recipe
+++ b/app-text/mdocml/mdocml-1.12.2.recipe
@@ -1,19 +1,19 @@
-SUMMARY="A suite of tools for compiling roff and man pages."
-DESCRIPTION="
-mdocml is a suite of tools compiling mdoc, the roff macro package of choice \
-for BSD manual pages, and man, the predominant historical package for UNIX \
-manuals. The mission of mdocml is to deprecate groff, the GNU troff \
+SUMMARY="A suite of tools for compiling roff and man pages"
+DESCRIPTION="mdocml is a suite of tools compiling mdoc, the roff macro package \
+of choice for BSD manual pages, and man, the predominant historical package \
+for UNIX manuals. The mission of mdocml is to deprecate groff, the GNU troff \
 implementation, for displaying mdoc pages whilst providing token support for \
-man.
-"
-
+man."
 HOMEPAGE="http://mdocml.bsd.lv/"
+LICENSE="ISC"
+REVISION="1"
+
+ARCHITECTURES="x86 x86_gcc2"
+
 SOURCE_URI="http://mdocml.bsd.lv/snapshots/mdocml-1.12.2.tar.gz"
 CHECKSUM_SHA256="c4f37afbf823636f63e3cd0673ae6c2ffc6017558e86bdcc02dc825c62daa9d7"
 COPYRIGHT="2008-2013 Ingo Schwarze, Kristaps Dzonsons"
-LICENSE="ISC"
-REVISION="1"
-ARCHITECTURES="x86 x86_gcc2"
+PATCHES="mdocml-1.12.2.patch"
 
 PROVIDES="
 	mdocml = $portVersion
@@ -21,29 +21,24 @@ PROVIDES="
 	cmd:preconv = $portVersion
 	cmd:demandoc = $portVersion
 	"
-
 REQUIRES="
 	haiku
 	"
-
-BUILD_REQUIRES=""
-BUILD_PREREQUIRES="
-	haiku_devel
-	cmd:make
-	cmd:gcc
-	cmd:ld
-	"
-
 PROVIDES_devel="
 	mdocml_devel = $portVersion compat >= 1.12
 	devel:libmandoc
 	"
-
 REQUIRES_devel="
 	mdocml == $portVersion
 	"
-
-PATCHES="mdocml-1.12.2.patch"
+BUILD_REQUIRES="
+	haiku_devel
+	"
+BUILD_PREREQUIRES="
+	cmd:make
+	cmd:gcc
+	cmd:ld
+	"
 
 BUILD()
 {
diff --git a/media-sound/milkytracker/milkytracker-0.90.86.recipe b/media-sound/milkytracker/milkytracker-0.90.86.recipe
index 193bc8375..bd2bfe61c 100644
--- a/media-sound/milkytracker/milkytracker-0.90.86.recipe
+++ b/media-sound/milkytracker/milkytracker-0.90.86.recipe
@@ -1,12 +1,27 @@
 SUMMARY="Fasttracker II inspired music tracker"
-DESCRIPTION="
-MilkyTracker is an open source, multi-platform music application for creating \
-.MOD and .XM module files. It attempts to recreate the module replay and user \
-experience of the popular DOS program Fasttracker II, with special playback \
-modes available for improved Amiga ProTracker 2/3 compatibility.
-"
+DESCRIPTION="MilkyTracker is an open source, multi-platform music application \
+for creating .MOD and .XM module files. It attempts to recreate the module \
+replay and user experience of the popular DOS program Fasttracker II, with \
+special playback modes available for improved Amiga ProTracker 2/3 \
+compatibility."
 HOMEPAGE="http://www.milkytracker.org/"
-COPYRIGHT="1994-2013
+LICENSE="
+	GNU GPL v3
+	New-BSD
+	"
+REVISION="2"
+
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+
+PATCHES="milkytracker-$portVersion.patchset"
+if [ $effectiveTargetArchitecture != "x86_gcc2" ]; then
+	PATCHES="milkytracker-$portVersion-gcc4.patchset"
+fi
+
+SOURCE_URI="http://www.milkytracker.org/files/milkytracker-0.90.86.tar.bz2"
+CHECKSUM_SHA256="eb93000ed4855e198dfb02df54f3e3536dc891084ca47cdd5393121137ba3bed"
+COPYRIGHT="
+	1994-2013
 	Peter 'pailes' Barth,
 	Christopher 'Deltafire' O'Neill,
 	Antti S. Lankila,
@@ -17,25 +32,12 @@ COPYRIGHT="1994-2013
 	Claudio Matsuoka,
 	Julian 'jua' Harnath
 	"
-LICENSE="GNU GPL v3
-	New-BSD"
-SOURCE_URI="http://www.milkytracker.org/files/milkytracker-0.90.86.tar.bz2"
-CHECKSUM_SHA256="eb93000ed4855e198dfb02df54f3e3536dc891084ca47cdd5393121137ba3bed"
-REVISION="2"
-ARCHITECTURES="x86_gcc2 x86 x86_64"
-
-PATCHES="milkytracker-$portVersion.patchset"
-if [ $effectiveTargetArchitecture != "x86_gcc2" ]; then
-	PATCHES="milkytracker-$portVersion-gcc4.patchset"
-fi
-
 
 PROVIDES="
 	milkytracker = $portVersion
 	app:MilkyTracker = $portVersion
 	app:MilkySettings = $portVersion
 	"
-
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix >= 1.2.3
diff --git a/net-dialup/minicom/minicom-2.6.2.recipe b/net-dialup/minicom/minicom-2.6.2.recipe
index 2ac763987..905b4fcd1 100644
--- a/net-dialup/minicom/minicom-2.6.2.recipe
+++ b/net-dialup/minicom/minicom-2.6.2.recipe
@@ -1,15 +1,10 @@
-SUMMARY="Minicom is a menu driven communications program."
-DESCRIPTION="
-Minicom is a menu driven communications program. It emulates ANSI and VT102 \
-terminals. It has a dialing directory and auto zmodem download.
-"
+SUMMARY="A menu driven communications program"
+DESCRIPTION="Minicom is a menu driven communications program. It emulates \
+ANSI and VT102 terminals. It has a dialing directory and auto zmodem download."
 HOMEPAGE="https://alioth.debian.org/projects/minicom/"
-SOURCE_URI="https://alioth.debian.org/frs/download.php/file/3869/minicom-2.6.2.tar.gz"
-CHECKSUM_SHA256="f3cf215f7914ffa5528e398962176102ad74df27ba38958142f56aa6d15c9168"
-COPYRIGHT="
-	1991,1992,1993,1994,1995,1996 Miquel van Smoorenburg."
 LICENSE="GNU GPL v2"
 REVISION="1"
+
 ARCHITECTURES="x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
@@ -18,6 +13,11 @@ if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
 	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
 fi
 
+SOURCE_URI="https://alioth.debian.org/frs/download.php/file/3869/minicom-2.6.2.tar.gz"
+CHECKSUM_SHA256="f3cf215f7914ffa5528e398962176102ad74df27ba38958142f56aa6d15c9168"
+COPYRIGHT="
+	1991-1996 Miquel van Smoorenburg"
+
 PROVIDES="
 	minicom$secondaryArchSuffix = $portVersion
 	cmd:minicom$secondaryArchSuffix = $portVersion
@@ -25,20 +25,17 @@ PROVIDES="
 	cmd:ascii_xfr$secondaryArchSuffix = $portVersion
 	cmd:runscript$secondaryArchSuffix = $portVersion
 	"
-
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libiconv$secondaryArchSuffix
 	lib:libncurses$secondaryArchSuffix
 	"
-
 BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
 	devel:libiconv$secondaryArchSuffix
 	devel:libncurses$secondaryArchSuffix
-"
-
+	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel
 	cmd:autoconf
 	cmd:make
 	cmd:gcc$secondaryArchSuffix
diff --git a/sys-apps/man/man-1.6g.recipe b/sys-apps/man/man-1.6g.recipe
index ea2acf5e5..558468275 100644
--- a/sys-apps/man/man-1.6g.recipe
+++ b/sys-apps/man/man-1.6g.recipe
@@ -1,15 +1,14 @@
 SUMMARY="Standard commands to read man pages"
-DESCRIPTION="
-Standard commands to read man pages.
-"
+DESCRIPTION="Standard commands to read man pages."
 HOMEPAGE="http://primates.ximian.com/~flucifredi/man/"
-SOURCE_URI="http://primates.ximian.com/~flucifredi/man/man-1.6g.tar.gz"
-CHECKSUM_SHA256="ccdcb8c3f4e0080923d7e818f0e4a202db26c46415eaef361387c20995b8959f"
 LICENSE="GNU GPL v2"
-COPYRIGHT="1989-2012 Free Software Foundation, Inc."
 REVISION="4"
+
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 
+SOURCE_URI="http://primates.ximian.com/~flucifredi/man/man-1.6g.tar.gz"
+CHECKSUM_SHA256="ccdcb8c3f4e0080923d7e818f0e4a202db26c46415eaef361387c20995b8959f"
+COPYRIGHT="1989-2012 Free Software Foundation, Inc."
 PATCHES="man-1.6g.patchset"
 
 PROVIDES="
@@ -21,7 +20,6 @@ PROVIDES="
 	cmd:man2html = $portVersion compat >= 1.6
 	cmd:whatis = $portVersion compat >= 1.6
 	"
-
 REQUIRES="
 	haiku
 	cmd:awk
@@ -62,8 +60,7 @@ BUILD_PREREQUIRES="
 
 GLOBAL_WRITABLE_FILES="
 	settings/man.conf keep-old
-"
-
+	"
 
 BUILD()
 {
diff --git a/sys-apps/man/patches/man-1.6g.patch b/sys-apps/man/patches/man-1.6g.patch
deleted file mode 100644
index e3171b3ca..000000000
--- a/sys-apps/man/patches/man-1.6g.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-diff -up man-1.6g/configure.orig man-1.6g/configure
---- man-1.6g/configure.orig	2010-12-31 13:28:46.006291456 -0700
-+++ man-1.6g/configure	2012-05-02 21:57:49.683147264 -0600
-@@ -287,6 +287,12 @@ if test -f /xenix; then
-   esac
- fi
- 
-+echo checking for Haiku
-+if test `uname` = "Haiku"; then
-+  LIBS="$LIBS -L/boot/system/lib -llocale"
-+  mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
-+fi
-+
- echo checking how to get alloca
- echo '
- #ifdef __GNUC__
-diff -up man-1.6g/man2html/Makefile.in.orig man-1.6g/man2html/Makefile.in
---- man-1.6g/man2html/Makefile.in.orig	2010-12-31 13:28:46.010747904 -0700
-+++ man-1.6g/man2html/Makefile.in	2012-05-02 21:58:50.621805568 -0600
-@@ -2,7 +2,7 @@ CC = @CC@
- CFLAGS += -Wall -Wstrict-prototypes -Wmissing-prototypes
- OBJECTS = man2html.o cgibase.o abbrev.o strdefs.o
- EXEEXT = @EXEEXT@
--bindir = $(DESTDIR)$(PREFIX)/usr/bin
-+bindir = $(DESTDIR)$(PREFIX)/bin
- mandir = $(DESTDIR)$(PREFIX)@mandir@
- vardir = $(DESTDIR)$(PREFIX)/var
- httpdir = $(DESTDIR)$(PREFIX)/home/httpd
-diff -up man-1.6g/src/Makefile.in.orig man-1.6g/src/Makefile.in
---- man-1.6g/src/Makefile.in.orig	2010-12-31 13:28:46.006815744 -0700
-+++ man-1.6g/src/Makefile.in	2012-05-02 21:59:22.845938688 -0600
-@@ -30,6 +30,8 @@ LDFLAGS ?= -s
- 
- LIBOBJS = @LIBOBJS@
- 
-+LIBS = @LIBS@
-+
- all: man$(EXEEXT) man.conf apropos whatis makewhatis
- 
- MANOBJS = man.o manfile.o manpath.o man-config.o man-getopt.o \
-diff -up man-1.6g/src/man.conf.in.orig man-1.6g/src/man.conf.in
---- man-1.6g/src/man.conf.in.orig	2010-10-25 18:22:24.008388608 -0600
-+++ man-1.6g/src/man.conf.in	2012-05-02 21:57:49.699400192 -0600
-@@ -36,11 +36,14 @@
- #
- # Every automatically generated MANPATH includes these fields
- #
--MANPATH	/usr/man
--MANPATH	/usr/share/man
--MANPATH	/usr/local/man
--MANPATH	/usr/local/share/man
--MANPATH	/usr/X11R6/man
-+MANPATH	/boot/common/man
-+MANPATH	/boot/common/share/man
-+MANPATH	/boot/home/config/man
-+MANPATH	/boot/home/config/share/man
-+MANPATH	/boot/common/*/man
-+MANPATH	/boot/common/*/share/man
-+MANPATH	/boot/home/config/*/man
-+MANPATH	/boot/home/config/*/share/man
- #
- # Uncomment if you want to include one of these by default
- #
-@@ -58,15 +61,9 @@ MANPATH	/usr/X11R6/man
- # in the mandatory manpath already, but will keep man from statting
- # lots of other nearby files and directories.
- #
--MANPATH_MAP	/bin			/usr/share/man
--MANPATH_MAP	/sbin			/usr/share/man
--MANPATH_MAP	/usr/bin		/usr/share/man
--MANPATH_MAP	/usr/sbin		/usr/share/man
--MANPATH_MAP	/usr/local/bin		/usr/local/share/man
--MANPATH_MAP	/usr/local/sbin		/usr/local/share/man
--MANPATH_MAP	/usr/X11R6/bin		/usr/X11R6/man
--MANPATH_MAP	/usr/bin/X11		/usr/X11R6/man
--MANPATH_MAP	/usr/bin/mh		/usr/share/man
-+MANPATH_MAP	/bin			/boot/common/share/man
-+MANPATH_MAP	/boot/common/bin		/boot/common/share/man
-+MANPATH_MAP	/boot/home/config/bin		/boot/home/config/share/man
- #
- # NOAUTOPATH keeps man from automatically adding directories that look like
- # manual page directories to the path.
diff --git a/sys-fs/mtools/mtools-4.0.18.recipe b/sys-fs/mtools/mtools-4.0.18.recipe
index 2f11f2fcb..2aa974b4f 100644
--- a/sys-fs/mtools/mtools-4.0.18.recipe
+++ b/sys-fs/mtools/mtools-4.0.18.recipe
@@ -1,4 +1,4 @@
-SUMMARY="utilities to access MS-DOS disks without mounting them."
+SUMMARY="Utilities to access MS-DOS disks without mounting"
 DESCRIPTION="Mtools is a collection of utilities to access MS-DOS disks from \
 GNU and Unix without mounting them. It supports Win'95 style long file names, \
 OS/2 Xdf disks and 2m disks (store up to 1992k on a high density 3 1/2 disk). \
@@ -7,10 +7,11 @@ labels, FAT-specific file attributes (hidden, system, ...), \"bad block\" map \
 maintenance, access to remote floppy drives, Iomega ZIP disk protection, \
 \"secure\" erase, display of file's on-disk layout, etc."
 HOMEPAGE="http://www.gnu.org/software/mtools/"
+LICENSE="GNU GPL v3"
 REVISION="1"
+
 ARCHITECTURES="x86_64"
 COPYRIGHT="1997-2009 Alain Knaff"
-LICENSE="GNU GPL v3"
 
 SOURCE_URI="ftp://ftp.gnu.org/gnu/mtools/mtools-4.0.18.tar.bz2"
 CHECKSUM_SHA256="59e9cf80885399c4f229e5d87e49c0c2bfeec044e1386d59fcd0b0aead6b2f85"
@@ -50,18 +51,18 @@ PROVIDES="
 	cmd:mzip
 	cmd:tgz
 	cmd:uz
-"
-
+	"
 REQUIRES="
 	haiku
-"
-
-BUILD_PREREQUIRES="
+	"
+BUILD_REQUIRES="
 	haiku_devel
+	"
+BUILD_PREREQUIRES="
 	cmd:awk
 	cmd:gcc
 	cmd:make
-"
+	"
 
 BUILD()
 {
diff --git a/sys-libs/mtdev/mtdev-1.1.5.recipe b/sys-libs/mtdev/mtdev-1.1.5.recipe
index 4de86a80e..bd66fcaf7 100644
--- a/sys-libs/mtdev/mtdev-1.1.5.recipe
+++ b/sys-libs/mtdev/mtdev-1.1.5.recipe
@@ -1,37 +1,44 @@
-SUMMARY="A Multitouch Protocol Translation Library."
+SUMMARY="A multitouch protocol translation library"
 DESCRIPTION="MTDev is a stand-alone library which transforms all variants of \
 kernel MT events to the slotted type B protocol. The events put into \
 mtdev may be from any MT device, specifically type A without contact \
 tracking, type A with contact tracking, or type B with contact tracking."
 HOMEPAGE="http://bitmath.org/code/mtdev/"
-SOURCE_URI="http://bitmath.org/code/mtdev/mtdev-1.1.5.tar.bz2"
-CHECKSUM_SHA256="6677d5708a7948840de734d8b4675d5980d4561171c5a8e89e54adf7a13eba7f"
-REVISION="1"
 LICENSE="MIT"
-COPYRIGHT="
-		2010 Kenrik Rydberg
-		2010 Canonical Ltd.
-		"
+REVISION="1"
 
 ARCHITECTURES="!x86 !x86_gcc2"
 SECONDARY_ARCHITECTURES="!x86 !x86_gcc2"
 
+SOURCE_URI="http://bitmath.org/code/mtdev/mtdev-1.1.5.tar.bz2"
+CHECKSUM_SHA256="6677d5708a7948840de734d8b4675d5980d4561171c5a8e89e54adf7a13eba7f"
+COPYRIGHT="
+	2010 Kenrik Rydberg
+	2010 Canonical Ltd.
+	"
 PROVIDES="
-		mtdev$secondaryArchSuffix = $portVersion
-		lib:libmtdev$secondaryArchSuffix = 1.0.0 compat >= 1
-		"
-
+	mtdev$secondaryArchSuffix = $portVersion
+	lib:libmtdev$secondaryArchSuffix = 1.0.0 compat >= 1
+	"
 REQUIRES="
-		haiku$secondaryArchSuffix >= $haikuVersion
-		"
-
+	haiku$secondaryArchSuffix >= $haikuVersion
+	"
+PROVIDES_devel="
+	mtdev${secondaryArchSuffix}_devel = $portVersion
+	devel:libmtdev$secondaryArchSuffix = 1.0.0 compat >= 1
+	"
+REQUIRES_devel="
+	mtdev${secondaryArchSuffix} == $portVersion base
+	"
 BUILD_REQUIRES="
-		haiku${secondaryArchSuffix}_devel
-		cmd:pkg_config$secondaryArchSuffix
-		cmd:gcc$secondaryArchSuffix
-		cmd:make
-		cmd:awk
-		"
+	haiku${secondaryArchSuffix}_devel
+	"
+BUILD_PREREQUIRES="
+	cmd:pkg_config$secondaryArchSuffix
+	cmd:gcc$secondaryArchSuffix
+	cmd:make
+	cmd:awk
+	"
 
 BUILD()
 {
@@ -47,14 +54,3 @@ INSTALL()
 	prepareInstalledDevelLibs libmtdev
 	packageEntries devel $developDir
 }
-
-# ----- Devel Package -----------------------------------------------------
-
-PROVIDES_devel="
-		mtdev${secondaryArchSuffix}_devel = $portVersion
-		devel:libmtdev$secondaryArchSuffix = 1.0.0 compat >= 1
-"
-
-REQUIRES_devel="
-		mtdev${secondaryArchSuffix} == $portVersion base
-"