diff --git a/app-text/texlive/texlive-2014.recipe b/app-text/texlive/texlive-2014.recipe
index 0ccf79649..81be3ffd0 100644
--- a/app-text/texlive/texlive-2014.recipe
+++ b/app-text/texlive/texlive-2014.recipe
@@ -1,27 +1,23 @@
-SUMMARY="TeX Live"
-DESCRIPTION="
-TeX Live is an easy way to get up and running with the TeX document production system. It provides a
-comprehensive TeX system. It includes all the major TeX-related programs, macro packages, and fonts
-that are free software, including support for many languages around the world.
-"
+SUMMARY="A comprehensive TeX system"
+DESCRIPTION="TeX Live is an easy way to get up and running with the TeX \
+document production system. It provides a comprehensive TeX system. It \
+includes all the major TeX-related programs, macro packages, and fonts that \
+are free software, including support for many languages around the world."
 HOMEPAGE="http://tug.org/texlive/"
 COPYRIGHT="1996 by collaboration between the TeX user groups."
 LICENSE="GNU GPL v2"
+REVISION="1"
 SOURCE_URI="ftp://tug.org/historic/systems/texlive/2014/texlive-20140525-source.tar.xz"
 SOURCE_URI_2="ftp://tug.org/historic/systems/texlive/2014/texlive-20140525-texmf.tar.xz"
 CHECKSUM_SHA256="08bb4eb02923ac65ce1183612c6b64da185904f26a1660f5ca4f902d055795be"
 CHECKSUM_SHA256_2="e0227251c5aa23f8b88973c298cc80b03bd238c645f7f82a6ce888a06b295963"
 SOURCE_DIR="texlive-20140525-source"
 SOURCE_DIR_2="texlive-20140525-texmf"
-
-REVISION="1"
-
-ARCHITECTURES="x86"
-SECONDARY_ARCHITECTURES="!x86_gcc2 x86"
-SECONDARY_ARCHITECTURES="x86"
-
 PATCHES="texlive-2014.patchset"
 
+ARCHITECTURES="x86 !x86_gcc2"
+SECONDARY_ARCHITECTURES="x86"
+
 PROVIDES="
 	texlive = $portVersion compat >= 2014
 	cmd:a2ping
@@ -411,6 +407,16 @@ REQUIRES="
 	lib:libicuuc$secondaryArchSuffix
 	lib:libicui18n$secondaryArchSuffix
 	"
+
+PROVIDES_devel="
+	texlive${secondaryArchSuffix}_devel = $portVersion
+	devel:libkpathsea$secondaryArchSuffix = $portVersion
+	devel:libptexenc$secondaryArchSuffix = $portVersion
+	"
+REQUIRES_devel="
+	texlive$secondaryArchSuffix == $portVersion base
+	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	haiku_devel
@@ -696,14 +702,3 @@ TEST()
 {
 	make check
 }
-
-# ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
-	texlive${secondaryArchSuffix}_devel = $portVersion
-	devel:libkpathsea$secondaryArchSuffix = $portVersion
-	devel:libptexenc$secondaryArchSuffix = $portVersion
-	"
-REQUIRES_devel="
-	texlive$secondaryArchSuffix == $portVersion base
-	"
diff --git a/dev-embedded/u_boot_tools/u_boot_tools-2012.10.recipe b/dev-embedded/u_boot_tools/u_boot_tools-2012.10.recipe
index 27c120277..07c0f6b3b 100644
--- a/dev-embedded/u_boot_tools/u_boot_tools-2012.10.recipe
+++ b/dev-embedded/u_boot_tools/u_boot_tools-2012.10.recipe
@@ -1,30 +1,33 @@
-SUMMARY="utilities for working with Das U-Boot"
+SUMMARY="Utilities for working with 'Das U-Boot'"
 DESCRIPTION="This package includes the mkimage program, which allows generation
 of U-Boot images in various formats."
 HOMEPAGE="http://www.denx.de/wiki/U-Boot/Documentation"
+COPYRIGHT="2003 - 2012 U-Boot"
+LICENSE="GNU GPL v2"
 REVISION="1"
-ARCHITECTURES="x86_gcc2 x86_64"
-
 SOURCE_URI="http://ftp.denx.de/pub/u-boot/u-boot-2012.10.tar.bz2"
 SOURCE_DIR="u-boot-$portVersion"
 CHECKSUM_SHA256="dddec75070b5faa5df463085e3e1d27c6d058ec3481c666917baa961956d4d17"
 PATCHES="u_boot_tools-$portVersion.patchset"
 
+ARCHITECTURES="x86_gcc2 x86_64"
+
 PROVIDES="
 	u_boot_tools = $portVersion
 	cmd:mkimage
 	cmd:mkenvimage
-"
-
+	"
 REQUIRES="
 	haiku
-"
+	"
 
+BUILD_REQUIRES="
+	haiku_deve
+	"
 BUILD_PREREQUIRES="
-	haiku_devel
 	cmd:gcc
 	cmd:make
-"
+	"
 
 BUILD()
 {
@@ -38,6 +41,3 @@ INSTALL()
 	cp tools/mkimage $binDir
 	cp tools/mkenvimage $binDir
 }
-
-LICENSE="GNU GPL v2"
-COPYRIGHT="2003 - 2012 U-Boot"
diff --git a/dev-python/pygments/pygments-1.6.recipe b/dev-python/pygments/pygments-1.6.recipe
index 6c5609c13..c6589149b 100644
--- a/dev-python/pygments/pygments-1.6.recipe
+++ b/dev-python/pygments/pygments-1.6.recipe
@@ -1,8 +1,8 @@
-SUMMARY="a generic syntax highlighter for general use"
-DESCRIPTION="
-It is a generic syntax highlighter for general use in all kinds of software \
-such as forum systems, wikis or other applications that need to prettify \
-source code. Highlights are:
+SUMMARY="A generic syntax highlighter"
+DESCRIPTION="It is a generic syntax highlighter for general use in all kinds \
+of software such as forum systems, wikis or other applications that need to \
+prettify source code. Highlights are:
+
 * a wide range of common languages and markup formats is supported
 * special attention is paid to details that increase highlighting quality
 * support for new languages and formats are added easily; most languages use a \
@@ -10,24 +10,22 @@ simple regex-based lexing mechanism
 * a number of output formats is available, among them HTML, RTF, LaTeX and \
 ANSI sequences
 * it is usable as a command-line tool and as a library
-* ... and it highlights even Brainf*ck!
-"
+* ... and it highlights even Brainf*ck!"
 HOMEPAGE="http://pygments.org/"
-SOURCE_URI="https://pypi.python.org/packages/source/P/Pygments/Pygments-1.6.tar.gz"
-CHECKSUM_SHA256="799ed4caf77516e54440806d8d9cd82a7607dfdf4e4fb643815171a4b5c921c0"
-COPYRIGHT="2006-2013 by the Pygments team, see AUTHORS"
+COPYRIGHT="2006-2013 by the Pygments team"
 LICENSE="BSD (2-clause)"
 REVISION="1"
+SOURCE_URI="https://pypi.python.org/packages/source/P/Pygments/Pygments-1.6.tar.gz"
+CHECKSUM_SHA256="799ed4caf77516e54440806d8d9cd82a7607dfdf4e4fb643815171a4b5c921c0"
+SOURCE_DIR="Pygments-1.6"
+
 ARCHITECTURES="x86 ?x86_gcc2"
 SECONDARY_ARCHITECTURES="x86 ?x86_gcc2"
 
-SOURCE_DIR="Pygments-1.6"
-
 PROVIDES="
 	pygments$secondaryArchSuffix = $portVersion
 	cmd:pygmentize$secondaryArchSuffix = $portVersion
 	"
-
 REQUIRES="
 	haiku$secondaryArchSuffix
 	cmd:python$secondaryArchSuffix
@@ -36,7 +34,6 @@ REQUIRES="
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	"
-
 BUILD_PREREQUIRES="
 	cmd:python$secondaryArchSuffix
 	"
diff --git a/media-fonts/unifont/unifont-7.0.06.recipe b/media-fonts/unifont/unifont-7.0.06.recipe
index fb10b487d..99875d8b4 100644
--- a/media-fonts/unifont/unifont-7.0.06.recipe
+++ b/media-fonts/unifont/unifont-7.0.06.recipe
@@ -1,10 +1,12 @@
-SUMMARY="Unifoundry unifont"
-DESCRIPTION="GNU Unifont is part of the GNU Project
+SUMMARY="Unifoundry's font covering Unicode's BMP"
+DESCRIPTION="GNU Unifont is part of the GNU Project.
 The GNU Unifont by Roman Czyborra is a free bitmap font that covers the \
-Unicode Basic Multilingual Plane (BMP), \
-using an intermediate bitmapped font format."
+Unicode Basic Multilingual Plane (BMP), using an intermediate bitmapped \
+font format."
 HOMEPAGE="http://unifoundry.com"
-SOURCE_URI="http://unifoundry.com/pub/unifont-7.0.06/font-builds/unifont-7.0.06.ttf#noarchive"
+COPYRIGHT="Unifoundry"
+SLICENSE="GNU GPL v2"
+REVISION="2"OURCE_URI="http://unifoundry.com/pub/unifont-7.0.06/font-builds/unifont-7.0.06.ttf#noarchive"
 CHECKSUM_SHA256="a7a49189502d01033cc4028048f10706c665952341f2d5831d4477c8b301b362"
 SOURCE_URI_2="http://unifoundry.com/pub/unifont-7.0.06/font-builds/unifont_upper-7.0.06.ttf#noarchive"
 CHECKSUM_SHA256_2="8cf9b9870860a3aec239d6ee43387a3ba8c3b8302d4b8d73bca8a419a7deb01d"
@@ -13,9 +15,6 @@ CHECKSUM_SHA256_3="ddf4b3632f7cda10d53c6f62e198db7989524cfd7131af2591ad50dc1aa31
 SOURCE_URI_4="http://unifoundry.com/pub/unifont-7.0.06/font-builds/unifont_upper_csur-7.0.06.ttf#noarchive"
 CHECKSUM_SHA256_4="0e1841505d1be6636cf6d5e60cc4ff09b56784e29f2728060231b26d74ab7551"
 SOURCE_DIR=""
-LICENSE="GNU GPL v2"
-COPYRIGHT="Unifoundry"
-REVISION="2"
 
 ARCHITECTURES="any"
 DISABLE_SOURCE_PACKAGE="yes"
diff --git a/media-gfx/wings/wings-1.5.3.recipe b/media-gfx/wings/wings-1.5.3.recipe
index e403cb4d1..beddbf046 100644
--- a/media-gfx/wings/wings-1.5.3.recipe
+++ b/media-gfx/wings/wings-1.5.3.recipe
@@ -1,4 +1,4 @@
-SUMMARY="Polygon modeler"
+SUMMARY="A 3D polygon modeler"
 DESCRIPTION="Wings 3D is an advanced subdivision modeler that is both powerful \
 and easy to use.
 
@@ -12,23 +12,30 @@ Wings 3D offers a wide range of modeling tools, a customizable interface, \
 support for lights and materials, and a built-in AutoUV mapping facility.
 
 There is no support in Wings for animation."
-LICENSE="wings"
-COPYRIGHT="Bjorn Gustavsson, and other parties"
-REVISION="1"
-ARCHITECTURES="?x86_gcc2"
 HOMEPAGE="http://www.wings3d.com/"
-
+COPYRIGHT="Bjorn Gustavsson, and other parties"
+LICENSE="wings"
+REVISION="1"
 SOURCE_URI="https://sourceforge.net/projects/wings/files/wings/$portVersion/wings-$portVersion.tar.bz2"
 CHECKSUM_SHA256="c08060016f83679ce08947942d31af0e3b5d105525d0df5e993ec6f1a81fdd8e"
 
-PROVIDES="
-	wings
-"
+ARCHITECTURES="?x86_gcc2"
 
+PROVIDES="
+	wings = $portVersion
+	app:wings
+	"
+REQUIRES="
+	haiku
+	"
+
+BUILD_REQUIRES="
+	haiku_devel
+	"
 BUILD_PREREQUIRES="
 	cmd:erlc
 	cmd:make
-"
+	"
 
 BUILD()
 {
diff --git a/media-libs/tiff/tiff-3.9.6.recipe b/media-libs/tiff/tiff-3.9.6.recipe
index 383bceac7..9d55e1c9e 100644
--- a/media-libs/tiff/tiff-3.9.6.recipe
+++ b/media-libs/tiff/tiff-3.9.6.recipe
@@ -1,4 +1,4 @@
-SUMMARY="A library to red/write TIFF images"
+SUMMARY="A library to read/write TIFF images"
 DESCRIPTION="TIFF the Tag Image File Format, is a widely used format for \
 storing image data. Included in this software is a library, libtiff, for \
 reading and writing TIFF."
diff --git a/media-libs/tiff/tiff4-4.0.3.recipe b/media-libs/tiff/tiff4-4.0.3.recipe
index 81645c89f..fc4a18971 100644
--- a/media-libs/tiff/tiff4-4.0.3.recipe
+++ b/media-libs/tiff/tiff4-4.0.3.recipe
@@ -1,16 +1,17 @@
-SUMMARY="Tiff library"
-DESCRIPTION="
-TIFF the Tag Image File Format, is a widely used format for storing image \
-data. Included in this software is a library, libtiff, for reading and writing \
-TIFF.
-"
+SUMMARY="A library to read/write TIFF images"
+DESCRIPTION="TIFF the Tag Image File Format, is a widely used format for \
+storing image data. Included in this software is a library, libtiff, for \
+reading and writing TIFF."
 HOMEPAGE="http://www.libtiff.org"
-SOURCE_URI="ftp://ftp.remotesensing.org/pub/libtiff/tiff-$portVersion.tar.gz"
-CHECKSUM_SHA256="ea1aebe282319537fb2d4d7805f478dd4e0e05c33d0928baba76a7c963684872"
-LICENSE="MIT"
 COPYRIGHT="1988-1997 Sam Leffler
 	1991-1997 Silicon Graphics, Inc."
+LICENSE="MIT"
 REVISION="1"
+SOURCE_URI="ftp://ftp.remotesensing.org/pub/libtiff/tiff-$portVersion.tar.gz"
+CHECKSUM_SHA256="ea1aebe282319537fb2d4d7805f478dd4e0e05c33d0928baba76a7c963684872"
+SOURCE_DIR="tiff-$portVersion"
+PATCHES="tiff-4.0.3.patch"
+
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
@@ -25,69 +26,6 @@ REQUIRES="
 	lib:libjpeg$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
-BUILD_REQUIRES="
-	devel:libGL$secondaryArchSuffix
-	devel:libjpeg$secondaryArchSuffix
-	devel:libz$secondaryArchSuffix
-	"
-BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	cmd:aclocal
-	cmd:autoconf
-	cmd:automake
-	cmd:gcc$secondaryArchSuffix
-	cmd:ld$secondaryArchSuffix
-	cmd:libtoolize
-	cmd:make
-	"
-PATCHES="
-	tiff-4.0.3.patch
-"
-
-PATCH()
-{
-	if [ $effectiveTargetArchitecture == x86_gcc2 ]; then
-		sed -i 's/ios::pos_type/streampos/g' libtiff/tif_stream.cxx
-		sed -i 's/ios::off_type/streamoff/g' libtiff/tif_stream.cxx
-	fi
-}
-
-SOURCE_DIR="tiff-$portVersion"
-
-BUILD()
-{
-	autoreconf -fi
-	runConfigure ./configure --with-docdir=$documentationDir/$portName
-#		--enable-shared
-	make $jobArgs
-}
-
-INSTALL()
-{
-	make install
-
-	prepareInstalledDevelLibs libtiff libtiffxx
-	fixPkgconfig
-
-	# devel package
-	packageEntries devel \
-		$developDir
-
-	# tools package
-	if [ -z "$secondaryArchSuffix" ]; then
-		packageEntries tools \
-			$binDir \
-			$documentationDir
-	fi
-
-	# Remove stuff we don't need in the secondary architecture base package.
-	if [ -n "$secondaryArchSuffix" ]; then
-		rm -rf $binDir
-		rm -rf $documentationDir
-	fi
-}
-
-# ----- devel package -------------------------------------------------------
 
 PROVIDES_devel="
 	tiff4${secondaryArchSuffix}_devel = $portVersion compat >= 4
@@ -101,8 +39,6 @@ CONFLICTS_devel="
 	tiff${secondaryArchSuffix}_devel
 	"
 
-# ----- tools package -------------------------------------------------------
-
 if [ -z "$secondaryArchSuffix" ]; then
 	SUMMARY_tools="The TIFF tools"
 	PROVIDES_tools="
@@ -138,3 +74,60 @@ if [ -z "$secondaryArchSuffix" ]; then
 		lib:libz
 		"
 fi
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	devel:libGL$secondaryArchSuffix
+	devel:libjpeg$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	cmd:aclocal
+	cmd:autoconf
+	cmd:automake
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:libtoolize
+	cmd:make
+	"
+
+PATCH()
+{
+	if [ $effectiveTargetArchitecture == x86_gcc2 ]; then
+		sed -i 's/ios::pos_type/streampos/g' libtiff/tif_stream.cxx
+		sed -i 's/ios::off_type/streamoff/g' libtiff/tif_stream.cxx
+	fi
+}
+
+BUILD()
+{
+	autoreconf -fi
+	runConfigure ./configure --with-docdir=$documentationDir/$portName
+#		--enable-shared
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+
+	prepareInstalledDevelLibs libtiff libtiffxx
+	fixPkgconfig
+
+	# devel package
+	packageEntries devel \
+		$developDir
+
+	# tools package
+	if [ -z "$secondaryArchSuffix" ]; then
+		packageEntries tools \
+			$binDir \
+			$documentationDir
+	fi
+
+	# Remove stuff we don't need in the secondary architecture base package.
+	if [ -n "$secondaryArchSuffix" ]; then
+		rm -rf $binDir
+		rm -rf $documentationDir
+	fi
+}
diff --git a/media-video/vcdimager/vcdimager-0.7.24.recipe b/media-video/vcdimager/vcdimager-0.7.24.recipe
index 2d550b118..f2c53eb9e 100644
--- a/media-video/vcdimager/vcdimager-0.7.24.recipe
+++ b/media-video/vcdimager/vcdimager-0.7.24.recipe
@@ -1,29 +1,27 @@
-SUMMARY="author, disassemble and analyze Video CDs"
-DESCRIPTION="
-GNU VCDImager is a full-featured mastering suite for authoring, disassembling\
-and analyzing Video CDs and Super Video CDs.
+SUMMARY="Author, disassemble and analyze Video CDs"
+DESCRIPTION="GNU VCDImager is a full-featured mastering suite for authoring, \
+disassembling and analyzing Video CDs and Super Video CDs.
 
 The following features are available so far (some features are only available \
 in the latest alpha snapshots):
 
- * Free software available under the GNU Public License
- * Support for Video CD 1.1 and 2.0 disc formats
- * Support for the Super Video CD 1.0 disc format
- * Full PBC (playback control) support (play lists, selection lists and end lists)
- * Support for segment play items
- * Automatic padding of MPEG streams on the fly
- * Support for 99-minute (out-of-specification) CD-R media
- * Extraction of Video CDs into files (incl. the PBC information)
- * Runs on all major UNIX flavors and on Win32
- * Use of XML for the description of Video CDs
-"
+* Free software available under the GNU Public License
+* Support for Video CD 1.1 and 2.0 disc formats
+* Support for the Super Video CD 1.0 disc format
+* Full PBC (playback control) support (play lists, selection lists and end \
+lists)
+* Support for segment play items
+* Automatic padding of MPEG streams on the fly
+* Support for 99-minute (out-of-specification) CD-R media
+* Extraction of Video CDs into files (incl. the PBC information)
+* Runs on all major UNIX flavors and on Win32
+* Use of XML for the description of Video CDs"
 HOMEPAGE="http://www.vcdimager.org/"
+COPYRIGHT="2002 Herbert Valerio Riedel"
+LICENSE="GNU GPL v2"
+REVISION="2"
 SOURCE_URI="ftp://ftp.mirror.nl/pub/mirror/gnu/vcdimager/vcdimager-0.7.24.tar.gz"
 CHECKSUM_SHA256="075d7a67353ff3004745da781435698b6bc4a053838d0d4a3ce0516d7d974694"
-REVISION="2"
-
-LICENSE="GNU GPL v2"
-COPYRIGHT="2002 Herbert Valerio Riedel"
 
 ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 ?x86"
@@ -38,9 +36,7 @@ PROVIDES="
 	cmd:vcdxminfo$secondaryArchSuffix
 	cmd:vcdxrip$secondaryArchSuffix
 	lib:libvcdinfo$secondaryArchSuffix
-
 	"
-
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libcdio$secondaryArchSuffix
@@ -50,16 +46,23 @@ REQUIRES="
 	lib:libz$secondaryArchSuffix
 	"
 
+PROVIDES_devel="
+    vcdimager${secondaryArchSuffix}_devel = $portVersion
+    devel:libvcdinfo$secondaryArchSuffix = $portVersion
+    "
+REQUIRES_devel="
+    vcdimager$secondaryArchSuffix == $portVersion base
+	"
+
 BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
 	devel:libcdio$secondaryArchSuffix
 	devel:libxml2$secondaryArchSuffix
 	devel:libpopt$secondaryArchSuffix
 	devel:libiconv$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
 	"
-
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel
 	cmd:libtool
 	cmd:aclocal
 	cmd:autoconf
@@ -97,13 +100,3 @@ INSTALL()
 	packageEntries devel \
 		$developDir
 }
-
-# ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
-    vcdimager${secondaryArchSuffix}_devel = $portVersion
-    devel:libvcdinfo$secondaryArchSuffix = $portVersion
-    "
-REQUIRES_devel="
-    vcdimager$secondaryArchSuffix == $portVersion base
-	"
diff --git a/x11-misc/util_macros/util_macros-1.17.0_git.recipe b/x11-misc/util_macros/util_macros-1.17.0_git.recipe
index e641158b9..3620519e4 100644
--- a/x11-misc/util_macros/util_macros-1.17.0_git.recipe
+++ b/x11-misc/util_macros/util_macros-1.17.0_git.recipe
@@ -1,15 +1,13 @@
-SUMMARY="xorg util-macros"
-DESCRIPTION="
-Xorg util-macros.
-"
+SUMMARY="X.Org's utility macros"
+DESCRIPTION="This is a set of autoconf macros used by the configure.ac \
+scripts in other Xorg modular packages, and is needed to generate new \
+versions of their configure scripts with autoconf.
 HOMEPAGE="http://cgit.freedesktop.org/xorg/util/macros/"
 COPYRIGHT="2005 Red Hat, Inc.
-	2005, 2006, Oracle and/or its affiliates. All rights reserved."
+	2005, 2006, Oracle and/or its affiliates"
 LICENSE="MIT"
-
-SOURCE_URI="git://anongit.freedesktop.org/xorg/util/macros"
-#CHECKSUM_MD5=""
 REVISION="1"
+SOURCE_URI="git://anongit.freedesktop.org/xorg/util/macros"
 
 ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64"
 SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86"
@@ -23,10 +21,9 @@ REQUIRES="
 	"
 
 BUILD_REQUIRES="
-	"
-
-BUILD_PREREQUIRES="
 	haiku${secondaryArchSuffix}_devel
+	"
+BUILD_PREREQUIRES="
 	cmd:autoconf
 	cmd:aclocal
 	cmd:make
@@ -34,7 +31,6 @@ BUILD_PREREQUIRES="
 	cmd:ld$secondaryArchSuffix
 	"
 
-
 BUILD()
 {
 	./autogen.sh -V
diff --git a/x11-proto/xproto/xproto-7.0.23_git.recipe b/x11-proto/xproto/xproto-7.0.23_git.recipe
index 9803af39c..72355dda4 100644
--- a/x11-proto/xproto/xproto-7.0.23_git.recipe
+++ b/x11-proto/xproto/xproto-7.0.23_git.recipe
@@ -1,7 +1,5 @@
-SUMMARY="xproto"
-DESCRIPTION="
-xproto.
-"
+SUMMARY="X.Org xproto protocol headers"
+DESCRIPTION="The X.Org xproto protocol headers."
 HOMEPAGE="http://cgit.freedesktop.org/xorg/proto/xproto/"
 COPYRIGHT="1991, Oracle and/or its affiliates. All rights reserved.
 	1985, 1987, 1988, 1990, 1991, 1993-1996, 1998  The Open Group
@@ -10,11 +8,8 @@ COPYRIGHT="1991, Oracle and/or its affiliates. All rights reserved.
 	1989 by Hewlett-Packard Company.
 	1999  The XFree86 Project Inc."
 LICENSE="MIT (no promotion)"
-
-SOURCE_URI="git://anongit.freedesktop.org/xorg/proto/xproto"
-#CHECKSUM_MD5=""
 REVISION="1"
-
+SOURCE_URI="git://anongit.freedesktop.org/xorg/proto/xproto"
 PATCHES="xproto-7.0.23_git.patch"
 
 ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64"
@@ -29,10 +24,9 @@ REQUIRES="
 	"
 
 BUILD_REQUIRES="
-	"
-
-BUILD_PREREQUIRES="
 	haiku${secondaryArchSuffix}_devel
+	"
+BUILD_PREREQUIRES="
 	devel:util_macros$secondaryArchSuffix
 	cmd:autoconf
 	cmd:libtool
diff --git a/x11-proto/xproto/xproto-7.0.26.recipe b/x11-proto/xproto/xproto-7.0.26.recipe
index 51568a540..63910ddd5 100644
--- a/x11-proto/xproto/xproto-7.0.26.recipe
+++ b/x11-proto/xproto/xproto-7.0.26.recipe
@@ -1,7 +1,5 @@
 SUMMARY="X.Org xproto protocol headers"
-DESCRIPTION="
-The X.Org xproto protocol headers.
-"
+DESCRIPTION="The X.Org xproto protocol headers."
 HOMEPAGE="http://cgit.freedesktop.org/xorg/proto/xproto/"
 COPYRIGHT="1991, Oracle and/or its affiliates. All rights reserved.
 	1985, 1987, 1988, 1990, 1991, 1993-1996, 1998  The Open Group
@@ -10,11 +8,9 @@ COPYRIGHT="1991, Oracle and/or its affiliates. All rights reserved.
 	1989 by Hewlett-Packard Company.
 	1999  The XFree86 Project Inc."
 LICENSE="MIT (no promotion)"
-
+REVISION="2"
 SOURCE_URI="http://cgit.freedesktop.org/xorg/proto/xproto/snapshot/xproto-7.0.26.tar.gz"
 CHECKSUM_SHA256="8c9667873a446f34c440d06e37c83144979d1abe6fa3dcd52727e7c6fecb290f"
-REVISION="2"
-
 PATCHES="xproto-7.0.26.patch"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
@@ -29,10 +25,9 @@ REQUIRES="
 	"
 
 BUILD_REQUIRES="
-	"
-
-BUILD_PREREQUIRES="
 	haiku${secondaryArchSuffix}_devel
+	"
+BUILD_PREREQUIRES="
 	devel:util_macros$secondaryArchSuffix
 	cmd:autoconf
 	cmd:libtool